From af847a68bd49b1ae4a34ee91461eb15265fe819c Mon Sep 17 00:00:00 2001
From: Ben Doyle <benjamin.peter.doyle@gmail.com>
Date: Thu, 21 Jan 2016 06:57:06 -0500
Subject: [PATCH 001/712] google-cloud-sdk: Add various modules to PYTHONPATH

This fixes a sequence of missing-module errors seen when calling
`gcloud auth authenticate-service-acount`.
---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 75860bc27d3..fa37681ac71 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -1,5 +1,7 @@
 {stdenv, fetchurl, python27, python27Packages, makeWrapper}:
 
+with python27Packages;
+
 stdenv.mkDerivation rec {
   version = "0.9.82";
   name = "google-cloud-sdk-${version}";
@@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
         wrapper="$out/bin/$program"
         makeWrapper "$programPath" "$wrapper" \
             --set CLOUDSDK_PYTHON "${python27}/bin/python" \
-            --prefix PYTHONPATH : "$(toPythonPath ${python27Packages.crcmod})"
+            --prefix PYTHONPATH : "$(toPythonPath ${cffi}):$(toPythonPath ${cryptography}):$(toPythonPath ${pyopenssl}):$(toPythonPath ${crcmod})"
     done
 
     # install man pages

From aa46904490cadc55817ec32695c484026ddf3e15 Mon Sep 17 00:00:00 2001
From: Arnold Krille <arnold@arnoldarts.de>
Date: Sat, 30 Jan 2016 23:00:39 +0100
Subject: [PATCH 002/712] containers: Add a hostbridge and ipv6 addresses

This allows the containers to have their interface in a bridge on the host.
Also this adds IPv6 addresses to the containers both with bridged and unbridged
network.
---
 nixos/modules/virtualisation/containers.nix | 100 ++++++++++++++++----
 1 file changed, 81 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 121ecbc9bf2..4c20ee27de2 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -28,14 +28,23 @@ let
 
       # Initialise the container side of the veth pair.
       if [ "$PRIVATE_NETWORK" = 1 ]; then
+
         ip link set host0 name eth0
         ip link set dev eth0 up
+
+        if [ -n "$LOCAL_ADDRESS" ]; then
+          ip addr add $LOCAL_ADDRESS dev eth0
+        fi
+        if [ -n "$LOCAL_ADDRESS6" ]; then
+          ip -6 addr add $LOCAL_ADDRESS6 dev eth0
+        fi
         if [ -n "$HOST_ADDRESS" ]; then
           ip route add $HOST_ADDRESS dev eth0
           ip route add default via $HOST_ADDRESS
         fi
-        if [ -n "$LOCAL_ADDRESS" ]; then
-          ip addr add $LOCAL_ADDRESS dev eth0
+        if [ -n "$HOST_ADDRESS6" ]; then
+          ip -6 route add $HOST_ADDRESS6 dev eth0
+          ip -6 route add default via $HOST_ADDRESS6
         fi
       fi
 
@@ -48,7 +57,7 @@ let
   system = config.nixpkgs.system;
 
   bindMountOpts = { name, config, ... }: {
-  
+
     options = {
       mountPoint = mkOption {
         example = "/mnt/usb";
@@ -68,13 +77,13 @@ let
         description = "Determine whether the mounted path will be accessed in read-only mode.";
       };
     };
-    
+
     config = {
       mountPoint = mkDefault name;
     };
-    
+
   };
-  
+
   mkBindFlag = d:
                let flagPrefix = if d.isReadOnly then " --bind-ro=" else " --bind=";
                    mountstr = if d.hostPath != null then "${d.hostPath}:${d.mountPoint}" else "${d.mountPoint}";
@@ -142,12 +151,33 @@ in
               '';
             };
 
+            hostBridge = mkOption {
+              type = types.nullOr types.string;
+              default = null;
+              example = "br0";
+              description = ''
+                Put the host-side of the veth-pair into the named bridge.
+                Only one of hostAddress* or hostBridge can be given.
+              '';
+            };
+
             hostAddress = mkOption {
               type = types.nullOr types.str;
               default = null;
               example = "10.231.136.1";
               description = ''
                 The IPv4 address assigned to the host interface.
+                (Not used when hostBridge is set.)
+              '';
+            };
+
+            hostAddress6 = mkOption {
+              type = types.nullOr types.string;
+              default = null;
+              example = "fc00::1";
+              description = ''
+                The IPv6 address assigned to the host interface.
+                (Not used when hostBridge is set.)
               '';
             };
 
@@ -161,6 +191,16 @@ in
               '';
             };
 
+            localAddress6 = mkOption {
+              type = types.nullOr types.string;
+              default = null;
+              example = "fc00::2";
+              description = ''
+                The IPv6 address assigned to <literal>eth0</literal>
+                in the container.
+              '';
+            };
+
             interfaces = mkOption {
               type = types.listOf types.string;
               default = [];
@@ -185,7 +225,7 @@ in
               example = { "/home" = { hostPath = "/home/alice";
                                       isReadOnly = false; };
                         };
-                        
+
               description =
                 ''
                   An extra list of directories that is bound to the container.
@@ -257,11 +297,7 @@ in
 
             if [ "$PRIVATE_NETWORK" = 1 ]; then
               ip link del dev "ve-$INSTANCE" 2> /dev/null || true
-            fi
-
-
-            if [ "$PRIVATE_NETWORK" = 1 ]; then
-              ip link del dev "ve-$INSTANCE" 2> /dev/null || true
+              ip link del dev "vb-$INSTANCE" 2> /dev/null || true
             fi
          '';
 
@@ -281,6 +317,9 @@ in
 
             if [ "$PRIVATE_NETWORK" = 1 ]; then
               extraFlags+=" --network-veth"
+              if [ -n "$HOST_BRIDGE" ]; then
+                extraFlags+=" --network-bridge=$HOST_BRIDGE"
+              fi
             fi
 
             for iface in $INTERFACES; do
@@ -315,8 +354,11 @@ in
               --bind="/nix/var/nix/profiles/per-container/$INSTANCE:/nix/var/nix/profiles" \
               --bind="/nix/var/nix/gcroots/per-container/$INSTANCE:/nix/var/nix/gcroots" \
               --setenv PRIVATE_NETWORK="$PRIVATE_NETWORK" \
+              --setenv HOST_BRIDGE="$HOST_BRIDGE" \
               --setenv HOST_ADDRESS="$HOST_ADDRESS" \
               --setenv LOCAL_ADDRESS="$LOCAL_ADDRESS" \
+              --setenv HOST_ADDRESS6="$HOST_ADDRESS6" \
+              --setenv LOCAL_ADDRESS6="$LOCAL_ADDRESS6" \
               --setenv PATH="$PATH" \
               ${containerInit} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init"
           '';
@@ -324,13 +366,21 @@ in
         postStart =
           ''
             if [ "$PRIVATE_NETWORK" = 1 ]; then
-              ifaceHost=ve-$INSTANCE
-              ip link set dev $ifaceHost up
-              if [ -n "$HOST_ADDRESS" ]; then
-                ip addr add $HOST_ADDRESS dev $ifaceHost
-              fi
-              if [ -n "$LOCAL_ADDRESS" ]; then
-                ip route add $LOCAL_ADDRESS dev $ifaceHost
+              if [ -z "$HOST_BRIDGE" ]; then
+                ifaceHost=ve-$INSTANCE
+                ip link set dev $ifaceHost up
+                if [ -n "$HOST_ADDRESS" ]; then
+                  ip addr add $HOST_ADDRESS dev $ifaceHost
+                fi
+                if [ -n "$HOST_ADDRESS6" ]; then
+                  ip -6 addr add $HOST_ADDRESS6 dev $ifaceHost
+                fi
+                if [ -n "$LOCAL_ADDRESS" ]; then
+                  ip route add $LOCAL_ADDRESS dev $ifaceHost
+                fi
+                if [ -n "$LOCAL_ADDRESS6" ]; then
+                  ip -6 route add $LOCAL_ADDRESS6 dev $ifaceHost
+                fi
               fi
             fi
 
@@ -353,6 +403,9 @@ in
         restartIfChanged = false;
         #reloadIfChanged = true; # FIXME
 
+        wants = [ "netwprk.target" ];
+        after = [ "network.target" ];
+
         serviceConfig = {
           ExecReload = pkgs.writeScript "reload-container"
             ''
@@ -396,12 +449,21 @@ in
             SYSTEM_PATH=${cfg.path}
             ${optionalString cfg.privateNetwork ''
               PRIVATE_NETWORK=1
+              ${optionalString (cfg.hostBridge != null) ''
+                HOST_BRIDGE=${cfg.hostBridge}
+              ''}
               ${optionalString (cfg.hostAddress != null) ''
                 HOST_ADDRESS=${cfg.hostAddress}
               ''}
+              ${optionalString (cfg.hostAddress6 != null) ''
+                HOST_ADDRESS6=${cfg.hostAddress6}
+              ''}
               ${optionalString (cfg.localAddress != null) ''
                 LOCAL_ADDRESS=${cfg.localAddress}
               ''}
+              ${optionalString (cfg.localAddress6 != null) ''
+                LOCAL_ADDRESS6=${cfg.localAddress6}
+              ''}
             ''}
              INTERFACES="${toString cfg.interfaces}"
            ${optionalString cfg.autoStart ''

From 3b31c52d4b2784de33280feb9949f2ab8241ac50 Mon Sep 17 00:00:00 2001
From: Arnold Krille <arnold@arnoldarts.de>
Date: Sun, 31 Jan 2016 21:45:05 +0100
Subject: [PATCH 003/712] containers: Add more tests for ipv6 and hostbridge
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A testcase each for
- declarative ipv6-only container
  Seems odd to define the container IPs with their prefix length attached.
  There should be a better way…
- declarative bridged container

Also fix the ping test by waiting for the container to start

When the ping was executed, the container might not have finished starting. Or
the host-side of the container wasn't finished with config. Waiting for
2 seconds in between fixes this.
---
 nixos/release.nix                 |  2 +
 nixos/tests/containers-bridge.nix | 81 +++++++++++++++++++++++++++++++
 nixos/tests/containers-ipv6.nix   | 61 +++++++++++++++++++++++
 nixos/tests/containers.nix        |  5 +-
 4 files changed, 148 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/containers-bridge.nix
 create mode 100644 nixos/tests/containers-ipv6.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 8a01b2685a7..2dc1b21daaf 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -200,6 +200,8 @@ in rec {
   tests.chromium = callSubTests tests/chromium.nix {};
   tests.cjdns = callTest tests/cjdns.nix {};
   tests.containers = callTest tests/containers.nix {};
+  tests.containers-ipv6 = callTest tests/containers-ipv6.nix {};
+  tests.containers-bridge = callTest tests/containers-bridge.nix {};
   tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; });
   tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; });
   tests.dnscrypt-proxy = callTest tests/dnscrypt-proxy.nix { system = "x86_64-linux"; };
diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix
new file mode 100644
index 00000000000..8c3340b60a7
--- /dev/null
+++ b/nixos/tests/containers-bridge.nix
@@ -0,0 +1,81 @@
+# Test for NixOS' container support.
+
+let
+  hostIp = "192.168.0.1";
+  containerIp = "192.168.0.100/24";
+  hostIp6 = "fc00::1";
+  containerIp6 = "fc00::2/7";
+in
+
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "containers-bridge";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ aristid aszlig eelco chaoflow ];
+  };
+
+  machine =
+    { config, pkgs, ... }:
+    { imports = [ ../modules/installer/cd-dvd/channel.nix ];
+      virtualisation.writableStore = true;
+      virtualisation.memorySize = 768;
+
+      networking.bridges = {
+        br0 = {
+          interfaces = [];
+        };
+      };
+      networking.interfaces = {
+        br0 = {
+          ip4 = [{ address = hostIp; prefixLength = 24; }];
+          ip6 = [{ address = hostIp6; prefixLength = 7; }];
+        };
+      };
+
+      containers.webserver =
+        {
+          autoStart = true;
+          privateNetwork = true;
+          hostBridge = "br0";
+          localAddress = containerIp;
+          localAddress6 = containerIp6;
+          config =
+            { services.httpd.enable = true;
+              services.httpd.adminAddr = "foo@example.org";
+              networking.firewall.allowedTCPPorts = [ 80 ];
+              networking.firewall.allowPing = true;
+            };
+        };
+
+      virtualisation.pathsInNixDB = [ pkgs.stdenv ];
+    };
+
+  testScript =
+    ''
+      $machine->waitForUnit("default.target");
+      $machine->succeed("nixos-container list") =~ /webserver/ or die;
+
+      # Start the webserver container.
+      $machine->succeed("nixos-container status webserver") =~ /up/ or die;
+
+      "${containerIp}" =~ /([^\/]+)\/([0-9+])/;
+      my $ip = $1;
+      chomp $ip;
+      $machine->succeed("ping -n -c 1 $ip");
+      $machine->succeed("curl --fail http://$ip/ > /dev/null");
+
+      "${containerIp6}" =~ /([^\/]+)\/([0-9+])/;
+      my $ip6 = $1;
+      chomp $ip6;
+      $machine->succeed("ping6 -n -c 1 $ip6");
+      $machine->succeed("curl --fail http://[$ip6]/ > /dev/null");
+
+      # Stop the container.
+      $machine->succeed("nixos-container stop webserver");
+      $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null");
+      $machine->fail("curl --fail --connect-timeout 2 http://[$ip6]/ > /dev/null");
+
+      # Destroying a declarative container should fail.
+      $machine->fail("nixos-container destroy webserver");
+    '';
+
+})
diff --git a/nixos/tests/containers-ipv6.nix b/nixos/tests/containers-ipv6.nix
new file mode 100644
index 00000000000..0c1b8e88564
--- /dev/null
+++ b/nixos/tests/containers-ipv6.nix
@@ -0,0 +1,61 @@
+# Test for NixOS' container support.
+
+let
+  hostIp = "fc00::2";
+  localIp = "fc00::1";
+in
+
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "containers-ipv6";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ aristid aszlig eelco chaoflow ];
+  };
+
+  machine =
+    { config, pkgs, ... }:
+    { imports = [ ../modules/installer/cd-dvd/channel.nix ];
+      virtualisation.writableStore = true;
+      virtualisation.memorySize = 768;
+
+      containers.webserver =
+        { privateNetwork = true;
+          hostAddress6 = hostIp;
+          localAddress6 = localIp;
+          config =
+            { services.httpd.enable = true;
+              services.httpd.adminAddr = "foo@example.org";
+              networking.firewall.allowedTCPPorts = [ 80 ];
+              networking.firewall.allowPing = true;
+            };
+        };
+
+      virtualisation.pathsInNixDB = [ pkgs.stdenv ];
+    };
+
+  testScript =
+    ''
+      $machine->waitForUnit("default.target");
+      $machine->succeed("nixos-container list") =~ /webserver/ or die;
+
+      # Start the webserver container.
+      $machine->succeed("nixos-container start webserver");
+
+      # wait two seconds for the container to start and the network to be up
+      sleep 2;
+
+      # Since "start" returns after the container has reached
+      # multi-user.target, we should now be able to access it.
+      my $ip = "${localIp}";
+      chomp $ip;
+      $machine->succeed("ping6 -n -c 1 $ip");
+      $machine->succeed("curl --fail http://[$ip]/ > /dev/null");
+
+      # Stop the container.
+      $machine->succeed("nixos-container stop webserver");
+      $machine->fail("curl --fail --connect-timeout 2 http://[$ip]/ > /dev/null");
+
+      # Destroying a declarative container should fail.
+      $machine->fail("nixos-container destroy webserver");
+    '';
+
+})
diff --git a/nixos/tests/containers.nix b/nixos/tests/containers.nix
index ce36a7e0588..108feba0891 100644
--- a/nixos/tests/containers.nix
+++ b/nixos/tests/containers.nix
@@ -34,11 +34,14 @@ import ./make-test.nix ({ pkgs, ...} : {
       # Start the webserver container.
       $machine->succeed("nixos-container start webserver");
 
+      # wait two seconds for the container to start and the network to be up
+      sleep 2;
+
       # Since "start" returns after the container has reached
       # multi-user.target, we should now be able to access it.
       my $ip = $machine->succeed("nixos-container show-ip webserver");
       chomp $ip;
-      #$machine->succeed("ping -c1 $ip"); # FIXME
+      $machine->succeed("ping -n -c1 $ip");
       $machine->succeed("curl --fail http://$ip/ > /dev/null");
 
       # Stop the container.

From 2d6a2b41313464ba82297c4f6e86c7026c7d132e Mon Sep 17 00:00:00 2001
From: Arnold Krille <arnold@arnoldarts.de>
Date: Fri, 18 Mar 2016 15:29:45 +0100
Subject: [PATCH 004/712] containers tests: Distinguish declarative and
 imperative containers

---
 nixos/release.nix                             |  3 +-
 ...ntainers.nix => containers-imperative.nix} | 37 +------------
 nixos/tests/containers-ipv4.nix               | 55 +++++++++++++++++++
 3 files changed, 58 insertions(+), 37 deletions(-)
 rename nixos/tests/{containers.nix => containers-imperative.nix} (68%)
 create mode 100644 nixos/tests/containers-ipv4.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 2dc1b21daaf..7ef4ca8f934 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -199,9 +199,10 @@ in rec {
   tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; });
   tests.chromium = callSubTests tests/chromium.nix {};
   tests.cjdns = callTest tests/cjdns.nix {};
-  tests.containers = callTest tests/containers.nix {};
+  tests.containers-ipv4 = callTest tests/containers-ipv4.nix {};
   tests.containers-ipv6 = callTest tests/containers-ipv6.nix {};
   tests.containers-bridge = callTest tests/containers-bridge.nix {};
+  tests.containers-imperative = callTest tests/containers-imperative.nix {};
   tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; });
   tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; });
   tests.dnscrypt-proxy = callTest tests/dnscrypt-proxy.nix { system = "x86_64-linux"; };
diff --git a/nixos/tests/containers.nix b/nixos/tests/containers-imperative.nix
similarity index 68%
rename from nixos/tests/containers.nix
rename to nixos/tests/containers-imperative.nix
index 108feba0891..8d100fedf78 100644
--- a/nixos/tests/containers.nix
+++ b/nixos/tests/containers-imperative.nix
@@ -1,7 +1,7 @@
 # Test for NixOS' container support.
 
 import ./make-test.nix ({ pkgs, ...} : {
-  name = "containers";
+  name = "containers-imperative";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ aristid aszlig eelco chaoflow ];
   };
@@ -11,43 +11,11 @@ import ./make-test.nix ({ pkgs, ...} : {
     { imports = [ ../modules/installer/cd-dvd/channel.nix ];
       virtualisation.writableStore = true;
       virtualisation.memorySize = 768;
-
-      containers.webserver =
-        { privateNetwork = true;
-          hostAddress = "10.231.136.1";
-          localAddress = "10.231.136.2";
-          config =
-            { services.httpd.enable = true;
-              services.httpd.adminAddr = "foo@example.org";
-              networking.firewall.allowedTCPPorts = [ 80 ];
-              networking.firewall.allowPing = true;
-            };
-        };
-
       virtualisation.pathsInNixDB = [ pkgs.stdenv ];
     };
 
   testScript =
     ''
-      $machine->succeed("nixos-container list") =~ /webserver/ or die;
-
-      # Start the webserver container.
-      $machine->succeed("nixos-container start webserver");
-
-      # wait two seconds for the container to start and the network to be up
-      sleep 2;
-
-      # Since "start" returns after the container has reached
-      # multi-user.target, we should now be able to access it.
-      my $ip = $machine->succeed("nixos-container show-ip webserver");
-      chomp $ip;
-      $machine->succeed("ping -n -c1 $ip");
-      $machine->succeed("curl --fail http://$ip/ > /dev/null");
-
-      # Stop the container.
-      $machine->succeed("nixos-container stop webserver");
-      $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null");
-
       # Make sure we have a NixOS tree (required by ‘nixos-container create’).
       $machine->succeed("PAGER=cat nix-env -qa -A nixos.hello >&2");
 
@@ -114,9 +82,6 @@ import ./make-test.nix ({ pkgs, ...} : {
         # Ensure that the container path is gone
         "test ! -e /var/lib/containers/$id1"
       );
-
-      # Destroying a declarative container should fail.
-      $machine->fail("nixos-container destroy webserver");
     '';
 
 })
diff --git a/nixos/tests/containers-ipv4.nix b/nixos/tests/containers-ipv4.nix
new file mode 100644
index 00000000000..8f1ab40221a
--- /dev/null
+++ b/nixos/tests/containers-ipv4.nix
@@ -0,0 +1,55 @@
+# Test for NixOS' container support.
+
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "containers-ipv4";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ aristid aszlig eelco chaoflow ];
+  };
+
+  machine =
+    { config, pkgs, ... }:
+    { imports = [ ../modules/installer/cd-dvd/channel.nix ];
+      virtualisation.writableStore = true;
+      virtualisation.memorySize = 768;
+
+      containers.webserver =
+        { privateNetwork = true;
+          hostAddress = "10.231.136.1";
+          localAddress = "10.231.136.2";
+          config =
+            { services.httpd.enable = true;
+              services.httpd.adminAddr = "foo@example.org";
+              networking.firewall.allowedTCPPorts = [ 80 ];
+              networking.firewall.allowPing = true;
+            };
+        };
+
+      virtualisation.pathsInNixDB = [ pkgs.stdenv ];
+    };
+
+  testScript =
+    ''
+      $machine->succeed("nixos-container list") =~ /webserver/ or die;
+
+      # Start the webserver container.
+      $machine->succeed("nixos-container start webserver");
+
+      # wait two seconds for the container to start and the network to be up
+      sleep 2;
+
+      # Since "start" returns after the container has reached
+      # multi-user.target, we should now be able to access it.
+      my $ip = $machine->succeed("nixos-container show-ip webserver");
+      chomp $ip;
+      $machine->succeed("ping -n -c1 $ip");
+      $machine->succeed("curl --fail http://$ip/ > /dev/null");
+
+      # Stop the container.
+      $machine->succeed("nixos-container stop webserver");
+      $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null");
+
+      # Destroying a declarative container should fail.
+      $machine->fail("nixos-container destroy webserver");
+    '';
+
+})

From 3c819f28f57ee1485f15faf917f2fc6a861a6883 Mon Sep 17 00:00:00 2001
From: Arnold Krille <arnold@arnoldarts.de>
Date: Sat, 2 Apr 2016 17:03:30 +0200
Subject: [PATCH 005/712] containers: Make declarative containers real systemd
 services

Without the templating (which is still present for imperative containers), it
will be possible to set individual dependencies. Like depending on the network
only if the hostbridge or hardware interfaces are used.

Ported from #3021
---
 nixos/modules/virtualisation/containers.nix | 307 ++++++++++----------
 1 file changed, 147 insertions(+), 160 deletions(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 4c20ee27de2..fca21a8610b 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -278,167 +278,180 @@ in
   };
 
 
-  config = mkIf (config.boot.enableContainers) {
+  config = mkIf (config.boot.enableContainers) (let
 
-    systemd.services."container@" =
-      { description = "Container '%i'";
+    unit = {
+      description = "Container '%i'";
 
-        unitConfig.RequiresMountsFor = [ "/var/lib/containers/%i" ];
+      unitConfig.RequiresMountsFor = [ "/var/lib/containers/%i" ];
 
-        path = [ pkgs.iproute ];
+      path = [ pkgs.iproute ];
 
-        environment.INSTANCE = "%i";
-        environment.root = "/var/lib/containers/%i";
+      environment.INSTANCE = "%i";
+      environment.root = "/var/lib/containers/%i";
 
-        preStart =
-          ''
-            # Clean up existing machined registration and interfaces.
-            machinectl terminate "$INSTANCE" 2> /dev/null || true
+      preStart =
+        ''
+          # Clean up existing machined registration and interfaces.
+          machinectl terminate "$INSTANCE" 2> /dev/null || true
 
-            if [ "$PRIVATE_NETWORK" = 1 ]; then
-              ip link del dev "ve-$INSTANCE" 2> /dev/null || true
-              ip link del dev "vb-$INSTANCE" 2> /dev/null || true
+          if [ "$PRIVATE_NETWORK" = 1 ]; then
+            ip link del dev "ve-$INSTANCE" 2> /dev/null || true
+            ip link del dev "vb-$INSTANCE" 2> /dev/null || true
+          fi
+       '';
+
+      script =
+        ''
+          mkdir -p -m 0755 "$root/etc" "$root/var/lib"
+          mkdir -p -m 0700 "$root/var/lib/private" "$root/root" /run/containers
+          if ! [ -e "$root/etc/os-release" ]; then
+            touch "$root/etc/os-release"
+          fi
+
+          mkdir -p -m 0755 \
+            "/nix/var/nix/profiles/per-container/$INSTANCE" \
+            "/nix/var/nix/gcroots/per-container/$INSTANCE"
+
+          cp --remove-destination /etc/resolv.conf "$root/etc/resolv.conf"
+
+          if [ "$PRIVATE_NETWORK" = 1 ]; then
+            extraFlags+=" --network-veth"
+            if [ -n "$HOST_BRIDGE" ]; then
+              extraFlags+=" --network-bridge=$HOST_BRIDGE"
             fi
-         '';
+          fi
 
-        script =
-          ''
-            mkdir -p -m 0755 "$root/etc" "$root/var/lib"
-            mkdir -p -m 0700 "$root/var/lib/private" "$root/root" /run/containers
-            if ! [ -e "$root/etc/os-release" ]; then
-              touch "$root/etc/os-release"
+          for iface in $INTERFACES; do
+            extraFlags+=" --network-interface=$iface"
+          done
+
+          for iface in $MACVLANS; do
+            extraFlags+=" --network-macvlan=$iface"
+          done
+
+          # If the host is 64-bit and the container is 32-bit, add a
+          # --personality flag.
+          ${optionalString (config.nixpkgs.system == "x86_64-linux") ''
+            if [ "$(< ''${SYSTEM_PATH:-/nix/var/nix/profiles/per-container/$INSTANCE/system}/system)" = i686-linux ]; then
+              extraFlags+=" --personality=x86"
             fi
+          ''}
 
-            mkdir -p -m 0755 \
-              "/nix/var/nix/profiles/per-container/$INSTANCE" \
-              "/nix/var/nix/gcroots/per-container/$INSTANCE"
 
-            cp --remove-destination /etc/resolv.conf "$root/etc/resolv.conf"
 
-            if [ "$PRIVATE_NETWORK" = 1 ]; then
-              extraFlags+=" --network-veth"
-              if [ -n "$HOST_BRIDGE" ]; then
-                extraFlags+=" --network-bridge=$HOST_BRIDGE"
+          # Run systemd-nspawn without startup notification (we'll
+          # wait for the container systemd to signal readiness).
+          EXIT_ON_REBOOT=1 NOTIFY_SOCKET= \
+          exec ${config.systemd.package}/bin/systemd-nspawn \
+            --keep-unit \
+            -M "$INSTANCE" -D "$root" $extraFlags \
+            $EXTRA_NSPAWN_FLAGS \
+            --bind-ro=/nix/store \
+            --bind-ro=/nix/var/nix/db \
+            --bind-ro=/nix/var/nix/daemon-socket \
+            --bind=/run/systemd/notify:/var/lib/private/host-notify \
+            --bind="/nix/var/nix/profiles/per-container/$INSTANCE:/nix/var/nix/profiles" \
+            --bind="/nix/var/nix/gcroots/per-container/$INSTANCE:/nix/var/nix/gcroots" \
+            --setenv PRIVATE_NETWORK="$PRIVATE_NETWORK" \
+            --setenv HOST_BRIDGE="$HOST_BRIDGE" \
+            --setenv HOST_ADDRESS="$HOST_ADDRESS" \
+            --setenv LOCAL_ADDRESS="$LOCAL_ADDRESS" \
+            --setenv HOST_ADDRESS6="$HOST_ADDRESS6" \
+            --setenv LOCAL_ADDRESS6="$LOCAL_ADDRESS6" \
+            --setenv PATH="$PATH" \
+            ${containerInit} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init"
+        '';
+
+      postStart =
+        ''
+          if [ "$PRIVATE_NETWORK" = 1 ]; then
+            if [ -z "$HOST_BRIDGE" ]; then
+              ifaceHost=ve-$INSTANCE
+              ip link set dev $ifaceHost up
+              if [ -n "$HOST_ADDRESS" ]; then
+                ip addr add $HOST_ADDRESS dev $ifaceHost
+              fi
+              if [ -n "$HOST_ADDRESS6" ]; then
+                ip -6 addr add $HOST_ADDRESS6 dev $ifaceHost
+              fi
+              if [ -n "$LOCAL_ADDRESS" ]; then
+                ip route add $LOCAL_ADDRESS dev $ifaceHost
+              fi
+              if [ -n "$LOCAL_ADDRESS6" ]; then
+                ip -6 route add $LOCAL_ADDRESS6 dev $ifaceHost
               fi
             fi
+          fi
 
-            for iface in $INTERFACES; do
-              extraFlags+=" --network-interface=$iface"
-            done
+          # Get the leader PID so that we can signal it in
+          # preStop. We can't use machinectl there because D-Bus
+          # might be shutting down. FIXME: in systemd 219 we can
+          # just signal systemd-nspawn to do a clean shutdown.
+          machinectl show "$INSTANCE" | sed 's/Leader=\(.*\)/\1/;t;d' > "/run/containers/$INSTANCE.pid"
+        '';
 
-            for iface in $MACVLANS; do
-              extraFlags+=" --network-macvlan=$iface"
-            done
+      preStop =
+        ''
+          pid="$(cat /run/containers/$INSTANCE.pid)"
+          if [ -n "$pid" ]; then
+            kill -RTMIN+4 "$pid"
+          fi
+          rm -f "/run/containers/$INSTANCE.pid"
+        '';
 
-            # If the host is 64-bit and the container is 32-bit, add a
-            # --personality flag.
-            ${optionalString (config.nixpkgs.system == "x86_64-linux") ''
-              if [ "$(< ''${SYSTEM_PATH:-/nix/var/nix/profiles/per-container/$INSTANCE/system}/system)" = i686-linux ]; then
-                extraFlags+=" --personality=x86"
-              fi
-            ''}
+      restartIfChanged = false;
 
-
-
-            # Run systemd-nspawn without startup notification (we'll
-            # wait for the container systemd to signal readiness).
-            EXIT_ON_REBOOT=1 NOTIFY_SOCKET= \
-            exec ${config.systemd.package}/bin/systemd-nspawn \
-              --keep-unit \
-              -M "$INSTANCE" -D "$root" $extraFlags \
-              $EXTRA_NSPAWN_FLAGS \
-              --bind-ro=/nix/store \
-              --bind-ro=/nix/var/nix/db \
-              --bind-ro=/nix/var/nix/daemon-socket \
-              --bind=/run/systemd/notify:/var/lib/private/host-notify \
-              --bind="/nix/var/nix/profiles/per-container/$INSTANCE:/nix/var/nix/profiles" \
-              --bind="/nix/var/nix/gcroots/per-container/$INSTANCE:/nix/var/nix/gcroots" \
-              --setenv PRIVATE_NETWORK="$PRIVATE_NETWORK" \
-              --setenv HOST_BRIDGE="$HOST_BRIDGE" \
-              --setenv HOST_ADDRESS="$HOST_ADDRESS" \
-              --setenv LOCAL_ADDRESS="$LOCAL_ADDRESS" \
-              --setenv HOST_ADDRESS6="$HOST_ADDRESS6" \
-              --setenv LOCAL_ADDRESS6="$LOCAL_ADDRESS6" \
-              --setenv PATH="$PATH" \
-              ${containerInit} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init"
-          '';
-
-        postStart =
+      serviceConfig = {
+        ExecReload = pkgs.writeScript "reload-container"
           ''
-            if [ "$PRIVATE_NETWORK" = 1 ]; then
-              if [ -z "$HOST_BRIDGE" ]; then
-                ifaceHost=ve-$INSTANCE
-                ip link set dev $ifaceHost up
-                if [ -n "$HOST_ADDRESS" ]; then
-                  ip addr add $HOST_ADDRESS dev $ifaceHost
-                fi
-                if [ -n "$HOST_ADDRESS6" ]; then
-                  ip -6 addr add $HOST_ADDRESS6 dev $ifaceHost
-                fi
-                if [ -n "$LOCAL_ADDRESS" ]; then
-                  ip route add $LOCAL_ADDRESS dev $ifaceHost
-                fi
-                if [ -n "$LOCAL_ADDRESS6" ]; then
-                  ip -6 route add $LOCAL_ADDRESS6 dev $ifaceHost
-                fi
-              fi
-            fi
-
-            # Get the leader PID so that we can signal it in
-            # preStop. We can't use machinectl there because D-Bus
-            # might be shutting down. FIXME: in systemd 219 we can
-            # just signal systemd-nspawn to do a clean shutdown.
-            machinectl show "$INSTANCE" | sed 's/Leader=\(.*\)/\1/;t;d' > "/run/containers/$INSTANCE.pid"
+            #! ${pkgs.stdenv.shell} -e
+            ${nixos-container}/bin/nixos-container run "$INSTANCE" -- \
+              bash --login -c "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/bin/switch-to-configuration test"
           '';
 
-        preStop =
-          ''
-            pid="$(cat /run/containers/$INSTANCE.pid)"
-            if [ -n "$pid" ]; then
-              kill -RTMIN+4 "$pid"
-            fi
-            rm -f "/run/containers/$INSTANCE.pid"
-          '';
+        SyslogIdentifier = "container %i";
 
-        restartIfChanged = false;
-        #reloadIfChanged = true; # FIXME
+        EnvironmentFile = "-/etc/containers/%i.conf";
 
-        wants = [ "netwprk.target" ];
-        after = [ "network.target" ];
+        Type = "notify";
 
-        serviceConfig = {
-          ExecReload = pkgs.writeScript "reload-container"
-            ''
-              #! ${pkgs.stdenv.shell} -e
-              ${nixos-container}/bin/nixos-container run "$INSTANCE" -- \
-                bash --login -c "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/bin/switch-to-configuration test"
-            '';
+        NotifyAccess = "all";
 
-          SyslogIdentifier = "container %i";
+        # Note that on reboot, systemd-nspawn returns 133, so this
+        # unit will be restarted. On poweroff, it returns 0, so the
+        # unit won't be restarted.
+        RestartForceExitStatus = "133";
+        SuccessExitStatus = "133";
 
-          EnvironmentFile = "-/etc/containers/%i.conf";
+        Restart = "on-failure";
 
-          Type = "notify";
-
-          NotifyAccess = "all";
-
-          # Note that on reboot, systemd-nspawn returns 133, so this
-          # unit will be restarted. On poweroff, it returns 0, so the
-          # unit won't be restarted.
-          RestartForceExitStatus = "133";
-          SuccessExitStatus = "133";
-
-          Restart = "on-failure";
-
-          # Hack: we don't want to kill systemd-nspawn, since we call
-          # "machinectl poweroff" in preStop to shut down the
-          # container cleanly. But systemd requires sending a signal
-          # (at least if we want remaining processes to be killed
-          # after the timeout). So send an ignored signal.
-          KillMode = "mixed";
-          KillSignal = "WINCH";
-        };
+        # Hack: we don't want to kill systemd-nspawn, since we call
+        # "machinectl poweroff" in preStop to shut down the
+        # container cleanly. But systemd requires sending a signal
+        # (at least if we want remaining processes to be killed
+        # after the timeout). So send an ignored signal.
+        KillMode = "mixed";
+        KillSignal = "WINCH";
       };
+    };
+  in {
+    systemd.services = listToAttrs (filter (x: x.value != null) (
+      # The generic container template used by imperative containers
+      [{ name = "container@"; value = unit; }]
+      # declarative containers
+      ++ (mapAttrsToList (name: cfg: nameValuePair "container@${name}" (
+        if cfg.autoStart then
+          unit // {
+            wantedBy = [ "multi-user.target" ];
+            wants = [ "network.target" ];
+            after = [ "network.target" ];
+            restartTriggers = [ cfg.path ];
+            reloadIfChanged = true;
+          }
+        else null
+      )) config.containers)
+    ));
 
     # Generate a configuration file in /etc/containers for each
     # container so that container@.target can get the container
@@ -482,31 +495,5 @@ in
     networking.dhcpcd.denyInterfaces = [ "ve-*" ];
 
     environment.systemPackages = [ nixos-container ];
-
-    # Start containers at boot time.
-    systemd.services.all-containers =
-      { description = "All Containers";
-
-        wantedBy = [ "multi-user.target" ];
-
-        unitConfig.ConditionDirectoryNotEmpty = "/etc/containers";
-
-        serviceConfig.Type = "oneshot";
-
-        script =
-          ''
-            res=0
-            shopt -s nullglob
-            for i in /etc/containers/*.conf; do
-              AUTO_START=
-              source "$i"
-              if [ "$AUTO_START" = 1 ]; then
-                systemctl start "container@$(basename "$i" .conf).service" || res=1
-              fi
-            done
-            exit $res
-          ''; # */
-      };
-
-  };
+  });
 }

From d3ab51674ccc8a06d6bbd67b97eb104936986649 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 8 Apr 2016 12:49:37 +0200
Subject: [PATCH 006/712] beancount: init at
 2016-04-10-b5721f1c6f01bd168a5781652e5e3167f7f8ceb3

---
 .../applications/office/beancount/default.nix | 43 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/applications/office/beancount/default.nix

diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix
new file mode 100644
index 00000000000..8811183dfc8
--- /dev/null
+++ b/pkgs/applications/office/beancount/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchhg, pkgs, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+  version = "2016-04-10-b5721f1c6f01bd168a5781652e5e3167f7f8ceb3";
+  name = "beancount-${version}";
+  namePrefix = "";
+
+  src = fetchhg {
+    url = "https://bitbucket.org/blais/beancount";
+    rev = "b5721f1c6f01bd168a5781652e5e3167f7f8ceb3";
+    sha256 = "10nv3p9cix7yp23a9hnq5163rpl8cfs3hv75h90ld57dc24nxzn2";
+  };
+
+  buildInputs = with pythonPackages; [ nose ];
+
+  checkPhase = ''
+    nosetests $out
+  '';
+
+  propagatedBuildInputs = with pythonPackages; [
+    beautifulsoup4
+    bottle
+    chardet
+    dateutil
+    google_api_python_client
+    lxml
+    ply
+    python_magic
+  ];
+
+  meta = {
+    homepage = http://furius.ca/beancount/;
+    description = "double-entry bookkeeping computer language";
+    longDescription = ''
+        A double-entry bookkeeping computer language that lets you define
+        financial transaction records in a text file, read them in memory,
+        generate a variety of reports from them, and provides a web interface.
+    '';
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dfb1d258ba3..1464a93d23e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14585,6 +14585,10 @@ in
 
   bastet = callPackage ../games/bastet {};
 
+  beancount = callPackage ../applications/office/beancount {
+      pythonPackages = python3Packages;
+  };
+
   beret = callPackage ../games/beret { };
 
   bitsnbots = callPackage ../games/bitsnbots {

From 52e699dcdfed6c839e6016d767b73c8587ec27fb Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 11 Apr 2016 16:48:01 +0300
Subject: [PATCH 007/712] ogre: don't build with nvigia-cg and samples by
 default, add flags

---
 pkgs/development/libraries/ogre/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix
index 89d694cc497..aba02827665 100644
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@@ -1,11 +1,12 @@
-{ fetchurl, stdenv
+{ fetchurl, stdenv, lib
 , cmake, mesa
 , freetype, freeimage, zziplib, randrproto, libXrandr
 , libXaw, freeglut, libXt, libpng, boost, ois
 , xproto, libX11, libXmu, libSM, pkgconfig
 , libXxf86vm, xf86vidmodeproto, libICE
 , renderproto, libXrender
-, nvidia_cg_toolkit }:
+, withNvidiaCg ? false, nvidia_cg_toolkit
+, withSamples ? false }:
 
 stdenv.mkDerivation {
   name = "ogre-1.9-hg-20160322";
@@ -15,10 +16,10 @@ stdenv.mkDerivation {
      sha256 = "0w3argjy1biaxwa3c80zxxgll67wjp8czd83p87awlcvwzdk5mz9";
   };
 
-  cmakeFlags = [ "-DOGRE_INSTALL_SAMPLES=yes" ]
-    ++ (map (x: "-DOGRE_BUILD_PLUGIN_${x}=on")
-            [ "BSP" "CG" "OCTREE" "PCZ" "PFX" ])
-    ++ (map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]);
+  cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ]
+    ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on")
+           ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")
+    ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ];
 
   enableParallelBuilding = true;
 
@@ -29,8 +30,7 @@ stdenv.mkDerivation {
      xproto libX11 libXmu libSM pkgconfig
      libXxf86vm xf86vidmodeproto libICE
      renderproto libXrender
-     nvidia_cg_toolkit
-   ];
+   ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;
 
   meta = {
     description = "A 3D engine";

From 5a2563c059309c0600404ce69f06a235fb717e4f Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Mon, 11 Apr 2016 15:00:09 -0400
Subject: [PATCH 008/712] theano: init at 0.8.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c14372ea99b..d10a64c588d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20085,6 +20085,36 @@ in modules // {
     };
   };
 
+  Theano = buildPythonPackage rec {
+    name = "Theano-0.8.1";
+
+    disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3");
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/T/Theano/${name}.tar.gz";
+      sha256 = "17dikk94r8bzkxg976srqlhj5c7phs9gl837iabyfdpixkbrl79g";
+    };
+
+    #preCheck = ''
+    #  mkdir -p check-phase
+    #  export HOME=$(pwd)/check-phase
+    #'';
+    doCheck = false;
+    # takes far too long, also throws "TypeError: sort() missing 1 required positional argument: 'a'"
+    # when run from the installer, and testing with Python 3.5 hits github.com/Theano/Theano/issues/4276,
+    # the fix for which hasn't been merged yet.
+
+    # keep Nose around since running the tests by hand is possible from Python or bash
+    propagatedBuildInputs = [ stdenv pkgs.blas ] ++ (with self; [ nose numpy pydot_ng scipy six ]);
+
+    meta = {
+      homepage = http://deeplearning.net/software/theano/;
+      description = "A Python library for large-scale array computation";
+      license = stdenv.lib.licenses.bsd3;
+      maintainers = [ maintainers.bcdarwin ];
+    };
+  };
+
   tidylib = buildPythonPackage rec {
     version = "0.2.4";
     name = "pytidylib-${version}";

From 9eced61d2adbb61ee8e0f446775728d032078dcb Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Tue, 12 Apr 2016 11:43:43 +0200
Subject: [PATCH 009/712] git: respect $SSL_CERT_FILE

This allows git to work on systems without
/etc/ssl/certs/ca-certificates.crt, such as OS X, instead of failing
with "error setting certificate verify locations".
---
 .../version-management/git-and-tools/git/default.nix  |  1 +
 .../git-and-tools/git/ssl-cert-file.patch             | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 4f41ffb916e..082a791a69c 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation {
     ./symlinks-in-bin.patch
     ./git-sh-i18n.patch
     ./ssh-path.patch
+    ./ssl-cert-file.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch b/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch
new file mode 100644
index 00000000000..bafd65e8c93
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch
@@ -0,0 +1,11 @@
+diff -ru git-2.7.4-orig/http.c git-2.7.4/http.c
+--- git-2.7.4-orig/http.c	2016-03-17 21:47:59.000000000 +0100
++++ git-2.7.4/http.c	2016-04-12 11:38:33.187070848 +0200
+@@ -544,6 +544,7 @@
+ #if LIBCURL_VERSION_NUM >= 0x070908
+ 	set_from_env(&ssl_capath, "GIT_SSL_CAPATH");
+ #endif
++	set_from_env(&ssl_cainfo, "SSL_CERT_FILE");
+ 	set_from_env(&ssl_cainfo, "GIT_SSL_CAINFO");
+ 
+ 	set_from_env(&user_agent, "GIT_HTTP_USER_AGENT");

From 41f170f439e95f432b5df86db2383c4939f722c9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 11 Apr 2016 18:29:00 +0200
Subject: [PATCH 010/712] nixos/doc: Allow refs from options to the manual

My first attempt to do this was to just use a conditional <refsection/>
in order to not create exact references in the manpage but create the
reference in the HTML manual, as suggested by @edolstra on IRC.

Later I went on to use <olink/> to reference sections of the manual, but
in order to do that, we need to overhaul how we generate the manual and
manpages.

So, that's where we are now:

There is a new derivation called "manual-olinkdb", which is the olinkdb
for the HTML manual, which in turn creates the olinkdb.xml file and the
manual.db. The former contains the targetdoc references and the latter
the specific targetptr elements.

The reason why I included the olinkdb.xml verbatim is that first of all
the DTD is dependent on the Docbook XSL sources and the references
within the olinkdb.xml entities are relative to the current directory.

So using a store path for that would end up searching for the manual.db
directly in /nix/store/manual.db.

Unfortunately, the <olinks/> that end up in the output file are
relative, so for example if you're clicking on one of these within the
PDF, the URL is searched in the current directory.

However, the sections from the olink's text are still valid, so we could
use an alternative URL for that in the future.

The manual doesn't contain any links, so even referencing the relative
URL shouldn't do any harm.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @edolstra
---
 nixos/doc/manual/default.nix | 75 +++++++++++++++++++++++++++++-------
 1 file changed, 62 insertions(+), 13 deletions(-)

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 69da1f94882..92b76bdb1f0 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -73,6 +73,63 @@ let
       </toc>
     '';
 
+  manualXsltprocOptions = toString [
+    "--param section.autolabel 1"
+    "--param section.label.includes.component.label 1"
+    "--stringparam html.stylesheet style.css"
+    "--param xref.with.number.and.title 1"
+    "--param toc.section.depth 3"
+    "--stringparam admon.style ''"
+    "--stringparam callout.graphics.extension .gif"
+    "--stringparam current.docid manual"
+    "--param chunk.section.depth 0"
+    "--param chunk.first.sections 1"
+    "--param use.id.as.filename 1"
+    "--stringparam generate.toc 'book toc appendix toc'"
+    "--stringparam chunk.toc ${toc}"
+  ];
+
+  olinkDB = stdenv.mkDerivation {
+    name = "manual-olinkdb";
+
+    inherit sources;
+
+    buildInputs = [ libxml2 libxslt ];
+
+    buildCommand = ''
+      ${copySources}
+
+      xsltproc \
+        ${manualXsltprocOptions} \
+        --stringparam collect.xref.targets only \
+        --stringparam targets.filename "$out/manual.db" \
+        --nonet --xinclude \
+        ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl \
+        ./manual.xml
+
+      # Check the validity of the man pages sources.
+      xmllint --noout --nonet --xinclude --noxincludenode \
+        --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \
+        ./man-pages.xml
+
+      cat > "$out/olinkdb.xml" <<EOF
+      <?xml version="1.0" encoding="utf-8"?>
+      <!DOCTYPE targetset SYSTEM
+        "file://${docbook5_xsl}/xml/xsl/docbook/common/targetdatabase.dtd" [
+        <!ENTITY manualtargets SYSTEM "file://$out/manual.db">
+      ]>
+      <targetset>
+        <targetsetinfo>
+            Allows for cross-referencing olinks between the manpages
+            and the HTML/PDF manuals.
+        </targetsetinfo>
+
+        <document targetdoc="manual">&manualtargets;</document>
+      </targetset>
+      EOF
+    '';
+  };
+
 in rec {
 
   # The NixOS options in JSON format.
@@ -115,18 +172,8 @@ in rec {
       dst=$out/share/doc/nixos
       mkdir -p $dst
       xsltproc \
-        --param section.autolabel 1 \
-        --param section.label.includes.component.label 1 \
-        --stringparam html.stylesheet style.css \
-        --param xref.with.number.and.title 1 \
-        --param toc.section.depth 3 \
-        --stringparam admon.style "" \
-        --stringparam callout.graphics.extension .gif \
-        --param chunk.section.depth 0 \
-        --param chunk.first.sections 1 \
-        --param use.id.as.filename 1 \
-        --stringparam generate.toc "book toc appendix toc" \
-        --stringparam chunk.toc ${toc} \
+        ${manualXsltprocOptions} \
+        --stringparam target.database.document "${olinkDB}/olinkdb.xml" \
         --nonet --xinclude --output $dst/ \
         ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl ./manual.xml
 
@@ -158,6 +205,7 @@ in rec {
       dst=$out/share/doc/nixos
       mkdir -p $dst
       xmllint --xinclude manual.xml | dblatex -o $dst/manual.pdf - \
+        -P target.database.document="${olinkDB}/olinkdb.xml" \
         -P doc.collab.show=0 \
         -P latex.output.revhistory=0
 
@@ -177,7 +225,7 @@ in rec {
     buildCommand = ''
       ${copySources}
 
-      # Check the validity of the manual sources.
+      # Check the validity of the man pages sources.
       xmllint --noout --nonet --xinclude --noxincludenode \
         --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \
         ./man-pages.xml
@@ -189,6 +237,7 @@ in rec {
         --param man.output.base.dir "'$out/share/man/'" \
         --param man.endnotes.are.numbered 0 \
         --param man.break.after.slash 1 \
+        --stringparam target.database.document "${olinkDB}/olinkdb.xml" \
         ${docbook5_xsl}/xml/xsl/docbook/manpages/docbook.xsl \
         ./man-pages.xml
     '';

From 52fb00535e8e721784cb5103915697fd3e8abed1 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Thu, 14 Apr 2016 17:31:04 -0400
Subject: [PATCH 011/712] frameworks: GL is undefined

The GLUT frameworks is currently a Nix evaluation error.
---
 pkgs/os-specific/darwin/apple-sdk/frameworks.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
index 750adfe3cbf..3ecb3511422 100644
--- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
@@ -48,7 +48,7 @@ with frameworks; with libs; {
   ForceFeedback           = [ CF IOKit ];
   Foundation              = [ CF libobjc Security ApplicationServices SystemConfiguration ];
   GLKit                   = [ CF ];
-  GLUT                    = [ GL OpenGL ];
+  GLUT                    = [ OpenGL ];
   GSS                     = [];
   GameController          = [];
   GameKit                 = [ Foundation ];

From f270af1acd52e01f76295def42302bb8535f9c58 Mon Sep 17 00:00:00 2001
From: Christoph Ruegge <c.ruegge@math.uni-goettingen.de>
Date: Thu, 14 Apr 2016 11:28:10 +0200
Subject: [PATCH 012/712] xsession: Update DBus activation environment

`dbus-launch` is executed early in the script, before desktop managers
had a chance to setup the environment. If DBus activation is used,
applications launched by this may therefore lack necessary environment
variables. This patch sends the complete environment to DBus after
launching the desktop manager.
---
 nixos/modules/services/x11/display-managers/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index be634fc259a..ff78964e553 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -126,6 +126,14 @@ let
         (*) echo "$0: Desktop manager '$desktopManager' not found.";;
       esac
 
+      ${optionalString cfg.startDbusSession ''
+        ${pkgs.glib}/bin/gdbus call --session \
+          --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus \
+          --method org.freedesktop.DBus.UpdateActivationEnvironment \
+          "{$(env | ${pkgs.gnused}/bin/sed "s/'/\\\\'/g; s/\([^=]*\)=\(.*\)/'\1':'\2'/" \
+                  | ${pkgs.coreutils}/bin/paste -sd,)}"
+      ''}
+
       test -n "$waitPID" && wait "$waitPID"
       exit 0
     '';

From 970d80b0ff5390e97ce72f0ff576cd088e57d9b0 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Fri, 11 Mar 2016 15:10:10 -0500
Subject: [PATCH 013/712] cf-private: fix CFLAGS surgery

The previous version could produce unparseable flags.
---
 pkgs/os-specific/darwin/cf-private/setup-hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/cf-private/setup-hook.sh b/pkgs/os-specific/darwin/cf-private/setup-hook.sh
index 7594c07977b..ae9ed5d1584 100644
--- a/pkgs/os-specific/darwin/cf-private/setup-hook.sh
+++ b/pkgs/os-specific/darwin/cf-private/setup-hook.sh
@@ -1,5 +1,5 @@
 prependSearchPath() {
-  NIX_CFLAGS_COMPILE="-F@out@/Library/Frameworks ${NIX_CFLAGS_COMPILE/"-F@out@/Library/Frameworks"/}"
+  NIX_CFLAGS_COMPILE="-F@out@/Library/Frameworks ${NIX_CFLAGS_COMPILE}"
 }
 
 linkWithRealCF() {

From ca1d46f98a71d3b21de0b9a30f759a7af2514f61 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Fri, 11 Mar 2016 15:11:02 -0500
Subject: [PATCH 014/712] ApplicationServices: add CoreGraphics child

The AVFoundation framework uses a relative path that presumes that
CoreGraphics is a child framework of ApplicationServices. It is not in
the 10.9 SDK.

This patch makes it one by tweaking the framework derivation generator
with special support to address this problem.
---
 pkgs/os-specific/darwin/apple-sdk/default.nix | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index c18d3f6cc6d..c1e09c20111 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -66,7 +66,18 @@ let
         mkdir -p "$dest"
         pushd "$dest" >/dev/null
 
-        cp -R "${sdk}/Library/Frameworks/$path/Versions/$current/Headers" .
+        # Keep track of if this is a child or a child rescue as with
+        # ApplicationServices in the 10.9 SDK
+        local isChild
+
+        if [ -d "${sdk}/Library/Frameworks/$path/Versions/$current/Headers" ]; then
+          isChild=1
+          cp -R "${sdk}/Library/Frameworks/$path/Versions/$current/Headers" .
+        else
+          isChild=0
+          current="$(readlink "/System/Library/Frameworks/$name.framework/Versions/Current")"
+          cp -R "${sdk}/Library/Frameworks/$name.framework/Versions/$current/Headers" .
+        fi
         ln -s -L "/System/Library/Frameworks/$path/Versions/$current/$name"
         ln -s -L "/System/Library/Frameworks/$path/Versions/$current/Resources"
 
@@ -74,8 +85,17 @@ let
           ln -s "/System/Library/Frameworks/$path/module.map"
         fi
 
-        pushd "${sdk}/Library/Frameworks/$path/Versions/$current" >/dev/null
+        if [ $isChild -eq 1 ]; then
+          pushd "${sdk}/Library/Frameworks/$path/Versions/$current" >/dev/null
+        else
+          pushd "${sdk}/Library/Frameworks/$name.framework/Versions/$current" >/dev/null
+        fi
         local children=$(echo Frameworks/*.framework)
+        if [ "$name" == "ApplicationServices" ]; then
+          # Fixing up ApplicationServices which is missing
+          # CoreGraphics in the 10.9 SDK
+          children="$children Frameworks/CoreGraphics.framework"
+        fi
         popd >/dev/null
 
         for child in $children; do

From 184a3957e6a476e6f81abee552856861118ce85b Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Fri, 11 Mar 2016 15:12:55 -0500
Subject: [PATCH 015/712] ffmpeg-full: avfoundation indev support on darwin

Adds support for camera input devices on OS X.

This required fixing links in output libraries and executables to pull
in the system's CoreFoundation.framework rather than the open source CF
one.
---
 .../libraries/ffmpeg-full/default.nix         | 22 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  4 +++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 91974a31175..0f6ffe51d85 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -141,7 +141,7 @@
 /*
  *  Darwin frameworks
  */
-, Cocoa, CoreServices
+, Cocoa, CoreServices, AVFoundation, MediaToolbox, VideoDecodeAcceleration, CF
 }:
 
 /* Maintainer notes:
@@ -177,7 +177,7 @@
 
 let
   inherit (stdenv) isCygwin isFreeBSD isLinux;
-  inherit (stdenv.lib) optional optionals enableFeature;
+  inherit (stdenv.lib) optional optionals optionalString enableFeature;
 in
 
 /*
@@ -410,11 +410,25 @@ stdenv.mkDerivation rec {
     ++ optionals nonfreeLicensing [ faac fdk_aac openssl ]
     ++ optional ((isLinux || isFreeBSD) && libva != null) libva
     ++ optionals isLinux [ alsaLib libraw1394 libv4l ]
-    ++ optionals stdenv.isDarwin [ Cocoa CoreServices ];
+    ++ optionals stdenv.isDarwin [ Cocoa CoreServices AVFoundation MediaToolbox
+                                   VideoDecodeAcceleration ];
 
   # Build qt-faststart executable
   buildPhase = optional qtFaststartProgram ''make tools/qt-faststart'';
-  postInstall = optional qtFaststartProgram ''cp -a tools/qt-faststart $out/bin/'';
+
+  # Hacky framework patching technique borrowed from the phantomjs2 package
+  postInstall = optionalString qtFaststartProgram ''
+    cp -a tools/qt-faststart $out/bin/
+  '' + optionalString stdenv.isDarwin ''
+    FILES=($(ls $out/bin/*))
+    FILES+=($(ls $out/lib/*.dylib))
+    for f in ''${FILES[@]}; do
+      if [ ! -h "$f" ]; then
+        install_name_tool -change ${CF}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation "$f"
+      fi
+    done
+  '';
+
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e44ac3e0bb..5cf8a5b7448 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6705,7 +6705,9 @@ in
     vid-stab = if stdenv.isDarwin then null else vid-stab;
     x265 = if stdenv.isDarwin then null else x265;
     xavs = if stdenv.isDarwin then null else xavs;
-    inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices;
+    inherit (darwin) CF;
+    inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices AVFoundation
+                                          MediaToolbox VideoDecodeAcceleration;
   };
 
   ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { };

From f3536f8ca0d6e609fb7a73c546d5f0d88a023759 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 19 Apr 2016 18:05:40 +0200
Subject: [PATCH 016/712] cairo: build cairo-xlib even on Darwin

---
 pkgs/development/libraries/cairo/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 2e4821b3073..f6f0a0d3af7 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -32,8 +32,7 @@ stdenv.mkDerivation rec {
   ]);
 
   propagatedBuildInputs =
-    with xorg; [ libXext fontconfig expat freetype pixman zlib libpng ]
-    ++ optional (!stdenv.isDarwin) libXrender
+    with xorg; [ libXext fontconfig expat freetype pixman zlib libpng libXrender ]
     ++ optionals xcbSupport [ libxcb xcbutil ]
     ++ optional gobjectSupport glib
     ++ optional glSupport mesa_noglu

From b301b00b89327393cc1830e3e9aca09b4a2fd49b Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Tue, 19 Apr 2016 22:39:53 -0700
Subject: [PATCH 017/712] libinput: v1.2.2 -> v1.2.3

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

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 18dbd2de38b..2c29482227a 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -15,11 +15,11 @@ in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libinput-1.2.2";
+  name = "libinput-1.2.3";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "0rzkp37dnn4qnkx7v3hckx5ryv3lr0vl234pnk6z2vfq40v5pb08";
+    sha256 = "1wp937sn2dzqhrbl2bhapqb0pvybc80z8ynw7yfkm5ycl39skch9";
   };
 
   configureFlags = [

From fe901d1372cccd2dc04d5187c3366fabacc3f9c9 Mon Sep 17 00:00:00 2001
From: Tadas Barzdzius <tadas@barzdzius.lt>
Date: Wed, 20 Apr 2016 12:39:14 +0300
Subject: [PATCH 018/712] maintainers: add retrry to maintainers list

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 720824ee66e..1cdb3dd8d1a 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -294,6 +294,7 @@
   refnil = "Martin Lavoie <broemartino@gmail.com>";
   relrod = "Ricky Elrod <ricky@elrod.me>";
   renzo = "Renzo Carbonara <renzocarbonara@gmail.com>";
+  retrry = "Tadas Barzdžius <retrry@gmail.com>";
   rick68 = "Wei-Ming Yang <rick68@gmail.com>";
   rickynils = "Rickard Nilsson <rickynils@gmail.com>";
   rnhmjoj = "Michele Guerini Rocco <micheleguerinirocco@me.com>";

From 9450a6826f68b4ba18618bbb25368b95fceeae2f Mon Sep 17 00:00:00 2001
From: Tadas Barzdzius <tadas@barzdzius.lt>
Date: Wed, 20 Apr 2016 12:39:44 +0300
Subject: [PATCH 019/712] rustc: 1.7.0 -> 1.8.0

---
 pkgs/development/compilers/rustc/default.nix | 16 ++++++++--------
 pkgs/development/compilers/rustc/generic.nix |  5 +++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/rustc/default.nix b/pkgs/development/compilers/rustc/default.nix
index 61346f1b4e2..38d6cb0b6e7 100644
--- a/pkgs/development/compilers/rustc/default.nix
+++ b/pkgs/development/compilers/rustc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, callPackage }:
 
 callPackage ./generic.nix {
-  shortVersion = "1.7.0";
+  shortVersion = "1.8.0";
   isRelease = true;
   forceBundledLLVM = false;
   configureFlags = [ "--release-channel=stable" ];
-  srcSha = "05f4v6sfmvkwsv6a7jp9sxsm84s0gdvqyf2wwdi1ilg9k8nxzgd4";
+  srcSha = "1s03aymmhhrndq29sv9cs8s4p1sg8qvq8ds6lyp6s4ny8nyvdpzy";
 
   /* Rust is bootstrapped from an earlier built version. We need
   to fetch these earlier versions, which vary per platform.
@@ -15,12 +15,12 @@ callPackage ./generic.nix {
   for the tagged release and not a snapshot in the current HEAD.
   */
 
-  snapshotHashLinux686 = "a09c4a4036151d0cb28e265101669731600e01f2";
-  snapshotHashLinux64 = "97e2a5eb8904962df8596e95d6e5d9b574d73bf4";
-  snapshotHashDarwin686 = "ca52d2d3ba6497ed007705ee3401cf7efc136ca1";
-  snapshotHashDarwin64 = "3c44ffa18f89567c2b81f8d695e711c86d81ffc7";
-  snapshotDate = "2015-12-18";
-  snapshotRev = "3391630";
+  snapshotHashLinux686 = "5f194aa7628c0703f0fd48adc4ec7f3cc64b98c7";
+  snapshotHashLinux64 = "d29b7607d13d64078b6324aec82926fb493f59ba";
+  snapshotHashDarwin686 = "4c8e42dd649e247f3576bf9dfa273327b4907f9c";
+  snapshotHashDarwin64 = "411a41363f922d1d93fa62ff2fedf5c35e9cccb2";
+  snapshotDate = "2016-02-17";
+  snapshotRev = "4d3eebf";
 
   patches = [ ./patches/remove-uneeded-git.patch ]
     ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix
index 3f640076947..976c1b932b5 100644
--- a/pkgs/development/compilers/rustc/generic.nix
+++ b/pkgs/development/compilers/rustc/generic.nix
@@ -62,7 +62,7 @@ let version = if isRelease then
     meta = with stdenv.lib; {
       homepage = http://www.rust-lang.org/;
       description = "A safe, concurrent, practical language";
-      maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington ];
+      maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington retrry ];
       license = [ licenses.mit licenses.asl20 ];
       platforms = platforms.linux ++ platforms.darwin;
     };
@@ -164,7 +164,8 @@ with stdenv.lib; stdenv.mkDerivation {
   buildInputs = [ ncurses ]
     ++ optional (!forceBundledLLVM) llvmShared;
 
-  enableParallelBuilding = false; # missing files during linking, occasionally
+  # https://github.com/rust-lang/rust/issues/30181
+  # enableParallelBuilding = false; # missing files during linking, occasionally
 
   outputs = [ "out" "doc" ];
   setOutputFlags = false;

From 0649edd4321181f9314dadd23db812615e936d55 Mon Sep 17 00:00:00 2001
From: Tadas Barzdzius <tadas@barzdzius.lt>
Date: Wed, 20 Apr 2016 12:40:59 +0300
Subject: [PATCH 020/712] Heatseeker: 1.3.0 -> 1.4.0

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

diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix
index 0d85554c347..9183f1290ea 100644
--- a/pkgs/tools/misc/heatseeker/default.nix
+++ b/pkgs/tools/misc/heatseeker/default.nix
@@ -4,17 +4,17 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "heatseeker-${version}";
-  version = "1.3.0";
+  version = "1.4.0";
 
-  depsSha256 = "03jap7myf85xgx9270sws8x57nl04a1wx8szrk9qx24s9vnnjcnh";
+  depsSha256 = "1acimdkl6ra9jlyiydzzd6ccdygr5is2xf9gw8i45xzh0xnsq226";
 
   src = fetchFromGitHub {
     owner = "rschmitt";
     repo = "heatseeker";
     rev = "v${version}";
-    sha256 = "1xdvwgmh9lwv82hv1qg82bjv2iplnvva6lzbg7dyhbszhv7rhkbl";
+    sha256 = "1v2p6l4bdmvn9jggb12p0j5ajjvnbcdjsiavlcqiijz2w8wcdgs8";
   };
-  
+
   # some tests require a tty, this variable turns them off for Travis CI,
   # which we can also make use of
   TRAVIS= "true";

From 94280ecf903d26c4cf1f8205ca0cc47b0d1cce38 Mon Sep 17 00:00:00 2001
From: Tadas Barzdzius <tadas@barzdzius.lt>
Date: Wed, 20 Apr 2016 12:41:37 +0300
Subject: [PATCH 021/712] exa: 2016-04-11 -> 2016-04-20

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

diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix
index 4c20719fc51..39ba9bb2e50 100644
--- a/pkgs/tools/misc/exa/default.nix
+++ b/pkgs/tools/misc/exa/default.nix
@@ -4,15 +4,15 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "exa-${version}";
-  version = "2016-04-11";
+  version = "2016-04-20";
 
   depsSha256 = "1rpynsni2r3gim10xc1qkj51wpbzafwsr99y61zh41v4vh047g1k";
 
   src = fetchFromGitHub {
     owner = "ogham";
     repo = "exa";
-    rev = "9b87ef1da2231acef985bb08f7bd4a557167b652";
-    sha256 = "1f71bqkpc6bf9jg1zxy21rzbyhzghwfmgbyyyb81ggxcri0kajwi";
+    rev = "110a1c716bfc4a7f74f74b3c4f0a881c773fcd06";
+    sha256 = "136yxi85m50vwmqinr1wnd0h29n5yjykqqqk9ibbcmmhx8sqhjzf";
   };
 
   nativeBuildInputs = [ cmake ];

From 7d661a4ab40a6296322bb7eced188a6d74dc6dc1 Mon Sep 17 00:00:00 2001
From: Tadas Barzdzius <tadas@barzdzius.lt>
Date: Wed, 20 Apr 2016 12:42:37 +0300
Subject: [PATCH 022/712] cargo: 0.8.0 -> 0.9.0. Enable Darwin

---
 .../tools/build-managers/cargo/common.nix     |  4 ++--
 .../tools/build-managers/cargo/default.nix    | 19 +++++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cargo/common.nix b/pkgs/development/tools/build-managers/cargo/common.nix
index 110956ebf85..64966479319 100644
--- a/pkgs/development/tools/build-managers/cargo/common.nix
+++ b/pkgs/development/tools/build-managers/cargo/common.nix
@@ -31,8 +31,8 @@
   meta = with stdenv.lib; {
     homepage = http://crates.io;
     description = "Downloads your Rust project's dependencies and builds your project";
-    maintainers = with maintainers; [ wizeman ];
+    maintainers = with maintainers; [ wizeman retrry ];
     license = [ licenses.mit licenses.asl20 ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
index e0094b4350a..c3e782a12ea 100644
--- a/pkgs/development/tools/build-managers/cargo/default.nix
+++ b/pkgs/development/tools/build-managers/cargo/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
+{ stdenv, cacert, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
 , cmake, zlib, makeWrapper }:
 
 with rustPlatform;
 
 with ((import ./common.nix) {
   inherit stdenv rustc;
-  version = "0.8.0";
+  version = "0.9.0";
 });
 
 buildRustPackage rec {
@@ -15,10 +15,10 @@ buildRustPackage rec {
   src = fetchgit {
     url = "git://github.com/rust-lang/cargo";
     rev = "refs/tags/${version}";
-    sha256 = "02z0b6hpygjjfbskg22ggrhdv2nasrgf8x1fd8y0qzg4krx2czlh";
+    sha256 = "0d3n2jdhaz06yhilvmw3m2avxv501da1hdhljc9mwkz3l5bkv2jv";
   };
 
-  depsSha256 = "1gwc5ygs3h8jxs506xmbj1xzaqpb3kmg3pkxg9j9yqy616jw6rcn";
+  depsSha256 = "1x2m7ww2z8nl5ic2nds85p7ma8x0zp654jg7ay905ia95daiabzg";
 
   buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ];
 
@@ -28,8 +28,15 @@ buildRustPackage rec {
 
   buildPhase = "make";
 
-  # Disable check phase as there are lots of failures (some probably due to
-  # trying to access the network).
+  checkPhase = ''
+    # Export SSL_CERT_FILE as without it one test fails with SSL verification error
+    export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
+    # Disable cross compilation tests
+    export CFG_DISABLE_CROSS_TESTS=1
+    cargo test
+  '';
+
+  # Disable check phase as there are failures (author_prefers_cargo test fails)
   doCheck = false;
 
   installPhase = ''

From 357a251bfb2449ee9d6c9b18b17d86fef7d4767c Mon Sep 17 00:00:00 2001
From: Tadas Barzdzius <tadas@barzdzius.lt>
Date: Wed, 20 Apr 2016 12:43:00 +0300
Subject: [PATCH 023/712] rustfmt: 2016-03-22 -> 0.4.0

---
 pkgs/development/tools/rust/rustfmt/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix
index 55e721306ce..0fad7290df3 100644
--- a/pkgs/development/tools/rust/rustfmt/default.nix
+++ b/pkgs/development/tools/rust/rustfmt/default.nix
@@ -4,16 +4,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "rustfmt-${version}";
-  version = "2016-03-22";
+  version = "0.4";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "rustfmt";
-    rev = "ca757183fedf8e89286372b91ca074c11d99c4f4";
-    sha256 = "0ngg5m002hwwmsqy9wr50dj3l3zgwk39701wzszm3nrhz6x13dmj";
+    rev = "19768da5c97c108a05e6f545b73ba4b76d1b1788";
+    sha256 = "0f2m0gvlqlybcjl2xqwxlp5hjkhd30kx25dq56k5x0r3808ijksg";
   };
 
-  depsSha256 = "0mg4z197iiwjlgqs5izacld25cr11qi3bcrqq204f0jzrnj3y8ag";
+  depsSha256 = "1lbcpvp7xhyl96w7jfd18w6py60nwllr93jna5j33zvnip61cpf5";
 
   meta = with stdenv.lib; {
     description = "A tool for formatting Rust code according to style guidelines";

From a2973df0334933aca215ceedf54e2642871a9a9e Mon Sep 17 00:00:00 2001
From: Tadas Barzdzius <tadas@barzdzius.lt>
Date: Wed, 20 Apr 2016 15:08:12 +0300
Subject: [PATCH 024/712] pijul: use stable rustPlatform

---
 pkgs/applications/version-management/pijul/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index 399e4cf3024..66dd63956d6 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchdarcs, rustUnstable, openssl, libssh }:
+{ stdenv, fetchdarcs, rustPlatform, openssl, libssh }:
 
-with rustUnstable;
+with rustPlatform;
 
 buildRustPackage rec {
   name = "pijul-${version}";

From 713a069155416043a45f47eeee65546b1e94f8fe Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 20 Apr 2016 09:26:58 +0900
Subject: [PATCH 025/712] oraclejdk: 8u77 -> 8u91, 8u92

---
 pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 8 ++------
 pkgs/development/compilers/oraclejdk/jdk8-linux.nix     | 6 +++---
 pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix  | 6 +++---
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
index 5ac7c417ba2..a18ffcbf3d4 100644
--- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
@@ -119,12 +119,6 @@ let result = stdenv.mkDerivation rec {
       done
     fi
 
-    # construct the rpath
-    rpath=
-    for i in $libraries; do
-        rpath=$rpath''${rpath:+:}$i/lib:$i/lib64
-    done
-
     if test -z "$installjdk"; then
       jrePath=$out
     else
@@ -176,6 +170,8 @@ let result = stdenv.mkDerivation rec {
     [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++
     (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []);
 
+  rpath = stdenv.lib.strings.makeLibraryPath libraries;
+
   passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
 
   passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package
diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
index 554e3fc9838..0a9792f2b4a 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "77";
+  patchVersion = "91";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "14hyniai5l9qpg0pbnxa4rhyhk90qgihszfkn8h3vziqhmvrp27j";
-  sha256_x86_64 = "0hyzvvj4bf0r4jda8fv3k06d9bf37nji37qbq067mcjp5abc0zd4";
+  sha256_i686 = "0lndni81vfpz2l6zb8zsshaavk0483q5jc8yzj4fdjv6wnshbkay";
+  sha256_x86_64 = "0lkm3fz1vdi69f34sysavvh3abx603j1frc9hxvr08pwvmm536vg";
   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 554e3fc9838..d6d783b8a30 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 = "77";
+  patchVersion = "92";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "14hyniai5l9qpg0pbnxa4rhyhk90qgihszfkn8h3vziqhmvrp27j";
-  sha256_x86_64 = "0hyzvvj4bf0r4jda8fv3k06d9bf37nji37qbq067mcjp5abc0zd4";
+  sha256_i686 = "095j2hh2xas05jajy4qdj9hxq3k460x4m12rcaxkaxw754imj0vj";
+  sha256_x86_64 = "11wrqd3qbkhimbw9n4g9i0635pjhhnijwxyid7lvjv26kdgg58vr";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";

From e6899cc80c3ceb7116d21d486b234bd8bd127a08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 20 Apr 2016 16:11:34 +0100
Subject: [PATCH 026/712] add linuxPackages.dpdk: libs and drivers for fast
 packet processing

---
 pkgs/os-specific/linux/dpdk/default.nix | 40 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/os-specific/linux/dpdk/default.nix

diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix
new file mode 100644
index 00000000000..c93e0e80fa1
--- /dev/null
+++ b/pkgs/os-specific/linux/dpdk/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, lib, kernel, fetchurl }:
+
+assert lib.versionAtLeast kernel.version "3.18";
+
+stdenv.mkDerivation rec {
+  name = "dpdk-${version}-${kernel.version}";
+  version = "16.04";
+
+  src = fetchurl {
+    url = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${version}.tar.gz";
+    sha256 = "0yrz3nnhv65v2jzz726bjswkn8ffqc1sr699qypc9m78qrdljcfn";
+  };
+
+  RTE_KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
+  RTE_TARGET = "x86_64-native-linuxapp-gcc";
+
+  enableParallelBuilding = true;
+  outputs = [ "out" "examples" ];
+
+  buildPhase = ''
+    make T=x86_64-native-linuxapp-gcc config
+    make T=x86_64-native-linuxapp-gcc install
+    make T=x86_64-native-linuxapp-gcc examples
+  '';
+
+  installPhase = ''
+    cp -pr x86_64-native-linuxapp-gcc/{app,lib,include,kmod} $out/
+
+    mkdir $examples
+    cp -pr examples/* $examples/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Set of libraries and drivers for fast packet processing";
+    homepage = http://dpdk.org/;
+    license = with licenses; [ lgpl21 gpl2 bsd2 ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.iElectric ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8132ccd5aa5..7aa7e40508f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10652,6 +10652,8 @@ in
 
     cpupower = callPackage ../os-specific/linux/cpupower { };
 
+    dpdk = callPackage ../os-specific/linux/dpdk { };
+
     e1000e = callPackage ../os-specific/linux/e1000e {};
 
     v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { };

From 7cdf23a1f5dd8963b87f78d898bd42234cc4c631 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 20 Apr 2016 23:04:58 +0800
Subject: [PATCH 027/712] aucdtect: init at 0.8.2

A binary distribution of the TA Analyzer that verifies if audio files
are in fact lossless.
---
 pkgs/tools/audio/aucdtect/default.nix | 32 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/audio/aucdtect/default.nix

diff --git a/pkgs/tools/audio/aucdtect/default.nix b/pkgs/tools/audio/aucdtect/default.nix
new file mode 100644
index 00000000000..244f7b40673
--- /dev/null
+++ b/pkgs/tools/audio/aucdtect/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, lib, rpmextract }:
+
+assert stdenv.isLinux;
+
+with lib;
+
+stdenv.mkDerivation rec {
+  name = "aucdtext-${version}";
+  version = "0.8-2";
+
+  src = fetchurl {
+    url = "http://www.true-audio.com/ftp/aucdtect-${version}.i586.rpm";
+    sha256 = "1lp5f0rq5b5n5il0c64m00gcfskarvgqslpryms9443d200y6mmd";
+  };
+
+  unpackCmd = "${rpmextract}/bin/rpmextract $src";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -m755 local/bin/auCDtect $out/bin/aucdtect
+  '';
+
+  dontStrip = true;
+
+  meta = with stdenv.lib; {
+    description = "Verify authenticity of lossless audio files";
+    homepage = http://tausoft.org;
+    license = licenses.unfreeRedistributable;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8132ccd5aa5..d9ad1b5d35e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16599,6 +16599,8 @@ in
 
   mg = callPackage ../applications/editors/mg { };
 
+  aucdtect = callPackage ../tools/audio/aucdtect { };
+
   togglesg-download = callPackage ../tools/misc/togglesg-download { };
 
   discord = callPackage ../applications/networking/instant-messengers/discord { };

From 0087d161204afc42355d1f867df5a9d51533bfae Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 19 Apr 2016 12:15:23 +0000
Subject: [PATCH 028/712] haskellPackages: clean up unnecessary overrides

---
 .../haskell-modules/configuration-common.nix           | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b824a06bd68..90cef5e92a0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -248,9 +248,6 @@ self: super: {
   webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; };
   websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; };
 
-  # While waiting for https://github.com/jwiegley/gitlib/pull/53 to be merged
-  hlibgit2 = addBuildTool super.hlibgit2 pkgs.git;
-
   # https://github.com/mvoidex/hsdev/issues/11
   hsdev = dontHaddock super.hsdev;
 
@@ -263,9 +260,6 @@ self: super: {
   # Upstream notified by e-mail.
   permutation = dontCheck super.permutation;
 
-  # https://github.com/vincenthz/hs-tls/issues/102
-  tls = dontCheck super.tls;
-
   # https://github.com/jputcu/serialport/issues/25
   serialport = dontCheck super.serialport;
 
@@ -275,9 +269,6 @@ self: super: {
   # Fails no apparent reason. Upstream has been notified by e-mail.
   assertions = dontCheck super.assertions;
 
-  # https://github.com/vincenthz/tasty-kat/issues/1
-  tasty-kat = dontCheck super.tasty-kat;
-
   # These packages try to execute non-existent external programs.
   cmaes = dontCheck super.cmaes;                        # http://hydra.cryp.to/build/498725/log/raw
   dbmigrations = dontCheck super.dbmigrations;
@@ -302,7 +293,6 @@ self: super: {
   test-sandbox = dontCheck super.test-sandbox;
   users-postgresql-simple = dontCheck super.users-postgresql-simple;
   wai-middleware-hmac = dontCheck super.wai-middleware-hmac;
-  wai-middleware-throttle = dontCheck super.wai-middleware-throttle; # https://github.com/creichert/wai-middleware-throttle/issues/1
   xkbcommon = dontCheck super.xkbcommon;
   xmlgen = dontCheck super.xmlgen;
   hapistrano = dontCheck super.hapistrano;

From 25387a1bedefb391db9f8585cfa1d160fc3bacfe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 Apr 2016 20:53:24 +0200
Subject: [PATCH 029/712] nixos-checkout: Remove

This command was useful when NixOS was spread across multiple
repositories, but now it's pretty pointless (and obfuscates what
happens, i.e. "git clone git://github.com/NixOS/nixpkgs.git").
---
 nixos/doc/manual/development/sources.xml      | 32 ++++------
 .../cd-dvd/system-tarball-fuloong2f.nix       |  3 +-
 .../cd-dvd/system-tarball-sheevaplug.nix      |  3 +-
 .../installer/tools/nixos-checkout.nix        | 60 -------------------
 nixos/modules/module-list.nix                 |  1 -
 5 files changed, 13 insertions(+), 86 deletions(-)
 delete mode 100644 nixos/modules/installer/tools/nixos-checkout.nix

diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml
index 879a31e32c5..fd0b0109b32 100644
--- a/nixos/doc/manual/development/sources.xml
+++ b/nixos/doc/manual/development/sources.xml
@@ -11,35 +11,25 @@ uses the NixOS and Nixpkgs sources provided by the
 <literal>nixos-unstable</literal> channel (kept in
 <filename>/nix/var/nix/profiles/per-user/root/channels/nixos</filename>).
 To modify NixOS, however, you should check out the latest sources from
-Git.  This is done using the following command:
+Git.  This is as follows:
 
 <screen>
-$ nixos-checkout <replaceable>/my/sources</replaceable>
-</screen>
-
-or
-
-<screen>
-$ mkdir -p <replaceable>/my/sources</replaceable>
-$ cd <replaceable>/my/sources</replaceable>
-$ nix-env -i git
 $ git clone git://github.com/NixOS/nixpkgs.git
 $ cd nixpkgs
 $ git remote add channels git://github.com/NixOS/nixpkgs-channels.git
 $ git remote update channels
 </screen>
 
-This will check out the latest NixOS sources to
-<filename><replaceable>/my/sources</replaceable>/nixpkgs/nixos</filename>
-and the Nixpkgs sources to
-<filename><replaceable>/my/sources</replaceable>/nixpkgs</filename>.
-(The NixOS source tree lives in a subdirectory of the Nixpkgs
-repository.) The remote <literal>channels</literal> refers to a
-read-only repository that tracks the Nixpkgs/NixOS channels (see <xref
-linkend="sec-upgrading"/> for more information about channels). Thus,
-the Git branch <literal>channels/nixos-14.12</literal> will contain
-the latest built and tested version available in the
-<literal>nixos-14.12</literal> channel.</para>
+This will check out the latest Nixpkgs sources to
+<filename>./nixpkgs</filename> the NixOS sources to
+<filename>./nixpkgs/nixos</filename>. (The NixOS source tree lives in
+a subdirectory of the Nixpkgs repository.) The remote
+<literal>channels</literal> refers to a read-only repository that
+tracks the Nixpkgs/NixOS channels (see <xref linkend="sec-upgrading"/>
+for more information about channels). Thus, the Git branch
+<literal>channels/nixos-14.12</literal> will contain the latest built
+and tested version available in the <literal>nixos-14.12</literal>
+channel.</para>
 
 <para>It’s often inconvenient to develop directly on the master
 branch, since if somebody has just committed (say) a change to GCC,
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index 6fe490b02bf..d984cb30717 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -52,8 +52,7 @@ in
   # Include some utilities that are useful for installing or repairing
   # the system.
   environment.systemPackages =
-    [ pkgs.subversion # for nixos-checkout
-      pkgs.w3m # needed for the manual anyway
+    [ pkgs.w3m # needed for the manual anyway
       pkgs.testdisk # useful for repairing boot problems
       pkgs.mssys # for writing Microsoft boot sectors / MBRs
       pkgs.parted
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 7badfcb8df2..9e733241993 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -49,8 +49,7 @@ in
   # Include some utilities that are useful for installing or repairing
   # the system.
   environment.systemPackages =
-    [ pkgs.subversion # for nixos-checkout
-      pkgs.w3m # needed for the manual anyway
+    [ pkgs.w3m # needed for the manual anyway
       pkgs.ddrescue
       pkgs.ccrypt
       pkgs.cryptsetup # needed for dm-crypt volumes
diff --git a/nixos/modules/installer/tools/nixos-checkout.nix b/nixos/modules/installer/tools/nixos-checkout.nix
deleted file mode 100644
index 07274e139f7..00000000000
--- a/nixos/modules/installer/tools/nixos-checkout.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-# This module generates the nixos-checkout script, which performs a
-# checkout of the Nixpkgs Git repository.
-
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  nixosCheckout = pkgs.substituteAll {
-    name = "nixos-checkout";
-    dir = "bin";
-    isExecutable = true;
-    src = pkgs.writeScript "nixos-checkout"
-      ''
-        #! ${pkgs.stdenv.shell} -e
-
-        if [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
-          echo "Usage: `basename $0` [PREFIX]. See NixOS Manual for more info."
-          exit 0
-        fi
-
-        prefix="$1"
-        if [ -z "$prefix" ]; then prefix=/etc/nixos; fi
-        mkdir -p "$prefix"
-        cd "$prefix"
-
-        if [ -z "$(type -P git)" ]; then
-            echo "installing Git..."
-            nix-env -iA nixos.git
-        fi
-
-        # Move any old nixpkgs directories out of the way.
-        backupTimestamp=$(date "+%Y%m%d%H%M%S")
-
-        if [ -e nixpkgs -a ! -e nixpkgs/.git ]; then
-            mv nixpkgs nixpkgs-$backupTimestamp
-        fi
-
-        # Check out the Nixpkgs sources.
-        if ! [ -e nixpkgs/.git ]; then
-            echo "Creating repository in $prefix/nixpkgs..."
-            git init --quiet nixpkgs
-        else
-            echo "Updating repository in $prefix/nixpkgs..."
-        fi
-        cd nixpkgs
-        git remote add origin git://github.com/NixOS/nixpkgs.git || true
-        git remote add channels git://github.com/NixOS/nixpkgs-channels.git || true
-        git remote set-url origin --push git@github.com:NixOS/nixpkgs.git
-        git remote update
-        git checkout master
-      '';
-   };
-
-in
-
-{
-  environment.systemPackages = [ nixosCheckout ];
-}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index bb8fa48105a..e59ec07b8aa 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -47,7 +47,6 @@
   ./i18n/input-method/nabi.nix
   ./i18n/input-method/uim.nix
   ./installer/tools/auto-upgrade.nix
-  ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
   ./misc/assertions.nix
   ./misc/crashdump.nix

From 2ddc17b930dd4446b259e18d2ef416c4d352fbea Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Wed, 20 Apr 2016 22:42:52 +0300
Subject: [PATCH 030/712] skype: fix rpath broken by closure-size merge

---
 .../networking/instant-messengers/skype/default.nix        | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix
index 2f2dba18e49..5bb2121b1fd 100644
--- a/pkgs/applications/networking/instant-messengers/skype/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skype/default.nix
@@ -38,13 +38,8 @@ stdenv.mkDerivation rec {
     mkdir -p $out/{libexec/skype/,bin}
     cp -r * $out/libexec/skype/
 
-    fullPath=
-    for i in $nativeBuildInputs; do
-      fullPath=$fullPath''${fullPath:+:}$i/lib
-    done
-
     patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath "$fullPath" $out/libexec/skype/skype
+        --set-rpath "${lib.makeLibraryPath buildInputs}" $out/libexec/skype/skype
 
     cat > $out/bin/skype << EOF
     #!${stdenv.shell}

From 1d6990db066f346432f9196ce2b209a52ff64768 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Wed, 20 Apr 2016 22:27:34 +0200
Subject: [PATCH 031/712] boot.loader.grub: fix variable name (#14855)

---
 nixos/modules/system/boot/loader/grub/grub.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 05322497a4b..289405f9319 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -499,7 +499,7 @@ in
         }
       ] ++ flip map args.devices (device: {
         assertion = device == "nodev" || hasPrefix "/" device;
-        message = "GRUB devices must be absolute paths, not ${dev} in ${args.path}";
+        message = "GRUB devices must be absolute paths, not ${device} in ${args.path}";
       }));
     })
 

From 9bc2daa9272213b7411613cdc0c356fb5d43fa7d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Apr 2016 22:30:16 +0200
Subject: [PATCH 032/712] pcre: drop unused withCharSize function argument

---
 pkgs/development/libraries/pcre/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 8bce1512d13..91af6f4dadf 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl
 , windows ? null, variant ? null, pcre
-, withCharSize ? 8
 }:
 
 with stdenv.lib;

From 4ea23ca27786c1084c64daa4550534ceecd2b149 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Wed, 20 Apr 2016 22:42:44 +0200
Subject: [PATCH 033/712] gnutls: 3.4.6 -> 3.4.11

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

diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix
index 6d196978cdf..71c3010467c 100644
--- a/pkgs/development/libraries/gnutls/3.4.nix
+++ b/pkgs/development/libraries/gnutls/3.4.nix
@@ -1,11 +1,11 @@
 { callPackage, fetchurl, autoreconfHook, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.4.6";
+  version = "3.4.11";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.xz";
-    sha256 = "1v109px1sy1s731fnawzdsvggdswmr7ha9q5lid4v8pzgznmkdgy";
+    sha256 = "1f4sbb38xab46h67a3pm6kybgrahjx3vbrn66qq3cbc2jngrrvvh";
   };
 
   # This fixes some broken parallel dependencies

From c9e300b4588b5b8b8ee2f39f742631f50df368f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Apr 2016 23:13:05 +0200
Subject: [PATCH 034/712] texlive (old): un-break syntax highlighting in Emacs
 (cosmetic)

---
 pkgs/tools/typesetting/tex/texlive/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 48a5ae8d649..6baaf12b857 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -65,7 +65,7 @@ rec {
     mkdir -p $out/libexec/
     mv $out/bin $out/libexec/$(uname -m)
     mkdir -p $out/bin
-    for i in "$out/libexec/"* "$out/libexec/"*/* ; do
+    for i in "$out/libexec/"* "$out/libexec/"*"/"* ; do
         test \( \! -d "$i" \) -a \( -x "$i" -o -L "$i" \) || continue
 
       if [ -x "$i" ]; then
@@ -105,7 +105,7 @@ rec {
 
     PATH=$PATH:$out/bin mktexlsr $out/share/texmf*
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    for prog in $out/bin/*; do
+    for prog in "$out/bin/"*; do
       wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler.out}/lib"
     done
   '' ) [ "minInit" "defEnsureDir" "doUnpack" "doMakeInstall" "promoteLibexec" "patchShebangsInterim"];

From 00ac3ac6ceb370fc234855b16fb38da401717f80 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Apr 2016 23:13:40 +0200
Subject: [PATCH 035/712] texlive (old): mark build as broken

Reported in https://github.com/NixOS/nixpkgs/issues/14807. It's probably
about time to convert to the new texlive code, which is *much* nicer.
See http://nixos.org/nixpkgs/manual/#sec-language-texlive for details.
---
 pkgs/tools/typesetting/tex/texlive/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 6baaf12b857..3a93c6445a7 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -156,5 +156,6 @@ rec {
     maintainers = with maintainers; [ lovek323 raskin jwiegley ];
     platforms   = platforms.unix;
     hydraPlatforms = [];
+    broken = true; # https://github.com/NixOS/nixpkgs/issues/14807
   };
 }

From 85603d2166f0541487697a2d3310943a5f4795f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 20 Apr 2016 23:09:30 +0100
Subject: [PATCH 036/712] linuxPackages.dpdk: fix build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit a56a9d1b590eb3dcadecf5b65ecabb46ae818d31)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/os-specific/linux/dpdk/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix
index c93e0e80fa1..486cd736c71 100644
--- a/pkgs/os-specific/linux/dpdk/default.nix
+++ b/pkgs/os-specific/linux/dpdk/default.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
+    mkdir $out
     cp -pr x86_64-native-linuxapp-gcc/{app,lib,include,kmod} $out/
 
     mkdir $examples
@@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
     description = "Set of libraries and drivers for fast packet processing";
     homepage = http://dpdk.org/;
     license = with licenses; [ lgpl21 gpl2 bsd2 ];
-    platforms = platforms.linux;
+    platforms =  [ "x86_64-linux" ];;
     maintainers = [ maintainers.iElectric ];
   };
 }

From 8262cd0244fb8549571b983f4f688125c3b3b4bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 20 Apr 2016 23:38:52 +0100
Subject: [PATCH 037/712] eval

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

diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix
index 486cd736c71..7ca71a695e0 100644
--- a/pkgs/os-specific/linux/dpdk/default.nix
+++ b/pkgs/os-specific/linux/dpdk/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     description = "Set of libraries and drivers for fast packet processing";
     homepage = http://dpdk.org/;
     license = with licenses; [ lgpl21 gpl2 bsd2 ];
-    platforms =  [ "x86_64-linux" ];;
+    platforms =  [ "x86_64-linux" ];
     maintainers = [ maintainers.iElectric ];
   };
 }

From dbd88d8778266143813b2dc3c1a2145427235f82 Mon Sep 17 00:00:00 2001
From: Maarten Hoogendoorn <maarten@moretea.nl>
Date: Thu, 21 Apr 2016 11:42:33 +0200
Subject: [PATCH 038/712] google-cloud-sdk: 0.9.82 -> 106.0.0

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 75860bc27d3..81bd6456103 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, python27, python27Packages, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  version = "0.9.82";
+  version = "106.0.0";
   name = "google-cloud-sdk-${version}";
 
   src = fetchurl {
-    url = "https://dl.google.com/dl/cloudsdk/release/packages/google-cloud-sdk-coretools-linux-static-20151008123015.tar.gz";
-    sha256 = "11gnhgjj4y4dzi3wfdpnz918m7xraz1k3ady1d6y446hmc5q2512";
+    url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-106.0.0-linux-x86_64.tar.gz";
+    sha256 = "00jhpx32sfxcgl404plmb8122bs0ijl2rv25h17mnjn067nhz7nn";
   };
 
   buildInputs = [python27 makeWrapper];

From 9445bb25fc77f8e53c5fd024c9609d8a3b8590cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 21 Apr 2016 12:18:16 +0200
Subject: [PATCH 039/712] gtksourceview-2: update 2.9.9 -> 2.10.5

It doesn't seem to help with mousepad problems #14862,
but it shouldn't hurt.
---
 .../desktops/gnome-2/desktop/gtksourceview/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
index aa1080012d5..c69ee82fa26 100644
--- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
@@ -1,11 +1,13 @@
 {stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk, pango, 
   libxml2Python, perl, intltool, gettext}:
 
-stdenv.mkDerivation {
-  name = "gtksourceview-2.9.9";
+stdenv.mkDerivation rec {
+  name = "gtksourceview-${version}";
+  version = "2.10.5";
+
   src = fetchurl {
-    url = mirror://gnome/sources/gtksourceview/2.9/gtksourceview-2.9.9.tar.bz2;
-    sha256 = "0d0i586nj8jsqqfcjcvaj0yzc3sid3s1a4y62xr0qbddkbn1wllj";
+    url = "mirror://gnome/sources/gtksourceview/2.10/${name}.tar.bz2";
+    sha256 = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e";
   };
   buildInputs = [pkgconfig atk cairo glib gtk pango libxml2Python perl intltool
     gettext];

From c4ab7e2cd4f5ad39a2f1d590af2d2b72037fdfb2 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Wed, 20 Apr 2016 17:58:19 -0430
Subject: [PATCH 040/712] libxml2 : Have exec_prefix match the location of
 bin/xml2-config.

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

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index f7e175373e1..8eedf50c9ca 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ zlib findXMLCatalogs ];
 
-  configureFlags = "--with-python=${python}";
+  configureFlags = "--with-python=${python} --exec_prefix=$dev";
 
   enableParallelBuilding = true;
 

From a74aa5bce790b4c334eee51213aba99bb9c03251 Mon Sep 17 00:00:00 2001
From: Ollie Charles <ollie@ocharles.org.uk>
Date: Tue, 19 Apr 2016 11:13:33 +0100
Subject: [PATCH 041/712] golden-cheetah: Fix evaluation

For now, disable the Dropbox configuration.
---
 pkgs/applications/misc/golden-cheetah/default.nix | 13 +++++++------
 pkgs/top-level/all-packages.nix                   |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index 82695bbdd7e..799746ee6bd 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -18,12 +18,13 @@ stdenv.mkDerivation rec {
     echo 'QMAKE_LRELEASE = ${qttools}/bin/lrelease' >> src/gcconfig.pri
     sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local
     qmake PREFIX=$out build.pro
-  '' + (
-    with (config.golden-cheetah);
-    stdenv.lib.optionalString (dropbox-client-id != null && dropbox-client-secret != null) ''
-      echo 'DEFINES += GC_DROPBOX_CLIENT_ID=\\\"${config.golden-cheetah.dropbox-client-id}\\\"' >>  src/gcconfig.pri
-      echo 'DEFINES += GC_DROPBOX_CLIENT_SECRET=\\\"${config.golden-cheetah.dropbox-client-secret}\\\"' >>  src/gcconfig.pri
-    '');
+  '';
+    #  + (
+    # with (config.golden-cheetah);
+    # stdenv.lib.optionalString (dropbox-client-id != null && dropbox-client-secret != null) ''
+    #   echo 'DEFINES += GC_DROPBOX_CLIENT_ID=\\\"${config.golden-cheetah.dropbox-client-id}\\\"' >>  src/gcconfig.pri
+    #   echo 'DEFINES += GC_DROPBOX_CLIENT_SECRET=\\\"${config.golden-cheetah.dropbox-client-secret}\\\"' >>  src/gcconfig.pri
+    # '');
   installPhase = ''
     mkdir -p $out/bin
     cp src/GoldenCheetah $out/bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 449a17137ae..ca64821e383 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16607,5 +16607,5 @@ in
 
   discord = callPackage ../applications/networking/instant-messengers/discord { };
 
-  #golden-cheetah = qt5.callPackage ../applications/misc/golden-cheetah {};
+  golden-cheetah = qt5.callPackage ../applications/misc/golden-cheetah {};
 }

From f2cee89b22eb572cfaa24d679a6a6cdf64c5d3d7 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Thu, 21 Apr 2016 11:09:53 -0300
Subject: [PATCH 042/712] factorio: add explict dependency on cacert for chroot
 build

---
 pkgs/games/factorio/fetch.nix | 4 ++--
 pkgs/games/factorio/fetch.sh  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/factorio/fetch.nix b/pkgs/games/factorio/fetch.nix
index 03dc786492a..78c7faf018c 100644
--- a/pkgs/games/factorio/fetch.nix
+++ b/pkgs/games/factorio/fetch.nix
@@ -1,4 +1,4 @@
-{ stdenv, curl
+{ stdenv, curl, cacert
 # Begin download parameters
 , username ? ""
 , password ? ""
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ curl ];
 
-  inherit url loginUrl username password;
+  inherit url loginUrl username password cacert;
 
   builder = ./fetch.sh;
 
diff --git a/pkgs/games/factorio/fetch.sh b/pkgs/games/factorio/fetch.sh
index ad976673686..d6549c0a676 100644
--- a/pkgs/games/factorio/fetch.sh
+++ b/pkgs/games/factorio/fetch.sh
@@ -8,7 +8,7 @@ source $stdenv/setup
 curl="curl \
  --max-redirs 20 \
  --retry 3 \
- --cacert /etc/ssl/certs/ca-bundle.crt \
+ --cacert $cacert/etc/ssl/certs/ca-bundle.crt \
  $curlOpts \
  $NIX_CURL_FLAGS"
 

From 4785ebc471efb4c8b0fb466221de0ca117841413 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 21 Apr 2016 17:12:47 +0300
Subject: [PATCH 043/712] mjpegtools: split, use minimal version by default

---
 pkgs/tools/video/mjpegtools/default.nix | 25 +++++++++++++++++++++++--
 pkgs/top-level/all-packages.nix         |  6 +++++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix
index 33b497fa3eb..4aee9064d72 100644
--- a/pkgs/tools/video/mjpegtools/default.nix
+++ b/pkgs/tools/video/mjpegtools/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, gtk, libdv, libjpeg, libpng, libX11, pkgconfig, SDL, SDL_gfx }:
+{ stdenv, lib, fetchurl, gtk, libdv, libjpeg, libpng, libX11, pkgconfig, SDL, SDL_gfx
+, withMinimal ? false
+}:
 
 # TODO:
 # - make dependencies optional
@@ -7,9 +9,28 @@
 
 stdenv.mkDerivation rec {
   name = "mjpegtools-2.1.0";
+
   src = fetchurl {
     url = "mirror://sourceforge/mjpeg/${name}.tar.gz";
     sha256 = "01y4xpfdvd4zgv6fmcjny9mr1gbfd4y2i4adp657ydw6fqyi8kw6";
   };
-  buildInputs = [ gtk libdv libjpeg libpng libX11 pkgconfig SDL SDL_gfx ];
+
+  buildInputs = [ libdv libjpeg libpng pkgconfig ]
+              ++ lib.optional (!withMinimal) [ gtk libX11 SDL SDL_gfx ];
+
+  postPatch = ''
+    sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+  '';
+
+  enableParallelBuilding = true;
+
+  outputs = [ "out" "lib" ];
+
+  meta = with stdenv.lib; {
+    description = "A suite of programs for processing MPEG or MJPEG video";
+    homepage = http://mjpeg.sourceforge.net/;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ abbradar ];
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca64821e383..5ee6c190ad4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2378,7 +2378,11 @@ in
 
   minixml = callPackage ../development/libraries/minixml { };
 
-  mjpegtools = callPackage ../tools/video/mjpegtools { };
+  mjpegtoolsFull = callPackage ../tools/video/mjpegtools { };
+
+  mjpegtools = self.mjpegtoolsFull.override {
+    withMinimal = true;
+  };
 
   mkcue = callPackage ../tools/cd-dvd/mkcue { };
 

From c6c85c0a58cea2df5f6a1b1ca9356034d9c566f2 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 21 Apr 2016 17:13:05 +0300
Subject: [PATCH 044/712] gst_all_1.gst-plugins-bad: add mplex plugin

---
 pkgs/development/libraries/gstreamer/bad/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 4603b3e29db..330c1d8dfa4 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -4,7 +4,7 @@
 , libmodplug, mpeg2dec, mpg123
 , openjpeg, libopus, librsvg
 , wildmidi, fluidsynth, libvdpau, wayland
-, libwebp, xvidcore, gnutls
+, libwebp, xvidcore, gnutls, mjpegtools
 , mesa, libintlOrEmpty
 }:
 
@@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
     openjpeg libopus librsvg
     fluidsynth libvdpau
     libwebp xvidcore gnutls mesa
+    mjpegtools
   ]
     ++ libintlOrEmpty
     ++ optional faacSupport faac

From d713fd1f9f498fa02b07491d2cb16f0cdd4d9c73 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 21 Apr 2016 17:14:15 +0300
Subject: [PATCH 045/712] libdvdcss: 1.3.0 -> 1.4.0

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

diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix
index c5cdec0ae5f..ae3ae407a92 100644
--- a/pkgs/development/libraries/libdvdcss/default.nix
+++ b/pkgs/development/libraries/libdvdcss/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libdvdcss-${version}";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchurl {
     url = "http://get.videolan.org/libdvdcss/${version}/${name}.tar.bz2";
-    sha256 = "158k9zagmbk5bkbz96l6lwhh7xcgfcnzflkr4vblskhcab6llhbw";
+    sha256 = "0nl45ifc4xcb196snv9d6hinfw614cqpzcqp92dg43c0hickg290";
   };
 
   meta = with stdenv.lib; {

From aad2f71eeec382bd6b261c02e6f5b650359dfd19 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 21 Apr 2016 17:15:47 +0300
Subject: [PATCH 046/712] brasero: 3.12.0 -> 3.12.1

---
 pkgs/tools/cd-dvd/brasero/default.nix | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix
index 91a5440df3e..ff910ad2e49 100644
--- a/pkgs/tools/cd-dvd/brasero/default.nix
+++ b/pkgs/tools/cd-dvd/brasero/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify
+{ stdenv, lib, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify
 , libcanberra_gtk3, intltool, makeWrapper, dvdauthor, cdrdao
-, dvdplusrwtools, cdrtools, libdvdcss, wrapGAppsHook }:
+, dvdplusrwtools, cdrtools, vcdimager, wrapGAppsHook }:
+
+# libdvdcss is "too old" (in fast "too new"), see https://bugs.launchpad.net/ubuntu/+source/brasero/+bug/611590
 
 let
   major = "3.12";
-  minor = "0";
-  binpath = stdenv.lib.makeBinPath [ dvdauthor cdrdao dvdplusrwtools cdrtools ];
+  minor = "1";
+  binpath = lib.makeBinPath [ dvdauthor cdrdao dvdplusrwtools vcdimager cdrtools ];
 
 in stdenv.mkDerivation rec {
   version = "${major}.${minor}";
@@ -13,12 +15,12 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.gnome.org/sources/brasero/${major}/${name}.tar.xz";
-    sha256 = "68fef2699b772fa262d855dac682100dbfea05563a7e4056eff8fe6447aec2fc";
+    sha256 = "09vi2hyhl0bz7imv3ky6h7x5m3d546n968wcghydwrkvwm9ylpls";
   };
 
   nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ];
 
-  buildInputs = [ gtk3 libxml2 libnotify libcanberra_gtk3 libdvdcss
+  buildInputs = [ gtk3 libxml2 libnotify libcanberra_gtk3
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base
                   gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
                   gst_all_1.gst-plugins-ugly gst_all_1.gst-libav ];
@@ -27,14 +29,15 @@ in stdenv.mkDerivation rec {
   # will obviously not work on nix
   patches = [ ./remove-symlink-check.patch ];
 
+  enableParallelBuilding = true;
+
   configureFlags = [
     "--with-girdir=$out/share/gir-1.0"
-    "--with-typelibdir=$out/lib/girepository-1.0" ];
-
-  NIX_CFLAGS_LINK = [ "-ldvdcss" ];
+    "--with-typelibdir=$out/lib/girepository-1.0"
+  ];
 
   preFixup = ''
-    gappsWrapperArgs+=(--prefix PATH : "${binpath}")
+    gappsWrapperArgs+=(--prefix PATH : "${binpath}" --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH")
   '';
 
   meta = with stdenv.lib; {

From 456aa48d3847b350476a43da0f8f4879dab7a9db Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 21 Apr 2016 17:16:56 +0300
Subject: [PATCH 047/712] kde4.k3b: add needed binaries to PATH

---
 pkgs/applications/misc/k3b/default.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix
index f48912aeb1e..922dec11180 100644
--- a/pkgs/applications/misc/k3b/default.nix
+++ b/pkgs/applications/misc/k3b/default.nix
@@ -1,11 +1,17 @@
-{ stdenv, fetchurl, makeWrapper, automoc4, cmake, perl, pkgconfig
-, shared_mime_info, libvorbis, taglib , flac, libsamplerate
+{ stdenv, lib, fetchurl, makeWrapper, automoc4, cmake, perl, pkgconfig
+, shared_mime_info, libvorbis, taglib, flac, libsamplerate
 , libdvdread, lame, libsndfile, libmad, gettext , transcode, cdrdao
-, cdrtools, dvdplusrwtools, vcdimager, cdparanoia , kdelibs
+, cdrtools, dvdplusrwtools, vcdimager, cdparanoia, kdelibs, libdvdcss, ffmpeg
 , kdemultimedia, phonon, libkcddb ? null
 }:
 
-stdenv.mkDerivation rec {
+let
+  # at runtime, k3b needs the executables cdrdao, cdrecord, dvd+rw-format,
+  # eMovix, growisofs, mkisofs, normalize, readcd, transcode, vcdxbuild,
+  # vcdxminfo, and vcdxrip
+  binPath = lib.makeBinPath [ cdrdao dvdplusrwtools transcode vcdimager cdrtools ];
+
+in stdenv.mkDerivation rec {
   name = "k3b-2.0.3a";
 
   src = fetchurl {
@@ -19,18 +25,16 @@ stdenv.mkDerivation rec {
     shared_mime_info libvorbis taglib flac libsamplerate libdvdread
     lame libsndfile libmad stdenv.cc.libc kdelibs
     kdemultimedia phonon libkcddb makeWrapper cdparanoia
+    libdvdcss ffmpeg
   ];
 
   enableParallelBuilding = true;
 
-  # at runtime, k3b needs the executables cdrdao, cdrecord, dvd+rw-format,
-  # eMovix, growisofs, mkisofs, normalize, readcd, transcode, vcdxbuild,
-  # vcdxminfo, and vcdxrip
-  propagatedUserEnvPkgs = [ cdrdao cdrtools dvdplusrwtools transcode vcdimager ];
+  NIX_CFLAGS_LINK = [ "-lcdda_interface" "-lcdda_paranoia" "-ldvdcss" ];
 
   postInstall = ''
     wrapProgram $out/bin/k3b \
-      --prefix LD_LIBRARY_PATH ":" "${cdparanoia}/lib"
+      --prefix PATH ":" "${binPath}"
   '';
 
   meta = with stdenv.lib; {

From 46ae49fbff86803f855e2c880a900caf9c5a9d44 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 21 Apr 2016 17:19:53 +0300
Subject: [PATCH 048/712] dvd-slideshow: use PATH

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

diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix
index 040a7a2e7a6..1506f6e23c9 100644
--- a/pkgs/applications/video/dvd-slideshow/default.nix
+++ b/pkgs/applications/video/dvd-slideshow/default.nix
@@ -1,10 +1,12 @@
-{ stdenv, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools }:
+{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools }:
 
 let
+  binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg imagemagick lame mjpegtools sox transcode vorbis-tools ];
+
   wrapper = writeScript "dvd-slideshow.sh" ''
       #!/bin/bash
       # wrapper script for dvd-slideshow programs
-      export PATH=${cdrtools}/bin:${dvdauthor}/bin:${ffmpeg.bin}/bin:${imagemagick}/bin:${lame}/bin:${mjpegtools}/bin:${sox}/bin:${transcode}/bin:${vorbis-tools}/bin:$PATH
+      export PATH=${binPath}:$PATH
 
       dir=`dirname "$0"`
       exe=`basename "$0"`

From f1492bf44c839f5d7ba9d809ea71b4e4fb3f08bc Mon Sep 17 00:00:00 2001
From: Robbin C <robbinch33@gmail.com>
Date: Thu, 21 Apr 2016 22:57:19 +0800
Subject: [PATCH 049/712] tinc-haskell: init at 20160419

---
 pkgs/development/tools/misc/tinc/default.nix | 41 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/tools/misc/tinc/default.nix

diff --git a/pkgs/development/tools/misc/tinc/default.nix b/pkgs/development/tools/misc/tinc/default.nix
new file mode 100644
index 00000000000..44491fa0ef9
--- /dev/null
+++ b/pkgs/development/tools/misc/tinc/default.nix
@@ -0,0 +1,41 @@
+{ mkDerivation, aeson, base, bytestring, Cabal, containers
+, directory, exceptions, filelock, filepath, gitrev, graph-wrapper
+, hpack, hspec, HUnit, language-dot, mockery, parsec, process
+, QuickCheck, safe, stdenv, temporary, time, transformers, unix
+, unix-compat, with-location, yaml, fetchFromGitHub
+, ghc, cabal2nix, cabal-install, makeWrapper
+}:
+mkDerivation {
+  pname = "tinc";
+  version = "20160419";
+  src = fetchFromGitHub {
+    owner = "sol";
+    repo = "tinc";
+    rev = "b9f7cc1076098b1f99f20655052c9fd34598d891";
+    sha256 = "1f0k7a4vxdd2cd2h5qwska9hfw7ig6q2rx87d09fg2xlix96g81r";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  executableHaskellDepends = [
+    aeson base bytestring Cabal containers directory exceptions
+    filelock filepath gitrev graph-wrapper hpack language-dot parsec
+    process temporary time transformers unix-compat with-location yaml
+  ];
+  testHaskellDepends = [
+    aeson base bytestring Cabal containers directory exceptions
+    filelock filepath gitrev graph-wrapper hpack hspec HUnit
+    language-dot mockery parsec process QuickCheck safe temporary time
+    transformers unix unix-compat with-location yaml
+  ];
+  postInstall = ''
+    source ${makeWrapper}/nix-support/setup-hook
+    wrapProgram $out/bin/tinc \
+      --prefix PATH : '${ghc}/bin' \
+      --prefix PATH : '${cabal2nix}/bin' \
+      --prefix PATH : '${cabal-install}/bin'
+  '';
+  description = "A dependency manager for Haskell";
+  homepage = "https://github.com/sol/tinc#readme";
+  license = stdenv.lib.licenses.mit;
+  maintainers = [ stdenv.lib.maintainers.robbinch ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec6b5e83065..ffc88d1cf48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6302,6 +6302,8 @@ in
 
   texi2html = callPackage ../development/tools/misc/texi2html { };
 
+  tinc-haskell = haskellPackages.callPackage ../development/tools/misc/tinc { };
+
   travis = callPackage ../development/tools/misc/travis { };
 
   tweak = callPackage ../applications/editors/tweak { };

From 11e252e5a08e27d189f4688b99b88a4e4859bcee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Apr 2016 17:16:59 +0200
Subject: [PATCH 050/712] aws-sdk-cpp: 0.9.6 -> 0.10.6

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

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 6a881e4245a..1848bd064f1 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   name = "aws-sdk-cpp-${version}";
-  version = "0.9.6";
+  version = "0.10.6";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-sdk-cpp";
     rev = version;
-    sha256 = "022v7naa5vjvq3wfn4mcp99li61ffsk2fnc8qqi52cb1pyxz9sk1";
+    sha256 = "1x3xam7vprlld6iqhqgdhgmqyclfy8dvzgy3375cijy9akhvv67i";
   };
 
   buildInputs = [ cmake curl ];

From 7e934fbf735a29a828d7c2d0b547b8821bbab645 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Thu, 21 Apr 2016 19:47:02 +0300
Subject: [PATCH 051/712] android-studio: 2.0.0.0 -> 2.0.0.20

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

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 5d20d0578ea..e93e5840b69 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -148,14 +148,14 @@ in
 
   android-studio = buildAndroidStudio rec {
     name = "android-studio-${version}";
-    version = "2.0.0.0";
-    build = "143.2443734";
+    version = "2.0.0.20";
+    build = "143.2739321";
     description = "Android development environment based on IntelliJ IDEA";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" +
             "/android-studio-ide-${build}-linux.zip";
-      sha256 = "0j6bi87hb5jxjwfhfya64s673vdkdslsqc6sqa4zl97sabvafk2w";
+      sha256 = "14bb4ha868015wm8v8vivxfylfzm7gbvf01h82w4bhzdbzgn1zpr";
     };
   };
 

From 1e4ebcdf2db23881f9430b290f330d3963079999 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Thu, 21 Apr 2016 14:50:03 -0400
Subject: [PATCH 052/712] redis: enable Lua scripting support

---
 pkgs/servers/nosql/redis/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 04bb9fc2bbd..16a2ec21079 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, lua }:
 
 stdenv.mkDerivation rec {
   version = "3.0.7";
@@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "08vzfdr67gp3lvk770qpax2c5g2sx8hn6p64jn3jddrvxb2939xj";
   };
 
+  buildInputs = [ lua ];
   makeFlags = "PREFIX=$(out)";
 
   enableParallelBuilding = true;

From ba08f0014de4456fbd2ae3bed4726d2f1121aa1b Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 21 Apr 2016 23:03:46 +0200
Subject: [PATCH 053/712] libraw: 0.17.0 -> 0.17.1

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

diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index 031886d3451..ee842b0c4bd 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libraw-${version}";
-  version = "0.17.0";
+  version = "0.17.1";
 
   src = fetchurl {
     url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz";
-    sha256 = "043kckxjqanw8dl3m9f6kvsf0l20ywxmgxd1xb0slj6m8l4w4hz6";
+    sha256 = "18fygk896gxbx47nh2rn5jp4skisgkl6pdfjqb7h0zn39hd6b6g5";
   };
 
   buildInputs = [ lcms2 jasper ];

From e59151f3ef01911a5ba86782bed5cb72982811f0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 22 Apr 2016 00:54:31 +0200
Subject: [PATCH 054/712] nix-binary-cache: take into account Nix split
 (mulitple-outputs)

---
 pkgs/servers/http/nix-binary-cache/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix
index 674557d74fc..33801c8cd32 100644
--- a/pkgs/servers/http/nix-binary-cache/default.nix
+++ b/pkgs/servers/http/nix-binary-cache/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
       --replace @shell@ "${stdenv.shell}" \
       --replace @coreutils@ "${coreutils}/bin" \
       --replace @findutils@ "${findutils}/bin" \
-      --replace @nix@ "${nix}/bin" \
+      --replace @nix@ "${nix.out}/bin" \
       --replace @xz@ "${xz.bin}/bin" \
       --replace @bzip2@ "${bzip2.bin}/bin" \
       --replace @gnused@ "${gnused}/bin" \
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       --replace @shell@ "${stdenv.shell}" \
       --replace @coreutils@ "${coreutils}/bin" \
       --replace @findutils@ "${findutils}/bin" \
-      --replace @nix@ "${nix}/bin" \
+      --replace @nix@ "${nix.out}/bin" \
       --replace @xz@ "${xz.bin}/bin" \
       --replace @bzip2@ "${bzip2.bin}/bin" \
       --replace @gnused@ "${gnused}/bin" \

From 38aa457f9a9cac462a9c952f459631b0ebf951a5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 22 Apr 2016 00:57:21 +0200
Subject: [PATCH 055/712] sgtpuzzles: add a .upstream file for autoupdating

---
 pkgs/games/sgt-puzzles/default.upstream | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 pkgs/games/sgt-puzzles/default.upstream

diff --git a/pkgs/games/sgt-puzzles/default.upstream b/pkgs/games/sgt-puzzles/default.upstream
new file mode 100644
index 00000000000..b6d048b68ae
--- /dev/null
+++ b/pkgs/games/sgt-puzzles/default.upstream
@@ -0,0 +1,5 @@
+minimize_overwrite
+url http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles.tar.gz
+redirect
+NEED_TO_CHOOSE_URL=
+version '.*[-_.]([0-9]{8}[.][^.]+)[.]tar[.].*' '\1'

From 0ddf8c7f6fd4241e26016327ec85c5b958bdc32c Mon Sep 17 00:00:00 2001
From: Andrew Burkett <andrew@andrew-nix.internal.sieinc.com>
Date: Thu, 21 Apr 2016 15:01:44 -0700
Subject: [PATCH 056/712] scrapy: init at 1.0.5

---
 lib/maintainers.nix                |  1 +
 pkgs/top-level/python-packages.nix | 60 ++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 717d04e2031..1140362c16e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -102,6 +102,7 @@
   dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>";
   dochang = "Desmond O. Chang <dochang@gmail.com>";
   doublec = "Chris Double <chris.double@double.co.nz>";
+  drewkett = "Andrew Burkett <burkett.andrew@gmail.com>";
   ebzzry = "Rommel Martinez <ebzzry@gmail.com>";
   ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>";
   eduarrrd = "Eduard Bachmakov <e.bachmakov@gmail.com>";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3d1e2026a82..77974dff752 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26423,4 +26423,64 @@ in modules // {
     };
   };
 
+  w3lib = buildPythonPackage rec {
+    name = "w3lib-${version}";
+    version = "1.14.2";
+
+    buildInputs = with self ; [ six pytest ];
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/w/w3lib/${name}.tar.gz";
+      sha256 = "bd87eae62d208eef70869951abf05e96a8ee559714074a485168de4c5b190004";
+    };
+
+    meta = {
+      description = "A library of web-related functions";
+      homepage = "https://github.com/scrapy/w3lib";
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ drewkett ];
+    };
+  };
+
+  queuelib = buildPythonPackage rec {
+    name = "queuelib-${version}";
+    version = "1.4.2";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/q/queuelib/${name}.tar.gz";
+      sha256 = "a6829918157ed433fafa87b0bb1e93e3e63c885270166db5884a02c34c86f914";
+    };
+
+    buildInputs = with self ; [ pytest ];
+
+    meta = {
+      description = "A collection of persistent (disk-based) queues for Python";
+      homepage = "https://github.com/scrapy/queuelib";
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ drewkett ];
+    };
+  };
+
+  scrapy = buildPythonPackage rec {
+    name = "Scrapy-${version}";
+    version = "1.0.5";
+
+    disabled = isPy3k;
+
+    buildInputs = with self ; [ pytest ];
+    propagatedBuildInputs = with self ; [ six twisted w3lib lxml cssselect queuelib pyopenssl service-identity ];
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/S/Scrapy/${name}.tar.gz";
+      sha256 = "0a51c785a310d65f6e70285a2da56d48ef7d049bd7fd60a08eef05c52328ca96";
+    };
+
+    meta = {
+      description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages";
+      homepage = "http://scrapy.org/";
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ drewkett ];
+      platforms = platforms.linux;
+    };
+  };
 }

From 9c0997a0ef62d178d6bc88aeacc2643481edef9e Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Tue, 12 Apr 2016 13:31:47 -0700
Subject: [PATCH 057/712] hoogle service: init

---
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/development/hoogle.nix | 68 +++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 nixos/modules/services/development/hoogle.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e59ec07b8aa..41210e64851 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -158,6 +158,7 @@
   ./services/desktops/gnome3/tracker.nix
   ./services/desktops/profile-sync-daemon.nix
   ./services/desktops/telepathy.nix
+  ./services/development/hoogle.nix
   ./services/games/factorio.nix
   ./services/games/ghost-one.nix
   ./services/games/minecraft-server.nix
diff --git a/nixos/modules/services/development/hoogle.nix b/nixos/modules/services/development/hoogle.nix
new file mode 100644
index 00000000000..27281774b6f
--- /dev/null
+++ b/nixos/modules/services/development/hoogle.nix
@@ -0,0 +1,68 @@
+{ config, lib, pkgs, ... }:
+
+# services.hoogle = {
+#   enable = true;
+#   packages = hp: with hp; [ text lens ];
+#   haskellPackages = pkgs.haskellPackages;
+# };
+
+with lib;
+
+let
+
+  cfg = config.services.hoogle;
+  ghcWithHoogle = pkgs.haskellPackages.ghcWithHoogle;
+
+in {
+
+  options.services.hoogle = {
+    enable = mkEnableOption "Hoogle Documentation service";
+
+    port = mkOption {
+      type = types.int;
+      default = 8080;
+      description = ''
+        Port number Hoogle will be listening to.
+      '';
+    };
+
+    packages = mkOption {
+      default = hp: [];
+      example = "hp: with hp; [ text lens ]";
+      description = ''
+        A function that returns a list of Haskell packages to generate
+        documentation for.
+
+        The argument will be a Haskell package set provided by the
+        haskellPackages config option.
+      '';
+    };
+
+    haskellPackages = mkOption {
+      description = "Which haskell package set to use.";
+      example = "pkgs.haskellPackages";
+      type = types.attrs;
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.hoogle = {
+      description = "Hoogle Haskell documentation search";
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        Restart = "always";
+        ExecStart =
+          let env = cfg.haskellPackages.ghcWithHoogle cfg.packages;
+              hoogleEnv = pkgs.buildEnv {
+                name = "hoogleServiceEnv";
+                paths = [env];
+              };
+          in ''
+            ${hoogleEnv}/bin/hoogle server --local -p ${toString cfg.port}
+          '';
+      };
+    };
+  };
+
+}

From 2e7b0bbd2244d6314b83cdd4868cc30dfda96575 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 22 Apr 2016 02:28:29 +0200
Subject: [PATCH 058/712] hoogle service: fixups

Basic hardening
- Run as nobody:nogroup with a private /tmp, /home & /run/user
- Create working directory under /run (hoogle insists on writing to cwd
  and otherwise returns "something went wrong" to every query)

Option tweaks
- Provide a default for the haskellPackage option
- Set text values for defaults
- Move hoogleEnv to the top-level & simplify it
---
 nixos/modules/services/development/hoogle.nix | 50 ++++++++++---------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/nixos/modules/services/development/hoogle.nix b/nixos/modules/services/development/hoogle.nix
index 27281774b6f..90aa04d2762 100644
--- a/nixos/modules/services/development/hoogle.nix
+++ b/nixos/modules/services/development/hoogle.nix
@@ -1,22 +1,20 @@
 { config, lib, pkgs, ... }:
 
-# services.hoogle = {
-#   enable = true;
-#   packages = hp: with hp; [ text lens ];
-#   haskellPackages = pkgs.haskellPackages;
-# };
-
 with lib;
 
 let
 
   cfg = config.services.hoogle;
-  ghcWithHoogle = pkgs.haskellPackages.ghcWithHoogle;
+
+  hoogleEnv = pkgs.buildEnv {
+    name = "hoogle";
+    paths = [ (cfg.haskellPackages.ghcWithHoogle cfg.packages) ];
+  };
 
 in {
 
   options.services.hoogle = {
-    enable = mkEnableOption "Hoogle Documentation service";
+    enable = mkEnableOption "Haskell documentation server";
 
     port = mkOption {
       type = types.int;
@@ -28,39 +26,43 @@ in {
 
     packages = mkOption {
       default = hp: [];
+      defaultText = "hp: []";
       example = "hp: with hp; [ text lens ]";
       description = ''
-        A function that returns a list of Haskell packages to generate
-        documentation for.
+        The Haskell packages to generate documentation for.
 
-        The argument will be a Haskell package set provided by the
-        haskellPackages config option.
+        The option value is a function that takes the package set specified in
+        the <varname>haskellPackages</varname> option as its sole parameter and
+        returns a list of packages.
       '';
     };
 
     haskellPackages = mkOption {
       description = "Which haskell package set to use.";
-      example = "pkgs.haskellPackages";
-      type = types.attrs;
+      default = pkgs.haskellPackages;
+      defaultText = "pkgs.haskellPackages";
     };
 
   };
 
   config = mkIf cfg.enable {
     systemd.services.hoogle = {
-      description = "Hoogle Haskell documentation search";
+      description = "Haskell documentation server";
+
       wantedBy = [ "multi-user.target" ];
+
       serviceConfig = {
         Restart = "always";
-        ExecStart =
-          let env = cfg.haskellPackages.ghcWithHoogle cfg.packages;
-              hoogleEnv = pkgs.buildEnv {
-                name = "hoogleServiceEnv";
-                paths = [env];
-              };
-          in ''
-            ${hoogleEnv}/bin/hoogle server --local -p ${toString cfg.port}
-          '';
+        ExecStart = ''${hoogleEnv}/bin/hoogle server --local -p ${toString cfg.port}'';
+
+        User = "nobody";
+        Group = "nogroup";
+
+        PrivateTmp = true;
+        ProtectHome = true;
+
+        RuntimeDirectory = "hoogle";
+        WorkingDirectory = "%t/hoogle";
       };
     };
   };

From 672efb940f343ad0947b2d7fb125a6df38a5b079 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 22 Apr 2016 04:08:21 +0200
Subject: [PATCH 059/712] torbrowser: fix torEnv after multiple-outputs

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

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index ef00a8538a9..75cc832f85b 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -6,9 +6,9 @@ let
   torEnv = buildEnv {
     name = "tor-env";
     paths = [
-      stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype
-      fontconfig gdk_pixbuf cairo xorg.libXrender xorg.libX11 xorg.libXext
-      xorg.libXt
+      stdenv.cc.cc.lib zlib glib alsaLib dbus.lib dbus_glib gtk atk pango.out
+      freetype fontconfig.lib gdk_pixbuf cairo xorg.libXrender xorg.libX11
+      xorg.libXext xorg.libXt
     ];
   };
 

From f3fd0dcd90dfe9738627be31a9f1e64717545b53 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Thu, 21 Apr 2016 19:10:10 -0700
Subject: [PATCH 060/712] plex: plexpass: 0.9.16.4.1911 -> 0.9.16.5.1966

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

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 22a5c852e15..50fc85d48b3 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -5,9 +5,9 @@
 
 let
   plexpkg = if enablePlexPass then {
-    version = "0.9.16.4.1911";
-    vsnHash = "ee6e505";
-    sha256 = "0lq0lcynmc09d0whynb0x2zgd39dp7z7k86ndgm2clay3zbzqpfd";
+    version = "0.9.16.5.1966";
+    vsnHash = "81a3bf0";
+    sha256 = "1sgdd3r067j9ysfp90wjx6zi01s00wzgzs27l8xdlsbnvjr8zmf8";
   } else {
     version = "0.9.16.4.1911";
     vsnHash = "ee6e505";

From 008d47131f41248bd0917424871ac6dd126a3b09 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 22 Apr 2016 04:14:21 +0200
Subject: [PATCH 061/712] Revert "torbrowser: fix torEnv after
 multiple-outputs"

This reverts commit 672efb940f343ad0947b2d7fb125a6df38a5b079.

This is a terrible fix, use buildEnv's extraOutputsToInstall instead.
---
 pkgs/tools/security/tor/torbrowser.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index 75cc832f85b..ef00a8538a9 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -6,9 +6,9 @@ let
   torEnv = buildEnv {
     name = "tor-env";
     paths = [
-      stdenv.cc.cc.lib zlib glib alsaLib dbus.lib dbus_glib gtk atk pango.out
-      freetype fontconfig.lib gdk_pixbuf cairo xorg.libXrender xorg.libX11
-      xorg.libXext xorg.libXt
+      stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype
+      fontconfig gdk_pixbuf cairo xorg.libXrender xorg.libX11 xorg.libXext
+      xorg.libXt
     ];
   };
 

From 0122cbfd5905d228a43c2e176836c9e577c33bb7 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 22 Apr 2016 04:19:11 +0200
Subject: [PATCH 062/712] torbrowser: also install lib and out into the torEnv

---
 pkgs/tools/security/tor/torbrowser.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index ef00a8538a9..c320e7e58b6 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -10,6 +10,7 @@ let
       fontconfig gdk_pixbuf cairo xorg.libXrender xorg.libX11 xorg.libXext
       xorg.libXt
     ];
+    extraOutputsToInstall = [ "lib" "out" ];
   };
 
   ldLibraryPath = ''${torEnv}/lib${stdenv.lib.optionalString stdenv.is64bit ":${torEnv}/lib64"}'';

From 390abc547b709eceb333d80d4478baf091c4303d Mon Sep 17 00:00:00 2001
From: Micxjo Funkcio <micxjo@fastmail.com>
Date: Thu, 21 Apr 2016 20:31:58 -0700
Subject: [PATCH 063/712] gnuplot: 5.0.0 -> 5.0.3

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

diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index 2b78f1fba40..5c70d0e7d0a 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -21,11 +21,11 @@ let
   withX = libX11 != null && !aquaterm && !stdenv.isDarwin;
 in
 stdenv.mkDerivation rec {
-  name = "gnuplot-5.0.0";
+  name = "gnuplot-5.0.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/gnuplot/${name}.tar.gz";
-    sha256 = "1bqg6zbsin9w9m53rbf6adzv0j2gs66z2p5pkd060jlipk2lnza1";
+    sha256 = "05f7p21d2b0r3h0af8i75bh2inx9pws1k4crx5c400927xgy6vjz";
   };
 
   buildInputs =

From 50d6c3ba3874c5b79750868786ca0de9982390b4 Mon Sep 17 00:00:00 2001
From: Sheena Artrip <sheena.artrip@gmail.com>
Date: Fri, 22 Apr 2016 02:39:42 -0400
Subject: [PATCH 064/712] virtualbox: obey NIX_BUILD_CORES for make invocation

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

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index f09480ba394..371acbed5e6 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -33,7 +33,7 @@ let
           "$mod/Module.symvers"
       fi
       INSTALL_MOD_PATH="$out" INSTALL_MOD_DIR=misc \
-      make -C "$MODULES_BUILD_DIR" DEPMOD=/do_not_use_depmod \
+      make -j $NIX_BUILD_CORES -C "$MODULES_BUILD_DIR" DEPMOD=/do_not_use_depmod \
         "M=\$(PWD)/$mod" BUILD_TYPE="${buildType}" ${action}
     done
   '';
@@ -144,7 +144,7 @@ in stdenv.mkDerivation {
 
   buildPhase = ''
     source env.sh
-    kmk BUILD_TYPE="${buildType}"
+    kmk -j $NIX_BUILD_CORES BUILD_TYPE="${buildType}"
     ${forEachModule "modules"}
   '';
 

From f1675d9137f97d125a0bfbc5977b1b4778b78629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Fri, 22 Apr 2016 09:29:39 +0200
Subject: [PATCH 065/712] tsocks: use musl instead of glibc

---
 pkgs/top-level/all-packages.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ee6c190ad4..61f714c3ad9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8953,7 +8953,11 @@ in
 
   unicap = callPackage ../development/libraries/unicap {};
 
-  tsocks = callPackage ../development/libraries/tsocks { };
+  tsocks = callPackage ../development/libraries/tsocks {
+    stdenv = overrideCC stdenv (
+      wrapCCWith (callPackage ../build-support/cc-wrapper)
+      musl "" gcc.cc);
+  };
 
   unixODBC = callPackage ../development/libraries/unixODBC { };
 

From 01854a850a7e62c6a4f1de7c4ca0f1c9d89841c8 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 22 Apr 2016 10:40:57 +0300
Subject: [PATCH 066/712] treewide: Replace module_init_tools -> kmod

The former is deprecated and doesn't handle compressed kernel modules,
so all current usages of it are broken.
---
 .../hardware/video/webcam/facetimehd.nix      |  4 +--
 .../openafs-client/default.nix                |  4 +--
 nixos/modules/virtualisation/qemu-vm.nix      | 10 +++----
 pkgs/build-support/vm/default.nix             | 28 +++++++++----------
 .../os-specific/linux/pcmciautils/default.nix |  6 ++--
 pkgs/os-specific/linux/pm-utils/default.nix   |  4 +--
 pkgs/tools/X11/bumblebee/default.nix          |  6 ++--
 pkgs/tools/misc/tlp/default.nix               |  4 +--
 .../network-manager/openconnect.nix           |  4 +--
 .../networking/network-manager/openvpn.nix    |  4 +--
 .../tools/networking/network-manager/vpnc.nix |  4 +--
 11 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/nixos/modules/hardware/video/webcam/facetimehd.nix b/nixos/modules/hardware/video/webcam/facetimehd.nix
index b35709763b9..309cedca48b 100644
--- a/nixos/modules/hardware/video/webcam/facetimehd.nix
+++ b/nixos/modules/hardware/video/webcam/facetimehd.nix
@@ -31,13 +31,13 @@ in
 
     # unload module during suspend/hibernate as it crashes the whole system
     powerManagement.powerDownCommands = ''
-      ${pkgs.module_init_tools}/bin/rmmod -f facetimehd
+      ${pkgs.kmod}/bin/rmmod -f facetimehd
     '';
 
     # and load it back on resume
     powerManagement.resumeCommands = ''
       export MODULE_DIR=/run/current-system/kernel-modules/lib/modules
-      ${pkgs.module_init_tools}/bin/modprobe -v facetimehd
+      ${pkgs.kmod}/bin/modprobe -v facetimehd
     '';
 
   };
diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix
index 7a44fc1ea5e..61c66bb8835 100644
--- a/nixos/modules/services/network-filesystems/openafs-client/default.nix
+++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix
@@ -80,7 +80,7 @@ in
       preStart = ''
         mkdir -p -m 0755 /afs
         mkdir -m 0700 -p ${cfg.cacheDirectory}
-        ${pkgs.module_init_tools}/sbin/insmod ${openafsPkgs}/lib/openafs/libafs-*.ko || true
+        ${pkgs.kmod}/sbin/insmod ${openafsPkgs}/lib/openafs/libafs-*.ko || true
         ${openafsPkgs}/sbin/afsd -confdir ${afsConfig} -cachedir ${cfg.cacheDirectory} ${if cfg.sparse then "-dynroot-sparse" else "-dynroot"} -fakestat -afsdb
         ${openafsPkgs}/bin/fs setcrypt ${if cfg.crypt then "on" else "off"}
       '';
@@ -92,7 +92,7 @@ in
       preStop = ''
         ${pkgs.utillinux}/bin/umount /afs
         ${openafsPkgs}/sbin/afsd -shutdown
-        ${pkgs.module_init_tools}/sbin/rmmod libafs
+        ${pkgs.kmod}/sbin/rmmod libafs
       '';
     };
   };
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 7dfbc38efee..7269fae5194 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -149,11 +149,11 @@ let
           ${pkgs.mtools}/bin/mlabel -i /dev/vda2 ::boot
 
           # Mount /boot; load necessary modules first.
-          ${pkgs.module_init_tools}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_cp437.ko || true
-          ${pkgs.module_init_tools}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_iso8859-1.ko || true
-          ${pkgs.module_init_tools}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/fat.ko || true
-          ${pkgs.module_init_tools}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/vfat.ko || true
-          ${pkgs.module_init_tools}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/efivarfs/efivarfs.ko || true
+          ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_cp437.ko || true
+          ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_iso8859-1.ko || true
+          ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/fat.ko || true
+          ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/vfat.ko || true
+          ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/efivarfs/efivarfs.ko || true
           mkdir /boot
           mount /dev/vda2 /boot
 
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index e670e1ef225..2d33a197346 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -329,14 +329,14 @@ rec {
       buildInputs = [ utillinux ];
       buildCommand = ''
         ln -s ${linux}/lib /lib
-        ${module_init_tools}/bin/modprobe loop
-        ${module_init_tools}/bin/modprobe ext4
-        ${module_init_tools}/bin/modprobe hfs
-        ${module_init_tools}/bin/modprobe hfsplus
-        ${module_init_tools}/bin/modprobe squashfs
-        ${module_init_tools}/bin/modprobe iso9660
-        ${module_init_tools}/bin/modprobe ufs
-        ${module_init_tools}/bin/modprobe cramfs
+        ${kmod}/bin/modprobe loop
+        ${kmod}/bin/modprobe ext4
+        ${kmod}/bin/modprobe hfs
+        ${kmod}/bin/modprobe hfsplus
+        ${kmod}/bin/modprobe squashfs
+        ${kmod}/bin/modprobe iso9660
+        ${kmod}/bin/modprobe ufs
+        ${kmod}/bin/modprobe cramfs
         mknod /dev/loop0 b 7 0
 
         mkdir -p $out
@@ -355,12 +355,12 @@ rec {
       buildInputs = [ utillinux mtdutils ];
       buildCommand = ''
         ln -s ${linux}/lib /lib
-        ${module_init_tools}/bin/modprobe mtd
-        ${module_init_tools}/bin/modprobe mtdram total_size=131072
-        ${module_init_tools}/bin/modprobe mtdchar
-        ${module_init_tools}/bin/modprobe mtdblock
-        ${module_init_tools}/bin/modprobe jffs2
-        ${module_init_tools}/bin/modprobe zlib
+        ${kmod}/bin/modprobe mtd
+        ${kmod}/bin/modprobe mtdram total_size=131072
+        ${kmod}/bin/modprobe mtdchar
+        ${kmod}/bin/modprobe mtdblock
+        ${kmod}/bin/modprobe jffs2
+        ${kmod}/bin/modprobe zlib
         mknod /dev/mtd0 c 90 0
         mknod /dev/mtdblock0 b 31 0
 
diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix
index ce5814965ef..3e41df9465f 100644
--- a/pkgs/os-specific/linux/pcmciautils/default.nix
+++ b/pkgs/os-specific/linux/pcmciautils/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , yacc, flex
-, sysfsutils, module_init_tools, udev
+, sysfsutils, kmod, udev
 , firmware # Special pcmcia cards.
 , config   # Special hardware (map memory & port & irq)
 , lib      # used to generate postInstall script.
@@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
     sha256 = "5d8e2efad8a7f692129610603da232f2144851753d8d49a70eeb8eb1be6f6bc3";
   };
 
-  buildInputs = [udev yacc sysfsutils module_init_tools flex];
+  buildInputs = [udev yacc sysfsutils kmod flex];
 
   patchPhase = ''
     sed -i "
-      s,/sbin/modprobe,${module_init_tools}&,;
+      s,/sbin/modprobe,${kmod}&,;
       s,/lib/udev/,$out/sbin/,;
     " udev/* # fix-color */
     sed -i "
diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix
index 19315ec2d0b..cb74dc204a3 100644
--- a/pkgs/os-specific/linux/pm-utils/default.nix
+++ b/pkgs/os-specific/linux/pm-utils/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, coreutils, gnugrep, utillinux, module_init_tools
+{ stdenv, fetchurl, coreutils, gnugrep, utillinux, kmod
 , procps, kbd, dbus_tools }:
 
 let
 
   binPath = stdenv.lib.makeBinPath
-    [ coreutils gnugrep utillinux module_init_tools procps kbd dbus_tools ];
+    [ coreutils gnugrep utillinux kmod procps kbd dbus_tools ];
 
   sbinPath = stdenv.lib.makeSearchPathOutputs "sbin" ["bin"]
     [ procps ];
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix
index d1f2318d6d4..803fd0dd850 100644
--- a/pkgs/tools/X11/bumblebee/default.nix
+++ b/pkgs/tools/X11/bumblebee/default.nix
@@ -18,7 +18,7 @@
 
 { stdenv, lib, fetchurl, pkgconfig, help2man, makeWrapper
 , glib, libbsd
-, libX11, libXext, xorgserver, xkbcomp, module_init_tools, xkeyboard_config, xf86videonouveau
+, libX11, libXext, xorgserver, xkbcomp, kmod, xkeyboard_config, xf86videonouveau
 , nvidia_x11, virtualgl, primusLib
 # The below should only be non-null in a x86_64 system. On a i686
 # system the above nvidia_x11 and virtualgl will be the i686 packages.
@@ -43,7 +43,7 @@ let
 
   nvidiaLibs = lib.makeLibraryPath nvidia_x11s;
 
-  bbdPath = lib.makeBinPath [ module_init_tools xorgserver ];
+  bbdPath = lib.makeBinPath [ kmod xorgserver ];
   bbdLibs = lib.makeLibraryPath [ libX11 libXext ];
 
   xmodules = lib.concatStringsSep "," (map (x: "${x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau));
@@ -80,7 +80,7 @@ in stdenv.mkDerivation rec {
     # be in PATH, and thus no action for them is required.
 
     substituteInPlace src/module.c \
-      --replace "/sbin/modinfo" "${module_init_tools}/sbin/modinfo"
+      --replace "/sbin/modinfo" "${kmod}/sbin/modinfo"
 
     # Don't use a special group, just reuse wheel.
     substituteInPlace configure \
diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix
index e20dc850008..d290c9f9a5a 100644
--- a/pkgs/tools/misc/tlp/default.nix
+++ b/pkgs/tools/misc/tlp/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, perl, systemd, iw, rfkill, hdparm, ethtool, inetutils
-, module_init_tools, pciutils, smartmontools, x86_energy_perf_policy, gawk, gnugrep, coreutils
+, kmod, pciutils, smartmontools, x86_energy_perf_policy, gawk, gnugrep, coreutils
 , enableRDW ? false, networkmanager
 }:
 
@@ -27,7 +27,7 @@ in stdenv.mkDerivation {
   buildInputs = [ perl ];
 
   paths = lib.makeBinPath
-          ([ iw rfkill hdparm ethtool inetutils systemd module_init_tools pciutils smartmontools
+          ([ iw rfkill hdparm ethtool inetutils systemd kmod pciutils smartmontools
              x86_energy_perf_policy gawk gnugrep coreutils
            ]
            ++ lib.optional enableRDW networkmanager
diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix
index 0009aaf6b44..6a93100fa10 100644
--- a/pkgs/tools/networking/network-manager/openconnect.nix
+++ b/pkgs/tools/networking/network-manager/openconnect.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager, libsecret
-, withGnome ? true, gnome3, procps, module_init_tools }:
+, withGnome ? true, gnome3, procps, kmod }:
 
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
        --replace "/sbin/sysctl" "${procps}/sbin/sysctl"
      substituteInPlace "src/nm-openconnect-service.c" \
        --replace "/usr/sbin/openconnect" "${openconnect}/sbin/openconnect" \
-       --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe"
+       --replace "/sbin/modprobe" "${kmod}/sbin/modprobe"
   '';
 
   postConfigure = ''
diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix
index be026457195..4b98600611e 100644
--- a/pkgs/tools/networking/network-manager/openvpn.nix
+++ b/pkgs/tools/networking/network-manager/openvpn.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openvpn, intltool, pkgconfig, networkmanager, libsecret
-, withGnome ? true, gnome3, procps, module_init_tools }:
+, withGnome ? true, gnome3, procps, kmod }:
 
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
        --replace "/sbin/sysctl" "${procps}/sbin/sysctl"
      substituteInPlace "src/nm-openvpn-service.c" \
        --replace "/sbin/openvpn" "${openvpn}/sbin/openvpn" \
-       --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe"
+       --replace "/sbin/modprobe" "${kmod}/sbin/modprobe"
      substituteInPlace "properties/auth-helpers.c" \
        --replace "/sbin/openvpn" "${openvpn}/sbin/openvpn"
   '';
diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix
index 5f3ab00ebc4..64de5408c7e 100644
--- a/pkgs/tools/networking/network-manager/vpnc.nix
+++ b/pkgs/tools/networking/network-manager/vpnc.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager, libsecret
-, withGnome ? true, gnome3, procps, module_init_tools }:
+, withGnome ? true, gnome3, procps, kmod }:
 
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
        --replace "/sbin/sysctl" "${procps}/sbin/sysctl"
      substituteInPlace "src/nm-vpnc-service.c" \
        --replace "/sbin/vpnc" "${vpnc}/sbin/vpnc" \
-       --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe"
+       --replace "/sbin/modprobe" "${kmod}/sbin/modprobe"
   '';
 
   postConfigure = ''

From d0c127487fd607c9c66cb0a1a4d1eb9782632ae1 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 22 Apr 2016 10:42:31 +0300
Subject: [PATCH 067/712] qemu-img: Fix module paths

They are compressed nowadays.

Not sure if these are really needed since nobody noticed they were
broken, but anyway...
---
 nixos/modules/virtualisation/qemu-vm.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 7269fae5194..d9b866d2e55 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -149,11 +149,11 @@ let
           ${pkgs.mtools}/bin/mlabel -i /dev/vda2 ::boot
 
           # Mount /boot; load necessary modules first.
-          ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_cp437.ko || true
-          ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_iso8859-1.ko || true
-          ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/fat.ko || true
-          ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/vfat.ko || true
-          ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/efivarfs/efivarfs.ko || true
+          ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_cp437.ko.xz || true
+          ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_iso8859-1.ko.xz || true
+          ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/fat.ko.xz || true
+          ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/vfat.ko.xz || true
+          ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/efivarfs/efivarfs.ko.xz || true
           mkdir /boot
           mount /dev/vda2 /boot
 

From 0f8a49bb4511b29985d426d3e1b0e83c9d3eb763 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 22 Apr 2016 10:44:55 +0300
Subject: [PATCH 068/712] module_init_tools: Remove

It is deprecated doesn't handle compressed modules, unlike its modern
counterpart kmod.

Add a compatibility alias to kmod for now in case someone is depending
on this in their scripts.
---
 .../linux/module-init-tools/default.nix       |  38 -----
 .../linux/module-init-tools/docbook2man.patch |  12 --
 .../linux/module-init-tools/module-dir.patch  | 161 ------------------
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   2 -
 pkgs/top-level/release-small.nix              |   1 -
 6 files changed, 1 insertion(+), 214 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/module-init-tools/default.nix
 delete mode 100644 pkgs/os-specific/linux/module-init-tools/docbook2man.patch
 delete mode 100644 pkgs/os-specific/linux/module-init-tools/module-dir.patch

diff --git a/pkgs/os-specific/linux/module-init-tools/default.nix b/pkgs/os-specific/linux/module-init-tools/default.nix
deleted file mode 100644
index ded6e77e43b..00000000000
--- a/pkgs/os-specific/linux/module-init-tools/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, docbook2x, docbook_sgml_dtd_41 }:
-
-assert (stdenv.lib.elem stdenv.system stdenv.lib.platforms.linux);
-
-stdenv.mkDerivation {
-  name = "module-init-tools-3.16";
-
-  src = [
-    (fetchurl {
-      url = http://ftp.be.debian.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.16.tar.bz2;
-      sha256 = "0jxnz9ahfic79rp93l5wxcbgh4pkv85mwnjlbv1gz3jawv5cvwp1";
-    })
-
-    # Upstream forgot to include the generated manpages.  Thankfully
-    # the Gentoo people fixed this for us :-)
-    (fetchurl {
-      urls = [
-        mirror://gentoo/distfiles/module-init-tools-3.16-man.tar.bz2
-        http://mirror.meleeweb.net/pub/linux/gentoo/distfiles/module-init-tools-3.16-man.tar.bz2
-      ];
-      sha256 = "1j1nzi87kgsh4scl645fhwhjvljxj83cmdasa4n4p5krhasgw358";
-    })
-  ];
-
-  buildInputs = [ stdenv.glibc.dev stdenv.glibc.static ];
-
-  SGML_CATALOG_FILES = "${docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat";
-
-  patches = [ ./module-dir.patch ./docbook2man.patch ];
-
-  postInstall = "rm $out/sbin/insmod.static"; # don't need it
-
-  meta = {
-    homepage = http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/;
-    description = "Tools for loading and managing Linux kernel modules";
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/os-specific/linux/module-init-tools/docbook2man.patch b/pkgs/os-specific/linux/module-init-tools/docbook2man.patch
deleted file mode 100644
index 4de07b658a9..00000000000
--- a/pkgs/os-specific/linux/module-init-tools/docbook2man.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur module-init-tools-3.16-orig/Makefile.in module-init-tools-3.16/Makefile.in
---- module-init-tools-3.16-orig/Makefile.in	2011-06-02 13:56:45.000000000 -0400
-+++ module-init-tools-3.16/Makefile.in	2011-10-01 23:59:30.584443193 -0400
-@@ -174,7 +174,7 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--DOCBOOKTOMAN = @DOCBOOKTOMAN@
-+DOCBOOKTOMAN = @DOCBOOKTOMAN@ --sgml
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
diff --git a/pkgs/os-specific/linux/module-init-tools/module-dir.patch b/pkgs/os-specific/linux/module-init-tools/module-dir.patch
deleted file mode 100644
index 95c7559604d..00000000000
--- a/pkgs/os-specific/linux/module-init-tools/module-dir.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-commit cf2c95edb7918bc658f6cae93793c1949fc9cb6e
-Author: David Guibert <david.guibert@gmail.com>
-Date:   Fri Aug 5 14:20:12 2011 +0200
-
-    introduce module-dir
-
-diff --git a/depmod.c b/depmod.c
-index a1d2f8c..9362a35 100644
---- a/depmod.c
-+++ b/depmod.c
-@@ -48,9 +48,6 @@
- 
- #include "testing.h"
- 
--#ifndef MODULE_DIR
--#define MODULE_DIR "/lib/modules/"
--#endif
- 
- #ifndef MODULE_BUILTIN_KEY
- #define MODULE_BUILTIN_KEY "built-in"
-@@ -1516,6 +1513,7 @@ static int parse_config_file(const char *filename,
- 	char *line;
- 	unsigned int linenum = 0;
- 	FILE *cfile;
-+ 	char *module_dir;
- 
- 	cfile = fopen(filename, "r");
- 	if (!cfile) {
-@@ -1525,6 +1523,10 @@ static int parse_config_file(const char *filename,
- 		return 0;
- 	}
- 
-+        if((module_dir = getenv("MODULE_DIR")) == NULL) {
-+                module_dir = "/lib/modules/";
-+        }
-+
- 	while ((line = getline_wrapped(cfile, &linenum)) != NULL) {
- 		char *ptr = line;
- 		char *cmd, *modname;
-@@ -1550,7 +1552,7 @@ static int parse_config_file(const char *filename,
- 					continue;
- 				}
- 				nofail_asprintf(&dirname, "%s%s%s/%s", basedir,
--					MODULE_DIR, kernelversion, search_path);
-+					module_dir, kernelversion, search_path);
- 				len = strlen(dirname);
- 				*search = add_search(dirname, len, *search);
- 				free(dirname);
-@@ -1565,7 +1567,7 @@ static int parse_config_file(const char *filename,
- 				continue;
- 
- 			nofail_asprintf(&pathname, "%s%s%s/%s/%s.ko", basedir,
--				MODULE_DIR, kernelversion, subdir, modname);
-+				module_dir, kernelversion, subdir, modname);
- 
- 			*overrides = add_override(pathname, *overrides);
- 			free(pathname);
-@@ -1737,6 +1739,7 @@ int main(int argc, char *argv[])
- 	char *basedir = "", *dirname, *version;
- 	char *system_map = NULL, *module_symvers = NULL;
- 	int i;
-+ 	char *module_dir;
- 	const char *config = NULL;
- 
- 	if (native_endianness() == 0)
-@@ -1832,7 +1835,11 @@ int main(int argc, char *argv[])
- 	if (optind == argc)
- 		all = 1;
- 
--	nofail_asprintf(&dirname, "%s%s%s", basedir, MODULE_DIR, version);
-+        if((module_dir = getenv("MODULE_DIR")) == NULL) {
-+                module_dir = "/lib/modules/";
-+        }
-+
-+	nofail_asprintf(&dirname, "%s%s%s", basedir, module_dir, version);
- 
- 	if (maybe_all) {
- 		if (!doing_stdout && !depfile_out_of_date(dirname))
-@@ -1850,7 +1857,7 @@ int main(int argc, char *argv[])
- 		size_t len;
- 
- 		nofail_asprintf(&dirname, "%s%s%s/updates", basedir,
--				MODULE_DIR, version);
-+				module_dir, version);
- 		len = strlen(dirname);
- 		search = add_search(dirname, len, search);
- 	}
-diff --git a/modinfo.c b/modinfo.c
-index 1dd8469..67b1041 100644
---- a/modinfo.c
-+++ b/modinfo.c
-@@ -19,9 +19,6 @@
- #include "zlibsupport.h"
- #include "testing.h"
- 
--#ifndef MODULE_DIR
--#define MODULE_DIR "/lib/modules"
--#endif
- 
- struct param
- {
-@@ -193,6 +190,11 @@ static struct elf_file *grab_module(const char *name,
- 	struct utsname buf;
- 	char *depname, *p, *moddir;
- 	struct elf_file *module;
-+ 	char *module_dir;
-+
-+        if((module_dir = getenv("MODULE_DIR")) == NULL) {
-+                module_dir = "/lib/modules/";
-+        }
- 
- 	if (strchr(name, '.') || strchr(name, '/')) {
- 		module = grab_elf_file(name);
-@@ -207,9 +209,9 @@ static struct elf_file *grab_module(const char *name,
- 		kernel = buf.release;
- 	}
- 	if (strlen(basedir))
--		nofail_asprintf(&moddir, "%s/%s/%s", basedir, MODULE_DIR, kernel);
-+		nofail_asprintf(&moddir, "%s/%s/%s", basedir, module_dir, kernel);
- 	else
--		nofail_asprintf(&moddir, "%s/%s", MODULE_DIR, kernel);
-+		nofail_asprintf(&moddir, "%s/%s", module_dir, kernel);
- 
- 	/* Search for it in modules.dep. */
- 	nofail_asprintf(&depname, "%s/%s", moddir, "modules.dep");
-diff --git a/modprobe.c b/modprobe.c
-index 5464f45..d9fbf9d 100644
---- a/modprobe.c
-+++ b/modprobe.c
-@@ -86,10 +86,6 @@ typedef enum
- 
- } modprobe_flags_t;
- 
--#ifndef MODULE_DIR
--#define MODULE_DIR "/lib/modules"
--#endif
--
- /**
-  * print_usage - output the prefered program usage
-  *
-@@ -2136,6 +2132,7 @@ int main(int argc, char *argv[])
- 	struct modprobe_conf conf = {};
- 
- 	recursion_depth = 0;
-+ 	char *module_dir = NULL;
- 
- 	/* Prepend options from environment. */
- 	argv = merge_args(getenv("MODPROBE_OPTIONS"), argv, &argc);
-@@ -2233,7 +2230,11 @@ int main(int argc, char *argv[])
- 	if (argc < optind + 1 && !dump_config && !list_only)
- 		print_usage(argv[0]);
- 
--	nofail_asprintf(&dirname, "%s%s/%s", basedir, MODULE_DIR, buf.release);
-+	if((module_dir = getenv("MODULE_DIR")) == NULL) {
-+		module_dir = "/lib/modules";
-+	}
-+
-+	nofail_asprintf(&dirname, "%s%s/%s", basedir, module_dir, buf.release);
- 
- 	/* Old-style -t xxx wildcard?  Only with -l. */
- 	if (list_only) {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 23e05eb6c9e..40083d8bf4f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -59,6 +59,7 @@ doNotDisplayTwice rec {
   manpages = man-pages; # added 2015-12-06
   midoriWrapper = midori; # added 2015-01
   mlt-qt5 = qt5.mlt;  # added 2015-12-19
+  module_init_tools = kmod; # added 2016-04-22
   mssys = ms-sys; # added 2015-12-13
   multipath_tools = multipath-tools;  # added 2016-01-21
   mupen64plus1_5 = mupen64plus; # added 2016-02-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6beb15d2ba..7d069d01f95 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10870,8 +10870,6 @@ in
 
   mmc-utils = callPackage ../os-specific/linux/mmc-utils { };
 
-  module_init_tools = callPackage ../os-specific/linux/module-init-tools { };
-
   aggregateModules = modules:
     callPackage ../os-specific/linux/kmod/aggregator.nix {
       inherit modules;
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index bd2223b4b04..0ccb160e4f6 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -105,7 +105,6 @@ with import ./release-lib.nix { inherit supportedSystems; };
   mingetty = linux;
   mk = linux;
   mktemp = all;
-  module_init_tools = linux;
   mono = linux;
   monotone = linux;
   mpg321 = linux;

From 3148c7e45bdaa786ec776d8a49cef6a84d719b03 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Sat, 16 Apr 2016 14:22:59 +0200
Subject: [PATCH 069/712] pcapfix: init at 1.1.0

---
 pkgs/tools/networking/pcapfix/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/tools/networking/pcapfix/default.nix

diff --git a/pkgs/tools/networking/pcapfix/default.nix b/pkgs/tools/networking/pcapfix/default.nix
new file mode 100644
index 00000000000..0c5035f2d39
--- /dev/null
+++ b/pkgs/tools/networking/pcapfix/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "pcapfix-1.1.0";
+
+  src = fetchurl {
+    url = "https://f00l.de/pcapfix/${name}.tar.gz";
+    sha256 = "025jpsqav9wg9lql7jfpd67z1113j8gzmjc5nqf5q07b01nnpfgj";
+  };
+
+  postPatch = ''sed -i "s|/usr|$out|" Makefile'';
+
+  meta = with stdenv.lib;
+    { homepage = "https://f00l.de/pcapfix/";
+      description = "Repair your broken pcap and pcapng files";
+      license = licenses.gpl3;
+      maintainers = [ maintainers.ehmry ];
+    };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 61f714c3ad9..b8a73642055 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2783,6 +2783,8 @@ in
 
   patchage = callPackage ../applications/audio/patchage { };
 
+  pcapfix = callPackage ../tools/networking/pcapfix { };
+
   pbzip2 = callPackage ../tools/compression/pbzip2 { };
 
   pciutils = callPackage ../tools/system/pciutils { };

From 71e0ce571b6fcd9a1a702c4198c9892b22b50fe7 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 22 Apr 2016 11:52:15 +0200
Subject: [PATCH 070/712] csdp: fix build on Darwin

When the `INSTALL` file is present, `make` claims that the `install`
target is up-to-date.
---
 pkgs/applications/science/math/csdp/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/math/csdp/default.nix b/pkgs/applications/science/math/csdp/default.nix
index 64fa4579949..67a0834c00d 100644
--- a/pkgs/applications/science/math/csdp/default.nix
+++ b/pkgs/applications/science/math/csdp/default.nix
@@ -15,6 +15,7 @@ stdenv.mkDerivation {
   '';
 
   preInstall = ''
+    rm -f INSTALL
     mkdir -p $out/bin
   '';
 

From a05ba7375d6b6f31b36d3cf36006bdcdadde06b7 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 12 Apr 2016 12:05:03 +0300
Subject: [PATCH 071/712] quassel: use qt4 version of the daemon because as of
 now qt5 version fails to use proxies(connection refused)

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

diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix
index 52c7ac8e689..99269c49e8f 100644
--- a/nixos/modules/services/networking/quassel.nix
+++ b/nixos/modules/services/networking/quassel.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let
-  quassel = pkgs.quasselDaemon_qt5;
+  quassel = pkgs.kde4.quasselDaemon;
   cfg = config.services.quassel;
   user = if cfg.user != null then cfg.user else "quassel";
 in

From 594416b210722ccfc653fe58c1d9c9cad8fefb35 Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Fri, 22 Apr 2016 12:31:09 +0200
Subject: [PATCH 072/712] nodejs: 5.10.1 -> 5.11.0

---
 pkgs/development/web/nodejs/v5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix
index 5cb87ecc076..d051b4850c1 100644
--- a/pkgs/development/web/nodejs/v5.nix
+++ b/pkgs/development/web/nodejs/v5.nix
@@ -6,7 +6,7 @@
 assert stdenv.system != "armv5tel-linux";
 
 let
-  version = "5.10.1";
+  version = "5.11.0";
 
   deps = {
     inherit openssl zlib libuv;
@@ -30,7 +30,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "1kdaahq3h89c7mz2qbqx43qdigsswl1i8ll5vw6j8g5m2av7iqn6";
+    sha256 = "14ayv5rgagc6lj7fil0bdbzwj2qxj5picw802rfmmpj9kqdb0hgg";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];

From a63aa838753dc8650e335ab555949df9b2603da1 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 22 Apr 2016 14:35:49 +0300
Subject: [PATCH 073/712] qtcreator: fix build

---
 pkgs/development/qtcreator/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index a5dde0a580b..a5005932103 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -25,8 +25,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  preConfigure = ''
+  configurePhase = ''
+    runHook preConfigure
     qmake -spec linux-g++ qtcreator.pro
+    runHook postConfigure
   '';
 
   buildFlags = optionalString withDocumentation " docs";

From 6185f74531b1610fb0e71a4f057e6dbeeb116616 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 22 Apr 2016 13:51:11 +0300
Subject: [PATCH 074/712] atom, electron, vscode: split dependencies to atomEnv

fixes #14890
---
 pkgs/applications/editors/atom/default.nix   | 34 ++++++--------------
 pkgs/applications/editors/atom/env.nix       | 19 +++++++++++
 pkgs/applications/editors/vscode/default.nix | 27 ++++++----------
 pkgs/development/tools/electron/default.nix  | 30 ++++++-----------
 pkgs/development/tools/electron/env-atom.nix | 17 ----------
 pkgs/top-level/all-packages.nix              | 13 +++-----
 6 files changed, 52 insertions(+), 88 deletions(-)
 create mode 100644 pkgs/applications/editors/atom/env.nix
 delete mode 100644 pkgs/development/tools/electron/env-atom.nix

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 9f8f6f5fd0c..5cad049ba32 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -1,20 +1,6 @@
-{ stdenv, fetchurl, lib, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
-, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
-, gvfs, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, systemd
-}:
+{ stdenv, fetchurl, lib, makeWrapper, gvfs, atomEnv }:
 
-let
-  atomPkgs = [
-    stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3
-    fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
-    xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
-    xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
-    xorg.libXcursor libcap systemd
-  ];
-  atomLib = lib.makeLibraryPath atomPkgs;
-  atomLib64 = lib.makeSearchPathOutputs "lib64" ["lib"] atomPkgs;
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "atom-${version}";
   version = "1.6.2";
 
@@ -26,25 +12,23 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  phases = [ "installPhase" "fixupPhase" ];
-
-  installPhase = ''
-    mkdir -p $out
+  buildCommand = ''
+    mkdir -p $out/usr/
     ar p $src data.tar.gz | tar -C $out -xz ./usr
     substituteInPlace $out/usr/share/applications/atom.desktop \
       --replace /usr/share/atom $out/bin
     mv $out/usr/* $out/
     rm -r $out/share/lintian
     rm -r $out/usr/
+    wrapProgram $out/bin/atom \
+      --prefix "PATH" : "${gvfs}/bin"
+
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${atomEnv.libPath}:$out/share/atom" \
       $out/share/atom/atom
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${atomEnv.libPath}" \
       $out/share/atom/resources/app/apm/bin/node
-    wrapProgram $out/bin/atom \
-      --prefix "LD_LIBRARY_PATH" : "${atomLib}:${atomLib64}" \
-      --prefix "PATH" : "${gvfs}/bin"
-    wrapProgram $out/bin/apm \
-      --prefix "LD_LIBRARY_PATH" : "${atomLib}:${atomLib64}"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix
new file mode 100644
index 00000000000..d91d8a4ecbe
--- /dev/null
+++ b/pkgs/applications/editors/atom/env.nix
@@ -0,0 +1,19 @@
+{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk, atk, pango, freetype, fontconfig
+, libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
+, gconf, nss, xorg, libcap, systemd, libnotify
+}:
+
+let
+  packages = [
+    stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3
+    fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
+    xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
+    xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
+    xorg.libXcursor libcap systemd libnotify
+  ];
+
+  libPathNative = lib.makeLibraryPath packages;
+  libPath64 = lib.makeSearchPathOutputs "lib64" ["lib"] packages;
+  libPath = "${libPathNative}:${libPath64}";
+
+in { inherit packages libPath; }
diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 0d9572ebc22..5e8a39bb101 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -1,10 +1,6 @@
-{ stdenv, callPackage, fetchurl, unzip
-, ...
-} @ args:
+{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv }:
 
 let
-  atomEnv = callPackage ../../../development/tools/electron/env-atom.nix (args);
-
   version = "0.10.10";
   rev = "5b5f4db87c10345b9d5c8d0bed745bcad4533135";
   sha256 = if stdenv.system == "i686-linux"    then "1mmgq4fxi2h4hvz7yxgzzyvlznkb42qwr8i1g2b1akdlgnrvvpby"
@@ -30,21 +26,16 @@ in
     buildInputs = [ unzip ];
 
     installPhase = ''
-      mkdir -p $out/bin
-      cp -r ./* $out/bin
-
-      ${if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then ''
-        patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        $out/bin/code
-      '' else ""}
+      mkdir -p $out/lib/vscode $out/bin
+      cp -r ./* $out/lib/vscode
+      ln -s $out/lib/vscode/code $out/bin
     '';
 
-    postFixup = ''
-      ${if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then ''
-        patchelf \
-        --set-rpath "${atomEnv}/lib:${atomEnv}/lib64:$out/bin:$(patchelf --print-rpath $out/bin/code)" \
-        $out/bin/code
-      '' else ""}
+    fixupPhase = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") ''
+      patchelf \
+        --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+        --set-rpath "${atomEnv.libPath}:$out/lib/vscode" \
+        $out/lib/vscode/code
     '';
 
     meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index d7d338f7f60..74adbb3f153 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -1,10 +1,6 @@
-{ stdenv, callPackage, fetchurl, unzip
-, ...
-} @ args:
+{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv }:
 
-let
-  atomEnv = callPackage ./env-atom.nix (args);
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "electron-${version}";
   version = "0.36.2";
 
@@ -14,23 +10,17 @@ in stdenv.mkDerivation rec {
     name = "${name}.zip";
   };
 
-  buildInputs = [ atomEnv unzip ];
+  buildInputs = [ unzip ];
 
-  phases = [ "installPhase" "fixupPhase" ];
+  buildCommand = ''
+    mkdir -p $out/lib/electron $out/bin
+    unzip -d $out/lib/electron $src
+    ln -s $out/lib/electron/electron $out/bin
 
-  unpackCmd = "unzip";
-
-  installPhase = ''
-    mkdir -p $out/bin
-    unzip -d $out/bin $src
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-    $out/bin/electron
-  '';
-
-  postFixup = ''
     patchelf \
-    --set-rpath "${atomEnv}/lib:${atomEnv}/lib64:$out/bin:$(patchelf --print-rpath $out/bin/electron)" \
-    $out/bin/electron
+      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${atomEnv.libPath}:$out/lib/electron" \
+      $out/lib/electron/electron
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/electron/env-atom.nix b/pkgs/development/tools/electron/env-atom.nix
deleted file mode 100644
index 6c69b2e52cc..00000000000
--- a/pkgs/development/tools/electron/env-atom.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, buildEnv, zlib, glib, alsaLib
-, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
-, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap
-, systemd, libnotify
-, ...
-}:
-
-buildEnv {
-  name = "env-atom";
-  paths = [
-    stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3
-    fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
-    xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
-    xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
-    xorg.libXcursor libcap systemd libnotify
-  ];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8a73642055..bba0883c923 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5700,10 +5700,7 @@ in
 
   astyle = callPackage ../development/tools/misc/astyle { };
 
-  electron = callPackage ../development/tools/electron {
-    gconf = pkgs.gnome.GConf;
-  };
-
+  electron = callPackage ../development/tools/electron { };
 
   autobuild = callPackage ../development/tools/misc/autobuild { };
 
@@ -11647,10 +11644,12 @@ in
 
   artha = callPackage ../applications/misc/artha { };
 
-  atom = callPackage ../applications/editors/atom {
+  atomEnv = callPackage ../applications/editors/atom/env.nix {
     gconf = gnome.GConf;
   };
 
+  atom = callPackage ../applications/editors/atom { };
+
   aseprite = callPackage ../applications/editors/aseprite {
     giflib = giflib_4_1;
   };
@@ -14253,9 +14252,7 @@ in
 
   vorbis-tools = callPackage ../applications/audio/vorbis-tools { };
 
-  vscode = callPackage ../applications/editors/vscode {
-    gconf = pkgs.gnome.GConf;
-  };
+  vscode = callPackage ../applications/editors/vscode { };
 
   vue = callPackage ../applications/misc/vue { };
 

From 935493a3610ca1830a22c92685eb58622fa2366a Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Fri, 22 Apr 2016 12:27:38 +0200
Subject: [PATCH 075/712] vscode: add desktop file

---
 pkgs/applications/editors/vscode/default.nix | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 5e8a39bb101..f5b204b074e 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv }:
+{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem }:
+
 
 let
   version = "0.10.10";
@@ -23,12 +24,28 @@ in
       inherit sha256;
     };
 
+    desktopItem = makeDesktopItem {
+      name = "code";
+      exec = "code";
+      icon = "code";
+      comment = "Visual Studio Code is a code editor redefined and optimized for building and debugging modern web and cloud applications";
+      desktopName = "Visual Studio Code";
+      genericName = "Text Editor";
+      categories = "GNOME;GTK;Utility;TextEditor;Development;";
+    };
+
     buildInputs = [ unzip ];
 
     installPhase = ''
       mkdir -p $out/lib/vscode $out/bin
       cp -r ./* $out/lib/vscode
       ln -s $out/lib/vscode/code $out/bin
+
+      mkdir -p $out/share/applications
+      cp $desktopItem/share/applications/* $out/share/applications
+
+      mkdir -p $out/share/pixmaps
+      cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png
     '';
 
     fixupPhase = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") ''

From 0b8d8b5ca8fd11a1c784d13cbb2082b0d7faa538 Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Fri, 22 Apr 2016 13:23:24 +0200
Subject: [PATCH 076/712] vscode: 0.10.10 -> 1.0.0

---
 pkgs/applications/editors/vscode/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index f5b204b074e..134dc397e06 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -1,19 +1,18 @@
 { stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem }:
 
-
 let
-  version = "0.10.10";
-  rev = "5b5f4db87c10345b9d5c8d0bed745bcad4533135";
-  sha256 = if stdenv.system == "i686-linux"    then "1mmgq4fxi2h4hvz7yxgzzyvlznkb42qwr8i1g2b1akdlgnrvvpby"
-      else if stdenv.system == "x86_64-linux"  then "1zjb6mys5qs9mb21rpgpnbgq4gpnw6gsgfn5imf7ca7myk1bxnvk"
-      else if stdenv.system == "x86_64-darwin" then "0y1as2s6nhicyvdfszphhqp76iv9wcygglrl2f0jamm98g9qp66p"
+  version = "1.0.0";
+  rev = "fa6d0f03813dfb9df4589c30121e9fcffa8a8ec8";
+
+  sha256 = if stdenv.system == "i686-linux"    then "1nnsvr51k8cmq8rccksylam4ww40pdn9dnhnp9096z5ccrf4qa1b"
+      else if stdenv.system == "x86_64-linux"  then "0p408pp2il6kawfsql8n5dvl75kmf2n2p0r266mjnww6vprmq4gw"
+      else if stdenv.system == "x86_64-darwin" then "06k41ljfvgyxbl364jlkdjk8lkwr6bpq2r051vin93cnqfxridkq"
       else throw "Unsupported system: ${stdenv.system}";
 
   urlMod = if stdenv.system == "i686-linux" then "linux-ia32"
       else if stdenv.system == "x86_64-linux" then "linux-x64"
       else if stdenv.system == "x86_64-darwin" then "darwin"
       else throw "Unsupported system: ${stdenv.system}";
-
 in
   stdenv.mkDerivation rec {
     name = "vscode-${version}";

From 253b84a1eb2609ea7d71a236040515dc7c131b1b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 22 Apr 2016 17:44:30 +0300
Subject: [PATCH 077/712] vscode, electron, atom: run fixup phases

---
 pkgs/applications/editors/atom/default.nix   | 2 ++
 pkgs/applications/editors/vscode/default.nix | 2 +-
 pkgs/development/tools/electron/default.nix  | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 5cad049ba32..9a392b90dc1 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/atom \
       --prefix "PATH" : "${gvfs}/bin"
 
+    fixupPhase
+
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       --set-rpath "${atomEnv.libPath}:$out/share/atom" \
       $out/share/atom/atom
diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 134dc397e06..b372dda1bf8 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -47,7 +47,7 @@ in
       cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png
     '';
 
-    fixupPhase = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") ''
+    postFixup = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") ''
       patchelf \
         --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
         --set-rpath "${atomEnv.libPath}:$out/lib/vscode" \
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index 74adbb3f153..a3afc235a6c 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     unzip -d $out/lib/electron $src
     ln -s $out/lib/electron/electron $out/bin
 
+    fixupPhase
+
     patchelf \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       --set-rpath "${atomEnv.libPath}:$out/lib/electron" \

From 05a7c34d476db6c5996f8a98b97cc12f79dd56d5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 20 Apr 2016 19:50:57 +0200
Subject: [PATCH 078/712] sane-backends-git -> 2016-04-20

---
 pkgs/applications/graphics/sane/backends/git.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix
index ae1526990f2..d7d512d8def 100644
--- a/pkgs/applications/graphics/sane/backends/git.nix
+++ b/pkgs/applications/graphics/sane/backends/git.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "2016-04-14";
+  version = "2016-04-20";
   src = fetchgit {
-    sha256 = "414fa7753043f8f3775d926eede01a9dbccf6255b2b2b961a3c48b4fa76a4952";
-    rev = "19c128a23e27c1ab5a030fa6ff74da1b740629bb";
+    sha256 = "f4a20eb41d72ff5961484ef164df44805a987523153107cc6f45acfb3d0208e2";
+    rev = "4b2f171a13248a8e3d79379e368c54fb71ed97e2";
     url = "git://alioth.debian.org/git/sane/sane-backends.git";
   };
 })

From 5a6cac7ca4deb6fd6566f1650496bae9096744ae Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 20 Apr 2016 22:01:31 +0200
Subject: [PATCH 079/712] miniupnpd: 1.9.20160222 -> 2.0

---
 pkgs/tools/networking/miniupnpd/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index d2bc7b4e772..6003471bed9 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "miniupnpd-1.9.20160222";
+  name = "miniupnpd-2.0";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "0q694dla4v36qsc0x50xqg2jjhwdi9pl7r2gl10yvhkahxqx1ng7";
+    sha256 = "1dxzhvkylrnbkd5srb9rb2g4f9ydd1zbjg5sdf190m0g1sha6snr";
     name = "${name}.tar.gz";
   };
 
@@ -16,13 +16,14 @@ stdenv.mkDerivation rec {
 
   makefile = "Makefile.linux";
 
-  buildFlags = "miniupnpd genuuid";
+  buildFlags = [ "miniupnpd" "genuuid" ];
 
-  installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
+  installFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://miniupnp.free.fr/;
     description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
   };
 }

From 8db6b7615a91322f0ccea77cfdea89e395619fdb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 21 Apr 2016 13:57:32 +0200
Subject: [PATCH 080/712] debian-devscripts: 2.16.2 -> 2.16.3

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

diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index 617cd5f5548..edc527484c6 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.16.2";
+  version = "2.16.3";
   name = "debian-devscripts-${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz";
-    sha256 = "0qlzciiyfhq11j5wf0x6jsa18bmmf2z7f2x5psq2wkkccfi0fxc4";
+    sha256 = "0w030zdvcwaxpashdd6zvqgmy89h107p7gvd3lqx9vdy9zv0agd2";
   };
 
   buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile 

From e7f0a2ce00224535556a203c396f9e02a66f571d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 21 Apr 2016 20:38:45 +0200
Subject: [PATCH 081/712] pythonPackages.gandi-cli: init at 0.18

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c59bec38d3b..a180eb6cf02 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5698,6 +5698,25 @@ in modules // {
     };
   };
 
+  gandi-cli = buildPythonPackage rec {
+    name = "gandi-cli-${version}";
+    version = "0.18";
+    src = pkgs.fetchFromGitHub {
+      sha256 = "045gnz345nfbi1g7j3gcyzrxrx3hcidaxzr05cb49rcr8nmqh1s3";
+      rev = version;
+      repo = "gandi.cli";
+      owner = "Gandi";
+    };
+    propagatedBuildInputs = with self; [ click ipy pyyaml requests ];
+    doCheck = false;	# Tests try to contact the actual remote API
+    meta = {
+      homepage = http://cli.gandi.net/;
+      description = "Command-line interface to the public Gandi.net API";
+      license = licenses.gpl3Plus;
+      maintainers = with maintainers; [ nckx ];
+    };
+  };
+
   gateone = buildPythonPackage rec {
     name = "gateone-1.2-0d57c3";
     disabled = ! isPy27;

From 3fdf40bca0c869268de0c8731f78f1f15af181c9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 22 Apr 2016 16:18:42 +0200
Subject: [PATCH 082/712] eid-mw: 4.1.14 -> 4.1.16

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

diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index 85409fae85b..b6a7b2fedbe 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "eid-mw-${version}";
-  version = "4.1.14";
+  version = "4.1.16";
 
   src = fetchFromGitHub {
-    sha256 = "1gj08dylcwdfjmdci1ja853n9xqkhgxy0x8m30bks81qwbnd12lp";
+    sha256 = "14b17aa45l0pyqd87c17mgfmpgq1qmybnl6hq9mc29rxw6jdb1ka";
     rev = "v${version}";
     repo = "eid-mw";
     owner = "Fedict";

From 42d5aa8c23dbb2e46b46789bc007774b58b55541 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 22 Apr 2016 17:34:41 +0200
Subject: [PATCH 083/712] libreoffice: libreoffice-still: init at 5.0.5.2 (the
 current stable release)

---
 .../libreoffice/libreoffice-srcs-still.nix    | 523 ++++++++++++++++++
 .../applications/office/libreoffice/still.nix | 255 +++++++++
 pkgs/top-level/all-packages.nix               |  20 +
 3 files changed, 798 insertions(+)
 create mode 100644 pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
 create mode 100644 pkgs/applications/office/libreoffice/still.nix

diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
new file mode 100644
index 00000000000..a70d5a7c77c
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
@@ -0,0 +1,523 @@
+[
+{
+  name = "libabw-0.1.1.tar.bz2";
+  md5 = "7a3815b506d064313ba309617b6f5a0b";
+  brief = true;
+}
+{
+  name = "commons-codec-1.6-src.tar.gz";
+  md5 = "2e482c7567908d334785ce7d69ddfff7";
+  brief = false;
+}
+{
+  name = "commons-httpclient-3.1-src.tar.gz";
+  md5 = "2c9b0f83ed5890af02c0df1c1776f39b";
+  brief = false;
+}
+{
+  name = "commons-lang-2.4-src.tar.gz";
+  md5 = "625ff5f2f968dd908bca43c9469d6e6b";
+  brief = false;
+}
+{
+  name = "commons-logging-1.2-src.tar.gz";
+  md5 = "ce977548f1cbf46918e93cd38ac35163";
+  brief = true;
+}
+{
+  name = "apr-1.4.8.tar.gz";
+  md5 = "eff9d741b0999a9bbab96862dd2a2a3d";
+  brief = true;
+}
+{
+  name = "apr-util-1.5.3.tar.gz";
+  md5 = "71a11d037240b292f824ba1eb537b4e3";
+  brief = true;
+}
+{
+  name = "boost_1_55_0.tar.bz2";
+  md5 = "d6eef4b4cacb2183f2bf265a5a03a354";
+  brief = false;
+}
+{
+  name = "bsh-2.0b5-src.zip";
+  md5 = "ec1941a74d3ef513c4ce57a9092b74e1";
+  brief = false;
+}
+{
+  name = "cairo-1.10.2.tar.gz";
+  md5 = "f101a9e88b783337b20b2e26dfd26d5f";
+  brief = false;
+}
+{
+  name = "libcdr-0.1.1.tar.bz2";
+  md5 = "b33fd0be3befdd1b37777e08ce058bd9";
+  brief = true;
+}
+{
+  name = "clucene-core-2.3.3.4.tar.gz";
+  md5 = "48d647fbd8ef8889e5a7f422c1bfda94";
+  brief = false;
+}
+{
+  name = "libcmis-0.5.0.tar.gz";
+  md5 = "5821b806a98e6c38370970e682ce76e8";
+  brief = false;
+}
+{
+  name = "CoinMP-1.7.6.tgz";
+  md5 = "1cce53bf4b40ae29790d2c5c9f8b1129";
+  brief = true;
+}
+{
+  name = "collada2gltf-master-cb1d97788a.tar.bz2";
+  md5 = "4b87018f7fff1d054939d19920b751a0";
+  brief = false;
+}
+{
+  name = "cppunit-1.13.2.tar.gz";
+  md5 = "d1c6bdd5a76c66d2c38331e2d287bc01";
+  brief = true;
+}
+{
+  name = "converttexttonumber-1-5-0.oxt";
+  md5 = "1f467e5bb703f12cbbb09d5cf67ecf4a";
+  brief = false;
+}
+{
+  name = "curl-7.43.0.tar.bz2";
+  md5 = "11bddbb452a8b766b932f859aaeeed39";
+  brief = true;
+}
+{
+  name = "libe-book-0.1.2.tar.bz2";
+  md5 = "6b48eda57914e6343efebc9381027b78";
+  brief = true;
+}
+{
+  name = "epm-3.7.tar.gz";
+  md5 = "3ade8cfe7e59ca8e65052644fed9fca4";
+  brief = false;
+}
+{
+  name = "libetonyek-0.1.3.tar.bz2";
+  md5 = "e5947373dd7834f27e93f1636faa419f";
+  brief = true;
+}
+{
+  name = "expat-2.1.0.tar.gz";
+  md5 = "dd7dab7a5fea97d2a6a43f511449b7cd";
+  brief = false;
+}
+{
+  name = "Firebird-2.5.2.26540-0.tar.bz2";
+  md5 = "21154d2004e025c8a3666625b0357bb5";
+  brief = true;
+}
+{
+  name = "fontconfig-2.8.0.tar.gz";
+  md5 = "77e15a92006ddc2adbb06f840d591c0e";
+  brief = false;
+}
+{
+  name = "crosextrafonts-20130214.tar.gz";
+  md5 = "368f114c078f94214a308a74c7e991bc";
+  brief = false;
+}
+{
+  name = "crosextrafonts-carlito-20130920.tar.gz";
+  md5 = "c74b7223abe75949b4af367942d96c7a";
+  brief = false;
+}
+{
+  name = "dejavu-fonts-ttf-2.34.zip";
+  md5 = "a4e565e220b5de082c23995e256e3c12";
+  brief = false;
+}
+{
+  name = "gentiumbasic-fonts-1.10.zip";
+  md5 = "35efabc239af896dfb79be7ebdd6e6b9";
+  brief = false;
+}
+{
+  name = "liberation-fonts-ttf-1.07.4.tar.gz";
+  md5 = "134d8262145fc793c6af494dcace3e71";
+  brief = false;
+}
+{
+  name = "liberation-fonts-ttf-2.00.1.tar.gz";
+  md5 = "5c781723a0d9ed6188960defba8e91cf";
+  brief = false;
+}
+{
+  name = "LinLibertineG-20120116.zip";
+  md5 = "e7a384790b13c29113e22e596ade9687";
+  brief = false;
+}
+{
+  name = "open-sans-font-ttf-1.10.tar.gz";
+  md5 = "7a15edea7d415ac5150ea403e27401fd";
+  brief = false;
+}
+{
+  name = "pt-serif-font-1.0000W.tar.gz";
+  md5 = "c3c1a8ba7452950636e871d25020ce0d";
+  brief = false;
+}
+{
+  name = "source-code-font-1.009.tar.gz";
+  md5 = "0279a21fab6f245e85a6f85fea54f511";
+  brief = false;
+}
+{
+  name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz";
+  md5 = "edc4d741888bc0d38e32dbaa17149596";
+  brief = false;
+}
+{
+  name = "libfreehand-0.1.1.tar.bz2";
+  md5 = "8cf70c5dc4d24d2dc4a107f509d2d6d7";
+  brief = true;
+}
+{
+  name = "freetype-2.4.8.tar.bz2";
+  md5 = "dbf2caca1d3afd410a29217a9809d397";
+  brief = false;
+}
+{
+  name = "glew-1.10.0.zip";
+  md5 = "594eb47b4b1210e25438d51825404d5a";
+  brief = false;
+}
+{
+  name = "glm-0.9.4.6-libreoffice.zip";
+  md5 = "bae83fa5dc7f081768daace6e199adc3";
+  brief = false;
+}
+{
+  name = "graphite2-1.2.4.tgz";
+  md5 = "2ef839348fe28e3b923bf8cced440227";
+  brief = true;
+}
+{
+  name = "harfbuzz-0.9.40.tar.bz2";
+  md5 = "0e27e531f4c4acff601ebff0957755c2";
+  brief = true;
+}
+{
+  name = "hsqldb_1_8_0.zip";
+  md5 = "17410483b5b5f267aa18b7e00b65e6e0";
+  brief = false;
+}
+{
+  name = "hunspell-1.3.3.tar.gz";
+  md5 = "4967da60b23413604c9e563beacc63b4";
+  brief = false;
+}
+{
+  name = "hyphen-2.8.8.tar.gz";
+  md5 = "5ade6ae2a99bc1e9e57031ca88d36dad";
+  brief = false;
+}
+{
+  name = "icu4c-54_1-src.tgz";
+  md5 = "e844caed8f2ca24c088505b0d6271bc0";
+  brief = false;
+}
+{
+  name = "flow-engine-0.9.4.zip";
+  md5 = "ba2930200c9f019c2d93a8c88c651a0f";
+  brief = false;
+}
+{
+  name = "flute-1.1.6.zip";
+  md5 = "d8bd5eed178db6e2b18eeed243f85aa8";
+  brief = false;
+}
+{
+  name = "libbase-1.1.6.zip";
+  md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624";
+  brief = false;
+}
+{
+  name = "libfonts-1.1.6.zip";
+  md5 = "3bdf40c0d199af31923e900d082ca2dd";
+  brief = false;
+}
+{
+  name = "libformula-1.1.7.zip";
+  md5 = "3404ab6b1792ae5f16bbd603bd1e1d03";
+  brief = false;
+}
+{
+  name = "liblayout-0.2.10.zip";
+  md5 = "db60e4fde8dd6d6807523deb71ee34dc";
+  brief = false;
+}
+{
+  name = "libloader-1.1.6.zip";
+  md5 = "97b2d4dba862397f446b217e2b623e71";
+  brief = false;
+}
+{
+  name = "librepository-1.1.6.zip";
+  md5 = "8ce2fcd72becf06c41f7201d15373ed9";
+  brief = false;
+}
+{
+  name = "libserializer-1.1.6.zip";
+  md5 = "f94d9870737518e3b597f9265f4e9803";
+  brief = false;
+}
+{
+  name = "libxml-1.1.7.zip";
+  md5 = "ace6ab49184e329db254e454a010f56d";
+  brief = false;
+}
+{
+  name = "sacjava-1.3.zip";
+  md5 = "39bb3fcea1514f1369fcfc87542390fd";
+  brief = false;
+}
+{
+  name = "jpegsrc.v9a.tar.gz";
+  md5 = "3353992aecaee1805ef4109aadd433e7";
+  brief = true;
+}
+{
+  name = "libjpeg-turbo-1.3.1.tar.gz";
+  md5 = "2c3a68129dac443a72815ff5bb374b05";
+  brief = true;
+}
+{
+  name = "language-subtag-registry-2015-08-04.tar.bz2";
+  md5 = "bf5986dbfa1c9a0f26cf1b00ed369484";
+  brief = true;
+}
+{
+  name = "JLanguageTool-1.7.0.tar.bz2";
+  md5 = "b63e6340a02ff1cacfeadb2c42286161";
+  brief = false;
+}
+{
+  name = "lcms2-2.6.tar.gz";
+  md5 = "f4c08d38ceade4a664ebff7228910a33";
+  brief = true;
+}
+{
+  name = "libatomic_ops-7_2d.zip";
+  md5 = "c0b86562d5aa40761a87134f83e6adcf";
+  brief = true;
+}
+{
+  name = "libeot-0.01.tar.bz2";
+  md5 = "aa24f5dd2a2992f4a116aa72af817548";
+  brief = true;
+}
+{
+  name = "libexttextcat-3.4.4.tar.bz2";
+  md5 = "10d61fbaa6a06348823651b1bd7940fe";
+  brief = false;
+}
+{
+  name = "libgltf-0.0.2.tar.bz2";
+  md5 = "d63a9f47ab048f5009d90693d6aa6424";
+  brief = true;
+  subDir = "libgltf/";
+}
+{
+  name = "liblangtag-0.5.1.tar.bz2";
+  md5 = "36271d3fa0d9dec1632029b6d7aac925";
+  brief = false;
+}
+{
+  name = "xmlsec1-1.2.14.tar.gz";
+  md5 = "1f24ab1d39f4a51faf22244c94a6203f";
+  brief = false;
+}
+{
+  name = "libxml2-2.9.3.tar.gz";
+  md5 = "daece17e045f1c107610e137ab50c179";
+  brief = false;
+}
+{
+  name = "libxslt-1.1.28.tar.gz";
+  md5 = "9667bf6f9310b957254fdcf6596600b7";
+  brief = false;
+}
+{
+  name = "lp_solve_5.5.tar.gz";
+  md5 = "26b3e95ddf3d9c077c480ea45874b3b8";
+  brief = false;
+}
+{
+  name = "mariadb_client-2.0.0-src.tar.gz";
+  md5 = "a233181e03d3c307668b4c722d881661";
+  brief = false;
+}
+{
+  name = "mdds_0.12.1.tar.bz2";
+  md5 = "ef2560ed5416652a7fe195305b14cebe";
+  brief = true;
+}
+{
+  name = "libmspub-0.1.2.tar.bz2";
+  md5 = "ff9d0f9dd8fbc523408ea1953d5bde41";
+  brief = true;
+}
+{
+  name = "libmwaw-0.3.5.tar.bz2";
+  md5 = "bdc58bbf89aaaf6d29b3516d96830a06";
+  brief = true;
+}
+{
+  name = "mysql-connector-c++-1.1.4.tar.gz";
+  md5 = "7239a4430efd4d0189c4f24df67f08e5";
+  brief = false;
+}
+{
+  name = "mythes-1.2.4.tar.gz";
+  md5 = "a8c2c5b8f09e7ede322d5c602ff6a4b6";
+  brief = false;
+}
+{
+  name = "neon-0.29.5.tar.gz";
+  md5 = "ff369e69ef0f0143beb5626164e87ae2";
+  brief = false;
+}
+{
+  name = "nss-3.19.4-with-nspr-4.10.10.tar.gz";
+  md5 = "478e0e90ebc4a90159549e77021021fd";
+  brief = false;
+}
+{
+  name = "libodfgen-0.1.4.tar.bz2";
+  md5 = "8716be5c22ae8353f9aaa380d74840dc";
+  brief = true;
+}
+{
+  name = "OpenCOLLADA-master-6509aa13af.tar.bz2";
+  md5 = "4ca8a6ef0afeefc864e9ef21b9f14bd6";
+  brief = true;
+}
+{
+  name = "openldap-2.4.31.tgz";
+  md5 = "804c6cb5698db30b75ad0ff1c25baefd";
+  brief = false;
+}
+{
+  name = "openssl-1.0.2a.tar.gz";
+  md5 = "a06c547dac9044161a477211049f60ef";
+  brief = true;
+}
+{
+  name = "liborcus-0.7.0.tar.bz2";
+  md5 = "7681383be6ce489d84c1c74f4e7f9643";
+  brief = false;
+}
+{
+  name = "libpagemaker-0.0.2.tar.bz2";
+  md5 = "795cc7a59ace4db2b12586971d668671";
+  brief = true;
+}
+{
+  name = "pixman-0.24.4.tar.bz2";
+  md5 = "c63f411b3ad147db2bcce1bf262a0e02";
+  brief = false;
+}
+{
+  name = "libpng-1.5.24.tar.gz";
+  md5 = "6652e428d1d3fc3c6cb1362159b1cf3b";
+  brief = true;
+}
+{
+  name = "poppler-0.26.4.tar.gz";
+  md5 = "35c0660065d023365e9854c13e289d12";
+  brief = true;
+}
+{
+  name = "postgresql-9.2.1.tar.bz2";
+  md5 = "c0b4799ea9850eae3ead14f0a60e9418";
+  brief = false;
+}
+{
+  name = "Python-3.3.5.tgz";
+  md5 = "803a75927f8f241ca78633890c798021";
+  brief = true;
+}
+{
+  name = "raptor2-2.0.9.tar.gz";
+  md5 = "4ceb9316488b0ea01acf011023cf7fff";
+  brief = false;
+}
+{
+  name = "rasqal-0.9.30.tar.gz";
+  md5 = "b12c5f9cfdb6b04efce5a4a186b8416b";
+  brief = false;
+}
+{
+  name = "redland-1.0.16.tar.gz";
+  md5 = "32f8e1417a64d3c6f2c727f9053f55ea";
+  brief = false;
+}
+{
+  name = "librevenge-0.0.2.tar.bz2";
+  md5 = "2d4183bf17aea1a71842468a71a68c47";
+  brief = true;
+}
+{
+  name = "rhino1_5R5.zip";
+  md5 = "798b2ffdc8bcfe7bca2cf92b62caf685";
+  brief = false;
+}
+{
+  name = "serf-1.2.1.tar.bz2";
+  md5 = "4f8e76c9c6567aee1d66aba49f76a58b";
+  brief = true;
+}
+{
+  name = "swingExSrc.zip";
+  md5 = "35c94d2df8893241173de1d16b6034c0";
+  brief = false;
+}
+{
+  name = "ucpp-1.3.2.tar.gz";
+  md5 = "0168229624cfac409e766913506961a8";
+  brief = false;
+}
+{
+  name = "vigra1.6.0.tar.gz";
+  md5 = "d62650a6f908e85643e557a236ea989c";
+  brief = false;
+}
+{
+  name = "libvisio-0.1.1.tar.bz2";
+  md5 = "726c1f5be65eb7d649e0d48b63d920e7";
+  brief = true;
+}
+{
+  name = "libwpd-0.10.0.tar.bz2";
+  md5 = "0773d79a1f240ef9f4f20242b13c5bb7";
+  brief = true;
+}
+{
+  name = "libwpg-0.3.0.tar.bz2";
+  md5 = "17da9770cb8b317b7633f9807b32b71a";
+  brief = true;
+}
+{
+  name = "libwps-0.4.0.tar.bz2";
+  md5 = "e9162d2566421d9d71b3ad2377a68fd5";
+  brief = true;
+}
+{
+  name = "xsltml_2.1.2.zip";
+  md5 = "a7983f859eafb2677d7ff386a023bc40";
+  brief = false;
+}
+{
+  name = "zlib-1.2.8.tar.gz";
+  md5 = "44d667c142d7cda120332623eab69f40";
+  brief = true;
+}
+]
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
new file mode 100644
index 00000000000..0e4d2d79762
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -0,0 +1,255 @@
+{ stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip
+, CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd
+, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
+, bison, flex, zip, unzip, gtk3, gtk, libmspack, getopt, file, cairo, which
+, icu, boost, jdk, ant, cups, xorg, libcmis
+, openssl, gperf, cppunit, GConf, ORBit2, poppler
+, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw
+, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
+, libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra
+, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
+, fontsConf, pkgconfig, libzip, bluez5, libtool, maven
+, libatomic_ops, graphite2, harfbuzz, libodfgen
+, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
+, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas
+, defaultIconTheme, glib, ncurses
+, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ]
+, withHelp ? true
+, kdeIntegration ? false
+}:
+
+let
+  lib = stdenv.lib;
+  langsSpaces = lib.concatStringsSep " " langs;
+  major = "5";
+  minor = "0";
+  patch = "5";
+  tweak = "2";
+  subdir = "${major}.${minor}.${patch}";
+  version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
+
+  fetchThirdParty = {name, md5, brief, subDir ? ""}: fetchurl {
+    inherit name md5;
+    url = if brief then
+            "http://dev-www.libreoffice.org/src/${subDir}${name}"
+          else
+            "http://dev-www.libreoffice.org/src/${subDir}${md5}-${name}";
+  };
+
+  fetchSrc = {name, sha256}: fetchurl {
+    url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz";
+    inherit sha256;
+  };
+
+  srcs = {
+    third_party = [ (fetchurl rec {
+        url = "http://dev-www.libreoffice.org/extern/${md5}-${name}";
+        md5 = "185d60944ea767075d27247c3162b3bc";
+        name = "unowinreg.dll";
+      }) ] ++ (map fetchThirdParty (import ./libreoffice-srcs-still.nix));
+
+    translations = fetchSrc {
+      name = "translations";
+      sha256 = "13cbfiqaycy8cxji5jfwfbgar8l4fzhg3aaggavsrwsmbvrqpbb7";
+    };
+
+    # TODO: dictionaries
+
+    help = fetchSrc {
+      name = "help";
+      sha256 = "0an081aj63hfhxv0k8h92vly0rnglbcpqax2pinybryk4dnljr36";
+    };
+
+  };
+in stdenv.mkDerivation rec {
+  name = "libreoffice-${version}";
+
+  src = fetchurl {
+    url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
+    sha256 = "120vcxpxzs0za76fyfry281ysv6d1ianb37d1yq8py8chkdjkrqy";
+  };
+
+  # Openoffice will open libcups dynamically, so we link it directly
+  # to make its dlopen work.
+  # It also seems not to mention libdl explicitly in some places.
+  NIX_LDFLAGS = "-lcups -ldl";
+
+  # For some reason librdf_redland sometimes refers to rasqal.h instead 
+  # of rasqal/rasqal.h
+  NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal";
+
+  # If we call 'configure', 'make' will then call configure again without parameters.
+  # It's their system.
+  configureScript = "./autogen.sh";
+  dontUseCmakeConfigure = true;
+
+  postUnpack = ''
+    mkdir -v $sourceRoot/src
+  '' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party)
+  + ''
+    ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name}
+    ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name}
+  '';
+
+  QT4DIR = qt4;
+
+  # Fix boost 1.59 compat
+  # Try removing in the next version
+  CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED";
+
+  preConfigure = ''
+    configureFlagsArray=(
+      "--with-parallelism=$NIX_BUILD_CORES"
+      "--with-lang=${langsSpaces}"
+    );
+
+    chmod a+x ./bin/unpack-sources
+    patchShebangs .
+    # It is used only as an indicator of the proper current directory
+    touch solenv/inc/target.mk
+
+    # BLFS patch for Glibc 2.23 renaming isnan
+    sed -ire "s@isnan@std::&@g" xmloff/source/draw/ximp3dscene.cxx
+  '';
+
+  # fetch_Download_item tries to interpret the name as a variable name
+  # Let it do so…
+  postConfigure = ''
+    sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile
+    sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile
+
+    # unit test sd_tiledrendering seems to be fragile
+    # http://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html
+    echo > ./sd/CppunitTest_sd_tiledrendering.mk
+    sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk
+    # one more fragile test?
+    sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
+  '';
+
+  makeFlags = "SHELL=${bash}/bin/bash";
+
+  enableParallelBuilding = true;
+
+  buildPhase = ''
+    # This is required as some cppunittests require fontconfig configured
+    export FONTCONFIG_FILE=${fontsConf}
+
+    # This to avoid using /lib:/usr/lib at linking
+    sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk
+
+    find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \;
+
+    make
+  '';
+
+  # It installs only things to $out/lib/libreoffice
+  postInstall = ''
+    mkdir -p $out/bin $out/share/desktop
+
+    mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/"
+
+    for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do
+      ln -s $out/lib/libreoffice/program/$a $out/bin/$a
+      wrapProgram "$out/bin/$a" \
+         --prefix XDG_DATA_DIRS : \
+         "$out/share:$GSETTINGS_SCHEMAS_PATH" \
+         ;
+    done
+
+    ln -s $out/bin/soffice $out/bin/libreoffice
+    ln -s $out/lib/libreoffice/share/xdg $out/share/applications
+
+    for f in $out/share/applications/*.desktop; do
+      substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=libreoffice"
+      substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=libreoffice"
+      substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=libreoffice"
+    done
+
+    cp -r sysui/desktop/icons  "$out/share"
+    sed -re 's@Icon=libreofficedev[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
+  '';
+
+  configureFlags = [
+    "${if withHelp then "" else "--without-help"}"
+    "--with-boost=${boost.dev}"
+    "--with-boost-libdir=${boost.lib}/lib"
+    "--with-beanshell-jar=${bsh}"
+    "--with-vendor=NixOS"
+    "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar"
+    "--disable-report-builder"
+    "--enable-python=system"
+    "--enable-dbus"
+    (lib.enableFeature kdeIntegration "kde4")
+    "--with-package-format=installed"
+    "--enable-epm"
+    "--with-jdk-home=${jdk.home}"
+    "--with-ant-home=${ant}/lib/ant"
+    "--with-system-cairo"
+    "--with-system-libs"
+    "--with-system-headers"
+    "--with-system-openssl"
+    "--with-system-libabw"
+    "--with-system-libcmis"
+    "--with-system-libwps"
+    "--with-system-openldap"
+    "--with-system-coinmp"
+
+    # Without these, configure does not finish
+    "--without-junit"
+
+    # I imagine this helps. Copied from go-oo.
+    # Modified on every upgrade, though
+    "--disable-odk"
+    "--disable-postgresql-sdbc"
+    "--disable-firebird-sdbc"
+    "--without-fonts"
+    "--without-myspell-dicts"
+    "--without-doxygen"
+
+    # TODO: package these as system libraries
+    "--with-system-beanshell"
+    "--without-system-hsqldb"
+    "--without-system-altlinuxhyph"
+    "--without-system-lpsolve"
+    "--without-system-npapi-headers"
+    "--without-system-libetonyek"
+    "--without-system-libfreehand"
+    "--without-system-liblangtag"
+    "--without-system-libmspub"
+    "--without-system-libpagemaker"
+    "--without-system-libgltf"
+    # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f
+    "--without-system-orcus"
+  ];
+
+  checkPhase = ''
+    make unitcheck
+    make slowcheck
+  '';
+
+  buildInputs = with xorg;
+    [ ant ArchiveZip autoconf automake bison boost cairo clucene_core
+      CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig
+      freetype GConf getopt gnome_vfs gperf gtk3 gtk
+      hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
+      libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
+      libXaw libXext libXi libXinerama libxml2 libxslt libXtst
+      libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
+      gst_all_1.gst-plugins-base gsettings_desktop_schemas glib
+      neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
+      python3 sablotron sane-backends tcsh unzip vigra which zip zlib
+      mdds bluez5 glibc libcmis libwps libabw
+      libxshmfence libatomic_ops graphite2 harfbuzz
+      librevenge libe-book libmwaw glm glew ncurses
+      libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
+    ]
+    ++ lib.optional kdeIntegration kde4.kdelibs;
+
+  meta = with lib; {
+    description = "Comprehensive, professional-quality productivity suite (Still/stable release)";
+    homepage = http://libreoffice.org/;
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ viric raskin ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5ce66d56b9..621ed6a5145 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13000,6 +13000,26 @@ in
     };
   };
 
+  libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/still.nix {
+    inherit (perlPackages) ArchiveZip CompressZlib;
+    inherit (gnome) GConf ORBit2 gnome_vfs;
+    inherit (gnome3) gsettings_desktop_schemas defaultIconTheme;
+    zip = zip.override { enableNLS = false; };
+    #glm = glm_0954;
+    bluez5 = bluez5_28;
+    fontsConf = makeFontsConf {
+      fontDirectories = [
+        freefont_ttf xorg.fontmiscmisc xorg.fontbhttf
+      ];
+    };
+    clucene_core = clucene_core_2;
+    lcms = lcms2;
+    harfbuzz = harfbuzz.override {
+      withIcu = true; withGraphite2 = true;
+    };
+  });
+
+
   liferea = callPackage ../applications/networking/newsreaders/liferea {
     webkitgtk = webkitgtk24x;
   };

From e36339fd806490409e006f58a5b9d01dc3affbc8 Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Fri, 22 Apr 2016 15:59:40 +0000
Subject: [PATCH 084/712] mercurial: add comment for maintainers on version
 bump

---
 pkgs/applications/version-management/mercurial/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index f44baad4715..27f0279335d 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -3,6 +3,7 @@
 , ApplicationServices, cf-private }:
 
 let
+  # if you bump version, update pkgs.tortoisehg too or ping maintainer
   version = "3.7.3";
   name = "mercurial-${version}";
 in

From 2fce49d3e8218c231aed37926acf987dd3b112df Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Fri, 22 Apr 2016 16:00:43 +0000
Subject: [PATCH 085/712] tortoisehg: 3.7.1 -> 3.7.3, refactor

update tortoisehg to 3.7.3 and remove source patch in build expression.
setup.py in TortoiseHG computes wrong paths in `build` phase
(upstream bug https://bitbucket.org/tortoisehg/thg/issues/4483/problems-with-setuppy-on-posix-systems).
So we skip this phase and perform install manually (the `build` phase is still performed as subcommand).
---
 .../version-management/tortoisehg/default.nix  | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
index 60e71351208..2ba730a04d2 100644
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -2,12 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
     name = "tortoisehg-${version}";
-    version = "3.7.1";
-    namePrefix = "";
+    version = "3.7.3";
 
     src = fetchurl {
       url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
-      sha256 = "1ycf8knwk1rs99s5caq611sk4c4nzwyzq8g35hw5kwj15b6dl4k6";
+      sha256 = "1vahiavpkf9ib2mx8z5i6f0kh072zycazmbrc4sl94p5pvv5w1dh";
     };
 
     pythonPath = with pythonPackages; [ pyqt4 mercurial qscintilla iniparse ];
@@ -15,14 +14,11 @@ pythonPackages.buildPythonApplication rec {
     propagatedBuildInputs = with pythonPackages; [ qscintilla iniparse ];
 
     doCheck = false;
-
-    postUnpack = ''
-     substituteInPlace $sourceRoot/setup.py \
-       --replace "sharedir = os.path.join(installcmd.install_data[rootlen:], 'share')" "sharedir = '$out/share/'"
-    '';
-
-    postInstall = ''
-     ln -s $out/bin/thg $out/bin/tortoisehg     #convenient alias
+    dontStrip = true;
+    buildPhase = "";
+    installPhase = ''
+      ${pythonPackages.python.executable} setup.py install --prefix=$out
+      ln -s $out/bin/thg $out/bin/tortoisehg     #convenient alias
     '';
 
     meta = {

From 2c0a0ce3c53bbdcd38af73987ae78e839c9e3ec2 Mon Sep 17 00:00:00 2001
From: Nicolas Petton <nicolas@petton.fr>
Date: Fri, 22 Apr 2016 18:29:44 +0200
Subject: [PATCH 086/712] file-roller: Enable nautilus extension

---
 pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix
index df90c7b2977..d5b2558cf70 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix
@@ -1,18 +1,17 @@
 { stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive
-, attr, bzip2, acl, wrapGAppsHook, librsvg, gdk_pixbuf }:
+, attr, bzip2, acl, wrapGAppsHook, librsvg, libnotify, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  # TODO: support nautilus
-  # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so
-
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
 
-  buildInputs = [ glib gnome3.gtk intltool itstool libxml2 libarchive
+  buildInputs = [ glib gnome3.gtk intltool itstool libxml2 libarchive libnotify
                   gnome3.defaultIconTheme attr bzip2 acl gdk_pixbuf librsvg
                   gnome3.dconf ];
 
+  installFlags = [ "nautilus_extensiondir=$(out)/lib/nautilus/extensions-3.0" ];
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/FileRoller;
     description = "Archive manager for the GNOME desktop environment";

From 9f4ac8d3f8e964561be657d276d331de6fd6a638 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Fri, 22 Apr 2016 14:03:27 -0300
Subject: [PATCH 087/712] lsb-release: init at 1.4

---
 .../os-specific/linux/lsb-release/default.nix | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/os-specific/linux/lsb-release/default.nix

diff --git a/pkgs/os-specific/linux/lsb-release/default.nix b/pkgs/os-specific/linux/lsb-release/default.nix
new file mode 100644
index 00000000000..9715f77f9e4
--- /dev/null
+++ b/pkgs/os-specific/linux/lsb-release/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, perl, getopt }:
+
+stdenv.mkDerivation rec {
+  version = "1.4";
+  name = "lsb-release-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/lsb/${name}.tar.gz";
+    sha256 = "0wkiy7ymfi3fh2an2g30raw6yxh6rzf6nz2v90fplbnnz2414clr";
+  };
+
+  preConfigure = ''
+    substituteInPlace help2man \
+      --replace /usr/bin/perl ${perl}/bin/perl
+  '';
+
+  installFlags = [ "prefix=$(out)" ];
+
+  buildInputs = [ perl getopt ];
+
+  meta = {
+    description = "Prints certain LSB (Linux Standard Base) and Distribution information";
+    homepage = http://www.linuxfoundation.org/collaborate/workgroups/lsb;
+    license = [ stdenv.lib.licenses.gpl2Plus stdenv.lib.licenses.gpl3Plus ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8a5bdb8605..d31afaa46be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2249,6 +2249,8 @@ in
 
   lrzip = callPackage ../tools/compression/lrzip { };
 
+  lsb-release = callPackage ../os-specific/linux/lsb-release { };
+
   # lsh installs `bin/nettle-lfib-stream' and so does Nettle.  Give the
   # former a lower priority than Nettle.
   lsh = lowPrio (callPackage ../tools/networking/lsh { });

From 1f1d8993c93ce773afeea87a247330283ebce9a7 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 22 Apr 2016 20:47:40 +0200
Subject: [PATCH 088/712] calibre: 2.54.0 -> 2.55.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 7b789b3881d..d7ab712dae6 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.54.0";
+  version = "2.55.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "1r2cxnqiqnx51gbw283z8lz58i9zpvbf0a5ncrg5b2i9bphdiq79";
+    sha256 = "12412d5vjp141xp5qvif50fskd1vsmr15h956z3bh6j99n8z5953";
   };
 
   inherit python;

From b56dc1c4b04fd1c411a1d0d724680c783f19d7dd Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 22 Apr 2016 20:48:58 +0200
Subject: [PATCH 089/712] entr: 3.4 -> 3.5

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

diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix
index c6bca6e9d8f..0cc30fe45e3 100644
--- a/pkgs/tools/misc/entr/default.nix
+++ b/pkgs/tools/misc/entr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "entr-${version}";
-  version = "3.4";
+  version = "3.5";
 
   src = fetchurl {
     url = "http://entrproject.org/code/${name}.tar.gz";
-    sha256 = "02h1drxn2lid2fwzwjpkp9p04l0g5a56v6jyj3gi3dzjsq7h0zff";
+    sha256 = "05k4jyjna0pr2dalwc1l1dhrcyk6pw7hbss7jl4ykwfadcs5br73";
   };
 
   postPatch = ''

From fe6899e330cec6e52d8704d463c03d0cfb60a9ed Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 22 Apr 2016 20:51:11 +0200
Subject: [PATCH 090/712] instead: 2.4.0 -> 2.4.1

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

diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix
index 3dbda395dd6..e3fd6ccb2f7 100644
--- a/pkgs/games/instead/default.nix
+++ b/pkgs/games/instead/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }:
 
 let
-  version = "2.4.0";
+  version = "2.4.1";
 
   # I took several games at random from http://instead.syscall.ru/games/
   games = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz";
-    sha256 = "1xxga3ppgjshxzd0p53vsbaqkpzmjnm4vw0j1v7qbqzjgi3r44ix";
+    sha256 = "1i69b10jfb980d5zhmvh1i789hh982vxiwgqna82b84pdf3y7kgw";
   };
 
   NIX_LDFLAGS = "-llua -lgcc_s";

From 8d7e44745d98f77c505cf53b26e2b0920a0494fc Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 22 Apr 2016 21:01:56 +0200
Subject: [PATCH 091/712] libfilezilla: 0.4.0.1 -> 0.5.0

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

diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index d8e1c29875c..4381f9e6c73 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libfilezilla-${version}";
-  version = "0.4.0.1";
+  version = "0.5.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/filezilla/libfilezilla/${version}/${name}.tar.bz2";
-    sha256 = "1ldiyhjv4jg2jyj3d56mlgyj9lx0qkf1857wvsy51lp9aj96h0v0";
+    sha256 = "07f5hk5izqgqjadrwy608gi0w3scm3zvpsv63j7bgfqk67qilslc";
   };
 
   meta = with stdenv.lib; {

From 6768d3be9c48fc908da2f53cd1d60cd0ce1cad06 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 22 Apr 2016 21:03:14 +0200
Subject: [PATCH 092/712] python-betamax: 0.5.1 -> 0.6.0

---
 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 a180eb6cf02..69f54774858 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1702,11 +1702,11 @@ in modules // {
   };
 
   betamax = buildPythonPackage rec {
-    name = "betamax-0.5.1";
+    name = "betamax-0.6.0";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/b/betamax/${name}.tar.gz";
-      sha256 = "1glzigrbip9w2jr2gcmwa96rffhi9x9l1455dhbcx2gh3pmcykl6";
+      sha256 = "0vw4d53jbbb2kdl7l891h8iyxklqcd6ldvgcyhw9hl40ljdhv1wz";
     };
 
     propagatedBuildInputs = [ self.requests2 ];

From 545a65a76767d1a85a5398d4253f281dd841b2fb Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 22 Apr 2016 21:04:39 +0200
Subject: [PATCH 093/712] betamax-matchers: 0.2.0 -> 0.3.0

---
 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 69f54774858..877b12dcf1b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1721,11 +1721,11 @@ in modules // {
 
   betamax-matchers = buildPythonPackage rec {
     name = "betamax-matchers-${version}";
-    version = "0.2.0";
+    version = "0.3.0";
 
     src = pkgs.fetchurl {
        url = "https://pypi.python.org/packages/source/b/betamax-matchers/${name}.tar.gz";
-      sha256 = "13n2dy8s2jx8x8bbx684bff3444584bnmg0zhkfxhxndpy18p4is";
+      sha256 = "039kvqsdcvvlfxjc3n1x2xvjg6qkqbql0p7rc4z7bnxm9kcm88la";
     };
 
     buildInputs = with self; [ betamax requests_toolbelt ];

From 6ec9d2119438bf82fd538311436651a19c268522 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 22 Apr 2016 22:07:35 +0200
Subject: [PATCH 094/712] theme-vertex: 20150923 -> 20160329

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

diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix
index ea79426d47e..7c6778a40d5 100644
--- a/pkgs/misc/themes/vertex/default.nix
+++ b/pkgs/misc/themes/vertex/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "theme-vertex-${version}";
-  version = "20150923";
+  version = "20160329";
 
   src = fetchFromGitHub {
     owner = "horst3180";
     repo = "Vertex-theme";
     rev = version;
-    sha256 = "0jsdnrw7sgrb7s4byv80y9c782gd6vbq0xsrrhwkflfnxcldvz4r";
+    sha256 = "1zafnbxn9hgi4lmi254iw9jyhifcqijxa7cymwjpyy0jfa6sm1qj";
   };
 
   buildInputs = [ autoreconfHook gtk3 pkgconfig ];

From 6a0903597ad05d73c902895677e05a66f011bff5 Mon Sep 17 00:00:00 2001
From: Ethan Pailes <ethanpailes@gmail.com>
Date: Fri, 22 Apr 2016 11:42:40 -0400
Subject: [PATCH 095/712] tomb: init at version 2.2

---
 pkgs/os-specific/linux/tomb/default.nix | 41 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/os-specific/linux/tomb/default.nix

diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix
new file mode 100644
index 00000000000..5ed7ad5b959
--- /dev/null
+++ b/pkgs/os-specific/linux/tomb/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, zsh, pinentry, cryptsetup, gnupg1orig, makeWrapper }:
+
+let
+    version = "2.2";
+in
+
+stdenv.mkDerivation rec {
+  name = "tomb-${version}";
+
+  src = fetchurl {
+    url = "https://files.dyne.org/tomb/tomb-${version}.tar.gz";
+    sha256 = "11msj38fdmymiqcmwq1883kjqi5zr01ybdjj58rfjjrw4zw2w5y0";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  buildPhase = ''
+    # manually patch the interpreter
+    sed -i -e "1s|.*|#!${zsh}/bin/zsh|g" tomb
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/man/man1
+
+    cp tomb $out/bin/tomb
+    cp doc/tomb.1 $out/share/man/man1
+
+    wrapProgram $out/bin/tomb \
+        --prefix PATH : "${pinentry}/bin" \
+        --prefix PATH : "${cryptsetup}/bin" \
+        --prefix PATH : "${gnupg1orig}/bin"
+  '';
+
+  meta = {
+    description = "File encryption on GNU/Linux";
+    homepage = https://www.dyne.org/software/tomb/;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8a73642055..d0067f5aeb7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16618,4 +16618,6 @@ in
   discord = callPackage ../applications/networking/instant-messengers/discord { };
 
   golden-cheetah = qt5.callPackage ../applications/misc/golden-cheetah {};
+
+  tomb = callPackage ../os-specific/linux/tomb {};
 }

From d24523cc13982a1aeffdd151b185386ff6c7b187 Mon Sep 17 00:00:00 2001
From: Chris Martin <ch.martin@gmail.com>
Date: Fri, 22 Apr 2016 14:51:49 -0700
Subject: [PATCH 096/712] nixpkgs manual: fix link to go2nix

---
 doc/languages-frameworks/go.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml
index 89908b3b8ff..d715765f6a1 100644
--- a/doc/languages-frameworks/go.xml
+++ b/doc/languages-frameworks/go.xml
@@ -119,6 +119,6 @@ done
 </screen>
 </para>
 
-  <para>To extract dependency information from a Go package in automated way use <link xlink:href="https://github.com/cstrahan/go2nix">go2nix</link>.</para>
+  <para>To extract dependency information from a Go package in automated way use <link xlink:href="https://github.com/kamilchm/go2nix">go2nix</link>.</para>
 </section>
 

From 5b5ce8dcff65385c7fda90d1a9a8772ddea6381c Mon Sep 17 00:00:00 2001
From: obadz <git@obadz.com>
Date: Fri, 22 Apr 2016 17:13:29 -0500
Subject: [PATCH 097/712] fix my email address

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 9d9caa776d6..63b79ccab0b 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -254,7 +254,7 @@
   notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
   np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>";
   nslqqq = "Nikita Mikhailov <nslqqq@gmail.com>";
-  obadz = "obadz <dav-nixos@odav.org>";
+  obadz = "obadz <nixos@obadz.com>";
   ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
   odi = "Oliver Dunkl <oliver.dunkl@gmail.com>";
   offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";

From 0f98931d466d12f109cfbe74d7c96330c1534a1d Mon Sep 17 00:00:00 2001
From: = <anothersms@gmail.com>
Date: Fri, 22 Apr 2016 14:32:15 +0200
Subject: [PATCH 098/712] NeuroTools: init at 0.3.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7bcf655efe6..12854cc5e29 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4598,6 +4598,40 @@ in modules // {
     };
   });
 
+  neurotools = buildPythonPackage (rec {
+    name = "NeuroTools-${version}";
+    version = "0.3.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/N/NeuroTools/${name}.tar.gz";
+      sha256 = "0ly6qa87l3afhksab06vp1iimlbm1kdnsw98mxcnpzz9q07l4nd4";
+    };
+
+    disabled = isPy3k;
+
+    # Tests are not automatically run
+    # Many tests fail (using py.test), and some need R
+    doCheck = false;
+
+    propagatedBuildInputs = with self; [
+      scipy
+      numpy
+      matplotlib
+      tables
+      pyaml
+      urllib3
+      rpy2
+      mpi4py
+    ];
+
+    meta = {
+      description = "Collection of tools to support analysis of neural activity";
+      homepage = https://pypi.python.org/pypi/NeuroTools;
+      license = licenses.gpl2;
+      maintainers = with maintainers; [ nico202 ];
+    };
+  });
+
   jdatetime = buildPythonPackage (rec {
     name = "jdatetime-${version}";
     version = "1.7.1";

From f1e16b437fcb84cac49ad6c0f6334a6dad39ff09 Mon Sep 17 00:00:00 2001
From: = <anothersms@gmail.com>
Date: Sat, 23 Apr 2016 00:30:52 +0200
Subject: [PATCH 099/712] MDP: init at 0.1.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 877b12dcf1b..08720c93c2c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3931,6 +3931,27 @@ in modules // {
     };
   };
 
+  MDP = buildPythonPackage rec {
+    version = "0.1.0";
+    name = "MDP-${version}";
+
+    src = pkgs.fetchurl {
+      url = https://pypi.python.org/packages/source/M/MDP/MDP-3.5.tar.gz;
+      sha256 = "0aw1zxmyvx6gfmmnixbqmdaah28jl7rmqkzhxv53091asc23iw9k";
+    };
+
+    propagatedBuildInputs = with self; [ future numpy ];
+
+    doCheck = false;
+
+    meta = {
+      description = "Library for building complex data processing software by combining widely used machine learning algorithms";
+      homepage = http://mdp-toolkit.sourceforge.net;
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ nico202 ];
+    };
+  };
+
   minidb = buildPythonPackage rec {
     name = "minidb-2.0.1";
 

From bdf714c3039411bcaa942822cfc7c039a391a552 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Fri, 22 Apr 2016 19:34:11 -0300
Subject: [PATCH 100/712] dwarf-fortress-unfuck: 2016-02-11 -> 2016-04-22 and
 zlib dependency

---
 pkgs/games/dwarf-fortress/unfuck.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index 57b0e458cc2..598f795083b 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchFromGitHub, cmake
 , mesa, SDL, SDL_image, SDL_ttf, glew, openalSoft
-, ncurses, glib, gtk2, libsndfile
+, ncurses, glib, gtk2, libsndfile, zlib
 }:
 
 stdenv.mkDerivation {
-  name = "dwarf_fortress_unfuck-2016-02-11";
+  name = "dwarf_fortress_unfuck-2016-04-22";
 
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "dwarf_fortress_unfuck";
-    rev = "2ba59c87bb63bea598825a73bdc896b0e041e2d5";
-    sha256 = "0q2rhigvaabdknmb2c84gg71qz7xncmx04npzx4bki9avyxsrpcl";
+    rev = "dde40a2c619eac119b6db1bcd0c8d8612472f866";
+    sha256 = "12bqh3k4wsk1c0bz2zly8h0ilbsdmsbwr9cdjc6i7liwg9906g7i";
   };
 
   cmakeFlags = [
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     mesa SDL SDL_image SDL_ttf glew openalSoft
-    ncurses gtk2 libsndfile
+    ncurses gtk2 libsndfile zlib
   ];
 
   installPhase = ''

From 32394a3cd788e6d4b3f390bd26b6e5ff3021a35d Mon Sep 17 00:00:00 2001
From: = <anothersms@gmail.com>
Date: Sat, 23 Apr 2016 00:37:29 +0200
Subject: [PATCH 101/712] oger: init at 1.1.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 08720c93c2c..f3088bb64ea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3932,17 +3932,18 @@ in modules // {
   };
 
   MDP = buildPythonPackage rec {
-    version = "0.1.0";
+    version = "3.5";
     name = "MDP-${version}";
 
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/M/MDP/MDP-3.5.tar.gz;
+      url = "https://pypi.python.org/packages/source/M/MDP/${name}.tar.gz";
       sha256 = "0aw1zxmyvx6gfmmnixbqmdaah28jl7rmqkzhxv53091asc23iw9k";
     };
 
+    buildInputs = with self; [ pytest ];
     propagatedBuildInputs = with self; [ future numpy ];
 
-    doCheck = false;
+    doCheck = true;
 
     meta = {
       description = "Library for building complex data processing software by combining widely used machine learning algorithms";
@@ -6795,6 +6796,25 @@ in modules // {
     };
   };
 
+  oger = buildPythonPackage rec {
+    name = "oger-${version}";
+    version = "1.1.3";
+    src = pkgs.fetchurl {
+      url = "http://organic.elis.ugent.be/sites/organic.elis.ugent.be/files/Oger-${version}.tar.gz";
+      sha256 = "1k02ys812lz0x0yymljp102amkm8bvfgqsrphnk235xbcrb0akg5";
+    };
+
+    propagatedBuildInputs = with self; [ MDP scipy numpy matplotlib ];
+
+    meta = {
+      homepage = http://organic.elis.ugent.be/organic/engine;
+      description = "Rapidly build, train, and evalue modular learning architectures";
+      maintainers = with maintainers; [ nico202 ];
+      license = licenses.lgpl3;
+    };
+  };
+		  
+
   pathtools = buildPythonPackage rec {
     name = "pathtools-${version}";
     version = "0.1.2";

From d10d105ca6cc5fc71528250228775101df825573 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 22 Apr 2016 21:20:32 +0300
Subject: [PATCH 102/712] aria2: 1.21.0 -> 1.22.0

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

diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 189be8be9e2..01c6500b143 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "aria2-${version}";
-  version = "1.21.0";
+  version = "1.22.0";
 
   src = fetchurl {
     url = "https://github.com/tatsuhiro-t/aria2/releases/download/release-${version}/${name}.tar.xz";
-    sha256 = "1035rzx9y7qv4p7cv04f461343dxha7ikprch059x2fci8n5yp12";
+    sha256 = "12agwdvvkr34wqhyyfp418dj0k7nbr297qmcd3wj5kkn7brv6gxc";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = https://github.com/tatsuhiro-t/aria2;
     description = "A lightweight, multi-protocol, multi-source, command-line download utility";

From b9682eba1784b1aa9b6835c78ce302eda8d2bc11 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 23 Apr 2016 02:20:17 +0300
Subject: [PATCH 103/712] svox: init at 2016-01-25

---
 pkgs/applications/audio/svox/default.nix | 43 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/applications/audio/svox/default.nix

diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix
new file mode 100644
index 00000000000..f8258dd10ab
--- /dev/null
+++ b/pkgs/applications/audio/svox/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation rec {
+  name = "svox-${version}";
+  version = "2016-01-25";
+
+  src = fetchgit {
+    url = "https://android.googlesource.com/platform/external/svox";
+    rev = "dfb9937746b1828d093faf3b1494f9dc403f392d";
+    sha256 = "1gkfj5avikzmr2vv8bhf83n15jcbz4phz5j13l0qnh3gjzh4f1bk";
+  };
+
+  postPatch = ''
+    cd pico
+  '';
+
+  buildPhase = ''
+    cd lib
+    for i in *.c; do
+      $CC -O2 -fPIC -c -o ''${i%.c}.o $i
+    done
+    $CC -shared -o libttspico.so *.o
+    cd ..
+  '';
+
+  installPhase = ''
+    install -Dm755 lib/libttspico.so $out/lib/libttspico.so
+    mkdir -p $out/include
+    cp lib/*.h $out/include
+    mkdir -p $out/share/pico/lang
+    cp lang/*.bin $out/share/pico/lang
+  '';
+
+  NIX_CFLAGS_COMPILE = [ "-include stdint.h" ];
+
+  meta = with stdenv.lib; {
+    description = "Text-to-speech engine";
+    homepage = https://android.googlesource.com/platform/external/svox;
+    platforms = platforms.linux;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f939096cc5e..a959341fe35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12593,6 +12593,8 @@ in
 
   quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { };
 
+  svox = callPackage ../applications/audio/svox { };
+
   gkrellm = callPackage ../applications/misc/gkrellm { };
 
   gmu = callPackage ../applications/audio/gmu { };

From f3435096e2110ab78e4edeba3bfb0d905d19b2ed Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 22 Apr 2016 21:02:52 +0300
Subject: [PATCH 104/712] speechd: 0.7.1 -> 0.8.3

Make it actually useful -- support sound output and several voice modules
---
 .../development/libraries/speechd/default.nix | 33 ++++++++++++++-----
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix
index 5104532ea91..613fee3c6d6 100644
--- a/pkgs/development/libraries/speechd/default.nix
+++ b/pkgs/development/libraries/speechd/default.nix
@@ -1,20 +1,37 @@
-{ fetchurl, stdenv, dotconf, glib, pkgconfig }:
+{ fetchurl, lib, stdenv, intltool, libtool, pkgconfig, glib, dotconf, libsndfile
+, libao, python3Packages
+, withEspeak ? false, espeak
+, withPico ? true, svox
+}:
 
 stdenv.mkDerivation rec {
-  name = "speech-dispatcher-" + version;
-  version = "0.7.1";
+  name = "speech-dispatcher-${version}";
+  version = "0.8.3";
 
   src = fetchurl {
     url = "http://www.freebsoft.org/pub/projects/speechd/${name}.tar.gz";
-    sha256 = "0laag72iw03545zggdzcr860b8q7w1vrjr3csd2ldps7jhlwzad8";
+    sha256 = "0kqy7z4l59n2anc7xn588w4rkacig1hajx8c53qrh90ypar978ln";
   };
 
-  buildInputs = [ dotconf glib pkgconfig ];
+  buildInputs = [ intltool libtool glib dotconf libsndfile libao python3Packages.python ]
+             ++ lib.optional withEspeak espeak
+             ++ lib.optional withPico svox;
+  nativeBuildInputs = [ pkgconfig python3Packages.wrapPython ];
 
-  meta = {
+  pythonPath = with python3Packages; [ pyxdg ];
+
+  postPatch = lib.optionalString withPico ''
+    sed -i 's,/usr/share/pico/lang/,${svox}/share/pico/lang/,g' src/modules/pico.c
+  '';
+
+  postInstall = ''
+    wrapPythonPrograms
+  '';
+
+  meta = with stdenv.lib; {
     description = "Common interface to speech synthesis";
-
     homepage = http://www.freebsoft.org/speechd;
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
   };
 }

From 5489bc41099dbfaf9407942669f7c5faf8b6dad2 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 23 Apr 2016 02:21:34 +0300
Subject: [PATCH 105/712] mumble: fix speechd support

---
 pkgs/applications/networking/mumble/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 20a32159520..37c4c4005ba 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -80,6 +80,8 @@ let
       "CONFIG+=no-server"
     ];
 
+    NIX_CFLAGS_COMPILE = optional speechdSupport "-I${speechd}/include/speech-dispatcher";
+
     installPhase = ''
       cp scripts/mumble-overlay $out/bin
       sed -i "s,/usr/lib,$out/lib,g" $out/bin/mumble-overlay

From 6900fdc84b3b884cb10808dd4afd538fc05d03a0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 23 Apr 2016 02:21:46 +0300
Subject: [PATCH 106/712] mumble: 1.2.10 -> 1.2.15

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

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 37c4c4005ba..9af0401a818 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -110,12 +110,12 @@ let
   };
 
   stableSource = rec {
-    version = "1.2.10";
+    version = "1.2.15";
     qtVersion = 4;
 
     src = fetchurl {
       url = "https://github.com/mumble-voip/mumble/releases/download/${version}/mumble-${version}.tar.gz";
-      sha256 = "012vm0xf84x13414jlsx964c5a1nwnbn41jnspkciajlxxipldn6";
+      sha256 = "1yjywzybgq23ry5s2yihggs13ffrphhwl6rlp6lq79rkwvafa9v5";
     };
   };
 

From ae0a64cf2c04b45fcf135e27be114debfbfe902d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 23 Apr 2016 02:22:03 +0300
Subject: [PATCH 107/712] mumble_git: 2015-11-08 -> 2016-04-10

---
 .../networking/mumble/default.nix             | 27 +++----------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 9af0401a818..88b9ae49efd 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -120,34 +120,15 @@ let
   };
 
   gitSource = rec {
-    version = "1.3.0-git-2015-11-08";
+    version = "1.3.0-git-2016-04-10";
     qtVersion = 5;
 
+    # Needs submodules
     src = fetchgit {
       url = "https://github.com/mumble-voip/mumble";
-      rev = "72038f6aa038f5964e2bba5a09d3d391d4680e5f";
-      sha256 = "03978b85f7y0bffl8vwkmakjnxxjqapfz3pn0b8zf3b1ppwjy9g4";
+      rev = "0502fa67b036bae9f07a586d9f05a8bf74c24291";
+      sha256 = "073v8nway17j1n1lm70x508722b1q3vb6h4fvmcbbma3d22y1h45";
     };
-
-    # TODO: Remove fetchgit as it requires git
-    /*src = fetchFromGitHub {
-      owner = "mumble-voip";
-      repo = "mumble";
-      rev = "13e494c60beb20748eeb8be126b27e1226d168c8";
-      sha256 = "024my6wzahq16w7fjwrbksgnq98z4jjbdyy615kfyd9yk2qnpl80";
-    };
-
-    theme = fetchFromGitHub {
-      owner = "mumble-voip";
-      repo = "mumble-theme";
-      rev = "16b61d958f131ca85ab0f601d7331601b63d8f30";
-      sha256 = "0rbh825mwlh38j6nv2sran2clkiwvzj430mhvkdvzli9ysjxgsl3";
-    };
-
-    prePatch = ''
-      rmdir themes/Mumble
-      ln -s ${theme} themes/Mumble
-    '';*/
   };
 in {
   mumble     = client stableSource;

From 1076c93de3778f818d7e4cfe68b5232808f34fa0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 23 Apr 2016 01:29:34 +0200
Subject: [PATCH 108/712] tiled: 0.12.3 -> 0.16.0; clean up; maintain

---
 pkgs/applications/editors/tiled/default.nix | 35 ++++++++++++---------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index e4b2f0461c2..201db054743 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -1,26 +1,31 @@
-{ stdenv, fetchurl, qtbase, qttools, qmakeHook, pkgconfig, python }:
+{ stdenv, fetchurl, pkgconfig, qmakeHook
+, python, qtbase, qttools, zlib }:
 
 let
-  version = "0.12.3";
-  sha256 = "001j4lvb5d9h3m6vgz2na07637x6xg4bdvxi2hg4a0j9rikb4y40";
-in
-
-stdenv.mkDerivation rec {
+#  qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ];
+in stdenv.mkDerivation rec {
   name = "tiled-${version}";
+  version = "0.16.0";
 
   src = fetchurl {
+    name = "${name}.tar.gz";
     url = "https://github.com/bjorn/tiled/archive/v${version}.tar.gz";
-    inherit sha256;
+    sha256 = "1vlhfkgl126irp53xw94jw1xnj96l1hwnbxmm1s5az60460gfbf0";
   };
 
-  buildInputs = [ qtbase qttools qmakeHook pkgconfig python ];
+  nativeBuildInputs = [ pkgconfig qmakeHook ];
+  buildInputs = [ python qtbase qttools ];
 
-  meta = {
-    description = "A free, easy to use and flexible tile map editor";
-    homepage = "http://www.mapeditor.org/";
-    # libtiled and tmxviewer is licensed under 2-calause BSD license.
-    # The rest is GPL2 or later.
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Free, easy to use and flexible tile map editor";
+    homepage = http://www.mapeditor.org/;
+    license = with licenses; [
+      bsd2	# libtiled and tmxviewer
+      gpl2Plus	# all the rest
+    ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
   };
 }

From 23f3d86a3be8188a7623fe74727e8c842d01e633 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 23 Apr 2016 01:30:53 +0200
Subject: [PATCH 109/712] sane-backends-git -> 2016-04-23

More Pixma fixes.
---
 pkgs/applications/graphics/sane/backends/git.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix
index d7d512d8def..182c99dc2d0 100644
--- a/pkgs/applications/graphics/sane/backends/git.nix
+++ b/pkgs/applications/graphics/sane/backends/git.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "2016-04-20";
+  version = "2016-04-23";
   src = fetchgit {
-    sha256 = "f4a20eb41d72ff5961484ef164df44805a987523153107cc6f45acfb3d0208e2";
-    rev = "4b2f171a13248a8e3d79379e368c54fb71ed97e2";
+    sha256 = "11bf60cd5a6b314e855a69a6f57a5ca0db3254527def55662bce25810a2314df";
+    rev = "c8169b1e656f7f95c67946298da5a0e1c143f8e8";
     url = "git://alioth.debian.org/git/sane/sane-backends.git";
   };
 })

From be21e16652b18eb6e9611c8cf9a20e8d877ec564 Mon Sep 17 00:00:00 2001
From: roblabla <robinlambertz+dev@gmail.com>
Date: Sat, 23 Apr 2016 01:48:54 +0200
Subject: [PATCH 110/712] matrix-synapse: update 0.12.0 -> 0.14.0

---
 pkgs/servers/matrix-synapse/default.nix | 10 +++++-----
 pkgs/top-level/python-packages.nix      |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 9165e03d79c..ee0e66baa95 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -2,23 +2,23 @@
 let
   matrix-angular-sdk = buildPythonApplication rec {
     name = "matrix-angular-sdk-${version}";
-    version = "0.6.6";
+    version = "0.6.8";
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/m/matrix-angular-sdk/matrix-angular-sdk-${version}.tar.gz";
-      sha256 = "1vknhmibb8gh8lng50va2cdvng5xm7vqv9dl680m3gj38pg0bv8a";
+      sha256 = "0gmx4y5kqqphnq3m7xk2vpzb0w2a4palicw7wfdr1q2schl9fhz2";
     };
   };
 in
 buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.12.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
-    rev = "f35f8d06ea58e2d0cdccd82924c7a44fd93f4c38";
-    sha256 = "0b0k1am9lh0qglagc06m91qs26ybv37k7wpbg5333x8jaf5d1si4";
+    rev = "5fbdf2bcec40bf2f24fc0698440ee384595ff027";
+    sha256 = "1f9flb68l0bb5fkggxz1pghv72snsx6yia3s58f85z13f9vh84cb";
   };
 
   patches = [ ./matrix-synapse.patch ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3d1e2026a82..f7a5fc4d326 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16251,11 +16251,11 @@ in modules // {
 
   pysaml2 = buildPythonPackage rec {
     name = "pysaml2-${version}";
-    version = "3.0.0";
+    version = "3.0.2";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/pysaml2/${name}.tar.gz";
-      sha256 = "1h2wvagvl59642jq0s63mfr01q637vq6526mr8riykrjnchcbbi2";
+      sha256 = "0y2iw1dddcvi13xjh3l52z1mvnrbc41ik9k4nn7lwj8x5kimnk9n";
     };
 
     propagatedBuildInputs = with self; [
@@ -25045,12 +25045,12 @@ in modules // {
 
   unpaddedbase64 = buildPythonPackage rec {
     name = "unpaddedbase64-${version}";
-    version = "1.0.1";
+    version = "1.1.0";
 
     src = pkgs.fetchgit {
       url = "https://github.com/matrix-org/python-unpaddedbase64.git";
       rev = "refs/tags/v${version}";
-      sha256 = "f221240a6d414c4244ab906b1dc8983c4d1114acb778cb857f6fc50d710be502";
+      sha256 = "2dad07b53cf816a5c2fc14a1a193b0df63ab5aacaccffb328753e7d3027d434e";
     };
   };
 

From 83274eccf04584b98d4f64e92a1056178c7e7e7f Mon Sep 17 00:00:00 2001
From: Markus Binsteiner <makkus@gmail.com>
Date: Sat, 23 Apr 2016 12:52:42 +1200
Subject: [PATCH 111/712] seafile-*: 4.4.2 -> 5.0.7

Also updated dependencies:
ccnet: 1.4.2 -> 5.0.7
libsearpc: 1.2.2 -> 3.0.7
---
 pkgs/applications/networking/seafile-client/default.nix | 4 ++--
 pkgs/development/libraries/libsearpc/default.nix        | 8 ++++----
 pkgs/misc/seafile-shared/default.nix                    | 4 ++--
 pkgs/tools/networking/ccnet/default.nix                 | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 108135cea37..555667c035c 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec
 {
-  version = "4.4.2";
+  version = "5.0.7";
   name = "seafile-client-${version}";
 
   src = fetchurl
   {
     url = "https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz";
-    sha256 = "0aj39xiayibxp3vcrwi58pn51h9vcsy2z04q8jm17qadmk9dzyw6";
+    sha256 = "ae6975bc1adf45d09cf9f6332ceac7cf285f8191f6cf50c6291ed45f8cf4ffa5";
   };
 
   buildInputs = [ pkgconfig cmake qt4 seafile-shared makeWrapper ];
diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix
index 0410f64edec..0391786c3fd 100644
--- a/pkgs/development/libraries/libsearpc/default.nix
+++ b/pkgs/development/libraries/libsearpc/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec
 {
-  version = "1.2.2";
-  seafileVersion = "3.0-latest";
+  version = "3.0.7";
+  seafileVersion = "5.0.7";
   name = "libsearpc-${version}";
 
   src = fetchurl
   {
-    url = "https://github.com/haiwen/libsearpc/archive/v${seafileVersion}.tar.gz";
-    sha256 = "1kdq6chn3qhvr616sw91gf9kjfgbv9snl2srqisw0zddw1qkfcan";
+    url = "https://github.com/haiwen/libsearpc/archive/v${version}.tar.gz";
+    sha256 = "0fdrgksdwd4qxp7qvh75y39dy52h2f5wfjbqr00h3rwkbx4npvpg";
   };
 
   patches = [ ./libsearpc.pc.patch ];
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index 2b3b05ceda1..16464ab27e3 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec
 {
-  version = "4.4.2";
+  version = "5.0.7";
   name = "seafile-shared-${version}";
 
   src = fetchurl
   {
     url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz";
-    sha256 = "00sflvyap3nw38qblpagp2japgp83sqc5s4r336mi6475grgmnyi";
+    sha256 = "ec166c86a41e7ab3b1ae97a56326ab4a2b1ec38686486b956c3d153b8023c670";
   };
 
   buildInputs = [ which automake autoconf pkgconfig libtool vala python intltool fuse ];
diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix
index 556ef8d0274..d7aaa0f77fc 100644
--- a/pkgs/tools/networking/ccnet/default.nix
+++ b/pkgs/tools/networking/ccnet/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec
 {
-  version = "1.4.2";
-  seafileVersion = "4.0.6";
+  version = "5.0.7";
+  seafileVersion = "5.0.7";
   name = "ccnet-${version}";
 
   src = fetchurl
   {
-    url = "https://github.com/haiwen/ccnet/archive/v${seafileVersion}.tar.gz";
-    sha256 = "06srvyphrfx7g18vk899850q0aw8cxx34cj96mjzc3sqm0bkzqsh";
+    url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz";
+    sha256 = "1e1c670a85619b174328a15925a050c7a8b323fecd13434992332f5c15e05de1";
   };
 
   buildInputs = [ which automake autoconf pkgconfig libtool vala  python ];

From 274a699348b4fdb610e9af48c965f611fd111b7f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 23 Apr 2016 03:57:00 +0300
Subject: [PATCH 112/712] libburn: init at 1.4.2.pl01

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

diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix
new file mode 100644
index 00000000000..22edcc15769
--- /dev/null
+++ b/pkgs/development/libraries/libburn/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libburn-${version}";
+  version = "1.4.2.pl01";
+
+  src = fetchurl {
+    url = "http://files.libburnia-project.org/releases/${name}.tar.gz";
+    sha256 = "1nqfm24dm2csdnhsmpgw9cwcnkwvqlvfzsm9bhr6yg7bbmzwvkrk";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://libburnia-project.org/;
+    description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a959341fe35..2c791a2c30c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7338,6 +7338,8 @@ in
 
   libbson = callPackage ../development/libraries/libbson { };
 
+  libburn = callPackage ../development/libraries/libburn { };
+
   libcaca = callPackage ../development/libraries/libcaca { };
 
   libcanberra = callPackage ../development/libraries/libcanberra { };

From 60ddddeb5b3693483e2d75ebfef52b1d60edee22 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 23 Apr 2016 03:57:14 +0300
Subject: [PATCH 113/712] libisofs: init at 1.4.2

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

diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix
new file mode 100644
index 00000000000..d7e78410740
--- /dev/null
+++ b/pkgs/development/libraries/libisofs/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, acl, attr, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "libisofs-${version}";
+  version = "1.4.2";
+
+  src = fetchurl {
+    url = "http://files.libburnia-project.org/releases/${name}.tar.gz";
+    sha256 = "1axk1ykv8ibrlrd2f3allidviimi4ya6k7wpvr6r4y1sc7mg7rym";
+  };
+
+  buildInputs = [ attr zlib ];
+  propagatedBuildInputs = [ acl ];
+
+  meta = with stdenv.lib; {
+    homepage = http://libburnia-project.org/;
+    description = "A library to create an ISO-9660 filesystem with extensions like RockRidge or Joliet";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c791a2c30c..c70314209b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7735,6 +7735,8 @@ in
     graphviz = graphviz-nox;
   };
 
+  libisofs = callPackage ../development/libraries/libisofs { };
+
   libiptcdata = callPackage ../development/libraries/libiptcdata { };
 
   libjpeg_original = callPackage ../development/libraries/libjpeg { };

From 666cba9ad96caaf79833474034eac4a18614c23e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 23 Apr 2016 04:11:19 +0300
Subject: [PATCH 114/712] cdrtools: mark as free but don't distribute in binary
 form

---
 pkgs/applications/misc/cdrtools/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix
index 2168a21f7da..55bcfd99e17 100644
--- a/pkgs/applications/misc/cdrtools/default.nix
+++ b/pkgs/applications/misc/cdrtools/default.nix
@@ -26,10 +26,11 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://sourceforge.net/projects/cdrtools/;
     description = "Highly portable CD/DVD/BluRay command line recording software";
-    # Licensing issues: This package contains code licensed under CDDL, GPL2
-    # and LGPL2. There is debate regarding the legality of this licensing.
-    # Marked as unfree to avoid any possible legal issues.
-    license = licenses.unfree;
+    license = with licenses; [ gpl2 lgpl2 cddl ];
     platforms = platforms.linux;
+    # Licensing issues: This package contains code licensed under CDDL, GPL2
+    # and LGPL2. There is a debate regarding the legality of distributing this
+    # package in binary form.
+    hydraPlatforms = [];
   };
 }

From 2a51c3c12acc9b7199d2b38c880c5072f7928505 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 23 Apr 2016 04:13:43 +0300
Subject: [PATCH 115/712] brasero: use libburn and libisofs instead of some
 packages

---
 pkgs/tools/cd-dvd/brasero/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix
index ff910ad2e49..e903601c81d 100644
--- a/pkgs/tools/cd-dvd/brasero/default.nix
+++ b/pkgs/tools/cd-dvd/brasero/default.nix
@@ -1,13 +1,13 @@
 { stdenv, lib, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify
-, libcanberra_gtk3, intltool, makeWrapper, dvdauthor, cdrdao
-, dvdplusrwtools, cdrtools, vcdimager, wrapGAppsHook }:
+, libcanberra_gtk3, intltool, makeWrapper, dvdauthor, libburn, libisofs
+, vcdimager, wrapGAppsHook }:
 
 # libdvdcss is "too old" (in fast "too new"), see https://bugs.launchpad.net/ubuntu/+source/brasero/+bug/611590
 
 let
   major = "3.12";
   minor = "1";
-  binpath = lib.makeBinPath [ dvdauthor cdrdao dvdplusrwtools vcdimager cdrtools ];
+  binpath = lib.makeBinPath [ dvdauthor vcdimager ];
 
 in stdenv.mkDerivation rec {
   version = "${major}.${minor}";
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ];
 
-  buildInputs = [ gtk3 libxml2 libnotify libcanberra_gtk3
+  buildInputs = [ gtk3 libxml2 libnotify libcanberra_gtk3 libburn libisofs
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base
                   gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
                   gst_all_1.gst-plugins-ugly gst_all_1.gst-libav ];

From e690c3a8dd566651f5fa237bb6cb1d3166450b50 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 23 Apr 2016 04:14:10 +0300
Subject: [PATCH 116/712] k3b: move cdrtools dependency to a wrapper

---
 pkgs/applications/misc/k3b/default.nix |  7 ++++---
 pkgs/applications/misc/k3b/wrapper.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  6 +++---
 3 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/applications/misc/k3b/wrapper.nix

diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix
index 922dec11180..8c69e36a4e4 100644
--- a/pkgs/applications/misc/k3b/default.nix
+++ b/pkgs/applications/misc/k3b/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, makeWrapper, automoc4, cmake, perl, pkgconfig
 , shared_mime_info, libvorbis, taglib, flac, libsamplerate
 , libdvdread, lame, libsndfile, libmad, gettext , transcode, cdrdao
-, cdrtools, dvdplusrwtools, vcdimager, cdparanoia, kdelibs, libdvdcss, ffmpeg
+, dvdplusrwtools, vcdimager, cdparanoia, kdelibs, libdvdcss, ffmpeg
 , kdemultimedia, phonon, libkcddb ? null
 }:
 
@@ -9,10 +9,11 @@ let
   # at runtime, k3b needs the executables cdrdao, cdrecord, dvd+rw-format,
   # eMovix, growisofs, mkisofs, normalize, readcd, transcode, vcdxbuild,
   # vcdxminfo, and vcdxrip
-  binPath = lib.makeBinPath [ cdrdao dvdplusrwtools transcode vcdimager cdrtools ];
+  binPath = lib.makeBinPath [ cdrdao dvdplusrwtools transcode vcdimager ];
 
 in stdenv.mkDerivation rec {
-  name = "k3b-2.0.3a";
+  name = "k3b-${version}";
+  version = "2.0.3a";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/k3b/${name}.tar.xz";
diff --git a/pkgs/applications/misc/k3b/wrapper.nix b/pkgs/applications/misc/k3b/wrapper.nix
new file mode 100644
index 00000000000..d5c98a2affa
--- /dev/null
+++ b/pkgs/applications/misc/k3b/wrapper.nix
@@ -0,0 +1,23 @@
+{ lib, buildEnv, k3b-original, cdrtools, makeWrapper }:
+
+let
+  binPath = lib.makeBinPath [ cdrtools ];
+in buildEnv {
+  name = "k3b-${k3b-original.version}";
+
+  paths = [ k3b-original ];
+  buildInputs = [ makeWrapper ];
+
+  postBuild = ''
+    # TODO: This could be avoided if buildEnv could be forced to create all directories
+    if [ -L $out/bin ]; then
+      rm $out/bin
+      mkdir $out/bin
+      for i in ${k3b-original}/bin/*; do
+        ln -s $i $out/bin
+      done
+    fi
+    wrapProgram $out/bin/k3b \
+      --prefix PATH ':' ${binPath}
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c70314209b2..9a7bffe73a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15292,9 +15292,9 @@ in
 
           eventlist = callPackage ../applications/office/eventlist {};
 
-          k3b = callPackage ../applications/misc/k3b {
-            cdrtools = cdrkit;
-          };
+          k3b-original = lowPrio (callPackage ../applications/misc/k3b { });
+
+          k3b = callPackage ../applications/misc/k3b/wrapper.nix { };
 
           kadu = callPackage ../applications/networking/instant-messengers/kadu { };
 

From ef9175c5fb5ae0dc17bdfdffef8859d725f318c1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 23 Apr 2016 04:14:28 +0300
Subject: [PATCH 117/712] brasero: move cdrtools dependency to a wrapper

---
 pkgs/tools/cd-dvd/brasero/wrapper.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  4 +++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/cd-dvd/brasero/wrapper.nix

diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/pkgs/tools/cd-dvd/brasero/wrapper.nix
new file mode 100644
index 00000000000..021e0da0e72
--- /dev/null
+++ b/pkgs/tools/cd-dvd/brasero/wrapper.nix
@@ -0,0 +1,23 @@
+{ lib, buildEnv, brasero-original, cdrtools, makeWrapper }:
+
+let
+  binPath = lib.makeBinPath [ cdrtools ];
+in buildEnv {
+  name = "brasero-${brasero-original.version}";
+
+  paths = [ brasero-original ];
+  buildInputs = [ makeWrapper ];
+
+  postBuild = ''
+    # TODO: This could be avoided if buildEnv could be forced to create all directories
+    if [ -L $out/bin ]; then
+      rm $out/bin
+      mkdir $out/bin
+      for i in ${brasero-original}/bin/*; do
+        ln -s $i $out/bin
+      done
+    fi
+    wrapProgram $out/bin/brasero \
+      --prefix PATH ':' ${binPath}
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a7bffe73a5..c75365bf8fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -609,7 +609,9 @@ in
 
   boxfs = callPackage ../tools/filesystems/boxfs { };
 
-  brasero = callPackage ../tools/cd-dvd/brasero { };
+  brasero-original = lowPrio (callPackage ../tools/cd-dvd/brasero { });
+
+  brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { };
 
   brltty = callPackage ../tools/misc/brltty {
     alsaSupport = (!stdenv.isDarwin);

From d3754d34824810d80c8e05767f05c85855883a00 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Fri, 22 Apr 2016 22:49:00 -0400
Subject: [PATCH 118/712] ghcjs-base: update via ghcjs-boot

This pulls in two fixes for XMLHttpRequest for ghcjs-base:

* Fix two typos for websockets
  https://github.com/ghcjs/ghcjs-base/pull/54

* Respect `.withCredentials`property of XHR
  https://github.com/ghcjs/ghcjs-base/pull/57
---
 pkgs/development/compilers/ghcjs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 929d59a9a9b..fb8d789f533 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -40,8 +40,8 @@
 
 , ghcjsBootSrc ? fetchgit {
     url = git://github.com/ghcjs/ghcjs-boot.git;
-    rev = "758e79e420403e0f6625eda19b10c46564f7cbb5";
-    sha256 = "0gq1mc86cb2z875a7sdj44yy8g95rwxzkl3z1q8gg33k05s3b58r";
+    rev = "8c549931da27ba9e607f77195208ec156c840c8a";
+    sha256 = "0yg9bnabja39qysh9pg1335qbvbc0r2mdw6cky94p7kavacndfdv";
     fetchSubmodules = true;
   }
 , ghcjsBoot ? import ./ghcjs-boot.nix {

From 0657ddca952ea24a566e581f5c80e2172c6c6e61 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Sat, 23 Apr 2016 00:39:17 -0400
Subject: [PATCH 119/712] go: 1.6 -> 1.6.2

---
 pkgs/development/compilers/go/1.6.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix
index d9924c56744..4efcdb53f47 100644
--- a/pkgs/development/compilers/go/1.6.nix
+++ b/pkgs/development/compilers/go/1.6.nix
@@ -15,11 +15,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "go-${version}";
-  version = "1.6";
+  version = "1.6.2";
 
   src = fetchurl {
     url = "https://github.com/golang/go/archive/go${version}.tar.gz";
-    sha256 = "04g7w34qamgy9gqpy75xm03s8xbbslv1735iv1a06z8sphpkgs7m";
+    sha256 = "17sfhg3xfnakk666wlsbhxp4vbn19hlywf5cn1zfcd4zqkcyx30h";
   };
 
   # perl is used for testing go vet
@@ -96,12 +96,6 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./remove-tools-1.5.patch
-    # Fix bug when using musl (see https://github.com/golang/go/issues/14476)
-    # Should be fixed by go 1.6.1
-    (fetchpatch {
-      url = "https://github.com/golang/go/commit/1439158120742e5f41825de90a76b680da64bf76.patch";
-      sha256 = "0yixpbx056ns5wgd3f4absgiyc2ymmqk8mkhhz5ja90dvilzxcwd";
-    })
   ]
   # -ldflags=-s is required to compile on Darwin, see
   # https://github.com/golang/go/issues/11994

From 08546d3a20c915fb6554d68b3de89a1f2c0a1faa Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Fri, 22 Apr 2016 22:39:28 -0700
Subject: [PATCH 120/712] unifi: fix for closure-size changes

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

diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix
index 4dc0cd96904..782dced33df 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@@ -62,7 +62,7 @@ in
       bindsTo = systemdMountPoints;
       unitConfig.RequiresMountsFor = stateDir;
       # This a HACK to fix missing dependencies of dynamic libs extracted from jars
-      environment.LD_LIBRARY_PATH = with pkgs.stdenv; "${cc.cc}/lib";
+      environment.LD_LIBRARY_PATH = with pkgs.stdenv; "${cc.cc.lib}/lib";
 
       preStart = ''
         # Ensure privacy of state

From 86357de0c8d971f968b776abfc9f556b759f0ed2 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Fri, 22 Apr 2016 22:43:45 -0700
Subject: [PATCH 121/712] mfi: relocatable data dir

---
 nixos/modules/services/networking/mfi.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/modules/services/networking/mfi.nix b/nixos/modules/services/networking/mfi.nix
index 5afb83ed022..775564a2c44 100644
--- a/nixos/modules/services/networking/mfi.nix
+++ b/nixos/modules/services/networking/mfi.nix
@@ -10,6 +10,7 @@ let
     { what = "${pkgs.mfi}/dl"; where = "${stateDir}/dl"; }
     { what = "${pkgs.mfi}/lib"; where = "${stateDir}/lib"; }
     { what = "${pkgs.mongodb248}/bin"; where = "${stateDir}/bin"; }
+    { what = "${cfg.dataDir}"; where = "${stateDir}/data"; }
   ];
   systemdMountPoints = map (m: "${utils.escapeSystemdPath m.where}.mount") mountPoints;
   ports = [ 6080 6880 6443 6843 ];
@@ -23,6 +24,15 @@ in
         default = true;
         description = "Whether to open TCP ports ${concatMapStrings (a: "${toString a} ") ports}for the services.";
       };
+      dataDir = mkOption {
+        type = types.str;
+        default = "${stateDir}/data";
+        description = ''
+          Where to store the database and other data.
+
+          This directory will be bind-mounted to ${stateDir}/data as part of the service startup.
+        '';
+      };
     };
   };
 

From 032f3e721c1259b8a65f2bbe9f6c3a4d1994719f Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Fri, 22 Apr 2016 22:43:55 -0700
Subject: [PATCH 122/712] unifi: relocatable data dir

---
 nixos/modules/services/networking/unifi.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix
index 782dced33df..cb5a88e67aa 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@@ -17,6 +17,10 @@ let
       what = "${pkgs.mongodb}/bin";
       where = "${stateDir}/bin";
     }
+    {
+      what = "${cfg.dataDir}";
+      where = "${stateDir}/data";
+    }
   ];
   systemdMountPoints = map (m: "${utils.escapeSystemdPath m.where}.mount") mountPoints;
 in
@@ -32,6 +36,16 @@ in
       '';
     };
 
+    services.unifi.dataDir = mkOption {
+      type = types.str;
+      default = "${stateDir}/data";
+      description = ''
+        Where to store the database and other data.
+
+        This directory will be bind-mounted to ${stateDir}/data as part of the service startup.
+      '';
+    };
+
   };
 
   config = mkIf cfg.enable {

From efd1d4fa6059dd23dcdb869028ce40f4fcd6ac44 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Sat, 23 Apr 2016 10:45:24 +0200
Subject: [PATCH 123/712] qtbitcointrader: 1.08.03 -> 1.10.01

---
 .../misc/qtbitcointrader/default.nix          | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix
index 7de4e3e55a1..a8613f917eb 100644
--- a/pkgs/applications/misc/qtbitcointrader/default.nix
+++ b/pkgs/applications/misc/qtbitcointrader/default.nix
@@ -1,36 +1,33 @@
-{ stdenv, fetchFromGitHub, qt4, qmake4Hook }:
+{ stdenv, fetchurl, qt5 }:
 
 let
-  version = "1.08.03";
+  version = "1.10.01";
 in
 stdenv.mkDerivation {
   name = "qtbitcointrader-${version}";
 
-  src = fetchFromGitHub {
-    owner = "JulyIGHOR";
-    repo = "QtBitcoinTrader";
-    rev = "ee30cf158fa8535f2155a387558d3b8994728c28";
-    sha256 = "0kxb0n11agqid0nyqdspfndm03b8l0nl8x4yx2hsrizs6m5z08h4";
+  src = fetchurl {
+    url = "https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${version}.tar.gz";
+    sha256 = "0pgj8rsk9yxvls7yjpzblzbci2vvd0mlf9c7wdbjhwf6qyi7dfi3";
   };
 
-  buildInputs = [ qt4 ];
-
-  nativeBuildHooks = [ qmake4Hook ];
+  buildInputs = [ qt5.qtbase qt5.qtmultimedia qt5.qtscript ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/src";
 
-  preConfigure = ''
-    qmakeFlags="$qmakeFlags \
+  configurePhase = ''
+    qmake $qmakeFlags \
+      PREFIX=$out \
       DESKTOPDIR=$out/share/applications \
       ICONDIR=$out/share/pixmaps \
-    "
+      QtBitcoinTrader_Desktop.pro
   '';
 
   meta = with stdenv.lib;
-    { description = "Secure bitcoin trading client";
+    { description = "Bitcoin trading client";
       homepage = https://centrabit.com/;
       license = licenses.lgpl3;
-      platforms = qt4.meta.platforms;
+      platforms = qt5.qtbase.meta.platforms;
       maintainers = [ maintainers.ehmry ];
     };
 }

From 7a9aded54da8afc6d9305312263294bc16f880da Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 23 Apr 2016 11:30:11 +0200
Subject: [PATCH 124/712] pythonPackages.aiohttp: 0.19.0 -> 0.21.5

---
 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 72f808434c1..0fd3fb23fbf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -431,11 +431,11 @@ in modules // {
 
   aiohttp = buildPythonPackage rec {
     name = "aiohttp-${version}";
-    version = "0.19.0";
+    version = "0.21.5";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/a/aiohttp/${name}.tar.gz";
-      sha256 = "9bfb173baec179431a1c8f3566185e8ebbd1517cf4450217087d79e26e44c287";
+      sha256 = "0n8517wc8b6yc925f7zhgl4wqf4ay1w2fzar0pj1h20yfa1wiids";
     };
 
     disabled = pythonOlder "3.4";

From d4f7c8a2086aba8066cb97286f31588bd7849341 Mon Sep 17 00:00:00 2001
From: = <anothersms@gmail.com>
Date: Sat, 23 Apr 2016 12:20:44 +0200
Subject: [PATCH 125/712] non: 2016-03-06 -> 2016-04-05

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

diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix
index ead53721950..9217bc285bc 100644
--- a/pkgs/applications/audio/non/default.nix
+++ b/pkgs/applications/audio/non/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   name = "non-${version}";
-  version = "2016-03-06";
+  version = "2016-04-05";
   src = fetchFromGitHub {
     owner = "original-male";
     repo = "non";
-    rev = "3946d392216ee999b560d8b7cdee7c4347110e29";
-    sha256 = "02vnq2mfimgdrmv3lmz80yif4h9a1lympv0wqc5dr2l0f8amj2fp";
+    rev = "16885e69fe865495dc32d869d1454ab148b0dca6";
+    sha256 = "1nwzzgcdpbqh5kjvz40yy5nmzvpp8gcr9biyhhwi68s5bsg972ss";
   };
 
   buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile

From 733d89d802a7b201f1811af9c62cb2567035b4c0 Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Sat, 23 Apr 2016 12:32:58 +0200
Subject: [PATCH 126/712] rustRegistry: 2016-04-18 -> 2016-04-23

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

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 0476b3991ba..d3a84d416d1 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,15 +7,15 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2016-04-18";
-  rev = "2cd09d5c51264ae0e2deede74fb2620dae757c16";
+  version = "2016-04-23";
+  rev = "ae2c4051b5df822213c3382bf0d1daaef38ea90c";
 
   src = fetchFromGitHub {
       inherit rev;
 
       owner = "rust-lang";
       repo = "crates.io-index";
-      sha256 = "0br52x480g9wqm9fl6kcin0m4a4bd20j65c454hhdw7b9ngaydav";
+      sha256 = "17ypnb59w4j2f51qpyx5jidkgqvsrk3c7b3mc5s85niy7mvk8wy4";
   };
 
 in

From 5fdc54387e03b0bf626da8c7f704d4335f2d911b Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 22 Apr 2016 12:19:18 +0200
Subject: [PATCH 127/712] haxor-news: init at 0.3.1

---
 pkgs/applications/misc/haxor-news/default.nix | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/misc/haxor-news/default.nix

diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix
new file mode 100644
index 00000000000..e4074547d78
--- /dev/null
+++ b/pkgs/applications/misc/haxor-news/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+  version = "0.3.1";
+  name = "haxor-news-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/donnemartin/haxor-news/archive/0.3.1.tar.gz";
+    sha256 = "0jglx8fy38sjyszvvg7mvmyk66l53kyq4i09hmgdz7hb1hrm9m2m";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [
+    click
+    colorama
+    requests2
+    pygments
+    prompt_toolkit_52
+    six
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/donnemartin/haxor-news";
+    description = "Browse Hacker News like a haxor";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ matthiasbeyer ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8a73642055..8fddd44cded 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7128,6 +7128,8 @@ in
 
   hawknl = callPackage ../development/libraries/hawknl { };
 
+  haxor-news = callPackage ../applications/misc/haxor-news { };
+
   herqq = callPackage ../development/libraries/herqq { };
 
   heyefi = self.haskellPackages.heyefi;

From db179647d62e181a884d6d30460c9ff841808dec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 23 Apr 2016 13:11:32 +0100
Subject: [PATCH 128/712] make all boot tests release critical #14902
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 9d1662c6c90059b63fad01b3f55a0df94af7cde4)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 nixos/release-combined.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 53ef4564b5c..abb69f121da 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -64,6 +64,9 @@ in rec {
         (all nixos.tests.installer.btrfsSubvols)
         (all nixos.tests.installer.btrfsSubvolDefault)
         (all nixos.tests.boot.biosCdrom)
+        (all nixos.tests.boot.biosUsb)
+        (all nixos.tests.boot.uefiCdrom)
+        (all nixos.tests.boot.uefiUsb)
         (all nixos.tests.ipv6)
         (all nixos.tests.kde4)
         #(all nixos.tests.lightdm)

From bb13afea6cff95c5d4d6f7a7045d60f141bb7abf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 13 Mar 2016 16:39:07 -0400
Subject: [PATCH 129/712] pyatspi: call via pythonPackages

---
 pkgs/development/python-modules/pyatspi/default.nix | 9 +++++++--
 pkgs/top-level/all-packages.nix                     | 2 +-
 pkgs/top-level/python-packages.nix                  | 2 ++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix
index 636126ea74a..598056a0c36 100644
--- a/pkgs/development/python-modules/pyatspi/default.nix
+++ b/pkgs/development/python-modules/pyatspi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, python3, python3Packages, at_spi2_core }:
+{ stdenv, fetchurl, pkgconfig, at_spi2_core, pythonPackages }:
 
 stdenv.mkDerivation rec {
   version = "2.18.0";
@@ -9,8 +9,13 @@ stdenv.mkDerivation rec {
     sha256 = "0imbyk2v6c11da7pkwz91313pkkldxs8zfg81zb2ql6h0nnh6vzq";
   };
 
+  broken = true;
+
   buildInputs = [
-    pkgconfig python3 python3Packages.pygobject3 at_spi2_core
+    at_spi2_core
+    pkgconfig
+    pythonPackages.python
+    pythonPackages.pygobject3
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0906c7ce961..85e3c5f7b6a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2944,7 +2944,7 @@ in
 
   pwnat = callPackage ../tools/networking/pwnat { };
 
-  pyatspi = callPackage ../development/python-modules/pyatspi { };
+  pyatspi = python3Packages.pyatspi;
 
   pycangjie = pythonPackages.pycangjie;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a0c2bc5d351..0a2e6bc7286 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -140,6 +140,8 @@ in modules // {
 
   plantuml = callPackage ../tools/misc/plantuml { };
 
+  pyatspi = if isPy3k then callPackage ../development/python-modules/pyatspi { } else throw "pyatspi not supported for interpreter ${python.executable}";
+
   pycairo = callPackage ../development/python-modules/pycairo {
   };
 

From d72e82498313705df4cf29681c91177c411c5397 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 13 Mar 2016 16:56:08 -0400
Subject: [PATCH 130/712] pyexiv2: call via pythonPackages

---
 pkgs/top-level/all-packages.nix    | 2 +-
 pkgs/top-level/python-packages.nix | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85e3c5f7b6a..e9fee1e8e3f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9452,7 +9452,7 @@ in
 
   pycups = pythonPackages.pycups;
 
-  pyexiv2 = callPackage ../development/python-modules/pyexiv2 { };
+  pyexiv2 = pythonPackages.pyexiv2;
 
   pygame = pythonPackages.pygame;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0a2e6bc7286..ba084652063 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -149,6 +149,8 @@ in modules // {
 
   pycrypto = callPackage ../development/python-modules/pycrypto { };
 
+  pyexiv2 = if (!isPy3k) then callPackage ../development/python-modules/pyexiv2 {} else throw "pyexiv2 not supported for interpreter ${python.executable}";
+
   pygame = callPackage ../development/python-modules/pygame { };
 
   pygobject = callPackage ../development/python-modules/pygobject { };

From b843ef426c5bb348864c0cb6bd42d4752e3a0a42 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 13 Mar 2016 17:02:41 -0400
Subject: [PATCH 131/712] rhpl: call via pythonPackages

---
 pkgs/top-level/all-packages.nix    | 2 +-
 pkgs/top-level/python-packages.nix | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9fee1e8e3f..bdfd78abb83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9470,7 +9470,7 @@ in
 
   pyopenssl = pythonPackages.pyopenssl;
 
-  rhpl = callPackage ../development/python-modules/rhpl { };
+  rhpl = pythonPackages.rhpl;
 
   pyqt4 = pythonPackages.pyqt4;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ba084652063..429acdd6347 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -187,6 +187,8 @@ in modules // {
 
   pyxml = if !isPy3k then callPackage ../development/python-modules/pyxml{ } else throw "pyxml not supported for interpreter ${python.executable}";
 
+  rhpl = if !isPy3k then callPackage ../development/python-modules/rhpl {} else throw "rhpl not supported for interpreter ${python.executable}";
+
   sip = callPackage ../development/python-modules/sip { };
 
   sip_4_16 = callPackage ../development/python-modules/sip/4.16.nix { };

From dd16ab92dc7f11c83d74c58f8eb94c7d40191623 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Sat, 23 Apr 2016 15:08:45 +0200
Subject: [PATCH 132/712] emby: init at 3.0.5930

---
 pkgs/servers/emby/default.nix   | 35 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/servers/emby/default.nix

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
new file mode 100644
index 00000000000..26ac26f67c1
--- /dev/null
+++ b/pkgs/servers/emby/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, unzip, sqlite }:
+
+stdenv.mkDerivation rec {
+  name = "emby-${version}";
+  version = "3.0.5930";
+
+  src = fetchurl {
+    url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
+    sha256 = "0498v7wng13c9n8sjfaq0b8p933vn7hk5icsranm39bkh3jqgdwf";
+  };
+
+  buildInputs = [ unzip ];
+  propagatedBuildInputs = [ sqlite ];
+
+  # Need to set sourceRoot as unpacker will complain about multiple directory output
+  sourceRoot = ".";
+
+  patchPhase = ''
+    substituteInPlace System.Data.SQLite.dll.config --replace libsqlite3.so ${sqlite.out}/lib/libsqlite3.so
+    substituteInPlace MediaBrowser.Server.Mono.exe.config --replace ProgramData-Server "/var/lib/emby/ProgramData-Server"
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -r * $out/bin
+  '';
+
+  meta = {
+    description = "MediaBrowser - Bring together your videos, music, photos, and live television";
+    homepage = http://emby.media/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.fadenb ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc5b11fdbd3..6cd3c72e89f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -754,6 +754,8 @@ in
 
   elementary-icon-theme = callPackage ../data/icons/elementary-icon-theme { };
 
+  emby = callPackage ../servers/emby { };
+
   enca = callPackage ../tools/text/enca { };
 
   ent = callPackage ../tools/misc/ent { };

From c145f6eaa75567f87dd2f61832c3e28f067cfe2b Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Sat, 23 Apr 2016 15:49:33 +0200
Subject: [PATCH 133/712] emby service: new service

---
 nixos/modules/misc/ids.nix           |  2 +
 nixos/modules/module-list.nix        |  1 +
 nixos/modules/services/misc/emby.nix | 64 ++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+)
 create mode 100644 nixos/modules/services/misc/emby.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 9e6bbc74438..684ca132bc7 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -263,6 +263,7 @@
       caddy = 239;
       taskd = 240;
       factorio = 241;
+      emby = 242;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -497,6 +498,7 @@
       caddy = 239;
       taskd = 240;
       factorio = 241;
+      emby = 242;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 41210e64851..972802b2341 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -216,6 +216,7 @@
   ./services/misc/dictd.nix
   ./services/misc/disnix.nix
   ./services/misc/docker-registry.nix
+  ./services/misc/emby.nix
   ./services/misc/etcd.nix
   ./services/misc/felix.nix
   ./services/misc/folding-at-home.nix
diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix
new file mode 100644
index 00000000000..fe872349f45
--- /dev/null
+++ b/nixos/modules/services/misc/emby.nix
@@ -0,0 +1,64 @@
+{ config, pkgs, lib, mono, ... }:
+
+with lib;
+
+let
+  cfg = config.services.emby;
+  emby = pkgs.emby;
+in
+{
+  options = {
+    services.emby = {
+      enable = mkEnableOption "Emby Media Server";
+
+      user = mkOption {
+        type = types.str;
+        default = "emby";
+        description = "User account under which Emby runs.";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "emby";
+        description = "Group under which emby runs.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.emby = {
+      description = "Emby Media Server";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      preStart = ''
+        test -d /var/lib/emby/ProgramData-Server || {
+          echo "Creating initial Emby data directory in /var/lib/emby/ProgramData-Server"
+          mkdir -p /var/lib/emby/ProgramData-Server
+          chown -R ${cfg.user}:${cfg.group} /var/lib/emby/ProgramData-Server
+          }
+      '';
+
+      serviceConfig = {
+        Type = "simple";
+        User = cfg.user;
+        Group = cfg.group;
+        PermissionsStartOnly = "true";
+        ExecStart = "${pkgs.mono}/bin/mono ${pkgs.emby}/bin/MediaBrowser.Server.Mono.exe";
+        Restart = "on-failure";
+      };
+    };
+
+    users.extraUsers = mkIf (cfg.user == "emby") {
+      emby = {
+        group = cfg.group;
+        uid = config.ids.uids.emby;
+      };
+    };
+
+    users.extraGroups = mkIf (cfg.group == "emby") {
+      emby = {
+        gid = config.ids.gids.emby;
+      };
+    };
+  };
+}

From a1b39b9990f2c23f31875a5993441ea686885df3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 23 Apr 2016 16:16:22 +0200
Subject: [PATCH 134/712] cups tests: finally fix them

Fixes #14748.
---
 nixos/tests/printing.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 10d69b446cd..c777fd41b78 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -62,7 +62,7 @@ import ./make-test.nix ({pkgs, ... }: {
       # Test printing various file types.
       foreach my $file ("${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf",
                         "${pkgs.groff.doc}/share/doc/*/meref.ps",
-                        "${pkgs.cups}/share/doc/cups/images/cups.png",
+                        "${pkgs.cups.out}/share/doc/cups/images/cups.png",
                         "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt")
       {
           $file =~ /([^\/]*)$/; my $fn = $1;

From 0857405208623e37d20d5bc8f5ce5067dc12d7e7 Mon Sep 17 00:00:00 2001
From: Simon Vandel Sillesen <simon.vandel@gmail.com>
Date: Sat, 23 Apr 2016 16:17:41 +0200
Subject: [PATCH 135/712] Oracle Java Mission Control: fix startup

The jmc binary needed some runtime dependencies. JMC can now be run.
---
 pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
index a18ffcbf3d4..fe5b3b71258 100644
--- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
@@ -11,6 +11,7 @@
 { swingSupport ? true
 , stdenv
 , requireFile
+, makeWrapper
 , unzip
 , file
 , xorg ? null
@@ -83,6 +84,8 @@ let result = stdenv.mkDerivation rec {
   nativeBuildInputs = [ file ]
     ++ stdenv.lib.optional installjce unzip;
 
+  buildInputs = [ makeWrapper ];
+
   # See: https://github.com/NixOS/patchelf/issues/10
   dontStrip = 1;
 
@@ -159,6 +162,10 @@ let result = stdenv.mkDerivation rec {
     cat <<EOF >> $out/nix-support/setup-hook
     if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
     EOF
+
+    # Oracle Java Mission Control needs to know where libgtk-x11 and related is
+    wrapProgram "$out/bin/jmc" \
+        --suffix-each LD_LIBRARY_PATH ':' "${rpath}" \
   '';
 
   inherit installjdk pluginSupport;

From 788122c3c5dcd146f65fbd587972b22f5ff8481e Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 21 Apr 2016 21:35:41 -0500
Subject: [PATCH 136/712] facetimehd: Only unload module if it is loaded

The pre-sleep service exits if any command fails. Unloading facetimehd
without it being loaded blocks subsequent commands from running.

Note: `modprobe -r` works a bit better when unloading unused modules,
and is preferrable to `rmmod`. However, the facetimehd module does not
support suspending. In this case, it seems preferable to forcefully
unload the module. `modprobe` does not support a `--force` flag when
removing, so we are left with `rmmod`.

See:
 - https://github.com/NixOS/nixpkgs/pull/14883
 - https://github.com/patjak/bcwc_pcie/wiki#known-issues
---
 nixos/modules/hardware/video/webcam/facetimehd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/hardware/video/webcam/facetimehd.nix b/nixos/modules/hardware/video/webcam/facetimehd.nix
index 309cedca48b..2a2fcf3057d 100644
--- a/nixos/modules/hardware/video/webcam/facetimehd.nix
+++ b/nixos/modules/hardware/video/webcam/facetimehd.nix
@@ -31,7 +31,7 @@ in
 
     # unload module during suspend/hibernate as it crashes the whole system
     powerManagement.powerDownCommands = ''
-      ${pkgs.kmod}/bin/rmmod -f facetimehd
+      ${pkgs.kmod}/bin/lsmod | ${pkgs.gnugrep}/bin/grep -q "^facetimehd" && ${pkgs.kmod}/bin/rmmod -f -v facetimehd
     '';
 
     # and load it back on resume

From 1b80f2478851d7c2bec8e4732224ad6028d0e3cd Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Fri, 4 Mar 2016 14:10:17 +0100
Subject: [PATCH 137/712] vim-plugins: make Cocoa optional

---
 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 0ad4db97635..83dcab35e67 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -2,7 +2,7 @@
 { fetchurl, bash, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip
 , which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages, zip
 , vim_configurable, vimPlugins, xkb_switch, git
-, Cocoa
+, Cocoa ? null
 }:
 
 let

From aaec8fb9f1ab299b399793fe5b86f60a7c3f8f88 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Mon, 29 Feb 2016 18:40:32 +0100
Subject: [PATCH 138/712] vim-plugins: add vimprivewpandoc and needed python
 modules

---
 pkgs/misc/vim-plugins/default.nix      | 21 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  2 ++
 pkgs/top-level/python-packages.nix     | 46 ++++++++++++++++++++++++++
 3 files changed, 69 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 83dcab35e67..5b32a1b49ea 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1682,4 +1682,25 @@ rec {
 
   };
 
+  vim-pandoc-after = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-pandoc-after-2015-06-01";
+    src = fetchgit {
+      url = "git://github.com/vim-pandoc/vim-pandoc-after";
+      rev = "4377665e5c98f29ea838deb3b942200b8dd096ef";
+      sha256 = "1di82bgi7sjn7lmma7g9zbdraamsy9c6g7ms6jgglfvynbbvmgg0";
+    };
+    dependencies = [];
+
+  };
+
+  vimpreviewpandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vimpreviewpandoc-2016-03-03";
+    src = fetchgit {
+      url = "git://github.com/tex/vimpreviewpandoc";
+      rev = "7c05b4a7bf55a361c7ac33e6e05f7965daed5889";
+      sha256 = "12xnnsvdsl2wc7fy537pdk6s3nfxw46g1l4xqr0fxzhz712nczk5";
+    };
+    dependencies = [];
+
+  };
 }
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 5102d6cde1c..2b8d71b8760 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -68,6 +68,7 @@
 "github:shougo/vimshell.vim"
 "github:sjl/gundo.vim"
 "github:takac/vim-hardtime"
+"github:tex/vimpreviewpandoc"
 "github:thinca/vim-quickrun"
 "github:tomasr/molokai"
 "github:tpope/vim-eunuch"
@@ -77,6 +78,7 @@
 "github:vim-airline/vim-airline-themes"
 "github:vim-pandoc/vim-pandoc"
 "github:vim-pandoc/vim-pandoc-syntax"
+"github:vim-pandoc/vim-pandoc-after"
 "github:vim-scripts/Colour-Sampler-Pack"
 "github:vim-scripts/a.vim"
 "github:vim-scripts/align"
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 429acdd6347..68a71864933 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26541,4 +26541,50 @@ in modules // {
       platforms = platforms.linux;
     };
   };
+  pandocfilters = buildPythonPackage rec{
+    version = "1.3.0";
+    pname = "pandocfilters";
+    name = pname + "-${version}";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "jgm";
+      repo = pname;
+      rev = version;
+      sha256 = "0ky9k800ixwiwvra0na6d6qaqcyps83mycgd8qvkrn5r80hddkzz";
+    };
+
+    propagatedBuildInputs = with self; [ ];
+
+    meta = {
+      description = "A python module for writing pandoc filters, with a collection of examples";
+      homepage = https://github.com/jgm/pandocfilters;
+      license = licenses.mit;
+      maintainers = with maintainers; [];
+    };
+  };
+
+  htmltreediff = buildPythonPackage rec{
+    version = "0.1.2";
+    pname = "htmltreediff";
+    name = pname + "-${version}";
+
+    # Does not work with Py >= 3
+    disabled = !isPy27;
+
+    src = pkgs.fetchFromGitHub {
+      owner = "christian-oudard";
+      repo = pname;
+      rev = "v" + version;
+      sha256 = "16mqp2jyznrw1mgd3qzybq28h2k5wz7vmmz1m6xpgscazyjhvvd1";
+    };
+
+    propagatedBuildInputs = with self; [ lxml html5lib ];
+
+    meta = {
+      description = " Structure-aware diff for html and xml documents";
+      homepage = https://github.com/christian-oudard/htmltreediff;
+      license = licenses.bsdOriginal;
+      maintainers = with maintainers; [];
+    };
+  };
 }

From 31176b579227956554a8d347e0a644332951e1f2 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Sat, 5 Mar 2016 22:55:55 +0100
Subject: [PATCH 139/712] blockdiag: 1.4.7 --> 1.5.3

* version bump
* change url from pypi to bitbucket
---
 pkgs/top-level/python-packages.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 68a71864933..1232f7a58fd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2334,11 +2334,12 @@ in modules // {
 
 
   blockdiag = buildPythonPackage rec {
-    name = "blockdiag-1.4.7";
+    name = "blockdiag";
+    version = "1.5.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/b/blockdiag/${name}.tar.gz";
-      sha256 = "0bc29sh8hj3hmhclifh1by0n6vg2pl9wkxb7fmljyw0arjas54bf";
+      url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2";
+      sha256 = "0r0qbmv0ijnqidsgm2rqs162y9aixmnkmzgnzgk52hiy7ydm4k8f";
     };
 
     buildInputs = with self; [ pep8 nose unittest2 docutils ];

From 07d305af32ba74319c58f3f66dc94d814f89850d Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Sat, 23 Apr 2016 20:33:21 +0200
Subject: [PATCH 140/712] rkt: 1.2.0 -> 1.4.0

---
 pkgs/applications/virtualization/rkt/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 4845d0b6065..892deadfe38 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -1,15 +1,15 @@
 { stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, trousers, squashfsTools,
-  cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper }:
+  cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper, glibc }:
 
 let
-  coreosImageRelease = "794.1.0";
-  coreosImageSystemdVersion = "222";
+  coreosImageRelease = "991.0.0";
+  coreosImageSystemdVersion = "225";
 
   # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor.
   stage1Flavours = [ "coreos" "fly" "host" ];
 
 in stdenv.mkDerivation rec {
-  version = "1.2.0";
+  version = "1.4.0";
   name = "rkt-${version}";
   BUILDDIR="build-${name}";
 
@@ -17,15 +17,16 @@ in stdenv.mkDerivation rec {
       rev = "v${version}";
       owner = "coreos";
       repo = "rkt";
-      sha256 = "0icsrh118mm3rabbcr0gd3b22m5rizdbqlrfp9d79g591p7bjh38";
+      sha256 = "0lnvqhg88aa6zx4wnkz17v3f529i9hi0y2aihfsq09pvsn56hwjl";
   };
 
   stage1BaseImage = fetchurl {
     url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
-    sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym";
+    sha256 = "1vaimrbynhjh4f30rq92bv1h3c1lxnf8isx5c2qvnn3lghypss9k";
   };
 
   buildInputs = [
+    glibc.out glibc.static
     autoreconfHook go file git wget gnupg1 trousers squashfsTools cpio acl systemd
     makeWrapper
   ];

From 929b0d99c1848ae4491aec0620c1fe252bf2fbd0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 23 Apr 2016 19:32:08 +0300
Subject: [PATCH 141/712] imagemagick: support JPEG2000

---
 pkgs/applications/graphics/ImageMagick/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index ef3b7b05b18..b732a2ed916 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, pkgconfig, libtool
 , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
-, lcms2, openexr, libpng, librsvg, libtiff, libxml2
+, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg
 }:
 
 let
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig libtool zlib fontconfig freetype ghostscript libjpeg
-      openexr libpng librsvg libtiff libxml2
+      openexr libpng librsvg libtiff libxml2 openjpeg
     ];
 
   propagatedBuildInputs =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cd3c72e89f..0daa3d2b13c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12814,6 +12814,7 @@ in
     librsvg = null;
     libtiff = null;
     libxml2 = null;
+    openjpeg = null;
   };
 
   imagemagick = self.imagemagickBig.override {

From 7f32a05baac41ca5472bb9bcc0b1d0ea7f48d7bb Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 23 Apr 2016 22:25:34 +0300
Subject: [PATCH 142/712] dwarf-therapist: fix build

---
 pkgs/games/dwarf-fortress/dwarf-therapist/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index 65eb7d49771..6c094ff20f8 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, texlive }:
+{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, qmakeHook, texlive }:
 
 let
   version = "37.0.0";
@@ -15,14 +15,10 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "layouts" ];
   buildInputs = [ qtbase qtdeclarative ];
-  nativeBuildInputs = [ texlive ];
+  nativeBuildInputs = [ texlive qmakeHook ];
 
   enableParallelBuilding = false;
 
-  configurePhase = ''
-    $QMAKE PREFIX=$out
-  '';
-
   # Move layout files so they cannot be found by Therapist
   postInstall = ''
     mkdir -p $layouts

From fb6ea3deadfbffc9bd605d68170c0e3133abcb6d Mon Sep 17 00:00:00 2001
From: Al Zohali <zohl@fmap.me>
Date: Sat, 23 Apr 2016 22:26:23 +0300
Subject: [PATCH 143/712] postgresql service: initialScript fixup

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

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 31ffe51c11e..80ee32f4ee3 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -242,7 +242,7 @@ in
 
             if test -e "${cfg.dataDir}/.first_startup"; then
               ${optionalString (cfg.initialScript != null) ''
-                cat "${cfg.initialScript}" | psql --port=${toString cfg.port} postgres
+                psql -f "${cfg.initialScript}" --port=${toString cfg.port} postgres
               ''}
               rm -f "${cfg.dataDir}/.first_startup"
             fi

From 3f14b00106e74bd6e0d81f8f1af301d38278e0ec Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Fri, 22 Apr 2016 23:34:16 -0300
Subject: [PATCH 144/712] cegui: init at 0.8.4

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

diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix
new file mode 100644
index 00000000000..c7d7aa4d67a
--- /dev/null
+++ b/pkgs/development/libraries/cegui/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, cmake, ogre, freetype, boost, expat }:
+
+stdenv.mkDerivation rec {
+  name = "cegui-${version}";
+  version = "0.8.4";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/crayzedsgui/${name}.tar.bz2";
+    sha256 = "1253aywv610rbs96hwqiw2z7xrrv24l3jhfsqj95w143idabvz5m";
+  };
+
+
+  buildInputs = [ cmake ogre freetype boost expat ];
+
+  meta = with stdenv.lib; {
+    homepage = http://cegui.org.uk/;
+    description = "C++ Library for creating GUIs";
+    license = licenses.mit;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 449a17137ae..abeb980a532 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6492,6 +6492,8 @@ in
   celt_0_7 = callPackage ../development/libraries/celt/0.7.nix {};
   celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix {};
 
+  cegui = callPackage ../development/libraries/cegui {};
+
   cgal = callPackage ../development/libraries/CGAL {};
 
   cgui = callPackage ../development/libraries/cgui {};

From a49ffbb196441b53907c4da5953e68e3f50adca9 Mon Sep 17 00:00:00 2001
From: Tadas Barzdzius <tadas@barzdzius.lt>
Date: Sat, 23 Apr 2016 23:08:02 +0300
Subject: [PATCH 145/712] cargo: add libiconv to buildInputs to fix darwin
 build

---
 pkgs/development/tools/build-managers/cargo/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
index c3e782a12ea..2d7cdc36504 100644
--- a/pkgs/development/tools/build-managers/cargo/default.nix
+++ b/pkgs/development/tools/build-managers/cargo/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, cacert, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
-, cmake, zlib, makeWrapper }:
+{ stdenv, lib, cacert, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
+, cmake, zlib, makeWrapper
+# Darwin dependencies
+, libiconv }:
 
 with rustPlatform;
 
@@ -20,7 +22,8 @@ buildRustPackage rec {
 
   depsSha256 = "1x2m7ww2z8nl5ic2nds85p7ma8x0zp654jg7ay905ia95daiabzg";
 
-  buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ];
+  buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ]
+    ++ lib.optional stdenv.isDarwin libiconv;
 
   configurePhase = ''
     ./configure --enable-optimize --prefix=$out --local-cargo=${cargo}/bin/cargo

From 0fc911f029387701c775607cc13b0ccf5b15dc91 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 23 Apr 2016 11:55:39 +0200
Subject: [PATCH 146/712] perl-File-ReadBackwards: init at 1.05

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index da58b1c4cf8..ee389880ea9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5124,6 +5124,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  FileReadBackwards = buildPerlPackage rec {
+    name = "File-ReadBackwards-1.05";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/U/UR/URI/${name}.tar.gz";
+      sha256 = "82b261af87507cc3e7e66899c457104ebc8d1c09fb85c53f67c1f90f70f18d6e";
+    };
+    meta = {
+      description = "Read a file backwards by lines";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
   FileRemove = buildPerlPackage rec {
     name = "File-Remove-1.52";
     src = fetchurl {

From 30f1bc1a6496693e866f06cfe72fd3a9980691a5 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 23 Apr 2016 12:36:09 +0200
Subject: [PATCH 147/712] perl-Test-Fatal: 0.013 -> 0.014

---
 pkgs/top-level/perl-packages.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ee389880ea9..ffcc0496118 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11852,17 +11852,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  TestFatal = buildPerlPackage {
-    name = "Test-Fatal-0.013";
+  TestFatal = buildPerlPackage rec {
+    name = "Test-Fatal-0.014";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.013.tar.gz;
-      sha256 = "1rrndzkjff3bdlzzdsfsd3fhng142la2m74ihkgv17islkp17yq2";
+      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
+      sha256 = "bcdcef5c7b2790a187ebca810b0a08221a63256062cfab3c3b98685d91d1cbb0";
     };
     propagatedBuildInputs = [ TryTiny ];
     meta = {
-      homepage = https://github.com/rjbs/test-fatal;
+      homepage = https://github.com/rjbs/Test-Fatal;
       description = "Incredibly simple helpers for testing code with exceptions";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 

From 367b5d7710fbc5e6e8125b974c000d9a44f175a8 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 23 Apr 2016 12:37:20 +0200
Subject: [PATCH 148/712] perl-Pod-LaTeX: fix build and license fields

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ffcc0496118..0d76a3c07b4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10076,17 +10076,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  PodLaTeX = buildPerlModule {
+  PodLaTeX = buildPerlModule rec {
     name = "Pod-LaTeX-0.61";
     src = fetchurl {
-      url = mirror://cpan/authors/id/T/TJ/TJENNESS/Pod-LaTeX-0.61.tar.gz;
+      url = "mirror://cpan/authors/id/T/TJ/TJENNESS/${name}.tar.gz";
       sha256 = "15a840ea1c8a76cd3c865fbbf2fec33b03615c0daa50f9c800c54e0cf0659d46";
     };
-    propagatedBuildInputs = [ if_ ];
+    buildInputs = [ ModuleBuild ];
+    propagatedBuildInputs = [ self."if" ];
     meta = {
       homepage = http://github.com/timj/perl-Pod-LaTeX/tree/master;
       description = "Convert Pod data to formatted Latex";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
 

From 8693a51c7d33f457d8bb2fd95fcef4a4ad2d0d85 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 23 Apr 2016 12:38:07 +0200
Subject: [PATCH 149/712] perl-Pod-POM: init at 2.01

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0d76a3c07b4..ba776785489 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10076,6 +10076,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  PodPOM = buildPerlPackage rec {
+    name = "Pod-POM-2.01";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz";
+      sha256 = "1b50fba9bbdde3ead192beeba0eaddd0c614e3afb1743fa6fff805f57c56f7f4";
+    };
+    buildInputs = [ FileSlurper TestDifferences TextDiff ];
+    meta = {
+      homepage = https://github.com/neilb/Pod-POM;
+      description = "POD Object Model";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
   PodLaTeX = buildPerlModule rec {
     name = "Pod-LaTeX-0.61";
     src = fetchurl {

From 9ff7ad81d800447a9c42ec919cb6824dffa82078 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 23 Apr 2016 12:39:13 +0200
Subject: [PATCH 150/712] perl-Pod-POM-View-TOC: init at 0.02

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ba776785489..85ca89926b2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10091,6 +10091,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  PodPOMViewTOC = buildPerlPackage rec {
+    name = "Pod-POM-View-TOC-0.02";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PE/PERLER/${name}.tar.gz";
+      sha256 = "ccb42272c7503379cb1131394620ee50276d72844e0e80eb4b007a9d58f87623";
+    };
+    buildInputs = [ TestMore ];
+    propagatedBuildInputs = [ PodPOM ];
+    meta = {
+      description = "Generate the TOC of a POD with Pod::POM";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
   PodLaTeX = buildPerlModule rec {
     name = "Pod-LaTeX-0.61";
     src = fetchurl {

From 93972de2e7500677c2316813462b9ca951943fa0 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 23 Apr 2016 12:42:03 +0200
Subject: [PATCH 151/712] perl-MIME-Lite: init at 3.030

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 85ca89926b2..013a131da3a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7565,6 +7565,20 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ ProcWaitStat ];
   };
 
+  MIMELite = buildPerlPackage rec {
+    name = "MIME-Lite-3.030";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
+      sha256 = "8f39901bc580bc3dce69e10415305e4435ff90264c63d29f707b4566460be962";
+    };
+    propagatedBuildInputs = [ EmailDateFormat MailTools MIMETypes ];
+    meta = {
+      description = "Low-calorie MIME generator (DEPRECATED)";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
   MIMEtools = buildPerlPackage {
     name = "MIME-tools-5.507";
     src = fetchurl {

From 2d3ffdc33921307ee2cc08df49de2c827c371c6e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 23 Apr 2016 12:48:10 +0200
Subject: [PATCH 152/712] perl-MailTools: 2.13 -> 2.14

Also add meta section.
---
 pkgs/top-level/perl-packages.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 013a131da3a..7857f130bce 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7325,13 +7325,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  MailTools = buildPerlPackage {
-    name = "MailTools-2.13";
+  MailTools = buildPerlPackage rec {
+    name = "MailTools-2.14";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.13.tar.gz;
-      sha256 = "1djjl05ndn8dmwri4vw5wfky5sqy7sf63qaijvhf9g5yh53405kj";
+      url = "mirror://cpan/authors/id/M/MA/MARKOV/${name}.tar.gz";
+      sha256 = "1y6zndb4rsn8i65g1bg3b0zb7966cz83q19zg7m7bvxjfkv7wz2b";
+    };
+    propagatedBuildInputs = [ TimeDate ];
+    meta = {
+      description = "Various e-mail related modules";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
-    propagatedBuildInputs = [TimeDate TestPod];
   };
 
   MathLibm = buildPerlPackage rec {

From 8410664baa148a99603e4c4663cb4fff76971808 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 23 Apr 2016 12:49:23 +0200
Subject: [PATCH 153/712] perl-Catalyst-Controller-POD: init at 1.0.0

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7857f130bce..07ca0677aa3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -973,6 +973,22 @@ let self = _self // overrides; _self = with self; {
       namespaceautoclean ];
   };
 
+  CatalystControllerPOD = buildPerlPackage rec {
+    name = "Catalyst-Controller-POD-1.0.0";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PE/PERLER/${name}.tar.gz";
+      sha256 = "ee2a4bb3ed78baa1464335408f284345b6ba0ef6576ad7bfbd7b656c788a39f9";
+    };
+    buildInputs = [ CatalystRuntime ModuleBuild ModuleInstall TestWWWMechanizeCatalyst ];
+    propagatedBuildInputs = [ CatalystPluginStaticSimple CatalystRuntime ClassAccessor FileShareDir FileSlurp JSONXS LWP ListMoreUtils PathClass PodPOM PodPOMViewTOC TestWWWMechanizeCatalyst XMLSimple ];
+    meta = {
+      homepage = http://search.cpan.org/dist/Catalyst-Controller-POD/;
+      description = "Serves PODs right from your Catalyst application";
+      license = stdenv.lib.licenses.bsd3;
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
   CatalystDevel = buildPerlPackage {
     name = "Catalyst-Devel-1.39";
     src = fetchurl {

From 5895b38c2998f8830e166cad6aefbb18c61cc12c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 23 Apr 2016 13:12:16 +0200
Subject: [PATCH 154/712] perl-Guard: 1.022 -> 1.023

Fixes build with Perl 5.22.
---
 pkgs/top-level/perl-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 07ca0677aa3..fb7e3189210 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5593,11 +5593,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  Guard = buildPerlPackage {
-    name = "Guard-1.022";
+  Guard = buildPerlPackage rec {
+    name = "Guard-1.023";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/ML/MLEHMANN/Guard-1.022.tar.gz;
-      sha256 = "0saq9949d13mdvpnls7mw1cy74lm4ncl7agbs7n2jl4sy6bvmw9m";
+      url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz";
+      sha256 = "34c4ddf91fc93d1090d86da14df706d175b1610c67372c01e12ce9555d4dd1dc";
     };
     meta = {
       maintainers = with maintainers; [ ocharles ];

From 46e5412cfd92aea1a6eaeef84e49b8680d583513 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 23 Apr 2016 19:16:20 +0200
Subject: [PATCH 155/712] perl-Exception-Base: 0.25 -> 0.2501

Fixes build under Perl 5.22.
---
 pkgs/top-level/perl-packages.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index fb7e3189210..6517879cb40 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4516,16 +4516,17 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  ExceptionBase = buildPerlPackage {
-    name = "Exception-Base-0.25";
+  ExceptionBase = buildPerlPackage rec {
+    name = "Exception-Base-0.2501";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Base-0.25.tar.gz;
-      sha256 = "1s2is862xba2yy633wn2nklrya36yrlwxlbpqjrv8m31xj2c8khw";
+      url = "mirror://cpan/authors/id/D/DE/DEXTER/${name}.tar.gz";
+      sha256 = "5723dd78f4ac0b4d262a05ea46af663ea00d8096b2e9c0a43515c210760e1e75";
     };
     buildInputs = [ TestUnitLite ];
     meta = {
+      description = "Lightweight exceptions";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
-      platforms   = stdenv.lib.platforms.unix;
     };
   };
 

From 71b935c33978ceda7b761c0d798f373407f7a4d1 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Fri, 22 Apr 2016 22:58:51 -0300
Subject: [PATCH 156/712] opendungeons: init at 0.6.0

---
 pkgs/games/opendungeons/cmakepaths.patch | 17 +++++++++++++++++
 pkgs/games/opendungeons/default.nix      | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 3 files changed, 41 insertions(+)
 create mode 100644 pkgs/games/opendungeons/cmakepaths.patch
 create mode 100644 pkgs/games/opendungeons/default.nix

diff --git a/pkgs/games/opendungeons/cmakepaths.patch b/pkgs/games/opendungeons/cmakepaths.patch
new file mode 100644
index 00000000000..bcffd7a22bc
--- /dev/null
+++ b/pkgs/games/opendungeons/cmakepaths.patch
@@ -0,0 +1,17 @@
+--- ../CMakeLists.txt	
++++ ../CMakeLists.txt	
+@@ -31,12 +31,12 @@
+     set(OD_PLUGINS_CFG_PATH ".")
+ else()
+     # Set binary and data install locations if we want to use the installer
+-    set(OD_BIN_PATH ${CMAKE_INSTALL_PREFIX}/games CACHE PATH "Absolute path to the game binary directory")
++    set(OD_BIN_PATH ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "Absolute path to the game binary directory")
+     set(OD_DATA_PATH ${CMAKE_INSTALL_PREFIX}/share/games/${PROJECT_NAME} CACHE PATH "Absolute path to the game data directory")
+     set(OD_SHARE_PATH ${CMAKE_INSTALL_PREFIX}/share CACHE PATH "Absolute path to the shared data directory (desktop file, icons, etc.)")
+     # Set the plugins.cfg file path to a common but architecture-dependent location.
+     # Because the plugins.cfg Ogre plugins path path may vary depending on the architecture used.
+-    set(OD_PLUGINS_CFG_PATH /etc/${PROJECT_NAME} CACHE PATH "Absolute path to the Ogre plugins.cfg file")
++    set(OD_PLUGINS_CFG_PATH ${CMAKE_INSTALL_PREFIX}/etc/${PROJECT_NAME} CACHE PATH "Absolute path to the Ogre plugins.cfg file")
+ endif()
+ 
+ if(NOT MSVC)
diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix
new file mode 100644
index 00000000000..fe3a381c7f5
--- /dev/null
+++ b/pkgs/games/opendungeons/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, ogre, cegui, boost, sfml, openal, cmake, ois }:
+
+stdenv.mkDerivation rec {
+  name = "opendungeons-${version}";
+  version = "0.6.0";
+
+  src = fetchurl {
+    url = "ftp://download.tuxfamily.org/opendungeons/${version}/${name}.tar.xz";
+    sha256 = "1g0sjh732794h26cbkr0p96i3c0avm0mx9ip5zbvb2y3sbpjcbib";
+  };
+
+  patches = [ ./cmakepaths.patch ];
+
+  buildInputs = [ cmake ogre cegui boost sfml openal ois ];
+
+  meta = with stdenv.lib; {
+    description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius.";
+    homepage = "https://opendungeons.github.io";
+    license = [ licenses.gpl3Plus licenses.zlib licenses.mit licenses.cc-by-sa-30 licenses.cc0 licenses.ofl licenses.cc-by-30 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index abeb980a532..fcfba76dbf7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14904,6 +14904,8 @@ in
 
   openarena = callPackage ../games/openarena { };
 
+  opendungeons = callPackage ../games/opendungeons { };
+
   openlierox = callPackage ../games/openlierox { };
 
   openmw = callPackage ../games/openmw { };

From cf445932263b1c6f6131c83f1c19b281717ee308 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 23 Apr 2016 22:49:18 +0200
Subject: [PATCH 157/712] perl-PDF-API2: init at 2.027

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6517879cb40..62ebb60c539 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9608,6 +9608,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  PDFAPI2 = buildPerlPackage rec {
+    name = "PDF-API2-2.027";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SS/SSIMMS/${name}.tar.gz";
+      sha256 = "d24db02d902198406270551857830633b289ad39f5a9ba5431246f8cd60e7599";
+    };
+    propagatedBuildInputs = [ FontTTF ];
+    meta = {
+      description = "Facilitates the creation and modification of PDF files";
+      license = stdenv.lib.licenses.lgpl21;
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
   Pegex = buildPerlPackage rec {
     name = "Pegex-0.60";
     src = fetchurl {

From c397348538fc7874daa361711002958e84b66499 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sat, 23 Apr 2016 22:52:34 +0200
Subject: [PATCH 158/712] vdirsyncer: 0.9.3 -> 0.10.0

lxml is not needed anymore. I added myself to the maintainers. I didn't
check why pypi is providing this complicated URL now.
---
 pkgs/tools/misc/vdirsyncer/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index fedfaa48aa3..0cf7f92912e 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -3,18 +3,17 @@
 # Packaging documentation at:
 # https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst
 pythonPackages.buildPythonApplication rec {
-  version = "0.9.3";
+  version = "0.10.0";
   name = "vdirsyncer-${version}";
   namePrefix = "";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/v/vdirsyncer/${name}.tar.gz";
-    sha256 = "1wjhzjfcvwz68j6wc5cmjsw69ggwcpfy7jp7z7q6fnwwp4dr98lc";
+    url = "https://pypi.python.org/packages/0b/fb/c42223e1e9169e4770194e62143d431755724b080d8cb77f14705b634815/vdirsyncer-0.10.0.tar.gz";
+    sha256 = "1gf86sbd6w0w4zayh9r3irlp5jwrzbjikjc0vs5zkdpa5c199f78";
   };
 
   propagatedBuildInputs = with pythonPackages; [
     click click-log click-threading
-    lxml
     requests_toolbelt
     requests2
     atomicwrites
@@ -31,7 +30,7 @@ pythonPackages.buildPythonApplication rec {
   meta = with stdenv.lib; {
     homepage = https://github.com/pimutils/vdirsyncer;
     description = "Synchronize calendars and contacts";
-    maintainers = with maintainers; [ matthiasbeyer jgeerds ];
+    maintainers = with maintainers; [ matthiasbeyer jgeerds DamienCassou ];
     platforms = platforms.all;
     license = licenses.mit;
   };

From 3b7aee2e5a87b256aaff903a33106d974a25dbef Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 8 Apr 2016 12:49:37 +0200
Subject: [PATCH 159/712] beancount: init at
 2016-04-10-b5721f1c6f01bd168a5781652e5e3167f7f8ceb3

---
 .../applications/office/beancount/default.nix | 43 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/applications/office/beancount/default.nix

diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix
new file mode 100644
index 00000000000..8811183dfc8
--- /dev/null
+++ b/pkgs/applications/office/beancount/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchhg, pkgs, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+  version = "2016-04-10-b5721f1c6f01bd168a5781652e5e3167f7f8ceb3";
+  name = "beancount-${version}";
+  namePrefix = "";
+
+  src = fetchhg {
+    url = "https://bitbucket.org/blais/beancount";
+    rev = "b5721f1c6f01bd168a5781652e5e3167f7f8ceb3";
+    sha256 = "10nv3p9cix7yp23a9hnq5163rpl8cfs3hv75h90ld57dc24nxzn2";
+  };
+
+  buildInputs = with pythonPackages; [ nose ];
+
+  checkPhase = ''
+    nosetests $out
+  '';
+
+  propagatedBuildInputs = with pythonPackages; [
+    beautifulsoup4
+    bottle
+    chardet
+    dateutil
+    google_api_python_client
+    lxml
+    ply
+    python_magic
+  ];
+
+  meta = {
+    homepage = http://furius.ca/beancount/;
+    description = "double-entry bookkeeping computer language";
+    longDescription = ''
+        A double-entry bookkeeping computer language that lets you define
+        financial transaction records in a text file, read them in memory,
+        generate a variety of reports from them, and provides a web interface.
+    '';
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 621ed6a5145..9ebd6d6960f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14697,6 +14697,10 @@ in
 
   bastet = callPackage ../games/bastet {};
 
+  beancount = callPackage ../applications/office/beancount {
+      pythonPackages = python3Packages;
+  };
+
   beret = callPackage ../games/beret { };
 
   bitsnbots = callPackage ../games/bitsnbots {

From 8dbcb4e35ecc2513dab1ed8cb6052f68ab0a6537 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Mon, 28 Mar 2016 14:14:13 -0700
Subject: [PATCH 160/712] beamPackages: Add support for Mix and Erlang.mk

---
 .../beam-modules/build-erlang-mk.nix          |    86 +
 .../build-hex.nix                             |     0
 pkgs/development/beam-modules/build-mix.nix   |    86 +
 .../build-rebar3.nix                          |     9 +-
 pkgs/development/beam-modules/default.nix     |    17 +
 .../rebar3 => beam-modules}/fetch-hex.nix     |     0
 .../development/beam-modules/hex-packages.nix | 43524 ++++++++++++++++
 .../beam-modules/hex-registry-snapshot.nix    |    23 +
 pkgs/development/beam-modules/hex/default.nix |    58 +
 pkgs/development/beam-modules/mix-bootstrap   |   112 +
 .../beam-modules/pgsql/default.nix            |    34 +
 .../webdriver/default.nix                     |     0
 pkgs/development/erlang-modules/default.nix   |    14 -
 .../erlang-modules/hex-packages.nix           |  3027 --
 .../tools/build-managers/rebar3/default.nix   |     7 +-
 pkgs/top-level/all-packages.nix               |     9 +-
 16 files changed, 43953 insertions(+), 3053 deletions(-)
 create mode 100644 pkgs/development/beam-modules/build-erlang-mk.nix
 rename pkgs/development/{erlang-modules => beam-modules}/build-hex.nix (100%)
 create mode 100644 pkgs/development/beam-modules/build-mix.nix
 rename pkgs/development/{erlang-modules => beam-modules}/build-rebar3.nix (88%)
 create mode 100644 pkgs/development/beam-modules/default.nix
 rename pkgs/development/{tools/build-managers/rebar3 => beam-modules}/fetch-hex.nix (100%)
 create mode 100644 pkgs/development/beam-modules/hex-packages.nix
 create mode 100644 pkgs/development/beam-modules/hex-registry-snapshot.nix
 create mode 100644 pkgs/development/beam-modules/hex/default.nix
 create mode 100755 pkgs/development/beam-modules/mix-bootstrap
 create mode 100644 pkgs/development/beam-modules/pgsql/default.nix
 rename pkgs/development/{erlang-modules => beam-modules}/webdriver/default.nix (100%)
 delete mode 100644 pkgs/development/erlang-modules/default.nix
 delete mode 100644 pkgs/development/erlang-modules/hex-packages.nix

diff --git a/pkgs/development/beam-modules/build-erlang-mk.nix b/pkgs/development/beam-modules/build-erlang-mk.nix
new file mode 100644
index 00000000000..8c2b72aa43c
--- /dev/null
+++ b/pkgs/development/beam-modules/build-erlang-mk.nix
@@ -0,0 +1,86 @@
+{ stdenv, writeText, erlang, perl, which, gitMinimal, wget }:
+
+{ name, version
+, src
+, setupHook ? null
+, buildInputs ? []
+, beamDeps ? []
+, postPatch ? ""
+, compilePorts ? false
+, installPhase ? null
+, meta ? {}
+, ... }@attrs:
+
+with stdenv.lib;
+
+let
+  shell = drv: stdenv.mkDerivation {
+          name = "interactive-shell-${drv.name}";
+          buildInputs = [ drv ];
+    };
+
+  pkg = self: stdenv.mkDerivation ( attrs // {
+    app_name = "${name}";
+    name = "${name}-${version}";
+    inherit version;
+
+    dontStrip = true;
+
+    inherit src;
+
+    setupHook = if setupHook == null
+    then writeText "setupHook.sh" ''
+       addToSearchPath ERL_LIBS "$1/lib/erlang/lib"
+    ''
+    else setupHook;
+
+    buildInputs = [ erlang perl which gitMinimal wget ];
+    propagatedBuildInputs = beamDeps;
+
+    configurePhase = ''
+      runHook preConfigure
+
+      # We shouldnt need to do this, but it seems at times there is a *.app in
+      # the repo/package. This ensures we start from a clean slate
+      make SKIP_DEPS=1 clean
+
+      runHook postConfigure
+    '';
+
+    buildPhase = ''
+        runHook preBuild
+
+        make SKIP_DEPS=1
+
+        runHook postBuild
+    '';
+
+    installPhase = ''
+        runHook preInstall
+
+        mkdir -p $out/lib/erlang/lib/${name}
+        cp -r ebin $out/lib/erlang/lib/${name}/
+        cp -r src $out/lib/erlang/lib/${name}/
+
+        if [ -d include ]; then
+          cp -r include $out/lib/erlang/lib/${name}/
+        fi
+
+        if [ -d priv ]; then
+          cp -r priv $out/lib/erlang/lib/${name}/
+        fi
+
+        if [ -d doc ]; then
+          cp -r doc $out/lib/erlang/lib/${name}/
+        fi
+
+        runHook postInstall
+    '';
+
+    passthru = {
+      packageName = name;
+      env = shell self;
+      inherit beamDeps;
+    };
+});
+in fix pkg
diff --git a/pkgs/development/erlang-modules/build-hex.nix b/pkgs/development/beam-modules/build-hex.nix
similarity index 100%
rename from pkgs/development/erlang-modules/build-hex.nix
rename to pkgs/development/beam-modules/build-hex.nix
diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix
new file mode 100644
index 00000000000..12efc00b050
--- /dev/null
+++ b/pkgs/development/beam-modules/build-mix.nix
@@ -0,0 +1,86 @@
+{ stdenv, writeText, elixir, erlang, hexRegistrySnapshot, hex }:
+
+{ name
+, version
+, src
+, setupHook ? null
+, buildInputs ? []
+, beamDeps ? []
+, postPatch ? ""
+, compilePorts ? false
+, installPhase ? null
+, meta ? {}
+, ... }@attrs:
+
+with stdenv.lib;
+
+let
+  shell = drv: stdenv.mkDerivation {
+          name = "interactive-shell-${drv.name}";
+          buildInputs = [ drv ];
+    };
+
+  bootstrapper = ./mix-bootstrap;
+
+  pkg = self: stdenv.mkDerivation ( attrs // {
+    name = "${name}-${version}";
+    inherit version;
+
+    dontStrip = true;
+
+    inherit src;
+
+    setupHook = if setupHook == null
+    then writeText "setupHook.sh" ''
+       addToSearchPath ERL_LIBS "$1/lib/erlang/lib"
+    ''
+    else setupHook;
+
+    inherit buildInputs;
+    propagatedBuildInputs = [ hexRegistrySnapshot hex elixir ] ++ beamDeps;
+
+    configurePhase = ''
+      runHook preConfigure
+      ${erlang}/bin/escript ${bootstrapper}
+      runHook postConfigure
+    '';
+
+    buildPhase = ''
+        runHook preBuild
+
+        export HEX_OFFLINE=1
+        export HEX_HOME=`pwd`
+        export MIX_ENV=prod
+
+        MIX_ENV=prod mix compile --debug-info --no-deps-check
+
+        runHook postBuild
+    '';
+
+    installPhase = ''
+        runHook preInstall
+
+        MIXENV=prod
+
+        if [ -d "_build/shared" ]; then
+          MIXENV=shared
+        fi
+
+        mkdir -p "$out/lib/erlang/lib/${name}-${version}"
+        for reldir in src ebin priv include; do
+          fd="_build/$MIXENV/lib/${name}/$reldir"
+          [ -d "$fd" ] || continue
+          cp -Hrt "$out/lib/erlang/lib/${name}-${version}" "$fd"
+          success=1
+        done
+
+        runHook postInstall
+    '';
+
+    passthru = {
+      packageName = name;
+      env = shell self;
+      inherit beamDeps;
+    };
+});
+in fix pkg
diff --git a/pkgs/development/erlang-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix
similarity index 88%
rename from pkgs/development/erlang-modules/build-rebar3.nix
rename to pkgs/development/beam-modules/build-rebar3.nix
index 8033d6c838e..2627ddf99a6 100644
--- a/pkgs/development/erlang-modules/build-rebar3.nix
+++ b/pkgs/development/beam-modules/build-rebar3.nix
@@ -1,10 +1,10 @@
-{ stdenv, writeText, erlang, rebar3, openssl, libyaml, fetchHex, fetchFromGitHub,
+{ stdenv, writeText, erlang, rebar3, openssl, libyaml,
   pc, buildEnv }:
 
 { name, version
 , src
 , setupHook ? null
-, buildInputs ? [], erlangDeps ? [], buildPlugins ? []
+, buildInputs ? [], beamDeps ? [], buildPlugins ? []
 , postPatch ? ""
 , compilePorts ? false
 , installPhase ? null
@@ -27,8 +27,9 @@ let
     inherit version;
 
     buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ];
-    propagatedBuildInputs = unique (erlangDeps ++ ownPlugins);
+    propagatedBuildInputs = unique (beamDeps ++ ownPlugins);
 
+    dontStrip = true;
     # The following are used by rebar3-nix-bootstrap
     inherit compilePorts;
     buildPlugins = ownPlugins;
@@ -81,7 +82,7 @@ let
     passthru = {
       packageName = name;
       env = shell self;
-      inherit erlangDeps;
+      inherit beamDeps;
     };
   });
 in
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
new file mode 100644
index 00000000000..03bab8c4aa9
--- /dev/null
+++ b/pkgs/development/beam-modules/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, pkgs }: #? import <nixpkgs> {} }:
+
+let
+  self = rec {
+    hexPackages = import ./hex-packages.nix { stdenv = stdenv; callPackage = self.callPackage; };
+    callPackage = pkgs.lib.callPackageWith (pkgs // self // hexPackages);
+    buildRebar3 = callPackage ./build-rebar3.nix {};
+    buildHex = callPackage ./build-hex.nix {};
+    buildErlangMk = callPackage ./build-erlang-mk.nix {};
+    buildMix = callPackage ./build-mix.nix {};
+
+    ## Non hex packages
+    hex = callPackage ./hex {};
+    webdriver = callPackage ./webdriver {};
+    elli = callPackage ./elli {};
+  };
+in self // self.hexPackages
diff --git a/pkgs/development/tools/build-managers/rebar3/fetch-hex.nix b/pkgs/development/beam-modules/fetch-hex.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/rebar3/fetch-hex.nix
rename to pkgs/development/beam-modules/fetch-hex.nix
diff --git a/pkgs/development/beam-modules/hex-packages.nix b/pkgs/development/beam-modules/hex-packages.nix
new file mode 100644
index 00000000000..d7b635176a8
--- /dev/null
+++ b/pkgs/development/beam-modules/hex-packages.nix
@@ -0,0 +1,43524 @@
+/* hex-packages.nix is an auto-generated file -- DO NOT EDIT! */
+
+/* Unbuildable packages:
+
+
+*/
+{ stdenv, callPackage, overrides ? (self: super: {}) }:
+
+let
+  packages = self: rec {
+    abnf_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "abnf";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "abnf";
+              version = "0.0.1";
+              sha256 =
+                "81e263f061ba677bda3e0d7f8884730eb51c14d7bc6526647c46cce659f1b054";
+            };
+
+            meta = {
+              description = ''ABNF parser for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/vanstee/abnf";
+            };
+          }
+      ) {};
+
+    abnf = abnf_0_0_1;
+
+    absinthe_0_5_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "absinthe";
+            version = "0.5.2";
+            src = fetchHex {
+              pkg = "absinthe";
+              version = "0.5.2";
+              sha256 =
+                "2b926ae2b61e0227caf437419d017bb146a9073a67e4e5fa5ed754f3b30994f6";
+            };
+
+            meta = {
+              description = ''GraphQL for Elixir'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/CargoSense/absinthe";
+            };
+          }
+      ) {};
+
+    absinthe = absinthe_0_5_2;
+
+    absinthe_plug_0_5_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, absinthe_0_5_2 }:
+          buildMix {
+            name = "absinthe_plug";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "absinthe_plug";
+              version = "0.5.0";
+              sha256 =
+                "eaa22a2af708ee3c37217ad5fcf31210347bb7c0807f7c96cffb09b311326291";
+            };
+            beamDeps  = [ plug_1_1_1 absinthe_0_5_2 ];
+
+            meta = {
+              description = ''A plug for Absinthe, an experimental GraphQL
+                            toolkit'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/CargoSense/absinthe_plug";
+            };
+          }
+      ) {};
+
+    absinthe_plug = absinthe_plug_0_5_0;
+
+    access_token_extractor_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "access_token_extractor";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "access_token_extractor";
+              version = "0.1.1";
+              sha256 =
+                "40f76799f8fbb5b03230b31d4d55c5a169e7c3ad82d776a9d87fe0c65c85396d";
+            };
+            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+
+            meta = {
+              longDescription = ''Simple Plug to extract access_token from
+                                request and add it to private map in Plug.Conn
+                                struct.'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/rohanpujaris/access_token_extractor";
+            };
+          }
+      ) {};
+
+    access_token_extractor = access_token_extractor_0_1_1;
+
+    active_0_9_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "active";
+            version = "0.9.0";
+            src = fetchHex {
+              pkg = "active";
+              version = "0.9.0";
+              sha256 =
+                "3ec6a0eda29137866674ddd56d44f6b0383fa3ec4480121639d2ef61b443ec28";
+            };
+
+            meta = {
+              description = ''Erlang active reloader'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/synrc/active";
+            };
+          }
+      ) {};
+
+    active = active_0_9_0;
+
+    adam7_0_4_0 = callPackage
+      (
+        {  buildMix, fetchHex, apex_0_3_7 }:
+          buildMix {
+            name = "adam7";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "adam7";
+              version = "0.4.0";
+              sha256 =
+                "8b540817f2fa92ba4b198d42d1ee4af348ed1edf8bd02d69691e0d8bdbecdcee";
+            };
+            beamDeps  = [ apex_0_3_7 ];
+
+            meta = {
+              longDescription = ''Adam7 interlacing library for Elixir.
+                                Primarily used for interlacing and
+                                de-interlacing image data for PNGs.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/SenecaSystems/imagineer";
+            };
+          }
+      ) {};
+
+    adam7 = adam7_0_4_0;
+
+    adap_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "adap";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "adap";
+              version = "0.0.1";
+              sha256 =
+                "10679369764e2aa68560008c1f8bea40d5c715389e27e10b35b1ceda3fedadbb";
+            };
+
+            meta = {
+              longDescription = '' Create a data stream across your information
+                                systems to query, augment and transform data
+                                according to Elixir matching rules. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "http://github.com/awetzel/adap";
+            };
+          }
+      ) {};
+
+    adap = adap_0_0_1;
+
+    addict_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          phoenix_1_1_4,
+          mailgun_0_0_2,
+          ecto_0_16_0,
+          cowboy_1_0_4,
+          comeonin_1_6_0
+        }:
+          buildMix {
+            name = "addict";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "addict";
+              version = "0.1.0";
+              sha256 =
+                "8d8ca253ee73bae88c1eb756992fe4435aa4e7b58eddcd102097b13dc4af611a";
+            };
+            beamDeps  = [
+                          phoenix_1_1_4
+                          mailgun_0_0_2
+                          ecto_0_16_0
+                          cowboy_1_0_4
+                          comeonin_1_6_0
+                        ];
+
+            meta = {
+              longDescription = ''Addict allows you to manage users on your
+                                Phoenix app easily. Register, login, logout,
+                                recover password and password updating is
+                                available off-the-shelf.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/trenpixster/addict";
+            };
+          }
+      ) {};
+
+    addict = addict_0_1_0;
+
+    address_us_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "address_us";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "address_us";
+              version = "0.1.1";
+              sha256 =
+                "e29c6dd33d2a2ebd97441bfdac3eb23fa6221cf5d3be8b8c66247ee61ce442c6";
+            };
+
+            meta = {
+              description = ''Library for parsing US Addresses into their
+                            individual parts.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/smashedtoatoms/address_us";
+            };
+          }
+      ) {};
+
+    address_us = address_us_0_1_1;
+
+    aeacus_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex, comeonin_1_6_0 }:
+          buildMix {
+            name = "aeacus";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "aeacus";
+              version = "0.3.0";
+              sha256 =
+                "3cc138cfc7c508cfd85afddd0881632dde2e663d222c9e3749fae8c80ebb2c0b";
+            };
+            beamDeps  = [ comeonin_1_6_0 ];
+
+            meta = {
+              longDescription = ''A simple, secure, and highly configurable
+                                Elixir identity [username | email | id |
+                                etc.]/password authentication module; Compatible
+                                with Ecto.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/zmoshansky/aeacus";
+            };
+          }
+      ) {};
+
+    aeacus = aeacus_0_3_0;
+
+    airbrake_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "airbrake";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "airbrake";
+              version = "0.1.0";
+              sha256 =
+                "45d3e2da7f5a8793b9fd7752cbeaa988a848396f44b77d0265f3bed36182d901";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''An Elixir notifier to the Airbrake'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/romul/airbrake-elixir";
+            };
+          }
+      ) {};
+
+    airbrake = airbrake_0_1_0;
+
+    airbrake_plug_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, airbrake_0_1_0 }:
+          buildMix {
+            name = "airbrake_plug";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "airbrake_plug";
+              version = "0.1.1";
+              sha256 =
+                "2560f8b830e94b09788952165cd3053b47106d4afebf547dc370d7f307e804b9";
+            };
+            beamDeps  = [ airbrake_0_1_0 ];
+
+            meta = {
+              description = ''Airbrake reporter for Elixir`s Plug'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/romul/airbrake_plug";
+            };
+          }
+      ) {};
+
+    airbrake_plug = airbrake_plug_0_1_1;
+
+    airbrakex_0_0_6 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_1 }:
+          buildMix {
+            name = "airbrakex";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "airbrakex";
+              version = "0.0.6";
+              sha256 =
+                "a8efc0a9a641a6c5ada2585ee5889291b74ded10977af7b1a4ac6bc445d166e8";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Airbrake Elixir Notifier'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/fazibear/airbrakex";
+            };
+          }
+      ) {};
+
+    airbrakex = airbrakex_0_0_6;
+
+    alambic_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "alambic";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "alambic";
+              version = "0.1.0";
+              sha256 =
+                "04dc4cc88d56539ec4006a84668186501be9be4c369f145af6a606bb63d97ce0";
+            };
+
+            meta = {
+              longDescription = ''A collection of small elixir utilities.
+                                Semaphore: quick way of limiting access to a
+                                resource CountDown: quick way of counting fan
+                                in/out events'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/sdanzan/alambic";
+            };
+          }
+      ) {};
+
+    alambic = alambic_0_1_0;
+
+    alchemy_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, uuid_1_1_3 }:
+          buildMix {
+            name = "alchemy";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "alchemy";
+              version = "0.0.1";
+              sha256 =
+                "109ce3f83d596a6ab9a947f472516f87da7b0df823fe2d91e27bc6594a305c3d";
+            };
+            beamDeps  = [ uuid_1_1_3 ];
+
+            meta = {
+              description = ''Perform experiments in production'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/keathley/alchemy";
+            };
+          }
+      ) {};
+
+    alchemy = alchemy_0_0_1;
+
+    aleppo_0_9_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "aleppo";
+            version = "0.9.0";
+            src = fetchHex {
+              pkg = "aleppo";
+              version = "0.9.0";
+              sha256 =
+                "2f360631d64da53f40621714e157fd33805a95d0160d5c62fcfb3e132986ce71";
+            };
+
+            meta = {
+              description = ''Aleppo: ALternative Erlang Pre-ProcessOr'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/ErlyORM/aleppo";
+            };
+          }
+      ) {};
+
+    aleppo = aleppo_0_9_0;
+
+    alexa_plug_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1 }:
+          buildMix {
+            name = "alexa_plug";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "alexa_plug";
+              version = "0.2.0";
+              sha256 =
+                "a78f6fa5e3ba33ce0943f4cb96d6cfcc9b36637a4575314469c8a0d45fff40d0";
+            };
+            beamDeps  = [ plug_1_1_1 ];
+
+            meta = {
+              longDescription = ''A simple set of plugs and utilities for
+                                interfacing with the Amazon Echo and the Alexa
+                                Skills Kit.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jordantdavis/alexa_plug";
+            };
+          }
+      ) {};
+
+    alexa_plug = alexa_plug_0_2_0;
+
+    algae_0_9_1 = callPackage
+      (
+        {  buildMix, fetchHex, quark_1_0_2 }:
+          buildMix {
+            name = "algae";
+            version = "0.9.1";
+            src = fetchHex {
+              pkg = "algae";
+              version = "0.9.1";
+              sha256 =
+                "6d0877d508bd16098b4fb6d0549c5070b8217016b61ac8b220d9f35f3fb82391";
+            };
+            beamDeps  = [ quark_1_0_2 ];
+
+            meta = {
+              description = ''Bootstrapped algebraic data types for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/robot-overlord/algae";
+            };
+          }
+      ) {};
+
+    algae = algae_0_9_1;
+
+    alice_0_1_2 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          slack_0_4_2,
+          redix_0_3_4,
+          poolboy_1_5_1,
+          poison_2_0_1
+        }:
+          buildMix {
+            name = "alice";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "alice";
+              version = "0.1.2";
+              sha256 =
+                "badb6a115a8de88bab122b197214881cd64d2aaf48d8004013adbc6a024fb985";
+            };
+            beamDeps  = [ slack_0_4_2 redix_0_3_4 poolboy_1_5_1 poison_2_0_1
+                      ];
+
+            meta = {
+              description = ''A Slack bot'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/adamzaninovich/alice";
+            };
+          }
+      ) {};
+
+    alice = alice_0_1_2;
+
+    alice_against_humanity_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, alice_0_1_2 }:
+          buildMix {
+            name = "alice_against_humanity";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "alice_against_humanity";
+              version = "0.0.1";
+              sha256 =
+                "8c9ddbd7b5db3a18740a354b2e385c7e652e820f4262279dfabee36de93c7816";
+            };
+            beamDeps  = [ alice_0_1_2 ];
+
+            meta = {
+              description = ''A handler for the Alice Slack bot. Play Cards
+                            Against Humanity with Alice.'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/adamzaninovich/alice_against_humanity";
+            };
+          }
+      ) {};
+
+    alice_against_humanity = alice_against_humanity_0_0_1;
+
+    alice_google_images_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, alice_0_1_2 }:
+          buildMix {
+            name = "alice_google_images";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "alice_google_images";
+              version = "0.0.1";
+              sha256 =
+                "ca276e382bde0a996866c7196ae454d3fdc0eb835398e8ece56c24b2c74736cc";
+            };
+            beamDeps  = [ alice_0_1_2 ];
+
+            meta = {
+              description = ''A handler for the Alice Slack bot. Get random
+                            images from Google'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/adamzaninovich/alice_google_images";
+            };
+          }
+      ) {};
+
+    alice_google_images = alice_google_images_0_0_1;
+
+    alice_karma_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, alice_0_1_2 }:
+          buildMix {
+            name = "alice_karma";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "alice_karma";
+              version = "0.0.1";
+              sha256 =
+                "b2c1d8b0b7fe077b2a4bc1f24b01e872e24d4f6c82d50791ef6b3a57fc2af150";
+            };
+            beamDeps  = [ alice_0_1_2 ];
+
+            meta = {
+              longDescription = ''A handler for the Alice Slack bot. Allows
+                                Alice to keep track of karma points for
+                                arbitrary terms.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/adamzaninovich/alice_karma";
+            };
+          }
+      ) {};
+
+    alice_karma = alice_karma_0_0_1;
+
+    alphonse_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, cipher_0_1_0 }:
+          buildMix {
+            name = "alphonse";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "alphonse";
+              version = "0.1.0";
+              sha256 =
+                "01666afde723be7d84fcd2e55741c90fd8bc78a407001677deb0717f685b8d21";
+            };
+            beamDeps  = [ cipher_0_1_0 ];
+
+            meta = {
+              description = ''A module wrapper to encrypt and decrypt files
+                            with aes-128-cbc'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/chrisenytc/alphonse";
+            };
+          }
+      ) {};
+
+    alphonse = alphonse_0_1_0;
+
+    amazon_product_advertising_client_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          timex_1_0_0_rc4,
+          sweet_xml_0_6_1,
+          httpoison_0_8_1
+        }:
+          buildMix {
+            name = "amazon_product_advertising_client";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "amazon_product_advertising_client";
+              version = "0.1.0";
+              sha256 =
+                "b50ac32e0386060de093955662a8152bcb446c81c6fa5315ec0cf94586c69c24";
+            };
+            beamDeps  = [ timex_1_0_0_rc4 sweet_xml_0_6_1 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''An Amazon Product Advertising API client for
+                            Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/zachgarwood/elixir-amazon-product-advertising-client";
+            };
+          }
+      ) {};
+
+    amazon_product_advertising_client =
+      amazon_product_advertising_client_0_1_0;
+
+    amnesia_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex, exquisite_0_1_6 }:
+          buildMix {
+            name = "amnesia";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "amnesia";
+              version = "0.2.1";
+              sha256 =
+                "2d8b0dc6d2da2dcce7339cb2173dc3dad5a2f0865ce770f5f3ded796cd1d6e61";
+            };
+            beamDeps  = [ exquisite_0_1_6 ];
+
+            meta = {
+              description = ''mnesia wrapper for Elixir'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/meh/amnesia";
+            };
+          }
+      ) {};
+
+    amnesia = amnesia_0_2_1;
+
+    amqp_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, amqp_client_3_5_6 }:
+          buildMix {
+            name = "amqp";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "amqp";
+              version = "0.1.1";
+              sha256 =
+                "64cf314b8953cef7c809cce8f21cb8574f1ca29226b007bbaab7ac9079c96912";
+            };
+            beamDeps  = [ amqp_client_3_5_6 ];
+
+            meta = {
+              description = ''Idiomatic Elixir client for RabbitMQ.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pma/amqp";
+            };
+          }
+      ) {};
+
+    amqp_0_1_4 = callPackage
+      (
+        {  buildMix, fetchHex, amqp_client_3_5_6 }:
+          buildMix {
+            name = "amqp";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "amqp";
+              version = "0.1.4";
+              sha256 =
+                "a75d9b9283f306627b1d72a1ae326bb8c2910c5cd8198fa036e575b74b340ef4";
+            };
+            beamDeps  = [ amqp_client_3_5_6 ];
+
+            meta = {
+              description = ''Idiomatic Elixir client for RabbitMQ.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pma/amqp";
+            };
+          }
+      ) {};
+
+    amqp = amqp_0_1_4;
+
+    amqp_client_3_5_6 = callPackage
+      (
+        {  buildRebar3, fetchHex, rabbit_common_3_5_6 }:
+          buildRebar3 {
+            name = "amqp_client";
+            version = "3.5.6";
+            src = fetchHex {
+              pkg = "amqp_client";
+              version = "3.5.6";
+              sha256 =
+                "3dc10a5ba146fd737502d407a1afee0c460b4477d66ca361240985f412a2e9a3";
+            };
+
+            beamDeps  = [ rabbit_common_3_5_6 ];
+
+            meta = {
+              description = ''Erlang RabbitMQ/AMQP client.'';
+              license = stdenv.lib.licenses.mpl11;
+              homepage = "https://github.com/jbrisbin/amqp_client";
+            };
+          }
+      ) {};
+
+    amqp_client = amqp_client_3_5_6;
+
+    amrita_0_4_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "amrita";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "amrita";
+              version = "0.4.0";
+              sha256 =
+                "8d3e642e665f9634aa44463ed6964ccf05e251c81ef92aaa9eacce2e9be959ad";
+            };
+
+            meta = {
+              description = ''A polite, well mannered and thoroughly upstanding
+                            testing framework for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "http://amrita.io";
+            };
+          }
+      ) {};
+
+    amrita = amrita_0_4_0;
+
+    anaphora_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "anaphora";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "anaphora";
+              version = "0.1.1";
+              sha256 =
+                "c43d66532152b05caee2cfca06ae1b86bd297c2e67ca358ecdcdc94da57ade83";
+            };
+
+            meta = {
+              description = ''The anaphoric macro collection for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sviridov/anaphora-elixir";
+            };
+          }
+      ) {};
+
+    anaphora = anaphora_0_1_1;
+
+    anubis_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "anubis";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "anubis";
+              version = "0.1.0";
+              sha256 =
+                "38329609a08261ba50b8ef2cfffa3bc4926b5412f8683a9322e59cf953779aab";
+            };
+
+            meta = {
+              description = '' Anubis is a framework for building command line
+                            applications. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bennyhallett/anubis";
+            };
+          }
+      ) {};
+
+    anubis_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "anubis";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "anubis";
+              version = "0.3.0";
+              sha256 =
+                "556039ca0e045116e3a2f71b15e7d884122e6b7596fede05d022d28412df5ae2";
+            };
+
+            meta = {
+              description = '' Anubis is a framework for building command line
+                            applications. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bennyhallett/anubis";
+            };
+          }
+      ) {};
+
+    anubis = anubis_0_3_0;
+
+    apache_passwd_md5_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "apache_passwd_md5";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "apache_passwd_md5";
+              version = "1.0.0";
+              sha256 =
+                "2ffc49fe46aadcd21248aacb4a9c723c8d8a0304747f8cf8e6089e97404f59f1";
+            };
+
+            meta = {
+              longDescription = ''Provides Apache/APR style password hashing.
+                                Useful for generating or authenticating against
+                                MD5 htpasswd passwords. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/kevinmontuori/Apache.PasswdMD5";
+            };
+          }
+      ) {};
+
+    apache_passwd_md5 = apache_passwd_md5_1_0_0;
+
+    apex_0_3_7 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "apex";
+            version = "0.3.7";
+            src = fetchHex {
+              pkg = "apex";
+              version = "0.3.7";
+              sha256 =
+                "a1c8313e9c909ff2489f004b3514430293b1aafb81569b93a1822d486f56080d";
+            };
+
+            meta = {
+              description = ''Elixir clone of Ruby`s awesome_print gem'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bjro/apex";
+            };
+          }
+      ) {};
+
+    apex = apex_0_3_7;
+
+    apix_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "apix";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "apix";
+              version = "0.1.0";
+              sha256 =
+                "d1d809cf41731e39a6c23e02fb41c9375bf04db35c8ce595c99c03eea694f30e";
+            };
+
+            meta = {
+              longDescription = ''Simple convention and DSL for transformation
+                                of elixir functions to a documented and ready
+                                for validation API.'';
+
+              homepage = "https://github.com/liveforeverx/apix";
+            };
+          }
+      ) {};
+
+    apix = apix_0_1_0;
+
+    apns_0_0_11 = callPackage
+      (
+        {  buildMix, fetchHex, poolboy_1_5_1, poison_1_5_2 }:
+          buildMix {
+            name = "apns";
+            version = "0.0.11";
+            src = fetchHex {
+              pkg = "apns";
+              version = "0.0.11";
+              sha256 =
+                "03258b65f3225f47d3f2c23b087f96b904e9f84b5be242e66c0dbfb54c728011";
+            };
+            beamDeps  = [ poolboy_1_5_1 poison_1_5_2 ];
+
+            meta = {
+              description = ''APNS (Apple Push Notification Service) library
+                            for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/chvanikoff/apns4ex";
+            };
+          }
+      ) {};
+
+    apns = apns_0_0_11;
+
+    apostle_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_4_0, httpoison_0_7_5 }:
+          buildMix {
+            name = "apostle";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "apostle";
+              version = "0.0.3";
+              sha256 =
+                "3bb6b358236bbf730df69fa775f230355235a7e24dae73a9f17e4237c3fdb583";
+            };
+            beamDeps  = [ poison_1_4_0 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''Elixir client for Apostle.io.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jamesotron/apostle-elixir";
+            };
+          }
+      ) {};
+
+    apostle = apostle_0_0_3;
+
+    ar2ecto_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ar2ecto";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "ar2ecto";
+              version = "0.1.2";
+              sha256 =
+                "a32322d39f1c0cff335b05b5c2252e531091565c3cf754811087edd2e115a718";
+            };
+
+            meta = {
+              description = ''Ar2ecto is a set of mix tasks to help you migrate
+                            from ActiveRecord to Ecto.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/aforward/ar2ecto";
+            };
+          }
+      ) {};
+
+    ar2ecto = ar2ecto_0_1_2;
+
+    arc_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1, ex_aws_0_4_17 }:
+          buildMix {
+            name = "arc";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "arc";
+              version = "0.3.0";
+              sha256 =
+                "cc0bb4e31e9b4eccb164959bfc4f438390d5ddaed5762c49761a69d7e2f75e48";
+            };
+            beamDeps  = [ httpoison_0_8_1 ex_aws_0_4_17 ];
+
+            meta = {
+              description = ''Flexible file upload and attachment library for
+                            Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/stavro/arc";
+            };
+          }
+      ) {};
+
+    arc = arc_0_3_0;
+
+    arc_ecto_0_3_2 = callPackage
+      (
+        {  buildMix, fetchHex, ecto_2_0_0_beta_0, arc_0_3_0 }:
+          buildMix {
+            name = "arc_ecto";
+            version = "0.3.2";
+            src = fetchHex {
+              pkg = "arc_ecto";
+              version = "0.3.2";
+              sha256 =
+                "92cb9e81eb75a1a9fdb4f4fc8e83714b9ee67e3ddb96db9d53c46e7002bf7e8d";
+            };
+            beamDeps  = [ ecto_2_0_0_beta_0 arc_0_3_0 ];
+
+            meta = {
+              description = ''An integration with Arc and Ecto.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/stavro/arc_ecto";
+            };
+          }
+      ) {};
+
+    arc_ecto = arc_ecto_0_3_2;
+
+    argent_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "argent";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "argent";
+              version = "0.0.1";
+              sha256 =
+                "dde0920308efca2c8dd9681057e5196f625b53ed8dff86a27242807c3653d645";
+            };
+
+            meta = {
+              description = ''A currency management library for elixir.'';
+
+            };
+          }
+      ) {};
+
+    argent = argent_0_0_1;
+
+    argument_parser_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "argument_parser";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "argument_parser";
+              version = "0.1.1";
+              sha256 =
+                "beebcf7216bce18d953a832209ec0e9a3b669f108bf49c09f964060f0a10cb85";
+            };
+
+            meta = {
+              description = ''More powerful argument parser for creating nice
+                            scripts'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/jisaacstone/ex_argument_parser";
+            };
+          }
+      ) {};
+
+    argument_parser = argument_parser_0_1_1;
+
+    array_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "array";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "array";
+              version = "1.0.1";
+              sha256 =
+                "626ac1383566dadee3a10357cd6d192151c6d604ee3266809daf0da6b5e33bbb";
+            };
+
+            meta = {
+              description = ''An elixir wrapper library for Erlang`s array.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/takscape/elixir-array";
+            };
+          }
+      ) {};
+
+    array = array_1_0_1;
+
+    artifact_0_1_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, porcelain_2_0_1, poolboy_1_5_1, plug_1_1_1
+        }:
+          buildMix {
+            name = "artifact";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "artifact";
+              version = "0.1.0";
+              sha256 =
+                "1b03c29afa283429fbd158ce70345b0612a6bc87b743164ddc5b86213b42d9f5";
+            };
+            beamDeps  = [ porcelain_2_0_1 poolboy_1_5_1 plug_1_1_1 ];
+
+            meta = {
+              description = ''File upload and on-the-fly processing for
+                            Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/doomspork/artifact";
+            };
+          }
+      ) {};
+
+    artifact = artifact_0_1_0;
+
+    aruspex_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, zipper_tree_0_1_1, exyz_1_0_0 }:
+          buildMix {
+            name = "aruspex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "aruspex";
+              version = "0.1.0";
+              sha256 =
+                "2effd16e1081a7af2e5ade9c58cdf4c4d90e2095749ccf733332be2924a6d771";
+            };
+            beamDeps  = [ zipper_tree_0_1_1 exyz_1_0_0 ];
+
+            meta = {
+              description = ''A configurable constraint solver with an API
+                            based on JSR 331.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://www.github.com/dkendal/aruspex";
+            };
+          }
+      ) {};
+
+    aruspex = aruspex_0_1_0;
+
+    asanaficator_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_7_5, exjsx_3_2_0 }:
+          buildMix {
+            name = "asanaficator";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "asanaficator";
+              version = "0.0.1";
+              sha256 =
+                "891ca378a0b83d7018c10073ab14f35930186098d777e24550fff84a9683bfa3";
+            };
+            beamDeps  = [ httpoison_0_7_5 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''Simple Elixir wrapper for the Asana API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/trenpixster/asanaficator";
+            };
+          }
+      ) {};
+
+    asanaficator = asanaficator_0_0_1;
+
+    ashes_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ashes";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "ashes";
+              version = "0.0.3";
+              sha256 =
+                "2178ab8c0fa1cf53b6d6152773ae79ca6100c80861d59e55e5fa06c5979b042b";
+            };
+
+            meta = {
+              description = ''A code generation tool for the phoenix web
+                            framework'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nickgartmann/ashes";
+            };
+          }
+      ) {};
+
+    ashes = ashes_0_0_3;
+
+    assembla_api_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "assembla_api";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "assembla_api";
+              version = "0.1.0";
+              sha256 =
+                "b4a3898de536e4820702c0f119993fd2804e91e2525d1e7eba57d8744983ef24";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Assembla API client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Assembla/ex_assembla_api";
+            };
+          }
+      ) {};
+
+    assembla_api = assembla_api_0_1_0;
+
+    assert_diff_0_0_5 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "assert_diff";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "assert_diff";
+              version = "0.0.5";
+              sha256 =
+                "ad53a2819c33d39ad2f71404a964625691e9d6bf3d63dbc28442acda71109426";
+            };
+
+            meta = {
+              description = ''assert_diff which fallbacks to git diff'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/ske77/assert_diff";
+            };
+          }
+      ) {};
+
+    assert_diff = assert_diff_0_0_5;
+
+    atlas_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "atlas";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "atlas";
+              version = "0.2.0";
+              sha256 =
+                "1c887e4a6224f3189a92e4e4684a2623161a70c7fbd0fd7db79233d5d2f6facf";
+            };
+
+            meta = {
+              description = ''Object Relational Mapper for Elixir '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/chrismccord/atlas";
+            };
+          }
+      ) {};
+
+    atlas = atlas_0_2_0;
+
+    authentic_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "authentic";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "authentic";
+              version = "0.0.1";
+              sha256 =
+                "2fba6e1efde9fef4866d17499907811a3957ded8c07866c7b34474f0f0d59e29";
+            };
+
+            meta = {
+              description = ''Auth for Phoenix'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    authentic = authentic_0_0_1;
+
+    auto_doc_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_1 }:
+          buildMix {
+            name = "auto_doc";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "auto_doc";
+              version = "0.0.2";
+              sha256 =
+                "9c4b30c526e59f63173fe2f0d0c360ac678f1e7a11adcf209dfc843a3e63e6f7";
+            };
+            beamDeps  = [ poison_1_5_2 plug_1_1_1 ];
+
+            meta = {
+              description = ''A package that will create REST API docs based on
+                            your ExUnit tests.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/meatherly/auto_doc";
+            };
+          }
+      ) {};
+
+    auto_doc = auto_doc_0_0_2;
+
+    autobots_license_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "autobots_license";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "autobots_license";
+              version = "0.1.0";
+              sha256 =
+                "7cfa258ce5eff01018dfd6faf509b430d03770fb733c1b10217b9e52770014b3";
+            };
+            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+
+            meta = {    };
+          }
+      ) {};
+
+    autobots_license = autobots_license_0_1_0;
+
+    avex_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "avex";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "avex";
+              version = "0.2.0";
+              sha256 =
+                "e63970026cc566e9aa9c24c261f43843a7553835d2009b16e838217644ded815";
+            };
+
+            meta = {
+              description = ''Awesome validations for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jonhkr/avex";
+            };
+          }
+      ) {};
+
+    avex = avex_0_2_0;
+
+    aws_0_0_8 = callPackage
+      (
+        {
+          buildMix, fetchHex, timex_1_0_1, poison_1_5_2, httpoison_0_8_1
+        }:
+          buildMix {
+            name = "aws";
+            version = "0.0.8";
+            src = fetchHex {
+              pkg = "aws";
+              version = "0.0.8";
+              sha256 =
+                "4cd03efff629c01847ec82777ba1af2a8543fde288fe48ab36d9b8aa66ba7e9f";
+            };
+            beamDeps  = [ timex_1_0_1 poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''AWS clients for Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/jkakar/aws-elixir";
+            };
+          }
+      ) {};
+
+    aws = aws_0_0_8;
+
+    aws_auth_0_2_5 = callPackage
+      (
+        {  buildMix, fetchHex, timex_1_0_1 }:
+          buildMix {
+            name = "aws_auth";
+            version = "0.2.5";
+            src = fetchHex {
+              pkg = "aws_auth";
+              version = "0.2.5";
+              sha256 =
+                "646f1f42652adfb329b5eedde28ddda516c6d02dce45932108b85e2d8bd91b0a";
+            };
+            beamDeps  = [ timex_1_0_1 ];
+
+            meta = {
+              description = ''AWS Signature Version 4 Signing Library'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/bryanjos/aws_auth";
+            };
+          }
+      ) {};
+
+    aws_auth = aws_auth_0_2_5;
+
+    aws_erlang_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          jsx_2_8_0,
+          hackney_1_4_8,
+          erlware_commons_0_18_0
+        }:
+          buildMix {
+            name = "aws_erlang";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "aws_erlang";
+              version = "0.1.0";
+              sha256 =
+                "274e5232cda0ae883ffd813eb172dc0c00134ee04b3deaad1f34e1d4b42b282e";
+            };
+            beamDeps  = [ jsx_2_8_0 hackney_1_4_8 erlware_commons_0_18_0 ];
+
+            meta = {
+              description = ''aws clients for erlang'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/jkakar/aws-erlang";
+            };
+          }
+      ) {};
+
+    aws_erlang = aws_erlang_0_1_0;
+
+    aws_http_0_2_4 = callPackage
+      (
+        {  buildRebar3, fetchHex, lhttpc_1_3_0, barrel_jiffy_0_14_4 }:
+          buildRebar3 {
+            name = "aws_http";
+            version = "0.2.4";
+            src = fetchHex {
+              pkg = "aws_http";
+              version = "0.2.4";
+              sha256 =
+                "96065da0d348a8e47e01531cfa720615e15a21c1bd4e5c82decf56026cde128f";
+            };
+
+            beamDeps  = [ lhttpc_1_3_0 barrel_jiffy_0_14_4 ];
+
+            meta = {
+              description = ''Amazon AWS HTTP helpers'';
+
+              homepage = "https://github.com/anha0825/erl_aws_http";
+            };
+          }
+      ) {};
+
+    aws_http = aws_http_0_2_4;
+
+    b2_0_0_6 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "b2";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "b2";
+              version = "0.0.6";
+              sha256 =
+                "f8b33d1ec36576dfbca3f2f4c5fad1a9a227207d1ef63b3a388778e8fad3333a";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Elixir B2 cloud API wrapper'';
+
+            };
+          }
+      ) {};
+
+    b2 = b2_0_0_6;
+
+    backoff_1_1_3 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "backoff";
+            version = "1.1.3";
+            src = fetchHex {
+              pkg = "backoff";
+              version = "1.1.3";
+              sha256 =
+                "30cead738d20e4c8d36cd37857dd5e23aeba57cb868bf64766d47d371422bdff";
+            };
+
+            meta = {
+              description = ''Exponential backoffs library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ferd/backoff";
+            };
+          }
+      ) {};
+
+    backoff = backoff_1_1_3;
+
+    balanced_3_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_2_1, httpotion_1_0_0 }:
+          buildMix {
+            name = "balanced";
+            version = "3.1.0";
+            src = fetchHex {
+              pkg = "balanced";
+              version = "3.1.0";
+              sha256 =
+                "f86f199d76ac66407fbb82fb927e999ec4119a617500965b824ceb4071fcd2d2";
+            };
+            beamDeps  = [ poison_1_2_1 httpotion_1_0_0 ];
+
+            meta = {
+              description = ''Balanced API for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bryanjos/balanced-elixir";
+            };
+          }
+      ) {};
+
+    balanced = balanced_3_1_0;
+
+    bamboo_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
+          buildMix {
+            name = "bamboo";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "bamboo";
+              version = "0.2.0";
+              sha256 =
+                "f75790da6235225840be3cf6ea9dcfe91abb51bb20ab8e42425a4d207296bbe5";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
+
+            meta = {
+              longDescription = ''Straightforward, composable, and adapter
+                                based Elixir email library for people that love
+                                piping. Adapters for Mandrill, Sendgrid,
+                                in-memory, and test.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/paulcsmith/bamboo";
+            };
+          }
+      ) {};
+
+    bamboo = bamboo_0_2_0;
+
+    bandwidth_1_2_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_4_0, httpoison_0_7_5 }:
+          buildMix {
+            name = "bandwidth";
+            version = "1.2.1";
+            src = fetchHex {
+              pkg = "bandwidth";
+              version = "1.2.1";
+              sha256 =
+                "cfc31517bd160cc9a2e6c55b664eccadc001fc650bd8ea9f01418feb8e7194b5";
+            };
+            beamDeps  = [ poison_1_4_0 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''An Elixir client library for the Bandwidth
+                            Application Platform'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/wtcross/elixir-bandwidth";
+            };
+          }
+      ) {};
+
+    bandwidth = bandwidth_1_2_1;
+
+    bankster_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "bankster";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "bankster";
+              version = "0.1.0";
+              sha256 =
+                "c56909377e5246b37043b4b19a940a4eac8ef57d8e8006d10e201928fd2bbcb7";
+            };
+
+            meta = {
+              description = ''Bankster is an IBAN and BIC validation tool for
+                            Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/railsmechanic/bankster";
+            };
+          }
+      ) {};
+
+    bankster = bankster_0_1_0;
+
+    banner_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "banner";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "banner";
+              version = "0.1.0";
+              sha256 =
+                "309a752cd592bd8dda3526865d050b1e20a953baed8b7480d0489001688f7a0f";
+            };
+
+            meta = {
+              description = ''It is Elixir sysvbanner port from
+                            https://github.com/uffejakobsen/sysvbanner.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/winebarrel/elixir-sysvbanner";
+            };
+          }
+      ) {};
+
+    banner = banner_0_1_0;
+
+    barrel_ibrowse_4_2_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "barrel_ibrowse";
+            version = "4.2.0";
+            src = fetchHex {
+              pkg = "barrel_ibrowse";
+              version = "4.2.0";
+              sha256 =
+                "58bd9e45932c10fd3d0ceb5c4e47952c3243ea300b388192761ac20be197b2ca";
+            };
+
+            meta = {
+              description = ''Erlang HTTP client application'';
+
+              homepage = "https://github.com/barrel-db/ibrowse";
+            };
+          }
+      ) {};
+
+    barrel_ibrowse = barrel_ibrowse_4_2_0;
+
+    barrel_jiffy_0_14_4 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "barrel_jiffy";
+            version = "0.14.4";
+            src = fetchHex {
+              pkg = "barrel_jiffy";
+              version = "0.14.4";
+              sha256 =
+                "3b730d6a18e988b8411f449bbb5df3637eb7bea864302924581b2391dd6b6e71";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''JSON Decoder/Encoder.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/barrel-db/jiffy";
+            };
+          }
+      ) {};
+
+    barrel_jiffy_0_14_5 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "barrel_jiffy";
+            version = "0.14.5";
+            src = fetchHex {
+              pkg = "barrel_jiffy";
+              version = "0.14.5";
+              sha256 =
+                "8a874c6dbcf439a7d7b300b4463f47e088fd54e2b715ef7261e21807ee421f47";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''JSON Decoder/Encoder.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/barrel-db/jiffy";
+            };
+          }
+      ) {};
+
+    barrel_jiffy = barrel_jiffy_0_14_5;
+
+    barrel_oauth_1_6_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "barrel_oauth";
+            version = "1.6.0";
+            src = fetchHex {
+              pkg = "barrel_oauth";
+              version = "1.6.0";
+              sha256 =
+                "b2a800b771d45f32a9a55d416054b3bdfab3a925b62e8000f2c08b719390d4dd";
+            };
+
+            meta = {
+              description = ''An Erlang OAuth 1.0 implementation'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/barrel-db/erlang-oauth";
+            };
+          }
+      ) {};
+
+    barrel_oauth = barrel_oauth_1_6_0;
+
+    base16_1_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "base16";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "base16";
+              version = "1.0.0";
+              sha256 =
+                "02afd0827e61a7b07093873e063575ca3a2b07520567c7f8cec7c5d42f052d76";
+            };
+
+            meta = {
+              description = ''Base16 encoding and decoding'';
+              license = with stdenv.lib.licenses; [ bsd3 free ];
+              homepage = "https://github.com/goj/base16";
+            };
+          }
+      ) {};
+
+    base16 = base16_1_0_0;
+
+    base58_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "base58";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "base58";
+              version = "0.1.0";
+              sha256 =
+                "e9746b7fa618f15d22e3098e06b35083977aff8fe0594628baae282769a2ceff";
+            };
+
+            meta = {
+              description = ''Base58 encoding/decoding for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jrdnull/base58";
+            };
+          }
+      ) {};
+
+    base58 = base58_0_1_0;
+
+    base58check_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "base58check";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "base58check";
+              version = "0.1.0";
+              sha256 =
+                "29617beb2aaffe27ef40d7232a60beb5ad208667df4f2b619552367698cd4ca4";
+            };
+
+            meta = {
+              description = ''Elixir implementation of Base58Check encoding
+                            meant for Bitcoin '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gjaldon/base58check";
+            };
+          }
+      ) {};
+
+    base58check = base58check_0_1_0;
+
+    base62_1_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, custom_base_0_1_0 }:
+          buildMix {
+            name = "base62";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "base62";
+              version = "1.1.0";
+              sha256 =
+                "3e6d5e21aed7875951236ae25a69ac5a22767c685e4e49e973918ae4ba7d9a2a";
+            };
+            beamDeps  = [ custom_base_0_1_0 ];
+
+            meta = {
+              description = ''Base62 encoder/decoder in pure Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/igas/base62";
+            };
+          }
+      ) {};
+
+    base62 = base62_1_1_0;
+
+    base64url_0_0_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "base64url";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "base64url";
+              version = "0.0.1";
+              sha256 =
+                "fab09b20e3f5db886725544cbcf875b8e73ec93363954eb8a1a9ed834aa8c1f9";
+            };
+
+            meta = {
+              description = ''URL safe base64-compatible codec'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dvv/base64url";
+            };
+          }
+      ) {};
+
+    base64url = base64url_0_0_1;
+
+    basho_stats_1_0_3 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "basho_stats";
+            version = "1.0.3";
+            src = fetchHex {
+              pkg = "basho_stats";
+              version = "1.0.3";
+              sha256 =
+                "d739e733b1c8afcaa467289fca50221753fc8cde6e7b53a79b67f98a2a261f5a";
+            };
+
+            meta = {
+              description = ''Basic Erlang statistics library'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/basho/basho_stats";
+            };
+          }
+      ) {};
+
+    basho_stats = basho_stats_1_0_3;
+
+    basic_auth_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_0_8_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "basic_auth";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "basic_auth";
+              version = "1.0.0";
+              sha256 =
+                "e8ed4b5ca05c06dc1c19c69f1f00611e93d17bfa913eefbb6bed4a209af3a5a9";
+            };
+            beamDeps  = [ plug_0_8_1 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Basic Authentication Plug'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/cultivatehq/basic_auth";
+            };
+          }
+      ) {};
+
+    basic_auth = basic_auth_1_0_0;
+
+    batcher_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "batcher";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "batcher";
+              version = "0.0.1";
+              sha256 =
+                "738a930f809603dc21e6612c1df38cbc452887ddf34670d20f05e136231f3671";
+            };
+
+            meta = {
+              longDescription = ''Process a backlog of items after it has grown
+                                to a certain size or a defined time has
+                                passed'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/behe/batcher";
+            };
+          }
+      ) {};
+
+    batcher = batcher_0_0_1;
+
+    battlenet_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "battlenet";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "battlenet";
+              version = "0.0.2";
+              sha256 =
+                "cdd4e182da5a2db478e0da9ac1a467fc8f2b8ec638e3e38dd7962ff3fe8c9342";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Elixir library for the Battle.net API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/cazrin/battlenet";
+            };
+          }
+      ) {};
+
+    battlenet = battlenet_0_0_2;
+
+    bbmustache_1_0_3 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "bbmustache";
+            version = "1.0.3";
+            src = fetchHex {
+              pkg = "bbmustache";
+              version = "1.0.3";
+              sha256 =
+                "d79d9f3f90d14e20bda0c801063801ce9b72b71f5831d70b8d36065fb1a52208";
+            };
+
+            meta = {
+              description = ''Binary pattern match Based Mustache template
+                            engine for Erlang/OTP'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/soranoba/bbmustache";
+            };
+          }
+      ) {};
+
+    bbmustache_1_0_4 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "bbmustache";
+            version = "1.0.4";
+            src = fetchHex {
+              pkg = "bbmustache";
+              version = "1.0.4";
+              sha256 =
+                "03b0d47db66e86df993896dce7578d7e4aae5f84636809b45fa8a3e34ee59b12";
+            };
+
+            meta = {
+              description = ''Binary pattern match Based Mustache template
+                            engine for Erlang/OTP'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/soranoba/bbmustache";
+            };
+          }
+      ) {};
+
+    bbmustache_1_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "bbmustache";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "bbmustache";
+              version = "1.1.0";
+              sha256 =
+                "aa22469836bb8a9928ad741bdd2038d49116228bfbe0c2d6c792e1bdd4b256d9";
+            };
+
+            meta = {
+              description = ''Binary pattern match Based Mustache template
+                            engine for Erlang/OTP'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/soranoba/bbmustache";
+            };
+          }
+      ) {};
+
+    bbmustache = bbmustache_1_1_0;
+
+    beaker_1_2_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          phoenix_1_1_4,
+          ecto_2_0_0_beta_0,
+          bureaucrat_0_1_2
+        }:
+          buildMix {
+            name = "beaker";
+            version = "1.2.0";
+            src = fetchHex {
+              pkg = "beaker";
+              version = "1.2.0";
+              sha256 =
+                "f792ee661db3e31f4c6cacae992e81bbcc302ce05aec29c16bab9853bd763438";
+            };
+            beamDeps  = [ phoenix_1_1_4 ecto_2_0_0_beta_0 bureaucrat_0_1_2 ];
+
+            meta = {
+              longDescription = ''Measure your Elixir! A metrics library that
+                                will help Elixirists keep track of their
+                                application`s performance, as well as any custom
+                                statistics they like.'';
+
+              homepage = "http://github.com/hahuang65/beaker";
+            };
+          }
+      ) {};
+
+    beaker = beaker_1_2_0;
+
+    beam_analyzer_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "beam_analyzer";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "beam_analyzer";
+              version = "0.0.3";
+              sha256 =
+                "acfb7b4d92c1147401f2de8e0fe5ad33236814a57fdcfbcb184e9292e43c7d27";
+            };
+
+            meta = {
+              description = ''Get information about Erlang/Elixir modules and
+                            BEAM files'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/joeyates/beam_analyzer";
+            };
+          }
+      ) {};
+
+    beam_analyzer = beam_analyzer_0_0_3;
+
+    bear_0_8_3 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "bear";
+            version = "0.8.3";
+            src = fetchHex {
+              pkg = "bear";
+              version = "0.8.3";
+              sha256 =
+                "0a04ce4702e00e0a43c0fcdd63e38c9c7d64dceb32b27ffed261709e7c3861ad";
+            };
+
+            meta = {
+              description = ''Statistics functions for Erlang'';
+
+              homepage = "https://github.com/puzza007/bear";
+            };
+          }
+      ) {};
+
+    bear = bear_0_8_3;
+
+    belvedere_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "belvedere";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "belvedere";
+              version = "0.0.1";
+              sha256 =
+                "b222f5c3ab855655b7950681542e2c3941c52533bd8b6cbb08be60f91427113e";
+            };
+
+            meta = {
+              description = ''An example Elixir project with CircleCI, Docker,
+                            Dialyzer integration.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "http://nirvana.io";
+            };
+          }
+      ) {};
+
+    belvedere = belvedere_0_0_1;
+
+    benchfella_0_3_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "benchfella";
+            version = "0.3.2";
+            src = fetchHex {
+              pkg = "benchfella";
+              version = "0.3.2";
+              sha256 =
+                "322270993f38246b02c8a98d64491a2b46a4efef5667a479d55a49ec53ea6dcf";
+            };
+
+            meta = {
+              description = ''Microbenchmarking tool for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/alco/benchfella";
+            };
+          }
+      ) {};
+
+    benchfella = benchfella_0_3_2;
+
+    benchmark_ips_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "benchmark_ips";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "benchmark_ips";
+              version = "0.2.0";
+              sha256 =
+                "7c55c4317dae5b8dae6a655e25a7aa491acd076e36efb9c9852a789a3592b703";
+            };
+
+            meta = {
+              description = ''A tool to run benchmarks to determine iteration
+                            per second.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mxhold/benchmark_ips";
+            };
+          }
+      ) {};
+
+    benchmark_ips = benchmark_ips_0_2_0;
+
+    benchwarmer_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "benchwarmer";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "benchwarmer";
+              version = "0.0.2";
+              sha256 =
+                "8b98b39c1c50df624f9c2d13ca953eeed465eed6feda975da26b479df2b4c9f5";
+            };
+
+            meta = {
+              longDescription = ''Benchwarmer is an Elixir micro-benchmarking
+                                utility that runs a function (or list of
+                                functions) repeatedly against a dataset for a
+                                period of time, and then reports on the average
+                                time each operation took to complete, allowing
+                                for easy comparison. '';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/mroth/benchwarmer";
+            };
+          }
+      ) {};
+
+    benchwarmer = benchwarmer_0_0_2;
+
+    bencode_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, eqc_ex_1_2_4 }:
+          buildMix {
+            name = "bencode";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "bencode";
+              version = "0.2.0";
+              sha256 =
+                "78ec5fbfa24cb98795d80d4982fc30563af4d7cd7c77ee86a3bffeb1b3a312dd";
+            };
+            beamDeps  = [ eqc_ex_1_2_4 ];
+
+            meta = {
+              longDescription = ''A bencode encoder and decoder. The decoder
+                                will return the info hash with along with the
+                                decoded data, and the encoder is implemented as
+                                a protocol, allowing any data structure to be
+                                bcode encoded.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/gausby/bencode";
+            };
+          }
+      ) {};
+
+    bencode = bencode_0_2_0;
+
+    bencoder_0_0_7 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "bencoder";
+            version = "0.0.7";
+            src = fetchHex {
+              pkg = "bencoder";
+              version = "0.0.7";
+              sha256 =
+                "1fd5478490f0ef03e5afee0c0392226efe07a76c9f537697176bc46bc46500b8";
+            };
+
+            meta = {
+              description = ''a library to handle bencode in elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/alehander42/bencoder";
+            };
+          }
+      ) {};
+
+    bencoder = bencoder_0_0_7;
+
+    bencodex_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "bencodex";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "bencodex";
+              version = "1.0.0";
+              sha256 =
+                "a70c319eed907d4d0520bf2ed6eedc77cbf1312274b144341dc4ecc74136124d";
+            };
+
+            meta = {
+              description = ''Encoder and decoder for the bencode format'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/patrickgombert/bencodex";
+            };
+          }
+      ) {};
+
+    bencodex = bencodex_1_0_0;
+
+    bert_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "bert";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "bert";
+              version = "0.1.0";
+              sha256 =
+                "2a561521ec3529b248658a3e2d3d4bfe6729b0ab8291c701bf15ef413eda1506";
+            };
+
+            meta = {
+              description = ''BERT Encoder/Decoder'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/yuce/bert.erl";
+            };
+          }
+      ) {};
+
+    bert = bert_0_1_0;
+
+    bertex_1_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "bertex";
+            version = "1.2.0";
+            src = fetchHex {
+              pkg = "bertex";
+              version = "1.2.0";
+              sha256 =
+                "5e6db198c106dbfbd6e419201ec15facd71fac320f24e3e85a856d624ac4096a";
+            };
+
+            meta = {
+              description = '' Elixir BERT encoder/decoder '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edgurgel/bertex";
+            };
+          }
+      ) {};
+
+    bertex = bertex_1_2_0;
+
+    bgg_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, quinn_0_0_4, httpoison_0_8_1 }:
+          buildMix {
+            name = "bgg";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "bgg";
+              version = "0.1.0";
+              sha256 =
+                "d26593e7ebb23f76e6c0e73a9a1acb6a45ec25ea53b6ee716a2291f07c5f1fb6";
+            };
+            beamDeps  = [ quinn_0_0_4 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''A BoardGameGeek API wrapper in Elixir
+                            http://boardgamegeek.com/xmlapi/'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/peralmq/bgg-elixir";
+            };
+          }
+      ) {};
+
+    bgg = bgg_0_1_0;
+
+    billiards_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "billiards";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "billiards";
+              version = "0.0.1";
+              sha256 =
+                "5b8d8eab12e35c0c7eff5be02a4adf0a7aa4cf10688a5faeec9b10f2c2f04046";
+            };
+             meta = {    };
+          }
+      ) {};
+
+    billiards = billiards_0_0_1;
+
+    bin_format_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "bin_format";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "bin_format";
+              version = "0.0.1";
+              sha256 =
+                "f73b9d1691499964d248b4a19b56284b2c51652015a63b77c2688b92cb55d66a";
+            };
+
+            meta = {
+              longDescription = ''Automatically generate the boilerplate to
+                                convert between binaries and Elixir structs.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/willpenington/bin_format";
+            };
+          }
+      ) {};
+
+    bin_format = bin_format_0_0_1;
+
+    bing_translator_0_2_3 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          timex_1_0_0_rc4,
+          poison_1_5_2,
+          httpoison_0_8_1,
+          floki_0_7_1
+        }:
+          buildMix {
+            name = "bing_translator";
+            version = "0.2.3";
+            src = fetchHex {
+              pkg = "bing_translator";
+              version = "0.2.3";
+              sha256 =
+                "a1a953a96728e0531c41c96befe4301d80370c2f09a2ed412a8c8a817d7333c9";
+            };
+            beamDeps  = [
+                          timex_1_0_0_rc4
+                          poison_1_5_2
+                          httpoison_0_8_1
+                          floki_0_7_1
+                        ];
+
+            meta = {
+              longDescription = ''Translate strings using the Bing HTTP API.
+                                Requires that you have a Client ID and Secret.
+                                See README.md for information.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ikeikeikeike/bing_translator";
+            };
+          }
+      ) {};
+
+    bing_translator = bing_translator_0_2_3;
+
+    binstructor_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "binstructor";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "binstructor";
+              version = "0.0.1";
+              sha256 =
+                "ab6e619628d4308a47744dcf9dd0c9ff48f4a5cc5e00ce6bb3852d92e654ba74";
+            };
+
+            meta = {
+              longDescription = ''Automatically generate the boilerplate to
+                                convert between binaries and Elixir structs.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/willpenington/binstructor";
+            };
+          }
+      ) {};
+
+    binstructor = binstructor_0_0_1;
+
+    bit_field_set_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, eqc_ex_1_2_4 }:
+          buildMix {
+            name = "bit_field_set";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "bit_field_set";
+              version = "0.1.0";
+              sha256 =
+                "63a9c8eb05dc0f9cd79590d718db56ccc1b41cd48d91457d94754a44a2663044";
+            };
+            beamDeps  = [ eqc_ex_1_2_4 ];
+
+            meta = {
+              longDescription = ''Store and manipulate a set of bit flags,
+                                mostly used for syncing the state between peers
+                                in a peer to peer network, such as
+                                BitTorrent.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/gausby/bit_field_set";
+            };
+          }
+      ) {};
+
+    bit_field_set = bit_field_set_0_1_0;
+
+    bitbucket_api_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, jsx_2_8_0, httpoison_0_7_5, jsex_2_0_0 }:
+          buildMix {
+            name = "bitbucket_api";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "bitbucket_api";
+              version = "0.0.2";
+              sha256 =
+                "25fbdda8ed1813f0ade92b4f28b3290b3efd6be63ff25c84ab9e24b512464245";
+            };
+            beamDeps  = [ jsx_2_8_0 httpoison_0_7_5 jsex_2_0_0 ];
+
+            meta = {
+              description = ''Create hooks for Bitbucket. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Blackrush/bitbucket_api";
+            };
+          }
+      ) {};
+
+    bitbucket_api = bitbucket_api_0_0_2;
+
+    bitfield_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "bitfield";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "bitfield";
+              version = "1.0.0";
+              sha256 =
+                "0f1ca3f3e9f8661cc2686561717c326309541f95e4f82f7b7d927e150f5f7b5a";
+            };
+
+            meta = {
+              description = ''Simple bitfields for erlang/elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/camshaft/bitfield.erl";
+            };
+          }
+      ) {};
+
+    bitfield = bitfield_1_0_0;
+
+    bitmap_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "bitmap";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "bitmap";
+              version = "1.0.0";
+              sha256 =
+                "c33ca1dd28d6979e61f3517140ef71e80f8ded4029debabbb6482ef650384b34";
+            };
+
+            meta = {
+              longDescription = ''Package to help you create and work with
+                                bitmaps
+                                (https://en.wikipedia.org/wiki/Bitmap)'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/hashd/bitmap-elixir";
+            };
+          }
+      ) {};
+
+    bitmap = bitmap_1_0_0;
+
+    bitpay_0_2_5 = callPackage
+      (
+        {
+          buildMix, fetchHex, uuid_0_1_5, httpotion_1_0_0, exjsx_3_1_0
+        }:
+          buildMix {
+            name = "bitpay";
+            version = "0.2.5";
+            src = fetchHex {
+              pkg = "bitpay";
+              version = "0.2.5";
+              sha256 =
+                "25a0b2dbf6619ddc0db4cf1ee03b3d097adac47dc47c65b71a2661eba0f2e3a2";
+            };
+            beamDeps  = [ uuid_0_1_5 httpotion_1_0_0 exjsx_3_1_0 ];
+
+            meta = {
+              longDescription = ''Library to allow elixir apps to easily use
+                                the BitPay REST API to authenticate, generate
+                                invoices, and retrieve invoices. Includes
+                                Utilities for using Erlangs library for Elliptic
+                                Curve Keys.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitpay/elixir-client";
+            };
+          }
+      ) {};
+
+    bitpay = bitpay_0_2_5;
+
+    blackbook_0_3_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          timex_ecto_0_5_0,
+          timex_0_19_5,
+          secure_random_0_2_0,
+          postgrex_0_11_1,
+          ecto_2_0_0_beta_0,
+          earmark_0_2_1,
+          comeonin_1_6_0
+        }:
+          buildMix {
+            name = "blackbook";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "blackbook";
+              version = "0.3.1";
+              sha256 =
+                "deecf1248ec5ef7911e3b440a968d8cb2dae54d50e36bf80173a2593f0e4ecde";
+            };
+            beamDeps  = [
+                          timex_ecto_0_5_0
+                          timex_0_19_5
+                          secure_random_0_2_0
+                          postgrex_0_11_1
+                          ecto_2_0_0_beta_0
+                          earmark_0_2_1
+                          comeonin_1_6_0
+                        ];
+
+            meta = {    };
+          }
+      ) {};
+
+    blackbook = blackbook_0_3_1;
+
+    blacksmith_0_1_3 = callPackage
+      (
+        {  buildMix, fetchHex, faker_0_6_0 }:
+          buildMix {
+            name = "blacksmith";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "blacksmith";
+              version = "0.1.3";
+              sha256 =
+                "d070295cac13fef8d05cc50b900413e8e6dd863f4958bd55986b56d3874a20b4";
+            };
+            beamDeps  = [ faker_0_6_0 ];
+
+            meta = {
+              description = ''Elixir fake data generation for testing and
+                            development'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/batate/blacksmith";
+            };
+          }
+      ) {};
+
+    blacksmith = blacksmith_0_1_3;
+
+    blaguth_1_2_1 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "blaguth";
+            version = "1.2.1";
+            src = fetchHex {
+              pkg = "blaguth";
+              version = "1.2.1";
+              sha256 =
+                "2900dc5b7c6f7810bdf5e0ede8749632997811ae5b72ada34f59699b4310a65a";
+            };
+            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Basic Access Authentication in Plug
+                            applications.'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/lexmag/blaguth";
+            };
+          }
+      ) {};
+
+    blaguth = blaguth_1_2_1;
+
+    blanket_0_3_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "blanket";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "blanket";
+              version = "0.3.1";
+              sha256 =
+                "9d7f382c1254b83ba3334d143b942afd4a03c0ae1d32f7fee5fd3de184f4c016";
+            };
+
+            meta = {
+              description = ''Blanket covers your tables ! Don`t loose your ETS
+                            tables with Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/niahoo/blanket";
+            };
+          }
+      ) {};
+
+    blanket = blanket_0_3_1;
+
+    block_timer_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "block_timer";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "block_timer";
+              version = "0.0.1";
+              sha256 =
+                "1dec7d6590de5b5d2cecd101ea4b276180b7d428e8b36863c424223dd0a97782";
+            };
+
+            meta = {
+              description = ''Macros to use :timer.apply_after and
+                            :timer.apply_interval with a block'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/adamkittelson/block_timer";
+            };
+          }
+      ) {};
+
+    block_timer = block_timer_0_0_1;
+
+    blocking_queue_1_3_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "blocking_queue";
+            version = "1.3.0";
+            src = fetchHex {
+              pkg = "blocking_queue";
+              version = "1.3.0";
+              sha256 =
+                "10f2b942a29f83c3bfef6285096d7f42028201c89f317c731e708b528a7fc17d";
+            };
+
+            meta = {
+              longDescription = ''BlockingQueue is a simple queue implemented
+                                as a GenServer. It has a fixed maximum length
+                                established when it is created.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/joekain/BlockingQueue";
+            };
+          }
+      ) {};
+
+    blocking_queue = blocking_queue_1_3_0;
+
+    bloodhound_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "bloodhound";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "bloodhound";
+              version = "0.1.1";
+              sha256 =
+                "6aaab638fe90fc3714b650b659df774c7cdb12d098fee3910952e0a0f8fcd6ec";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''An ElasticSearch library for Elixir that can be
+                            easily integrated with Ecto'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ianwalter/bloodhound";
+            };
+          }
+      ) {};
+
+    bloodhound = bloodhound_0_1_1;
+
+    bloomex_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "bloomex";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "bloomex";
+              version = "1.0.0";
+              sha256 =
+                "598f414e8bb23054843430fff449861ce7d8f6a81a220cbfed8cf42dcd1dd299";
+            };
+
+            meta = {
+              description = ''Bloomex is a pure Elixir implementation of
+                            Scalable Bloom Filters.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gmcabrita/bloomex";
+            };
+          }
+      ) {};
+
+    bloomex = bloomex_1_0_0;
+
+    bmark_1_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "bmark";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "bmark";
+              version = "1.0.2";
+              sha256 =
+                "70204b013c75d3b95d58acc42ff62461eaebe1e5345ef029fe59ba30a15b1747";
+            };
+
+            meta = {
+              longDescription = ''A benchmarking tool for Elixir with a focus
+                                on comparing results with confidence.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/joekain/bmark";
+            };
+          }
+      ) {};
+
+    bmark = bmark_1_0_2;
+
+    boltun_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex, postgrex_0_11_1 }:
+          buildMix {
+            name = "boltun";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "boltun";
+              version = "0.0.4";
+              sha256 =
+                "fcf18b4bfab0afcd1c31133c9c5232776ededd1fb3caa1536ded8265002ab867";
+            };
+            beamDeps  = [ postgrex_0_11_1 ];
+
+            meta = {
+              longDescription = ''Transforms notifications from the Postgres
+                                LISTEN/NOTIFY mechanism into callback
+                                execution'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/briksoftware/boltun";
+            };
+          }
+      ) {};
+
+    boltun = boltun_0_0_4;
+
+    booter_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "booter";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "booter";
+              version = "0.1.0";
+              sha256 =
+                "bb14263b5d5dc74c3f4086f764153a0d09b2b05a9cda6f4b121cc7789159a80e";
+            };
+
+            meta = {
+              description = ''Boot an Elixir application step by step'';
+              license = stdenv.lib.licenses.mpl11;
+              homepage = "https://github.com/eraserewind/booter";
+            };
+          }
+      ) {};
+
+    booter = booter_0_1_0;
+
+    botan_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "botan";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "botan";
+              version = "0.1.2";
+              sha256 =
+                "43541b5c52c91e46295a015f58857c347c85a7753d7c3cd3a1f835b25fdedaa9";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Elixir wrapper for Botan.io'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mendab1e/exBotan";
+            };
+          }
+      ) {};
+
+    botan = botan_0_1_2;
+
+    bottler_0_5_0 = callPackage
+      (
+        {  buildMix, fetchHex, sshex_1_1_0 }:
+          buildMix {
+            name = "bottler";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "bottler";
+              version = "0.5.0";
+              sha256 =
+                "a76b2ddfc98ef943ceb6730dd09fb3d085cb9dcc8feb8c739abbe0dcc77d8ffe";
+            };
+            beamDeps  = [ sshex_1_1_0 ];
+
+            meta = {
+              longDescription = ''Help you bottle, ship and serve your Elixir
+                                apps. Bottler is a collection of tools that aims
+                                to help you generate releases, ship them to your
+                                servers, install them there, and get them live
+                                on production.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/elpulgardelpanda/bottler";
+            };
+          }
+      ) {};
+
+    bottler = bottler_0_5_0;
+
+    bouncer_0_1_5 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          redix_0_3_4,
+          poolboy_1_5_1,
+          poison_1_5_2,
+          plug_1_1_1,
+          phoenix_1_1_4
+        }:
+          buildMix {
+            name = "bouncer";
+            version = "0.1.5";
+            src = fetchHex {
+              pkg = "bouncer";
+              version = "0.1.5";
+              sha256 =
+                "82979e9c8df401cbf5eb2dd09dff3952933cf2efd9135be1f0cb51ec04deb996";
+            };
+            beamDeps  = [
+                          redix_0_3_4
+                          poolboy_1_5_1
+                          poison_1_5_2
+                          plug_1_1_1
+                          phoenix_1_1_4
+                        ];
+
+            meta = {
+              description = ''Token-based authorization and session management
+                            for Phoenix (Elixir)'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ianwalter/bouncer";
+            };
+          }
+      ) {};
+
+    bouncer = bouncer_0_1_5;
+
+    braintree_0_3_1 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1 }:
+          buildMix {
+            name = "braintree";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "braintree";
+              version = "0.3.1";
+              sha256 =
+                "a93e78cbf8a1407035d8bcf6e7d53fc2ef2f716f3bd49b833ae105fa06a40ec1";
+            };
+            beamDeps  = [ httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Native Braintree client library for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sorentwo/braintree-elixir";
+            };
+          }
+      ) {};
+
+    braintree = braintree_0_3_1;
+
+    braise_0_3_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_3_1 }:
+          buildMix {
+            name = "braise";
+            version = "0.3.2";
+            src = fetchHex {
+              pkg = "braise";
+              version = "0.3.2";
+              sha256 =
+                "5efb63b074308be51d25b1f324799b8b715b5b025bfdbdd9a39972b36a7b957c";
+            };
+            beamDeps  = [ poison_1_3_1 ];
+
+            meta = {
+              description = ''A library that converts JSON Schema into ember
+                            models/adapters.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/IoraHealth/braise";
+            };
+          }
+      ) {};
+
+    braise = braise_0_3_2;
+
+    brcpfcnpj_0_0_9 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "brcpfcnpj";
+            version = "0.0.9";
+            src = fetchHex {
+              pkg = "brcpfcnpj";
+              version = "0.0.9";
+              sha256 =
+                "d5b7c8b473a07c3c91aa450b91ef9899a423c3f36a3027d4be5da25fdf5cef4b";
+            };
+
+            meta = {
+              longDescription = ''Valida Cpf/Cnpj e Formatar em String caso
+                                necessario Number format and Validate, to the
+                                documents brazilians (CPF/CNPJ)'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/williamgueiros/Brcpfcnpj";
+            };
+          }
+      ) {};
+
+    brcpfcnpj = brcpfcnpj_0_0_9;
+
+    breadcrumble_1_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1 }:
+          buildMix {
+            name = "breadcrumble";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "breadcrumble";
+              version = "1.0.2";
+              sha256 =
+                "8265e64e363df90e556125e091ba52e92a8eeaad57cc3efdd926aa0b069ad78f";
+            };
+            beamDeps  = [ plug_1_1_1 ];
+
+            meta = {
+              description = ''Elixir port of Breadcrumble library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ma2gedev/breadcrumble_ex";
+            };
+          }
+      ) {};
+
+    breadcrumble = breadcrumble_1_0_2;
+
+    briefly_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "briefly";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "briefly";
+              version = "0.3.0";
+              sha256 =
+                "c6ebf8fc3dcd4950dd10c03e953fb4f553a8bcf0ff4c8c40d71542434cd7e046";
+            };
+
+            meta = {
+              description = ''Simple, robust temporary file support'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/CargoSense/briefly";
+            };
+          }
+      ) {};
+
+    briefly = briefly_0_3_0;
+
+    browser_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "browser";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "browser";
+              version = "0.1.2";
+              sha256 =
+                "37919c96372654f687ee9d6645c50b8f6182baad589978326a00f671133446e7";
+            };
+
+            meta = {
+              description = ''Browser detection library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tuvistavie/elixir-browser";
+            };
+          }
+      ) {};
+
+    browser = browser_0_1_2;
+
+    bson_0_4_4 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "bson";
+            version = "0.4.4";
+            src = fetchHex {
+              pkg = "bson";
+              version = "0.4.4";
+              sha256 =
+                "69cbda1d27fd0f500f306c99e609593132c66b521b92a21ce6f21fea88dc3d27";
+            };
+
+            meta = {
+              description = ''BSON implementation for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/checkiz/elixir-bson";
+            };
+          }
+      ) {};
+
+    bson = bson_0_4_4;
+
+    bstr_0_3_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "bstr";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "bstr";
+              version = "0.3.0";
+              sha256 =
+                "0fb4e05619663d48dabcd21023915741277ba392f2a5710dde7ab6034760284d";
+            };
+
+            meta = {
+              description = ''Erlang library that uses binaries as strings'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/jcomellas/bstr";
+            };
+          }
+      ) {};
+
+    bstr = bstr_0_3_0;
+
+    bugsnag_1_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "bugsnag";
+            version = "1.1.1";
+            src = fetchHex {
+              pkg = "bugsnag";
+              version = "1.1.1";
+              sha256 =
+                "ed4d8876e9bdf841f6f08e6562ad9455ef3d06fb9d403702e7e24611fbe96247";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''An Elixir interface to the Bugsnag API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jarednorman/bugsnag-elixir";
+            };
+          }
+      ) {};
+
+    bugsnag = bugsnag_1_1_1;
+
+    bugsnag_erl_0_1_2 = callPackage
+      (
+        {  buildRebar3, fetchHex, lager_3_0_1, jsx_2_8_0 }:
+          buildRebar3 {
+            name = "bugsnag_erl";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "bugsnag_erl";
+              version = "0.1.2";
+              sha256 =
+                "c54c6e7fcb5e74b1d3611371ce7bd73fb31aaf27f909398a286683802c541851";
+            };
+
+            beamDeps  = [ lager_3_0_1 jsx_2_8_0 ];
+
+            meta = {
+              description = ''Bugsnag notifier'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/project-fifo/bugsnag-erlang";
+            };
+          }
+      ) {};
+
+    bugsnag_erl = bugsnag_erl_0_1_2;
+
+    bump_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "bump";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "bump";
+              version = "0.1.0";
+              sha256 =
+                "068b418026a90382f9809ffe0504579f7ccea981f794ff6257ba2a0925b91360";
+            };
+
+            meta = {
+              description = ''A library for writing BMP files from binary data.
+                            '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/evanfarrar/ex_bump";
+            };
+          }
+      ) {};
+
+    bump = bump_0_1_0;
+
+    bunt_0_1_5 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "bunt";
+            version = "0.1.5";
+            src = fetchHex {
+              pkg = "bunt";
+              version = "0.1.5";
+              sha256 =
+                "5a365df70e90a021617d1bcf6dedada848176728c84a33b463e59fb0c9b8cc65";
+            };
+
+            meta = {
+              description = ''256 color ANSI coloring in the terminal'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rrrene/bunt";
+            };
+          }
+      ) {};
+
+    bunt = bunt_0_1_5;
+
+    bureaucrat_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex, plug_0_8_1 }:
+          buildMix {
+            name = "bureaucrat";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "bureaucrat";
+              version = "0.1.2";
+              sha256 =
+                "cd746f6f9ee9927b1b81ae7834c7b0a045df7e53151674d8b3d8de5832ec7402";
+            };
+            beamDeps  = [ plug_0_8_1 ];
+
+            meta = {
+              description = ''Generate Phoenix API documentation from tests'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/api-hogs/bureaucrat";
+            };
+          }
+      ) {};
+
+    bureaucrat = bureaucrat_0_1_2;
+
+    butler_0_6_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
+          buildMix {
+            name = "butler";
+            version = "0.6.2";
+            src = fetchHex {
+              pkg = "butler";
+              version = "0.6.2";
+              sha256 =
+                "28d681c4986c6711bf72c645084a83ea108a35039cedf5d03d6779d86cb7db19";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''A simple elixir robot to help you get things
+                            done'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/keathley/butler";
+            };
+          }
+      ) {};
+
+    butler_0_7_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
+          buildMix {
+            name = "butler";
+            version = "0.7.1";
+            src = fetchHex {
+              pkg = "butler";
+              version = "0.7.1";
+              sha256 =
+                "fdc4226c0347ea94e6b535c7d352c098720bdfad280357dad9b4d8bd3c346bd7";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''A simple elixir robot to help you get things
+                            done'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/keathley/butler";
+            };
+          }
+      ) {};
+
+    butler = butler_0_7_1;
+
+    butler_cage_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, butler_0_7_1 }:
+          buildMix {
+            name = "butler_cage";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "butler_cage";
+              version = "0.0.2";
+              sha256 =
+                "22c5d1d0cbe6c19fffae260b02717a984ee5632c34492ee4254972ca4ab8e059";
+            };
+            beamDeps  = [ butler_0_7_1 ];
+
+            meta = {
+              description = ''A Butler plugin for showing silly photos of Nick
+                            Cage.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/keathley/butler_cage";
+            };
+          }
+      ) {};
+
+    butler_cage = butler_cage_0_0_2;
+
+    butler_cowsay_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex, cowsay_0_0_1, butler_0_6_2 }:
+          buildMix {
+            name = "butler_cowsay";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "butler_cowsay";
+              version = "0.2.1";
+              sha256 =
+                "d5b6ef82ebd387666c8b8d4fd93df3d11ff2ed7a129ae3aa7d7faac9ae803195";
+            };
+            beamDeps  = [ cowsay_0_0_1 butler_0_6_2 ];
+
+            meta = {
+              description = ''ButlerCowsay plugin for Butler SlackBot'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bbrock25/butler_cowsay";
+            };
+          }
+      ) {};
+
+    butler_cowsay = butler_cowsay_0_2_1;
+
+    butler_new_0_4_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "butler_new";
+            version = "0.4.3";
+            src = fetchHex {
+              pkg = "butler_new";
+              version = "0.4.3";
+              sha256 =
+                "ef68a4957dde207e7663c3947d8ec93d8e24c9872619bd66b47d52abfb2b3d90";
+            };
+             meta = {    };
+          }
+      ) {};
+
+    butler_new = butler_new_0_4_3;
+
+    butler_tableflip_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, butler_0_7_1 }:
+          buildMix {
+            name = "butler_tableflip";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "butler_tableflip";
+              version = "0.0.3";
+              sha256 =
+                "327840e6a07b8a3f2cc461920aea0a1cf39898b6fc0e1484e94867810dfea444";
+            };
+            beamDeps  = [ butler_0_7_1 ];
+
+            meta = {
+              description = ''Butler Plugin for flipping tables.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/keathley/butler_tableflip";
+            };
+          }
+      ) {};
+
+    butler_tableflip = butler_tableflip_0_0_3;
+
+    bypass_0_5_1 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "bypass";
+            version = "0.5.1";
+            src = fetchHex {
+              pkg = "bypass";
+              version = "0.5.1";
+              sha256 =
+                "bbff87f453cd98a81c9caeb305e5bcee25fe4fe31089cb19127a36dd224c2454";
+            };
+            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+
+            meta = {
+              longDescription = ''Bypass provides a quick way to create a
+                                custom plug that can be put in place instead of
+                                an actual HTTP server to return prebaked
+                                responses to client requests. This is most
+                                useful in tests, when you want to create a mock
+                                HTTP server and test how your HTTP client
+                                handles different types of responses from the
+                                server.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pspdfkit-labs/bypass";
+            };
+          }
+      ) {};
+
+    bypass = bypass_0_5_1;
+
+    cache_tab_1_0_2 = callPackage
+      (
+        {  buildRebar3, fetchHex, p1_utils_1_0_3 }:
+          buildRebar3 {
+            name = "cache_tab";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "cache_tab";
+              version = "1.0.2";
+              sha256 =
+                "1d802a8bdf01178e1c6171037cc6e66da1a0c9fbb6589f644919d9a7402ebcd2";
+            };
+
+            beamDeps  = [ p1_utils_1_0_3 ];
+
+            meta = {
+              description = ''In-memory cache Erlang / Elixir library'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/processone/cache_tab";
+            };
+          }
+      ) {};
+
+    cache_tab = cache_tab_1_0_2;
+
+    calecto_0_5_0 = callPackage
+      (
+        {  buildMix, fetchHex, ecto_1_1_3, calendar_0_12_4 }:
+          buildMix {
+            name = "calecto";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "calecto";
+              version = "0.5.0";
+              sha256 =
+                "3414a87a3a355eeb8116c2fc993e3827772f1dc9064aab00a81a76a5ef00ab5b";
+            };
+            beamDeps  = [ ecto_1_1_3 calendar_0_12_4 ];
+
+            meta = {
+              longDescription = ''Library for using Calendar with Ecto. This
+                                lets you save Calendar types in Ecto and work
+                                with date-times in multiple timezones.'';
+
+              homepage = "https://github.com/lau/calecto";
+            };
+          }
+      ) {};
+
+    calecto = calecto_0_5_0;
+
+    calendar_0_12_3 = callPackage
+      (
+        {  buildMix, fetchHex, tzdata_0_1_8 }:
+          buildMix {
+            name = "calendar";
+            version = "0.12.3";
+            src = fetchHex {
+              pkg = "calendar";
+              version = "0.12.3";
+              sha256 =
+                "19aba4c9660239a710ac70e9bef56d8c8db73ebb48a2c89e3ac02cec64838aad";
+            };
+            beamDeps  = [ tzdata_0_1_8 ];
+
+            meta = {
+              longDescription = ''Calendar is a datetime library for Elixir.
+                                Providing explicit types for datetimes, dates
+                                and times. Full timezone support via its sister
+                                package `tzdata`. Safe parsing and formatting of
+                                standard formats (ISO, RFC, Unix, JS etc.) plus
+                                strftime formatting. Easy and safe
+                                interoperability with erlang style datetime
+                                tuples. Extendable through protocols. Related
+                                packages are available for i18n, Ecto and
+                                Phoenix interoperability.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lau/calendar";
+            };
+          }
+      ) {};
+
+    calendar_0_12_4 = callPackage
+      (
+        {  buildMix, fetchHex, tzdata_0_1_8 }:
+          buildMix {
+            name = "calendar";
+            version = "0.12.4";
+            src = fetchHex {
+              pkg = "calendar";
+              version = "0.12.4";
+              sha256 =
+                "1df7cc23b7dfa3228498fff3bd298495d8431433be94db62a60e93ffa455a060";
+            };
+            beamDeps  = [ tzdata_0_1_8 ];
+
+            meta = {
+              longDescription = ''Calendar is a datetime library for Elixir.
+                                Providing explicit types for datetimes, dates
+                                and times. Full timezone support via its sister
+                                package `tzdata`. Safe parsing and formatting of
+                                standard formats (ISO, RFC, Unix, JS etc.) plus
+                                strftime formatting. Easy and safe
+                                interoperability with erlang style datetime
+                                tuples. Extendable through protocols. Related
+                                packages are available for i18n, Ecto and
+                                Phoenix interoperability.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lau/calendar";
+            };
+          }
+      ) {};
+
+    calendar = calendar_0_12_4;
+
+    calendar_translations_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, calendar_0_12_4 }:
+          buildMix {
+            name = "calendar_translations";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "calendar_translations";
+              version = "0.0.3";
+              sha256 =
+                "b232912959f7f645a34e1a6ceca4657156e64bb5db3573fbc61c603c648dcb09";
+            };
+            beamDeps  = [ calendar_0_12_4 ];
+
+            meta = {
+              description = ''Translations for the Calendar library.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/padde/calendar_translations";
+            };
+          }
+      ) {};
+
+    calendar_translations = calendar_translations_0_0_3;
+
+    calliope_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "calliope";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "calliope";
+              version = "0.3.0";
+              sha256 =
+                "0a0ccf87616459c36ff1f1551701da38485eb601500e74cffd7e42fe9862f74d";
+            };
+
+            meta = {
+              description = ''An Elixir library for parsing haml templates. '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/nurugger07/calliope";
+            };
+          }
+      ) {};
+
+    calliope = calliope_0_3_0;
+
+    canada_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "canada";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "canada";
+              version = "1.0.0";
+              sha256 =
+                "5f4eb50f2f2747e5f3e8750760e2683b38667e113281a7a71b502d1aa52d89d1";
+            };
+
+            meta = {
+              description = '' A DSL for declarative permissions '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jarednorman/canada";
+            };
+          }
+      ) {};
+
+    canada = canada_1_0_0;
+
+    canary_0_14_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, plug_1_1_1, ecto_2_0_0_beta_0, canada_1_0_0
+        }:
+          buildMix {
+            name = "canary";
+            version = "0.14.0";
+            src = fetchHex {
+              pkg = "canary";
+              version = "0.14.0";
+              sha256 =
+                "5002649bbe4b9c7e00fb7f0c499c109eb34732f50f69ede797ed1e768e4f0029";
+            };
+            beamDeps  = [ plug_1_1_1 ecto_2_0_0_beta_0 canada_1_0_0 ];
+
+            meta = {
+              longDescription = ''An authorization library to restrict what
+                                resources the current user is allowed to access,
+                                and load resources for you.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/cpjk/canary";
+            };
+          }
+      ) {};
+
+    canary = canary_0_14_0;
+
+    carrier_1_0_4 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
+          buildMix {
+            name = "carrier";
+            version = "1.0.4";
+            src = fetchHex {
+              pkg = "carrier";
+              version = "1.0.4";
+              sha256 =
+                "9ea767fa6dfc35b1b5ebcdf3d737ea741589100573406969cea7579bbb51c0de";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''Elixir library for interacting with
+                            SmartyStreets'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mylanconnolly/carrier";
+            };
+          }
+      ) {};
+
+    carrier = carrier_1_0_4;
+
+    cartographer_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "cartographer";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "cartographer";
+              version = "0.0.1";
+              sha256 =
+                "8f070615ca221b94a22e846303a3b9cc7ae31c2dea5c3d8f39a116f0d8c4b18f";
+            };
+
+            meta = {
+              description = ''Geohash algorithm implementation in Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/afronski/cartographer";
+            };
+          }
+      ) {};
+
+    cartographer = cartographer_0_0_1;
+
+    cassius_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "cassius";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "cassius";
+              version = "0.0.1";
+              sha256 =
+                "3fe26f2b1fceed3c553871dcf954955063e01ab2e2de41d8322e58bd03348c17";
+            };
+
+            meta = {
+              description = ''Monitor linux file system events'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jquadrin/cassius";
+            };
+          }
+      ) {};
+
+    cassius = cassius_0_0_1;
+
+    cauldron_0_1_5 = callPackage
+      (
+        {  buildMix, fetchHex, httprot_0_1_7, reagent_0_1_5 }:
+          buildMix {
+            name = "cauldron";
+            version = "0.1.5";
+            src = fetchHex {
+              pkg = "cauldron";
+              version = "0.1.5";
+              sha256 =
+                "565ee9bb6800512a3c9e8a58951455904c44d8f0ec207e80e20aef9f8cb7d6b1";
+            };
+            beamDeps  = [ httprot_0_1_7 reagent_0_1_5 ];
+
+            meta = {
+              description = ''Web server library written in Elixir'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/meh/cauldron";
+            };
+          }
+      ) {};
+
+    cauldron = cauldron_0_1_5;
+
+    caylir_0_2_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, poolboy_1_5_1, poison_1_5_2, hackney_1_4_8
+        }:
+          buildMix {
+            name = "caylir";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "caylir";
+              version = "0.2.0";
+              sha256 =
+                "b3699171f2bef699ce1968394cb2aee3b5ec7db529a395d8bf7d85163067f888";
+            };
+            beamDeps  = [ poolboy_1_5_1 poison_1_5_2 hackney_1_4_8 ];
+
+            meta = {
+              description = ''Cayley driver for Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/mneudert/caylir";
+            };
+          }
+      ) {};
+
+    caylir = caylir_0_2_0;
+
+    ccc_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ccc";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "ccc";
+              version = "0.0.2";
+              sha256 =
+                "cb976cf81c8497a271d3c6a4b20be4d0e569d5a0db3a60a227e1e8a13ee6abf7";
+            };
+
+            meta = {
+              description = ''Character Code Converter'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Joe-noh/ccc";
+            };
+          }
+      ) {};
+
+    ccc = ccc_0_0_2;
+
+    certifi_0_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "certifi";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "certifi";
+              version = "0.1.1";
+              sha256 =
+                "e6d1dda48fad1b1c5b454c8402e2ac375ae12bf85a9910decaf791f330a7de29";
+            };
+
+            meta = {
+              description = ''An OTP library'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/certifi/erlang-certifi";
+            };
+          }
+      ) {};
+
+    certifi_0_3_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "certifi";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "certifi";
+              version = "0.3.0";
+              sha256 =
+                "42ae85fe91c038a634a5fb8d0c77f4fc581914c508f087c7138e9366a1517f6a";
+            };
+
+            meta = {
+              description = ''An OTP library'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/certifi/erlang-certifi";
+            };
+          }
+      ) {};
+
+    certifi = certifi_0_3_0;
+
+    cesso_0_1_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "cesso";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "cesso";
+              version = "0.1.3";
+              sha256 =
+                "54ba81e0d1358095e00305e48cd3917bc9ee06905bdaab7bc60c7ae3489a6ba7";
+            };
+
+            meta = {
+              description = ''CSV handling library for Elixir.'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/meh/cesso";
+            };
+          }
+      ) {};
+
+    cesso = cesso_0_1_3;
+
+    cet_0_2_2 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          lager_3_0_1,
+          jsx_2_8_0,
+          gen_smtp_0_9_0,
+          cowboy_1_0_4,
+          bstr_0_3_0,
+          bbmustache_1_0_4
+        }:
+          buildRebar3 {
+            name = "cet";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "cet";
+              version = "0.2.2";
+              sha256 =
+                "3da06f36791484576e4b338a2d8b5cfa65fe81ae7ed748aa7df85de0cb3bd2b4";
+            };
+
+            beamDeps  = [
+                          lager_3_0_1
+                          jsx_2_8_0
+                          gen_smtp_0_9_0
+                          cowboy_1_0_4
+                          bstr_0_3_0
+                          bbmustache_1_0_4
+                        ];
+
+            meta = {
+              description = ''Cielo24 Erlang Tools'';
+
+              homepage = "https://github.com/Cielo24/cet";
+            };
+          }
+      ) {};
+
+    cet = cet_0_2_2;
+
+    cf_0_1_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "cf";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "cf";
+              version = "0.1.2";
+              sha256 =
+                "c86f56bca74dd3616057b28574d920973fe665ecb064aa458dc6a2447f3f4924";
+            };
+
+            meta = {
+              description = ''Terminal colour helper'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    cf_0_2_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "cf";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "cf";
+              version = "0.2.1";
+              sha256 =
+                "baee9aa7ec2dfa3cb4486b67211177caa293f876780f0b313b45718edef6a0a5";
+            };
+
+            meta = {
+              description = ''Terminal colour helper'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    cf = cf_0_2_1;
+
+    changex_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "changex";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "changex";
+              version = "0.1.1";
+              sha256 =
+                "e087a4c3cc8eb3e94eba6050c5b1cc24dba3427eb4e4e15cebdb4000582c9851";
+            };
+
+            meta = {
+              description = ''Automatically generate a CHANGELOG.md file based
+                            on git commit history. '';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/Gazler/changex";
+            };
+          }
+      ) {};
+
+    changex = changex_0_1_1;
+
+    chaos_spawn_0_7_0 = callPackage
+      (
+        {  buildMix, fetchHex, timex_0_19_5, exactor_2_2_0 }:
+          buildMix {
+            name = "chaos_spawn";
+            version = "0.7.0";
+            src = fetchHex {
+              pkg = "chaos_spawn";
+              version = "0.7.0";
+              sha256 =
+                "c4c8e985e750706fb4351d6eb036b513a4b7ea3e689a9aecd424251991f21eaa";
+            };
+            beamDeps  = [ timex_0_19_5 exactor_2_2_0 ];
+
+            meta = {
+              longDescription = ''Providing tools to randomly kill proceses.
+                                With the goal of creating robust supevision
+                                trees.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/meadsteve/chaos-spawn";
+            };
+          }
+      ) {};
+
+    chaos_spawn = chaos_spawn_0_7_0;
+
+    charlotte_0_4_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          cowboy_1_0_4,
+          env_conf_0_3_0,
+          uuid_0_1_5,
+          jazz_0_2_1
+        }:
+          buildMix {
+            name = "charlotte";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "charlotte";
+              version = "0.4.0";
+              sha256 =
+                "2c0eb1335922bec0c6bc5e8f3dc4d84192657b708c2558742f676ed430f0950f";
+            };
+            beamDeps  = [ cowboy_1_0_4 env_conf_0_3_0 uuid_0_1_5 jazz_0_2_1
+                      ];
+
+            meta = {
+              longDescription = '' Charlotte is a Web Framework. It takes a
+                                little from Rails and a little from Sinatra and
+                                does a few things it`s own way. The goal is to
+                                be light weight, fun and get out of your way.
+                                defmodule Controller do use
+                                Charlotte.Handlers.HTTP def routes do [
+                                {"/path", :path}, {"/path/:part",
+                                :path_with_part} ] end def path("GET", _params,
+                                conn) do render [message: "hello from path"],
+                                conn end def path(verb, _params, conn) do
+                                respond 405, {"Allowed", "GET"}, "#{verb} not
+                                allowed", conn end end '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/LeakyBucket/charlotte.git";
+            };
+          }
+      ) {};
+
+    charlotte = charlotte_0_4_0;
+
+    charm_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "charm";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "charm";
+              version = "0.0.1";
+              sha256 =
+                "97a05c37c76b2efa5e8bd3c47333e9ebfe4f7c8777540900fcbec70c287bffa7";
+            };
+
+            meta = {
+              description = ''Use ansi terminal characters to write colors and
+                            cursor positions.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tomgco/elixir-charm";
+            };
+          }
+      ) {};
+
+    charm = charm_0_0_1;
+
+    chartkick_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, uuid_1_1_3, poison_1_5_2 }:
+          buildMix {
+            name = "chartkick";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "chartkick";
+              version = "0.0.2";
+              sha256 =
+                "6a4f4170b162117f3be9d0a9d98b63b58da8ec2cea4e29155d14441a0b12ac6c";
+            };
+            beamDeps  = [ uuid_1_1_3 poison_1_5_2 ];
+
+            meta = {    };
+          }
+      ) {};
+
+    chartkick = chartkick_0_0_2;
+
+    chash_0_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "chash";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "chash";
+              version = "0.1.1";
+              sha256 =
+                "607d369e56016a51218c42f2692312cd116834193805c99debbe02889013c84a";
+            };
+
+            meta = {
+              description = ''Riaks CHash implementation'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/project-fifo/chash";
+            };
+          }
+      ) {};
+
+    chash = chash_0_1_1;
+
+    chinese_translation_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1 }:
+          buildMix {
+            name = "chinese_translation";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "chinese_translation";
+              version = "0.1.0";
+              sha256 =
+                "d5e4f59421bad59e465322ce7a8f366179e5f6a732d7e06435e8a7c01f42e7ab";
+            };
+            beamDeps  = [ httpoison_0_8_1 ];
+
+            meta = {
+              longDescription = ''ChineseTranslation provides traditional
+                                chinese <-> simplified chinese translation, as
+                                well as pinyin translation and slugify for
+                                chinese phrases/characters. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tyrchen/chinese_translation";
+            };
+          }
+      ) {};
+
+    chinese_translation = chinese_translation_0_1_0;
+
+    chronos_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "chronos";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "chronos";
+              version = "1.0.0";
+              sha256 =
+                "cfe0087dcf2ab401b3c2c1faa977571f9880f527b54a8c22cda5a8023a8420af";
+            };
+
+            meta = {
+              longDescription = ''An Elixir library for handling dates. It can
+                                be used to quickly determine a date. In a human
+                                readable format.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/nurugger07/chronos";
+            };
+          }
+      ) {};
+
+    chronos_1_5_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "chronos";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "chronos";
+              version = "1.5.1";
+              sha256 =
+                "015d881b1d095b53f626dc32f8db05e5faca8635b199d3cc2022a057c469904b";
+            };
+
+            meta = {
+              longDescription = ''An Elixir library for handling dates. It can
+                                be used to quickly determine a date. In a human
+                                readable format.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/nurugger07/chronos";
+            };
+          }
+      ) {};
+
+    chronos = chronos_1_5_1;
+
+    chunky_svg_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex, xml_builder_0_0_8 }:
+          buildMix {
+            name = "chunky_svg";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "chunky_svg";
+              version = "0.0.4";
+              sha256 =
+                "c8d7212148d72b03b6ed102410017a2cf77987a09fb889320fc381d383e68c75";
+            };
+            beamDeps  = [ xml_builder_0_0_8 ];
+
+            meta = {
+              description = '' A library for drawing things with SVG '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mmmries/chunky_svg";
+            };
+          }
+      ) {};
+
+    chunky_svg = chunky_svg_0_0_4;
+
+    cidr_0_5_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "cidr";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "cidr";
+              version = "0.5.0";
+              sha256 =
+                "876baa94135d058a5ff617c8a072cdb2e5381661eb93b70d07844c0f9e00f38d";
+            };
+
+            meta = {
+              description = ''Classless Inter-Domain Routing (CIDR) for
+                            Elixir'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/c-rack/cidr-elixir";
+            };
+          }
+      ) {};
+
+    cidr = cidr_0_5_0;
+
+    cipher_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "cipher";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "cipher";
+              version = "0.1.0";
+              sha256 =
+                "f70300294a15cc9db597f2c5f2251e87572cf701a6fe4e2981420fc902e640e5";
+            };
+
+            meta = {
+              longDescription = ''Elixir crypto library to encrypt/decrypt
+                                arbitrary binaries. It uses Erlang Crypto, so
+                                it`s not big deal. Mostly a collection of
+                                helpers wrapping it. It allows to use a crypted
+                                key to validate signed requests. The exact same
+                                cipher is implemented for Python, Ruby and
+                                Elixir, so it can be used to integrate apps from
+                                different languages.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rubencaro/cipher";
+            };
+          }
+      ) {};
+
+    cipher = cipher_0_1_0;
+
+    cirru_parser_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "cirru_parser";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "cirru_parser";
+              version = "0.0.1";
+              sha256 =
+                "259f533ee97805c50eb12fa8472b5553eaca5bfd58216d54a734dfa1c4d0c678";
+            };
+
+            meta = {
+              description = ''Cirru Parser in Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Cirru/parser.ex";
+            };
+          }
+      ) {};
+
+    cirru_parser = cirru_parser_0_0_1;
+
+    ckan_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpotion_2_1_0 }:
+          buildMix {
+            name = "ckan";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "ckan";
+              version = "0.0.2";
+              sha256 =
+                "471a58f1d38df7a6ff36af9a1e9d4c6cb9d310c5acb2db95ff3184717d7762a0";
+            };
+            beamDeps  = [ poison_1_5_2 httpotion_2_1_0 ];
+
+            meta = {
+              description = ''A small library for interacting with CKAN
+                            (ckan.org) instances'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/rossjones/ckan_ex";
+            };
+          }
+      ) {};
+
+    ckan = ckan_0_0_2;
+
+    cldr_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "cldr";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "cldr";
+              version = "0.0.1";
+              sha256 =
+                "12e38f1ac12957606db8bd63314d98e40db007ff413de8f2ec94e0520a078201";
+            };
+
+            meta = {
+              description = ''cldr is a library to use information from CLDR
+                            data. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/magicienap/cldr";
+            };
+          }
+      ) {};
+
+    cldr = cldr_0_0_1;
+
+    cleverbot_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_7_5 }:
+          buildMix {
+            name = "cleverbot";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "cleverbot";
+              version = "0.0.1";
+              sha256 =
+                "2a6f1bedbfd03fa0bbceff1134976d720e349cd7551cd5033eadf79f6cea4622";
+            };
+            beamDeps  = [ httpoison_0_7_5 ];
+
+            meta = {
+              description = ''A Cleverbot API wrapper.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/BlakeWilliams/Elixir-Cleverbot";
+            };
+          }
+      ) {};
+
+    cleverbot = cleverbot_0_0_1;
+
+    clint_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, plug_0_11_3, cowboy_1_0_4 }:
+          buildMix {
+            name = "clint";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "clint";
+              version = "0.0.1";
+              sha256 =
+                "41c6781b5f4b986bce14c3578d39c497bcb8427f1d36d8cde5fcaa6e03cae2b1";
+            };
+            beamDeps  = [ plug_0_11_3 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''An Elixir web micro-framework, inspired by
+                            Sinatra'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lpil/clint";
+            };
+          }
+      ) {};
+
+    clint = clint_0_0_1;
+
+    cloak_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, ecto_2_0_0_beta_0 }:
+          buildMix {
+            name = "cloak";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "cloak";
+              version = "0.2.0";
+              sha256 =
+                "8e2455ab420102280719efc86cee7a58d1de358a541cd7d1b49b74fa30fa8fb8";
+            };
+            beamDeps  = [ poison_2_1_0 ecto_2_0_0_beta_0 ];
+
+            meta = {
+              description = ''Encrypted fields for Ecto.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/danielberkompas/cloak";
+            };
+          }
+      ) {};
+
+    cloak = cloak_0_2_0;
+
+    cloudi_core_1_5_1 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          varpool_1_5_1,
+          uuid_erl_1_5_1,
+          trie_1_5_1,
+          syslog_1_0_2,
+          supool_1_5_1,
+          reltool_util_1_5_1,
+          quickrand_1_5_1,
+          pqueue_1_5_1,
+          nodefinder_1_5_1,
+          keys1value_1_5_1,
+          key2value_1_5_1,
+          erlang_term_1_5_1,
+          dynamic_compile_1_0_0,
+          cpg_1_5_1
+        }:
+          buildRebar3 {
+            name = "cloudi_core";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_core";
+              version = "1.5.1";
+              sha256 =
+                "1dd4471c9c5d5b0e8c0ccaff2878e046c430a8b00d59c2c0a41ed29cba1102ba";
+            };
+
+            beamDeps  = [
+                          varpool_1_5_1
+                          uuid_erl_1_5_1
+                          trie_1_5_1
+                          syslog_1_0_2
+                          supool_1_5_1
+                          reltool_util_1_5_1
+                          quickrand_1_5_1
+                          pqueue_1_5_1
+                          nodefinder_1_5_1
+                          keys1value_1_5_1
+                          key2value_1_5_1
+                          erlang_term_1_5_1
+                          dynamic_compile_1_0_0
+                          cpg_1_5_1
+                        ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_core = cloudi_core_1_5_1;
+
+    cloudi_service_api_requests_1_5_1 = callPackage
+      (
+        {
+          buildRebar3, fetchHex, trie_1_5_1, jsx_2_4_0, cloudi_core_1_5_1
+        }:
+          buildRebar3 {
+            name = "cloudi_service_api_requests";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_service_api_requests";
+              version = "1.5.1";
+              sha256 =
+                "3af4a6bb4ef9f428f6044a752cc5c37cd7bf9fdc7d26407044b8c716b40c86f3";
+            };
+
+            beamDeps  = [ trie_1_5_1 jsx_2_4_0 cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework API requests
+                            (JSON-RPC/Erlang-term support)'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_api_requests = cloudi_service_api_requests_1_5_1;
+
+    cloudi_service_db_1_5_1 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          uuid_erl_1_5_1,
+          trie_1_5_1,
+          cloudi_core_1_5_1
+        }:
+          buildRebar3 {
+            name = "cloudi_service_db";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_service_db";
+              version = "1.5.1";
+              sha256 =
+                "067fccc8ca006722021b873995245f498a86582540bf738f6648bdceebd187e9";
+            };
+
+            beamDeps  = [ uuid_erl_1_5_1 trie_1_5_1 cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework Database
+                            (in-memory/testing/generic)'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_db = cloudi_service_db_1_5_1;
+
+    cloudi_service_db_cassandra_1_3_3 = callPackage
+      (
+        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
+          buildRebar3 {
+            name = "cloudi_service_db_cassandra";
+            version = "1.3.3";
+            src = fetchHex {
+              pkg = "cloudi_service_db_cassandra";
+              version = "1.3.3";
+              sha256 =
+                "78c9f924df50466fc3d27ffdd38dd235562be2ba4da5c298c569b3eee2bc10ef";
+            };
+
+            beamDeps  = [ cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework Cassandra
+                            Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_db_cassandra = cloudi_service_db_cassandra_1_3_3;
+
+    cloudi_service_db_cassandra_cql_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
+          buildRebar3 {
+            name = "cloudi_service_db_cassandra_cql";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_service_db_cassandra_cql";
+              version = "1.5.1";
+              sha256 =
+                "09173e571262745de51bb0b53732d909d846c80079ce33b976df7d61584f9ba8";
+            };
+
+            beamDeps  = [ cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework Cassandra CQL
+                            Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_db_cassandra_cql =
+      cloudi_service_db_cassandra_cql_1_5_1;
+
+    cloudi_service_db_couchdb_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
+          buildRebar3 {
+            name = "cloudi_service_db_couchdb";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_service_db_couchdb";
+              version = "1.5.1";
+              sha256 =
+                "c6e97aadacf625549c99a96435e35d0dc971a7d0e7cf5283769e3d7e8ee36812";
+            };
+
+            beamDeps  = [ cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework CouchDB Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_db_couchdb = cloudi_service_db_couchdb_1_5_1;
+
+    cloudi_service_db_elasticsearch_1_3_3 = callPackage
+      (
+        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
+          buildRebar3 {
+            name = "cloudi_service_db_elasticsearch";
+            version = "1.3.3";
+            src = fetchHex {
+              pkg = "cloudi_service_db_elasticsearch";
+              version = "1.3.3";
+              sha256 =
+                "2e4f6c8488ce879235f0548cb15cae6f3bcbb3c0b20e51ab3faad6769220ee12";
+            };
+
+            beamDeps  = [ cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework elasticsearch
+                            Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_db_elasticsearch =
+      cloudi_service_db_elasticsearch_1_3_3;
+
+    cloudi_service_db_http_elli_1_5_1 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          uuid_erl_1_5_1,
+          trie_1_5_1,
+          elli_1_0_4,
+          cowlib_1_0_2,
+          cloudi_core_1_5_1
+        }:
+          buildRebar3 {
+            name = "cloudi_service_db_http_elli";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_service_db_http_elli";
+              version = "1.5.1";
+              sha256 =
+                "f1dde8cbb83773fb0e9ac918ac5c6ffdf3255462d252296b9a23f02e144ea13a";
+            };
+
+            beamDeps  = [
+                          uuid_erl_1_5_1
+                          trie_1_5_1
+                          elli_1_0_4
+                          cowlib_1_0_2
+                          cloudi_core_1_5_1
+                        ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework elli HTTP
+                            Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_db_http_elli = cloudi_service_db_http_elli_1_5_1;
+
+    cloudi_service_db_memcached_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
+          buildRebar3 {
+            name = "cloudi_service_db_memcached";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_service_db_memcached";
+              version = "1.5.1";
+              sha256 =
+                "edcd28714e02d1b875c0c3a754fe230d5247b7b5e10194a74ee4d425fdca0839";
+            };
+
+            beamDeps  = [ cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework memcached
+                            Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_db_memcached = cloudi_service_db_memcached_1_5_1;
+
+    cloudi_service_db_mysql_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
+          buildRebar3 {
+            name = "cloudi_service_db_mysql";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_service_db_mysql";
+              version = "1.5.1";
+              sha256 =
+                "9bb0dec142d903615e0a5e360bd5faae9ceeccf37f1afc705e2a9a402c273a5b";
+            };
+
+            beamDeps  = [ cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework MySQL Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_db_mysql = cloudi_service_db_mysql_1_5_1;
+
+    cloudi_service_db_pgsql_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
+          buildRebar3 {
+            name = "cloudi_service_db_pgsql";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_service_db_pgsql";
+              version = "1.5.1";
+              sha256 =
+                "d7cf7cb44d57e84f68310f0e146bf2c76f0aa42bca0073166c0da79ddd44b70e";
+            };
+
+            beamDeps  = [ cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework PostgreSQL
+                            Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_db_pgsql = cloudi_service_db_pgsql_1_5_1;
+
+    cloudi_service_db_riak_1_3_3 = callPackage
+      (
+        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
+          buildRebar3 {
+            name = "cloudi_service_db_riak";
+            version = "1.3.3";
+            src = fetchHex {
+              pkg = "cloudi_service_db_riak";
+              version = "1.3.3";
+              sha256 =
+                "902b6cb52a077fa47579631c07ca5ee414001b7388aac324b668c902a75de459";
+            };
+
+            beamDeps  = [ cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework Riak Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_db_riak = cloudi_service_db_riak_1_3_3;
+
+    cloudi_service_db_tokyotyrant_1_5_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
+          buildRebar3 {
+            name = "cloudi_service_db_tokyotyrant";
+            version = "1.5.0";
+            src = fetchHex {
+              pkg = "cloudi_service_db_tokyotyrant";
+              version = "1.5.0";
+              sha256 =
+                "553893dfed554b3988e80f6dbc2aa301255941646fe82df57d4bca00ffeb9d1a";
+            };
+
+            beamDeps  = [ cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework Tokyo Tyrant
+                            Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_db_tokyotyrant =
+      cloudi_service_db_tokyotyrant_1_5_0;
+
+    cloudi_service_filesystem_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, cowlib_1_0_2, cloudi_core_1_5_1 }:
+          buildRebar3 {
+            name = "cloudi_service_filesystem";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_service_filesystem";
+              version = "1.5.1";
+              sha256 =
+                "18fa3406bd3a6cafb40cbacd01c16ff32daccf6b4eb45efa6ec351d03f08d4c3";
+            };
+
+            beamDeps  = [ cowlib_1_0_2 cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework Filesystem
+                            Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_filesystem = cloudi_service_filesystem_1_5_1;
+
+    cloudi_service_http_client_1_5_1 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          uuid_erl_1_5_1,
+          trie_1_5_1,
+          cloudi_core_1_5_1
+        }:
+          buildRebar3 {
+            name = "cloudi_service_http_client";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_service_http_client";
+              version = "1.5.1";
+              sha256 =
+                "674be0160e09543e9cddf0286b11d8110514b0db3d18e2f9e097796997b7a7db";
+            };
+
+            beamDeps  = [ uuid_erl_1_5_1 trie_1_5_1 cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework HTTP client
+                            Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_http_client = cloudi_service_http_client_1_5_1;
+
+    cloudi_service_http_cowboy_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, cowboy_1_0_4, cloudi_core_1_5_1 }:
+          buildRebar3 {
+            name = "cloudi_service_http_cowboy";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_service_http_cowboy";
+              version = "1.5.1";
+              sha256 =
+                "e0d07bbcd33bac980b66b7854bb8804433ba4619b6c6a3be63fefa36372b7a4b";
+            };
+
+            beamDeps  = [ cowboy_1_0_4 cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework cowboy HTTP/HTTPS
+                            Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_http_cowboy = cloudi_service_http_cowboy_1_5_1;
+
+    cloudi_service_http_rest_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, trie_1_5_1, cloudi_core_1_5_1 }:
+          buildRebar3 {
+            name = "cloudi_service_http_rest";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_service_http_rest";
+              version = "1.5.1";
+              sha256 =
+                "5f9f51df32defa5d383446431a0029d614732b1377933e0c682ca4556cfe63ce";
+            };
+
+            beamDeps  = [ trie_1_5_1 cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''REST HTTP CloudI Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_http_rest = cloudi_service_http_rest_1_5_1;
+
+    cloudi_service_map_reduce_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
+          buildRebar3 {
+            name = "cloudi_service_map_reduce";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_service_map_reduce";
+              version = "1.5.1";
+              sha256 =
+                "44d31fd7f4e772bce5f508f4eb41d423bbfc347f2d7a4194326085ee5542a61d";
+            };
+
+            beamDeps  = [ cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework Map/Reduce
+                            Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_map_reduce = cloudi_service_map_reduce_1_5_1;
+
+    cloudi_service_monitoring_1_5_1 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          key2value_1_5_1,
+          folsom_0_8_3,
+          cloudi_core_1_5_1
+        }:
+          buildRebar3 {
+            name = "cloudi_service_monitoring";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_service_monitoring";
+              version = "1.5.1";
+              sha256 =
+                "4cb1d89085bba3b30910d8d129dde609cc063f761a736418da0eb9491ee673d5";
+            };
+
+            beamDeps  = [ key2value_1_5_1 folsom_0_8_3 cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''CloudI Monitoring Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_monitoring = cloudi_service_monitoring_1_5_1;
+
+    cloudi_service_queue_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
+          buildRebar3 {
+            name = "cloudi_service_queue";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_service_queue";
+              version = "1.5.1";
+              sha256 =
+                "7fc7a1f0e8a888df2f6b5a2d3c0a7134475ba99f08aeb92244bbbf12e420d4c6";
+            };
+
+            beamDeps  = [ cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework Persistent Queue
+                            Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_queue = cloudi_service_queue_1_5_1;
+
+    cloudi_service_quorum_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
+          buildRebar3 {
+            name = "cloudi_service_quorum";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_service_quorum";
+              version = "1.5.1";
+              sha256 =
+                "2ca5f275073696f6226c7610a3933761d28081ad86d2b7a37dac41b40fe293f9";
+            };
+
+            beamDeps  = [ cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework Quorum Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_quorum = cloudi_service_quorum_1_5_1;
+
+    cloudi_service_router_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
+          buildRebar3 {
+            name = "cloudi_service_router";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_service_router";
+              version = "1.5.1";
+              sha256 =
+                "e37d8f657183ab44fe28f27d02a6a50608c04af8f47872cbd4cb12a19a23b18f";
+            };
+
+            beamDeps  = [ cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework Router Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_router = cloudi_service_router_1_5_1;
+
+    cloudi_service_tcp_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
+          buildRebar3 {
+            name = "cloudi_service_tcp";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_service_tcp";
+              version = "1.5.1";
+              sha256 =
+                "f0be083ef768aa356148f7fa26989139bfc5d8fb6f1119bd31eed06e5ab38469";
+            };
+
+            beamDeps  = [ cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework TCP Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_tcp = cloudi_service_tcp_1_5_1;
+
+    cloudi_service_timers_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
+          buildRebar3 {
+            name = "cloudi_service_timers";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_service_timers";
+              version = "1.5.1";
+              sha256 =
+                "c576fe4725493fd3303945398b0984f339a8b52877bead4deb282e7d0f4bbc64";
+            };
+
+            beamDeps  = [ cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework Timers Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_timers = cloudi_service_timers_1_5_1;
+
+    cloudi_service_udp_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
+          buildRebar3 {
+            name = "cloudi_service_udp";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_service_udp";
+              version = "1.5.1";
+              sha256 =
+                "d2939f6eb8048a0b154463e3ee5ff986a0a5370c97019e5562ee3fbb07b8698b";
+            };
+
+            beamDeps  = [ cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework UDP Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_udp = cloudi_service_udp_1_5_1;
+
+    cloudi_service_validate_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
+          buildRebar3 {
+            name = "cloudi_service_validate";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_service_validate";
+              version = "1.5.1";
+              sha256 =
+                "96712d805bea5f36acbb01c90b46b87532e64a454a7c2b4deb34029508c51c78";
+            };
+
+            beamDeps  = [ cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework Validate Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_validate = cloudi_service_validate_1_5_1;
+
+    cloudi_service_zeromq_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
+          buildRebar3 {
+            name = "cloudi_service_zeromq";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cloudi_service_zeromq";
+              version = "1.5.1";
+              sha256 =
+                "dba08d714d32fc9b50658ef075a13e99285458f73f433fb6f2059afcfb1ce498";
+            };
+
+            beamDeps  = [ cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework ZeroMQ Service'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    cloudi_service_zeromq = cloudi_service_zeromq_1_5_1;
+
+    cloudinary_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_4_0, httpoison_0_8_1 }:
+          buildMix {
+            name = "cloudinary";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "cloudinary";
+              version = "0.0.2";
+              sha256 =
+                "9e32b21717b193f90a526203725811b96294d7c88391e5ad4a57bf178678cc4c";
+            };
+            beamDeps  = [ poison_1_4_0 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Library to upload to Cloudinary'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    cloudinary = cloudinary_0_0_2;
+
+    cloudinaryex_0_0_2 = callPackage
+      (
+        {
+          buildMix, fetchHex, timex_1_0_1, poison_1_5_2, httpoison_0_8_1
+        }:
+          buildMix {
+            name = "cloudinaryex";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "cloudinaryex";
+              version = "0.0.2";
+              sha256 =
+                "31518baacfcca428e30ee8f1c411d76568344e7032ed93cf34535e279c8472fc";
+            };
+            beamDeps  = [ timex_1_0_1 poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''A library for connecting with Cloudinary in
+                            Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/micahwedemeyer/cloudinaryex";
+            };
+          }
+      ) {};
+
+    cloudinaryex = cloudinaryex_0_0_2;
+
+    clox_0_1_3 = callPackage
+      (
+        {  buildMix, fetchHex, timex_0_13_5 }:
+          buildMix {
+            name = "clox";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "clox";
+              version = "0.1.3";
+              sha256 =
+                "a4e9330289479ecffce51346071282d8470612462b40e150d34a27475411f35b";
+            };
+            beamDeps  = [ timex_0_13_5 ];
+
+            meta = {
+              description = ''time series date keys'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/camshaft/clox";
+            };
+          }
+      ) {};
+
+    clox = clox_0_1_3;
+
+    cmark_0_6_8 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "cmark";
+            version = "0.6.8";
+            src = fetchHex {
+              pkg = "cmark";
+              version = "0.6.8";
+              sha256 =
+                "ee148d419684923567be4f413cf82c6f8da2d235e40d434e616febca158372cc";
+            };
+            compilePorts = true;
+
+            meta = {
+              longDescription = ''Elixir NIF for cmark (C), a parser library
+                                following the CommonMark spec, a compatible
+                                implementation of Markdown.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/asaaki/cmark.ex";
+            };
+          }
+      ) {};
+
+    cmark = cmark_0_6_8;
+
+    cobertura_cover_0_9_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "cobertura_cover";
+            version = "0.9.0";
+            src = fetchHex {
+              pkg = "cobertura_cover";
+              version = "0.9.0";
+              sha256 =
+                "870bc4658cacc5c80d13f1206b688925234d2dc4e00278e8a3e72fbbd6bea0b1";
+            };
+
+            meta = {
+              longDescription = ''A plugin for `mix test --cover` that writes a
+                                `coverage.xml` file compatible with Jenkins`
+                                Cobertura plugin. '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/PSPDFKit-labs/cobertura_cover";
+            };
+          }
+      ) {};
+
+    cobertura_cover = cobertura_cover_0_9_0;
+
+    codepagex_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "codepagex";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "codepagex";
+              version = "0.1.2";
+              sha256 =
+                "cb6fbd1ebf1b1748aee9d956fb15115af407db3348efc26bc9d3d637c6441074";
+            };
+
+            meta = {
+              longDescription = ''Codepagex is an elixir library to convert
+                                between string encodings to and from utf-8. Like
+                                iconv, but written in pure Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/tallakt/codepagex";
+            };
+          }
+      ) {};
+
+    codepagex = codepagex_0_1_2;
+
+    coffee_rotor_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex, rotor_0_2_2 }:
+          buildMix {
+            name = "coffee_rotor";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "coffee_rotor";
+              version = "0.2.1";
+              sha256 =
+                "cb2f786c1abf109ed4d86ec175c02cb09adb1f1ee52d7a4ef0c9e65979d4f365";
+            };
+            beamDeps  = [ rotor_0_2_2 ];
+
+            meta = {
+              description = ''A [rotor](https://github.com/HashNuke/rotor) to
+                            compile CoffeeScript files '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/HashNuke/coffee_rotor";
+            };
+          }
+      ) {};
+
+    coffee_rotor = coffee_rotor_0_2_1;
+
+    coinbase_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          timex_0_13_5,
+          poison_1_3_1,
+          inflex_1_0_0,
+          httpoison_0_7_5,
+          dotenv_0_0_4
+        }:
+          buildMix {
+            name = "coinbase";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "coinbase";
+              version = "0.0.1";
+              sha256 =
+                "c7d59d239f219623765a596dc61a678a527d19fd0110db1ea09ab937d0df9bcc";
+            };
+            beamDeps  = [
+                          timex_0_13_5
+                          poison_1_3_1
+                          inflex_1_0_0
+                          httpoison_0_7_5
+                          dotenv_0_0_4
+                        ];
+
+            meta = {
+              description = ''Coinbase API for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gregpardo/coinbase-elixir";
+            };
+          }
+      ) {};
+
+    coinbase = coinbase_0_0_1;
+
+    colixir_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "colixir";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "colixir";
+              version = "0.0.1";
+              sha256 =
+                "38dc49351419c6fcfdb76bbc785e07c3acf83cc29f632719dd601ecadbfb73b8";
+            };
+
+            meta = {
+              description = ''Colixir creates colorized text for terminal
+                            output'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/mondok/colixir";
+            };
+          }
+      ) {};
+
+    colixir = colixir_0_0_1;
+
+    color_stream_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "color_stream";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "color_stream";
+              version = "0.0.2";
+              sha256 =
+                "b1181f32b310311016006f4f8d52b3418d1af6f06e71903daabafdcaa602a29d";
+            };
+
+            meta = {
+              description = ''Generate random colors that are fairly spaced out
+                            and look nice.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/code-lever/color-stream-elixir";
+            };
+          }
+      ) {};
+
+    color_stream = color_stream_0_0_2;
+
+    color_utils_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "color_utils";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "color_utils";
+              version = "0.2.0";
+              sha256 =
+                "bf16a1a9de7d837a68ede139c6e06bc9d57f9eccedff302f730105bd80d98647";
+            };
+
+            meta = {
+              description = ''A Color Util library for Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/barakyo/color_utils";
+            };
+          }
+      ) {};
+
+    color_utils = color_utils_0_2_0;
+
+    colorful_0_6_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "colorful";
+            version = "0.6.0";
+            src = fetchHex {
+              pkg = "colorful";
+              version = "0.6.0";
+              sha256 =
+                "6b00225f137efdde7901d3ddc7626a3b33031c20ea145097b2442680e72adc3d";
+            };
+
+            meta = {
+              description = ''Modules which manage colors'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Joe-noh/colorful";
+            };
+          }
+      ) {};
+
+    colorful = colorful_0_6_0;
+
+    colorize_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "colorize";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "colorize";
+              version = "0.2.0";
+              sha256 =
+                "d43757bae49d6da310d641cf7ec809bdc0b6a9eb40fb7ac4c57c1dbbb7d4e32e";
+            };
+
+            meta = {
+              description = ''Colorize your text in the console'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/shiroyasha/colorize";
+            };
+          }
+      ) {};
+
+    colorize = colorize_0_2_0;
+
+    colors_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "colors";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "colors";
+              version = "1.0.1";
+              sha256 =
+                "960aa874a3cbbf4356c64ef8194d5215c8373537a720fc0ab46c90400ecf8949";
+            };
+
+            meta = {
+              description = ''a colors util'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/lidashuang/colors";
+            };
+          }
+      ) {};
+
+    colors = colors_1_0_1;
+
+    combination_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "combination";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "combination";
+              version = "0.0.2";
+              sha256 =
+                "f3e4934d2077d161e4ec8c6e54a2c4b6b39d8189a1434866ca3e2afedd38be04";
+            };
+
+            meta = {
+              description = ''Elixir library computing simple combination and
+                            permutation on Enumerables.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/seantanly/elixir-combination";
+            };
+          }
+      ) {};
+
+    combination = combination_0_0_2;
+
+    combine_0_7_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "combine";
+            version = "0.7.0";
+            src = fetchHex {
+              pkg = "combine";
+              version = "0.7.0";
+              sha256 =
+                "3ac1b6622e6149204899c7069b850a53ed38d1a749cc7357aeffe86e8bfc593c";
+            };
+
+            meta = {
+              description = ''A parser combinator library for Elixir
+                            projects.'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    combine = combine_0_7_0;
+
+    comeonin_1_6_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, comeonin_i18n_0_1_3 }:
+          buildRebar3 {
+            name = "comeonin";
+            version = "1.6.0";
+            src = fetchHex {
+              pkg = "comeonin";
+              version = "1.6.0";
+              sha256 =
+                "40dd0da2c33696d19515888fd86b9ffdcad92d49e9a6b3b13df98e824897a1b1";
+            };
+            compilePorts = true;
+            beamDeps  = [ comeonin_i18n_0_1_3 ];
+
+            meta = {
+              description = ''Password hashing (bcrypt, pbkdf2_sha512) library
+                            for Elixir.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/elixircnx/comeonin";
+            };
+          }
+      ) {};
+
+    comeonin_2_0_3 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "comeonin";
+            version = "2.0.3";
+            src = fetchHex {
+              pkg = "comeonin";
+              version = "2.0.3";
+              sha256 =
+                "a9a6f87107ebf6898adeca7130adb1b9e421c1be7e8b30b13ac1e0354ea15198";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''Password hashing (bcrypt, pbkdf2_sha512) library
+                            for Elixir.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/elixircnx/comeonin";
+            };
+          }
+      ) {};
+
+    comeonin_2_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "comeonin";
+            version = "2.1.1";
+            src = fetchHex {
+              pkg = "comeonin";
+              version = "2.1.1";
+              sha256 =
+                "7f85774ae5d453f664d0e7809cc1ab32ff22855d16ff6a2edd68c6d36cb1a1aa";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''Password hashing (bcrypt, pbkdf2_sha512) library
+                            for Elixir.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/elixircnx/comeonin";
+            };
+          }
+      ) {};
+
+    comeonin = comeonin_2_1_1;
+
+    comeonin_ecto_password_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, ecto_1_1_3, comeonin_2_1_1 }:
+          buildMix {
+            name = "comeonin_ecto_password";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "comeonin_ecto_password";
+              version = "0.0.3";
+              sha256 =
+                "44c8dbf5b81fca515b91422fddb240c5d714bc81bc0d59b3ca60300edb3f856b";
+            };
+            beamDeps  = [ ecto_1_1_3 comeonin_2_1_1 ];
+
+            meta = {
+              description = ''Ecto custom type for storing encrypted password
+                            using Comonin'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/vic/comeonin_ecto_password";
+            };
+          }
+      ) {};
+
+    comeonin_ecto_password = comeonin_ecto_password_0_0_3;
+
+    comeonin_i18n_0_1_3 = callPackage
+      (
+        {  buildMix, fetchHex, gettext_0_10_0 }:
+          buildMix {
+            name = "comeonin_i18n";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "comeonin_i18n";
+              version = "0.1.3";
+              sha256 =
+                "4b45ca5af3cbf20bf7d3f7e874629041a2a921ad5a62ca9b94546a1e559023a6";
+            };
+            beamDeps  = [ gettext_0_10_0 ];
+
+            meta = {
+              description = ''Internationalization support for the Comeonin
+                            password hashing library.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/elixircnx/comeonin_i18n";
+            };
+          }
+      ) {};
+
+    comeonin_i18n = comeonin_i18n_0_1_3;
+
+    commerce_billing_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          mock_0_1_1,
+          jazz_0_2_1,
+          httpoison_0_8_1,
+          ex_doc_0_11_4
+        }:
+          buildMix {
+            name = "commerce_billing";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "commerce_billing";
+              version = "0.0.2";
+              sha256 =
+                "6bb751f496011b974cb8d536b079eb7dfaeee4be827e4cf2fe0585e10f26bd04";
+            };
+            beamDeps  = [ mock_0_1_1 jazz_0_2_1 httpoison_0_8_1 ex_doc_0_11_4
+                      ];
+
+            meta = {
+              description = ''Credit card processing library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/joshnuss/commerce_billing";
+            };
+          }
+      ) {};
+
+    commerce_billing = commerce_billing_0_0_2;
+
+    complex_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, exprintf_0_1_6, earmark_0_2_1 }:
+          buildMix {
+            name = "complex";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "complex";
+              version = "0.2.0";
+              sha256 =
+                "6db6a2850ed907c4d9e062591110dc70c35c3818ccf609f1268052a3f4bf10b0";
+            };
+            beamDeps  = [ exprintf_0_1_6 earmark_0_2_1 ];
+
+            meta = {
+              description = ''Complex is a library for types and mathematical
+                            functions for complex numbers.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/twist-vector/elixir-complex.git";
+            };
+          }
+      ) {};
+
+    complex = complex_0_2_0;
+
+    con_cache_0_11_0 = callPackage
+      (
+        {  buildMix, fetchHex, exactor_2_2_0 }:
+          buildMix {
+            name = "con_cache";
+            version = "0.11.0";
+            src = fetchHex {
+              pkg = "con_cache";
+              version = "0.11.0";
+              sha256 =
+                "cd6d3dd4f6900520e3975592e1bbb57ac217e15f1f350f5bcba0c63578cb0a49";
+            };
+            beamDeps  = [ exactor_2_2_0 ];
+
+            meta = {
+              longDescription = ''ETS based key-value storage with support for
+                                row-level isolated writes, TTL auto-purge, and
+                                modification callbacks.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sasa1977/con_cache";
+            };
+          }
+      ) {};
+
+    con_cache = con_cache_0_11_0;
+
+    con_cache_0_9_0 = callPackage
+      (
+        {  buildMix, fetchHex, exactor_2_2_0 }:
+          buildMix {
+            name = "con_cache";
+            version = "0.9.0";
+            src = fetchHex {
+              pkg = "con_cache";
+              version = "0.9.0";
+              sha256 =
+                "600b122653d7e5f6414bb0728fa6133c656e2d24fad7f0a31bb89c1c70ec68bb";
+            };
+            beamDeps  = [ exactor_2_2_0 ];
+
+            meta = {
+              longDescription = ''ETS based key-value storage with support for
+                                row-level isolated writes, TTL auto-purge, and
+                                modification callbacks.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sasa1977/con_cache";
+            };
+          }
+      ) {};
+
+    conferl_0_0_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "conferl";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "conferl";
+              version = "0.0.1";
+              sha256 =
+                "402ff3b66ff98ada2b537e2d9d329f4f6f32230c39d7a3be150cf72b7525f801";
+            };
+
+            meta = {
+              description = ''Auto-Conference Service in Erlang (similar to
+                            Disqus)'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/inaka/conferl";
+            };
+          }
+      ) {};
+
+    conferl = conferl_0_0_1;
+
+    configparser_ex_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "configparser_ex";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "configparser_ex";
+              version = "0.2.0";
+              sha256 =
+                "acc487b8671b8fadba6bf5694115c23e04c9754cb226f371f17dc7588687d8ac";
+            };
+
+            meta = {
+              description = ''A module that parses INI-like files. Not unlike
+                            Python configparser package.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/easco/configparser_ex";
+            };
+          }
+      ) {};
+
+    configparser_ex = configparser_ex_0_2_0;
+
+    conform_0_13_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "conform";
+            version = "0.13.0";
+            src = fetchHex {
+              pkg = "conform";
+              version = "0.13.0";
+              sha256 =
+                "72bc5f0e55d15f8387892b664c30e969e3584e8da15d6b5d45caac4d84ee1165";
+            };
+
+            meta = {
+              description = ''Easy release configuration for Elixir apps.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitwalker/conform";
+            };
+          }
+      ) {};
+
+    conform_0_16_0 = callPackage
+      (
+        {  buildMix, fetchHex, neotoma_1_7_3 }:
+          buildMix {
+            name = "conform";
+            version = "0.16.0";
+            src = fetchHex {
+              pkg = "conform";
+              version = "0.16.0";
+              sha256 =
+                "4d510e428fe05d7b505cefca66359bb4700aa7b68189624f5ba4cd1c22b5bf1a";
+            };
+            beamDeps  = [ neotoma_1_7_3 ];
+
+            meta = {
+              description = ''Easy release configuration for Elixir apps.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitwalker/conform";
+            };
+          }
+      ) {};
+
+    conform_1_0_0_rc8 = callPackage
+      (
+        {  buildMix, fetchHex, neotoma_1_7_3 }:
+          buildMix {
+            name = "conform";
+            version = "1.0.0-rc8";
+            src = fetchHex {
+              pkg = "conform";
+              version = "1.0.0-rc8";
+              sha256 =
+                "0177ab7eaf0f66372df9aadd1d4e198e205b76f561be0e26f6a52ca6adcadf80";
+            };
+            beamDeps  = [ neotoma_1_7_3 ];
+
+            meta = {
+              description = ''Easy release configuration for Elixir apps.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitwalker/conform";
+            };
+          }
+      ) {};
+
+    conform = conform_1_0_0_rc8;
+
+    conform_exrm_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex, exrm_1_0_0_rc8, conform_1_0_0_rc8 }:
+          buildMix {
+            name = "conform_exrm";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "conform_exrm";
+              version = "0.3.0";
+              sha256 =
+                "52baf48678b29b8986bc325877489679b597633457397d078782262ee444808e";
+            };
+            beamDeps  = [ exrm_1_0_0_rc8 conform_1_0_0_rc8 ];
+
+            meta = {
+              description = ''Conform plugin for ExRM'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitwalker/conform_exrm";
+            };
+          }
+      ) {};
+
+    conform_exrm = conform_exrm_0_3_0;
+
+    connection_1_0_0_rc_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "connection";
+            version = "1.0.0-rc.1";
+            src = fetchHex {
+              pkg = "connection";
+              version = "1.0.0-rc.1";
+              sha256 =
+                "915a998f7bf30013611bf3cfc778b0d8ff163a968bd7604e7021aca272136a48";
+            };
+
+            meta = {
+              description = ''Connection behaviour for connection processes'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/fishcakez/connection";
+            };
+          }
+      ) {};
+
+    connection_1_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "connection";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "connection";
+              version = "1.0.2";
+              sha256 =
+                "b4ffd56c0ad3caac8dc6125a007e416ba2dab54a1d4b380766bb9e87c56120fb";
+            };
+
+            meta = {
+              description = ''Connection behaviour for connection processes'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/fishcakez/connection";
+            };
+          }
+      ) {};
+
+    connection = connection_1_0_2;
+
+    conqueuer_0_5_1 = callPackage
+      (
+        {  buildMix, fetchHex, poolboy_1_5_1, inflex_1_5_0 }:
+          buildMix {
+            name = "conqueuer";
+            version = "0.5.1";
+            src = fetchHex {
+              pkg = "conqueuer";
+              version = "0.5.1";
+              sha256 =
+                "7370e2a0201f73ced6b202877b4dcb6872e1b6bbb0c024b1edee3a058dd653ab";
+            };
+            beamDeps  = [ poolboy_1_5_1 inflex_1_5_0 ];
+
+            meta = {
+              description = ''An Elixir in memory work queue.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/midas/conqueuer";
+            };
+          }
+      ) {};
+
+    conqueuer = conqueuer_0_5_1;
+
+    console_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "console";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "console";
+              version = "0.0.1";
+              sha256 =
+                "55e0635d7fdde35a04694e646a01b161c142b4d814a97ed8a373fd42af35c955";
+            };
+
+            meta = {
+
+              homepage = "https://github.com/matteosister/console";
+            };
+          }
+      ) {};
+
+    console = console_0_0_1;
+
+    consul_1_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_7_5, exjsx_3_2_0 }:
+          buildMix {
+            name = "consul";
+            version = "1.0.3";
+            src = fetchHex {
+              pkg = "consul";
+              version = "1.0.3";
+              sha256 =
+                "80d5836e4cbe686bff535634e719e0892455b03e77bcde149fb221c80fdb1a52";
+            };
+            beamDeps  = [ httpoison_0_7_5 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''An Elixir client for Consul`s HTTP API '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/undeadlabs/consul-ex";
+            };
+          }
+      ) {};
+
+    consul = consul_1_0_3;
+
+    control_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "control";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "control";
+              version = "0.0.4";
+              sha256 =
+                "c806da1d82614a27f876aea5d222edb1cdb52d883553ada03f1ff79c09c024d9";
+            };
+
+            meta = {
+              description = ''An exploratory look into functors, applicatives,
+                            and monads for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/slogsdon/elixir-control";
+            };
+          }
+      ) {};
+
+    control = control_0_0_4;
+
+    convertat_1_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "convertat";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "convertat";
+              version = "1.1.0";
+              sha256 =
+                "603229c43df6769f2166c78c5c3f31316390bf6e19fa8e15f02026170ab51a79";
+            };
+
+            meta = {
+              description = ''Provides functions for converting from and to
+                            arbitrary bases. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/whatyouhide/convertat";
+            };
+          }
+      ) {};
+
+    convertat = convertat_1_1_0;
+
+    core_0_14_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "core";
+            version = "0.14.1";
+            src = fetchHex {
+              pkg = "core";
+              version = "0.14.1";
+              sha256 =
+                "142c14544ce688b4527abeadfb3bf249678caaec1a3f3d11cb4927695f19ff33";
+            };
+
+            meta = {
+              description = ''Library for selective receive OTP processes'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/fishcakez/core";
+            };
+          }
+      ) {};
+
+    core = core_0_14_1;
+
+    core_data_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, floki_0_1_1 }:
+          buildMix {
+            name = "core_data";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "core_data";
+              version = "0.1.0";
+              sha256 =
+                "09b308a42f0697053c68f253e7f687c0f6b5f96bb1b114a7b1852c5b6804122e";
+            };
+            beamDeps  = [ floki_0_1_1 ];
+
+            meta = {
+              description = ''iOS Core Data parser'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/evolet-project/core_data";
+            };
+          }
+      ) {};
+
+    core_data = core_data_0_1_0;
+
+    cors_plug_1_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "cors_plug";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "cors_plug";
+              version = "1.1.0";
+              sha256 =
+                "b6ae0bf0c8a993d7f94f7061774e70403726b2ffe5d648964b72d6f42fd71979";
+            };
+            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+
+            meta = {
+              longDescription = ''An elixir plug that adds CORS headers to
+                                requests and responds to preflight requests
+                                (OPTIONS)'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "http://github.com/mschae/cors_plug";
+            };
+          }
+      ) {};
+
+    cors_plug = cors_plug_1_1_0;
+
+    corsica_0_4_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "corsica";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "corsica";
+              version = "0.4.0";
+              sha256 =
+                "9f5e7c6b3e6b52f9b07d76f207fbe39273d9cb22099b6b3d83621ded29fb42d6";
+            };
+            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Plug-based swiss-army knife for CORS requests.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/whatyouhide/corsica";
+            };
+          }
+      ) {};
+
+    corsica = corsica_0_4_0;
+
+    couch_factory_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "couch_factory";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "couch_factory";
+              version = "0.1.1";
+              sha256 =
+                "79b2e2c48bf6b036f959ff70c14b0d4da767e4bca7efae8f6c758eefab1a28d5";
+            };
+
+            meta = {
+              description = ''Factory Girl implementation with CouchDb
+                            persistence.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/javierg/couch_factory";
+            };
+          }
+      ) {};
+
+    couch_factory = couch_factory_0_1_1;
+
+    couchbeam_1_2_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, jsx_2_8_0, hackney_1_4_4 }:
+          buildRebar3 {
+            name = "couchbeam";
+            version = "1.2.1";
+            src = fetchHex {
+              pkg = "couchbeam";
+              version = "1.2.1";
+              sha256 =
+                "ed19f0412aa0539ecf622ac8ade1ca0e316f424e3334ad015a3fb8db19e91194";
+            };
+
+            beamDeps  = [ jsx_2_8_0 hackney_1_4_4 ];
+
+            meta = {
+              description = ''Erlang CouchDB client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/benoitc/couchbeam";
+            };
+          }
+      ) {};
+
+    couchbeam = couchbeam_1_2_1;
+
+    couchdb_client_0_2_5 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_7_5,
+          ex_doc_0_11_4,
+          earmark_0_2_1
+        }:
+          buildMix {
+            name = "couchdb_client";
+            version = "0.2.5";
+            src = fetchHex {
+              pkg = "couchdb_client";
+              version = "0.2.5";
+              sha256 =
+                "243c2fde196762dd6b664d3a91d111ac70336b22d91ca9aafc7c778e61ccb496";
+            };
+            beamDeps  = [
+                          poison_1_5_2
+                          httpoison_0_7_5
+                          ex_doc_0_11_4
+                          earmark_0_2_1
+                        ];
+
+            meta = {
+              description = ''A partial yet functional CouchDB client, with
+                            attachment support.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gutschilla/elixir-couchdb-client";
+            };
+          }
+      ) {};
+
+    couchdb_client = couchdb_client_0_2_5;
+
+    couchdb_connector_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "couchdb_connector";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "couchdb_connector";
+              version = "0.2.0";
+              sha256 =
+                "05ac95c3f08038c3f17c03be5f27922b919513dfd4582f2da150f70182dac01b";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              longDescription = ''A connector for CouchDB, the Erlang-based,
+                                JSON document database. The connector does not
+                                implement the protocols defined in Ecto.
+                                Reasons: CouchDB does not support transactions
+                                as known in the world of ACID compliant,
+                                relational databases. The concept of migrations
+                                also does not apply to CouchDB. And since
+                                CouchDB does not implement an SQL dialect, the
+                                decision was taken to not follow the standards
+                                established by Ecto. The connector offers
+                                `create`, `update` and `read` operations through
+                                its Writer and Reader modules. Basic support for
+                                view operations is provided by the View
+                                module.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/locolupo/couchdb_connector";
+            };
+          }
+      ) {};
+
+    couchdb_connector = couchdb_connector_0_2_0;
+
+    count_buffer_0_1_5 = callPackage
+      (
+        {  buildMix, fetchHex, pool_ring_0_1_5 }:
+          buildMix {
+            name = "count_buffer";
+            version = "0.1.5";
+            src = fetchHex {
+              pkg = "count_buffer";
+              version = "0.1.5";
+              sha256 =
+                "6e78dc0458dac8dae9d41d7857c7185b3164cecd9992a1407265ebfa3455544e";
+            };
+            beamDeps  = [ pool_ring_0_1_5 ];
+
+            meta = {
+              description = ''buffer a large set of counters and flush
+                            periodically'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/camshaft/count_buffer";
+            };
+          }
+      ) {};
+
+    count_buffer = count_buffer_0_1_5;
+
+    countries_1_1_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "countries";
+            version = "1.1.2";
+            src = fetchHex {
+              pkg = "countries";
+              version = "1.1.2";
+              sha256 =
+                "8420314185aed4152340dcab3f8643d9c312610e2c065ee8709d8a097285149c";
+            };
+
+            meta = {
+              longDescription = ''Countries is a collection of all sorts of
+                                useful information for every country in the [ISO
+                                3166](https://de.wikipedia.org/wiki/ISO_3166)
+                                standard. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/SebastianSzturo/countries";
+            };
+          }
+      ) {};
+
+    countries = countries_1_1_2;
+
+    coverex_1_4_8 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "coverex";
+            version = "1.4.8";
+            src = fetchHex {
+              pkg = "coverex";
+              version = "1.4.8";
+              sha256 =
+                "47f03bd9d00b22893fda81273c310d30d96e849026f5c1d0ad664089c875bac6";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              longDescription = ''Coverex is an Elixir Coverage tool used by
+                                mix. It provides tables with overviews of module
+                                and function coverage data, includings links to
+                                annotated source code files and supports
+                                coveralls.io.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/alfert/coverex";
+            };
+          }
+      ) {};
+
+    coverex = coverex_1_4_8;
+
+    cowboy_1_0_4 = callPackage
+      (
+        {  buildRebar3, fetchHex, cowlib_1_0_2, ranch_1_2_1 }:
+          buildRebar3 {
+            name = "cowboy";
+            version = "1.0.4";
+            src = fetchHex {
+              pkg = "cowboy";
+              version = "1.0.4";
+              sha256 =
+                "6a0edee96885fae3a8dd0ac1f333538a42e807db638a9453064ccfdaa6b9fdac";
+            };
+
+            beamDeps  = [ cowlib_1_0_2 ranch_1_2_1 ];
+
+            meta = {
+              description = ''Small, fast, modular HTTP server written in
+                            Erlang.'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/ninenines/cowboy";
+            };
+          }
+      ) {};
+
+    cowboy = cowboy_1_0_4;
+
+    cowboy_oauth_0_2_14 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          oauth2_erlang_0_6_1,
+          libsnarl_0_3_40,
+          lager_2_1_1,
+          jsxd_0_1_10,
+          jsx_1_4_5,
+          erlydtl2_0_11_1,
+          cowboy_1_0_4
+        }:
+          buildRebar3 {
+            name = "cowboy_oauth";
+            version = "0.2.14";
+            src = fetchHex {
+              pkg = "cowboy_oauth";
+              version = "0.2.14";
+              sha256 =
+                "fc6b3da2a53d8527a08f6427745c85eb3b2da1e90de1a3fe290d4193ac4e5b09";
+            };
+
+            beamDeps  = [
+                          oauth2_erlang_0_6_1
+                          libsnarl_0_3_40
+                          lager_2_1_1
+                          jsxd_0_1_10
+                          jsx_1_4_5
+                          erlydtl2_0_11_1
+                          cowboy_1_0_4
+                        ];
+
+            meta = {
+              description = ''OAuth2 endpoints for cowboy and snarl.'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/project-fifo/cowboy_oauth";
+            };
+          }
+      ) {};
+
+    cowboy_oauth = cowboy_oauth_0_2_14;
+
+    cowgirl_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "cowgirl";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "cowgirl";
+              version = "0.0.1";
+              sha256 =
+                "3b06ca6bb82fa3674ddad182cc479d9ab1538b83a4cf616c666e0d6f873c44e5";
+            };
+
+            meta = {
+              description = ''Small, fast, modular HTTP server written in
+                            Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/larrylv/cowgirl";
+            };
+          }
+      ) {};
+
+    cowgirl = cowgirl_0_0_1;
+
+    cowlib_1_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "cowlib";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "cowlib";
+              version = "1.0.0";
+              sha256 =
+                "4dacd60356177ec8cf93dbff399de17435b613f3318202614d3d5acbccee1474";
+            };
+
+            meta = {
+              description = ''Support library for manipulating Web
+                            protocols.'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/ninenines/cowlib";
+            };
+          }
+      ) {};
+
+    cowlib_1_0_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "cowlib";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "cowlib";
+              version = "1.0.2";
+              sha256 =
+                "db622da03aa039e6366ab953e31186cc8190d32905e33788a1acb22744e6abd2";
+            };
+
+            meta = {
+              description = ''Support library for manipulating Web
+                            protocols.'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/ninenines/cowlib";
+            };
+          }
+      ) {};
+
+    cowlib_1_3_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "cowlib";
+            version = "1.3.0";
+            src = fetchHex {
+              pkg = "cowlib";
+              version = "1.3.0";
+              sha256 =
+                "2b1ac020ec92e7a59cb7322779870c2d3adc7c904ecb3b9fa406f04dc9816b73";
+            };
+
+            meta = {
+              description = ''Support library for manipulating Web
+                            protocols.'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/ninenines/cowlib";
+            };
+          }
+      ) {};
+
+    cowlib = cowlib_1_3_0;
+
+    cowsay_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "cowsay";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "cowsay";
+              version = "0.0.1";
+              sha256 =
+                "9f8a6634710974787751279b22ef5d7cb3c6a74db42636540ae5db37c4632e2a";
+            };
+
+            meta = {
+              description = ''A cow-friend who will speak your mind'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bbrock25/cowsay";
+            };
+          }
+      ) {};
+
+    cowsay = cowsay_0_0_1;
+
+    cpg_1_5_1 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          trie_1_5_1,
+          reltool_util_1_5_1,
+          quickrand_1_5_1
+        }:
+          buildRebar3 {
+            name = "cpg";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "cpg";
+              version = "1.5.1";
+              sha256 =
+                "3bd7b7c48a0f959985d7038d6c533ee5540d12b8adfa6693409f4f6f492f4b45";
+            };
+
+            beamDeps  = [ trie_1_5_1 reltool_util_1_5_1 quickrand_1_5_1 ];
+
+            meta = {
+              description = ''CloudI Process Groups'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/cpg";
+            };
+          }
+      ) {};
+
+    cpg = cpg_1_5_1;
+
+    cqex_0_1_4 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "cqex";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "cqex";
+              version = "0.1.4";
+              sha256 =
+                "3c6a461605cc7e664178e6343cb585aa8c453831bb4447519007fcfe39697328";
+            };
+
+            meta = {
+              description = ''Idiomatic Elixir client for Cassandra.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/matehat/cqex";
+            };
+          }
+      ) {};
+
+    cqex = cqex_0_1_4;
+
+    craterl_0_2_3 = callPackage
+      (
+        {  buildRebar3, fetchHex, jsx_2_7_1, hackney_1_3_1 }:
+          buildRebar3 {
+            name = "craterl";
+            version = "0.2.3";
+            src = fetchHex {
+              pkg = "craterl";
+              version = "0.2.3";
+              sha256 =
+                "bbbfa254fa5834d144f9061fff03035eca9a50b5e7581ce342c495b91af02929";
+            };
+
+            beamDeps  = [ jsx_2_7_1 hackney_1_3_1 ];
+
+            meta = {
+              description = ''erlang client for crate'';
+
+            };
+          }
+      ) {};
+
+    craterl = craterl_0_2_3;
+
+    crc_0_3_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "crc";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "crc";
+              version = "0.3.0";
+              sha256 =
+                "23d7cb6a18cca461f46f5a0f341c74fd0a680cdae62460687f1a24f0a7faabd4";
+            };
+
+            meta = {
+              description = ''A library used to calculate CRC checksums for
+                            binary data'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/TattdCodeMonkey/crc";
+            };
+          }
+      ) {};
+
+    crc = crc_0_3_0;
+
+    credit_card_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "credit_card";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "credit_card";
+              version = "1.0.0";
+              sha256 =
+                "c7dee15035f4ff925f08bc806c4bd1817209c64d8ba089d0731808ee35e97ba0";
+            };
+
+            meta = {
+              description = ''A library for validating credit card numbers'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/abakhi/credit_card";
+            };
+          }
+      ) {};
+
+    credit_card = credit_card_1_0_0;
+
+    credo_0_1_10 = callPackage
+      (
+        {  buildMix, fetchHex, bunt_0_1_5 }:
+          buildMix {
+            name = "credo";
+            version = "0.1.10";
+            src = fetchHex {
+              pkg = "credo";
+              version = "0.1.10";
+              sha256 =
+                "2a52a3fc144bc5c70899381a58de603eb14751f4965dfea1866b20324b9806c0";
+            };
+            beamDeps  = [ bunt_0_1_5 ];
+
+            meta = {
+              longDescription = ''A static code analysis tool for the Elixir
+                                language with a focus on code consistency and
+                                teaching.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rrrene/credo";
+            };
+          }
+      ) {};
+
+    credo_0_3_3 = callPackage
+      (
+        {  buildMix, fetchHex, bunt_0_1_5 }:
+          buildMix {
+            name = "credo";
+            version = "0.3.3";
+            src = fetchHex {
+              pkg = "credo";
+              version = "0.3.3";
+              sha256 =
+                "9cf7816093412e31bad13f08f6713ed935312d3a0d489edc76187c21e01a6afe";
+            };
+            beamDeps  = [ bunt_0_1_5 ];
+
+            meta = {
+              longDescription = ''A static code analysis tool for the Elixir
+                                language with a focus on code consistency and
+                                teaching.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rrrene/credo";
+            };
+          }
+      ) {};
+
+    credo = credo_0_3_3;
+
+    croma_0_3_8 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "croma";
+            version = "0.3.8";
+            src = fetchHex {
+              pkg = "croma";
+              version = "0.3.8";
+              sha256 =
+                "48735ed0a450c2101a884f14fba5d5946d27601426de220e2327feffb5cc2cca";
+            };
+
+            meta = {
+              description = ''Elixir macro utilities'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    croma = croma_0_3_8;
+
+    crudex_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, plug_auth_0_2_0 }:
+          buildMix {
+            name = "crudex";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "crudex";
+              version = "0.0.2";
+              sha256 =
+                "2ccf07c728dbb328b9f869a87465c8ba647931ec68f563c4ddea99ec76fa4364";
+            };
+            beamDeps  = [ plug_auth_0_2_0 ];
+
+            meta = {
+              description = ''A glue keeping Phoenix and Ecto together'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/briksoftware/crudex";
+            };
+          }
+      ) {};
+
+    crudex = crudex_0_0_2;
+
+    crutches_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "crutches";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "crutches";
+              version = "1.0.0";
+              sha256 =
+                "cfd97962a22fe30820e6ca6d0671c763232a7edf149aa11bd62ee77dff0ffff0";
+            };
+
+            meta = {
+              description = ''An Elixir toolbelt freely inspired from Ruby`s
+                            ActiveSupport'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mykewould/crutches";
+            };
+          }
+      ) {};
+
+    crutches = crutches_1_0_0;
+
+    cryptex_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "cryptex";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "cryptex";
+              version = "0.0.1";
+              sha256 =
+                "19d709c6ffbda3c74ec811190d168170db0435720cbe788c0233bea4afee1d16";
+            };
+
+            meta = {
+              description = ''An Elixir library for encrypting/decrypting,
+                            signing/verifying data. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/scrogson/cryptex";
+            };
+          }
+      ) {};
+
+    cryptex = cryptex_0_0_1;
+
+    crypto_ext_0_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "crypto_ext";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "crypto_ext";
+              version = "0.1.1";
+              sha256 =
+                "19715a35b392c557cc9503e2aa1f8fbd1dcd3cdcb11a0d2f73a3fe75f4db76b8";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''Crypto lib extension to support AES 128 ECB
+                            cipher'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/adrienmo/crypto_ext";
+            };
+          }
+      ) {};
+
+    crypto_ext = crypto_ext_0_1_1;
+
+    crypto_rsassa_pss_1_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "crypto_rsassa_pss";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "crypto_rsassa_pss";
+              version = "1.0.0";
+              sha256 =
+                "d8f48874dbef940a8954126249499714e702d8ae0a8f23230a6c2f4a92833313";
+            };
+
+            meta = {
+              description = ''RSASSA-PSS Public Key Cryptographic Signature
+                            Algorithm for Erlang'';
+              license = stdenv.lib.licenses.mpl20;
+              homepage =
+                "https://github.com/potatosalad/erlang-crypto_rsassa_pss";
+            };
+          }
+      ) {};
+
+    crypto_rsassa_pss = crypto_rsassa_pss_1_0_0;
+
+    cspex_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, exactor_2_2_0 }:
+          buildMix {
+            name = "cspex";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "cspex";
+              version = "1.0.0";
+              sha256 =
+                "f5df9923dd4250444a3e9f5f49fa76398c0b1415d468047b9a83ef5480348646";
+            };
+            beamDeps  = [ exactor_2_2_0 ];
+
+            meta = {
+              description = ''A library that brings all the CSP joy to the
+                            Elixir land.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/vidalraphael/cspex";
+            };
+          }
+      ) {};
+
+    cspex = cspex_1_0_0;
+
+    csv_1_2_4 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "csv";
+            version = "1.2.4";
+            src = fetchHex {
+              pkg = "csv";
+              version = "1.2.4";
+              sha256 =
+                "66fee1eaf536347d493942cb5e085321c51e80de124ff00f4b2651870b919b99";
+            };
+
+            meta = {
+              description = ''CSV Decoding and Encoding for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/beatrichartz/csv";
+            };
+          }
+      ) {};
+
+    csv = csv_1_2_4;
+
+    csvlixir_2_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "csvlixir";
+            version = "2.0.2";
+            src = fetchHex {
+              pkg = "csvlixir";
+              version = "2.0.2";
+              sha256 =
+                "f1e4ca61af3004a66efbe5d02486519a5d6c3610b9d5404352dbf6cd8ec593ec";
+            };
+
+            meta = {
+              longDescription = ''CSVLixir is a CSV reader/writer for Elixir.
+                                It operates on files and strings. The reader can
+                                read CSV files or CSV strings. Reading from
+                                files returns a stream of lists. Reading from
+                                strings returns a list of lists. The writer
+                                transforms a (possibly lazy) list of lists into
+                                a stream of CSV strings. It can also take a
+                                single list and return a single CSV string.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/jimm/csvlixir";
+            };
+          }
+      ) {};
+
+    csvlixir = csvlixir_2_0_2;
+
+    cth_readable_1_2_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, cf_0_2_1 }:
+          buildRebar3 {
+            name = "cth_readable";
+            version = "1.2.1";
+            src = fetchHex {
+              pkg = "cth_readable";
+              version = "1.2.1";
+              sha256 =
+                "923ae5bd8a044695a3223cc6539126e69f91aff89bb924ccf38da9ee615d6492";
+            };
+
+            beamDeps  = [ cf_0_2_1 ];
+
+            meta = {
+              description = ''Common Test hooks for more readable logs'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/ferd/cth_readable";
+            };
+          }
+      ) {};
+
+    cth_readable = cth_readable_1_2_1;
+
+    cuckoo_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, murmur_1_0_0 }:
+          buildMix {
+            name = "cuckoo";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "cuckoo";
+              version = "1.0.0";
+              sha256 =
+                "18f31763c50c20bb89e1fbc4b9eb5b97f6ffc23e3a90ba4cf5e97ccd96da8df2";
+            };
+            beamDeps  = [ murmur_1_0_0 ];
+
+            meta = {
+              description = ''Cuckoo is a pure Elixir implementation of Cuckoo
+                            Filters.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gmcabrita/cuckoo";
+            };
+          }
+      ) {};
+
+    cuckoo = cuckoo_1_0_0;
+
+    cucumberl_0_0_6 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "cucumberl";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "cucumberl";
+              version = "0.0.6";
+              sha256 =
+                "3b9ea813997fd8c1e3d2b004e89288496dc21d2e5027f432e5900569d2c61cf3";
+            };
+
+            meta = {
+              description = ''A pure-erlang implementation of Cucumber.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ericbmerritt/cucumberl";
+            };
+          }
+      ) {};
+
+    cucumberl = cucumberl_0_0_6;
+
+    cuid_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "cuid";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "cuid";
+              version = "0.1.0";
+              sha256 =
+                "80cd46bd323e05b706c60008368e631b559307b554c0acc54292ab2c73a3340b";
+            };
+
+            meta = {
+              description = ''Generate collision-resistant ids, in Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/duailibe/cuid";
+            };
+          }
+      ) {};
+
+    cuid = cuid_0_1_0;
+
+    cure_0_4_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "cure";
+            version = "0.4.1";
+            src = fetchHex {
+              pkg = "cure";
+              version = "0.4.1";
+              sha256 =
+                "92ac6e2dfed6a955cdfedc6860fb84ec968400902b27dfd068e49ff82277932b";
+            };
+
+            meta = {
+              longDescription = ''Interfaces Elixir with C/C++ code in a
+                                user-friendly way! Based on Erlang-ports.
+                                Provides a few Mix-tasks to kickstart the
+                                development process.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Primordus/Cure.git";
+            };
+          }
+      ) {};
+
+    cure = cure_0_4_1;
+
+    current_streak_ex_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1, floki_0_7_1 }:
+          buildMix {
+            name = "current_streak_ex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "current_streak_ex";
+              version = "0.1.0";
+              sha256 =
+                "08b846b7347fa134d845e0654b4775eba78e995675f18ec51533e7e42aa3abaa";
+            };
+            beamDeps  = [ httpoison_0_8_1 floki_0_7_1 ];
+
+            meta = {
+              description = ''Get github current streak which support only
+                            public repositories.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/KazuCocoa/current_streak_ex";
+            };
+          }
+      ) {};
+
+    current_streak_ex = current_streak_ex_0_1_0;
+
+    current_user_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "current_user";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "current_user";
+              version = "0.0.1";
+              sha256 =
+                "8a400d8cbd02da89bccf67a357733b682e0d6d4c421b7230405ac16b1988809c";
+            };
+
+            meta = {
+              description = ''Configurable user authentication for Phoenix'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/halogenandtoast/current_user";
+            };
+          }
+      ) {};
+
+    current_user = current_user_0_0_1;
+
+    currently_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "currently";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "currently";
+              version = "0.0.3";
+              sha256 =
+                "50d7f8e0c6eb1dd4f434cd50c7447eb8f9e3d4c413161948df7363c41bf90ec1";
+            };
+
+            meta = {
+              description = ''Currently is a tool to display cards currently
+                            assigns on Trello '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/chatgris/currently";
+            };
+          }
+      ) {};
+
+    currently = currently_0_0_3;
+
+    curry_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "curry";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "curry";
+              version = "0.0.1";
+              sha256 =
+                "e8f56fee1cb82ae2616c36021d4dd8c2b4169490e224dea84f63feb47475d6f0";
+            };
+
+            meta = {
+              description = ''A simple currying macro allowing to define
+                            curried functions in Elixir modules.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/niahoo/elixir-curry";
+            };
+          }
+      ) {};
+
+    curry = curry_0_0_1;
+
+    curtail_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "curtail";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "curtail";
+              version = "0.1.0";
+              sha256 =
+                "0d43f4bcecf91c935a89cd52af62efa62e264b4c82a07e29e9945988735fdc1f";
+            };
+
+            meta = {
+              description = ''HTML-safe string truncation.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/seankay/curtail";
+            };
+          }
+      ) {};
+
+    curtail = curtail_0_1_0;
+
+    curtains_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_0_3 }:
+          buildMix {
+            name = "curtains";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "curtains";
+              version = "0.0.1";
+              sha256 =
+                "d547bd024049630fd072994a759befaab908fa69f5e200b2b584e12f12e9842f";
+            };
+            beamDeps  = [ plug_1_0_3 ];
+
+            meta = {
+              longDescription = ''Curtains is a Elixir package that "takes
+                                over" your Elixir website by returning content
+                                of a specified file (if it exists). This makes
+                                it perfect for "Under construction" and
+                                "Maintenance" pages. At it`s heart, it`s just a
+                                Plug.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/fteem/curtains";
+            };
+          }
+      ) {};
+
+    curtains = curtains_0_0_1;
+
+    cushion_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, httpotion_2_1_0 }:
+          buildMix {
+            name = "cushion";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "cushion";
+              version = "0.0.3";
+              sha256 =
+                "1371ab210bd3b7ef7381dbe3f53fedb8afbbb0c562f45d614e4849373919482b";
+            };
+            beamDeps  = [ httpotion_2_1_0 ];
+
+            meta = {
+              longDescription = ''A really simple Buffer API client for sending
+                                updates. Right now it only supports sending text
+                                updates, but hopefully will support more in the
+                                future.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ryanbillingsley/cushion";
+            };
+          }
+      ) {};
+
+    cushion = cushion_0_0_3;
+
+    custom_base_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "custom_base";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "custom_base";
+              version = "0.1.0";
+              sha256 =
+                "3a75d9cabcad3936e9194d387966213cb13a4d14b7b69f2cea0fc22ff2f76726";
+            };
+
+            meta = {
+              description = ''Allow you to make custom base conversion in
+                            Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/igas/custom_base";
+            };
+          }
+      ) {};
+
+    custom_base_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "custom_base";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "custom_base";
+              version = "0.2.0";
+              sha256 =
+                "d7c26409eb22b00d69f591fd89cc4e84550656862c655c7ae3edf63f7381899b";
+            };
+
+            meta = {
+              description = ''Allow you to make custom base conversion in
+                            Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/igas/custom_base";
+            };
+          }
+      ) {};
+
+    custom_base = custom_base_0_2_0;
+
+    cuttlefish_2_0_7 = callPackage
+      (
+        {  buildRebar3, fetchHex, lager_3_0_2, getopt_0_8_2 }:
+          buildRebar3 {
+            name = "cuttlefish";
+            version = "2.0.7";
+            src = fetchHex {
+              pkg = "cuttlefish";
+              version = "2.0.7";
+              sha256 =
+                "57589747ba40a75c53872002cd251a2933102457cdcc99b8ed72823ba1288869";
+            };
+
+            beamDeps  = [ lager_3_0_2 getopt_0_8_2 ];
+
+            meta = {
+              description = ''cuttlefish configuration abstraction'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/tsloughter/cuttlefish";
+            };
+          }
+      ) {};
+
+    cuttlefish = cuttlefish_2_0_7;
+
+    cypher_query_0_0_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "cypher_query";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "cypher_query";
+              version = "0.0.1";
+              sha256 =
+                "068bee4f13275d3448a4676bf113d5b2e414b47a9f84bb6e1614a009104c3f30";
+            };
+
+            meta = {
+              description = ''A dumb string-based query builder for neo4j
+                            Cypher queries'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/collin/cypher_query";
+            };
+          }
+      ) {};
+
+    cypher_query = cypher_query_0_0_1;
+
+    database_url_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "database_url";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "database_url";
+              version = "0.1.0";
+              sha256 =
+                "273c8c926761d5716fee17c8a8494583d729a4419e30479a292eb6cea3d9a756";
+            };
+
+            meta = {
+              description = ''Parse database URL and renturn keyword list for
+                            use with Ecto.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/s-m-i-t-a/database_url";
+            };
+          }
+      ) {};
+
+    database_url = database_url_0_1_0;
+
+    datomex_0_0_5 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_1,
+          ex_doc_0_6_2,
+          erldn_1_0_5
+        }:
+          buildMix {
+            name = "datomex";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "datomex";
+              version = "0.0.5";
+              sha256 =
+                "bb2a5171a5d7783e40776db7fe7a6bff73ff69a4da4205c83b39c26ff73488c0";
+            };
+            beamDeps  = [
+                          poison_1_5_2 httpoison_0_8_1 ex_doc_0_6_2 erldn_1_0_5
+                        ];
+
+            meta = {
+              description = ''Low level Elixir driver for the Datomic Database.
+                            '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edubkendo/datomex";
+            };
+          }
+      ) {};
+
+    datomex = datomex_0_0_5;
+
+    datomic_gen_server_1_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, exdn_2_1_2 }:
+          buildMix {
+            name = "datomic_gen_server";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "datomic_gen_server";
+              version = "1.1.0";
+              sha256 =
+                "c5369270fa9a21544efc359e80eff4b24d5dfbe869c211da0df6ebf216afa5a3";
+            };
+            beamDeps  = [ exdn_2_1_2 ];
+
+            meta = {
+              longDescription = ''An Elixir GenServer that communicates with a
+                                Clojure Datomic peer running in the JVM, using
+                                clojure-erlastic.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/psfblair/datomic_gen_server";
+            };
+          }
+      ) {};
+
+    datomic_gen_server = datomic_gen_server_1_1_0;
+
+    db_0_9_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "db";
+            version = "0.9.0";
+            src = fetchHex {
+              pkg = "db";
+              version = "0.9.0";
+              sha256 =
+                "23d0307bc227782b1c0c86bb5b66130312cf3eb4363f3f39d5b1fc84140b3a91";
+            };
+
+            meta = {
+              description = ''Banking Database'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/spawnproc/db";
+            };
+          }
+      ) {};
+
+    db = db_0_9_0;
+
+    db_connection_0_2_3 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          sbroker_0_7_0,
+          poolboy_1_5_1,
+          connection_1_0_2
+        }:
+          buildMix {
+            name = "db_connection";
+            version = "0.2.3";
+            src = fetchHex {
+              pkg = "db_connection";
+              version = "0.2.3";
+              sha256 =
+                "16a1e0a968b3610fd482f64266411bde554515572c2b184af493d749ef206fca";
+            };
+            beamDeps  = [ sbroker_0_7_0 poolboy_1_5_1 connection_1_0_2 ];
+
+            meta = {
+              description = ''Database connection behaviour for database
+                            transactions and connection pooling'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/fishcakez/db_connection";
+            };
+          }
+      ) {};
+
+    db_connection = db_connection_0_2_3;
+
+    dbg_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "dbg";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "dbg";
+              version = "1.0.1";
+              sha256 =
+                "866159f496a1ad9b959501f16db3d1338bb6cef029a75a67ca5615d25b38345f";
+            };
+
+            meta = {
+              description = ''Distributed tracing'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/fishcakez/dbg";
+            };
+          }
+      ) {};
+
+    dbg = dbg_1_0_1;
+
+    dbus_0_4_0 = callPackage
+      (
+        {  buildMix, fetchHex, poolboy_1_5_1, eredis_1_0_8 }:
+          buildMix {
+            name = "dbus";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "dbus";
+              version = "0.4.0";
+              sha256 =
+                "d743b06a73286622af4a9390c4a16dcc5bce6be184ed660cfd76bd2f0b8ebedb";
+            };
+            beamDeps  = [ poolboy_1_5_1 eredis_1_0_8 ];
+
+            meta = {
+              description = ''A native erlang implementation of D-Bus'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/lizenn/erlang-dbus";
+            };
+          }
+      ) {};
+
+    dbus = dbus_0_4_0;
+
+    ddb_client_0_1_17 = callPackage
+      (
+        {  buildRebar3, fetchHex, mmath_0_1_15, dproto_0_1_12 }:
+          buildRebar3 {
+            name = "ddb_client";
+            version = "0.1.17";
+            src = fetchHex {
+              pkg = "ddb_client";
+              version = "0.1.17";
+              sha256 =
+                "8a65ef0f4e1edb2c575f8c8b38b4fed51ea94fd6c6ec39cc464a66dab45e0892";
+            };
+
+            beamDeps  = [ mmath_0_1_15 dproto_0_1_12 ];
+
+            meta = {
+              description = ''DalmatinerDB client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dalmatinerdb/ddb_client";
+            };
+          }
+      ) {};
+
+    ddb_client = ddb_client_0_1_17;
+
+    dealer_0_8_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "dealer";
+            version = "0.8.0";
+            src = fetchHex {
+              pkg = "dealer";
+              version = "0.8.0";
+              sha256 =
+                "c8c72d38e1cff6a181a6b6f627fb6fd5998279827519e598eb28bcef2be721ee";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''An API Client for Stockfighter.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/larrylv/dealer";
+            };
+          }
+      ) {};
+
+    dealer = dealer_0_8_0;
+
+    decimal_0_2_5 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "decimal";
+            version = "0.2.5";
+            src = fetchHex {
+              pkg = "decimal";
+              version = "0.2.5";
+              sha256 =
+                "2e2d871c68fea7cc86eb20826cdb6fccec1b6b242bae46d958806e598dc3c947";
+            };
+
+            meta = {
+              description = ''Arbitrary precision decimal arithmetic for
+                            Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/ericmj/decimal";
+            };
+          }
+      ) {};
+
+    decimal_1_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "decimal";
+            version = "1.1.1";
+            src = fetchHex {
+              pkg = "decimal";
+              version = "1.1.1";
+              sha256 =
+                "c73f361389c2221e2fda0e2ba63c6de88d1545b00ddc0b4d5885202ccc34c568";
+            };
+
+            meta = {
+              description = ''Arbitrary precision decimal arithmetic for
+                            Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/ericmj/decimal";
+            };
+          }
+      ) {};
+
+    decimal = decimal_1_1_1;
+
+    decks_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "decks";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "decks";
+              version = "0.0.1";
+              sha256 =
+                "de75b96c66f23c365935949ec53efab1f2f5d187803c26d733dd3b2df535af7d";
+            };
+
+            meta = {
+              description = ''Implements standard card decks for Elixir-based
+                            card games.'';
+
+            };
+          }
+      ) {};
+
+    decks = decks_0_0_1;
+
+    decoction_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "decoction";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "decoction";
+              version = "0.0.1";
+              sha256 =
+                "cdf7ad35cdf87962e153bb56d9c68f8dd061469d58cae8923cbdcd2980d7adc0";
+            };
+
+            meta = {
+              description = ''Decoction is a static site generator written in
+                            Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/aarvay/decoction";
+            };
+          }
+      ) {};
+
+    decoction = decoction_0_0_1;
+
+    defmemo_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "defmemo";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "defmemo";
+              version = "0.1.1";
+              sha256 =
+                "8fefc49ff64b06fdb1ee15292419c16919a7a3c6b8e5cac6afd7a13919715e0f";
+            };
+
+            meta = {
+              description = '' A memoization macro (defmemo) for elixir using a
+                            genserver backing store. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/os6sense/DefMemo";
+            };
+          }
+      ) {};
+
+    defmemo = defmemo_0_1_1;
+
+    delayed_otp_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "delayed_otp";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "delayed_otp";
+              version = "0.0.2";
+              sha256 =
+                "22fe457d78fe1f216dcfca8c84431ac1f31e93267fdd563a5ca86c8289e2620f";
+            };
+
+            meta = {
+              longDescription = ''Delay death of supervisor children or
+                                gen_server : for instance Erlang supervisor with
+                                exponential backoff restart strategy.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/awetzel/delayed_otp";
+            };
+          }
+      ) {};
+
+    delayed_otp = delayed_otp_0_0_2;
+
+    delegate_behaviour_0_1_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "delegate_behaviour";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "delegate_behaviour";
+              version = "0.1.3";
+              sha256 =
+                "15b335b5c30072ce8e0845eeb8116397ef357efbfbc64b59b6c113b96520e9c5";
+            };
+
+            meta = {
+              description = ''Macros to define modules that delegate to
+                            concrete implementations of behaviours'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    delegate_behaviour = delegate_behaviour_0_1_3;
+
+    demacro_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "demacro";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "demacro";
+              version = "0.0.1";
+              sha256 =
+                "e2a83d48f6b3e03764baf2e149dd5420e632d0d4daa77c5226697a3755a89d16";
+            };
+             meta = {    };
+          }
+      ) {};
+
+    demacro = demacro_0_0_1;
+
+    denrei_0_2_3 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "denrei";
+            version = "0.2.3";
+            src = fetchHex {
+              pkg = "denrei";
+              version = "0.2.3";
+              sha256 =
+                "bc0e8cf7e085dda6027df83ef5d63c41b93988bcd7f3db7c68e4dad3cd599744";
+            };
+
+            meta = {
+              description = ''Denrei - a lightweight Erlang messaging
+                            system.'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    denrei = denrei_0_2_3;
+
+    descriptive_statistics_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "descriptive_statistics";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "descriptive_statistics";
+              version = "0.0.1";
+              sha256 =
+                "52004394a60aa8b7df57dda43591de6187a34a31ef64b0a4eecd140a647e2050";
+            };
+
+            meta = {
+              longDescription = ''Descriptive Statistics is a library that
+                                allows you to compute simple descriptive
+                                statistics in Elixir. Inspired by
+                                https://github.com/thirtysixthspan/descriptive_statistics.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pusewicz/descriptive_statistics";
+            };
+          }
+      ) {};
+
+    descriptive_statistics = descriptive_statistics_0_0_1;
+
+    detergent_0_3_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "detergent";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "detergent";
+              version = "0.3.0";
+              sha256 =
+                "510cfb5d35b4b344762f074b73c8696b4bdde654ea046b3365cf92760ae33362";
+            };
+
+            meta = {
+              description = ''An emulsifying Erlang SOAP library'';
+              license = with stdenv.lib.licenses; [ unlicense bsd3 ];
+              homepage = "https://github.com/devinus/detergent";
+            };
+          }
+      ) {};
+
+    detergent = detergent_0_3_0;
+
+    detergentex_0_0_7 = callPackage
+      (
+        {  buildMix, fetchHex, detergent_0_3_0 }:
+          buildMix {
+            name = "detergentex";
+            version = "0.0.7";
+            src = fetchHex {
+              pkg = "detergentex";
+              version = "0.0.7";
+              sha256 =
+                "6bb1bc2fe9228f97e512ef012c473ed822263dc38c3dbaa727fcd111ce1c4771";
+            };
+            beamDeps  = [ detergent_0_3_0 ];
+
+            meta = {
+              description = ''Elixir binding to Detergent erlang library used
+                            to call WSDL SOAP Services'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/r-icarus/detergentex";
+            };
+          }
+      ) {};
+
+    detergentex = detergentex_0_0_7;
+
+    dexts_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "dexts";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "dexts";
+              version = "0.2.1";
+              sha256 =
+                "9e5cfb3c4546b2f40713b7176556dfd5a839d77b6953ddaf9f06054a5c827ca4";
+            };
+
+            meta = {
+              description = ''dets wrapper for Elixir'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/meh/dexts";
+            };
+          }
+      ) {};
+
+    dexts = dexts_0_2_1;
+
+    dflow_0_1_5 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "dflow";
+            version = "0.1.5";
+            src = fetchHex {
+              pkg = "dflow";
+              version = "0.1.5";
+              sha256 =
+                "f08e73f22d4c620ef5f358a0b40f8fe3b91219ca3922fbdbe7e42f1cb58f737e";
+            };
+
+            meta = {
+              description = ''Pipelined flow processing engine'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dalmatinerdb/dflow";
+            };
+          }
+      ) {};
+
+    dflow = dflow_0_1_5;
+
+    di_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_1 }:
+          buildMix {
+            name = "di";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "di";
+              version = "0.1.0";
+              sha256 =
+                "d7a89568c986c98399667faeb618d5cc42a89965717e758323aa5370d1547260";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Elixir wrapper for DI.FM'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/JoshuaThompson/di";
+            };
+          }
+      ) {};
+
+    di = di_0_1_0;
+
+    dialyxir_0_3_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "dialyxir";
+            version = "0.3.3";
+            src = fetchHex {
+              pkg = "dialyxir";
+              version = "0.3.3";
+              sha256 =
+                "8851d7c582ce9db43b0564f026b2f6a461df62e139a7891fde50f9b6a7fc496c";
+            };
+
+            meta = {
+              description = ''Mix tasks to simplify use of Dialyzer in Elixir
+                            projects.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/jeremyjh/dialyxir";
+            };
+          }
+      ) {};
+
+    dialyxir = dialyxir_0_3_3;
+
+    dialyze_0_1_4 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "dialyze";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "dialyze";
+              version = "0.1.4";
+              sha256 =
+                "af9d6c37d8c067aaee959d4e1701e045e011906217c9f772218a3abaa92e4505";
+            };
+
+            meta = {
+              description = ''Dialyzer Mix task'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/fishcakez/dialyze";
+            };
+          }
+      ) {};
+
+    dialyze_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "dialyze";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "dialyze";
+              version = "0.2.0";
+              sha256 =
+                "05efe534da3b6d0a89cb655f3dc7cf3a99088b0832c5a75a9898a6241ff01cd2";
+            };
+
+            meta = {
+              description = ''Dialyzer Mix task'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/fishcakez/dialyze";
+            };
+          }
+      ) {};
+
+    dialyze = dialyze_0_2_0;
+
+    diane_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, sweet_xml_0_4_0 }:
+          buildMix {
+            name = "diane";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "diane";
+              version = "0.0.1";
+              sha256 =
+                "cb4a9984aab545f376d32f13b4ab612ba32a603781ddd743658d9c3991a4a89d";
+            };
+            beamDeps  = [ sweet_xml_0_4_0 ];
+
+            meta = {
+              description = ''RSS/Atom parser for Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/ptrckbrwn/diane";
+            };
+          }
+      ) {};
+
+    diane = diane_0_0_1;
+
+    dice_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "dice";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "dice";
+              version = "0.0.1";
+              sha256 =
+                "975795636d6374bf120669cdbd6008a64bdd193a2ff202ffbdeefaa03d11bb9c";
+            };
+
+            meta = {
+              description = ''Library and CLI app for rolling dice '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/stocks29/dice";
+            };
+          }
+      ) {};
+
+    dice = dice_0_0_1;
+
+    dice_roller_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "dice_roller";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "dice_roller";
+              version = "1.0.1";
+              sha256 =
+                "a9c4b9a85dc7d26a78ff1dcc58aee9e6bcc9df473531b032d95e6cd6e2402679";
+            };
+
+            meta = {
+               license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/KevinGreene/DiceRoller";
+            };
+          }
+      ) {};
+
+    dice_roller = dice_roller_1_0_1;
+
+    dicer_0_8_0 = callPackage
+      (
+        {  buildMix, fetchHex, sfmt_0_12_2 }:
+          buildMix {
+            name = "dicer";
+            version = "0.8.0";
+            src = fetchHex {
+              pkg = "dicer";
+              version = "0.8.0";
+              sha256 =
+                "834e5d3f4cd9afac655e0f27869ecfdf6fa4ea061ad9ededdc6f295f71325960";
+            };
+            beamDeps  = [ sfmt_0_12_2 ];
+
+            meta = {
+              description = ''Elixir library to calculate dice rolls. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/olhado/dicer";
+            };
+          }
+      ) {};
+
+    dicer = dicer_0_8_0;
+
+    dicks_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_7_5, exjsx_3_1_0 }:
+          buildMix {
+            name = "dicks";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "dicks";
+              version = "0.1.0";
+              sha256 =
+                "66d1a93ad1753361f2fc82033805a5f4c03ff295c78123e497f1ec56b9815be3";
+            };
+            beamDeps  = [ httpoison_0_7_5 exjsx_3_1_0 ];
+
+            meta = {
+              longDescription = ''An Elixir client for the Dick As A Service
+                                platform http://dicks-api.herokuapp.com '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Annwenn/DicksEx";
+            };
+          }
+      ) {};
+
+    dicks = dicks_0_1_0;
+
+    dicon_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "dicon";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "dicon";
+              version = "0.2.0";
+              sha256 =
+                "7da0fb146e81f34a6112594c88682c89b8cdf0ab9ccdaa92547399c283f2f98f";
+            };
+
+            meta = {
+              description = ''Simple release deliverer for Elixir'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/lexmag/dicon";
+            };
+          }
+      ) {};
+
+    dicon = dicon_0_2_0;
+
+    difficult_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, ex_doc_0_11_4, earmark_0_2_1 }:
+          buildMix {
+            name = "difficult";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "difficult";
+              version = "0.0.2";
+              sha256 =
+                "5e47c31935cd81082942ac4515c24cad2630ef024e27c5e9cde96f60a93cc39b";
+            };
+            beamDeps  = [ ex_doc_0_11_4 earmark_0_2_1 ];
+
+            meta = {
+              description = ''Difficult, but computable functions'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/massn/Difficult";
+            };
+          }
+      ) {};
+
+    difficult = difficult_0_0_2;
+
+    digoc_0_3_3 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_3_1, httpoison_0_8_1 }:
+          buildMix {
+            name = "digoc";
+            version = "0.3.3";
+            src = fetchHex {
+              pkg = "digoc";
+              version = "0.3.3";
+              sha256 =
+                "23d5c2f1b977b1f3e12567879a20bc211898efdfcac9a0b6802324bc42ea0605";
+            };
+            beamDeps  = [ poison_1_3_1 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''An Elixir client for the Digital Ocean API v2.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/kevinmontuori/digoc";
+            };
+          }
+      ) {};
+
+    digoc = digoc_0_3_3;
+
+    dir_walker_0_0_6 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "dir_walker";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "dir_walker";
+              version = "0.0.6";
+              sha256 =
+                "5bf891b970cca8df7d6e7d94857c508d2f5b48c615903427edbcbc483358fc92";
+            };
+
+            meta = {
+              longDescription = ''DirWalker lazily traverses one or more
+                                directory trees, depth first, returning
+                                successive file names. Initialize the walker
+                                using {:ok, walker} = DirWalker.start_link(path)
+                                # or [path, path...] Then return the next `n`
+                                path names using paths = DirWalker.next(walker
+                                <, n \ 1>) Successive calls to `next` will
+                                return successive file names, until all file
+                                names have been returned. These methods have
+                                also been wrapped into a Stream resource. paths
+                                = DirWalker.stream(path) # or [path,path...] '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/pragdave/dir_walker";
+            };
+          }
+      ) {};
+
+    dir_walker = dir_walker_0_0_6;
+
+    discount_0_7_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "discount";
+            version = "0.7.0";
+            src = fetchHex {
+              pkg = "discount";
+              version = "0.7.0";
+              sha256 =
+                "a37b7890620f93aa2fae06eee364cd906991588bc8897e659f51634179519c97";
+            };
+
+            meta = {
+              description = ''Elixir NIF for discount, a Markdown parser'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/asaaki/discount.ex";
+            };
+          }
+      ) {};
+
+    discount = discount_0_7_0;
+
+    discovery_0_5_7 = callPackage
+      (
+        {  buildMix, fetchHex, hash_ring_ex_1_1_2, consul_1_0_3 }:
+          buildMix {
+            name = "discovery";
+            version = "0.5.7";
+            src = fetchHex {
+              pkg = "discovery";
+              version = "0.5.7";
+              sha256 =
+                "e252044547397e53c52809d5b76070f302e243992c4cbfa233fc4fa44927ccc8";
+            };
+            beamDeps  = [ hash_ring_ex_1_1_2 consul_1_0_3 ];
+
+            meta = {
+              description = ''An OTP application for auto-discovering services
+                            with Consul '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/undeadlabs/discovery";
+            };
+          }
+      ) {};
+
+    discovery = discovery_0_5_7;
+
+    dismake_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "dismake";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "dismake";
+              version = "1.0.0";
+              sha256 =
+                "7eeff4a362ed4b4250e4090caa6861ee7b27a524919f574b9f836067b63ac058";
+            };
+
+            meta = {
+              description = ''Dismake is a "compiler" (as in Mix.compilers)
+                            that just runs make. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jarednorman/dismake";
+            };
+          }
+      ) {};
+
+    dismake = dismake_1_0_0;
+
+    distance_api_matrix_1_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "distance_api_matrix";
+            version = "1.0.3";
+            src = fetchHex {
+              pkg = "distance_api_matrix";
+              version = "1.0.3";
+              sha256 =
+                "e4b6848481f4c8f5f15ad1c9f116816a3941f7c96df37fbad350faffc7887a6a";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Google Distance Matrix API Library for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/C404/distance-api-matrix";
+            };
+          }
+      ) {};
+
+    distance_api_matrix = distance_api_matrix_1_0_3;
+
+    distancex_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2 }:
+          buildMix {
+            name = "distancex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "distancex";
+              version = "0.1.0";
+              sha256 =
+                "62d78de83026d809dc93c1ea92452cffc6e905f157e9dfa25cbc51b44e54d6f4";
+            };
+            beamDeps  = [ poison_1_5_2 ];
+
+            meta = {
+              longDescription = ''Elixir-wrapper for Google Directions API. Can
+                                return the drive time and driving distance
+                                between two places.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/vysakh0/distancex";
+            };
+          }
+      ) {};
+
+    distancex = distancex_0_1_0;
+
+    diver_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "diver";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "diver";
+              version = "0.1.1";
+              sha256 =
+                "6860e05da87741be919e0b4264178e0ca1b50a108bcaeb1a2a51c9e1726d3079";
+            };
+
+            meta = {
+              longDescription = ''A HBase driver for Erlang/Elixir using
+                                jinterface and the Asynchbase Java client to
+                                query the database. '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/novabyte/diver";
+            };
+          }
+      ) {};
+
+    diver = diver_0_1_1;
+
+    dlist_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "dlist";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "dlist";
+              version = "0.0.1";
+              sha256 =
+                "51c9d4a9e02c9a8892450876939d1e18b7f9ae78b237a683f0efad47d46e5f9a";
+            };
+
+            meta = {
+              description = ''Deque implementations '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/stocks29/dlist.git";
+            };
+          }
+      ) {};
+
+    dlist = dlist_0_0_1;
+
+    dns_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "dns";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "dns";
+              version = "0.0.3";
+              sha256 =
+                "60f4ff5a01cf95bbeb7b407712bcf833092280f6cc0c34ab09d2c0415fcb842e";
+            };
+
+            meta = {
+              longDescription = ''DNS library for Elixir. Currently, the
+                                package provides: - Elixir structs to interface
+                                with `inet_dns` module. - DNS.Server behavior -
+                                DNS.Client Note: the `inet_dns` module is
+                                considered internal to Erlang and subject to
+                                change. If this happened this library will be
+                                updated to accommodate for that, but for now
+                                `inet_dns` is simple and worked for me.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/tungd/elixir-dns";
+            };
+          }
+      ) {};
+
+    dns = dns_0_0_3;
+
+    dnsimple_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
+          buildMix {
+            name = "dnsimple";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "dnsimple";
+              version = "0.0.1";
+              sha256 =
+                "37acb9b7a35f9383ed98754e5bee5c479b91ac739ec566befa32d9baccdb4105";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''An (experimental) Elixir client for the DNSimple
+                            API v2.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/weppos/dnsimple-elixir";
+            };
+          }
+      ) {};
+
+    dnsimple = dnsimple_0_0_1;
+
+    doc_plug_1_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1 }:
+          buildMix {
+            name = "doc_plug";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "doc_plug";
+              version = "1.0.2";
+              sha256 =
+                "2813f85dcd4f7228d54c277898d3d7483d03ef27ed4f9abc9eae6f57b00e79b8";
+            };
+            beamDeps  = [ plug_1_1_1 ];
+
+            meta = {
+              description = ''Plug to automatically generate and serve project
+                            documentation.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/hild/doc_plug";
+            };
+          }
+      ) {};
+
+    doc_plug = doc_plug_1_0_2;
+
+    docker_0_3_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildRebar3 {
+            name = "docker";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "docker";
+              version = "0.3.0";
+              sha256 =
+                "ad97dbaa51a615a7694018d95b0b09403b6d552a03ddb3ba50f121c814cc624a";
+            };
+
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Elixir client for the Docker Remote API using
+                            HTTPoison. '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/hexedpackets/docker-elixir";
+            };
+          }
+      ) {};
+
+    docker = docker_0_3_0;
+
+    dogma_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2 }:
+          buildMix {
+            name = "dogma";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "dogma";
+              version = "0.1.0";
+              sha256 =
+                "cd261c67d712ce4e9d8020d9cb6627c756db8dc5466c169611d81b79c5a261d0";
+            };
+            beamDeps  = [ poison_1_5_2 ];
+
+            meta = {
+              description = ''A code style linter for Elixir, powered by
+                            shame.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lpil/dogma";
+            };
+          }
+      ) {};
+
+    dogma = dogma_0_1_0;
+
+    dogstatsd_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "dogstatsd";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "dogstatsd";
+              version = "0.0.3";
+              sha256 =
+                "4632886c61e928f57359790ad345d3cc58c37b0f82fb7d35d485a8e2385cf887";
+            };
+
+            meta = {
+              description = ''A client for DogStatsd, an extension of the
+                            StatsD metric server for Datadog.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/adamkittelson/dogstatsd-elixir";
+            };
+          }
+      ) {};
+
+    dogstatsd = dogstatsd_0_0_3;
+
+    dot_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "dot";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "dot";
+              version = "0.0.3";
+              sha256 =
+                "3411bf1f70bb8ea0caa64515054a4a161b711667a5cdb0e7c14e766ce04b06ae";
+            };
+             meta = {    };
+          }
+      ) {};
+
+    dot = dot_0_0_3;
+
+    dotenv_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "dotenv";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "dotenv";
+              version = "0.0.4";
+              sha256 =
+                "e5243714a0fa0fbb6b5f466b1302db3a5fdb28363460fd4d282167e476cf703d";
+            };
+
+            meta = {
+              description = ''A port of dotenv to Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/avdi/dotenv_elixir";
+            };
+          }
+      ) {};
+
+    dotenv_2_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "dotenv";
+            version = "2.0.0";
+            src = fetchHex {
+              pkg = "dotenv";
+              version = "2.0.0";
+              sha256 =
+                "bff466b9c1976a17ec1536e095b192e77ec2e2554fd229f23bbb7b598838d95f";
+            };
+
+            meta = {
+              description = ''A port of dotenv to Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/avdi/dotenv_elixir";
+            };
+          }
+      ) {};
+
+    dotenv = dotenv_2_0_0;
+
+    dotenv_elixir_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "dotenv_elixir";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "dotenv_elixir";
+              version = "0.0.2";
+              sha256 =
+                "b7b95bff53df3bee1f500a24543bfb4c5c90b69c741454a86509b5a26c0355b7";
+            };
+
+            meta = {
+              description = ''A port of dotenv to Elixir '';
+
+              homepage = "https://github.com/avdi/dotenv_elixir";
+            };
+          }
+      ) {};
+
+    dotenv_elixir = dotenv_elixir_0_0_2;
+
+    dovetail_0_0_3 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "dovetail";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "dovetail";
+              version = "0.0.3";
+              sha256 =
+                "01b6c3085ebb9cb7d43115c7a2d9780a840017e521daeb7d0a2233f61f8b0306";
+            };
+
+            meta = {
+              description = ''Dovetail provides a harness for running test
+                            dovecot servers.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/thusfresh/dovetail";
+            };
+          }
+      ) {};
+
+    dovetail = dovetail_0_0_3;
+
+    dpd_client_0_0_6 = callPackage
+      (
+        {  buildMix, fetchHex, hackney_1_0_6, poison_1_0_3 }:
+          buildMix {
+            name = "dpd_client";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "dpd_client";
+              version = "0.0.6";
+              sha256 =
+                "080d8e9e4c68db87e42ead3fa3ffbc8cde2cadac441dbe81fa7a1b903486cc2d";
+            };
+            beamDeps  = [ hackney_1_0_6 poison_1_0_3 ];
+
+            meta = {
+              longDescription = ''`dpd_client` is an API client for the DPD
+                                service. It only supports a few of the API`s
+                                endpoints at present. '';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    dpd_client = dpd_client_0_0_6;
+
+    dproto_0_1_12 = callPackage
+      (
+        {  buildRebar3, fetchHex, mmath_0_1_15 }:
+          buildRebar3 {
+            name = "dproto";
+            version = "0.1.12";
+            src = fetchHex {
+              pkg = "dproto";
+              version = "0.1.12";
+              sha256 =
+                "49e2a048293a6c6213b69b5e983c581f81de0536e9acb5c47cd113ef410abbcf";
+            };
+
+            beamDeps  = [ mmath_0_1_15 ];
+
+            meta = {
+              description = ''Protocols for dalmatinerdb'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dalmatinerdb/dproto";
+            };
+          }
+      ) {};
+
+    dproto = dproto_0_1_12;
+
+    dqe_0_1_33 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          qdate_0_4_2,
+          poolboy_1_5_1,
+          mmath_0_1_16,
+          lager_3_0_2,
+          dproto_0_1_12,
+          dflow_0_1_5,
+          ddb_client_0_1_17
+        }:
+          buildRebar3 {
+            name = "dqe";
+            version = "0.1.33";
+            src = fetchHex {
+              pkg = "dqe";
+              version = "0.1.33";
+              sha256 =
+                "b3c4eded2953afff00df0e33534b36e8bcceccafa9c11fd3438e1a88d570bb41";
+            };
+
+            beamDeps  = [
+                          qdate_0_4_2
+                          poolboy_1_5_1
+                          mmath_0_1_16
+                          lager_3_0_2
+                          dproto_0_1_12
+                          dflow_0_1_5
+                          ddb_client_0_1_17
+                        ];
+
+            meta = {
+              description = ''DalmatinerDB query engine'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dalmatinerdb/dqe";
+            };
+          }
+      ) {};
+
+    dqe = dqe_0_1_33;
+
+    drawille_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, ex_doc_0_10_0, earmark_0_1_19 }:
+          buildMix {
+            name = "drawille";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "drawille";
+              version = "0.0.1";
+              sha256 =
+                "58d631fee40578dc077603c8cb969e3efa32c098c9d6295648432b07728d8ae3";
+            };
+            beamDeps  = [ ex_doc_0_10_0 earmark_0_1_19 ];
+
+            meta = {
+              description = ''Drawings using terminal braille characters.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/massn/elixir-drawille";
+            };
+          }
+      ) {};
+
+    drawille = drawille_0_0_1;
+
+    dropbox_0_0_7 = callPackage
+      (
+        {  buildMix, fetchHex, hackney_1_0_6, jazz_0_2_1 }:
+          buildMix {
+            name = "dropbox";
+            version = "0.0.7";
+            src = fetchHex {
+              pkg = "dropbox";
+              version = "0.0.7";
+              sha256 =
+                "d881be0c042856e0b2ff446dfac0b64337f5cbbb18479f4c81080d3d2cd7e4af";
+            };
+            beamDeps  = [ hackney_1_0_6 jazz_0_2_1 ];
+
+            meta = {
+              description = ''A Dropbox Core API client for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ammmir/elixir-dropbox";
+            };
+          }
+      ) {};
+
+    dropbox = dropbox_0_0_7;
+
+    dublin_bus_api_0_1_5 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1, floki_0_7_1 }:
+          buildMix {
+            name = "dublin_bus_api";
+            version = "0.1.5";
+            src = fetchHex {
+              pkg = "dublin_bus_api";
+              version = "0.1.5";
+              sha256 =
+                "54fb2c72fa682481970b126f53a45f2a38cc8d7fdff132483534f4ff04407bc1";
+            };
+            beamDeps  = [ httpoison_0_8_1 floki_0_7_1 ];
+
+            meta = {
+              description = ''Access to the Real Time Passenger Information
+                            (RTPI) for Dublin Bus services.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/carlo-colombo/dublin-bus-api";
+            };
+          }
+      ) {};
+
+    dublin_bus_api = dublin_bus_api_0_1_5;
+
+    durga_transport_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "durga_transport";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "durga_transport";
+              version = "1.0.1";
+              sha256 =
+                "42db857eba0e78c4eb15823b5137e8ccad13711cc2c873b6f1b469c4c0771009";
+            };
+             meta = {    };
+          }
+      ) {};
+
+    durga_transport = durga_transport_1_0_1;
+
+    dye_0_4_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "dye";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "dye";
+              version = "0.4.0";
+              sha256 =
+                "95c11e5baafc79531f37bee1256066a8fef63739707723ac1e349739a3217003";
+            };
+
+            meta = {
+              description = ''Dyeing your terminal!'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Kabie/dye";
+            };
+          }
+      ) {};
+
+    dye = dye_0_4_0;
+
+    dynamic_compile_1_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "dynamic_compile";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "dynamic_compile";
+              version = "1.0.0";
+              sha256 =
+                "eb73d8e9a6334914f79c15ee8214acad9659c42222d49beda3e8b6f6789a980a";
+            };
+
+            meta = {
+              description = ''compile and load erlang modules from string
+                            input'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/okeuday/dynamic_compile";
+            };
+          }
+      ) {};
+
+    dynamic_compile = dynamic_compile_1_0_0;
+
+    e2qc_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "e2qc";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "e2qc";
+              version = "0.1.0";
+              sha256 =
+                "3a97f9b3c60ec723002a816c041ac224dc5aba3360bd922c5e38cfd40f59c65b";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''2q cache'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/project-fifo/e2qc";
+            };
+          }
+      ) {};
+
+    e2qc = e2qc_0_1_0;
+
+    e_queue_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "e_queue";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "e_queue";
+              version = "1.0.1";
+              sha256 =
+                "aff37843191c1229ec49d0d067b18d5e0871a28fe049a4a82c7884e66320b7e8";
+            };
+
+            meta = {
+              longDescription = ''An Elixir wrapper around the Erlang optimized
+                                `queue` that supports the FIFO, first-in
+                                first-out, pattern. This is useful is when you
+                                can`t predict when an item needs to be taken or
+                                added to the queue. Use this instead of using
+                                `++` or double reversing lists to add items to
+                                the "back" of a queue.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/benfalk/e_queue";
+            };
+          }
+      ) {};
+
+    e_queue = e_queue_1_0_1;
+
+    earmark_0_1_14 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "earmark";
+            version = "0.1.14";
+            src = fetchHex {
+              pkg = "earmark";
+              version = "0.1.14";
+              sha256 =
+                "5e44505d71df50a839bde48c922357f9340168340dfc7502f581f68b6a0a29f9";
+            };
+
+            meta = {
+              longDescription = ''Earmark is a pure-Elixir Markdown converter.
+                                It is intended to be used as a library (just
+                                call Earmark.to_html), but can also be used as a
+                                command-line tool (just run mix escript.build
+                                first). Output generation is pluggable.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/pragdave/earmark";
+            };
+          }
+      ) {};
+
+    earmark_0_1_19 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "earmark";
+            version = "0.1.19";
+            src = fetchHex {
+              pkg = "earmark";
+              version = "0.1.19";
+              sha256 =
+                "db85f989ba3030d40d3a901d7eebbf926ee07355bf6113d730b8aaf9404a6bd7";
+            };
+
+            meta = {
+              longDescription = ''Earmark is a pure-Elixir Markdown converter.
+                                It is intended to be used as a library (just
+                                call Earmark.to_html), but can also be used as a
+                                command-line tool (just run mix escript.build
+                                first). Output generation is pluggable.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/pragdave/earmark";
+            };
+          }
+      ) {};
+
+    earmark_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "earmark";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "earmark";
+              version = "0.2.1";
+              sha256 =
+                "c86afb8d22a5aa8315afd4257c7512011c0c9a48b0fea43af7612836b958098b";
+            };
+
+            meta = {
+              longDescription = ''Earmark is a pure-Elixir Markdown converter.
+                                It is intended to be used as a library (just
+                                call Earmark.to_html), but can also be used as a
+                                command-line tool (just run mix escript.build
+                                first). Output generation is pluggable.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/pragdave/earmark";
+            };
+          }
+      ) {};
+
+    earmark = earmark_0_2_1;
+
+    eastar_0_3_8 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "eastar";
+            version = "0.3.8";
+            src = fetchHex {
+              pkg = "eastar";
+              version = "0.3.8";
+              sha256 =
+                "c36e6ba809fb6e228902349e6f794d0362edb4bfd4f6e814107ed9bbc8c8dd17";
+            };
+
+            meta = {
+              longDescription = ''Eastar is a pure-Elixir implementation of A*
+                                graph pathfinding algorithm. All graph
+                                environment, like nodes connectivity, distance &
+                                H-metric are abstracted away - you provide them
+                                as functions.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://github.com/herenowcoder/eastar";
+            };
+          }
+      ) {};
+
+    eastar = eastar_0_3_8;
+
+    easy_server_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "easy_server";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "easy_server";
+              version = "0.0.1";
+              sha256 =
+                "af9faac0c7c440cf04bbb5d1f8aea1fc00b0c60da384c8103fafdaf0df00a0bb";
+            };
+
+            meta = {
+              description = ''Easier GenServer for Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/termoose/EasyServer";
+            };
+          }
+      ) {};
+
+    easy_server = easy_server_0_0_1;
+
+    easypost_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2 }:
+          buildMix {
+            name = "easypost";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "easypost";
+              version = "0.0.1";
+              sha256 =
+                "8339fcfb60a1d4833b99aa611d194bf1ae94f22509dc81cf90d07ee2db0e074e";
+            };
+            beamDeps  = [ poison_1_5_2 ];
+
+            meta = {
+              description = ''Elixir Easypost Client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Dania02525/easypost";
+            };
+          }
+      ) {};
+
+    easypost = easypost_0_0_1;
+
+    ecc_0_1_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ecc";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "ecc";
+              version = "0.1.3";
+              sha256 =
+                "0255ffe6e2b2cbbc2445ec7de6d29e16b6b6d8eaf0a6ae99a299cc79162541db";
+            };
+
+            meta = {
+              longDescription = ''An elixir module for elliptic curve
+                                cryptography. It can be used either as a library
+                                or as a GenServer-Task for signing messages and
+                                verifying signatures with a public key. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/farao/elixir-ecc";
+            };
+          }
+      ) {};
+
+    ecc = ecc_0_1_3;
+
+    ecdo_0_1_4 = callPackage
+      (
+        {
+          buildMix, fetchHex, postgrex_0_11_1, mariaex_0_6_2, ecto_1_0_7
+        }:
+          buildMix {
+            name = "ecdo";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "ecdo";
+              version = "0.1.4";
+              sha256 =
+                "362c75113bca6c8379ac2b1654ae78ed099ab0faee4a1fbacb7b4b9b137b9f1d";
+            };
+            beamDeps  = [ postgrex_0_11_1 mariaex_0_6_2 ecto_1_0_7 ];
+
+            meta = {
+              longDescription = ''Ecdo is a dynamic interface for ecto aims to
+                                simplify building dynamic query API based on
+                                ecto models.'';
+
+              homepage = "https://github.com/xerions/ecdo";
+            };
+          }
+      ) {};
+
+    ecdo = ecdo_0_1_4;
+
+    echo_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "echo";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "echo";
+              version = "0.2.0";
+              sha256 =
+                "e03b37ada0457fbf3e91b2e721c9367b1590a17a5fb9be35672a46206309f1a4";
+            };
+
+            meta = {
+              longDescription = ''A simple & highly extendable,
+                                meta-notification system; Echo checks
+                                notification preferences & dispatch
+                                notifications to different adapters (ex. email,
+                                logger, analytics, sms, etc.)'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/zmoshansky/echo";
+            };
+          }
+      ) {};
+
+    echo = echo_0_2_0;
+
+    econfig_0_7_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "econfig";
+            version = "0.7.1";
+            src = fetchHex {
+              pkg = "econfig";
+              version = "0.7.1";
+              sha256 =
+                "b11d68e3d288b5cb4bd34e668e03176c4ea42790c09f1f449cdbd46a649ea7f3";
+            };
+
+            meta = {
+              description = ''simple Erlang config handler using INI files'';
+
+              homepage = "https://github.com/benoitc/econfig";
+            };
+          }
+      ) {};
+
+    econfig = econfig_0_7_1;
+
+    ecto_0_16_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          sbroker_0_7_0,
+          postgrex_0_9_1,
+          poolboy_1_5_1,
+          poison_1_5_2,
+          mariaex_0_4_3,
+          decimal_1_1_1
+        }:
+          buildMix {
+            name = "ecto";
+            version = "0.16.0";
+            src = fetchHex {
+              pkg = "ecto";
+              version = "0.16.0";
+              sha256 =
+                "45643e7a09fdd0a32cf440c5b2e71c5120f24310280da50f51713399d9bb49d6";
+            };
+            beamDeps  = [
+                          sbroker_0_7_0
+                          postgrex_0_9_1
+                          poolboy_1_5_1
+                          poison_1_5_2
+                          mariaex_0_4_3
+                          decimal_1_1_1
+                        ];
+
+            meta = {
+              longDescription = ''Ecto is a domain specific language for
+                                writing queries and interacting with databases
+                                in Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/elixir-lang/ecto";
+            };
+          }
+      ) {};
+
+    ecto_0_2_4 = callPackage
+      (
+        {
+          buildMix, fetchHex, postgrex_0_6_0, poolboy_1_2_1, decimal_0_2_5
+        }:
+          buildMix {
+            name = "ecto";
+            version = "0.2.4";
+            src = fetchHex {
+              pkg = "ecto";
+              version = "0.2.4";
+              sha256 =
+                "b6918fb8a0b72220238832616c42937ac04d2f8016d687b53e3a241234cae4f3";
+            };
+            beamDeps  = [ postgrex_0_6_0 poolboy_1_2_1 decimal_0_2_5 ];
+
+            meta = {
+              longDescription = ''Ecto is a domain specific language for
+                                writing queries and interacting with databases
+                                in Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/elixir-lang/ecto";
+            };
+          }
+      ) {};
+
+    ecto_0_2_6 = callPackage
+      (
+        {
+          buildMix, fetchHex, postgrex_0_6_0, poolboy_1_5_1, decimal_0_2_5
+        }:
+          buildMix {
+            name = "ecto";
+            version = "0.2.6";
+            src = fetchHex {
+              pkg = "ecto";
+              version = "0.2.6";
+              sha256 =
+                "746fd42fa1a9fae304d9bb280782d9456a1f092ea71ead3a876876753c936dc8";
+            };
+            beamDeps  = [ postgrex_0_6_0 poolboy_1_5_1 decimal_0_2_5 ];
+
+            meta = {
+              longDescription = ''Ecto is a domain specific language for
+                                writing queries and interacting with databases
+                                in Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/elixir-lang/ecto";
+            };
+          }
+      ) {};
+
+    ecto_0_5_1 = callPackage
+      (
+        {
+          buildMix, fetchHex, postgrex_0_6_0, poolboy_1_4_2, decimal_0_2_5
+        }:
+          buildMix {
+            name = "ecto";
+            version = "0.5.1";
+            src = fetchHex {
+              pkg = "ecto";
+              version = "0.5.1";
+              sha256 =
+                "a7f1f8022f6b8c53edc91076bcc885e1124fdf14cdc2c4a11d3b9b4c26cf34a8";
+            };
+            beamDeps  = [ postgrex_0_6_0 poolboy_1_4_2 decimal_0_2_5 ];
+
+            meta = {
+              longDescription = ''Ecto is a domain specific language for
+                                writing queries and interacting with databases
+                                in Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/elixir-lang/ecto";
+            };
+          }
+      ) {};
+
+    ecto_1_0_7 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          sbroker_0_7_0,
+          postgrex_0_9_1,
+          poolboy_1_5_1,
+          poison_1_5_2,
+          mariaex_0_4_3,
+          decimal_1_1_1
+        }:
+          buildMix {
+            name = "ecto";
+            version = "1.0.7";
+            src = fetchHex {
+              pkg = "ecto";
+              version = "1.0.7";
+              sha256 =
+                "d56766fb8e93dcec7e6dd9ef8bfe624b9b6d1f3a433fac4f0e7532681f501086";
+            };
+            beamDeps  = [
+                          sbroker_0_7_0
+                          postgrex_0_9_1
+                          poolboy_1_5_1
+                          poison_1_5_2
+                          mariaex_0_4_3
+                          decimal_1_1_1
+                        ];
+
+            meta = {
+              longDescription = ''Ecto is a domain specific language for
+                                writing queries and interacting with databases
+                                in Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/elixir-lang/ecto";
+            };
+          }
+      ) {};
+
+    ecto_1_1_3 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          sbroker_0_7_0,
+          postgrex_0_11_1,
+          poolboy_1_5_1,
+          poison_1_5_2,
+          mariaex_0_5_0,
+          decimal_1_1_1
+        }:
+          buildMix {
+            name = "ecto";
+            version = "1.1.3";
+            src = fetchHex {
+              pkg = "ecto";
+              version = "1.1.3";
+              sha256 =
+                "0db9486edf2bc98cca77e5c22f7cb7e5a2d56fdb0268e4bb2e67353cc058b060";
+            };
+            beamDeps  = [
+                          sbroker_0_7_0
+                          postgrex_0_11_1
+                          poolboy_1_5_1
+                          poison_1_5_2
+                          mariaex_0_5_0
+                          decimal_1_1_1
+                        ];
+
+            meta = {
+              longDescription = ''Ecto is a domain specific language for
+                                writing queries and interacting with databases
+                                in Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/elixir-lang/ecto";
+            };
+          }
+      ) {};
+
+    ecto_2_0_0_beta_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          sbroker_0_7_0,
+          postgrex_0_11_1,
+          poolboy_1_5_1,
+          poison_1_0_3,
+          mariaex_0_6_2,
+          decimal_1_1_1
+        }:
+          buildMix {
+            name = "ecto";
+            version = "2.0.0-beta.0";
+            src = fetchHex {
+              pkg = "ecto";
+              version = "2.0.0-beta.0";
+              sha256 =
+                "9c281d7de07610cc1025d2d5d2910aace0b0618c60fcbd6fd6f4b720c2f4e996";
+            };
+            beamDeps  = [
+                          sbroker_0_7_0
+                          postgrex_0_11_1
+                          poolboy_1_5_1
+                          poison_1_0_3
+                          mariaex_0_6_2
+                          decimal_1_1_1
+                        ];
+
+            meta = {
+              longDescription = ''Ecto is a domain specific language for
+                                writing queries and interacting with databases
+                                in Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/elixir-lang/ecto";
+            };
+          }
+      ) {};
+
+    ecto = ecto_2_0_0_beta_0;
+
+    ecto_audit_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ecto_audit";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ecto_audit";
+              version = "0.0.1";
+              sha256 =
+                "04829a9670d4258b96c6218043093b68a1d3b03c37ee316a1c19366a59dbbd59";
+            };
+
+            meta = {
+              description = ''Ecto extension to support auditing data changes
+                            in your Schema.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mattweldon/ecto_audit";
+            };
+          }
+      ) {};
+
+    ecto_audit = ecto_audit_0_0_1;
+
+    ecto_enum_0_3_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          postgrex_0_11_1,
+          mariaex_0_6_2,
+          ecto_2_0_0_beta_0
+        }:
+          buildMix {
+            name = "ecto_enum";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "ecto_enum";
+              version = "0.3.0";
+              sha256 =
+                "2aabbeeee17c67b8336890cc1888b1104b71e29852d464a77efca4257b02a8d9";
+            };
+            beamDeps  = [ postgrex_0_11_1 mariaex_0_6_2 ecto_2_0_0_beta_0 ];
+
+            meta = {
+              description = ''Ecto extension to support enums in models'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gjaldon/ecto_enum";
+            };
+          }
+      ) {};
+
+    ecto_enum = ecto_enum_0_3_0;
+
+    ecto_fixtures_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, uuid_1_1_3 }:
+          buildMix {
+            name = "ecto_fixtures";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "ecto_fixtures";
+              version = "0.0.2";
+              sha256 =
+                "64e7ea208763fbcfb089ae8693fddcbe45c70ce2879614ad4edf883ca33ce061";
+            };
+            beamDeps  = [ uuid_1_1_3 ];
+
+            meta = {
+              longDescription = ''Ecto Fixtures provides a simple DSL for
+                                quickly creating fixture data for your test
+                                suite.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dockyard/ecto_fixtures";
+            };
+          }
+      ) {};
+
+    ecto_fixtures = ecto_fixtures_0_0_2;
+
+    ecto_gettext_0_1_4 = callPackage
+      (
+        {  buildMix, fetchHex, gettext_0_10_0 }:
+          buildMix {
+            name = "ecto_gettext";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "ecto_gettext";
+              version = "0.1.4";
+              sha256 =
+                "fdd333fd0655a86f985bed4558132b6b382cdafbce23e21cab4a9afc08b47f82";
+            };
+            beamDeps  = [ gettext_0_10_0 ];
+
+            meta = {
+              description = ''EctoGettext - library for localization Ecto
+                            validation errors with using Gettext'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/exbugs-elixir/ecto_gettext";
+            };
+          }
+      ) {};
+
+    ecto_gettext = ecto_gettext_0_1_4;
+
+    ecto_hstore_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, ecto_2_0_0_beta_0 }:
+          buildMix {
+            name = "ecto_hstore";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ecto_hstore";
+              version = "0.0.1";
+              sha256 =
+                "0dca7ad14d0fa42038594e00a6f1e1fb3476644f71299f9e4ca10f1b9d6098cb";
+            };
+            beamDeps  = [ ecto_2_0_0_beta_0 ];
+
+            meta = {
+              description = ''Ecto.Hstore adds Postgres Hstore compatibility to
+                            Ecto. '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/stavro/ecto_hstore";
+            };
+          }
+      ) {};
+
+    ecto_hstore = ecto_hstore_0_0_1;
+
+    ecto_it_0_2_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          postgrex_0_11_1,
+          mariaex_0_6_2,
+          ecto_2_0_0_beta_0
+        }:
+          buildMix {
+            name = "ecto_it";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "ecto_it";
+              version = "0.2.0";
+              sha256 =
+                "ddbf27e85547b9812d7b49bc2252b4667468582b174045ba2bb1a804d209a860";
+            };
+            beamDeps  = [ postgrex_0_11_1 mariaex_0_6_2 ecto_2_0_0_beta_0 ];
+
+            meta = {
+              longDescription = ''Ecto IT is library for writing integration
+                                tests(with database backend) for ecto-based
+                                applications.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/xerions/ecto_it";
+            };
+          }
+      ) {};
+
+    ecto_it = ecto_it_0_2_0;
+
+    ecto_lazy_float_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex, ecto_2_0_0_beta_0 }:
+          buildMix {
+            name = "ecto_lazy_float";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "ecto_lazy_float";
+              version = "0.1.2";
+              sha256 =
+                "76f14bf8d2bf52e3143c79fdf0e9d9bbb2fb1b087e847b13347e52e5b0c5da94";
+            };
+            beamDeps  = [ ecto_2_0_0_beta_0 ];
+
+            meta = {
+              description = ''Ecto.LazyFloat takes integer, strings, and floats
+                            and casts them to floats. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/joshdholtz/ecto-lazy-float";
+            };
+          }
+      ) {};
+
+    ecto_lazy_float = ecto_lazy_float_0_1_2;
+
+    ecto_ldap_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, ecto_2_0_0_beta_0 }:
+          buildMix {
+            name = "ecto_ldap";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "ecto_ldap";
+              version = "0.2.0";
+              sha256 =
+                "9228e091811d699c530a717633f0be8f3468d80f81f721c5f4ce2bd9b401de13";
+            };
+            beamDeps  = [ ecto_2_0_0_beta_0 ];
+
+            meta = {
+              description = ''An Ecto adapter for LDAP'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jeffweiss/ecto_ldap";
+            };
+          }
+      ) {};
+
+    ecto_ldap = ecto_ldap_0_2_0;
+
+    ecto_migrate_0_6_3 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          postgrex_0_11_1,
+          mariaex_0_6_2,
+          ecto_it_0_2_0,
+          ecto_1_0_7
+        }:
+          buildMix {
+            name = "ecto_migrate";
+            version = "0.6.3";
+            src = fetchHex {
+              pkg = "ecto_migrate";
+              version = "0.6.3";
+              sha256 =
+                "a604f2fe7874c674bd42fc70f3e89776d3738571d252ec8b785a107a6fa12b5c";
+            };
+            beamDeps  = [
+                          postgrex_0_11_1 mariaex_0_6_2 ecto_it_0_2_0 ecto_1_0_7
+                        ];
+
+            meta = {
+              longDescription = ''Ecto auto migration library. It allows to
+                                generate and run migrations for initial and
+                                update migrations.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/xerions/ecto_migrate";
+            };
+          }
+      ) {};
+
+    ecto_migrate = ecto_migrate_0_6_3;
+
+    ecto_ordered_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, ecto_0_5_1 }:
+          buildMix {
+            name = "ecto_ordered";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "ecto_ordered";
+              version = "0.0.2";
+              sha256 =
+                "315ccd497576d800e3962874da19dae8938eb36ca4dc14193ed95ef7c9c12c1e";
+            };
+            beamDeps  = [ ecto_0_5_1 ];
+
+            meta = {
+              description = ''Ecto extension to support ordered list models'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/trustatom-oss/ecto-ordered";
+            };
+          }
+      ) {};
+
+    ecto_ordered = ecto_ordered_0_0_2;
+
+    ecto_validation_case_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, ex_doc_0_11_4, ecto_2_0_0_beta_0 }:
+          buildMix {
+            name = "ecto_validation_case";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "ecto_validation_case";
+              version = "0.1.1";
+              sha256 =
+                "0bec902247929e66cb0687f09d458633385843d18ca6ec1ac2557e6754b55cbd";
+            };
+            beamDeps  = [ ex_doc_0_11_4 ecto_2_0_0_beta_0 ];
+
+            meta = {
+              description = ''Ecto.ValidationCase simplifies writing validation
+                            tests for Ecto models. '';
+              license = with stdenv.lib.licenses; [ mit asl20 ];
+              homepage =
+                "https://github.com/danielberkompas/ecto_validation_case";
+            };
+          }
+      ) {};
+
+    ecto_validation_case = ecto_validation_case_0_1_1;
+
+    ectograph_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, graphql_0_1_2, ecto_1_1_3 }:
+          buildMix {
+            name = "ectograph";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ectograph";
+              version = "0.0.1";
+              sha256 =
+                "1fe701999ff1648cdac64ed6500793f8534fe7771ed5b533c21bc42a648d3484";
+            };
+            beamDeps  = [ graphql_0_1_2 ecto_1_1_3 ];
+
+            meta = {
+              longDescription = ''Ectograph is a set of utility functions for
+                                using Ecto in combination with GraphQL
+                                (joshprice/graphql-elixir)'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/icidasset/ectograph";
+            };
+          }
+      ) {};
+
+    ectograph = ectograph_0_0_1;
+
+    ectoo_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex, postgrex_0_11_1, ecto_2_0_0_beta_0 }:
+          buildMix {
+            name = "ectoo";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "ectoo";
+              version = "0.0.4";
+              sha256 =
+                "bf5852e97e64666ebd57df710e4cb1239d3fcf135d7ae9d5d666fc53aa0e0b46";
+            };
+            beamDeps  = [ postgrex_0_11_1 ecto_2_0_0_beta_0 ];
+
+            meta = {
+              longDescription = ''Make simple things easy in Ecto, e.g.
+                                Ectoo.max(MyModel, :age). Also .count, .min,
+                                .max, .avg.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/henrik/ectoo";
+            };
+          }
+      ) {};
+
+    ectoo = ectoo_0_0_4;
+
+    ectophile_0_3_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          postgrex_0_9_1,
+          poison_1_5_2,
+          mariaex_0_4_3,
+          ecto_2_0_0_beta_0
+        }:
+          buildMix {
+            name = "ectophile";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "ectophile";
+              version = "0.3.0";
+              sha256 =
+                "376c7c838bc602bc64d7ae3dfa4079717f6ed5e0117113652fc281e3e17227d2";
+            };
+            beamDeps  = [
+                          postgrex_0_9_1
+                          poison_1_5_2
+                          mariaex_0_4_3
+                          ecto_2_0_0_beta_0
+                        ];
+
+            meta = {
+              description = ''File upload extension for Ecto'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gjaldon/ectophile";
+            };
+          }
+      ) {};
+
+    ectophile = ectophile_0_3_0;
+
+    edeliver_1_1_4 = callPackage
+      (
+        {  buildMix, fetchHex, exrm_1_0_0_rc8 }:
+          buildMix {
+            name = "edeliver";
+            version = "1.1.4";
+            src = fetchHex {
+              pkg = "edeliver";
+              version = "1.1.4";
+              sha256 =
+                "b7c95a499efb0fc9baf681dfaba3c09c64d9cde5c4cf4faafd44d6de9cba8928";
+            };
+            beamDeps  = [ exrm_1_0_0_rc8 ];
+
+            meta = {
+              longDescription = ''Build and Deploy Elixir Applications and
+                                perform Hot-Code Upgrades and Schema
+                                Migrations'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/boldpoker/edeliver";
+            };
+          }
+      ) {};
+
+    edeliver = edeliver_1_1_4;
+
+    eden_0_1_3 = callPackage
+      (
+        {  buildMix, fetchHex, timex_0_13_5, array_1_0_1 }:
+          buildMix {
+            name = "eden";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "eden";
+              version = "0.1.3";
+              sha256 =
+                "cbada564b3beb28c350a3f01da7398329e39c24dc9780002ab842d14604ca67b";
+            };
+            beamDeps  = [ timex_0_13_5 array_1_0_1 ];
+
+            meta = {
+              description = ''edn (extensible data notation) encoder/decoder
+                            implemented in Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/jfacorro/Eden/";
+            };
+          }
+      ) {};
+
+    eden = eden_0_1_3;
+
+    edgarex_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, httpotion_2_0_0, exquery_0_0_11 }:
+          buildMix {
+            name = "edgarex";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "edgarex";
+              version = "0.0.2";
+              sha256 =
+                "99e25e685bc44a1f804729779e77d5e3d1920f42c99478cd9b712d724b4f6af4";
+            };
+            beamDeps  = [ httpotion_2_0_0 exquery_0_0_11 ];
+
+            meta = {
+              longDescription = '' A set of utilities for fetching documents
+                                from the SEC EDGAR data portal, as well as
+                                parsing them into simpler structures. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rozap/edgarex";
+            };
+          }
+      ) {};
+
+    edgarex = edgarex_0_0_2;
+
+    edib_0_5_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "edib";
+            version = "0.5.1";
+            src = fetchHex {
+              pkg = "edib";
+              version = "0.5.1";
+              sha256 =
+                "25218e2eca8c5b51b0344c04d635551689b4791760104227963173299b7d60e0";
+            };
+
+            meta = {
+              longDescription = ''Mix task to create a docker image of your
+                                application release. More detailed information
+                                about release image building at:
+                                https://github.com/edib-tool/elixir-docker-image-builder'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edib-tool/mix-edib";
+            };
+          }
+      ) {};
+
+    edib = edib_0_5_1;
+
+    edip_0_4_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "edip";
+            version = "0.4.3";
+            src = fetchHex {
+              pkg = "edip";
+              version = "0.4.3";
+              sha256 =
+                "b0b9f34b2048b3f03c1f25b6dc60a1567b6f3ec8c6ad945de30dc313d7608800";
+            };
+
+            meta = {
+              longDescription = ''Mix task to create a docker image of your
+                                application release. More detailed information
+                                about release image packaging at:
+                                https://github.com/asaaki/elixir-docker-image-packager'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/asaaki/mix-edip";
+            };
+          }
+      ) {};
+
+    edip = edip_0_4_3;
+
+    edown_0_7_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "edown";
+            version = "0.7.0";
+            src = fetchHex {
+              pkg = "edown";
+              version = "0.7.0";
+              sha256 =
+                "6d7365a7854cd724e8d1fd005f5faa4444eae6a87eb6df9b789b6e7f6f09110a";
+            };
+
+            meta = {
+              description = ''Markdown generated from Edoc.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/uwiger/edown";
+            };
+          }
+      ) {};
+
+    edown = edown_0_7_0;
+
+    eeb_0_1_3 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          tzdata_0_1_8,
+          timex_1_0_1,
+          plug_0_14_0,
+          earmark_0_1_19,
+          cowboy_1_0_4
+        }:
+          buildMix {
+            name = "eeb";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "eeb";
+              version = "0.1.3";
+              sha256 =
+                "c2f4bc1e6dbada6b7086e92db14a401ac1440d25d5c5ac078fc55e6545c73f4e";
+            };
+            beamDeps  = [
+                          tzdata_0_1_8
+                          timex_1_0_1
+                          plug_0_14_0
+                          earmark_0_1_19
+                          cowboy_1_0_4
+                        ];
+
+            meta = {
+              description = ''Elixir extendable blog.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/aborn/eeb";
+            };
+          }
+      ) {};
+
+    eeb = eeb_0_1_3;
+
+    egithub_0_2_2 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          shotgun_0_2_2,
+          jiffy_0_14_7,
+          lager_3_0_2,
+          goldrush_0_1_7
+        }:
+          buildRebar3 {
+            name = "egithub";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "egithub";
+              version = "0.2.2";
+              sha256 =
+                "ff8e279d3868576cc2a05336c7ca4bed3972f7a01676be859b7e1750da4570f8";
+            };
+
+            beamDeps  = [
+                          shotgun_0_2_2 jiffy_0_14_7 lager_3_0_2 goldrush_0_1_7
+                        ];
+
+            meta = {
+              description = ''GitHub API client'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/inaka/erlang-github";
+            };
+          }
+      ) {};
+
+    egithub = egithub_0_2_2;
+
+    eh_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "eh";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "eh";
+              version = "0.2.0";
+              sha256 =
+                "91013c78138c8854c5699ef42324e66286fed0048c4d4212c4dc3012d764c628";
+            };
+
+            meta = {
+              description = ''Lookup Elixir documentation from the command line
+                            '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/Frost/eh.git";
+            };
+          }
+      ) {};
+
+    eh = eh_0_2_0;
+
+    eight_ball_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "eight_ball";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "eight_ball";
+              version = "0.0.1";
+              sha256 =
+                "1ba1b2b5f3dfaba751b51f101c3c526a09f0c989768f265e82a6a065447a6aa4";
+            };
+
+            meta = {
+              description = ''Library that acts like a real life Magic 8
+                            Ball.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/fteem/eight_ball";
+            };
+          }
+      ) {};
+
+    eight_ball = eight_ball_0_0_1;
+
+    eight_ball_dj_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "eight_ball_dj";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "eight_ball_dj";
+              version = "0.0.2";
+              sha256 =
+                "5b0d4f92a76f3d48d5541936ae8540154ed2a14ccda1a45e250d6a577bb541f5";
+            };
+
+            meta = {
+              description = ''Ask a question to the Magic Eight Ball'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/djkianoosh/eight_ball";
+            };
+          }
+      ) {};
+
+    eight_ball_dj = eight_ball_dj_0_0_2;
+
+    eio_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "eio";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "eio";
+              version = "0.1.0";
+              sha256 =
+                "f39f017c73713b36ee27d8a0635634ac2e96b4d540f28db9dd358d8744dccd88";
+            };
+            beamDeps  = [ poison_1_5_2 plug_1_1_1 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Engine.io server for Elixir.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/falood/eio";
+            };
+          }
+      ) {};
+
+    eio = eio_0_1_0;
+
+    ejabberd_16_1_0_beta1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          stun_1_0_1,
+          stringprep_1_0_2,
+          sqlite3_1_1_5,
+          p1_xmlrpc_1_15_1,
+          p1_utils_1_0_3,
+          p1_pgsql_1_0_1,
+          p1_oauth2_0_6_1,
+          p1_mysql_1_0_1,
+          lager_3_0_2,
+          jiffy_0_14_7,
+          iconv_1_0_0,
+          fast_yaml_1_0_2,
+          fast_xml_1_1_3,
+          fast_tls_1_0_1,
+          ezlib_1_0_1,
+          esip_1_0_2,
+          eredis_1_0_8,
+          cache_tab_1_0_2
+        }:
+          buildMix {
+            name = "ejabberd";
+            version = "16.1.0-beta1";
+            src = fetchHex {
+              pkg = "ejabberd";
+              version = "16.1.0-beta1";
+              sha256 =
+                "c1f6b702ab0e75866979c62edeab4dcc01a2cd9d375a73799b7288dbdc77d743";
+            };
+            beamDeps  = [
+                          stun_1_0_1
+                          stringprep_1_0_2
+                          sqlite3_1_1_5
+                          p1_xmlrpc_1_15_1
+                          p1_utils_1_0_3
+                          p1_pgsql_1_0_1
+                          p1_oauth2_0_6_1
+                          p1_mysql_1_0_1
+                          lager_3_0_2
+                          jiffy_0_14_7
+                          iconv_1_0_0
+                          fast_yaml_1_0_2
+                          fast_xml_1_1_3
+                          fast_tls_1_0_1
+                          ezlib_1_0_1
+                          esip_1_0_2
+                          eredis_1_0_8
+                          cache_tab_1_0_2
+                        ];
+
+            meta = {
+              longDescription = ''Robust, ubiquitous and massively scalable
+                                Jabber / XMPP Instant Messaging platform.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/processone/ejabberd";
+            };
+          }
+      ) {};
+
+    ejabberd = ejabberd_16_1_0_beta1;
+
+    ejabberd_dev_15_9_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ejabberd_dev";
+            version = "15.9.0";
+            src = fetchHex {
+              pkg = "ejabberd_dev";
+              version = "15.9.0";
+              sha256 =
+                "4c4ca5b3ee1900bd7e5babed76cae361b6350ed5793ce013cbfccc06208c291e";
+            };
+
+            meta = {
+              longDescription = ''A package to help with building ejabberd
+                                modules. This package includes source and header
+                                files from the ejabberd project that are
+                                necessary in order to build a gen_mod module.'';
+              license = stdenv.lib.licenses.gpl3;
+              homepage = "https://github.com/scrogson/ejabberd_dev";
+            };
+          }
+      ) {};
+
+    ejabberd_dev = ejabberd_dev_15_9_0;
+
+    ekstat_0_2_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "ekstat";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "ekstat";
+              version = "0.2.2";
+              sha256 =
+                "fdd30052433bf7ceb453397c4cabee2d9b0a2a716842a29a1121d3474c5b9fa7";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''libkstat interface for erlang'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/Licenser/ekstat";
+            };
+          }
+      ) {};
+
+    ekstat = ekstat_0_2_2;
+
+    elastex_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_1 }:
+          buildMix {
+            name = "elastex";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "elastex";
+              version = "0.1.1";
+              sha256 =
+                "e08e9640f0d68250dfbe3a6d54855f75742db647ace24a42667d88e234c5849c";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Data driven elixir client for Elasticsearch.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/michaeldoaty/elastex";
+            };
+          }
+      ) {};
+
+    elastex = elastex_0_1_1;
+
+    elastix_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
+          buildMix {
+            name = "elastix";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "elastix";
+              version = "0.1.0";
+              sha256 =
+                "3e24e2287bbd733e913d16092ea3fdff6b7f8f74f9eae73b07699fcf62bb5b06";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''A simple Elastic REST client written in
+                            Elixir.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/werbitzky/elastix";
+            };
+          }
+      ) {};
+
+    elastix = elastix_0_1_0;
+
+    elaxtic_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1 }:
+          buildMix {
+            name = "elaxtic";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "elaxtic";
+              version = "0.0.1";
+              sha256 =
+                "a912a0327bfe1c6443cec47a03d11450fed2e649bfdcd4e77bdb9176baa8cd45";
+            };
+            beamDeps  = [ httpoison_0_8_1 ];
+
+            meta = {
+              description = ''ElasticSearch client for Elixir and Ecto
+                            driver.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/vic/elaxtic";
+            };
+          }
+      ) {};
+
+    elaxtic = elaxtic_0_0_1;
+
+    eleveldb_2_1_3 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "eleveldb";
+            version = "2.1.3";
+            src = fetchHex {
+              pkg = "eleveldb";
+              version = "2.1.3";
+              sha256 =
+                "91f4caccc3d0a40a6135b9a647a52c7ec5fefdd41883e1a0f32745838d7cfd3c";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''Erlang LevelDB API'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/basho/eleveldb";
+            };
+          }
+      ) {};
+
+    eleveldb = eleveldb_2_1_3;
+
+    elibphonenumber_0_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "elibphonenumber";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "elibphonenumber";
+              version = "0.1.1";
+              sha256 =
+                "6dcbcd49fe7c969873a3431eaa3939298b2564308d2a8fbcc22b7d9b4bc65f27";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''A port driver for libphonenumber'';
+
+              homepage = "https://github.com/johnhamelink/elibphonenumber";
+            };
+          }
+      ) {};
+
+    elibphonenumber = elibphonenumber_0_1_1;
+
+    elistrix_0_0_5 = callPackage
+      (
+        {  buildMix, fetchHex, timex_0_13_5 }:
+          buildMix {
+            name = "elistrix";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "elistrix";
+              version = "0.0.5";
+              sha256 =
+                "63888c589e9ec116f4cb6f8b6ef18aec478d48563965da94594408d3c86450d3";
+            };
+            beamDeps  = [ timex_0_13_5 ];
+
+            meta = {
+              longDescription = ''A latency / fault tolerance library to help
+                                isolate your applications from an uncertain
+                                world of slow or failed services.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tobz/elistrix";
+            };
+          }
+      ) {};
+
+    elistrix = elistrix_0_0_5;
+
+    elixilorem_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "elixilorem";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "elixilorem";
+              version = "0.0.1";
+              sha256 =
+                "fbe0f40bed9e3e3db687e88d3afb24e1a81ae274582170d1ca0545e13638cbea";
+            };
+
+            meta = {
+              description = ''A Lorem Ipsum generator for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mgamini/elixilorem";
+            };
+          }
+      ) {};
+
+    elixilorem = elixilorem_0_0_1;
+
+    elixir_ale_0_4_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "elixir_ale";
+            version = "0.4.1";
+            src = fetchHex {
+              pkg = "elixir_ale";
+              version = "0.4.1";
+              sha256 =
+                "2ee5c6989a8005a0ab8f1aea0b4f89b5feae75be78a70bade6627c3624c59c46";
+            };
+
+            meta = {
+              description = ''Elixir access to hardware I/O interfaces such as
+                            GPIO, I2C, and SPI.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/fhunleth/elixir_ale";
+            };
+          }
+      ) {};
+
+    elixir_ale = elixir_ale_0_4_1;
+
+    elixir_ami_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "elixir_ami";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "elixir_ami";
+              version = "0.0.3";
+              sha256 =
+                "781171af1bcc20466117fb119646b55ad473c93ce57549ffec4c65f7ba8a1ede";
+            };
+
+            meta = {
+              longDescription = ''Elixir client for the Asterisk AMI protocol.
+                                Find the user guide in the github repo at:
+                                https://github.com/marcelog/elixir_ami.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/marcelog/elixir_ami";
+            };
+          }
+      ) {};
+
+    elixir_ami = elixir_ami_0_0_3;
+
+    elixir_authorizenet_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex, xml_builder_0_0_8, exmerl_0_1_1 }:
+          buildMix {
+            name = "elixir_authorizenet";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "elixir_authorizenet";
+              version = "0.2.1";
+              sha256 =
+                "ac690facc36206982a7bc1eca4cf3d50a68194e05c2cf927e0e3f166c71e9f0f";
+            };
+            beamDeps  = [ xml_builder_0_0_8 exmerl_0_1_1 ];
+
+            meta = {
+              longDescription = ''Elixir client for the Authorize.Net merchant
+                                API. This should help you integrate using the
+                                AIM. A nice number of features are implemented
+                                (probably most of the ones used on a daily basis
+                                are already there), but since the API offers a
+                                big number of features and combinations, I still
+                                consider this as WIP, and pull requests,
+                                suggestions, or other kind of feedback are very
+                                welcome! Find the user guide in the github repo
+                                at:
+                                https://github.com/marcelog/elixir_authorizenet.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/marcelog/elixir_authorizenet";
+            };
+          }
+      ) {};
+
+    elixir_authorizenet = elixir_authorizenet_0_2_1;
+
+    elixir_bencode_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "elixir_bencode";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "elixir_bencode";
+              version = "1.0.0";
+              sha256 =
+                "2c4c86843b2377182da7cff125784a227c7bc63ef9e92ce7257f14b132667ebe";
+            };
+
+            meta = {
+              description = ''Bencode encoder / decoder in Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/AntonFagerberg/elixir_bencode";
+            };
+          }
+      ) {};
+
+    elixir_bencode = elixir_bencode_1_0_0;
+
+    elixir_drawille_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, ex_doc_0_10_0, earmark_0_1_19 }:
+          buildMix {
+            name = "elixir_drawille";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "elixir_drawille";
+              version = "0.0.3";
+              sha256 =
+                "5fab2af19c8f8c68e62aa4f0a3c17d23a9519e998617470df3ae3cb59516c52c";
+            };
+            beamDeps  = [ ex_doc_0_10_0 earmark_0_1_19 ];
+
+            meta = {
+              description = ''Drawings using terminal braille characters.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/massn/elixir-drawille";
+            };
+          }
+      ) {};
+
+    elixir_drawille = elixir_drawille_0_0_3;
+
+    elixir_exif_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "elixir_exif";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "elixir_exif";
+              version = "0.1.0";
+              sha256 =
+                "9d8e79d247495347c15d89172e86b49b3c9592b8df8d70ec0a4db126c3cd599b";
+            };
+
+            meta = {
+              description = ''Parse exif and thumbnail data from jpeg/tiff
+                            images.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sschneider1207/ElixirExif";
+            };
+          }
+      ) {};
+
+    elixir_exif = elixir_exif_0_1_0;
+
+    elixir_feed_parser_0_9_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "elixir_feed_parser";
+            version = "0.9.0";
+            src = fetchHex {
+              pkg = "elixir_feed_parser";
+              version = "0.9.0";
+              sha256 =
+                "35e0164c63e513d100008a9ada090ba6f1efe89cafc7995f321c0168e39cce5c";
+            };
+
+            meta = {
+              description = ''An Elixir Atom/RSS2 feed parser.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/fdietz/elixir-feed-parser";
+            };
+          }
+      ) {};
+
+    elixir_feed_parser = elixir_feed_parser_0_9_0;
+
+    elixir_freshbooks_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, xml_builder_0_0_8, exmerl_0_1_1 }:
+          buildMix {
+            name = "elixir_freshbooks";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "elixir_freshbooks";
+              version = "0.0.2";
+              sha256 =
+                "a40deaaf4400c0de95b7bf4b19fc9216a063e44854113301914b7b893e8c66d4";
+            };
+            beamDeps  = [ xml_builder_0_0_8 exmerl_0_1_1 ];
+
+            meta = {
+              description = ''Elixir client for FreshBooks.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/marcelog/elixir_freshbooks";
+            };
+          }
+      ) {};
+
+    elixir_freshbooks = elixir_freshbooks_0_0_2;
+
+    elixir_ipfs_api_0_1_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1, ex_doc_0_10_0
+        }:
+          buildMix {
+            name = "elixir_ipfs_api";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "elixir_ipfs_api";
+              version = "0.1.0";
+              sha256 =
+                "b8b6656ce18ff070b2328436cfa3d55f08b3e0a2f98bee49d4b3cb49c144684b";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ex_doc_0_10_0 ];
+
+            meta = {
+              description = ''An elixir client library for the IPFS API'';
+
+            };
+          }
+      ) {};
+
+    elixir_ipfs_api = elixir_ipfs_api_0_1_0;
+
+    elixir_locker_0_1_4 = callPackage
+      (
+        {  buildMix, fetchHex, locker_1_0_8 }:
+          buildMix {
+            name = "elixir_locker";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "elixir_locker";
+              version = "0.1.4";
+              sha256 =
+                "cca190b5846f37dfaaa495981b92e34015ca0dd0a879d200be90333f3866ceb2";
+            };
+            beamDeps  = [ locker_1_0_8 ];
+
+            meta = {
+              description = ''Elixir wrapper for the locker Erlang library.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tsharju/elixir_locker";
+            };
+          }
+      ) {};
+
+    elixir_locker = elixir_locker_0_1_4;
+
+    elixir_mbcs_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "elixir_mbcs";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "elixir_mbcs";
+              version = "0.1.2";
+              sha256 =
+                "45d2572ed4c2bae10e961ddf95846ffd64f83ed7427898b8fdf3221607f610b5";
+            };
+
+            meta = {
+              description = ''Convert the character encoding'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/woxtu/elixir-mbcs";
+            };
+          }
+      ) {};
+
+    elixir_mbcs = elixir_mbcs_0_1_2;
+
+    elixir_mod_event_0_0_5 = callPackage
+      (
+        {  buildMix, fetchHex, uuid_1_1_3 }:
+          buildMix {
+            name = "elixir_mod_event";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "elixir_mod_event";
+              version = "0.0.5";
+              sha256 =
+                "d38fe29a32107e889c52f849ceec6267709591b7db98db14bd3890683ca78b0f";
+            };
+            beamDeps  = [ uuid_1_1_3 ];
+
+            meta = {
+              longDescription = ''Elixir client for FreeSWITCH
+                                mod_event_socket. Find the user guide in the
+                                github repo at:
+                                https://github.com/marcelog/elixir_mod_event.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/marcelog/elixir_mod_event";
+            };
+          }
+      ) {};
+
+    elixir_mod_event = elixir_mod_event_0_0_5;
+
+    elixir_nsq_1_0_3 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          uuid_1_1_3,
+          socket_0_3_1,
+          poison_1_5_2,
+          httpotion_2_1_0
+        }:
+          buildMix {
+            name = "elixir_nsq";
+            version = "1.0.3";
+            src = fetchHex {
+              pkg = "elixir_nsq";
+              version = "1.0.3";
+              sha256 =
+                "6d30c3754dfdd988f927b9c6ae51d3e0ec4b0d2477b99047baf7a52c96bf9494";
+            };
+            beamDeps  = [
+                          uuid_1_1_3 socket_0_3_1 poison_1_5_2 httpotion_2_1_0
+                        ];
+
+            meta = {
+              longDescription = ''A client library for NSQ, `elixir_nsq` aims
+                                to be complete, easy to use, and well tested.
+                                Developed at Wistia (http://wistia.com).'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/wistia/elixir_nsq";
+            };
+          }
+      ) {};
+
+    elixir_nsq = elixir_nsq_1_0_3;
+
+    elixir_radius_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "elixir_radius";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "elixir_radius";
+              version = "0.1.0";
+              sha256 =
+                "40f4c2a792c5967e21d4e7914a91a62fbed3712bf9c6ec5f0a549e659e4ddc94";
+            };
+
+            meta = {
+              description = ''Decode & encode RADIUS packets '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bearice/elixir-radius";
+            };
+          }
+      ) {};
+
+    elixir_radius = elixir_radius_0_1_0;
+
+    elixir_script_0_15_2 = callPackage
+      (
+        {  buildMix, fetchHex, estree_2_2_0 }:
+          buildMix {
+            name = "elixir_script";
+            version = "0.15.2";
+            src = fetchHex {
+              pkg = "elixir_script";
+              version = "0.15.2";
+              sha256 =
+                "daa98f9f065576450843e9f867c7c8afe38edb29345aec276c112e4786ff2f5c";
+            };
+            beamDeps  = [ estree_2_2_0 ];
+
+            meta = {
+              description = ''ElixirScript: compiles Elixir code to
+                            JavaScript'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bryanjos/elixirscript";
+            };
+          }
+      ) {};
+
+    elixir_script = elixir_script_0_15_2;
+
+    elixir_talk_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "elixir_talk";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "elixir_talk";
+              version = "1.0.1";
+              sha256 =
+                "846a7a66fbc11ed09aec93130da1fc034d28b8e5241b585ebeaaca5b38e0e0d2";
+            };
+
+            meta = {
+              description = ''ElixirTalk is an Elixir client for beanstalkd.
+                            '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jsvisa/elixir_talk";
+            };
+          }
+      ) {};
+
+    elixir_talk = elixir_talk_1_0_1;
+
+    elixir_tea_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "elixir_tea";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "elixir_tea";
+              version = "1.0.0";
+              sha256 =
+                "c1e46d2d7b07a926ba8730452f517db45cf4f8f35d119b84aa0f0f676048cdcc";
+            };
+
+            meta = {
+              description = ''A TEA (Tiny Encryption Algorithm) implemented in
+                            pure Elixir. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/keichan34/elixir_tea";
+            };
+          }
+      ) {};
+
+    elixir_tea = elixir_tea_1_0_0;
+
+    elixlsx_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "elixlsx";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "elixlsx";
+              version = "0.0.2";
+              sha256 =
+                "59778841cecdaec28cf6b008add62a7653a4bd5eb9031e6fb0a076cc9e69fb3d";
+            };
+
+            meta = {
+              description = ''a writer for XLSX spreadsheet files'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/xou/elixlsx";
+            };
+          }
+      ) {};
+
+    elixlsx = elixlsx_0_0_2;
+
+    elixtagram_0_2_5 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_1_5_2, oauth2_0_5_0, httpoison_0_7_5
+        }:
+          buildMix {
+            name = "elixtagram";
+            version = "0.2.5";
+            src = fetchHex {
+              pkg = "elixtagram";
+              version = "0.2.5";
+              sha256 =
+                "71503f2bfec0d4728449321e4e1aaae7c8ae24974d53b904327bcef5b16e6900";
+            };
+            beamDeps  = [ poison_1_5_2 oauth2_0_5_0 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''Instagram client library for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zensavona/elixtagram";
+            };
+          }
+      ) {};
+
+    elixtagram = elixtagram_0_2_5;
+
+    elli_1_0_4 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "elli";
+            version = "1.0.4";
+            src = fetchHex {
+              pkg = "elli";
+              version = "1.0.4";
+              sha256 =
+                "87641b9c069b1372dac4e1bdda795076ea3142af78aac0d63896a38079e89e8e";
+            };
+
+            meta = {
+              description = ''Fast and robust web server for building
+                            high-throughput, low-latency apps'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/knutin/elli";
+            };
+          }
+      ) {};
+
+    elli = elli_1_0_4;
+
+    elmit_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, httpotion_2_1_0 }:
+          buildMix {
+            name = "elmit";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "elmit";
+              version = "0.0.1";
+              sha256 =
+                "90e5df811553733dd7505f9cc81397c3bdaf9c336eb3542c7e44f3c2012ef96e";
+            };
+            beamDeps  = [ httpotion_2_1_0 ];
+
+            meta = {
+              description = ''Google Translate with speech synthesis in your
+                            terminal as Hex package.'';
+
+            };
+          }
+      ) {};
+
+    elmit = elmit_0_0_1;
+
+    email_checker_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, socket_0_3_1 }:
+          buildMix {
+            name = "email_checker";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "email_checker";
+              version = "0.0.3";
+              sha256 =
+                "feac6fa5cc1343b437221ace18fa8fa7251dfa777e986063e13f435d6aff990c";
+            };
+            beamDeps  = [ socket_0_3_1 ];
+
+            meta = {
+              longDescription = ''Simple library checking the validity of an
+                                email. Checks are performed in the following
+                                order: - REGEX: validate the emails has a good
+                                looking format - MX: validate the domain sever
+                                contains MX records - SMTP: validate the SMTP
+                                behind the MX records knows this email address
+                                (no email sent)'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/kdisneur/email_checker";
+            };
+          }
+      ) {};
+
+    email_checker = email_checker_0_0_3;
+
+    eministat_0_10_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "eministat";
+            version = "0.10.1";
+            src = fetchHex {
+              pkg = "eministat";
+              version = "0.10.1";
+              sha256 =
+                "1e581fe282e8851c036fb6e4908add91956eba62ce0cce97fceee66067157d5f";
+            };
+
+            meta = {
+              description = ''Basic statistics for comparing datasets from
+                            benchmarks'';
+
+            };
+          }
+      ) {};
+
+    eministat = eministat_0_10_1;
+
+    eml_0_7_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "eml";
+            version = "0.7.1";
+            src = fetchHex {
+              pkg = "eml";
+              version = "0.7.1";
+              sha256 =
+                "f03a35e2684455ee9e8b641f9550d41893f5b013c1277751685414f56cee9c0a";
+            };
+
+            meta = {
+              longDescription = ''Eml makes markup a first class citizen in
+                                Elixir. It provides a flexible and modular
+                                toolkit for generating, parsing and manipulating
+                                markup. It`s main focus is html, but other
+                                markup languages could be implemented as well.
+                                '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/zambal/eml";
+            };
+          }
+      ) {};
+
+    eml = eml_0_7_1;
+
+    emodel_1_3_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "emodel";
+            version = "1.3.1";
+            src = fetchHex {
+              pkg = "emodel";
+              version = "1.3.1";
+              sha256 =
+                "6271ac4fb20c81b60ce568345ddec8abaea59a6b1eb63aa35ada25a009464ce2";
+            };
+
+            meta = {
+              description = ''Erlang data transformation/validation library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/egobrain/emodel";
+            };
+          }
+      ) {};
+
+    emodel = emodel_1_3_1;
+
+    enotify_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "enotify";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "enotify";
+              version = "0.1.0";
+              sha256 =
+                "8e48da763ce15bfd75cc857ddfe5011b03189d597f47bcdd8acc6fbbe8e6b6f4";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''Filesystem listener'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tsloughter/enotify";
+            };
+          }
+      ) {};
+
+    enotify = enotify_0_1_0;
+
+    ensq_0_1_6 = callPackage
+      (
+        {  buildRebar3, fetchHex, lager_2_1_1, jsxd_0_1_10, jsx_1_4_5 }:
+          buildRebar3 {
+            name = "ensq";
+            version = "0.1.6";
+            src = fetchHex {
+              pkg = "ensq";
+              version = "0.1.6";
+              sha256 =
+                "dd8c167eef061bb80384b34a81dc9a2079d42b254bd4ecbb0aa586937182a466";
+            };
+
+            beamDeps  = [ lager_2_1_1 jsxd_0_1_10 jsx_1_4_5 ];
+
+            meta = {
+              description = ''Erlang client for NSQ'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/project-fifo/ensq";
+            };
+          }
+      ) {};
+
+    ensq = ensq_0_1_6;
+
+    env_conf_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex, earmark_0_1_19 }:
+          buildMix {
+            name = "env_conf";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "env_conf";
+              version = "0.3.0";
+              sha256 =
+                "b1d9732ed635d2dea5bcd74a512e7274350361bc3de12080a03e985d7df3d900";
+            };
+            beamDeps  = [ earmark_0_1_19 ];
+
+            meta = {
+              description = '' A simple 12-Factor configuration service for
+                            Elixir. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/leakybucket/env_conf.git";
+            };
+          }
+      ) {};
+
+    env_conf = env_conf_0_3_0;
+
+    envy_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "envy";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "envy";
+              version = "0.0.2";
+              sha256 =
+                "01e20425b7b5acfa1f43d7431601015e059d9363bf9d50b00f2aeb6b0e3fa03f";
+            };
+
+            meta = {
+              description = ''A package for managing env files'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/BlakeWilliams/envy";
+            };
+          }
+      ) {};
+
+    envy = envy_0_0_2;
+
+    eper_0_94_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "eper";
+            version = "0.94.0";
+            src = fetchHex {
+              pkg = "eper";
+              version = "0.94.0";
+              sha256 =
+                "8d853792fa61a7fd068fe9c113a8a44bc839e11ad70cb8d5d2884566e3bede39";
+            };
+
+            meta = {
+              longDescription = ''Erlang Performance and Debugging Tools sherk
+                                - a profiler, similar to Linux oprofile or MacOs
+                                shark gperf - a graphical performance monitor;
+                                shows CPU, memory and network usage dtop -
+                                similar to unix top redbug- similar to the OTP
+                                dbg application, but safer, better etc.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/massemanet/eper";
+            };
+          }
+      ) {};
+
+    eper = eper_0_94_0;
+
+    epgsql_3_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "epgsql";
+            version = "3.1.1";
+            src = fetchHex {
+              pkg = "epgsql";
+              version = "3.1.1";
+              sha256 =
+                "4b3f478ad090aed7200b2a8c9f2d5ef45c3aaa167be896b5237bba4b40f461d8";
+            };
+
+            meta = {
+              description = ''PostgreSQL Client'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/epgsql/epgsql";
+            };
+          }
+      ) {};
+
+    epgsql = epgsql_3_1_1;
+
+    episcina_1_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, gproc_0_3_1 }:
+          buildRebar3 {
+            name = "episcina";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "episcina";
+              version = "1.1.0";
+              sha256 =
+                "16238717bfbc8cb226342f6b098bb1fafb48c7547265a10ad3e6e83899abc46f";
+            };
+
+            beamDeps  = [ gproc_0_3_1 ];
+
+            meta = {
+              description = ''Erlang Connection Pool'';
+
+            };
+          }
+      ) {};
+
+    episcina = episcina_1_1_0;
+
+    eplugin_0_1_4 = callPackage
+      (
+        {  buildRebar3, fetchHex, lager_2_1_1 }:
+          buildRebar3 {
+            name = "eplugin";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "eplugin";
+              version = "0.1.4";
+              sha256 =
+                "5103579323fb71e2c245fb5886c53e9ff4115282c09ecb5368b0ae293f0b20fe";
+            };
+
+            beamDeps  = [ lager_2_1_1 ];
+
+            meta = {
+              description = ''plugin provider for erlang'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/Licenser/eplugin";
+            };
+          }
+      ) {};
+
+    eplugin = eplugin_0_1_4;
+
+    epubnub_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, jsx_2_7_1, hackney_1_3_2 }:
+          buildRebar3 {
+            name = "epubnub";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "epubnub";
+              version = "0.1.0";
+              sha256 =
+                "5a3b21ea035b1a7d89eeaf062da946fb17682a72fb9ae12d313677552f63fa69";
+            };
+
+            beamDeps  = [ jsx_2_7_1 hackney_1_3_2 ];
+
+            meta = {
+              description = ''Erlang PubNub API'';
+
+            };
+          }
+      ) {};
+
+    epubnub = epubnub_0_1_0;
+
+    eqc_ex_1_2_4 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "eqc_ex";
+            version = "1.2.4";
+            src = fetchHex {
+              pkg = "eqc_ex";
+              version = "1.2.4";
+              sha256 =
+                "2d2895bedf784ffaf11144d25e6ca11a4cfff5b73c35ec6bedd3c5ec5cabc5e9";
+            };
+
+            meta = {
+              description = ''Wrappers to facilitate using Quviq QuickCheck
+                            with Elixir.'';
+              license = stdenv.lib.licenses.bsd3;
+            };
+          }
+      ) {};
+
+    eqc_ex = eqc_ex_1_2_4;
+
+    eql_0_1_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "eql";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "eql";
+              version = "0.1.2";
+              sha256 =
+                "3b1a85c491d44262802058c0de97a2c90678d5d45851b88a076b1a45a8d6d4b3";
+            };
+
+            meta = {
+              description = ''Erlang with SQL'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/artemeff/eql";
+            };
+          }
+      ) {};
+
+    eql = eql_0_1_2;
+
+    eredis_1_0_8 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "eredis";
+            version = "1.0.8";
+            src = fetchHex {
+              pkg = "eredis";
+              version = "1.0.8";
+              sha256 =
+                "f303533e72129b264a2d8217c4ddc977c7527ff4b8a6a55f92f62b7fcc099334";
+            };
+
+            meta = {
+              description = ''Erlang Redis client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/wooga/eredis";
+            };
+          }
+      ) {};
+
+    eredis = eredis_1_0_8;
+
+    eredis_cluster_0_5_4 = callPackage
+      (
+        {  buildRebar3, fetchHex, poolboy_1_5_1, eredis_1_0_8 }:
+          buildRebar3 {
+            name = "eredis_cluster";
+            version = "0.5.4";
+            src = fetchHex {
+              pkg = "eredis_cluster";
+              version = "0.5.4";
+              sha256 =
+                "09320fe4fb737923e254d6d7ff4da421c1515fc74be9d2d9482ee4a576367681";
+            };
+
+            beamDeps  = [ poolboy_1_5_1 eredis_1_0_8 ];
+
+            meta = {
+              description = ''An erlang wrapper for eredis library to support
+                            cluster mode'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/adrienmo/eredis_cluster";
+            };
+          }
+      ) {};
+
+    eredis_cluster = eredis_cluster_0_5_4;
+
+    erl2ex_0_0_7 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "erl2ex";
+            version = "0.0.7";
+            src = fetchHex {
+              pkg = "erl2ex";
+              version = "0.0.7";
+              sha256 =
+                "2df3a8441cb059784523f7e2da15e897cf211a6cfec942c63032a4e5798805f1";
+            };
+
+            meta = {
+              longDescription = ''Erl2ex is an Erlang to Elixir transpiler,
+                                converting well-formed Erlang source to Elixir
+                                source with equivalent functionality.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/dazuma/erl2ex";
+            };
+          }
+      ) {};
+
+    erl2ex = erl2ex_0_0_7;
+
+    erlang_localtime_1_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "erlang_localtime";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "erlang_localtime";
+              version = "1.0.0";
+              sha256 =
+                "46e3f7b18477b377ec71f9dcd91c4d30fe82a128ffa9f89be1595d4d08414844";
+            };
+
+            meta = {
+              description = ''Erlang library for conversion from one local time
+                            to another'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/choptastic/erlang_localtime";
+            };
+          }
+      ) {};
+
+    erlang_localtime = erlang_localtime_1_0_0;
+
+    erlang_lua_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "erlang_lua";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "erlang_lua";
+              version = "0.1.0";
+              sha256 =
+                "4376a57f86e43ae1d687dca8b6c7c7f692b95d30091a9550636328358026e6eb";
+            };
+            compilePorts = true;
+
+            meta = {
+              longDescription = ''Erlang-lua hex package, using Erlang`s Port
+                                and C Node to run Lua VM as an external Node'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rtraschke/erlang-lua";
+            };
+          }
+      ) {};
+
+    erlang_lua = erlang_lua_0_1_0;
+
+    erlang_term_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "erlang_term";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "erlang_term";
+              version = "1.5.1";
+              sha256 =
+                "88bae81a80306e82fd3fc43e2d8228049e666f3cfe4627687832cd7edb878e06";
+            };
+
+            meta = {
+              description = ''Provide the in-memory size of Erlang terms'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/erlang_term";
+            };
+          }
+      ) {};
+
+    erlang_term = erlang_term_1_5_1;
+
+    erlang_version_0_2_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "erlang_version";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "erlang_version";
+              version = "0.2.0";
+              sha256 =
+                "74daddba65a247ec57913e5de8f243af42bbbc3d6a0c411a1252da81c09ae661";
+            };
+
+            meta = {
+              description = ''Retrieve Erlang/OTP version like `18.1`'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sapporo-beam/erlang_version";
+            };
+          }
+      ) {};
+
+    erlang_version = erlang_version_0_2_0;
+
+    erlastic_search_1_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, jsx_2_6_2, hackney_1_1_0 }:
+          buildRebar3 {
+            name = "erlastic_search";
+            version = "1.1.1";
+            src = fetchHex {
+              pkg = "erlastic_search";
+              version = "1.1.1";
+              sha256 =
+                "ac15a64db1397b616e1308b997d5de5372a3f67bd2bbdbf32b22d635befcc55a";
+            };
+
+            beamDeps  = [ jsx_2_6_2 hackney_1_1_0 ];
+
+            meta = {
+              description = ''An Erlang app for communicating with Elastic
+                            Search`s rest interface.'';
+              license = stdenv.lib.licenses.lpgl3;
+              homepage = "https://github.com/tsloughter/erlastic_search";
+            };
+          }
+      ) {};
+
+    erlastic_search = erlastic_search_1_1_1;
+
+    erlaudio_0_2_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "erlaudio";
+            version = "0.2.3";
+            src = fetchHex {
+              pkg = "erlaudio";
+              version = "0.2.3";
+              sha256 =
+                "cb9efb0ce80faae003ab39f8cc2d3fccbb4bd1c8f5f525aea392f28662517032";
+            };
+
+            meta = {
+              description = ''Erlang audio bindings to portaudio'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/asonge/erlaudio";
+            };
+          }
+      ) {};
+
+    erlaudio = erlaudio_0_2_3;
+
+    erlcloud_0_13_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, lhttpc_1_3_0, jsx_2_8_0 }:
+          buildRebar3 {
+            name = "erlcloud";
+            version = "0.13.0";
+            src = fetchHex {
+              pkg = "erlcloud";
+              version = "0.13.0";
+              sha256 =
+                "70e1f5aa86b5f7a62d1141a7507a9e334f833793e3b909fe9c1cfc9916e516a0";
+            };
+
+            beamDeps  = [ lhttpc_1_3_0 jsx_2_8_0 ];
+
+            meta = {
+              description = ''Erlang cloud computing library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/erlcloud/erlcloud";
+            };
+          }
+      ) {};
+
+    erlcloud = erlcloud_0_13_0;
+
+    erlcloud_0_9_2 = callPackage
+      (
+        {  buildRebar3, fetchHex, meck_0_8_4, lhttpc_1_3_0, jsx_2_4_0 }:
+          buildRebar3 {
+            name = "erlcloud";
+            version = "0.9.2";
+            src = fetchHex {
+              pkg = "erlcloud";
+              version = "0.9.2";
+              sha256 =
+                "739ab77c3f007b3c8466e093726fb3e62b19691d70dbff4defc4beac61e48f12";
+            };
+
+            beamDeps  = [ meck_0_8_4 lhttpc_1_3_0 jsx_2_4_0 ];
+
+            meta = {
+              description = ''Erlang cloud computing library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/erlcloud/erlcloud";
+            };
+          }
+      ) {};
+
+    erldn_1_0_5 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "erldn";
+            version = "1.0.5";
+            src = fetchHex {
+              pkg = "erldn";
+              version = "1.0.5";
+              sha256 =
+                "b7fdafda24884ab52dc453a18a99ad3d31fa690770d2d50f8e5bdbc3fff0f166";
+            };
+
+            meta = {
+              description = ''An edn parser for the Erlang platform.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/marianoguerra/erldn";
+            };
+          }
+      ) {};
+
+    erldn = erldn_1_0_5;
+
+    erlexec_1_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "erlexec";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "erlexec";
+              version = "1.1.0";
+              sha256 =
+                "772162f0f0349f89ea11b9f27401cb437ccaabf480320284a13f2259bb63cb87";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''OS Process Manager'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/saleyn/erlexec";
+            };
+          }
+      ) {};
+
+    erlexec = erlexec_1_1_0;
+
+    erlsh_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "erlsh";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "erlsh";
+              version = "0.1.0";
+              sha256 =
+                "94ef1492dd59fef211f01ffd40c47b6e51c0f59e2a3d0739366e4890961332d9";
+            };
+            compilePorts = true;
+
+            meta = {
+              longDescription = ''Family of functions and ports involving
+                                interacting with the system shell, paths and
+                                external programs.'';
+
+            };
+          }
+      ) {};
+
+    erlsh = erlsh_0_1_0;
+
+    erlsom_1_2_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "erlsom";
+            version = "1.2.1";
+            src = fetchHex {
+              pkg = "erlsom";
+              version = "1.2.1";
+              sha256 =
+                "e8f4d1d83583df7d1db8346aa30b82a6599b93fcc4b2d9165007e02ed40e7cae";
+            };
+
+            meta = {
+              description = ''erlsom XSD parser'';
+
+            };
+          }
+      ) {};
+
+    erlsom = erlsom_1_2_1;
+
+    erltrace_0_1_4 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "erltrace";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "erltrace";
+              version = "0.1.4";
+              sha256 =
+                "821452cb6d470cfe22cd1793c94c4e499957c72944a5d8781253aeb5b610acb0";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''erlang dtrace consumer.'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/project-fifo/erltrace";
+            };
+          }
+      ) {};
+
+    erltrace = erltrace_0_1_4;
+
+    erlware_commons_0_14_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "erlware_commons";
+            version = "0.14.0";
+            src = fetchHex {
+              pkg = "erlware_commons";
+              version = "0.14.0";
+              sha256 =
+                "ec36ca48ce0d4e64a7b0e00771260257e91162816254dc2d8d3cc9f83285dafe";
+            };
+
+            meta = {
+              description = ''Additional standard library for Erlang'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/erlware/erlware_commons";
+            };
+          }
+      ) {};
+
+    erlware_commons_0_15_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "erlware_commons";
+            version = "0.15.0";
+            src = fetchHex {
+              pkg = "erlware_commons";
+              version = "0.15.0";
+              sha256 =
+                "5f38cb1df90148a7b21d48b221f399244ce86256584e6ea7986f2de732dee3c6";
+            };
+
+            meta = {
+              description = ''Additional standard library for Erlang'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/erlware/erlware_commons";
+            };
+          }
+      ) {};
+
+    erlware_commons_0_18_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, cf_0_2_1 }:
+          buildRebar3 {
+            name = "erlware_commons";
+            version = "0.18.0";
+            src = fetchHex {
+              pkg = "erlware_commons";
+              version = "0.18.0";
+              sha256 =
+                "e71dda7cd5dcf34c9d07255d49c67e1d229dd230c101fdb996820bcdb5b03c49";
+            };
+
+            beamDeps  = [ cf_0_2_1 ];
+
+            meta = {
+              description = ''Additional standard library for Erlang'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/erlware/erlware_commons";
+            };
+          }
+      ) {};
+
+    erlware_commons_0_19_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, cf_0_2_1 }:
+          buildRebar3 {
+            name = "erlware_commons";
+            version = "0.19.0";
+            src = fetchHex {
+              pkg = "erlware_commons";
+              version = "0.19.0";
+              sha256 =
+                "5bbff9402cd9e973af81745a8a40177d245b55b4c239f80a236949b856f2dabd";
+            };
+
+            beamDeps  = [ cf_0_2_1 ];
+
+            meta = {
+              description = ''Additional standard library for Erlang'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/erlware/erlware_commons";
+            };
+          }
+      ) {};
+
+    erlware_commons = erlware_commons_0_19_0;
+
+    erlydtl_0_11_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "erlydtl";
+            version = "0.11.1";
+            src = fetchHex {
+              pkg = "erlydtl";
+              version = "0.11.1";
+              sha256 =
+                "b1958c0ec95de69458c6af8b5bffbdde0070d5042710a63b1616cacdf39ae188";
+            };
+
+            meta = {
+              description = ''Django Template Language for Erlang'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/project-fifo/fifo_spec";
+            };
+          }
+      ) {};
+
+    erlydtl = erlydtl_0_11_1;
+
+    erlydtl2_0_11_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "erlydtl2";
+            version = "0.11.1";
+            src = fetchHex {
+              pkg = "erlydtl2";
+              version = "0.11.1";
+              sha256 =
+                "ae0d9f293ce8a2eeaabedf2b5f950d21e14570e67e5a38c11fe1e4ca598e6d5b";
+            };
+
+            meta = {
+              description = ''Django Template Language for Erlang'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/erlydtl/erlydtl";
+            };
+          }
+      ) {};
+
+    erlydtl2 = erlydtl2_0_11_1;
+
+    erlzk_0_6_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "erlzk";
+            version = "0.6.1";
+            src = fetchHex {
+              pkg = "erlzk";
+              version = "0.6.1";
+              sha256 =
+                "6bba045ad0b7beb566825b463ada2464929655ce01e291022c1efed81a674759";
+            };
+
+            meta = {
+              description = ''A Pure Erlang ZooKeeper Client (no C
+                            dependency)'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/huaban/erlzk";
+            };
+          }
+      ) {};
+
+    erlzk = erlzk_0_6_1;
+
+    es_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "es";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "es";
+              version = "0.0.1";
+              sha256 =
+                "88a8f096177d111f82e8c05b611a3ec067abecb2612f44abb9a12eff06218d48";
+            };
+
+            meta = {
+              description = ''A shell. With stuff.'';
+
+            };
+          }
+      ) {};
+
+    es = es_0_0_1;
+
+    escalus_2_6_4 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "escalus";
+            version = "2.6.4";
+            src = fetchHex {
+              pkg = "escalus";
+              version = "2.6.4";
+              sha256 =
+                "f5227c39ddbdeb1056fd69eef1c8a80364fb8b690b98d662b126bb95f4108d66";
+            };
+
+            meta = {
+              description = ''Escalus is an Erlang XMPP client library'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/esl/escalus";
+            };
+          }
+      ) {};
+
+    escalus = escalus_2_6_4;
+
+    esel_0_1_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "esel";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "esel";
+              version = "0.1.2";
+              sha256 =
+                "874d1775c86d27d9e88486a37351ffc09f826ef062c8ea211e65d08e103f946c";
+            };
+
+            meta = {
+              description = ''An wrapper around openssl'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    esel = esel_0_1_2;
+
+    esip_1_0_2 = callPackage
+      (
+        {
+          buildRebar3, fetchHex, stun_1_0_1, p1_utils_1_0_3, fast_tls_1_0_1
+        }:
+          buildRebar3 {
+            name = "esip";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "esip";
+              version = "1.0.2";
+              sha256 =
+                "659b684d2573a52dfe411f20a36b704c41183b4c8206261229bfad12404d1cf7";
+            };
+            compilePorts = true;
+            beamDeps  = [ stun_1_0_1 p1_utils_1_0_3 fast_tls_1_0_1 ];
+
+            meta = {
+              description = ''ProcessOne SIP server component in Erlang'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/processone/esip";
+            };
+          }
+      ) {};
+
+    esip = esip_1_0_2;
+
+    espec_0_8_11 = callPackage
+      (
+        {  buildMix, fetchHex, meck_0_8_4 }:
+          buildMix {
+            name = "espec";
+            version = "0.8.11";
+            src = fetchHex {
+              pkg = "espec";
+              version = "0.8.11";
+              sha256 =
+                "a30b084605a8a4eaf41004e9c25036eb493d98cbc2118f18a0e648011a5c3bd1";
+            };
+            beamDeps  = [ meck_0_8_4 ];
+
+            meta = {
+              description = ''BDD test framework for Elixir inspired by
+                            RSpec.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/antonmi/espec";
+            };
+          }
+      ) {};
+
+    espec = espec_0_8_11;
+
+    espec_phoenix_0_2_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, phoenix_1_1_4, floki_0_7_1, espec_0_8_11
+        }:
+          buildMix {
+            name = "espec_phoenix";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "espec_phoenix";
+              version = "0.2.0";
+              sha256 =
+                "069e7df74370905cdce3c87144e707174c13e13c6541ecc4ac114465292bf08e";
+            };
+            beamDeps  = [ phoenix_1_1_4 floki_0_7_1 espec_0_8_11 ];
+
+            meta = {
+              description = ''ESpec for Phoenix web framework.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/antonmi/espec_phoenix";
+            };
+          }
+      ) {};
+
+    espec_phoenix = espec_phoenix_0_2_0;
+
+    esqlite_0_2_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "esqlite";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "esqlite";
+              version = "0.2.2";
+              sha256 =
+                "5f15f8014baa9d31ee83817afe9164b3ecd76f77b2de7515f2cca2ca75b642e0";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''A Sqlite3 NIF'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/mmzeeman/esqlite";
+            };
+          }
+      ) {};
+
+    esqlite = esqlite_0_2_2;
+
+    estree_2_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "estree";
+            version = "2.2.0";
+            src = fetchHex {
+              pkg = "estree";
+              version = "2.2.0";
+              sha256 =
+                "0adb199b79b31f05f2f01ab87f099ea84684ffffb1571fb33cde05500f9367f2";
+            };
+
+            meta = {
+              longDescription = ''Represents the JavaScript AST from the ESTree
+                                spec. Includes tools for building an AST and
+                                generating code from it.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bryanjos/elixir-estree";
+            };
+          }
+      ) {};
+
+    estree = estree_2_2_0;
+
+    esync_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "esync";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "esync";
+              version = "0.0.1";
+              sha256 =
+                "28a59a0cbe885ec39dec4992aac8495147d1ec9b623883b01e8aa775cb334f03";
+            };
+
+            meta = {
+              description = ''Concurrently sync two or more directories so that
+                            their contents are identical'';
+
+              homepage = "https://github.com/GrahamGoudeau21/ElixirSync";
+            };
+          }
+      ) {};
+
+    esync = esync_0_0_1;
+
+    etcd_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_2_0 }:
+          buildMix {
+            name = "etcd";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "etcd";
+              version = "0.0.2";
+              sha256 =
+                "c1b559bc37812b9ab488f90f322dc0b826c94ac9809d9044b42b4fb420710848";
+            };
+            beamDeps  = [ httpoison_0_8_1 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''Etcd APIv2 Client for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bearice/elixir-etcd";
+            };
+          }
+      ) {};
+
+    etcd = etcd_0_0_2;
+
+    ether_0_0_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "ether";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ether";
+              version = "0.0.1";
+              sha256 =
+                "867752143aa09e07d0a50ae9526b7c8f620e189f509326a635c304b453496f16";
+            };
+
+            meta = {
+              description = ''Elixir Debugger '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/maarek/ether";
+            };
+          }
+      ) {};
+
+    ether = ether_0_0_1;
+
+    ets_map_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ets_map";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ets_map";
+              version = "0.0.1";
+              sha256 =
+                "c33d714212c56d99b2472d522e24db808cd8a407101051d407be310412d61eae";
+            };
+
+            meta = {
+              description = ''A Map-like Elixir data structure that is backed
+                            by an ETS table.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/antipax/ets_map";
+            };
+          }
+      ) {};
+
+    ets_map = ets_map_0_0_1;
+
+    etude_0_3_7 = callPackage
+      (
+        {  buildMix, fetchHex, rebind_0_1_3, lineo_0_1_0 }:
+          buildMix {
+            name = "etude";
+            version = "0.3.7";
+            src = fetchHex {
+              pkg = "etude";
+              version = "0.3.7";
+              sha256 =
+                "ee18b03eec697eccfd7027c4aaaa944e0d3335ece6c150504248763d94bbc338";
+            };
+            beamDeps  = [ rebind_0_1_3 lineo_0_1_0 ];
+
+            meta = {
+              description = ''parallel computation coordination utilities for
+                            erlang/elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/camshaft/etude";
+            };
+          }
+      ) {};
+
+    etude_0_4_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, rebind_0_1_3, parse_trans_2_9_0, lineo_0_1_0
+        }:
+          buildMix {
+            name = "etude";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "etude";
+              version = "0.4.0";
+              sha256 =
+                "602db062916cfe50b82257f1fdce039b08584d7ff285183c3a51060f197b4f01";
+            };
+            beamDeps  = [ rebind_0_1_3 parse_trans_2_9_0 lineo_0_1_0 ];
+
+            meta = {
+              description = ''parallel computation coordination utilities for
+                            erlang/elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/camshaft/etude";
+            };
+          }
+      ) {};
+
+    etude = etude_0_4_0;
+
+    euler_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "euler";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "euler";
+              version = "0.0.1";
+              sha256 =
+                "ab12770dd81fbb20524c751f71a31b8cc16553404665a336212d20bf351eb0fc";
+            };
+
+            meta = {
+              longDescription = ''euler is a library that provides math
+                                functions. ## Features * Working with integers:
+                                * Greatest common divisor of two numbers (gcd)
+                                '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/magicienap/euler";
+            };
+          }
+      ) {};
+
+    euler = euler_0_0_1;
+
+    eunit_formatters_0_3_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "eunit_formatters";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "eunit_formatters";
+              version = "0.3.1";
+              sha256 =
+                "64a40741429b7aff149c605d5a6135a48046af394a7282074e6003b3b56ae931";
+            };
+
+            meta = {
+              description = ''Better output for eunit suites'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/seancribbs/eunit_formatters";
+            };
+          }
+      ) {};
+
+    eunit_formatters = eunit_formatters_0_3_1;
+
+    event_source_encoder_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "event_source_encoder";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "event_source_encoder";
+              version = "0.0.3";
+              sha256 =
+                "b930b7a8cf52e32913ba9bd333472253e2c100c91216c54dde043e5106d601df";
+            };
+
+            meta = {
+              longDescription = ''EventSourceEncoder is a Elixir library to
+                                encode data into EventSource compliant data. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/chatgris/event_source_encoder";
+            };
+          }
+      ) {};
+
+    event_source_encoder = event_source_encoder_0_0_3;
+
+    everex_0_1_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          plug_0_11_3,
+          oauther_1_0_2,
+          httpoison_0_7_5,
+          cowboy_1_0_4
+        }:
+          buildMix {
+            name = "everex";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "everex";
+              version = "0.1.1";
+              sha256 =
+                "3a85fc8d749b58c5fe87dc224cb7066cf1a45ac06d87c3661cd7a555076a901e";
+            };
+            beamDeps  = [
+                          plug_0_11_3 oauther_1_0_2 httpoison_0_7_5 cowboy_1_0_4
+                        ];
+
+            meta = {
+              longDescription = ''Evernote API client for Elixir NOTE: Everex
+                                is UNDER DEVELOPMENT, and is NOT ready for
+                                production use. Feedback and contributions (via
+                                pull requests) are very welcome, of course!
+                                UPDATE: There is now an example showing how to
+                                get access using the OAuth authentication
+                                process. See `examples/oauth.exs`. '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/jwarlander/everex";
+            };
+          }
+      ) {};
+
+    everex = everex_0_1_1;
+
+    everyoneapi_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_3_1, httpoison_0_7_5 }:
+          buildMix {
+            name = "everyoneapi";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "everyoneapi";
+              version = "0.0.1";
+              sha256 =
+                "8214fa434a10716f252bcbcb5660faddbc20909d1058d1b491c95132eb4b3182";
+            };
+            beamDeps  = [ poison_1_3_1 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''API Client for EveryoneAPI.com.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "http://github.com/knewter/everyoneapi";
+            };
+          }
+      ) {};
+
+    everyoneapi = everyoneapi_0_0_1;
+
+    ewebmachine_2_0_12 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "ewebmachine";
+            version = "2.0.12";
+            src = fetchHex {
+              pkg = "ewebmachine";
+              version = "2.0.12";
+              sha256 =
+                "66a4ca701594da9396d6bab03f074f1ab56080a62e6545e6e455a24296c96a1a";
+            };
+            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+
+            meta = {
+              longDescription = ''Ewebmachine contains macros and plugs to
+                                allow you to compose HTTP decision handlers and
+                                run the HTTP decision tree to get your HTTP
+                                response. This project is a rewrite for Elixir
+                                and Plug of basho webmachine.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "http://github.com/awetzel/ewebmachine";
+            };
+          }
+      ) {};
+
+    ewebmachine = ewebmachine_2_0_12;
+
+    ex2ms_1_3_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex2ms";
+            version = "1.3.0";
+            src = fetchHex {
+              pkg = "ex2ms";
+              version = "1.3.0";
+              sha256 =
+                "ff2bfb0adb93830705cd73f2860891fd44a8f22cc2fdaf9f23bfcf2e4bdcfa79";
+            };
+
+            meta = {
+              description = ''Translates Elixir functions to match
+                            specifications for use with `ets`.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/ericmj/ex2ms";
+            };
+          }
+      ) {};
+
+    ex2ms_1_4_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex2ms";
+            version = "1.4.0";
+            src = fetchHex {
+              pkg = "ex2ms";
+              version = "1.4.0";
+              sha256 =
+                "8a743796d9f067f047e50d9726dfd8eb2791e6ce00c79edbd5ced6a06fe5e388";
+            };
+
+            meta = {
+              description = ''Translates Elixir functions to match
+                            specifications for use with `ets`.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/ericmj/ex2ms";
+            };
+          }
+      ) {};
+
+    ex2ms = ex2ms_1_4_0;
+
+    ex_abnf_0_2_7 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_abnf";
+            version = "0.2.7";
+            src = fetchHex {
+              pkg = "ex_abnf";
+              version = "0.2.7";
+              sha256 =
+                "2ca070a97b392a142619f0a126e48c7e27d39353be9a76fb358c401821495e1a";
+            };
+
+            meta = {
+              longDescription = ''A parser and interpreter for ABNF grammars.
+                                This is not a parser generator, but an
+                                interpreter. It will load up an ABNF grammar,
+                                and generate an AST for it. Then one can apply
+                                any of the rules to an input and the interpreter
+                                will parse the input according to the rule.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/marcelog/ex_abnf";
+            };
+          }
+      ) {};
+
+    ex_abnf = ex_abnf_0_2_7;
+
+    ex_aerospike_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_aerospike";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ex_aerospike";
+              version = "0.0.1";
+              sha256 =
+                "3420ba4b94c25aca08106d58ce4bdc941767e588bf8092747a611e38a7b5e03f";
+            };
+             meta = {    };
+          }
+      ) {};
+
+    ex_aerospike = ex_aerospike_0_0_1;
+
+    ex_aws_0_4_17 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          sweet_xml_0_6_1,
+          poison_1_5_2,
+          jsx_2_8_0,
+          httpotion_2_2_0,
+          httpoison_0_8_1
+        }:
+          buildMix {
+            name = "ex_aws";
+            version = "0.4.17";
+            src = fetchHex {
+              pkg = "ex_aws";
+              version = "0.4.17";
+              sha256 =
+                "e0b28688f9409eb3132efc0d01e02854dd1a22fa7df8940ef88a75ba1448a01c";
+            };
+            beamDeps  = [
+                          sweet_xml_0_6_1
+                          poison_1_5_2
+                          jsx_2_8_0
+                          httpotion_2_2_0
+                          httpoison_0_8_1
+                        ];
+
+            meta = {
+              description = ''AWS client. Currently supports Dynamo, Kinesis,
+                            Lambda, S3'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/CargoSense/ex_aws";
+            };
+          }
+      ) {};
+
+    ex_aws = ex_aws_0_4_17;
+
+    ex_bitcask_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_bitcask";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "ex_bitcask";
+              version = "0.1.0";
+              sha256 =
+                "dc771229aae3c07c31a5523303f0c4dbe3c700d5025a09dfcca9cc357222c463";
+            };
+
+            meta = {
+              longDescription = ''Elixir wrapper of Basho`s Bitcask Key/Value
+                                store. Bitcask as a Log-Structured Hash Table
+                                for Fast Key/Value Data. '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/JonGretar/ExBitcask";
+            };
+          }
+      ) {};
+
+    ex_bitcask = ex_bitcask_0_1_0;
+
+    ex_brace_expansion_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_brace_expansion";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "ex_brace_expansion";
+              version = "0.0.2";
+              sha256 =
+                "d7470a00cffe4425f89e83d7288c24b641c3f6cbde136a08089e7420467cd237";
+            };
+
+            meta = {
+              longDescription = ''Brace expansion, as known from sh/bash, in
+                                Elixir. Quick example:
+                                ExBraceExpansion.expand("file-{a,b,c}.jpg") =>
+                                ["file-a.jpg", "file-b.jpg", "file-c.jpg"] '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gniquil/ex_brace_expansion";
+            };
+          }
+      ) {};
+
+    ex_brace_expansion = ex_brace_expansion_0_0_2;
+
+    ex_chimp_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "ex_chimp";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ex_chimp";
+              version = "0.0.1";
+              sha256 =
+                "1a4e97e2a4b7bf7401660acd61d7e35b9c758638c305324971eddc5bd1bb0bee";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Basic/minimal Mailchimp API client.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/twined/ex_chimp";
+            };
+          }
+      ) {};
+
+    ex_chimp = ex_chimp_0_0_1;
+
+    ex_clacks_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1 }:
+          buildMix {
+            name = "ex_clacks";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "ex_clacks";
+              version = "0.1.1";
+              sha256 =
+                "524f966b03b1a1ac4ab3f6beeef6ce5030cf3b16927c466d42a8b08c5355b231";
+            };
+            beamDeps  = [ plug_1_1_1 ];
+
+            meta = {
+              description = ''A Plug that pays homage to Terry Pratchett'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/polymetis/ex_clacks";
+            };
+          }
+      ) {};
+
+    ex_clacks = ex_clacks_0_1_1;
+
+    ex_closeio_0_0_7 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "ex_closeio";
+            version = "0.0.7";
+            src = fetchHex {
+              pkg = "ex_closeio";
+              version = "0.0.7";
+              sha256 =
+                "8873b4c80e610ebed7a43245aaeb182a56ad6709ca318cf4ee0bf9870fd4b0b4";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Close.io client library for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/taylorbrooks/ex_closeio";
+            };
+          }
+      ) {};
+
+    ex_closeio = ex_closeio_0_0_7;
+
+    ex_cloudinary_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "ex_cloudinary";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "ex_cloudinary";
+              version = "0.1.1";
+              sha256 =
+                "1473ab409152d7d61062224ae5402c6ec677c10da63e29b1332c6fd35cf91381";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''A wrapper around the HTTPoison.Base module for
+                            Cloudinary.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sschneider1207/ExCloudinary";
+            };
+          }
+      ) {};
+
+    ex_cloudinary = ex_cloudinary_0_1_1;
+
+    ex_conf_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_conf";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "ex_conf";
+              version = "0.1.2";
+              sha256 =
+                "0156e2b0d35a2ea9eeebe55e301035bfeb2187412a07d573cc1bc4a163b85de5";
+            };
+
+            meta = {
+              description = ''Simple Elixir Configuration Management '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/phoenixframework/ex_conf";
+            };
+          }
+      ) {};
+
+    ex_conf_0_1_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_conf";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "ex_conf";
+              version = "0.1.3";
+              sha256 =
+                "140dfae39127354f6efa6c295ca5407a20cf2802be199ecdc77aa38e2915ca42";
+            };
+
+            meta = {
+              description = ''Simple Elixir Configuration Management '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/phoenixframework/ex_conf";
+            };
+          }
+      ) {};
+
+    ex_conf = ex_conf_0_1_3;
+
+    ex_crypto_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, timex_1_0_1, poison_2_1_0, pipe_0_0_2 }:
+          buildMix {
+            name = "ex_crypto";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ex_crypto";
+              version = "0.0.1";
+              sha256 =
+                "f9c47326435e52154a6db97359356a44c1fe21a0d26fda24a46367ba33ccb85f";
+            };
+            beamDeps  = [ timex_1_0_1 poison_2_1_0 pipe_0_0_2 ];
+
+            meta = {
+              longDescription = ''A wrapper around the Erlang Crypto module
+                                with sensible defaults for common tasks.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ntrepid8/ex_crypto";
+            };
+          }
+      ) {};
+
+    ex_crypto = ex_crypto_0_0_1;
+
+    ex_csv_0_1_4 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_csv";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "ex_csv";
+              version = "0.1.4";
+              sha256 =
+                "56ee6b70564aa1762f5bfc2b205e55caa83aef046d974614a22b8ec0f839005e";
+            };
+
+            meta = {
+              description = ''CSV for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/CargoSense/ex_csv";
+            };
+          }
+      ) {};
+
+    ex_csv = ex_csv_0_1_4;
+
+    ex_doc_0_10_0 = callPackage
+      (
+        {  buildMix, fetchHex, earmark_0_1_14 }:
+          buildMix {
+            name = "ex_doc";
+            version = "0.10.0";
+            src = fetchHex {
+              pkg = "ex_doc";
+              version = "0.10.0";
+              sha256 =
+                "3d9f15777aa3fb62700d5984eb09ceeb6c1574d61be0f70801e3390e36942b35";
+            };
+            beamDeps  = [ earmark_0_1_14 ];
+
+            meta = {
+              description = ''ExDoc is a documentation generation tool for
+                            Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/elixir-lang/ex_doc";
+            };
+          }
+      ) {};
+
+    ex_doc_0_11_4 = callPackage
+      (
+        {  buildMix, fetchHex, earmark_0_1_14 }:
+          buildMix {
+            name = "ex_doc";
+            version = "0.11.4";
+            src = fetchHex {
+              pkg = "ex_doc";
+              version = "0.11.4";
+              sha256 =
+                "639e97b24c1c6c172f557163b830673646983417de9ac0da2c25c7063deed293";
+            };
+            beamDeps  = [ earmark_0_1_14 ];
+
+            meta = {
+              description = ''ExDoc is a documentation generation tool for
+                            Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/elixir-lang/ex_doc";
+            };
+          }
+      ) {};
+
+    ex_doc = ex_doc_0_11_4;
+
+    ex_doc_0_6_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_doc";
+            version = "0.6.2";
+            src = fetchHex {
+              pkg = "ex_doc";
+              version = "0.6.2";
+              sha256 =
+                "fdd21c651fbe96f39697c3acd9ee6b849348cafb4000b92a130e2df8a0a3e2b6";
+            };
+
+            meta = {
+              description = ''ExDoc is a documentation generation tool for
+                            Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/elixir-lang/ex_doc";
+            };
+          }
+      ) {};
+
+    ex_doc_dash_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex, ex_doc_0_11_4, earmark_0_1_14 }:
+          buildMix {
+            name = "ex_doc_dash";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "ex_doc_dash";
+              version = "0.3.0";
+              sha256 =
+                "0b511eecda1dd2c51fab8b1e071e3d6292f6a136232425d3f20baa9ca0fbeb43";
+            };
+            beamDeps  = [ ex_doc_0_11_4 earmark_0_1_14 ];
+
+            meta = {
+              description = ''Formatter for ExDoc to generate docset
+                            documentation for use in Dash.app.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/JonGretar/ExDocDash";
+            };
+          }
+      ) {};
+
+    ex_doc_dash = ex_doc_dash_0_3_0;
+
+    ex_doc_epub_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, ex_doc_0_11_4, earmark_0_1_19 }:
+          buildMix {
+            name = "ex_doc_epub";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "ex_doc_epub";
+              version = "0.0.2";
+              sha256 =
+                "dbb606e86c70cff37fb2e228f9b5971ee3afb08a10c247d5734b114c5d5fdb15";
+            };
+            beamDeps  = [ ex_doc_0_11_4 earmark_0_1_19 ];
+
+            meta = {
+              description = ''Create documentation for Elixir projects in EPUB
+                            format'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/milmazz/ex_doc_epub";
+            };
+          }
+      ) {};
+
+    ex_doc_epub = ex_doc_epub_0_0_2;
+
+    ex_dockerapi_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
+          buildMix {
+            name = "ex_dockerapi";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ex_dockerapi";
+              version = "0.0.1";
+              sha256 =
+                "337481d27cb65f7d607e28f0bc129f2197c1b04fdc357446f5a07f2296b9604b";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''Docker API client.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/JonGretar/DockerAPI.ex";
+            };
+          }
+      ) {};
+
+    ex_dockerapi = ex_dockerapi_0_0_1;
+
+    ex_edn_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex, timex_0_13_5, array_1_0_1 }:
+          buildMix {
+            name = "ex_edn";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "ex_edn";
+              version = "0.1.2";
+              sha256 =
+                "9568e79cb96bd61f26389b96ab1ac4fee57762fba6c166ddc745c521ccf2c5ca";
+            };
+            beamDeps  = [ timex_0_13_5 array_1_0_1 ];
+
+            meta = {
+              longDescription = ''[edn](https://github.com/edn-format/edn)
+                                (extensible data notation) encoder/decoder
+                                implemented in Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/jfacorro/ExEdn/";
+            };
+          }
+      ) {};
+
+    ex_edn = ex_edn_0_1_2;
+
+    ex_fabricators_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_fabricators";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "ex_fabricators";
+              version = "0.1.0";
+              sha256 =
+                "edde1017f8a8fc3dbb3915c8791a6d0801f06fbe72f69ec50222dc47930c57d9";
+            };
+
+            meta = {
+              description = ''Easy way to cook your structs for tests'';
+
+              homepage = "https://github.com/alterego-labs/ex_fabricators";
+            };
+          }
+      ) {};
+
+    ex_fabricators = ex_fabricators_0_1_0;
+
+    ex_hl7_0_1_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_hl7";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "ex_hl7";
+              version = "0.1.3";
+              sha256 =
+                "57ea6567e6da3cb14098bddb95a843dbfb04981578ad5a0f3c437bce8ac9cd29";
+            };
+
+            meta = {
+              description = ''HL7 Parser for Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/jcomellas/ex_hl7";
+            };
+          }
+      ) {};
+
+    ex_hl7 = ex_hl7_0_1_3;
+
+    ex_iss_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "ex_iss";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "ex_iss";
+              version = "1.0.0";
+              sha256 =
+                "8b2b2eebbd75593e814e712555c7f69138864317cf2f0093a82ca305138baa83";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              longDescription = ''This package is for interfacing with the Open
+                                Notify API to information such as the ISS`s
+                                current location, crew, and when it will pass
+                                over a location.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/cryptobird/ex_iss";
+            };
+          }
+      ) {};
+
+    ex_iss = ex_iss_1_0_0;
+
+    ex_json_schema_0_3_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_json_schema";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "ex_json_schema";
+              version = "0.3.1";
+              sha256 =
+                "928faaafb82e08f0458257b4eea9e7fb7cc0bd2551103d0ae4fcb1840d343cc4";
+            };
+
+            meta = {
+              longDescription = ''A JSON Schema validator with full support for
+                                the draft 4 specification and zero
+                                dependencies.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jonasschmidt/ex_json_schema";
+            };
+          }
+      ) {};
+
+    ex_json_schema = ex_json_schema_0_3_1;
+
+    ex_link_header_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_link_header";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "ex_link_header";
+              version = "0.0.3";
+              sha256 =
+                "f4edcb2194c7480f2b03f00da68d25de03c38d217497639ebdbca6325890e153";
+            };
+
+            meta = {
+              description = ''Parse HTTP link headers in Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/simonrand/ex_link_header";
+            };
+          }
+      ) {};
+
+    ex_link_header = ex_link_header_0_0_3;
+
+    ex_machina_0_6_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_machina";
+            version = "0.6.1";
+            src = fetchHex {
+              pkg = "ex_machina";
+              version = "0.6.1";
+              sha256 =
+                "f55476400ca109d24f216ee961a6d04be4a932429ecd3ae6a948d5d04f4fa2ea";
+            };
+
+            meta = {
+              description = ''A factory library by the creators of
+                            FactoryGirl'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/thoughtbot/ex_machina";
+            };
+          }
+      ) {};
+
+    ex_machina = ex_machina_0_6_1;
+
+    ex_mark2pdf_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, earmark_0_1_19 }:
+          buildMix {
+            name = "ex_mark2pdf";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "ex_mark2pdf";
+              version = "0.1.0";
+              sha256 =
+                "d1458c9b01bc53b9c365d4d12ac8187b09e06f02667639d4a63c4543427dfb1d";
+            };
+            beamDeps  = [ earmark_0_1_19 ];
+
+            meta = {
+              description = ''Generate a PDF from Markdown file.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/darui00kara/ex_mark2pdf";
+            };
+          }
+      ) {};
+
+    ex_mark2pdf = ex_mark2pdf_0_1_0;
+
+    ex_marshal_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, decimal_1_1_1 }:
+          buildMix {
+            name = "ex_marshal";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "ex_marshal";
+              version = "0.0.3";
+              sha256 =
+                "28eaf18799bca83519d0ac517a4fd0a9a2211bea7f96c74b27952a20be2938a8";
+            };
+            beamDeps  = [ decimal_1_1_1 ];
+
+            meta = {
+              description = ''Ruby Marshal format implemented in Elixir.'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/gaynetdinov/ex_marshal";
+            };
+          }
+      ) {};
+
+    ex_marshal = ex_marshal_0_0_3;
+
+    ex_minimatch_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, ex_brace_expansion_0_0_2 }:
+          buildMix {
+            name = "ex_minimatch";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ex_minimatch";
+              version = "0.0.1";
+              sha256 =
+                "3255bb8496635d3ef5d86ec6829958a3573ff730ca01534b0fead9c2e3af7de4";
+            };
+            beamDeps  = [ ex_brace_expansion_0_0_2 ];
+
+            meta = {
+              longDescription = ''Globbing paths without walking the tree!
+                                Elixir and Erlang provide `wildcard` functions
+                                in the stdlib. But these will walk the directory
+                                tree. If you simply want to test whether a file
+                                path matches a glob, ExMinimatch is for you. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gniquil/ex_minimatch";
+            };
+          }
+      ) {};
+
+    ex_minimatch = ex_minimatch_0_0_1;
+
+    ex_modbus_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, ex_doc_0_11_4, earmark_0_1_19 }:
+          buildMix {
+            name = "ex_modbus";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "ex_modbus";
+              version = "0.0.2";
+              sha256 =
+                "8930d2bdd867ebc649f285689723499f39af181ee84cb4e7856eaa3f9cc21d30";
+            };
+            beamDeps  = [ ex_doc_0_11_4 earmark_0_1_19 ];
+
+            meta = {
+              description = ''An Elixir ModbusTCP client implementation.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/hirschenberger/ex_modbus";
+            };
+          }
+      ) {};
+
+    ex_modbus = ex_modbus_0_0_2;
+
+    ex_omegle_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, jsex_2_0_0, httpoison_0_8_1 }:
+          buildMix {
+            name = "ex_omegle";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "ex_omegle";
+              version = "0.1.1";
+              sha256 =
+                "8166d1125a2670f55fce2030367d9da381e577ad122dcf1d03784e536c78cc65";
+            };
+            beamDeps  = [ jsex_2_0_0 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''A minimal Omegle chat client library for
+                            Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/xtagon/ex_omegle";
+            };
+          }
+      ) {};
+
+    ex_omegle = ex_omegle_0_1_1;
+
+    ex_orient_1_0_2 = callPackage
+      (
+        {
+          buildMix, fetchHex, poolboy_1_2_1, poison_1_0_3, marco_polo_0_2_1
+        }:
+          buildMix {
+            name = "ex_orient";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "ex_orient";
+              version = "1.0.2";
+              sha256 =
+                "36296ba45e6d321c8c023ab110a1c80bac9e48afe0c6df00aa44223870d74796";
+            };
+            beamDeps  = [ poolboy_1_2_1 poison_1_0_3 marco_polo_0_2_1 ];
+
+            meta = {
+              longDescription = ''OrientDB query builder that provides nice
+                                syntax and connection pooling. Uses MarcoPolo
+                                under the hood to run commands.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Remesh/ex_orient/";
+            };
+          }
+      ) {};
+
+    ex_orient = ex_orient_1_0_2;
+
+    ex_parametarized_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_parametarized";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "ex_parametarized";
+              version = "1.0.0";
+              sha256 =
+                "daa04087cc41608f1604f2cc52dfe3e3c3ee4612c3b6091d7b6025d10d79f31a";
+            };
+
+            meta = {
+              description = ''Simple macro for parametarized testing'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/KazuCocoa/ex_parametarized";
+            };
+          }
+      ) {};
+
+    ex_parametarized = ex_parametarized_1_0_0;
+
+    ex_parameterized_1_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_parameterized";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "ex_parameterized";
+              version = "1.0.2";
+              sha256 =
+                "c3a9b2471060a7f2cfc4cac4617125d4272991315d6223156d67c10abd055b10";
+            };
+
+            meta = {
+              description = ''Simple macro for parameterized testing'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/KazuCocoa/ex_parameterized";
+            };
+          }
+      ) {};
+
+    ex_parameterized = ex_parameterized_1_0_2;
+
+    ex_parsec_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex, monad_1_0_5 }:
+          buildMix {
+            name = "ex_parsec";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "ex_parsec";
+              version = "0.2.1";
+              sha256 =
+                "1564d820e0b8b265a1525454aa9914edc15b6165ae74ffa31008686cbbad67da";
+            };
+            beamDeps  = [ monad_1_0_5 ];
+
+            meta = {
+              description = ''A parser combinator library inspired by
+                            Parsec.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/alexrp/ex_parsec";
+            };
+          }
+      ) {};
+
+    ex_parsec = ex_parsec_0_2_1;
+
+    ex_pool_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_pool";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "ex_pool";
+              version = "0.1.1";
+              sha256 =
+                "0e2a945acefa067f902dbfa6cb683884838099d6be496dc43cb7dccf31df978d";
+            };
+
+            meta = {
+              description = ''A generic pooling library for Elixir'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/jcabotc/ex_pool";
+            };
+          }
+      ) {};
+
+    ex_pool = ex_pool_0_1_1;
+
+    ex_rated_1_2_1 = callPackage
+      (
+        {  buildMix, fetchHex, ex2ms_1_3_0 }:
+          buildMix {
+            name = "ex_rated";
+            version = "1.2.1";
+            src = fetchHex {
+              pkg = "ex_rated";
+              version = "1.2.1";
+              sha256 =
+                "868282cdf5b8a6698382182411ec46965204a0fbe83e65368004e944a5c608ac";
+            };
+            beamDeps  = [ ex2ms_1_3_0 ];
+
+            meta = {
+              longDescription = ''ExRated, the OTP GenServer with the naughty
+                                name that allows you to rate-limit calls to any
+                                service that requires it. For example,
+                                rate-limit calls to your favorite API which
+                                requires no more than `limit` API calls within a
+                                `scale` milliseconds time window. You can
+                                enforce limits for windows as narrow as
+                                milliseconds, or as broad as you like.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/grempe/ex_rated";
+            };
+          }
+      ) {};
+
+    ex_rated = ex_rated_1_2_1;
+
+    ex_rfc3966_0_2_3 = callPackage
+      (
+        {  buildMix, fetchHex, ex_abnf_0_2_7 }:
+          buildMix {
+            name = "ex_rfc3966";
+            version = "0.2.3";
+            src = fetchHex {
+              pkg = "ex_rfc3966";
+              version = "0.2.3";
+              sha256 =
+                "730e14d9670ab0d2b2b24c2d3bfabe861bf21d4163c01db747a91c54090cc0d5";
+            };
+            beamDeps  = [ ex_abnf_0_2_7 ];
+
+            meta = {
+              longDescription = ''A "tel" URI parser trying to be strictly
+                                compatible with RFC3966. Uses official ABNF
+                                grammar and ex_abnf as interpreter.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/marcelog/ex_rfc3966";
+            };
+          }
+      ) {};
+
+    ex_rfc3966 = ex_rfc3966_0_2_3;
+
+    ex_rfc3986_0_2_6 = callPackage
+      (
+        {  buildMix, fetchHex, ex_abnf_0_2_7 }:
+          buildMix {
+            name = "ex_rfc3986";
+            version = "0.2.6";
+            src = fetchHex {
+              pkg = "ex_rfc3986";
+              version = "0.2.6";
+              sha256 =
+                "bfc8ce510f910dbbd1f4a8433de85090375d1701e0b9a488ba7afd8efae98bfa";
+            };
+            beamDeps  = [ ex_abnf_0_2_7 ];
+
+            meta = {
+              longDescription = ''An URI parser trying to be strictly
+                                compatible with RFC3986. Uses official ABNF
+                                grammar and ex_abnf as interpreter.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/marcelog/ex_rfc3986";
+            };
+          }
+      ) {};
+
+    ex_rfc3986 = ex_rfc3986_0_2_6;
+
+    ex_spec_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_spec";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "ex_spec";
+              version = "1.0.0";
+              sha256 =
+                "e5f4b6ee0a918015d1d190ead7807f31ec62a8d8920fc93602bf722c171e7ae8";
+            };
+
+            meta = {
+              description = ''BDD-like syntax for ExUnit'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/drewolson/ex_spec";
+            };
+          }
+      ) {};
+
+    ex_spec = ex_spec_1_0_0;
+
+    ex_statsd_0_5_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_statsd";
+            version = "0.5.3";
+            src = fetchHex {
+              pkg = "ex_statsd";
+              version = "0.5.3";
+              sha256 =
+                "357c616a327a40133e49a54db1d46b0d7c9ab2de186f7bfecdc0efca6394adf6";
+            };
+
+            meta = {
+              description = ''A StatsD client for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/CargoSense/ex_statsd";
+            };
+          }
+      ) {};
+
+    ex_statsd = ex_statsd_0_5_3;
+
+    ex_sync_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, connection_1_0_2 }:
+          buildMix {
+            name = "ex_sync";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ex_sync";
+              version = "0.0.1";
+              sha256 =
+                "82261cf62a567b8eb0eba35dfbf0d9b546110825e8c64bb4ebc2ac8e37458499";
+            };
+            beamDeps  = [ connection_1_0_2 ];
+
+            meta = {
+              longDescription = ''A library to handle [Differential
+                                Synchroniazation](https://neil.fraser.name/writing/sync/)
+                                in an Elixir app.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/invrs/exsync";
+            };
+          }
+      ) {};
+
+    ex_sync = ex_sync_0_0_1;
+
+    ex_test_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_test";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ex_test";
+              version = "0.0.1";
+              sha256 =
+                "c283542766be3f9044068a6a91c22a8270987334151db7bd10f12c8db1ebfbe3";
+            };
+
+            meta = {
+              description = ''Wrapper around ExUnit to support BBD (rspec) like
+                            syntax'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mcb/ex_test";
+            };
+          }
+      ) {};
+
+    ex_test = ex_test_0_0_1;
+
+    ex_twilio_0_1_3 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_1_5_2, inflex_1_0_0, httpotion_2_1_0
+        }:
+          buildMix {
+            name = "ex_twilio";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "ex_twilio";
+              version = "0.1.3";
+              sha256 =
+                "50b949beed606a3e5dceb63c07db7f79cb0806901ea23bc109a9969429d8a2bf";
+            };
+            beamDeps  = [ poison_1_5_2 inflex_1_0_0 httpotion_2_1_0 ];
+
+            meta = {
+              description = ''Twilio API library for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/danielberkompas/ex_twilio";
+            };
+          }
+      ) {};
+
+    ex_twilio = ex_twilio_0_1_3;
+
+    ex_twiml_2_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_twiml";
+            version = "2.1.0";
+            src = fetchHex {
+              pkg = "ex_twiml";
+              version = "2.1.0";
+              sha256 =
+                "7515c90ea4342e178b2894ca4cf8f03225a20c35e94c1f19e47bb839cc5f627d";
+            };
+
+            meta = {
+              description = ''Generate TwiML with Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/danielberkompas/ex_twiml";
+            };
+          }
+      ) {};
+
+    ex_twiml = ex_twiml_2_1_0;
+
+    ex_unit_emacs_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_unit_emacs";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "ex_unit_emacs";
+              version = "0.1.2";
+              sha256 =
+                "f22a3c987b39b2ebedd9652a2fab07d7efd43baf376d9854398095bd220bd462";
+            };
+
+            meta = {
+              description = ''Emacs integration for ExUnit'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bruce/ex_unit_emacs";
+            };
+          }
+      ) {};
+
+    ex_unit_emacs = ex_unit_emacs_0_1_2;
+
+    ex_unit_fixtures_0_3_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_unit_fixtures";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "ex_unit_fixtures";
+              version = "0.3.1";
+              sha256 =
+                "b4b988211bf4cd08a26eb76756e4563c94c6648c195e45af26ea62e4d37a65f6";
+            };
+
+            meta = {
+              description = ''A modular fixture system for ExUnit, inspired by
+                            py.test fixtures.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/obmarg/ex_unit_fixtures";
+            };
+          }
+      ) {};
+
+    ex_unit_fixtures = ex_unit_fixtures_0_3_1;
+
+    ex_vmstats_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_vmstats";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ex_vmstats";
+              version = "0.0.1";
+              sha256 =
+                "587d088696b51b0e053b2626c6de51ca7be67b5e3a49c7320da5b4e7cd96d347";
+            };
+
+            meta = {
+              description = ''An Elixir package for pushing Erlang VM stats
+                            into StatsD.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/fanduel/ex_vmstats";
+            };
+          }
+      ) {};
+
+    ex_vmstats = ex_vmstats_0_0_1;
+
+    exactor_2_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exactor";
+            version = "2.2.0";
+            src = fetchHex {
+              pkg = "exactor";
+              version = "2.2.0";
+              sha256 =
+                "c60cd68899db3ec0bdbd41c7ccf3ae3b52391a18704040461763f052e97b5e15";
+            };
+
+            meta = {
+              description = ''Simplified creation of GenServer based processes
+                            in Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sasa1977/exactor";
+            };
+          }
+      ) {};
+
+    exactor = exactor_2_2_0;
+
+    example_files_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "example_files";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "example_files";
+              version = "0.2.0";
+              sha256 =
+                "5454a42e421f5b35669fa80aeac067ca010dfb4fd7f834a530070e2a95d71689";
+            };
+
+            meta = {
+              longDescription = ''Mix tasks for managing example files in your
+                                project. Your project may contain files that are
+                                intended to serve as explanatory samples of
+                                files provided by a project contributor or user,
+                                such as configuration and the like. The Mix
+                                tasks provided here enable you to easily find,
+                                copy, and check the freshness of example files
+                                and your copies of them.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/njonsson/example_files";
+            };
+          }
+      ) {};
+
+    example_files = example_files_0_2_0;
+
+    exauth_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exauth";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "exauth";
+              version = "0.0.1";
+              sha256 =
+                "40a6bbea6f6b2d524cc4a4107aa9a6a5dc725171968ce8b4aa43599f8835d3cc";
+            };
+
+            meta = {
+              description = ''Wrapper for erlang-oauth'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mschae/exauth";
+            };
+          }
+      ) {};
+
+    exauth = exauth_0_0_1;
+
+    exbouncer_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exbouncer";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "exbouncer";
+              version = "0.0.1";
+              sha256 =
+                "1152124b31dd00eddfb59fff015d92632744fa5cd4630a7eb8976a82aa012e41";
+            };
+
+            meta = {
+              longDescription = ''An authorization library in Elixir for Plug
+                                applications that restricts what resources the
+                                current user/admin or any role is allowed to
+                                access,'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/vysakh0/exbouncer";
+            };
+          }
+      ) {};
+
+    exbouncer = exbouncer_0_0_1;
+
+    excaliper_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "excaliper";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "excaliper";
+              version = "0.0.1";
+              sha256 =
+                "d43430518ffcf8de60a1d44355f6a200f348ec1ca8bc4287ca17c97543e86732";
+            };
+
+            meta = {
+              description = ''Fast image dimension detector inspired by the
+                            Node.JS module Calipers.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mgartner/excaliper";
+            };
+          }
+      ) {};
+
+    excaliper = excaliper_0_0_1;
+
+    excellent_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "excellent";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "excellent";
+              version = "0.0.1";
+              sha256 =
+                "a0628dce02de6a33cf441883723c480b0f07fdacade46f6d608465bb717491bd";
+            };
+
+            meta = {
+              description = ''A OpenXL (Excel files ending with .xlsx) parser
+                            for Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/leifg/excellent";
+            };
+          }
+      ) {};
+
+    excellent = excellent_0_0_1;
+
+    excheck_0_3_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "excheck";
+            version = "0.3.2";
+            src = fetchHex {
+              pkg = "excheck";
+              version = "0.3.2";
+              sha256 =
+                "138cf65d5ca716b94ff3368e6f089c855e59d95e503612399a231e68fc855484";
+            };
+
+            meta = {
+              description = ''Property-based testing library for Elixir
+                            (QuickCheck style).'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/parroty/excheck";
+            };
+          }
+      ) {};
+
+    excheck = excheck_0_3_2;
+
+    excoap_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "excoap";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "excoap";
+              version = "0.0.1";
+              sha256 =
+                "06caae698590da85aded80db7996300127d48a4e9cf7bdca8d35113c094e5094";
+            };
+
+            meta = {
+              description = ''CoAP implementation for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mbialon/excoap";
+            };
+          }
+      ) {};
+
+    excoap = excoap_0_0_1;
+
+    exconstructor_0_9_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exconstructor";
+            version = "0.9.0";
+            src = fetchHex {
+              pkg = "exconstructor";
+              version = "0.9.0";
+              sha256 =
+                "14af965ba0370d7808e16f8b2781b8a5ea3e42cf6c34012efe75e60b56b2dbbc";
+            };
+
+            meta = {
+              longDescription = ''ExConstructor generates constructor functions
+                                for your structs, handling map-vs-keyword-list,
+                                string-vs-atom-keys, and
+                                camelCase-vs-under_score issues
+                                automatically.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/appcues/exconstructor";
+            };
+          }
+      ) {};
+
+    exconstructor = exconstructor_0_9_0;
+
+    excountries_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
+          buildMix {
+            name = "excountries";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "excountries";
+              version = "0.0.3";
+              sha256 =
+                "ec0bbb4147b54817e7d17a7ed91e1b88046769a26020c591ed5fde336b4fb8d3";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''Elixir wrapper for REST Countries API
+                            (http://restcountries.eu/)'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/fteem/excountries";
+            };
+          }
+      ) {};
+
+    excountries = excountries_0_0_3;
+
+    excoveralls_0_5_1 = callPackage
+      (
+        {  buildMix, fetchHex, hackney_1_4_8, exjsx_3_2_0 }:
+          buildMix {
+            name = "excoveralls";
+            version = "0.5.1";
+            src = fetchHex {
+              pkg = "excoveralls";
+              version = "0.5.1";
+              sha256 =
+                "26c8bb6dadc8436c1e0155f50327e90c91d6efab88468c09ac10f12be7070324";
+            };
+            beamDeps  = [ hackney_1_4_8 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''Coverage report tool for Elixir with coveralls.io
+                            integration.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/parroty/excoveralls";
+            };
+          }
+      ) {};
+
+    excoveralls = excoveralls_0_5_1;
+
+    exdatauri_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exdatauri";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "exdatauri";
+              version = "0.1.0";
+              sha256 =
+                "46d064019d4d785428226baafbc3f11fc8621838b0d633768f18182d2cf4a719";
+            };
+
+            meta = {
+              description = ''A RFC 2397 URI parser for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/flupke/exdatauri";
+            };
+          }
+      ) {};
+
+    exdatauri = exdatauri_0_1_0;
+
+    exddb_0_1_3 = callPackage
+      (
+        {  buildMix, fetchHex, erlcloud_0_9_2 }:
+          buildMix {
+            name = "exddb";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "exddb";
+              version = "0.1.3";
+              sha256 =
+                "e57bd285110585476a457a843fdcff3cce6923c9472b6bec95ac9bf986dd27e4";
+            };
+            beamDeps  = [ erlcloud_0_9_2 ];
+
+            meta = {
+              description = ''Simple library for working with data in
+                            DynamoDB.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/muhmi/exddb";
+            };
+          }
+      ) {};
+
+    exddb = exddb_0_1_3;
+
+    exdesk_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "exdesk";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "exdesk";
+              version = "0.2.0";
+              sha256 =
+                "0c1e02bb4aef9075ff4affb3354c0e318dc3be1817faae8b450ef590c7d67688";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Desk.com client library for elixir.'';
+
+              homepage = "https://github.com/deadkarma/exdesk";
+            };
+          }
+      ) {};
+
+    exdesk = exdesk_0_2_0;
+
+    exdisque_0_0_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, eredis_1_0_8 }:
+          buildRebar3 {
+            name = "exdisque";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "exdisque";
+              version = "0.0.1";
+              sha256 =
+                "c3b7ec89217df46ae6cf1adadb81118877c66272266f0ee5e2c7ff45d048fb31";
+            };
+
+            beamDeps  = [ eredis_1_0_8 ];
+
+            meta = {
+              description = ''Elixir client library for Disque:
+                            https://github.com/antirez/disque'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mosic/exdisque";
+            };
+          }
+      ) {};
+
+    exdisque = exdisque_0_0_1;
+
+    exdjango_0_3_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          redix_0_3_4,
+          poolboy_1_5_1,
+          poison_1_0_3,
+          plug_1_1_1,
+          comeonin_2_1_1
+        }:
+          buildMix {
+            name = "exdjango";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "exdjango";
+              version = "0.3.0";
+              sha256 =
+                "62cf5e5870b28b4cdf25b0056897bb92ba3ed7b92d87c8083ebf820c35213ef6";
+            };
+            beamDeps  = [
+                          redix_0_3_4
+                          poolboy_1_5_1
+                          poison_1_0_3
+                          plug_1_1_1
+                          comeonin_2_1_1
+                        ];
+
+            meta = {
+              description = ''An elixir library for working with django'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nicksanders/exdjango";
+            };
+          }
+      ) {};
+
+    exdjango = exdjango_0_3_0;
+
+    exdm_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex, exrm_0_19_9 }:
+          buildMix {
+            name = "exdm";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "exdm";
+              version = "0.0.4";
+              sha256 =
+                "85e8fa483a760c46e19f0e8e0f53eb35ed74cc17f23c72d3002e47a847011e39";
+            };
+            beamDeps  = [ exrm_0_19_9 ];
+
+            meta = {
+              description = ''Deploy Elixir applications via mix tasks'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/joeyates/exdm";
+            };
+          }
+      ) {};
+
+    exdm = exdm_0_0_4;
+
+    exdn_2_1_2 = callPackage
+      (
+        {  buildMix, fetchHex, erldn_1_0_5, calendar_0_12_4 }:
+          buildMix {
+            name = "exdn";
+            version = "2.1.2";
+            src = fetchHex {
+              pkg = "exdn";
+              version = "2.1.2";
+              sha256 =
+                "a4414d397ccf0c86413ad18d307879f5c6c19183b430276cfb31a026dda1350c";
+            };
+            beamDeps  = [ erldn_1_0_5 calendar_0_12_4 ];
+
+            meta = {
+              longDescription = ''a two-way translator between Elixir data
+                                structures and strings of data following the edn
+                                specification.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/psfblair/exdn";
+            };
+          }
+      ) {};
+
+    exdn = exdn_2_1_2;
+
+    exdweet_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
+          buildMix {
+            name = "exdweet";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "exdweet";
+              version = "0.0.1";
+              sha256 =
+                "2b263d5d73c7af5bd824a02b56df671a609698a96ea78cb0660dbd753118f376";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''Elixir/Erlang Client for Dweet'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/amit-saxena/exdweet";
+            };
+          }
+      ) {};
+
+    exdweet = exdweet_0_0_1;
+
+    exec_1_0_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "exec";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "exec";
+              version = "1.0.1";
+              sha256 =
+                "87c7ef2dea2bb503bb0eec8cb34776172999aecc6e12d90f7629796a7a3ccb1f";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''OS Process Manager'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/saleyn/erlexec";
+            };
+          }
+      ) {};
+
+    exec = exec_1_0_1;
+
+    execjs_1_1_3 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2 }:
+          buildMix {
+            name = "execjs";
+            version = "1.1.3";
+            src = fetchHex {
+              pkg = "execjs";
+              version = "1.1.3";
+              sha256 =
+                "a0992d14ccc3458563be305d70fd6f6f6e9db6e8b62dd4e15bf69aeb382eb074";
+            };
+            beamDeps  = [ poison_1_5_2 ];
+
+            meta = {
+              description = ''Run JavaScript code from Elixir'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/devinus/execjs";
+            };
+          }
+      ) {};
+
+    execjs = execjs_1_1_3;
+
+    exelli_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exelli";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "exelli";
+              version = "0.1.0";
+              sha256 =
+                "9777493429d5b4e3f3a9391ede7706deba65b253aa0d810efa9e26859b6f269c";
+            };
+
+            meta = {
+              longDescription = ''Elli wrapper in elixir, with some sugar
+                                syntax. (even 2 times faster than Plug on
+                                Cowboy) '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/pigmej/exelli";
+            };
+          }
+      ) {};
+
+    exelli = exelli_0_1_0;
+
+    exeque_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exeque";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "exeque";
+              version = "0.1.0";
+              sha256 =
+                "d860208c3a651c97cacd95e842e4dceffc84f518026c5737e93b46444f000dfa";
+            };
+
+            meta = {
+              longDescription = ''Exeque allows you to queue up a list of
+                                functions and specify how many workers should be
+                                used to run those functions. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/duff/exeque";
+            };
+          }
+      ) {};
+
+    exeque = exeque_0_1_0;
+
+    exexif_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exexif";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "exexif";
+              version = "0.0.1";
+              sha256 =
+                "48db21d8a77a9f922046ad6018266c0df32efb82331113ccb787e08fb7464a74";
+            };
+
+            meta = {
+              longDescription = ''Read TIFF and EXIF information from a
+                                JPEG-format image. 1. Retrieve data from a file:
+                                iex> {:ok, info} =
+                                Exexif.exif_from_jpeg_file(path) Retrieve data
+                                from a binary containing the JPEG (you don`t
+                                need the whole thing—the exif is near the
+                                beginning of a JPEG, so 100k or so should do
+                                fine). iex> {:ok, info} =
+                                Exexif.exif_from_jpeg_buffer(buffer) 2. Access
+                                the high level TIFF data: iex> info.x_resolution
+                                72 iex> info.model "DSC-RX100M2" 3. The exif
+                                data is in there, too. iex>
+                                info.exif.color_space "sRGB" iex> info.exif |>
+                                Dict.keys [:brightness_value, :color_space,
+                                :component_configuration,
+                                :compressed_bits_per_pixel, :contrast,
+                                :custom_rendered, :datetime_original,
+                                :datetime_tigitized, :digital_zoom_ratio,
+                                :exif_image_height, :exif_image_width,
+                                :exif_version, :exposure_bias_value,
+                                :exposure_mode, :exposure_program,
+                                :exposure_time, :f_number, :file_source, :flash,
+                                :flash_pix_persion, :focal_length,
+                                :focal_length_in_35mm_film, :iso_speed_ratings,
+                                :lens_info, :light_source, :max_aperture_value,
+                                :metering_mode, :recommended_exposure,
+                                :saturation, :scene_capture_type, :scene_type,
+                                :sensitivity_type, :sharpness, :white_balance]
+                                '';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/pragdave/exexif";
+            };
+          }
+      ) {};
+
+    exexif = exexif_0_0_1;
+
+    exfavicon_0_3_2 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1, floki_0_7_1 }:
+          buildMix {
+            name = "exfavicon";
+            version = "0.3.2";
+            src = fetchHex {
+              pkg = "exfavicon";
+              version = "0.3.2";
+              sha256 =
+                "95503035ea2b6768c7d3fb8af9769830b9933b2579c7fdcfdd6b775e830213c2";
+            };
+            beamDeps  = [ httpoison_0_8_1 floki_0_7_1 ];
+
+            meta = {
+              description = ''A exfavicon to detect a site`s favicon.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ikeikeikeike/exfavicon";
+            };
+          }
+      ) {};
+
+    exfavicon = exfavicon_0_3_2;
+
+    exfile_0_1_2 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          plug_1_0_3,
+          phoenix_html_2_5_0,
+          ecto_2_0_0_beta_0
+        }:
+          buildMix {
+            name = "exfile";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "exfile";
+              version = "0.1.2";
+              sha256 =
+                "bb0e2e1ef86017b3d6cbf6d6818abea153f194a50cc84f359146a348bcc61664";
+            };
+            beamDeps  = [ plug_1_0_3 phoenix_html_2_5_0 ecto_2_0_0_beta_0 ];
+
+            meta = {
+              longDescription = ''File upload handling in Elixir and Plug.
+                                Supports pluggable processors and storage
+                                backends.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/keichan34/exfile";
+            };
+          }
+      ) {};
+
+    exfile = exfile_0_1_2;
+
+    exfile_b2_0_1_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1, exfile_0_1_2
+        }:
+          buildMix {
+            name = "exfile_b2";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "exfile_b2";
+              version = "0.1.0";
+              sha256 =
+                "62a58a3347387b00fdf666984b02b6b0c28fda0b60395eea08de3c7a21af61f5";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 exfile_0_1_2 ];
+
+            meta = {
+              description = ''A Backblaze B2 storage backend adapter for
+                            Exfile.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/keichan34/exfile-b2";
+            };
+          }
+      ) {};
+
+    exfile_b2 = exfile_b2_0_1_0;
+
+    exfile_imagemagick_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, exfile_0_1_2 }:
+          buildMix {
+            name = "exfile_imagemagick";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "exfile_imagemagick";
+              version = "0.1.0";
+              sha256 =
+                "ab290f8a7e43678dc2289cf38558562cc433c59d1ddf8859525e22f5e4033c49";
+            };
+            beamDeps  = [ exfile_0_1_2 ];
+
+            meta = {
+              description = ''An ImageMagick file processor suite for
+                            Exfile.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/keichan34/exfile-imagemagick";
+            };
+          }
+      ) {};
+
+    exfile_imagemagick = exfile_imagemagick_0_1_0;
+
+    exfile_memory_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, exfile_0_1_2 }:
+          buildMix {
+            name = "exfile_memory";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "exfile_memory";
+              version = "0.1.0";
+              sha256 =
+                "66330c408a73094d115227d0e16b936229721e16703197559a828bfb7795f9d7";
+            };
+            beamDeps  = [ exfile_0_1_2 ];
+
+            meta = {
+              description = ''In-memory (ets) storage backend for Exfile.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/keichan34/exfile-memory";
+            };
+          }
+      ) {};
+
+    exfile_memory = exfile_memory_0_1_0;
+
+    exfirebase_0_4_0 = callPackage
+      (
+        {  buildMix, fetchHex, httpotion_2_2_0, exjsx_3_2_0 }:
+          buildMix {
+            name = "exfirebase";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "exfirebase";
+              version = "0.4.0";
+              sha256 =
+                "acd2f1fe87e83437a5d52b811b3e86bc75933bc29b0daa2da836a97ddd60b478";
+            };
+            beamDeps  = [ httpotion_2_2_0 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''An elixir library for accessing the Firebase REST
+                            API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/parroty/exfirebase";
+            };
+          }
+      ) {};
+
+    exfirebase = exfirebase_0_4_0;
+
+    exfoaas_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_1 }:
+          buildMix {
+            name = "exfoaas";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "exfoaas";
+              version = "0.0.1";
+              sha256 =
+                "ccfd3da421505d131a126d05d0def3ca99cdae6fec397956e4a5f1ee2bfae256";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''brings the utility of FOAAS to elixir.'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/cryptobird/ExFOAAS.git";
+            };
+          }
+      ) {};
+
+    exfoaas = exfoaas_0_0_1;
+
+    exfsm_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exfsm";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "exfsm";
+              version = "0.0.3";
+              sha256 =
+                "2da7b2b25f9603fc3142da3090abe85425f9852b89c230316fb6d29691ede6eb";
+            };
+
+            meta = {
+              longDescription = ''Simple elixir library to define composable
+                                FSM as function (not related at all with
+                                `:gen_fsm`, no state/process management)'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/awetzel/exfsm";
+            };
+          }
+      ) {};
+
+    exfsm = exfsm_0_0_3;
+
+    exfswatch_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, fs_0_9_2 }:
+          buildMix {
+            name = "exfswatch";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "exfswatch";
+              version = "0.1.1";
+              sha256 =
+                "b97d5e120dc9efbf31e182625e1382f09202cf66863161570221bb4e1bfa82a1";
+            };
+            beamDeps  = [ fs_0_9_2 ];
+
+            meta = {
+              description = ''A file change watcher wrapper based on
+                            [fs](https://github.com/synrc/fs)'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/falood/exfswatch";
+            };
+          }
+      ) {};
+
+    exfswatch = exfswatch_0_1_1;
+
+    exfuck_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exfuck";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "exfuck";
+              version = "0.1.0";
+              sha256 =
+                "c71358ae7a31682d84f89f7f5fdc1c6b545ea93f70391a9ec15987458d70dbe8";
+            };
+
+            meta = {
+              description = ''Brainfuck interpreter written in elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/shiroyasha/exfuck";
+            };
+          }
+      ) {};
+
+    exfuck = exfuck_0_1_0;
+
+    exgenius_0_0_5 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_2_0 }:
+          buildMix {
+            name = "exgenius";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "exgenius";
+              version = "0.0.5";
+              sha256 =
+                "f0f4463ac9ad79a102a1bf0ded91d77ed87ce262da6045990be51450ef240fd5";
+            };
+            beamDeps  = [ httpoison_0_8_1 exjsx_3_2_0 ];
+
+            meta = {
+              longDescription = '' Elixir library for the (undocumented) Rap
+                                Genius (and also Rock, Tech, Pop, Country, etc)
+                                API '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jeffweiss/exgenius";
+            };
+          }
+      ) {};
+
+    exgenius = exgenius_0_0_5;
+
+    exgpg_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, uuid_0_1_5, porcelain_2_0_1 }:
+          buildMix {
+            name = "exgpg";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "exgpg";
+              version = "0.0.3";
+              sha256 =
+                "13499da2a59567f87f5293cc874ab1256e88089784645d997406d8f95978319a";
+            };
+            beamDeps  = [ uuid_0_1_5 porcelain_2_0_1 ];
+
+            meta = {    };
+          }
+      ) {};
+
+    exgpg = exgpg_0_0_3;
+
+    exgravatar_2_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exgravatar";
+            version = "2.0.0";
+            src = fetchHex {
+              pkg = "exgravatar";
+              version = "2.0.0";
+              sha256 =
+                "ddfcfc899f24fd98c811a6824964c85b5c87a60f41fe034380081680d5c8e765";
+            };
+
+            meta = {
+              description = ''An Elixir module for generating Gravatar urls.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/scrogson/exgravatar";
+            };
+          }
+      ) {};
+
+    exgravatar = exgravatar_2_0_0;
+
+    exgrid_0_3_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, timex_0_13_5, json_0_3_3, httpotion_1_0_0
+        }:
+          buildMix {
+            name = "exgrid";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "exgrid";
+              version = "0.3.0";
+              sha256 =
+                "96676dfc20b2e8c7caf5f68c202eada246f192d3246922be7214a0da0d219506";
+            };
+            beamDeps  = [ timex_0_13_5 json_0_3_3 httpotion_1_0_0 ];
+
+            meta = {
+              description = ''Elixir bindings for SendGrid`s REST API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bradleyd/exgrid";
+            };
+          }
+      ) {};
+
+    exgrid = exgrid_0_3_0;
+
+    exhal_4_0_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          uri_template_1_2_0,
+          poison_2_1_0,
+          httpoison_0_8_1
+        }:
+          buildMix {
+            name = "exhal";
+            version = "4.0.0";
+            src = fetchHex {
+              pkg = "exhal";
+              version = "4.0.0";
+              sha256 =
+                "94a10116449d0c5dce43bddd0a96ed2dbefa032883841752a48129227ae4b426";
+            };
+            beamDeps  = [ uri_template_1_2_0 poison_2_1_0 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Use HAL APIs with ease'';
+              license = stdenv.lib.licenses.free;
+            };
+          }
+      ) {};
+
+    exhal = exhal_4_0_0;
+
+    exhcl_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exhcl";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "exhcl";
+              version = "0.2.1";
+              sha256 =
+                "9c7ab6216cd978b2dd3f6573dd3ccf0a9d5055b36008a0ada01d9431198c17f7";
+            };
+
+            meta = {
+              description = ''Configuration language inspired by HCL'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/asakura/exhcl";
+            };
+          }
+      ) {};
+
+    exhcl = exhcl_0_2_1;
+
+    exiban_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exiban";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "exiban";
+              version = "0.0.3";
+              sha256 =
+                "98c2656de7ce4c27090f482704e7e915d9046c0a3c4545d7ae4b68986de776a8";
+            };
+
+            meta = {
+              description = ''Library for manipulating and validating IBAN
+                            account numbers.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/kkempin/exiban";
+            };
+          }
+      ) {};
+
+    exiban = exiban_0_0_3;
+
+    exirc_0_9_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exirc";
+            version = "0.9.2";
+            src = fetchHex {
+              pkg = "exirc";
+              version = "0.9.2";
+              sha256 =
+                "5b534e0a1bb3d54b57df9c8265d861e4dc3f3078c5483d7520b398458a1c6367";
+            };
+
+            meta = {
+              description = ''An IRC client library for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitwalker/exirc";
+            };
+          }
+      ) {};
+
+    exirc = exirc_0_9_2;
+
+    exjira_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, dotenv_0_0_4 }:
+          buildMix {
+            name = "exjira";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "exjira";
+              version = "0.0.1";
+              sha256 =
+                "da992f593939629300ddf90c0aafbcafb05c4c7e5f817c3a76dd7c0ac43f8575";
+            };
+            beamDeps  = [ poison_1_5_2 dotenv_0_0_4 ];
+
+            meta = {
+              description = ''JIRA client library for Elixir '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mattweldon/exjira";
+            };
+          }
+      ) {};
+
+    exjira = exjira_0_0_1;
+
+    exjprop_0_0_5 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          sweet_xml_0_6_1,
+          httpoison_0_8_1,
+          ex_aws_0_4_17
+        }:
+          buildMix {
+            name = "exjprop";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "exjprop";
+              version = "0.0.5";
+              sha256 =
+                "9fcc1e2e3e12f9f49b1b42cb97df917b5021933d962370dbe67557718a5adee0";
+            };
+            beamDeps  = [ sweet_xml_0_6_1 httpoison_0_8_1 ex_aws_0_4_17 ];
+
+            meta = {
+              description = ''Elixir library for reading Java properties files
+                            from various sources'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/stocks29/exjprop.git";
+            };
+          }
+      ) {};
+
+    exjprop = exjprop_0_0_5;
+
+    exjson_0_5_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exjson";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "exjson";
+              version = "0.5.0";
+              sha256 =
+                "749422adf4381c8089a910d0ca545282ff0bd506cd4e17a6a08f4f9e7799fa94";
+            };
+
+            meta = {
+              description = ''A simple Elixir implementation of JSON with an
+                            Erlang parser.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/guedes/exjson";
+            };
+          }
+      ) {};
+
+    exjson = exjson_0_5_0;
+
+    exjsx_3_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, jsx_2_4_0 }:
+          buildMix {
+            name = "exjsx";
+            version = "3.0.2";
+            src = fetchHex {
+              pkg = "exjsx";
+              version = "3.0.2";
+              sha256 =
+                "2cd67240a54e9cd2616bc83c0c352d47f87bccd2ec599eceedc00bcbe9063f07";
+            };
+            beamDeps  = [ jsx_2_4_0 ];
+
+            meta = {
+              description = ''json for elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/talentdeficit/exjsx";
+            };
+          }
+      ) {};
+
+    exjsx_3_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, jsx_2_4_0 }:
+          buildMix {
+            name = "exjsx";
+            version = "3.1.0";
+            src = fetchHex {
+              pkg = "exjsx";
+              version = "3.1.0";
+              sha256 =
+                "588a0b67ed0c45b21f018515fc478efac83c088661bd588831e41c9073a818fb";
+            };
+            beamDeps  = [ jsx_2_4_0 ];
+
+            meta = {
+              description = ''json for elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/talentdeficit/exjsx";
+            };
+          }
+      ) {};
+
+    exjsx_3_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, jsx_2_6_2 }:
+          buildMix {
+            name = "exjsx";
+            version = "3.2.0";
+            src = fetchHex {
+              pkg = "exjsx";
+              version = "3.2.0";
+              sha256 =
+                "9c8600822e894e3c31bed800c78a5a04812b71a6e5a5656426c6ce01ebe2cf1c";
+            };
+            beamDeps  = [ jsx_2_6_2 ];
+
+            meta = {
+              description = ''json for elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/talentdeficit/exjsx";
+            };
+          }
+      ) {};
+
+    exjsx = exjsx_3_2_0;
+
+    exkad_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          socket_0_2_8,
+          poison_1_2_1,
+          plug_0_8_4,
+          httpotion_1_0_0,
+          cowboy_1_0_4
+        }:
+          buildMix {
+            name = "exkad";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "exkad";
+              version = "0.0.2";
+              sha256 =
+                "b12f4e48ed460521ae3b79895d1e8c43ed24df54260e5519e58708ff76468afb";
+            };
+            beamDeps  = [
+                          socket_0_2_8
+                          poison_1_2_1
+                          plug_0_8_4
+                          httpotion_1_0_0
+                          cowboy_1_0_4
+                        ];
+
+            meta = {
+              description = ''A simple kademlia implementation'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rozap/exkad";
+            };
+          }
+      ) {};
+
+    exkad = exkad_0_0_2;
+
+    exkanji_0_2_5 = callPackage
+      (
+        {  buildMix, fetchHex, exromaji_0_2_8 }:
+          buildMix {
+            name = "exkanji";
+            version = "0.2.5";
+            src = fetchHex {
+              pkg = "exkanji";
+              version = "0.2.5";
+              sha256 =
+                "f88383523a4b01dbb534eb2f9f95b87cf75402b7a28962170e19919eb07f86a6";
+            };
+            beamDeps  = [ exromaji_0_2_8 ];
+
+            meta = {
+              longDescription = ''A Elixir library for translating between
+                                hiragana, katakana, romaji and kanji. It uses
+                                Mecab.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ikeikeikeike/exkanji";
+            };
+          }
+      ) {};
+
+    exkanji = exkanji_0_2_5;
+
+    exkismet_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "exkismet";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "exkismet";
+              version = "0.0.2";
+              sha256 =
+                "3648f010eb80891b0195f9ced0e02a5a08860a9d96e8f7bbe328c68f27b85b64";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''A client (completely unofficial) for the
+                            Akismet.com comment-spam detection API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/cameronp/exkismet";
+            };
+          }
+      ) {};
+
+    exkismet = exkismet_0_0_2;
+
+    exldap_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exldap";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "exldap";
+              version = "0.1.1";
+              sha256 =
+                "5cade5ad64caaeb0e0d70fcd9567aa827e6f50cb375599e2887319c40807cc92";
+            };
+
+            meta = {
+              description = ''A module for working with LDAP from Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jmerriweather/exldap";
+            };
+          }
+      ) {};
+
+    exldap = exldap_0_1_1;
+
+    exleveldb_0_7_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exleveldb";
+            version = "0.7.0";
+            src = fetchHex {
+              pkg = "exleveldb";
+              version = "0.7.0";
+              sha256 =
+                "90ff2b76b58c889e60203951c1cf5072cf24fd1fad9faad3dce6c96bf34330fc";
+            };
+
+            meta = {
+              longDescription = ''Exleveldb is a thin wrapper around Basho`s
+                                eleveldb (github.com/basho/eleveldb). At the
+                                moment, Exleveldb exposes functions for the
+                                following features of LevelDB: - Opening a new
+                                datastore. - Closing an open datastore. -
+                                Getting values by key. - Storing individual
+                                key-value pairs. - Deleting stored key-value
+                                pairs. - Checking if a datastore is empty. -
+                                Folding over key-value pairs in the datastore. -
+                                Folding over keys in the datastore. - Batch
+                                writes to the datastore (put or delete). -
+                                Destroying a datastore. Additionally, the option
+                                of streaming key-value pairs or keys from the
+                                datastore has been added in v0.5.0. Note:
+                                Because eleveldb is not a hex package, you will
+                                need to include it as a separate dependency in
+                                your project (See `README.md`).'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/skovsgaard/exleveldb.git";
+            };
+          }
+      ) {};
+
+    exleveldb = exleveldb_0_7_0;
+
+    exlibris_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exlibris";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "exlibris";
+              version = "0.0.1";
+              sha256 =
+                "c6f957233b464eeddf590bad43368427ee9c715470e89d2f348d7d01935ad7be";
+            };
+
+            meta = {
+              longDescription = ''A collection of random library functions I
+                                use across multiple projects: pipe_while_ok:
+                                Create pipelines that terminate early if any
+                                step fails to return a tuple that starts {:ok,
+                                ...} before_returning: Like Ruby`s returning, it
+                                evaluates its first argument, then evalates the
+                                do block. It always returns the value of its
+                                first argument. '';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/pragdave/exlibris";
+            };
+          }
+      ) {};
+
+    exlibris = exlibris_0_0_1;
+
+    exlingr_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exlingr";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "exlingr";
+              version = "0.0.1";
+              sha256 =
+                "b45acd0e10f719b88c943b3194b7fded6ece9874c7da2c1f18b2ce2425581701";
+            };
+
+            meta = {
+              description = ''Lingr client library for elixir. '';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/mtwtkman/exlingr";
+            };
+          }
+      ) {};
+
+    exlingr = exlingr_0_0_1;
+
+    exmatrix_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, benchfella_0_3_2 }:
+          buildMix {
+            name = "exmatrix";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "exmatrix";
+              version = "0.0.1";
+              sha256 =
+                "58fe316b1ee31f9394f246ec91a6a9157dfae0c38ea649a4c11f70976ca1d13b";
+            };
+            beamDeps  = [ benchfella_0_3_2 ];
+
+            meta = {
+              longDescription = ''ExMatrix is a small library for working with
+                                matrices, originally developed for testing
+                                matrix multiplication in parallel.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/a115/exmatrix";
+            };
+          }
+      ) {};
+
+    exmatrix = exmatrix_0_0_1;
+
+    exmerl_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exmerl";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "exmerl";
+              version = "0.1.1";
+              sha256 =
+                "4bb5d6c1863c5e381b460416c9b517a211db9abd9abf0f32c99b07e128b842aa";
+            };
+
+            meta = {
+              description = ''An Elixir wrapper for parsing XML through the
+                            xmerl_* suite of modules '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/pwoolcoc/exmerl";
+            };
+          }
+      ) {};
+
+    exmerl = exmerl_0_1_1;
+
+    exmetrics_1_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exmetrics";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "exmetrics";
+              version = "1.1.0";
+              sha256 =
+                "1f4645ca0e9ef9b1815c0b301ff2f9a5b5548bc45adb68386cb6529998513d1b";
+            };
+
+            meta = {
+              longDescription = ''Exmetrics provides counters, gauges and
+                                histograms for instrumenting an elixir
+                                application.'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    exmetrics = exmetrics_1_1_0;
+
+    exml_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exml";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "exml";
+              version = "0.1.0";
+              sha256 =
+                "aeed2cc53cae303180fa18eb552241af32e7f05af94ac82de9b81d67b71dee78";
+            };
+
+            meta = {
+              description = ''Most simple Elixir wrapper for xmerl xpath'';
+
+            };
+          }
+      ) {};
+
+    exml = exml_0_1_0;
+
+    exmoji_0_2_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2 }:
+          buildMix {
+            name = "exmoji";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "exmoji";
+              version = "0.2.2";
+              sha256 =
+                "d0123ec6fd14506da93b0e8fdb7c2efa819cc69addeb56a78f3c1e0b8a09d015";
+            };
+            beamDeps  = [ poison_1_5_2 ];
+
+            meta = {
+              description = ''Emoji encoding swiss army knife for dealing with
+                            Unicode and other gotchas.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mroth/exmoji";
+            };
+          }
+      ) {};
+
+    exmoji = exmoji_0_2_2;
+
+    exns_0_3_1_beta = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          uuid_1_1_3,
+          poolboy_1_5_1,
+          poison_1_5_2,
+          msgpax_0_8_2
+        }:
+          buildMix {
+            name = "exns";
+            version = "0.3.1-beta";
+            src = fetchHex {
+              pkg = "exns";
+              version = "0.3.1-beta";
+              sha256 =
+                "ac2042252d873f0449358628a83c49b80587017ed2962960bca0082809e74398";
+            };
+            beamDeps  = [ uuid_1_1_3 poolboy_1_5_1 poison_1_5_2 msgpax_0_8_2
+                      ];
+
+            meta = {
+              longDescription = ''A library for writing clients to communicate
+                                with Python nanoservices via nanomsg.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/walkr/exns";
+            };
+          }
+      ) {};
+
+    exns = exns_0_3_1_beta;
+
+    exnumerable_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exnumerable";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "exnumerable";
+              version = "0.0.1";
+              sha256 =
+                "ea6041540da09b96176a37bdd71e3c6fbacb8353aca3b084deedb17cee265e2e";
+            };
+
+            meta = {
+              description = ''Enumerable type definition in a simple way to be
+                            used with any database.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/KamilLelonek/exnumerable";
+            };
+          }
+      ) {};
+
+    exnumerable = exnumerable_0_0_1;
+
+    exnumerator_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exnumerator";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "exnumerator";
+              version = "1.0.0";
+              sha256 =
+                "7511385b408e6aa2f494444dac4fd8734b91456734adbc46f17c7185a504514a";
+            };
+
+            meta = {
+              description = ''Enumerable type definition in a simple way to be
+                            used with any database.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/KamilLelonek/exnumerator";
+            };
+          }
+      ) {};
+
+    exnumerator = exnumerator_1_0_0;
+
+    exnumterator_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exnumterator";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "exnumterator";
+              version = "1.0.0";
+              sha256 =
+                "895b1dfff48d0459e66338ca8a8b831c2f31654fc0758a24e11a2f54a9cb1106";
+            };
+
+            meta = {
+              description = ''Enumerable type definition in a simple way to be
+                            used with any database.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/KamilLelonek/exnumterator";
+            };
+          }
+      ) {};
+
+    exnumterator = exnumterator_1_0_0;
+
+    exoddic_1_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exoddic";
+            version = "1.2.0";
+            src = fetchHex {
+              pkg = "exoddic";
+              version = "1.2.0";
+              sha256 =
+                "84d79ad8365f9efb5de30afbe074d5360828b3780ff21dfd06d865a3d7773d2e";
+            };
+
+            meta = {
+              description = ''Odds and probability handling and conversions'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mwmiller/exoddic";
+            };
+          }
+      ) {};
+
+    exoddic = exoddic_1_2_0;
+
+    exometer_core_1_0_0 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          setup_1_7_0,
+          parse_trans_2_9_0,
+          lager_3_0_2,
+          folsom_0_8_3
+        }:
+          buildRebar3 {
+            name = "exometer_core";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "exometer_core";
+              version = "1.0.0";
+              sha256 =
+                "6fe43b22439dd89b7b307214cf18084d26fd82e024d8855bdecccf923f93d852";
+            };
+
+            beamDeps  = [
+                          setup_1_7_0 parse_trans_2_9_0 lager_3_0_2 folsom_0_8_3
+                        ];
+
+            meta = {
+              description = ''Code instrumentation and metrics collection
+                            package.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/basho/exometer_core";
+            };
+          }
+      ) {};
+
+    exometer_core = exometer_core_1_0_0;
+
+    exos_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exos";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "exos";
+              version = "1.0.0";
+              sha256 =
+                "3659fca730360d11d90db8ccb0206e978c838af48bc46ac096d47ea807b9d324";
+            };
+
+            meta = {
+              longDescription = ''Create a GenServer in any language. Exos
+                                contains a very simple GenServer which proxy
+                                calls and casts to a given port command,
+                                encoding and decoding the message to the port
+                                using erlang external binary term format. (see
+                                related projects : clojure|python|node_erlastic
+                                on https://github.com/awetzel) '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/awetzel/exos";
+            };
+          }
+      ) {};
+
+    exos = exos_1_0_0;
+
+    expand_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "expand";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "expand";
+              version = "0.0.3";
+              sha256 =
+                "5f2ce07ba074392100fc5f6b8e8af9ec728ce4716e592422c510997d543efa63";
+            };
+
+            meta = {
+              description = ''A pretty printer'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/joeyates/expand";
+            };
+          }
+      ) {};
+
+    expand = expand_0_0_3;
+
+    exparticle_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "exparticle";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "exparticle";
+              version = "0.0.2";
+              sha256 =
+                "ce70b77da48e84307791af00143ad4b9677d39765459865976d459d3b1bdcaf2";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''ExParticle is an elixir client to communicate
+                            with Particle Cloud API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mtanzi/exparticle";
+            };
+          }
+      ) {};
+
+    exparticle = exparticle_0_0_2;
+
+    expcap_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, timex_0_13_5 }:
+          buildMix {
+            name = "expcap";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "expcap";
+              version = "0.1.0";
+              sha256 =
+                "d9d62f7cb7a3acfdb13668668c6cd4e317a125519a5b24830e4184474e8fe274";
+            };
+            beamDeps  = [ timex_0_13_5 ];
+
+            meta = {
+              longDescription = ''A PCAP library written in Elixir. This does
+                                not wrap a C or Erlang PCAP library, rather it
+                                attempts to be an idiomatic Elixir library. This
+                                library parses pcap files, however it does not
+                                yet support most protocols that can be contained
+                                within a pcap file. The only supported protocols
+                                at the moment are: * Ethernet * IPv4 * UDP * DNS
+                                '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/cobenian/expcap";
+            };
+          }
+      ) {};
+
+    expcap = expcap_0_1_0;
+
+    experiment_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "experiment";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "experiment";
+              version = "0.0.3";
+              sha256 =
+                "5acb6c232aff08719f97254ca27ed1eb165c3f2d229e03cda85e4d31ad7b3156";
+            };
+
+            meta = {
+              description = ''Experiment is a library for carefully refactoring
+                            critical paths in production.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/andrewvy/experiment";
+            };
+          }
+      ) {};
+
+    experiment = experiment_0_0_3;
+
+    expinboard_0_0_1 = callPackage
+      (
+        {
+          buildMix, fetchHex, ibrowse_4_2_2, httpotion_2_1_0, exjsx_3_2_0
+        }:
+          buildMix {
+            name = "expinboard";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "expinboard";
+              version = "0.0.1";
+              sha256 =
+                "3ff152d837293c0f53ead6cba4180ced55308d2869faa698e459abbe23d59bdc";
+            };
+            beamDeps  = [ ibrowse_4_2_2 httpotion_2_1_0 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''A simple elixir pinboard client.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/thilko/expinboard";
+            };
+          }
+      ) {};
+
+    expinboard = expinboard_0_0_1;
+
+    expletive_0_1_4 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "expletive";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "expletive";
+              version = "0.1.4";
+              sha256 =
+                "dfb9ac919526bcb7f28b5acadad634b7e9d220203874ef124a87264a078f24b4";
+            };
+
+            meta = {
+              description = ''Profanity detection and sanitization library'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/xavier/expletive";
+            };
+          }
+      ) {};
+
+    expletive = expletive_0_1_4;
+
+    expool_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "expool";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "expool";
+              version = "0.1.0";
+              sha256 =
+                "dfb6e81957a94080f33e8469c497102a36831d7fba4a902d895c3f82f5232060";
+            };
+
+            meta = {
+              description = ''Simple process pooling and task submission'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zackehh/expool";
+            };
+          }
+      ) {};
+
+    expool = expool_0_1_0;
+
+    expr_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "expr";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "expr";
+              version = "0.1.0";
+              sha256 =
+                "5076c73cb6beaafeab5fab4731170c29dca5581eec44df3be363660a872abb97";
+            };
+
+            meta = {
+              description = ''An Elixir library for parsing and evaluating
+                            mathematical expressions '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Rob-bie/Expr";
+            };
+          }
+      ) {};
+
+    expr = expr_0_1_0;
+
+    exprintf_0_1_6 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exprintf";
+            version = "0.1.6";
+            src = fetchHex {
+              pkg = "exprintf";
+              version = "0.1.6";
+              sha256 =
+                "7acb31f93cef83effd3aa1f0572f9e29d7d1b4f50a6d456e2830fa7594c16182";
+            };
+
+            meta = {
+              description = ''A printf / sprintf library for Elixir. It works
+                            as a wrapper for :io.format. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/parroty/exprintf";
+            };
+          }
+      ) {};
+
+    exprintf = exprintf_0_1_6;
+
+    exprof_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, exprintf_0_1_6 }:
+          buildMix {
+            name = "exprof";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "exprof";
+              version = "0.2.0";
+              sha256 =
+                "2b3b8c623873172a6c7ba1707981f51feea6b6edbabd5347752030803ad0c954";
+            };
+            beamDeps  = [ exprintf_0_1_6 ];
+
+            meta = {
+              description = ''A simple code profiler for Elixir using eprof.
+                            '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/parroty/exprof";
+            };
+          }
+      ) {};
+
+    exprof = exprof_0_2_0;
+
+    exprotobuf_0_10_2 = callPackage
+      (
+        {  buildMix, fetchHex, gpb_3_18_10 }:
+          buildMix {
+            name = "exprotobuf";
+            version = "0.10.2";
+            src = fetchHex {
+              pkg = "exprotobuf";
+              version = "0.10.2";
+              sha256 =
+                "dc71af3a83a51376de72de160123408cd38adfed2ad2f419465b4d1e3f87d244";
+            };
+            beamDeps  = [ gpb_3_18_10 ];
+
+            meta = {
+              longDescription = ''exprotobuf provides native encoding/decoding
+                                of protobuf messages via generated
+                                modules/structs.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/bitwalker/exprotobuf";
+            };
+          }
+      ) {};
+
+    exprotobuf_0_13_0 = callPackage
+      (
+        {  buildMix, fetchHex, gpb_3_18_10 }:
+          buildMix {
+            name = "exprotobuf";
+            version = "0.13.0";
+            src = fetchHex {
+              pkg = "exprotobuf";
+              version = "0.13.0";
+              sha256 =
+                "25921ae192f22eca89d543134a7b12bd2db617bb77992f1d4957b8b28bccbc8e";
+            };
+            beamDeps  = [ gpb_3_18_10 ];
+
+            meta = {
+              longDescription = ''exprotobuf provides native encoding/decoding
+                                of protobuf messages via generated
+                                modules/structs.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/bitwalker/exprotobuf";
+            };
+          }
+      ) {};
+
+    exprotobuf_1_0_0_rc1 = callPackage
+      (
+        {  buildMix, fetchHex, gpb_3_18_10 }:
+          buildMix {
+            name = "exprotobuf";
+            version = "1.0.0-rc1";
+            src = fetchHex {
+              pkg = "exprotobuf";
+              version = "1.0.0-rc1";
+              sha256 =
+                "e4cbf0bc2672e0d9fa3afe5acac8617a4e94443256d5fc19e5e7721681dd3eff";
+            };
+            beamDeps  = [ gpb_3_18_10 ];
+
+            meta = {
+              longDescription = ''exprotobuf provides native encoding/decoding
+                                of protobuf messages via generated
+                                modules/structs.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/bitwalker/exprotobuf";
+            };
+          }
+      ) {};
+
+    exprotobuf = exprotobuf_1_0_0_rc1;
+
+    exq_0_6_4 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          uuid_1_1_3,
+          timex_1_0_1,
+          redix_0_3_4,
+          poison_2_1_0
+        }:
+          buildMix {
+            name = "exq";
+            version = "0.6.4";
+            src = fetchHex {
+              pkg = "exq";
+              version = "0.6.4";
+              sha256 =
+                "24b75a33da51ea3f3561a127237dbefa5b82d2ff478eb9591314644d89bc8c95";
+            };
+            beamDeps  = [ uuid_1_1_3 timex_1_0_1 redix_0_3_4 poison_2_1_0 ];
+
+            meta = {
+              longDescription = ''Exq is a job processing library compatible
+                                with Resque / Sidekiq for the Elixir
+                                language.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/akira/exq";
+            };
+          }
+      ) {};
+
+    exq = exq_0_6_4;
+
+    exq_ui_0_6_4 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, exq_0_6_4, cowboy_1_0_4 }:
+          buildMix {
+            name = "exq_ui";
+            version = "0.6.4";
+            src = fetchHex {
+              pkg = "exq_ui";
+              version = "0.6.4";
+              sha256 =
+                "6072838b9161e8b036466dd8fb21ea99fd93beb2488d76f3d6561211eac36b71";
+            };
+            beamDeps  = [ plug_1_1_1 exq_0_6_4 cowboy_1_0_4 ];
+
+            meta = {
+              longDescription = ''Exq UI is the UI component for Exq, a job
+                                processing library. Exq UI provides the UI
+                                dashboard to display stats on job processing.'';
+
+              homepage = "https://github.com/akira/exq";
+            };
+          }
+      ) {};
+
+    exq_ui = exq_ui_0_6_4;
+
+    exql_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, tds_0_5_4 }:
+          buildMix {
+            name = "exql";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "exql";
+              version = "0.0.3";
+              sha256 =
+                "0dea2cd0f6cb1ba6c1cd4298716131fafb4271f2c076df0dd6e73e37cecb4705";
+            };
+            beamDeps  = [ tds_0_5_4 ];
+
+            meta = {
+              description = ''A functional query tool for MSSQL.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mattweldon/exql";
+            };
+          }
+      ) {};
+
+    exql = exql_0_0_3;
+
+    exquery_0_0_11 = callPackage
+      (
+        {  buildRebar3, fetchHex, ex_doc_0_11_4, earmark_0_1_19 }:
+          buildRebar3 {
+            name = "exquery";
+            version = "0.0.11";
+            src = fetchHex {
+              pkg = "exquery";
+              version = "0.0.11";
+              sha256 =
+                "61b520599fa33dc8c97be32f41c8fe4a6eb9d8b98b72a72cb88185868692a0c1";
+            };
+
+            beamDeps  = [ ex_doc_0_11_4 earmark_0_1_19 ];
+
+            meta = {
+              longDescription = '' A library for parsing HTML and querying
+                                elements within. Handy for web scraping or
+                                autmated testing. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rozap/exquery";
+            };
+          }
+      ) {};
+
+    exquery = exquery_0_0_11;
+
+    exquisite_0_1_6 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exquisite";
+            version = "0.1.6";
+            src = fetchHex {
+              pkg = "exquisite";
+              version = "0.1.6";
+              sha256 =
+                "8bd974eea0ef20d841f999818e4b6f0edd8e52b6723e8c5b2c4ba7a22fa07c7a";
+            };
+
+            meta = {
+              description = ''DSL to match_spec'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/meh/exquisite";
+            };
+          }
+      ) {};
+
+    exquisite = exquisite_0_1_6;
+
+    exrabbit_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exrabbit";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "exrabbit";
+              version = "0.0.2";
+              sha256 =
+                "8dda89e78a8918eddcf28200e4474127151a8e20a2b54447b817732344b4e55a";
+            };
+
+            meta = {
+              description = ''RabbitMQ bindings and DSL for Elixir'';
+
+              homepage = "https://github.com/d0rc/exrabbit";
+            };
+          }
+      ) {};
+
+    exrabbit = exrabbit_0_0_2;
+
+    exrecaptcha_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, httpotion_1_0_0 }:
+          buildMix {
+            name = "exrecaptcha";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "exrecaptcha";
+              version = "0.0.3";
+              sha256 =
+                "2df1a9e868d3adc31a657755df04fabc9c9e7d12f56cbcc86b27f670dcd962b5";
+            };
+            beamDeps  = [ httpotion_1_0_0 ];
+
+            meta = {
+              longDescription = ''Simple ReCaptcha display/verify code for
+                                Elixir applications. Designed to be used with a
+                                CMS such as Phoenix. '';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/adanselm/exrecaptcha";
+            };
+          }
+      ) {};
+
+    exrecaptcha = exrecaptcha_0_0_3;
+
+    exredis_0_2_3 = callPackage
+      (
+        {  buildMix, fetchHex, eredis_1_0_8 }:
+          buildMix {
+            name = "exredis";
+            version = "0.2.3";
+            src = fetchHex {
+              pkg = "exredis";
+              version = "0.2.3";
+              sha256 =
+                "0d5a48cd27ec6200c3ffa5442d7dc615d7dbfe94a500d1240b9c0c9205ec4e56";
+            };
+            beamDeps  = [ eredis_1_0_8 ];
+
+            meta = {
+              description = ''Redis client for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/artemeff/exredis";
+            };
+          }
+      ) {};
+
+    exredis = exredis_0_2_3;
+
+    exrethinkdb_0_0_3 = callPackage
+      (
+        {  buildRebar3, fetchHex, poison_1_4_0 }:
+          buildRebar3 {
+            name = "exrethinkdb";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "exrethinkdb";
+              version = "0.0.3";
+              sha256 =
+                "c48a25a613de9f4c8ffe490044e448f01d816e0f6806af018494c3a19890ed1a";
+            };
+
+            beamDeps  = [ poison_1_4_0 ];
+
+            meta = {
+              description = ''RethinkDB driver for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/hamiltop/exrethinkdb";
+            };
+          }
+      ) {};
+
+    exrethinkdb = exrethinkdb_0_0_3;
+
+    exrm_0_15_1 = callPackage
+      (
+        {  buildMix, fetchHex, conform_0_13_0 }:
+          buildMix {
+            name = "exrm";
+            version = "0.15.1";
+            src = fetchHex {
+              pkg = "exrm";
+              version = "0.15.1";
+              sha256 =
+                "ed2227e8b189af4deca0f1b637fdfe9514b817128f6c2b007ccb05c65d49f132";
+            };
+            beamDeps  = [ conform_0_13_0 ];
+
+            meta = {
+              longDescription = ''Exrm, or Elixir Release Manager, provides mix
+                                tasks for building, upgrading, and controlling
+                                release packages for your application.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitwalker/exrm";
+            };
+          }
+      ) {};
+
+    exrm_0_18_8 = callPackage
+      (
+        {  buildMix, fetchHex, relx_3_3_1, conform_0_16_0 }:
+          buildMix {
+            name = "exrm";
+            version = "0.18.8";
+            src = fetchHex {
+              pkg = "exrm";
+              version = "0.18.8";
+              sha256 =
+                "a8aa031d824f882a762404bc19b6fbe6c10703941097a6ef8bb93a62cc987e22";
+            };
+            beamDeps  = [ relx_3_3_1 conform_0_16_0 ];
+
+            meta = {
+              longDescription = ''Exrm, or Elixir Release Manager, provides mix
+                                tasks for building, upgrading, and controlling
+                                release packages for your application.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitwalker/exrm";
+            };
+          }
+      ) {};
+
+    exrm_0_19_9 = callPackage
+      (
+        {  buildMix, fetchHex, relx_3_5_0, conform_1_0_0_rc8 }:
+          buildMix {
+            name = "exrm";
+            version = "0.19.9";
+            src = fetchHex {
+              pkg = "exrm";
+              version = "0.19.9";
+              sha256 =
+                "3107dcac0727f7e986ef36604e13943759a52188fbee630d72b1b3adb4594941";
+            };
+            beamDeps  = [ relx_3_5_0 conform_1_0_0_rc8 ];
+
+            meta = {
+              longDescription = ''Exrm, or Elixir Release Manager, provides mix
+                                tasks for building, upgrading, and controlling
+                                release packages for your application.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitwalker/exrm";
+            };
+          }
+      ) {};
+
+    exrm_1_0_0_rc8 = callPackage
+      (
+        {  buildMix, fetchHex, relx_3_17_0 }:
+          buildMix {
+            name = "exrm";
+            version = "1.0.0-rc8";
+            src = fetchHex {
+              pkg = "exrm";
+              version = "1.0.0-rc8";
+              sha256 =
+                "f4bc906713eb57e9ac7c4bf16aa218cbb437b3392f2183eb3057e8f6921fa8fa";
+            };
+            beamDeps  = [ relx_3_17_0 ];
+
+            meta = {
+              longDescription = ''Exrm, or Elixir Release Manager, provides mix
+                                tasks for building, upgrading, and controlling
+                                release packages for your application.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitwalker/exrm";
+            };
+          }
+      ) {};
+
+    exrm = exrm_1_0_0_rc8;
+
+    exrm_heroku_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, exrm_1_0_0_rc8 }:
+          buildMix {
+            name = "exrm_heroku";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "exrm_heroku";
+              version = "0.1.1";
+              sha256 =
+                "19fc16f1cfcc1c86bc64796a287028b8a8d951f7737024893c1772ba658da76d";
+            };
+            beamDeps  = [ exrm_1_0_0_rc8 ];
+
+            meta = {
+              description = ''Publish Elixir releases created with exrm release
+                            manager to Heroku. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ride/exrm-heroku";
+            };
+          }
+      ) {};
+
+    exrm_heroku = exrm_heroku_0_1_1;
+
+    exrm_rpm_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex, exrm_0_15_1 }:
+          buildMix {
+            name = "exrm_rpm";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "exrm_rpm";
+              version = "0.3.0";
+              sha256 =
+                "28c2339fac5073d615fb4a52816dd4fc56c9da2db9e71846b0affdf171643044";
+            };
+            beamDeps  = [ exrm_0_15_1 ];
+
+            meta = {
+              longDescription = ''Adds simple Red Hat Package Manager (RPM)
+                                generation to the exrm package manager. The
+                                generated RPM file includes the Elixir release
+                                and an init.d script to manage the project`s
+                                service. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/smpallen99/exrm-rpm";
+            };
+          }
+      ) {};
+
+    exrm_rpm = exrm_rpm_0_3_0;
+
+    exromaji_0_2_8 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exromaji";
+            version = "0.2.8";
+            src = fetchHex {
+              pkg = "exromaji";
+              version = "0.2.8";
+              sha256 =
+                "c402dc57b246ba09a93612e2ac715e013d063eada3f1a88bfe89ad59ecff23db";
+            };
+
+            meta = {
+              description = ''A Elixir library for translating between
+                            hiragana, katakana, and romaji.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ikeikeikeike/exromaji";
+            };
+          }
+      ) {};
+
+    exromaji = exromaji_0_2_8;
+
+    exrun_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exrun";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "exrun";
+              version = "0.1.1";
+              sha256 =
+                "d61b90c23ba37c9b44b379d6094ef8411522d17d94d33b786e1dc5bfac09bfc0";
+            };
+
+            meta = {
+              longDescription = ''Elixir - save and easy to use, tracing tools
+                                for running elixir and erlang applications'';
+
+              homepage = "https://github.com/liveforeverx/exrun";
+            };
+          }
+      ) {};
+
+    exrun = exrun_0_1_1;
+
+    exsamples_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exsamples";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "exsamples";
+              version = "0.1.0";
+              sha256 =
+                "92acafe7e8a5d6b1c1b5ca937b9dab887f9a4474cfd6510a7117690a6c6da86d";
+            };
+
+            meta = {
+              longDescription = ''Initializes lists of maps, structs or keyword
+                                lists using tabular data in Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/msaraiva/exsamples";
+            };
+          }
+      ) {};
+
+    exsamples = exsamples_0_1_0;
+
+    exscript_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exscript";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "exscript";
+              version = "0.0.1";
+              sha256 =
+                "56360c7f6063df2088deb0ec7683dee90c4bfede861ef85b81fa94cc0abe302b";
+            };
+
+            meta = {
+              description = ''Escript generator '';
+
+              homepage = "https://github.com/liveforeverx/exscript";
+            };
+          }
+      ) {};
+
+    exscript = exscript_0_0_1;
+
+    exseed_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, ecto_2_0_0_beta_0 }:
+          buildMix {
+            name = "exseed";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "exseed";
+              version = "0.0.3";
+              sha256 =
+                "d5f42ed419c9f1d5d179dc93fdf6a58344b07055764498f222f07f95cb82dd98";
+            };
+            beamDeps  = [ ecto_2_0_0_beta_0 ];
+
+            meta = {
+              description = ''A library that provides a simple DSL for seeding
+                            databases through Ecto.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/seaneshbaugh/exseed";
+            };
+          }
+      ) {};
+
+    exseed = exseed_0_0_3;
+
+    exsentry_0_2_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          uuid_1_1_3,
+          timex_1_0_1,
+          poison_1_5_2,
+          plug_1_1_1,
+          ibrowse_4_2_2,
+          httpotion_2_2_0,
+          fuzzyurl_0_8_1
+        }:
+          buildMix {
+            name = "exsentry";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "exsentry";
+              version = "0.2.1";
+              sha256 =
+                "3feebb7a00f9fac19c989214bf15131d540e1e88c27286c46b3083c4f85972fb";
+            };
+            beamDeps  = [
+                          uuid_1_1_3
+                          timex_1_0_1
+                          poison_1_5_2
+                          plug_1_1_1
+                          ibrowse_4_2_2
+                          httpotion_2_2_0
+                          fuzzyurl_0_8_1
+                        ];
+
+            meta = {
+              description = ''ExSentry is a client for the Sentry error
+                            reporting platform.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/appcues/exsentry";
+            };
+          }
+      ) {};
+
+    exsentry = exsentry_0_2_1;
+
+    exstatic_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1 }:
+          buildMix {
+            name = "exstatic";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "exstatic";
+              version = "0.1.0";
+              sha256 =
+                "e063b91c0b2995e4a1a2c1aa56cdd578374320a8755844cc6471b58fa3874d0d";
+            };
+            beamDeps  = [ plug_1_1_1 ];
+
+            meta = {
+              longDescription = ''Serve static files from memory in the Phoenix
+                                Framework. This extension compiles all of a
+                                project`s static assets (e.g. Javascript, HTML,
+                                images, etc) into Erlang modules and loads them
+                                into the Erlang VM, with the purpose of serving
+                                them fast and without a dependency on a
+                                filesystem.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/arjan/exstatic";
+            };
+          }
+      ) {};
+
+    exstatic = exstatic_0_1_0;
+
+    exstatsd_0_1_5 = callPackage
+      (
+        {  buildMix, fetchHex, exactor_2_2_0 }:
+          buildMix {
+            name = "exstatsd";
+            version = "0.1.5";
+            src = fetchHex {
+              pkg = "exstatsd";
+              version = "0.1.5";
+              sha256 =
+                "4fcad707df57fdb91338dae212355704924bea8db10207715b95e3c110e7b219";
+            };
+            beamDeps  = [ exactor_2_2_0 ];
+
+            meta = {
+              description = ''An Elixir ports client for StatsD'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/upbit/ExStatsD";
+            };
+          }
+      ) {};
+
+    exstatsd = exstatsd_0_1_5;
+
+    exsync_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex, exfswatch_0_1_1 }:
+          buildMix {
+            name = "exsync";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "exsync";
+              version = "0.1.2";
+              sha256 =
+                "21a1106d5e62ced84a567bde2acbdff73ddf06d2a78fbd80ffa488fae4bde48b";
+            };
+            beamDeps  = [ exfswatch_0_1_1 ];
+
+            meta = {
+              description = ''Yet another Elixir reloader.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/falood/exsync";
+            };
+          }
+      ) {};
+
+    exsync = exsync_0_1_2;
+
+    exsyslog_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, syslog_1_0_2, poison_1_5_2 }:
+          buildMix {
+            name = "exsyslog";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "exsyslog";
+              version = "1.0.1";
+              sha256 =
+                "a3972cf2c70bcf8fedcd702109ed6a2213d1905c6eabb0e42e600b34bc9f0fbe";
+            };
+            beamDeps  = [ syslog_1_0_2 poison_1_5_2 ];
+
+            meta = {
+              description = ''ExSyslog is a Elixir Logger custom backend to
+                            syslog.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/22cans/exsyslog";
+            };
+          }
+      ) {};
+
+    exsyslog = exsyslog_1_0_1;
+
+    extreme_0_4_3 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          uuid_1_1_3,
+          poison_1_5_2,
+          httpoison_0_8_1,
+          exprotobuf_0_10_2
+        }:
+          buildMix {
+            name = "extreme";
+            version = "0.4.3";
+            src = fetchHex {
+              pkg = "extreme";
+              version = "0.4.3";
+              sha256 =
+                "db08580b4b839be7bf3f6198efc7de02c22a3688f46ce32deca983db74f1e330";
+            };
+            beamDeps  = [
+                          uuid_1_1_3
+                          poison_1_5_2
+                          httpoison_0_8_1
+                          exprotobuf_0_10_2
+                        ];
+
+            meta = {
+              description = ''Elixir TCP adapter for EventStore.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/exponentially/extreme";
+            };
+          }
+      ) {};
+
+    extreme = extreme_0_4_3;
+
+    extripe_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_1 }:
+          buildMix {
+            name = "extripe";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "extripe";
+              version = "0.2.0";
+              sha256 =
+                "70cccdf79565d34ab4df68d89e22cfe574b2fe64b631303c496e27f83e798491";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Stripe API wrapper'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/princemaple/extripe";
+            };
+          }
+      ) {};
+
+    extripe = extripe_0_2_0;
+
+    exts_0_2_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exts";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "exts";
+              version = "0.2.2";
+              sha256 =
+                "0c3fa7e429912a4af48dd94975535e6db0557297d675b9d9105645d05d3a3089";
+            };
+
+            meta = {
+              description = ''ets wrapper for Elixir'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/meh/exts";
+            };
+          }
+      ) {};
+
+    exts = exts_0_2_2;
+
+    extwitter_0_6_2 = callPackage
+      (
+        {  buildMix, fetchHex, timex_1_0_1, poison_1_5_2 }:
+          buildMix {
+            name = "extwitter";
+            version = "0.6.2";
+            src = fetchHex {
+              pkg = "extwitter";
+              version = "0.6.2";
+              sha256 =
+                "dd5ea2b6c9f99e167024b3ec6fb97f4803f39521229771ae001f7b44ed572f76";
+            };
+            beamDeps  = [ timex_1_0_1 poison_1_5_2 ];
+
+            meta = {
+              description = ''Twitter client library for elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/parroty/extwitter";
+            };
+          }
+      ) {};
+
+    extwitter = extwitter_0_6_2;
+
+    exurban_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, jazz_0_2_1, httpoison_0_7_5 }:
+          buildMix {
+            name = "exurban";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "exurban";
+              version = "0.0.1";
+              sha256 =
+                "612b3136b144edfbad658acca6961a3c9a1afe5d343acacb5ce5b358a67bd797";
+            };
+            beamDeps  = [ jazz_0_2_1 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''Elixir wrapper for UrbanAirship API.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/tappsi/exurban";
+            };
+          }
+      ) {};
+
+    exurban = exurban_0_0_1;
+
+    exvcr_0_3_9 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          meck_0_8_4,
+          httpotion_1_0_0,
+          httpoison_0_8_1,
+          exjsx_3_2_0,
+          exactor_2_2_0
+        }:
+          buildMix {
+            name = "exvcr";
+            version = "0.3.9";
+            src = fetchHex {
+              pkg = "exvcr";
+              version = "0.3.9";
+              sha256 =
+                "25645f6598111ba76ed30b4a2079169ae1aed0795ef87bf74d70a3a7ca8f2112";
+            };
+            beamDeps  = [
+                          meck_0_8_4
+                          httpotion_1_0_0
+                          httpoison_0_8_1
+                          exjsx_3_2_0
+                          exactor_2_2_0
+                        ];
+
+            meta = {
+              description = ''HTTP request/response recording library for
+                            elixir, inspired by VCR.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/parroty/exvcr";
+            };
+          }
+      ) {};
+
+    exvcr_0_7_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          meck_0_8_4,
+          httpotion_2_2_0,
+          httpoison_0_8_1,
+          exjsx_3_2_0,
+          exactor_2_2_0
+        }:
+          buildMix {
+            name = "exvcr";
+            version = "0.7.1";
+            src = fetchHex {
+              pkg = "exvcr";
+              version = "0.7.1";
+              sha256 =
+                "e894995695be15a546c1acf09d87967b078e0f6bc0a2be540d226c8ae40b161d";
+            };
+            beamDeps  = [
+                          meck_0_8_4
+                          httpotion_2_2_0
+                          httpoison_0_8_1
+                          exjsx_3_2_0
+                          exactor_2_2_0
+                        ];
+
+            meta = {
+              description = ''HTTP request/response recording library for
+                            elixir, inspired by VCR.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/parroty/exvcr";
+            };
+          }
+      ) {};
+
+    exvcr = exvcr_0_7_1;
+
+    exyelp_0_0_2 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_2_1_0, oauther_1_0_2, httpoison_0_8_1
+        }:
+          buildMix {
+            name = "exyelp";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "exyelp";
+              version = "0.0.2";
+              sha256 =
+                "1be8553ea0369a092eac1b6a0b47652b7c0570911483aa3ca454bef05ddd4d5d";
+            };
+            beamDeps  = [ poison_2_1_0 oauther_1_0_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''An Elixir Yelp API client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gaslight/exyelp";
+            };
+          }
+      ) {};
+
+    exyelp = exyelp_0_0_2;
+
+    exyz_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exyz";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "exyz";
+              version = "1.0.0";
+              sha256 =
+                "b1d53964ca72f70dd71c91327bf912858619d0357a53765ed3a08671e6769ef5";
+            };
+
+            meta = {
+              description = ''Z-combinator in elixir: recursive anonymous
+                            functions.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/Dkendal/exyz";
+            };
+          }
+      ) {};
+
+    exyz = exyz_1_0_0;
+
+    eye_drops_1_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, fs_0_9_2 }:
+          buildMix {
+            name = "eye_drops";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "eye_drops";
+              version = "1.1.0";
+              sha256 =
+                "e1ed246cd35d0b58798fdec5cca8066d9251cc37251f298e531d8163dbc11332";
+            };
+            beamDeps  = [ fs_0_9_2 ];
+
+            meta = {
+              longDescription = ''A configurable mix task to watch file changes
+                                Watch file changes in a project and run the
+                                corresponding command when a change happens.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rkotze/eye_drops";
+            };
+          }
+      ) {};
+
+    eye_drops = eye_drops_1_1_0;
+
+    ezcryptex_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, cryptex_0_0_1 }:
+          buildMix {
+            name = "ezcryptex";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ezcryptex";
+              version = "0.0.1";
+              sha256 =
+                "0c1c295cf5500106f7288949021ccbdc0d3a9276c2ae9938e45254b7500017b5";
+            };
+            beamDeps  = [ cryptex_0_0_1 ];
+
+            meta = {
+              longDescription = ''Thin layer on top of Cryptex for more easily
+                                encrypting/decrypting, signing/verifying data in
+                                elixir. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/stocks29/ezcryptex";
+            };
+          }
+      ) {};
+
+    ezcryptex = ezcryptex_0_0_1;
+
+    ezlib_1_0_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "ezlib";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "ezlib";
+              version = "1.0.1";
+              sha256 =
+                "fea58a6ab557888dbfc91a8d20c55755614c123277a57dea2e91711c630465e1";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''Native zlib driver for Erlang / Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/processone/ezlib";
+            };
+          }
+      ) {};
+
+    ezlib = ezlib_1_0_1;
+
+    ezmq_0_2_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, lager_3_0_1, gen_listener_tcp_0_3_2 }:
+          buildRebar3 {
+            name = "ezmq";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "ezmq";
+              version = "0.2.0";
+              sha256 =
+                "bc804ffded0b0d0f684d4313ad3fa676479df962c584daaf5aa14ada5b86a52b";
+            };
+
+            beamDeps  = [ lager_3_0_1 gen_listener_tcp_0_3_2 ];
+
+            meta = {
+              description = ''Native Erlang 0MQ implementation'';
+              license = stdenv.lib.licenses.mpl20;
+              homepage = "https://github.com/zeromq/ezmq";
+            };
+          }
+      ) {};
+
+    ezmq = ezmq_0_2_0;
+
+    facebook_0_4_1 = callPackage
+      (
+        {
+          buildMix, fetchHex, libex_config_0_2_0, json_0_3_3, hackney_1_4_8
+        }:
+          buildMix {
+            name = "facebook";
+            version = "0.4.1";
+            src = fetchHex {
+              pkg = "facebook";
+              version = "0.4.1";
+              sha256 =
+                "f5583fe383f8a2b421f91ddbc9beccc9626527e96ec3502c723cc99e1c47e863";
+            };
+            beamDeps  = [ libex_config_0_2_0 json_0_3_3 hackney_1_4_8 ];
+
+            meta = {
+              longDescription = ''Facebook Graph API Wrapper written in Elixir.
+                                Please note, this is very much a work in
+                                progress. Feel free to contribute using pull
+                                requests.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mweibel/facebook.ex";
+            };
+          }
+      ) {};
+
+    facebook = facebook_0_4_1;
+
+    factory_girl_elixir_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "factory_girl_elixir";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "factory_girl_elixir";
+              version = "0.1.1";
+              sha256 =
+                "2e07de9813089c6e6a45f0584eb2bfd28d3acbf654073b9e2ed6d0fd531b8f7e";
+            };
+
+            meta = {
+              description = ''Minimal implementation of Ruby`s factory_girl in
+                            Elixir. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sinetris/factory_girl_elixir";
+            };
+          }
+      ) {};
+
+    factory_girl_elixir = factory_girl_elixir_0_1_1;
+
+    faker_0_6_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "faker";
+            version = "0.6.0";
+            src = fetchHex {
+              pkg = "faker";
+              version = "0.6.0";
+              sha256 =
+                "4f305a9ec9a2645bf4777dda1b56643d04333b7ff601145bf4b80acca030c2a0";
+            };
+
+            meta = {
+              description = ''Faker is a pure Elixir library for generating
+                            fake data.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/igas/faker";
+            };
+          }
+      ) {};
+
+    faker = faker_0_6_0;
+
+    fast_tls_1_0_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, p1_utils_1_0_3 }:
+          buildRebar3 {
+            name = "fast_tls";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "fast_tls";
+              version = "1.0.1";
+              sha256 =
+                "479d1e53a14b749b96581df7320440da1ff56df9dde91d327b3ecc1bc60fcb0d";
+            };
+            compilePorts = true;
+            beamDeps  = [ p1_utils_1_0_3 ];
+
+            meta = {
+              description = ''TLS / SSL OpenSSL-based native driver for Erlang
+                            / Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/processone/fast_tls";
+            };
+          }
+      ) {};
+
+    fast_tls = fast_tls_1_0_1;
+
+    fast_xml_1_1_3 = callPackage
+      (
+        {  buildRebar3, fetchHex, p1_utils_1_0_3 }:
+          buildRebar3 {
+            name = "fast_xml";
+            version = "1.1.3";
+            src = fetchHex {
+              pkg = "fast_xml";
+              version = "1.1.3";
+              sha256 =
+                "ea1abe9cdfa0df67178378ba5ec11e746023b66bc1ed0f980ae69d2aa1f732c3";
+            };
+            compilePorts = true;
+            beamDeps  = [ p1_utils_1_0_3 ];
+
+            meta = {
+              description = ''Fast Expat-based Erlang / Elixir XML parsing
+                            library'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/processone/fast_xml";
+            };
+          }
+      ) {};
+
+    fast_xml = fast_xml_1_1_3;
+
+    fast_yaml_1_0_2 = callPackage
+      (
+        {  buildRebar3, fetchHex, p1_utils_1_0_3 }:
+          buildRebar3 {
+            name = "fast_yaml";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "fast_yaml";
+              version = "1.0.2";
+              sha256 =
+                "2f2034d6003425b02619ba15658665134cfd81e3d1c9379c268f802a5775086d";
+            };
+            compilePorts = true;
+            beamDeps  = [ p1_utils_1_0_3 ];
+
+            meta = {
+              description = ''Fast YAML native library for Erlang / Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/processone/fast_yaml";
+            };
+          }
+      ) {};
+
+    fast_yaml = fast_yaml_1_0_2;
+
+    favicon_0_0_7 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_7_5, floki_0_7_1 }:
+          buildMix {
+            name = "favicon";
+            version = "0.0.7";
+            src = fetchHex {
+              pkg = "favicon";
+              version = "0.0.7";
+              sha256 =
+                "b9a577d3d22a6e51843eb334b87de512f48a548d7a7edf56e178e0dde420ba0e";
+            };
+            beamDeps  = [ httpoison_0_7_5 floki_0_7_1 ];
+
+            meta = {
+              description = ''A library that fetches the favicon url for a
+                            specified url'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ricn/favicon";
+            };
+          }
+      ) {};
+
+    favicon = favicon_0_0_7;
+
+    fdg_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "fdg";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "fdg";
+              version = "0.0.4";
+              sha256 =
+                "a5ec0f8214e52c63186e620a3556a3d61c6fa9118bf4a6b84b67ff236b8a98da";
+            };
+
+            meta = {
+              longDescription = ''This project aims to be a simple library with
+                                which to build force directed graphs. Ideally,
+                                FDG will be used to produce visualiations of
+                                networks and static analysis of code.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/johnhamelink/elixir-fdg";
+            };
+          }
+      ) {};
+
+    fdg = fdg_0_0_4;
+
+    feeder_1_4_7 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "feeder";
+            version = "1.4.7";
+            src = fetchHex {
+              pkg = "feeder";
+              version = "1.4.7";
+              sha256 =
+                "1ac4696d0801c5e433caedeb38001341a9e22120998dcb0ee6d358266260c3da";
+            };
+
+            meta = {
+              description = ''Stream parse RSS and Atom formatted XML feeds.
+                            '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/michaelnisi/feeder";
+            };
+          }
+      ) {};
+
+    feeder_2_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "feeder";
+            version = "2.0.0";
+            src = fetchHex {
+              pkg = "feeder";
+              version = "2.0.0";
+              sha256 =
+                "9780c5f032d3480cf7d9fd71d3f0c5f73211e0d3a8d9cdabcb1327b3a4ff758e";
+            };
+
+            meta = {
+              description = ''Stream parse RSS and Atom formatted XML feeds.
+                            '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/michaelnisi/feeder";
+            };
+          }
+      ) {};
+
+    feeder = feeder_2_0_0;
+
+    feeder_ex_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, feeder_1_4_7 }:
+          buildMix {
+            name = "feeder_ex";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "feeder_ex";
+              version = "0.0.2";
+              sha256 =
+                "0816c5c2757098d02727dcba55dfb8b4ecff66736d0f74d4bd36ffe93f033c31";
+            };
+            beamDeps  = [ feeder_1_4_7 ];
+
+            meta = {
+              description = ''RSS feed parser. Simple wrapper for feeder.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/manukall/feeder_ex";
+            };
+          }
+      ) {};
+
+    feeder_ex = feeder_ex_0_0_2;
+
+    feedistiller_2_0_2 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          timex_0_19_5,
+          httpoison_0_7_5,
+          feeder_2_0_0,
+          alambic_0_1_0
+        }:
+          buildMix {
+            name = "feedistiller";
+            version = "2.0.2";
+            src = fetchHex {
+              pkg = "feedistiller";
+              version = "2.0.2";
+              sha256 =
+                "453244b3a41fbde7e13ccd675928f41f155799c218b47cbead9e67066efc8276";
+            };
+            beamDeps  = [
+                          timex_0_19_5
+                          httpoison_0_7_5
+                          feeder_2_0_0
+                          alambic_0_1_0
+                        ];
+
+            meta = {
+              description = ''Download RSS/Atom feeds enclosures.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/sdanzan/feedistiller";
+            };
+          }
+      ) {};
+
+    feedistiller = feedistiller_2_0_2;
+
+    feedlex_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_3_1, httpoison_0_8_1 }:
+          buildMix {
+            name = "feedlex";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "feedlex";
+              version = "0.0.1";
+              sha256 =
+                "1f20033824f816d6904837601c14bdffcf1a56a53b8ed7d7916a67e48e53b4a5";
+            };
+            beamDeps  = [ poison_1_3_1 httpoison_0_8_1 ];
+
+            meta = {
+              longDescription = ''Feedly RSS reader client for Elixir
+                                (elixir-lang). Partial but functional
+                                implementation. For now it covers the following
+                                Feedly APIs: * authentication; * feed; * stream;
+                                * subscription.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/essenciary/feedlex";
+            };
+          }
+      ) {};
+
+    feedlex = feedlex_0_0_1;
+
+    feedme_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, timex_0_19_5 }:
+          buildMix {
+            name = "feedme";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "feedme";
+              version = "0.0.1";
+              sha256 =
+                "021621981bbb03b317e4a948a39d269ab1a2dc6d9ec6ee1c744e565000da680d";
+            };
+            beamDeps  = [ timex_0_19_5 ];
+
+            meta = {
+              description = ''Elixir RSS/Atom parser built on erlang`s xmerl
+                            xml parser'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/umurgdk/elixir-feedme";
+            };
+          }
+      ) {};
+
+    feedme = feedme_0_0_1;
+
+    feedparser_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "feedparser";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "feedparser";
+              version = "0.0.3";
+              sha256 =
+                "ef19d82d5d0db4ca10e1a83c8eefe82678538cdeb143e707bf7ef738177c3eeb";
+            };
+
+            meta = {
+              description = ''Discover and parse RSS and Atom feeds'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/l3kn/Elixir-Feedparser";
+            };
+          }
+      ) {};
+
+    feedparser = feedparser_0_0_3;
+
+    fernet_ecto_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex, ecto_1_1_3 }:
+          buildMix {
+            name = "fernet_ecto";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "fernet_ecto";
+              version = "0.0.4";
+              sha256 =
+                "22a9ab7a7fd1347620ba5dd9e128eae1e97d6403b0ee90a289580c2cb386e1c0";
+            };
+            beamDeps  = [ ecto_1_1_3 ];
+
+            meta = {
+              description = ''Fernet-encrypted fields for Ecto'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/jkakar/fernet-ecto";
+            };
+          }
+      ) {};
+
+    fernet_ecto = fernet_ecto_0_0_4;
+
+    fernetex_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, timex_0_19_5, json_0_3_3 }:
+          buildMix {
+            name = "fernetex";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "fernetex";
+              version = "0.0.1";
+              sha256 =
+                "0e386a7d783329a2742398e987b0584ca448b22b27ccfc857eab1b0752178714";
+            };
+            beamDeps  = [ timex_0_19_5 json_0_3_3 ];
+
+            meta = {
+              description = ''Elixir implementation of Fernet library based on
+                            https://github.com/fernet/spec'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/kennyp/fernetex";
+            };
+          }
+      ) {};
+
+    fernetex = fernetex_0_0_1;
+
+    fifo_dt_0_1_66 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          riak_dt_2_1_1,
+          libsnarlmatch_0_1_7,
+          lager_2_1_1,
+          jsxd_0_1_10,
+          jsx_1_4_5,
+          fifo_utils_0_1_20
+        }:
+          buildRebar3 {
+            name = "fifo_dt";
+            version = "0.1.66";
+            src = fetchHex {
+              pkg = "fifo_dt";
+              version = "0.1.66";
+              sha256 =
+                "a72df25753a0dad32b22b02356f2979b8e3556f0333449f476d581332f02da6b";
+            };
+
+            beamDeps  = [
+                          riak_dt_2_1_1
+                          libsnarlmatch_0_1_7
+                          lager_2_1_1
+                          jsxd_0_1_10
+                          jsx_1_4_5
+                          fifo_utils_0_1_20
+                        ];
+
+            meta = {
+              description = ''FiFo datatype collection'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/project-fifo/fifo_dt";
+            };
+          }
+      ) {};
+
+    fifo_dt = fifo_dt_0_1_66;
+
+    fifo_lager_0_1_3 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          lager_logstash_backend_0_1_0,
+          lager_graylog_0_1_0,
+          lager_3_0_2
+        }:
+          buildRebar3 {
+            name = "fifo_lager";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "fifo_lager";
+              version = "0.1.3";
+              sha256 =
+                "89904ffcaaec1e92329d01d18805b26a71683b2ea646bbe8ed4f73de92ce267e";
+            };
+
+            beamDeps  = [
+                          lager_logstash_backend_0_1_0
+                          lager_graylog_0_1_0
+                          lager_3_0_2
+                        ];
+
+            meta = {
+              description = ''Lager config and dependencies'';
+
+            };
+          }
+      ) {};
+
+    fifo_lager = fifo_lager_0_1_3;
+
+    fifo_s3_0_1_16 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          poolboy_1_5_1,
+          lager_3_0_2,
+          erlcloud_0_13_0,
+          base16_1_0_0
+        }:
+          buildRebar3 {
+            name = "fifo_s3";
+            version = "0.1.16";
+            src = fetchHex {
+              pkg = "fifo_s3";
+              version = "0.1.16";
+              sha256 =
+                "14a3601a7586d37ae5fd8996db45d0f7a7ef82c0bc1adaefa36cd881997ed32f";
+            };
+
+            beamDeps  = [
+                          poolboy_1_5_1 lager_3_0_2 erlcloud_0_13_0 base16_1_0_0
+                        ];
+
+            meta = {
+              description = ''S3 storange client library for erlang'';
+
+            };
+          }
+      ) {};
+
+    fifo_s3 = fifo_s3_0_1_16;
+
+    fifo_spec_0_1_27 = callPackage
+      (
+        {  buildRebar3, fetchHex, fifo_dt_0_1_66 }:
+          buildRebar3 {
+            name = "fifo_spec";
+            version = "0.1.27";
+            src = fetchHex {
+              pkg = "fifo_spec";
+              version = "0.1.27";
+              sha256 =
+                "2ef9662a7423da74b7f4517e9470e44e03383c1116ee6da3944021ff3cd44ef6";
+            };
+
+            beamDeps  = [ fifo_dt_0_1_66 ];
+
+            meta = {
+              description = ''Specs for FiFo APIs'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/project-fifo/fifo_spec";
+            };
+          }
+      ) {};
+
+    fifo_spec = fifo_spec_0_1_27;
+
+    fifo_utils_0_1_20 = callPackage
+      (
+        {  buildRebar3, fetchHex, uuid_erl_1_5_1, lager_2_1_1 }:
+          buildRebar3 {
+            name = "fifo_utils";
+            version = "0.1.20";
+            src = fetchHex {
+              pkg = "fifo_utils";
+              version = "0.1.20";
+              sha256 =
+                "01ec5ae5e8a8c3d8e9dc658de1c00818ac807195b4a5c47f98aa2c9af4d54663";
+            };
+
+            beamDeps  = [ uuid_erl_1_5_1 lager_2_1_1 ];
+
+            meta = {
+              description = ''FiFo utility library'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/project-fifo/fifo_utils";
+            };
+          }
+      ) {};
+
+    fifo_utils_0_1_21 = callPackage
+      (
+        {  buildRebar3, fetchHex, uuid_erl_1_5_1, lager_2_1_1 }:
+          buildRebar3 {
+            name = "fifo_utils";
+            version = "0.1.21";
+            src = fetchHex {
+              pkg = "fifo_utils";
+              version = "0.1.21";
+              sha256 =
+                "8a9298fd7486f56b74b4ffc1d6a3ff3713ffde44b248371f7f673a9bd76add60";
+            };
+
+            beamDeps  = [ uuid_erl_1_5_1 lager_2_1_1 ];
+
+            meta = {
+              description = ''FiFo utility library'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/project-fifo/fifo_utils";
+            };
+          }
+      ) {};
+
+    fifo_utils = fifo_utils_0_1_21;
+
+    figaro_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "figaro";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "figaro";
+              version = "0.1.0";
+              sha256 =
+                "3342018ab0135211b85d00f34567ca3a2d6d66289840c9eb0096ec97fad8a201";
+            };
+
+            meta = {
+              description = ''Simple Elixir project configuration'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/trestrantham/ex_figaro";
+            };
+          }
+      ) {};
+
+    figaro = figaro_0_1_0;
+
+    figaro_elixir_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "figaro_elixir";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "figaro_elixir";
+              version = "1.0.0";
+              sha256 =
+                "98a7690c60fc32874e73b025b7deb5887d7cdff4556178af1849bde38a7ba104";
+            };
+
+            meta = {
+              description = ''Environmental variables manager and configuration
+                            management tool.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/KamilLelonek/figaro-elixir";
+            };
+          }
+      ) {};
+
+    figaro_elixir = figaro_elixir_1_0_0;
+
+    filepreviews_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_4_0, httpoison_0_7_5 }:
+          buildMix {
+            name = "filepreviews";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "filepreviews";
+              version = "1.0.1";
+              sha256 =
+                "bdb67cd960dd98a4a1d6d0d4944721bf98a506dbfb2b361ca473dbaf40cc9470";
+            };
+            beamDeps  = [ poison_1_4_0 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''FilePreviews.io API client library for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/GetBlimp/filepreviews-elixir";
+            };
+          }
+      ) {};
+
+    filepreviews = filepreviews_1_0_1;
+
+    filtrex_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, timex_0_19_5 }:
+          buildMix {
+            name = "filtrex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "filtrex";
+              version = "0.1.0";
+              sha256 =
+                "475187169e70534b3ba2db6f47656538deb2ff447744e4112cc1008414162e9c";
+            };
+            beamDeps  = [ timex_0_19_5 ];
+
+            meta = {
+              longDescription = ''A library for performing and validating
+                                complex filters from a client (e.g. smart
+                                filters)'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rcdilorenzo/filtrex";
+            };
+          }
+      ) {};
+
+    filtrex = filtrex_0_1_0;
+
+    finance_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, timex_1_0_1 }:
+          buildMix {
+            name = "finance";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "finance";
+              version = "0.0.1";
+              sha256 =
+                "fe08fc521e65605d54fd8b68fbdfdbd233b408e8330cf8038337214b553c2c17";
+            };
+            beamDeps  = [ timex_1_0_1 ];
+
+            meta = {
+              longDescription = ''A library to calculate Xirr through the
+                                bisection method using parallel processes.'';
+
+            };
+          }
+      ) {};
+
+    finance = finance_0_0_1;
+
+    finch_0_0_3 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          postgrex_0_6_0,
+          phoenix_0_4_1,
+          ecto_0_2_4,
+          cowboy_1_0_4
+        }:
+          buildMix {
+            name = "finch";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "finch";
+              version = "0.0.3";
+              sha256 =
+                "48168045693af14b28263a5c121794dfcfb6da9eb33cc7a7eca93899668a2032";
+            };
+            beamDeps  = [
+                          postgrex_0_6_0 phoenix_0_4_1 ecto_0_2_4 cowboy_1_0_4
+                        ];
+
+            meta = {
+              longDescription = '' Resource layer for Phoenix and Ecto projects
+                                for auto-generated RESTful CRUD APIs. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rozap/finch";
+            };
+          }
+      ) {};
+
+    finch = finch_0_0_3;
+
+    finicity_0_0_4 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          xml_builder_0_0_8,
+          httpotion_2_1_0,
+          floki_0_7_1
+        }:
+          buildMix {
+            name = "finicity";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "finicity";
+              version = "0.0.4";
+              sha256 =
+                "bed2444d52366a7e6f49bafff0d985c04540ef298922273df11efebe9c1e8387";
+            };
+            beamDeps  = [ xml_builder_0_0_8 httpotion_2_1_0 floki_0_7_1 ];
+
+            meta = {
+              description = ''Client library for Finicity.'';
+
+            };
+          }
+      ) {};
+
+    finicity = finicity_0_0_4;
+
+    fireworks_0_5_1 = callPackage
+      (
+        {  buildMix, fetchHex, poolboy_1_5_1, amqp_0_1_4 }:
+          buildMix {
+            name = "fireworks";
+            version = "0.5.1";
+            src = fetchHex {
+              pkg = "fireworks";
+              version = "0.5.1";
+              sha256 =
+                "33beceafc10537c975b571617dfc5c000a8232c112c1383f52b9e6a12437f9ca";
+            };
+            beamDeps  = [ poolboy_1_5_1 amqp_0_1_4 ];
+
+            meta = {
+              description = ''Simple elixir work queue consumption for
+                            RabbitMQ'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/mobileoverlord/fireworks";
+            };
+          }
+      ) {};
+
+    fireworks = fireworks_0_5_1;
+
+    firmata_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "firmata";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "firmata";
+              version = "0.0.1";
+              sha256 =
+                "c3f928839c32e366389b3f9d34cfc73505952f854dd13c52eff56b9e5853ea6c";
+            };
+
+            meta = {
+              longDescription = ''This package implements the Firmata protocol.
+                                Firmata is a MIDI-based protocol for
+                                communicating with microcontrollers.'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/kfatehi/firmata";
+            };
+          }
+      ) {};
+
+    firmata = firmata_0_0_1;
+
+    fitbit_0_0_1 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1, hackney_1_4_8
+        }:
+          buildMix {
+            name = "fitbit";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "fitbit";
+              version = "0.0.1";
+              sha256 =
+                "dc09d3b6d37ea67d21a52a704bd52357daa223e18afe4831515730452b3ada25";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 hackney_1_4_8 ];
+
+            meta = {
+              description = ''A Fitbit Library for Elixir'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/trestrantham/fitbit";
+            };
+          }
+      ) {};
+
+    fitbit = fitbit_0_0_1;
+
+    fitex_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "fitex";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "fitex";
+              version = "0.0.1";
+              sha256 =
+                "5918d784a419fa1367606b6bc01b202febc3762b5b624e5829db636415041fcb";
+            };
+
+            meta = {
+              description = ''FitEx is a Macro-Module which provides a bit of
+                            sugar for function definitions.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Puddah/FitEx";
+            };
+          }
+      ) {};
+
+    fitex = fitex_0_0_1;
+
+    fixby_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "fixby";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "fixby";
+              version = "0.0.1";
+              sha256 =
+                "e361bb9324c616e397fc78bda81a3629a39189f4675aefdeb54e85dfa74a629f";
+            };
+
+            meta = {
+              description = ''FIXBY comments that raise after a given version
+                            of Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/CoderDennis/fixby-elixir";
+            };
+          }
+      ) {};
+
+    fixby = fixby_0_0_1;
+
+    fixme_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "fixme";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "fixme";
+              version = "0.0.4";
+              sha256 =
+                "e5e36db0c083a96a459723d89c151fc1f33f9873122e6c4924e06d18d20f9e84";
+            };
+
+            meta = {
+              description = ''FIXME comments that raise after a certain point
+                            in time.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/henrik/fixme-elixir";
+            };
+          }
+      ) {};
+
+    fixme = fixme_0_0_4;
+
+    flasked_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "flasked";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "flasked";
+              version = "0.3.0";
+              sha256 =
+                "371368ec9586939343fad0196f6dc3492bb4e56309490271d29bf46beede9210";
+            };
+
+            meta = {
+              longDescription = ''Flasked injects application environment
+                                configuration at runtime based on given ENV
+                                variables and a mapping. This is pretty useful
+                                for applications following the 12factor app
+                                principle or which are deployed in
+                                containerization infrastructures like Docker.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/asaaki/flasked";
+            };
+          }
+      ) {};
+
+    flasked = flasked_0_3_0;
+
+    fleet_api_0_0_15 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_3_1, httpoison_0_7_1 }:
+          buildMix {
+            name = "fleet_api";
+            version = "0.0.15";
+            src = fetchHex {
+              pkg = "fleet_api";
+              version = "0.0.15";
+              sha256 =
+                "8aa8206a91129dab3b2a11ffd16b131ef1e37ceff633ed818616e96c8dca7957";
+            };
+            beamDeps  = [ poison_1_3_1 httpoison_0_7_1 ];
+
+            meta = {
+              longDescription = ''A simple wrapper for the Fleet API. Can be
+                                used with etcd tokens or via direct node
+                                URLs.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jordan0day/fleet-api.git";
+            };
+          }
+      ) {};
+
+    fleet_api = fleet_api_0_0_15;
+
+    flock_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "flock";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "flock";
+              version = "0.0.1";
+              sha256 =
+                "3a533d32a450cb0e5b78880c421080fb34fb95d4cf3c1ee053b4e97c6cadd4c8";
+            };
+
+            meta = {
+              description = ''Distributed Services '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/chrismccord/flock";
+            };
+          }
+      ) {};
+
+    flock = flock_0_0_1;
+
+    floki_0_0_5 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "floki";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "floki";
+              version = "0.0.5";
+              sha256 =
+                "05044b8dade147bc0390300eefe48c3118eb61d94a57bd73966549a24c76e795";
+            };
+
+            meta = {
+              description = ''Floki is a simple HTML parser that enables search
+                            for nodes using CSS selectors.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/philss/floki";
+            };
+          }
+      ) {};
+
+    floki_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, mochiweb_2_12_2 }:
+          buildMix {
+            name = "floki";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "floki";
+              version = "0.1.1";
+              sha256 =
+                "b608415520f6701acdbbffed86b62291b00ce695f7f3b067919594534c9858a9";
+            };
+            beamDeps  = [ mochiweb_2_12_2 ];
+
+            meta = {
+              description = ''Floki is a simple HTML parser that enables search
+                            for nodes using CSS selectors.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/philss/floki";
+            };
+          }
+      ) {};
+
+    floki_0_7_1 = callPackage
+      (
+        {  buildMix, fetchHex, mochiweb_2_12_2 }:
+          buildMix {
+            name = "floki";
+            version = "0.7.1";
+            src = fetchHex {
+              pkg = "floki";
+              version = "0.7.1";
+              sha256 =
+                "f4d9df7ffbfeed170dc81d9c6309e47fe3d51c6247b42a2341d8675d3ff653b1";
+            };
+            beamDeps  = [ mochiweb_2_12_2 ];
+
+            meta = {
+              description = ''Floki is a simple HTML parser that enables search
+                            for nodes using CSS selectors.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/philss/floki";
+            };
+          }
+      ) {};
+
+    floki = floki_0_7_1;
+
+    floorplan_0_1_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          xml_builder_0_0_8,
+          tzdata_0_1_8,
+          timex_1_0_1,
+          postgrex_0_11_1,
+          poison_1_5_2,
+          httpotion_2_1_0
+        }:
+          buildMix {
+            name = "floorplan";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "floorplan";
+              version = "0.1.1";
+              sha256 =
+                "56679e586efa7ae179a940920ef2b4d56e40b9b1d01cb4ce8528ef6870a77b00";
+            };
+            beamDeps  = [
+                          xml_builder_0_0_8
+                          tzdata_0_1_8
+                          timex_1_0_1
+                          postgrex_0_11_1
+                          poison_1_5_2
+                          httpotion_2_1_0
+                        ];
+
+            meta = {
+              description = ''A module for generating sitemaps from a variety
+                            of data sources'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/househappy/floorplan";
+            };
+          }
+      ) {};
+
+    floorplan = floorplan_0_1_1;
+
+    flower_power_0_2_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, timex_1_0_1, poison_1_5_2, httpoison_0_7_5
+        }:
+          buildMix {
+            name = "flower_power";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "flower_power";
+              version = "0.2.0";
+              sha256 =
+                "1ade69e578fd65dd2d10b8097846411f1a5d0a42ad55e9faa532c65bbaf59bbb";
+            };
+            beamDeps  = [ timex_1_0_1 poison_1_5_2 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''Api client for flower power cloud api'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Korbin73/FlowerPower";
+            };
+          }
+      ) {};
+
+    flower_power = flower_power_0_2_0;
+
+    fluent_client_0_1_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, socket_0_2_8, poison_1_3_1, msgpax_0_7_0
+        }:
+          buildMix {
+            name = "fluent_client";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "fluent_client";
+              version = "0.1.0";
+              sha256 =
+                "df1d05da9475938422a734cd311564eef44bfebea3c37b06ab167368875c2d15";
+            };
+            beamDeps  = [ socket_0_2_8 poison_1_3_1 msgpax_0_7_0 ];
+
+            meta = {
+              description = ''fluentd client library'';
+              license = stdenv.lib.licenses.asl20;
+              homepage =
+                "https://github.com/trustatom-oss/elixir-fluent-client";
+            };
+          }
+      ) {};
+
+    fluent_client = fluent_client_0_1_0;
+
+    fn_1_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "fn";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "fn";
+              version = "1.0.0";
+              sha256 =
+                "1433b353c8739bb28ac0d6826c9f6a05033f158e8c8195faf01a863668b3bbc7";
+            };
+
+            meta = {
+              description = ''More functional Erlang'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/artemeff/fn";
+            };
+          }
+      ) {};
+
+    fn = fn_1_0_0;
+
+    fnv_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex, hexate_0_5_1 }:
+          buildMix {
+            name = "fnv";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "fnv";
+              version = "0.2.1";
+              sha256 =
+                "4f64367d63f0f40fd6bd1618164df41173c76517b10ce96d8358ccc01e1cb2a4";
+            };
+            beamDeps  = [ hexate_0_5_1 ];
+
+            meta = {
+              description = ''Pure Elixir implementation of Fowler–Noll–Vo
+                            hash functions (FNV-1/FNV-1a)'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/asaaki/fnv.ex";
+            };
+          }
+      ) {};
+
+    fnv = fnv_0_2_1;
+
+    folsom_0_8_3 = callPackage
+      (
+        {  buildRebar3, fetchHex, bear_0_8_3 }:
+          buildRebar3 {
+            name = "folsom";
+            version = "0.8.3";
+            src = fetchHex {
+              pkg = "folsom";
+              version = "0.8.3";
+              sha256 =
+                "afaa1ea4cd2a10a32242ac5d76fa7b17e98d202883859136b791d9a383b26820";
+            };
+
+            beamDeps  = [ bear_0_8_3 ];
+
+            meta = {
+              description = ''Erlang based metrics system'';
+
+            };
+          }
+      ) {};
+
+    folsom = folsom_0_8_3;
+
+    folsom_ddb_0_1_20 = callPackage
+      (
+        {  buildRebar3, fetchHex, ddb_client_0_1_17 }:
+          buildRebar3 {
+            name = "folsom_ddb";
+            version = "0.1.20";
+            src = fetchHex {
+              pkg = "folsom_ddb";
+              version = "0.1.20";
+              sha256 =
+                "9103ab70b048bf35618daf85b314d815e66c23e7100a71b07dcbec18e75d02d1";
+            };
+
+            beamDeps  = [ ddb_client_0_1_17 ];
+
+            meta = {
+              description = ''DalmatinerDB backend to store folsom metrics'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dalmatinerdb/folsom_ddb";
+            };
+          }
+      ) {};
+
+    folsom_ddb = folsom_ddb_0_1_20;
+
+    folsomite_1_2_8 = callPackage
+      (
+        {  buildRebar3, fetchHex, folsom_0_8_3 }:
+          buildRebar3 {
+            name = "folsomite";
+            version = "1.2.8";
+            src = fetchHex {
+              pkg = "folsomite";
+              version = "1.2.8";
+              sha256 =
+                "9ce64603cdffb8ad55e950142146b3fe05533020906a81aa9c2f524635d813dc";
+            };
+
+            beamDeps  = [ folsom_0_8_3 ];
+
+            meta = {
+              description = ''Blow up your Graphite server with Folsom
+                            metrics'';
+
+            };
+          }
+      ) {};
+
+    folsomite = folsomite_1_2_8;
+
+    font_awesome_phoenix_0_3_2 = callPackage
+      (
+        {  buildMix, fetchHex, phoenix_html_2_5_0 }:
+          buildMix {
+            name = "font_awesome_phoenix";
+            version = "0.3.2";
+            src = fetchHex {
+              pkg = "font_awesome_phoenix";
+              version = "0.3.2";
+              sha256 =
+                "826dd9e0400351cb539ccced605455d8da25490fd37a75085eb68fa133e65f34";
+            };
+            beamDeps  = [ phoenix_html_2_5_0 ];
+
+            meta = {
+              description = ''HTML helper functions to build Font Awesome icon
+                            tags.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/code-lever/font-awesome-phoenix";
+            };
+          }
+      ) {};
+
+    font_awesome_phoenix = font_awesome_phoenix_0_3_2;
+
+    forcex_0_1_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, timex_1_0_0_rc4, httpoison_0_8_1, exjsx_3_2_0
+        }:
+          buildMix {
+            name = "forcex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "forcex";
+              version = "0.1.0";
+              sha256 =
+                "3f7c4ddffaa0bfb0408b0148e14e344d7c42349923894ab44b56513c05c14c08";
+            };
+            beamDeps  = [ timex_1_0_0_rc4 httpoison_0_8_1 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''Elixir library for the Force.com / SalesForce /
+                            SFDC REST API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jeffweiss/forcex";
+            };
+          }
+      ) {};
+
+    forcex = forcex_0_1_0;
+
+    forecast_io_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex, json_0_3_3, httpotion_1_0_0 }:
+          buildMix {
+            name = "forecast_io";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "forecast_io";
+              version = "0.2.1";
+              sha256 =
+                "e109212dcd55c7d94bf9d85c1d6ee6687d35eb065335df13fc105fc242506c09";
+            };
+            beamDeps  = [ json_0_3_3 httpotion_1_0_0 ];
+
+            meta = {
+              description = ''Simple wrapper for Forecast.IO API '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/r-icarus/forecast_io";
+            };
+          }
+      ) {};
+
+    forecast_io = forecast_io_0_2_1;
+
+    form_data_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "form_data";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "form_data";
+              version = "0.1.1";
+              sha256 =
+                "0fdc822ba56e8bb9cd945c79105572a50144f16d096a95ca4ac9fe2d754862dc";
+            };
+
+            meta = {
+              description = ''Build a multipart/form-data form struct in
+                            Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jinze/form_data";
+            };
+          }
+      ) {};
+
+    form_data = form_data_0_1_1;
+
+    forms_0_0_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "forms";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "forms";
+              version = "0.0.1";
+              sha256 =
+                "530f63ed8ed5a171f744fc75bd69cb2e36496899d19dbef48101b4636b795868";
+            };
+
+            meta = {
+              description = ''Toolbox that simplifies working with Erlang`s
+                            abstract format'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/efcasado/forms";
+            };
+          }
+      ) {};
+
+    forms = forms_0_0_1;
+
+    fox_0_1_12 = callPackage
+      (
+        {  buildMix, fetchHex, timex_1_0_1, ecto_2_0_0_beta_0 }:
+          buildMix {
+            name = "fox";
+            version = "0.1.12";
+            src = fetchHex {
+              pkg = "fox";
+              version = "0.1.12";
+              sha256 =
+                "3b4fe9b49422d99e0c888ca839e828b70b4334637f443a14afc941be5e6a847e";
+            };
+            beamDeps  = [ timex_1_0_1 ecto_2_0_0_beta_0 ];
+
+            meta = {
+              longDescription = ''Collection of support utility functions and
+                                extensions for day-to-day web development with
+                                Elixir. Includes utility extension to strings,
+                                uri, dicts, integers, functions, parallel,
+                                records, random, and time'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/foxnewsnetwork/fox";
+            };
+          }
+      ) {};
+
+    fox = fox_0_1_12;
+
+    fqc_0_1_5 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "fqc";
+            version = "0.1.5";
+            src = fetchHex {
+              pkg = "fqc";
+              version = "0.1.5";
+              sha256 =
+                "47536dec351a12e1cbe0bc3b52bfff3b0690b0aec660472b5cf49f812eb9aa4f";
+            };
+
+            meta = {
+              description = ''FiFo EQC helper'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/project-fifo/fqc";
+            };
+          }
+      ) {};
+
+    fqc_0_1_7 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "fqc";
+            version = "0.1.7";
+            src = fetchHex {
+              pkg = "fqc";
+              version = "0.1.7";
+              sha256 =
+                "b6873982bad60a34553b00435848521f5178b5508eeded8dfa0d8b2e00846e8e";
+            };
+
+            meta = {
+              description = ''FiFo EQC helper'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/project-fifo/fqc";
+            };
+          }
+      ) {};
+
+    fqc = fqc_0_1_7;
+
+    frank_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, amqp_0_1_4 }:
+          buildMix {
+            name = "frank";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "frank";
+              version = "0.0.3";
+              sha256 =
+                "f5f19c57aa763b483af80329f54e2de55b1fcb1dde5c304eed97fbde9ca2ce7d";
+            };
+            beamDeps  = [ amqp_0_1_4 ];
+
+            meta = {
+              description = ''Simple Elixir client for RabbitMQ built on top of
+                            AMQP.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/triptec/frank";
+            };
+          }
+      ) {};
+
+    frank = frank_0_0_3;
+
+    friendly_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, floki_0_7_1 }:
+          buildMix {
+            name = "friendly";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "friendly";
+              version = "1.0.1";
+              sha256 =
+                "5bacdeba9a6752613c037f7ffacd4f7185cf9b348b3b41c73497e539bbb17602";
+            };
+            beamDeps  = [ floki_0_7_1 ];
+
+            meta = {
+              longDescription = ''HTML and XML parser with the most friendly
+                                API in Elixir land. CSS selector in, list of
+                                elements out.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/qertoip/friendly/";
+            };
+          }
+      ) {};
+
+    friendly = friendly_1_0_1;
+
+    fs_0_9_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "fs";
+            version = "0.9.2";
+            src = fetchHex {
+              pkg = "fs";
+              version = "0.9.2";
+              sha256 =
+                "9a00246e8af58cdf465ae7c48fd6fd7ba2e43300413dfcc25447ecd3bf76f0c1";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''FS VXZ Listener'';
+
+            };
+          }
+      ) {};
+
+    fs = fs_0_9_2;
+
+    fsm_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "fsm";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "fsm";
+              version = "0.2.0";
+              sha256 =
+                "dbc7b316d37f258db4f1a897109da14c2c76aa706fe85859532eff2ea30986bf";
+            };
+
+            meta = {
+              description = ''Finite state machine as a functional data
+                            structure.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sasa1977/fsm";
+            };
+          }
+      ) {};
+
+    fsm = fsm_0_2_0;
+
+    fulcrum_0_0_6 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "fulcrum";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "fulcrum";
+              version = "0.0.6";
+              sha256 =
+                "9cddd3906bad693cad791841d19b2be089e064a5f2dd35d340f46e6cd15d7930";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              longDescription = ''Fulcrum library for Elixir. The aim is to
+                                present the Fulcrum API as a replacement for an
+                                Ecto Repo. So, instead of Repo.all(Form), you
+                                can write Fulcrum.all(Form). In this way, you
+                                only have to make minor changes to your
+                                controllers, to work with Fulcrum.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pinx/fulcrum";
+            };
+          }
+      ) {};
+
+    fulcrum = fulcrum_0_0_6;
+
+    fumanchu_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "fumanchu";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "fumanchu";
+              version = "0.0.1";
+              sha256 =
+                "3ae3f825b598d2af9ace3f9ef25ff23b7724507cddb2dddb2176e4a49afabc89";
+            };
+
+            meta = {
+              description = ''An (almost) spec-compliant Mustache parser
+                            written in Elixir'';
+
+            };
+          }
+      ) {};
+
+    fumanchu = fumanchu_0_0_1;
+
+    funnel_0_4_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poolboy_1_5_1,
+          httpoison_0_8_1,
+          uuid_0_1_5,
+          poison_1_5_2
+        }:
+          buildMix {
+            name = "funnel";
+            version = "0.4.1";
+            src = fetchHex {
+              pkg = "funnel";
+              version = "0.4.1";
+              sha256 =
+                "84b937146c9464afc2a92e53aa0109de60caef599f82613fdcd4dc3e864025d7";
+            };
+            beamDeps  = [
+                          poolboy_1_5_1 httpoison_0_8_1 uuid_0_1_5 poison_1_5_2
+                        ];
+
+            meta = {
+              description = ''Streaming API built upon ElasticSearch`s
+                            percolation. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/af83/funnel";
+            };
+          }
+      ) {};
+
+    funnel = funnel_0_4_1;
+
+    fuse_2_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "fuse";
+            version = "2.0.0";
+            src = fetchHex {
+              pkg = "fuse";
+              version = "2.0.0";
+              sha256 =
+                "e2c55c0629ce418974165a65b342e54527333303d7e9c1f0493679144c9698cb";
+            };
+
+            meta = {
+              description = ''A Circuit breaker implementation for Erlang'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jlouis/fuse";
+            };
+          }
+      ) {};
+
+    fuse = fuse_2_0_0;
+
+    fuzzyurl_0_8_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "fuzzyurl";
+            version = "0.8.1";
+            src = fetchHex {
+              pkg = "fuzzyurl";
+              version = "0.8.1";
+              sha256 =
+                "8229d3d14bcbaf792a550ee68347662efd93022e7fc0221f7681c104b3356900";
+            };
+
+            meta = {
+              longDescription = ''Fuzzyurl is a library for non-strict parsing,
+                                construction, and fuzzy-matching of URLs.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/gamache/fuzzyurl.ex";
+            };
+          }
+      ) {};
+
+    fuzzyurl = fuzzyurl_0_8_1;
+
+    gateway_0_0_6 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_2_1_0, httpoison_0_8_1, fox_0_1_12
+        }:
+          buildMix {
+            name = "gateway";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "gateway";
+              version = "0.0.6";
+              sha256 =
+                "4d0de05b0168ee0cc41c9c38491a4b4641d446f38170ca170d0d7440b0c8f619";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_1 fox_0_1_12 ];
+
+            meta = {
+              longDescription = ''A generic set of macros and conventions to
+                                build clients to communicate with JSON REST
+                                APIs'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/foxnewsnetwork/gateway";
+            };
+          }
+      ) {};
+
+    gateway = gateway_0_0_6;
+
+    gb2260_0_4_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0 }:
+          buildMix {
+            name = "gb2260";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "gb2260";
+              version = "0.4.0";
+              sha256 =
+                "62e89f7f4fcee973e8092e41676a903831f0cf88e31d6bedcf88382dfe40f333";
+            };
+            beamDeps  = [ poison_2_1_0 ];
+
+            meta = {
+              description = ''The Elixir implementation for looking up the
+                            Chinese administrative divisions.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/LcpMarvel/gb2260";
+            };
+          }
+      ) {};
+
+    gb2260 = gb2260_0_4_0;
+
+    gcm_1_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "gcm";
+            version = "1.2.0";
+            src = fetchHex {
+              pkg = "gcm";
+              version = "1.2.0";
+              sha256 =
+                "281d5c2dc94a24382292f6fbfe7348316e8afa0a40285978f03e7dcae068170a";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''GCM library to send pushes through GCM'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/carnivalmobile/gcm";
+            };
+          }
+      ) {};
+
+    gcm = gcm_1_2_0;
+
+    gcmex_0_0_1 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5, earmark_0_2_1
+        }:
+          buildMix {
+            name = "gcmex";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "gcmex";
+              version = "0.0.1";
+              sha256 =
+                "92f3bbafd7ad0718490d1bdc10d4a2aa5ee7167c144bfe6584cf4260ab6feeab";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 earmark_0_2_1 ];
+
+            meta = {
+              description = ''Google Cloud Messaging client library for
+                            elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dukex/gcmex";
+            };
+          }
+      ) {};
+
+    gcmex = gcmex_0_0_1;
+
+    gealts_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "gealts";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "gealts";
+              version = "0.0.1";
+              sha256 =
+                "c23b96986b19801c3428ff961e26e5b7327cd38141c2161951fdba233b71ac2b";
+            };
+
+            meta = {
+              description = ''A crude genetic programming library.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/0010-IO/gealts";
+            };
+          }
+      ) {};
+
+    gealts = gealts_0_0_1;
+
+    gelf_logger_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0 }:
+          buildMix {
+            name = "gelf_logger";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "gelf_logger";
+              version = "0.2.0";
+              sha256 =
+                "3729e42e3c8d492ec4b18cd7a70783cc2d15811b7096613a60da04743d1f7838";
+            };
+            beamDeps  = [ poison_2_1_0 ];
+
+            meta = {
+              longDescription = ''A Logger backend that will generate Graylog
+                                Extended Log Format messages and send them to a
+                                compatible server.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jschniper/gelf_logger";
+            };
+          }
+      ) {};
+
+    gelf_logger = gelf_logger_0_2_0;
+
+    gelfex_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, connection_1_0_2 }:
+          buildMix {
+            name = "gelfex";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "gelfex";
+              version = "0.0.1";
+              sha256 =
+                "35ca2deb8221379fc8eb2d4e33888ce590defe91dbbaaa10ef352d6654723279";
+            };
+            beamDeps  = [ poison_1_5_2 connection_1_0_2 ];
+
+            meta = {
+              description = ''Elixir client for logging GELF messages to
+                            Graylog.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/donpinkster/gelfex";
+            };
+          }
+      ) {};
+
+    gelfex = gelfex_0_0_1;
+
+    gen_listener_tcp_0_3_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "gen_listener_tcp";
+            version = "0.3.2";
+            src = fetchHex {
+              pkg = "gen_listener_tcp";
+              version = "0.3.2";
+              sha256 =
+                "b3c3fbc525ba2b32d947b06811d38470d5b0abe2ca81b623192a71539ed22336";
+            };
+
+            meta = {
+              description = ''Generic TCP Server'';
+
+              homepage = "https://github.com/travelping/gen_listener_tcp";
+            };
+          }
+      ) {};
+
+    gen_listener_tcp = gen_listener_tcp_0_3_2;
+
+    gen_smtp_0_9_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "gen_smtp";
+            version = "0.9.0";
+            src = fetchHex {
+              pkg = "gen_smtp";
+              version = "0.9.0";
+              sha256 =
+                "5a05f23a7cbe0c6242d290b445c6bbc0c287e3d0e09d3fcdc6bcd2c8973b6688";
+            };
+
+            meta = {
+              longDescription = ''A generic Erlang SMTP server framework that
+                                can be extended via callback modules in the OTP
+                                style. '';
+
+              homepage = "https://github.com/Vagabond/gen_smtp";
+            };
+          }
+      ) {};
+
+    gen_smtp = gen_smtp_0_9_0;
+
+    gendex_0_5_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "gendex";
+            version = "0.5.1";
+            src = fetchHex {
+              pkg = "gendex";
+              version = "0.5.1";
+              sha256 =
+                "b3eedba31b1a76ab33e6b57689e4312625fafb2667ac7b485df22c05b4c9439f";
+            };
+
+            meta = {
+              description = ''Gendex tells you the most likely gender of a
+                            person based on first name.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dre1080/gendex";
+            };
+          }
+      ) {};
+
+    gendex = gendex_0_5_1;
+
+    geo_1_0_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          postgrex_0_11_1,
+          poison_1_0_3,
+          ecto_2_0_0_beta_0
+        }:
+          buildMix {
+            name = "geo";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "geo";
+              version = "1.0.1";
+              sha256 =
+                "c0ab2df75521a2f50ff339294ff914b3a71e4f3753c5a82851457e0d40bb2e9c";
+            };
+            beamDeps  = [ postgrex_0_11_1 poison_1_0_3 ecto_2_0_0_beta_0 ];
+
+            meta = {
+              description = ''PostGIS extension for Postgrex. Also encodes and
+                            decodes WKB, WKT, and GeoJSON.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bryanjos/geo";
+            };
+          }
+      ) {};
+
+    geo = geo_1_0_1;
+
+    geocalc_0_4_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "geocalc";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "geocalc";
+              version = "0.4.0";
+              sha256 =
+                "353bcb1efc5b64fc3f8ca33338e51b47ae5f39b272da79be7f1ff7a6daa8dafb";
+            };
+
+            meta = {
+              description = ''Calculate distance, bearing and more between
+                            latitude/longitude points.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/yltsrc/geocalc";
+            };
+          }
+      ) {};
+
+    geocalc = geocalc_0_4_0;
+
+    geocoder_0_4_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          towel_0_2_1,
+          poolboy_1_5_1,
+          poison_1_5_2,
+          httpoison_0_8_1
+        }:
+          buildMix {
+            name = "geocoder";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "geocoder";
+              version = "0.4.0";
+              sha256 =
+                "67c45859114f5b82949cb98b75cfc862d739a5212164e4147552c6b3701cc975";
+            };
+            beamDeps  = [
+                          towel_0_2_1 poolboy_1_5_1 poison_1_5_2 httpoison_0_8_1
+                        ];
+
+            meta = {
+              description = ''A simple, efficient geocoder/reverse geocoder
+                            with a built-in cache.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/knrz/geocoder";
+            };
+          }
+      ) {};
+
+    geocoder = geocoder_0_4_0;
+
+    geohash_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "geohash";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "geohash";
+              version = "0.1.1";
+              sha256 =
+                "ffca8ce73cce9c52aae2000c5f417009b87f23d6e2df69cd6985bc5cc05aa998";
+            };
+
+            meta = {
+              description = ''Geohash encode/decode implementation for
+                            Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/polmuz/elixir-geohash";
+            };
+          }
+      ) {};
+
+    geohash = geohash_0_1_1;
+
+    geolix_0_9_0 = callPackage
+      (
+        {  buildMix, fetchHex, poolboy_1_5_1 }:
+          buildMix {
+            name = "geolix";
+            version = "0.9.0";
+            src = fetchHex {
+              pkg = "geolix";
+              version = "0.9.0";
+              sha256 =
+                "05bf3057a8997aaf70abc2e8f3ef04679c12b061829af263b3bfb44ad3e8e6a0";
+            };
+            beamDeps  = [ poolboy_1_5_1 ];
+
+            meta = {
+              description = ''MaxMind GeoIP2 database reader/decoder'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/mneudert/geolix";
+            };
+          }
+      ) {};
+
+    geolix = geolix_0_9_0;
+
+    getopt_0_8_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "getopt";
+            version = "0.8.2";
+            src = fetchHex {
+              pkg = "getopt";
+              version = "0.8.2";
+              sha256 =
+                "736e6db3679fbbad46373efb96b69509f8e420281635e9d92989af9f0a0483f7";
+            };
+
+            meta = {
+              description = ''Command-line options parser for Erlang'';
+
+              homepage = "https://github.com/jcomellas/getopt";
+            };
+          }
+      ) {};
+
+    getopt = getopt_0_8_2;
+
+    gettext_0_10_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "gettext";
+            version = "0.10.0";
+            src = fetchHex {
+              pkg = "gettext";
+              version = "0.10.0";
+              sha256 =
+                "c37747dced24fe00cb4245cb348a36556fa82851c10748cfe4c6a0253aea374e";
+            };
+
+            meta = {
+              description = ''Internationalization and localization through
+                            gettext'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/elixir-lang/gettext";
+            };
+          }
+      ) {};
+
+    gettext = gettext_0_10_0;
+
+    gh_webhook_plug_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1 }:
+          buildMix {
+            name = "gh_webhook_plug";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "gh_webhook_plug";
+              version = "0.0.2";
+              sha256 =
+                "f89c7b883923aea3a3c488e3344390e0771735df72dad7fec270ce49aba88854";
+            };
+            beamDeps  = [ plug_1_1_1 ];
+
+            meta = {
+              longDescription = ''This Plug makes it easy to listen and respond
+                                to Github webhook requests in your Elixir
+                                apps.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/emilsoman/gh_webhook_plug";
+            };
+          }
+      ) {};
+
+    gh_webhook_plug = gh_webhook_plug_0_0_2;
+
+    gibran_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "gibran";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "gibran";
+              version = "0.0.1";
+              sha256 =
+                "20e221e7743279bb37560c94bf93dea576d9a24d301cd75f3cfa5f6b0ec6dd20";
+            };
+
+            meta = {
+              description = ''An Elixir natural language processor.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/abitdodgy/gibran";
+            };
+          }
+      ) {};
+
+    gibran = gibran_0_0_1;
+
+    gil_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_7_5, floki_0_7_1 }:
+          buildMix {
+            name = "gil";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "gil";
+              version = "0.0.3";
+              sha256 =
+                "5235fdfd30513bd5d75a93272fc952f3ae1c0746e400591c244383d8f0fe9403";
+            };
+            beamDeps  = [ httpoison_0_7_5 floki_0_7_1 ];
+
+            meta = {
+              description = ''"Mix custome task for check exchange rate"'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/modalsoul/gil";
+            };
+          }
+      ) {};
+
+    gil = gil_0_0_3;
+
+    gimei_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "gimei";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "gimei";
+              version = "0.0.2";
+              sha256 =
+                "858aab561bc200358ee7098c80ea91d8c7e38b0058c55b1e4df28f5e5a27db7c";
+            };
+
+            meta = {
+              description = ''Gimei is a pure Elixir library for genrating
+                            Japanese fake data.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/KazuCocoa/elixir-gimei";
+            };
+          }
+      ) {};
+
+    gimei = gimei_0_0_2;
+
+    gimei_ex_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "gimei_ex";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "gimei_ex";
+              version = "1.0.0";
+              sha256 =
+                "21dd295d7beae218cc947d649d62d990aa2931d844c15e367528d68926a21987";
+            };
+
+            meta = {
+              description = ''Elixir port of gimei library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ma2gedev/gimei_ex";
+            };
+          }
+      ) {};
+
+    gimei_ex = gimei_ex_1_0_0;
+
+    git_cli_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "git_cli";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "git_cli";
+              version = "0.1.0";
+              sha256 =
+                "08cc7b12b7c29cee656d81008e9627b027555cbdf78fa609b599d64bbef71214";
+            };
+
+            meta = {
+              description = ''A simple interface to Git CLI'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tuvistavie/elixir-git-cli";
+            };
+          }
+      ) {};
+
+    git_cli = git_cli_0_1_0;
+
+    gitex_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "gitex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "gitex";
+              version = "0.1.0";
+              sha256 =
+                "ac3bfa723cf2f734837fc7d89a330fa80156f96eaa2e6326d2ab60880a804de7";
+            };
+
+            meta = {
+              longDescription = ''Elixir implementation of the Git object
+                                storage, but with the goal to implement the same
+                                semantic with other storage and topics'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/awetzel/gitex";
+            };
+          }
+      ) {};
+
+    gitex_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "gitex";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "gitex";
+              version = "0.2.0";
+              sha256 =
+                "68074becf5e9a01d00096c306a05b023d0107bafca178ff0f043f893b7b95450";
+            };
+
+            meta = {
+              longDescription = ''Elixir implementation of the Git object
+                                storage, but with the goal to implement the same
+                                semantic with other storage and topics'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/awetzel/gitex";
+            };
+          }
+      ) {};
+
+    gitex = gitex_0_2_0;
+
+    github_oauth_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "github_oauth";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "github_oauth";
+              version = "0.1.1";
+              sha256 =
+                "4e68983af9ed8146a2505ad759cb151c3202471285f07df6132a4acd47aa91f2";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''simple github oauth library'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/lidashuang/github_oauth";
+            };
+          }
+      ) {};
+
+    github_oauth = github_oauth_0_1_1;
+
+    glitchylicious_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "glitchylicious";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "glitchylicious";
+              version = "0.0.1";
+              sha256 =
+                "2d7c55bd138722ff810006d4b36873d80ad0473e074ccc377e381c5a88f0a9db";
+            };
+
+            meta = {
+              description = ''Glitching and image corruption library.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/0010-IO/glitchylicious";
+            };
+          }
+      ) {};
+
+    glitchylicious = glitchylicious_0_0_1;
+
+    global_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "global";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "global";
+              version = "1.0.0";
+              sha256 =
+                "00b0637bc2d86154af2885807296d4b6616e6b50a2d52c8ce187ddfe317890ee";
+            };
+
+            meta = {
+              description = ''A wrapper for Erlang`s :global module with
+                            documentation.'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/mgwidmann/global";
+            };
+          }
+      ) {};
+
+    global = global_1_0_0;
+
+    gmail_0_0_17 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          timex_1_0_0_rc4,
+          poison_1_5_2,
+          httpoison_0_8_1
+        }:
+          buildMix {
+            name = "gmail";
+            version = "0.0.17";
+            src = fetchHex {
+              pkg = "gmail";
+              version = "0.0.17";
+              sha256 =
+                "3c8fa022730d7e8016c777e48977077d6ebc02c4382d13d94b60f452ed8e650d";
+            };
+            beamDeps  = [ timex_1_0_0_rc4 poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''A simple Gmail REST API client for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/craigp/elixir-gmail";
+            };
+          }
+      ) {};
+
+    gmail = gmail_0_0_17;
+
+    gold_0_12_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1, decimal_1_1_1
+        }:
+          buildMix {
+            name = "gold";
+            version = "0.12.0";
+            src = fetchHex {
+              pkg = "gold";
+              version = "0.12.0";
+              sha256 =
+                "fba43501f6c25116c29358c4b5494de5e078cc516572045ac73a7944b918105b";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 decimal_1_1_1 ];
+
+            meta = {
+              description = ''An Elixir library to interface with the Bitcoin
+                            core JSON-RPC API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/solatis/gold";
+            };
+          }
+      ) {};
+
+    gold = gold_0_12_0;
+
+    goldrush_0_1_7 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "goldrush";
+            version = "0.1.7";
+            src = fetchHex {
+              pkg = "goldrush";
+              version = "0.1.7";
+              sha256 =
+                "a94a74cd363ce5f4970ed8242c551ec62b71939db1bbfd2e030142cab25a4ffe";
+            };
+
+            meta = {
+              description = ''Small, Fast event processing and monitoring for
+                            Erlang/OTP applications. '';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/DeadZen/goldrush";
+            };
+          }
+      ) {};
+
+    goldrush = goldrush_0_1_7;
+
+    good_enough_geoid_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, csv_1_2_4 }:
+          buildMix {
+            name = "good_enough_geoid";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "good_enough_geoid";
+              version = "0.0.2";
+              sha256 =
+                "7b2a556206f71e743d77c26a55b60b3282bd799b8254510f62afe2a4ec330746";
+            };
+            beamDeps  = [ csv_1_2_4 ];
+
+            meta = {
+              description = ''Get EGM Geoid heights that are good enough for
+                            some purposes (maybe yours).'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/code-lever/good-enough-geoid-elixir";
+            };
+          }
+      ) {};
+
+    good_enough_geoid = good_enough_geoid_0_0_2;
+
+    good_times_1_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "good_times";
+            version = "1.1.1";
+            src = fetchHex {
+              pkg = "good_times";
+              version = "1.1.1";
+              sha256 =
+                "1ecb4524b506a5dde5fa9e2312d6f98249b4b45e49a74cf799a8577b52157b90";
+            };
+
+            meta = {
+              description = ''Expressive and easy to use datetime functions.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/DevL/good_times";
+            };
+          }
+      ) {};
+
+    good_times = good_times_1_1_1;
+
+    google_auth_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          plug_1_1_1,
+          module_mocker_0_2_0,
+          cowboy_1_0_4,
+          access_token_extractor_0_1_1
+        }:
+          buildMix {
+            name = "google_auth";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "google_auth";
+              version = "0.0.2";
+              sha256 =
+                "029f2399456a7b7474635cab36544d35e200ddd7a470a905191de0fc3612adb5";
+            };
+            beamDeps  = [
+                          plug_1_1_1
+                          module_mocker_0_2_0
+                          cowboy_1_0_4
+                          access_token_extractor_0_1_1
+                        ];
+
+            meta = {
+              longDescription = ''Simple Plug to provide google based
+                                authentication. Just pass access_token received
+                                from client side google auth flow and this plug
+                                will get name, emai and picture of user from
+                                google and add it to private inside Plug.Conn'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rohanpujaris/google_auth";
+            };
+          }
+      ) {};
+
+    google_auth = google_auth_0_0_2;
+
+    google_sheets_2_0_3 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          sweet_xml_0_6_1,
+          httpoison_0_8_1,
+          hackney_1_4_8
+        }:
+          buildMix {
+            name = "google_sheets";
+            version = "2.0.3";
+            src = fetchHex {
+              pkg = "google_sheets";
+              version = "2.0.3";
+              sha256 =
+                "10b5708d3fb7e41a4e8e026e0cdd2c282fb4804f7f3b53e2a9dd5ddce01749fe";
+            };
+            beamDeps  = [ sweet_xml_0_6_1 httpoison_0_8_1 hackney_1_4_8 ];
+
+            meta = {
+              description = ''OTP application for fetching and polling Google
+                            spreadsheet data in CSV format.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/GrandCru/GoogleSheets";
+            };
+          }
+      ) {};
+
+    google_sheets = google_sheets_2_0_3;
+
+    goth_0_0_3 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poison_1_5_2,
+          json_web_token_0_2_4,
+          httpoison_0_8_1
+        }:
+          buildMix {
+            name = "goth";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "goth";
+              version = "0.0.3";
+              sha256 =
+                "0bbf59ae842dc4518cf42123b0fb0d0255bcb72ea37c8ec13bab2efe2339ccc3";
+            };
+            beamDeps  = [ poison_1_5_2 json_web_token_0_2_4 httpoison_0_8_1
+                      ];
+
+            meta = {
+              longDescription = ''A simple library to generate and retrieve
+                                Oauth2 tokens for use with Google Cloud Service
+                                accounts.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/peburrows/goth";
+            };
+          }
+      ) {};
+
+    goth = goth_0_0_3;
+
+    gpb_3_18_10 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "gpb";
+            version = "3.18.10";
+            src = fetchHex {
+              pkg = "gpb";
+              version = "3.18.10";
+              sha256 =
+                "caf6833ca216a08246efe660393f3bce291d46dc873ec3588f11e4c112030714";
+            };
+
+            meta = {
+              description = ''A compiler for Google protocol buffer definitions
+                            files for Erlang.'';
+              license = stdenv.lib.licenses.lpgl1;
+              homepage = "https://github.com/tomas-abrahamsson/gpb";
+            };
+          }
+      ) {};
+
+    gpb_3_18_8 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "gpb";
+            version = "3.18.8";
+            src = fetchHex {
+              pkg = "gpb";
+              version = "3.18.8";
+              sha256 =
+                "44af8eadd3edc030684d36ea6964926af6d95aa32e105a02fcc2cd2e1b436694";
+            };
+
+            meta = {
+              description = ''A compiler for Google protocol buffer definitions
+                            files for Erlang.'';
+              license = stdenv.lib.licenses.lpgl1;
+              homepage = "https://github.com/tomas-abrahamsson/gpb";
+            };
+          }
+      ) {};
+
+    gpb_3_19_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "gpb";
+            version = "3.19.0";
+            src = fetchHex {
+              pkg = "gpb";
+              version = "3.19.0";
+              sha256 =
+                "9d7fdee6914d5ce3850a58f00ae37240ba7ccb9ecf37aeb0e1bdfae37ca6b4b7";
+            };
+
+            meta = {
+              description = ''A compiler for Google protocol buffer definitions
+                            files for Erlang.'';
+              license = stdenv.lib.licenses.lpgl1;
+              homepage = "https://github.com/tomas-abrahamsson/gpb";
+            };
+          }
+      ) {};
+
+    gpb = gpb_3_19_0;
+
+    gproc_0_3_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "gproc";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "gproc";
+              version = "0.3.1";
+              sha256 =
+                "3c449925a5cbf57cc40d13c6c282bc1080b5ed3bad97e1acdbe969fd63a65fce";
+            };
+
+            meta = {
+              longDescription = ''Gproc is a process dictionary for Erlang,
+                                which provides a number of useful features
+                                beyond what the built-in dictionary has: * Use
+                                any term as a process alias * Register a process
+                                under several aliases * Non-unique properties
+                                can be registered simultaneously by many
+                                processes * QLC and match specification
+                                interface for efficient queries on the
+                                dictionary * Await registration, let`s you wait
+                                until a process registers itself * Atomically
+                                give away registered names and properties to
+                                another process * Counters, and aggregated
+                                counters, which automatically maintain the total
+                                of all counters with a given name * Global
+                                registry, with all the above functions applied
+                                to a network of nodes'';
+              license = stdenv.lib.licenses.epl10;
+              homepage = "https://github.com/uwiger/gproc";
+            };
+          }
+      ) {};
+
+    gproc_0_5_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "gproc";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "gproc";
+              version = "0.5.0";
+              sha256 =
+                "5bc0fa4e999a6665b92ce57a7f12d7e9d1c26bfc39b0f657994be05cd3818b18";
+            };
+
+            meta = {
+              longDescription = ''Gproc is a process dictionary for Erlang,
+                                which provides a number of useful features
+                                beyond what the built-in dictionary has: * Use
+                                any term as a process alias * Register a process
+                                under several aliases * Non-unique properties
+                                can be registered simultaneously by many
+                                processes * QLC and match specification
+                                interface for efficient queries on the
+                                dictionary * Await registration, let`s you wait
+                                until a process registers itself * Atomically
+                                give away registered names and properties to
+                                another process * Counters, and aggregated
+                                counters, which automatically maintain the total
+                                of all counters with a given name * Global
+                                registry, with all the above functions applied
+                                to a network of nodes'';
+              license = stdenv.lib.licenses.epl10;
+              homepage = "https://github.com/uwiger/gproc";
+            };
+          }
+      ) {};
+
+    gproc = gproc_0_5_0;
+
+    graphex_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "graphex";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "graphex";
+              version = "0.2.1";
+              sha256 =
+                "9279db515110de152479903488b1df6ad2de409f5b48d00fac55211bfab2e728";
+            };
+
+            meta = {
+              description = ''A task graph execution library for elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/stocks29/graphex";
+            };
+          }
+      ) {};
+
+    graphex = graphex_0_2_1;
+
+    graphmath_1_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "graphmath";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "graphmath";
+              version = "1.0.2";
+              sha256 =
+                "6be38a7f4c6167f2c766ee74fd2642c8d98412c4b2bd4c1238cad493f30f4524";
+            };
+
+            meta = {
+              description = ''Graphmath is a library for doing 2D and 3D
+                            mathemtical operations.'';
+              license = with stdenv.lib.licenses; [ free wtfpl free ];
+              homepage = "https://github.com/crertel/graphmath";
+            };
+          }
+      ) {};
+
+    graphmath = graphmath_1_0_2;
+
+    graphql_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "graphql";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "graphql";
+              version = "0.1.2";
+              sha256 =
+                "d517247d9518fb1db9631a988f02935a253da43c3c2818c8a1355631645bd92c";
+            };
+
+            meta = {
+              description = ''GraphQL Elixir implementation'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/graphql-elixir/graphql";
+            };
+          }
+      ) {};
+
+    graphql = graphql_0_1_2;
+
+    graphql_ex_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "graphql_ex";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "graphql_ex";
+              version = "0.0.1";
+              sha256 =
+                "51884d5275d354b915db03eb390e858ead88b3f3e4f699b2fa7dc8eb442bc343";
+            };
+             meta = {    };
+          }
+      ) {};
+
+    graphql_ex = graphql_ex_0_0_1;
+
+    graphql_parser_0_0_3 = callPackage
+      (
+        {  buildRebar3, fetchHex, poison_1_5_2 }:
+          buildRebar3 {
+            name = "graphql_parser";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "graphql_parser";
+              version = "0.0.3";
+              sha256 =
+                "c54d6d3a4d5daba22559bc306e3e52cb8d78d3a93738f615c16e405ad56ac6a9";
+            };
+
+            beamDeps  = [ poison_1_5_2 ];
+
+            meta = {
+              longDescription = ''An elixir interface for libgraphqlparser
+                                implemented as a NIF for parsing GraphQL.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/aarvay/graphql_parser";
+            };
+          }
+      ) {};
+
+    graphql_parser = graphql_parser_0_0_3;
+
+    gravatarify_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "gravatarify";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "gravatarify";
+              version = "0.1.0";
+              sha256 =
+                "d11f416611ed802d72e57f649c74f17c6dbf0e751da87e355cbfd14d4047d17e";
+            };
+
+            meta = {
+              description = ''Gravatar images with an ease'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/shiroyasha/gravatarify";
+            };
+          }
+      ) {};
+
+    gravatarify = gravatarify_0_1_0;
+
+    gray_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "gray";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "gray";
+              version = "0.0.2";
+              sha256 =
+                "95b071e0742ed10298c5d0ff027aec3eaadf3a807ed5e88bd4d2861a5220be62";
+            };
+
+            meta = {
+              longDescription = ''Package to help you operate with [gray codes]
+                                (https://en.wikipedia.org/wiki/Gray_code)'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/hashd/gray";
+            };
+          }
+      ) {};
+
+    gray = gray_0_0_2;
+
+    growl_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "growl";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "growl";
+              version = "0.0.2";
+              sha256 =
+                "0b43fba8d18349b5bd507b457016298cfafea4a50831e8ce944569b45d3bceb8";
+            };
+
+            meta = {
+              longDescription = ''# Growl A simple wrapper to the command line
+                                interface for the [Growl OSX notification
+                                system](http://growl.info/). ## Setup ```Elixir
+                                defp deps do [ {:growl, github:
+                                "zhallett/growl"} ] ``` ## Usage Within the
+                                script you would like to create a `growl`
+                                notification, make the module call as follows:
+                                ```Elixir Growl.notify("This is a notification")
+                                ``` The API accepts messages in a string format,
+                                as well as a list. If the first argument is a
+                                list, the first object is the title line, with
+                                subsequent lines being the body of the
+                                notification. ```Elixir Growl.notify(["Example",
+                                "This is an example notification"]) ``` would
+                                give the following notification: ![Forced
+                                Update](https://github.com/zhallett/growl/blob/master/multi_line_notification.png?raw=true
+                                "Multi-Line notification Screenshot")) ##
+                                Contributing 1. Fork it 2. Create your feature
+                                branch (`git checkout -b my-new-feature`) 3.
+                                Commit your changes (`git commit -am `Add some
+                                feature``) 4. Push to the branch (`git push
+                                origin my-new-feature`) 5. Create new Pull
+                                Request '';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/zhallett/growl";
+            };
+          }
+      ) {};
+
+    growl = growl_0_0_2;
+
+    guardian_0_10_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          uuid_1_1_3,
+          poison_1_5_2,
+          plug_1_1_1,
+          jose_1_6_1
+        }:
+          buildMix {
+            name = "guardian";
+            version = "0.10.1";
+            src = fetchHex {
+              pkg = "guardian";
+              version = "0.10.1";
+              sha256 =
+                "741aaa989ab656317a247d1db4dcd8e3efbd840b4d451bed7a37504ffdba6dc9";
+            };
+            beamDeps  = [ uuid_1_1_3 poison_1_5_2 plug_1_1_1 jose_1_6_1 ];
+
+            meta = {
+              description = ''Elixir Authentication framework'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ueberauth/guardian";
+            };
+          }
+      ) {};
+
+    guardian = guardian_0_10_1;
+
+    guardian_0_9_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          uuid_1_1_3,
+          poison_1_5_2,
+          plug_1_1_1,
+          jose_1_6_1
+        }:
+          buildMix {
+            name = "guardian";
+            version = "0.9.1";
+            src = fetchHex {
+              pkg = "guardian";
+              version = "0.9.1";
+              sha256 =
+                "9a79ae386f777774ab2910007cd30b20e2ea8da51c0712ec07f8cc8a13dfe293";
+            };
+            beamDeps  = [ uuid_1_1_3 poison_1_5_2 plug_1_1_1 jose_1_6_1 ];
+
+            meta = {
+              description = ''Elixir Authentication framework'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ueberauth/guardian";
+            };
+          }
+      ) {};
+
+    guardian_db_0_4_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          postgrex_0_11_1,
+          guardian_0_9_1,
+          ecto_2_0_0_beta_0
+        }:
+          buildMix {
+            name = "guardian_db";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "guardian_db";
+              version = "0.4.0";
+              sha256 =
+                "d8fc1d33885c42c9a35c1c370bfe676b68a9b4fb54ed33ff7075e32cadcd1279";
+            };
+            beamDeps  = [ postgrex_0_11_1 guardian_0_9_1 ecto_2_0_0_beta_0 ];
+
+            meta = {
+              description = ''DB tracking for token validity'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/hassox/guardian_db";
+            };
+          }
+      ) {};
+
+    guardian_db = guardian_db_0_4_0;
+
+    guardsafe_0_5_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "guardsafe";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "guardsafe";
+              version = "0.5.0";
+              sha256 =
+                "e6808876c07f21d78c3935c0607791cd2ceec40f3b855fa03774e8087bcfc277";
+            };
+
+            meta = {
+              description = ''Macros expanding into code that can be safely
+                            used in guard clauses.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/DevL/guardsafe";
+            };
+          }
+      ) {};
+
+    guardsafe = guardsafe_0_5_0;
+
+    gun_1_0_0_pre_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, ranch_1_1_0, cowlib_1_3_0 }:
+          buildRebar3 {
+            name = "gun";
+            version = "1.0.0-pre.1";
+            src = fetchHex {
+              pkg = "gun";
+              version = "1.0.0-pre.1";
+              sha256 =
+                "53aca19e83b15127aa4e299435823b367d5ba6797852984af6c2b9b493be9d56";
+            };
+
+            beamDeps  = [ ranch_1_1_0 cowlib_1_3_0 ];
+
+            meta = {
+              description = ''Asynchronous SPDY, HTTP and Websocket client.'';
+
+            };
+          }
+      ) {};
+
+    gun = gun_1_0_0_pre_1;
+
+    guri_0_2_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          websocket_client_1_1_0,
+          poison_1_5_2,
+          httpoison_0_8_1
+        }:
+          buildMix {
+            name = "guri";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "guri";
+              version = "0.2.1";
+              sha256 =
+                "7fa0f2ebff111c368895798041d982f00eec34589d93f10bb323bb5a09e1f888";
+            };
+            beamDeps  = [ websocket_client_1_1_0 poison_1_5_2 httpoison_0_8_1
+                      ];
+
+            meta = {
+              description = ''Automate tasks and keep everyone in the loop with
+                            Guri'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/elvio/guri";
+            };
+          }
+      ) {};
+
+    guri = guri_0_2_1;
+
+    gurka_0_1_7 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "gurka";
+            version = "0.1.7";
+            src = fetchHex {
+              pkg = "gurka";
+              version = "0.1.7";
+              sha256 =
+                "b46c96446f46a53411a3b45d126ec19e724178818206ca1d2dd16abff28df6b5";
+            };
+
+            meta = {
+              description = ''Erlang implementation of Cucumber'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    gurka = gurka_0_1_7;
+
+    gutenex_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, imagineer_0_2_1, apex_0_3_7 }:
+          buildMix {
+            name = "gutenex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "gutenex";
+              version = "0.1.0";
+              sha256 =
+                "212861089f4707ae39e25c08c0d2bb33fca876f1cf71ce7d4546d192c3be03a5";
+            };
+            beamDeps  = [ imagineer_0_2_1 apex_0_3_7 ];
+
+            meta = {
+              description = ''PDF Generation in Elixir '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/SenecaSystems/gutenex";
+            };
+          }
+      ) {};
+
+    gutenex = gutenex_0_1_0;
+
+    hackney_1_0_6 = callPackage
+      (
+        {
+          buildRebar3, fetchHex, ssl_verify_hostname_1_0_1, idna_1_0_2
+        }:
+          buildRebar3 {
+            name = "hackney";
+            version = "1.0.6";
+            src = fetchHex {
+              pkg = "hackney";
+              version = "1.0.6";
+              sha256 =
+                "ba74e309ffd9413ca2fdc0c68871e31db9d6f779f8aa32f4828e08ebab8300da";
+            };
+
+            beamDeps  = [ ssl_verify_hostname_1_0_1 idna_1_0_2 ];
+
+            meta = {
+              description = ''simple HTTP client'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/benoitc/hackney";
+            };
+          }
+      ) {};
+
+    hackney_1_1_0 = callPackage
+      (
+        {
+          buildRebar3, fetchHex, ssl_verify_hostname_1_0_6, idna_1_0_3
+        }:
+          buildRebar3 {
+            name = "hackney";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "hackney";
+              version = "1.1.0";
+              sha256 =
+                "c8551072fdc8d5d5faacc5a31050cb943c3a8eb533149798b3ff424ef2d68501";
+            };
+
+            beamDeps  = [ ssl_verify_hostname_1_0_6 idna_1_0_3 ];
+
+            meta = {
+              description = ''simple HTTP client'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/benoitc/hackney";
+            };
+          }
+      ) {};
+
+    hackney_1_3_1 = callPackage
+      (
+        {
+          buildRebar3, fetchHex, ssl_verify_hostname_1_0_6, idna_1_0_3
+        }:
+          buildRebar3 {
+            name = "hackney";
+            version = "1.3.1";
+            src = fetchHex {
+              pkg = "hackney";
+              version = "1.3.1";
+              sha256 =
+                "1a6316daceae744758fc88f2961e68c5a8b6cf1e1f49a28fc2caea6d27581add";
+            };
+
+            beamDeps  = [ ssl_verify_hostname_1_0_6 idna_1_0_3 ];
+
+            meta = {
+              description = ''simple HTTP client'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/benoitc/hackney";
+            };
+          }
+      ) {};
+
+    hackney_1_3_2 = callPackage
+      (
+        {
+          buildRebar3, fetchHex, ssl_verify_hostname_1_0_6, idna_1_0_3
+        }:
+          buildRebar3 {
+            name = "hackney";
+            version = "1.3.2";
+            src = fetchHex {
+              pkg = "hackney";
+              version = "1.3.2";
+              sha256 =
+                "9b811cff637b29f9c7e2c61abf01986c85cd4f64a9422315fd803993b4e82615";
+            };
+
+            beamDeps  = [ ssl_verify_hostname_1_0_6 idna_1_0_3 ];
+
+            meta = {
+              description = ''simple HTTP client'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/benoitc/hackney";
+            };
+          }
+      ) {};
+
+    hackney_1_4_4 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          ssl_verify_hostname_1_0_5,
+          mimerl_1_0_0,
+          idna_1_0_2,
+          certifi_0_1_1
+        }:
+          buildRebar3 {
+            name = "hackney";
+            version = "1.4.4";
+            src = fetchHex {
+              pkg = "hackney";
+              version = "1.4.4";
+              sha256 =
+                "c8ab2436556d6bce7e85a85adec67f6abeb8c7508668a3e29750be3c4bf4e3a8";
+            };
+
+            beamDeps  = [
+                          ssl_verify_hostname_1_0_5
+                          mimerl_1_0_0
+                          idna_1_0_2
+                          certifi_0_1_1
+                        ];
+
+            meta = {
+              description = ''simple HTTP client'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/benoitc/hackney";
+            };
+          }
+      ) {};
+
+    hackney_1_4_8 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          ssl_verify_hostname_1_0_5,
+          mimerl_1_0_2,
+          idna_1_0_3,
+          certifi_0_3_0
+        }:
+          buildRebar3 {
+            name = "hackney";
+            version = "1.4.8";
+            src = fetchHex {
+              pkg = "hackney";
+              version = "1.4.8";
+              sha256 =
+                "7c212741163cec1cf38ad845bd71efafcbf81365cf754c978b354c6375dc4da2";
+            };
+
+            beamDeps  = [
+                          ssl_verify_hostname_1_0_5
+                          mimerl_1_0_2
+                          idna_1_0_3
+                          certifi_0_3_0
+                        ];
+
+            meta = {
+              description = ''simple HTTP client'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/benoitc/hackney";
+            };
+          }
+      ) {};
+
+    hackney = hackney_1_4_8;
+
+    haikunator_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "haikunator";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "haikunator";
+              version = "1.0.1";
+              sha256 =
+                "60692df3a559df14bac6a8c115091977f0a45eea55123a5cb37e3d763cbe92e8";
+            };
+
+            meta = {
+              longDescription = ''Generate Heroku-like memorable random names
+                                to use in your apps or anywhere else.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/knrz/Haikunator";
+            };
+          }
+      ) {};
+
+    haikunator = haikunator_1_0_1;
+
+    hamcrest_0_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "hamcrest";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "hamcrest";
+              version = "0.1.1";
+              sha256 =
+                "5207b83e8d3168b9cbbeb3b4c4d83817a38a05f55478510e9c4db83ef83fa0ca";
+            };
+
+            meta = {
+              description = ''Erlang port of Hamcrest'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/hyperthunk/hamcrest-erlang";
+            };
+          }
+      ) {};
+
+    hamcrest = hamcrest_0_1_1;
+
+    happy_1_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "happy";
+            version = "1.1.1";
+            src = fetchHex {
+              pkg = "happy";
+              version = "1.1.1";
+              sha256 =
+                "3b2ee083ea1d68063df4fb0561eb462703e6188d9352d0763b458ee6ce385060";
+            };
+
+            meta = {
+              longDescription = ''Happy path programming in elixir. Alternative
+                                to ok_jose, elixir`s 1.2 `with` keyword and that
+                                kind of stuff.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/vic/happy";
+            };
+          }
+      ) {};
+
+    happy = happy_1_1_1;
+
+    harakiri_0_6_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "harakiri";
+            version = "0.6.0";
+            src = fetchHex {
+              pkg = "harakiri";
+              version = "0.6.0";
+              sha256 =
+                "0cd6f40db8d2e475ea4b9ae4c872656171bced2571e8f86caf49ac7680656b94";
+            };
+
+            meta = {
+              description = ''Help applications do things to themselves.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rubencaro/harakiri";
+            };
+          }
+      ) {};
+
+    harakiri = harakiri_0_6_0;
+
+    harvest_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "harvest";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "harvest";
+              version = "0.0.2";
+              sha256 =
+                "d4d7289c7f166cd035140b6ebe6a14c4cf1f1552b597473bcc29588c8e394e6d";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Harvest Time Tracking API wrapper written in
+                            Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/luishurtado/harvest";
+            };
+          }
+      ) {};
+
+    harvest = harvest_0_0_2;
+
+    hash_ring_ex_1_1_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "hash_ring_ex";
+            version = "1.1.2";
+            src = fetchHex {
+              pkg = "hash_ring_ex";
+              version = "1.1.2";
+              sha256 =
+                "f33c2f7cc134d9ab1b91d961395b3a2b4d3d47b12b16c4e9d964bc3b57b7d573";
+            };
+
+            meta = {
+              description = ''A consistent hash-ring implemention for Elixir.
+                            '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/reset/hash-ring-ex";
+            };
+          }
+      ) {};
+
+    hash_ring_ex = hash_ring_ex_1_1_2;
+
+    hashids_2_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "hashids";
+            version = "2.0.1";
+            src = fetchHex {
+              pkg = "hashids";
+              version = "2.0.1";
+              sha256 =
+                "8f16b2bf57a71ce5da716bdd731c61e789e2c25f1fd5c00130f0efee9a251a26";
+            };
+
+            meta = {
+              description = ''Hashids lets you obfuscate numerical identifiers
+                            via reversible mapping.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/alco/hashids-elixir";
+            };
+          }
+      ) {};
+
+    hashids = hashids_2_0_1;
+
+    heapq_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "heapq";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "heapq";
+              version = "0.0.1";
+              sha256 =
+                "60bc20c109360c6899203f4015fae42c9e5a4f82707f76b064e10d6da135d4fd";
+            };
+
+            meta = {
+              description = ''A Heap-based Priority Queue Implementation in
+                            Elixir.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/takscape/elixir-heapq";
+            };
+          }
+      ) {};
+
+    heapq = heapq_0_0_1;
+
+    hedwig_1_0_0_rc3 = callPackage
+      (
+        {  buildMix, fetchHex, gproc_0_5_0 }:
+          buildMix {
+            name = "hedwig";
+            version = "1.0.0-rc3";
+            src = fetchHex {
+              pkg = "hedwig";
+              version = "1.0.0-rc3";
+              sha256 =
+                "846347c6ae462e98b8c8c8a60f0bef8ee2c4ffa28463a0df030ae8a938cc773f";
+            };
+            beamDeps  = [ gproc_0_5_0 ];
+
+            meta = {
+              description = ''An adapter-based chat bot framework'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/hedwig-im/hedwig";
+            };
+          }
+      ) {};
+
+    hedwig = hedwig_1_0_0_rc3;
+
+    hedwig_xmpp_1_0_0_rc2 = callPackage
+      (
+        {  buildMix, fetchHex, romeo_0_4_0, hedwig_1_0_0_rc3 }:
+          buildMix {
+            name = "hedwig_xmpp";
+            version = "1.0.0-rc2";
+            src = fetchHex {
+              pkg = "hedwig_xmpp";
+              version = "1.0.0-rc2";
+              sha256 =
+                "79d60e836763c9eb88798bb5921e8eda717fbbf3030ca401f2a3915f58bc59e0";
+            };
+            beamDeps  = [ romeo_0_4_0 hedwig_1_0_0_rc3 ];
+
+            meta = {
+              description = ''An XMPP adapter for Hedwig'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/hedwig-im/hedwig";
+            };
+          }
+      ) {};
+
+    hedwig_xmpp = hedwig_xmpp_1_0_0_rc2;
+
+    hello_0_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "hello";
+            version = "0.0.0";
+            src = fetchHex {
+              pkg = "hello";
+              version = "0.0.0";
+              sha256 =
+                "35378799d296eda76d236544085041c8d19cd9f6dd6d5f31b5914bee6e6128fc";
+            };
+
+            meta = {
+              description = ''Reserving this name for an awesome project I am
+                            building.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/thejamespinto";
+            };
+          }
+      ) {};
+
+    hello = hello_0_0_0;
+
+    hello_world_0_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, decimal_0_2_5 }:
+          buildMix {
+            name = "hello_world";
+            version = "0.0.0";
+            src = fetchHex {
+              pkg = "hello_world";
+              version = "0.0.0";
+              sha256 =
+                "ae8b9c09cd73bf5268bdd4095cb9d5efbb716cb841834a6edf111f45279b207d";
+            };
+            beamDeps  = [ decimal_0_2_5 ];
+
+            meta = {
+              description = ''hello-world test'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/shanilevy/hello_world_hex";
+            };
+          }
+      ) {};
+
+    hello_world = hello_world_0_0_0;
+
+    hello_world_header_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, plug_0_8_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "hello_world_header";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "hello_world_header";
+              version = "0.0.1";
+              sha256 =
+                "caddb7712a66326face465231cf3bfe9210a62787cf5f499f9fbcc04e4695242";
+            };
+            beamDeps  = [ plug_0_8_1 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Demo plug used for tutorial purposes.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/cultivatehq/hello_world_header";
+            };
+          }
+      ) {};
+
+    hello_world_header = hello_world_header_0_0_1;
+
+    hermes_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, chronos_1_5_1 }:
+          buildMix {
+            name = "hermes";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "hermes";
+              version = "0.1.0";
+              sha256 =
+                "f28880392a8b1b027c58c387870099f854f842fdeb1f7a0ba94a0b1ca07643bf";
+            };
+            beamDeps  = [ chronos_1_5_1 ];
+
+            meta = {
+              longDescription = ''Is a mailer component for sending & recieving
+                                emails. The name comes from the greek messanger
+                                of the gods.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/nurugger07/hemes";
+            };
+          }
+      ) {};
+
+    hermes = hermes_0_1_0;
+
+    hex_math_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "hex_math";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "hex_math";
+              version = "0.0.2";
+              sha256 =
+                "1dd9284c402d06bcd63ccb8df6022342defb2de4bd666066ed409e3b3c47761b";
+            };
+
+            meta = {
+              description = ''Library for working with hex grids.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tjcelaya/hex_math";
+            };
+          }
+      ) {};
+
+    hex_math = hex_math_0_0_2;
+
+    hex_searcher_1_0_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          table_rex_0_4_0,
+          ibrowse_4_2_2,
+          httpotion_2_1_0,
+          floki_0_7_1
+        }:
+          buildMix {
+            name = "hex_searcher";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "hex_searcher";
+              version = "1.0.0";
+              sha256 =
+                "26d2097aa0f950c67ea55822e15cfec26976f76a60ec51d758af9d60126b3538";
+            };
+            beamDeps  = [
+                          table_rex_0_4_0
+                          ibrowse_4_2_2
+                          httpotion_2_1_0
+                          floki_0_7_1
+                        ];
+
+            meta = {
+              description = ''Search hex packages from terminal'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nguyenvinhlinh/HexSearcher";
+            };
+          }
+      ) {};
+
+    hex_searcher = hex_searcher_1_0_0;
+
+    hexate_0_5_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "hexate";
+            version = "0.5.1";
+            src = fetchHex {
+              pkg = "hexate";
+              version = "0.5.1";
+              sha256 =
+                "b146d4c48380bef3eee74e16bc243f91783f72502759f1f18460b6a8da441270";
+            };
+
+            meta = {
+              description = ''A simple module for working with hex strings in
+                            Elixir. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rjsamson/hexate";
+            };
+          }
+      ) {};
+
+    hexate = hexate_0_5_1;
+
+    hexbot_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "hexbot";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "hexbot";
+              version = "0.0.1";
+              sha256 =
+                "f9b8c9805468f7b93fa88440f1e75d8ed2fc3b7d11a68c455abf81efcc31590c";
+            };
+
+            meta = {
+              description = ''A hubot-like bot framework for chatops.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tombell/hexbot";
+            };
+          }
+      ) {};
+
+    hexbot = hexbot_0_0_1;
+
+    hexdocset_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, floki_0_0_5 }:
+          buildMix {
+            name = "hexdocset";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "hexdocset";
+              version = "1.0.0";
+              sha256 =
+                "846ed02411d759710f0f72a401d81a67cbc181421e461d3246540b3d471044be";
+            };
+            beamDeps  = [ floki_0_0_5 ];
+
+            meta = {
+              description = ''Convert hex doc to Dash.app`s docset format.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/yesmeck/hexdocset";
+            };
+          }
+      ) {};
+
+    hexdocset = hexdocset_1_0_0;
+
+    hexoku_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, jsex_2_0_0, httpoison_0_8_1 }:
+          buildMix {
+            name = "hexoku";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "hexoku";
+              version = "0.1.0";
+              sha256 =
+                "39c24660842061d71922df5f87ac4fa065b3f18f64a4f438d40495ffeb9d711b";
+            };
+            beamDeps  = [ jsex_2_0_0 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Heroku API client and Heroku Mix tasks for Elixir
+                            projects. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/JonGretar/Hexoku";
+            };
+          }
+      ) {};
+
+    hexoku = hexoku_0_1_0;
+
+    hlc_2_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "hlc";
+            version = "2.0.0";
+            src = fetchHex {
+              pkg = "hlc";
+              version = "2.0.0";
+              sha256 =
+                "460ac04654e920e068d1fd17aec1f78b1879cc42ac7f3def7497f0d1cc5056ad";
+            };
+
+            meta = {
+              description = ''hybrid logical clock'';
+
+              homepage = "https://github.com/barrel-db/hlc";
+            };
+          }
+      ) {};
+
+    hlc = hlc_2_0_0;
+
+    holidays_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "holidays";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "holidays";
+              version = "0.1.1";
+              sha256 =
+                "098f192bd02f1fd68fd22ae69dc608a03e89a4c814c3c3901d56c8f697cda622";
+            };
+
+            meta = {
+              description = ''Library for finding which holidays fall on given
+                            dates.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/CoderDennis/holidays";
+            };
+          }
+      ) {};
+
+    holidays = holidays_0_1_1;
+
+    honeybadger_0_3_1 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_1_5_2, plug_0_8_1, httpoison_0_8_1
+        }:
+          buildMix {
+            name = "honeybadger";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "honeybadger";
+              version = "0.3.1";
+              sha256 =
+                "9555cbe7a4069f27f8182c066411f6c439f79f147eb0a1605e13d55b07fb260b";
+            };
+            beamDeps  = [ poison_1_5_2 plug_0_8_1 httpoison_0_8_1 ];
+
+            meta = {
+              longDescription = ''Elixir client, Plug and error_logger for
+                                integrating with the Honeybadger.io exception
+                                tracker'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/honeybadger-io/honeybadger-elixir";
+            };
+          }
+      ) {};
+
+    honeybadger = honeybadger_0_3_1;
+
+    honeydew_0_0_8 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "honeydew";
+            version = "0.0.8";
+            src = fetchHex {
+              pkg = "honeydew";
+              version = "0.0.8";
+              sha256 =
+                "3bf8f7d9665f2897c43f6f3f5f31e598ecf41270bfb57fae11b994715f2665cc";
+            };
+
+            meta = {
+              description = ''Job queue + worker pool with permanent
+                            workers.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/koudelka/elixir-honeydew";
+            };
+          }
+      ) {};
+
+    honeydew = honeydew_0_0_8;
+
+    hooks_1_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "hooks";
+            version = "1.1.1";
+            src = fetchHex {
+              pkg = "hooks";
+              version = "1.1.1";
+              sha256 =
+                "6834ad3a2a624a5ffd49e9cb146ff49ded423b67f31905b122d24128c72c5c85";
+            };
+
+            meta = {
+              description = ''generic plugin & hook system'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/barrel-db/hooks";
+            };
+          }
+      ) {};
+
+    hooks = hooks_1_1_1;
+
+    hound_0_8_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_1 }:
+          buildMix {
+            name = "hound";
+            version = "0.8.2";
+            src = fetchHex {
+              pkg = "hound";
+              version = "0.8.2";
+              sha256 =
+                "3ecb4b7d20de76e6790d61e53555e3486ed5810bb6f0052321620b1d46ffb188";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Webdriver library for integration testing and
+                            browser automation'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/HashNuke/hound";
+            };
+          }
+      ) {};
+
+    hound = hound_0_8_2;
+
+    hr_0_2_2 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          yyid_0_1_2,
+          plug_1_1_1,
+          phoenix_html_2_5_0,
+          phoenix_ecto_3_0_0_beta_0,
+          phoenix_1_1_4,
+          oauth2_0_3_0,
+          linguist_0_1_5,
+          joken_0_16_1,
+          comeonin_1_6_0
+        }:
+          buildMix {
+            name = "hr";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "hr";
+              version = "0.2.2";
+              sha256 =
+                "67d02f62bffda952dbaf80cfea85601f31c39e04d3bf90da7a08b89e1bce71df";
+            };
+            beamDeps  = [
+                          yyid_0_1_2
+                          plug_1_1_1
+                          phoenix_html_2_5_0
+                          phoenix_ecto_3_0_0_beta_0
+                          phoenix_1_1_4
+                          oauth2_0_3_0
+                          linguist_0_1_5
+                          joken_0_16_1
+                          comeonin_1_6_0
+                        ];
+
+            meta = {
+              description = ''User accounts for Phoenix. Supports OAuth, JWT
+                            and forms out of the box'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zensavona/hr";
+            };
+          }
+      ) {};
+
+    hr = hr_0_2_2;
+
+    hstore_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, postgrex_0_6_0, apex_0_3_7 }:
+          buildMix {
+            name = "hstore";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "hstore";
+              version = "0.0.2";
+              sha256 =
+                "bd5040285c29162685f4db37ef3ad30c2bb473f5c54fe03ef29b4383cf23504a";
+            };
+            beamDeps  = [ postgrex_0_6_0 apex_0_3_7 ];
+
+            meta = {
+              longDescription = ''A collection of encoders and decoders for
+                                hstore data type support for Postgrex. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/senecasystems/hstore";
+            };
+          }
+      ) {};
+
+    hstore = hstore_0_0_2;
+
+    html_builder_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "html_builder";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "html_builder";
+              version = "0.1.0";
+              sha256 =
+                "825fa6d1be1c42bf91dcd198c791eb32156973a70273afb93616285f97dce0c2";
+            };
+
+            meta = {
+              description = ''generate html in elixir with simple data
+                            structures'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/camshaft/html_builder";
+            };
+          }
+      ) {};
+
+    html_builder = html_builder_0_1_0;
+
+    html_entities_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "html_entities";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "html_entities";
+              version = "0.3.0";
+              sha256 =
+                "93811511394efeee964f6e7df3b72b37ad39c1d185030c3561aebf1c15c4d995";
+            };
+
+            meta = {
+              description = ''Decode and encode HTML entities in a string.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/martinsvalin/html_entities";
+            };
+          }
+      ) {};
+
+    html_entities = html_entities_0_3_0;
+
+    html_sanitize_ex_0_3_1 = callPackage
+      (
+        {  buildMix, fetchHex, mochiweb_2_12_2 }:
+          buildMix {
+            name = "html_sanitize_ex";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "html_sanitize_ex";
+              version = "0.3.1";
+              sha256 =
+                "cf99531194f621515cc7f62db14f899e404529782b94061b44931c3c4b78099d";
+            };
+            beamDeps  = [ mochiweb_2_12_2 ];
+
+            meta = {
+              description = ''HTML sanitizer for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rrrene/html_sanitize_ex";
+            };
+          }
+      ) {};
+
+    html_sanitize_ex = html_sanitize_ex_0_3_1;
+
+    html_to_pdf_0_5_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "html_to_pdf";
+            version = "0.5.2";
+            src = fetchHex {
+              pkg = "html_to_pdf";
+              version = "0.5.2";
+              sha256 =
+                "7adcde56c221e8f2447837d3b5983775f53071035d9ce9f179635a5e94c795e3";
+            };
+
+            meta = {
+              description = ''Super simple library for turning raw HTML or
+                            webpages into beautiful PDFs.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mattweldon/html_to_pdf";
+            };
+          }
+      ) {};
+
+    html_to_pdf = html_to_pdf_0_5_2;
+
+    htpasswd_1_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, apache_passwd_md5_1_0_0 }:
+          buildMix {
+            name = "htpasswd";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "htpasswd";
+              version = "1.0.2";
+              sha256 =
+                "0c9006a42eae68ac2f561e5876c0fd8083560c57da099ffa6c828eeb00246bba";
+            };
+            beamDeps  = [ apache_passwd_md5_1_0_0 ];
+
+            meta = {
+              longDescription = ''Provides basic htpasswd(1) functions as a
+                                library: encode and check passwords in MD5, SHA,
+                                crypt, or plaintext format, add to and delete
+                                from htaccess files. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/kevinmontuori/Apache.htpasswd";
+            };
+          }
+      ) {};
+
+    htpasswd = htpasswd_1_0_2;
+
+    http_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          pool_0_0_2,
+          excoveralls_0_5_1,
+          ex_doc_0_6_2,
+          earmark_0_1_19,
+          dialyze_0_1_4
+        }:
+          buildMix {
+            name = "http";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "http";
+              version = "0.0.1";
+              sha256 =
+                "1ee497d4ec73290e5d9b9effab88786716185550bd65822e7a31c32d1a044a96";
+            };
+            beamDeps  = [
+                          pool_0_0_2
+                          excoveralls_0_5_1
+                          ex_doc_0_6_2
+                          earmark_0_1_19
+                          dialyze_0_1_4
+                        ];
+
+            meta = {
+              description = ''HTTP server for Elixir Not currently working, but
+                            close :) '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/slogsdon/http";
+            };
+          }
+      ) {};
+
+    http = http_0_0_1;
+
+    http_proxy_1_0_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          plug_1_0_3,
+          hackney_1_4_8,
+          exjsx_3_2_0,
+          cowboy_1_0_4
+        }:
+          buildMix {
+            name = "http_proxy";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "http_proxy";
+              version = "1.0.1";
+              sha256 =
+                "7ff5d10c8932b189844f9735742250e4fdbe9de5eba40c84e7447f54fc75fdd3";
+            };
+            beamDeps  = [ plug_1_0_3 hackney_1_4_8 exjsx_3_2_0 cowboy_1_0_4
+                      ];
+
+            meta = {
+              description = ''Multi port HTTP Proxy and support record/play
+                            request.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/KazuCocoa/http_proxy";
+            };
+          }
+      ) {};
+
+    http_proxy = http_proxy_1_0_1;
+
+    http_router_0_0_8 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          xml_builder_0_0_8,
+          poison_1_5_2,
+          plug_1_1_1,
+          cowboy_1_0_4
+        }:
+          buildMix {
+            name = "http_router";
+            version = "0.0.8";
+            src = fetchHex {
+              pkg = "http_router";
+              version = "0.0.8";
+              sha256 =
+                "9a2844cc8c880621ca2689e0056f50e2c19e3b0e87a8e2524489459b377a8dc3";
+            };
+            beamDeps  = [
+                          xml_builder_0_0_8 poison_1_5_2 plug_1_1_1 cowboy_1_0_4
+                        ];
+
+            meta = {
+              longDescription = ''HTTP Router with various macros to assist in
+                                developing your application and organizing your
+                                code'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/sugar-framework/elixir-http-router";
+            };
+          }
+      ) {};
+
+    http_router = http_router_0_0_8;
+
+    http_signature_1_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "http_signature";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "http_signature";
+              version = "1.1.0";
+              sha256 =
+                "3e6036d9c29289ed0e35dd6f41821dec9061ce20aad3c4d35dcbae8c84eb3baa";
+            };
+
+            meta = {
+              description = ''Erlang and Elixir implementations of Joyent`s
+                            HTTP Signature Scheme.'';
+              license = stdenv.lib.licenses.mpl20;
+              homepage =
+                "https://github.com/potatosalad/erlang-http_signature";
+            };
+          }
+      ) {};
+
+    http_signature = http_signature_1_1_0;
+
+    httparrot_0_3_4 = callPackage
+      (
+        {  buildMix, fetchHex, exjsx_3_2_0, cowboy_1_0_4 }:
+          buildMix {
+            name = "httparrot";
+            version = "0.3.4";
+            src = fetchHex {
+              pkg = "httparrot";
+              version = "0.3.4";
+              sha256 =
+                "05dc3a30de92a5fc284c937339131c478d57b125cb3d65e97b99bc0fce3d3452";
+            };
+            beamDeps  = [ exjsx_3_2_0 cowboy_1_0_4 ];
+
+            meta = {
+              description = '' HTTP Request & Response Server. An incomplete
+                            clone of http://httpbin.org '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edgurgel/httparrot";
+            };
+          }
+      ) {};
+
+    httparrot = httparrot_0_3_4;
+
+    httpehaviour_0_9_0 = callPackage
+      (
+        {  buildMix, fetchHex, hackney_1_4_8 }:
+          buildMix {
+            name = "httpehaviour";
+            version = "0.9.0";
+            src = fetchHex {
+              pkg = "httpehaviour";
+              version = "0.9.0";
+              sha256 =
+                "54e93dcf0e62d392781078cf029478194797fe67c98dffe99a91b5d5ec33e4e5";
+            };
+            beamDeps  = [ hackney_1_4_8 ];
+
+            meta = {
+              description = ''Yet Yet Another HTTP client for Elixir powered by
+                            hackney'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edgurgel/httpehaviour";
+            };
+          }
+      ) {};
+
+    httpehaviour = httpehaviour_0_9_0;
+
+    httpoison_0_7_1 = callPackage
+      (
+        {  buildMix, fetchHex, hackney_1_3_2 }:
+          buildMix {
+            name = "httpoison";
+            version = "0.7.1";
+            src = fetchHex {
+              pkg = "httpoison";
+              version = "0.7.1";
+              sha256 =
+                "ad146f8a1e8cb81d50337ca62bd83a80fc1e3df768b93a9ed4c497c3a554c9b0";
+            };
+            beamDeps  = [ hackney_1_3_2 ];
+
+            meta = {
+              description = ''Yet Another HTTP client for Elixir powered by
+                            hackney'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edgurgel/httpoison";
+            };
+          }
+      ) {};
+
+    httpoison_0_7_5 = callPackage
+      (
+        {  buildMix, fetchHex, hackney_1_3_2 }:
+          buildMix {
+            name = "httpoison";
+            version = "0.7.5";
+            src = fetchHex {
+              pkg = "httpoison";
+              version = "0.7.5";
+              sha256 =
+                "a9b32452df3c4671c012953d6bb15e3a52bbb41b618f72cbd464e8c9320847c9";
+            };
+            beamDeps  = [ hackney_1_3_2 ];
+
+            meta = {
+              description = ''Yet Another HTTP client for Elixir powered by
+                            hackney'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edgurgel/httpoison";
+            };
+          }
+      ) {};
+
+    httpoison_0_8_0 = callPackage
+      (
+        {  buildMix, fetchHex, hackney_1_4_8 }:
+          buildMix {
+            name = "httpoison";
+            version = "0.8.0";
+            src = fetchHex {
+              pkg = "httpoison";
+              version = "0.8.0";
+              sha256 =
+                "7a6455689233867da40f285e9e3bcce506cd0c60b1094e1c449de76a46b9e50b";
+            };
+            beamDeps  = [ hackney_1_4_8 ];
+
+            meta = {
+              description = ''Yet Another HTTP client for Elixir powered by
+                            hackney'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edgurgel/httpoison";
+            };
+          }
+      ) {};
+
+    httpoison_0_8_1 = callPackage
+      (
+        {  buildMix, fetchHex, hackney_1_4_8 }:
+          buildMix {
+            name = "httpoison";
+            version = "0.8.1";
+            src = fetchHex {
+              pkg = "httpoison";
+              version = "0.8.1";
+              sha256 =
+                "b4cf6955675f86c77f939b10d29491632a1d227ce1dc4c4db759bc4a52cea600";
+            };
+            beamDeps  = [ hackney_1_4_8 ];
+
+            meta = {
+              description = ''Yet Another HTTP client for Elixir powered by
+                            hackney'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edgurgel/httpoison";
+            };
+          }
+      ) {};
+
+    httpoison = httpoison_0_8_1;
+
+    httpotion_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "httpotion";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "httpotion";
+              version = "1.0.0";
+              sha256 =
+                "1ff7af8a280928316ba43e15644b75eedd4481dcd56426beb6cad920b244b734";
+            };
+
+            meta = {
+              description = ''Fancy HTTP client for Elixir, based on
+                            ibrowse.'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/myfreeweb/httpotion";
+            };
+          }
+      ) {};
+
+    httpotion_2_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "httpotion";
+            version = "2.0.0";
+            src = fetchHex {
+              pkg = "httpotion";
+              version = "2.0.0";
+              sha256 =
+                "550c94a898f3f2f0bb5f45a18380df66c478fc05b899a1febd7fd3ca666b93c8";
+            };
+
+            meta = {
+              description = ''Fancy HTTP client for Elixir, based on
+                            ibrowse.'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/myfreeweb/httpotion";
+            };
+          }
+      ) {};
+
+    httpotion_2_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "httpotion";
+            version = "2.1.0";
+            src = fetchHex {
+              pkg = "httpotion";
+              version = "2.1.0";
+              sha256 =
+                "d34f1e82283b6b953f611dc24571aa2586e72e19d3d6632b8e3dba78cf1e3761";
+            };
+
+            meta = {
+              description = ''Fancy HTTP client for Elixir, based on
+                            ibrowse.'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/myfreeweb/httpotion";
+            };
+          }
+      ) {};
+
+    httpotion_2_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, ibrowse_4_2_2 }:
+          buildMix {
+            name = "httpotion";
+            version = "2.2.0";
+            src = fetchHex {
+              pkg = "httpotion";
+              version = "2.2.0";
+              sha256 =
+                "b5df0909f1cce248a021a1ba970053dbb59bd2695a188396bfc08b6bd73cbd77";
+            };
+            beamDeps  = [ ibrowse_4_2_2 ];
+
+            meta = {
+              description = ''Fancy HTTP client for Elixir, based on
+                            ibrowse.'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/myfreeweb/httpotion";
+            };
+          }
+      ) {};
+
+    httpotion = httpotion_2_2_0;
+
+    httprot_0_1_7 = callPackage
+      (
+        {  buildMix, fetchHex, socket_0_3_1 }:
+          buildMix {
+            name = "httprot";
+            version = "0.1.7";
+            src = fetchHex {
+              pkg = "httprot";
+              version = "0.1.7";
+              sha256 =
+                "3cf35411d7b16a9af13af4a569eeac09d3375f05ac86139f3448f87302719999";
+            };
+            beamDeps  = [ socket_0_3_1 ];
+
+            meta = {
+              description = ''HTTP client library'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/meh/httprot";
+            };
+          }
+      ) {};
+
+    httprot = httprot_0_1_7;
+
+    huami_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "huami";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "huami";
+              version = "0.0.1";
+              sha256 =
+                "c12f38e24e7b085422e5f57c991792cd5045bd083574b1cca0458d8f2dfae40d";
+            };
+
+            meta = {
+              description = ''A CLI version of flower password writing in
+                            Elixir. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/yesmeck/huami.ex";
+            };
+          }
+      ) {};
+
+    huami = huami_0_0_1;
+
+    huex_0_5_0 = callPackage
+      (
+        {  buildMix, fetchHex, json_0_3_3, httpoison_0_8_1 }:
+          buildMix {
+            name = "huex";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "huex";
+              version = "0.5.0";
+              sha256 =
+                "e5fe37fdc4299567922697516df8ade2f64d2c1573dc9a253e5037f66576858f";
+            };
+            beamDeps  = [ json_0_3_3 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Elixir client for Philips Hue connected light
+                            bulbs'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/xavier/huex";
+            };
+          }
+      ) {};
+
+    huex = huex_0_5_0;
+
+    hufflehoff_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "hufflehoff";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "hufflehoff";
+              version = "0.0.1";
+              sha256 =
+                "f10c6ffceb3b6d161ff5aa4dfeb8fe77affabf073f0bc7059d8296a4256093f2";
+            };
+
+            meta = {
+              description = ''A Huffman encoder/decoder for HTTP/2 headers.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sideshow/hufflehoff";
+            };
+          }
+      ) {};
+
+    hufflehoff = hufflehoff_0_0_1;
+
+    huffman_1_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "huffman";
+            version = "1.1.1";
+            src = fetchHex {
+              pkg = "huffman";
+              version = "1.1.1";
+              sha256 =
+                "6983b0eebb29e6f7b4e971cf46e04ebcf52f073ca97f7ed29b5c0de68d58c496";
+            };
+
+            meta = {
+              description = ''Huffman encoding and decoding.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/SenecaSystems/huffman";
+            };
+          }
+      ) {};
+
+    huffman = huffman_1_1_1;
+
+    hulaaki_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "hulaaki";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "hulaaki";
+              version = "0.0.2";
+              sha256 =
+                "d1bea8de565a4ca49f0e362c37597c3e8744b0323a7e9104cf09ac555e713ebe";
+            };
+
+            meta = {
+              description = ''An MQTT 3.1.1 client library written in
+                            Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/suvash/hulaaki";
+            };
+          }
+      ) {};
+
+    hulaaki = hulaaki_0_0_2;
+
+    hydra_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          porcelain_2_0_1,
+          poison_1_5_2,
+          plug_1_1_1,
+          httpoison_0_8_1,
+          cowboy_1_0_4
+        }:
+          buildMix {
+            name = "hydra";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "hydra";
+              version = "0.0.1";
+              sha256 =
+                "ea35ec756dfaa0390ba53a0313bb50b924517f746922a98e3489bddf8e066b7d";
+            };
+            beamDeps  = [
+                          porcelain_2_0_1
+                          poison_1_5_2
+                          plug_1_1_1
+                          httpoison_0_8_1
+                          cowboy_1_0_4
+                        ];
+
+            meta = {
+              description = ''A multi-headed beast: API gateway, request cache,
+                            and data transformations'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/doomspork/hydra";
+            };
+          }
+      ) {};
+
+    hydra = hydra_0_0_1;
+
+    hypermedia_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "hypermedia";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "hypermedia";
+              version = "0.0.1";
+              sha256 =
+                "595c174772c45206f293f61b338105e61d96dba1436b07ed5b3b12eb07842721";
+            };
+
+            meta = {
+              description = ''A Elixir library for creating HAL/JSON Hypermedia
+                            APIs'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jurriaan/hypermedia";
+            };
+          }
+      ) {};
+
+    hypermedia = hypermedia_0_0_1;
+
+    hypermock_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, meck_0_8_4 }:
+          buildMix {
+            name = "hypermock";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "hypermock";
+              version = "0.0.2";
+              sha256 =
+                "dbb7ad24f651a3bb99475f39f9b0d6b7e9b3f959d8a80577ea6c803a5b548516";
+            };
+            beamDeps  = [ meck_0_8_4 ];
+
+            meta = {    };
+          }
+      ) {};
+
+    hypermock = hypermock_0_0_2;
+
+    iam_role_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, jsone_1_2_0 }:
+          buildMix {
+            name = "iam_role";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "iam_role";
+              version = "1.0.0";
+              sha256 =
+                "acfc5d5c5130a36dfb2b460f790bd9e32bf39274f17333bd65c28d216983761d";
+            };
+            beamDeps  = [ jsone_1_2_0 ];
+
+            meta = {
+              description = ''Application for automatically fetching AWS IAM
+                            role security credentials.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tsharju/iam_role";
+            };
+          }
+      ) {};
+
+    iam_role = iam_role_1_0_0;
+
+    ibrowse_4_2_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "ibrowse";
+            version = "4.2.2";
+            src = fetchHex {
+              pkg = "ibrowse";
+              version = "4.2.2";
+              sha256 =
+                "b800cb7442bcc852c6832821e9d0a7098ff626e1415bddaeff4596640b31c0ae";
+            };
+
+            meta = {
+              description = ''Erlang HTTP client application'';
+              license = with stdenv.lib.licenses; [ free bsd3 ];
+              homepage = "https://github.com/cmullaparthi/ibrowse";
+            };
+          }
+      ) {};
+
+    ibrowse = ibrowse_4_2_2;
+
+    iconv_1_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "iconv";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "iconv";
+              version = "1.0.0";
+              sha256 =
+                "2ac0268bf0b392b86dca00b63d90595959ebc3dca6305284045592fa487e7204";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''Fast encoding conversion library for Erlang /
+                            Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/processone/iconv";
+            };
+          }
+      ) {};
+
+    iconv = iconv_1_0_0;
+
+    identicon_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "identicon";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "identicon";
+              version = "0.2.0";
+              sha256 =
+                "38b11bb3ed2c76956fcbf8673be8cbf6570ef8a85d92b51ce45304ed0368d88c";
+            };
+
+            meta = {
+              description = ''Elixir library for generating 5x5 symmetrical
+                            identicons'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/rbishop/identicon";
+            };
+          }
+      ) {};
+
+    identicon = identicon_0_2_0;
+
+    idna_1_0_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "idna";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "idna";
+              version = "1.0.2";
+              sha256 =
+                "a5d645e307aa4f67efe31682f720b7eaf431ab148b3d6fb66cbaf6314499610f";
+            };
+
+            meta = {
+              description = ''A pure Erlang IDNA implementation'';
+
+              homepage = "https://github.com/benoitc/erlang-idna";
+            };
+          }
+      ) {};
+
+    idna_1_0_3 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "idna";
+            version = "1.0.3";
+            src = fetchHex {
+              pkg = "idna";
+              version = "1.0.3";
+              sha256 =
+                "357d489a51112db4f216034406834f9172b3c0ff5a12f83fb28b25ca271541d1";
+            };
+
+            meta = {
+              description = ''A pure Erlang IDNA implementation'';
+
+              homepage = "https://github.com/benoitc/erlang-idna";
+            };
+          }
+      ) {};
+
+    idna = idna_1_0_3;
+
+    ielixir_0_9_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ielixir";
+            version = "0.9.0";
+            src = fetchHex {
+              pkg = "ielixir";
+              version = "0.9.0";
+              sha256 =
+                "a6cce07a3aeb493bd248f063ba0327e88103b64c0c54657e344dab1c6f568078";
+            };
+
+            meta = {
+              description = ''Jupyter`s kernel for Elixir programming
+                            language'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/pprzetacznik/ielixir";
+            };
+          }
+      ) {};
+
+    ielixir = ielixir_0_9_0;
+
+    ifttt_oauth_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, oauth2_0_5_0 }:
+          buildMix {
+            name = "ifttt_oauth";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ifttt_oauth";
+              version = "0.0.1";
+              sha256 =
+                "9029506687be770891b3fb54d9e39bab9dd0f65a9551c6b335a3b0a60dc3026c";
+            };
+            beamDeps  = [ oauth2_0_5_0 ];
+
+            meta = {
+              longDescription = ''A simple Elixir wrapper around
+                                scrogson/oauth2 to retrieve IFTTT Bearer tokens
+                                from their mobile api.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nickgal/ifttt_oauth";
+            };
+          }
+      ) {};
+
+    ifttt_oauth = ifttt_oauth_0_0_1;
+
+    imagineer_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex, apex_0_3_7 }:
+          buildMix {
+            name = "imagineer";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "imagineer";
+              version = "0.2.1";
+              sha256 =
+                "31a8430b89770fdd6ec9d96a6e3d9ea92296dfc57e98bb812cd376e60f2e70f8";
+            };
+            beamDeps  = [ apex_0_3_7 ];
+
+            meta = {
+              description = ''Image processing in Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/SenecaSystems/imagineer";
+            };
+          }
+      ) {};
+
+    imagineer = imagineer_0_2_1;
+
+    imgex_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "imgex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "imgex";
+              version = "0.1.0";
+              sha256 =
+                "783e78b0624b87d1431d8acaa790998ac75d8654312e5799eff7b12956246c49";
+            };
+
+            meta = {
+              description = ''Unofficial client library for generating imgix
+                            URLs in Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ianwalter/imgex";
+            };
+          }
+      ) {};
+
+    imgex = imgex_0_1_0;
+
+    immortal_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "immortal";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "immortal";
+              version = "0.2.0";
+              sha256 =
+                "4387bffa9e2c25b8bfed0bf9d80fd918861c6a4098b853138d2398d5b6f24be2";
+            };
+
+            meta = {
+              description = ''Helpers for fault-tolerant OTP applications'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/danielberkompas/immortal";
+            };
+          }
+      ) {};
+
+    immortal = immortal_0_2_0;
+
+    inaka_aleppo_0_9_9 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "inaka_aleppo";
+            version = "0.9.9";
+            src = fetchHex {
+              pkg = "inaka_aleppo";
+              version = "0.9.9";
+              sha256 =
+                "11c09648e42b5755a437319a12826c17344a162db73dd2880457b0fa3a1ce1ff";
+            };
+
+            meta = {
+              description = ''Aleppo: ALternative Erlang Pre-ProcessOr'';
+
+              homepage = "https://github.com/inaka/aleppo";
+            };
+          }
+      ) {};
+
+    inaka_aleppo = inaka_aleppo_0_9_9;
+
+    inaka_mixer_0_1_5 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "inaka_mixer";
+            version = "0.1.5";
+            src = fetchHex {
+              pkg = "inaka_mixer";
+              version = "0.1.5";
+              sha256 =
+                "37af35b1c17a94a0cb643cba23cba2ca68d6fe51c3ad8337629d4c3c017cc912";
+            };
+
+            meta = {
+              description = ''Mix in public functions from external modules'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/inaka/mixer";
+            };
+          }
+      ) {};
+
+    inaka_mixer = inaka_mixer_0_1_5;
+
+    inch_ex_0_5_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_0_3 }:
+          buildMix {
+            name = "inch_ex";
+            version = "0.5.1";
+            src = fetchHex {
+              pkg = "inch_ex";
+              version = "0.5.1";
+              sha256 =
+                "4d0aaefa4928fdc4758118a37dccb5b90805559ada3f652ca157f66ea268ea20";
+            };
+            beamDeps  = [ poison_1_0_3 ];
+
+            meta = {
+              description = ''Provides a Mix task that gives you hints where to
+                            improve your inline docs'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rrrene/inch_ex";
+            };
+          }
+      ) {};
+
+    inch_ex = inch_ex_0_5_1;
+
+    inch_test_0_0_1 = callPackage
+      (
+        {
+          buildMix, fetchHex, inch_ex_0_5_1, ex_doc_0_11_4, earmark_0_2_1
+        }:
+          buildMix {
+            name = "inch_test";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "inch_test";
+              version = "0.0.1";
+              sha256 =
+                "41405c11b22fad3f3b49127f881c2c4c79b206c04b8cb77268828380779a374d";
+            };
+            beamDeps  = [ inch_ex_0_5_1 ex_doc_0_11_4 earmark_0_2_1 ];
+
+            meta = {    };
+          }
+      ) {};
+
+    inch_test = inch_test_0_0_1;
+
+    indefinite_article_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "indefinite_article";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "indefinite_article";
+              version = "0.0.1";
+              sha256 =
+                "cb59d3373c5ff05693f74f445e7807d1fe5c38b9cfa6bcedfd9efedb4a0861ae";
+            };
+
+            meta = {
+              description = ''Returns you the indefinite article of a string
+                            (*a* banana, *an* apple, etc)'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/Buyapowa/indefinite_article";
+            };
+          }
+      ) {};
+
+    indefinite_article = indefinite_article_0_0_1;
+
+    inet_cidr_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "inet_cidr";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "inet_cidr";
+              version = "1.0.1";
+              sha256 =
+                "4809be88cf1a436b819acec2b07a33e7ad24beb0cf9b6c8a94217aea7d298d8a";
+            };
+
+            meta = {
+              longDescription = ''Classless Inter-Domain Routing (CIDR) library
+                                for Elixir Compatible with Erlang`s :inet module
+                                and support for IPv4 and IPv6'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/cobenian/inet_cidr";
+            };
+          }
+      ) {};
+
+    inet_cidr = inet_cidr_1_0_1;
+
+    inflex_0_2_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "inflex";
+            version = "0.2.3";
+            src = fetchHex {
+              pkg = "inflex";
+              version = "0.2.3";
+              sha256 =
+                "1acb28e23bfb8a38e07fbb764a2691a59fce5c499a79fd27e869a43495710e64";
+            };
+
+            meta = {
+              description = ''An Elixir library for handling word
+                            inflections.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/nurugger07/inflex";
+            };
+          }
+      ) {};
+
+    inflex_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "inflex";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "inflex";
+              version = "0.3.0";
+              sha256 =
+                "2cb9896a2572eb0989d92d7d98653829e079ccb804aa1b98beafff7678275852";
+            };
+
+            meta = {
+              description = ''An Elixir library for handling word
+                            inflections.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/nurugger07/inflex";
+            };
+          }
+      ) {};
+
+    inflex_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "inflex";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "inflex";
+              version = "1.0.0";
+              sha256 =
+                "549ebe94420051cdf845028372d1f89c8fbdd7b5f5ddd51e0619b827b7be6793";
+            };
+
+            meta = {
+              description = ''An Elixir library for handling word
+                            inflections.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/nurugger07/inflex";
+            };
+          }
+      ) {};
+
+    inflex_1_4_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "inflex";
+            version = "1.4.1";
+            src = fetchHex {
+              pkg = "inflex";
+              version = "1.4.1";
+              sha256 =
+                "d316fecd9db83db97828bbcbdb689f5c412e3aaf658329cf479cad5baa856c92";
+            };
+
+            meta = {
+              description = ''An Elixir library for handling word
+                            inflections.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/nurugger07/inflex";
+            };
+          }
+      ) {};
+
+    inflex_1_5_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "inflex";
+            version = "1.5.0";
+            src = fetchHex {
+              pkg = "inflex";
+              version = "1.5.0";
+              sha256 =
+                "d48609edc5bb7901b95dcc00c1e38f259e8006904865a028954ccfe9336a3384";
+            };
+
+            meta = {
+              description = ''An Elixir library for handling word
+                            inflections.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/nurugger07/inflex";
+            };
+          }
+      ) {};
+
+    inflex = inflex_1_5_0;
+
+    ini_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ini";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ini";
+              version = "0.0.1";
+              sha256 =
+                "96b86cf664ca8247cdad166c29251ef4ddc156f16f906bdf2ea1c37831fbf804";
+            };
+
+            meta = {
+              description = ''Module to parse ini files.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nathanjohnson320/ini";
+            };
+          }
+      ) {};
+
+    ini = ini_0_0_1;
+
+    inquisitor_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, ecto_2_0_0_beta_0 }:
+          buildMix {
+            name = "inquisitor";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "inquisitor";
+              version = "0.0.2";
+              sha256 =
+                "a4d6ed194db0600bad5a19b4efbdd900a0aa943ad79dc03a9a81aaba7ffd4d3d";
+            };
+            beamDeps  = [ ecto_2_0_0_beta_0 ];
+
+            meta = {
+              description = ''Easily build extendable and composable Ecto
+                            queries.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dockyard/inquisitor";
+            };
+          }
+      ) {};
+
+    inquisitor = inquisitor_0_0_2;
+
+    insert_ordered_set_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "insert_ordered_set";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "insert_ordered_set";
+              version = "0.0.1";
+              sha256 =
+                "78ebc47d780aa1e8fabce7d4f4d5f3b9c90e1443514ad830b32f7c5184f87634";
+            };
+
+            meta = {
+              longDescription = ''Provides a data structure with the following
+                                properties: 1. Contains unique values. 2. O(1)
+                                manipulation operations (e.g. insert, delete) by
+                                using an underlying Map. 3. Preserves insertion
+                                order when converting to a list. Allows reverse
+                                insertion ordering.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/localshred/insert_ordered_set";
+            };
+          }
+      ) {};
+
+    insert_ordered_set = insert_ordered_set_0_0_1;
+
+    insight_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "insight";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "insight";
+              version = "0.0.2";
+              sha256 =
+                "0088430e0a2826d7b52313d9c29af67712530b18a21a192d5e134f975f0596fe";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Elixir package for consuming any Insight-powered
+                            Bitcoin explorer.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/stampery/elixir-insight";
+            };
+          }
+      ) {};
+
+    insight = insight_0_0_2;
+
+    insights_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "insights";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "insights";
+              version = "0.0.2";
+              sha256 =
+                "92794ab7ba760a7b17ffac1f98ecff1a848148d15a1d9fabe58b0150767cddbd";
+            };
+
+            meta = {
+              longDescription = ''Insights is a wrapper for sending and data
+                                capture for keen.io or others adapters'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/gullitmiranda/insights";
+            };
+          }
+      ) {};
+
+    insights = insights_0_0_2;
+
+    instream_0_9_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, poolboy_1_5_1, poison_1_5_2, hackney_1_4_8
+        }:
+          buildMix {
+            name = "instream";
+            version = "0.9.0";
+            src = fetchHex {
+              pkg = "instream";
+              version = "0.9.0";
+              sha256 =
+                "e0413b68ca4a593ca11179e968c7c5f79d897a2435d5d40def68f6bc59d7a042";
+            };
+            beamDeps  = [ poolboy_1_5_1 poison_1_5_2 hackney_1_4_8 ];
+
+            meta = {
+              description = ''InfluxDB driver for Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/mneudert/instream";
+            };
+          }
+      ) {};
+
+    instream = instream_0_9_0;
+
+    instrumental_0_1_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "instrumental";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "instrumental";
+              version = "0.1.3";
+              sha256 =
+                "26d3c6dcd2b04d716266afa9d12ba193fc1f038d21c67178e50f77ef1671acec";
+            };
+
+            meta = {
+              description = ''An Elixir client for Instrumental
+                            (http://instrumentalapp.com).'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/undeadlabs/instrumental-ex";
+            };
+          }
+      ) {};
+
+    instrumental = instrumental_0_1_3;
+
+    intellij_elixir_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex, exrm_0_15_1 }:
+          buildMix {
+            name = "intellij_elixir";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "intellij_elixir";
+              version = "0.1.2";
+              sha256 =
+                "023e970e20ef19dbd6e818708c687faf9b47b525b9771bc910a4e48adc101a46";
+            };
+            beamDeps  = [ exrm_0_15_1 ];
+
+            meta = {
+              longDescription = ''IntellijElixir allows intellij-elixir to ask
+                                Elixir for the native quoted form of code to
+                                check that intellij-elixir`s quoted form
+                                matches. '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/KronicDeth/intellij_elixir";
+            };
+          }
+      ) {};
+
+    intellij_elixir = intellij_elixir_0_1_2;
+
+    iona_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex, porcelain_2_0_1, briefly_0_3_0 }:
+          buildMix {
+            name = "iona";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "iona";
+              version = "0.2.1";
+              sha256 =
+                "6c990a1a3dcf144f26d5ce773b4f4538c53ed259c775818991bd28f516317bd5";
+            };
+            beamDeps  = [ porcelain_2_0_1 briefly_0_3_0 ];
+
+            meta = {
+              description = ''Document generation using LaTeX'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/CargoSense/iona";
+            };
+          }
+      ) {};
+
+    iona = iona_0_2_1;
+
+    iplist_1_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, earmark_0_2_1, cidr_0_5_0 }:
+          buildMix {
+            name = "iplist";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "iplist";
+              version = "1.0.2";
+              sha256 =
+                "fae5b5accc8b7a7618c2d1fbf94607ce6e79ca3b493da6643dbb1bd92be30bd4";
+            };
+            beamDeps  = [ earmark_0_2_1 cidr_0_5_0 ];
+
+            meta = {
+              description = ''Library and CLI tool to expand IPv4 ranges to
+                            lists of IP numbers'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/digitalronin/iplist";
+            };
+          }
+      ) {};
+
+    iplist = iplist_1_0_2;
+
+    is_email_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "is_email";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "is_email";
+              version = "0.0.2";
+              sha256 =
+                "fefcf35b6ca506cd7d2e3d1d850b49e9a2545180db46e291845aa9fd54812d82";
+            };
+
+            meta = {
+              description = ''Loosely check whether a given string is an
+                            email'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/johnotander/is_email";
+            };
+          }
+      ) {};
+
+    is_email = is_email_0_0_2;
+
+    is_up_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, httpotion_2_1_0 }:
+          buildMix {
+            name = "is_up";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "is_up";
+              version = "1.0.0";
+              sha256 =
+                "8811dde26c0142174987941b6395e1934e54c3a88db1d5b19e38b6f794e93c87";
+            };
+            beamDeps  = [ httpotion_2_1_0 ];
+
+            meta = {
+              description = ''Check whether a given url is up.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/johnotander/is_up";
+            };
+          }
+      ) {};
+
+    is_up = is_up_1_0_0;
+
+    is_url_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "is_url";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "is_url";
+              version = "0.0.1";
+              sha256 =
+                "4c3f86302e0c675ece51a247838f64ce88335008035463c8c20b21667399d413";
+            };
+
+            meta = {
+              description = ''Validate a url'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/johnotander/is_url";
+            };
+          }
+      ) {};
+
+    is_url = is_url_0_0_1;
+
+    isaac_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "isaac";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "isaac";
+              version = "0.0.1";
+              sha256 =
+                "e43c136931b8003def7cf8a9eaa49e9713ab91a76729c667591e0a4c03511fa1";
+            };
+
+            meta = {
+              longDescription = ''Isaac is an elixir module for the [ISAAC
+                                Stream
+                                Cipher](http://burtleburtle.net/bob/rand/isaacafa.html)
+                                It wraps around https://github.com/arianvp/ISAAC
+                                which is a port of the ISAAC stream cipher to
+                                platforms which have words bigger than 32 bits.
+                                '';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/arianvp/elixir-isaac";
+            };
+          }
+      ) {};
+
+    isaac = isaac_0_0_1;
+
+    isbndbex_0_0_1 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1, credo_0_1_10
+        }:
+          buildMix {
+            name = "isbndbex";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "isbndbex";
+              version = "0.0.1";
+              sha256 =
+                "565fe2ea413d0ec50d51c166ad1dd5dc840c3cdb01e70467484017aa6b14d1f9";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 credo_0_1_10 ];
+
+            meta = {
+              description = ''Elixir wrapper for isbndb.com json api.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rcoedo/isbndbex";
+            };
+          }
+      ) {};
+
+    isbndbex = isbndbex_0_0_1;
+
+    isn_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, postgrex_0_11_1, ecto_2_0_0_beta_0 }:
+          buildMix {
+            name = "isn";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "isn";
+              version = "1.0.0";
+              sha256 =
+                "08fe62a8fa20333f65e750d7e4abe8c2f215994e514e495178fa718b5a4e3673";
+            };
+            beamDeps  = [ postgrex_0_11_1 ecto_2_0_0_beta_0 ];
+
+            meta = {
+              description = ''Ecto types for the postgreSQL isn extension.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/Frost/isn";
+            };
+          }
+      ) {};
+
+    isn = isn_1_0_0;
+
+    iso3166_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, floki_0_7_1 }:
+          buildMix {
+            name = "iso3166";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "iso3166";
+              version = "0.0.2";
+              sha256 =
+                "c36a652871f31d4b50b4ebd75e99094a1cf9ad7d3df9ddd467b94c2b4dbf9466";
+            };
+            beamDeps  = [ poison_1_5_2 floki_0_7_1 ];
+
+            meta = {
+              longDescription = ''A library that provides a list of ISO3166
+                                country names, two letter abbreviations, three
+                                letter abbreviations, and functions for
+                                converting between them.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/joelpm/iso3166ex";
+            };
+          }
+      ) {};
+
+    iso3166 = iso3166_0_0_2;
+
+    ja_serializer_0_7_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          scrivener_1_1_2,
+          poison_1_5_2,
+          plug_1_1_1,
+          inflex_1_5_0,
+          ecto_2_0_0_beta_0
+        }:
+          buildMix {
+            name = "ja_serializer";
+            version = "0.7.1";
+            src = fetchHex {
+              pkg = "ja_serializer";
+              version = "0.7.1";
+              sha256 =
+                "3f85203b1dd2e1c501ac41d45e9213a659e67c00ebacbe1b3e5b042c50f226ea";
+            };
+            beamDeps  = [
+                          scrivener_1_1_2
+                          poison_1_5_2
+                          plug_1_1_1
+                          inflex_1_5_0
+                          ecto_2_0_0_beta_0
+                        ];
+
+            meta = {
+              longDescription = ''A serialization library implementing the
+                                jsonapi.org 1.0 spec suitable for use building
+                                JSON APIs in Pheonix, Relax, or any other plug
+                                based framework/library.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/AgilionApps/ja_serializer";
+            };
+          }
+      ) {};
+
+    ja_serializer = ja_serializer_0_7_1;
+
+    janrain_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1 }:
+          buildMix {
+            name = "janrain";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "janrain";
+              version = "0.0.1";
+              sha256 =
+                "35299ee088dfd5647e7a5cd129d5011f2d6319fe53045b2a8ce3ddf70792cc78";
+            };
+            beamDeps  = [ httpoison_0_8_1 ];
+
+            meta = {
+              longDescription = ''A small library to help with Janrain logins.
+                                Probably most useful when used in conjuction
+                                with Phoenix and Guardian.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rickr/janrain";
+            };
+          }
+      ) {};
+
+    janrain = janrain_0_0_1;
+
+    japanese_holiday_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, timex_0_12_9 }:
+          buildMix {
+            name = "japanese_holiday";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "japanese_holiday";
+              version = "0.0.2";
+              sha256 =
+                "3363e2062dbdad48de88d092c549e8b55eecc2d86a61168578e54e6ba9065eaf";
+            };
+            beamDeps  = [ timex_0_12_9 ];
+
+            meta = {
+              description = ''An elixir library for japanese holiday '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Joe-noh/japanese_holiday";
+            };
+          }
+      ) {};
+
+    japanese_holiday = japanese_holiday_0_0_2;
+
+    jazz_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "jazz";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "jazz";
+              version = "0.1.1";
+              sha256 =
+                "e348e93a07c449789d17ddddd11cba080ef43132affdd1a287765f3e307ecd1c";
+            };
+
+            meta = {
+              description = ''JSON handling library for Elixir.'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/meh/jazz";
+            };
+          }
+      ) {};
+
+    jazz_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "jazz";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "jazz";
+              version = "0.2.1";
+              sha256 =
+                "1c239947305efba0f3e48786a815fd512d49af4acf61914c03ebb18cc79c0477";
+            };
+
+            meta = {
+              description = ''JSON handling library for Elixir.'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/meh/jazz";
+            };
+          }
+      ) {};
+
+    jazz = jazz_0_2_1;
+
+    jc_1_0_4 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "jc";
+            version = "1.0.4";
+            src = fetchHex {
+              pkg = "jc";
+              version = "1.0.4";
+              sha256 =
+                "8bcfe202084109fc80fcf521e630466fc53cbb909aff4283bed43252664023df";
+            };
+
+            meta = {
+              description = ''A simple, distributed, in-memory caching
+                            system'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jr0senblum/jc";
+            };
+          }
+      ) {};
+
+    jc = jc_1_0_4;
+
+    jequalson_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "jequalson";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "jequalson";
+              version = "0.1.1";
+              sha256 =
+                "5ed0a54b8aaa457cb441b3baafc508d8be4fc90db29a0cc27980eeeb65db18ac";
+            };
+
+            meta = {
+              description = ''Helpers for testing JSON responses.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dm1try/jequalson";
+            };
+          }
+      ) {};
+
+    jequalson = jequalson_0_1_1;
+
+    jesse_0_1_3 = callPackage
+      (
+        {  buildRebar3, fetchHex, jsx_2_8_0 }:
+          buildRebar3 {
+            name = "jesse";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "jesse";
+              version = "0.1.3";
+              sha256 =
+                "679702baf154d8e078c60b8eb4f2b7f53304e24deea03b32cbff350772afba4d";
+            };
+
+            beamDeps  = [ jsx_2_8_0 ];
+
+            meta = {
+              description = ''jesse'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/for-GET/jesse";
+            };
+          }
+      ) {};
+
+    jesse = jesse_0_1_3;
+
+    jiffy_0_14_7 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "jiffy";
+            version = "0.14.7";
+            src = fetchHex {
+              pkg = "jiffy";
+              version = "0.14.7";
+              sha256 =
+                "2b3b0f7976dae9c8266036e0d7e0398b64ac5207e3beee4c57896e44b2c17e97";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''JSON Decoder/Encoder.'';
+              license = with stdenv.lib.licenses; [ mit bsd3 ];
+              homepage = "https://github.com/davisp/jiffy";
+            };
+          }
+      ) {};
+
+    jiffy = jiffy_0_14_7;
+
+    jira_0_0_8 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_1 }:
+          buildMix {
+            name = "jira";
+            version = "0.0.8";
+            src = fetchHex {
+              pkg = "jira";
+              version = "0.0.8";
+              sha256 =
+                "71c19ef23ea7351a2dc7b8f14d0c5794ff00382fa43a88a2235ec9c1741a73cb";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''An Elixir client library for JIRA + JIRA Agile /
+                            Greenhopper'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jeffweiss/jira";
+            };
+          }
+      ) {};
+
+    jira = jira_0_0_8;
+
+    jobspool_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, uuid_1_1_3 }:
+          buildMix {
+            name = "jobspool";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "jobspool";
+              version = "0.1.0";
+              sha256 =
+                "f4ba59374f844fe8ac018606748b120b7860c0f568364514d1dc87eb42829aad";
+            };
+            beamDeps  = [ uuid_1_1_3 ];
+
+            meta = {
+              description = ''Simple Elixir jobs pool'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/flupke/exjobspool";
+            };
+          }
+      ) {};
+
+    jobspool = jobspool_0_1_0;
+
+    joken_0_13_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "joken";
+            version = "0.13.1";
+            src = fetchHex {
+              pkg = "joken";
+              version = "0.13.1";
+              sha256 =
+                "f9fd7803403651c891332aabc1f97ca87ad8f01be1262d5a9a51da7987e08163";
+            };
+
+            meta = {
+              description = ''JWT Library for Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/bryanjos/joken";
+            };
+          }
+      ) {};
+
+    joken_0_16_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_1, jose_1_6_1 }:
+          buildMix {
+            name = "joken";
+            version = "0.16.1";
+            src = fetchHex {
+              pkg = "joken";
+              version = "0.16.1";
+              sha256 =
+                "a804bfd350f61688f6ce8d9898bc17fd4b59990c054debeea44234d53048d93d";
+            };
+            beamDeps  = [ poison_1_5_2 plug_1_1_1 jose_1_6_1 ];
+
+            meta = {
+              description = ''JWT Library for Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/bryanjos/joken";
+            };
+          }
+      ) {};
+
+    joken_1_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_0_3, plug_1_1_1, jose_1_6_1 }:
+          buildMix {
+            name = "joken";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "joken";
+              version = "1.1.0";
+              sha256 =
+                "05e3ff0799b97b8513a5a17a8f57b1d7ee250f32561e559c997c0ecbea462287";
+            };
+            beamDeps  = [ poison_1_0_3 plug_1_1_1 jose_1_6_1 ];
+
+            meta = {
+              description = ''JWT Library for Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/bryanjos/joken";
+            };
+          }
+      ) {};
+
+    joken = joken_1_1_0;
+
+    jolt_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "jolt";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "jolt";
+              version = "0.1.0";
+              sha256 =
+                "922498b234a1b0a813255d3abf5caa64a9afdc41eb4d8d71f87d71c41fe792e8";
+            };
+            beamDeps  = [ poison_1_5_2 plug_1_1_1 cowboy_1_0_4 ];
+
+            meta = {
+              longDescription = ''A full REST JSON API with zero coding,
+                                powered by Elixir. It is intended to be used as
+                                a command-line tool (just run mix escript.build
+                                first).'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/clarkware/jolt";
+            };
+          }
+      ) {};
+
+    jolt = jolt_0_1_0;
+
+    jorel_mix_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "jorel_mix";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "jorel_mix";
+              version = "0.0.1";
+              sha256 =
+                "be990099dc7d13dd22e741d96dd3282ba9096f9e132c047ebc0f134b3d470461";
+            };
+
+            meta = {
+              description = ''Just anOther RELease assembler'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/emedia-project/jorel_mix";
+            };
+          }
+      ) {};
+
+    jorel_mix = jorel_mix_0_0_1;
+
+    jose_1_6_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, base64url_0_0_1 }:
+          buildRebar3 {
+            name = "jose";
+            version = "1.6.1";
+            src = fetchHex {
+              pkg = "jose";
+              version = "1.6.1";
+              sha256 =
+                "36f1875790af6a1353a737fa13c6ba1f5356f1bd569341ac035eeaa22be23ac9";
+            };
+
+            beamDeps  = [ base64url_0_0_1 ];
+
+            meta = {
+              description = ''JSON Object Signing and Encryption (JOSE) for
+                            Erlang and Elixir.'';
+              license = stdenv.lib.licenses.mpl20;
+              homepage = "https://github.com/potatosalad/erlang-jose";
+            };
+          }
+      ) {};
+
+    jose = jose_1_6_1;
+
+    jsex_2_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, jsx_2_8_0 }:
+          buildMix {
+            name = "jsex";
+            version = "2.0.0";
+            src = fetchHex {
+              pkg = "jsex";
+              version = "2.0.0";
+              sha256 =
+                "98c1501645e31efdbcbb6172983d4deb1335de993966197e6a4343492fa7d872";
+            };
+            beamDeps  = [ jsx_2_8_0 ];
+
+            meta = {
+              description = ''json for elixir '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/talentdeficit/jsex";
+            };
+          }
+      ) {};
+
+    jsex = jsex_2_0_0;
+
+    json_0_3_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "json";
+            version = "0.3.3";
+            src = fetchHex {
+              pkg = "json";
+              version = "0.3.3";
+              sha256 =
+                "d1986548847189b51f1efb65d196e6ab9f2e88a6878a363aec0e3c77e2550616";
+            };
+
+            meta = {
+              description = ''Native Elixir library for JSON encoding and
+                            decoding'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/cblage/elixir-json";
+            };
+          }
+      ) {};
+
+    json = json_0_3_3;
+
+    json_diff_ex_0_5_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "json_diff_ex";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "json_diff_ex";
+              version = "0.5.0";
+              sha256 =
+                "314fe606c76dea0c5b70ca918f5dd75a89456c6330596d707bbbf70c800352c9";
+            };
+
+            meta = {
+              description = ''Diff and patch for JSON in Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/olafura/json_diff_ex";
+            };
+          }
+      ) {};
+
+    json_diff_ex = json_diff_ex_0_5_0;
+
+    json_logger_0_5_1 = callPackage
+      (
+        {  buildMix, fetchHex, json_0_3_3 }:
+          buildMix {
+            name = "json_logger";
+            version = "0.5.1";
+            src = fetchHex {
+              pkg = "json_logger";
+              version = "0.5.1";
+              sha256 =
+                "08b4868fe8396fc27fc2d248a8aedac72f8ca82a671a163cc575bfa3e8a2be93";
+            };
+            beamDeps  = [ json_0_3_3 ];
+
+            meta = {
+              description = ''A simple library for logging with JSON, best
+                            suited with Logstash.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/LeeroyDing/json_logger";
+            };
+          }
+      ) {};
+
+    json_logger = json_logger_0_5_1;
+
+    json_pointer_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "json_pointer";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "json_pointer";
+              version = "0.0.2";
+              sha256 =
+                "150b37bc4ff689758f17aee180fbf8f7226c3eeff7d28a782e6f0a74f859417e";
+            };
+
+            meta = {
+              longDescription = ''Implementation of RFC 6901 which defines a
+                                string syntax for identifying a specific value
+                                within a JSON document'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/xavier/json_pointer";
+            };
+          }
+      ) {};
+
+    json_pointer = json_pointer_0_0_2;
+
+    json_web_token_0_2_4 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2 }:
+          buildMix {
+            name = "json_web_token";
+            version = "0.2.4";
+            src = fetchHex {
+              pkg = "json_web_token";
+              version = "0.2.4";
+              sha256 =
+                "49d11e61cf31e212ccd80bcffe1b9c911144c2399ec062a514394376d037fa8a";
+            };
+            beamDeps  = [ poison_1_5_2 ];
+
+            meta = {
+              description = ''Elixir implementation of the JSON Web Token
+                            (JWT), RFC 7519'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/garyf/json_web_token_ex";
+            };
+          }
+      ) {};
+
+    json_web_token = json_web_token_0_2_4;
+
+    jsonapi_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1 }:
+          buildMix {
+            name = "jsonapi";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "jsonapi";
+              version = "0.1.0";
+              sha256 =
+                "b4c7d4797a680f23ae8dae666b4e71573f0bb3330223ebb53985e754ade265c8";
+            };
+            beamDeps  = [ plug_1_1_1 ];
+
+            meta = {
+              longDescription = ''Fully functional JSONAPI V1 Serializer as
+                                well as a QueryParser for Plug bases projects
+                                and applications.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jeregrine/jsonapi";
+            };
+          }
+      ) {};
+
+    jsonapi = jsonapi_0_1_0;
+
+    jsone_1_2_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "jsone";
+            version = "1.2.0";
+            src = fetchHex {
+              pkg = "jsone";
+              version = "1.2.0";
+              sha256 =
+                "a60e74284d3a923cde65c00a39dd4542fd7da7c22e8385c0378ad419c54b2e08";
+            };
+
+            meta = {
+              description = ''Erlang JSON Library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sile/jsone";
+            };
+          }
+      ) {};
+
+    jsone = jsone_1_2_0;
+
+    jsx_1_4_5 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "jsx";
+            version = "1.4.5";
+            src = fetchHex {
+              pkg = "jsx";
+              version = "1.4.5";
+              sha256 =
+                "ff5115611c5dd789cebe3addc07d18b86340f701c52ad063caba6fe8da3a489b";
+            };
+
+            meta = {
+              longDescription = ''an erlang application for consuming,
+                                producing and manipulating json. inspired by
+                                yajl'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/talentdeficit/jsx";
+            };
+          }
+      ) {};
+
+    jsx_2_4_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "jsx";
+            version = "2.4.0";
+            src = fetchHex {
+              pkg = "jsx";
+              version = "2.4.0";
+              sha256 =
+                "f9044993bfc94371a7757656ab4b9ba2daaad3ddc97df37c2368875eea049b19";
+            };
+
+            meta = {
+              longDescription = ''an erlang application for consuming,
+                                producing and manipulating json. inspired by
+                                yajl'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/talentdeficit/jsx";
+            };
+          }
+      ) {};
+
+    jsx_2_6_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "jsx";
+            version = "2.6.1";
+            src = fetchHex {
+              pkg = "jsx";
+              version = "2.6.1";
+              sha256 =
+                "5d0700bce9b5ef7c4bd5dd1004c9cc80d20a60f1bd02f8792fc3b3b2da90db59";
+            };
+
+            meta = {
+              longDescription = ''an erlang application for consuming,
+                                producing and manipulating json. inspired by
+                                yajl'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/talentdeficit/jsx";
+            };
+          }
+      ) {};
+
+    jsx_2_6_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "jsx";
+            version = "2.6.2";
+            src = fetchHex {
+              pkg = "jsx";
+              version = "2.6.2";
+              sha256 =
+                "6bfccb6461cc3c7d5cc63f3e69ffeb2f1f8de50eca5980065311c056a69a907f";
+            };
+
+            meta = {
+              longDescription = ''an erlang application for consuming,
+                                producing and manipulating json. inspired by
+                                yajl'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/talentdeficit/jsx";
+            };
+          }
+      ) {};
+
+    jsx_2_7_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "jsx";
+            version = "2.7.1";
+            src = fetchHex {
+              pkg = "jsx";
+              version = "2.7.1";
+              sha256 =
+                "52d0e8bda0c8624bc59c3119236eb49bb66289702ea3d59ad76fd2a56cdf9089";
+            };
+
+            meta = {
+              longDescription = ''an erlang application for consuming,
+                                producing and manipulating json. inspired by
+                                yajl'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/talentdeficit/jsx";
+            };
+          }
+      ) {};
+
+    jsx_2_8_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "jsx";
+            version = "2.8.0";
+            src = fetchHex {
+              pkg = "jsx";
+              version = "2.8.0";
+              sha256 =
+                "a8ba15d5bac2c48b2be1224a0542ad794538d79e2cc16841a4e24ca75f0f8378";
+            };
+
+            meta = {
+              longDescription = ''an erlang application for consuming,
+                                producing and manipulating json. inspired by
+                                yajl'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/talentdeficit/jsx";
+            };
+          }
+      ) {};
+
+    jsx = jsx_2_8_0;
+
+    jsxd_0_1_10 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "jsxd";
+            version = "0.1.10";
+            src = fetchHex {
+              pkg = "jsxd";
+              version = "0.1.10";
+              sha256 =
+                "f71a8238f08a1dee130e8959ff5343524891fa6531392667a5b911cead5f5082";
+            };
+
+            meta = {
+              description = ''jsx data structire traversing and modification
+                            library.'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/Licenser/jsxd";
+            };
+          }
+      ) {};
+
+    jsxd = jsxd_0_1_10;
+
+    jsxn_0_2_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, jsx_2_8_0 }:
+          buildRebar3 {
+            name = "jsxn";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "jsxn";
+              version = "0.2.1";
+              sha256 =
+                "122a52538dc34ddf4a6efcaeb9744fc948d132f3608e96f109a0d1a054fd1f57";
+            };
+
+            beamDeps  = [ jsx_2_8_0 ];
+
+            meta = {
+              description = ''jsx but with maps'';
+
+              homepage = "https://github.com/talentdeficit/jsxn";
+            };
+          }
+      ) {};
+
+    jsxn = jsxn_0_2_1;
+
+    junit_formatter_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "junit_formatter";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "junit_formatter";
+              version = "0.1.2";
+              sha256 =
+                "1bfd13c71b116541b46ca1b9c07fb82483da9acaaad706e277e4b08e2b198316";
+            };
+
+            meta = {
+              longDescription = ''An ExUnit.Formatter that produces an XML
+                                report of the tests run in the project _build
+                                dir. It is a good fit with Jenkins test
+                                reporting plugin, for example.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/victorolinasc/junit-formatter";
+            };
+          }
+      ) {};
+
+    junit_formatter = junit_formatter_0_1_2;
+
+    jwalk_1_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "jwalk";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "jwalk";
+              version = "1.1.0";
+              sha256 =
+                "10c150910ba3539583887cb2b5c3f70d602138471e6f6b5c22498aa18ed654e1";
+            };
+
+            meta = {
+              longDescription = ''Helper module for working with Erlang
+                                representations of JSON, handling eep-18, map,
+                                mochijson-style and proplists representations'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jr0senblum/jwalk";
+            };
+          }
+      ) {};
+
+    jwalk = jwalk_1_1_0;
+
+    jwt_0_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, jsx_2_8_0, base64url_0_0_1 }:
+          buildRebar3 {
+            name = "jwt";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "jwt";
+              version = "0.1.1";
+              sha256 =
+                "abcff4a2a42af2b7b7bdf55eeb2b73ce2e3bef760750004e74bc5835d64d2188";
+            };
+
+            beamDeps  = [ jsx_2_8_0 base64url_0_0_1 ];
+
+            meta = {
+              description = ''Erlang JWT library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/artemeff/jwt";
+            };
+          }
+      ) {};
+
+    jwt = jwt_0_1_1;
+
+    jwt_claims_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, json_web_token_0_2_4 }:
+          buildMix {
+            name = "jwt_claims";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "jwt_claims";
+              version = "0.0.3";
+              sha256 =
+                "baf94583907a4d774079a8a98c13c0cf5d306ee6211e805f156523a20658e230";
+            };
+            beamDeps  = [ json_web_token_0_2_4 ];
+
+            meta = {
+              description = ''Elixir implementation of JWT registered claims,
+                            RFC 7519'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/garyf/jwt_claims_ex";
+            };
+          }
+      ) {};
+
+    jwt_claims = jwt_claims_0_0_3;
+
+    jwtex_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_3_1 }:
+          buildMix {
+            name = "jwtex";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "jwtex";
+              version = "0.0.1";
+              sha256 =
+                "5b8b826e8543e323f62a0e8cb2fb5714d8e7110ecce97419cd0a4a656fa411cf";
+            };
+            beamDeps  = [ poison_1_3_1 ];
+
+            meta = {
+              description = ''JWT decoding library for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "http://github.com/mschae/jwtex";
+            };
+          }
+      ) {};
+
+    jwtex = jwtex_0_0_1;
+
+    kafka_ex_0_4_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "kafka_ex";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "kafka_ex";
+              version = "0.4.0";
+              sha256 =
+                "93355c6acb4d11b000ced332da9ac91dad1ed0468e9f240b040869a0cde5d71a";
+            };
+
+            meta = {
+              description = ''Kafka client for Elixir/Erlang.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/kafkaex/kafka_ex";
+            };
+          }
+      ) {};
+
+    kafka_ex = kafka_ex_0_4_0;
+
+    kaguya_0_3_7 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "kaguya";
+            version = "0.3.7";
+            src = fetchHex {
+              pkg = "kaguya";
+              version = "0.3.7";
+              sha256 =
+                "eced5d988fb5bc868e09402c2dd1f6cc67e60d9f07af2d263aada831021f0d84";
+            };
+
+            meta = {
+              longDescription = ''A small, powerful, and modular IRC bot
+                                framework. Using a flexible macro based routing
+                                system, modules can be easily created and
+                                used.'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/Luminarys/Kaguya";
+            };
+          }
+      ) {};
+
+    kaguya = kaguya_0_3_7;
+
+    kalecto_0_3_3 = callPackage
+      (
+        {  buildRebar3, fetchHex, kalends_0_6_5, ecto_0_16_0 }:
+          buildRebar3 {
+            name = "kalecto";
+            version = "0.3.3";
+            src = fetchHex {
+              pkg = "kalecto";
+              version = "0.3.3";
+              sha256 =
+                "c83d417718f626eb43ffa5527ea25fa5348f6f24f7930d27db7556759094eb1b";
+            };
+
+            beamDeps  = [ kalends_0_6_5 ecto_0_16_0 ];
+
+            meta = {
+              longDescription = ''Library for using Kalends with Ecto. This
+                                lets you save Kalends types in Ecto and work
+                                with date-times in multiple timezones. '';
+
+              homepage = "https://github.com/lau/kalecto";
+            };
+          }
+      ) {};
+
+    kalecto = kalecto_0_3_3;
+
+    kalends_0_6_5 = callPackage
+      (
+        {  buildRebar3, fetchHex, tzdata_0_1_8 }:
+          buildRebar3 {
+            name = "kalends";
+            version = "0.6.5";
+            src = fetchHex {
+              pkg = "kalends";
+              version = "0.6.5";
+              sha256 =
+                "b16621edbccdbe5d3f76efe03dab59292f3782d0d7e29bbe2de9943e49968fe2";
+            };
+
+            beamDeps  = [ tzdata_0_1_8 ];
+
+            meta = {
+              longDescription = ''Kalends is a datetime library in pure Elixir
+                                with up-to-date timezone support using the Olson
+                                database. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lau/kalends";
+            };
+          }
+      ) {};
+
+    kalends = kalends_0_6_5;
+
+    kane_0_0_5 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1, goth_0_0_3
+        }:
+          buildMix {
+            name = "kane";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "kane";
+              version = "0.0.5";
+              sha256 =
+                "e4865178b16793d4f947dee2f21448b3639fad2b1edeb515df67707cf30dc2c3";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 goth_0_0_3 ];
+
+            meta = {
+              longDescription = ''A library for interacting with Google Cloud
+                                Pub/Sub (PubSub). Supports both publication and
+                                pull subscription'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/peburrows/kane";
+            };
+          }
+      ) {};
+
+    kane = kane_0_0_5;
+
+    katipo_0_2_4 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          uri_0_1_0,
+          quintana_0_2_0,
+          gproc_0_5_0,
+          cowlib_1_0_0
+        }:
+          buildRebar3 {
+            name = "katipo";
+            version = "0.2.4";
+            src = fetchHex {
+              pkg = "katipo";
+              version = "0.2.4";
+              sha256 =
+                "7ad315785b1e43a78c9d5912469401ab5fa396182acf1ab40feea39539a53d1e";
+            };
+            compilePorts = true;
+            beamDeps  = [ uri_0_1_0 quintana_0_2_0 gproc_0_5_0 cowlib_1_0_0
+                      ];
+
+            meta = {
+              description = ''HTTP client based on libcurl'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/puzza007/katipo";
+            };
+          }
+      ) {};
+
+    katipo = katipo_0_2_4;
+
+    keccakf1600_2_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "keccakf1600";
+            version = "2.0.0";
+            src = fetchHex {
+              pkg = "keccakf1600";
+              version = "2.0.0";
+              sha256 =
+                "bf381475f5d1daf1df2f46bf24d1d4b91debb638b5a6b014cdce40e32eee8f07";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''Keccak-f[1600] asynchronous port driver'';
+              license = stdenv.lib.licenses.mpl20;
+              homepage = "https://github.com/potatosalad/erlang-keccakf1600";
+            };
+          }
+      ) {};
+
+    keccakf1600 = keccakf1600_2_0_0;
+
+    keelless_0_1_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1, hackney_1_4_4
+        }:
+          buildMix {
+            name = "keelless";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "keelless";
+              version = "0.1.0";
+              sha256 =
+                "b038600bb0520975a052fe6852a2dcd0dbd1069309134c617519079037d6927e";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 hackney_1_4_4 ];
+
+            meta = {
+              description = ''Keen IO API for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/hpyhacking/keelless";
+            };
+          }
+      ) {};
+
+    keelless = keelless_0_1_0;
+
+    keenex_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_3_1, httpotion_1_0_0 }:
+          buildMix {
+            name = "keenex";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "keenex";
+              version = "0.2.0";
+              sha256 =
+                "5f66d942fe7066bec625985779d7e69647462e586a704e449cc7229ea752ccb9";
+            };
+            beamDeps  = [ poison_1_3_1 httpotion_1_0_0 ];
+
+            meta = {
+              description = ''Keen.io API Client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bryanjos/keenex";
+            };
+          }
+      ) {};
+
+    keenex = keenex_0_2_0;
+
+    key2value_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "key2value";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "key2value";
+              version = "1.5.1";
+              sha256 =
+                "2a40464b9f8ef62e8828d869ac8d2bf9135b4956d29ba4eb044e8522b2d35ffa";
+            };
+
+            meta = {
+              description = ''Erlang 2-way Map'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/key2value";
+            };
+          }
+      ) {};
+
+    key2value = key2value_1_5_1;
+
+    keys1value_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "keys1value";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "keys1value";
+              version = "1.5.1";
+              sha256 =
+                "2385132be0903c170fe21e54a0c3e746a604777b66ee458bb6e5f25650d3354f";
+            };
+
+            meta = {
+              description = ''Erlang Set Associative Map For Key Lists'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/keys1value";
+            };
+          }
+      ) {};
+
+    keys1value = keys1value_1_5_1;
+
+    kindred_0_0_1 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_2_0_1, httpoison_0_8_1, ex_rated_1_2_1
+        }:
+          buildMix {
+            name = "kindred";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "kindred";
+              version = "0.0.1";
+              sha256 =
+                "48b229e007f3d6d06e38f49c85598c20fb6e76d92afd441a86fdee931c2f5fc2";
+            };
+            beamDeps  = [ poison_2_0_1 httpoison_0_8_1 ex_rated_1_2_1 ];
+
+            meta = {
+              description = ''League of Legends API client written in Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/matthewferderber/kindred";
+            };
+          }
+      ) {};
+
+    kindred = kindred_0_0_1;
+
+    kitsune_0_5_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2 }:
+          buildMix {
+            name = "kitsune";
+            version = "0.5.2";
+            src = fetchHex {
+              pkg = "kitsune";
+              version = "0.5.2";
+              sha256 =
+                "f8d48f1f3abe89aa9df7b37bc59c9bfa5932142d076d5322f97e92ec732bf993";
+            };
+            beamDeps  = [ poison_1_5_2 ];
+
+            meta = {
+              longDescription = ''Kitsune is an Elixir library for transforming
+                                the representation of data inspired by
+                                Representable.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edubkendo/kitsune";
+            };
+          }
+      ) {};
+
+    kitsune = kitsune_0_5_2;
+
+    kovacs_0_9_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "kovacs";
+            version = "0.9.2";
+            src = fetchHex {
+              pkg = "kovacs";
+              version = "0.9.2";
+              sha256 =
+                "0d6fc6830f0d22e793b2472d8808e86384596e26b7bdd17becba3af7f0a8495e";
+            };
+
+            meta = {
+              longDescription = ''Kovacs - A simple ExUnit test runner It will
+                                monitor the file system and run test files when
+                                it detects changes. '';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/antp/kovacs";
+            };
+          }
+      ) {};
+
+    kovacs = kovacs_0_9_2;
+
+    kubex_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "kubex";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "kubex";
+              version = "0.1.1";
+              sha256 =
+                "b0bd22246731b1c4d4d7f832cd0015fd6586022c779fb6672f45a648da7dcf79";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Kubernetes integration for and in pure Elixir.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/ingerslevio/kubex";
+            };
+          }
+      ) {};
+
+    kubex = kubex_0_1_1;
+
+    kvs_2_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "kvs";
+            version = "2.1.0";
+            src = fetchHex {
+              pkg = "kvs";
+              version = "2.1.0";
+              sha256 =
+                "c06382e4dbe8a7dc58201187ddd303e5b1e546713da3a3813863fe62e63dc4c7";
+            };
+
+            meta = {
+              description = ''Erlang Abstract Database'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/synrc/kvs";
+            };
+          }
+      ) {};
+
+    kvs = kvs_2_1_0;
+
+    kwfuns_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "kwfuns";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "kwfuns";
+              version = "0.0.4";
+              sha256 =
+                "ce1ac52be8d3c3cb7c77fc339eaa877a190899e889bf97cdb92e01922fd52b54";
+            };
+
+            meta = {
+              longDescription = ''Macros to create functions with syntax based
+                                keyword parameters with default values defkw
+                                make_list_elem( parent, text, spaced: false,
+                                type: :ul ) do ... end translates to def
+                                make_list_elem( parent, text, keywords \ [] ) do
+                                some_code_with( spaces, typed) end'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/RobertDober/lab42_defkw";
+            };
+          }
+      ) {};
+
+    kwfuns = kwfuns_0_0_4;
+
+    lager_2_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, goldrush_0_1_7 }:
+          buildRebar3 {
+            name = "lager";
+            version = "2.1.1";
+            src = fetchHex {
+              pkg = "lager";
+              version = "2.1.1";
+              sha256 =
+                "5eb1c17ff0f8692285b7648ef5d827d492b8d7554da782afc300ebb4861d5aba";
+            };
+
+            beamDeps  = [ goldrush_0_1_7 ];
+
+            meta = {
+              description = ''Erlang logging framework'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/basho/lager";
+            };
+          }
+      ) {};
+
+    lager_3_0_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, goldrush_0_1_7 }:
+          buildRebar3 {
+            name = "lager";
+            version = "3.0.1";
+            src = fetchHex {
+              pkg = "lager";
+              version = "3.0.1";
+              sha256 =
+                "d32c9233105b72dc5c1f6a8fe9a33cc205ecccc359c4449950060cee5a329e35";
+            };
+
+            beamDeps  = [ goldrush_0_1_7 ];
+
+            meta = {
+              description = ''Erlang logging framework'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/basho/lager";
+            };
+          }
+      ) {};
+
+    lager_3_0_2 = callPackage
+      (
+        {  buildRebar3, fetchHex, goldrush_0_1_7 }:
+          buildRebar3 {
+            name = "lager";
+            version = "3.0.2";
+            src = fetchHex {
+              pkg = "lager";
+              version = "3.0.2";
+              sha256 =
+                "527f3b233e01b6cb68780c14ef675ed08ec02247dc029cacecbb56c78dfca100";
+            };
+
+            beamDeps  = [ goldrush_0_1_7 ];
+
+            meta = {
+              description = ''Erlang logging framework'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/basho/lager";
+            };
+          }
+      ) {};
+
+    lager = lager_3_0_2;
+
+    lager_graylog_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, lager_3_0_2 }:
+          buildRebar3 {
+            name = "lager_graylog";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "lager_graylog";
+              version = "0.1.0";
+              sha256 =
+                "539ddc1b5a4280bf5ef8c377cfa037830a2fbe989fd378af10f5355c502fc8d9";
+            };
+
+            beamDeps  = [ lager_3_0_2 ];
+
+            meta = {
+              description = ''An Erlang lager_graylog library'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/esl/lager_graylog";
+            };
+          }
+      ) {};
+
+    lager_graylog = lager_graylog_0_1_0;
+
+    lager_logger_1_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, lager_3_0_2 }:
+          buildMix {
+            name = "lager_logger";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "lager_logger";
+              version = "1.0.2";
+              sha256 =
+                "28e13b1a5d43acefdf7f49d219ecb268dd934da448d2e1d4c3f74378fdea9e89";
+            };
+            beamDeps  = [ lager_3_0_2 ];
+
+            meta = {
+              longDescription = ''LagerLogger is a lager backend that forwards
+                                all log messages to Elixir`s Logger.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/PSPDFKit-labs/lager_logger";
+            };
+          }
+      ) {};
+
+    lager_logger = lager_logger_1_0_2;
+
+    lager_logstash_backend_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, lager_3_0_2, jsx_2_6_1 }:
+          buildRebar3 {
+            name = "lager_logstash_backend";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "lager_logstash_backend";
+              version = "0.1.0";
+              sha256 =
+                "9d729050a9cae2bb965d6211d428a79838e48f8acac394f24c48e3d47e6758c9";
+            };
+
+            beamDeps  = [ lager_3_0_2 jsx_2_6_1 ];
+
+            meta = {
+              description = ''Lager Logstash Logging Backend'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/inaka/lager_logstash_backend.git";
+            };
+          }
+      ) {};
+
+    lager_logstash_backend = lager_logstash_backend_0_1_0;
+
+    lager_watchdog_0_1_10 = callPackage
+      (
+        {  buildRebar3, fetchHex, lager_2_1_1 }:
+          buildRebar3 {
+            name = "lager_watchdog";
+            version = "0.1.10";
+            src = fetchHex {
+              pkg = "lager_watchdog";
+              version = "0.1.10";
+              sha256 =
+                "ac2a5f7d519fa69fff3d41c5c19419552085346f98de4378ca38efa81c322a94";
+            };
+
+            beamDeps  = [ lager_2_1_1 ];
+
+            meta = {
+              description = ''lager provider to send data to watchdog.'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/project-fifo/lager_watchdog";
+            };
+          }
+      ) {};
+
+    lager_watchdog = lager_watchdog_0_1_10;
+
+    lasp_0_0_4 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "lasp";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "lasp";
+              version = "0.0.4";
+              sha256 =
+                "d119098a34bbd0331ab1cb22e0f1f1d25da35132f8a61ecdc0ed5c0135c84942";
+            };
+
+            meta = {
+              description = ''Declarative, distributed, eventually consistent
+                            compuations.'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/lasp-lang/lasp";
+            };
+          }
+      ) {};
+
+    lasp = lasp_0_0_4;
+
+    lasse_1_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "lasse";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "lasse";
+              version = "1.1.0";
+              sha256 =
+                "53e70ea9031f7583331a9f9bdbb29da933e591e5c4cce521b4bf85c68e7f3385";
+            };
+
+            meta = {
+              description = ''Lasse: Server-Sent Event handler for Cowboy.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/inaka/lasse";
+            };
+          }
+      ) {};
+
+    lasse = lasse_1_1_0;
+
+    lazymaru_0_2_5 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_3_1, plug_0_9_0, cowboy_1_0_4 }:
+          buildMix {
+            name = "lazymaru";
+            version = "0.2.5";
+            src = fetchHex {
+              pkg = "lazymaru";
+              version = "0.2.5";
+              sha256 =
+                "aeb7d963ddcd48791014922dc93030b182ee1fb13b7efbe041190c92cf1e939e";
+            };
+            beamDeps  = [ poison_1_3_1 plug_0_9_0 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Elixir copy of grape for creating REST-like
+                            APIs.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/falood/lazymaru";
+            };
+          }
+      ) {};
+
+    lazymaru = lazymaru_0_2_5;
+
+    ledx_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, elixir_ale_0_4_1 }:
+          buildMix {
+            name = "ledx";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ledx";
+              version = "0.0.1";
+              sha256 =
+                "f468e65572b7c9dcb6c906678c873194818bb1dd78ce35b7dddd9397df4f81a6";
+            };
+            beamDeps  = [ elixir_ale_0_4_1 ];
+
+            meta = {
+              description = ''Ledx is a simple library for interfacing with
+                            LEDs on embedded platforms.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/danmarcab/ledx";
+            };
+          }
+      ) {};
+
+    ledx = ledx_0_0_1;
+
+    level_1_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "level";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "level";
+              version = "1.0.0";
+              sha256 =
+                "42d54a840e79af5833e5ae335b374699c46d996053f2f3480e181a57cad2ae62";
+            };
+
+            meta = {
+              longDescription = ''Level implements various helper functions and
+                                data types for working with Googles Level data
+                                store. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gausby/level";
+            };
+          }
+      ) {};
+
+    level = level_1_0_0;
+
+    lex_luthor_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "lex_luthor";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "lex_luthor";
+              version = "0.1.0";
+              sha256 =
+                "1a8ebf646f9cd29f3696659e67f4bbb65a5a558e4b3e1f43013c5e85022189a2";
+            };
+
+            meta = {
+              longDescription = ''LexLuthor is a Lexer in Elixir (say that 10
+                                times fast) which uses macros to generate a
+                                reusable lexers. Good times.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jamesotron/lex_luthor";
+            };
+          }
+      ) {};
+
+    lex_luthor = lex_luthor_0_1_0;
+
+    lfsr_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "lfsr";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "lfsr";
+              version = "0.0.2";
+              sha256 =
+                "8a14455bd0ce5c6b7dc56bf1027007c67e48979b49b70e09372cc36769d16b90";
+            };
+
+            meta = {
+              description = ''Elixir implementation of a binary Galois Linear
+                            Feedback Shift Register. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pma/lfsr";
+            };
+          }
+      ) {};
+
+    lfsr = lfsr_0_0_2;
+
+    lhttpc_1_3_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "lhttpc";
+            version = "1.3.0";
+            src = fetchHex {
+              pkg = "lhttpc";
+              version = "1.3.0";
+              sha256 =
+                "ddd2bd4b85159bc987c954b14877168e6a3c3e516105702189776e97c50296a4";
+            };
+
+            meta = {
+              description = ''Lightweight HTTP Client'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/talko/lhttpc";
+            };
+          }
+      ) {};
+
+    lhttpc = lhttpc_1_3_0;
+
+    libchunter_0_1_45 = callPackage
+      (
+        {  buildRebar3, fetchHex, lager_2_1_1, fifo_spec_0_1_27 }:
+          buildRebar3 {
+            name = "libchunter";
+            version = "0.1.45";
+            src = fetchHex {
+              pkg = "libchunter";
+              version = "0.1.45";
+              sha256 =
+                "ecd76f18b2a1ee115b86a6b485119c2a36de9da1d41449dd5bc7e139dedeeb4b";
+            };
+
+            beamDeps  = [ lager_2_1_1 fifo_spec_0_1_27 ];
+
+            meta = {
+              description = ''Chunter interface library.'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/project-fifo/libchunter";
+            };
+          }
+      ) {};
+
+    libchunter = libchunter_0_1_45;
+
+    libex_config_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "libex_config";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "libex_config";
+              version = "0.2.0";
+              sha256 =
+                "27534209d8661d597017426922d64267f2452baac36866ba0bb470792f55292d";
+            };
+
+            meta = {
+              description = ''LibEx.Config exposes helpers around accessing OTP
+                            application configuration. '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/reset/libex-config";
+            };
+          }
+      ) {};
+
+    libex_config = libex_config_0_2_0;
+
+    libleofs_0_1_2 = callPackage
+      (
+        {  buildRebar3, fetchHex, jsx_1_4_5 }:
+          buildRebar3 {
+            name = "libleofs";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "libleofs";
+              version = "0.1.2";
+              sha256 =
+                "62c39168e30a94e6bf0c3b3677995f5735ca03358465a6756db01a75c4e5c04b";
+            };
+
+            beamDeps  = [ jsx_1_4_5 ];
+
+            meta = {
+              description = ''LeoFS management library.'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/project-fifo/libleofs";
+            };
+          }
+      ) {};
+
+    libleofs = libleofs_0_1_2;
+
+    librex_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, secure_random_0_2_0 }:
+          buildMix {
+            name = "librex";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "librex";
+              version = "1.0.0";
+              sha256 =
+                "c047e48eca2414394ecf5291e626fa813c8baaa9d35ab917dc6937f99461948c";
+            };
+            beamDeps  = [ secure_random_0_2_0 ];
+
+            meta = {
+              description = ''Convert office documents to other formats using
+                            LibreOffice'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ricn/librex";
+            };
+          }
+      ) {};
+
+    librex = librex_1_0_0;
+
+    libsnarl_0_3_40 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          oauth2_erlang_0_6_1,
+          mdns_client_lib_0_1_33,
+          libsnarlmatch_0_1_7,
+          lager_3_0_2,
+          fifo_spec_0_1_27
+        }:
+          buildRebar3 {
+            name = "libsnarl";
+            version = "0.3.40";
+            src = fetchHex {
+              pkg = "libsnarl";
+              version = "0.3.40";
+              sha256 =
+                "fd574da4318b2732dd275fed371d13cd6ed4d0424e7acc3e0429ea97859fabbf";
+            };
+
+            beamDeps  = [
+                          oauth2_erlang_0_6_1
+                          mdns_client_lib_0_1_33
+                          libsnarlmatch_0_1_7
+                          lager_3_0_2
+                          fifo_spec_0_1_27
+                        ];
+
+            meta = {
+              description = ''snarl interface library'';
+
+            };
+          }
+      ) {};
+
+    libsnarl = libsnarl_0_3_40;
+
+    libsnarlmatch_0_1_5 = callPackage
+      (
+        {  buildRebar3, fetchHex, fqc_0_1_5 }:
+          buildRebar3 {
+            name = "libsnarlmatch";
+            version = "0.1.5";
+            src = fetchHex {
+              pkg = "libsnarlmatch";
+              version = "0.1.5";
+              sha256 =
+                "11410122ca7a0685c4a7df1795d7f5a1e7bf9c5f17096414402fd9d1f0e1ac04";
+            };
+
+            beamDeps  = [ fqc_0_1_5 ];
+
+            meta = {
+              description = ''permission matcher library'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/project-fifo/libsnarlmatch";
+            };
+          }
+      ) {};
+
+    libsnarlmatch_0_1_7 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "libsnarlmatch";
+            version = "0.1.7";
+            src = fetchHex {
+              pkg = "libsnarlmatch";
+              version = "0.1.7";
+              sha256 =
+                "72e9bcf7968e75774393778146ac6596116f1c60136dd607ad249183684ee380";
+            };
+
+            meta = {
+              description = ''permission matcher library'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/project-fifo/libsnarlmatch";
+            };
+          }
+      ) {};
+
+    libsnarlmatch = libsnarlmatch_0_1_7;
+
+    libsniffle_0_3_37 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          mdns_client_lib_0_1_33,
+          lager_3_0_2,
+          fifo_spec_0_1_27
+        }:
+          buildRebar3 {
+            name = "libsniffle";
+            version = "0.3.37";
+            src = fetchHex {
+              pkg = "libsniffle";
+              version = "0.3.37";
+              sha256 =
+                "fa840488f50292bbe206e7c13cc9640099cacec8aea3c0c581f6cc482b5bd94c";
+            };
+
+            beamDeps  = [ mdns_client_lib_0_1_33 lager_3_0_2 fifo_spec_0_1_27
+                      ];
+
+            meta = {
+              description = ''Sniffle API'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/project-fifo/libsniffle";
+            };
+          }
+      ) {};
+
+    libsniffle = libsniffle_0_3_37;
+
+    libsodium_0_0_3 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "libsodium";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "libsodium";
+              version = "0.0.3";
+              sha256 =
+                "e66e9d91647a1519194cb0b240144123d68fae0f8cb57a9be9ced30ba8e24397";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''libsodium port driver'';
+              license = stdenv.lib.licenses.mpl20;
+              homepage = "https://github.com/potatosalad/erlang-libsodium";
+            };
+          }
+      ) {};
+
+    libsodium = libsodium_0_0_3;
+
+    lineo_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "lineo";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "lineo";
+              version = "0.1.0";
+              sha256 =
+                "842733d2aae3b8cfadf3acfe456241eb3434e68984d1fdbb7be15e335591e21c";
+            };
+
+            meta = {
+               license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/camshaft/lineo";
+            };
+          }
+      ) {};
+
+    lineo = lineo_0_1_0;
+
+    linguist_0_1_5 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "linguist";
+            version = "0.1.5";
+            src = fetchHex {
+              pkg = "linguist";
+              version = "0.1.5";
+              sha256 =
+                "d8b0665512a800854152082f6d56142e56e5da5f5b0d879298117b7dfd55ba97";
+            };
+
+            meta = {
+              description = ''Elixir Internationalization library '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/chrismccord/linguist";
+            };
+          }
+      ) {};
+
+    linguist = linguist_0_1_5;
+
+    link_shrinkex_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "link_shrinkex";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "link_shrinkex";
+              version = "1.0.0";
+              sha256 =
+                "2c7d99b23849f90d9aec8cd4f9960c6c198351735eda754288b778fe0e5f7e82";
+            };
+
+            meta = {
+              description = ''Google`s URL Shortener API for Elixir. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jonahoffline/link_shrinkex";
+            };
+          }
+      ) {};
+
+    link_shrinkex = link_shrinkex_1_0_0;
+
+    liquid_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "liquid";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "liquid";
+              version = "0.1.0";
+              sha256 =
+                "f2f4e2499419de30a984b706e2119007cc9f46e79a22a865715ed040a6a1f4db";
+            };
+
+            meta = {
+              description = ''Liquid implementation in elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nulian/liquid-elixir";
+            };
+          }
+      ) {};
+
+    liquid = liquid_0_1_0;
+
+    locker_1_0_8 = callPackage
+      (
+        {  buildRebar3, fetchHex, proper_1_1_1_beta }:
+          buildRebar3 {
+            name = "locker";
+            version = "1.0.8";
+            src = fetchHex {
+              pkg = "locker";
+              version = "1.0.8";
+              sha256 =
+                "9cf9890e6b12dab7b8d1997c455348742db6caf2eaac3b64c514cd4e8dca2b56";
+            };
+
+            beamDeps  = [ proper_1_1_1_beta ];
+
+            meta = {
+              longDescription = ''Distributed de-centralized consistent
+                                in-memory key-value store written in Erlang.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/wooga/locker";
+            };
+          }
+      ) {};
+
+    locker = locker_1_0_8;
+
+    logfmt_3_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "logfmt";
+            version = "3.0.2";
+            src = fetchHex {
+              pkg = "logfmt";
+              version = "3.0.2";
+              sha256 =
+                "d079aab159c3682d90054dbf8228cc0f86c8d5df6e6145c60d69a81110c3ee1c";
+            };
+
+            meta = {
+              description = ''Logfmt is a module for encoding and decoding
+                            logfmt-style log lines.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jclem/logfmt-elixir";
+            };
+          }
+      ) {};
+
+    logfmt = logfmt_3_0_2;
+
+    logger_file_backend_0_0_6 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "logger_file_backend";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "logger_file_backend";
+              version = "0.0.6";
+              sha256 =
+                "57554adfad0599adc3ea540accc1791d4adffedbe87640c0b92df9b860bb1c69";
+            };
+
+            meta = {
+              description = ''Simple logger backend that writes to a file'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/onkel-dirtus/logger_file_backend";
+            };
+          }
+      ) {};
+
+    logger_file_backend = logger_file_backend_0_0_6;
+
+    logger_logentries_backend_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "logger_logentries_backend";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "logger_logentries_backend";
+              version = "0.0.1";
+              sha256 =
+                "f3db38f7ab4dc40cd8078bf4cad79ce2a1e759f0f7f2b2dee4fbc3abb8fe3d7e";
+            };
+
+            meta = {
+              longDescription = ''A Logger backend to support the Logentries
+                                service (logentries.com) TCP input log
+                                mechanism'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/sysdia-solutions/logger_logentries_backend";
+            };
+          }
+      ) {};
+
+    logger_logentries_backend = logger_logentries_backend_0_0_1;
+
+    logger_loggly_backend_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1 }:
+          buildMix {
+            name = "logger_loggly_backend";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "logger_loggly_backend";
+              version = "0.1.0";
+              sha256 =
+                "4b19e284f0b910c824a228093afa176ea4b9c4546893b2ad5da2769aa2bcbc85";
+            };
+            beamDeps  = [ httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Loggly logger backend'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/joeyfeldberg/loggly_backend";
+            };
+          }
+      ) {};
+
+    logger_loggly_backend = logger_loggly_backend_0_1_0;
+
+    logger_logstash_backend_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, timex_1_0_1, exjsx_3_1_0 }:
+          buildMix {
+            name = "logger_logstash_backend";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "logger_logstash_backend";
+              version = "1.0.0";
+              sha256 =
+                "ca36f8ab5f738c143da6b72c9d603ede7e201e2a1c7d683b270c2641d14bbcb2";
+            };
+            beamDeps  = [ timex_1_0_1 exjsx_3_1_0 ];
+
+            meta = {
+              description = ''Logstash UDP producer backend for Logger.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/marcelog/logger_logstash_backend";
+            };
+          }
+      ) {};
+
+    logger_logstash_backend = logger_logstash_backend_1_0_0;
+
+    logger_papertrail_backend_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "logger_papertrail_backend";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "logger_papertrail_backend";
+              version = "0.0.2";
+              sha256 =
+                "afc8bce277dc827172d33b20024970811950a139552ed1d0e1ea75e2860a055e";
+            };
+
+            meta = {
+              description = ''A Papertrail backend for Elixir Logger'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/larskrantz/logger_papertrail_backend";
+            };
+          }
+      ) {};
+
+    logger_papertrail_backend = logger_papertrail_backend_0_0_2;
+
+    lolcat_0_0_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, quickrand_1_5_1, colorful_0_6_0 }:
+          buildRebar3 {
+            name = "lolcat";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "lolcat";
+              version = "0.0.1";
+              sha256 =
+                "884799d2e7f294a6a5455e19c9816592d7b1314cefaba18952876fef0c4a10af";
+            };
+
+            beamDeps  = [ quickrand_1_5_1 colorful_0_6_0 ];
+
+            meta = {
+              description = ''The clone of lolcat. written in elixir '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/restartr/ex-lolcat";
+            };
+          }
+      ) {};
+
+    lolcat = lolcat_0_0_1;
+
+    loom_0_0_10 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "loom";
+            version = "0.0.10";
+            src = fetchHex {
+              pkg = "loom";
+              version = "0.0.10";
+              sha256 =
+                "f32cf0fe1c14efb9b4fda15285a5d331b64e952da7a0561c66f7e2b671d36cb8";
+            };
+
+            meta = {
+              description = ''A modern CRDT library that uses protocols to
+                            create composable CRDTs.'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/asonge/loom";
+            };
+          }
+      ) {};
+
+    loom = loom_0_0_10;
+
+    lru_1_3_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "lru";
+            version = "1.3.1";
+            src = fetchHex {
+              pkg = "lru";
+              version = "1.3.1";
+              sha256 =
+                "cd6ac15c383d58cd2933df9cb918617b24b12b6e5fb24d94c4c8f200fd93f619";
+            };
+
+            meta = {
+              description = ''implements a fixed-size LRU cache'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/barrel-db/erlang-lru";
+            };
+          }
+      ) {};
+
+    lru = lru_1_3_1;
+
+    lru_cache_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "lru_cache";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "lru_cache";
+              version = "0.1.0";
+              sha256 =
+                "9543e4b00ad3763fa2a92cf9ed7429dff645d912f5d9134b32d573bb327f56b5";
+            };
+
+            meta = {
+              description = ''ETS-based LRU Cache'';
+
+              homepage = "https://github.com/arago/lru_cache";
+            };
+          }
+      ) {};
+
+    lru_cache = lru_cache_0_1_0;
+
+    ltsv_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ltsv";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "ltsv";
+              version = "0.1.0";
+              sha256 =
+                "62e56251331da6cf5b95de9ecf6e0984749b0ba935356397151fa19f2491a449";
+            };
+
+            meta = {
+              description = ''A Labeled Tab-separated Values Parser'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ma2gedev/ltsvex";
+            };
+          }
+      ) {};
+
+    ltsv = ltsv_0_1_0;
+
+    luhn_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "luhn";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "luhn";
+              version = "0.3.0";
+              sha256 =
+                "e98e7dac83e18d75dbcb87559f17f7b40c00edf79a38b02b9ab5a7d74b05efc2";
+            };
+
+            meta = {
+              description = ''Luhn algorithm in Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ma2gedev/luhn_ex";
+            };
+          }
+      ) {};
+
+    luhn = luhn_0_3_0;
+
+    luhnatex_0_5_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "luhnatex";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "luhnatex";
+              version = "0.5.0";
+              sha256 =
+                "d2edc93e2058f1608217eb90402cc776b40f389f445e6c2a82792a0993f4b6de";
+            };
+
+            meta = {
+              description = ''Luhn algorithm in Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/my-flow/luhnatex";
+            };
+          }
+      ) {};
+
+    luhnatex = luhnatex_0_5_0;
+
+    lz4_0_2_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "lz4";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "lz4";
+              version = "0.2.2";
+              sha256 =
+                "a59522221e7cdfe3792bf8b3bb21cfe7ac657790e5826201fa2c5d0bc7484a2d";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''LZ4 bindings for Erlang'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/szktty/erlang-lz4.git";
+            };
+          }
+      ) {};
+
+    lz4 = lz4_0_2_2;
+
+    lz_string_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "lz_string";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "lz_string";
+              version = "0.0.3";
+              sha256 =
+                "747ddaee6f146d6133c16c53f18ca9dc429d5c1e0ca11d8eeb322630448ec08b";
+            };
+
+            meta = {
+              description = ''Elixir implementation of pieroxy`s lz-string
+                            compression algorithm.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/koudelka/elixir-lz-string";
+            };
+          }
+      ) {};
+
+    lz_string = lz_string_0_0_3;
+
+    m2x_1_3_1 = callPackage
+      (
+        {  buildMix, fetchHex, json_0_3_3, hackney_1_4_8 }:
+          buildMix {
+            name = "m2x";
+            version = "1.3.1";
+            src = fetchHex {
+              pkg = "m2x";
+              version = "1.3.1";
+              sha256 =
+                "3325226ac185b40304469aa94a7376511bf57d535eb1d32b2aca6c2009c54fe2";
+            };
+            beamDeps  = [ json_0_3_3 hackney_1_4_8 ];
+
+            meta = {
+              longDescription = ''Elixir client library for the AT&T M2X
+                                (http://m2x.att.com) API. AT&T M2X is a
+                                cloud-based fully managed time-series data
+                                storage service for network connected
+                                machine-to-machine (M2M) devices and the
+                                Internet of Things (IoT).'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/attm2x/m2x-elixir";
+            };
+          }
+      ) {};
+
+    m2x = m2x_1_3_1;
+
+    m2x_erlang_1_3_1 = callPackage
+      (
+        {  buildMix, fetchHex, jsx_2_8_0, hackney_1_4_8 }:
+          buildMix {
+            name = "m2x_erlang";
+            version = "1.3.1";
+            src = fetchHex {
+              pkg = "m2x_erlang";
+              version = "1.3.1";
+              sha256 =
+                "873db746f4428490670b54aabcc93fda8d94c3c4e25c94a9aef7275858a8b809";
+            };
+            beamDeps  = [ jsx_2_8_0 hackney_1_4_8 ];
+
+            meta = {
+              longDescription = ''Erlang client library for the AT&T M2X
+                                (http://m2x.att.com) API. AT&T M2X is a
+                                cloud-based fully managed time-series data
+                                storage service for network connected
+                                machine-to-machine (M2M) devices and the
+                                Internet of Things (IoT).'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/attm2x/m2x-erlang";
+            };
+          }
+      ) {};
+
+    m2x_erlang = m2x_erlang_1_3_1;
+
+    mad_0_9_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "mad";
+            version = "0.9.0";
+            src = fetchHex {
+              pkg = "mad";
+              version = "0.9.0";
+              sha256 =
+                "5eeb635094586b517f08000b059b680981c7da5527bab83e7bfa3f54176c0f1e";
+            };
+
+            meta = {
+              description = ''Small and fast rebar replacement'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/synrc/mad";
+            };
+          }
+      ) {};
+
+    mad = mad_0_9_0;
+
+    mail_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mail";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "mail";
+              version = "0.0.2";
+              sha256 =
+                "724cea5cac7b0ffdf2fa65a8d89d7c83de72da7eba6d6b31f8669854cb32baa3";
+            };
+
+            meta = {
+              description = ''Easily build a composable mail message'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/DockYard/elixir-mail";
+            };
+          }
+      ) {};
+
+    mail = mail_0_0_2;
+
+    mailchimp_0_0_5 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_7_5 }:
+          buildMix {
+            name = "mailchimp";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "mailchimp";
+              version = "0.0.5";
+              sha256 =
+                "e2681ec4a99a3ba59a523e1e6369ca276399733fb34d08fd823a1e0658613de9";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''A basic Elixir wrapper for version 3 of the
+                            MailChimp API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/duartejc/mailchimp";
+            };
+          }
+      ) {};
+
+    mailchimp = mailchimp_0_0_5;
+
+    mailer_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, timex_1_0_1, gen_smtp_0_9_0 }:
+          buildMix {
+            name = "mailer";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "mailer";
+              version = "1.0.0";
+              sha256 =
+                "cd54048c0cea44b9d96b82352d74fadf078e705b343c62a6e6e27f60de21099b";
+            };
+            beamDeps  = [ timex_1_0_1 gen_smtp_0_9_0 ];
+
+            meta = {
+              description = ''Mailer - A simple email client'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/antp/mailer";
+            };
+          }
+      ) {};
+
+    mailer = mailer_1_0_0;
+
+    mailgun_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mailgun";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "mailgun";
+              version = "0.0.2";
+              sha256 =
+                "9e00f4411d5838556d326b02038f6fa3f173a67af28148329014f9889cd4a5c4";
+            };
+
+            meta = {
+              description = ''Elixir Mailgun Client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/chrismccord/mailgun";
+            };
+          }
+      ) {};
+
+    mailgun_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2 }:
+          buildMix {
+            name = "mailgun";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "mailgun";
+              version = "0.1.2";
+              sha256 =
+                "9cc828e06238045c92414db8f2e9a64a6004aca9b9a4856e5222db99bd8528e8";
+            };
+            beamDeps  = [ poison_1_5_2 ];
+
+            meta = {
+              description = ''Elixir Mailgun Client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/chrismccord/mailgun";
+            };
+          }
+      ) {};
+
+    mailgun = mailgun_0_1_2;
+
+    mailgun_webhook_auth_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_0_8_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "mailgun_webhook_auth";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "mailgun_webhook_auth";
+              version = "1.0.0";
+              sha256 =
+                "0e6c93d8fd37fc948db0f92ee545ecbed99787dc04ceb8981e588b06ad3108eb";
+            };
+            beamDeps  = [ plug_0_8_1 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''A Plug for validating Mailgun Webhook requests in
+                            Elixir applications.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/typesend/mailgun_webhook_auth";
+            };
+          }
+      ) {};
+
+    mailgun_webhook_auth = mailgun_webhook_auth_1_0_0;
+
+    mailibex_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mailibex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "mailibex";
+              version = "0.1.0";
+              sha256 =
+                "01f207ee181a58d629c5329d378ee319f9dbab9259e28367751d8860ffe63a36";
+            };
+
+            meta = {
+              longDescription = ''Mailibex is an email library in Elixir :
+                                currently implements DKIM, SPF, DMARC, MimeMail
+                                (using iconv nif for encoding), MimeType (and
+                                file type detection), a simplified api to modify
+                                or create mimemail as a keyword list. Next step
+                                is a full implementation of SMTP client and
+                                server, to make it possible to use emails as a
+                                routable API for events and messages between
+                                your applications.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/awetzel/mailibex";
+            };
+          }
+      ) {};
+
+    mailibex = mailibex_0_1_0;
+
+    mailman_0_2_1 = callPackage
+      (
+        {
+          buildMix, fetchHex, gen_smtp_0_9_0, ex_doc_0_11_4, earmark_0_2_1
+        }:
+          buildMix {
+            name = "mailman";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "mailman";
+              version = "0.2.1";
+              sha256 =
+                "b1594af744dc0e879ed8e42133c7d1d8136468218be2c6dfbf416dd3861b20c7";
+            };
+            beamDeps  = [ gen_smtp_0_9_0 ex_doc_0_11_4 earmark_0_2_1 ];
+
+            meta = {
+              description = ''Library providing a clean way of defining mailers
+                            in Elixir apps'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/kamilc/mailman";
+            };
+          }
+      ) {};
+
+    mailman = mailman_0_2_1;
+
+    majremind_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "majremind";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "majremind";
+              version = "0.0.1";
+              sha256 =
+                "604ba3b2142497b2384c73b2320f9738711a9cc07b4348f8e870ee6e470c4749";
+            };
+
+            meta = {
+              longDescription = ''A self-maintained database of your updated
+                                server which tells you which one needs to be
+                                updated. It uses Disk Erlang Term Storage for
+                                its internal database, located at
+                                $HOME/.config/majremind/ '';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    majremind = majremind_0_0_1;
+
+    mandrag_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, exrm_0_15_1 }:
+          buildMix {
+            name = "mandrag";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "mandrag";
+              version = "0.1.1";
+              sha256 =
+                "e9e9fcbb844a2a86ecd95f5f8fa7db9f6ff88f3e2a6dca2bd996f4f71bbf125d";
+            };
+            beamDeps  = [ exrm_0_15_1 ];
+
+            meta = {
+              description = ''A simple, extremely assumptive deploy script for
+                            Phoenix apps'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/cschiewek/mandrag";
+            };
+          }
+      ) {};
+
+    mandrag = mandrag_0_1_1;
+
+    mandrake_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mandrake";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "mandrake";
+              version = "0.0.4";
+              sha256 =
+                "ed672e094f68ff07c1f8e78a3c8a95af3e23a71ca90515ad441738446ee18887";
+            };
+
+            meta = {
+              longDescription = ''Mandrake is a functional programming library
+                                that bring something else magic in elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mbasso/mandrake";
+            };
+          }
+      ) {};
+
+    mandrake = mandrake_0_0_4;
+
+    mandrill_0_4_1 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_1_0 }:
+          buildMix {
+            name = "mandrill";
+            version = "0.4.1";
+            src = fetchHex {
+              pkg = "mandrill";
+              version = "0.4.1";
+              sha256 =
+                "2d554149c425c511a006d978427acc1d384c8f6d4f3699fdce04e42e24268400";
+            };
+            beamDeps  = [ httpoison_0_8_1 exjsx_3_1_0 ];
+
+            meta = {
+              longDescription = ''A Mandrill wrapper for Elixir Requires an
+                                active account with Mandrill
+                                (http://mandrill.com).'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/slogsdon/mandrill-elixir";
+            };
+          }
+      ) {};
+
+    mandrill = mandrill_0_4_1;
+
+    mandrillex_0_2_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, jsex_2_0_0, httpoison_0_8_1, hackney_1_0_6
+        }:
+          buildMix {
+            name = "mandrillex";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "mandrillex";
+              version = "0.2.0";
+              sha256 =
+                "840bf36e545cde376797603df4109aae49d2c17b2b06f84a058fff4448d362eb";
+            };
+            beamDeps  = [ jsex_2_0_0 httpoison_0_8_1 hackney_1_0_6 ];
+
+            meta = {
+              longDescription = ''A Mandrill wrapper for Elixir Requires an
+                                active account with Mandrill
+                                (http://mandrill.com). '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/slogsdon/mandrillex";
+            };
+          }
+      ) {};
+
+    mandrillex = mandrillex_0_2_0;
+
+    marco_polo_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex, decimal_1_1_1, connection_1_0_0_rc_1 }:
+          buildMix {
+            name = "marco_polo";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "marco_polo";
+              version = "0.2.1";
+              sha256 =
+                "60730b3b488e11c91b57f0d3490baf86fd2972cd51a481480a5aec1e2aacf5fd";
+            };
+            beamDeps  = [ decimal_1_1_1 connection_1_0_0_rc_1 ];
+
+            meta = {
+              description = ''Binary driver for the OrientDB database.'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/MyMedsAndMe/marco_polo";
+            };
+          }
+      ) {};
+
+    marco_polo = marco_polo_0_2_1;
+
+    mariaex_0_4_3 = callPackage
+      (
+        {  buildMix, fetchHex, decimal_1_1_1 }:
+          buildMix {
+            name = "mariaex";
+            version = "0.4.3";
+            src = fetchHex {
+              pkg = "mariaex";
+              version = "0.4.3";
+              sha256 =
+                "5403290df22598e0152c7f1edd64f6372238055d5e72cc830780d019f4d22d57";
+            };
+            beamDeps  = [ decimal_1_1_1 ];
+
+            meta = {
+              description = ''Pure elixir database driver for MariaDB /
+                            MySQL.'';
+
+              homepage = "https://github.com/xerions/mariaex";
+            };
+          }
+      ) {};
+
+    mariaex_0_5_0 = callPackage
+      (
+        {  buildMix, fetchHex, decimal_1_1_1 }:
+          buildMix {
+            name = "mariaex";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "mariaex";
+              version = "0.5.0";
+              sha256 =
+                "fe2a576c6b4e446c3744af7dda0a3ed6f179f80451a8e412be520b9005bb26c0";
+            };
+            beamDeps  = [ decimal_1_1_1 ];
+
+            meta = {
+              description = ''Pure elixir database driver for MariaDB /
+                            MySQL.'';
+
+              homepage = "https://github.com/xerions/mariaex";
+            };
+          }
+      ) {};
+
+    mariaex_0_6_2 = callPackage
+      (
+        {  buildMix, fetchHex, decimal_1_1_1, connection_1_0_2 }:
+          buildMix {
+            name = "mariaex";
+            version = "0.6.2";
+            src = fetchHex {
+              pkg = "mariaex";
+              version = "0.6.2";
+              sha256 =
+                "195d9f46e09029872505402159ec713cdfa7b847622cc6b6db658c0d24f85ecd";
+            };
+            beamDeps  = [ decimal_1_1_1 connection_1_0_2 ];
+
+            meta = {
+              description = ''Pure elixir database driver for MariaDB /
+                            MySQL.'';
+
+              homepage = "https://github.com/xerions/mariaex";
+            };
+          }
+      ) {};
+
+    mariaex = mariaex_0_6_2;
+
+    marked_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "marked";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "marked";
+              version = "0.0.1";
+              sha256 =
+                "6e16369d41355bef05b18f98230afe08dcb3ccfaaab168382513d86c19721035";
+            };
+
+            meta = {
+              description = ''CommonMark compatible Markdown parser'';
+
+            };
+          }
+      ) {};
+
+    marked = marked_0_0_1;
+
+    maru_0_9_3 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_0_3, plug_1_1_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "maru";
+            version = "0.9.3";
+            src = fetchHex {
+              pkg = "maru";
+              version = "0.9.3";
+              sha256 =
+                "6dd160dbc77b72a1954d53c5d584402006f0c28a278f3f28c5ec651246db480d";
+            };
+            beamDeps  = [ poison_1_0_3 plug_1_1_1 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''REST-like API micro-framework for elixir inspired
+                            by grape.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/falood/maru";
+            };
+          }
+      ) {};
+
+    maru = maru_0_9_3;
+
+    maru_entity_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "maru_entity";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "maru_entity";
+              version = "0.1.2";
+              sha256 =
+                "93b1f9f3941032cdf98b999cf4db85cace7e6259a78427322c5af8a5621e45b6";
+            };
+
+            meta = {
+              description = ''Elixir copy of grape-entity'';
+
+            };
+          }
+      ) {};
+
+    maru_entity = maru_entity_0_1_2;
+
+    maru_swagger_0_7_1 = callPackage
+      (
+        {  buildMix, fetchHex, maru_0_9_3 }:
+          buildMix {
+            name = "maru_swagger";
+            version = "0.7.1";
+            src = fetchHex {
+              pkg = "maru_swagger";
+              version = "0.7.1";
+              sha256 =
+                "035cfecc126ccdc830694c8c6f6c1d3376b6d037b31d30f31b53334305179940";
+            };
+            beamDeps  = [ maru_0_9_3 ];
+
+            meta = {
+              description = ''Add swagger compliant documentation to your maru
+                            API'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/falood/maru_swagger";
+            };
+          }
+      ) {};
+
+    maru_swagger = maru_swagger_0_7_1;
+
+    marvel_1_0_0 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          timex_0_13_5,
+          poison_1_5_2,
+          httpoison_0_8_1
+        }:
+          buildRebar3 {
+            name = "marvel";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "marvel";
+              version = "1.0.0";
+              sha256 =
+                "7b5e99ccfa84954c2e46295aa72ab57b7511e1ec8e0bd13d1c5948efe1a0d23d";
+            };
+
+            beamDeps  = [ timex_0_13_5 poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Marvel API and CLI Client '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bryanjos/marvel";
+            };
+          }
+      ) {};
+
+    marvel = marvel_1_0_0;
+
+    marvin_0_3_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          slack_0_3_0,
+          poison_2_1_0,
+          ibrowse_4_2_2,
+          httpotion_2_2_0
+        }:
+          buildMix {
+            name = "marvin";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "marvin";
+              version = "0.3.0";
+              sha256 =
+                "722a97aef1d0f7fb783948002897ea1ec67ac77cb471016386bf485bb8bd86c7";
+            };
+            beamDeps  = [
+                          slack_0_3_0 poison_2_1_0 ibrowse_4_2_2 httpotion_2_2_0
+                        ];
+
+            meta = {
+              description = ''A Slack bot framework.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/willrax/marvin";
+            };
+          }
+      ) {};
+
+    marvin = marvin_0_3_0;
+
+    math_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "math";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "math";
+              version = "0.0.1";
+              sha256 =
+                "ca9c87163b052d2c849a7b4ef3d8664f9400024f26c6add1ce200aa72604a90d";
+            };
+
+            meta = {
+              description = ''The missing Math module for Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/folz/math";
+            };
+          }
+      ) {};
+
+    math = math_0_0_1;
+
+    matrix_0_3_1 = callPackage
+      (
+        {  buildMix, fetchHex, exprintf_0_1_6, earmark_0_2_1 }:
+          buildMix {
+            name = "matrix";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "matrix";
+              version = "0.3.1";
+              sha256 =
+                "3184d70b36666d52e011caf8be4590e2ecf3cc772203ec22b44d90c302592523";
+            };
+            beamDeps  = [ exprintf_0_1_6 earmark_0_2_1 ];
+
+            meta = {
+              longDescription = ''Matrix is a linear algebra library for
+                                manipulating dense matrices. Its primary design
+                                goal is ease of use.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/twist-vector/elixir-matrix.git";
+            };
+          }
+      ) {};
+
+    matrix = matrix_0_3_1;
+
+    maybe_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "maybe";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "maybe";
+              version = "0.0.1";
+              sha256 =
+                "b1915afa2dd6a2db64ad7b20b41eeb2d3cb576cdbd20679594eb6ef76f612638";
+            };
+
+            meta = {
+              description = ''Utils to deal with errors'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zweifisch/maybe";
+            };
+          }
+      ) {};
+
+    maybe = maybe_0_0_1;
+
+    mazurka_0_3_32 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          xml_builder_0_0_8,
+          poison_2_1_0,
+          plug_1_1_1,
+          mimetype_parser_0_1_1,
+          mazurka_dsl_0_1_1,
+          html_builder_0_1_0,
+          etude_0_3_7,
+          ecto_1_0_7
+        }:
+          buildMix {
+            name = "mazurka";
+            version = "0.3.32";
+            src = fetchHex {
+              pkg = "mazurka";
+              version = "0.3.32";
+              sha256 =
+                "93a1a7fe508daae8df47a6bf8d3969d5cf93a206b65a5c350a0ea26005968f6a";
+            };
+            beamDeps  = [
+                          xml_builder_0_0_8
+                          poison_2_1_0
+                          plug_1_1_1
+                          mimetype_parser_0_1_1
+                          mazurka_dsl_0_1_1
+                          html_builder_0_1_0
+                          etude_0_3_7
+                          ecto_1_0_7
+                        ];
+
+            meta = {
+              description = ''hypermedia api toolkit'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mazurka/mazurka";
+            };
+          }
+      ) {};
+
+    mazurka = mazurka_0_3_32;
+
+    mazurka_dsl_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mazurka_dsl";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "mazurka_dsl";
+              version = "0.1.1";
+              sha256 =
+                "2877b27736daa1f5757ff1c2b34ec35d43c8e501b5292be5f9db7de95b88ea69";
+            };
+
+            meta = {
+              description = ''DSL for defining mazurka resources'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mazurka/mazurka_dsl";
+            };
+          }
+      ) {};
+
+    mazurka_dsl = mazurka_dsl_0_1_1;
+
+    mazurka_mediatype_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, etude_0_4_0 }:
+          buildMix {
+            name = "mazurka_mediatype";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "mazurka_mediatype";
+              version = "0.2.0";
+              sha256 =
+                "4ccd8b27d6405e93cb34861f211d69b79ab46c2dbc5c7874d4ee3c580a5754bb";
+            };
+            beamDeps  = [ etude_0_4_0 ];
+
+            meta = {
+              description = ''mazurka mediatype interface'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mazurka/mazurka_mediatype";
+            };
+          }
+      ) {};
+
+    mazurka_mediatype = mazurka_mediatype_0_2_0;
+
+    mazurka_mediatype_hyperjson_0_2_3 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poison_1_3_1,
+          mazurka_mediatype_0_2_0,
+          etude_0_4_0
+        }:
+          buildMix {
+            name = "mazurka_mediatype_hyperjson";
+            version = "0.2.3";
+            src = fetchHex {
+              pkg = "mazurka_mediatype_hyperjson";
+              version = "0.2.3";
+              sha256 =
+                "f09489f242598ece8496f50c9dfc3d1a051b6115a654ebbb9ce5336e04b2cb8d";
+            };
+            beamDeps  = [ poison_1_3_1 mazurka_mediatype_0_2_0 etude_0_4_0 ];
+
+            meta = {
+              description = ''hyper+json mediatype compiler for mazurka'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/mazurka/mazurka_mediatype_hyperjson";
+            };
+          }
+      ) {};
+
+    mazurka_mediatype_hyperjson = mazurka_mediatype_hyperjson_0_2_3;
+
+    mcrypt_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "mcrypt";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "mcrypt";
+              version = "0.1.0";
+              sha256 =
+                "508a35ba255190f80309dcabf9c81c88b86b9ec13af180627ad51b8e5cf2a4cd";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''NIF wrapper around libmcrypt.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/system76/elixir-mcrypt";
+            };
+          }
+      ) {};
+
+    mcrypt = mcrypt_0_1_0;
+
+    mcup_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mcup";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "mcup";
+              version = "0.0.2";
+              sha256 =
+                "c59537882707237c961d3d69b149619ec35c808cd5e98646cbcb7985e300b975";
+            };
+
+            meta = {
+              description = ''DSL for markup. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Joe-noh/mcup";
+            };
+          }
+      ) {};
+
+    mcup = mcup_0_0_2;
+
+    mdns_client_0_1_7 = callPackage
+      (
+        {  buildRebar3, fetchHex, lager_2_1_1 }:
+          buildRebar3 {
+            name = "mdns_client";
+            version = "0.1.7";
+            src = fetchHex {
+              pkg = "mdns_client";
+              version = "0.1.7";
+              sha256 =
+                "c707532d693bd19bed8ccd167574b6b0337f07e38b87bd7f9111d9cb9799fac2";
+            };
+
+            beamDeps  = [ lager_2_1_1 ];
+
+            meta = {
+              description = ''mDNS service discovery client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Licenser/erlang-mdns-client";
+            };
+          }
+      ) {};
+
+    mdns_client = mdns_client_0_1_7;
+
+    mdns_client_lib_0_1_33 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          pooler_1_4_0,
+          mdns_client_0_1_7,
+          lager_2_1_1
+        }:
+          buildRebar3 {
+            name = "mdns_client_lib";
+            version = "0.1.33";
+            src = fetchHex {
+              pkg = "mdns_client_lib";
+              version = "0.1.33";
+              sha256 =
+                "9ad3723c929acbdfec70021ceb6606e59c7e6189af97652409bfc9624052e0fe";
+            };
+
+            beamDeps  = [ pooler_1_4_0 mdns_client_0_1_7 lager_2_1_1 ];
+
+            meta = {
+              description = ''client lib for mdns aware tcp servers'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/Licenser/mdns_client_lib";
+            };
+          }
+      ) {};
+
+    mdns_client_lib = mdns_client_lib_0_1_33;
+
+    mdns_server_0_2_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "mdns_server";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "mdns_server";
+              version = "0.2.0";
+              sha256 =
+                "bc9465880e15e57033960ab6820258b87134bef69032210c67e53e3718e289d0";
+            };
+
+            meta = {
+              description = ''mDNS service discovery server'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Licenser/erlang-mdns-server";
+            };
+          }
+      ) {};
+
+    mdns_server = mdns_server_0_2_0;
+
+    mdns_server_lib_0_2_3 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          ranch_1_1_0,
+          mdns_server_0_2_0,
+          lager_3_0_2
+        }:
+          buildRebar3 {
+            name = "mdns_server_lib";
+            version = "0.2.3";
+            src = fetchHex {
+              pkg = "mdns_server_lib";
+              version = "0.2.3";
+              sha256 =
+                "078775ccea5d768095716ca6bd82f657601203352495d9726f4cc080c8c07695";
+            };
+
+            beamDeps  = [ ranch_1_1_0 mdns_server_0_2_0 lager_3_0_2 ];
+
+            meta = {
+              description = ''server side for mdns client server
+                            implementation'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/Licenser/mdns_server_lib";
+            };
+          }
+      ) {};
+
+    mdns_server_lib = mdns_server_lib_0_2_3;
+
+    meck_0_8_4 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "meck";
+            version = "0.8.4";
+            src = fetchHex {
+              pkg = "meck";
+              version = "0.8.4";
+              sha256 =
+                "2cdfbd0edd8f62b3d2061efc03c0e490282dd2ea6de44e15d2006e83f4f8eead";
+            };
+
+            meta = {
+              description = ''A mocking framework for Erlang'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/eproxus/meck";
+            };
+          }
+      ) {};
+
+    meck = meck_0_8_4;
+
+    medex_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4, consul_1_0_3 }:
+          buildMix {
+            name = "medex";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "medex";
+              version = "0.1.2";
+              sha256 =
+                "dd8dd07892a4aedbe7680fa8637b1c17b7615b2aaea0b25b84acad4ed50700d2";
+            };
+            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 consul_1_0_3 ];
+
+            meta = {
+              longDescription = ''Medical Examination - application for
+                                register health check callbacks and represent
+                                their state via HTTP.'';
+
+              homepage = "https://github.com/xerions/medex";
+            };
+          }
+      ) {};
+
+    medex = medex_0_1_2;
+
+    meld_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "meld";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "meld";
+              version = "0.1.2";
+              sha256 =
+                "3f86b810df38e0767a472829a26f92c07c986c1bcc41421eba021a5a6c174e83";
+            };
+
+            meta = {
+              description = ''create real CLIs in elixir, using mix tasks'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/conflate/meld";
+            };
+          }
+      ) {};
+
+    meld = meld_0_1_2;
+
+    mellon_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, plug_1_1_1 }:
+          buildMix {
+            name = "mellon";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "mellon";
+              version = "0.1.0";
+              sha256 =
+                "e9252f1abdc4c38a4ad9cc3bd194630f7756ba22a25e6ebf8e937b1600cb9aae";
+            };
+            beamDeps  = [ poison_2_1_0 plug_1_1_1 ];
+
+            meta = {
+              longDescription = ''Mellon is a Plug used in authentication of
+                                APIs. It`s flexible, you can define your own
+                                validator etc.'';
+
+              homepage = "https://github.com/sajmoon/mellon";
+            };
+          }
+      ) {};
+
+    mellon = mellon_0_1_0;
+
+    memcache_client_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, poolboy_1_5_1, poison_1_5_2 }:
+          buildMix {
+            name = "memcache_client";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "memcache_client";
+              version = "1.0.0";
+              sha256 =
+                "ef5977dc10fd0d55606887168735ae4a0c481a1edbf2a28e042cab3f53e1f9c3";
+            };
+            beamDeps  = [ poolboy_1_5_1 poison_1_5_2 ];
+
+            meta = {
+              description = ''Memcache client library utilizing the memcache
+                            binary protocol.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tsharju/memcache_client";
+            };
+          }
+      ) {};
+
+    memcache_client = memcache_client_1_0_0;
+
+    message_pack_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "message_pack";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "message_pack";
+              version = "0.2.0";
+              sha256 =
+                "94f31aa2734989e97562fcd1ad0b159e8571f4b97f591995bfdcbbbcfcaadd83";
+            };
+
+            meta = {
+              description = ''MessagePack Implementation for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mururu/msgpack-elixir";
+            };
+          }
+      ) {};
+
+    message_pack = message_pack_0_2_0;
+
+    meta_0_0_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, forms_0_0_1 }:
+          buildRebar3 {
+            name = "meta";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "meta";
+              version = "0.0.1";
+              sha256 =
+                "9aa1be58e265a16eafb9092d9675427672721ca9d3c924664e561b0857c6dcb8";
+            };
+
+            beamDeps  = [ forms_0_0_1 ];
+
+            meta = {
+              description = ''A metaprogramming library for Erlang'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/efcasado/forms";
+            };
+          }
+      ) {};
+
+    meta = meta_0_0_1;
+
+    metainvestigator_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, floki_0_7_1 }:
+          buildMix {
+            name = "metainvestigator";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "metainvestigator";
+              version = "0.0.3";
+              sha256 =
+                "774b3973090491a9a342a68c5cf099c98581ae0f1b1d313a08a7d2030d541781";
+            };
+            beamDeps  = [ floki_0_7_1 ];
+
+            meta = {
+              description = ''A library for web scraping, inspired by
+                            MetaInspector'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nekova/metainvestigator";
+            };
+          }
+      ) {};
+
+    metainvestigator = metainvestigator_0_0_3;
+
+    metrics_0_2_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "metrics";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "metrics";
+              version = "0.2.1";
+              sha256 =
+                "1cccc3534fa5a7861a3dcc0414afba00a616937e82c95d6172a523a5d2e97c03";
+            };
+
+            meta = {
+              description = ''A generic interface to different metrics systems
+                            in Erlang.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/benoitc/erlang-metrics";
+            };
+          }
+      ) {};
+
+    metrics = metrics_0_2_1;
+
+    metrix_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, logfmt_3_0_2 }:
+          buildMix {
+            name = "metrix";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "metrix";
+              version = "0.2.0";
+              sha256 =
+                "544fbe90988d7ac1e828287b44d88166c8aa2738ec983b1578af7d51d7b63dd7";
+            };
+            beamDeps  = [ logfmt_3_0_2 ];
+
+            meta = {
+              longDescription = ''Metrix is a library to log custom application
+                                metrics, in a well-structured, human *and*
+                                machine readable format, for use by downstream
+                                log processing systems (like Librato, Reimann,
+                                etc...)'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rwdaigle/metrix";
+            };
+          }
+      ) {};
+
+    metrix = metrix_0_2_0;
+
+    mex_0_0_5 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mex";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "mex";
+              version = "0.0.5";
+              sha256 =
+                "52765dc6f5d0b03dba9f08424b85cfbc96f873dfc769cdb6a26ac391ad3344e3";
+            };
+
+            meta = {
+              description = ''Macro-expansion display helper for IEx.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mrluc/mex";
+            };
+          }
+      ) {};
+
+    mex = mex_0_0_5;
+
+    microformats2_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, httpotion_2_2_0, floki_0_7_1 }:
+          buildMix {
+            name = "microformats2";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "microformats2";
+              version = "0.0.1";
+              sha256 =
+                "9b14b1065763c422beb7fea518a1374bb17bcbe8f903381612e4deb3c9b8e385";
+            };
+            beamDeps  = [ httpotion_2_2_0 floki_0_7_1 ];
+
+            meta = {
+              description = ''A microformats2 parser
+                            (http://microformats.org/wiki/microformats-2) for
+                            Elixir'';
+              license = stdenv.lib.licenses.agpl3;
+              homepage = "https://github.com/ckruse/microformats2-elixir";
+            };
+          }
+      ) {};
+
+    microformats2 = microformats2_0_0_1;
+
+    milliseconds_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "milliseconds";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "milliseconds";
+              version = "0.0.1";
+              sha256 =
+                "6f82b9f47590e96ed90761d6eb331a9c11a40b68216d5e4867420899420035f0";
+            };
+
+            meta = {
+              longDescription = '' Simple library to work with milliseconds.
+                                Convert text to milliseconds: convert("2d")
+                                Convert milliseconds to text: convert(8640000)
+                                Calculate future time: future_time("6hrs") '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/davebryson/elixir_milliseconds";
+            };
+          }
+      ) {};
+
+    milliseconds = milliseconds_0_0_1;
+
+    mime_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mime";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "mime";
+              version = "0.0.1";
+              sha256 =
+                "24098ddfbd23433846d064a337531dcd3b1c3abdad4c359bf4f1a89243270a00";
+            };
+
+            meta = {
+              description = ''A mime type module for elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/elixirdrops/mime";
+            };
+          }
+      ) {};
+
+    mime = mime_0_0_1;
+
+    mimerl_1_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "mimerl";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "mimerl";
+              version = "1.0.0";
+              sha256 =
+                "a30b01104a29bd3a363db8646e4ce0f7980f9ecd23a98707c46c3ced918c41b4";
+            };
+
+            meta = {
+              description = ''Library to handle mimetypes'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/benoitc/mimerl";
+            };
+          }
+      ) {};
+
+    mimerl_1_0_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "mimerl";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "mimerl";
+              version = "1.0.2";
+              sha256 =
+                "7a4c8e1115a2732a67d7624e28cf6c9f30c66711a9e92928e745c255887ba465";
+            };
+
+            meta = {
+              description = ''Library to handle mimetypes'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/benoitc/mimerl";
+            };
+          }
+      ) {};
+
+    mimerl_1_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "mimerl";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "mimerl";
+              version = "1.1.0";
+              sha256 =
+                "def0f1922a5dcdeeee6e4f41139b364e7f0f40239774b528a0986b12bcb42ddc";
+            };
+
+            meta = {
+              description = ''Library to handle mimetypes'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/benoitc/mimerl";
+            };
+          }
+      ) {};
+
+    mimerl = mimerl_1_1_0;
+
+    mimetype_parser_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mimetype_parser";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "mimetype_parser";
+              version = "0.1.1";
+              sha256 =
+                "ec26e5e2bb279babd5bd415d626d04040d9f719fc2b0066eb909777a93015fce";
+            };
+
+            meta = {
+              description = ''parse mimetypes'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/camshaft/mimetype_parser";
+            };
+          }
+      ) {};
+
+    mimetype_parser = mimetype_parser_0_1_1;
+
+    mimex_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mimex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "mimex";
+              version = "0.1.0";
+              sha256 =
+                "68858d5fb6a59780c3b94a445fd994856c3f1d0f3ed8dff6a95b6aa80027e4de";
+            };
+
+            meta = {
+              description = ''MIME type utilities for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/hex-sh/mimex";
+            };
+          }
+      ) {};
+
+    mimex = mimex_0_1_0;
+
+    minmaxlist_0_0_5 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "minmaxlist";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "minmaxlist";
+              version = "0.0.5";
+              sha256 =
+                "6d14c8a55196e803cb6cdfded42f57d61b96e4bd3ce7c31f36e33a3257256d8e";
+            };
+
+            meta = {
+              longDescription = ''Elixir library extending `Enum.min_by/2`,
+                                `Enum.max_by/2` and `Enum.min_max_by/2` to
+                                return a list of results instead of just one.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/seantanly/elixir-minmaxlist";
+            };
+          }
+      ) {};
+
+    minmaxlist = minmaxlist_0_0_5;
+
+    misc_random_0_2_6 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "misc_random";
+            version = "0.2.6";
+            src = fetchHex {
+              pkg = "misc_random";
+              version = "0.2.6";
+              sha256 =
+                "4fe3db3bddcf55d93404fa9f5bf006800d54bfeb78bcf583376750d28ac0d7bc";
+            };
+
+            meta = {
+              longDescription = ''This is a very thin wrapper around erlang`s
+                                random:uniform method. It allows you to create
+                                random strings or numbers.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gutschilla/elixir-helper-random";
+            };
+          }
+      ) {};
+
+    misc_random = misc_random_0_2_6;
+
+    mix_apidoc_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2 }:
+          buildMix {
+            name = "mix_apidoc";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "mix_apidoc";
+              version = "0.1.0";
+              sha256 =
+                "e22e8a2ebf33efb6feb9a7ee6ee69a2df73496c8c6793a57cd426e9e9b1ba82e";
+            };
+            beamDeps  = [ poison_1_5_2 ];
+
+            meta = {
+              longDescription = ''A mix task that triggers apidoc to create
+                                documentation for RESTful web APIs from inline
+                                code annotations.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sldab/mix_apidoc";
+            };
+          }
+      ) {};
+
+    mix_apidoc = mix_apidoc_0_1_0;
+
+    mix_deps_tree_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mix_deps_tree";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "mix_deps_tree";
+              version = "0.1.0";
+              sha256 =
+                "de19ea3eebf578080263f25fdf6a248fdc460aa86e41d582cc0d0379329fa6b6";
+            };
+
+            meta = {
+              description = ''Mix task to print dependency tree of an
+                            application to a terminal'';
+
+              homepage = "https://github.com/liveforeverx/mix_deps_tree";
+            };
+          }
+      ) {};
+
+    mix_deps_tree = mix_deps_tree_0_1_0;
+
+    mix_erlang_tasks_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mix_erlang_tasks";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "mix_erlang_tasks";
+              version = "0.1.0";
+              sha256 =
+                "95d2839c422c482a70c08a8702da8242f86b773f8ab6e8602a4eb72da8da04ed";
+            };
+
+            meta = {
+              longDescription = ''This project provides a few Mix tasks that
+                                make it more convenient to use Mix as a build
+                                tool and package manager when developing
+                                applications in Erlang.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/alco/mix-erlang-tasks";
+            };
+          }
+      ) {};
+
+    mix_erlang_tasks = mix_erlang_tasks_0_1_0;
+
+    mix_eunit_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mix_eunit";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "mix_eunit";
+              version = "0.1.2";
+              sha256 =
+                "910cd611635e845be3c57b2c6c0dac7af24c87055b3d289fe93d7df1dafaeb6c";
+            };
+
+            meta = {
+              description = ''A mix task to run eunit tests, works for umbrella
+                            projects'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dantswain/mix_eunit";
+            };
+          }
+      ) {};
+
+    mix_eunit = mix_eunit_0_1_2;
+
+    mix_info_0_7_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mix_info";
+            version = "0.7.2";
+            src = fetchHex {
+              pkg = "mix_info";
+              version = "0.7.2";
+              sha256 =
+                "7b4430ea649bb0c978f3b761403c068b08d9781c3f325c3f0dc57c1b44f395a2";
+            };
+
+            meta = {
+              longDescription = ''A mix task that counts directories, files,
+                                lines of code, modules, functions etc and
+                                displays the results.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pskordilakis/mix_info";
+            };
+          }
+      ) {};
+
+    mix_info = mix_info_0_7_2;
+
+    mix_test_watch_0_2_5 = callPackage
+      (
+        {  buildMix, fetchHex, fs_0_9_2 }:
+          buildMix {
+            name = "mix_test_watch";
+            version = "0.2.5";
+            src = fetchHex {
+              pkg = "mix_test_watch";
+              version = "0.2.5";
+              sha256 =
+                "68ddd24df6d6ca77f8a95d4bb0443998031984122aa574d79434fac25f10da7b";
+            };
+            beamDeps  = [ fs_0_9_2 ];
+
+            meta = {
+              description = ''Automatically run tests when files change'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lpil/mix-test.watch";
+            };
+          }
+      ) {};
+
+    mix_test_watch = mix_test_watch_0_2_5;
+
+    mixpanel_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, exjsx_3_1_0 }:
+          buildMix {
+            name = "mixpanel";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "mixpanel";
+              version = "0.0.3";
+              sha256 =
+                "7b81d80d3705e5d4451951984bac49d476e3c79131138e9ffb66538f9c51a56e";
+            };
+            beamDeps  = [ exjsx_3_1_0 ];
+
+            meta = {
+              description = ''A client for the Mixpanel HTTP API. See
+                            mixpanel.com.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/michihuber/mixpanel_ex";
+            };
+          }
+      ) {};
+
+    mixpanel = mixpanel_0_0_3;
+
+    mixpanel_api_ex_0_8_3 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "mixpanel_api_ex";
+            version = "0.8.3";
+            src = fetchHex {
+              pkg = "mixpanel_api_ex";
+              version = "0.8.3";
+              sha256 =
+                "1ff5eb4aa333495a86868873deb8fcd04c5f2e6f2560d77ac6ccbe07e2e3d7b4";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Elixir client for the Mixpanel API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/agevio/mixpanel_api_ex";
+            };
+          }
+      ) {};
+
+    mixpanel_api_ex = mixpanel_api_ex_0_8_3;
+
+    mixpanel_data_client_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_3_1, httpoison_0_8_1 }:
+          buildMix {
+            name = "mixpanel_data_client";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "mixpanel_data_client";
+              version = "0.0.2";
+              sha256 =
+                "7f3bbd608ae18153655f27bd50ea01ad85630d6c1cc6ab9ed336e95419f06c86";
+            };
+            beamDeps  = [ poison_1_3_1 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Client library for interacting with the Mixpanel
+                            Data API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jeregrine/mixpanel_data_client";
+            };
+          }
+      ) {};
+
+    mixpanel_data_client = mixpanel_data_client_0_0_2;
+
+    mixstar_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, netrc_0_0_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "mixstar";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "mixstar";
+              version = "0.0.1";
+              sha256 =
+                "d7f9014711d04049c90a8f835857d1bde04647b326d1ec949e2a90477f4d4a39";
+            };
+            beamDeps  = [ netrc_0_0_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''MixStar starred GitHub repository that depends on
+                            your project'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ma2gedev/mix-star";
+            };
+          }
+      ) {};
+
+    mixstar = mixstar_0_0_1;
+
+    mixunit_0_9_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "mixunit";
+            version = "0.9.2";
+            src = fetchHex {
+              pkg = "mixunit";
+              version = "0.9.2";
+              sha256 =
+                "2c0e66d10d479ec95c636d2de1db04cba03574282182af0df49c297230b22d43";
+            };
+
+            meta = {
+              description = ''an eunit task for mix'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/talentdeficit/mixunit";
+            };
+          }
+      ) {};
+
+    mixunit = mixunit_0_9_2;
+
+    mmExchangeRate_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, jsx_2_8_0, httpotion_1_0_0 }:
+          buildMix {
+            name = "mmExchangeRate";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "mmExchangeRate";
+              version = "0.0.1";
+              sha256 =
+                "6daf6e74bf3ce8f9d7cc19b18b023d700201a847dde94a0eef1f263ce65efbac";
+            };
+            beamDeps  = [ jsx_2_8_0 httpotion_1_0_0 ];
+
+            meta = {
+              longDescription = ''A simple exchange rate checker and calculator
+                                based on Central Bank of Myanmar Api. '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/Arkar-Aung/mmExchangeRate";
+            };
+          }
+      ) {};
+
+    mmExchangeRate = mmExchangeRate_0_0_1;
+
+    mmath_0_1_15 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "mmath";
+            version = "0.1.15";
+            src = fetchHex {
+              pkg = "mmath";
+              version = "0.1.15";
+              sha256 =
+                "2ad56c5a321dda866f36981df134b9e2f393b46786cd2549ed626d1423458c86";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''math library for metric sequences and binary
+                            arrays.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dalmatinerdb/mmath";
+            };
+          }
+      ) {};
+
+    mmath_0_1_16 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "mmath";
+            version = "0.1.16";
+            src = fetchHex {
+              pkg = "mmath";
+              version = "0.1.16";
+              sha256 =
+                "dcf450b5527ba445e0b33ecdb0d546fa9bff96f6efbf6d314447f32344d37ef6";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''math library for metric sequences and binary
+                            arrays.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dalmatinerdb/mmath";
+            };
+          }
+      ) {};
+
+    mmath = mmath_0_1_16;
+
+    mobiledoc_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mobiledoc";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "mobiledoc";
+              version = "0.0.1";
+              sha256 =
+                "02aaa0168d51cd5d491127128f568ff37a6415115c45076a79bc8f7f449c524a";
+            };
+
+            meta = {
+              description = ''An HTML renderer for the MobileDoc format used by
+                            the ContentKit editor.'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/zeppelin/mobiledoc-renderer-elixir";
+            };
+          }
+      ) {};
+
+    mobiledoc = mobiledoc_0_0_1;
+
+    mochiweb_2_12_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "mochiweb";
+            version = "2.12.2";
+            src = fetchHex {
+              pkg = "mochiweb";
+              version = "2.12.2";
+              sha256 =
+                "d3e681d4054b74a96cf2efcd09e94157ab83a5f55ddc4ce69f90b8144673bd7a";
+            };
+
+            meta = {
+              description = ''MochiWeb is an Erlang library for building
+                            lightweight HTTP servers. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mochi/mochiweb";
+            };
+          }
+      ) {};
+
+    mochiweb = mochiweb_2_12_2;
+
+    mock_0_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, meck_0_8_4 }:
+          buildRebar3 {
+            name = "mock";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "mock";
+              version = "0.1.1";
+              sha256 =
+                "d2d73a2f0621bbf23011fdc6a29eca114381e77098e19b71d0774278ca80bc01";
+            };
+
+            beamDeps  = [ meck_0_8_4 ];
+
+            meta = {
+              longDescription = ''A mocking libary for the Elixir language. We
+                                use the Erlang meck library to provide module
+                                mocking functionality for Elixir. It uses macros
+                                in Elixir to expose the functionality in a
+                                convenient manner for integrating in Elixir
+                                tests.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jjh42/mock";
+            };
+          }
+      ) {};
+
+    mock = mock_0_1_1;
+
+    module_mocker_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "module_mocker";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "module_mocker";
+              version = "0.2.0";
+              sha256 =
+                "ce8aa59f0c58ce7d333a1853f6a3a106fe0cbbe79f6f9aeb72370d66ed454f5b";
+            };
+
+            meta = {
+              longDescription = ''ModuleMocker allows to use different module
+                                in development and test environment. It allows
+                                convention to mock module for test'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rohanpujaris/module_mocker";
+            };
+          }
+      ) {};
+
+    module_mocker = module_mocker_0_2_0;
+
+    moebius_1_0_8 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          timex_0_19_5,
+          postgrex_0_9_1,
+          poison_1_5_2,
+          json_0_3_3,
+          inflex_1_5_0
+        }:
+          buildMix {
+            name = "moebius";
+            version = "1.0.8";
+            src = fetchHex {
+              pkg = "moebius";
+              version = "1.0.8";
+              sha256 =
+                "6fb42bfb7a85409e5281d990d9db5a5012221019867eef34de2e49fce245b0d9";
+            };
+            beamDeps  = [
+                          timex_0_19_5
+                          postgrex_0_9_1
+                          poison_1_5_2
+                          json_0_3_3
+                          inflex_1_5_0
+                        ];
+
+            meta = {
+              description = ''A functional approach to data access with
+                            Elixir'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/robconery/moebius";
+            };
+          }
+      ) {};
+
+    moebius = moebius_1_0_8;
+
+    mogrify_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mogrify";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "mogrify";
+              version = "0.2.0";
+              sha256 =
+                "47e9c3c9eba9772f0d5da28e430efef4e9317a7f805357de06a18945ebbf9a5e";
+            };
+
+            meta = {
+              description = ''ImageMagick command line wrapper.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/route/mogrify";
+            };
+          }
+      ) {};
+
+    mogrify = mogrify_0_2_0;
+
+    mojoauth_1_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, timex_1_0_1 }:
+          buildMix {
+            name = "mojoauth";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "mojoauth";
+              version = "1.0.2";
+              sha256 =
+                "72d8b3fdff6d6571d7dcc9ad46b249823c84e0321920a0e9d6f39ee5f9fc2f23";
+            };
+            beamDeps  = [ timex_1_0_1 ];
+
+            meta = {
+              longDescription = ''MojoAuth is a set of standard approaches to
+                                cross-app authentication based on HMAC.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/adhearsion/mojo-auth.ex";
+            };
+          }
+      ) {};
+
+    mojoauth = mojoauth_1_0_2;
+
+    moment_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "moment";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "moment";
+              version = "0.1.0";
+              sha256 =
+                "0cc098c8ba88f768ffd41e4bc4bb45b559d49361a2f8f7a39c686020da3f1842";
+            };
+
+            meta = {
+              description = ''Parse, validate, manipulate, and display dates in
+                            Elixir.'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/atabary/moment";
+            };
+          }
+      ) {};
+
+    moment = moment_0_1_0;
+
+    mon_handler_1_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, dialyze_0_2_0 }:
+          buildMix {
+            name = "mon_handler";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "mon_handler";
+              version = "1.0.2";
+              sha256 =
+                "d18942f95750b94e3da1d9fca7a2ea4b1b1d27c017feff76cb109b29bb308f58";
+            };
+            beamDeps  = [ dialyze_0_2_0 ];
+
+            meta = {
+              longDescription = ''A minimal GenServer that monitors a given
+                                GenEvent handler. This server will handle exits
+                                of the Handler and attempt to re-add it to the
+                                manager when unexpected exits occur. Exits for
+                                :normal, :shutdown or :swapped reasons will not
+                                attempt a re-add to the manager.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tattdcodemonkey/mon_handler";
+            };
+          }
+      ) {};
+
+    mon_handler = mon_handler_1_0_2;
+
+    monad_1_0_5 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "monad";
+            version = "1.0.5";
+            src = fetchHex {
+              pkg = "monad";
+              version = "1.0.5";
+              sha256 =
+                "d8ebe20971160e96bd6cdf11b5e8b5c24b70fddde3d198e5f7c3b5ebfbc78d6e";
+            };
+
+            meta = {
+              description = ''Monads and do-syntax for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rmies/monad";
+            };
+          }
+      ) {};
+
+    monad = monad_1_0_5;
+
+    monadex_1_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "monadex";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "monadex";
+              version = "1.0.2";
+              sha256 =
+                "968784f2789fcb30b118399e51736f2265ca6b2823cc8fcabd73d6e4ac23e082";
+            };
+
+            meta = {
+              description = ''Improve pipelines with monads.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rob-brown/MonadEx";
+            };
+          }
+      ) {};
+
+    monadex = monadex_1_0_2;
+
+    mondo_0_1_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_2_1_0, plug_1_1_1, httpoison_0_8_1
+        }:
+          buildMix {
+            name = "mondo";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "mondo";
+              version = "0.1.0";
+              sha256 =
+                "f557216314e098137f5140f1194e2eba7a2a030d78affc23ea5943f586ab1095";
+            };
+            beamDeps  = [ poison_2_1_0 plug_1_1_1 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''An Elixir client for the Mondo API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/stevedomin/mondo_elixir";
+            };
+          }
+      ) {};
+
+    mondo = mondo_0_1_0;
+
+    monetized_0_3_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, ecto_1_1_3, decimal_1_1_1 }:
+          buildMix {
+            name = "monetized";
+            version = "0.3.2";
+            src = fetchHex {
+              pkg = "monetized";
+              version = "0.3.2";
+              sha256 =
+                "1978e46c6dd352fea0e9ce208835886ea4fd07dfc1555ee2f9adce98a9e82ce6";
+            };
+            beamDeps  = [ poison_1_5_2 ecto_1_1_3 decimal_1_1_1 ];
+
+            meta = {
+              description = ''A lightweight solution for handling and storing
+                            money.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/theocodes/monetized";
+            };
+          }
+      ) {};
+
+    monetized = monetized_0_3_2;
+
+    money_0_0_1_dev = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "money";
+            version = "0.0.1-dev";
+            src = fetchHex {
+              pkg = "money";
+              version = "0.0.1-dev";
+              sha256 =
+                "ea032fa5bbed9b9e8a91192601d612b805b1855e0ed6cdb99e3277b0a2735aeb";
+            };
+
+            meta = {
+              longDescription = ''Elixir library for working with Money safer,
+                                easier, and fun, is an interpretation of the
+                                Fowler`s Money pattern in fun.prog.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/liuggio/money";
+            };
+          }
+      ) {};
+
+    money = money_0_0_1_dev;
+
+    mongo_0_5_4 = callPackage
+      (
+        {  buildMix, fetchHex, bson_0_4_4 }:
+          buildMix {
+            name = "mongo";
+            version = "0.5.4";
+            src = fetchHex {
+              pkg = "mongo";
+              version = "0.5.4";
+              sha256 =
+                "fb6e0ed11bd2f193e12d0f905eb1968525b52dc99441ecbbf90c7745df246ed8";
+            };
+            beamDeps  = [ bson_0_4_4 ];
+
+            meta = {
+              description = ''MongoDB driver for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/checkiz/elixir-mongo";
+            };
+          }
+      ) {};
+
+    mongo = mongo_0_5_4;
+
+    mongodb_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, poolboy_1_5_1, connection_1_0_2 }:
+          buildMix {
+            name = "mongodb";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "mongodb";
+              version = "0.1.1";
+              sha256 =
+                "714f0543288c42bc42bf3ee6ac5f52db3fbc0b152610aa2536b51c244652abe0";
+            };
+            beamDeps  = [ poolboy_1_5_1 connection_1_0_2 ];
+
+            meta = {
+              description = ''MongoDB driver for Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/ericmj/mongodb";
+            };
+          }
+      ) {};
+
+    mongodb = mongodb_0_1_1;
+
+    mongodb_ecto_0_1_3 = callPackage
+      (
+        {  buildMix, fetchHex, mongodb_0_1_1, ecto_1_0_7 }:
+          buildMix {
+            name = "mongodb_ecto";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "mongodb_ecto";
+              version = "0.1.3";
+              sha256 =
+                "8befad3e958f3924cb780dbf958d63539d48e23ca680e4e9dc1cf63b6827ce8a";
+            };
+            beamDeps  = [ mongodb_0_1_1 ecto_1_0_7 ];
+
+            meta = {
+              description = ''MongoDB adapter for Ecto'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/michalmuskala/mongodb_ecto";
+            };
+          }
+      ) {};
+
+    mongodb_ecto = mongodb_ecto_0_1_3;
+
+    monk_0_1_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "monk";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "monk";
+              version = "0.1.3";
+              sha256 =
+                "35e6a2eea7090612fa25a003fb95ac120f27087f203445bbc33ac18682ddd724";
+            };
+
+            meta = {
+              description = ''Monk helps to distinguish good from evil with an
+                            simple ok/error monad'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/niahoo/monk";
+            };
+          }
+      ) {};
+
+    monk = monk_0_1_3;
+
+    morph_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "morph";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "morph";
+              version = "0.1.0";
+              sha256 =
+                "a20a6bfda56cb8f2d9904e2ea4b2b0a4159ab2692181919f6eb4fe9f52abf3f2";
+            };
+
+            meta = {
+              description = ''Lightweight string transformations for Elixir.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/cmoncrief/elixir-morph";
+            };
+          }
+      ) {};
+
+    morph = morph_0_1_0;
+
+    motor_hat_0_6_1 = callPackage
+      (
+        {  buildMix, fetchHex, elixir_ale_0_4_1 }:
+          buildMix {
+            name = "motor_hat";
+            version = "0.6.1";
+            src = fetchHex {
+              pkg = "motor_hat";
+              version = "0.6.1";
+              sha256 =
+                "f555e0ec59ee95d4dc6c14cbc3d9d12014f9bd7882c776dde715b9b1674ffa79";
+            };
+            beamDeps  = [ elixir_ale_0_4_1 ];
+
+            meta = {
+              longDescription = ''Elixir implementation of the pyhton motor_hat
+                                library from Adafruit for there motor_hat board.
+                                Library:
+                                https://github.com/adafruit/Adafruit-Motor-HAT-Python-Library
+                                Board: https://www.adafruit.com/product/2348'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/matthewphilyaw/motor_hat";
+            };
+          }
+      ) {};
+
+    motor_hat = motor_hat_0_6_1;
+
+    moxie_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "moxie";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "moxie";
+              version = "0.0.1";
+              sha256 =
+                "193e18ce0888f01fe2b43d0dcf79af5f48e50eba3a73609703cb4c04bea2ae46";
+            };
+
+            meta = {
+               license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/molossus/moxie";
+            };
+          }
+      ) {};
+
+    moxie = moxie_0_0_1;
+
+    mpinyin_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mpinyin";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "mpinyin";
+              version = "0.0.2";
+              sha256 =
+                "1de0911391e6a76a91166f5210d4254165692ea28c00d4f153763d0a5757cb92";
+            };
+
+            meta = {
+              description = ''Pinyin module for Elixir. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Hor/mpinyin";
+            };
+          }
+      ) {};
+
+    mpinyin = mpinyin_0_0_2;
+
+    msgpack_0_4_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "msgpack";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "msgpack";
+              version = "0.4.0";
+              sha256 =
+                "cb69184b254bcddfd0b3b813fa9ffc87dd4642ad026bb8117e2384b55239eae4";
+            };
+
+            meta = {
+              description = ''MessagePack serializer/deserializer'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "http://msgpack.org";
+            };
+          }
+      ) {};
+
+    msgpack = msgpack_0_4_0;
+
+    msgpax_0_7_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "msgpax";
+            version = "0.7.0";
+            src = fetchHex {
+              pkg = "msgpax";
+              version = "0.7.0";
+              sha256 =
+                "c51838cc08674eada16ff7ff516b1c4028fecba602bdc04747f85a94dca25202";
+            };
+
+            meta = {
+              longDescription = ''This library provides an API for serializing
+                                and de-serializing Elixir terms using the
+                                MessagePack format'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/lexmag/msgpax";
+            };
+          }
+      ) {};
+
+    msgpax_0_8_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "msgpax";
+            version = "0.8.2";
+            src = fetchHex {
+              pkg = "msgpax";
+              version = "0.8.2";
+              sha256 =
+                "aa0baa382383160d90275a1b5d8f72c457a2feed89cbb1bd080a5c3821389507";
+            };
+
+            meta = {
+              longDescription = ''This library provides an API for serializing
+                                and de-serializing Elixir terms using the
+                                MessagePack format'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/lexmag/msgpax";
+            };
+          }
+      ) {};
+
+    msgpax = msgpax_0_8_2;
+
+    mstore_0_1_9 = callPackage
+      (
+        {  buildRebar3, fetchHex, trie_1_5_0, mmath_0_1_15 }:
+          buildRebar3 {
+            name = "mstore";
+            version = "0.1.9";
+            src = fetchHex {
+              pkg = "mstore";
+              version = "0.1.9";
+              sha256 =
+                "c9b0ac9de587e72d292b923c12fcc1ce8b74946dd688987246a5a4d26679b6ca";
+            };
+
+            beamDeps  = [ trie_1_5_0 mmath_0_1_15 ];
+
+            meta = {
+              description = ''Fast, flat metric store.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dalmatinerdb/mstore";
+            };
+          }
+      ) {};
+
+    mstore = mstore_0_1_9;
+
+    mt940_0_4_0 = callPackage
+      (
+        {  buildMix, fetchHex, timex_0_19_5, decimal_1_1_1 }:
+          buildMix {
+            name = "mt940";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "mt940";
+              version = "0.4.0";
+              sha256 =
+                "7d9f509b4fa43bee0feaba3fa1aceed394145daa522561cd84b584d968be3be4";
+            };
+            beamDeps  = [ timex_0_19_5 decimal_1_1_1 ];
+
+            meta = {
+              description = ''MT940 parser for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/my-flow/mt940";
+            };
+          }
+      ) {};
+
+    mt940 = mt940_0_4_0;
+
+    mtx_1_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "mtx";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "mtx";
+              version = "1.0.0";
+              sha256 =
+                "3bdcb209fe3cdfc5a6b5b95f619ecd123b7ee1d9203ace2178c8ff73be5bb90f";
+            };
+
+            meta = {
+              description = ''Metrics Client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/synrc/mtx";
+            };
+          }
+      ) {};
+
+    mtx = mtx_1_0_0;
+
+    multidef_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "multidef";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "multidef";
+              version = "0.2.1";
+              sha256 =
+                "719dfdb9206ea34fc7b49c282b30adab752f9d1efb22678907d54fa0b54c50c6";
+            };
+
+            meta = {
+              longDescription = ''Lets you define multiple heads for the same
+                                function: defmodule Test do import MultiDef mdef
+                                fred do { :init, val } -> fred {:double, val} {
+                                :double, val } -> IO.puts(val*2) a, b -> a+b end
+                                end IO.inspect Test.fred 1, 2 #=> 3 IO.inspect
+                                Test.fred { :init, 4 } #=> 8 '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/pragdave/mdef";
+            };
+          }
+      ) {};
+
+    multidef = multidef_0_2_1;
+
+    multiset_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "multiset";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "multiset";
+              version = "0.0.4";
+              sha256 =
+                "f713b5102d17963fc516e0017725d716dade0b1fec979f0e3a53b8d203748c45";
+            };
+
+            meta = {
+              description = ''Multisets for Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/hilverd/multiset-elixir";
+            };
+          }
+      ) {};
+
+    multiset = multiset_0_0_4;
+
+    murdoch_0_0_1 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1, goth_0_0_3
+        }:
+          buildMix {
+            name = "murdoch";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "murdoch";
+              version = "0.0.1";
+              sha256 =
+                "77ec44ca76d6b4a14df7222104a36cb29ed25f7d52fb3ffe30807ddc82a2d9ad";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 goth_0_0_3 ];
+
+            meta = {
+              longDescription = ''A library for interacting with Google Cloud
+                                Pub/Sub (PubSub). Supports both publication and
+                                pull subscription'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/peburrows/murdoch";
+            };
+          }
+      ) {};
+
+    murdoch = murdoch_0_0_1;
+
+    murmur_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "murmur";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "murmur";
+              version = "1.0.0";
+              sha256 =
+                "5e81af1fe3c7a166830e5a695e2f2253a5255888c2f510d206d103914b4e28da";
+            };
+
+            meta = {
+              longDescription = ''Murmur is a pure Elixir implementation of the
+                                non-cryptographic hash Murmur3. It aims to
+                                implement the x86_32bit, x86_128bit and
+                                x64_128bit variants.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gmcabrita/murmur";
+            };
+          }
+      ) {};
+
+    murmur = murmur_1_0_0;
+
+    mustache_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mustache";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "mustache";
+              version = "0.0.2";
+              sha256 =
+                "0d91f0a6221f482e736987c59032e84f6bade6ae9179e595592e2cc0b728b441";
+            };
+
+            meta = {
+              description = ''Mustache templates for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/schultyy/Mustache.ex";
+            };
+          }
+      ) {};
+
+    mustache = mustache_0_0_2;
+
+    mustachex_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mustachex";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "mustachex";
+              version = "0.0.1";
+              sha256 =
+                "356a7268e609c77a5b02d4ea4d98a189684a07709ec7db2dafd2b34da79bb402";
+            };
+
+            meta = {
+              description = ''Mustache for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jui/mustachex";
+            };
+          }
+      ) {};
+
+    mustachex = mustachex_0_0_1;
+
+    mynumber_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mynumber";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "mynumber";
+              version = "1.0.0";
+              sha256 =
+                "9d95bd6c7a2178c1fe3b9dc2712a6d9567885389a1a20b27518ea6067deeb0f7";
+            };
+
+            meta = {
+              description = ''Mynumber Validation for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/cncgl/elixir_mynumber";
+            };
+          }
+      ) {};
+
+    mynumber = mynumber_1_0_0;
+
+    mysql_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mysql";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "mysql";
+              version = "1.0.0";
+              sha256 =
+                "34b8e9252e150d329798a0d7f7054f40c08703ccdd7e37dfc5116fe388513251";
+            };
+
+            meta = {
+              description = ''MySQL/OTP – MySQL driver for Erlang/OTP'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/mysql-otp/mysql-otp";
+            };
+          }
+      ) {};
+
+    mysql = mysql_1_0_0;
+
+    mysqlex_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, mysql_1_0_0 }:
+          buildMix {
+            name = "mysqlex";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "mysqlex";
+              version = "0.0.1";
+              sha256 =
+                "5df9c80e9ff9a61fe9ddb4c8883963686f66e21168b64acfa55b14c50e9305ee";
+            };
+            beamDeps  = [ mysql_1_0_0 ];
+
+            meta = {
+              longDescription = ''An Ecto-compatible wrapper around the
+                                mysql-otp library.
+                                https://github.com/mysql-otp/mysql-otp'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/tjheeta/mysqlex";
+            };
+          }
+      ) {};
+
+    mysqlex = mysqlex_0_0_1;
+
+    n2o_2_3_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "n2o";
+            version = "2.3.0";
+            src = fetchHex {
+              pkg = "n2o";
+              version = "2.3.0";
+              sha256 =
+                "fca4f0a259fda332784d6d7948f8aadec5fb6a7695d5ac79b849b0ae547fb7b8";
+            };
+
+            meta = {
+              description = ''N2O Application Server'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/synrc/n2o";
+            };
+          }
+      ) {};
+
+    n2o = n2o_2_3_0;
+
+    nacl_0_3_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "nacl";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "nacl";
+              version = "0.3.0";
+              sha256 =
+                "83a626d0ddd17a9c9528aa57a79e0e19746a42def007bc48c4984f0905098a7b";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''Erlang-NaCl hex package'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tonyg/erlang-nacl";
+            };
+          }
+      ) {};
+
+    nacl = nacl_0_3_0;
+
+    nadia_0_3_3 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "nadia";
+            version = "0.3.3";
+            src = fetchHex {
+              pkg = "nadia";
+              version = "0.3.3";
+              sha256 =
+                "8ea94a9a92aac18b98736148892c6ec672fa599cb5aa222757393c1551228b4e";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Telegram Bot API Wrapper written in Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zhyu/nadia";
+            };
+          }
+      ) {};
+
+    nadia = nadia_0_3_3;
+
+    nat_set_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "nat_set";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "nat_set";
+              version = "0.0.1";
+              sha256 =
+                "cc6ed65c754153d7c98c9825370780831cfbe638d162cb4ae2178eadcdd00611";
+            };
+
+            meta = {
+              description = ''Represent sets of natural numbers compactly in
+                            Elixir using bitwise operations'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/hilverd/nat-set-elixir";
+            };
+          }
+      ) {};
+
+    nat_set = nat_set_0_0_1;
+
+    nativegen_0_4_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "nativegen";
+            version = "0.4.1";
+            src = fetchHex {
+              pkg = "nativegen";
+              version = "0.4.1";
+              sha256 =
+                "54c36ca3c0333f04b84f8b15fa028fcecfe77614954c78e87b22ed56e977f46f";
+            };
+
+            meta = {
+              description = ''Accessible REST API code generator for native
+                            app.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/yoavlt/nativegen";
+            };
+          }
+      ) {};
+
+    nativegen = nativegen_0_4_1;
+
+    nats_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poolboy_1_5_1, json_0_3_3 }:
+          buildMix {
+            name = "nats";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "nats";
+              version = "0.0.1";
+              sha256 =
+                "5568e91f56f65388ad6cb92ddbd70cec5227dadea9d12ec558e93bfe71c9bf78";
+            };
+            beamDeps  = [ poolboy_1_5_1 json_0_3_3 ];
+
+            meta = {
+              description = ''A NATS client written in elixir supporting
+                            pub/sub for microservices'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/aforward/elixir_nats";
+            };
+          }
+      ) {};
+
+    nats = nats_0_0_1;
+
+    nats_msg_0_3_3 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "nats_msg";
+            version = "0.3.3";
+            src = fetchHex {
+              pkg = "nats_msg";
+              version = "0.3.3";
+              sha256 =
+                "80b2669f8c53395c156d3a121befe71a5131d7a42f14a38fbd7778a179b498ac";
+            };
+
+            meta = {
+              description = ''Pure Erlang NATS Protocol Message
+                            Encoder/Decoder'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/yuce/nats_msg";
+            };
+          }
+      ) {};
+
+    nats_msg = nats_msg_0_3_3;
+
+    natsio_0_1_4 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "natsio";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "natsio";
+              version = "0.1.4";
+              sha256 =
+                "3ed391e3e5f494828da2cb4949e661df782004cfe8273b9f1685ba4bc858187e";
+            };
+
+            meta = {
+              description = ''NATS framework for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nats-io/elixir-nats";
+            };
+          }
+      ) {};
+
+    natsio = natsio_0_1_4;
+
+    natural_sort_0_3_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "natural_sort";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "natural_sort";
+              version = "0.3.0";
+              sha256 =
+                "6c3476edf395c487a8b55d104458e0f029ca2adb7a0373d12a7a08643f7e7172";
+            };
+
+            meta = {
+              description = ''Sort a list of strings containing numbers in a
+                            natural manner. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/DanCouper/natural_sort";
+            };
+          }
+      ) {};
+
+    natural_sort = natural_sort_0_3_0;
+
+    naughtygram_0_2_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_7_5,
+          floki_0_7_1,
+          exprintf_0_1_6
+        }:
+          buildMix {
+            name = "naughtygram";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "naughtygram";
+              version = "0.2.0";
+              sha256 =
+                "7ae4fb6518c06116139bc6a1fe6e3e52fe590acc4d5dc487c01fc2878ba6819d";
+            };
+            beamDeps  = [
+                          poison_1_5_2
+                          httpoison_0_7_5
+                          floki_0_7_1
+                          exprintf_0_1_6
+                        ];
+
+            meta = {
+              description = ''Instagram Private API client library for
+                            Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zensavona/naughtygram";
+            };
+          }
+      ) {};
+
+    naughtygram = naughtygram_0_2_0;
+
+    navigation_history_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1 }:
+          buildMix {
+            name = "navigation_history";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "navigation_history";
+              version = "0.2.0";
+              sha256 =
+                "9fbddedd831930c3f2e784c53442558d90d68040f9921dfa9441da63d6b8dacc";
+            };
+            beamDeps  = [ plug_1_1_1 ];
+
+            meta = {
+              description = ''Navigation history tracking plug'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/tuvistavie/plug-navigation-history";
+            };
+          }
+      ) {};
+
+    navigation_history = navigation_history_0_2_0;
+
+    navigation_tree_0_4_4 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "navigation_tree";
+            version = "0.4.4";
+            src = fetchHex {
+              pkg = "navigation_tree";
+              version = "0.4.4";
+              sha256 =
+                "a4e6aad3224ad9c463a1ac0412463a18ac71b7a78ea16303ad72f43f1fb217c6";
+            };
+
+            meta = {
+              longDescription = ''A navigation tree representation with helpers
+                                to generate HTML out of it - depending of
+                                userroles. Also creates nice HTML navbars for
+                                Bootstrap. Implemented as Agent to hold config
+                                state.'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/gutschilla/elixir-navigation-tree";
+            };
+          }
+      ) {};
+
+    navigation_tree = navigation_tree_0_4_4;
+
+    neat_ex_1_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, json_0_3_3 }:
+          buildMix {
+            name = "neat_ex";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "neat_ex";
+              version = "1.1.0";
+              sha256 =
+                "42d08b8c1bb5245d19864f683df77354ee466b285bac48abed3dd3471a738b21";
+            };
+            beamDeps  = [ json_0_3_3 ];
+
+            meta = {
+              longDescription = ''This project provides the means to define,
+                                simulate, and serialize
+                                Artificial-Neural-Networks (ANNs), as well as
+                                the means to develop them through use of the
+                                Neuro-Evolution of Augmenting Toplogies (NEAT)
+                                algorithm created by Dr. Kenneth Stanley.
+                                Neuro-Evolution, unlike back-propogation, easily
+                                allows the usage of recurrent neural networks
+                                instead of just feed-forward networks, and
+                                fitness functions instead of just training data.
+                                Additionally, since NEAT augments topologies,
+                                all the engine needs to start is the
+                                input/output layout, and a fitness function.'';
+              license = stdenv.lib.licenses.asl20;
+            };
+          }
+      ) {};
+
+    neat_ex = neat_ex_1_1_0;
+
+    neo4j_sips_0_1_12 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poolboy_1_5_1,
+          poison_1_5_2,
+          httpoison_0_7_5,
+          con_cache_0_9_0
+        }:
+          buildMix {
+            name = "neo4j_sips";
+            version = "0.1.12";
+            src = fetchHex {
+              pkg = "neo4j_sips";
+              version = "0.1.12";
+              sha256 =
+                "7a4547b36abd57856f04c8d0b7f2a39eb9fdf7a8c088fdf5836853559ad7aee2";
+            };
+            beamDeps  = [
+                          poolboy_1_5_1
+                          poison_1_5_2
+                          httpoison_0_7_5
+                          con_cache_0_9_0
+                        ];
+
+            meta = {
+              description = ''A very simple and versatile Neo4J Elixir
+                            driver'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/florinpatrascu/neo4j_sips";
+            };
+          }
+      ) {};
+
+    neo4j_sips = neo4j_sips_0_1_12;
+
+    neotoma_1_7_3 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "neotoma";
+            version = "1.7.3";
+            src = fetchHex {
+              pkg = "neotoma";
+              version = "1.7.3";
+              sha256 =
+                "2da322b9b1567ffa0706a7f30f6bbbde70835ae44a1050615f4b4a3d436e0f28";
+            };
+
+            meta = {
+              description = ''PEG/Packrat toolkit and parser-generator.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/seancribbs/neotoma";
+            };
+          }
+      ) {};
+
+    neotoma = neotoma_1_7_3;
+
+    neotomex_0_1_4 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "neotomex";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "neotomex";
+              version = "0.1.4";
+              sha256 =
+                "0a15f69aa859882699e30a30386ad47a16abb5e862c27aea56e51040d682fa5a";
+            };
+
+            meta = {
+              description = ''A PEG parser/transformer with a pleasant Elixir
+                            DSL.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/jtmoulia/neotomex";
+            };
+          }
+      ) {};
+
+    neotomex = neotomex_0_1_4;
+
+    nerves_io_neopixel_0_2_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "nerves_io_neopixel";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "nerves_io_neopixel";
+              version = "0.2.0";
+              sha256 =
+                "662ca0af01330399eba9aff9806c086027ec5b3a2e235af4cd909282a6d09afa";
+            };
+
+            meta = {
+              description = ''Drive WS2812B "NeoPixel" RGB LED strips from a
+                            Raspberry Pi using Elixir.'';
+              license = with stdenv.lib.licenses; [ mit free ];
+              homepage = "https://github.com/GregMefford/nerves_io_neopixel";
+            };
+          }
+      ) {};
+
+    nerves_io_neopixel = nerves_io_neopixel_0_2_0;
+
+    nest_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "nest";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "nest";
+              version = "0.0.1";
+              sha256 =
+                "4092651c14022a285eb4ffb8b6e9c3d6c5937729644fcc88b43f74324bc3bac3";
+            };
+
+            meta = {
+              longDescription = ''A library for using the Nest API, allowing
+                                integration with Nest Thermostats and other Nest
+                                devices.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/adamzaninovich/nest";
+            };
+          }
+      ) {};
+
+    nest = nest_0_0_1;
+
+    nested_set_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, ecto_1_1_3 }:
+          buildMix {
+            name = "nested_set";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "nested_set";
+              version = "0.0.1";
+              sha256 =
+                "cd38faeaef21ad1675d4a4467cff6b439b90ca1c07fac72857ab63804967a00d";
+            };
+            beamDeps  = [ ecto_1_1_3 ];
+
+            meta = {
+              longDescription = ''Nested Set implementation for Ecto/Phoenix.
+                                It is our first attempt to make something like
+                                acts_as_nested_set in rails. Still in WIP, be
+                                cautious if planing to use.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/bansalakhil/elixir_nested_set";
+            };
+          }
+      ) {};
+
+    nested_set = nested_set_0_0_1;
+
+    netrc_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "netrc";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "netrc";
+              version = "0.0.2";
+              sha256 =
+                "a82b1702d8702a51b17e1756261b316ae3a72ac07bbf04e3a1258cc1210f6000";
+            };
+
+            meta = {
+              description = ''Read netrc files'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ma2gedev/netrcex";
+            };
+          }
+      ) {};
+
+    netrc = netrc_0_0_2;
+
+    netstrings_2_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "netstrings";
+            version = "2.0.0";
+            src = fetchHex {
+              pkg = "netstrings";
+              version = "2.0.0";
+              sha256 =
+                "f510110b2a821363409fd77942f61309b6c0000a8cdda91a6f653e95f3c36c23";
+            };
+
+            meta = {
+              description = ''Netstrings implementaton'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mwmiller/netstrings_ex";
+            };
+          }
+      ) {};
+
+    netstrings = netstrings_2_0_0;
+
+    news_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "news";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "news";
+              version = "0.3.0";
+              sha256 =
+                "b8759a3cb0bb40e86d5a5ea65b911a066da4ec197b097be88fb67f6358838124";
+            };
+
+            meta = {
+              description = ''Publish elixir and erlang new weekly'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zhongwencool/news";
+            };
+          }
+      ) {};
+
+    news = news_0_3_0;
+
+    ngram_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ngram";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ngram";
+              version = "0.0.1";
+              sha256 =
+                "13185be68166d8314ae63f70eceb58a4e00b441d3294633450d4f8a7c565e218";
+            };
+
+            meta = {
+              description = ''n-gram tokenization and distance calculations'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ardcore/ngram";
+            };
+          }
+      ) {};
+
+    ngram = ngram_0_0_1;
+
+    nice_nickname_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_4_0 }:
+          buildMix {
+            name = "nice_nickname";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "nice_nickname";
+              version = "0.0.1";
+              sha256 =
+                "7d5c635290df8fa7a59dbaa22e519102e13ddb8ac4cae5a7a40018c9ff795b42";
+            };
+            beamDeps  = [ poison_1_4_0 ];
+
+            meta = {
+              description = ''A nickname generator and profanity filter for
+                            Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/skylerparr/nice_nickname";
+            };
+          }
+      ) {};
+
+    nice_nickname = nice_nickname_0_0_1;
+
+    nifty_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "nifty";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "nifty";
+              version = "0.0.3";
+              sha256 =
+                "ef5c6ea64835d3371382c7e042c42aec0b85625b232b4b9e1f2587e1c8e5401e";
+            };
+
+            meta = {
+              longDescription = ''A semi-useful tool to generate boilerplate
+                                when you want to use a NIF in your project. You
+                                don`t really want to use a NIF in your project,
+                                until you do. Then this might save you writing
+                                most of the boilerplate.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rossjones/nifty";
+            };
+          }
+      ) {};
+
+    nifty = nifty_0_0_3;
+
+    nile_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "nile";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "nile";
+              version = "0.1.2";
+              sha256 =
+                "3b7c463f7e0d12a38757b893d41d08772d6f06e5e4a15812409b655acb4b6dfc";
+            };
+
+            meta = {
+              description = ''Elixir stream extensions'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/camshaft/nile";
+            };
+          }
+      ) {};
+
+    nile = nile_0_1_2;
+
+    ninjaproxies_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "ninjaproxies";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "ninjaproxies";
+              version = "0.2.0";
+              sha256 =
+                "5524329d00944690b362d30fef9c4032c03c401cc44d0ad9e98e147f5792fade";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Ninjaproxies client library for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zensavona/ninjaproxies";
+            };
+          }
+      ) {};
+
+    ninjaproxies = ninjaproxies_0_2_0;
+
+    nio_google_authenticator_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, pot_0_9_4, ecto_2_0_0_beta_0 }:
+          buildMix {
+            name = "nio_google_authenticator";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "nio_google_authenticator";
+              version = "1.0.1";
+              sha256 =
+                "a8a82c6c40e9575e8bea2fc7302af05bcd478b3a6a0e9df212617f807fe23758";
+            };
+            beamDeps  = [ pot_0_9_4 ecto_2_0_0_beta_0 ];
+
+            meta = {
+              longDescription = ''NioGoogleAuthenticator is a collection of
+                                Elixir convenience functions to generate secrets
+                                and validate tokens used in conjunction with
+                                Google Authenticator. It also includes functions
+                                that automatically add a secret to an
+                                Ecto.Changeset.'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/maxneuvians/nio_google_authenticator";
+            };
+          }
+      ) {};
+
+    nio_google_authenticator = nio_google_authenticator_1_0_1;
+
+    nio_google_geocoder_0_7_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_1,
+          ecto_2_0_0_beta_0
+        }:
+          buildMix {
+            name = "nio_google_geocoder";
+            version = "0.7.0";
+            src = fetchHex {
+              pkg = "nio_google_geocoder";
+              version = "0.7.0";
+              sha256 =
+                "ba551ad6138b133d6b90ac96c0443aa31724084049059bf15710dac4c1f3e701";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ecto_2_0_0_beta_0 ];
+
+            meta = {
+              longDescription = ''NioGoogleGeocoder is a collection of Elixir
+                                convenience functions to geocode a single, or
+                                list of, addresses. It also includes a function
+                                that automatically adds a geo location to an
+                                `Ecto.Changeset`.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/maxneuvians/nio_google_geocoder";
+            };
+          }
+      ) {};
+
+    nio_google_geocoder = nio_google_geocoder_0_7_0;
+
+    nodefinder_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, erlcloud_0_9_2 }:
+          buildRebar3 {
+            name = "nodefinder";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "nodefinder";
+              version = "1.5.1";
+              sha256 =
+                "c617372ee14c344c546a978936d7ceab283609b3b33b6516ed9b3651ad5bfb48";
+            };
+
+            beamDeps  = [ erlcloud_0_9_2 ];
+
+            meta = {
+              description = ''Strategies For Automatic Node Discovery'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/nodefinder";
+            };
+          }
+      ) {};
+
+    nodefinder = nodefinder_1_5_1;
+
+    normalize_email_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, is_email_0_0_2 }:
+          buildMix {
+            name = "normalize_email";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "normalize_email";
+              version = "0.0.1";
+              sha256 =
+                "ac5864ecf0d002ecbc56f9296bff7c01fc1d7e2e84e2529f7726f1a068f5d584";
+            };
+            beamDeps  = [ is_email_0_0_2 ];
+
+            meta = {
+              description = ''Normalize an email address'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/johnotander/normalize_email";
+            };
+          }
+      ) {};
+
+    normalize_email = normalize_email_0_0_1;
+
+    normalize_url_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "normalize_url";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "normalize_url";
+              version = "0.0.2";
+              sha256 =
+                "491ea6aa41e044dd85248407e5ebc94a608f89b30292e7ee72d52c3659421016";
+            };
+
+            meta = {
+              description = ''Normalize a url'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/johnotander/normalize_url";
+            };
+          }
+      ) {};
+
+    normalize_url = normalize_url_0_0_2;
+
+    not_qwerty123_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, gettext_0_10_0 }:
+          buildMix {
+            name = "not_qwerty123";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "not_qwerty123";
+              version = "1.0.0";
+              sha256 =
+                "f1ec4634e5608ffae5c1d546696e77abfce8ee1fa415de93e43a2161d70d59d4";
+            };
+            beamDeps  = [ gettext_0_10_0 ];
+
+            meta = {
+              description = ''Library to check password strength and generate
+                            random passwords.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/riverrun/notqwerty123";
+            };
+          }
+      ) {};
+
+    not_qwerty123 = not_qwerty123_1_0_0;
+
+    number_0_4_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "number";
+            version = "0.4.1";
+            src = fetchHex {
+              pkg = "number";
+              version = "0.4.1";
+              sha256 =
+                "773d28c837acf17b0056deb54b7d966a3d6a9d853e88c08829b5732cb7029fb9";
+            };
+
+            meta = {
+              description = ''Convert numbers to various string formats, such
+                            as currency'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/danielberkompas/number";
+            };
+          }
+      ) {};
+
+    number = number_0_4_1;
+
+    oauth2_0_3_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poison_1_5_2,
+          plug_1_1_1,
+          httpoison_0_8_1,
+          hackney_1_4_8
+        }:
+          buildMix {
+            name = "oauth2";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "oauth2";
+              version = "0.3.0";
+              sha256 =
+                "ee23e6fb6ac84abce23713ba93f1df2fd368c9ad7b9288f0ef6fcec0e0249043";
+            };
+            beamDeps  = [
+                          poison_1_5_2 plug_1_1_1 httpoison_0_8_1 hackney_1_4_8
+                        ];
+
+            meta = {
+              description = ''An Elixir OAuth 2.0 Client Library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/scrogson/oauth2";
+            };
+          }
+      ) {};
+
+    oauth2_0_5_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poison_1_5_2,
+          mimetype_parser_0_1_1,
+          httpoison_0_8_1
+        }:
+          buildMix {
+            name = "oauth2";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "oauth2";
+              version = "0.5.0";
+              sha256 =
+                "1bc7d89a27a85fcdd9ebad7a0f4b80c4ae4ae98ed4cf87545667892f92e6a4dd";
+            };
+            beamDeps  = [ poison_1_5_2 mimetype_parser_0_1_1 httpoison_0_8_1
+                      ];
+
+            meta = {
+              description = ''An Elixir OAuth 2.0 Client Library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/scrogson/oauth2";
+            };
+          }
+      ) {};
+
+    oauth2 = oauth2_0_5_0;
+
+    oauth2_erlang_0_6_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "oauth2_erlang";
+            version = "0.6.1";
+            src = fetchHex {
+              pkg = "oauth2_erlang";
+              version = "0.6.1";
+              sha256 =
+                "dc60e92de379fd27c3b9296e2368e97797233a092297d41f47f3a72846b2a974";
+            };
+
+            meta = {
+              description = ''Erlang OAuth 2.0 implementation'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/kivra/oauth2";
+            };
+          }
+      ) {};
+
+    oauth2_erlang = oauth2_erlang_0_6_1;
+
+    oauth2cli_0_0_4 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poison_1_5_2,
+          plug_0_9_0,
+          httpoison_0_7_5,
+          hackney_1_4_8,
+          cowboy_1_0_4
+        }:
+          buildMix {
+            name = "oauth2cli";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "oauth2cli";
+              version = "0.0.4";
+              sha256 =
+                "16645e7bb9b3af13d1187da955403ff70c0cdaded278d0c51503ea6c29172b5b";
+            };
+            beamDeps  = [
+                          poison_1_5_2
+                          plug_0_9_0
+                          httpoison_0_7_5
+                          hackney_1_4_8
+                          cowboy_1_0_4
+                        ];
+
+            meta = {
+              description = ''Simple OAuth2 client '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mgamini/oauth2cli-elixir";
+            };
+          }
+      ) {};
+
+    oauth2cli = oauth2cli_0_0_4;
+
+    oauth2ex_0_0_8 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          timex_1_0_0_rc4,
+          plug_1_1_1,
+          httpoison_0_8_1,
+          exjsx_3_2_0,
+          cowboy_1_0_4
+        }:
+          buildMix {
+            name = "oauth2ex";
+            version = "0.0.8";
+            src = fetchHex {
+              pkg = "oauth2ex";
+              version = "0.0.8";
+              sha256 =
+                "0420cc1ee402922a77cdd9a090cb886083fdc42658df9d8401e72d7a1daab4c0";
+            };
+            beamDeps  = [
+                          timex_1_0_0_rc4
+                          plug_1_1_1
+                          httpoison_0_8_1
+                          exjsx_3_2_0
+                          cowboy_1_0_4
+                        ];
+
+            meta = {
+              description = ''An OAuth 2.0 client library for elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/parroty/oauth2ex";
+            };
+          }
+      ) {};
+
+    oauth2ex = oauth2ex_0_0_8;
+
+    oauther_1_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "oauther";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "oauther";
+              version = "1.0.2";
+              sha256 =
+                "2b65e6408600d5daed7bb1b108533624b6c34491f0278b44013400aa7b551e4d";
+            };
+
+            meta = {
+              description = ''Library to authenticate with OAuth 1.0
+                            protocol.'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/lexmag/oauther";
+            };
+          }
+      ) {};
+
+    oauther = oauther_1_0_2;
+
+    obelisk_0_10_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          rss_0_2_1,
+          plug_0_11_3,
+          mock_0_1_1,
+          earmark_0_1_19,
+          cowboy_1_0_4,
+          chronos_1_0_0,
+          calliope_0_3_0,
+          anubis_0_1_0
+        }:
+          buildMix {
+            name = "obelisk";
+            version = "0.10.0";
+            src = fetchHex {
+              pkg = "obelisk";
+              version = "0.10.0";
+              sha256 =
+                "faf46188e3f79c8ac512ae104016f18d05598198feb35a09c8936c548dfba06e";
+            };
+            beamDeps  = [
+                          rss_0_2_1
+                          plug_0_11_3
+                          mock_0_1_1
+                          earmark_0_1_19
+                          cowboy_1_0_4
+                          chronos_1_0_0
+                          calliope_0_3_0
+                          anubis_0_1_0
+                        ];
+
+            meta = {
+              longDescription = '' obelisk is a static site generator for
+                                Elixir. It is inspired by jekyll, with the goal
+                                of being fast and simple to use and extend. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bennyhallett/obelisk";
+            };
+          }
+      ) {};
+
+    obelisk = obelisk_0_10_0;
+
+    observer_cli_1_0_3 = callPackage
+      (
+        {  buildRebar3, fetchHex, recon_2_2_1 }:
+          buildRebar3 {
+            name = "observer_cli";
+            version = "1.0.3";
+            src = fetchHex {
+              pkg = "observer_cli";
+              version = "1.0.3";
+              sha256 =
+                "18e5d9aa5412ec063cf9719bcfe73bf990c5fed5c9a3c8422c2b5d9529fc8b0d";
+            };
+
+            beamDeps  = [ recon_2_2_1 ];
+
+            meta = {
+              description = ''Visualize Erlang Nodes On The Command Line'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zhongwencool/observer_cli";
+            };
+          }
+      ) {};
+
+    observer_cli = observer_cli_1_0_3;
+
+    octokit_0_0_3 = callPackage
+      (
+        {
+          buildMix, fetchHex, timex_1_0_1, poison_2_1_0, httpoison_0_8_1
+        }:
+          buildMix {
+            name = "octokit";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "octokit";
+              version = "0.0.3";
+              sha256 =
+                "5cc713c2052c3a46e24ac04781bee4199926e2a175597b9f1c4c7d9ddb2b4241";
+            };
+            beamDeps  = [ timex_1_0_1 poison_2_1_0 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''An Elixir library for accessing the GitHub
+                            API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lee-dohm/octokit.ex";
+            };
+          }
+      ) {};
+
+    octokit = octokit_0_0_3;
+
+    og_0_0_5 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "og";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "og";
+              version = "0.0.5";
+              sha256 =
+                "6260a10988cee65dfc6245e60a719c15a8239167946a7f8f847fb3b9fa624022";
+            };
+
+            meta = {
+              description = ''Og is a small collection of logger helper
+                            functions in elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/stephenmoloney/og";
+            };
+          }
+      ) {};
+
+    og = og_0_0_5;
+
+    ok_0_1_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ok";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "ok";
+              version = "0.1.3";
+              sha256 =
+                "e5ac8a719f097467925d492da2cd2ad9543dfd8729739fa4a32a671337eb08bb";
+            };
+
+            meta = {
+              description = ''Effecient error handling in elixir pipelines.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/CrowdHailer/OK";
+            };
+          }
+      ) {};
+
+    ok = ok_0_1_3;
+
+    ok_jose_2_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ok_jose";
+            version = "2.0.0";
+            src = fetchHex {
+              pkg = "ok_jose";
+              version = "2.0.0";
+              sha256 =
+                "55377aa3f9b6e563aeb14b3960e4d2a697a059799e8d8ee390059faeaab219eb";
+            };
+
+            meta = {
+              description = ''Pipe functions that produce ok/error tuples.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/vic/ok_jose";
+            };
+          }
+      ) {};
+
+    ok_jose = ok_jose_2_0_0;
+
+    okta_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_4_0, httpoison_0_7_5 }:
+          buildMix {
+            name = "okta";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "okta";
+              version = "0.0.1";
+              sha256 =
+                "1fb857a60a917bfe9ff6b1bf87908ba8aa1387ddc4586f9b9465fe19415d825a";
+            };
+            beamDeps  = [ poison_1_4_0 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''An Elixir Library for interfacing Okta'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/Cobenian/okta";
+            };
+          }
+      ) {};
+
+    okta = okta_0_0_1;
+
+    omise_0_1_4 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "omise";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "omise";
+              version = "0.1.4";
+              sha256 =
+                "35e7fe1776da9cf5ddeb0138391868d6dbbe976e5a932183c4f445371b1b0c4d";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Omise client library for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/teerawat1992/omise";
+            };
+          }
+      ) {};
+
+    omise = omise_0_1_4;
+
+    one_signal_0_0_6 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "one_signal";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "one_signal";
+              version = "0.0.6";
+              sha256 =
+                "d90ec5f9e43d164e2942422d3c1e9a6b26a956ea135eb1a316380e12ef6b27d1";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Elixir wrapper of OneSignal'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/yoavlt/one_signal";
+            };
+          }
+      ) {};
+
+    one_signal = one_signal_0_0_6;
+
+    onetime_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, timex_1_0_1 }:
+          buildMix {
+            name = "onetime";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "onetime";
+              version = "1.0.0";
+              sha256 =
+                "28481e7e239caa0002a42178af46cb80c3501faca7c1b953558e9d8dbba76c4c";
+            };
+            beamDeps  = [ timex_1_0_1 ];
+
+            meta = {
+              description = ''An onetime key-value store'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ryo33/onetime-elixir";
+            };
+          }
+      ) {};
+
+    onetime = onetime_1_0_0;
+
+    oop_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "oop";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "oop";
+              version = "0.0.4";
+              sha256 =
+                "ab09b287b80ce860f34bf07652c23a9a21c4064aca730a25becfe30c6b46b81b";
+            };
+
+            meta = {
+              description = ''OOP in Elixir!'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/wojtekmach/oop";
+            };
+          }
+      ) {};
+
+    oop = oop_0_0_4;
+
+    opbeat_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "opbeat";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "opbeat";
+              version = "0.3.0";
+              sha256 =
+                "20977e8ae08a1789326a3e5c0c8fa3265dd0e6ddc1fb6abe25c3a33d3fc9e692";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Elixir client for opbeat'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/teodor-pripoae/opbeat";
+            };
+          }
+      ) {};
+
+    opbeat = opbeat_0_3_0;
+
+    openmaize_0_15_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          postgrex_0_11_1,
+          poison_1_5_2,
+          plug_1_1_1,
+          ecto_2_0_0_beta_0,
+          cowboy_1_0_4,
+          comeonin_2_1_1
+        }:
+          buildMix {
+            name = "openmaize";
+            version = "0.15.1";
+            src = fetchHex {
+              pkg = "openmaize";
+              version = "0.15.1";
+              sha256 =
+                "2ef5890c2fa041cd7d11d2b16b76dd7d8b6ac6e5044093732b1441fdaa10fd56";
+            };
+            beamDeps  = [
+                          postgrex_0_11_1
+                          poison_1_5_2
+                          plug_1_1_1
+                          ecto_2_0_0_beta_0
+                          cowboy_1_0_4
+                          comeonin_2_1_1
+                        ];
+
+            meta = {
+              description = ''Authentication library for Elixir using Plug.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/elixircnx/openmaize";
+            };
+          }
+      ) {};
+
+    openmaize = openmaize_0_15_1;
+
+    openstack_0_0_4 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          table_0_0_4,
+          poison_1_5_2,
+          maybe_0_0_1,
+          httpoison_0_8_1
+        }:
+          buildMix {
+            name = "openstack";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "openstack";
+              version = "0.0.4";
+              sha256 =
+                "ddc471e2d95edb26b3f826986f730fbb1fb70de62edaa00a0c1cd7fd6de7fde1";
+            };
+            beamDeps  = [
+                          table_0_0_4 poison_1_5_2 maybe_0_0_1 httpoison_0_8_1
+                        ];
+
+            meta = {
+              description = ''Openstack Client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zweifisch/openstack.ex";
+            };
+          }
+      ) {};
+
+    openstack = openstack_0_0_4;
+
+    ordered_list_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ordered_list";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "ordered_list";
+              version = "0.1.0";
+              sha256 =
+                "6b6410f35d1bda7335fc0c5f16e2b6f5a6a8c162363073931347dc184521159d";
+            };
+
+            meta = {
+              description = ''Sorting and reordering positions in a list.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/aarondufall/ordered_list";
+            };
+          }
+      ) {};
+
+    ordered_list = ordered_list_0_1_0;
+
+    os_utils_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "os_utils";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "os_utils";
+              version = "0.3.0";
+              sha256 =
+                "b49e32630b3f198b5fe4f6858aa03d1236d659564f98d522c9e646c045e13b64";
+            };
+
+            meta = {
+              description = ''OS utilities for Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/orderthruchaos/os_utils";
+            };
+          }
+      ) {};
+
+    os_utils = os_utils_0_3_0;
+
+    osc_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "osc";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "osc";
+              version = "0.1.1";
+              sha256 =
+                "41830bf1494e6f2419ab8e35d11c0f650aab1d37b45d1b3fdfcc3682e191324c";
+            };
+
+            meta = {
+              description = ''OSC encoder/decoder for elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/camshaft/osc_ex";
+            };
+          }
+      ) {};
+
+    osc = osc_0_1_1;
+
+    overpass_0_1_1 = callPackage
+      (
+        {
+          buildMix, fetchHex, sweet_xml_0_5_1, jsx_2_8_0, httpoison_0_7_5
+        }:
+          buildMix {
+            name = "overpass";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "overpass";
+              version = "0.1.1";
+              sha256 =
+                "6a664bd17e7612825fd7c3a0c3e0039412d83ac6d459c84018caf07e800cb6a8";
+            };
+            beamDeps  = [ sweet_xml_0_5_1 jsx_2_8_0 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''A Elixir wrapper to access the Overpass API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/CodeforChemnitz/elixir-overpass";
+            };
+          }
+      ) {};
+
+    overpass = overpass_0_1_1;
+
+    p1_mysql_1_0_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "p1_mysql";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "p1_mysql";
+              version = "1.0.1";
+              sha256 =
+                "4235c0d95d4ec01ed7511ebb253f5c54a9635b766a8b923f41e238ed85008e7d";
+            };
+
+            meta = {
+              description = ''Pure Erlang MySQL driver'';
+              license = with stdenv.lib.licenses; [ free asl20 ];
+              homepage = "https://github.com/processone/p1_mysql";
+            };
+          }
+      ) {};
+
+    p1_mysql = p1_mysql_1_0_1;
+
+    p1_oauth2_0_6_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "p1_oauth2";
+            version = "0.6.1";
+            src = fetchHex {
+              pkg = "p1_oauth2";
+              version = "0.6.1";
+              sha256 =
+                "304923dcaf1edcc84b7f3f6fab1d5235777604ec3334453cf50de1060300e002";
+            };
+
+            meta = {
+              description = ''Erlang OAuth 2.0 implementation'';
+              license = with stdenv.lib.licenses; [ mit asl20 ];
+              homepage = "https://github.com/processone/p1_oauth2";
+            };
+          }
+      ) {};
+
+    p1_oauth2 = p1_oauth2_0_6_1;
+
+    p1_pgsql_1_0_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "p1_pgsql";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "p1_pgsql";
+              version = "1.0.1";
+              sha256 =
+                "7436d18f320b200e4cab6a0c16d6416aa32115b9dcfabfb05af6e9cbd62d1c0c";
+            };
+
+            meta = {
+              description = ''PostgreSQL driver'';
+              license = with stdenv.lib.licenses; [ epl10 asl20 ];
+              homepage = "https://github.com/processone/p1_pgsql";
+            };
+          }
+      ) {};
+
+    p1_pgsql = p1_pgsql_1_0_1;
+
+    p1_stringprep_1_0_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, p1_utils_1_0_3 }:
+          buildRebar3 {
+            name = "p1_stringprep";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "p1_stringprep";
+              version = "1.0.1";
+              sha256 =
+                "e36ce6434010eba2fb6fc18bf4ba65797be3bba17a686f79a2326d26614071c0";
+            };
+            compilePorts = true;
+            beamDeps  = [ p1_utils_1_0_3 ];
+
+            meta = {
+              description = ''Fast Stringprep Erlang / Elixir implementation'';
+              license = with stdenv.lib.licenses; [ asl20 free ];
+              homepage = "https://github.com/processone/stringprep";
+            };
+          }
+      ) {};
+
+    p1_stringprep = p1_stringprep_1_0_1;
+
+    p1_utils_1_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "p1_utils";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "p1_utils";
+              version = "1.0.0";
+              sha256 =
+                "b2c6316286b071f2f667fb1c59b44fe0c996917515fa93374a4a3264affc5105";
+            };
+
+            meta = {
+              description = ''Erlang utility modules from ProcessOne'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/processone/p1_utils";
+            };
+          }
+      ) {};
+
+    p1_utils_1_0_3 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "p1_utils";
+            version = "1.0.3";
+            src = fetchHex {
+              pkg = "p1_utils";
+              version = "1.0.3";
+              sha256 =
+                "6bf7dc7108eee70e036ea745faf5f55b4354e267f14371ea13338f58ce402d5e";
+            };
+
+            meta = {
+              description = ''Erlang utility modules from ProcessOne'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/processone/p1_utils";
+            };
+          }
+      ) {};
+
+    p1_utils = p1_utils_1_0_3;
+
+    p1_xml_1_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, p1_utils_1_0_0 }:
+          buildRebar3 {
+            name = "p1_xml";
+            version = "1.1.1";
+            src = fetchHex {
+              pkg = "p1_xml";
+              version = "1.1.1";
+              sha256 =
+                "ab68956163cc5ff8c749c503507a36c543841259e78c58a2bbe0ebe76a0b7ce3";
+            };
+            compilePorts = true;
+            beamDeps  = [ p1_utils_1_0_0 ];
+
+            meta = {
+              description = ''XML parsing library. Now obsolete. Use fast_xml
+                            instead'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/processone/xml";
+            };
+          }
+      ) {};
+
+    p1_xml = p1_xml_1_1_1;
+
+    p1_xmlrpc_1_15_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "p1_xmlrpc";
+            version = "1.15.1";
+            src = fetchHex {
+              pkg = "p1_xmlrpc";
+              version = "1.15.1";
+              sha256 =
+                "4bca3009ad6b6c37c30255e3d63191a188e0fc6b6db41a428fe111d699d1a330";
+            };
+
+            meta = {
+              description = ''XML-RPC server'';
+              license = with stdenv.lib.licenses; [ bsd2 asl20 ];
+              homepage = "https://github.com/processone/p1_xmlrpc";
+            };
+          }
+      ) {};
+
+    p1_xmlrpc = p1_xmlrpc_1_15_1;
+
+    pact_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "pact";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "pact";
+              version = "0.2.0";
+              sha256 =
+                "a19000dcfd6c6b220e508ed44e9040d83e4814db2f6f74b11de1a4597a8de05e";
+            };
+
+            meta = {
+              description = ''Elixir dependency registry for better testing and
+                            cleaner code'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/BlakeWilliams/pact";
+            };
+          }
+      ) {};
+
+    pact = pact_0_2_0;
+
+    pagexduty_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_1_0 }:
+          buildMix {
+            name = "pagexduty";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "pagexduty";
+              version = "0.1.0";
+              sha256 =
+                "7292a63eeb27637ff19f91f50910d2bbbc860e1eb0413aa5a5035ef32b41b232";
+            };
+            beamDeps  = [ httpoison_0_8_1 exjsx_3_1_0 ];
+
+            meta = {
+              description = ''A Pagerduty client for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ride/pagexduty";
+            };
+          }
+      ) {};
+
+    pagexduty = pagexduty_0_1_0;
+
+    paginex_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "paginex";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "paginex";
+              version = "0.0.1";
+              sha256 =
+                "4fdc1a0bb02fbd910d24c59caae6d5793fd24a2a29d6498c04a332095e616770";
+            };
+
+            meta = {
+              description = ''Exposes a pagination struct that can be helpful
+                            to render the pagination html.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bhserna/paginex";
+            };
+          }
+      ) {};
+
+    paginex = paginex_0_0_1;
+
+    painstaking_0_5_6 = callPackage
+      (
+        {  buildMix, fetchHex, exoddic_1_2_0 }:
+          buildMix {
+            name = "painstaking";
+            version = "0.5.6";
+            src = fetchHex {
+              pkg = "painstaking";
+              version = "0.5.6";
+              sha256 =
+                "f7efbebacbea3e0bb8adf79ab90ca896e54d179eb76a4da4eb1687411fa4af58";
+            };
+            beamDeps  = [ exoddic_1_2_0 ];
+
+            meta = {
+              description = ''Bet stake sizing recommendations'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mwmiller/painstaking";
+            };
+          }
+      ) {};
+
+    painstaking = painstaking_0_5_6;
+
+    palette_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "palette";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "palette";
+              version = "0.0.2";
+              sha256 =
+                "0ad5bbd207b4462078888882b494de937690659bb72ca34ff247b1c9c4784033";
+            };
+
+            meta = {
+              description = ''A handy library for colouring strings.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lpil/palette";
+            };
+          }
+      ) {};
+
+    palette = palette_0_0_2;
+
+    pandex_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "pandex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "pandex";
+              version = "0.1.0";
+              sha256 =
+                "a9c6b401be16af5f385c4ff8fc7e3eb9686e2829b0855854de428ff2bd23e34f";
+            };
+
+            meta = {
+              longDescription = ''Pandex is a lightweight Elixir wrapper for
+                                [Pandoc](http://pandoc.org). Pandex enables you
+                                to convert Markdown, CommonMark, HTML, Latex,
+                                json, html to HTML, HTML5, opendocument, rtf,
+                                texttile, asciidoc, markdown, json and others.
+                                Pandex has no dependencies other than Pandoc
+                                itself.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/filterkaapi/pandex";
+            };
+          }
+      ) {};
+
+    pandex = pandex_0_1_0;
+
+    pangu_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "pangu";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "pangu";
+              version = "0.1.0";
+              sha256 =
+                "2634cc2463421757aca0a76665de83940d4fda12f8ed316ae929bb29f64d06c5";
+            };
+
+            meta = {
+              description = ''Paranoid text spacing in Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/cataska/pangu.ex";
+            };
+          }
+      ) {};
+
+    pangu = pangu_0_1_0;
+
+    parabaikElixirConverter_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "parabaikElixirConverter";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "parabaikElixirConverter";
+              version = "0.0.1";
+              sha256 =
+                "ac72f871ac393ca2e42d11f9103019f6270209b1b0fe58d6f110f5dd66c387e4";
+            };
+
+            meta = {
+              longDescription = ''ParabaikElixirConverter is just a Elixir
+                                version of Parabaik converter. It can convert
+                                from Unicode to Zawgyi-One and Zawgyi-One to
+                                Unicode vice versa. '';
+              license = stdenv.lib.licenses.asl20;
+              homepage =
+                "https://github.com/Arkar-Aung/ParabaikElixirConverter";
+            };
+          }
+      ) {};
+
+    parabaikElixirConverter = parabaikElixirConverter_0_0_1;
+
+    parallel_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "parallel";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "parallel";
+              version = "0.0.3";
+              sha256 =
+                "d9b5e98c1892f5376b4dfa28c48a3a17029f86a28d1f9ec2f7c1a2747f256a4d";
+            };
+
+            meta = {
+              description = ''Straightforward parallel processing for Elixir'';
+
+              homepage = "https://github.com/Anonyfox/parallel";
+            };
+          }
+      ) {};
+
+    parallel = parallel_0_0_3;
+
+    parallel_stream_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "parallel_stream";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "parallel_stream";
+              version = "1.0.1";
+              sha256 =
+                "de54833225b0e67f21db47333a08685aed50d778a2f11cf7e36ae9e3fe4ee107";
+            };
+
+            meta = {
+              description = ''Parallel stream operations for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/beatrichartz/parallel_stream";
+            };
+          }
+      ) {};
+
+    parallel_stream = parallel_stream_1_0_1;
+
+    params_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, ecto_1_1_3 }:
+          buildMix {
+            name = "params";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "params";
+              version = "1.0.1";
+              sha256 =
+                "182cfd185f886ad72e350baa7c2b1a5a0f77c52140ddc2604a5efef0f122dd51";
+            };
+            beamDeps  = [ ecto_1_1_3 ];
+
+            meta = {
+              description = ''Parameter structure validation and casting with
+                            Ecto.Schema.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/vic/params";
+            };
+          }
+      ) {};
+
+    params = params_1_0_1;
+
+    paratize_2_1_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "paratize";
+            version = "2.1.2";
+            src = fetchHex {
+              pkg = "paratize";
+              version = "2.1.2";
+              sha256 =
+                "3ac2970f8c40979bdd7ea6eebb106fb8c51e64e745e0f068e059cfbecbace433";
+            };
+
+            meta = {
+              description = ''Elixir library providing some handy parallel
+                            processing facilities.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/seantanly/elixir-paratize";
+            };
+          }
+      ) {};
+
+    paratize = paratize_2_1_2;
+
+    parse_client_0_2_3 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_7_5, exjsx_3_0_2 }:
+          buildMix {
+            name = "parse_client";
+            version = "0.2.3";
+            src = fetchHex {
+              pkg = "parse_client";
+              version = "0.2.3";
+              sha256 =
+                "b80b259f9645ea4767824d47c12f719faf51a8031c4162f316fbe99a77b45c23";
+            };
+            beamDeps  = [ httpoison_0_7_5 exjsx_3_0_2 ];
+
+            meta = {
+              description = ''Elixir client for the parse.com REST API '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/elixircnx/parse_elixir_client";
+            };
+          }
+      ) {};
+
+    parse_client = parse_client_0_2_3;
+
+    parse_torrent_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, bencodex_1_0_0 }:
+          buildMix {
+            name = "parse_torrent";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "parse_torrent";
+              version = "0.1.0";
+              sha256 =
+                "4dd7e2a51e6da91d0bbf843735ceeee43dda1f704a0d2717cefa11a259dec65d";
+            };
+            beamDeps  = [ bencodex_1_0_0 ];
+
+            meta = {
+              description = ''Parses a .torrent file and returns a map'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/preciz/parse_torrent";
+            };
+          }
+      ) {};
+
+    parse_torrent = parse_torrent_0_1_0;
+
+    parse_trans_2_9_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, edown_0_7_0 }:
+          buildRebar3 {
+            name = "parse_trans";
+            version = "2.9.0";
+            src = fetchHex {
+              pkg = "parse_trans";
+              version = "2.9.0";
+              sha256 =
+                "dda020976ad4aafe051ce785c0460a71a11b8b6b8c08a98e2c45b83edfdf2978";
+            };
+
+            beamDeps  = [ edown_0_7_0 ];
+
+            meta = {
+              description = ''Parse transform utilities for Erlang.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/uwiger/parse_trans";
+            };
+          }
+      ) {};
+
+    parse_trans = parse_trans_2_9_0;
+
+    parselix_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "parselix";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "parselix";
+              version = "0.1.0";
+              sha256 =
+                "c728426e1361e94918a7b24d45b86f00e0e7225e9086b02074ac7b33a4307406";
+            };
+
+            meta = {
+              description = ''A Parser Combinator Library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ryo33/Parselix";
+            };
+          }
+      ) {};
+
+    parselix = parselix_0_1_0;
+
+    parsex_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1, poison_1_1_1 }:
+          buildMix {
+            name = "parsex";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "parsex";
+              version = "0.0.2";
+              sha256 =
+                "024657ae8d29eba99caf90276ac2d7f27cf435a543d4036859fd4ab6ffbceb75";
+            };
+            beamDeps  = [ httpoison_0_8_1 poison_1_1_1 ];
+
+            meta = {
+              description = ''ParsEx is an Elixir HTTP Client for communicating
+                            with Parse.com`s Restful API '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/maarek/ParsEx";
+            };
+          }
+      ) {};
+
+    parsex = parsex_0_0_2;
+
+    passport_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex, phoenix_1_1_4, comeonin_2_1_1 }:
+          buildMix {
+            name = "passport";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "passport";
+              version = "0.0.4";
+              sha256 =
+                "10e8e42cfd5fa834d7c3c3276c39274a3824100f2ffeed26adb4ed8475f0be91";
+            };
+            beamDeps  = [ phoenix_1_1_4 comeonin_2_1_1 ];
+
+            meta = {
+              description = ''Provides authentication for phoenix
+                            applications'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/opendrops/passport";
+            };
+          }
+      ) {};
+
+    passport = passport_0_0_4;
+
+    pathway_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2 }:
+          buildMix {
+            name = "pathway";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "pathway";
+              version = "0.1.0";
+              sha256 =
+                "ae734bc8db0d91c0876e15b7e22e8d7616701eff94b1bd2930d2783a1b11c01d";
+            };
+            beamDeps  = [ poison_1_5_2 ];
+
+            meta = {
+              description = ''A HTTP client library for the Trak.io REST API.
+                            '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/novabyte/pathway";
+            };
+          }
+      ) {};
+
+    pathway = pathway_0_1_0;
+
+    pattern_tap_0_2_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "pattern_tap";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "pattern_tap";
+              version = "0.2.2";
+              sha256 =
+                "2d17fe4c076b12efe39a362ade88d11d8bed204009027755802213db9feb3675";
+            };
+
+            meta = {
+              description = ''Macro for tapping into a pattern match while
+                            using the pipe operator '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mgwidmann/elixir-pattern_tap";
+            };
+          }
+      ) {};
+
+    pattern_tap = pattern_tap_0_2_2;
+
+    pavlov_0_2_3 = callPackage
+      (
+        {  buildMix, fetchHex, meck_0_8_4 }:
+          buildMix {
+            name = "pavlov";
+            version = "0.2.3";
+            src = fetchHex {
+              pkg = "pavlov";
+              version = "0.2.3";
+              sha256 =
+                "4d38e96b7581261a49f00d2046603ad3c9af6d52abd26d16bbf6a0a5a82c9643";
+            };
+            beamDeps  = [ meck_0_8_4 ];
+
+            meta = {
+              longDescription = ''Pavlov is a BDD library for your Elixir
+                                projects, allowing you to write expressive unit
+                                tests that tell the story of how your
+                                application behaves. The syntax tries to follow
+                                RSpec`s wherever possible.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sproutapp/pavlov";
+            };
+          }
+      ) {};
+
+    pavlov = pavlov_0_2_3;
+
+    pbkdf2_2_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "pbkdf2";
+            version = "2.0.0";
+            src = fetchHex {
+              pkg = "pbkdf2";
+              version = "2.0.0";
+              sha256 =
+                "1e793ce6fdb0576613115714deae9dfc1d1537eaba74f07efb36de139774488d";
+            };
+
+            meta = {
+              description = ''Erlang PBKDF2 Key Derivation Function'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/basho/erlang-pbkdf2";
+            };
+          }
+      ) {};
+
+    pbkdf2 = pbkdf2_2_0_0;
+
+    pc_1_2_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "pc";
+            version = "1.2.0";
+            src = fetchHex {
+              pkg = "pc";
+              version = "1.2.0";
+              sha256 =
+                "ef0f59d26a25af0a5247ef1a06d28d8300f8624647b02dc521ac79a7eceb8883";
+            };
+
+            meta = {
+              description = ''a rebar3 port compiler for native code'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/blt/port_compiler";
+            };
+          }
+      ) {};
+
+    pc = pc_1_2_0;
+
+    pdf2htmlex_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "pdf2htmlex";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "pdf2htmlex";
+              version = "0.2.0";
+              sha256 =
+                "50885e995d25362b1f25c74796c0627657147d4d10ccb4be736be3b06b8a44a3";
+            };
+
+            meta = {
+              description = ''Convert PDF docs to beautiful HTML files without
+                            losing text or format.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ricn/pdf2htmlex";
+            };
+          }
+      ) {};
+
+    pdf2htmlex = pdf2htmlex_0_2_0;
+
+    pdf_generator_0_3_1 = callPackage
+      (
+        {  buildMix, fetchHex, porcelain_2_0_1, misc_random_0_2_6 }:
+          buildMix {
+            name = "pdf_generator";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "pdf_generator";
+              version = "0.3.1";
+              sha256 =
+                "d81181dd60db4bfbf121161208c69d2aeabce74e24125a009761e1bf4cab11a7";
+            };
+            beamDeps  = [ porcelain_2_0_1 misc_random_0_2_6 ];
+
+            meta = {
+              longDescription = ''A simple wrapper for wkhtmltopdf (HTML to
+                                PDF) and PDFTK (adds in encryption) for use in
+                                Elixir projects.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gutschilla/elixir-pdf-generator";
+            };
+          }
+      ) {};
+
+    pdf_generator = pdf_generator_0_3_1;
+
+    peatio_client_1_5_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_1,
+          hackney_1_4_4,
+          decimal_1_1_1
+        }:
+          buildMix {
+            name = "peatio_client";
+            version = "1.5.0";
+            src = fetchHex {
+              pkg = "peatio_client";
+              version = "1.5.0";
+              sha256 =
+                "701489d2b53b76194bb8745003c2e5665045ba4132ec1020813c63671d19081e";
+            };
+            beamDeps  = [
+                          poison_1_5_2
+                          httpoison_0_8_1
+                          hackney_1_4_4
+                          decimal_1_1_1
+                        ];
+
+            meta = {
+              description = ''Peatio Exchange compatibility API for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/peatio/peatio-client-elixir";
+            };
+          }
+      ) {};
+
+    peatio_client = peatio_client_1_5_0;
+
+    peon_2_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "peon";
+            version = "2.0.0";
+            src = fetchHex {
+              pkg = "peon";
+              version = "2.0.0";
+              sha256 =
+                "3d87e626f5d014563d1cf319c0fe8576c8eb3f4399ecc9a0d7fb2385a180aaab";
+            };
+
+            meta = {
+              description = ''Use Elixir maps as a document storage format.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/supernintendo/peon";
+            };
+          }
+      ) {};
+
+    peon = peon_2_0_0;
+
+    pet_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, yomel_0_5_0 }:
+          buildMix {
+            name = "pet";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "pet";
+              version = "0.1.1";
+              sha256 =
+                "5ec25c6c2337e286919c925dce46ecfa4b09311f516ecd922c71391cd4caa697";
+            };
+            beamDeps  = [ yomel_0_5_0 ];
+
+            meta = {
+              description = ''Account management tool compatible with pit'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Joe-noh/pet";
+            };
+          }
+      ) {};
+
+    pet = pet_0_1_1;
+
+    petick_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "petick";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "petick";
+              version = "0.0.1";
+              sha256 =
+                "77ca306a379109aeb98528fdc5642dccc0b66379e67058814470d0cf30053586";
+            };
+
+            meta = {
+              description = ''Periodic timer'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/niku/petick";
+            };
+          }
+      ) {};
+
+    petick = petick_0_0_1;
+
+    phoenix_0_2_10 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          inflex_0_2_3,
+          ex_conf_0_1_2,
+          plug_0_5_0,
+          jazz_0_1_1
+        }:
+          buildMix {
+            name = "phoenix";
+            version = "0.2.10";
+            src = fetchHex {
+              pkg = "phoenix";
+              version = "0.2.10";
+              sha256 =
+                "bb65584ef5696cf90cb4823fd82d5fd930d7e092f171410687c90924519b0022";
+            };
+            beamDeps  = [ inflex_0_2_3 ex_conf_0_1_2 plug_0_5_0 jazz_0_1_1 ];
+
+            meta = {
+              longDescription = ''Productive. Reliable. Fast. A productive web
+                                framework that does not compromise speed and
+                                maintainability.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/phoenixframework/phoenix";
+            };
+          }
+      ) {};
+
+    phoenix_0_4_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          cowboy_1_0_4,
+          plug_0_7_0,
+          linguist_0_1_5,
+          poison_1_1_1
+        }:
+          buildMix {
+            name = "phoenix";
+            version = "0.4.1";
+            src = fetchHex {
+              pkg = "phoenix";
+              version = "0.4.1";
+              sha256 =
+                "b1e72759e90a814b6a5d4d94e218b2c975bd156ebdfb4c54f8dc8b590267b4e0";
+            };
+            beamDeps  = [ cowboy_1_0_4 plug_0_7_0 linguist_0_1_5 poison_1_1_1
+                      ];
+
+            meta = {
+              longDescription = ''Productive. Reliable. Fast. A productive web
+                                framework that does not compromise speed and
+                                maintainability.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/phoenixframework/phoenix";
+            };
+          }
+      ) {};
+
+    phoenix_1_0_4 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "phoenix";
+            version = "1.0.4";
+            src = fetchHex {
+              pkg = "phoenix";
+              version = "1.0.4";
+              sha256 =
+                "591d5f7f3a6f5407e8491a92dc6a2d0b7b94ef4f3526ad8ef4eb82660e6f69f6";
+            };
+            beamDeps  = [ poison_1_5_2 plug_1_1_1 cowboy_1_0_4 ];
+
+            meta = {
+              longDescription = ''Productive. Reliable. Fast. A productive web
+                                framework that does not compromise speed and
+                                maintainability.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/phoenixframework/phoenix";
+            };
+          }
+      ) {};
+
+    phoenix_1_1_4 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_0_3, plug_1_1_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "phoenix";
+            version = "1.1.4";
+            src = fetchHex {
+              pkg = "phoenix";
+              version = "1.1.4";
+              sha256 =
+                "5765238fd5caef83a8ce9242d63b4302963f44aefe70510a597aae86b5b6cd10";
+            };
+            beamDeps  = [ poison_1_0_3 plug_1_1_1 cowboy_1_0_4 ];
+
+            meta = {
+              longDescription = ''Productive. Reliable. Fast. A productive web
+                                framework that does not compromise speed and
+                                maintainability.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/phoenixframework/phoenix";
+            };
+          }
+      ) {};
+
+    phoenix = phoenix_1_1_4;
+
+    phoenix_calendar_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex, phoenix_html_2_5_0, calendar_0_12_3 }:
+          buildMix {
+            name = "phoenix_calendar";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "phoenix_calendar";
+              version = "0.1.2";
+              sha256 =
+                "f22968fd2287b419bf9791845b62501bf0177630d01a92b0ba33e5f00978ca3c";
+            };
+            beamDeps  = [ phoenix_html_2_5_0 calendar_0_12_3 ];
+
+            meta = {
+              description = ''Integration between Phoenix & Calendar'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/lau/phoenix_calendar";
+            };
+          }
+      ) {};
+
+    phoenix_calendar = phoenix_calendar_0_1_2;
+
+    phoenix_dtl_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "phoenix_dtl";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "phoenix_dtl";
+              version = "0.0.1";
+              sha256 =
+                "04e80730e1437dc624bd96207eaef064320209bb73e48915b4b52a9a01271898";
+            };
+
+            meta = {
+              description = ''Phoenix Template Engine for the django template
+                            language '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/andihit/phoenix_dtl";
+            };
+          }
+      ) {};
+
+    phoenix_dtl = phoenix_dtl_0_0_1;
+
+    phoenix_ecto_3_0_0_beta_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_1_0_3, phoenix_html_2_5_0, ecto_0_2_6
+        }:
+          buildMix {
+            name = "phoenix_ecto";
+            version = "3.0.0-beta.0";
+            src = fetchHex {
+              pkg = "phoenix_ecto";
+              version = "3.0.0-beta.0";
+              sha256 =
+                "f5e7c174329e9f64e6970c46a122654b6d27c619f3e6184e4db10577b0e5daac";
+            };
+            beamDeps  = [ poison_1_0_3 phoenix_html_2_5_0 ecto_0_2_6 ];
+
+            meta = {
+              description = ''Integration between Phoenix & Ecto'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/phoenixframework/phoenix_ecto";
+            };
+          }
+      ) {};
+
+    phoenix_ecto = phoenix_ecto_3_0_0_beta_0;
+
+    phoenix_gen_gulp_jspm_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, phoenix_1_1_4 }:
+          buildMix {
+            name = "phoenix_gen_gulp_jspm";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "phoenix_gen_gulp_jspm";
+              version = "1.0.0";
+              sha256 =
+                "7124ff1f232d82da40619579d2b3a5d15834f9cf3880ba3e8176cb7321b9eb59";
+            };
+            beamDeps  = [ phoenix_1_1_4 ];
+
+            meta = {
+              description = ''Replaces Brunch with Gulp and adds JSPM'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bryanjos/phoenix_gen_gulp_jspm";
+            };
+          }
+      ) {};
+
+    phoenix_gen_gulp_jspm = phoenix_gen_gulp_jspm_1_0_0;
+
+    phoenix_generator_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex, inflex_0_3_0 }:
+          buildMix {
+            name = "phoenix_generator";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "phoenix_generator";
+              version = "0.2.1";
+              sha256 =
+                "2be3753fba7b4a9afa461d270ab5111d76d1e5997b8e1587344051d85b6a1a36";
+            };
+            beamDeps  = [ inflex_0_3_0 ];
+
+            meta = {
+              description = ''A collection of boilerplate generators for the
+                            Phoenix web framework.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/etufe/phoenix_generator";
+            };
+          }
+      ) {};
+
+    phoenix_generator = phoenix_generator_0_2_1;
+
+    phoenix_haml_0_2_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          phoenix_html_2_5_0,
+          phoenix_1_0_4,
+          calliope_0_3_0
+        }:
+          buildMix {
+            name = "phoenix_haml";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "phoenix_haml";
+              version = "0.2.0";
+              sha256 =
+                "ec4f0dae227972a472661f1e8f9c51e8618290c8b6e5ca084ff81f6e7318468e";
+            };
+            beamDeps  = [ phoenix_html_2_5_0 phoenix_1_0_4 calliope_0_3_0 ];
+
+            meta = {
+              description = ''Phoenix Template Engine for Haml'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/chrismccord/phoenix_haml";
+            };
+          }
+      ) {};
+
+    phoenix_haml = phoenix_haml_0_2_0;
+
+    phoenix_html_2_5_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_0_8_1 }:
+          buildMix {
+            name = "phoenix_html";
+            version = "2.5.0";
+            src = fetchHex {
+              pkg = "phoenix_html";
+              version = "2.5.0";
+              sha256 =
+                "a3ef7288bf4a8304c65092774f602e3b1120536bed20dba9e90a5d2d41163fd4";
+            };
+            beamDeps  = [ plug_0_8_1 ];
+
+            meta = {
+              description = ''Phoenix.HTML functions for working with HTML
+                            strings and templates'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/phoenixframework/phoenix_html";
+            };
+          }
+      ) {};
+
+    phoenix_html = phoenix_html_2_5_0;
+
+    phoenix_html_sanitizer_0_2_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, phoenix_html_2_5_0, html_sanitize_ex_0_3_1
+        }:
+          buildMix {
+            name = "phoenix_html_sanitizer";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "phoenix_html_sanitizer";
+              version = "0.2.0";
+              sha256 =
+                "4cb5ae02d5560ff4e24cc378487065d038f0efd4883925a770b05c1c1d56a13c";
+            };
+            beamDeps  = [ phoenix_html_2_5_0 html_sanitize_ex_0_3_1 ];
+
+            meta = {
+              description = ''HTML sanitizer for Phoenix'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/elixirstatus/phoenix_html_sanitizer";
+            };
+          }
+      ) {};
+
+    phoenix_html_sanitizer = phoenix_html_sanitizer_0_2_0;
+
+    phoenix_linguist_0_0_1 = callPackage
+      (
+        {
+          buildMix, fetchHex, phoenix_1_1_4, linguist_0_1_5, cowboy_1_0_4
+        }:
+          buildMix {
+            name = "phoenix_linguist";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "phoenix_linguist";
+              version = "0.0.1";
+              sha256 =
+                "4a27898ab733b3b55c9fe38bd7ae299a92cfb290dc7d9bc940e1af653de1b1eb";
+            };
+            beamDeps  = [ phoenix_1_1_4 linguist_0_1_5 cowboy_1_0_4 ];
+
+            meta = {
+              longDescription = ''A project that integrates Phoenix with
+                                Linguist, providing a plug and view helpers'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jxs/phoenix_linguist";
+            };
+          }
+      ) {};
+
+    phoenix_linguist = phoenix_linguist_0_0_1;
+
+    phoenix_live_reload_1_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, phoenix_0_2_10, fs_0_9_2 }:
+          buildMix {
+            name = "phoenix_live_reload";
+            version = "1.0.3";
+            src = fetchHex {
+              pkg = "phoenix_live_reload";
+              version = "1.0.3";
+              sha256 =
+                "fbb65b7e4f4205b2e5d7061480889bd34d5c943a56feebd20b3dd949332fed85";
+            };
+            beamDeps  = [ phoenix_0_2_10 fs_0_9_2 ];
+
+            meta = {
+              description = ''Provides live-reload functionality for Phoenix'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/phoenixframework/phoenix_live_reload";
+            };
+          }
+      ) {};
+
+    phoenix_live_reload = phoenix_live_reload_1_0_3;
+
+    phoenix_pubsub_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "phoenix_pubsub";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "phoenix_pubsub";
+              version = "0.0.1";
+              sha256 =
+                "ea9f1853699e838965155af063f536f440afacadca316fb657858b3ac40da2eb";
+            };
+
+            meta = {
+              description = ''Distributed PubSub and Presence platform'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/phoenixframework/phoenix_pubsub";
+            };
+          }
+      ) {};
+
+    phoenix_pubsub = phoenix_pubsub_0_0_1;
+
+    phoenix_pubsub_postgres_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, postgrex_0_11_1, poolboy_1_4_2 }:
+          buildMix {
+            name = "phoenix_pubsub_postgres";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "phoenix_pubsub_postgres";
+              version = "0.0.2";
+              sha256 =
+                "85b43b941b8c3dcf3f967dcd5bca1e29716235398b8b6c03d52d6611d5cf82ad";
+            };
+            beamDeps  = [ postgrex_0_11_1 poolboy_1_4_2 ];
+
+            meta = {
+              description = ''Postgresql PubSub adapter for Phoenix apps'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/opendrops/phoenix-pubsub-postgres";
+            };
+          }
+      ) {};
+
+    phoenix_pubsub_postgres = phoenix_pubsub_postgres_0_0_2;
+
+    phoenix_pubsub_rabbitmq_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poolboy_1_4_2, amqp_0_1_4 }:
+          buildMix {
+            name = "phoenix_pubsub_rabbitmq";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "phoenix_pubsub_rabbitmq";
+              version = "0.0.1";
+              sha256 =
+                "e2158052cb3adfedca953fe8318dd5633d276728cc4fae6daa54d0dd7b7401c6";
+            };
+            beamDeps  = [ poolboy_1_4_2 amqp_0_1_4 ];
+
+            meta = {
+              description = ''RabbitMQ adapter for the Phoenix framework PubSub
+                            layer. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pma/phoenix_pubsub_rabbitmq";
+            };
+          }
+      ) {};
+
+    phoenix_pubsub_rabbitmq = phoenix_pubsub_rabbitmq_0_0_1;
+
+    phoenix_pubsub_redis_2_0_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, redo_2_0_1, poolboy_1_2_1, phoenix_1_1_4
+        }:
+          buildMix {
+            name = "phoenix_pubsub_redis";
+            version = "2.0.0";
+            src = fetchHex {
+              pkg = "phoenix_pubsub_redis";
+              version = "2.0.0";
+              sha256 =
+                "a10e9f4c419bed62d807e8be82f9ed5c9d8dfaef302165a0eec3e51ed1cb1cfa";
+            };
+            beamDeps  = [ redo_2_0_1 poolboy_1_2_1 phoenix_1_1_4 ];
+
+            meta = {
+              description = ''The Redis PubSub adapter for the Phoenix
+                            framework'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/phoenixframework/phoenix_pubsub_redis";
+            };
+          }
+      ) {};
+
+    phoenix_pubsub_redis = phoenix_pubsub_redis_2_0_0;
+
+    phoenix_pubsub_vernemq_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "phoenix_pubsub_vernemq";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "phoenix_pubsub_vernemq";
+              version = "0.0.3";
+              sha256 =
+                "92c228aee119d21c68b0b43250414686dee16986cb4d0039608612abd0d22824";
+            };
+
+            meta = {
+              description = ''The VerneMQ MQTT pubsub adapter for the Phoenix
+                            framework'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/larshesel/phoenix_pubsub_vernemq";
+            };
+          }
+      ) {};
+
+    phoenix_pubsub_vernemq = phoenix_pubsub_vernemq_0_0_3;
+
+    phoenix_simple_form_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, phoenix_html_2_5_0 }:
+          buildMix {
+            name = "phoenix_simple_form";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "phoenix_simple_form";
+              version = "0.0.2";
+              sha256 =
+                "e059ada8c507168d2267d6a1db1790192c063ca5e2a3579dfd2d1b07e25e9f45";
+            };
+            beamDeps  = [ phoenix_html_2_5_0 ];
+
+            meta = {
+              description = ''Easy form handling for phoenix'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sbrink/phoenix_simple_form";
+            };
+          }
+      ) {};
+
+    phoenix_simple_form = phoenix_simple_form_0_0_2;
+
+    phoenix_slim_0_4_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          slim_fast_0_10_0,
+          phoenix_html_2_5_0,
+          phoenix_1_1_4
+        }:
+          buildMix {
+            name = "phoenix_slim";
+            version = "0.4.1";
+            src = fetchHex {
+              pkg = "phoenix_slim";
+              version = "0.4.1";
+              sha256 =
+                "4225e74608e29c93c603c6cde61766b604495e04ef65d6ca325ff1a9a492c563";
+            };
+            beamDeps  = [ slim_fast_0_10_0 phoenix_html_2_5_0 phoenix_1_1_4
+                      ];
+
+            meta = {
+              description = ''Phoenix Template Engine for Slim'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/doomspork/phoenix_slim";
+            };
+          }
+      ) {};
+
+    phoenix_slim = phoenix_slim_0_4_1;
+
+    phoenix_slime_0_4_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          slime_0_12_1,
+          phoenix_html_2_5_0,
+          phoenix_1_1_4,
+          cowboy_1_0_4
+        }:
+          buildMix {
+            name = "phoenix_slime";
+            version = "0.4.1";
+            src = fetchHex {
+              pkg = "phoenix_slime";
+              version = "0.4.1";
+              sha256 =
+                "aa4036f88a0cab517ca8fa506c7c465fbb89f9857270c5711f6b83cec1cb8849";
+            };
+            beamDeps  = [
+                          slime_0_12_1
+                          phoenix_html_2_5_0
+                          phoenix_1_1_4
+                          cowboy_1_0_4
+                        ];
+
+            meta = {
+              description = ''Phoenix Template Engine for Slim-like
+                            templates'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/slime-lang/phoenix_slime";
+            };
+          }
+      ) {};
+
+    phoenix_slime = phoenix_slime_0_4_1;
+
+    phoenix_timex_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, timex_1_0_1, phoenix_html_2_5_0 }:
+          buildMix {
+            name = "phoenix_timex";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "phoenix_timex";
+              version = "0.0.3";
+              sha256 =
+                "47b2c32de83581ef12b58bdd9518c8180684ec7161cc7944d3b27542e414bc84";
+            };
+            beamDeps  = [ timex_1_0_1 phoenix_html_2_5_0 ];
+
+            meta = {
+              description = ''Phoenix and Timex integration'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Paradem/phoenix_timex";
+            };
+          }
+      ) {};
+
+    phoenix_timex = phoenix_timex_0_0_3;
+
+    phoenix_token_auth_0_4_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          timex_1_0_0_rc4,
+          secure_random_0_1_1,
+          postgrex_0_11_1,
+          poison_1_4_0,
+          phoenix_1_1_4,
+          mailgun_0_1_2,
+          joken_0_13_1,
+          ecto_2_0_0_beta_0,
+          cowboy_1_0_4,
+          comeonin_2_0_3
+        }:
+          buildMix {
+            name = "phoenix_token_auth";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "phoenix_token_auth";
+              version = "0.4.0";
+              sha256 =
+                "be1f3ed9d770b4d8650a30b6c091513d44e0c0331616366457713db77de2a620";
+            };
+            beamDeps  = [
+                          timex_1_0_0_rc4
+                          secure_random_0_1_1
+                          postgrex_0_11_1
+                          poison_1_4_0
+                          phoenix_1_1_4
+                          mailgun_0_1_2
+                          joken_0_13_1
+                          ecto_2_0_0_beta_0
+                          cowboy_1_0_4
+                          comeonin_2_0_3
+                        ];
+
+            meta = {
+              longDescription = ''Solution for token auth in Phoenix apps.
+                                Provides an api for registration, account
+                                confirmation and logging in.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/manukall/phoenix_token_auth";
+            };
+          }
+      ) {};
+
+    phoenix_token_auth = phoenix_token_auth_0_4_0;
+
+    phst_transform_0_9_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "phst_transform";
+            version = "0.9.0";
+            src = fetchHex {
+              pkg = "phst_transform";
+              version = "0.9.0";
+              sha256 =
+                "a5e76cd5b0549a36ec6268644a04366a7672bf449ecb5065dba441faf0c29dc1";
+            };
+
+            meta = {
+              longDescription = ''An Elixir Protocol and implementation for
+                                creating a tranform of any elixir data.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/philosophers-stone/transform";
+            };
+          }
+      ) {};
+
+    phst_transform = phst_transform_0_9_0;
+
+    picosat_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "picosat";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "picosat";
+              version = "0.1.0";
+              sha256 =
+                "d9bfa31240906306a6dae6bdd6fb1cb452e9462a391efa63017b17b2877cab51";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''Erlang bindings for PicoSAT'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tsloughter/picosat";
+            };
+          }
+      ) {};
+
+    picosat = picosat_0_1_0;
+
+    pigeon_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
+          buildMix {
+            name = "pigeon";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "pigeon";
+              version = "0.3.0";
+              sha256 =
+                "cb332c872656fc426b10309f0c840635549727f35df4deb52816f2c6b920639c";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''HTTP2-compliant wrapper for sending iOS and
+                            Android push notifications.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/codedge-llc/pigeon";
+            };
+          }
+      ) {};
+
+    pigeon = pigeon_0_3_0;
+
+    pin_elixir_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpotion_2_1_0 }:
+          buildMix {
+            name = "pin_elixir";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "pin_elixir";
+              version = "0.0.1";
+              sha256 =
+                "0140eecb7c714f9dadbcec26c45e2b2d770735029b7dcf98cdba9d793d80130a";
+            };
+            beamDeps  = [ poison_1_5_2 httpotion_2_1_0 ];
+
+            meta = {
+              description = ''A library to wrap the Pin Payments API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mfeckie/pin_elixir";
+            };
+          }
+      ) {};
+
+    pin_elixir = pin_elixir_0_0_1;
+
+    pinglix_1_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, timex_0_19_5, poison_1_4_0, plug_1_1_1 }:
+          buildMix {
+            name = "pinglix";
+            version = "1.1.1";
+            src = fetchHex {
+              pkg = "pinglix";
+              version = "1.1.1";
+              sha256 =
+                "bff8166655cc143518c0089aca104755ab188816707fb73a5739dd094f45e895";
+            };
+            beamDeps  = [ timex_0_19_5 poison_1_4_0 plug_1_1_1 ];
+
+            meta = {
+              longDescription = ''Plug compatible health check system in Elixir
+                                based on
+                                https://github.com/jbarnette/pinglish.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pvdvreede/pinglix";
+            };
+          }
+      ) {};
+
+    pinglix = pinglix_1_1_1;
+
+    pinyin_0_1_4 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "pinyin";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "pinyin";
+              version = "0.1.4";
+              sha256 =
+                "e0fc3dc148bc938ad12f5aefabf017620eb314ca4cf045b91ad195c557d5fa96";
+            };
+
+            meta = {
+              description = ''chinese pinyin library'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/lidashuang/pinyin";
+            };
+          }
+      ) {};
+
+    pinyin = pinyin_0_1_4;
+
+    pipe_0_0_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "pipe";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "pipe";
+              version = "0.0.2";
+              sha256 =
+                "ad6d90981606bb04d040c0af49cf493417994214ce6e74ac572dc2ee67e2c064";
+            };
+
+            meta = {
+              description = ''An Elixir extension that extends the pipe (|>)
+                            operator through macros. '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/batate/elixir-pipes";
+            };
+          }
+      ) {};
+
+    pipe = pipe_0_0_2;
+
+    pipe_here_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "pipe_here";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "pipe_here";
+              version = "1.0.0";
+              sha256 =
+                "95558a60ec7736685029e1b28b1c7cd7c7eae714fab779406aa2512c0f29c51e";
+            };
+
+            meta = {
+              description = ''An Elixir macro for easily piping arguments at
+                            any position.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/vic/pipe_here";
+            };
+          }
+      ) {};
+
+    pipe_here = pipe_here_1_0_0;
+
+    pipe_while_ok_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "pipe_while_ok";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "pipe_while_ok";
+              version = "0.0.2";
+              sha256 =
+                "b62708d0a0b82f421f937b99c5ff21a966e21d9a1f42ba75b8788100ac2c6567";
+            };
+
+            meta = {
+              description = ''PipeWhileOk =========== Moved to
+                            https://githib.com/pragdave/exlibris '';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/pragdave/pipe_while_ok";
+            };
+          }
+      ) {};
+
+    pipe_while_ok = pipe_while_ok_0_0_2;
+
+    pipette_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex, mock_0_1_1 }:
+          buildMix {
+            name = "pipette";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "pipette";
+              version = "0.0.4";
+              sha256 =
+                "8742ea9b115071c3aa7cec4ddacfa161ff63fd647e0491ac442cb118d7198e26";
+            };
+            beamDeps  = [ mock_0_1_1 ];
+
+            meta = {
+              description = ''new_data = pipette(data, template)'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/liquidz/pipette";
+            };
+          }
+      ) {};
+
+    pipette = pipette_0_0_4;
+
+    pixie_0_3_3 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          timex_0_19_5,
+          secure_random_0_2_0,
+          poolboy_1_5_1,
+          poison_1_5_2,
+          plug_1_0_3,
+          gproc_0_5_0,
+          exredis_0_2_3,
+          ex_minimatch_0_0_1,
+          ex_doc_0_11_4,
+          cowboy_1_0_4,
+          con_cache_0_9_0
+        }:
+          buildMix {
+            name = "pixie";
+            version = "0.3.3";
+            src = fetchHex {
+              pkg = "pixie";
+              version = "0.3.3";
+              sha256 =
+                "b89f9b3db05b68ce79656a4b188bae1065e96b286b5422321c37fcd508350b32";
+            };
+            beamDeps  = [
+                          timex_0_19_5
+                          secure_random_0_2_0
+                          poolboy_1_5_1
+                          poison_1_5_2
+                          plug_1_0_3
+                          gproc_0_5_0
+                          exredis_0_2_3
+                          ex_minimatch_0_0_1
+                          ex_doc_0_11_4
+                          cowboy_1_0_4
+                          con_cache_0_9_0
+                        ];
+
+            meta = {
+              description = ''Bayeux compatible server written in Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/messagerocket/pixie";
+            };
+          }
+      ) {};
+
+    pixie = pixie_0_3_3;
+
+    pkcs7_1_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "pkcs7";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "pkcs7";
+              version = "1.0.2";
+              sha256 =
+                "0e4faa65411e204b7952712d58f657335109ecbb24cf79163dc96458ba8d6518";
+            };
+
+            meta = {
+              description = ''PKCS7 binary padding for erlang'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/camshaft/pkcs7.erl";
+            };
+          }
+      ) {};
+
+    pkcs7 = pkcs7_1_0_2;
+
+    placid_0_1_3 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          xml_builder_0_0_8,
+          poison_1_2_1,
+          plug_0_9_0,
+          linguist_0_1_5,
+          http_router_0_0_8,
+          cowboy_1_0_4
+        }:
+          buildMix {
+            name = "placid";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "placid";
+              version = "0.1.3";
+              sha256 =
+                "78d30028ba9238c9b2cb7c5f91dc818aa3746c1c410a38fec9732de8a3c20146";
+            };
+            beamDeps  = [
+                          xml_builder_0_0_8
+                          poison_1_2_1
+                          plug_0_9_0
+                          linguist_0_1_5
+                          http_router_0_0_8
+                          cowboy_1_0_4
+                        ];
+
+            meta = {
+              longDescription = ''A REST toolkit for building highly-scalable
+                                and fault-tolerant HTTP APIs with Elixir '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/slogsdon/placid";
+            };
+          }
+      ) {};
+
+    placid = placid_0_1_3;
+
+    plasm_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, postgrex_0_11_1, ecto_2_0_0_beta_0 }:
+          buildMix {
+            name = "plasm";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "plasm";
+              version = "0.1.0";
+              sha256 =
+                "0eb476cae0b02dedbbc558f59ca22f0791221129d15fba570c0a3b96401d6836";
+            };
+            beamDeps  = [ postgrex_0_11_1 ecto_2_0_0_beta_0 ];
+
+            meta = {
+              longDescription = ''Plasm is a composable query library for Ecto
+                                containing several common query transforms to
+                                make working with Ecto easier.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/atomic-fads/plasm";
+            };
+          }
+      ) {};
+
+    plasm = plasm_0_1_0;
+
+    plist_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "plist";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "plist";
+              version = "0.0.2";
+              sha256 =
+                "e3560e6d94c4464b7479bb42a0fc1450e89fe99e67af099fb5cb2b2c7402409f";
+            };
+
+            meta = {
+              description = ''An Elixir library to parse files in Apple`s
+                            property list formats'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ciaran/plist";
+            };
+          }
+      ) {};
+
+    plist = plist_0_0_2;
+
+    plug_0_11_3 = callPackage
+      (
+        {  buildMix, fetchHex, cowboy_1_0_4 }:
+          buildMix {
+            name = "plug";
+            version = "0.11.3";
+            src = fetchHex {
+              pkg = "plug";
+              version = "0.11.3";
+              sha256 =
+                "82834fa130af2520b9dad4a271f4fe5c25a456cf2334aae35ef84989efec65e3";
+            };
+            beamDeps  = [ cowboy_1_0_4 ];
+
+            meta = {
+              description = ''A specification and conveniences for composable
+                            modules between web applications'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/elixir-lang/plug";
+            };
+          }
+      ) {};
+
+    plug_0_12_2 = callPackage
+      (
+        {  buildMix, fetchHex, cowboy_1_0_4 }:
+          buildMix {
+            name = "plug";
+            version = "0.12.2";
+            src = fetchHex {
+              pkg = "plug";
+              version = "0.12.2";
+              sha256 =
+                "b26e8c636fc5b83e0b69767fb3cb2c693703b7f8c1eed11091e57f6e7caebc2d";
+            };
+            beamDeps  = [ cowboy_1_0_4 ];
+
+            meta = {
+              description = ''A specification and conveniences for composable
+                            modules between web applications'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/elixir-lang/plug";
+            };
+          }
+      ) {};
+
+    plug_0_13_1 = callPackage
+      (
+        {  buildMix, fetchHex, cowboy_1_0_4 }:
+          buildMix {
+            name = "plug";
+            version = "0.13.1";
+            src = fetchHex {
+              pkg = "plug";
+              version = "0.13.1";
+              sha256 =
+                "50b7ef7c753e703b04ed79bc254ed0fbe07db3ed90894598d377c41e15f4490b";
+            };
+            beamDeps  = [ cowboy_1_0_4 ];
+
+            meta = {
+              description = ''A specification and conveniences for composable
+                            modules between web applications'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/elixir-lang/plug";
+            };
+          }
+      ) {};
+
+    plug_0_14_0 = callPackage
+      (
+        {  buildMix, fetchHex, cowboy_1_0_4 }:
+          buildMix {
+            name = "plug";
+            version = "0.14.0";
+            src = fetchHex {
+              pkg = "plug";
+              version = "0.14.0";
+              sha256 =
+                "bacee77168bce635d959d8c41e0723936fba41170edf11665deaf30ee668303d";
+            };
+            beamDeps  = [ cowboy_1_0_4 ];
+
+            meta = {
+              description = ''A specification and conveniences for composable
+                            modules between web applications'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/elixir-lang/plug";
+            };
+          }
+      ) {};
+
+    plug_0_5_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "plug";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "plug";
+              version = "0.5.0";
+              sha256 =
+                "e34388510cdf725521cc772a8e711a090e1684bd964ced89d86b53dfd7a66ff5";
+            };
+
+            meta = {
+              description = ''A specification and conveniences for composable
+                            modules between web applications'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/elixir-lang/plug";
+            };
+          }
+      ) {};
+
+    plug_0_7_0 = callPackage
+      (
+        {  buildMix, fetchHex, cowboy_1_0_4 }:
+          buildMix {
+            name = "plug";
+            version = "0.7.0";
+            src = fetchHex {
+              pkg = "plug";
+              version = "0.7.0";
+              sha256 =
+                "c25ceaacbdd0085653d84f8187c179e523b2edd54d393673df2d761f85795867";
+            };
+            beamDeps  = [ cowboy_1_0_4 ];
+
+            meta = {
+              description = ''A specification and conveniences for composable
+                            modules between web applications'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/elixir-lang/plug";
+            };
+          }
+      ) {};
+
+    plug_0_8_1 = callPackage
+      (
+        {  buildMix, fetchHex, cowboy_1_0_4 }:
+          buildMix {
+            name = "plug";
+            version = "0.8.1";
+            src = fetchHex {
+              pkg = "plug";
+              version = "0.8.1";
+              sha256 =
+                "bf16b2ac50df99b6179b25dd35737d5fb9dda1442f00bbeb54190244de5d8617";
+            };
+            beamDeps  = [ cowboy_1_0_4 ];
+
+            meta = {
+              description = ''A specification and conveniences for composable
+                            modules between web applications'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/elixir-lang/plug";
+            };
+          }
+      ) {};
+
+    plug_0_8_4 = callPackage
+      (
+        {  buildMix, fetchHex, cowboy_1_0_4 }:
+          buildMix {
+            name = "plug";
+            version = "0.8.4";
+            src = fetchHex {
+              pkg = "plug";
+              version = "0.8.4";
+              sha256 =
+                "22c18f351cb30df9ca0b33bedd545bdbbc7eee60f1321cfcfe703228355ff2ec";
+            };
+            beamDeps  = [ cowboy_1_0_4 ];
+
+            meta = {
+              description = ''A specification and conveniences for composable
+                            modules between web applications'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/elixir-lang/plug";
+            };
+          }
+      ) {};
+
+    plug_0_9_0 = callPackage
+      (
+        {  buildMix, fetchHex, cowboy_1_0_4 }:
+          buildMix {
+            name = "plug";
+            version = "0.9.0";
+            src = fetchHex {
+              pkg = "plug";
+              version = "0.9.0";
+              sha256 =
+                "2715df7f9e2650d1725576f5a683317d8dcaf656f524c14b384d7a54d74a09d1";
+            };
+            beamDeps  = [ cowboy_1_0_4 ];
+
+            meta = {
+              description = ''A specification and conveniences for composable
+                            modules between web applications'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/elixir-lang/plug";
+            };
+          }
+      ) {};
+
+    plug_1_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, cowboy_1_0_4 }:
+          buildMix {
+            name = "plug";
+            version = "1.0.3";
+            src = fetchHex {
+              pkg = "plug";
+              version = "1.0.3";
+              sha256 =
+                "31d1cc267cf48e3db8ce00b7a7bb6ced41c04d8f3593a61318f9a7f721997f6e";
+            };
+            beamDeps  = [ cowboy_1_0_4 ];
+
+            meta = {
+              description = ''A specification and conveniences for composable
+                            modules between web applications'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/elixir-lang/plug";
+            };
+          }
+      ) {};
+
+    plug_1_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, cowboy_1_0_4 }:
+          buildMix {
+            name = "plug";
+            version = "1.1.1";
+            src = fetchHex {
+              pkg = "plug";
+              version = "1.1.1";
+              sha256 =
+                "15a8ebd70bc8e545ee96212f26751d57908a3ea63cd5ca1d664a5d70038b8071";
+            };
+            beamDeps  = [ cowboy_1_0_4 ];
+
+            meta = {
+              description = ''A specification and conveniences for composable
+                            modules between web applications'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/elixir-lang/plug";
+            };
+          }
+      ) {};
+
+    plug = plug_1_1_1;
+
+    plug_abort_2_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, plug_0_8_1, cowboy_1_0_4, poison_1_0_3 }:
+          buildMix {
+            name = "plug_abort";
+            version = "2.1.1";
+            src = fetchHex {
+              pkg = "plug_abort";
+              version = "2.1.1";
+              sha256 =
+                "8da98a882ea79e08443e7d26c94ee2b572560efca3f0a5922c69e508ac02d883";
+            };
+            beamDeps  = [ plug_0_8_1 cowboy_1_0_4 poison_1_0_3 ];
+
+            meta = {
+              description = ''Easily abort the processing of a plug stack '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/onkel-dirtus/plug_abort";
+            };
+          }
+      ) {};
+
+    plug_abort = plug_abort_2_1_1;
+
+    plug_accept_language_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "plug_accept_language";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "plug_accept_language";
+              version = "0.1.0";
+              sha256 =
+                "5535c842805ba980f3bf5fa5cde202fd3375c049e3681e206de1976c5765765a";
+            };
+
+            meta = {
+              description = ''parse the accept-language header'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/camshaft/plug_accept_language";
+            };
+          }
+      ) {};
+
+    plug_accept_language = plug_accept_language_0_1_0;
+
+    plug_accesslog_0_10_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          tzdata_0_5_6,
+          timex_1_0_1,
+          plug_1_1_1,
+          cowboy_1_0_4
+        }:
+          buildMix {
+            name = "plug_accesslog";
+            version = "0.10.0";
+            src = fetchHex {
+              pkg = "plug_accesslog";
+              version = "0.10.0";
+              sha256 =
+                "c7cb4562e6ee51f9329b0aea877c3c82d5c109a1946b40b19f7311b7290d474a";
+            };
+            beamDeps  = [ tzdata_0_5_6 timex_1_0_1 plug_1_1_1 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Plug for writing access logs'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/mneudert/plug_accesslog";
+            };
+          }
+      ) {};
+
+    plug_accesslog = plug_accesslog_0_10_0;
+
+    plug_assign_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_0_3 }:
+          buildMix {
+            name = "plug_assign";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "plug_assign";
+              version = "1.0.0";
+              sha256 =
+                "293a2885e8d23fce64b9f81019882e14512d57cf82b863f9be860157e5f79708";
+            };
+            beamDeps  = [ plug_1_0_3 ];
+
+            meta = {
+              description = ''A simple plug to allow setting variables in a
+                            connection.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nshafer/plug_assign";
+            };
+          }
+      ) {};
+
+    plug_assign = plug_assign_1_0_0;
+
+    plug_auth_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_0_8_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "plug_auth";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "plug_auth";
+              version = "0.2.0";
+              sha256 =
+                "beb4fe7afce35714055b7cf362b1bd31665c0f4f2f2f6e59076d70ed60c48dc8";
+            };
+            beamDeps  = [ plug_0_8_1 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''A collection of authentication-related plugs'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/bitgamma/plug_auth";
+            };
+          }
+      ) {};
+
+    plug_auth = plug_auth_0_2_0;
+
+    plug_basic_auth_1_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_0_8_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "plug_basic_auth";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "plug_basic_auth";
+              version = "1.1.0";
+              sha256 =
+                "6763e5ad0f17d6693e296cc3a69c1db627f9b66bda2bcded4ddfcc84a42f0c03";
+            };
+            beamDeps  = [ plug_0_8_1 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''A Plug for using HTTP Basic Authentication in
+                            Plug applications'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/rbishop/plug_basic_auth";
+            };
+          }
+      ) {};
+
+    plug_basic_auth = plug_basic_auth_1_1_0;
+
+    plug_byte_serve_0_3_2 = callPackage
+      (
+        {  buildMix, fetchHex, plug_0_11_3 }:
+          buildMix {
+            name = "plug_byte_serve";
+            version = "0.3.2";
+            src = fetchHex {
+              pkg = "plug_byte_serve";
+              version = "0.3.2";
+              sha256 =
+                "f6e4873373b3efd207877ca5f797f4ea539cf2a885aae895c6c3df73ce9b75ac";
+            };
+            beamDeps  = [ plug_0_11_3 ];
+
+            meta = {
+              description = ''A Plug for using HTTP Byte Serving in Plug
+                            applications.'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/masteinhauser/plug_byte_serve";
+            };
+          }
+      ) {};
+
+    plug_byte_serve = plug_byte_serve_0_3_2;
+
+    plug_cloudflare_1_2_1 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, cidr_0_5_0 }:
+          buildMix {
+            name = "plug_cloudflare";
+            version = "1.2.1";
+            src = fetchHex {
+              pkg = "plug_cloudflare";
+              version = "1.2.1";
+              sha256 =
+                "854e202c40f86c50e0b95c373c5335106f21f9059fc74d8379915ab560ecf8b6";
+            };
+            beamDeps  = [ plug_1_1_1 cidr_0_5_0 ];
+
+            meta = {
+              description = ''Convert CloudFlare`s CF-Connecting-IP header to
+                            Plug.Conn`s remote_ip field.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/c-rack/plug_cloudflare";
+            };
+          }
+      ) {};
+
+    plug_cloudflare = plug_cloudflare_1_2_1;
+
+    plug_cors_0_8_2 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "plug_cors";
+            version = "0.8.2";
+            src = fetchHex {
+              pkg = "plug_cors";
+              version = "0.8.2";
+              sha256 =
+                "286a36b000989538c168d115f6a017aaa15a4031e4f867d300878d81c3b8c6aa";
+            };
+            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Deprecated: CORS Plug Middleware. Please use
+                            corsica instead'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/bryanjos/plug_cors";
+            };
+          }
+      ) {};
+
+    plug_cors = plug_cors_0_8_2;
+
+    plug_exception_handler_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex, plug_0_8_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "plug_exception_handler";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "plug_exception_handler";
+              version = "0.0.4";
+              sha256 =
+                "477ea599e516bcf8efb399ca43ca3d9cecd50982222b1f5f259092d4c99fca28";
+            };
+            beamDeps  = [ plug_0_8_1 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Rescue exceptions from your plug stack'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/onkel-dirtus/plug_exception_handler";
+            };
+          }
+      ) {};
+
+    plug_exception_handler = plug_exception_handler_0_0_4;
+
+    plug_forwarded_peer_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1 }:
+          buildMix {
+            name = "plug_forwarded_peer";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "plug_forwarded_peer";
+              version = "0.0.2";
+              sha256 =
+                "c2466e0f0ef75a0d925a957fa50dfcded2c4788fe67857a675411e7184ae5ec3";
+            };
+            beamDeps  = [ plug_1_1_1 ];
+
+            meta = {
+              longDescription = ''Very simple plug which reads
+                                `X-Forwarded-For` or `Forwarded` header
+                                according to rfc7239 and fill `conn.remote_ip`
+                                with the root client ip.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "http://github.com/awetzel/plug_forwarded_peer";
+            };
+          }
+      ) {};
+
+    plug_forwarded_peer = plug_forwarded_peer_0_0_2;
+
+    plug_fprof_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "plug_fprof";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "plug_fprof";
+              version = "0.0.1";
+              sha256 =
+                "4c5e6171ab7ebb29b6d473f8c5fd758a11ade5847d31add676c944a302ab006c";
+            };
+
+            meta = {
+              description = ''A Plug that adds fprof tracing to requests, to
+                            allow for easy profiling.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/obmarg/plug_fprof";
+            };
+          }
+      ) {};
+
+    plug_fprof = plug_fprof_0_0_1;
+
+    plug_geoip2_0_4_2 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, geolix_0_9_0 }:
+          buildMix {
+            name = "plug_geoip2";
+            version = "0.4.2";
+            src = fetchHex {
+              pkg = "plug_geoip2";
+              version = "0.4.2";
+              sha256 =
+                "2a6443040e07e677b0ff7749d2cdf7797a97254466f6740aee11544a18f4993a";
+            };
+            beamDeps  = [ plug_1_1_1 geolix_0_9_0 ];
+
+            meta = {
+              longDescription = ''Adds geo location to a Plug connection based
+                                upon the client IP address by using MaxMind`s
+                                GeoIP2 database.'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    plug_geoip2 = plug_geoip2_0_4_2;
+
+    plug_graphql_0_1_5 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poison_1_5_2,
+          plug_0_8_1,
+          graphql_0_1_2,
+          cowboy_1_0_4
+        }:
+          buildMix {
+            name = "plug_graphql";
+            version = "0.1.5";
+            src = fetchHex {
+              pkg = "plug_graphql";
+              version = "0.1.5";
+              sha256 =
+                "a0a93dfe74a701393428bd0963dd2b93db5e418f8bf095a0b1f9bdab854ef0b7";
+            };
+            beamDeps  = [ poison_1_5_2 plug_0_8_1 graphql_0_1_2 cowboy_1_0_4
+                      ];
+
+            meta = {
+              description = ''A Plug integration for GraphQL Elixir'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/graphql-elixir/plug_graphql";
+            };
+          }
+      ) {};
+
+    plug_graphql = plug_graphql_0_1_5;
+
+    plug_heartbeat_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "plug_heartbeat";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "plug_heartbeat";
+              version = "0.2.0";
+              sha256 =
+                "23cb357dad510695b6bb339fdbf5d3fc8581546124f7389d63c9cf723e4ad40f";
+            };
+            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''A tiny plug for responding to heartbeat requests
+                            '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/whatyouhide/plug_heartbeat";
+            };
+          }
+      ) {};
+
+    plug_heartbeat = plug_heartbeat_0_2_0;
+
+    plug_json_parser_0_0_6 = callPackage
+      (
+        {  buildMix, fetchHex, plug_0_8_1, cowboy_1_0_4, poison_1_1_1 }:
+          buildMix {
+            name = "plug_json_parser";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "plug_json_parser";
+              version = "0.0.6";
+              sha256 =
+                "4c07f3adade5ad8730b6ec5d33d50b5dbe1a960e2be29a764b415c5234c79204";
+            };
+            beamDeps  = [ plug_0_8_1 cowboy_1_0_4 poison_1_1_1 ];
+
+            meta = {
+              description = ''JSON parse for Plug.Parsers '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/onkel-dirtus/plug_json_parser";
+            };
+          }
+      ) {};
+
+    plug_json_parser = plug_json_parser_0_0_6;
+
+    plug_jwt_0_7_1 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, joken_0_16_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "plug_jwt";
+            version = "0.7.1";
+            src = fetchHex {
+              pkg = "plug_jwt";
+              version = "0.7.1";
+              sha256 =
+                "a87cd8815454093c3300bdae4f2af7ec8c671fd22ce55f598309b5bed4ac3a2a";
+            };
+            beamDeps  = [ plug_1_1_1 joken_0_16_1 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''JWT Plug Middleware'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/bryanjos/plug_jwt.git";
+            };
+          }
+      ) {};
+
+    plug_jwt = plug_jwt_0_7_1;
+
+    plug_media_type_router_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1 }:
+          buildMix {
+            name = "plug_media_type_router";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "plug_media_type_router";
+              version = "0.0.2";
+              sha256 =
+                "e5f72ee4fd1a43321532e3165b3609a1184ba2d576279a1a63e17afba084f12b";
+            };
+            beamDeps  = [ plug_1_1_1 ];
+
+            meta = {
+              longDescription = ''An Elixir Plug for routing requests to other
+                                Plugs based on the request`s Media Type'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/cazrin/plug_media_type_router";
+            };
+          }
+      ) {};
+
+    plug_media_type_router = plug_media_type_router_0_0_2;
+
+    plug_rails_cookie_session_store_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "plug_rails_cookie_session_store";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "plug_rails_cookie_session_store";
+              version = "0.1.0";
+              sha256 =
+                "e08041d2ad4884826d8296a5560609df04a936ceca492d094f06458699ac69da";
+            };
+            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Rails compatible Plug session store'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/cconstantin/plug_rails_cookie_session_store";
+            };
+          }
+      ) {};
+
+    plug_rails_cookie_session_store =
+      plug_rails_cookie_session_store_0_1_0;
+
+    plug_redirect_https_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1 }:
+          buildMix {
+            name = "plug_redirect_https";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "plug_redirect_https";
+              version = "0.0.4";
+              sha256 =
+                "b0cf8d86bb6d39653923e48067e6259beb6daee3f0e6ea6beff9ddcbef22b4d5";
+            };
+            beamDeps  = [ plug_1_1_1 ];
+
+            meta = {
+              description = ''Plug to redirect http requests to https requests
+                            behind a reverse proxy'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/stocks29/plug_redirect_https.git";
+            };
+          }
+      ) {};
+
+    plug_redirect_https = plug_redirect_https_0_0_4;
+
+    plug_require_header_0_8_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_1 }:
+          buildMix {
+            name = "plug_require_header";
+            version = "0.8.0";
+            src = fetchHex {
+              pkg = "plug_require_header";
+              version = "0.8.0";
+              sha256 =
+                "b721158316f6d2efd4b24bd05a8a1c06caa699ee25249185c8c4f03f9204b283";
+            };
+            beamDeps  = [ poison_1_5_2 plug_1_1_1 ];
+
+            meta = {
+              description = ''An Elixir Plug for requiring and extracting a
+                            given header.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/DevL/plug_require_header";
+            };
+          }
+      ) {};
+
+    plug_require_header = plug_require_header_0_8_0;
+
+    plug_response_header_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1 }:
+          buildMix {
+            name = "plug_response_header";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "plug_response_header";
+              version = "0.2.1";
+              sha256 =
+                "82fd11fc70d925ed5a608ac13a9f604a80e24827f6603999d6a0f3f123862048";
+            };
+            beamDeps  = [ plug_1_1_1 ];
+
+            meta = {
+              description = ''This plug allows manipulation of HTTP response
+                            headers'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/c-rack/plug_response_header";
+            };
+          }
+      ) {};
+
+    plug_response_header = plug_response_header_0_2_1;
+
+    plug_ribbon_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1 }:
+          buildMix {
+            name = "plug_ribbon";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "plug_ribbon";
+              version = "0.2.1";
+              sha256 =
+                "34fcbffb6fc3adde6bb167506934ab19787d2fff82b6bf93918e0000159bfe9d";
+            };
+            beamDeps  = [ plug_1_1_1 ];
+
+            meta = {
+              description = ''Injects a ribbon to your web application
+                            depending on the environment'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://git.io/plug_ribbon";
+            };
+          }
+      ) {};
+
+    plug_ribbon = plug_ribbon_0_2_1;
+
+    plug_runtime_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1 }:
+          buildMix {
+            name = "plug_runtime";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "plug_runtime";
+              version = "0.0.1";
+              sha256 =
+                "b47ec0f5870e3c6adcad708c37ecbdd69ec25cd1f5bf1c15e21f78b518b7eb1c";
+            };
+            beamDeps  = [ plug_1_1_1 ];
+
+            meta = {
+              longDescription = ''A simple Plug to measure the runtime of a
+                                request. Results will be in the X-Runtime
+                                header.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/mje113/plug_runtime";
+            };
+          }
+      ) {};
+
+    plug_runtime = plug_runtime_0_0_1;
+
+    plug_secure_headers_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1 }:
+          buildMix {
+            name = "plug_secure_headers";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "plug_secure_headers";
+              version = "0.0.1";
+              sha256 =
+                "727c5b7216aaa4bec2e0f88ed72199082820341602fad49cfc4c74477f55a905";
+            };
+            beamDeps  = [ plug_1_1_1 ];
+
+            meta = {
+              description = ''HTTP security headers with validatation for
+                            Phoenix/Plug'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/anotherhale/plug_secure_headers";
+            };
+          }
+      ) {};
+
+    plug_secure_headers = plug_secure_headers_0_0_1;
+
+    plug_session_memcached_0_3_3 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          plug_1_1_1,
+          ex_doc_0_11_4,
+          earmark_0_2_1,
+          cowboy_1_0_4
+        }:
+          buildMix {
+            name = "plug_session_memcached";
+            version = "0.3.3";
+            src = fetchHex {
+              pkg = "plug_session_memcached";
+              version = "0.3.3";
+              sha256 =
+                "f9cd5de250dbab0180166c873a50d297036d72f7cbac1a076972444c41f0b4c3";
+            };
+            beamDeps  = [ plug_1_1_1 ex_doc_0_11_4 earmark_0_2_1 cowboy_1_0_4
+                      ];
+
+            meta = {
+              description = ''A memcached session store for use with
+                            Plug.Session'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/gutschilla/plug-session-memcached";
+            };
+          }
+      ) {};
+
+    plug_session_memcached = plug_session_memcached_0_3_3;
+
+    plug_session_redis_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, redo_2_0_1, poolboy_1_5_1 }:
+          buildMix {
+            name = "plug_session_redis";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "plug_session_redis";
+              version = "0.1.0";
+              sha256 =
+                "8a101a1e36cb9212153191e44963f052b7478b0bfaff5a85e331afe0ae56dbeb";
+            };
+            beamDeps  = [ redo_2_0_1 poolboy_1_5_1 ];
+
+            meta = {
+              description = ''The Redis Plug.Session adapter for the Phoenix
+                            framework.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/aposto/plug_session_redis";
+            };
+          }
+      ) {};
+
+    plug_session_redis = plug_session_redis_0_1_0;
+
+    plug_statsd_0_4_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, ex_statsd_0_5_3 }:
+          buildMix {
+            name = "plug_statsd";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "plug_statsd";
+              version = "0.4.0";
+              sha256 =
+                "c618161e5ad93c727be6ce776e7f53542950d97a602691aee2acef2d57dbdea9";
+            };
+            beamDeps  = [ plug_1_1_1 ex_statsd_0_5_3 ];
+
+            meta = {
+              description = ''A (Phoenix) plug for sending request counts and
+                            response times to statsd'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jeffweiss/plug_statsd";
+            };
+          }
+      ) {};
+
+    plug_statsd = plug_statsd_0_4_0;
+
+    plug_test_helpers_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_0_8_4, cowboy_1_0_4 }:
+          buildMix {
+            name = "plug_test_helpers";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "plug_test_helpers";
+              version = "0.1.0";
+              sha256 =
+                "f542d679a33d42147612164ade572fa973344b4550ffcbbb0ef540492c9e97fe";
+            };
+            beamDeps  = [ plug_0_8_4 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Helpers to test your Plugs with ExUnit'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/xavier/plug_test_helpers";
+            };
+          }
+      ) {};
+
+    plug_test_helpers = plug_test_helpers_0_1_0;
+
+    plug_wait1_0_1_4 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_3_1, plug_0_13_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "plug_wait1";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "plug_wait1";
+              version = "0.1.4";
+              sha256 =
+                "4ef36a750c07484e6c6513421e56ad42fa023cb424cbb4cf11a2e686a4fa4be7";
+            };
+            beamDeps  = [ poison_1_3_1 plug_0_13_1 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Plug adapter for the wait1 protocol'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/wait1/plug_wait1";
+            };
+          }
+      ) {};
+
+    plug_wait1 = plug_wait1_0_1_4;
+
+    plug_x_forwarded_for_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "plug_x_forwarded_for";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "plug_x_forwarded_for";
+              version = "0.1.0";
+              sha256 =
+                "7a12dff0f850855ae85d70ed0e71aff5ec55dad6c52fc46d6ba21119e6183b33";
+            };
+
+            meta = {
+              description = ''x-forwarded-for plug middleware'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/camshaft/plug_x_forwarded_for";
+            };
+          }
+      ) {};
+
+    plug_x_forwarded_for = plug_x_forwarded_for_0_1_0;
+
+    plugin_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "plugin";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "plugin";
+              version = "0.1.0";
+              sha256 =
+                "f596a2e9e14081884a841d1805e024d435c6a27e5e38b9c64214017659560fad";
+            };
+
+            meta = {
+              longDescription = ''Like Plug, only without web-specific logic
+                                and without a typed Conn-datastructure'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ruby2elixir/plugin";
+            };
+          }
+      ) {};
+
+    plugin = plugin_0_1_0;
+
+    plugs_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "plugs";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "plugs";
+              version = "0.1.0";
+              sha256 =
+                "8d6cafd3ea0d373795774c9de2a0503433d65d9c2c0d58bd23ba0d9ba3547297";
+            };
+            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''A collection of Plug middleware for web
+                            applications'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sugar-framework/plugs";
+            };
+          }
+      ) {};
+
+    plugs = plugs_0_1_0;
+
+    plugsnag_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, bugsnag_1_1_1 }:
+          buildMix {
+            name = "plugsnag";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "plugsnag";
+              version = "1.0.1";
+              sha256 =
+                "cf6c257d400b872787ced1a7175adb7332a7aa9d12d1a6ac6abcd8cf799bd06c";
+            };
+            beamDeps  = [ bugsnag_1_1_1 ];
+
+            meta = {
+              description = ''Bugsnag reporter for Elixir`s Plug'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jarednorman/plugsnag";
+            };
+          }
+      ) {};
+
+    plugsnag = plugsnag_1_0_1;
+
+    plumber_girl_0_9_6 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "plumber_girl";
+            version = "0.9.6";
+            src = fetchHex {
+              pkg = "plumber_girl";
+              version = "0.9.6";
+              sha256 =
+                "2a9faf9980cae59e11a6f9cf151a634cd809de220293bbbaba849f216c247a45";
+            };
+
+            meta = {
+              description = ''PlumberGirl takes care of your Elixir piping
+                            issues!'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ruby2elixir/plumber_girl";
+            };
+          }
+      ) {};
+
+    plumber_girl = plumber_girl_0_9_6;
+
+    png_0_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "png";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "png";
+              version = "0.1.1";
+              sha256 =
+                "f8d4a17c118dcc16bb18d0fda6e26947001f9312bc6c061d2236b424fc3dd9ea";
+            };
+
+            meta = {
+              longDescription = ''A pure Erlang library for creating PNG
+                                images. It can currently create 8 and 16 bit
+                                RGB, RGB with alpha, indexed, grayscale and
+                                grayscale with alpha images.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/yuce/png";
+            };
+          }
+      ) {};
+
+    png = png_0_1_1;
+
+    pocketex_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_3_1, httpoison_0_8_1 }:
+          buildMix {
+            name = "pocketex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "pocketex";
+              version = "0.1.0";
+              sha256 =
+                "b832df8e3f3102b69892cc5cfab4418de876a6ecc5780805458b9946aa407cbf";
+            };
+            beamDeps  = [ poison_1_3_1 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Pocketex is an Elixir client for the Pocket read
+                            later service (getpocket.com) '';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/essenciary/pocketex";
+            };
+          }
+      ) {};
+
+    pocketex = pocketex_0_1_0;
+
+    poison_1_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "poison";
+            version = "1.0.3";
+            src = fetchHex {
+              pkg = "poison";
+              version = "1.0.3";
+              sha256 =
+                "632b9f5c4c2e56987f123b9f35e52b356c2de28ce7692d66becf12df10cc1012";
+            };
+
+            meta = {
+              description = ''An incredibly fast, pure Elixir JSON library'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/devinus/poison";
+            };
+          }
+      ) {};
+
+    poison_1_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "poison";
+            version = "1.1.1";
+            src = fetchHex {
+              pkg = "poison";
+              version = "1.1.1";
+              sha256 =
+                "57e77cdafe34769dcc114c6c249847b66304e5489891306b9762e3211520d767";
+            };
+
+            meta = {
+              description = ''An incredibly fast, pure Elixir JSON library'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/devinus/poison";
+            };
+          }
+      ) {};
+
+    poison_1_2_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "poison";
+            version = "1.2.1";
+            src = fetchHex {
+              pkg = "poison";
+              version = "1.2.1";
+              sha256 =
+                "7be9f3b2688efdcc689062ccd21e340ee5fd3ef9dcd142136034beb5ed1c2e23";
+            };
+
+            meta = {
+              description = ''An incredibly fast, pure Elixir JSON library'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/devinus/poison";
+            };
+          }
+      ) {};
+
+    poison_1_3_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "poison";
+            version = "1.3.1";
+            src = fetchHex {
+              pkg = "poison";
+              version = "1.3.1";
+              sha256 =
+                "fbd78dd3e5abbadc17ddd89905002f6d20a03046f7555a6098d28a9f14feaf58";
+            };
+
+            meta = {
+              description = ''An incredibly fast, pure Elixir JSON library'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/devinus/poison";
+            };
+          }
+      ) {};
+
+    poison_1_4_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "poison";
+            version = "1.4.0";
+            src = fetchHex {
+              pkg = "poison";
+              version = "1.4.0";
+              sha256 =
+                "b2715aaeb9f549f4e30739d43993e3c1b1053a4ed69d50c660621bdd1eb96606";
+            };
+
+            meta = {
+              description = ''An incredibly fast, pure Elixir JSON library'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/devinus/poison";
+            };
+          }
+      ) {};
+
+    poison_1_5_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "poison";
+            version = "1.5.0";
+            src = fetchHex {
+              pkg = "poison";
+              version = "1.5.0";
+              sha256 =
+                "a31ffdaf77494ff12d6c2c9cb03235d4373596d2faf62ee5b99c1ae479618400";
+            };
+
+            meta = {
+              description = ''An incredibly fast, pure Elixir JSON library'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/devinus/poison";
+            };
+          }
+      ) {};
+
+    poison_1_5_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "poison";
+            version = "1.5.2";
+            src = fetchHex {
+              pkg = "poison";
+              version = "1.5.2";
+              sha256 =
+                "4afc59dcadf71be7edc8b934b39f554ec7b31e2b1b1a4767383a663f86958ce3";
+            };
+
+            meta = {
+              description = ''An incredibly fast, pure Elixir JSON library'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/devinus/poison";
+            };
+          }
+      ) {};
+
+    poison_2_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "poison";
+            version = "2.0.1";
+            src = fetchHex {
+              pkg = "poison";
+              version = "2.0.1";
+              sha256 =
+                "7f34906a0839f3b49b9b7647461c5144787611f599e8d743214280761699df2b";
+            };
+
+            meta = {
+              description = ''An incredibly fast, pure Elixir JSON library'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/devinus/poison";
+            };
+          }
+      ) {};
+
+    poison_2_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "poison";
+            version = "2.1.0";
+            src = fetchHex {
+              pkg = "poison";
+              version = "2.1.0";
+              sha256 =
+                "002caaf939b97c84533ef0f621d3ed414ed703fcd03c91ec0dd62043df102c63";
+            };
+
+            meta = {
+              description = ''An incredibly fast, pure Elixir JSON library'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/devinus/poison";
+            };
+          }
+      ) {};
+
+    poison = poison_2_1_0;
+
+    poker_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "poker";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "poker";
+              version = "0.0.2";
+              sha256 =
+                "9599ef62b0a2e1b15ff2697cb1603dd7be00911d8a613e1d01cfdf8c8b5d63b3";
+            };
+
+            meta = {
+              description = ''An Elixir library to work with Poker hands.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/wojtekmach/poker_elixir";
+            };
+          }
+      ) {};
+
+    poker = poker_0_0_2;
+
+    polyglot_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "polyglot";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "polyglot";
+              version = "0.0.1";
+              sha256 =
+                "83aaf990f322ea5c314b469932e87db7175374b0e0b28d078defba60dca0fb78";
+            };
+
+            meta = {
+              longDescription = ''Polyglot is a localization library for Elixir
+                                that provides reusable formatting rules and
+                                translations for a large number of languages.'';
+              license = with stdenv.lib.licenses; [ mit free ];
+              homepage = "https://github.com/padde/polyglot";
+            };
+          }
+      ) {};
+
+    polyglot = polyglot_0_0_1;
+
+    polyvox_id3_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "polyvox_id3";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "polyvox_id3";
+              version = "0.2.1";
+              sha256 =
+                "2bb3e3b9edde6630160857563c992f7e9ea56d11d263172c95161b4275f6b48c";
+            };
+
+            meta = {
+              description = ''A podcast-centric ID3 library for parsing and
+                            writing ID3 tags.'';
+              license = stdenv.lib.licenses.gpl3;
+              homepage = "https://github.com/polyvox/polyvox_id3";
+            };
+          }
+      ) {};
+
+    polyvox_id3 = polyvox_id3_0_2_1;
+
+    pool_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "pool";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "pool";
+              version = "0.0.2";
+              sha256 =
+                "7be2ade7f9c000393d474dd96751680d5cb567cd68d3ee02c4c8e465d3a4395a";
+            };
+
+            meta = {
+              description = ''Socket acceptor pool Not ready for use at this
+                            time. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/slogsdon/pool";
+            };
+          }
+      ) {};
+
+    pool = pool_0_0_2;
+
+    pool_ring_0_1_5 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "pool_ring";
+            version = "0.1.5";
+            src = fetchHex {
+              pkg = "pool_ring";
+              version = "0.1.5";
+              sha256 =
+                "a5d965379d8cb05e772e606951ba1b33c45b58a0809ba9f44eff453ea43068ce";
+            };
+
+            meta = {
+              description = ''create a pool based on a hash ring'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/camshaft/pool_ring";
+            };
+          }
+      ) {};
+
+    pool_ring = pool_ring_0_1_5;
+
+    poolboy_1_2_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "poolboy";
+            version = "1.2.1";
+            src = fetchHex {
+              pkg = "poolboy";
+              version = "1.2.1";
+              sha256 =
+                "5e134d817f04e00b17187c50e7a38362812b7053591479a62f0025c45d622369";
+            };
+
+            meta = {
+              description = ''A hunky Erlang worker pool factory'';
+              license = with stdenv.lib.licenses; [ unlicense asl20 ];
+              homepage = "https://github.com/devinus/poolboy";
+            };
+          }
+      ) {};
+
+    poolboy_1_4_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "poolboy";
+            version = "1.4.2";
+            src = fetchHex {
+              pkg = "poolboy";
+              version = "1.4.2";
+              sha256 =
+                "6133b67251080f32ffed4f71913cd2998fd6f02fa076677aadf7278b62853938";
+            };
+
+            meta = {
+              description = ''A hunky Erlang worker pool factory'';
+              license = with stdenv.lib.licenses; [ unlicense asl20 ];
+              homepage = "https://github.com/devinus/poolboy";
+            };
+          }
+      ) {};
+
+    poolboy_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "poolboy";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "poolboy";
+              version = "1.5.1";
+              sha256 =
+                "8f7168911120e13419e086e78d20e4d1a6776f1eee2411ac9f790af10813389f";
+            };
+
+            meta = {
+              description = ''A hunky Erlang worker pool factory'';
+              license = with stdenv.lib.licenses; [ unlicense asl20 ];
+              homepage = "https://github.com/devinus/poolboy";
+            };
+          }
+      ) {};
+
+    poolboy = poolboy_1_5_1;
+
+    pooler_1_4_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "pooler";
+            version = "1.4.0";
+            src = fetchHex {
+              pkg = "pooler";
+              version = "1.4.0";
+              sha256 =
+                "08ca384be64045b257a22a3569571c9ef33dafdac44212c7f0596f255e5a0d5c";
+            };
+
+            meta = {
+              description = ''An OTP Process Pool Application'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/seth/pooler";
+            };
+          }
+      ) {};
+
+    pooler_1_5_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "pooler";
+            version = "1.5.0";
+            src = fetchHex {
+              pkg = "pooler";
+              version = "1.5.0";
+              sha256 =
+                "f493b4b947967fa4250dd1f96e86a5440ecab51da114d2c256cced58ad991908";
+            };
+
+            meta = {
+              description = ''An OTP Process Pool Application'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/seth/pooler";
+            };
+          }
+      ) {};
+
+    pooler = pooler_1_5_0;
+
+    populator_0_4_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "populator";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "populator";
+              version = "0.4.0";
+              sha256 =
+                "4f2b2720676db740139ebd69ca0c26b111721d7d049f185f0e5a50cfca18085d";
+            };
+
+            meta = {
+              description = ''Supervisor population control library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rubencaro/populator";
+            };
+          }
+      ) {};
+
+    populator = populator_0_4_0;
+
+    porcelain_2_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "porcelain";
+            version = "2.0.1";
+            src = fetchHex {
+              pkg = "porcelain";
+              version = "2.0.1";
+              sha256 =
+                "dbe57a57c3917654694ea6be7e756e26345a59d2974fe6ec861a71f469767ad9";
+            };
+
+            meta = {
+              longDescription = ''Porcelain implements a saner approach to
+                                launching and communicating with external OS
+                                processes from Elixir. Built on top of Erlang`s
+                                ports, it provides richer functionality and
+                                simpler API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/alco/porcelain";
+            };
+          }
+      ) {};
+
+    porcelain = porcelain_2_0_1;
+
+    portal_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "portal";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "portal";
+              version = "0.0.1";
+              sha256 =
+                "975d2aa4b4e155092214bee9ecc547d4c6603001c78eb824669823e1e116c84c";
+            };
+
+            meta = {
+              longDescription = ''A shooting fault-tolerant doors for
+                                distributed portal data-transfer application in
+                                Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/josevalim/portal";
+            };
+          }
+      ) {};
+
+    portal = portal_0_0_1;
+
+    porterstemmer_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "porterstemmer";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "porterstemmer";
+              version = "0.0.1";
+              sha256 =
+                "8b3987cce8602d6ad16829fd4fefc848f01efcdc46d9e806059eec6a1b9d7cc8";
+            };
+
+            meta = {
+              longDescription = '' Porter stemmer in Elixir. It does not stem
+                                words beginning with an uppercase letter. This
+                                is to prevent stemming of acronyms or names. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/frpaulas/porterstemmer.git";
+            };
+          }
+      ) {};
+
+    porterstemmer = porterstemmer_0_0_1;
+
+    posterize_0_9_2 = callPackage
+      (
+        {  buildMix, fetchHex, postgrex_0_11_1 }:
+          buildMix {
+            name = "posterize";
+            version = "0.9.2";
+            src = fetchHex {
+              pkg = "posterize";
+              version = "0.9.2";
+              sha256 =
+                "c88f4fdefb2bc0cad5a7b19eca21fe9954f0a6b88a3af7eb685ee5df324b0ce2";
+            };
+            beamDeps  = [ postgrex_0_11_1 ];
+
+            meta = {
+              description = ''erlang wrapper for postgrex'';
+              license = with stdenv.lib.licenses; [ asl20 mit ];
+              homepage = "https://github.com/talentdeficit/posterize";
+            };
+          }
+      ) {};
+
+    posterize = posterize_0_9_2;
+
+    postgrex_0_11_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          decimal_1_1_1,
+          db_connection_0_2_3,
+          connection_1_0_2
+        }:
+          buildMix {
+            name = "postgrex";
+            version = "0.11.1";
+            src = fetchHex {
+              pkg = "postgrex";
+              version = "0.11.1";
+              sha256 =
+                "f56d47038f4f642cee0f9c40eeea0ef9ba645b7fc77723b4764f282df95baeb8";
+            };
+            beamDeps  = [ decimal_1_1_1 db_connection_0_2_3 connection_1_0_2
+                      ];
+
+            meta = {
+              description = ''PostgreSQL driver for Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/ericmj/postgrex";
+            };
+          }
+      ) {};
+
+    postgrex = postgrex_0_11_1;
+
+    postgrex_0_6_0 = callPackage
+      (
+        {  buildMix, fetchHex, decimal_0_2_5 }:
+          buildMix {
+            name = "postgrex";
+            version = "0.6.0";
+            src = fetchHex {
+              pkg = "postgrex";
+              version = "0.6.0";
+              sha256 =
+                "aa2aede73938a952ffbbe2b1173ac52c377a2055fd3e44ac1843bef782f5f8d4";
+            };
+            beamDeps  = [ decimal_0_2_5 ];
+
+            meta = {
+              description = ''PostgreSQL driver for Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/ericmj/postgrex";
+            };
+          }
+      ) {};
+
+    postgrex_0_9_1 = callPackage
+      (
+        {  buildMix, fetchHex, decimal_1_1_1 }:
+          buildMix {
+            name = "postgrex";
+            version = "0.9.1";
+            src = fetchHex {
+              pkg = "postgrex";
+              version = "0.9.1";
+              sha256 =
+                "9c9a4ffca145479b343d7a51730557305425aab69e8d31cc32f348f85996fb5a";
+            };
+            beamDeps  = [ decimal_1_1_1 ];
+
+            meta = {
+              description = ''PostgreSQL driver for Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/ericmj/postgrex";
+            };
+          }
+      ) {};
+
+    pot_0_9_4 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "pot";
+            version = "0.9.4";
+            src = fetchHex {
+              pkg = "pot";
+              version = "0.9.4";
+              sha256 =
+                "ba6814a8e2be50d64ee65612cf627aba4784555054c22ac5066e6543f349887c";
+            };
+
+            meta = {
+              longDescription = ''POT is an Erlang library for generating
+                                Google Authenticator compatible one time
+                                passwords.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/yuce/pot";
+            };
+          }
+      ) {};
+
+    pot = pot_0_9_4;
+
+    power_assert_0_0_8 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "power_assert";
+            version = "0.0.8";
+            src = fetchHex {
+              pkg = "power_assert";
+              version = "0.0.8";
+              sha256 =
+                "b4e1d27ab8e05f01d458ba84c4caced1f9b0209b3178dfcf4334e857a8aa6cd0";
+            };
+
+            meta = {
+              description = ''Power Assert in Elixir. Shows evaluation results
+                            each expression.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/ma2gedev/power_assert_ex";
+            };
+          }
+      ) {};
+
+    power_assert = power_assert_0_0_8;
+
+    pqueue_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "pqueue";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "pqueue";
+              version = "1.5.1";
+              sha256 =
+                "7ba01afe6b50ea4b239fa770f9e2c2db4871b3927ac44aea180d1fd52601b317";
+            };
+
+            meta = {
+              description = ''Erlang Priority Queue Implementation'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/pqueue";
+            };
+          }
+      ) {};
+
+    pqueue = pqueue_1_5_1;
+
+    prefecture_jp_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "prefecture_jp";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "prefecture_jp";
+              version = "0.0.2";
+              sha256 =
+                "ffc29fc76ee098b5f6c7c93db3736916cc23b0ace424dd8c0f946570aeb75c22";
+            };
+
+            meta = {
+              description = ''PrefectureJp is a library for Japanese
+                            prefecture.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ymmtmsys/prefecture_jp";
+            };
+          }
+      ) {};
+
+    prefecture_jp = prefecture_jp_0_0_2;
+
+    presentex_0_0_10 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "presentex";
+            version = "0.0.10";
+            src = fetchHex {
+              pkg = "presentex";
+              version = "0.0.10";
+              sha256 =
+                "86479a0b79146dadc3f224d2023d06d7f4f87fd455a3267bbd11759ebde1404c";
+            };
+
+            meta = {
+              description = ''An Elixir -> HTML/JavaScript presentation
+                            generation tool. '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/Cobenian/Presentex";
+            };
+          }
+      ) {};
+
+    presentex = presentex_0_0_10;
+
+    pretty_hex_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "pretty_hex";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "pretty_hex";
+              version = "0.0.1";
+              sha256 =
+                "ab91a38480049af4811ffdaf15dbee9370acb9b20cdc870281d2006a8fe928b4";
+            };
+
+            meta = {
+              description = ''A binary hex dumping library in Elixir. '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/polsab/pretty_hex";
+            };
+          }
+      ) {};
+
+    pretty_hex = pretty_hex_0_0_1;
+
+    pricing_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, timex_1_0_1, porcelain_2_0_1 }:
+          buildMix {
+            name = "pricing";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "pricing";
+              version = "0.0.1";
+              sha256 =
+                "82e0438611507f600bd799c986872588f88627fdcf7a15d4031d779c9d1cd4d7";
+            };
+            beamDeps  = [ timex_1_0_1 porcelain_2_0_1 ];
+
+            meta = {
+              description = ''Pricing financial instruments in Elixir'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/arthurcolle/pricing";
+            };
+          }
+      ) {};
+
+    pricing = pricing_0_0_1;
+
+    progress_bar_1_4_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "progress_bar";
+            version = "1.4.0";
+            src = fetchHex {
+              pkg = "progress_bar";
+              version = "1.4.0";
+              sha256 =
+                "c184bba509ec32f81ee03a596972b84e7e9d04de2ae076a408bd08a7a80e98fa";
+            };
+
+            meta = {
+              description = ''Command-line progress bars and spinners.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/henrik/progress_bar";
+            };
+          }
+      ) {};
+
+    progress_bar = progress_bar_1_4_0;
+
+    proper_1_1_1_beta = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "proper";
+            version = "1.1.1-beta";
+            src = fetchHex {
+              pkg = "proper";
+              version = "1.1.1-beta";
+              sha256 =
+                "bde5c0fef0f8d804a7c06aab4f293d19f42149e5880b3412b75efa608e86d342";
+            };
+
+            meta = {
+              description = ''QuickCheck-inspired property-based testing tool
+                            for Erlang.'';
+              license = stdenv.lib.licenses.gpl3;
+              homepage = "https://github.com/manopapad/proper";
+            };
+          }
+      ) {};
+
+    proper = proper_1_1_1_beta;
+
+    proplist_1_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "proplist";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "proplist";
+              version = "1.1.0";
+              sha256 =
+                "6fc73362d15b4810f4979ddf72ec53c1efc020657a57b7cdd1f682bd38c08298";
+            };
+
+            meta = {
+              description = ''Proplist provides the complete Keyword API, but
+                            for Proplists.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/knrz/proplist";
+            };
+          }
+      ) {};
+
+    proplist = proplist_1_1_0;
+
+    protobuffs_0_8_2 = callPackage
+      (
+        {  buildRebar3, fetchHex, meck_0_8_4 }:
+          buildRebar3 {
+            name = "protobuffs";
+            version = "0.8.2";
+            src = fetchHex {
+              pkg = "protobuffs";
+              version = "0.8.2";
+              sha256 =
+                "b77e9d03518927b290cc5bb5cc9622a177e70289100fea9ccb57873573e54553";
+            };
+
+            beamDeps  = [ meck_0_8_4 ];
+
+            meta = {
+              longDescription = ''An implementation of Google`s Protocol
+                                Buffers for Erlang, based on
+                                ngerakines/erlang_protobuffs.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/basho/erlang_protobuffs";
+            };
+          }
+      ) {};
+
+    protobuffs = protobuffs_0_8_2;
+
+    provider_asn1_0_1_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "provider_asn1";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "provider_asn1";
+              version = "0.1.2";
+              sha256 =
+                "b310c46a2d5675431737f10a55d6b37347c11bf3efc4c1d7b63e710e3842c1bb";
+            };
+
+            meta = {
+              description = ''Compile ASN.1 with Rebar3'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/knusbaum/provider_asn1";
+            };
+          }
+      ) {};
+
+    provider_asn1 = provider_asn1_0_1_2;
+
+    providers_1_4_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, getopt_0_8_2 }:
+          buildRebar3 {
+            name = "providers";
+            version = "1.4.1";
+            src = fetchHex {
+              pkg = "providers";
+              version = "1.4.1";
+              sha256 =
+                "dfd88305670a3d942c08a2d852eeb4c20ec40ee2ba589339a48083ac74f14e36";
+            };
+
+            beamDeps  = [ getopt_0_8_2 ];
+
+            meta = {
+              description = ''Providers provider.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tsloughter/providers";
+            };
+          }
+      ) {};
+
+    providers_1_6_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, getopt_0_8_2 }:
+          buildRebar3 {
+            name = "providers";
+            version = "1.6.0";
+            src = fetchHex {
+              pkg = "providers";
+              version = "1.6.0";
+              sha256 =
+                "0f6876529a613d34224de8c61d3660388eb981142360f2699486d8536050ce2f";
+            };
+
+            beamDeps  = [ getopt_0_8_2 ];
+
+            meta = {
+              description = ''Providers provider.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tsloughter/providers";
+            };
+          }
+      ) {};
+
+    providers = providers_1_6_0;
+
+    proxy_0_0_1 = callPackage
+      (
+        {
+          buildMix, fetchHex, plug_1_1_1, httpoison_0_8_1, cowboy_1_0_4
+        }:
+          buildMix {
+            name = "proxy";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "proxy";
+              version = "0.0.1";
+              sha256 =
+                "74691b18a0918d6e14df1f254ee9f342a547bc280151a4d88a540839ae75bbae";
+            };
+            beamDeps  = [ plug_1_1_1 httpoison_0_8_1 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Proxy plug for upstream servers'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/chadwpry/elixir-proxy";
+            };
+          }
+      ) {};
+
+    proxy = proxy_0_0_1;
+
+    pubnub_ex_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_2_0 }:
+          buildMix {
+            name = "pubnub_ex";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "pubnub_ex";
+              version = "0.0.2";
+              sha256 =
+                "83d270cfe2be6728fb96d9145371a87ddc876a97f91cdca2584cc82c2a0b91cb";
+            };
+            beamDeps  = [ httpoison_0_8_1 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''A pubsub tool for pubnub.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ryuone/pubnub_ex";
+            };
+          }
+      ) {};
+
+    pubnub_ex = pubnub_ex_0_0_2;
+
+    pubsub_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "pubsub";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "pubsub";
+              version = "0.0.2";
+              sha256 =
+                "2072bf67d5d4b6d41c81f0e89697d72ca323c5640e883b0d0cec7d43cf6c8ae8";
+            };
+
+            meta = {
+              description = ''Publish-Subscribe utility'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/simonewebdesign/elixir_pubsub";
+            };
+          }
+      ) {};
+
+    pubsub = pubsub_0_0_2;
+
+    pulse_libs_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "pulse_libs";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "pulse_libs";
+              version = "1.0.0";
+              sha256 =
+                "fda2aee58af502bb58752f6a6fcc3f97b2d6eed1a63d39ab91937e5811dbb2fc";
+            };
+
+            meta = {
+              description = ''Elixir standard libraries instrumented with
+                            PULSE.'';
+              license = stdenv.lib.licenses.asl20;
+            };
+          }
+      ) {};
+
+    pulse_libs = pulse_libs_1_0_0;
+
+    pusher_0_1_2 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          signaturex_0_0_8,
+          httpoison_0_8_1,
+          exjsx_3_2_0
+        }:
+          buildMix {
+            name = "pusher";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "pusher";
+              version = "0.1.2";
+              sha256 =
+                "6a21b65a7a1e6a4fe7b1cd0d555ca25c871e68441cef3373dc5771ab0c2a47c2";
+            };
+            beamDeps  = [ signaturex_0_0_8 httpoison_0_8_1 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''Pusher HTTP client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edgurgel/pusher";
+            };
+          }
+      ) {};
+
+    pusher = pusher_0_1_2;
+
+    qdate_0_4_2 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          erlware_commons_0_18_0,
+          erlang_localtime_1_0_0
+        }:
+          buildRebar3 {
+            name = "qdate";
+            version = "0.4.2";
+            src = fetchHex {
+              pkg = "qdate";
+              version = "0.4.2";
+              sha256 =
+                "4cb9dcc4418e57e27aff12d0e7d6c6e373a18e130ad66155a3dfdccde848c052";
+            };
+
+            beamDeps  = [ erlware_commons_0_18_0 erlang_localtime_1_0_0 ];
+
+            meta = {
+              description = ''Simple Date and Timezone handling for Erlang'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/choptastic/qdate";
+            };
+          }
+      ) {};
+
+    qdate = qdate_0_4_2;
+
+    qiita_ex_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_2_0 }:
+          buildMix {
+            name = "qiita_ex";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "qiita_ex";
+              version = "0.0.2";
+              sha256 =
+                "0bb9a5535c0915c426ff13350b907cbd2b455bb99d8bcb8324ffadb6c9bcf1eb";
+            };
+            beamDeps  = [ httpoison_0_8_1 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''Qiita API v2 Interface for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ma2gedev/qiita_ex";
+            };
+          }
+      ) {};
+
+    qiita_ex = qiita_ex_0_0_2;
+
+    qiniu_0_2_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_3_1, httpoison_0_7_5 }:
+          buildMix {
+            name = "qiniu";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "qiniu";
+              version = "0.2.2";
+              sha256 =
+                "6c03aeb2d58a1d44f2476eba83640978f166267b07a4e7ce6cb4b498be5cb1c5";
+            };
+            beamDeps  = [ poison_1_3_1 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''Qiniu Resource (Cloud) Storage SDK for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tony612/qiniu";
+            };
+          }
+      ) {};
+
+    qiniu = qiniu_0_2_2;
+
+    qlc_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "qlc";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "qlc";
+              version = "1.0.0";
+              sha256 =
+                "80df25fc032ced6f8c0c21df4099434db09d6de87ee32237719c776974ad15cc";
+            };
+
+            meta = {
+              description = ''QLC interface for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/k1complete/qlc";
+            };
+          }
+      ) {};
+
+    qlc = qlc_1_0_0;
+
+    quantum_1_6_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "quantum";
+            version = "1.6.1";
+            src = fetchHex {
+              pkg = "quantum";
+              version = "1.6.1";
+              sha256 =
+                "877ef048391ff0c0268cc17078dd707351241af0c04041bc432398017b998bbf";
+            };
+
+            meta = {
+              description = ''Cron-like job scheduler for Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/c-rack/quantum-elixir";
+            };
+          }
+      ) {};
+
+    quantum = quantum_1_6_1;
+
+    quark_1_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "quark";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "quark";
+              version = "1.0.2";
+              sha256 =
+                "c24950acc4d6f44aff612302871b2cff5f56d6b702285bc04e7b71179e5b13c7";
+            };
+
+            meta = {
+              description = ''Common combinators for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/robot-overlord/quark";
+            };
+          }
+      ) {};
+
+    quark = quark_1_0_2;
+
+    queuex_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "queuex";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "queuex";
+              version = "0.2.0";
+              sha256 =
+                "e40b25befc34ecff962c92536e6a520967dd2d6031cb70a58be62269a6aec623";
+            };
+
+            meta = {
+              description = ''Priority Queue'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/falood/queuex";
+            };
+          }
+      ) {};
+
+    queuex = queuex_0_2_0;
+
+    quickrand_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "quickrand";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "quickrand";
+              version = "1.5.1";
+              sha256 =
+                "0b3dcc6ddb23319c1f6a5ed143778864b8ad2f0ebd693a2d121cf5ae0c4db507";
+            };
+
+            meta = {
+              longDescription = ''Quick Random Number Generation: Provides a
+                                simple interface to call efficient random number
+                                generation functions based on the context.
+                                Proper random number seeding is enforced.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/quickrand";
+            };
+          }
+      ) {};
+
+    quickrand = quickrand_1_5_1;
+
+    quinn_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "quinn";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "quinn";
+              version = "0.0.4";
+              sha256 =
+                "6cafeb8e6d9635b3a26caf1768c70751f0bbdc6afb9acd7067a52316b22c8de2";
+            };
+
+            meta = {
+              description = ''Quinn is Elixir xml parser. '';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/nhu313/Quinn";
+            };
+          }
+      ) {};
+
+    quinn = quinn_0_0_4;
+
+    quintana_0_2_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, folsom_0_8_3 }:
+          buildRebar3 {
+            name = "quintana";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "quintana";
+              version = "0.2.0";
+              sha256 =
+                "0646fe332ca3415ca6b0b273b4a5689ec902b9f9004ca62229ded00bd5f64cda";
+            };
+
+            beamDeps  = [ folsom_0_8_3 ];
+
+            meta = {
+              description = ''Wrapper around some Folsom functions'';
+
+            };
+          }
+      ) {};
+
+    quintana_0_2_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, folsom_0_8_3 }:
+          buildRebar3 {
+            name = "quintana";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "quintana";
+              version = "0.2.1";
+              sha256 =
+                "d4683eb33c71f6cab3b17b896b4fa9180f17a0a8b086440bfe0c5675182f0194";
+            };
+
+            beamDeps  = [ folsom_0_8_3 ];
+
+            meta = {
+              description = ''Wrapper around some Folsom functions'';
+
+            };
+          }
+      ) {};
+
+    quintana = quintana_0_2_1;
+
+    rabbitElixir_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, exjsx_3_1_0 }:
+          buildMix {
+            name = "rabbitElixir";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "rabbitElixir";
+              version = "1.0.1";
+              sha256 =
+                "bc0ddae7fa0b869a6688db2e5d909d375ff0692a959aa768eed586bcfd2d0a2f";
+            };
+            beamDeps  = [ exjsx_3_1_0 ];
+
+            meta = {
+              description = ''Another Zawgyi <=> Unicode Converter '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Rabbit-Converter/Rabbit-Elixir";
+            };
+          }
+      ) {};
+
+    rabbitElixir = rabbitElixir_1_0_1;
+
+    rabbit_common_3_5_6 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "rabbit_common";
+            version = "3.5.6";
+            src = fetchHex {
+              pkg = "rabbit_common";
+              version = "3.5.6";
+              sha256 =
+                "9335ab3ebc4e8e140d7bc9b1b0e7ee99c0aa87d0a746b704184121ba35c04f1c";
+            };
+
+            meta = {
+              longDescription = ''Includes modules which are a runtime
+                                dependency of the RabbitMQ/AMQP Erlang client
+                                and are common to the RabbitMQ server.'';
+              license = stdenv.lib.licenses.mpl11;
+              homepage = "https://github.com/jbrisbin/rabbit_common";
+            };
+          }
+      ) {};
+
+    rabbit_common = rabbit_common_3_5_6;
+
+    rackla_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poison_1_5_2,
+          plug_0_14_0,
+          hackney_1_4_8,
+          cowboy_1_0_4
+        }:
+          buildMix {
+            name = "rackla";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "rackla";
+              version = "0.1.0";
+              sha256 =
+                "640b77e8a78e66085a49fc4af6fc3b028b2db8af39ee4c950e4a812c15c8657f";
+            };
+            beamDeps  = [ poison_1_5_2 plug_0_14_0 hackney_1_4_8 cowboy_1_0_4
+                      ];
+
+            meta = {
+              description = ''Rackla is library for building API-gateways.'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/AntonFagerberg/rackla";
+            };
+          }
+      ) {};
+
+    rackla = rackla_0_1_0;
+
+    radpath_0_0_5 = callPackage
+      (
+        {  buildMix, fetchHex, excoveralls_0_5_1 }:
+          buildMix {
+            name = "radpath";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "radpath";
+              version = "0.0.5";
+              sha256 =
+                "0da59ca494b833988c9e2b64e075a63949adf8716bf4470d738754723de9bdca";
+            };
+            beamDeps  = [ excoveralls_0_5_1 ];
+
+            meta = {
+              description = ''A path library for Elixir inspired by Python path
+                            libraries '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lowks/Radpath";
+            };
+          }
+      ) {};
+
+    radpath = radpath_0_0_5;
+
+    rails_4_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1 }:
+          buildMix {
+            name = "rails";
+            version = "4.2.0";
+            src = fetchHex {
+              pkg = "rails";
+              version = "4.2.0";
+              sha256 =
+                "731692769aa106a20c87b12dca15336fd1d16a7f02e2615ad76f6ce83a2b0b46";
+            };
+            beamDeps  = [ plug_1_1_1 ];
+
+            meta = {
+              longDescription = ''A plug to get your plug/phoenix applications
+                                performance more in line with Rails.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/BlakeWilliams/rails";
+            };
+          }
+      ) {};
+
+    rails = rails_4_2_0;
+
+    ranch_1_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "ranch";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "ranch";
+              version = "1.1.0";
+              sha256 =
+                "98ade939e63e6567da5dec5bc5bd93cbdc53d53f8b1aa998adec60dc4057f048";
+            };
+
+            meta = {
+              description = ''Socket acceptor pool for TCP protocols.'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/ninenines/ranch";
+            };
+          }
+      ) {};
+
+    ranch_1_2_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "ranch";
+            version = "1.2.1";
+            src = fetchHex {
+              pkg = "ranch";
+              version = "1.2.1";
+              sha256 =
+                "f602d057615ce737945c239e9c8155d3f5300fc5b1255abf81f2a9d0d08e5b04";
+            };
+
+            meta = {
+              description = ''Socket acceptor pool for TCP protocols.'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/ninenines/ranch";
+            };
+          }
+      ) {};
+
+    ranch = ranch_1_2_1;
+
+    random_0_2_2 = callPackage
+      (
+        {  buildMix, fetchHex, tinymt_0_3_1 }:
+          buildMix {
+            name = "random";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "random";
+              version = "0.2.2";
+              sha256 =
+                "504b6bd71c149a8b24c77df3b64c7261112f48811c91b5b8ab71f54d338c6b37";
+            };
+            beamDeps  = [ tinymt_0_3_1 ];
+
+            meta = {
+              longDescription = ''This module contains pseudo-random number
+                                generators for various distributions ported from
+                                Python 3 random module for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/yuce/random";
+            };
+          }
+      ) {};
+
+    random = random_0_2_2;
+
+    random_string_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "random_string";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "random_string";
+              version = "0.0.1";
+              sha256 =
+                "4a90483956764f6ad3d928e27d2e6a1e830bc53b28ded5464c715eb2ec6b8ed8";
+            };
+
+            meta = {
+              description = ''Generates random string (or a stream of
+                            characters) of desired character sets.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sylph01/random_string";
+            };
+          }
+      ) {};
+
+    random_string = random_string_0_0_1;
+
+    range_extras_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "range_extras";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "range_extras";
+              version = "0.1.0";
+              sha256 =
+                "edc50d31341e1370d009df8b51d7d0e355a966068520ff38e88b8b542953e15c";
+            };
+
+            meta = {
+              description = ''Elixir range utilities: constant-time random
+                            sampling and set operations.'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/lnikkila/elixir-range-extras";
+            };
+          }
+      ) {};
+
+    range_extras = range_extras_0_1_0;
+
+    rankmatcher_0_1_2 = callPackage
+      (
+        {  buildRebar3, fetchHex, libsnarlmatch_0_1_5 }:
+          buildRebar3 {
+            name = "rankmatcher";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "rankmatcher";
+              version = "0.1.2";
+              sha256 =
+                "8ea5974be574159e6ac188fc4309ef86889d6b227df44b1426f39b02b7d533e7";
+            };
+
+            beamDeps  = [ libsnarlmatch_0_1_5 ];
+
+            meta = {
+              description = ''Library to rank and match lists'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/dalmatinerdb/mstore";
+            };
+          }
+      ) {};
+
+    rankmatcher = rankmatcher_0_1_2;
+
+    rapidax_0_0_3 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1, cowboy_1_0_4
+        }:
+          buildMix {
+            name = "rapidax";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "rapidax";
+              version = "0.0.3";
+              sha256 =
+                "9912b79b3d2729465bf66315bd955e031aeb038f05a63faa2dc0414026edb18c";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Rapidly develop your API client - based on
+                            rapidash gem'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/victorlcampos/rapidax";
+            };
+          }
+      ) {};
+
+    rapidax = rapidax_0_0_3;
+
+    rational_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, earmark_0_2_1 }:
+          buildMix {
+            name = "rational";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "rational";
+              version = "0.2.0";
+              sha256 =
+                "640093486afd882e5283d4269d9ab624369239016fed67e3b8038845322107b7";
+            };
+            beamDeps  = [ earmark_0_2_1 ];
+
+            meta = {
+              longDescription = ''Rational is a module for exact representation
+                                and manipulation of rational fractions, that is,
+                                those fractions that can be exactly represented
+                                by a ratio of integers (e.g., 1/3 or
+                                4176/22687).'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/twist-vector/elixir-rational.git";
+            };
+          }
+      ) {};
+
+    rational = rational_0_2_0;
+
+    ratx_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "ratx";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "ratx";
+              version = "0.1.0";
+              sha256 =
+                "fbf933ff32fdc127200880f5b567820bf03504ade1bd697ffbc0535dbafc23d6";
+            };
+
+            meta = {
+              description = ''Rate limiter and overload protection for erlang
+                            and elixir applications. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/liveforeverx/ratx";
+            };
+          }
+      ) {};
+
+    ratx = ratx_0_1_0;
+
+    raven_0_0_5 = callPackage
+      (
+        {  buildMix, fetchHex, hackney_1_0_6, uuid_0_1_5, poison_1_2_1 }:
+          buildMix {
+            name = "raven";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "raven";
+              version = "0.0.5";
+              sha256 =
+                "dac032f4a14adbd174927508709585bd34f9baa2836ff3987b4d071790cb229a";
+            };
+            beamDeps  = [ hackney_1_0_6 uuid_0_1_5 poison_1_2_1 ];
+
+            meta = {
+              description = ''Raven is an Elixir client for Sentry'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/vishnevskiy/raven-elixir";
+            };
+          }
+      ) {};
+
+    raven = raven_0_0_5;
+
+    raygun_0_2_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          timex_1_0_1,
+          poison_1_5_2,
+          plug_1_1_1,
+          httpoison_0_8_1
+        }:
+          buildMix {
+            name = "raygun";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "raygun";
+              version = "0.2.0";
+              sha256 =
+                "742fe2fef4fff5933802566375ce8efe27eaa2afbb8609c1bca50ef43f30bc3f";
+            };
+            beamDeps  = [ timex_1_0_1 poison_1_5_2 plug_1_1_1 httpoison_0_8_1
+                      ];
+
+            meta = {
+              longDescription = ''Send errors in your application to Raygun.
+                                Raygun captures all your application errors in
+                                one place. It can be used as a Plug, via Logger
+                                and/or programmatically.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/cobenian/raygun";
+            };
+          }
+      ) {};
+
+    raygun = raygun_0_2_0;
+
+    reactive_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "reactive";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "reactive";
+              version = "0.0.1";
+              sha256 =
+                "af17deb3beedd24319940000e286a1f8d9f29beb498980475e16cc57857469f9";
+            };
+
+            meta = {
+              description = ''Reactive Programming for Elixir'';
+
+            };
+          }
+      ) {};
+
+    reactive = reactive_0_0_1;
+
+    readme_md_doc_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex, ex_doc_0_11_4, argument_parser_0_1_1 }:
+          buildMix {
+            name = "readme_md_doc";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "readme_md_doc";
+              version = "0.1.2";
+              sha256 =
+                "3353e8598991afbaa8d12344212fdd9c85413d1664b026a7ee1036573c6f536c";
+            };
+            beamDeps  = [ ex_doc_0_11_4 argument_parser_0_1_1 ];
+
+            meta = {
+              description = ''README.md generation tool for small Elixir
+                            project'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/jisaacstone/readme_md_docgen";
+            };
+          }
+      ) {};
+
+    readme_md_doc = readme_md_doc_0_1_2;
+
+    reagent_0_1_5 = callPackage
+      (
+        {  buildMix, fetchHex, exts_0_2_2, socket_0_2_8 }:
+          buildMix {
+            name = "reagent";
+            version = "0.1.5";
+            src = fetchHex {
+              pkg = "reagent";
+              version = "0.1.5";
+              sha256 =
+                "bc2765571d6358098c2c90f7870aa5111bf726a1abef2ad131f02b9aa55c5c9c";
+            };
+            beamDeps  = [ exts_0_2_2 socket_0_2_8 ];
+
+            meta = {
+              description = ''You need more reagents to conjure this server'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/meh/reagent";
+            };
+          }
+      ) {};
+
+    reagent = reagent_0_1_5;
+
+    reap_0_1_3 = callPackage
+      (
+        {  buildMix, fetchHex, jsex_2_0_0 }:
+          buildMix {
+            name = "reap";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "reap";
+              version = "0.1.3";
+              sha256 =
+                "e260540500a29ac9945db512a550cd9b56ba4295b4aa3c1b408ad62720e7807b";
+            };
+            beamDeps  = [ jsex_2_0_0 ];
+
+            meta = {
+              description = ''A library for working with the refheap API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Raynes/reap";
+            };
+          }
+      ) {};
+
+    reap = reap_0_1_3;
+
+    reaxive_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "reaxive";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "reaxive";
+              version = "0.1.0";
+              sha256 =
+                "d185c80da34499999000f6aaab3ab891cdff34cb3a2079835e8e6f5b4e813fa2";
+            };
+
+            meta = {
+              longDescription = ''Reaxive is a library inspired by Reactive
+                                Extensions and ELM to provide functional
+                                reactive programming to Elixir. It allows for
+                                active sequences of events and a set of
+                                stream-reducer like transformations such as map
+                                or filter. '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/alfert/reaxive";
+            };
+          }
+      ) {};
+
+    reaxive = reaxive_0_1_0;
+
+    reaxt_0_3_2 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poolboy_1_5_1,
+          poison_1_4_0,
+          plug_1_1_1,
+          exos_1_0_0,
+          cowboy_1_0_4
+        }:
+          buildMix {
+            name = "reaxt";
+            version = "0.3.2";
+            src = fetchHex {
+              pkg = "reaxt";
+              version = "0.3.2";
+              sha256 =
+                "48413f06e14e26b10ea513f7006625684c8db23ea18bfd61eaa5732c588f769c";
+            };
+            beamDeps  = [
+                          poolboy_1_5_1
+                          poison_1_4_0
+                          plug_1_1_1
+                          exos_1_0_0
+                          cowboy_1_0_4
+                        ];
+
+            meta = {
+              longDescription = ''Use your react components into your elixir
+                                application, using webpack compilation.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/awetzel/reaxt";
+            };
+          }
+      ) {};
+
+    reaxt = reaxt_0_3_2;
+
+    rebar3_abnfc_plugin_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "rebar3_abnfc_plugin";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "rebar3_abnfc_plugin";
+              version = "0.1.0";
+              sha256 =
+                "7c9cf5608888c0fe149cfc4d25a5911e604a1e63f7c0c73c3cf8792a33be9a7b";
+            };
+
+            meta = {
+              description = ''A rebar plugin for abnfc'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/surik/rebar3_abnfc_plugin";
+            };
+          }
+      ) {};
+
+    rebar3_abnfc_plugin = rebar3_abnfc_plugin_0_1_0;
+
+    rebar3_appup_plugin_1_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "rebar3_appup_plugin";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "rebar3_appup_plugin";
+              version = "1.0.0";
+              sha256 =
+                "8211e7cf4f251cdd3c324864e6e090d89a9edb58d019f4cdb7e1084cc6a4b9d7";
+            };
+
+            meta = {
+              description = ''A rebar3 plugin for handling .appup files'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lrascao/rebar3_appup_plugin";
+            };
+          }
+      ) {};
+
+    rebar3_appup_plugin = rebar3_appup_plugin_1_0_0;
+
+    rebar3_asn1_compiler_1_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "rebar3_asn1_compiler";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "rebar3_asn1_compiler";
+              version = "1.0.0";
+              sha256 =
+                "25ec1d5c97393195650ac8c7a06a267a886a1479950ee047c43b5228c07b30b9";
+            };
+
+            meta = {
+              description = ''Compile ASN.1 modules with Rebar3'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pyykkis/rebar3_asn1_compiler";
+            };
+          }
+      ) {};
+
+    rebar3_asn1_compiler = rebar3_asn1_compiler_1_0_0;
+
+    rebar3_auto_0_3_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, enotify_0_1_0 }:
+          buildRebar3 {
+            name = "rebar3_auto";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "rebar3_auto";
+              version = "0.3.0";
+              sha256 =
+                "9fcca62411b0b7680426bd911002c0769690aef3838829583ffa4547fd5038b5";
+            };
+
+            beamDeps  = [ enotify_0_1_0 ];
+
+            meta = {
+              description = ''Rebar3 plugin for auto compiling on changes'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tsloughter/rebar3_auto";
+            };
+          }
+      ) {};
+
+    rebar3_auto = rebar3_auto_0_3_0;
+
+    rebar3_autotest_0_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, enotify_0_1_0 }:
+          buildRebar3 {
+            name = "rebar3_autotest";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "rebar3_autotest";
+              version = "0.1.1";
+              sha256 =
+                "7f5856336e772b14a578f0c01ce14b2a195c41d5b595c83662ffd130f7874eac";
+            };
+
+            beamDeps  = [ enotify_0_1_0 ];
+
+            meta = {
+              description = ''A rebar3 plugin to run tests automatically when
+                            there are changes.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/NobbZ/rebar3_autotest";
+            };
+          }
+      ) {};
+
+    rebar3_autotest = rebar3_autotest_0_1_1;
+
+    rebar3_cuttlefish_0_5_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, cuttlefish_2_0_7 }:
+          buildRebar3 {
+            name = "rebar3_cuttlefish";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "rebar3_cuttlefish";
+              version = "0.5.0";
+              sha256 =
+                "dd2cdb1e6cbcf5cdb92adec0e359a3ec5f407c49a6182e7fdfcde1b45e790348";
+            };
+
+            beamDeps  = [ cuttlefish_2_0_7 ];
+
+            meta = {
+              description = ''A rebar plugin'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/tsloughter/rebar3_cuttlefish";
+            };
+          }
+      ) {};
+
+    rebar3_cuttlefish = rebar3_cuttlefish_0_5_0;
+
+    rebar3_diameter_compiler_0_3_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "rebar3_diameter_compiler";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "rebar3_diameter_compiler";
+              version = "0.3.1";
+              sha256 =
+                "c5965e3810ccf9ef9ba9185a81fe569ef6e9f3a9e546e99c5e900736b0c39274";
+            };
+
+            meta = {
+              description = ''Compile diameter .dia files'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/carlosedp/rebar3_diameter_compiler";
+            };
+          }
+      ) {};
+
+    rebar3_diameter_compiler = rebar3_diameter_compiler_0_3_1;
+
+    rebar3_elixirc_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "rebar3_elixirc";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "rebar3_elixirc";
+              version = "0.1.0";
+              sha256 =
+                "1c6ae367737306beefa0891d60cabf0357b85fcf472a2808c3e2295882f6ead8";
+            };
+
+            meta = {
+              description = ''A rebar plugin'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/tsloughter/rebar3_elixirc";
+            };
+          }
+      ) {};
+
+    rebar3_elixirc = rebar3_elixirc_0_1_0;
+
+    rebar3_eqc_0_0_8 = callPackage
+      (
+        {  buildRebar3, fetchHex, cf_0_1_2 }:
+          buildRebar3 {
+            name = "rebar3_eqc";
+            version = "0.0.8";
+            src = fetchHex {
+              pkg = "rebar3_eqc";
+              version = "0.0.8";
+              sha256 =
+                "0a5cd09106a23ccad2b528e5c2f68f7884cba367b03e81c055f1f3fc742d1526";
+            };
+
+            beamDeps  = [ cf_0_1_2 ];
+
+            meta = {
+              description = ''Plugin to run EQC properties'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage =
+                "https://github.com/kellymclaughlin/rebar3-eqc-plugin";
+            };
+          }
+      ) {};
+
+    rebar3_eqc = rebar3_eqc_0_0_8;
+
+    rebar3_exunit_0_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "rebar3_exunit";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "rebar3_exunit";
+              version = "0.1.1";
+              sha256 =
+                "910d2f2038dcf2b32deb40a36082ad5435389106b2dbd6266e0ee3a20a688650";
+            };
+
+            meta = {
+              description = ''Plugin to run exUnit tests'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/processone/rebar3_exunit_plugin";
+            };
+          }
+      ) {};
+
+    rebar3_exunit = rebar3_exunit_0_1_1;
+
+    rebar3_gpb_plugin_1_2_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, gpb_3_18_8 }:
+          buildRebar3 {
+            name = "rebar3_gpb_plugin";
+            version = "1.2.0";
+            src = fetchHex {
+              pkg = "rebar3_gpb_plugin";
+              version = "1.2.0";
+              sha256 =
+                "a5b305359d17399a2f4bfc26c6f4fd12ad846966642241ff85eb6e04bd1e97b6";
+            };
+
+            beamDeps  = [ gpb_3_18_8 ];
+
+            meta = {
+              description = ''A rebar3 gpb plugin for compiling .proto files'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lrascao/rebar3_gpb_plugin";
+            };
+          }
+      ) {};
+
+    rebar3_gpb_plugin = rebar3_gpb_plugin_1_2_0;
+
+    rebar3_hex_1_19_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "rebar3_hex";
+            version = "1.19.0";
+            src = fetchHex {
+              pkg = "rebar3_hex";
+              version = "1.19.0";
+              sha256 =
+                "b7c291d742e25eeae5dc5bd97e5b0a8987dab17da65054f757311ad90b16b73e";
+            };
+
+            meta = {
+              description = ''Hex.pm plugin for rebar3'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tsloughter/rebar3_hex";
+            };
+          }
+      ) {};
+
+    rebar3_hex = rebar3_hex_1_19_0;
+
+    rebar3_idl_compiler_0_3_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "rebar3_idl_compiler";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "rebar3_idl_compiler";
+              version = "0.3.0";
+              sha256 =
+                "31ba95205c40b990cb3c49abb397abc47b4d5f9c402db83f9daebbc44e69789d";
+            };
+
+            meta = {
+              description = ''Rebar3 IDL Compiler'';
+
+              homepage = "https://github.com/sebastiw/rebar3_idl_compiler";
+            };
+          }
+      ) {};
+
+    rebar3_idl_compiler = rebar3_idl_compiler_0_3_0;
+
+    rebar3_live_0_1_3 = callPackage
+      (
+        {  buildRebar3, fetchHex, enotify_0_1_0 }:
+          buildRebar3 {
+            name = "rebar3_live";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "rebar3_live";
+              version = "0.1.3";
+              sha256 =
+                "d9ee2ff022fc73ac94f206c13ff8aa7591a536704f49c4cbacabf37d181a4391";
+            };
+
+            beamDeps  = [ enotify_0_1_0 ];
+
+            meta = {
+              description = ''Rebar3 live plugin'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pvmart/rebar3_live";
+            };
+          }
+      ) {};
+
+    rebar3_live = rebar3_live_0_1_3;
+
+    rebar3_neotoma_plugin_0_2_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, neotoma_1_7_3 }:
+          buildRebar3 {
+            name = "rebar3_neotoma_plugin";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "rebar3_neotoma_plugin";
+              version = "0.2.0";
+              sha256 =
+                "c0ebbdb08c017cac90c7d3310a9bd4a5088a46abd4e2fef9e9a9805a657396b8";
+            };
+
+            beamDeps  = [ neotoma_1_7_3 ];
+
+            meta = {
+              description = ''Neotoma rebar plugin'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage =
+                "https://github.com/zamotivator/rebar3_neotoma_plugin";
+            };
+          }
+      ) {};
+
+    rebar3_neotoma_plugin = rebar3_neotoma_plugin_0_2_0;
+
+    rebar3_proper_0_5_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, proper_1_1_1_beta }:
+          buildRebar3 {
+            name = "rebar3_proper";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "rebar3_proper";
+              version = "0.5.0";
+              sha256 =
+                "c73549e279454f6a5887d564addafb779a4dd276460f17af5c26045ef8f44059";
+            };
+
+            beamDeps  = [ proper_1_1_1_beta ];
+
+            meta = {
+              description = ''Run PropEr test suites'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/ferd/rebar3_proper";
+            };
+          }
+      ) {};
+
+    rebar3_proper = rebar3_proper_0_5_0;
+
+    rebar3_proper_plugin_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "rebar3_proper_plugin";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "rebar3_proper_plugin";
+              version = "0.1.0";
+              sha256 =
+                "7071555afb623e73a2c572de6d4379f9c197b44e68608944eb2835617faed10d";
+            };
+
+            meta = {
+              description = ''A rebar plugin'';
+
+            };
+          }
+      ) {};
+
+    rebar3_proper_plugin = rebar3_proper_plugin_0_1_0;
+
+    rebar3_protobuffs_0_2_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, protobuffs_0_8_2 }:
+          buildRebar3 {
+            name = "rebar3_protobuffs";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "rebar3_protobuffs";
+              version = "0.2.0";
+              sha256 =
+                "b5422c5aee1dcea90fa44e4b769c01e8cefe8b1ab09e44b4d2008d465e80c49c";
+            };
+
+            beamDeps  = [ protobuffs_0_8_2 ];
+
+            meta = {
+              description = ''A rebar plugin'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/benoitc/rebar3_protobuffs";
+            };
+          }
+      ) {};
+
+    rebar3_protobuffs = rebar3_protobuffs_0_2_0;
+
+    rebar3_run_0_2_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "rebar3_run";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "rebar3_run";
+              version = "0.2.0";
+              sha256 =
+                "321e0647893957d1bb05a88d940a8a3b9129097d63529e13f815c4857bf29497";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''A rebar plugin'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tsloughter/rebar3_run";
+            };
+          }
+      ) {};
+
+    rebar3_run = rebar3_run_0_2_0;
+
+    rebar3_yang_plugin_0_2_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "rebar3_yang_plugin";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "rebar3_yang_plugin";
+              version = "0.2.1";
+              sha256 =
+                "8a68890ba67baf25b539acfd20783732a90b57f75f7d868cb62d1f7f061449fa";
+            };
+
+            meta = {
+              description = ''A rebar plugin for yang'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/surik/rebar3_yang_plugin";
+            };
+          }
+      ) {};
+
+    rebar3_yang_plugin = rebar3_yang_plugin_0_2_1;
+
+    rebar_alias_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "rebar_alias";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "rebar_alias";
+              version = "0.1.0";
+              sha256 =
+                "59fb42b39964af3a29ebe94c11247f618dd4d5e4e1a69cfaffabbed03ccff70f";
+            };
+
+            meta = {
+              description = ''A rebar plugin'';
+
+            };
+          }
+      ) {};
+
+    rebar_alias = rebar_alias_0_1_0;
+
+    rebar_erl_vsn_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "rebar_erl_vsn";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "rebar_erl_vsn";
+              version = "0.1.0";
+              sha256 =
+                "7cf1e2e85a80785a4e4e1529a2c837dbd2d540214cf791214e56f931e5e9865d";
+            };
+
+            meta = {
+              description = ''defines for erlang versions'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    rebar_erl_vsn = rebar_erl_vsn_0_1_0;
+
+    rebar_protobuffs_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, gpb_3_18_8 }:
+          buildRebar3 {
+            name = "rebar_protobuffs";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "rebar_protobuffs";
+              version = "0.1.0";
+              sha256 =
+                "1345b2135aed454855bfc74b760feb420924824c937157098b1f8668deb919b5";
+            };
+
+            beamDeps  = [ gpb_3_18_8 ];
+
+            meta = {
+              description = ''A rebar plugin'';
+
+            };
+          }
+      ) {};
+
+    rebar_protobuffs = rebar_protobuffs_0_1_0;
+
+    rebind_0_1_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "rebind";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "rebind";
+              version = "0.1.3";
+              sha256 =
+                "043322759e646ef255e91440d275573b70d9ac6bdf10988ec976ddcf1baf99c3";
+            };
+
+            meta = {
+              description = ''rebind parse transform for erlang'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/camshaft/rebind";
+            };
+          }
+      ) {};
+
+    rebind = rebind_0_1_3;
+
+    recaptcha_1_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "recaptcha";
+            version = "1.1.1";
+            src = fetchHex {
+              pkg = "recaptcha";
+              version = "1.1.1";
+              sha256 =
+                "ebfa37443d23d2c70366f3f84f00bd50d59da5583ffde2673bc5ea83667b5751";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''A simple reCaptcha package for Phoenix
+                            applications.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/JustMikey/recaptcha";
+            };
+          }
+      ) {};
+
+    recaptcha = recaptcha_1_1_1;
+
+    recon_2_2_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "recon";
+            version = "2.2.1";
+            src = fetchHex {
+              pkg = "recon";
+              version = "2.2.1";
+              sha256 =
+                "6c548ad0f4916495a78977674a251847869f85b5125b7c2a44da3178955adfd1";
+            };
+
+            meta = {
+              longDescription = ''Recon wants to be a set of tools usable in
+                                production to diagnose Erlang problems or
+                                inspect production environment safely.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/ferd/recon";
+            };
+          }
+      ) {};
+
+    recon = recon_2_2_1;
+
+    recon_ex_0_9_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "recon_ex";
+            version = "0.9.0";
+            src = fetchHex {
+              pkg = "recon_ex";
+              version = "0.9.0";
+              sha256 =
+                "7a24dcb173e74c0e65357deb6e084cd71b1f24915b4801e12ec38bd4d587c2dd";
+            };
+
+            meta = {
+              description = ''Elixir wrapper for Recon, diagnostic tools for
+                            production use'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/tatsuya6502/recon_ex";
+            };
+          }
+      ) {};
+
+    recon_ex = recon_ex_0_9_0;
+
+    record_translator_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "record_translator";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "record_translator";
+              version = "0.0.3";
+              sha256 =
+                "d6a30b2b23194e58c282c86cc0d3f61a738e1840afcee4007fdbb10e7ad7bf76";
+            };
+
+            meta = {
+              description = ''Erlang`s file of records to Elixir`s maps'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/massn/record_translator";
+            };
+          }
+      ) {};
+
+    record_translator = record_translator_0_0_3;
+
+    red_0_0_5 = callPackage
+      (
+        {  buildMix, fetchHex, exredis_0_2_3 }:
+          buildMix {
+            name = "red";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "red";
+              version = "0.0.5";
+              sha256 =
+                "191b394672817e1ef955cc9b99bd26c61daab9bbbbc089825e7957e92c0eba60";
+            };
+            beamDeps  = [ exredis_0_2_3 ];
+
+            meta = {
+              longDescription = ''Red is an Elixir library that uses Redis to
+                                persist relationships between objects, like a
+                                graph.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/rodrigues/red";
+            };
+          }
+      ) {};
+
+    red = red_0_0_5;
+
+    red_black_tree_1_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "red_black_tree";
+            version = "1.2.0";
+            src = fetchHex {
+              pkg = "red_black_tree";
+              version = "1.2.0";
+              sha256 =
+                "1e8e7b85d075e249f9384ba0fcd2aacbff3697a5cb3cb5c9838c86f762b79725";
+            };
+
+            meta = {
+              description = ''Red-Black trees: an ordered key-value store with
+                            O(log(N)) performance'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/SenecaSystems/red_black_tree";
+            };
+          }
+      ) {};
+
+    red_black_tree = red_black_tree_1_2_0;
+
+    reddhl_0_0_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, poison_1_4_0, httpoison_0_8_1 }:
+          buildRebar3 {
+            name = "reddhl";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "reddhl";
+              version = "0.0.1";
+              sha256 =
+                "4b2a5b1e3119b5b44e57c10e395fc817d977bf7fd72464605efff08266336871";
+            };
+
+            beamDeps  = [ poison_1_4_0 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''An headline and link puller for Reddit and its
+                            various subreddits '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/MonkeyIsNull/reddhl";
+            };
+          }
+      ) {};
+
+    reddhl = reddhl_0_0_1;
+
+    redis_poolex_0_0_5 = callPackage
+      (
+        {  buildMix, fetchHex, poolboy_1_5_1, exredis_0_2_3 }:
+          buildMix {
+            name = "redis_poolex";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "redis_poolex";
+              version = "0.0.5";
+              sha256 =
+                "aec40aa6807c6629a20657af502073849263bc35385abbcbb13748aaf8c995b6";
+            };
+            beamDeps  = [ poolboy_1_5_1 exredis_0_2_3 ];
+
+            meta = {
+              description = ''Redis connection pool using poolboy and exredis
+                            libraries'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/oivoodoo/redis_poolex";
+            };
+          }
+      ) {};
+
+    redis_poolex = redis_poolex_0_0_5;
+
+    redix_0_3_4 = callPackage
+      (
+        {  buildMix, fetchHex, connection_1_0_2 }:
+          buildMix {
+            name = "redix";
+            version = "0.3.4";
+            src = fetchHex {
+              pkg = "redix";
+              version = "0.3.4";
+              sha256 =
+                "111acb6b4250f2c2aa1757bf9404176a5fc1e2a70cfd2413cbf26e217f61927e";
+            };
+            beamDeps  = [ connection_1_0_2 ];
+
+            meta = {
+              description = ''Superfast, pipelined, resilient Redis driver for
+                            Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/whatyouhide/redix";
+            };
+          }
+      ) {};
+
+    redix = redix_0_3_4;
+
+    redo_2_0_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "redo";
+            version = "2.0.1";
+            src = fetchHex {
+              pkg = "redo";
+              version = "2.0.1";
+              sha256 =
+                "f7b2be8c825ec34413c54d8f302cc935ce4ecac8421ae3914c5dadd816dcb1e6";
+            };
+
+            meta = {
+              description = ''Pipelined Redis Erlang Driver'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/heroku/redo";
+            };
+          }
+      ) {};
+
+    redo = redo_2_0_1;
+
+    redtube_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "redtube";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "redtube";
+              version = "1.0.0";
+              sha256 =
+                "f9c5b83c3f860c448328079f1250b54f06749d9c1adb593f7e11e45fe8131a0d";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''API Wrapper for Redtube'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/kkirsche/Redtube_Elixir";
+            };
+          }
+      ) {};
+
+    redtube = redtube_1_0_0;
+
+    ref_inspector_0_8_0 = callPackage
+      (
+        {  buildMix, fetchHex, poolboy_1_5_1 }:
+          buildMix {
+            name = "ref_inspector";
+            version = "0.8.0";
+            src = fetchHex {
+              pkg = "ref_inspector";
+              version = "0.8.0";
+              sha256 =
+                "3bef725ae702cfd9724fb1adabf1210740a15d6861feab01d13ccb9007f9a634";
+            };
+            beamDeps  = [ poolboy_1_5_1 ];
+
+            meta = {
+              description = ''Referer parser library'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/elixytics/ref_inspector";
+            };
+          }
+      ) {};
+
+    ref_inspector = ref_inspector_0_8_0;
+
+    relax_0_3_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poison_1_5_2,
+          plug_1_1_1,
+          ja_serializer_0_7_1,
+          ecto_2_0_0_beta_0,
+          cowboy_1_0_4
+        }:
+          buildMix {
+            name = "relax";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "relax";
+              version = "0.3.0";
+              sha256 =
+                "04382f1d8a6d14e3a9b2177a318aa02129665fa3e00fb52d0042e286ea9af392";
+            };
+            beamDeps  = [
+                          poison_1_5_2
+                          plug_1_1_1
+                          ja_serializer_0_7_1
+                          ecto_2_0_0_beta_0
+                          cowboy_1_0_4
+                        ];
+
+            meta = {
+              longDescription = ''A jsonapi.org serializer and optional server
+                                implementation in Elixir. Relax can be used as a
+                                standalone API with Relax.Router and
+                                Relax.Resources, or integrated into Phoenix
+                                using Relax.Serializer.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/AgilionApps/relax";
+            };
+          }
+      ) {};
+
+    relax = relax_0_3_0;
+
+    relflow_1_0_4 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "relflow";
+            version = "1.0.4";
+            src = fetchHex {
+              pkg = "relflow";
+              version = "1.0.4";
+              sha256 =
+                "e6d9652ed7511aea18fa012d5abc19301acd8cbe81a44a159391086a5be12e1f";
+            };
+
+            meta = {
+              description = ''Rebar3 release workflow plugin'';
+              license = stdenv.lib.licenses.apsl20;
+            };
+          }
+      ) {};
+
+    relflow = relflow_1_0_4;
+
+    relief_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "relief";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "relief";
+              version = "0.0.1";
+              sha256 =
+                "81c51cdf1fbaa7654da74d4ac1831b0d79504affd7b1fbe9d6f16ce701288c50";
+            };
+
+            meta = {
+              description = ''A collection of Elixir Stream oriented relief
+                            mechanisms.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/voidlock/relief";
+            };
+          }
+      ) {};
+
+    relief = relief_0_0_1;
+
+    relisa_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, exrm_0_18_8 }:
+          buildMix {
+            name = "relisa";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "relisa";
+              version = "0.1.0";
+              sha256 =
+                "e771fa9da8363571765374a0cf3f1237da8c1be35ea4109165928ca42895954c";
+            };
+            beamDeps  = [ exrm_0_18_8 ];
+
+            meta = {
+              description = ''Fast, simple, and composable deployment library
+                            for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/SenecaSystems/relisa";
+            };
+          }
+      ) {};
+
+    relisa = relisa_0_1_0;
+
+    relocker_0_0_6 = callPackage
+      (
+        {  buildMix, fetchHex, exredis_0_2_3 }:
+          buildMix {
+            name = "relocker";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "relocker";
+              version = "0.0.6";
+              sha256 =
+                "8aaaa5f7d118b543764005fa7af47a77d9c74d606603c29005b0637ef1c192df";
+            };
+            beamDeps  = [ exredis_0_2_3 ];
+
+            meta = {
+              description = ''A library for holding a lock in Redis.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/grandCru/relocker";
+            };
+          }
+      ) {};
+
+    relocker = relocker_0_0_6;
+
+    reltool_util_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "reltool_util";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "reltool_util";
+              version = "1.5.1";
+              sha256 =
+                "746e16871afdcf85d8a115389193c8d660d0df1d26d6ac700590e0ad252646b1";
+            };
+
+            meta = {
+              description = ''Erlang reltool utility functionality
+                            application'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/reltool_util";
+            };
+          }
+      ) {};
+
+    reltool_util = reltool_util_1_5_1;
+
+    relx_3_17_0 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          providers_1_6_0,
+          getopt_0_8_2,
+          erlware_commons_0_18_0,
+          cf_0_2_1,
+          bbmustache_1_0_4
+        }:
+          buildRebar3 {
+            name = "relx";
+            version = "3.17.0";
+            src = fetchHex {
+              pkg = "relx";
+              version = "3.17.0";
+              sha256 =
+                "c22f3d8400394787cb67191dea4de1acccf1563f6cd2f1934bf2a13a525c5ef6";
+            };
+
+            beamDeps  = [
+                          providers_1_6_0
+                          getopt_0_8_2
+                          erlware_commons_0_18_0
+                          cf_0_2_1
+                          bbmustache_1_0_4
+                        ];
+
+            meta = {
+              description = ''Release assembler for Erlang/OTP Releases'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/erlware/relx";
+            };
+          }
+      ) {};
+
+    relx = relx_3_17_0;
+
+    relx_3_3_1 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          providers_1_4_1,
+          getopt_0_8_2,
+          erlware_commons_0_14_0,
+          bbmustache_1_0_3
+        }:
+          buildRebar3 {
+            name = "relx";
+            version = "3.3.1";
+            src = fetchHex {
+              pkg = "relx";
+              version = "3.3.1";
+              sha256 =
+                "782fdce1daccb5dca6b372cdffb979cda3431ac245db5fafe93247f4fdab049b";
+            };
+
+            beamDeps  = [
+                          providers_1_4_1
+                          getopt_0_8_2
+                          erlware_commons_0_14_0
+                          bbmustache_1_0_3
+                        ];
+
+            meta = {
+              description = ''Release assembler for Erlang/OTP Releases'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/erlware/relx";
+            };
+          }
+      ) {};
+
+    relx_3_5_0 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          providers_1_4_1,
+          getopt_0_8_2,
+          erlware_commons_0_15_0,
+          bbmustache_1_0_3
+        }:
+          buildRebar3 {
+            name = "relx";
+            version = "3.5.0";
+            src = fetchHex {
+              pkg = "relx";
+              version = "3.5.0";
+              sha256 =
+                "a8cbf529702024f56d03d43349a5aafac55a6aa1b2ecf7bd3e8cc61e72a858a1";
+            };
+
+            beamDeps  = [
+                          providers_1_4_1
+                          getopt_0_8_2
+                          erlware_commons_0_15_0
+                          bbmustache_1_0_3
+                        ];
+
+            meta = {
+              description = ''Release assembler for Erlang/OTP Releases'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/erlware/relx";
+            };
+          }
+      ) {};
+
+    remix_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "remix";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "remix";
+              version = "0.0.2";
+              sha256 =
+                "5f5555646ed4fca83fab8620735150aa0bc408c5a17a70d28cfa7086bc6f497c";
+            };
+
+            meta = {
+              description = ''Recompiles mix projects on any change to the lib
+                            directory.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/AgilionApps/remix";
+            };
+          }
+      ) {};
+
+    remix = remix_0_0_2;
+
+    remodel_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "remodel";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "remodel";
+              version = "0.0.1";
+              sha256 =
+                "f88edf81e99f7474792e71f5ab61155d1a031484565badebb8a15b0fe15b5207";
+            };
+
+            meta = {
+              longDescription = ''Remodel is an Elixir presenter package used
+                                to transform data structures. This is especially
+                                useful when a desired representation doesn`t
+                                match the schema defined within the database.
+                                '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/stavro/remodel";
+            };
+          }
+      ) {};
+
+    remodel = remodel_0_0_1;
+
+    rendezvous_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "rendezvous";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "rendezvous";
+              version = "0.0.1";
+              sha256 =
+                "92aa7157aa2d0c1dcfc1dfeddeaef023aca6f5f0790fd8040828c831f3f7f893";
+            };
+
+            meta = {
+              longDescription = ''Implementation of the Rendezvous or Highest
+                                Random Weight (HRW) hashing algorithm'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Puddah/Rendezvous";
+            };
+          }
+      ) {};
+
+    rendezvous = rendezvous_0_0_1;
+
+    repoquery_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "repoquery";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "repoquery";
+              version = "0.0.2";
+              sha256 =
+                "6b379793fae7cf8ff696feaeff9bf06d58ad66a9cbadfc8a769291c54814c922";
+            };
+
+            meta = {
+              description = ''An Elixir interface for the `repoquery` cli
+                            tool.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rentpath/repoquery";
+            };
+          }
+      ) {};
+
+    repoquery = repoquery_0_0_2;
+
+    reporter_0_4_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_1,
+          floki_0_7_1,
+          feeder_ex_0_0_2
+        }:
+          buildMix {
+            name = "reporter";
+            version = "0.4.1";
+            src = fetchHex {
+              pkg = "reporter";
+              version = "0.4.1";
+              sha256 =
+                "414bc7874fd551d5559907b88617a9a58aacb556d8b6adf6270cbef34656ebac";
+            };
+            beamDeps  = [
+                          poison_2_1_0
+                          httpoison_0_8_1
+                          floki_0_7_1
+                          feeder_ex_0_0_2
+                        ];
+
+            meta = {
+              description = ''Simple getting reviews library from AppStore and
+                            GooglePlay'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/KazuCocoa/simple_app_reporter_ex";
+            };
+          }
+      ) {};
+
+    reporter = reporter_0_4_1;
+
+    reprise_0_5_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "reprise";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "reprise";
+              version = "0.5.0";
+              sha256 =
+                "9db9fe973d2ac318a079409a75a18a8c2b5b1554db05f3611e81f555103ed9ed";
+            };
+
+            meta = {
+              longDescription = ''Reprise reloads your modules after they`ve
+                                been recompiled. This is an intentionally
+                                simplified reloader when compared to the other
+                                ones, like exreloader or Mochiweb reloader. It
+                                aims to do one thing well. Only the beam files
+                                which were created under your mix project are
+                                scanned for changes. Deps are also excluded from
+                                checking and reloading. It doesn`t try to
+                                compile changed sources -- this task is better
+                                left to some shell tools like inotify.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/herenowcoder/reprise";
+            };
+          }
+      ) {};
+
+    reprise = reprise_0_5_0;
+
+    resin_0_4_1 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1 }:
+          buildMix {
+            name = "resin";
+            version = "0.4.1";
+            src = fetchHex {
+              pkg = "resin";
+              version = "0.4.1";
+              sha256 =
+                "c6bdfd13e91cbc289df91440e216b91aa590a7dafe59958b0197cedd8cfef792";
+            };
+            beamDeps  = [ plug_1_1_1 ];
+
+            meta = {
+              description = ''Pour resin in your plug pipeline to add
+                            (configurable) enterpriseyness!'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Frost/resin";
+            };
+          }
+      ) {};
+
+    resin = resin_0_4_1;
+
+    rest_1_5_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "rest";
+            version = "1.5.0";
+            src = fetchHex {
+              pkg = "rest";
+              version = "1.5.0";
+              sha256 =
+                "d99f75ef949eae41e28f707f9e1b6ea5fa07cba57c5365b5466ed357e8f78b07";
+            };
+
+            meta = {
+              description = ''REST erlang interface generator'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/synrc/rest";
+            };
+          }
+      ) {};
+
+    rest = rest_1_5_0;
+
+    rest_client_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poison_1_5_2,
+          mock_0_1_1,
+          inflex_1_4_1,
+          httpotion_2_1_0
+        }:
+          buildMix {
+            name = "rest_client";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "rest_client";
+              version = "0.0.1";
+              sha256 =
+                "b537f9bc91fbf09ecb6c5890c0e5a01f20de869bc804f730688f61d6acd96cf8";
+            };
+            beamDeps  = [
+                          poison_1_5_2 mock_0_1_1 inflex_1_4_1 httpotion_2_1_0
+                        ];
+
+            meta = {
+              longDescription = ''RestClient is a generic REST client library.
+                                It generates structs and functions for use with
+                                APIs.'';
+
+              homepage = "https://github.com/phikes/elixir-restclient";
+            };
+          }
+      ) {};
+
+    rest_client = rest_client_0_0_1;
+
+    rethinkdb_0_3_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_0_3, connection_1_0_2 }:
+          buildMix {
+            name = "rethinkdb";
+            version = "0.3.2";
+            src = fetchHex {
+              pkg = "rethinkdb";
+              version = "0.3.2";
+              sha256 =
+                "b97da3f1281575ac4e24d1cc0ce20a7f5a2e05bc7d212e4e58e0c9f2411a1c8a";
+            };
+            beamDeps  = [ poison_1_0_3 connection_1_0_2 ];
+
+            meta = {
+              description = ''RethinkDB driver for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/hamiltop/rethinkdb-elixir";
+            };
+          }
+      ) {};
+
+    rethinkdb = rethinkdb_0_3_2;
+
+    reup_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "reup";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "reup";
+              version = "0.1.0";
+              sha256 =
+                "949a672190119f8b24160167e3685fdd5397474f98dc875ccfd31378ebd68506";
+            };
+
+            meta = {
+              description = ''dev watcher that auto compiles and reloads
+                            modules'';
+              license = stdenv.lib.licenses.apsl20;
+            };
+          }
+      ) {};
+
+    reup = reup_0_1_0;
+
+    reverse_proxy_0_1_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, plug_1_0_3, httpoison_0_7_5, cowboy_1_0_4
+        }:
+          buildMix {
+            name = "reverse_proxy";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "reverse_proxy";
+              version = "0.1.0";
+              sha256 =
+                "77ab07ca68e758d5ce07878ae4effab8522545e6d491f9ae96c87814f35cbab2";
+            };
+            beamDeps  = [ plug_1_0_3 httpoison_0_7_5 cowboy_1_0_4 ];
+
+            meta = {
+              longDescription = ''A Plug based, reverse proxy server. Upstream
+                                servers can be listed per-domain in the
+                                following forms: - List of remote nodes, e.g.
+                                `["host:4000", "host:4001"]` - A `{plug,
+                                options}` tuple, useful for umbrella
+                                applications'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/slogsdon/elixir-reverse-proxy";
+            };
+          }
+      ) {};
+
+    reverse_proxy = reverse_proxy_0_1_0;
+
+    revision_plate_ex_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "revision_plate_ex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "revision_plate_ex";
+              version = "0.1.0";
+              sha256 =
+                "6c88a514ae5b36999fd52c01cc3ea746f8ba9c7900b47f4758a65c197b8aed71";
+            };
+            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+
+            meta = {
+              longDescription = ''Plug application and middleware that serves
+                                endpoint returns application`s REVISION'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/KazuCocoa/revision_plate_ex";
+            };
+          }
+      ) {};
+
+    revision_plate_ex = revision_plate_ex_0_1_0;
+
+    rfc3339_0_2_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "rfc3339";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "rfc3339";
+              version = "0.2.0";
+              sha256 =
+                "992ebf382d6982f2fff48928394d4d50d413b7a4abe576ba518b92c82ac2eb99";
+            };
+
+            meta = {
+              description = ''an rfc3339 parser and formatter'';
+              license = with stdenv.lib.licenses; [ asl20 mit ];
+              homepage = "https://github.com/talentdeficit/rfc3339";
+            };
+          }
+      ) {};
+
+    rfc3339 = rfc3339_0_2_0;
+
+    riak_1_0_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, riakc_2_1_1, pooler_1_5_0, linguist_0_1_5
+        }:
+          buildMix {
+            name = "riak";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "riak";
+              version = "1.0.0";
+              sha256 =
+                "4171c6e40aba67f8464c807bd70c68e8bf63c9cecf3d28dde88ef1e8f5a21930";
+            };
+            beamDeps  = [ riakc_2_1_1 pooler_1_5_0 linguist_0_1_5 ];
+
+            meta = {
+              description = ''A Riak client written in Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/drewkerrigan/riak-elixir-client";
+            };
+          }
+      ) {};
+
+    riak = riak_1_0_0;
+
+    riak_dt_2_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "riak_dt";
+            version = "2.1.1";
+            src = fetchHex {
+              pkg = "riak_dt";
+              version = "2.1.1";
+              sha256 =
+                "b5ab9e1d579ec3129cbea4b1977261aa2c5ad634321f87ace83bb32b99f65396";
+            };
+
+            meta = {
+              description = ''riak CTDT datatypes'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/basho/riak_dt";
+            };
+          }
+      ) {};
+
+    riak_dt = riak_dt_2_1_1;
+
+    riak_ensemble_2_1_3 = callPackage
+      (
+        {  buildRebar3, fetchHex, lager_3_0_2, eleveldb_2_1_3 }:
+          buildRebar3 {
+            name = "riak_ensemble";
+            version = "2.1.3";
+            src = fetchHex {
+              pkg = "riak_ensemble";
+              version = "2.1.3";
+              sha256 =
+                "593c68745ce3117c2e0beaa57e36ad2971bd3540645f233df866a19468970ae2";
+            };
+
+            beamDeps  = [ lager_3_0_2 eleveldb_2_1_3 ];
+
+            meta = {
+              description = ''Multi-Paxos framework in Erlang'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/basho/riak_ensemble";
+            };
+          }
+      ) {};
+
+    riak_ensemble = riak_ensemble_2_1_3;
+
+    riak_pb_2_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, protobuffs_0_8_2, hamcrest_0_1_1 }:
+          buildRebar3 {
+            name = "riak_pb";
+            version = "2.1.0";
+            src = fetchHex {
+              pkg = "riak_pb";
+              version = "2.1.0";
+              sha256 =
+                "76309b9b831d276bf9abf92362183030ed63910a2e153f1f8a389e97dec6c287";
+            };
+
+            beamDeps  = [ protobuffs_0_8_2 hamcrest_0_1_1 ];
+
+            meta = {
+              description = ''Riak Protocol Buffers Messages'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/basho/riak_pb";
+            };
+          }
+      ) {};
+
+    riak_pb = riak_pb_2_1_0;
+
+    riak_sysmon_2_1_2 = callPackage
+      (
+        {  buildRebar3, fetchHex, lager_3_0_2 }:
+          buildRebar3 {
+            name = "riak_sysmon";
+            version = "2.1.2";
+            src = fetchHex {
+              pkg = "riak_sysmon";
+              version = "2.1.2";
+              sha256 =
+                "a467f7a24fbdeac5b23baf0269758236458fabf8b498e9c551e61c5238e6f97c";
+            };
+
+            beamDeps  = [ lager_3_0_2 ];
+
+            meta = {
+              description = ''Rate-limiting system_monitor event handler'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/basho/riak_sysmon";
+            };
+          }
+      ) {};
+
+    riak_sysmon = riak_sysmon_2_1_2;
+
+    riakc_2_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, riak_pb_2_1_0 }:
+          buildRebar3 {
+            name = "riakc";
+            version = "2.1.1";
+            src = fetchHex {
+              pkg = "riakc";
+              version = "2.1.1";
+              sha256 =
+                "4f7141c03529d4f1c28c71eafcd797be0a538ba21d5d6923a17a9ca9e64e744e";
+            };
+
+            beamDeps  = [ riak_pb_2_1_0 ];
+
+            meta = {
+              description = ''Erlang clients for Riak.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/basho/riak-erlang-client";
+            };
+          }
+      ) {};
+
+    riakc = riakc_2_1_1;
+
+    riboflavin_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "riboflavin";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "riboflavin";
+              version = "0.0.2";
+              sha256 =
+                "cc4ac4c80b6d591deaea136a3d055eba4ead6bbe2fc9b220a4432f160d0ddec6";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Backblaze B2 client.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/silentdragonz/riboflavin";
+            };
+          }
+      ) {};
+
+    riboflavin = riboflavin_0_0_2;
+
+    riemann_0_0_14 = callPackage
+      (
+        {  buildMix, fetchHex, honeydew_0_0_8, exprotobuf_0_13_0 }:
+          buildMix {
+            name = "riemann";
+            version = "0.0.14";
+            src = fetchHex {
+              pkg = "riemann";
+              version = "0.0.14";
+              sha256 =
+                "05656878f8aee98f1baa601ca762338014cf2440d1fb043f682669241314a2d5";
+            };
+            beamDeps  = [ honeydew_0_0_8 exprotobuf_0_13_0 ];
+
+            meta = {
+              description = ''A client for the Riemann event stream
+                            processor'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/koudelka/elixir-riemann";
+            };
+          }
+      ) {};
+
+    riemann = riemann_0_0_14;
+
+    robotex_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_1_0 }:
+          buildMix {
+            name = "robotex";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "robotex";
+              version = "0.0.1";
+              sha256 =
+                "ae1c618b20e3847f4c372350bdda3b0dc577e1491310ef97fd5869c4f750533e";
+            };
+            beamDeps  = [ httpoison_0_8_1 exjsx_3_1_0 ];
+
+            meta = {
+              description = ''Robotex is a client for the Telegram Bot API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/EddyShure/robotex";
+            };
+          }
+      ) {};
+
+    robotex = robotex_0_0_1;
+
+    rogger_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, timex_0_13_5, amqp_0_1_1 }:
+          buildRebar3 {
+            name = "rogger";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "rogger";
+              version = "0.1.0";
+              sha256 =
+                "2e68650f9ee8f1047410538163e930567c049d91f883cbc96d9f52aea6052b61";
+            };
+
+            beamDeps  = [ timex_0_13_5 amqp_0_1_1 ];
+
+            meta = {
+              description = ''Elixir logger to publish log messages in
+                            RabbitMQ. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/duartejc/rogger";
+            };
+          }
+      ) {};
+
+    rogger = rogger_0_1_0;
+
+    rollbax_0_5_3 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_0_3, hackney_1_4_8 }:
+          buildMix {
+            name = "rollbax";
+            version = "0.5.3";
+            src = fetchHex {
+              pkg = "rollbax";
+              version = "0.5.3";
+              sha256 =
+                "0f24d041c932043915a14ab4e186bd3f1613bccee30ad251bb79a60533680336";
+            };
+            beamDeps  = [ poison_1_0_3 hackney_1_4_8 ];
+
+            meta = {
+              description = ''Exception tracking and logging from Elixir to
+                            Rollbar'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/elixir-addicts/rollbax";
+            };
+          }
+      ) {};
+
+    rollbax = rollbax_0_5_3;
+
+    rollex_0_4_0 = callPackage
+      (
+        {  buildMix, fetchHex, sfmt_0_12_2 }:
+          buildMix {
+            name = "rollex";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "rollex";
+              version = "0.4.0";
+              sha256 =
+                "53410bbd7687ff751b51b9737965bff1ba9c3d0673af65752f4ae3be0de1b44c";
+            };
+            beamDeps  = [ sfmt_0_12_2 ];
+
+            meta = {
+              description = ''Elixir library using a Pratt Parser algorithm to
+                            calculate dice rolls.'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    rollex = rollex_0_4_0;
+
+    roman_numerals_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "roman_numerals";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "roman_numerals";
+              version = "1.0.1";
+              sha256 =
+                "5e9dcfcb645c1ca937ddc0170805028596fbf4936d0119131350d7de95b7c6a1";
+            };
+
+            meta = {
+              description = ''Convert numbers to Roman numerals and back.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lpil/roman-numerals";
+            };
+          }
+      ) {};
+
+    roman_numerals = roman_numerals_1_0_1;
+
+    romanex_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "romanex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "romanex";
+              version = "0.1.0";
+              sha256 =
+                "b1f769bbf638d14247c70be8b944cfa76a84a00ef690e9cba26032ae03e33a89";
+            };
+
+            meta = {
+              description = ''Encode, Decode, and Validate Roman Numerals.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/itsgreggreg/romanex";
+            };
+          }
+      ) {};
+
+    romanex = romanex_0_1_0;
+
+    romeo_0_4_0 = callPackage
+      (
+        {  buildMix, fetchHex, connection_1_0_2 }:
+          buildMix {
+            name = "romeo";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "romeo";
+              version = "0.4.0";
+              sha256 =
+                "38f1fe4ddeab5865de68dff196cf18b86d7ba3b8bb49c2753f1d04b145f248d4";
+            };
+            beamDeps  = [ connection_1_0_2 ];
+
+            meta = {
+              description = ''An XMPP Client for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/scrogson/romeo";
+            };
+          }
+      ) {};
+
+    romeo = romeo_0_4_0;
+
+    roombex_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex, serial_0_1_2 }:
+          buildMix {
+            name = "roombex";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "roombex";
+              version = "0.0.4";
+              sha256 =
+                "93ff6124016e14e2ecdf90628b638f80eb97cc0b21f2c50288585d33fc5d3d54";
+            };
+            beamDeps  = [ serial_0_1_2 ];
+
+            meta = {
+              longDescription = ''Implements the Roomba binary protocol. Send
+                                and receive binary data using elixir data
+                                structures and simple functions.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mmmries/roombex";
+            };
+          }
+      ) {};
+
+    roombex = roombex_0_0_4;
+
+    rop_0_5_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "rop";
+            version = "0.5.3";
+            src = fetchHex {
+              pkg = "rop";
+              version = "0.5.3";
+              sha256 =
+                "3b8c37802c530eecc7714c175fe36486bb45157519cc7498ac487f6590f396e8";
+            };
+
+            meta = {
+              description = ''Some convenient macros to enable
+                            railsway-oriented programming in Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ruby2elixir/rop";
+            };
+          }
+      ) {};
+
+    rop = rop_0_5_3;
+
+    rotor_0_2_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "rotor";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "rotor";
+              version = "0.2.2";
+              sha256 =
+                "82de479c2cb6d26299916209d2945d1b39cf820f38279485ea5d5a8c494cb281";
+            };
+
+            meta = {
+              longDescription = ''Rotor is a build system for Elixir projects.
+                                Use it to compile things, run commands or do
+                                anything when files change. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/HashNuke/rotor";
+            };
+          }
+      ) {};
+
+    rotor = rotor_0_2_2;
+
+    rquote_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "rquote";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "rquote";
+              version = "0.0.1";
+              sha256 =
+                "54e1cba92716a4176d89e20d841dbc3a1227ef2fd9f7ddc5711a900877912354";
+            };
+
+            meta = {
+              description = ''Library and CLI for generating random price
+                            quotes '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/stocks29/rquote";
+            };
+          }
+      ) {};
+
+    rquote = rquote_0_0_1;
+
+    rsa_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "rsa";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "rsa";
+              version = "0.0.1";
+              sha256 =
+                "6351a45a5a58285c41d611ec32b37ee486d7dacd119d7ef90ada844c44e95596";
+            };
+
+            meta = {
+              description = ''Erlang public_key cryptography wrapper'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/trapped/elixir-rsa";
+            };
+          }
+      ) {};
+
+    rsa = rsa_0_0_1;
+
+    rss_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "rss";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "rss";
+              version = "0.2.1";
+              sha256 =
+                "1af49c787fc789740a0fa7e0e197a7cb779a63c4eb703f013fea400126eac1f2";
+            };
+
+            meta = {
+              description = ''A super simple RSS feed builder '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bennyhallett/elixir-rss";
+            };
+          }
+      ) {};
+
+    rss = rss_0_2_1;
+
+    rubix_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "rubix";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "rubix";
+              version = "0.0.2";
+              sha256 =
+                "b9083f7c8981fc162bfda5c8aa9855f79298905eb8e3b4a4089134614b2a8199";
+            };
+
+            meta = {
+              description = ''A very simple (and barely-functioning) Ruby
+                            runner for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/YellowApple/Rubix";
+            };
+          }
+      ) {};
+
+    rubix = rubix_0_0_2;
+
+    rulex_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "rulex";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "rulex";
+              version = "0.2.0";
+              sha256 =
+                "41429f27164bb05f2fa4c6326b63a8773f61c89ef9ef0bd93937cbc473d03ab5";
+            };
+
+            meta = {
+              longDescription = ''Rulex contains a very simple macro "defrule"
+                                allowing you to write a rule system using Elixir
+                                pattern matching. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/awetzel/rulex";
+            };
+          }
+      ) {};
+
+    rulex = rulex_0_2_0;
+
+    russian_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "russian";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "russian";
+              version = "0.1.0";
+              sha256 =
+                "ebacf93bb9f653f749f787d65629ed2bd830dec295fb785f44738c120e9fde9a";
+            };
+
+            meta = {
+              description = ''Transliterate a string with russian characters'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Kr00lIX/russian_elixir";
+            };
+          }
+      ) {};
+
+    russian = russian_0_1_0;
+
+    safetybox_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex, earmark_0_2_1, cryptex_0_0_1 }:
+          buildMix {
+            name = "safetybox";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "safetybox";
+              version = "0.1.2";
+              sha256 =
+                "7785f6f8f53082af331a3dd44d9a1dd759d7c7981f3b6924482c81370b8cc706";
+            };
+            beamDeps  = [ earmark_0_2_1 cryptex_0_0_1 ];
+
+            meta = {
+              description = ''A set of helper functions for security oriented
+                            operations, like encrypt. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/aforward/safetybox";
+            };
+          }
+      ) {};
+
+    safetybox = safetybox_0_1_2;
+
+    saltie_0_3_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "saltie";
+            version = "0.3.2";
+            src = fetchHex {
+              pkg = "saltie";
+              version = "0.3.2";
+              sha256 =
+                "6d1eb4b3d0f3a494990a28af3a5e6f79221f230ed7b24063cdfa2ea34c8794f2";
+            };
+
+            meta = {
+              description = ''**DEPRECATED**. See hex.pm/packages/hashids'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/alco/saltie";
+            };
+          }
+      ) {};
+
+    saltie = saltie_0_3_2;
+
+    sap_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, control_0_0_4 }:
+          buildMix {
+            name = "sap";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "sap";
+              version = "0.0.2";
+              sha256 =
+                "63f2db3cbbb753eac51177783463fb364dd560745bf5e4e8ba10a237e557903c";
+            };
+            beamDeps  = [ plug_1_1_1 control_0_0_4 ];
+
+            meta = {
+              longDescription = ''Sap is a toolkit for Plug applications to
+                                accept and respond to HTTP requests by using a
+                                decision tree built with combinators.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/slogsdon/sap";
+            };
+          }
+      ) {};
+
+    sap = sap_0_0_2;
+
+    sasl_ex_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "sasl_ex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "sasl_ex";
+              version = "0.1.0";
+              sha256 =
+                "ce7f244817f6264738d5432d9b734921b9fdfe4ca2351a890ed678eb6fbaad3e";
+            };
+
+            meta = {
+              longDescription = ''A lib for decoding bytes in the format of the
+                                SASL protocol into an Elixir struct.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/elbow-jason/sasl_ex";
+            };
+          }
+      ) {};
+
+    sasl_ex = sasl_ex_0_1_0;
+
+    sass_elixir_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "sass_elixir";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "sass_elixir";
+              version = "0.0.1";
+              sha256 =
+                "565dc1c40057a9a7ae3a3c27151a8dd87a3d672d346fcc5b4829152d22c4a511";
+            };
+
+            meta = {
+              description = ''A SASS plugin for elixir projects'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zamith/sass_elixir";
+            };
+          }
+      ) {};
+
+    sass_elixir = sass_elixir_0_0_1;
+
+    savory_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "savory";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "savory";
+              version = "0.0.2";
+              sha256 =
+                "a45ef32a6f45092e1328bc1eb47bda3c8f992afe863aaa73c455f31b0c8591b9";
+            };
+
+            meta = {
+              longDescription = ''An Elixir implementation of Freza`s salt_nif
+                                which interfaces with libsodium, a wrapper for
+                                the cryptographic primitive libary NaCl. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/electricFeel/savory";
+            };
+          }
+      ) {};
+
+    savory = savory_0_0_2;
+
+    sbroker_0_7_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "sbroker";
+            version = "0.7.0";
+            src = fetchHex {
+              pkg = "sbroker";
+              version = "0.7.0";
+              sha256 =
+                "5bc0bfd79896fd5b92072a71fa4a1e120f4110f2cf9562a0b9dd2fcfe9e5cfd2";
+            };
+
+            meta = {
+              description = ''Process broker for dispatching with backpressure
+                            and load shedding'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/fishcakez/sbroker";
+            };
+          }
+      ) {};
+
+    sbroker = sbroker_0_7_0;
+
+    scaffold_0_0_5 = callPackage
+      (
+        {  buildMix, fetchHex, gitex_0_1_0, configparser_ex_0_2_0 }:
+          buildMix {
+            name = "scaffold";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "scaffold";
+              version = "0.0.5";
+              sha256 =
+                "fad499b712a576bc9d0f4842494baf9ec8d4c388f99c14f74654b1dbd158945c";
+            };
+            beamDeps  = [ gitex_0_1_0 configparser_ex_0_2_0 ];
+
+            meta = {
+              description = ''A mix task for creating new projects based on
+                            templates fetched from a Git-repo.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/gausby/scaffold";
+            };
+          }
+      ) {};
+
+    scaffold = scaffold_0_0_5;
+
+    schedule_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "schedule";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "schedule";
+              version = "0.1.0";
+              sha256 =
+                "0b9b9440fe5e6d4a0cad34a170d3ec3251e06c42610f1c4106d93949b845db73";
+            };
+
+            meta = {
+              description = ''Basic operations with intervals for Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/dvele55/schedule";
+            };
+          }
+      ) {};
+
+    schedule = schedule_0_1_0;
+
+    schizo_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "schizo";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "schizo";
+              version = "0.0.1";
+              sha256 =
+                "278d738fe6d3d1455dd24e0450a95f4191b8ce63b7059a1b74e7bad86c47746d";
+            };
+
+            meta = {
+              description = ''Transform every other word in a sentence with
+                            some transformers.'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/teerawat1992/Schizo";
+            };
+          }
+      ) {};
+
+    schizo = schizo_0_0_1;
+
+    scrape_1_0_4 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          timex_1_0_0_rc4,
+          parallel_0_0_3,
+          httpoison_0_8_1,
+          floki_0_7_1,
+          codepagex_0_1_2
+        }:
+          buildMix {
+            name = "scrape";
+            version = "1.0.4";
+            src = fetchHex {
+              pkg = "scrape";
+              version = "1.0.4";
+              sha256 =
+                "ff26574b5ab5a6cf1f9aaa1369c2b9880bce2cf53b261a65160fdf9b4e11a361";
+            };
+            beamDeps  = [
+                          timex_1_0_0_rc4
+                          parallel_0_0_3
+                          httpoison_0_8_1
+                          floki_0_7_1
+                          codepagex_0_1_2
+                        ];
+
+            meta = {
+              description = ''Scrape any website, article or RSS/Atom feed with
+                            ease!'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/Anonyfox/elixir-scrape";
+            };
+          }
+      ) {};
+
+    scrape = scrape_1_0_4;
+
+    scrivener_1_1_2 = callPackage
+      (
+        {  buildMix, fetchHex, postgrex_0_11_1, ecto_2_0_0_beta_0 }:
+          buildMix {
+            name = "scrivener";
+            version = "1.1.2";
+            src = fetchHex {
+              pkg = "scrivener";
+              version = "1.1.2";
+              sha256 =
+                "9be46bdce0d8179ece431226eb9eddbe13bc158d647a3daee64a49bc26ca9dcf";
+            };
+            beamDeps  = [ postgrex_0_11_1 ecto_2_0_0_beta_0 ];
+
+            meta = {
+              description = ''Paginate your Ecto queries'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/drewolson/scrivener";
+            };
+          }
+      ) {};
+
+    scrivener = scrivener_1_1_2;
+
+    scrivener_html_1_0_8 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          scrivener_1_1_2,
+          phoenix_html_2_5_0,
+          phoenix_1_1_4
+        }:
+          buildMix {
+            name = "scrivener_html";
+            version = "1.0.8";
+            src = fetchHex {
+              pkg = "scrivener_html";
+              version = "1.0.8";
+              sha256 =
+                "1bea661f9940acae0ef28949c35e61dd1d314d0ac93c333ed85c7a37593a6406";
+            };
+            beamDeps  = [ scrivener_1_1_2 phoenix_html_2_5_0 phoenix_1_1_4 ];
+
+            meta = {
+              description = ''HTML helpers for Scrivener'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mgwidmann/scrivener_html";
+            };
+          }
+      ) {};
+
+    scrivener_html = scrivener_html_1_0_8;
+
+    secure_headers_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, pipe_0_0_2 }:
+          buildMix {
+            name = "secure_headers";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "secure_headers";
+              version = "0.0.1";
+              sha256 =
+                "df5ffa08c91a270da9a167edac6181c87a8467e7c98d65651bd6b1c928e75cb1";
+            };
+            beamDeps  = [ plug_1_1_1 pipe_0_0_2 ];
+
+            meta = {
+              description = ''HTTP Security Headers for Phoenix or Plug'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/anotherhale/secure_headers";
+            };
+          }
+      ) {};
+
+    secure_headers = secure_headers_0_0_1;
+
+    secure_password_0_3_1 = callPackage
+      (
+        {  buildMix, fetchHex, ecto_2_0_0_beta_0, comeonin_2_1_1 }:
+          buildMix {
+            name = "secure_password";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "secure_password";
+              version = "0.3.1";
+              sha256 =
+                "04d91c55486177940d480e802f28f8ee4b5ac6590ed1e0a3ab16603d39c35673";
+            };
+            beamDeps  = [ ecto_2_0_0_beta_0 comeonin_2_1_1 ];
+
+            meta = {
+              description = ''A port of Rails has_secure_password for Ecto
+                            models'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tuvistavie/ecto-secure-password";
+            };
+          }
+      ) {};
+
+    secure_password = secure_password_0_3_1;
+
+    secure_random_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "secure_random";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "secure_random";
+              version = "0.1.1";
+              sha256 =
+                "55fa172d9f606bbf43a775f5b34b0866c8bbf242acf7e1ff1eafec2c07fdcc53";
+            };
+
+            meta = {
+              description = ''A convienance library based on Ruy`s
+                            SecureRandom'';
+              license = stdenv.lib.licenses.asl20;
+              homepage =
+                "https://github.com/patricksrobertson/secure_random.ex";
+            };
+          }
+      ) {};
+
+    secure_random_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "secure_random";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "secure_random";
+              version = "0.2.0";
+              sha256 =
+                "d17b17f5b25e38359838ae61165d18724084796fcbdf3c18f09ee5876892c5a0";
+            };
+
+            meta = {
+              description = ''A convienance library based on Ruy`s
+                            SecureRandom'';
+              license = stdenv.lib.licenses.asl20;
+              homepage =
+                "https://github.com/patricksrobertson/secure_random.ex";
+            };
+          }
+      ) {};
+
+    secure_random = secure_random_0_2_0;
+
+    segment_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_3_1, httpotion_2_1_0 }:
+          buildMix {
+            name = "segment";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "segment";
+              version = "0.1.0";
+              sha256 =
+                "1747bf7a3f8d524d28890ce4499ef30a635f91c826d62e2b95711061faf02423";
+            };
+            beamDeps  = [ poison_1_3_1 httpotion_2_1_0 ];
+
+            meta = {
+              description = ''analytics_elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/stueccles/analytics-elixir";
+            };
+          }
+      ) {};
+
+    segment = segment_0_1_0;
+
+    select_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, mochiweb_2_12_2 }:
+          buildMix {
+            name = "select";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "select";
+              version = "0.0.1";
+              sha256 =
+                "9f579c2f342b51f6e42d414110a889c8b6a4430e49697b724ccdbbf8265853e9";
+            };
+            beamDeps  = [ mochiweb_2_12_2 ];
+
+            meta = {
+              longDescription = ''An Elixir library to extract useful data from
+                                HTML documents, suitable for web scraping.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/utkarshkukreti/select.ex";
+            };
+          }
+      ) {};
+
+    select = select_0_0_1;
+
+    semver_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "semver";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "semver";
+              version = "0.1.2";
+              sha256 =
+                "6e8150b94b1d5cbe3c31986a46cdc57c9af6f71f3747900280b2da7c0466a993";
+            };
+
+            meta = {
+              description = ''Utilities for working with semver.org-compliant
+                            version strings'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lee-dohm/semver";
+            };
+          }
+      ) {};
+
+    semver = semver_0_1_2;
+
+    sentient_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2 }:
+          buildMix {
+            name = "sentient";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "sentient";
+              version = "0.0.2";
+              sha256 =
+                "fb752b01c2eb4a729cbe8b8301acca5bcb75a242f12819b6a56f3be3c877c3ec";
+            };
+            beamDeps  = [ poison_1_5_2 ];
+
+            meta = {
+              description = ''Simple sentiment analysis based on the AFINN-111
+                            wordlist'';
+
+            };
+          }
+      ) {};
+
+    sentient = sentient_0_0_2;
+
+    sentinel_0_0_4 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          ueberauth_0_2_0,
+          secure_random_0_2_0,
+          postgrex_0_11_1,
+          phoenix_1_1_4,
+          jose_1_6_1,
+          guardian_db_0_4_0,
+          guardian_0_9_1,
+          ex_doc_0_11_4,
+          ecto_2_0_0_beta_0,
+          earmark_0_2_1,
+          cowboy_1_0_4,
+          comeonin_2_1_1
+        }:
+          buildMix {
+            name = "sentinel";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "sentinel";
+              version = "0.0.4";
+              sha256 =
+                "a97e13dd2c629eea7f5b6f2b818869e6f206a320eb3bfcfc9b315aa08cbeeac4";
+            };
+            beamDeps  = [
+                          ueberauth_0_2_0
+                          secure_random_0_2_0
+                          postgrex_0_11_1
+                          phoenix_1_1_4
+                          jose_1_6_1
+                          guardian_db_0_4_0
+                          guardian_0_9_1
+                          ex_doc_0_11_4
+                          ecto_2_0_0_beta_0
+                          earmark_0_2_1
+                          cowboy_1_0_4
+                          comeonin_2_1_1
+                        ];
+
+            meta = {
+              longDescription = ''Adds helpful extras to Guardian like default
+                                mailer support, as well as out of the box
+                                controllers and routes'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/britton-jb/sentinel";
+            };
+          }
+      ) {};
+
+    sentinel = sentinel_0_0_4;
+
+    sentry_0_3_2 = callPackage
+      (
+        {  buildMix, fetchHex, ecto_2_0_0_beta_0, comeonin_1_6_0 }:
+          buildMix {
+            name = "sentry";
+            version = "0.3.2";
+            src = fetchHex {
+              pkg = "sentry";
+              version = "0.3.2";
+              sha256 =
+                "fd4aa8c6b5d51b85e452a01292fbd437dfbfc5d37515c13f4a9a94441dc89609";
+            };
+            beamDeps  = [ ecto_2_0_0_beta_0 comeonin_1_6_0 ];
+
+            meta = {
+              description = ''Simplified authentication and authorization
+                            package for Phoenix'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/imranismail/sentry";
+            };
+          }
+      ) {};
+
+    sentry = sentry_0_3_2;
+
+    serial_0_1_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "serial";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "serial";
+              version = "0.1.2";
+              sha256 =
+                "c0aed287f565b7ce1e1091a6a3dd08fd99bf0884c81b53ecf978c502ef652231";
+            };
+
+            meta = {
+              description = ''Serial communication through Elixir ports'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/bitgamma/elixir_serial";
+            };
+          }
+      ) {};
+
+    serial = serial_0_1_2;
+
+    service_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
+          buildRebar3 {
+            name = "service";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "service";
+              version = "1.5.1";
+              sha256 =
+                "283d29bee5e2170a08c1eccb87f89368e9ce831cc52fb0715ed811f43847d2f8";
+            };
+
+            beamDeps  = [ cloudi_core_1_5_1 ];
+
+            meta = {
+              description = ''Erlang/Elixir Cloud Framework Service Behavior'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "http://cloudi.org";
+            };
+          }
+      ) {};
+
+    service = service_1_5_1;
+
+    setup_1_7_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "setup";
+            version = "1.7.0";
+            src = fetchHex {
+              pkg = "setup";
+              version = "1.7.0";
+              sha256 =
+                "50d9cd7862d15812d2fd96a688bd70d6b7df88bbbf42cab9f010bb0fd5c91baa";
+            };
+
+            meta = {
+              description = ''Generic setup application for Erlang-based
+                            systems'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/uwiger/setup";
+            };
+          }
+      ) {};
+
+    setup = setup_1_7_0;
+
+    sfmt_0_12_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "sfmt";
+            version = "0.12.2";
+            src = fetchHex {
+              pkg = "sfmt";
+              version = "0.12.2";
+              sha256 =
+                "8c541998bedb7d6bfe699ba6ee319f563190ead5a01f30c02ff504c20f4e8e2a";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''SIMD-oriented Fast Mersenne Twister (SFMT) for
+                            Erlang.'';
+              license = stdenv.lib.licenses.bsd2;
+              homepage = "https://github.com/jj1bdx/sfmt-erlang/";
+            };
+          }
+      ) {};
+
+    sfmt_0_13_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "sfmt";
+            version = "0.13.0";
+            src = fetchHex {
+              pkg = "sfmt";
+              version = "0.13.0";
+              sha256 =
+                "aaacd4824f2b3e439d360bcce6079863da1e7f564014602e9e7815f8740b6358";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''SIMD-oriented Fast Mersenne Twister (SFMT) for
+                            Erlang.'';
+              license = stdenv.lib.licenses.bsd2;
+              homepage = "https://github.com/jj1bdx/sfmt-erlang/";
+            };
+          }
+      ) {};
+
+    sfmt = sfmt_0_13_0;
+
+    sfsobject_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "sfsobject";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "sfsobject";
+              version = "0.0.3";
+              sha256 =
+                "fa30bf41d426d7dc899bd038ca44daf32c93e55452cfd0dc141eb6ded6d85f3c";
+            };
+
+            meta = {
+              description = ''Encode/decode SFSObjects'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/splattael/sfsobject";
+            };
+          }
+      ) {};
+
+    sfsobject = sfsobject_0_0_3;
+
+    sh_1_1_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "sh";
+            version = "1.1.2";
+            src = fetchHex {
+              pkg = "sh";
+              version = "1.1.2";
+              sha256 =
+                "78ec787a58d546ae915073978e9ad21a7b3e6187fb5b9c93922e6435542ae4c5";
+            };
+
+            meta = {
+              description = ''Run programs as functions in Elixir'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/devinus/sh";
+            };
+          }
+      ) {};
+
+    sh = sh_1_1_2;
+
+    shameless_plug_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1 }:
+          buildMix {
+            name = "shameless_plug";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "shameless_plug";
+              version = "1.0.0";
+              sha256 =
+                "65c8af34d1853e85c8412d6ca15fd39354668c09c124cbc8e35cffea59d3a617";
+            };
+            beamDeps  = [ plug_1_1_1 ];
+
+            meta = {
+              description = ''A novelty Plug to remove the word "shame" from
+                            the page body.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/henrik/shameless_plug";
+            };
+          }
+      ) {};
+
+    shameless_plug = shameless_plug_1_0_0;
+
+    shape_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "shape";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "shape";
+              version = "0.0.2";
+              sha256 =
+                "c2e990b68f3423110109bf7e6bbebe8c10307bb28778ebcf9f7d6e0b8dc854f2";
+            };
+
+            meta = {
+              description = ''A data validation library for Elixir based on
+                            Prismatoc Scheme'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/prio/shape";
+            };
+          }
+      ) {};
+
+    shape = shape_0_0_2;
+
+    short_maps_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "short_maps";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "short_maps";
+              version = "0.1.1";
+              sha256 =
+                "852170b9be988f51b7b8a920097238ab0847433c417a4bc3bea6cef3b013b2b8";
+            };
+
+            meta = {
+              description = ''Implementation of a ~m sigil for ES6-like maps in
+                            Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/whatyouhide/short_maps";
+            };
+          }
+      ) {};
+
+    short_maps = short_maps_0_1_1;
+
+    shotgun_0_2_2 = callPackage
+      (
+        {  buildRebar3, fetchHex, gun_1_0_0_pre_1 }:
+          buildRebar3 {
+            name = "shotgun";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "shotgun";
+              version = "0.2.2";
+              sha256 =
+                "d2993953cff0c82eb47744206ae171a141deeff84539fe2f58068e3909ae066c";
+            };
+
+            beamDeps  = [ gun_1_0_0_pre_1 ];
+
+            meta = {
+              description = ''better than just a gun'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/inaka/shotgun";
+            };
+          }
+      ) {};
+
+    shotgun_0_2_3 = callPackage
+      (
+        {  buildRebar3, fetchHex, gun_1_0_0_pre_1, cowlib_1_0_2 }:
+          buildRebar3 {
+            name = "shotgun";
+            version = "0.2.3";
+            src = fetchHex {
+              pkg = "shotgun";
+              version = "0.2.3";
+              sha256 =
+                "7b40dcf0faebf698fea541db5f6338f555d0c9c828493e9953d1748d9e5280b5";
+            };
+
+            beamDeps  = [ gun_1_0_0_pre_1 cowlib_1_0_2 ];
+
+            meta = {
+              description = ''better than just a gun'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/inaka/shotgun";
+            };
+          }
+      ) {};
+
+    shotgun = shotgun_0_2_3;
+
+    shouldi_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "shouldi";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "shouldi";
+              version = "0.3.0";
+              sha256 =
+                "1cc3706e7a7ce4e37f9893b3b49f1dc586f861ffd194f8170f118eaa324017d7";
+            };
+
+            meta = {
+              description = ''Elixir testing libraries with support for nested
+                            contexts'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/batate/shouldi";
+            };
+          }
+      ) {};
+
+    shouldi = shouldi_0_3_0;
+
+    shove_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poolboy_1_5_1, poison_1_5_2 }:
+          buildMix {
+            name = "shove";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "shove";
+              version = "0.0.1";
+              sha256 =
+                "48c7db56f6df92c8cd50ff5cfc73ce12d843e257991af6c3d4762f8af50bd87f";
+            };
+            beamDeps  = [ poolboy_1_5_1 poison_1_5_2 ];
+
+            meta = {
+              description = ''Push notifications for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bratsche/shove";
+            };
+          }
+      ) {};
+
+    shove = shove_0_0_1;
+
+    shrivel_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "shrivel";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "shrivel";
+              version = "0.0.3";
+              sha256 =
+                "c2a4874eed97044fe2bfa5e871f188a191b4042e72a6156cfd50c7c0d8296dbf";
+            };
+
+            meta = {
+              description = ''URL shortener'';
+
+              homepage = "https://github.com/Qeaql/shrivel";
+            };
+          }
+      ) {};
+
+    shrivel = shrivel_0_0_3;
+
+    sidejob_2_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "sidejob";
+            version = "2.0.0";
+            src = fetchHex {
+              pkg = "sidejob";
+              version = "2.0.0";
+              sha256 =
+                "19fea24060a1d0d37e78480fbd79d6b95e07f445aad725f7124a23194641c743";
+            };
+
+            meta = {
+              longDescription = ''sidejob is an Erlang library that implements
+                                a parallel, capacity-limited request pool. In
+                                sidejob, these pools are called resources. A
+                                resource is managed by multiple gen_server like
+                                processes which can be sent calls and casts
+                                using sidejob:call or sidejob:cast respectively.
+                                This library was originally written to support
+                                process bounding in Riak using the
+                                sidejob_supervisor behavior. In Riak, this is
+                                used to limit the number of concurrent get/put
+                                FSMs that can be active, failing client requests
+                                with {error, overload} if the limit is ever hit.
+                                The purpose being to provide a fail-safe
+                                mechanism during extreme overload scenarios. '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/basho/sidejob";
+            };
+          }
+      ) {};
+
+    sidejob = sidejob_2_0_0;
+
+    sidetask_1_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, sidejob_2_0_0 }:
+          buildMix {
+            name = "sidetask";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "sidetask";
+              version = "1.1.0";
+              sha256 =
+                "acf9f1620c003a13942cf607e360cfbfe57a3b5dcef1471653f4168891446d54";
+            };
+            beamDeps  = [ sidejob_2_0_0 ];
+
+            meta = {
+              longDescription = ''SideTask is an alternative to Elixir`s
+                                Task.Supervisor that uses Basho`s sidejob
+                                library for better parallelism and to support
+                                capacity limiting of Tasks. SideTask provides an
+                                API similar to Task.Supervisor, with the
+                                addition that all calls that start a new task
+                                require a sidejob resource as argument and can
+                                return `{:error, :overload}`. Convenience
+                                functions for adding and deleting sidejob
+                                resources are provided.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/MSch/sidetask";
+            };
+          }
+      ) {};
+
+    sidetask = sidetask_1_1_0;
+
+    signaturex_0_0_8 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "signaturex";
+            version = "0.0.8";
+            src = fetchHex {
+              pkg = "signaturex";
+              version = "0.0.8";
+              sha256 =
+                "5897373a265e41245a251d828e4782457f129d5c49179a29079ff86139beeb0e";
+            };
+
+            meta = {
+              description = ''Simple key/secret based authentication for
+                            APIs'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edgurgel/signaturex";
+            };
+          }
+      ) {};
+
+    signaturex_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "signaturex";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "signaturex";
+              version = "1.0.1";
+              sha256 =
+                "a8cb1b527026288dcb8d72a351e784c00cbd6e08964109595f08d85f41f022cc";
+            };
+
+            meta = {
+              description = ''Simple key/secret based authentication for
+                            APIs'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edgurgel/signaturex";
+            };
+          }
+      ) {};
+
+    signaturex = signaturex_1_0_1;
+
+    simetric_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "simetric";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "simetric";
+              version = "0.1.0";
+              sha256 =
+                "5a69a4b65670a0af0dba7e775b56e6995f2e599771ea360e87e28fd5b7eab3a9";
+            };
+
+            meta = {
+              longDescription = ''The library provides facilities to perform
+                                approximate string matching and measurement of
+                                string similarity/distance.'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/lexmag/simetric";
+            };
+          }
+      ) {};
+
+    simetric = simetric_0_1_0;
+
+    simple_agent_0_0_7 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "simple_agent";
+            version = "0.0.7";
+            src = fetchHex {
+              pkg = "simple_agent";
+              version = "0.0.7";
+              sha256 =
+                "23532eed173ab8e1a980095c5a1352e41d9f2a149005ed21b9d4f67859603ffe";
+            };
+
+            meta = {
+              description = ''A simplification/abstraction layer for the Agent
+                            module.'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/TheFirstAvenger/elixir-simple_agent.git";
+            };
+          }
+      ) {};
+
+    simple_agent = simple_agent_0_0_7;
+
+    simple_bar_0_0_7 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "simple_bar";
+            version = "0.0.7";
+            src = fetchHex {
+              pkg = "simple_bar";
+              version = "0.0.7";
+              sha256 =
+                "68fca76dee6fb1073e613e3498121b6a50739a2786f35d826309c55f55735ae1";
+            };
+
+            meta = {
+              description = ''The simplest cli progress bar'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jeffreybaird/simple_bar";
+            };
+          }
+      ) {};
+
+    simple_bar = simple_bar_0_0_7;
+
+    simple_format_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, phoenix_html_2_5_0 }:
+          buildMix {
+            name = "simple_format";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "simple_format";
+              version = "0.1.0";
+              sha256 =
+                "747cc74f743f89bcced219282f8639743f679b65183defecc7721f46e31dfcd0";
+            };
+            beamDeps  = [ phoenix_html_2_5_0 ];
+
+            meta = {
+              description = ''Rail`s simple_format helper for Phoenix.HTML'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/michalmuskala/simple_format";
+            };
+          }
+      ) {};
+
+    simple_format = simple_format_0_1_0;
+
+    simple_secrets_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, pkcs7_1_0_2, msgpax_0_8_2 }:
+          buildMix {
+            name = "simple_secrets";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "simple_secrets";
+              version = "1.0.0";
+              sha256 =
+                "797c98d49250fb343ed9a98411db641a3e5ae3344433f0a46d22dfec98bce11f";
+            };
+            beamDeps  = [ pkcs7_1_0_2 msgpax_0_8_2 ];
+
+            meta = {
+              description = ''A simple, opinionated library for encrypting
+                            small packets of data securely.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/camshaft/simple_secrets_ex";
+            };
+          }
+      ) {};
+
+    simple_secrets = simple_secrets_1_0_0;
+
+    simplex_0_4_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          timex_1_0_1,
+          sweet_xml_0_6_1,
+          poison_1_5_2,
+          ibrowse_4_2_2,
+          httpotion_2_2_0
+        }:
+          buildMix {
+            name = "simplex";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "simplex";
+              version = "0.4.0";
+              sha256 =
+                "43dfdc62aa2c4919464615b5acc4f03b028b3b9875fa72c128563e7d794ba2a2";
+            };
+            beamDeps  = [
+                          timex_1_0_1
+                          sweet_xml_0_6_1
+                          poison_1_5_2
+                          ibrowse_4_2_2
+                          httpotion_2_2_0
+                        ];
+
+            meta = {
+              description = ''An Elixir library for interacting with the Amazon
+                            SimpleDB API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/adamkittelson/simplex";
+            };
+          }
+      ) {};
+
+    simplex = simplex_0_4_0;
+
+    siphash_3_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "siphash";
+            version = "3.0.0";
+            src = fetchHex {
+              pkg = "siphash";
+              version = "3.0.0";
+              sha256 =
+                "91b8efc8f3e26713c1bb91a91c9b6a8f6a5f949986622b1d548e8fee1cde7347";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''Elixir implementation of the SipHash hash
+                            family'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zackehh/siphash-elixir";
+            };
+          }
+      ) {};
+
+    siphash = siphash_3_0_0;
+
+    sips_downloader_0_2_2 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          httpoison_0_8_1,
+          html_entities_0_3_0,
+          floki_0_7_1
+        }:
+          buildMix {
+            name = "sips_downloader";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "sips_downloader";
+              version = "0.2.2";
+              sha256 =
+                "358d10e61f2d8b03e644194d09f1ca6c9c339bb9c80371eba21576571a857f94";
+            };
+            beamDeps  = [ httpoison_0_8_1 html_entities_0_3_0 floki_0_7_1 ];
+
+            meta = {
+              description = ''Automatically download new ElixirSips episodes'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/DavsX/SipsDownloader";
+            };
+          }
+      ) {};
+
+    sips_downloader = sips_downloader_0_2_2;
+
+    skills_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "skills";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "skills";
+              version = "0.0.1";
+              sha256 =
+                "3845188cae5b6f43a8a9488a57831be8259ca83131ac0a1adfd24fbe846eb30f";
+            };
+
+            meta = {
+              description = ''A skill-based ranking algorithms library for
+                            Elixir. Includes Elo and TrueSkill.'';
+              license = stdenv.lib.licenses.mpl20;
+              homepage = "https://github.com/folz/skills.ex";
+            };
+          }
+      ) {};
+
+    skills = skills_0_0_1;
+
+    skroutz_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_1 }:
+          buildMix {
+            name = "skroutz";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "skroutz";
+              version = "0.0.1";
+              sha256 =
+                "08d6703c21e2371e68cae0c559d7a1ff119f767662e2f76a0f3a53551742721b";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Elixir library for accessing the Skroutz API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/skroutz/skroutz.ex";
+            };
+          }
+      ) {};
+
+    skroutz = skroutz_0_0_1;
+
+    slack_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_7_5, exjsx_3_1_0 }:
+          buildMix {
+            name = "slack";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "slack";
+              version = "0.3.0";
+              sha256 =
+                "43983932db6460a915822e12a0d499df5380804184bae3c170f9f918670f5454";
+            };
+            beamDeps  = [ httpoison_0_7_5 exjsx_3_1_0 ];
+
+            meta = {
+              description = ''A Slack Real Time Messaging API client.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/BlakeWilliams/Elixir-Slack";
+            };
+          }
+      ) {};
+
+    slack_0_4_2 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_1_0 }:
+          buildMix {
+            name = "slack";
+            version = "0.4.2";
+            src = fetchHex {
+              pkg = "slack";
+              version = "0.4.2";
+              sha256 =
+                "a32ced7527706b6adaae428eb03836260bdcf560be6ef92662ea6ec1541e687f";
+            };
+            beamDeps  = [ httpoison_0_8_1 exjsx_3_1_0 ];
+
+            meta = {
+              description = ''A Slack Real Time Messaging API client.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/BlakeWilliams/Elixir-Slack";
+            };
+          }
+      ) {};
+
+    slack = slack_0_4_2;
+
+    slack_webhook_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_7_5 }:
+          buildMix {
+            name = "slack_webhook";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "slack_webhook";
+              version = "0.0.2";
+              sha256 =
+                "7099c22a5b07fd47914a5336469e3696ebe5d5402798ba1e06eec7287d5551ad";
+            };
+            beamDeps  = [ httpoison_0_7_5 ];
+
+            meta = {
+              description = ''Sends simple messages to Slack channel using
+                            webhook API.'';
+              license = stdenv.lib.licenses.cc0;
+              homepage = "https://github.com/remiq/slack_webhook";
+            };
+          }
+      ) {};
+
+    slack_webhook = slack_webhook_0_0_2;
+
+    slacker_0_0_2 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_1_5_2, inflex_1_0_0, httpoison_0_8_1
+        }:
+          buildMix {
+            name = "slacker";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "slacker";
+              version = "0.0.2";
+              sha256 =
+                "4d3a110772e7b273a6d771bf4bc869fd13cb3bb9e99bca8f038e58d384f0ef1b";
+            };
+            beamDeps  = [ poison_1_5_2 inflex_1_0_0 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''A bot library for the Slack chat service.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/koudelka/slacker";
+            };
+          }
+      ) {};
+
+    slacker = slacker_0_0_2;
+
+    slackex_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_2_0 }:
+          buildMix {
+            name = "slackex";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "slackex";
+              version = "0.0.1";
+              sha256 =
+                "bdd1d523cd576ff054ed3eee4efe22eee87ded127054332ca5a3bc1d6a997f33";
+            };
+            beamDeps  = [ httpoison_0_8_1 exjsx_3_2_0 ];
+
+            meta = {
+              longDescription = ''A Slack wrapper for Elixir Requires an active
+                                account with Slack (http://slack.com).'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/davidstump/slackex";
+            };
+          }
+      ) {};
+
+    slackex = slackex_0_0_1;
+
+    slim_fast_0_10_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "slim_fast";
+            version = "0.10.0";
+            src = fetchHex {
+              pkg = "slim_fast";
+              version = "0.10.0";
+              sha256 =
+                "aae7eb1573c1ee98f5fa11098d758b80b35f4d67e6e5f81135ae4d66cb571c44";
+            };
+
+            meta = {
+              description = ''An Elixir library for rendering slim
+                            templates.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/doomspork/slim_fast";
+            };
+          }
+      ) {};
+
+    slim_fast = slim_fast_0_10_0;
+
+    slime_0_12_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "slime";
+            version = "0.12.1";
+            src = fetchHex {
+              pkg = "slime";
+              version = "0.12.1";
+              sha256 =
+                "0a2f92f2f7523118efadcb20fe54611ddfb65428c6a21b69182fc247e361dc1e";
+            };
+
+            meta = {
+              description = ''An Elixir library for rendering Slim-like
+                            templates.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/slime-lang/slime";
+            };
+          }
+      ) {};
+
+    slime = slime_0_12_1;
+
+    slp_0_0_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "slp";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "slp";
+              version = "0.0.2";
+              sha256 =
+                "27e5f7330c7ce631f16e3ec5781b31cbb2247d2bcdeab1e979a66dcc4397bd77";
+            };
+
+            meta = {
+              longDescription = ''An Elixir application for using the Service
+                                Location Protocol. SLP is a commonly used
+                                service discovery protocol.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/stuart/elixir_slp";
+            };
+          }
+      ) {};
+
+    slp = slp_0_0_2;
+
+    slugger_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "slugger";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "slugger";
+              version = "0.1.0";
+              sha256 =
+                "c74ef1f09acd6952591d89ab6747b337aaec9624e57623ca3a7b9e2cf536a8a3";
+            };
+
+            meta = {
+              longDescription = ''The library Slugger can generate slugs from
+                                given strings that can be used in URLs or file
+                                names.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/h4cc/slugger";
+            };
+          }
+      ) {};
+
+    slugger = slugger_0_1_0;
+
+    smex_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, murmur_1_0_0, amqp_0_1_4 }:
+          buildMix {
+            name = "smex";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "smex";
+              version = "0.0.1";
+              sha256 =
+                "3a84a2b3b3f09965bb0c2d57d04ba435b33c47319ee308feb4a182ddd9e69867";
+            };
+            beamDeps  = [ murmur_1_0_0 amqp_0_1_4 ];
+
+            meta = {
+              description = ''An Elixir library for simplifying the sending of
+                            protocol buffers over rabbitmq.'';
+
+            };
+          }
+      ) {};
+
+    smex = smex_0_0_1;
+
+    smurf_0_1_3 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "smurf";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "smurf";
+              version = "0.1.3";
+              sha256 =
+                "5ed8e18ec8eea0647e7e938ce15cc76e59497d0a259cea15124520a48f0d6be6";
+            };
+
+            meta = {
+              description = ''SMF interfacing library for erlang'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/project-fifo/smurf";
+            };
+          }
+      ) {};
+
+    smurf = smurf_0_1_3;
+
+    snappy_1_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "snappy";
+            version = "1.1.1";
+            src = fetchHex {
+              pkg = "snappy";
+              version = "1.1.1";
+              sha256 =
+                "7faed3ec6bcac363c2a6f09b4f000a12c8166b42b3bf70228d532f8afcfbcb6a";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''snappy compressor/decompressor Erlang NIF
+                            wrapper'';
+
+              homepage = "https://github.com/barrel-db/snappy";
+            };
+          }
+      ) {};
+
+    snappy = snappy_1_1_1;
+
+    socket_0_2_8 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "socket";
+            version = "0.2.8";
+            src = fetchHex {
+              pkg = "socket";
+              version = "0.2.8";
+              sha256 =
+                "dc711caa318c31eea35e0cfec62e9a376fda6c1365356de59d9a78a4ebb635c9";
+            };
+
+            meta = {
+              description = ''Socket handling library for Elixir'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/meh/elixir-socket";
+            };
+          }
+      ) {};
+
+    socket_0_3_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "socket";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "socket";
+              version = "0.3.1";
+              sha256 =
+                "f016b4e0c2643926cce846b6a744b0cd7c8352106052dcb7c396bf1b7f55d21c";
+            };
+
+            meta = {
+              description = ''Socket handling library for Elixir'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/meh/elixir-socket";
+            };
+          }
+      ) {};
+
+    socket = socket_0_3_1;
+
+    sorted_set_1_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, red_black_tree_1_2_0 }:
+          buildMix {
+            name = "sorted_set";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "sorted_set";
+              version = "1.1.0";
+              sha256 =
+                "2c2c119554e02d8c813fd9511a8417b20f8efd3c27fa4ab722ba733140fb9a46";
+            };
+            beamDeps  = [ red_black_tree_1_2_0 ];
+
+            meta = {
+              description = ''SortedSet implementation for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/SenecaSystems/sorted_set";
+            };
+          }
+      ) {};
+
+    sorted_set = sorted_set_1_1_0;
+
+    spaceapi_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0 }:
+          buildMix {
+            name = "spaceapi";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "spaceapi";
+              version = "0.1.2";
+              sha256 =
+                "2d9f7da251e3d6dfd33248173622166afb6ecb28dc6286191ab178d85117584d";
+            };
+            beamDeps  = [ poison_2_1_0 ];
+
+            meta = {
+              description = ''A small Elixir package for parsing the Space
+                            API'';
+              license = with stdenv.lib.licenses; [ mit gpl3 ];
+              homepage = "https://github.com/geistesk/spaceapi";
+            };
+          }
+      ) {};
+
+    spaceapi = spaceapi_0_1_2;
+
+    spaced_repetitions_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, timex_0_16_2 }:
+          buildMix {
+            name = "spaced_repetitions";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "spaced_repetitions";
+              version = "0.0.1";
+              sha256 =
+                "67e846a7fe32d7ab5b10373dd9f80eccccacc05ad2b9f3e6ca3de09da8b8abc5";
+            };
+            beamDeps  = [ timex_0_16_2 ];
+
+            meta = {
+              description = ''Spaced repetitions library with basic sm2
+                            implementation'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mrluc/exreps";
+            };
+          }
+      ) {};
+
+    spaced_repetitions = spaced_repetitions_0_0_1;
+
+    sparkpost_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpotion_2_1_0 }:
+          buildMix {
+            name = "sparkpost";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "sparkpost";
+              version = "0.1.0";
+              sha256 =
+                "704fa320132235db00c4b40b6990e63ec3c2581d681d86c0765ef930c88a2694";
+            };
+            beamDeps  = [ poison_1_5_2 httpotion_2_1_0 ];
+
+            meta = {
+              description = ''The official Elixir package for the SparkPost
+                            API'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/SparkPost/elixir-sparkpost";
+            };
+          }
+      ) {};
+
+    sparkpost = sparkpost_0_1_0;
+
+    spawndir_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, exrm_0_15_1 }:
+          buildMix {
+            name = "spawndir";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "spawndir";
+              version = "0.1.1";
+              sha256 =
+                "c407c9eb1f6f8ebb622df28b2f19a34447add6555f87208446a458b60ea9750c";
+            };
+            beamDeps  = [ exrm_0_15_1 ];
+
+            meta = {
+              longDescription = ''# SpawnDir Spawns commands from the file
+                                system. This exists to provide a simple
+                                mechanism for spawning and managing processes:
+                                simply add an executable, or a symbolic link to
+                                one, to a monitored directory. The config allows
+                                arguments to be specified by file or directory.
+                                While not as flexible as upstart, monit, et al.,
+                                SpawnDir`s use of the filesystem provides a
+                                simpler UNIX-ish interface. ## Usage To use the
+                                escript executable: ./spawndir DIR [ARGS ...]
+                                where `DIR` is the directory to be monitored,
+                                and each command will be started with the
+                                supplied `ARGS` To run using mix: mix run
+                                --no-halt You can configure what is watched via
+                                the `:spawndir` application environment
+                                variables: :default_opts :: [opt] :watch :: [cmd
+                                | {cmd, [opt]}] where opt :: string() cmd ::
+                                string() ## Future Additions - Check for
+                                executable flag - Package installation - Monitor
+                                filesystem for commands being added/removed
+                                Copyright (c) Thomas Moulia, 2014 '';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/jtmoulia/spawndir";
+            };
+          }
+      ) {};
+
+    spawndir = spawndir_0_1_1;
+
+    spell_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_4_0, msgpax_0_8_2 }:
+          buildMix {
+            name = "spell";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "spell";
+              version = "0.1.0";
+              sha256 =
+                "c768ada54d3cbda57d63344b0b9c91520362700dde4b939a825358f01f1dbfa9";
+            };
+            beamDeps  = [ poison_1_4_0 msgpax_0_8_2 ];
+
+            meta = {
+              longDescription = ''Spell is an extensible Elixir WAMP client.
+                                Spell supports the client subscriber, publisher,
+                                callee, and caller roles.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/MyMedsAndMe/spell";
+            };
+          }
+      ) {};
+
+    spell = spell_0_1_0;
+
+    spf_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "spf";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "spf";
+              version = "0.0.1";
+              sha256 =
+                "64126066eaac871e08a1ece2721e0fccb36220b28a4c6b03f08f0d4d459909a3";
+            };
+
+            meta = {
+              description = ''SPF implementation in Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/hex-sh/spf";
+            };
+          }
+      ) {};
+
+    spf = spf_0_0_1;
+
+    spherical_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "spherical";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "spherical";
+              version = "0.0.1";
+              sha256 =
+                "eaa7f1a4d265a0a6d0b8e23b530882dda0e68e35780a5af50ac6a2d9d2ba2fac";
+            };
+
+            meta = {
+              description = ''An spherical geometry library for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/arpunk/spherical";
+            };
+          }
+      ) {};
+
+    spherical = spherical_0_0_1;
+
+    spirit_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, plug_0_14_0, cowboy_1_0_4 }:
+          buildMix {
+            name = "spirit";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "spirit";
+              version = "0.0.1";
+              sha256 =
+                "ffaa22ccfd4999eacaee60464eb494bb9da597a8dad0dcad575fb506e06ee3b6";
+            };
+            beamDeps  = [ poison_1_5_2 plug_0_14_0 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Elixir microframework for web development.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/emancu/spirit";
+            };
+          }
+      ) {};
+
+    spirit = spirit_0_0_1;
+
+    spotify_ex_0_0_4 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_1_5_2, plug_1_1_1, httpoison_0_8_1
+        }:
+          buildMix {
+            name = "spotify_ex";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "spotify_ex";
+              version = "0.0.4";
+              sha256 =
+                "f2e8647410096d34d9baecf8d9622896214320641ed72c11c711f9a463e4a961";
+            };
+            beamDeps  = [ poison_1_5_2 plug_1_1_1 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''An Elixir wrapper for Spotify API O-Auth.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://www.github.com/jsncmgs1/spotify_ex";
+            };
+          }
+      ) {};
+
+    spotify_ex = spotify_ex_0_0_4;
+
+    spreedly_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "spreedly";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "spreedly";
+              version = "0.1.1";
+              sha256 =
+                "a8aa76698a4fe95cb4c5cb77be2cfc4e085685570aacb25382fffdca4c7e1a6f";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''A wrapper for the Spreedly API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/duff/spreedly-elixir";
+            };
+          }
+      ) {};
+
+    spreedly = spreedly_0_1_1;
+
+    sql_dust_0_1_5 = callPackage
+      (
+        {  buildMix, fetchHex, inflex_1_5_0, ecto_2_0_0_beta_0 }:
+          buildMix {
+            name = "sql_dust";
+            version = "0.1.5";
+            src = fetchHex {
+              pkg = "sql_dust";
+              version = "0.1.5";
+              sha256 =
+                "8b8ec15b23c964e74e020cc7bd9ff9456d302ceb173465ebd0cc04c10bc3775d";
+            };
+            beamDeps  = [ inflex_1_5_0 ecto_2_0_0_beta_0 ];
+
+            meta = {
+              longDescription = ''Easy. Simple. Powerful. Generate (complex)
+                                SQL queries using magical Elixir SQL dust.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bettyblocks/sql_dust";
+            };
+          }
+      ) {};
+
+    sql_dust = sql_dust_0_1_5;
+
+    sqlite3_1_1_5 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "sqlite3";
+            version = "1.1.5";
+            src = fetchHex {
+              pkg = "sqlite3";
+              version = "1.1.5";
+              sha256 =
+                "fc2beb8b09deec6cf68bd6203ecf28bf827d2073915bc7131c9cd56d5ff27260";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''SQLite3 Interface'';
+              license = stdenv.lib.licenses.epl10;
+              homepage = "https://github.com/processone/erlang-sqlite3";
+            };
+          }
+      ) {};
+
+    sqlite3 = sqlite3_1_1_5;
+
+    sqlite_ecto_1_1_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          sqlitex_0_8_2,
+          poison_1_5_2,
+          ecto_2_0_0_beta_0
+        }:
+          buildMix {
+            name = "sqlite_ecto";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "sqlite_ecto";
+              version = "1.1.0";
+              sha256 =
+                "88951b424e909d8047f0d03c13418c321df9e94560ac30241d8b1f7e48f49201";
+            };
+            beamDeps  = [ sqlitex_0_8_2 poison_1_5_2 ecto_2_0_0_beta_0 ];
+
+            meta = {
+              description = ''SQLite3 adapter for Ecto'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jazzyb/sqlite_ecto";
+            };
+          }
+      ) {};
+
+    sqlite_ecto = sqlite_ecto_1_1_0;
+
+    sqlitex_0_8_2 = callPackage
+      (
+        {
+          buildMix, fetchHex, pipe_0_0_2, esqlite_0_2_2, decimal_1_1_1
+        }:
+          buildMix {
+            name = "sqlitex";
+            version = "0.8.2";
+            src = fetchHex {
+              pkg = "sqlitex";
+              version = "0.8.2";
+              sha256 =
+                "8485c24f945ce9c04ad894aff14cb965dcae3e93e08fbdca51a18ea85e9719df";
+            };
+            beamDeps  = [ pipe_0_0_2 esqlite_0_2_2 decimal_1_1_1 ];
+
+            meta = {
+              description = ''A thin Elixir wrapper around esqlite'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mmmries/sqlitex";
+            };
+          }
+      ) {};
+
+    sqlitex = sqlitex_0_8_2;
+
+    ssdb_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ssdb";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "ssdb";
+              version = "0.3.0";
+              sha256 =
+                "a6b71533949a38ef193ccded89d620d2b6808b1b55a2e0f16dae7e1abad9874f";
+            };
+
+            meta = {
+              description = ''SSDB client for Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/lidashuang/ssdb-elixir";
+            };
+          }
+      ) {};
+
+    ssdb = ssdb_0_3_0;
+
+    ssdb_elixir_0_2_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ssdb_elixir";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "ssdb_elixir";
+              version = "0.2.2";
+              sha256 =
+                "3aa4d2b90b4a4c0f73b1fec3e67b90dfee081bce4653f942a05857082b65bc99";
+            };
+
+            meta = {
+              description = ''SSDB client for Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/lidashuang/ssdb_elixir";
+            };
+          }
+      ) {};
+
+    ssdb_elixir = ssdb_elixir_0_2_2;
+
+    sshex_1_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "sshex";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "sshex";
+              version = "1.1.0";
+              sha256 =
+                "4e4415547e9dde608d08bf7fff094b6705614a584089356ffbdb6f97821f49ff";
+            };
+
+            meta = {
+              description = ''Simple SSH helpers for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rubencaro/sshex";
+            };
+          }
+      ) {};
+
+    sshex_2_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "sshex";
+            version = "2.1.0";
+            src = fetchHex {
+              pkg = "sshex";
+              version = "2.1.0";
+              sha256 =
+                "303bd8fd007bf2d10ddfae83b74acafc747f24908c2590b098ba2e85c570c58b";
+            };
+
+            meta = {
+              description = ''Simple SSH helpers for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rubencaro/sshex";
+            };
+          }
+      ) {};
+
+    sshex = sshex_2_1_0;
+
+    ssl_verify_hostname_1_0_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "ssl_verify_hostname";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "ssl_verify_hostname";
+              version = "1.0.1";
+              sha256 =
+                "630baab6b1dd68f516b779353b368e4c605f1a022f3e544833b1667fdd321493";
+            };
+
+            meta = {
+              description = ''Hostname verification library for Erlang'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/deadtrickster/ssl_verify_hostname.erl";
+            };
+          }
+      ) {};
+
+    ssl_verify_hostname_1_0_5 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "ssl_verify_hostname";
+            version = "1.0.5";
+            src = fetchHex {
+              pkg = "ssl_verify_hostname";
+              version = "1.0.5";
+              sha256 =
+                "f2cb11e6144e10ab39d1e14bf9fb2437b690979c70bf5428e9dc4bfaf1dfeabf";
+            };
+
+            meta = {
+              description = ''Hostname verification library for Erlang'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/deadtrickster/ssl_verify_hostname.erl";
+            };
+          }
+      ) {};
+
+    ssl_verify_hostname_1_0_6 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "ssl_verify_hostname";
+            version = "1.0.6";
+            src = fetchHex {
+              pkg = "ssl_verify_hostname";
+              version = "1.0.6";
+              sha256 =
+                "72b2fc8a8e23d77eed4441137fefa491bbf4a6dc52e9c0045f3f8e92e66243b5";
+            };
+
+            meta = {
+              description = ''Hostname verification library for Erlang'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/deadtrickster/ssl_verify_hostname.erl";
+            };
+          }
+      ) {};
+
+    ssl_verify_hostname = ssl_verify_hostname_1_0_6;
+
+    stackd_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "stackd";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "stackd";
+              version = "0.0.1";
+              sha256 =
+                "41749dc834f92af4954988b5e9155d45fcbf63224ecfcabce6f1fc80f3aff8f9";
+            };
+
+            meta = {
+              description = ''Stackd'';
+
+            };
+          }
+      ) {};
+
+    stackd = stackd_0_0_1;
+
+    stash_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "stash";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "stash";
+              version = "1.0.0";
+              sha256 =
+                "ac68a470ed2a292b59c1dbf286a97e8b25ec72adaeeb3734c183dc54b659f7d6";
+            };
+
+            meta = {
+              description = ''Simple ETS backed key/value store for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zackehh/stash";
+            };
+          }
+      ) {};
+
+    stash = stash_1_0_0;
+
+    statistics_0_4_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "statistics";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "statistics";
+              version = "0.4.0";
+              sha256 =
+                "550390b85fcb32dcf2e3498b06076352aa332b0a5002830b0438bb3fdb8da37a";
+            };
+
+            meta = {
+              description = ''Functions for descriptive statistics and common
+                            distributions'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/msharp/elixir-statistics";
+            };
+          }
+      ) {};
+
+    statistics = statistics_0_4_0;
+
+    statix_0_7_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "statix";
+            version = "0.7.0";
+            src = fetchHex {
+              pkg = "statix";
+              version = "0.7.0";
+              sha256 =
+                "0439c5698eaef7c2de213d9bff5681eeccc1dec789931e9ae73b9d2b2968234b";
+            };
+
+            meta = {
+              description = ''An Elixir client for StatsD compatible
+                            servers.'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/lexmag/statix";
+            };
+          }
+      ) {};
+
+    statix = statix_0_7_0;
+
+    std_json_io_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          porcelain_2_0_1,
+          poolboy_1_5_1,
+          poison_1_5_2,
+          fs_0_9_2
+        }:
+          buildMix {
+            name = "std_json_io";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "std_json_io";
+              version = "0.1.0";
+              sha256 =
+                "14f1c18c31a0b0b3ffb1e654247925335059eec9c800d81dd6379166e7403d1e";
+            };
+            beamDeps  = [ porcelain_2_0_1 poolboy_1_5_1 poison_1_5_2 fs_0_9_2
+                      ];
+
+            meta = {
+              description = ''Application for managing and communicating with
+                            IO servers via JSON'';
+
+            };
+          }
+      ) {};
+
+    std_json_io = std_json_io_0_1_0;
+
+    steamex_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, sweet_xml_0_4_0, httpoison_0_7_5 }:
+          buildMix {
+            name = "steamex";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "steamex";
+              version = "0.0.3";
+              sha256 =
+                "4e9a5da88acb54897593dadc3e8a4cbdae86a31e7662888105463d20c0430dd8";
+            };
+            beamDeps  = [ sweet_xml_0_4_0 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''Steam API and Auth (with Phoenix/Plug
+                            integration) for Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/antipax/steamex";
+            };
+          }
+      ) {};
+
+    steamex = steamex_0_0_3;
+
+    stemex_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "stemex";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "stemex";
+              version = "0.1.1";
+              sha256 =
+                "219b8e81fedba5a9bb978b8f7eaf230e77f2702d58e409adcca998fde1788521";
+            };
+
+            meta = {
+              longDescription = ''Stemex is a NIF wrapper above snowball
+                                containing stemmers for : danish, dutch,
+                                english, finnish, french, german, hungarian,
+                                italian, kraaij_pohlmann, lovins, norwegian,
+                                portuguese, romanian, russian, spanish, swedish,
+                                turkish.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/awetzel/stemex";
+            };
+          }
+      ) {};
+
+    stemex = stemex_0_1_1;
+
+    stmd_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, ex_doc_0_11_4, earmark_0_2_1 }:
+          buildMix {
+            name = "stmd";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "stmd";
+              version = "0.0.2";
+              sha256 =
+                "3b45578da652e881b1974bbe836d9b8e0e8db8d6ef0042aee69340d5eaf2d9b3";
+            };
+            beamDeps  = [ ex_doc_0_11_4 earmark_0_2_1 ];
+
+            meta = {
+              description = ''[DEPRECATED] New package: cmark'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/asaaki/cmark.ex";
+            };
+          }
+      ) {};
+
+    stmd = stmd_0_0_2;
+
+    stockastic_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_2_0 }:
+          buildMix {
+            name = "stockastic";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "stockastic";
+              version = "0.0.2";
+              sha256 =
+                "f180915a21d4aa4a64f660696b77c5788334d4bae2639a58814565af0d75ca56";
+            };
+            beamDeps  = [ httpoison_0_8_1 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''Simple Elixir wrapper for the Stockfighter API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/shanewilton/stockastic";
+            };
+          }
+      ) {};
+
+    stockastic = stockastic_0_0_2;
+
+    stockfighter_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "stockfighter";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "stockfighter";
+              version = "0.0.1";
+              sha256 =
+                "d72726cf055068e2b62ef9091ec17ab9292b60bc7f4a7306c17cad6d022a3bd7";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''a simple wrapper of stockfighter http api'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lerencao/stockfighter";
+            };
+          }
+      ) {};
+
+    stockfighter = stockfighter_0_0_1;
+
+    stopwatch_0_0_7 = callPackage
+      (
+        {  buildMix, fetchHex, timex_1_0_1 }:
+          buildMix {
+            name = "stopwatch";
+            version = "0.0.7";
+            src = fetchHex {
+              pkg = "stopwatch";
+              version = "0.0.7";
+              sha256 =
+                "de20ad70ca3b0f70d0a2000858e80c0afd4163101e18d0428ee62a58e7c8360a";
+            };
+            beamDeps  = [ timex_1_0_1 ];
+
+            meta = {
+              description = ''The stopwatch provides an easy api to measure
+                            elapsed time and profile code.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/matteosister/stopwatch";
+            };
+          }
+      ) {};
+
+    stopwatch = stopwatch_0_0_7;
+
+    stream_runner_1_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "stream_runner";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "stream_runner";
+              version = "1.1.0";
+              sha256 =
+                "3c2da3658440ba57224cd484de4b0d8b128e5463413ac05285cdfa4b37e30798";
+            };
+
+            meta = {
+              description = ''Run a Stream as a process'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/fishcakez/stream_runner";
+            };
+          }
+      ) {};
+
+    stream_runner = stream_runner_1_1_0;
+
+    stream_weaver_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "stream_weaver";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "stream_weaver";
+              version = "0.0.2";
+              sha256 =
+                "6664a585d4afaac63e69f367e79bcc6af886dbebd1f8b66a099f6164973dc168";
+            };
+
+            meta = {
+              description = ''Library for working with streams'';
+
+            };
+          }
+      ) {};
+
+    stream_weaver = stream_weaver_0_0_2;
+
+    strftimerl_0_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "strftimerl";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "strftimerl";
+              version = "0.1.1";
+              sha256 =
+                "c09c7cd6a421bcbc1020c1440a2e73e312b852adbb3034d11f3dffa27d7953b1";
+            };
+
+            meta = {
+              description = ''strftime formatting in erlang'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/gmr/strftimerl";
+            };
+          }
+      ) {};
+
+    strftimerl = strftimerl_0_1_1;
+
+    strict_comparison_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "strict_comparison";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "strict_comparison";
+              version = "0.0.1";
+              sha256 =
+                "c033d7c5befc4971171a20c8fce96ae04fc0ebf0bae790b7ee0e7498f9d7997e";
+            };
+
+            meta = {
+              description = ''Provides strict number comparison in both regular
+                            code and guards.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/antipax/strict_comparison";
+            };
+          }
+      ) {};
+
+    strict_comparison = strict_comparison_0_0_1;
+
+    stringprep_1_0_2 = callPackage
+      (
+        {  buildRebar3, fetchHex, p1_utils_1_0_3 }:
+          buildRebar3 {
+            name = "stringprep";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "stringprep";
+              version = "1.0.2";
+              sha256 =
+                "6990e6d9d9bc241a77ceb54d4afd7332319710dbebdae8f4f0c627186194c520";
+            };
+            compilePorts = true;
+            beamDeps  = [ p1_utils_1_0_3 ];
+
+            meta = {
+              description = ''Fast Stringprep Erlang / Elixir implementation'';
+              license = with stdenv.lib.licenses; [ asl20 free ];
+              homepage = "https://github.com/processone/stringprep";
+            };
+          }
+      ) {};
+
+    stringprep = stringprep_1_0_2;
+
+    stripe_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, jazz_0_2_1, httpotion_1_0_0 }:
+          buildMix {
+            name = "stripe";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "stripe";
+              version = "0.0.1";
+              sha256 =
+                "99f9920ce562109abb70a1998a4f6b5bcd07f5063237cf28dd81387163df3f02";
+            };
+            beamDeps  = [ jazz_0_2_1 httpotion_1_0_0 ];
+
+            meta = {
+              longDescription = ''Wrapper around Stripe`s API. Full
+                                documentation can be found at
+                                https://stripe.com/docs/api '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/SenecaSystems/stripe";
+            };
+          }
+      ) {};
+
+    stripe = stripe_0_0_1;
+
+    stripex_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, gateway_0_0_6 }:
+          buildMix {
+            name = "stripex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "stripex";
+              version = "0.1.0";
+              sha256 =
+                "49959c78e677d3e30edd808cce7a013a7120f337705d0e2fd646c000d9b30853";
+            };
+            beamDeps  = [ gateway_0_0_6 ];
+
+            meta = {
+              longDescription = ''A much more ruby-stripe-like wrapper around
+                                Stripe`s API (built with Poison). Full
+                                documentation can be found at
+                                https://stripe.com/docs/api'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/foxnewsnetwork/stripex";
+            };
+          }
+      ) {};
+
+    stripex = stripex_0_1_0;
+
+    stripity_stripe_1_2_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_1,
+          hackney_1_4_8,
+          earmark_0_2_1
+        }:
+          buildMix {
+            name = "stripity_stripe";
+            version = "1.2.0";
+            src = fetchHex {
+              pkg = "stripity_stripe";
+              version = "1.2.0";
+              sha256 =
+                "25cb8c92ce83354a8d160514f183167a6c67ec3f1221e925cff3750da0fe4cd6";
+            };
+            beamDeps  = [
+                          poison_1_5_2
+                          httpoison_0_8_1
+                          hackney_1_4_8
+                          earmark_0_2_1
+                        ];
+
+            meta = {
+              description = ''A Stripe Library for Elixir'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/robconery/stripity-stripe";
+            };
+          }
+      ) {};
+
+    stripity_stripe = stripity_stripe_1_2_0;
+
+    struct_fields_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "struct_fields";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "struct_fields";
+              version = "0.2.0";
+              sha256 =
+                "245be58f06535a05247b6539e2640eb649c25eb896010452f2ee43b5e2604b72";
+            };
+
+            meta = {
+              description = ''Tiny module to easily get a list of fields for
+                            structs.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nTraum/struct_fields";
+            };
+          }
+      ) {};
+
+    struct_fields = struct_fields_0_2_0;
+
+    structurez_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "structurez";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "structurez";
+              version = "0.0.1";
+              sha256 =
+                "acacce1dfcd92854e75f891468c264689aa8223c21c88064f5c6883e11f3ae12";
+            };
+
+            meta = {
+              description = ''Additional Data Structures for use in Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/hamiltop/structurez";
+            };
+          }
+      ) {};
+
+    structurez = structurez_0_0_1;
+
+    stun_1_0_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, p1_utils_1_0_3, fast_tls_1_0_1 }:
+          buildRebar3 {
+            name = "stun";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "stun";
+              version = "1.0.1";
+              sha256 =
+                "77c9713436dd51e334698ce1de3e17e3601552c40ced76e2bd321eb5eaa33374";
+            };
+
+            beamDeps  = [ p1_utils_1_0_3 fast_tls_1_0_1 ];
+
+            meta = {
+              description = ''STUN and TURN library for Erlang / Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/processone/stun";
+            };
+          }
+      ) {};
+
+    stun = stun_1_0_1;
+
+    sugar_0_4_10 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          templates_0_0_5,
+          postgrex_0_11_1,
+          poison_1_5_2,
+          plugs_0_1_0,
+          plug_1_1_1,
+          http_router_0_0_8,
+          ecto_2_0_0_beta_0,
+          cowboy_1_0_4
+        }:
+          buildMix {
+            name = "sugar";
+            version = "0.4.10";
+            src = fetchHex {
+              pkg = "sugar";
+              version = "0.4.10";
+              sha256 =
+                "6a0fe8e12032aa4c8932801c000bb361ddec4ea6cb64e756e56e26306ea08a99";
+            };
+            beamDeps  = [
+                          templates_0_0_5
+                          postgrex_0_11_1
+                          poison_1_5_2
+                          plugs_0_1_0
+                          plug_1_1_1
+                          http_router_0_0_8
+                          ecto_2_0_0_beta_0
+                          cowboy_1_0_4
+                        ];
+
+            meta = {
+              description = ''Modular web framework'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sugar-framework/sugar";
+            };
+          }
+      ) {};
+
+    sugar = sugar_0_4_10;
+
+    supermemo_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, timex_0_13_5 }:
+          buildMix {
+            name = "supermemo";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "supermemo";
+              version = "1.0.0";
+              sha256 =
+                "d8afa9ed4f8d18d835eb60b68c36ef4ee8489d0abed5051fde20dc433ea8a076";
+            };
+            beamDeps  = [ timex_0_13_5 ];
+
+            meta = {
+              longDescription = ''An Elixir implementation of the Supermemo 2
+                                Algorithm as described here:
+                                http://www.supermemo.com/english/ol/sm2.htm. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edubkendo/supermemo";
+            };
+          }
+      ) {};
+
+    supermemo = supermemo_1_0_0;
+
+    supervisord_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, xmlrpc_0_9_1, httpoison_0_7_5 }:
+          buildMix {
+            name = "supervisord";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "supervisord";
+              version = "0.1.0";
+              sha256 =
+                "628bd1f94bff68048e270fec788250ca4adf888a9b9e20e6963958dec43f8ee0";
+            };
+            beamDeps  = [ xmlrpc_0_9_1 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''Supervisord library for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/pocketberserker/elixir-supervisord";
+            };
+          }
+      ) {};
+
+    supervisord = supervisord_0_1_0;
+
+    supool_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "supool";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "supool";
+              version = "1.5.1";
+              sha256 =
+                "c191d63ff19ae177bf4cfba02303ae4552d8b48ec4133e24053e037513dfae09";
+            };
+
+            meta = {
+              description = ''Erlang Process Pool as a Supervisor'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/supool";
+            };
+          }
+      ) {};
+
+    supool = supool_1_5_1;
+
+    swaggerdoc_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, phoenix_1_0_4, ecto_1_0_7 }:
+          buildMix {
+            name = "swaggerdoc";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "swaggerdoc";
+              version = "0.0.1";
+              sha256 =
+                "8131fc20821e2dc4f9dd3322dc2e0b8ff1cd25c36338c3eb7d725440edd01405";
+            };
+            beamDeps  = [ poison_1_5_2 phoenix_1_0_4 ecto_1_0_7 ];
+
+            meta = {
+              longDescription = ''The SwaggerDoc module provides a convenience
+                                task for generating Swagger API documentation
+                                for Phoenix and Ecto-based projects.'';
+              license = stdenv.lib.licenses.mpl20;
+              homepage = "https://github.com/OpenAperture/swaggerdoc.git";
+            };
+          }
+      ) {};
+
+    swaggerdoc = swaggerdoc_0_0_1;
+
+    sweet_xml_0_4_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "sweet_xml";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "sweet_xml";
+              version = "0.4.0";
+              sha256 =
+                "94b7134a34f95437ad444d9bc3d5d7e69eabec8196e1a36fe181e97123ec5eb4";
+            };
+
+            meta = {
+              description = ''An sweet wrapper of :xmerl to help query xml
+                            docs'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/awetzel/sweet_xml";
+            };
+          }
+      ) {};
+
+    sweet_xml_0_5_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "sweet_xml";
+            version = "0.5.1";
+            src = fetchHex {
+              pkg = "sweet_xml";
+              version = "0.5.1";
+              sha256 =
+                "3266dedc5e2e6c6b1c5b8a088504a58980632727803de22a5a276da847ea6947";
+            };
+
+            meta = {
+              description = ''An sweet wrapper of :xmerl to help query xml
+                            docs'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/awetzel/sweet_xml";
+            };
+          }
+      ) {};
+
+    sweet_xml_0_6_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "sweet_xml";
+            version = "0.6.1";
+            src = fetchHex {
+              pkg = "sweet_xml";
+              version = "0.6.1";
+              sha256 =
+                "30059e5367a4728ca4b246682adc72618a0a8c997eca6f52a107b2fe3ab4f313";
+            };
+
+            meta = {
+              description = ''An sweet wrapper of :xmerl to help query xml
+                            docs'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/awetzel/sweet_xml";
+            };
+          }
+      ) {};
+
+    sweet_xml = sweet_xml_0_6_1;
+
+    switchboard_0_3_2 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          lager_3_0_2,
+          jsx_2_8_0,
+          gproc_0_5_0,
+          cowboy_1_0_4
+        }:
+          buildRebar3 {
+            name = "switchboard";
+            version = "0.3.2";
+            src = fetchHex {
+              pkg = "switchboard";
+              version = "0.3.2";
+              sha256 =
+                "0b1debb284cd63e5220dc56462dafebd1418579bb40a5b8e51dfdf1f50bfbeb3";
+            };
+
+            beamDeps  = [ lager_3_0_2 jsx_2_8_0 gproc_0_5_0 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Conduct monitoring and operations across email
+                            accounts'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/thusfresh/switchboard";
+            };
+          }
+      ) {};
+
+    switchboard = switchboard_0_3_2;
+
+    syn_osc_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, osc_0_1_1 }:
+          buildMix {
+            name = "syn_osc";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "syn_osc";
+              version = "0.1.0";
+              sha256 =
+                "7cdb75d8e9a64f3e2baf77bce83d06e0da4361d34a82c3ddda68a6efb3d21df9";
+            };
+            beamDeps  = [ osc_0_1_1 ];
+
+            meta = {
+              description = ''SynOSC encoder/decoder for elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/camshaft/syn_osc_ex";
+            };
+          }
+      ) {};
+
+    syn_osc = syn_osc_0_1_0;
+
+    synthex_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "synthex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "synthex";
+              version = "0.1.0";
+              sha256 =
+                "111932916800698a032b9cf7e883146613acc788d165066210e1e09b00e476bc";
+            };
+
+            meta = {
+              description = ''A signal synthesis library'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/bitgamma/synthex";
+            };
+          }
+      ) {};
+
+    synthex = synthex_0_1_0;
+
+    syslog_1_0_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "syslog";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "syslog";
+              version = "1.0.2";
+              sha256 =
+                "ca158a84afe482f77cb4668383a6108f1e9190fcdf3035858f426b91b2021bf6";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''Erlang port driver for interacting with syslog
+                            via syslog'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/Vagabond/erlang-syslog";
+            };
+          }
+      ) {};
+
+    syslog = syslog_1_0_2;
+
+    table_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "table";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "table";
+              version = "0.0.4";
+              sha256 =
+                "9962976cb40b4cd517a03c572ced492185e9642bb224e29942f9b7671e31c55a";
+            };
+
+            meta = {
+              description = ''ascii tables for cli'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zweifisch/table";
+            };
+          }
+      ) {};
+
+    table = table_0_0_4;
+
+    table_rex_0_4_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "table_rex";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "table_rex";
+              version = "0.4.0";
+              sha256 =
+                "71776a56629b850c647d298577f153faa41d3a98cff41446dd799c6bf30fcf19";
+            };
+
+            meta = {
+              description = ''Generate configurable text-based tables for
+                            display (ASCII & more)'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/djm/table_rex";
+            };
+          }
+      ) {};
+
+    table_rex_0_8_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "table_rex";
+            version = "0.8.0";
+            src = fetchHex {
+              pkg = "table_rex";
+              version = "0.8.0";
+              sha256 =
+                "8d026afe99ac07f1261eae09334edbf8ec7ce55b812c3a60440ed88db83aad82";
+            };
+
+            meta = {
+              description = ''Generate configurable text-based tables for
+                            display (ASCII & more)'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/djm/table_rex";
+            };
+          }
+      ) {};
+
+    table_rex = table_rex_0_8_0;
+
+    tabula_2_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "tabula";
+            version = "2.0.1";
+            src = fetchHex {
+              pkg = "tabula";
+              version = "2.0.1";
+              sha256 =
+                "ed66a6d83890eaece976daf1083aa4e0ed9d877e185a1a9ccf1f2c87ee61b49e";
+            };
+
+            meta = {
+              description = ''Pretty printer for maps/structs collections'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/aerosol/Tabula";
+            };
+          }
+      ) {};
+
+    tabula = tabula_2_0_1;
+
+    tagplay_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_7_5, exjsx_3_1_0 }:
+          buildMix {
+            name = "tagplay";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "tagplay";
+              version = "0.1.0";
+              sha256 =
+                "620561f030ad83fc9e9bafec7efb03ded24d9ed81ac32a9ef1bc56c0ab87d61f";
+            };
+            beamDeps  = [ httpoison_0_7_5 exjsx_3_1_0 ];
+
+            meta = {
+              description = ''Tagplay.co API client. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Tagplay/elixir-tagplay";
+            };
+          }
+      ) {};
+
+    tagplay = tagplay_0_1_0;
+
+    tail_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "tail";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "tail";
+              version = "1.0.1";
+              sha256 =
+                "8cec5c708be02aab6094f9c6fdf5b6b0e68c0c3d4f2f9ae341e743d119e9c07f";
+            };
+
+            meta = {
+              longDescription = ''A simple file tail functionality. Calls a
+                                callback function whenever new lines are
+                                detected on a file.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/TheFirstAvenger/elixir-tail.git";
+            };
+          }
+      ) {};
+
+    tail = tail_1_0_1;
+
+    tane_0_3_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "tane";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "tane";
+              version = "0.3.1";
+              sha256 =
+                "8154bcc365b7f21d7ab6ff6d122f6dc110dda05bbfcd7f331a7f514512913e0a";
+            };
+
+            meta = {
+              description = ''Library for Seeding Databases'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Joe-noh/tane";
+            };
+          }
+      ) {};
+
+    tane = tane_0_3_1;
+
+    tanegashima_0_0_3 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poison_2_1_0,
+          httpoison_0_8_1,
+          ex_doc_0_11_4,
+          earmark_0_2_1,
+          dialyze_0_2_0
+        }:
+          buildMix {
+            name = "tanegashima";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "tanegashima";
+              version = "0.0.3";
+              sha256 =
+                "a087f30aa519aae47c1d9d03dfcccef0305e72052d3951b2aa327ca3017ca989";
+            };
+            beamDeps  = [
+                          poison_2_1_0
+                          httpoison_0_8_1
+                          ex_doc_0_11_4
+                          earmark_0_2_1
+                          dialyze_0_2_0
+                        ];
+
+            meta = {
+              description = ''Elixir wrapper for Pushbullet-API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/massn/Tanegashima";
+            };
+          }
+      ) {};
+
+    tanegashima = tanegashima_0_0_3;
+
+    tanuki_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "tanuki";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "tanuki";
+              version = "0.2.0";
+              sha256 =
+                "f499d6bcb80fc29f2d0b68d16d8309cb25589583b1f4d0eb23cbc4fe5afbab8c";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''GitLab API wrapper in Elixir, named after GitLabs
+                            mascot'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ZJvandeWeg/Tanuki";
+            };
+          }
+      ) {};
+
+    tanuki = tanuki_0_2_0;
+
+    tap_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "tap";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "tap";
+              version = "0.1.0";
+              sha256 =
+                "6016e69aafb18d75cb82ec30c2e09660eccf5cbd439b6a6d81a68b0825f13172";
+            };
+
+            meta = {
+              description = ''Elixir tracing'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/eproxus/tap";
+            };
+          }
+      ) {};
+
+    tap = tap_0_1_0;
+
+    tau_0_0_6 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "tau";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "tau";
+              version = "0.0.6";
+              sha256 =
+                "6469f53ae39221f045b6dbd8199eaa95ed5f6c1252b063bc6edd1f21ae2ad0e7";
+            };
+
+            meta = {
+              description = ''The mathematical constant tau'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/FranklinChen/tau";
+            };
+          }
+      ) {};
+
+    tau = tau_0_0_6;
+
+    tds_0_5_4 = callPackage
+      (
+        {  buildMix, fetchHex, decimal_1_1_1 }:
+          buildMix {
+            name = "tds";
+            version = "0.5.4";
+            src = fetchHex {
+              pkg = "tds";
+              version = "0.5.4";
+              sha256 =
+                "110eb8d8a58d0d5fe629bfe75dacb56fa14bde441d2baffbfa2bb0c65ee66cba";
+            };
+            beamDeps  = [ decimal_1_1_1 ];
+
+            meta = {
+              description = ''MSSQL / TDS Driver for Ecto.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/livehelpnow/tds";
+            };
+          }
+      ) {};
+
+    tds = tds_0_5_4;
+
+    tds_ecto_1_0_2 = callPackage
+      (
+        {
+          buildMix, fetchHex, tds_0_5_4, poison_1_5_2, ecto_2_0_0_beta_0
+        }:
+          buildMix {
+            name = "tds_ecto";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "tds_ecto";
+              version = "1.0.2";
+              sha256 =
+                "c592061c97b923fd3f2a7b212eefdd7a35ddb0dac94886b8995ed03b2b9dfd53";
+            };
+            beamDeps  = [ tds_0_5_4 poison_1_5_2 ecto_2_0_0_beta_0 ];
+
+            meta = {
+              description = ''MSSQL / TDS Adapter for Ecto.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/livehelpnow/tds_ecto";
+            };
+          }
+      ) {};
+
+    tds_ecto = tds_ecto_1_0_2;
+
+    tea_crypto_1_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "tea_crypto";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "tea_crypto";
+              version = "1.0.0";
+              sha256 =
+                "0e7e60d0afe79f0624faa8a358a3a00c912cfa548f3632383927abca4db29cc6";
+            };
+
+            meta = {
+              description = ''A TEA implementation in Erlang. '';
+
+              homepage = "https://github.com/keichan34/tea_crypto";
+            };
+          }
+      ) {};
+
+    tea_crypto = tea_crypto_1_0_0;
+
+    teamcity_exunit_formatter_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "teamcity_exunit_formatter";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "teamcity_exunit_formatter";
+              version = "0.2.0";
+              sha256 =
+                "894a7791c21537bef8438bfe8706b2612e7248f1e316af0ba8c0a0d95c19f0dc";
+            };
+
+            meta = {
+              longDescription = ''A formatter for Elixirs ExUnit that formats
+                                as TeamCity Service Messages. Will let you track
+                                test results in TeamCitys UI'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lixhq/teamcity-exunit-formatter";
+            };
+          }
+      ) {};
+
+    teamcity_exunit_formatter = teamcity_exunit_formatter_0_2_0;
+
+    telebot_0_1_2 = callPackage
+      (
+        {  buildRebar3, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
+          buildRebar3 {
+            name = "telebot";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "telebot";
+              version = "0.1.2";
+              sha256 =
+                "cb1f3058dcf182357f1620f58ac289d685b277fb31082c1644bd5f3892ccaf78";
+            };
+
+            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''A Telegram bot plugin system for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ottolin/telebot";
+            };
+          }
+      ) {};
+
+    telebot = telebot_0_1_2;
+
+    telephonist_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex, immortal_0_2_0, ex_twiml_2_1_0 }:
+          buildMix {
+            name = "telephonist";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "telephonist";
+              version = "0.1.2";
+              sha256 =
+                "c89922cfc4137dace4fd6458a6ff32f624dd9775b2e90efffbd864cdaa537a3e";
+            };
+            beamDeps  = [ immortal_0_2_0 ex_twiml_2_1_0 ];
+
+            meta = {
+               license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/danielberkompas/telephonist";
+            };
+          }
+      ) {};
+
+    telephonist = telephonist_0_1_2;
+
+    temp_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "temp";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "temp";
+              version = "0.3.0";
+              sha256 =
+                "e1d2584bb62453e6bbb6247821909ae2d6a0fa7f59da9e4dc5581c0565d9c38b";
+            };
+
+            meta = {
+              description = ''An Elixir module to easily create and use
+                            temporary files and directories.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tuvistavie/elixir-temp";
+            };
+          }
+      ) {};
+
+    temp = temp_0_3_0;
+
+    templates_0_0_5 = callPackage
+      (
+        {  buildMix, fetchHex, calliope_0_3_0 }:
+          buildMix {
+            name = "templates";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "templates";
+              version = "0.0.5";
+              sha256 =
+                "b06a865acfb39fe17cb589ac64696127351015c9ff5d27bae0e223e770b27269";
+            };
+            beamDeps  = [ calliope_0_3_0 ];
+
+            meta = {
+              description = ''A helper library for adding templating to web
+                            applications '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sugar-framework/templates";
+            };
+          }
+      ) {};
+
+    templates = templates_0_0_5;
+
+    temporary_env_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "temporary_env";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "temporary_env";
+              version = "1.0.1";
+              sha256 =
+                "64bd9bade983bbdbb0c59c35343faa4c86d5533a8fe596891be84d52a41bdfe0";
+            };
+
+            meta = {
+              description = ''A tool for managing application env state within
+                            tests.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lpil/temporary-env";
+            };
+          }
+      ) {};
+
+    temporary_env = temporary_env_1_0_1;
+
+    tentabucket_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_2_0 }:
+          buildMix {
+            name = "tentabucket";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "tentabucket";
+              version = "0.0.1";
+              sha256 =
+                "5784dad17f973efcc3c4ea7672927095864d58af1f830614e4c8f06c63d4822d";
+            };
+            beamDeps  = [ httpoison_0_8_1 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''Simple Bitbucket API client library for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/duksis/tentabucket";
+            };
+          }
+      ) {};
+
+    tentabucket = tentabucket_0_0_1;
+
+    tentacat_0_3_1 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_2_0 }:
+          buildMix {
+            name = "tentacat";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "tentacat";
+              version = "0.3.1";
+              sha256 =
+                "fea53526c4d1847bddfc6033cdb9ea7cdbd516e18d6bed25bfcff88b5d2d6551";
+            };
+            beamDeps  = [ httpoison_0_8_1 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''Simple Elixir wrapper for the GitHub API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edgurgel/tentacat";
+            };
+          }
+      ) {};
+
+    tentacat = tentacat_0_3_1;
+
+    term_table_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "term_table";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "term_table";
+              version = "0.0.2";
+              sha256 =
+                "e0a39ef8fa4343ded18bf53b381c12ae557ca2982e24351788db457b38bd7924";
+            };
+
+            meta = {
+              description = ''Pretty terminal table for Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/ske77/term_table";
+            };
+          }
+      ) {};
+
+    term_table = term_table_0_0_2;
+
+    termcap_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "termcap";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "termcap";
+              version = "0.1.0";
+              sha256 =
+                "8c5167d68759bd1cd020eeaf5fd94153430fd19fa5a5fdeeb0b3129f0aba2a21";
+            };
+
+            meta = {
+              description = ''Pure erlang termcap library'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    termcap = termcap_0_1_0;
+
+    tesla_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex, exjsx_3_1_0 }:
+          buildMix {
+            name = "tesla";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "tesla";
+              version = "0.2.1";
+              sha256 =
+                "02193ace70596445a5924e33a7e89ee15378dde07197b59bb5fba9217d8afc10";
+            };
+            beamDeps  = [ exjsx_3_1_0 ];
+
+            meta = {
+              description = ''HTTP client library, with support for middleware
+                            and multiple adapters.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/monterail/tesla";
+            };
+          }
+      ) {};
+
+    tesla = tesla_0_2_1;
+
+    test_times_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "test_times";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "test_times";
+              version = "1.0.0";
+              sha256 =
+                "be468ea6002d247f743bd005c4ed71b5f86ae0e9b112ab52fea8c4f5db71cced";
+            };
+
+            meta = {
+              description = ''Report individual test times in ascending
+                            order'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/pinfieldharm/test_times";
+            };
+          }
+      ) {};
+
+    test_times = test_times_1_0_0;
+
+    tfidf_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "tfidf";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "tfidf";
+              version = "0.1.2";
+              sha256 =
+                "9dc3b778a31998671a3a3e91d5abcf1c7e9794e39d97d4eba4ce4150d80e2b36";
+            };
+
+            meta = {
+              description = ''Elixir implementation of tf-idf (Term
+                            frequency-inverse document frequency)'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/OCannings/tf-idf";
+            };
+          }
+      ) {};
+
+    tfidf = tfidf_0_1_2;
+
+    the_fuzz_0_2_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "the_fuzz";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "the_fuzz";
+              version = "0.2.2";
+              sha256 =
+                "fe851aee08b2e09b6e5cc5acb08c48691f7ac27f52d8400ad55bb045e1f350c5";
+            };
+
+            meta = {
+              longDescription = ''String metrics and phonetic algorithms for
+                                Elixir (e.g. Dice/Sorensen, Hamming, Jaccard,
+                                Jaro, Jaro-Winkler, Levenshtein, Metaphone,
+                                N-Gram, NYSIIS, Overlap, Ratcliff/Obershelp,
+                                Refined NYSIIS, Refined Soundex, Soundex,
+                                Tversky, Tanimoto, Weighted Levenshtein). Based
+                                Heavily on StringMetrics for Scala written by
+                                Rocky Madden.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/smashedtoatoms/the_fuzz";
+            };
+          }
+      ) {};
+
+    the_fuzz = the_fuzz_0_2_2;
+
+    theriac_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, fitex_0_0_1 }:
+          buildMix {
+            name = "theriac";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "theriac";
+              version = "0.0.1";
+              sha256 =
+                "c67162d0bb02629cf3502adba2680c59c058ecbc3dda821384ee00e903d6484f";
+            };
+            beamDeps  = [ fitex_0_0_1 ];
+
+            meta = {
+              description = ''Implementation of clojure style transducers in
+                            elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/timdeputter/theriac";
+            };
+          }
+      ) {};
+
+    theriac = theriac_0_0_1;
+
+    thrift_1_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "thrift";
+            version = "1.2.0";
+            src = fetchHex {
+              pkg = "thrift";
+              version = "1.2.0";
+              sha256 =
+                "c16a8192125b8067ff4e8d0391ae8d59e3428176ebda381b01db782dab8177e7";
+            };
+
+            meta = {
+              longDescription = ''A collection of utilities for working with
+                                Thrift in Elixir. Provides a copy of the Erlang
+                                Thrift runtime.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/pinterest/elixir-thrift";
+            };
+          }
+      ) {};
+
+    thrift = thrift_1_2_0;
+
+    time_distance_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, timex_1_0_1 }:
+          buildMix {
+            name = "time_distance";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "time_distance";
+              version = "0.0.1";
+              sha256 =
+                "41ebe658882f2defd2cd472960e5a31b18d7ea2a4520c06907f7f2093d030e58";
+            };
+            beamDeps  = [ timex_1_0_1 ];
+
+            meta = {
+              longDescription = ''Show the difference between two specified
+                                times, or between a specified time and now in
+                                words (eg. 1 week ago)'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/aussiegeek/time_distance";
+            };
+          }
+      ) {};
+
+    time_distance = time_distance_0_0_1;
+
+    time_seer_0_0_5 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "time_seer";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "time_seer";
+              version = "0.0.5";
+              sha256 =
+                "70a70fe4d6032d9a0cc41bfede0ed88e1cad1430de29d7dbb0b942f2d4b8768f";
+            };
+
+            meta = {
+              longDescription = ''TimeSeer is an Elixir library for parsing
+                                dates and times and returning Erlang style date
+                                and time tuples. Eg. "15:12:07" "2:42pm"
+                                "24/12/2014" will become {15,12,7}, {14,42,0},
+                                and {2014,12,24} respectively.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lau/time_seer";
+            };
+          }
+      ) {};
+
+    time_seer = time_seer_0_0_5;
+
+    timex_0_12_9 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "timex";
+            version = "0.12.9";
+            src = fetchHex {
+              pkg = "timex";
+              version = "0.12.9";
+              sha256 =
+                "6d5be2480b6aa55b452acaffd1fc91e576ffb1e0bc0f04358c8869a47af9ec60";
+            };
+
+            meta = {
+              longDescription = ''A comprehensive date/time library for Elixir
+                                Fully timezone-aware, using the Olson Timezone
+                                database - Supports local-timezone lookups -
+                                Supports POSIX-style timezones - Supports
+                                lookups of any Olson tzdata timezones - Supports
+                                arbitrary shifts across time and through
+                                timezones, including ambiguous time periods,
+                                non-existent time periods, and leaps. Provides
+                                both Date and DateTime types, for use depending
+                                on your needs, with an AmbiguousDateTime type
+                                for handling those DateTime values which fall on
+                                an ambigouos timezone period. Extendable via
+                                Convertable and Comparable protocols, so you can
+                                use Timex with your own types! Locale-aware,
+                                currently only supports "ru" and "en", but more
+                                will be added over time. Provides a broad array
+                                of date/time helper functions -
+                                shifting/adding/subtracting - diffing -
+                                comparing/before?/after?/between? - conversions
+                                - get day of week, week of year, ISO dates, and
+                                names for each - get the beginning or ending of
+                                a given week - get the beginning or ending of a
+                                year, quarter, week, or month - get days in a
+                                given month - normalization Provides a broad
+                                array of time-specific helpers - convert to and
+                                from units: weeks, days, hours, seconds, ms, and
+                                microseconds - measure execution time -
+                                diff/compare - to/from 12/24 hour clock times -
+                                add/subtract Safe date/time string formatting
+                                and parsing - Informative parser errors -
+                                Supports strftime, as well as an easier to read
+                                formatter, i.e. `{ISO:Basic}`, `{YYYY}` -
+                                Supports many formats out of the box: ISO8601
+                                basic and extended, RFC822, RFC1123, RFC3339,
+                                ANSIC, UNIX - Relative time formatter (i.e. "2
+                                years from now") Extendable - Protocols for core
+                                modules like the parser tokenizer - Easy to wrap
+                                to add extra functionality Can be used with
+                                Phoenix and Ecto when used with timex_ecto
+                                package'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitwalker/timex";
+            };
+          }
+      ) {};
+
+    timex_0_13_5 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "timex";
+            version = "0.13.5";
+            src = fetchHex {
+              pkg = "timex";
+              version = "0.13.5";
+              sha256 =
+                "2d553f9e4b5ed7f7f9743012b6be8fd5bdf5d727e93951cd5be220dcbf161f75";
+            };
+
+            meta = {
+              longDescription = ''A comprehensive date/time library for Elixir
+                                Fully timezone-aware, using the Olson Timezone
+                                database - Supports local-timezone lookups -
+                                Supports POSIX-style timezones - Supports
+                                lookups of any Olson tzdata timezones - Supports
+                                arbitrary shifts across time and through
+                                timezones, including ambiguous time periods,
+                                non-existent time periods, and leaps. Provides
+                                both Date and DateTime types, for use depending
+                                on your needs, with an AmbiguousDateTime type
+                                for handling those DateTime values which fall on
+                                an ambigouos timezone period. Extendable via
+                                Convertable and Comparable protocols, so you can
+                                use Timex with your own types! Locale-aware,
+                                currently only supports "ru" and "en", but more
+                                will be added over time. Provides a broad array
+                                of date/time helper functions -
+                                shifting/adding/subtracting - diffing -
+                                comparing/before?/after?/between? - conversions
+                                - get day of week, week of year, ISO dates, and
+                                names for each - get the beginning or ending of
+                                a given week - get the beginning or ending of a
+                                year, quarter, week, or month - get days in a
+                                given month - normalization Provides a broad
+                                array of time-specific helpers - convert to and
+                                from units: weeks, days, hours, seconds, ms, and
+                                microseconds - measure execution time -
+                                diff/compare - to/from 12/24 hour clock times -
+                                add/subtract Safe date/time string formatting
+                                and parsing - Informative parser errors -
+                                Supports strftime, as well as an easier to read
+                                formatter, i.e. `{ISO:Basic}`, `{YYYY}` -
+                                Supports many formats out of the box: ISO8601
+                                basic and extended, RFC822, RFC1123, RFC3339,
+                                ANSIC, UNIX - Relative time formatter (i.e. "2
+                                years from now") Extendable - Protocols for core
+                                modules like the parser tokenizer - Easy to wrap
+                                to add extra functionality Can be used with
+                                Phoenix and Ecto when used with timex_ecto
+                                package'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitwalker/timex";
+            };
+          }
+      ) {};
+
+    timex_0_16_2 = callPackage
+      (
+        {  buildMix, fetchHex, tzdata_0_1_8 }:
+          buildMix {
+            name = "timex";
+            version = "0.16.2";
+            src = fetchHex {
+              pkg = "timex";
+              version = "0.16.2";
+              sha256 =
+                "951b740468c5de3495ce750d33c9df313100de75060242fd2dfe308f40706793";
+            };
+            beamDeps  = [ tzdata_0_1_8 ];
+
+            meta = {
+              longDescription = ''A comprehensive date/time library for Elixir
+                                Fully timezone-aware, using the Olson Timezone
+                                database - Supports local-timezone lookups -
+                                Supports POSIX-style timezones - Supports
+                                lookups of any Olson tzdata timezones - Supports
+                                arbitrary shifts across time and through
+                                timezones, including ambiguous time periods,
+                                non-existent time periods, and leaps. Provides
+                                both Date and DateTime types, for use depending
+                                on your needs, with an AmbiguousDateTime type
+                                for handling those DateTime values which fall on
+                                an ambigouos timezone period. Extendable via
+                                Convertable and Comparable protocols, so you can
+                                use Timex with your own types! Locale-aware,
+                                currently only supports "ru" and "en", but more
+                                will be added over time. Provides a broad array
+                                of date/time helper functions -
+                                shifting/adding/subtracting - diffing -
+                                comparing/before?/after?/between? - conversions
+                                - get day of week, week of year, ISO dates, and
+                                names for each - get the beginning or ending of
+                                a given week - get the beginning or ending of a
+                                year, quarter, week, or month - get days in a
+                                given month - normalization Provides a broad
+                                array of time-specific helpers - convert to and
+                                from units: weeks, days, hours, seconds, ms, and
+                                microseconds - measure execution time -
+                                diff/compare - to/from 12/24 hour clock times -
+                                add/subtract Safe date/time string formatting
+                                and parsing - Informative parser errors -
+                                Supports strftime, as well as an easier to read
+                                formatter, i.e. `{ISO:Basic}`, `{YYYY}` -
+                                Supports many formats out of the box: ISO8601
+                                basic and extended, RFC822, RFC1123, RFC3339,
+                                ANSIC, UNIX - Relative time formatter (i.e. "2
+                                years from now") Extendable - Protocols for core
+                                modules like the parser tokenizer - Easy to wrap
+                                to add extra functionality Can be used with
+                                Phoenix and Ecto when used with timex_ecto
+                                package'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitwalker/timex";
+            };
+          }
+      ) {};
+
+    timex_0_19_5 = callPackage
+      (
+        {  buildMix, fetchHex, tzdata_0_5_6, combine_0_7_0 }:
+          buildMix {
+            name = "timex";
+            version = "0.19.5";
+            src = fetchHex {
+              pkg = "timex";
+              version = "0.19.5";
+              sha256 =
+                "be1985ab99a6aebc3672b1d82b27e409c9a7af4658f3cc5900fa8754e159b02c";
+            };
+            beamDeps  = [ tzdata_0_5_6 combine_0_7_0 ];
+
+            meta = {
+              longDescription = ''A comprehensive date/time library for Elixir
+                                Fully timezone-aware, using the Olson Timezone
+                                database - Supports local-timezone lookups -
+                                Supports POSIX-style timezones - Supports
+                                lookups of any Olson tzdata timezones - Supports
+                                arbitrary shifts across time and through
+                                timezones, including ambiguous time periods,
+                                non-existent time periods, and leaps. Provides
+                                both Date and DateTime types, for use depending
+                                on your needs, with an AmbiguousDateTime type
+                                for handling those DateTime values which fall on
+                                an ambigouos timezone period. Extendable via
+                                Convertable and Comparable protocols, so you can
+                                use Timex with your own types! Locale-aware,
+                                currently only supports "ru" and "en", but more
+                                will be added over time. Provides a broad array
+                                of date/time helper functions -
+                                shifting/adding/subtracting - diffing -
+                                comparing/before?/after?/between? - conversions
+                                - get day of week, week of year, ISO dates, and
+                                names for each - get the beginning or ending of
+                                a given week - get the beginning or ending of a
+                                year, quarter, week, or month - get days in a
+                                given month - normalization Provides a broad
+                                array of time-specific helpers - convert to and
+                                from units: weeks, days, hours, seconds, ms, and
+                                microseconds - measure execution time -
+                                diff/compare - to/from 12/24 hour clock times -
+                                add/subtract Safe date/time string formatting
+                                and parsing - Informative parser errors -
+                                Supports strftime, as well as an easier to read
+                                formatter, i.e. `{ISO:Basic}`, `{YYYY}` -
+                                Supports many formats out of the box: ISO8601
+                                basic and extended, RFC822, RFC1123, RFC3339,
+                                ANSIC, UNIX - Relative time formatter (i.e. "2
+                                years from now") Extendable - Protocols for core
+                                modules like the parser tokenizer - Easy to wrap
+                                to add extra functionality Can be used with
+                                Phoenix and Ecto when used with timex_ecto
+                                package'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitwalker/timex";
+            };
+          }
+      ) {};
+
+    timex_1_0_0_rc4 = callPackage
+      (
+        {  buildMix, fetchHex, tzdata_0_1_8, combine_0_7_0 }:
+          buildMix {
+            name = "timex";
+            version = "1.0.0-rc4";
+            src = fetchHex {
+              pkg = "timex";
+              version = "1.0.0-rc4";
+              sha256 =
+                "3da1356901fe205455404c83d2ea7804b63ed47e3a2cdb428545e568e05d6885";
+            };
+            beamDeps  = [ tzdata_0_1_8 combine_0_7_0 ];
+
+            meta = {
+              longDescription = ''A comprehensive date/time library for Elixir
+                                Fully timezone-aware, using the Olson Timezone
+                                database - Supports local-timezone lookups -
+                                Supports POSIX-style timezones - Supports
+                                lookups of any Olson tzdata timezones - Supports
+                                arbitrary shifts across time and through
+                                timezones, including ambiguous time periods,
+                                non-existent time periods, and leaps. Provides
+                                both Date and DateTime types, for use depending
+                                on your needs, with an AmbiguousDateTime type
+                                for handling those DateTime values which fall on
+                                an ambigouos timezone period. Extendable via
+                                Convertable and Comparable protocols, so you can
+                                use Timex with your own types! Locale-aware,
+                                currently only supports "ru" and "en", but more
+                                will be added over time. Provides a broad array
+                                of date/time helper functions -
+                                shifting/adding/subtracting - diffing -
+                                comparing/before?/after?/between? - conversions
+                                - get day of week, week of year, ISO dates, and
+                                names for each - get the beginning or ending of
+                                a given week - get the beginning or ending of a
+                                year, quarter, week, or month - get days in a
+                                given month - normalization Provides a broad
+                                array of time-specific helpers - convert to and
+                                from units: weeks, days, hours, seconds, ms, and
+                                microseconds - measure execution time -
+                                diff/compare - to/from 12/24 hour clock times -
+                                add/subtract Safe date/time string formatting
+                                and parsing - Informative parser errors -
+                                Supports strftime, as well as an easier to read
+                                formatter, i.e. `{ISO:Basic}`, `{YYYY}` -
+                                Supports many formats out of the box: ISO8601
+                                basic and extended, RFC822, RFC1123, RFC3339,
+                                ANSIC, UNIX - Relative time formatter (i.e. "2
+                                years from now") Extendable - Protocols for core
+                                modules like the parser tokenizer - Easy to wrap
+                                to add extra functionality Can be used with
+                                Phoenix and Ecto when used with timex_ecto
+                                package'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitwalker/timex";
+            };
+          }
+      ) {};
+
+    timex_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, tzdata_0_1_8, combine_0_7_0 }:
+          buildMix {
+            name = "timex";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "timex";
+              version = "1.0.1";
+              sha256 =
+                "6124f84b38f9ee526df91abca6d14bf503cc014b1f3c86d0d3412192e2b12d07";
+            };
+            beamDeps  = [ tzdata_0_1_8 combine_0_7_0 ];
+
+            meta = {
+              longDescription = ''A comprehensive date/time library for Elixir
+                                Fully timezone-aware, using the Olson Timezone
+                                database - Supports local-timezone lookups -
+                                Supports POSIX-style timezones - Supports
+                                lookups of any Olson tzdata timezones - Supports
+                                arbitrary shifts across time and through
+                                timezones, including ambiguous time periods,
+                                non-existent time periods, and leaps. Provides
+                                both Date and DateTime types, for use depending
+                                on your needs, with an AmbiguousDateTime type
+                                for handling those DateTime values which fall on
+                                an ambigouos timezone period. Extendable via
+                                Convertable and Comparable protocols, so you can
+                                use Timex with your own types! Locale-aware,
+                                currently only supports "ru" and "en", but more
+                                will be added over time. Provides a broad array
+                                of date/time helper functions -
+                                shifting/adding/subtracting - diffing -
+                                comparing/before?/after?/between? - conversions
+                                - get day of week, week of year, ISO dates, and
+                                names for each - get the beginning or ending of
+                                a given week - get the beginning or ending of a
+                                year, quarter, week, or month - get days in a
+                                given month - normalization Provides a broad
+                                array of time-specific helpers - convert to and
+                                from units: weeks, days, hours, seconds, ms, and
+                                microseconds - measure execution time -
+                                diff/compare - to/from 12/24 hour clock times -
+                                add/subtract Safe date/time string formatting
+                                and parsing - Informative parser errors -
+                                Supports strftime, as well as an easier to read
+                                formatter, i.e. `{ISO:Basic}`, `{YYYY}` -
+                                Supports many formats out of the box: ISO8601
+                                basic and extended, RFC822, RFC1123, RFC3339,
+                                ANSIC, UNIX - Relative time formatter (i.e. "2
+                                years from now") Extendable - Protocols for core
+                                modules like the parser tokenizer - Easy to wrap
+                                to add extra functionality Can be used with
+                                Phoenix and Ecto when used with timex_ecto
+                                package'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitwalker/timex";
+            };
+          }
+      ) {};
+
+    timex = timex_1_0_1;
+
+    timex_ecto_0_5_0 = callPackage
+      (
+        {  buildMix, fetchHex, timex_0_19_5, ecto_2_0_0_beta_0 }:
+          buildMix {
+            name = "timex_ecto";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "timex_ecto";
+              version = "0.5.0";
+              sha256 =
+                "6fe5ffbcfd3abeda54a1ce01206e982d7470c095520694c3cc2637d558e723b0";
+            };
+            beamDeps  = [ timex_0_19_5 ecto_2_0_0_beta_0 ];
+
+            meta = {
+              description = ''A plugin for Ecto and Timex which allows use of
+                            Timex types with Ecto'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitwalker/timex_ecto";
+            };
+          }
+      ) {};
+
+    timex_ecto_0_9_0 = callPackage
+      (
+        {  buildMix, fetchHex, timex_1_0_1, ecto_2_0_0_beta_0 }:
+          buildMix {
+            name = "timex_ecto";
+            version = "0.9.0";
+            src = fetchHex {
+              pkg = "timex_ecto";
+              version = "0.9.0";
+              sha256 =
+                "454cbd67b18fa75485369b266c0142a2a5d78bb3d4078cd10dc2ec99f1088232";
+            };
+            beamDeps  = [ timex_1_0_1 ecto_2_0_0_beta_0 ];
+
+            meta = {
+              description = ''A plugin for Ecto and Timex which allows use of
+                            Timex types with Ecto'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitwalker/timex_ecto";
+            };
+          }
+      ) {};
+
+    timex_ecto = timex_ecto_0_9_0;
+
+    timex_interval_0_6_0 = callPackage
+      (
+        {  buildMix, fetchHex, timex_1_0_0_rc4 }:
+          buildMix {
+            name = "timex_interval";
+            version = "0.6.0";
+            src = fetchHex {
+              pkg = "timex_interval";
+              version = "0.6.0";
+              sha256 =
+                "c2d932e892cb15dacabafdc456040208c285c6d00087f688282d6693a6bbb04e";
+            };
+            beamDeps  = [ timex_1_0_0_rc4 ];
+
+            meta = {
+              description = ''A date/time interval library for Elixir projects,
+                            based on Timex.'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/atabary/timex-interval";
+            };
+          }
+      ) {};
+
+    timex_interval = timex_interval_0_6_0;
+
+    tinymt_0_3_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "tinymt";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "tinymt";
+              version = "0.3.1";
+              sha256 =
+                "9de8fcedf254661bc4aa550aac317e28be35d4a5d91adf3fa3689dfad6cc1e5a";
+            };
+
+            meta = {
+              description = ''Tiny Mersenne Twister (TinyMT) for Erlang'';
+              license = stdenv.lib.licenses.bsd2;
+              homepage = "https://github.com/jj1bdx/tinymt-erlang/";
+            };
+          }
+      ) {};
+
+    tinymt = tinymt_0_3_1;
+
+    tirexs_0_8_0_beta1 = callPackage
+      (
+        {  buildMix, fetchHex, exjsx_3_2_0 }:
+          buildMix {
+            name = "tirexs";
+            version = "0.8.0-beta1";
+            src = fetchHex {
+              pkg = "tirexs";
+              version = "0.8.0-beta1";
+              sha256 =
+                "3d7187e73f9ac85204b45ecd81a49b607415d2aecfe628d23dfd45baeb9486ee";
+            };
+            beamDeps  = [ exjsx_3_2_0 ];
+
+            meta = {
+              description = ''An Elixir flavored DSL for building JSON based
+                            queries to Elasticsearch engine'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/Zatvobor/tirexs";
+            };
+          }
+      ) {};
+
+    tirexs = tirexs_0_8_0_beta1;
+
+    tmdb_0_0_6 = callPackage
+      (
+        {
+          buildRebar3, fetchHex, poison_1_4_0, httpoison_0_8_1, exjsx_3_1_0
+        }:
+          buildRebar3 {
+            name = "tmdb";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "tmdb";
+              version = "0.0.6";
+              sha256 =
+                "4cbad6ffa556a0eeecb22c3960d47451e918313e5651808439f039403dd38d3a";
+            };
+
+            beamDeps  = [ poison_1_4_0 httpoison_0_8_1 exjsx_3_1_0 ];
+
+            meta = {    };
+          }
+      ) {};
+
+    tmdb = tmdb_0_0_6;
+
+    todo_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "todo";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "todo";
+              version = "1.0.1";
+              sha256 =
+                "40b40fe538ff54d090d2992b107361de7b1a18ef3ad41b69ec2bb5b327e951ba";
+            };
+
+            meta = {
+              description = ''A small TODO comments utility.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/niahoo/elixir-todo";
+            };
+          }
+      ) {};
+
+    todo = todo_1_0_1;
+
+    tomlex_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "tomlex";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "tomlex";
+              version = "0.0.4";
+              sha256 =
+                "4aa86ca5ede2147156697267a72bafb425fea2ad9c3a5c0bf6fe7f1e57e9ffa9";
+            };
+
+            meta = {
+              description = ''A TOML parser for elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zamith/tomlex";
+            };
+          }
+      ) {};
+
+    tomlex = tomlex_0_0_4;
+
+    toniq_1_0_4 = callPackage
+      (
+        {  buildMix, fetchHex, uuid_1_1_3, exredis_0_2_3 }:
+          buildMix {
+            name = "toniq";
+            version = "1.0.4";
+            src = fetchHex {
+              pkg = "toniq";
+              version = "1.0.4";
+              sha256 =
+                "77c88b11b00180a7eacd0a7b722c89d4abf22fae818d50aa955d401f91c07c93";
+            };
+            beamDeps  = [ uuid_1_1_3 exredis_0_2_3 ];
+
+            meta = {
+              longDescription = ''Simple and reliable background job processing
+                                library for Elixir. Has persistence, retries,
+                                concurrency limiting, error handling and is
+                                heroku friendly.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/joakimk/toniq";
+            };
+          }
+      ) {};
+
+    toniq = toniq_1_0_4;
+
+    towel_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "towel";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "towel";
+              version = "0.2.1";
+              sha256 =
+                "e7b7c5e7e6d8df9e781e130d1defccc9a27f888f7b95c132d8ccd1d6957d3b7a";
+            };
+
+            meta = {
+              description = ''A delightfully simple monad library that`s
+                            written for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/knrz/towel";
+            };
+          }
+      ) {};
+
+    towel = towel_0_2_1;
+
+    tqdm_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "tqdm";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "tqdm";
+              version = "0.0.1";
+              sha256 =
+                "70636f54515581abefb88020a5393b87a64186b7fa4a59a50e52854f999319bc";
+            };
+
+            meta = {
+              longDescription = ''Add a progress bar to your enumerables
+                                (Lists, Maps, Streams, Ranges, etc.) in a
+                                second.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/antipax/tqdm_elixir";
+            };
+          }
+      ) {};
+
+    tqdm = tqdm_0_0_1;
+
+    tracker_request_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex, bencoder_0_0_7 }:
+          buildMix {
+            name = "tracker_request";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "tracker_request";
+              version = "0.0.4";
+              sha256 =
+                "5a4b20ed43589e9a7bd66ae1a72e5df983489b2d07ae990b32758e3353281584";
+            };
+            beamDeps  = [ bencoder_0_0_7 ];
+
+            meta = {
+              description = ''Deal with bittorrent tracker requests and
+                            responses'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/alehander42/tracker_request";
+            };
+          }
+      ) {};
+
+    tracker_request = tracker_request_0_0_4;
+
+    trackline_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          timex_1_0_1,
+          exml_0_1_0,
+          exmerl_0_1_1,
+          erlsom_1_2_1,
+          apex_0_3_7
+        }:
+          buildMix {
+            name = "trackline";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "trackline";
+              version = "0.0.1";
+              sha256 =
+                "42ee5d56b2ec0c55715e7f03a9aacd6d7ce8543519e9ec696335348eb1a24f7c";
+            };
+            beamDeps  = [
+                          timex_1_0_1
+                          exml_0_1_0
+                          exmerl_0_1_1
+                          erlsom_1_2_1
+                          apex_0_3_7
+                        ];
+
+            meta = {
+              description = ''A GPX parser for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/andrewhao/trackline";
+            };
+          }
+      ) {};
+
+    trackline = trackline_0_0_1;
+
+    tradie_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "tradie";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "tradie";
+              version = "0.0.1";
+              sha256 =
+                "d317c61c9bd9ab46184df8036057855e676d8598905c6708b9a9e26af3b7fd04";
+            };
+
+            meta = {
+              longDescription = ''Execute multiple tasks in parallel, allowing
+                                retry for each task, and a global timeout. Based
+                                loosely on
+                                http://theerlangelist.com/article/beyond_taskasync.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/madlep/tradie";
+            };
+          }
+      ) {};
+
+    tradie = tradie_0_0_1;
+
+    trailing_format_plug_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+          buildMix {
+            name = "trailing_format_plug";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "trailing_format_plug";
+              version = "0.0.4";
+              sha256 =
+                "16e2485b7069c8e025460d183d4711d9c5bbf46ae532dde859cc6623d12bfc71";
+            };
+            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+
+            meta = {
+              longDescription = ''An elixir plug to support legacy APIs that
+                                use a rails-like trailing format:
+                                http://api.dev/resources.format'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "http://github.com/mschae/trailing_format_plug";
+            };
+          }
+      ) {};
+
+    trailing_format_plug = trailing_format_plug_0_0_4;
+
+    traitify_elixir_0_1_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poison_1_1_1,
+          httpoison_0_7_5,
+          hackney_1_0_6,
+          exvcr_0_3_9,
+          ex_conf_0_1_3
+        }:
+          buildMix {
+            name = "traitify_elixir";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "traitify_elixir";
+              version = "0.1.1";
+              sha256 =
+                "ff8568415b70f2fe6548add244cb06c9a9d8c03f0e3d9568730b926f6a9cdd95";
+            };
+            beamDeps  = [
+                          poison_1_1_1
+                          httpoison_0_7_5
+                          hackney_1_0_6
+                          exvcr_0_3_9
+                          ex_conf_0_1_3
+                        ];
+
+            meta = {
+              description = ''An Elixir client library for the Traitify API '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/traitify/traitify_elixir";
+            };
+          }
+      ) {};
+
+    traitify_elixir = traitify_elixir_0_1_1;
+
+    transducer_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "transducer";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "transducer";
+              version = "0.1.0";
+              sha256 =
+                "89533238e42bace715485c5113bb5c39beecb333c00f4624ae85d5c0f6e96db4";
+            };
+
+            meta = {
+              longDescription = ''Composable algorithmic transformations.
+                                Transducers let you combine reduction operations
+                                like `map`, `filter`, `take_while`, `take`, and
+                                so on into a single reducing function. As with
+                                Stream, but in contrast to Enum, all operations
+                                are performed for each item before the next item
+                                in the enumerable is processed. One difference
+                                with the Stream module is that the transducers`
+                                reducing functions don`t have to produce an
+                                enumerable, while Stream module transformations
+                                always do.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/garyposter/elixir-transducer";
+            };
+          }
+      ) {};
+
+    transducer = transducer_0_1_0;
+
+    travis_ex_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "travis_ex";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "travis_ex";
+              version = "0.0.2";
+              sha256 =
+                "80589ec01596dfc1e02cef61ce0adc3c9b73977b56a528e214c37af079efa10a";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Travis-ci API client library for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/duksis/travis_ex";
+            };
+          }
+      ) {};
+
+    travis_ex = travis_ex_0_0_2;
+
+    trie_1_5_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "trie";
+            version = "1.5.0";
+            src = fetchHex {
+              pkg = "trie";
+              version = "1.5.0";
+              sha256 =
+                "613981536e33f58d92e44bd31801376f71deee0e57c63372fe8ab5fbbc37f7dc";
+            };
+
+            meta = {
+              description = ''Erlang Trie Implementation'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/trie";
+            };
+          }
+      ) {};
+
+    trie_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "trie";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "trie";
+              version = "1.5.1";
+              sha256 =
+                "4b845dccfca8962b90584e98d270e2ff43e2e181bb046c4aae0e0f457679f98d";
+            };
+
+            meta = {
+              description = ''Erlang Trie Implementation'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/trie";
+            };
+          }
+      ) {};
+
+    trie = trie_1_5_1;
+
+    trot_0_5_3 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poison_1_5_2,
+          plug_heartbeat_0_2_0,
+          plug_0_14_0,
+          cowboy_1_0_4,
+          calliope_0_3_0
+        }:
+          buildMix {
+            name = "trot";
+            version = "0.5.3";
+            src = fetchHex {
+              pkg = "trot";
+              version = "0.5.3";
+              sha256 =
+                "982a4ff3a0fffe1e9cc752313fd4c45487fdd484dde7265728da4579c29354e1";
+            };
+            beamDeps  = [
+                          poison_1_5_2
+                          plug_heartbeat_0_2_0
+                          plug_0_14_0
+                          cowboy_1_0_4
+                          calliope_0_3_0
+                        ];
+
+            meta = {
+              description = ''A web micro-framework based on Plug and
+                            Cowboy.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/hexedpackets/trot";
+            };
+          }
+      ) {};
+
+    trot = trot_0_5_3;
+
+    tsuru_1_0_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "tsuru";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "tsuru";
+              version = "1.0.2";
+              sha256 =
+                "b586ad8d47799a086e4225494f5e3cf4e306ca255a173a4b48fe51d542cefb6b";
+            };
+
+            meta = {
+              description = ''A collection of useful tools for Erlang
+                            applications'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    tsuru = tsuru_1_0_2;
+
+    tuco_tuco_0_8_1 = callPackage
+      (
+        {  buildMix, fetchHex, webdriver_0_8_1 }:
+          buildMix {
+            name = "tuco_tuco";
+            version = "0.8.1";
+            src = fetchHex {
+              pkg = "tuco_tuco";
+              version = "0.8.1";
+              sha256 =
+                "9c61ae99070047928940100e4bc4808583eae656cfaae03e7d6b7a3b3cc23c74";
+            };
+            beamDeps  = [ webdriver_0_8_1 ];
+
+            meta = {
+              description = ''Testing tool for web applications'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/stuart/tuco-tuco";
+            };
+          }
+      ) {};
+
+    tuco_tuco = tuco_tuco_0_8_1;
+
+    twittex_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex, oauther_1_0_2, oauth2_0_5_0 }:
+          buildMix {
+            name = "twittex";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "twittex";
+              version = "0.0.4";
+              sha256 =
+                "2cfe144fe70ed0d0fcfbc18f232a54a844d1ef79db74cd385c8640e40ea30aa7";
+            };
+            beamDeps  = [ oauther_1_0_2 oauth2_0_5_0 ];
+
+            meta = {
+              description = ''Twitter client library for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/almightycouch/twittex";
+            };
+          }
+      ) {};
+
+    twittex = twittex_0_0_4;
+
+    type_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "type";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "type";
+              version = "0.0.2";
+              sha256 =
+                "1553ec18df7781cc1144477e075ac3c907aa7900db308d9d43cf7cfbeeb7a8ac";
+            };
+
+            meta = {
+              description = ''A module for checking the type of an argument'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jeffreybaird/type";
+            };
+          }
+      ) {};
+
+    type = type_0_0_2;
+
+    typeformx_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "typeformx";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "typeformx";
+              version = "0.0.1";
+              sha256 =
+                "8f6f1613f53f8c5012eb6d05276f5d305bdb9d4b0e94926680b536d0e1d94a62";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''An Elixir client library for the Typeform API
+                            (typeform.io)'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/netflakes/TypeformX";
+            };
+          }
+      ) {};
+
+    typeformx = typeformx_0_0_1;
+
+    tzdata_0_1_8 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "tzdata";
+            version = "0.1.8";
+            src = fetchHex {
+              pkg = "tzdata";
+              version = "0.1.8";
+              sha256 =
+                "68af93cc1e0e0e6be76a583faaf15d57972a1afbf1e39f9d70524da87dfae825";
+            };
+
+            meta = {
+              description = ''Tzdata is a parser and library for the tz
+                            database.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lau/tzdata";
+            };
+          }
+      ) {};
+
+    tzdata_0_5_6 = callPackage
+      (
+        {  buildMix, fetchHex, hackney_1_4_8 }:
+          buildMix {
+            name = "tzdata";
+            version = "0.5.6";
+            src = fetchHex {
+              pkg = "tzdata";
+              version = "0.5.6";
+              sha256 =
+                "e2be18ea3e7c7dc83520b0eed369bbeea0c478299590524009a9dbaf0a9bfb04";
+            };
+            beamDeps  = [ hackney_1_4_8 ];
+
+            meta = {
+              description = ''Tzdata is a parser and library for the tz
+                            database.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lau/tzdata";
+            };
+          }
+      ) {};
+
+    tzdata = tzdata_0_5_6;
+
+    ua_inspector_0_10_0 = callPackage
+      (
+        {  buildMix, fetchHex, poolboy_1_5_1 }:
+          buildMix {
+            name = "ua_inspector";
+            version = "0.10.0";
+            src = fetchHex {
+              pkg = "ua_inspector";
+              version = "0.10.0";
+              sha256 =
+                "10f53183f10fcdbafb912e32798decec31fa0477fb4ddaa48048467936231d9a";
+            };
+            beamDeps  = [ poolboy_1_5_1 ];
+
+            meta = {
+              description = ''User agent parser library'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/elixytics/ua_inspector";
+            };
+          }
+      ) {};
+
+    ua_inspector = ua_inspector_0_10_0;
+
+    uber_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "uber";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "uber";
+              version = "0.1.0";
+              sha256 =
+                "bf3dde22ad6207577ea1093649394d968ef94725fdc56d5ea6afd22d12886d9a";
+            };
+
+            meta = {
+              description = ''Utilities for working with the UBER hypermedia
+                            format'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/gamache/uber.ex";
+            };
+          }
+      ) {};
+
+    uber = uber_0_1_0;
+
+    ucol_nif_1_1_5 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "ucol_nif";
+            version = "1.1.5";
+            src = fetchHex {
+              pkg = "ucol_nif";
+              version = "1.1.5";
+              sha256 =
+                "a6fad2b92dfe84a2654a085163de39cae88762d14c414cdeaeb66ac41d5c156e";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''ICU based collation module'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/refuge/ucol_nif";
+            };
+          }
+      ) {};
+
+    ucol_nif = ucol_nif_1_1_5;
+
+    udpflux_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "udpflux";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "udpflux";
+              version = "0.0.2";
+              sha256 =
+                "0a6d0003b818364bad9ed8bc55b8789b8fc129d055799cd517a551445fe0649e";
+            };
+
+            meta = {
+              description = ''An opinionated UDP-only InfluxDB client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/timbuchwaldt/udpflux";
+            };
+          }
+      ) {};
+
+    udpflux = udpflux_0_0_2;
+
+    ueberauth_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1 }:
+          buildMix {
+            name = "ueberauth";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "ueberauth";
+              version = "0.2.0";
+              sha256 =
+                "d6ee9cfe96be0e2b4005cb482b8e29c20ae0d6f7332ea9f686397c4ab20bf4de";
+            };
+            beamDeps  = [ plug_1_1_1 ];
+
+            meta = {
+              description = ''An Elixir Authentication System for Plug-based
+                            Web Applications'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ueberauth/ueberauth";
+            };
+          }
+      ) {};
+
+    ueberauth = ueberauth_0_2_0;
+
+    ueberauth_facebook_0_3_2 = callPackage
+      (
+        {  buildMix, fetchHex, ueberauth_0_2_0, oauth2_0_5_0 }:
+          buildMix {
+            name = "ueberauth_facebook";
+            version = "0.3.2";
+            src = fetchHex {
+              pkg = "ueberauth_facebook";
+              version = "0.3.2";
+              sha256 =
+                "d766a41a0b26bccfc1371b776bfcfb760f09639ac3de9aa8885023af9e5641c5";
+            };
+            beamDeps  = [ ueberauth_0_2_0 oauth2_0_5_0 ];
+
+            meta = {
+              description = ''An Uberauth strategy for Facebook
+                            authentication.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ueberauth/ueberauth_facebook";
+            };
+          }
+      ) {};
+
+    ueberauth_facebook = ueberauth_facebook_0_3_2;
+
+    ueberauth_fitbit_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex, ueberauth_0_2_0, oauth2_0_5_0 }:
+          buildMix {
+            name = "ueberauth_fitbit";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "ueberauth_fitbit";
+              version = "0.2.1";
+              sha256 =
+                "669e2bba8f498651dc4c31fbb978179b9d344264ace2ff8f53e007cc6d243956";
+            };
+            beamDeps  = [ ueberauth_0_2_0 oauth2_0_5_0 ];
+
+            meta = {
+              description = ''An Ueberauth strategy for Fitbit OAuth2
+                            authentication'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/vinniefranco/ueberauth_fitbit";
+            };
+          }
+      ) {};
+
+    ueberauth_fitbit = ueberauth_fitbit_0_2_1;
+
+    ueberauth_github_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, ueberauth_0_2_0, oauth2_0_5_0 }:
+          buildMix {
+            name = "ueberauth_github";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "ueberauth_github";
+              version = "0.2.0";
+              sha256 =
+                "b12b3dae8c097d5cd57a3e1cd97286b796ee36794b031f92a76e848f572cb4ab";
+            };
+            beamDeps  = [ ueberauth_0_2_0 oauth2_0_5_0 ];
+
+            meta = {
+              description = ''An Ueberauth strategy for using Github to
+                            authenticate your users.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ueberauth/ueberauth_github";
+            };
+          }
+      ) {};
+
+    ueberauth_github = ueberauth_github_0_2_0;
+
+    ueberauth_google_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, ueberauth_0_2_0, oauth2_0_5_0 }:
+          buildMix {
+            name = "ueberauth_google";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "ueberauth_google";
+              version = "0.2.0";
+              sha256 =
+                "b57f13534f37b7062df5a696976453af1faabc00d608ccdce29f9289164fce44";
+            };
+            beamDeps  = [ ueberauth_0_2_0 oauth2_0_5_0 ];
+
+            meta = {
+              description = ''An Uberauth strategy for Google
+                            authentication.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ueberauth/ueberauth_google";
+            };
+          }
+      ) {};
+
+    ueberauth_google = ueberauth_google_0_2_0;
+
+    ueberauth_identity_0_2_2 = callPackage
+      (
+        {
+          buildMix, fetchHex, ueberauth_0_2_0, poison_1_5_2, plug_1_1_1
+        }:
+          buildMix {
+            name = "ueberauth_identity";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "ueberauth_identity";
+              version = "0.2.2";
+              sha256 =
+                "6c3d7e5917a5030f737152cc86af4c7066a66a30aea049562c687e5af51bee82";
+            };
+            beamDeps  = [ ueberauth_0_2_0 poison_1_5_2 plug_1_1_1 ];
+
+            meta = {
+              description = ''An Ueberauth strategy for basic
+                            username/password'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ueberauth/ueberauth_identity";
+            };
+          }
+      ) {};
+
+    ueberauth_identity = ueberauth_identity_0_2_2;
+
+    ueberauth_slack_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, ueberauth_0_2_0, oauth2_0_5_0 }:
+          buildMix {
+            name = "ueberauth_slack";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "ueberauth_slack";
+              version = "0.2.0";
+              sha256 =
+                "1b109ed50d34b3a18d5db04234475baa3ae08893b46a7b5a1726fec4adb6753b";
+            };
+            beamDeps  = [ ueberauth_0_2_0 oauth2_0_5_0 ];
+
+            meta = {
+              description = ''An Ueberauth strategy for using Slack to
+                            authenticate your users'';
+
+            };
+          }
+      ) {};
+
+    ueberauth_slack = ueberauth_slack_0_2_0;
+
+    ueberauth_twitter_0_2_2 = callPackage
+      (
+        {  buildMix, fetchHex, ueberauth_0_2_0, httpoison_0_8_1 }:
+          buildMix {
+            name = "ueberauth_twitter";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "ueberauth_twitter";
+              version = "0.2.2";
+              sha256 =
+                "911a227b8290e8d65cee8d45015477d4ea51dbcf637c8a41ff88b34fcc5ab65a";
+            };
+            beamDeps  = [ ueberauth_0_2_0 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''An Uberauth strategy for Twitter
+                            authentication.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ueberauth/ueberauth_twitter";
+            };
+          }
+      ) {};
+
+    ueberauth_twitter = ueberauth_twitter_0_2_2;
+
+    ui_0_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "ui";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "ui";
+              version = "0.1.1";
+              sha256 =
+                "492da59ca39055c0dfc794a2ebd564adb9ed635402c7b46659981f32aa9d94c1";
+            };
+
+            meta = {
+              description = ''An OTP application'';
+
+            };
+          }
+      ) {};
+
+    ui = ui_0_1_1;
+
+    uk_postcode_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "uk_postcode";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "uk_postcode";
+              version = "0.3.0";
+              sha256 =
+                "a03250f6896bef8851f243856d36952e7776a8d2fa654aa4d3336d841cbb59f8";
+            };
+
+            meta = {
+              longDescription = ''UK postcode parsing and validation library.
+                                Validate full postcodes or parts of a postcode,
+                                and can extract parts of a full postcode. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/KushalP/uk_postcode";
+            };
+          }
+      ) {};
+
+    uk_postcode = uk_postcode_0_3_0;
+
+    ulitos_0_3_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "ulitos";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "ulitos";
+              version = "0.3.0";
+              sha256 =
+                "385f5fdc4cb2ea9f2ae3abcdec3f8dcbb120095f9d50acfd4ee58ecef18429d3";
+            };
+
+            meta = {
+              description = ''Erlang common utils'';
+
+              homepage = "https://github.com/palkan/ulitos";
+            };
+          }
+      ) {};
+
+    ulitos = ulitos_0_3_0;
+
+    unit_fun_0_5_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "unit_fun";
+            version = "0.5.1";
+            src = fetchHex {
+              pkg = "unit_fun";
+              version = "0.5.1";
+              sha256 =
+                "adc90b1e6363234d2507b6f1af08186831fb556ee8c8cb62d13fb03b8c3cc93c";
+            };
+
+            meta = {
+              description = ''Library for adding units/dimensions to numeric
+                            types.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/meadsteve/unit_fun";
+            };
+          }
+      ) {};
+
+    unit_fun = unit_fun_0_5_1;
+
+    units_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "units";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "units";
+              version = "1.0.0";
+              sha256 =
+                "edac76cb036b993ef35781701fc561b4a6c95e4d7c89dba0d6f96ae3077b8ffe";
+            };
+
+            meta = {
+              description = ''Common unit conversions for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/solatis/units";
+            };
+          }
+      ) {};
+
+    units = units_1_0_0;
+
+    unsplash_0_3_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_1_5_2, oauth2_0_5_0, httpoison_0_8_1
+        }:
+          buildMix {
+            name = "unsplash";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "unsplash";
+              version = "0.3.0";
+              sha256 =
+                "609ded0d452729df1d6272ca7997a6bd6fb65821606f17d078c73a1b2ecbc37a";
+            };
+            beamDeps  = [ poison_1_5_2 oauth2_0_5_0 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Unsplash API in Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/waynehoover/unsplash-elixir";
+            };
+          }
+      ) {};
+
+    unsplash = unsplash_0_3_0;
+
+    upyun_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "upyun";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "upyun";
+              version = "0.0.1";
+              sha256 =
+                "a5276f371b667efb1da6e48828279963b23d6eb4b5a5225e6f3e19c77c4e4851";
+            };
+
+            meta = {
+              description = ''UPYun sdk for Elixir. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Hor/upyun-elixir";
+            };
+          }
+      ) {};
+
+    upyun = upyun_0_0_1;
+
+    uri_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "uri";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "uri";
+              version = "0.1.0";
+              sha256 =
+                "3833c3b5745fc0822df86c3a3591219048026fea8a535223b440d26029218996";
+            };
+
+            meta = {
+              description = ''URI Parsing/Encoding Library'';
+
+            };
+          }
+      ) {};
+
+    uri = uri_0_1_0;
+
+    uri_template_1_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "uri_template";
+            version = "1.2.0";
+            src = fetchHex {
+              pkg = "uri_template";
+              version = "1.2.0";
+              sha256 =
+                "c1c97235b8571703926e77449cb272f8ae3a0710b6c91099ec6f66f44425a8c0";
+            };
+
+            meta = {
+              description = ''RFC 6570 complient URI template processor'';
+              license = stdenv.lib.licenses.free;
+            };
+          }
+      ) {};
+
+    uri_template = uri_template_1_2_0;
+
+    urilib_0_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "urilib";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "urilib";
+              version = "0.1.1";
+              sha256 =
+                "6000180e6977263e5996921f243e0c152aad29c87d202f8a650acb412c5aa758";
+            };
+
+            meta = {
+              description = ''A RFC-3986 URI Library for parsing and building
+                            URIs'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/gmr/urilib";
+            };
+          }
+      ) {};
+
+    urilib = urilib_0_1_1;
+
+    url_unroller_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1 }:
+          buildMix {
+            name = "url_unroller";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "url_unroller";
+              version = "0.0.2";
+              sha256 =
+                "9e12c97ff7b45e457734293cabfdd1e60dbfe3d4f80ec7706814a84b61cf11ec";
+            };
+            beamDeps  = [ httpoison_0_8_1 ];
+
+            meta = {
+              description = ''A simple url unroller/unshortener'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/semanticart/url_unroller";
+            };
+          }
+      ) {};
+
+    url_unroller = url_unroller_0_0_2;
+
+    urna_0_1_4 = callPackage
+      (
+        {  buildMix, fetchHex, cauldron_0_1_5, jazz_0_2_1 }:
+          buildMix {
+            name = "urna";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "urna";
+              version = "0.1.4";
+              sha256 =
+                "46f531370376bd4730cf7c17eede9b9b92ce46c5a57e9ce1e129fcc17a2b2848";
+            };
+            beamDeps  = [ cauldron_0_1_5 jazz_0_2_1 ];
+
+            meta = {
+              description = ''REST in peace'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/meh/urna";
+            };
+          }
+      ) {};
+
+    urna = urna_0_1_4;
+
+    uuid_0_1_5 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "uuid";
+            version = "0.1.5";
+            src = fetchHex {
+              pkg = "uuid";
+              version = "0.1.5";
+              sha256 =
+                "5cfb91972f5cacb0bcb2f00414d5747dd575d84b864c96f668ab3b729cc08422";
+            };
+
+            meta = {
+              description = ''UUID generator and utilities for Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/zyro/elixir-uuid";
+            };
+          }
+      ) {};
+
+    uuid_1_1_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "uuid";
+            version = "1.1.3";
+            src = fetchHex {
+              pkg = "uuid";
+              version = "1.1.3";
+              sha256 =
+                "dab67ed70fc162595e63b84c38904fb2ea1779909b46a5f61753ba7ddbe9877b";
+            };
+
+            meta = {
+              description = ''UUID generator and utilities for Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/zyro/elixir-uuid";
+            };
+          }
+      ) {};
+
+    uuid = uuid_1_1_3;
+
+    uuid_erl_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, quickrand_1_5_1 }:
+          buildRebar3 {
+            name = "uuid_erl";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "uuid_erl";
+              version = "1.5.1";
+              sha256 =
+                "fd2a8d90693631455073d4ae2b34fdb9d58da30c0ee0e63149fbf320c71b74fa";
+            };
+
+            beamDeps  = [ quickrand_1_5_1 ];
+
+            meta = {
+              description = ''Erlang UUID Implementation'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/uuid";
+            };
+          }
+      ) {};
+
+    uuid_erl = uuid_erl_1_5_1;
+
+    vagrant_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "vagrant";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "vagrant";
+              version = "0.0.1";
+              sha256 =
+                "805a78a9ee586546d0716ddc9afc3417630c48faab4606cf54c863b10a05ce52";
+            };
+
+            meta = {
+              description = ''Vagrant CLI Wrapper'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/mobileoverlord/vagrant";
+            };
+          }
+      ) {};
+
+    vagrant = vagrant_0_0_1;
+
+    valid_field_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex, ecto_2_0_0_beta_0 }:
+          buildMix {
+            name = "valid_field";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "valid_field";
+              version = "0.3.0";
+              sha256 =
+                "258591717d45835be4f3b299a2c332dc33702876c272f2fff455956c4a5409dc";
+            };
+            beamDeps  = [ ecto_2_0_0_beta_0 ];
+
+            meta = {
+              description = ''ValidField aids unit testing a changeset for
+                            valid (and invalid) fields'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dockyard/valid_field";
+            };
+          }
+      ) {};
+
+    valid_field = valid_field_0_3_0;
+
+    varpool_1_5_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "varpool";
+            version = "1.5.1";
+            src = fetchHex {
+              pkg = "varpool";
+              version = "1.5.1";
+              sha256 =
+                "ff6059bdcd0efad606e8c54ee623cfeaef59778c18e343dd772e84d99d188e26";
+            };
+
+            meta = {
+              description = ''Erlang Process Pools as a Local Variable'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/varpool";
+            };
+          }
+      ) {};
+
+    varpool = varpool_1_5_1;
+
+    verify_origin_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1 }:
+          buildMix {
+            name = "verify_origin";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "verify_origin";
+              version = "0.1.0";
+              sha256 =
+                "90834033676cb0ca632f208f489f6eb92ae94323fe7243efba577e1deb031167";
+            };
+            beamDeps  = [ plug_1_1_1 ];
+
+            meta = {
+              description = ''A library for using Origin header checking to
+                            prevent CSRF'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/danmcclain/verify_origin";
+            };
+          }
+      ) {};
+
+    verify_origin = verify_origin_0_1_0;
+
+    verk_0_9_6 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          timex_1_0_1,
+          redix_0_3_4,
+          poolboy_1_5_1,
+          poison_1_5_2
+        }:
+          buildMix {
+            name = "verk";
+            version = "0.9.6";
+            src = fetchHex {
+              pkg = "verk";
+              version = "0.9.6";
+              sha256 =
+                "a8b021d474d199c946fc6b7b38053218d8157faa60e9068c18db86ea5a978869";
+            };
+            beamDeps  = [ timex_1_0_1 redix_0_3_4 poolboy_1_5_1 poison_1_5_2
+                      ];
+
+            meta = {
+              description = ''Verk is a job processing system backed by
+                            Redis.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edgurgel/verk";
+            };
+          }
+      ) {};
+
+    verk = verk_0_9_6;
+
+    verk_web_0_9_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          verk_0_9_6,
+          phoenix_html_2_5_0,
+          phoenix_1_1_4,
+          gettext_0_10_0,
+          cowboy_1_0_4
+        }:
+          buildMix {
+            name = "verk_web";
+            version = "0.9.1";
+            src = fetchHex {
+              pkg = "verk_web";
+              version = "0.9.1";
+              sha256 =
+                "71eb5c4ab6f73676b21c24b1ba86a3c11a1979339d83ab52a77a3be70da6e61b";
+            };
+            beamDeps  = [
+                          verk_0_9_6
+                          phoenix_html_2_5_0
+                          phoenix_1_1_4
+                          gettext_0_10_0
+                          cowboy_1_0_4
+                        ];
+
+            meta = {
+              description = ''A Verk dashboard'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edgurgel/verk_web";
+            };
+          }
+      ) {};
+
+    verk_web = verk_web_0_9_1;
+
+    vex_0_5_5 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "vex";
+            version = "0.5.5";
+            src = fetchHex {
+              pkg = "vex";
+              version = "0.5.5";
+              sha256 =
+                "fade5440a742304214d1cb53d5ce6bd39dafb6e2ae87e5ce36041a7aa4c365f9";
+            };
+
+            meta = {
+              description = ''An extensible data validation library for
+                            Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/CargoSense/vex";
+            };
+          }
+      ) {};
+
+    vex = vex_0_5_5;
+
+    viktor_0_0_5 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_1 }:
+          buildMix {
+            name = "viktor";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "viktor";
+              version = "0.0.5";
+              sha256 =
+                "df49c25a93ea36d6f65b25716c894a9479ab6f990ed138170bdeea2930ef6cec";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Client API wrapper for League of Legends API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/josephyi/viktor";
+            };
+          }
+      ) {};
+
+    viktor = viktor_0_0_5;
+
+    vimeo_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
+          buildMix {
+            name = "vimeo";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "vimeo";
+              version = "0.0.2";
+              sha256 =
+                "62adf724e67b6fefa2ecc2fcc770e320f4133676cf67cd68a39e5ca45ddd3377";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
+
+            meta = {
+              description = ''Vimeo API v3 client library for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lilfaf/vimeo.ex";
+            };
+          }
+      ) {};
+
+    vimeo = vimeo_0_0_2;
+
+    virus_total_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, jsx_2_8_0, httpoison_0_8_1 }:
+          buildMix {
+            name = "virus_total";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "virus_total";
+              version = "0.0.1";
+              sha256 =
+                "bed3680d17c98f978a90f5b443b6e269ee0a3f2239d2262502d8d10ee042ebfa";
+            };
+            beamDeps  = [ jsx_2_8_0 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Elixir OTP application for the VirusTotal Public
+                            API v2.0'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dtykocki/virus_total";
+            };
+          }
+      ) {};
+
+    virus_total = virus_total_0_0_1;
+
+    voorhees_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, ex_doc_0_11_4 }:
+          buildMix {
+            name = "voorhees";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "voorhees";
+              version = "0.1.1";
+              sha256 =
+                "0cacff8371280ede205633691a60604f1c3d771508f9b7ffa83d523526326112";
+            };
+            beamDeps  = [ poison_2_1_0 ex_doc_0_11_4 ];
+
+            meta = {
+              description = ''A library for validating JSON responses'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/danmcclain/voorhees";
+            };
+          }
+      ) {};
+
+    voorhees = voorhees_0_1_1;
+
+    watcher_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "watcher";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "watcher";
+              version = "1.0.0";
+              sha256 =
+                "53620951438e857d24f1ef324f94f42b90e8d6069dd6553ec4e6331370418b2b";
+            };
+
+            meta = {
+              description = ''Watcher for GenEvent'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edgurgel/watcher";
+            };
+          }
+      ) {};
+
+    watcher = watcher_1_0_0;
+
+    wayback_archiver_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, httpotion_2_1_0, floki_0_7_1 }:
+          buildMix {
+            name = "wayback_archiver";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "wayback_archiver";
+              version = "0.0.1";
+              sha256 =
+                "9f8bea06d6dcac6c017a3a41859373c10a1b46fb133db47300c2ae7c9fada590";
+            };
+            beamDeps  = [ httpotion_2_1_0 floki_0_7_1 ];
+
+            meta = {
+              description = ''Send URLs to Wayback Machine'';
+              license = stdenv.lib.licenses.free;
+            };
+          }
+      ) {};
+
+    wayback_archiver = wayback_archiver_0_0_1;
+
+    web_socket_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_4_0, plug_0_12_2, cowboy_1_0_4 }:
+          buildMix {
+            name = "web_socket";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "web_socket";
+              version = "0.0.1";
+              sha256 =
+                "b0afdac11840d17b2a2af5cc1939416fac13f64209083e06e6873002ae44ce12";
+            };
+            beamDeps  = [ poison_1_4_0 plug_0_12_2 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Modular web framework '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/slogsdon/plug-web-socket";
+            };
+          }
+      ) {};
+
+    web_socket = web_socket_0_0_1;
+
+    webassembly_0_6_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "webassembly";
+            version = "0.6.1";
+            src = fetchHex {
+              pkg = "webassembly";
+              version = "0.6.1";
+              sha256 =
+                "687cc567c6c58e154ca5f5bd45986c6fda530c42702ab7c6007f6cb663db4137";
+            };
+
+            meta = {
+              longDescription = ''WebAssembly is a web DSL for Elixir. You
+                                create html structure straight using do blocks.
+                                Means, you can intermix html-building blocks
+                                with full Elixir syntax. DSL output is an
+                                iolist, which you can flatten to string, but
+                                better use is to just feed it to the socket (via
+                                Plug & Cowboy). WebAssembly aims to have 100%
+                                test coverage.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/herenowcoder/webassembly";
+            };
+          }
+      ) {};
+
+    webassembly = webassembly_0_6_1;
+
+    webdriver_0_8_1 = callPackage
+      (
+        {  buildMix, fetchHex, jazz_0_2_1, httpotion_2_2_0 }:
+          buildMix {
+            name = "webdriver";
+            version = "0.8.1";
+            src = fetchHex {
+              pkg = "webdriver";
+              version = "0.8.1";
+              sha256 =
+                "fe2009920fb210cd50df3a7d2bb40cd6f2844a538d52a48952f18008e1c5f3d3";
+            };
+            beamDeps  = [ jazz_0_2_1 httpotion_2_2_0 ];
+
+            meta = {
+              description = ''Webdriver protocol for driving web browsers.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/stuart/elixir-webdriver";
+            };
+          }
+      ) {};
+
+    webdriver = webdriver_0_8_1;
+
+    weber_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "weber";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "weber";
+              version = "0.1.0";
+              sha256 =
+                "742c45b3c99e207dd0aeccb818edd2ace4af10699c96fbcee0ce2f692dc5fe12";
+            };
+
+            meta = {
+              description = ''weber - is Elixir MVC web framework.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/elixir-web/weber";
+            };
+          }
+      ) {};
+
+    weber = weber_0_1_0;
+
+    webpay_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "webpay";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "webpay";
+              version = "0.0.4";
+              sha256 =
+                "abab40fc7fda25a55d3a3dce4327d3f322df378432a9ed5e7c43e553989f467e";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Elixir Webpay API wrapper'';
+
+            };
+          }
+      ) {};
+
+    webpay = webpay_0_0_4;
+
+    websocket_client_1_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "websocket_client";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "websocket_client";
+              version = "1.1.0";
+              sha256 =
+                "21c3d0df073634f2ca349af5b54a61755d637d6390c34d8d57c064f68ca92acd";
+            };
+
+            meta = {
+              description = ''Erlang websocket client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sanmiguel/websocket_client";
+            };
+          }
+      ) {};
+
+    websocket_client = websocket_client_1_1_0;
+
+    wechat_check_signature_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1 }:
+          buildMix {
+            name = "wechat_check_signature";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "wechat_check_signature";
+              version = "0.0.1";
+              sha256 =
+                "5c5bb053c15082e12ad6da485fc4f711efa9198107368a42456aeafcf870caec";
+            };
+            beamDeps  = [ plug_1_1_1 ];
+
+            meta = {
+              description = ''An Elixir Plug for checking wechat signature.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/octocandy/wechat_check_signature";
+            };
+          }
+      ) {};
+
+    wechat_check_signature = wechat_check_signature_0_0_1;
+
+    wechatex_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1 }:
+          buildMix {
+            name = "wechatex";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "wechatex";
+              version = "0.0.1";
+              sha256 =
+                "211971a79d38326dbf5e603ee00165708eb17670f2a84e54df929191c6fef81c";
+            };
+            beamDeps  = [ plug_1_1_1 ];
+
+            meta = {
+              description = ''Wechat plugins for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/octocandy/wechatex";
+            };
+          }
+      ) {};
+
+    wechatex = wechatex_0_0_1;
+
+    weebo_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "weebo";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "weebo";
+              version = "0.1.2";
+              sha256 =
+                "335367353f5675f3ce0ced41512b554da0f986efc4064479d403726c0a169231";
+            };
+
+            meta = {
+              description = ''An XML-RPC parser/formatter for Elixir, with full
+                            support for datatype mapping!'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/stevenschobert/weebo";
+            };
+          }
+      ) {};
+
+    weebo = weebo_0_1_2;
+
+    white_bread_2_5_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "white_bread";
+            version = "2.5.0";
+            src = fetchHex {
+              pkg = "white_bread";
+              version = "2.5.0";
+              sha256 =
+                "0256755080fadfbd45285ace5279147a6f8af3df2ae89eed70b5072471f21360";
+            };
+
+            meta = {
+              longDescription = ''Story BDD tool based on cucumber. Parses
+                                Gherkin formatted feature files and executes
+                                them as tests.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/meadsteve/white-bread";
+            };
+          }
+      ) {};
+
+    white_bread = white_bread_2_5_0;
+
+    wifi_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_4_0, httpoison_0_8_1 }:
+          buildMix {
+            name = "wifi";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "wifi";
+              version = "0.2.0";
+              sha256 =
+                "0060d0dda9308e9dc652e83f7646485d932188a11e17fb814125ccd7449effc5";
+            };
+            beamDeps  = [ poison_1_4_0 httpoison_0_8_1 ];
+
+            meta = {
+              longDescription = ''Various utility functions for working with
+                                the local Wifi network in Elixir. These
+                                functions are mostly useful in scripts that
+                                could benefit from knowing the current location
+                                of the computer or the Wifi surroundings.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gausby/wifi";
+            };
+          }
+      ) {};
+
+    wifi = wifi_0_2_0;
+
+    wire_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, bencoder_0_0_7 }:
+          buildMix {
+            name = "wire";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "wire";
+              version = "0.2.0";
+              sha256 =
+                "0a2ce1329c321bd675a79152e3ed2e99cc59b3747112498e62b14bf686ca7fba";
+            };
+            beamDeps  = [ bencoder_0_0_7 ];
+
+            meta = {
+              description = ''Encode and decode bittorrent peer wire protocol
+                            messages'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/alehander42/wire";
+            };
+          }
+      ) {};
+
+    wire = wire_0_2_0;
+
+    witchcraft_0_4_2 = callPackage
+      (
+        {  buildMix, fetchHex, quark_1_0_2, algae_0_9_1 }:
+          buildMix {
+            name = "witchcraft";
+            version = "0.4.2";
+            src = fetchHex {
+              pkg = "witchcraft";
+              version = "0.4.2";
+              sha256 =
+                "cdd6379d5a8b0baab3b79b0c9b87473d8292e0d9a80fa2e21fac61d31218609f";
+            };
+            beamDeps  = [ quark_1_0_2 algae_0_9_1 ];
+
+            meta = {
+              description = ''Common algebraic structures and functions'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/robot-overlord/witchcraft";
+            };
+          }
+      ) {};
+
+    witchcraft = witchcraft_0_4_2;
+
+    wizard_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "wizard";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "wizard";
+              version = "0.1.0";
+              sha256 =
+                "cc22faf9e76f50592906b816027fef4ee1942a59005cf8c831c7f76e48b9193e";
+            };
+
+            meta = {
+              description = ''Wizard is a math and statistics library for
+                            Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/raywan/wizard";
+            };
+          }
+      ) {};
+
+    wizard = wizard_0_1_0;
+
+    wizardry_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_1, comeonin_1_6_0 }:
+          buildMix {
+            name = "wizardry";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "wizardry";
+              version = "0.0.1";
+              sha256 =
+                "4a85b8c3e5813dee20aa0d5503811568743644883723c9b226436616c9a779a3";
+            };
+            beamDeps  = [ plug_1_1_1 comeonin_1_6_0 ];
+
+            meta = {
+              description = ''Simple, low-level user account framework for
+                            Phoenix Framework'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/knrz/wizardry";
+            };
+          }
+      ) {};
+
+    wizardry = wizardry_0_0_1;
+
+    work_queue_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, pipe_while_ok_0_0_2 }:
+          buildMix {
+            name = "work_queue";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "work_queue";
+              version = "0.0.3";
+              sha256 =
+                "31b000cf454ee0a8f90408ea10c33ee6cdd062256a7dd3aac7fe67c48fcbb424";
+            };
+            beamDeps  = [ pipe_while_ok_0_0_2 ];
+
+            meta = {
+              description = ''A simple implement of the Hungry Consumer model
+                            of concurrent servers. '';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/pragdave/work_queue";
+            };
+          }
+      ) {};
+
+    work_queue = work_queue_0_0_3;
+
+    worker_pool_1_0_4 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "worker_pool";
+            version = "1.0.4";
+            src = fetchHex {
+              pkg = "worker_pool";
+              version = "1.0.4";
+              sha256 =
+                "7854a3b94e9624728db3a0475d00e7d0728adf3bf2ee3802bbf8ca10356d6f64";
+            };
+
+            meta = {
+              description = ''Erlang Worker Pool'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/inaka/worker_pool";
+            };
+          }
+      ) {};
+
+    worker_pool = worker_pool_1_0_4;
+
+    workex_0_10_0 = callPackage
+      (
+        {  buildMix, fetchHex, exactor_2_2_0 }:
+          buildMix {
+            name = "workex";
+            version = "0.10.0";
+            src = fetchHex {
+              pkg = "workex";
+              version = "0.10.0";
+              sha256 =
+                "9bb48e3ff0294021ecc78d86d4a7521dbe46e129ae9e51a46c9f2a67a63e9cbd";
+            };
+            beamDeps  = [ exactor_2_2_0 ];
+
+            meta = {
+              description = ''A behaviour for simple flow control and
+                            backpressure.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sasa1977/workex";
+            };
+          }
+      ) {};
+
+    workex = workex_0_10_0;
+
+    workshop_0_5_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "workshop";
+            version = "0.5.1";
+            src = fetchHex {
+              pkg = "workshop";
+              version = "0.5.1";
+              sha256 =
+                "f6eaab9360764e83cca6892d939357e505fe163412b22acca7ea4fe307c8bed2";
+            };
+
+            meta = {
+              longDescription = ''Mix tasks for creating and running
+                                interactive workshops for teaching people how to
+                                program in Elixir, and other things.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/gausby/workshop";
+            };
+          }
+      ) {};
+
+    workshop = workshop_0_5_1;
+
+    world_json_0_1_5 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_3_1 }:
+          buildMix {
+            name = "world_json";
+            version = "0.1.5";
+            src = fetchHex {
+              pkg = "world_json";
+              version = "0.1.5";
+              sha256 =
+                "3a960d9794627a1927f7410185bf36c22d6b4d8f079bf74e131d0f5606b7f567";
+            };
+            beamDeps  = [ poison_1_3_1 ];
+
+            meta = {
+              description = ''topojson country and state/province collections
+                            for elixir/erlang'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/camshaft/world_json_ex";
+            };
+          }
+      ) {};
+
+    world_json = world_json_0_1_5;
+
+    wpa_supplicant_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "wpa_supplicant";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "wpa_supplicant";
+              version = "0.1.0";
+              sha256 =
+                "8a73ca51203401755d42ba636918106540aa3723006dab344dc8a7ec8fa2f3d5";
+            };
+
+            meta = {
+              longDescription = ''Elixir interface to the wpa_supplicant
+                                daemon. The wpa_supplicant provides application
+                                support for scanning for access points, managing
+                                Wi-Fi connections, and handling all of the
+                                security and other parameters associated with
+                                Wi-Fi. '';
+              license = with stdenv.lib.licenses; [ asl20 free ];
+              homepage = "https://github.com/fhunleth/wpa_supplicant.ex";
+            };
+          }
+      ) {};
+
+    wpa_supplicant = wpa_supplicant_0_1_0;
+
+    wykop_api_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "wykop_api";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "wykop_api";
+              version = "0.0.4";
+              sha256 =
+                "0c2acade581168e5cdf3d1dbde53183bc1c49882c8ba8793e045f20d5a9a26d0";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Library for Wykop API.'';
+              license = stdenv.lib.licenses.cc0;
+              homepage = "https://github.com/remiq/wykop_api_elixir";
+            };
+          }
+      ) {};
+
+    wykop_api = wykop_api_0_0_4;
+
+    xe_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_1, floki_0_7_1 }:
+          buildMix {
+            name = "xe";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "xe";
+              version = "0.0.1";
+              sha256 =
+                "53d693612db1343c36a7bbe6286c23f7ccfdbd44500c2a38970743238d230a77";
+            };
+            beamDeps  = [ httpoison_0_8_1 floki_0_7_1 ];
+
+            meta = {
+              description = ''Real time conversion for currencies'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/paulodiniz/xe";
+            };
+          }
+      ) {};
+
+    xe = xe_0_0_1;
+
+    xfighter_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "xfighter";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "xfighter";
+              version = "0.2.1";
+              sha256 =
+                "67bb43379cd89b4b95f65f02ad5421719723d262fdbe7e399fb82ac7f3b490a8";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''An API wrapper for the programming game
+                            Stockfighter.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitchef/xfighter";
+            };
+          }
+      ) {};
+
+    xfighter = xfighter_0_2_1;
+
+    xlsx_parser_0_0_4 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          timex_1_0_1,
+          sweet_xml_0_5_1,
+          simple_agent_0_0_7
+        }:
+          buildMix {
+            name = "xlsx_parser";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "xlsx_parser";
+              version = "0.0.4";
+              sha256 =
+                "53d86e1142483421d5c1fe769f69980560a6809ca37a13c3dcd4c49fee46a831";
+            };
+            beamDeps  = [ timex_1_0_1 sweet_xml_0_5_1 simple_agent_0_0_7 ];
+
+            meta = {
+              longDescription = ''Simple parsing of xlsx spreadsheet data. Data
+                                can be retrieved or written to csv.'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/TheFirstAvenger/elixir-xlsx_parser.git";
+            };
+          }
+      ) {};
+
+    xlsx_parser = xlsx_parser_0_0_4;
+
+    xml_builder_0_0_8 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "xml_builder";
+            version = "0.0.8";
+            src = fetchHex {
+              pkg = "xml_builder";
+              version = "0.0.8";
+              sha256 =
+                "51922bc50e0ef79c757d1016eda2a486f8688cd7307c4519102ea1fea4c5a3cd";
+            };
+
+            meta = {
+              description = ''XML builder for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/joshnuss/xml_builder";
+            };
+          }
+      ) {};
+
+    xml_builder = xml_builder_0_0_8;
+
+    xmlrpc_0_9_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "xmlrpc";
+            version = "0.9.1";
+            src = fetchHex {
+              pkg = "xmlrpc";
+              version = "0.9.1";
+              sha256 =
+                "b2f6941248fa2e55e89dcb69304f58a7cc4203ce68b986260836933be8fac879";
+            };
+
+            meta = {
+              longDescription = ''XML-RPC encoder/decder for Elixir. Supports
+                                all valid datatypes. Input (ie untrusted) is
+                                parsed with erlsom against an xml-schema for
+                                security.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/ewildgoose/elixir-xml_rpc";
+            };
+          }
+      ) {};
+
+    xmlrpc = xmlrpc_0_9_1;
+
+    xoauth2_0_0_3 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_1_5_2, mock_0_1_1, httpoison_0_8_1
+        }:
+          buildMix {
+            name = "xoauth2";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "xoauth2";
+              version = "0.0.3";
+              sha256 =
+                "4a43a0bca1707b579c6a141524666006dd25ed2efdc19aee5d6eeedf6efc3418";
+            };
+            beamDeps  = [ poison_1_5_2 mock_0_1_1 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''A simple XOAuth2 module for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/craigp/elixir_xoauth2";
+            };
+          }
+      ) {};
+
+    xoauth2 = xoauth2_0_0_3;
+
+    xref_runner_0_2_5 = callPackage
+      (
+        {  buildRebar3, fetchHex, getopt_0_8_2 }:
+          buildRebar3 {
+            name = "xref_runner";
+            version = "0.2.5";
+            src = fetchHex {
+              pkg = "xref_runner";
+              version = "0.2.5";
+              sha256 =
+                "12ca46c02789b0b2755284dedeb73aac0d9a3120c28c992040feb86766ee2c9a";
+            };
+
+            beamDeps  = [ getopt_0_8_2 ];
+
+            meta = {
+              description = ''Xref Runner'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/inaka/xref_runner";
+            };
+          }
+      ) {};
+
+    xref_runner = xref_runner_0_2_5;
+
+    yahoo_fx_0_1_3 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          hackney_1_0_6,
+          time_seer_0_0_5,
+          httpoison_0_7_5
+        }:
+          buildMix {
+            name = "yahoo_fx";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "yahoo_fx";
+              version = "0.1.3";
+              sha256 =
+                "6f8691b2de712ea5e870f48291a2a2debd8ae8977e37480e69ce81f423e40479";
+            };
+            beamDeps  = [ hackney_1_0_6 time_seer_0_0_5 httpoison_0_7_5 ];
+
+            meta = {
+              longDescription = ''YahooFx is an Elixir library for getting
+                                currency exchange rates from Yahoo Finance'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lau/yahoo_fx";
+            };
+          }
+      ) {};
+
+    yahoo_fx = yahoo_fx_0_1_3;
+
+    yaml_elixir_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "yaml_elixir";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "yaml_elixir";
+              version = "1.0.0";
+              sha256 =
+                "8d318d459561678bbe42bdcc7282ebe9dd7538f34045812054edf226634bf4a7";
+            };
+
+            meta = {
+              description = ''Yaml parser for Elixir based on native Erlang
+                            implementation.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/KamilLelonek/yaml-elixir";
+            };
+          }
+      ) {};
+
+    yaml_elixir = yaml_elixir_1_0_0;
+
+    yar_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, socket_0_3_1 }:
+          buildMix {
+            name = "yar";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "yar";
+              version = "0.1.0";
+              sha256 =
+                "23cdbe07714deee32a3d4be77e7c392ef57ab8ad28d10e053edf1cb0a136c2e6";
+            };
+            beamDeps  = [ socket_0_3_1 ];
+
+            meta = {
+              description = ''Yet Another Redis client (implemented in pure
+                            elixir)'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dantswain/yar";
+            };
+          }
+      ) {};
+
+    yar = yar_0_1_0;
+
+    yggdrasil_1_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, exredis_0_2_3, amqp_0_1_4 }:
+          buildMix {
+            name = "yggdrasil";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "yggdrasil";
+              version = "1.1.0";
+              sha256 =
+                "f4412a82c09c09b70a9520f91113d9aa064f74b597ff5bdad6601ca7cf860f63";
+            };
+            beamDeps  = [ exredis_0_2_3 amqp_0_1_4 ];
+
+            meta = {
+              longDescription = ''Yggdrasil is an app to manage subscriptions
+                                to several brokers. It has simple
+                                implementations for Redis and RabbitMQ, but they
+                                can easily be extended. Also provides a
+                                `behaviour` to define custom brokers.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gmtprime/yggdrasil";
+            };
+          }
+      ) {};
+
+    yggdrasil = yggdrasil_1_1_0;
+
+    yocingo_0_0_2 = callPackage
+      (
+        {
+          buildMix, fetchHex, httpoison_0_8_1, exjsx_3_2_0, earmark_0_2_1
+        }:
+          buildMix {
+            name = "yocingo";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "yocingo";
+              version = "0.0.2";
+              sha256 =
+                "3ce350bb833e72edc684dc6ece956146161d4b7215cd9557f95bb2d7dcb1abf4";
+            };
+            beamDeps  = [ httpoison_0_8_1 exjsx_3_2_0 earmark_0_2_1 ];
+
+            meta = {
+              longDescription = ''This is a full Telegram Bot API. With this
+                                module you can create your own Telegram Bot.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Yawolf/yocingo";
+            };
+          }
+      ) {};
+
+    yocingo = yocingo_0_0_2;
+
+    yodlee_0_0_9 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1, hackney_1_4_8
+        }:
+          buildMix {
+            name = "yodlee";
+            version = "0.0.9";
+            src = fetchHex {
+              pkg = "yodlee";
+              version = "0.0.9";
+              sha256 =
+                "4bc779bc847bfb39ebc04789116da830d049e0755a594d5d8f38dffc250cf69e";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 hackney_1_4_8 ];
+
+            meta = {
+              description = ''Yodlee API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/levanto-financial/yodlee-elixir";
+            };
+          }
+      ) {};
+
+    yodlee = yodlee_0_0_9;
+
+    yomel_0_5_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "yomel";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "yomel";
+              version = "0.5.0";
+              sha256 =
+                "737be278c9ae9ed40b24a45a461ea47b4979429e1d51b28961d43ee3a6426827";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''Decodes yaml into elixir terms'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Joe-noh/yomel";
+            };
+          }
+      ) {};
+
+    yomel = yomel_0_5_0;
+
+    ytx_0_0_5 = callPackage
+      (
+        {  buildMix, fetchHex, rapidax_0_0_3 }:
+          buildMix {
+            name = "ytx";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "ytx";
+              version = "0.0.5";
+              sha256 =
+                "a30877517201e1c964627782345273fa7ae2157591d1ae6f5663333f370db6f6";
+            };
+            beamDeps  = [ rapidax_0_0_3 ];
+
+            meta = {
+              description = ''Youtube API Client for Elixir'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/victorlcampos/ytx";
+            };
+          }
+      ) {};
+
+    ytx = ytx_0_0_5;
+
+    yuri_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "yuri";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "yuri";
+              version = "1.0.0";
+              sha256 =
+                "4a4c851f7ea20141201a9b69eaefb300b420e6c94a1513519aaef39f63d939c5";
+            };
+
+            meta = {
+              description = ''Simple struct for representing URIs.'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/kemonomachi/yuri";
+            };
+          }
+      ) {};
+
+    yuri = yuri_1_0_0;
+
+    yyid_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "yyid";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "yyid";
+              version = "0.1.2";
+              sha256 =
+                "37fb0acf8e7f30e66fbba18326b357aeaeb19b671b59d4beb8c8bd943370eeab";
+            };
+
+            meta = {
+              longDescription = ''Generates random tokens that look like type 4
+                                UUIDs: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/janlelis/yyid.ex";
+            };
+          }
+      ) {};
+
+    yyid = yyid_0_1_2;
+
+    zanox_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_0, httpoison_0_8_0 }:
+          buildMix {
+            name = "zanox";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "zanox";
+              version = "0.0.1";
+              sha256 =
+                "30af29400aaa0ff207ca4f24849d563c1691185faf86fc2c7f534b550175dee2";
+            };
+            beamDeps  = [ poison_1_5_0 httpoison_0_8_0 ];
+
+            meta = {
+              description = ''Zanox API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rafaelss/zanox";
+            };
+          }
+      ) {};
+
+    zanox = zanox_0_0_1;
+
+    zarex_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "zarex";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "zarex";
+              version = "0.2.0";
+              sha256 =
+                "2e7d632116b1ec750ab2bd86e4936cc6f84a467c98a9507b4b3cf828f1edc1e1";
+            };
+
+            meta = {
+              description = ''Filename sanitization for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ricn/zarex";
+            };
+          }
+      ) {};
+
+    zarex = zarex_0_2_0;
+
+    zbase32_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "zbase32";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "zbase32";
+              version = "1.0.0";
+              sha256 =
+                "bea25493cb512cf0d0ee4e1140c4dc276a27cc299c9b304117ec7b7e4af557b6";
+            };
+
+            meta = {
+              longDescription = ''Efficient implementation of z-base-32, Phil
+                                Zimmermann`s human-oriented base-32 encoding.
+                                z-base-32 is a Base32 encoding designed to be
+                                easier for human use and more compact. It
+                                includes 1, 8 and 9 but excludes l, v and 2. It
+                                also permutes the alphabet so that the easier
+                                characters are the ones that occur more
+                                frequently. It compactly encodes bitstrings
+                                whose length in bits is not a multiple of 8, and
+                                omits trailing padding characters. z-base-32 was
+                                used in Mnet open source project, and is
+                                currently used in Phil Zimmermann`s ZRTP
+                                protocol, and in the Tahoe-LAFS open source
+                                project.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pspdfkit-labs/zbase32";
+            };
+          }
+      ) {};
+
+    zbase32 = zbase32_1_0_0;
+
+    zencoder_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_4_0, httpotion_1_0_0 }:
+          buildMix {
+            name = "zencoder";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "zencoder";
+              version = "1.0.1";
+              sha256 =
+                "b2220575aa2ee1da5101774c82e1d68f2e5f86d6cefd6f04811c882fc05473bc";
+            };
+            beamDeps  = [ poison_1_4_0 httpotion_1_0_0 ];
+
+            meta = {
+              description = ''Elixir API wrapper for the Zencoder video
+                            transcoding API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zencoder/zencoder-ex";
+            };
+          }
+      ) {};
+
+    zencoder = zencoder_1_0_1;
+
+    zipcloudx_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+          buildMix {
+            name = "zipcloudx";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "zipcloudx";
+              version = "0.0.2";
+              sha256 =
+                "1e474ec0229b6dd1404c34fbd2a851d136d9549d5ecccbd01d017baac64b264e";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+
+            meta = {
+              description = ''Elixir zipcloud API wrapper'';
+
+            };
+          }
+      ) {};
+
+    zipcloudx = zipcloudx_0_0_2;
+
+    zipper_0_1_5 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "zipper";
+            version = "0.1.5";
+            src = fetchHex {
+              pkg = "zipper";
+              version = "0.1.5";
+              sha256 =
+                "7df5552f41169a8feb1a2e81e2753ec4e4debb7d48cdf1edc77037205782d547";
+            };
+
+            meta = {
+              description = ''Generic Zipper Implementation for Erlang'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/inaka/zipper";
+            };
+          }
+      ) {};
+
+    zipper = zipper_0_1_5;
+
+    zipper_tree_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "zipper_tree";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "zipper_tree";
+              version = "0.1.1";
+              sha256 =
+                "df6e81d6be9c9ac582bcde541e263d1379485f5cbb5b7cd1b55cd031fe7741ea";
+            };
+
+            meta = {
+              description = ''Methods for travelsal and modification of Trees
+                            using a zipper. '';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/Dkendal/zipper_tree";
+            };
+          }
+      ) {};
+
+    zipper_tree = zipper_tree_0_1_1;
+
+  };
+in stdenv.lib.fix' (stdenv.lib.extends overrides packages)
\ No newline at end of file
diff --git a/pkgs/development/beam-modules/hex-registry-snapshot.nix b/pkgs/development/beam-modules/hex-registry-snapshot.nix
new file mode 100644
index 00000000000..378fb382f95
--- /dev/null
+++ b/pkgs/development/beam-modules/hex-registry-snapshot.nix
@@ -0,0 +1,23 @@
+{stdenv, writeText, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+    name = "hex-registry";
+    rev = "329ae2b";
+    version = "0.0.0+build.${rev}";
+
+    src = fetchFromGitHub {
+        owner = "erlang-nix";
+        repo = "hex-pm-registry-snapshots";
+        inherit rev;
+        sha256 = "1rs3z8psfvy10mzlfvkdzbflgikcnq08r38kfi0f8p5wvi8f8hmh";
+    };
+
+    installPhase = ''
+       mkdir -p "$out/var/hex"
+       zcat "registry.ets.gz" > "$out/var/hex/registry.ets"
+    '';
+
+    setupHook = writeText "setupHook.sh" ''
+        export HEX_REGISTRY_SNAPSHOT="$1/var/hex/registry.ets"
+   '';
+}
diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix
new file mode 100644
index 00000000000..2cb06b07e59
--- /dev/null
+++ b/pkgs/development/beam-modules/hex/default.nix
@@ -0,0 +1,58 @@
+{stdenv, fetchFromGitHub, writeText, elixir }:
+
+let
+  shell = drv: stdenv.mkDerivation {
+          name = "interactive-shell-${drv.name}";
+          buildInputs = [ drv ];
+    };
+
+  pkg = self: stdenv.mkDerivation rec {
+    name = "hex";
+    version = "v0.11.3";
+
+    src = fetchFromGitHub {
+        owner = "hexpm";
+        repo = "hex";
+        rev = "f5e200ad95f030f0a7ab88a86545dd0dde1ee521";
+        sha256 = "0n4cgmnbmglarydls9pmxznbzp49pv85ncbd4f2lp1fm7qr08xfw";
+    };
+
+    setupHook = writeText "setupHook.sh" ''
+       addToSearchPath ERL_LIBS "$1/lib/erlang/lib/"
+    '';
+
+    dontStrip = true;
+
+    buildInputs = [ elixir ];
+
+    buildPhase = ''
+      runHook preBuild
+      export HEX_OFFLINE=1
+      export HEX_HOME=./
+      export MIX_ENV=prod
+      mix compile
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/lib/erlang/lib
+      cp -r ./_build/prod/lib/hex $out/lib/erlang/lib/
+
+      runHook postInstall
+    '';
+
+    meta = {
+      description = "Package manager for the Erlang VM https://hex.pm";
+      license = stdenv.lib.licenses.mit;
+      homepage = "https://github.com/hexpm/hex";
+      maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
+    };
+
+    passthru = {
+      env = shell self;
+    };
+
+};
+in stdenv.lib.fix pkg
diff --git a/pkgs/development/beam-modules/mix-bootstrap b/pkgs/development/beam-modules/mix-bootstrap
new file mode 100755
index 00000000000..c4a1b364daa
--- /dev/null
+++ b/pkgs/development/beam-modules/mix-bootstrap
@@ -0,0 +1,112 @@
+#!/usr/bin/env escript
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%%! -smp enable
+%%% ---------------------------------------------------------------------------
+%%% @doc
+%%% The purpose of this command is to prepare a rebar3 project so that
+%%% rebar3 understands that the dependencies are all already
+%%% installed. If you want a hygienic build on nix then you must run
+%%% this command before running rebar3. I suggest that you add a
+%%% `Makefile` to your project and have the bootstrap command be a
+%%% dependency of the build commands. See the nix documentation for
+%%% more information.
+%%%
+%%% This command designed to have as few dependencies as possible so
+%%% that it can be a dependency of root level packages like rebar3. To
+%%% that end it does many things in a fairly simplistic way. That is
+%%% by design.
+%%%
+%%% ### Assumptions
+%%%
+%%% This command makes the following assumptions:
+%%%
+%%% * It is run in a nix-shell or nix-build environment
+%%% * that all dependencies have been added to the ERL_LIBS
+%%%   Environment Variable
+
+-record(data, {version
+              , erl_libs
+              , root
+              , name
+              , registry_snapshot}).
+-define(LOCAL_HEX_REGISTRY, "registry.ets").
+
+main(Args) ->
+    {ok, RequiredData} = gather_required_data_from_the_environment(Args),
+    ok = bootstrap_libs(RequiredData).
+
+%% @doc
+%% This takes an app name in the standard OTP <name>-<version> format
+%% and returns just the app name. Why? because rebar is doesn't
+%% respect OTP conventions in some cases.
+-spec fixup_app_name(file:name()) -> string().
+fixup_app_name(Path) ->
+    BaseName = filename:basename(Path),
+    case string:tokens(BaseName, "-") of
+        [Name, _Version] -> Name;
+        Name -> Name
+    end.
+
+
+-spec gather_required_data_from_the_environment([string()]) -> {ok, #data{}}.
+gather_required_data_from_the_environment(_) ->
+    {ok, #data{ version = guard_env("version")
+              , erl_libs = os:getenv("ERL_LIBS", [])
+              , root = code:root_dir()
+              , name = guard_env("name")
+              , registry_snapshot = guard_env("HEX_REGISTRY_SNAPSHOT")}}.
+
+-spec guard_env(string()) -> string().
+guard_env(Name) ->
+    case os:getenv(Name) of
+        false ->
+            stderr("Expected Environment variable ~s! Are you sure you are "
+                   "running in a Nix environment? Either a nix-build, "
+                   "nix-shell, etc?~n", [Name]),
+            erlang:halt(1);
+        Variable ->
+            Variable
+    end.
+
+-spec bootstrap_libs(#data{}) -> ok.
+bootstrap_libs(#data{erl_libs = ErlLibs}) ->
+    io:format("Bootstrapping dependent libraries~n"),
+    Target = "_build/prod/lib/",
+    Paths = string:tokens(ErlLibs, ":"),
+    CopiableFiles =
+        lists:foldl(fun(Path, Acc) ->
+                            gather_directory_contents(Path) ++ Acc
+                    end, [], Paths),
+    lists:foreach(fun (Path) ->
+                          ok = link_app(Path, Target)
+                  end, CopiableFiles).
+
+-spec gather_directory_contents(string()) -> [{string(), string()}].
+gather_directory_contents(Path) ->
+    {ok, Names} = file:list_dir(Path),
+    lists:map(fun(AppName) ->
+                 {filename:join(Path, AppName), fixup_app_name(AppName)}
+              end, Names).
+
+%% @doc
+%% Makes a symlink from the directory pointed at by Path to a
+%% directory of the same name in Target. So if we had a Path of
+%% {`foo/bar/baz/bash`, `baz`} and a Target of `faz/foo/foos`, the symlink
+%% would be `faz/foo/foos/baz`.
+-spec link_app({string(), string()}, string()) -> ok.
+link_app({Path, TargetFile}, TargetDir) ->
+    Target = filename:join(TargetDir, TargetFile),
+    ok = make_symlink(Path, Target).
+
+-spec make_symlink(string(), string()) -> ok.
+make_symlink(Path, TargetFile) ->
+    file:delete(TargetFile),
+    ok = filelib:ensure_dir(TargetFile),
+    io:format("Making symlink from ~s to ~s~n", [Path, TargetFile]),
+    ok = file:make_symlink(Path, TargetFile).
+
+%% @doc
+%% Write the result of the format string out to stderr.
+-spec stderr(string(), [term()]) -> ok.
+stderr(FormatStr, Args) ->
+    io:put_chars(standard_error, io_lib:format(FormatStr, Args)).
diff --git a/pkgs/development/beam-modules/pgsql/default.nix b/pkgs/development/beam-modules/pgsql/default.nix
new file mode 100644
index 00000000000..6fc1587a38e
--- /dev/null
+++ b/pkgs/development/beam-modules/pgsql/default.nix
@@ -0,0 +1,34 @@
+{stdenv, fetchFromGitHub, buildRebar3 }:
+
+let
+  shell = drv: stdenv.mkDerivation {
+          name = "interactive-shell-${drv.name}";
+          buildInputs = [ drv ];
+    };
+
+  pkg = self: buildRebar3 rec {
+    name = "pgsql";
+    version = "25+beta.2";
+
+    src = fetchFromGitHub {
+        owner = "semiocast";
+        repo = "pgsql";
+        rev = "14f632bc89e464d82ce3ef12a67ed8c2adb5b60c";
+        sha256 = "17dcahiwlw61zhy8aq9rn46lwb35fb9q3372s4wmz01czm8c348w";
+    };
+
+    dontStrip = true;
+
+    meta = {
+      description = "Erlang PostgreSQL Driver";
+      license = stdenv.lib.licenses.mit;
+      homepage = "https://github.com/semiocast/pgsql";
+      maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
+    };
+
+    passthru = {
+      env = shell self;
+    };
+
+};
+in stdenv.lib.fix pkg
diff --git a/pkgs/development/erlang-modules/webdriver/default.nix b/pkgs/development/beam-modules/webdriver/default.nix
similarity index 100%
rename from pkgs/development/erlang-modules/webdriver/default.nix
rename to pkgs/development/beam-modules/webdriver/default.nix
diff --git a/pkgs/development/erlang-modules/default.nix b/pkgs/development/erlang-modules/default.nix
deleted file mode 100644
index f3adf18df0c..00000000000
--- a/pkgs/development/erlang-modules/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ stdenv, pkgs }: #? import <nixpkgs> {} }:
-
-let
-  self = rec {
-    hex = import ./hex-packages.nix { stdenv = stdenv; callPackage = self.callPackage; };
-    callPackage = pkgs.lib.callPackageWith (pkgs // self // hex);
-
-    buildRebar3 = callPackage ./build-rebar3.nix {};
-    buildHex = callPackage ./build-hex.nix {};
-
-    ## Non hex packages
-    webdriver = callPackage ./webdriver {};
-  };
-in self // self.hex
diff --git a/pkgs/development/erlang-modules/hex-packages.nix b/pkgs/development/erlang-modules/hex-packages.nix
deleted file mode 100644
index 0d1127b6c79..00000000000
--- a/pkgs/development/erlang-modules/hex-packages.nix
+++ /dev/null
@@ -1,3027 +0,0 @@
-/* hex-packages.nix is an auto-generated file -- DO NOT EDIT! */
-
-/* Unbuildable packages: 
-
- * active_0_9_0
- * amqp_client_3_5_6
- * aws_http_0_2_4
- * barrel_jiffy_0_14_4
- * barrel_jiffy_0_14_5
- * cache_tab_1_0_1
- * certifi_0_1_1
- * cet_0_2_1
- * cloudi_core_1_4_0_rc_4
- * cloudi_core_1_5_1
- * cloudi_service_api_requests_1_5_1
- * cloudi_service_db_1_5_1
- * cloudi_service_db_cassandra_1_3_3
- * cloudi_service_db_cassandra_cql_1_5_1
- * cloudi_service_db_couchdb_1_5_1
- * cloudi_service_db_elasticsearch_1_3_3
- * cloudi_service_db_http_elli_1_5_1
- * cloudi_service_db_memcached_1_5_1
- * cloudi_service_db_mysql_1_5_1
- * cloudi_service_db_pgsql_1_5_1
- * cloudi_service_db_riak_1_3_3
- * cloudi_service_db_tokyotyrant_1_5_0
- * cloudi_service_filesystem_1_5_1
- * cloudi_service_http_client_1_5_1
- * cloudi_service_http_cowboy_1_5_1
- * cloudi_service_http_rest_1_5_1
- * cloudi_service_map_reduce_1_5_1
- * cloudi_service_monitoring_1_5_1
- * cloudi_service_queue_1_5_1
- * cloudi_service_quorum_1_5_1
- * cloudi_service_router_1_5_1
- * cloudi_service_tcp_1_5_1
- * cloudi_service_timers_1_5_1
- * cloudi_service_udp_1_5_1
- * cloudi_service_validate_1_5_1
- * cloudi_service_zeromq_1_5_1
- * cmark_0_6_2
- * comeonin_2_0_1
- * conferl_0_0_1
- * couchbeam_1_2_1
- * cowboy_1_0_4
- * cpg_1_4_0
- * cpg_1_5_1
- * craterl_0_2_3
- * cucumberl_0_0_6
- * db_0_9_0
- * ddb_client_0_1_17
- * denrei_0_2_3
- * dproto_0_1_12
- * dqe_0_1_22
- * ekstat_0_2_2
- * elibphonenumber_0_1_1
- * elli_1_0_4
- * enotify_0_1_0
- * ensq_0_1_6
- * eplugin_0_1_4
- * epubnub_0_1_0
- * eredis_cluster_0_5_4
- * erlang_lua_0_1_0
- * erlastic_search_1_1_1
- * erlaudio_0_2_3
- * erlcloud_0_12_0
- * erltrace_0_1_4
- * escalus_2_6_4
- * ex_bitcask_0_1_0
- * ezmq_0_2_0
- * fast_tls_1_0_0
- * fast_xml_1_1_2
- * fast_yaml_1_0_1
- * fifo_utils_0_1_18
- * folsom_ddb_0_1_20
- * fqc_0_1_7
- * gpb_3_18_10
- * gpb_3_18_8
- * hackney_1_1_0
- * hackney_1_3_1
- * hackney_1_3_2
- * hackney_1_4_4
- * hackney_1_4_8
- * hash_ring_ex_1_1_2
- * jc_1_0_4
- * jose_1_4_2
- * jsx_2_7_2
- * jsxn_0_2_1
- * katipo_0_2_4
- * kvs_2_1_0
- * lager_2_1_1
- * lager_watchdog_0_1_10
- * lasp_0_0_3
- * libleofs_0_1_2
- * locker_1_0_8
- * mad_0_9_0
- * mcrypt_0_1_0
- * mdns_client_0_1_7
- * mdns_client_lib_0_1_33
- * mimerl_1_0_0
- * mmath_0_1_15
- * mmath_0_1_16
- * msgpack_0_4_0
- * mstore_0_1_9
- * n2o_2_3_0
- * nacl_0_3_0
- * neotoma_1_7_3
- * nodefinder_1_4_0
- * nodefinder_1_5_1
- * observer_cli_1_0_3
- * p1_stringprep_1_0_0
- * p1_utils_1_0_0
- * p1_utils_1_0_1
- * p1_utils_1_0_2
- * p1_utils_1_0_3
- * p1_xml_1_1_1
- * parse_trans_2_9_0
- * picosat_0_1_0
- * png_0_1_1
- * pooler_1_4_0
- * protobuffs_0_8_2
- * rankmatcher_0_1_2
- * rebar3_abnfc_plugin_0_1_0
- * rebar3_auto_0_3_0
- * rebar3_eqc_0_0_8
- * rebar3_exunit_0_1_1
- * rebar3_live_0_1_3
- * rebar3_neotoma_plugin_0_2_0
- * rebar3_proper_0_5_0
- * rebar3_proper_plugin_0_1_0
- * rebar3_protobuffs_0_2_0
- * rebar3_run_0_2_0
- * rebar3_yang_plugin_0_2_1
- * rebar_protobuffs_0_1_0
- * relflow_1_0_4
- * reup_0_1_0
- * riak_pb_2_1_0
- * riakc_2_1_1
- * service_1_5_1
- * sfmt_0_12_8
- * siphash_2_1_1
- * snappy_1_1_1
- * stun_1_0_0
- * syslog_1_0_2
- * ucol_nif_1_1_5
- * ui_0_1_1
- * uuid_erl_1_4_0
- * uuid_erl_1_5_1
- * xref_runner_0_2_5
- * yomel_0_5_0
-
-*/
-{ stdenv, callPackage }:
-
-let
-  self = rec {
-    backoff_1_1_3 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "backoff";
-	    version = "1.1.3";
-	    sha256 =
-	      "30cead738d20e4c8d36cd37857dd5e23aeba57cb868bf64766d47d371422bdff";
-	      
-	    meta = {
-	      description = "Exponential backoffs library";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/ferd/backoff";
-	    };
-	  }
-      ) {};
-    
-    backoff = backoff_1_1_3;
-    
-    barrel_ibrowse_4_2_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "barrel_ibrowse";
-	    version = "4.2.0";
-	    sha256 =
-	      "58bd9e45932c10fd3d0ceb5c4e47952c3243ea300b388192761ac20be197b2ca";
-	      
-	    meta = {
-	      description = "Erlang HTTP client application";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/barrel-db/ibrowse";
-	    };
-	  }
-      ) {};
-    
-    barrel_ibrowse = barrel_ibrowse_4_2_0;
-    
-    barrel_oauth_1_6_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "barrel_oauth";
-	    version = "1.6.0";
-	    sha256 =
-	      "b2a800b771d45f32a9a55d416054b3bdfab3a925b62e8000f2c08b719390d4dd";
-	      
-	    meta = {
-	      description = "An Erlang OAuth 1.0 implementation";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/barrel-db/erlang-oauth";
-	    };
-	  }
-      ) {};
-    
-    barrel_oauth = barrel_oauth_1_6_0;
-    
-    base16_1_0_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "base16";
-	    version = "1.0.0";
-	    sha256 =
-	      "02afd0827e61a7b07093873e063575ca3a2b07520567c7f8cec7c5d42f052d76";
-	      
-	    meta = {
-	      description = "Base16 encoding and decoding";
-	      license = with stdenv.lib.licenses; [ bsd3 free ];
-	      homepage = "https://github.com/goj/base16";
-	    };
-	  }
-      ) {};
-    
-    base16 = base16_1_0_0;
-    
-    base64url_0_0_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "base64url";
-	    version = "0.0.1";
-	    sha256 =
-	      "fab09b20e3f5db886725544cbcf875b8e73ec93363954eb8a1a9ed834aa8c1f9";
-	      
-	    meta = {
-	      description = "URL safe base64-compatible codec";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/dvv/base64url";
-	    };
-	  }
-      ) {};
-    
-    base64url = base64url_0_0_1;
-    
-    bbmustache_1_0_4 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "bbmustache";
-	    version = "1.0.4";
-	    sha256 =
-	      "03b0d47db66e86df993896dce7578d7e4aae5f84636809b45fa8a3e34ee59b12";
-	      
-	    meta = {
-	      description =
-		"Binary pattern match Based Mustache template engine for Erlang/OTP";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/soranoba/bbmustache";
-	    };
-	  }
-      ) {};
-    
-    bbmustache_1_1_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "bbmustache";
-	    version = "1.1.0";
-	    sha256 =
-	      "aa22469836bb8a9928ad741bdd2038d49116228bfbe0c2d6c792e1bdd4b256d9";
-	      
-	    meta = {
-	      description =
-		"Binary pattern match Based Mustache template engine for Erlang/OTP";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/soranoba/bbmustache";
-	    };
-	  }
-      ) {};
-    
-    bbmustache = bbmustache_1_1_0;
-    
-    bear_0_8_3 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "bear";
-	    version = "0.8.3";
-	    sha256 =
-	      "0a04ce4702e00e0a43c0fcdd63e38c9c7d64dceb32b27ffed261709e7c3861ad";
-	      
-	    meta = {
-	      description = "Statistics functions for Erlang";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/puzza007/bear";
-	    };
-	  }
-      ) {};
-    
-    bear = bear_0_8_3;
-    
-    bstr_0_3_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "bstr";
-	    version = "0.3.0";
-	    sha256 =
-	      "0fb4e05619663d48dabcd21023915741277ba392f2a5710dde7ab6034760284d";
-	      
-	    meta = {
-	      description = "Erlang library that uses binaries as strings";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/jcomellas/bstr";
-	    };
-	  }
-      ) {};
-    
-    bstr = bstr_0_3_0;
-    
-    certifi_0_3_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "certifi";
-	    version = "0.3.0";
-	    sha256 =
-	      "42ae85fe91c038a634a5fb8d0c77f4fc581914c508f087c7138e9366a1517f6a";
-	      
-	    meta = {
-	      description = "An OTP library";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/certifi/erlang-certifi";
-	    };
-	  }
-      ) {};
-    
-    certifi = certifi_0_3_0;
-    
-    cf_0_1_2 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "cf";
-	    version = "0.1.2";
-	    sha256 =
-	      "c86f56bca74dd3616057b28574d920973fe665ecb064aa458dc6a2447f3f4924";
-	      
-	    meta = {
-	      description = "Terminal colour helper";
-	      license = stdenv.lib.licenses.mit; 
-	    };
-	  }
-      ) {};
-    
-    cf_0_2_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "cf";
-	    version = "0.2.1";
-	    sha256 =
-	      "baee9aa7ec2dfa3cb4486b67211177caa293f876780f0b313b45718edef6a0a5";
-	      
-	    meta = {
-	      description = "Terminal colour helper";
-	      license = stdenv.lib.licenses.mit; 
-	    };
-	  }
-      ) {};
-    
-    cf = cf_0_2_1;
-    
-    cowlib_1_0_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "cowlib";
-	    version = "1.0.0";
-	    sha256 =
-	      "4dacd60356177ec8cf93dbff399de17435b613f3318202614d3d5acbccee1474";
-	      
-	    meta = {
-	      description = "Support library for manipulating Web protocols";
-	      license = stdenv.lib.licenses.isc;
-	      homepage = "https://github.com/ninenines/cowlib";
-	    };
-	  }
-      ) {};
-    
-    cowlib_1_0_2 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "cowlib";
-	    version = "1.0.2";
-	    sha256 =
-	      "db622da03aa039e6366ab953e31186cc8190d32905e33788a1acb22744e6abd2";
-	      
-	    meta = {
-	      description = "Support library for manipulating Web protocols";
-	      license = stdenv.lib.licenses.isc;
-	      homepage = "https://github.com/ninenines/cowlib";
-	    };
-	  }
-      ) {};
-    
-    cowlib_1_3_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "cowlib";
-	    version = "1.3.0";
-	    sha256 =
-	      "2b1ac020ec92e7a59cb7322779870c2d3adc7c904ecb3b9fa406f04dc9816b73";
-	      
-	    meta = {
-	      description = "Support library for manipulating Web protocols";
-	      license = stdenv.lib.licenses.isc;
-	      homepage = "https://github.com/ninenines/cowlib";
-	    };
-	  }
-      ) {};
-    
-    cowlib = cowlib_1_3_0;
-    
-    crc_0_3_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "crc";
-	    version = "0.3.0";
-	    sha256 =
-	      "23d7cb6a18cca461f46f5a0f341c74fd0a680cdae62460687f1a24f0a7faabd4";
-	      
-	    meta = {
-	      description =
-		"A library used to calculate CRC checksums for binary data";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/TattdCodeMonkey/crc";
-	    };
-	  }
-      ) {};
-    
-    crc = crc_0_3_0;
-    
-    crypto_rsassa_pss_1_0_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "crypto_rsassa_pss";
-	    version = "1.0.0";
-	    sha256 =
-	      "d8f48874dbef940a8954126249499714e702d8ae0a8f23230a6c2f4a92833313";
-	      
-	    meta = {
-	      description =
-		"RSASSA-PSS Public Key Cryptographic Signature Algorithm for Erlang";
-	      license = stdenv.lib.licenses.free;
-	      homepage =
-		"https://github.com/potatosalad/erlang-crypto_rsassa_pss";
-	    };
-	  }
-      ) {};
-    
-    crypto_rsassa_pss = crypto_rsassa_pss_1_0_0;
-    
-    cth_readable_1_2_0 = callPackage
-      (
-	{ buildHex, cf_0_2_1 }:
-	  buildHex {
-	    name = "cth_readable";
-	    version = "1.2.0";
-	    sha256 =
-	      "41dee2a37e0f266c590b3ea9542ca664e84ebc781a3949115eba658afc08026d";
-	     
-	    erlangDeps  = [ cf_0_2_1 ];
-	    
-	    meta = {
-	      description = "Common Test hooks for more readable logs";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/ferd/cth_readable";
-	    };
-	  }
-      ) {};
-    
-    cth_readable = cth_readable_1_2_0;
-    
-    detergent_0_3_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "detergent";
-	    version = "0.3.0";
-	    sha256 =
-	      "510cfb5d35b4b344762f074b73c8696b4bdde654ea046b3365cf92760ae33362";
-	      
-	    meta = {
-	      description = "An emulsifying Erlang SOAP library";
-	      license = with stdenv.lib.licenses; [ unlicense bsd3 ];
-	      homepage = "https://github.com/devinus/detergent";
-	    };
-	  }
-      ) {};
-    
-    detergent = detergent_0_3_0;
-    
-    dflow_0_1_5 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "dflow";
-	    version = "0.1.5";
-	    sha256 =
-	      "f08e73f22d4c620ef5f358a0b40f8fe3b91219ca3922fbdbe7e42f1cb58f737e";
-	      
-	    meta = {
-	      description = "Pipelined flow processing engine";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/dalmatinerdb/dflow";
-	    };
-	  }
-      ) {};
-    
-    dflow = dflow_0_1_5;
-    
-    discount_0_7_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "discount";
-	    version = "0.7.0";
-	    sha256 =
-	      "a37b7890620f93aa2fae06eee364cd906991588bc8897e659f51634179519c97";
-	      
-	    meta = {
-	      description = "Elixir NIF for discount, a Markdown parser";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/asaaki/discount.ex";
-	    };
-	  }
-      ) {};
-    
-    discount = discount_0_7_0;
-    
-    dynamic_compile_1_0_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "dynamic_compile";
-	    version = "1.0.0";
-	    sha256 =
-	      "eb73d8e9a6334914f79c15ee8214acad9659c42222d49beda3e8b6f6789a980a";
-	      
-	    meta = {
-	      description =
-		"compile and load erlang modules from string input";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/okeuday/dynamic_compile";
-	    };
-	  }
-      ) {};
-    
-    dynamic_compile = dynamic_compile_1_0_0;
-    
-    econfig_0_7_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "econfig";
-	    version = "0.7.1";
-	    sha256 =
-	      "b11d68e3d288b5cb4bd34e668e03176c4ea42790c09f1f449cdbd46a649ea7f3";
-	      
-	    meta = {
-	      description = "simple Erlang config handler using INI files";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/benoitc/econfig";
-	    };
-	  }
-      ) {};
-    
-    econfig = econfig_0_7_1;
-    
-    edown_0_7_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "edown";
-	    version = "0.7.0";
-	    sha256 =
-	      "6d7365a7854cd724e8d1fd005f5faa4444eae6a87eb6df9b789b6e7f6f09110a";
-	      
-	    meta = {
-	      description = "Markdown generated from Edoc";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/uwiger/edown";
-	    };
-	  }
-      ) {};
-    
-    edown = edown_0_7_0;
-    
-    elixir_ale_0_4_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "elixir_ale";
-	    version = "0.4.1";
-	    sha256 =
-	      "2ee5c6989a8005a0ab8f1aea0b4f89b5feae75be78a70bade6627c3624c59c46";
-	      
-	    meta = {
-	      description =
-		"Elixir access to hardware I/O interfaces such as GPIO, I2C, and SPI.";
-	      license = stdenv.lib.licenses.asl20;
-	      homepage = "https://github.com/fhunleth/elixir_ale";
-	    };
-	  }
-      ) {};
-    
-    elixir_ale = elixir_ale_0_4_1;
-    
-    eper_0_94_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "eper";
-	    version = "0.94.0";
-	    sha256 =
-	      "8d853792fa61a7fd068fe9c113a8a44bc839e11ad70cb8d5d2884566e3bede39";
-	      
-	    meta = {
-	      longDescription = ''Erlang Performance and Debugging Tools sherk
-				- a profiler, similar to Linux oprofile or MacOs
-				shark gperf - a graphical performance monitor;
-				shows CPU, memory and network usage dtop -
-				similar to unix top redbug- similar to the OTP
-				dbg application, but safer, better etc.'';
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/massemanet/eper";
-	    };
-	  }
-      ) {};
-    
-    eper = eper_0_94_0;
-    
-    epgsql_3_1_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "epgsql";
-	    version = "3.1.1";
-	    sha256 =
-	      "4b3f478ad090aed7200b2a8c9f2d5ef45c3aaa167be896b5237bba4b40f461d8";
-	      
-	    meta = {
-	      description = "PostgreSQL Client";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/epgsql/epgsql";
-	    };
-	  }
-      ) {};
-    
-    epgsql = epgsql_3_1_1;
-    
-    episcina_1_1_0 = callPackage
-      (
-	{ buildHex, gproc_0_3_1 }:
-	  buildHex {
-	    name = "episcina";
-	    version = "1.1.0";
-	    sha256 =
-	      "16238717bfbc8cb226342f6b098bb1fafb48c7547265a10ad3e6e83899abc46f";
-	     
-	    erlangDeps  = [ gproc_0_3_1 ];
-	    
-	    meta = {
-	      description = "Erlang Connection Pool";
-	      license = stdenv.lib.licenses.free; 
-	    };
-	  }
-      ) {};
-    
-    episcina = episcina_1_1_0;
-    
-    eql_0_1_2 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "eql";
-	    version = "0.1.2";
-	    sha256 =
-	      "3b1a85c491d44262802058c0de97a2c90678d5d45851b88a076b1a45a8d6d4b3";
-	      
-	    meta = {
-	      description = "Erlang with SQL";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/artemeff/eql";
-	    };
-	  }
-      ) {};
-    
-    eql = eql_0_1_2;
-    
-    eredis_1_0_8 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "eredis";
-	    version = "1.0.8";
-	    sha256 =
-	      "f303533e72129b264a2d8217c4ddc977c7527ff4b8a6a55f92f62b7fcc099334";
-	      
-	    meta = {
-	      description = "Erlang Redis client";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/wooga/eredis";
-	    };
-	  }
-      ) {};
-    
-    eredis = eredis_1_0_8;
-    
-    erlang_term_1_4_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "erlang_term";
-	    version = "1.4.0";
-	    sha256 =
-	      "1a4d491dbd13b7a714815af10fc658948a5a440de23755a32b741ca07d8ba592";
-	      
-	    meta = {
-	      description = "Provide the in-memory size of Erlang terms";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/okeuday/erlang_term";
-	    };
-	  }
-      ) {};
-    
-    erlang_term_1_5_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "erlang_term";
-	    version = "1.5.1";
-	    sha256 =
-	      "88bae81a80306e82fd3fc43e2d8228049e666f3cfe4627687832cd7edb878e06";
-	      
-	    meta = {
-	      description = "Provide the in-memory size of Erlang terms";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/okeuday/erlang_term";
-	    };
-	  }
-      ) {};
-    
-    erlang_term = erlang_term_1_5_1;
-    
-    erlang_version_0_2_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "erlang_version";
-	    version = "0.2.0";
-	    sha256 =
-	      "74daddba65a247ec57913e5de8f243af42bbbc3d6a0c411a1252da81c09ae661";
-	      
-	    meta = {
-	      description = "Retrieve Erlang/OTP version like `18.1'";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/sapporo-beam/erlang_version";
-	    };
-	  }
-      ) {};
-    
-    erlang_version = erlang_version_0_2_0;
-    
-    erlcloud_0_11_0 = callPackage
-      (
-	{ buildHex, jsx_2_6_2, lhttpc_1_3_0, meck_0_8_3 }:
-	  buildHex {
-	    name = "erlcloud";
-	    version = "0.11.0";
-	    sha256 =
-	      "ca9876dab57ed8fb5fb75ab6ce11e59a346387d357d7a038a2e18d1d31a30716";
-	     
-	    erlangDeps  = [ jsx_2_6_2 lhttpc_1_3_0 meck_0_8_3 ];
-	    
-	    meta = {
-	      description = "Cloud Computing library for erlang";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/gleber/erlcloud";
-	    };
-	  }
-      ) {};
-    
-    erldn_1_0_2 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "erldn";
-	    version = "1.0.2";
-	    sha256 =
-	      "51a721f1aac9c5fcc6abb0fa156a97ac8e033ee7cbee1624345ec6e47dfe0aa0";
-	      
-	    meta = {
-	      description = "An edn parser for the Erlang platform.
-";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/marianoguerra/erldn";
-	    };
-	  }
-      ) {};
-    
-    erldn = erldn_1_0_2;
-    
-    erlexec_1_0_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "erlexec";
-	    version = "1.0.1";
-	    sha256 =
-	      "eb1e11f16288db4ea35af08503eabf1250d5540c1e8bd35ba04312f5f703e14f";
-	    compilePorts = true;
-	     
-	    meta = {
-	      description = "OS Process Manager";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/saleyn/erlexec";
-	    };
-	  }
-      ) {};
-    
-    erlexec = erlexec_1_0_1;
-    
-    erlsh_0_1_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "erlsh";
-	    version = "0.1.0";
-	    sha256 =
-	      "94ef1492dd59fef211f01ffd40c47b6e51c0f59e2a3d0739366e4890961332d9";
-	    compilePorts = true;
-	     
-	    meta = {
-	      longDescription = ''Family of functions and ports involving
-				interacting with the system shell, paths and
-				external programs.'';
-	      license = stdenv.lib.licenses.free; 
-	    };
-	  }
-      ) {};
-    
-    erlsh = erlsh_0_1_0;
-    
-    erlsom_1_2_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "erlsom";
-	    version = "1.2.1";
-	    sha256 =
-	      "e8f4d1d83583df7d1db8346aa30b82a6599b93fcc4b2d9165007e02ed40e7cae";
-	      
-	    meta = {
-	      description = "erlsom XSD parser";
-	      license = stdenv.lib.licenses.free; 
-	    };
-	  }
-      ) {};
-    
-    erlsom = erlsom_1_2_1;
-    
-    erlware_commons_0_18_0 = callPackage
-      (
-	{ buildHex, cf_0_2_1 }:
-	  buildHex {
-	    name = "erlware_commons";
-	    version = "0.18.0";
-	    sha256 =
-	      "e71dda7cd5dcf34c9d07255d49c67e1d229dd230c101fdb996820bcdb5b03c49";
-	     
-	    erlangDeps  = [ cf_0_2_1 ];
-	    
-	    meta = {
-	      description = "Additional standard library for Erlang";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/erlware/erlware_commons";
-	    };
-	  }
-      ) {};
-    
-    erlware_commons = erlware_commons_0_18_0;
-    
-    erlzk_0_6_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "erlzk";
-	    version = "0.6.1";
-	    sha256 =
-	      "6bba045ad0b7beb566825b463ada2464929655ce01e291022c1efed81a674759";
-	      
-	    meta = {
-	      description = "A Pure Erlang ZooKeeper Client (no C dependency)";
-	      license = stdenv.lib.licenses.asl20;
-	      homepage = "https://github.com/huaban/erlzk";
-	    };
-	  }
-      ) {};
-    
-    erlzk = erlzk_0_6_1;
-    
-    esel_0_1_2 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "esel";
-	    version = "0.1.2";
-	    sha256 =
-	      "874d1775c86d27d9e88486a37351ffc09f826ef062c8ea211e65d08e103f946c";
-	      
-	    meta = {
-	      description = "An wrapper around openssl";
-	      license = stdenv.lib.licenses.mit; 
-	    };
-	  }
-      ) {};
-    
-    esel = esel_0_1_2;
-    
-    esqlite_0_2_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "esqlite";
-	    version = "0.2.1";
-	    sha256 =
-	      "79f2d1d05e6e29e50228af794dac8900ce47dd60bc11fbf1279f924f83752689";
-	    compilePorts = true;
-	     
-	    meta = {
-	      description = "A Sqlite3 NIF";
-	      license = stdenv.lib.licenses.asl20;
-	      homepage = "https://github.com/mmzeeman/esqlite";
-	    };
-	  }
-      ) {};
-    
-    esqlite = esqlite_0_2_1;
-    
-    eunit_formatters_0_3_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "eunit_formatters";
-	    version = "0.3.1";
-	    sha256 =
-	      "64a40741429b7aff149c605d5a6135a48046af394a7282074e6003b3b56ae931";
-	      
-	    meta = {
-	      description = "Better output for eunit suites";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/seancribbs/eunit_formatters";
-	    };
-	  }
-      ) {};
-    
-    eunit_formatters = eunit_formatters_0_3_1;
-    
-    exec_1_0_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "exec";
-	    version = "1.0.1";
-	    sha256 =
-	      "87c7ef2dea2bb503bb0eec8cb34776172999aecc6e12d90f7629796a7a3ccb1f";
-	    compilePorts = true;
-	     
-	    meta = {
-	      description = "OS Process Manager";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/saleyn/erlexec";
-	    };
-	  }
-      ) {};
-    
-    exec = exec_1_0_1;
-    
-    exmerl_0_1_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "exmerl";
-	    version = "0.1.1";
-	    sha256 =
-	      "4bb5d6c1863c5e381b460416c9b517a211db9abd9abf0f32c99b07e128b842aa";
-	      
-	    meta = {
-	      description =
-		"An Elixir wrapper for parsing XML through the xmerl_* suite of modules
-";
-	      license = stdenv.lib.licenses.asl20;
-	      homepage = "https://github.com/pwoolcoc/exmerl";
-	    };
-	  }
-      ) {};
-    
-    exmerl = exmerl_0_1_1;
-    
-    feeder_2_0_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "feeder";
-	    version = "2.0.0";
-	    sha256 =
-	      "9780c5f032d3480cf7d9fd71d3f0c5f73211e0d3a8d9cdabcb1327b3a4ff758e";
-	      
-	    meta = {
-	      description = "Stream parse RSS and Atom formatted XML feeds.
-";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/michaelnisi/feeder";
-	    };
-	  }
-      ) {};
-    
-    feeder = feeder_2_0_0;
-    
-    fn_1_0_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "fn";
-	    version = "1.0.0";
-	    sha256 =
-	      "1433b353c8739bb28ac0d6826c9f6a05033f158e8c8195faf01a863668b3bbc7";
-	      
-	    meta = {
-	      description = "More functional Erlang";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/artemeff/fn";
-	    };
-	  }
-      ) {};
-    
-    fn = fn_1_0_0;
-    
-    folsom_0_8_3 = callPackage
-      (
-	{ buildHex, bear_0_8_3 }:
-	  buildHex {
-	    name = "folsom";
-	    version = "0.8.3";
-	    sha256 =
-	      "afaa1ea4cd2a10a32242ac5d76fa7b17e98d202883859136b791d9a383b26820";
-	     
-	    erlangDeps  = [ bear_0_8_3 ];
-	    
-	    meta = {
-	      description = "Erlang based metrics system";
-	      license = stdenv.lib.licenses.free; 
-	    };
-	  }
-      ) {};
-    
-    folsom = folsom_0_8_3;
-    
-    folsomite_1_2_8 = callPackage
-      (
-	{ buildHex, folsom_0_8_3 }:
-	  buildHex {
-	    name = "folsomite";
-	    version = "1.2.8";
-	    sha256 =
-	      "9ce64603cdffb8ad55e950142146b3fe05533020906a81aa9c2f524635d813dc";
-	     
-	    erlangDeps  = [ folsom_0_8_3 ];
-	    
-	    meta = {
-	      description = "Blow up your Graphite server with Folsom metrics";
-	      license = stdenv.lib.licenses.free; 
-	    };
-	  }
-      ) {};
-    
-    folsomite = folsomite_1_2_8;
-    
-    fqc_0_1_5 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "fqc";
-	    version = "0.1.5";
-	    sha256 =
-	      "47536dec351a12e1cbe0bc3b52bfff3b0690b0aec660472b5cf49f812eb9aa4f";
-	      
-	    meta = {
-	      description = "FiFo EQC helper";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/project-fifo/fqc";
-	    };
-	  }
-      ) {};
-    
-    fs_0_9_2 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "fs";
-	    version = "0.9.2";
-	    sha256 =
-	      "9a00246e8af58cdf465ae7c48fd6fd7ba2e43300413dfcc25447ecd3bf76f0c1";
-	    compilePorts = true;
-	     
-	    meta = {
-	      description = "Erlang FileSystem Listener";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/synrc/fs";
-	    };
-	  }
-      ) {};
-    
-    fs = fs_0_9_2;
-    
-    fuse_2_0_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "fuse";
-	    version = "2.0.0";
-	    sha256 =
-	      "e2c55c0629ce418974165a65b342e54527333303d7e9c1f0493679144c9698cb";
-	      
-	    meta = {
-	      description = "A Circuit breaker implementation for Erlang";
-	      license = stdenv.lib.licenses.free; 
-	    };
-	  }
-      ) {};
-    
-    fuse = fuse_2_0_0;
-    
-    gen_listener_tcp_0_3_2 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "gen_listener_tcp";
-	    version = "0.3.2";
-	    sha256 =
-	      "b3c3fbc525ba2b32d947b06811d38470d5b0abe2ca81b623192a71539ed22336";
-	      
-	    meta = {
-	      description = "Generic TCP Server";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/travelping/gen_listener_tcp";
-	    };
-	  }
-      ) {};
-    
-    gen_listener_tcp = gen_listener_tcp_0_3_2;
-    
-    gen_smtp_0_9_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "gen_smtp";
-	    version = "0.9.0";
-	    sha256 =
-	      "5a05f23a7cbe0c6242d290b445c6bbc0c287e3d0e09d3fcdc6bcd2c8973b6688";
-	      
-	    meta = {
-	      longDescription = ''A generic Erlang SMTP server framework that
-				can be extended via callback modules in the OTP
-				style. '';
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/Vagabond/gen_smtp";
-	    };
-	  }
-      ) {};
-    
-    gen_smtp = gen_smtp_0_9_0;
-    
-    getopt_0_8_2 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "getopt";
-	    version = "0.8.2";
-	    sha256 =
-	      "736e6db3679fbbad46373efb96b69509f8e420281635e9d92989af9f0a0483f7";
-	      
-	    meta = {
-	      description = "Command-line options parser for Erlang";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/jcomellas/getopt";
-	    };
-	  }
-      ) {};
-    
-    getopt = getopt_0_8_2;
-    
-    goldrush_0_1_7 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "goldrush";
-	    version = "0.1.7";
-	    sha256 =
-	      "a94a74cd363ce5f4970ed8242c551ec62b71939db1bbfd2e030142cab25a4ffe";
-	      
-	    meta = {
-	      description =
-		"Small, Fast event processing and monitoring for Erlang/OTP applications.
-";
-	      license = stdenv.lib.licenses.isc;
-	      homepage = "https://github.com/DeadZen/goldrush";
-	    };
-	  }
-      ) {};
-    
-    goldrush = goldrush_0_1_7;
-    
-    gproc_0_3_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "gproc";
-	    version = "0.3.1";
-	    sha256 =
-	      "3c449925a5cbf57cc40d13c6c282bc1080b5ed3bad97e1acdbe969fd63a65fce";
-	      
-	    meta = {
-	      longDescription = ''Gproc is a process dictionary for Erlang,
-				which provides a number of useful features
-				beyond what the built-in dictionary has: * Use
-				any term as a process alias * Register a process
-				under several aliases * Non-unique properties
-				can be registered simultaneously by many
-				processes * QLC and match specification
-				interface for efficient queries on the
-				dictionary * Await registration, let's you wait
-				until a process registers itself * Atomically
-				give away registered names and properties to
-				another process * Counters, and aggregated
-				counters, which automatically maintain the total
-				of all counters with a given name * Global
-				registry, with all the above functions applied
-				to a network of nodes'';
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/uwiger/gproc";
-	    };
-	  }
-      ) {};
-    
-    gproc_0_5_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "gproc";
-	    version = "0.5.0";
-	    sha256 =
-	      "5bc0fa4e999a6665b92ce57a7f12d7e9d1c26bfc39b0f657994be05cd3818b18";
-	      
-	    meta = {
-	      longDescription = ''Gproc is a process dictionary for Erlang,
-				which provides a number of useful features
-				beyond what the built-in dictionary has: * Use
-				any term as a process alias * Register a process
-				under several aliases * Non-unique properties
-				can be registered simultaneously by many
-				processes * QLC and match specification
-				interface for efficient queries on the
-				dictionary * Await registration, let's you wait
-				until a process registers itself * Atomically
-				give away registered names and properties to
-				another process * Counters, and aggregated
-				counters, which automatically maintain the total
-				of all counters with a given name * Global
-				registry, with all the above functions applied
-				to a network of nodes'';
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/uwiger/gproc";
-	    };
-	  }
-      ) {};
-    
-    gproc = gproc_0_5_0;
-    
-    gurka_0_1_7 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "gurka";
-	    version = "0.1.7";
-	    sha256 =
-	      "b46c96446f46a53411a3b45d126ec19e724178818206ca1d2dd16abff28df6b5";
-	      
-	    meta = {
-	      description = "Erlang implementation of Cucumber";
-	      license = stdenv.lib.licenses.mit; 
-	    };
-	  }
-      ) {};
-    
-    gurka = gurka_0_1_7;
-    
-    hamcrest_0_1_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "hamcrest";
-	    version = "0.1.1";
-	    sha256 =
-	      "5207b83e8d3168b9cbbeb3b4c4d83817a38a05f55478510e9c4db83ef83fa0ca";
-	      
-	    meta = {
-	      description = "Erlang port of Hamcrest";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/hyperthunk/hamcrest-erlang";
-	    };
-	  }
-      ) {};
-    
-    hamcrest = hamcrest_0_1_1;
-    
-    hlc_2_0_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "hlc";
-	    version = "2.0.0";
-	    sha256 =
-	      "460ac04654e920e068d1fd17aec1f78b1879cc42ac7f3def7497f0d1cc5056ad";
-	      
-	    meta = {
-	      description = "hybrid logical clock";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/barrel-db/hlc";
-	    };
-	  }
-      ) {};
-    
-    hlc = hlc_2_0_0;
-    
-    hooks_1_1_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "hooks";
-	    version = "1.1.1";
-	    sha256 =
-	      "6834ad3a2a624a5ffd49e9cb146ff49ded423b67f31905b122d24128c72c5c85";
-	      
-	    meta = {
-	      description = "generic plugin & hook system";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/barrel-db/hooks";
-	    };
-	  }
-      ) {};
-    
-    hooks = hooks_1_1_1;
-    
-    http_signature_1_1_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "http_signature";
-	    version = "1.1.0";
-	    sha256 =
-	      "3e6036d9c29289ed0e35dd6f41821dec9061ce20aad3c4d35dcbae8c84eb3baa";
-	      
-	    meta = {
-	      description =
-		"Erlang and Elixir implementations of Joyent's HTTP Signature Scheme.";
-	      license = stdenv.lib.licenses.free;
-	      homepage =
-		"https://github.com/potatosalad/erlang-http_signature";
-	    };
-	  }
-      ) {};
-    
-    http_signature = http_signature_1_1_0;
-    
-    ibrowse_4_2_2 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "ibrowse";
-	    version = "4.2.2";
-	    sha256 =
-	      "b800cb7442bcc852c6832821e9d0a7098ff626e1415bddaeff4596640b31c0ae";
-	      
-	    meta = {
-	      description = "Erlang HTTP client application";
-	      license = with stdenv.lib.licenses; [ free bsd3 ];
-	      homepage = "https://github.com/cmullaparthi/ibrowse";
-	    };
-	  }
-      ) {};
-    
-    ibrowse = ibrowse_4_2_2;
-    
-    idna_1_0_2 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "idna";
-	    version = "1.0.2";
-	    sha256 =
-	      "a5d645e307aa4f67efe31682f720b7eaf431ab148b3d6fb66cbaf6314499610f";
-	      
-	    meta = {
-	      description = "A pure Erlang IDNA implementation";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/benoitc/erlang-idna";
-	    };
-	  }
-      ) {};
-    
-    idna_1_0_3 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "idna";
-	    version = "1.0.3";
-	    sha256 =
-	      "357d489a51112db4f216034406834f9172b3c0ff5a12f83fb28b25ca271541d1";
-	      
-	    meta = {
-	      description = "A pure Erlang IDNA implementation";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/benoitc/erlang-idna";
-	    };
-	  }
-      ) {};
-    
-    idna = idna_1_0_3;
-    
-    inaka_aleppo_0_9_6 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "inaka_aleppo";
-	    version = "0.9.6";
-	    sha256 =
-	      "774171dc84a300f63a15fe732773edf535d7414286890e961e754f1f794dbc85";
-	      
-	    meta = {
-	      description = "Aleppo: ALternative Erlang Pre-ProcessOr";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/inaka/aleppo";
-	    };
-	  }
-      ) {};
-    
-    inaka_aleppo = inaka_aleppo_0_9_6;
-    
-    inaka_mixer_0_1_5 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "inaka_mixer";
-	    version = "0.1.5";
-	    sha256 =
-	      "37af35b1c17a94a0cb643cba23cba2ca68d6fe51c3ad8337629d4c3c017cc912";
-	      
-	    meta = {
-	      description = "Mix in public functions from external modules";
-	      license = stdenv.lib.licenses.asl20;
-	      homepage = "https://github.com/inaka/mixer";
-	    };
-	  }
-      ) {};
-    
-    inaka_mixer = inaka_mixer_0_1_5;
-    
-    jiffy_0_14_7 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "jiffy";
-	    version = "0.14.7";
-	    sha256 =
-	      "2b3b0f7976dae9c8266036e0d7e0398b64ac5207e3beee4c57896e44b2c17e97";
-	    compilePorts = true;
-	     
-	    meta = {
-	      description = "JSON Decoder/Encoder";
-	      license = with stdenv.lib.licenses; [ mit bsd3 ];
-	      homepage = "https://github.com/davisp/jiffy";
-	    };
-	  }
-      ) {};
-    
-    jiffy = jiffy_0_14_7;
-    
-    jsone_1_2_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "jsone";
-	    version = "1.2.0";
-	    sha256 =
-	      "a60e74284d3a923cde65c00a39dd4542fd7da7c22e8385c0378ad419c54b2e08";
-	      
-	    meta = {
-	      description = "Erlang JSON Library";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/sile/jsone";
-	    };
-	  }
-      ) {};
-    
-    jsone = jsone_1_2_0;
-    
-    jsx_1_4_5 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "jsx";
-	    version = "1.4.5";
-	    sha256 =
-	      "ff5115611c5dd789cebe3addc07d18b86340f701c52ad063caba6fe8da3a489b";
-	      
-	    meta = {
-	      longDescription = ''an erlang application for consuming,
-				producing and manipulating json. inspired by
-				yajl'';
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/talentdeficit/jsx";
-	    };
-	  }
-      ) {};
-    
-    jsx_2_2_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "jsx";
-	    version = "2.2.0";
-	    sha256 =
-	      "d0bbc1ef47fd2fed84e28faed66918cf9eceed03b7ded48a23076e716fdbc84f";
-	      
-	    meta = {
-	      longDescription = ''an erlang application for consuming,
-				producing and manipulating json. inspired by
-				yajl'';
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/talentdeficit/jsx";
-	    };
-	  }
-      ) {};
-    
-    jsx_2_6_2 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "jsx";
-	    version = "2.6.2";
-	    sha256 =
-	      "6bfccb6461cc3c7d5cc63f3e69ffeb2f1f8de50eca5980065311c056a69a907f";
-	      
-	    meta = {
-	      longDescription = ''an erlang application for consuming,
-				producing and manipulating json. inspired by
-				yajl'';
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/talentdeficit/jsx";
-	    };
-	  }
-      ) {};
-    
-    jsx_2_7_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "jsx";
-	    version = "2.7.1";
-	    sha256 =
-	      "52d0e8bda0c8624bc59c3119236eb49bb66289702ea3d59ad76fd2a56cdf9089";
-	      
-	    meta = {
-	      longDescription = ''an erlang application for consuming,
-				producing and manipulating json. inspired by
-				yajl'';
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/talentdeficit/jsx";
-	    };
-	  }
-      ) {};
-    
-    jsx_2_8_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "jsx";
-	    version = "2.8.0";
-	    sha256 =
-	      "a8ba15d5bac2c48b2be1224a0542ad794538d79e2cc16841a4e24ca75f0f8378";
-	      
-	    meta = {
-	      longDescription = ''an erlang application for consuming,
-				producing and manipulating json. inspired by
-				yajl'';
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/talentdeficit/jsx";
-	    };
-	  }
-      ) {};
-    
-    jsx = jsx_2_8_0;
-    
-    jsxd_0_1_10 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "jsxd";
-	    version = "0.1.10";
-	    sha256 =
-	      "f71a8238f08a1dee130e8959ff5343524891fa6531392667a5b911cead5f5082";
-	      
-	    meta = {
-	      description =
-		"jsx data structire traversing and modification library.";
-	      license = stdenv.lib.licenses.cddl;
-	      homepage = "https://github.com/Licenser/jsxd";
-	    };
-	  }
-      ) {};
-    
-    jsxd = jsxd_0_1_10;
-    
-    jwalk_1_1_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "jwalk";
-	    version = "1.1.0";
-	    sha256 =
-	      "10c150910ba3539583887cb2b5c3f70d602138471e6f6b5c22498aa18ed654e1";
-	      
-	    meta = {
-	      longDescription = ''Helper module for working with Erlang
-				proplist, map, EEP-18 and mochijson-style
-				representations of JSON'';
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/jr0senblum/jwalk";
-	    };
-	  }
-      ) {};
-    
-    jwalk = jwalk_1_1_0;
-    
-    jwt_0_1_1 = callPackage
-      (
-	{ buildHex, base64url_0_0_1, jsx_2_8_0 }:
-	  buildHex {
-	    name = "jwt";
-	    version = "0.1.1";
-	    sha256 =
-	      "abcff4a2a42af2b7b7bdf55eeb2b73ce2e3bef760750004e74bc5835d64d2188";
-	     
-	    erlangDeps  = [ base64url_0_0_1 jsx_2_8_0 ];
-	    
-	    meta = {
-	      description = "Erlang JWT library";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/artemeff/jwt";
-	    };
-	  }
-      ) {};
-    
-    jwt = jwt_0_1_1;
-    
-    key2value_1_4_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "key2value";
-	    version = "1.4.0";
-	    sha256 =
-	      "ad63453fcf54ab853581b78c6d2df56be41ea691ba4bc05920264c19f35a0ded";
-	      
-	    meta = {
-	      description = "Erlang 2-way Map";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/okeuday/key2value";
-	    };
-	  }
-      ) {};
-    
-    key2value_1_5_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "key2value";
-	    version = "1.5.1";
-	    sha256 =
-	      "2a40464b9f8ef62e8828d869ac8d2bf9135b4956d29ba4eb044e8522b2d35ffa";
-	      
-	    meta = {
-	      description = "Erlang 2-way Map";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/okeuday/key2value";
-	    };
-	  }
-      ) {};
-    
-    key2value = key2value_1_5_1;
-    
-    keys1value_1_5_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "keys1value";
-	    version = "1.5.1";
-	    sha256 =
-	      "2385132be0903c170fe21e54a0c3e746a604777b66ee458bb6e5f25650d3354f";
-	      
-	    meta = {
-	      description = "Erlang Set Associative Map For Key Lists";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/okeuday/keys1value";
-	    };
-	  }
-      ) {};
-    
-    keys1value = keys1value_1_5_1;
-    
-    lager_3_0_1 = callPackage
-      (
-	{ buildHex, goldrush_0_1_7 }:
-	  buildHex {
-	    name = "lager";
-	    version = "3.0.1";
-	    sha256 =
-	      "d32c9233105b72dc5c1f6a8fe9a33cc205ecccc359c4449950060cee5a329e35";
-	     
-	    erlangDeps  = [ goldrush_0_1_7 ];
-	    
-	    meta = {
-	      description = "Erlang logging framework";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/basho/lager";
-	    };
-	  }
-      ) {};
-    
-    lager_3_0_2 = callPackage
-      (
-	{ buildHex, goldrush_0_1_7 }:
-	  buildHex {
-	    name = "lager";
-	    version = "3.0.2";
-	    sha256 =
-	      "527f3b233e01b6cb68780c14ef675ed08ec02247dc029cacecbb56c78dfca100";
-	     
-	    erlangDeps  = [ goldrush_0_1_7 ];
-	    
-	    meta = {
-	      description = "Erlang logging framework";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/basho/lager";
-	    };
-	  }
-      ) {};
-    
-    lager = lager_3_0_2;
-    
-    lasse_1_1_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "lasse";
-	    version = "1.1.0";
-	    sha256 =
-	      "53e70ea9031f7583331a9f9bdbb29da933e591e5c4cce521b4bf85c68e7f3385";
-	      
-	    meta = {
-	      description = "Lasse: Server-Sent Event handler for Cowboy";
-	      license = stdenv.lib.licenses.asl20;
-	      homepage = "https://github.com/inaka/lasse";
-	    };
-	  }
-      ) {};
-    
-    lasse = lasse_1_1_0;
-    
-    lhttpc_1_3_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "lhttpc";
-	    version = "1.3.0";
-	    sha256 =
-	      "ddd2bd4b85159bc987c954b14877168e6a3c3e516105702189776e97c50296a4";
-	      
-	    meta = {
-	      description = "Lightweight HTTP/1.1 client";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/talko/lhttpc";
-	    };
-	  }
-      ) {};
-    
-    lhttpc = lhttpc_1_3_0;
-    
-    libsnarlmatch_0_1_5 = callPackage
-      (
-	{ buildHex, fqc_0_1_5 }:
-	  buildHex {
-	    name = "libsnarlmatch";
-	    version = "0.1.5";
-	    sha256 =
-	      "11410122ca7a0685c4a7df1795d7f5a1e7bf9c5f17096414402fd9d1f0e1ac04";
-	     
-	    erlangDeps  = [ fqc_0_1_5 ];
-	    
-	    meta = {
-	      description = "permission matcher library";
-	      license = stdenv.lib.licenses.cddl;
-	      homepage = "https://github.com/project-fifo/libsnarlmatch";
-	    };
-	  }
-      ) {};
-    
-    libsnarlmatch_0_1_7 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "libsnarlmatch";
-	    version = "0.1.7";
-	    sha256 =
-	      "72e9bcf7968e75774393778146ac6596116f1c60136dd607ad249183684ee380";
-	      
-	    meta = {
-	      description = "permission matcher library";
-	      license = stdenv.lib.licenses.cddl;
-	      homepage = "https://github.com/project-fifo/libsnarlmatch";
-	    };
-	  }
-      ) {};
-    
-    libsnarlmatch = libsnarlmatch_0_1_7;
-    
-    lru_1_3_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "lru";
-	    version = "1.3.1";
-	    sha256 =
-	      "cd6ac15c383d58cd2933df9cb918617b24b12b6e5fb24d94c4c8f200fd93f619";
-	      
-	    meta = {
-	      description = "implements a fixed-size LRU cache";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/barrel-db/erlang-lru";
-	    };
-	  }
-      ) {};
-    
-    lru = lru_1_3_1;
-    
-    lz4_0_2_2 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "lz4";
-	    version = "0.2.2";
-	    sha256 =
-	      "a59522221e7cdfe3792bf8b3bb21cfe7ac657790e5826201fa2c5d0bc7484a2d";
-	    compilePorts = true;
-	     
-	    meta = {
-	      description = "LZ4 bindings for Erlang";
-	      license = stdenv.lib.licenses.isc;
-	      homepage = "https://github.com/szktty/erlang-lz4.git";
-	    };
-	  }
-      ) {};
-    
-    lz4 = lz4_0_2_2;
-    
-    mdns_server_0_2_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "mdns_server";
-	    version = "0.2.0";
-	    sha256 =
-	      "bc9465880e15e57033960ab6820258b87134bef69032210c67e53e3718e289d0";
-	      
-	    meta = {
-	      description = "mDNS service discovery server";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/Licenser/erlang-mdns-server";
-	    };
-	  }
-      ) {};
-    
-    mdns_server = mdns_server_0_2_0;
-    
-    mdns_server_lib_0_2_3 = callPackage
-      (
-	{ buildHex, lager_3_0_2, mdns_server_0_2_0, ranch_1_1_0 }:
-	  buildHex {
-	    name = "mdns_server_lib";
-	    version = "0.2.3";
-	    sha256 =
-	      "078775ccea5d768095716ca6bd82f657601203352495d9726f4cc080c8c07695";
-	     
-	    erlangDeps  = [ lager_3_0_2 mdns_server_0_2_0 ranch_1_1_0 ];
-	    
-	    meta = {
-	      description =
-		"server side for mdns client server implementation";
-	      license = stdenv.lib.licenses.cddl;
-	      homepage = "https://github.com/Licenser/mdns_server_lib";
-	    };
-	  }
-      ) {};
-    
-    mdns_server_lib = mdns_server_lib_0_2_3;
-    
-    meck_0_8_3 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "meck";
-	    version = "0.8.3";
-	    sha256 =
-	      "53bd3873d0193d6b2b4a165cfc4b9ffc3934355c3ba19e88239ef6a027cc02b6";
-	      
-	    meta = {
-	      description = "A mocking framework for Erlang";
-	      license = stdenv.lib.licenses.asl20;
-	      homepage = "https://github.com/eproxus/meck";
-	    };
-	  }
-      ) {};
-    
-    meck_0_8_4 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "meck";
-	    version = "0.8.4";
-	    sha256 =
-	      "2cdfbd0edd8f62b3d2061efc03c0e490282dd2ea6de44e15d2006e83f4f8eead";
-	      
-	    meta = {
-	      description = "A mocking framework for Erlang";
-	      license = stdenv.lib.licenses.asl20;
-	      homepage = "https://github.com/eproxus/meck";
-	    };
-	  }
-      ) {};
-    
-    meck = meck_0_8_4;
-    
-    metrics_0_2_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "metrics";
-	    version = "0.2.1";
-	    sha256 =
-	      "1cccc3534fa5a7861a3dcc0414afba00a616937e82c95d6172a523a5d2e97c03";
-	      
-	    meta = {
-	      description =
-		"A generic interface to different metrics systems in Erlang.";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/benoitc/erlang-metrics";
-	    };
-	  }
-      ) {};
-    
-    metrics = metrics_0_2_1;
-    
-    mimerl_1_0_2 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "mimerl";
-	    version = "1.0.2";
-	    sha256 =
-	      "7a4c8e1115a2732a67d7624e28cf6c9f30c66711a9e92928e745c255887ba465";
-	      
-	    meta = {
-	      description = "Library to handle mimetypes";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/benoitc/mimerl";
-	    };
-	  }
-      ) {};
-    
-    mimerl_1_1_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "mimerl";
-	    version = "1.1.0";
-	    sha256 =
-	      "def0f1922a5dcdeeee6e4f41139b364e7f0f40239774b528a0986b12bcb42ddc";
-	      
-	    meta = {
-	      description = "Library to handle mimetypes";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/benoitc/mimerl";
-	    };
-	  }
-      ) {};
-    
-    mimerl = mimerl_1_1_0;
-    
-    mochiweb_2_12_2 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "mochiweb";
-	    version = "2.12.2";
-	    sha256 =
-	      "d3e681d4054b74a96cf2efcd09e94157ab83a5f55ddc4ce69f90b8144673bd7a";
-	      
-	    meta = {
-	      description =
-		"MochiWeb is an Erlang library for building lightweight HTTP servers.
-";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/mochi/mochiweb";
-	    };
-	  }
-      ) {};
-    
-    mochiweb = mochiweb_2_12_2;
-    
-    mtx_1_0_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "mtx";
-	    version = "1.0.0";
-	    sha256 =
-	      "3bdcb209fe3cdfc5a6b5b95f619ecd123b7ee1d9203ace2178c8ff73be5bb90f";
-	      
-	    meta = {
-	      description = "Metrics Client";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/synrc/mtx";
-	    };
-	  }
-      ) {};
-    
-    mtx = mtx_1_0_0;
-    
-    pc_1_2_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "pc";
-	    version = "1.2.0";
-	    sha256 =
-	      "ef0f59d26a25af0a5247ef1a06d28d8300f8624647b02dc521ac79a7eceb8883";
-	      
-	    meta = {
-	      description = "a rebar3 port compiler for native code";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/blt/port_compiler";
-	    };
-	  }
-      ) {};
-    
-    pc = pc_1_2_0;
-    
-    poolboy_1_5_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "poolboy";
-	    version = "1.5.1";
-	    sha256 =
-	      "8f7168911120e13419e086e78d20e4d1a6776f1eee2411ac9f790af10813389f";
-	      
-	    meta = {
-	      description = "A hunky Erlang worker pool factory";
-	      license = with stdenv.lib.licenses; [ unlicense asl20 ];
-	      homepage = "https://github.com/devinus/poolboy";
-	    };
-	  }
-      ) {};
-    
-    poolboy = poolboy_1_5_1;
-    
-    pooler_1_5_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "pooler";
-	    version = "1.5.0";
-	    sha256 =
-	      "f493b4b947967fa4250dd1f96e86a5440ecab51da114d2c256cced58ad991908";
-	      
-	    meta = {
-	      description = "An OTP Process Pool Application";
-	      license = stdenv.lib.licenses.asl20;
-	      homepage = "https://github.com/seth/pooler";
-	    };
-	  }
-      ) {};
-    
-    pooler = pooler_1_5_0;
-    
-    pot_0_9_3 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "pot";
-	    version = "0.9.3";
-	    sha256 =
-	      "752d2605c15605cd455cb3514b1ce329309eb61dfa88397dce49772dac9ad581";
-	      
-	    meta = {
-	      description = "One Time Passwords for Erlang";
-	      license = stdenv.lib.licenses.free; 
-	    };
-	  }
-      ) {};
-    
-    pot = pot_0_9_3;
-    
-    pqueue_1_5_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "pqueue";
-	    version = "1.5.1";
-	    sha256 =
-	      "7ba01afe6b50ea4b239fa770f9e2c2db4871b3927ac44aea180d1fd52601b317";
-	      
-	    meta = {
-	      description = "Erlang Priority Queue Implementation";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/okeuday/pqueue";
-	    };
-	  }
-      ) {};
-    
-    pqueue = pqueue_1_5_1;
-    
-    proper_1_1_1_beta = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "proper";
-	    version = "1.1.1-beta";
-	    sha256 =
-	      "bde5c0fef0f8d804a7c06aab4f293d19f42149e5880b3412b75efa608e86d342";
-	      
-	    meta = {
-	      description =
-		"QuickCheck-inspired property-based testing tool for Erlang.";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/manopapad/proper";
-	    };
-	  }
-      ) {};
-    
-    proper = proper_1_1_1_beta;
-    
-    providers_1_6_0 = callPackage
-      (
-	{ buildHex, getopt_0_8_2 }:
-	  buildHex {
-	    name = "providers";
-	    version = "1.6.0";
-	    sha256 =
-	      "0f6876529a613d34224de8c61d3660388eb981142360f2699486d8536050ce2f";
-	     
-	    erlangDeps  = [ getopt_0_8_2 ];
-	    
-	    meta = {
-	      description = "Providers provider";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/tsloughter/providers";
-	    };
-	  }
-      ) {};
-    
-    providers = providers_1_6_0;
-    
-    quickrand_1_5_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "quickrand";
-	    version = "1.5.1";
-	    sha256 =
-	      "0b3dcc6ddb23319c1f6a5ed143778864b8ad2f0ebd693a2d121cf5ae0c4db507";
-	      
-	    meta = {
-	      longDescription = ''Quick Random Number Generation: Provides a
-				simple interface to call efficient random number
-				generation functions based on the context.
-				Proper random number seeding is enforced.'';
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/okeuday/quickrand";
-	    };
-	  }
-      ) {};
-    
-    quickrand = quickrand_1_5_1;
-    
-    quintana_0_2_0 = callPackage
-      (
-	{ buildHex, folsom_0_8_3 }:
-	  buildHex {
-	    name = "quintana";
-	    version = "0.2.0";
-	    sha256 =
-	      "0646fe332ca3415ca6b0b273b4a5689ec902b9f9004ca62229ded00bd5f64cda";
-	     
-	    erlangDeps  = [ folsom_0_8_3 ];
-	    
-	    meta = {
-	      description = "Wrapper around some Folsom functions";
-	      license = stdenv.lib.licenses.free; 
-	    };
-	  }
-      ) {};
-    
-    quintana_0_2_1 = callPackage
-      (
-	{ buildHex, folsom_0_8_3 }:
-	  buildHex {
-	    name = "quintana";
-	    version = "0.2.1";
-	    sha256 =
-	      "d4683eb33c71f6cab3b17b896b4fa9180f17a0a8b086440bfe0c5675182f0194";
-	     
-	    erlangDeps  = [ folsom_0_8_3 ];
-	    
-	    meta = {
-	      description = "Wrapper around some Folsom functions";
-	      license = stdenv.lib.licenses.free; 
-	    };
-	  }
-      ) {};
-    
-    quintana = quintana_0_2_1;
-    
-    rabbit_common_3_5_6 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "rabbit_common";
-	    version = "3.5.6";
-	    sha256 =
-	      "9335ab3ebc4e8e140d7bc9b1b0e7ee99c0aa87d0a746b704184121ba35c04f1c";
-	      
-	    meta = {
-	      longDescription = ''Includes modules which are a runtime
-				dependency of the RabbitMQ/AMQP Erlang client
-				and are common to the RabbitMQ server.'';
-	      license = stdenv.lib.licenses.mpl11;
-	      homepage = "https://github.com/jbrisbin/rabbit_common";
-	    };
-	  }
-      ) {};
-    
-    rabbit_common = rabbit_common_3_5_6;
-    
-    ranch_1_1_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "ranch";
-	    version = "1.1.0";
-	    sha256 =
-	      "98ade939e63e6567da5dec5bc5bd93cbdc53d53f8b1aa998adec60dc4057f048";
-	      
-	    meta = {
-	      description = "Socket acceptor pool for TCP protocols";
-	      license = stdenv.lib.licenses.isc;
-	      homepage = "https://github.com/ninenines/ranch";
-	    };
-	  }
-      ) {};
-    
-    ranch_1_2_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "ranch";
-	    version = "1.2.0";
-	    sha256 =
-	      "82bbb48cdad151000f7ad600d7a29afd972df409fde600bbc9b1ed4fdc08c399";
-	      
-	    meta = {
-	      description = "Socket acceptor pool for TCP protocols";
-	      license = stdenv.lib.licenses.isc;
-	      homepage = "https://github.com/ninenines/ranch";
-	    };
-	  }
-      ) {};
-    
-    ranch = ranch_1_2_0;
-    
-    ratx_0_1_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "ratx";
-	    version = "0.1.0";
-	    sha256 =
-	      "fbf933ff32fdc127200880f5b567820bf03504ade1bd697ffbc0535dbafc23d6";
-	      
-	    meta = {
-	      description =
-		"Rate limiter and overload protection for erlang and elixir applications.
-";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/liveforeverx/ratx";
-	    };
-	  }
-      ) {};
-    
-    ratx = ratx_0_1_0;
-    
-    rebar3_asn1_compiler_1_0_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "rebar3_asn1_compiler";
-	    version = "1.0.0";
-	    sha256 =
-	      "25ec1d5c97393195650ac8c7a06a267a886a1479950ee047c43b5228c07b30b9";
-	      
-	    meta = {
-	      description = "Compile ASN.1 modules with Rebar3";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/pyykkis/rebar3_asn1_compiler";
-	    };
-	  }
-      ) {};
-    
-    rebar3_asn1_compiler = rebar3_asn1_compiler_1_0_0;
-    
-    rebar3_diameter_compiler_0_3_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "rebar3_diameter_compiler";
-	    version = "0.3.1";
-	    sha256 =
-	      "c5965e3810ccf9ef9ba9185a81fe569ef6e9f3a9e546e99c5e900736b0c39274";
-	      
-	    meta = {
-	      description = "Compile diameter .dia files";
-	      license = stdenv.lib.licenses.mit;
-	      homepage =
-		"https://github.com/carlosedp/rebar3_diameter_compiler";
-	    };
-	  }
-      ) {};
-    
-    rebar3_diameter_compiler = rebar3_diameter_compiler_0_3_1;
-    
-    rebar3_hex_1_14_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "rebar3_hex";
-	    version = "1.14.0";
-	    sha256 =
-	      "e655ba352835654d41b8077695415792a0de01f3200aa1ce0c8458f785ec2311";
-	      
-	    meta = {
-	      description = "Hex.pm plugin for rebar3";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/tsloughter/rebar3_hex";
-	    };
-	  }
-      ) {};
-    
-    rebar3_hex = rebar3_hex_1_14_0;
-    
-    rebar3_idl_compiler_0_3_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "rebar3_idl_compiler";
-	    version = "0.3.0";
-	    sha256 =
-	      "31ba95205c40b990cb3c49abb397abc47b4d5f9c402db83f9daebbc44e69789d";
-	      
-	    meta = {
-	      description = "Rebar3 IDL Compiler";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/sebastiw/rebar3_idl_compiler";
-	    };
-	  }
-      ) {};
-    
-    rebar3_idl_compiler = rebar3_idl_compiler_0_3_0;
-    
-    rebar_alias_0_1_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "rebar_alias";
-	    version = "0.1.0";
-	    sha256 =
-	      "59fb42b39964af3a29ebe94c11247f618dd4d5e4e1a69cfaffabbed03ccff70f";
-	      
-	    meta = {
-	      description = "A rebar plugin";
-	      license = stdenv.lib.licenses.free; 
-	    };
-	  }
-      ) {};
-    
-    rebar_alias = rebar_alias_0_1_0;
-    
-    rebar_erl_vsn_0_1_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "rebar_erl_vsn";
-	    version = "0.1.0";
-	    sha256 =
-	      "7cf1e2e85a80785a4e4e1529a2c837dbd2d540214cf791214e56f931e5e9865d";
-	      
-	    meta = {
-	      description = "defines for erlang versions";
-	      license = stdenv.lib.licenses.mit; 
-	    };
-	  }
-      ) {};
-    
-    rebar_erl_vsn = rebar_erl_vsn_0_1_0;
-    
-    recon_2_2_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "recon";
-	    version = "2.2.1";
-	    sha256 =
-	      "6c548ad0f4916495a78977674a251847869f85b5125b7c2a44da3178955adfd1";
-	      
-	    meta = {
-	      longDescription = ''Recon wants to be a set of tools usable in
-				production to diagnose Erlang problems or
-				inspect production environment safely.'';
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/ferd/recon";
-	    };
-	  }
-      ) {};
-    
-    recon = recon_2_2_1;
-    
-    redo_2_0_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "redo";
-	    version = "2.0.1";
-	    sha256 =
-	      "f7b2be8c825ec34413c54d8f302cc935ce4ecac8421ae3914c5dadd816dcb1e6";
-	      
-	    meta = {
-	      description = "Pipelined Redis Erlang Driver";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/heroku/redo";
-	    };
-	  }
-      ) {};
-    
-    redo = redo_2_0_1;
-    
-    reltool_util_1_4_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "reltool_util";
-	    version = "1.4.0";
-	    sha256 =
-	      "a625874976fffe8ab56d4b5b7d5fd37620a2692462bbe24ae003ab13052ef0d3";
-	      
-	    meta = {
-	      description = "Erlang reltool utility functionality application";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/okeuday/reltool_util";
-	    };
-	  }
-      ) {};
-    
-    reltool_util_1_5_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "reltool_util";
-	    version = "1.5.1";
-	    sha256 =
-	      "746e16871afdcf85d8a115389193c8d660d0df1d26d6ac700590e0ad252646b1";
-	      
-	    meta = {
-	      description = "Erlang reltool utility functionality application";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/okeuday/reltool_util";
-	    };
-	  }
-      ) {};
-    
-    reltool_util = reltool_util_1_5_1;
-    
-    relx_3_13_0 = callPackage
-      (
-	{
-	  buildHex,
-	  bbmustache_1_0_4,
-	  cf_0_2_1,
-	  erlware_commons_0_18_0,
-	  getopt_0_8_2,
-	  providers_1_6_0
-	}:
-	  buildHex {
-	    name = "relx";
-	    version = "3.13.0";
-	    sha256 =
-	      "1ccadc6c9c6883807be0a6250411d2c299c532928e0a6d07db812400a2303ec1";
-	     
-	    erlangDeps  = [
-			    bbmustache_1_0_4
-			    cf_0_2_1
-			    erlware_commons_0_18_0
-			    getopt_0_8_2
-			    providers_1_6_0
-			  ];
-	    
-	    meta = {
-	      description = "Release assembler for Erlang/OTP Releases";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/erlware/relx";
-	    };
-	  }
-      ) {};
-    
-    relx = relx_3_13_0;
-    
-    savory_0_0_2 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "savory";
-	    version = "0.0.2";
-	    sha256 =
-	      "a45ef32a6f45092e1328bc1eb47bda3c8f992afe863aaa73c455f31b0c8591b9";
-	      
-	    meta = {
-	      longDescription = ''An Elixir implementation of Freza's salt_nif
-				which interfaces with libsodium, a wrapper for
-				the cryptographic primitive libary NaCl. '';
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/electricFeel/savory";
-	    };
-	  }
-      ) {};
-    
-    savory = savory_0_0_2;
-    
-    sbroker_0_7_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "sbroker";
-	    version = "0.7.0";
-	    sha256 =
-	      "5bc0bfd79896fd5b92072a71fa4a1e120f4110f2cf9562a0b9dd2fcfe9e5cfd2";
-	      
-	    meta = {
-	      description =
-		"Process broker for dispatching with backpressure and load shedding";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/fishcakez/sbroker";
-	    };
-	  }
-      ) {};
-    
-    sbroker = sbroker_0_7_0;
-    
-    serial_0_1_2 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "serial";
-	    version = "0.1.2";
-	    sha256 =
-	      "c0aed287f565b7ce1e1091a6a3dd08fd99bf0884c81b53ecf978c502ef652231";
-	      
-	    meta = {
-	      description = "Serial communication through Elixir ports";
-	      license = stdenv.lib.licenses.isc;
-	      homepage = "https://github.com/bitgamma/elixir_serial";
-	    };
-	  }
-      ) {};
-    
-    serial = serial_0_1_2;
-    
-    sidejob_2_0_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "sidejob";
-	    version = "2.0.0";
-	    sha256 =
-	      "19fea24060a1d0d37e78480fbd79d6b95e07f445aad725f7124a23194641c743";
-	      
-	    meta = {
-	      longDescription = ''sidejob is an Erlang library that implements
-				a parallel, capacity-limited request pool. In
-				sidejob, these pools are called resources. A
-				resource is managed by multiple gen_server like
-				processes which can be sent calls and casts
-				using sidejob:call or sidejob:cast respectively.
-				This library was originally written to support
-				process bounding in Riak using the
-				sidejob_supervisor behavior. In Riak, this is
-				used to limit the number of concurrent get/put
-				FSMs that can be active, failing client requests
-				with {error, overload} if the limit is ever hit.
-				The purpose being to provide a fail-safe
-				mechanism during extreme overload scenarios. '';
-	      license = stdenv.lib.licenses.asl20;
-	      homepage = "https://github.com/basho/sidejob";
-	    };
-	  }
-      ) {};
-    
-    sidejob = sidejob_2_0_0;
-    
-    slp_0_0_2 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "slp";
-	    version = "0.0.2";
-	    sha256 =
-	      "27e5f7330c7ce631f16e3ec5781b31cbb2247d2bcdeab1e979a66dcc4397bd77";
-	      
-	    meta = {
-	      longDescription = ''An Elixir application for using the Service
-				Location Protocol. SLP is a commonly used
-				service discovery protocol.'';
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/stuart/elixir_slp";
-	    };
-	  }
-      ) {};
-    
-    slp = slp_0_0_2;
-    
-    smurf_0_1_3 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "smurf";
-	    version = "0.1.3";
-	    sha256 =
-	      "5ed8e18ec8eea0647e7e938ce15cc76e59497d0a259cea15124520a48f0d6be6";
-	      
-	    meta = {
-	      description = "SMF interfacing library for erlang";
-	      license = stdenv.lib.licenses.cddl;
-	      homepage = "https://github.com/project-fifo/smurf";
-	    };
-	  }
-      ) {};
-    
-    smurf = smurf_0_1_3;
-    
-    ssl_verify_hostname_1_0_5 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "ssl_verify_hostname";
-	    version = "1.0.5";
-	    sha256 =
-	      "f2cb11e6144e10ab39d1e14bf9fb2437b690979c70bf5428e9dc4bfaf1dfeabf";
-	      
-	    meta = {
-	      description = "Hostname verification library for Erlang";
-	      license = stdenv.lib.licenses.mit;
-	      homepage =
-		"https://github.com/deadtrickster/ssl_verify_hostname.erl";
-	    };
-	  }
-      ) {};
-    
-    ssl_verify_hostname_1_0_6 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "ssl_verify_hostname";
-	    version = "1.0.6";
-	    sha256 =
-	      "72b2fc8a8e23d77eed4441137fefa491bbf4a6dc52e9c0045f3f8e92e66243b5";
-	      
-	    meta = {
-	      description = "Hostname verification library for Erlang";
-	      license = stdenv.lib.licenses.mit;
-	      homepage =
-		"https://github.com/deadtrickster/ssl_verify_hostname.erl";
-	    };
-	  }
-      ) {};
-    
-    ssl_verify_hostname = ssl_verify_hostname_1_0_6;
-    
-    strftimerl_0_1_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "strftimerl";
-	    version = "0.1.1";
-	    sha256 =
-	      "c09c7cd6a421bcbc1020c1440a2e73e312b852adbb3034d11f3dffa27d7953b1";
-	      
-	    meta = {
-	      description = "strftime formatting in erlang";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/gmr/strftimerl";
-	    };
-	  }
-      ) {};
-    
-    strftimerl = strftimerl_0_1_1;
-    
-    supool_1_5_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "supool";
-	    version = "1.5.1";
-	    sha256 =
-	      "c191d63ff19ae177bf4cfba02303ae4552d8b48ec4133e24053e037513dfae09";
-	      
-	    meta = {
-	      description = "Erlang Process Pool as a Supervisor";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/okeuday/supool";
-	    };
-	  }
-      ) {};
-    
-    supool = supool_1_5_1;
-    
-    tea_crypto_1_0_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "tea_crypto";
-	    version = "1.0.0";
-	    sha256 =
-	      "0e7e60d0afe79f0624faa8a358a3a00c912cfa548f3632383927abca4db29cc6";
-	      
-	    meta = {
-	      description = "A TEA implementation in Erlang.
-";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/keichan34/tea_crypto";
-	    };
-	  }
-      ) {};
-    
-    tea_crypto = tea_crypto_1_0_0;
-    
-    termcap_0_1_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "termcap";
-	    version = "0.1.0";
-	    sha256 =
-	      "8c5167d68759bd1cd020eeaf5fd94153430fd19fa5a5fdeeb0b3129f0aba2a21";
-	      
-	    meta = {
-	      description = "Pure erlang termcap library";
-	      license = stdenv.lib.licenses.mit; 
-	    };
-	  }
-      ) {};
-    
-    termcap = termcap_0_1_0;
-    
-    tinymt_0_3_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "tinymt";
-	    version = "0.3.1";
-	    sha256 =
-	      "9de8fcedf254661bc4aa550aac317e28be35d4a5d91adf3fa3689dfad6cc1e5a";
-	      
-	    meta = {
-	      description = "Tiny Mersenne Twister (TinyMT) for Erlang";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/jj1bdx/tinymt-erlang/";
-	    };
-	  }
-      ) {};
-    
-    tinymt = tinymt_0_3_1;
-    
-    trie_1_5_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "trie";
-	    version = "1.5.0";
-	    sha256 =
-	      "613981536e33f58d92e44bd31801376f71deee0e57c63372fe8ab5fbbc37f7dc";
-	      
-	    meta = {
-	      description = "Erlang Trie Implementation";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/okeuday/trie";
-	    };
-	  }
-      ) {};
-    
-    trie_1_5_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "trie";
-	    version = "1.5.1";
-	    sha256 =
-	      "4b845dccfca8962b90584e98d270e2ff43e2e181bb046c4aae0e0f457679f98d";
-	      
-	    meta = {
-	      description = "Erlang Trie Implementation";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/okeuday/trie";
-	    };
-	  }
-      ) {};
-    
-    trie = trie_1_5_1;
-    
-    tsuru_1_0_2 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "tsuru";
-	    version = "1.0.2";
-	    sha256 =
-	      "b586ad8d47799a086e4225494f5e3cf4e306ca255a173a4b48fe51d542cefb6b";
-	      
-	    meta = {
-	      description =
-		"A collection of useful tools for Erlang applications";
-	      license = stdenv.lib.licenses.mit; 
-	    };
-	  }
-      ) {};
-    
-    tsuru = tsuru_1_0_2;
-    
-    uri_0_1_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "uri";
-	    version = "0.1.0";
-	    sha256 =
-	      "3833c3b5745fc0822df86c3a3591219048026fea8a535223b440d26029218996";
-	      
-	    meta = {
-	      description = "URI Parsing/Encoding Library";
-	      license = stdenv.lib.licenses.free; 
-	    };
-	  }
-      ) {};
-    
-    uri = uri_0_1_0;
-    
-    varpool_1_5_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "varpool";
-	    version = "1.5.1";
-	    sha256 =
-	      "ff6059bdcd0efad606e8c54ee623cfeaef59778c18e343dd772e84d99d188e26";
-	      
-	    meta = {
-	      description = "Erlang Process Pools as a Local Variable";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/okeuday/varpool";
-	    };
-	  }
-      ) {};
-    
-    varpool = varpool_1_5_1;
-    
-    weber_0_1_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "weber";
-	    version = "0.1.0";
-	    sha256 =
-	      "742c45b3c99e207dd0aeccb818edd2ace4af10699c96fbcee0ce2f692dc5fe12";
-	      
-	    meta = {
-	      description = "weber - is Elixir MVC web framework";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/elixir-web/weber";
-	    };
-	  }
-      ) {};
-    
-    weber = weber_0_1_0;
-    
-    websocket_client_1_1_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "websocket_client";
-	    version = "1.1.0";
-	    sha256 =
-	      "21c3d0df073634f2ca349af5b54a61755d637d6390c34d8d57c064f68ca92acd";
-	      
-	    meta = {
-	      description = "Erlang websocket client";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/sanmiguel/websocket_client";
-	    };
-	  }
-      ) {};
-    
-    websocket_client = websocket_client_1_1_0;
-    
-    worker_pool_1_0_4 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "worker_pool";
-	    version = "1.0.4";
-	    sha256 =
-	      "7854a3b94e9624728db3a0475d00e7d0728adf3bf2ee3802bbf8ca10356d6f64";
-	      
-	    meta = {
-	      description = "Erlang Worker Pool";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "https://github.com/inaka/worker_pool";
-	    };
-	  }
-      ) {};
-    
-    worker_pool = worker_pool_1_0_4;
-    
-    wpa_supplicant_0_1_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "wpa_supplicant";
-	    version = "0.1.0";
-	    sha256 =
-	      "8a73ca51203401755d42ba636918106540aa3723006dab344dc8a7ec8fa2f3d5";
-	      
-	    meta = {
-	      longDescription = ''Elixir interface to the wpa_supplicant
-				daemon. The wpa_supplicant provides application
-				support for scanning for access points, managing
-				Wi-Fi connections, and handling all of the
-				security and other parameters associated with
-				Wi-Fi. '';
-	      license = with stdenv.lib.licenses; [ asl20 free ];
-	      homepage = "https://github.com/fhunleth/wpa_supplicant.ex";
-	    };
-	  }
-      ) {};
-    
-    wpa_supplicant = wpa_supplicant_0_1_0;
-    
-    zipper_0_1_5 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "zipper";
-	    version = "0.1.5";
-	    sha256 =
-	      "7df5552f41169a8feb1a2e81e2753ec4e4debb7d48cdf1edc77037205782d547";
-	      
-	    meta = {
-	      description = "Generic Zipper Implementation for Erlang";
-	      license = stdenv.lib.licenses.asl20;
-	      homepage = "https://github.com/inaka/zipper";
-	    };
-	  }
-      ) {};
-    
-    zipper = zipper_0_1_5;
-    
-  };
-in self
\ No newline at end of file
diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index ac3a5ac9e40..057ae59b144 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -1,10 +1,9 @@
 { stdenv, writeText, callPackage, fetchurl,
-  fetchHex, erlang, hermeticRebar3 ? true, rebar3-nix-bootstrap, tree, fetchFromGitHub }:
-
+  fetchHex, erlang, hermeticRebar3 ? true, rebar3-nix-bootstrap,
+  tree, fetchFromGitHub, hexRegistrySnapshot }:
 
 let
   version = "3.0.0-beta.4";
-  registrySnapshot = callPackage ./registrySnapshot.nix { };
 
   # TODO: all these below probably should go into nixpkgs.erlangModules.sources.*
   # {erlware_commons,     "0.16.0"},
@@ -89,7 +88,7 @@ stdenv.mkDerivation {
   else [];
 
   buildInputs = [ erlang tree  ];
-  propagatedBuildInputs = [ registrySnapshot rebar3-nix-bootstrap ];
+  propagatedBuildInputs = [ hexRegistrySnapshot rebar3-nix-bootstrap ];
 
   postPatch = ''
     echo postPatch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ebd6d6960f..3ec5d3f1323 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5312,11 +5312,12 @@ in
   rebar3-open = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = false; };
   rebar3 = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = true; };
   rebar3-nix-bootstrap = callPackage ../development/tools/erlang/rebar3-nix-bootstrap { };
-  fetchHex = callPackage ../development/tools/build-managers/rebar3/fetch-hex.nix { };
+  hexRegistrySnapshot = callPackage ../development/beam-modules/hex-registry-snapshot.nix { };
+  fetchHex = callPackage ../development/beam-modules/fetch-hex.nix { };
 
-  erlangPackages = callPackage ../development/erlang-modules { };
-  cuter = erlangPackages.callPackage ../development/tools/erlang/cuter { };
-  hex2nix = erlangPackages.callPackage ../development/tools/erlang/hex2nix { };
+  beamPackages = callPackage ../development/beam-modules { };
+  hex2nix = beamPackages.callPackage ../development/tools/erlang/hex2nix { };
+  cuter = callPackage ../development/tools/erlang/cuter { };
 
   elixir = callPackage ../development/interpreters/elixir { };
 

From be5da0449e4d9ce9bb68b7a3eaf099155accf64b Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Wed, 30 Mar 2016 10:17:59 -0700
Subject: [PATCH 161/712] beam-support: update registry to latest '59b836d'

---
 doc/beam-users-guide.xml                      | 376 ++++++++++++++++++
 doc/erlang-users-guide.xml                    | 305 --------------
 doc/manual.xml                                |   2 +-
 pkgs/development/beam-modules/build-mix.nix   |   1 -
 pkgs/development/beam-modules/default.nix     |   1 -
 .../beam-modules/hex-registry-snapshot.nix    |   4 +-
 .../tools/erlang/cuter/default.nix            |   6 +-
 7 files changed, 382 insertions(+), 313 deletions(-)
 create mode 100644 doc/beam-users-guide.xml
 delete mode 100644 doc/erlang-users-guide.xml

diff --git a/doc/beam-users-guide.xml b/doc/beam-users-guide.xml
new file mode 100644
index 00000000000..c1a4c90bc27
--- /dev/null
+++ b/doc/beam-users-guide.xml
@@ -0,0 +1,376 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="users-guide-to-the-erlang-infrastructure">
+
+  <title>User's Guide to the Beam Infrastructure</title>
+  <section xml:id="beam-introduction">
+    <title>Beam Languages (Erlang &amp; Elixir) on Nix</title>
+    <para>
+      In this document and related Nix expressions we use the term
+      <emphasis>Beam</emphasis> to describe the environment. Beam is
+      the name of the Erlang Virtial Machine and, as far as we know,
+      from a packaging perspective all languages that run on Beam are
+      interchangable. The things that do change, like the build
+      system, are transperant to the users of the package. So we make
+      no distinction.
+    </para>
+  </section>
+<section xml:id="build-tools">
+  <title>Build Tools</title>
+  <section xml:id="build-tools-rebar3">
+    <title>Rebar3</title>
+    <para>
+      By default Rebar3 wants to manage it's own dependencies. In the
+      normal non-Nix, this is perfectly acceptable. In the Nix world it
+      is not. To support this we have created two versions of rebar3,
+      <literal>rebar3</literal> and <literal>rebar3-open</literal>. The
+      <literal>rebar3</literal> version has been patched to remove the
+      ability to download anything from it. If you are not running it a
+      nix-shell or a nix-build then its probably not going to work for
+      you. <literal>rebar3-open</literal> is the normal, un-modified
+      rebar3. It should work exactly as would any other version of
+      rebar3. Any Erlang package should rely on
+      <literal>rebar3</literal> and thats really what you should be
+      using too.
+    </para>
+  </section>
+  <section xml:id="build-tools-other">
+    <title>Mix &amp; Erlang.mk</title>
+    <para>
+      Both Mix and Erlang.mk work exactly as you would expect. There
+      is a bootstrap process that needs to be run for both of
+      them. However, that is supported by the
+      <literal>buildMix</literal> and <literal>buildErlangMk</literal> derivations.
+    </para>
+  </section>
+
+</section>
+
+<section xml:id="how-to-install-beam-packages">
+  <title>How to install Beam packages</title>
+  <para>
+    Beam packages are not registered in the top level simply because
+    they are not relevant to the vast majority of Nix users. They are
+    installable using the <literal>beamPackages</literal> attribute
+    set.
+
+    You can list the avialable packages in the
+    <literal>beamPackages</literal> with the following command:
+  </para>
+
+  <programlisting>
+$ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -qaP -A beamPackages
+beamPackages.esqlite    esqlite-0.2.1
+beamPackages.goldrush   goldrush-0.1.7
+beamPackages.ibrowse    ibrowse-4.2.2
+beamPackages.jiffy      jiffy-0.14.5
+beamPackages.lager      lager-3.0.2
+beamPackages.meck       meck-0.8.3
+beamPackages.rebar3-pc  pc-1.1.0
+  </programlisting>
+  <para>
+    To install any of those packages into your profile, refer to them by
+    their attribute path (first column):
+  </para>
+  <programlisting>
+$ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
+  </programlisting>
+  <para>
+    The attribute path of any Beam packages corresponds to the name
+    of that particular package in Hex or its OTP Application/Release name.
+  </para>
+</section>
+<section xml:id="packaging-beam-applications">
+  <title>Packaging Beam Applications</title>
+  <section  xml:id="packaging-erlang-applications">
+    <title>Erlang Applications</title>
+    <section xml:id="rebar3-packages">
+      <title>Rebar3 Packages</title>
+      <para>
+        There is a Nix functional called
+        <literal>buildRebar3</literal>. We use this function to make a
+        derivation that understands how to build the rebar3 project. For
+        example, the epression we use to build the <link
+        xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>
+        project follows.
+      </para>
+      <programlisting>
+        {stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons }:
+
+          buildRebar3 rec {
+            name = "hex2nix";
+            version = "0.0.1";
+
+            src = fetchFromGitHub {
+              owner = "ericbmerritt";
+              repo = "hex2nix";
+              rev = "${version}";
+              sha256 = "1w7xjidz1l5yjmhlplfx7kphmnpvqm67w99hd2m7kdixwdxq0zqg";
+            };
+
+          beamDeps = [ ibrowse jsx erlware_commons ];
+        }
+      </programlisting>
+      <para>
+        The only visible difference between this derivation and
+        something like <literal>stdenv.mkDerivation</literal> is that we
+        have added <literal>erlangDeps</literal> to the derivation. If
+        you add your Beam dependencies here they will be correctly
+        handled by the system.
+      </para>
+      <para>
+        If your package needs to compile native code via Rebar's port
+        compilation mechenism. You should add <literal>compilePort =
+        true;</literal> to the derivation.
+      </para>
+    </section>
+    <section xml:id="erlang-mk-packages">
+      <title>Erlang.mk Packages</title>
+      <para>
+        Erlang.mk functions almost identically to Rebar. The only real
+        difference is that <literal>buildErlangMk</literal> is called
+        instead of <literal>buildRebar3</literal>
+      </para>
+      <programlisting>
+        { buildErlangMk, fetchHex,  cowlib, ranch }:
+          buildErlangMk {
+            name = "cowboy";
+            version = "1.0.4";
+            src = fetchHex {
+              pkg = "cowboy";
+              version = "1.0.4";
+              sha256 =
+                "6a0edee96885fae3a8dd0ac1f333538a42e807db638a9453064ccfdaa6b9fdac";
+            };
+            beamDeps  = [ cowlib ranch ];
+
+            meta = {
+              description = ''Small, fast, modular HTTP server written in
+                            Erlang.'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/ninenines/cowboy";
+            };
+        }
+      </programlisting>
+    </section>
+    <section xml:id="mix-packages">
+      <title>Mix Packages</title>
+      <para>
+        Mix functions almost identically to Rebar. The only real
+        difference is that <literal>buildMix</literal> is called
+        instead of <literal>buildRebar3</literal>
+      </para>
+      <programlisting>
+        { buildMix, fetchHex, plug, absinthe }:
+        buildMix {
+          name = "absinthe_plug";
+          version = "1.0.0";
+          src = fetchHex {
+            pkg = "absinthe_plug";
+            version = "1.0.0";
+            sha256 =
+              "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33";
+          };
+          beamDeps  = [ plug absinthe];
+
+          meta = {
+            description = ''A plug for Absinthe, an experimental GraphQL
+                            toolkit'';
+            license = stdenv.lib.licenses.bsd3;
+            homepage = "https://github.com/CargoSense/absinthe_plug";
+         };
+       }
+      </programlisting>
+    </section>
+  </section>
+</section>
+<section xml:id="how-to-develop">
+  <title>How to develop</title>
+  <section xml:id="accessing-an-environment">
+    <title>Accessing an Environment</title>
+    <para>
+      Often, all you want to do is be able to access a valid
+      environment that contains a specific package and its
+      dependencies. we can do that with the <literal>env</literal>
+      part of a derivation. For example, lets say we want to access an
+      erlang repl with ibrowse loaded up. We could do the following.
+    </para>
+    <programlisting>
+      ~/w/nixpkgs ❯❯❯ nix-shell -A beamPackages.ibrowse.env --run "erl"
+      Erlang/OTP 18 [erts-7.0] [source] [64-bit] [smp:4:4] [async-threads:10] [hipe] [kernel-poll:false]
+
+      Eshell V7.0  (abort with ^G)
+      1> m(ibrowse).
+      Module: ibrowse
+      MD5: 3b3e0137d0cbb28070146978a3392945
+      Compiled: January 10 2016, 23:34
+      Object file: /nix/store/g1rlf65rdgjs4abbyj4grp37ry7ywivj-ibrowse-4.2.2/lib/erlang/lib/ibrowse-4.2.2/ebin/ibrowse.beam
+      Compiler options:  [{outdir,"/tmp/nix-build-ibrowse-4.2.2.drv-0/hex-source-ibrowse-4.2.2/_build/default/lib/ibrowse/ebin"},
+      debug_info,debug_info,nowarn_shadow_vars,
+      warn_unused_import,warn_unused_vars,warnings_as_errors,
+      {i,"/tmp/nix-build-ibrowse-4.2.2.drv-0/hex-source-ibrowse-4.2.2/_build/default/lib/ibrowse/include"}]
+      Exports:
+      add_config/1                  send_req_direct/7
+      all_trace_off/0               set_dest/3
+      code_change/3                 set_max_attempts/3
+      get_config_value/1            set_max_pipeline_size/3
+      get_config_value/2            set_max_sessions/3
+      get_metrics/0                 show_dest_status/0
+      get_metrics/2                 show_dest_status/1
+      handle_call/3                 show_dest_status/2
+      handle_cast/2                 spawn_link_worker_process/1
+      handle_info/2                 spawn_link_worker_process/2
+      init/1                        spawn_worker_process/1
+      module_info/0                 spawn_worker_process/2
+      module_info/1                 start/0
+      rescan_config/0               start_link/0
+      rescan_config/1               stop/0
+      send_req/3                    stop_worker_process/1
+      send_req/4                    stream_close/1
+      send_req/5                    stream_next/1
+      send_req/6                    terminate/2
+      send_req_direct/4             trace_off/0
+      send_req_direct/5             trace_off/2
+      send_req_direct/6             trace_on/0
+      trace_on/2
+      ok
+      2>
+    </programlisting>
+    <para>
+      Notice the <literal>-A beamPackages.ibrowse.env</literal>.That
+      is the key to this functionality.
+    </para>
+  </section>
+  <section xml:id="creating-a-shell">
+    <title>Creating a Shell</title>
+    <para>
+      Getting access to an environment often isn't enough to do real
+      development. Many times we need to create a
+      <literal>shell.nix</literal> file and do our development inside
+      of the environment specified by that file. This file looks a lot
+      like the packageing described above. The main difference is that
+      <literal>src</literal> points to project root and we call the
+      package directly.
+    </para>
+    <programlisting>
+{ pkgs ? import &quot;&lt;nixpkgs&quot;&gt; {} }:
+
+with pkgs;
+
+let
+
+  f = { buildRebar3, ibrowse, jsx, erlware_commons }:
+      buildRebar3 {
+        name = "hex2nix";
+        version = "0.1.0";
+        src = ./.;
+        erlangDeps = [ ibrowse jsx erlware_commons ];
+      };
+  drv = beamPackages.callPackage f {};
+
+in
+ drv
+    </programlisting>
+    <section xml:id="building-in-a-shell">
+    <title>Building in a shell</title>
+    <para>
+      We can leveral the support of the Derivation, regardless of
+      which build Derivation is called by calling the commands themselv.s
+    </para>
+    <programlisting>
+# =============================================================================
+# Variables
+# =============================================================================
+
+NIX_TEMPLATES := "$(CURDIR)/nix-templates"
+
+TARGET := "$(PREFIX)"
+
+PROJECT_NAME := thorndyke
+
+NIXPKGS=../nixpkgs
+NIX_PATH=nixpkgs=$(NIXPKGS)
+NIX_SHELL=nix-shell -I "$(NIX_PATH)" --pure
+# =============================================================================
+# Rules
+# =============================================================================
+.PHONY= all test clean repl shell build test analyze configure install \
+        test-nix-install publish plt analyze
+
+all: build
+
+guard-%:
+        @ if [ "${${*}}" == "" ]; then \
+                echo "Environment variable $* not set"; \
+                exit 1; \
+        fi
+
+clean:
+        rm -rf _build
+        rm -rf .cache
+
+repl:
+        $(NIX_SHELL) --run "iex -pa './_build/prod/lib/*/ebin'"
+
+shell:
+        $(NIX_SHELL)
+
+configure:
+        $(NIX_SHELL) --command 'eval "$$configurePhase"'
+
+build: configure
+        $(NIX_SHELL) --command 'eval "$$buildPhase"'
+
+install:
+        $(NIX_SHELL) --command 'eval "$$installPhase"'
+
+test:
+        $(NIX_SHELL) --command 'mix test --no-start --no-deps-check'
+
+plt:
+        $(NIX_SHELL) --run "mix dialyzer.plt --no-deps-check"
+
+analyze: build plt
+        $(NIX_SHELL) --run "mix dialyzer --no-compile"
+
+    </programlisting>
+    <para>
+      If you add the <literal>shell.nix</literal> as described and
+      user rebar as follows things should simply work. Aside from the
+      <literal>test</literal>, <literal>plt</literal>, and
+      <literal>analyze</literal> the talks work just fine for all of
+      the build Derivations.
+    </para>
+  </section>
+</section>
+</section>
+<section xml:id="generating-packages-from-hex-with-hex2nix">
+  <title>Generating Packages from Hex with Hex2Nix</title>
+  <para>
+    Updating the Hex packages requires the use of the
+    <literal>hex2nix</literal> tool. Given the path to the Erlang
+    modules (usually
+    <literal>pkgs/development/erlang-modules</literal>). It will
+    happily dump a file called
+    <literal>hex-packages.nix</literal>. That file will contain all
+    the packages that use a recognized build system in Hex. However,
+    it can't know whether or not all those packages are buildable.
+    </para>
+    <para>
+      To make life easier for our users, it makes good sense to go
+      ahead and attempt to build all those packages and remove the
+      ones that don't build. To do that, simply run the command (in
+      the root of your <literal>nixpkgs</literal> repository). that follows.
+    </para>
+    <programlisting>
+$ nix-build -A beamPackages
+    </programlisting>
+    <para>
+      That will build every package in
+      <literal>beamPackages</literal>. Then you can go through and
+      manually remove the ones that fail. Hopefully, someone will
+      improve <literal>hex2nix</literal> in the future to automate
+      that.
+    </para>
+</section>
+</chapter>
diff --git a/doc/erlang-users-guide.xml b/doc/erlang-users-guide.xml
deleted file mode 100644
index 074ae50b1c0..00000000000
--- a/doc/erlang-users-guide.xml
+++ /dev/null
@@ -1,305 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xml:id="users-guide-to-the-erlang-infrastructure">
-
-<title>User's Guide to the Erlang Infrastructure</title>
-<section xml:id="build-tools">
-  <title>Build Tools</title>
-  <para>
-    By default Rebar3 wants to manage it's own dependencies. In the
-    normal non-Nix, this is perfectly acceptable. In the Nix world it
-    is not. To support this we have created two versions of rebar3,
-    <literal>rebar3</literal> and <literal>rebar3-open</literal>. The
-    <literal>rebar3</literal> version has been patched to remove the
-    ability to download anything from it. If you are not running it a
-    nix-shell or a nix-build then its probably not going to work for
-    you. <literal>rebar3-open</literal> is the normal, un-modified
-    rebar3. It should work exactly as would any other version of
-    rebar3. Any Erlang package should rely on
-    <literal>rebar3</literal> and thats really what you should be
-    using too.
-  </para>
-</section>
-
-<section xml:id="how-to-install-erlang-packages">
-  <title>How to install Erlang packages</title>
-  <para>
-    Erlang packages are not registered in the top level simply because
-    they are not relevant to the vast majority of Nix users. They are
-    installable using the <literal>erlangPackages</literal> attribute set.
-
-    You can list the avialable packages in the
-    <literal>erlangPackages</literal> with the following command:
-  </para>
-
-  <programlisting>
-$ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -qaP -A erlangPackages
-erlangPackages.esqlite    esqlite-0.2.1
-erlangPackages.goldrush   goldrush-0.1.7
-erlangPackages.ibrowse    ibrowse-4.2.2
-erlangPackages.jiffy      jiffy-0.14.5
-erlangPackages.lager      lager-3.0.2
-erlangPackages.meck       meck-0.8.3
-erlangPackages.rebar3-pc  pc-1.1.0
-  </programlisting>
-  <para>
-    To install any of those packages into your profile, refer to them by
-    their attribute path (first column):
-  </para>
-  <programlisting>
-$ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA erlangPackages.ibrowse
-  </programlisting>
-  <para>
-    The attribute path of any Erlang packages corresponds to the name
-    of that particular package in Hex or its OTP Application/Release name.
-  </para>
-</section>
-<section xml:id="packaging-erlang-applications">
-  <title>Packaging Erlang Applications</title>
-  <section xml:id="rebar3-packages">
-    <title>Rebar3 Packages</title>
-    <para>
-      There is a Nix functional called
-      <literal>buildRebar3</literal>. We use this function to make a
-      derivation that understands how to build the rebar3 project. For
-      example, the epression we use to build the <link
-      xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>
-      project follows.
-    </para>
-    <programlisting>
-{stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons }:
-
-buildRebar3 rec {
-    name = "hex2nix";
-    version = "0.0.1";
-
-    src = fetchFromGitHub {
-        owner = "ericbmerritt";
-        repo = "hex2nix";
-        rev = "${version}";
-        sha256 = "1w7xjidz1l5yjmhlplfx7kphmnpvqm67w99hd2m7kdixwdxq0zqg";
-    };
-
-    erlangDeps = [ ibrowse jsx erlware_commons ];
-}
-    </programlisting>
-    <para>
-      The only visible difference between this derivation and
-      something like <literal>stdenv.mkDerivation</literal> is that we
-      have added <literal>erlangDeps</literal> to the derivation. If
-      you add your Erlang dependencies here they will be correctly
-      handled by the system.
-    </para>
-    <para>
-      If your package needs to compile native code via Rebar's port
-      compilation mechenism. You should add <literal>compilePort =
-      true;</literal> to the derivation.
-    </para>
-  </section>
-
-  <section xml:id="hex-packages">
-    <title>Hex Packages</title>
-    <para>
-      Hex packages are based on Rebar packages. In fact, at the moment
-      we can only compile Hex packages that are buildable with
-      Rebar3. Packages that use Mix and other build systems are not
-      supported. That being said, we know a lot more about Hex and can
-      do more for you.
-    </para>
-    <programlisting>
-{ buildHex }:
-  buildHex {
-    name = "esqlite";
-    version = "0.2.1";
-    sha256 = "1296fn1lz4lz4zqzn4dwc3flgkh0i6n4sydg501faabfbv8d3wkr";
-    compilePort = true;
-}
-    </programlisting>
-    <para>
-      For Hex packages you need to provide the name, the version, and
-      the Sha 256 digest of the package and use
-      <literal>buildHex</literal> to build it. Obviously, the package
-      needs to have already been published to Hex.
-    </para>
-  </section>
-</section>
-<section xml:id="how-to-develop">
-  <title>How to develop</title>
-  <section xml:id="accessing-an-environment">
-    <title>Accessing an Environment</title>
-    <para>
-      Often, all you want to do is be able to access a valid
-      environment that contains a specific package and its
-      dependencies. we can do that with the <literal>env</literal>
-      part of a derivation. For example, lets say we want to access an
-      erlang repl with ibrowse loaded up. We could do the following.
-    </para>
-    <programlisting>
-      ~/w/nixpkgs ❯❯❯ nix-shell -A erlangPackages.ibrowse.env --run "erl"
-      Erlang/OTP 18 [erts-7.0] [source] [64-bit] [smp:4:4] [async-threads:10] [hipe] [kernel-poll:false]
-
-      Eshell V7.0  (abort with ^G)
-      1> m(ibrowse).
-      Module: ibrowse
-      MD5: 3b3e0137d0cbb28070146978a3392945
-      Compiled: January 10 2016, 23:34
-      Object file: /nix/store/g1rlf65rdgjs4abbyj4grp37ry7ywivj-ibrowse-4.2.2/lib/erlang/lib/ibrowse-4.2.2/ebin/ibrowse.beam
-      Compiler options:  [{outdir,"/tmp/nix-build-ibrowse-4.2.2.drv-0/hex-source-ibrowse-4.2.2/_build/default/lib/ibrowse/ebin"},
-      debug_info,debug_info,nowarn_shadow_vars,
-      warn_unused_import,warn_unused_vars,warnings_as_errors,
-      {i,"/tmp/nix-build-ibrowse-4.2.2.drv-0/hex-source-ibrowse-4.2.2/_build/default/lib/ibrowse/include"}]
-      Exports:
-      add_config/1                  send_req_direct/7
-      all_trace_off/0               set_dest/3
-      code_change/3                 set_max_attempts/3
-      get_config_value/1            set_max_pipeline_size/3
-      get_config_value/2            set_max_sessions/3
-      get_metrics/0                 show_dest_status/0
-      get_metrics/2                 show_dest_status/1
-      handle_call/3                 show_dest_status/2
-      handle_cast/2                 spawn_link_worker_process/1
-      handle_info/2                 spawn_link_worker_process/2
-      init/1                        spawn_worker_process/1
-      module_info/0                 spawn_worker_process/2
-      module_info/1                 start/0
-      rescan_config/0               start_link/0
-      rescan_config/1               stop/0
-      send_req/3                    stop_worker_process/1
-      send_req/4                    stream_close/1
-      send_req/5                    stream_next/1
-      send_req/6                    terminate/2
-      send_req_direct/4             trace_off/0
-      send_req_direct/5             trace_off/2
-      send_req_direct/6             trace_on/0
-      trace_on/2
-      ok
-      2>
-    </programlisting>
-    <para>
-      Notice the <literal>-A erlangPackages.ibrowse.env</literal>.That
-      is the key to this functionality.
-    </para>
-  </section>
-  <section xml:id="creating-a-shell">
-    <title>Creating a Shell</title>
-    <para>
-      Getting access to an environment often isn't enough to do real
-      development. Many times we need to create a
-      <literal>shell.nix</literal> file and do our development inside
-      of the environment specified by that file. This file looks a lot
-      like the packageing described above. The main difference is that
-      <literal>src</literal> points to project root and we call the
-      package directly.
-    </para>
-    <programlisting>
-{ pkgs ? import &quot;&lt;nixpkgs&quot;&gt; {} }:
-
-with pkgs;
-
-let
-
-  f = { buildHex, ibrowse, jsx, erlware_commons }:
-      buildHex {
-        name = "hex2nix";
-        version = "0.1.0";
-        src = ./.;
-        erlangDeps = [ ibrowse jsx erlware_commons ];
-      };
-  drv = erlangPackages.callPackage f {};
-
-in
- drv
-    </programlisting>
-    <section xml:id="building-in-a-shell">
-    <title>Building in a shell</title>
-    <para>
-      Unfortunatly for us users of Nix, Rebar isn't very cooperative
-      with us from the standpoint of building a hermetic
-      environment. When building the rebar3 support we had to do some
-      sneaky things to get it not to go out and pull packages on its
-      own. Also unfortunately, you have to do some of the same things
-      when building a project inside of a Nix shell.
-
-      <orderedlist numeration="arabic">
-        <listitem>
-          <para>Run <literal>rebar3-nix-bootstrap</literal> every time
-          dependencies change</para>
-        </listitem>
-        <listitem>
-          <para>Set Home to the current directory.</para>
-        </listitem>
-      </orderedlist>
-
-      If you do these two things then Rebar will be happy with you. I
-      codify these into a makefile. Forunately, rebar3-nix-bootstrap
-      is idempotent and fairly quick. so you can run it as often as
-      you like.
-    </para>
-    <programlisting>
-# =============================================================================
-# Rules
-# =============================================================================
-.PHONY= all test clean repl shell build test analyze bootstrap
-
-all: test
-
-clean:
-        rm -rf _build
-        rm -rf .cache
-
-repl:
-        nix-shell --run "erl"
-
-shell:
-        nix-shell --run "bash"
-
-bootstrap:
-        nix-shell --pure --run "rebar3-nix-bootstrap"
-
-build: bootstrap
-        nix-shell --pure --run "HOME=$(CURDIR) rebar3 compile"
-
-analyze: bootstrap
-        nix-shell --pure --run "HOME=$(CURDIR) rebar3 do compile,dialyzer"
-
-test: bootstrap
-        nix-shell --pure --run "HOME=$(CURDIR) rebar3 do compile,dialyzer,eunit"
-
-    </programlisting>
-    <para>
-      If you add the <literal>shell.nix</literal> as described and
-      user rebar as follows things should simply work.
-    </para>
-  </section>
-</section>
-</section>
-<section xml:id="generating-packages-from-hex-with-hex2nix">
-  <title>Generating Packages from Hex with Hex2Nix</title>
-  <para>
-    Updating the Hex packages requires the use of the
-    <literal>hex2nix</literal> tool. Given the path to the Erlang
-    modules (usually
-    <literal>pkgs/development/erlang-modules</literal>). It will
-    happily dump a file called
-    <literal>hex-packages.nix</literal>. That file will contain all
-    the packages that use a recognized build system in Hex. However,
-    it can't know whether or not all those packages are buildable.
-    </para>
-    <para>
-      To make life easier for our users, it makes good sense to go
-      ahead and attempt to build all those packages and remove the
-      ones that don't build. To do that, simply run the command (in
-      the root of your <literal>nixpkgs</literal> repository). that follows.
-    </para>
-    <programlisting>
-$ nix-build -A erlangPackages
-    </programlisting>
-    <para>
-      That will build every package in
-      <literal>erlangPackages</literal>. Then you can go through and
-      manually remove the ones that fail. Hopefully, someone will
-      improve <literal>hex2nix</literal> in the future to automate
-      that.
-    </para>
-</section>
-</chapter>
diff --git a/doc/manual.xml b/doc/manual.xml
index de663fcd5b6..1045d0d4f81 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -21,7 +21,7 @@
   <xi:include href="coding-conventions.xml" />
   <xi:include href="submitting-changes.xml" />
   <xi:include href="haskell-users-guide.xml" />
-  <xi:include href="erlang-users-guide.xml" />
+  <xi:include href="beam-users-guide.xml" />
   <xi:include href="contributing.xml" />
 
 </book>
diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix
index 12efc00b050..70c186df8a0 100644
--- a/pkgs/development/beam-modules/build-mix.nix
+++ b/pkgs/development/beam-modules/build-mix.nix
@@ -8,7 +8,6 @@
 , beamDeps ? []
 , postPatch ? ""
 , compilePorts ? false
-, installPhase ? null
 , meta ? {}
 , ... }@attrs:
 
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 03bab8c4aa9..fec600400cb 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -12,6 +12,5 @@ let
     ## Non hex packages
     hex = callPackage ./hex {};
     webdriver = callPackage ./webdriver {};
-    elli = callPackage ./elli {};
   };
 in self // self.hexPackages
diff --git a/pkgs/development/beam-modules/hex-registry-snapshot.nix b/pkgs/development/beam-modules/hex-registry-snapshot.nix
index 378fb382f95..3c2690c0103 100644
--- a/pkgs/development/beam-modules/hex-registry-snapshot.nix
+++ b/pkgs/development/beam-modules/hex-registry-snapshot.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
     name = "hex-registry";
-    rev = "329ae2b";
+    rev = "59b836d";
     version = "0.0.0+build.${rev}";
 
     src = fetchFromGitHub {
         owner = "erlang-nix";
         repo = "hex-pm-registry-snapshots";
         inherit rev;
-        sha256 = "1rs3z8psfvy10mzlfvkdzbflgikcnq08r38kfi0f8p5wvi8f8hmh";
+        sha256 = "1l8m6ckn5ivhfiv3k4dymi6b7wg511fwymnpxd6ymfd39dq0n5b0";
     };
 
     installPhase = ''
diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix
index a8806127d35..7d05a56bfdf 100644
--- a/pkgs/development/tools/erlang/cuter/default.nix
+++ b/pkgs/development/tools/erlang/cuter/default.nix
@@ -1,5 +1,5 @@
 {stdenv, autoconf, which, writeText, makeWrapper, fetchFromGitHub, erlang,
-  erlangPackages, z3, python27 }:
+  beamPackages, z3, python27 }:
 
 stdenv.mkDerivation rec {
     name = "cuter";
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
     };
 
     setupHook = writeText "setupHook.sh" ''
-       addToSearchPath ERL_LIBS "$1/lib/erlang/lib/"
+    addToSearchPath ERL_LIBS "$1/lib/erlang/lib/"
     '';
-    buildInputs = with erlangPackages; [ autoconf erlang z3 python27 makeWrapper which ];
+    buildInputs = with beamPackages; [ autoconf erlang z3 python27 makeWrapper which ];
 
     buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target";
     configurePhase = ''

From e214f29168a7c61f65fd960ba35a04b056f6b03c Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Wed, 30 Mar 2016 10:19:55 -0700
Subject: [PATCH 162/712] elixir: modify elixir to allow debug information

This modifies the elixir derivation to allow 'debugInfo' to be set. This
will build the elixir library with debug information and allow dializer
to be used it derivative projects
---
 .../development/beam-modules/hex-packages.nix | 12657 ++++++++++++----
 .../interpreters/elixir/default.nix           |     7 +-
 2 files changed, 9786 insertions(+), 2878 deletions(-)

diff --git a/pkgs/development/beam-modules/hex-packages.nix b/pkgs/development/beam-modules/hex-packages.nix
index d7b635176a8..e7745ce6050 100644
--- a/pkgs/development/beam-modules/hex-packages.nix
+++ b/pkgs/development/beam-modules/hex-packages.nix
@@ -31,17 +31,17 @@ let
 
     abnf = abnf_0_0_1;
 
-    absinthe_0_5_2 = callPackage
+    absinthe_1_0_0 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "absinthe";
-            version = "0.5.2";
+            version = "1.0.0";
             src = fetchHex {
               pkg = "absinthe";
-              version = "0.5.2";
+              version = "1.0.0";
               sha256 =
-                "2b926ae2b61e0227caf437419d017bb146a9073a67e4e5fa5ed754f3b30994f6";
+                "c5606be8b46003e7ac47e87c924908cb390b892fef0eae390deb66f8ee123a1c";
             };
 
             meta = {
@@ -52,21 +52,42 @@ let
           }
       ) {};
 
-    absinthe = absinthe_0_5_2;
-
-    absinthe_plug_0_5_0 = callPackage
+    absinthe_1_1_2 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, absinthe_0_5_2 }:
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "absinthe";
+            version = "1.1.2";
+            src = fetchHex {
+              pkg = "absinthe";
+              version = "1.1.2";
+              sha256 =
+                "e15a387d865922df70506a4cdb63520de8ae9473358deefaffa3f70195193b07";
+            };
+
+            meta = {
+              description = ''GraphQL for Elixir'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/CargoSense/absinthe";
+            };
+          }
+      ) {};
+
+    absinthe = absinthe_1_1_2;
+
+    absinthe_plug_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_3, absinthe_1_0_0 }:
           buildMix {
             name = "absinthe_plug";
-            version = "0.5.0";
+            version = "1.0.0";
             src = fetchHex {
               pkg = "absinthe_plug";
-              version = "0.5.0";
+              version = "1.0.0";
               sha256 =
-                "eaa22a2af708ee3c37217ad5fcf31210347bb7c0807f7c96cffb09b311326291";
+                "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33";
             };
-            beamDeps  = [ plug_1_1_1 absinthe_0_5_2 ];
+            beamDeps  = [ plug_1_1_3 absinthe_1_0_0 ];
 
             meta = {
               description = ''A plug for Absinthe, an experimental GraphQL
@@ -77,11 +98,35 @@ let
           }
       ) {};
 
-    absinthe_plug = absinthe_plug_0_5_0;
+    absinthe_plug = absinthe_plug_1_0_0;
+
+    absinthe_relay_0_8_0 = callPackage
+      (
+        {  buildMix, fetchHex, absinthe_1_1_2 }:
+          buildMix {
+            name = "absinthe_relay";
+            version = "0.8.0";
+            src = fetchHex {
+              pkg = "absinthe_relay";
+              version = "0.8.0";
+              sha256 =
+                "a54ba3775d06db5d7cf3eaa7165bfa3eeaf26f7ee1d5021e0b4db3d74a3ecdd9";
+            };
+            beamDeps  = [ absinthe_1_1_2 ];
+
+            meta = {
+              description = ''Relay framework support for Absinthe'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/absinthe-graphql/absinthe_relay";
+            };
+          }
+      ) {};
+
+    absinthe_relay = absinthe_relay_0_8_0;
 
     access_token_extractor_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
           buildMix {
             name = "access_token_extractor";
             version = "0.1.1";
@@ -91,7 +136,7 @@ let
               sha256 =
                 "40f76799f8fbb5b03230b31d4d55c5a169e7c3ad82d776a9d87fe0c65c85396d";
             };
-            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
 
             meta = {
               longDescription = ''Simple Plug to extract access_token from
@@ -272,9 +317,33 @@ let
 
     aeacus = aeacus_0_3_0;
 
+    ahab_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ahab";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "ahab";
+              version = "0.1.1";
+              sha256 =
+                "c981c2f62dccd15a055083f9bc088aa0e4a029625ef9aa45104c4ba0ead12bd2";
+            };
+
+            meta = {
+              description = ''A lightweight, low latency TCP acceptor pool for
+                            Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/jquadrin/ahab";
+            };
+          }
+      ) {};
+
+    ahab = ahab_0_1_1;
+
     airbrake_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "airbrake";
             version = "0.1.0";
@@ -284,7 +353,7 @@ let
               sha256 =
                 "45d3e2da7f5a8793b9fd7752cbeaa988a848396f44b77d0265f3bed36182d901";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''An Elixir notifier to the Airbrake'';
@@ -322,7 +391,7 @@ let
 
     airbrakex_0_0_6 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
           buildMix {
             name = "airbrakex";
             version = "0.0.6";
@@ -332,7 +401,7 @@ let
               sha256 =
                 "a8efc0a9a641a6c5ada2585ee5889291b74ded10977af7b1a4ac6bc445d166e8";
             };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_1 ];
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
 
             meta = {
               description = ''Airbrake Elixir Notifier'';
@@ -344,6 +413,34 @@ let
 
     airbrakex = airbrakex_0_0_6;
 
+    airbrakify_0_0_1 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_2_1_0, plug_1_1_3, httpoison_0_8_2
+        }:
+          buildMix {
+            name = "airbrakify";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "airbrakify";
+              version = "0.0.1";
+              sha256 =
+                "973f895ba83e6dd71cf87182419e144db5c3ac23e43b7a1247e51559bf2737b6";
+            };
+            beamDeps  = [ poison_2_1_0 plug_1_1_3 httpoison_0_8_2 ];
+
+            meta = {
+              longDescription = ''A simple Airbrake/Errbit library for
+                                Elixir/Phoenix projects. Currently only supports
+                                error/exception notifications via a Plug.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Diamond/airbrakify";
+            };
+          }
+      ) {};
+
+    airbrakify = airbrakify_0_0_1;
+
     alambic_0_1_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -370,6 +467,52 @@ let
 
     alambic = alambic_0_1_0;
 
+    alchemic_pinyin_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "alchemic_pinyin";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "alchemic_pinyin";
+              version = "0.1.0";
+              sha256 =
+                "b1488866a9501557d9a5089726675bb34affd513316e167baccc155d7abfefd2";
+            };
+
+            meta = {
+              description = ''中文汉字转拼音.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zhangsoledad/alchemic_pinyin";
+            };
+          }
+      ) {};
+
+    alchemic_pinyin = alchemic_pinyin_0_1_0;
+
+    alchemist_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "alchemist";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "alchemist";
+              version = "0.0.2";
+              sha256 =
+                "095ad9b47258b2d482b782a5794ed800df1c4024abbc126f347738be72a1aa51";
+            };
+
+            meta = {
+              description = ''Carefully refactor critical paths'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/jkakar/alchemist";
+            };
+          }
+      ) {};
+
+    alchemist = alchemist_0_0_2;
+
     alchemy_0_0_1 = callPackage
       (
         {  buildMix, fetchHex, uuid_1_1_3 }:
@@ -417,9 +560,34 @@ let
 
     aleppo = aleppo_0_9_0;
 
+    alexa_0_1_12 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0 }:
+          buildMix {
+            name = "alexa";
+            version = "0.1.12";
+            src = fetchHex {
+              pkg = "alexa";
+              version = "0.1.12";
+              sha256 =
+                "dbc1da3081766570635abc31a799164a1afb34fce437b1d5ef14bfcc5f8ace3d";
+            };
+            beamDeps  = [ poison_2_1_0 ];
+
+            meta = {
+              description = ''Framework for implementing an Amazon Alexa
+                            Skill.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/col/alexa";
+            };
+          }
+      ) {};
+
+    alexa = alexa_0_1_12;
+
     alexa_plug_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1 }:
+        {  buildMix, fetchHex, plug_1_1_3 }:
           buildMix {
             name = "alexa_plug";
             version = "0.2.0";
@@ -429,7 +597,7 @@ let
               sha256 =
                 "a78f6fa5e3ba33ce0943f4cb96d6cfcc9b36637a4575314469c8a0d45fff40d0";
             };
-            beamDeps  = [ plug_1_1_1 ];
+            beamDeps  = [ plug_1_1_3 ];
 
             meta = {
               longDescription = ''A simple set of plugs and utilities for
@@ -443,17 +611,42 @@ let
 
     alexa_plug = alexa_plug_0_2_0;
 
-    algae_0_9_1 = callPackage
+    alexa_web_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4, alexa_0_1_12 }:
+          buildMix {
+            name = "alexa_web";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "alexa_web";
+              version = "0.0.2";
+              sha256 =
+                "e60a7fa60eb52bbb91e445cf0ee3781e0e2a148855befa638b274e6720421126";
+            };
+            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 alexa_0_1_12 ];
+
+            meta = {
+              description = ''A web endpoint for deploying one or a collection
+                            of Amazon Alexa Skills'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/col/alexa_web";
+            };
+          }
+      ) {};
+
+    alexa_web = alexa_web_0_0_2;
+
+    algae_0_10_0 = callPackage
       (
         {  buildMix, fetchHex, quark_1_0_2 }:
           buildMix {
             name = "algae";
-            version = "0.9.1";
+            version = "0.10.0";
             src = fetchHex {
               pkg = "algae";
-              version = "0.9.1";
+              version = "0.10.0";
               sha256 =
-                "6d0877d508bd16098b4fb6d0549c5070b8217016b61ac8b220d9f35f3fb82391";
+                "02d89132d99da1e13271007d1109be958ef8b3b7a5e64323299b84d0aa2353e1";
             };
             beamDeps  = [ quark_1_0_2 ];
 
@@ -465,29 +658,45 @@ let
           }
       ) {};
 
-    algae = algae_0_9_1;
+    algae = algae_0_10_0;
 
-    alice_0_1_2 = callPackage
+    algolia_0_3_1 = callPackage
       (
-        {
-          buildMix,
-          fetchHex,
-          slack_0_4_2,
-          redix_0_3_4,
-          poolboy_1_5_1,
-          poison_2_0_1
-        }:
+        {  buildMix, fetchHex, poison_1_0_3, hackney_1_6_0 }:
+          buildMix {
+            name = "algolia";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "algolia";
+              version = "0.3.1";
+              sha256 =
+                "a88020c68712d134e66ccde3d2029766249d3da0188da369448a24f66d2f9f6c";
+            };
+            beamDeps  = [ poison_1_0_3 hackney_1_6_0 ];
+
+            meta = {
+              description = ''Elixir implementation of Algolia Search API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sikanhe/algolia-elixir";
+            };
+          }
+      ) {};
+
+    algolia = algolia_0_3_1;
+
+    alice_0_3_3 = callPackage
+      (
+        {  buildMix, fetchHex, slack_0_4_2, redix_0_3_6, poolboy_1_5_1 }:
           buildMix {
             name = "alice";
-            version = "0.1.2";
+            version = "0.3.3";
             src = fetchHex {
               pkg = "alice";
-              version = "0.1.2";
+              version = "0.3.3";
               sha256 =
-                "badb6a115a8de88bab122b197214881cd64d2aaf48d8004013adbc6a024fb985";
+                "637953131f96a877f13661da9640efcca4417c69f51db70db85bfa18648156f8";
             };
-            beamDeps  = [ slack_0_4_2 redix_0_3_4 poolboy_1_5_1 poison_2_0_1
-                      ];
+            beamDeps  = [ slack_0_4_2 redix_0_3_6 poolboy_1_5_1 ];
 
             meta = {
               description = ''A Slack bot'';
@@ -497,21 +706,21 @@ let
           }
       ) {};
 
-    alice = alice_0_1_2;
+    alice = alice_0_3_3;
 
-    alice_against_humanity_0_0_1 = callPackage
+    alice_against_humanity_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex, alice_0_1_2 }:
+        {  buildMix, fetchHex, alice_0_3_3 }:
           buildMix {
             name = "alice_against_humanity";
-            version = "0.0.1";
+            version = "0.1.2";
             src = fetchHex {
               pkg = "alice_against_humanity";
-              version = "0.0.1";
+              version = "0.1.2";
               sha256 =
-                "8c9ddbd7b5db3a18740a354b2e385c7e652e820f4262279dfabee36de93c7816";
+                "aac5f049b59d0eaaea2383e1fc8fec28125b9a29ffda7fbe214d829738ad3935";
             };
-            beamDeps  = [ alice_0_1_2 ];
+            beamDeps  = [ alice_0_3_3 ];
 
             meta = {
               description = ''A handler for the Alice Slack bot. Play Cards
@@ -523,21 +732,21 @@ let
           }
       ) {};
 
-    alice_against_humanity = alice_against_humanity_0_0_1;
+    alice_against_humanity = alice_against_humanity_0_1_2;
 
-    alice_google_images_0_0_1 = callPackage
+    alice_google_images_0_1_3 = callPackage
       (
-        {  buildMix, fetchHex, alice_0_1_2 }:
+        {  buildMix, fetchHex, alice_0_3_3 }:
           buildMix {
             name = "alice_google_images";
-            version = "0.0.1";
+            version = "0.1.3";
             src = fetchHex {
               pkg = "alice_google_images";
-              version = "0.0.1";
+              version = "0.1.3";
               sha256 =
-                "ca276e382bde0a996866c7196ae454d3fdc0eb835398e8ece56c24b2c74736cc";
+                "04b4e23c44a67c032c1ac8e2da4ca0fca03ec20cf207b4cb40eba0cb17e975e8";
             };
-            beamDeps  = [ alice_0_1_2 ];
+            beamDeps  = [ alice_0_3_3 ];
 
             meta = {
               description = ''A handler for the Alice Slack bot. Get random
@@ -549,21 +758,21 @@ let
           }
       ) {};
 
-    alice_google_images = alice_google_images_0_0_1;
+    alice_google_images = alice_google_images_0_1_3;
 
-    alice_karma_0_0_1 = callPackage
+    alice_karma_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex, alice_0_1_2 }:
+        {  buildMix, fetchHex, alice_0_3_3 }:
           buildMix {
             name = "alice_karma";
-            version = "0.0.1";
+            version = "0.1.1";
             src = fetchHex {
               pkg = "alice_karma";
-              version = "0.0.1";
+              version = "0.1.1";
               sha256 =
-                "b2c1d8b0b7fe077b2a4bc1f24b01e872e24d4f6c82d50791ef6b3a57fc2af150";
+                "c73198e5edb1f5a05e744ca11afa0d2cc58ec183ca0c32bd5e8a01efa7b61559";
             };
-            beamDeps  = [ alice_0_1_2 ];
+            beamDeps  = [ alice_0_3_3 ];
 
             meta = {
               longDescription = ''A handler for the Alice Slack bot. Allows
@@ -575,7 +784,58 @@ let
           }
       ) {};
 
-    alice_karma = alice_karma_0_0_1;
+    alice_karma = alice_karma_0_1_1;
+
+    alice_shizzle_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex, gizoogle_0_0_2, alice_0_3_3 }:
+          buildMix {
+            name = "alice_shizzle";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "alice_shizzle";
+              version = "0.1.2";
+              sha256 =
+                "c98481d59c004f905958b9412bff1d288a649cf373afb4fea307222af2597c19";
+            };
+            beamDeps  = [ gizoogle_0_0_2 alice_0_3_3 ];
+
+            meta = {
+              longDescription = ''A handlez fo` tha Alice Slack bot fo` realz.
+                                Uses Gizoogle ta allow you ta drop a rhyme like
+                                a thug n` retrieve links fo` translated sitez'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/notdevinclark/alice_shizzle";
+            };
+          }
+      ) {};
+
+    alice_shizzle = alice_shizzle_0_1_2;
+
+    alice_xkcd_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, xkcd_0_0_1, alice_0_3_3 }:
+          buildMix {
+            name = "alice_xkcd";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "alice_xkcd";
+              version = "0.0.3";
+              sha256 =
+                "13562b43fd99c7d9cdc568d7511c154842b9a59a19eca9df019069193bd94842";
+            };
+            beamDeps  = [ xkcd_0_0_1 alice_0_3_3 ];
+
+            meta = {
+              longDescription = ''A handler for the Alice Slack bot. Retrieves
+                                latest, specific and random XKCD comics.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/notdevinclark/alice_xkcd";
+            };
+          }
+      ) {};
+
+    alice_xkcd = alice_xkcd_0_0_3;
 
     alphonse_0_1_0 = callPackage
       (
@@ -602,25 +862,21 @@ let
 
     alphonse = alphonse_0_1_0;
 
-    amazon_product_advertising_client_0_1_0 = callPackage
+    amazon_product_advertising_client_0_1_1 = callPackage
       (
         {
-          buildMix,
-          fetchHex,
-          timex_1_0_0_rc4,
-          sweet_xml_0_6_1,
-          httpoison_0_8_1
+          buildMix, fetchHex, timex_1_0_2, sweet_xml_0_6_1, httpoison_0_8_2
         }:
           buildMix {
             name = "amazon_product_advertising_client";
-            version = "0.1.0";
+            version = "0.1.1";
             src = fetchHex {
               pkg = "amazon_product_advertising_client";
-              version = "0.1.0";
+              version = "0.1.1";
               sha256 =
-                "b50ac32e0386060de093955662a8152bcb446c81c6fa5315ec0cf94586c69c24";
+                "406111cedbd475cab29bdcc69f48ddc3670e57d2e3294e8d948c117ae492951c";
             };
-            beamDeps  = [ timex_1_0_0_rc4 sweet_xml_0_6_1 httpoison_0_8_1 ];
+            beamDeps  = [ timex_1_0_2 sweet_xml_0_6_1 httpoison_0_8_2 ];
 
             meta = {
               description = ''An Amazon Product Advertising API client for
@@ -633,7 +889,7 @@ let
       ) {};
 
     amazon_product_advertising_client =
-      amazon_product_advertising_client_0_1_0;
+      amazon_product_advertising_client_0_1_1;
 
     amnesia_0_2_1 = callPackage
       (
@@ -754,17 +1010,17 @@ let
 
     amrita = amrita_0_4_0;
 
-    anaphora_0_1_1 = callPackage
+    anaphora_0_1_2 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "anaphora";
-            version = "0.1.1";
+            version = "0.1.2";
             src = fetchHex {
               pkg = "anaphora";
-              version = "0.1.1";
+              version = "0.1.2";
               sha256 =
-                "c43d66532152b05caee2cfca06ae1b86bd297c2e67ca358ecdcdc94da57ade83";
+                "fb60a214b2be57d7a08aa8237cd7afb009b637563d64ed5e6ec486e36c484001";
             };
 
             meta = {
@@ -775,7 +1031,31 @@ let
           }
       ) {};
 
-    anaphora = anaphora_0_1_1;
+    anaphora = anaphora_0_1_2;
+
+    anilixir_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
+          buildMix {
+            name = "anilixir";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "anilixir";
+              version = "1.0.0";
+              sha256 =
+                "ee5c6dfa7e5250d8ec5c9b04910e3202788ceeba231cb3ff8b22e479cc64f1c3";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
+
+            meta = {
+              description = ''Anilist API client for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sotojuan/anilixir";
+            };
+          }
+      ) {};
+
+    anilixir = anilixir_1_0_0;
 
     anubis_0_1_0 = callPackage
       (
@@ -869,7 +1149,28 @@ let
           }
       ) {};
 
-    apex = apex_0_3_7;
+    apex_0_4_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "apex";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "apex";
+              version = "0.4.0";
+              sha256 =
+                "0a566f042e9be5e220ed7ca2869770c0c2c0ca4560c416dee317df86f238eccf";
+            };
+
+            meta = {
+              description = ''Elixir clone of Ruby`s awesome_print gem'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bjro/apex";
+            };
+          }
+      ) {};
+
+    apex = apex_0_4_0;
 
     apix_0_1_0 = callPackage
       (
@@ -896,17 +1197,17 @@ let
 
     apix = apix_0_1_0;
 
-    apns_0_0_11 = callPackage
+    apns_0_0_12 = callPackage
       (
         {  buildMix, fetchHex, poolboy_1_5_1, poison_1_5_2 }:
           buildMix {
             name = "apns";
-            version = "0.0.11";
+            version = "0.0.12";
             src = fetchHex {
               pkg = "apns";
-              version = "0.0.11";
+              version = "0.0.12";
               sha256 =
-                "03258b65f3225f47d3f2c23b087f96b904e9f84b5be242e66c0dbfb54c728011";
+                "3eb40b6ef9e73a5082593f6ac1e8ba8548bbfd4bff1f3a5c5d5707ac114fc172";
             };
             beamDeps  = [ poolboy_1_5_1 poison_1_5_2 ];
 
@@ -919,7 +1220,7 @@ let
           }
       ) {};
 
-    apns = apns_0_0_11;
+    apns = apns_0_0_12;
 
     apostle_0_0_3 = callPackage
       (
@@ -969,19 +1270,21 @@ let
 
     ar2ecto = ar2ecto_0_1_2;
 
-    arc_0_3_0 = callPackage
+    arc_0_5_1 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1, ex_aws_0_4_17 }:
+        {
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, ex_aws_0_4_18
+        }:
           buildMix {
             name = "arc";
-            version = "0.3.0";
+            version = "0.5.1";
             src = fetchHex {
               pkg = "arc";
-              version = "0.3.0";
+              version = "0.5.1";
               sha256 =
-                "cc0bb4e31e9b4eccb164959bfc4f438390d5ddaed5762c49761a69d7e2f75e48";
+                "21c64533b2b13033c57cbe031bc064a7c3edfa9a1cb52286dfeda7c4c6d83426";
             };
-            beamDeps  = [ httpoison_0_8_1 ex_aws_0_4_17 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ex_aws_0_4_18 ];
 
             meta = {
               description = ''Flexible file upload and attachment library for
@@ -992,11 +1295,11 @@ let
           }
       ) {};
 
-    arc = arc_0_3_0;
+    arc = arc_0_5_1;
 
     arc_ecto_0_3_2 = callPackage
       (
-        {  buildMix, fetchHex, ecto_2_0_0_beta_0, arc_0_3_0 }:
+        {  buildMix, fetchHex, ecto_2_0_0_beta_2, arc_0_5_1 }:
           buildMix {
             name = "arc_ecto";
             version = "0.3.2";
@@ -1006,7 +1309,7 @@ let
               sha256 =
                 "92cb9e81eb75a1a9fdb4f4fc8e83714b9ee67e3ddb96db9d53c46e7002bf7e8d";
             };
-            beamDeps  = [ ecto_2_0_0_beta_0 arc_0_3_0 ];
+            beamDeps  = [ ecto_2_0_0_beta_2 arc_0_5_1 ];
 
             meta = {
               description = ''An integration with Arc and Ecto.'';
@@ -1040,17 +1343,17 @@ let
 
     argent = argent_0_0_1;
 
-    argument_parser_0_1_1 = callPackage
+    argument_parser_0_1_3 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "argument_parser";
-            version = "0.1.1";
+            version = "0.1.3";
             src = fetchHex {
               pkg = "argument_parser";
-              version = "0.1.1";
+              version = "0.1.3";
               sha256 =
-                "beebcf7216bce18d953a832209ec0e9a3b669f108bf49c09f964060f0a10cb85";
+                "2c56a6c9dfa9790aabdb8f9268ac501404376ffb13396ff515e66f1ebf64817d";
             };
 
             meta = {
@@ -1062,7 +1365,7 @@ let
           }
       ) {};
 
-    argument_parser = argument_parser_0_1_1;
+    argument_parser = argument_parser_0_1_3;
 
     array_1_0_1 = callPackage
       (
@@ -1087,21 +1390,21 @@ let
 
     array = array_1_0_1;
 
-    artifact_0_1_0 = callPackage
+    artifact_0_4_0 = callPackage
       (
         {
-          buildMix, fetchHex, porcelain_2_0_1, poolboy_1_5_1, plug_1_1_1
+          buildMix, fetchHex, porcelain_2_0_1, poolboy_1_5_1, plug_1_1_3
         }:
           buildMix {
             name = "artifact";
-            version = "0.1.0";
+            version = "0.4.0";
             src = fetchHex {
               pkg = "artifact";
-              version = "0.1.0";
+              version = "0.4.0";
               sha256 =
-                "1b03c29afa283429fbd158ce70345b0612a6bc87b743164ddc5b86213b42d9f5";
+                "6c66a3c745418e1f1207940c3815828d1a0f022d8186e5da593599d1f460197f";
             };
-            beamDeps  = [ porcelain_2_0_1 poolboy_1_5_1 plug_1_1_1 ];
+            beamDeps  = [ porcelain_2_0_1 poolboy_1_5_1 plug_1_1_3 ];
 
             meta = {
               description = ''File upload and on-the-fly processing for
@@ -1112,7 +1415,7 @@ let
           }
       ) {};
 
-    artifact = artifact_0_1_0;
+    artifact = artifact_0_4_0;
 
     aruspex_0_1_0 = callPackage
       (
@@ -1189,7 +1492,7 @@ let
 
     assembla_api_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "assembla_api";
             version = "0.1.0";
@@ -1199,7 +1502,7 @@ let
               sha256 =
                 "b4a3898de536e4820702c0f119993fd2804e91e2525d1e7eba57d8744983ef24";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Assembla API client'';
@@ -1257,6 +1560,31 @@ let
 
     atlas = atlas_0_2_0;
 
+    auth_test_support_0_0_6 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_3 }:
+          buildMix {
+            name = "auth_test_support";
+            version = "0.0.6";
+            src = fetchHex {
+              pkg = "auth_test_support";
+              version = "0.0.6";
+              sha256 =
+                "930596c61d237fbf74b86d87819f0a7df8da8ef79051294a1982ded403cb2401";
+            };
+            beamDeps  = [ plug_1_1_3 ];
+
+            meta = {
+              description = ''Authentication and authorization test support
+                            functions'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/DockYard/auth_test_support";
+            };
+          }
+      ) {};
+
+    auth_test_support = auth_test_support_0_0_6;
+
     authentic_0_0_1 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -1281,7 +1609,7 @@ let
 
     auto_doc_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_3 }:
           buildMix {
             name = "auto_doc";
             version = "0.0.2";
@@ -1291,7 +1619,7 @@ let
               sha256 =
                 "9c4b30c526e59f63173fe2f0d0c360ac678f1e7a11adcf209dfc843a3e63e6f7";
             };
-            beamDeps  = [ poison_1_5_2 plug_1_1_1 ];
+            beamDeps  = [ poison_1_5_2 plug_1_1_3 ];
 
             meta = {
               description = ''A package that will create REST API docs based on
@@ -1306,7 +1634,7 @@ let
 
     autobots_license_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
           buildMix {
             name = "autobots_license";
             version = "0.1.0";
@@ -1316,7 +1644,7 @@ let
               sha256 =
                 "7cfa258ce5eff01018dfd6faf509b430d03770fb733c1b10217b9e52770014b3";
             };
-            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
 
             meta = {    };
           }
@@ -1347,21 +1675,21 @@ let
 
     avex = avex_0_2_0;
 
-    aws_0_0_8 = callPackage
+    aws_0_0_10 = callPackage
       (
         {
-          buildMix, fetchHex, timex_1_0_1, poison_1_5_2, httpoison_0_8_1
+          buildMix, fetchHex, timex_1_0_2, poison_1_5_2, httpoison_0_8_2
         }:
           buildMix {
             name = "aws";
-            version = "0.0.8";
+            version = "0.0.10";
             src = fetchHex {
               pkg = "aws";
-              version = "0.0.8";
+              version = "0.0.10";
               sha256 =
-                "4cd03efff629c01847ec82777ba1af2a8543fde288fe48ab36d9b8aa66ba7e9f";
+                "ce2c9ffbaf7b9a3762826a6f8be8ac6ce8d4ef5c74e021514d14d5cafd625d03";
             };
-            beamDeps  = [ timex_1_0_1 poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ timex_1_0_2 poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''AWS clients for Elixir'';
@@ -1371,11 +1699,11 @@ let
           }
       ) {};
 
-    aws = aws_0_0_8;
+    aws = aws_0_0_10;
 
     aws_auth_0_2_5 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_1 }:
+        {  buildMix, fetchHex, timex_1_0_2 }:
           buildMix {
             name = "aws_auth";
             version = "0.2.5";
@@ -1385,7 +1713,7 @@ let
               sha256 =
                 "646f1f42652adfb329b5eedde28ddda516c6d02dce45932108b85e2d8bd91b0a";
             };
-            beamDeps  = [ timex_1_0_1 ];
+            beamDeps  = [ timex_1_0_2 ];
 
             meta = {
               description = ''AWS Signature Version 4 Signing Library'';
@@ -1397,7 +1725,32 @@ let
 
     aws_auth = aws_auth_0_2_5;
 
-    aws_erlang_0_1_0 = callPackage
+    aws_cli_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, erlexec_1_1_0 }:
+          buildRebar3 {
+            name = "aws_cli";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "aws_cli";
+              version = "0.1.0";
+              sha256 =
+                "14fd91c4752a5eb5b2c781c4843589824b35750d7785b57e0460ba6d96bfe8c1";
+            };
+
+            beamDeps  = [ erlexec_1_1_0 ];
+
+            meta = {
+              description = ''AWS cli wrapper for Erlang'';
+
+              homepage = "https://github.com/fyler/aws_cli";
+            };
+          }
+      ) {};
+
+    aws_cli = aws_cli_0_1_0;
+
+    aws_erlang_0_1_1 = callPackage
       (
         {
           buildMix,
@@ -1408,12 +1761,12 @@ let
         }:
           buildMix {
             name = "aws_erlang";
-            version = "0.1.0";
+            version = "0.1.1";
             src = fetchHex {
               pkg = "aws_erlang";
-              version = "0.1.0";
+              version = "0.1.1";
               sha256 =
-                "274e5232cda0ae883ffd813eb172dc0c00134ee04b3deaad1f34e1d4b42b282e";
+                "5a0f27869ec106eac25fa66aa39f226a2eee3f6b3ab02879e4fa60bab7937709";
             };
             beamDeps  = [ jsx_2_8_0 hackney_1_4_8 erlware_commons_0_18_0 ];
 
@@ -1425,7 +1778,7 @@ let
           }
       ) {};
 
-    aws_erlang = aws_erlang_0_1_0;
+    aws_erlang = aws_erlang_0_1_1;
 
     aws_http_0_2_4 = callPackage
       (
@@ -1454,7 +1807,7 @@ let
 
     b2_0_0_6 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "b2";
             version = "0.0.6";
@@ -1464,7 +1817,7 @@ let
               sha256 =
                 "f8b33d1ec36576dfbca3f2f4c5fad1a9a227207d1ef63b3a388778e8fad3333a";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Elixir B2 cloud API wrapper'';
@@ -1500,7 +1853,7 @@ let
 
     balanced_3_1_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_2_1, httpotion_1_0_0 }:
+        {  buildMix, fetchHex, poison_1_2_1, httpotion_2_2_2 }:
           buildMix {
             name = "balanced";
             version = "3.1.0";
@@ -1510,7 +1863,7 @@ let
               sha256 =
                 "f86f199d76ac66407fbb82fb927e999ec4119a617500965b824ceb4071fcd2d2";
             };
-            beamDeps  = [ poison_1_2_1 httpotion_1_0_0 ];
+            beamDeps  = [ poison_1_2_1 httpotion_2_2_2 ];
 
             meta = {
               description = ''Balanced API for Elixir'';
@@ -1522,19 +1875,19 @@ let
 
     balanced = balanced_3_1_0;
 
-    bamboo_0_2_0 = callPackage
+    bamboo_0_3_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
           buildMix {
             name = "bamboo";
-            version = "0.2.0";
+            version = "0.3.2";
             src = fetchHex {
               pkg = "bamboo";
-              version = "0.2.0";
+              version = "0.3.2";
               sha256 =
-                "f75790da6235225840be3cf6ea9dcfe91abb51bb20ab8e42425a4d207296bbe5";
+                "1b4bfdddae49f6fc66616c63b4d2d9a0e99d40a08619004f5c4f4e4aebfa20ed";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
 
             meta = {
               longDescription = ''Straightforward, composable, and adapter
@@ -1547,7 +1900,59 @@ let
           }
       ) {};
 
-    bamboo = bamboo_0_2_0;
+    bamboo_0_4_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_2_1_0, plug_1_1_3, httpoison_0_8_2
+        }:
+          buildMix {
+            name = "bamboo";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "bamboo";
+              version = "0.4.0";
+              sha256 =
+                "5227b1e65a8634da0f46e1eb41a7ca44d3f6de33bfadf950da16e65e9c8428a7";
+            };
+            beamDeps  = [ poison_2_1_0 plug_1_1_3 httpoison_0_8_2 ];
+
+            meta = {
+              longDescription = ''Straightforward, composable, and adapter
+                                based Elixir email library for people that love
+                                piping. Adapters for Mandrill, Sendgrid,
+                                in-memory, and test.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/paulcsmith/bamboo";
+            };
+          }
+      ) {};
+
+    bamboo = bamboo_0_4_0;
+
+    bamboo_sendgrid_0_1_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, bamboo_0_3_2
+        }:
+          buildMix {
+            name = "bamboo_sendgrid";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "bamboo_sendgrid";
+              version = "0.1.0";
+              sha256 =
+                "ee44ac3f096777064c4cf02df238276338914295f5b17caf38192789a590825c";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 bamboo_0_3_2 ];
+
+            meta = {
+              description = ''A SendGrid adapter for Bamboo.'';
+              license = stdenv.lib.licenses.publicDomain;
+            };
+          }
+      ) {};
+
+    bamboo_sendgrid = bamboo_sendgrid_0_1_0;
 
     bandwidth_1_2_1 = callPackage
       (
@@ -1784,19 +2189,19 @@ let
 
     base58check = base58check_0_1_0;
 
-    base62_1_1_0 = callPackage
+    base62_1_2_0 = callPackage
       (
-        {  buildMix, fetchHex, custom_base_0_1_0 }:
+        {  buildMix, fetchHex, custom_base_0_2_0 }:
           buildMix {
             name = "base62";
-            version = "1.1.0";
+            version = "1.2.0";
             src = fetchHex {
               pkg = "base62";
-              version = "1.1.0";
+              version = "1.2.0";
               sha256 =
-                "3e6d5e21aed7875951236ae25a69ac5a22767c685e4e49e973918ae4ba7d9a2a";
+                "14aac55c7978b7a710906ee29df65ba1cee5af2d43efe236c96311696618088b";
             };
-            beamDeps  = [ custom_base_0_1_0 ];
+            beamDeps  = [ custom_base_0_2_0 ];
 
             meta = {
               description = ''Base62 encoder/decoder in pure Elixir.'';
@@ -1806,7 +2211,7 @@ let
           }
       ) {};
 
-    base62 = base62_1_1_0;
+    base62 = base62_1_2_0;
 
     base64url_0_0_1 = callPackage
       (
@@ -1831,6 +2236,53 @@ let
 
     base64url = base64url_0_0_1;
 
+    basehangul_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, iconv_1_0_0 }:
+          buildMix {
+            name = "basehangul";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "basehangul";
+              version = "0.2.0";
+              sha256 =
+                "ea7b03e7407e4c24778a40eb3edf305cf10897057ff14718344f83badb3525cc";
+            };
+            beamDeps  = [ iconv_1_0_0 ];
+
+            meta = {
+              description = ''Elixir implementation of BaseHangul.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/Dalgona/basehangul";
+            };
+          }
+      ) {};
+
+    basehangul = basehangul_0_2_0;
+
+    basho_poolboy_0_8_1_p3 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "basho_poolboy";
+            version = "0.8.1-p3";
+            src = fetchHex {
+              pkg = "basho_poolboy";
+              version = "0.8.1-p3";
+              sha256 =
+                "8e2ead104eaa80bbfcf5c688774f4ddab73733cab79230e78d097c7ba880c42d";
+            };
+
+            meta = {
+              description = ''A hunky Erlang worker pool factory'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/basho/riak_sysmon";
+            };
+          }
+      ) {};
+
+    basho_poolboy = basho_poolboy_0_8_1_p3;
+
     basho_stats_1_0_3 = callPackage
       (
         {  buildRebar3, fetchHex }:
@@ -1856,7 +2308,7 @@ let
 
     basic_auth_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_0_8_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, plug_0_5_2, cowboy_1_0_4 }:
           buildMix {
             name = "basic_auth";
             version = "1.0.0";
@@ -1866,7 +2318,7 @@ let
               sha256 =
                 "e8ed4b5ca05c06dc1c19c69f1f00611e93d17bfa913eefbb6bed4a209af3a5a9";
             };
-            beamDeps  = [ plug_0_8_1 cowboy_1_0_4 ];
+            beamDeps  = [ plug_0_5_2 cowboy_1_0_4 ];
 
             meta = {
               description = ''Basic Authentication Plug'';
@@ -1905,7 +2357,7 @@ let
 
     battlenet_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "battlenet";
             version = "0.0.2";
@@ -1915,7 +2367,7 @@ let
               sha256 =
                 "cdd4e182da5a2db478e0da9ac1a467fc8f2b8ec638e3e38dd7962ff3fe8c9342";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Elixir library for the Battle.net API.'';
@@ -1995,13 +2447,76 @@ let
 
     bbmustache = bbmustache_1_1_0;
 
+    bbsmq_0_0_4 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          uuid_1_1_3,
+          poison_2_1_0,
+          httpoison_0_8_2,
+          exprotobuf_1_0_0,
+          amqp_0_1_4
+        }:
+          buildMix {
+            name = "bbsmq";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "bbsmq";
+              version = "0.0.4";
+              sha256 =
+                "94fc10b314f176c9d4d874c387d41b2cb4bab68d749f3e3ce50096167eb6900c";
+            };
+            beamDeps  = [
+                          uuid_1_1_3
+                          poison_2_1_0
+                          httpoison_0_8_2
+                          exprotobuf_1_0_0
+                          amqp_0_1_4
+                        ];
+
+            meta = {
+              description = ''Translate CloudFoundry BBS events and endpoints
+                            into rabbitmq messages.'';
+
+            };
+          }
+      ) {};
+
+    bbsmq = bbsmq_0_0_4;
+
+    bcrypt_0_5_0_p3a = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "bcrypt";
+            version = "0.5.0-p3a";
+            src = fetchHex {
+              pkg = "bcrypt";
+              version = "0.5.0-p3a";
+              sha256 =
+                "492decdc633399b356a3bbfe8279c10a49b1040fc082c8cbf2d30b41ff88f310";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''An Erlang wrapper (NIF or port program) for the
+                            OpenBSD password scheme, bcrypt.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/chef/erlang-bcrypt";
+            };
+          }
+      ) {};
+
+    bcrypt = bcrypt_0_5_0_p3a;
+
     beaker_1_2_0 = callPackage
       (
         {
           buildMix,
           fetchHex,
           phoenix_1_1_4,
-          ecto_2_0_0_beta_0,
+          ecto_2_0_0_beta_2,
           bureaucrat_0_1_2
         }:
           buildMix {
@@ -2013,7 +2528,7 @@ let
               sha256 =
                 "f792ee661db3e31f4c6cacae992e81bbcc302ce05aec29c16bab9853bd763438";
             };
-            beamDeps  = [ phoenix_1_1_4 ecto_2_0_0_beta_0 bureaucrat_0_1_2 ];
+            beamDeps  = [ phoenix_1_1_4 ecto_2_0_0_beta_2 bureaucrat_0_1_2 ];
 
             meta = {
               longDescription = ''Measure your Elixir! A metrics library that
@@ -2075,6 +2590,31 @@ let
 
     bear = bear_0_8_3;
 
+    belixir_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "belixir";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "belixir";
+              version = "0.2.0";
+              sha256 =
+                "1d4cea63bf593f8ccdbad32270158704d65aa6f88ee2df48422aced2566465e3";
+            };
+
+            meta = {
+              longDescription = ''Benchmark ips tool for elixir-lang. Runs
+                                given codes in given seconds and compares
+                                them.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/meinac/belixir";
+            };
+          }
+      ) {};
+
+    belixir = belixir_0_2_0;
+
     belvedere_0_0_1 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -2174,17 +2714,17 @@ let
 
     benchwarmer = benchwarmer_0_0_2;
 
-    bencode_0_2_0 = callPackage
+    bencode_0_3_0 = callPackage
       (
         {  buildMix, fetchHex, eqc_ex_1_2_4 }:
           buildMix {
             name = "bencode";
-            version = "0.2.0";
+            version = "0.3.0";
             src = fetchHex {
               pkg = "bencode";
-              version = "0.2.0";
+              version = "0.3.0";
               sha256 =
-                "78ec5fbfa24cb98795d80d4982fc30563af4d7cd7c77ee86a3bffeb1b3a312dd";
+                "98d397fd0a13ba47bfb51927fede25c780539d38946e6d53c6b83c998636a002";
             };
             beamDeps  = [ eqc_ex_1_2_4 ];
 
@@ -2200,7 +2740,7 @@ let
           }
       ) {};
 
-    bencode = bencode_0_2_0;
+    bencode = bencode_0_3_0;
 
     bencoder_0_0_7 = callPackage
       (
@@ -2248,6 +2788,31 @@ let
 
     bencodex = bencodex_1_0_0;
 
+    bento_0_9_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0 }:
+          buildMix {
+            name = "bento";
+            version = "0.9.0";
+            src = fetchHex {
+              pkg = "bento";
+              version = "0.9.0";
+              sha256 =
+                "3bc189cab5909af848cda351cc2bf3ff8998f41b6c21524204217674cbcff8c4";
+            };
+            beamDeps  = [ poison_2_1_0 ];
+
+            meta = {
+              description = ''An incredibly fast, pure Elixir Bencoding
+                            library.'';
+              license = stdenv.lib.licenses.mpl20;
+              homepage = "https://github.com/folz/bento";
+            };
+          }
+      ) {};
+
+    bento = bento_0_9_0;
+
     bert_0_1_0 = callPackage
       (
         {  buildRebar3, fetchHex }:
@@ -2296,7 +2861,7 @@ let
 
     bgg_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, quinn_0_0_4, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, quinn_0_0_4, httpoison_0_8_2 }:
           buildMix {
             name = "bgg";
             version = "0.1.0";
@@ -2306,7 +2871,7 @@ let
               sha256 =
                 "d26593e7ebb23f76e6c0e73a9a1acb6a45ec25ea53b6ee716a2291f07c5f1fb6";
             };
-            beamDeps  = [ quinn_0_0_4 httpoison_0_8_1 ];
+            beamDeps  = [ quinn_0_0_4 httpoison_0_8_2 ];
 
             meta = {
               description = ''A BoardGameGeek API wrapper in Elixir
@@ -2319,6 +2884,56 @@ let
 
     bgg = bgg_0_1_0;
 
+    big_query_0_0_2 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_2_1_0, jose_1_4_2, httpoison_0_8_2
+        }:
+          buildMix {
+            name = "big_query";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "big_query";
+              version = "0.0.2";
+              sha256 =
+                "db969991b701113c0991ae0f468a85abfbf1bdaf0bc2706fd8357e15dcfe138a";
+            };
+            beamDeps  = [ poison_2_1_0 jose_1_4_2 httpoison_0_8_2 ];
+
+            meta = {
+              description = ''A Google BigQuery API client.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/jordan0day/big_query";
+            };
+          }
+      ) {};
+
+    big_query = big_query_0_0_2;
+
+    bigflake_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex, base62_1_2_0 }:
+          buildMix {
+            name = "bigflake";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "bigflake";
+              version = "0.3.0";
+              sha256 =
+                "18505f0ca3a7b77fe267840b9172ec5000e118587cb36d148d73c5e642c400a5";
+            };
+            beamDeps  = [ base62_1_2_0 ];
+
+            meta = {
+              description = ''128-bit, k-ordered, conflict-free IDs Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/stevedomin/bigflake";
+            };
+          }
+      ) {};
+
+    bigflake = bigflake_0_3_0;
+
     billiards_0_0_1 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -2361,30 +2976,27 @@ let
 
     bin_format = bin_format_0_0_1;
 
-    bing_translator_0_2_3 = callPackage
+    bing_translator_0_2_6 = callPackage
       (
         {
           buildMix,
           fetchHex,
-          timex_1_0_0_rc4,
+          timex_1_0_2,
           poison_1_5_2,
-          httpoison_0_8_1,
-          floki_0_7_1
+          httpoison_0_8_2,
+          floki_0_8_0
         }:
           buildMix {
             name = "bing_translator";
-            version = "0.2.3";
+            version = "0.2.6";
             src = fetchHex {
               pkg = "bing_translator";
-              version = "0.2.3";
+              version = "0.2.6";
               sha256 =
-                "a1a953a96728e0531c41c96befe4301d80370c2f09a2ed412a8c8a817d7333c9";
+                "d25df43466458eca86c9d5aa22d94bc41c3d182949a9ec36e9387ffe442e540e";
             };
             beamDeps  = [
-                          timex_1_0_0_rc4
-                          poison_1_5_2
-                          httpoison_0_8_1
-                          floki_0_7_1
+                          timex_1_0_2 poison_1_5_2 httpoison_0_8_2 floki_0_8_0
                         ];
 
             meta = {
@@ -2397,7 +3009,7 @@ let
           }
       ) {};
 
-    bing_translator = bing_translator_0_2_3;
+    bing_translator = bing_translator_0_2_6;
 
     binstructor_0_0_1 = callPackage
       (
@@ -2474,6 +3086,30 @@ let
 
     bitbucket_api = bitbucket_api_0_0_2;
 
+    bitcask_2_0_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "bitcask";
+            version = "2.0.2";
+            src = fetchHex {
+              pkg = "bitcask";
+              version = "2.0.2";
+              sha256 =
+                "666bd79d17faabd62a626ed6fc98176b818266f7bb9639d76244f003ed5b2fe2";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''Bitcask key value store'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/basho/bitcask";
+            };
+          }
+      ) {};
+
+    bitcask = bitcask_2_0_2;
+
     bitfield_1_0_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -2525,7 +3161,7 @@ let
     bitpay_0_2_5 = callPackage
       (
         {
-          buildMix, fetchHex, uuid_0_1_5, httpotion_1_0_0, exjsx_3_1_0
+          buildMix, fetchHex, uuid_1_0_0, httpotion_2_2_2, exjsx_3_1_0
         }:
           buildMix {
             name = "bitpay";
@@ -2536,7 +3172,7 @@ let
               sha256 =
                 "25a0b2dbf6619ddc0db4cf1ee03b3d097adac47dc47c65b71a2661eba0f2e3a2";
             };
-            beamDeps  = [ uuid_0_1_5 httpotion_1_0_0 exjsx_3_1_0 ];
+            beamDeps  = [ uuid_1_0_0 httpotion_2_2_2 exjsx_3_1_0 ];
 
             meta = {
               longDescription = ''Library to allow elixir apps to easily use
@@ -2557,11 +3193,11 @@ let
         {
           buildMix,
           fetchHex,
-          timex_ecto_0_5_0,
+          timex_ecto_1_0_4,
           timex_0_19_5,
           secure_random_0_2_0,
           postgrex_0_11_1,
-          ecto_2_0_0_beta_0,
+          ecto_2_0_0_beta_2,
           earmark_0_2_1,
           comeonin_1_6_0
         }:
@@ -2575,11 +3211,11 @@ let
                 "deecf1248ec5ef7911e3b440a968d8cb2dae54d50e36bf80173a2593f0e4ecde";
             };
             beamDeps  = [
-                          timex_ecto_0_5_0
+                          timex_ecto_1_0_4
                           timex_0_19_5
                           secure_random_0_2_0
                           postgrex_0_11_1
-                          ecto_2_0_0_beta_0
+                          ecto_2_0_0_beta_2
                           earmark_0_2_1
                           comeonin_1_6_0
                         ];
@@ -2617,7 +3253,7 @@ let
 
     blaguth_1_2_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
           buildMix {
             name = "blaguth";
             version = "1.2.1";
@@ -2627,7 +3263,7 @@ let
               sha256 =
                 "2900dc5b7c6f7810bdf5e0ede8749632997811ae5b72ada34f59699b4310a65a";
             };
-            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
 
             meta = {
               description = ''Basic Access Authentication in Plug
@@ -2640,6 +3276,29 @@ let
 
     blaguth = blaguth_1_2_1;
 
+    blake2_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "blake2";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "blake2";
+              version = "0.0.1";
+              sha256 =
+                "3f4d66c465d424076f3673065bdd3f3cdcda2cdc59bbdfc7216fa405fa563264";
+            };
+
+            meta = {
+              description = ''BLAKE2 hash function'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mwmiller/blake2_ex";
+            };
+          }
+      ) {};
+
+    blake2 = blake2_0_0_1;
+
     blanket_0_3_1 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -2664,6 +3323,30 @@ let
 
     blanket = blanket_0_3_1;
 
+    blaze_cloud_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_0_1, httpoison_0_8_2 }:
+          buildMix {
+            name = "blaze_cloud";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "blaze_cloud";
+              version = "0.0.1";
+              sha256 =
+                "c5a26f194691d7c40a008c5aded034ca0a43d4fa6a9173952333479cf2661b2b";
+            };
+            beamDeps  = [ poison_2_0_1 httpoison_0_8_2 ];
+
+            meta = {
+              description = ''Elixir Library for Backblaze B2 Cloud Storage.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/PerishableDave/blaze_cloud";
+            };
+          }
+      ) {};
+
+    blaze_cloud = blaze_cloud_0_0_1;
+
     block_timer_0_0_1 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -2688,6 +3371,32 @@ let
 
     block_timer = block_timer_0_0_1;
 
+    blockchain_info_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
+          buildMix {
+            name = "blockchain_info";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "blockchain_info";
+              version = "0.0.1";
+              sha256 =
+                "22efbcc8df574ddddb9d548150fa704966a59397c103ce58d82a6597cbd5ccd2";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
+
+            meta = {
+              longDescription = ''WIP BlockchainInfo API wrapper for Elixir.
+                                Provides access to bitcoin blockchain data.'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/cyberpunk-ventures/blockchain_info_ex";
+            };
+          }
+      ) {};
+
+    blockchain_info = blockchain_info_0_0_1;
+
     blocking_queue_1_3_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -2715,7 +3424,7 @@ let
 
     bloodhound_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "bloodhound";
             version = "0.1.1";
@@ -2725,7 +3434,7 @@ let
               sha256 =
                 "6aaab638fe90fc3714b650b659df774c7cdb12d098fee3910952e0a0f8fcd6ec";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''An ElasticSearch library for Elixir that can be
@@ -2762,17 +3471,17 @@ let
 
     bloomex = bloomex_1_0_0;
 
-    bmark_1_0_2 = callPackage
+    bmark_1_0_3 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "bmark";
-            version = "1.0.2";
+            version = "1.0.3";
             src = fetchHex {
               pkg = "bmark";
-              version = "1.0.2";
+              version = "1.0.3";
               sha256 =
-                "70204b013c75d3b95d58acc42ff62461eaebe1e5345ef029fe59ba30a15b1747";
+                "243b04d2e2431d01d93f442896d5e6ee52396782c161ef0a0e4f51a353393d93";
             };
 
             meta = {
@@ -2784,7 +3493,34 @@ let
           }
       ) {};
 
-    bmark = bmark_1_0_2;
+    bmark = bmark_1_0_3;
+
+    bno055_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, gproc_0_5_0, elixir_ale_0_4_1 }:
+          buildMix {
+            name = "bno055";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "bno055";
+              version = "0.0.1";
+              sha256 =
+                "07f97909748be55dc7e3f31b9fbf708c5b43e9ba229f82b674aaa0ad57f35ef6";
+            };
+            beamDeps  = [ gproc_0_5_0 elixir_ale_0_4_1 ];
+
+            meta = {
+              longDescription = ''OTP application for reading the BNO-055
+                                absolute orientation sensor. Euler angles are
+                                read at 20hz and published to a configured local
+                                `gproc` property.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/TattdCodeMonkey/bno055";
+            };
+          }
+      ) {};
+
+    bno055 = bno055_0_0_1;
 
     boltun_0_0_4 = callPackage
       (
@@ -2837,7 +3573,7 @@ let
 
     botan_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "botan";
             version = "0.1.2";
@@ -2847,7 +3583,7 @@ let
               sha256 =
                 "43541b5c52c91e46295a015f58857c347c85a7753d7c3cd3a1f835b25fdedaa9";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Elixir wrapper for Botan.io'';
@@ -2892,10 +3628,10 @@ let
         {
           buildMix,
           fetchHex,
-          redix_0_3_4,
+          redix_0_3_6,
           poolboy_1_5_1,
           poison_1_5_2,
-          plug_1_1_1,
+          plug_1_1_3,
           phoenix_1_1_4
         }:
           buildMix {
@@ -2908,10 +3644,10 @@ let
                 "82979e9c8df401cbf5eb2dd09dff3952933cf2efd9135be1f0cb51ec04deb996";
             };
             beamDeps  = [
-                          redix_0_3_4
+                          redix_0_3_6
                           poolboy_1_5_1
                           poison_1_5_2
-                          plug_1_1_1
+                          plug_1_1_3
                           phoenix_1_1_4
                         ];
 
@@ -2926,19 +3662,43 @@ let
 
     bouncer = bouncer_0_1_5;
 
-    braintree_0_3_1 = callPackage
+    brady_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, phoenix_1_1_4 }:
+          buildMix {
+            name = "brady";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "brady";
+              version = "0.0.2";
+              sha256 =
+                "90518fe90719cfb64d3b3d8a2947f14b2d8657414d9e9bb86cb03e7901334b0d";
+            };
+            beamDeps  = [ phoenix_1_1_4 ];
+
+            meta = {
+              description = ''Template helpers for Phoenix applications'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/thoughtbot/brady";
+            };
+          }
+      ) {};
+
+    brady = brady_0_0_2;
+
+    braintree_0_3_2 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_2 }:
           buildMix {
             name = "braintree";
-            version = "0.3.1";
+            version = "0.3.2";
             src = fetchHex {
               pkg = "braintree";
-              version = "0.3.1";
+              version = "0.3.2";
               sha256 =
-                "a93e78cbf8a1407035d8bcf6e7d53fc2ef2f716f3bd49b833ae105fa06a40ec1";
+                "cfc2aa7fc94c74eeb41c34a401fa8784f9c423268086c797949d0f0dc5c657a3";
             };
-            beamDeps  = [ httpoison_0_8_1 ];
+            beamDeps  = [ httpoison_0_8_2 ];
 
             meta = {
               description = ''Native Braintree client library for Elixir'';
@@ -2948,7 +3708,7 @@ let
           }
       ) {};
 
-    braintree = braintree_0_3_1;
+    braintree = braintree_0_3_2;
 
     braise_0_3_2 = callPackage
       (
@@ -2975,17 +3735,17 @@ let
 
     braise = braise_0_3_2;
 
-    brcpfcnpj_0_0_9 = callPackage
+    brcpfcnpj_0_1_0 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "brcpfcnpj";
-            version = "0.0.9";
+            version = "0.1.0";
             src = fetchHex {
               pkg = "brcpfcnpj";
-              version = "0.0.9";
+              version = "0.1.0";
               sha256 =
-                "d5b7c8b473a07c3c91aa450b91ef9899a423c3f36a3027d4be5da25fdf5cef4b";
+                "19ba4d572c93c70d571a36d6ada2fca4d03330d8f96c6b7d8e4c47fa9f809c90";
             };
 
             meta = {
@@ -2998,21 +3758,21 @@ let
           }
       ) {};
 
-    brcpfcnpj = brcpfcnpj_0_0_9;
+    brcpfcnpj = brcpfcnpj_0_1_0;
 
-    breadcrumble_1_0_2 = callPackage
+    breadcrumble_1_0_3 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1 }:
+        {  buildMix, fetchHex, plug_1_1_3 }:
           buildMix {
             name = "breadcrumble";
-            version = "1.0.2";
+            version = "1.0.3";
             src = fetchHex {
               pkg = "breadcrumble";
-              version = "1.0.2";
+              version = "1.0.3";
               sha256 =
-                "8265e64e363df90e556125e091ba52e92a8eeaad57cc3efdd926aa0b069ad78f";
+                "f1d3ec0d3bf74670c58d4ff6c1d10cad0757c003b56ba9f77e3d76a05ac68be3";
             };
-            beamDeps  = [ plug_1_1_1 ];
+            beamDeps  = [ plug_1_1_3 ];
 
             meta = {
               description = ''Elixir port of Breadcrumble library'';
@@ -3022,7 +3782,7 @@ let
           }
       ) {};
 
-    breadcrumble = breadcrumble_1_0_2;
+    breadcrumble = breadcrumble_1_0_3;
 
     briefly_0_3_0 = callPackage
       (
@@ -3116,19 +3876,42 @@ let
 
     bstr = bstr_0_3_0;
 
-    bugsnag_1_1_1 = callPackage
+    buffer_0_3_6 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "buffer";
+            version = "0.3.6";
+            src = fetchHex {
+              pkg = "buffer";
+              version = "0.3.6";
+              sha256 =
+                "409f4d725b69bd36635ec18df9e2c3b6e78ef6ebc14a0e55a98dc58b4c65b7c3";
+            };
+
+            meta = {
+              description = ''Provide read and write buffers for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/adrienmo/buffer";
+            };
+          }
+      ) {};
+
+    buffer = buffer_0_3_6;
+
+    bugsnag_1_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "bugsnag";
-            version = "1.1.1";
+            version = "1.2.0";
             src = fetchHex {
               pkg = "bugsnag";
-              version = "1.1.1";
+              version = "1.2.0";
               sha256 =
-                "ed4d8876e9bdf841f6f08e6562ad9455ef3d06fb9d403702e7e24611fbe96247";
+                "23c6e8eb827ec1294684b5fe788d4d1cd670804ddfb74bb2bd427aed44a68f05";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''An Elixir interface to the Bugsnag API'';
@@ -3138,22 +3921,22 @@ let
           }
       ) {};
 
-    bugsnag = bugsnag_1_1_1;
+    bugsnag = bugsnag_1_2_0;
 
-    bugsnag_erl_0_1_2 = callPackage
+    bugsnag_erl_0_1_3 = callPackage
       (
-        {  buildRebar3, fetchHex, lager_3_0_1, jsx_2_8_0 }:
+        {  buildRebar3, fetchHex, lager_2_1_1, jsx_2_8_0 }:
           buildRebar3 {
             name = "bugsnag_erl";
-            version = "0.1.2";
+            version = "0.1.3";
             src = fetchHex {
               pkg = "bugsnag_erl";
-              version = "0.1.2";
+              version = "0.1.3";
               sha256 =
-                "c54c6e7fcb5e74b1d3611371ce7bd73fb31aaf27f909398a286683802c541851";
+                "02b400b8f7f606c580ca81311279ef8bbe99c2cfc32b0b956af1644594ddaf2b";
             };
 
-            beamDeps  = [ lager_3_0_1 jsx_2_8_0 ];
+            beamDeps  = [ lager_2_1_1 jsx_2_8_0 ];
 
             meta = {
               description = ''Bugsnag notifier'';
@@ -3163,7 +3946,30 @@ let
           }
       ) {};
 
-    bugsnag_erl = bugsnag_erl_0_1_2;
+    bugsnag_erl = bugsnag_erl_0_1_3;
+
+    build_client_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "build_client";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "build_client";
+              version = "0.0.1";
+              sha256 =
+                "ee28ca64db404b76316fa578f30888b7725cbde91d6f89fa7dfc384a32b9c095";
+            };
+
+            meta = {
+              description = ''AX Deployment Client'';
+
+              homepage = "https://github.com/dapdizzy/build_client";
+            };
+          }
+      ) {};
+
+    build_client = build_client_0_0_1;
 
     bump_0_1_0 = callPackage
       (
@@ -3214,7 +4020,7 @@ let
 
     bureaucrat_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex, plug_0_8_1 }:
+        {  buildMix, fetchHex, plug_0_5_2 }:
           buildMix {
             name = "bureaucrat";
             version = "0.1.2";
@@ -3224,7 +4030,7 @@ let
               sha256 =
                 "cd746f6f9ee9927b1b81ae7834c7b0a045df7e53151674d8b3d8de5832ec7402";
             };
-            beamDeps  = [ plug_0_8_1 ];
+            beamDeps  = [ plug_0_5_2 ];
 
             meta = {
               description = ''Generate Phoenix API documentation from tests'';
@@ -3236,17 +4042,17 @@ let
 
     bureaucrat = bureaucrat_0_1_2;
 
-    butler_0_6_2 = callPackage
+    butler_0_7_0 = callPackage
       (
         {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
           buildMix {
             name = "butler";
-            version = "0.6.2";
+            version = "0.7.0";
             src = fetchHex {
               pkg = "butler";
-              version = "0.6.2";
+              version = "0.7.0";
               sha256 =
-                "28d681c4986c6711bf72c645084a83ea108a35039cedf5d03d6779d86cb7db19";
+                "0a6ab3880449370d4fe40355372c8929ff16031fd5d118a8936739cb034b45bd";
             };
             beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
 
@@ -3311,7 +4117,7 @@ let
 
     butler_cowsay_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex, cowsay_0_0_1, butler_0_6_2 }:
+        {  buildMix, fetchHex, cowsay_0_0_1, butler_0_7_0 }:
           buildMix {
             name = "butler_cowsay";
             version = "0.2.1";
@@ -3321,7 +4127,7 @@ let
               sha256 =
                 "d5b6ef82ebd387666c8b8d4fd93df3d11ff2ed7a129ae3aa7d7faac9ae803195";
             };
-            beamDeps  = [ cowsay_0_0_1 butler_0_6_2 ];
+            beamDeps  = [ cowsay_0_0_1 butler_0_7_0 ];
 
             meta = {
               description = ''ButlerCowsay plugin for Butler SlackBot'';
@@ -3377,7 +4183,7 @@ let
 
     bypass_0_5_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
           buildMix {
             name = "bypass";
             version = "0.5.1";
@@ -3387,7 +4193,7 @@ let
               sha256 =
                 "bbff87f453cd98a81c9caeb305e5bcee25fe4fe31089cb19127a36dd224c2454";
             };
-            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
 
             meta = {
               longDescription = ''Bypass provides a quick way to create a
@@ -3431,19 +4237,43 @@ let
 
     cache_tab = cache_tab_1_0_2;
 
-    calecto_0_5_0 = callPackage
+    cachex_0_8_0 = callPackage
       (
-        {  buildMix, fetchHex, ecto_1_1_3, calendar_0_12_4 }:
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "cachex";
+            version = "0.8.0";
+            src = fetchHex {
+              pkg = "cachex";
+              version = "0.8.0";
+              sha256 =
+                "b6fa0414bc725a557fc73deed144b318831f2f4ed5f67e525da8972eb789059d";
+            };
+
+            meta = {
+              description = ''Powerful in-memory key/value storage for
+                            Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zackehh/cachex";
+            };
+          }
+      ) {};
+
+    cachex = cachex_0_8_0;
+
+    calecto_0_5_2 = callPackage
+      (
+        {  buildMix, fetchHex, ecto_0_2_7, calendar_0_12_4 }:
           buildMix {
             name = "calecto";
-            version = "0.5.0";
+            version = "0.5.2";
             src = fetchHex {
               pkg = "calecto";
-              version = "0.5.0";
+              version = "0.5.2";
               sha256 =
-                "3414a87a3a355eeb8116c2fc993e3827772f1dc9064aab00a81a76a5ef00ab5b";
+                "ed21765dea78d2b3888a11c83c9642aee0624098625bc32b0eb642b9e3578ef7";
             };
-            beamDeps  = [ ecto_1_1_3 calendar_0_12_4 ];
+            beamDeps  = [ ecto_0_2_7 calendar_0_12_4 ];
 
             meta = {
               longDescription = ''Library for using Calendar with Ecto. This
@@ -3455,42 +4285,11 @@ let
           }
       ) {};
 
-    calecto = calecto_0_5_0;
-
-    calendar_0_12_3 = callPackage
-      (
-        {  buildMix, fetchHex, tzdata_0_1_8 }:
-          buildMix {
-            name = "calendar";
-            version = "0.12.3";
-            src = fetchHex {
-              pkg = "calendar";
-              version = "0.12.3";
-              sha256 =
-                "19aba4c9660239a710ac70e9bef56d8c8db73ebb48a2c89e3ac02cec64838aad";
-            };
-            beamDeps  = [ tzdata_0_1_8 ];
-
-            meta = {
-              longDescription = ''Calendar is a datetime library for Elixir.
-                                Providing explicit types for datetimes, dates
-                                and times. Full timezone support via its sister
-                                package `tzdata`. Safe parsing and formatting of
-                                standard formats (ISO, RFC, Unix, JS etc.) plus
-                                strftime formatting. Easy and safe
-                                interoperability with erlang style datetime
-                                tuples. Extendable through protocols. Related
-                                packages are available for i18n, Ecto and
-                                Phoenix interoperability.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/lau/calendar";
-            };
-          }
-      ) {};
+    calecto = calecto_0_5_2;
 
     calendar_0_12_4 = callPackage
       (
-        {  buildMix, fetchHex, tzdata_0_1_8 }:
+        {  buildMix, fetchHex, tzdata_0_1_201603 }:
           buildMix {
             name = "calendar";
             version = "0.12.4";
@@ -3500,7 +4299,7 @@ let
               sha256 =
                 "1df7cc23b7dfa3228498fff3bd298495d8431433be94db62a60e93ffa455a060";
             };
-            beamDeps  = [ tzdata_0_1_8 ];
+            beamDeps  = [ tzdata_0_1_201603 ];
 
             meta = {
               longDescription = ''Calendar is a datetime library for Elixir.
@@ -3519,11 +4318,42 @@ let
           }
       ) {};
 
-    calendar = calendar_0_12_4;
+    calendar_0_13_2 = callPackage
+      (
+        {  buildMix, fetchHex, tzdata_0_1_201603 }:
+          buildMix {
+            name = "calendar";
+            version = "0.13.2";
+            src = fetchHex {
+              pkg = "calendar";
+              version = "0.13.2";
+              sha256 =
+                "5be3a69db1a177ed39d24d582ac7be3dab59ee8aeae41ee17c36a263a9818460";
+            };
+            beamDeps  = [ tzdata_0_1_201603 ];
+
+            meta = {
+              longDescription = ''Calendar is a datetime library for Elixir.
+                                Providing explicit types for datetimes, dates
+                                and times. Full timezone support via its sister
+                                package `tzdata`. Safe parsing and formatting of
+                                standard formats (ISO, RFC, Unix, JS etc.) plus
+                                strftime formatting. Easy and safe
+                                interoperability with erlang style datetime
+                                tuples. Extendable through protocols. Related
+                                packages are available for i18n, Ecto and
+                                Phoenix interoperability.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lau/calendar";
+            };
+          }
+      ) {};
+
+    calendar = calendar_0_13_2;
 
     calendar_translations_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, calendar_0_12_4 }:
+        {  buildMix, fetchHex, calendar_0_13_2 }:
           buildMix {
             name = "calendar_translations";
             version = "0.0.3";
@@ -3533,7 +4363,7 @@ let
               sha256 =
                 "b232912959f7f645a34e1a6ceca4657156e64bb5db3573fbc61c603c648dcb09";
             };
-            beamDeps  = [ calendar_0_12_4 ];
+            beamDeps  = [ calendar_0_13_2 ];
 
             meta = {
               description = ''Translations for the Calendar library.'';
@@ -3591,21 +4421,21 @@ let
 
     canada = canada_1_0_0;
 
-    canary_0_14_0 = callPackage
+    canary_0_14_1 = callPackage
       (
         {
-          buildMix, fetchHex, plug_1_1_1, ecto_2_0_0_beta_0, canada_1_0_0
+          buildMix, fetchHex, plug_1_1_3, ecto_2_0_0_beta_2, canada_1_0_0
         }:
           buildMix {
             name = "canary";
-            version = "0.14.0";
+            version = "0.14.1";
             src = fetchHex {
               pkg = "canary";
-              version = "0.14.0";
+              version = "0.14.1";
               sha256 =
-                "5002649bbe4b9c7e00fb7f0c499c109eb34732f50f69ede797ed1e768e4f0029";
+                "8ee0f96f4f98c0c0188eea68b2d90adae8e6af527eb04ee8623811bd58be7f0c";
             };
-            beamDeps  = [ plug_1_1_1 ecto_2_0_0_beta_0 canada_1_0_0 ];
+            beamDeps  = [ plug_1_1_3 ecto_2_0_0_beta_2 canada_1_0_0 ];
 
             meta = {
               longDescription = ''An authorization library to restrict what
@@ -3617,7 +4447,7 @@ let
           }
       ) {};
 
-    canary = canary_0_14_0;
+    canary = canary_0_14_1;
 
     carrier_1_0_4 = callPackage
       (
@@ -3667,6 +4497,54 @@ let
 
     cartographer = cartographer_0_0_1;
 
+    cassette_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_2, exml_0_1_0 }:
+          buildMix {
+            name = "cassette";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "cassette";
+              version = "1.0.0";
+              sha256 =
+                "cbb9e1bffc2161ac51f6b8b376159e6bf1f39a2f41a9f07f861653cfb4c4e531";
+            };
+            beamDeps  = [ httpoison_0_8_2 exml_0_1_0 ];
+
+            meta = {
+              description = ''A CAS client and validation library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/locaweb/elixir-cassette";
+            };
+          }
+      ) {};
+
+    cassette = cassette_1_0_0;
+
+    cassette_plug_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_3, cassette_1_0_0 }:
+          buildMix {
+            name = "cassette_plug";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "cassette_plug";
+              version = "1.0.1";
+              sha256 =
+                "7c6ca0bacb3660efd1367b95c8a2d70e485e2842b9bfc87bdeb85c33882dc164";
+            };
+            beamDeps  = [ plug_1_1_3 cassette_1_0_0 ];
+
+            meta = {
+              description = ''An auth Plug using Cassette'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/locaweb/cassette-plug";
+            };
+          }
+      ) {};
+
+    cassette_plug = cassette_plug_1_0_1;
+
     cassius_0_0_1 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -3717,7 +4595,7 @@ let
     caylir_0_2_0 = callPackage
       (
         {
-          buildMix, fetchHex, poolboy_1_5_1, poison_1_5_2, hackney_1_4_8
+          buildMix, fetchHex, poolboy_1_5_1, poison_1_5_2, hackney_1_6_0
         }:
           buildMix {
             name = "caylir";
@@ -3728,7 +4606,7 @@ let
               sha256 =
                 "b3699171f2bef699ce1968394cb2aee3b5ec7db529a395d8bf7d85163067f888";
             };
-            beamDeps  = [ poolboy_1_5_1 poison_1_5_2 hackney_1_4_8 ];
+            beamDeps  = [ poolboy_1_5_1 poison_1_5_2 hackney_1_6_0 ];
 
             meta = {
               description = ''Cayley driver for Elixir'';
@@ -3763,6 +4641,48 @@ let
 
     ccc = ccc_0_0_2;
 
+    cep_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          sweet_xml_0_6_1,
+          poolboy_1_5_1,
+          poison_2_1_0,
+          httpoison_0_8_2,
+          codepagex_0_1_2
+        }:
+          buildMix {
+            name = "cep";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "cep";
+              version = "0.0.1";
+              sha256 =
+                "f76e67e1d989fc2edbfbd265f79e4a33a0aa7f9ff06934a1f2d49903df72b79f";
+            };
+            beamDeps  = [
+                          sweet_xml_0_6_1
+                          poolboy_1_5_1
+                          poison_2_1_0
+                          httpoison_0_8_2
+                          codepagex_0_1_2
+                        ];
+
+            meta = {
+              longDescription = ''A package to query Brazilian CEP codes. Has
+                                support for multiple source APIs (Correios,
+                                ViaCep, Postmon, etc). It can query one specific
+                                source or query until one source returns a valid
+                                result.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/douglascamata/cep";
+            };
+          }
+      ) {};
+
+    cep = cep_0_0_1;
+
     certifi_0_1_1 = callPackage
       (
         {  buildRebar3, fetchHex }:
@@ -3805,7 +4725,28 @@ let
           }
       ) {};
 
-    certifi = certifi_0_3_0;
+    certifi_0_4_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "certifi";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "certifi";
+              version = "0.4.0";
+              sha256 =
+                "1cc233bee2d6990e7b0ff4c5824d7f401edda8a3cfad04d3328e35ad97de7611";
+            };
+
+            meta = {
+              description = ''An OTP library'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/certifi/erlang-certifi";
+            };
+          }
+      ) {};
+
+    certifi = certifi_0_4_0;
 
     cesso_0_1_3 = callPackage
       (
@@ -3830,7 +4771,7 @@ let
 
     cesso = cesso_0_1_3;
 
-    cet_0_2_2 = callPackage
+    cet_0_2_3 = callPackage
       (
         {
           buildRebar3,
@@ -3844,12 +4785,12 @@ let
         }:
           buildRebar3 {
             name = "cet";
-            version = "0.2.2";
+            version = "0.2.3";
             src = fetchHex {
               pkg = "cet";
-              version = "0.2.2";
+              version = "0.2.3";
               sha256 =
-                "3da06f36791484576e4b338a2d8b5cfa65fe81ae7ed748aa7df85de0cb3bd2b4";
+                "4942c6d86568ee8daffebfece8b73dcef3d91702484480b27a2b32590ad0894e";
             };
 
             beamDeps  = [
@@ -3869,7 +4810,7 @@ let
           }
       ) {};
 
-    cet = cet_0_2_2;
+    cet = cet_0_2_3;
 
     cf_0_1_2 = callPackage
       (
@@ -3913,6 +4854,54 @@ let
 
     cf = cf_0_2_1;
 
+    chacha20_0_3_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "chacha20";
+            version = "0.3.2";
+            src = fetchHex {
+              pkg = "chacha20";
+              version = "0.3.2";
+              sha256 =
+                "26882c84da45dd1158a0249031f5a67329a6c4cd89e075d409324eee30444410";
+            };
+
+            meta = {
+              description = ''Chacha20 symmetric stream cipher'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mwmiller/chacha20_ex";
+            };
+          }
+      ) {};
+
+    chacha20 = chacha20_0_3_2;
+
+    changeset_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex, defmemo_0_1_1 }:
+          buildMix {
+            name = "changeset";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "changeset";
+              version = "0.2.1";
+              sha256 =
+                "b2ae6487630bcd2931f54331852f4d834dc1ae47687abc95fbc9194c15c55a5f";
+            };
+            beamDeps  = [ defmemo_0_1_1 ];
+
+            meta = {
+              description = ''A package for calculating between-list edit
+                            distances.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/erwald/elixir-changeset";
+            };
+          }
+      ) {};
+
+    changeset = changeset_0_2_1;
+
     changex_0_1_1 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -3970,7 +4959,7 @@ let
           fetchHex,
           cowboy_1_0_4,
           env_conf_0_3_0,
-          uuid_0_1_5,
+          uuid_1_0_0,
           jazz_0_2_1
         }:
           buildMix {
@@ -3982,7 +4971,7 @@ let
               sha256 =
                 "2c0eb1335922bec0c6bc5e8f3dc4d84192657b708c2558742f676ed430f0950f";
             };
-            beamDeps  = [ cowboy_1_0_4 env_conf_0_3_0 uuid_0_1_5 jazz_0_2_1
+            beamDeps  = [ cowboy_1_0_4 env_conf_0_3_0 uuid_1_0_0 jazz_0_2_1
                       ];
 
             meta = {
@@ -4073,9 +5062,40 @@ let
 
     chash = chash_0_1_1;
 
+    chatter_0_0_14 = callPackage
+      (
+        {
+          buildMix, fetchHex, snappy_1_1_1, ranch_1_2_1, exactor_2_2_0
+        }:
+          buildMix {
+            name = "chatter";
+            version = "0.0.14";
+            src = fetchHex {
+              pkg = "chatter";
+              version = "0.0.14";
+              sha256 =
+                "6f6ee9aac860198a08322f77a334df82c43e38aa9f5fa7186034bf84ac86f060";
+            };
+            beamDeps  = [ snappy_1_1_1 ranch_1_2_1 exactor_2_2_0 ];
+
+            meta = {
+              longDescription = ''Chatter is extracted from the ScaleSmall
+                                project as a standalone piece. This may be used
+                                independently to broadcast messages to a set of
+                                nodes. It uses a mixture of UDP multicast and
+                                TCP to deliver messages and tries to minimize
+                                network traffic while doing so.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dbeck/chatter_ex/";
+            };
+          }
+      ) {};
+
+    chatter = chatter_0_0_14;
+
     chinese_translation_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, httpoison_0_8_2 }:
           buildMix {
             name = "chinese_translation";
             version = "0.1.0";
@@ -4085,7 +5105,7 @@ let
               sha256 =
                 "d5e4f59421bad59e465322ce7a8f366179e5f6a732d7e06435e8a7c01f42e7ab";
             };
-            beamDeps  = [ httpoison_0_8_1 ];
+            beamDeps  = [ httpoison_0_8_2 ];
 
             meta = {
               longDescription = ''ChineseTranslation provides traditional
@@ -4100,17 +5120,17 @@ let
 
     chinese_translation = chinese_translation_0_1_0;
 
-    chronos_1_0_0 = callPackage
+    chronos_0_3_9 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "chronos";
-            version = "1.0.0";
+            version = "0.3.9";
             src = fetchHex {
               pkg = "chronos";
-              version = "1.0.0";
+              version = "0.3.9";
               sha256 =
-                "cfe0087dcf2ab401b3c2c1faa977571f9880f527b54a8c22cda5a8023a8420af";
+                "973e1273088677a12afc1a72aad78fe5070fb0ad6f9b1c648d79dd251292dee4";
             };
 
             meta = {
@@ -4172,17 +5192,17 @@ let
 
     chunky_svg = chunky_svg_0_0_4;
 
-    cidr_0_5_0 = callPackage
+    cidr_1_0_0 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "cidr";
-            version = "0.5.0";
+            version = "1.0.0";
             src = fetchHex {
               pkg = "cidr";
-              version = "0.5.0";
+              version = "1.0.0";
               sha256 =
-                "876baa94135d058a5ff617c8a072cdb2e5381661eb93b70d07844c0f9e00f38d";
+                "3bffa78af48cfbcd89461144bd2e1990b4f2631a8328c42cb033fa71c14b8f46";
             };
 
             meta = {
@@ -4194,7 +5214,7 @@ let
           }
       ) {};
 
-    cidr = cidr_0_5_0;
+    cidr = cidr_1_0_0;
 
     cipher_0_1_0 = callPackage
       (
@@ -4224,7 +5244,36 @@ let
           }
       ) {};
 
-    cipher = cipher_0_1_0;
+    cipher_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0 }:
+          buildMix {
+            name = "cipher";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "cipher";
+              version = "1.0.0";
+              sha256 =
+                "a83812b09b65c6a821129e709fee31b4f96ccc0c547e29fe42928ed49811ed79";
+            };
+            beamDeps  = [ poison_2_1_0 ];
+
+            meta = {
+              longDescription = ''Elixir crypto library to encrypt/decrypt
+                                arbitrary binaries. It uses Erlang Crypto, so
+                                it`s not big deal. Mostly a collection of
+                                helpers wrapping it. It allows to use a crypted
+                                key to validate signed requests. The exact same
+                                cipher is implemented for Python, Ruby and
+                                Elixir, so it can be used to integrate apps from
+                                different languages.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rubencaro/cipher";
+            };
+          }
+      ) {};
+
+    cipher = cipher_1_0_0;
 
     cirru_parser_0_0_1 = callPackage
       (
@@ -4251,7 +5300,7 @@ let
 
     ckan_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpotion_2_1_0 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpotion_2_2_2 }:
           buildMix {
             name = "ckan";
             version = "0.0.2";
@@ -4261,7 +5310,7 @@ let
               sha256 =
                 "471a58f1d38df7a6ff36af9a1e9d4c6cb9d310c5acb2db95ff3184717d7762a0";
             };
-            beamDeps  = [ poison_1_5_2 httpotion_2_1_0 ];
+            beamDeps  = [ poison_1_5_2 httpotion_2_2_2 ];
 
             meta = {
               description = ''A small library for interacting with CKAN
@@ -4322,6 +5371,43 @@ let
 
     cleverbot = cleverbot_0_0_1;
 
+    clicksign_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          plug_1_1_3,
+          httpoison_0_8_2,
+          exjsx_3_2_0,
+          cowboy_1_0_4,
+          bypass_0_5_1
+        }:
+          buildMix {
+            name = "clicksign";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "clicksign";
+              version = "0.0.2";
+              sha256 =
+                "e6e9335c86298d5d5af6c18b85f3533554eca74d6129e1aea7dae17849b48ed2";
+            };
+            beamDeps  = [
+                          plug_1_1_3
+                          httpoison_0_8_2
+                          exjsx_3_2_0
+                          cowboy_1_0_4
+                          bypass_0_5_1
+                        ];
+
+            meta = {
+              description = ''Clicksign client'';
+
+            };
+          }
+      ) {};
+
+    clicksign = clicksign_0_0_2;
+
     clint_0_0_1 = callPackage
       (
         {  buildMix, fetchHex, plug_0_11_3, cowboy_1_0_4 }:
@@ -4347,9 +5433,34 @@ let
 
     clint = clint_0_0_1;
 
+    clique_3_0_1 = callPackage
+      (
+        {  buildRebar3, fetchHex, cuttlefish_2_0_7 }:
+          buildRebar3 {
+            name = "clique";
+            version = "3.0.1";
+            src = fetchHex {
+              pkg = "clique";
+              version = "3.0.1";
+              sha256 =
+                "f26bd1d293a88223b9dc21dc5a2643e64823f3e8e178536fb66e97c4ff4a2ac2";
+            };
+
+            beamDeps  = [ cuttlefish_2_0_7 ];
+
+            meta = {
+              description = ''A CLI library for erlang'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/basho/clique";
+            };
+          }
+      ) {};
+
+    clique = clique_3_0_1;
+
     cloak_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0, ecto_2_0_0_beta_0 }:
+        {  buildMix, fetchHex, poison_2_1_0, ecto_2_0_0_beta_2 }:
           buildMix {
             name = "cloak";
             version = "0.2.0";
@@ -4359,7 +5470,7 @@ let
               sha256 =
                 "8e2455ab420102280719efc86cee7a58d1de358a541cd7d1b49b74fa30fa8fb8";
             };
-            beamDeps  = [ poison_2_1_0 ecto_2_0_0_beta_0 ];
+            beamDeps  = [ poison_2_1_0 ecto_2_0_0_beta_2 ];
 
             meta = {
               description = ''Encrypted fields for Ecto.'';
@@ -4371,6 +5482,66 @@ let
 
     cloak = cloak_0_2_0;
 
+    close_enough_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "close_enough";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "close_enough";
+              version = "0.0.1";
+              sha256 =
+                "cbd73a651bffc50259035a311e5a03cb01176667b76aece059778dda9bd72079";
+            };
+
+            meta = {
+              description = ''Forget typos in function names name, CloseEnough
+                            handles them.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sivsushruth/close_enough";
+            };
+          }
+      ) {};
+
+    close_enough = close_enough_0_0_1;
+
+    cloudex_0_0_2 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          tzdata_0_5_7,
+          timex_0_19_5,
+          poison_1_5_2,
+          httpoison_0_8_2
+        }:
+          buildMix {
+            name = "cloudex";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "cloudex";
+              version = "0.0.2";
+              sha256 =
+                "eb424a8e6610de6f7a2f2be074937c571a86d11e4b942d2ea39900855a66b306";
+            };
+            beamDeps  = [
+                          tzdata_0_5_7 timex_0_19_5 poison_1_5_2 httpoison_0_8_2
+                        ];
+
+            meta = {
+              longDescription = ''A library that helps with uploading image
+                                files and urls to cloudinary. Also provides an
+                                helper to generate transformations and
+                                cloudinary urls pointing to your images'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/smeevil/cloudex";
+            };
+          }
+      ) {};
+
+    cloudex = cloudex_0_0_2;
+
     cloudi_core_1_5_1 = callPackage
       (
         {
@@ -4431,7 +5602,7 @@ let
     cloudi_service_api_requests_1_5_1 = callPackage
       (
         {
-          buildRebar3, fetchHex, trie_1_5_1, jsx_2_4_0, cloudi_core_1_5_1
+          buildRebar3, fetchHex, trie_1_5_1, jsx_2_3_1, cloudi_core_1_5_1
         }:
           buildRebar3 {
             name = "cloudi_service_api_requests";
@@ -4443,7 +5614,7 @@ let
                 "3af4a6bb4ef9f428f6044a752cc5c37cd7bf9fdc7d26407044b8c716b40c86f3";
             };
 
-            beamDeps  = [ trie_1_5_1 jsx_2_4_0 cloudi_core_1_5_1 ];
+            beamDeps  = [ trie_1_5_1 jsx_2_3_1 cloudi_core_1_5_1 ];
 
             meta = {
               description = ''Erlang/Elixir Cloud Framework API requests
@@ -4600,7 +5771,7 @@ let
           fetchHex,
           uuid_erl_1_5_1,
           trie_1_5_1,
-          elli_1_0_4,
+          elli_1_0_5,
           cowlib_1_0_2,
           cloudi_core_1_5_1
         }:
@@ -4617,7 +5788,7 @@ let
             beamDeps  = [
                           uuid_erl_1_5_1
                           trie_1_5_1
-                          elli_1_0_4
+                          elli_1_0_5
                           cowlib_1_0_2
                           cloudi_core_1_5_1
                         ];
@@ -5131,7 +6302,7 @@ let
 
     cloudinary_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_4_0, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_4_0, httpoison_0_8_2 }:
           buildMix {
             name = "cloudinary";
             version = "0.0.2";
@@ -5141,7 +6312,7 @@ let
               sha256 =
                 "9e32b21717b193f90a526203725811b96294d7c88391e5ad4a57bf178678cc4c";
             };
-            beamDeps  = [ poison_1_4_0 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_4_0 httpoison_0_8_2 ];
 
             meta = {
               description = ''Library to upload to Cloudinary'';
@@ -5155,7 +6326,7 @@ let
     cloudinaryex_0_0_2 = callPackage
       (
         {
-          buildMix, fetchHex, timex_1_0_1, poison_1_5_2, httpoison_0_8_1
+          buildMix, fetchHex, timex_1_0_2, poison_1_5_2, httpoison_0_8_2
         }:
           buildMix {
             name = "cloudinaryex";
@@ -5166,7 +6337,7 @@ let
               sha256 =
                 "31518baacfcca428e30ee8f1c411d76568344e7032ed93cf34535e279c8472fc";
             };
-            beamDeps  = [ timex_1_0_1 poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ timex_1_0_2 poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''A library for connecting with Cloudinary in
@@ -5205,8 +6376,8 @@ let
 
     cmark_0_6_8 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "cmark";
             version = "0.6.8";
             src = fetchHex {
@@ -5215,7 +6386,6 @@ let
               sha256 =
                 "ee148d419684923567be4f413cf82c6f8da2d235e40d434e616febca158372cc";
             };
-            compilePorts = true;
 
             meta = {
               longDescription = ''Elixir NIF for cmark (C), a parser library
@@ -5342,6 +6512,39 @@ let
 
     coinbase = coinbase_0_0_1;
 
+    coincap_io_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_2,
+          exconstructor_1_0_2
+        }:
+          buildMix {
+            name = "coincap_io";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "coincap_io";
+              version = "0.0.1";
+              sha256 =
+                "27638d227a407a204c83534e15917bd77fac64a8bdc96dbad07d59a935639da3";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 exconstructor_1_0_2 ];
+
+            meta = {
+              longDescription = ''WIP, unstable Elixir API wrapper for
+                                coincap.io. Provides access to market
+                                capitalization data of bitcoin, altcoins and
+                                cryptotokens.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/cyberpunk-ventures/coincap_io_ex";
+            };
+          }
+      ) {};
+
+    coincap_io = coincap_io_0_0_1;
+
     colixir_0_0_1 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -5531,8 +6734,8 @@ let
 
     comeonin_1_6_0 = callPackage
       (
-        {  buildRebar3, fetchHex, comeonin_i18n_0_1_3 }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex, comeonin_i18n_0_1_3 }:
+          buildErlangMk {
             name = "comeonin";
             version = "1.6.0";
             src = fetchHex {
@@ -5541,7 +6744,6 @@ let
               sha256 =
                 "40dd0da2c33696d19515888fd86b9ffdcad92d49e9a6b3b13df98e824897a1b1";
             };
-            compilePorts = true;
             beamDeps  = [ comeonin_i18n_0_1_3 ];
 
             meta = {
@@ -5555,8 +6757,8 @@ let
 
     comeonin_2_0_3 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "comeonin";
             version = "2.0.3";
             src = fetchHex {
@@ -5565,7 +6767,6 @@ let
               sha256 =
                 "a9a6f87107ebf6898adeca7130adb1b9e421c1be7e8b30b13ac1e0354ea15198";
             };
-            compilePorts = true;
 
             meta = {
               description = ''Password hashing (bcrypt, pbkdf2_sha512) library
@@ -5578,8 +6779,8 @@ let
 
     comeonin_2_1_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "comeonin";
             version = "2.1.1";
             src = fetchHex {
@@ -5588,7 +6789,6 @@ let
               sha256 =
                 "7f85774ae5d453f664d0e7809cc1ab32ff22855d16ff6a2edd68c6d36cb1a1aa";
             };
-            compilePorts = true;
 
             meta = {
               description = ''Password hashing (bcrypt, pbkdf2_sha512) library
@@ -5599,11 +6799,33 @@ let
           }
       ) {};
 
-    comeonin = comeonin_2_1_1;
+    comeonin_2_3_0 = callPackage
+      (
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
+            name = "comeonin";
+            version = "2.3.0";
+            src = fetchHex {
+              pkg = "comeonin";
+              version = "2.3.0";
+              sha256 =
+                "f3463468faa27ec22116a0469406472b0f67cf86c3e9cb44ac2991c5a0c2655d";
+            };
+
+            meta = {
+              description = ''Password hashing (bcrypt, pbkdf2_sha512) library
+                            for Elixir.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/elixircnx/comeonin";
+            };
+          }
+      ) {};
+
+    comeonin = comeonin_2_3_0;
 
     comeonin_ecto_password_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, ecto_1_1_3, comeonin_2_1_1 }:
+        {  buildMix, fetchHex, ecto_1_1_5, comeonin_2_3_0 }:
           buildMix {
             name = "comeonin_ecto_password";
             version = "0.0.3";
@@ -5613,7 +6835,7 @@ let
               sha256 =
                 "44c8dbf5b81fca515b91422fddb240c5d714bc81bc0d59b3ca60300edb3f856b";
             };
-            beamDeps  = [ ecto_1_1_3 comeonin_2_1_1 ];
+            beamDeps  = [ ecto_1_1_5 comeonin_2_3_0 ];
 
             meta = {
               description = ''Ecto custom type for storing encrypted password
@@ -5656,9 +6878,9 @@ let
         {
           buildMix,
           fetchHex,
-          mock_0_1_1,
+          mock_0_1_3,
           jazz_0_2_1,
-          httpoison_0_8_1,
+          httpoison_0_8_2,
           ex_doc_0_11_4
         }:
           buildMix {
@@ -5670,7 +6892,7 @@ let
               sha256 =
                 "6bb751f496011b974cb8d536b079eb7dfaeee4be827e4cf2fe0585e10f26bd04";
             };
-            beamDeps  = [ mock_0_1_1 jazz_0_2_1 httpoison_0_8_1 ex_doc_0_11_4
+            beamDeps  = [ mock_0_1_3 jazz_0_2_1 httpoison_0_8_2 ex_doc_0_11_4
                       ];
 
             meta = {
@@ -5708,6 +6930,31 @@ let
 
     complex = complex_0_2_0;
 
+    comredis_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0 }:
+          buildMix {
+            name = "comredis";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "comredis";
+              version = "1.0.0";
+              sha256 =
+                "181989546464dbe57f2feceb39954eea8008e28612df0c6a7b9b0f7003b251e9";
+            };
+            beamDeps  = [ poison_2_1_0 ];
+
+            meta = {
+              description = ''Comredis is your comrade for Redis command
+                            generation in Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/iurifq/comredis";
+            };
+          }
+      ) {};
+
+    comredis = comredis_1_0_0;
+
     con_cache_0_11_0 = callPackage
       (
         {  buildMix, fetchHex, exactor_2_2_0 }:
@@ -5760,8 +7007,8 @@ let
 
     conferl_0_0_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "conferl";
             version = "0.0.1";
             src = fetchHex {
@@ -5782,17 +7029,40 @@ let
 
     conferl = conferl_0_0_1;
 
-    configparser_ex_0_2_0 = callPackage
+    config_values_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "config_values";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "config_values";
+              version = "1.0.0";
+              sha256 =
+                "cdbd33fd68cf7fa4fe88dfc1f73e5d26f69d86132650dfba9a636dc75f6cb26c";
+            };
+
+            meta = {
+              description = ''Interpolated configuration values'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/hassox/config_values";
+            };
+          }
+      ) {};
+
+    config_values = config_values_1_0_0;
+
+    configparser_ex_0_2_1 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "configparser_ex";
-            version = "0.2.0";
+            version = "0.2.1";
             src = fetchHex {
               pkg = "configparser_ex";
-              version = "0.2.0";
+              version = "0.2.1";
               sha256 =
-                "acc487b8671b8fadba6bf5694115c23e04c9754cb226f371f17dc7588687d8ac";
+                "3319861498f5e711058b1b3b54f88275af85e1bf9493bd0b904393d5971f117e";
             };
 
             meta = {
@@ -5804,19 +7074,40 @@ let
           }
       ) {};
 
-    configparser_ex = configparser_ex_0_2_0;
+    configparser_ex = configparser_ex_0_2_1;
 
-    conform_0_13_0 = callPackage
+    conform_0_10_5 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "conform";
-            version = "0.13.0";
+            version = "0.10.5";
             src = fetchHex {
               pkg = "conform";
-              version = "0.13.0";
+              version = "0.10.5";
               sha256 =
-                "72bc5f0e55d15f8387892b664c30e969e3584e8da15d6b5d45caac4d84ee1165";
+                "2ded6a4f7405f2288d7888c86b59d3f2871bd9339f3e396d9f9fb148c4ce2304";
+            };
+
+            meta = {
+              description = ''Easy release configuration for Elixir apps.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitwalker/conform";
+            };
+          }
+      ) {};
+
+    conform_0_11_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "conform";
+            version = "0.11.0";
+            src = fetchHex {
+              pkg = "conform";
+              version = "0.11.0";
+              sha256 =
+                "2547e29fec74952572a0f2456f38e11dc8247a00d4b197eca2e61a8fd767f3eb";
             };
 
             meta = {
@@ -5871,21 +7162,43 @@ let
           }
       ) {};
 
-    conform = conform_1_0_0_rc8;
-
-    conform_exrm_0_3_0 = callPackage
+    conform_2_0_0 = callPackage
       (
-        {  buildMix, fetchHex, exrm_1_0_0_rc8, conform_1_0_0_rc8 }:
+        {  buildMix, fetchHex, neotoma_1_7_3 }:
+          buildMix {
+            name = "conform";
+            version = "2.0.0";
+            src = fetchHex {
+              pkg = "conform";
+              version = "2.0.0";
+              sha256 =
+                "2a3bc36dd50363778c0cb2f13026d65b5e4c919abf91be21c1a51c480c723403";
+            };
+            beamDeps  = [ neotoma_1_7_3 ];
+
+            meta = {
+              description = ''Easy release configuration for Elixir apps.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitwalker/conform";
+            };
+          }
+      ) {};
+
+    conform = conform_2_0_0;
+
+    conform_exrm_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, exrm_1_0_3, conform_2_0_0 }:
           buildMix {
             name = "conform_exrm";
-            version = "0.3.0";
+            version = "1.0.0";
             src = fetchHex {
               pkg = "conform_exrm";
-              version = "0.3.0";
+              version = "1.0.0";
               sha256 =
-                "52baf48678b29b8986bc325877489679b597633457397d078782262ee444808e";
+                "acf8eb831b0f8573a92694da4d3b513f551b8d854a8c4670c560379ae5c0f2fd";
             };
-            beamDeps  = [ exrm_1_0_0_rc8 conform_1_0_0_rc8 ];
+            beamDeps  = [ exrm_1_0_3 conform_2_0_0 ];
 
             meta = {
               description = ''Conform plugin for ExRM'';
@@ -5895,7 +7208,7 @@ let
           }
       ) {};
 
-    conform_exrm = conform_exrm_0_3_0;
+    conform_exrm = conform_exrm_1_0_0;
 
     connection_1_0_0_rc_1 = callPackage
       (
@@ -5987,6 +7300,31 @@ let
 
     console = console_0_0_1;
 
+    console_tree_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "console_tree";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "console_tree";
+              version = "0.0.1";
+              sha256 =
+                "c7dea20c14fd8bc6697a68f2917def38d20c772eb4b5715b18197672e7ddc0eb";
+            };
+
+            meta = {
+              longDescription = ''A simple library to print a text
+                                representation of a tree structure, intended for
+                                use in a terminal environment.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ciaran/console_tree";
+            };
+          }
+      ) {};
+
+    console_tree = console_tree_0_0_1;
+
     consul_1_0_3 = callPackage
       (
         {  buildMix, fetchHex, httpoison_0_7_5, exjsx_3_2_0 }:
@@ -6106,19 +7444,19 @@ let
 
     core_data = core_data_0_1_0;
 
-    cors_plug_1_1_0 = callPackage
+    cors_plug_1_1_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
           buildMix {
             name = "cors_plug";
-            version = "1.1.0";
+            version = "1.1.1";
             src = fetchHex {
               pkg = "cors_plug";
-              version = "1.1.0";
+              version = "1.1.1";
               sha256 =
-                "b6ae0bf0c8a993d7f94f7061774e70403726b2ffe5d648964b72d6f42fd71979";
+                "12300007530a014c32f6dfe71a1775d1b39dd43fd7b35697574ab7d78c5e629c";
             };
-            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
 
             meta = {
               longDescription = ''An elixir plug that adds CORS headers to
@@ -6130,21 +7468,21 @@ let
           }
       ) {};
 
-    cors_plug = cors_plug_1_1_0;
+    cors_plug = cors_plug_1_1_1;
 
-    corsica_0_4_0 = callPackage
+    corsica_0_4_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
           buildMix {
             name = "corsica";
-            version = "0.4.0";
+            version = "0.4.1";
             src = fetchHex {
               pkg = "corsica";
-              version = "0.4.0";
+              version = "0.4.1";
               sha256 =
-                "9f5e7c6b3e6b52f9b07d76f207fbe39273d9cb22099b6b3d83621ded29fb42d6";
+                "718b95d067cba24563b6fcc5ac64ced304c71323df3c0abe58351054125f964d";
             };
-            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
 
             meta = {
               description = ''Plug-based swiss-army knife for CORS requests.'';
@@ -6154,7 +7492,7 @@ let
           }
       ) {};
 
-    corsica = corsica_0_4_0;
+    corsica = corsica_0_4_1;
 
     couch_factory_0_1_1 = callPackage
       (
@@ -6180,20 +7518,20 @@ let
 
     couch_factory = couch_factory_0_1_1;
 
-    couchbeam_1_2_1 = callPackage
+    couchbeam_1_3_0 = callPackage
       (
-        {  buildRebar3, fetchHex, jsx_2_8_0, hackney_1_4_4 }:
+        {  buildRebar3, fetchHex, jsx_2_8_0, hackney_1_5_7 }:
           buildRebar3 {
             name = "couchbeam";
-            version = "1.2.1";
+            version = "1.3.0";
             src = fetchHex {
               pkg = "couchbeam";
-              version = "1.2.1";
+              version = "1.3.0";
               sha256 =
-                "ed19f0412aa0539ecf622ac8ade1ca0e316f424e3334ad015a3fb8db19e91194";
+                "5d94bfc80532999e4f8e7f5da3abff74fbf3b59d5e02e0a99eb0dc3697c97a50";
             };
 
-            beamDeps  = [ jsx_2_8_0 hackney_1_4_4 ];
+            beamDeps  = [ jsx_2_8_0 hackney_1_5_7 ];
 
             meta = {
               description = ''Erlang CouchDB client'';
@@ -6203,7 +7541,7 @@ let
           }
       ) {};
 
-    couchbeam = couchbeam_1_2_1;
+    couchbeam = couchbeam_1_3_0;
 
     couchdb_client_0_2_5 = callPackage
       (
@@ -6244,7 +7582,7 @@ let
 
     couchdb_connector_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "couchdb_connector";
             version = "0.2.0";
@@ -6254,7 +7592,7 @@ let
               sha256 =
                 "05ac95c3f08038c3f17c03be5f27922b919513dfd4582f2da150f70182dac01b";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               longDescription = ''A connector for CouchDB, the Erlang-based,
@@ -6279,6 +7617,30 @@ let
 
     couchdb_connector = couchdb_connector_0_2_0;
 
+    couchex_0_6_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "couchex";
+            version = "0.6.0";
+            src = fetchHex {
+              pkg = "couchex";
+              version = "0.6.0";
+              sha256 =
+                "44e02558dc29d739cf27dad76bfc8e8632c4779ce2c701a418409912641b7c3b";
+            };
+
+            meta = {
+              description = ''CouchDB client, wrapping couchbeam erlang
+                            client.'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/ringling/couchex";
+            };
+          }
+      ) {};
+
+    couchex = couchex_0_6_0;
+
     count_buffer_0_1_5 = callPackage
       (
         {  buildMix, fetchHex, pool_ring_0_1_5 }:
@@ -6330,9 +7692,70 @@ let
 
     countries = countries_1_1_2;
 
+    courier_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, mail_0_0_4, gen_smtp_0_9_0 }:
+          buildMix {
+            name = "courier";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "courier";
+              version = "0.0.3";
+              sha256 =
+                "8c8c560da7011c8846ed5ee60af867124ff043a7d37773156b6d8a08390b73fc";
+            };
+            beamDeps  = [ mail_0_0_4 gen_smtp_0_9_0 ];
+
+            meta = {
+              description = ''Adapter based email delivery'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/DockYard/courier";
+            };
+          }
+      ) {};
+
+    courier = courier_0_0_3;
+
+    courier_web_0_0_8 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          uuid_1_1_3,
+          poison_2_1_0,
+          plug_1_1_3,
+          ja_serializer_0_8_1,
+          courier_0_0_3
+        }:
+          buildMix {
+            name = "courier_web";
+            version = "0.0.8";
+            src = fetchHex {
+              pkg = "courier_web";
+              version = "0.0.8";
+              sha256 =
+                "c4161f218d487901bc1e63ce1840c73de34d84d8c53eda12f09cea4a8fa2758b";
+            };
+            beamDeps  = [
+                          uuid_1_1_3
+                          poison_2_1_0
+                          plug_1_1_3
+                          ja_serializer_0_8_1
+                          courier_0_0_3
+                        ];
+
+            meta = {
+              description = ''Web client adapter for Courier'';
+
+            };
+          }
+      ) {};
+
+    courier_web = courier_web_0_0_8;
+
     coverex_1_4_8 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "coverex";
             version = "1.4.8";
@@ -6342,7 +7765,7 @@ let
               sha256 =
                 "47f03bd9d00b22893fda81273c310d30d96e849026f5c1d0ad664089c875bac6";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               longDescription = ''Coverex is an Elixir Coverage tool used by
@@ -6360,8 +7783,8 @@ let
 
     cowboy_1_0_4 = callPackage
       (
-        {  buildRebar3, fetchHex, cowlib_1_0_2, ranch_1_2_1 }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex, cowlib_1_0_2, ranch_1_2_1 }:
+          buildErlangMk {
             name = "cowboy";
             version = "1.0.4";
             src = fetchHex {
@@ -6370,7 +7793,6 @@ let
               sha256 =
                 "6a0edee96885fae3a8dd0ac1f333538a42e807db638a9453064ccfdaa6b9fdac";
             };
-
             beamDeps  = [ cowlib_1_0_2 ranch_1_2_1 ];
 
             meta = {
@@ -6453,8 +7875,8 @@ let
 
     cowlib_1_0_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "cowlib";
             version = "1.0.0";
             src = fetchHex {
@@ -6475,8 +7897,8 @@ let
 
     cowlib_1_0_2 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "cowlib";
             version = "1.0.2";
             src = fetchHex {
@@ -6497,8 +7919,8 @@ let
 
     cowlib_1_3_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "cowlib";
             version = "1.3.0";
             src = fetchHex {
@@ -6620,17 +8042,17 @@ let
 
     craterl = craterl_0_2_3;
 
-    crc_0_3_0 = callPackage
+    crc_0_4_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "crc";
-            version = "0.3.0";
+            version = "0.4.0";
             src = fetchHex {
               pkg = "crc";
-              version = "0.3.0";
+              version = "0.4.0";
               sha256 =
-                "23d7cb6a18cca461f46f5a0f341c74fd0a680cdae62460687f1a24f0a7faabd4";
+                "4f0d872d46faea966aeb687158b7e02bfc61c49c4f2fb33f5e52e3d167f4faeb";
             };
 
             meta = {
@@ -6642,7 +8064,7 @@ let
           }
       ) {};
 
-    crc = crc_0_3_0;
+    crc = crc_0_4_0;
 
     credit_card_1_0_0 = callPackage
       (
@@ -6667,17 +8089,17 @@ let
 
     credit_card = credit_card_1_0_0;
 
-    credo_0_1_10 = callPackage
+    credo_0_3_10 = callPackage
       (
         {  buildMix, fetchHex, bunt_0_1_5 }:
           buildMix {
             name = "credo";
-            version = "0.1.10";
+            version = "0.3.10";
             src = fetchHex {
               pkg = "credo";
-              version = "0.1.10";
+              version = "0.3.10";
               sha256 =
-                "2a52a3fc144bc5c70899381a58de603eb14751f4965dfea1866b20324b9806c0";
+                "dbc6e8ed6cd3567576bb6c4cc0dbea6fb3f7ef88a530aa2d17d13a1106cff156";
             };
             beamDeps  = [ bunt_0_1_5 ];
 
@@ -6691,17 +8113,19 @@ let
           }
       ) {};
 
-    credo_0_3_3 = callPackage
+    credo = credo_0_3_10;
+
+    credo_0_3_2 = callPackage
       (
         {  buildMix, fetchHex, bunt_0_1_5 }:
           buildMix {
             name = "credo";
-            version = "0.3.3";
+            version = "0.3.2";
             src = fetchHex {
               pkg = "credo";
-              version = "0.3.3";
+              version = "0.3.2";
               sha256 =
-                "9cf7816093412e31bad13f08f6713ed935312d3a0d489edc76187c21e01a6afe";
+                "0040bfc7a76f3c345647dc32743f4c1ca2911cc1fc53bc2dc3f9fd98704da805";
             };
             beamDeps  = [ bunt_0_1_5 ];
 
@@ -6715,19 +8139,17 @@ let
           }
       ) {};
 
-    credo = credo_0_3_3;
-
-    croma_0_3_8 = callPackage
+    croma_0_4_0 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "croma";
-            version = "0.3.8";
+            version = "0.4.0";
             src = fetchHex {
               pkg = "croma";
-              version = "0.3.8";
+              version = "0.4.0";
               sha256 =
-                "48735ed0a450c2101a884f14fba5d5946d27601426de220e2327feffb5cc2cca";
+                "6bcf8a0aad588fc57b4a4dedacf54ec4461e6906da5273c4bd8e121d179e3413";
             };
 
             meta = {
@@ -6737,11 +8159,11 @@ let
           }
       ) {};
 
-    croma = croma_0_3_8;
+    croma = croma_0_4_0;
 
     crudex_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, plug_auth_0_2_0 }:
+        {  buildMix, fetchHex, plug_auth_0_3_0 }:
           buildMix {
             name = "crudex";
             version = "0.0.2";
@@ -6751,7 +8173,7 @@ let
               sha256 =
                 "2ccf07c728dbb328b9f869a87465c8ba647931ec68f563c4ddea99ec76fa4364";
             };
-            beamDeps  = [ plug_auth_0_2_0 ];
+            beamDeps  = [ plug_auth_0_3_0 ];
 
             meta = {
               description = ''A glue keeping Phoenix and Ecto together'';
@@ -6811,17 +8233,17 @@ let
 
     cryptex = cryptex_0_0_1;
 
-    crypto_ext_0_1_1 = callPackage
+    crypto_ext_0_1_3 = callPackage
       (
         {  buildRebar3, fetchHex }:
           buildRebar3 {
             name = "crypto_ext";
-            version = "0.1.1";
+            version = "0.1.3";
             src = fetchHex {
               pkg = "crypto_ext";
-              version = "0.1.1";
+              version = "0.1.3";
               sha256 =
-                "19715a35b392c557cc9503e2aa1f8fbd1dcd3cdcb11a0d2f73a3fe75f4db76b8";
+                "8caea80b44aa7a8b02399e522b7ff756f07a8ef810dc39d54b4abed68bdb5cf3";
             };
             compilePorts = true;
 
@@ -6834,7 +8256,7 @@ let
           }
       ) {};
 
-    crypto_ext = crypto_ext_0_1_1;
+    crypto_ext = crypto_ext_0_1_3;
 
     crypto_rsassa_pss_1_0_0 = callPackage
       (
@@ -6886,18 +8308,19 @@ let
 
     cspex = cspex_1_0_0;
 
-    csv_1_2_4 = callPackage
+    csv_1_3_3 = callPackage
       (
-        {  buildMix, fetchHex }:
+        {  buildMix, fetchHex, parallel_stream_1_0_3 }:
           buildMix {
             name = "csv";
-            version = "1.2.4";
+            version = "1.3.3";
             src = fetchHex {
               pkg = "csv";
-              version = "1.2.4";
+              version = "1.3.3";
               sha256 =
-                "66fee1eaf536347d493942cb5e085321c51e80de124ff00f4b2651870b919b99";
+                "f3ef7b1ae28a55e53b8cb5c11d0e0b64e76e38d5f3e830bf2e3bf2cc0a89d848";
             };
+            beamDeps  = [ parallel_stream_1_0_3 ];
 
             meta = {
               description = ''CSV Decoding and Encoding for Elixir'';
@@ -6907,7 +8330,7 @@ let
           }
       ) {};
 
-    csv = csv_1_2_4;
+    csv = csv_1_3_3;
 
     csvlixir_2_0_2 = callPackage
       (
@@ -6939,17 +8362,17 @@ let
 
     csvlixir = csvlixir_2_0_2;
 
-    cth_readable_1_2_1 = callPackage
+    cth_readable_1_2_2 = callPackage
       (
         {  buildRebar3, fetchHex, cf_0_2_1 }:
           buildRebar3 {
             name = "cth_readable";
-            version = "1.2.1";
+            version = "1.2.2";
             src = fetchHex {
               pkg = "cth_readable";
-              version = "1.2.1";
+              version = "1.2.2";
               sha256 =
-                "923ae5bd8a044695a3223cc6539126e69f91aff89bb924ccf38da9ee615d6492";
+                "77585432b98b45b9ee086399cefa97b2191b6d780c4e795bf43c529412d9694d";
             };
 
             beamDeps  = [ cf_0_2_1 ];
@@ -6962,7 +8385,7 @@ let
           }
       ) {};
 
-    cth_readable = cth_readable_1_2_1;
+    cth_readable = cth_readable_1_2_2;
 
     cuckoo_1_0_0 = callPackage
       (
@@ -7061,19 +8484,44 @@ let
 
     cure = cure_0_4_1;
 
-    current_streak_ex_0_1_0 = callPackage
+    currency_formatter_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1, floki_0_7_1 }:
+        {  buildMix, fetchHex, poison_2_1_0 }:
+          buildMix {
+            name = "currency_formatter";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "currency_formatter";
+              version = "0.0.1";
+              sha256 =
+                "dab55279ae6377f00a9d01a0a7ab015d380d550d71f303900ae554f8d0065606";
+            };
+            beamDeps  = [ poison_2_1_0 ];
+
+            meta = {
+              description = ''A function to format a number to a currency using
+                            iso standards'';
+              license = stdenv.lib.licenses.wtfpl;
+              homepage = "https://github.com/smeevil/currency_formatter";
+            };
+          }
+      ) {};
+
+    currency_formatter = currency_formatter_0_0_1;
+
+    current_streak_ex_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_2, floki_0_8_0 }:
           buildMix {
             name = "current_streak_ex";
-            version = "0.1.0";
+            version = "0.1.1";
             src = fetchHex {
               pkg = "current_streak_ex";
-              version = "0.1.0";
+              version = "0.1.1";
               sha256 =
-                "08b846b7347fa134d845e0654b4775eba78e995675f18ec51533e7e42aa3abaa";
+                "1c62bcd7bdd69818dc05f0602e03a5aca6b21554206cb6634bedb807ee27d5a7";
             };
-            beamDeps  = [ httpoison_0_8_1 floki_0_7_1 ];
+            beamDeps  = [ httpoison_0_8_2 floki_0_8_0 ];
 
             meta = {
               description = ''Get github current streak which support only
@@ -7084,7 +8532,7 @@ let
           }
       ) {};
 
-    current_streak_ex = current_streak_ex_0_1_0;
+    current_streak_ex = current_streak_ex_0_1_1;
 
     current_user_0_0_1 = callPackage
       (
@@ -7209,9 +8657,32 @@ let
 
     curtains = curtains_0_0_1;
 
+    curve25519_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "curve25519";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "curve25519";
+              version = "0.1.0";
+              sha256 =
+                "786f9ede0aa9503f65015c19d9cd1b9263c5e7523cd215ee23d6d94ba16473d1";
+            };
+
+            meta = {
+              description = ''Curve25519 Diffie-Hellman functions'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mwmiller/curve25519_ex";
+            };
+          }
+      ) {};
+
+    curve25519 = curve25519_0_1_0;
+
     cushion_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, httpotion_2_1_0 }:
+        {  buildMix, fetchHex, httpotion_2_2_2 }:
           buildMix {
             name = "cushion";
             version = "0.0.3";
@@ -7221,7 +8692,7 @@ let
               sha256 =
                 "1371ab210bd3b7ef7381dbe3f53fedb8afbbb0c562f45d614e4849373919482b";
             };
-            beamDeps  = [ httpotion_2_1_0 ];
+            beamDeps  = [ httpotion_2_2_2 ];
 
             meta = {
               longDescription = ''A really simple Buffer API client for sending
@@ -7236,28 +8707,6 @@ let
 
     cushion = cushion_0_0_3;
 
-    custom_base_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "custom_base";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "custom_base";
-              version = "0.1.0";
-              sha256 =
-                "3a75d9cabcad3936e9194d387966213cb13a4d14b7b69f2cea0fc22ff2f76726";
-            };
-
-            meta = {
-              description = ''Allow you to make custom base conversion in
-                            Elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/igas/custom_base";
-            };
-          }
-      ) {};
-
     custom_base_0_2_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -7331,6 +8780,31 @@ let
 
     cypher_query = cypher_query_0_0_1;
 
+    data_leaf_walker_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "data_leaf_walker";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "data_leaf_walker";
+              version = "0.1.0";
+              sha256 =
+                "9d3a8688c3751765453f04e8f60f3826757396dce66baf7e2cf7335c9c373bbd";
+            };
+
+            meta = {
+              longDescription = ''Traverse and map values of deeply nested data
+                                structures: Provides a `map_deeply/2` function
+                                for Maps and Lists and Keyword Lists'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gutschilla/elixir-map-deeply";
+            };
+          }
+      ) {};
+
+    data_leaf_walker = data_leaf_walker_0_1_0;
+
     database_url_0_1_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -7361,8 +8835,8 @@ let
           buildMix,
           fetchHex,
           poison_1_5_2,
-          httpoison_0_8_1,
-          ex_doc_0_6_2,
+          httpoison_0_8_2,
+          ex_doc_0_7_3,
           erldn_1_0_5
         }:
           buildMix {
@@ -7375,7 +8849,7 @@ let
                 "bb2a5171a5d7783e40776db7fe7a6bff73ff69a4da4205c83b39c26ff73488c0";
             };
             beamDeps  = [
-                          poison_1_5_2 httpoison_0_8_1 ex_doc_0_6_2 erldn_1_0_5
+                          poison_1_5_2 httpoison_0_8_2 ex_doc_0_7_3 erldn_1_0_5
                         ];
 
             meta = {
@@ -7389,17 +8863,17 @@ let
 
     datomex = datomex_0_0_5;
 
-    datomic_gen_server_1_1_0 = callPackage
+    datomic_gen_server_2_0_1 = callPackage
       (
         {  buildMix, fetchHex, exdn_2_1_2 }:
           buildMix {
             name = "datomic_gen_server";
-            version = "1.1.0";
+            version = "2.0.1";
             src = fetchHex {
               pkg = "datomic_gen_server";
-              version = "1.1.0";
+              version = "2.0.1";
               sha256 =
-                "c5369270fa9a21544efc359e80eff4b24d5dfbe869c211da0df6ebf216afa5a3";
+                "601422e876b895d1841c02afe4b89ec32d4859a4c9a81c2ecbe5fa6bf6d651ba";
             };
             beamDeps  = [ exdn_2_1_2 ];
 
@@ -7413,7 +8887,7 @@ let
           }
       ) {};
 
-    datomic_gen_server = datomic_gen_server_1_1_0;
+    datomic_gen_server = datomic_gen_server_2_0_1;
 
     db_0_9_0 = callPackage
       (
@@ -7438,7 +8912,7 @@ let
 
     db = db_0_9_0;
 
-    db_connection_0_2_3 = callPackage
+    db_connection_0_2_4 = callPackage
       (
         {
           buildMix,
@@ -7449,12 +8923,12 @@ let
         }:
           buildMix {
             name = "db_connection";
-            version = "0.2.3";
+            version = "0.2.4";
             src = fetchHex {
               pkg = "db_connection";
-              version = "0.2.3";
+              version = "0.2.4";
               sha256 =
-                "16a1e0a968b3610fd482f64266411bde554515572c2b184af493d749ef206fca";
+                "fbb5074affe8d57d0f677cf3692371a1fa3f90673c81e61214b0388995b4d4a7";
             };
             beamDeps  = [ sbroker_0_7_0 poolboy_1_5_1 connection_1_0_2 ];
 
@@ -7467,7 +8941,7 @@ let
           }
       ) {};
 
-    db_connection = db_connection_0_2_3;
+    db_connection = db_connection_0_2_4;
 
     dbg_1_0_1 = callPackage
       (
@@ -7492,19 +8966,41 @@ let
 
     dbg = dbg_1_0_1;
 
-    dbus_0_4_0 = callPackage
+    dbschema_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, poolboy_1_5_1, eredis_1_0_8 }:
-          buildMix {
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "dbschema";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "dbschema";
+              version = "0.2.0";
+              sha256 =
+                "92eed9e62bf5998d33e7826e02f35bafa52bc7f5915c7ebaf4a8c687529688e2";
+            };
+
+            meta = {
+              description = ''Database postgresql migrations util'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/egobrain/dbschema";
+            };
+          }
+      ) {};
+
+    dbschema = dbschema_0_2_0;
+
+    dbus_0_5_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
             name = "dbus";
-            version = "0.4.0";
+            version = "0.5.0";
             src = fetchHex {
               pkg = "dbus";
-              version = "0.4.0";
+              version = "0.5.0";
               sha256 =
-                "d743b06a73286622af4a9390c4a16dcc5bce6be184ed660cfd76bd2f0b8ebedb";
+                "8607c4ae1c9e2f377cfd4c34fd8207ad842347dc86db1360605d0a85266ae2e3";
             };
-            beamDeps  = [ poolboy_1_5_1 eredis_1_0_8 ];
 
             meta = {
               description = ''A native erlang implementation of D-Bus'';
@@ -7514,7 +9010,7 @@ let
           }
       ) {};
 
-    dbus = dbus_0_4_0;
+    dbus = dbus_0_5_0;
 
     ddb_client_0_1_17 = callPackage
       (
@@ -7543,7 +9039,7 @@ let
 
     dealer_0_8_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "dealer";
             version = "0.8.0";
@@ -7553,7 +9049,7 @@ let
               sha256 =
                 "c8c72d38e1cff6a181a6b6f627fb6fd5998279827519e598eb28bcef2be721ee";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''An API Client for Stockfighter.'';
@@ -7845,6 +9341,32 @@ let
 
     detergentex = detergentex_0_0_7;
 
+    deviant_elixir_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_2, feeder_ex_0_0_2 }:
+          buildMix {
+            name = "deviant_elixir";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "deviant_elixir";
+              version = "0.0.4";
+              sha256 =
+                "42473969889a47edab66384988e70ab6b4da158043e9231deab822743e3d9943";
+            };
+            beamDeps  = [ httpoison_0_8_2 feeder_ex_0_0_2 ];
+
+            meta = {
+              longDescription = ''WIP. Unstable alpha. Elixir API wrapper for
+                                Deviant Art. At this moment provides only RSS
+                                feeds intergac.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/vdaniuk/deviant-elixir";
+            };
+          }
+      ) {};
+
+    deviant_elixir = deviant_elixir_0_0_4;
+
     dexts_0_2_1 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -7893,7 +9415,7 @@ let
 
     di_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
           buildMix {
             name = "di";
             version = "0.1.0";
@@ -7903,7 +9425,7 @@ let
               sha256 =
                 "d7a89568c986c98399667faeb618d5cc42a89965717e758323aa5370d1547260";
             };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_1 ];
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
 
             meta = {
               description = ''Elixir wrapper for DI.FM'';
@@ -7960,17 +9482,17 @@ let
           }
       ) {};
 
-    dialyze_0_2_0 = callPackage
+    dialyze_0_2_1 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "dialyze";
-            version = "0.2.0";
+            version = "0.2.1";
             src = fetchHex {
               pkg = "dialyze";
-              version = "0.2.0";
+              version = "0.2.1";
               sha256 =
-                "05efe534da3b6d0a89cb655f3dc7cf3a99088b0832c5a75a9898a6241ff01cd2";
+                "f485181fa53229356621261a384963cb47511cccf1454e82ca4fde53274fcd48";
             };
 
             meta = {
@@ -7981,7 +9503,7 @@ let
           }
       ) {};
 
-    dialyze = dialyze_0_2_0;
+    dialyze = dialyze_0_2_1;
 
     diane_0_0_1 = callPackage
       (
@@ -8054,7 +9576,7 @@ let
 
     dicer_0_8_0 = callPackage
       (
-        {  buildMix, fetchHex, sfmt_0_12_2 }:
+        {  buildMix, fetchHex, sfmt_0_12_7 }:
           buildMix {
             name = "dicer";
             version = "0.8.0";
@@ -8064,7 +9586,7 @@ let
               sha256 =
                 "834e5d3f4cd9afac655e0f27869ecfdf6fa4ea061ad9ededdc6f295f71325960";
             };
-            beamDeps  = [ sfmt_0_12_2 ];
+            beamDeps  = [ sfmt_0_12_7 ];
 
             meta = {
               description = ''Elixir library to calculate dice rolls. '';
@@ -8101,17 +9623,17 @@ let
 
     dicks = dicks_0_1_0;
 
-    dicon_0_2_0 = callPackage
+    dicon_0_3_0 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "dicon";
-            version = "0.2.0";
+            version = "0.3.0";
             src = fetchHex {
               pkg = "dicon";
-              version = "0.2.0";
+              version = "0.3.0";
               sha256 =
-                "7da0fb146e81f34a6112594c88682c89b8cdf0ab9ccdaa92547399c283f2f98f";
+                "52c5839feb9e0fa4247a564b79ac6717d8adc0e65a34739caaf26982fa213a12";
             };
 
             meta = {
@@ -8122,7 +9644,7 @@ let
           }
       ) {};
 
-    dicon = dicon_0_2_0;
+    dicon = dicon_0_3_0;
 
     difficult_0_0_2 = callPackage
       (
@@ -8150,7 +9672,7 @@ let
 
     digoc_0_3_3 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_3_1, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_3_1, httpoison_0_8_2 }:
           buildMix {
             name = "digoc";
             version = "0.3.3";
@@ -8160,7 +9682,7 @@ let
               sha256 =
                 "23d5c2f1b977b1f3e12567879a20bc211898efdfcac9a0b6802324bc42ea0605";
             };
-            beamDeps  = [ poison_1_3_1 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_3_1 httpoison_0_8_2 ];
 
             meta = {
               description = ''An Elixir client for the Digital Ocean API v2.'';
@@ -8172,6 +9694,42 @@ let
 
     digoc = digoc_0_3_3;
 
+    diplomat_0_0_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poison_1_5_2,
+          httpoison_0_8_2,
+          goth_0_0_3,
+          exprotobuf_1_0_0
+        }:
+          buildMix {
+            name = "diplomat";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "diplomat";
+              version = "0.0.1";
+              sha256 =
+                "49d2bff25e177701f988f1abfb164233617c9af2da1701cb06f651e2b789407b";
+            };
+            beamDeps  = [
+                          poison_1_5_2
+                          httpoison_0_8_2
+                          goth_0_0_3
+                          exprotobuf_1_0_0
+                        ];
+
+            meta = {
+              description = ''A library for interacting with Google`s Cloud
+                            Datastore'';
+
+            };
+          }
+      ) {};
+
+    diplomat = diplomat_0_0_1;
+
     dir_walker_0_0_6 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -8277,19 +9835,65 @@ let
 
     dismake = dismake_1_0_0;
 
-    distance_api_matrix_1_0_3 = callPackage
+    distance_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "distance";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "distance";
+              version = "0.1.2";
+              sha256 =
+                "8eca7e3d5cf36bc52814a858b07380f13d236ba5d7b70c4d4b1c6a455294aaf3";
+            };
+
+            meta = {
+              description = ''Various distance functions for geometric or
+                            geographic calculations'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pkinney/distance";
+            };
+          }
+      ) {};
+
+    distance_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "distance";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "distance";
+              version = "0.2.0";
+              sha256 =
+                "5ee0a5d05468c50c74d6ae4bcb13c5cd8e31f9ea45fce12290f2ad093df04944";
+            };
+
+            meta = {
+              description = ''Various distance functions for geometric or
+                            geographic calculations'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pkinney/distance";
+            };
+          }
+      ) {};
+
+    distance = distance_0_2_0;
+
+    distance_api_matrix_2_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "distance_api_matrix";
-            version = "1.0.3";
+            version = "2.0.0";
             src = fetchHex {
               pkg = "distance_api_matrix";
-              version = "1.0.3";
+              version = "2.0.0";
               sha256 =
-                "e4b6848481f4c8f5f15ad1c9f116816a3941f7c96df37fbad350faffc7887a6a";
+                "e6996e829d7cf4e3e6b7790c53207f86aa467c0ba28af7a20df81e3b16d40fa0";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Google Distance Matrix API Library for Elixir'';
@@ -8299,7 +9903,7 @@ let
           }
       ) {};
 
-    distance_api_matrix = distance_api_matrix_1_0_3;
+    distance_api_matrix = distance_api_matrix_2_0_0;
 
     distancex_0_1_0 = callPackage
       (
@@ -8430,9 +10034,35 @@ let
 
     dnsimple = dnsimple_0_0_1;
 
+    doc_first_formatter_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "doc_first_formatter";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "doc_first_formatter";
+              version = "0.0.1";
+              sha256 =
+                "d1bd7a64e8a742847f910557b66d302b65a10b8180e4e660edfc22987cda3262";
+            };
+
+            meta = {
+              longDescription = ''An ExUnit formatter that puts a list of tests
+                                first, distinguishes pending from failed tests,
+                                and saves detailed error information for once
+                                the test suite is finished.'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/bkerley/doc_first_formatter";
+            };
+          }
+      ) {};
+
+    doc_first_formatter = doc_first_formatter_0_0_1;
+
     doc_plug_1_0_2 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1 }:
+        {  buildMix, fetchHex, plug_1_1_3 }:
           buildMix {
             name = "doc_plug";
             version = "1.0.2";
@@ -8442,7 +10072,7 @@ let
               sha256 =
                 "2813f85dcd4f7228d54c277898d3d7483d03ef27ed4f9abc9eae6f57b00e79b8";
             };
-            beamDeps  = [ plug_1_1_1 ];
+            beamDeps  = [ plug_1_1_3 ];
 
             meta = {
               description = ''Plug to automatically generate and serve project
@@ -8457,7 +10087,7 @@ let
 
     docker_0_3_0 = callPackage
       (
-        {  buildRebar3, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildRebar3, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildRebar3 {
             name = "docker";
             version = "0.3.0";
@@ -8468,7 +10098,7 @@ let
                 "ad97dbaa51a615a7694018d95b0b09403b6d552a03ddb3ba50f121c814cc624a";
             };
 
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Elixir client for the Docker Remote API using
@@ -8481,19 +10111,19 @@ let
 
     docker = docker_0_3_0;
 
-    dogma_0_1_0 = callPackage
+    dogma_0_1_4 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2 }:
+        {  buildMix, fetchHex, poison_2_1_0 }:
           buildMix {
             name = "dogma";
-            version = "0.1.0";
+            version = "0.1.4";
             src = fetchHex {
               pkg = "dogma";
-              version = "0.1.0";
+              version = "0.1.4";
               sha256 =
-                "cd261c67d712ce4e9d8020d9cb6627c756db8dc5466c169611d81b79c5a261d0";
+                "ebf6f6bf8291e4a73b2886fc35e05224f0068237594f0e0609d1834863172245";
             };
-            beamDeps  = [ poison_1_5_2 ];
+            beamDeps  = [ poison_2_1_0 ];
 
             meta = {
               description = ''A code style linter for Elixir, powered by
@@ -8504,7 +10134,7 @@ let
           }
       ) {};
 
-    dogma = dogma_0_1_0;
+    dogma = dogma_0_1_4;
 
     dogstatsd_0_0_3 = callPackage
       (
@@ -8617,8 +10247,8 @@ let
 
     dovetail_0_0_3 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "dovetail";
             version = "0.0.3";
             src = fetchHex {
@@ -8641,7 +10271,7 @@ let
 
     dpd_client_0_0_6 = callPackage
       (
-        {  buildMix, fetchHex, hackney_1_0_6, poison_1_0_3 }:
+        {  buildMix, fetchHex, hackney_1_4_8, poison_1_0_3 }:
           buildMix {
             name = "dpd_client";
             version = "0.0.6";
@@ -8651,7 +10281,7 @@ let
               sha256 =
                 "080d8e9e4c68db87e42ead3fa3ffbc8cde2cadac441dbe81fa7a1b903486cc2d";
             };
-            beamDeps  = [ hackney_1_0_6 poison_1_0_3 ];
+            beamDeps  = [ hackney_1_4_8 poison_1_0_3 ];
 
             meta = {
               longDescription = ''`dpd_client` is an API client for the DPD
@@ -8758,7 +10388,7 @@ let
 
     dropbox_0_0_7 = callPackage
       (
-        {  buildMix, fetchHex, hackney_1_0_6, jazz_0_2_1 }:
+        {  buildMix, fetchHex, hackney_1_4_8, jazz_0_2_1 }:
           buildMix {
             name = "dropbox";
             version = "0.0.7";
@@ -8768,7 +10398,7 @@ let
               sha256 =
                 "d881be0c042856e0b2ff446dfac0b64337f5cbbb18479f4c81080d3d2cd7e4af";
             };
-            beamDeps  = [ hackney_1_0_6 jazz_0_2_1 ];
+            beamDeps  = [ hackney_1_4_8 jazz_0_2_1 ];
 
             meta = {
               description = ''A Dropbox Core API client for Elixir'';
@@ -8780,19 +10410,19 @@ let
 
     dropbox = dropbox_0_0_7;
 
-    dublin_bus_api_0_1_5 = callPackage
+    dublin_bus_api_0_1_6 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1, floki_0_7_1 }:
+        {  buildMix, fetchHex, httpoison_0_8_2, floki_0_8_0 }:
           buildMix {
             name = "dublin_bus_api";
-            version = "0.1.5";
+            version = "0.1.6";
             src = fetchHex {
               pkg = "dublin_bus_api";
-              version = "0.1.5";
+              version = "0.1.6";
               sha256 =
-                "54fb2c72fa682481970b126f53a45f2a38cc8d7fdff132483534f4ff04407bc1";
+                "4ac4811519a176c149b03c021bebd44771a279c489fe09c18a1f16f373c7bbb8";
             };
-            beamDeps  = [ httpoison_0_8_1 floki_0_7_1 ];
+            beamDeps  = [ httpoison_0_8_2 floki_0_8_0 ];
 
             meta = {
               description = ''Access to the Real Time Passenger Information
@@ -8803,7 +10433,7 @@ let
           }
       ) {};
 
-    dublin_bus_api = dublin_bus_api_0_1_5;
+    dublin_bus_api = dublin_bus_api_0_1_6;
 
     durga_transport_1_0_1 = callPackage
       (
@@ -8923,17 +10553,41 @@ let
 
     e_queue = e_queue_1_0_1;
 
-    earmark_0_1_14 = callPackage
+    e_quip_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
+          buildMix {
+            name = "e_quip";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "e_quip";
+              version = "0.0.1";
+              sha256 =
+                "e6fe9eeb96dbc863b527a792e730ea41aea43caef2a5db68ea2c4c9fc21f552a";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
+
+            meta = {
+              description = ''Simple Quip API Client'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/mmartinson/e_quip";
+            };
+          }
+      ) {};
+
+    e_quip = e_quip_0_0_1;
+
+    earmark_0_1_15 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "earmark";
-            version = "0.1.14";
+            version = "0.1.15";
             src = fetchHex {
               pkg = "earmark";
-              version = "0.1.14";
+              version = "0.1.15";
               sha256 =
-                "5e44505d71df50a839bde48c922357f9340168340dfc7502f581f68b6a0a29f9";
+                "cffc809198d000cc9b81cce80ebc673da8647291451015da42fc523f9dd781d7";
             };
 
             meta = {
@@ -9074,6 +10728,31 @@ let
 
     easypost = easypost_0_0_1;
 
+    ec2_0_9_1 = callPackage
+      (
+        {  buildMix, fetchHex, jsx_2_8_0 }:
+          buildMix {
+            name = "ec2";
+            version = "0.9.1";
+            src = fetchHex {
+              pkg = "ec2";
+              version = "0.9.1";
+              sha256 =
+                "ae857fe633bca078fd1ee54232dd3bc74566ff46b93aa53e38d74c546c3d9b6f";
+            };
+            beamDeps  = [ jsx_2_8_0 ];
+
+            meta = {
+              description = ''helper library for working with aws ec2
+                            metadata'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/talentdeficit/ec2";
+            };
+          }
+      ) {};
+
+    ec2 = ec2_0_9_1;
+
     ecc_0_1_3 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -9103,7 +10782,7 @@ let
     ecdo_0_1_4 = callPackage
       (
         {
-          buildMix, fetchHex, postgrex_0_11_1, mariaex_0_6_2, ecto_1_0_7
+          buildMix, fetchHex, postgrex_0_11_1, mariaex_0_7_0, ecto_1_0_7
         }:
           buildMix {
             name = "ecdo";
@@ -9114,7 +10793,7 @@ let
               sha256 =
                 "362c75113bca6c8379ac2b1654ae78ed099ab0faee4a1fbacb7b4b9b137b9f1d";
             };
-            beamDeps  = [ postgrex_0_11_1 mariaex_0_6_2 ecto_1_0_7 ];
+            beamDeps  = [ postgrex_0_11_1 mariaex_0_7_0 ecto_1_0_7 ];
 
             meta = {
               longDescription = ''Ecdo is a dynamic interface for ecto aims to
@@ -9155,6 +10834,30 @@ let
 
     echo = echo_0_2_0;
 
+    echonest_ex_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
+          buildMix {
+            name = "echonest_ex";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "echonest_ex";
+              version = "0.0.2";
+              sha256 =
+                "d8b3d7f2b04eb48b689877aaf9db30f33acea3ea02daca5aad8d105ac785bd98";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
+
+            meta = {
+              description = ''Echonest api wrapper for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/desmondhume/echonest_ex";
+            };
+          }
+      ) {};
+
+    echonest_ex = echonest_ex_0_0_2;
+
     econfig_0_7_1 = callPackage
       (
         {  buildRebar3, fetchHex }:
@@ -9178,6 +10881,46 @@ let
 
     econfig = econfig_0_7_1;
 
+    ecto_0_15_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          sbroker_0_7_0,
+          postgrex_0_9_1,
+          poolboy_1_5_1,
+          poison_1_5_2,
+          mariaex_0_4_3,
+          decimal_1_1_1
+        }:
+          buildMix {
+            name = "ecto";
+            version = "0.15.0";
+            src = fetchHex {
+              pkg = "ecto";
+              version = "0.15.0";
+              sha256 =
+                "44bbe98d66c20aa70dcac2cb41f6ae058aa50c3029089e2158d043113110164b";
+            };
+            beamDeps  = [
+                          sbroker_0_7_0
+                          postgrex_0_9_1
+                          poolboy_1_5_1
+                          poison_1_5_2
+                          mariaex_0_4_3
+                          decimal_1_1_1
+                        ];
+
+            meta = {
+              longDescription = ''Ecto is a domain specific language for
+                                writing queries and interacting with databases
+                                in Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/elixir-lang/ecto";
+            };
+          }
+      ) {};
+
     ecto_0_16_0 = callPackage
       (
         {
@@ -9221,7 +10964,7 @@ let
     ecto_0_2_4 = callPackage
       (
         {
-          buildMix, fetchHex, postgrex_0_6_0, poolboy_1_2_1, decimal_0_2_5
+          buildMix, fetchHex, postgrex_0_8_4, poolboy_1_2_1, decimal_0_2_5
         }:
           buildMix {
             name = "ecto";
@@ -9232,7 +10975,7 @@ let
               sha256 =
                 "b6918fb8a0b72220238832616c42937ac04d2f8016d687b53e3a241234cae4f3";
             };
-            beamDeps  = [ postgrex_0_6_0 poolboy_1_2_1 decimal_0_2_5 ];
+            beamDeps  = [ postgrex_0_8_4 poolboy_1_2_1 decimal_0_2_5 ];
 
             meta = {
               longDescription = ''Ecto is a domain specific language for
@@ -9244,21 +10987,21 @@ let
           }
       ) {};
 
-    ecto_0_2_6 = callPackage
+    ecto_0_2_7 = callPackage
       (
         {
-          buildMix, fetchHex, postgrex_0_6_0, poolboy_1_5_1, decimal_0_2_5
+          buildMix, fetchHex, postgrex_0_8_4, poolboy_1_4_2, decimal_0_2_5
         }:
           buildMix {
             name = "ecto";
-            version = "0.2.6";
+            version = "0.2.7";
             src = fetchHex {
               pkg = "ecto";
-              version = "0.2.6";
+              version = "0.2.7";
               sha256 =
-                "746fd42fa1a9fae304d9bb280782d9456a1f092ea71ead3a876876753c936dc8";
+                "3f26fd41a9e34272f5e753a010b1494646892130c91603da717b375c7acfed7f";
             };
-            beamDeps  = [ postgrex_0_6_0 poolboy_1_5_1 decimal_0_2_5 ];
+            beamDeps  = [ postgrex_0_8_4 poolboy_1_4_2 decimal_0_2_5 ];
 
             meta = {
               longDescription = ''Ecto is a domain specific language for
@@ -9273,7 +11016,7 @@ let
     ecto_0_5_1 = callPackage
       (
         {
-          buildMix, fetchHex, postgrex_0_6_0, poolboy_1_4_2, decimal_0_2_5
+          buildMix, fetchHex, postgrex_0_8_4, poolboy_1_4_2, decimal_0_2_5
         }:
           buildMix {
             name = "ecto";
@@ -9284,7 +11027,7 @@ let
               sha256 =
                 "a7f1f8022f6b8c53edc91076bcc885e1124fdf14cdc2c4a11d3b9b4c26cf34a8";
             };
-            beamDeps  = [ postgrex_0_6_0 poolboy_1_4_2 decimal_0_2_5 ];
+            beamDeps  = [ postgrex_0_8_4 poolboy_1_4_2 decimal_0_2_5 ];
 
             meta = {
               longDescription = ''Ecto is a domain specific language for
@@ -9336,7 +11079,7 @@ let
           }
       ) {};
 
-    ecto_1_1_3 = callPackage
+    ecto_1_1_5 = callPackage
       (
         {
           buildMix,
@@ -9345,24 +11088,24 @@ let
           postgrex_0_11_1,
           poolboy_1_5_1,
           poison_1_5_2,
-          mariaex_0_5_0,
+          mariaex_0_1_7,
           decimal_1_1_1
         }:
           buildMix {
             name = "ecto";
-            version = "1.1.3";
+            version = "1.1.5";
             src = fetchHex {
               pkg = "ecto";
-              version = "1.1.3";
+              version = "1.1.5";
               sha256 =
-                "0db9486edf2bc98cca77e5c22f7cb7e5a2d56fdb0268e4bb2e67353cc058b060";
+                "6283cae93763257ac7a319e28ab2308efcd3a4c1571e65ef55721067a01caf69";
             };
             beamDeps  = [
                           sbroker_0_7_0
                           postgrex_0_11_1
                           poolboy_1_5_1
                           poison_1_5_2
-                          mariaex_0_5_0
+                          mariaex_0_1_7
                           decimal_1_1_1
                         ];
 
@@ -9376,7 +11119,7 @@ let
           }
       ) {};
 
-    ecto_2_0_0_beta_0 = callPackage
+    ecto_2_0_0_beta_2 = callPackage
       (
         {
           buildMix,
@@ -9385,24 +11128,24 @@ let
           postgrex_0_11_1,
           poolboy_1_5_1,
           poison_1_0_3,
-          mariaex_0_6_2,
+          mariaex_0_7_0,
           decimal_1_1_1
         }:
           buildMix {
             name = "ecto";
-            version = "2.0.0-beta.0";
+            version = "2.0.0-beta.2";
             src = fetchHex {
               pkg = "ecto";
-              version = "2.0.0-beta.0";
+              version = "2.0.0-beta.2";
               sha256 =
-                "9c281d7de07610cc1025d2d5d2910aace0b0618c60fcbd6fd6f4b720c2f4e996";
+                "8b4f7ee50b342b9ea8a9c64b855625f2f805ddb981b89261d464fe84e93e40bd";
             };
             beamDeps  = [
                           sbroker_0_7_0
                           postgrex_0_11_1
                           poolboy_1_5_1
                           poison_1_0_3
-                          mariaex_0_6_2
+                          mariaex_0_7_0
                           decimal_1_1_1
                         ];
 
@@ -9416,7 +11159,7 @@ let
           }
       ) {};
 
-    ecto = ecto_2_0_0_beta_0;
+    ecto = ecto_2_0_0_beta_2;
 
     ecto_audit_0_0_1 = callPackage
       (
@@ -9448,8 +11191,8 @@ let
           buildMix,
           fetchHex,
           postgrex_0_11_1,
-          mariaex_0_6_2,
-          ecto_2_0_0_beta_0
+          mariaex_0_7_0,
+          ecto_2_0_0_beta_2
         }:
           buildMix {
             name = "ecto_enum";
@@ -9460,7 +11203,7 @@ let
               sha256 =
                 "2aabbeeee17c67b8336890cc1888b1104b71e29852d464a77efca4257b02a8d9";
             };
-            beamDeps  = [ postgrex_0_11_1 mariaex_0_6_2 ecto_2_0_0_beta_0 ];
+            beamDeps  = [ postgrex_0_11_1 mariaex_0_7_0 ecto_2_0_0_beta_2 ];
 
             meta = {
               description = ''Ecto extension to support enums in models'';
@@ -9525,7 +11268,7 @@ let
 
     ecto_hstore_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, ecto_2_0_0_beta_0 }:
+        {  buildMix, fetchHex, ecto_2_0_0_beta_2 }:
           buildMix {
             name = "ecto_hstore";
             version = "0.0.1";
@@ -9535,7 +11278,7 @@ let
               sha256 =
                 "0dca7ad14d0fa42038594e00a6f1e1fb3476644f71299f9e4ca10f1b9d6098cb";
             };
-            beamDeps  = [ ecto_2_0_0_beta_0 ];
+            beamDeps  = [ ecto_2_0_0_beta_2 ];
 
             meta = {
               description = ''Ecto.Hstore adds Postgres Hstore compatibility to
@@ -9554,8 +11297,8 @@ let
           buildMix,
           fetchHex,
           postgrex_0_11_1,
-          mariaex_0_6_2,
-          ecto_2_0_0_beta_0
+          mariaex_0_7_0,
+          ecto_2_0_0_beta_2
         }:
           buildMix {
             name = "ecto_it";
@@ -9566,7 +11309,7 @@ let
               sha256 =
                 "ddbf27e85547b9812d7b49bc2252b4667468582b174045ba2bb1a804d209a860";
             };
-            beamDeps  = [ postgrex_0_11_1 mariaex_0_6_2 ecto_2_0_0_beta_0 ];
+            beamDeps  = [ postgrex_0_11_1 mariaex_0_7_0 ecto_2_0_0_beta_2 ];
 
             meta = {
               longDescription = ''Ecto IT is library for writing integration
@@ -9582,7 +11325,7 @@ let
 
     ecto_lazy_float_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex, ecto_2_0_0_beta_0 }:
+        {  buildMix, fetchHex, ecto_2_0_0_beta_2 }:
           buildMix {
             name = "ecto_lazy_float";
             version = "0.1.2";
@@ -9592,7 +11335,7 @@ let
               sha256 =
                 "76f14bf8d2bf52e3143c79fdf0e9d9bbb2fb1b087e847b13347e52e5b0c5da94";
             };
-            beamDeps  = [ ecto_2_0_0_beta_0 ];
+            beamDeps  = [ ecto_2_0_0_beta_2 ];
 
             meta = {
               description = ''Ecto.LazyFloat takes integer, strings, and floats
@@ -9605,19 +11348,19 @@ let
 
     ecto_lazy_float = ecto_lazy_float_0_1_2;
 
-    ecto_ldap_0_2_0 = callPackage
+    ecto_ldap_0_2_4 = callPackage
       (
-        {  buildMix, fetchHex, ecto_2_0_0_beta_0 }:
+        {  buildMix, fetchHex, ecto_2_0_0_beta_2 }:
           buildMix {
             name = "ecto_ldap";
-            version = "0.2.0";
+            version = "0.2.4";
             src = fetchHex {
               pkg = "ecto_ldap";
-              version = "0.2.0";
+              version = "0.2.4";
               sha256 =
-                "9228e091811d699c530a717633f0be8f3468d80f81f721c5f4ce2bd9b401de13";
+                "156294145a5d4ab0b71f86f2738a991de0fa6352360f5d5383b22dc18a25dc57";
             };
-            beamDeps  = [ ecto_2_0_0_beta_0 ];
+            beamDeps  = [ ecto_2_0_0_beta_2 ];
 
             meta = {
               description = ''An Ecto adapter for LDAP'';
@@ -9627,7 +11370,7 @@ let
           }
       ) {};
 
-    ecto_ldap = ecto_ldap_0_2_0;
+    ecto_ldap = ecto_ldap_0_2_4;
 
     ecto_migrate_0_6_3 = callPackage
       (
@@ -9635,7 +11378,7 @@ let
           buildMix,
           fetchHex,
           postgrex_0_11_1,
-          mariaex_0_6_2,
+          mariaex_0_7_0,
           ecto_it_0_2_0,
           ecto_1_0_7
         }:
@@ -9649,7 +11392,7 @@ let
                 "a604f2fe7874c674bd42fc70f3e89776d3738571d252ec8b785a107a6fa12b5c";
             };
             beamDeps  = [
-                          postgrex_0_11_1 mariaex_0_6_2 ecto_it_0_2_0 ecto_1_0_7
+                          postgrex_0_11_1 mariaex_0_7_0 ecto_it_0_2_0 ecto_1_0_7
                         ];
 
             meta = {
@@ -9690,7 +11433,7 @@ let
 
     ecto_validation_case_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex, ex_doc_0_11_4, ecto_2_0_0_beta_0 }:
+        {  buildMix, fetchHex, ex_doc_0_11_4, ecto_2_0_0_beta_2 }:
           buildMix {
             name = "ecto_validation_case";
             version = "0.1.1";
@@ -9700,7 +11443,7 @@ let
               sha256 =
                 "0bec902247929e66cb0687f09d458633385843d18ca6ec1ac2557e6754b55cbd";
             };
-            beamDeps  = [ ex_doc_0_11_4 ecto_2_0_0_beta_0 ];
+            beamDeps  = [ ex_doc_0_11_4 ecto_2_0_0_beta_2 ];
 
             meta = {
               description = ''Ecto.ValidationCase simplifies writing validation
@@ -9714,19 +11457,19 @@ let
 
     ecto_validation_case = ecto_validation_case_0_1_1;
 
-    ectograph_0_0_1 = callPackage
+    ectograph_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, graphql_0_1_2, ecto_1_1_3 }:
+        {  buildMix, fetchHex, graphql_0_2_0, ecto_1_1_5 }:
           buildMix {
             name = "ectograph";
-            version = "0.0.1";
+            version = "0.0.2";
             src = fetchHex {
               pkg = "ectograph";
-              version = "0.0.1";
+              version = "0.0.2";
               sha256 =
-                "1fe701999ff1648cdac64ed6500793f8534fe7771ed5b533c21bc42a648d3484";
+                "44eff08624c5f93af30878f4e1e47d69354078ff9081bf2b0203513bb6e0ead9";
             };
-            beamDeps  = [ graphql_0_1_2 ecto_1_1_3 ];
+            beamDeps  = [ graphql_0_2_0 ecto_1_1_5 ];
 
             meta = {
               longDescription = ''Ectograph is a set of utility functions for
@@ -9738,11 +11481,11 @@ let
           }
       ) {};
 
-    ectograph = ectograph_0_0_1;
+    ectograph = ectograph_0_0_2;
 
     ectoo_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex, postgrex_0_11_1, ecto_2_0_0_beta_0 }:
+        {  buildMix, fetchHex, postgrex_0_11_1, ecto_2_0_0_beta_2 }:
           buildMix {
             name = "ectoo";
             version = "0.0.4";
@@ -9752,7 +11495,7 @@ let
               sha256 =
                 "bf5852e97e64666ebd57df710e4cb1239d3fcf135d7ae9d5d666fc53aa0e0b46";
             };
-            beamDeps  = [ postgrex_0_11_1 ecto_2_0_0_beta_0 ];
+            beamDeps  = [ postgrex_0_11_1 ecto_2_0_0_beta_2 ];
 
             meta = {
               longDescription = ''Make simple things easy in Ecto, e.g.
@@ -9774,7 +11517,7 @@ let
           postgrex_0_9_1,
           poison_1_5_2,
           mariaex_0_4_3,
-          ecto_2_0_0_beta_0
+          ecto_2_0_0_beta_2
         }:
           buildMix {
             name = "ectophile";
@@ -9789,7 +11532,7 @@ let
                           postgrex_0_9_1
                           poison_1_5_2
                           mariaex_0_4_3
-                          ecto_2_0_0_beta_0
+                          ecto_2_0_0_beta_2
                         ];
 
             meta = {
@@ -9804,7 +11547,7 @@ let
 
     edeliver_1_1_4 = callPackage
       (
-        {  buildMix, fetchHex, exrm_1_0_0_rc8 }:
+        {  buildMix, fetchHex, exrm_1_0_3 }:
           buildMix {
             name = "edeliver";
             version = "1.1.4";
@@ -9814,7 +11557,7 @@ let
               sha256 =
                 "b7c95a499efb0fc9baf681dfaba3c09c64d9cde5c4cf4faafd44d6de9cba8928";
             };
-            beamDeps  = [ exrm_1_0_0_rc8 ];
+            beamDeps  = [ exrm_1_0_3 ];
 
             meta = {
               longDescription = ''Build and Deploy Elixir Applications and
@@ -9855,7 +11598,7 @@ let
 
     edgarex_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, httpotion_2_0_0, exquery_0_0_11 }:
+        {  buildMix, fetchHex, httpotion_2_2_2, exquery_0_0_11 }:
           buildMix {
             name = "edgarex";
             version = "0.0.2";
@@ -9865,7 +11608,7 @@ let
               sha256 =
                 "99e25e685bc44a1f804729779e77d5e3d1920f42c99478cd9b712d724b4f6af4";
             };
-            beamDeps  = [ httpotion_2_0_0 exquery_0_0_11 ];
+            beamDeps  = [ httpotion_2_2_2 exquery_0_0_11 ];
 
             meta = {
               longDescription = '' A set of utilities for fetching documents
@@ -9933,8 +11676,8 @@ let
 
     edown_0_7_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "edown";
             version = "0.7.0";
             src = fetchHex {
@@ -9959,8 +11702,8 @@ let
         {
           buildMix,
           fetchHex,
-          tzdata_0_1_8,
-          timex_1_0_1,
+          tzdata_0_1_201603,
+          timex_1_0_2,
           plug_0_14_0,
           earmark_0_1_19,
           cowboy_1_0_4
@@ -9975,8 +11718,8 @@ let
                 "c2f4bc1e6dbada6b7086e92db14a401ac1440d25d5c5ac078fc55e6545c73f4e";
             };
             beamDeps  = [
-                          tzdata_0_1_8
-                          timex_1_0_1
+                          tzdata_0_1_201603
+                          timex_1_0_2
                           plug_0_14_0
                           earmark_0_1_19
                           cowboy_1_0_4
@@ -9992,17 +11735,65 @@ let
 
     eeb = eeb_0_1_3;
 
+    efirebirdsql_0_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "efirebirdsql";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "efirebirdsql";
+              version = "0.1.1";
+              sha256 =
+                "dff29bcd6f5f99baa18dd339c01f441b498030e88ac4a1d7c4524da79b0a4cb7";
+            };
+
+            meta = {
+              description = ''Firebird Client'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nakagami/efirebirdsql";
+            };
+          }
+      ) {};
+
+    efirebirdsql = efirebirdsql_0_1_1;
+
+    efrisby_0_2_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, jsx_2_8_0, hackney_1_4_8 }:
+          buildRebar3 {
+            name = "efrisby";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "efrisby";
+              version = "0.2.0";
+              sha256 =
+                "5ad6f030a9e6b7611af09ce009106dcad9fa4ab3d23aa6db03573082f4824470";
+            };
+
+            beamDeps  = [ jsx_2_8_0 hackney_1_4_8 ];
+
+            meta = {
+              description = ''A REST API testing framework for erlang'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/FabioBatSilva/efrisby";
+            };
+          }
+      ) {};
+
+    efrisby = efrisby_0_2_0;
+
     egithub_0_2_2 = callPackage
       (
         {
-          buildRebar3,
+          buildErlangMk,
           fetchHex,
           shotgun_0_2_2,
           jiffy_0_14_7,
           lager_3_0_2,
           goldrush_0_1_7
         }:
-          buildRebar3 {
+          buildErlangMk {
             name = "egithub";
             version = "0.2.2";
             src = fetchHex {
@@ -10011,7 +11802,6 @@ let
               sha256 =
                 "ff8e279d3868576cc2a05336c7ca4bed3972f7a01676be859b7e1750da4570f8";
             };
-
             beamDeps  = [
                           shotgun_0_2_2 jiffy_0_14_7 lager_3_0_2 goldrush_0_1_7
                         ];
@@ -10099,7 +11889,7 @@ let
 
     eio_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_3, cowboy_1_0_4 }:
           buildMix {
             name = "eio";
             version = "0.1.0";
@@ -10109,7 +11899,7 @@ let
               sha256 =
                 "f39f017c73713b36ee27d8a0635634ac2e96b4d540f28db9dd358d8744dccd88";
             };
-            beamDeps  = [ poison_1_5_2 plug_1_1_1 cowboy_1_0_4 ];
+            beamDeps  = [ poison_1_5_2 plug_1_1_3 cowboy_1_0_4 ];
 
             meta = {
               description = ''Engine.io server for Elixir.'';
@@ -10121,24 +11911,24 @@ let
 
     eio = eio_0_1_0;
 
-    ejabberd_16_1_0_beta1 = callPackage
+    ejabberd_16_2_0 = callPackage
       (
         {
           buildMix,
           fetchHex,
           stun_1_0_1,
-          stringprep_1_0_2,
+          stringprep_1_0_3,
           sqlite3_1_1_5,
           p1_xmlrpc_1_15_1,
           p1_utils_1_0_3,
-          p1_pgsql_1_0_1,
+          p1_pgsql_1_1_0,
           p1_oauth2_0_6_1,
           p1_mysql_1_0_1,
           lager_3_0_2,
           jiffy_0_14_7,
           iconv_1_0_0,
-          fast_yaml_1_0_2,
-          fast_xml_1_1_3,
+          fast_yaml_1_0_3,
+          fast_xml_1_1_11,
           fast_tls_1_0_1,
           ezlib_1_0_1,
           esip_1_0_2,
@@ -10147,27 +11937,27 @@ let
         }:
           buildMix {
             name = "ejabberd";
-            version = "16.1.0-beta1";
+            version = "16.2.0";
             src = fetchHex {
               pkg = "ejabberd";
-              version = "16.1.0-beta1";
+              version = "16.2.0";
               sha256 =
-                "c1f6b702ab0e75866979c62edeab4dcc01a2cd9d375a73799b7288dbdc77d743";
+                "4e51457ac9f850782a5da63d060b8f710c2c652c7bd2062bb8c804a13985ca6e";
             };
             beamDeps  = [
                           stun_1_0_1
-                          stringprep_1_0_2
+                          stringprep_1_0_3
                           sqlite3_1_1_5
                           p1_xmlrpc_1_15_1
                           p1_utils_1_0_3
-                          p1_pgsql_1_0_1
+                          p1_pgsql_1_1_0
                           p1_oauth2_0_6_1
                           p1_mysql_1_0_1
                           lager_3_0_2
                           jiffy_0_14_7
                           iconv_1_0_0
-                          fast_yaml_1_0_2
-                          fast_xml_1_1_3
+                          fast_yaml_1_0_3
+                          fast_xml_1_1_11
                           fast_tls_1_0_1
                           ezlib_1_0_1
                           esip_1_0_2
@@ -10184,7 +11974,7 @@ let
           }
       ) {};
 
-    ejabberd = ejabberd_16_1_0_beta1;
+    ejabberd = ejabberd_16_2_0;
 
     ejabberd_dev_15_9_0 = callPackage
       (
@@ -10236,19 +12026,19 @@ let
 
     ekstat = ekstat_0_2_2;
 
-    elastex_0_1_1 = callPackage
+    elastex_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
           buildMix {
             name = "elastex";
-            version = "0.1.1";
+            version = "0.1.2";
             src = fetchHex {
               pkg = "elastex";
-              version = "0.1.1";
+              version = "0.1.2";
               sha256 =
-                "e08e9640f0d68250dfbe3a6d54855f75742db647ace24a42667d88e234c5849c";
+                "eaab5305db3d5d326e471dc1799606b7055971dfb7d9a27571850d2ce7e97f9b";
             };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_1 ];
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
 
             meta = {
               description = ''Data driven elixir client for Elasticsearch.'';
@@ -10258,7 +12048,7 @@ let
           }
       ) {};
 
-    elastex = elastex_0_1_1;
+    elastex = elastex_0_1_2;
 
     elastix_0_1_0 = callPackage
       (
@@ -10287,7 +12077,7 @@ let
 
     elaxtic_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, httpoison_0_8_2 }:
           buildMix {
             name = "elaxtic";
             version = "0.0.1";
@@ -10297,7 +12087,7 @@ let
               sha256 =
                 "a912a0327bfe1c6443cec47a03d11450fed2e649bfdcd4e77bdb9176baa8cd45";
             };
-            beamDeps  = [ httpoison_0_8_1 ];
+            beamDeps  = [ httpoison_0_8_2 ];
 
             meta = {
               description = ''ElasticSearch client for Elixir and Ecto
@@ -10409,8 +12199,8 @@ let
 
     elixir_ale_0_4_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "elixir_ale";
             version = "0.4.1";
             src = fetchHex {
@@ -10456,17 +12246,17 @@ let
 
     elixir_ami = elixir_ami_0_0_3;
 
-    elixir_authorizenet_0_2_1 = callPackage
+    elixir_authorizenet_0_2_2 = callPackage
       (
         {  buildMix, fetchHex, xml_builder_0_0_8, exmerl_0_1_1 }:
           buildMix {
             name = "elixir_authorizenet";
-            version = "0.2.1";
+            version = "0.2.2";
             src = fetchHex {
               pkg = "elixir_authorizenet";
-              version = "0.2.1";
+              version = "0.2.2";
               sha256 =
-                "ac690facc36206982a7bc1eca4cf3d50a68194e05c2cf927e0e3f166c71e9f0f";
+                "10111f4fe073d69a5ae817838377ba52bf6b04199c8386f48ca13804db6e2f70";
             };
             beamDeps  = [ xml_builder_0_0_8 exmerl_0_1_1 ];
 
@@ -10488,7 +12278,7 @@ let
           }
       ) {};
 
-    elixir_authorizenet = elixir_authorizenet_0_2_1;
+    elixir_authorizenet = elixir_authorizenet_0_2_2;
 
     elixir_bencode_1_0_0 = callPackage
       (
@@ -10537,17 +12327,17 @@ let
 
     elixir_drawille = elixir_drawille_0_0_3;
 
-    elixir_exif_0_1_0 = callPackage
+    elixir_exif_0_1_1 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "elixir_exif";
-            version = "0.1.0";
+            version = "0.1.1";
             src = fetchHex {
               pkg = "elixir_exif";
-              version = "0.1.0";
+              version = "0.1.1";
               sha256 =
-                "9d8e79d247495347c15d89172e86b49b3c9592b8df8d70ec0a4db126c3cd599b";
+                "a491a3e134c00f2a1f59c8e3a1bd62b9b94c1ce4179a20d737903f3edcc9bd78";
             };
 
             meta = {
@@ -10559,7 +12349,7 @@ let
           }
       ) {};
 
-    elixir_exif = elixir_exif_0_1_0;
+    elixir_exif = elixir_exif_0_1_1;
 
     elixir_feed_parser_0_9_0 = callPackage
       (
@@ -10584,17 +12374,17 @@ let
 
     elixir_feed_parser = elixir_feed_parser_0_9_0;
 
-    elixir_freshbooks_0_0_2 = callPackage
+    elixir_freshbooks_0_0_4 = callPackage
       (
         {  buildMix, fetchHex, xml_builder_0_0_8, exmerl_0_1_1 }:
           buildMix {
             name = "elixir_freshbooks";
-            version = "0.0.2";
+            version = "0.0.4";
             src = fetchHex {
               pkg = "elixir_freshbooks";
-              version = "0.0.2";
+              version = "0.0.4";
               sha256 =
-                "a40deaaf4400c0de95b7bf4b19fc9216a063e44854113301914b7b893e8c66d4";
+                "404ba66129bb1a756f6c06460d483d72d59990bc460616a1e61bd87af4108628";
             };
             beamDeps  = [ xml_builder_0_0_8 exmerl_0_1_1 ];
 
@@ -10606,12 +12396,12 @@ let
           }
       ) {};
 
-    elixir_freshbooks = elixir_freshbooks_0_0_2;
+    elixir_freshbooks = elixir_freshbooks_0_0_4;
 
     elixir_ipfs_api_0_1_0 = callPackage
       (
         {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1, ex_doc_0_10_0
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, ex_doc_0_10_0
         }:
           buildMix {
             name = "elixir_ipfs_api";
@@ -10622,7 +12412,7 @@ let
               sha256 =
                 "b8b6656ce18ff070b2328436cfa3d55f08b3e0a2f98bee49d4b3cb49c144684b";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ex_doc_0_10_0 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ex_doc_0_10_0 ];
 
             meta = {
               description = ''An elixir client library for the IPFS API'';
@@ -10715,7 +12505,7 @@ let
           uuid_1_1_3,
           socket_0_3_1,
           poison_1_5_2,
-          httpotion_2_1_0
+          httpotion_2_2_2
         }:
           buildMix {
             name = "elixir_nsq";
@@ -10727,7 +12517,7 @@ let
                 "6d30c3754dfdd988f927b9c6ae51d3e0ec4b0d2477b99047baf7a52c96bf9494";
             };
             beamDeps  = [
-                          uuid_1_1_3 socket_0_3_1 poison_1_5_2 httpotion_2_1_0
+                          uuid_1_1_3 socket_0_3_1 poison_1_5_2 httpotion_2_2_2
                         ];
 
             meta = {
@@ -10742,6 +12532,29 @@ let
 
     elixir_nsq = elixir_nsq_1_0_3;
 
+    elixir_prelude_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "elixir_prelude";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "elixir_prelude";
+              version = "0.2.1";
+              sha256 =
+                "178d8de9762447e8f8271bd6af356a171af9fb7c20fcd4fa510a05e19b24240d";
+            };
+
+            meta = {
+              description = ''Small set of useful utility functions'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ruby2elixir/elixir_prelude";
+            };
+          }
+      ) {};
+
+    elixir_prelude = elixir_prelude_0_2_1;
+
     elixir_radius_0_1_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -10765,19 +12578,19 @@ let
 
     elixir_radius = elixir_radius_0_1_0;
 
-    elixir_script_0_15_2 = callPackage
+    elixir_script_0_16_0 = callPackage
       (
-        {  buildMix, fetchHex, estree_2_2_0 }:
+        {  buildMix, fetchHex, estree_2_3_0 }:
           buildMix {
             name = "elixir_script";
-            version = "0.15.2";
+            version = "0.16.0";
             src = fetchHex {
               pkg = "elixir_script";
-              version = "0.15.2";
+              version = "0.16.0";
               sha256 =
-                "daa98f9f065576450843e9f867c7c8afe38edb29345aec276c112e4786ff2f5c";
+                "a2ff037d9c3562198fb3e35ff112cb35827078b1a905368be5ff351c582966a9";
             };
-            beamDeps  = [ estree_2_2_0 ];
+            beamDeps  = [ estree_2_3_0 ];
 
             meta = {
               description = ''ElixirScript: compiles Elixir code to
@@ -10788,7 +12601,7 @@ let
           }
       ) {};
 
-    elixir_script = elixir_script_0_15_2;
+    elixir_script = elixir_script_0_16_0;
 
     elixir_talk_1_0_1 = callPackage
       (
@@ -10838,6 +12651,30 @@ let
 
     elixir_tea = elixir_tea_1_0_0;
 
+    elixir_v8_0_2_2 = callPackage
+      (
+        {  buildMix, fetchHex, poolboy_1_5_1, exjsx_3_2_0 }:
+          buildMix {
+            name = "elixir_v8";
+            version = "0.2.2";
+            src = fetchHex {
+              pkg = "elixir_v8";
+              version = "0.2.2";
+              sha256 =
+                "71034e37c2b8113156b19b1ca5b9b772fb454fe11c1cba33567fb61d3c8cedbe";
+            };
+            beamDeps  = [ poolboy_1_5_1 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''V8 engine for Elixir with pools.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/le0pard/elixir_v8";
+            };
+          }
+      ) {};
+
+    elixir_v8 = elixir_v8_0_2_2;
+
     elixlsx_0_0_2 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -10864,7 +12701,7 @@ let
     elixtagram_0_2_5 = callPackage
       (
         {
-          buildMix, fetchHex, poison_1_5_2, oauth2_0_5_0, httpoison_0_7_5
+          buildMix, fetchHex, poison_1_5_2, oauth2_0_6_0, httpoison_0_7_5
         }:
           buildMix {
             name = "elixtagram";
@@ -10875,7 +12712,7 @@ let
               sha256 =
                 "71503f2bfec0d4728449321e4e1aaae7c8ae24974d53b904327bcef5b16e6900";
             };
-            beamDeps  = [ poison_1_5_2 oauth2_0_5_0 httpoison_0_7_5 ];
+            beamDeps  = [ poison_1_5_2 oauth2_0_6_0 httpoison_0_7_5 ];
 
             meta = {
               description = ''Instagram client library for Elixir.'';
@@ -10887,17 +12724,17 @@ let
 
     elixtagram = elixtagram_0_2_5;
 
-    elli_1_0_4 = callPackage
+    elli_1_0_5 = callPackage
       (
         {  buildRebar3, fetchHex }:
           buildRebar3 {
             name = "elli";
-            version = "1.0.4";
+            version = "1.0.5";
             src = fetchHex {
               pkg = "elli";
-              version = "1.0.4";
+              version = "1.0.5";
               sha256 =
-                "87641b9c069b1372dac4e1bdda795076ea3142af78aac0d63896a38079e89e8e";
+                "fb55bab884f1d921f2e86c00738909a9e56aca14604e617b138e163093609c97";
             };
 
             meta = {
@@ -10909,11 +12746,11 @@ let
           }
       ) {};
 
-    elli = elli_1_0_4;
+    elli = elli_1_0_5;
 
     elmit_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, httpotion_2_1_0 }:
+        {  buildMix, fetchHex, httpotion_2_2_2 }:
           buildMix {
             name = "elmit";
             version = "0.0.1";
@@ -10923,7 +12760,7 @@ let
               sha256 =
                 "90e5df811553733dd7505f9cc81397c3bdaf9c336eb3542c7e44f3c2012ef96e";
             };
-            beamDeps  = [ httpotion_2_1_0 ];
+            beamDeps  = [ httpotion_2_2_2 ];
 
             meta = {
               description = ''Google Translate with speech synthesis in your
@@ -11164,6 +13001,29 @@ let
 
     eper = eper_0_94_0;
 
+    epgpool_1_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "epgpool";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "epgpool";
+              version = "1.0.0";
+              sha256 =
+                "fefcde1302722d010a71733cd2e1403ab40686343e7281221136b24d6fad5889";
+            };
+
+            meta = {
+              description = ''Erlang postgresql pool application'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/egobrain/epgpool";
+            };
+          }
+      ) {};
+
+    epgpool = epgpool_1_0_0;
+
     epgsql_3_1_1 = callPackage
       (
         {  buildRebar3, fetchHex }:
@@ -11187,6 +13047,30 @@ let
 
     epgsql = epgsql_3_1_1;
 
+    epiphany_0_1_0_dev = callPackage
+      (
+        {  buildMix, fetchHex, connection_1_0_2 }:
+          buildMix {
+            name = "epiphany";
+            version = "0.1.0-dev";
+            src = fetchHex {
+              pkg = "epiphany";
+              version = "0.1.0-dev";
+              sha256 =
+                "38b15e762a4bb8c57a3ef238531dd465113b1019fb5aa63d7c8b38ed579f15f9";
+            };
+            beamDeps  = [ connection_1_0_2 ];
+
+            meta = {
+              description = ''Cassandra driver for Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/vptheron/epiphany";
+            };
+          }
+      ) {};
+
+    epiphany = epiphany_0_1_0_dev;
+
     episcina_1_1_0 = callPackage
       (
         {  buildRebar3, fetchHex, gproc_0_3_1 }:
@@ -11306,6 +13190,29 @@ let
 
     eql = eql_0_1_2;
 
+    equery_0_2_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "equery";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "equery";
+              version = "0.2.0";
+              sha256 =
+                "4e1f91ecdcaf61db99be759ebe133d351aec760ff8e7ea1c33e6f0626cf6068b";
+            };
+
+            meta = {
+              description = ''Sql generator library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/egobrain/equery";
+            };
+          }
+      ) {};
+
+    equery = equery_0_2_0;
+
     eredis_1_0_8 = callPackage
       (
         {  buildRebar3, fetchHex }:
@@ -11355,17 +13262,17 @@ let
 
     eredis_cluster = eredis_cluster_0_5_4;
 
-    erl2ex_0_0_7 = callPackage
+    erl2ex_0_0_8 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "erl2ex";
-            version = "0.0.7";
+            version = "0.0.8";
             src = fetchHex {
               pkg = "erl2ex";
-              version = "0.0.7";
+              version = "0.0.8";
               sha256 =
-                "2df3a8441cb059784523f7e2da15e897cf211a6cfec942c63032a4e5798805f1";
+                "bbe0b1a43e1621158d7985e77d7d1f00db0410d5987b429c30c8d0cc582e0f6f";
             };
 
             meta = {
@@ -11378,7 +13285,30 @@ let
           }
       ) {};
 
-    erl2ex = erl2ex_0_0_7;
+    erl2ex = erl2ex_0_0_8;
+
+    erlang_dbus_0_2_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "erlang_dbus";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "erlang_dbus";
+              version = "0.2.0";
+              sha256 =
+                "b00065acfae0cfea909335eab07339292a1f9a9c91b2f542d3841f86f4aac605";
+            };
+
+            meta = {
+              description = ''A native erlang implementation of D-Bus'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/lizenn/erlang-dbus";
+            };
+          }
+      ) {};
+
+    erlang_dbus = erlang_dbus_0_2_0;
 
     erlang_localtime_1_0_0 = callPackage
       (
@@ -11547,11 +13477,34 @@ let
           }
       ) {};
 
-    erlcloud = erlcloud_0_13_0;
+    erlcloud_0_13_2 = callPackage
+      (
+        {  buildRebar3, fetchHex, lhttpc_1_4_0, jsx_2_8_0 }:
+          buildRebar3 {
+            name = "erlcloud";
+            version = "0.13.2";
+            src = fetchHex {
+              pkg = "erlcloud";
+              version = "0.13.2";
+              sha256 =
+                "568d464760802322b7dc81e95f9c7bfb2fa8121423e67b2db6ed1c80697e1277";
+            };
+
+            beamDeps  = [ lhttpc_1_4_0 jsx_2_8_0 ];
+
+            meta = {
+              description = ''Erlang cloud computing library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/erlcloud/erlcloud";
+            };
+          }
+      ) {};
+
+    erlcloud = erlcloud_0_13_2;
 
     erlcloud_0_9_2 = callPackage
       (
-        {  buildRebar3, fetchHex, meck_0_8_4, lhttpc_1_3_0, jsx_2_4_0 }:
+        {  buildRebar3, fetchHex, meck_0_8_4, lhttpc_1_3_0, jsx_2_3_1 }:
           buildRebar3 {
             name = "erlcloud";
             version = "0.9.2";
@@ -11562,7 +13515,7 @@ let
                 "739ab77c3f007b3c8466e093726fb3e62b19691d70dbff4defc4beac61e48f12";
             };
 
-            beamDeps  = [ meck_0_8_4 lhttpc_1_3_0 jsx_2_4_0 ];
+            beamDeps  = [ meck_0_8_4 lhttpc_1_3_0 jsx_2_3_1 ];
 
             meta = {
               description = ''Erlang cloud computing library'';
@@ -11574,8 +13527,8 @@ let
 
     erldn_1_0_5 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "erldn";
             version = "1.0.5";
             src = fetchHex {
@@ -11617,7 +13570,52 @@ let
           }
       ) {};
 
-    erlexec = erlexec_1_1_0;
+    erlexec_1_1_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "erlexec";
+            version = "1.1.1";
+            src = fetchHex {
+              pkg = "erlexec";
+              version = "1.1.1";
+              sha256 =
+                "86e354558e3e2275d5d611d08c87bb66bdffa500573b1af410d117d6b6bc460b";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''OS Process Manager'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/saleyn/erlexec";
+            };
+          }
+      ) {};
+
+    erlexec = erlexec_1_1_1;
+
+    erlogger_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "erlogger";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "erlogger";
+              version = "0.1.0";
+              sha256 =
+                "de2d64f0932e8af46264d92a224ed46e41f2b698b1bbd245ae19321715322146";
+            };
+
+            meta = {
+              description = ''Logging service for Erlang Applications.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/knusbaum/erlogger";
+            };
+          }
+      ) {};
+
+    erlogger = erlogger_0_1_0;
 
     erlsh_0_1_0 = callPackage
       (
@@ -11690,27 +13688,6 @@ let
 
     erltrace = erltrace_0_1_4;
 
-    erlware_commons_0_14_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "erlware_commons";
-            version = "0.14.0";
-            src = fetchHex {
-              pkg = "erlware_commons";
-              version = "0.14.0";
-              sha256 =
-                "ec36ca48ce0d4e64a7b0e00771260257e91162816254dc2d8d3cc9f83285dafe";
-            };
-
-            meta = {
-              description = ''Additional standard library for Erlang'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/erlware/erlware_commons";
-            };
-          }
-      ) {};
-
     erlware_commons_0_15_0 = callPackage
       (
         {  buildRebar3, fetchHex }:
@@ -11778,7 +13755,30 @@ let
           }
       ) {};
 
-    erlware_commons = erlware_commons_0_19_0;
+    erlware_commons_0_20_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, cf_0_2_1 }:
+          buildRebar3 {
+            name = "erlware_commons";
+            version = "0.20.0";
+            src = fetchHex {
+              pkg = "erlware_commons";
+              version = "0.20.0";
+              sha256 =
+                "bff981dbd0acb12ac9d10b41ca96ba76a26e2a1f2714d1e0cb0112f4a67d956a";
+            };
+
+            beamDeps  = [ cf_0_2_1 ];
+
+            meta = {
+              description = ''Additional standard library for Erlang'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/erlware/erlware_commons";
+            };
+          }
+      ) {};
+
+    erlware_commons = erlware_commons_0_20_0;
 
     erlydtl_0_11_1 = callPackage
       (
@@ -11828,8 +13828,8 @@ let
 
     erlzk_0_6_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "erlzk";
             version = "0.6.1";
             src = fetchHex {
@@ -11850,6 +13850,54 @@ let
 
     erlzk = erlzk_0_6_1;
 
+    erocksdb_0_4_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "erocksdb";
+            version = "0.4.1";
+            src = fetchHex {
+              pkg = "erocksdb";
+              version = "0.4.1";
+              sha256 =
+                "982f25f0dcf4d1aa176ce4ec1b01b630bef601e4f8e103890fac23e0a3dc72ec";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''RocksDB for Erlang'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/leo-project/erocksdb";
+            };
+          }
+      ) {};
+
+    erocksdb = erocksdb_0_4_1;
+
+    erwatch_0_3_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "erwatch";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "erwatch";
+              version = "0.3.0";
+              sha256 =
+                "0be5f4e83d762aa36ac3582efb480fb8041d06057a122c5d94a9956c4e3dbccc";
+            };
+
+            meta = {
+              description = ''Erwatch is an Erlang/OTP application for tracking
+                            changes in a file system.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/yuce/erwatch.git";
+            };
+          }
+      ) {};
+
+    erwatch = erwatch_0_3_0;
+
     es_0_0_1 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -11874,8 +13922,8 @@ let
 
     escalus_2_6_4 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "escalus";
             version = "2.6.4";
             src = fetchHex {
@@ -11944,17 +13992,17 @@ let
 
     esip = esip_1_0_2;
 
-    espec_0_8_11 = callPackage
+    espec_0_8_16 = callPackage
       (
         {  buildMix, fetchHex, meck_0_8_4 }:
           buildMix {
             name = "espec";
-            version = "0.8.11";
+            version = "0.8.16";
             src = fetchHex {
               pkg = "espec";
-              version = "0.8.11";
+              version = "0.8.16";
               sha256 =
-                "a30b084605a8a4eaf41004e9c25036eb493d98cbc2118f18a0e648011a5c3bd1";
+                "f96d469838a747f60bb23a7515e4065808af31da1c0f3c50162b0dd383248a95";
             };
             beamDeps  = [ meck_0_8_4 ];
 
@@ -11967,12 +14015,12 @@ let
           }
       ) {};
 
-    espec = espec_0_8_11;
+    espec = espec_0_8_16;
 
     espec_phoenix_0_2_0 = callPackage
       (
         {
-          buildMix, fetchHex, phoenix_1_1_4, floki_0_7_1, espec_0_8_11
+          buildMix, fetchHex, phoenix_1_1_4, floki_0_7_2, espec_0_8_16
         }:
           buildMix {
             name = "espec_phoenix";
@@ -11983,7 +14031,7 @@ let
               sha256 =
                 "069e7df74370905cdce3c87144e707174c13e13c6541ecc4ac114465292bf08e";
             };
-            beamDeps  = [ phoenix_1_1_4 floki_0_7_1 espec_0_8_11 ];
+            beamDeps  = [ phoenix_1_1_4 floki_0_7_2 espec_0_8_16 ];
 
             meta = {
               description = ''ESpec for Phoenix web framework.'';
@@ -11997,8 +14045,8 @@ let
 
     esqlite_0_2_2 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "esqlite";
             version = "0.2.2";
             src = fetchHex {
@@ -12007,7 +14055,6 @@ let
               sha256 =
                 "5f15f8014baa9d31ee83817afe9164b3ecd76f77b2de7515f2cca2ca75b642e0";
             };
-            compilePorts = true;
 
             meta = {
               description = ''A Sqlite3 NIF'';
@@ -12019,17 +14066,17 @@ let
 
     esqlite = esqlite_0_2_2;
 
-    estree_2_2_0 = callPackage
+    estree_2_3_0 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "estree";
-            version = "2.2.0";
+            version = "2.3.0";
             src = fetchHex {
               pkg = "estree";
-              version = "2.2.0";
+              version = "2.3.0";
               sha256 =
-                "0adb199b79b31f05f2f01ab87f099ea84684ffffb1571fb33cde05500f9367f2";
+                "f73bf510523aac5518845d4d844a9690ba30450fc666ac138e8965a6c88b26ae";
             };
 
             meta = {
@@ -12042,7 +14089,7 @@ let
           }
       ) {};
 
-    estree = estree_2_2_0;
+    estree = estree_2_3_0;
 
     esync_0_0_1 = callPackage
       (
@@ -12070,7 +14117,7 @@ let
 
     etcd_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_2_0 }:
+        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_2_0 }:
           buildMix {
             name = "etcd";
             version = "0.0.2";
@@ -12080,7 +14127,7 @@ let
               sha256 =
                 "c1b559bc37812b9ab488f90f322dc0b826c94ac9809d9044b42b4fb420710848";
             };
-            beamDeps  = [ httpoison_0_8_1 exjsx_3_2_0 ];
+            beamDeps  = [ httpoison_0_8_2 exjsx_3_2_0 ];
 
             meta = {
               description = ''Etcd APIv2 Client for Elixir'';
@@ -12115,6 +14162,34 @@ let
 
     ether = ether_0_0_1;
 
+    etherchain_org_0_0_3 = callPackage
+      (
+        {
+          buildMix, fetchHex, vex_0_5_5, poison_1_5_2, httpoison_0_8_2
+        }:
+          buildMix {
+            name = "etherchain_org";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "etherchain_org";
+              version = "0.0.3";
+              sha256 =
+                "45b231f1d177be098e2ddd575dd53d0b8676d676ed18c932495307e098c40880";
+            };
+            beamDeps  = [ vex_0_5_5 poison_1_5_2 httpoison_0_8_2 ];
+
+            meta = {
+              longDescription = ''WIP Elixir API wrapper for etherchain.org.
+                                Provides access to ethereum blockchain data.'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/cyberpunk-ventures/etherchain_org_ex";
+            };
+          }
+      ) {};
+
+    etherchain_org = etherchain_org_0_0_3;
+
     ets_map_0_0_1 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -12162,21 +14237,19 @@ let
           }
       ) {};
 
-    etude_0_4_0 = callPackage
+    etude_1_0_0_beta_0 = callPackage
       (
-        {
-          buildMix, fetchHex, rebind_0_1_3, parse_trans_2_9_0, lineo_0_1_0
-        }:
+        {  buildMix, fetchHex, poison_2_1_0, nile_0_1_3 }:
           buildMix {
             name = "etude";
-            version = "0.4.0";
+            version = "1.0.0-beta.0";
             src = fetchHex {
               pkg = "etude";
-              version = "0.4.0";
+              version = "1.0.0-beta.0";
               sha256 =
-                "602db062916cfe50b82257f1fdce039b08584d7ff285183c3a51060f197b4f01";
+                "f5a2896982cd062fe188dcb0216ef5c960959aa2ba77f4d31b00d0dda56890dd";
             };
-            beamDeps  = [ rebind_0_1_3 parse_trans_2_9_0 lineo_0_1_0 ];
+            beamDeps  = [ poison_2_1_0 nile_0_1_3 ];
 
             meta = {
               description = ''parallel computation coordination utilities for
@@ -12187,7 +14260,7 @@ let
           }
       ) {};
 
-    etude = etude_0_4_0;
+    etude = etude_1_0_0_beta_0;
 
     euler_0_0_1 = callPackage
       (
@@ -12238,6 +14311,31 @@ let
 
     eunit_formatters = eunit_formatters_0_3_1;
 
+    evel_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, hash_ring_0_4_0 }:
+          buildRebar3 {
+            name = "evel";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "evel";
+              version = "0.1.0";
+              sha256 =
+                "5f381ab07b2f914b437808da2ef01fb2905349d17d467f5b5008bfdb5a2418dd";
+            };
+
+            beamDeps  = [ hash_ring_0_4_0 ];
+
+            meta = {
+              description = ''An Eventual Leader Election Library for Erlang'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sile/evel";
+            };
+          }
+      ) {};
+
+    evel = evel_0_1_0;
+
     event_source_encoder_0_0_3 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -12262,6 +14360,59 @@ let
 
     event_source_encoder = event_source_encoder_0_0_3;
 
+    eventstore_0_2_1 = callPackage
+      (
+        {
+          buildMix, fetchHex, postgrex_0_11_1, poolboy_1_5_1, fsm_0_2_0
+        }:
+          buildMix {
+            name = "eventstore";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "eventstore";
+              version = "0.2.1";
+              sha256 =
+                "ca035c60f925868826eb81bc85a91a7fa5e0637e3232d68e2d7aef248bf2ca35";
+            };
+            beamDeps  = [ postgrex_0_11_1 poolboy_1_5_1 fsm_0_2_0 ];
+
+            meta = {
+              description = ''EventStore using PostgreSQL for persistence.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/slashdotdash/eventstore";
+            };
+          }
+      ) {};
+
+    eventstore = eventstore_0_2_1;
+
+    eventstore_client_0_1_4 = callPackage
+      (
+        {
+          buildMix, fetchHex, uuid_1_1_3, poison_2_1_0, httpoison_0_8_2
+        }:
+          buildMix {
+            name = "eventstore_client";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "eventstore_client";
+              version = "0.1.4";
+              sha256 =
+                "fa77e1a7906b3ed27c0dfa0bd41f27b3129285857948aa23a3f888b0dd531109";
+            };
+            beamDeps  = [ uuid_1_1_3 poison_2_1_0 httpoison_0_8_2 ];
+
+            meta = {
+              description = ''HTTP Client for EventStore (geteventstore.com)'';
+
+              homepage =
+                "https://github.com/tbug/elixir-eventstore-http-client";
+            };
+          }
+      ) {};
+
+    eventstore_client = eventstore_client_0_1_4;
+
     everex_0_1_1 = callPackage
       (
         {
@@ -12327,7 +14478,7 @@ let
 
     ewebmachine_2_0_12 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
           buildMix {
             name = "ewebmachine";
             version = "2.0.12";
@@ -12337,7 +14488,7 @@ let
               sha256 =
                 "66a4ca701594da9396d6bab03f074f1ab56080a62e6545e6e455a24296c96a1a";
             };
-            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
 
             meta = {
               longDescription = ''Ewebmachine contains macros and plugs to
@@ -12353,28 +14504,6 @@ let
 
     ewebmachine = ewebmachine_2_0_12;
 
-    ex2ms_1_3_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "ex2ms";
-            version = "1.3.0";
-            src = fetchHex {
-              pkg = "ex2ms";
-              version = "1.3.0";
-              sha256 =
-                "ff2bfb0adb93830705cd73f2860891fd44a8f22cc2fdaf9f23bfcf2e4bdcfa79";
-            };
-
-            meta = {
-              description = ''Translates Elixir functions to match
-                            specifications for use with `ets`.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/ericmj/ex2ms";
-            };
-          }
-      ) {};
-
     ex2ms_1_4_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -12445,7 +14574,7 @@ let
 
     ex_aerospike = ex_aerospike_0_0_1;
 
-    ex_aws_0_4_17 = callPackage
+    ex_aws_0_4_18 = callPackage
       (
         {
           buildMix,
@@ -12453,24 +14582,24 @@ let
           sweet_xml_0_6_1,
           poison_1_5_2,
           jsx_2_8_0,
-          httpotion_2_2_0,
-          httpoison_0_8_1
+          httpotion_2_2_2,
+          httpoison_0_8_2
         }:
           buildMix {
             name = "ex_aws";
-            version = "0.4.17";
+            version = "0.4.18";
             src = fetchHex {
               pkg = "ex_aws";
-              version = "0.4.17";
+              version = "0.4.18";
               sha256 =
-                "e0b28688f9409eb3132efc0d01e02854dd1a22fa7df8940ef88a75ba1448a01c";
+                "6e534b4c4b56046a52d86d62be59358418e38cdd994428a80fbdbba5cc37f075";
             };
             beamDeps  = [
                           sweet_xml_0_6_1
                           poison_1_5_2
                           jsx_2_8_0
-                          httpotion_2_2_0
-                          httpoison_0_8_1
+                          httpotion_2_2_2
+                          httpoison_0_8_2
                         ];
 
             meta = {
@@ -12482,7 +14611,7 @@ let
           }
       ) {};
 
-    ex_aws = ex_aws_0_4_17;
+    ex_aws = ex_aws_0_4_18;
 
     ex_bitcask_0_1_0 = callPackage
       (
@@ -12537,7 +14666,7 @@ let
 
     ex_chimp_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "ex_chimp";
             version = "0.0.1";
@@ -12547,7 +14676,7 @@ let
               sha256 =
                 "1a4e97e2a4b7bf7401660acd61d7e35b9c758638c305324971eddc5bd1bb0bee";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Basic/minimal Mailchimp API client.'';
@@ -12561,7 +14690,7 @@ let
 
     ex_clacks_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1 }:
+        {  buildMix, fetchHex, plug_1_1_3 }:
           buildMix {
             name = "ex_clacks";
             version = "0.1.1";
@@ -12571,7 +14700,7 @@ let
               sha256 =
                 "524f966b03b1a1ac4ab3f6beeef6ce5030cf3b16927c466d42a8b08c5355b231";
             };
-            beamDeps  = [ plug_1_1_1 ];
+            beamDeps  = [ plug_1_1_3 ];
 
             meta = {
               description = ''A Plug that pays homage to Terry Pratchett'';
@@ -12583,19 +14712,19 @@ let
 
     ex_clacks = ex_clacks_0_1_1;
 
-    ex_closeio_0_0_7 = callPackage
+    ex_closeio_0_0_12 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "ex_closeio";
-            version = "0.0.7";
+            version = "0.0.12";
             src = fetchHex {
               pkg = "ex_closeio";
-              version = "0.0.7";
+              version = "0.0.12";
               sha256 =
-                "8873b4c80e610ebed7a43245aaeb182a56ad6709ca318cf4ee0bf9870fd4b0b4";
+                "6090eaa4b699da9c242f498db0435cd45489702dc9859450cb4e26fd48288e79";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Close.io client library for Elixir.'';
@@ -12605,21 +14734,21 @@ let
           }
       ) {};
 
-    ex_closeio = ex_closeio_0_0_7;
+    ex_closeio = ex_closeio_0_0_12;
 
-    ex_cloudinary_0_1_1 = callPackage
+    ex_cloudinary_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "ex_cloudinary";
-            version = "0.1.1";
+            version = "0.1.2";
             src = fetchHex {
               pkg = "ex_cloudinary";
-              version = "0.1.1";
+              version = "0.1.2";
               sha256 =
-                "1473ab409152d7d61062224ae5402c6ec677c10da63e29b1332c6fd35cf91381";
+                "cbd90bcf8d5f9f7f2c624d2822704f693ff25716d2195281f418db4e13b553ea";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''A wrapper around the HTTPoison.Base module for
@@ -12630,7 +14759,7 @@ let
           }
       ) {};
 
-    ex_cloudinary = ex_cloudinary_0_1_1;
+    ex_cloudinary = ex_cloudinary_0_1_2;
 
     ex_conf_0_1_2 = callPackage
       (
@@ -12678,7 +14807,7 @@ let
 
     ex_crypto_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_1, poison_2_1_0, pipe_0_0_2 }:
+        {  buildMix, fetchHex, timex_2_1_3, poison_2_1_0, pipe_0_0_2 }:
           buildMix {
             name = "ex_crypto";
             version = "0.0.1";
@@ -12688,7 +14817,7 @@ let
               sha256 =
                 "f9c47326435e52154a6db97359356a44c1fe21a0d26fda24a46367ba33ccb85f";
             };
-            beamDeps  = [ timex_1_0_1 poison_2_1_0 pipe_0_0_2 ];
+            beamDeps  = [ timex_2_1_3 poison_2_1_0 pipe_0_0_2 ];
 
             meta = {
               longDescription = ''A wrapper around the Erlang Crypto module
@@ -12726,7 +14855,7 @@ let
 
     ex_doc_0_10_0 = callPackage
       (
-        {  buildMix, fetchHex, earmark_0_1_14 }:
+        {  buildMix, fetchHex, earmark_0_1_15 }:
           buildMix {
             name = "ex_doc";
             version = "0.10.0";
@@ -12736,7 +14865,7 @@ let
               sha256 =
                 "3d9f15777aa3fb62700d5984eb09ceeb6c1574d61be0f70801e3390e36942b35";
             };
-            beamDeps  = [ earmark_0_1_14 ];
+            beamDeps  = [ earmark_0_1_15 ];
 
             meta = {
               description = ''ExDoc is a documentation generation tool for
@@ -12749,7 +14878,7 @@ let
 
     ex_doc_0_11_4 = callPackage
       (
-        {  buildMix, fetchHex, earmark_0_1_14 }:
+        {  buildMix, fetchHex, earmark_0_1_15 }:
           buildMix {
             name = "ex_doc";
             version = "0.11.4";
@@ -12759,7 +14888,7 @@ let
               sha256 =
                 "639e97b24c1c6c172f557163b830673646983417de9ac0da2c25c7063deed293";
             };
-            beamDeps  = [ earmark_0_1_14 ];
+            beamDeps  = [ earmark_0_1_15 ];
 
             meta = {
               description = ''ExDoc is a documentation generation tool for
@@ -12772,18 +14901,19 @@ let
 
     ex_doc = ex_doc_0_11_4;
 
-    ex_doc_0_6_2 = callPackage
+    ex_doc_0_7_3 = callPackage
       (
-        {  buildMix, fetchHex }:
+        {  buildMix, fetchHex, earmark_0_1_15 }:
           buildMix {
             name = "ex_doc";
-            version = "0.6.2";
+            version = "0.7.3";
             src = fetchHex {
               pkg = "ex_doc";
-              version = "0.6.2";
+              version = "0.7.3";
               sha256 =
-                "fdd21c651fbe96f39697c3acd9ee6b849348cafb4000b92a130e2df8a0a3e2b6";
+                "45efbc6d2dc58d864e41be8a4321a5ecf643a061ec71487453447b29539f81ff";
             };
+            beamDeps  = [ earmark_0_1_15 ];
 
             meta = {
               description = ''ExDoc is a documentation generation tool for
@@ -12796,7 +14926,7 @@ let
 
     ex_doc_dash_0_3_0 = callPackage
       (
-        {  buildMix, fetchHex, ex_doc_0_11_4, earmark_0_1_14 }:
+        {  buildMix, fetchHex, ex_doc_0_11_4, earmark_0_1_15 }:
           buildMix {
             name = "ex_doc_dash";
             version = "0.3.0";
@@ -12806,7 +14936,7 @@ let
               sha256 =
                 "0b511eecda1dd2c51fab8b1e071e3d6292f6a136232425d3f20baa9ca0fbeb43";
             };
-            beamDeps  = [ ex_doc_0_11_4 earmark_0_1_14 ];
+            beamDeps  = [ ex_doc_0_11_4 earmark_0_1_15 ];
 
             meta = {
               description = ''Formatter for ExDoc to generate docset
@@ -12894,6 +15024,31 @@ let
 
     ex_edn = ex_edn_0_1_2;
 
+    ex_enum_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, gettext_0_10_0 }:
+          buildMix {
+            name = "ex_enum";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "ex_enum";
+              version = "0.1.0";
+              sha256 =
+                "f6685959ef337018e42c4baccdce98cc9618974759d1fdb969fcf9a266e590ea";
+            };
+            beamDeps  = [ gettext_0_10_0 ];
+
+            meta = {
+              description = ''Enum library for Elixir inspired by
+                            ActiveHash::Enum.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/kenta-aktsk/ex_enum";
+            };
+          }
+      ) {};
+
+    ex_enum = ex_enum_0_1_0;
+
     ex_fabricators_0_1_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -12917,6 +15072,32 @@ let
 
     ex_fabricators = ex_fabricators_0_1_0;
 
+    ex_guard_0_10_0 = callPackage
+      (
+        {  buildMix, fetchHex, fs_0_9_2 }:
+          buildMix {
+            name = "ex_guard";
+            version = "0.10.0";
+            src = fetchHex {
+              pkg = "ex_guard";
+              version = "0.10.0";
+              sha256 =
+                "5e099659bf2e197e8d7acfbad597b48c59961c1f61f8ec45d4e22a5d6f6e6fb5";
+            };
+            beamDeps  = [ fs_0_9_2 ];
+
+            meta = {
+              longDescription = ''ExGuard automates various tasks by running
+                                custom rules whenever file or directories are
+                                modified.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/slashmili/ex_guard";
+            };
+          }
+      ) {};
+
+    ex_guard = ex_guard_0_10_0;
+
     ex_hl7_0_1_3 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -12940,9 +15121,33 @@ let
 
     ex_hl7 = ex_hl7_0_1_3;
 
+    ex_ical_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, timex_1_0_2 }:
+          buildMix {
+            name = "ex_ical";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ex_ical";
+              version = "0.0.1";
+              sha256 =
+                "b8b41eb4626fc41e36f054de8983d944d100f103979bd82d069b3a982bb51959";
+            };
+            beamDeps  = [ timex_1_0_2 ];
+
+            meta = {
+              description = ''ICalendar parser.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/fazibear/ex_ical";
+            };
+          }
+      ) {};
+
+    ex_ical = ex_ical_0_0_1;
+
     ex_iss_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "ex_iss";
             version = "1.0.0";
@@ -12952,7 +15157,7 @@ let
               sha256 =
                 "8b2b2eebbd75593e814e712555c7f69138864317cf2f0093a82ca305138baa83";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               longDescription = ''This package is for interfacing with the Open
@@ -13115,19 +15320,18 @@ let
 
     ex_minimatch = ex_minimatch_0_0_1;
 
-    ex_modbus_0_0_2 = callPackage
+    ex_modbus_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, ex_doc_0_11_4, earmark_0_1_19 }:
+        {  buildMix, fetchHex }:
           buildMix {
             name = "ex_modbus";
-            version = "0.0.2";
+            version = "0.0.3";
             src = fetchHex {
               pkg = "ex_modbus";
-              version = "0.0.2";
+              version = "0.0.3";
               sha256 =
-                "8930d2bdd867ebc649f285689723499f39af181ee84cb4e7856eaa3f9cc21d30";
+                "bdfd52c43e690a9af041f34b7cd1f6c2843e39fe51b9afcc2a83fbf4d254fd50";
             };
-            beamDeps  = [ ex_doc_0_11_4 earmark_0_1_19 ];
 
             meta = {
               description = ''An Elixir ModbusTCP client implementation.'';
@@ -13137,11 +15341,11 @@ let
           }
       ) {};
 
-    ex_modbus = ex_modbus_0_0_2;
+    ex_modbus = ex_modbus_0_0_3;
 
     ex_omegle_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex, jsex_2_0_0, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, jsex_2_0_0, httpoison_0_8_2 }:
           buildMix {
             name = "ex_omegle";
             version = "0.1.1";
@@ -13151,7 +15355,7 @@ let
               sha256 =
                 "8166d1125a2670f55fce2030367d9da381e577ad122dcf1d03784e536c78cc65";
             };
-            beamDeps  = [ jsex_2_0_0 httpoison_0_8_1 ];
+            beamDeps  = [ jsex_2_0_0 httpoison_0_8_2 ];
 
             meta = {
               description = ''A minimal Omegle chat client library for
@@ -13164,19 +15368,19 @@ let
 
     ex_omegle = ex_omegle_0_1_1;
 
-    ex_orient_1_0_2 = callPackage
+    ex_orient_1_1_1 = callPackage
       (
         {
           buildMix, fetchHex, poolboy_1_2_1, poison_1_0_3, marco_polo_0_2_1
         }:
           buildMix {
             name = "ex_orient";
-            version = "1.0.2";
+            version = "1.1.1";
             src = fetchHex {
               pkg = "ex_orient";
-              version = "1.0.2";
+              version = "1.1.1";
               sha256 =
-                "36296ba45e6d321c8c023ab110a1c80bac9e48afe0c6df00aa44223870d74796";
+                "9cad40957987bb4aa440d798e6f7096de5136f54fe0b7bd7d0d5f67be63a7a08";
             };
             beamDeps  = [ poolboy_1_2_1 poison_1_0_3 marco_polo_0_2_1 ];
 
@@ -13190,7 +15394,7 @@ let
           }
       ) {};
 
-    ex_orient = ex_orient_1_0_2;
+    ex_orient = ex_orient_1_1_1;
 
     ex_parametarized_1_0_0 = callPackage
       (
@@ -13286,19 +15490,43 @@ let
 
     ex_pool = ex_pool_0_1_1;
 
-    ex_rated_1_2_1 = callPackage
+    ex_prometheus_io_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, ex2ms_1_3_0 }:
+        {  buildMix, fetchHex, poison_1_5_2 }:
+          buildMix {
+            name = "ex_prometheus_io";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "ex_prometheus_io";
+              version = "0.0.3";
+              sha256 =
+                "7c2baaf0eef43d3e68d822532e0ca22daea41f6cce85de6b0ba538819fdb3832";
+            };
+            beamDeps  = [ poison_1_5_2 ];
+
+            meta = {
+              description = ''Prometheus.io Elixir client API library'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/kennyballou/ex_prometheus_io";
+            };
+          }
+      ) {};
+
+    ex_prometheus_io = ex_prometheus_io_0_0_3;
+
+    ex_rated_1_2_2 = callPackage
+      (
+        {  buildMix, fetchHex, ex2ms_1_4_0 }:
           buildMix {
             name = "ex_rated";
-            version = "1.2.1";
+            version = "1.2.2";
             src = fetchHex {
               pkg = "ex_rated";
-              version = "1.2.1";
+              version = "1.2.2";
               sha256 =
-                "868282cdf5b8a6698382182411ec46965204a0fbe83e65368004e944a5c608ac";
+                "65f7e9aaba3ba5bf8995b34a29c9572652b051cfdd7988e5f9b7ea329bb71ca1";
             };
-            beamDeps  = [ ex2ms_1_3_0 ];
+            beamDeps  = [ ex2ms_1_4_0 ];
 
             meta = {
               longDescription = ''ExRated, the OTP GenServer with the naughty
@@ -13315,7 +15543,7 @@ let
           }
       ) {};
 
-    ex_rated = ex_rated_1_2_1;
+    ex_rated = ex_rated_1_2_2;
 
     ex_rfc3966_0_2_3 = callPackage
       (
@@ -13369,6 +15597,33 @@ let
 
     ex_rfc3986 = ex_rfc3986_0_2_6;
 
+    ex_slp_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, ex_doc_0_11_4, earmark_0_2_1 }:
+          buildMix {
+            name = "ex_slp";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "ex_slp";
+              version = "0.1.0";
+              sha256 =
+                "9356a927d0809af648320b56d40929edb7c5807955b7460f362f674f1326e4c2";
+            };
+            beamDeps  = [ ex_doc_0_11_4 earmark_0_2_1 ];
+
+            meta = {
+              longDescription = ''Zero-config local network Elixir/Erlang node
+                                discovery lib. Allows an Elixir node to register
+                                itself as a local netowrk service and discover
+                                the orher registered services.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/4pcbr/ex_slp_tk";
+            };
+          }
+      ) {};
+
+    ex_slp = ex_slp_0_1_0;
+
     ex_spec_1_0_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -13392,6 +15647,30 @@ let
 
     ex_spec = ex_spec_1_0_0;
 
+    ex_sshd_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_sshd";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "ex_sshd";
+              version = "0.0.1";
+              sha256 =
+                "5227d6e0bc1c2227f60529679bc60494f6599f1ebe786389e0d15a7a2d92d83e";
+            };
+
+            meta = {
+              longDescription = ''Simple Elixir SSH worker that provides an
+                                Elixir shell over SSH into your application.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tverlaan/ex_sshd";
+            };
+          }
+      ) {};
+
+    ex_sshd = ex_sshd_0_0_1;
+
     ex_statsd_0_5_3 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -13415,17 +15694,17 @@ let
 
     ex_statsd = ex_statsd_0_5_3;
 
-    ex_sync_0_0_1 = callPackage
+    ex_sync_0_0_2 = callPackage
       (
         {  buildMix, fetchHex, connection_1_0_2 }:
           buildMix {
             name = "ex_sync";
-            version = "0.0.1";
+            version = "0.0.2";
             src = fetchHex {
               pkg = "ex_sync";
-              version = "0.0.1";
+              version = "0.0.2";
               sha256 =
-                "82261cf62a567b8eb0eba35dfbf0d9b546110825e8c64bb4ebc2ac8e37458499";
+                "2e6eb61310c708f59d10a5c53549230091a4e75c98352dcf04f34fabf3f81c35";
             };
             beamDeps  = [ connection_1_0_2 ];
 
@@ -13439,19 +15718,19 @@ let
           }
       ) {};
 
-    ex_sync = ex_sync_0_0_1;
+    ex_sync = ex_sync_0_0_2;
 
-    ex_test_0_0_1 = callPackage
+    ex_test_0_0_2 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "ex_test";
-            version = "0.0.1";
+            version = "0.0.2";
             src = fetchHex {
               pkg = "ex_test";
-              version = "0.0.1";
+              version = "0.0.2";
               sha256 =
-                "c283542766be3f9044068a6a91c22a8270987334151db7bd10f12c8db1ebfbe3";
+                "fdc33e0fa2fdab921fa54f0484645681ed0695f69439a6f40430e31fbc589756";
             };
 
             meta = {
@@ -13463,23 +15742,23 @@ let
           }
       ) {};
 
-    ex_test = ex_test_0_0_1;
+    ex_test = ex_test_0_0_2;
 
-    ex_twilio_0_1_3 = callPackage
+    ex_twilio_0_1_4 = callPackage
       (
         {
-          buildMix, fetchHex, poison_1_5_2, inflex_1_0_0, httpotion_2_1_0
+          buildMix, fetchHex, poison_1_5_2, inflex_1_5_0, httpotion_2_2_2
         }:
           buildMix {
             name = "ex_twilio";
-            version = "0.1.3";
+            version = "0.1.4";
             src = fetchHex {
               pkg = "ex_twilio";
-              version = "0.1.3";
+              version = "0.1.4";
               sha256 =
-                "50b949beed606a3e5dceb63c07db7f79cb0806901ea23bc109a9969429d8a2bf";
+                "97caa270770cd0d9f17de05ad8498fab48eb8c6ac28e66cf6a64aa0ebf26b60d";
             };
-            beamDeps  = [ poison_1_5_2 inflex_1_0_0 httpotion_2_1_0 ];
+            beamDeps  = [ poison_1_5_2 inflex_1_5_0 httpotion_2_2_2 ];
 
             meta = {
               description = ''Twilio API library for Elixir'';
@@ -13489,7 +15768,7 @@ let
           }
       ) {};
 
-    ex_twilio = ex_twilio_0_1_3;
+    ex_twilio = ex_twilio_0_1_4;
 
     ex_twiml_2_1_0 = callPackage
       (
@@ -13561,6 +15840,53 @@ let
 
     ex_unit_fixtures = ex_unit_fixtures_0_3_1;
 
+    ex_unit_notifier_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ex_unit_notifier";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "ex_unit_notifier";
+              version = "0.1.0";
+              sha256 =
+                "e7566bd9ec23dc6862ea660667f1e9525af26609cef5ed03694b4e33049c5325";
+            };
+
+            meta = {
+              description = ''Desktop notifications for ExUnit'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/navinpeiris/ex_unit_notifier";
+            };
+          }
+      ) {};
+
+    ex_unit_notifier = ex_unit_notifier_0_1_0;
+
+    ex_victor_ops_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, httpotion_2_2_2 }:
+          buildMix {
+            name = "ex_victor_ops";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "ex_victor_ops";
+              version = "0.2.1";
+              sha256 =
+                "86941d8955783640b7991c0f049ba428a3595d55aa85dcd1cb3e4edaaee62125";
+            };
+            beamDeps  = [ poison_2_1_0 httpotion_2_2_2 ];
+
+            meta = {
+              description = ''VictorOps API library for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/cagedata/ex_victor_ops";
+            };
+          }
+      ) {};
+
+    ex_victor_ops = ex_victor_ops_0_2_1;
+
     ex_vmstats_0_0_1 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -13609,6 +15935,62 @@ let
 
     exactor = exactor_2_2_0;
 
+    exalgebra_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex, eye_drops_1_0_1 }:
+          buildMix {
+            name = "exalgebra";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "exalgebra";
+              version = "0.0.4";
+              sha256 =
+                "8994432fa46db0aa36fa1637a1a856c8ade4472435335220db4f9f56e2c23c4d";
+            };
+            beamDeps  = [ eye_drops_1_0_1 ];
+
+            meta = {
+              longDescription = ''This library collects a host of common
+                                functions that can be used in linear algebraic
+                                computations.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/leighshepperson/exalgebra";
+            };
+          }
+      ) {};
+
+    exalgebra = exalgebra_0_0_4;
+
+    exalice_0_0_5_alpha = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          tirexs_0_8_0_beta5,
+          poison_2_1_0,
+          httpoison_0_8_2
+        }:
+          buildMix {
+            name = "exalice";
+            version = "0.0.5-alpha";
+            src = fetchHex {
+              pkg = "exalice";
+              version = "0.0.5-alpha";
+              sha256 =
+                "205bc2a86dce72fbcfb8cd30ecb4efebcdcff3d5f0c22c176db5bf4530b2820a";
+            };
+            beamDeps  = [ tirexs_0_8_0_beta5 poison_2_1_0 httpoison_0_8_2 ];
+
+            meta = {
+              description = ''ExAlice, a geocoder with swappable storage'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/kpanic/exalice";
+            };
+          }
+      ) {};
+
+    exalice = exalice_0_0_5_alpha;
+
     example_files_0_2_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -13662,6 +16044,29 @@ let
 
     exauth = exauth_0_0_1;
 
+    exbackoff_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exbackoff";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "exbackoff";
+              version = "0.0.3";
+              sha256 =
+                "dc3df168c73800c0978d732c121cd934ce2e5564d6addb953f8601e3010ae225";
+            };
+
+            meta = {
+              description = ''Simple exponential backoffs in Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mingchuno/exbackoff";
+            };
+          }
+      ) {};
+
+    exbackoff = exbackoff_0_0_3;
+
     exbouncer_0_0_1 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -13736,17 +16141,17 @@ let
 
     excellent = excellent_0_0_1;
 
-    excheck_0_3_2 = callPackage
+    excheck_0_3_3 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "excheck";
-            version = "0.3.2";
+            version = "0.3.3";
             src = fetchHex {
               pkg = "excheck";
-              version = "0.3.2";
+              version = "0.3.3";
               sha256 =
-                "138cf65d5ca716b94ff3368e6f089c855e59d95e503612399a231e68fc855484";
+                "3a3b9c163a1b0152df8f6b8fa019d4980d77e36dbe3c7ed3d508ef066ee9f870";
             };
 
             meta = {
@@ -13758,7 +16163,7 @@ let
           }
       ) {};
 
-    excheck = excheck_0_3_2;
+    excheck = excheck_0_3_3;
 
     excoap_0_0_1 = callPackage
       (
@@ -13783,17 +16188,17 @@ let
 
     excoap = excoap_0_0_1;
 
-    exconstructor_0_9_0 = callPackage
+    exconstructor_1_0_2 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "exconstructor";
-            version = "0.9.0";
+            version = "1.0.2";
             src = fetchHex {
               pkg = "exconstructor";
-              version = "0.9.0";
+              version = "1.0.2";
               sha256 =
-                "14af965ba0370d7808e16f8b2781b8a5ea3e42cf6c34012efe75e60b56b2dbbc";
+                "e8cd1c88d5ea044a340fed75deb1fda2edc71afaac157dce561288a6bf733035";
             };
 
             meta = {
@@ -13808,7 +16213,7 @@ let
           }
       ) {};
 
-    exconstructor = exconstructor_0_9_0;
+    exconstructor = exconstructor_1_0_2;
 
     excountries_0_0_3 = callPackage
       (
@@ -13837,7 +16242,7 @@ let
 
     excoveralls_0_5_1 = callPackage
       (
-        {  buildMix, fetchHex, hackney_1_4_8, exjsx_3_2_0 }:
+        {  buildMix, fetchHex, hackney_1_6_0, exjsx_3_2_0 }:
           buildMix {
             name = "excoveralls";
             version = "0.5.1";
@@ -13847,7 +16252,7 @@ let
               sha256 =
                 "26c8bb6dadc8436c1e0155f50327e90c91d6efab88468c09ac10f12be7070324";
             };
-            beamDeps  = [ hackney_1_4_8 exjsx_3_2_0 ];
+            beamDeps  = [ hackney_1_6_0 exjsx_3_2_0 ];
 
             meta = {
               description = ''Coverage report tool for Elixir with coveralls.io
@@ -13910,7 +16315,7 @@ let
 
     exdesk_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "exdesk";
             version = "0.2.0";
@@ -13920,7 +16325,7 @@ let
               sha256 =
                 "0c1e02bb4aef9075ff4affb3354c0e318dc3be1817faae8b450ef590c7d67688";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Desk.com client library for elixir.'';
@@ -13958,32 +16363,32 @@ let
 
     exdisque = exdisque_0_0_1;
 
-    exdjango_0_3_0 = callPackage
+    exdjango_0_3_1 = callPackage
       (
         {
           buildMix,
           fetchHex,
-          redix_0_3_4,
+          redix_0_3_6,
           poolboy_1_5_1,
           poison_1_0_3,
-          plug_1_1_1,
-          comeonin_2_1_1
+          plug_1_1_3,
+          comeonin_2_3_0
         }:
           buildMix {
             name = "exdjango";
-            version = "0.3.0";
+            version = "0.3.1";
             src = fetchHex {
               pkg = "exdjango";
-              version = "0.3.0";
+              version = "0.3.1";
               sha256 =
-                "62cf5e5870b28b4cdf25b0056897bb92ba3ed7b92d87c8083ebf820c35213ef6";
+                "ae7bb57e696d7e4ca5d05cac85afd67ccce611594f33a98c06a4922bdd44d6d6";
             };
             beamDeps  = [
-                          redix_0_3_4
+                          redix_0_3_6
                           poolboy_1_5_1
                           poison_1_0_3
-                          plug_1_1_1
-                          comeonin_2_1_1
+                          plug_1_1_3
+                          comeonin_2_3_0
                         ];
 
             meta = {
@@ -13994,7 +16399,7 @@ let
           }
       ) {};
 
-    exdjango = exdjango_0_3_0;
+    exdjango = exdjango_0_3_1;
 
     exdm_0_0_4 = callPackage
       (
@@ -14221,7 +16626,7 @@ let
 
     exfavicon_0_3_2 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1, floki_0_7_1 }:
+        {  buildMix, fetchHex, httpoison_0_8_2, floki_0_8_0 }:
           buildMix {
             name = "exfavicon";
             version = "0.3.2";
@@ -14231,7 +16636,7 @@ let
               sha256 =
                 "95503035ea2b6768c7d3fb8af9769830b9933b2579c7fdcfdd6b775e830213c2";
             };
-            beamDeps  = [ httpoison_0_8_1 floki_0_7_1 ];
+            beamDeps  = [ httpoison_0_8_2 floki_0_8_0 ];
 
             meta = {
               description = ''A exfavicon to detect a site`s favicon.'';
@@ -14243,25 +16648,25 @@ let
 
     exfavicon = exfavicon_0_3_2;
 
-    exfile_0_1_2 = callPackage
+    exfile_0_1_5 = callPackage
       (
         {
           buildMix,
           fetchHex,
           plug_1_0_3,
-          phoenix_html_2_5_0,
-          ecto_2_0_0_beta_0
+          phoenix_html_2_5_1,
+          ecto_2_0_0_beta_2
         }:
           buildMix {
             name = "exfile";
-            version = "0.1.2";
+            version = "0.1.5";
             src = fetchHex {
               pkg = "exfile";
-              version = "0.1.2";
+              version = "0.1.5";
               sha256 =
-                "bb0e2e1ef86017b3d6cbf6d6818abea153f194a50cc84f359146a348bcc61664";
+                "b2aee601b1db3ef5a8c5c638da287ec59153a21fb3b8bdbe0bd404d1e20696a1";
             };
-            beamDeps  = [ plug_1_0_3 phoenix_html_2_5_0 ecto_2_0_0_beta_0 ];
+            beamDeps  = [ plug_1_0_3 phoenix_html_2_5_1 ecto_2_0_0_beta_2 ];
 
             meta = {
               longDescription = ''File upload handling in Elixir and Plug.
@@ -14273,23 +16678,53 @@ let
           }
       ) {};
 
-    exfile = exfile_0_1_2;
-
-    exfile_b2_0_1_0 = callPackage
+    exfile_0_2_0 = callPackage
       (
         {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1, exfile_0_1_2
+          buildMix,
+          fetchHex,
+          plug_1_0_3,
+          phoenix_html_2_5_1,
+          ecto_2_0_0_beta_2
+        }:
+          buildMix {
+            name = "exfile";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "exfile";
+              version = "0.2.0";
+              sha256 =
+                "f5977fbb7037e17d93224abec4e46dde7b60a6ce8e37654167c9abfbeacaf274";
+            };
+            beamDeps  = [ plug_1_0_3 phoenix_html_2_5_1 ecto_2_0_0_beta_2 ];
+
+            meta = {
+              longDescription = ''File upload handling in Elixir and Plug.
+                                Supports pluggable processors and storage
+                                backends.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/keichan34/exfile";
+            };
+          }
+      ) {};
+
+    exfile = exfile_0_2_0;
+
+    exfile_b2_0_1_3 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, exfile_0_2_0
         }:
           buildMix {
             name = "exfile_b2";
-            version = "0.1.0";
+            version = "0.1.3";
             src = fetchHex {
               pkg = "exfile_b2";
-              version = "0.1.0";
+              version = "0.1.3";
               sha256 =
-                "62a58a3347387b00fdf666984b02b6b0c28fda0b60395eea08de3c7a21af61f5";
+                "f73e1d45279e9d279f2d8cb112a2d7e791ff0b129eea69252c22a6fc180a5106";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 exfile_0_1_2 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 exfile_0_2_0 ];
 
             meta = {
               description = ''A Backblaze B2 storage backend adapter for
@@ -14300,21 +16735,21 @@ let
           }
       ) {};
 
-    exfile_b2 = exfile_b2_0_1_0;
+    exfile_b2 = exfile_b2_0_1_3;
 
-    exfile_imagemagick_0_1_0 = callPackage
+    exfile_imagemagick_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex, exfile_0_1_2 }:
+        {  buildMix, fetchHex, exfile_0_2_0 }:
           buildMix {
             name = "exfile_imagemagick";
-            version = "0.1.0";
+            version = "0.1.1";
             src = fetchHex {
               pkg = "exfile_imagemagick";
-              version = "0.1.0";
+              version = "0.1.1";
               sha256 =
-                "ab290f8a7e43678dc2289cf38558562cc433c59d1ddf8859525e22f5e4033c49";
+                "be501b021d1d4a3603dbc6ed2223a81817ffb39bd51e0ee2a5314bd07f132695";
             };
-            beamDeps  = [ exfile_0_1_2 ];
+            beamDeps  = [ exfile_0_2_0 ];
 
             meta = {
               description = ''An ImageMagick file processor suite for
@@ -14325,11 +16760,11 @@ let
           }
       ) {};
 
-    exfile_imagemagick = exfile_imagemagick_0_1_0;
+    exfile_imagemagick = exfile_imagemagick_0_1_1;
 
     exfile_memory_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, exfile_0_1_2 }:
+        {  buildMix, fetchHex, exfile_0_1_5 }:
           buildMix {
             name = "exfile_memory";
             version = "0.1.0";
@@ -14339,7 +16774,7 @@ let
               sha256 =
                 "66330c408a73094d115227d0e16b936229721e16703197559a828bfb7795f9d7";
             };
-            beamDeps  = [ exfile_0_1_2 ];
+            beamDeps  = [ exfile_0_1_5 ];
 
             meta = {
               description = ''In-memory (ets) storage backend for Exfile.'';
@@ -14353,7 +16788,7 @@ let
 
     exfirebase_0_4_0 = callPackage
       (
-        {  buildMix, fetchHex, httpotion_2_2_0, exjsx_3_2_0 }:
+        {  buildMix, fetchHex, httpotion_2_2_2, exjsx_3_2_0 }:
           buildMix {
             name = "exfirebase";
             version = "0.4.0";
@@ -14363,7 +16798,7 @@ let
               sha256 =
                 "acd2f1fe87e83437a5d52b811b3e86bc75933bc29b0daa2da836a97ddd60b478";
             };
-            beamDeps  = [ httpotion_2_2_0 exjsx_3_2_0 ];
+            beamDeps  = [ httpotion_2_2_2 exjsx_3_2_0 ];
 
             meta = {
               description = ''An elixir library for accessing the Firebase REST
@@ -14376,19 +16811,19 @@ let
 
     exfirebase = exfirebase_0_4_0;
 
-    exfoaas_0_0_1 = callPackage
+    exfoaas_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
           buildMix {
             name = "exfoaas";
-            version = "0.0.1";
+            version = "0.0.2";
             src = fetchHex {
               pkg = "exfoaas";
-              version = "0.0.1";
+              version = "0.0.2";
               sha256 =
-                "ccfd3da421505d131a126d05d0def3ca99cdae6fec397956e4a5f1ee2bfae256";
+                "521f355f8c38c056f66cd8ac236f561c2a3502e451c07a88761e05c22c8848aa";
             };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_1 ];
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
 
             meta = {
               description = ''brings the utility of FOAAS to elixir.'';
@@ -14398,19 +16833,19 @@ let
           }
       ) {};
 
-    exfoaas = exfoaas_0_0_1;
+    exfoaas = exfoaas_0_0_2;
 
-    exfsm_0_0_3 = callPackage
+    exfsm_0_1_3 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "exfsm";
-            version = "0.0.3";
+            version = "0.1.3";
             src = fetchHex {
               pkg = "exfsm";
-              version = "0.0.3";
+              version = "0.1.3";
               sha256 =
-                "2da7b2b25f9603fc3142da3090abe85425f9852b89c230316fb6d29691ede6eb";
+                "6535a0565d6013ca728c10e11c9ac85216d995652892469f7380147da8c3d727";
             };
 
             meta = {
@@ -14423,7 +16858,7 @@ let
           }
       ) {};
 
-    exfsm = exfsm_0_0_3;
+    exfsm = exfsm_0_1_3;
 
     exfswatch_0_1_1 = callPackage
       (
@@ -14475,7 +16910,7 @@ let
 
     exgenius_0_0_5 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_2_0 }:
+        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_2_0 }:
           buildMix {
             name = "exgenius";
             version = "0.0.5";
@@ -14485,7 +16920,7 @@ let
               sha256 =
                 "f0f4463ac9ad79a102a1bf0ded91d77ed87ce262da6045990be51450ef240fd5";
             };
-            beamDeps  = [ httpoison_0_8_1 exjsx_3_2_0 ];
+            beamDeps  = [ httpoison_0_8_2 exjsx_3_2_0 ];
 
             meta = {
               longDescription = '' Elixir library for the (undocumented) Rap
@@ -14501,7 +16936,7 @@ let
 
     exgpg_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, uuid_0_1_5, porcelain_2_0_1 }:
+        {  buildMix, fetchHex, uuid_1_0_0, porcelain_2_0_1 }:
           buildMix {
             name = "exgpg";
             version = "0.0.3";
@@ -14511,7 +16946,7 @@ let
               sha256 =
                 "13499da2a59567f87f5293cc874ab1256e88089784645d997406d8f95978319a";
             };
-            beamDeps  = [ uuid_0_1_5 porcelain_2_0_1 ];
+            beamDeps  = [ uuid_1_0_0 porcelain_2_0_1 ];
 
             meta = {    };
           }
@@ -14545,7 +16980,7 @@ let
     exgrid_0_3_0 = callPackage
       (
         {
-          buildMix, fetchHex, timex_0_13_5, json_0_3_3, httpotion_1_0_0
+          buildMix, fetchHex, timex_0_13_5, json_0_3_3, httpotion_2_2_2
         }:
           buildMix {
             name = "exgrid";
@@ -14556,7 +16991,7 @@ let
               sha256 =
                 "96676dfc20b2e8c7caf5f68c202eada246f192d3246922be7214a0da0d219506";
             };
-            beamDeps  = [ timex_0_13_5 json_0_3_3 httpotion_1_0_0 ];
+            beamDeps  = [ timex_0_13_5 json_0_3_3 httpotion_2_2_2 ];
 
             meta = {
               description = ''Elixir bindings for SendGrid`s REST API'';
@@ -14568,25 +17003,25 @@ let
 
     exgrid = exgrid_0_3_0;
 
-    exhal_4_0_0 = callPackage
+    exhal_4_2_1 = callPackage
       (
         {
           buildMix,
           fetchHex,
           uri_template_1_2_0,
           poison_2_1_0,
-          httpoison_0_8_1
+          httpoison_0_8_2
         }:
           buildMix {
             name = "exhal";
-            version = "4.0.0";
+            version = "4.2.1";
             src = fetchHex {
               pkg = "exhal";
-              version = "4.0.0";
+              version = "4.2.1";
               sha256 =
-                "94a10116449d0c5dce43bddd0a96ed2dbefa032883841752a48129227ae4b426";
+                "5696572795d659441412e55600a3593d5d57828e0a3efcdc2c7985f9cdbe81a0";
             };
-            beamDeps  = [ uri_template_1_2_0 poison_2_1_0 httpoison_0_8_1 ];
+            beamDeps  = [ uri_template_1_2_0 poison_2_1_0 httpoison_0_8_2 ];
 
             meta = {
               description = ''Use HAL APIs with ease'';
@@ -14595,7 +17030,7 @@ let
           }
       ) {};
 
-    exhal = exhal_4_0_0;
+    exhal = exhal_4_2_1;
 
     exhcl_0_2_1 = callPackage
       (
@@ -14620,17 +17055,17 @@ let
 
     exhcl = exhcl_0_2_1;
 
-    exiban_0_0_3 = callPackage
+    exiban_0_0_4 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "exiban";
-            version = "0.0.3";
+            version = "0.0.4";
             src = fetchHex {
               pkg = "exiban";
-              version = "0.0.3";
+              version = "0.0.4";
               sha256 =
-                "98c2656de7ce4c27090f482704e7e915d9046c0a3c4545d7ae4b68986de776a8";
+                "c1d1da991db264ca99b9e9245bb09d69f6297050b18329be1e4c01d5106778b5";
             };
 
             meta = {
@@ -14642,19 +17077,43 @@ let
           }
       ) {};
 
-    exiban = exiban_0_0_3;
+    exiban = exiban_0_0_4;
 
-    exirc_0_9_2 = callPackage
+    exintercom_0_1_6 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_0_3, httpoison_0_8_2 }:
+          buildMix {
+            name = "exintercom";
+            version = "0.1.6";
+            src = fetchHex {
+              pkg = "exintercom";
+              version = "0.1.6";
+              sha256 =
+                "3e4e112dc29a36244b490bb6fb40c861be12e70a7723323520430059c3ffeb51";
+            };
+            beamDeps  = [ poison_1_0_3 httpoison_0_8_2 ];
+
+            meta = {
+              description = ''Intercom client library.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/versality/exintercom";
+            };
+          }
+      ) {};
+
+    exintercom = exintercom_0_1_6;
+
+    exirc_0_10_0 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "exirc";
-            version = "0.9.2";
+            version = "0.10.0";
             src = fetchHex {
               pkg = "exirc";
-              version = "0.9.2";
+              version = "0.10.0";
               sha256 =
-                "5b534e0a1bb3d54b57df9c8265d861e4dc3f3078c5483d7520b398458a1c6367";
+                "f2382ad3d97e791cc38ce54558296bb0afe7d222dc5f248ec72c6a0ca9c494a8";
             };
 
             meta = {
@@ -14665,7 +17124,7 @@ let
           }
       ) {};
 
-    exirc = exirc_0_9_2;
+    exirc = exirc_0_10_0;
 
     exjira_0_0_1 = callPackage
       (
@@ -14697,8 +17156,8 @@ let
           buildMix,
           fetchHex,
           sweet_xml_0_6_1,
-          httpoison_0_8_1,
-          ex_aws_0_4_17
+          httpoison_0_8_2,
+          ex_aws_0_4_18
         }:
           buildMix {
             name = "exjprop";
@@ -14709,7 +17168,7 @@ let
               sha256 =
                 "9fcc1e2e3e12f9f49b1b42cb97df917b5021933d962370dbe67557718a5adee0";
             };
-            beamDeps  = [ sweet_xml_0_6_1 httpoison_0_8_1 ex_aws_0_4_17 ];
+            beamDeps  = [ sweet_xml_0_6_1 httpoison_0_8_2 ex_aws_0_4_18 ];
 
             meta = {
               description = ''Elixir library for reading Java properties files
@@ -14748,7 +17207,7 @@ let
 
     exjsx_3_0_2 = callPackage
       (
-        {  buildMix, fetchHex, jsx_2_4_0 }:
+        {  buildMix, fetchHex, jsx_2_3_1 }:
           buildMix {
             name = "exjsx";
             version = "3.0.2";
@@ -14758,7 +17217,7 @@ let
               sha256 =
                 "2cd67240a54e9cd2616bc83c0c352d47f87bccd2ec599eceedc00bcbe9063f07";
             };
-            beamDeps  = [ jsx_2_4_0 ];
+            beamDeps  = [ jsx_2_3_1 ];
 
             meta = {
               description = ''json for elixir'';
@@ -14822,7 +17281,7 @@ let
           socket_0_2_8,
           poison_1_2_1,
           plug_0_8_4,
-          httpotion_1_0_0,
+          httpotion_2_2_2,
           cowboy_1_0_4
         }:
           buildMix {
@@ -14838,7 +17297,7 @@ let
                           socket_0_2_8
                           poison_1_2_1
                           plug_0_8_4
-                          httpotion_1_0_0
+                          httpotion_2_2_2
                           cowboy_1_0_4
                         ];
 
@@ -14852,19 +17311,19 @@ let
 
     exkad = exkad_0_0_2;
 
-    exkanji_0_2_5 = callPackage
+    exkanji_0_2_6 = callPackage
       (
-        {  buildMix, fetchHex, exromaji_0_2_8 }:
+        {  buildMix, fetchHex, exromaji_0_3_0 }:
           buildMix {
             name = "exkanji";
-            version = "0.2.5";
+            version = "0.2.6";
             src = fetchHex {
               pkg = "exkanji";
-              version = "0.2.5";
+              version = "0.2.6";
               sha256 =
-                "f88383523a4b01dbb534eb2f9f95b87cf75402b7a28962170e19919eb07f86a6";
+                "2de4907764e9f1f2c67d9bc6b49a44d50fd0cbc86b5848cbada14438616636d1";
             };
-            beamDeps  = [ exromaji_0_2_8 ];
+            beamDeps  = [ exromaji_0_3_0 ];
 
             meta = {
               longDescription = ''A Elixir library for translating between
@@ -14876,11 +17335,11 @@ let
           }
       ) {};
 
-    exkanji = exkanji_0_2_5;
+    exkanji = exkanji_0_2_6;
 
     exkismet_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "exkismet";
             version = "0.0.2";
@@ -14890,7 +17349,7 @@ let
               sha256 =
                 "3648f010eb80891b0195f9ced0e02a5a08860a9d96e8f7bbe328c68f27b85b64";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''A client (completely unofficial) for the
@@ -15139,7 +17598,7 @@ let
 
     exmoji = exmoji_0_2_2;
 
-    exns_0_3_1_beta = callPackage
+    exns_0_3_2_beta = callPackage
       (
         {
           buildMix,
@@ -15151,12 +17610,12 @@ let
         }:
           buildMix {
             name = "exns";
-            version = "0.3.1-beta";
+            version = "0.3.2-beta";
             src = fetchHex {
               pkg = "exns";
-              version = "0.3.1-beta";
+              version = "0.3.2-beta";
               sha256 =
-                "ac2042252d873f0449358628a83c49b80587017ed2962960bca0082809e74398";
+                "cc29b065ea9c346a14052e6ebe738fe93714ed936ef23d57b08786f968c4dc48";
             };
             beamDeps  = [ uuid_1_1_3 poolboy_1_5_1 poison_1_5_2 msgpax_0_8_2
                       ];
@@ -15170,7 +17629,7 @@ let
           }
       ) {};
 
-    exns = exns_0_3_1_beta;
+    exns = exns_0_3_2_beta;
 
     exnumerable_0_0_1 = callPackage
       (
@@ -15244,17 +17703,17 @@ let
 
     exnumterator = exnumterator_1_0_0;
 
-    exoddic_1_2_0 = callPackage
+    exoddic_1_3_1 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "exoddic";
-            version = "1.2.0";
+            version = "1.3.1";
             src = fetchHex {
               pkg = "exoddic";
-              version = "1.2.0";
+              version = "1.3.1";
               sha256 =
-                "84d79ad8365f9efb5de30afbe074d5360828b3780ff21dfd06d865a3d7773d2e";
+                "e244c4aab1a25836300973f8afd42aef41dea19121c748c4b6d7b447db842194";
             };
 
             meta = {
@@ -15265,7 +17724,7 @@ let
           }
       ) {};
 
-    exoddic = exoddic_1_2_0;
+    exoddic = exoddic_1_3_1;
 
     exometer_core_1_0_0 = callPackage
       (
@@ -15356,7 +17815,7 @@ let
 
     exparticle_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "exparticle";
             version = "0.0.2";
@@ -15366,7 +17825,7 @@ let
               sha256 =
                 "ce70b77da48e84307791af00143ad4b9677d39765459865976d459d3b1bdcaf2";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''ExParticle is an elixir client to communicate
@@ -15437,7 +17896,7 @@ let
     expinboard_0_0_1 = callPackage
       (
         {
-          buildMix, fetchHex, ibrowse_4_2_2, httpotion_2_1_0, exjsx_3_2_0
+          buildMix, fetchHex, ibrowse_4_2_2, httpotion_2_2_2, exjsx_3_2_0
         }:
           buildMix {
             name = "expinboard";
@@ -15448,7 +17907,7 @@ let
               sha256 =
                 "3ff152d837293c0f53ead6cba4180ced55308d2869faa698e459abbe23d59bdc";
             };
-            beamDeps  = [ ibrowse_4_2_2 httpotion_2_1_0 exjsx_3_2_0 ];
+            beamDeps  = [ ibrowse_4_2_2 httpotion_2_2_2 exjsx_3_2_0 ];
 
             meta = {
               description = ''A simple elixir pinboard client.'';
@@ -15483,17 +17942,17 @@ let
 
     expletive = expletive_0_1_4;
 
-    expool_0_1_0 = callPackage
+    expool_0_2_0 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "expool";
-            version = "0.1.0";
+            version = "0.2.0";
             src = fetchHex {
               pkg = "expool";
-              version = "0.1.0";
+              version = "0.2.0";
               sha256 =
-                "dfb6e81957a94080f33e8469c497102a36831d7fba4a902d895c3f82f5232060";
+                "f0cc61c365d1950522ad5816cf638353602db5a5d74feb7c96748dfa2b6f9d07";
             };
 
             meta = {
@@ -15504,7 +17963,30 @@ let
           }
       ) {};
 
-    expool = expool_0_1_0;
+    expool = expool_0_2_0;
+
+    export_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "export";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "export";
+              version = "0.0.2";
+              sha256 =
+                "f956aa84d18d089b9a8250d53ac6c8ecff3ea29313e661cbb19ed329762f2acb";
+            };
+
+            meta = {
+              description = ''Erlport wrapper for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/fazibear/export";
+            };
+          }
+      ) {};
+
+    export = export_0_0_2;
 
     expr_0_1_0 = callPackage
       (
@@ -15627,17 +18109,17 @@ let
           }
       ) {};
 
-    exprotobuf_1_0_0_rc1 = callPackage
+    exprotobuf_1_0_0 = callPackage
       (
         {  buildMix, fetchHex, gpb_3_18_10 }:
           buildMix {
             name = "exprotobuf";
-            version = "1.0.0-rc1";
+            version = "1.0.0";
             src = fetchHex {
               pkg = "exprotobuf";
-              version = "1.0.0-rc1";
+              version = "1.0.0";
               sha256 =
-                "e4cbf0bc2672e0d9fa3afe5acac8617a4e94443256d5fc19e5e7721681dd3eff";
+                "042cc4b2b3e9c13e6fcfd08e49043fa2640aa718e4d743404e1006a372bc2564";
             };
             beamDeps  = [ gpb_3_18_10 ];
 
@@ -15651,28 +18133,28 @@ let
           }
       ) {};
 
-    exprotobuf = exprotobuf_1_0_0_rc1;
+    exprotobuf = exprotobuf_1_0_0;
 
-    exq_0_6_4 = callPackage
+    exq_0_6_5 = callPackage
       (
         {
           buildMix,
           fetchHex,
           uuid_1_1_3,
-          timex_1_0_1,
-          redix_0_3_4,
+          timex_2_1_3,
+          redix_0_3_6,
           poison_2_1_0
         }:
           buildMix {
             name = "exq";
-            version = "0.6.4";
+            version = "0.6.5";
             src = fetchHex {
               pkg = "exq";
-              version = "0.6.4";
+              version = "0.6.5";
               sha256 =
-                "24b75a33da51ea3f3561a127237dbefa5b82d2ff478eb9591314644d89bc8c95";
+                "bacb92950e9c01532c9467dc7b4f7d930d8a70ef8d7b9797237aac6f0b608ba2";
             };
-            beamDeps  = [ uuid_1_1_3 timex_1_0_1 redix_0_3_4 poison_2_1_0 ];
+            beamDeps  = [ uuid_1_1_3 timex_2_1_3 redix_0_3_6 poison_2_1_0 ];
 
             meta = {
               longDescription = ''Exq is a job processing library compatible
@@ -15684,21 +18166,21 @@ let
           }
       ) {};
 
-    exq = exq_0_6_4;
+    exq = exq_0_6_5;
 
-    exq_ui_0_6_4 = callPackage
+    exq_ui_0_6_5 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, exq_0_6_4, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, plug_1_1_3, exq_0_6_5, cowboy_1_0_4 }:
           buildMix {
             name = "exq_ui";
-            version = "0.6.4";
+            version = "0.6.5";
             src = fetchHex {
               pkg = "exq_ui";
-              version = "0.6.4";
+              version = "0.6.5";
               sha256 =
-                "6072838b9161e8b036466dd8fb21ea99fd93beb2488d76f3d6561211eac36b71";
+                "88763e802738438d54e3b33966e2544832ed2d8215497c9c63b08d8c7199b7f3";
             };
-            beamDeps  = [ plug_1_1_1 exq_0_6_4 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_3 exq_0_6_5 cowboy_1_0_4 ];
 
             meta = {
               longDescription = ''Exq UI is the UI component for Exq, a job
@@ -15710,7 +18192,7 @@ let
           }
       ) {};
 
-    exq_ui = exq_ui_0_6_4;
+    exq_ui = exq_ui_0_6_5;
 
     exql_0_0_3 = callPackage
       (
@@ -15811,7 +18293,7 @@ let
 
     exrecaptcha_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, httpotion_1_0_0 }:
+        {  buildMix, fetchHex, httpotion_2_2_2 }:
           buildMix {
             name = "exrecaptcha";
             version = "0.0.3";
@@ -15821,7 +18303,7 @@ let
               sha256 =
                 "2df1a9e868d3adc31a657755df04fabc9c9e7d12f56cbcc86b27f670dcd962b5";
             };
-            beamDeps  = [ httpotion_1_0_0 ];
+            beamDeps  = [ httpotion_2_2_2 ];
 
             meta = {
               longDescription = ''Simple ReCaptcha display/verify code for
@@ -15859,6 +18341,53 @@ let
 
     exredis = exredis_0_2_3;
 
+    exref_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "exref";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "exref";
+              version = "0.1.0";
+              sha256 =
+                "19597fbdd563e447608d5f3a43171c29cde4e0462f5163314cc1db74ccef2f65";
+            };
+
+            meta = {
+              description = ''Damn simple mix integration of xref.'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    exref = exref_0_1_0;
+
+    exrequester_0_5_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpotion_2_2_2 }:
+          buildMix {
+            name = "exrequester";
+            version = "0.5.2";
+            src = fetchHex {
+              pkg = "exrequester";
+              version = "0.5.2";
+              sha256 =
+                "9c55974b2f9a4294dd9a53ebed8f9b1c2788cd0845dccbc9471cf6869201903a";
+            };
+            beamDeps  = [ poison_1_5_2 httpotion_2_2_2 ];
+
+            meta = {
+              description = ''Quickly create API clients using module
+                            attributes.'';
+
+              homepage = "https://github.com/oarrabi/exrequester";
+            };
+          }
+      ) {};
+
+    exrequester = exrequester_0_5_2;
+
     exrethinkdb_0_0_3 = callPackage
       (
         {  buildRebar3, fetchHex, poison_1_4_0 }:
@@ -15884,19 +18413,43 @@ let
 
     exrethinkdb = exrethinkdb_0_0_3;
 
-    exrm_0_15_1 = callPackage
+    exrm_0_14_17 = callPackage
       (
-        {  buildMix, fetchHex, conform_0_13_0 }:
+        {  buildMix, fetchHex, conform_0_11_0 }:
           buildMix {
             name = "exrm";
-            version = "0.15.1";
+            version = "0.14.17";
             src = fetchHex {
               pkg = "exrm";
-              version = "0.15.1";
+              version = "0.14.17";
               sha256 =
-                "ed2227e8b189af4deca0f1b637fdfe9514b817128f6c2b007ccb05c65d49f132";
+                "c5b0c2bd4bad44d2f67f5ec720e5a4cff829dfac234aa79056970f83236bb976";
             };
-            beamDeps  = [ conform_0_13_0 ];
+            beamDeps  = [ conform_0_11_0 ];
+
+            meta = {
+              longDescription = ''Exrm, or Elixir Release Manager, provides mix
+                                tasks for building, upgrading, and controlling
+                                release packages for your application.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitwalker/exrm";
+            };
+          }
+      ) {};
+
+    exrm_0_14_2 = callPackage
+      (
+        {  buildMix, fetchHex, conform_0_10_5 }:
+          buildMix {
+            name = "exrm";
+            version = "0.14.2";
+            src = fetchHex {
+              pkg = "exrm";
+              version = "0.14.2";
+              sha256 =
+                "ff70905672059035bfa62a3bb0043809724c6a852050eac52faa06aeb65855c0";
+            };
+            beamDeps  = [ conform_0_10_5 ];
 
             meta = {
               longDescription = ''Exrm, or Elixir Release Manager, provides mix
@@ -15910,7 +18463,7 @@ let
 
     exrm_0_18_8 = callPackage
       (
-        {  buildMix, fetchHex, relx_3_3_1, conform_0_16_0 }:
+        {  buildMix, fetchHex, relx_3_3_2, conform_0_16_0 }:
           buildMix {
             name = "exrm";
             version = "0.18.8";
@@ -15920,7 +18473,7 @@ let
               sha256 =
                 "a8aa031d824f882a762404bc19b6fbe6c10703941097a6ef8bb93a62cc987e22";
             };
-            beamDeps  = [ relx_3_3_1 conform_0_16_0 ];
+            beamDeps  = [ relx_3_3_2 conform_0_16_0 ];
 
             meta = {
               longDescription = ''Exrm, or Elixir Release Manager, provides mix
@@ -15956,19 +18509,19 @@ let
           }
       ) {};
 
-    exrm_1_0_0_rc8 = callPackage
+    exrm_1_0_3 = callPackage
       (
-        {  buildMix, fetchHex, relx_3_17_0 }:
+        {  buildMix, fetchHex, relx_3_18_0 }:
           buildMix {
             name = "exrm";
-            version = "1.0.0-rc8";
+            version = "1.0.3";
             src = fetchHex {
               pkg = "exrm";
-              version = "1.0.0-rc8";
+              version = "1.0.3";
               sha256 =
-                "f4bc906713eb57e9ac7c4bf16aa218cbb437b3392f2183eb3057e8f6921fa8fa";
+                "22ce83a1ffab133ebc94cef871d830971ca0b2f9df3ba44caa8f7eadb13bbe3b";
             };
-            beamDeps  = [ relx_3_17_0 ];
+            beamDeps  = [ relx_3_18_0 ];
 
             meta = {
               longDescription = ''Exrm, or Elixir Release Manager, provides mix
@@ -15980,11 +18533,49 @@ let
           }
       ) {};
 
-    exrm = exrm_1_0_0_rc8;
+    exrm = exrm_1_0_3;
+
+    exrm_deb_0_0_5 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          vex_0_5_5,
+          timex_1_0_2,
+          exrm_1_0_3,
+          ex_doc_0_11_4,
+          earmark_0_2_1
+        }:
+          buildMix {
+            name = "exrm_deb";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "exrm_deb";
+              version = "0.0.5";
+              sha256 =
+                "b74c80e7c25750f78c4fefc75e8df66356d235d2c038751037ae60dad0ac7fc3";
+            };
+            beamDeps  = [
+                          vex_0_5_5
+                          timex_1_0_2
+                          exrm_1_0_3
+                          ex_doc_0_11_4
+                          earmark_0_2_1
+                        ];
+
+            meta = {
+              description = ''Create a deb for your elixir release with ease'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/johnhamelink/exrm_deb";
+            };
+          }
+      ) {};
+
+    exrm_deb = exrm_deb_0_0_5;
 
     exrm_heroku_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex, exrm_1_0_0_rc8 }:
+        {  buildMix, fetchHex, exrm_1_0_3 }:
           buildMix {
             name = "exrm_heroku";
             version = "0.1.1";
@@ -15994,7 +18585,7 @@ let
               sha256 =
                 "19fc16f1cfcc1c86bc64796a287028b8a8d951f7737024893c1772ba658da76d";
             };
-            beamDeps  = [ exrm_1_0_0_rc8 ];
+            beamDeps  = [ exrm_1_0_3 ];
 
             meta = {
               description = ''Publish Elixir releases created with exrm release
@@ -16009,7 +18600,7 @@ let
 
     exrm_rpm_0_3_0 = callPackage
       (
-        {  buildMix, fetchHex, exrm_0_15_1 }:
+        {  buildMix, fetchHex, exrm_0_14_2 }:
           buildMix {
             name = "exrm_rpm";
             version = "0.3.0";
@@ -16019,7 +18610,7 @@ let
               sha256 =
                 "28c2339fac5073d615fb4a52816dd4fc56c9da2db9e71846b0affdf171643044";
             };
-            beamDeps  = [ exrm_0_15_1 ];
+            beamDeps  = [ exrm_0_14_2 ];
 
             meta = {
               longDescription = ''Adds simple Red Hat Package Manager (RPM)
@@ -16035,17 +18626,17 @@ let
 
     exrm_rpm = exrm_rpm_0_3_0;
 
-    exromaji_0_2_8 = callPackage
+    exromaji_0_3_0 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "exromaji";
-            version = "0.2.8";
+            version = "0.3.0";
             src = fetchHex {
               pkg = "exromaji";
-              version = "0.2.8";
+              version = "0.3.0";
               sha256 =
-                "c402dc57b246ba09a93612e2ac715e013d063eada3f1a88bfe89ad59ecff23db";
+                "d1b820b3de05bb3729b3b1d8b3e22ee965899a90abbec44ed6d18507a5f174d3";
             };
 
             meta = {
@@ -16057,7 +18648,7 @@ let
           }
       ) {};
 
-    exromaji = exromaji_0_2_8;
+    exromaji = exromaji_0_3_0;
 
     exrun_0_1_1 = callPackage
       (
@@ -16132,7 +18723,7 @@ let
 
     exseed_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, ecto_2_0_0_beta_0 }:
+        {  buildMix, fetchHex, ecto_2_0_0_beta_2 }:
           buildMix {
             name = "exseed";
             version = "0.0.3";
@@ -16142,7 +18733,7 @@ let
               sha256 =
                 "d5f42ed419c9f1d5d179dc93fdf6a58344b07055764498f222f07f95cb82dd98";
             };
-            beamDeps  = [ ecto_2_0_0_beta_0 ];
+            beamDeps  = [ ecto_2_0_0_beta_2 ];
 
             meta = {
               description = ''A library that provides a simple DSL for seeding
@@ -16155,35 +18746,35 @@ let
 
     exseed = exseed_0_0_3;
 
-    exsentry_0_2_1 = callPackage
+    exsentry_0_3_0 = callPackage
       (
         {
           buildMix,
           fetchHex,
           uuid_1_1_3,
-          timex_1_0_1,
-          poison_1_5_2,
-          plug_1_1_1,
+          timex_2_1_3,
+          poison_1_0_3,
+          plug_1_1_3,
           ibrowse_4_2_2,
-          httpotion_2_2_0,
+          httpotion_2_2_2,
           fuzzyurl_0_8_1
         }:
           buildMix {
             name = "exsentry";
-            version = "0.2.1";
+            version = "0.3.0";
             src = fetchHex {
               pkg = "exsentry";
-              version = "0.2.1";
+              version = "0.3.0";
               sha256 =
-                "3feebb7a00f9fac19c989214bf15131d540e1e88c27286c46b3083c4f85972fb";
+                "0cc5b035b58a95e3361de9417a3ab61bf055d02fc3273b048011dcba7f2a515c";
             };
             beamDeps  = [
                           uuid_1_1_3
-                          timex_1_0_1
-                          poison_1_5_2
-                          plug_1_1_1
+                          timex_2_1_3
+                          poison_1_0_3
+                          plug_1_1_3
                           ibrowse_4_2_2
-                          httpotion_2_2_0
+                          httpotion_2_2_2
                           fuzzyurl_0_8_1
                         ];
 
@@ -16196,11 +18787,11 @@ let
           }
       ) {};
 
-    exsentry = exsentry_0_2_1;
+    exsentry = exsentry_0_3_0;
 
     exstatic_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1 }:
+        {  buildMix, fetchHex, plug_1_1_3 }:
           buildMix {
             name = "exstatic";
             version = "0.1.0";
@@ -16210,7 +18801,7 @@ let
               sha256 =
                 "e063b91c0b2995e4a1a2c1aa56cdd578374320a8755844cc6471b58fa3874d0d";
             };
-            beamDeps  = [ plug_1_1_1 ];
+            beamDeps  = [ plug_1_1_3 ];
 
             meta = {
               longDescription = ''Serve static files from memory in the Phoenix
@@ -16301,29 +18892,29 @@ let
 
     exsyslog = exsyslog_1_0_1;
 
-    extreme_0_4_3 = callPackage
+    extreme_0_5_0 = callPackage
       (
         {
           buildMix,
           fetchHex,
           uuid_1_1_3,
           poison_1_5_2,
-          httpoison_0_8_1,
+          httpoison_0_8_2,
           exprotobuf_0_10_2
         }:
           buildMix {
             name = "extreme";
-            version = "0.4.3";
+            version = "0.5.0";
             src = fetchHex {
               pkg = "extreme";
-              version = "0.4.3";
+              version = "0.5.0";
               sha256 =
-                "db08580b4b839be7bf3f6198efc7de02c22a3688f46ce32deca983db74f1e330";
+                "ddbc42891e2d16a5d204939809e35236968c6bc06d4adab7027f8635fec222ab";
             };
             beamDeps  = [
                           uuid_1_1_3
                           poison_1_5_2
-                          httpoison_0_8_1
+                          httpoison_0_8_2
                           exprotobuf_0_10_2
                         ];
 
@@ -16335,21 +18926,21 @@ let
           }
       ) {};
 
-    extreme = extreme_0_4_3;
+    extreme = extreme_0_5_0;
 
-    extripe_0_2_0 = callPackage
+    extripe_0_3_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
           buildMix {
             name = "extripe";
-            version = "0.2.0";
+            version = "0.3.2";
             src = fetchHex {
               pkg = "extripe";
-              version = "0.2.0";
+              version = "0.3.2";
               sha256 =
-                "70cccdf79565d34ab4df68d89e22cfe574b2fe64b631303c496e27f83e798491";
+                "4df5dd859ad780bdb4dc0d1c823a8df82cf7421037f1ed40adf20b426d6729a1";
             };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_1 ];
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
 
             meta = {
               description = ''Stripe API wrapper'';
@@ -16359,7 +18950,7 @@ let
           }
       ) {};
 
-    extripe = extripe_0_2_0;
+    extripe = extripe_0_3_2;
 
     exts_0_2_2 = callPackage
       (
@@ -16384,19 +18975,19 @@ let
 
     exts = exts_0_2_2;
 
-    extwitter_0_6_2 = callPackage
+    extwitter_0_7_0 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_1, poison_1_5_2 }:
+        {  buildMix, fetchHex, poison_1_5_2 }:
           buildMix {
             name = "extwitter";
-            version = "0.6.2";
+            version = "0.7.0";
             src = fetchHex {
               pkg = "extwitter";
-              version = "0.6.2";
+              version = "0.7.0";
               sha256 =
-                "dd5ea2b6c9f99e167024b3ec6fb97f4803f39521229771ae001f7b44ed572f76";
+                "15fca145977192f315382d51258324ffd1862161deb586c67aaf0a205ca3cc73";
             };
-            beamDeps  = [ timex_1_0_1 poison_1_5_2 ];
+            beamDeps  = [ poison_1_5_2 ];
 
             meta = {
               description = ''Twitter client library for elixir.'';
@@ -16406,7 +18997,7 @@ let
           }
       ) {};
 
-    extwitter = extwitter_0_6_2;
+    extwitter = extwitter_0_7_0;
 
     exurban_0_0_1 = callPackage
       (
@@ -16438,8 +19029,8 @@ let
           buildMix,
           fetchHex,
           meck_0_8_4,
-          httpotion_1_0_0,
-          httpoison_0_8_1,
+          httpotion_2_2_2,
+          httpoison_0_8_2,
           exjsx_3_2_0,
           exactor_2_2_0
         }:
@@ -16454,8 +19045,8 @@ let
             };
             beamDeps  = [
                           meck_0_8_4
-                          httpotion_1_0_0
-                          httpoison_0_8_1
+                          httpotion_2_2_2
+                          httpoison_0_8_2
                           exjsx_3_2_0
                           exactor_2_2_0
                         ];
@@ -16469,30 +19060,30 @@ let
           }
       ) {};
 
-    exvcr_0_7_1 = callPackage
+    exvcr_0_7_2 = callPackage
       (
         {
           buildMix,
           fetchHex,
           meck_0_8_4,
-          httpotion_2_2_0,
-          httpoison_0_8_1,
+          httpotion_2_2_2,
+          httpoison_0_8_2,
           exjsx_3_2_0,
           exactor_2_2_0
         }:
           buildMix {
             name = "exvcr";
-            version = "0.7.1";
+            version = "0.7.2";
             src = fetchHex {
               pkg = "exvcr";
-              version = "0.7.1";
+              version = "0.7.2";
               sha256 =
-                "e894995695be15a546c1acf09d87967b078e0f6bc0a2be540d226c8ae40b161d";
+                "8e5feda0b2a9d2f2305bc68c76286cad73a1ecd9638038691cc17e378e321016";
             };
             beamDeps  = [
                           meck_0_8_4
-                          httpotion_2_2_0
-                          httpoison_0_8_1
+                          httpotion_2_2_2
+                          httpoison_0_8_2
                           exjsx_3_2_0
                           exactor_2_2_0
                         ];
@@ -16506,12 +19097,12 @@ let
           }
       ) {};
 
-    exvcr = exvcr_0_7_1;
+    exvcr = exvcr_0_7_2;
 
     exyelp_0_0_2 = callPackage
       (
         {
-          buildMix, fetchHex, poison_2_1_0, oauther_1_0_2, httpoison_0_8_1
+          buildMix, fetchHex, poison_2_1_0, oauther_1_0_2, httpoison_0_8_2
         }:
           buildMix {
             name = "exyelp";
@@ -16522,7 +19113,7 @@ let
               sha256 =
                 "1be8553ea0369a092eac1b6a0b47652b7c0570911483aa3ca454bef05ddd4d5d";
             };
-            beamDeps  = [ poison_2_1_0 oauther_1_0_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_2_1_0 oauther_1_0_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''An Elixir Yelp API client'';
@@ -16558,17 +19149,17 @@ let
 
     exyz = exyz_1_0_0;
 
-    eye_drops_1_1_0 = callPackage
+    eye_drops_1_0_1 = callPackage
       (
         {  buildMix, fetchHex, fs_0_9_2 }:
           buildMix {
             name = "eye_drops";
-            version = "1.1.0";
+            version = "1.0.1";
             src = fetchHex {
               pkg = "eye_drops";
-              version = "1.1.0";
+              version = "1.0.1";
               sha256 =
-                "e1ed246cd35d0b58798fdec5cca8066d9251cc37251f298e531d8163dbc11332";
+                "4b57c4e6ec58e8e278c5dd2849ad248ccbf1cb9c340476cfebb7ac31e1bbe85d";
             };
             beamDeps  = [ fs_0_9_2 ];
 
@@ -16582,7 +19173,31 @@ let
           }
       ) {};
 
-    eye_drops = eye_drops_1_1_0;
+    eye_drops_1_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, fs_0_9_2 }:
+          buildMix {
+            name = "eye_drops";
+            version = "1.2.0";
+            src = fetchHex {
+              pkg = "eye_drops";
+              version = "1.2.0";
+              sha256 =
+                "0e0fe7ccf1fc4208ae0811c60a0f0d1e37ef9a60dfaefc8ff235a8be51fa9ae7";
+            };
+            beamDeps  = [ fs_0_9_2 ];
+
+            meta = {
+              longDescription = ''A configurable mix task to watch file changes
+                                Watch file changes in a project and run the
+                                corresponding command when a change happens.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rkotze/eye_drops";
+            };
+          }
+      ) {};
+
+    eye_drops = eye_drops_1_2_0;
 
     ezcryptex_0_0_1 = callPackage
       (
@@ -16636,8 +19251,10 @@ let
 
     ezmq_0_2_0 = callPackage
       (
-        {  buildRebar3, fetchHex, lager_3_0_1, gen_listener_tcp_0_3_2 }:
-          buildRebar3 {
+        {
+          buildErlangMk, fetchHex, lager_2_1_1, gen_listener_tcp_0_3_2
+        }:
+          buildErlangMk {
             name = "ezmq";
             version = "0.2.0";
             src = fetchHex {
@@ -16646,8 +19263,7 @@ let
               sha256 =
                 "bc804ffded0b0d0f684d4313ad3fa676479df962c584daaf5aa14ada5b86a52b";
             };
-
-            beamDeps  = [ lager_3_0_1 gen_listener_tcp_0_3_2 ];
+            beamDeps  = [ lager_2_1_1 gen_listener_tcp_0_3_2 ];
 
             meta = {
               description = ''Native Erlang 0MQ implementation'';
@@ -16659,21 +19275,21 @@ let
 
     ezmq = ezmq_0_2_0;
 
-    facebook_0_4_1 = callPackage
+    facebook_0_4_2 = callPackage
       (
         {
-          buildMix, fetchHex, libex_config_0_2_0, json_0_3_3, hackney_1_4_8
+          buildMix, fetchHex, libex_config_0_2_0, json_0_3_3, hackney_1_6_0
         }:
           buildMix {
             name = "facebook";
-            version = "0.4.1";
+            version = "0.4.2";
             src = fetchHex {
               pkg = "facebook";
-              version = "0.4.1";
+              version = "0.4.2";
               sha256 =
-                "f5583fe383f8a2b421f91ddbc9beccc9626527e96ec3502c723cc99e1c47e863";
+                "033147d8ae278172ea7fb6fd445bdd6288fb06a8479b9f0e0ae376acc1efdad6";
             };
-            beamDeps  = [ libex_config_0_2_0 json_0_3_3 hackney_1_4_8 ];
+            beamDeps  = [ libex_config_0_2_0 json_0_3_3 hackney_1_6_0 ];
 
             meta = {
               longDescription = ''Facebook Graph API Wrapper written in Elixir.
@@ -16686,7 +19302,7 @@ let
           }
       ) {};
 
-    facebook = facebook_0_4_1;
+    facebook = facebook_0_4_2;
 
     factory_girl_elixir_0_1_1 = callPackage
       (
@@ -16712,6 +19328,30 @@ let
 
     factory_girl_elixir = factory_girl_elixir_0_1_1;
 
+    fake_cas_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4, bypass_0_5_1 }:
+          buildMix {
+            name = "fake_cas";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "fake_cas";
+              version = "1.0.1";
+              sha256 =
+                "bb3522de447f7a3d84ced7b55e83b9ce72ce7c509581ed87ab26264fb39aafe5";
+            };
+            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 bypass_0_5_1 ];
+
+            meta = {
+              description = ''A Cas server stub'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rhruiz/elixir-fake_cas";
+            };
+          }
+      ) {};
+
+    fake_cas = fake_cas_1_0_1;
+
     faker_0_6_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -16762,17 +19402,17 @@ let
 
     fast_tls = fast_tls_1_0_1;
 
-    fast_xml_1_1_3 = callPackage
+    fast_xml_1_1_11 = callPackage
       (
         {  buildRebar3, fetchHex, p1_utils_1_0_3 }:
           buildRebar3 {
             name = "fast_xml";
-            version = "1.1.3";
+            version = "1.1.11";
             src = fetchHex {
               pkg = "fast_xml";
-              version = "1.1.3";
+              version = "1.1.11";
               sha256 =
-                "ea1abe9cdfa0df67178378ba5ec11e746023b66bc1ed0f980ae69d2aa1f732c3";
+                "58ad965b6e6913a7cc488552bb30a17d029a44c6b1a17f369870cd911ada46b8";
             };
             compilePorts = true;
             beamDeps  = [ p1_utils_1_0_3 ];
@@ -16786,19 +19426,19 @@ let
           }
       ) {};
 
-    fast_xml = fast_xml_1_1_3;
+    fast_xml = fast_xml_1_1_11;
 
-    fast_yaml_1_0_2 = callPackage
+    fast_yaml_1_0_3 = callPackage
       (
         {  buildRebar3, fetchHex, p1_utils_1_0_3 }:
           buildRebar3 {
             name = "fast_yaml";
-            version = "1.0.2";
+            version = "1.0.3";
             src = fetchHex {
               pkg = "fast_yaml";
-              version = "1.0.2";
+              version = "1.0.3";
               sha256 =
-                "2f2034d6003425b02619ba15658665134cfd81e3d1c9379c268f802a5775086d";
+                "f2b2258dfb98ba69c16005d3944582994f2b83f830b717858a5d6807497274ba";
             };
             compilePorts = true;
             beamDeps  = [ p1_utils_1_0_3 ];
@@ -16811,11 +19451,34 @@ let
           }
       ) {};
 
-    fast_yaml = fast_yaml_1_0_2;
+    fast_yaml = fast_yaml_1_0_3;
+
+    faust_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "faust";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "faust";
+              version = "0.1.0";
+              sha256 =
+                "0ab347a6f377a97e621db0f659841436d6dbb31f1b7c8309e3fb543bec0c473e";
+            };
+
+            meta = {
+              description = ''A Markov chain text generator for Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/jquadrin/faust";
+            };
+          }
+      ) {};
+
+    faust = faust_0_1_0;
 
     favicon_0_0_7 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_7_5, floki_0_7_1 }:
+        {  buildMix, fetchHex, httpoison_0_7_5, floki_0_8_0 }:
           buildMix {
             name = "favicon";
             version = "0.0.7";
@@ -16825,7 +19488,7 @@ let
               sha256 =
                 "b9a577d3d22a6e51843eb334b87de512f48a548d7a7edf56e178e0dde420ba0e";
             };
-            beamDeps  = [ httpoison_0_7_5 floki_0_7_1 ];
+            beamDeps  = [ httpoison_0_7_5 floki_0_8_0 ];
 
             meta = {
               description = ''A library that fetches the favicon url for a
@@ -16864,6 +19527,31 @@ let
 
     fdg = fdg_0_0_4;
 
+    feature_toggler_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, exredis_0_2_3 }:
+          buildMix {
+            name = "feature_toggler";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "feature_toggler";
+              version = "0.0.1";
+              sha256 =
+                "dac607aa67971e87b9d8fb8eb3057246d4480c99e11951faa1ed9f204b7f48ae";
+            };
+            beamDeps  = [ exredis_0_2_3 ];
+
+            meta = {
+              description = ''This is a simple feature toggler/switch with
+                            redis database written in elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/aravindgd/feature_toggler";
+            };
+          }
+      ) {};
+
+    feature_toggler = feature_toggler_0_0_1;
+
     feeder_1_4_7 = callPackage
       (
         {  buildRebar3, fetchHex }:
@@ -16934,6 +19622,32 @@ let
 
     feeder_ex = feeder_ex_0_0_2;
 
+    feederer_0_5_6 = callPackage
+      (
+        {  buildMix, fetchHex, poolboy_1_5_1 }:
+          buildMix {
+            name = "feederer";
+            version = "0.5.6";
+            src = fetchHex {
+              pkg = "feederer";
+              version = "0.5.6";
+              sha256 =
+                "07e25464b14b9263b343602b649bb9680764481b1dfe64270dcef5c83321522c";
+            };
+            beamDeps  = [ poolboy_1_5_1 ];
+
+            meta = {
+              longDescription = ''Parses XML syndication feeds such as RSS,
+                                Atom, etc. Elixir feedparser wrapper using
+                                erlport.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/draftli/feederer";
+            };
+          }
+      ) {};
+
+    feederer = feederer_0_5_6;
+
     feedistiller_2_0_2 = callPackage
       (
         {
@@ -16972,7 +19686,7 @@ let
 
     feedlex_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_3_1, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_3_1, httpoison_0_8_2 }:
           buildMix {
             name = "feedlex";
             version = "0.0.1";
@@ -16982,7 +19696,7 @@ let
               sha256 =
                 "1f20033824f816d6904837601c14bdffcf1a56a53b8ed7d7916a67e48e53b4a5";
             };
-            beamDeps  = [ poison_1_3_1 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_3_1 httpoison_0_8_2 ];
 
             meta = {
               longDescription = ''Feedly RSS reader client for Elixir
@@ -17046,19 +19760,19 @@ let
 
     feedparser = feedparser_0_0_3;
 
-    fernet_ecto_0_0_4 = callPackage
+    fernet_ecto_0_0_5 = callPackage
       (
-        {  buildMix, fetchHex, ecto_1_1_3 }:
+        {  buildMix, fetchHex, fernetex_0_0_2, ecto_1_1_5 }:
           buildMix {
             name = "fernet_ecto";
-            version = "0.0.4";
+            version = "0.0.5";
             src = fetchHex {
               pkg = "fernet_ecto";
-              version = "0.0.4";
+              version = "0.0.5";
               sha256 =
-                "22a9ab7a7fd1347620ba5dd9e128eae1e97d6403b0ee90a289580c2cb386e1c0";
+                "d4f9d0c6ffda955b9a1870bfc525def01fb65fef0bb3c4ed739ce5bbfbb98cda";
             };
-            beamDeps  = [ ecto_1_1_3 ];
+            beamDeps  = [ fernetex_0_0_2 ecto_1_1_5 ];
 
             meta = {
               description = ''Fernet-encrypted fields for Ecto'';
@@ -17068,21 +19782,21 @@ let
           }
       ) {};
 
-    fernet_ecto = fernet_ecto_0_0_4;
+    fernet_ecto = fernet_ecto_0_0_5;
 
-    fernetex_0_0_1 = callPackage
+    fernetex_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, timex_0_19_5, json_0_3_3 }:
+        {  buildMix, fetchHex, timex_1_0_2 }:
           buildMix {
             name = "fernetex";
-            version = "0.0.1";
+            version = "0.0.2";
             src = fetchHex {
               pkg = "fernetex";
-              version = "0.0.1";
+              version = "0.0.2";
               sha256 =
-                "0e386a7d783329a2742398e987b0584ca448b22b27ccfc857eab1b0752178714";
+                "a6d052384397defe780d3551a16b8b639dba6f89aeea7a6984ecadf44501cfc9";
             };
-            beamDeps  = [ timex_0_19_5 json_0_3_3 ];
+            beamDeps  = [ timex_1_0_2 ];
 
             meta = {
               description = ''Elixir implementation of Fernet library based on
@@ -17093,7 +19807,38 @@ let
           }
       ) {};
 
-    fernetex = fernetex_0_0_1;
+    fernetex = fernetex_0_0_2;
+
+    fifo_db_0_2_1 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          lager_3_0_2,
+          erocksdb_0_4_1,
+          eleveldb_2_1_3
+        }:
+          buildRebar3 {
+            name = "fifo_db";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "fifo_db";
+              version = "0.2.1";
+              sha256 =
+                "c712ec4dba2b6c358f44196b7bddb2f93ce7a61db2ce1b28d45ebe872e8bc207";
+            };
+
+            beamDeps  = [ lager_3_0_2 erocksdb_0_4_1 eleveldb_2_1_3 ];
+
+            meta = {
+              description = ''Project-FiFo db wrapper'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/project-fifo/fifo_db";
+            };
+          }
+      ) {};
+
+    fifo_db = fifo_db_0_2_1;
 
     fifo_dt_0_1_66 = callPackage
       (
@@ -17134,7 +19879,46 @@ let
           }
       ) {};
 
-    fifo_dt = fifo_dt_0_1_66;
+    fifo_dt_0_1_68 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          riak_dt_2_1_1,
+          libsnarlmatch_0_1_7,
+          lager_2_1_1,
+          jsxd_0_1_10,
+          jsx_1_4_5,
+          fifo_utils_0_1_20
+        }:
+          buildRebar3 {
+            name = "fifo_dt";
+            version = "0.1.68";
+            src = fetchHex {
+              pkg = "fifo_dt";
+              version = "0.1.68";
+              sha256 =
+                "dc465553abac1e4a9db50930bbba5ee15f625a440b482311ceb0e428cc121894";
+            };
+
+            beamDeps  = [
+                          riak_dt_2_1_1
+                          libsnarlmatch_0_1_7
+                          lager_2_1_1
+                          jsxd_0_1_10
+                          jsx_1_4_5
+                          fifo_utils_0_1_20
+                        ];
+
+            meta = {
+              description = ''FiFo datatype collection'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/project-fifo/fifo_dt";
+            };
+          }
+      ) {};
+
+    fifo_dt = fifo_dt_0_1_68;
 
     fifo_lager_0_1_3 = callPackage
       (
@@ -17251,17 +20035,17 @@ let
           }
       ) {};
 
-    fifo_utils_0_1_21 = callPackage
+    fifo_utils_0_1_22 = callPackage
       (
         {  buildRebar3, fetchHex, uuid_erl_1_5_1, lager_2_1_1 }:
           buildRebar3 {
             name = "fifo_utils";
-            version = "0.1.21";
+            version = "0.1.22";
             src = fetchHex {
               pkg = "fifo_utils";
-              version = "0.1.21";
+              version = "0.1.22";
               sha256 =
-                "8a9298fd7486f56b74b4ffc1d6a3ff3713ffde44b248371f7f673a9bd76add60";
+                "dd38d1418298600063354ebb84cbcbf6d49504416323368c8d590dd2a95e257e";
             };
 
             beamDeps  = [ uuid_erl_1_5_1 lager_2_1_1 ];
@@ -17274,7 +20058,30 @@ let
           }
       ) {};
 
-    fifo_utils = fifo_utils_0_1_21;
+    fifo_utils = fifo_utils_0_1_22;
+
+    fifocache_1_0_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "fifocache";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "fifocache";
+              version = "1.0.1";
+              sha256 =
+                "363f03e2871b8d8c7564a47133162ce18c362bd70897f5bd58fa246a0e169a43";
+            };
+
+            meta = {
+              description = ''Fixed size FIFO cache implementation'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/mururu/fifocache";
+            };
+          }
+      ) {};
+
+    fifocache = fifocache_1_0_1;
 
     figaro_0_1_0 = callPackage
       (
@@ -17323,6 +20130,31 @@ let
 
     figaro_elixir = figaro_elixir_1_0_0;
 
+    file_info_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, mimetype_parser_0_1_2 }:
+          buildMix {
+            name = "file_info";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "file_info";
+              version = "0.0.2";
+              sha256 =
+                "f28456aafd014c01a4188fee36c1571e9669b0506eb22c830db357084c0c9cb2";
+            };
+            beamDeps  = [ mimetype_parser_0_1_2 ];
+
+            meta = {
+              description = ''Get MIME-type of a file by its magic number
+                            (linux only)'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/NobbZ/file_info";
+            };
+          }
+      ) {};
+
+    file_info = file_info_0_0_2;
+
     filepreviews_1_0_1 = callPackage
       (
         {  buildMix, fetchHex, poison_1_4_0, httpoison_0_7_5 }:
@@ -17375,7 +20207,7 @@ let
 
     finance_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_1 }:
+        {  buildMix, fetchHex, timex_1_0_2 }:
           buildMix {
             name = "finance";
             version = "0.0.1";
@@ -17385,7 +20217,7 @@ let
               sha256 =
                 "fe08fc521e65605d54fd8b68fbdfdbd233b408e8330cf8038337214b553c2c17";
             };
-            beamDeps  = [ timex_1_0_1 ];
+            beamDeps  = [ timex_1_0_2 ];
 
             meta = {
               longDescription = ''A library to calculate Xirr through the
@@ -17431,25 +20263,25 @@ let
 
     finch = finch_0_0_3;
 
-    finicity_0_0_4 = callPackage
+    finicity_0_0_5 = callPackage
       (
         {
           buildMix,
           fetchHex,
           xml_builder_0_0_8,
-          httpotion_2_1_0,
-          floki_0_7_1
+          httpotion_2_2_2,
+          floki_0_8_0
         }:
           buildMix {
             name = "finicity";
-            version = "0.0.4";
+            version = "0.0.5";
             src = fetchHex {
               pkg = "finicity";
-              version = "0.0.4";
+              version = "0.0.5";
               sha256 =
-                "bed2444d52366a7e6f49bafff0d985c04540ef298922273df11efebe9c1e8387";
+                "b58ef39987976cf50851311a95b40504ba763c0d82256b012f5b1246bd92d9b4";
             };
-            beamDeps  = [ xml_builder_0_0_8 httpotion_2_1_0 floki_0_7_1 ];
+            beamDeps  = [ xml_builder_0_0_8 httpotion_2_2_2 floki_0_8_0 ];
 
             meta = {
               description = ''Client library for Finicity.'';
@@ -17458,7 +20290,7 @@ let
           }
       ) {};
 
-    finicity = finicity_0_0_4;
+    finicity = finicity_0_0_5;
 
     fireworks_0_5_1 = callPackage
       (
@@ -17513,7 +20345,7 @@ let
     fitbit_0_0_1 = callPackage
       (
         {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1, hackney_1_4_8
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, hackney_1_4_10
         }:
           buildMix {
             name = "fitbit";
@@ -17524,7 +20356,7 @@ let
               sha256 =
                 "dc09d3b6d37ea67d21a52a704bd52357daa223e18afe4831515730452b3ada25";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 hackney_1_4_8 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 hackney_1_4_10 ];
 
             meta = {
               description = ''A Fitbit Library for Elixir'';
@@ -17730,17 +20562,17 @@ let
           }
       ) {};
 
-    floki_0_7_1 = callPackage
+    floki_0_7_2 = callPackage
       (
         {  buildMix, fetchHex, mochiweb_2_12_2 }:
           buildMix {
             name = "floki";
-            version = "0.7.1";
+            version = "0.7.2";
             src = fetchHex {
               pkg = "floki";
-              version = "0.7.1";
+              version = "0.7.2";
               sha256 =
-                "f4d9df7ffbfeed170dc81d9c6309e47fe3d51c6247b42a2341d8675d3ff653b1";
+                "c7078ac2a54501a16ff469c78292bac5013e457ffa8801b74bc293616aa5b0d0";
             };
             beamDeps  = [ mochiweb_2_12_2 ];
 
@@ -17753,7 +20585,30 @@ let
           }
       ) {};
 
-    floki = floki_0_7_1;
+    floki_0_8_0 = callPackage
+      (
+        {  buildMix, fetchHex, mochiweb_html_2_13_0 }:
+          buildMix {
+            name = "floki";
+            version = "0.8.0";
+            src = fetchHex {
+              pkg = "floki";
+              version = "0.8.0";
+              sha256 =
+                "9cc084ca7adf275f639bb7a292838d7dc86d8917314c22f8aa2d8f6ba8b8d18d";
+            };
+            beamDeps  = [ mochiweb_html_2_13_0 ];
+
+            meta = {
+              description = ''Floki is a simple HTML parser that enables search
+                            for nodes using CSS selectors.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/philss/floki";
+            };
+          }
+      ) {};
+
+    floki = floki_0_8_0;
 
     floorplan_0_1_1 = callPackage
       (
@@ -17761,11 +20616,11 @@ let
           buildMix,
           fetchHex,
           xml_builder_0_0_8,
-          tzdata_0_1_8,
-          timex_1_0_1,
+          tzdata_0_1_201603,
+          timex_1_0_2,
           postgrex_0_11_1,
           poison_1_5_2,
-          httpotion_2_1_0
+          httpotion_2_2_2
         }:
           buildMix {
             name = "floorplan";
@@ -17778,11 +20633,11 @@ let
             };
             beamDeps  = [
                           xml_builder_0_0_8
-                          tzdata_0_1_8
-                          timex_1_0_1
+                          tzdata_0_1_201603
+                          timex_1_0_2
                           postgrex_0_11_1
                           poison_1_5_2
-                          httpotion_2_1_0
+                          httpotion_2_2_2
                         ];
 
             meta = {
@@ -17796,21 +20651,21 @@ let
 
     floorplan = floorplan_0_1_1;
 
-    flower_power_0_2_0 = callPackage
+    flower_power_0_3_2 = callPackage
       (
         {
-          buildMix, fetchHex, timex_1_0_1, poison_1_5_2, httpoison_0_7_5
+          buildMix, fetchHex, timex_1_0_2, poison_1_5_2, httpoison_0_7_5
         }:
           buildMix {
             name = "flower_power";
-            version = "0.2.0";
+            version = "0.3.2";
             src = fetchHex {
               pkg = "flower_power";
-              version = "0.2.0";
+              version = "0.3.2";
               sha256 =
-                "1ade69e578fd65dd2d10b8097846411f1a5d0a42ad55e9faa532c65bbaf59bbb";
+                "f0b7d14fbe0ea78225f3b8424bc907ca6d977576d974b57dcd860afa8ed426a8";
             };
-            beamDeps  = [ timex_1_0_1 poison_1_5_2 httpoison_0_7_5 ];
+            beamDeps  = [ timex_1_0_2 poison_1_5_2 httpoison_0_7_5 ];
 
             meta = {
               description = ''Api client for flower power cloud api'';
@@ -17820,12 +20675,12 @@ let
           }
       ) {};
 
-    flower_power = flower_power_0_2_0;
+    flower_power = flower_power_0_3_2;
 
     fluent_client_0_1_0 = callPackage
       (
         {
-          buildMix, fetchHex, socket_0_2_8, poison_1_3_1, msgpax_0_7_0
+          buildMix, fetchHex, socket_0_2_8, poison_1_3_1, msgpax_0_7_1
         }:
           buildMix {
             name = "fluent_client";
@@ -17836,7 +20691,7 @@ let
               sha256 =
                 "df1d05da9475938422a734cd311564eef44bfebea3c37b06ab167368875c2d15";
             };
-            beamDeps  = [ socket_0_2_8 poison_1_3_1 msgpax_0_7_0 ];
+            beamDeps  = [ socket_0_2_8 poison_1_3_1 msgpax_0_7_1 ];
 
             meta = {
               description = ''fluentd client library'';
@@ -17849,6 +20704,29 @@ let
 
     fluent_client = fluent_client_0_1_0;
 
+    fluxter_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "fluxter";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "fluxter";
+              version = "0.2.0";
+              sha256 =
+                "7834e830d156bf9ee819e69929a42f9ce8373a4d50c3e002ad9949cfeb42391d";
+            };
+
+            meta = {
+              description = ''An InfluxDB writer for Elixir'';
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/lexmag/fluxter";
+            };
+          }
+      ) {};
+
+    fluxter = fluxter_0_2_0;
+
     fn_1_0_0 = callPackage
       (
         {  buildRebar3, fetchHex }:
@@ -17921,17 +20799,17 @@ let
 
     folsom = folsom_0_8_3;
 
-    folsom_ddb_0_1_20 = callPackage
+    folsom_ddb_0_1_22 = callPackage
       (
         {  buildRebar3, fetchHex, ddb_client_0_1_17 }:
           buildRebar3 {
             name = "folsom_ddb";
-            version = "0.1.20";
+            version = "0.1.22";
             src = fetchHex {
               pkg = "folsom_ddb";
-              version = "0.1.20";
+              version = "0.1.22";
               sha256 =
-                "9103ab70b048bf35618daf85b314d815e66c23e7100a71b07dcbec18e75d02d1";
+                "8b2c5b674b993738f22ff265159e6d71d6640632ed98e9c1cd3daef15b586e46";
             };
 
             beamDeps  = [ ddb_client_0_1_17 ];
@@ -17944,7 +20822,7 @@ let
           }
       ) {};
 
-    folsom_ddb = folsom_ddb_0_1_20;
+    folsom_ddb = folsom_ddb_0_1_22;
 
     folsomite_1_2_8 = callPackage
       (
@@ -17973,7 +20851,7 @@ let
 
     font_awesome_phoenix_0_3_2 = callPackage
       (
-        {  buildMix, fetchHex, phoenix_html_2_5_0 }:
+        {  buildMix, fetchHex, phoenix_html_2_5_1 }:
           buildMix {
             name = "font_awesome_phoenix";
             version = "0.3.2";
@@ -17983,7 +20861,7 @@ let
               sha256 =
                 "826dd9e0400351cb539ccced605455d8da25490fd37a75085eb68fa133e65f34";
             };
-            beamDeps  = [ phoenix_html_2_5_0 ];
+            beamDeps  = [ phoenix_html_2_5_1 ];
 
             meta = {
               description = ''HTML helper functions to build Font Awesome icon
@@ -17996,21 +20874,21 @@ let
 
     font_awesome_phoenix = font_awesome_phoenix_0_3_2;
 
-    forcex_0_1_0 = callPackage
+    forcex_0_2_0 = callPackage
       (
         {
-          buildMix, fetchHex, timex_1_0_0_rc4, httpoison_0_8_1, exjsx_3_2_0
+          buildMix, fetchHex, timex_1_0_2, httpoison_0_8_2, exjsx_3_2_0
         }:
           buildMix {
             name = "forcex";
-            version = "0.1.0";
+            version = "0.2.0";
             src = fetchHex {
               pkg = "forcex";
-              version = "0.1.0";
+              version = "0.2.0";
               sha256 =
-                "3f7c4ddffaa0bfb0408b0148e14e344d7c42349923894ab44b56513c05c14c08";
+                "31c6bd2d550193983812a5e8c4ed53d5d6be0fe30ce6628d62828f00544a7a4b";
             };
-            beamDeps  = [ timex_1_0_0_rc4 httpoison_0_8_1 exjsx_3_2_0 ];
+            beamDeps  = [ timex_1_0_2 httpoison_0_8_2 exjsx_3_2_0 ];
 
             meta = {
               description = ''Elixir library for the Force.com / SalesForce /
@@ -18021,11 +20899,11 @@ let
           }
       ) {};
 
-    forcex = forcex_0_1_0;
+    forcex = forcex_0_2_0;
 
     forecast_io_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex, json_0_3_3, httpotion_1_0_0 }:
+        {  buildMix, fetchHex, json_0_3_3, httpotion_2_2_2 }:
           buildMix {
             name = "forecast_io";
             version = "0.2.1";
@@ -18035,7 +20913,7 @@ let
               sha256 =
                 "e109212dcd55c7d94bf9d85c1d6ee6687d35eb065335df13fc105fc242506c09";
             };
-            beamDeps  = [ json_0_3_3 httpotion_1_0_0 ];
+            beamDeps  = [ json_0_3_3 httpotion_2_2_2 ];
 
             meta = {
               description = ''Simple wrapper for Forecast.IO API '';
@@ -18097,7 +20975,7 @@ let
 
     fox_0_1_12 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_1, ecto_2_0_0_beta_0 }:
+        {  buildMix, fetchHex, timex_2_1_3, ecto_2_0_0_beta_2 }:
           buildMix {
             name = "fox";
             version = "0.1.12";
@@ -18107,7 +20985,7 @@ let
               sha256 =
                 "3b4fe9b49422d99e0c888ca839e828b70b4334637f443a14afc941be5e6a847e";
             };
-            beamDeps  = [ timex_1_0_1 ecto_2_0_0_beta_0 ];
+            beamDeps  = [ timex_2_1_3 ecto_2_0_0_beta_2 ];
 
             meta = {
               longDescription = ''Collection of support utility functions and
@@ -18123,27 +21001,6 @@ let
 
     fox = fox_0_1_12;
 
-    fqc_0_1_5 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "fqc";
-            version = "0.1.5";
-            src = fetchHex {
-              pkg = "fqc";
-              version = "0.1.5";
-              sha256 =
-                "47536dec351a12e1cbe0bc3b52bfff3b0690b0aec660472b5cf49f812eb9aa4f";
-            };
-
-            meta = {
-              description = ''FiFo EQC helper'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/project-fifo/fqc";
-            };
-          }
-      ) {};
-
     fqc_0_1_7 = callPackage
       (
         {  buildRebar3, fetchHex }:
@@ -18192,9 +21049,34 @@ let
 
     frank = frank_0_0_3;
 
+    freegeoip_0_0_4 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
+          buildMix {
+            name = "freegeoip";
+            version = "0.0.4";
+            src = fetchHex {
+              pkg = "freegeoip";
+              version = "0.0.4";
+              sha256 =
+                "6776938ddc1318ee8a34ef6e3a5dcb85013bbb27feeae3c7d65487ff17e2b558";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
+
+            meta = {
+              description = ''Simple Elixir wrapper for freegeoip.net HTTP
+                            API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/juljimm/freegeoip-elixir";
+            };
+          }
+      ) {};
+
+    freegeoip = freegeoip_0_0_4;
+
     friendly_1_0_1 = callPackage
       (
-        {  buildMix, fetchHex, floki_0_7_1 }:
+        {  buildMix, fetchHex, floki_0_8_0 }:
           buildMix {
             name = "friendly";
             version = "1.0.1";
@@ -18204,7 +21086,7 @@ let
               sha256 =
                 "5bacdeba9a6752613c037f7ffacd4f7185cf9b348b3b41c73497e539bbb17602";
             };
-            beamDeps  = [ floki_0_7_1 ];
+            beamDeps  = [ floki_0_8_0 ];
 
             meta = {
               longDescription = ''HTML and XML parser with the most friendly
@@ -18267,7 +21149,7 @@ let
 
     fulcrum_0_0_6 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "fulcrum";
             version = "0.0.6";
@@ -18277,7 +21159,7 @@ let
               sha256 =
                 "9cddd3906bad693cad791841d19b2be089e064a5f2dd35d340f46e6cd15d7930";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               longDescription = ''Fulcrum library for Elixir. The aim is to
@@ -18317,14 +21199,40 @@ let
 
     fumanchu = fumanchu_0_0_1;
 
+    function_decorating_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "function_decorating";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "function_decorating";
+              version = "0.0.1";
+              sha256 =
+                "06016a2765de8ea0243b7993226177c96d0f6d51a2db2f84ee9d224a355c3b92";
+            };
+
+            meta = {
+              longDescription = ''A function decorator macro for Elixir. Used
+                                mainly for adding log statements to the function
+                                calls.'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/elpddev/elixir-function-decorating";
+            };
+          }
+      ) {};
+
+    function_decorating = function_decorating_0_0_1;
+
     funnel_0_4_1 = callPackage
       (
         {
           buildMix,
           fetchHex,
           poolboy_1_5_1,
-          httpoison_0_8_1,
-          uuid_0_1_5,
+          httpoison_0_8_2,
+          uuid_1_0_0,
           poison_1_5_2
         }:
           buildMix {
@@ -18337,7 +21245,7 @@ let
                 "84b937146c9464afc2a92e53aa0109de60caef599f82613fdcd4dc3e864025d7";
             };
             beamDeps  = [
-                          poolboy_1_5_1 httpoison_0_8_1 uuid_0_1_5 poison_1_5_2
+                          poolboy_1_5_1 httpoison_0_8_2 uuid_1_0_0 poison_1_5_2
                         ];
 
             meta = {
@@ -18351,17 +21259,17 @@ let
 
     funnel = funnel_0_4_1;
 
-    fuse_2_0_0 = callPackage
+    fuse_2_2_0 = callPackage
       (
         {  buildRebar3, fetchHex }:
           buildRebar3 {
             name = "fuse";
-            version = "2.0.0";
+            version = "2.2.0";
             src = fetchHex {
               pkg = "fuse";
-              version = "2.0.0";
+              version = "2.2.0";
               sha256 =
-                "e2c55c0629ce418974165a65b342e54527333303d7e9c1f0493679144c9698cb";
+                "c397f336455ab6596842d2199f018af69855f17df1635e212d3871a135ad46fa";
             };
 
             meta = {
@@ -18372,7 +21280,7 @@ let
           }
       ) {};
 
-    fuse = fuse_2_0_0;
+    fuse = fuse_2_2_0;
 
     fuzzyurl_0_8_1 = callPackage
       (
@@ -18398,10 +21306,34 @@ let
 
     fuzzyurl = fuzzyurl_0_8_1;
 
+    fwatch_0_5_0 = callPackage
+      (
+        {  buildMix, fetchHex, fs_0_9_2, earmark_0_2_1 }:
+          buildMix {
+            name = "fwatch";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "fwatch";
+              version = "0.5.0";
+              sha256 =
+                "1cd46bcae7074c10a4a4d25989ef20ab515d075d762af8e6c86e8d50c011604c";
+            };
+            beamDeps  = [ fs_0_9_2 earmark_0_2_1 ];
+
+            meta = {
+              description = ''A file watcher for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ryo33/fwatch-ex";
+            };
+          }
+      ) {};
+
+    fwatch = fwatch_0_5_0;
+
     gateway_0_0_6 = callPackage
       (
         {
-          buildMix, fetchHex, poison_2_1_0, httpoison_0_8_1, fox_0_1_12
+          buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2, fox_0_1_12
         }:
           buildMix {
             name = "gateway";
@@ -18412,7 +21344,7 @@ let
               sha256 =
                 "4d0de05b0168ee0cc41c9c38491a4b4641d446f38170ca170d0d7440b0c8f619";
             };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_1 fox_0_1_12 ];
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 fox_0_1_12 ];
 
             meta = {
               longDescription = ''A generic set of macros and conventions to
@@ -18453,7 +21385,7 @@ let
 
     gcm_1_2_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "gcm";
             version = "1.2.0";
@@ -18463,7 +21395,7 @@ let
               sha256 =
                 "281d5c2dc94a24382292f6fbfe7348316e8afa0a40285978f03e7dcae068170a";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''GCM library to send pushes through GCM'';
@@ -18576,6 +21508,29 @@ let
 
     gelfex = gelfex_0_0_1;
 
+    gen_leader_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "gen_leader";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "gen_leader";
+              version = "0.1.0";
+              sha256 =
+                "31340f49935767f12b639b69cdc585f26ebcc1802ba46b33555b229da2366207";
+            };
+
+            meta = {
+              description = ''The gen_leader behaviour'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/knusbaum/gen_leader_revival";
+            };
+          }
+      ) {};
+
+    gen_leader = gen_leader_0_1_0;
+
     gen_listener_tcp_0_3_2 = callPackage
       (
         {  buildRebar3, fetchHex }:
@@ -18599,6 +21554,32 @@ let
 
     gen_listener_tcp = gen_listener_tcp_0_3_2;
 
+    gen_rpc_1_0_2 = callPackage
+      (
+        {  buildRebar3, fetchHex, lager_3_0_2 }:
+          buildRebar3 {
+            name = "gen_rpc";
+            version = "1.0.2";
+            src = fetchHex {
+              pkg = "gen_rpc";
+              version = "1.0.2";
+              sha256 =
+                "2e7669c865be0051d322c092f83c0eadefeb04698098ee4b80cc43f60d39f5dd";
+            };
+
+            beamDeps  = [ lager_3_0_2 ];
+
+            meta = {
+              description = ''A scalable RPC library for Erlang-VM based
+                            languages'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/priestjim/gen_rpc";
+            };
+          }
+      ) {};
+
+    gen_rpc = gen_rpc_1_0_2;
+
     gen_smtp_0_9_0 = callPackage
       (
         {  buildRebar3, fetchHex }:
@@ -18655,7 +21636,7 @@ let
           fetchHex,
           postgrex_0_11_1,
           poison_1_0_3,
-          ecto_2_0_0_beta_0
+          ecto_2_0_0_beta_2
         }:
           buildMix {
             name = "geo";
@@ -18666,7 +21647,7 @@ let
               sha256 =
                 "c0ab2df75521a2f50ff339294ff914b3a71e4f3753c5a82851457e0d40bb2e9c";
             };
-            beamDeps  = [ postgrex_0_11_1 poison_1_0_3 ecto_2_0_0_beta_0 ];
+            beamDeps  = [ postgrex_0_11_1 poison_1_0_3 ecto_2_0_0_beta_2 ];
 
             meta = {
               description = ''PostGIS extension for Postgrex. Also encodes and
@@ -18711,7 +21692,7 @@ let
           towel_0_2_1,
           poolboy_1_5_1,
           poison_1_5_2,
-          httpoison_0_8_1
+          httpoison_0_8_2
         }:
           buildMix {
             name = "geocoder";
@@ -18723,7 +21704,7 @@ let
                 "67c45859114f5b82949cb98b75cfc862d739a5212164e4147552c6b3701cc975";
             };
             beamDeps  = [
-                          towel_0_2_1 poolboy_1_5_1 poison_1_5_2 httpoison_0_8_1
+                          towel_0_2_1 poolboy_1_5_1 poison_1_5_2 httpoison_0_8_2
                         ];
 
             meta = {
@@ -18834,7 +21815,7 @@ let
 
     gh_webhook_plug_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1 }:
+        {  buildMix, fetchHex, plug_1_1_3 }:
           buildMix {
             name = "gh_webhook_plug";
             version = "0.0.2";
@@ -18844,7 +21825,7 @@ let
               sha256 =
                 "f89c7b883923aea3a3c488e3344390e0771735df72dad7fec270ce49aba88854";
             };
-            beamDeps  = [ plug_1_1_1 ];
+            beamDeps  = [ plug_1_1_3 ];
 
             meta = {
               longDescription = ''This Plug makes it easy to listen and respond
@@ -18858,17 +21839,17 @@ let
 
     gh_webhook_plug = gh_webhook_plug_0_0_2;
 
-    gibran_0_0_1 = callPackage
+    gibran_0_0_2 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "gibran";
-            version = "0.0.1";
+            version = "0.0.2";
             src = fetchHex {
               pkg = "gibran";
-              version = "0.0.1";
+              version = "0.0.2";
               sha256 =
-                "20e221e7743279bb37560c94bf93dea576d9a24d301cd75f3cfa5f6b0ec6dd20";
+                "bdf0eb8c7469ac17e14e898b26fb47d4a360409f7a750bfde5d7d0765f327ca4";
             };
 
             meta = {
@@ -18879,11 +21860,11 @@ let
           }
       ) {};
 
-    gibran = gibran_0_0_1;
+    gibran = gibran_0_0_2;
 
     gil_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_7_5, floki_0_7_1 }:
+        {  buildMix, fetchHex, httpoison_0_7_5, floki_0_8_0 }:
           buildMix {
             name = "gil";
             version = "0.0.3";
@@ -18893,7 +21874,7 @@ let
               sha256 =
                 "5235fdfd30513bd5d75a93272fc952f3ae1c0746e400591c244383d8f0fe9403";
             };
-            beamDeps  = [ httpoison_0_7_5 floki_0_7_1 ];
+            beamDeps  = [ httpoison_0_7_5 floki_0_8_0 ];
 
             meta = {
               description = ''"Mix custome task for check exchange rate"'';
@@ -18952,17 +21933,17 @@ let
 
     gimei_ex = gimei_ex_1_0_0;
 
-    git_cli_0_1_0 = callPackage
+    git_cli_0_2_0 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "git_cli";
-            version = "0.1.0";
+            version = "0.2.0";
             src = fetchHex {
               pkg = "git_cli";
-              version = "0.1.0";
+              version = "0.2.0";
               sha256 =
-                "08cc7b12b7c29cee656d81008e9627b027555cbdf78fa609b599d64bbef71214";
+                "8e52506764fd6ba5f153d2bcd5635c160ed83a7a4e8834b4e67eee317a37f962";
             };
 
             meta = {
@@ -18973,7 +21954,7 @@ let
           }
       ) {};
 
-    git_cli = git_cli_0_1_0;
+    git_cli = git_cli_0_2_0;
 
     gitex_0_1_0 = callPackage
       (
@@ -19025,7 +22006,7 @@ let
 
     github_oauth_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "github_oauth";
             version = "0.1.1";
@@ -19035,7 +22016,7 @@ let
               sha256 =
                 "4e68983af9ed8146a2505ad759cb151c3202471285f07df6132a4acd47aa91f2";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''simple github oauth library'';
@@ -19047,6 +22028,56 @@ let
 
     github_oauth = github_oauth_0_1_1;
 
+    github_trend_ex_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_2, floki_0_8_0 }:
+          buildMix {
+            name = "github_trend_ex";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "github_trend_ex";
+              version = "0.1.2";
+              sha256 =
+                "019565ad8efe6c25414dcddc6a7fc99e34f0ff457989ec7b5ad03b79b0c8ca8b";
+            };
+            beamDeps  = [ httpoison_0_8_2 floki_0_8_0 ];
+
+            meta = {
+              description = ''Get trend repositories from Github.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/KazuCocoa/github_trend_ex";
+            };
+          }
+      ) {};
+
+    github_trend_ex = github_trend_ex_0_1_2;
+
+    gizoogle_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_2 }:
+          buildMix {
+            name = "gizoogle";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "gizoogle";
+              version = "0.0.2";
+              sha256 =
+                "c22d720fc60df8670a194c6ed1fb17fe272a7560b478037aef4a1437331f60e3";
+            };
+            beamDeps  = [ httpoison_0_8_2 ];
+
+            meta = {
+              longDescription = ''Uses Gizoogle ta allow you ta drop a rhyme
+                                like a thug n` retrieve links fo` translated
+                                sitez'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/notdevinclark/gizoogle";
+            };
+          }
+      ) {};
+
+    gizoogle = gizoogle_0_0_2;
+
     glitchylicious_0_0_1 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -19094,25 +22125,44 @@ let
 
     global = global_1_0_0;
 
-    gmail_0_0_17 = callPackage
+    gm_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "gm";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "gm";
+              version = "0.0.2";
+              sha256 =
+                "3dc6e1d336afe370219b8b465a651012168f6fe7b9e9d2b0609b6384e1bcb8f7";
+            };
+
+            meta = {
+              description = ''Idiomatic GraphicsMagick wrapper for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/utkarshkukreti/gm.ex";
+            };
+          }
+      ) {};
+
+    gm = gm_0_0_2;
+
+    gmail_0_1_8 = callPackage
       (
         {
-          buildMix,
-          fetchHex,
-          timex_1_0_0_rc4,
-          poison_1_5_2,
-          httpoison_0_8_1
+          buildMix, fetchHex, timex_2_1_3, poison_2_1_0, httpoison_0_8_2
         }:
           buildMix {
             name = "gmail";
-            version = "0.0.17";
+            version = "0.1.8";
             src = fetchHex {
               pkg = "gmail";
-              version = "0.0.17";
+              version = "0.1.8";
               sha256 =
-                "3c8fa022730d7e8016c777e48977077d6ebc02c4382d13d94b60f452ed8e650d";
+                "d307c44c9241730fa96d5dbab796295f3d55980465faddf610bf962cd359cbcf";
             };
-            beamDeps  = [ timex_1_0_0_rc4 poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ timex_2_1_3 poison_2_1_0 httpoison_0_8_2 ];
 
             meta = {
               description = ''A simple Gmail REST API client for Elixir'';
@@ -19122,12 +22172,12 @@ let
           }
       ) {};
 
-    gmail = gmail_0_0_17;
+    gmail = gmail_0_1_8;
 
     gold_0_12_0 = callPackage
       (
         {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1, decimal_1_1_1
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, decimal_1_1_1
         }:
           buildMix {
             name = "gold";
@@ -19138,7 +22188,7 @@ let
               sha256 =
                 "fba43501f6c25116c29358c4b5494de5e078cc516572045ac73a7944b918105b";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 decimal_1_1_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 decimal_1_1_1 ];
 
             meta = {
               description = ''An Elixir library to interface with the Bitcoin
@@ -19177,7 +22227,7 @@ let
 
     good_enough_geoid_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, csv_1_2_4 }:
+        {  buildMix, fetchHex, csv_1_3_3 }:
           buildMix {
             name = "good_enough_geoid";
             version = "0.0.2";
@@ -19187,7 +22237,7 @@ let
               sha256 =
                 "7b2a556206f71e743d77c26a55b60b3282bd799b8254510f62afe2a4ec330746";
             };
-            beamDeps  = [ csv_1_2_4 ];
+            beamDeps  = [ csv_1_3_3 ];
 
             meta = {
               description = ''Get EGM Geoid heights that are good enough for
@@ -19229,7 +22279,7 @@ let
         {
           buildMix,
           fetchHex,
-          plug_1_1_1,
+          plug_1_1_3,
           module_mocker_0_2_0,
           cowboy_1_0_4,
           access_token_extractor_0_1_1
@@ -19244,7 +22294,7 @@ let
                 "029f2399456a7b7474635cab36544d35e200ddd7a470a905191de0fc3612adb5";
             };
             beamDeps  = [
-                          plug_1_1_1
+                          plug_1_1_3
                           module_mocker_0_2_0
                           cowboy_1_0_4
                           access_token_extractor_0_1_1
@@ -19264,25 +22314,25 @@ let
 
     google_auth = google_auth_0_0_2;
 
-    google_sheets_2_0_3 = callPackage
+    google_sheets_2_0_5 = callPackage
       (
         {
           buildMix,
           fetchHex,
           sweet_xml_0_6_1,
-          httpoison_0_8_1,
-          hackney_1_4_8
+          httpoison_0_8_2,
+          hackney_1_6_0
         }:
           buildMix {
             name = "google_sheets";
-            version = "2.0.3";
+            version = "2.0.5";
             src = fetchHex {
               pkg = "google_sheets";
-              version = "2.0.3";
+              version = "2.0.5";
               sha256 =
-                "10b5708d3fb7e41a4e8e026e0cdd2c282fb4804f7f3b53e2a9dd5ddce01749fe";
+                "aeaaab3e2df75289cf14740a76b014652fb77a5ef95be3921fc36f4165812682";
             };
-            beamDeps  = [ sweet_xml_0_6_1 httpoison_0_8_1 hackney_1_4_8 ];
+            beamDeps  = [ sweet_xml_0_6_1 httpoison_0_8_2 hackney_1_6_0 ];
 
             meta = {
               description = ''OTP application for fetching and polling Google
@@ -19293,7 +22343,7 @@ let
           }
       ) {};
 
-    google_sheets = google_sheets_2_0_3;
+    google_sheets = google_sheets_2_0_5;
 
     goth_0_0_3 = callPackage
       (
@@ -19302,7 +22352,7 @@ let
           fetchHex,
           poison_1_5_2,
           json_web_token_0_2_4,
-          httpoison_0_8_1
+          httpoison_0_8_2
         }:
           buildMix {
             name = "goth";
@@ -19313,7 +22363,7 @@ let
               sha256 =
                 "0bbf59ae842dc4518cf42123b0fb0d0255bcb72ea37c8ec13bab2efe2339ccc3";
             };
-            beamDeps  = [ poison_1_5_2 json_web_token_0_2_4 httpoison_0_8_1
+            beamDeps  = [ poison_1_5_2 json_web_token_0_2_4 httpoison_0_8_2
                       ];
 
             meta = {
@@ -19330,8 +22380,8 @@ let
 
     gpb_3_18_10 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "gpb";
             version = "3.18.10";
             src = fetchHex {
@@ -19352,8 +22402,8 @@ let
 
     gpb_3_18_8 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "gpb";
             version = "3.18.8";
             src = fetchHex {
@@ -19372,17 +22422,17 @@ let
           }
       ) {};
 
-    gpb_3_19_0 = callPackage
+    gpb_3_20_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "gpb";
-            version = "3.19.0";
+            version = "3.20.0";
             src = fetchHex {
               pkg = "gpb";
-              version = "3.19.0";
+              version = "3.20.0";
               sha256 =
-                "9d7fdee6914d5ce3850a58f00ae37240ba7ccb9ecf37aeb0e1bdfae37ca6b4b7";
+                "d83eb25783fdc3f10b4f8e00c8434453a260958c696efa85fee53ed3a9447e83";
             };
 
             meta = {
@@ -19394,7 +22444,7 @@ let
           }
       ) {};
 
-    gpb = gpb_3_19_0;
+    gpb = gpb_3_20_0;
 
     gproc_0_3_1 = callPackage
       (
@@ -19517,17 +22567,17 @@ let
 
     graphmath = graphmath_1_0_2;
 
-    graphql_0_1_2 = callPackage
+    graphql_0_2_0 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "graphql";
-            version = "0.1.2";
+            version = "0.2.0";
             src = fetchHex {
               pkg = "graphql";
-              version = "0.1.2";
+              version = "0.2.0";
               sha256 =
-                "d517247d9518fb1db9631a988f02935a253da43c3c2818c8a1355631645bd92c";
+                "2469337ef663fb63922e67beafa2a50d56de14176c699758a855210140c269df";
             };
 
             meta = {
@@ -19538,7 +22588,7 @@ let
           }
       ) {};
 
-    graphql = graphql_0_1_2;
+    graphql = graphql_0_2_0;
 
     graphql_ex_0_0_1 = callPackage
       (
@@ -19560,8 +22610,8 @@ let
 
     graphql_parser_0_0_3 = callPackage
       (
-        {  buildRebar3, fetchHex, poison_1_5_2 }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex, poison_1_5_2 }:
+          buildErlangMk {
             name = "graphql_parser";
             version = "0.0.3";
             src = fetchHex {
@@ -19570,7 +22620,6 @@ let
               sha256 =
                 "c54d6d3a4d5daba22559bc306e3e52cb8d78d3a93738f615c16e405ad56ac6a9";
             };
-
             beamDeps  = [ poison_1_5_2 ];
 
             meta = {
@@ -19584,6 +22633,30 @@ let
 
     graphql_parser = graphql_parser_0_0_3;
 
+    graphql_relay_0_0_16 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_0_3, graphql_0_2_0, ecto_1_1_5 }:
+          buildMix {
+            name = "graphql_relay";
+            version = "0.0.16";
+            src = fetchHex {
+              pkg = "graphql_relay";
+              version = "0.0.16";
+              sha256 =
+                "70c84b22afba3dc47c0a68c4ba58f7f4319d1ef55c8a85364fc05e05bcaf97af";
+            };
+            beamDeps  = [ poison_1_0_3 graphql_0_2_0 ecto_1_1_5 ];
+
+            meta = {
+              description = ''Elixir implementation of Relay for GraphQL'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/graphql-elixir/graphql_relay";
+            };
+          }
+      ) {};
+
+    graphql_relay = graphql_relay_0_0_16;
+
     gravatarify_0_1_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -19631,6 +22704,34 @@ let
 
     gray = gray_0_0_2;
 
+    group_manager_0_0_8 = callPackage
+      (
+        {  buildMix, fetchHex, chatter_0_0_14 }:
+          buildMix {
+            name = "group_manager";
+            version = "0.0.8";
+            src = fetchHex {
+              pkg = "group_manager";
+              version = "0.0.8";
+              sha256 =
+                "69d9de842663ed764a8f6792c6a0f5a378e717e302058b9050b4a58be0d14cdf";
+            };
+            beamDeps  = [ chatter_0_0_14 ];
+
+            meta = {
+              longDescription = ''GroupManager is extracted from the ScaleSmall
+                                project as a standalone piece. This can be used
+                                independently to manage a set of nodes and
+                                coordinate a common goal expressed as integer
+                                ranges.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dbeck/groupman_ex/";
+            };
+          }
+      ) {};
+
+    group_manager = group_manager_0_0_8;
+
     growl_0_0_2 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -19683,8 +22784,8 @@ let
           fetchHex,
           uuid_1_1_3,
           poison_1_5_2,
-          plug_1_1_1,
-          jose_1_6_1
+          plug_1_1_3,
+          jose_1_7_3
         }:
           buildMix {
             name = "guardian";
@@ -19695,7 +22796,7 @@ let
               sha256 =
                 "741aaa989ab656317a247d1db4dcd8e3efbd840b4d451bed7a37504ffdba6dc9";
             };
-            beamDeps  = [ uuid_1_1_3 poison_1_5_2 plug_1_1_1 jose_1_6_1 ];
+            beamDeps  = [ uuid_1_1_3 poison_1_5_2 plug_1_1_3 jose_1_7_3 ];
 
             meta = {
               description = ''Elixir Authentication framework'';
@@ -19714,8 +22815,8 @@ let
           fetchHex,
           uuid_1_1_3,
           poison_1_5_2,
-          plug_1_1_1,
-          jose_1_6_1
+          plug_1_1_3,
+          jose_1_7_3
         }:
           buildMix {
             name = "guardian";
@@ -19726,7 +22827,7 @@ let
               sha256 =
                 "9a79ae386f777774ab2910007cd30b20e2ea8da51c0712ec07f8cc8a13dfe293";
             };
-            beamDeps  = [ uuid_1_1_3 poison_1_5_2 plug_1_1_1 jose_1_6_1 ];
+            beamDeps  = [ uuid_1_1_3 poison_1_5_2 plug_1_1_3 jose_1_7_3 ];
 
             meta = {
               description = ''Elixir Authentication framework'';
@@ -19743,7 +22844,7 @@ let
           fetchHex,
           postgrex_0_11_1,
           guardian_0_9_1,
-          ecto_2_0_0_beta_0
+          ecto_2_0_0_beta_2
         }:
           buildMix {
             name = "guardian_db";
@@ -19754,7 +22855,7 @@ let
               sha256 =
                 "d8fc1d33885c42c9a35c1c370bfe676b68a9b4fb54ed33ff7075e32cadcd1279";
             };
-            beamDeps  = [ postgrex_0_11_1 guardian_0_9_1 ecto_2_0_0_beta_0 ];
+            beamDeps  = [ postgrex_0_11_1 guardian_0_9_1 ecto_2_0_0_beta_2 ];
 
             meta = {
               description = ''DB tracking for token validity'';
@@ -19821,7 +22922,7 @@ let
           fetchHex,
           websocket_client_1_1_0,
           poison_1_5_2,
-          httpoison_0_8_1
+          httpoison_0_8_2
         }:
           buildMix {
             name = "guri";
@@ -19832,7 +22933,7 @@ let
               sha256 =
                 "7fa0f2ebff111c368895798041d982f00eec34589d93f10bb323bb5a09e1f888";
             };
-            beamDeps  = [ websocket_client_1_1_0 poison_1_5_2 httpoison_0_8_1
+            beamDeps  = [ websocket_client_1_1_0 poison_1_5_2 httpoison_0_8_2
                       ];
 
             meta = {
@@ -19892,37 +22993,12 @@ let
 
     gutenex = gutenex_0_1_0;
 
-    hackney_1_0_6 = callPackage
-      (
-        {
-          buildRebar3, fetchHex, ssl_verify_hostname_1_0_1, idna_1_0_2
-        }:
-          buildRebar3 {
-            name = "hackney";
-            version = "1.0.6";
-            src = fetchHex {
-              pkg = "hackney";
-              version = "1.0.6";
-              sha256 =
-                "ba74e309ffd9413ca2fdc0c68871e31db9d6f779f8aa32f4828e08ebab8300da";
-            };
-
-            beamDeps  = [ ssl_verify_hostname_1_0_1 idna_1_0_2 ];
-
-            meta = {
-              description = ''simple HTTP client'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/benoitc/hackney";
-            };
-          }
-      ) {};
-
     hackney_1_1_0 = callPackage
       (
         {
-          buildRebar3, fetchHex, ssl_verify_hostname_1_0_6, idna_1_0_3
+          buildErlangMk, fetchHex, ssl_verify_hostname_1_0_6, idna_2_0_0
         }:
-          buildRebar3 {
+          buildErlangMk {
             name = "hackney";
             version = "1.1.0";
             src = fetchHex {
@@ -19931,8 +23007,7 @@ let
               sha256 =
                 "c8551072fdc8d5d5faacc5a31050cb943c3a8eb533149798b3ff424ef2d68501";
             };
-
-            beamDeps  = [ ssl_verify_hostname_1_0_6 idna_1_0_3 ];
+            beamDeps  = [ ssl_verify_hostname_1_0_6 idna_2_0_0 ];
 
             meta = {
               description = ''simple HTTP client'';
@@ -19945,9 +23020,9 @@ let
     hackney_1_3_1 = callPackage
       (
         {
-          buildRebar3, fetchHex, ssl_verify_hostname_1_0_6, idna_1_0_3
+          buildErlangMk, fetchHex, ssl_verify_hostname_1_0_6, idna_2_0_0
         }:
-          buildRebar3 {
+          buildErlangMk {
             name = "hackney";
             version = "1.3.1";
             src = fetchHex {
@@ -19956,8 +23031,7 @@ let
               sha256 =
                 "1a6316daceae744758fc88f2961e68c5a8b6cf1e1f49a28fc2caea6d27581add";
             };
-
-            beamDeps  = [ ssl_verify_hostname_1_0_6 idna_1_0_3 ];
+            beamDeps  = [ ssl_verify_hostname_1_0_6 idna_2_0_0 ];
 
             meta = {
               description = ''simple HTTP client'';
@@ -19970,9 +23044,9 @@ let
     hackney_1_3_2 = callPackage
       (
         {
-          buildRebar3, fetchHex, ssl_verify_hostname_1_0_6, idna_1_0_3
+          buildErlangMk, fetchHex, ssl_verify_hostname_1_0_6, idna_2_0_0
         }:
-          buildRebar3 {
+          buildErlangMk {
             name = "hackney";
             version = "1.3.2";
             src = fetchHex {
@@ -19981,8 +23055,42 @@ let
               sha256 =
                 "9b811cff637b29f9c7e2c61abf01986c85cd4f64a9422315fd803993b4e82615";
             };
+            beamDeps  = [ ssl_verify_hostname_1_0_6 idna_2_0_0 ];
 
-            beamDeps  = [ ssl_verify_hostname_1_0_6 idna_1_0_3 ];
+            meta = {
+              description = ''simple HTTP client'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/benoitc/hackney";
+            };
+          }
+      ) {};
+
+    hackney_1_4_10 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          ssl_verify_hostname_1_0_5,
+          mimerl_1_0_2,
+          idna_1_1_0,
+          certifi_0_3_0
+        }:
+          buildRebar3 {
+            name = "hackney";
+            version = "1.4.10";
+            src = fetchHex {
+              pkg = "hackney";
+              version = "1.4.10";
+              sha256 =
+                "dbdda6c342984ab0f35c5099dfab4b419a77771d096089a9173bf11ab6a0f7bf";
+            };
+
+            beamDeps  = [
+                          ssl_verify_hostname_1_0_5
+                          mimerl_1_0_2
+                          idna_1_1_0
+                          certifi_0_3_0
+                        ];
 
             meta = {
               description = ''simple HTTP client'';
@@ -20062,7 +23170,81 @@ let
           }
       ) {};
 
-    hackney = hackney_1_4_8;
+    hackney_1_5_7 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          ssl_verify_fun_1_1_0,
+          mimerl_1_0_2,
+          metrics_1_0_1,
+          idna_1_2_0,
+          certifi_0_4_0
+        }:
+          buildRebar3 {
+            name = "hackney";
+            version = "1.5.7";
+            src = fetchHex {
+              pkg = "hackney";
+              version = "1.5.7";
+              sha256 =
+                "627ed3f048b950d2dbbec918519f89f498a2136d74ca8180c15fad412b9bc869";
+            };
+
+            beamDeps  = [
+                          ssl_verify_fun_1_1_0
+                          mimerl_1_0_2
+                          metrics_1_0_1
+                          idna_1_2_0
+                          certifi_0_4_0
+                        ];
+
+            meta = {
+              description = ''simple HTTP client'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/benoitc/hackney";
+            };
+          }
+      ) {};
+
+    hackney_1_6_0 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          ssl_verify_fun_1_1_0,
+          mimerl_1_0_2,
+          metrics_1_0_1,
+          idna_1_2_0,
+          certifi_0_4_0
+        }:
+          buildRebar3 {
+            name = "hackney";
+            version = "1.6.0";
+            src = fetchHex {
+              pkg = "hackney";
+              version = "1.6.0";
+              sha256 =
+                "8b517f17c794ab611815042d24e149daafbd898d63aac8baf6750b890261c716";
+            };
+
+            beamDeps  = [
+                          ssl_verify_fun_1_1_0
+                          mimerl_1_0_2
+                          metrics_1_0_1
+                          idna_1_2_0
+                          certifi_0_4_0
+                        ];
+
+            meta = {
+              description = ''simple HTTP client'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/benoitc/hackney";
+            };
+          }
+      ) {};
+
+    hackney = hackney_1_6_0;
 
     haikunator_1_0_1 = callPackage
       (
@@ -20090,8 +23272,8 @@ let
 
     hamcrest_0_1_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "hamcrest";
             version = "0.1.1";
             src = fetchHex {
@@ -20159,19 +23341,19 @@ let
 
     harakiri = harakiri_0_6_0;
 
-    harvest_0_0_2 = callPackage
+    harvest_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
           buildMix {
             name = "harvest";
-            version = "0.0.2";
+            version = "0.0.3";
             src = fetchHex {
               pkg = "harvest";
-              version = "0.0.2";
+              version = "0.0.3";
               sha256 =
-                "d4d7289c7f166cd035140b6ebe6a14c4cf1f1552b597473bcc29588c8e394e6d";
+                "a9b52f37959a97e876603da5a34a0683e9e4a8e534fb7c672175602768fc812a";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
 
             meta = {
               description = ''Harvest Time Tracking API wrapper written in
@@ -20182,12 +23364,35 @@ let
           }
       ) {};
 
-    harvest = harvest_0_0_2;
+    harvest = harvest_0_0_3;
 
-    hash_ring_ex_1_1_2 = callPackage
+    hash_ring_0_4_0 = callPackage
       (
         {  buildRebar3, fetchHex }:
           buildRebar3 {
+            name = "hash_ring";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "hash_ring";
+              version = "0.4.0";
+              sha256 =
+                "97f7b4252e660ae3c66fd163277267d3445cfea097342027fe6cc3512fdafd16";
+            };
+
+            meta = {
+              description = ''Consistent Hash Ring'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sile/hash_ring";
+            };
+          }
+      ) {};
+
+    hash_ring = hash_ring_0_4_0;
+
+    hash_ring_ex_1_1_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
             name = "hash_ring_ex";
             version = "1.1.2";
             src = fetchHex {
@@ -20208,17 +23413,17 @@ let
 
     hash_ring_ex = hash_ring_ex_1_1_2;
 
-    hashids_2_0_1 = callPackage
+    hashids_2_0_2 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "hashids";
-            version = "2.0.1";
+            version = "2.0.2";
             src = fetchHex {
               pkg = "hashids";
-              version = "2.0.1";
+              version = "2.0.2";
               sha256 =
-                "8f16b2bf57a71ce5da716bdd731c61e789e2c25f1fd5c00130f0efee9a251a26";
+                "3dae063908483454ec691e61da580a056997b4c9affcf12b2330937ee48e6bf0";
             };
 
             meta = {
@@ -20230,7 +23435,54 @@ let
           }
       ) {};
 
-    hashids = hashids_2_0_1;
+    hashids = hashids_2_0_2;
+
+    hdr_histogram_0_2_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "hdr_histogram";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "hdr_histogram";
+              version = "0.2.0";
+              sha256 =
+                "42b6d038deeb6a6b695f5f18842afef240b2510e433bc08b21c9b3daa99a221e";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''High Dynamic Range Histogram Erlang/OTP
+                            library'';
+              license = with stdenv.lib.licenses; [ cc0 bsd3 ];
+              homepage = "https://github.com/HdrHistogram/hdr_histogram_erl";
+            };
+          }
+      ) {};
+
+    hdr_histogram = hdr_histogram_0_2_0;
+
+    heap_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "heap";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "heap";
+              version = "1.0.0";
+              sha256 =
+                "39ddb188337ef43dd46e1920abba0bb88821a8cc19cc8688aa36045a58f733d0";
+            };
+
+            meta = {
+              description = ''Heap data structure and tools'';
+
+            };
+          }
+      ) {};
+
+    heap = heap_1_0_0;
 
     heapq_0_0_1 = callPackage
       (
@@ -20256,6 +23508,28 @@ let
 
     heapq = heapq_0_0_1;
 
+    hedwig_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex, gproc_0_5_0 }:
+          buildMix {
+            name = "hedwig";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "hedwig";
+              version = "0.3.0";
+              sha256 =
+                "2a1dfd91c56c43e804fbfb7a24fcaee67f17add19615e66321205ad486231e53";
+            };
+            beamDeps  = [ gproc_0_5_0 ];
+
+            meta = {
+              description = ''An adapter-based chat bot framework'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/hedwig-im/hedwig";
+            };
+          }
+      ) {};
+
     hedwig_1_0_0_rc3 = callPackage
       (
         {  buildMix, fetchHex, gproc_0_5_0 }:
@@ -20280,9 +23554,57 @@ let
 
     hedwig = hedwig_1_0_0_rc3;
 
+    hedwig_hipchat_0_9_4 = callPackage
+      (
+        {  buildMix, fetchHex, romeo_0_4_0, hedwig_0_3_0 }:
+          buildMix {
+            name = "hedwig_hipchat";
+            version = "0.9.4";
+            src = fetchHex {
+              pkg = "hedwig_hipchat";
+              version = "0.9.4";
+              sha256 =
+                "4d42f307e1c9fd91a47808476a1c278997c6990a69db41f6ed081b61a69056f4";
+            };
+            beamDeps  = [ romeo_0_4_0 hedwig_0_3_0 ];
+
+            meta = {
+              description = ''A HipChat adapter for Hedwig'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jwarlander/hedwig_hipchat";
+            };
+          }
+      ) {};
+
+    hedwig_hipchat = hedwig_hipchat_0_9_4;
+
+    hedwig_irc_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, hedwig_0_3_0, exirc_0_10_0 }:
+          buildMix {
+            name = "hedwig_irc";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "hedwig_irc";
+              version = "0.1.1";
+              sha256 =
+                "367d1a654069078fad1a5d27a1447c6aa6044517fbe46c9e10182faa418d6085";
+            };
+            beamDeps  = [ hedwig_0_3_0 exirc_0_10_0 ];
+
+            meta = {
+              description = ''An IRC adapter for Hedwig'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jeffweiss/hedwig_irc";
+            };
+          }
+      ) {};
+
+    hedwig_irc = hedwig_irc_0_1_1;
+
     hedwig_xmpp_1_0_0_rc2 = callPackage
       (
-        {  buildMix, fetchHex, romeo_0_4_0, hedwig_1_0_0_rc3 }:
+        {  buildMix, fetchHex, romeo_0_4_0, hedwig_0_3_0 }:
           buildMix {
             name = "hedwig_xmpp";
             version = "1.0.0-rc2";
@@ -20292,7 +23614,7 @@ let
               sha256 =
                 "79d60e836763c9eb88798bb5921e8eda717fbbf3030ca401f2a3915f58bc59e0";
             };
-            beamDeps  = [ romeo_0_4_0 hedwig_1_0_0_rc3 ];
+            beamDeps  = [ romeo_0_4_0 hedwig_0_3_0 ];
 
             meta = {
               description = ''An XMPP adapter for Hedwig'';
@@ -20354,7 +23676,7 @@ let
 
     hello_world_header_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_0_8_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, plug_0_5_2, cowboy_1_0_4 }:
           buildMix {
             name = "hello_world_header";
             version = "0.0.1";
@@ -20364,7 +23686,7 @@ let
               sha256 =
                 "caddb7712a66326face465231cf3bfe9210a62787cf5f499f9fbcc04e4695242";
             };
-            beamDeps  = [ plug_0_8_1 cowboy_1_0_4 ];
+            beamDeps  = [ plug_0_5_2 cowboy_1_0_4 ];
 
             meta = {
               description = ''Demo plug used for tutorial purposes.'';
@@ -20432,8 +23754,8 @@ let
           fetchHex,
           table_rex_0_4_0,
           ibrowse_4_2_2,
-          httpotion_2_1_0,
-          floki_0_7_1
+          httpotion_2_2_2,
+          floki_0_7_2
         }:
           buildMix {
             name = "hex_searcher";
@@ -20447,8 +23769,8 @@ let
             beamDeps  = [
                           table_rex_0_4_0
                           ibrowse_4_2_2
-                          httpotion_2_1_0
-                          floki_0_7_1
+                          httpotion_2_2_2
+                          floki_0_7_2
                         ];
 
             meta = {
@@ -20534,7 +23856,7 @@ let
 
     hexoku_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, jsex_2_0_0, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, jsex_2_0_0, httpoison_0_8_2 }:
           buildMix {
             name = "hexoku";
             version = "0.1.0";
@@ -20544,7 +23866,7 @@ let
               sha256 =
                 "39c24660842061d71922df5f87ac4fa065b3f18f64a4f438d40495ffeb9d711b";
             };
-            beamDeps  = [ jsex_2_0_0 httpoison_0_8_1 ];
+            beamDeps  = [ jsex_2_0_0 httpoison_0_8_2 ];
 
             meta = {
               description = ''Heroku API client and Heroku Mix tasks for Elixir
@@ -20580,6 +23902,67 @@ let
 
     hlc = hlc_2_0_0;
 
+    hmc5883l_0_5_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          multidef_0_2_1,
+          mon_handler_1_0_2,
+          elixir_ale_0_4_1,
+          dialyze_0_1_4
+        }:
+          buildMix {
+            name = "hmc5883l";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "hmc5883l";
+              version = "0.5.0";
+              sha256 =
+                "cbda55c14a5e1fc5accd49de948331c5dc264286c6ecd58c348cb54c66fe6fa4";
+            };
+            beamDeps  = [
+                          multidef_0_2_1
+                          mon_handler_1_0_2
+                          elixir_ale_0_4_1
+                          dialyze_0_1_4
+                        ];
+
+            meta = {
+              longDescription = ''OTP application for reading the HMC5883L
+                                3-axis magnetometer. Magnetic heading is read at
+                                approx. 13hz (every 75ms)'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/tattdcodemonkey/hmc5883l";
+            };
+          }
+      ) {};
+
+    hmc5883l = hmc5883l_0_5_0;
+
+    hoax_0_11_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "hoax";
+            version = "0.11.1";
+            src = fetchHex {
+              pkg = "hoax";
+              version = "0.11.1";
+              sha256 =
+                "49476b151d5aac771fca9fc079c745339203d5a7313b357e90942b5d929d0110";
+            };
+
+            meta = {
+              description = ''Yet another mocking library for Erlang'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/xenolinguist/hoax";
+            };
+          }
+      ) {};
+
+    hoax = hoax_0_11_1;
+
     holidays_0_1_1 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -20604,21 +23987,21 @@ let
 
     holidays = holidays_0_1_1;
 
-    honeybadger_0_3_1 = callPackage
+    honeybadger_0_4_0 = callPackage
       (
         {
-          buildMix, fetchHex, poison_1_5_2, plug_0_8_1, httpoison_0_8_1
+          buildMix, fetchHex, poison_2_1_0, plug_1_1_3, httpoison_0_8_2
         }:
           buildMix {
             name = "honeybadger";
-            version = "0.3.1";
+            version = "0.4.0";
             src = fetchHex {
               pkg = "honeybadger";
-              version = "0.3.1";
+              version = "0.4.0";
               sha256 =
-                "9555cbe7a4069f27f8182c066411f6c439f79f147eb0a1605e13d55b07fb260b";
+                "d2810f38e4a600476ac585c1980dffdf2f62eb2212fe27f76eb07e0ea2bc2dd8";
             };
-            beamDeps  = [ poison_1_5_2 plug_0_8_1 httpoison_0_8_1 ];
+            beamDeps  = [ poison_2_1_0 plug_1_1_3 httpoison_0_8_2 ];
 
             meta = {
               longDescription = ''Elixir client, Plug and error_logger for
@@ -20631,7 +24014,7 @@ let
           }
       ) {};
 
-    honeybadger = honeybadger_0_3_1;
+    honeybadger = honeybadger_0_4_0;
 
     honeydew_0_0_8 = callPackage
       (
@@ -20682,7 +24065,7 @@ let
 
     hound_0_8_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
           buildMix {
             name = "hound";
             version = "0.8.2";
@@ -20692,7 +24075,7 @@ let
               sha256 =
                 "3ecb4b7d20de76e6790d61e53555e3486ed5810bb6f0052321620b1d46ffb188";
             };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_1 ];
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
 
             meta = {
               description = ''Webdriver library for integration testing and
@@ -20705,15 +24088,41 @@ let
 
     hound = hound_0_8_2;
 
+    hpack_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "hpack";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "hpack";
+              version = "1.0.0";
+              sha256 =
+                "092fe46ef1c59bf2d7d47f627520321eb6965861db1516c95ef19d484958aea5";
+            };
+
+            meta = {
+              longDescription = ''Implementation of the
+                                [HPack](https://http2.github.io/http2-spec/compression.html)
+                                protocol, a compression format for efficiently
+                                representing HTTP header fields, to be used in
+                                HTTP/2.'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    hpack = hpack_1_0_0;
+
     hr_0_2_2 = callPackage
       (
         {
           buildMix,
           fetchHex,
           yyid_0_1_2,
-          plug_1_1_1,
-          phoenix_html_2_5_0,
-          phoenix_ecto_3_0_0_beta_0,
+          plug_1_1_3,
+          phoenix_html_2_5_1,
+          phoenix_ecto_3_0_0_beta_2,
           phoenix_1_1_4,
           oauth2_0_3_0,
           linguist_0_1_5,
@@ -20731,9 +24140,9 @@ let
             };
             beamDeps  = [
                           yyid_0_1_2
-                          plug_1_1_1
-                          phoenix_html_2_5_0
-                          phoenix_ecto_3_0_0_beta_0
+                          plug_1_1_3
+                          phoenix_html_2_5_1
+                          phoenix_ecto_3_0_0_beta_2
                           phoenix_1_1_4
                           oauth2_0_3_0
                           linguist_0_1_5
@@ -20754,7 +24163,7 @@ let
 
     hstore_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, postgrex_0_6_0, apex_0_3_7 }:
+        {  buildMix, fetchHex, postgrex_0_8_4, apex_0_3_7 }:
           buildMix {
             name = "hstore";
             version = "0.0.2";
@@ -20764,7 +24173,7 @@ let
               sha256 =
                 "bd5040285c29162685f4db37ef3ad30c2bb473f5c54fe03ef29b4383cf23504a";
             };
-            beamDeps  = [ postgrex_0_6_0 apex_0_3_7 ];
+            beamDeps  = [ postgrex_0_8_4 apex_0_3_7 ];
 
             meta = {
               longDescription = ''A collection of encoders and decoders for
@@ -20777,17 +24186,17 @@ let
 
     hstore = hstore_0_0_2;
 
-    html_builder_0_1_0 = callPackage
+    html_builder_0_1_1 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "html_builder";
-            version = "0.1.0";
+            version = "0.1.1";
             src = fetchHex {
               pkg = "html_builder";
-              version = "0.1.0";
+              version = "0.1.1";
               sha256 =
-                "825fa6d1be1c42bf91dcd198c791eb32156973a70273afb93616285f97dce0c2";
+                "7cba41180419a26e2fb8ff1c075efcdf31e4079e06144d58623c32c1de3835d9";
             };
 
             meta = {
@@ -20799,7 +24208,7 @@ let
           }
       ) {};
 
-    html_builder = html_builder_0_1_0;
+    html_builder = html_builder_0_1_1;
 
     html_entities_0_3_0 = callPackage
       (
@@ -20824,6 +24233,28 @@ let
 
     html_entities = html_entities_0_3_0;
 
+    html_sanitize_ex_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex, mochiweb_2_12_2 }:
+          buildMix {
+            name = "html_sanitize_ex";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "html_sanitize_ex";
+              version = "0.1.2";
+              sha256 =
+                "e6937b25832bcdccb8b547632428de7fe034199c871f037311d4340c345348a7";
+            };
+            beamDeps  = [ mochiweb_2_12_2 ];
+
+            meta = {
+              description = ''HTML sanitizer for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rrrene/html_sanitize_ex";
+            };
+          }
+      ) {};
+
     html_sanitize_ex_0_3_1 = callPackage
       (
         {  buildMix, fetchHex, mochiweb_2_12_2 }:
@@ -20906,7 +24337,7 @@ let
           fetchHex,
           pool_0_0_2,
           excoveralls_0_5_1,
-          ex_doc_0_6_2,
+          ex_doc_0_7_3,
           earmark_0_1_19,
           dialyze_0_1_4
         }:
@@ -20922,7 +24353,7 @@ let
             beamDeps  = [
                           pool_0_0_2
                           excoveralls_0_5_1
-                          ex_doc_0_6_2
+                          ex_doc_0_7_3
                           earmark_0_1_19
                           dialyze_0_1_4
                         ];
@@ -20938,13 +24369,62 @@ let
 
     http = http_0_0_1;
 
+    http2_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "http2";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "http2";
+              version = "0.0.2";
+              sha256 =
+                "fd8354d9c7800223ffcb66c2c359a40a5be3809ea4e3b2046fee253a5d049250";
+            };
+
+            meta = {
+              description = ''HPACK implementation for Elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/kiennt/hpack";
+            };
+          }
+      ) {};
+
+    http2 = http2_0_0_2;
+
+    http_params_serializer_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "http_params_serializer";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "http_params_serializer";
+              version = "0.1.1";
+              sha256 =
+                "7d6c2184814b7232130a3193c9832827c5eeaaae928155d96863ec426da6ce69";
+            };
+
+            meta = {
+              longDescription = ''A small library to serialize deeply nested
+                                datastructures into HTTP parameters that most
+                                backends do understand'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/ruby2elixir/http_params_serializer";
+            };
+          }
+      ) {};
+
+    http_params_serializer = http_params_serializer_0_1_1;
+
     http_proxy_1_0_1 = callPackage
       (
         {
           buildMix,
           fetchHex,
           plug_1_0_3,
-          hackney_1_4_8,
+          hackney_1_4_10,
           exjsx_3_2_0,
           cowboy_1_0_4
         }:
@@ -20957,7 +24437,7 @@ let
               sha256 =
                 "7ff5d10c8932b189844f9735742250e4fdbe9de5eba40c84e7447f54fc75fdd3";
             };
-            beamDeps  = [ plug_1_0_3 hackney_1_4_8 exjsx_3_2_0 cowboy_1_0_4
+            beamDeps  = [ plug_1_0_3 hackney_1_4_10 exjsx_3_2_0 cowboy_1_0_4
                       ];
 
             meta = {
@@ -20978,7 +24458,7 @@ let
           fetchHex,
           xml_builder_0_0_8,
           poison_1_5_2,
-          plug_1_1_1,
+          plug_1_1_3,
           cowboy_1_0_4
         }:
           buildMix {
@@ -20991,7 +24471,7 @@ let
                 "9a2844cc8c880621ca2689e0056f50e2c19e3b0e87a8e2524489459b377a8dc3";
             };
             beamDeps  = [
-                          xml_builder_0_0_8 poison_1_5_2 plug_1_1_1 cowboy_1_0_4
+                          xml_builder_0_0_8 poison_1_5_2 plug_1_1_3 cowboy_1_0_4
                         ];
 
             meta = {
@@ -21009,8 +24489,8 @@ let
 
     http_signature_1_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "http_signature";
             version = "1.1.0";
             src = fetchHex {
@@ -21059,7 +24539,7 @@ let
 
     httpehaviour_0_9_0 = callPackage
       (
-        {  buildMix, fetchHex, hackney_1_4_8 }:
+        {  buildMix, fetchHex, hackney_1_6_0 }:
           buildMix {
             name = "httpehaviour";
             version = "0.9.0";
@@ -21069,7 +24549,7 @@ let
               sha256 =
                 "54e93dcf0e62d392781078cf029478194797fe67c98dffe99a91b5d5ec33e4e5";
             };
-            beamDeps  = [ hackney_1_4_8 ];
+            beamDeps  = [ hackney_1_6_0 ];
 
             meta = {
               description = ''Yet Yet Another HTTP client for Elixir powered by
@@ -21084,7 +24564,7 @@ let
 
     httpoison_0_7_1 = callPackage
       (
-        {  buildMix, fetchHex, hackney_1_3_2 }:
+        {  buildMix, fetchHex, hackney_1_4_8 }:
           buildMix {
             name = "httpoison";
             version = "0.7.1";
@@ -21094,7 +24574,7 @@ let
               sha256 =
                 "ad146f8a1e8cb81d50337ca62bd83a80fc1e3df768b93a9ed4c497c3a554c9b0";
             };
-            beamDeps  = [ hackney_1_3_2 ];
+            beamDeps  = [ hackney_1_4_8 ];
 
             meta = {
               description = ''Yet Another HTTP client for Elixir powered by
@@ -21107,7 +24587,7 @@ let
 
     httpoison_0_7_5 = callPackage
       (
-        {  buildMix, fetchHex, hackney_1_3_2 }:
+        {  buildMix, fetchHex, hackney_1_4_8 }:
           buildMix {
             name = "httpoison";
             version = "0.7.5";
@@ -21117,7 +24597,7 @@ let
               sha256 =
                 "a9b32452df3c4671c012953d6bb15e3a52bbb41b618f72cbd464e8c9320847c9";
             };
-            beamDeps  = [ hackney_1_3_2 ];
+            beamDeps  = [ hackney_1_4_8 ];
 
             meta = {
               description = ''Yet Another HTTP client for Elixir powered by
@@ -21130,7 +24610,7 @@ let
 
     httpoison_0_8_0 = callPackage
       (
-        {  buildMix, fetchHex, hackney_1_4_8 }:
+        {  buildMix, fetchHex, hackney_1_4_10 }:
           buildMix {
             name = "httpoison";
             version = "0.8.0";
@@ -21140,7 +24620,7 @@ let
               sha256 =
                 "7a6455689233867da40f285e9e3bcce506cd0c60b1094e1c449de76a46b9e50b";
             };
-            beamDeps  = [ hackney_1_4_8 ];
+            beamDeps  = [ hackney_1_4_10 ];
 
             meta = {
               description = ''Yet Another HTTP client for Elixir powered by
@@ -21151,19 +24631,19 @@ let
           }
       ) {};
 
-    httpoison_0_8_1 = callPackage
+    httpoison_0_8_2 = callPackage
       (
-        {  buildMix, fetchHex, hackney_1_4_8 }:
+        {  buildMix, fetchHex, hackney_1_5_7 }:
           buildMix {
             name = "httpoison";
-            version = "0.8.1";
+            version = "0.8.2";
             src = fetchHex {
               pkg = "httpoison";
-              version = "0.8.1";
+              version = "0.8.2";
               sha256 =
-                "b4cf6955675f86c77f939b10d29491632a1d227ce1dc4c4db759bc4a52cea600";
+                "00738e34fe2e254199c0324ef60b8150a7b2ced66c2296c4df8425c8e9b8d5c0";
             };
-            beamDeps  = [ hackney_1_4_8 ];
+            beamDeps  = [ hackney_1_5_7 ];
 
             meta = {
               description = ''Yet Another HTTP client for Elixir powered by
@@ -21174,85 +24654,19 @@ let
           }
       ) {};
 
-    httpoison = httpoison_0_8_1;
+    httpoison = httpoison_0_8_2;
 
-    httpotion_1_0_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "httpotion";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "httpotion";
-              version = "1.0.0";
-              sha256 =
-                "1ff7af8a280928316ba43e15644b75eedd4481dcd56426beb6cad920b244b734";
-            };
-
-            meta = {
-              description = ''Fancy HTTP client for Elixir, based on
-                            ibrowse.'';
-              license = stdenv.lib.licenses.unlicense;
-              homepage = "https://github.com/myfreeweb/httpotion";
-            };
-          }
-      ) {};
-
-    httpotion_2_0_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "httpotion";
-            version = "2.0.0";
-            src = fetchHex {
-              pkg = "httpotion";
-              version = "2.0.0";
-              sha256 =
-                "550c94a898f3f2f0bb5f45a18380df66c478fc05b899a1febd7fd3ca666b93c8";
-            };
-
-            meta = {
-              description = ''Fancy HTTP client for Elixir, based on
-                            ibrowse.'';
-              license = stdenv.lib.licenses.unlicense;
-              homepage = "https://github.com/myfreeweb/httpotion";
-            };
-          }
-      ) {};
-
-    httpotion_2_1_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "httpotion";
-            version = "2.1.0";
-            src = fetchHex {
-              pkg = "httpotion";
-              version = "2.1.0";
-              sha256 =
-                "d34f1e82283b6b953f611dc24571aa2586e72e19d3d6632b8e3dba78cf1e3761";
-            };
-
-            meta = {
-              description = ''Fancy HTTP client for Elixir, based on
-                            ibrowse.'';
-              license = stdenv.lib.licenses.unlicense;
-              homepage = "https://github.com/myfreeweb/httpotion";
-            };
-          }
-      ) {};
-
-    httpotion_2_2_0 = callPackage
+    httpotion_2_2_2 = callPackage
       (
         {  buildMix, fetchHex, ibrowse_4_2_2 }:
           buildMix {
             name = "httpotion";
-            version = "2.2.0";
+            version = "2.2.2";
             src = fetchHex {
               pkg = "httpotion";
-              version = "2.2.0";
+              version = "2.2.2";
               sha256 =
-                "b5df0909f1cce248a021a1ba970053dbb59bd2695a188396bfc08b6bd73cbd77";
+                "47c6b6c535592547366fe16bfa175385e7de09eecbb2dc6b0f2cea526ef45fbd";
             };
             beamDeps  = [ ibrowse_4_2_2 ];
 
@@ -21265,7 +24679,7 @@ let
           }
       ) {};
 
-    httpotion = httpotion_2_2_0;
+    httpotion = httpotion_2_2_2;
 
     httprot_0_1_7 = callPackage
       (
@@ -21317,7 +24731,7 @@ let
 
     huex_0_5_0 = callPackage
       (
-        {  buildMix, fetchHex, json_0_3_3, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, json_0_3_3, httpoison_0_8_2 }:
           buildMix {
             name = "huex";
             version = "0.5.0";
@@ -21327,7 +24741,7 @@ let
               sha256 =
                 "e5fe37fdc4299567922697516df8ade2f64d2c1573dc9a253e5037f66576858f";
             };
-            beamDeps  = [ json_0_3_3 httpoison_0_8_1 ];
+            beamDeps  = [ json_0_3_3 httpoison_0_8_2 ];
 
             meta = {
               description = ''Elixir client for Philips Hue connected light
@@ -21417,8 +24831,8 @@ let
           fetchHex,
           porcelain_2_0_1,
           poison_1_5_2,
-          plug_1_1_1,
-          httpoison_0_8_1,
+          plug_1_1_3,
+          httpoison_0_8_2,
           cowboy_1_0_4
         }:
           buildMix {
@@ -21433,8 +24847,8 @@ let
             beamDeps  = [
                           porcelain_2_0_1
                           poison_1_5_2
-                          plug_1_1_1
-                          httpoison_0_8_1
+                          plug_1_1_3
+                          httpoison_0_8_2
                           cowboy_1_0_4
                         ];
 
@@ -21495,7 +24909,7 @@ let
 
     iam_role_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, jsone_1_2_0 }:
+        {  buildMix, fetchHex, jsone_1_2_1 }:
           buildMix {
             name = "iam_role";
             version = "1.0.0";
@@ -21505,7 +24919,7 @@ let
               sha256 =
                 "acfc5d5c5130a36dfb2b460f790bd9e32bf39274f17333bd65c28d216983761d";
             };
-            beamDeps  = [ jsone_1_2_0 ];
+            beamDeps  = [ jsone_1_2_1 ];
 
             meta = {
               description = ''Application for automatically fetching AWS IAM
@@ -21592,8 +25006,8 @@ let
 
     idna_1_0_2 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "idna";
             version = "1.0.2";
             src = fetchHex {
@@ -21632,20 +25046,108 @@ let
           }
       ) {};
 
-    idna = idna_1_0_3;
+    idna_1_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "idna";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "idna";
+              version = "1.1.0";
+              sha256 =
+                "d399393011cd2fa93761d70199b604b2f055bcf6cb45cac922870e122d2eb2fe";
+            };
 
-    ielixir_0_9_0 = callPackage
+            meta = {
+              description = ''A pure Erlang IDNA implementation'';
+
+              homepage = "https://github.com/benoitc/erlang-idna";
+            };
+          }
+      ) {};
+
+    idna_1_2_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "idna";
+            version = "1.2.0";
+            src = fetchHex {
+              pkg = "idna";
+              version = "1.2.0";
+              sha256 =
+                "1d724cdafb66397e61774ead242c9b725de7033cde8ea98fa4a91e64ac5ef5b3";
+            };
+
+            meta = {
+              description = ''A pure Erlang IDNA implementation'';
+
+              homepage = "https://github.com/benoitc/erlang-idna";
+            };
+          }
+      ) {};
+
+    idna_2_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "idna";
+            version = "2.0.0";
+            src = fetchHex {
+              pkg = "idna";
+              version = "2.0.0";
+              sha256 =
+                "881226593c79eb4b2bf7106a3f2995c70ee6ffbb371c8d1bc71f2869686089f4";
+            };
+
+            meta = {
+              description = ''A pure Erlang IDNA implementation'';
+
+              homepage = "https://github.com/benoitc/erlang-idna";
+            };
+          }
+      ) {};
+
+    idna = idna_2_0_0;
+
+    ieex_0_0_3 = callPackage
       (
         {  buildMix, fetchHex }:
+          buildMix {
+            name = "ieex";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "ieex";
+              version = "0.0.3";
+              sha256 =
+                "c448a86c7979bc75f98e9eb32473041975fb633bc9715f1965958e4a9dbbd1ff";
+            };
+
+            meta = {
+              description = ''Biblioteca para validacao de Inscricao
+                            Estadual'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/edmaarcosta/IEEx";
+            };
+          }
+      ) {};
+
+    ieex = ieex_0_0_3;
+
+    ielixir_0_9_5 = callPackage
+      (
+        {  buildMix, fetchHex, sqlite_ecto_0_5_0, ecto_0_15_0 }:
           buildMix {
             name = "ielixir";
-            version = "0.9.0";
+            version = "0.9.5";
             src = fetchHex {
               pkg = "ielixir";
-              version = "0.9.0";
+              version = "0.9.5";
               sha256 =
-                "a6cce07a3aeb493bd248f063ba0327e88103b64c0c54657e344dab1c6f568078";
+                "77dae7b4b147da21161b6de0662d3bdeb13d15b12866b2e67add5ec3c550b7ce";
             };
+            beamDeps  = [ sqlite_ecto_0_5_0 ecto_0_15_0 ];
 
             meta = {
               description = ''Jupyter`s kernel for Elixir programming
@@ -21656,11 +25158,11 @@ let
           }
       ) {};
 
-    ielixir = ielixir_0_9_0;
+    ielixir = ielixir_0_9_5;
 
     ifttt_oauth_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, oauth2_0_5_0 }:
+        {  buildMix, fetchHex, oauth2_0_6_0 }:
           buildMix {
             name = "ifttt_oauth";
             version = "0.0.1";
@@ -21670,7 +25172,7 @@ let
               sha256 =
                 "9029506687be770891b3fb54d9e39bab9dd0f65a9551c6b335a3b0a60dc3026c";
             };
-            beamDeps  = [ oauth2_0_5_0 ];
+            beamDeps  = [ oauth2_0_6_0 ];
 
             meta = {
               longDescription = ''A simple Elixir wrapper around
@@ -21757,8 +25259,8 @@ let
 
     inaka_aleppo_0_9_9 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "inaka_aleppo";
             version = "0.9.9";
             src = fetchHex {
@@ -21780,8 +25282,8 @@ let
 
     inaka_mixer_0_1_5 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "inaka_mixer";
             version = "0.1.5";
             src = fetchHex {
@@ -21897,17 +25399,17 @@ let
 
     inet_cidr = inet_cidr_1_0_1;
 
-    inflex_0_2_3 = callPackage
+    inflex_0_2_4 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "inflex";
-            version = "0.2.3";
+            version = "0.2.4";
             src = fetchHex {
               pkg = "inflex";
-              version = "0.2.3";
+              version = "0.2.4";
               sha256 =
-                "1acb28e23bfb8a38e07fbb764a2691a59fce5c499a79fd27e869a43495710e64";
+                "f4bf8389a59b04f2b92be024d6234fc3583863f06d23db70324f9cb6b5eba8bf";
             };
 
             meta = {
@@ -22032,19 +25534,19 @@ let
 
     ini = ini_0_0_1;
 
-    inquisitor_0_0_2 = callPackage
+    inquisitor_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, ecto_2_0_0_beta_0 }:
+        {  buildMix, fetchHex, ecto_2_0_0_beta_2 }:
           buildMix {
             name = "inquisitor";
-            version = "0.0.2";
+            version = "0.1.0";
             src = fetchHex {
               pkg = "inquisitor";
-              version = "0.0.2";
+              version = "0.1.0";
               sha256 =
-                "a4d6ed194db0600bad5a19b4efbdd900a0aa943ad79dc03a9a81aaba7ffd4d3d";
+                "06a2cbfba419cc1d81f9c6a62a7f501f3aabaf991b514aa2b012c582c50609bd";
             };
-            beamDeps  = [ ecto_2_0_0_beta_0 ];
+            beamDeps  = [ ecto_2_0_0_beta_2 ];
 
             meta = {
               description = ''Easily build extendable and composable Ecto
@@ -22055,7 +25557,7 @@ let
           }
       ) {};
 
-    inquisitor = inquisitor_0_0_2;
+    inquisitor = inquisitor_0_1_0;
 
     insert_ordered_set_0_0_1 = callPackage
       (
@@ -22085,19 +25587,19 @@ let
 
     insert_ordered_set = insert_ordered_set_0_0_1;
 
-    insight_0_0_2 = callPackage
+    insight_0_1_3 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "insight";
-            version = "0.0.2";
+            version = "0.1.3";
             src = fetchHex {
               pkg = "insight";
-              version = "0.0.2";
+              version = "0.1.3";
               sha256 =
-                "0088430e0a2826d7b52313d9c29af67712530b18a21a192d5e134f975f0596fe";
+                "5d7519317e4235d56128bef37a5319308921eab748df3295f1fa2842763a6ea3";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Elixir package for consuming any Insight-powered
@@ -22108,7 +25610,7 @@ let
           }
       ) {};
 
-    insight = insight_0_0_2;
+    insight = insight_0_1_3;
 
     insights_0_0_2 = callPackage
       (
@@ -22134,21 +25636,21 @@ let
 
     insights = insights_0_0_2;
 
-    instream_0_9_0 = callPackage
+    instream_0_10_0 = callPackage
       (
         {
-          buildMix, fetchHex, poolboy_1_5_1, poison_1_5_2, hackney_1_4_8
+          buildMix, fetchHex, poolboy_1_5_1, poison_1_0_3, hackney_1_6_0
         }:
           buildMix {
             name = "instream";
-            version = "0.9.0";
+            version = "0.10.0";
             src = fetchHex {
               pkg = "instream";
-              version = "0.9.0";
+              version = "0.10.0";
               sha256 =
-                "e0413b68ca4a593ca11179e968c7c5f79d897a2435d5d40def68f6bc59d7a042";
+                "e43e1400c6c177cb3295585b2d29312571b1f8aaea643b4f605705db858283c4";
             };
-            beamDeps  = [ poolboy_1_5_1 poison_1_5_2 hackney_1_4_8 ];
+            beamDeps  = [ poolboy_1_5_1 poison_1_0_3 hackney_1_6_0 ];
 
             meta = {
               description = ''InfluxDB driver for Elixir'';
@@ -22158,7 +25660,7 @@ let
           }
       ) {};
 
-    instream = instream_0_9_0;
+    instream = instream_0_10_0;
 
     instrumental_0_1_3 = callPackage
       (
@@ -22186,7 +25688,7 @@ let
 
     intellij_elixir_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex, exrm_0_15_1 }:
+        {  buildMix, fetchHex, exrm_0_14_17 }:
           buildMix {
             name = "intellij_elixir";
             version = "0.1.2";
@@ -22196,7 +25698,7 @@ let
               sha256 =
                 "023e970e20ef19dbd6e818708c687faf9b47b525b9771bc910a4e48adc101a46";
             };
-            beamDeps  = [ exrm_0_15_1 ];
+            beamDeps  = [ exrm_0_14_17 ];
 
             meta = {
               longDescription = ''IntellijElixir allows intellij-elixir to ask
@@ -22237,7 +25739,7 @@ let
 
     iplist_1_0_2 = callPackage
       (
-        {  buildMix, fetchHex, earmark_0_2_1, cidr_0_5_0 }:
+        {  buildMix, fetchHex, earmark_0_2_1, cidr_1_0_0 }:
           buildMix {
             name = "iplist";
             version = "1.0.2";
@@ -22247,7 +25749,7 @@ let
               sha256 =
                 "fae5b5accc8b7a7618c2d1fbf94607ce6e79ca3b493da6643dbb1bd92be30bd4";
             };
-            beamDeps  = [ earmark_0_2_1 cidr_0_5_0 ];
+            beamDeps  = [ earmark_0_2_1 cidr_1_0_0 ];
 
             meta = {
               description = ''Library and CLI tool to expand IPv4 ranges to
@@ -22260,6 +25762,53 @@ let
 
     iplist = iplist_1_0_2;
 
+    iptools_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "iptools";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "iptools";
+              version = "0.0.1";
+              sha256 =
+                "c8733e46e083c7497f3293e6e366e6fe384abb67557a72c3e362434e4eb0665d";
+            };
+
+            meta = {
+              description = ''A set of functions for validating and
+                            transforming IPv4 addresses'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/blackfist/iptools";
+            };
+          }
+      ) {};
+
+    iptools = iptools_0_0_1;
+
+    is_chinese_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "is_chinese";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "is_chinese";
+              version = "1.0.0";
+              sha256 =
+                "907da2e2995c104bb89152d276c41337b6c4075aa866663e3fb7ebe48da8ff62";
+            };
+
+            meta = {
+              description = ''Check whether string is Chinese'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/lidashuang/is_chinese";
+            };
+          }
+      ) {};
+
+    is_chinese = is_chinese_1_0_0;
+
     is_email_0_0_2 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -22286,7 +25835,7 @@ let
 
     is_up_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, httpotion_2_1_0 }:
+        {  buildMix, fetchHex, httpotion_2_2_2 }:
           buildMix {
             name = "is_up";
             version = "1.0.0";
@@ -22296,7 +25845,7 @@ let
               sha256 =
                 "8811dde26c0142174987941b6395e1934e54c3a88db1d5b19e38b6f794e93c87";
             };
-            beamDeps  = [ httpotion_2_1_0 ];
+            beamDeps  = [ httpotion_2_2_2 ];
 
             meta = {
               description = ''Check whether a given url is up.'';
@@ -22363,7 +25912,7 @@ let
     isbndbex_0_0_1 = callPackage
       (
         {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1, credo_0_1_10
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, credo_0_3_2
         }:
           buildMix {
             name = "isbndbex";
@@ -22374,7 +25923,7 @@ let
               sha256 =
                 "565fe2ea413d0ec50d51c166ad1dd5dc840c3cdb01e70467484017aa6b14d1f9";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 credo_0_1_10 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 credo_0_3_2 ];
 
             meta = {
               description = ''Elixir wrapper for isbndb.com json api.'';
@@ -22388,7 +25937,7 @@ let
 
     isn_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, postgrex_0_11_1, ecto_2_0_0_beta_0 }:
+        {  buildMix, fetchHex, postgrex_0_11_1, ecto_2_0_0_beta_2 }:
           buildMix {
             name = "isn";
             version = "1.0.0";
@@ -22398,7 +25947,7 @@ let
               sha256 =
                 "08fe62a8fa20333f65e750d7e4abe8c2f215994e514e495178fa718b5a4e3673";
             };
-            beamDeps  = [ postgrex_0_11_1 ecto_2_0_0_beta_0 ];
+            beamDeps  = [ postgrex_0_11_1 ecto_2_0_0_beta_2 ];
 
             meta = {
               description = ''Ecto types for the postgreSQL isn extension.'';
@@ -22410,19 +25959,19 @@ let
 
     isn = isn_1_0_0;
 
-    iso3166_0_0_2 = callPackage
+    iso3166_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, floki_0_7_1 }:
+        {  buildMix, fetchHex, poison_2_1_0, floki_0_8_0 }:
           buildMix {
             name = "iso3166";
-            version = "0.0.2";
+            version = "0.0.3";
             src = fetchHex {
               pkg = "iso3166";
-              version = "0.0.2";
+              version = "0.0.3";
               sha256 =
-                "c36a652871f31d4b50b4ebd75e99094a1cf9ad7d3df9ddd467b94c2b4dbf9466";
+                "9d531b578e4535fd7b85d8f50da3374d057ae7b7c7ecc522710eb7f638660b79";
             };
-            beamDeps  = [ poison_1_5_2 floki_0_7_1 ];
+            beamDeps  = [ poison_2_1_0 floki_0_8_0 ];
 
             meta = {
               longDescription = ''A library that provides a list of ISO3166
@@ -22435,34 +25984,34 @@ let
           }
       ) {};
 
-    iso3166 = iso3166_0_0_2;
+    iso3166 = iso3166_0_0_3;
 
-    ja_serializer_0_7_1 = callPackage
+    ja_serializer_0_8_1 = callPackage
       (
         {
           buildMix,
           fetchHex,
           scrivener_1_1_2,
-          poison_1_5_2,
-          plug_1_1_1,
+          poison_1_0_3,
+          plug_1_1_3,
           inflex_1_5_0,
-          ecto_2_0_0_beta_0
+          ecto_2_0_0_beta_2
         }:
           buildMix {
             name = "ja_serializer";
-            version = "0.7.1";
+            version = "0.8.1";
             src = fetchHex {
               pkg = "ja_serializer";
-              version = "0.7.1";
+              version = "0.8.1";
               sha256 =
-                "3f85203b1dd2e1c501ac41d45e9213a659e67c00ebacbe1b3e5b042c50f226ea";
+                "5f68d075f32456e6de55297601c65a8b2a8144135c6adbb51d13c6d0db338b93";
             };
             beamDeps  = [
                           scrivener_1_1_2
-                          poison_1_5_2
-                          plug_1_1_1
+                          poison_1_0_3
+                          plug_1_1_3
                           inflex_1_5_0
-                          ecto_2_0_0_beta_0
+                          ecto_2_0_0_beta_2
                         ];
 
             meta = {
@@ -22476,11 +26025,11 @@ let
           }
       ) {};
 
-    ja_serializer = ja_serializer_0_7_1;
+    ja_serializer = ja_serializer_0_8_1;
 
     janrain_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, httpoison_0_8_2 }:
           buildMix {
             name = "janrain";
             version = "0.0.1";
@@ -22490,7 +26039,7 @@ let
               sha256 =
                 "35299ee088dfd5647e7a5cd129d5011f2d6319fe53045b2a8ce3ddf70792cc78";
             };
-            beamDeps  = [ httpoison_0_8_1 ];
+            beamDeps  = [ httpoison_0_8_2 ];
 
             meta = {
               longDescription = ''A small library to help with Janrain logins.
@@ -22528,17 +26077,17 @@ let
 
     japanese_holiday = japanese_holiday_0_0_2;
 
-    jazz_0_1_1 = callPackage
+    jazz_0_1_2 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "jazz";
-            version = "0.1.1";
+            version = "0.1.2";
             src = fetchHex {
               pkg = "jazz";
-              version = "0.1.1";
+              version = "0.1.2";
               sha256 =
-                "e348e93a07c449789d17ddddd11cba080ef43132affdd1a287765f3e307ecd1c";
+                "db316e2334f3dc3745dc208eba1900471d52713e2c65b7b83cb913deffd5f4a7";
             };
 
             meta = {
@@ -22670,7 +26219,7 @@ let
 
     jira_0_0_8 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
           buildMix {
             name = "jira";
             version = "0.0.8";
@@ -22680,7 +26229,7 @@ let
               sha256 =
                 "71c19ef23ea7351a2dc7b8f14d0c5794ff00382fa43a88a2235ec9c1741a73cb";
             };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_1 ];
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
 
             meta = {
               description = ''An Elixir client library for JIRA + JIRA Agile /
@@ -22740,7 +26289,7 @@ let
 
     joken_0_16_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_1, jose_1_6_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_3, jose_1_7_3 }:
           buildMix {
             name = "joken";
             version = "0.16.1";
@@ -22750,7 +26299,7 @@ let
               sha256 =
                 "a804bfd350f61688f6ce8d9898bc17fd4b59990c054debeea44234d53048d93d";
             };
-            beamDeps  = [ poison_1_5_2 plug_1_1_1 jose_1_6_1 ];
+            beamDeps  = [ poison_1_5_2 plug_1_1_3 jose_1_7_3 ];
 
             meta = {
               description = ''JWT Library for Elixir'';
@@ -22762,7 +26311,7 @@ let
 
     joken_1_1_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_0_3, plug_1_1_1, jose_1_6_1 }:
+        {  buildMix, fetchHex, poison_1_0_3, plug_1_1_3, jose_1_7_3 }:
           buildMix {
             name = "joken";
             version = "1.1.0";
@@ -22772,7 +26321,7 @@ let
               sha256 =
                 "05e3ff0799b97b8513a5a17a8f57b1d7ee250f32561e559c997c0ecbea462287";
             };
-            beamDeps  = [ poison_1_0_3 plug_1_1_1 jose_1_6_1 ];
+            beamDeps  = [ poison_1_0_3 plug_1_1_3 jose_1_7_3 ];
 
             meta = {
               description = ''JWT Library for Elixir'';
@@ -22786,7 +26335,7 @@ let
 
     jolt_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_3, cowboy_1_0_4 }:
           buildMix {
             name = "jolt";
             version = "0.1.0";
@@ -22796,7 +26345,7 @@ let
               sha256 =
                 "922498b234a1b0a813255d3abf5caa64a9afdc41eb4d8d71f87d71c41fe792e8";
             };
-            beamDeps  = [ poison_1_5_2 plug_1_1_1 cowboy_1_0_4 ];
+            beamDeps  = [ poison_1_5_2 plug_1_1_3 cowboy_1_0_4 ];
 
             meta = {
               longDescription = ''A full REST JSON API with zero coding,
@@ -22834,19 +26383,18 @@ let
 
     jorel_mix = jorel_mix_0_0_1;
 
-    jose_1_6_1 = callPackage
+    jose_1_4_2 = callPackage
       (
-        {  buildRebar3, fetchHex, base64url_0_0_1 }:
-          buildRebar3 {
+        {  buildMix, fetchHex, base64url_0_0_1 }:
+          buildMix {
             name = "jose";
-            version = "1.6.1";
+            version = "1.4.2";
             src = fetchHex {
               pkg = "jose";
-              version = "1.6.1";
+              version = "1.4.2";
               sha256 =
-                "36f1875790af6a1353a737fa13c6ba1f5356f1bd569341ac035eeaa22be23ac9";
+                "7bc79dfa28b0194c9334eddeaf33d02b51d4101d5b18f08086503a7b82be7cb0";
             };
-
             beamDeps  = [ base64url_0_0_1 ];
 
             meta = {
@@ -22858,7 +26406,30 @@ let
           }
       ) {};
 
-    jose = jose_1_6_1;
+    jose_1_7_3 = callPackage
+      (
+        {  buildMix, fetchHex, base64url_0_0_1 }:
+          buildMix {
+            name = "jose";
+            version = "1.7.3";
+            src = fetchHex {
+              pkg = "jose";
+              version = "1.7.3";
+              sha256 =
+                "d77d20c25873a138da8a64eb867c4115ba9cf44b74c00be2bc255e363da727c8";
+            };
+            beamDeps  = [ base64url_0_0_1 ];
+
+            meta = {
+              description = ''JSON Object Signing and Encryption (JOSE) for
+                            Erlang and Elixir.'';
+              license = stdenv.lib.licenses.mpl20;
+              homepage = "https://github.com/potatosalad/erlang-jose";
+            };
+          }
+      ) {};
+
+    jose = jose_1_7_3;
 
     jsex_2_0_0 = callPackage
       (
@@ -23008,7 +26579,7 @@ let
 
     jsonapi_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1 }:
+        {  buildMix, fetchHex, plug_1_1_3 }:
           buildMix {
             name = "jsonapi";
             version = "0.1.0";
@@ -23018,7 +26589,7 @@ let
               sha256 =
                 "b4c7d4797a680f23ae8dae666b4e71573f0bb3330223ebb53985e754ade265c8";
             };
-            beamDeps  = [ plug_1_1_1 ];
+            beamDeps  = [ plug_1_1_3 ];
 
             meta = {
               longDescription = ''Fully functional JSONAPI V1 Serializer as
@@ -23032,17 +26603,17 @@ let
 
     jsonapi = jsonapi_0_1_0;
 
-    jsone_1_2_0 = callPackage
+    jsone_1_2_1 = callPackage
       (
         {  buildRebar3, fetchHex }:
           buildRebar3 {
             name = "jsone";
-            version = "1.2.0";
+            version = "1.2.1";
             src = fetchHex {
               pkg = "jsone";
-              version = "1.2.0";
+              version = "1.2.1";
               sha256 =
-                "a60e74284d3a923cde65c00a39dd4542fd7da7c22e8385c0378ad419c54b2e08";
+                "d7e772c545a8df144790c3891d09e3be9f917965ebc0bed301f8fd8d3b319059";
             };
 
             meta = {
@@ -23053,7 +26624,7 @@ let
           }
       ) {};
 
-    jsone = jsone_1_2_0;
+    jsone = jsone_1_2_1;
 
     jsx_1_4_5 = callPackage
       (
@@ -23078,6 +26649,29 @@ let
           }
       ) {};
 
+    jsx_2_3_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "jsx";
+            version = "2.3.1";
+            src = fetchHex {
+              pkg = "jsx";
+              version = "2.3.1";
+              sha256 =
+                "b57bc292e08c0f4a796c2d2fbb541265ff92474de294131b62468dc5ae808495";
+            };
+
+            meta = {
+              longDescription = ''an erlang application for consuming,
+                                producing and manipulating json. inspired by
+                                yajl'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/talentdeficit/jsx";
+            };
+          }
+      ) {};
+
     jsx_2_4_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -23149,8 +26743,8 @@ let
 
     jsx_2_7_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildMix, fetchHex }:
+          buildMix {
             name = "jsx";
             version = "2.7.1";
             src = fetchHex {
@@ -23172,8 +26766,8 @@ let
 
     jsx_2_8_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildMix, fetchHex }:
+          buildMix {
             name = "jsx";
             version = "2.8.0";
             src = fetchHex {
@@ -23244,17 +26838,17 @@ let
 
     jsxn = jsxn_0_2_1;
 
-    junit_formatter_0_1_2 = callPackage
+    junit_formatter_1_0_0 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "junit_formatter";
-            version = "0.1.2";
+            version = "1.0.0";
             src = fetchHex {
               pkg = "junit_formatter";
-              version = "0.1.2";
+              version = "1.0.0";
               sha256 =
-                "1bfd13c71b116541b46ca1b9c07fb82483da9acaaad706e277e4b08e2b198316";
+                "f01064940927874ef2c3d275182822951167c7bd685f5d2b0dfcc84928fa0dcb";
             };
 
             meta = {
@@ -23268,19 +26862,19 @@ let
           }
       ) {};
 
-    junit_formatter = junit_formatter_0_1_2;
+    junit_formatter = junit_formatter_1_0_0;
 
-    jwalk_1_1_0 = callPackage
+    jwalk_1_1_2 = callPackage
       (
         {  buildRebar3, fetchHex }:
           buildRebar3 {
             name = "jwalk";
-            version = "1.1.0";
+            version = "1.1.2";
             src = fetchHex {
               pkg = "jwalk";
-              version = "1.1.0";
+              version = "1.1.2";
               sha256 =
-                "10c150910ba3539583887cb2b5c3f70d602138471e6f6b5c22498aa18ed654e1";
+                "322d6bc04c1b16efdd711711c101415f9df18a87af31315e6d04e48e678d1bf0";
             };
 
             meta = {
@@ -23293,19 +26887,19 @@ let
           }
       ) {};
 
-    jwalk = jwalk_1_1_0;
+    jwalk = jwalk_1_1_2;
 
-    jwt_0_1_1 = callPackage
+    jwt_0_1_2 = callPackage
       (
         {  buildRebar3, fetchHex, jsx_2_8_0, base64url_0_0_1 }:
           buildRebar3 {
             name = "jwt";
-            version = "0.1.1";
+            version = "0.1.2";
             src = fetchHex {
               pkg = "jwt";
-              version = "0.1.1";
+              version = "0.1.2";
               sha256 =
-                "abcff4a2a42af2b7b7bdf55eeb2b73ce2e3bef760750004e74bc5835d64d2188";
+                "be9a6502857f40e3c285909a80a21d00dffcb9330951abe86e6c9cffb17770f1";
             };
 
             beamDeps  = [ jsx_2_8_0 base64url_0_0_1 ];
@@ -23318,7 +26912,7 @@ let
           }
       ) {};
 
-    jwt = jwt_0_1_1;
+    jwt = jwt_0_1_2;
 
     jwt_claims_0_0_3 = callPackage
       (
@@ -23369,17 +26963,40 @@ let
 
     jwtex = jwtex_0_0_1;
 
-    kafka_ex_0_4_0 = callPackage
+    k6_bytea_1_1_5 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "k6_bytea";
+            version = "1.1.5";
+            src = fetchHex {
+              pkg = "k6_bytea";
+              version = "1.1.5";
+              sha256 =
+                "1ce4ca84bbe45890bc3c07809f8e01fb80c4613226fbd318aaac73d4cd233132";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''A mutable byte array for Erlang.'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    k6_bytea = k6_bytea_1_1_5;
+
+    kafka_ex_0_5_0 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "kafka_ex";
-            version = "0.4.0";
+            version = "0.5.0";
             src = fetchHex {
               pkg = "kafka_ex";
-              version = "0.4.0";
+              version = "0.5.0";
               sha256 =
-                "93355c6acb4d11b000ced332da9ac91dad1ed0468e9f240b040869a0cde5d71a";
+                "5e5d5be9bad3d9b9e77f75047c479aadc140d7e13be85a912cef8e7d647f0ae7";
             };
 
             meta = {
@@ -23390,19 +27007,19 @@ let
           }
       ) {};
 
-    kafka_ex = kafka_ex_0_4_0;
+    kafka_ex = kafka_ex_0_5_0;
 
-    kaguya_0_3_7 = callPackage
+    kaguya_0_4_1 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "kaguya";
-            version = "0.3.7";
+            version = "0.4.1";
             src = fetchHex {
               pkg = "kaguya";
-              version = "0.3.7";
+              version = "0.4.1";
               sha256 =
-                "eced5d988fb5bc868e09402c2dd1f6cc67e60d9f07af2d263aada831021f0d84";
+                "071fbb9b096d2c4e987a820ea1a9d749d3da378c306053f3c44f5c9a9c748fa1";
             };
 
             meta = {
@@ -23416,7 +27033,7 @@ let
           }
       ) {};
 
-    kaguya = kaguya_0_3_7;
+    kaguya = kaguya_0_4_1;
 
     kalecto_0_3_3 = callPackage
       (
@@ -23447,7 +27064,7 @@ let
 
     kalends_0_6_5 = callPackage
       (
-        {  buildRebar3, fetchHex, tzdata_0_1_8 }:
+        {  buildRebar3, fetchHex, tzdata_0_1_201603 }:
           buildRebar3 {
             name = "kalends";
             version = "0.6.5";
@@ -23458,7 +27075,7 @@ let
                 "b16621edbccdbe5d3f76efe03dab59292f3782d0d7e29bbe2de9943e49968fe2";
             };
 
-            beamDeps  = [ tzdata_0_1_8 ];
+            beamDeps  = [ tzdata_0_1_201603 ];
 
             meta = {
               longDescription = ''Kalends is a datetime library in pure Elixir
@@ -23475,7 +27092,7 @@ let
     kane_0_0_5 = callPackage
       (
         {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1, goth_0_0_3
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, goth_0_0_3
         }:
           buildMix {
             name = "kane";
@@ -23486,7 +27103,7 @@ let
               sha256 =
                 "e4865178b16793d4f947dee2f21448b3639fad2b1edeb515df67707cf30dc2c3";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 goth_0_0_3 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 goth_0_0_3 ];
 
             meta = {
               longDescription = ''A library for interacting with Google Cloud
@@ -23500,28 +27117,22 @@ let
 
     kane = kane_0_0_5;
 
-    katipo_0_2_4 = callPackage
+    katipo_0_3_2 = callPackage
       (
         {
-          buildRebar3,
-          fetchHex,
-          uri_0_1_0,
-          quintana_0_2_0,
-          gproc_0_5_0,
-          cowlib_1_0_0
+          buildRebar3, fetchHex, quintana_0_2_0, gproc_0_5_0, cowlib_1_0_0
         }:
           buildRebar3 {
             name = "katipo";
-            version = "0.2.4";
+            version = "0.3.2";
             src = fetchHex {
               pkg = "katipo";
-              version = "0.2.4";
+              version = "0.3.2";
               sha256 =
-                "7ad315785b1e43a78c9d5912469401ab5fa396182acf1ab40feea39539a53d1e";
+                "b940c01fcffd5609bf325eb15b7e6bfbbf19f57b9fa39d7117cf16b8d0df0890";
             };
             compilePorts = true;
-            beamDeps  = [ uri_0_1_0 quintana_0_2_0 gproc_0_5_0 cowlib_1_0_0
-                      ];
+            beamDeps  = [ quintana_0_2_0 gproc_0_5_0 cowlib_1_0_0 ];
 
             meta = {
               description = ''HTTP client based on libcurl'';
@@ -23531,7 +27142,37 @@ let
           }
       ) {};
 
-    katipo = katipo_0_2_4;
+    katipo = katipo_0_3_2;
+
+    kcl_0_4_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          salsa20_0_3_0,
+          poly1305_0_4_0,
+          curve25519_0_1_0
+        }:
+          buildMix {
+            name = "kcl";
+            version = "0.4.1";
+            src = fetchHex {
+              pkg = "kcl";
+              version = "0.4.1";
+              sha256 =
+                "90c2492dc4333ae444d2ec4facee567c73f061e3c10878fcd02b426e347495bc";
+            };
+            beamDeps  = [ salsa20_0_3_0 poly1305_0_4_0 curve25519_0_1_0 ];
+
+            meta = {
+              description = ''KCl - a poor NaCL crypto suite substitute'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mwmiller/kcl";
+            };
+          }
+      ) {};
+
+    kcl = kcl_0_4_1;
 
     keccakf1600_2_0_0 = callPackage
       (
@@ -23560,7 +27201,7 @@ let
     keelless_0_1_0 = callPackage
       (
         {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1, hackney_1_4_4
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, hackney_1_4_4
         }:
           buildMix {
             name = "keelless";
@@ -23571,7 +27212,7 @@ let
               sha256 =
                 "b038600bb0520975a052fe6852a2dcd0dbd1069309134c617519079037d6927e";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 hackney_1_4_4 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 hackney_1_4_4 ];
 
             meta = {
               description = ''Keen IO API for Elixir.'';
@@ -23585,7 +27226,7 @@ let
 
     keenex_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_3_1, httpotion_1_0_0 }:
+        {  buildMix, fetchHex, poison_1_3_1, httpotion_2_2_2 }:
           buildMix {
             name = "keenex";
             version = "0.2.0";
@@ -23595,7 +27236,7 @@ let
               sha256 =
                 "5f66d942fe7066bec625985779d7e69647462e586a704e449cc7229ea752ccb9";
             };
-            beamDeps  = [ poison_1_3_1 httpotion_1_0_0 ];
+            beamDeps  = [ poison_1_3_1 httpotion_2_2_2 ];
 
             meta = {
               description = ''Keen.io API Client'';
@@ -23607,6 +27248,32 @@ let
 
     keenex = keenex_0_2_0;
 
+    kerosene_0_0_1 = callPackage
+      (
+        {
+          buildMix, fetchHex, phoenix_html_2_0_0_dev, ecto_2_0_0_beta_2
+        }:
+          buildMix {
+            name = "kerosene";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "kerosene";
+              version = "0.0.1";
+              sha256 =
+                "a4a54d2ac3179a4b14b2c115740294003cae23cf30adaad203310d79451d5ddd";
+            };
+            beamDeps  = [ phoenix_html_2_0_0_dev ecto_2_0_0_beta_2 ];
+
+            meta = {
+              description = ''Pagination for Ecto and Phoenix.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/elixirdrops/kerosene";
+            };
+          }
+      ) {};
+
+    kerosene = kerosene_0_0_1;
+
     key2value_1_5_1 = callPackage
       (
         {  buildRebar3, fetchHex }:
@@ -23656,7 +27323,7 @@ let
     kindred_0_0_1 = callPackage
       (
         {
-          buildMix, fetchHex, poison_2_0_1, httpoison_0_8_1, ex_rated_1_2_1
+          buildMix, fetchHex, poison_2_0_1, httpoison_0_8_2, ex_rated_1_2_2
         }:
           buildMix {
             name = "kindred";
@@ -23667,7 +27334,7 @@ let
               sha256 =
                 "48b229e007f3d6d06e38f49c85598c20fb6e76d92afd441a86fdee931c2f5fc2";
             };
-            beamDeps  = [ poison_2_0_1 httpoison_0_8_1 ex_rated_1_2_1 ];
+            beamDeps  = [ poison_2_0_1 httpoison_0_8_2 ex_rated_1_2_2 ];
 
             meta = {
               description = ''League of Legends API client written in Elixir'';
@@ -23732,7 +27399,7 @@ let
 
     kubex_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "kubex";
             version = "0.1.1";
@@ -23742,7 +27409,7 @@ let
               sha256 =
                 "b0bd22246731b1c4d4d7f832cd0015fd6586022c779fb6672f45a648da7dcf79";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Kubernetes integration for and in pure Elixir.'';
@@ -23807,8 +27474,8 @@ let
 
     lager_2_1_1 = callPackage
       (
-        {  buildRebar3, fetchHex, goldrush_0_1_7 }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex, goldrush_0_1_7 }:
+          buildErlangMk {
             name = "lager";
             version = "2.1.1";
             src = fetchHex {
@@ -23817,7 +27484,6 @@ let
               sha256 =
                 "5eb1c17ff0f8692285b7648ef5d827d492b8d7554da782afc300ebb4861d5aba";
             };
-
             beamDeps  = [ goldrush_0_1_7 ];
 
             meta = {
@@ -23901,6 +27567,31 @@ let
 
     lager_graylog = lager_graylog_0_1_0;
 
+    lager_hipchat_0_2_0 = callPackage
+      (
+        {  buildRebar3, fetchHex, lager_3_0_2 }:
+          buildRebar3 {
+            name = "lager_hipchat";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "lager_hipchat";
+              version = "0.2.0";
+              sha256 =
+                "83dc3246822b33b2889c431975ff0f8ffc6954c9e5f744bfd99acd9fa8605a1c";
+            };
+
+            beamDeps  = [ lager_3_0_2 ];
+
+            meta = {
+              description = ''HipChat backend for Lager'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/synlay/lager_hipchat";
+            };
+          }
+      ) {};
+
+    lager_hipchat = lager_hipchat_0_2_0;
+
     lager_logger_1_0_2 = callPackage
       (
         {  buildMix, fetchHex, lager_3_0_2 }:
@@ -23976,17 +27667,17 @@ let
 
     lager_watchdog = lager_watchdog_0_1_10;
 
-    lasp_0_0_4 = callPackage
+    lasp_0_0_5 = callPackage
       (
         {  buildRebar3, fetchHex }:
           buildRebar3 {
             name = "lasp";
-            version = "0.0.4";
+            version = "0.0.5";
             src = fetchHex {
               pkg = "lasp";
-              version = "0.0.4";
+              version = "0.0.5";
               sha256 =
-                "d119098a34bbd0331ab1cb22e0f1f1d25da35132f8a61ecdc0ed5c0135c84942";
+                "0298ef6ad4a35a3ac93ad64c722adc852d45b2d9f8fb76b47edf257481150349";
             };
 
             meta = {
@@ -23998,12 +27689,12 @@ let
           }
       ) {};
 
-    lasp = lasp_0_0_4;
+    lasp = lasp_0_0_5;
 
     lasse_1_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "lasse";
             version = "1.1.0";
             src = fetchHex {
@@ -24073,6 +27764,54 @@ let
 
     ledx = ledx_0_0_1;
 
+    left_pad_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "left_pad";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "left_pad";
+              version = "0.0.3";
+              sha256 =
+                "9b14a4b7f84f320175bd2ed2f24754a62206fdd67d90117602876c415cf22374";
+            };
+
+            meta = {
+              description = ''Pad a string to the left with any number of
+                            characters.'';
+              license = stdenv.lib.licenses.mpl20;
+              homepage = "https://github.com/folz/left_pad.ex";
+            };
+          }
+      ) {};
+
+    left_pad = left_pad_0_0_3;
+
+    leftpad_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "leftpad";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "leftpad";
+              version = "1.0.1";
+              sha256 =
+                "88e4cd8039461f2558f6e8378d834772b9315554080c5b729d65472209824a89";
+            };
+
+            meta = {
+              description = ''left pad for elixir, because why not?
+                            ¯\_(ツ)_/¯'';
+              license = stdenv.lib.licenses.unlicense;
+              homepage = "https://github.com/colinrymer/leftpad.ex";
+            };
+          }
+      ) {};
+
+    leftpad = leftpad_1_0_1;
+
     level_1_0_0 = callPackage
       (
         {  buildRebar3, fetchHex }:
@@ -24168,19 +27907,40 @@ let
           }
       ) {};
 
-    lhttpc = lhttpc_1_3_0;
+    lhttpc_1_4_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "lhttpc";
+            version = "1.4.0";
+            src = fetchHex {
+              pkg = "lhttpc";
+              version = "1.4.0";
+              sha256 =
+                "26d5a12b63fedb3e862a816a472258007dc1e85b75a9bcdb0223425e39827777";
+            };
 
-    libchunter_0_1_45 = callPackage
+            meta = {
+              description = ''Lightweight HTTP Client'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/talko/lhttpc";
+            };
+          }
+      ) {};
+
+    lhttpc = lhttpc_1_4_0;
+
+    libchunter_0_1_46 = callPackage
       (
         {  buildRebar3, fetchHex, lager_2_1_1, fifo_spec_0_1_27 }:
           buildRebar3 {
             name = "libchunter";
-            version = "0.1.45";
+            version = "0.1.46";
             src = fetchHex {
               pkg = "libchunter";
-              version = "0.1.45";
+              version = "0.1.46";
               sha256 =
-                "ecd76f18b2a1ee115b86a6b485119c2a36de9da1d41449dd5bc7e139dedeeb4b";
+                "39f117de7cd71e65c793380266595b5b8fdd29edb8ca28b114efbaa2866eba90";
             };
 
             beamDeps  = [ lager_2_1_1 fifo_spec_0_1_27 ];
@@ -24193,7 +27953,33 @@ let
           }
       ) {};
 
-    libchunter = libchunter_0_1_45;
+    libchunter = libchunter_0_1_46;
+
+    libdecaf_0_0_2 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "libdecaf";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "libdecaf";
+              version = "0.0.2";
+              sha256 =
+                "1e4ab8b542388941118927ae45021c4fb8097f9cce5c2d875624c330adc92b0a";
+            };
+            compilePorts = true;
+
+            meta = {
+              longDescription = ''libdecaf NIF for ECDH (X25519, X448), EdDSA
+                                (Ed25519, Ed25519ph, Ed448, Ed448ph),
+                                curve25519, curve448'';
+              license = stdenv.lib.licenses.mpl20;
+              homepage = "https://github.com/potatosalad/erlang-libdecaf";
+            };
+          }
+      ) {};
+
+    libdecaf = libdecaf_0_0_2;
 
     libex_config_0_2_0 = callPackage
       (
@@ -24219,6 +28005,38 @@ let
 
     libex_config = libex_config_0_2_0;
 
+    libhowl_0_1_34 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          mdns_client_lib_0_1_38,
+          lager_2_1_1,
+          fifo_spec_0_1_27
+        }:
+          buildRebar3 {
+            name = "libhowl";
+            version = "0.1.34";
+            src = fetchHex {
+              pkg = "libhowl";
+              version = "0.1.34";
+              sha256 =
+                "d358c609db2f09d05d51fc73e78b0fbddedbe4cbbc298711e664bfbf0662e10d";
+            };
+
+            beamDeps  = [ mdns_client_lib_0_1_38 lager_2_1_1 fifo_spec_0_1_27
+                      ];
+
+            meta = {
+              description = ''howl client library'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/project-fifo/libhowl";
+            };
+          }
+      ) {};
+
+    libhowl = libhowl_0_1_34;
+
     libleofs_0_1_2 = callPackage
       (
         {  buildRebar3, fetchHex, jsx_1_4_5 }:
@@ -24305,31 +28123,44 @@ let
           }
       ) {};
 
-    libsnarl = libsnarl_0_3_40;
-
-    libsnarlmatch_0_1_5 = callPackage
+    libsnarl_0_3_44 = callPackage
       (
-        {  buildRebar3, fetchHex, fqc_0_1_5 }:
+        {
+          buildRebar3,
+          fetchHex,
+          oauth2_erlang_0_6_1,
+          mdns_client_lib_0_1_38,
+          libsnarlmatch_0_1_7,
+          lager_2_1_1,
+          fifo_spec_0_1_27
+        }:
           buildRebar3 {
-            name = "libsnarlmatch";
-            version = "0.1.5";
+            name = "libsnarl";
+            version = "0.3.44";
             src = fetchHex {
-              pkg = "libsnarlmatch";
-              version = "0.1.5";
+              pkg = "libsnarl";
+              version = "0.3.44";
               sha256 =
-                "11410122ca7a0685c4a7df1795d7f5a1e7bf9c5f17096414402fd9d1f0e1ac04";
+                "a77b2f532758a7016c375ddf16e316d5a4a727c65418bf7255ed158c8b1e243c";
             };
 
-            beamDeps  = [ fqc_0_1_5 ];
+            beamDeps  = [
+                          oauth2_erlang_0_6_1
+                          mdns_client_lib_0_1_38
+                          libsnarlmatch_0_1_7
+                          lager_2_1_1
+                          fifo_spec_0_1_27
+                        ];
 
             meta = {
-              description = ''permission matcher library'';
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/project-fifo/libsnarlmatch";
+              description = ''snarl interface library'';
+
             };
           }
       ) {};
 
+    libsnarl = libsnarl_0_3_44;
+
     libsnarlmatch_0_1_7 = callPackage
       (
         {  buildRebar3, fetchHex }:
@@ -24353,26 +28184,26 @@ let
 
     libsnarlmatch = libsnarlmatch_0_1_7;
 
-    libsniffle_0_3_37 = callPackage
+    libsniffle_0_3_45 = callPackage
       (
         {
           buildRebar3,
           fetchHex,
-          mdns_client_lib_0_1_33,
-          lager_3_0_2,
+          mdns_client_lib_0_1_38,
+          lager_2_1_1,
           fifo_spec_0_1_27
         }:
           buildRebar3 {
             name = "libsniffle";
-            version = "0.3.37";
+            version = "0.3.45";
             src = fetchHex {
               pkg = "libsniffle";
-              version = "0.3.37";
+              version = "0.3.45";
               sha256 =
-                "fa840488f50292bbe206e7c13cc9640099cacec8aea3c0c581f6cc482b5bd94c";
+                "906329c2a54689f74a53a3cd3fa1fc96ad88be326860227e4a2c731ab40738ed";
             };
 
-            beamDeps  = [ mdns_client_lib_0_1_33 lager_3_0_2 fifo_spec_0_1_27
+            beamDeps  = [ mdns_client_lib_0_1_38 lager_2_1_1 fifo_spec_0_1_27
                       ];
 
             meta = {
@@ -24383,19 +28214,19 @@ let
           }
       ) {};
 
-    libsniffle = libsniffle_0_3_37;
+    libsniffle = libsniffle_0_3_45;
 
-    libsodium_0_0_3 = callPackage
+    libsodium_0_0_4 = callPackage
       (
         {  buildRebar3, fetchHex }:
           buildRebar3 {
             name = "libsodium";
-            version = "0.0.3";
+            version = "0.0.4";
             src = fetchHex {
               pkg = "libsodium";
-              version = "0.0.3";
+              version = "0.0.4";
               sha256 =
-                "e66e9d91647a1519194cb0b240144123d68fae0f8cb57a9be9ced30ba8e24397";
+                "0ace378dd062546571e0607bddf96fe1dcf62a871fab42b4542328e3bca4b38a";
             };
             compilePorts = true;
 
@@ -24407,7 +28238,7 @@ let
           }
       ) {};
 
-    libsodium = libsodium_0_0_3;
+    libsodium = libsodium_0_0_4;
 
     lineo_0_1_0 = callPackage
       (
@@ -24500,6 +28331,30 @@ let
 
     liquid = liquid_0_1_0;
 
+    lob_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, chacha20_0_3_2 }:
+          buildMix {
+            name = "lob";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "lob";
+              version = "0.1.0";
+              sha256 =
+                "adf071a07fde2fbd2393c06a18959e6d48622c7a3769e868cf577095c7eac67e";
+            };
+            beamDeps  = [ poison_2_1_0 chacha20_0_3_2 ];
+
+            meta = {
+              description = ''Length-Object-Binary (LOB) Packet Encoding'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mwmiller/lob_ex";
+            };
+          }
+      ) {};
+
+    lob = lob_0_1_0;
+
     locker_1_0_8 = callPackage
       (
         {  buildRebar3, fetchHex, proper_1_1_1_beta }:
@@ -24550,17 +28405,17 @@ let
 
     logfmt = logfmt_3_0_2;
 
-    logger_file_backend_0_0_6 = callPackage
+    logger_file_backend_0_0_7 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "logger_file_backend";
-            version = "0.0.6";
+            version = "0.0.7";
             src = fetchHex {
               pkg = "logger_file_backend";
-              version = "0.0.6";
+              version = "0.0.7";
               sha256 =
-                "57554adfad0599adc3ea540accc1791d4adffedbe87640c0b92df9b860bb1c69";
+                "135823f39e810f1826cbd6fa5e1207c6d60a6de09b563c9a204f5b55587cf5a4";
             };
 
             meta = {
@@ -24571,7 +28426,33 @@ let
           }
       ) {};
 
-    logger_file_backend = logger_file_backend_0_0_6;
+    logger_file_backend = logger_file_backend_0_0_7;
+
+    logger_json_file_backend_0_1_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_0_3 }:
+          buildMix {
+            name = "logger_json_file_backend";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "logger_json_file_backend";
+              version = "0.1.2";
+              sha256 =
+                "5734a14534ec57f7b1603c53d091facd4e47d7e5b83cf99d1c73439527d995d9";
+            };
+            beamDeps  = [ poison_1_0_3 ];
+
+            meta = {
+              description = ''Logger backend that write a json map per line to
+                            a file'';
+              license = stdenv.lib.licenses.isc;
+              homepage =
+                "https://github.com/xflagstudio/elixir_logger_json_file_backend";
+            };
+          }
+      ) {};
+
+    logger_json_file_backend = logger_json_file_backend_0_1_2;
 
     logger_logentries_backend_0_0_1 = callPackage
       (
@@ -24599,19 +28480,19 @@ let
 
     logger_logentries_backend = logger_logentries_backend_0_0_1;
 
-    logger_loggly_backend_0_1_0 = callPackage
+    logger_loggly_backend_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, httpoison_0_8_2 }:
           buildMix {
             name = "logger_loggly_backend";
-            version = "0.1.0";
+            version = "0.2.0";
             src = fetchHex {
               pkg = "logger_loggly_backend";
-              version = "0.1.0";
+              version = "0.2.0";
               sha256 =
-                "4b19e284f0b910c824a228093afa176ea4b9c4546893b2ad5da2769aa2bcbc85";
+                "111d0e256ace86e2af366b1afc7152b4aadd3cd6c093d5d2b119c08a84395fd6";
             };
-            beamDeps  = [ httpoison_0_8_1 ];
+            beamDeps  = [ httpoison_0_8_2 ];
 
             meta = {
               description = ''Loggly logger backend'';
@@ -24621,21 +28502,21 @@ let
           }
       ) {};
 
-    logger_loggly_backend = logger_loggly_backend_0_1_0;
+    logger_loggly_backend = logger_loggly_backend_0_2_0;
 
-    logger_logstash_backend_1_0_0 = callPackage
+    logger_logstash_backend_2_0_0 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_1, exjsx_3_1_0 }:
+        {  buildMix, fetchHex, timex_2_1_3, exjsx_3_1_0 }:
           buildMix {
             name = "logger_logstash_backend";
-            version = "1.0.0";
+            version = "2.0.0";
             src = fetchHex {
               pkg = "logger_logstash_backend";
-              version = "1.0.0";
+              version = "2.0.0";
               sha256 =
-                "ca36f8ab5f738c143da6b72c9d603ede7e201e2a1c7d683b270c2641d14bbcb2";
+                "e0c709aa8fbddd825ef5cc5287e0d04f4470498173555e07156675aeba2b2b7a";
             };
-            beamDeps  = [ timex_1_0_1 exjsx_3_1_0 ];
+            beamDeps  = [ timex_2_1_3 exjsx_3_1_0 ];
 
             meta = {
               description = ''Logstash UDP producer backend for Logger.'';
@@ -24645,7 +28526,7 @@ let
           }
       ) {};
 
-    logger_logstash_backend = logger_logstash_backend_1_0_0;
+    logger_logstash_backend = logger_logstash_backend_2_0_0;
 
     logger_papertrail_backend_0_0_2 = callPackage
       (
@@ -24789,17 +28670,17 @@ let
 
     ltsv = ltsv_0_1_0;
 
-    luhn_0_3_0 = callPackage
+    luhn_0_3_1 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "luhn";
-            version = "0.3.0";
+            version = "0.3.1";
             src = fetchHex {
               pkg = "luhn";
-              version = "0.3.0";
+              version = "0.3.1";
               sha256 =
-                "e98e7dac83e18d75dbcb87559f17f7b40c00edf79a38b02b9ab5a7d74b05efc2";
+                "86aba88228660238ad981b92cb7a0e92be04772fc54fe5effb338c94b3b7d9fa";
             };
 
             meta = {
@@ -24810,7 +28691,7 @@ let
           }
       ) {};
 
-    luhn = luhn_0_3_0;
+    luhn = luhn_0_3_1;
 
     luhnatex_0_5_0 = callPackage
       (
@@ -24835,6 +28716,84 @@ let
 
     luhnatex = luhnatex_0_5_0;
 
+    lyn_0_0_16 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          ueberauth_twitter_0_2_2,
+          ueberauth_slack_0_2_0,
+          ueberauth_identity_0_2_3,
+          ueberauth_google_0_2_0,
+          ueberauth_github_0_2_0,
+          ueberauth_facebook_0_3_2,
+          ueberauth_0_2_0,
+          scrivener_1_1_2,
+          postgrex_0_11_1,
+          poolboy_1_5_1,
+          poison_1_5_2,
+          phoenix_html_2_5_1,
+          phoenix_ecto_3_0_0_beta_2,
+          phoenix_1_1_4,
+          json_0_3_3,
+          inflex_1_5_0,
+          guardian_db_0_4_0,
+          guardian_0_9_1,
+          gettext_0_10_0,
+          exos_1_0_0,
+          cowboy_1_0_4,
+          comeonin_2_1_1,
+          absinthe_plug_1_0_0
+        }:
+          buildMix {
+            name = "lyn";
+            version = "0.0.16";
+            src = fetchHex {
+              pkg = "lyn";
+              version = "0.0.16";
+              sha256 =
+                "63eeabb42336605c1fd79addbdf6a3300bb3101e019be9279f69a98c86345660";
+            };
+            beamDeps  = [
+                          ueberauth_twitter_0_2_2
+                          ueberauth_slack_0_2_0
+                          ueberauth_identity_0_2_3
+                          ueberauth_google_0_2_0
+                          ueberauth_github_0_2_0
+                          ueberauth_facebook_0_3_2
+                          ueberauth_0_2_0
+                          scrivener_1_1_2
+                          postgrex_0_11_1
+                          poolboy_1_5_1
+                          poison_1_5_2
+                          phoenix_html_2_5_1
+                          phoenix_ecto_3_0_0_beta_2
+                          phoenix_1_1_4
+                          json_0_3_3
+                          inflex_1_5_0
+                          guardian_db_0_4_0
+                          guardian_0_9_1
+                          gettext_0_10_0
+                          exos_1_0_0
+                          cowboy_1_0_4
+                          comeonin_2_1_1
+                          absinthe_plug_1_0_0
+                        ];
+
+            meta = {
+              longDescription = ''This is a CMS written in Elixir. Aims to be
+                                the great open-source ecommerce and/or startup
+                                solution for those who are searching for a
+                                performance and stability on top of modern
+                                technologies like React and Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/viatsko/lyn";
+            };
+          }
+      ) {};
+
+    lyn = lyn_0_0_16;
+
     lz4_0_2_2 = callPackage
       (
         {  buildRebar3, fetchHex }:
@@ -24883,19 +28842,19 @@ let
 
     lz_string = lz_string_0_0_3;
 
-    m2x_1_3_1 = callPackage
+    m2x_2_0_0 = callPackage
       (
-        {  buildMix, fetchHex, json_0_3_3, hackney_1_4_8 }:
+        {  buildMix, fetchHex, json_0_3_3, hackney_1_6_0 }:
           buildMix {
             name = "m2x";
-            version = "1.3.1";
+            version = "2.0.0";
             src = fetchHex {
               pkg = "m2x";
-              version = "1.3.1";
+              version = "2.0.0";
               sha256 =
-                "3325226ac185b40304469aa94a7376511bf57d535eb1d32b2aca6c2009c54fe2";
+                "e125cf588d48d9b04fb4a003bb62ab1a8e8df359866dba0cde6444e9fd7ce939";
             };
-            beamDeps  = [ json_0_3_3 hackney_1_4_8 ];
+            beamDeps  = [ json_0_3_3 hackney_1_6_0 ];
 
             meta = {
               longDescription = ''Elixir client library for the AT&T M2X
@@ -24910,11 +28869,11 @@ let
           }
       ) {};
 
-    m2x = m2x_1_3_1;
+    m2x = m2x_2_0_0;
 
     m2x_erlang_1_3_1 = callPackage
       (
-        {  buildMix, fetchHex, jsx_2_8_0, hackney_1_4_8 }:
+        {  buildMix, fetchHex, jsx_2_8_0, hackney_1_6_0 }:
           buildMix {
             name = "m2x_erlang";
             version = "1.3.1";
@@ -24924,7 +28883,7 @@ let
               sha256 =
                 "873db746f4428490670b54aabcc93fda8d94c3c4e25c94a9aef7275858a8b809";
             };
-            beamDeps  = [ jsx_2_8_0 hackney_1_4_8 ];
+            beamDeps  = [ jsx_2_8_0 hackney_1_6_0 ];
 
             meta = {
               longDescription = ''Erlang client library for the AT&T M2X
@@ -24964,17 +28923,41 @@ let
 
     mad = mad_0_9_0;
 
-    mail_0_0_2 = callPackage
+    magic_number_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "magic_number";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "magic_number";
+              version = "0.0.1";
+              sha256 =
+                "aef41d128da2cc8f5a4302a15048edd5ff58fcff68e847b6a6ebb000d8d44cc1";
+            };
+
+            meta = {
+              description = ''MagicNumber is the module to determine a file`s
+                            type from its magic number.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ishikawa/elixir-magic-number";
+            };
+          }
+      ) {};
+
+    magic_number = magic_number_0_0_1;
+
+    mail_0_0_4 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "mail";
-            version = "0.0.2";
+            version = "0.0.4";
             src = fetchHex {
               pkg = "mail";
-              version = "0.0.2";
+              version = "0.0.4";
               sha256 =
-                "724cea5cac7b0ffdf2fa65a8d89d7c83de72da7eba6d6b31f8669854cb32baa3";
+                "015bb93bc3233fbf0bb28daf71963ddc290d574d9b3d63e1b45641d1a2d4571e";
             };
 
             meta = {
@@ -24985,7 +28968,7 @@ let
           }
       ) {};
 
-    mail = mail_0_0_2;
+    mail = mail_0_0_4;
 
     mailchimp_0_0_5 = callPackage
       (
@@ -25012,19 +28995,19 @@ let
 
     mailchimp = mailchimp_0_0_5;
 
-    mailer_1_0_0 = callPackage
+    mailer_1_0_1 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_1, gen_smtp_0_9_0 }:
+        {  buildMix, fetchHex, timex_2_1_3, gen_smtp_0_9_0 }:
           buildMix {
             name = "mailer";
-            version = "1.0.0";
+            version = "1.0.1";
             src = fetchHex {
               pkg = "mailer";
-              version = "1.0.0";
+              version = "1.0.1";
               sha256 =
-                "cd54048c0cea44b9d96b82352d74fadf078e705b343c62a6e6e27f60de21099b";
+                "08b834102ad6eb2f2a363b70939935d3d23d1e3a68d96a2a7f8730fb7834c63d";
             };
-            beamDeps  = [ timex_1_0_1 gen_smtp_0_9_0 ];
+            beamDeps  = [ timex_2_1_3 gen_smtp_0_9_0 ];
 
             meta = {
               description = ''Mailer - A simple email client'';
@@ -25034,7 +29017,7 @@ let
           }
       ) {};
 
-    mailer = mailer_1_0_0;
+    mailer = mailer_1_0_1;
 
     mailgun_0_0_2 = callPackage
       (
@@ -25083,7 +29066,7 @@ let
 
     mailgun_webhook_auth_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_0_8_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, plug_0_5_2, cowboy_1_0_4 }:
           buildMix {
             name = "mailgun_webhook_auth";
             version = "1.0.0";
@@ -25093,7 +29076,7 @@ let
               sha256 =
                 "0e6c93d8fd37fc948db0f92ee545ecbed99787dc04ceb8981e588b06ad3108eb";
             };
-            beamDeps  = [ plug_0_8_1 cowboy_1_0_4 ];
+            beamDeps  = [ plug_0_5_2 cowboy_1_0_4 ];
 
             meta = {
               description = ''A Plug for validating Mailgun Webhook requests in
@@ -25137,19 +29120,19 @@ let
 
     mailibex = mailibex_0_1_0;
 
-    mailman_0_2_1 = callPackage
+    mailman_0_2_2 = callPackage
       (
         {
           buildMix, fetchHex, gen_smtp_0_9_0, ex_doc_0_11_4, earmark_0_2_1
         }:
           buildMix {
             name = "mailman";
-            version = "0.2.1";
+            version = "0.2.2";
             src = fetchHex {
               pkg = "mailman";
-              version = "0.2.1";
+              version = "0.2.2";
               sha256 =
-                "b1594af744dc0e879ed8e42133c7d1d8136468218be2c6dfbf416dd3861b20c7";
+                "3a7aaf863017c0b9d924e31ccb34649ba31bcbbd8eac4837bbe3a040c37f94ab";
             };
             beamDeps  = [ gen_smtp_0_9_0 ex_doc_0_11_4 earmark_0_2_1 ];
 
@@ -25162,7 +29145,7 @@ let
           }
       ) {};
 
-    mailman = mailman_0_2_1;
+    mailman = mailman_0_2_2;
 
     majremind_0_0_1 = callPackage
       (
@@ -25192,7 +29175,7 @@ let
 
     mandrag_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex, exrm_0_15_1 }:
+        {  buildMix, fetchHex, exrm_1_0_3 }:
           buildMix {
             name = "mandrag";
             version = "0.1.1";
@@ -25202,7 +29185,7 @@ let
               sha256 =
                 "e9e9fcbb844a2a86ecd95f5f8fa7db9f6ff88f3e2a6dca2bd996f4f71bbf125d";
             };
-            beamDeps  = [ exrm_0_15_1 ];
+            beamDeps  = [ exrm_1_0_3 ];
 
             meta = {
               description = ''A simple, extremely assumptive deploy script for
@@ -25241,7 +29224,7 @@ let
 
     mandrill_0_4_1 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_1_0 }:
+        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_1_0 }:
           buildMix {
             name = "mandrill";
             version = "0.4.1";
@@ -25251,7 +29234,7 @@ let
               sha256 =
                 "2d554149c425c511a006d978427acc1d384c8f6d4f3699fdce04e42e24268400";
             };
-            beamDeps  = [ httpoison_0_8_1 exjsx_3_1_0 ];
+            beamDeps  = [ httpoison_0_8_2 exjsx_3_1_0 ];
 
             meta = {
               longDescription = ''A Mandrill wrapper for Elixir Requires an
@@ -25268,7 +29251,7 @@ let
     mandrillex_0_2_0 = callPackage
       (
         {
-          buildMix, fetchHex, jsex_2_0_0, httpoison_0_8_1, hackney_1_0_6
+          buildMix, fetchHex, jsex_2_0_0, httpoison_0_8_2, hackney_1_4_8
         }:
           buildMix {
             name = "mandrillex";
@@ -25279,7 +29262,7 @@ let
               sha256 =
                 "840bf36e545cde376797603df4109aae49d2c17b2b06f84a058fff4448d362eb";
             };
-            beamDeps  = [ jsex_2_0_0 httpoison_0_8_1 hackney_1_0_6 ];
+            beamDeps  = [ jsex_2_0_0 httpoison_0_8_2 hackney_1_4_8 ];
 
             meta = {
               longDescription = ''A Mandrill wrapper for Elixir Requires an
@@ -25293,6 +29276,30 @@ let
 
     mandrillex = mandrillex_0_2_0;
 
+    maptu_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "maptu";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "maptu";
+              version = "0.1.0";
+              sha256 =
+                "8dc5fd69e78a948a6cd3b95a1b1cb1a7056948a4445e4abed773cae8c88c16da";
+            };
+
+            meta = {
+              description = ''Tiny library to convert from "encoded" maps to
+                            Elixir structs.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/whatyouhide/maptu";
+            };
+          }
+      ) {};
+
+    maptu = maptu_0_1_0;
+
     marco_polo_0_2_1 = callPackage
       (
         {  buildMix, fetchHex, decimal_1_1_1, connection_1_0_0_rc_1 }:
@@ -25317,6 +29324,29 @@ let
 
     marco_polo = marco_polo_0_2_1;
 
+    mariaex_0_1_7 = callPackage
+      (
+        {  buildMix, fetchHex, decimal_1_1_1 }:
+          buildMix {
+            name = "mariaex";
+            version = "0.1.7";
+            src = fetchHex {
+              pkg = "mariaex";
+              version = "0.1.7";
+              sha256 =
+                "58daf08d513327b422a68de199202e6a2c1785472e2fa8d8ffe212e6ee51b1fb";
+            };
+            beamDeps  = [ decimal_1_1_1 ];
+
+            meta = {
+              description = ''Pure elixir database driver for MariaDB /
+                            MySQL.'';
+
+              homepage = "https://github.com/xerions/mariaex";
+            };
+          }
+      ) {};
+
     mariaex_0_4_3 = callPackage
       (
         {  buildMix, fetchHex, decimal_1_1_1 }:
@@ -25340,19 +29370,19 @@ let
           }
       ) {};
 
-    mariaex_0_5_0 = callPackage
+    mariaex_0_7_0 = callPackage
       (
-        {  buildMix, fetchHex, decimal_1_1_1 }:
+        {  buildMix, fetchHex, decimal_1_1_1, db_connection_0_2_4 }:
           buildMix {
             name = "mariaex";
-            version = "0.5.0";
+            version = "0.7.0";
             src = fetchHex {
               pkg = "mariaex";
-              version = "0.5.0";
+              version = "0.7.0";
               sha256 =
-                "fe2a576c6b4e446c3744af7dda0a3ed6f179f80451a8e412be520b9005bb26c0";
+                "758c1d8a75a9ce71f047e8d54b0fa1cde518252b25aecb9b8c42f918340bdfb6";
             };
-            beamDeps  = [ decimal_1_1_1 ];
+            beamDeps  = [ decimal_1_1_1 db_connection_0_2_4 ];
 
             meta = {
               description = ''Pure elixir database driver for MariaDB /
@@ -25363,30 +29393,7 @@ let
           }
       ) {};
 
-    mariaex_0_6_2 = callPackage
-      (
-        {  buildMix, fetchHex, decimal_1_1_1, connection_1_0_2 }:
-          buildMix {
-            name = "mariaex";
-            version = "0.6.2";
-            src = fetchHex {
-              pkg = "mariaex";
-              version = "0.6.2";
-              sha256 =
-                "195d9f46e09029872505402159ec713cdfa7b847622cc6b6db658c0d24f85ecd";
-            };
-            beamDeps  = [ decimal_1_1_1 connection_1_0_2 ];
-
-            meta = {
-              description = ''Pure elixir database driver for MariaDB /
-                            MySQL.'';
-
-              homepage = "https://github.com/xerions/mariaex";
-            };
-          }
-      ) {};
-
-    mariaex = mariaex_0_6_2;
+    mariaex = mariaex_0_7_0;
 
     marked_0_0_1 = callPackage
       (
@@ -25410,19 +29417,70 @@ let
 
     marked = marked_0_0_1;
 
-    maru_0_9_3 = callPackage
+    markit_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_0_3, plug_1_1_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
+          buildMix {
+            name = "markit";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "markit";
+              version = "0.1.2";
+              sha256 =
+                "6304ceb1e7a5787555bc7d048bf3c9c0b432fe5378c6d630fb02d0bb871e57b5";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
+
+            meta = {
+              description = ''Access stock market data from markit.com'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/col/markit";
+            };
+          }
+      ) {};
+
+    markit = markit_0_1_2;
+
+    markit_skill_0_0_2 = callPackage
+      (
+        {
+          buildMix, fetchHex, markit_0_1_2, inflex_1_5_0, alexa_0_1_12
+        }:
+          buildMix {
+            name = "markit_skill";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "markit_skill";
+              version = "0.0.2";
+              sha256 =
+                "166d8ef88c08c21821dda379a053af761db4de5dff50226bfcb0e3a18fc855db";
+            };
+            beamDeps  = [ markit_0_1_2 inflex_1_5_0 alexa_0_1_12 ];
+
+            meta = {
+              description = ''Amazon Alexa skill that uses data from
+                            Markit.com'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/col/markit_skill";
+            };
+          }
+      ) {};
+
+    markit_skill = markit_skill_0_0_2;
+
+    maru_0_9_5 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_0_3, plug_1_1_3, cowboy_1_0_4 }:
           buildMix {
             name = "maru";
-            version = "0.9.3";
+            version = "0.9.5";
             src = fetchHex {
               pkg = "maru";
-              version = "0.9.3";
+              version = "0.9.5";
               sha256 =
-                "6dd160dbc77b72a1954d53c5d584402006f0c28a278f3f28c5ec651246db480d";
+                "36456f36fea5b2fc5cacd280535347f11d949799bfb8506e772e30b062056d3d";
             };
-            beamDeps  = [ poison_1_0_3 plug_1_1_1 cowboy_1_0_4 ];
+            beamDeps  = [ poison_1_0_3 plug_1_1_3 cowboy_1_0_4 ];
 
             meta = {
               description = ''REST-like API micro-framework for elixir inspired
@@ -25433,7 +29491,7 @@ let
           }
       ) {};
 
-    maru = maru_0_9_3;
+    maru = maru_0_9_5;
 
     maru_entity_0_1_2 = callPackage
       (
@@ -25457,19 +29515,19 @@ let
 
     maru_entity = maru_entity_0_1_2;
 
-    maru_swagger_0_7_1 = callPackage
+    maru_swagger_0_7_3 = callPackage
       (
-        {  buildMix, fetchHex, maru_0_9_3 }:
+        {  buildMix, fetchHex, maru_0_9_5 }:
           buildMix {
             name = "maru_swagger";
-            version = "0.7.1";
+            version = "0.7.3";
             src = fetchHex {
               pkg = "maru_swagger";
-              version = "0.7.1";
+              version = "0.7.3";
               sha256 =
-                "035cfecc126ccdc830694c8c6f6c1d3376b6d037b31d30f31b53334305179940";
+                "919148f80e76bd4dba89021cbffcf359cfe05028250d05a3eacf2bae5e24ec46";
             };
-            beamDeps  = [ maru_0_9_3 ];
+            beamDeps  = [ maru_0_9_5 ];
 
             meta = {
               description = ''Add swagger compliant documentation to your maru
@@ -25480,7 +29538,7 @@ let
           }
       ) {};
 
-    maru_swagger = maru_swagger_0_7_1;
+    maru_swagger = maru_swagger_0_7_3;
 
     marvel_1_0_0 = callPackage
       (
@@ -25489,7 +29547,7 @@ let
           fetchHex,
           timex_0_13_5,
           poison_1_5_2,
-          httpoison_0_8_1
+          httpoison_0_8_2
         }:
           buildRebar3 {
             name = "marvel";
@@ -25501,7 +29559,7 @@ let
                 "7b5e99ccfa84954c2e46295aa72ab57b7511e1ec8e0bd13d1c5948efe1a0d23d";
             };
 
-            beamDeps  = [ timex_0_13_5 poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ timex_0_13_5 poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Marvel API and CLI Client '';
@@ -25521,7 +29579,7 @@ let
           slack_0_3_0,
           poison_2_1_0,
           ibrowse_4_2_2,
-          httpotion_2_2_0
+          httpotion_2_2_2
         }:
           buildMix {
             name = "marvin";
@@ -25533,7 +29591,7 @@ let
                 "722a97aef1d0f7fb783948002897ea1ec67ac77cb471016386bf485bb8bd86c7";
             };
             beamDeps  = [
-                          slack_0_3_0 poison_2_1_0 ibrowse_4_2_2 httpotion_2_2_0
+                          slack_0_3_0 poison_2_1_0 ibrowse_4_2_2 httpotion_2_2_2
                         ];
 
             meta = {
@@ -25618,36 +29676,36 @@ let
 
     maybe = maybe_0_0_1;
 
-    mazurka_0_3_32 = callPackage
+    mazurka_0_3_34 = callPackage
       (
         {
           buildMix,
           fetchHex,
           xml_builder_0_0_8,
           poison_2_1_0,
-          plug_1_1_1,
-          mimetype_parser_0_1_1,
+          plug_1_1_3,
+          mimetype_parser_0_1_2,
           mazurka_dsl_0_1_1,
-          html_builder_0_1_0,
+          html_builder_0_1_1,
           etude_0_3_7,
           ecto_1_0_7
         }:
           buildMix {
             name = "mazurka";
-            version = "0.3.32";
+            version = "0.3.34";
             src = fetchHex {
               pkg = "mazurka";
-              version = "0.3.32";
+              version = "0.3.34";
               sha256 =
-                "93a1a7fe508daae8df47a6bf8d3969d5cf93a206b65a5c350a0ea26005968f6a";
+                "4efd11082e2c6af965bc2f5e282601858f5e8d78f9ace30ba7baa27b03333023";
             };
             beamDeps  = [
                           xml_builder_0_0_8
                           poison_2_1_0
-                          plug_1_1_1
-                          mimetype_parser_0_1_1
+                          plug_1_1_3
+                          mimetype_parser_0_1_2
                           mazurka_dsl_0_1_1
-                          html_builder_0_1_0
+                          html_builder_0_1_1
                           etude_0_3_7
                           ecto_1_0_7
                         ];
@@ -25660,7 +29718,7 @@ let
           }
       ) {};
 
-    mazurka = mazurka_0_3_32;
+    mazurka = mazurka_0_3_34;
 
     mazurka_dsl_0_1_1 = callPackage
       (
@@ -25687,7 +29745,7 @@ let
 
     mazurka_mediatype_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, etude_0_4_0 }:
+        {  buildMix, fetchHex, etude_1_0_0_beta_0 }:
           buildMix {
             name = "mazurka_mediatype";
             version = "0.2.0";
@@ -25697,7 +29755,7 @@ let
               sha256 =
                 "4ccd8b27d6405e93cb34861f211d69b79ab46c2dbc5c7874d4ee3c580a5754bb";
             };
-            beamDeps  = [ etude_0_4_0 ];
+            beamDeps  = [ etude_1_0_0_beta_0 ];
 
             meta = {
               description = ''mazurka mediatype interface'';
@@ -25716,7 +29774,7 @@ let
           fetchHex,
           poison_1_3_1,
           mazurka_mediatype_0_2_0,
-          etude_0_4_0
+          etude_1_0_0_beta_0
         }:
           buildMix {
             name = "mazurka_mediatype_hyperjson";
@@ -25727,7 +29785,11 @@ let
               sha256 =
                 "f09489f242598ece8496f50c9dfc3d1a051b6115a654ebbb9ce5336e04b2cb8d";
             };
-            beamDeps  = [ poison_1_3_1 mazurka_mediatype_0_2_0 etude_0_4_0 ];
+            beamDeps  = [
+                          poison_1_3_1
+                          mazurka_mediatype_0_2_0
+                          etude_1_0_0_beta_0
+                        ];
 
             meta = {
               description = ''hyper+json mediatype compiler for mazurka'';
@@ -25740,10 +29802,64 @@ let
 
     mazurka_mediatype_hyperjson = mazurka_mediatype_hyperjson_0_2_3;
 
+    mc_data_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0 }:
+          buildMix {
+            name = "mc_data";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "mc_data";
+              version = "0.0.2";
+              sha256 =
+                "8faba98530129d3a79d7a3062db1f4fa358363be1575fb28acb6e74abb031e86";
+            };
+            beamDeps  = [ poison_2_1_0 ];
+
+            meta = {
+              description = ''Provides access to data from the game
+                            Minecraft.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/hansihe/elixir_mc_data";
+            };
+          }
+      ) {};
+
+    mc_data = mc_data_0_0_2;
+
+    mc_protocol_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, uuid_1_1_3 }:
+          buildMix {
+            name = "mc_protocol";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "mc_protocol";
+              version = "0.0.1";
+              sha256 =
+                "683d92c0c6efd034f56a664bcb4f21f17050a89577f4aa0200343673fd357865";
+            };
+            beamDeps  = [ uuid_1_1_3 ];
+
+            meta = {
+              longDescription = ''Implementation of the Minecraft protocol in
+                                Elixir. Aims to provide functional ways to
+                                interact with the minecraft protocol on all
+                                levels, including packet reading and writing,
+                                encryption, compression, authentication and
+                                more.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/hansihe/elixir_mc_protocol";
+            };
+          }
+      ) {};
+
+    mc_protocol = mc_protocol_0_0_1;
+
     mcrypt_0_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "mcrypt";
             version = "0.1.0";
             src = fetchHex {
@@ -25752,7 +29868,6 @@ let
               sha256 =
                 "508a35ba255190f80309dcabf9c81c88b86b9ec13af180627ad51b8e5cf2a4cd";
             };
-            compilePorts = true;
 
             meta = {
               description = ''NIF wrapper around libmcrypt.'';
@@ -25841,7 +29956,36 @@ let
           }
       ) {};
 
-    mdns_client_lib = mdns_client_lib_0_1_33;
+    mdns_client_lib_0_1_38 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          pooler_1_5_0,
+          mdns_client_0_1_7,
+          lager_2_1_1
+        }:
+          buildRebar3 {
+            name = "mdns_client_lib";
+            version = "0.1.38";
+            src = fetchHex {
+              pkg = "mdns_client_lib";
+              version = "0.1.38";
+              sha256 =
+                "46b990c883ca02c780a2295ffe75b51888c028ca42cd86b8ad517eca80cbd765";
+            };
+
+            beamDeps  = [ pooler_1_5_0 mdns_client_0_1_7 lager_2_1_1 ];
+
+            meta = {
+              description = ''client lib for mdns aware tcp servers'';
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/Licenser/mdns_client_lib";
+            };
+          }
+      ) {};
+
+    mdns_client_lib = mdns_client_lib_0_1_38;
 
     mdns_server_0_2_0 = callPackage
       (
@@ -25900,8 +30044,8 @@ let
 
     meck_0_8_4 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "meck";
             version = "0.8.4";
             src = fetchHex {
@@ -25923,7 +30067,7 @@ let
 
     medex_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4, consul_1_0_3 }:
+        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4, consul_1_0_3 }:
           buildMix {
             name = "medex";
             version = "0.1.2";
@@ -25933,7 +30077,7 @@ let
               sha256 =
                 "dd8dd07892a4aedbe7680fa8637b1c17b7615b2aaea0b25b84acad4ed50700d2";
             };
-            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 consul_1_0_3 ];
+            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 consul_1_0_3 ];
 
             meta = {
               longDescription = ''Medical Examination - application for
@@ -25970,19 +30114,19 @@ let
 
     meld = meld_0_1_2;
 
-    mellon_0_1_0 = callPackage
+    mellon_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0, plug_1_1_1 }:
+        {  buildMix, fetchHex, poison_2_1_0, plug_1_1_3 }:
           buildMix {
             name = "mellon";
-            version = "0.1.0";
+            version = "0.1.1";
             src = fetchHex {
               pkg = "mellon";
-              version = "0.1.0";
+              version = "0.1.1";
               sha256 =
-                "e9252f1abdc4c38a4ad9cc3bd194630f7756ba22a25e6ebf8e937b1600cb9aae";
+                "2b05fca901c0b9609cdd65cfb015a7646a9ec239cf1694ee8f1384a53a5ac0b4";
             };
-            beamDeps  = [ poison_2_1_0 plug_1_1_1 ];
+            beamDeps  = [ poison_2_1_0 plug_1_1_3 ];
 
             meta = {
               longDescription = ''Mellon is a Plug used in authentication of
@@ -25994,21 +30138,46 @@ let
           }
       ) {};
 
-    mellon = mellon_0_1_0;
+    mellon = mellon_0_1_1;
 
-    memcache_client_1_0_0 = callPackage
+    mem_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex, poolboy_1_5_1, poison_1_5_2 }:
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mem";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "mem";
+              version = "0.1.2";
+              sha256 =
+                "492f8bc52ca5d7ccdfdfac19d8a6f145eb9d268b712b02c207544022dfe2d42b";
+            };
+
+            meta = {
+              description = ''ETS based KV cache with TTL and LRU support'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/falood/mem";
+            };
+          }
+      ) {};
+
+    mem = mem_0_1_2;
+
+    memcache_client_1_1_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, poolboy_1_5_1, poison_2_1_0, connection_1_0_2
+        }:
           buildMix {
             name = "memcache_client";
-            version = "1.0.0";
+            version = "1.1.0";
             src = fetchHex {
               pkg = "memcache_client";
-              version = "1.0.0";
+              version = "1.1.0";
               sha256 =
-                "ef5977dc10fd0d55606887168735ae4a0c481a1edbf2a28e042cab3f53e1f9c3";
+                "e12d6add6d9ef817f7cf47d85c37c75c9ec81512a7ad88f23b50963048bce439";
             };
-            beamDeps  = [ poolboy_1_5_1 poison_1_5_2 ];
+            beamDeps  = [ poolboy_1_5_1 poison_2_1_0 connection_1_0_2 ];
 
             meta = {
               description = ''Memcache client library utilizing the memcache
@@ -26019,7 +30188,7 @@ let
           }
       ) {};
 
-    memcache_client = memcache_client_1_0_0;
+    memcache_client = memcache_client_1_1_0;
 
     message_pack_0_2_0 = callPackage
       (
@@ -26071,7 +30240,7 @@ let
 
     metainvestigator_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, floki_0_7_1 }:
+        {  buildMix, fetchHex, floki_0_8_0 }:
           buildMix {
             name = "metainvestigator";
             version = "0.0.3";
@@ -26081,7 +30250,7 @@ let
               sha256 =
                 "774b3973090491a9a342a68c5cf099c98581ae0f1b1d313a08a7d2030d541781";
             };
-            beamDeps  = [ floki_0_7_1 ];
+            beamDeps  = [ floki_0_8_0 ];
 
             meta = {
               description = ''A library for web scraping, inspired by
@@ -26094,17 +30263,17 @@ let
 
     metainvestigator = metainvestigator_0_0_3;
 
-    metrics_0_2_1 = callPackage
+    metrics_1_0_1 = callPackage
       (
         {  buildRebar3, fetchHex }:
           buildRebar3 {
             name = "metrics";
-            version = "0.2.1";
+            version = "1.0.1";
             src = fetchHex {
               pkg = "metrics";
-              version = "0.2.1";
+              version = "1.0.1";
               sha256 =
-                "1cccc3534fa5a7861a3dcc0414afba00a616937e82c95d6172a523a5d2e97c03";
+                "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16";
             };
 
             meta = {
@@ -26116,7 +30285,29 @@ let
           }
       ) {};
 
-    metrics = metrics_0_2_1;
+    metrics_1_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "metrics";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "metrics";
+              version = "1.1.0";
+              sha256 =
+                "48bd4774cef5bd88680cf71c9db46acbe5a80f23072cb2a0a42e8f7d5bd33549";
+            };
+
+            meta = {
+              description = ''A generic interface to different metrics systems
+                            in Erlang.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/benoitc/erlang-metrics";
+            };
+          }
+      ) {};
+
+    metrics = metrics_1_1_0;
 
     metrix_0_2_0 = callPackage
       (
@@ -26169,19 +30360,19 @@ let
 
     mex = mex_0_0_5;
 
-    microformats2_0_0_1 = callPackage
+    microformats2_0_0_5 = callPackage
       (
-        {  buildMix, fetchHex, httpotion_2_2_0, floki_0_7_1 }:
+        {  buildMix, fetchHex, httpotion_2_2_2, floki_0_7_2 }:
           buildMix {
             name = "microformats2";
-            version = "0.0.1";
+            version = "0.0.5";
             src = fetchHex {
               pkg = "microformats2";
-              version = "0.0.1";
+              version = "0.0.5";
               sha256 =
-                "9b14b1065763c422beb7fea518a1374bb17bcbe8f903381612e4deb3c9b8e385";
+                "890ca1812738869aa65865339a730c5542949cac4b017b25fc276e81b37157b2";
             };
-            beamDeps  = [ httpotion_2_2_0 floki_0_7_1 ];
+            beamDeps  = [ httpotion_2_2_2 floki_0_7_2 ];
 
             meta = {
               description = ''A microformats2 parser
@@ -26193,7 +30384,7 @@ let
           }
       ) {};
 
-    microformats2 = microformats2_0_0_1;
+    microformats2 = microformats2_0_0_5;
 
     milliseconds_0_0_1 = callPackage
       (
@@ -26309,17 +30500,17 @@ let
 
     mimerl = mimerl_1_1_0;
 
-    mimetype_parser_0_1_1 = callPackage
+    mimetype_parser_0_1_2 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "mimetype_parser";
-            version = "0.1.1";
+            version = "0.1.2";
             src = fetchHex {
               pkg = "mimetype_parser";
-              version = "0.1.1";
+              version = "0.1.2";
               sha256 =
-                "ec26e5e2bb279babd5bd415d626d04040d9f719fc2b0066eb909777a93015fce";
+                "c495521cad6cf49fb79098e68e921c58955312df46c9c5aa5abab44224c2647d";
             };
 
             meta = {
@@ -26330,7 +30521,7 @@ let
           }
       ) {};
 
-    mimetype_parser = mimetype_parser_0_1_1;
+    mimetype_parser = mimetype_parser_0_1_2;
 
     mimex_0_1_0 = callPackage
       (
@@ -26355,17 +30546,17 @@ let
 
     mimex = mimex_0_1_0;
 
-    minmaxlist_0_0_5 = callPackage
+    minmaxlist_0_0_6 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "minmaxlist";
-            version = "0.0.5";
+            version = "0.0.6";
             src = fetchHex {
               pkg = "minmaxlist";
-              version = "0.0.5";
+              version = "0.0.6";
               sha256 =
-                "6d14c8a55196e803cb6cdfded42f57d61b96e4bd3ce7c31f36e33a3257256d8e";
+                "cc9bc50dc971c8c3743bcecdaca35330593d6466d911c656ba7d718836e68a57";
             };
 
             meta = {
@@ -26378,7 +30569,7 @@ let
           }
       ) {};
 
-    minmaxlist = minmaxlist_0_0_5;
+    minmaxlist = minmaxlist_0_0_6;
 
     misc_random_0_2_6 = callPackage
       (
@@ -26530,17 +30721,17 @@ let
 
     mix_info = mix_info_0_7_2;
 
-    mix_test_watch_0_2_5 = callPackage
+    mix_test_watch_0_2_6 = callPackage
       (
         {  buildMix, fetchHex, fs_0_9_2 }:
           buildMix {
             name = "mix_test_watch";
-            version = "0.2.5";
+            version = "0.2.6";
             src = fetchHex {
               pkg = "mix_test_watch";
-              version = "0.2.5";
+              version = "0.2.6";
               sha256 =
-                "68ddd24df6d6ca77f8a95d4bb0443998031984122aa574d79434fac25f10da7b";
+                "b7019e9a0eba42bc98f15be9c1402f23c2b0dab7b67e71bba8bc5b337b0ab273";
             };
             beamDeps  = [ fs_0_9_2 ];
 
@@ -26552,7 +30743,7 @@ let
           }
       ) {};
 
-    mix_test_watch = mix_test_watch_0_2_5;
+    mix_test_watch = mix_test_watch_0_2_6;
 
     mixpanel_0_0_3 = callPackage
       (
@@ -26581,7 +30772,7 @@ let
 
     mixpanel_api_ex_0_8_3 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "mixpanel_api_ex";
             version = "0.8.3";
@@ -26591,7 +30782,7 @@ let
               sha256 =
                 "1ff5eb4aa333495a86868873deb8fcd04c5f2e6f2560d77ac6ccbe07e2e3d7b4";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Elixir client for the Mixpanel API.'';
@@ -26605,7 +30796,7 @@ let
 
     mixpanel_data_client_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_3_1, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_3_1, httpoison_0_8_2 }:
           buildMix {
             name = "mixpanel_data_client";
             version = "0.0.2";
@@ -26615,7 +30806,7 @@ let
               sha256 =
                 "7f3bbd608ae18153655f27bd50ea01ad85630d6c1cc6ab9ed336e95419f06c86";
             };
-            beamDeps  = [ poison_1_3_1 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_3_1 httpoison_0_8_2 ];
 
             meta = {
               description = ''Client library for interacting with the Mixpanel
@@ -26630,7 +30821,7 @@ let
 
     mixstar_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, netrc_0_0_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, netrc_0_0_2, httpoison_0_8_2 }:
           buildMix {
             name = "mixstar";
             version = "0.0.1";
@@ -26640,7 +30831,7 @@ let
               sha256 =
                 "d7f9014711d04049c90a8f835857d1bde04647b326d1ec949e2a90477f4d4a39";
             };
-            beamDeps  = [ netrc_0_0_2 httpoison_0_8_1 ];
+            beamDeps  = [ netrc_0_0_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''MixStar starred GitHub repository that depends on
@@ -26678,7 +30869,7 @@ let
 
     mmExchangeRate_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, jsx_2_8_0, httpotion_1_0_0 }:
+        {  buildMix, fetchHex, jsx_2_8_0, httpotion_2_2_2 }:
           buildMix {
             name = "mmExchangeRate";
             version = "0.0.1";
@@ -26688,7 +30879,7 @@ let
               sha256 =
                 "6daf6e74bf3ce8f9d7cc19b18b023d700201a847dde94a0eef1f263ce65efbac";
             };
-            beamDeps  = [ jsx_2_8_0 httpotion_1_0_0 ];
+            beamDeps  = [ jsx_2_8_0 httpotion_2_2_2 ];
 
             meta = {
               longDescription = ''A simple exchange rate checker and calculator
@@ -26749,6 +30940,30 @@ let
 
     mmath = mmath_0_1_16;
 
+    mnemonic_slugs_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mnemonic_slugs";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "mnemonic_slugs";
+              version = "0.0.1";
+              sha256 =
+                "d5200aaf06da3f9f307b58464f5eca2ed1a0dc379a12fe4f42444bb1e30a4bd8";
+            };
+
+            meta = {
+              description = ''MnemonicSlugs is an Elixir library for generating
+                            memorable slugs.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/devshane/mnemonic_slugs";
+            };
+          }
+      ) {};
+
+    mnemonic_slugs = mnemonic_slugs_0_0_1;
+
     mobiledoc_0_0_1 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -26776,8 +30991,8 @@ let
 
     mochiweb_2_12_2 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "mochiweb";
             version = "2.12.2";
             src = fetchHex {
@@ -26798,19 +31013,41 @@ let
 
     mochiweb = mochiweb_2_12_2;
 
-    mock_0_1_1 = callPackage
+    mochiweb_html_2_13_0 = callPackage
       (
-        {  buildRebar3, fetchHex, meck_0_8_4 }:
+        {  buildRebar3, fetchHex }:
           buildRebar3 {
-            name = "mock";
-            version = "0.1.1";
+            name = "mochiweb_html";
+            version = "2.13.0";
             src = fetchHex {
-              pkg = "mock";
-              version = "0.1.1";
+              pkg = "mochiweb_html";
+              version = "2.13.0";
               sha256 =
-                "d2d73a2f0621bbf23011fdc6a29eca114381e77098e19b71d0774278ca80bc01";
+                "c05f969fd011b357ea2f577c2b996776241d179ba2eb1bcba274cc23fdcf5439";
             };
 
+            meta = {
+              description = ''Mochiweb HTML parser'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mochi/mochiweb";
+            };
+          }
+      ) {};
+
+    mochiweb_html = mochiweb_html_2_13_0;
+
+    mock_0_1_3 = callPackage
+      (
+        {  buildMix, fetchHex, meck_0_8_4 }:
+          buildMix {
+            name = "mock";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "mock";
+              version = "0.1.3";
+              sha256 =
+                "bf7cf50d528394d870cdecac4920ab719cec0af98eff95759b57cab0e5ee143e";
+            };
             beamDeps  = [ meck_0_8_4 ];
 
             meta = {
@@ -26826,7 +31063,7 @@ let
           }
       ) {};
 
-    mock = mock_0_1_1;
+    mock = mock_0_1_3;
 
     module_mocker_0_2_0 = callPackage
       (
@@ -26917,7 +31154,7 @@ let
 
     mojoauth_1_0_2 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_1 }:
+        {  buildMix, fetchHex, timex_1_0_2 }:
           buildMix {
             name = "mojoauth";
             version = "1.0.2";
@@ -26927,7 +31164,7 @@ let
               sha256 =
                 "72d8b3fdff6d6571d7dcc9ad46b249823c84e0321920a0e9d6f39ee5f9fc2f23";
             };
-            beamDeps  = [ timex_1_0_1 ];
+            beamDeps  = [ timex_1_0_2 ];
 
             meta = {
               longDescription = ''MojoAuth is a set of standard approaches to
@@ -26966,7 +31203,7 @@ let
 
     mon_handler_1_0_2 = callPackage
       (
-        {  buildMix, fetchHex, dialyze_0_2_0 }:
+        {  buildMix, fetchHex, dialyze_0_2_1 }:
           buildMix {
             name = "mon_handler";
             version = "1.0.2";
@@ -26976,7 +31213,7 @@ let
               sha256 =
                 "d18942f95750b94e3da1d9fca7a2ea4b1b1d27c017feff76cb109b29bb308f58";
             };
-            beamDeps  = [ dialyze_0_2_0 ];
+            beamDeps  = [ dialyze_0_2_1 ];
 
             meta = {
               longDescription = ''A minimal GenServer that monitors a given
@@ -27042,7 +31279,7 @@ let
     mondo_0_1_0 = callPackage
       (
         {
-          buildMix, fetchHex, poison_2_1_0, plug_1_1_1, httpoison_0_8_1
+          buildMix, fetchHex, poison_2_1_0, plug_1_1_3, httpoison_0_8_2
         }:
           buildMix {
             name = "mondo";
@@ -27053,7 +31290,7 @@ let
               sha256 =
                 "f557216314e098137f5140f1194e2eba7a2a030d78affc23ea5943f586ab1095";
             };
-            beamDeps  = [ poison_2_1_0 plug_1_1_1 httpoison_0_8_1 ];
+            beamDeps  = [ poison_2_1_0 plug_1_1_3 httpoison_0_8_2 ];
 
             meta = {
               description = ''An Elixir client for the Mondo API.'';
@@ -27067,7 +31304,7 @@ let
 
     monetized_0_3_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, ecto_1_1_3, decimal_1_1_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, ecto_1_1_5, decimal_1_1_1 }:
           buildMix {
             name = "monetized";
             version = "0.3.2";
@@ -27077,7 +31314,7 @@ let
               sha256 =
                 "1978e46c6dd352fea0e9ce208835886ea4fd07dfc1555ee2f9adce98a9e82ce6";
             };
-            beamDeps  = [ poison_1_5_2 ecto_1_1_3 decimal_1_1_1 ];
+            beamDeps  = [ poison_1_5_2 ecto_1_1_5 decimal_1_1_1 ];
 
             meta = {
               description = ''A lightweight solution for handling and storing
@@ -27163,17 +31400,17 @@ let
 
     mongodb = mongodb_0_1_1;
 
-    mongodb_ecto_0_1_3 = callPackage
+    mongodb_ecto_0_1_4 = callPackage
       (
         {  buildMix, fetchHex, mongodb_0_1_1, ecto_1_0_7 }:
           buildMix {
             name = "mongodb_ecto";
-            version = "0.1.3";
+            version = "0.1.4";
             src = fetchHex {
               pkg = "mongodb_ecto";
-              version = "0.1.3";
+              version = "0.1.4";
               sha256 =
-                "8befad3e958f3924cb780dbf958d63539d48e23ca680e4e9dc1cf63b6827ce8a";
+                "2f9cc8c8cd316e187f4b8b94d0a88618ce4a6cb1b6cfa7856573f3376fb443bf";
             };
             beamDeps  = [ mongodb_0_1_1 ecto_1_0_7 ];
 
@@ -27185,7 +31422,7 @@ let
           }
       ) {};
 
-    mongodb_ecto = mongodb_ecto_0_1_3;
+    mongodb_ecto = mongodb_ecto_0_1_4;
 
     monk_0_1_3 = callPackage
       (
@@ -27307,17 +31544,17 @@ let
 
     mpinyin = mpinyin_0_0_2;
 
-    msgpack_0_4_0 = callPackage
+    msgpack_0_5_0 = callPackage
       (
         {  buildRebar3, fetchHex }:
           buildRebar3 {
             name = "msgpack";
-            version = "0.4.0";
+            version = "0.5.0";
             src = fetchHex {
               pkg = "msgpack";
-              version = "0.4.0";
+              version = "0.5.0";
               sha256 =
-                "cb69184b254bcddfd0b3b813fa9ffc87dd4642ad026bb8117e2384b55239eae4";
+                "520ae767b3c3c0796d2913c92f463bc8b4dee091880734f5b99a90921e18b704";
             };
 
             meta = {
@@ -27328,19 +31565,19 @@ let
           }
       ) {};
 
-    msgpack = msgpack_0_4_0;
+    msgpack = msgpack_0_5_0;
 
-    msgpax_0_7_0 = callPackage
+    msgpax_0_7_1 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "msgpax";
-            version = "0.7.0";
+            version = "0.7.1";
             src = fetchHex {
               pkg = "msgpax";
-              version = "0.7.0";
+              version = "0.7.1";
               sha256 =
-                "c51838cc08674eada16ff7ff516b1c4028fecba602bdc04747f85a94dca25202";
+                "3d2bb32de9552482f35b86cbdc547ee94b67615bfcc831222cde869afa202f2c";
             };
 
             meta = {
@@ -27504,7 +31741,7 @@ let
     murdoch_0_0_1 = callPackage
       (
         {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1, goth_0_0_3
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, goth_0_0_3
         }:
           buildMix {
             name = "murdoch";
@@ -27515,7 +31752,7 @@ let
               sha256 =
                 "77ec44ca76d6b4a14df7222104a36cb29ed25f7d52fb3ffe30807ddc82a2d9ad";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 goth_0_0_3 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 goth_0_0_3 ];
 
             meta = {
               longDescription = ''A library for interacting with Google Cloud
@@ -27529,6 +31766,30 @@ let
 
     murdoch = murdoch_0_0_1;
 
+    murmur_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "murmur";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "murmur";
+              version = "0.2.1";
+              sha256 =
+                "7e38b2f136d4e8039abb88f6cbdf50c939408d3819be4b18b639a968ee9c2bce";
+            };
+
+            meta = {
+              longDescription = ''Murmur is a pure Elixir implementation of the
+                                non-cryptographic hash Murmur3. It aims to
+                                implement the x86_32bit, x86_128bit and
+                                x64_128bit variants.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gmcabrita/murmur";
+            };
+          }
+      ) {};
+
     murmur_1_0_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -27601,6 +31862,30 @@ let
 
     mustachex = mustachex_0_0_1;
 
+    mutant_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "mutant";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "mutant";
+              version = "0.0.2";
+              sha256 =
+                "c875062e082242b79c85356993ad3cfd7d550392d34fc6da23a132495b0dcb6f";
+            };
+
+            meta = {
+              description = ''Now you can create mutable structs, use this with
+                            care and only as a last resort'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/hackersguildco/Mutant";
+            };
+          }
+      ) {};
+
+    mutant = mutant_0_0_2;
+
     mynumber_1_0_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -27675,8 +31960,8 @@ let
 
     n2o_2_3_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildMix, fetchHex }:
+          buildMix {
             name = "n2o";
             version = "2.3.0";
             src = fetchHex {
@@ -27720,19 +32005,19 @@ let
 
     nacl = nacl_0_3_0;
 
-    nadia_0_3_3 = callPackage
+    nadia_0_4_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "nadia";
-            version = "0.3.3";
+            version = "0.4.0";
             src = fetchHex {
               pkg = "nadia";
-              version = "0.3.3";
+              version = "0.4.0";
               sha256 =
-                "8ea94a9a92aac18b98736148892c6ec672fa599cb5aa222757393c1551228b4e";
+                "e76217333ad6d02ec971bfa781e70268285fc417aebb486318e0584affccb08d";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Telegram Bot API Wrapper written in Elixir'';
@@ -27742,7 +32027,7 @@ let
           }
       ) {};
 
-    nadia = nadia_0_3_3;
+    nadia = nadia_0_4_0;
 
     nat_set_0_0_1 = callPackage
       (
@@ -27817,17 +32102,17 @@ let
 
     nats = nats_0_0_1;
 
-    nats_msg_0_3_3 = callPackage
+    nats_msg_0_4_1 = callPackage
       (
         {  buildRebar3, fetchHex }:
           buildRebar3 {
             name = "nats_msg";
-            version = "0.3.3";
+            version = "0.4.1";
             src = fetchHex {
               pkg = "nats_msg";
-              version = "0.3.3";
+              version = "0.4.1";
               sha256 =
-                "80b2669f8c53395c156d3a121befe71a5131d7a42f14a38fbd7778a179b498ac";
+                "8e21a78bf2ae76d7702bcc03eb87bdddac1b99edebfc99db98e8e94a7a5361c4";
             };
 
             meta = {
@@ -27839,7 +32124,7 @@ let
           }
       ) {};
 
-    nats_msg = nats_msg_0_3_3;
+    nats_msg = nats_msg_0_4_1;
 
     natsio_0_1_4 = callPackage
       (
@@ -27895,7 +32180,7 @@ let
           fetchHex,
           poison_1_5_2,
           httpoison_0_7_5,
-          floki_0_7_1,
+          floki_0_8_0,
           exprintf_0_1_6
         }:
           buildMix {
@@ -27910,7 +32195,7 @@ let
             beamDeps  = [
                           poison_1_5_2
                           httpoison_0_7_5
-                          floki_0_7_1
+                          floki_0_8_0
                           exprintf_0_1_6
                         ];
 
@@ -27927,7 +32212,7 @@ let
 
     navigation_history_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1 }:
+        {  buildMix, fetchHex, plug_1_1_3 }:
           buildMix {
             name = "navigation_history";
             version = "0.2.0";
@@ -27937,7 +32222,7 @@ let
               sha256 =
                 "9fbddedd831930c3f2e784c53442558d90d68040f9921dfa9441da63d6b8dacc";
             };
-            beamDeps  = [ plug_1_1_1 ];
+            beamDeps  = [ plug_1_1_3 ];
 
             meta = {
               description = ''Navigation history tracking plug'';
@@ -27978,6 +32263,45 @@ let
 
     navigation_tree = navigation_tree_0_4_4;
 
+    ndc_ex_sdk_0_0_7 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          xml_builder_0_0_8,
+          pipe_0_0_2,
+          ibrowse_4_2_2,
+          httpotion_2_2_2
+        }:
+          buildMix {
+            name = "ndc_ex_sdk";
+            version = "0.0.7";
+            src = fetchHex {
+              pkg = "ndc_ex_sdk";
+              version = "0.0.7";
+              sha256 =
+                "73402d51ce6da305409d48e1638e864a336038a03205e66c75c090115c8fe8b8";
+            };
+            beamDeps  = [
+                          xml_builder_0_0_8
+                          pipe_0_0_2
+                          ibrowse_4_2_2
+                          httpotion_2_2_2
+                        ];
+
+            meta = {
+              longDescription = ''This is an Elixir package that wrapps any
+                                NDC-compliant API. It`s host-agnostic and quite
+                                flexible-through-configuration so that it can
+                                reach NDC hosts with a certain flexibility'';
+
+              homepage = "https://github.com/open-ndc/ndc-ex-sdk";
+            };
+          }
+      ) {};
+
+    ndc_ex_sdk = ndc_ex_sdk_0_0_7;
+
     neat_ex_1_1_0 = callPackage
       (
         {  buildMix, fetchHex, json_0_3_3 }:
@@ -28013,30 +32337,80 @@ let
 
     neat_ex = neat_ex_1_1_0;
 
-    neo4j_sips_0_1_12 = callPackage
+    nectar_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "nectar";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "nectar";
+              version = "0.0.1";
+              sha256 =
+                "dffc5f1c68c83d9eb83ca1c8868d923beaccfdf36ae2e5122dc7bc8edd5665f5";
+            };
+
+            meta = {
+              description = ''Placeholder package for nectar ecommerce'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    nectar = nectar_0_0_1;
+
+    neo4j_0_3_0 = callPackage
+      (
+        {  buildErlangMk, fetchHex, jiffy_0_14_7, hackney_1_4_10 }:
+          buildErlangMk {
+            name = "neo4j";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "neo4j";
+              version = "0.3.0";
+              sha256 =
+                "93b07252e5216dbccedda19a28873ab5352f59a3c0f257b85a14d3b4e47d3cf7";
+            };
+            beamDeps  = [ jiffy_0_14_7 hackney_1_4_10 ];
+
+            meta = {
+              longDescription = ''Erlang client library for Neo4J This is a
+                                lightweight wrapper for Neo4j REST API. Exposes
+                                all of the functionality exposed by Neo4J REST
+                                API. Please refer to README to see if you need
+                                version 0.2.1 or 0.3'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dmitriid/neo4j-erlang";
+            };
+          }
+      ) {};
+
+    neo4j = neo4j_0_3_0;
+
+    neo4j_sips_0_1_25 = callPackage
       (
         {
           buildMix,
           fetchHex,
           poolboy_1_5_1,
-          poison_1_5_2,
-          httpoison_0_7_5,
-          con_cache_0_9_0
+          poison_2_1_0,
+          httpoison_0_8_2,
+          con_cache_0_11_0
         }:
           buildMix {
             name = "neo4j_sips";
-            version = "0.1.12";
+            version = "0.1.25";
             src = fetchHex {
               pkg = "neo4j_sips";
-              version = "0.1.12";
+              version = "0.1.25";
               sha256 =
-                "7a4547b36abd57856f04c8d0b7f2a39eb9fdf7a8c088fdf5836853559ad7aee2";
+                "b81aa758aa45ec67c40d8876e5bf6a69e290e0c8d529e078546e930dbc3dcd8e";
             };
             beamDeps  = [
                           poolboy_1_5_1
-                          poison_1_5_2
-                          httpoison_0_7_5
-                          con_cache_0_9_0
+                          poison_2_1_0
+                          httpoison_0_8_2
+                          con_cache_0_11_0
                         ];
 
             meta = {
@@ -28048,7 +32422,43 @@ let
           }
       ) {};
 
-    neo4j_sips = neo4j_sips_0_1_12;
+    neo4j_sips = neo4j_sips_0_1_25;
+
+    neo4j_sips_models_0_1_1 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          timex_1_0_2,
+          neo4j_sips_0_1_25,
+          inflex_1_5_0,
+          chronos_1_5_1
+        }:
+          buildMix {
+            name = "neo4j_sips_models";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "neo4j_sips_models";
+              version = "0.1.1";
+              sha256 =
+                "6572993cd5acdcdf77490d608236c869ce0cda2931beda2a272f85f2f1831759";
+            };
+            beamDeps  = [
+                          timex_1_0_2
+                          neo4j_sips_0_1_25
+                          inflex_1_5_0
+                          chronos_1_5_1
+                        ];
+
+            meta = {
+              description = ''Add Models support to the Neo4J Elixir driver'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/florinpatrascu/neo4j_sips_models";
+            };
+          }
+      ) {};
+
+    neo4j_sips_models = neo4j_sips_models_0_1_1;
 
     neotoma_1_7_3 = callPackage
       (
@@ -28097,10 +32507,35 @@ let
 
     neotomex = neotomex_0_1_4;
 
+    nerves_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, exrm_1_0_3 }:
+          buildMix {
+            name = "nerves";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "nerves";
+              version = "0.2.0";
+              sha256 =
+                "b53cd891c3d719597ccb084bdcfc6eb714f820d9c53c44f1bab4d530c9b0734f";
+            };
+            beamDeps  = [ exrm_1_0_3 ];
+
+            meta = {
+              longDescription = ''Nerves - Create firmware for embedded devices
+                                like Raspberry Pi, BeagleBone Black, and more'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/nerves-project/nerves";
+            };
+          }
+      ) {};
+
+    nerves = nerves_0_2_0;
+
     nerves_io_neopixel_0_2_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "nerves_io_neopixel";
             version = "0.2.0";
             src = fetchHex {
@@ -28146,19 +32581,19 @@ let
 
     nest = nest_0_0_1;
 
-    nested_set_0_0_1 = callPackage
+    nested_set_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, ecto_1_1_3 }:
+        {  buildMix, fetchHex, ecto_1_1_5 }:
           buildMix {
             name = "nested_set";
-            version = "0.0.1";
+            version = "0.0.2";
             src = fetchHex {
               pkg = "nested_set";
-              version = "0.0.1";
+              version = "0.0.2";
               sha256 =
-                "cd38faeaef21ad1675d4a4467cff6b439b90ca1c07fac72857ab63804967a00d";
+                "283fac1cbaf129d29a7ea6b6c050248bdc63631421d395f0b909510c3f7d2e83";
             };
-            beamDeps  = [ ecto_1_1_3 ];
+            beamDeps  = [ ecto_1_1_5 ];
 
             meta = {
               longDescription = ''Nested Set implementation for Ecto/Phoenix.
@@ -28171,7 +32606,7 @@ let
           }
       ) {};
 
-    nested_set = nested_set_0_0_1;
+    nested_set = nested_set_0_0_2;
 
     netrc_0_0_2 = callPackage
       (
@@ -28196,17 +32631,17 @@ let
 
     netrc = netrc_0_0_2;
 
-    netstrings_2_0_0 = callPackage
+    netstrings_2_0_1 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "netstrings";
-            version = "2.0.0";
+            version = "2.0.1";
             src = fetchHex {
               pkg = "netstrings";
-              version = "2.0.0";
+              version = "2.0.1";
               sha256 =
-                "f510110b2a821363409fd77942f61309b6c0000a8cdda91a6f653e95f3c36c23";
+                "f6a3727dba6ae5aa3371ffddf7adf6aaf46bf387e84873f65152083ecf821845";
             };
 
             meta = {
@@ -28217,7 +32652,32 @@ let
           }
       ) {};
 
-    netstrings = netstrings_2_0_0;
+    netstrings = netstrings_2_0_1;
+
+    neural_network_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "neural_network";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "neural_network";
+              version = "0.1.0";
+              sha256 =
+                "80e84eaf4e0ff5455651c6c7cef484b9eefd60d6bd8e59606eb72a42cf18587c";
+            };
+
+            meta = {
+              longDescription = ''A neural network made up of layers of neurons
+                                connected to each other to form a relationship
+                                allowing it to learn.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/kblake/neural-net-elixir";
+            };
+          }
+      ) {};
+
+    neural_network = neural_network_0_1_0;
 
     news_0_3_0 = callPackage
       (
@@ -28317,17 +32777,17 @@ let
 
     nifty = nifty_0_0_3;
 
-    nile_0_1_2 = callPackage
+    nile_0_1_3 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "nile";
-            version = "0.1.2";
+            version = "0.1.3";
             src = fetchHex {
               pkg = "nile";
-              version = "0.1.2";
+              version = "0.1.3";
               sha256 =
-                "3b7c463f7e0d12a38757b893d41d08772d6f06e5e4a15812409b655acb4b6dfc";
+                "73a2c8be8507bb39de74eb3fa5ae40e3c40cabef30cd884f67ab6d3400a7bea4";
             };
 
             meta = {
@@ -28338,11 +32798,11 @@ let
           }
       ) {};
 
-    nile = nile_0_1_2;
+    nile = nile_0_1_3;
 
     ninjaproxies_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "ninjaproxies";
             version = "0.2.0";
@@ -28352,7 +32812,7 @@ let
               sha256 =
                 "5524329d00944690b362d30fef9c4032c03c401cc44d0ad9e98e147f5792fade";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Ninjaproxies client library for Elixir.'';
@@ -28366,7 +32826,7 @@ let
 
     nio_google_authenticator_1_0_1 = callPackage
       (
-        {  buildMix, fetchHex, pot_0_9_4, ecto_2_0_0_beta_0 }:
+        {  buildMix, fetchHex, pot_0_9_4, ecto_2_0_0_beta_2 }:
           buildMix {
             name = "nio_google_authenticator";
             version = "1.0.1";
@@ -28376,7 +32836,7 @@ let
               sha256 =
                 "a8a82c6c40e9575e8bea2fc7302af05bcd478b3a6a0e9df212617f807fe23758";
             };
-            beamDeps  = [ pot_0_9_4 ecto_2_0_0_beta_0 ];
+            beamDeps  = [ pot_0_9_4 ecto_2_0_0_beta_2 ];
 
             meta = {
               longDescription = ''NioGoogleAuthenticator is a collection of
@@ -28400,8 +32860,8 @@ let
           buildMix,
           fetchHex,
           poison_1_5_2,
-          httpoison_0_8_1,
-          ecto_2_0_0_beta_0
+          httpoison_0_8_2,
+          ecto_2_0_0_beta_2
         }:
           buildMix {
             name = "nio_google_geocoder";
@@ -28412,7 +32872,7 @@ let
               sha256 =
                 "ba551ad6138b133d6b90ac96c0443aa31724084049059bf15710dac4c1f3e701";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ecto_2_0_0_beta_0 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ecto_2_0_0_beta_2 ];
 
             meta = {
               longDescription = ''NioGoogleGeocoder is a collection of Elixir
@@ -28428,6 +32888,30 @@ let
 
     nio_google_geocoder = nio_google_geocoder_0_7_0;
 
+    njord_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
+          buildMix {
+            name = "njord";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "njord";
+              version = "0.1.1";
+              sha256 =
+                "b438430dbf6ceaf2bede01a285c5032be3041cbedd7c1552653d75179fab4dfb";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
+
+            meta = {
+              description = ''A wrapper over HTTPoison to build client APIs.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gmtprime/njord";
+            };
+          }
+      ) {};
+
+    njord = njord_0_1_1;
+
     nodefinder_1_5_1 = callPackage
       (
         {  buildRebar3, fetchHex, erlcloud_0_9_2 }:
@@ -28453,6 +32937,30 @@ let
 
     nodefinder = nodefinder_1_5_1;
 
+    normalixr_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex, ecto_0_2_7 }:
+          buildMix {
+            name = "normalixr";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "normalixr";
+              version = "0.3.0";
+              sha256 =
+                "22a9c5137c23b1485a6b13027cb2979ce04d5b119b257e863975a7fb336c1e46";
+            };
+            beamDeps  = [ ecto_0_2_7 ];
+
+            meta = {
+              description = ''Normalization and backfilling Ecto Schemas'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/theemuts/normalixr";
+            };
+          }
+      ) {};
+
+    normalixr = normalixr_0_3_0;
+
     normalize_email_0_0_1 = callPackage
       (
         {  buildMix, fetchHex, is_email_0_0_2 }:
@@ -28500,17 +33008,17 @@ let
 
     normalize_url = normalize_url_0_0_2;
 
-    not_qwerty123_1_0_0 = callPackage
+    not_qwerty123_1_1_0 = callPackage
       (
         {  buildMix, fetchHex, gettext_0_10_0 }:
           buildMix {
             name = "not_qwerty123";
-            version = "1.0.0";
+            version = "1.1.0";
             src = fetchHex {
               pkg = "not_qwerty123";
-              version = "1.0.0";
+              version = "1.1.0";
               sha256 =
-                "f1ec4634e5608ffae5c1d546696e77abfce8ee1fa415de93e43a2161d70d59d4";
+                "4997296d742f72fe95f8933cba92ab6cee3147888dc9bbd7b703c7f970e8ab58";
             };
             beamDeps  = [ gettext_0_10_0 ];
 
@@ -28523,7 +33031,7 @@ let
           }
       ) {};
 
-    not_qwerty123 = not_qwerty123_1_0_0;
+    not_qwerty123 = not_qwerty123_1_1_0;
 
     number_0_4_1 = callPackage
       (
@@ -28555,9 +33063,9 @@ let
           buildMix,
           fetchHex,
           poison_1_5_2,
-          plug_1_1_1,
-          httpoison_0_8_1,
-          hackney_1_4_8
+          plug_1_1_3,
+          httpoison_0_8_2,
+          hackney_1_6_0
         }:
           buildMix {
             name = "oauth2";
@@ -28569,7 +33077,7 @@ let
                 "ee23e6fb6ac84abce23713ba93f1df2fd368c9ad7b9288f0ef6fcec0e0249043";
             };
             beamDeps  = [
-                          poison_1_5_2 plug_1_1_1 httpoison_0_8_1 hackney_1_4_8
+                          poison_1_5_2 plug_1_1_3 httpoison_0_8_2 hackney_1_6_0
                         ];
 
             meta = {
@@ -28580,25 +33088,25 @@ let
           }
       ) {};
 
-    oauth2_0_5_0 = callPackage
+    oauth2_0_6_0 = callPackage
       (
         {
           buildMix,
           fetchHex,
-          poison_1_5_2,
-          mimetype_parser_0_1_1,
-          httpoison_0_8_1
+          poison_1_0_3,
+          mimetype_parser_0_1_2,
+          httpoison_0_8_2
         }:
           buildMix {
             name = "oauth2";
-            version = "0.5.0";
+            version = "0.6.0";
             src = fetchHex {
               pkg = "oauth2";
-              version = "0.5.0";
+              version = "0.6.0";
               sha256 =
-                "1bc7d89a27a85fcdd9ebad7a0f4b80c4ae4ae98ed4cf87545667892f92e6a4dd";
+                "1fcc76a12fcaa57392c0288be90df0eabd898c0982944c67d0e84e980c423e10";
             };
-            beamDeps  = [ poison_1_5_2 mimetype_parser_0_1_1 httpoison_0_8_1
+            beamDeps  = [ poison_1_0_3 mimetype_parser_0_1_2 httpoison_0_8_2
                       ];
 
             meta = {
@@ -28609,7 +33117,7 @@ let
           }
       ) {};
 
-    oauth2 = oauth2_0_5_0;
+    oauth2 = oauth2_0_6_0;
 
     oauth2_erlang_0_6_1 = callPackage
       (
@@ -28642,7 +33150,7 @@ let
           poison_1_5_2,
           plug_0_9_0,
           httpoison_0_7_5,
-          hackney_1_4_8,
+          hackney_1_6_0,
           cowboy_1_0_4
         }:
           buildMix {
@@ -28658,7 +33166,7 @@ let
                           poison_1_5_2
                           plug_0_9_0
                           httpoison_0_7_5
-                          hackney_1_4_8
+                          hackney_1_6_0
                           cowboy_1_0_4
                         ];
 
@@ -28672,30 +33180,30 @@ let
 
     oauth2cli = oauth2cli_0_0_4;
 
-    oauth2ex_0_0_8 = callPackage
+    oauth2ex_0_0_9 = callPackage
       (
         {
           buildMix,
           fetchHex,
           timex_1_0_0_rc4,
-          plug_1_1_1,
-          httpoison_0_8_1,
+          plug_1_1_3,
+          httpoison_0_8_2,
           exjsx_3_2_0,
           cowboy_1_0_4
         }:
           buildMix {
             name = "oauth2ex";
-            version = "0.0.8";
+            version = "0.0.9";
             src = fetchHex {
               pkg = "oauth2ex";
-              version = "0.0.8";
+              version = "0.0.9";
               sha256 =
-                "0420cc1ee402922a77cdd9a090cb886083fdc42658df9d8401e72d7a1daab4c0";
+                "46f5f13c0474da8727f45c6d7c455d86d94a1b20176230a2b21be0494066a564";
             };
             beamDeps  = [
                           timex_1_0_0_rc4
-                          plug_1_1_1
-                          httpoison_0_8_1
+                          plug_1_1_3
+                          httpoison_0_8_2
                           exjsx_3_2_0
                           cowboy_1_0_4
                         ];
@@ -28708,7 +33216,7 @@ let
           }
       ) {};
 
-    oauth2ex = oauth2ex_0_0_8;
+    oauth2ex = oauth2ex_0_0_9;
 
     oauther_1_0_2 = callPackage
       (
@@ -28741,10 +33249,10 @@ let
           fetchHex,
           rss_0_2_1,
           plug_0_11_3,
-          mock_0_1_1,
+          mock_0_1_3,
           earmark_0_1_19,
           cowboy_1_0_4,
-          chronos_1_0_0,
+          chronos_0_3_9,
           calliope_0_3_0,
           anubis_0_1_0
         }:
@@ -28760,10 +33268,10 @@ let
             beamDeps  = [
                           rss_0_2_1
                           plug_0_11_3
-                          mock_0_1_1
+                          mock_0_1_3
                           earmark_0_1_19
                           cowboy_1_0_4
-                          chronos_1_0_0
+                          chronos_0_3_9
                           calliope_0_3_0
                           anubis_0_1_0
                         ];
@@ -28805,21 +33313,44 @@ let
 
     observer_cli = observer_cli_1_0_3;
 
-    octokit_0_0_3 = callPackage
+    octet_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "octet";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "octet";
+              version = "0.0.2";
+              sha256 =
+                "12c7d7cff035f48139e7304913e7c227ce5bf95508ad8096ed510328d916ede3";
+            };
+
+            meta = {
+              description = ''Octet string converter'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/kiennt/octet";
+            };
+          }
+      ) {};
+
+    octet = octet_0_0_2;
+
+    octokit_0_1_0 = callPackage
       (
         {
-          buildMix, fetchHex, timex_1_0_1, poison_2_1_0, httpoison_0_8_1
+          buildMix, fetchHex, timex_1_0_2, poison_2_1_0, httpoison_0_8_2
         }:
           buildMix {
             name = "octokit";
-            version = "0.0.3";
+            version = "0.1.0";
             src = fetchHex {
               pkg = "octokit";
-              version = "0.0.3";
+              version = "0.1.0";
               sha256 =
-                "5cc713c2052c3a46e24ac04781bee4199926e2a175597b9f1c4c7d9ddb2b4241";
+                "1c761130e94dbbe16a7751ee1289e1334c9208222da03a8ae9fd77c50f5e969b";
             };
-            beamDeps  = [ timex_1_0_1 poison_2_1_0 httpoison_0_8_1 ];
+            beamDeps  = [ timex_1_0_2 poison_2_1_0 httpoison_0_8_2 ];
 
             meta = {
               description = ''An Elixir library for accessing the GitHub
@@ -28830,19 +33361,67 @@ let
           }
       ) {};
 
-    octokit = octokit_0_0_3;
+    octokit = octokit_0_1_0;
 
-    og_0_0_5 = callPackage
+    odgn_json_pointer_1_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "odgn_json_pointer";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "odgn_json_pointer";
+              version = "1.1.0";
+              sha256 =
+                "04330904e76a596342a5a9ac09c5d10250a237fc39c59d5576c8ac3b15842f3d";
+            };
+
+            meta = {
+              description = ''This is an implementation of JSON Pointer (RFC
+                            6901) for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/odogono/elixir-jsonpointer";
+            };
+          }
+      ) {};
+
+    odgn_json_pointer = odgn_json_pointer_1_1_0;
+
+    odt_potion_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "odt_potion";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "odt_potion";
+              version = "0.0.1";
+              sha256 =
+                "f2c429129dc1e636dbd3563750c667315aff650ddfe7aefe06991299f76f35bd";
+            };
+
+            meta = {
+              description = ''Substitute placeholders in ODT`s with custom
+                            information'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/andrewcottage/odt_potion";
+            };
+          }
+      ) {};
+
+    odt_potion = odt_potion_0_0_1;
+
+    og_0_0_6 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "og";
-            version = "0.0.5";
+            version = "0.0.6";
             src = fetchHex {
               pkg = "og";
-              version = "0.0.5";
+              version = "0.0.6";
               sha256 =
-                "6260a10988cee65dfc6245e60a719c15a8239167946a7f8f847fb3b9fa624022";
+                "8934f5e495dc8fcc8ed56f37f0067e0a360c9588c04c6b800d91eb593b9067d3";
             };
 
             meta = {
@@ -28854,7 +33433,7 @@ let
           }
       ) {};
 
-    og = og_0_0_5;
+    og = og_0_0_6;
 
     ok_0_1_3 = callPackage
       (
@@ -28928,7 +33507,7 @@ let
 
     omise_0_1_4 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "omise";
             version = "0.1.4";
@@ -28938,7 +33517,7 @@ let
               sha256 =
                 "35e7fe1776da9cf5ddeb0138391868d6dbbe976e5a932183c4f445371b1b0c4d";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Omise client library for Elixir.'';
@@ -28952,7 +33531,7 @@ let
 
     one_signal_0_0_6 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "one_signal";
             version = "0.0.6";
@@ -28962,7 +33541,7 @@ let
               sha256 =
                 "d90ec5f9e43d164e2942422d3c1e9a6b26a956ea135eb1a316380e12ef6b27d1";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Elixir wrapper of OneSignal'';
@@ -28976,7 +33555,7 @@ let
 
     onetime_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_1 }:
+        {  buildMix, fetchHex, timex_1_0_2 }:
           buildMix {
             name = "onetime";
             version = "1.0.0";
@@ -28986,7 +33565,7 @@ let
               sha256 =
                 "28481e7e239caa0002a42178af46cb80c3501faca7c1b953558e9d8dbba76c4c";
             };
-            beamDeps  = [ timex_1_0_1 ];
+            beamDeps  = [ timex_1_0_2 ];
 
             meta = {
               description = ''An onetime key-value store'';
@@ -29023,7 +33602,7 @@ let
 
     opbeat_0_3_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "opbeat";
             version = "0.3.0";
@@ -29033,7 +33612,7 @@ let
               sha256 =
                 "20977e8ae08a1789326a3e5c0c8fa3265dd0e6ddc1fb6abe25c3a33d3fc9e692";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Elixir client for opbeat'';
@@ -29045,34 +33624,60 @@ let
 
     opbeat = opbeat_0_3_0;
 
-    openmaize_0_15_1 = callPackage
+    open_graphx_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_2, floki_0_8_0 }:
+          buildMix {
+            name = "open_graphx";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "open_graphx";
+              version = "0.0.2";
+              sha256 =
+                "2eef951c4fbb8a01f11ed3ab6ca62dc695a84baf9ae0fbe7698058eac8020b70";
+            };
+            beamDeps  = [ httpoison_0_8_2 floki_0_8_0 ];
+
+            meta = {
+              description = ''Load Open Graph Protocol'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/yoavlt/open_graphx";
+            };
+          }
+      ) {};
+
+    open_graphx = open_graphx_0_0_2;
+
+    openmaize_0_17_2 = callPackage
       (
         {
           buildMix,
           fetchHex,
           postgrex_0_11_1,
-          poison_1_5_2,
-          plug_1_1_1,
-          ecto_2_0_0_beta_0,
+          poison_2_1_0,
+          plug_1_1_3,
+          not_qwerty123_1_1_0,
+          ecto_2_0_0_beta_2,
           cowboy_1_0_4,
-          comeonin_2_1_1
+          comeonin_2_3_0
         }:
           buildMix {
             name = "openmaize";
-            version = "0.15.1";
+            version = "0.17.2";
             src = fetchHex {
               pkg = "openmaize";
-              version = "0.15.1";
+              version = "0.17.2";
               sha256 =
-                "2ef5890c2fa041cd7d11d2b16b76dd7d8b6ac6e5044093732b1441fdaa10fd56";
+                "d3199c1513d4033ccec4fcc52a0d0dd6afb09b5c58c848a33d43dd4da08eda91";
             };
             beamDeps  = [
                           postgrex_0_11_1
-                          poison_1_5_2
-                          plug_1_1_1
-                          ecto_2_0_0_beta_0
+                          poison_2_1_0
+                          plug_1_1_3
+                          not_qwerty123_1_1_0
+                          ecto_2_0_0_beta_2
                           cowboy_1_0_4
-                          comeonin_2_1_1
+                          comeonin_2_3_0
                         ];
 
             meta = {
@@ -29083,7 +33688,7 @@ let
           }
       ) {};
 
-    openmaize = openmaize_0_15_1;
+    openmaize = openmaize_0_17_2;
 
     openstack_0_0_4 = callPackage
       (
@@ -29093,7 +33698,7 @@ let
           table_0_0_4,
           poison_1_5_2,
           maybe_0_0_1,
-          httpoison_0_8_1
+          httpoison_0_8_2
         }:
           buildMix {
             name = "openstack";
@@ -29105,7 +33710,7 @@ let
                 "ddc471e2d95edb26b3f826986f730fbb1fb70de62edaa00a0c1cd7fd6de7fde1";
             };
             beamDeps  = [
-                          table_0_0_4 poison_1_5_2 maybe_0_0_1 httpoison_0_8_1
+                          table_0_0_4 poison_1_5_2 maybe_0_0_1 httpoison_0_8_2
                         ];
 
             meta = {
@@ -29213,6 +33818,31 @@ let
 
     overpass = overpass_0_1_1;
 
+    oxr_0_3_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
+          buildMix {
+            name = "oxr";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "oxr";
+              version = "0.3.1";
+              sha256 =
+                "85b9525da74c1c36c3e8121d4db79775fc62ba27bb34be1f7f4b5615c70dc57c";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
+
+            meta = {
+              description = ''A thin API wrapper for Open Exchange Rates
+                            (https://openexchangerates.org)'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/marksilvis/oxr-elixir";
+            };
+          }
+      ) {};
+
+    oxr = oxr_0_3_1;
+
     p1_mysql_1_0_1 = callPackage
       (
         {  buildRebar3, fetchHex }:
@@ -29259,17 +33889,17 @@ let
 
     p1_oauth2 = p1_oauth2_0_6_1;
 
-    p1_pgsql_1_0_1 = callPackage
+    p1_pgsql_1_1_0 = callPackage
       (
         {  buildRebar3, fetchHex }:
           buildRebar3 {
             name = "p1_pgsql";
-            version = "1.0.1";
+            version = "1.1.0";
             src = fetchHex {
               pkg = "p1_pgsql";
-              version = "1.0.1";
+              version = "1.1.0";
               sha256 =
-                "7436d18f320b200e4cab6a0c16d6416aa32115b9dcfabfb05af6e9cbd62d1c0c";
+                "d6616a30e8d6964b488cebd6b9ca754783640ca85c4792bf7b1260a15303bf1c";
             };
 
             meta = {
@@ -29280,7 +33910,7 @@ let
           }
       ) {};
 
-    p1_pgsql = p1_pgsql_1_0_1;
+    p1_pgsql = p1_pgsql_1_1_0;
 
     p1_stringprep_1_0_1 = callPackage
       (
@@ -29426,7 +34056,7 @@ let
 
     pagexduty_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_1_0 }:
+        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_1_0 }:
           buildMix {
             name = "pagexduty";
             version = "0.1.0";
@@ -29436,7 +34066,7 @@ let
               sha256 =
                 "7292a63eeb27637ff19f91f50910d2bbbc860e1eb0413aa5a5035ef32b41b232";
             };
-            beamDeps  = [ httpoison_0_8_1 exjsx_3_1_0 ];
+            beamDeps  = [ httpoison_0_8_2 exjsx_3_1_0 ];
 
             meta = {
               description = ''A Pagerduty client for Elixir.'';
@@ -29472,19 +34102,19 @@ let
 
     paginex = paginex_0_0_1;
 
-    painstaking_0_5_6 = callPackage
+    painstaking_0_5_8 = callPackage
       (
-        {  buildMix, fetchHex, exoddic_1_2_0 }:
+        {  buildMix, fetchHex, exoddic_1_3_1 }:
           buildMix {
             name = "painstaking";
-            version = "0.5.6";
+            version = "0.5.8";
             src = fetchHex {
               pkg = "painstaking";
-              version = "0.5.6";
+              version = "0.5.8";
               sha256 =
-                "f7efbebacbea3e0bb8adf79ab90ca896e54d179eb76a4da4eb1687411fa4af58";
+                "f9de5ab6139fdda653df0a90e57fe229728a25f3611bf520c9433edd2ab81318";
             };
-            beamDeps  = [ exoddic_1_2_0 ];
+            beamDeps  = [ exoddic_1_3_1 ];
 
             meta = {
               description = ''Bet stake sizing recommendations'';
@@ -29494,7 +34124,7 @@ let
           }
       ) {};
 
-    painstaking = painstaking_0_5_6;
+    painstaking = painstaking_0_5_8;
 
     palette_0_0_2 = callPackage
       (
@@ -29621,17 +34251,17 @@ let
 
     parallel = parallel_0_0_3;
 
-    parallel_stream_1_0_1 = callPackage
+    parallel_stream_1_0_3 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "parallel_stream";
-            version = "1.0.1";
+            version = "1.0.3";
             src = fetchHex {
               pkg = "parallel_stream";
-              version = "1.0.1";
+              version = "1.0.3";
               sha256 =
-                "de54833225b0e67f21db47333a08685aed50d778a2f11cf7e36ae9e3fe4ee107";
+                "8b0090b13a42343ad709ed088111fd40a9e4c2d1819ef6c1e601347134ed34d0";
             };
 
             meta = {
@@ -29642,21 +34272,21 @@ let
           }
       ) {};
 
-    parallel_stream = parallel_stream_1_0_1;
+    parallel_stream = parallel_stream_1_0_3;
 
-    params_1_0_1 = callPackage
+    params_2_0_0_beta_0 = callPackage
       (
-        {  buildMix, fetchHex, ecto_1_1_3 }:
+        {  buildMix, fetchHex, ecto_0_2_7 }:
           buildMix {
             name = "params";
-            version = "1.0.1";
+            version = "2.0.0-beta.0";
             src = fetchHex {
               pkg = "params";
-              version = "1.0.1";
+              version = "2.0.0-beta.0";
               sha256 =
-                "182cfd185f886ad72e350baa7c2b1a5a0f77c52140ddc2604a5efef0f122dd51";
+                "c8db0e2c6d4c592e66d19f6fdef0ecfab8aeb23101cbacf7cd3c5c8624780a72";
             };
-            beamDeps  = [ ecto_1_1_3 ];
+            beamDeps  = [ ecto_0_2_7 ];
 
             meta = {
               description = ''Parameter structure validation and casting with
@@ -29667,19 +34297,19 @@ let
           }
       ) {};
 
-    params = params_1_0_1;
+    params = params_2_0_0_beta_0;
 
-    paratize_2_1_2 = callPackage
+    paratize_2_1_3 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "paratize";
-            version = "2.1.2";
+            version = "2.1.3";
             src = fetchHex {
               pkg = "paratize";
-              version = "2.1.2";
+              version = "2.1.3";
               sha256 =
-                "3ac2970f8c40979bdd7ea6eebb106fb8c51e64e745e0f068e059cfbecbace433";
+                "7dc6135524c65473f680ec3ade55c2f65b77ad40451ffd2bbd4128066b037d84";
             };
 
             meta = {
@@ -29691,7 +34321,7 @@ let
           }
       ) {};
 
-    paratize = paratize_2_1_2;
+    paratize = paratize_2_1_3;
 
     parse_client_0_2_3 = callPackage
       (
@@ -29717,19 +34347,19 @@ let
 
     parse_client = parse_client_0_2_3;
 
-    parse_torrent_0_1_0 = callPackage
+    parse_torrent_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, bencodex_1_0_0 }:
+        {  buildMix, fetchHex, earmark_0_2_1, bencode_0_3_0 }:
           buildMix {
             name = "parse_torrent";
-            version = "0.1.0";
+            version = "0.2.0";
             src = fetchHex {
               pkg = "parse_torrent";
-              version = "0.1.0";
+              version = "0.2.0";
               sha256 =
-                "4dd7e2a51e6da91d0bbf843735ceeee43dda1f704a0d2717cefa11a259dec65d";
+                "444d49f20ede110e33e0817134ef3f0b843a7af01c88e9c168acc4892ae2d320";
             };
-            beamDeps  = [ bencodex_1_0_0 ];
+            beamDeps  = [ earmark_0_2_1 bencode_0_3_0 ];
 
             meta = {
               description = ''Parses a .torrent file and returns a map'';
@@ -29739,7 +34369,7 @@ let
           }
       ) {};
 
-    parse_torrent = parse_torrent_0_1_0;
+    parse_torrent = parse_torrent_0_2_0;
 
     parse_trans_2_9_0 = callPackage
       (
@@ -29791,7 +34421,7 @@ let
 
     parsex_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1, poison_1_1_1 }:
+        {  buildMix, fetchHex, httpoison_0_8_2, poison_1_1_1 }:
           buildMix {
             name = "parsex";
             version = "0.0.2";
@@ -29801,7 +34431,7 @@ let
               sha256 =
                 "024657ae8d29eba99caf90276ac2d7f27cf435a543d4036859fd4ab6ffbceb75";
             };
-            beamDeps  = [ httpoison_0_8_1 poison_1_1_1 ];
+            beamDeps  = [ httpoison_0_8_2 poison_1_1_1 ];
 
             meta = {
               description = ''ParsEx is an Elixir HTTP Client for communicating
@@ -29816,7 +34446,7 @@ let
 
     passport_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex, phoenix_1_1_4, comeonin_2_1_1 }:
+        {  buildMix, fetchHex, phoenix_1_1_4, comeonin_2_3_0 }:
           buildMix {
             name = "passport";
             version = "0.0.4";
@@ -29826,7 +34456,7 @@ let
               sha256 =
                 "10e8e42cfd5fa834d7c3c3276c39274a3824100f2ffeed26adb4ed8475f0be91";
             };
-            beamDeps  = [ phoenix_1_1_4 comeonin_2_1_1 ];
+            beamDeps  = [ phoenix_1_1_4 comeonin_2_3_0 ];
 
             meta = {
               description = ''Provides authentication for phoenix
@@ -29939,6 +34569,30 @@ let
 
     pbkdf2 = pbkdf2_2_0_0;
 
+    pbkdf2_nif_0_3_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "pbkdf2_nif";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "pbkdf2_nif";
+              version = "0.3.0";
+              sha256 =
+                "7ad61389164cceac87e2bed9d8f184cd713cca85d51e096604c40bf86d96a8b7";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''PBKDF2 NIF implementation'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/barrel-db/erlang-pbkdf2-nif";
+            };
+          }
+      ) {};
+
+    pbkdf2_nif = pbkdf2_nif_0_3_0;
+
     pc_1_2_0 = callPackage
       (
         {  buildRebar3, fetchHex }:
@@ -30018,7 +34672,7 @@ let
           buildMix,
           fetchHex,
           poison_1_5_2,
-          httpoison_0_8_1,
+          httpoison_0_8_2,
           hackney_1_4_4,
           decimal_1_1_1
         }:
@@ -30033,7 +34687,7 @@ let
             };
             beamDeps  = [
                           poison_1_5_2
-                          httpoison_0_8_1
+                          httpoison_0_8_2
                           hackney_1_4_4
                           decimal_1_1_1
                         ];
@@ -30118,26 +34772,100 @@ let
 
     petick = petick_0_0_1;
 
-    phoenix_0_2_10 = callPackage
+    pg2pubsub_0_1_12 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "pg2pubsub";
+            version = "0.1.12";
+            src = fetchHex {
+              pkg = "pg2pubsub";
+              version = "0.1.12";
+              sha256 =
+                "13d653d3f35108b3d83430794127d3df3294f205790ab27ac58e353614487af2";
+            };
+
+            meta = {
+              description = ''A PubSub implementation for Elixir, using PG2
+                            (Erlang process groups).'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/kbremner/pg2pubsub";
+            };
+          }
+      ) {};
+
+    pg2pubsub = pg2pubsub_0_1_12;
+
+    pgpool_1_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "pgpool";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "pgpool";
+              version = "1.0.0";
+              sha256 =
+                "694ae752dc02734cbe174577d8bdf4058d0353379385a3448aec1bec5d9b49ff";
+            };
+
+            meta = {
+              longDescription = ''A PosgreSQL client that automatically uses
+                                connection pools and reconnects in case of
+                                errors.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ostinelli/pgpool";
+            };
+          }
+      ) {};
+
+    pgpool = pgpool_1_0_0;
+
+    phasedb_0_0_1 = callPackage
+      (
+        {
+          buildMix, fetchHex, inflex_1_5_0, heap_1_0_0, calendar_0_12_4
+        }:
+          buildMix {
+            name = "phasedb";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "phasedb";
+              version = "0.0.1";
+              sha256 =
+                "42927c48bc8ab9645ec799b5cb7f1379692bb7ba14eff8a6895dacd98217e22d";
+            };
+            beamDeps  = [ inflex_1_5_0 heap_1_0_0 calendar_0_12_4 ];
+
+            meta = {
+              description = ''A real-time time series database.'';
+
+            };
+          }
+      ) {};
+
+    phasedb = phasedb_0_0_1;
+
+    phoenix_0_2_11 = callPackage
       (
         {
           buildMix,
           fetchHex,
-          inflex_0_2_3,
+          inflex_0_2_4,
           ex_conf_0_1_2,
-          plug_0_5_0,
-          jazz_0_1_1
+          plug_0_5_1,
+          jazz_0_1_2
         }:
           buildMix {
             name = "phoenix";
-            version = "0.2.10";
+            version = "0.2.11";
             src = fetchHex {
               pkg = "phoenix";
-              version = "0.2.10";
+              version = "0.2.11";
               sha256 =
-                "bb65584ef5696cf90cb4823fd82d5fd930d7e092f171410687c90924519b0022";
+                "49bae6b4308f118942446154a63ea81d40a1ff79a0f20a846498f481c680ebdd";
             };
-            beamDeps  = [ inflex_0_2_3 ex_conf_0_1_2 plug_0_5_0 jazz_0_1_1 ];
+            beamDeps  = [ inflex_0_2_4 ex_conf_0_1_2 plug_0_5_1 jazz_0_1_2 ];
 
             meta = {
               longDescription = ''Productive. Reliable. Fast. A productive web
@@ -30183,7 +34911,7 @@ let
 
     phoenix_1_0_4 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_3, cowboy_1_0_4 }:
           buildMix {
             name = "phoenix";
             version = "1.0.4";
@@ -30193,7 +34921,7 @@ let
               sha256 =
                 "591d5f7f3a6f5407e8491a92dc6a2d0b7b94ef4f3526ad8ef4eb82660e6f69f6";
             };
-            beamDeps  = [ poison_1_5_2 plug_1_1_1 cowboy_1_0_4 ];
+            beamDeps  = [ poison_1_5_2 plug_1_1_3 cowboy_1_0_4 ];
 
             meta = {
               longDescription = ''Productive. Reliable. Fast. A productive web
@@ -30207,7 +34935,7 @@ let
 
     phoenix_1_1_4 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_0_3, plug_1_1_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, poison_1_0_3, plug_1_1_3, cowboy_1_0_4 }:
           buildMix {
             name = "phoenix";
             version = "1.1.4";
@@ -30217,7 +34945,7 @@ let
               sha256 =
                 "5765238fd5caef83a8ce9242d63b4302963f44aefe70510a597aae86b5b6cd10";
             };
-            beamDeps  = [ poison_1_0_3 plug_1_1_1 cowboy_1_0_4 ];
+            beamDeps  = [ poison_1_0_3 plug_1_1_3 cowboy_1_0_4 ];
 
             meta = {
               longDescription = ''Productive. Reliable. Fast. A productive web
@@ -30233,7 +34961,7 @@ let
 
     phoenix_calendar_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex, phoenix_html_2_5_0, calendar_0_12_3 }:
+        {  buildMix, fetchHex, phoenix_html_2_5_1, calendar_0_12_4 }:
           buildMix {
             name = "phoenix_calendar";
             version = "0.1.2";
@@ -30243,7 +34971,7 @@ let
               sha256 =
                 "f22968fd2287b419bf9791845b62501bf0177630d01a92b0ba33e5f00978ca3c";
             };
-            beamDeps  = [ phoenix_html_2_5_0 calendar_0_12_3 ];
+            beamDeps  = [ phoenix_html_2_5_1 calendar_0_12_4 ];
 
             meta = {
               description = ''Integration between Phoenix & Calendar'';
@@ -30279,21 +35007,21 @@ let
 
     phoenix_dtl = phoenix_dtl_0_0_1;
 
-    phoenix_ecto_3_0_0_beta_0 = callPackage
+    phoenix_ecto_3_0_0_beta_2 = callPackage
       (
         {
-          buildMix, fetchHex, poison_1_0_3, phoenix_html_2_5_0, ecto_0_2_6
+          buildMix, fetchHex, poison_1_0_3, phoenix_html_2_5_1, ecto_0_2_7
         }:
           buildMix {
             name = "phoenix_ecto";
-            version = "3.0.0-beta.0";
+            version = "3.0.0-beta.2";
             src = fetchHex {
               pkg = "phoenix_ecto";
-              version = "3.0.0-beta.0";
+              version = "3.0.0-beta.2";
               sha256 =
-                "f5e7c174329e9f64e6970c46a122654b6d27c619f3e6184e4db10577b0e5daac";
+                "7df3a54eb77846e306255d7953a2c3b6484e8b50c1dac510c779df28f28641b8";
             };
-            beamDeps  = [ poison_1_0_3 phoenix_html_2_5_0 ecto_0_2_6 ];
+            beamDeps  = [ poison_1_0_3 phoenix_html_2_5_1 ecto_0_2_7 ];
 
             meta = {
               description = ''Integration between Phoenix & Ecto'';
@@ -30303,7 +35031,34 @@ let
           }
       ) {};
 
-    phoenix_ecto = phoenix_ecto_3_0_0_beta_0;
+    phoenix_ecto = phoenix_ecto_3_0_0_beta_2;
+
+    phoenix_ember_0_0_1 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, hackney_1_4_10
+        }:
+          buildMix {
+            name = "phoenix_ember";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "phoenix_ember";
+              version = "0.0.1";
+              sha256 =
+                "2d108380a8eb25b88b80b950b7022bc061b77b8bfd2e37769e01499d6a6d2884";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 hackney_1_4_10 ];
+
+            meta = {
+              description = ''Ember.js integration via
+                            ember-phoenix/phoenix-ember'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/levanto-financial/phoenix-ember";
+            };
+          }
+      ) {};
+
+    phoenix_ember = phoenix_ember_0_0_1;
 
     phoenix_gen_gulp_jspm_1_0_0 = callPackage
       (
@@ -30359,7 +35114,7 @@ let
         {
           buildMix,
           fetchHex,
-          phoenix_html_2_5_0,
+          phoenix_html_2_5_1,
           phoenix_1_0_4,
           calliope_0_3_0
         }:
@@ -30372,7 +35127,7 @@ let
               sha256 =
                 "ec4f0dae227972a472661f1e8f9c51e8618290c8b6e5ca084ff81f6e7318468e";
             };
-            beamDeps  = [ phoenix_html_2_5_0 phoenix_1_0_4 calliope_0_3_0 ];
+            beamDeps  = [ phoenix_html_2_5_1 phoenix_1_0_4 calliope_0_3_0 ];
 
             meta = {
               description = ''Phoenix Template Engine for Haml'';
@@ -30384,19 +35139,19 @@ let
 
     phoenix_haml = phoenix_haml_0_2_0;
 
-    phoenix_html_2_5_0 = callPackage
+    phoenix_html_2_0_0_dev = callPackage
       (
-        {  buildMix, fetchHex, plug_0_8_1 }:
+        {  buildMix, fetchHex, plug_0_5_2 }:
           buildMix {
             name = "phoenix_html";
-            version = "2.5.0";
+            version = "2.0.0-dev";
             src = fetchHex {
               pkg = "phoenix_html";
-              version = "2.5.0";
+              version = "2.0.0-dev";
               sha256 =
-                "a3ef7288bf4a8304c65092774f602e3b1120536bed20dba9e90a5d2d41163fd4";
+                "3057019ee9159d7916ca80a85aa9b2848250916ccfa08047f821a9b19893c8aa";
             };
-            beamDeps  = [ plug_0_8_1 ];
+            beamDeps  = [ plug_0_5_2 ];
 
             meta = {
               description = ''Phoenix.HTML functions for working with HTML
@@ -30407,12 +35162,35 @@ let
           }
       ) {};
 
-    phoenix_html = phoenix_html_2_5_0;
+    phoenix_html_2_5_1 = callPackage
+      (
+        {  buildMix, fetchHex, plug_0_5_2 }:
+          buildMix {
+            name = "phoenix_html";
+            version = "2.5.1";
+            src = fetchHex {
+              pkg = "phoenix_html";
+              version = "2.5.1";
+              sha256 =
+                "a5ebd47c5d0b5e3707fd9364e3ec228d8b84efa83e0ff80de451a42906ed1e60";
+            };
+            beamDeps  = [ plug_0_5_2 ];
+
+            meta = {
+              description = ''Phoenix.HTML functions for working with HTML
+                            strings and templates'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/phoenixframework/phoenix_html";
+            };
+          }
+      ) {};
+
+    phoenix_html = phoenix_html_2_5_1;
 
     phoenix_html_sanitizer_0_2_0 = callPackage
       (
         {
-          buildMix, fetchHex, phoenix_html_2_5_0, html_sanitize_ex_0_3_1
+          buildMix, fetchHex, phoenix_html_2_5_1, html_sanitize_ex_0_3_1
         }:
           buildMix {
             name = "phoenix_html_sanitizer";
@@ -30423,7 +35201,7 @@ let
               sha256 =
                 "4cb5ae02d5560ff4e24cc378487065d038f0efd4883925a770b05c1c1d56a13c";
             };
-            beamDeps  = [ phoenix_html_2_5_0 html_sanitize_ex_0_3_1 ];
+            beamDeps  = [ phoenix_html_2_5_1 html_sanitize_ex_0_3_1 ];
 
             meta = {
               description = ''HTML sanitizer for Phoenix'';
@@ -30436,6 +35214,45 @@ let
 
     phoenix_html_sanitizer = phoenix_html_sanitizer_0_2_0;
 
+    phoenix_html_simplified_helpers_0_3_2 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          timex_ecto_1_0_4,
+          timex_1_0_2,
+          gettext_0_10_0,
+          ecto_2_0_0_beta_2
+        }:
+          buildMix {
+            name = "phoenix_html_simplified_helpers";
+            version = "0.3.2";
+            src = fetchHex {
+              pkg = "phoenix_html_simplified_helpers";
+              version = "0.3.2";
+              sha256 =
+                "e34d2dae01c5803b1fdc1f6514b920541c7028f18322d6c8c8587dc77e5a7837";
+            };
+            beamDeps  = [
+                          timex_ecto_1_0_4
+                          timex_1_0_2
+                          gettext_0_10_0
+                          ecto_2_0_0_beta_2
+                        ];
+
+            meta = {
+              longDescription = ''Some view helpers for phoenix html( truncate,
+                                time_ago_in_words, number_with_delimiter )'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/ikeikeikeike/phoenix_html_simplified_helpers";
+            };
+          }
+      ) {};
+
+    phoenix_html_simplified_helpers =
+      phoenix_html_simplified_helpers_0_3_2;
+
     phoenix_linguist_0_0_1 = callPackage
       (
         {
@@ -30465,7 +35282,7 @@ let
 
     phoenix_live_reload_1_0_3 = callPackage
       (
-        {  buildMix, fetchHex, phoenix_0_2_10, fs_0_9_2 }:
+        {  buildMix, fetchHex, phoenix_0_2_11, fs_0_9_2 }:
           buildMix {
             name = "phoenix_live_reload";
             version = "1.0.3";
@@ -30475,7 +35292,7 @@ let
               sha256 =
                 "fbb65b7e4f4205b2e5d7061480889bd34d5c943a56feebd20b3dd949332fed85";
             };
-            beamDeps  = [ phoenix_0_2_10 fs_0_9_2 ];
+            beamDeps  = [ phoenix_0_2_11 fs_0_9_2 ];
 
             meta = {
               description = ''Provides live-reload functionality for Phoenix'';
@@ -30615,7 +35432,7 @@ let
 
     phoenix_simple_form_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, phoenix_html_2_5_0 }:
+        {  buildMix, fetchHex, phoenix_html_2_5_1 }:
           buildMix {
             name = "phoenix_simple_form";
             version = "0.0.2";
@@ -30625,7 +35442,7 @@ let
               sha256 =
                 "e059ada8c507168d2267d6a1db1790192c063ca5e2a3579dfd2d1b07e25e9f45";
             };
-            beamDeps  = [ phoenix_html_2_5_0 ];
+            beamDeps  = [ phoenix_html_2_5_1 ];
 
             meta = {
               description = ''Easy form handling for phoenix'';
@@ -30643,7 +35460,7 @@ let
           buildMix,
           fetchHex,
           slim_fast_0_10_0,
-          phoenix_html_2_5_0,
+          phoenix_html_2_5_1,
           phoenix_1_1_4
         }:
           buildMix {
@@ -30655,7 +35472,7 @@ let
               sha256 =
                 "4225e74608e29c93c603c6cde61766b604495e04ef65d6ca325ff1a9a492c563";
             };
-            beamDeps  = [ slim_fast_0_10_0 phoenix_html_2_5_0 phoenix_1_1_4
+            beamDeps  = [ slim_fast_0_10_0 phoenix_html_2_5_1 phoenix_1_1_4
                       ];
 
             meta = {
@@ -30668,28 +35485,28 @@ let
 
     phoenix_slim = phoenix_slim_0_4_1;
 
-    phoenix_slime_0_4_1 = callPackage
+    phoenix_slime_0_5_1 = callPackage
       (
         {
           buildMix,
           fetchHex,
-          slime_0_12_1,
-          phoenix_html_2_5_0,
+          slime_0_12_2,
+          phoenix_html_2_5_1,
           phoenix_1_1_4,
           cowboy_1_0_4
         }:
           buildMix {
             name = "phoenix_slime";
-            version = "0.4.1";
+            version = "0.5.1";
             src = fetchHex {
               pkg = "phoenix_slime";
-              version = "0.4.1";
+              version = "0.5.1";
               sha256 =
-                "aa4036f88a0cab517ca8fa506c7c465fbb89f9857270c5711f6b83cec1cb8849";
+                "23a0028271f7ad03b199336efa9c3f4df02049de10dc94b5c133b4bb69f5e7e1";
             };
             beamDeps  = [
-                          slime_0_12_1
-                          phoenix_html_2_5_0
+                          slime_0_12_2
+                          phoenix_html_2_5_1
                           phoenix_1_1_4
                           cowboy_1_0_4
                         ];
@@ -30703,11 +35520,42 @@ let
           }
       ) {};
 
-    phoenix_slime = phoenix_slime_0_4_1;
+    phoenix_slime = phoenix_slime_0_5_1;
+
+    phoenix_swoosh_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          swoosh_0_1_0,
+          phoenix_html_2_5_1,
+          phoenix_1_1_4
+        }:
+          buildMix {
+            name = "phoenix_swoosh";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "phoenix_swoosh";
+              version = "0.1.0";
+              sha256 =
+                "cba68c2e421fbe7f54fbe8641918b0a276abbf81bee5a8eb37026cac85af9bd1";
+            };
+            beamDeps  = [ swoosh_0_1_0 phoenix_html_2_5_1 phoenix_1_1_4 ];
+
+            meta = {
+              description = ''Use Swoosh to easily send emails in your Phoenix
+                            project.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/swoosh/phoenix_swoosh";
+            };
+          }
+      ) {};
+
+    phoenix_swoosh = phoenix_swoosh_0_1_0;
 
     phoenix_timex_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_1, phoenix_html_2_5_0 }:
+        {  buildMix, fetchHex, timex_1_0_2, phoenix_html_2_5_1 }:
           buildMix {
             name = "phoenix_timex";
             version = "0.0.3";
@@ -30717,7 +35565,7 @@ let
               sha256 =
                 "47b2c32de83581ef12b58bdd9518c8180684ec7161cc7944d3b27542e414bc84";
             };
-            beamDeps  = [ timex_1_0_1 phoenix_html_2_5_0 ];
+            beamDeps  = [ timex_1_0_2 phoenix_html_2_5_1 ];
 
             meta = {
               description = ''Phoenix and Timex integration'';
@@ -30741,7 +35589,7 @@ let
           phoenix_1_1_4,
           mailgun_0_1_2,
           joken_0_13_1,
-          ecto_2_0_0_beta_0,
+          ecto_2_0_0_beta_2,
           cowboy_1_0_4,
           comeonin_2_0_3
         }:
@@ -30762,7 +35610,7 @@ let
                           phoenix_1_1_4
                           mailgun_0_1_2
                           joken_0_13_1
-                          ecto_2_0_0_beta_0
+                          ecto_2_0_0_beta_2
                           cowboy_1_0_4
                           comeonin_2_0_3
                         ];
@@ -30779,6 +35627,53 @@ let
 
     phoenix_token_auth = phoenix_token_auth_0_4_0;
 
+    phoenix_webpack_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "phoenix_webpack";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "phoenix_webpack";
+              version = "0.1.0";
+              sha256 =
+                "9a5b53836b60bfc3baf36e9aa85b48cfc227f004419b81c195e5e08936562ba7";
+            };
+
+            meta = {
+              description = ''Easily generate webpack configs for phoenix'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/keathley/phoenix_webpack";
+            };
+          }
+      ) {};
+
+    phoenix_webpack = phoenix_webpack_0_1_0;
+
+    phone_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "phone";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "phone";
+              version = "0.0.1";
+              sha256 =
+                "9f56ea4a2a3790b779d9bedbe04f63bae4e68c7a57c6331258917edc78f0f8bd";
+            };
+
+            meta = {
+              description = ''Parser for phone numbers in international
+                            standard. NOT READY FOR USE.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/fcevado/phone";
+            };
+          }
+      ) {};
+
+    phone = phone_0_0_1;
+
     phst_transform_0_9_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -30827,19 +35722,19 @@ let
 
     picosat = picosat_0_1_0;
 
-    pigeon_0_3_0 = callPackage
+    pigeon_0_4_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "pigeon";
-            version = "0.3.0";
+            version = "0.4.1";
             src = fetchHex {
               pkg = "pigeon";
-              version = "0.3.0";
+              version = "0.4.1";
               sha256 =
-                "cb332c872656fc426b10309f0c840635549727f35df4deb52816f2c6b920639c";
+                "f27413b863d470a8689e6378b9b36ee68f8bbcf8720f0b616756530f92bc23a0";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''HTTP2-compliant wrapper for sending iOS and
@@ -30850,11 +35745,11 @@ let
           }
       ) {};
 
-    pigeon = pigeon_0_3_0;
+    pigeon = pigeon_0_4_1;
 
     pin_elixir_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpotion_2_1_0 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpotion_2_2_2 }:
           buildMix {
             name = "pin_elixir";
             version = "0.0.1";
@@ -30864,7 +35759,7 @@ let
               sha256 =
                 "0140eecb7c714f9dadbcec26c45e2b2d770735029b7dcf98cdba9d793d80130a";
             };
-            beamDeps  = [ poison_1_5_2 httpotion_2_1_0 ];
+            beamDeps  = [ poison_1_5_2 httpotion_2_2_2 ];
 
             meta = {
               description = ''A library to wrap the Pin Payments API'';
@@ -30878,7 +35773,7 @@ let
 
     pinglix_1_1_1 = callPackage
       (
-        {  buildMix, fetchHex, timex_0_19_5, poison_1_4_0, plug_1_1_1 }:
+        {  buildMix, fetchHex, timex_0_19_5, poison_1_4_0, plug_1_1_3 }:
           buildMix {
             name = "pinglix";
             version = "1.1.1";
@@ -30888,7 +35783,7 @@ let
               sha256 =
                 "bff8166655cc143518c0089aca104755ab188816707fb73a5739dd094f45e895";
             };
-            beamDeps  = [ timex_0_19_5 poison_1_4_0 plug_1_1_1 ];
+            beamDeps  = [ timex_0_19_5 poison_1_4_0 plug_1_1_3 ];
 
             meta = {
               longDescription = ''Plug compatible health check system in Elixir
@@ -30999,7 +35894,7 @@ let
 
     pipette_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex, mock_0_1_1 }:
+        {  buildMix, fetchHex, mock_0_1_3 }:
           buildMix {
             name = "pipette";
             version = "0.0.4";
@@ -31009,7 +35904,7 @@ let
               sha256 =
                 "8742ea9b115071c3aa7cec4ddacfa161ff63fd647e0491ac442cb118d7198e26";
             };
-            beamDeps  = [ mock_0_1_1 ];
+            beamDeps  = [ mock_0_1_3 ];
 
             meta = {
               description = ''new_data = pipette(data, template)'';
@@ -31137,7 +36032,7 @@ let
 
     plasm_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, postgrex_0_11_1, ecto_2_0_0_beta_0 }:
+        {  buildMix, fetchHex, postgrex_0_11_1, ecto_2_0_0_beta_2 }:
           buildMix {
             name = "plasm";
             version = "0.1.0";
@@ -31147,7 +36042,7 @@ let
               sha256 =
                 "0eb476cae0b02dedbbc558f59ca22f0791221129d15fba570c0a3b96401d6836";
             };
-            beamDeps  = [ postgrex_0_11_1 ecto_2_0_0_beta_0 ];
+            beamDeps  = [ postgrex_0_11_1 ecto_2_0_0_beta_2 ];
 
             meta = {
               longDescription = ''Plasm is a composable query library for Ecto
@@ -31161,17 +36056,17 @@ let
 
     plasm = plasm_0_1_0;
 
-    plist_0_0_2 = callPackage
+    plist_0_0_4 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "plist";
-            version = "0.0.2";
+            version = "0.0.4";
             src = fetchHex {
               pkg = "plist";
-              version = "0.0.2";
+              version = "0.0.4";
               sha256 =
-                "e3560e6d94c4464b7479bb42a0fc1450e89fe99e67af099fb5cb2b2c7402409f";
+                "533836ee86188fa2a0aed92410534851aac3cb46ee0919c98553b1f38a63aa1a";
             };
 
             meta = {
@@ -31183,7 +36078,7 @@ let
           }
       ) {};
 
-    plist = plist_0_0_2;
+    plist = plist_0_0_4;
 
     plug_0_11_3 = callPackage
       (
@@ -31277,17 +36172,17 @@ let
           }
       ) {};
 
-    plug_0_5_0 = callPackage
+    plug_0_5_1 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "plug";
-            version = "0.5.0";
+            version = "0.5.1";
             src = fetchHex {
               pkg = "plug";
-              version = "0.5.0";
+              version = "0.5.1";
               sha256 =
-                "e34388510cdf725521cc772a8e711a090e1684bd964ced89d86b53dfd7a66ff5";
+                "95271e2372bf794e19ce50c097a439e1586a6b125f432ee21fbea96ab9832fc1";
             };
 
             meta = {
@@ -31299,6 +36194,51 @@ let
           }
       ) {};
 
+    plug_0_5_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "plug";
+            version = "0.5.2";
+            src = fetchHex {
+              pkg = "plug";
+              version = "0.5.2";
+              sha256 =
+                "d31cde7d9d3867a544e427a3431113f276fe9269cd00054440d38b56e61c53ea";
+            };
+
+            meta = {
+              description = ''A specification and conveniences for composable
+                            modules between web applications'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/elixir-lang/plug";
+            };
+          }
+      ) {};
+
+    plug_0_5_3 = callPackage
+      (
+        {  buildMix, fetchHex, cowboy_1_0_4 }:
+          buildMix {
+            name = "plug";
+            version = "0.5.3";
+            src = fetchHex {
+              pkg = "plug";
+              version = "0.5.3";
+              sha256 =
+                "97457d419def5bf13b17fa953cf56b8ca9f2e3973174d6890cd54fe84110c955";
+            };
+            beamDeps  = [ cowboy_1_0_4 ];
+
+            meta = {
+              description = ''A specification and conveniences for composable
+                            modules between web applications'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/elixir-lang/plug";
+            };
+          }
+      ) {};
+
     plug_0_7_0 = callPackage
       (
         {  buildMix, fetchHex, cowboy_1_0_4 }:
@@ -31322,29 +36262,6 @@ let
           }
       ) {};
 
-    plug_0_8_1 = callPackage
-      (
-        {  buildMix, fetchHex, cowboy_1_0_4 }:
-          buildMix {
-            name = "plug";
-            version = "0.8.1";
-            src = fetchHex {
-              pkg = "plug";
-              version = "0.8.1";
-              sha256 =
-                "bf16b2ac50df99b6179b25dd35737d5fb9dda1442f00bbeb54190244de5d8617";
-            };
-            beamDeps  = [ cowboy_1_0_4 ];
-
-            meta = {
-              description = ''A specification and conveniences for composable
-                            modules between web applications'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/elixir-lang/plug";
-            };
-          }
-      ) {};
-
     plug_0_8_4 = callPackage
       (
         {  buildMix, fetchHex, cowboy_1_0_4 }:
@@ -31414,17 +36331,17 @@ let
           }
       ) {};
 
-    plug_1_1_1 = callPackage
+    plug_1_1_3 = callPackage
       (
         {  buildMix, fetchHex, cowboy_1_0_4 }:
           buildMix {
             name = "plug";
-            version = "1.1.1";
+            version = "1.1.3";
             src = fetchHex {
               pkg = "plug";
-              version = "1.1.1";
+              version = "1.1.3";
               sha256 =
-                "15a8ebd70bc8e545ee96212f26751d57908a3ea63cd5ca1d664a5d70038b8071";
+                "3063801910afe580891477f7e03c5c7a51592fa790a04f12815a127e4e0e336f";
             };
             beamDeps  = [ cowboy_1_0_4 ];
 
@@ -31437,11 +36354,11 @@ let
           }
       ) {};
 
-    plug = plug_1_1_1;
+    plug = plug_1_1_3;
 
     plug_abort_2_1_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_0_8_1, cowboy_1_0_4, poison_1_0_3 }:
+        {  buildMix, fetchHex, plug_0_5_3, cowboy_1_0_4, poison_1_0_3 }:
           buildMix {
             name = "plug_abort";
             version = "2.1.1";
@@ -31451,7 +36368,7 @@ let
               sha256 =
                 "8da98a882ea79e08443e7d26c94ee2b572560efca3f0a5922c69e508ac02d883";
             };
-            beamDeps  = [ plug_0_8_1 cowboy_1_0_4 poison_1_0_3 ];
+            beamDeps  = [ plug_0_5_3 cowboy_1_0_4 poison_1_0_3 ];
 
             meta = {
               description = ''Easily abort the processing of a plug stack '';
@@ -31486,26 +36403,26 @@ let
 
     plug_accept_language = plug_accept_language_0_1_0;
 
-    plug_accesslog_0_10_0 = callPackage
+    plug_accesslog_0_11_0 = callPackage
       (
         {
           buildMix,
           fetchHex,
-          tzdata_0_5_6,
-          timex_1_0_1,
-          plug_1_1_1,
+          tzdata_0_5_7,
+          timex_2_1_3,
+          plug_1_1_3,
           cowboy_1_0_4
         }:
           buildMix {
             name = "plug_accesslog";
-            version = "0.10.0";
+            version = "0.11.0";
             src = fetchHex {
               pkg = "plug_accesslog";
-              version = "0.10.0";
+              version = "0.11.0";
               sha256 =
-                "c7cb4562e6ee51f9329b0aea877c3c82d5c109a1946b40b19f7311b7290d474a";
+                "86ee180fd234a3c6d413153764f2a9e2d57171d3e89df2643a276b8760bcc867";
             };
-            beamDeps  = [ tzdata_0_5_6 timex_1_0_1 plug_1_1_1 cowboy_1_0_4 ];
+            beamDeps  = [ tzdata_0_5_7 timex_2_1_3 plug_1_1_3 cowboy_1_0_4 ];
 
             meta = {
               description = ''Plug for writing access logs'';
@@ -31515,7 +36432,7 @@ let
           }
       ) {};
 
-    plug_accesslog = plug_accesslog_0_10_0;
+    plug_accesslog = plug_accesslog_0_11_0;
 
     plug_assign_1_0_0 = callPackage
       (
@@ -31542,19 +36459,19 @@ let
 
     plug_assign = plug_assign_1_0_0;
 
-    plug_auth_0_2_0 = callPackage
+    plug_auth_0_3_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_0_8_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, plug_0_5_2, cowboy_1_0_4 }:
           buildMix {
             name = "plug_auth";
-            version = "0.2.0";
+            version = "0.3.0";
             src = fetchHex {
               pkg = "plug_auth";
-              version = "0.2.0";
+              version = "0.3.0";
               sha256 =
-                "beb4fe7afce35714055b7cf362b1bd31665c0f4f2f2f6e59076d70ed60c48dc8";
+                "e9935f31526baff0262ef17055f853f0045172adf7b39fd9b1c54c6347477a71";
             };
-            beamDeps  = [ plug_0_8_1 cowboy_1_0_4 ];
+            beamDeps  = [ plug_0_5_2 cowboy_1_0_4 ];
 
             meta = {
               description = ''A collection of authentication-related plugs'';
@@ -31564,11 +36481,11 @@ let
           }
       ) {};
 
-    plug_auth = plug_auth_0_2_0;
+    plug_auth = plug_auth_0_3_0;
 
     plug_basic_auth_1_1_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_0_8_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, plug_0_5_2, cowboy_1_0_4 }:
           buildMix {
             name = "plug_basic_auth";
             version = "1.1.0";
@@ -31578,7 +36495,7 @@ let
               sha256 =
                 "6763e5ad0f17d6693e296cc3a69c1db627f9b66bda2bcded4ddfcc84a42f0c03";
             };
-            beamDeps  = [ plug_0_8_1 cowboy_1_0_4 ];
+            beamDeps  = [ plug_0_5_2 cowboy_1_0_4 ];
 
             meta = {
               description = ''A Plug for using HTTP Basic Authentication in
@@ -31616,19 +36533,19 @@ let
 
     plug_byte_serve = plug_byte_serve_0_3_2;
 
-    plug_cloudflare_1_2_1 = callPackage
+    plug_cloudflare_1_3_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, cidr_0_5_0 }:
+        {  buildMix, fetchHex, plug_1_1_3, cidr_1_0_0 }:
           buildMix {
             name = "plug_cloudflare";
-            version = "1.2.1";
+            version = "1.3.0";
             src = fetchHex {
               pkg = "plug_cloudflare";
-              version = "1.2.1";
+              version = "1.3.0";
               sha256 =
-                "854e202c40f86c50e0b95c373c5335106f21f9059fc74d8379915ab560ecf8b6";
+                "641df2e40267446172c43b2f52dd9a1cbcd1f24dccd101bda29732a13335ab21";
             };
-            beamDeps  = [ plug_1_1_1 cidr_0_5_0 ];
+            beamDeps  = [ plug_1_1_3 cidr_1_0_0 ];
 
             meta = {
               description = ''Convert CloudFlare`s CF-Connecting-IP header to
@@ -31639,11 +36556,11 @@ let
           }
       ) {};
 
-    plug_cloudflare = plug_cloudflare_1_2_1;
+    plug_cloudflare = plug_cloudflare_1_3_0;
 
     plug_cors_0_8_2 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
           buildMix {
             name = "plug_cors";
             version = "0.8.2";
@@ -31653,7 +36570,7 @@ let
               sha256 =
                 "286a36b000989538c168d115f6a017aaa15a4031e4f867d300878d81c3b8c6aa";
             };
-            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
 
             meta = {
               description = ''Deprecated: CORS Plug Middleware. Please use
@@ -31668,7 +36585,7 @@ let
 
     plug_exception_handler_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex, plug_0_8_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, plug_0_5_3, cowboy_1_0_4 }:
           buildMix {
             name = "plug_exception_handler";
             version = "0.0.4";
@@ -31678,7 +36595,7 @@ let
               sha256 =
                 "477ea599e516bcf8efb399ca43ca3d9cecd50982222b1f5f259092d4c99fca28";
             };
-            beamDeps  = [ plug_0_8_1 cowboy_1_0_4 ];
+            beamDeps  = [ plug_0_5_3 cowboy_1_0_4 ];
 
             meta = {
               description = ''Rescue exceptions from your plug stack'';
@@ -31693,7 +36610,7 @@ let
 
     plug_forwarded_peer_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1 }:
+        {  buildMix, fetchHex, plug_1_1_3 }:
           buildMix {
             name = "plug_forwarded_peer";
             version = "0.0.2";
@@ -31703,7 +36620,7 @@ let
               sha256 =
                 "c2466e0f0ef75a0d925a957fa50dfcded2c4788fe67857a675411e7184ae5ec3";
             };
-            beamDeps  = [ plug_1_1_1 ];
+            beamDeps  = [ plug_1_1_3 ];
 
             meta = {
               longDescription = ''Very simple plug which reads
@@ -31744,7 +36661,7 @@ let
 
     plug_geoip2_0_4_2 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, geolix_0_9_0 }:
+        {  buildMix, fetchHex, plug_1_1_3, geolix_0_9_0 }:
           buildMix {
             name = "plug_geoip2";
             version = "0.4.2";
@@ -31754,7 +36671,7 @@ let
               sha256 =
                 "2a6443040e07e677b0ff7749d2cdf7797a97254466f6740aee11544a18f4993a";
             };
-            beamDeps  = [ plug_1_1_1 geolix_0_9_0 ];
+            beamDeps  = [ plug_1_1_3 geolix_0_9_0 ];
 
             meta = {
               longDescription = ''Adds geo location to a Plug connection based
@@ -31767,26 +36684,26 @@ let
 
     plug_geoip2 = plug_geoip2_0_4_2;
 
-    plug_graphql_0_1_5 = callPackage
+    plug_graphql_0_2_0 = callPackage
       (
         {
           buildMix,
           fetchHex,
-          poison_1_5_2,
-          plug_0_8_1,
-          graphql_0_1_2,
+          poison_1_0_3,
+          plug_0_5_2,
+          graphql_0_2_0,
           cowboy_1_0_4
         }:
           buildMix {
             name = "plug_graphql";
-            version = "0.1.5";
+            version = "0.2.0";
             src = fetchHex {
               pkg = "plug_graphql";
-              version = "0.1.5";
+              version = "0.2.0";
               sha256 =
-                "a0a93dfe74a701393428bd0963dd2b93db5e418f8bf095a0b1f9bdab854ef0b7";
+                "d633309e386fb4feafcadaa390fb1ae2cf26416823b1c1484ed4d018e13c769a";
             };
-            beamDeps  = [ poison_1_5_2 plug_0_8_1 graphql_0_1_2 cowboy_1_0_4
+            beamDeps  = [ poison_1_0_3 plug_0_5_2 graphql_0_2_0 cowboy_1_0_4
                       ];
 
             meta = {
@@ -31797,11 +36714,11 @@ let
           }
       ) {};
 
-    plug_graphql = plug_graphql_0_1_5;
+    plug_graphql = plug_graphql_0_2_0;
 
     plug_heartbeat_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
           buildMix {
             name = "plug_heartbeat";
             version = "0.2.0";
@@ -31811,7 +36728,7 @@ let
               sha256 =
                 "23cb357dad510695b6bb339fdbf5d3fc8581546124f7389d63c9cf723e4ad40f";
             };
-            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
 
             meta = {
               description = ''A tiny plug for responding to heartbeat requests
@@ -31826,7 +36743,7 @@ let
 
     plug_json_parser_0_0_6 = callPackage
       (
-        {  buildMix, fetchHex, plug_0_8_1, cowboy_1_0_4, poison_1_1_1 }:
+        {  buildMix, fetchHex, plug_0_7_0, cowboy_1_0_4, poison_1_1_1 }:
           buildMix {
             name = "plug_json_parser";
             version = "0.0.6";
@@ -31836,7 +36753,7 @@ let
               sha256 =
                 "4c07f3adade5ad8730b6ec5d33d50b5dbe1a960e2be29a764b415c5234c79204";
             };
-            beamDeps  = [ plug_0_8_1 cowboy_1_0_4 poison_1_1_1 ];
+            beamDeps  = [ plug_0_7_0 cowboy_1_0_4 poison_1_1_1 ];
 
             meta = {
               description = ''JSON parse for Plug.Parsers '';
@@ -31850,7 +36767,7 @@ let
 
     plug_jwt_0_7_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, joken_0_16_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, plug_1_1_3, joken_0_16_1, cowboy_1_0_4 }:
           buildMix {
             name = "plug_jwt";
             version = "0.7.1";
@@ -31860,7 +36777,7 @@ let
               sha256 =
                 "a87cd8815454093c3300bdae4f2af7ec8c671fd22ce55f598309b5bed4ac3a2a";
             };
-            beamDeps  = [ plug_1_1_1 joken_0_16_1 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_3 joken_0_16_1 cowboy_1_0_4 ];
 
             meta = {
               description = ''JWT Plug Middleware'';
@@ -31874,7 +36791,7 @@ let
 
     plug_media_type_router_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1 }:
+        {  buildMix, fetchHex, plug_1_1_3 }:
           buildMix {
             name = "plug_media_type_router";
             version = "0.0.2";
@@ -31884,7 +36801,7 @@ let
               sha256 =
                 "e5f72ee4fd1a43321532e3165b3609a1184ba2d576279a1a63e17afba084f12b";
             };
-            beamDeps  = [ plug_1_1_1 ];
+            beamDeps  = [ plug_1_1_3 ];
 
             meta = {
               longDescription = ''An Elixir Plug for routing requests to other
@@ -31897,9 +36814,33 @@ let
 
     plug_media_type_router = plug_media_type_router_0_0_2;
 
+    plug_pagecache_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
+          buildMix {
+            name = "plug_pagecache";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "plug_pagecache";
+              version = "0.2.0";
+              sha256 =
+                "8f33202de45d772dd1f416a10d43f8e2daabf937d459e010fa9c850834e1877f";
+            };
+            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''Plug for full page response caching'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/mneudert/plug_pagecache";
+            };
+          }
+      ) {};
+
+    plug_pagecache = plug_pagecache_0_2_0;
+
     plug_rails_cookie_session_store_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
           buildMix {
             name = "plug_rails_cookie_session_store";
             version = "0.1.0";
@@ -31909,7 +36850,7 @@ let
               sha256 =
                 "e08041d2ad4884826d8296a5560609df04a936ceca492d094f06458699ac69da";
             };
-            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
 
             meta = {
               description = ''Rails compatible Plug session store'';
@@ -31923,19 +36864,43 @@ let
     plug_rails_cookie_session_store =
       plug_rails_cookie_session_store_0_1_0;
 
-    plug_redirect_https_0_0_4 = callPackage
+    plug_redirect_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1 }:
+        {  buildMix, fetchHex, plug_1_1_3 }:
+          buildMix {
+            name = "plug_redirect";
+            version = "0.1.2";
+            src = fetchHex {
+              pkg = "plug_redirect";
+              version = "0.1.2";
+              sha256 =
+                "f5fb2653ed39cf843bcc3cb13ba2bf547b1f66ef7c24f963551acd0b8e1c4705";
+            };
+            beamDeps  = [ plug_1_1_3 ];
+
+            meta = {
+              description = ''A plug builder for redirecting requests.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lpil/plug-redirect";
+            };
+          }
+      ) {};
+
+    plug_redirect = plug_redirect_0_1_2;
+
+    plug_redirect_https_0_0_6 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_3 }:
           buildMix {
             name = "plug_redirect_https";
-            version = "0.0.4";
+            version = "0.0.6";
             src = fetchHex {
               pkg = "plug_redirect_https";
-              version = "0.0.4";
+              version = "0.0.6";
               sha256 =
-                "b0cf8d86bb6d39653923e48067e6259beb6daee3f0e6ea6beff9ddcbef22b4d5";
+                "73f1b3172183005f0fb59a43c50a94a708c06ffcc35a7387967d87e001369068";
             };
-            beamDeps  = [ plug_1_1_1 ];
+            beamDeps  = [ plug_1_1_3 ];
 
             meta = {
               description = ''Plug to redirect http requests to https requests
@@ -31946,11 +36911,11 @@ let
           }
       ) {};
 
-    plug_redirect_https = plug_redirect_https_0_0_4;
+    plug_redirect_https = plug_redirect_https_0_0_6;
 
     plug_require_header_0_8_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_3 }:
           buildMix {
             name = "plug_require_header";
             version = "0.8.0";
@@ -31960,7 +36925,7 @@ let
               sha256 =
                 "b721158316f6d2efd4b24bd05a8a1c06caa699ee25249185c8c4f03f9204b283";
             };
-            beamDeps  = [ poison_1_5_2 plug_1_1_1 ];
+            beamDeps  = [ poison_1_5_2 plug_1_1_3 ];
 
             meta = {
               description = ''An Elixir Plug for requiring and extracting a
@@ -31975,7 +36940,7 @@ let
 
     plug_response_header_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1 }:
+        {  buildMix, fetchHex, plug_1_1_3 }:
           buildMix {
             name = "plug_response_header";
             version = "0.2.1";
@@ -31985,7 +36950,7 @@ let
               sha256 =
                 "82fd11fc70d925ed5a608ac13a9f604a80e24827f6603999d6a0f3f123862048";
             };
-            beamDeps  = [ plug_1_1_1 ];
+            beamDeps  = [ plug_1_1_3 ];
 
             meta = {
               description = ''This plug allows manipulation of HTTP response
@@ -32000,7 +36965,7 @@ let
 
     plug_ribbon_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1 }:
+        {  buildMix, fetchHex, plug_1_1_3 }:
           buildMix {
             name = "plug_ribbon";
             version = "0.2.1";
@@ -32010,7 +36975,7 @@ let
               sha256 =
                 "34fcbffb6fc3adde6bb167506934ab19787d2fff82b6bf93918e0000159bfe9d";
             };
-            beamDeps  = [ plug_1_1_1 ];
+            beamDeps  = [ plug_1_1_3 ];
 
             meta = {
               description = ''Injects a ribbon to your web application
@@ -32023,19 +36988,19 @@ let
 
     plug_ribbon = plug_ribbon_0_2_1;
 
-    plug_runtime_0_0_1 = callPackage
+    plug_runtime_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1 }:
+        {  buildMix, fetchHex, plug_1_1_3 }:
           buildMix {
             name = "plug_runtime";
-            version = "0.0.1";
+            version = "1.0.0";
             src = fetchHex {
               pkg = "plug_runtime";
-              version = "0.0.1";
+              version = "1.0.0";
               sha256 =
-                "b47ec0f5870e3c6adcad708c37ecbdd69ec25cd1f5bf1c15e21f78b518b7eb1c";
+                "58e213a40fe339771ab93520da56c2108488cfd9e99c7e92def367567ce225a7";
             };
-            beamDeps  = [ plug_1_1_1 ];
+            beamDeps  = [ plug_1_1_3 ];
 
             meta = {
               longDescription = ''A simple Plug to measure the runtime of a
@@ -32047,11 +37012,11 @@ let
           }
       ) {};
 
-    plug_runtime = plug_runtime_0_0_1;
+    plug_runtime = plug_runtime_1_0_0;
 
     plug_secure_headers_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1 }:
+        {  buildMix, fetchHex, plug_1_1_3 }:
           buildMix {
             name = "plug_secure_headers";
             version = "0.0.1";
@@ -32061,7 +37026,7 @@ let
               sha256 =
                 "727c5b7216aaa4bec2e0f88ed72199082820341602fad49cfc4c74477f55a905";
             };
-            beamDeps  = [ plug_1_1_1 ];
+            beamDeps  = [ plug_1_1_3 ];
 
             meta = {
               description = ''HTTP security headers with validatation for
@@ -32079,7 +37044,7 @@ let
         {
           buildMix,
           fetchHex,
-          plug_1_1_1,
+          plug_1_1_3,
           ex_doc_0_11_4,
           earmark_0_2_1,
           cowboy_1_0_4
@@ -32093,7 +37058,7 @@ let
               sha256 =
                 "f9cd5de250dbab0180166c873a50d297036d72f7cbac1a076972444c41f0b4c3";
             };
-            beamDeps  = [ plug_1_1_1 ex_doc_0_11_4 earmark_0_2_1 cowboy_1_0_4
+            beamDeps  = [ plug_1_1_3 ex_doc_0_11_4 earmark_0_2_1 cowboy_1_0_4
                       ];
 
             meta = {
@@ -32135,7 +37100,7 @@ let
 
     plug_statsd_0_4_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, ex_statsd_0_5_3 }:
+        {  buildMix, fetchHex, plug_1_1_3, ex_statsd_0_5_3 }:
           buildMix {
             name = "plug_statsd";
             version = "0.4.0";
@@ -32145,7 +37110,7 @@ let
               sha256 =
                 "c618161e5ad93c727be6ce776e7f53542950d97a602691aee2acef2d57dbdea9";
             };
-            beamDeps  = [ plug_1_1_1 ex_statsd_0_5_3 ];
+            beamDeps  = [ plug_1_1_3 ex_statsd_0_5_3 ];
 
             meta = {
               description = ''A (Phoenix) plug for sending request counts and
@@ -32182,6 +37147,30 @@ let
 
     plug_test_helpers = plug_test_helpers_0_1_0;
 
+    plug_utm_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
+          buildMix {
+            name = "plug_utm";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "plug_utm";
+              version = "0.0.2";
+              sha256 =
+                "d473d6b360f5a9189cee2a0f95c06ffb1cb9495a9bb8c729a631c2fa33ed5fc9";
+            };
+            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
+
+            meta = {
+              description = ''UTM tracking parameters to cookies'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/honeypotio/plug_utm";
+            };
+          }
+      ) {};
+
+    plug_utm = plug_utm_0_0_2;
+
     plug_wait1_0_1_4 = callPackage
       (
         {  buildMix, fetchHex, poison_1_3_1, plug_0_13_1, cowboy_1_0_4 }:
@@ -32255,7 +37244,7 @@ let
 
     plugs_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
           buildMix {
             name = "plugs";
             version = "0.1.0";
@@ -32265,7 +37254,7 @@ let
               sha256 =
                 "8d6cafd3ea0d373795774c9de2a0503433d65d9c2c0d58bd23ba0d9ba3547297";
             };
-            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
 
             meta = {
               description = ''A collection of Plug middleware for web
@@ -32278,19 +37267,19 @@ let
 
     plugs = plugs_0_1_0;
 
-    plugsnag_1_0_1 = callPackage
+    plugsnag_1_1_0 = callPackage
       (
-        {  buildMix, fetchHex, bugsnag_1_1_1 }:
+        {  buildMix, fetchHex, bugsnag_1_2_0 }:
           buildMix {
             name = "plugsnag";
-            version = "1.0.1";
+            version = "1.1.0";
             src = fetchHex {
               pkg = "plugsnag";
-              version = "1.0.1";
+              version = "1.1.0";
               sha256 =
-                "cf6c257d400b872787ced1a7175adb7332a7aa9d12d1a6ac6abcd8cf799bd06c";
+                "aa3a9e587042f5519d8309fc4cf764a0262eda0da752ddf87c5fcfea176208ad";
             };
-            beamDeps  = [ bugsnag_1_1_1 ];
+            beamDeps  = [ bugsnag_1_2_0 ];
 
             meta = {
               description = ''Bugsnag reporter for Elixir`s Plug'';
@@ -32300,7 +37289,7 @@ let
           }
       ) {};
 
-    plugsnag = plugsnag_1_0_1;
+    plugsnag = plugsnag_1_1_0;
 
     plumber_girl_0_9_6 = callPackage
       (
@@ -32354,7 +37343,7 @@ let
 
     pocketex_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_3_1, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_3_1, httpoison_0_8_2 }:
           buildMix {
             name = "pocketex";
             version = "0.1.0";
@@ -32364,7 +37353,7 @@ let
               sha256 =
                 "b832df8e3f3102b69892cc5cfab4418de876a6ecc5780805458b9946aa407cbf";
             };
-            beamDeps  = [ poison_1_3_1 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_3_1 httpoison_0_8_2 ];
 
             meta = {
               description = ''Pocketex is an Elixir client for the Pocket read
@@ -32591,6 +37580,56 @@ let
 
     poker = poker_0_0_2;
 
+    poloniex_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
+          buildMix {
+            name = "poloniex";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "poloniex";
+              version = "0.0.3";
+              sha256 =
+                "976011016844c86ddded4310962194dfbbd296f5c7b9af469ea13131987d403b";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
+
+            meta = {
+              longDescription = ''WIP Poloniex API wrapper for Elixir. Provides
+                                access to market data including trading pairs
+                                between ETH, BTC, DOGE, LTC and others.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/cyberpunk-ventures/poloniex_ex";
+            };
+          }
+      ) {};
+
+    poloniex = poloniex_0_0_3;
+
+    poly1305_0_4_0 = callPackage
+      (
+        {  buildMix, fetchHex, chacha20_0_3_2 }:
+          buildMix {
+            name = "poly1305";
+            version = "0.4.0";
+            src = fetchHex {
+              pkg = "poly1305";
+              version = "0.4.0";
+              sha256 =
+                "a31cd3dcc1244033b0981adfe9b2d0766115152ea42ba1c62a8dc93c87f094b7";
+            };
+            beamDeps  = [ chacha20_0_3_2 ];
+
+            meta = {
+              description = ''Poly1305 message authentication'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mwmiller/poly1305_ex";
+            };
+          }
+      ) {};
+
+    poly1305 = poly1305_0_4_0;
+
     polyglot_0_0_1 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -32616,6 +37655,30 @@ let
 
     polyglot = polyglot_0_0_1;
 
+    polyline_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, vector_0_1_0 }:
+          buildMix {
+            name = "polyline";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "polyline";
+              version = "0.1.0";
+              sha256 =
+                "6df2ebd1a5f55d6f680924200175bc5473beadd013acec72d201fcec18d31afd";
+            };
+            beamDeps  = [ vector_0_1_0 ];
+
+            meta = {
+              description = ''Encoding and decoding of Polylines'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pkinney/polyline_ex";
+            };
+          }
+      ) {};
+
+    polyline = polyline_0_1_0;
+
     polyvox_id3_0_2_1 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -32754,8 +37817,8 @@ let
 
     pooler_1_4_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "pooler";
             version = "1.4.0";
             src = fetchHex {
@@ -32775,8 +37838,8 @@ let
 
     pooler_1_5_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "pooler";
             version = "1.5.0";
             src = fetchHex {
@@ -32871,6 +37934,31 @@ let
 
     portal = portal_0_0_1;
 
+    porter_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "porter";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "porter";
+              version = "0.0.1";
+              sha256 =
+                "81ef97a1d6eb495b6a919cdaae4268a49a3591903424d4ed00f67104d09e89dd";
+            };
+
+            meta = {
+              longDescription = ''Porter provides an OTP application that runs
+                                the specified system command using the Erlang
+                                Port library and then streams the results back
+                                to you.'';
+
+            };
+          }
+      ) {};
+
+    porter = porter_0_0_1;
+
     porterstemmer_0_0_1 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -32896,19 +37984,65 @@ let
 
     porterstemmer = porterstemmer_0_0_1;
 
-    posterize_0_9_2 = callPackage
+    portmidi_3_2_0 = callPackage
       (
-        {  buildMix, fetchHex, postgrex_0_11_1 }:
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
+            name = "portmidi";
+            version = "3.2.0";
+            src = fetchHex {
+              pkg = "portmidi";
+              version = "3.2.0";
+              sha256 =
+                "93344ce66905d0c841d1e387eb24572bb2d2214668b45bf926d0363e9c064641";
+            };
+
+            meta = {
+              description = ''Elixir bindings to the portmidi C library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/lucidstack/ex-portmidi";
+            };
+          }
+      ) {};
+
+    portmidi = portmidi_3_2_0;
+
+    positive_13_3_7 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "positive";
+            version = "13.3.7";
+            src = fetchHex {
+              pkg = "positive";
+              version = "13.3.7";
+              sha256 =
+                "516964039cbae4e64226d9e50787f32134f3411bc0ae8cedf26488ba004616be";
+            };
+
+            meta = {
+              description = ''Library: check if an integer is positive'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jlouis/positive";
+            };
+          }
+      ) {};
+
+    positive = positive_13_3_7;
+
+    posterize_0_10_0 = callPackage
+      (
+        {  buildMix, fetchHex, postgrex_0_11_1, jsx_2_8_0 }:
           buildMix {
             name = "posterize";
-            version = "0.9.2";
+            version = "0.10.0";
             src = fetchHex {
               pkg = "posterize";
-              version = "0.9.2";
+              version = "0.10.0";
               sha256 =
-                "c88f4fdefb2bc0cad5a7b19eca21fe9954f0a6b88a3af7eb685ee5df324b0ce2";
+                "3569fd8f8097acb2a49fb23c446d3a8ff57879779866d71929eb356d076e7eb9";
             };
-            beamDeps  = [ postgrex_0_11_1 ];
+            beamDeps  = [ postgrex_0_11_1 jsx_2_8_0 ];
 
             meta = {
               description = ''erlang wrapper for postgrex'';
@@ -32918,7 +38052,7 @@ let
           }
       ) {};
 
-    posterize = posterize_0_9_2;
+    posterize = posterize_0_10_0;
 
     postgrex_0_11_1 = callPackage
       (
@@ -32926,7 +38060,7 @@ let
           buildMix,
           fetchHex,
           decimal_1_1_1,
-          db_connection_0_2_3,
+          db_connection_0_2_4,
           connection_1_0_2
         }:
           buildMix {
@@ -32938,7 +38072,7 @@ let
               sha256 =
                 "f56d47038f4f642cee0f9c40eeea0ef9ba645b7fc77723b4764f282df95baeb8";
             };
-            beamDeps  = [ decimal_1_1_1 db_connection_0_2_3 connection_1_0_2
+            beamDeps  = [ decimal_1_1_1 db_connection_0_2_4 connection_1_0_2
                       ];
 
             meta = {
@@ -32973,6 +38107,28 @@ let
           }
       ) {};
 
+    postgrex_0_8_4 = callPackage
+      (
+        {  buildMix, fetchHex, decimal_1_1_1 }:
+          buildMix {
+            name = "postgrex";
+            version = "0.8.4";
+            src = fetchHex {
+              pkg = "postgrex";
+              version = "0.8.4";
+              sha256 =
+                "19c205c8de0e2e5817f2250100281c58e717cb11ff1bb410bf661ee78c24e79b";
+            };
+            beamDeps  = [ decimal_1_1_1 ];
+
+            meta = {
+              description = ''PostgreSQL driver for Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/ericmj/postgrex";
+            };
+          }
+      ) {};
+
     postgrex_0_9_1 = callPackage
       (
         {  buildMix, fetchHex, decimal_1_1_1 }:
@@ -33067,6 +38223,31 @@ let
 
     pqueue = pqueue_1_5_1;
 
+    pragmatic_0_1_6 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "pragmatic";
+            version = "0.1.6";
+            src = fetchHex {
+              pkg = "pragmatic";
+              version = "0.1.6";
+              sha256 =
+                "e26b1b60d9657a61b6543646817a5d2dff73120bae33fa3de4c60bb356cf49b0";
+            };
+
+            meta = {
+              longDescription = ''A small, simple library to deal with the
+                                practical issues arising from using Elixir on
+                                Windows'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/OnorioCatenacci/pragmatic";
+            };
+          }
+      ) {};
+
+    pragmatic = pragmatic_0_1_6;
+
     prefecture_jp_0_0_2 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -33091,6 +38272,31 @@ let
 
     prefecture_jp = prefecture_jp_0_0_2;
 
+    prelude_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, etude_1_0_0_beta_0 }:
+          buildMix {
+            name = "prelude";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "prelude";
+              version = "0.0.1";
+              sha256 =
+                "805c5a43a043864b4793f4aeff574b88e9eaac18e49d93cb71cbd6270283bde9";
+            };
+            beamDeps  = [ etude_1_0_0_beta_0 ];
+
+            meta = {
+              description = ''a preprocessor/compiler toolset for erlang and
+                            elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/camshaft/prelude";
+            };
+          }
+      ) {};
+
+    prelude = prelude_0_0_1;
+
     presentex_0_0_10 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -33140,7 +38346,7 @@ let
 
     pricing_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_1, porcelain_2_0_1 }:
+        {  buildMix, fetchHex, timex_1_0_2, porcelain_2_0_1 }:
           buildMix {
             name = "pricing";
             version = "0.0.1";
@@ -33150,7 +38356,7 @@ let
               sha256 =
                 "82e0438611507f600bd799c986872588f88627fdcf7a15d4031d779c9d1cd4d7";
             };
-            beamDeps  = [ timex_1_0_1 porcelain_2_0_1 ];
+            beamDeps  = [ timex_1_0_2 porcelain_2_0_1 ];
 
             meta = {
               description = ''Pricing financial instruments in Elixir'';
@@ -33209,6 +38415,33 @@ let
 
     proper = proper_1_1_1_beta;
 
+    proper_case_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "proper_case";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "proper_case";
+              version = "0.1.1";
+              sha256 =
+                "63c279ad8721fb91175f74a03584fda2baaea6f5d79d5e899dddfd934e924d8a";
+            };
+
+            meta = {
+              longDescription = ''An Elixir library that converts keys in maps
+                                between `snake_case` and `camel_case`. Useful as
+                                a plug in Phoenix for converting incoming params
+                                from JavaScript`s `camelCase` to Elixir`s
+                                `snake_case`'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/johnnyji/proper_case";
+            };
+          }
+      ) {};
+
+    proper_case = proper_case_0_1_1;
+
     proplist_1_1_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -33233,10 +38466,36 @@ let
 
     proplist = proplist_1_1_0;
 
+    proto_def_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0 }:
+          buildMix {
+            name = "proto_def";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "proto_def";
+              version = "0.0.1";
+              sha256 =
+                "0b045cd0f4684c7b0fe8100e136e7b54c2be247423cad741d4d9405e6178a769";
+            };
+            beamDeps  = [ poison_2_1_0 ];
+
+            meta = {
+              longDescription = ''ProtoDef compiler for Elixir. (mostly)
+                                Compatible with
+                                https://github.com/ProtoDef-io/ProtoDef.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ProtoDef-io/elixir-protodef";
+            };
+          }
+      ) {};
+
+    proto_def = proto_def_0_0_1;
+
     protobuffs_0_8_2 = callPackage
       (
-        {  buildRebar3, fetchHex, meck_0_8_4 }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex, meck_0_8_4 }:
+          buildErlangMk {
             name = "protobuffs";
             version = "0.8.2";
             src = fetchHex {
@@ -33245,7 +38504,6 @@ let
               sha256 =
                 "b77e9d03518927b290cc5bb5cc9622a177e70289100fea9ccb57873573e54553";
             };
-
             beamDeps  = [ meck_0_8_4 ];
 
             meta = {
@@ -33260,17 +38518,17 @@ let
 
     protobuffs = protobuffs_0_8_2;
 
-    provider_asn1_0_1_2 = callPackage
+    provider_asn1_0_2_1 = callPackage
       (
         {  buildRebar3, fetchHex }:
           buildRebar3 {
             name = "provider_asn1";
-            version = "0.1.2";
+            version = "0.2.1";
             src = fetchHex {
               pkg = "provider_asn1";
-              version = "0.1.2";
+              version = "0.2.1";
               sha256 =
-                "b310c46a2d5675431737f10a55d6b37347c11bf3efc4c1d7b63e710e3842c1bb";
+                "1fbf4a1a9711b6308423a213d45dbe409937cdfbad0816491d18aea5d3c44242";
             };
 
             meta = {
@@ -33281,7 +38539,7 @@ let
           }
       ) {};
 
-    provider_asn1 = provider_asn1_0_1_2;
+    provider_asn1 = provider_asn1_0_2_1;
 
     providers_1_4_1 = callPackage
       (
@@ -33334,7 +38592,7 @@ let
     proxy_0_0_1 = callPackage
       (
         {
-          buildMix, fetchHex, plug_1_1_1, httpoison_0_8_1, cowboy_1_0_4
+          buildMix, fetchHex, plug_1_1_3, httpoison_0_8_2, cowboy_1_0_4
         }:
           buildMix {
             name = "proxy";
@@ -33345,7 +38603,7 @@ let
               sha256 =
                 "74691b18a0918d6e14df1f254ee9f342a547bc280151a4d88a540839ae75bbae";
             };
-            beamDeps  = [ plug_1_1_1 httpoison_0_8_1 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_3 httpoison_0_8_2 cowboy_1_0_4 ];
 
             meta = {
               description = ''Proxy plug for upstream servers'';
@@ -33359,7 +38617,7 @@ let
 
     pubnub_ex_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_2_0 }:
+        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_2_0 }:
           buildMix {
             name = "pubnub_ex";
             version = "0.0.2";
@@ -33369,7 +38627,7 @@ let
               sha256 =
                 "83d270cfe2be6728fb96d9145371a87ddc876a97f91cdca2584cc82c2a0b91cb";
             };
-            beamDeps  = [ httpoison_0_8_1 exjsx_3_2_0 ];
+            beamDeps  = [ httpoison_0_8_2 exjsx_3_2_0 ];
 
             meta = {
               description = ''A pubsub tool for pubnub.'';
@@ -33404,6 +38662,32 @@ let
 
     pubsub = pubsub_0_0_2;
 
+    pulse_0_1_3 = callPackage
+      (
+        {  buildMix, fetchHex, sonic_0_1_3 }:
+          buildMix {
+            name = "pulse";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "pulse";
+              version = "0.1.3";
+              sha256 =
+                "8d9ab6b8f5b3e8da2feedb32062b97243bfc8c250ad5bab09fd61944e51e6aa0";
+            };
+            beamDeps  = [ sonic_0_1_3 ];
+
+            meta = {
+              longDescription = ''Service registration and discovery library
+                                for Elixir. Relies on etcd as an external
+                                service registry.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/heroiclabs/pulse";
+            };
+          }
+      ) {};
+
+    pulse = pulse_0_1_3;
+
     pulse_libs_1_0_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -33427,25 +38711,25 @@ let
 
     pulse_libs = pulse_libs_1_0_0;
 
-    pusher_0_1_2 = callPackage
+    pusher_0_1_3 = callPackage
       (
         {
           buildMix,
           fetchHex,
-          signaturex_0_0_8,
-          httpoison_0_8_1,
+          signaturex_1_0_1,
+          httpoison_0_8_2,
           exjsx_3_2_0
         }:
           buildMix {
             name = "pusher";
-            version = "0.1.2";
+            version = "0.1.3";
             src = fetchHex {
               pkg = "pusher";
-              version = "0.1.2";
+              version = "0.1.3";
               sha256 =
-                "6a21b65a7a1e6a4fe7b1cd0d555ca25c871e68441cef3373dc5771ab0c2a47c2";
+                "1443c9652d3a3d03fcfef0e8dca817affa80d1c4e0eb582282af0d9c69a087f3";
             };
-            beamDeps  = [ signaturex_0_0_8 httpoison_0_8_1 exjsx_3_2_0 ];
+            beamDeps  = [ signaturex_1_0_1 httpoison_0_8_2 exjsx_3_2_0 ];
 
             meta = {
               description = ''Pusher HTTP client'';
@@ -33455,7 +38739,31 @@ let
           }
       ) {};
 
-    pusher = pusher_0_1_2;
+    pusher = pusher_0_1_3;
+
+    pushex_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_0_3, httpoison_0_8_2 }:
+          buildMix {
+            name = "pushex";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "pushex";
+              version = "0.0.2";
+              sha256 =
+                "7330d48e2816b9d3444b96d30f9144607490807684f2f231fa91bc7c6888fe03";
+            };
+            beamDeps  = [ poison_1_0_3 httpoison_0_8_2 ];
+
+            meta = {
+              description = ''Mobile push notification library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tuvistavie/pushex";
+            };
+          }
+      ) {};
+
+    pushex = pushex_0_0_2;
 
     qdate_0_4_2 = callPackage
       (
@@ -33489,7 +38797,7 @@ let
 
     qiita_ex_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_2_0 }:
+        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_2_0 }:
           buildMix {
             name = "qiita_ex";
             version = "0.0.2";
@@ -33499,7 +38807,7 @@ let
               sha256 =
                 "0bb9a5535c0915c426ff13350b907cbd2b455bb99d8bcb8324ffadb6c9bcf1eb";
             };
-            beamDeps  = [ httpoison_0_8_1 exjsx_3_2_0 ];
+            beamDeps  = [ httpoison_0_8_2 exjsx_3_2_0 ];
 
             meta = {
               description = ''Qiita API v2 Interface for Elixir'';
@@ -33558,18 +38866,19 @@ let
 
     qlc = qlc_1_0_0;
 
-    quantum_1_6_1 = callPackage
+    quantum_1_7_1 = callPackage
       (
-        {  buildMix, fetchHex }:
+        {  buildMix, fetchHex, timex_2_1_3 }:
           buildMix {
             name = "quantum";
-            version = "1.6.1";
+            version = "1.7.1";
             src = fetchHex {
               pkg = "quantum";
-              version = "1.6.1";
+              version = "1.7.1";
               sha256 =
-                "877ef048391ff0c0268cc17078dd707351241af0c04041bc432398017b998bbf";
+                "55a74be6a021816fe78d9a4a9450281e027302806313c9fa6e51694d44106c0a";
             };
+            beamDeps  = [ timex_2_1_3 ];
 
             meta = {
               description = ''Cron-like job scheduler for Elixir.'';
@@ -33579,7 +38888,7 @@ let
           }
       ) {};
 
-    quantum = quantum_1_6_1;
+    quantum = quantum_1_7_1;
 
     quark_1_0_2 = callPackage
       (
@@ -33722,6 +39031,30 @@ let
 
     quintana = quintana_0_2_1;
 
+    ra_0_3_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "ra";
+            version = "0.3.2";
+            src = fetchHex {
+              pkg = "ra";
+              version = "0.3.2";
+              sha256 =
+                "696cc4fd2dc1a36c705af7e7a1551bd054ad245841fccbc5d9d210f375c2dcf4";
+            };
+
+            meta = {
+              description = ''Ra is a framework for building command line
+                            applications.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/NobbZ/ra";
+            };
+          }
+      ) {};
+
+    ra = ra_0_3_2;
+
     rabbitElixir_1_0_1 = callPackage
       (
         {  buildMix, fetchHex, exjsx_3_1_0 }:
@@ -33771,26 +39104,26 @@ let
 
     rabbit_common = rabbit_common_3_5_6;
 
-    rackla_0_1_0 = callPackage
+    rackla_1_0_0 = callPackage
       (
         {
           buildMix,
           fetchHex,
-          poison_1_5_2,
-          plug_0_14_0,
-          hackney_1_4_8,
+          poison_2_1_0,
+          plug_1_1_3,
+          hackney_1_4_10,
           cowboy_1_0_4
         }:
           buildMix {
             name = "rackla";
-            version = "0.1.0";
+            version = "1.0.0";
             src = fetchHex {
               pkg = "rackla";
-              version = "0.1.0";
+              version = "1.0.0";
               sha256 =
-                "640b77e8a78e66085a49fc4af6fc3b028b2db8af39ee4c950e4a812c15c8657f";
+                "8d299ccea08686953beb11841eeb70ffba7fa040422bc62eaded785432422032";
             };
-            beamDeps  = [ poison_1_5_2 plug_0_14_0 hackney_1_4_8 cowboy_1_0_4
+            beamDeps  = [ poison_2_1_0 plug_1_1_3 hackney_1_4_10 cowboy_1_0_4
                       ];
 
             meta = {
@@ -33801,7 +39134,7 @@ let
           }
       ) {};
 
-    rackla = rackla_0_1_0;
+    rackla = rackla_1_0_0;
 
     radpath_0_0_5 = callPackage
       (
@@ -33830,7 +39163,7 @@ let
 
     rails_4_2_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1 }:
+        {  buildMix, fetchHex, plug_1_1_3 }:
           buildMix {
             name = "rails";
             version = "4.2.0";
@@ -33840,7 +39173,7 @@ let
               sha256 =
                 "731692769aa106a20c87b12dca15336fd1d16a7f02e2615ad76f6ce83a2b0b46";
             };
-            beamDeps  = [ plug_1_1_1 ];
+            beamDeps  = [ plug_1_1_3 ];
 
             meta = {
               longDescription = ''A plug to get your plug/phoenix applications
@@ -33855,8 +39188,8 @@ let
 
     ranch_1_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "ranch";
             version = "1.1.0";
             src = fetchHex {
@@ -33876,8 +39209,8 @@ let
 
     ranch_1_2_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "ranch";
             version = "1.2.1";
             src = fetchHex {
@@ -33971,20 +39304,20 @@ let
 
     range_extras = range_extras_0_1_0;
 
-    rankmatcher_0_1_2 = callPackage
+    rankmatcher_0_1_4 = callPackage
       (
-        {  buildRebar3, fetchHex, libsnarlmatch_0_1_5 }:
+        {  buildRebar3, fetchHex, libsnarlmatch_0_1_7 }:
           buildRebar3 {
             name = "rankmatcher";
-            version = "0.1.2";
+            version = "0.1.4";
             src = fetchHex {
               pkg = "rankmatcher";
-              version = "0.1.2";
+              version = "0.1.4";
               sha256 =
-                "8ea5974be574159e6ac188fc4309ef86889d6b227df44b1426f39b02b7d533e7";
+                "ae02bd458ba5c4298809e056668206dac3675c15319780808cbdde48068185c6";
             };
 
-            beamDeps  = [ libsnarlmatch_0_1_5 ];
+            beamDeps  = [ libsnarlmatch_0_1_7 ];
 
             meta = {
               description = ''Library to rank and match lists'';
@@ -33994,12 +39327,12 @@ let
           }
       ) {};
 
-    rankmatcher = rankmatcher_0_1_2;
+    rankmatcher = rankmatcher_0_1_4;
 
     rapidax_0_0_3 = callPackage
       (
         {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1, cowboy_1_0_4
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, cowboy_1_0_4
         }:
           buildMix {
             name = "rapidax";
@@ -34010,7 +39343,7 @@ let
               sha256 =
                 "9912b79b3d2729465bf66315bd955e031aeb038f05a63faa2dc0414026edb18c";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 cowboy_1_0_4 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 cowboy_1_0_4 ];
 
             meta = {
               description = ''Rapidly develop your API client - based on
@@ -34053,8 +39386,8 @@ let
 
     ratx_0_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildMix, fetchHex }:
+          buildMix {
             name = "ratx";
             version = "0.1.0";
             src = fetchHex {
@@ -34077,7 +39410,7 @@ let
 
     raven_0_0_5 = callPackage
       (
-        {  buildMix, fetchHex, hackney_1_0_6, uuid_0_1_5, poison_1_2_1 }:
+        {  buildMix, fetchHex, hackney_1_4_8, uuid_1_0_0, poison_1_2_1 }:
           buildMix {
             name = "raven";
             version = "0.0.5";
@@ -34087,7 +39420,7 @@ let
               sha256 =
                 "dac032f4a14adbd174927508709585bd34f9baa2836ff3987b4d071790cb229a";
             };
-            beamDeps  = [ hackney_1_0_6 uuid_0_1_5 poison_1_2_1 ];
+            beamDeps  = [ hackney_1_4_8 uuid_1_0_0 poison_1_2_1 ];
 
             meta = {
               description = ''Raven is an Elixir client for Sentry'';
@@ -34104,10 +39437,10 @@ let
         {
           buildMix,
           fetchHex,
-          timex_1_0_1,
+          timex_1_0_2,
           poison_1_5_2,
-          plug_1_1_1,
-          httpoison_0_8_1
+          plug_1_1_3,
+          httpoison_0_8_2
         }:
           buildMix {
             name = "raygun";
@@ -34118,7 +39451,7 @@ let
               sha256 =
                 "742fe2fef4fff5933802566375ce8efe27eaa2afbb8609c1bca50ef43f30bc3f";
             };
-            beamDeps  = [ timex_1_0_1 poison_1_5_2 plug_1_1_1 httpoison_0_8_1
+            beamDeps  = [ timex_1_0_2 poison_1_5_2 plug_1_1_3 httpoison_0_8_2
                       ];
 
             meta = {
@@ -34158,7 +39491,7 @@ let
 
     readme_md_doc_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex, ex_doc_0_11_4, argument_parser_0_1_1 }:
+        {  buildMix, fetchHex, ex_doc_0_11_4, argument_parser_0_1_3 }:
           buildMix {
             name = "readme_md_doc";
             version = "0.1.2";
@@ -34168,7 +39501,7 @@ let
               sha256 =
                 "3353e8598991afbaa8d12344212fdd9c85413d1664b026a7ee1036573c6f536c";
             };
-            beamDeps  = [ ex_doc_0_11_4 argument_parser_0_1_1 ];
+            beamDeps  = [ ex_doc_0_11_4 argument_parser_0_1_3 ];
 
             meta = {
               description = ''README.md generation tool for small Elixir
@@ -34264,7 +39597,7 @@ let
           fetchHex,
           poolboy_1_5_1,
           poison_1_4_0,
-          plug_1_1_1,
+          plug_1_1_3,
           exos_1_0_0,
           cowboy_1_0_4
         }:
@@ -34280,7 +39613,7 @@ let
             beamDeps  = [
                           poolboy_1_5_1
                           poison_1_4_0
-                          plug_1_1_1
+                          plug_1_1_3
                           exos_1_0_0
                           cowboy_1_0_4
                         ];
@@ -34416,17 +39749,17 @@ let
 
     rebar3_autotest = rebar3_autotest_0_1_1;
 
-    rebar3_cuttlefish_0_5_0 = callPackage
+    rebar3_cuttlefish_0_10_0 = callPackage
       (
         {  buildRebar3, fetchHex, cuttlefish_2_0_7 }:
           buildRebar3 {
             name = "rebar3_cuttlefish";
-            version = "0.5.0";
+            version = "0.10.0";
             src = fetchHex {
               pkg = "rebar3_cuttlefish";
-              version = "0.5.0";
+              version = "0.10.0";
               sha256 =
-                "dd2cdb1e6cbcf5cdb92adec0e359a3ec5f407c49a6182e7fdfcde1b45e790348";
+                "e19a7393b09f2ed35e6ebbac392290d6ff1428e6d8573eac9ce49684b324b6e0";
             };
 
             beamDeps  = [ cuttlefish_2_0_7 ];
@@ -34439,7 +39772,7 @@ let
           }
       ) {};
 
-    rebar3_cuttlefish = rebar3_cuttlefish_0_5_0;
+    rebar3_cuttlefish = rebar3_cuttlefish_0_10_0;
 
     rebar3_diameter_compiler_0_3_1 = callPackage
       (
@@ -34488,17 +39821,17 @@ let
 
     rebar3_elixirc = rebar3_elixirc_0_1_0;
 
-    rebar3_eqc_0_0_8 = callPackage
+    rebar3_eqc_0_0_10 = callPackage
       (
         {  buildRebar3, fetchHex, cf_0_1_2 }:
           buildRebar3 {
             name = "rebar3_eqc";
-            version = "0.0.8";
+            version = "0.0.10";
             src = fetchHex {
               pkg = "rebar3_eqc";
-              version = "0.0.8";
+              version = "0.0.10";
               sha256 =
-                "0a5cd09106a23ccad2b528e5c2f68f7884cba367b03e81c055f1f3fc742d1526";
+                "5f901a542ca237da5106c35ae67224316b4aca7ba16204efc874fd1329414729";
             };
 
             beamDeps  = [ cf_0_1_2 ];
@@ -34512,7 +39845,7 @@ let
           }
       ) {};
 
-    rebar3_eqc = rebar3_eqc_0_0_8;
+    rebar3_eqc = rebar3_eqc_0_0_10;
 
     rebar3_exunit_0_1_1 = callPackage
       (
@@ -34537,20 +39870,20 @@ let
 
     rebar3_exunit = rebar3_exunit_0_1_1;
 
-    rebar3_gpb_plugin_1_2_0 = callPackage
+    rebar3_gpb_plugin_1_3_0 = callPackage
       (
-        {  buildRebar3, fetchHex, gpb_3_18_8 }:
+        {  buildRebar3, fetchHex, gpb_3_20_0 }:
           buildRebar3 {
             name = "rebar3_gpb_plugin";
-            version = "1.2.0";
+            version = "1.3.0";
             src = fetchHex {
               pkg = "rebar3_gpb_plugin";
-              version = "1.2.0";
+              version = "1.3.0";
               sha256 =
-                "a5b305359d17399a2f4bfc26c6f4fd12ad846966642241ff85eb6e04bd1e97b6";
+                "8708e32b99a98d25179a831a7192ed75b15ed396c7e9b927d8bf705f13b3269c";
             };
 
-            beamDeps  = [ gpb_3_18_8 ];
+            beamDeps  = [ gpb_3_20_0 ];
 
             meta = {
               description = ''A rebar3 gpb plugin for compiling .proto files'';
@@ -34560,7 +39893,7 @@ let
           }
       ) {};
 
-    rebar3_gpb_plugin = rebar3_gpb_plugin_1_2_0;
+    rebar3_gpb_plugin = rebar3_gpb_plugin_1_3_0;
 
     rebar3_hex_1_19_0 = callPackage
       (
@@ -34659,17 +39992,17 @@ let
 
     rebar3_neotoma_plugin = rebar3_neotoma_plugin_0_2_0;
 
-    rebar3_proper_0_5_0 = callPackage
+    rebar3_proper_0_6_0 = callPackage
       (
         {  buildRebar3, fetchHex, proper_1_1_1_beta }:
           buildRebar3 {
             name = "rebar3_proper";
-            version = "0.5.0";
+            version = "0.6.0";
             src = fetchHex {
               pkg = "rebar3_proper";
-              version = "0.5.0";
+              version = "0.6.0";
               sha256 =
-                "c73549e279454f6a5887d564addafb779a4dd276460f17af5c26045ef8f44059";
+                "8d951f0ef4cfdf699b1dec0b035a9c00a6ac9544b0145ec28621add21b46298d";
             };
 
             beamDeps  = [ proper_1_1_1_beta ];
@@ -34682,7 +40015,7 @@ let
           }
       ) {};
 
-    rebar3_proper = rebar3_proper_0_5_0;
+    rebar3_proper = rebar3_proper_0_6_0;
 
     rebar3_proper_plugin_0_1_0 = callPackage
       (
@@ -34755,6 +40088,29 @@ let
 
     rebar3_run = rebar3_run_0_2_0;
 
+    rebar3_vendor_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "rebar3_vendor";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "rebar3_vendor";
+              version = "0.1.0";
+              sha256 =
+                "db0c9623e1c45eda4daa04752768d580682a827a314a548e5fd61ffcf950b301";
+            };
+
+            meta = {
+              description = ''Rebar3 plugin for vendoring dependencies.'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "http://github.com/tsloughter/rebar3_vendor";
+            };
+          }
+      ) {};
+
+    rebar3_vendor = rebar3_vendor_0_1_0;
+
     rebar3_yang_plugin_0_2_1 = callPackage
       (
         {  buildRebar3, fetchHex }:
@@ -34871,7 +40227,7 @@ let
 
     recaptcha_1_1_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "recaptcha";
             version = "1.1.1";
@@ -34881,7 +40237,7 @@ let
               sha256 =
                 "ebfa37443d23d2c70366f3f84f00bd50d59da5583ffde2673bc5ea83667b5751";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''A simple reCaptcha package for Phoenix
@@ -35018,7 +40374,7 @@ let
 
     reddhl_0_0_1 = callPackage
       (
-        {  buildRebar3, fetchHex, poison_1_4_0, httpoison_0_8_1 }:
+        {  buildRebar3, fetchHex, poison_1_4_0, httpoison_0_8_2 }:
           buildRebar3 {
             name = "reddhl";
             version = "0.0.1";
@@ -35029,7 +40385,7 @@ let
                 "4b2a5b1e3119b5b44e57c10e395fc817d977bf7fd72464605efff08266336871";
             };
 
-            beamDeps  = [ poison_1_4_0 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_4_0 httpoison_0_8_2 ];
 
             meta = {
               description = ''An headline and link puller for Reddit and its
@@ -35042,6 +40398,31 @@ let
 
     reddhl = reddhl_0_0_1;
 
+    redis_pool_0_2_3 = callPackage
+      (
+        {  buildMix, fetchHex, poolboy_1_5_1, eredis_1_0_8 }:
+          buildMix {
+            name = "redis_pool";
+            version = "0.2.3";
+            src = fetchHex {
+              pkg = "redis_pool";
+              version = "0.2.3";
+              sha256 =
+                "e30620f1376b516fb0ccbb40b0f1097e23a21c5676b1cd3fe9fe89fb9f655339";
+            };
+            beamDeps  = [ poolboy_1_5_1 eredis_1_0_8 ];
+
+            meta = {
+              description = ''Redis pool for Elixir. Build on top of eredis and
+                            poolboy.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/le0pard/redis_pool";
+            };
+          }
+      ) {};
+
+    redis_pool = redis_pool_0_2_3;
+
     redis_poolex_0_0_5 = callPackage
       (
         {  buildMix, fetchHex, poolboy_1_5_1, exredis_0_2_3 }:
@@ -35067,17 +40448,17 @@ let
 
     redis_poolex = redis_poolex_0_0_5;
 
-    redix_0_3_4 = callPackage
+    redix_0_3_6 = callPackage
       (
         {  buildMix, fetchHex, connection_1_0_2 }:
           buildMix {
             name = "redix";
-            version = "0.3.4";
+            version = "0.3.6";
             src = fetchHex {
               pkg = "redix";
-              version = "0.3.4";
+              version = "0.3.6";
               sha256 =
-                "111acb6b4250f2c2aa1757bf9404176a5fc1e2a70cfd2413cbf26e217f61927e";
+                "6c7e3d6bf904eeff99232d28832d3234e4309179dc11516829dd672c8a98a663";
             };
             beamDeps  = [ connection_1_0_2 ];
 
@@ -35090,7 +40471,7 @@ let
           }
       ) {};
 
-    redix = redix_0_3_4;
+    redix = redix_0_3_6;
 
     redo_2_0_1 = callPackage
       (
@@ -35117,7 +40498,7 @@ let
 
     redtube_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "redtube";
             version = "1.0.0";
@@ -35127,7 +40508,7 @@ let
               sha256 =
                 "f9c5b83c3f860c448328079f1250b54f06749d9c1adb593f7e11e45fe8131a0d";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''API Wrapper for Redtube'';
@@ -35163,15 +40544,38 @@ let
 
     ref_inspector = ref_inspector_0_8_0;
 
+    regdom_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "regdom";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "regdom";
+              version = "0.0.1";
+              sha256 =
+                "845cdc5c60e50bac9684fa762ecd42627a84eedf96c7f554fceb0d8f3bfc86bd";
+            };
+
+            meta = {
+              description = ''elixir port of regdom-lib'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/adqio/regdom-lib";
+            };
+          }
+      ) {};
+
+    regdom = regdom_0_0_1;
+
     relax_0_3_0 = callPackage
       (
         {
           buildMix,
           fetchHex,
           poison_1_5_2,
-          plug_1_1_1,
-          ja_serializer_0_7_1,
-          ecto_2_0_0_beta_0,
+          plug_1_1_3,
+          ja_serializer_0_8_1,
+          ecto_2_0_0_beta_2,
           cowboy_1_0_4
         }:
           buildMix {
@@ -35185,9 +40589,9 @@ let
             };
             beamDeps  = [
                           poison_1_5_2
-                          plug_1_1_1
-                          ja_serializer_0_7_1
-                          ecto_2_0_0_beta_0
+                          plug_1_1_3
+                          ja_serializer_0_8_1
+                          ecto_2_0_0_beta_2
                           cowboy_1_0_4
                         ];
 
@@ -35205,17 +40609,17 @@ let
 
     relax = relax_0_3_0;
 
-    relflow_1_0_4 = callPackage
+    relflow_1_0_5 = callPackage
       (
         {  buildRebar3, fetchHex }:
           buildRebar3 {
             name = "relflow";
-            version = "1.0.4";
+            version = "1.0.5";
             src = fetchHex {
               pkg = "relflow";
-              version = "1.0.4";
+              version = "1.0.5";
               sha256 =
-                "e6d9652ed7511aea18fa012d5abc19301acd8cbe81a44a159391086a5be12e1f";
+                "7a991b7e5e390f1cdb16dd0cbb9327bd70ce785e6cebcb6ea25a6693fd836b18";
             };
 
             meta = {
@@ -35225,7 +40629,7 @@ let
           }
       ) {};
 
-    relflow = relflow_1_0_4;
+    relflow = relflow_1_0_5;
 
     relief_0_0_1 = callPackage
       (
@@ -35276,17 +40680,17 @@ let
 
     relisa = relisa_0_1_0;
 
-    relocker_0_0_6 = callPackage
+    relocker_0_0_8 = callPackage
       (
         {  buildMix, fetchHex, exredis_0_2_3 }:
           buildMix {
             name = "relocker";
-            version = "0.0.6";
+            version = "0.0.8";
             src = fetchHex {
               pkg = "relocker";
-              version = "0.0.6";
+              version = "0.0.8";
               sha256 =
-                "8aaaa5f7d118b543764005fa7af47a77d9c74d606603c29005b0637ef1c192df";
+                "e5678d5fe1795384c672a15a80bf91e3007683e5d22bc523eed634635e89bf4b";
             };
             beamDeps  = [ exredis_0_2_3 ];
 
@@ -35298,7 +40702,7 @@ let
           }
       ) {};
 
-    relocker = relocker_0_0_6;
+    relocker = relocker_0_0_8;
 
     reltool_util_1_5_1 = callPackage
       (
@@ -35324,31 +40728,31 @@ let
 
     reltool_util = reltool_util_1_5_1;
 
-    relx_3_17_0 = callPackage
+    relx_3_18_0 = callPackage
       (
         {
           buildRebar3,
           fetchHex,
           providers_1_6_0,
           getopt_0_8_2,
-          erlware_commons_0_18_0,
+          erlware_commons_0_19_0,
           cf_0_2_1,
           bbmustache_1_0_4
         }:
           buildRebar3 {
             name = "relx";
-            version = "3.17.0";
+            version = "3.18.0";
             src = fetchHex {
               pkg = "relx";
-              version = "3.17.0";
+              version = "3.18.0";
               sha256 =
-                "c22f3d8400394787cb67191dea4de1acccf1563f6cd2f1934bf2a13a525c5ef6";
+                "e76e0446b8d1b113f2b7dcc713f032ccdf1dbda33d76edfeb19c2b6b686dcad7";
             };
 
             beamDeps  = [
                           providers_1_6_0
                           getopt_0_8_2
-                          erlware_commons_0_18_0
+                          erlware_commons_0_19_0
                           cf_0_2_1
                           bbmustache_1_0_4
                         ];
@@ -35361,32 +40765,32 @@ let
           }
       ) {};
 
-    relx = relx_3_17_0;
+    relx = relx_3_18_0;
 
-    relx_3_3_1 = callPackage
+    relx_3_3_2 = callPackage
       (
         {
           buildRebar3,
           fetchHex,
           providers_1_4_1,
           getopt_0_8_2,
-          erlware_commons_0_14_0,
+          erlware_commons_0_15_0,
           bbmustache_1_0_3
         }:
           buildRebar3 {
             name = "relx";
-            version = "3.3.1";
+            version = "3.3.2";
             src = fetchHex {
               pkg = "relx";
-              version = "3.3.1";
+              version = "3.3.2";
               sha256 =
-                "782fdce1daccb5dca6b372cdffb979cda3431ac245db5fafe93247f4fdab049b";
+                "4c97df0ceb82890b3612b9c30e8d865e3d738fc69186bc94da0f75f619f7195a";
             };
 
             beamDeps  = [
                           providers_1_4_1
                           getopt_0_8_2
-                          erlware_commons_0_14_0
+                          erlware_commons_0_15_0
                           bbmustache_1_0_3
                         ];
 
@@ -35538,8 +40942,8 @@ let
           buildMix,
           fetchHex,
           poison_2_1_0,
-          httpoison_0_8_1,
-          floki_0_7_1,
+          httpoison_0_8_2,
+          floki_0_8_0,
           feeder_ex_0_0_2
         }:
           buildMix {
@@ -35553,8 +40957,8 @@ let
             };
             beamDeps  = [
                           poison_2_1_0
-                          httpoison_0_8_1
-                          floki_0_7_1
+                          httpoison_0_8_2
+                          floki_0_8_0
                           feeder_ex_0_0_2
                         ];
 
@@ -35603,7 +41007,7 @@ let
 
     resin_0_4_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1 }:
+        {  buildMix, fetchHex, plug_1_1_3 }:
           buildMix {
             name = "resin";
             version = "0.4.1";
@@ -35613,7 +41017,7 @@ let
               sha256 =
                 "c6bdfd13e91cbc289df91440e216b91aa590a7dafe59958b0197cedd8cfef792";
             };
-            beamDeps  = [ plug_1_1_1 ];
+            beamDeps  = [ plug_1_1_3 ];
 
             meta = {
               description = ''Pour resin in your plug pipeline to add
@@ -35655,9 +41059,9 @@ let
           buildMix,
           fetchHex,
           poison_1_5_2,
-          mock_0_1_1,
+          mock_0_1_3,
           inflex_1_4_1,
-          httpotion_2_1_0
+          httpotion_2_2_2
         }:
           buildMix {
             name = "rest_client";
@@ -35669,7 +41073,7 @@ let
                 "b537f9bc91fbf09ecb6c5890c0e5a01f20de869bc804f730688f61d6acd96cf8";
             };
             beamDeps  = [
-                          poison_1_5_2 mock_0_1_1 inflex_1_4_1 httpotion_2_1_0
+                          poison_1_5_2 mock_0_1_3 inflex_1_4_1 httpotion_2_2_2
                         ];
 
             meta = {
@@ -35684,17 +41088,17 @@ let
 
     rest_client = rest_client_0_0_1;
 
-    rethinkdb_0_3_2 = callPackage
+    rethinkdb_0_4_0 = callPackage
       (
         {  buildMix, fetchHex, poison_1_0_3, connection_1_0_2 }:
           buildMix {
             name = "rethinkdb";
-            version = "0.3.2";
+            version = "0.4.0";
             src = fetchHex {
               pkg = "rethinkdb";
-              version = "0.3.2";
+              version = "0.4.0";
               sha256 =
-                "b97da3f1281575ac4e24d1cc0ce20a7f5a2e05bc7d212e4e58e0c9f2411a1c8a";
+                "ca2d13a226987edf6943f7af968510b1836becc3c14b42667f82cd57bbcd4e8f";
             };
             beamDeps  = [ poison_1_0_3 connection_1_0_2 ];
 
@@ -35706,7 +41110,31 @@ let
           }
       ) {};
 
-    rethinkdb = rethinkdb_0_3_2;
+    rethinkdb = rethinkdb_0_4_0;
+
+    rethinkdb_changefeed_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, rethinkdb_0_4_0, connection_1_0_2 }:
+          buildMix {
+            name = "rethinkdb_changefeed";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "rethinkdb_changefeed";
+              version = "0.0.1";
+              sha256 =
+                "c895db0d57d55c7c7ab4aeb6ce167c82de1d0f7a884c93d4ea0cdea16df11b82";
+            };
+            beamDeps  = [ rethinkdb_0_4_0 connection_1_0_2 ];
+
+            meta = {
+              description = ''RethinkDB Supervised Changefeeds'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/hamiltop/rethinkdb_changefeed";
+            };
+          }
+      ) {};
+
+    rethinkdb_changefeed = rethinkdb_changefeed_0_0_1;
 
     reup_0_1_0 = callPackage
       (
@@ -35764,7 +41192,7 @@ let
 
     revision_plate_ex_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
           buildMix {
             name = "revision_plate_ex";
             version = "0.1.0";
@@ -35774,7 +41202,7 @@ let
               sha256 =
                 "6c88a514ae5b36999fd52c01cc3ea746f8ba9c7900b47f4758a65c197b8aed71";
             };
-            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
 
             meta = {
               longDescription = ''Plug application and middleware that serves
@@ -35787,17 +41215,17 @@ let
 
     revision_plate_ex = revision_plate_ex_0_1_0;
 
-    rfc3339_0_2_0 = callPackage
+    rfc3339_0_9_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildMix, fetchHex }:
+          buildMix {
             name = "rfc3339";
-            version = "0.2.0";
+            version = "0.9.0";
             src = fetchHex {
               pkg = "rfc3339";
-              version = "0.2.0";
+              version = "0.9.0";
               sha256 =
-                "992ebf382d6982f2fff48928394d4d50d413b7a4abe576ba518b92c82ac2eb99";
+                "182314de35c9f4180b22eb5f22916d8d7a799c1109a060c752970273a9332ad6";
             };
 
             meta = {
@@ -35808,7 +41236,7 @@ let
           }
       ) {};
 
-    rfc3339 = rfc3339_0_2_0;
+    rfc3339 = rfc3339_0_9_0;
 
     riak_1_0_0 = callPackage
       (
@@ -35836,6 +41264,63 @@ let
 
     riak = riak_1_0_0;
 
+    riak_core_ng_2_2_3 = callPackage
+      (
+        {
+          buildRebar3,
+          fetchHex,
+          riak_sysmon_2_1_2,
+          riak_ensemble_2_1_3,
+          pbkdf2_2_0_0,
+          lager_3_0_2,
+          goldrush_0_1_7,
+          exometer_core_1_0_0,
+          erocksdb_0_4_1,
+          eleveldb_2_1_3,
+          edown_0_7_0,
+          cuttlefish_2_0_7,
+          clique_3_0_1,
+          chash_0_1_1,
+          basho_stats_1_0_3,
+          basho_poolboy_0_8_1_p3
+        }:
+          buildRebar3 {
+            name = "riak_core_ng";
+            version = "2.2.3";
+            src = fetchHex {
+              pkg = "riak_core_ng";
+              version = "2.2.3";
+              sha256 =
+                "41cc44bf8e0c6a18858d9a5327bc0098526d6c5d272b3e73bf3ff19019b53cd3";
+            };
+
+            beamDeps  = [
+                          riak_sysmon_2_1_2
+                          riak_ensemble_2_1_3
+                          pbkdf2_2_0_0
+                          lager_3_0_2
+                          goldrush_0_1_7
+                          exometer_core_1_0_0
+                          erocksdb_0_4_1
+                          eleveldb_2_1_3
+                          edown_0_7_0
+                          cuttlefish_2_0_7
+                          clique_3_0_1
+                          chash_0_1_1
+                          basho_stats_1_0_3
+                          basho_poolboy_0_8_1_p3
+                        ];
+
+            meta = {
+              description = ''Riak Core'';
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/project-fifo/riak_core";
+            };
+          }
+      ) {};
+
+    riak_core_ng = riak_core_ng_2_2_3;
+
     riak_dt_2_1_1 = callPackage
       (
         {  buildRebar3, fetchHex }:
@@ -35886,8 +41371,8 @@ let
 
     riak_pb_2_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex, protobuffs_0_8_2, hamcrest_0_1_1 }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex, protobuffs_0_8_2, hamcrest_0_1_1 }:
+          buildErlangMk {
             name = "riak_pb";
             version = "2.1.0";
             src = fetchHex {
@@ -35896,7 +41381,6 @@ let
               sha256 =
                 "76309b9b831d276bf9abf92362183030ed63910a2e153f1f8a389e97dec6c287";
             };
-
             beamDeps  = [ protobuffs_0_8_2 hamcrest_0_1_1 ];
 
             meta = {
@@ -35936,8 +41420,8 @@ let
 
     riakc_2_1_1 = callPackage
       (
-        {  buildRebar3, fetchHex, riak_pb_2_1_0 }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex, riak_pb_2_1_0 }:
+          buildErlangMk {
             name = "riakc";
             version = "2.1.1";
             src = fetchHex {
@@ -35946,7 +41430,6 @@ let
               sha256 =
                 "4f7141c03529d4f1c28c71eafcd797be0a538ba21d5d6923a17a9ca9e64e744e";
             };
-
             beamDeps  = [ riak_pb_2_1_0 ];
 
             meta = {
@@ -35961,7 +41444,7 @@ let
 
     riboflavin_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "riboflavin";
             version = "0.0.2";
@@ -35971,7 +41454,7 @@ let
               sha256 =
                 "cc4ac4c80b6d591deaea136a3d055eba4ead6bbe2fc9b220a4432f160d0ddec6";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Backblaze B2 client.'';
@@ -36010,7 +41493,7 @@ let
 
     robotex_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_1_0 }:
+        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_1_0 }:
           buildMix {
             name = "robotex";
             version = "0.0.1";
@@ -36020,7 +41503,7 @@ let
               sha256 =
                 "ae1c618b20e3847f4c372350bdda3b0dc577e1491310ef97fd5869c4f750533e";
             };
-            beamDeps  = [ httpoison_0_8_1 exjsx_3_1_0 ];
+            beamDeps  = [ httpoison_0_8_2 exjsx_3_1_0 ];
 
             meta = {
               description = ''Robotex is a client for the Telegram Bot API.'';
@@ -36058,19 +41541,19 @@ let
 
     rogger = rogger_0_1_0;
 
-    rollbax_0_5_3 = callPackage
+    rollbax_0_5_4 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_0_3, hackney_1_4_8 }:
+        {  buildMix, fetchHex, poison_1_0_3, hackney_1_6_0 }:
           buildMix {
             name = "rollbax";
-            version = "0.5.3";
+            version = "0.5.4";
             src = fetchHex {
               pkg = "rollbax";
-              version = "0.5.3";
+              version = "0.5.4";
               sha256 =
-                "0f24d041c932043915a14ab4e186bd3f1613bccee30ad251bb79a60533680336";
+                "e089f9c2ea51447111c14e2491e0b2d27eaff9efc6f1bfda5edcd64881923197";
             };
-            beamDeps  = [ poison_1_0_3 hackney_1_4_8 ];
+            beamDeps  = [ poison_1_0_3 hackney_1_6_0 ];
 
             meta = {
               description = ''Exception tracking and logging from Elixir to
@@ -36081,11 +41564,11 @@ let
           }
       ) {};
 
-    rollbax = rollbax_0_5_3;
+    rollbax = rollbax_0_5_4;
 
     rollex_0_4_0 = callPackage
       (
-        {  buildMix, fetchHex, sfmt_0_12_2 }:
+        {  buildMix, fetchHex, sfmt_0_12_7 }:
           buildMix {
             name = "rollex";
             version = "0.4.0";
@@ -36095,7 +41578,7 @@ let
               sha256 =
                 "53410bbd7687ff751b51b9737965bff1ba9c3d0673af65752f4ae3be0de1b44c";
             };
-            beamDeps  = [ sfmt_0_12_2 ];
+            beamDeps  = [ sfmt_0_12_7 ];
 
             meta = {
               description = ''Elixir library using a Pratt Parser algorithm to
@@ -36419,6 +41902,29 @@ let
 
     safetybox = safetybox_0_1_2;
 
+    salsa20_0_3_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "salsa20";
+            version = "0.3.0";
+            src = fetchHex {
+              pkg = "salsa20";
+              version = "0.3.0";
+              sha256 =
+                "4b2c2fc873c5443443220966f8c87e73d3d99725cd99cb93f6d752ce3cf3c335";
+            };
+
+            meta = {
+              description = ''Salsa20 symmetric stream cipher'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mwmiller/salsa20_ex";
+            };
+          }
+      ) {};
+
+    salsa20 = salsa20_0_3_0;
+
     saltie_0_3_2 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -36444,7 +41950,7 @@ let
 
     sap_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, control_0_0_4 }:
+        {  buildMix, fetchHex, plug_1_1_3, control_0_0_4 }:
           buildMix {
             name = "sap";
             version = "0.0.2";
@@ -36454,7 +41960,7 @@ let
               sha256 =
                 "63f2db3cbbb753eac51177783463fb364dd560745bf5e4e8ba10a237e557903c";
             };
-            beamDeps  = [ plug_1_1_1 control_0_0_4 ];
+            beamDeps  = [ plug_1_1_3 control_0_0_4 ];
 
             meta = {
               longDescription = ''Sap is a toolkit for Plug applications to
@@ -36566,7 +42072,7 @@ let
 
     scaffold_0_0_5 = callPackage
       (
-        {  buildMix, fetchHex, gitex_0_1_0, configparser_ex_0_2_0 }:
+        {  buildMix, fetchHex, gitex_0_1_0, configparser_ex_0_2_1 }:
           buildMix {
             name = "scaffold";
             version = "0.0.5";
@@ -36576,7 +42082,7 @@ let
               sha256 =
                 "fad499b712a576bc9d0f4842494baf9ec8d4c388f99c14f74654b1dbd158945c";
             };
-            beamDeps  = [ gitex_0_1_0 configparser_ex_0_2_0 ];
+            beamDeps  = [ gitex_0_1_0 configparser_ex_0_2_1 ];
 
             meta = {
               description = ''A mix task for creating new projects based on
@@ -36643,8 +42149,8 @@ let
           fetchHex,
           timex_1_0_0_rc4,
           parallel_0_0_3,
-          httpoison_0_8_1,
-          floki_0_7_1,
+          httpoison_0_8_2,
+          floki_0_8_0,
           codepagex_0_1_2
         }:
           buildMix {
@@ -36659,8 +42165,8 @@ let
             beamDeps  = [
                           timex_1_0_0_rc4
                           parallel_0_0_3
-                          httpoison_0_8_1
-                          floki_0_7_1
+                          httpoison_0_8_2
+                          floki_0_8_0
                           codepagex_0_1_2
                         ];
 
@@ -36677,7 +42183,7 @@ let
 
     scrivener_1_1_2 = callPackage
       (
-        {  buildMix, fetchHex, postgrex_0_11_1, ecto_2_0_0_beta_0 }:
+        {  buildMix, fetchHex, postgrex_0_11_1, ecto_2_0_0_beta_2 }:
           buildMix {
             name = "scrivener";
             version = "1.1.2";
@@ -36687,7 +42193,7 @@ let
               sha256 =
                 "9be46bdce0d8179ece431226eb9eddbe13bc158d647a3daee64a49bc26ca9dcf";
             };
-            beamDeps  = [ postgrex_0_11_1 ecto_2_0_0_beta_0 ];
+            beamDeps  = [ postgrex_0_11_1 ecto_2_0_0_beta_2 ];
 
             meta = {
               description = ''Paginate your Ecto queries'';
@@ -36699,25 +42205,50 @@ let
 
     scrivener = scrivener_1_1_2;
 
-    scrivener_html_1_0_8 = callPackage
+    scrivener_headers_1_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, scrivener_1_1_2, plug_1_1_3 }:
+          buildMix {
+            name = "scrivener_headers";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "scrivener_headers";
+              version = "1.0.1";
+              sha256 =
+                "2b004352dc5f394b33d4414ce9ebf379db7a9c4b1c92130d73a52e0a16efc93f";
+            };
+            beamDeps  = [ scrivener_1_1_2 plug_1_1_3 ];
+
+            meta = {
+              description = ''Helpers for paginating API responses with
+                            Scrivener and HTTP headers'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/doomspork/scrivener_headers";
+            };
+          }
+      ) {};
+
+    scrivener_headers = scrivener_headers_1_0_1;
+
+    scrivener_html_1_0_9 = callPackage
       (
         {
           buildMix,
           fetchHex,
           scrivener_1_1_2,
-          phoenix_html_2_5_0,
+          phoenix_html_2_5_1,
           phoenix_1_1_4
         }:
           buildMix {
             name = "scrivener_html";
-            version = "1.0.8";
+            version = "1.0.9";
             src = fetchHex {
               pkg = "scrivener_html";
-              version = "1.0.8";
+              version = "1.0.9";
               sha256 =
-                "1bea661f9940acae0ef28949c35e61dd1d314d0ac93c333ed85c7a37593a6406";
+                "e65645698e35463e1f0f553f76bf24d47a905870837b7c7544220d3e71c3a23b";
             };
-            beamDeps  = [ scrivener_1_1_2 phoenix_html_2_5_0 phoenix_1_1_4 ];
+            beamDeps  = [ scrivener_1_1_2 phoenix_html_2_5_1 phoenix_1_1_4 ];
 
             meta = {
               description = ''HTML helpers for Scrivener'';
@@ -36727,11 +42258,89 @@ let
           }
       ) {};
 
-    scrivener_html = scrivener_html_1_0_8;
+    scrivener_html = scrivener_html_1_0_9;
+
+    seat_json_0_0_18 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "seat_json";
+            version = "0.0.18";
+            src = fetchHex {
+              pkg = "seat_json";
+              version = "0.0.18";
+              sha256 =
+                "d0e7339fb24e156e53aa4cc733dda90d1c3bfa5f5fc38b7e293b690e7289c516";
+            };
+
+            meta = {
+              description = ''Simple Elixir Api Testing lib'';
+
+            };
+          }
+      ) {};
+
+    seat_json = seat_json_0_0_18;
+
+    sec_company_filings_rss_feed_parser_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, floki_0_7_2 }:
+          buildMix {
+            name = "sec_company_filings_rss_feed_parser";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "sec_company_filings_rss_feed_parser";
+              version = "0.0.2";
+              sha256 =
+                "b9c07c900a0afd5d8b4df68d4673d6fbb30ff50fe93579bab5133b748dde90a2";
+            };
+            beamDeps  = [ floki_0_7_2 ];
+
+            meta = {
+              longDescription = ''XML Parser for a Company`s SEC Filings Feed
+                                An example of such a feed can be found here:
+                                https://www.sec.gov/cgi-bin/browse-edgar?action=getcompany&CIK=0001418091&CIK=0001418091&type=&dateb=&owner=exclude&start=0&count=40&output=atom'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/vikram7/sec_company_filings_rss_feed_parser";
+            };
+          }
+      ) {};
+
+    sec_company_filings_rss_feed_parser =
+      sec_company_filings_rss_feed_parser_0_0_2;
+
+    sec_recent_filings_rss_feed_parser_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, floki_0_7_2 }:
+          buildMix {
+            name = "sec_recent_filings_rss_feed_parser";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "sec_recent_filings_rss_feed_parser";
+              version = "0.0.3";
+              sha256 =
+                "e58bc230abd16e972fc49e25db63afd5d2b7aa5b03c9c2d31f03bbd311ec7cee";
+            };
+            beamDeps  = [ floki_0_7_2 ];
+
+            meta = {
+              longDescription = ''XML Parser for the SEC`s Latest Filings Feed
+                                An example of such a feed can be found here:
+                                https://www.sec.gov/cgi-bin/browse-edgar?action=getcurrent&CIK=&type=10-K&company=&dateb=&owner=include&start=0&count=40&output=atom'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/vikram7/sec_latest_filings_rss_feed_parser";
+            };
+          }
+      ) {};
+
+    sec_recent_filings_rss_feed_parser =
+      sec_recent_filings_rss_feed_parser_0_0_3;
 
     secure_headers_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, pipe_0_0_2 }:
+        {  buildMix, fetchHex, plug_1_1_3, pipe_0_0_2 }:
           buildMix {
             name = "secure_headers";
             version = "0.0.1";
@@ -36741,7 +42350,7 @@ let
               sha256 =
                 "df5ffa08c91a270da9a167edac6181c87a8467e7c98d65651bd6b1c928e75cb1";
             };
-            beamDeps  = [ plug_1_1_1 pipe_0_0_2 ];
+            beamDeps  = [ plug_1_1_3 pipe_0_0_2 ];
 
             meta = {
               description = ''HTTP Security Headers for Phoenix or Plug'';
@@ -36753,19 +42362,19 @@ let
 
     secure_headers = secure_headers_0_0_1;
 
-    secure_password_0_3_1 = callPackage
+    secure_password_0_4_0 = callPackage
       (
-        {  buildMix, fetchHex, ecto_2_0_0_beta_0, comeonin_2_1_1 }:
+        {  buildMix, fetchHex, ecto_0_2_7, comeonin_2_3_0 }:
           buildMix {
             name = "secure_password";
-            version = "0.3.1";
+            version = "0.4.0";
             src = fetchHex {
               pkg = "secure_password";
-              version = "0.3.1";
+              version = "0.4.0";
               sha256 =
-                "04d91c55486177940d480e802f28f8ee4b5ac6590ed1e0a3ab16603d39c35673";
+                "b4f0ffe0bbac3e629356fa508438c23b6a99f6aac17a6b1f6314250e2c5a9a68";
             };
-            beamDeps  = [ ecto_2_0_0_beta_0 comeonin_2_1_1 ];
+            beamDeps  = [ ecto_0_2_7 comeonin_2_3_0 ];
 
             meta = {
               description = ''A port of Rails has_secure_password for Ecto
@@ -36776,7 +42385,7 @@ let
           }
       ) {};
 
-    secure_password = secure_password_0_3_1;
+    secure_password = secure_password_0_4_0;
 
     secure_random_0_1_1 = callPackage
       (
@@ -36828,7 +42437,7 @@ let
 
     segment_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_3_1, httpotion_2_1_0 }:
+        {  buildMix, fetchHex, poison_1_3_1, httpotion_2_2_2 }:
           buildMix {
             name = "segment";
             version = "0.1.0";
@@ -36838,7 +42447,7 @@ let
               sha256 =
                 "1747bf7a3f8d524d28890ce4499ef30a635f91c826d62e2b95711061faf02423";
             };
-            beamDeps  = [ poison_1_3_1 httpotion_2_1_0 ];
+            beamDeps  = [ poison_1_3_1 httpotion_2_2_2 ];
 
             meta = {
               description = ''analytics_elixir'';
@@ -36899,6 +42508,32 @@ let
 
     semver = semver_0_1_2;
 
+    sendgrid_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
+          buildMix {
+            name = "sendgrid";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "sendgrid";
+              version = "0.0.2";
+              sha256 =
+                "b9f27a1ae636688941998174b8595d9a5a4b24b870019f8a0009202f919bf151";
+            };
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
+
+            meta = {
+              description = ''A wrapper for SendGrid`s API to create composable
+                            emails.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/alexgaribay/sendgrid_elixir
+";
+            };
+          }
+      ) {};
+
+    sendgrid = sendgrid_0_0_2;
+
     sentient_0_0_2 = callPackage
       (
         {  buildMix, fetchHex, poison_1_5_2 }:
@@ -36923,7 +42558,7 @@ let
 
     sentient = sentient_0_0_2;
 
-    sentinel_0_0_4 = callPackage
+    sentinel_0_1_0 = callPackage
       (
         {
           buildMix,
@@ -36932,37 +42567,37 @@ let
           secure_random_0_2_0,
           postgrex_0_11_1,
           phoenix_1_1_4,
-          jose_1_6_1,
+          jose_1_7_3,
           guardian_db_0_4_0,
-          guardian_0_9_1,
+          guardian_0_10_1,
           ex_doc_0_11_4,
-          ecto_2_0_0_beta_0,
+          ecto_2_0_0_beta_2,
           earmark_0_2_1,
           cowboy_1_0_4,
-          comeonin_2_1_1
+          comeonin_2_3_0
         }:
           buildMix {
             name = "sentinel";
-            version = "0.0.4";
+            version = "0.1.0";
             src = fetchHex {
               pkg = "sentinel";
-              version = "0.0.4";
+              version = "0.1.0";
               sha256 =
-                "a97e13dd2c629eea7f5b6f2b818869e6f206a320eb3bfcfc9b315aa08cbeeac4";
+                "8fd20d50c00a9a431308e13aac5910e46d44b347e9bb5147f83da25c768bff82";
             };
             beamDeps  = [
                           ueberauth_0_2_0
                           secure_random_0_2_0
                           postgrex_0_11_1
                           phoenix_1_1_4
-                          jose_1_6_1
+                          jose_1_7_3
                           guardian_db_0_4_0
-                          guardian_0_9_1
+                          guardian_0_10_1
                           ex_doc_0_11_4
-                          ecto_2_0_0_beta_0
+                          ecto_2_0_0_beta_2
                           earmark_0_2_1
                           cowboy_1_0_4
-                          comeonin_2_1_1
+                          comeonin_2_3_0
                         ];
 
             meta = {
@@ -36975,11 +42610,11 @@ let
           }
       ) {};
 
-    sentinel = sentinel_0_0_4;
+    sentinel = sentinel_0_1_0;
 
     sentry_0_3_2 = callPackage
       (
-        {  buildMix, fetchHex, ecto_2_0_0_beta_0, comeonin_1_6_0 }:
+        {  buildMix, fetchHex, ecto_2_0_0_beta_2, comeonin_1_6_0 }:
           buildMix {
             name = "sentry";
             version = "0.3.2";
@@ -36989,7 +42624,7 @@ let
               sha256 =
                 "fd4aa8c6b5d51b85e452a01292fbd437dfbfc5d37515c13f4a9a94441dc89609";
             };
-            beamDeps  = [ ecto_2_0_0_beta_0 comeonin_1_6_0 ];
+            beamDeps  = [ ecto_2_0_0_beta_2 comeonin_1_6_0 ];
 
             meta = {
               description = ''Simplified authentication and authorization
@@ -37002,10 +42637,64 @@ let
 
     sentry = sentry_0_3_2;
 
+    sequences_1_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "sequences";
+            version = "1.1.0";
+            src = fetchHex {
+              pkg = "sequences";
+              version = "1.1.0";
+              sha256 =
+                "e087e078b8813052213d0812b4fe1d8ffbdbdf7d6379c174b78cfd22b9058fb0";
+            };
+
+            meta = {
+              longDescription = ''The Sequences module defines multiple methods
+                                that return a Stream of numbers, usually
+                                integers. The different Streams can be tapped in
+                                on-demand, by running any `Enum` function on
+                                them. For efficiency, these sequences are
+                                calculated in a way that re-uses previously
+                                calculated results whenever possible. List of
+                                included sequences: •
+                                Sequences.integers(start, step): a helper
+                                function to create any kind of lazy integer
+                                sequence with a regular step distance. •
+                                Sequences.integers •
+                                Sequences.positive_integers •
+                                Sequences.odd_integers •
+                                Sequences.even_integers • Sequences.zeroes •
+                                Sequences.ones • Sequences.factorials •
+                                Sequences.fibonacci • Sequences.catalan •
+                                Sequences.triangular • Sequences.primes •
+                                Sequences.squareroot_tuple(n): Returns a tuple
+                                with an integer part (single integer number) and
+                                decimal part (digit stream) •
+                                Sequences.squareroot_tuple(n, num_of_digits):
+                                Returns a tuple with an integer part (single
+                                integer number) and decimal part (digit list
+                                with given length) •
+                                Sequences.squareroot_decimals(n): Returns
+                                decimal stream of the decimal expansion of a
+                                square root. •
+                                Sequences.squareroot_expansion/1: Returns a
+                                digit stream of the decimal expansion of a
+                                square root, including the digits of the
+                                integral part at the front.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Qqwy/elixir-sequences";
+            };
+          }
+      ) {};
+
+    sequences = sequences_1_1_0;
+
     serial_0_1_2 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "serial";
             version = "0.1.2";
             src = fetchHex {
@@ -37074,19 +42763,18 @@ let
 
     setup = setup_1_7_0;
 
-    sfmt_0_12_2 = callPackage
+    sfmt_0_12_7 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "sfmt";
-            version = "0.12.2";
+            version = "0.12.7";
             src = fetchHex {
               pkg = "sfmt";
-              version = "0.12.2";
+              version = "0.12.7";
               sha256 =
-                "8c541998bedb7d6bfe699ba6ee319f563190ead5a01f30c02ff504c20f4e8e2a";
+                "4e295f5053b4a525c00b990cd88b38e492716e7e0c62abf0c626d9fea0ba800e";
             };
-            compilePorts = true;
 
             meta = {
               description = ''SIMD-oriented Fast Mersenne Twister (SFMT) for
@@ -37099,8 +42787,8 @@ let
 
     sfmt_0_13_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "sfmt";
             version = "0.13.0";
             src = fetchHex {
@@ -37109,7 +42797,6 @@ let
               sha256 =
                 "aaacd4824f2b3e439d360bcce6079863da1e7f564014602e9e7815f8740b6358";
             };
-            compilePorts = true;
 
             meta = {
               description = ''SIMD-oriented Fast Mersenne Twister (SFMT) for
@@ -37170,7 +42857,7 @@ let
 
     shameless_plug_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1 }:
+        {  buildMix, fetchHex, plug_1_1_3 }:
           buildMix {
             name = "shameless_plug";
             version = "1.0.0";
@@ -37180,7 +42867,7 @@ let
               sha256 =
                 "65c8af34d1853e85c8412d6ca15fd39354668c09c124cbc8e35cffea59d3a617";
             };
-            beamDeps  = [ plug_1_1_1 ];
+            beamDeps  = [ plug_1_1_3 ];
 
             meta = {
               description = ''A novelty Plug to remove the word "shame" from
@@ -37243,8 +42930,8 @@ let
 
     shotgun_0_2_2 = callPackage
       (
-        {  buildRebar3, fetchHex, gun_1_0_0_pre_1 }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex, gun_1_0_0_pre_1 }:
+          buildErlangMk {
             name = "shotgun";
             version = "0.2.2";
             src = fetchHex {
@@ -37253,7 +42940,6 @@ let
               sha256 =
                 "d2993953cff0c82eb47744206ae171a141deeff84539fe2f58068e3909ae066c";
             };
-
             beamDeps  = [ gun_1_0_0_pre_1 ];
 
             meta = {
@@ -37266,8 +42952,8 @@ let
 
     shotgun_0_2_3 = callPackage
       (
-        {  buildRebar3, fetchHex, gun_1_0_0_pre_1, cowlib_1_0_2 }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex, gun_1_0_0_pre_1, cowlib_1_0_2 }:
+          buildErlangMk {
             name = "shotgun";
             version = "0.2.3";
             src = fetchHex {
@@ -37276,7 +42962,6 @@ let
               sha256 =
                 "7b40dcf0faebf698fea541db5f6338f555d0c9c828493e9953d1748d9e5280b5";
             };
-
             beamDeps  = [ gun_1_0_0_pre_1 cowlib_1_0_2 ];
 
             meta = {
@@ -37396,6 +43081,29 @@ let
 
     sidejob = sidejob_2_0_0;
 
+    sideshow_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "sideshow";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "sideshow";
+              version = "0.0.1";
+              sha256 =
+                "b1816b137826a6c5da5d19b0d52f1f0a1263756e1598ece8cd31be95a74e1a85";
+            };
+
+            meta = {
+              description = ''Background jobs OTP style'';
+              license = stdenv.lib.licenses.gpl3;
+              homepage = "https://github.com/pavlos/sideshow";
+            };
+          }
+      ) {};
+
+    sideshow = sideshow_0_0_1;
+
     sidetask_1_1_0 = callPackage
       (
         {  buildMix, fetchHex, sidejob_2_0_0 }:
@@ -37429,28 +43137,6 @@ let
 
     sidetask = sidetask_1_1_0;
 
-    signaturex_0_0_8 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "signaturex";
-            version = "0.0.8";
-            src = fetchHex {
-              pkg = "signaturex";
-              version = "0.0.8";
-              sha256 =
-                "5897373a265e41245a251d828e4782457f129d5c49179a29079ff86139beeb0e";
-            };
-
-            meta = {
-              description = ''Simple key/secret based authentication for
-                            APIs'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/edgurgel/signaturex";
-            };
-          }
-      ) {};
-
     signaturex_1_0_1 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -37550,7 +43236,7 @@ let
 
     simple_format_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, phoenix_html_2_5_0 }:
+        {  buildMix, fetchHex, phoenix_html_2_5_1 }:
           buildMix {
             name = "simple_format";
             version = "0.1.0";
@@ -37560,7 +43246,7 @@ let
               sha256 =
                 "747cc74f743f89bcced219282f8639743f679b65183defecc7721f46e31dfcd0";
             };
-            beamDeps  = [ phoenix_html_2_5_0 ];
+            beamDeps  = [ phoenix_html_2_5_1 ];
 
             meta = {
               description = ''Rail`s simple_format helper for Phoenix.HTML'';
@@ -37602,11 +43288,11 @@ let
         {
           buildMix,
           fetchHex,
-          timex_1_0_1,
+          timex_1_0_2,
           sweet_xml_0_6_1,
           poison_1_5_2,
           ibrowse_4_2_2,
-          httpotion_2_2_0
+          httpotion_2_2_2
         }:
           buildMix {
             name = "simplex";
@@ -37618,11 +43304,11 @@ let
                 "43dfdc62aa2c4919464615b5acc4f03b028b3b9875fa72c128563e7d794ba2a2";
             };
             beamDeps  = [
-                          timex_1_0_1
+                          timex_1_0_2
                           sweet_xml_0_6_1
                           poison_1_5_2
                           ibrowse_4_2_2
-                          httpotion_2_2_0
+                          httpotion_2_2_2
                         ];
 
             meta = {
@@ -37636,10 +43322,60 @@ let
 
     simplex = simplex_0_4_0;
 
-    siphash_3_0_0 = callPackage
+    simplify_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, geo_1_0_1, distance_0_1_2 }:
+          buildMix {
+            name = "simplify";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "simplify";
+              version = "0.2.0";
+              sha256 =
+                "1b1af67f19e3a6589361665f4ca80e27873107bc9ef579e08fce43e52f62cffd";
+            };
+            beamDeps  = [ poison_2_1_0 geo_1_0_1 distance_0_1_2 ];
+
+            meta = {
+              longDescription = ''Implementation of the
+                                Ramer–Douglas–Peucker algorithm for reducing
+                                the number of points used to represent a
+                                curve.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pkinney/simplify_ex";
+            };
+          }
+      ) {};
+
+    simplify = simplify_0_2_0;
+
+    simpre_0_1_0 = callPackage
       (
         {  buildRebar3, fetchHex }:
           buildRebar3 {
+            name = "simpre";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "simpre";
+              version = "0.1.0";
+              sha256 =
+                "db0a48789360d2a683ea3a8605c2fb0134eb9fb63f07c0069be78906cdf5fb94";
+            };
+
+            meta = {
+              description = ''Simple Process Registry'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/yuce/simpre.git";
+            };
+          }
+      ) {};
+
+    simpre = simpre_0_1_0;
+
+    siphash_3_0_0 = callPackage
+      (
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "siphash";
             version = "3.0.0";
             src = fetchHex {
@@ -37648,7 +43384,6 @@ let
               sha256 =
                 "91b8efc8f3e26713c1bb91a91c9b6a8f6a5f949986622b1d548e8fee1cde7347";
             };
-            compilePorts = true;
 
             meta = {
               description = ''Elixir implementation of the SipHash hash
@@ -37666,9 +43401,9 @@ let
         {
           buildMix,
           fetchHex,
-          httpoison_0_8_1,
+          httpoison_0_8_2,
           html_entities_0_3_0,
-          floki_0_7_1
+          floki_0_8_0
         }:
           buildMix {
             name = "sips_downloader";
@@ -37679,7 +43414,7 @@ let
               sha256 =
                 "358d10e61f2d8b03e644194d09f1ca6c9c339bb9c80371eba21576571a857f94";
             };
-            beamDeps  = [ httpoison_0_8_1 html_entities_0_3_0 floki_0_7_1 ];
+            beamDeps  = [ httpoison_0_8_2 html_entities_0_3_0 floki_0_8_0 ];
 
             meta = {
               description = ''Automatically download new ElixirSips episodes'';
@@ -37715,19 +43450,19 @@ let
 
     skills = skills_0_0_1;
 
-    skroutz_0_0_1 = callPackage
+    skroutz_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
           buildMix {
             name = "skroutz";
-            version = "0.0.1";
+            version = "0.1.0";
             src = fetchHex {
               pkg = "skroutz";
-              version = "0.0.1";
+              version = "0.1.0";
               sha256 =
-                "08d6703c21e2371e68cae0c559d7a1ff119f767662e2f76a0f3a53551742721b";
+                "af54cd490adf503f378f57806b4c12bbd2506fa24f6e4f7c1cbceaf8c86d2b51";
             };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_1 ];
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
 
             meta = {
               description = ''Elixir library for accessing the Skroutz API'';
@@ -37737,7 +43472,7 @@ let
           }
       ) {};
 
-    skroutz = skroutz_0_0_1;
+    skroutz = skroutz_0_1_0;
 
     slack_0_3_0 = callPackage
       (
@@ -37763,7 +43498,7 @@ let
 
     slack_0_4_2 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_1_0 }:
+        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_1_0 }:
           buildMix {
             name = "slack";
             version = "0.4.2";
@@ -37773,7 +43508,7 @@ let
               sha256 =
                 "a32ced7527706b6adaae428eb03836260bdcf560be6ef92662ea6ec1541e687f";
             };
-            beamDeps  = [ httpoison_0_8_1 exjsx_3_1_0 ];
+            beamDeps  = [ httpoison_0_8_2 exjsx_3_1_0 ];
 
             meta = {
               description = ''A Slack Real Time Messaging API client.'';
@@ -37785,6 +43520,30 @@ let
 
     slack = slack_0_4_2;
 
+    slack_logger_backend_0_1_3 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
+          buildMix {
+            name = "slack_logger_backend";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "slack_logger_backend";
+              version = "0.1.3";
+              sha256 =
+                "12e9809e981abb0243f1fe72a4cb331142d9d3ce4425822c28f5b3d51ed7a5fe";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
+
+            meta = {
+              description = ''A logger backend for posting errors to Slack.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/craigp/slack_logger_backend";
+            };
+          }
+      ) {};
+
+    slack_logger_backend = slack_logger_backend_0_1_3;
+
     slack_webhook_0_0_2 = callPackage
       (
         {  buildMix, fetchHex, httpoison_0_7_5 }:
@@ -37813,7 +43572,7 @@ let
     slacker_0_0_2 = callPackage
       (
         {
-          buildMix, fetchHex, poison_1_5_2, inflex_1_0_0, httpoison_0_8_1
+          buildMix, fetchHex, poison_1_5_2, inflex_1_0_0, httpoison_0_8_2
         }:
           buildMix {
             name = "slacker";
@@ -37824,7 +43583,7 @@ let
               sha256 =
                 "4d3a110772e7b273a6d771bf4bc869fd13cb3bb9e99bca8f038e58d384f0ef1b";
             };
-            beamDeps  = [ poison_1_5_2 inflex_1_0_0 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 inflex_1_0_0 httpoison_0_8_2 ];
 
             meta = {
               description = ''A bot library for the Slack chat service.'';
@@ -37838,7 +43597,7 @@ let
 
     slackex_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_2_0 }:
+        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_2_0 }:
           buildMix {
             name = "slackex";
             version = "0.0.1";
@@ -37848,7 +43607,7 @@ let
               sha256 =
                 "bdd1d523cd576ff054ed3eee4efe22eee87ded127054332ca5a3bc1d6a997f33";
             };
-            beamDeps  = [ httpoison_0_8_1 exjsx_3_2_0 ];
+            beamDeps  = [ httpoison_0_8_2 exjsx_3_2_0 ];
 
             meta = {
               longDescription = ''A Slack wrapper for Elixir Requires an active
@@ -37885,17 +43644,17 @@ let
 
     slim_fast = slim_fast_0_10_0;
 
-    slime_0_12_1 = callPackage
+    slime_0_12_2 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "slime";
-            version = "0.12.1";
+            version = "0.12.2";
             src = fetchHex {
               pkg = "slime";
-              version = "0.12.1";
+              version = "0.12.2";
               sha256 =
-                "0a2f92f2f7523118efadcb20fe54611ddfb65428c6a21b69182fc247e361dc1e";
+                "389ed56ef536f25e29a99979ff1a3402ce21a0d40fcc49be93e44dcde11b9633";
             };
 
             meta = {
@@ -37907,12 +43666,12 @@ let
           }
       ) {};
 
-    slime = slime_0_12_1;
+    slime = slime_0_12_2;
 
     slp_0_0_2 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "slp";
             version = "0.0.2";
             src = fetchHex {
@@ -37934,6 +43693,29 @@ let
 
     slp = slp_0_0_2;
 
+    slugerl_1_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "slugerl";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "slugerl";
+              version = "1.0.0";
+              sha256 =
+                "5a06364270afb773b32a7a4e05cf9cb4ccf904faedb2825d7336f3065e4f791b";
+            };
+
+            meta = {
+              description = ''slugify'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/thraxil/slugerl";
+            };
+          }
+      ) {};
+
+    slugerl = slugerl_1_0_0;
+
     slugger_0_1_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -37961,7 +43743,7 @@ let
 
     smex_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, murmur_1_0_0, amqp_0_1_4 }:
+        {  buildMix, fetchHex, murmur_0_2_1, amqp_0_1_4 }:
           buildMix {
             name = "smex";
             version = "0.0.1";
@@ -37971,7 +43753,7 @@ let
               sha256 =
                 "3a84a2b3b3f09965bb0c2d57d04ba435b33c47319ee308feb4a182ddd9e69867";
             };
-            beamDeps  = [ murmur_1_0_0 amqp_0_1_4 ];
+            beamDeps  = [ murmur_0_2_1 amqp_0_1_4 ];
 
             meta = {
               description = ''An Elixir library for simplifying the sending of
@@ -38031,6 +43813,30 @@ let
 
     snappy = snappy_1_1_1;
 
+    snowflake_client_0_1_1 = callPackage
+      (
+        {  buildMix, fetchHex, oauth2_0_6_0 }:
+          buildMix {
+            name = "snowflake_client";
+            version = "0.1.1";
+            src = fetchHex {
+              pkg = "snowflake_client";
+              version = "0.1.1";
+              sha256 =
+                "94b21c7ad47775ef5853399e22ba2f8a91d8e174ca3a1da4e2fea05dfad12459";
+            };
+            beamDeps  = [ oauth2_0_6_0 ];
+
+            meta = {
+              description = ''A OAuth 2.0 client for Snowflake.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/IoraHealth/snowflake_client";
+            };
+          }
+      ) {};
+
+    snowflake_client = snowflake_client_0_1_1;
+
     socket_0_2_8 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -38075,6 +43881,30 @@ let
 
     socket = socket_0_3_1;
 
+    sonic_0_1_3 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, hackney_1_6_0 }:
+          buildMix {
+            name = "sonic";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "sonic";
+              version = "0.1.3";
+              sha256 =
+                "2bf88f0e86cf04db4b426569153f26fd41f6202aee1e9175e0a242eb5a0a0586";
+            };
+            beamDeps  = [ poison_2_1_0 hackney_1_6_0 ];
+
+            meta = {
+              description = ''etcd library and bindings for Elixir.'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/heroiclabs/sonic";
+            };
+          }
+      ) {};
+
+    sonic = sonic_0_1_3;
+
     sorted_set_1_1_0 = callPackage
       (
         {  buildMix, fetchHex, red_black_tree_1_2_0 }:
@@ -38149,9 +43979,34 @@ let
 
     spaced_repetitions = spaced_repetitions_0_0_1;
 
+    spacesaving_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex, earmark_0_2_1, dialyze_0_2_1 }:
+          buildMix {
+            name = "spacesaving";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "spacesaving";
+              version = "0.0.3";
+              sha256 =
+                "e13f6ceb1adaad447f12eab1cfc5668a2ab4784393c67b4c8cde815533cd43f8";
+            };
+            beamDeps  = [ earmark_0_2_1 dialyze_0_2_1 ];
+
+            meta = {
+              description = ''stream count distinct element estimation using
+                            the "space saving" algorithm.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rozap/spacesaving";
+            };
+          }
+      ) {};
+
+    spacesaving = spacesaving_0_0_3;
+
     sparkpost_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpotion_2_1_0 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpotion_2_2_2 }:
           buildMix {
             name = "sparkpost";
             version = "0.1.0";
@@ -38161,7 +44016,7 @@ let
               sha256 =
                 "704fa320132235db00c4b40b6990e63ec3c2581d681d86c0765ef930c88a2694";
             };
-            beamDeps  = [ poison_1_5_2 httpotion_2_1_0 ];
+            beamDeps  = [ poison_1_5_2 httpotion_2_2_2 ];
 
             meta = {
               description = ''The official Elixir package for the SparkPost
@@ -38176,7 +44031,7 @@ let
 
     spawndir_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex, exrm_0_15_1 }:
+        {  buildMix, fetchHex, exrm_0_14_2 }:
           buildMix {
             name = "spawndir";
             version = "0.1.1";
@@ -38186,7 +44041,7 @@ let
               sha256 =
                 "c407c9eb1f6f8ebb622df28b2f19a34447add6555f87208446a458b60ea9750c";
             };
-            beamDeps  = [ exrm_0_15_1 ];
+            beamDeps  = [ exrm_0_14_2 ];
 
             meta = {
               longDescription = ''# SpawnDir Spawns commands from the file
@@ -38317,7 +44172,7 @@ let
     spotify_ex_0_0_4 = callPackage
       (
         {
-          buildMix, fetchHex, poison_1_5_2, plug_1_1_1, httpoison_0_8_1
+          buildMix, fetchHex, poison_1_5_2, plug_1_1_3, httpoison_0_8_2
         }:
           buildMix {
             name = "spotify_ex";
@@ -38328,7 +44183,7 @@ let
               sha256 =
                 "f2e8647410096d34d9baecf8d9622896214320641ed72c11c711f9a463e4a961";
             };
-            beamDeps  = [ poison_1_5_2 plug_1_1_1 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 plug_1_1_3 httpoison_0_8_2 ];
 
             meta = {
               description = ''An Elixir wrapper for Spotify API O-Auth.'';
@@ -38340,9 +44195,33 @@ let
 
     spotify_ex = spotify_ex_0_0_4;
 
+    spout_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "spout";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "spout";
+              version = "0.0.1";
+              sha256 =
+                "5389628219cfa6df18ba366cb668055e44e97eccfea38d385d0581c489f3926a";
+            };
+
+            meta = {
+              longDescription = ''A TAP producer that integrates with existing
+                                ExUnit tests via an ExUnit formatter'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Stratus3D/Spout";
+            };
+          }
+      ) {};
+
+    spout = spout_0_0_1;
+
     spreedly_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "spreedly";
             version = "0.1.1";
@@ -38352,7 +44231,7 @@ let
               sha256 =
                 "a8aa76698a4fe95cb4c5cb77be2cfc4e085685570aacb25382fffdca4c7e1a6f";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''A wrapper for the Spreedly API.'';
@@ -38364,19 +44243,19 @@ let
 
     spreedly = spreedly_0_1_1;
 
-    sql_dust_0_1_5 = callPackage
+    sql_dust_0_3_2 = callPackage
       (
-        {  buildMix, fetchHex, inflex_1_5_0, ecto_2_0_0_beta_0 }:
+        {  buildMix, fetchHex, inflex_1_5_0, ecto_2_0_0_beta_2 }:
           buildMix {
             name = "sql_dust";
-            version = "0.1.5";
+            version = "0.3.2";
             src = fetchHex {
               pkg = "sql_dust";
-              version = "0.1.5";
+              version = "0.3.2";
               sha256 =
-                "8b8ec15b23c964e74e020cc7bd9ff9456d302ceb173465ebd0cc04c10bc3775d";
+                "58282299f10ac2cd2684f043052e0186979cf886d2a9e788d0555d9ef19c7bad";
             };
-            beamDeps  = [ inflex_1_5_0 ecto_2_0_0_beta_0 ];
+            beamDeps  = [ inflex_1_5_0 ecto_2_0_0_beta_2 ];
 
             meta = {
               longDescription = ''Easy. Simple. Powerful. Generate (complex)
@@ -38387,7 +44266,7 @@ let
           }
       ) {};
 
-    sql_dust = sql_dust_0_1_5;
+    sql_dust = sql_dust_0_3_2;
 
     sqlite3_1_1_5 = callPackage
       (
@@ -38413,14 +44292,38 @@ let
 
     sqlite3 = sqlite3_1_1_5;
 
+    sqlite_ecto_0_5_0 = callPackage
+      (
+        {
+          buildMix, fetchHex, sqlitex_0_8_3, poison_1_5_2, ecto_0_15_0
+        }:
+          buildMix {
+            name = "sqlite_ecto";
+            version = "0.5.0";
+            src = fetchHex {
+              pkg = "sqlite_ecto";
+              version = "0.5.0";
+              sha256 =
+                "cb26ae002ee444aa9b12d680ec11570204ba128631ccd7d2d6d3aafcd521880e";
+            };
+            beamDeps  = [ sqlitex_0_8_3 poison_1_5_2 ecto_0_15_0 ];
+
+            meta = {
+              description = ''SQLite3 adapter for Ecto'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jazzyb/sqlite_ecto";
+            };
+          }
+      ) {};
+
     sqlite_ecto_1_1_0 = callPackage
       (
         {
           buildMix,
           fetchHex,
-          sqlitex_0_8_2,
+          sqlitex_0_8_3,
           poison_1_5_2,
-          ecto_2_0_0_beta_0
+          ecto_2_0_0_beta_2
         }:
           buildMix {
             name = "sqlite_ecto";
@@ -38431,7 +44334,7 @@ let
               sha256 =
                 "88951b424e909d8047f0d03c13418c321df9e94560ac30241d8b1f7e48f49201";
             };
-            beamDeps  = [ sqlitex_0_8_2 poison_1_5_2 ecto_2_0_0_beta_0 ];
+            beamDeps  = [ sqlitex_0_8_3 poison_1_5_2 ecto_2_0_0_beta_2 ];
 
             meta = {
               description = ''SQLite3 adapter for Ecto'';
@@ -38443,19 +44346,19 @@ let
 
     sqlite_ecto = sqlite_ecto_1_1_0;
 
-    sqlitex_0_8_2 = callPackage
+    sqlitex_0_8_3 = callPackage
       (
         {
           buildMix, fetchHex, pipe_0_0_2, esqlite_0_2_2, decimal_1_1_1
         }:
           buildMix {
             name = "sqlitex";
-            version = "0.8.2";
+            version = "0.8.3";
             src = fetchHex {
               pkg = "sqlitex";
-              version = "0.8.2";
+              version = "0.8.3";
               sha256 =
-                "8485c24f945ce9c04ad894aff14cb965dcae3e93e08fbdca51a18ea85e9719df";
+                "44daaeb135178165d0a6cd6754e4af05e56e5d2943c0b1108df7df718745ec0f";
             };
             beamDeps  = [ pipe_0_0_2 esqlite_0_2_2 decimal_1_1_1 ];
 
@@ -38467,7 +44370,29 @@ let
           }
       ) {};
 
-    sqlitex = sqlitex_0_8_2;
+    sqlitex_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, esqlite_0_2_2, decimal_1_1_1 }:
+          buildMix {
+            name = "sqlitex";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "sqlitex";
+              version = "1.0.0";
+              sha256 =
+                "cbd7310e900841aa2dc6071b497330e730de1cd9618003006e0af48afb24d5f8";
+            };
+            beamDeps  = [ esqlite_0_2_2 decimal_1_1_1 ];
+
+            meta = {
+              description = ''A thin Elixir wrapper around esqlite'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mmmries/sqlitex";
+            };
+          }
+      ) {};
+
+    sqlitex = sqlitex_1_0_0;
 
     ssdb_0_3_0 = callPackage
       (
@@ -38559,32 +44484,33 @@ let
 
     sshex = sshex_2_1_0;
 
-    ssl_verify_hostname_1_0_1 = callPackage
+    ssl_verify_fun_1_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "ssl_verify_hostname";
-            version = "1.0.1";
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
+            name = "ssl_verify_fun";
+            version = "1.1.0";
             src = fetchHex {
-              pkg = "ssl_verify_hostname";
-              version = "1.0.1";
+              pkg = "ssl_verify_fun";
+              version = "1.1.0";
               sha256 =
-                "630baab6b1dd68f516b779353b368e4c605f1a022f3e544833b1667fdd321493";
+                "6c0e0d857fdb031ba67b0a791202bee116bea2313db7b649839000847591ba1e";
             };
 
             meta = {
-              description = ''Hostname verification library for Erlang'';
+              description = ''SSL verification functions for Erlang'';
               license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/deadtrickster/ssl_verify_hostname.erl";
+              homepage = "https://github.com/deadtrickster/ssl_verify_fun.erl";
             };
           }
       ) {};
 
+    ssl_verify_fun = ssl_verify_fun_1_1_0;
+
     ssl_verify_hostname_1_0_5 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "ssl_verify_hostname";
             version = "1.0.5";
             src = fetchHex {
@@ -38605,8 +44531,8 @@ let
 
     ssl_verify_hostname_1_0_6 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "ssl_verify_hostname";
             version = "1.0.6";
             src = fetchHex {
@@ -38672,6 +44598,29 @@ let
 
     stash = stash_1_0_0;
 
+    stathat_0_0_3 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "stathat";
+            version = "0.0.3";
+            src = fetchHex {
+              pkg = "stathat";
+              version = "0.0.3";
+              sha256 =
+                "2d3663d1bbbf13fbae688a89656dd53f747e69d23ec73bcfd8835c2ca9d09c35";
+            };
+
+            meta = {
+              description = ''StatHat client library.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/travisjeffery/stathat";
+            };
+          }
+      ) {};
+
+    stathat = stathat_0_0_3;
+
     statistics_0_4_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -38752,19 +44701,19 @@ let
 
     std_json_io = std_json_io_0_1_0;
 
-    steamex_0_0_3 = callPackage
+    steamex_0_0_5 = callPackage
       (
-        {  buildMix, fetchHex, sweet_xml_0_4_0, httpoison_0_7_5 }:
+        {  buildMix, fetchHex, sweet_xml_0_6_1, httpoison_0_8_2 }:
           buildMix {
             name = "steamex";
-            version = "0.0.3";
+            version = "0.0.5";
             src = fetchHex {
               pkg = "steamex";
-              version = "0.0.3";
+              version = "0.0.5";
               sha256 =
-                "4e9a5da88acb54897593dadc3e8a4cbdae86a31e7662888105463d20c0430dd8";
+                "4a290c432c0480cf372fece76cc4f09e231261fda64ef5027e8855e16aa5a2f6";
             };
-            beamDeps  = [ sweet_xml_0_4_0 httpoison_0_7_5 ];
+            beamDeps  = [ sweet_xml_0_6_1 httpoison_0_8_2 ];
 
             meta = {
               description = ''Steam API and Auth (with Phoenix/Plug
@@ -38775,7 +44724,7 @@ let
           }
       ) {};
 
-    steamex = steamex_0_0_3;
+    steamex = steamex_0_0_5;
 
     stemex_0_1_1 = callPackage
       (
@@ -38805,6 +44754,29 @@ let
 
     stemex = stemex_0_1_1;
 
+    stillir_1_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "stillir";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "stillir";
+              version = "1.0.0";
+              sha256 =
+                "04afdee2e5123b6da11fcc28c38d581f74db0cbe1faa1c36ed4f364797b588c0";
+            };
+
+            meta = {
+              description = ''Read Unix env vars into application config'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/heroku/stillir";
+            };
+          }
+      ) {};
+
+    stillir = stillir_1_0_0;
+
     stmd_0_0_2 = callPackage
       (
         {  buildMix, fetchHex, ex_doc_0_11_4, earmark_0_2_1 }:
@@ -38831,7 +44803,7 @@ let
 
     stockastic_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_2_0 }:
+        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_2_0 }:
           buildMix {
             name = "stockastic";
             version = "0.0.2";
@@ -38841,7 +44813,7 @@ let
               sha256 =
                 "f180915a21d4aa4a64f660696b77c5788334d4bae2639a58814565af0d75ca56";
             };
-            beamDeps  = [ httpoison_0_8_1 exjsx_3_2_0 ];
+            beamDeps  = [ httpoison_0_8_2 exjsx_3_2_0 ];
 
             meta = {
               description = ''Simple Elixir wrapper for the Stockfighter API'';
@@ -38855,7 +44827,7 @@ let
 
     stockfighter_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "stockfighter";
             version = "0.0.1";
@@ -38865,7 +44837,7 @@ let
               sha256 =
                 "d72726cf055068e2b62ef9091ec17ab9292b60bc7f4a7306c17cad6d022a3bd7";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''a simple wrapper of stockfighter http api'';
@@ -38879,7 +44851,7 @@ let
 
     stopwatch_0_0_7 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_1 }:
+        {  buildMix, fetchHex, timex_1_0_2 }:
           buildMix {
             name = "stopwatch";
             version = "0.0.7";
@@ -38889,7 +44861,7 @@ let
               sha256 =
                 "de20ad70ca3b0f70d0a2000858e80c0afd4163101e18d0428ee62a58e7c8360a";
             };
-            beamDeps  = [ timex_1_0_1 ];
+            beamDeps  = [ timex_1_0_2 ];
 
             meta = {
               description = ''The stopwatch provides an easy api to measure
@@ -38902,6 +44874,30 @@ let
 
     stopwatch = stopwatch_0_0_7;
 
+    strava_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
+          buildMix {
+            name = "strava";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "strava";
+              version = "0.0.1";
+              sha256 =
+                "f0b50d8c65fe769c08fd97afc4e3039eb1d3d2eb324adf8a52aaaa93685723e2";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
+
+            meta = {
+              description = ''Elixir wrapper for the Strava API (V3)'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/slashdotdash/strava";
+            };
+          }
+      ) {};
+
+    strava = strava_0_0_1;
+
     stream_runner_1_1_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -38994,17 +44990,17 @@ let
 
     strict_comparison = strict_comparison_0_0_1;
 
-    stringprep_1_0_2 = callPackage
+    stringprep_1_0_3 = callPackage
       (
         {  buildRebar3, fetchHex, p1_utils_1_0_3 }:
           buildRebar3 {
             name = "stringprep";
-            version = "1.0.2";
+            version = "1.0.3";
             src = fetchHex {
               pkg = "stringprep";
-              version = "1.0.2";
+              version = "1.0.3";
               sha256 =
-                "6990e6d9d9bc241a77ceb54d4afd7332319710dbebdae8f4f0c627186194c520";
+                "140c8300f29e33649580d9d2416f6684b00f386f690c76cc275b7ee43c735074";
             };
             compilePorts = true;
             beamDeps  = [ p1_utils_1_0_3 ];
@@ -39017,11 +45013,11 @@ let
           }
       ) {};
 
-    stringprep = stringprep_1_0_2;
+    stringprep = stringprep_1_0_3;
 
     stripe_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, jazz_0_2_1, httpotion_1_0_0 }:
+        {  buildMix, fetchHex, jazz_0_2_1, httpotion_2_2_2 }:
           buildMix {
             name = "stripe";
             version = "0.0.1";
@@ -39031,7 +45027,7 @@ let
               sha256 =
                 "99f9920ce562109abb70a1998a4f6b5bcd07f5063237cf28dd81387163df3f02";
             };
-            beamDeps  = [ jazz_0_2_1 httpotion_1_0_0 ];
+            beamDeps  = [ jazz_0_2_1 httpotion_2_2_2 ];
 
             meta = {
               longDescription = ''Wrapper around Stripe`s API. Full
@@ -39072,31 +45068,21 @@ let
 
     stripex = stripex_0_1_0;
 
-    stripity_stripe_1_2_0 = callPackage
+    stripity_stripe_1_4_0 = callPackage
       (
         {
-          buildMix,
-          fetchHex,
-          poison_1_5_2,
-          httpoison_0_8_1,
-          hackney_1_4_8,
-          earmark_0_2_1
+          buildMix, fetchHex, poison_2_0_1, httpoison_0_8_2, hackney_1_4_10
         }:
           buildMix {
             name = "stripity_stripe";
-            version = "1.2.0";
+            version = "1.4.0";
             src = fetchHex {
               pkg = "stripity_stripe";
-              version = "1.2.0";
+              version = "1.4.0";
               sha256 =
-                "25cb8c92ce83354a8d160514f183167a6c67ec3f1221e925cff3750da0fe4cd6";
+                "1ba06bf31efd899c03c09f1b6faa3ca5da3f48571202c8999f8ea6e5ca47c02f";
             };
-            beamDeps  = [
-                          poison_1_5_2
-                          httpoison_0_8_1
-                          hackney_1_4_8
-                          earmark_0_2_1
-                        ];
+            beamDeps  = [ poison_2_0_1 httpoison_0_8_2 hackney_1_4_10 ];
 
             meta = {
               description = ''A Stripe Library for Elixir'';
@@ -39106,19 +45092,19 @@ let
           }
       ) {};
 
-    stripity_stripe = stripity_stripe_1_2_0;
+    stripity_stripe = stripity_stripe_1_4_0;
 
-    struct_fields_0_2_0 = callPackage
+    struct_fields_0_3_0 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "struct_fields";
-            version = "0.2.0";
+            version = "0.3.0";
             src = fetchHex {
               pkg = "struct_fields";
-              version = "0.2.0";
+              version = "0.3.0";
               sha256 =
-                "245be58f06535a05247b6539e2640eb649c25eb896010452f2ee43b5e2604b72";
+                "d0ec469ccb59d2207a94cb8e3d3ce9b8bf09f239695e33a0e2447e2a1ff2178b";
             };
 
             meta = {
@@ -39130,7 +45116,7 @@ let
           }
       ) {};
 
-    struct_fields = struct_fields_0_2_0;
+    struct_fields = struct_fields_0_3_0;
 
     structurez_0_0_1 = callPackage
       (
@@ -39189,9 +45175,9 @@ let
           postgrex_0_11_1,
           poison_1_5_2,
           plugs_0_1_0,
-          plug_1_1_1,
+          plug_1_1_3,
           http_router_0_0_8,
-          ecto_2_0_0_beta_0,
+          ecto_2_0_0_beta_2,
           cowboy_1_0_4
         }:
           buildMix {
@@ -39208,9 +45194,9 @@ let
                           postgrex_0_11_1
                           poison_1_5_2
                           plugs_0_1_0
-                          plug_1_1_1
+                          plug_1_1_3
                           http_router_0_0_8
-                          ecto_2_0_0_beta_0
+                          ecto_2_0_0_beta_2
                           cowboy_1_0_4
                         ];
 
@@ -39324,6 +45310,30 @@ let
 
     swaggerdoc = swaggerdoc_0_0_1;
 
+    swapi_1_0_0 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_2 }:
+          buildMix {
+            name = "swapi";
+            version = "1.0.0";
+            src = fetchHex {
+              pkg = "swapi";
+              version = "1.0.0";
+              sha256 =
+                "55b40ddd97d632b027463aefccb8d6fa9ffa77f224a25af5565bbaecff5c7a3c";
+            };
+            beamDeps  = [ httpoison_0_8_2 ];
+
+            meta = {
+              description = ''An Elixir wrapper for the Star Wars API.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/twhitacre/swapi.ex";
+            };
+          }
+      ) {};
+
+    swapi = swapi_1_0_0;
+
     sweet_xml_0_4_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -39425,6 +45435,71 @@ let
 
     switchboard = switchboard_0_3_2;
 
+    swoosh_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poison_2_1_0,
+          plug_1_1_3,
+          httpoison_0_8_2,
+          gen_smtp_0_9_0,
+          cowboy_1_0_4
+        }:
+          buildMix {
+            name = "swoosh";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "swoosh";
+              version = "0.1.0";
+              sha256 =
+                "46488cbd7d158e4907869d7b097d7663d608405021c43aeb6a51a6c70cb7ee3b";
+            };
+            beamDeps  = [
+                          poison_2_1_0
+                          plug_1_1_3
+                          httpoison_0_8_2
+                          gen_smtp_0_9_0
+                          cowboy_1_0_4
+                        ];
+
+            meta = {
+              longDescription = ''Compose, deliver and test your emails easily
+                                in Elixir. Supports SMTP, Sendgrid, Mandrill,
+                                Postmark and Mailgun out of the box. Works great
+                                with Phoenix.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/swoosh/swoosh";
+            };
+          }
+      ) {};
+
+    swoosh = swoosh_0_1_0;
+
+    syn_1_2_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "syn";
+            version = "1.2.1";
+            src = fetchHex {
+              pkg = "syn";
+              version = "1.2.1";
+              sha256 =
+                "a21864a00c39f6753cde0269c979c5260dc9bf1991ca0d5c9635ebec499d6f61";
+            };
+
+            meta = {
+              description = ''A global Process Registry and Process Group
+                            manager.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ostinelli/syn";
+            };
+          }
+      ) {};
+
+    syn = syn_1_2_1;
+
     syn_osc_0_1_0 = callPackage
       (
         {  buildMix, fetchHex, osc_0_1_1 }:
@@ -39497,6 +45572,31 @@ let
 
     syslog = syslog_1_0_2;
 
+    system_env_loader_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "system_env_loader";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "system_env_loader";
+              version = "0.1.0";
+              sha256 =
+                "b271e8dcc857d7e36159554c343ed0af950e9dc8adf0f4cee399228142f68ec6";
+            };
+
+            meta = {
+              longDescription = ''A little package to load (bashlike) files
+                                with exported ENV variables into Elixir
+                                runtime'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ruby2elixir/system_env_loader";
+            };
+          }
+      ) {};
+
+    system_env_loader = system_env_loader_0_1_0;
+
     table_0_0_4 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -39589,6 +45689,29 @@ let
 
     tabula = tabula_2_0_1;
 
+    tachometer_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "tachometer";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "tachometer";
+              version = "0.1.0";
+              sha256 =
+                "5b2624c593280fc7a4621b264688509ba76ca3450a70ae0cfff43183604f903c";
+            };
+
+            meta = {
+              description = ''Scheduler instrumentation for BEAM in Elixir'';
+              license = stdenv.lib.licenses.gpl3;
+              homepage = "https://github.com/pavlos/tachometer";
+            };
+          }
+      ) {};
+
+    tachometer = tachometer_0_1_0;
+
     tagplay_0_1_0 = callPackage
       (
         {  buildMix, fetchHex, httpoison_0_7_5, exjsx_3_1_0 }:
@@ -39661,32 +45784,32 @@ let
 
     tane = tane_0_3_1;
 
-    tanegashima_0_0_3 = callPackage
+    tanegashima_0_0_9 = callPackage
       (
         {
           buildMix,
           fetchHex,
           poison_2_1_0,
-          httpoison_0_8_1,
+          httpoison_0_8_2,
           ex_doc_0_11_4,
           earmark_0_2_1,
-          dialyze_0_2_0
+          dialyze_0_2_1
         }:
           buildMix {
             name = "tanegashima";
-            version = "0.0.3";
+            version = "0.0.9";
             src = fetchHex {
               pkg = "tanegashima";
-              version = "0.0.3";
+              version = "0.0.9";
               sha256 =
-                "a087f30aa519aae47c1d9d03dfcccef0305e72052d3951b2aa327ca3017ca989";
+                "91d0496f57e156a4f5b205ca4743f857cbf7739012b4b5eb704a31d00062cad6";
             };
             beamDeps  = [
                           poison_2_1_0
-                          httpoison_0_8_1
+                          httpoison_0_8_2
                           ex_doc_0_11_4
                           earmark_0_2_1
-                          dialyze_0_2_0
+                          dialyze_0_2_1
                         ];
 
             meta = {
@@ -39697,11 +45820,11 @@ let
           }
       ) {};
 
-    tanegashima = tanegashima_0_0_3;
+    tanegashima = tanegashima_0_0_9;
 
     tanuki_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "tanuki";
             version = "0.2.0";
@@ -39711,7 +45834,7 @@ let
               sha256 =
                 "f499d6bcb80fc29f2d0b68d16d8309cb25589583b1f4d0eb23cbc4fe5afbab8c";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''GitLab API wrapper in Elixir, named after GitLabs
@@ -39797,7 +45920,7 @@ let
     tds_ecto_1_0_2 = callPackage
       (
         {
-          buildMix, fetchHex, tds_0_5_4, poison_1_5_2, ecto_2_0_0_beta_0
+          buildMix, fetchHex, tds_0_5_4, poison_1_5_2, ecto_2_0_0_beta_2
         }:
           buildMix {
             name = "tds_ecto";
@@ -39808,7 +45931,7 @@ let
               sha256 =
                 "c592061c97b923fd3f2a7b212eefdd7a35ddb0dac94886b8995ed03b2b9dfd53";
             };
-            beamDeps  = [ tds_0_5_4 poison_1_5_2 ecto_2_0_0_beta_0 ];
+            beamDeps  = [ tds_0_5_4 poison_1_5_2 ecto_2_0_0_beta_2 ];
 
             meta = {
               description = ''MSSQL / TDS Adapter for Ecto.'';
@@ -39843,6 +45966,56 @@ let
 
     tea_crypto = tea_crypto_1_0_0;
 
+    teacup_0_3_2 = callPackage
+      (
+        {  buildRebar3, fetchHex, simpre_0_1_0 }:
+          buildRebar3 {
+            name = "teacup";
+            version = "0.3.2";
+            src = fetchHex {
+              pkg = "teacup";
+              version = "0.3.2";
+              sha256 =
+                "53d616e19d858524e34cf113f0f418c5631db4ee01430f7b3d19afcf9beb68b1";
+            };
+
+            beamDeps  = [ simpre_0_1_0 ];
+
+            meta = {
+              description = ''Simple TCP client library for Erlang'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    teacup = teacup_0_3_2;
+
+    teacup_nats_0_3_1 = callPackage
+      (
+        {
+          buildRebar3, fetchHex, teacup_0_3_2, nats_msg_0_4_1, jsx_2_8_0
+        }:
+          buildRebar3 {
+            name = "teacup_nats";
+            version = "0.3.1";
+            src = fetchHex {
+              pkg = "teacup_nats";
+              version = "0.3.1";
+              sha256 =
+                "5ffd0732ca26931784c8c9fc713545ef02449a8ae9208e3c8b079623a36044c9";
+            };
+
+            beamDeps  = [ teacup_0_3_2 nats_msg_0_4_1 jsx_2_8_0 ];
+
+            meta = {
+              description = ''Teacup based NATS Client for Erlang'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    teacup_nats = teacup_nats_0_3_1;
+
     teamcity_exunit_formatter_0_2_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -39893,6 +46066,29 @@ let
 
     telebot = telebot_0_1_2;
 
+    telehashname_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "telehashname";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "telehashname";
+              version = "0.0.2";
+              sha256 =
+                "301a92653dafa69f118fdb8b8ca42259ac2e82441175231e1d67afcd26409f71";
+            };
+
+            meta = {
+              description = ''Telehash hashname implementation'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mwmiller/telehashname_ex";
+            };
+          }
+      ) {};
+
+    telehashname = telehashname_0_0_2;
+
     telephonist_0_1_2 = callPackage
       (
         {  buildMix, fetchHex, immortal_0_2_0, ex_twiml_2_1_0 }:
@@ -39916,17 +46112,17 @@ let
 
     telephonist = telephonist_0_1_2;
 
-    temp_0_3_0 = callPackage
+    temp_0_4_0 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "temp";
-            version = "0.3.0";
+            version = "0.4.0";
             src = fetchHex {
               pkg = "temp";
-              version = "0.3.0";
+              version = "0.4.0";
               sha256 =
-                "e1d2584bb62453e6bbb6247821909ae2d6a0fa7f59da9e4dc5581c0565d9c38b";
+                "1a852035e1c8bb9b33d00d322161689553d412fea783617afbd22112d481ffff";
             };
 
             meta = {
@@ -39938,7 +46134,7 @@ let
           }
       ) {};
 
-    temp = temp_0_3_0;
+    temp = temp_0_4_0;
 
     templates_0_0_5 = callPackage
       (
@@ -39991,7 +46187,7 @@ let
 
     tentabucket_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_2_0 }:
+        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_2_0 }:
           buildMix {
             name = "tentabucket";
             version = "0.0.1";
@@ -40001,7 +46197,7 @@ let
               sha256 =
                 "5784dad17f973efcc3c4ea7672927095864d58af1f830614e4c8f06c63d4822d";
             };
-            beamDeps  = [ httpoison_0_8_1 exjsx_3_2_0 ];
+            beamDeps  = [ httpoison_0_8_2 exjsx_3_2_0 ];
 
             meta = {
               description = ''Simple Bitbucket API client library for Elixir'';
@@ -40013,19 +46209,19 @@ let
 
     tentabucket = tentabucket_0_0_1;
 
-    tentacat_0_3_1 = callPackage
+    tentacat_0_4_0 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1, exjsx_3_2_0 }:
+        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_2_0 }:
           buildMix {
             name = "tentacat";
-            version = "0.3.1";
+            version = "0.4.0";
             src = fetchHex {
               pkg = "tentacat";
-              version = "0.3.1";
+              version = "0.4.0";
               sha256 =
-                "fea53526c4d1847bddfc6033cdb9ea7cdbd516e18d6bed25bfcff88b5d2d6551";
+                "3fc0ab0b8f218fc3486d00f47d4b71ae70709c4137a8d8d573b44038b4ee43b3";
             };
-            beamDeps  = [ httpoison_0_8_1 exjsx_3_2_0 ];
+            beamDeps  = [ httpoison_0_8_2 exjsx_3_2_0 ];
 
             meta = {
               description = ''Simple Elixir wrapper for the GitHub API'';
@@ -40035,7 +46231,7 @@ let
           }
       ) {};
 
-    tentacat = tentacat_0_3_1;
+    tentacat = tentacat_0_4_0;
 
     term_table_0_0_2 = callPackage
       (
@@ -40210,6 +46406,68 @@ let
 
     theriac = theriac_0_0_1;
 
+    thermex_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "thermex";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "thermex";
+              version = "0.0.2";
+              sha256 =
+                "10ac274c919012c31539ecd7c4b2b27ba413af46c4dad86029203dc84b956ec3";
+            };
+
+            meta = {
+              description = ''An OTP application for watching temperature
+                            sensors'';
+
+            };
+          }
+      ) {};
+
+    thermex = thermex_0_0_2;
+
+    thesis_0_0_8 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          plug_1_1_3,
+          phoenix_html_2_5_1,
+          phoenix_1_1_4,
+          html_sanitize_ex_0_1_2,
+          ecto_2_0_0_beta_2
+        }:
+          buildMix {
+            name = "thesis";
+            version = "0.0.8";
+            src = fetchHex {
+              pkg = "thesis";
+              version = "0.0.8";
+              sha256 =
+                "8fc1a3fd06b66c695a270519009903f1d2d5bd586f5061a614c37d7b46df7896";
+            };
+            beamDeps  = [
+                          plug_1_1_3
+                          phoenix_html_2_5_1
+                          phoenix_1_1_4
+                          html_sanitize_ex_0_1_2
+                          ecto_2_0_0_beta_2
+                        ];
+
+            meta = {
+              description = ''Thesis is a lightweight bolt-on content editing
+                            system for Phoenix websites.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/infinite_red/thesis";
+            };
+          }
+      ) {};
+
+    thesis = thesis_0_0_8;
+
     thrift_1_2_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -40237,7 +46495,7 @@ let
 
     time_distance_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_1 }:
+        {  buildMix, fetchHex, timex_1_0_2 }:
           buildMix {
             name = "time_distance";
             version = "0.0.1";
@@ -40247,7 +46505,7 @@ let
               sha256 =
                 "41ebe658882f2defd2cd472960e5a31b18d7ea2a4520c06907f7f2093d030e58";
             };
-            beamDeps  = [ timex_1_0_1 ];
+            beamDeps  = [ timex_1_0_2 ];
 
             meta = {
               longDescription = ''Show the difference between two specified
@@ -40261,17 +46519,17 @@ let
 
     time_distance = time_distance_0_0_1;
 
-    time_seer_0_0_5 = callPackage
+    time_seer_0_0_6 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "time_seer";
-            version = "0.0.5";
+            version = "0.0.6";
             src = fetchHex {
               pkg = "time_seer";
-              version = "0.0.5";
+              version = "0.0.6";
               sha256 =
-                "70a70fe4d6032d9a0cc41bfede0ed88e1cad1430de29d7dbb0b942f2d4b8768f";
+                "b5cfe4b5126deef913a91463c735c214efdde1cfb57e9303444d1a687fde53f5";
             };
 
             meta = {
@@ -40286,7 +46544,7 @@ let
           }
       ) {};
 
-    time_seer = time_seer_0_0_5;
+    time_seer = time_seer_0_0_6;
 
     timex_0_12_9 = callPackage
       (
@@ -40410,7 +46668,7 @@ let
 
     timex_0_16_2 = callPackage
       (
-        {  buildMix, fetchHex, tzdata_0_1_8 }:
+        {  buildMix, fetchHex, tzdata_0_1_201603 }:
           buildMix {
             name = "timex";
             version = "0.16.2";
@@ -40420,7 +46678,7 @@ let
               sha256 =
                 "951b740468c5de3495ce750d33c9df313100de75060242fd2dfe308f40706793";
             };
-            beamDeps  = [ tzdata_0_1_8 ];
+            beamDeps  = [ tzdata_0_1_201603 ];
 
             meta = {
               longDescription = ''A comprehensive date/time library for Elixir
@@ -40471,7 +46729,7 @@ let
 
     timex_0_19_5 = callPackage
       (
-        {  buildMix, fetchHex, tzdata_0_5_6, combine_0_7_0 }:
+        {  buildMix, fetchHex, tzdata_0_5_7, combine_0_7_0 }:
           buildMix {
             name = "timex";
             version = "0.19.5";
@@ -40481,7 +46739,7 @@ let
               sha256 =
                 "be1985ab99a6aebc3672b1d82b27e409c9a7af4658f3cc5900fa8754e159b02c";
             };
-            beamDeps  = [ tzdata_0_5_6 combine_0_7_0 ];
+            beamDeps  = [ tzdata_0_5_7 combine_0_7_0 ];
 
             meta = {
               longDescription = ''A comprehensive date/time library for Elixir
@@ -40532,7 +46790,7 @@ let
 
     timex_1_0_0_rc4 = callPackage
       (
-        {  buildMix, fetchHex, tzdata_0_1_8, combine_0_7_0 }:
+        {  buildMix, fetchHex, tzdata_0_1_201603, combine_0_7_0 }:
           buildMix {
             name = "timex";
             version = "1.0.0-rc4";
@@ -40542,7 +46800,7 @@ let
               sha256 =
                 "3da1356901fe205455404c83d2ea7804b63ed47e3a2cdb428545e568e05d6885";
             };
-            beamDeps  = [ tzdata_0_1_8 combine_0_7_0 ];
+            beamDeps  = [ tzdata_0_1_201603 combine_0_7_0 ];
 
             meta = {
               longDescription = ''A comprehensive date/time library for Elixir
@@ -40591,19 +46849,19 @@ let
           }
       ) {};
 
-    timex_1_0_1 = callPackage
+    timex_1_0_2 = callPackage
       (
-        {  buildMix, fetchHex, tzdata_0_1_8, combine_0_7_0 }:
+        {  buildMix, fetchHex, tzdata_0_1_201603, combine_0_7_0 }:
           buildMix {
             name = "timex";
-            version = "1.0.1";
+            version = "1.0.2";
             src = fetchHex {
               pkg = "timex";
-              version = "1.0.1";
+              version = "1.0.2";
               sha256 =
-                "6124f84b38f9ee526df91abca6d14bf503cc014b1f3c86d0d3412192e2b12d07";
+                "cbc359d21b5e2e694ab437e614bb4198af5be1031da4969dfd7ddf1b56064c88";
             };
-            beamDeps  = [ tzdata_0_1_8 combine_0_7_0 ];
+            beamDeps  = [ tzdata_0_1_201603 combine_0_7_0 ];
 
             meta = {
               longDescription = ''A comprehensive date/time library for Elixir
@@ -40652,21 +46910,88 @@ let
           }
       ) {};
 
-    timex = timex_1_0_1;
-
-    timex_ecto_0_5_0 = callPackage
+    timex_2_1_3 = callPackage
       (
-        {  buildMix, fetchHex, timex_0_19_5, ecto_2_0_0_beta_0 }:
+        {
+          buildMix,
+          fetchHex,
+          tzdata_0_1_201603,
+          gettext_0_10_0,
+          combine_0_7_0
+        }:
+          buildMix {
+            name = "timex";
+            version = "2.1.3";
+            src = fetchHex {
+              pkg = "timex";
+              version = "2.1.3";
+              sha256 =
+                "d39de4fc4ca4ceb08841f4ea362a5d3e6c07d6300b77d18581b0c034a8c8ac60";
+            };
+            beamDeps  = [ tzdata_0_1_201603 gettext_0_10_0 combine_0_7_0 ];
+
+            meta = {
+              longDescription = ''A comprehensive date/time library for Elixir
+                                Fully timezone-aware, using the Olson Timezone
+                                database - Supports local-timezone lookups -
+                                Supports POSIX-style timezones - Supports
+                                lookups of any Olson tzdata timezones - Supports
+                                arbitrary shifts across time and through
+                                timezones, including ambiguous time periods,
+                                non-existent time periods, and leaps. Provides
+                                both Date and DateTime types, for use depending
+                                on your needs, with an AmbiguousDateTime type
+                                for handling those DateTime values which fall on
+                                an ambigouos timezone period. Extendable via
+                                Convertable and Comparable protocols, so you can
+                                use Timex with your own types! Locale-aware,
+                                currently only supports "ru" and "en", but more
+                                will be added over time. Provides a broad array
+                                of date/time helper functions -
+                                shifting/adding/subtracting - diffing -
+                                comparing/before?/after?/between? - conversions
+                                - get day of week, week of year, ISO dates, and
+                                names for each - get the beginning or ending of
+                                a given week - get the beginning or ending of a
+                                year, quarter, week, or month - get days in a
+                                given month - normalization Provides a broad
+                                array of time-specific helpers - convert to and
+                                from units: weeks, days, hours, seconds, ms, and
+                                microseconds - measure execution time -
+                                diff/compare - to/from 12/24 hour clock times -
+                                add/subtract Safe date/time string formatting
+                                and parsing - Informative parser errors -
+                                Supports strftime, as well as an easier to read
+                                formatter, i.e. `{ISO:Basic}`, `{YYYY}` -
+                                Supports many formats out of the box: ISO8601
+                                basic and extended, RFC822, RFC1123, RFC3339,
+                                ANSIC, UNIX - Relative time formatter (i.e. "2
+                                years from now") Extendable - Protocols for core
+                                modules like the parser tokenizer - Easy to wrap
+                                to add extra functionality Can be used with
+                                Phoenix and Ecto when used with timex_ecto
+                                package'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitwalker/timex";
+            };
+          }
+      ) {};
+
+    timex = timex_2_1_3;
+
+    timex_ecto_1_0_4 = callPackage
+      (
+        {  buildMix, fetchHex, timex_2_1_3, ecto_0_2_7 }:
           buildMix {
             name = "timex_ecto";
-            version = "0.5.0";
+            version = "1.0.4";
             src = fetchHex {
               pkg = "timex_ecto";
-              version = "0.5.0";
+              version = "1.0.4";
               sha256 =
-                "6fe5ffbcfd3abeda54a1ce01206e982d7470c095520694c3cc2637d558e723b0";
+                "98818bc66aad2234c78a879b57445ea329dea64d74d8bf67adc331eb4c504a74";
             };
-            beamDeps  = [ timex_0_19_5 ecto_2_0_0_beta_0 ];
+            beamDeps  = [ timex_2_1_3 ecto_0_2_7 ];
 
             meta = {
               description = ''A plugin for Ecto and Timex which allows use of
@@ -40677,30 +47002,7 @@ let
           }
       ) {};
 
-    timex_ecto_0_9_0 = callPackage
-      (
-        {  buildMix, fetchHex, timex_1_0_1, ecto_2_0_0_beta_0 }:
-          buildMix {
-            name = "timex_ecto";
-            version = "0.9.0";
-            src = fetchHex {
-              pkg = "timex_ecto";
-              version = "0.9.0";
-              sha256 =
-                "454cbd67b18fa75485369b266c0142a2a5d78bb3d4078cd10dc2ec99f1088232";
-            };
-            beamDeps  = [ timex_1_0_1 ecto_2_0_0_beta_0 ];
-
-            meta = {
-              description = ''A plugin for Ecto and Timex which allows use of
-                            Timex types with Ecto'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bitwalker/timex_ecto";
-            };
-          }
-      ) {};
-
-    timex_ecto = timex_ecto_0_9_0;
+    timex_ecto = timex_ecto_1_0_4;
 
     timex_interval_0_6_0 = callPackage
       (
@@ -40729,8 +47031,8 @@ let
 
     tinymt_0_3_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "tinymt";
             version = "0.3.1";
             src = fetchHex {
@@ -40750,17 +47052,17 @@ let
 
     tinymt = tinymt_0_3_1;
 
-    tirexs_0_8_0_beta1 = callPackage
+    tirexs_0_8_0_beta5 = callPackage
       (
         {  buildMix, fetchHex, exjsx_3_2_0 }:
           buildMix {
             name = "tirexs";
-            version = "0.8.0-beta1";
+            version = "0.8.0-beta5";
             src = fetchHex {
               pkg = "tirexs";
-              version = "0.8.0-beta1";
+              version = "0.8.0-beta5";
               sha256 =
-                "3d7187e73f9ac85204b45ecd81a49b607415d2aecfe628d23dfd45baeb9486ee";
+                "5aec67541a1361aca21e6849c78755727596a6e93e2ad90d53add537892d399c";
             };
             beamDeps  = [ exjsx_3_2_0 ];
 
@@ -40773,12 +47075,35 @@ let
           }
       ) {};
 
-    tirexs = tirexs_0_8_0_beta1;
+    tirexs = tirexs_0_8_0_beta5;
+
+    tlv_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "tlv";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "tlv";
+              version = "0.1.0";
+              sha256 =
+                "bc040b662594ad6c83f1d931ee2e74f8d00697afa215087297f64546a0c500e9";
+            };
+
+            meta = {
+              description = ''Encodes/Decodes BER-TLVs structures'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/bitgamma/elixir_tlv";
+            };
+          }
+      ) {};
+
+    tlv = tlv_0_1_0;
 
     tmdb_0_0_6 = callPackage
       (
         {
-          buildRebar3, fetchHex, poison_1_4_0, httpoison_0_8_1, exjsx_3_1_0
+          buildRebar3, fetchHex, poison_1_4_0, httpoison_0_8_2, exjsx_3_1_0
         }:
           buildRebar3 {
             name = "tmdb";
@@ -40790,7 +47115,7 @@ let
                 "4cbad6ffa556a0eeecb22c3960d47451e918313e5651808439f039403dd38d3a";
             };
 
-            beamDeps  = [ poison_1_4_0 httpoison_0_8_1 exjsx_3_1_0 ];
+            beamDeps  = [ poison_1_4_0 httpoison_0_8_2 exjsx_3_1_0 ];
 
             meta = {    };
           }
@@ -40798,17 +47123,17 @@ let
 
     tmdb = tmdb_0_0_6;
 
-    todo_1_0_1 = callPackage
+    todo_1_2_0 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "todo";
-            version = "1.0.1";
+            version = "1.2.0";
             src = fetchHex {
               pkg = "todo";
-              version = "1.0.1";
+              version = "1.2.0";
               sha256 =
-                "40b40fe538ff54d090d2992b107361de7b1a18ef3ad41b69ec2bb5b327e951ba";
+                "92b0da31ee335a4caff5bb91950688fc3195c2eb78cc70be80e3b616f2be88bc";
             };
 
             meta = {
@@ -40819,7 +47144,31 @@ let
           }
       ) {};
 
-    todo = todo_1_0_1;
+    todo = todo_1_2_0;
+
+    togglex_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
+          buildMix {
+            name = "togglex";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "togglex";
+              version = "0.2.0";
+              sha256 =
+                "725b4299c5aad1c87900e667d6a01c88ba18f8e545283f31d2f726745c174e30";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
+
+            meta = {
+              description = ''Simple Elixir wrapper for the Toggl API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/diacode/togglex";
+            };
+          }
+      ) {};
+
+    togglex = togglex_0_2_0;
 
     tomlex_0_0_4 = callPackage
       (
@@ -40844,17 +47193,17 @@ let
 
     tomlex = tomlex_0_0_4;
 
-    toniq_1_0_4 = callPackage
+    toniq_1_0_5 = callPackage
       (
         {  buildMix, fetchHex, uuid_1_1_3, exredis_0_2_3 }:
           buildMix {
             name = "toniq";
-            version = "1.0.4";
+            version = "1.0.5";
             src = fetchHex {
               pkg = "toniq";
-              version = "1.0.4";
+              version = "1.0.5";
               sha256 =
-                "77c88b11b00180a7eacd0a7b722c89d4abf22fae818d50aa955d401f91c07c93";
+                "aa67c43131393872d82d53b9a8bf4a3d5b97c52a6588d53aaa61c29828e0664a";
             };
             beamDeps  = [ uuid_1_1_3 exredis_0_2_3 ];
 
@@ -40869,7 +47218,7 @@ let
           }
       ) {};
 
-    toniq = toniq_1_0_4;
+    toniq = toniq_1_0_5;
 
     towel_0_2_1 = callPackage
       (
@@ -40950,7 +47299,7 @@ let
         {
           buildMix,
           fetchHex,
-          timex_1_0_1,
+          timex_1_0_2,
           exml_0_1_0,
           exmerl_0_1_1,
           erlsom_1_2_1,
@@ -40966,7 +47315,7 @@ let
                 "42ee5d56b2ec0c55715e7f03a9aacd6d7ce8543519e9ec696335348eb1a24f7c";
             };
             beamDeps  = [
-                          timex_1_0_1
+                          timex_1_0_2
                           exml_0_1_0
                           exmerl_0_1_1
                           erlsom_1_2_1
@@ -40983,6 +47332,45 @@ let
 
     trackline = trackline_0_0_1;
 
+    tractor_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          postgrex_0_11_1,
+          phoenix_ecto_3_0_0_beta_2,
+          phoenix_1_1_4,
+          gettext_0_10_0,
+          cowboy_1_0_4
+        }:
+          buildMix {
+            name = "tractor";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "tractor";
+              version = "0.1.0";
+              sha256 =
+                "f88e92d512b9c696bb250c0caa1bd85f60893bbf855eb34d622e0aae156f3063";
+            };
+            beamDeps  = [
+                          postgrex_0_11_1
+                          phoenix_ecto_3_0_0_beta_2
+                          phoenix_1_1_4
+                          gettext_0_10_0
+                          cowboy_1_0_4
+                        ];
+
+            meta = {
+              description = ''A fast and scalable pure Elixir BitTorrent
+                            tracker.'';
+              license = stdenv.lib.licenses.mpl20;
+              homepage = "https://github.com/folz/tractor";
+            };
+          }
+      ) {};
+
+    tractor = tractor_0_1_0;
+
     tradie_0_0_1 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -41011,7 +47399,7 @@ let
 
     trailing_format_plug_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, cowboy_1_0_4 }:
+        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
           buildMix {
             name = "trailing_format_plug";
             version = "0.0.4";
@@ -41021,7 +47409,7 @@ let
               sha256 =
                 "16e2485b7069c8e025460d183d4711d9c5bbf46ae532dde859cc6623d12bfc71";
             };
-            beamDeps  = [ plug_1_1_1 cowboy_1_0_4 ];
+            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
 
             meta = {
               longDescription = ''An elixir plug to support legacy APIs that
@@ -41042,7 +47430,7 @@ let
           fetchHex,
           poison_1_1_1,
           httpoison_0_7_5,
-          hackney_1_0_6,
+          hackney_1_4_8,
           exvcr_0_3_9,
           ex_conf_0_1_3
         }:
@@ -41058,7 +47446,7 @@ let
             beamDeps  = [
                           poison_1_1_1
                           httpoison_0_7_5
-                          hackney_1_0_6
+                          hackney_1_4_8
                           exvcr_0_3_9
                           ex_conf_0_1_3
                         ];
@@ -41108,7 +47496,7 @@ let
 
     travis_ex_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "travis_ex";
             version = "0.0.2";
@@ -41118,7 +47506,7 @@ let
               sha256 =
                 "80589ec01596dfc1e02cef61ce0adc3c9b73977b56a528e214c37af079efa10a";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Travis-ci API client library for Elixir'';
@@ -41130,6 +47518,33 @@ let
 
     travis_ex = travis_ex_0_0_2;
 
+    tributary_0_0_2 = callPackage
+      (
+        {  buildMix, fetchHex, ecto_2_0_0_beta_2 }:
+          buildMix {
+            name = "tributary";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "tributary";
+              version = "0.0.2";
+              sha256 =
+                "f35f7f025b7db0555d4477ddf10622972f9200523355b09bdbb9ecf0f6c95d73";
+            };
+            beamDeps  = [ ecto_2_0_0_beta_2 ];
+
+            meta = {
+              longDescription = ''A simple stream generation library for Ecto
+                                queries that facilitates more efficient paging
+                                of queries both in the database and in your
+                                Ecto-reliant applicaton.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/davidantaramian/tributary";
+            };
+          }
+      ) {};
+
+    tributary = tributary_0_0_2;
+
     trie_1_5_0 = callPackage
       (
         {  buildRebar3, fetchHex }:
@@ -41213,17 +47628,17 @@ let
 
     trot = trot_0_5_3;
 
-    tsuru_1_0_2 = callPackage
+    tsuru_1_4_0 = callPackage
       (
         {  buildRebar3, fetchHex }:
           buildRebar3 {
             name = "tsuru";
-            version = "1.0.2";
+            version = "1.4.0";
             src = fetchHex {
               pkg = "tsuru";
-              version = "1.0.2";
+              version = "1.4.0";
               sha256 =
-                "b586ad8d47799a086e4225494f5e3cf4e306ca255a173a4b48fe51d542cefb6b";
+                "7825d3b530b46a8c4ff93b3c83a31d0f2ce042ddc741a89d3776edfd9f2828f7";
             };
 
             meta = {
@@ -41234,7 +47649,31 @@ let
           }
       ) {};
 
-    tsuru = tsuru_1_0_2;
+    tsuru = tsuru_1_4_0;
+
+    tubex_0_0_7 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
+          buildMix {
+            name = "tubex";
+            version = "0.0.7";
+            src = fetchHex {
+              pkg = "tubex";
+              version = "0.0.7";
+              sha256 =
+                "8b34ade3d0484ee5ebb1155c16454d545284d0c215bf999a206cbcc198acea83";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
+
+            meta = {
+              description = ''Elixir wrapper of YouTube Data API v3'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/yoavlt/tubex";
+            };
+          }
+      ) {};
+
+    tubex = tubex_0_0_7;
 
     tuco_tuco_0_8_1 = callPackage
       (
@@ -41260,9 +47699,34 @@ let
 
     tuco_tuco = tuco_tuco_0_8_1;
 
+    twittertex_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex, phoenix_html_2_5_1 }:
+          buildMix {
+            name = "twittertex";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "twittertex";
+              version = "0.1.0";
+              sha256 =
+                "76548d5cc68c098e7b04d2cb5846859ac38adb20aa9c3925436b9967ce785503";
+            };
+            beamDeps  = [ phoenix_html_2_5_1 ];
+
+            meta = {
+              description = ''Formats a tweet as HTML, using the entities from
+                            its JSON structure.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tomtaylor/twittertex";
+            };
+          }
+      ) {};
+
+    twittertex = twittertex_0_1_0;
+
     twittex_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex, oauther_1_0_2, oauth2_0_5_0 }:
+        {  buildMix, fetchHex, oauther_1_0_2, oauth2_0_6_0 }:
           buildMix {
             name = "twittex";
             version = "0.0.4";
@@ -41272,7 +47736,7 @@ let
               sha256 =
                 "2cfe144fe70ed0d0fcfbc18f232a54a844d1ef79db74cd385c8640e40ea30aa7";
             };
-            beamDeps  = [ oauther_1_0_2 oauth2_0_5_0 ];
+            beamDeps  = [ oauther_1_0_2 oauth2_0_6_0 ];
 
             meta = {
               description = ''Twitter client library for Elixir'';
@@ -41309,7 +47773,7 @@ let
 
     typeformx_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "typeformx";
             version = "0.0.1";
@@ -41319,7 +47783,7 @@ let
               sha256 =
                 "8f6f1613f53f8c5012eb6d05276f5d305bdb9d4b0e94926680b536d0e1d94a62";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''An Elixir client library for the Typeform API
@@ -41332,17 +47796,17 @@ let
 
     typeformx = typeformx_0_0_1;
 
-    tzdata_0_1_8 = callPackage
+    tzdata_0_1_201603 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "tzdata";
-            version = "0.1.8";
+            version = "0.1.201603";
             src = fetchHex {
               pkg = "tzdata";
-              version = "0.1.8";
+              version = "0.1.201603";
               sha256 =
-                "68af93cc1e0e0e6be76a583faaf15d57972a1afbf1e39f9d70524da87dfae825";
+                "77598cedfb09cfdfb8f431c51131eb84229c46b2c5a7eebdf5904b2b8f003225";
             };
 
             meta = {
@@ -41354,19 +47818,19 @@ let
           }
       ) {};
 
-    tzdata_0_5_6 = callPackage
+    tzdata_0_5_7 = callPackage
       (
-        {  buildMix, fetchHex, hackney_1_4_8 }:
+        {  buildMix, fetchHex, hackney_1_6_0 }:
           buildMix {
             name = "tzdata";
-            version = "0.5.6";
+            version = "0.5.7";
             src = fetchHex {
               pkg = "tzdata";
-              version = "0.5.6";
+              version = "0.5.7";
               sha256 =
-                "e2be18ea3e7c7dc83520b0eed369bbeea0c478299590524009a9dbaf0a9bfb04";
+                "1747ca537ddd0861a56a5f37f9fa480a66eb7dfc0f5f1fcdd0b08ba300c87743";
             };
-            beamDeps  = [ hackney_1_4_8 ];
+            beamDeps  = [ hackney_1_6_0 ];
 
             meta = {
               description = ''Tzdata is a parser and library for the tz
@@ -41377,19 +47841,44 @@ let
           }
       ) {};
 
-    tzdata = tzdata_0_5_6;
+    tzdata = tzdata_0_5_7;
 
-    ua_inspector_0_10_0 = callPackage
+    u2f_0_1_3 = callPackage
+      (
+        {  buildRebar3, fetchHex, jiffy_0_14_7, base64url_0_0_1 }:
+          buildRebar3 {
+            name = "u2f";
+            version = "0.1.3";
+            src = fetchHex {
+              pkg = "u2f";
+              version = "0.1.3";
+              sha256 =
+                "2a781f1664fac6a4de53b25115c1b00a143e02d7b7bdb583e1965a061d20e30c";
+            };
+
+            beamDeps  = [ jiffy_0_14_7 base64url_0_0_1 ];
+
+            meta = {
+              description = ''Server-side U2F library'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/sharpfin/u2f-erl";
+            };
+          }
+      ) {};
+
+    u2f = u2f_0_1_3;
+
+    ua_inspector_0_11_0 = callPackage
       (
         {  buildMix, fetchHex, poolboy_1_5_1 }:
           buildMix {
             name = "ua_inspector";
-            version = "0.10.0";
+            version = "0.11.0";
             src = fetchHex {
               pkg = "ua_inspector";
-              version = "0.10.0";
+              version = "0.11.0";
               sha256 =
-                "10f53183f10fcdbafb912e32798decec31fa0477fb4ddaa48048467936231d9a";
+                "ddc05b1293962317caab370610131e950a697a62ac7d041c885e5540dba1cf72";
             };
             beamDeps  = [ poolboy_1_5_1 ];
 
@@ -41401,7 +47890,7 @@ let
           }
       ) {};
 
-    ua_inspector = ua_inspector_0_10_0;
+    ua_inspector = ua_inspector_0_11_0;
 
     uber_0_1_0 = callPackage
       (
@@ -41427,6 +47916,30 @@ let
 
     uber = uber_0_1_0;
 
+    ucol_2_0_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "ucol";
+            version = "2.0.0";
+            src = fetchHex {
+              pkg = "ucol";
+              version = "2.0.0";
+              sha256 =
+                "b544b88ce034d1d1ab58e093744cbded9a1e8b05006870b4d3865d6cd5066a21";
+            };
+            compilePorts = true;
+
+            meta = {
+              description = ''ICU based collation module'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/refuge/ucol_nif";
+            };
+          }
+      ) {};
+
+    ucol = ucol_2_0_0;
+
     ucol_nif_1_1_5 = callPackage
       (
         {  buildRebar3, fetchHex }:
@@ -41476,7 +47989,7 @@ let
 
     ueberauth_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1 }:
+        {  buildMix, fetchHex, plug_1_1_3 }:
           buildMix {
             name = "ueberauth";
             version = "0.2.0";
@@ -41486,7 +47999,7 @@ let
               sha256 =
                 "d6ee9cfe96be0e2b4005cb482b8e29c20ae0d6f7332ea9f686397c4ab20bf4de";
             };
-            beamDeps  = [ plug_1_1_1 ];
+            beamDeps  = [ plug_1_1_3 ];
 
             meta = {
               description = ''An Elixir Authentication System for Plug-based
@@ -41501,7 +48014,7 @@ let
 
     ueberauth_facebook_0_3_2 = callPackage
       (
-        {  buildMix, fetchHex, ueberauth_0_2_0, oauth2_0_5_0 }:
+        {  buildMix, fetchHex, ueberauth_0_2_0, oauth2_0_6_0 }:
           buildMix {
             name = "ueberauth_facebook";
             version = "0.3.2";
@@ -41511,7 +48024,7 @@ let
               sha256 =
                 "d766a41a0b26bccfc1371b776bfcfb760f09639ac3de9aa8885023af9e5641c5";
             };
-            beamDeps  = [ ueberauth_0_2_0 oauth2_0_5_0 ];
+            beamDeps  = [ ueberauth_0_2_0 oauth2_0_6_0 ];
 
             meta = {
               description = ''An Uberauth strategy for Facebook
@@ -41526,7 +48039,7 @@ let
 
     ueberauth_fitbit_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex, ueberauth_0_2_0, oauth2_0_5_0 }:
+        {  buildMix, fetchHex, ueberauth_0_2_0, oauth2_0_6_0 }:
           buildMix {
             name = "ueberauth_fitbit";
             version = "0.2.1";
@@ -41536,7 +48049,7 @@ let
               sha256 =
                 "669e2bba8f498651dc4c31fbb978179b9d344264ace2ff8f53e007cc6d243956";
             };
-            beamDeps  = [ ueberauth_0_2_0 oauth2_0_5_0 ];
+            beamDeps  = [ ueberauth_0_2_0 oauth2_0_6_0 ];
 
             meta = {
               description = ''An Ueberauth strategy for Fitbit OAuth2
@@ -41551,7 +48064,7 @@ let
 
     ueberauth_github_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, ueberauth_0_2_0, oauth2_0_5_0 }:
+        {  buildMix, fetchHex, ueberauth_0_2_0, oauth2_0_6_0 }:
           buildMix {
             name = "ueberauth_github";
             version = "0.2.0";
@@ -41561,7 +48074,7 @@ let
               sha256 =
                 "b12b3dae8c097d5cd57a3e1cd97286b796ee36794b031f92a76e848f572cb4ab";
             };
-            beamDeps  = [ ueberauth_0_2_0 oauth2_0_5_0 ];
+            beamDeps  = [ ueberauth_0_2_0 oauth2_0_6_0 ];
 
             meta = {
               description = ''An Ueberauth strategy for using Github to
@@ -41576,7 +48089,7 @@ let
 
     ueberauth_google_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, ueberauth_0_2_0, oauth2_0_5_0 }:
+        {  buildMix, fetchHex, ueberauth_0_2_0, oauth2_0_6_0 }:
           buildMix {
             name = "ueberauth_google";
             version = "0.2.0";
@@ -41586,7 +48099,7 @@ let
               sha256 =
                 "b57f13534f37b7062df5a696976453af1faabc00d608ccdce29f9289164fce44";
             };
-            beamDeps  = [ ueberauth_0_2_0 oauth2_0_5_0 ];
+            beamDeps  = [ ueberauth_0_2_0 oauth2_0_6_0 ];
 
             meta = {
               description = ''An Uberauth strategy for Google
@@ -41599,21 +48112,19 @@ let
 
     ueberauth_google = ueberauth_google_0_2_0;
 
-    ueberauth_identity_0_2_2 = callPackage
+    ueberauth_identity_0_2_3 = callPackage
       (
-        {
-          buildMix, fetchHex, ueberauth_0_2_0, poison_1_5_2, plug_1_1_1
-        }:
+        {  buildMix, fetchHex, ueberauth_0_2_0, plug_1_1_3 }:
           buildMix {
             name = "ueberauth_identity";
-            version = "0.2.2";
+            version = "0.2.3";
             src = fetchHex {
               pkg = "ueberauth_identity";
-              version = "0.2.2";
+              version = "0.2.3";
               sha256 =
-                "6c3d7e5917a5030f737152cc86af4c7066a66a30aea049562c687e5af51bee82";
+                "ebbb4d7fe6c94053486a32794ab2a561f004f01fd1099c7e0a69901dc32c51ca";
             };
-            beamDeps  = [ ueberauth_0_2_0 poison_1_5_2 plug_1_1_1 ];
+            beamDeps  = [ ueberauth_0_2_0 plug_1_1_3 ];
 
             meta = {
               description = ''An Ueberauth strategy for basic
@@ -41624,11 +48135,11 @@ let
           }
       ) {};
 
-    ueberauth_identity = ueberauth_identity_0_2_2;
+    ueberauth_identity = ueberauth_identity_0_2_3;
 
     ueberauth_slack_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, ueberauth_0_2_0, oauth2_0_5_0 }:
+        {  buildMix, fetchHex, ueberauth_0_2_0, oauth2_0_6_0 }:
           buildMix {
             name = "ueberauth_slack";
             version = "0.2.0";
@@ -41638,7 +48149,7 @@ let
               sha256 =
                 "1b109ed50d34b3a18d5db04234475baa3ae08893b46a7b5a1726fec4adb6753b";
             };
-            beamDeps  = [ ueberauth_0_2_0 oauth2_0_5_0 ];
+            beamDeps  = [ ueberauth_0_2_0 oauth2_0_6_0 ];
 
             meta = {
               description = ''An Ueberauth strategy for using Slack to
@@ -41652,7 +48163,7 @@ let
 
     ueberauth_twitter_0_2_2 = callPackage
       (
-        {  buildMix, fetchHex, ueberauth_0_2_0, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, ueberauth_0_2_0, httpoison_0_8_2 }:
           buildMix {
             name = "ueberauth_twitter";
             version = "0.2.2";
@@ -41662,7 +48173,7 @@ let
               sha256 =
                 "911a227b8290e8d65cee8d45015477d4ea51dbcf637c8a41ff88b34fcc5ab65a";
             };
-            beamDeps  = [ ueberauth_0_2_0 httpoison_0_8_1 ];
+            beamDeps  = [ ueberauth_0_2_0 httpoison_0_8_2 ];
 
             meta = {
               description = ''An Uberauth strategy for Twitter
@@ -41795,7 +48306,7 @@ let
     unsplash_0_3_0 = callPackage
       (
         {
-          buildMix, fetchHex, poison_1_5_2, oauth2_0_5_0, httpoison_0_8_1
+          buildMix, fetchHex, poison_1_5_2, oauth2_0_6_0, httpoison_0_8_2
         }:
           buildMix {
             name = "unsplash";
@@ -41806,7 +48317,7 @@ let
               sha256 =
                 "609ded0d452729df1d6272ca7997a6bd6fb65821606f17d078c73a1b2ecbc37a";
             };
-            beamDeps  = [ poison_1_5_2 oauth2_0_5_0 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 oauth2_0_6_0 httpoison_0_8_2 ];
 
             meta = {
               description = ''Unsplash API in Elixir'';
@@ -41818,6 +48329,30 @@ let
 
     unsplash = unsplash_0_3_0;
 
+    untappd_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_2_0 }:
+          buildMix {
+            name = "untappd";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "untappd";
+              version = "0.0.1";
+              sha256 =
+                "f4560612cd78002202234660cf248f004c91ade8c10dc87ad136eb5d8f49d66a";
+            };
+            beamDeps  = [ httpoison_0_8_2 exjsx_3_2_0 ];
+
+            meta = {
+              description = ''Elixir wrapper for the Untappd API'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/nimi/untappd";
+            };
+          }
+      ) {};
+
+    untappd = untappd_0_0_1;
+
     upyun_0_0_1 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -41909,19 +48444,19 @@ let
 
     urilib = urilib_0_1_1;
 
-    url_unroller_0_0_2 = callPackage
+    url_unroller_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, httpoison_0_8_2 }:
           buildMix {
             name = "url_unroller";
-            version = "0.0.2";
+            version = "0.0.3";
             src = fetchHex {
               pkg = "url_unroller";
-              version = "0.0.2";
+              version = "0.0.3";
               sha256 =
-                "9e12c97ff7b45e457734293cabfdd1e60dbfe3d4f80ec7706814a84b61cf11ec";
+                "65a46b7335060111bdc5ad164548361f3c7ff5a39ff9493a9109dd20b98498b9";
             };
-            beamDeps  = [ httpoison_0_8_1 ];
+            beamDeps  = [ httpoison_0_8_2 ];
 
             meta = {
               description = ''A simple url unroller/unshortener'';
@@ -41931,7 +48466,7 @@ let
           }
       ) {};
 
-    url_unroller = url_unroller_0_0_2;
+    url_unroller = url_unroller_0_0_3;
 
     urna_0_1_4 = callPackage
       (
@@ -41957,17 +48492,17 @@ let
 
     urna = urna_0_1_4;
 
-    uuid_0_1_5 = callPackage
+    uuid_1_0_0 = callPackage
       (
         {  buildMix, fetchHex }:
           buildMix {
             name = "uuid";
-            version = "0.1.5";
+            version = "1.0.0";
             src = fetchHex {
               pkg = "uuid";
-              version = "0.1.5";
+              version = "1.0.0";
               sha256 =
-                "5cfb91972f5cacb0bcb2f00414d5747dd575d84b864c96f668ab3b729cc08422";
+                "ff0a92c21c23935a944a5c5608c1c5af8d629ff5e11593001434d21efcb343b4";
             };
 
             meta = {
@@ -42051,7 +48586,7 @@ let
 
     valid_field_0_3_0 = callPackage
       (
-        {  buildMix, fetchHex, ecto_2_0_0_beta_0 }:
+        {  buildMix, fetchHex, ecto_2_0_0_beta_2 }:
           buildMix {
             name = "valid_field";
             version = "0.3.0";
@@ -42061,7 +48596,7 @@ let
               sha256 =
                 "258591717d45835be4f3b299a2c332dc33702876c272f2fff455956c4a5409dc";
             };
-            beamDeps  = [ ecto_2_0_0_beta_0 ];
+            beamDeps  = [ ecto_2_0_0_beta_2 ];
 
             meta = {
               description = ''ValidField aids unit testing a changeset for
@@ -42097,9 +48632,83 @@ let
 
     varpool = varpool_1_5_1;
 
+    vector_0_1_0 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "vector";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "vector";
+              version = "0.1.0";
+              sha256 =
+                "2399175b7daa136a15ddbaeeb007de0b903fd21979aec1afa2ead92d37033870";
+            };
+
+            meta = {
+              longDescription = ''Library of common vector functions for use in
+                                geometric or graphical calculations.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pkinney/vector_ex";
+            };
+          }
+      ) {};
+
+    vector_0_2_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "vector";
+            version = "0.2.1";
+            src = fetchHex {
+              pkg = "vector";
+              version = "0.2.1";
+              sha256 =
+                "20c7d2b83aae6da37c53e7d3139096b4dcfbd289a57b38a07dfb570a1c6e38fb";
+            };
+
+            meta = {
+              longDescription = ''Library of common vector functions for use in
+                                geometric or graphical calculations.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pkinney/vector_ex";
+            };
+          }
+      ) {};
+
+    vector = vector_0_2_1;
+
+    velkoz_0_0_1 = callPackage
+      (
+        {
+          buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2, ex_rated_1_2_2
+        }:
+          buildMix {
+            name = "velkoz";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "velkoz";
+              version = "0.0.1";
+              sha256 =
+                "3eaa4d2f1b1904d57811e42a841735eb2eb74eb4ea93c7182e1c0b1e0a01a7e8";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ex_rated_1_2_2 ];
+
+            meta = {
+              longDescription = ''Velkoz is an api wrapper for the game leauge
+                                of legends. You can find the api documentation
+                                :: https://developer.riotgames.com/api'';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/tesseract-tech/velkoz";
+            };
+          }
+      ) {};
+
+    velkoz = velkoz_0_0_1;
+
     verify_origin_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1 }:
+        {  buildMix, fetchHex, plug_1_1_3 }:
           buildMix {
             name = "verify_origin";
             version = "0.1.0";
@@ -42109,7 +48718,7 @@ let
               sha256 =
                 "90834033676cb0ca632f208f489f6eb92ae94323fe7243efba577e1deb031167";
             };
-            beamDeps  = [ plug_1_1_1 ];
+            beamDeps  = [ plug_1_1_3 ];
 
             meta = {
               description = ''A library for using Origin header checking to
@@ -42122,27 +48731,33 @@ let
 
     verify_origin = verify_origin_0_1_0;
 
-    verk_0_9_6 = callPackage
+    verk_0_9_11 = callPackage
       (
         {
           buildMix,
           fetchHex,
-          timex_1_0_1,
-          redix_0_3_4,
+          watcher_1_0_0,
+          timex_1_0_2,
+          redix_0_3_6,
           poolboy_1_5_1,
           poison_1_5_2
         }:
           buildMix {
             name = "verk";
-            version = "0.9.6";
+            version = "0.9.11";
             src = fetchHex {
               pkg = "verk";
-              version = "0.9.6";
+              version = "0.9.11";
               sha256 =
-                "a8b021d474d199c946fc6b7b38053218d8157faa60e9068c18db86ea5a978869";
+                "79183e0e79a106f0712bd291ac1c81124a497d4e1aef0f9db6672ec5b6190b49";
             };
-            beamDeps  = [ timex_1_0_1 redix_0_3_4 poolboy_1_5_1 poison_1_5_2
-                      ];
+            beamDeps  = [
+                          watcher_1_0_0
+                          timex_1_0_2
+                          redix_0_3_6
+                          poolboy_1_5_1
+                          poison_1_5_2
+                        ];
 
             meta = {
               description = ''Verk is a job processing system backed by
@@ -42153,31 +48768,31 @@ let
           }
       ) {};
 
-    verk = verk_0_9_6;
+    verk = verk_0_9_11;
 
-    verk_web_0_9_1 = callPackage
+    verk_web_0_9_4 = callPackage
       (
         {
           buildMix,
           fetchHex,
-          verk_0_9_6,
-          phoenix_html_2_5_0,
+          verk_0_9_11,
+          phoenix_html_2_5_1,
           phoenix_1_1_4,
           gettext_0_10_0,
           cowboy_1_0_4
         }:
           buildMix {
             name = "verk_web";
-            version = "0.9.1";
+            version = "0.9.4";
             src = fetchHex {
               pkg = "verk_web";
-              version = "0.9.1";
+              version = "0.9.4";
               sha256 =
-                "71eb5c4ab6f73676b21c24b1ba86a3c11a1979339d83ab52a77a3be70da6e61b";
+                "58c5c58515d435eda9f2ddb42d418b8e189b624f2b365e0a70fcd18880c8cb07";
             };
             beamDeps  = [
-                          verk_0_9_6
-                          phoenix_html_2_5_0
+                          verk_0_9_11
+                          phoenix_html_2_5_1
                           phoenix_1_1_4
                           gettext_0_10_0
                           cowboy_1_0_4
@@ -42191,7 +48806,7 @@ let
           }
       ) {};
 
-    verk_web = verk_web_0_9_1;
+    verk_web = verk_web_0_9_4;
 
     vex_0_5_5 = callPackage
       (
@@ -42217,19 +48832,19 @@ let
 
     vex = vex_0_5_5;
 
-    viktor_0_0_5 = callPackage
+    viktor_0_0_9 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
           buildMix {
             name = "viktor";
-            version = "0.0.5";
+            version = "0.0.9";
             src = fetchHex {
               pkg = "viktor";
-              version = "0.0.5";
+              version = "0.0.9";
               sha256 =
-                "df49c25a93ea36d6f65b25716c894a9479ab6f990ed138170bdeea2930ef6cec";
+                "876c3b9dbac7503640144fc9850c80e56148daa3aa28029f5d8fb44b35b999ff";
             };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_1 ];
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
 
             meta = {
               description = ''Client API wrapper for League of Legends API.'';
@@ -42239,7 +48854,7 @@ let
           }
       ) {};
 
-    viktor = viktor_0_0_5;
+    viktor = viktor_0_0_9;
 
     vimeo_0_0_2 = callPackage
       (
@@ -42267,7 +48882,7 @@ let
 
     virus_total_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, jsx_2_8_0, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, jsx_2_8_0, httpoison_0_8_2 }:
           buildMix {
             name = "virus_total";
             version = "0.0.1";
@@ -42277,7 +48892,7 @@ let
               sha256 =
                 "bed3680d17c98f978a90f5b443b6e269ee0a3f2239d2262502d8d10ee042ebfa";
             };
-            beamDeps  = [ jsx_2_8_0 httpoison_0_8_1 ];
+            beamDeps  = [ jsx_2_8_0 httpoison_0_8_2 ];
 
             meta = {
               description = ''Elixir OTP application for the VirusTotal Public
@@ -42314,6 +48929,66 @@ let
 
     voorhees = voorhees_0_1_1;
 
+    voxpop_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "voxpop";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "voxpop";
+              version = "0.0.1";
+              sha256 =
+                "85a410b1df2de5852ce491c653d29781b1db2845f8d2e51d9809f7ebbe90a6c9";
+            };
+
+            meta = {
+              description = ''Voxpop generates text from declarative
+                            grammars.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zovafit/voxpop";
+            };
+          }
+      ) {};
+
+    voxpop = voxpop_0_0_1;
+
+    wallaby_0_1_0 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poolboy_1_5_1,
+          poison_2_1_0,
+          httpoison_0_8_2,
+          dialyze_0_2_1
+        }:
+          buildMix {
+            name = "wallaby";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "wallaby";
+              version = "0.1.0";
+              sha256 =
+                "836fd7f97f1f70befc6e2e3a9bc785ff70b5de053d2e9ca021a5918edfa0a099";
+            };
+            beamDeps  = [
+                          poolboy_1_5_1
+                          poison_2_1_0
+                          httpoison_0_8_2
+                          dialyze_0_2_1
+                        ];
+
+            meta = {
+              description = ''Concurrent feature tests for elixir'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/keathley/wallaby";
+            };
+          }
+      ) {};
+
+    wallaby = wallaby_0_1_0;
+
     watcher_1_0_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -42339,7 +49014,7 @@ let
 
     wayback_archiver_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, httpotion_2_1_0, floki_0_7_1 }:
+        {  buildMix, fetchHex, httpotion_2_2_2, floki_0_8_0 }:
           buildMix {
             name = "wayback_archiver";
             version = "0.0.1";
@@ -42349,7 +49024,7 @@ let
               sha256 =
                 "9f8bea06d6dcac6c017a3a41859373c10a1b46fb133db47300c2ae7c9fada590";
             };
-            beamDeps  = [ httpotion_2_1_0 floki_0_7_1 ];
+            beamDeps  = [ httpotion_2_2_2 floki_0_8_0 ];
 
             meta = {
               description = ''Send URLs to Wayback Machine'';
@@ -42416,7 +49091,7 @@ let
 
     webdriver_0_8_1 = callPackage
       (
-        {  buildMix, fetchHex, jazz_0_2_1, httpotion_2_2_0 }:
+        {  buildMix, fetchHex, jazz_0_2_1, httpotion_2_2_2 }:
           buildMix {
             name = "webdriver";
             version = "0.8.1";
@@ -42426,7 +49101,7 @@ let
               sha256 =
                 "fe2009920fb210cd50df3a7d2bb40cd6f2844a538d52a48952f18008e1c5f3d3";
             };
-            beamDeps  = [ jazz_0_2_1 httpotion_2_2_0 ];
+            beamDeps  = [ jazz_0_2_1 httpotion_2_2_2 ];
 
             meta = {
               description = ''Webdriver protocol for driving web browsers.'';
@@ -42461,9 +49136,35 @@ let
 
     weber = weber_0_1_0;
 
+    webmentions_0_0_5 = callPackage
+      (
+        {  buildMix, fetchHex, httpotion_2_2_2, floki_0_7_2 }:
+          buildMix {
+            name = "webmentions";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "webmentions";
+              version = "0.0.5";
+              sha256 =
+                "8240363589044572bc1ceddef0843d03ccb23e7ca5bb660e9dd11fb7c9e06414";
+            };
+            beamDeps  = [ httpotion_2_2_2 floki_0_7_2 ];
+
+            meta = {
+              description = ''A Webmentions
+                            (https://indiewebcamp.com/Webmention) module for
+                            Elixir'';
+              license = stdenv.lib.licenses.agpl3;
+              homepage = "https://github.com/ckruse/webmentions-elixir";
+            };
+          }
+      ) {};
+
+    webmentions = webmentions_0_0_5;
+
     webpay_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "webpay";
             version = "0.0.4";
@@ -42473,7 +49174,7 @@ let
               sha256 =
                 "abab40fc7fda25a55d3a3dce4327d3f322df378432a9ed5e7c43e553989f467e";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Elixir Webpay API wrapper'';
@@ -42509,7 +49210,7 @@ let
 
     wechat_check_signature_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1 }:
+        {  buildMix, fetchHex, plug_1_1_3 }:
           buildMix {
             name = "wechat_check_signature";
             version = "0.0.1";
@@ -42519,7 +49220,7 @@ let
               sha256 =
                 "5c5bb053c15082e12ad6da485fc4f711efa9198107368a42456aeafcf870caec";
             };
-            beamDeps  = [ plug_1_1_1 ];
+            beamDeps  = [ plug_1_1_3 ];
 
             meta = {
               description = ''An Elixir Plug for checking wechat signature.'';
@@ -42533,7 +49234,7 @@ let
 
     wechatex_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1 }:
+        {  buildMix, fetchHex, plug_1_1_3 }:
           buildMix {
             name = "wechatex";
             version = "0.0.1";
@@ -42543,7 +49244,7 @@ let
               sha256 =
                 "211971a79d38326dbf5e603ee00165708eb17670f2a84e54df929191c6fef81c";
             };
-            beamDeps  = [ plug_1_1_1 ];
+            beamDeps  = [ plug_1_1_3 ];
 
             meta = {
               description = ''Wechat plugins for Elixir.'';
@@ -42606,7 +49307,7 @@ let
 
     wifi_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_4_0, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_4_0, httpoison_0_8_2 }:
           buildMix {
             name = "wifi";
             version = "0.2.0";
@@ -42616,7 +49317,7 @@ let
               sha256 =
                 "0060d0dda9308e9dc652e83f7646485d932188a11e17fb814125ccd7449effc5";
             };
-            beamDeps  = [ poison_1_4_0 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_4_0 httpoison_0_8_2 ];
 
             meta = {
               longDescription = ''Various utility functions for working with
@@ -42659,7 +49360,7 @@ let
 
     witchcraft_0_4_2 = callPackage
       (
-        {  buildMix, fetchHex, quark_1_0_2, algae_0_9_1 }:
+        {  buildMix, fetchHex, quark_1_0_2, algae_0_10_0 }:
           buildMix {
             name = "witchcraft";
             version = "0.4.2";
@@ -42669,7 +49370,7 @@ let
               sha256 =
                 "cdd6379d5a8b0baab3b79b0c9b87473d8292e0d9a80fa2e21fac61d31218609f";
             };
-            beamDeps  = [ quark_1_0_2 algae_0_9_1 ];
+            beamDeps  = [ quark_1_0_2 algae_0_10_0 ];
 
             meta = {
               description = ''Common algebraic structures and functions'';
@@ -42707,7 +49408,7 @@ let
 
     wizardry_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_1, comeonin_1_6_0 }:
+        {  buildMix, fetchHex, plug_1_1_3, comeonin_1_6_0 }:
           buildMix {
             name = "wizardry";
             version = "0.0.1";
@@ -42717,7 +49418,7 @@ let
               sha256 =
                 "4a85b8c3e5813dee20aa0d5503811568743644883723c9b226436616c9a779a3";
             };
-            beamDeps  = [ plug_1_1_1 comeonin_1_6_0 ];
+            beamDeps  = [ plug_1_1_3 comeonin_1_6_0 ];
 
             meta = {
               description = ''Simple, low-level user account framework for
@@ -42828,17 +49529,17 @@ let
 
     workshop = workshop_0_5_1;
 
-    world_json_0_1_5 = callPackage
+    world_json_0_1_6 = callPackage
       (
         {  buildMix, fetchHex, poison_1_3_1 }:
           buildMix {
             name = "world_json";
-            version = "0.1.5";
+            version = "0.1.6";
             src = fetchHex {
               pkg = "world_json";
-              version = "0.1.5";
+              version = "0.1.6";
               sha256 =
-                "3a960d9794627a1927f7410185bf36c22d6b4d8f079bf74e131d0f5606b7f567";
+                "f91493355bc522e6ee58eed6d21fca41c32f246052c1324cb5f08b2eb1eb5e83";
             };
             beamDeps  = [ poison_1_3_1 ];
 
@@ -42851,7 +49552,7 @@ let
           }
       ) {};
 
-    world_json = world_json_0_1_5;
+    world_json = world_json_0_1_6;
 
     wpa_supplicant_0_1_0 = callPackage
       (
@@ -42883,7 +49584,7 @@ let
 
     wykop_api_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "wykop_api";
             version = "0.0.4";
@@ -42893,7 +49594,7 @@ let
               sha256 =
                 "0c2acade581168e5cdf3d1dbde53183bc1c49882c8ba8793e045f20d5a9a26d0";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Library for Wykop API.'';
@@ -42907,7 +49608,7 @@ let
 
     xe_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, httpoison_0_8_1, floki_0_7_1 }:
+        {  buildMix, fetchHex, httpoison_0_8_2, floki_0_8_0 }:
           buildMix {
             name = "xe";
             version = "0.0.1";
@@ -42917,7 +49618,7 @@ let
               sha256 =
                 "53d693612db1343c36a7bbe6286c23f7ccfdbd44500c2a38970743238d230a77";
             };
-            beamDeps  = [ httpoison_0_8_1 floki_0_7_1 ];
+            beamDeps  = [ httpoison_0_8_2 floki_0_8_0 ];
 
             meta = {
               description = ''Real time conversion for currencies'';
@@ -42931,7 +49632,7 @@ let
 
     xfighter_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "xfighter";
             version = "0.2.1";
@@ -42941,7 +49642,7 @@ let
               sha256 =
                 "67bb43379cd89b4b95f65f02ad5421719723d262fdbe7e399fb82ac7f3b490a8";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''An API wrapper for the programming game
@@ -42954,12 +49655,37 @@ let
 
     xfighter = xfighter_0_2_1;
 
+    xkcd_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
+          buildMix {
+            name = "xkcd";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "xkcd";
+              version = "0.0.1";
+              sha256 =
+                "1c757360b9c5ff3d098e9c04874ed273289ea890e4d87e7dd99164633fe061b5";
+            };
+            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
+
+            meta = {
+              longDescription = ''Uses the XKCD JSON API to retrieve the
+                                random, specific and the latest XKCD comic.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/notdevinclark/xkcd";
+            };
+          }
+      ) {};
+
+    xkcd = xkcd_0_0_1;
+
     xlsx_parser_0_0_4 = callPackage
       (
         {
           buildMix,
           fetchHex,
-          timex_1_0_1,
+          timex_1_0_2,
           sweet_xml_0_5_1,
           simple_agent_0_0_7
         }:
@@ -42972,7 +49698,7 @@ let
               sha256 =
                 "53d86e1142483421d5c1fe769f69980560a6809ca37a13c3dcd4c49fee46a831";
             };
-            beamDeps  = [ timex_1_0_1 sweet_xml_0_5_1 simple_agent_0_0_7 ];
+            beamDeps  = [ timex_1_0_2 sweet_xml_0_5_1 simple_agent_0_0_7 ];
 
             meta = {
               longDescription = ''Simple parsing of xlsx spreadsheet data. Data
@@ -42986,6 +49712,34 @@ let
 
     xlsx_parser = xlsx_parser_0_0_4;
 
+    xlsxir_0_0_2 = callPackage
+      (
+        {
+          buildMix, fetchHex, sweet_xml_0_6_1, ex_doc_0_11_4, earmark_0_2_1
+        }:
+          buildMix {
+            name = "xlsxir";
+            version = "0.0.2";
+            src = fetchHex {
+              pkg = "xlsxir";
+              version = "0.0.2";
+              sha256 =
+                "7019d6c58f87543fcccc463cec5132d7a2343f5ef2ffdbb77095b694646e6ab0";
+            };
+            beamDeps  = [ sweet_xml_0_6_1 ex_doc_0_11_4 earmark_0_2_1 ];
+
+            meta = {
+              longDescription = ''Parses Microsoft Excel worksheets (currently
+                                only .xlsx format) and returns the data in
+                                either a list or a map.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/kennellroxco/xlsxir";
+            };
+          }
+      ) {};
+
+    xlsxir = xlsxir_0_0_2;
+
     xml_builder_0_0_8 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -43038,7 +49792,7 @@ let
     xoauth2_0_0_3 = callPackage
       (
         {
-          buildMix, fetchHex, poison_1_5_2, mock_0_1_1, httpoison_0_8_1
+          buildMix, fetchHex, poison_1_5_2, mock_0_1_3, httpoison_0_8_2
         }:
           buildMix {
             name = "xoauth2";
@@ -43049,7 +49803,7 @@ let
               sha256 =
                 "4a43a0bca1707b579c6a141524666006dd25ed2efdc19aee5d6eeedf6efc3418";
             };
-            beamDeps  = [ poison_1_5_2 mock_0_1_1 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 mock_0_1_3 httpoison_0_8_2 ];
 
             meta = {
               description = ''A simple XOAuth2 module for Elixir'';
@@ -43063,8 +49817,8 @@ let
 
     xref_runner_0_2_5 = callPackage
       (
-        {  buildRebar3, fetchHex, getopt_0_8_2 }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex, getopt_0_8_2 }:
+          buildErlangMk {
             name = "xref_runner";
             version = "0.2.5";
             src = fetchHex {
@@ -43073,7 +49827,6 @@ let
               sha256 =
                 "12ca46c02789b0b2755284dedeb73aac0d9a3120c28c992040feb86766ee2c9a";
             };
-
             beamDeps  = [ getopt_0_8_2 ];
 
             meta = {
@@ -43086,25 +49839,42 @@ let
 
     xref_runner = xref_runner_0_2_5;
 
-    yahoo_fx_0_1_3 = callPackage
+    xxhash_0_2_0 = callPackage
       (
-        {
-          buildMix,
-          fetchHex,
-          hackney_1_0_6,
-          time_seer_0_0_5,
-          httpoison_0_7_5
-        }:
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "xxhash";
+            version = "0.2.0";
+            src = fetchHex {
+              pkg = "xxhash";
+              version = "0.2.0";
+              sha256 =
+                "ed57fd84e2c4fc440c28fa6a59d2c2ec0d3957b58dfd05cf06da8824ee6494d8";
+            };
+
+            meta = {
+              description = ''Native Elixir xxHash port.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/ttvd/elixir-xxhash";
+            };
+          }
+      ) {};
+
+    xxhash = xxhash_0_2_0;
+
+    yahoo_fx_0_2_0 = callPackage
+      (
+        {  buildMix, fetchHex, time_seer_0_0_6, httpoison_0_8_2 }:
           buildMix {
             name = "yahoo_fx";
-            version = "0.1.3";
+            version = "0.2.0";
             src = fetchHex {
               pkg = "yahoo_fx";
-              version = "0.1.3";
+              version = "0.2.0";
               sha256 =
-                "6f8691b2de712ea5e870f48291a2a2debd8ae8977e37480e69ce81f423e40479";
+                "e06b6986c483cad62081e19fba3089f3eab4a4f1e1cc06cd17aa45d34dd14913";
             };
-            beamDeps  = [ hackney_1_0_6 time_seer_0_0_5 httpoison_0_7_5 ];
+            beamDeps  = [ time_seer_0_0_6 httpoison_0_8_2 ];
 
             meta = {
               longDescription = ''YahooFx is an Elixir library for getting
@@ -43115,7 +49885,7 @@ let
           }
       ) {};
 
-    yahoo_fx = yahoo_fx_0_1_3;
+    yahoo_fx = yahoo_fx_0_2_0;
 
     yaml_elixir_1_0_0 = callPackage
       (
@@ -43166,17 +49936,40 @@ let
 
     yar = yar_0_1_0;
 
-    yggdrasil_1_1_0 = callPackage
+    yes_msg_0_1_0 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "yes_msg";
+            version = "0.1.0";
+            src = fetchHex {
+              pkg = "yes_msg";
+              version = "0.1.0";
+              sha256 =
+                "45e0a13d87cf84fa50001b27f898b470c610207947e4ddb1b1160804b4e62e0e";
+            };
+
+            meta = {
+              description = ''Yet another simple message (YES) parser for
+                            Erlang.'';
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    yes_msg = yes_msg_0_1_0;
+
+    yggdrasil_1_1_1 = callPackage
       (
         {  buildMix, fetchHex, exredis_0_2_3, amqp_0_1_4 }:
           buildMix {
             name = "yggdrasil";
-            version = "1.1.0";
+            version = "1.1.1";
             src = fetchHex {
               pkg = "yggdrasil";
-              version = "1.1.0";
+              version = "1.1.1";
               sha256 =
-                "f4412a82c09c09b70a9520f91113d9aa064f74b597ff5bdad6601ca7cf860f63";
+                "0e83184601187cfc2a7a101085eed98b31911279e442dd761bdbc692b6c87a40";
             };
             beamDeps  = [ exredis_0_2_3 amqp_0_1_4 ];
 
@@ -43192,12 +49985,12 @@ let
           }
       ) {};
 
-    yggdrasil = yggdrasil_1_1_0;
+    yggdrasil = yggdrasil_1_1_1;
 
     yocingo_0_0_2 = callPackage
       (
         {
-          buildMix, fetchHex, httpoison_0_8_1, exjsx_3_2_0, earmark_0_2_1
+          buildMix, fetchHex, httpoison_0_8_2, exjsx_3_2_0, earmark_0_2_1
         }:
           buildMix {
             name = "yocingo";
@@ -43208,7 +50001,7 @@ let
               sha256 =
                 "3ce350bb833e72edc684dc6ece956146161d4b7215cd9557f95bb2d7dcb1abf4";
             };
-            beamDeps  = [ httpoison_0_8_1 exjsx_3_2_0 earmark_0_2_1 ];
+            beamDeps  = [ httpoison_0_8_2 exjsx_3_2_0 earmark_0_2_1 ];
 
             meta = {
               longDescription = ''This is a full Telegram Bot API. With this
@@ -43221,21 +50014,21 @@ let
 
     yocingo = yocingo_0_0_2;
 
-    yodlee_0_0_9 = callPackage
+    yodlee_0_1_4 = callPackage
       (
         {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1, hackney_1_4_8
+          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, hackney_1_4_10
         }:
           buildMix {
             name = "yodlee";
-            version = "0.0.9";
+            version = "0.1.4";
             src = fetchHex {
               pkg = "yodlee";
-              version = "0.0.9";
+              version = "0.1.4";
               sha256 =
-                "4bc779bc847bfb39ebc04789116da830d049e0755a594d5d8f38dffc250cf69e";
+                "a5ecf2c7ec42611f7f6cdaf0980da6028f5881e23484b2bf001d75fb6f0525df";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 hackney_1_4_8 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 hackney_1_4_10 ];
 
             meta = {
               description = ''Yodlee API'';
@@ -43245,12 +50038,12 @@ let
           }
       ) {};
 
-    yodlee = yodlee_0_0_9;
+    yodlee = yodlee_0_1_4;
 
     yomel_0_5_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "yomel";
             version = "0.5.0";
             src = fetchHex {
@@ -43259,7 +50052,6 @@ let
               sha256 =
                 "737be278c9ae9ed40b24a45a461ea47b4979429e1d51b28961d43ee3a6426827";
             };
-            compilePorts = true;
 
             meta = {
               description = ''Decodes yaml into elixir terms'';
@@ -43295,6 +50087,30 @@ let
 
     ytx = ytx_0_0_5;
 
+    yubico_0_1_4 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "yubico";
+            version = "0.1.4";
+            src = fetchHex {
+              pkg = "yubico";
+              version = "0.1.4";
+              sha256 =
+                "0609f63f3b6141e56014b5247526448a41bf9f61431800891b8c219310f425ad";
+            };
+
+            meta = {
+              description = ''Client implementing the Yubico Validation
+                            Protocol Version 2.0.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/project-fifo/erlang-yubico";
+            };
+          }
+      ) {};
+
+    yubico = yubico_0_1_4;
+
     yuri_1_0_0 = callPackage
       (
         {  buildMix, fetchHex }:
@@ -43427,7 +50243,7 @@ let
 
     zencoder_1_0_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_4_0, httpotion_1_0_0 }:
+        {  buildMix, fetchHex, poison_1_4_0, httpotion_2_2_2 }:
           buildMix {
             name = "zencoder";
             version = "1.0.1";
@@ -43437,7 +50253,7 @@ let
               sha256 =
                 "b2220575aa2ee1da5101774c82e1d68f2e5f86d6cefd6f04811c882fc05473bc";
             };
-            beamDeps  = [ poison_1_4_0 httpotion_1_0_0 ];
+            beamDeps  = [ poison_1_4_0 httpotion_2_2_2 ];
 
             meta = {
               description = ''Elixir API wrapper for the Zencoder video
@@ -43450,9 +50266,33 @@ let
 
     zencoder = zencoder_1_0_1;
 
+    zigzag_0_0_1 = callPackage
+      (
+        {  buildMix, fetchHex }:
+          buildMix {
+            name = "zigzag";
+            version = "0.0.1";
+            src = fetchHex {
+              pkg = "zigzag";
+              version = "0.0.1";
+              sha256 =
+                "27a151e219cf0dcabda9977aad3fbae7b8c366c88a88846e830bc4364f31ed95";
+            };
+
+            meta = {
+              description = ''Zigzag is a fast and flexible parallel processing
+                            library for Elixir.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/utkarshkukreti/zigzag.ex";
+            };
+          }
+      ) {};
+
+    zigzag = zigzag_0_0_1;
+
     zipcloudx_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_1 }:
+        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
           buildMix {
             name = "zipcloudx";
             version = "0.0.2";
@@ -43462,7 +50302,7 @@ let
               sha256 =
                 "1e474ec0229b6dd1404c34fbd2a851d136d9549d5ecccbd01d017baac64b264e";
             };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_1 ];
+            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
 
             meta = {
               description = ''Elixir zipcloud API wrapper'';
@@ -43473,17 +50313,17 @@ let
 
     zipcloudx = zipcloudx_0_0_2;
 
-    zipper_0_1_5 = callPackage
+    zipper_0_2_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildErlangMk, fetchHex }:
+          buildErlangMk {
             name = "zipper";
-            version = "0.1.5";
+            version = "0.2.0";
             src = fetchHex {
               pkg = "zipper";
-              version = "0.1.5";
+              version = "0.2.0";
               sha256 =
-                "7df5552f41169a8feb1a2e81e2753ec4e4debb7d48cdf1edc77037205782d547";
+                "8f5a9271cebd535ff9bf9fd6829a36b3031d16c71b2ae6712e171f117520c023";
             };
 
             meta = {
@@ -43494,7 +50334,7 @@ let
           }
       ) {};
 
-    zipper = zipper_0_1_5;
+    zipper = zipper_0_2_0;
 
     zipper_tree_0_1_1 = callPackage
       (
@@ -43520,5 +50360,68 @@ let
 
     zipper_tree = zipper_tree_0_1_1;
 
+    zlist_1_0_1 = callPackage
+      (
+        {  buildRebar3, fetchHex }:
+          buildRebar3 {
+            name = "zlist";
+            version = "1.0.1";
+            src = fetchHex {
+              pkg = "zlist";
+              version = "1.0.1";
+              sha256 =
+                "d63b2ef3328f9b4b3ad827663db3d3b878311d08973c2abc202a66ad55c8a78c";
+            };
+
+            meta = {
+              description = ''Erlang lazy list library'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/egobrain/zlist";
+            };
+          }
+      ) {};
+
+    zlist = zlist_1_0_1;
+
+    zuppler_users_client_0_0_5 = callPackage
+      (
+        {
+          buildMix,
+          fetchHex,
+          poolboy_1_5_1,
+          phoenix_1_1_4,
+          oauth2_0_6_0,
+          lru_cache_0_1_0,
+          httpotion_2_2_2
+        }:
+          buildMix {
+            name = "zuppler_users_client";
+            version = "0.0.5";
+            src = fetchHex {
+              pkg = "zuppler_users_client";
+              version = "0.0.5";
+              sha256 =
+                "519d87847b792db04bf97b6c6d56b26724b65f83b0f5ee17b83e82c5fb371557";
+            };
+            beamDeps  = [
+                          poolboy_1_5_1
+                          phoenix_1_1_4
+                          oauth2_0_6_0
+                          lru_cache_0_1_0
+                          httpotion_2_2_2
+                        ];
+
+            meta = {
+              description = ''An Elixir OAuth 2.0 Client Library to protect
+                            Zuppler API'';
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/zuppler/zuppler-users-client-elixir.git";
+            };
+          }
+      ) {};
+
+    zuppler_users_client = zuppler_users_client_0_0_5;
+
   };
 in stdenv.lib.fix' (stdenv.lib.extends overrides packages)
\ No newline at end of file
diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index f71b557bc25..e45c6784e94 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils, curl, bash }:
+{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils, curl, bash,
+  debugInfo ? false }:
 
 stdenv.mkDerivation rec {
   name = "elixir-${version}";
@@ -16,6 +17,10 @@ stdenv.mkDerivation rec {
   LANG = "en_US.UTF-8";
   LC_TYPE = "en_US.UTF-8";
 
+  buildFlags = if debugInfo
+   then "ERL_COMPILER_OPTIONS=debug_info"
+   else "";
+
   preBuild = ''
     # The build process uses ./rebar. Link it to the nixpkgs rebar
     rm -v rebar

From 8d3d0a1ca97cae40bde9e0b92d9c6a99c233e38c Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Fri, 1 Apr 2016 08:34:28 -0700
Subject: [PATCH 163/712] relx-exe: init at 3.18.0

This adds an executable version of the relx library to the system.
---
 .../tools/erlang/relx-exe/default.nix         | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/erlang/relx-exe/default.nix

diff --git a/pkgs/development/tools/erlang/relx-exe/default.nix b/pkgs/development/tools/erlang/relx-exe/default.nix
new file mode 100644
index 00000000000..8b2bee8ad4f
--- /dev/null
+++ b/pkgs/development/tools/erlang/relx-exe/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, beamPackages, makeWrapper, fetchHex, erlang }:
+  beamPackages.buildRebar3 {
+    name = "relx-exe";
+    version = "3.18.0";
+    src = fetchHex {
+      pkg = "relx";
+      version = "3.18.0";
+      sha256 =
+        "e76e0446b8d1b113f2b7dcc713f032ccdf1dbda33d76edfeb19c2b6b686dcad7";
+    };
+
+    buildInputs = [ makeWrapper erlang ];
+
+    beamDeps  = with beamPackages; [
+      providers_1_6_0
+      getopt_0_8_2
+      erlware_commons_0_19_0
+      cf_0_2_1
+      bbmustache_1_0_4
+    ];
+
+    postBuild = ''
+      HOME=. rebar3 escriptize
+    '';
+
+    postInstall = ''
+      mkdir -p "$out/bin"
+      cp -r "_build/default/bin/relx" "$out/bin/relx"
+    '';
+
+    meta = {
+      description = "Executable command for Relx";
+      license = stdenv.lib.licenses.asl20;
+      homepage = "https://github.com/erlware/relx";
+      maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
+    };
+
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ec5d3f1323..02a1721ab17 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5319,7 +5319,9 @@ in
   hex2nix = beamPackages.callPackage ../development/tools/erlang/hex2nix { };
   cuter = callPackage ../development/tools/erlang/cuter { };
 
-  elixir = callPackage ../development/interpreters/elixir { };
+  relxExe = callPackage ../development/tools/erlang/relx-exe {};
+
+  elixir = callPackage ../development/interpreters/elixir { debugInfo = true; };
 
   groovy = callPackage ../development/interpreters/groovy { };
 

From 2d6d9682bb8a910f3eb5f0be8d5687c753e9732c Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Fri, 1 Apr 2016 13:13:02 -0700
Subject: [PATCH 164/712] elixir: set ERL_LIBS for elixir apps

Previously Elixir didn't correct set the ERL_LIBS environment
variable for the OTP Applications that it supplies. This
change fixes that
---
 pkgs/development/interpreters/elixir/default.nix   | 2 ++
 pkgs/development/interpreters/elixir/setup-hook.sh | 5 +++++
 2 files changed, 7 insertions(+)
 create mode 100644 pkgs/development/interpreters/elixir/setup-hook.sh

diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index e45c6784e94..b612033c8e5 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
   LANG = "en_US.UTF-8";
   LC_TYPE = "en_US.UTF-8";
 
+  setupHook = ./setup-hook.sh;
+
   buildFlags = if debugInfo
    then "ERL_COMPILER_OPTIONS=debug_info"
    else "";
diff --git a/pkgs/development/interpreters/elixir/setup-hook.sh b/pkgs/development/interpreters/elixir/setup-hook.sh
new file mode 100644
index 00000000000..2ed3b2e6454
--- /dev/null
+++ b/pkgs/development/interpreters/elixir/setup-hook.sh
@@ -0,0 +1,5 @@
+addErlLibPath() {
+    addToSearchPath ERL_LIBS $1/lib/elixir/lib
+}
+
+envHooks+=(addErlLibPath)

From 383626b9d7dd56618f0789eefee147a097ada4a4 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Fri, 15 Apr 2016 11:06:57 -0700
Subject: [PATCH 165/712] move rebar3-nix-bootstrap to rebar3

This moves rebar3-nix-bootstrap from its own repository to rebar3. Its a
single file and this vastly reduces the complexity of making changes.
---
 .../development/beam-modules/build-rebar3.nix |   2 +-
 .../tools/build-managers/rebar3/default.nix   |  10 +-
 .../rebar3/rebar3-nix-bootstrap               | 256 ++++++++++++++++++
 .../erlang/rebar3-nix-bootstrap/default.nix   |  24 --
 pkgs/top-level/all-packages.nix               |   1 -
 5 files changed, 264 insertions(+), 29 deletions(-)
 create mode 100755 pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
 delete mode 100644 pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix

diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix
index 2627ddf99a6..f13322519fd 100644
--- a/pkgs/development/beam-modules/build-rebar3.nix
+++ b/pkgs/development/beam-modules/build-rebar3.nix
@@ -48,7 +48,7 @@ let
 
     configurePhase = ''
       runHook preConfigure
-      rebar3-nix-bootstrap
+      ${erlang}/bin/escript ${rebar3.bootstrapper}
       runHook postConfigure
     '';
 
diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index 057ae59b144..2b5eee407a4 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -1,10 +1,12 @@
 { stdenv, writeText, callPackage, fetchurl,
-  fetchHex, erlang, hermeticRebar3 ? true, rebar3-nix-bootstrap,
+  fetchHex, erlang, hermeticRebar3 ? true,
   tree, fetchFromGitHub, hexRegistrySnapshot }:
 
 let
   version = "3.0.0-beta.4";
 
+  bootstrapper = ./rebar3-nix-bootstrap;
+
   # TODO: all these below probably should go into nixpkgs.erlangModules.sources.*
   # {erlware_commons,     "0.16.0"},
   erlware_commons = fetchHex {
@@ -83,16 +85,18 @@ stdenv.mkDerivation {
     sha256 = "0px66scjdia9aaa5z36qzxb848r56m0k98g0bxw065a2narsh4xy";
   };
 
+  inherit bootstrapper;
+
   patches = if hermeticRebar3 == true
   then  [ ./hermetic-bootstrap.patch ./hermetic-rebar3.patch ]
   else [];
 
   buildInputs = [ erlang tree  ];
-  propagatedBuildInputs = [ hexRegistrySnapshot rebar3-nix-bootstrap ];
+  propagatedBuildInputs = [ hexRegistrySnapshot ];
 
   postPatch = ''
     echo postPatch
-    rebar3-nix-bootstrap registry-only
+    ${erlang}/bin/escript ${bootstrapper} registry-only
     echo "$ERL_LIBS"
     mkdir -p _build/default/lib/
     mkdir -p _build/default/plugins
diff --git a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap b/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
new file mode 100755
index 00000000000..d75d69f054d
--- /dev/null
+++ b/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
@@ -0,0 +1,256 @@
+#!/usr/bin/env escript
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%%! -smp enable
+%%% ---------------------------------------------------------------------------
+%%% @doc
+%%% The purpose of this command is to prepare a rebar3 project so that
+%%% rebar3 understands that the dependencies are all already
+%%% installed. If you want a hygienic build on nix then you must run
+%%% this command before running rebar3. I suggest that you add a
+%%% `Makefile` to your project and have the bootstrap command be a
+%%% dependency of the build commands. See the nix documentation for
+%%% more information.
+%%%
+%%% This command designed to have as few dependencies as possible so
+%%% that it can be a dependency of root level packages like rebar3. To
+%%% that end it does many things in a fairly simplistic way. That is
+%%% by design.
+%%%
+%%% ### Assumptions
+%%%
+%%% This command makes the following assumptions:
+%%%
+%%% * It is run in a nix-shell or nix-build environment
+%%% * that all dependencies have been added to the ERL_LIBS
+%%%   Environment Variable
+
+-record(data, {version
+              , registry_only = false
+              , compile_ports
+              , erl_libs
+              , plugins
+              , root
+              , name
+              , registry_snapshot}).
+
+-define(HEX_REGISTRY_PATH, ".cache/rebar3/hex/default/registry").
+
+main(Args) ->
+    {ok, ArgData} = parse_args(Args),
+    {ok, RequiredData} = gather_required_data_from_the_environment(ArgData),
+    do(RequiredData).
+
+%% @doc
+%% This actually runs the command. There are two modes 'register_only'
+%% where the register is created from hex and everything else.
+-spec do(#data{}) -> ok.
+do(RequiredData = #data{registry_only = true}) ->
+    ok = bootstrap_registry(RequiredData);
+do(RequiredData) ->
+    ok = bootstrap_registry(RequiredData),
+    ok = bootstrap_configs(RequiredData),
+    ok = bootstrap_plugins(RequiredData),
+    ok = bootstrap_libs(RequiredData).
+
+%% @doc
+%% Argument parsing is super simple only because we want to keep the
+%% dependencies minimal. For now there can be two entries on the
+%% command line, "register-only" and "compile-ports"
+-spec parse_args([string()]) -> #data{}.
+parse_args(Args) ->
+    {ok, #data{registry_only = lists:member("registry-only", Args)}}.
+
+-spec bootstrap_configs(#data{}) -> ok.
+bootstrap_configs(RequiredData)->
+    io:format("Boostrapping app and rebar configurations~n"),
+    ok = if_single_app_project_update_app_src_version(RequiredData),
+    ok = if_compile_ports_add_pc_plugin(RequiredData).
+
+-spec bootstrap_plugins(#data{}) -> ok.
+bootstrap_plugins(#data{plugins = Plugins}) ->
+    io:format("Bootstrapping rebar3 plugins~n"),
+    Target = "_build/default/plugins/",
+    Paths = string:tokens(Plugins, " "),
+    CopiableFiles =
+        lists:foldl(fun(Path, Acc) ->
+                            gather_dependency(Path) ++ Acc
+                    end, [], Paths),
+    lists:foreach(fun (Path) ->
+                          link_app(Path, Target)
+                  end, CopiableFiles).
+
+-spec bootstrap_libs(#data{}) -> ok.
+bootstrap_libs(#data{erl_libs = ErlLibs}) ->
+    io:format("Bootstrapping dependent librariesXXXX~n"),
+    Target = "_build/default/lib/",
+    Paths = string:tokens(ErlLibs, ":"),
+    CopiableFiles =
+        lists:foldl(fun(Path, Acc) ->
+                            gather_directory_contents(Path) ++ Acc
+                    end, [], Paths),
+    lists:foreach(fun (Path) ->
+                          link_app(Path, Target)
+                  end, CopiableFiles).
+
+-spec gather_dependency(string()) -> [{string(), string()}].
+gather_dependency(Path) ->
+    FullLibrary = filename:join(Path, "lib/erlang/lib/"),
+    case filelib:is_dir(FullLibrary) of
+        true ->
+            gather_directory_contents(FullLibrary);
+        false ->
+            [raw_hex(Path)]
+    end.
+
+-spec raw_hex(string()) -> {string(), string()}.
+raw_hex(Path) ->
+    [_, Name] = re:split(Path, "-hex-source-"),
+    {Path, erlang:binary_to_list(Name)}.
+
+-spec gather_directory_contents(string()) -> [{string(), string()}].
+gather_directory_contents(Path) ->
+    {ok, Names} = file:list_dir(Path),
+    lists:map(fun(AppName) ->
+                 {filename:join(Path, AppName), fixup_app_name(AppName)}
+              end, Names).
+
+%% @doc
+%% Makes a symlink from the directory pointed at by Path to a
+%% directory of the same name in Target. So if we had a Path of
+%% {`foo/bar/baz/bash`, `baz`} and a Target of `faz/foo/foos`, the symlink
+%% would be `faz/foo/foos/baz`.
+-spec link_app({string(), string()}, string()) -> ok.
+link_app({Path, TargetFile}, TargetDir) ->
+    Target = filename:join(TargetDir, TargetFile),
+    make_symlink(Path, Target).
+
+-spec make_symlink(string(), string()) -> ok.
+make_symlink(Path, TargetFile) ->
+    file:delete(TargetFile),
+    ok = filelib:ensure_dir(TargetFile),
+    io:format("Making symlink from ~s to ~s~n", [Path, TargetFile]),
+    ok = file:make_symlink(Path, TargetFile).
+
+%% @doc
+%% This takes an app name in the standard OTP <name>-<version> format
+%% and returns just the app name. Why? because rebar is doesn't
+%% respect OTP conventions in some cases.
+-spec fixup_app_name(string()) -> string().
+fixup_app_name(FileName) ->
+    case string:tokens(FileName, "-") of
+        [Name] -> Name;
+        [Name, _Version] -> Name
+    end.
+
+-spec bootstrap_registry(#data{}) -> ok.
+bootstrap_registry(#data{registry_snapshot = RegistrySnapshot}) ->
+    io:format("Bootstrapping Hex Registry for Rebar~n"),
+    make_sure_registry_snapshot_exists(RegistrySnapshot),
+    filelib:ensure_dir(?HEX_REGISTRY_PATH),
+    ok = case filelib:is_file(?HEX_REGISTRY_PATH) of
+             true ->
+                 file:delete(?HEX_REGISTRY_PATH);
+             false ->
+                 ok
+         end,
+    ok = file:make_symlink(RegistrySnapshot,
+                           ?HEX_REGISTRY_PATH).
+
+-spec make_sure_registry_snapshot_exists(string()) -> ok.
+make_sure_registry_snapshot_exists(RegistrySnapshot) ->
+    case filelib:is_file(RegistrySnapshot) of
+        true ->
+            ok;
+        false ->
+            stderr("Registry snapshot (~s) does not exist!", [RegistrySnapshot]),
+            erlang:halt(1)
+    end.
+
+-spec gather_required_data_from_the_environment(#data{}) -> {ok, map()}.
+gather_required_data_from_the_environment(ArgData) ->
+    {ok, ArgData#data{ version = guard_env("version")
+                     , erl_libs = os:getenv("ERL_LIBS", [])
+                     , plugins = os:getenv("buildPlugins", [])
+                     , root = code:root_dir()
+                     , name = guard_env("name")
+                     , compile_ports = nix2bool(os:getenv("compilePorts", ""))
+                     , registry_snapshot = guard_env("HEX_REGISTRY_SNAPSHOT")}}.
+
+-spec nix2bool(any()) -> boolean().
+nix2bool("1") ->
+    true;
+nix2bool("") ->
+    false.
+
+-spec guard_env(string()) -> string().
+guard_env(Name) ->
+    case os:getenv(Name) of
+        false ->
+            stderr("Expected Environment variable ~s! Are you sure you are "
+                   "running in a Nix environment? Either a nix-build, "
+                   "nix-shell, etc?~n", [Name]),
+            erlang:halt(1);
+        Variable ->
+            Variable
+    end.
+
+%% @doc
+%% If the compile ports flag is set, rewrite the rebar config to
+%% include the 'pc' plugin.
+-spec if_compile_ports_add_pc_plugin(#data{}) -> ok.
+if_compile_ports_add_pc_plugin(#data{compile_ports = true}) ->
+    ConfigTerms = update_config(read_rebar_config()),
+    Text = lists:map(fun(Term) -> io_lib:format("~tp.~n", [Term]) end,
+                     ConfigTerms),
+    file:write_file("rebar.config", Text);
+if_compile_ports_add_pc_plugin(_) ->
+    ok.
+
+-spec update_config([term()]) -> [term()].
+update_config(Config) ->
+    case lists:keysearch(plugins, 1, Config) of
+        {ok, {plugins, PluginList}} ->
+            lists:keystore(plugins, 1, Config, {plugins, [Config | PluginList]});
+        _ ->
+            [{plugins, [pc]} | Config]
+    end.
+
+-spec read_rebar_config() -> [term()].
+read_rebar_config() ->
+    case file:consult("rebar.config") of
+        {ok, Terms} ->
+            Terms;
+        _ ->
+            stderr("Unable to read rebar config!", []),
+            erlang:halt(1)
+    end.
+
+
+-spec if_single_app_project_update_app_src_version(#data{}) -> ok.
+if_single_app_project_update_app_src_version(#data{name = Name,
+                                                   version = Version}) ->
+    case app_src_exists(Name) of
+        {true, SrcFile} ->
+            update_app_src_with_version(SrcFile, Version);
+        {false, _} ->
+            ok
+    end.
+
+-spec update_app_src_with_version(string(), string()) -> ok.
+update_app_src_with_version(SrcFile, Version) ->
+    {ok, [{application, Name, Details}]} = file:consult(SrcFile),
+    NewDetails = lists:keyreplace(vsn, 1, Details, {vsn, Version}),
+    file:write_file(SrcFile, io_lib:fwrite("~p.\n", [{application, Name, NewDetails}])).
+
+-spec app_src_exists(string()) -> boolean().
+app_src_exists(Name) ->
+    FileName = filename:join("src",
+                             lists:concat([Name, ".app.src"])),
+    {filelib:is_file(FileName), FileName}.
+
+
+%% @doc
+%% Write the result of the format string out to stderr.
+-spec stderr(string(), [term()]) -> ok.
+stderr(FormatStr, Args) ->
+    io:put_chars(standard_error, io_lib:format(FormatStr, Args)).
diff --git a/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix b/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix
deleted file mode 100644
index ed38d573abf..00000000000
--- a/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{stdenv, fetchFromGitHub, erlang }:
-
-stdenv.mkDerivation rec {
-    name = "rebar3-nix-bootstrap";
-    version = "0.0.3";
-
-    src = fetchFromGitHub {
-        owner = "erlang-nix";
-        repo = "rebar3-nix-bootstrap";
-        rev = "${version}";
-        sha256 = "01yyaz104jj3mxx8k10q3rwpn2rh13q1ja5r0iq37qyjmg8xflhq";
-    };
-
-    buildInputs = [ erlang ];
-
-    installFlags = "PREFIX=$(out)";
-
-    meta = {
-      description = "Shim command to help bootstrap a rebar3 project on Nix";
-      license = stdenv.lib.licenses.asl20;
-      homepage = "https://github.com/erlang-nix/rebar3-nix-bootstrap";
-      maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
-    };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02a1721ab17..3b0f9db8f16 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5311,7 +5311,6 @@ in
   rebar = callPackage ../development/tools/build-managers/rebar { };
   rebar3-open = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = false; };
   rebar3 = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = true; };
-  rebar3-nix-bootstrap = callPackage ../development/tools/erlang/rebar3-nix-bootstrap { };
   hexRegistrySnapshot = callPackage ../development/beam-modules/hex-registry-snapshot.nix { };
   fetchHex = callPackage ../development/beam-modules/fetch-hex.nix { };
 

From f36be6edbfc0bfa8f203db0175b489a4e7553301 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Fri, 15 Apr 2016 11:09:52 -0700
Subject: [PATCH 166/712] hex-packages: update to the latest version

hex2nix has changed to accomodate elixir and erlang.mk. This includes
those changes along with updates from hex itself.
---
 pkgs/development/beam-modules/default.nix     |     2 +-
 .../development/beam-modules/hex-packages.nix | 31290 +++-------------
 2 files changed, 5157 insertions(+), 26135 deletions(-)

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index fec600400cb..8a79a0b3e40 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -2,7 +2,7 @@
 
 let
   self = rec {
-    hexPackages = import ./hex-packages.nix { stdenv = stdenv; callPackage = self.callPackage; };
+    hexPackages = import ./hex-packages.nix { stdenv = stdenv; callPackage = self.callPackage; pkgs = pkgs; };
     callPackage = pkgs.lib.callPackageWith (pkgs // self // hexPackages);
     buildRebar3 = callPackage ./build-rebar3.nix {};
     buildHex = callPackage ./build-hex.nix {};
diff --git a/pkgs/development/beam-modules/hex-packages.nix b/pkgs/development/beam-modules/hex-packages.nix
index e7745ce6050..1fcbb6f3e51 100644
--- a/pkgs/development/beam-modules/hex-packages.nix
+++ b/pkgs/development/beam-modules/hex-packages.nix
@@ -2,16 +2,864 @@
 
 /* Unbuildable packages:
 
+ * active_0_9_0
+ * address_us_0_1_1
+ * aeacus_0_3_0
+ * airbrake_0_1_0
+ * airbrake_plug_0_1_1
+ * airbrakex_0_0_6
+ * airbrakify_0_0_1
+ * algolia_0_3_1
+ * alice_0_3_3
+ * alice_against_humanity_0_1_2
+ * alice_google_images_0_1_3
+ * alice_karma_0_1_1
+ * alice_shizzle_0_1_2
+ * alice_xkcd_0_0_3
+ * amazon_product_advertising_client_0_1_1
+ * amqp_0_1_1
+ * amqp_0_1_4
+ * amqp_client_3_5_6
+ * amrita_0_4_0
+ * anilixir_1_0_0
+ * anubis_0_1_0
+ * anubis_0_3_0
+ * apache_passwd_md5_1_0_0
+ * apostle_0_0_3
+ * arc_0_5_1
+ * arc_ecto_0_3_2
+ * asanaficator_0_0_1
+ * assembla_api_0_1_0
+ * atlas_0_2_0
+ * aws_0_0_10
+ * aws_erlang_0_1_1
+ * aws_http_0_2_4
+ * b2_0_0_6
+ * backoff_1_1_3
+ * balanced_3_1_0
+ * bamboo_0_3_2
+ * bamboo_0_4_0
+ * bamboo_sendgrid_0_1_0
+ * bandwidth_1_2_1
+ * barrel_jiffy_0_14_4
+ * barrel_jiffy_0_14_5
+ * basehangul_0_2_0
+ * basho_stats_1_0_3
+ * basic_auth_1_0_0
+ * battlenet_0_0_2
+ * bbsmq_0_0_4
+ * beaker_1_2_0
+ * benchwarmer_0_0_2
+ * bencoder_0_0_7
+ * bertex_1_2_0
+ * bgg_0_1_0
+ * big_query_0_0_2
+ * bing_translator_0_2_6
+ * bitbucket_api_0_0_2
+ * bitpay_0_2_5
+ * blackbook_0_3_1
+ * blaze_cloud_0_0_1
+ * block_timer_0_0_1
+ * blockchain_info_0_0_1
+ * bloodhound_0_1_1
+ * bno055_0_0_1
+ * booter_0_1_0
+ * botan_0_1_2
+ * bottler_0_5_0
+ * bouncer_0_1_5
+ * brady_0_0_2
+ * braintree_0_3_2
+ * bson_0_4_4
+ * bugsnag_1_2_0
+ * bugsnag_erl_0_1_3
+ * bump_0_1_0
+ * bureaucrat_0_1_2
+ * butler_0_7_0
+ * butler_0_7_1
+ * butler_cage_0_0_2
+ * butler_cowsay_0_2_1
+ * butler_new_0_4_3
+ * butler_tableflip_0_0_3
+ * cache_tab_1_0_2
+ * calecto_0_5_2
+ * canada_1_0_0
+ * canary_0_14_1
+ * carrier_1_0_4
+ * cassette_1_0_0
+ * cassette_plug_1_0_1
+ * cassius_0_0_1
+ * cauldron_0_1_5
+ * caylir_0_2_0
+ * ccc_0_0_2
+ * cep_0_0_1
+ * cesso_0_1_3
+ * cet_0_2_3
+ * chaos_spawn_0_7_0
+ * charlotte_0_4_0
+ * charm_0_0_1
+ * chatter_0_0_14
+ * chinese_translation_0_1_0
+ * cipher_1_0_0
+ * cldr_0_0_1
+ * cleverbot_0_0_1
+ * clicksign_0_0_2
+ * cloak_0_2_0
+ * cloudex_0_0_2
+ * cloudi_core_1_5_1
+ * cloudi_service_api_requests_1_5_1
+ * cloudi_service_db_1_5_1
+ * cloudi_service_db_cassandra_1_3_3
+ * cloudi_service_db_cassandra_cql_1_5_1
+ * cloudi_service_db_couchdb_1_5_1
+ * cloudi_service_db_elasticsearch_1_3_3
+ * cloudi_service_db_http_elli_1_5_1
+ * cloudi_service_db_memcached_1_5_1
+ * cloudi_service_db_mysql_1_5_1
+ * cloudi_service_db_pgsql_1_5_1
+ * cloudi_service_db_riak_1_3_3
+ * cloudi_service_db_tokyotyrant_1_5_0
+ * cloudi_service_filesystem_1_5_1
+ * cloudi_service_http_client_1_5_1
+ * cloudi_service_http_cowboy_1_5_1
+ * cloudi_service_http_rest_1_5_1
+ * cloudi_service_map_reduce_1_5_1
+ * cloudi_service_monitoring_1_5_1
+ * cloudi_service_queue_1_5_1
+ * cloudi_service_quorum_1_5_1
+ * cloudi_service_router_1_5_1
+ * cloudi_service_tcp_1_5_1
+ * cloudi_service_timers_1_5_1
+ * cloudi_service_udp_1_5_1
+ * cloudi_service_validate_1_5_1
+ * cloudi_service_zeromq_1_5_1
+ * cloudinary_0_0_2
+ * cloudinaryex_0_0_2
+ * clox_0_1_3
+ * cmark_0_6_8
+ * coinbase_0_0_1
+ * coincap_io_0_0_1
+ * comeonin_1_6_0
+ * comeonin_2_0_3
+ * comeonin_2_1_1
+ * comeonin_2_3_0
+ * comeonin_ecto_password_0_0_3
+ * commerce_billing_0_0_2
+ * comredis_1_0_0
+ * conferl_0_0_1
+ * conform_0_10_5
+ * conform_0_11_0
+ * console_0_0_1
+ * consul_1_0_3
+ * core_0_14_1
+ * core_data_0_1_0
+ * couchbeam_1_3_0
+ * couchdb_client_0_2_5
+ * couchdb_connector_0_2_0
+ * countries_1_1_2
+ * courier_web_0_0_8
+ * coverex_1_4_8
+ * cowboy_oauth_0_2_14
+ * cpg_1_5_1
+ * craterl_0_2_3
+ * crc_0_4_0
+ * crudex_0_0_2
+ * crypto_ext_0_1_3
+ * cure_0_4_1
+ * current_streak_ex_0_1_1
+ * currently_0_0_3
+ * datomex_0_0_5
+ * datomic_gen_server_2_0_1
+ * db_0_9_0
+ * dbschema_0_2_0
+ * dbus_0_5_0
+ * ddb_client_0_1_17
+ * dealer_0_8_0
+ * decimal_0_2_5
+ * denrei_0_2_3
+ * descriptive_statistics_0_0_1
+ * deviant_elixir_0_0_4
+ * dexts_0_2_1
+ * di_0_1_0
+ * dialyze_0_1_4
+ * diane_0_0_1
+ * dicer_0_8_0
+ * dicks_0_1_0
+ * digoc_0_3_3
+ * diplomat_0_0_1
+ * discount_0_7_0
+ * discovery_0_5_7
+ * distance_api_matrix_2_0_0
+ * dns_0_0_3
+ * dnsimple_0_0_1
+ * docker_0_3_0
+ * dotenv_0_0_4
+ * dotenv_elixir_0_0_2
+ * dovetail_0_0_3
+ * dpd_client_0_0_6
+ * dproto_0_1_12
+ * dqe_0_1_33
+ * dropbox_0_0_7
+ * dublin_bus_api_0_1_6
+ * e_quip_0_0_1
+ * ecc_0_1_3
+ * echonest_ex_0_0_2
+ * ecto_0_2_4
+ * ecto_0_2_7
+ * ecto_0_5_1
+ * ecto_2_0_0_beta_2
+ * ecto_enum_0_3_0
+ * ecto_fixtures_0_0_2
+ * ecto_hstore_0_0_1
+ * ecto_it_0_2_0
+ * ecto_lazy_float_0_1_2
+ * ecto_ldap_0_2_4
+ * ecto_migrate_0_6_3
+ * ecto_ordered_0_0_2
+ * ecto_validation_case_0_1_1
+ * ectoo_0_0_4
+ * ectophile_0_3_0
+ * eden_0_1_3
+ * edgarex_0_0_2
+ * edown_0_7_0
+ * efrisby_0_2_0
+ * ejabberd_16_2_0
+ * ekstat_0_2_2
+ * elastex_0_1_2
+ * elastix_0_1_0
+ * elaxtic_0_0_1
+ * eleveldb_2_1_3
+ * elibphonenumber_0_1_1
+ * elistrix_0_0_5
+ * elixilorem_0_0_1
+ * elixir_ale_0_4_1
+ * elixir_ipfs_api_0_1_0
+ * elixir_locker_0_1_4
+ * elixir_nsq_1_0_3
+ * elixir_talk_1_0_1
+ * elixtagram_0_2_5
+ * elmit_0_0_1
+ * email_checker_0_0_3
+ * enotify_0_1_0
+ * ensq_0_1_6
+ * env_conf_0_3_0
+ * epgpool_1_0_0
+ * eplugin_0_1_4
+ * epubnub_0_1_0
+ * eredis_cluster_0_5_4
+ * erlang_dbus_0_2_0
+ * erlang_lua_0_1_0
+ * erlastic_search_1_1_1
+ * erlcloud_0_9_2
+ * erldn_1_0_5
+ * erlexec_1_1_1
+ * erltrace_0_1_4
+ * erlzk_0_6_1
+ * erocksdb_0_4_1
+ * erwatch_0_3_0
+ * es_0_0_1
+ * escalus_2_6_4
+ * esip_1_0_2
+ * espec_0_8_16
+ * espec_phoenix_0_2_0
+ * esqlite_0_2_2
+ * etcd_0_0_2
+ * etherchain_org_0_0_3
+ * euler_0_0_1
+ * event_source_encoder_0_0_3
+ * eventstore_client_0_1_4
+ * everex_0_1_1
+ * everyoneapi_0_0_1
+ * ex_aerospike_0_0_1
+ * ex_aws_0_4_18
+ * ex_bitcask_0_1_0
+ * ex_chimp_0_0_1
+ * ex_closeio_0_0_12
+ * ex_cloudinary_0_1_2
+ * ex_conf_0_1_2
+ * ex_conf_0_1_3
+ * ex_crypto_0_0_1
+ * ex_dockerapi_0_0_1
+ * ex_edn_0_1_2
+ * ex_iss_1_0_0
+ * ex_omegle_0_1_1
+ * ex_orient_1_1_1
+ * ex_parsec_0_2_1
+ * ex_unit_emacs_0_1_2
+ * exalice_0_0_5_alpha
+ * exauth_0_0_1
+ * excheck_0_3_3
+ * excountries_0_0_3
+ * excoveralls_0_5_1
+ * exddb_0_1_3
+ * exdesk_0_2_0
+ * exdjango_0_3_1
+ * exdn_2_1_2
+ * exdweet_0_0_1
+ * exeque_0_1_0
+ * exfavicon_0_3_2
+ * exfile_0_1_5
+ * exfile_0_2_0
+ * exfile_b2_0_1_3
+ * exfile_imagemagick_0_1_1
+ * exfile_memory_0_1_0
+ * exfoaas_0_0_2
+ * exgenius_0_0_5
+ * exgpg_0_0_3
+ * exgrid_0_3_0
+ * exhal_4_2_1
+ * exintercom_0_1_6
+ * exjira_0_0_1
+ * exjprop_0_0_5
+ * exkad_0_0_2
+ * exkismet_0_0_2
+ * exometer_core_1_0_0
+ * exos_1_0_0
+ * exparticle_0_0_2
+ * expcap_0_1_0
+ * exprotobuf_0_10_2
+ * exprotobuf_0_13_0
+ * exprotobuf_1_0_0
+ * exrabbit_0_0_2
+ * exrecaptcha_0_0_3
+ * exrm_0_14_17
+ * exrm_0_14_2
+ * exrm_0_18_8
+ * exrm_rpm_0_3_0
+ * exseed_0_0_3
+ * exsentry_0_3_0
+ * exsyslog_1_0_1
+ * extreme_0_5_0
+ * extripe_0_3_2
+ * exts_0_2_2
+ * exurban_0_0_1
+ * exvcr_0_3_9
+ * exvcr_0_7_2
+ * exyelp_0_0_2
+ * ezlib_1_0_1
+ * ezmq_0_2_0
+ * facebook_0_4_2
+ * fast_tls_1_0_1
+ * fast_xml_1_1_11
+ * fast_yaml_1_0_3
+ * favicon_0_0_7
+ * feedistiller_2_0_2
+ * feedlex_0_0_1
+ * feedme_0_0_1
+ * fifo_db_0_2_1
+ * fifo_dt_0_1_66
+ * fifo_dt_0_1_68
+ * fifo_spec_0_1_27
+ * fifo_utils_0_1_20
+ * fifo_utils_0_1_22
+ * figaro_0_1_0
+ * filepreviews_1_0_1
+ * filtrex_0_1_0
+ * finch_0_0_3
+ * fireworks_0_5_1
+ * fitbit_0_0_1
+ * fitex_0_0_1
+ * fleet_api_0_0_15
+ * floki_0_1_1
+ * floki_0_7_2
+ * flower_power_0_3_2
+ * fluent_client_0_1_0
+ * folsom_ddb_0_1_22
+ * font_awesome_phoenix_0_3_2
+ * forcex_0_2_0
+ * forecast_io_0_2_1
+ * form_data_0_1_1
+ * fox_0_1_12
+ * fqc_0_1_7
+ * frank_0_0_3
+ * freegeoip_0_0_4
+ * fulcrum_0_0_6
+ * funnel_0_4_1
+ * gateway_0_0_6
+ * gcm_1_2_0
+ * gcmex_0_0_1
+ * gen_rpc_1_0_2
+ * geo_1_0_1
+ * geocoder_0_4_0
+ * gil_0_0_3
+ * gimei_0_0_2
+ * gimei_ex_1_0_0
+ * github_oauth_0_1_1
+ * github_trend_ex_0_1_2
+ * gizoogle_0_0_2
+ * gmail_0_1_8
+ * gold_0_12_0
+ * google_sheets_2_0_5
+ * goth_0_0_3
+ * gpb_3_18_10
+ * gpb_3_18_8
+ * gpb_3_20_0
+ * graphql_parser_0_0_3
+ * graphql_relay_0_0_16
+ * group_manager_0_0_8
+ * guardian_0_10_1
+ * guardian_0_9_1
+ * guardian_db_0_4_0
+ * guri_0_2_1
+ * gutenex_0_1_0
+ * hackney_1_1_0
+ * hackney_1_3_1
+ * hackney_1_3_2
+ * hackney_1_4_10
+ * hackney_1_4_4
+ * hackney_1_4_8
+ * hackney_1_5_7
+ * hackney_1_6_0
+ * hamcrest_0_1_1
+ * harvest_0_0_3
+ * hash_ring_ex_1_1_2
+ * hdr_histogram_0_2_0
+ * hedwig_hipchat_0_9_4
+ * hedwig_irc_0_1_1
+ * hedwig_xmpp_1_0_0_rc2
+ * hello_0_0_0
+ * hello_world_0_0_0
+ * hello_world_header_0_0_1
+ * hex_searcher_1_0_0
+ * hexoku_0_1_0
+ * hmc5883l_0_5_0
+ * honeybadger_0_4_0
+ * honeydew_0_0_8
+ * hound_0_8_2
+ * hr_0_2_2
+ * hstore_0_0_2
+ * html_sanitize_ex_0_1_2
+ * html_sanitize_ex_0_3_1
+ * htpasswd_1_0_2
+ * http_0_0_1
+ * http_proxy_1_0_1
+ * httpehaviour_0_9_0
+ * httpoison_0_7_1
+ * httpoison_0_7_5
+ * httpoison_0_8_0
+ * httpoison_0_8_2
+ * httprot_0_1_7
+ * huex_0_5_0
+ * hydra_0_0_1
+ * hypermock_0_0_2
+ * iconv_1_0_0
+ * ielixir_0_9_5
+ * ifttt_oauth_0_0_1
+ * inaka_aleppo_0_9_9
+ * inaka_mixer_0_1_5
+ * inch_ex_0_5_1
+ * inch_test_0_0_1
+ * inquisitor_0_1_0
+ * insight_0_1_3
+ * instream_0_10_0
+ * intellij_elixir_0_1_2
+ * iona_0_2_1
+ * isbndbex_0_0_1
+ * isn_1_0_0
+ * ja_serializer_0_8_1
+ * janrain_0_0_1
+ * japanese_holiday_0_0_2
+ * jazz_0_1_2
+ * jazz_0_2_1
+ * jc_1_0_4
+ * jira_0_0_8
+ * joken_1_1_0
+ * jsxn_0_2_1
+ * kane_0_0_5
+ * katipo_0_3_2
+ * keccakf1600_2_0_0
+ * keelless_0_1_0
+ * kerosene_0_0_1
+ * kindred_0_0_1
+ * kovacs_0_9_2
+ * kubex_0_1_1
+ * kvs_2_1_0
+ * lager_2_1_1
+ * lager_watchdog_0_1_10
+ * lasp_0_0_5
+ * lazymaru_0_2_5
+ * ledx_0_0_1
+ * libchunter_0_1_46
+ * libdecaf_0_0_2
+ * libex_config_0_2_0
+ * libhowl_0_1_34
+ * libleofs_0_1_2
+ * libsnarl_0_3_40
+ * libsnarl_0_3_44
+ * libsniffle_0_3_45
+ * libsodium_0_0_4
+ * link_shrinkex_1_0_0
+ * locker_1_0_8
+ * logger_json_file_backend_0_1_2
+ * logger_logentries_backend_0_0_1
+ * logger_loggly_backend_0_2_0
+ * lyn_0_0_16
+ * m2x_2_0_0
+ * m2x_erlang_1_3_1
+ * mad_0_9_0
+ * mailchimp_0_0_5
+ * mailgun_webhook_auth_1_0_0
+ * mailibex_0_1_0
+ * mandrill_0_4_1
+ * mandrillex_0_2_0
+ * markit_0_1_2
+ * markit_skill_0_0_2
+ * maru_0_9_5
+ * maru_swagger_0_7_3
+ * marvel_1_0_0
+ * marvin_0_3_0
+ * mcrypt_0_1_0
+ * mdns_client_0_1_7
+ * mdns_client_lib_0_1_33
+ * mdns_client_lib_0_1_38
+ * meck_0_8_4
+ * medex_0_1_2
+ * message_pack_0_2_0
+ * microformats2_0_0_5
+ * mixpanel_api_ex_0_8_3
+ * mixpanel_data_client_0_0_2
+ * mixstar_0_0_1
+ * mmath_0_1_15
+ * mmath_0_1_16
+ * mobiledoc_0_0_1
+ * mochiweb_2_12_2
+ * mock_0_1_3
+ * moebius_1_0_8
+ * mondo_0_1_0
+ * mongo_0_5_4
+ * motor_hat_0_6_1
+ * mstore_0_1_9
+ * mt940_0_4_0
+ * murdoch_0_0_1
+ * mustachex_0_0_1
+ * mynumber_1_0_0
+ * nacl_0_3_0
+ * nadia_0_4_0
+ * naughtygram_0_2_0
+ * neo4j_0_3_0
+ * neo4j_sips_0_1_25
+ * neo4j_sips_models_0_1_1
+ * neotomex_0_1_4
+ * nerves_io_neopixel_0_2_0
+ * nice_nickname_0_0_1
+ * nifty_0_0_3
+ * ninjaproxies_0_2_0
+ * nio_google_authenticator_1_0_1
+ * nio_google_geocoder_0_7_0
+ * njord_0_1_1
+ * nodefinder_1_5_1
+ * normalixr_0_3_0
+ * oauth2_0_3_0
+ * oauth2_0_6_0
+ * oauth2cli_0_0_4
+ * oauth2ex_0_0_9
+ * obelisk_0_10_0
+ * observer_cli_1_0_3
+ * octokit_0_1_0
+ * okta_0_0_1
+ * omise_0_1_4
+ * one_signal_0_0_6
+ * opbeat_0_3_0
+ * open_graphx_0_0_2
+ * openmaize_0_17_2
+ * openstack_0_0_4
+ * overpass_0_1_1
+ * oxr_0_3_1
+ * p1_mysql_1_0_1
+ * p1_pgsql_1_1_0
+ * p1_stringprep_1_0_1
+ * p1_utils_1_0_3
+ * p1_xml_1_1_1
+ * p1_xmlrpc_1_15_1
+ * pagexduty_0_1_0
+ * params_2_0_0_beta_0
+ * parse_client_0_2_3
+ * parse_trans_2_9_0
+ * parsex_0_0_2
+ * passport_0_0_4
+ * pavlov_0_2_3
+ * peatio_client_1_5_0
+ * pet_0_1_1
+ * pgpool_1_0_0
+ * phoenix_0_2_11
+ * phoenix_0_4_1
+ * phoenix_1_1_4
+ * phoenix_calendar_0_1_2
+ * phoenix_dtl_0_0_1
+ * phoenix_ecto_3_0_0_beta_2
+ * phoenix_ember_0_0_1
+ * phoenix_gen_gulp_jspm_1_0_0
+ * phoenix_haml_0_2_0
+ * phoenix_html_2_0_0_dev
+ * phoenix_html_2_5_1
+ * phoenix_html_sanitizer_0_2_0
+ * phoenix_html_simplified_helpers_0_3_2
+ * phoenix_linguist_0_0_1
+ * phoenix_live_reload_1_0_3
+ * phoenix_pubsub_rabbitmq_0_0_1
+ * phoenix_pubsub_redis_2_0_0
+ * phoenix_simple_form_0_0_2
+ * phoenix_slim_0_4_1
+ * phoenix_slime_0_5_1
+ * phoenix_swoosh_0_1_0
+ * phoenix_timex_0_0_3
+ * phoenix_token_auth_0_4_0
+ * picosat_0_1_0
+ * pigeon_0_4_1
+ * pin_elixir_0_0_1
+ * pinglix_1_1_1
+ * pipette_0_0_4
+ * pixie_0_3_3
+ * placid_0_1_3
+ * plasm_0_1_0
+ * plug_0_5_1
+ * plug_0_5_2
+ * plug_0_5_3
+ * plug_0_7_0
+ * plug_abort_2_1_1
+ * plug_accesslog_0_11_0
+ * plug_auth_0_3_0
+ * plug_basic_auth_1_1_0
+ * plug_byte_serve_0_3_2
+ * plug_cors_0_8_2
+ * plug_exception_handler_0_0_4
+ * plug_graphql_0_2_0
+ * plug_json_parser_0_0_6
+ * plug_jwt_0_7_1
+ * plug_secure_headers_0_0_1
+ * plugsnag_1_1_0
+ * pocketex_0_1_0
+ * poison_1_0_3
+ * poison_1_1_1
+ * poison_1_2_1
+ * poloniex_0_0_3
+ * pool_0_0_2
+ * poolboy_1_2_1
+ * pooler_1_4_0
+ * pooler_1_5_0
+ * portal_0_0_1
+ * porterstemmer_0_0_1
+ * portmidi_3_2_0
+ * postgrex_0_6_0
+ * proper_1_1_1_beta
+ * protobuffs_0_8_2
+ * proxy_0_0_1
+ * pubnub_ex_0_0_2
+ * pulse_0_1_3
+ * pulse_libs_1_0_0
+ * pusher_0_1_3
+ * pushex_0_0_2
+ * qiita_ex_0_0_2
+ * qiniu_0_2_2
+ * quinn_0_0_4
+ * rackla_1_0_0
+ * radpath_0_0_5
+ * random_0_2_2
+ * rapidax_0_0_3
+ * raven_0_0_5
+ * raygun_0_2_0
+ * reactive_0_0_1
+ * reagent_0_1_5
+ * reaxt_0_3_2
+ * rebar3_abnfc_plugin_0_1_0
+ * rebar3_auto_0_3_0
+ * rebar3_autotest_0_1_1
+ * rebar3_eqc_0_0_10
+ * rebar3_exunit_0_1_1
+ * rebar3_gpb_plugin_1_3_0
+ * rebar3_live_0_1_3
+ * rebar3_proper_0_6_0
+ * rebar3_proper_plugin_0_1_0
+ * rebar3_protobuffs_0_2_0
+ * rebar3_run_0_2_0
+ * rebar3_yang_plugin_0_2_1
+ * rebar_protobuffs_0_1_0
+ * recaptcha_1_1_1
+ * recon_ex_0_9_0
+ * record_translator_0_0_3
+ * reddhl_0_0_1
+ * redtube_1_0_0
+ * relax_0_3_0
+ * relisa_0_1_0
+ * rendezvous_0_0_1
+ * reporter_0_4_1
+ * rest_client_0_0_1
+ * rethinkdb_0_4_0
+ * rethinkdb_changefeed_0_0_1
+ * reverse_proxy_0_1_0
+ * riak_1_0_0
+ * riak_core_ng_2_2_3
+ * riak_ensemble_2_1_3
+ * riak_pb_2_1_0
+ * riakc_2_1_1
+ * riboflavin_0_0_2
+ * riemann_0_0_14
+ * robotex_0_0_1
+ * rogger_0_1_0
+ * rollbax_0_5_4
+ * roombex_0_0_4
+ * rss_0_2_1
+ * rulex_0_2_0
+ * saltie_0_3_2
+ * sass_elixir_0_0_1
+ * savory_0_0_2
+ * scrape_1_0_4
+ * scrivener_1_1_2
+ * scrivener_headers_1_0_1
+ * scrivener_html_1_0_9
+ * sec_company_filings_rss_feed_parser_0_0_2
+ * sec_recent_filings_rss_feed_parser_0_0_3
+ * secure_headers_0_0_1
+ * secure_password_0_4_0
+ * select_0_0_1
+ * sendgrid_0_0_2
+ * sentinel_0_1_0
+ * sentry_0_3_2
+ * sequences_1_1_0
+ * serial_0_1_2
+ * service_1_5_1
+ * simple_format_0_1_0
+ * simplify_0_2_0
+ * siphash_3_0_0
+ * sips_downloader_0_2_2
+ * skroutz_0_1_0
+ * slack_0_3_0
+ * slack_0_4_2
+ * slack_logger_backend_0_1_3
+ * slack_webhook_0_0_2
+ * slacker_0_0_2
+ * slackex_0_0_1
+ * slp_0_0_2
+ * smex_0_0_1
+ * snappy_1_1_1
+ * snowflake_client_0_1_1
+ * socket_0_2_8
+ * socket_0_3_1
+ * sonic_0_1_3
+ * spaced_repetitions_0_0_1
+ * spawndir_0_1_1
+ * spirit_0_0_1
+ * spotify_ex_0_0_4
+ * spreedly_0_1_1
+ * sql_dust_0_3_2
+ * sqlite3_1_1_5
+ * sqlite_ecto_0_5_0
+ * sqlite_ecto_1_1_0
+ * sqlitex_0_8_3
+ * sqlitex_1_0_0
+ * ssdb_0_3_0
+ * ssdb_elixir_0_2_2
+ * sshex_1_1_0
+ * ssl_verify_fun_1_1_0
+ * ssl_verify_hostname_1_0_5
+ * ssl_verify_hostname_1_0_6
+ * statistics_0_4_0
+ * steamex_0_0_5
+ * stmd_0_0_2
+ * stockastic_0_0_2
+ * stockfighter_0_0_1
+ * strava_0_0_1
+ * stringprep_1_0_3
+ * stripe_0_0_1
+ * stripex_0_1_0
+ * stripity_stripe_1_4_0
+ * structurez_0_0_1
+ * stun_1_0_1
+ * sugar_0_4_10
+ * supermemo_1_0_0
+ * supervisord_0_1_0
+ * swaggerdoc_0_0_1
+ * swapi_1_0_0
+ * sweet_xml_0_4_0
+ * swoosh_0_1_0
+ * syslog_1_0_2
+ * tagplay_0_1_0
+ * tanegashima_0_0_9
+ * tanuki_0_2_0
+ * tds_ecto_1_0_2
+ * telebot_0_1_2
+ * templates_0_0_5
+ * tentabucket_0_0_1
+ * tentacat_0_4_0
+ * theriac_0_0_1
+ * thesis_0_0_8
+ * timex_0_12_9
+ * timex_0_13_5
+ * timex_0_16_2
+ * timex_0_19_5
+ * timex_ecto_1_0_4
+ * tmdb_0_0_6
+ * togglex_0_2_0
+ * tomlex_0_0_4
+ * tracker_request_0_0_4
+ * tractor_0_1_0
+ * traitify_elixir_0_1_1
+ * travis_ex_0_0_2
+ * tributary_0_0_2
+ * tubex_0_0_7
+ * tuco_tuco_0_8_1
+ * twittertex_0_1_0
+ * twittex_0_0_4
+ * typeformx_0_0_1
+ * tzdata_0_5_7
+ * u2f_0_1_3
+ * ucol_2_0_0
+ * ucol_nif_1_1_5
+ * ueberauth_facebook_0_3_2
+ * ueberauth_fitbit_0_2_1
+ * ueberauth_github_0_2_0
+ * ueberauth_google_0_2_0
+ * ueberauth_slack_0_2_0
+ * ueberauth_twitter_0_2_2
+ * unsplash_0_3_0
+ * untappd_0_0_1
+ * upyun_0_0_1
+ * uri_template_1_2_0
+ * url_unroller_0_0_3
+ * urna_0_1_4
+ * uuid_erl_1_5_1
+ * valid_field_0_3_0
+ * velkoz_0_0_1
+ * verk_web_0_9_4
+ * viktor_0_0_9
+ * vimeo_0_0_2
+ * virus_total_0_0_1
+ * wallaby_0_1_0
+ * wayback_archiver_0_0_1
+ * webdriver_0_8_1
+ * weber_0_1_0
+ * webmentions_0_0_5
+ * webpay_0_0_4
+ * weebo_0_1_2
+ * wifi_0_2_0
+ * wire_0_2_0
+ * wizardry_0_0_1
+ * wpa_supplicant_0_1_0
+ * wykop_api_0_0_4
+ * xe_0_0_1
+ * xfighter_0_2_1
+ * xkcd_0_0_1
+ * xoauth2_0_0_3
+ * yahoo_fx_0_2_0
+ * yar_0_1_0
+ * yggdrasil_1_1_1
+ * yocingo_0_0_2
+ * yodlee_0_1_4
+ * yomel_0_5_0
+ * ytx_0_0_5
+ * zanox_0_0_1
+ * zencoder_1_0_1
+ * zipcloudx_0_0_2
+ * zuppler_users_client_0_0_5
 
 */
-{ stdenv, callPackage, overrides ? (self: super: {}) }:
+{ stdenv, pkgs, callPackage, overrides ? (self: super: {}) }:
 
 let
   packages = self: rec {
     abnf_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "abnf";
             version = "0.0.1";
             src = fetchHex {
@@ -26,15 +874,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/vanstee/abnf";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     abnf = abnf_0_0_1;
 
     absinthe_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "absinthe";
             version = "1.0.0";
             src = fetchHex {
@@ -49,13 +897,13 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/CargoSense/absinthe";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     absinthe_1_1_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "absinthe";
             version = "1.1.2";
             src = fetchHex {
@@ -70,15 +918,21 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/CargoSense/absinthe";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     absinthe = absinthe_1_1_2;
 
     absinthe_plug_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3, absinthe_1_0_0 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_3,
+          absinthe_1_0_0
+        }:
+          buildMix ({
             name = "absinthe_plug";
             version = "1.0.0";
             src = fetchHex {
@@ -95,15 +949,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/CargoSense/absinthe_plug";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     absinthe_plug = absinthe_plug_1_0_0;
 
     absinthe_relay_0_8_0 = callPackage
       (
-        {  buildMix, fetchHex, absinthe_1_1_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, absinthe_1_1_2 }:
+          buildMix ({
             name = "absinthe_relay";
             version = "0.8.0";
             src = fetchHex {
@@ -119,15 +973,21 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/absinthe-graphql/absinthe_relay";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     absinthe_relay = absinthe_relay_0_8_0;
 
     access_token_extractor_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_3,
+          cowboy_1_0_4
+        }:
+          buildMix ({
             name = "access_token_extractor";
             version = "0.1.1";
             src = fetchHex {
@@ -146,38 +1006,15 @@ let
               homepage =
                 "https://github.com/rohanpujaris/access_token_extractor";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     access_token_extractor = access_token_extractor_0_1_1;
 
-    active_0_9_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "active";
-            version = "0.9.0";
-            src = fetchHex {
-              pkg = "active";
-              version = "0.9.0";
-              sha256 =
-                "3ec6a0eda29137866674ddd56d44f6b0383fa3ec4480121639d2ef61b443ec28";
-            };
-
-            meta = {
-              description = ''Erlang active reloader'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/synrc/active";
-            };
-          }
-      ) {};
-
-    active = active_0_9_0;
-
     adam7_0_4_0 = callPackage
       (
-        {  buildMix, fetchHex, apex_0_3_7 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, apex_0_3_7 }:
+          buildMix ({
             name = "adam7";
             version = "0.4.0";
             src = fetchHex {
@@ -195,15 +1032,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/SenecaSystems/imagineer";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     adam7 = adam7_0_4_0;
 
     adap_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "adap";
             version = "0.0.1";
             src = fetchHex {
@@ -220,107 +1057,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "http://github.com/awetzel/adap";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     adap = adap_0_0_1;
 
-    addict_0_1_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          phoenix_1_1_4,
-          mailgun_0_0_2,
-          ecto_0_16_0,
-          cowboy_1_0_4,
-          comeonin_1_6_0
-        }:
-          buildMix {
-            name = "addict";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "addict";
-              version = "0.1.0";
-              sha256 =
-                "8d8ca253ee73bae88c1eb756992fe4435aa4e7b58eddcd102097b13dc4af611a";
-            };
-            beamDeps  = [
-                          phoenix_1_1_4
-                          mailgun_0_0_2
-                          ecto_0_16_0
-                          cowboy_1_0_4
-                          comeonin_1_6_0
-                        ];
-
-            meta = {
-              longDescription = ''Addict allows you to manage users on your
-                                Phoenix app easily. Register, login, logout,
-                                recover password and password updating is
-                                available off-the-shelf.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/trenpixster/addict";
-            };
-          }
-      ) {};
-
-    addict = addict_0_1_0;
-
-    address_us_0_1_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "address_us";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "address_us";
-              version = "0.1.1";
-              sha256 =
-                "e29c6dd33d2a2ebd97441bfdac3eb23fa6221cf5d3be8b8c66247ee61ce442c6";
-            };
-
-            meta = {
-              description = ''Library for parsing US Addresses into their
-                            individual parts.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/smashedtoatoms/address_us";
-            };
-          }
-      ) {};
-
-    address_us = address_us_0_1_1;
-
-    aeacus_0_3_0 = callPackage
-      (
-        {  buildMix, fetchHex, comeonin_1_6_0 }:
-          buildMix {
-            name = "aeacus";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "aeacus";
-              version = "0.3.0";
-              sha256 =
-                "3cc138cfc7c508cfd85afddd0881632dde2e663d222c9e3749fae8c80ebb2c0b";
-            };
-            beamDeps  = [ comeonin_1_6_0 ];
-
-            meta = {
-              longDescription = ''A simple, secure, and highly configurable
-                                Elixir identity [username | email | id |
-                                etc.]/password authentication module; Compatible
-                                with Ecto.'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/zmoshansky/aeacus";
-            };
-          }
-      ) {};
-
-    aeacus = aeacus_0_3_0;
-
     ahab_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ahab";
             version = "0.1.1";
             src = fetchHex {
@@ -336,115 +1081,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/jquadrin/ahab";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ahab = ahab_0_1_1;
 
-    airbrake_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "airbrake";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "airbrake";
-              version = "0.1.0";
-              sha256 =
-                "45d3e2da7f5a8793b9fd7752cbeaa988a848396f44b77d0265f3bed36182d901";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''An Elixir notifier to the Airbrake'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/romul/airbrake-elixir";
-            };
-          }
-      ) {};
-
-    airbrake = airbrake_0_1_0;
-
-    airbrake_plug_0_1_1 = callPackage
-      (
-        {  buildMix, fetchHex, airbrake_0_1_0 }:
-          buildMix {
-            name = "airbrake_plug";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "airbrake_plug";
-              version = "0.1.1";
-              sha256 =
-                "2560f8b830e94b09788952165cd3053b47106d4afebf547dc370d7f307e804b9";
-            };
-            beamDeps  = [ airbrake_0_1_0 ];
-
-            meta = {
-              description = ''Airbrake reporter for Elixir`s Plug'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/romul/airbrake_plug";
-            };
-          }
-      ) {};
-
-    airbrake_plug = airbrake_plug_0_1_1;
-
-    airbrakex_0_0_6 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "airbrakex";
-            version = "0.0.6";
-            src = fetchHex {
-              pkg = "airbrakex";
-              version = "0.0.6";
-              sha256 =
-                "a8efc0a9a641a6c5ada2585ee5889291b74ded10977af7b1a4ac6bc445d166e8";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Airbrake Elixir Notifier'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/fazibear/airbrakex";
-            };
-          }
-      ) {};
-
-    airbrakex = airbrakex_0_0_6;
-
-    airbrakify_0_0_1 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_2_1_0, plug_1_1_3, httpoison_0_8_2
-        }:
-          buildMix {
-            name = "airbrakify";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "airbrakify";
-              version = "0.0.1";
-              sha256 =
-                "973f895ba83e6dd71cf87182419e144db5c3ac23e43b7a1247e51559bf2737b6";
-            };
-            beamDeps  = [ poison_2_1_0 plug_1_1_3 httpoison_0_8_2 ];
-
-            meta = {
-              longDescription = ''A simple Airbrake/Errbit library for
-                                Elixir/Phoenix projects. Currently only supports
-                                error/exception notifications via a Plug.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/Diamond/airbrakify";
-            };
-          }
-      ) {};
-
-    airbrakify = airbrakify_0_0_1;
-
     alambic_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "alambic";
             version = "0.1.0";
             src = fetchHex {
@@ -462,15 +1107,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/sdanzan/alambic";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     alambic = alambic_0_1_0;
 
     alchemic_pinyin_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "alchemic_pinyin";
             version = "0.1.0";
             src = fetchHex {
@@ -485,15 +1130,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/zhangsoledad/alchemic_pinyin";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     alchemic_pinyin = alchemic_pinyin_0_1_0;
 
     alchemist_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "alchemist";
             version = "0.0.2";
             src = fetchHex {
@@ -508,15 +1153,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/jkakar/alchemist";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     alchemist = alchemist_0_0_2;
 
     alchemy_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, uuid_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, uuid_1_1_3 }:
+          buildMix ({
             name = "alchemy";
             version = "0.0.1";
             src = fetchHex {
@@ -532,15 +1177,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/keathley/alchemy";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     alchemy = alchemy_0_0_1;
 
     aleppo_0_9_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "aleppo";
             version = "0.9.0";
             src = fetchHex {
@@ -555,15 +1200,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/ErlyORM/aleppo";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     aleppo = aleppo_0_9_0;
 
     alexa_0_1_12 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
+          buildMix ({
             name = "alexa";
             version = "0.1.12";
             src = fetchHex {
@@ -580,15 +1225,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/col/alexa";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     alexa = alexa_0_1_12;
 
     alexa_plug_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "alexa_plug";
             version = "0.2.0";
             src = fetchHex {
@@ -606,15 +1251,22 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/jordantdavis/alexa_plug";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     alexa_plug = alexa_plug_0_2_0;
 
     alexa_web_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4, alexa_0_1_12 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_3,
+          cowboy_1_0_4,
+          alexa_0_1_12
+        }:
+          buildMix ({
             name = "alexa_web";
             version = "0.0.2";
             src = fetchHex {
@@ -631,15 +1283,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/col/alexa_web";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     alexa_web = alexa_web_0_0_2;
 
     algae_0_10_0 = callPackage
       (
-        {  buildMix, fetchHex, quark_1_0_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, quark_1_0_2 }:
+          buildMix ({
             name = "algae";
             version = "0.10.0";
             src = fetchHex {
@@ -655,192 +1307,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/robot-overlord/algae";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     algae = algae_0_10_0;
 
-    algolia_0_3_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_0_3, hackney_1_6_0 }:
-          buildMix {
-            name = "algolia";
-            version = "0.3.1";
-            src = fetchHex {
-              pkg = "algolia";
-              version = "0.3.1";
-              sha256 =
-                "a88020c68712d134e66ccde3d2029766249d3da0188da369448a24f66d2f9f6c";
-            };
-            beamDeps  = [ poison_1_0_3 hackney_1_6_0 ];
-
-            meta = {
-              description = ''Elixir implementation of Algolia Search API'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/sikanhe/algolia-elixir";
-            };
-          }
-      ) {};
-
-    algolia = algolia_0_3_1;
-
-    alice_0_3_3 = callPackage
-      (
-        {  buildMix, fetchHex, slack_0_4_2, redix_0_3_6, poolboy_1_5_1 }:
-          buildMix {
-            name = "alice";
-            version = "0.3.3";
-            src = fetchHex {
-              pkg = "alice";
-              version = "0.3.3";
-              sha256 =
-                "637953131f96a877f13661da9640efcca4417c69f51db70db85bfa18648156f8";
-            };
-            beamDeps  = [ slack_0_4_2 redix_0_3_6 poolboy_1_5_1 ];
-
-            meta = {
-              description = ''A Slack bot'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/adamzaninovich/alice";
-            };
-          }
-      ) {};
-
-    alice = alice_0_3_3;
-
-    alice_against_humanity_0_1_2 = callPackage
-      (
-        {  buildMix, fetchHex, alice_0_3_3 }:
-          buildMix {
-            name = "alice_against_humanity";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "alice_against_humanity";
-              version = "0.1.2";
-              sha256 =
-                "aac5f049b59d0eaaea2383e1fc8fec28125b9a29ffda7fbe214d829738ad3935";
-            };
-            beamDeps  = [ alice_0_3_3 ];
-
-            meta = {
-              description = ''A handler for the Alice Slack bot. Play Cards
-                            Against Humanity with Alice.'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/adamzaninovich/alice_against_humanity";
-            };
-          }
-      ) {};
-
-    alice_against_humanity = alice_against_humanity_0_1_2;
-
-    alice_google_images_0_1_3 = callPackage
-      (
-        {  buildMix, fetchHex, alice_0_3_3 }:
-          buildMix {
-            name = "alice_google_images";
-            version = "0.1.3";
-            src = fetchHex {
-              pkg = "alice_google_images";
-              version = "0.1.3";
-              sha256 =
-                "04b4e23c44a67c032c1ac8e2da4ca0fca03ec20cf207b4cb40eba0cb17e975e8";
-            };
-            beamDeps  = [ alice_0_3_3 ];
-
-            meta = {
-              description = ''A handler for the Alice Slack bot. Get random
-                            images from Google'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/adamzaninovich/alice_google_images";
-            };
-          }
-      ) {};
-
-    alice_google_images = alice_google_images_0_1_3;
-
-    alice_karma_0_1_1 = callPackage
-      (
-        {  buildMix, fetchHex, alice_0_3_3 }:
-          buildMix {
-            name = "alice_karma";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "alice_karma";
-              version = "0.1.1";
-              sha256 =
-                "c73198e5edb1f5a05e744ca11afa0d2cc58ec183ca0c32bd5e8a01efa7b61559";
-            };
-            beamDeps  = [ alice_0_3_3 ];
-
-            meta = {
-              longDescription = ''A handler for the Alice Slack bot. Allows
-                                Alice to keep track of karma points for
-                                arbitrary terms.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/adamzaninovich/alice_karma";
-            };
-          }
-      ) {};
-
-    alice_karma = alice_karma_0_1_1;
-
-    alice_shizzle_0_1_2 = callPackage
-      (
-        {  buildMix, fetchHex, gizoogle_0_0_2, alice_0_3_3 }:
-          buildMix {
-            name = "alice_shizzle";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "alice_shizzle";
-              version = "0.1.2";
-              sha256 =
-                "c98481d59c004f905958b9412bff1d288a649cf373afb4fea307222af2597c19";
-            };
-            beamDeps  = [ gizoogle_0_0_2 alice_0_3_3 ];
-
-            meta = {
-              longDescription = ''A handlez fo` tha Alice Slack bot fo` realz.
-                                Uses Gizoogle ta allow you ta drop a rhyme like
-                                a thug n` retrieve links fo` translated sitez'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/notdevinclark/alice_shizzle";
-            };
-          }
-      ) {};
-
-    alice_shizzle = alice_shizzle_0_1_2;
-
-    alice_xkcd_0_0_3 = callPackage
-      (
-        {  buildMix, fetchHex, xkcd_0_0_1, alice_0_3_3 }:
-          buildMix {
-            name = "alice_xkcd";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "alice_xkcd";
-              version = "0.0.3";
-              sha256 =
-                "13562b43fd99c7d9cdc568d7511c154842b9a59a19eca9df019069193bd94842";
-            };
-            beamDeps  = [ xkcd_0_0_1 alice_0_3_3 ];
-
-            meta = {
-              longDescription = ''A handler for the Alice Slack bot. Retrieves
-                                latest, specific and random XKCD comics.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/notdevinclark/alice_xkcd";
-            };
-          }
-      ) {};
-
-    alice_xkcd = alice_xkcd_0_0_3;
-
     alphonse_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, cipher_0_1_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, cipher_0_1_0 }:
+          buildMix ({
             name = "alphonse";
             version = "0.1.0";
             src = fetchHex {
@@ -857,44 +1332,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/chrisenytc/alphonse";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     alphonse = alphonse_0_1_0;
 
-    amazon_product_advertising_client_0_1_1 = callPackage
-      (
-        {
-          buildMix, fetchHex, timex_1_0_2, sweet_xml_0_6_1, httpoison_0_8_2
-        }:
-          buildMix {
-            name = "amazon_product_advertising_client";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "amazon_product_advertising_client";
-              version = "0.1.1";
-              sha256 =
-                "406111cedbd475cab29bdcc69f48ddc3670e57d2e3294e8d948c117ae492951c";
-            };
-            beamDeps  = [ timex_1_0_2 sweet_xml_0_6_1 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''An Amazon Product Advertising API client for
-                            Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/zachgarwood/elixir-amazon-product-advertising-client";
-            };
-          }
-      ) {};
-
-    amazon_product_advertising_client =
-      amazon_product_advertising_client_0_1_1;
-
     amnesia_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex, exquisite_0_1_6 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, exquisite_0_1_6 }:
+          buildMix ({
             name = "amnesia";
             version = "0.2.1";
             src = fetchHex {
@@ -910,110 +1356,15 @@ let
               license = stdenv.lib.licenses.wtfpl;
               homepage = "https://github.com/meh/amnesia";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     amnesia = amnesia_0_2_1;
 
-    amqp_0_1_1 = callPackage
-      (
-        {  buildMix, fetchHex, amqp_client_3_5_6 }:
-          buildMix {
-            name = "amqp";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "amqp";
-              version = "0.1.1";
-              sha256 =
-                "64cf314b8953cef7c809cce8f21cb8574f1ca29226b007bbaab7ac9079c96912";
-            };
-            beamDeps  = [ amqp_client_3_5_6 ];
-
-            meta = {
-              description = ''Idiomatic Elixir client for RabbitMQ.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/pma/amqp";
-            };
-          }
-      ) {};
-
-    amqp_0_1_4 = callPackage
-      (
-        {  buildMix, fetchHex, amqp_client_3_5_6 }:
-          buildMix {
-            name = "amqp";
-            version = "0.1.4";
-            src = fetchHex {
-              pkg = "amqp";
-              version = "0.1.4";
-              sha256 =
-                "a75d9b9283f306627b1d72a1ae326bb8c2910c5cd8198fa036e575b74b340ef4";
-            };
-            beamDeps  = [ amqp_client_3_5_6 ];
-
-            meta = {
-              description = ''Idiomatic Elixir client for RabbitMQ.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/pma/amqp";
-            };
-          }
-      ) {};
-
-    amqp = amqp_0_1_4;
-
-    amqp_client_3_5_6 = callPackage
-      (
-        {  buildRebar3, fetchHex, rabbit_common_3_5_6 }:
-          buildRebar3 {
-            name = "amqp_client";
-            version = "3.5.6";
-            src = fetchHex {
-              pkg = "amqp_client";
-              version = "3.5.6";
-              sha256 =
-                "3dc10a5ba146fd737502d407a1afee0c460b4477d66ca361240985f412a2e9a3";
-            };
-
-            beamDeps  = [ rabbit_common_3_5_6 ];
-
-            meta = {
-              description = ''Erlang RabbitMQ/AMQP client.'';
-              license = stdenv.lib.licenses.mpl11;
-              homepage = "https://github.com/jbrisbin/amqp_client";
-            };
-          }
-      ) {};
-
-    amqp_client = amqp_client_3_5_6;
-
-    amrita_0_4_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "amrita";
-            version = "0.4.0";
-            src = fetchHex {
-              pkg = "amrita";
-              version = "0.4.0";
-              sha256 =
-                "8d3e642e665f9634aa44463ed6964ccf05e251c81ef92aaa9eacce2e9be959ad";
-            };
-
-            meta = {
-              description = ''A polite, well mannered and thoroughly upstanding
-                            testing framework for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "http://amrita.io";
-            };
-          }
-      ) {};
-
-    amrita = amrita_0_4_0;
-
     anaphora_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "anaphora";
             version = "0.1.2";
             src = fetchHex {
@@ -1028,110 +1379,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/sviridov/anaphora-elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     anaphora = anaphora_0_1_2;
 
-    anilixir_1_0_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "anilixir";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "anilixir";
-              version = "1.0.0";
-              sha256 =
-                "ee5c6dfa7e5250d8ec5c9b04910e3202788ceeba231cb3ff8b22e479cc64f1c3";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Anilist API client for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/sotojuan/anilixir";
-            };
-          }
-      ) {};
-
-    anilixir = anilixir_1_0_0;
-
-    anubis_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "anubis";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "anubis";
-              version = "0.1.0";
-              sha256 =
-                "38329609a08261ba50b8ef2cfffa3bc4926b5412f8683a9322e59cf953779aab";
-            };
-
-            meta = {
-              description = '' Anubis is a framework for building command line
-                            applications. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bennyhallett/anubis";
-            };
-          }
-      ) {};
-
-    anubis_0_3_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "anubis";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "anubis";
-              version = "0.3.0";
-              sha256 =
-                "556039ca0e045116e3a2f71b15e7d884122e6b7596fede05d022d28412df5ae2";
-            };
-
-            meta = {
-              description = '' Anubis is a framework for building command line
-                            applications. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bennyhallett/anubis";
-            };
-          }
-      ) {};
-
-    anubis = anubis_0_3_0;
-
-    apache_passwd_md5_1_0_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "apache_passwd_md5";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "apache_passwd_md5";
-              version = "1.0.0";
-              sha256 =
-                "2ffc49fe46aadcd21248aacb4a9c723c8d8a0304747f8cf8e6089e97404f59f1";
-            };
-
-            meta = {
-              longDescription = ''Provides Apache/APR style password hashing.
-                                Useful for generating or authenticating against
-                                MD5 htpasswd passwords. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/kevinmontuori/Apache.PasswdMD5";
-            };
-          }
-      ) {};
-
-    apache_passwd_md5 = apache_passwd_md5_1_0_0;
-
     apex_0_3_7 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "apex";
             version = "0.3.7";
             src = fetchHex {
@@ -1146,13 +1402,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bjro/apex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     apex_0_4_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "apex";
             version = "0.4.0";
             src = fetchHex {
@@ -1167,15 +1423,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bjro/apex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     apex = apex_0_4_0;
 
     apix_0_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "apix";
             version = "0.1.0";
             src = fetchHex {
@@ -1192,15 +1448,21 @@ let
 
               homepage = "https://github.com/liveforeverx/apix";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     apix = apix_0_1_0;
 
     apns_0_0_12 = callPackage
       (
-        {  buildMix, fetchHex, poolboy_1_5_1, poison_1_5_2 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poolboy_1_5_1,
+          poison_1_5_2
+        }:
+          buildMix ({
             name = "apns";
             version = "0.0.12";
             src = fetchHex {
@@ -1217,39 +1479,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/chvanikoff/apns4ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     apns = apns_0_0_12;
 
-    apostle_0_0_3 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_4_0, httpoison_0_7_5 }:
-          buildMix {
-            name = "apostle";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "apostle";
-              version = "0.0.3";
-              sha256 =
-                "3bb6b358236bbf730df69fa775f230355235a7e24dae73a9f17e4237c3fdb583";
-            };
-            beamDeps  = [ poison_1_4_0 httpoison_0_7_5 ];
-
-            meta = {
-              description = ''Elixir client for Apostle.io.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jamesotron/apostle-elixir";
-            };
-          }
-      ) {};
-
-    apostle = apostle_0_0_3;
-
     ar2ecto_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ar2ecto";
             version = "0.1.2";
             src = fetchHex {
@@ -1265,66 +1503,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/aforward/ar2ecto";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ar2ecto = ar2ecto_0_1_2;
 
-    arc_0_5_1 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, ex_aws_0_4_18
-        }:
-          buildMix {
-            name = "arc";
-            version = "0.5.1";
-            src = fetchHex {
-              pkg = "arc";
-              version = "0.5.1";
-              sha256 =
-                "21c64533b2b13033c57cbe031bc064a7c3edfa9a1cb52286dfeda7c4c6d83426";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ex_aws_0_4_18 ];
-
-            meta = {
-              description = ''Flexible file upload and attachment library for
-                            Elixir.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/stavro/arc";
-            };
-          }
-      ) {};
-
-    arc = arc_0_5_1;
-
-    arc_ecto_0_3_2 = callPackage
-      (
-        {  buildMix, fetchHex, ecto_2_0_0_beta_2, arc_0_5_1 }:
-          buildMix {
-            name = "arc_ecto";
-            version = "0.3.2";
-            src = fetchHex {
-              pkg = "arc_ecto";
-              version = "0.3.2";
-              sha256 =
-                "92cb9e81eb75a1a9fdb4f4fc8e83714b9ee67e3ddb96db9d53c46e7002bf7e8d";
-            };
-            beamDeps  = [ ecto_2_0_0_beta_2 arc_0_5_1 ];
-
-            meta = {
-              description = ''An integration with Arc and Ecto.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/stavro/arc_ecto";
-            };
-          }
-      ) {};
-
-    arc_ecto = arc_ecto_0_3_2;
-
     argent_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "argent";
             version = "0.0.1";
             src = fetchHex {
@@ -1338,15 +1525,15 @@ let
               description = ''A currency management library for elixir.'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     argent = argent_0_0_1;
 
     argument_parser_0_1_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "argument_parser";
             version = "0.1.3";
             src = fetchHex {
@@ -1362,15 +1549,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/jisaacstone/ex_argument_parser";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     argument_parser = argument_parser_0_1_3;
 
     array_1_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "array";
             version = "1.0.1";
             src = fetchHex {
@@ -1385,7 +1572,7 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/takscape/elixir-array";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     array = array_1_0_1;
@@ -1393,9 +1580,14 @@ let
     artifact_0_4_0 = callPackage
       (
         {
-          buildMix, fetchHex, porcelain_2_0_1, poolboy_1_5_1, plug_1_1_3
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          porcelain_2_0_1,
+          poolboy_1_5_1,
+          plug_1_1_3
         }:
-          buildMix {
+          buildMix ({
             name = "artifact";
             version = "0.4.0";
             src = fetchHex {
@@ -1412,15 +1604,21 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/doomspork/artifact";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     artifact = artifact_0_4_0;
 
     aruspex_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, zipper_tree_0_1_1, exyz_1_0_0 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          zipper_tree_0_1_1,
+          exyz_1_0_0
+        }:
+          buildMix ({
             name = "aruspex";
             version = "0.1.0";
             src = fetchHex {
@@ -1437,39 +1635,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://www.github.com/dkendal/aruspex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     aruspex = aruspex_0_1_0;
 
-    asanaficator_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_7_5, exjsx_3_2_0 }:
-          buildMix {
-            name = "asanaficator";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "asanaficator";
-              version = "0.0.1";
-              sha256 =
-                "891ca378a0b83d7018c10073ab14f35930186098d777e24550fff84a9683bfa3";
-            };
-            beamDeps  = [ httpoison_0_7_5 exjsx_3_2_0 ];
-
-            meta = {
-              description = ''Simple Elixir wrapper for the Asana API'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/trenpixster/asanaficator";
-            };
-          }
-      ) {};
-
-    asanaficator = asanaficator_0_0_1;
-
     ashes_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ashes";
             version = "0.0.3";
             src = fetchHex {
@@ -1485,39 +1659,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/nickgartmann/ashes";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ashes = ashes_0_0_3;
 
-    assembla_api_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "assembla_api";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "assembla_api";
-              version = "0.1.0";
-              sha256 =
-                "b4a3898de536e4820702c0f119993fd2804e91e2525d1e7eba57d8744983ef24";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Assembla API client'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/Assembla/ex_assembla_api";
-            };
-          }
-      ) {};
-
-    assembla_api = assembla_api_0_1_0;
-
     assert_diff_0_0_5 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "assert_diff";
             version = "0.0.5";
             src = fetchHex {
@@ -1532,38 +1682,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/ske77/assert_diff";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     assert_diff = assert_diff_0_0_5;
 
-    atlas_0_2_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "atlas";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "atlas";
-              version = "0.2.0";
-              sha256 =
-                "1c887e4a6224f3189a92e4e4684a2623161a70c7fbd0fd7db79233d5d2f6facf";
-            };
-
-            meta = {
-              description = ''Object Relational Mapper for Elixir '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/chrismccord/atlas";
-            };
-          }
-      ) {};
-
-    atlas = atlas_0_2_0;
-
     auth_test_support_0_0_6 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "auth_test_support";
             version = "0.0.6";
             src = fetchHex {
@@ -1580,15 +1707,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/DockYard/auth_test_support";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     auth_test_support = auth_test_support_0_0_6;
 
     authentic_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "authentic";
             version = "0.0.1";
             src = fetchHex {
@@ -1602,15 +1729,21 @@ let
               description = ''Auth for Phoenix'';
               license = stdenv.lib.licenses.mit;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     authentic = authentic_0_0_1;
 
     auto_doc_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_3 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          plug_1_1_3
+        }:
+          buildMix ({
             name = "auto_doc";
             version = "0.0.2";
             src = fetchHex {
@@ -1627,15 +1760,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/meatherly/auto_doc";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     auto_doc = auto_doc_0_0_2;
 
     autobots_license_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_3,
+          cowboy_1_0_4
+        }:
+          buildMix ({
             name = "autobots_license";
             version = "0.1.0";
             src = fetchHex {
@@ -1647,15 +1786,15 @@ let
             beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
 
             meta = {    };
-          }
+          } // packageOverrides)
       ) {};
 
     autobots_license = autobots_license_0_1_0;
 
     avex_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "avex";
             version = "0.2.0";
             src = fetchHex {
@@ -1670,41 +1809,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/jonhkr/avex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     avex = avex_0_2_0;
 
-    aws_0_0_10 = callPackage
-      (
-        {
-          buildMix, fetchHex, timex_1_0_2, poison_1_5_2, httpoison_0_8_2
-        }:
-          buildMix {
-            name = "aws";
-            version = "0.0.10";
-            src = fetchHex {
-              pkg = "aws";
-              version = "0.0.10";
-              sha256 =
-                "ce2c9ffbaf7b9a3762826a6f8be8ac6ce8d4ef5c74e021514d14d5cafd625d03";
-            };
-            beamDeps  = [ timex_1_0_2 poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''AWS clients for Elixir'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/jkakar/aws-elixir";
-            };
-          }
-      ) {};
-
-    aws = aws_0_0_10;
-
     aws_auth_0_2_5 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, timex_1_0_2 }:
+          buildMix ({
             name = "aws_auth";
             version = "0.2.5";
             src = fetchHex {
@@ -1720,15 +1833,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/bryanjos/aws_auth";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     aws_auth = aws_auth_0_2_5;
 
     aws_cli_0_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex, erlexec_1_1_0 }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex, erlexec_1_1_0 }:
+          buildRebar3 ({
             name = "aws_cli";
             version = "0.1.0";
             src = fetchHex {
@@ -1745,244 +1858,15 @@ let
 
               homepage = "https://github.com/fyler/aws_cli";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     aws_cli = aws_cli_0_1_0;
 
-    aws_erlang_0_1_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          jsx_2_8_0,
-          hackney_1_4_8,
-          erlware_commons_0_18_0
-        }:
-          buildMix {
-            name = "aws_erlang";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "aws_erlang";
-              version = "0.1.1";
-              sha256 =
-                "5a0f27869ec106eac25fa66aa39f226a2eee3f6b3ab02879e4fa60bab7937709";
-            };
-            beamDeps  = [ jsx_2_8_0 hackney_1_4_8 erlware_commons_0_18_0 ];
-
-            meta = {
-              description = ''aws clients for erlang'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/jkakar/aws-erlang";
-            };
-          }
-      ) {};
-
-    aws_erlang = aws_erlang_0_1_1;
-
-    aws_http_0_2_4 = callPackage
-      (
-        {  buildRebar3, fetchHex, lhttpc_1_3_0, barrel_jiffy_0_14_4 }:
-          buildRebar3 {
-            name = "aws_http";
-            version = "0.2.4";
-            src = fetchHex {
-              pkg = "aws_http";
-              version = "0.2.4";
-              sha256 =
-                "96065da0d348a8e47e01531cfa720615e15a21c1bd4e5c82decf56026cde128f";
-            };
-
-            beamDeps  = [ lhttpc_1_3_0 barrel_jiffy_0_14_4 ];
-
-            meta = {
-              description = ''Amazon AWS HTTP helpers'';
-
-              homepage = "https://github.com/anha0825/erl_aws_http";
-            };
-          }
-      ) {};
-
-    aws_http = aws_http_0_2_4;
-
-    b2_0_0_6 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "b2";
-            version = "0.0.6";
-            src = fetchHex {
-              pkg = "b2";
-              version = "0.0.6";
-              sha256 =
-                "f8b33d1ec36576dfbca3f2f4c5fad1a9a227207d1ef63b3a388778e8fad3333a";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Elixir B2 cloud API wrapper'';
-
-            };
-          }
-      ) {};
-
-    b2 = b2_0_0_6;
-
-    backoff_1_1_3 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "backoff";
-            version = "1.1.3";
-            src = fetchHex {
-              pkg = "backoff";
-              version = "1.1.3";
-              sha256 =
-                "30cead738d20e4c8d36cd37857dd5e23aeba57cb868bf64766d47d371422bdff";
-            };
-
-            meta = {
-              description = ''Exponential backoffs library'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ferd/backoff";
-            };
-          }
-      ) {};
-
-    backoff = backoff_1_1_3;
-
-    balanced_3_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_2_1, httpotion_2_2_2 }:
-          buildMix {
-            name = "balanced";
-            version = "3.1.0";
-            src = fetchHex {
-              pkg = "balanced";
-              version = "3.1.0";
-              sha256 =
-                "f86f199d76ac66407fbb82fb927e999ec4119a617500965b824ceb4071fcd2d2";
-            };
-            beamDeps  = [ poison_1_2_1 httpotion_2_2_2 ];
-
-            meta = {
-              description = ''Balanced API for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bryanjos/balanced-elixir";
-            };
-          }
-      ) {};
-
-    balanced = balanced_3_1_0;
-
-    bamboo_0_3_2 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "bamboo";
-            version = "0.3.2";
-            src = fetchHex {
-              pkg = "bamboo";
-              version = "0.3.2";
-              sha256 =
-                "1b4bfdddae49f6fc66616c63b4d2d9a0e99d40a08619004f5c4f4e4aebfa20ed";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              longDescription = ''Straightforward, composable, and adapter
-                                based Elixir email library for people that love
-                                piping. Adapters for Mandrill, Sendgrid,
-                                in-memory, and test.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/paulcsmith/bamboo";
-            };
-          }
-      ) {};
-
-    bamboo_0_4_0 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_2_1_0, plug_1_1_3, httpoison_0_8_2
-        }:
-          buildMix {
-            name = "bamboo";
-            version = "0.4.0";
-            src = fetchHex {
-              pkg = "bamboo";
-              version = "0.4.0";
-              sha256 =
-                "5227b1e65a8634da0f46e1eb41a7ca44d3f6de33bfadf950da16e65e9c8428a7";
-            };
-            beamDeps  = [ poison_2_1_0 plug_1_1_3 httpoison_0_8_2 ];
-
-            meta = {
-              longDescription = ''Straightforward, composable, and adapter
-                                based Elixir email library for people that love
-                                piping. Adapters for Mandrill, Sendgrid,
-                                in-memory, and test.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/paulcsmith/bamboo";
-            };
-          }
-      ) {};
-
-    bamboo = bamboo_0_4_0;
-
-    bamboo_sendgrid_0_1_0 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, bamboo_0_3_2
-        }:
-          buildMix {
-            name = "bamboo_sendgrid";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "bamboo_sendgrid";
-              version = "0.1.0";
-              sha256 =
-                "ee44ac3f096777064c4cf02df238276338914295f5b17caf38192789a590825c";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 bamboo_0_3_2 ];
-
-            meta = {
-              description = ''A SendGrid adapter for Bamboo.'';
-              license = stdenv.lib.licenses.publicDomain;
-            };
-          }
-      ) {};
-
-    bamboo_sendgrid = bamboo_sendgrid_0_1_0;
-
-    bandwidth_1_2_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_4_0, httpoison_0_7_5 }:
-          buildMix {
-            name = "bandwidth";
-            version = "1.2.1";
-            src = fetchHex {
-              pkg = "bandwidth";
-              version = "1.2.1";
-              sha256 =
-                "cfc31517bd160cc9a2e6c55b664eccadc001fc650bd8ea9f01418feb8e7194b5";
-            };
-            beamDeps  = [ poison_1_4_0 httpoison_0_7_5 ];
-
-            meta = {
-              description = ''An Elixir client library for the Bandwidth
-                            Application Platform'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/wtcross/elixir-bandwidth";
-            };
-          }
-      ) {};
-
-    bandwidth = bandwidth_1_2_1;
-
     bankster_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "bankster";
             version = "0.1.0";
             src = fetchHex {
@@ -1998,15 +1882,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/railsmechanic/bankster";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     bankster = bankster_0_1_0;
 
     banner_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "banner";
             version = "0.1.0";
             src = fetchHex {
@@ -2022,15 +1906,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/winebarrel/elixir-sysvbanner";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     banner = banner_0_1_0;
 
     barrel_ibrowse_4_2_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "barrel_ibrowse";
             version = "4.2.0";
             src = fetchHex {
@@ -2045,61 +1929,15 @@ let
 
               homepage = "https://github.com/barrel-db/ibrowse";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     barrel_ibrowse = barrel_ibrowse_4_2_0;
 
-    barrel_jiffy_0_14_4 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "barrel_jiffy";
-            version = "0.14.4";
-            src = fetchHex {
-              pkg = "barrel_jiffy";
-              version = "0.14.4";
-              sha256 =
-                "3b730d6a18e988b8411f449bbb5df3637eb7bea864302924581b2391dd6b6e71";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''JSON Decoder/Encoder.'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/barrel-db/jiffy";
-            };
-          }
-      ) {};
-
-    barrel_jiffy_0_14_5 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "barrel_jiffy";
-            version = "0.14.5";
-            src = fetchHex {
-              pkg = "barrel_jiffy";
-              version = "0.14.5";
-              sha256 =
-                "8a874c6dbcf439a7d7b300b4463f47e088fd54e2b715ef7261e21807ee421f47";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''JSON Decoder/Encoder.'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/barrel-db/jiffy";
-            };
-          }
-      ) {};
-
-    barrel_jiffy = barrel_jiffy_0_14_5;
-
     barrel_oauth_1_6_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "barrel_oauth";
             version = "1.6.0";
             src = fetchHex {
@@ -2114,15 +1952,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/barrel-db/erlang-oauth";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     barrel_oauth = barrel_oauth_1_6_0;
 
     base16_1_0_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "base16";
             version = "1.0.0";
             src = fetchHex {
@@ -2137,15 +1975,15 @@ let
               license = with stdenv.lib.licenses; [ bsd3 free ];
               homepage = "https://github.com/goj/base16";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     base16 = base16_1_0_0;
 
     base58_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "base58";
             version = "0.1.0";
             src = fetchHex {
@@ -2160,15 +1998,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/jrdnull/base58";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     base58 = base58_0_1_0;
 
     base58check_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "base58check";
             version = "0.1.0";
             src = fetchHex {
@@ -2184,15 +2022,17 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/gjaldon/base58check";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     base58check = base58check_0_1_0;
 
     base62_1_2_0 = callPackage
       (
-        {  buildMix, fetchHex, custom_base_0_2_0 }:
-          buildMix {
+        {
+          buildMix, packageOverrides ? {}, fetchHex, custom_base_0_2_0
+        }:
+          buildMix ({
             name = "base62";
             version = "1.2.0";
             src = fetchHex {
@@ -2208,15 +2048,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/igas/base62";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     base62 = base62_1_2_0;
 
     base64url_0_0_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "base64url";
             version = "0.0.1";
             src = fetchHex {
@@ -2231,39 +2071,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/dvv/base64url";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     base64url = base64url_0_0_1;
 
-    basehangul_0_2_0 = callPackage
-      (
-        {  buildMix, fetchHex, iconv_1_0_0 }:
-          buildMix {
-            name = "basehangul";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "basehangul";
-              version = "0.2.0";
-              sha256 =
-                "ea7b03e7407e4c24778a40eb3edf305cf10897057ff14718344f83badb3525cc";
-            };
-            beamDeps  = [ iconv_1_0_0 ];
-
-            meta = {
-              description = ''Elixir implementation of BaseHangul.'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/Dalgona/basehangul";
-            };
-          }
-      ) {};
-
-    basehangul = basehangul_0_2_0;
-
     basho_poolboy_0_8_1_p3 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "basho_poolboy";
             version = "0.8.1-p3";
             src = fetchHex {
@@ -2278,62 +2094,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/basho/riak_sysmon";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     basho_poolboy = basho_poolboy_0_8_1_p3;
 
-    basho_stats_1_0_3 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "basho_stats";
-            version = "1.0.3";
-            src = fetchHex {
-              pkg = "basho_stats";
-              version = "1.0.3";
-              sha256 =
-                "d739e733b1c8afcaa467289fca50221753fc8cde6e7b53a79b67f98a2a261f5a";
-            };
-
-            meta = {
-              description = ''Basic Erlang statistics library'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/basho/basho_stats";
-            };
-          }
-      ) {};
-
-    basho_stats = basho_stats_1_0_3;
-
-    basic_auth_1_0_0 = callPackage
-      (
-        {  buildMix, fetchHex, plug_0_5_2, cowboy_1_0_4 }:
-          buildMix {
-            name = "basic_auth";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "basic_auth";
-              version = "1.0.0";
-              sha256 =
-                "e8ed4b5ca05c06dc1c19c69f1f00611e93d17bfa913eefbb6bed4a209af3a5a9";
-            };
-            beamDeps  = [ plug_0_5_2 cowboy_1_0_4 ];
-
-            meta = {
-              description = ''Basic Authentication Plug'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/cultivatehq/basic_auth";
-            };
-          }
-      ) {};
-
-    basic_auth = basic_auth_1_0_0;
-
     batcher_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "batcher";
             version = "0.0.1";
             src = fetchHex {
@@ -2350,39 +2119,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/behe/batcher";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     batcher = batcher_0_0_1;
 
-    battlenet_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "battlenet";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "battlenet";
-              version = "0.0.2";
-              sha256 =
-                "cdd4e182da5a2db478e0da9ac1a467fc8f2b8ec638e3e38dd7962ff3fe8c9342";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Elixir library for the Battle.net API.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/cazrin/battlenet";
-            };
-          }
-      ) {};
-
-    battlenet = battlenet_0_0_2;
-
     bbmustache_1_0_3 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "bbmustache";
             version = "1.0.3";
             src = fetchHex {
@@ -2398,13 +2143,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/soranoba/bbmustache";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     bbmustache_1_0_4 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "bbmustache";
             version = "1.0.4";
             src = fetchHex {
@@ -2420,13 +2165,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/soranoba/bbmustache";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     bbmustache_1_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "bbmustache";
             version = "1.1.0";
             src = fetchHex {
@@ -2442,53 +2187,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/soranoba/bbmustache";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     bbmustache = bbmustache_1_1_0;
 
-    bbsmq_0_0_4 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          uuid_1_1_3,
-          poison_2_1_0,
-          httpoison_0_8_2,
-          exprotobuf_1_0_0,
-          amqp_0_1_4
-        }:
-          buildMix {
-            name = "bbsmq";
-            version = "0.0.4";
-            src = fetchHex {
-              pkg = "bbsmq";
-              version = "0.0.4";
-              sha256 =
-                "94fc10b314f176c9d4d874c387d41b2cb4bab68d749f3e3ce50096167eb6900c";
-            };
-            beamDeps  = [
-                          uuid_1_1_3
-                          poison_2_1_0
-                          httpoison_0_8_2
-                          exprotobuf_1_0_0
-                          amqp_0_1_4
-                        ];
-
-            meta = {
-              description = ''Translate CloudFoundry BBS events and endpoints
-                            into rabbitmq messages.'';
-
-            };
-          }
-      ) {};
-
-    bbsmq = bbsmq_0_0_4;
-
     bcrypt_0_5_0_p3a = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "bcrypt";
             version = "0.5.0-p3a";
             src = fetchHex {
@@ -2498,6 +2205,8 @@ let
                 "492decdc633399b356a3bbfe8279c10a49b1040fc082c8cbf2d30b41ff88f310";
             };
             compilePorts = true;
+            buildPlugins  = [ pc ];
+
 
             meta = {
               description = ''An Erlang wrapper (NIF or port program) for the
@@ -2505,48 +2214,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/chef/erlang-bcrypt";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     bcrypt = bcrypt_0_5_0_p3a;
 
-    beaker_1_2_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          phoenix_1_1_4,
-          ecto_2_0_0_beta_2,
-          bureaucrat_0_1_2
-        }:
-          buildMix {
-            name = "beaker";
-            version = "1.2.0";
-            src = fetchHex {
-              pkg = "beaker";
-              version = "1.2.0";
-              sha256 =
-                "f792ee661db3e31f4c6cacae992e81bbcc302ce05aec29c16bab9853bd763438";
-            };
-            beamDeps  = [ phoenix_1_1_4 ecto_2_0_0_beta_2 bureaucrat_0_1_2 ];
-
-            meta = {
-              longDescription = ''Measure your Elixir! A metrics library that
-                                will help Elixirists keep track of their
-                                application`s performance, as well as any custom
-                                statistics they like.'';
-
-              homepage = "http://github.com/hahuang65/beaker";
-            };
-          }
-      ) {};
-
-    beaker = beaker_1_2_0;
-
     beam_analyzer_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "beam_analyzer";
             version = "0.0.3";
             src = fetchHex {
@@ -2562,15 +2238,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/joeyates/beam_analyzer";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     beam_analyzer = beam_analyzer_0_0_3;
 
     bear_0_8_3 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "bear";
             version = "0.8.3";
             src = fetchHex {
@@ -2585,15 +2261,15 @@ let
 
               homepage = "https://github.com/puzza007/bear";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     bear = bear_0_8_3;
 
     belixir_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "belixir";
             version = "0.2.0";
             src = fetchHex {
@@ -2610,15 +2286,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/meinac/belixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     belixir = belixir_0_2_0;
 
     belvedere_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "belvedere";
             version = "0.0.1";
             src = fetchHex {
@@ -2634,15 +2310,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "http://nirvana.io";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     belvedere = belvedere_0_0_1;
 
     benchfella_0_3_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "benchfella";
             version = "0.3.2";
             src = fetchHex {
@@ -2657,15 +2333,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/alco/benchfella";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     benchfella = benchfella_0_3_2;
 
     benchmark_ips_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "benchmark_ips";
             version = "0.2.0";
             src = fetchHex {
@@ -2681,43 +2357,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mxhold/benchmark_ips";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     benchmark_ips = benchmark_ips_0_2_0;
 
-    benchwarmer_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "benchwarmer";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "benchwarmer";
-              version = "0.0.2";
-              sha256 =
-                "8b98b39c1c50df624f9c2d13ca953eeed465eed6feda975da26b479df2b4c9f5";
-            };
-
-            meta = {
-              longDescription = ''Benchwarmer is an Elixir micro-benchmarking
-                                utility that runs a function (or list of
-                                functions) repeatedly against a dataset for a
-                                period of time, and then reports on the average
-                                time each operation took to complete, allowing
-                                for easy comparison. '';
-              license = stdenv.lib.licenses.wtfpl;
-              homepage = "https://github.com/mroth/benchwarmer";
-            };
-          }
-      ) {};
-
-    benchwarmer = benchwarmer_0_0_2;
-
     bencode_0_3_0 = callPackage
       (
-        {  buildMix, fetchHex, eqc_ex_1_2_4 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, eqc_ex_1_2_4 }:
+          buildMix ({
             name = "bencode";
             version = "0.3.0";
             src = fetchHex {
@@ -2729,46 +2377,24 @@ let
             beamDeps  = [ eqc_ex_1_2_4 ];
 
             meta = {
-              longDescription = ''A bencode encoder and decoder. The decoder
-                                will return the info hash with along with the
-                                decoded data, and the encoder is implemented as
-                                a protocol, allowing any data structure to be
+              longDescription = ''A complete and correct Bencode encoder and
+                                decoder written in pure Elixir. The decoder will
+                                return the info hash with along with the decoded
+                                data, and the encoder is implemented as a
+                                protocol, allowing any data structure to be
                                 bcode encoded.'';
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/gausby/bencode";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     bencode = bencode_0_3_0;
 
-    bencoder_0_0_7 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "bencoder";
-            version = "0.0.7";
-            src = fetchHex {
-              pkg = "bencoder";
-              version = "0.0.7";
-              sha256 =
-                "1fd5478490f0ef03e5afee0c0392226efe07a76c9f537697176bc46bc46500b8";
-            };
-
-            meta = {
-              description = ''a library to handle bencode in elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/alehander42/bencoder";
-            };
-          }
-      ) {};
-
-    bencoder = bencoder_0_0_7;
-
     bencodex_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "bencodex";
             version = "1.0.0";
             src = fetchHex {
@@ -2783,15 +2409,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/patrickgombert/bencodex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     bencodex = bencodex_1_0_0;
 
     bento_0_9_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
+          buildMix ({
             name = "bento";
             version = "0.9.0";
             src = fetchHex {
@@ -2808,15 +2434,15 @@ let
               license = stdenv.lib.licenses.mpl20;
               homepage = "https://github.com/folz/bento";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     bento = bento_0_9_0;
 
     bert_0_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "bert";
             version = "0.1.0";
             src = fetchHex {
@@ -2831,89 +2457,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/yuce/bert.erl";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     bert = bert_0_1_0;
 
-    bertex_1_2_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "bertex";
-            version = "1.2.0";
-            src = fetchHex {
-              pkg = "bertex";
-              version = "1.2.0";
-              sha256 =
-                "5e6db198c106dbfbd6e419201ec15facd71fac320f24e3e85a856d624ac4096a";
-            };
-
-            meta = {
-              description = '' Elixir BERT encoder/decoder '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/edgurgel/bertex";
-            };
-          }
-      ) {};
-
-    bertex = bertex_1_2_0;
-
-    bgg_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, quinn_0_0_4, httpoison_0_8_2 }:
-          buildMix {
-            name = "bgg";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "bgg";
-              version = "0.1.0";
-              sha256 =
-                "d26593e7ebb23f76e6c0e73a9a1acb6a45ec25ea53b6ee716a2291f07c5f1fb6";
-            };
-            beamDeps  = [ quinn_0_0_4 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''A BoardGameGeek API wrapper in Elixir
-                            http://boardgamegeek.com/xmlapi/'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/peralmq/bgg-elixir";
-            };
-          }
-      ) {};
-
-    bgg = bgg_0_1_0;
-
-    big_query_0_0_2 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_2_1_0, jose_1_4_2, httpoison_0_8_2
-        }:
-          buildMix {
-            name = "big_query";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "big_query";
-              version = "0.0.2";
-              sha256 =
-                "db969991b701113c0991ae0f468a85abfbf1bdaf0bc2706fd8357e15dcfe138a";
-            };
-            beamDeps  = [ poison_2_1_0 jose_1_4_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''A Google BigQuery API client.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/jordan0day/big_query";
-            };
-          }
-      ) {};
-
-    big_query = big_query_0_0_2;
-
     bigflake_0_3_0 = callPackage
       (
-        {  buildMix, fetchHex, base62_1_2_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, base62_1_2_0 }:
+          buildMix ({
             name = "bigflake";
             version = "0.3.0";
             src = fetchHex {
@@ -2929,15 +2481,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/stevedomin/bigflake";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     bigflake = bigflake_0_3_0;
 
     billiards_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "billiards";
             version = "0.0.1";
             src = fetchHex {
@@ -2947,15 +2499,15 @@ let
                 "5b8d8eab12e35c0c7eff5be02a4adf0a7aa4cf10688a5faeec9b10f2c2f04046";
             };
              meta = {    };
-          }
+          } // packageOverrides)
       ) {};
 
     billiards = billiards_0_0_1;
 
     bin_format_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "bin_format";
             version = "0.0.1";
             src = fetchHex {
@@ -2971,50 +2523,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/willpenington/bin_format";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     bin_format = bin_format_0_0_1;
 
-    bing_translator_0_2_6 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          timex_1_0_2,
-          poison_1_5_2,
-          httpoison_0_8_2,
-          floki_0_8_0
-        }:
-          buildMix {
-            name = "bing_translator";
-            version = "0.2.6";
-            src = fetchHex {
-              pkg = "bing_translator";
-              version = "0.2.6";
-              sha256 =
-                "d25df43466458eca86c9d5aa22d94bc41c3d182949a9ec36e9387ffe442e540e";
-            };
-            beamDeps  = [
-                          timex_1_0_2 poison_1_5_2 httpoison_0_8_2 floki_0_8_0
-                        ];
-
-            meta = {
-              longDescription = ''Translate strings using the Bing HTTP API.
-                                Requires that you have a Client ID and Secret.
-                                See README.md for information.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ikeikeikeike/bing_translator";
-            };
-          }
-      ) {};
-
-    bing_translator = bing_translator_0_2_6;
-
     binstructor_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "binstructor";
             version = "0.0.1";
             src = fetchHex {
@@ -3030,15 +2547,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/willpenington/binstructor";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     binstructor = binstructor_0_0_1;
 
     bit_field_set_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, eqc_ex_1_2_4 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, eqc_ex_1_2_4 }:
+          buildMix ({
             name = "bit_field_set";
             version = "0.1.0";
             src = fetchHex {
@@ -3057,39 +2574,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/gausby/bit_field_set";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     bit_field_set = bit_field_set_0_1_0;
 
-    bitbucket_api_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, jsx_2_8_0, httpoison_0_7_5, jsex_2_0_0 }:
-          buildMix {
-            name = "bitbucket_api";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "bitbucket_api";
-              version = "0.0.2";
-              sha256 =
-                "25fbdda8ed1813f0ade92b4f28b3290b3efd6be63ff25c84ab9e24b512464245";
-            };
-            beamDeps  = [ jsx_2_8_0 httpoison_0_7_5 jsex_2_0_0 ];
-
-            meta = {
-              description = ''Create hooks for Bitbucket. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/Blackrush/bitbucket_api";
-            };
-          }
-      ) {};
-
-    bitbucket_api = bitbucket_api_0_0_2;
-
     bitcask_2_0_2 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "bitcask";
             version = "2.0.2";
             src = fetchHex {
@@ -3099,21 +2592,23 @@ let
                 "666bd79d17faabd62a626ed6fc98176b818266f7bb9639d76244f003ed5b2fe2";
             };
             compilePorts = true;
+            buildPlugins  = [ pc ];
+
 
             meta = {
               description = ''Bitcask key value store'';
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/basho/bitcask";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     bitcask = bitcask_2_0_2;
 
     bitfield_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "bitfield";
             version = "1.0.0";
             src = fetchHex {
@@ -3128,15 +2623,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/camshaft/bitfield.erl";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     bitfield = bitfield_1_0_0;
 
     bitmap_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "bitmap";
             version = "1.0.0";
             src = fetchHex {
@@ -3153,83 +2648,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/hashd/bitmap-elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     bitmap = bitmap_1_0_0;
 
-    bitpay_0_2_5 = callPackage
-      (
-        {
-          buildMix, fetchHex, uuid_1_0_0, httpotion_2_2_2, exjsx_3_1_0
-        }:
-          buildMix {
-            name = "bitpay";
-            version = "0.2.5";
-            src = fetchHex {
-              pkg = "bitpay";
-              version = "0.2.5";
-              sha256 =
-                "25a0b2dbf6619ddc0db4cf1ee03b3d097adac47dc47c65b71a2661eba0f2e3a2";
-            };
-            beamDeps  = [ uuid_1_0_0 httpotion_2_2_2 exjsx_3_1_0 ];
-
-            meta = {
-              longDescription = ''Library to allow elixir apps to easily use
-                                the BitPay REST API to authenticate, generate
-                                invoices, and retrieve invoices. Includes
-                                Utilities for using Erlangs library for Elliptic
-                                Curve Keys.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bitpay/elixir-client";
-            };
-          }
-      ) {};
-
-    bitpay = bitpay_0_2_5;
-
-    blackbook_0_3_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          timex_ecto_1_0_4,
-          timex_0_19_5,
-          secure_random_0_2_0,
-          postgrex_0_11_1,
-          ecto_2_0_0_beta_2,
-          earmark_0_2_1,
-          comeonin_1_6_0
-        }:
-          buildMix {
-            name = "blackbook";
-            version = "0.3.1";
-            src = fetchHex {
-              pkg = "blackbook";
-              version = "0.3.1";
-              sha256 =
-                "deecf1248ec5ef7911e3b440a968d8cb2dae54d50e36bf80173a2593f0e4ecde";
-            };
-            beamDeps  = [
-                          timex_ecto_1_0_4
-                          timex_0_19_5
-                          secure_random_0_2_0
-                          postgrex_0_11_1
-                          ecto_2_0_0_beta_2
-                          earmark_0_2_1
-                          comeonin_1_6_0
-                        ];
-
-            meta = {    };
-          }
-      ) {};
-
-    blackbook = blackbook_0_3_1;
-
     blacksmith_0_1_3 = callPackage
       (
-        {  buildMix, fetchHex, faker_0_6_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, faker_0_6_0 }:
+          buildMix ({
             name = "blacksmith";
             version = "0.1.3";
             src = fetchHex {
@@ -3246,15 +2673,21 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/batate/blacksmith";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     blacksmith = blacksmith_0_1_3;
 
     blaguth_1_2_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_3,
+          cowboy_1_0_4
+        }:
+          buildMix ({
             name = "blaguth";
             version = "1.2.1";
             src = fetchHex {
@@ -3271,15 +2704,15 @@ let
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/lexmag/blaguth";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     blaguth = blaguth_1_2_1;
 
     blake2_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "blake2";
             version = "0.0.1";
             src = fetchHex {
@@ -3294,15 +2727,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mwmiller/blake2_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     blake2 = blake2_0_0_1;
 
     blanket_0_3_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "blanket";
             version = "0.3.1";
             src = fetchHex {
@@ -3318,89 +2751,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/niahoo/blanket";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     blanket = blanket_0_3_1;
 
-    blaze_cloud_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_0_1, httpoison_0_8_2 }:
-          buildMix {
-            name = "blaze_cloud";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "blaze_cloud";
-              version = "0.0.1";
-              sha256 =
-                "c5a26f194691d7c40a008c5aded034ca0a43d4fa6a9173952333479cf2661b2b";
-            };
-            beamDeps  = [ poison_2_0_1 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Elixir Library for Backblaze B2 Cloud Storage.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/PerishableDave/blaze_cloud";
-            };
-          }
-      ) {};
-
-    blaze_cloud = blaze_cloud_0_0_1;
-
-    block_timer_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "block_timer";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "block_timer";
-              version = "0.0.1";
-              sha256 =
-                "1dec7d6590de5b5d2cecd101ea4b276180b7d428e8b36863c424223dd0a97782";
-            };
-
-            meta = {
-              description = ''Macros to use :timer.apply_after and
-                            :timer.apply_interval with a block'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/adamkittelson/block_timer";
-            };
-          }
-      ) {};
-
-    block_timer = block_timer_0_0_1;
-
-    blockchain_info_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "blockchain_info";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "blockchain_info";
-              version = "0.0.1";
-              sha256 =
-                "22efbcc8df574ddddb9d548150fa704966a59397c103ce58d82a6597cbd5ccd2";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              longDescription = ''WIP BlockchainInfo API wrapper for Elixir.
-                                Provides access to bitcoin blockchain data.'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/cyberpunk-ventures/blockchain_info_ex";
-            };
-          }
-      ) {};
-
-    blockchain_info = blockchain_info_0_0_1;
-
     blocking_queue_1_3_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "blocking_queue";
             version = "1.3.0";
             src = fetchHex {
@@ -3417,40 +2776,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/joekain/BlockingQueue";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     blocking_queue = blocking_queue_1_3_0;
 
-    bloodhound_0_1_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "bloodhound";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "bloodhound";
-              version = "0.1.1";
-              sha256 =
-                "6aaab638fe90fc3714b650b659df774c7cdb12d098fee3910952e0a0f8fcd6ec";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''An ElasticSearch library for Elixir that can be
-                            easily integrated with Ecto'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ianwalter/bloodhound";
-            };
-          }
-      ) {};
-
-    bloodhound = bloodhound_0_1_1;
-
     bloomex_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "bloomex";
             version = "1.0.0";
             src = fetchHex {
@@ -3466,15 +2800,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/gmcabrita/bloomex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     bloomex = bloomex_1_0_0;
 
     bmark_1_0_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "bmark";
             version = "1.0.3";
             src = fetchHex {
@@ -3490,42 +2824,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/joekain/bmark";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     bmark = bmark_1_0_3;
 
-    bno055_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, gproc_0_5_0, elixir_ale_0_4_1 }:
-          buildMix {
-            name = "bno055";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "bno055";
-              version = "0.0.1";
-              sha256 =
-                "07f97909748be55dc7e3f31b9fbf708c5b43e9ba229f82b674aaa0ad57f35ef6";
-            };
-            beamDeps  = [ gproc_0_5_0 elixir_ale_0_4_1 ];
-
-            meta = {
-              longDescription = ''OTP application for reading the BNO-055
-                                absolute orientation sensor. Euler angles are
-                                read at 20hz and published to a configured local
-                                `gproc` property.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/TattdCodeMonkey/bno055";
-            };
-          }
-      ) {};
-
-    bno055 = bno055_0_0_1;
-
     boltun_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex, postgrex_0_11_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, postgrex_0_11_1 }:
+          buildMix ({
             name = "boltun";
             version = "0.0.4";
             src = fetchHex {
@@ -3543,177 +2850,15 @@ let
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/briksoftware/boltun";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     boltun = boltun_0_0_4;
 
-    booter_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "booter";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "booter";
-              version = "0.1.0";
-              sha256 =
-                "bb14263b5d5dc74c3f4086f764153a0d09b2b05a9cda6f4b121cc7789159a80e";
-            };
-
-            meta = {
-              description = ''Boot an Elixir application step by step'';
-              license = stdenv.lib.licenses.mpl11;
-              homepage = "https://github.com/eraserewind/booter";
-            };
-          }
-      ) {};
-
-    booter = booter_0_1_0;
-
-    botan_0_1_2 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "botan";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "botan";
-              version = "0.1.2";
-              sha256 =
-                "43541b5c52c91e46295a015f58857c347c85a7753d7c3cd3a1f835b25fdedaa9";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Elixir wrapper for Botan.io'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/mendab1e/exBotan";
-            };
-          }
-      ) {};
-
-    botan = botan_0_1_2;
-
-    bottler_0_5_0 = callPackage
-      (
-        {  buildMix, fetchHex, sshex_1_1_0 }:
-          buildMix {
-            name = "bottler";
-            version = "0.5.0";
-            src = fetchHex {
-              pkg = "bottler";
-              version = "0.5.0";
-              sha256 =
-                "a76b2ddfc98ef943ceb6730dd09fb3d085cb9dcc8feb8c739abbe0dcc77d8ffe";
-            };
-            beamDeps  = [ sshex_1_1_0 ];
-
-            meta = {
-              longDescription = ''Help you bottle, ship and serve your Elixir
-                                apps. Bottler is a collection of tools that aims
-                                to help you generate releases, ship them to your
-                                servers, install them there, and get them live
-                                on production.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/elpulgardelpanda/bottler";
-            };
-          }
-      ) {};
-
-    bottler = bottler_0_5_0;
-
-    bouncer_0_1_5 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          redix_0_3_6,
-          poolboy_1_5_1,
-          poison_1_5_2,
-          plug_1_1_3,
-          phoenix_1_1_4
-        }:
-          buildMix {
-            name = "bouncer";
-            version = "0.1.5";
-            src = fetchHex {
-              pkg = "bouncer";
-              version = "0.1.5";
-              sha256 =
-                "82979e9c8df401cbf5eb2dd09dff3952933cf2efd9135be1f0cb51ec04deb996";
-            };
-            beamDeps  = [
-                          redix_0_3_6
-                          poolboy_1_5_1
-                          poison_1_5_2
-                          plug_1_1_3
-                          phoenix_1_1_4
-                        ];
-
-            meta = {
-              description = ''Token-based authorization and session management
-                            for Phoenix (Elixir)'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ianwalter/bouncer";
-            };
-          }
-      ) {};
-
-    bouncer = bouncer_0_1_5;
-
-    brady_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, phoenix_1_1_4 }:
-          buildMix {
-            name = "brady";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "brady";
-              version = "0.0.2";
-              sha256 =
-                "90518fe90719cfb64d3b3d8a2947f14b2d8657414d9e9bb86cb03e7901334b0d";
-            };
-            beamDeps  = [ phoenix_1_1_4 ];
-
-            meta = {
-              description = ''Template helpers for Phoenix applications'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/thoughtbot/brady";
-            };
-          }
-      ) {};
-
-    brady = brady_0_0_2;
-
-    braintree_0_3_2 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2 }:
-          buildMix {
-            name = "braintree";
-            version = "0.3.2";
-            src = fetchHex {
-              pkg = "braintree";
-              version = "0.3.2";
-              sha256 =
-                "cfc2aa7fc94c74eeb41c34a401fa8784f9c423268086c797949d0f0dc5c657a3";
-            };
-            beamDeps  = [ httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Native Braintree client library for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/sorentwo/braintree-elixir";
-            };
-          }
-      ) {};
-
-    braintree = braintree_0_3_2;
-
     braise_0_3_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_3_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_1_3_1 }:
+          buildMix ({
             name = "braise";
             version = "0.3.2";
             src = fetchHex {
@@ -3730,15 +2875,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/IoraHealth/braise";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     braise = braise_0_3_2;
 
     brcpfcnpj_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "brcpfcnpj";
             version = "0.1.0";
             src = fetchHex {
@@ -3755,15 +2900,15 @@ let
               license = stdenv.lib.licenses.unlicense;
               homepage = "https://github.com/williamgueiros/Brcpfcnpj";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     brcpfcnpj = brcpfcnpj_0_1_0;
 
     breadcrumble_1_0_3 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "breadcrumble";
             version = "1.0.3";
             src = fetchHex {
@@ -3779,15 +2924,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ma2gedev/breadcrumble_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     breadcrumble = breadcrumble_1_0_3;
 
     briefly_0_3_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "briefly";
             version = "0.3.0";
             src = fetchHex {
@@ -3802,15 +2947,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/CargoSense/briefly";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     briefly = briefly_0_3_0;
 
     browser_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "browser";
             version = "0.1.2";
             src = fetchHex {
@@ -3825,38 +2970,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/tuvistavie/elixir-browser";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     browser = browser_0_1_2;
 
-    bson_0_4_4 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "bson";
-            version = "0.4.4";
-            src = fetchHex {
-              pkg = "bson";
-              version = "0.4.4";
-              sha256 =
-                "69cbda1d27fd0f500f306c99e609593132c66b521b92a21ce6f21fea88dc3d27";
-            };
-
-            meta = {
-              description = ''BSON implementation for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/checkiz/elixir-bson";
-            };
-          }
-      ) {};
-
-    bson = bson_0_4_4;
-
     bstr_0_3_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "bstr";
             version = "0.3.0";
             src = fetchHex {
@@ -3871,15 +2993,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/jcomellas/bstr";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     bstr = bstr_0_3_0;
 
     buffer_0_3_6 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "buffer";
             version = "0.3.6";
             src = fetchHex {
@@ -3894,64 +3016,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/adrienmo/buffer";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     buffer = buffer_0_3_6;
 
-    bugsnag_1_2_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "bugsnag";
-            version = "1.2.0";
-            src = fetchHex {
-              pkg = "bugsnag";
-              version = "1.2.0";
-              sha256 =
-                "23c6e8eb827ec1294684b5fe788d4d1cd670804ddfb74bb2bd427aed44a68f05";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''An Elixir interface to the Bugsnag API'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jarednorman/bugsnag-elixir";
-            };
-          }
-      ) {};
-
-    bugsnag = bugsnag_1_2_0;
-
-    bugsnag_erl_0_1_3 = callPackage
-      (
-        {  buildRebar3, fetchHex, lager_2_1_1, jsx_2_8_0 }:
-          buildRebar3 {
-            name = "bugsnag_erl";
-            version = "0.1.3";
-            src = fetchHex {
-              pkg = "bugsnag_erl";
-              version = "0.1.3";
-              sha256 =
-                "02b400b8f7f606c580ca81311279ef8bbe99c2cfc32b0b956af1644594ddaf2b";
-            };
-
-            beamDeps  = [ lager_2_1_1 jsx_2_8_0 ];
-
-            meta = {
-              description = ''Bugsnag notifier'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/project-fifo/bugsnag-erlang";
-            };
-          }
-      ) {};
-
-    bugsnag_erl = bugsnag_erl_0_1_3;
-
     build_client_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "build_client";
             version = "0.0.1";
             src = fetchHex {
@@ -3966,39 +3039,15 @@ let
 
               homepage = "https://github.com/dapdizzy/build_client";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     build_client = build_client_0_0_1;
 
-    bump_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "bump";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "bump";
-              version = "0.1.0";
-              sha256 =
-                "068b418026a90382f9809ffe0504579f7ccea981f794ff6257ba2a0925b91360";
-            };
-
-            meta = {
-              description = ''A library for writing BMP files from binary data.
-                            '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/evanfarrar/ex_bump";
-            };
-          }
-      ) {};
-
-    bump = bump_0_1_0;
-
     bunt_0_1_5 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "bunt";
             version = "0.1.5";
             src = fetchHex {
@@ -4013,178 +3062,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/rrrene/bunt";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     bunt = bunt_0_1_5;
 
-    bureaucrat_0_1_2 = callPackage
-      (
-        {  buildMix, fetchHex, plug_0_5_2 }:
-          buildMix {
-            name = "bureaucrat";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "bureaucrat";
-              version = "0.1.2";
-              sha256 =
-                "cd746f6f9ee9927b1b81ae7834c7b0a045df7e53151674d8b3d8de5832ec7402";
-            };
-            beamDeps  = [ plug_0_5_2 ];
-
-            meta = {
-              description = ''Generate Phoenix API documentation from tests'';
-              license = stdenv.lib.licenses.unlicense;
-              homepage = "https://github.com/api-hogs/bureaucrat";
-            };
-          }
-      ) {};
-
-    bureaucrat = bureaucrat_0_1_2;
-
-    butler_0_7_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
-          buildMix {
-            name = "butler";
-            version = "0.7.0";
-            src = fetchHex {
-              pkg = "butler";
-              version = "0.7.0";
-              sha256 =
-                "0a6ab3880449370d4fe40355372c8929ff16031fd5d118a8936739cb034b45bd";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
-
-            meta = {
-              description = ''A simple elixir robot to help you get things
-                            done'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/keathley/butler";
-            };
-          }
-      ) {};
-
-    butler_0_7_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
-          buildMix {
-            name = "butler";
-            version = "0.7.1";
-            src = fetchHex {
-              pkg = "butler";
-              version = "0.7.1";
-              sha256 =
-                "fdc4226c0347ea94e6b535c7d352c098720bdfad280357dad9b4d8bd3c346bd7";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
-
-            meta = {
-              description = ''A simple elixir robot to help you get things
-                            done'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/keathley/butler";
-            };
-          }
-      ) {};
-
-    butler = butler_0_7_1;
-
-    butler_cage_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, butler_0_7_1 }:
-          buildMix {
-            name = "butler_cage";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "butler_cage";
-              version = "0.0.2";
-              sha256 =
-                "22c5d1d0cbe6c19fffae260b02717a984ee5632c34492ee4254972ca4ab8e059";
-            };
-            beamDeps  = [ butler_0_7_1 ];
-
-            meta = {
-              description = ''A Butler plugin for showing silly photos of Nick
-                            Cage.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/keathley/butler_cage";
-            };
-          }
-      ) {};
-
-    butler_cage = butler_cage_0_0_2;
-
-    butler_cowsay_0_2_1 = callPackage
-      (
-        {  buildMix, fetchHex, cowsay_0_0_1, butler_0_7_0 }:
-          buildMix {
-            name = "butler_cowsay";
-            version = "0.2.1";
-            src = fetchHex {
-              pkg = "butler_cowsay";
-              version = "0.2.1";
-              sha256 =
-                "d5b6ef82ebd387666c8b8d4fd93df3d11ff2ed7a129ae3aa7d7faac9ae803195";
-            };
-            beamDeps  = [ cowsay_0_0_1 butler_0_7_0 ];
-
-            meta = {
-              description = ''ButlerCowsay plugin for Butler SlackBot'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bbrock25/butler_cowsay";
-            };
-          }
-      ) {};
-
-    butler_cowsay = butler_cowsay_0_2_1;
-
-    butler_new_0_4_3 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "butler_new";
-            version = "0.4.3";
-            src = fetchHex {
-              pkg = "butler_new";
-              version = "0.4.3";
-              sha256 =
-                "ef68a4957dde207e7663c3947d8ec93d8e24c9872619bd66b47d52abfb2b3d90";
-            };
-             meta = {    };
-          }
-      ) {};
-
-    butler_new = butler_new_0_4_3;
-
-    butler_tableflip_0_0_3 = callPackage
-      (
-        {  buildMix, fetchHex, butler_0_7_1 }:
-          buildMix {
-            name = "butler_tableflip";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "butler_tableflip";
-              version = "0.0.3";
-              sha256 =
-                "327840e6a07b8a3f2cc461920aea0a1cf39898b6fc0e1484e94867810dfea444";
-            };
-            beamDeps  = [ butler_0_7_1 ];
-
-            meta = {
-              description = ''Butler Plugin for flipping tables.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/keathley/butler_tableflip";
-            };
-          }
-      ) {};
-
-    butler_tableflip = butler_tableflip_0_0_3;
-
     bypass_0_5_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_3,
+          cowboy_1_0_4
+        }:
+          buildMix ({
             name = "bypass";
             version = "0.5.1";
             src = fetchHex {
@@ -4207,40 +3099,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/pspdfkit-labs/bypass";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     bypass = bypass_0_5_1;
 
-    cache_tab_1_0_2 = callPackage
-      (
-        {  buildRebar3, fetchHex, p1_utils_1_0_3 }:
-          buildRebar3 {
-            name = "cache_tab";
-            version = "1.0.2";
-            src = fetchHex {
-              pkg = "cache_tab";
-              version = "1.0.2";
-              sha256 =
-                "1d802a8bdf01178e1c6171037cc6e66da1a0c9fbb6589f644919d9a7402ebcd2";
-            };
-
-            beamDeps  = [ p1_utils_1_0_3 ];
-
-            meta = {
-              description = ''In-memory cache Erlang / Elixir library'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/processone/cache_tab";
-            };
-          }
-      ) {};
-
-    cache_tab = cache_tab_1_0_2;
-
     cachex_0_8_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "cachex";
             version = "0.8.0";
             src = fetchHex {
@@ -4256,41 +3123,17 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/zackehh/cachex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cachex = cachex_0_8_0;
 
-    calecto_0_5_2 = callPackage
-      (
-        {  buildMix, fetchHex, ecto_0_2_7, calendar_0_12_4 }:
-          buildMix {
-            name = "calecto";
-            version = "0.5.2";
-            src = fetchHex {
-              pkg = "calecto";
-              version = "0.5.2";
-              sha256 =
-                "ed21765dea78d2b3888a11c83c9642aee0624098625bc32b0eb642b9e3578ef7";
-            };
-            beamDeps  = [ ecto_0_2_7 calendar_0_12_4 ];
-
-            meta = {
-              longDescription = ''Library for using Calendar with Ecto. This
-                                lets you save Calendar types in Ecto and work
-                                with date-times in multiple timezones.'';
-
-              homepage = "https://github.com/lau/calecto";
-            };
-          }
-      ) {};
-
-    calecto = calecto_0_5_2;
-
     calendar_0_12_4 = callPackage
       (
-        {  buildMix, fetchHex, tzdata_0_1_201603 }:
-          buildMix {
+        {
+          buildMix, packageOverrides ? {}, fetchHex, tzdata_0_1_201603
+        }:
+          buildMix ({
             name = "calendar";
             version = "0.12.4";
             src = fetchHex {
@@ -4315,13 +3158,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/lau/calendar";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     calendar_0_13_2 = callPackage
       (
-        {  buildMix, fetchHex, tzdata_0_1_201603 }:
-          buildMix {
+        {
+          buildMix, packageOverrides ? {}, fetchHex, tzdata_0_1_201603
+        }:
+          buildMix ({
             name = "calendar";
             version = "0.13.2";
             src = fetchHex {
@@ -4346,15 +3191,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/lau/calendar";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     calendar = calendar_0_13_2;
 
     calendar_translations_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, calendar_0_13_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, calendar_0_13_2 }:
+          buildMix ({
             name = "calendar_translations";
             version = "0.0.3";
             src = fetchHex {
@@ -4370,15 +3215,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/padde/calendar_translations";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     calendar_translations = calendar_translations_0_0_3;
 
     calliope_0_3_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "calliope";
             version = "0.3.0";
             src = fetchHex {
@@ -4389,95 +3234,19 @@ let
             };
 
             meta = {
-              description = ''An Elixir library for parsing haml templates. '';
+              description = ''An Elixir library for parsing haml templates.'';
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/nurugger07/calliope";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     calliope = calliope_0_3_0;
 
-    canada_1_0_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "canada";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "canada";
-              version = "1.0.0";
-              sha256 =
-                "5f4eb50f2f2747e5f3e8750760e2683b38667e113281a7a71b502d1aa52d89d1";
-            };
-
-            meta = {
-              description = '' A DSL for declarative permissions '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jarednorman/canada";
-            };
-          }
-      ) {};
-
-    canada = canada_1_0_0;
-
-    canary_0_14_1 = callPackage
-      (
-        {
-          buildMix, fetchHex, plug_1_1_3, ecto_2_0_0_beta_2, canada_1_0_0
-        }:
-          buildMix {
-            name = "canary";
-            version = "0.14.1";
-            src = fetchHex {
-              pkg = "canary";
-              version = "0.14.1";
-              sha256 =
-                "8ee0f96f4f98c0c0188eea68b2d90adae8e6af527eb04ee8623811bd58be7f0c";
-            };
-            beamDeps  = [ plug_1_1_3 ecto_2_0_0_beta_2 canada_1_0_0 ];
-
-            meta = {
-              longDescription = ''An authorization library to restrict what
-                                resources the current user is allowed to access,
-                                and load resources for you.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/cpjk/canary";
-            };
-          }
-      ) {};
-
-    canary = canary_0_14_1;
-
-    carrier_1_0_4 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
-          buildMix {
-            name = "carrier";
-            version = "1.0.4";
-            src = fetchHex {
-              pkg = "carrier";
-              version = "1.0.4";
-              sha256 =
-                "9ea767fa6dfc35b1b5ebcdf3d737ea741589100573406969cea7579bbb51c0de";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
-
-            meta = {
-              description = ''Elixir library for interacting with
-                            SmartyStreets'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/mylanconnolly/carrier";
-            };
-          }
-      ) {};
-
-    carrier = carrier_1_0_4;
-
     cartographer_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "cartographer";
             version = "0.0.1";
             src = fetchHex {
@@ -4492,201 +3261,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/afronski/cartographer";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cartographer = cartographer_0_0_1;
 
-    cassette_1_0_0 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2, exml_0_1_0 }:
-          buildMix {
-            name = "cassette";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "cassette";
-              version = "1.0.0";
-              sha256 =
-                "cbb9e1bffc2161ac51f6b8b376159e6bf1f39a2f41a9f07f861653cfb4c4e531";
-            };
-            beamDeps  = [ httpoison_0_8_2 exml_0_1_0 ];
-
-            meta = {
-              description = ''A CAS client and validation library'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/locaweb/elixir-cassette";
-            };
-          }
-      ) {};
-
-    cassette = cassette_1_0_0;
-
-    cassette_plug_1_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, plug_1_1_3, cassette_1_0_0 }:
-          buildMix {
-            name = "cassette_plug";
-            version = "1.0.1";
-            src = fetchHex {
-              pkg = "cassette_plug";
-              version = "1.0.1";
-              sha256 =
-                "7c6ca0bacb3660efd1367b95c8a2d70e485e2842b9bfc87bdeb85c33882dc164";
-            };
-            beamDeps  = [ plug_1_1_3 cassette_1_0_0 ];
-
-            meta = {
-              description = ''An auth Plug using Cassette'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/locaweb/cassette-plug";
-            };
-          }
-      ) {};
-
-    cassette_plug = cassette_plug_1_0_1;
-
-    cassius_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "cassius";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "cassius";
-              version = "0.0.1";
-              sha256 =
-                "3fe26f2b1fceed3c553871dcf954955063e01ab2e2de41d8322e58bd03348c17";
-            };
-
-            meta = {
-              description = ''Monitor linux file system events'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jquadrin/cassius";
-            };
-          }
-      ) {};
-
-    cassius = cassius_0_0_1;
-
-    cauldron_0_1_5 = callPackage
-      (
-        {  buildMix, fetchHex, httprot_0_1_7, reagent_0_1_5 }:
-          buildMix {
-            name = "cauldron";
-            version = "0.1.5";
-            src = fetchHex {
-              pkg = "cauldron";
-              version = "0.1.5";
-              sha256 =
-                "565ee9bb6800512a3c9e8a58951455904c44d8f0ec207e80e20aef9f8cb7d6b1";
-            };
-            beamDeps  = [ httprot_0_1_7 reagent_0_1_5 ];
-
-            meta = {
-              description = ''Web server library written in Elixir'';
-              license = stdenv.lib.licenses.wtfpl;
-              homepage = "https://github.com/meh/cauldron";
-            };
-          }
-      ) {};
-
-    cauldron = cauldron_0_1_5;
-
-    caylir_0_2_0 = callPackage
-      (
-        {
-          buildMix, fetchHex, poolboy_1_5_1, poison_1_5_2, hackney_1_6_0
-        }:
-          buildMix {
-            name = "caylir";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "caylir";
-              version = "0.2.0";
-              sha256 =
-                "b3699171f2bef699ce1968394cb2aee3b5ec7db529a395d8bf7d85163067f888";
-            };
-            beamDeps  = [ poolboy_1_5_1 poison_1_5_2 hackney_1_6_0 ];
-
-            meta = {
-              description = ''Cayley driver for Elixir'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/mneudert/caylir";
-            };
-          }
-      ) {};
-
-    caylir = caylir_0_2_0;
-
-    ccc_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "ccc";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "ccc";
-              version = "0.0.2";
-              sha256 =
-                "cb976cf81c8497a271d3c6a4b20be4d0e569d5a0db3a60a227e1e8a13ee6abf7";
-            };
-
-            meta = {
-              description = ''Character Code Converter'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/Joe-noh/ccc";
-            };
-          }
-      ) {};
-
-    ccc = ccc_0_0_2;
-
-    cep_0_0_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          sweet_xml_0_6_1,
-          poolboy_1_5_1,
-          poison_2_1_0,
-          httpoison_0_8_2,
-          codepagex_0_1_2
-        }:
-          buildMix {
-            name = "cep";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "cep";
-              version = "0.0.1";
-              sha256 =
-                "f76e67e1d989fc2edbfbd265f79e4a33a0aa7f9ff06934a1f2d49903df72b79f";
-            };
-            beamDeps  = [
-                          sweet_xml_0_6_1
-                          poolboy_1_5_1
-                          poison_2_1_0
-                          httpoison_0_8_2
-                          codepagex_0_1_2
-                        ];
-
-            meta = {
-              longDescription = ''A package to query Brazilian CEP codes. Has
-                                support for multiple source APIs (Correios,
-                                ViaCep, Postmon, etc). It can query one specific
-                                source or query until one source returns a valid
-                                result.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/douglascamata/cep";
-            };
-          }
-      ) {};
-
-    cep = cep_0_0_1;
-
     certifi_0_1_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "certifi";
             version = "0.1.1";
             src = fetchHex {
@@ -4696,18 +3279,21 @@ let
                 "e6d1dda48fad1b1c5b454c8402e2ac375ae12bf85a9910decaf791f330a7de29";
             };
 
+            buildPlugins  = [ rebar3_hex ];
+
+
             meta = {
               description = ''An OTP library'';
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/certifi/erlang-certifi";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     certifi_0_3_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "certifi";
             version = "0.3.0";
             src = fetchHex {
@@ -4722,13 +3308,13 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/certifi/erlang-certifi";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     certifi_0_4_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "certifi";
             version = "0.4.0";
             src = fetchHex {
@@ -4743,79 +3329,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/certifi/erlang-certifi";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     certifi = certifi_0_4_0;
 
-    cesso_0_1_3 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "cesso";
-            version = "0.1.3";
-            src = fetchHex {
-              pkg = "cesso";
-              version = "0.1.3";
-              sha256 =
-                "54ba81e0d1358095e00305e48cd3917bc9ee06905bdaab7bc60c7ae3489a6ba7";
-            };
-
-            meta = {
-              description = ''CSV handling library for Elixir.'';
-              license = stdenv.lib.licenses.wtfpl;
-              homepage = "https://github.com/meh/cesso";
-            };
-          }
-      ) {};
-
-    cesso = cesso_0_1_3;
-
-    cet_0_2_3 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          lager_3_0_1,
-          jsx_2_8_0,
-          gen_smtp_0_9_0,
-          cowboy_1_0_4,
-          bstr_0_3_0,
-          bbmustache_1_0_4
-        }:
-          buildRebar3 {
-            name = "cet";
-            version = "0.2.3";
-            src = fetchHex {
-              pkg = "cet";
-              version = "0.2.3";
-              sha256 =
-                "4942c6d86568ee8daffebfece8b73dcef3d91702484480b27a2b32590ad0894e";
-            };
-
-            beamDeps  = [
-                          lager_3_0_1
-                          jsx_2_8_0
-                          gen_smtp_0_9_0
-                          cowboy_1_0_4
-                          bstr_0_3_0
-                          bbmustache_1_0_4
-                        ];
-
-            meta = {
-              description = ''Cielo24 Erlang Tools'';
-
-              homepage = "https://github.com/Cielo24/cet";
-            };
-          }
-      ) {};
-
-    cet = cet_0_2_3;
-
     cf_0_1_2 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "cf";
             version = "0.1.2";
             src = fetchHex {
@@ -4829,13 +3351,13 @@ let
               description = ''Terminal colour helper'';
               license = stdenv.lib.licenses.mit;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cf_0_2_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "cf";
             version = "0.2.1";
             src = fetchHex {
@@ -4849,15 +3371,15 @@ let
               description = ''Terminal colour helper'';
               license = stdenv.lib.licenses.mit;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cf = cf_0_2_1;
 
     chacha20_0_3_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "chacha20";
             version = "0.3.2";
             src = fetchHex {
@@ -4872,15 +3394,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mwmiller/chacha20_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     chacha20 = chacha20_0_3_2;
 
     changeset_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex, defmemo_0_1_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, defmemo_0_1_1 }:
+          buildMix ({
             name = "changeset";
             version = "0.2.1";
             src = fetchHex {
@@ -4897,15 +3419,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/erwald/elixir-changeset";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     changeset = changeset_0_2_1;
 
     changex_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "changex";
             version = "0.1.1";
             src = fetchHex {
@@ -4921,108 +3443,21 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/Gazler/changex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     changex = changex_0_1_1;
 
-    chaos_spawn_0_7_0 = callPackage
-      (
-        {  buildMix, fetchHex, timex_0_19_5, exactor_2_2_0 }:
-          buildMix {
-            name = "chaos_spawn";
-            version = "0.7.0";
-            src = fetchHex {
-              pkg = "chaos_spawn";
-              version = "0.7.0";
-              sha256 =
-                "c4c8e985e750706fb4351d6eb036b513a4b7ea3e689a9aecd424251991f21eaa";
-            };
-            beamDeps  = [ timex_0_19_5 exactor_2_2_0 ];
-
-            meta = {
-              longDescription = ''Providing tools to randomly kill proceses.
-                                With the goal of creating robust supevision
-                                trees.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/meadsteve/chaos-spawn";
-            };
-          }
-      ) {};
-
-    chaos_spawn = chaos_spawn_0_7_0;
-
-    charlotte_0_4_0 = callPackage
+    chartkick_0_0_2 = callPackage
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
-          cowboy_1_0_4,
-          env_conf_0_3_0,
-          uuid_1_0_0,
-          jazz_0_2_1
+          uuid_1_1_3,
+          poison_1_5_2
         }:
-          buildMix {
-            name = "charlotte";
-            version = "0.4.0";
-            src = fetchHex {
-              pkg = "charlotte";
-              version = "0.4.0";
-              sha256 =
-                "2c0eb1335922bec0c6bc5e8f3dc4d84192657b708c2558742f676ed430f0950f";
-            };
-            beamDeps  = [ cowboy_1_0_4 env_conf_0_3_0 uuid_1_0_0 jazz_0_2_1
-                      ];
-
-            meta = {
-              longDescription = '' Charlotte is a Web Framework. It takes a
-                                little from Rails and a little from Sinatra and
-                                does a few things it`s own way. The goal is to
-                                be light weight, fun and get out of your way.
-                                defmodule Controller do use
-                                Charlotte.Handlers.HTTP def routes do [
-                                {"/path", :path}, {"/path/:part",
-                                :path_with_part} ] end def path("GET", _params,
-                                conn) do render [message: "hello from path"],
-                                conn end def path(verb, _params, conn) do
-                                respond 405, {"Allowed", "GET"}, "#{verb} not
-                                allowed", conn end end '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/LeakyBucket/charlotte.git";
-            };
-          }
-      ) {};
-
-    charlotte = charlotte_0_4_0;
-
-    charm_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "charm";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "charm";
-              version = "0.0.1";
-              sha256 =
-                "97a05c37c76b2efa5e8bd3c47333e9ebfe4f7c8777540900fcbec70c287bffa7";
-            };
-
-            meta = {
-              description = ''Use ansi terminal characters to write colors and
-                            cursor positions.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/tomgco/elixir-charm";
-            };
-          }
-      ) {};
-
-    charm = charm_0_0_1;
-
-    chartkick_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, uuid_1_1_3, poison_1_5_2 }:
-          buildMix {
+          buildMix ({
             name = "chartkick";
             version = "0.0.2";
             src = fetchHex {
@@ -5034,15 +3469,15 @@ let
             beamDeps  = [ uuid_1_1_3 poison_1_5_2 ];
 
             meta = {    };
-          }
+          } // packageOverrides)
       ) {};
 
     chartkick = chartkick_0_0_2;
 
     chash_0_1_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "chash";
             version = "0.1.1";
             src = fetchHex {
@@ -5057,73 +3492,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/project-fifo/chash";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     chash = chash_0_1_1;
 
-    chatter_0_0_14 = callPackage
-      (
-        {
-          buildMix, fetchHex, snappy_1_1_1, ranch_1_2_1, exactor_2_2_0
-        }:
-          buildMix {
-            name = "chatter";
-            version = "0.0.14";
-            src = fetchHex {
-              pkg = "chatter";
-              version = "0.0.14";
-              sha256 =
-                "6f6ee9aac860198a08322f77a334df82c43e38aa9f5fa7186034bf84ac86f060";
-            };
-            beamDeps  = [ snappy_1_1_1 ranch_1_2_1 exactor_2_2_0 ];
-
-            meta = {
-              longDescription = ''Chatter is extracted from the ScaleSmall
-                                project as a standalone piece. This may be used
-                                independently to broadcast messages to a set of
-                                nodes. It uses a mixture of UDP multicast and
-                                TCP to deliver messages and tries to minimize
-                                network traffic while doing so.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/dbeck/chatter_ex/";
-            };
-          }
-      ) {};
-
-    chatter = chatter_0_0_14;
-
-    chinese_translation_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2 }:
-          buildMix {
-            name = "chinese_translation";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "chinese_translation";
-              version = "0.1.0";
-              sha256 =
-                "d5e4f59421bad59e465322ce7a8f366179e5f6a732d7e06435e8a7c01f42e7ab";
-            };
-            beamDeps  = [ httpoison_0_8_2 ];
-
-            meta = {
-              longDescription = ''ChineseTranslation provides traditional
-                                chinese <-> simplified chinese translation, as
-                                well as pinyin translation and slugify for
-                                chinese phrases/characters. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/tyrchen/chinese_translation";
-            };
-          }
-      ) {};
-
-    chinese_translation = chinese_translation_0_1_0;
-
     chronos_0_3_9 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "chronos";
             version = "0.3.9";
             src = fetchHex {
@@ -5140,13 +3517,13 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/nurugger07/chronos";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     chronos_1_5_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "chronos";
             version = "1.5.1";
             src = fetchHex {
@@ -5163,15 +3540,17 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/nurugger07/chronos";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     chronos = chronos_1_5_1;
 
     chunky_svg_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex, xml_builder_0_0_8 }:
-          buildMix {
+        {
+          buildMix, packageOverrides ? {}, fetchHex, xml_builder_0_0_8
+        }:
+          buildMix ({
             name = "chunky_svg";
             version = "0.0.4";
             src = fetchHex {
@@ -5187,15 +3566,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mmmries/chunky_svg";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     chunky_svg = chunky_svg_0_0_4;
 
     cidr_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "cidr";
             version = "1.0.0";
             src = fetchHex {
@@ -5211,15 +3590,15 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/c-rack/cidr-elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cidr = cidr_1_0_0;
 
     cipher_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "cipher";
             version = "0.1.0";
             src = fetchHex {
@@ -5241,44 +3620,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/rubencaro/cipher";
             };
-          }
+          } // packageOverrides)
       ) {};
 
-    cipher_1_0_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0 }:
-          buildMix {
-            name = "cipher";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "cipher";
-              version = "1.0.0";
-              sha256 =
-                "a83812b09b65c6a821129e709fee31b4f96ccc0c547e29fe42928ed49811ed79";
-            };
-            beamDeps  = [ poison_2_1_0 ];
-
-            meta = {
-              longDescription = ''Elixir crypto library to encrypt/decrypt
-                                arbitrary binaries. It uses Erlang Crypto, so
-                                it`s not big deal. Mostly a collection of
-                                helpers wrapping it. It allows to use a crypted
-                                key to validate signed requests. The exact same
-                                cipher is implemented for Python, Ruby and
-                                Elixir, so it can be used to integrate apps from
-                                different languages.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/rubencaro/cipher";
-            };
-          }
-      ) {};
-
-    cipher = cipher_1_0_0;
-
     cirru_parser_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "cirru_parser";
             version = "0.0.1";
             src = fetchHex {
@@ -5293,15 +3641,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/Cirru/parser.ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cirru_parser = cirru_parser_0_0_1;
 
     ckan_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpotion_2_2_2 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpotion_2_2_2
+        }:
+          buildMix ({
             name = "ckan";
             version = "0.0.2";
             src = fetchHex {
@@ -5318,100 +3672,21 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/rossjones/ckan_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ckan = ckan_0_0_2;
 
-    cldr_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "cldr";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "cldr";
-              version = "0.0.1";
-              sha256 =
-                "12e38f1ac12957606db8bd63314d98e40db007ff413de8f2ec94e0520a078201";
-            };
-
-            meta = {
-              description = ''cldr is a library to use information from CLDR
-                            data. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/magicienap/cldr";
-            };
-          }
-      ) {};
-
-    cldr = cldr_0_0_1;
-
-    cleverbot_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_7_5 }:
-          buildMix {
-            name = "cleverbot";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "cleverbot";
-              version = "0.0.1";
-              sha256 =
-                "2a6f1bedbfd03fa0bbceff1134976d720e349cd7551cd5033eadf79f6cea4622";
-            };
-            beamDeps  = [ httpoison_0_7_5 ];
-
-            meta = {
-              description = ''A Cleverbot API wrapper.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/BlakeWilliams/Elixir-Cleverbot";
-            };
-          }
-      ) {};
-
-    cleverbot = cleverbot_0_0_1;
-
-    clicksign_0_0_2 = callPackage
+    clint_0_0_1 = callPackage
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
-          plug_1_1_3,
-          httpoison_0_8_2,
-          exjsx_3_2_0,
-          cowboy_1_0_4,
-          bypass_0_5_1
+          plug_0_11_3,
+          cowboy_1_0_4
         }:
-          buildMix {
-            name = "clicksign";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "clicksign";
-              version = "0.0.2";
-              sha256 =
-                "e6e9335c86298d5d5af6c18b85f3533554eca74d6129e1aea7dae17849b48ed2";
-            };
-            beamDeps  = [
-                          plug_1_1_3
-                          httpoison_0_8_2
-                          exjsx_3_2_0
-                          cowboy_1_0_4
-                          bypass_0_5_1
-                        ];
-
-            meta = {
-              description = ''Clicksign client'';
-
-            };
-          }
-      ) {};
-
-    clicksign = clicksign_0_0_2;
-
-    clint_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, plug_0_11_3, cowboy_1_0_4 }:
-          buildMix {
+          buildMix ({
             name = "clint";
             version = "0.0.1";
             src = fetchHex {
@@ -5428,15 +3703,17 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/lpil/clint";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     clint = clint_0_0_1;
 
     clique_3_0_1 = callPackage
       (
-        {  buildRebar3, fetchHex, cuttlefish_2_0_7 }:
-          buildRebar3 {
+        {
+          buildRebar3, packageOverrides ? {}, fetchHex, cuttlefish_2_0_7
+        }:
+          buildRebar3 ({
             name = "clique";
             version = "3.0.1";
             src = fetchHex {
@@ -5453,39 +3730,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/basho/clique";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     clique = clique_3_0_1;
 
-    cloak_0_2_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, ecto_2_0_0_beta_2 }:
-          buildMix {
-            name = "cloak";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "cloak";
-              version = "0.2.0";
-              sha256 =
-                "8e2455ab420102280719efc86cee7a58d1de358a541cd7d1b49b74fa30fa8fb8";
-            };
-            beamDeps  = [ poison_2_1_0 ecto_2_0_0_beta_2 ];
-
-            meta = {
-              description = ''Encrypted fields for Ecto.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/danielberkompas/cloak";
-            };
-          }
-      ) {};
-
-    cloak = cloak_0_2_0;
-
     close_enough_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "close_enough";
             version = "0.0.1";
             src = fetchHex {
@@ -5501,908 +3754,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/sivsushruth/close_enough";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     close_enough = close_enough_0_0_1;
 
-    cloudex_0_0_2 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          tzdata_0_5_7,
-          timex_0_19_5,
-          poison_1_5_2,
-          httpoison_0_8_2
-        }:
-          buildMix {
-            name = "cloudex";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "cloudex";
-              version = "0.0.2";
-              sha256 =
-                "eb424a8e6610de6f7a2f2be074937c571a86d11e4b942d2ea39900855a66b306";
-            };
-            beamDeps  = [
-                          tzdata_0_5_7 timex_0_19_5 poison_1_5_2 httpoison_0_8_2
-                        ];
-
-            meta = {
-              longDescription = ''A library that helps with uploading image
-                                files and urls to cloudinary. Also provides an
-                                helper to generate transformations and
-                                cloudinary urls pointing to your images'';
-              license = stdenv.lib.licenses.wtfpl;
-              homepage = "https://github.com/smeevil/cloudex";
-            };
-          }
-      ) {};
-
-    cloudex = cloudex_0_0_2;
-
-    cloudi_core_1_5_1 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          varpool_1_5_1,
-          uuid_erl_1_5_1,
-          trie_1_5_1,
-          syslog_1_0_2,
-          supool_1_5_1,
-          reltool_util_1_5_1,
-          quickrand_1_5_1,
-          pqueue_1_5_1,
-          nodefinder_1_5_1,
-          keys1value_1_5_1,
-          key2value_1_5_1,
-          erlang_term_1_5_1,
-          dynamic_compile_1_0_0,
-          cpg_1_5_1
-        }:
-          buildRebar3 {
-            name = "cloudi_core";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_core";
-              version = "1.5.1";
-              sha256 =
-                "1dd4471c9c5d5b0e8c0ccaff2878e046c430a8b00d59c2c0a41ed29cba1102ba";
-            };
-
-            beamDeps  = [
-                          varpool_1_5_1
-                          uuid_erl_1_5_1
-                          trie_1_5_1
-                          syslog_1_0_2
-                          supool_1_5_1
-                          reltool_util_1_5_1
-                          quickrand_1_5_1
-                          pqueue_1_5_1
-                          nodefinder_1_5_1
-                          keys1value_1_5_1
-                          key2value_1_5_1
-                          erlang_term_1_5_1
-                          dynamic_compile_1_0_0
-                          cpg_1_5_1
-                        ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_core = cloudi_core_1_5_1;
-
-    cloudi_service_api_requests_1_5_1 = callPackage
-      (
-        {
-          buildRebar3, fetchHex, trie_1_5_1, jsx_2_3_1, cloudi_core_1_5_1
-        }:
-          buildRebar3 {
-            name = "cloudi_service_api_requests";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_service_api_requests";
-              version = "1.5.1";
-              sha256 =
-                "3af4a6bb4ef9f428f6044a752cc5c37cd7bf9fdc7d26407044b8c716b40c86f3";
-            };
-
-            beamDeps  = [ trie_1_5_1 jsx_2_3_1 cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework API requests
-                            (JSON-RPC/Erlang-term support)'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_api_requests = cloudi_service_api_requests_1_5_1;
-
-    cloudi_service_db_1_5_1 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          uuid_erl_1_5_1,
-          trie_1_5_1,
-          cloudi_core_1_5_1
-        }:
-          buildRebar3 {
-            name = "cloudi_service_db";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_service_db";
-              version = "1.5.1";
-              sha256 =
-                "067fccc8ca006722021b873995245f498a86582540bf738f6648bdceebd187e9";
-            };
-
-            beamDeps  = [ uuid_erl_1_5_1 trie_1_5_1 cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework Database
-                            (in-memory/testing/generic)'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_db = cloudi_service_db_1_5_1;
-
-    cloudi_service_db_cassandra_1_3_3 = callPackage
-      (
-        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
-          buildRebar3 {
-            name = "cloudi_service_db_cassandra";
-            version = "1.3.3";
-            src = fetchHex {
-              pkg = "cloudi_service_db_cassandra";
-              version = "1.3.3";
-              sha256 =
-                "78c9f924df50466fc3d27ffdd38dd235562be2ba4da5c298c569b3eee2bc10ef";
-            };
-
-            beamDeps  = [ cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework Cassandra
-                            Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_db_cassandra = cloudi_service_db_cassandra_1_3_3;
-
-    cloudi_service_db_cassandra_cql_1_5_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
-          buildRebar3 {
-            name = "cloudi_service_db_cassandra_cql";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_service_db_cassandra_cql";
-              version = "1.5.1";
-              sha256 =
-                "09173e571262745de51bb0b53732d909d846c80079ce33b976df7d61584f9ba8";
-            };
-
-            beamDeps  = [ cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework Cassandra CQL
-                            Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_db_cassandra_cql =
-      cloudi_service_db_cassandra_cql_1_5_1;
-
-    cloudi_service_db_couchdb_1_5_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
-          buildRebar3 {
-            name = "cloudi_service_db_couchdb";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_service_db_couchdb";
-              version = "1.5.1";
-              sha256 =
-                "c6e97aadacf625549c99a96435e35d0dc971a7d0e7cf5283769e3d7e8ee36812";
-            };
-
-            beamDeps  = [ cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework CouchDB Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_db_couchdb = cloudi_service_db_couchdb_1_5_1;
-
-    cloudi_service_db_elasticsearch_1_3_3 = callPackage
-      (
-        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
-          buildRebar3 {
-            name = "cloudi_service_db_elasticsearch";
-            version = "1.3.3";
-            src = fetchHex {
-              pkg = "cloudi_service_db_elasticsearch";
-              version = "1.3.3";
-              sha256 =
-                "2e4f6c8488ce879235f0548cb15cae6f3bcbb3c0b20e51ab3faad6769220ee12";
-            };
-
-            beamDeps  = [ cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework elasticsearch
-                            Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_db_elasticsearch =
-      cloudi_service_db_elasticsearch_1_3_3;
-
-    cloudi_service_db_http_elli_1_5_1 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          uuid_erl_1_5_1,
-          trie_1_5_1,
-          elli_1_0_5,
-          cowlib_1_0_2,
-          cloudi_core_1_5_1
-        }:
-          buildRebar3 {
-            name = "cloudi_service_db_http_elli";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_service_db_http_elli";
-              version = "1.5.1";
-              sha256 =
-                "f1dde8cbb83773fb0e9ac918ac5c6ffdf3255462d252296b9a23f02e144ea13a";
-            };
-
-            beamDeps  = [
-                          uuid_erl_1_5_1
-                          trie_1_5_1
-                          elli_1_0_5
-                          cowlib_1_0_2
-                          cloudi_core_1_5_1
-                        ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework elli HTTP
-                            Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_db_http_elli = cloudi_service_db_http_elli_1_5_1;
-
-    cloudi_service_db_memcached_1_5_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
-          buildRebar3 {
-            name = "cloudi_service_db_memcached";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_service_db_memcached";
-              version = "1.5.1";
-              sha256 =
-                "edcd28714e02d1b875c0c3a754fe230d5247b7b5e10194a74ee4d425fdca0839";
-            };
-
-            beamDeps  = [ cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework memcached
-                            Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_db_memcached = cloudi_service_db_memcached_1_5_1;
-
-    cloudi_service_db_mysql_1_5_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
-          buildRebar3 {
-            name = "cloudi_service_db_mysql";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_service_db_mysql";
-              version = "1.5.1";
-              sha256 =
-                "9bb0dec142d903615e0a5e360bd5faae9ceeccf37f1afc705e2a9a402c273a5b";
-            };
-
-            beamDeps  = [ cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework MySQL Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_db_mysql = cloudi_service_db_mysql_1_5_1;
-
-    cloudi_service_db_pgsql_1_5_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
-          buildRebar3 {
-            name = "cloudi_service_db_pgsql";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_service_db_pgsql";
-              version = "1.5.1";
-              sha256 =
-                "d7cf7cb44d57e84f68310f0e146bf2c76f0aa42bca0073166c0da79ddd44b70e";
-            };
-
-            beamDeps  = [ cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework PostgreSQL
-                            Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_db_pgsql = cloudi_service_db_pgsql_1_5_1;
-
-    cloudi_service_db_riak_1_3_3 = callPackage
-      (
-        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
-          buildRebar3 {
-            name = "cloudi_service_db_riak";
-            version = "1.3.3";
-            src = fetchHex {
-              pkg = "cloudi_service_db_riak";
-              version = "1.3.3";
-              sha256 =
-                "902b6cb52a077fa47579631c07ca5ee414001b7388aac324b668c902a75de459";
-            };
-
-            beamDeps  = [ cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework Riak Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_db_riak = cloudi_service_db_riak_1_3_3;
-
-    cloudi_service_db_tokyotyrant_1_5_0 = callPackage
-      (
-        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
-          buildRebar3 {
-            name = "cloudi_service_db_tokyotyrant";
-            version = "1.5.0";
-            src = fetchHex {
-              pkg = "cloudi_service_db_tokyotyrant";
-              version = "1.5.0";
-              sha256 =
-                "553893dfed554b3988e80f6dbc2aa301255941646fe82df57d4bca00ffeb9d1a";
-            };
-
-            beamDeps  = [ cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework Tokyo Tyrant
-                            Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_db_tokyotyrant =
-      cloudi_service_db_tokyotyrant_1_5_0;
-
-    cloudi_service_filesystem_1_5_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, cowlib_1_0_2, cloudi_core_1_5_1 }:
-          buildRebar3 {
-            name = "cloudi_service_filesystem";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_service_filesystem";
-              version = "1.5.1";
-              sha256 =
-                "18fa3406bd3a6cafb40cbacd01c16ff32daccf6b4eb45efa6ec351d03f08d4c3";
-            };
-
-            beamDeps  = [ cowlib_1_0_2 cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework Filesystem
-                            Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_filesystem = cloudi_service_filesystem_1_5_1;
-
-    cloudi_service_http_client_1_5_1 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          uuid_erl_1_5_1,
-          trie_1_5_1,
-          cloudi_core_1_5_1
-        }:
-          buildRebar3 {
-            name = "cloudi_service_http_client";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_service_http_client";
-              version = "1.5.1";
-              sha256 =
-                "674be0160e09543e9cddf0286b11d8110514b0db3d18e2f9e097796997b7a7db";
-            };
-
-            beamDeps  = [ uuid_erl_1_5_1 trie_1_5_1 cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework HTTP client
-                            Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_http_client = cloudi_service_http_client_1_5_1;
-
-    cloudi_service_http_cowboy_1_5_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, cowboy_1_0_4, cloudi_core_1_5_1 }:
-          buildRebar3 {
-            name = "cloudi_service_http_cowboy";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_service_http_cowboy";
-              version = "1.5.1";
-              sha256 =
-                "e0d07bbcd33bac980b66b7854bb8804433ba4619b6c6a3be63fefa36372b7a4b";
-            };
-
-            beamDeps  = [ cowboy_1_0_4 cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework cowboy HTTP/HTTPS
-                            Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_http_cowboy = cloudi_service_http_cowboy_1_5_1;
-
-    cloudi_service_http_rest_1_5_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, trie_1_5_1, cloudi_core_1_5_1 }:
-          buildRebar3 {
-            name = "cloudi_service_http_rest";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_service_http_rest";
-              version = "1.5.1";
-              sha256 =
-                "5f9f51df32defa5d383446431a0029d614732b1377933e0c682ca4556cfe63ce";
-            };
-
-            beamDeps  = [ trie_1_5_1 cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''REST HTTP CloudI Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_http_rest = cloudi_service_http_rest_1_5_1;
-
-    cloudi_service_map_reduce_1_5_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
-          buildRebar3 {
-            name = "cloudi_service_map_reduce";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_service_map_reduce";
-              version = "1.5.1";
-              sha256 =
-                "44d31fd7f4e772bce5f508f4eb41d423bbfc347f2d7a4194326085ee5542a61d";
-            };
-
-            beamDeps  = [ cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework Map/Reduce
-                            Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_map_reduce = cloudi_service_map_reduce_1_5_1;
-
-    cloudi_service_monitoring_1_5_1 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          key2value_1_5_1,
-          folsom_0_8_3,
-          cloudi_core_1_5_1
-        }:
-          buildRebar3 {
-            name = "cloudi_service_monitoring";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_service_monitoring";
-              version = "1.5.1";
-              sha256 =
-                "4cb1d89085bba3b30910d8d129dde609cc063f761a736418da0eb9491ee673d5";
-            };
-
-            beamDeps  = [ key2value_1_5_1 folsom_0_8_3 cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''CloudI Monitoring Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_monitoring = cloudi_service_monitoring_1_5_1;
-
-    cloudi_service_queue_1_5_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
-          buildRebar3 {
-            name = "cloudi_service_queue";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_service_queue";
-              version = "1.5.1";
-              sha256 =
-                "7fc7a1f0e8a888df2f6b5a2d3c0a7134475ba99f08aeb92244bbbf12e420d4c6";
-            };
-
-            beamDeps  = [ cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework Persistent Queue
-                            Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_queue = cloudi_service_queue_1_5_1;
-
-    cloudi_service_quorum_1_5_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
-          buildRebar3 {
-            name = "cloudi_service_quorum";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_service_quorum";
-              version = "1.5.1";
-              sha256 =
-                "2ca5f275073696f6226c7610a3933761d28081ad86d2b7a37dac41b40fe293f9";
-            };
-
-            beamDeps  = [ cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework Quorum Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_quorum = cloudi_service_quorum_1_5_1;
-
-    cloudi_service_router_1_5_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
-          buildRebar3 {
-            name = "cloudi_service_router";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_service_router";
-              version = "1.5.1";
-              sha256 =
-                "e37d8f657183ab44fe28f27d02a6a50608c04af8f47872cbd4cb12a19a23b18f";
-            };
-
-            beamDeps  = [ cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework Router Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_router = cloudi_service_router_1_5_1;
-
-    cloudi_service_tcp_1_5_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
-          buildRebar3 {
-            name = "cloudi_service_tcp";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_service_tcp";
-              version = "1.5.1";
-              sha256 =
-                "f0be083ef768aa356148f7fa26989139bfc5d8fb6f1119bd31eed06e5ab38469";
-            };
-
-            beamDeps  = [ cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework TCP Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_tcp = cloudi_service_tcp_1_5_1;
-
-    cloudi_service_timers_1_5_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
-          buildRebar3 {
-            name = "cloudi_service_timers";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_service_timers";
-              version = "1.5.1";
-              sha256 =
-                "c576fe4725493fd3303945398b0984f339a8b52877bead4deb282e7d0f4bbc64";
-            };
-
-            beamDeps  = [ cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework Timers Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_timers = cloudi_service_timers_1_5_1;
-
-    cloudi_service_udp_1_5_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
-          buildRebar3 {
-            name = "cloudi_service_udp";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_service_udp";
-              version = "1.5.1";
-              sha256 =
-                "d2939f6eb8048a0b154463e3ee5ff986a0a5370c97019e5562ee3fbb07b8698b";
-            };
-
-            beamDeps  = [ cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework UDP Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_udp = cloudi_service_udp_1_5_1;
-
-    cloudi_service_validate_1_5_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
-          buildRebar3 {
-            name = "cloudi_service_validate";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_service_validate";
-              version = "1.5.1";
-              sha256 =
-                "96712d805bea5f36acbb01c90b46b87532e64a454a7c2b4deb34029508c51c78";
-            };
-
-            beamDeps  = [ cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework Validate Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_validate = cloudi_service_validate_1_5_1;
-
-    cloudi_service_zeromq_1_5_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
-          buildRebar3 {
-            name = "cloudi_service_zeromq";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cloudi_service_zeromq";
-              version = "1.5.1";
-              sha256 =
-                "dba08d714d32fc9b50658ef075a13e99285458f73f433fb6f2059afcfb1ce498";
-            };
-
-            beamDeps  = [ cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework ZeroMQ Service'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    cloudi_service_zeromq = cloudi_service_zeromq_1_5_1;
-
-    cloudinary_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_4_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "cloudinary";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "cloudinary";
-              version = "0.0.2";
-              sha256 =
-                "9e32b21717b193f90a526203725811b96294d7c88391e5ad4a57bf178678cc4c";
-            };
-            beamDeps  = [ poison_1_4_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Library to upload to Cloudinary'';
-              license = stdenv.lib.licenses.mit;
-            };
-          }
-      ) {};
-
-    cloudinary = cloudinary_0_0_2;
-
-    cloudinaryex_0_0_2 = callPackage
-      (
-        {
-          buildMix, fetchHex, timex_1_0_2, poison_1_5_2, httpoison_0_8_2
-        }:
-          buildMix {
-            name = "cloudinaryex";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "cloudinaryex";
-              version = "0.0.2";
-              sha256 =
-                "31518baacfcca428e30ee8f1c411d76568344e7032ed93cf34535e279c8472fc";
-            };
-            beamDeps  = [ timex_1_0_2 poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''A library for connecting with Cloudinary in
-                            Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/micahwedemeyer/cloudinaryex";
-            };
-          }
-      ) {};
-
-    cloudinaryex = cloudinaryex_0_0_2;
-
-    clox_0_1_3 = callPackage
-      (
-        {  buildMix, fetchHex, timex_0_13_5 }:
-          buildMix {
-            name = "clox";
-            version = "0.1.3";
-            src = fetchHex {
-              pkg = "clox";
-              version = "0.1.3";
-              sha256 =
-                "a4e9330289479ecffce51346071282d8470612462b40e150d34a27475411f35b";
-            };
-            beamDeps  = [ timex_0_13_5 ];
-
-            meta = {
-              description = ''time series date keys'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/camshaft/clox";
-            };
-          }
-      ) {};
-
-    clox = clox_0_1_3;
-
-    cmark_0_6_8 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "cmark";
-            version = "0.6.8";
-            src = fetchHex {
-              pkg = "cmark";
-              version = "0.6.8";
-              sha256 =
-                "ee148d419684923567be4f413cf82c6f8da2d235e40d434e616febca158372cc";
-            };
-
-            meta = {
-              longDescription = ''Elixir NIF for cmark (C), a parser library
-                                following the CommonMark spec, a compatible
-                                implementation of Markdown.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/asaaki/cmark.ex";
-            };
-          }
-      ) {};
-
-    cmark = cmark_0_6_8;
-
     cobertura_cover_0_9_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "cobertura_cover";
             version = "0.9.0";
             src = fetchHex {
@@ -6419,15 +3779,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/PSPDFKit-labs/cobertura_cover";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cobertura_cover = cobertura_cover_0_9_0;
 
     codepagex_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "codepagex";
             version = "0.1.2";
             src = fetchHex {
@@ -6444,15 +3804,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/tallakt/codepagex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     codepagex = codepagex_0_1_2;
 
     coffee_rotor_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex, rotor_0_2_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, rotor_0_2_2 }:
+          buildMix ({
             name = "coffee_rotor";
             version = "0.2.1";
             src = fetchHex {
@@ -6469,86 +3829,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/HashNuke/coffee_rotor";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     coffee_rotor = coffee_rotor_0_2_1;
 
-    coinbase_0_0_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          timex_0_13_5,
-          poison_1_3_1,
-          inflex_1_0_0,
-          httpoison_0_7_5,
-          dotenv_0_0_4
-        }:
-          buildMix {
-            name = "coinbase";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "coinbase";
-              version = "0.0.1";
-              sha256 =
-                "c7d59d239f219623765a596dc61a678a527d19fd0110db1ea09ab937d0df9bcc";
-            };
-            beamDeps  = [
-                          timex_0_13_5
-                          poison_1_3_1
-                          inflex_1_0_0
-                          httpoison_0_7_5
-                          dotenv_0_0_4
-                        ];
-
-            meta = {
-              description = ''Coinbase API for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/gregpardo/coinbase-elixir";
-            };
-          }
-      ) {};
-
-    coinbase = coinbase_0_0_1;
-
-    coincap_io_0_0_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poison_1_5_2,
-          httpoison_0_8_2,
-          exconstructor_1_0_2
-        }:
-          buildMix {
-            name = "coincap_io";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "coincap_io";
-              version = "0.0.1";
-              sha256 =
-                "27638d227a407a204c83534e15917bd77fac64a8bdc96dbad07d59a935639da3";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 exconstructor_1_0_2 ];
-
-            meta = {
-              longDescription = ''WIP, unstable Elixir API wrapper for
-                                coincap.io. Provides access to market
-                                capitalization data of bitcoin, altcoins and
-                                cryptotokens.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/cyberpunk-ventures/coincap_io_ex";
-            };
-          }
-      ) {};
-
-    coincap_io = coincap_io_0_0_1;
-
     colixir_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "colixir";
             version = "0.0.1";
             src = fetchHex {
@@ -6564,15 +3853,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/mondok/colixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     colixir = colixir_0_0_1;
 
     color_stream_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "color_stream";
             version = "0.0.2";
             src = fetchHex {
@@ -6588,15 +3877,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/code-lever/color-stream-elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     color_stream = color_stream_0_0_2;
 
     color_utils_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "color_utils";
             version = "0.2.0";
             src = fetchHex {
@@ -6611,15 +3900,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/barakyo/color_utils";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     color_utils = color_utils_0_2_0;
 
     colorful_0_6_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "colorful";
             version = "0.6.0";
             src = fetchHex {
@@ -6634,15 +3923,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/Joe-noh/colorful";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     colorful = colorful_0_6_0;
 
     colorize_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "colorize";
             version = "0.2.0";
             src = fetchHex {
@@ -6657,15 +3946,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/shiroyasha/colorize";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     colorize = colorize_0_2_0;
 
     colors_1_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "colors";
             version = "1.0.1";
             src = fetchHex {
@@ -6680,15 +3969,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/lidashuang/colors";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     colors = colors_1_0_1;
 
     combination_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "combination";
             version = "0.0.2";
             src = fetchHex {
@@ -6704,15 +3993,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/seantanly/elixir-combination";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     combination = combination_0_0_2;
 
     combine_0_7_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "combine";
             version = "0.7.0";
             src = fetchHex {
@@ -6727,131 +4016,15 @@ let
                             projects.'';
               license = stdenv.lib.licenses.mit;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     combine = combine_0_7_0;
 
-    comeonin_1_6_0 = callPackage
-      (
-        {  buildErlangMk, fetchHex, comeonin_i18n_0_1_3 }:
-          buildErlangMk {
-            name = "comeonin";
-            version = "1.6.0";
-            src = fetchHex {
-              pkg = "comeonin";
-              version = "1.6.0";
-              sha256 =
-                "40dd0da2c33696d19515888fd86b9ffdcad92d49e9a6b3b13df98e824897a1b1";
-            };
-            beamDeps  = [ comeonin_i18n_0_1_3 ];
-
-            meta = {
-              description = ''Password hashing (bcrypt, pbkdf2_sha512) library
-                            for Elixir.'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/elixircnx/comeonin";
-            };
-          }
-      ) {};
-
-    comeonin_2_0_3 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "comeonin";
-            version = "2.0.3";
-            src = fetchHex {
-              pkg = "comeonin";
-              version = "2.0.3";
-              sha256 =
-                "a9a6f87107ebf6898adeca7130adb1b9e421c1be7e8b30b13ac1e0354ea15198";
-            };
-
-            meta = {
-              description = ''Password hashing (bcrypt, pbkdf2_sha512) library
-                            for Elixir.'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/elixircnx/comeonin";
-            };
-          }
-      ) {};
-
-    comeonin_2_1_1 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "comeonin";
-            version = "2.1.1";
-            src = fetchHex {
-              pkg = "comeonin";
-              version = "2.1.1";
-              sha256 =
-                "7f85774ae5d453f664d0e7809cc1ab32ff22855d16ff6a2edd68c6d36cb1a1aa";
-            };
-
-            meta = {
-              description = ''Password hashing (bcrypt, pbkdf2_sha512) library
-                            for Elixir.'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/elixircnx/comeonin";
-            };
-          }
-      ) {};
-
-    comeonin_2_3_0 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "comeonin";
-            version = "2.3.0";
-            src = fetchHex {
-              pkg = "comeonin";
-              version = "2.3.0";
-              sha256 =
-                "f3463468faa27ec22116a0469406472b0f67cf86c3e9cb44ac2991c5a0c2655d";
-            };
-
-            meta = {
-              description = ''Password hashing (bcrypt, pbkdf2_sha512) library
-                            for Elixir.'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/elixircnx/comeonin";
-            };
-          }
-      ) {};
-
-    comeonin = comeonin_2_3_0;
-
-    comeonin_ecto_password_0_0_3 = callPackage
-      (
-        {  buildMix, fetchHex, ecto_1_1_5, comeonin_2_3_0 }:
-          buildMix {
-            name = "comeonin_ecto_password";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "comeonin_ecto_password";
-              version = "0.0.3";
-              sha256 =
-                "44c8dbf5b81fca515b91422fddb240c5d714bc81bc0d59b3ca60300edb3f856b";
-            };
-            beamDeps  = [ ecto_1_1_5 comeonin_2_3_0 ];
-
-            meta = {
-              description = ''Ecto custom type for storing encrypted password
-                            using Comonin'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/vic/comeonin_ecto_password";
-            };
-          }
-      ) {};
-
-    comeonin_ecto_password = comeonin_ecto_password_0_0_3;
-
     comeonin_i18n_0_1_3 = callPackage
       (
-        {  buildMix, fetchHex, gettext_0_10_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, gettext_0_10_0 }:
+          buildMix ({
             name = "comeonin_i18n";
             version = "0.1.3";
             src = fetchHex {
@@ -6868,47 +4041,21 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/elixircnx/comeonin_i18n";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     comeonin_i18n = comeonin_i18n_0_1_3;
 
-    commerce_billing_0_0_2 = callPackage
+    complex_0_2_0 = callPackage
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
-          mock_0_1_3,
-          jazz_0_2_1,
-          httpoison_0_8_2,
-          ex_doc_0_11_4
+          exprintf_0_1_6,
+          earmark_0_2_1
         }:
-          buildMix {
-            name = "commerce_billing";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "commerce_billing";
-              version = "0.0.2";
-              sha256 =
-                "6bb751f496011b974cb8d536b079eb7dfaeee4be827e4cf2fe0585e10f26bd04";
-            };
-            beamDeps  = [ mock_0_1_3 jazz_0_2_1 httpoison_0_8_2 ex_doc_0_11_4
-                      ];
-
-            meta = {
-              description = ''Credit card processing library'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/joshnuss/commerce_billing";
-            };
-          }
-      ) {};
-
-    commerce_billing = commerce_billing_0_0_2;
-
-    complex_0_2_0 = callPackage
-      (
-        {  buildMix, fetchHex, exprintf_0_1_6, earmark_0_2_1 }:
-          buildMix {
+          buildMix ({
             name = "complex";
             version = "0.2.0";
             src = fetchHex {
@@ -6925,40 +4072,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/twist-vector/elixir-complex.git";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     complex = complex_0_2_0;
 
-    comredis_1_0_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0 }:
-          buildMix {
-            name = "comredis";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "comredis";
-              version = "1.0.0";
-              sha256 =
-                "181989546464dbe57f2feceb39954eea8008e28612df0c6a7b9b0f7003b251e9";
-            };
-            beamDeps  = [ poison_2_1_0 ];
-
-            meta = {
-              description = ''Comredis is your comrade for Redis command
-                            generation in Elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/iurifq/comredis";
-            };
-          }
-      ) {};
-
-    comredis = comredis_1_0_0;
-
     con_cache_0_11_0 = callPackage
       (
-        {  buildMix, fetchHex, exactor_2_2_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, exactor_2_2_0 }:
+          buildMix ({
             name = "con_cache";
             version = "0.11.0";
             src = fetchHex {
@@ -6976,15 +4098,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/sasa1977/con_cache";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     con_cache = con_cache_0_11_0;
 
     con_cache_0_9_0 = callPackage
       (
-        {  buildMix, fetchHex, exactor_2_2_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, exactor_2_2_0 }:
+          buildMix ({
             name = "con_cache";
             version = "0.9.0";
             src = fetchHex {
@@ -7002,37 +4124,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/sasa1977/con_cache";
             };
-          }
+          } // packageOverrides)
       ) {};
 
-    conferl_0_0_1 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "conferl";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "conferl";
-              version = "0.0.1";
-              sha256 =
-                "402ff3b66ff98ada2b537e2d9d329f4f6f32230c39d7a3be150cf72b7525f801";
-            };
-
-            meta = {
-              description = ''Auto-Conference Service in Erlang (similar to
-                            Disqus)'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/inaka/conferl";
-            };
-          }
-      ) {};
-
-    conferl = conferl_0_0_1;
-
     config_values_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "config_values";
             version = "1.0.0";
             src = fetchHex {
@@ -7047,15 +4145,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/hassox/config_values";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     config_values = config_values_1_0_0;
 
     configparser_ex_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "configparser_ex";
             version = "0.2.1";
             src = fetchHex {
@@ -7071,57 +4169,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/easco/configparser_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     configparser_ex = configparser_ex_0_2_1;
 
-    conform_0_10_5 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "conform";
-            version = "0.10.5";
-            src = fetchHex {
-              pkg = "conform";
-              version = "0.10.5";
-              sha256 =
-                "2ded6a4f7405f2288d7888c86b59d3f2871bd9339f3e396d9f9fb148c4ce2304";
-            };
-
-            meta = {
-              description = ''Easy release configuration for Elixir apps.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bitwalker/conform";
-            };
-          }
-      ) {};
-
-    conform_0_11_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "conform";
-            version = "0.11.0";
-            src = fetchHex {
-              pkg = "conform";
-              version = "0.11.0";
-              sha256 =
-                "2547e29fec74952572a0f2456f38e11dc8247a00d4b197eca2e61a8fd767f3eb";
-            };
-
-            meta = {
-              description = ''Easy release configuration for Elixir apps.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bitwalker/conform";
-            };
-          }
-      ) {};
-
     conform_0_16_0 = callPackage
       (
-        {  buildMix, fetchHex, neotoma_1_7_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, neotoma_1_7_3 }:
+          buildMix ({
             name = "conform";
             version = "0.16.0";
             src = fetchHex {
@@ -7137,13 +4193,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bitwalker/conform";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     conform_1_0_0_rc8 = callPackage
       (
-        {  buildMix, fetchHex, neotoma_1_7_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, neotoma_1_7_3 }:
+          buildMix ({
             name = "conform";
             version = "1.0.0-rc8";
             src = fetchHex {
@@ -7159,13 +4215,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bitwalker/conform";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     conform_2_0_0 = callPackage
       (
-        {  buildMix, fetchHex, neotoma_1_7_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, neotoma_1_7_3 }:
+          buildMix ({
             name = "conform";
             version = "2.0.0";
             src = fetchHex {
@@ -7181,15 +4237,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bitwalker/conform";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     conform = conform_2_0_0;
 
     conform_exrm_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, exrm_1_0_3, conform_2_0_0 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          exrm_1_0_3,
+          conform_2_0_0
+        }:
+          buildMix ({
             name = "conform_exrm";
             version = "1.0.0";
             src = fetchHex {
@@ -7205,15 +4267,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bitwalker/conform_exrm";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     conform_exrm = conform_exrm_1_0_0;
 
     connection_1_0_0_rc_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "connection";
             version = "1.0.0-rc.1";
             src = fetchHex {
@@ -7228,13 +4290,13 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/fishcakez/connection";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     connection_1_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "connection";
             version = "1.0.2";
             src = fetchHex {
@@ -7249,15 +4311,21 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/fishcakez/connection";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     connection = connection_1_0_2;
 
     conqueuer_0_5_1 = callPackage
       (
-        {  buildMix, fetchHex, poolboy_1_5_1, inflex_1_5_0 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poolboy_1_5_1,
+          inflex_1_5_0
+        }:
+          buildMix ({
             name = "conqueuer";
             version = "0.5.1";
             src = fetchHex {
@@ -7273,37 +4341,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/midas/conqueuer";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     conqueuer = conqueuer_0_5_1;
 
-    console_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "console";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "console";
-              version = "0.0.1";
-              sha256 =
-                "55e0635d7fdde35a04694e646a01b161c142b4d814a97ed8a373fd42af35c955";
-            };
-
-            meta = {
-
-              homepage = "https://github.com/matteosister/console";
-            };
-          }
-      ) {};
-
-    console = console_0_0_1;
-
     console_tree_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "console_tree";
             version = "0.0.1";
             src = fetchHex {
@@ -7320,39 +4366,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ciaran/console_tree";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     console_tree = console_tree_0_0_1;
 
-    consul_1_0_3 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_7_5, exjsx_3_2_0 }:
-          buildMix {
-            name = "consul";
-            version = "1.0.3";
-            src = fetchHex {
-              pkg = "consul";
-              version = "1.0.3";
-              sha256 =
-                "80d5836e4cbe686bff535634e719e0892455b03e77bcde149fb221c80fdb1a52";
-            };
-            beamDeps  = [ httpoison_0_7_5 exjsx_3_2_0 ];
-
-            meta = {
-              description = ''An Elixir client for Consul`s HTTP API '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/undeadlabs/consul-ex";
-            };
-          }
-      ) {};
-
-    consul = consul_1_0_3;
-
     control_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "control";
             version = "0.0.4";
             src = fetchHex {
@@ -7368,15 +4390,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/slogsdon/elixir-control";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     control = control_0_0_4;
 
     convertat_1_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "convertat";
             version = "1.1.0";
             src = fetchHex {
@@ -7392,62 +4414,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/whatyouhide/convertat";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     convertat = convertat_1_1_0;
 
-    core_0_14_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "core";
-            version = "0.14.1";
-            src = fetchHex {
-              pkg = "core";
-              version = "0.14.1";
-              sha256 =
-                "142c14544ce688b4527abeadfb3bf249678caaec1a3f3d11cb4927695f19ff33";
-            };
-
-            meta = {
-              description = ''Library for selective receive OTP processes'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/fishcakez/core";
-            };
-          }
-      ) {};
-
-    core = core_0_14_1;
-
-    core_data_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, floki_0_1_1 }:
-          buildMix {
-            name = "core_data";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "core_data";
-              version = "0.1.0";
-              sha256 =
-                "09b308a42f0697053c68f253e7f687c0f6b5f96bb1b114a7b1852c5b6804122e";
-            };
-            beamDeps  = [ floki_0_1_1 ];
-
-            meta = {
-              description = ''iOS Core Data parser'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/evolet-project/core_data";
-            };
-          }
-      ) {};
-
-    core_data = core_data_0_1_0;
-
     cors_plug_1_1_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_3,
+          cowboy_1_0_4
+        }:
+          buildMix ({
             name = "cors_plug";
             version = "1.1.1";
             src = fetchHex {
@@ -7465,15 +4446,21 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "http://github.com/mschae/cors_plug";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cors_plug = cors_plug_1_1_1;
 
     corsica_0_4_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_3,
+          cowboy_1_0_4
+        }:
+          buildMix ({
             name = "corsica";
             version = "0.4.1";
             src = fetchHex {
@@ -7489,15 +4476,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/whatyouhide/corsica";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     corsica = corsica_0_4_1;
 
     couch_factory_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "couch_factory";
             version = "0.1.1";
             src = fetchHex {
@@ -7513,114 +4500,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/javierg/couch_factory";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     couch_factory = couch_factory_0_1_1;
 
-    couchbeam_1_3_0 = callPackage
-      (
-        {  buildRebar3, fetchHex, jsx_2_8_0, hackney_1_5_7 }:
-          buildRebar3 {
-            name = "couchbeam";
-            version = "1.3.0";
-            src = fetchHex {
-              pkg = "couchbeam";
-              version = "1.3.0";
-              sha256 =
-                "5d94bfc80532999e4f8e7f5da3abff74fbf3b59d5e02e0a99eb0dc3697c97a50";
-            };
-
-            beamDeps  = [ jsx_2_8_0 hackney_1_5_7 ];
-
-            meta = {
-              description = ''Erlang CouchDB client'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/benoitc/couchbeam";
-            };
-          }
-      ) {};
-
-    couchbeam = couchbeam_1_3_0;
-
-    couchdb_client_0_2_5 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poison_1_5_2,
-          httpoison_0_7_5,
-          ex_doc_0_11_4,
-          earmark_0_2_1
-        }:
-          buildMix {
-            name = "couchdb_client";
-            version = "0.2.5";
-            src = fetchHex {
-              pkg = "couchdb_client";
-              version = "0.2.5";
-              sha256 =
-                "243c2fde196762dd6b664d3a91d111ac70336b22d91ca9aafc7c778e61ccb496";
-            };
-            beamDeps  = [
-                          poison_1_5_2
-                          httpoison_0_7_5
-                          ex_doc_0_11_4
-                          earmark_0_2_1
-                        ];
-
-            meta = {
-              description = ''A partial yet functional CouchDB client, with
-                            attachment support.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/gutschilla/elixir-couchdb-client";
-            };
-          }
-      ) {};
-
-    couchdb_client = couchdb_client_0_2_5;
-
-    couchdb_connector_0_2_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "couchdb_connector";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "couchdb_connector";
-              version = "0.2.0";
-              sha256 =
-                "05ac95c3f08038c3f17c03be5f27922b919513dfd4582f2da150f70182dac01b";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              longDescription = ''A connector for CouchDB, the Erlang-based,
-                                JSON document database. The connector does not
-                                implement the protocols defined in Ecto.
-                                Reasons: CouchDB does not support transactions
-                                as known in the world of ACID compliant,
-                                relational databases. The concept of migrations
-                                also does not apply to CouchDB. And since
-                                CouchDB does not implement an SQL dialect, the
-                                decision was taken to not follow the standards
-                                established by Ecto. The connector offers
-                                `create`, `update` and `read` operations through
-                                its Writer and Reader modules. Basic support for
-                                view operations is provided by the View
-                                module.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/locolupo/couchdb_connector";
-            };
-          }
-      ) {};
-
-    couchdb_connector = couchdb_connector_0_2_0;
-
     couchex_0_6_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "couchex";
             version = "0.6.0";
             src = fetchHex {
@@ -7636,15 +4524,15 @@ let
               license = stdenv.lib.licenses.unlicense;
               homepage = "https://github.com/ringling/couchex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     couchex = couchex_0_6_0;
 
     count_buffer_0_1_5 = callPackage
       (
-        {  buildMix, fetchHex, pool_ring_0_1_5 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, pool_ring_0_1_5 }:
+          buildMix ({
             name = "count_buffer";
             version = "0.1.5";
             src = fetchHex {
@@ -7661,41 +4549,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/camshaft/count_buffer";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     count_buffer = count_buffer_0_1_5;
 
-    countries_1_1_2 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "countries";
-            version = "1.1.2";
-            src = fetchHex {
-              pkg = "countries";
-              version = "1.1.2";
-              sha256 =
-                "8420314185aed4152340dcab3f8643d9c312610e2c065ee8709d8a097285149c";
-            };
-
-            meta = {
-              longDescription = ''Countries is a collection of all sorts of
-                                useful information for every country in the [ISO
-                                3166](https://de.wikipedia.org/wiki/ISO_3166)
-                                standard. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/SebastianSzturo/countries";
-            };
-          }
-      ) {};
-
-    countries = countries_1_1_2;
-
     courier_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, mail_0_0_4, gen_smtp_0_9_0 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          mail_0_0_4,
+          gen_smtp_0_9_0
+        }:
+          buildMix ({
             name = "courier";
             version = "0.0.3";
             src = fetchHex {
@@ -7711,80 +4579,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/DockYard/courier";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     courier = courier_0_0_3;
 
-    courier_web_0_0_8 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          uuid_1_1_3,
-          poison_2_1_0,
-          plug_1_1_3,
-          ja_serializer_0_8_1,
-          courier_0_0_3
-        }:
-          buildMix {
-            name = "courier_web";
-            version = "0.0.8";
-            src = fetchHex {
-              pkg = "courier_web";
-              version = "0.0.8";
-              sha256 =
-                "c4161f218d487901bc1e63ce1840c73de34d84d8c53eda12f09cea4a8fa2758b";
-            };
-            beamDeps  = [
-                          uuid_1_1_3
-                          poison_2_1_0
-                          plug_1_1_3
-                          ja_serializer_0_8_1
-                          courier_0_0_3
-                        ];
-
-            meta = {
-              description = ''Web client adapter for Courier'';
-
-            };
-          }
-      ) {};
-
-    courier_web = courier_web_0_0_8;
-
-    coverex_1_4_8 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "coverex";
-            version = "1.4.8";
-            src = fetchHex {
-              pkg = "coverex";
-              version = "1.4.8";
-              sha256 =
-                "47f03bd9d00b22893fda81273c310d30d96e849026f5c1d0ad664089c875bac6";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              longDescription = ''Coverex is an Elixir Coverage tool used by
-                                mix. It provides tables with overviews of module
-                                and function coverage data, includings links to
-                                annotated source code files and supports
-                                coveralls.io.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/alfert/coverex";
-            };
-          }
-      ) {};
-
-    coverex = coverex_1_4_8;
-
     cowboy_1_0_4 = callPackage
       (
-        {  buildErlangMk, fetchHex, cowlib_1_0_2, ranch_1_2_1 }:
-          buildErlangMk {
+        {
+          buildErlangMk,
+          packageOverrides ? {},
+          fetchHex,
+          cowlib_1_0_2,
+          ranch_1_2_1
+        }:
+          buildErlangMk ({
             name = "cowboy";
             version = "1.0.4";
             src = fetchHex {
@@ -7801,58 +4610,15 @@ let
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/ninenines/cowboy";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cowboy = cowboy_1_0_4;
 
-    cowboy_oauth_0_2_14 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          oauth2_erlang_0_6_1,
-          libsnarl_0_3_40,
-          lager_2_1_1,
-          jsxd_0_1_10,
-          jsx_1_4_5,
-          erlydtl2_0_11_1,
-          cowboy_1_0_4
-        }:
-          buildRebar3 {
-            name = "cowboy_oauth";
-            version = "0.2.14";
-            src = fetchHex {
-              pkg = "cowboy_oauth";
-              version = "0.2.14";
-              sha256 =
-                "fc6b3da2a53d8527a08f6427745c85eb3b2da1e90de1a3fe290d4193ac4e5b09";
-            };
-
-            beamDeps  = [
-                          oauth2_erlang_0_6_1
-                          libsnarl_0_3_40
-                          lager_2_1_1
-                          jsxd_0_1_10
-                          jsx_1_4_5
-                          erlydtl2_0_11_1
-                          cowboy_1_0_4
-                        ];
-
-            meta = {
-              description = ''OAuth2 endpoints for cowboy and snarl.'';
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/project-fifo/cowboy_oauth";
-            };
-          }
-      ) {};
-
-    cowboy_oauth = cowboy_oauth_0_2_14;
-
     cowgirl_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "cowgirl";
             version = "0.0.1";
             src = fetchHex {
@@ -7868,15 +4634,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/larrylv/cowgirl";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cowgirl = cowgirl_0_0_1;
 
     cowlib_1_0_0 = callPackage
       (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
+        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
+          buildErlangMk ({
             name = "cowlib";
             version = "1.0.0";
             src = fetchHex {
@@ -7892,13 +4658,13 @@ let
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/ninenines/cowlib";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cowlib_1_0_2 = callPackage
       (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
+        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
+          buildErlangMk ({
             name = "cowlib";
             version = "1.0.2";
             src = fetchHex {
@@ -7914,13 +4680,13 @@ let
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/ninenines/cowlib";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cowlib_1_3_0 = callPackage
       (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
+        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
+          buildErlangMk ({
             name = "cowlib";
             version = "1.3.0";
             src = fetchHex {
@@ -7936,15 +4702,15 @@ let
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/ninenines/cowlib";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cowlib = cowlib_1_3_0;
 
     cowsay_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "cowsay";
             version = "0.0.1";
             src = fetchHex {
@@ -7959,46 +4725,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bbrock25/cowsay";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cowsay = cowsay_0_0_1;
 
-    cpg_1_5_1 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          trie_1_5_1,
-          reltool_util_1_5_1,
-          quickrand_1_5_1
-        }:
-          buildRebar3 {
-            name = "cpg";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "cpg";
-              version = "1.5.1";
-              sha256 =
-                "3bd7b7c48a0f959985d7038d6c533ee5540d12b8adfa6693409f4f6f492f4b45";
-            };
-
-            beamDeps  = [ trie_1_5_1 reltool_util_1_5_1 quickrand_1_5_1 ];
-
-            meta = {
-              description = ''CloudI Process Groups'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/okeuday/cpg";
-            };
-          }
-      ) {};
-
-    cpg = cpg_1_5_1;
-
     cqex_0_1_4 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "cqex";
             version = "0.1.4";
             src = fetchHex {
@@ -8013,63 +4748,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/matehat/cqex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cqex = cqex_0_1_4;
 
-    craterl_0_2_3 = callPackage
-      (
-        {  buildRebar3, fetchHex, jsx_2_7_1, hackney_1_3_1 }:
-          buildRebar3 {
-            name = "craterl";
-            version = "0.2.3";
-            src = fetchHex {
-              pkg = "craterl";
-              version = "0.2.3";
-              sha256 =
-                "bbbfa254fa5834d144f9061fff03035eca9a50b5e7581ce342c495b91af02929";
-            };
-
-            beamDeps  = [ jsx_2_7_1 hackney_1_3_1 ];
-
-            meta = {
-              description = ''erlang client for crate'';
-
-            };
-          }
-      ) {};
-
-    craterl = craterl_0_2_3;
-
-    crc_0_4_0 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "crc";
-            version = "0.4.0";
-            src = fetchHex {
-              pkg = "crc";
-              version = "0.4.0";
-              sha256 =
-                "4f0d872d46faea966aeb687158b7e02bfc61c49c4f2fb33f5e52e3d167f4faeb";
-            };
-
-            meta = {
-              description = ''A library used to calculate CRC checksums for
-                            binary data'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/TattdCodeMonkey/crc";
-            };
-          }
-      ) {};
-
-    crc = crc_0_4_0;
-
     credit_card_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "credit_card";
             version = "1.0.0";
             src = fetchHex {
@@ -8084,15 +4771,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/abakhi/credit_card";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     credit_card = credit_card_1_0_0;
 
     credo_0_3_10 = callPackage
       (
-        {  buildMix, fetchHex, bunt_0_1_5 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, bunt_0_1_5 }:
+          buildMix ({
             name = "credo";
             version = "0.3.10";
             src = fetchHex {
@@ -8110,15 +4797,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/rrrene/credo";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     credo = credo_0_3_10;
 
     credo_0_3_2 = callPackage
       (
-        {  buildMix, fetchHex, bunt_0_1_5 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, bunt_0_1_5 }:
+          buildMix ({
             name = "credo";
             version = "0.3.2";
             src = fetchHex {
@@ -8136,13 +4823,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/rrrene/credo";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     croma_0_4_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "croma";
             version = "0.4.0";
             src = fetchHex {
@@ -8156,39 +4843,15 @@ let
               description = ''Elixir macro utilities'';
               license = stdenv.lib.licenses.mit;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     croma = croma_0_4_0;
 
-    crudex_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, plug_auth_0_3_0 }:
-          buildMix {
-            name = "crudex";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "crudex";
-              version = "0.0.2";
-              sha256 =
-                "2ccf07c728dbb328b9f869a87465c8ba647931ec68f563c4ddea99ec76fa4364";
-            };
-            beamDeps  = [ plug_auth_0_3_0 ];
-
-            meta = {
-              description = ''A glue keeping Phoenix and Ecto together'';
-              license = stdenv.lib.licenses.isc;
-              homepage = "https://github.com/briksoftware/crudex";
-            };
-          }
-      ) {};
-
-    crudex = crudex_0_0_2;
-
     crutches_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "crutches";
             version = "1.0.0";
             src = fetchHex {
@@ -8204,15 +4867,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mykewould/crutches";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     crutches = crutches_1_0_0;
 
     cryptex_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "cryptex";
             version = "0.0.1";
             src = fetchHex {
@@ -8228,40 +4891,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/scrogson/cryptex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cryptex = cryptex_0_0_1;
 
-    crypto_ext_0_1_3 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "crypto_ext";
-            version = "0.1.3";
-            src = fetchHex {
-              pkg = "crypto_ext";
-              version = "0.1.3";
-              sha256 =
-                "8caea80b44aa7a8b02399e522b7ff756f07a8ef810dc39d54b4abed68bdb5cf3";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''Crypto lib extension to support AES 128 ECB
-                            cipher'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/adrienmo/crypto_ext";
-            };
-          }
-      ) {};
-
-    crypto_ext = crypto_ext_0_1_3;
-
     crypto_rsassa_pss_1_0_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "crypto_rsassa_pss";
             version = "1.0.0";
             src = fetchHex {
@@ -8278,15 +4916,15 @@ let
               homepage =
                 "https://github.com/potatosalad/erlang-crypto_rsassa_pss";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     crypto_rsassa_pss = crypto_rsassa_pss_1_0_0;
 
     cspex_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, exactor_2_2_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, exactor_2_2_0 }:
+          buildMix ({
             name = "cspex";
             version = "1.0.0";
             src = fetchHex {
@@ -8303,15 +4941,17 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/vidalraphael/cspex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cspex = cspex_1_0_0;
 
     csv_1_3_3 = callPackage
       (
-        {  buildMix, fetchHex, parallel_stream_1_0_3 }:
-          buildMix {
+        {
+          buildMix, packageOverrides ? {}, fetchHex, parallel_stream_1_0_3
+        }:
+          buildMix ({
             name = "csv";
             version = "1.3.3";
             src = fetchHex {
@@ -8327,15 +4967,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/beatrichartz/csv";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     csv = csv_1_3_3;
 
     csvlixir_2_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "csvlixir";
             version = "2.0.2";
             src = fetchHex {
@@ -8357,15 +4997,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/jimm/csvlixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     csvlixir = csvlixir_2_0_2;
 
     cth_readable_1_2_2 = callPackage
       (
-        {  buildRebar3, fetchHex, cf_0_2_1 }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex, cf_0_2_1 }:
+          buildRebar3 ({
             name = "cth_readable";
             version = "1.2.2";
             src = fetchHex {
@@ -8382,15 +5022,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/ferd/cth_readable";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cth_readable = cth_readable_1_2_2;
 
     cuckoo_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, murmur_1_0_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, murmur_1_0_0 }:
+          buildMix ({
             name = "cuckoo";
             version = "1.0.0";
             src = fetchHex {
@@ -8407,15 +5047,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/gmcabrita/cuckoo";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cuckoo = cuckoo_1_0_0;
 
     cucumberl_0_0_6 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "cucumberl";
             version = "0.0.6";
             src = fetchHex {
@@ -8425,20 +5065,23 @@ let
                 "3b9ea813997fd8c1e3d2b004e89288496dc21d2e5027f432e5900569d2c61cf3";
             };
 
+            buildPlugins  = [ rebar3_hex ];
+
+
             meta = {
               description = ''A pure-erlang implementation of Cucumber.'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ericbmerritt/cucumberl";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cucumberl = cucumberl_0_0_6;
 
     cuid_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "cuid";
             version = "0.1.0";
             src = fetchHex {
@@ -8453,41 +5096,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/duailibe/cuid";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cuid = cuid_0_1_0;
 
-    cure_0_4_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "cure";
-            version = "0.4.1";
-            src = fetchHex {
-              pkg = "cure";
-              version = "0.4.1";
-              sha256 =
-                "92ac6e2dfed6a955cdfedc6860fb84ec968400902b27dfd068e49ff82277932b";
-            };
-
-            meta = {
-              longDescription = ''Interfaces Elixir with C/C++ code in a
-                                user-friendly way! Based on Erlang-ports.
-                                Provides a few Mix-tasks to kickstart the
-                                development process.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/Primordus/Cure.git";
-            };
-          }
-      ) {};
-
-    cure = cure_0_4_1;
-
     currency_formatter_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
+          buildMix ({
             name = "currency_formatter";
             version = "0.0.1";
             src = fetchHex {
@@ -8504,40 +5121,15 @@ let
               license = stdenv.lib.licenses.wtfpl;
               homepage = "https://github.com/smeevil/currency_formatter";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     currency_formatter = currency_formatter_0_0_1;
 
-    current_streak_ex_0_1_1 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2, floki_0_8_0 }:
-          buildMix {
-            name = "current_streak_ex";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "current_streak_ex";
-              version = "0.1.1";
-              sha256 =
-                "1c62bcd7bdd69818dc05f0602e03a5aca6b21554206cb6634bedb807ee27d5a7";
-            };
-            beamDeps  = [ httpoison_0_8_2 floki_0_8_0 ];
-
-            meta = {
-              description = ''Get github current streak which support only
-                            public repositories.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/KazuCocoa/current_streak_ex";
-            };
-          }
-      ) {};
-
-    current_streak_ex = current_streak_ex_0_1_1;
-
     current_user_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "current_user";
             version = "0.0.1";
             src = fetchHex {
@@ -8552,39 +5144,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/halogenandtoast/current_user";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     current_user = current_user_0_0_1;
 
-    currently_0_0_3 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "currently";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "currently";
-              version = "0.0.3";
-              sha256 =
-                "50d7f8e0c6eb1dd4f434cd50c7447eb8f9e3d4c413161948df7363c41bf90ec1";
-            };
-
-            meta = {
-              description = ''Currently is a tool to display cards currently
-                            assigns on Trello '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/chatgris/currently";
-            };
-          }
-      ) {};
-
-    currently = currently_0_0_3;
-
     curry_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "curry";
             version = "0.0.1";
             src = fetchHex {
@@ -8600,15 +5168,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/niahoo/elixir-curry";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     curry = curry_0_0_1;
 
     curtail_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "curtail";
             version = "0.1.0";
             src = fetchHex {
@@ -8623,15 +5191,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/seankay/curtail";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     curtail = curtail_0_1_0;
 
     curtains_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_0_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_0_3 }:
+          buildMix ({
             name = "curtains";
             version = "0.0.1";
             src = fetchHex {
@@ -8643,24 +5211,24 @@ let
             beamDeps  = [ plug_1_0_3 ];
 
             meta = {
-              longDescription = ''Curtains is a Elixir package that "takes
-                                over" your Elixir website by returning content
+              longDescription = ''Curtains is a Elixir package that \"takes
+                                over\" your Elixir website by returning content
                                 of a specified file (if it exists). This makes
-                                it perfect for "Under construction" and
-                                "Maintenance" pages. At it`s heart, it`s just a
-                                Plug.'';
+                                it perfect for \"Under construction\" and
+                                \"Maintenance\" pages. At it`s heart, it`s just
+                                a Plug.'';
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/fteem/curtains";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     curtains = curtains_0_0_1;
 
     curve25519_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "curve25519";
             version = "0.1.0";
             src = fetchHex {
@@ -8675,15 +5243,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mwmiller/curve25519_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     curve25519 = curve25519_0_1_0;
 
     cushion_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, httpotion_2_2_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, httpotion_2_2_2 }:
+          buildMix ({
             name = "cushion";
             version = "0.0.3";
             src = fetchHex {
@@ -8702,15 +5270,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ryanbillingsley/cushion";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cushion = cushion_0_0_3;
 
     custom_base_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "custom_base";
             version = "0.2.0";
             src = fetchHex {
@@ -8726,15 +5294,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/igas/custom_base";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     custom_base = custom_base_0_2_0;
 
     cuttlefish_2_0_7 = callPackage
       (
-        {  buildRebar3, fetchHex, lager_3_0_2, getopt_0_8_2 }:
-          buildRebar3 {
+        {
+          buildRebar3,
+          packageOverrides ? {},
+          fetchHex,
+          lager_3_0_2,
+          getopt_0_8_2
+        }:
+          buildRebar3 ({
             name = "cuttlefish";
             version = "2.0.7";
             src = fetchHex {
@@ -8751,15 +5325,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/tsloughter/cuttlefish";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cuttlefish = cuttlefish_2_0_7;
 
     cypher_query_0_0_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "cypher_query";
             version = "0.0.1";
             src = fetchHex {
@@ -8775,15 +5349,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/collin/cypher_query";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     cypher_query = cypher_query_0_0_1;
 
     data_leaf_walker_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "data_leaf_walker";
             version = "0.1.0";
             src = fetchHex {
@@ -8800,15 +5374,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/gutschilla/elixir-map-deeply";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     data_leaf_walker = data_leaf_walker_0_1_0;
 
     database_url_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "database_url";
             version = "0.1.0";
             src = fetchHex {
@@ -8824,104 +5398,22 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/s-m-i-t-a/database_url";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     database_url = database_url_0_1_0;
 
-    datomex_0_0_5 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poison_1_5_2,
-          httpoison_0_8_2,
-          ex_doc_0_7_3,
-          erldn_1_0_5
-        }:
-          buildMix {
-            name = "datomex";
-            version = "0.0.5";
-            src = fetchHex {
-              pkg = "datomex";
-              version = "0.0.5";
-              sha256 =
-                "bb2a5171a5d7783e40776db7fe7a6bff73ff69a4da4205c83b39c26ff73488c0";
-            };
-            beamDeps  = [
-                          poison_1_5_2 httpoison_0_8_2 ex_doc_0_7_3 erldn_1_0_5
-                        ];
-
-            meta = {
-              description = ''Low level Elixir driver for the Datomic Database.
-                            '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/edubkendo/datomex";
-            };
-          }
-      ) {};
-
-    datomex = datomex_0_0_5;
-
-    datomic_gen_server_2_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, exdn_2_1_2 }:
-          buildMix {
-            name = "datomic_gen_server";
-            version = "2.0.1";
-            src = fetchHex {
-              pkg = "datomic_gen_server";
-              version = "2.0.1";
-              sha256 =
-                "601422e876b895d1841c02afe4b89ec32d4859a4c9a81c2ecbe5fa6bf6d651ba";
-            };
-            beamDeps  = [ exdn_2_1_2 ];
-
-            meta = {
-              longDescription = ''An Elixir GenServer that communicates with a
-                                Clojure Datomic peer running in the JVM, using
-                                clojure-erlastic.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/psfblair/datomic_gen_server";
-            };
-          }
-      ) {};
-
-    datomic_gen_server = datomic_gen_server_2_0_1;
-
-    db_0_9_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "db";
-            version = "0.9.0";
-            src = fetchHex {
-              pkg = "db";
-              version = "0.9.0";
-              sha256 =
-                "23d0307bc227782b1c0c86bb5b66130312cf3eb4363f3f39d5b1fc84140b3a91";
-            };
-
-            meta = {
-              description = ''Banking Database'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/spawnproc/db";
-            };
-          }
-      ) {};
-
-    db = db_0_9_0;
-
     db_connection_0_2_4 = callPackage
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           sbroker_0_7_0,
           poolboy_1_5_1,
           connection_1_0_2
         }:
-          buildMix {
+          buildMix ({
             name = "db_connection";
             version = "0.2.4";
             src = fetchHex {
@@ -8938,15 +5430,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/fishcakez/db_connection";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     db_connection = db_connection_0_2_4;
 
     dbg_1_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "dbg";
             version = "1.0.1";
             src = fetchHex {
@@ -8961,132 +5453,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/fishcakez/dbg";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     dbg = dbg_1_0_1;
 
-    dbschema_0_2_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "dbschema";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "dbschema";
-              version = "0.2.0";
-              sha256 =
-                "92eed9e62bf5998d33e7826e02f35bafa52bc7f5915c7ebaf4a8c687529688e2";
-            };
-
-            meta = {
-              description = ''Database postgresql migrations util'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/egobrain/dbschema";
-            };
-          }
-      ) {};
-
-    dbschema = dbschema_0_2_0;
-
-    dbus_0_5_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "dbus";
-            version = "0.5.0";
-            src = fetchHex {
-              pkg = "dbus";
-              version = "0.5.0";
-              sha256 =
-                "8607c4ae1c9e2f377cfd4c34fd8207ad842347dc86db1360605d0a85266ae2e3";
-            };
-
-            meta = {
-              description = ''A native erlang implementation of D-Bus'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/lizenn/erlang-dbus";
-            };
-          }
-      ) {};
-
-    dbus = dbus_0_5_0;
-
-    ddb_client_0_1_17 = callPackage
-      (
-        {  buildRebar3, fetchHex, mmath_0_1_15, dproto_0_1_12 }:
-          buildRebar3 {
-            name = "ddb_client";
-            version = "0.1.17";
-            src = fetchHex {
-              pkg = "ddb_client";
-              version = "0.1.17";
-              sha256 =
-                "8a65ef0f4e1edb2c575f8c8b38b4fed51ea94fd6c6ec39cc464a66dab45e0892";
-            };
-
-            beamDeps  = [ mmath_0_1_15 dproto_0_1_12 ];
-
-            meta = {
-              description = ''DalmatinerDB client'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/dalmatinerdb/ddb_client";
-            };
-          }
-      ) {};
-
-    ddb_client = ddb_client_0_1_17;
-
-    dealer_0_8_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "dealer";
-            version = "0.8.0";
-            src = fetchHex {
-              pkg = "dealer";
-              version = "0.8.0";
-              sha256 =
-                "c8c72d38e1cff6a181a6b6f627fb6fd5998279827519e598eb28bcef2be721ee";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''An API Client for Stockfighter.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/larrylv/dealer";
-            };
-          }
-      ) {};
-
-    dealer = dealer_0_8_0;
-
-    decimal_0_2_5 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "decimal";
-            version = "0.2.5";
-            src = fetchHex {
-              pkg = "decimal";
-              version = "0.2.5";
-              sha256 =
-                "2e2d871c68fea7cc86eb20826cdb6fccec1b6b242bae46d958806e598dc3c947";
-            };
-
-            meta = {
-              description = ''Arbitrary precision decimal arithmetic for
-                            Elixir.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/ericmj/decimal";
-            };
-          }
-      ) {};
-
     decimal_1_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "decimal";
             version = "1.1.1";
             src = fetchHex {
@@ -9102,15 +5477,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/ericmj/decimal";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     decimal = decimal_1_1_1;
 
     decks_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "decks";
             version = "0.0.1";
             src = fetchHex {
@@ -9125,15 +5500,15 @@ let
                             card games.'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     decks = decks_0_0_1;
 
     decoction_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "decoction";
             version = "0.0.1";
             src = fetchHex {
@@ -9149,15 +5524,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/aarvay/decoction";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     decoction = decoction_0_0_1;
 
     defmemo_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "defmemo";
             version = "0.1.1";
             src = fetchHex {
@@ -9173,15 +5548,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/os6sense/DefMemo";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     defmemo = defmemo_0_1_1;
 
     delayed_otp_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "delayed_otp";
             version = "0.0.2";
             src = fetchHex {
@@ -9198,15 +5573,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/awetzel/delayed_otp";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     delayed_otp = delayed_otp_0_0_2;
 
     delegate_behaviour_0_1_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "delegate_behaviour";
             version = "0.1.3";
             src = fetchHex {
@@ -9221,15 +5596,15 @@ let
                             concrete implementations of behaviours'';
               license = stdenv.lib.licenses.mit;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     delegate_behaviour = delegate_behaviour_0_1_3;
 
     demacro_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "demacro";
             version = "0.0.1";
             src = fetchHex {
@@ -9239,64 +5614,15 @@ let
                 "e2a83d48f6b3e03764baf2e149dd5420e632d0d4daa77c5226697a3755a89d16";
             };
              meta = {    };
-          }
+          } // packageOverrides)
       ) {};
 
     demacro = demacro_0_0_1;
 
-    denrei_0_2_3 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "denrei";
-            version = "0.2.3";
-            src = fetchHex {
-              pkg = "denrei";
-              version = "0.2.3";
-              sha256 =
-                "bc0e8cf7e085dda6027df83ef5d63c41b93988bcd7f3db7c68e4dad3cd599744";
-            };
-
-            meta = {
-              description = ''Denrei - a lightweight Erlang messaging
-                            system.'';
-              license = stdenv.lib.licenses.mit;
-            };
-          }
-      ) {};
-
-    denrei = denrei_0_2_3;
-
-    descriptive_statistics_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "descriptive_statistics";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "descriptive_statistics";
-              version = "0.0.1";
-              sha256 =
-                "52004394a60aa8b7df57dda43591de6187a34a31ef64b0a4eecd140a647e2050";
-            };
-
-            meta = {
-              longDescription = ''Descriptive Statistics is a library that
-                                allows you to compute simple descriptive
-                                statistics in Elixir. Inspired by
-                                https://github.com/thirtysixthspan/descriptive_statistics.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/pusewicz/descriptive_statistics";
-            };
-          }
-      ) {};
-
-    descriptive_statistics = descriptive_statistics_0_0_1;
-
     detergent_0_3_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "detergent";
             version = "0.3.0";
             src = fetchHex {
@@ -9311,15 +5637,15 @@ let
               license = with stdenv.lib.licenses; [ unlicense bsd3 ];
               homepage = "https://github.com/devinus/detergent";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     detergent = detergent_0_3_0;
 
     detergentex_0_0_7 = callPackage
       (
-        {  buildMix, fetchHex, detergent_0_3_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, detergent_0_3_0 }:
+          buildMix ({
             name = "detergentex";
             version = "0.0.7";
             src = fetchHex {
@@ -9336,64 +5662,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/r-icarus/detergentex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     detergentex = detergentex_0_0_7;
 
-    deviant_elixir_0_0_4 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2, feeder_ex_0_0_2 }:
-          buildMix {
-            name = "deviant_elixir";
-            version = "0.0.4";
-            src = fetchHex {
-              pkg = "deviant_elixir";
-              version = "0.0.4";
-              sha256 =
-                "42473969889a47edab66384988e70ab6b4da158043e9231deab822743e3d9943";
-            };
-            beamDeps  = [ httpoison_0_8_2 feeder_ex_0_0_2 ];
-
-            meta = {
-              longDescription = ''WIP. Unstable alpha. Elixir API wrapper for
-                                Deviant Art. At this moment provides only RSS
-                                feeds intergac.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/vdaniuk/deviant-elixir";
-            };
-          }
-      ) {};
-
-    deviant_elixir = deviant_elixir_0_0_4;
-
-    dexts_0_2_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "dexts";
-            version = "0.2.1";
-            src = fetchHex {
-              pkg = "dexts";
-              version = "0.2.1";
-              sha256 =
-                "9e5cfb3c4546b2f40713b7176556dfd5a839d77b6953ddaf9f06054a5c827ca4";
-            };
-
-            meta = {
-              description = ''dets wrapper for Elixir'';
-              license = stdenv.lib.licenses.wtfpl;
-              homepage = "https://github.com/meh/dexts";
-            };
-          }
-      ) {};
-
-    dexts = dexts_0_2_1;
-
     dflow_0_1_5 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "dflow";
             version = "0.1.5";
             src = fetchHex {
@@ -9408,39 +5685,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/dalmatinerdb/dflow";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     dflow = dflow_0_1_5;
 
-    di_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "di";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "di";
-              version = "0.1.0";
-              sha256 =
-                "d7a89568c986c98399667faeb618d5cc42a89965717e758323aa5370d1547260";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Elixir wrapper for DI.FM'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/JoshuaThompson/di";
-            };
-          }
-      ) {};
-
-    di = di_0_1_0;
-
     dialyxir_0_3_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "dialyxir";
             version = "0.3.3";
             src = fetchHex {
@@ -9456,36 +5709,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/jeremyjh/dialyxir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     dialyxir = dialyxir_0_3_3;
 
-    dialyze_0_1_4 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "dialyze";
-            version = "0.1.4";
-            src = fetchHex {
-              pkg = "dialyze";
-              version = "0.1.4";
-              sha256 =
-                "af9d6c37d8c067aaee959d4e1701e045e011906217c9f772218a3abaa92e4505";
-            };
-
-            meta = {
-              description = ''Dialyzer Mix task'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/fishcakez/dialyze";
-            };
-          }
-      ) {};
-
     dialyze_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "dialyze";
             version = "0.2.1";
             src = fetchHex {
@@ -9500,39 +5732,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/fishcakez/dialyze";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     dialyze = dialyze_0_2_1;
 
-    diane_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, sweet_xml_0_4_0 }:
-          buildMix {
-            name = "diane";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "diane";
-              version = "0.0.1";
-              sha256 =
-                "cb4a9984aab545f376d32f13b4ab612ba32a603781ddd743658d9c3991a4a89d";
-            };
-            beamDeps  = [ sweet_xml_0_4_0 ];
-
-            meta = {
-              description = ''RSS/Atom parser for Elixir.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/ptrckbrwn/diane";
-            };
-          }
-      ) {};
-
-    diane = diane_0_0_1;
-
     dice_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "dice";
             version = "0.0.1";
             src = fetchHex {
@@ -9547,15 +5755,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/stocks29/dice";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     dice = dice_0_0_1;
 
     dice_roller_1_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "dice_roller";
             version = "1.0.1";
             src = fetchHex {
@@ -9569,64 +5777,15 @@ let
                license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/KevinGreene/DiceRoller";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     dice_roller = dice_roller_1_0_1;
 
-    dicer_0_8_0 = callPackage
-      (
-        {  buildMix, fetchHex, sfmt_0_12_7 }:
-          buildMix {
-            name = "dicer";
-            version = "0.8.0";
-            src = fetchHex {
-              pkg = "dicer";
-              version = "0.8.0";
-              sha256 =
-                "834e5d3f4cd9afac655e0f27869ecfdf6fa4ea061ad9ededdc6f295f71325960";
-            };
-            beamDeps  = [ sfmt_0_12_7 ];
-
-            meta = {
-              description = ''Elixir library to calculate dice rolls. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/olhado/dicer";
-            };
-          }
-      ) {};
-
-    dicer = dicer_0_8_0;
-
-    dicks_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_7_5, exjsx_3_1_0 }:
-          buildMix {
-            name = "dicks";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "dicks";
-              version = "0.1.0";
-              sha256 =
-                "66d1a93ad1753361f2fc82033805a5f4c03ff295c78123e497f1ec56b9815be3";
-            };
-            beamDeps  = [ httpoison_0_7_5 exjsx_3_1_0 ];
-
-            meta = {
-              longDescription = ''An Elixir client for the Dick As A Service
-                                platform http://dicks-api.herokuapp.com '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/Annwenn/DicksEx";
-            };
-          }
-      ) {};
-
-    dicks = dicks_0_1_0;
-
     dicon_0_3_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "dicon";
             version = "0.3.0";
             src = fetchHex {
@@ -9641,15 +5800,21 @@ let
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/lexmag/dicon";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     dicon = dicon_0_3_0;
 
     difficult_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, ex_doc_0_11_4, earmark_0_2_1 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          ex_doc_0_11_4,
+          earmark_0_2_1
+        }:
+          buildMix ({
             name = "difficult";
             version = "0.0.2";
             src = fetchHex {
@@ -9665,75 +5830,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/massn/Difficult";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     difficult = difficult_0_0_2;
 
-    digoc_0_3_3 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_3_1, httpoison_0_8_2 }:
-          buildMix {
-            name = "digoc";
-            version = "0.3.3";
-            src = fetchHex {
-              pkg = "digoc";
-              version = "0.3.3";
-              sha256 =
-                "23d5c2f1b977b1f3e12567879a20bc211898efdfcac9a0b6802324bc42ea0605";
-            };
-            beamDeps  = [ poison_1_3_1 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''An Elixir client for the Digital Ocean API v2.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/kevinmontuori/digoc";
-            };
-          }
-      ) {};
-
-    digoc = digoc_0_3_3;
-
-    diplomat_0_0_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poison_1_5_2,
-          httpoison_0_8_2,
-          goth_0_0_3,
-          exprotobuf_1_0_0
-        }:
-          buildMix {
-            name = "diplomat";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "diplomat";
-              version = "0.0.1";
-              sha256 =
-                "49d2bff25e177701f988f1abfb164233617c9af2da1701cb06f651e2b789407b";
-            };
-            beamDeps  = [
-                          poison_1_5_2
-                          httpoison_0_8_2
-                          goth_0_0_3
-                          exprotobuf_1_0_0
-                        ];
-
-            meta = {
-              description = ''A library for interacting with Google`s Cloud
-                            Datastore'';
-
-            };
-          }
-      ) {};
-
-    diplomat = diplomat_0_0_1;
-
     dir_walker_0_0_6 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "dir_walker";
             version = "0.0.6";
             src = fetchHex {
@@ -9750,7 +5855,7 @@ let
                                 using {:ok, walker} = DirWalker.start_link(path)
                                 # or [path, path...] Then return the next `n`
                                 path names using paths = DirWalker.next(walker
-                                <, n \ 1>) Successive calls to `next` will
+                                <, n \\ 1>) Successive calls to `next` will
                                 return successive file names, until all file
                                 names have been returned. These methods have
                                 also been wrapped into a Stream resource. paths
@@ -9758,63 +5863,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/pragdave/dir_walker";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     dir_walker = dir_walker_0_0_6;
 
-    discount_0_7_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "discount";
-            version = "0.7.0";
-            src = fetchHex {
-              pkg = "discount";
-              version = "0.7.0";
-              sha256 =
-                "a37b7890620f93aa2fae06eee364cd906991588bc8897e659f51634179519c97";
-            };
-
-            meta = {
-              description = ''Elixir NIF for discount, a Markdown parser'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/asaaki/discount.ex";
-            };
-          }
-      ) {};
-
-    discount = discount_0_7_0;
-
-    discovery_0_5_7 = callPackage
-      (
-        {  buildMix, fetchHex, hash_ring_ex_1_1_2, consul_1_0_3 }:
-          buildMix {
-            name = "discovery";
-            version = "0.5.7";
-            src = fetchHex {
-              pkg = "discovery";
-              version = "0.5.7";
-              sha256 =
-                "e252044547397e53c52809d5b76070f302e243992c4cbfa233fc4fa44927ccc8";
-            };
-            beamDeps  = [ hash_ring_ex_1_1_2 consul_1_0_3 ];
-
-            meta = {
-              description = ''An OTP application for auto-discovering services
-                            with Consul '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/undeadlabs/discovery";
-            };
-          }
-      ) {};
-
-    discovery = discovery_0_5_7;
-
     dismake_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "dismake";
             version = "1.0.0";
             src = fetchHex {
@@ -9825,20 +5882,20 @@ let
             };
 
             meta = {
-              description = ''Dismake is a "compiler" (as in Mix.compilers)
+              description = ''Dismake is a \"compiler\" (as in Mix.compilers)
                             that just runs make. '';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/jarednorman/dismake";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     dismake = dismake_1_0_0;
 
     distance_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "distance";
             version = "0.1.2";
             src = fetchHex {
@@ -9854,13 +5911,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/pkinney/distance";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     distance_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "distance";
             version = "0.2.0";
             src = fetchHex {
@@ -9876,39 +5933,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/pkinney/distance";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     distance = distance_0_2_0;
 
-    distance_api_matrix_2_0_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "distance_api_matrix";
-            version = "2.0.0";
-            src = fetchHex {
-              pkg = "distance_api_matrix";
-              version = "2.0.0";
-              sha256 =
-                "e6996e829d7cf4e3e6b7790c53207f86aa467c0ba28af7a20df81e3b16d40fa0";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Google Distance Matrix API Library for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/C404/distance-api-matrix";
-            };
-          }
-      ) {};
-
-    distance_api_matrix = distance_api_matrix_2_0_0;
-
     distancex_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
+          buildMix ({
             name = "distancex";
             version = "0.1.0";
             src = fetchHex {
@@ -9926,15 +5959,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/vysakh0/distancex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     distancex = distancex_0_1_0;
 
     diver_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "diver";
             version = "0.1.1";
             src = fetchHex {
@@ -9951,15 +5984,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/novabyte/diver";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     diver = diver_0_1_1;
 
     dlist_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "dlist";
             version = "0.0.1";
             src = fetchHex {
@@ -9974,70 +6007,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/stocks29/dlist.git";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     dlist = dlist_0_0_1;
 
-    dns_0_0_3 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "dns";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "dns";
-              version = "0.0.3";
-              sha256 =
-                "60f4ff5a01cf95bbeb7b407712bcf833092280f6cc0c34ab09d2c0415fcb842e";
-            };
-
-            meta = {
-              longDescription = ''DNS library for Elixir. Currently, the
-                                package provides: - Elixir structs to interface
-                                with `inet_dns` module. - DNS.Server behavior -
-                                DNS.Client Note: the `inet_dns` module is
-                                considered internal to Erlang and subject to
-                                change. If this happened this library will be
-                                updated to accommodate for that, but for now
-                                `inet_dns` is simple and worked for me.'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/tungd/elixir-dns";
-            };
-          }
-      ) {};
-
-    dns = dns_0_0_3;
-
-    dnsimple_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
-          buildMix {
-            name = "dnsimple";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "dnsimple";
-              version = "0.0.1";
-              sha256 =
-                "37acb9b7a35f9383ed98754e5bee5c479b91ac739ec566befa32d9baccdb4105";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
-
-            meta = {
-              description = ''An (experimental) Elixir client for the DNSimple
-                            API v2.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/weppos/dnsimple-elixir";
-            };
-          }
-      ) {};
-
-    dnsimple = dnsimple_0_0_1;
-
     doc_first_formatter_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "doc_first_formatter";
             version = "0.0.1";
             src = fetchHex {
@@ -10055,15 +6033,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/bkerley/doc_first_formatter";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     doc_first_formatter = doc_first_formatter_0_0_1;
 
     doc_plug_1_0_2 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "doc_plug";
             version = "1.0.2";
             src = fetchHex {
@@ -10080,41 +6058,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/hild/doc_plug";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     doc_plug = doc_plug_1_0_2;
 
-    docker_0_3_0 = callPackage
-      (
-        {  buildRebar3, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildRebar3 {
-            name = "docker";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "docker";
-              version = "0.3.0";
-              sha256 =
-                "ad97dbaa51a615a7694018d95b0b09403b6d552a03ddb3ba50f121c814cc624a";
-            };
-
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Elixir client for the Docker Remote API using
-                            HTTPoison. '';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/hexedpackets/docker-elixir";
-            };
-          }
-      ) {};
-
-    docker = docker_0_3_0;
-
     dogma_0_1_4 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
+          buildMix ({
             name = "dogma";
             version = "0.1.4";
             src = fetchHex {
@@ -10131,15 +6083,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/lpil/dogma";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     dogma = dogma_0_1_4;
 
     dogstatsd_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "dogstatsd";
             version = "0.0.3";
             src = fetchHex {
@@ -10155,15 +6107,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/adamkittelson/dogstatsd-elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     dogstatsd = dogstatsd_0_0_3;
 
     dot_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "dot";
             version = "0.0.3";
             src = fetchHex {
@@ -10173,36 +6125,15 @@ let
                 "3411bf1f70bb8ea0caa64515054a4a161b711667a5cdb0e7c14e766ce04b06ae";
             };
              meta = {    };
-          }
+          } // packageOverrides)
       ) {};
 
     dot = dot_0_0_3;
 
-    dotenv_0_0_4 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "dotenv";
-            version = "0.0.4";
-            src = fetchHex {
-              pkg = "dotenv";
-              version = "0.0.4";
-              sha256 =
-                "e5243714a0fa0fbb6b5f466b1302db3a5fdb28363460fd4d282167e476cf703d";
-            };
-
-            meta = {
-              description = ''A port of dotenv to Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/avdi/dotenv_elixir";
-            };
-          }
-      ) {};
-
     dotenv_2_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "dotenv";
             version = "2.0.0";
             src = fetchHex {
@@ -10217,155 +6148,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/avdi/dotenv_elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     dotenv = dotenv_2_0_0;
 
-    dotenv_elixir_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "dotenv_elixir";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "dotenv_elixir";
-              version = "0.0.2";
-              sha256 =
-                "b7b95bff53df3bee1f500a24543bfb4c5c90b69c741454a86509b5a26c0355b7";
-            };
-
-            meta = {
-              description = ''A port of dotenv to Elixir '';
-
-              homepage = "https://github.com/avdi/dotenv_elixir";
-            };
-          }
-      ) {};
-
-    dotenv_elixir = dotenv_elixir_0_0_2;
-
-    dovetail_0_0_3 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "dovetail";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "dovetail";
-              version = "0.0.3";
-              sha256 =
-                "01b6c3085ebb9cb7d43115c7a2d9780a840017e521daeb7d0a2233f61f8b0306";
-            };
-
-            meta = {
-              description = ''Dovetail provides a harness for running test
-                            dovecot servers.'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/thusfresh/dovetail";
-            };
-          }
-      ) {};
-
-    dovetail = dovetail_0_0_3;
-
-    dpd_client_0_0_6 = callPackage
-      (
-        {  buildMix, fetchHex, hackney_1_4_8, poison_1_0_3 }:
-          buildMix {
-            name = "dpd_client";
-            version = "0.0.6";
-            src = fetchHex {
-              pkg = "dpd_client";
-              version = "0.0.6";
-              sha256 =
-                "080d8e9e4c68db87e42ead3fa3ffbc8cde2cadac441dbe81fa7a1b903486cc2d";
-            };
-            beamDeps  = [ hackney_1_4_8 poison_1_0_3 ];
-
-            meta = {
-              longDescription = ''`dpd_client` is an API client for the DPD
-                                service. It only supports a few of the API`s
-                                endpoints at present. '';
-              license = stdenv.lib.licenses.mit;
-            };
-          }
-      ) {};
-
-    dpd_client = dpd_client_0_0_6;
-
-    dproto_0_1_12 = callPackage
-      (
-        {  buildRebar3, fetchHex, mmath_0_1_15 }:
-          buildRebar3 {
-            name = "dproto";
-            version = "0.1.12";
-            src = fetchHex {
-              pkg = "dproto";
-              version = "0.1.12";
-              sha256 =
-                "49e2a048293a6c6213b69b5e983c581f81de0536e9acb5c47cd113ef410abbcf";
-            };
-
-            beamDeps  = [ mmath_0_1_15 ];
-
-            meta = {
-              description = ''Protocols for dalmatinerdb'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/dalmatinerdb/dproto";
-            };
-          }
-      ) {};
-
-    dproto = dproto_0_1_12;
-
-    dqe_0_1_33 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          qdate_0_4_2,
-          poolboy_1_5_1,
-          mmath_0_1_16,
-          lager_3_0_2,
-          dproto_0_1_12,
-          dflow_0_1_5,
-          ddb_client_0_1_17
-        }:
-          buildRebar3 {
-            name = "dqe";
-            version = "0.1.33";
-            src = fetchHex {
-              pkg = "dqe";
-              version = "0.1.33";
-              sha256 =
-                "b3c4eded2953afff00df0e33534b36e8bcceccafa9c11fd3438e1a88d570bb41";
-            };
-
-            beamDeps  = [
-                          qdate_0_4_2
-                          poolboy_1_5_1
-                          mmath_0_1_16
-                          lager_3_0_2
-                          dproto_0_1_12
-                          dflow_0_1_5
-                          ddb_client_0_1_17
-                        ];
-
-            meta = {
-              description = ''DalmatinerDB query engine'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/dalmatinerdb/dqe";
-            };
-          }
-      ) {};
-
-    dqe = dqe_0_1_33;
-
     drawille_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, ex_doc_0_10_0, earmark_0_1_19 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          ex_doc_0_10_0,
+          earmark_0_1_19
+        }:
+          buildMix ({
             name = "drawille";
             version = "0.0.1";
             src = fetchHex {
@@ -10381,64 +6178,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/massn/elixir-drawille";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     drawille = drawille_0_0_1;
 
-    dropbox_0_0_7 = callPackage
-      (
-        {  buildMix, fetchHex, hackney_1_4_8, jazz_0_2_1 }:
-          buildMix {
-            name = "dropbox";
-            version = "0.0.7";
-            src = fetchHex {
-              pkg = "dropbox";
-              version = "0.0.7";
-              sha256 =
-                "d881be0c042856e0b2ff446dfac0b64337f5cbbb18479f4c81080d3d2cd7e4af";
-            };
-            beamDeps  = [ hackney_1_4_8 jazz_0_2_1 ];
-
-            meta = {
-              description = ''A Dropbox Core API client for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ammmir/elixir-dropbox";
-            };
-          }
-      ) {};
-
-    dropbox = dropbox_0_0_7;
-
-    dublin_bus_api_0_1_6 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2, floki_0_8_0 }:
-          buildMix {
-            name = "dublin_bus_api";
-            version = "0.1.6";
-            src = fetchHex {
-              pkg = "dublin_bus_api";
-              version = "0.1.6";
-              sha256 =
-                "4ac4811519a176c149b03c021bebd44771a279c489fe09c18a1f16f373c7bbb8";
-            };
-            beamDeps  = [ httpoison_0_8_2 floki_0_8_0 ];
-
-            meta = {
-              description = ''Access to the Real Time Passenger Information
-                            (RTPI) for Dublin Bus services.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/carlo-colombo/dublin-bus-api";
-            };
-          }
-      ) {};
-
-    dublin_bus_api = dublin_bus_api_0_1_6;
-
     durga_transport_1_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "durga_transport";
             version = "1.0.1";
             src = fetchHex {
@@ -10448,15 +6196,15 @@ let
                 "42db857eba0e78c4eb15823b5137e8ccad13711cc2c873b6f1b469c4c0771009";
             };
              meta = {    };
-          }
+          } // packageOverrides)
       ) {};
 
     durga_transport = durga_transport_1_0_1;
 
     dye_0_4_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "dye";
             version = "0.4.0";
             src = fetchHex {
@@ -10471,15 +6219,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/Kabie/dye";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     dye = dye_0_4_0;
 
     dynamic_compile_1_0_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "dynamic_compile";
             version = "1.0.0";
             src = fetchHex {
@@ -10495,15 +6243,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/okeuday/dynamic_compile";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     dynamic_compile = dynamic_compile_1_0_0;
 
     e2qc_0_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "e2qc";
             version = "0.1.0";
             src = fetchHex {
@@ -10513,21 +6261,23 @@ let
                 "3a97f9b3c60ec723002a816c041ac224dc5aba3360bd922c5e38cfd40f59c65b";
             };
             compilePorts = true;
+            buildPlugins  = [ pc ];
+
 
             meta = {
               description = ''2q cache'';
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/project-fifo/e2qc";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     e2qc = e2qc_0_1_0;
 
     e_queue_1_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "e_queue";
             version = "1.0.1";
             src = fetchHex {
@@ -10544,43 +6294,19 @@ let
                                 can`t predict when an item needs to be taken or
                                 added to the queue. Use this instead of using
                                 `++` or double reversing lists to add items to
-                                the "back" of a queue.'';
+                                the \"back\" of a queue.'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/benfalk/e_queue";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     e_queue = e_queue_1_0_1;
 
-    e_quip_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "e_quip";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "e_quip";
-              version = "0.0.1";
-              sha256 =
-                "e6fe9eeb96dbc863b527a792e730ea41aea43caef2a5db68ea2c4c9fc21f552a";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Simple Quip API Client'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/mmartinson/e_quip";
-            };
-          }
-      ) {};
-
-    e_quip = e_quip_0_0_1;
-
     earmark_0_1_15 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "earmark";
             version = "0.1.15";
             src = fetchHex {
@@ -10599,13 +6325,13 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/pragdave/earmark";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     earmark_0_1_19 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "earmark";
             version = "0.1.19";
             src = fetchHex {
@@ -10624,13 +6350,13 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/pragdave/earmark";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     earmark_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "earmark";
             version = "0.2.1";
             src = fetchHex {
@@ -10649,15 +6375,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/pragdave/earmark";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     earmark = earmark_0_2_1;
 
     eastar_0_3_8 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "eastar";
             version = "0.3.8";
             src = fetchHex {
@@ -10676,15 +6402,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "http://github.com/herenowcoder/eastar";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     eastar = eastar_0_3_8;
 
     easy_server_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "easy_server";
             version = "0.0.1";
             src = fetchHex {
@@ -10699,15 +6425,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/termoose/EasyServer";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     easy_server = easy_server_0_0_1;
 
     easypost_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
+          buildMix ({
             name = "easypost";
             version = "0.0.1";
             src = fetchHex {
@@ -10723,15 +6449,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/Dania02525/easypost";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     easypost = easypost_0_0_1;
 
     ec2_0_9_1 = callPackage
       (
-        {  buildMix, fetchHex, jsx_2_8_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, jsx_2_8_0 }:
+          buildMix ({
             name = "ec2";
             version = "0.9.1";
             src = fetchHex {
@@ -10748,43 +6474,22 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/talentdeficit/ec2";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ec2 = ec2_0_9_1;
 
-    ecc_0_1_3 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "ecc";
-            version = "0.1.3";
-            src = fetchHex {
-              pkg = "ecc";
-              version = "0.1.3";
-              sha256 =
-                "0255ffe6e2b2cbbc2445ec7de6d29e16b6b6d8eaf0a6ae99a299cc79162541db";
-            };
-
-            meta = {
-              longDescription = ''An elixir module for elliptic curve
-                                cryptography. It can be used either as a library
-                                or as a GenServer-Task for signing messages and
-                                verifying signatures with a public key. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/farao/elixir-ecc";
-            };
-          }
-      ) {};
-
-    ecc = ecc_0_1_3;
-
     ecdo_0_1_4 = callPackage
       (
         {
-          buildMix, fetchHex, postgrex_0_11_1, mariaex_0_7_0, ecto_1_0_7
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          postgrex_0_11_1,
+          mariaex_0_7_0,
+          ecto_1_0_7
         }:
-          buildMix {
+          buildMix ({
             name = "ecdo";
             version = "0.1.4";
             src = fetchHex {
@@ -10802,15 +6507,15 @@ let
 
               homepage = "https://github.com/xerions/ecdo";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ecdo = ecdo_0_1_4;
 
     echo_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "echo";
             version = "0.2.0";
             src = fetchHex {
@@ -10829,39 +6534,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/zmoshansky/echo";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     echo = echo_0_2_0;
 
-    echonest_ex_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "echonest_ex";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "echonest_ex";
-              version = "0.0.2";
-              sha256 =
-                "d8b3d7f2b04eb48b689877aaf9db30f33acea3ea02daca5aad8d105ac785bd98";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Echonest api wrapper for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/desmondhume/echonest_ex";
-            };
-          }
-      ) {};
-
-    echonest_ex = echonest_ex_0_0_2;
-
     econfig_0_7_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "econfig";
             version = "0.7.1";
             src = fetchHex {
@@ -10876,7 +6557,7 @@ let
 
               homepage = "https://github.com/benoitc/econfig";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     econfig = econfig_0_7_1;
@@ -10885,6 +6566,7 @@ let
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           sbroker_0_7_0,
           postgrex_0_9_1,
@@ -10893,7 +6575,7 @@ let
           mariaex_0_4_3,
           decimal_1_1_1
         }:
-          buildMix {
+          buildMix ({
             name = "ecto";
             version = "0.15.0";
             src = fetchHex {
@@ -10918,13 +6600,14 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/elixir-lang/ecto";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ecto_0_16_0 = callPackage
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           sbroker_0_7_0,
           postgrex_0_9_1,
@@ -10933,7 +6616,7 @@ let
           mariaex_0_4_3,
           decimal_1_1_1
         }:
-          buildMix {
+          buildMix ({
             name = "ecto";
             version = "0.16.0";
             src = fetchHex {
@@ -10958,91 +6641,14 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/elixir-lang/ecto";
             };
-          }
-      ) {};
-
-    ecto_0_2_4 = callPackage
-      (
-        {
-          buildMix, fetchHex, postgrex_0_8_4, poolboy_1_2_1, decimal_0_2_5
-        }:
-          buildMix {
-            name = "ecto";
-            version = "0.2.4";
-            src = fetchHex {
-              pkg = "ecto";
-              version = "0.2.4";
-              sha256 =
-                "b6918fb8a0b72220238832616c42937ac04d2f8016d687b53e3a241234cae4f3";
-            };
-            beamDeps  = [ postgrex_0_8_4 poolboy_1_2_1 decimal_0_2_5 ];
-
-            meta = {
-              longDescription = ''Ecto is a domain specific language for
-                                writing queries and interacting with databases
-                                in Elixir.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/elixir-lang/ecto";
-            };
-          }
-      ) {};
-
-    ecto_0_2_7 = callPackage
-      (
-        {
-          buildMix, fetchHex, postgrex_0_8_4, poolboy_1_4_2, decimal_0_2_5
-        }:
-          buildMix {
-            name = "ecto";
-            version = "0.2.7";
-            src = fetchHex {
-              pkg = "ecto";
-              version = "0.2.7";
-              sha256 =
-                "3f26fd41a9e34272f5e753a010b1494646892130c91603da717b375c7acfed7f";
-            };
-            beamDeps  = [ postgrex_0_8_4 poolboy_1_4_2 decimal_0_2_5 ];
-
-            meta = {
-              longDescription = ''Ecto is a domain specific language for
-                                writing queries and interacting with databases
-                                in Elixir.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/elixir-lang/ecto";
-            };
-          }
-      ) {};
-
-    ecto_0_5_1 = callPackage
-      (
-        {
-          buildMix, fetchHex, postgrex_0_8_4, poolboy_1_4_2, decimal_0_2_5
-        }:
-          buildMix {
-            name = "ecto";
-            version = "0.5.1";
-            src = fetchHex {
-              pkg = "ecto";
-              version = "0.5.1";
-              sha256 =
-                "a7f1f8022f6b8c53edc91076bcc885e1124fdf14cdc2c4a11d3b9b4c26cf34a8";
-            };
-            beamDeps  = [ postgrex_0_8_4 poolboy_1_4_2 decimal_0_2_5 ];
-
-            meta = {
-              longDescription = ''Ecto is a domain specific language for
-                                writing queries and interacting with databases
-                                in Elixir.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/elixir-lang/ecto";
-            };
-          }
+          } // packageOverrides)
       ) {};
 
     ecto_1_0_7 = callPackage
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           sbroker_0_7_0,
           postgrex_0_9_1,
@@ -11051,7 +6657,7 @@ let
           mariaex_0_4_3,
           decimal_1_1_1
         }:
-          buildMix {
+          buildMix ({
             name = "ecto";
             version = "1.0.7";
             src = fetchHex {
@@ -11076,13 +6682,14 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/elixir-lang/ecto";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ecto_1_1_5 = callPackage
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           sbroker_0_7_0,
           postgrex_0_11_1,
@@ -11091,7 +6698,7 @@ let
           mariaex_0_1_7,
           decimal_1_1_1
         }:
-          buildMix {
+          buildMix ({
             name = "ecto";
             version = "1.1.5";
             src = fetchHex {
@@ -11116,55 +6723,13 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/elixir-lang/ecto";
             };
-          }
+          } // packageOverrides)
       ) {};
 
-    ecto_2_0_0_beta_2 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          sbroker_0_7_0,
-          postgrex_0_11_1,
-          poolboy_1_5_1,
-          poison_1_0_3,
-          mariaex_0_7_0,
-          decimal_1_1_1
-        }:
-          buildMix {
-            name = "ecto";
-            version = "2.0.0-beta.2";
-            src = fetchHex {
-              pkg = "ecto";
-              version = "2.0.0-beta.2";
-              sha256 =
-                "8b4f7ee50b342b9ea8a9c64b855625f2f805ddb981b89261d464fe84e93e40bd";
-            };
-            beamDeps  = [
-                          sbroker_0_7_0
-                          postgrex_0_11_1
-                          poolboy_1_5_1
-                          poison_1_0_3
-                          mariaex_0_7_0
-                          decimal_1_1_1
-                        ];
-
-            meta = {
-              longDescription = ''Ecto is a domain specific language for
-                                writing queries and interacting with databases
-                                in Elixir.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/elixir-lang/ecto";
-            };
-          }
-      ) {};
-
-    ecto = ecto_2_0_0_beta_2;
-
     ecto_audit_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ecto_audit";
             version = "0.0.1";
             src = fetchHex {
@@ -11180,71 +6745,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mattweldon/ecto_audit";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ecto_audit = ecto_audit_0_0_1;
 
-    ecto_enum_0_3_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          postgrex_0_11_1,
-          mariaex_0_7_0,
-          ecto_2_0_0_beta_2
-        }:
-          buildMix {
-            name = "ecto_enum";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "ecto_enum";
-              version = "0.3.0";
-              sha256 =
-                "2aabbeeee17c67b8336890cc1888b1104b71e29852d464a77efca4257b02a8d9";
-            };
-            beamDeps  = [ postgrex_0_11_1 mariaex_0_7_0 ecto_2_0_0_beta_2 ];
-
-            meta = {
-              description = ''Ecto extension to support enums in models'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/gjaldon/ecto_enum";
-            };
-          }
-      ) {};
-
-    ecto_enum = ecto_enum_0_3_0;
-
-    ecto_fixtures_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, uuid_1_1_3 }:
-          buildMix {
-            name = "ecto_fixtures";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "ecto_fixtures";
-              version = "0.0.2";
-              sha256 =
-                "64e7ea208763fbcfb089ae8693fddcbe45c70ce2879614ad4edf883ca33ce061";
-            };
-            beamDeps  = [ uuid_1_1_3 ];
-
-            meta = {
-              longDescription = ''Ecto Fixtures provides a simple DSL for
-                                quickly creating fixture data for your test
-                                suite.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/dockyard/ecto_fixtures";
-            };
-          }
-      ) {};
-
-    ecto_fixtures = ecto_fixtures_0_0_2;
-
     ecto_gettext_0_1_4 = callPackage
       (
-        {  buildMix, fetchHex, gettext_0_10_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, gettext_0_10_0 }:
+          buildMix ({
             name = "ecto_gettext";
             version = "0.1.4";
             src = fetchHex {
@@ -11261,206 +6770,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/exbugs-elixir/ecto_gettext";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ecto_gettext = ecto_gettext_0_1_4;
 
-    ecto_hstore_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, ecto_2_0_0_beta_2 }:
-          buildMix {
-            name = "ecto_hstore";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "ecto_hstore";
-              version = "0.0.1";
-              sha256 =
-                "0dca7ad14d0fa42038594e00a6f1e1fb3476644f71299f9e4ca10f1b9d6098cb";
-            };
-            beamDeps  = [ ecto_2_0_0_beta_2 ];
-
-            meta = {
-              description = ''Ecto.Hstore adds Postgres Hstore compatibility to
-                            Ecto. '';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/stavro/ecto_hstore";
-            };
-          }
-      ) {};
-
-    ecto_hstore = ecto_hstore_0_0_1;
-
-    ecto_it_0_2_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          postgrex_0_11_1,
-          mariaex_0_7_0,
-          ecto_2_0_0_beta_2
-        }:
-          buildMix {
-            name = "ecto_it";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "ecto_it";
-              version = "0.2.0";
-              sha256 =
-                "ddbf27e85547b9812d7b49bc2252b4667468582b174045ba2bb1a804d209a860";
-            };
-            beamDeps  = [ postgrex_0_11_1 mariaex_0_7_0 ecto_2_0_0_beta_2 ];
-
-            meta = {
-              longDescription = ''Ecto IT is library for writing integration
-                                tests(with database backend) for ecto-based
-                                applications.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/xerions/ecto_it";
-            };
-          }
-      ) {};
-
-    ecto_it = ecto_it_0_2_0;
-
-    ecto_lazy_float_0_1_2 = callPackage
-      (
-        {  buildMix, fetchHex, ecto_2_0_0_beta_2 }:
-          buildMix {
-            name = "ecto_lazy_float";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "ecto_lazy_float";
-              version = "0.1.2";
-              sha256 =
-                "76f14bf8d2bf52e3143c79fdf0e9d9bbb2fb1b087e847b13347e52e5b0c5da94";
-            };
-            beamDeps  = [ ecto_2_0_0_beta_2 ];
-
-            meta = {
-              description = ''Ecto.LazyFloat takes integer, strings, and floats
-                            and casts them to floats. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/joshdholtz/ecto-lazy-float";
-            };
-          }
-      ) {};
-
-    ecto_lazy_float = ecto_lazy_float_0_1_2;
-
-    ecto_ldap_0_2_4 = callPackage
-      (
-        {  buildMix, fetchHex, ecto_2_0_0_beta_2 }:
-          buildMix {
-            name = "ecto_ldap";
-            version = "0.2.4";
-            src = fetchHex {
-              pkg = "ecto_ldap";
-              version = "0.2.4";
-              sha256 =
-                "156294145a5d4ab0b71f86f2738a991de0fa6352360f5d5383b22dc18a25dc57";
-            };
-            beamDeps  = [ ecto_2_0_0_beta_2 ];
-
-            meta = {
-              description = ''An Ecto adapter for LDAP'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jeffweiss/ecto_ldap";
-            };
-          }
-      ) {};
-
-    ecto_ldap = ecto_ldap_0_2_4;
-
-    ecto_migrate_0_6_3 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          postgrex_0_11_1,
-          mariaex_0_7_0,
-          ecto_it_0_2_0,
-          ecto_1_0_7
-        }:
-          buildMix {
-            name = "ecto_migrate";
-            version = "0.6.3";
-            src = fetchHex {
-              pkg = "ecto_migrate";
-              version = "0.6.3";
-              sha256 =
-                "a604f2fe7874c674bd42fc70f3e89776d3738571d252ec8b785a107a6fa12b5c";
-            };
-            beamDeps  = [
-                          postgrex_0_11_1 mariaex_0_7_0 ecto_it_0_2_0 ecto_1_0_7
-                        ];
-
-            meta = {
-              longDescription = ''Ecto auto migration library. It allows to
-                                generate and run migrations for initial and
-                                update migrations.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/xerions/ecto_migrate";
-            };
-          }
-      ) {};
-
-    ecto_migrate = ecto_migrate_0_6_3;
-
-    ecto_ordered_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, ecto_0_5_1 }:
-          buildMix {
-            name = "ecto_ordered";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "ecto_ordered";
-              version = "0.0.2";
-              sha256 =
-                "315ccd497576d800e3962874da19dae8938eb36ca4dc14193ed95ef7c9c12c1e";
-            };
-            beamDeps  = [ ecto_0_5_1 ];
-
-            meta = {
-              description = ''Ecto extension to support ordered list models'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/trustatom-oss/ecto-ordered";
-            };
-          }
-      ) {};
-
-    ecto_ordered = ecto_ordered_0_0_2;
-
-    ecto_validation_case_0_1_1 = callPackage
-      (
-        {  buildMix, fetchHex, ex_doc_0_11_4, ecto_2_0_0_beta_2 }:
-          buildMix {
-            name = "ecto_validation_case";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "ecto_validation_case";
-              version = "0.1.1";
-              sha256 =
-                "0bec902247929e66cb0687f09d458633385843d18ca6ec1ac2557e6754b55cbd";
-            };
-            beamDeps  = [ ex_doc_0_11_4 ecto_2_0_0_beta_2 ];
-
-            meta = {
-              description = ''Ecto.ValidationCase simplifies writing validation
-                            tests for Ecto models. '';
-              license = with stdenv.lib.licenses; [ mit asl20 ];
-              homepage =
-                "https://github.com/danielberkompas/ecto_validation_case";
-            };
-          }
-      ) {};
-
-    ecto_validation_case = ecto_validation_case_0_1_1;
-
     ectograph_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, graphql_0_2_0, ecto_1_1_5 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          graphql_0_2_0,
+          ecto_1_1_5
+        }:
+          buildMix ({
             name = "ectograph";
             version = "0.0.2";
             src = fetchHex {
@@ -11478,77 +6802,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/icidasset/ectograph";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ectograph = ectograph_0_0_2;
 
-    ectoo_0_0_4 = callPackage
-      (
-        {  buildMix, fetchHex, postgrex_0_11_1, ecto_2_0_0_beta_2 }:
-          buildMix {
-            name = "ectoo";
-            version = "0.0.4";
-            src = fetchHex {
-              pkg = "ectoo";
-              version = "0.0.4";
-              sha256 =
-                "bf5852e97e64666ebd57df710e4cb1239d3fcf135d7ae9d5d666fc53aa0e0b46";
-            };
-            beamDeps  = [ postgrex_0_11_1 ecto_2_0_0_beta_2 ];
-
-            meta = {
-              longDescription = ''Make simple things easy in Ecto, e.g.
-                                Ectoo.max(MyModel, :age). Also .count, .min,
-                                .max, .avg.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/henrik/ectoo";
-            };
-          }
-      ) {};
-
-    ectoo = ectoo_0_0_4;
-
-    ectophile_0_3_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          postgrex_0_9_1,
-          poison_1_5_2,
-          mariaex_0_4_3,
-          ecto_2_0_0_beta_2
-        }:
-          buildMix {
-            name = "ectophile";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "ectophile";
-              version = "0.3.0";
-              sha256 =
-                "376c7c838bc602bc64d7ae3dfa4079717f6ed5e0117113652fc281e3e17227d2";
-            };
-            beamDeps  = [
-                          postgrex_0_9_1
-                          poison_1_5_2
-                          mariaex_0_4_3
-                          ecto_2_0_0_beta_2
-                        ];
-
-            meta = {
-              description = ''File upload extension for Ecto'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/gjaldon/ectophile";
-            };
-          }
-      ) {};
-
-    ectophile = ectophile_0_3_0;
-
     edeliver_1_1_4 = callPackage
       (
-        {  buildMix, fetchHex, exrm_1_0_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, exrm_1_0_3 }:
+          buildMix ({
             name = "edeliver";
             version = "1.1.4";
             src = fetchHex {
@@ -11566,66 +6828,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/boldpoker/edeliver";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     edeliver = edeliver_1_1_4;
 
-    eden_0_1_3 = callPackage
-      (
-        {  buildMix, fetchHex, timex_0_13_5, array_1_0_1 }:
-          buildMix {
-            name = "eden";
-            version = "0.1.3";
-            src = fetchHex {
-              pkg = "eden";
-              version = "0.1.3";
-              sha256 =
-                "cbada564b3beb28c350a3f01da7398329e39c24dc9780002ab842d14604ca67b";
-            };
-            beamDeps  = [ timex_0_13_5 array_1_0_1 ];
-
-            meta = {
-              description = ''edn (extensible data notation) encoder/decoder
-                            implemented in Elixir.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/jfacorro/Eden/";
-            };
-          }
-      ) {};
-
-    eden = eden_0_1_3;
-
-    edgarex_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, httpotion_2_2_2, exquery_0_0_11 }:
-          buildMix {
-            name = "edgarex";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "edgarex";
-              version = "0.0.2";
-              sha256 =
-                "99e25e685bc44a1f804729779e77d5e3d1920f42c99478cd9b712d724b4f6af4";
-            };
-            beamDeps  = [ httpotion_2_2_2 exquery_0_0_11 ];
-
-            meta = {
-              longDescription = '' A set of utilities for fetching documents
-                                from the SEC EDGAR data portal, as well as
-                                parsing them into simpler structures. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/rozap/edgarex";
-            };
-          }
-      ) {};
-
-    edgarex = edgarex_0_0_2;
-
     edib_0_5_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "edib";
             version = "0.5.1";
             src = fetchHex {
@@ -11643,15 +6854,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/edib-tool/mix-edib";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     edib = edib_0_5_1;
 
     edip_0_4_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "edip";
             version = "0.4.3";
             src = fetchHex {
@@ -11669,38 +6880,16 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/asaaki/mix-edip";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     edip = edip_0_4_3;
 
-    edown_0_7_0 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "edown";
-            version = "0.7.0";
-            src = fetchHex {
-              pkg = "edown";
-              version = "0.7.0";
-              sha256 =
-                "6d7365a7854cd724e8d1fd005f5faa4444eae6a87eb6df9b789b6e7f6f09110a";
-            };
-
-            meta = {
-              description = ''Markdown generated from Edoc.'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/uwiger/edown";
-            };
-          }
-      ) {};
-
-    edown = edown_0_7_0;
-
     eeb_0_1_3 = callPackage
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           tzdata_0_1_201603,
           timex_1_0_2,
@@ -11708,7 +6897,7 @@ let
           earmark_0_1_19,
           cowboy_1_0_4
         }:
-          buildMix {
+          buildMix ({
             name = "eeb";
             version = "0.1.3";
             src = fetchHex {
@@ -11730,15 +6919,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/aborn/eeb";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     eeb = eeb_0_1_3;
 
     efirebirdsql_0_1_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "efirebirdsql";
             version = "0.1.1";
             src = fetchHex {
@@ -11753,47 +6942,23 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/nakagami/efirebirdsql";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     efirebirdsql = efirebirdsql_0_1_1;
 
-    efrisby_0_2_0 = callPackage
-      (
-        {  buildRebar3, fetchHex, jsx_2_8_0, hackney_1_4_8 }:
-          buildRebar3 {
-            name = "efrisby";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "efrisby";
-              version = "0.2.0";
-              sha256 =
-                "5ad6f030a9e6b7611af09ce009106dcad9fa4ab3d23aa6db03573082f4824470";
-            };
-
-            beamDeps  = [ jsx_2_8_0 hackney_1_4_8 ];
-
-            meta = {
-              description = ''A REST API testing framework for erlang'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/FabioBatSilva/efrisby";
-            };
-          }
-      ) {};
-
-    efrisby = efrisby_0_2_0;
-
     egithub_0_2_2 = callPackage
       (
         {
           buildErlangMk,
+          packageOverrides ? {},
           fetchHex,
           shotgun_0_2_2,
           jiffy_0_14_7,
           lager_3_0_2,
           goldrush_0_1_7
         }:
-          buildErlangMk {
+          buildErlangMk ({
             name = "egithub";
             version = "0.2.2";
             src = fetchHex {
@@ -11811,15 +6976,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/inaka/erlang-github";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     egithub = egithub_0_2_2;
 
     eh_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "eh";
             version = "0.2.0";
             src = fetchHex {
@@ -11835,15 +7000,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/Frost/eh.git";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     eh = eh_0_2_0;
 
     eight_ball_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "eight_ball";
             version = "0.0.1";
             src = fetchHex {
@@ -11859,15 +7024,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/fteem/eight_ball";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     eight_ball = eight_ball_0_0_1;
 
     eight_ball_dj_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "eight_ball_dj";
             version = "0.0.2";
             src = fetchHex {
@@ -11882,15 +7047,22 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/djkianoosh/eight_ball";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     eight_ball_dj = eight_ball_dj_0_0_2;
 
     eio_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_3, cowboy_1_0_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          plug_1_1_3,
+          cowboy_1_0_4
+        }:
+          buildMix ({
             name = "eio";
             version = "0.1.0";
             src = fetchHex {
@@ -11906,80 +7078,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/falood/eio";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     eio = eio_0_1_0;
 
-    ejabberd_16_2_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          stun_1_0_1,
-          stringprep_1_0_3,
-          sqlite3_1_1_5,
-          p1_xmlrpc_1_15_1,
-          p1_utils_1_0_3,
-          p1_pgsql_1_1_0,
-          p1_oauth2_0_6_1,
-          p1_mysql_1_0_1,
-          lager_3_0_2,
-          jiffy_0_14_7,
-          iconv_1_0_0,
-          fast_yaml_1_0_3,
-          fast_xml_1_1_11,
-          fast_tls_1_0_1,
-          ezlib_1_0_1,
-          esip_1_0_2,
-          eredis_1_0_8,
-          cache_tab_1_0_2
-        }:
-          buildMix {
-            name = "ejabberd";
-            version = "16.2.0";
-            src = fetchHex {
-              pkg = "ejabberd";
-              version = "16.2.0";
-              sha256 =
-                "4e51457ac9f850782a5da63d060b8f710c2c652c7bd2062bb8c804a13985ca6e";
-            };
-            beamDeps  = [
-                          stun_1_0_1
-                          stringprep_1_0_3
-                          sqlite3_1_1_5
-                          p1_xmlrpc_1_15_1
-                          p1_utils_1_0_3
-                          p1_pgsql_1_1_0
-                          p1_oauth2_0_6_1
-                          p1_mysql_1_0_1
-                          lager_3_0_2
-                          jiffy_0_14_7
-                          iconv_1_0_0
-                          fast_yaml_1_0_3
-                          fast_xml_1_1_11
-                          fast_tls_1_0_1
-                          ezlib_1_0_1
-                          esip_1_0_2
-                          eredis_1_0_8
-                          cache_tab_1_0_2
-                        ];
-
-            meta = {
-              longDescription = ''Robust, ubiquitous and massively scalable
-                                Jabber / XMPP Instant Messaging platform.'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/processone/ejabberd";
-            };
-          }
-      ) {};
-
-    ejabberd = ejabberd_16_2_0;
-
     ejabberd_dev_15_9_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ejabberd_dev";
             version = "15.9.0";
             src = fetchHex {
@@ -11997,234 +7104,15 @@ let
               license = stdenv.lib.licenses.gpl3;
               homepage = "https://github.com/scrogson/ejabberd_dev";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ejabberd_dev = ejabberd_dev_15_9_0;
 
-    ekstat_0_2_2 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "ekstat";
-            version = "0.2.2";
-            src = fetchHex {
-              pkg = "ekstat";
-              version = "0.2.2";
-              sha256 =
-                "fdd30052433bf7ceb453397c4cabee2d9b0a2a716842a29a1121d3474c5b9fa7";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''libkstat interface for erlang'';
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/Licenser/ekstat";
-            };
-          }
-      ) {};
-
-    ekstat = ekstat_0_2_2;
-
-    elastex_0_1_2 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "elastex";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "elastex";
-              version = "0.1.2";
-              sha256 =
-                "eaab5305db3d5d326e471dc1799606b7055971dfb7d9a27571850d2ce7e97f9b";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Data driven elixir client for Elasticsearch.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/michaeldoaty/elastex";
-            };
-          }
-      ) {};
-
-    elastex = elastex_0_1_2;
-
-    elastix_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
-          buildMix {
-            name = "elastix";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "elastix";
-              version = "0.1.0";
-              sha256 =
-                "3e24e2287bbd733e913d16092ea3fdff6b7f8f74f9eae73b07699fcf62bb5b06";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
-
-            meta = {
-              description = ''A simple Elastic REST client written in
-                            Elixir.'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/werbitzky/elastix";
-            };
-          }
-      ) {};
-
-    elastix = elastix_0_1_0;
-
-    elaxtic_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2 }:
-          buildMix {
-            name = "elaxtic";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "elaxtic";
-              version = "0.0.1";
-              sha256 =
-                "a912a0327bfe1c6443cec47a03d11450fed2e649bfdcd4e77bdb9176baa8cd45";
-            };
-            beamDeps  = [ httpoison_0_8_2 ];
-
-            meta = {
-              description = ''ElasticSearch client for Elixir and Ecto
-                            driver.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/vic/elaxtic";
-            };
-          }
-      ) {};
-
-    elaxtic = elaxtic_0_0_1;
-
-    eleveldb_2_1_3 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "eleveldb";
-            version = "2.1.3";
-            src = fetchHex {
-              pkg = "eleveldb";
-              version = "2.1.3";
-              sha256 =
-                "91f4caccc3d0a40a6135b9a647a52c7ec5fefdd41883e1a0f32745838d7cfd3c";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''Erlang LevelDB API'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/basho/eleveldb";
-            };
-          }
-      ) {};
-
-    eleveldb = eleveldb_2_1_3;
-
-    elibphonenumber_0_1_1 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "elibphonenumber";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "elibphonenumber";
-              version = "0.1.1";
-              sha256 =
-                "6dcbcd49fe7c969873a3431eaa3939298b2564308d2a8fbcc22b7d9b4bc65f27";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''A port driver for libphonenumber'';
-
-              homepage = "https://github.com/johnhamelink/elibphonenumber";
-            };
-          }
-      ) {};
-
-    elibphonenumber = elibphonenumber_0_1_1;
-
-    elistrix_0_0_5 = callPackage
-      (
-        {  buildMix, fetchHex, timex_0_13_5 }:
-          buildMix {
-            name = "elistrix";
-            version = "0.0.5";
-            src = fetchHex {
-              pkg = "elistrix";
-              version = "0.0.5";
-              sha256 =
-                "63888c589e9ec116f4cb6f8b6ef18aec478d48563965da94594408d3c86450d3";
-            };
-            beamDeps  = [ timex_0_13_5 ];
-
-            meta = {
-              longDescription = ''A latency / fault tolerance library to help
-                                isolate your applications from an uncertain
-                                world of slow or failed services.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/tobz/elistrix";
-            };
-          }
-      ) {};
-
-    elistrix = elistrix_0_0_5;
-
-    elixilorem_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "elixilorem";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "elixilorem";
-              version = "0.0.1";
-              sha256 =
-                "fbe0f40bed9e3e3db687e88d3afb24e1a81ae274582170d1ca0545e13638cbea";
-            };
-
-            meta = {
-              description = ''A Lorem Ipsum generator for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/mgamini/elixilorem";
-            };
-          }
-      ) {};
-
-    elixilorem = elixilorem_0_0_1;
-
-    elixir_ale_0_4_1 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "elixir_ale";
-            version = "0.4.1";
-            src = fetchHex {
-              pkg = "elixir_ale";
-              version = "0.4.1";
-              sha256 =
-                "2ee5c6989a8005a0ab8f1aea0b4f89b5feae75be78a70bade6627c3624c59c46";
-            };
-
-            meta = {
-              description = ''Elixir access to hardware I/O interfaces such as
-                            GPIO, I2C, and SPI.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/fhunleth/elixir_ale";
-            };
-          }
-      ) {};
-
-    elixir_ale = elixir_ale_0_4_1;
-
     elixir_ami_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "elixir_ami";
             version = "0.0.3";
             src = fetchHex {
@@ -12241,15 +7129,21 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/marcelog/elixir_ami";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     elixir_ami = elixir_ami_0_0_3;
 
     elixir_authorizenet_0_2_2 = callPackage
       (
-        {  buildMix, fetchHex, xml_builder_0_0_8, exmerl_0_1_1 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          xml_builder_0_0_8,
+          exmerl_0_1_1
+        }:
+          buildMix ({
             name = "elixir_authorizenet";
             version = "0.2.2";
             src = fetchHex {
@@ -12275,15 +7169,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/marcelog/elixir_authorizenet";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     elixir_authorizenet = elixir_authorizenet_0_2_2;
 
     elixir_bencode_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "elixir_bencode";
             version = "1.0.0";
             src = fetchHex {
@@ -12298,15 +7192,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/AntonFagerberg/elixir_bencode";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     elixir_bencode = elixir_bencode_1_0_0;
 
     elixir_drawille_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, ex_doc_0_10_0, earmark_0_1_19 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          ex_doc_0_10_0,
+          earmark_0_1_19
+        }:
+          buildMix ({
             name = "elixir_drawille";
             version = "0.0.3";
             src = fetchHex {
@@ -12322,15 +7222,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/massn/elixir-drawille";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     elixir_drawille = elixir_drawille_0_0_3;
 
     elixir_exif_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "elixir_exif";
             version = "0.1.1";
             src = fetchHex {
@@ -12346,15 +7246,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/sschneider1207/ElixirExif";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     elixir_exif = elixir_exif_0_1_1;
 
     elixir_feed_parser_0_9_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "elixir_feed_parser";
             version = "0.9.0";
             src = fetchHex {
@@ -12369,15 +7269,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/fdietz/elixir-feed-parser";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     elixir_feed_parser = elixir_feed_parser_0_9_0;
 
     elixir_freshbooks_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex, xml_builder_0_0_8, exmerl_0_1_1 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          xml_builder_0_0_8,
+          exmerl_0_1_1
+        }:
+          buildMix ({
             name = "elixir_freshbooks";
             version = "0.0.4";
             src = fetchHex {
@@ -12393,64 +7299,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/marcelog/elixir_freshbooks";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     elixir_freshbooks = elixir_freshbooks_0_0_4;
 
-    elixir_ipfs_api_0_1_0 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, ex_doc_0_10_0
-        }:
-          buildMix {
-            name = "elixir_ipfs_api";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "elixir_ipfs_api";
-              version = "0.1.0";
-              sha256 =
-                "b8b6656ce18ff070b2328436cfa3d55f08b3e0a2f98bee49d4b3cb49c144684b";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ex_doc_0_10_0 ];
-
-            meta = {
-              description = ''An elixir client library for the IPFS API'';
-
-            };
-          }
-      ) {};
-
-    elixir_ipfs_api = elixir_ipfs_api_0_1_0;
-
-    elixir_locker_0_1_4 = callPackage
-      (
-        {  buildMix, fetchHex, locker_1_0_8 }:
-          buildMix {
-            name = "elixir_locker";
-            version = "0.1.4";
-            src = fetchHex {
-              pkg = "elixir_locker";
-              version = "0.1.4";
-              sha256 =
-                "cca190b5846f37dfaaa495981b92e34015ca0dd0a879d200be90333f3866ceb2";
-            };
-            beamDeps  = [ locker_1_0_8 ];
-
-            meta = {
-              description = ''Elixir wrapper for the locker Erlang library.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/tsharju/elixir_locker";
-            };
-          }
-      ) {};
-
-    elixir_locker = elixir_locker_0_1_4;
-
     elixir_mbcs_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "elixir_mbcs";
             version = "0.1.2";
             src = fetchHex {
@@ -12465,15 +7322,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/woxtu/elixir-mbcs";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     elixir_mbcs = elixir_mbcs_0_1_2;
 
     elixir_mod_event_0_0_5 = callPackage
       (
-        {  buildMix, fetchHex, uuid_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, uuid_1_1_3 }:
+          buildMix ({
             name = "elixir_mod_event";
             version = "0.0.5";
             src = fetchHex {
@@ -12492,50 +7349,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/marcelog/elixir_mod_event";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     elixir_mod_event = elixir_mod_event_0_0_5;
 
-    elixir_nsq_1_0_3 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          uuid_1_1_3,
-          socket_0_3_1,
-          poison_1_5_2,
-          httpotion_2_2_2
-        }:
-          buildMix {
-            name = "elixir_nsq";
-            version = "1.0.3";
-            src = fetchHex {
-              pkg = "elixir_nsq";
-              version = "1.0.3";
-              sha256 =
-                "6d30c3754dfdd988f927b9c6ae51d3e0ec4b0d2477b99047baf7a52c96bf9494";
-            };
-            beamDeps  = [
-                          uuid_1_1_3 socket_0_3_1 poison_1_5_2 httpotion_2_2_2
-                        ];
-
-            meta = {
-              longDescription = ''A client library for NSQ, `elixir_nsq` aims
-                                to be complete, easy to use, and well tested.
-                                Developed at Wistia (http://wistia.com).'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/wistia/elixir_nsq";
-            };
-          }
-      ) {};
-
-    elixir_nsq = elixir_nsq_1_0_3;
-
     elixir_prelude_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "elixir_prelude";
             version = "0.2.1";
             src = fetchHex {
@@ -12550,15 +7372,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ruby2elixir/elixir_prelude";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     elixir_prelude = elixir_prelude_0_2_1;
 
     elixir_radius_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "elixir_radius";
             version = "0.1.0";
             src = fetchHex {
@@ -12573,15 +7395,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bearice/elixir-radius";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     elixir_radius = elixir_radius_0_1_0;
 
     elixir_script_0_16_0 = callPackage
       (
-        {  buildMix, fetchHex, estree_2_3_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, estree_2_3_0 }:
+          buildMix ({
             name = "elixir_script";
             version = "0.16.0";
             src = fetchHex {
@@ -12598,39 +7420,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bryanjos/elixirscript";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     elixir_script = elixir_script_0_16_0;
 
-    elixir_talk_1_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "elixir_talk";
-            version = "1.0.1";
-            src = fetchHex {
-              pkg = "elixir_talk";
-              version = "1.0.1";
-              sha256 =
-                "846a7a66fbc11ed09aec93130da1fc034d28b8e5241b585ebeaaca5b38e0e0d2";
-            };
-
-            meta = {
-              description = ''ElixirTalk is an Elixir client for beanstalkd.
-                            '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jsvisa/elixir_talk";
-            };
-          }
-      ) {};
-
-    elixir_talk = elixir_talk_1_0_1;
-
     elixir_tea_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "elixir_tea";
             version = "1.0.0";
             src = fetchHex {
@@ -12646,15 +7444,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/keichan34/elixir_tea";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     elixir_tea = elixir_tea_1_0_0;
 
     elixir_v8_0_2_2 = callPackage
       (
-        {  buildMix, fetchHex, poolboy_1_5_1, exjsx_3_2_0 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poolboy_1_5_1,
+          exjsx_3_2_0
+        }:
+          buildMix ({
             name = "elixir_v8";
             version = "0.2.2";
             src = fetchHex {
@@ -12670,15 +7474,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/le0pard/elixir_v8";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     elixir_v8 = elixir_v8_0_2_2;
 
     elixlsx_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "elixlsx";
             version = "0.0.2";
             src = fetchHex {
@@ -12693,41 +7497,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/xou/elixlsx";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     elixlsx = elixlsx_0_0_2;
 
-    elixtagram_0_2_5 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_1_5_2, oauth2_0_6_0, httpoison_0_7_5
-        }:
-          buildMix {
-            name = "elixtagram";
-            version = "0.2.5";
-            src = fetchHex {
-              pkg = "elixtagram";
-              version = "0.2.5";
-              sha256 =
-                "71503f2bfec0d4728449321e4e1aaae7c8ae24974d53b904327bcef5b16e6900";
-            };
-            beamDeps  = [ poison_1_5_2 oauth2_0_6_0 httpoison_0_7_5 ];
-
-            meta = {
-              description = ''Instagram client library for Elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/zensavona/elixtagram";
-            };
-          }
-      ) {};
-
-    elixtagram = elixtagram_0_2_5;
-
     elli_1_0_5 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "elli";
             version = "1.0.5";
             src = fetchHex {
@@ -12743,69 +7521,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/knutin/elli";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     elli = elli_1_0_5;
 
-    elmit_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, httpotion_2_2_2 }:
-          buildMix {
-            name = "elmit";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "elmit";
-              version = "0.0.1";
-              sha256 =
-                "90e5df811553733dd7505f9cc81397c3bdaf9c336eb3542c7e44f3c2012ef96e";
-            };
-            beamDeps  = [ httpotion_2_2_2 ];
-
-            meta = {
-              description = ''Google Translate with speech synthesis in your
-                            terminal as Hex package.'';
-
-            };
-          }
-      ) {};
-
-    elmit = elmit_0_0_1;
-
-    email_checker_0_0_3 = callPackage
-      (
-        {  buildMix, fetchHex, socket_0_3_1 }:
-          buildMix {
-            name = "email_checker";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "email_checker";
-              version = "0.0.3";
-              sha256 =
-                "feac6fa5cc1343b437221ace18fa8fa7251dfa777e986063e13f435d6aff990c";
-            };
-            beamDeps  = [ socket_0_3_1 ];
-
-            meta = {
-              longDescription = ''Simple library checking the validity of an
-                                email. Checks are performed in the following
-                                order: - REGEX: validate the emails has a good
-                                looking format - MX: validate the domain sever
-                                contains MX records - SMTP: validate the SMTP
-                                behind the MX records knows this email address
-                                (no email sent)'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/kdisneur/email_checker";
-            };
-          }
-      ) {};
-
-    email_checker = email_checker_0_0_3;
-
     eministat_0_10_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "eministat";
             version = "0.10.1";
             src = fetchHex {
@@ -12820,15 +7544,15 @@ let
                             benchmarks'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     eministat = eministat_0_10_1;
 
     eml_0_7_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "eml";
             version = "0.7.1";
             src = fetchHex {
@@ -12848,15 +7572,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/zambal/eml";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     eml = eml_0_7_1;
 
     emodel_1_3_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "emodel";
             version = "1.3.1";
             src = fetchHex {
@@ -12871,89 +7595,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/egobrain/emodel";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     emodel = emodel_1_3_1;
 
-    enotify_0_1_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "enotify";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "enotify";
-              version = "0.1.0";
-              sha256 =
-                "8e48da763ce15bfd75cc857ddfe5011b03189d597f47bcdd8acc6fbbe8e6b6f4";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''Filesystem listener'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/tsloughter/enotify";
-            };
-          }
-      ) {};
-
-    enotify = enotify_0_1_0;
-
-    ensq_0_1_6 = callPackage
-      (
-        {  buildRebar3, fetchHex, lager_2_1_1, jsxd_0_1_10, jsx_1_4_5 }:
-          buildRebar3 {
-            name = "ensq";
-            version = "0.1.6";
-            src = fetchHex {
-              pkg = "ensq";
-              version = "0.1.6";
-              sha256 =
-                "dd8c167eef061bb80384b34a81dc9a2079d42b254bd4ecbb0aa586937182a466";
-            };
-
-            beamDeps  = [ lager_2_1_1 jsxd_0_1_10 jsx_1_4_5 ];
-
-            meta = {
-              description = ''Erlang client for NSQ'';
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/project-fifo/ensq";
-            };
-          }
-      ) {};
-
-    ensq = ensq_0_1_6;
-
-    env_conf_0_3_0 = callPackage
-      (
-        {  buildMix, fetchHex, earmark_0_1_19 }:
-          buildMix {
-            name = "env_conf";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "env_conf";
-              version = "0.3.0";
-              sha256 =
-                "b1d9732ed635d2dea5bcd74a512e7274350361bc3de12080a03e985d7df3d900";
-            };
-            beamDeps  = [ earmark_0_1_19 ];
-
-            meta = {
-              description = '' A simple 12-Factor configuration service for
-                            Elixir. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/leakybucket/env_conf.git";
-            };
-          }
-      ) {};
-
-    env_conf = env_conf_0_3_0;
-
     envy_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "envy";
             version = "0.0.2";
             src = fetchHex {
@@ -12968,15 +7618,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/BlakeWilliams/envy";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     envy = envy_0_0_2;
 
     eper_0_94_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "eper";
             version = "0.94.0";
             src = fetchHex {
@@ -12996,38 +7646,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/massemanet/eper";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     eper = eper_0_94_0;
 
-    epgpool_1_0_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "epgpool";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "epgpool";
-              version = "1.0.0";
-              sha256 =
-                "fefcde1302722d010a71733cd2e1403ab40686343e7281221136b24d6fad5889";
-            };
-
-            meta = {
-              description = ''Erlang postgresql pool application'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/egobrain/epgpool";
-            };
-          }
-      ) {};
-
-    epgpool = epgpool_1_0_0;
-
     epgsql_3_1_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "epgsql";
             version = "3.1.1";
             src = fetchHex {
@@ -13042,15 +7669,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/epgsql/epgsql";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     epgsql = epgsql_3_1_1;
 
     epiphany_0_1_0_dev = callPackage
       (
-        {  buildMix, fetchHex, connection_1_0_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, connection_1_0_2 }:
+          buildMix ({
             name = "epiphany";
             version = "0.1.0-dev";
             src = fetchHex {
@@ -13066,15 +7693,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/vptheron/epiphany";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     epiphany = epiphany_0_1_0_dev;
 
     episcina_1_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex, gproc_0_3_1 }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex, gproc_0_3_1 }:
+          buildRebar3 ({
             name = "episcina";
             version = "1.1.0";
             src = fetchHex {
@@ -13090,64 +7717,15 @@ let
               description = ''Erlang Connection Pool'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     episcina = episcina_1_1_0;
 
-    eplugin_0_1_4 = callPackage
-      (
-        {  buildRebar3, fetchHex, lager_2_1_1 }:
-          buildRebar3 {
-            name = "eplugin";
-            version = "0.1.4";
-            src = fetchHex {
-              pkg = "eplugin";
-              version = "0.1.4";
-              sha256 =
-                "5103579323fb71e2c245fb5886c53e9ff4115282c09ecb5368b0ae293f0b20fe";
-            };
-
-            beamDeps  = [ lager_2_1_1 ];
-
-            meta = {
-              description = ''plugin provider for erlang'';
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/Licenser/eplugin";
-            };
-          }
-      ) {};
-
-    eplugin = eplugin_0_1_4;
-
-    epubnub_0_1_0 = callPackage
-      (
-        {  buildRebar3, fetchHex, jsx_2_7_1, hackney_1_3_2 }:
-          buildRebar3 {
-            name = "epubnub";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "epubnub";
-              version = "0.1.0";
-              sha256 =
-                "5a3b21ea035b1a7d89eeaf062da946fb17682a72fb9ae12d313677552f63fa69";
-            };
-
-            beamDeps  = [ jsx_2_7_1 hackney_1_3_2 ];
-
-            meta = {
-              description = ''Erlang PubNub API'';
-
-            };
-          }
-      ) {};
-
-    epubnub = epubnub_0_1_0;
-
     eqc_ex_1_2_4 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "eqc_ex";
             version = "1.2.4";
             src = fetchHex {
@@ -13162,15 +7740,15 @@ let
                             with Elixir.'';
               license = stdenv.lib.licenses.bsd3;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     eqc_ex = eqc_ex_1_2_4;
 
     eql_0_1_2 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "eql";
             version = "0.1.2";
             src = fetchHex {
@@ -13185,15 +7763,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/artemeff/eql";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     eql = eql_0_1_2;
 
     equery_0_2_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "equery";
             version = "0.2.0";
             src = fetchHex {
@@ -13208,15 +7786,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/egobrain/equery";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     equery = equery_0_2_0;
 
     eredis_1_0_8 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "eredis";
             version = "1.0.8";
             src = fetchHex {
@@ -13231,41 +7809,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/wooga/eredis";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     eredis = eredis_1_0_8;
 
-    eredis_cluster_0_5_4 = callPackage
-      (
-        {  buildRebar3, fetchHex, poolboy_1_5_1, eredis_1_0_8 }:
-          buildRebar3 {
-            name = "eredis_cluster";
-            version = "0.5.4";
-            src = fetchHex {
-              pkg = "eredis_cluster";
-              version = "0.5.4";
-              sha256 =
-                "09320fe4fb737923e254d6d7ff4da421c1515fc74be9d2d9482ee4a576367681";
-            };
-
-            beamDeps  = [ poolboy_1_5_1 eredis_1_0_8 ];
-
-            meta = {
-              description = ''An erlang wrapper for eredis library to support
-                            cluster mode'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/adrienmo/eredis_cluster";
-            };
-          }
-      ) {};
-
-    eredis_cluster = eredis_cluster_0_5_4;
-
     erl2ex_0_0_8 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "erl2ex";
             version = "0.0.8";
             src = fetchHex {
@@ -13282,38 +7834,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/dazuma/erl2ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     erl2ex = erl2ex_0_0_8;
 
-    erlang_dbus_0_2_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "erlang_dbus";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "erlang_dbus";
-              version = "0.2.0";
-              sha256 =
-                "b00065acfae0cfea909335eab07339292a1f9a9c91b2f542d3841f86f4aac605";
-            };
-
-            meta = {
-              description = ''A native erlang implementation of D-Bus'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/lizenn/erlang-dbus";
-            };
-          }
-      ) {};
-
-    erlang_dbus = erlang_dbus_0_2_0;
-
     erlang_localtime_1_0_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "erlang_localtime";
             version = "1.0.0";
             src = fetchHex {
@@ -13329,40 +7858,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/choptastic/erlang_localtime";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     erlang_localtime = erlang_localtime_1_0_0;
 
-    erlang_lua_0_1_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "erlang_lua";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "erlang_lua";
-              version = "0.1.0";
-              sha256 =
-                "4376a57f86e43ae1d687dca8b6c7c7f692b95d30091a9550636328358026e6eb";
-            };
-            compilePorts = true;
-
-            meta = {
-              longDescription = ''Erlang-lua hex package, using Erlang`s Port
-                                and C Node to run Lua VM as an external Node'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/rtraschke/erlang-lua";
-            };
-          }
-      ) {};
-
-    erlang_lua = erlang_lua_0_1_0;
-
     erlang_term_1_5_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "erlang_term";
             version = "1.5.1";
             src = fetchHex {
@@ -13377,15 +7881,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/okeuday/erlang_term";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     erlang_term = erlang_term_1_5_1;
 
     erlang_version_0_2_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "erlang_version";
             version = "0.2.0";
             src = fetchHex {
@@ -13400,41 +7904,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/sapporo-beam/erlang_version";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     erlang_version = erlang_version_0_2_0;
 
-    erlastic_search_1_1_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, jsx_2_6_2, hackney_1_1_0 }:
-          buildRebar3 {
-            name = "erlastic_search";
-            version = "1.1.1";
-            src = fetchHex {
-              pkg = "erlastic_search";
-              version = "1.1.1";
-              sha256 =
-                "ac15a64db1397b616e1308b997d5de5372a3f67bd2bbdbf32b22d635befcc55a";
-            };
-
-            beamDeps  = [ jsx_2_6_2 hackney_1_1_0 ];
-
-            meta = {
-              description = ''An Erlang app for communicating with Elastic
-                            Search`s rest interface.'';
-              license = stdenv.lib.licenses.lpgl3;
-              homepage = "https://github.com/tsloughter/erlastic_search";
-            };
-          }
-      ) {};
-
-    erlastic_search = erlastic_search_1_1_1;
-
     erlaudio_0_2_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "erlaudio";
             version = "0.2.3";
             src = fetchHex {
@@ -13449,15 +7927,21 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/asonge/erlaudio";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     erlaudio = erlaudio_0_2_3;
 
     erlcloud_0_13_0 = callPackage
       (
-        {  buildRebar3, fetchHex, lhttpc_1_3_0, jsx_2_8_0 }:
-          buildRebar3 {
+        {
+          buildRebar3,
+          packageOverrides ? {},
+          fetchHex,
+          lhttpc_1_3_0,
+          jsx_2_8_0
+        }:
+          buildRebar3 ({
             name = "erlcloud";
             version = "0.13.0";
             src = fetchHex {
@@ -13474,13 +7958,19 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/erlcloud/erlcloud";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     erlcloud_0_13_2 = callPackage
       (
-        {  buildRebar3, fetchHex, lhttpc_1_4_0, jsx_2_8_0 }:
-          buildRebar3 {
+        {
+          buildRebar3,
+          packageOverrides ? {},
+          fetchHex,
+          lhttpc_1_4_0,
+          jsx_2_8_0
+        }:
+          buildRebar3 ({
             name = "erlcloud";
             version = "0.13.2";
             src = fetchHex {
@@ -13497,61 +7987,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/erlcloud/erlcloud";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     erlcloud = erlcloud_0_13_2;
 
-    erlcloud_0_9_2 = callPackage
-      (
-        {  buildRebar3, fetchHex, meck_0_8_4, lhttpc_1_3_0, jsx_2_3_1 }:
-          buildRebar3 {
-            name = "erlcloud";
-            version = "0.9.2";
-            src = fetchHex {
-              pkg = "erlcloud";
-              version = "0.9.2";
-              sha256 =
-                "739ab77c3f007b3c8466e093726fb3e62b19691d70dbff4defc4beac61e48f12";
-            };
-
-            beamDeps  = [ meck_0_8_4 lhttpc_1_3_0 jsx_2_3_1 ];
-
-            meta = {
-              description = ''Erlang cloud computing library'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/erlcloud/erlcloud";
-            };
-          }
-      ) {};
-
-    erldn_1_0_5 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "erldn";
-            version = "1.0.5";
-            src = fetchHex {
-              pkg = "erldn";
-              version = "1.0.5";
-              sha256 =
-                "b7fdafda24884ab52dc453a18a99ad3d31fa690770d2d50f8e5bdbc3fff0f166";
-            };
-
-            meta = {
-              description = ''An edn parser for the Erlang platform.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/marianoguerra/erldn";
-            };
-          }
-      ) {};
-
-    erldn = erldn_1_0_5;
-
     erlexec_1_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "erlexec";
             version = "1.1.0";
             src = fetchHex {
@@ -13561,43 +8005,21 @@ let
                 "772162f0f0349f89ea11b9f27401cb437ccaabf480320284a13f2259bb63cb87";
             };
             compilePorts = true;
+            buildPlugins  = [ pc ];
+
 
             meta = {
               description = ''OS Process Manager'';
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/saleyn/erlexec";
             };
-          }
+          } // packageOverrides)
       ) {};
 
-    erlexec_1_1_1 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "erlexec";
-            version = "1.1.1";
-            src = fetchHex {
-              pkg = "erlexec";
-              version = "1.1.1";
-              sha256 =
-                "86e354558e3e2275d5d611d08c87bb66bdffa500573b1af410d117d6b6bc460b";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''OS Process Manager'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/saleyn/erlexec";
-            };
-          }
-      ) {};
-
-    erlexec = erlexec_1_1_1;
-
     erlogger_0_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "erlogger";
             version = "0.1.0";
             src = fetchHex {
@@ -13607,20 +8029,23 @@ let
                 "de2d64f0932e8af46264d92a224ed46e41f2b698b1bbd245ae19321715322146";
             };
 
+            buildPlugins  = [ rebar3_hex ];
+
+
             meta = {
               description = ''Logging service for Erlang Applications.'';
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/knusbaum/erlogger";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     erlogger = erlogger_0_1_0;
 
     erlsh_0_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "erlsh";
             version = "0.1.0";
             src = fetchHex {
@@ -13637,15 +8062,15 @@ let
                                 external programs.'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     erlsh = erlsh_0_1_0;
 
     erlsom_1_2_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "erlsom";
             version = "1.2.1";
             src = fetchHex {
@@ -13659,39 +8084,15 @@ let
               description = ''erlsom XSD parser'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     erlsom = erlsom_1_2_1;
 
-    erltrace_0_1_4 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "erltrace";
-            version = "0.1.4";
-            src = fetchHex {
-              pkg = "erltrace";
-              version = "0.1.4";
-              sha256 =
-                "821452cb6d470cfe22cd1793c94c4e499957c72944a5d8781253aeb5b610acb0";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''erlang dtrace consumer.'';
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/project-fifo/erltrace";
-            };
-          }
-      ) {};
-
-    erltrace = erltrace_0_1_4;
-
     erlware_commons_0_15_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "erlware_commons";
             version = "0.15.0";
             src = fetchHex {
@@ -13706,13 +8107,13 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/erlware/erlware_commons";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     erlware_commons_0_18_0 = callPackage
       (
-        {  buildRebar3, fetchHex, cf_0_2_1 }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex, cf_0_2_1 }:
+          buildRebar3 ({
             name = "erlware_commons";
             version = "0.18.0";
             src = fetchHex {
@@ -13729,13 +8130,13 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/erlware/erlware_commons";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     erlware_commons_0_19_0 = callPackage
       (
-        {  buildRebar3, fetchHex, cf_0_2_1 }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex, cf_0_2_1 }:
+          buildRebar3 ({
             name = "erlware_commons";
             version = "0.19.0";
             src = fetchHex {
@@ -13752,13 +8153,13 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/erlware/erlware_commons";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     erlware_commons_0_20_0 = callPackage
       (
-        {  buildRebar3, fetchHex, cf_0_2_1 }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex, cf_0_2_1 }:
+          buildRebar3 ({
             name = "erlware_commons";
             version = "0.20.0";
             src = fetchHex {
@@ -13775,15 +8176,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/erlware/erlware_commons";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     erlware_commons = erlware_commons_0_20_0;
 
     erlydtl_0_11_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "erlydtl";
             version = "0.11.1";
             src = fetchHex {
@@ -13798,15 +8199,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/project-fifo/fifo_spec";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     erlydtl = erlydtl_0_11_1;
 
     erlydtl2_0_11_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "erlydtl2";
             version = "0.11.1";
             src = fetchHex {
@@ -13821,132 +8222,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/erlydtl/erlydtl";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     erlydtl2 = erlydtl2_0_11_1;
 
-    erlzk_0_6_1 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "erlzk";
-            version = "0.6.1";
-            src = fetchHex {
-              pkg = "erlzk";
-              version = "0.6.1";
-              sha256 =
-                "6bba045ad0b7beb566825b463ada2464929655ce01e291022c1efed81a674759";
-            };
-
-            meta = {
-              description = ''A Pure Erlang ZooKeeper Client (no C
-                            dependency)'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/huaban/erlzk";
-            };
-          }
-      ) {};
-
-    erlzk = erlzk_0_6_1;
-
-    erocksdb_0_4_1 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "erocksdb";
-            version = "0.4.1";
-            src = fetchHex {
-              pkg = "erocksdb";
-              version = "0.4.1";
-              sha256 =
-                "982f25f0dcf4d1aa176ce4ec1b01b630bef601e4f8e103890fac23e0a3dc72ec";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''RocksDB for Erlang'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/leo-project/erocksdb";
-            };
-          }
-      ) {};
-
-    erocksdb = erocksdb_0_4_1;
-
-    erwatch_0_3_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "erwatch";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "erwatch";
-              version = "0.3.0";
-              sha256 =
-                "0be5f4e83d762aa36ac3582efb480fb8041d06057a122c5d94a9956c4e3dbccc";
-            };
-
-            meta = {
-              description = ''Erwatch is an Erlang/OTP application for tracking
-                            changes in a file system.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/yuce/erwatch.git";
-            };
-          }
-      ) {};
-
-    erwatch = erwatch_0_3_0;
-
-    es_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "es";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "es";
-              version = "0.0.1";
-              sha256 =
-                "88a8f096177d111f82e8c05b611a3ec067abecb2612f44abb9a12eff06218d48";
-            };
-
-            meta = {
-              description = ''A shell. With stuff.'';
-
-            };
-          }
-      ) {};
-
-    es = es_0_0_1;
-
-    escalus_2_6_4 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "escalus";
-            version = "2.6.4";
-            src = fetchHex {
-              pkg = "escalus";
-              version = "2.6.4";
-              sha256 =
-                "f5227c39ddbdeb1056fd69eef1c8a80364fb8b690b98d662b126bb95f4108d66";
-            };
-
-            meta = {
-              description = ''Escalus is an Erlang XMPP client library'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/esl/escalus";
-            };
-          }
-      ) {};
-
-    escalus = escalus_2_6_4;
-
     esel_0_1_2 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "esel";
             version = "0.1.2";
             src = fetchHex {
@@ -13960,116 +8244,15 @@ let
               description = ''An wrapper around openssl'';
               license = stdenv.lib.licenses.mit;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     esel = esel_0_1_2;
 
-    esip_1_0_2 = callPackage
-      (
-        {
-          buildRebar3, fetchHex, stun_1_0_1, p1_utils_1_0_3, fast_tls_1_0_1
-        }:
-          buildRebar3 {
-            name = "esip";
-            version = "1.0.2";
-            src = fetchHex {
-              pkg = "esip";
-              version = "1.0.2";
-              sha256 =
-                "659b684d2573a52dfe411f20a36b704c41183b4c8206261229bfad12404d1cf7";
-            };
-            compilePorts = true;
-            beamDeps  = [ stun_1_0_1 p1_utils_1_0_3 fast_tls_1_0_1 ];
-
-            meta = {
-              description = ''ProcessOne SIP server component in Erlang'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/processone/esip";
-            };
-          }
-      ) {};
-
-    esip = esip_1_0_2;
-
-    espec_0_8_16 = callPackage
-      (
-        {  buildMix, fetchHex, meck_0_8_4 }:
-          buildMix {
-            name = "espec";
-            version = "0.8.16";
-            src = fetchHex {
-              pkg = "espec";
-              version = "0.8.16";
-              sha256 =
-                "f96d469838a747f60bb23a7515e4065808af31da1c0f3c50162b0dd383248a95";
-            };
-            beamDeps  = [ meck_0_8_4 ];
-
-            meta = {
-              description = ''BDD test framework for Elixir inspired by
-                            RSpec.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/antonmi/espec";
-            };
-          }
-      ) {};
-
-    espec = espec_0_8_16;
-
-    espec_phoenix_0_2_0 = callPackage
-      (
-        {
-          buildMix, fetchHex, phoenix_1_1_4, floki_0_7_2, espec_0_8_16
-        }:
-          buildMix {
-            name = "espec_phoenix";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "espec_phoenix";
-              version = "0.2.0";
-              sha256 =
-                "069e7df74370905cdce3c87144e707174c13e13c6541ecc4ac114465292bf08e";
-            };
-            beamDeps  = [ phoenix_1_1_4 floki_0_7_2 espec_0_8_16 ];
-
-            meta = {
-              description = ''ESpec for Phoenix web framework.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/antonmi/espec_phoenix";
-            };
-          }
-      ) {};
-
-    espec_phoenix = espec_phoenix_0_2_0;
-
-    esqlite_0_2_2 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "esqlite";
-            version = "0.2.2";
-            src = fetchHex {
-              pkg = "esqlite";
-              version = "0.2.2";
-              sha256 =
-                "5f15f8014baa9d31ee83817afe9164b3ecd76f77b2de7515f2cca2ca75b642e0";
-            };
-
-            meta = {
-              description = ''A Sqlite3 NIF'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/mmzeeman/esqlite";
-            };
-          }
-      ) {};
-
-    esqlite = esqlite_0_2_2;
-
     estree_2_3_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "estree";
             version = "2.3.0";
             src = fetchHex {
@@ -14086,15 +8269,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bryanjos/elixir-estree";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     estree = estree_2_3_0;
 
     esync_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "esync";
             version = "0.0.1";
             src = fetchHex {
@@ -14110,39 +8293,15 @@ let
 
               homepage = "https://github.com/GrahamGoudeau21/ElixirSync";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     esync = esync_0_0_1;
 
-    etcd_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_2_0 }:
-          buildMix {
-            name = "etcd";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "etcd";
-              version = "0.0.2";
-              sha256 =
-                "c1b559bc37812b9ab488f90f322dc0b826c94ac9809d9044b42b4fb420710848";
-            };
-            beamDeps  = [ httpoison_0_8_2 exjsx_3_2_0 ];
-
-            meta = {
-              description = ''Etcd APIv2 Client for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bearice/elixir-etcd";
-            };
-          }
-      ) {};
-
-    etcd = etcd_0_0_2;
-
     ether_0_0_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "ether";
             version = "0.0.1";
             src = fetchHex {
@@ -14157,43 +8316,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/maarek/ether";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ether = ether_0_0_1;
 
-    etherchain_org_0_0_3 = callPackage
-      (
-        {
-          buildMix, fetchHex, vex_0_5_5, poison_1_5_2, httpoison_0_8_2
-        }:
-          buildMix {
-            name = "etherchain_org";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "etherchain_org";
-              version = "0.0.3";
-              sha256 =
-                "45b231f1d177be098e2ddd575dd53d0b8676d676ed18c932495307e098c40880";
-            };
-            beamDeps  = [ vex_0_5_5 poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              longDescription = ''WIP Elixir API wrapper for etherchain.org.
-                                Provides access to ethereum blockchain data.'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/cyberpunk-ventures/etherchain_org_ex";
-            };
-          }
-      ) {};
-
-    etherchain_org = etherchain_org_0_0_3;
-
     ets_map_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ets_map";
             version = "0.0.1";
             src = fetchHex {
@@ -14209,15 +8340,21 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/antipax/ets_map";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ets_map = ets_map_0_0_1;
 
     etude_0_3_7 = callPackage
       (
-        {  buildMix, fetchHex, rebind_0_1_3, lineo_0_1_0 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          rebind_0_1_3,
+          lineo_0_1_0
+        }:
+          buildMix ({
             name = "etude";
             version = "0.3.7";
             src = fetchHex {
@@ -14234,13 +8371,19 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/camshaft/etude";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     etude_1_0_0_beta_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0, nile_0_1_3 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          nile_0_1_3
+        }:
+          buildMix ({
             name = "etude";
             version = "1.0.0-beta.0";
             src = fetchHex {
@@ -14257,41 +8400,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/camshaft/etude";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     etude = etude_1_0_0_beta_0;
 
-    euler_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "euler";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "euler";
-              version = "0.0.1";
-              sha256 =
-                "ab12770dd81fbb20524c751f71a31b8cc16553404665a336212d20bf351eb0fc";
-            };
-
-            meta = {
-              longDescription = ''euler is a library that provides math
-                                functions. ## Features * Working with integers:
-                                * Greatest common divisor of two numbers (gcd)
-                                '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/magicienap/euler";
-            };
-          }
-      ) {};
-
-    euler = euler_0_0_1;
-
     eunit_formatters_0_3_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "eunit_formatters";
             version = "0.3.1";
             src = fetchHex {
@@ -14306,15 +8423,17 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/seancribbs/eunit_formatters";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     eunit_formatters = eunit_formatters_0_3_1;
 
     evel_0_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex, hash_ring_0_4_0 }:
-          buildRebar3 {
+        {
+          buildRebar3, packageOverrides ? {}, fetchHex, hash_ring_0_4_0
+        }:
+          buildRebar3 ({
             name = "evel";
             version = "0.1.0";
             src = fetchHex {
@@ -14331,41 +8450,22 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/sile/evel";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     evel = evel_0_1_0;
 
-    event_source_encoder_0_0_3 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "event_source_encoder";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "event_source_encoder";
-              version = "0.0.3";
-              sha256 =
-                "b930b7a8cf52e32913ba9bd333472253e2c100c91216c54dde043e5106d601df";
-            };
-
-            meta = {
-              longDescription = ''EventSourceEncoder is a Elixir library to
-                                encode data into EventSource compliant data. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/chatgris/event_source_encoder";
-            };
-          }
-      ) {};
-
-    event_source_encoder = event_source_encoder_0_0_3;
-
     eventstore_0_2_1 = callPackage
       (
         {
-          buildMix, fetchHex, postgrex_0_11_1, poolboy_1_5_1, fsm_0_2_0
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          postgrex_0_11_1,
+          poolboy_1_5_1,
+          fsm_0_2_0
         }:
-          buildMix {
+          buildMix ({
             name = "eventstore";
             version = "0.2.1";
             src = fetchHex {
@@ -14381,105 +8481,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/slashdotdash/eventstore";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     eventstore = eventstore_0_2_1;
 
-    eventstore_client_0_1_4 = callPackage
-      (
-        {
-          buildMix, fetchHex, uuid_1_1_3, poison_2_1_0, httpoison_0_8_2
-        }:
-          buildMix {
-            name = "eventstore_client";
-            version = "0.1.4";
-            src = fetchHex {
-              pkg = "eventstore_client";
-              version = "0.1.4";
-              sha256 =
-                "fa77e1a7906b3ed27c0dfa0bd41f27b3129285857948aa23a3f888b0dd531109";
-            };
-            beamDeps  = [ uuid_1_1_3 poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''HTTP Client for EventStore (geteventstore.com)'';
-
-              homepage =
-                "https://github.com/tbug/elixir-eventstore-http-client";
-            };
-          }
-      ) {};
-
-    eventstore_client = eventstore_client_0_1_4;
-
-    everex_0_1_1 = callPackage
+    ewebmachine_2_0_12 = callPackage
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
-          plug_0_11_3,
-          oauther_1_0_2,
-          httpoison_0_7_5,
+          plug_1_1_3,
           cowboy_1_0_4
         }:
-          buildMix {
-            name = "everex";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "everex";
-              version = "0.1.1";
-              sha256 =
-                "3a85fc8d749b58c5fe87dc224cb7066cf1a45ac06d87c3661cd7a555076a901e";
-            };
-            beamDeps  = [
-                          plug_0_11_3 oauther_1_0_2 httpoison_0_7_5 cowboy_1_0_4
-                        ];
-
-            meta = {
-              longDescription = ''Evernote API client for Elixir NOTE: Everex
-                                is UNDER DEVELOPMENT, and is NOT ready for
-                                production use. Feedback and contributions (via
-                                pull requests) are very welcome, of course!
-                                UPDATE: There is now an example showing how to
-                                get access using the OAuth authentication
-                                process. See `examples/oauth.exs`. '';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/jwarlander/everex";
-            };
-          }
-      ) {};
-
-    everex = everex_0_1_1;
-
-    everyoneapi_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_3_1, httpoison_0_7_5 }:
-          buildMix {
-            name = "everyoneapi";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "everyoneapi";
-              version = "0.0.1";
-              sha256 =
-                "8214fa434a10716f252bcbcb5660faddbc20909d1058d1b491c95132eb4b3182";
-            };
-            beamDeps  = [ poison_1_3_1 httpoison_0_7_5 ];
-
-            meta = {
-              description = ''API Client for EveryoneAPI.com.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "http://github.com/knewter/everyoneapi";
-            };
-          }
-      ) {};
-
-    everyoneapi = everyoneapi_0_0_1;
-
-    ewebmachine_2_0_12 = callPackage
-      (
-        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
-          buildMix {
+          buildMix ({
             name = "ewebmachine";
             version = "2.0.12";
             src = fetchHex {
@@ -14499,15 +8515,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "http://github.com/awetzel/ewebmachine";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ewebmachine = ewebmachine_2_0_12;
 
     ex2ms_1_4_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ex2ms";
             version = "1.4.0";
             src = fetchHex {
@@ -14523,15 +8539,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/ericmj/ex2ms";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex2ms = ex2ms_1_4_0;
 
     ex_abnf_0_2_7 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ex_abnf";
             version = "0.2.7";
             src = fetchHex {
@@ -14551,97 +8567,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/marcelog/ex_abnf";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_abnf = ex_abnf_0_2_7;
 
-    ex_aerospike_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "ex_aerospike";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "ex_aerospike";
-              version = "0.0.1";
-              sha256 =
-                "3420ba4b94c25aca08106d58ce4bdc941767e588bf8092747a611e38a7b5e03f";
-            };
-             meta = {    };
-          }
-      ) {};
-
-    ex_aerospike = ex_aerospike_0_0_1;
-
-    ex_aws_0_4_18 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          sweet_xml_0_6_1,
-          poison_1_5_2,
-          jsx_2_8_0,
-          httpotion_2_2_2,
-          httpoison_0_8_2
-        }:
-          buildMix {
-            name = "ex_aws";
-            version = "0.4.18";
-            src = fetchHex {
-              pkg = "ex_aws";
-              version = "0.4.18";
-              sha256 =
-                "6e534b4c4b56046a52d86d62be59358418e38cdd994428a80fbdbba5cc37f075";
-            };
-            beamDeps  = [
-                          sweet_xml_0_6_1
-                          poison_1_5_2
-                          jsx_2_8_0
-                          httpotion_2_2_2
-                          httpoison_0_8_2
-                        ];
-
-            meta = {
-              description = ''AWS client. Currently supports Dynamo, Kinesis,
-                            Lambda, S3'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/CargoSense/ex_aws";
-            };
-          }
-      ) {};
-
-    ex_aws = ex_aws_0_4_18;
-
-    ex_bitcask_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "ex_bitcask";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "ex_bitcask";
-              version = "0.1.0";
-              sha256 =
-                "dc771229aae3c07c31a5523303f0c4dbe3c700d5025a09dfcca9cc357222c463";
-            };
-
-            meta = {
-              longDescription = ''Elixir wrapper of Basho`s Bitcask Key/Value
-                                store. Bitcask as a Log-Structured Hash Table
-                                for Fast Key/Value Data. '';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/JonGretar/ExBitcask";
-            };
-          }
-      ) {};
-
-    ex_bitcask = ex_bitcask_0_1_0;
-
     ex_brace_expansion_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ex_brace_expansion";
             version = "0.0.2";
             src = fetchHex {
@@ -14654,44 +8588,21 @@ let
             meta = {
               longDescription = ''Brace expansion, as known from sh/bash, in
                                 Elixir. Quick example:
-                                ExBraceExpansion.expand("file-{a,b,c}.jpg") =>
-                                ["file-a.jpg", "file-b.jpg", "file-c.jpg"] '';
+                                ExBraceExpansion.expand(\"file-{a,b,c}.jpg\") =>
+                                [\"file-a.jpg\", \"file-b.jpg\", \"file-c.jpg\"]
+                                '';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/gniquil/ex_brace_expansion";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_brace_expansion = ex_brace_expansion_0_0_2;
 
-    ex_chimp_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "ex_chimp";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "ex_chimp";
-              version = "0.0.1";
-              sha256 =
-                "1a4e97e2a4b7bf7401660acd61d7e35b9c758638c305324971eddc5bd1bb0bee";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Basic/minimal Mailchimp API client.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/twined/ex_chimp";
-            };
-          }
-      ) {};
-
-    ex_chimp = ex_chimp_0_0_1;
-
     ex_clacks_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "ex_clacks";
             version = "0.1.1";
             src = fetchHex {
@@ -14707,133 +8618,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/polymetis/ex_clacks";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_clacks = ex_clacks_0_1_1;
 
-    ex_closeio_0_0_12 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "ex_closeio";
-            version = "0.0.12";
-            src = fetchHex {
-              pkg = "ex_closeio";
-              version = "0.0.12";
-              sha256 =
-                "6090eaa4b699da9c242f498db0435cd45489702dc9859450cb4e26fd48288e79";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Close.io client library for Elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/taylorbrooks/ex_closeio";
-            };
-          }
-      ) {};
-
-    ex_closeio = ex_closeio_0_0_12;
-
-    ex_cloudinary_0_1_2 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "ex_cloudinary";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "ex_cloudinary";
-              version = "0.1.2";
-              sha256 =
-                "cbd90bcf8d5f9f7f2c624d2822704f693ff25716d2195281f418db4e13b553ea";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''A wrapper around the HTTPoison.Base module for
-                            Cloudinary.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/sschneider1207/ExCloudinary";
-            };
-          }
-      ) {};
-
-    ex_cloudinary = ex_cloudinary_0_1_2;
-
-    ex_conf_0_1_2 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "ex_conf";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "ex_conf";
-              version = "0.1.2";
-              sha256 =
-                "0156e2b0d35a2ea9eeebe55e301035bfeb2187412a07d573cc1bc4a163b85de5";
-            };
-
-            meta = {
-              description = ''Simple Elixir Configuration Management '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/phoenixframework/ex_conf";
-            };
-          }
-      ) {};
-
-    ex_conf_0_1_3 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "ex_conf";
-            version = "0.1.3";
-            src = fetchHex {
-              pkg = "ex_conf";
-              version = "0.1.3";
-              sha256 =
-                "140dfae39127354f6efa6c295ca5407a20cf2802be199ecdc77aa38e2915ca42";
-            };
-
-            meta = {
-              description = ''Simple Elixir Configuration Management '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/phoenixframework/ex_conf";
-            };
-          }
-      ) {};
-
-    ex_conf = ex_conf_0_1_3;
-
-    ex_crypto_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, timex_2_1_3, poison_2_1_0, pipe_0_0_2 }:
-          buildMix {
-            name = "ex_crypto";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "ex_crypto";
-              version = "0.0.1";
-              sha256 =
-                "f9c47326435e52154a6db97359356a44c1fe21a0d26fda24a46367ba33ccb85f";
-            };
-            beamDeps  = [ timex_2_1_3 poison_2_1_0 pipe_0_0_2 ];
-
-            meta = {
-              longDescription = ''A wrapper around the Erlang Crypto module
-                                with sensible defaults for common tasks.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ntrepid8/ex_crypto";
-            };
-          }
-      ) {};
-
-    ex_crypto = ex_crypto_0_0_1;
-
     ex_csv_0_1_4 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ex_csv";
             version = "0.1.4";
             src = fetchHex {
@@ -14848,15 +8641,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/CargoSense/ex_csv";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_csv = ex_csv_0_1_4;
 
     ex_doc_0_10_0 = callPackage
       (
-        {  buildMix, fetchHex, earmark_0_1_15 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, earmark_0_1_15 }:
+          buildMix ({
             name = "ex_doc";
             version = "0.10.0";
             src = fetchHex {
@@ -14873,13 +8666,13 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/elixir-lang/ex_doc";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_doc_0_11_4 = callPackage
       (
-        {  buildMix, fetchHex, earmark_0_1_15 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, earmark_0_1_15 }:
+          buildMix ({
             name = "ex_doc";
             version = "0.11.4";
             src = fetchHex {
@@ -14896,15 +8689,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/elixir-lang/ex_doc";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_doc = ex_doc_0_11_4;
 
     ex_doc_0_7_3 = callPackage
       (
-        {  buildMix, fetchHex, earmark_0_1_15 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, earmark_0_1_15 }:
+          buildMix ({
             name = "ex_doc";
             version = "0.7.3";
             src = fetchHex {
@@ -14921,13 +8714,19 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/elixir-lang/ex_doc";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_doc_dash_0_3_0 = callPackage
       (
-        {  buildMix, fetchHex, ex_doc_0_11_4, earmark_0_1_15 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          ex_doc_0_11_4,
+          earmark_0_1_15
+        }:
+          buildMix ({
             name = "ex_doc_dash";
             version = "0.3.0";
             src = fetchHex {
@@ -14944,15 +8743,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/JonGretar/ExDocDash";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_doc_dash = ex_doc_dash_0_3_0;
 
     ex_doc_epub_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, ex_doc_0_11_4, earmark_0_1_19 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          ex_doc_0_11_4,
+          earmark_0_1_19
+        }:
+          buildMix ({
             name = "ex_doc_epub";
             version = "0.0.2";
             src = fetchHex {
@@ -14969,65 +8774,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/milmazz/ex_doc_epub";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_doc_epub = ex_doc_epub_0_0_2;
 
-    ex_dockerapi_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
-          buildMix {
-            name = "ex_dockerapi";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "ex_dockerapi";
-              version = "0.0.1";
-              sha256 =
-                "337481d27cb65f7d607e28f0bc129f2197c1b04fdc357446f5a07f2296b9604b";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
-
-            meta = {
-              description = ''Docker API client.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/JonGretar/DockerAPI.ex";
-            };
-          }
-      ) {};
-
-    ex_dockerapi = ex_dockerapi_0_0_1;
-
-    ex_edn_0_1_2 = callPackage
-      (
-        {  buildMix, fetchHex, timex_0_13_5, array_1_0_1 }:
-          buildMix {
-            name = "ex_edn";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "ex_edn";
-              version = "0.1.2";
-              sha256 =
-                "9568e79cb96bd61f26389b96ab1ac4fee57762fba6c166ddc745c521ccf2c5ca";
-            };
-            beamDeps  = [ timex_0_13_5 array_1_0_1 ];
-
-            meta = {
-              longDescription = ''[edn](https://github.com/edn-format/edn)
-                                (extensible data notation) encoder/decoder
-                                implemented in Elixir.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/jfacorro/ExEdn/";
-            };
-          }
-      ) {};
-
-    ex_edn = ex_edn_0_1_2;
-
     ex_enum_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, gettext_0_10_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, gettext_0_10_0 }:
+          buildMix ({
             name = "ex_enum";
             version = "0.1.0";
             src = fetchHex {
@@ -15044,15 +8799,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/kenta-aktsk/ex_enum";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_enum = ex_enum_0_1_0;
 
     ex_fabricators_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ex_fabricators";
             version = "0.1.0";
             src = fetchHex {
@@ -15067,15 +8822,15 @@ let
 
               homepage = "https://github.com/alterego-labs/ex_fabricators";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_fabricators = ex_fabricators_0_1_0;
 
     ex_guard_0_10_0 = callPackage
       (
-        {  buildMix, fetchHex, fs_0_9_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, fs_0_9_2 }:
+          buildMix ({
             name = "ex_guard";
             version = "0.10.0";
             src = fetchHex {
@@ -15093,15 +8848,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/slashmili/ex_guard";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_guard = ex_guard_0_10_0;
 
     ex_hl7_0_1_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ex_hl7";
             version = "0.1.3";
             src = fetchHex {
@@ -15116,15 +8871,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/jcomellas/ex_hl7";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_hl7 = ex_hl7_0_1_3;
 
     ex_ical_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, timex_1_0_2 }:
+          buildMix ({
             name = "ex_ical";
             version = "0.0.1";
             src = fetchHex {
@@ -15140,42 +8895,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/fazibear/ex_ical";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_ical = ex_ical_0_0_1;
 
-    ex_iss_1_0_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "ex_iss";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "ex_iss";
-              version = "1.0.0";
-              sha256 =
-                "8b2b2eebbd75593e814e712555c7f69138864317cf2f0093a82ca305138baa83";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              longDescription = ''This package is for interfacing with the Open
-                                Notify API to information such as the ISS`s
-                                current location, crew, and when it will pass
-                                over a location.'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/cryptobird/ex_iss";
-            };
-          }
-      ) {};
-
-    ex_iss = ex_iss_1_0_0;
-
     ex_json_schema_0_3_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ex_json_schema";
             version = "0.3.1";
             src = fetchHex {
@@ -15192,15 +8920,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/jonasschmidt/ex_json_schema";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_json_schema = ex_json_schema_0_3_1;
 
     ex_link_header_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ex_link_header";
             version = "0.0.3";
             src = fetchHex {
@@ -15215,15 +8943,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/simonrand/ex_link_header";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_link_header = ex_link_header_0_0_3;
 
     ex_machina_0_6_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ex_machina";
             version = "0.6.1";
             src = fetchHex {
@@ -15239,15 +8967,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/thoughtbot/ex_machina";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_machina = ex_machina_0_6_1;
 
     ex_mark2pdf_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, earmark_0_1_19 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, earmark_0_1_19 }:
+          buildMix ({
             name = "ex_mark2pdf";
             version = "0.1.0";
             src = fetchHex {
@@ -15263,15 +8991,15 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/darui00kara/ex_mark2pdf";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_mark2pdf = ex_mark2pdf_0_1_0;
 
     ex_marshal_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, decimal_1_1_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, decimal_1_1_1 }:
+          buildMix ({
             name = "ex_marshal";
             version = "0.0.3";
             src = fetchHex {
@@ -15287,15 +9015,20 @@ let
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/gaynetdinov/ex_marshal";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_marshal = ex_marshal_0_0_3;
 
     ex_minimatch_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, ex_brace_expansion_0_0_2 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          ex_brace_expansion_0_0_2
+        }:
+          buildMix ({
             name = "ex_minimatch";
             version = "0.0.1";
             src = fetchHex {
@@ -15315,15 +9048,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/gniquil/ex_minimatch";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_minimatch = ex_minimatch_0_0_1;
 
     ex_modbus_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ex_modbus";
             version = "0.0.3";
             src = fetchHex {
@@ -15338,68 +9071,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/hirschenberger/ex_modbus";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_modbus = ex_modbus_0_0_3;
 
-    ex_omegle_0_1_1 = callPackage
-      (
-        {  buildMix, fetchHex, jsex_2_0_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "ex_omegle";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "ex_omegle";
-              version = "0.1.1";
-              sha256 =
-                "8166d1125a2670f55fce2030367d9da381e577ad122dcf1d03784e536c78cc65";
-            };
-            beamDeps  = [ jsex_2_0_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''A minimal Omegle chat client library for
-                            Elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/xtagon/ex_omegle";
-            };
-          }
-      ) {};
-
-    ex_omegle = ex_omegle_0_1_1;
-
-    ex_orient_1_1_1 = callPackage
-      (
-        {
-          buildMix, fetchHex, poolboy_1_2_1, poison_1_0_3, marco_polo_0_2_1
-        }:
-          buildMix {
-            name = "ex_orient";
-            version = "1.1.1";
-            src = fetchHex {
-              pkg = "ex_orient";
-              version = "1.1.1";
-              sha256 =
-                "9cad40957987bb4aa440d798e6f7096de5136f54fe0b7bd7d0d5f67be63a7a08";
-            };
-            beamDeps  = [ poolboy_1_2_1 poison_1_0_3 marco_polo_0_2_1 ];
-
-            meta = {
-              longDescription = ''OrientDB query builder that provides nice
-                                syntax and connection pooling. Uses MarcoPolo
-                                under the hood to run commands.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/Remesh/ex_orient/";
-            };
-          }
-      ) {};
-
-    ex_orient = ex_orient_1_1_1;
-
     ex_parametarized_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ex_parametarized";
             version = "1.0.0";
             src = fetchHex {
@@ -15414,15 +9094,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/KazuCocoa/ex_parametarized";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_parametarized = ex_parametarized_1_0_0;
 
     ex_parameterized_1_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ex_parameterized";
             version = "1.0.2";
             src = fetchHex {
@@ -15437,40 +9117,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/KazuCocoa/ex_parameterized";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_parameterized = ex_parameterized_1_0_2;
 
-    ex_parsec_0_2_1 = callPackage
-      (
-        {  buildMix, fetchHex, monad_1_0_5 }:
-          buildMix {
-            name = "ex_parsec";
-            version = "0.2.1";
-            src = fetchHex {
-              pkg = "ex_parsec";
-              version = "0.2.1";
-              sha256 =
-                "1564d820e0b8b265a1525454aa9914edc15b6165ae74ffa31008686cbbad67da";
-            };
-            beamDeps  = [ monad_1_0_5 ];
-
-            meta = {
-              description = ''A parser combinator library inspired by
-                            Parsec.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/alexrp/ex_parsec";
-            };
-          }
-      ) {};
-
-    ex_parsec = ex_parsec_0_2_1;
-
     ex_pool_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ex_pool";
             version = "0.1.1";
             src = fetchHex {
@@ -15485,15 +9140,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/jcabotc/ex_pool";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_pool = ex_pool_0_1_1;
 
     ex_prometheus_io_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
+          buildMix ({
             name = "ex_prometheus_io";
             version = "0.0.3";
             src = fetchHex {
@@ -15509,15 +9164,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/kennyballou/ex_prometheus_io";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_prometheus_io = ex_prometheus_io_0_0_3;
 
     ex_rated_1_2_2 = callPackage
       (
-        {  buildMix, fetchHex, ex2ms_1_4_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, ex2ms_1_4_0 }:
+          buildMix ({
             name = "ex_rated";
             version = "1.2.2";
             src = fetchHex {
@@ -15540,15 +9195,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/grempe/ex_rated";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_rated = ex_rated_1_2_2;
 
     ex_rfc3966_0_2_3 = callPackage
       (
-        {  buildMix, fetchHex, ex_abnf_0_2_7 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, ex_abnf_0_2_7 }:
+          buildMix ({
             name = "ex_rfc3966";
             version = "0.2.3";
             src = fetchHex {
@@ -15560,21 +9215,21 @@ let
             beamDeps  = [ ex_abnf_0_2_7 ];
 
             meta = {
-              longDescription = ''A "tel" URI parser trying to be strictly
+              longDescription = ''A \"tel\" URI parser trying to be strictly
                                 compatible with RFC3966. Uses official ABNF
                                 grammar and ex_abnf as interpreter.'';
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/marcelog/ex_rfc3966";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_rfc3966 = ex_rfc3966_0_2_3;
 
     ex_rfc3986_0_2_6 = callPackage
       (
-        {  buildMix, fetchHex, ex_abnf_0_2_7 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, ex_abnf_0_2_7 }:
+          buildMix ({
             name = "ex_rfc3986";
             version = "0.2.6";
             src = fetchHex {
@@ -15592,15 +9247,21 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/marcelog/ex_rfc3986";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_rfc3986 = ex_rfc3986_0_2_6;
 
     ex_slp_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, ex_doc_0_11_4, earmark_0_2_1 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          ex_doc_0_11_4,
+          earmark_0_2_1
+        }:
+          buildMix ({
             name = "ex_slp";
             version = "0.1.0";
             src = fetchHex {
@@ -15619,15 +9280,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/4pcbr/ex_slp_tk";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_slp = ex_slp_0_1_0;
 
     ex_spec_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ex_spec";
             version = "1.0.0";
             src = fetchHex {
@@ -15642,15 +9303,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/drewolson/ex_spec";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_spec = ex_spec_1_0_0;
 
     ex_sshd_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ex_sshd";
             version = "0.0.1";
             src = fetchHex {
@@ -15666,15 +9327,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/tverlaan/ex_sshd";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_sshd = ex_sshd_0_0_1;
 
     ex_statsd_0_5_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ex_statsd";
             version = "0.5.3";
             src = fetchHex {
@@ -15689,15 +9350,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/CargoSense/ex_statsd";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_statsd = ex_statsd_0_5_3;
 
     ex_sync_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, connection_1_0_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, connection_1_0_2 }:
+          buildMix ({
             name = "ex_sync";
             version = "0.0.2";
             src = fetchHex {
@@ -15715,15 +9376,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/invrs/exsync";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_sync = ex_sync_0_0_2;
 
     ex_test_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ex_test";
             version = "0.0.2";
             src = fetchHex {
@@ -15739,7 +9400,7 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mcb/ex_test";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_test = ex_test_0_0_2;
@@ -15747,9 +9408,14 @@ let
     ex_twilio_0_1_4 = callPackage
       (
         {
-          buildMix, fetchHex, poison_1_5_2, inflex_1_5_0, httpotion_2_2_2
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          inflex_1_5_0,
+          httpotion_2_2_2
         }:
-          buildMix {
+          buildMix ({
             name = "ex_twilio";
             version = "0.1.4";
             src = fetchHex {
@@ -15765,15 +9431,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/danielberkompas/ex_twilio";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_twilio = ex_twilio_0_1_4;
 
     ex_twiml_2_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ex_twiml";
             version = "2.1.0";
             src = fetchHex {
@@ -15788,38 +9454,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/danielberkompas/ex_twiml";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_twiml = ex_twiml_2_1_0;
 
-    ex_unit_emacs_0_1_2 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "ex_unit_emacs";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "ex_unit_emacs";
-              version = "0.1.2";
-              sha256 =
-                "f22a3c987b39b2ebedd9652a2fab07d7efd43baf376d9854398095bd220bd462";
-            };
-
-            meta = {
-              description = ''Emacs integration for ExUnit'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bruce/ex_unit_emacs";
-            };
-          }
-      ) {};
-
-    ex_unit_emacs = ex_unit_emacs_0_1_2;
-
     ex_unit_fixtures_0_3_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ex_unit_fixtures";
             version = "0.3.1";
             src = fetchHex {
@@ -15835,15 +9478,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/obmarg/ex_unit_fixtures";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_unit_fixtures = ex_unit_fixtures_0_3_1;
 
     ex_unit_notifier_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ex_unit_notifier";
             version = "0.1.0";
             src = fetchHex {
@@ -15854,19 +9497,25 @@ let
             };
 
             meta = {
-              description = ''Desktop notifications for ExUnit'';
+              description = ''Show status notifications for ExUnit test runs'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/navinpeiris/ex_unit_notifier";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_unit_notifier = ex_unit_notifier_0_1_0;
 
     ex_victor_ops_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0, httpotion_2_2_2 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          httpotion_2_2_2
+        }:
+          buildMix ({
             name = "ex_victor_ops";
             version = "0.2.1";
             src = fetchHex {
@@ -15882,15 +9531,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/cagedata/ex_victor_ops";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_victor_ops = ex_victor_ops_0_2_1;
 
     ex_vmstats_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ex_vmstats";
             version = "0.0.1";
             src = fetchHex {
@@ -15906,15 +9555,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/fanduel/ex_vmstats";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ex_vmstats = ex_vmstats_0_0_1;
 
     exactor_2_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exactor";
             version = "2.2.0";
             src = fetchHex {
@@ -15930,15 +9579,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/sasa1977/exactor";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exactor = exactor_2_2_0;
 
     exalgebra_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex, eye_drops_1_0_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, eye_drops_1_0_1 }:
+          buildMix ({
             name = "exalgebra";
             version = "0.0.4";
             src = fetchHex {
@@ -15950,51 +9599,21 @@ let
             beamDeps  = [ eye_drops_1_0_1 ];
 
             meta = {
-              longDescription = ''This library collects a host of common
-                                functions that can be used in linear algebraic
-                                computations.'';
+              longDescription = ''The ExAlgebra library is a collection of
+                                functions that are commonly used in linear
+                                algebra.'';
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/leighshepperson/exalgebra";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exalgebra = exalgebra_0_0_4;
 
-    exalice_0_0_5_alpha = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          tirexs_0_8_0_beta5,
-          poison_2_1_0,
-          httpoison_0_8_2
-        }:
-          buildMix {
-            name = "exalice";
-            version = "0.0.5-alpha";
-            src = fetchHex {
-              pkg = "exalice";
-              version = "0.0.5-alpha";
-              sha256 =
-                "205bc2a86dce72fbcfb8cd30ecb4efebcdcff3d5f0c22c176db5bf4530b2820a";
-            };
-            beamDeps  = [ tirexs_0_8_0_beta5 poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''ExAlice, a geocoder with swappable storage'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/kpanic/exalice";
-            };
-          }
-      ) {};
-
-    exalice = exalice_0_0_5_alpha;
-
     example_files_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "example_files";
             version = "0.2.0";
             src = fetchHex {
@@ -16016,38 +9635,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/njonsson/example_files";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     example_files = example_files_0_2_0;
 
-    exauth_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "exauth";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "exauth";
-              version = "0.0.1";
-              sha256 =
-                "40a6bbea6f6b2d524cc4a4107aa9a6a5dc725171968ce8b4aa43599f8835d3cc";
-            };
-
-            meta = {
-              description = ''Wrapper for erlang-oauth'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/mschae/exauth";
-            };
-          }
-      ) {};
-
-    exauth = exauth_0_0_1;
-
     exbackoff_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exbackoff";
             version = "0.0.3";
             src = fetchHex {
@@ -16062,15 +9658,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mingchuno/exbackoff";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exbackoff = exbackoff_0_0_3;
 
     exbouncer_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exbouncer";
             version = "0.0.1";
             src = fetchHex {
@@ -16088,15 +9684,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/vysakh0/exbouncer";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exbouncer = exbouncer_0_0_1;
 
     excaliper_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "excaliper";
             version = "0.0.1";
             src = fetchHex {
@@ -16112,15 +9708,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mgartner/excaliper";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     excaliper = excaliper_0_0_1;
 
     excellent_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "excellent";
             version = "0.0.1";
             src = fetchHex {
@@ -16136,39 +9732,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/leifg/excellent";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     excellent = excellent_0_0_1;
 
-    excheck_0_3_3 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "excheck";
-            version = "0.3.3";
-            src = fetchHex {
-              pkg = "excheck";
-              version = "0.3.3";
-              sha256 =
-                "3a3b9c163a1b0152df8f6b8fa019d4980d77e36dbe3c7ed3d508ef066ee9f870";
-            };
-
-            meta = {
-              description = ''Property-based testing library for Elixir
-                            (QuickCheck style).'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/parroty/excheck";
-            };
-          }
-      ) {};
-
-    excheck = excheck_0_3_3;
-
     excoap_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "excoap";
             version = "0.0.1";
             src = fetchHex {
@@ -16183,15 +9755,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mbialon/excoap";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     excoap = excoap_0_0_1;
 
     exconstructor_1_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exconstructor";
             version = "1.0.2";
             src = fetchHex {
@@ -16210,65 +9782,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/appcues/exconstructor";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exconstructor = exconstructor_1_0_2;
 
-    excountries_0_0_3 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
-          buildMix {
-            name = "excountries";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "excountries";
-              version = "0.0.3";
-              sha256 =
-                "ec0bbb4147b54817e7d17a7ed91e1b88046769a26020c591ed5fde336b4fb8d3";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
-
-            meta = {
-              description = ''Elixir wrapper for REST Countries API
-                            (http://restcountries.eu/)'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/fteem/excountries";
-            };
-          }
-      ) {};
-
-    excountries = excountries_0_0_3;
-
-    excoveralls_0_5_1 = callPackage
-      (
-        {  buildMix, fetchHex, hackney_1_6_0, exjsx_3_2_0 }:
-          buildMix {
-            name = "excoveralls";
-            version = "0.5.1";
-            src = fetchHex {
-              pkg = "excoveralls";
-              version = "0.5.1";
-              sha256 =
-                "26c8bb6dadc8436c1e0155f50327e90c91d6efab88468c09ac10f12be7070324";
-            };
-            beamDeps  = [ hackney_1_6_0 exjsx_3_2_0 ];
-
-            meta = {
-              description = ''Coverage report tool for Elixir with coveralls.io
-                            integration.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/parroty/excoveralls";
-            };
-          }
-      ) {};
-
-    excoveralls = excoveralls_0_5_1;
-
     exdatauri_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exdatauri";
             version = "0.1.0";
             src = fetchHex {
@@ -16283,64 +9805,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/flupke/exdatauri";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exdatauri = exdatauri_0_1_0;
 
-    exddb_0_1_3 = callPackage
-      (
-        {  buildMix, fetchHex, erlcloud_0_9_2 }:
-          buildMix {
-            name = "exddb";
-            version = "0.1.3";
-            src = fetchHex {
-              pkg = "exddb";
-              version = "0.1.3";
-              sha256 =
-                "e57bd285110585476a457a843fdcff3cce6923c9472b6bec95ac9bf986dd27e4";
-            };
-            beamDeps  = [ erlcloud_0_9_2 ];
-
-            meta = {
-              description = ''Simple library for working with data in
-                            DynamoDB.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/muhmi/exddb";
-            };
-          }
-      ) {};
-
-    exddb = exddb_0_1_3;
-
-    exdesk_0_2_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "exdesk";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "exdesk";
-              version = "0.2.0";
-              sha256 =
-                "0c1e02bb4aef9075ff4affb3354c0e318dc3be1817faae8b450ef590c7d67688";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Desk.com client library for elixir.'';
-
-              homepage = "https://github.com/deadkarma/exdesk";
-            };
-          }
-      ) {};
-
-    exdesk = exdesk_0_2_0;
-
     exdisque_0_0_1 = callPackage
       (
-        {  buildRebar3, fetchHex, eredis_1_0_8 }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex, eredis_1_0_8 }:
+          buildRebar3 ({
             name = "exdisque";
             version = "0.0.1";
             src = fetchHex {
@@ -16358,53 +9831,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mosic/exdisque";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exdisque = exdisque_0_0_1;
 
-    exdjango_0_3_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          redix_0_3_6,
-          poolboy_1_5_1,
-          poison_1_0_3,
-          plug_1_1_3,
-          comeonin_2_3_0
-        }:
-          buildMix {
-            name = "exdjango";
-            version = "0.3.1";
-            src = fetchHex {
-              pkg = "exdjango";
-              version = "0.3.1";
-              sha256 =
-                "ae7bb57e696d7e4ca5d05cac85afd67ccce611594f33a98c06a4922bdd44d6d6";
-            };
-            beamDeps  = [
-                          redix_0_3_6
-                          poolboy_1_5_1
-                          poison_1_0_3
-                          plug_1_1_3
-                          comeonin_2_3_0
-                        ];
-
-            meta = {
-              description = ''An elixir library for working with django'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/nicksanders/exdjango";
-            };
-          }
-      ) {};
-
-    exdjango = exdjango_0_3_1;
-
     exdm_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex, exrm_0_19_9 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, exrm_0_19_9 }:
+          buildMix ({
             name = "exdm";
             version = "0.0.4";
             src = fetchHex {
@@ -16420,65 +9855,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/joeyates/exdm";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exdm = exdm_0_0_4;
 
-    exdn_2_1_2 = callPackage
-      (
-        {  buildMix, fetchHex, erldn_1_0_5, calendar_0_12_4 }:
-          buildMix {
-            name = "exdn";
-            version = "2.1.2";
-            src = fetchHex {
-              pkg = "exdn";
-              version = "2.1.2";
-              sha256 =
-                "a4414d397ccf0c86413ad18d307879f5c6c19183b430276cfb31a026dda1350c";
-            };
-            beamDeps  = [ erldn_1_0_5 calendar_0_12_4 ];
-
-            meta = {
-              longDescription = ''a two-way translator between Elixir data
-                                structures and strings of data following the edn
-                                specification.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/psfblair/exdn";
-            };
-          }
-      ) {};
-
-    exdn = exdn_2_1_2;
-
-    exdweet_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
-          buildMix {
-            name = "exdweet";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "exdweet";
-              version = "0.0.1";
-              sha256 =
-                "2b263d5d73c7af5bd824a02b56df671a609698a96ea78cb0660dbd753118f376";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
-
-            meta = {
-              description = ''Elixir/Erlang Client for Dweet'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/amit-saxena/exdweet";
-            };
-          }
-      ) {};
-
-    exdweet = exdweet_0_0_1;
-
     exec_1_0_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "exec";
             version = "1.0.1";
             src = fetchHex {
@@ -16488,21 +9873,23 @@ let
                 "87c7ef2dea2bb503bb0eec8cb34776172999aecc6e12d90f7629796a7a3ccb1f";
             };
             compilePorts = true;
+            buildPlugins  = [ pc ];
+
 
             meta = {
               description = ''OS Process Manager'';
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/saleyn/erlexec";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exec = exec_1_0_1;
 
     execjs_1_1_3 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
+          buildMix ({
             name = "execjs";
             version = "1.1.3";
             src = fetchHex {
@@ -16518,15 +9905,15 @@ let
               license = stdenv.lib.licenses.unlicense;
               homepage = "https://github.com/devinus/execjs";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     execjs = execjs_1_1_3;
 
     exelli_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exelli";
             version = "0.1.0";
             src = fetchHex {
@@ -16543,40 +9930,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/pigmej/exelli";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exelli = exelli_0_1_0;
 
-    exeque_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "exeque";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "exeque";
-              version = "0.1.0";
-              sha256 =
-                "d860208c3a651c97cacd95e842e4dceffc84f518026c5737e93b46444f000dfa";
-            };
-
-            meta = {
-              longDescription = ''Exeque allows you to queue up a list of
-                                functions and specify how many workers should be
-                                used to run those functions. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/duff/exeque";
-            };
-          }
-      ) {};
-
-    exeque = exeque_0_1_0;
-
     exexif_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exexif";
             version = "0.0.1";
             src = fetchHex {
@@ -16597,9 +9959,9 @@ let
                                 fine). iex> {:ok, info} =
                                 Exexif.exif_from_jpeg_buffer(buffer) 2. Access
                                 the high level TIFF data: iex> info.x_resolution
-                                72 iex> info.model "DSC-RX100M2" 3. The exif
+                                72 iex> info.model \"DSC-RX100M2\" 3. The exif
                                 data is in there, too. iex>
-                                info.exif.color_space "sRGB" iex> info.exif |>
+                                info.exif.color_space \"sRGB\" iex> info.exif |>
                                 Dict.keys [:brightness_value, :color_space,
                                 :component_configuration,
                                 :compressed_bits_per_pixel, :contrast,
@@ -16619,177 +9981,21 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/pragdave/exexif";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exexif = exexif_0_0_1;
 
-    exfavicon_0_3_2 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2, floki_0_8_0 }:
-          buildMix {
-            name = "exfavicon";
-            version = "0.3.2";
-            src = fetchHex {
-              pkg = "exfavicon";
-              version = "0.3.2";
-              sha256 =
-                "95503035ea2b6768c7d3fb8af9769830b9933b2579c7fdcfdd6b775e830213c2";
-            };
-            beamDeps  = [ httpoison_0_8_2 floki_0_8_0 ];
-
-            meta = {
-              description = ''A exfavicon to detect a site`s favicon.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ikeikeikeike/exfavicon";
-            };
-          }
-      ) {};
-
-    exfavicon = exfavicon_0_3_2;
-
-    exfile_0_1_5 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          plug_1_0_3,
-          phoenix_html_2_5_1,
-          ecto_2_0_0_beta_2
-        }:
-          buildMix {
-            name = "exfile";
-            version = "0.1.5";
-            src = fetchHex {
-              pkg = "exfile";
-              version = "0.1.5";
-              sha256 =
-                "b2aee601b1db3ef5a8c5c638da287ec59153a21fb3b8bdbe0bd404d1e20696a1";
-            };
-            beamDeps  = [ plug_1_0_3 phoenix_html_2_5_1 ecto_2_0_0_beta_2 ];
-
-            meta = {
-              longDescription = ''File upload handling in Elixir and Plug.
-                                Supports pluggable processors and storage
-                                backends.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/keichan34/exfile";
-            };
-          }
-      ) {};
-
-    exfile_0_2_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          plug_1_0_3,
-          phoenix_html_2_5_1,
-          ecto_2_0_0_beta_2
-        }:
-          buildMix {
-            name = "exfile";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "exfile";
-              version = "0.2.0";
-              sha256 =
-                "f5977fbb7037e17d93224abec4e46dde7b60a6ce8e37654167c9abfbeacaf274";
-            };
-            beamDeps  = [ plug_1_0_3 phoenix_html_2_5_1 ecto_2_0_0_beta_2 ];
-
-            meta = {
-              longDescription = ''File upload handling in Elixir and Plug.
-                                Supports pluggable processors and storage
-                                backends.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/keichan34/exfile";
-            };
-          }
-      ) {};
-
-    exfile = exfile_0_2_0;
-
-    exfile_b2_0_1_3 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, exfile_0_2_0
-        }:
-          buildMix {
-            name = "exfile_b2";
-            version = "0.1.3";
-            src = fetchHex {
-              pkg = "exfile_b2";
-              version = "0.1.3";
-              sha256 =
-                "f73e1d45279e9d279f2d8cb112a2d7e791ff0b129eea69252c22a6fc180a5106";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 exfile_0_2_0 ];
-
-            meta = {
-              description = ''A Backblaze B2 storage backend adapter for
-                            Exfile.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/keichan34/exfile-b2";
-            };
-          }
-      ) {};
-
-    exfile_b2 = exfile_b2_0_1_3;
-
-    exfile_imagemagick_0_1_1 = callPackage
-      (
-        {  buildMix, fetchHex, exfile_0_2_0 }:
-          buildMix {
-            name = "exfile_imagemagick";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "exfile_imagemagick";
-              version = "0.1.1";
-              sha256 =
-                "be501b021d1d4a3603dbc6ed2223a81817ffb39bd51e0ee2a5314bd07f132695";
-            };
-            beamDeps  = [ exfile_0_2_0 ];
-
-            meta = {
-              description = ''An ImageMagick file processor suite for
-                            Exfile.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/keichan34/exfile-imagemagick";
-            };
-          }
-      ) {};
-
-    exfile_imagemagick = exfile_imagemagick_0_1_1;
-
-    exfile_memory_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, exfile_0_1_5 }:
-          buildMix {
-            name = "exfile_memory";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "exfile_memory";
-              version = "0.1.0";
-              sha256 =
-                "66330c408a73094d115227d0e16b936229721e16703197559a828bfb7795f9d7";
-            };
-            beamDeps  = [ exfile_0_1_5 ];
-
-            meta = {
-              description = ''In-memory (ets) storage backend for Exfile.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/keichan34/exfile-memory";
-            };
-          }
-      ) {};
-
-    exfile_memory = exfile_memory_0_1_0;
-
     exfirebase_0_4_0 = callPackage
       (
-        {  buildMix, fetchHex, httpotion_2_2_2, exjsx_3_2_0 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          httpotion_2_2_2,
+          exjsx_3_2_0
+        }:
+          buildMix ({
             name = "exfirebase";
             version = "0.4.0";
             src = fetchHex {
@@ -16806,39 +10012,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/parroty/exfirebase";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exfirebase = exfirebase_0_4_0;
 
-    exfoaas_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "exfoaas";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "exfoaas";
-              version = "0.0.2";
-              sha256 =
-                "521f355f8c38c056f66cd8ac236f561c2a3502e451c07a88761e05c22c8848aa";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''brings the utility of FOAAS to elixir.'';
-              license = stdenv.lib.licenses.wtfpl;
-              homepage = "https://github.com/cryptobird/ExFOAAS.git";
-            };
-          }
-      ) {};
-
-    exfoaas = exfoaas_0_0_2;
-
     exfsm_0_1_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exfsm";
             version = "0.1.3";
             src = fetchHex {
@@ -16855,15 +10037,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/awetzel/exfsm";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exfsm = exfsm_0_1_3;
 
     exfswatch_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex, fs_0_9_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, fs_0_9_2 }:
+          buildMix ({
             name = "exfswatch";
             version = "0.1.1";
             src = fetchHex {
@@ -16880,15 +10062,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/falood/exfswatch";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exfswatch = exfswatch_0_1_1;
 
     exfuck_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exfuck";
             version = "0.1.0";
             src = fetchHex {
@@ -16903,61 +10085,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/shiroyasha/exfuck";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exfuck = exfuck_0_1_0;
 
-    exgenius_0_0_5 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_2_0 }:
-          buildMix {
-            name = "exgenius";
-            version = "0.0.5";
-            src = fetchHex {
-              pkg = "exgenius";
-              version = "0.0.5";
-              sha256 =
-                "f0f4463ac9ad79a102a1bf0ded91d77ed87ce262da6045990be51450ef240fd5";
-            };
-            beamDeps  = [ httpoison_0_8_2 exjsx_3_2_0 ];
-
-            meta = {
-              longDescription = '' Elixir library for the (undocumented) Rap
-                                Genius (and also Rock, Tech, Pop, Country, etc)
-                                API '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jeffweiss/exgenius";
-            };
-          }
-      ) {};
-
-    exgenius = exgenius_0_0_5;
-
-    exgpg_0_0_3 = callPackage
-      (
-        {  buildMix, fetchHex, uuid_1_0_0, porcelain_2_0_1 }:
-          buildMix {
-            name = "exgpg";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "exgpg";
-              version = "0.0.3";
-              sha256 =
-                "13499da2a59567f87f5293cc874ab1256e88089784645d997406d8f95978319a";
-            };
-            beamDeps  = [ uuid_1_0_0 porcelain_2_0_1 ];
-
-            meta = {    };
-          }
-      ) {};
-
-    exgpg = exgpg_0_0_3;
-
     exgravatar_2_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exgravatar";
             version = "2.0.0";
             src = fetchHex {
@@ -16972,70 +10108,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/scrogson/exgravatar";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exgravatar = exgravatar_2_0_0;
 
-    exgrid_0_3_0 = callPackage
-      (
-        {
-          buildMix, fetchHex, timex_0_13_5, json_0_3_3, httpotion_2_2_2
-        }:
-          buildMix {
-            name = "exgrid";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "exgrid";
-              version = "0.3.0";
-              sha256 =
-                "96676dfc20b2e8c7caf5f68c202eada246f192d3246922be7214a0da0d219506";
-            };
-            beamDeps  = [ timex_0_13_5 json_0_3_3 httpotion_2_2_2 ];
-
-            meta = {
-              description = ''Elixir bindings for SendGrid`s REST API'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bradleyd/exgrid";
-            };
-          }
-      ) {};
-
-    exgrid = exgrid_0_3_0;
-
-    exhal_4_2_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          uri_template_1_2_0,
-          poison_2_1_0,
-          httpoison_0_8_2
-        }:
-          buildMix {
-            name = "exhal";
-            version = "4.2.1";
-            src = fetchHex {
-              pkg = "exhal";
-              version = "4.2.1";
-              sha256 =
-                "5696572795d659441412e55600a3593d5d57828e0a3efcdc2c7985f9cdbe81a0";
-            };
-            beamDeps  = [ uri_template_1_2_0 poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Use HAL APIs with ease'';
-              license = stdenv.lib.licenses.free;
-            };
-          }
-      ) {};
-
-    exhal = exhal_4_2_1;
-
     exhcl_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exhcl";
             version = "0.2.1";
             src = fetchHex {
@@ -17050,15 +10131,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/asakura/exhcl";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exhcl = exhcl_0_2_1;
 
     exiban_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exiban";
             version = "0.0.4";
             src = fetchHex {
@@ -17074,39 +10155,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/kkempin/exiban";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exiban = exiban_0_0_4;
 
-    exintercom_0_1_6 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_0_3, httpoison_0_8_2 }:
-          buildMix {
-            name = "exintercom";
-            version = "0.1.6";
-            src = fetchHex {
-              pkg = "exintercom";
-              version = "0.1.6";
-              sha256 =
-                "3e4e112dc29a36244b490bb6fb40c861be12e70a7723323520430059c3ffeb51";
-            };
-            beamDeps  = [ poison_1_0_3 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Intercom client library.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/versality/exintercom";
-            };
-          }
-      ) {};
-
-    exintercom = exintercom_0_1_6;
-
     exirc_0_10_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exirc";
             version = "0.10.0";
             src = fetchHex {
@@ -17121,70 +10178,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bitwalker/exirc";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exirc = exirc_0_10_0;
 
-    exjira_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, dotenv_0_0_4 }:
-          buildMix {
-            name = "exjira";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "exjira";
-              version = "0.0.1";
-              sha256 =
-                "da992f593939629300ddf90c0aafbcafb05c4c7e5f817c3a76dd7c0ac43f8575";
-            };
-            beamDeps  = [ poison_1_5_2 dotenv_0_0_4 ];
-
-            meta = {
-              description = ''JIRA client library for Elixir '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/mattweldon/exjira";
-            };
-          }
-      ) {};
-
-    exjira = exjira_0_0_1;
-
-    exjprop_0_0_5 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          sweet_xml_0_6_1,
-          httpoison_0_8_2,
-          ex_aws_0_4_18
-        }:
-          buildMix {
-            name = "exjprop";
-            version = "0.0.5";
-            src = fetchHex {
-              pkg = "exjprop";
-              version = "0.0.5";
-              sha256 =
-                "9fcc1e2e3e12f9f49b1b42cb97df917b5021933d962370dbe67557718a5adee0";
-            };
-            beamDeps  = [ sweet_xml_0_6_1 httpoison_0_8_2 ex_aws_0_4_18 ];
-
-            meta = {
-              description = ''Elixir library for reading Java properties files
-                            from various sources'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/stocks29/exjprop.git";
-            };
-          }
-      ) {};
-
-    exjprop = exjprop_0_0_5;
-
     exjson_0_5_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exjson";
             version = "0.5.0";
             src = fetchHex {
@@ -17200,15 +10202,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/guedes/exjson";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exjson = exjson_0_5_0;
 
     exjsx_3_0_2 = callPackage
       (
-        {  buildMix, fetchHex, jsx_2_3_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, jsx_2_3_1 }:
+          buildMix ({
             name = "exjsx";
             version = "3.0.2";
             src = fetchHex {
@@ -17224,13 +10226,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/talentdeficit/exjsx";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exjsx_3_1_0 = callPackage
       (
-        {  buildMix, fetchHex, jsx_2_4_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, jsx_2_4_0 }:
+          buildMix ({
             name = "exjsx";
             version = "3.1.0";
             src = fetchHex {
@@ -17246,13 +10248,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/talentdeficit/exjsx";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exjsx_3_2_0 = callPackage
       (
-        {  buildMix, fetchHex, jsx_2_6_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, jsx_2_6_2 }:
+          buildMix ({
             name = "exjsx";
             version = "3.2.0";
             src = fetchHex {
@@ -17268,53 +10270,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/talentdeficit/exjsx";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exjsx = exjsx_3_2_0;
 
-    exkad_0_0_2 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          socket_0_2_8,
-          poison_1_2_1,
-          plug_0_8_4,
-          httpotion_2_2_2,
-          cowboy_1_0_4
-        }:
-          buildMix {
-            name = "exkad";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "exkad";
-              version = "0.0.2";
-              sha256 =
-                "b12f4e48ed460521ae3b79895d1e8c43ed24df54260e5519e58708ff76468afb";
-            };
-            beamDeps  = [
-                          socket_0_2_8
-                          poison_1_2_1
-                          plug_0_8_4
-                          httpotion_2_2_2
-                          cowboy_1_0_4
-                        ];
-
-            meta = {
-              description = ''A simple kademlia implementation'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/rozap/exkad";
-            };
-          }
-      ) {};
-
-    exkad = exkad_0_0_2;
-
     exkanji_0_2_6 = callPackage
       (
-        {  buildMix, fetchHex, exromaji_0_3_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, exromaji_0_3_0 }:
+          buildMix ({
             name = "exkanji";
             version = "0.2.6";
             src = fetchHex {
@@ -17332,40 +10296,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ikeikeikeike/exkanji";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exkanji = exkanji_0_2_6;
 
-    exkismet_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "exkismet";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "exkismet";
-              version = "0.0.2";
-              sha256 =
-                "3648f010eb80891b0195f9ced0e02a5a08860a9d96e8f7bbe328c68f27b85b64";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''A client (completely unofficial) for the
-                            Akismet.com comment-spam detection API.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/cameronp/exkismet";
-            };
-          }
-      ) {};
-
-    exkismet = exkismet_0_0_2;
-
     exldap_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exldap";
             version = "0.1.1";
             src = fetchHex {
@@ -17380,15 +10319,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/jmerriweather/exldap";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exldap = exldap_0_1_1;
 
     exleveldb_0_7_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exleveldb";
             version = "0.7.0";
             src = fetchHex {
@@ -17419,15 +10358,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/skovsgaard/exleveldb.git";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exleveldb = exleveldb_0_7_0;
 
     exlibris_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exlibris";
             version = "0.0.1";
             src = fetchHex {
@@ -17449,15 +10388,15 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/pragdave/exlibris";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exlibris = exlibris_0_0_1;
 
     exlingr_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exlingr";
             version = "0.0.1";
             src = fetchHex {
@@ -17472,15 +10411,15 @@ let
               license = stdenv.lib.licenses.wtfpl;
               homepage = "https://github.com/mtwtkman/exlingr";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exlingr = exlingr_0_0_1;
 
     exmatrix_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, benchfella_0_3_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, benchfella_0_3_2 }:
+          buildMix ({
             name = "exmatrix";
             version = "0.0.1";
             src = fetchHex {
@@ -17498,15 +10437,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/a115/exmatrix";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exmatrix = exmatrix_0_0_1;
 
     exmerl_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exmerl";
             version = "0.1.1";
             src = fetchHex {
@@ -17522,15 +10461,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/pwoolcoc/exmerl";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exmerl = exmerl_0_1_1;
 
     exmetrics_1_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exmetrics";
             version = "1.1.0";
             src = fetchHex {
@@ -17546,15 +10485,15 @@ let
                                 application.'';
               license = stdenv.lib.licenses.mit;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exmetrics = exmetrics_1_1_0;
 
     exml_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exml";
             version = "0.1.0";
             src = fetchHex {
@@ -17568,15 +10507,15 @@ let
               description = ''Most simple Elixir wrapper for xmerl xpath'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exml = exml_0_1_0;
 
     exmoji_0_2_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
+          buildMix ({
             name = "exmoji";
             version = "0.2.2";
             src = fetchHex {
@@ -17593,7 +10532,7 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mroth/exmoji";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exmoji = exmoji_0_2_2;
@@ -17602,13 +10541,14 @@ let
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           uuid_1_1_3,
           poolboy_1_5_1,
           poison_1_5_2,
           msgpax_0_8_2
         }:
-          buildMix {
+          buildMix ({
             name = "exns";
             version = "0.3.2-beta";
             src = fetchHex {
@@ -17626,15 +10566,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/walkr/exns";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exns = exns_0_3_2_beta;
 
     exnumerable_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exnumerable";
             version = "0.0.1";
             src = fetchHex {
@@ -17650,15 +10590,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/KamilLelonek/exnumerable";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exnumerable = exnumerable_0_0_1;
 
     exnumerator_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exnumerator";
             version = "1.0.0";
             src = fetchHex {
@@ -17674,15 +10614,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/KamilLelonek/exnumerator";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exnumerator = exnumerator_1_0_0;
 
     exnumterator_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exnumterator";
             version = "1.0.0";
             src = fetchHex {
@@ -17698,15 +10638,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/KamilLelonek/exnumterator";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exnumterator = exnumterator_1_0_0;
 
     exoddic_1_3_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exoddic";
             version = "1.3.1";
             src = fetchHex {
@@ -17721,79 +10661,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mwmiller/exoddic";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exoddic = exoddic_1_3_1;
 
-    exometer_core_1_0_0 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          setup_1_7_0,
-          parse_trans_2_9_0,
-          lager_3_0_2,
-          folsom_0_8_3
-        }:
-          buildRebar3 {
-            name = "exometer_core";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "exometer_core";
-              version = "1.0.0";
-              sha256 =
-                "6fe43b22439dd89b7b307214cf18084d26fd82e024d8855bdecccf923f93d852";
-            };
-
-            beamDeps  = [
-                          setup_1_7_0 parse_trans_2_9_0 lager_3_0_2 folsom_0_8_3
-                        ];
-
-            meta = {
-              description = ''Code instrumentation and metrics collection
-                            package.'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/basho/exometer_core";
-            };
-          }
-      ) {};
-
-    exometer_core = exometer_core_1_0_0;
-
-    exos_1_0_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "exos";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "exos";
-              version = "1.0.0";
-              sha256 =
-                "3659fca730360d11d90db8ccb0206e978c838af48bc46ac096d47ea807b9d324";
-            };
-
-            meta = {
-              longDescription = ''Create a GenServer in any language. Exos
-                                contains a very simple GenServer which proxy
-                                calls and casts to a given port command,
-                                encoding and decoding the message to the port
-                                using erlang external binary term format. (see
-                                related projects : clojure|python|node_erlastic
-                                on https://github.com/awetzel) '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/awetzel/exos";
-            };
-          }
-      ) {};
-
-    exos = exos_1_0_0;
-
     expand_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "expand";
             version = "0.0.3";
             src = fetchHex {
@@ -17808,71 +10684,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/joeyates/expand";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     expand = expand_0_0_3;
 
-    exparticle_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "exparticle";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "exparticle";
-              version = "0.0.2";
-              sha256 =
-                "ce70b77da48e84307791af00143ad4b9677d39765459865976d459d3b1bdcaf2";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''ExParticle is an elixir client to communicate
-                            with Particle Cloud API'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/mtanzi/exparticle";
-            };
-          }
-      ) {};
-
-    exparticle = exparticle_0_0_2;
-
-    expcap_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, timex_0_13_5 }:
-          buildMix {
-            name = "expcap";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "expcap";
-              version = "0.1.0";
-              sha256 =
-                "d9d62f7cb7a3acfdb13668668c6cd4e317a125519a5b24830e4184474e8fe274";
-            };
-            beamDeps  = [ timex_0_13_5 ];
-
-            meta = {
-              longDescription = ''A PCAP library written in Elixir. This does
-                                not wrap a C or Erlang PCAP library, rather it
-                                attempts to be an idiomatic Elixir library. This
-                                library parses pcap files, however it does not
-                                yet support most protocols that can be contained
-                                within a pcap file. The only supported protocols
-                                at the moment are: * Ethernet * IPv4 * UDP * DNS
-                                '';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/cobenian/expcap";
-            };
-          }
-      ) {};
-
-    expcap = expcap_0_1_0;
-
     experiment_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "experiment";
             version = "0.0.3";
             src = fetchHex {
@@ -17888,7 +10708,7 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/andrewvy/experiment";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     experiment = experiment_0_0_3;
@@ -17896,9 +10716,14 @@ let
     expinboard_0_0_1 = callPackage
       (
         {
-          buildMix, fetchHex, ibrowse_4_2_2, httpotion_2_2_2, exjsx_3_2_0
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          ibrowse_4_2_2,
+          httpotion_2_2_2,
+          exjsx_3_2_0
         }:
-          buildMix {
+          buildMix ({
             name = "expinboard";
             version = "0.0.1";
             src = fetchHex {
@@ -17914,15 +10739,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/thilko/expinboard";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     expinboard = expinboard_0_0_1;
 
     expletive_0_1_4 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "expletive";
             version = "0.1.4";
             src = fetchHex {
@@ -17937,15 +10762,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/xavier/expletive";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     expletive = expletive_0_1_4;
 
     expool_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "expool";
             version = "0.2.0";
             src = fetchHex {
@@ -17960,15 +10785,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/zackehh/expool";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     expool = expool_0_2_0;
 
     export_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "export";
             version = "0.0.2";
             src = fetchHex {
@@ -17983,15 +10808,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/fazibear/export";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     export = export_0_0_2;
 
     expr_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "expr";
             version = "0.1.0";
             src = fetchHex {
@@ -18007,15 +10832,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/Rob-bie/Expr";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     expr = expr_0_1_0;
 
     exprintf_0_1_6 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exprintf";
             version = "0.1.6";
             src = fetchHex {
@@ -18031,15 +10856,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/parroty/exprintf";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exprintf = exprintf_0_1_6;
 
     exprof_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, exprintf_0_1_6 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, exprintf_0_1_6 }:
+          buildMix ({
             name = "exprof";
             version = "0.2.0";
             src = fetchHex {
@@ -18056,96 +10881,23 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/parroty/exprof";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exprof = exprof_0_2_0;
 
-    exprotobuf_0_10_2 = callPackage
-      (
-        {  buildMix, fetchHex, gpb_3_18_10 }:
-          buildMix {
-            name = "exprotobuf";
-            version = "0.10.2";
-            src = fetchHex {
-              pkg = "exprotobuf";
-              version = "0.10.2";
-              sha256 =
-                "dc71af3a83a51376de72de160123408cd38adfed2ad2f419465b4d1e3f87d244";
-            };
-            beamDeps  = [ gpb_3_18_10 ];
-
-            meta = {
-              longDescription = ''exprotobuf provides native encoding/decoding
-                                of protobuf messages via generated
-                                modules/structs.'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/bitwalker/exprotobuf";
-            };
-          }
-      ) {};
-
-    exprotobuf_0_13_0 = callPackage
-      (
-        {  buildMix, fetchHex, gpb_3_18_10 }:
-          buildMix {
-            name = "exprotobuf";
-            version = "0.13.0";
-            src = fetchHex {
-              pkg = "exprotobuf";
-              version = "0.13.0";
-              sha256 =
-                "25921ae192f22eca89d543134a7b12bd2db617bb77992f1d4957b8b28bccbc8e";
-            };
-            beamDeps  = [ gpb_3_18_10 ];
-
-            meta = {
-              longDescription = ''exprotobuf provides native encoding/decoding
-                                of protobuf messages via generated
-                                modules/structs.'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/bitwalker/exprotobuf";
-            };
-          }
-      ) {};
-
-    exprotobuf_1_0_0 = callPackage
-      (
-        {  buildMix, fetchHex, gpb_3_18_10 }:
-          buildMix {
-            name = "exprotobuf";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "exprotobuf";
-              version = "1.0.0";
-              sha256 =
-                "042cc4b2b3e9c13e6fcfd08e49043fa2640aa718e4d743404e1006a372bc2564";
-            };
-            beamDeps  = [ gpb_3_18_10 ];
-
-            meta = {
-              longDescription = ''exprotobuf provides native encoding/decoding
-                                of protobuf messages via generated
-                                modules/structs.'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/bitwalker/exprotobuf";
-            };
-          }
-      ) {};
-
-    exprotobuf = exprotobuf_1_0_0;
-
     exq_0_6_5 = callPackage
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           uuid_1_1_3,
           timex_2_1_3,
           redix_0_3_6,
           poison_2_1_0
         }:
-          buildMix {
+          buildMix ({
             name = "exq";
             version = "0.6.5";
             src = fetchHex {
@@ -18163,15 +10915,22 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/akira/exq";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exq = exq_0_6_5;
 
     exq_ui_0_6_5 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3, exq_0_6_5, cowboy_1_0_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_3,
+          exq_0_6_5,
+          cowboy_1_0_4
+        }:
+          buildMix ({
             name = "exq_ui";
             version = "0.6.5";
             src = fetchHex {
@@ -18189,15 +10948,15 @@ let
 
               homepage = "https://github.com/akira/exq";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exq_ui = exq_ui_0_6_5;
 
     exql_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, tds_0_5_4 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, tds_0_5_4 }:
+          buildMix ({
             name = "exql";
             version = "0.0.3";
             src = fetchHex {
@@ -18213,15 +10972,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mattweldon/exql";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exql = exql_0_0_3;
 
     exquery_0_0_11 = callPackage
       (
-        {  buildRebar3, fetchHex, ex_doc_0_11_4, earmark_0_1_19 }:
-          buildRebar3 {
+        {
+          buildRebar3,
+          packageOverrides ? {},
+          fetchHex,
+          ex_doc_0_11_4,
+          earmark_0_1_19
+        }:
+          buildRebar3 ({
             name = "exquery";
             version = "0.0.11";
             src = fetchHex {
@@ -18240,15 +11005,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/rozap/exquery";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exquery = exquery_0_0_11;
 
     exquisite_0_1_6 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exquisite";
             version = "0.1.6";
             src = fetchHex {
@@ -18263,64 +11028,15 @@ let
               license = stdenv.lib.licenses.wtfpl;
               homepage = "https://github.com/meh/exquisite";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exquisite = exquisite_0_1_6;
 
-    exrabbit_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "exrabbit";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "exrabbit";
-              version = "0.0.2";
-              sha256 =
-                "8dda89e78a8918eddcf28200e4474127151a8e20a2b54447b817732344b4e55a";
-            };
-
-            meta = {
-              description = ''RabbitMQ bindings and DSL for Elixir'';
-
-              homepage = "https://github.com/d0rc/exrabbit";
-            };
-          }
-      ) {};
-
-    exrabbit = exrabbit_0_0_2;
-
-    exrecaptcha_0_0_3 = callPackage
-      (
-        {  buildMix, fetchHex, httpotion_2_2_2 }:
-          buildMix {
-            name = "exrecaptcha";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "exrecaptcha";
-              version = "0.0.3";
-              sha256 =
-                "2df1a9e868d3adc31a657755df04fabc9c9e7d12f56cbcc86b27f670dcd962b5";
-            };
-            beamDeps  = [ httpotion_2_2_2 ];
-
-            meta = {
-              longDescription = ''Simple ReCaptcha display/verify code for
-                                Elixir applications. Designed to be used with a
-                                CMS such as Phoenix. '';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/adanselm/exrecaptcha";
-            };
-          }
-      ) {};
-
-    exrecaptcha = exrecaptcha_0_0_3;
-
     exredis_0_2_3 = callPackage
       (
-        {  buildMix, fetchHex, eredis_1_0_8 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, eredis_1_0_8 }:
+          buildMix ({
             name = "exredis";
             version = "0.2.3";
             src = fetchHex {
@@ -18336,15 +11052,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/artemeff/exredis";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exredis = exredis_0_2_3;
 
     exref_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exref";
             version = "0.1.0";
             src = fetchHex {
@@ -18358,15 +11074,21 @@ let
               description = ''Damn simple mix integration of xref.'';
               license = stdenv.lib.licenses.mit;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exref = exref_0_1_0;
 
     exrequester_0_5_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpotion_2_2_2 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpotion_2_2_2
+        }:
+          buildMix ({
             name = "exrequester";
             version = "0.5.2";
             src = fetchHex {
@@ -18383,15 +11105,15 @@ let
 
               homepage = "https://github.com/oarrabi/exrequester";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exrequester = exrequester_0_5_2;
 
     exrethinkdb_0_0_3 = callPackage
       (
-        {  buildRebar3, fetchHex, poison_1_4_0 }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex, poison_1_4_0 }:
+          buildRebar3 ({
             name = "exrethinkdb";
             version = "0.0.3";
             src = fetchHex {
@@ -18408,87 +11130,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/hamiltop/exrethinkdb";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exrethinkdb = exrethinkdb_0_0_3;
 
-    exrm_0_14_17 = callPackage
-      (
-        {  buildMix, fetchHex, conform_0_11_0 }:
-          buildMix {
-            name = "exrm";
-            version = "0.14.17";
-            src = fetchHex {
-              pkg = "exrm";
-              version = "0.14.17";
-              sha256 =
-                "c5b0c2bd4bad44d2f67f5ec720e5a4cff829dfac234aa79056970f83236bb976";
-            };
-            beamDeps  = [ conform_0_11_0 ];
-
-            meta = {
-              longDescription = ''Exrm, or Elixir Release Manager, provides mix
-                                tasks for building, upgrading, and controlling
-                                release packages for your application.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bitwalker/exrm";
-            };
-          }
-      ) {};
-
-    exrm_0_14_2 = callPackage
-      (
-        {  buildMix, fetchHex, conform_0_10_5 }:
-          buildMix {
-            name = "exrm";
-            version = "0.14.2";
-            src = fetchHex {
-              pkg = "exrm";
-              version = "0.14.2";
-              sha256 =
-                "ff70905672059035bfa62a3bb0043809724c6a852050eac52faa06aeb65855c0";
-            };
-            beamDeps  = [ conform_0_10_5 ];
-
-            meta = {
-              longDescription = ''Exrm, or Elixir Release Manager, provides mix
-                                tasks for building, upgrading, and controlling
-                                release packages for your application.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bitwalker/exrm";
-            };
-          }
-      ) {};
-
-    exrm_0_18_8 = callPackage
-      (
-        {  buildMix, fetchHex, relx_3_3_2, conform_0_16_0 }:
-          buildMix {
-            name = "exrm";
-            version = "0.18.8";
-            src = fetchHex {
-              pkg = "exrm";
-              version = "0.18.8";
-              sha256 =
-                "a8aa031d824f882a762404bc19b6fbe6c10703941097a6ef8bb93a62cc987e22";
-            };
-            beamDeps  = [ relx_3_3_2 conform_0_16_0 ];
-
-            meta = {
-              longDescription = ''Exrm, or Elixir Release Manager, provides mix
-                                tasks for building, upgrading, and controlling
-                                release packages for your application.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bitwalker/exrm";
-            };
-          }
-      ) {};
-
     exrm_0_19_9 = callPackage
       (
-        {  buildMix, fetchHex, relx_3_5_0, conform_1_0_0_rc8 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          relx_3_5_0,
+          conform_1_0_0_rc8
+        }:
+          buildMix ({
             name = "exrm";
             version = "0.19.9";
             src = fetchHex {
@@ -18506,13 +11162,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bitwalker/exrm";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exrm_1_0_3 = callPackage
       (
-        {  buildMix, fetchHex, relx_3_18_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, relx_3_18_0 }:
+          buildMix ({
             name = "exrm";
             version = "1.0.3";
             src = fetchHex {
@@ -18530,7 +11186,7 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bitwalker/exrm";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exrm = exrm_1_0_3;
@@ -18539,6 +11195,7 @@ let
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           vex_0_5_5,
           timex_1_0_2,
@@ -18546,7 +11203,7 @@ let
           ex_doc_0_11_4,
           earmark_0_2_1
         }:
-          buildMix {
+          buildMix ({
             name = "exrm_deb";
             version = "0.0.5";
             src = fetchHex {
@@ -18568,15 +11225,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/johnhamelink/exrm_deb";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exrm_deb = exrm_deb_0_0_5;
 
     exrm_heroku_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex, exrm_1_0_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, exrm_1_0_3 }:
+          buildMix ({
             name = "exrm_heroku";
             version = "0.1.1";
             src = fetchHex {
@@ -18593,43 +11250,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ride/exrm-heroku";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exrm_heroku = exrm_heroku_0_1_1;
 
-    exrm_rpm_0_3_0 = callPackage
-      (
-        {  buildMix, fetchHex, exrm_0_14_2 }:
-          buildMix {
-            name = "exrm_rpm";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "exrm_rpm";
-              version = "0.3.0";
-              sha256 =
-                "28c2339fac5073d615fb4a52816dd4fc56c9da2db9e71846b0affdf171643044";
-            };
-            beamDeps  = [ exrm_0_14_2 ];
-
-            meta = {
-              longDescription = ''Adds simple Red Hat Package Manager (RPM)
-                                generation to the exrm package manager. The
-                                generated RPM file includes the Elixir release
-                                and an init.d script to manage the project`s
-                                service. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/smpallen99/exrm-rpm";
-            };
-          }
-      ) {};
-
-    exrm_rpm = exrm_rpm_0_3_0;
-
     exromaji_0_3_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exromaji";
             version = "0.3.0";
             src = fetchHex {
@@ -18645,15 +11274,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ikeikeikeike/exromaji";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exromaji = exromaji_0_3_0;
 
     exrun_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exrun";
             version = "0.1.1";
             src = fetchHex {
@@ -18669,15 +11298,15 @@ let
 
               homepage = "https://github.com/liveforeverx/exrun";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exrun = exrun_0_1_1;
 
     exsamples_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exsamples";
             version = "0.1.0";
             src = fetchHex {
@@ -18693,15 +11322,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/msaraiva/exsamples";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exsamples = exsamples_0_1_0;
 
     exscript_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exscript";
             version = "0.0.1";
             src = fetchHex {
@@ -18716,83 +11345,15 @@ let
 
               homepage = "https://github.com/liveforeverx/exscript";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exscript = exscript_0_0_1;
 
-    exseed_0_0_3 = callPackage
-      (
-        {  buildMix, fetchHex, ecto_2_0_0_beta_2 }:
-          buildMix {
-            name = "exseed";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "exseed";
-              version = "0.0.3";
-              sha256 =
-                "d5f42ed419c9f1d5d179dc93fdf6a58344b07055764498f222f07f95cb82dd98";
-            };
-            beamDeps  = [ ecto_2_0_0_beta_2 ];
-
-            meta = {
-              description = ''A library that provides a simple DSL for seeding
-                            databases through Ecto.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/seaneshbaugh/exseed";
-            };
-          }
-      ) {};
-
-    exseed = exseed_0_0_3;
-
-    exsentry_0_3_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          uuid_1_1_3,
-          timex_2_1_3,
-          poison_1_0_3,
-          plug_1_1_3,
-          ibrowse_4_2_2,
-          httpotion_2_2_2,
-          fuzzyurl_0_8_1
-        }:
-          buildMix {
-            name = "exsentry";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "exsentry";
-              version = "0.3.0";
-              sha256 =
-                "0cc5b035b58a95e3361de9417a3ab61bf055d02fc3273b048011dcba7f2a515c";
-            };
-            beamDeps  = [
-                          uuid_1_1_3
-                          timex_2_1_3
-                          poison_1_0_3
-                          plug_1_1_3
-                          ibrowse_4_2_2
-                          httpotion_2_2_2
-                          fuzzyurl_0_8_1
-                        ];
-
-            meta = {
-              description = ''ExSentry is a client for the Sentry error
-                            reporting platform.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/appcues/exsentry";
-            };
-          }
-      ) {};
-
-    exsentry = exsentry_0_3_0;
-
     exstatic_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "exstatic";
             version = "0.1.0";
             src = fetchHex {
@@ -18814,15 +11375,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/arjan/exstatic";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exstatic = exstatic_0_1_0;
 
     exstatsd_0_1_5 = callPackage
       (
-        {  buildMix, fetchHex, exactor_2_2_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, exactor_2_2_0 }:
+          buildMix ({
             name = "exstatsd";
             version = "0.1.5";
             src = fetchHex {
@@ -18838,15 +11399,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/upbit/ExStatsD";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exstatsd = exstatsd_0_1_5;
 
     exsync_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex, exfswatch_0_1_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, exfswatch_0_1_1 }:
+          buildMix ({
             name = "exsync";
             version = "0.1.2";
             src = fetchHex {
@@ -18862,123 +11423,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/falood/exsync";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exsync = exsync_0_1_2;
 
-    exsyslog_1_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, syslog_1_0_2, poison_1_5_2 }:
-          buildMix {
-            name = "exsyslog";
-            version = "1.0.1";
-            src = fetchHex {
-              pkg = "exsyslog";
-              version = "1.0.1";
-              sha256 =
-                "a3972cf2c70bcf8fedcd702109ed6a2213d1905c6eabb0e42e600b34bc9f0fbe";
-            };
-            beamDeps  = [ syslog_1_0_2 poison_1_5_2 ];
-
-            meta = {
-              description = ''ExSyslog is a Elixir Logger custom backend to
-                            syslog.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/22cans/exsyslog";
-            };
-          }
-      ) {};
-
-    exsyslog = exsyslog_1_0_1;
-
-    extreme_0_5_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          uuid_1_1_3,
-          poison_1_5_2,
-          httpoison_0_8_2,
-          exprotobuf_0_10_2
-        }:
-          buildMix {
-            name = "extreme";
-            version = "0.5.0";
-            src = fetchHex {
-              pkg = "extreme";
-              version = "0.5.0";
-              sha256 =
-                "ddbc42891e2d16a5d204939809e35236968c6bc06d4adab7027f8635fec222ab";
-            };
-            beamDeps  = [
-                          uuid_1_1_3
-                          poison_1_5_2
-                          httpoison_0_8_2
-                          exprotobuf_0_10_2
-                        ];
-
-            meta = {
-              description = ''Elixir TCP adapter for EventStore.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/exponentially/extreme";
-            };
-          }
-      ) {};
-
-    extreme = extreme_0_5_0;
-
-    extripe_0_3_2 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "extripe";
-            version = "0.3.2";
-            src = fetchHex {
-              pkg = "extripe";
-              version = "0.3.2";
-              sha256 =
-                "4df5dd859ad780bdb4dc0d1c823a8df82cf7421037f1ed40adf20b426d6729a1";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Stripe API wrapper'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/princemaple/extripe";
-            };
-          }
-      ) {};
-
-    extripe = extripe_0_3_2;
-
-    exts_0_2_2 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "exts";
-            version = "0.2.2";
-            src = fetchHex {
-              pkg = "exts";
-              version = "0.2.2";
-              sha256 =
-                "0c3fa7e429912a4af48dd94975535e6db0557297d675b9d9105645d05d3a3089";
-            };
-
-            meta = {
-              description = ''ets wrapper for Elixir'';
-              license = stdenv.lib.licenses.wtfpl;
-              homepage = "https://github.com/meh/exts";
-            };
-          }
-      ) {};
-
-    exts = exts_0_2_2;
-
     extwitter_0_7_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
+          buildMix ({
             name = "extwitter";
             version = "0.7.0";
             src = fetchHex {
@@ -18994,141 +11447,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/parroty/extwitter";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     extwitter = extwitter_0_7_0;
 
-    exurban_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, jazz_0_2_1, httpoison_0_7_5 }:
-          buildMix {
-            name = "exurban";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "exurban";
-              version = "0.0.1";
-              sha256 =
-                "612b3136b144edfbad658acca6961a3c9a1afe5d343acacb5ce5b358a67bd797";
-            };
-            beamDeps  = [ jazz_0_2_1 httpoison_0_7_5 ];
-
-            meta = {
-              description = ''Elixir wrapper for UrbanAirship API.'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/tappsi/exurban";
-            };
-          }
-      ) {};
-
-    exurban = exurban_0_0_1;
-
-    exvcr_0_3_9 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          meck_0_8_4,
-          httpotion_2_2_2,
-          httpoison_0_8_2,
-          exjsx_3_2_0,
-          exactor_2_2_0
-        }:
-          buildMix {
-            name = "exvcr";
-            version = "0.3.9";
-            src = fetchHex {
-              pkg = "exvcr";
-              version = "0.3.9";
-              sha256 =
-                "25645f6598111ba76ed30b4a2079169ae1aed0795ef87bf74d70a3a7ca8f2112";
-            };
-            beamDeps  = [
-                          meck_0_8_4
-                          httpotion_2_2_2
-                          httpoison_0_8_2
-                          exjsx_3_2_0
-                          exactor_2_2_0
-                        ];
-
-            meta = {
-              description = ''HTTP request/response recording library for
-                            elixir, inspired by VCR.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/parroty/exvcr";
-            };
-          }
-      ) {};
-
-    exvcr_0_7_2 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          meck_0_8_4,
-          httpotion_2_2_2,
-          httpoison_0_8_2,
-          exjsx_3_2_0,
-          exactor_2_2_0
-        }:
-          buildMix {
-            name = "exvcr";
-            version = "0.7.2";
-            src = fetchHex {
-              pkg = "exvcr";
-              version = "0.7.2";
-              sha256 =
-                "8e5feda0b2a9d2f2305bc68c76286cad73a1ecd9638038691cc17e378e321016";
-            };
-            beamDeps  = [
-                          meck_0_8_4
-                          httpotion_2_2_2
-                          httpoison_0_8_2
-                          exjsx_3_2_0
-                          exactor_2_2_0
-                        ];
-
-            meta = {
-              description = ''HTTP request/response recording library for
-                            elixir, inspired by VCR.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/parroty/exvcr";
-            };
-          }
-      ) {};
-
-    exvcr = exvcr_0_7_2;
-
-    exyelp_0_0_2 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_2_1_0, oauther_1_0_2, httpoison_0_8_2
-        }:
-          buildMix {
-            name = "exyelp";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "exyelp";
-              version = "0.0.2";
-              sha256 =
-                "1be8553ea0369a092eac1b6a0b47652b7c0570911483aa3ca454bef05ddd4d5d";
-            };
-            beamDeps  = [ poison_2_1_0 oauther_1_0_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''An Elixir Yelp API client'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/gaslight/exyelp";
-            };
-          }
-      ) {};
-
-    exyelp = exyelp_0_0_2;
-
     exyz_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "exyz";
             version = "1.0.0";
             src = fetchHex {
@@ -19144,15 +11471,15 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/Dkendal/exyz";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     exyz = exyz_1_0_0;
 
     eye_drops_1_0_1 = callPackage
       (
-        {  buildMix, fetchHex, fs_0_9_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, fs_0_9_2 }:
+          buildMix ({
             name = "eye_drops";
             version = "1.0.1";
             src = fetchHex {
@@ -19170,13 +11497,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/rkotze/eye_drops";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     eye_drops_1_2_0 = callPackage
       (
-        {  buildMix, fetchHex, fs_0_9_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, fs_0_9_2 }:
+          buildMix ({
             name = "eye_drops";
             version = "1.2.0";
             src = fetchHex {
@@ -19194,15 +11521,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/rkotze/eye_drops";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     eye_drops = eye_drops_1_2_0;
 
     ezcryptex_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, cryptex_0_0_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, cryptex_0_0_1 }:
+          buildMix ({
             name = "ezcryptex";
             version = "0.0.1";
             src = fetchHex {
@@ -19220,94 +11547,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/stocks29/ezcryptex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ezcryptex = ezcryptex_0_0_1;
 
-    ezlib_1_0_1 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "ezlib";
-            version = "1.0.1";
-            src = fetchHex {
-              pkg = "ezlib";
-              version = "1.0.1";
-              sha256 =
-                "fea58a6ab557888dbfc91a8d20c55755614c123277a57dea2e91711c630465e1";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''Native zlib driver for Erlang / Elixir'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/processone/ezlib";
-            };
-          }
-      ) {};
-
-    ezlib = ezlib_1_0_1;
-
-    ezmq_0_2_0 = callPackage
-      (
-        {
-          buildErlangMk, fetchHex, lager_2_1_1, gen_listener_tcp_0_3_2
-        }:
-          buildErlangMk {
-            name = "ezmq";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "ezmq";
-              version = "0.2.0";
-              sha256 =
-                "bc804ffded0b0d0f684d4313ad3fa676479df962c584daaf5aa14ada5b86a52b";
-            };
-            beamDeps  = [ lager_2_1_1 gen_listener_tcp_0_3_2 ];
-
-            meta = {
-              description = ''Native Erlang 0MQ implementation'';
-              license = stdenv.lib.licenses.mpl20;
-              homepage = "https://github.com/zeromq/ezmq";
-            };
-          }
-      ) {};
-
-    ezmq = ezmq_0_2_0;
-
-    facebook_0_4_2 = callPackage
-      (
-        {
-          buildMix, fetchHex, libex_config_0_2_0, json_0_3_3, hackney_1_6_0
-        }:
-          buildMix {
-            name = "facebook";
-            version = "0.4.2";
-            src = fetchHex {
-              pkg = "facebook";
-              version = "0.4.2";
-              sha256 =
-                "033147d8ae278172ea7fb6fd445bdd6288fb06a8479b9f0e0ae376acc1efdad6";
-            };
-            beamDeps  = [ libex_config_0_2_0 json_0_3_3 hackney_1_6_0 ];
-
-            meta = {
-              longDescription = ''Facebook Graph API Wrapper written in Elixir.
-                                Please note, this is very much a work in
-                                progress. Feel free to contribute using pull
-                                requests.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/mweibel/facebook.ex";
-            };
-          }
-      ) {};
-
-    facebook = facebook_0_4_2;
-
     factory_girl_elixir_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "factory_girl_elixir";
             version = "0.1.1";
             src = fetchHex {
@@ -19323,15 +11571,22 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/sinetris/factory_girl_elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     factory_girl_elixir = factory_girl_elixir_0_1_1;
 
     fake_cas_1_0_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4, bypass_0_5_1 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_3,
+          cowboy_1_0_4,
+          bypass_0_5_1
+        }:
+          buildMix ({
             name = "fake_cas";
             version = "1.0.1";
             src = fetchHex {
@@ -19347,15 +11602,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/rhruiz/elixir-fake_cas";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     fake_cas = fake_cas_1_0_1;
 
     faker_0_6_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "faker";
             version = "0.6.0";
             src = fetchHex {
@@ -19371,92 +11626,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/igas/faker";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     faker = faker_0_6_0;
 
-    fast_tls_1_0_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, p1_utils_1_0_3 }:
-          buildRebar3 {
-            name = "fast_tls";
-            version = "1.0.1";
-            src = fetchHex {
-              pkg = "fast_tls";
-              version = "1.0.1";
-              sha256 =
-                "479d1e53a14b749b96581df7320440da1ff56df9dde91d327b3ecc1bc60fcb0d";
-            };
-            compilePorts = true;
-            beamDeps  = [ p1_utils_1_0_3 ];
-
-            meta = {
-              description = ''TLS / SSL OpenSSL-based native driver for Erlang
-                            / Elixir'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/processone/fast_tls";
-            };
-          }
-      ) {};
-
-    fast_tls = fast_tls_1_0_1;
-
-    fast_xml_1_1_11 = callPackage
-      (
-        {  buildRebar3, fetchHex, p1_utils_1_0_3 }:
-          buildRebar3 {
-            name = "fast_xml";
-            version = "1.1.11";
-            src = fetchHex {
-              pkg = "fast_xml";
-              version = "1.1.11";
-              sha256 =
-                "58ad965b6e6913a7cc488552bb30a17d029a44c6b1a17f369870cd911ada46b8";
-            };
-            compilePorts = true;
-            beamDeps  = [ p1_utils_1_0_3 ];
-
-            meta = {
-              description = ''Fast Expat-based Erlang / Elixir XML parsing
-                            library'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/processone/fast_xml";
-            };
-          }
-      ) {};
-
-    fast_xml = fast_xml_1_1_11;
-
-    fast_yaml_1_0_3 = callPackage
-      (
-        {  buildRebar3, fetchHex, p1_utils_1_0_3 }:
-          buildRebar3 {
-            name = "fast_yaml";
-            version = "1.0.3";
-            src = fetchHex {
-              pkg = "fast_yaml";
-              version = "1.0.3";
-              sha256 =
-                "f2b2258dfb98ba69c16005d3944582994f2b83f830b717858a5d6807497274ba";
-            };
-            compilePorts = true;
-            beamDeps  = [ p1_utils_1_0_3 ];
-
-            meta = {
-              description = ''Fast YAML native library for Erlang / Elixir'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/processone/fast_yaml";
-            };
-          }
-      ) {};
-
-    fast_yaml = fast_yaml_1_0_3;
-
     faust_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "faust";
             version = "0.1.0";
             src = fetchHex {
@@ -19471,40 +11649,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/jquadrin/faust";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     faust = faust_0_1_0;
 
-    favicon_0_0_7 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_7_5, floki_0_8_0 }:
-          buildMix {
-            name = "favicon";
-            version = "0.0.7";
-            src = fetchHex {
-              pkg = "favicon";
-              version = "0.0.7";
-              sha256 =
-                "b9a577d3d22a6e51843eb334b87de512f48a548d7a7edf56e178e0dde420ba0e";
-            };
-            beamDeps  = [ httpoison_0_7_5 floki_0_8_0 ];
-
-            meta = {
-              description = ''A library that fetches the favicon url for a
-                            specified url'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ricn/favicon";
-            };
-          }
-      ) {};
-
-    favicon = favicon_0_0_7;
-
     fdg_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "fdg";
             version = "0.0.4";
             src = fetchHex {
@@ -19522,15 +11675,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/johnhamelink/elixir-fdg";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     fdg = fdg_0_0_4;
 
     feature_toggler_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, exredis_0_2_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, exredis_0_2_3 }:
+          buildMix ({
             name = "feature_toggler";
             version = "0.0.1";
             src = fetchHex {
@@ -19547,15 +11700,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/aravindgd/feature_toggler";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     feature_toggler = feature_toggler_0_0_1;
 
     feeder_1_4_7 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "feeder";
             version = "1.4.7";
             src = fetchHex {
@@ -19571,13 +11724,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/michaelnisi/feeder";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     feeder_2_0_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "feeder";
             version = "2.0.0";
             src = fetchHex {
@@ -19593,15 +11746,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/michaelnisi/feeder";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     feeder = feeder_2_0_0;
 
     feeder_ex_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, feeder_1_4_7 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, feeder_1_4_7 }:
+          buildMix ({
             name = "feeder_ex";
             version = "0.0.2";
             src = fetchHex {
@@ -19617,15 +11770,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/manukall/feeder_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     feeder_ex = feeder_ex_0_0_2;
 
     feederer_0_5_6 = callPackage
       (
-        {  buildMix, fetchHex, poolboy_1_5_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poolboy_1_5_1 }:
+          buildMix ({
             name = "feederer";
             version = "0.5.6";
             src = fetchHex {
@@ -19643,104 +11796,15 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/draftli/feederer";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     feederer = feederer_0_5_6;
 
-    feedistiller_2_0_2 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          timex_0_19_5,
-          httpoison_0_7_5,
-          feeder_2_0_0,
-          alambic_0_1_0
-        }:
-          buildMix {
-            name = "feedistiller";
-            version = "2.0.2";
-            src = fetchHex {
-              pkg = "feedistiller";
-              version = "2.0.2";
-              sha256 =
-                "453244b3a41fbde7e13ccd675928f41f155799c218b47cbead9e67066efc8276";
-            };
-            beamDeps  = [
-                          timex_0_19_5
-                          httpoison_0_7_5
-                          feeder_2_0_0
-                          alambic_0_1_0
-                        ];
-
-            meta = {
-              description = ''Download RSS/Atom feeds enclosures.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/sdanzan/feedistiller";
-            };
-          }
-      ) {};
-
-    feedistiller = feedistiller_2_0_2;
-
-    feedlex_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_3_1, httpoison_0_8_2 }:
-          buildMix {
-            name = "feedlex";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "feedlex";
-              version = "0.0.1";
-              sha256 =
-                "1f20033824f816d6904837601c14bdffcf1a56a53b8ed7d7916a67e48e53b4a5";
-            };
-            beamDeps  = [ poison_1_3_1 httpoison_0_8_2 ];
-
-            meta = {
-              longDescription = ''Feedly RSS reader client for Elixir
-                                (elixir-lang). Partial but functional
-                                implementation. For now it covers the following
-                                Feedly APIs: * authentication; * feed; * stream;
-                                * subscription.'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/essenciary/feedlex";
-            };
-          }
-      ) {};
-
-    feedlex = feedlex_0_0_1;
-
-    feedme_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, timex_0_19_5 }:
-          buildMix {
-            name = "feedme";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "feedme";
-              version = "0.0.1";
-              sha256 =
-                "021621981bbb03b317e4a948a39d269ab1a2dc6d9ec6ee1c744e565000da680d";
-            };
-            beamDeps  = [ timex_0_19_5 ];
-
-            meta = {
-              description = ''Elixir RSS/Atom parser built on erlang`s xmerl
-                            xml parser'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/umurgdk/elixir-feedme";
-            };
-          }
-      ) {};
-
-    feedme = feedme_0_0_1;
-
     feedparser_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "feedparser";
             version = "0.0.3";
             src = fetchHex {
@@ -19755,15 +11819,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/l3kn/Elixir-Feedparser";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     feedparser = feedparser_0_0_3;
 
     fernet_ecto_0_0_5 = callPackage
       (
-        {  buildMix, fetchHex, fernetex_0_0_2, ecto_1_1_5 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          fernetex_0_0_2,
+          ecto_1_1_5
+        }:
+          buildMix ({
             name = "fernet_ecto";
             version = "0.0.5";
             src = fetchHex {
@@ -19779,15 +11849,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/jkakar/fernet-ecto";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     fernet_ecto = fernet_ecto_0_0_5;
 
     fernetex_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, timex_1_0_2 }:
+          buildMix ({
             name = "fernetex";
             version = "0.0.2";
             src = fetchHex {
@@ -19804,132 +11874,22 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/kennyp/fernetex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     fernetex = fernetex_0_0_2;
 
-    fifo_db_0_2_1 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          lager_3_0_2,
-          erocksdb_0_4_1,
-          eleveldb_2_1_3
-        }:
-          buildRebar3 {
-            name = "fifo_db";
-            version = "0.2.1";
-            src = fetchHex {
-              pkg = "fifo_db";
-              version = "0.2.1";
-              sha256 =
-                "c712ec4dba2b6c358f44196b7bddb2f93ce7a61db2ce1b28d45ebe872e8bc207";
-            };
-
-            beamDeps  = [ lager_3_0_2 erocksdb_0_4_1 eleveldb_2_1_3 ];
-
-            meta = {
-              description = ''Project-FiFo db wrapper'';
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/project-fifo/fifo_db";
-            };
-          }
-      ) {};
-
-    fifo_db = fifo_db_0_2_1;
-
-    fifo_dt_0_1_66 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          riak_dt_2_1_1,
-          libsnarlmatch_0_1_7,
-          lager_2_1_1,
-          jsxd_0_1_10,
-          jsx_1_4_5,
-          fifo_utils_0_1_20
-        }:
-          buildRebar3 {
-            name = "fifo_dt";
-            version = "0.1.66";
-            src = fetchHex {
-              pkg = "fifo_dt";
-              version = "0.1.66";
-              sha256 =
-                "a72df25753a0dad32b22b02356f2979b8e3556f0333449f476d581332f02da6b";
-            };
-
-            beamDeps  = [
-                          riak_dt_2_1_1
-                          libsnarlmatch_0_1_7
-                          lager_2_1_1
-                          jsxd_0_1_10
-                          jsx_1_4_5
-                          fifo_utils_0_1_20
-                        ];
-
-            meta = {
-              description = ''FiFo datatype collection'';
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/project-fifo/fifo_dt";
-            };
-          }
-      ) {};
-
-    fifo_dt_0_1_68 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          riak_dt_2_1_1,
-          libsnarlmatch_0_1_7,
-          lager_2_1_1,
-          jsxd_0_1_10,
-          jsx_1_4_5,
-          fifo_utils_0_1_20
-        }:
-          buildRebar3 {
-            name = "fifo_dt";
-            version = "0.1.68";
-            src = fetchHex {
-              pkg = "fifo_dt";
-              version = "0.1.68";
-              sha256 =
-                "dc465553abac1e4a9db50930bbba5ee15f625a440b482311ceb0e428cc121894";
-            };
-
-            beamDeps  = [
-                          riak_dt_2_1_1
-                          libsnarlmatch_0_1_7
-                          lager_2_1_1
-                          jsxd_0_1_10
-                          jsx_1_4_5
-                          fifo_utils_0_1_20
-                        ];
-
-            meta = {
-              description = ''FiFo datatype collection'';
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/project-fifo/fifo_dt";
-            };
-          }
-      ) {};
-
-    fifo_dt = fifo_dt_0_1_68;
-
     fifo_lager_0_1_3 = callPackage
       (
         {
           buildRebar3,
+          packageOverrides ? {},
           fetchHex,
           lager_logstash_backend_0_1_0,
           lager_graylog_0_1_0,
           lager_3_0_2
         }:
-          buildRebar3 {
+          buildRebar3 ({
             name = "fifo_lager";
             version = "0.1.3";
             src = fetchHex {
@@ -19949,7 +11909,7 @@ let
               description = ''Lager config and dependencies'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     fifo_lager = fifo_lager_0_1_3;
@@ -19958,13 +11918,14 @@ let
       (
         {
           buildRebar3,
+          packageOverrides ? {},
           fetchHex,
           poolboy_1_5_1,
           lager_3_0_2,
           erlcloud_0_13_0,
           base16_1_0_0
         }:
-          buildRebar3 {
+          buildRebar3 ({
             name = "fifo_s3";
             version = "0.1.16";
             src = fetchHex {
@@ -19982,88 +11943,15 @@ let
               description = ''S3 storange client library for erlang'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     fifo_s3 = fifo_s3_0_1_16;
 
-    fifo_spec_0_1_27 = callPackage
-      (
-        {  buildRebar3, fetchHex, fifo_dt_0_1_66 }:
-          buildRebar3 {
-            name = "fifo_spec";
-            version = "0.1.27";
-            src = fetchHex {
-              pkg = "fifo_spec";
-              version = "0.1.27";
-              sha256 =
-                "2ef9662a7423da74b7f4517e9470e44e03383c1116ee6da3944021ff3cd44ef6";
-            };
-
-            beamDeps  = [ fifo_dt_0_1_66 ];
-
-            meta = {
-              description = ''Specs for FiFo APIs'';
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/project-fifo/fifo_spec";
-            };
-          }
-      ) {};
-
-    fifo_spec = fifo_spec_0_1_27;
-
-    fifo_utils_0_1_20 = callPackage
-      (
-        {  buildRebar3, fetchHex, uuid_erl_1_5_1, lager_2_1_1 }:
-          buildRebar3 {
-            name = "fifo_utils";
-            version = "0.1.20";
-            src = fetchHex {
-              pkg = "fifo_utils";
-              version = "0.1.20";
-              sha256 =
-                "01ec5ae5e8a8c3d8e9dc658de1c00818ac807195b4a5c47f98aa2c9af4d54663";
-            };
-
-            beamDeps  = [ uuid_erl_1_5_1 lager_2_1_1 ];
-
-            meta = {
-              description = ''FiFo utility library'';
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/project-fifo/fifo_utils";
-            };
-          }
-      ) {};
-
-    fifo_utils_0_1_22 = callPackage
-      (
-        {  buildRebar3, fetchHex, uuid_erl_1_5_1, lager_2_1_1 }:
-          buildRebar3 {
-            name = "fifo_utils";
-            version = "0.1.22";
-            src = fetchHex {
-              pkg = "fifo_utils";
-              version = "0.1.22";
-              sha256 =
-                "dd38d1418298600063354ebb84cbcbf6d49504416323368c8d590dd2a95e257e";
-            };
-
-            beamDeps  = [ uuid_erl_1_5_1 lager_2_1_1 ];
-
-            meta = {
-              description = ''FiFo utility library'';
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/project-fifo/fifo_utils";
-            };
-          }
-      ) {};
-
-    fifo_utils = fifo_utils_0_1_22;
-
     fifocache_1_0_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "fifocache";
             version = "1.0.1";
             src = fetchHex {
@@ -20078,38 +11966,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/mururu/fifocache";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     fifocache = fifocache_1_0_1;
 
-    figaro_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "figaro";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "figaro";
-              version = "0.1.0";
-              sha256 =
-                "3342018ab0135211b85d00f34567ca3a2d6d66289840c9eb0096ec97fad8a201";
-            };
-
-            meta = {
-              description = ''Simple Elixir project configuration'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/trestrantham/ex_figaro";
-            };
-          }
-      ) {};
-
-    figaro = figaro_0_1_0;
-
     figaro_elixir_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "figaro_elixir";
             version = "1.0.0";
             src = fetchHex {
@@ -20125,15 +11990,17 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/KamilLelonek/figaro-elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     figaro_elixir = figaro_elixir_1_0_0;
 
     file_info_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, mimetype_parser_0_1_2 }:
-          buildMix {
+        {
+          buildMix, packageOverrides ? {}, fetchHex, mimetype_parser_0_1_2
+        }:
+          buildMix ({
             name = "file_info";
             version = "0.0.2";
             src = fetchHex {
@@ -20150,65 +12017,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/NobbZ/file_info";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     file_info = file_info_0_0_2;
 
-    filepreviews_1_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_4_0, httpoison_0_7_5 }:
-          buildMix {
-            name = "filepreviews";
-            version = "1.0.1";
-            src = fetchHex {
-              pkg = "filepreviews";
-              version = "1.0.1";
-              sha256 =
-                "bdb67cd960dd98a4a1d6d0d4944721bf98a506dbfb2b361ca473dbaf40cc9470";
-            };
-            beamDeps  = [ poison_1_4_0 httpoison_0_7_5 ];
-
-            meta = {
-              description = ''FilePreviews.io API client library for Elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/GetBlimp/filepreviews-elixir";
-            };
-          }
-      ) {};
-
-    filepreviews = filepreviews_1_0_1;
-
-    filtrex_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, timex_0_19_5 }:
-          buildMix {
-            name = "filtrex";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "filtrex";
-              version = "0.1.0";
-              sha256 =
-                "475187169e70534b3ba2db6f47656538deb2ff447744e4112cc1008414162e9c";
-            };
-            beamDeps  = [ timex_0_19_5 ];
-
-            meta = {
-              longDescription = ''A library for performing and validating
-                                complex filters from a client (e.g. smart
-                                filters)'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/rcdilorenzo/filtrex";
-            };
-          }
-      ) {};
-
-    filtrex = filtrex_0_1_0;
-
     finance_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, timex_1_0_2 }:
+          buildMix ({
             name = "finance";
             version = "0.0.1";
             src = fetchHex {
@@ -20224,55 +12041,22 @@ let
                                 bisection method using parallel processes.'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     finance = finance_0_0_1;
 
-    finch_0_0_3 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          postgrex_0_6_0,
-          phoenix_0_4_1,
-          ecto_0_2_4,
-          cowboy_1_0_4
-        }:
-          buildMix {
-            name = "finch";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "finch";
-              version = "0.0.3";
-              sha256 =
-                "48168045693af14b28263a5c121794dfcfb6da9eb33cc7a7eca93899668a2032";
-            };
-            beamDeps  = [
-                          postgrex_0_6_0 phoenix_0_4_1 ecto_0_2_4 cowboy_1_0_4
-                        ];
-
-            meta = {
-              longDescription = '' Resource layer for Phoenix and Ecto projects
-                                for auto-generated RESTful CRUD APIs. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/rozap/finch";
-            };
-          }
-      ) {};
-
-    finch = finch_0_0_3;
-
     finicity_0_0_5 = callPackage
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           xml_builder_0_0_8,
           httpotion_2_2_2,
           floki_0_8_0
         }:
-          buildMix {
+          buildMix ({
             name = "finicity";
             version = "0.0.5";
             src = fetchHex {
@@ -20287,40 +12071,15 @@ let
               description = ''Client library for Finicity.'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     finicity = finicity_0_0_5;
 
-    fireworks_0_5_1 = callPackage
-      (
-        {  buildMix, fetchHex, poolboy_1_5_1, amqp_0_1_4 }:
-          buildMix {
-            name = "fireworks";
-            version = "0.5.1";
-            src = fetchHex {
-              pkg = "fireworks";
-              version = "0.5.1";
-              sha256 =
-                "33beceafc10537c975b571617dfc5c000a8232c112c1383f52b9e6a12437f9ca";
-            };
-            beamDeps  = [ poolboy_1_5_1 amqp_0_1_4 ];
-
-            meta = {
-              description = ''Simple elixir work queue consumption for
-                            RabbitMQ'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/mobileoverlord/fireworks";
-            };
-          }
-      ) {};
-
-    fireworks = fireworks_0_5_1;
-
     firmata_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "firmata";
             version = "0.0.1";
             src = fetchHex {
@@ -20337,65 +12096,15 @@ let
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/kfatehi/firmata";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     firmata = firmata_0_0_1;
 
-    fitbit_0_0_1 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, hackney_1_4_10
-        }:
-          buildMix {
-            name = "fitbit";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "fitbit";
-              version = "0.0.1";
-              sha256 =
-                "dc09d3b6d37ea67d21a52a704bd52357daa223e18afe4831515730452b3ada25";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 hackney_1_4_10 ];
-
-            meta = {
-              description = ''A Fitbit Library for Elixir'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/trestrantham/fitbit";
-            };
-          }
-      ) {};
-
-    fitbit = fitbit_0_0_1;
-
-    fitex_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "fitex";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "fitex";
-              version = "0.0.1";
-              sha256 =
-                "5918d784a419fa1367606b6bc01b202febc3762b5b624e5829db636415041fcb";
-            };
-
-            meta = {
-              description = ''FitEx is a Macro-Module which provides a bit of
-                            sugar for function definitions.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/Puddah/FitEx";
-            };
-          }
-      ) {};
-
-    fitex = fitex_0_0_1;
-
     fixby_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "fixby";
             version = "0.0.1";
             src = fetchHex {
@@ -20411,15 +12120,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/CoderDennis/fixby-elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     fixby = fixby_0_0_1;
 
     fixme_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "fixme";
             version = "0.0.4";
             src = fetchHex {
@@ -20435,15 +12144,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/henrik/fixme-elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     fixme = fixme_0_0_4;
 
     flasked_0_3_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "flasked";
             version = "0.3.0";
             src = fetchHex {
@@ -20463,41 +12172,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/asaaki/flasked";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     flasked = flasked_0_3_0;
 
-    fleet_api_0_0_15 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_3_1, httpoison_0_7_1 }:
-          buildMix {
-            name = "fleet_api";
-            version = "0.0.15";
-            src = fetchHex {
-              pkg = "fleet_api";
-              version = "0.0.15";
-              sha256 =
-                "8aa8206a91129dab3b2a11ffd16b131ef1e37ceff633ed818616e96c8dca7957";
-            };
-            beamDeps  = [ poison_1_3_1 httpoison_0_7_1 ];
-
-            meta = {
-              longDescription = ''A simple wrapper for the Fleet API. Can be
-                                used with etcd tokens or via direct node
-                                URLs.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jordan0day/fleet-api.git";
-            };
-          }
-      ) {};
-
-    fleet_api = fleet_api_0_0_15;
-
     flock_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "flock";
             version = "0.0.1";
             src = fetchHex {
@@ -20512,15 +12195,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/chrismccord/flock";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     flock = flock_0_0_1;
 
     floki_0_0_5 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "floki";
             version = "0.0.5";
             src = fetchHex {
@@ -20536,59 +12219,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/philss/floki";
             };
-          }
-      ) {};
-
-    floki_0_1_1 = callPackage
-      (
-        {  buildMix, fetchHex, mochiweb_2_12_2 }:
-          buildMix {
-            name = "floki";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "floki";
-              version = "0.1.1";
-              sha256 =
-                "b608415520f6701acdbbffed86b62291b00ce695f7f3b067919594534c9858a9";
-            };
-            beamDeps  = [ mochiweb_2_12_2 ];
-
-            meta = {
-              description = ''Floki is a simple HTML parser that enables search
-                            for nodes using CSS selectors.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/philss/floki";
-            };
-          }
-      ) {};
-
-    floki_0_7_2 = callPackage
-      (
-        {  buildMix, fetchHex, mochiweb_2_12_2 }:
-          buildMix {
-            name = "floki";
-            version = "0.7.2";
-            src = fetchHex {
-              pkg = "floki";
-              version = "0.7.2";
-              sha256 =
-                "c7078ac2a54501a16ff469c78292bac5013e457ffa8801b74bc293616aa5b0d0";
-            };
-            beamDeps  = [ mochiweb_2_12_2 ];
-
-            meta = {
-              description = ''Floki is a simple HTML parser that enables search
-                            for nodes using CSS selectors.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/philss/floki";
-            };
-          }
+          } // packageOverrides)
       ) {};
 
     floki_0_8_0 = callPackage
       (
-        {  buildMix, fetchHex, mochiweb_html_2_13_0 }:
-          buildMix {
+        {
+          buildMix, packageOverrides ? {}, fetchHex, mochiweb_html_2_13_0
+        }:
+          buildMix ({
             name = "floki";
             version = "0.8.0";
             src = fetchHex {
@@ -20605,7 +12244,7 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/philss/floki";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     floki = floki_0_8_0;
@@ -20614,6 +12253,7 @@ let
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           xml_builder_0_0_8,
           tzdata_0_1_201603,
@@ -20622,7 +12262,7 @@ let
           poison_1_5_2,
           httpotion_2_2_2
         }:
-          buildMix {
+          buildMix ({
             name = "floorplan";
             version = "0.1.1";
             src = fetchHex {
@@ -20646,68 +12286,15 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/househappy/floorplan";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     floorplan = floorplan_0_1_1;
 
-    flower_power_0_3_2 = callPackage
-      (
-        {
-          buildMix, fetchHex, timex_1_0_2, poison_1_5_2, httpoison_0_7_5
-        }:
-          buildMix {
-            name = "flower_power";
-            version = "0.3.2";
-            src = fetchHex {
-              pkg = "flower_power";
-              version = "0.3.2";
-              sha256 =
-                "f0b7d14fbe0ea78225f3b8424bc907ca6d977576d974b57dcd860afa8ed426a8";
-            };
-            beamDeps  = [ timex_1_0_2 poison_1_5_2 httpoison_0_7_5 ];
-
-            meta = {
-              description = ''Api client for flower power cloud api'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/Korbin73/FlowerPower";
-            };
-          }
-      ) {};
-
-    flower_power = flower_power_0_3_2;
-
-    fluent_client_0_1_0 = callPackage
-      (
-        {
-          buildMix, fetchHex, socket_0_2_8, poison_1_3_1, msgpax_0_7_1
-        }:
-          buildMix {
-            name = "fluent_client";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "fluent_client";
-              version = "0.1.0";
-              sha256 =
-                "df1d05da9475938422a734cd311564eef44bfebea3c37b06ab167368875c2d15";
-            };
-            beamDeps  = [ socket_0_2_8 poison_1_3_1 msgpax_0_7_1 ];
-
-            meta = {
-              description = ''fluentd client library'';
-              license = stdenv.lib.licenses.asl20;
-              homepage =
-                "https://github.com/trustatom-oss/elixir-fluent-client";
-            };
-          }
-      ) {};
-
-    fluent_client = fluent_client_0_1_0;
-
     fluxter_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "fluxter";
             version = "0.2.0";
             src = fetchHex {
@@ -20722,15 +12309,15 @@ let
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/lexmag/fluxter";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     fluxter = fluxter_0_2_0;
 
     fn_1_0_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "fn";
             version = "1.0.0";
             src = fetchHex {
@@ -20745,15 +12332,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/artemeff/fn";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     fn = fn_1_0_0;
 
     fnv_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex, hexate_0_5_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, hexate_0_5_1 }:
+          buildMix ({
             name = "fnv";
             version = "0.2.1";
             src = fetchHex {
@@ -20770,15 +12357,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/asaaki/fnv.ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     fnv = fnv_0_2_1;
 
     folsom_0_8_3 = callPackage
       (
-        {  buildRebar3, fetchHex, bear_0_8_3 }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex, bear_0_8_3 }:
+          buildRebar3 ({
             name = "folsom";
             version = "0.8.3";
             src = fetchHex {
@@ -20794,40 +12381,15 @@ let
               description = ''Erlang based metrics system'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     folsom = folsom_0_8_3;
 
-    folsom_ddb_0_1_22 = callPackage
-      (
-        {  buildRebar3, fetchHex, ddb_client_0_1_17 }:
-          buildRebar3 {
-            name = "folsom_ddb";
-            version = "0.1.22";
-            src = fetchHex {
-              pkg = "folsom_ddb";
-              version = "0.1.22";
-              sha256 =
-                "8b2c5b674b993738f22ff265159e6d71d6640632ed98e9c1cd3daef15b586e46";
-            };
-
-            beamDeps  = [ ddb_client_0_1_17 ];
-
-            meta = {
-              description = ''DalmatinerDB backend to store folsom metrics'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/dalmatinerdb/folsom_ddb";
-            };
-          }
-      ) {};
-
-    folsom_ddb = folsom_ddb_0_1_22;
-
     folsomite_1_2_8 = callPackage
       (
-        {  buildRebar3, fetchHex, folsom_0_8_3 }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex, folsom_0_8_3 }:
+          buildRebar3 ({
             name = "folsomite";
             version = "1.2.8";
             src = fetchHex {
@@ -20844,115 +12406,15 @@ let
                             metrics'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     folsomite = folsomite_1_2_8;
 
-    font_awesome_phoenix_0_3_2 = callPackage
-      (
-        {  buildMix, fetchHex, phoenix_html_2_5_1 }:
-          buildMix {
-            name = "font_awesome_phoenix";
-            version = "0.3.2";
-            src = fetchHex {
-              pkg = "font_awesome_phoenix";
-              version = "0.3.2";
-              sha256 =
-                "826dd9e0400351cb539ccced605455d8da25490fd37a75085eb68fa133e65f34";
-            };
-            beamDeps  = [ phoenix_html_2_5_1 ];
-
-            meta = {
-              description = ''HTML helper functions to build Font Awesome icon
-                            tags.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/code-lever/font-awesome-phoenix";
-            };
-          }
-      ) {};
-
-    font_awesome_phoenix = font_awesome_phoenix_0_3_2;
-
-    forcex_0_2_0 = callPackage
-      (
-        {
-          buildMix, fetchHex, timex_1_0_2, httpoison_0_8_2, exjsx_3_2_0
-        }:
-          buildMix {
-            name = "forcex";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "forcex";
-              version = "0.2.0";
-              sha256 =
-                "31c6bd2d550193983812a5e8c4ed53d5d6be0fe30ce6628d62828f00544a7a4b";
-            };
-            beamDeps  = [ timex_1_0_2 httpoison_0_8_2 exjsx_3_2_0 ];
-
-            meta = {
-              description = ''Elixir library for the Force.com / SalesForce /
-                            SFDC REST API'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jeffweiss/forcex";
-            };
-          }
-      ) {};
-
-    forcex = forcex_0_2_0;
-
-    forecast_io_0_2_1 = callPackage
-      (
-        {  buildMix, fetchHex, json_0_3_3, httpotion_2_2_2 }:
-          buildMix {
-            name = "forecast_io";
-            version = "0.2.1";
-            src = fetchHex {
-              pkg = "forecast_io";
-              version = "0.2.1";
-              sha256 =
-                "e109212dcd55c7d94bf9d85c1d6ee6687d35eb065335df13fc105fc242506c09";
-            };
-            beamDeps  = [ json_0_3_3 httpotion_2_2_2 ];
-
-            meta = {
-              description = ''Simple wrapper for Forecast.IO API '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/r-icarus/forecast_io";
-            };
-          }
-      ) {};
-
-    forecast_io = forecast_io_0_2_1;
-
-    form_data_0_1_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "form_data";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "form_data";
-              version = "0.1.1";
-              sha256 =
-                "0fdc822ba56e8bb9cd945c79105572a50144f16d096a95ca4ac9fe2d754862dc";
-            };
-
-            meta = {
-              description = ''Build a multipart/form-data form struct in
-                            Elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jinze/form_data";
-            };
-          }
-      ) {};
-
-    form_data = form_data_0_1_1;
-
     forms_0_0_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "forms";
             version = "0.0.1";
             src = fetchHex {
@@ -20962,122 +12424,24 @@ let
                 "530f63ed8ed5a171f744fc75bd69cb2e36496899d19dbef48101b4636b795868";
             };
 
+            buildPlugins  = [ rebar3_hex ];
+
+
             meta = {
               description = ''Toolbox that simplifies working with Erlang`s
                             abstract format'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/efcasado/forms";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     forms = forms_0_0_1;
 
-    fox_0_1_12 = callPackage
-      (
-        {  buildMix, fetchHex, timex_2_1_3, ecto_2_0_0_beta_2 }:
-          buildMix {
-            name = "fox";
-            version = "0.1.12";
-            src = fetchHex {
-              pkg = "fox";
-              version = "0.1.12";
-              sha256 =
-                "3b4fe9b49422d99e0c888ca839e828b70b4334637f443a14afc941be5e6a847e";
-            };
-            beamDeps  = [ timex_2_1_3 ecto_2_0_0_beta_2 ];
-
-            meta = {
-              longDescription = ''Collection of support utility functions and
-                                extensions for day-to-day web development with
-                                Elixir. Includes utility extension to strings,
-                                uri, dicts, integers, functions, parallel,
-                                records, random, and time'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/foxnewsnetwork/fox";
-            };
-          }
-      ) {};
-
-    fox = fox_0_1_12;
-
-    fqc_0_1_7 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "fqc";
-            version = "0.1.7";
-            src = fetchHex {
-              pkg = "fqc";
-              version = "0.1.7";
-              sha256 =
-                "b6873982bad60a34553b00435848521f5178b5508eeded8dfa0d8b2e00846e8e";
-            };
-
-            meta = {
-              description = ''FiFo EQC helper'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/project-fifo/fqc";
-            };
-          }
-      ) {};
-
-    fqc = fqc_0_1_7;
-
-    frank_0_0_3 = callPackage
-      (
-        {  buildMix, fetchHex, amqp_0_1_4 }:
-          buildMix {
-            name = "frank";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "frank";
-              version = "0.0.3";
-              sha256 =
-                "f5f19c57aa763b483af80329f54e2de55b1fcb1dde5c304eed97fbde9ca2ce7d";
-            };
-            beamDeps  = [ amqp_0_1_4 ];
-
-            meta = {
-              description = ''Simple Elixir client for RabbitMQ built on top of
-                            AMQP.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/triptec/frank";
-            };
-          }
-      ) {};
-
-    frank = frank_0_0_3;
-
-    freegeoip_0_0_4 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "freegeoip";
-            version = "0.0.4";
-            src = fetchHex {
-              pkg = "freegeoip";
-              version = "0.0.4";
-              sha256 =
-                "6776938ddc1318ee8a34ef6e3a5dcb85013bbb27feeae3c7d65487ff17e2b558";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Simple Elixir wrapper for freegeoip.net HTTP
-                            API.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/juljimm/freegeoip-elixir";
-            };
-          }
-      ) {};
-
-    freegeoip = freegeoip_0_0_4;
-
     friendly_1_0_1 = callPackage
       (
-        {  buildMix, fetchHex, floki_0_8_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, floki_0_8_0 }:
+          buildMix ({
             name = "friendly";
             version = "1.0.1";
             src = fetchHex {
@@ -21095,15 +12459,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/qertoip/friendly/";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     friendly = friendly_1_0_1;
 
     fs_0_9_2 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "fs";
             version = "0.9.2";
             src = fetchHex {
@@ -21118,15 +12482,15 @@ let
               description = ''FS VXZ Listener'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     fs = fs_0_9_2;
 
     fsm_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "fsm";
             version = "0.2.0";
             src = fetchHex {
@@ -21142,44 +12506,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/sasa1977/fsm";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     fsm = fsm_0_2_0;
 
-    fulcrum_0_0_6 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "fulcrum";
-            version = "0.0.6";
-            src = fetchHex {
-              pkg = "fulcrum";
-              version = "0.0.6";
-              sha256 =
-                "9cddd3906bad693cad791841d19b2be089e064a5f2dd35d340f46e6cd15d7930";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              longDescription = ''Fulcrum library for Elixir. The aim is to
-                                present the Fulcrum API as a replacement for an
-                                Ecto Repo. So, instead of Repo.all(Form), you
-                                can write Fulcrum.all(Form). In this way, you
-                                only have to make minor changes to your
-                                controllers, to work with Fulcrum.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/pinx/fulcrum";
-            };
-          }
-      ) {};
-
-    fulcrum = fulcrum_0_0_6;
-
     fumanchu_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "fumanchu";
             version = "0.0.1";
             src = fetchHex {
@@ -21194,15 +12529,15 @@ let
                             written in Elixir'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     fumanchu = fumanchu_0_0_1;
 
     function_decorating_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "function_decorating";
             version = "0.0.1";
             src = fetchHex {
@@ -21220,49 +12555,15 @@ let
               homepage =
                 "https://github.com/elpddev/elixir-function-decorating";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     function_decorating = function_decorating_0_0_1;
 
-    funnel_0_4_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poolboy_1_5_1,
-          httpoison_0_8_2,
-          uuid_1_0_0,
-          poison_1_5_2
-        }:
-          buildMix {
-            name = "funnel";
-            version = "0.4.1";
-            src = fetchHex {
-              pkg = "funnel";
-              version = "0.4.1";
-              sha256 =
-                "84b937146c9464afc2a92e53aa0109de60caef599f82613fdcd4dc3e864025d7";
-            };
-            beamDeps  = [
-                          poolboy_1_5_1 httpoison_0_8_2 uuid_1_0_0 poison_1_5_2
-                        ];
-
-            meta = {
-              description = ''Streaming API built upon ElasticSearch`s
-                            percolation. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/af83/funnel";
-            };
-          }
-      ) {};
-
-    funnel = funnel_0_4_1;
-
     fuse_2_2_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "fuse";
             version = "2.2.0";
             src = fetchHex {
@@ -21277,15 +12578,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/jlouis/fuse";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     fuse = fuse_2_2_0;
 
     fuzzyurl_0_8_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "fuzzyurl";
             version = "0.8.1";
             src = fetchHex {
@@ -21301,15 +12602,21 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/gamache/fuzzyurl.ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     fuzzyurl = fuzzyurl_0_8_1;
 
     fwatch_0_5_0 = callPackage
       (
-        {  buildMix, fetchHex, fs_0_9_2, earmark_0_2_1 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          fs_0_9_2,
+          earmark_0_2_1
+        }:
+          buildMix ({
             name = "fwatch";
             version = "0.5.0";
             src = fetchHex {
@@ -21325,43 +12632,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ryo33/fwatch-ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     fwatch = fwatch_0_5_0;
 
-    gateway_0_0_6 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2, fox_0_1_12
-        }:
-          buildMix {
-            name = "gateway";
-            version = "0.0.6";
-            src = fetchHex {
-              pkg = "gateway";
-              version = "0.0.6";
-              sha256 =
-                "4d0de05b0168ee0cc41c9c38491a4b4641d446f38170ca170d0d7440b0c8f619";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 fox_0_1_12 ];
-
-            meta = {
-              longDescription = ''A generic set of macros and conventions to
-                                build clients to communicate with JSON REST
-                                APIs'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/foxnewsnetwork/gateway";
-            };
-          }
-      ) {};
-
-    gateway = gateway_0_0_6;
-
     gb2260_0_4_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
+          buildMix ({
             name = "gb2260";
             version = "0.4.0";
             src = fetchHex {
@@ -21378,66 +12657,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/LcpMarvel/gb2260";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     gb2260 = gb2260_0_4_0;
 
-    gcm_1_2_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "gcm";
-            version = "1.2.0";
-            src = fetchHex {
-              pkg = "gcm";
-              version = "1.2.0";
-              sha256 =
-                "281d5c2dc94a24382292f6fbfe7348316e8afa0a40285978f03e7dcae068170a";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''GCM library to send pushes through GCM'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/carnivalmobile/gcm";
-            };
-          }
-      ) {};
-
-    gcm = gcm_1_2_0;
-
-    gcmex_0_0_1 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5, earmark_0_2_1
-        }:
-          buildMix {
-            name = "gcmex";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "gcmex";
-              version = "0.0.1";
-              sha256 =
-                "92f3bbafd7ad0718490d1bdc10d4a2aa5ee7167c144bfe6584cf4260ab6feeab";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 earmark_0_2_1 ];
-
-            meta = {
-              description = ''Google Cloud Messaging client library for
-                            elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/dukex/gcmex";
-            };
-          }
-      ) {};
-
-    gcmex = gcmex_0_0_1;
-
     gealts_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "gealts";
             version = "0.0.1";
             src = fetchHex {
@@ -21452,15 +12680,15 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/0010-IO/gealts";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     gealts = gealts_0_0_1;
 
     gelf_logger_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
+          buildMix ({
             name = "gelf_logger";
             version = "0.2.0";
             src = fetchHex {
@@ -21478,15 +12706,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/jschniper/gelf_logger";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     gelf_logger = gelf_logger_0_2_0;
 
     gelfex_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, connection_1_0_2 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          connection_1_0_2
+        }:
+          buildMix ({
             name = "gelfex";
             version = "0.0.1";
             src = fetchHex {
@@ -21503,15 +12737,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/donpinkster/gelfex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     gelfex = gelfex_0_0_1;
 
     gen_leader_0_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "gen_leader";
             version = "0.1.0";
             src = fetchHex {
@@ -21521,20 +12755,23 @@ let
                 "31340f49935767f12b639b69cdc585f26ebcc1802ba46b33555b229da2366207";
             };
 
+            buildPlugins  = [ rebar3_hex ];
+
+
             meta = {
               description = ''The gen_leader behaviour'';
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/knusbaum/gen_leader_revival";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     gen_leader = gen_leader_0_1_0;
 
     gen_listener_tcp_0_3_2 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "gen_listener_tcp";
             version = "0.3.2";
             src = fetchHex {
@@ -21549,41 +12786,15 @@ let
 
               homepage = "https://github.com/travelping/gen_listener_tcp";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     gen_listener_tcp = gen_listener_tcp_0_3_2;
 
-    gen_rpc_1_0_2 = callPackage
-      (
-        {  buildRebar3, fetchHex, lager_3_0_2 }:
-          buildRebar3 {
-            name = "gen_rpc";
-            version = "1.0.2";
-            src = fetchHex {
-              pkg = "gen_rpc";
-              version = "1.0.2";
-              sha256 =
-                "2e7669c865be0051d322c092f83c0eadefeb04698098ee4b80cc43f60d39f5dd";
-            };
-
-            beamDeps  = [ lager_3_0_2 ];
-
-            meta = {
-              description = ''A scalable RPC library for Erlang-VM based
-                            languages'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/priestjim/gen_rpc";
-            };
-          }
-      ) {};
-
-    gen_rpc = gen_rpc_1_0_2;
-
     gen_smtp_0_9_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "gen_smtp";
             version = "0.9.0";
             src = fetchHex {
@@ -21600,15 +12811,15 @@ let
 
               homepage = "https://github.com/Vagabond/gen_smtp";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     gen_smtp = gen_smtp_0_9_0;
 
     gendex_0_5_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "gendex";
             version = "0.5.1";
             src = fetchHex {
@@ -21624,46 +12835,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/dre1080/gendex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     gendex = gendex_0_5_1;
 
-    geo_1_0_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          postgrex_0_11_1,
-          poison_1_0_3,
-          ecto_2_0_0_beta_2
-        }:
-          buildMix {
-            name = "geo";
-            version = "1.0.1";
-            src = fetchHex {
-              pkg = "geo";
-              version = "1.0.1";
-              sha256 =
-                "c0ab2df75521a2f50ff339294ff914b3a71e4f3753c5a82851457e0d40bb2e9c";
-            };
-            beamDeps  = [ postgrex_0_11_1 poison_1_0_3 ecto_2_0_0_beta_2 ];
-
-            meta = {
-              description = ''PostGIS extension for Postgrex. Also encodes and
-                            decodes WKB, WKT, and GeoJSON.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bryanjos/geo";
-            };
-          }
-      ) {};
-
-    geo = geo_1_0_1;
-
     geocalc_0_4_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "geocalc";
             version = "0.4.0";
             src = fetchHex {
@@ -21679,49 +12859,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/yltsrc/geocalc";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     geocalc = geocalc_0_4_0;
 
-    geocoder_0_4_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          towel_0_2_1,
-          poolboy_1_5_1,
-          poison_1_5_2,
-          httpoison_0_8_2
-        }:
-          buildMix {
-            name = "geocoder";
-            version = "0.4.0";
-            src = fetchHex {
-              pkg = "geocoder";
-              version = "0.4.0";
-              sha256 =
-                "67c45859114f5b82949cb98b75cfc862d739a5212164e4147552c6b3701cc975";
-            };
-            beamDeps  = [
-                          towel_0_2_1 poolboy_1_5_1 poison_1_5_2 httpoison_0_8_2
-                        ];
-
-            meta = {
-              description = ''A simple, efficient geocoder/reverse geocoder
-                            with a built-in cache.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/knrz/geocoder";
-            };
-          }
-      ) {};
-
-    geocoder = geocoder_0_4_0;
-
     geohash_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "geohash";
             version = "0.1.1";
             src = fetchHex {
@@ -21737,15 +12883,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/polmuz/elixir-geohash";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     geohash = geohash_0_1_1;
 
     geolix_0_9_0 = callPackage
       (
-        {  buildMix, fetchHex, poolboy_1_5_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poolboy_1_5_1 }:
+          buildMix ({
             name = "geolix";
             version = "0.9.0";
             src = fetchHex {
@@ -21761,15 +12907,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/mneudert/geolix";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     geolix = geolix_0_9_0;
 
     getopt_0_8_2 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "getopt";
             version = "0.8.2";
             src = fetchHex {
@@ -21784,15 +12930,15 @@ let
 
               homepage = "https://github.com/jcomellas/getopt";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     getopt = getopt_0_8_2;
 
     gettext_0_10_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "gettext";
             version = "0.10.0";
             src = fetchHex {
@@ -21808,15 +12954,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/elixir-lang/gettext";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     gettext = gettext_0_10_0;
 
     gh_webhook_plug_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "gh_webhook_plug";
             version = "0.0.2";
             src = fetchHex {
@@ -21834,15 +12980,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/emilsoman/gh_webhook_plug";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     gh_webhook_plug = gh_webhook_plug_0_0_2;
 
     gibran_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "gibran";
             version = "0.0.2";
             src = fetchHex {
@@ -21857,86 +13003,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/abitdodgy/gibran";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     gibran = gibran_0_0_2;
 
-    gil_0_0_3 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_7_5, floki_0_8_0 }:
-          buildMix {
-            name = "gil";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "gil";
-              version = "0.0.3";
-              sha256 =
-                "5235fdfd30513bd5d75a93272fc952f3ae1c0746e400591c244383d8f0fe9403";
-            };
-            beamDeps  = [ httpoison_0_7_5 floki_0_8_0 ];
-
-            meta = {
-              description = ''"Mix custome task for check exchange rate"'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/modalsoul/gil";
-            };
-          }
-      ) {};
-
-    gil = gil_0_0_3;
-
-    gimei_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "gimei";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "gimei";
-              version = "0.0.2";
-              sha256 =
-                "858aab561bc200358ee7098c80ea91d8c7e38b0058c55b1e4df28f5e5a27db7c";
-            };
-
-            meta = {
-              description = ''Gimei is a pure Elixir library for genrating
-                            Japanese fake data.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/KazuCocoa/elixir-gimei";
-            };
-          }
-      ) {};
-
-    gimei = gimei_0_0_2;
-
-    gimei_ex_1_0_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "gimei_ex";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "gimei_ex";
-              version = "1.0.0";
-              sha256 =
-                "21dd295d7beae218cc947d649d62d990aa2931d844c15e367528d68926a21987";
-            };
-
-            meta = {
-              description = ''Elixir port of gimei library'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ma2gedev/gimei_ex";
-            };
-          }
-      ) {};
-
-    gimei_ex = gimei_ex_1_0_0;
-
     git_cli_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "git_cli";
             version = "0.2.0";
             src = fetchHex {
@@ -21951,15 +13026,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/tuvistavie/elixir-git-cli";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     git_cli = git_cli_0_2_0;
 
     gitex_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "gitex";
             version = "0.1.0";
             src = fetchHex {
@@ -21976,13 +13051,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/awetzel/gitex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     gitex_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "gitex";
             version = "0.2.0";
             src = fetchHex {
@@ -21999,89 +13074,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/awetzel/gitex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     gitex = gitex_0_2_0;
 
-    github_oauth_0_1_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "github_oauth";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "github_oauth";
-              version = "0.1.1";
-              sha256 =
-                "4e68983af9ed8146a2505ad759cb151c3202471285f07df6132a4acd47aa91f2";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''simple github oauth library'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/lidashuang/github_oauth";
-            };
-          }
-      ) {};
-
-    github_oauth = github_oauth_0_1_1;
-
-    github_trend_ex_0_1_2 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2, floki_0_8_0 }:
-          buildMix {
-            name = "github_trend_ex";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "github_trend_ex";
-              version = "0.1.2";
-              sha256 =
-                "019565ad8efe6c25414dcddc6a7fc99e34f0ff457989ec7b5ad03b79b0c8ca8b";
-            };
-            beamDeps  = [ httpoison_0_8_2 floki_0_8_0 ];
-
-            meta = {
-              description = ''Get trend repositories from Github.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/KazuCocoa/github_trend_ex";
-            };
-          }
-      ) {};
-
-    github_trend_ex = github_trend_ex_0_1_2;
-
-    gizoogle_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2 }:
-          buildMix {
-            name = "gizoogle";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "gizoogle";
-              version = "0.0.2";
-              sha256 =
-                "c22d720fc60df8670a194c6ed1fb17fe272a7560b478037aef4a1437331f60e3";
-            };
-            beamDeps  = [ httpoison_0_8_2 ];
-
-            meta = {
-              longDescription = ''Uses Gizoogle ta allow you ta drop a rhyme
-                                like a thug n` retrieve links fo` translated
-                                sitez'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/notdevinclark/gizoogle";
-            };
-          }
-      ) {};
-
-    gizoogle = gizoogle_0_0_2;
-
     glitchylicious_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "glitchylicious";
             version = "0.0.1";
             src = fetchHex {
@@ -22096,15 +13097,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/0010-IO/glitchylicious";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     glitchylicious = glitchylicious_0_0_1;
 
     global_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "global";
             version = "1.0.0";
             src = fetchHex {
@@ -22120,15 +13121,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/mgwidmann/global";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     global = global_1_0_0;
 
     gm_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "gm";
             version = "0.0.2";
             src = fetchHex {
@@ -22143,68 +13144,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/utkarshkukreti/gm.ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     gm = gm_0_0_2;
 
-    gmail_0_1_8 = callPackage
-      (
-        {
-          buildMix, fetchHex, timex_2_1_3, poison_2_1_0, httpoison_0_8_2
-        }:
-          buildMix {
-            name = "gmail";
-            version = "0.1.8";
-            src = fetchHex {
-              pkg = "gmail";
-              version = "0.1.8";
-              sha256 =
-                "d307c44c9241730fa96d5dbab796295f3d55980465faddf610bf962cd359cbcf";
-            };
-            beamDeps  = [ timex_2_1_3 poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''A simple Gmail REST API client for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/craigp/elixir-gmail";
-            };
-          }
-      ) {};
-
-    gmail = gmail_0_1_8;
-
-    gold_0_12_0 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, decimal_1_1_1
-        }:
-          buildMix {
-            name = "gold";
-            version = "0.12.0";
-            src = fetchHex {
-              pkg = "gold";
-              version = "0.12.0";
-              sha256 =
-                "fba43501f6c25116c29358c4b5494de5e078cc516572045ac73a7944b918105b";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 decimal_1_1_1 ];
-
-            meta = {
-              description = ''An Elixir library to interface with the Bitcoin
-                            core JSON-RPC API.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/solatis/gold";
-            };
-          }
-      ) {};
-
-    gold = gold_0_12_0;
-
     goldrush_0_1_7 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "goldrush";
             version = "0.1.7";
             src = fetchHex {
@@ -22220,15 +13168,15 @@ let
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/DeadZen/goldrush";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     goldrush = goldrush_0_1_7;
 
     good_enough_geoid_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, csv_1_3_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, csv_1_3_3 }:
+          buildMix ({
             name = "good_enough_geoid";
             version = "0.0.2";
             src = fetchHex {
@@ -22246,15 +13194,15 @@ let
               homepage =
                 "https://github.com/code-lever/good-enough-geoid-elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     good_enough_geoid = good_enough_geoid_0_0_2;
 
     good_times_1_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "good_times";
             version = "1.1.1";
             src = fetchHex {
@@ -22269,7 +13217,7 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/DevL/good_times";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     good_times = good_times_1_1_1;
@@ -22278,13 +13226,14 @@ let
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           plug_1_1_3,
           module_mocker_0_2_0,
           cowboy_1_0_4,
           access_token_extractor_0_1_1
         }:
-          buildMix {
+          buildMix ({
             name = "google_auth";
             version = "0.0.2";
             src = fetchHex {
@@ -22309,147 +13258,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/rohanpujaris/google_auth";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     google_auth = google_auth_0_0_2;
 
-    google_sheets_2_0_5 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          sweet_xml_0_6_1,
-          httpoison_0_8_2,
-          hackney_1_6_0
-        }:
-          buildMix {
-            name = "google_sheets";
-            version = "2.0.5";
-            src = fetchHex {
-              pkg = "google_sheets";
-              version = "2.0.5";
-              sha256 =
-                "aeaaab3e2df75289cf14740a76b014652fb77a5ef95be3921fc36f4165812682";
-            };
-            beamDeps  = [ sweet_xml_0_6_1 httpoison_0_8_2 hackney_1_6_0 ];
-
-            meta = {
-              description = ''OTP application for fetching and polling Google
-                            spreadsheet data in CSV format.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/GrandCru/GoogleSheets";
-            };
-          }
-      ) {};
-
-    google_sheets = google_sheets_2_0_5;
-
-    goth_0_0_3 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poison_1_5_2,
-          json_web_token_0_2_4,
-          httpoison_0_8_2
-        }:
-          buildMix {
-            name = "goth";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "goth";
-              version = "0.0.3";
-              sha256 =
-                "0bbf59ae842dc4518cf42123b0fb0d0255bcb72ea37c8ec13bab2efe2339ccc3";
-            };
-            beamDeps  = [ poison_1_5_2 json_web_token_0_2_4 httpoison_0_8_2
-                      ];
-
-            meta = {
-              longDescription = ''A simple library to generate and retrieve
-                                Oauth2 tokens for use with Google Cloud Service
-                                accounts.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/peburrows/goth";
-            };
-          }
-      ) {};
-
-    goth = goth_0_0_3;
-
-    gpb_3_18_10 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "gpb";
-            version = "3.18.10";
-            src = fetchHex {
-              pkg = "gpb";
-              version = "3.18.10";
-              sha256 =
-                "caf6833ca216a08246efe660393f3bce291d46dc873ec3588f11e4c112030714";
-            };
-
-            meta = {
-              description = ''A compiler for Google protocol buffer definitions
-                            files for Erlang.'';
-              license = stdenv.lib.licenses.lpgl1;
-              homepage = "https://github.com/tomas-abrahamsson/gpb";
-            };
-          }
-      ) {};
-
-    gpb_3_18_8 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "gpb";
-            version = "3.18.8";
-            src = fetchHex {
-              pkg = "gpb";
-              version = "3.18.8";
-              sha256 =
-                "44af8eadd3edc030684d36ea6964926af6d95aa32e105a02fcc2cd2e1b436694";
-            };
-
-            meta = {
-              description = ''A compiler for Google protocol buffer definitions
-                            files for Erlang.'';
-              license = stdenv.lib.licenses.lpgl1;
-              homepage = "https://github.com/tomas-abrahamsson/gpb";
-            };
-          }
-      ) {};
-
-    gpb_3_20_0 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "gpb";
-            version = "3.20.0";
-            src = fetchHex {
-              pkg = "gpb";
-              version = "3.20.0";
-              sha256 =
-                "d83eb25783fdc3f10b4f8e00c8434453a260958c696efa85fee53ed3a9447e83";
-            };
-
-            meta = {
-              description = ''A compiler for Google protocol buffer definitions
-                            files for Erlang.'';
-              license = stdenv.lib.licenses.lpgl1;
-              homepage = "https://github.com/tomas-abrahamsson/gpb";
-            };
-          }
-      ) {};
-
-    gpb = gpb_3_20_0;
-
     gproc_0_3_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "gproc";
             version = "0.3.1";
             src = fetchHex {
@@ -22479,13 +13296,13 @@ let
               license = stdenv.lib.licenses.epl10;
               homepage = "https://github.com/uwiger/gproc";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     gproc_0_5_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "gproc";
             version = "0.5.0";
             src = fetchHex {
@@ -22515,15 +13332,15 @@ let
               license = stdenv.lib.licenses.epl10;
               homepage = "https://github.com/uwiger/gproc";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     gproc = gproc_0_5_0;
 
     graphex_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "graphex";
             version = "0.2.1";
             src = fetchHex {
@@ -22538,15 +13355,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/stocks29/graphex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     graphex = graphex_0_2_1;
 
     graphmath_1_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "graphmath";
             version = "1.0.2";
             src = fetchHex {
@@ -22562,15 +13379,15 @@ let
               license = with stdenv.lib.licenses; [ free wtfpl free ];
               homepage = "https://github.com/crertel/graphmath";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     graphmath = graphmath_1_0_2;
 
     graphql_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "graphql";
             version = "0.2.0";
             src = fetchHex {
@@ -22585,15 +13402,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/graphql-elixir/graphql";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     graphql = graphql_0_2_0;
 
     graphql_ex_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "graphql_ex";
             version = "0.0.1";
             src = fetchHex {
@@ -22603,64 +13420,15 @@ let
                 "51884d5275d354b915db03eb390e858ead88b3f3e4f699b2fa7dc8eb442bc343";
             };
              meta = {    };
-          }
+          } // packageOverrides)
       ) {};
 
     graphql_ex = graphql_ex_0_0_1;
 
-    graphql_parser_0_0_3 = callPackage
-      (
-        {  buildErlangMk, fetchHex, poison_1_5_2 }:
-          buildErlangMk {
-            name = "graphql_parser";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "graphql_parser";
-              version = "0.0.3";
-              sha256 =
-                "c54d6d3a4d5daba22559bc306e3e52cb8d78d3a93738f615c16e405ad56ac6a9";
-            };
-            beamDeps  = [ poison_1_5_2 ];
-
-            meta = {
-              longDescription = ''An elixir interface for libgraphqlparser
-                                implemented as a NIF for parsing GraphQL.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/aarvay/graphql_parser";
-            };
-          }
-      ) {};
-
-    graphql_parser = graphql_parser_0_0_3;
-
-    graphql_relay_0_0_16 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_0_3, graphql_0_2_0, ecto_1_1_5 }:
-          buildMix {
-            name = "graphql_relay";
-            version = "0.0.16";
-            src = fetchHex {
-              pkg = "graphql_relay";
-              version = "0.0.16";
-              sha256 =
-                "70c84b22afba3dc47c0a68c4ba58f7f4319d1ef55c8a85364fc05e05bcaf97af";
-            };
-            beamDeps  = [ poison_1_0_3 graphql_0_2_0 ecto_1_1_5 ];
-
-            meta = {
-              description = ''Elixir implementation of Relay for GraphQL'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/graphql-elixir/graphql_relay";
-            };
-          }
-      ) {};
-
-    graphql_relay = graphql_relay_0_0_16;
-
     gravatarify_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "gravatarify";
             version = "0.1.0";
             src = fetchHex {
@@ -22675,15 +13443,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/shiroyasha/gravatarify";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     gravatarify = gravatarify_0_1_0;
 
     gray_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "gray";
             version = "0.0.2";
             src = fetchHex {
@@ -22699,43 +13467,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/hashd/gray";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     gray = gray_0_0_2;
 
-    group_manager_0_0_8 = callPackage
-      (
-        {  buildMix, fetchHex, chatter_0_0_14 }:
-          buildMix {
-            name = "group_manager";
-            version = "0.0.8";
-            src = fetchHex {
-              pkg = "group_manager";
-              version = "0.0.8";
-              sha256 =
-                "69d9de842663ed764a8f6792c6a0f5a378e717e302058b9050b4a58be0d14cdf";
-            };
-            beamDeps  = [ chatter_0_0_14 ];
-
-            meta = {
-              longDescription = ''GroupManager is extracted from the ScaleSmall
-                                project as a standalone piece. This can be used
-                                independently to manage a set of nodes and
-                                coordinate a common goal expressed as integer
-                                ranges.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/dbeck/groupman_ex/";
-            };
-          }
-      ) {};
-
-    group_manager = group_manager_0_0_8;
-
     growl_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "growl";
             version = "0.0.2";
             src = fetchHex {
@@ -22750,19 +13490,20 @@ let
                                 interface for the [Growl OSX notification
                                 system](http://growl.info/). ## Setup ```Elixir
                                 defp deps do [ {:growl, github:
-                                "zhallett/growl"} ] ``` ## Usage Within the
+                                \"zhallett/growl\"} ] ``` ## Usage Within the
                                 script you would like to create a `growl`
                                 notification, make the module call as follows:
-                                ```Elixir Growl.notify("This is a notification")
-                                ``` The API accepts messages in a string format,
-                                as well as a list. If the first argument is a
-                                list, the first object is the title line, with
-                                subsequent lines being the body of the
-                                notification. ```Elixir Growl.notify(["Example",
-                                "This is an example notification"]) ``` would
-                                give the following notification: ![Forced
+                                ```Elixir Growl.notify(\"This is a
+                                notification\") ``` The API accepts messages in
+                                a string format, as well as a list. If the first
+                                argument is a list, the first object is the
+                                title line, with subsequent lines being the body
+                                of the notification. ```Elixir
+                                Growl.notify([\"Example\", \"This is an example
+                                notification\"]) ``` would give the following
+                                notification: ![Forced
                                 Update](https://github.com/zhallett/growl/blob/master/multi_line_notification.png?raw=true
-                                "Multi-Line notification Screenshot")) ##
+                                \"Multi-Line notification Screenshot\")) ##
                                 Contributing 1. Fork it 2. Create your feature
                                 branch (`git checkout -b my-new-feature`) 3.
                                 Commit your changes (`git commit -am `Add some
@@ -22772,105 +13513,15 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/zhallett/growl";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     growl = growl_0_0_2;
 
-    guardian_0_10_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          uuid_1_1_3,
-          poison_1_5_2,
-          plug_1_1_3,
-          jose_1_7_3
-        }:
-          buildMix {
-            name = "guardian";
-            version = "0.10.1";
-            src = fetchHex {
-              pkg = "guardian";
-              version = "0.10.1";
-              sha256 =
-                "741aaa989ab656317a247d1db4dcd8e3efbd840b4d451bed7a37504ffdba6dc9";
-            };
-            beamDeps  = [ uuid_1_1_3 poison_1_5_2 plug_1_1_3 jose_1_7_3 ];
-
-            meta = {
-              description = ''Elixir Authentication framework'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ueberauth/guardian";
-            };
-          }
-      ) {};
-
-    guardian = guardian_0_10_1;
-
-    guardian_0_9_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          uuid_1_1_3,
-          poison_1_5_2,
-          plug_1_1_3,
-          jose_1_7_3
-        }:
-          buildMix {
-            name = "guardian";
-            version = "0.9.1";
-            src = fetchHex {
-              pkg = "guardian";
-              version = "0.9.1";
-              sha256 =
-                "9a79ae386f777774ab2910007cd30b20e2ea8da51c0712ec07f8cc8a13dfe293";
-            };
-            beamDeps  = [ uuid_1_1_3 poison_1_5_2 plug_1_1_3 jose_1_7_3 ];
-
-            meta = {
-              description = ''Elixir Authentication framework'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ueberauth/guardian";
-            };
-          }
-      ) {};
-
-    guardian_db_0_4_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          postgrex_0_11_1,
-          guardian_0_9_1,
-          ecto_2_0_0_beta_2
-        }:
-          buildMix {
-            name = "guardian_db";
-            version = "0.4.0";
-            src = fetchHex {
-              pkg = "guardian_db";
-              version = "0.4.0";
-              sha256 =
-                "d8fc1d33885c42c9a35c1c370bfe676b68a9b4fb54ed33ff7075e32cadcd1279";
-            };
-            beamDeps  = [ postgrex_0_11_1 guardian_0_9_1 ecto_2_0_0_beta_2 ];
-
-            meta = {
-              description = ''DB tracking for token validity'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/hassox/guardian_db";
-            };
-          }
-      ) {};
-
-    guardian_db = guardian_db_0_4_0;
-
     guardsafe_0_5_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "guardsafe";
             version = "0.5.0";
             src = fetchHex {
@@ -22886,15 +13537,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/DevL/guardsafe";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     guardsafe = guardsafe_0_5_0;
 
     gun_1_0_0_pre_1 = callPackage
       (
-        {  buildRebar3, fetchHex, ranch_1_1_0, cowlib_1_3_0 }:
-          buildRebar3 {
+        {
+          buildRebar3,
+          packageOverrides ? {},
+          fetchHex,
+          ranch_1_1_0,
+          cowlib_1_3_0
+        }:
+          buildRebar3 ({
             name = "gun";
             version = "1.0.0-pre.1";
             src = fetchHex {
@@ -22910,47 +13567,15 @@ let
               description = ''Asynchronous SPDY, HTTP and Websocket client.'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     gun = gun_1_0_0_pre_1;
 
-    guri_0_2_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          websocket_client_1_1_0,
-          poison_1_5_2,
-          httpoison_0_8_2
-        }:
-          buildMix {
-            name = "guri";
-            version = "0.2.1";
-            src = fetchHex {
-              pkg = "guri";
-              version = "0.2.1";
-              sha256 =
-                "7fa0f2ebff111c368895798041d982f00eec34589d93f10bb323bb5a09e1f888";
-            };
-            beamDeps  = [ websocket_client_1_1_0 poison_1_5_2 httpoison_0_8_2
-                      ];
-
-            meta = {
-              description = ''Automate tasks and keep everyone in the loop with
-                            Guri'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/elvio/guri";
-            };
-          }
-      ) {};
-
-    guri = guri_0_2_1;
-
     gurka_0_1_7 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "gurka";
             version = "0.1.7";
             src = fetchHex {
@@ -22964,292 +13589,15 @@ let
               description = ''Erlang implementation of Cucumber'';
               license = stdenv.lib.licenses.mit;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     gurka = gurka_0_1_7;
 
-    gutenex_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, imagineer_0_2_1, apex_0_3_7 }:
-          buildMix {
-            name = "gutenex";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "gutenex";
-              version = "0.1.0";
-              sha256 =
-                "212861089f4707ae39e25c08c0d2bb33fca876f1cf71ce7d4546d192c3be03a5";
-            };
-            beamDeps  = [ imagineer_0_2_1 apex_0_3_7 ];
-
-            meta = {
-              description = ''PDF Generation in Elixir '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/SenecaSystems/gutenex";
-            };
-          }
-      ) {};
-
-    gutenex = gutenex_0_1_0;
-
-    hackney_1_1_0 = callPackage
-      (
-        {
-          buildErlangMk, fetchHex, ssl_verify_hostname_1_0_6, idna_2_0_0
-        }:
-          buildErlangMk {
-            name = "hackney";
-            version = "1.1.0";
-            src = fetchHex {
-              pkg = "hackney";
-              version = "1.1.0";
-              sha256 =
-                "c8551072fdc8d5d5faacc5a31050cb943c3a8eb533149798b3ff424ef2d68501";
-            };
-            beamDeps  = [ ssl_verify_hostname_1_0_6 idna_2_0_0 ];
-
-            meta = {
-              description = ''simple HTTP client'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/benoitc/hackney";
-            };
-          }
-      ) {};
-
-    hackney_1_3_1 = callPackage
-      (
-        {
-          buildErlangMk, fetchHex, ssl_verify_hostname_1_0_6, idna_2_0_0
-        }:
-          buildErlangMk {
-            name = "hackney";
-            version = "1.3.1";
-            src = fetchHex {
-              pkg = "hackney";
-              version = "1.3.1";
-              sha256 =
-                "1a6316daceae744758fc88f2961e68c5a8b6cf1e1f49a28fc2caea6d27581add";
-            };
-            beamDeps  = [ ssl_verify_hostname_1_0_6 idna_2_0_0 ];
-
-            meta = {
-              description = ''simple HTTP client'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/benoitc/hackney";
-            };
-          }
-      ) {};
-
-    hackney_1_3_2 = callPackage
-      (
-        {
-          buildErlangMk, fetchHex, ssl_verify_hostname_1_0_6, idna_2_0_0
-        }:
-          buildErlangMk {
-            name = "hackney";
-            version = "1.3.2";
-            src = fetchHex {
-              pkg = "hackney";
-              version = "1.3.2";
-              sha256 =
-                "9b811cff637b29f9c7e2c61abf01986c85cd4f64a9422315fd803993b4e82615";
-            };
-            beamDeps  = [ ssl_verify_hostname_1_0_6 idna_2_0_0 ];
-
-            meta = {
-              description = ''simple HTTP client'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/benoitc/hackney";
-            };
-          }
-      ) {};
-
-    hackney_1_4_10 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          ssl_verify_hostname_1_0_5,
-          mimerl_1_0_2,
-          idna_1_1_0,
-          certifi_0_3_0
-        }:
-          buildRebar3 {
-            name = "hackney";
-            version = "1.4.10";
-            src = fetchHex {
-              pkg = "hackney";
-              version = "1.4.10";
-              sha256 =
-                "dbdda6c342984ab0f35c5099dfab4b419a77771d096089a9173bf11ab6a0f7bf";
-            };
-
-            beamDeps  = [
-                          ssl_verify_hostname_1_0_5
-                          mimerl_1_0_2
-                          idna_1_1_0
-                          certifi_0_3_0
-                        ];
-
-            meta = {
-              description = ''simple HTTP client'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/benoitc/hackney";
-            };
-          }
-      ) {};
-
-    hackney_1_4_4 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          ssl_verify_hostname_1_0_5,
-          mimerl_1_0_0,
-          idna_1_0_2,
-          certifi_0_1_1
-        }:
-          buildRebar3 {
-            name = "hackney";
-            version = "1.4.4";
-            src = fetchHex {
-              pkg = "hackney";
-              version = "1.4.4";
-              sha256 =
-                "c8ab2436556d6bce7e85a85adec67f6abeb8c7508668a3e29750be3c4bf4e3a8";
-            };
-
-            beamDeps  = [
-                          ssl_verify_hostname_1_0_5
-                          mimerl_1_0_0
-                          idna_1_0_2
-                          certifi_0_1_1
-                        ];
-
-            meta = {
-              description = ''simple HTTP client'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/benoitc/hackney";
-            };
-          }
-      ) {};
-
-    hackney_1_4_8 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          ssl_verify_hostname_1_0_5,
-          mimerl_1_0_2,
-          idna_1_0_3,
-          certifi_0_3_0
-        }:
-          buildRebar3 {
-            name = "hackney";
-            version = "1.4.8";
-            src = fetchHex {
-              pkg = "hackney";
-              version = "1.4.8";
-              sha256 =
-                "7c212741163cec1cf38ad845bd71efafcbf81365cf754c978b354c6375dc4da2";
-            };
-
-            beamDeps  = [
-                          ssl_verify_hostname_1_0_5
-                          mimerl_1_0_2
-                          idna_1_0_3
-                          certifi_0_3_0
-                        ];
-
-            meta = {
-              description = ''simple HTTP client'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/benoitc/hackney";
-            };
-          }
-      ) {};
-
-    hackney_1_5_7 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          ssl_verify_fun_1_1_0,
-          mimerl_1_0_2,
-          metrics_1_0_1,
-          idna_1_2_0,
-          certifi_0_4_0
-        }:
-          buildRebar3 {
-            name = "hackney";
-            version = "1.5.7";
-            src = fetchHex {
-              pkg = "hackney";
-              version = "1.5.7";
-              sha256 =
-                "627ed3f048b950d2dbbec918519f89f498a2136d74ca8180c15fad412b9bc869";
-            };
-
-            beamDeps  = [
-                          ssl_verify_fun_1_1_0
-                          mimerl_1_0_2
-                          metrics_1_0_1
-                          idna_1_2_0
-                          certifi_0_4_0
-                        ];
-
-            meta = {
-              description = ''simple HTTP client'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/benoitc/hackney";
-            };
-          }
-      ) {};
-
-    hackney_1_6_0 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          ssl_verify_fun_1_1_0,
-          mimerl_1_0_2,
-          metrics_1_0_1,
-          idna_1_2_0,
-          certifi_0_4_0
-        }:
-          buildRebar3 {
-            name = "hackney";
-            version = "1.6.0";
-            src = fetchHex {
-              pkg = "hackney";
-              version = "1.6.0";
-              sha256 =
-                "8b517f17c794ab611815042d24e149daafbd898d63aac8baf6750b890261c716";
-            };
-
-            beamDeps  = [
-                          ssl_verify_fun_1_1_0
-                          mimerl_1_0_2
-                          metrics_1_0_1
-                          idna_1_2_0
-                          certifi_0_4_0
-                        ];
-
-            meta = {
-              description = ''simple HTTP client'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/benoitc/hackney";
-            };
-          }
-      ) {};
-
-    hackney = hackney_1_6_0;
-
     haikunator_1_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "haikunator";
             version = "1.0.1";
             src = fetchHex {
@@ -23265,38 +13613,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/knrz/Haikunator";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     haikunator = haikunator_1_0_1;
 
-    hamcrest_0_1_1 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "hamcrest";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "hamcrest";
-              version = "0.1.1";
-              sha256 =
-                "5207b83e8d3168b9cbbeb3b4c4d83817a38a05f55478510e9c4db83ef83fa0ca";
-            };
-
-            meta = {
-              description = ''Erlang port of Hamcrest'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/hyperthunk/hamcrest-erlang";
-            };
-          }
-      ) {};
-
-    hamcrest = hamcrest_0_1_1;
-
     happy_1_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "happy";
             version = "1.1.1";
             src = fetchHex {
@@ -23313,15 +13638,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/vic/happy";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     happy = happy_1_1_1;
 
     harakiri_0_6_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "harakiri";
             version = "0.6.0";
             src = fetchHex {
@@ -23336,40 +13661,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/rubencaro/harakiri";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     harakiri = harakiri_0_6_0;
 
-    harvest_0_0_3 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "harvest";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "harvest";
-              version = "0.0.3";
-              sha256 =
-                "a9b52f37959a97e876603da5a34a0683e9e4a8e534fb7c672175602768fc812a";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Harvest Time Tracking API wrapper written in
-                            Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/luishurtado/harvest";
-            };
-          }
-      ) {};
-
-    harvest = harvest_0_0_3;
-
     hash_ring_0_4_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "hash_ring";
             version = "0.4.0";
             src = fetchHex {
@@ -23384,39 +13684,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/sile/hash_ring";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     hash_ring = hash_ring_0_4_0;
 
-    hash_ring_ex_1_1_2 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "hash_ring_ex";
-            version = "1.1.2";
-            src = fetchHex {
-              pkg = "hash_ring_ex";
-              version = "1.1.2";
-              sha256 =
-                "f33c2f7cc134d9ab1b91d961395b3a2b4d3d47b12b16c4e9d964bc3b57b7d573";
-            };
-
-            meta = {
-              description = ''A consistent hash-ring implemention for Elixir.
-                            '';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/reset/hash-ring-ex";
-            };
-          }
-      ) {};
-
-    hash_ring_ex = hash_ring_ex_1_1_2;
-
     hashids_2_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "hashids";
             version = "2.0.2";
             src = fetchHex {
@@ -23432,40 +13708,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/alco/hashids-elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     hashids = hashids_2_0_2;
 
-    hdr_histogram_0_2_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "hdr_histogram";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "hdr_histogram";
-              version = "0.2.0";
-              sha256 =
-                "42b6d038deeb6a6b695f5f18842afef240b2510e433bc08b21c9b3daa99a221e";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''High Dynamic Range Histogram Erlang/OTP
-                            library'';
-              license = with stdenv.lib.licenses; [ cc0 bsd3 ];
-              homepage = "https://github.com/HdrHistogram/hdr_histogram_erl";
-            };
-          }
-      ) {};
-
-    hdr_histogram = hdr_histogram_0_2_0;
-
     heap_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "heap";
             version = "1.0.0";
             src = fetchHex {
@@ -23479,15 +13730,15 @@ let
               description = ''Heap data structure and tools'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     heap = heap_1_0_0;
 
     heapq_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "heapq";
             version = "0.0.1";
             src = fetchHex {
@@ -23503,15 +13754,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/takscape/elixir-heapq";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     heapq = heapq_0_0_1;
 
     hedwig_0_3_0 = callPackage
       (
-        {  buildMix, fetchHex, gproc_0_5_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, gproc_0_5_0 }:
+          buildMix ({
             name = "hedwig";
             version = "0.3.0";
             src = fetchHex {
@@ -23527,13 +13778,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/hedwig-im/hedwig";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     hedwig_1_0_0_rc3 = callPackage
       (
-        {  buildMix, fetchHex, gproc_0_5_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, gproc_0_5_0 }:
+          buildMix ({
             name = "hedwig";
             version = "1.0.0-rc3";
             src = fetchHex {
@@ -23549,159 +13800,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/hedwig-im/hedwig";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     hedwig = hedwig_1_0_0_rc3;
 
-    hedwig_hipchat_0_9_4 = callPackage
-      (
-        {  buildMix, fetchHex, romeo_0_4_0, hedwig_0_3_0 }:
-          buildMix {
-            name = "hedwig_hipchat";
-            version = "0.9.4";
-            src = fetchHex {
-              pkg = "hedwig_hipchat";
-              version = "0.9.4";
-              sha256 =
-                "4d42f307e1c9fd91a47808476a1c278997c6990a69db41f6ed081b61a69056f4";
-            };
-            beamDeps  = [ romeo_0_4_0 hedwig_0_3_0 ];
-
-            meta = {
-              description = ''A HipChat adapter for Hedwig'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jwarlander/hedwig_hipchat";
-            };
-          }
-      ) {};
-
-    hedwig_hipchat = hedwig_hipchat_0_9_4;
-
-    hedwig_irc_0_1_1 = callPackage
-      (
-        {  buildMix, fetchHex, hedwig_0_3_0, exirc_0_10_0 }:
-          buildMix {
-            name = "hedwig_irc";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "hedwig_irc";
-              version = "0.1.1";
-              sha256 =
-                "367d1a654069078fad1a5d27a1447c6aa6044517fbe46c9e10182faa418d6085";
-            };
-            beamDeps  = [ hedwig_0_3_0 exirc_0_10_0 ];
-
-            meta = {
-              description = ''An IRC adapter for Hedwig'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jeffweiss/hedwig_irc";
-            };
-          }
-      ) {};
-
-    hedwig_irc = hedwig_irc_0_1_1;
-
-    hedwig_xmpp_1_0_0_rc2 = callPackage
-      (
-        {  buildMix, fetchHex, romeo_0_4_0, hedwig_0_3_0 }:
-          buildMix {
-            name = "hedwig_xmpp";
-            version = "1.0.0-rc2";
-            src = fetchHex {
-              pkg = "hedwig_xmpp";
-              version = "1.0.0-rc2";
-              sha256 =
-                "79d60e836763c9eb88798bb5921e8eda717fbbf3030ca401f2a3915f58bc59e0";
-            };
-            beamDeps  = [ romeo_0_4_0 hedwig_0_3_0 ];
-
-            meta = {
-              description = ''An XMPP adapter for Hedwig'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/hedwig-im/hedwig";
-            };
-          }
-      ) {};
-
-    hedwig_xmpp = hedwig_xmpp_1_0_0_rc2;
-
-    hello_0_0_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "hello";
-            version = "0.0.0";
-            src = fetchHex {
-              pkg = "hello";
-              version = "0.0.0";
-              sha256 =
-                "35378799d296eda76d236544085041c8d19cd9f6dd6d5f31b5914bee6e6128fc";
-            };
-
-            meta = {
-              description = ''Reserving this name for an awesome project I am
-                            building.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/thejamespinto";
-            };
-          }
-      ) {};
-
-    hello = hello_0_0_0;
-
-    hello_world_0_0_0 = callPackage
-      (
-        {  buildMix, fetchHex, decimal_0_2_5 }:
-          buildMix {
-            name = "hello_world";
-            version = "0.0.0";
-            src = fetchHex {
-              pkg = "hello_world";
-              version = "0.0.0";
-              sha256 =
-                "ae8b9c09cd73bf5268bdd4095cb9d5efbb716cb841834a6edf111f45279b207d";
-            };
-            beamDeps  = [ decimal_0_2_5 ];
-
-            meta = {
-              description = ''hello-world test'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/shanilevy/hello_world_hex";
-            };
-          }
-      ) {};
-
-    hello_world = hello_world_0_0_0;
-
-    hello_world_header_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, plug_0_5_2, cowboy_1_0_4 }:
-          buildMix {
-            name = "hello_world_header";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "hello_world_header";
-              version = "0.0.1";
-              sha256 =
-                "caddb7712a66326face465231cf3bfe9210a62787cf5f499f9fbcc04e4695242";
-            };
-            beamDeps  = [ plug_0_5_2 cowboy_1_0_4 ];
-
-            meta = {
-              description = ''Demo plug used for tutorial purposes.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/cultivatehq/hello_world_header";
-            };
-          }
-      ) {};
-
-    hello_world_header = hello_world_header_0_0_1;
-
     hermes_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, chronos_1_5_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, chronos_1_5_1 }:
+          buildMix ({
             name = "hermes";
             version = "0.1.0";
             src = fetchHex {
@@ -23719,15 +13826,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/nurugger07/hemes";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     hermes = hermes_0_1_0;
 
     hex_math_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "hex_math";
             version = "0.0.2";
             src = fetchHex {
@@ -23742,51 +13849,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/tjcelaya/hex_math";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     hex_math = hex_math_0_0_2;
 
-    hex_searcher_1_0_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          table_rex_0_4_0,
-          ibrowse_4_2_2,
-          httpotion_2_2_2,
-          floki_0_7_2
-        }:
-          buildMix {
-            name = "hex_searcher";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "hex_searcher";
-              version = "1.0.0";
-              sha256 =
-                "26d2097aa0f950c67ea55822e15cfec26976f76a60ec51d758af9d60126b3538";
-            };
-            beamDeps  = [
-                          table_rex_0_4_0
-                          ibrowse_4_2_2
-                          httpotion_2_2_2
-                          floki_0_7_2
-                        ];
-
-            meta = {
-              description = ''Search hex packages from terminal'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/nguyenvinhlinh/HexSearcher";
-            };
-          }
-      ) {};
-
-    hex_searcher = hex_searcher_1_0_0;
-
     hexate_0_5_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "hexate";
             version = "0.5.1";
             src = fetchHex {
@@ -23802,15 +13873,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/rjsamson/hexate";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     hexate = hexate_0_5_1;
 
     hexbot_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "hexbot";
             version = "0.0.1";
             src = fetchHex {
@@ -23825,15 +13896,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/tombell/hexbot";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     hexbot = hexbot_0_0_1;
 
     hexdocset_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, floki_0_0_5 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, floki_0_0_5 }:
+          buildMix ({
             name = "hexdocset";
             version = "1.0.0";
             src = fetchHex {
@@ -23849,40 +13920,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/yesmeck/hexdocset";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     hexdocset = hexdocset_1_0_0;
 
-    hexoku_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, jsex_2_0_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "hexoku";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "hexoku";
-              version = "0.1.0";
-              sha256 =
-                "39c24660842061d71922df5f87ac4fa065b3f18f64a4f438d40495ffeb9d711b";
-            };
-            beamDeps  = [ jsex_2_0_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Heroku API client and Heroku Mix tasks for Elixir
-                            projects. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/JonGretar/Hexoku";
-            };
-          }
-      ) {};
-
-    hexoku = hexoku_0_1_0;
-
     hlc_2_0_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "hlc";
             version = "2.0.0";
             src = fetchHex {
@@ -23897,53 +13943,15 @@ let
 
               homepage = "https://github.com/barrel-db/hlc";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     hlc = hlc_2_0_0;
 
-    hmc5883l_0_5_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          multidef_0_2_1,
-          mon_handler_1_0_2,
-          elixir_ale_0_4_1,
-          dialyze_0_1_4
-        }:
-          buildMix {
-            name = "hmc5883l";
-            version = "0.5.0";
-            src = fetchHex {
-              pkg = "hmc5883l";
-              version = "0.5.0";
-              sha256 =
-                "cbda55c14a5e1fc5accd49de948331c5dc264286c6ecd58c348cb54c66fe6fa4";
-            };
-            beamDeps  = [
-                          multidef_0_2_1
-                          mon_handler_1_0_2
-                          elixir_ale_0_4_1
-                          dialyze_0_1_4
-                        ];
-
-            meta = {
-              longDescription = ''OTP application for reading the HMC5883L
-                                3-axis magnetometer. Magnetic heading is read at
-                                approx. 13hz (every 75ms)'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/tattdcodemonkey/hmc5883l";
-            };
-          }
-      ) {};
-
-    hmc5883l = hmc5883l_0_5_0;
-
     hoax_0_11_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "hoax";
             version = "0.11.1";
             src = fetchHex {
@@ -23958,15 +13966,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/xenolinguist/hoax";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     hoax = hoax_0_11_1;
 
     holidays_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "holidays";
             version = "0.1.1";
             src = fetchHex {
@@ -23982,68 +13990,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/CoderDennis/holidays";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     holidays = holidays_0_1_1;
 
-    honeybadger_0_4_0 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_2_1_0, plug_1_1_3, httpoison_0_8_2
-        }:
-          buildMix {
-            name = "honeybadger";
-            version = "0.4.0";
-            src = fetchHex {
-              pkg = "honeybadger";
-              version = "0.4.0";
-              sha256 =
-                "d2810f38e4a600476ac585c1980dffdf2f62eb2212fe27f76eb07e0ea2bc2dd8";
-            };
-            beamDeps  = [ poison_2_1_0 plug_1_1_3 httpoison_0_8_2 ];
-
-            meta = {
-              longDescription = ''Elixir client, Plug and error_logger for
-                                integrating with the Honeybadger.io exception
-                                tracker'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/honeybadger-io/honeybadger-elixir";
-            };
-          }
-      ) {};
-
-    honeybadger = honeybadger_0_4_0;
-
-    honeydew_0_0_8 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "honeydew";
-            version = "0.0.8";
-            src = fetchHex {
-              pkg = "honeydew";
-              version = "0.0.8";
-              sha256 =
-                "3bf8f7d9665f2897c43f6f3f5f31e598ecf41270bfb57fae11b994715f2665cc";
-            };
-
-            meta = {
-              description = ''Job queue + worker pool with permanent
-                            workers.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/koudelka/elixir-honeydew";
-            };
-          }
-      ) {};
-
-    honeydew = honeydew_0_0_8;
-
     hooks_1_1_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "hooks";
             version = "1.1.1";
             src = fetchHex {
@@ -24058,40 +14013,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/barrel-db/hooks";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     hooks = hooks_1_1_1;
 
-    hound_0_8_2 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "hound";
-            version = "0.8.2";
-            src = fetchHex {
-              pkg = "hound";
-              version = "0.8.2";
-              sha256 =
-                "3ecb4b7d20de76e6790d61e53555e3486ed5810bb6f0052321620b1d46ffb188";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Webdriver library for integration testing and
-                            browser automation'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/HashNuke/hound";
-            };
-          }
-      ) {};
-
-    hound = hound_0_8_2;
-
     hpack_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "hpack";
             version = "1.0.0";
             src = fetchHex {
@@ -24109,87 +14039,15 @@ let
                                 HTTP/2.'';
               license = stdenv.lib.licenses.mit;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     hpack = hpack_1_0_0;
 
-    hr_0_2_2 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          yyid_0_1_2,
-          plug_1_1_3,
-          phoenix_html_2_5_1,
-          phoenix_ecto_3_0_0_beta_2,
-          phoenix_1_1_4,
-          oauth2_0_3_0,
-          linguist_0_1_5,
-          joken_0_16_1,
-          comeonin_1_6_0
-        }:
-          buildMix {
-            name = "hr";
-            version = "0.2.2";
-            src = fetchHex {
-              pkg = "hr";
-              version = "0.2.2";
-              sha256 =
-                "67d02f62bffda952dbaf80cfea85601f31c39e04d3bf90da7a08b89e1bce71df";
-            };
-            beamDeps  = [
-                          yyid_0_1_2
-                          plug_1_1_3
-                          phoenix_html_2_5_1
-                          phoenix_ecto_3_0_0_beta_2
-                          phoenix_1_1_4
-                          oauth2_0_3_0
-                          linguist_0_1_5
-                          joken_0_16_1
-                          comeonin_1_6_0
-                        ];
-
-            meta = {
-              description = ''User accounts for Phoenix. Supports OAuth, JWT
-                            and forms out of the box'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/zensavona/hr";
-            };
-          }
-      ) {};
-
-    hr = hr_0_2_2;
-
-    hstore_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, postgrex_0_8_4, apex_0_3_7 }:
-          buildMix {
-            name = "hstore";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "hstore";
-              version = "0.0.2";
-              sha256 =
-                "bd5040285c29162685f4db37ef3ad30c2bb473f5c54fe03ef29b4383cf23504a";
-            };
-            beamDeps  = [ postgrex_0_8_4 apex_0_3_7 ];
-
-            meta = {
-              longDescription = ''A collection of encoders and decoders for
-                                hstore data type support for Postgrex. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/senecasystems/hstore";
-            };
-          }
-      ) {};
-
-    hstore = hstore_0_0_2;
-
     html_builder_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "html_builder";
             version = "0.1.1";
             src = fetchHex {
@@ -24205,15 +14063,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/camshaft/html_builder";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     html_builder = html_builder_0_1_1;
 
     html_entities_0_3_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "html_entities";
             version = "0.3.0";
             src = fetchHex {
@@ -24228,61 +14086,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/martinsvalin/html_entities";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     html_entities = html_entities_0_3_0;
 
-    html_sanitize_ex_0_1_2 = callPackage
-      (
-        {  buildMix, fetchHex, mochiweb_2_12_2 }:
-          buildMix {
-            name = "html_sanitize_ex";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "html_sanitize_ex";
-              version = "0.1.2";
-              sha256 =
-                "e6937b25832bcdccb8b547632428de7fe034199c871f037311d4340c345348a7";
-            };
-            beamDeps  = [ mochiweb_2_12_2 ];
-
-            meta = {
-              description = ''HTML sanitizer for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/rrrene/html_sanitize_ex";
-            };
-          }
-      ) {};
-
-    html_sanitize_ex_0_3_1 = callPackage
-      (
-        {  buildMix, fetchHex, mochiweb_2_12_2 }:
-          buildMix {
-            name = "html_sanitize_ex";
-            version = "0.3.1";
-            src = fetchHex {
-              pkg = "html_sanitize_ex";
-              version = "0.3.1";
-              sha256 =
-                "cf99531194f621515cc7f62db14f899e404529782b94061b44931c3c4b78099d";
-            };
-            beamDeps  = [ mochiweb_2_12_2 ];
-
-            meta = {
-              description = ''HTML sanitizer for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/rrrene/html_sanitize_ex";
-            };
-          }
-      ) {};
-
-    html_sanitize_ex = html_sanitize_ex_0_3_1;
-
     html_to_pdf_0_5_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "html_to_pdf";
             version = "0.5.2";
             src = fetchHex {
@@ -24298,81 +14110,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mattweldon/html_to_pdf";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     html_to_pdf = html_to_pdf_0_5_2;
 
-    htpasswd_1_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, apache_passwd_md5_1_0_0 }:
-          buildMix {
-            name = "htpasswd";
-            version = "1.0.2";
-            src = fetchHex {
-              pkg = "htpasswd";
-              version = "1.0.2";
-              sha256 =
-                "0c9006a42eae68ac2f561e5876c0fd8083560c57da099ffa6c828eeb00246bba";
-            };
-            beamDeps  = [ apache_passwd_md5_1_0_0 ];
-
-            meta = {
-              longDescription = ''Provides basic htpasswd(1) functions as a
-                                library: encode and check passwords in MD5, SHA,
-                                crypt, or plaintext format, add to and delete
-                                from htaccess files. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/kevinmontuori/Apache.htpasswd";
-            };
-          }
-      ) {};
-
-    htpasswd = htpasswd_1_0_2;
-
-    http_0_0_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          pool_0_0_2,
-          excoveralls_0_5_1,
-          ex_doc_0_7_3,
-          earmark_0_1_19,
-          dialyze_0_1_4
-        }:
-          buildMix {
-            name = "http";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "http";
-              version = "0.0.1";
-              sha256 =
-                "1ee497d4ec73290e5d9b9effab88786716185550bd65822e7a31c32d1a044a96";
-            };
-            beamDeps  = [
-                          pool_0_0_2
-                          excoveralls_0_5_1
-                          ex_doc_0_7_3
-                          earmark_0_1_19
-                          dialyze_0_1_4
-                        ];
-
-            meta = {
-              description = ''HTTP server for Elixir Not currently working, but
-                            close :) '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/slogsdon/http";
-            };
-          }
-      ) {};
-
-    http = http_0_0_1;
-
     http2_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "http2";
             version = "0.0.2";
             src = fetchHex {
@@ -24387,15 +14133,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/kiennt/hpack";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     http2 = http2_0_0_2;
 
     http_params_serializer_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "http_params_serializer";
             version = "0.1.1";
             src = fetchHex {
@@ -24413,55 +14159,23 @@ let
               homepage =
                 "https://github.com/ruby2elixir/http_params_serializer";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     http_params_serializer = http_params_serializer_0_1_1;
 
-    http_proxy_1_0_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          plug_1_0_3,
-          hackney_1_4_10,
-          exjsx_3_2_0,
-          cowboy_1_0_4
-        }:
-          buildMix {
-            name = "http_proxy";
-            version = "1.0.1";
-            src = fetchHex {
-              pkg = "http_proxy";
-              version = "1.0.1";
-              sha256 =
-                "7ff5d10c8932b189844f9735742250e4fdbe9de5eba40c84e7447f54fc75fdd3";
-            };
-            beamDeps  = [ plug_1_0_3 hackney_1_4_10 exjsx_3_2_0 cowboy_1_0_4
-                      ];
-
-            meta = {
-              description = ''Multi port HTTP Proxy and support record/play
-                            request.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/KazuCocoa/http_proxy";
-            };
-          }
-      ) {};
-
-    http_proxy = http_proxy_1_0_1;
-
     http_router_0_0_8 = callPackage
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           xml_builder_0_0_8,
           poison_1_5_2,
           plug_1_1_3,
           cowboy_1_0_4
         }:
-          buildMix {
+          buildMix ({
             name = "http_router";
             version = "0.0.8";
             src = fetchHex {
@@ -24482,15 +14196,15 @@ let
               homepage =
                 "https://github.com/sugar-framework/elixir-http-router";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     http_router = http_router_0_0_8;
 
     http_signature_1_1_0 = callPackage
       (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
+        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
+          buildErlangMk ({
             name = "http_signature";
             version = "1.1.0";
             src = fetchHex {
@@ -24507,15 +14221,21 @@ let
               homepage =
                 "https://github.com/potatosalad/erlang-http_signature";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     http_signature = http_signature_1_1_0;
 
     httparrot_0_3_4 = callPackage
       (
-        {  buildMix, fetchHex, exjsx_3_2_0, cowboy_1_0_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          exjsx_3_2_0,
+          cowboy_1_0_4
+        }:
+          buildMix ({
             name = "httparrot";
             version = "0.3.4";
             src = fetchHex {
@@ -24532,134 +14252,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/edgurgel/httparrot";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     httparrot = httparrot_0_3_4;
 
-    httpehaviour_0_9_0 = callPackage
-      (
-        {  buildMix, fetchHex, hackney_1_6_0 }:
-          buildMix {
-            name = "httpehaviour";
-            version = "0.9.0";
-            src = fetchHex {
-              pkg = "httpehaviour";
-              version = "0.9.0";
-              sha256 =
-                "54e93dcf0e62d392781078cf029478194797fe67c98dffe99a91b5d5ec33e4e5";
-            };
-            beamDeps  = [ hackney_1_6_0 ];
-
-            meta = {
-              description = ''Yet Yet Another HTTP client for Elixir powered by
-                            hackney'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/edgurgel/httpehaviour";
-            };
-          }
-      ) {};
-
-    httpehaviour = httpehaviour_0_9_0;
-
-    httpoison_0_7_1 = callPackage
-      (
-        {  buildMix, fetchHex, hackney_1_4_8 }:
-          buildMix {
-            name = "httpoison";
-            version = "0.7.1";
-            src = fetchHex {
-              pkg = "httpoison";
-              version = "0.7.1";
-              sha256 =
-                "ad146f8a1e8cb81d50337ca62bd83a80fc1e3df768b93a9ed4c497c3a554c9b0";
-            };
-            beamDeps  = [ hackney_1_4_8 ];
-
-            meta = {
-              description = ''Yet Another HTTP client for Elixir powered by
-                            hackney'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/edgurgel/httpoison";
-            };
-          }
-      ) {};
-
-    httpoison_0_7_5 = callPackage
-      (
-        {  buildMix, fetchHex, hackney_1_4_8 }:
-          buildMix {
-            name = "httpoison";
-            version = "0.7.5";
-            src = fetchHex {
-              pkg = "httpoison";
-              version = "0.7.5";
-              sha256 =
-                "a9b32452df3c4671c012953d6bb15e3a52bbb41b618f72cbd464e8c9320847c9";
-            };
-            beamDeps  = [ hackney_1_4_8 ];
-
-            meta = {
-              description = ''Yet Another HTTP client for Elixir powered by
-                            hackney'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/edgurgel/httpoison";
-            };
-          }
-      ) {};
-
-    httpoison_0_8_0 = callPackage
-      (
-        {  buildMix, fetchHex, hackney_1_4_10 }:
-          buildMix {
-            name = "httpoison";
-            version = "0.8.0";
-            src = fetchHex {
-              pkg = "httpoison";
-              version = "0.8.0";
-              sha256 =
-                "7a6455689233867da40f285e9e3bcce506cd0c60b1094e1c449de76a46b9e50b";
-            };
-            beamDeps  = [ hackney_1_4_10 ];
-
-            meta = {
-              description = ''Yet Another HTTP client for Elixir powered by
-                            hackney'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/edgurgel/httpoison";
-            };
-          }
-      ) {};
-
-    httpoison_0_8_2 = callPackage
-      (
-        {  buildMix, fetchHex, hackney_1_5_7 }:
-          buildMix {
-            name = "httpoison";
-            version = "0.8.2";
-            src = fetchHex {
-              pkg = "httpoison";
-              version = "0.8.2";
-              sha256 =
-                "00738e34fe2e254199c0324ef60b8150a7b2ced66c2296c4df8425c8e9b8d5c0";
-            };
-            beamDeps  = [ hackney_1_5_7 ];
-
-            meta = {
-              description = ''Yet Another HTTP client for Elixir powered by
-                            hackney'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/edgurgel/httpoison";
-            };
-          }
-      ) {};
-
-    httpoison = httpoison_0_8_2;
-
     httpotion_2_2_2 = callPackage
       (
-        {  buildMix, fetchHex, ibrowse_4_2_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, ibrowse_4_2_2 }:
+          buildMix ({
             name = "httpotion";
             version = "2.2.2";
             src = fetchHex {
@@ -24676,39 +14277,15 @@ let
               license = stdenv.lib.licenses.unlicense;
               homepage = "https://github.com/myfreeweb/httpotion";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     httpotion = httpotion_2_2_2;
 
-    httprot_0_1_7 = callPackage
-      (
-        {  buildMix, fetchHex, socket_0_3_1 }:
-          buildMix {
-            name = "httprot";
-            version = "0.1.7";
-            src = fetchHex {
-              pkg = "httprot";
-              version = "0.1.7";
-              sha256 =
-                "3cf35411d7b16a9af13af4a569eeac09d3375f05ac86139f3448f87302719999";
-            };
-            beamDeps  = [ socket_0_3_1 ];
-
-            meta = {
-              description = ''HTTP client library'';
-              license = stdenv.lib.licenses.wtfpl;
-              homepage = "https://github.com/meh/httprot";
-            };
-          }
-      ) {};
-
-    httprot = httprot_0_1_7;
-
     huami_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "huami";
             version = "0.0.1";
             src = fetchHex {
@@ -24724,40 +14301,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/yesmeck/huami.ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     huami = huami_0_0_1;
 
-    huex_0_5_0 = callPackage
-      (
-        {  buildMix, fetchHex, json_0_3_3, httpoison_0_8_2 }:
-          buildMix {
-            name = "huex";
-            version = "0.5.0";
-            src = fetchHex {
-              pkg = "huex";
-              version = "0.5.0";
-              sha256 =
-                "e5fe37fdc4299567922697516df8ade2f64d2c1573dc9a253e5037f66576858f";
-            };
-            beamDeps  = [ json_0_3_3 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Elixir client for Philips Hue connected light
-                            bulbs'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/xavier/huex";
-            };
-          }
-      ) {};
-
-    huex = huex_0_5_0;
-
     hufflehoff_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "hufflehoff";
             version = "0.0.1";
             src = fetchHex {
@@ -24772,15 +14324,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/sideshow/hufflehoff";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     hufflehoff = hufflehoff_0_0_1;
 
     huffman_1_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "huffman";
             version = "1.1.1";
             src = fetchHex {
@@ -24795,15 +14347,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/SenecaSystems/huffman";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     huffman = huffman_1_1_1;
 
     hulaaki_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "hulaaki";
             version = "0.0.2";
             src = fetchHex {
@@ -24819,54 +14371,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/suvash/hulaaki";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     hulaaki = hulaaki_0_0_2;
 
-    hydra_0_0_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          porcelain_2_0_1,
-          poison_1_5_2,
-          plug_1_1_3,
-          httpoison_0_8_2,
-          cowboy_1_0_4
-        }:
-          buildMix {
-            name = "hydra";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "hydra";
-              version = "0.0.1";
-              sha256 =
-                "ea35ec756dfaa0390ba53a0313bb50b924517f746922a98e3489bddf8e066b7d";
-            };
-            beamDeps  = [
-                          porcelain_2_0_1
-                          poison_1_5_2
-                          plug_1_1_3
-                          httpoison_0_8_2
-                          cowboy_1_0_4
-                        ];
-
-            meta = {
-              description = ''A multi-headed beast: API gateway, request cache,
-                            and data transformations'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/doomspork/hydra";
-            };
-          }
-      ) {};
-
-    hydra = hydra_0_0_1;
-
     hypermedia_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "hypermedia";
             version = "0.0.1";
             src = fetchHex {
@@ -24882,35 +14395,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/jurriaan/hypermedia";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     hypermedia = hypermedia_0_0_1;
 
-    hypermock_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, meck_0_8_4 }:
-          buildMix {
-            name = "hypermock";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "hypermock";
-              version = "0.0.2";
-              sha256 =
-                "dbb7ad24f651a3bb99475f39f9b0d6b7e9b3f959d8a80577ea6c803a5b548516";
-            };
-            beamDeps  = [ meck_0_8_4 ];
-
-            meta = {    };
-          }
-      ) {};
-
-    hypermock = hypermock_0_0_2;
-
     iam_role_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, jsone_1_2_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, jsone_1_2_1 }:
+          buildMix ({
             name = "iam_role";
             version = "1.0.0";
             src = fetchHex {
@@ -24927,15 +14420,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/tsharju/iam_role";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     iam_role = iam_role_1_0_0;
 
     ibrowse_4_2_2 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "ibrowse";
             version = "4.2.2";
             src = fetchHex {
@@ -24950,40 +14443,15 @@ let
               license = with stdenv.lib.licenses; [ free bsd3 ];
               homepage = "https://github.com/cmullaparthi/ibrowse";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ibrowse = ibrowse_4_2_2;
 
-    iconv_1_0_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "iconv";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "iconv";
-              version = "1.0.0";
-              sha256 =
-                "2ac0268bf0b392b86dca00b63d90595959ebc3dca6305284045592fa487e7204";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''Fast encoding conversion library for Erlang /
-                            Elixir'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/processone/iconv";
-            };
-          }
-      ) {};
-
-    iconv = iconv_1_0_0;
-
     identicon_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "identicon";
             version = "0.2.0";
             src = fetchHex {
@@ -24999,15 +14467,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/rbishop/identicon";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     identicon = identicon_0_2_0;
 
     idna_1_0_2 = callPackage
       (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
+        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
+          buildErlangMk ({
             name = "idna";
             version = "1.0.2";
             src = fetchHex {
@@ -25022,13 +14490,13 @@ let
 
               homepage = "https://github.com/benoitc/erlang-idna";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     idna_1_0_3 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "idna";
             version = "1.0.3";
             src = fetchHex {
@@ -25043,13 +14511,13 @@ let
 
               homepage = "https://github.com/benoitc/erlang-idna";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     idna_1_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "idna";
             version = "1.1.0";
             src = fetchHex {
@@ -25064,13 +14532,13 @@ let
 
               homepage = "https://github.com/benoitc/erlang-idna";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     idna_1_2_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "idna";
             version = "1.2.0";
             src = fetchHex {
@@ -25085,13 +14553,13 @@ let
 
               homepage = "https://github.com/benoitc/erlang-idna";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     idna_2_0_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "idna";
             version = "2.0.0";
             src = fetchHex {
@@ -25106,15 +14574,15 @@ let
 
               homepage = "https://github.com/benoitc/erlang-idna";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     idna = idna_2_0_0;
 
     ieex_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ieex";
             version = "0.0.3";
             src = fetchHex {
@@ -25130,66 +14598,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/edmaarcosta/IEEx";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ieex = ieex_0_0_3;
 
-    ielixir_0_9_5 = callPackage
-      (
-        {  buildMix, fetchHex, sqlite_ecto_0_5_0, ecto_0_15_0 }:
-          buildMix {
-            name = "ielixir";
-            version = "0.9.5";
-            src = fetchHex {
-              pkg = "ielixir";
-              version = "0.9.5";
-              sha256 =
-                "77dae7b4b147da21161b6de0662d3bdeb13d15b12866b2e67add5ec3c550b7ce";
-            };
-            beamDeps  = [ sqlite_ecto_0_5_0 ecto_0_15_0 ];
-
-            meta = {
-              description = ''Jupyter`s kernel for Elixir programming
-                            language'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/pprzetacznik/ielixir";
-            };
-          }
-      ) {};
-
-    ielixir = ielixir_0_9_5;
-
-    ifttt_oauth_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, oauth2_0_6_0 }:
-          buildMix {
-            name = "ifttt_oauth";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "ifttt_oauth";
-              version = "0.0.1";
-              sha256 =
-                "9029506687be770891b3fb54d9e39bab9dd0f65a9551c6b335a3b0a60dc3026c";
-            };
-            beamDeps  = [ oauth2_0_6_0 ];
-
-            meta = {
-              longDescription = ''A simple Elixir wrapper around
-                                scrogson/oauth2 to retrieve IFTTT Bearer tokens
-                                from their mobile api.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/nickgal/ifttt_oauth";
-            };
-          }
-      ) {};
-
-    ifttt_oauth = ifttt_oauth_0_0_1;
-
     imagineer_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex, apex_0_3_7 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, apex_0_3_7 }:
+          buildMix ({
             name = "imagineer";
             version = "0.2.1";
             src = fetchHex {
@@ -25205,15 +14622,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/SenecaSystems/imagineer";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     imagineer = imagineer_0_2_1;
 
     imgex_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "imgex";
             version = "0.1.0";
             src = fetchHex {
@@ -25229,15 +14646,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ianwalter/imgex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     imgex = imgex_0_1_0;
 
     immortal_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "immortal";
             version = "0.2.0";
             src = fetchHex {
@@ -25252,108 +14669,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/danielberkompas/immortal";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     immortal = immortal_0_2_0;
 
-    inaka_aleppo_0_9_9 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "inaka_aleppo";
-            version = "0.9.9";
-            src = fetchHex {
-              pkg = "inaka_aleppo";
-              version = "0.9.9";
-              sha256 =
-                "11c09648e42b5755a437319a12826c17344a162db73dd2880457b0fa3a1ce1ff";
-            };
-
-            meta = {
-              description = ''Aleppo: ALternative Erlang Pre-ProcessOr'';
-
-              homepage = "https://github.com/inaka/aleppo";
-            };
-          }
-      ) {};
-
-    inaka_aleppo = inaka_aleppo_0_9_9;
-
-    inaka_mixer_0_1_5 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "inaka_mixer";
-            version = "0.1.5";
-            src = fetchHex {
-              pkg = "inaka_mixer";
-              version = "0.1.5";
-              sha256 =
-                "37af35b1c17a94a0cb643cba23cba2ca68d6fe51c3ad8337629d4c3c017cc912";
-            };
-
-            meta = {
-              description = ''Mix in public functions from external modules'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/inaka/mixer";
-            };
-          }
-      ) {};
-
-    inaka_mixer = inaka_mixer_0_1_5;
-
-    inch_ex_0_5_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_0_3 }:
-          buildMix {
-            name = "inch_ex";
-            version = "0.5.1";
-            src = fetchHex {
-              pkg = "inch_ex";
-              version = "0.5.1";
-              sha256 =
-                "4d0aaefa4928fdc4758118a37dccb5b90805559ada3f652ca157f66ea268ea20";
-            };
-            beamDeps  = [ poison_1_0_3 ];
-
-            meta = {
-              description = ''Provides a Mix task that gives you hints where to
-                            improve your inline docs'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/rrrene/inch_ex";
-            };
-          }
-      ) {};
-
-    inch_ex = inch_ex_0_5_1;
-
-    inch_test_0_0_1 = callPackage
-      (
-        {
-          buildMix, fetchHex, inch_ex_0_5_1, ex_doc_0_11_4, earmark_0_2_1
-        }:
-          buildMix {
-            name = "inch_test";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "inch_test";
-              version = "0.0.1";
-              sha256 =
-                "41405c11b22fad3f3b49127f881c2c4c79b206c04b8cb77268828380779a374d";
-            };
-            beamDeps  = [ inch_ex_0_5_1 ex_doc_0_11_4 earmark_0_2_1 ];
-
-            meta = {    };
-          }
-      ) {};
-
-    inch_test = inch_test_0_0_1;
-
     indefinite_article_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "indefinite_article";
             version = "0.0.1";
             src = fetchHex {
@@ -25369,15 +14693,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/Buyapowa/indefinite_article";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     indefinite_article = indefinite_article_0_0_1;
 
     inet_cidr_1_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "inet_cidr";
             version = "1.0.1";
             src = fetchHex {
@@ -25394,15 +14718,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/cobenian/inet_cidr";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     inet_cidr = inet_cidr_1_0_1;
 
     inflex_0_2_4 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "inflex";
             version = "0.2.4";
             src = fetchHex {
@@ -25418,13 +14742,13 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/nurugger07/inflex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     inflex_0_3_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "inflex";
             version = "0.3.0";
             src = fetchHex {
@@ -25440,13 +14764,13 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/nurugger07/inflex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     inflex_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "inflex";
             version = "1.0.0";
             src = fetchHex {
@@ -25462,13 +14786,13 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/nurugger07/inflex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     inflex_1_4_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "inflex";
             version = "1.4.1";
             src = fetchHex {
@@ -25484,13 +14808,13 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/nurugger07/inflex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     inflex_1_5_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "inflex";
             version = "1.5.0";
             src = fetchHex {
@@ -25506,15 +14830,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/nurugger07/inflex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     inflex = inflex_1_5_0;
 
     ini_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ini";
             version = "0.0.1";
             src = fetchHex {
@@ -25529,40 +14853,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/nathanjohnson320/ini";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ini = ini_0_0_1;
 
-    inquisitor_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, ecto_2_0_0_beta_2 }:
-          buildMix {
-            name = "inquisitor";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "inquisitor";
-              version = "0.1.0";
-              sha256 =
-                "06a2cbfba419cc1d81f9c6a62a7f501f3aabaf991b514aa2b012c582c50609bd";
-            };
-            beamDeps  = [ ecto_2_0_0_beta_2 ];
-
-            meta = {
-              description = ''Easily build extendable and composable Ecto
-                            queries.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/dockyard/inquisitor";
-            };
-          }
-      ) {};
-
-    inquisitor = inquisitor_0_1_0;
-
     insert_ordered_set_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "insert_ordered_set";
             version = "0.0.1";
             src = fetchHex {
@@ -25582,40 +14881,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/localshred/insert_ordered_set";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     insert_ordered_set = insert_ordered_set_0_0_1;
 
-    insight_0_1_3 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "insight";
-            version = "0.1.3";
-            src = fetchHex {
-              pkg = "insight";
-              version = "0.1.3";
-              sha256 =
-                "5d7519317e4235d56128bef37a5319308921eab748df3295f1fa2842763a6ea3";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Elixir package for consuming any Insight-powered
-                            Bitcoin explorer.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/stampery/elixir-insight";
-            };
-          }
-      ) {};
-
-    insight = insight_0_1_3;
-
     insights_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "insights";
             version = "0.0.2";
             src = fetchHex {
@@ -25631,41 +14905,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/gullitmiranda/insights";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     insights = insights_0_0_2;
 
-    instream_0_10_0 = callPackage
-      (
-        {
-          buildMix, fetchHex, poolboy_1_5_1, poison_1_0_3, hackney_1_6_0
-        }:
-          buildMix {
-            name = "instream";
-            version = "0.10.0";
-            src = fetchHex {
-              pkg = "instream";
-              version = "0.10.0";
-              sha256 =
-                "e43e1400c6c177cb3295585b2d29312571b1f8aaea643b4f605705db858283c4";
-            };
-            beamDeps  = [ poolboy_1_5_1 poison_1_0_3 hackney_1_6_0 ];
-
-            meta = {
-              description = ''InfluxDB driver for Elixir'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/mneudert/instream";
-            };
-          }
-      ) {};
-
-    instream = instream_0_10_0;
-
     instrumental_0_1_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "instrumental";
             version = "0.1.3";
             src = fetchHex {
@@ -25681,66 +14929,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/undeadlabs/instrumental-ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     instrumental = instrumental_0_1_3;
 
-    intellij_elixir_0_1_2 = callPackage
-      (
-        {  buildMix, fetchHex, exrm_0_14_17 }:
-          buildMix {
-            name = "intellij_elixir";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "intellij_elixir";
-              version = "0.1.2";
-              sha256 =
-                "023e970e20ef19dbd6e818708c687faf9b47b525b9771bc910a4e48adc101a46";
-            };
-            beamDeps  = [ exrm_0_14_17 ];
-
-            meta = {
-              longDescription = ''IntellijElixir allows intellij-elixir to ask
-                                Elixir for the native quoted form of code to
-                                check that intellij-elixir`s quoted form
-                                matches. '';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/KronicDeth/intellij_elixir";
-            };
-          }
-      ) {};
-
-    intellij_elixir = intellij_elixir_0_1_2;
-
-    iona_0_2_1 = callPackage
-      (
-        {  buildMix, fetchHex, porcelain_2_0_1, briefly_0_3_0 }:
-          buildMix {
-            name = "iona";
-            version = "0.2.1";
-            src = fetchHex {
-              pkg = "iona";
-              version = "0.2.1";
-              sha256 =
-                "6c990a1a3dcf144f26d5ce773b4f4538c53ed259c775818991bd28f516317bd5";
-            };
-            beamDeps  = [ porcelain_2_0_1 briefly_0_3_0 ];
-
-            meta = {
-              description = ''Document generation using LaTeX'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/CargoSense/iona";
-            };
-          }
-      ) {};
-
-    iona = iona_0_2_1;
-
     iplist_1_0_2 = callPackage
       (
-        {  buildMix, fetchHex, earmark_0_2_1, cidr_1_0_0 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          earmark_0_2_1,
+          cidr_1_0_0
+        }:
+          buildMix ({
             name = "iplist";
             version = "1.0.2";
             src = fetchHex {
@@ -25757,15 +14960,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/digitalronin/iplist";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     iplist = iplist_1_0_2;
 
     iptools_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "iptools";
             version = "0.0.1";
             src = fetchHex {
@@ -25781,15 +14984,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/blackfist/iptools";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     iptools = iptools_0_0_1;
 
     is_chinese_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "is_chinese";
             version = "1.0.0";
             src = fetchHex {
@@ -25804,15 +15007,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/lidashuang/is_chinese";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     is_chinese = is_chinese_1_0_0;
 
     is_email_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "is_email";
             version = "0.0.2";
             src = fetchHex {
@@ -25828,15 +15031,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/johnotander/is_email";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     is_email = is_email_0_0_2;
 
     is_up_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, httpotion_2_2_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, httpotion_2_2_2 }:
+          buildMix ({
             name = "is_up";
             version = "1.0.0";
             src = fetchHex {
@@ -25852,15 +15055,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/johnotander/is_up";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     is_up = is_up_1_0_0;
 
     is_url_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "is_url";
             version = "0.0.1";
             src = fetchHex {
@@ -25875,15 +15078,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/johnotander/is_url";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     is_url = is_url_0_0_1;
 
     isaac_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "isaac";
             version = "0.0.1";
             src = fetchHex {
@@ -25904,65 +15107,21 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/arianvp/elixir-isaac";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     isaac = isaac_0_0_1;
 
-    isbndbex_0_0_1 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, credo_0_3_2
-        }:
-          buildMix {
-            name = "isbndbex";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "isbndbex";
-              version = "0.0.1";
-              sha256 =
-                "565fe2ea413d0ec50d51c166ad1dd5dc840c3cdb01e70467484017aa6b14d1f9";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 credo_0_3_2 ];
-
-            meta = {
-              description = ''Elixir wrapper for isbndb.com json api.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/rcoedo/isbndbex";
-            };
-          }
-      ) {};
-
-    isbndbex = isbndbex_0_0_1;
-
-    isn_1_0_0 = callPackage
-      (
-        {  buildMix, fetchHex, postgrex_0_11_1, ecto_2_0_0_beta_2 }:
-          buildMix {
-            name = "isn";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "isn";
-              version = "1.0.0";
-              sha256 =
-                "08fe62a8fa20333f65e750d7e4abe8c2f215994e514e495178fa718b5a4e3673";
-            };
-            beamDeps  = [ postgrex_0_11_1 ecto_2_0_0_beta_2 ];
-
-            meta = {
-              description = ''Ecto types for the postgreSQL isn extension.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/Frost/isn";
-            };
-          }
-      ) {};
-
-    isn = isn_1_0_0;
-
     iso3166_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0, floki_0_8_0 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          floki_0_8_0
+        }:
+          buildMix ({
             name = "iso3166";
             version = "0.0.3";
             src = fetchHex {
@@ -25981,174 +15140,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/joelpm/iso3166ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     iso3166 = iso3166_0_0_3;
 
-    ja_serializer_0_8_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          scrivener_1_1_2,
-          poison_1_0_3,
-          plug_1_1_3,
-          inflex_1_5_0,
-          ecto_2_0_0_beta_2
-        }:
-          buildMix {
-            name = "ja_serializer";
-            version = "0.8.1";
-            src = fetchHex {
-              pkg = "ja_serializer";
-              version = "0.8.1";
-              sha256 =
-                "5f68d075f32456e6de55297601c65a8b2a8144135c6adbb51d13c6d0db338b93";
-            };
-            beamDeps  = [
-                          scrivener_1_1_2
-                          poison_1_0_3
-                          plug_1_1_3
-                          inflex_1_5_0
-                          ecto_2_0_0_beta_2
-                        ];
-
-            meta = {
-              longDescription = ''A serialization library implementing the
-                                jsonapi.org 1.0 spec suitable for use building
-                                JSON APIs in Pheonix, Relax, or any other plug
-                                based framework/library.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/AgilionApps/ja_serializer";
-            };
-          }
-      ) {};
-
-    ja_serializer = ja_serializer_0_8_1;
-
-    janrain_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2 }:
-          buildMix {
-            name = "janrain";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "janrain";
-              version = "0.0.1";
-              sha256 =
-                "35299ee088dfd5647e7a5cd129d5011f2d6319fe53045b2a8ce3ddf70792cc78";
-            };
-            beamDeps  = [ httpoison_0_8_2 ];
-
-            meta = {
-              longDescription = ''A small library to help with Janrain logins.
-                                Probably most useful when used in conjuction
-                                with Phoenix and Guardian.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/rickr/janrain";
-            };
-          }
-      ) {};
-
-    janrain = janrain_0_0_1;
-
-    japanese_holiday_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, timex_0_12_9 }:
-          buildMix {
-            name = "japanese_holiday";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "japanese_holiday";
-              version = "0.0.2";
-              sha256 =
-                "3363e2062dbdad48de88d092c549e8b55eecc2d86a61168578e54e6ba9065eaf";
-            };
-            beamDeps  = [ timex_0_12_9 ];
-
-            meta = {
-              description = ''An elixir library for japanese holiday '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/Joe-noh/japanese_holiday";
-            };
-          }
-      ) {};
-
-    japanese_holiday = japanese_holiday_0_0_2;
-
-    jazz_0_1_2 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "jazz";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "jazz";
-              version = "0.1.2";
-              sha256 =
-                "db316e2334f3dc3745dc208eba1900471d52713e2c65b7b83cb913deffd5f4a7";
-            };
-
-            meta = {
-              description = ''JSON handling library for Elixir.'';
-              license = stdenv.lib.licenses.wtfpl;
-              homepage = "https://github.com/meh/jazz";
-            };
-          }
-      ) {};
-
-    jazz_0_2_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "jazz";
-            version = "0.2.1";
-            src = fetchHex {
-              pkg = "jazz";
-              version = "0.2.1";
-              sha256 =
-                "1c239947305efba0f3e48786a815fd512d49af4acf61914c03ebb18cc79c0477";
-            };
-
-            meta = {
-              description = ''JSON handling library for Elixir.'';
-              license = stdenv.lib.licenses.wtfpl;
-              homepage = "https://github.com/meh/jazz";
-            };
-          }
-      ) {};
-
-    jazz = jazz_0_2_1;
-
-    jc_1_0_4 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "jc";
-            version = "1.0.4";
-            src = fetchHex {
-              pkg = "jc";
-              version = "1.0.4";
-              sha256 =
-                "8bcfe202084109fc80fcf521e630466fc53cbb909aff4283bed43252664023df";
-            };
-
-            meta = {
-              description = ''A simple, distributed, in-memory caching
-                            system'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jr0senblum/jc";
-            };
-          }
-      ) {};
-
-    jc = jc_1_0_4;
-
     jequalson_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "jequalson";
             version = "0.1.1";
             src = fetchHex {
@@ -26163,15 +15163,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/dm1try/jequalson";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jequalson = jequalson_0_1_1;
 
     jesse_0_1_3 = callPackage
       (
-        {  buildRebar3, fetchHex, jsx_2_8_0 }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex, jsx_2_8_0 }:
+          buildRebar3 ({
             name = "jesse";
             version = "0.1.3";
             src = fetchHex {
@@ -26188,15 +15188,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/for-GET/jesse";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jesse = jesse_0_1_3;
 
     jiffy_0_14_7 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "jiffy";
             version = "0.14.7";
             src = fetchHex {
@@ -26212,40 +15212,15 @@ let
               license = with stdenv.lib.licenses; [ mit bsd3 ];
               homepage = "https://github.com/davisp/jiffy";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jiffy = jiffy_0_14_7;
 
-    jira_0_0_8 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "jira";
-            version = "0.0.8";
-            src = fetchHex {
-              pkg = "jira";
-              version = "0.0.8";
-              sha256 =
-                "71c19ef23ea7351a2dc7b8f14d0c5794ff00382fa43a88a2235ec9c1741a73cb";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''An Elixir client library for JIRA + JIRA Agile /
-                            Greenhopper'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jeffweiss/jira";
-            };
-          }
-      ) {};
-
-    jira = jira_0_0_8;
-
     jobspool_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, uuid_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, uuid_1_1_3 }:
+          buildMix ({
             name = "jobspool";
             version = "0.1.0";
             src = fetchHex {
@@ -26261,15 +15236,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/flupke/exjobspool";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jobspool = jobspool_0_1_0;
 
     joken_0_13_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "joken";
             version = "0.13.1";
             src = fetchHex {
@@ -26284,13 +15259,20 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/bryanjos/joken";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     joken_0_16_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_3, jose_1_7_3 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          plug_1_1_3,
+          jose_1_7_3
+        }:
+          buildMix ({
             name = "joken";
             version = "0.16.1";
             src = fetchHex {
@@ -26306,37 +15288,20 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/bryanjos/joken";
             };
-          }
+          } // packageOverrides)
       ) {};
 
-    joken_1_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_0_3, plug_1_1_3, jose_1_7_3 }:
-          buildMix {
-            name = "joken";
-            version = "1.1.0";
-            src = fetchHex {
-              pkg = "joken";
-              version = "1.1.0";
-              sha256 =
-                "05e3ff0799b97b8513a5a17a8f57b1d7ee250f32561e559c997c0ecbea462287";
-            };
-            beamDeps  = [ poison_1_0_3 plug_1_1_3 jose_1_7_3 ];
-
-            meta = {
-              description = ''JWT Library for Elixir'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/bryanjos/joken";
-            };
-          }
-      ) {};
-
-    joken = joken_1_1_0;
-
     jolt_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_3, cowboy_1_0_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          plug_1_1_3,
+          cowboy_1_0_4
+        }:
+          buildMix ({
             name = "jolt";
             version = "0.1.0";
             src = fetchHex {
@@ -26355,15 +15320,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/clarkware/jolt";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jolt = jolt_0_1_0;
 
     jorel_mix_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "jorel_mix";
             version = "0.0.1";
             src = fetchHex {
@@ -26378,15 +15343,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/emedia-project/jorel_mix";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jorel_mix = jorel_mix_0_0_1;
 
     jose_1_4_2 = callPackage
       (
-        {  buildMix, fetchHex, base64url_0_0_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, base64url_0_0_1 }:
+          buildMix ({
             name = "jose";
             version = "1.4.2";
             src = fetchHex {
@@ -26403,13 +15368,13 @@ let
               license = stdenv.lib.licenses.mpl20;
               homepage = "https://github.com/potatosalad/erlang-jose";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jose_1_7_3 = callPackage
       (
-        {  buildMix, fetchHex, base64url_0_0_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, base64url_0_0_1 }:
+          buildMix ({
             name = "jose";
             version = "1.7.3";
             src = fetchHex {
@@ -26426,15 +15391,15 @@ let
               license = stdenv.lib.licenses.mpl20;
               homepage = "https://github.com/potatosalad/erlang-jose";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jose = jose_1_7_3;
 
     jsex_2_0_0 = callPackage
       (
-        {  buildMix, fetchHex, jsx_2_8_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, jsx_2_8_0 }:
+          buildMix ({
             name = "jsex";
             version = "2.0.0";
             src = fetchHex {
@@ -26450,15 +15415,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/talentdeficit/jsex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jsex = jsex_2_0_0;
 
     json_0_3_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "json";
             version = "0.3.3";
             src = fetchHex {
@@ -26474,15 +15439,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/cblage/elixir-json";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     json = json_0_3_3;
 
     json_diff_ex_0_5_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "json_diff_ex";
             version = "0.5.0";
             src = fetchHex {
@@ -26497,15 +15462,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/olafura/json_diff_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     json_diff_ex = json_diff_ex_0_5_0;
 
     json_logger_0_5_1 = callPackage
       (
-        {  buildMix, fetchHex, json_0_3_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, json_0_3_3 }:
+          buildMix ({
             name = "json_logger";
             version = "0.5.1";
             src = fetchHex {
@@ -26522,15 +15487,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/LeeroyDing/json_logger";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     json_logger = json_logger_0_5_1;
 
     json_pointer_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "json_pointer";
             version = "0.0.2";
             src = fetchHex {
@@ -26547,15 +15512,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/xavier/json_pointer";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     json_pointer = json_pointer_0_0_2;
 
     json_web_token_0_2_4 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
+          buildMix ({
             name = "json_web_token";
             version = "0.2.4";
             src = fetchHex {
@@ -26572,15 +15537,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/garyf/json_web_token_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     json_web_token = json_web_token_0_2_4;
 
     jsonapi_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "jsonapi";
             version = "0.1.0";
             src = fetchHex {
@@ -26593,20 +15558,20 @@ let
 
             meta = {
               longDescription = ''Fully functional JSONAPI V1 Serializer as
-                                well as a QueryParser for Plug bases projects
+                                well as a QueryParser for Plug based projects
                                 and applications.'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/jeregrine/jsonapi";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jsonapi = jsonapi_0_1_0;
 
     jsone_1_2_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "jsone";
             version = "1.2.1";
             src = fetchHex {
@@ -26621,15 +15586,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/sile/jsone";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jsone = jsone_1_2_1;
 
     jsx_1_4_5 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "jsx";
             version = "1.4.5";
             src = fetchHex {
@@ -26646,13 +15611,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/talentdeficit/jsx";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jsx_2_3_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "jsx";
             version = "2.3.1";
             src = fetchHex {
@@ -26669,13 +15634,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/talentdeficit/jsx";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jsx_2_4_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "jsx";
             version = "2.4.0";
             src = fetchHex {
@@ -26692,13 +15657,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/talentdeficit/jsx";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jsx_2_6_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "jsx";
             version = "2.6.1";
             src = fetchHex {
@@ -26715,13 +15680,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/talentdeficit/jsx";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jsx_2_6_2 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "jsx";
             version = "2.6.2";
             src = fetchHex {
@@ -26738,13 +15703,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/talentdeficit/jsx";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jsx_2_7_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "jsx";
             version = "2.7.1";
             src = fetchHex {
@@ -26761,13 +15726,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/talentdeficit/jsx";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jsx_2_8_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "jsx";
             version = "2.8.0";
             src = fetchHex {
@@ -26784,15 +15749,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/talentdeficit/jsx";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jsx = jsx_2_8_0;
 
     jsxd_0_1_10 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "jsxd";
             version = "0.1.10";
             src = fetchHex {
@@ -26808,40 +15773,15 @@ let
               license = stdenv.lib.licenses.cddl;
               homepage = "https://github.com/Licenser/jsxd";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jsxd = jsxd_0_1_10;
 
-    jsxn_0_2_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, jsx_2_8_0 }:
-          buildRebar3 {
-            name = "jsxn";
-            version = "0.2.1";
-            src = fetchHex {
-              pkg = "jsxn";
-              version = "0.2.1";
-              sha256 =
-                "122a52538dc34ddf4a6efcaeb9744fc948d132f3608e96f109a0d1a054fd1f57";
-            };
-
-            beamDeps  = [ jsx_2_8_0 ];
-
-            meta = {
-              description = ''jsx but with maps'';
-
-              homepage = "https://github.com/talentdeficit/jsxn";
-            };
-          }
-      ) {};
-
-    jsxn = jsxn_0_2_1;
-
     junit_formatter_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "junit_formatter";
             version = "1.0.0";
             src = fetchHex {
@@ -26859,15 +15799,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/victorolinasc/junit-formatter";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     junit_formatter = junit_formatter_1_0_0;
 
     jwalk_1_1_2 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "jwalk";
             version = "1.1.2";
             src = fetchHex {
@@ -26884,15 +15824,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/jr0senblum/jwalk";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jwalk = jwalk_1_1_2;
 
     jwt_0_1_2 = callPackage
       (
-        {  buildRebar3, fetchHex, jsx_2_8_0, base64url_0_0_1 }:
-          buildRebar3 {
+        {
+          buildRebar3,
+          packageOverrides ? {},
+          fetchHex,
+          jsx_2_8_0,
+          base64url_0_0_1
+        }:
+          buildRebar3 ({
             name = "jwt";
             version = "0.1.2";
             src = fetchHex {
@@ -26909,15 +15855,17 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/artemeff/jwt";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jwt = jwt_0_1_2;
 
     jwt_claims_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, json_web_token_0_2_4 }:
-          buildMix {
+        {
+          buildMix, packageOverrides ? {}, fetchHex, json_web_token_0_2_4
+        }:
+          buildMix ({
             name = "jwt_claims";
             version = "0.0.3";
             src = fetchHex {
@@ -26934,15 +15882,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/garyf/jwt_claims_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jwt_claims = jwt_claims_0_0_3;
 
     jwtex_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_3_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_1_3_1 }:
+          buildMix ({
             name = "jwtex";
             version = "0.0.1";
             src = fetchHex {
@@ -26958,15 +15906,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "http://github.com/mschae/jwtex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     jwtex = jwtex_0_0_1;
 
     k6_bytea_1_1_5 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "k6_bytea";
             version = "1.1.5";
             src = fetchHex {
@@ -26976,20 +15924,22 @@ let
                 "1ce4ca84bbe45890bc3c07809f8e01fb80c4613226fbd318aaac73d4cd233132";
             };
             compilePorts = true;
+            buildPlugins  = [ pc ];
+
 
             meta = {
               description = ''A mutable byte array for Erlang.'';
               license = stdenv.lib.licenses.mit;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     k6_bytea = k6_bytea_1_1_5;
 
     kafka_ex_0_5_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "kafka_ex";
             version = "0.5.0";
             src = fetchHex {
@@ -27004,15 +15954,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/kafkaex/kafka_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     kafka_ex = kafka_ex_0_5_0;
 
     kaguya_0_4_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "kaguya";
             version = "0.4.1";
             src = fetchHex {
@@ -27030,15 +15980,21 @@ let
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/Luminarys/Kaguya";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     kaguya = kaguya_0_4_1;
 
     kalecto_0_3_3 = callPackage
       (
-        {  buildRebar3, fetchHex, kalends_0_6_5, ecto_0_16_0 }:
-          buildRebar3 {
+        {
+          buildRebar3,
+          packageOverrides ? {},
+          fetchHex,
+          kalends_0_6_5,
+          ecto_0_16_0
+        }:
+          buildRebar3 ({
             name = "kalecto";
             version = "0.3.3";
             src = fetchHex {
@@ -27057,15 +16013,17 @@ let
 
               homepage = "https://github.com/lau/kalecto";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     kalecto = kalecto_0_3_3;
 
     kalends_0_6_5 = callPackage
       (
-        {  buildRebar3, fetchHex, tzdata_0_1_201603 }:
-          buildRebar3 {
+        {
+          buildRebar3, packageOverrides ? {}, fetchHex, tzdata_0_1_201603
+        }:
+          buildRebar3 ({
             name = "kalends";
             version = "0.6.5";
             src = fetchHex {
@@ -27084,76 +16042,22 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/lau/kalends";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     kalends = kalends_0_6_5;
 
-    kane_0_0_5 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, goth_0_0_3
-        }:
-          buildMix {
-            name = "kane";
-            version = "0.0.5";
-            src = fetchHex {
-              pkg = "kane";
-              version = "0.0.5";
-              sha256 =
-                "e4865178b16793d4f947dee2f21448b3639fad2b1edeb515df67707cf30dc2c3";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 goth_0_0_3 ];
-
-            meta = {
-              longDescription = ''A library for interacting with Google Cloud
-                                Pub/Sub (PubSub). Supports both publication and
-                                pull subscription'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/peburrows/kane";
-            };
-          }
-      ) {};
-
-    kane = kane_0_0_5;
-
-    katipo_0_3_2 = callPackage
-      (
-        {
-          buildRebar3, fetchHex, quintana_0_2_0, gproc_0_5_0, cowlib_1_0_0
-        }:
-          buildRebar3 {
-            name = "katipo";
-            version = "0.3.2";
-            src = fetchHex {
-              pkg = "katipo";
-              version = "0.3.2";
-              sha256 =
-                "b940c01fcffd5609bf325eb15b7e6bfbbf19f57b9fa39d7117cf16b8d0df0890";
-            };
-            compilePorts = true;
-            beamDeps  = [ quintana_0_2_0 gproc_0_5_0 cowlib_1_0_0 ];
-
-            meta = {
-              description = ''HTTP client based on libcurl'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/puzza007/katipo";
-            };
-          }
-      ) {};
-
-    katipo = katipo_0_3_2;
-
     kcl_0_4_1 = callPackage
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           salsa20_0_3_0,
           poly1305_0_4_0,
           curve25519_0_1_0
         }:
-          buildMix {
+          buildMix ({
             name = "kcl";
             version = "0.4.1";
             src = fetchHex {
@@ -27169,65 +16073,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mwmiller/kcl";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     kcl = kcl_0_4_1;
 
-    keccakf1600_2_0_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "keccakf1600";
-            version = "2.0.0";
-            src = fetchHex {
-              pkg = "keccakf1600";
-              version = "2.0.0";
-              sha256 =
-                "bf381475f5d1daf1df2f46bf24d1d4b91debb638b5a6b014cdce40e32eee8f07";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''Keccak-f[1600] asynchronous port driver'';
-              license = stdenv.lib.licenses.mpl20;
-              homepage = "https://github.com/potatosalad/erlang-keccakf1600";
-            };
-          }
-      ) {};
-
-    keccakf1600 = keccakf1600_2_0_0;
-
-    keelless_0_1_0 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, hackney_1_4_4
-        }:
-          buildMix {
-            name = "keelless";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "keelless";
-              version = "0.1.0";
-              sha256 =
-                "b038600bb0520975a052fe6852a2dcd0dbd1069309134c617519079037d6927e";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 hackney_1_4_4 ];
-
-            meta = {
-              description = ''Keen IO API for Elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/hpyhacking/keelless";
-            };
-          }
-      ) {};
-
-    keelless = keelless_0_1_0;
-
     keenex_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_3_1, httpotion_2_2_2 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_3_1,
+          httpotion_2_2_2
+        }:
+          buildMix ({
             name = "keenex";
             version = "0.2.0";
             src = fetchHex {
@@ -27243,41 +16103,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bryanjos/keenex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     keenex = keenex_0_2_0;
 
-    kerosene_0_0_1 = callPackage
-      (
-        {
-          buildMix, fetchHex, phoenix_html_2_0_0_dev, ecto_2_0_0_beta_2
-        }:
-          buildMix {
-            name = "kerosene";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "kerosene";
-              version = "0.0.1";
-              sha256 =
-                "a4a54d2ac3179a4b14b2c115740294003cae23cf30adaad203310d79451d5ddd";
-            };
-            beamDeps  = [ phoenix_html_2_0_0_dev ecto_2_0_0_beta_2 ];
-
-            meta = {
-              description = ''Pagination for Ecto and Phoenix.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/elixirdrops/kerosene";
-            };
-          }
-      ) {};
-
-    kerosene = kerosene_0_0_1;
-
     key2value_1_5_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "key2value";
             version = "1.5.1";
             src = fetchHex {
@@ -27292,15 +16126,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/okeuday/key2value";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     key2value = key2value_1_5_1;
 
     keys1value_1_5_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "keys1value";
             version = "1.5.1";
             src = fetchHex {
@@ -27315,41 +16149,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/okeuday/keys1value";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     keys1value = keys1value_1_5_1;
 
-    kindred_0_0_1 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_2_0_1, httpoison_0_8_2, ex_rated_1_2_2
-        }:
-          buildMix {
-            name = "kindred";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "kindred";
-              version = "0.0.1";
-              sha256 =
-                "48b229e007f3d6d06e38f49c85598c20fb6e76d92afd441a86fdee931c2f5fc2";
-            };
-            beamDeps  = [ poison_2_0_1 httpoison_0_8_2 ex_rated_1_2_2 ];
-
-            meta = {
-              description = ''League of Legends API client written in Elixir'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/matthewferderber/kindred";
-            };
-          }
-      ) {};
-
-    kindred = kindred_0_0_1;
-
     kitsune_0_5_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
+          buildMix ({
             name = "kitsune";
             version = "0.5.2";
             src = fetchHex {
@@ -27367,87 +16175,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/edubkendo/kitsune";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     kitsune = kitsune_0_5_2;
 
-    kovacs_0_9_2 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "kovacs";
-            version = "0.9.2";
-            src = fetchHex {
-              pkg = "kovacs";
-              version = "0.9.2";
-              sha256 =
-                "0d6fc6830f0d22e793b2472d8808e86384596e26b7bdd17becba3af7f0a8495e";
-            };
-
-            meta = {
-              longDescription = ''Kovacs - A simple ExUnit test runner It will
-                                monitor the file system and run test files when
-                                it detects changes. '';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/antp/kovacs";
-            };
-          }
-      ) {};
-
-    kovacs = kovacs_0_9_2;
-
-    kubex_0_1_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "kubex";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "kubex";
-              version = "0.1.1";
-              sha256 =
-                "b0bd22246731b1c4d4d7f832cd0015fd6586022c779fb6672f45a648da7dcf79";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Kubernetes integration for and in pure Elixir.'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/ingerslevio/kubex";
-            };
-          }
-      ) {};
-
-    kubex = kubex_0_1_1;
-
-    kvs_2_1_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "kvs";
-            version = "2.1.0";
-            src = fetchHex {
-              pkg = "kvs";
-              version = "2.1.0";
-              sha256 =
-                "c06382e4dbe8a7dc58201187ddd303e5b1e546713da3a3813863fe62e63dc4c7";
-            };
-
-            meta = {
-              description = ''Erlang Abstract Database'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/synrc/kvs";
-            };
-          }
-      ) {};
-
-    kvs = kvs_2_1_0;
-
     kwfuns_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "kwfuns";
             version = "0.0.4";
             src = fetchHex {
@@ -27462,42 +16198,22 @@ let
                                 keyword parameters with default values defkw
                                 make_list_elem( parent, text, spaced: false,
                                 type: :ul ) do ... end translates to def
-                                make_list_elem( parent, text, keywords \ [] ) do
-                                some_code_with( spaces, typed) end'';
+                                make_list_elem( parent, text, keywords \\ [] )
+                                do some_code_with( spaces, typed) end'';
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/RobertDober/lab42_defkw";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     kwfuns = kwfuns_0_0_4;
 
-    lager_2_1_1 = callPackage
-      (
-        {  buildErlangMk, fetchHex, goldrush_0_1_7 }:
-          buildErlangMk {
-            name = "lager";
-            version = "2.1.1";
-            src = fetchHex {
-              pkg = "lager";
-              version = "2.1.1";
-              sha256 =
-                "5eb1c17ff0f8692285b7648ef5d827d492b8d7554da782afc300ebb4861d5aba";
-            };
-            beamDeps  = [ goldrush_0_1_7 ];
-
-            meta = {
-              description = ''Erlang logging framework'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/basho/lager";
-            };
-          }
-      ) {};
-
     lager_3_0_1 = callPackage
       (
-        {  buildRebar3, fetchHex, goldrush_0_1_7 }:
-          buildRebar3 {
+        {
+          buildRebar3, packageOverrides ? {}, fetchHex, goldrush_0_1_7
+        }:
+          buildRebar3 ({
             name = "lager";
             version = "3.0.1";
             src = fetchHex {
@@ -27514,13 +16230,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/basho/lager";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     lager_3_0_2 = callPackage
       (
-        {  buildRebar3, fetchHex, goldrush_0_1_7 }:
-          buildRebar3 {
+        {
+          buildRebar3, packageOverrides ? {}, fetchHex, goldrush_0_1_7
+        }:
+          buildRebar3 ({
             name = "lager";
             version = "3.0.2";
             src = fetchHex {
@@ -27537,15 +16255,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/basho/lager";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     lager = lager_3_0_2;
 
     lager_graylog_0_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex, lager_3_0_2 }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex, lager_3_0_2 }:
+          buildRebar3 ({
             name = "lager_graylog";
             version = "0.1.0";
             src = fetchHex {
@@ -27562,15 +16280,15 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/esl/lager_graylog";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     lager_graylog = lager_graylog_0_1_0;
 
     lager_hipchat_0_2_0 = callPackage
       (
-        {  buildRebar3, fetchHex, lager_3_0_2 }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex, lager_3_0_2 }:
+          buildRebar3 ({
             name = "lager_hipchat";
             version = "0.2.0";
             src = fetchHex {
@@ -27587,15 +16305,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/synlay/lager_hipchat";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     lager_hipchat = lager_hipchat_0_2_0;
 
     lager_logger_1_0_2 = callPackage
       (
-        {  buildMix, fetchHex, lager_3_0_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, lager_3_0_2 }:
+          buildMix ({
             name = "lager_logger";
             version = "1.0.2";
             src = fetchHex {
@@ -27612,15 +16330,21 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/PSPDFKit-labs/lager_logger";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     lager_logger = lager_logger_1_0_2;
 
     lager_logstash_backend_0_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex, lager_3_0_2, jsx_2_6_1 }:
-          buildRebar3 {
+        {
+          buildRebar3,
+          packageOverrides ? {},
+          fetchHex,
+          lager_3_0_2,
+          jsx_2_6_1
+        }:
+          buildRebar3 ({
             name = "lager_logstash_backend";
             version = "0.1.0";
             src = fetchHex {
@@ -27637,64 +16361,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/inaka/lager_logstash_backend.git";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     lager_logstash_backend = lager_logstash_backend_0_1_0;
 
-    lager_watchdog_0_1_10 = callPackage
-      (
-        {  buildRebar3, fetchHex, lager_2_1_1 }:
-          buildRebar3 {
-            name = "lager_watchdog";
-            version = "0.1.10";
-            src = fetchHex {
-              pkg = "lager_watchdog";
-              version = "0.1.10";
-              sha256 =
-                "ac2a5f7d519fa69fff3d41c5c19419552085346f98de4378ca38efa81c322a94";
-            };
-
-            beamDeps  = [ lager_2_1_1 ];
-
-            meta = {
-              description = ''lager provider to send data to watchdog.'';
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/project-fifo/lager_watchdog";
-            };
-          }
-      ) {};
-
-    lager_watchdog = lager_watchdog_0_1_10;
-
-    lasp_0_0_5 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "lasp";
-            version = "0.0.5";
-            src = fetchHex {
-              pkg = "lasp";
-              version = "0.0.5";
-              sha256 =
-                "0298ef6ad4a35a3ac93ad64c722adc852d45b2d9f8fb76b47edf257481150349";
-            };
-
-            meta = {
-              description = ''Declarative, distributed, eventually consistent
-                            compuations.'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/lasp-lang/lasp";
-            };
-          }
-      ) {};
-
-    lasp = lasp_0_0_5;
-
     lasse_1_1_0 = callPackage
       (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
+        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
+          buildErlangMk ({
             name = "lasse";
             version = "1.1.0";
             src = fetchHex {
@@ -27709,65 +16384,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/inaka/lasse";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     lasse = lasse_1_1_0;
 
-    lazymaru_0_2_5 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_3_1, plug_0_9_0, cowboy_1_0_4 }:
-          buildMix {
-            name = "lazymaru";
-            version = "0.2.5";
-            src = fetchHex {
-              pkg = "lazymaru";
-              version = "0.2.5";
-              sha256 =
-                "aeb7d963ddcd48791014922dc93030b182ee1fb13b7efbe041190c92cf1e939e";
-            };
-            beamDeps  = [ poison_1_3_1 plug_0_9_0 cowboy_1_0_4 ];
-
-            meta = {
-              description = ''Elixir copy of grape for creating REST-like
-                            APIs.'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/falood/lazymaru";
-            };
-          }
-      ) {};
-
-    lazymaru = lazymaru_0_2_5;
-
-    ledx_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, elixir_ale_0_4_1 }:
-          buildMix {
-            name = "ledx";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "ledx";
-              version = "0.0.1";
-              sha256 =
-                "f468e65572b7c9dcb6c906678c873194818bb1dd78ce35b7dddd9397df4f81a6";
-            };
-            beamDeps  = [ elixir_ale_0_4_1 ];
-
-            meta = {
-              description = ''Ledx is a simple library for interfacing with
-                            LEDs on embedded platforms.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/danmarcab/ledx";
-            };
-          }
-      ) {};
-
-    ledx = ledx_0_0_1;
-
     left_pad_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "left_pad";
             version = "0.0.3";
             src = fetchHex {
@@ -27783,15 +16408,15 @@ let
               license = stdenv.lib.licenses.mpl20;
               homepage = "https://github.com/folz/left_pad.ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     left_pad = left_pad_0_0_3;
 
     leftpad_1_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "leftpad";
             version = "1.0.1";
             src = fetchHex {
@@ -27803,19 +16428,19 @@ let
 
             meta = {
               description = ''left pad for elixir, because why not?
-                            ¯\_(ツ)_/¯'';
+                            ¯\\_(ツ)_/¯'';
               license = stdenv.lib.licenses.unlicense;
               homepage = "https://github.com/colinrymer/leftpad.ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     leftpad = leftpad_1_0_1;
 
     level_1_0_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "level";
             version = "1.0.0";
             src = fetchHex {
@@ -27832,15 +16457,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/gausby/level";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     level = level_1_0_0;
 
     lex_luthor_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "lex_luthor";
             version = "0.1.0";
             src = fetchHex {
@@ -27857,15 +16482,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/jamesotron/lex_luthor";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     lex_luthor = lex_luthor_0_1_0;
 
     lfsr_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "lfsr";
             version = "0.0.2";
             src = fetchHex {
@@ -27881,15 +16506,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/pma/lfsr";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     lfsr = lfsr_0_0_2;
 
     lhttpc_1_3_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "lhttpc";
             version = "1.3.0";
             src = fetchHex {
@@ -27904,13 +16529,13 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/talko/lhttpc";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     lhttpc_1_4_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "lhttpc";
             version = "1.4.0";
             src = fetchHex {
@@ -27925,147 +16550,17 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/talko/lhttpc";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     lhttpc = lhttpc_1_4_0;
 
-    libchunter_0_1_46 = callPackage
-      (
-        {  buildRebar3, fetchHex, lager_2_1_1, fifo_spec_0_1_27 }:
-          buildRebar3 {
-            name = "libchunter";
-            version = "0.1.46";
-            src = fetchHex {
-              pkg = "libchunter";
-              version = "0.1.46";
-              sha256 =
-                "39f117de7cd71e65c793380266595b5b8fdd29edb8ca28b114efbaa2866eba90";
-            };
-
-            beamDeps  = [ lager_2_1_1 fifo_spec_0_1_27 ];
-
-            meta = {
-              description = ''Chunter interface library.'';
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/project-fifo/libchunter";
-            };
-          }
-      ) {};
-
-    libchunter = libchunter_0_1_46;
-
-    libdecaf_0_0_2 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "libdecaf";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "libdecaf";
-              version = "0.0.2";
-              sha256 =
-                "1e4ab8b542388941118927ae45021c4fb8097f9cce5c2d875624c330adc92b0a";
-            };
-            compilePorts = true;
-
-            meta = {
-              longDescription = ''libdecaf NIF for ECDH (X25519, X448), EdDSA
-                                (Ed25519, Ed25519ph, Ed448, Ed448ph),
-                                curve25519, curve448'';
-              license = stdenv.lib.licenses.mpl20;
-              homepage = "https://github.com/potatosalad/erlang-libdecaf";
-            };
-          }
-      ) {};
-
-    libdecaf = libdecaf_0_0_2;
-
-    libex_config_0_2_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "libex_config";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "libex_config";
-              version = "0.2.0";
-              sha256 =
-                "27534209d8661d597017426922d64267f2452baac36866ba0bb470792f55292d";
-            };
-
-            meta = {
-              description = ''LibEx.Config exposes helpers around accessing OTP
-                            application configuration. '';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/reset/libex-config";
-            };
-          }
-      ) {};
-
-    libex_config = libex_config_0_2_0;
-
-    libhowl_0_1_34 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          mdns_client_lib_0_1_38,
-          lager_2_1_1,
-          fifo_spec_0_1_27
-        }:
-          buildRebar3 {
-            name = "libhowl";
-            version = "0.1.34";
-            src = fetchHex {
-              pkg = "libhowl";
-              version = "0.1.34";
-              sha256 =
-                "d358c609db2f09d05d51fc73e78b0fbddedbe4cbbc298711e664bfbf0662e10d";
-            };
-
-            beamDeps  = [ mdns_client_lib_0_1_38 lager_2_1_1 fifo_spec_0_1_27
-                      ];
-
-            meta = {
-              description = ''howl client library'';
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/project-fifo/libhowl";
-            };
-          }
-      ) {};
-
-    libhowl = libhowl_0_1_34;
-
-    libleofs_0_1_2 = callPackage
-      (
-        {  buildRebar3, fetchHex, jsx_1_4_5 }:
-          buildRebar3 {
-            name = "libleofs";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "libleofs";
-              version = "0.1.2";
-              sha256 =
-                "62c39168e30a94e6bf0c3b3677995f5735ca03358465a6756db01a75c4e5c04b";
-            };
-
-            beamDeps  = [ jsx_1_4_5 ];
-
-            meta = {
-              description = ''LeoFS management library.'';
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/project-fifo/libleofs";
-            };
-          }
-      ) {};
-
-    libleofs = libleofs_0_1_2;
-
     librex_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, secure_random_0_2_0 }:
-          buildMix {
+        {
+          buildMix, packageOverrides ? {}, fetchHex, secure_random_0_2_0
+        }:
+          buildMix ({
             name = "librex";
             version = "1.0.0";
             src = fetchHex {
@@ -28082,89 +16577,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ricn/librex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     librex = librex_1_0_0;
 
-    libsnarl_0_3_40 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          oauth2_erlang_0_6_1,
-          mdns_client_lib_0_1_33,
-          libsnarlmatch_0_1_7,
-          lager_3_0_2,
-          fifo_spec_0_1_27
-        }:
-          buildRebar3 {
-            name = "libsnarl";
-            version = "0.3.40";
-            src = fetchHex {
-              pkg = "libsnarl";
-              version = "0.3.40";
-              sha256 =
-                "fd574da4318b2732dd275fed371d13cd6ed4d0424e7acc3e0429ea97859fabbf";
-            };
-
-            beamDeps  = [
-                          oauth2_erlang_0_6_1
-                          mdns_client_lib_0_1_33
-                          libsnarlmatch_0_1_7
-                          lager_3_0_2
-                          fifo_spec_0_1_27
-                        ];
-
-            meta = {
-              description = ''snarl interface library'';
-
-            };
-          }
-      ) {};
-
-    libsnarl_0_3_44 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          oauth2_erlang_0_6_1,
-          mdns_client_lib_0_1_38,
-          libsnarlmatch_0_1_7,
-          lager_2_1_1,
-          fifo_spec_0_1_27
-        }:
-          buildRebar3 {
-            name = "libsnarl";
-            version = "0.3.44";
-            src = fetchHex {
-              pkg = "libsnarl";
-              version = "0.3.44";
-              sha256 =
-                "a77b2f532758a7016c375ddf16e316d5a4a727c65418bf7255ed158c8b1e243c";
-            };
-
-            beamDeps  = [
-                          oauth2_erlang_0_6_1
-                          mdns_client_lib_0_1_38
-                          libsnarlmatch_0_1_7
-                          lager_2_1_1
-                          fifo_spec_0_1_27
-                        ];
-
-            meta = {
-              description = ''snarl interface library'';
-
-            };
-          }
-      ) {};
-
-    libsnarl = libsnarl_0_3_44;
-
     libsnarlmatch_0_1_7 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "libsnarlmatch";
             version = "0.1.7";
             src = fetchHex {
@@ -28179,71 +16600,15 @@ let
               license = stdenv.lib.licenses.cddl;
               homepage = "https://github.com/project-fifo/libsnarlmatch";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     libsnarlmatch = libsnarlmatch_0_1_7;
 
-    libsniffle_0_3_45 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          mdns_client_lib_0_1_38,
-          lager_2_1_1,
-          fifo_spec_0_1_27
-        }:
-          buildRebar3 {
-            name = "libsniffle";
-            version = "0.3.45";
-            src = fetchHex {
-              pkg = "libsniffle";
-              version = "0.3.45";
-              sha256 =
-                "906329c2a54689f74a53a3cd3fa1fc96ad88be326860227e4a2c731ab40738ed";
-            };
-
-            beamDeps  = [ mdns_client_lib_0_1_38 lager_2_1_1 fifo_spec_0_1_27
-                      ];
-
-            meta = {
-              description = ''Sniffle API'';
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/project-fifo/libsniffle";
-            };
-          }
-      ) {};
-
-    libsniffle = libsniffle_0_3_45;
-
-    libsodium_0_0_4 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "libsodium";
-            version = "0.0.4";
-            src = fetchHex {
-              pkg = "libsodium";
-              version = "0.0.4";
-              sha256 =
-                "0ace378dd062546571e0607bddf96fe1dcf62a871fab42b4542328e3bca4b38a";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''libsodium port driver'';
-              license = stdenv.lib.licenses.mpl20;
-              homepage = "https://github.com/potatosalad/erlang-libsodium";
-            };
-          }
-      ) {};
-
-    libsodium = libsodium_0_0_4;
-
     lineo_0_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "lineo";
             version = "0.1.0";
             src = fetchHex {
@@ -28257,15 +16622,15 @@ let
                license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/camshaft/lineo";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     lineo = lineo_0_1_0;
 
     linguist_0_1_5 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "linguist";
             version = "0.1.5";
             src = fetchHex {
@@ -28280,38 +16645,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/chrismccord/linguist";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     linguist = linguist_0_1_5;
 
-    link_shrinkex_1_0_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "link_shrinkex";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "link_shrinkex";
-              version = "1.0.0";
-              sha256 =
-                "2c7d99b23849f90d9aec8cd4f9960c6c198351735eda754288b778fe0e5f7e82";
-            };
-
-            meta = {
-              description = ''Google`s URL Shortener API for Elixir. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jonahoffline/link_shrinkex";
-            };
-          }
-      ) {};
-
-    link_shrinkex = link_shrinkex_1_0_0;
-
     liquid_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "liquid";
             version = "0.1.0";
             src = fetchHex {
@@ -28326,15 +16668,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/nulian/liquid-elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     liquid = liquid_0_1_0;
 
     lob_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0, chacha20_0_3_2 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          chacha20_0_3_2
+        }:
+          buildMix ({
             name = "lob";
             version = "0.1.0";
             src = fetchHex {
@@ -28350,41 +16698,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mwmiller/lob_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     lob = lob_0_1_0;
 
-    locker_1_0_8 = callPackage
-      (
-        {  buildRebar3, fetchHex, proper_1_1_1_beta }:
-          buildRebar3 {
-            name = "locker";
-            version = "1.0.8";
-            src = fetchHex {
-              pkg = "locker";
-              version = "1.0.8";
-              sha256 =
-                "9cf9890e6b12dab7b8d1997c455348742db6caf2eaac3b64c514cd4e8dca2b56";
-            };
-
-            beamDeps  = [ proper_1_1_1_beta ];
-
-            meta = {
-              longDescription = ''Distributed de-centralized consistent
-                                in-memory key-value store written in Erlang.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/wooga/locker";
-            };
-          }
-      ) {};
-
-    locker = locker_1_0_8;
-
     logfmt_3_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "logfmt";
             version = "3.0.2";
             src = fetchHex {
@@ -28400,15 +16722,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/jclem/logfmt-elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     logfmt = logfmt_3_0_2;
 
     logger_file_backend_0_0_7 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "logger_file_backend";
             version = "0.0.7";
             src = fetchHex {
@@ -28423,91 +16745,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/onkel-dirtus/logger_file_backend";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     logger_file_backend = logger_file_backend_0_0_7;
 
-    logger_json_file_backend_0_1_2 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_0_3 }:
-          buildMix {
-            name = "logger_json_file_backend";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "logger_json_file_backend";
-              version = "0.1.2";
-              sha256 =
-                "5734a14534ec57f7b1603c53d091facd4e47d7e5b83cf99d1c73439527d995d9";
-            };
-            beamDeps  = [ poison_1_0_3 ];
-
-            meta = {
-              description = ''Logger backend that write a json map per line to
-                            a file'';
-              license = stdenv.lib.licenses.isc;
-              homepage =
-                "https://github.com/xflagstudio/elixir_logger_json_file_backend";
-            };
-          }
-      ) {};
-
-    logger_json_file_backend = logger_json_file_backend_0_1_2;
-
-    logger_logentries_backend_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "logger_logentries_backend";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "logger_logentries_backend";
-              version = "0.0.1";
-              sha256 =
-                "f3db38f7ab4dc40cd8078bf4cad79ce2a1e759f0f7f2b2dee4fbc3abb8fe3d7e";
-            };
-
-            meta = {
-              longDescription = ''A Logger backend to support the Logentries
-                                service (logentries.com) TCP input log
-                                mechanism'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/sysdia-solutions/logger_logentries_backend";
-            };
-          }
-      ) {};
-
-    logger_logentries_backend = logger_logentries_backend_0_0_1;
-
-    logger_loggly_backend_0_2_0 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2 }:
-          buildMix {
-            name = "logger_loggly_backend";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "logger_loggly_backend";
-              version = "0.2.0";
-              sha256 =
-                "111d0e256ace86e2af366b1afc7152b4aadd3cd6c093d5d2b119c08a84395fd6";
-            };
-            beamDeps  = [ httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Loggly logger backend'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/joeyfeldberg/loggly_backend";
-            };
-          }
-      ) {};
-
-    logger_loggly_backend = logger_loggly_backend_0_2_0;
-
     logger_logstash_backend_2_0_0 = callPackage
       (
-        {  buildMix, fetchHex, timex_2_1_3, exjsx_3_1_0 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          timex_2_1_3,
+          exjsx_3_1_0
+        }:
+          buildMix ({
             name = "logger_logstash_backend";
             version = "2.0.0";
             src = fetchHex {
@@ -28523,15 +16775,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/marcelog/logger_logstash_backend";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     logger_logstash_backend = logger_logstash_backend_2_0_0;
 
     logger_papertrail_backend_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "logger_papertrail_backend";
             version = "0.0.2";
             src = fetchHex {
@@ -28547,15 +16799,21 @@ let
               homepage =
                 "https://github.com/larskrantz/logger_papertrail_backend";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     logger_papertrail_backend = logger_papertrail_backend_0_0_2;
 
     lolcat_0_0_1 = callPackage
       (
-        {  buildRebar3, fetchHex, quickrand_1_5_1, colorful_0_6_0 }:
-          buildRebar3 {
+        {
+          buildRebar3,
+          packageOverrides ? {},
+          fetchHex,
+          quickrand_1_5_1,
+          colorful_0_6_0
+        }:
+          buildRebar3 ({
             name = "lolcat";
             version = "0.0.1";
             src = fetchHex {
@@ -28572,15 +16830,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/restartr/ex-lolcat";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     lolcat = lolcat_0_0_1;
 
     loom_0_0_10 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "loom";
             version = "0.0.10";
             src = fetchHex {
@@ -28596,15 +16854,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/asonge/loom";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     loom = loom_0_0_10;
 
     lru_1_3_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "lru";
             version = "1.3.1";
             src = fetchHex {
@@ -28619,15 +16877,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/barrel-db/erlang-lru";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     lru = lru_1_3_1;
 
     lru_cache_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "lru_cache";
             version = "0.1.0";
             src = fetchHex {
@@ -28642,15 +16900,15 @@ let
 
               homepage = "https://github.com/arago/lru_cache";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     lru_cache = lru_cache_0_1_0;
 
     ltsv_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ltsv";
             version = "0.1.0";
             src = fetchHex {
@@ -28665,15 +16923,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ma2gedev/ltsvex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ltsv = ltsv_0_1_0;
 
     luhn_0_3_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "luhn";
             version = "0.3.1";
             src = fetchHex {
@@ -28688,15 +16946,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ma2gedev/luhn_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     luhn = luhn_0_3_1;
 
     luhnatex_0_5_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "luhnatex";
             version = "0.5.0";
             src = fetchHex {
@@ -28711,93 +16969,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/my-flow/luhnatex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     luhnatex = luhnatex_0_5_0;
 
-    lyn_0_0_16 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          ueberauth_twitter_0_2_2,
-          ueberauth_slack_0_2_0,
-          ueberauth_identity_0_2_3,
-          ueberauth_google_0_2_0,
-          ueberauth_github_0_2_0,
-          ueberauth_facebook_0_3_2,
-          ueberauth_0_2_0,
-          scrivener_1_1_2,
-          postgrex_0_11_1,
-          poolboy_1_5_1,
-          poison_1_5_2,
-          phoenix_html_2_5_1,
-          phoenix_ecto_3_0_0_beta_2,
-          phoenix_1_1_4,
-          json_0_3_3,
-          inflex_1_5_0,
-          guardian_db_0_4_0,
-          guardian_0_9_1,
-          gettext_0_10_0,
-          exos_1_0_0,
-          cowboy_1_0_4,
-          comeonin_2_1_1,
-          absinthe_plug_1_0_0
-        }:
-          buildMix {
-            name = "lyn";
-            version = "0.0.16";
-            src = fetchHex {
-              pkg = "lyn";
-              version = "0.0.16";
-              sha256 =
-                "63eeabb42336605c1fd79addbdf6a3300bb3101e019be9279f69a98c86345660";
-            };
-            beamDeps  = [
-                          ueberauth_twitter_0_2_2
-                          ueberauth_slack_0_2_0
-                          ueberauth_identity_0_2_3
-                          ueberauth_google_0_2_0
-                          ueberauth_github_0_2_0
-                          ueberauth_facebook_0_3_2
-                          ueberauth_0_2_0
-                          scrivener_1_1_2
-                          postgrex_0_11_1
-                          poolboy_1_5_1
-                          poison_1_5_2
-                          phoenix_html_2_5_1
-                          phoenix_ecto_3_0_0_beta_2
-                          phoenix_1_1_4
-                          json_0_3_3
-                          inflex_1_5_0
-                          guardian_db_0_4_0
-                          guardian_0_9_1
-                          gettext_0_10_0
-                          exos_1_0_0
-                          cowboy_1_0_4
-                          comeonin_2_1_1
-                          absinthe_plug_1_0_0
-                        ];
-
-            meta = {
-              longDescription = ''This is a CMS written in Elixir. Aims to be
-                                the great open-source ecommerce and/or startup
-                                solution for those who are searching for a
-                                performance and stability on top of modern
-                                technologies like React and Elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/viatsko/lyn";
-            };
-          }
-      ) {};
-
-    lyn = lyn_0_0_16;
-
     lz4_0_2_2 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "lz4";
             version = "0.2.2";
             src = fetchHex {
@@ -28813,15 +16993,15 @@ let
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/szktty/erlang-lz4.git";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     lz4 = lz4_0_2_2;
 
     lz_string_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "lz_string";
             version = "0.0.3";
             src = fetchHex {
@@ -28837,96 +17017,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/koudelka/elixir-lz-string";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     lz_string = lz_string_0_0_3;
 
-    m2x_2_0_0 = callPackage
-      (
-        {  buildMix, fetchHex, json_0_3_3, hackney_1_6_0 }:
-          buildMix {
-            name = "m2x";
-            version = "2.0.0";
-            src = fetchHex {
-              pkg = "m2x";
-              version = "2.0.0";
-              sha256 =
-                "e125cf588d48d9b04fb4a003bb62ab1a8e8df359866dba0cde6444e9fd7ce939";
-            };
-            beamDeps  = [ json_0_3_3 hackney_1_6_0 ];
-
-            meta = {
-              longDescription = ''Elixir client library for the AT&T M2X
-                                (http://m2x.att.com) API. AT&T M2X is a
-                                cloud-based fully managed time-series data
-                                storage service for network connected
-                                machine-to-machine (M2M) devices and the
-                                Internet of Things (IoT).'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/attm2x/m2x-elixir";
-            };
-          }
-      ) {};
-
-    m2x = m2x_2_0_0;
-
-    m2x_erlang_1_3_1 = callPackage
-      (
-        {  buildMix, fetchHex, jsx_2_8_0, hackney_1_6_0 }:
-          buildMix {
-            name = "m2x_erlang";
-            version = "1.3.1";
-            src = fetchHex {
-              pkg = "m2x_erlang";
-              version = "1.3.1";
-              sha256 =
-                "873db746f4428490670b54aabcc93fda8d94c3c4e25c94a9aef7275858a8b809";
-            };
-            beamDeps  = [ jsx_2_8_0 hackney_1_6_0 ];
-
-            meta = {
-              longDescription = ''Erlang client library for the AT&T M2X
-                                (http://m2x.att.com) API. AT&T M2X is a
-                                cloud-based fully managed time-series data
-                                storage service for network connected
-                                machine-to-machine (M2M) devices and the
-                                Internet of Things (IoT).'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/attm2x/m2x-erlang";
-            };
-          }
-      ) {};
-
-    m2x_erlang = m2x_erlang_1_3_1;
-
-    mad_0_9_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "mad";
-            version = "0.9.0";
-            src = fetchHex {
-              pkg = "mad";
-              version = "0.9.0";
-              sha256 =
-                "5eeb635094586b517f08000b059b680981c7da5527bab83e7bfa3f54176c0f1e";
-            };
-
-            meta = {
-              description = ''Small and fast rebar replacement'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/synrc/mad";
-            };
-          }
-      ) {};
-
-    mad = mad_0_9_0;
-
     magic_number_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "magic_number";
             version = "0.0.1";
             src = fetchHex {
@@ -28942,15 +17041,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ishikawa/elixir-magic-number";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     magic_number = magic_number_0_0_1;
 
     mail_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "mail";
             version = "0.0.4";
             src = fetchHex {
@@ -28965,40 +17064,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/DockYard/elixir-mail";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mail = mail_0_0_4;
 
-    mailchimp_0_0_5 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_7_5 }:
-          buildMix {
-            name = "mailchimp";
-            version = "0.0.5";
-            src = fetchHex {
-              pkg = "mailchimp";
-              version = "0.0.5";
-              sha256 =
-                "e2681ec4a99a3ba59a523e1e6369ca276399733fb34d08fd823a1e0658613de9";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_7_5 ];
-
-            meta = {
-              description = ''A basic Elixir wrapper for version 3 of the
-                            MailChimp API.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/duartejc/mailchimp";
-            };
-          }
-      ) {};
-
-    mailchimp = mailchimp_0_0_5;
-
     mailer_1_0_1 = callPackage
       (
-        {  buildMix, fetchHex, timex_2_1_3, gen_smtp_0_9_0 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          timex_2_1_3,
+          gen_smtp_0_9_0
+        }:
+          buildMix ({
             name = "mailer";
             version = "1.0.1";
             src = fetchHex {
@@ -29014,15 +17094,15 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/antp/mailer";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mailer = mailer_1_0_1;
 
     mailgun_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "mailgun";
             version = "0.0.2";
             src = fetchHex {
@@ -29037,13 +17117,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/chrismccord/mailgun";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mailgun_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
+          buildMix ({
             name = "mailgun";
             version = "0.1.2";
             src = fetchHex {
@@ -29059,73 +17139,22 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/chrismccord/mailgun";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mailgun = mailgun_0_1_2;
 
-    mailgun_webhook_auth_1_0_0 = callPackage
-      (
-        {  buildMix, fetchHex, plug_0_5_2, cowboy_1_0_4 }:
-          buildMix {
-            name = "mailgun_webhook_auth";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "mailgun_webhook_auth";
-              version = "1.0.0";
-              sha256 =
-                "0e6c93d8fd37fc948db0f92ee545ecbed99787dc04ceb8981e588b06ad3108eb";
-            };
-            beamDeps  = [ plug_0_5_2 cowboy_1_0_4 ];
-
-            meta = {
-              description = ''A Plug for validating Mailgun Webhook requests in
-                            Elixir applications.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/typesend/mailgun_webhook_auth";
-            };
-          }
-      ) {};
-
-    mailgun_webhook_auth = mailgun_webhook_auth_1_0_0;
-
-    mailibex_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "mailibex";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "mailibex";
-              version = "0.1.0";
-              sha256 =
-                "01f207ee181a58d629c5329d378ee319f9dbab9259e28367751d8860ffe63a36";
-            };
-
-            meta = {
-              longDescription = ''Mailibex is an email library in Elixir :
-                                currently implements DKIM, SPF, DMARC, MimeMail
-                                (using iconv nif for encoding), MimeType (and
-                                file type detection), a simplified api to modify
-                                or create mimemail as a keyword list. Next step
-                                is a full implementation of SMTP client and
-                                server, to make it possible to use emails as a
-                                routable API for events and messages between
-                                your applications.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/awetzel/mailibex";
-            };
-          }
-      ) {};
-
-    mailibex = mailibex_0_1_0;
-
     mailman_0_2_2 = callPackage
       (
         {
-          buildMix, fetchHex, gen_smtp_0_9_0, ex_doc_0_11_4, earmark_0_2_1
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          gen_smtp_0_9_0,
+          ex_doc_0_11_4,
+          earmark_0_2_1
         }:
-          buildMix {
+          buildMix ({
             name = "mailman";
             version = "0.2.2";
             src = fetchHex {
@@ -29142,15 +17171,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/kamilc/mailman";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mailman = mailman_0_2_2;
 
     majremind_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "majremind";
             version = "0.0.1";
             src = fetchHex {
@@ -29168,15 +17197,15 @@ let
                                 $HOME/.config/majremind/ '';
               license = stdenv.lib.licenses.mit;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     majremind = majremind_0_0_1;
 
     mandrag_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex, exrm_1_0_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, exrm_1_0_3 }:
+          buildMix ({
             name = "mandrag";
             version = "0.1.1";
             src = fetchHex {
@@ -29193,15 +17222,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/cschiewek/mandrag";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mandrag = mandrag_0_1_1;
 
     mandrake_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "mandrake";
             version = "0.0.4";
             src = fetchHex {
@@ -29217,69 +17246,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mbasso/mandrake";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mandrake = mandrake_0_0_4;
 
-    mandrill_0_4_1 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_1_0 }:
-          buildMix {
-            name = "mandrill";
-            version = "0.4.1";
-            src = fetchHex {
-              pkg = "mandrill";
-              version = "0.4.1";
-              sha256 =
-                "2d554149c425c511a006d978427acc1d384c8f6d4f3699fdce04e42e24268400";
-            };
-            beamDeps  = [ httpoison_0_8_2 exjsx_3_1_0 ];
-
-            meta = {
-              longDescription = ''A Mandrill wrapper for Elixir Requires an
-                                active account with Mandrill
-                                (http://mandrill.com).'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/slogsdon/mandrill-elixir";
-            };
-          }
-      ) {};
-
-    mandrill = mandrill_0_4_1;
-
-    mandrillex_0_2_0 = callPackage
-      (
-        {
-          buildMix, fetchHex, jsex_2_0_0, httpoison_0_8_2, hackney_1_4_8
-        }:
-          buildMix {
-            name = "mandrillex";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "mandrillex";
-              version = "0.2.0";
-              sha256 =
-                "840bf36e545cde376797603df4109aae49d2c17b2b06f84a058fff4448d362eb";
-            };
-            beamDeps  = [ jsex_2_0_0 httpoison_0_8_2 hackney_1_4_8 ];
-
-            meta = {
-              longDescription = ''A Mandrill wrapper for Elixir Requires an
-                                active account with Mandrill
-                                (http://mandrill.com). '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/slogsdon/mandrillex";
-            };
-          }
-      ) {};
-
-    mandrillex = mandrillex_0_2_0;
-
     maptu_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "maptu";
             version = "0.1.0";
             src = fetchHex {
@@ -29290,20 +17265,26 @@ let
             };
 
             meta = {
-              description = ''Tiny library to convert from "encoded" maps to
+              description = ''Tiny library to convert from \"encoded\" maps to
                             Elixir structs.'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/whatyouhide/maptu";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     maptu = maptu_0_1_0;
 
     marco_polo_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex, decimal_1_1_1, connection_1_0_0_rc_1 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          decimal_1_1_1,
+          connection_1_0_0_rc_1
+        }:
+          buildMix ({
             name = "marco_polo";
             version = "0.2.1";
             src = fetchHex {
@@ -29319,15 +17300,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/MyMedsAndMe/marco_polo";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     marco_polo = marco_polo_0_2_1;
 
     mariaex_0_1_7 = callPackage
       (
-        {  buildMix, fetchHex, decimal_1_1_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, decimal_1_1_1 }:
+          buildMix ({
             name = "mariaex";
             version = "0.1.7";
             src = fetchHex {
@@ -29341,16 +17322,16 @@ let
             meta = {
               description = ''Pure elixir database driver for MariaDB /
                             MySQL.'';
-
+              license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/xerions/mariaex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mariaex_0_4_3 = callPackage
       (
-        {  buildMix, fetchHex, decimal_1_1_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, decimal_1_1_1 }:
+          buildMix ({
             name = "mariaex";
             version = "0.4.3";
             src = fetchHex {
@@ -29364,16 +17345,22 @@ let
             meta = {
               description = ''Pure elixir database driver for MariaDB /
                             MySQL.'';
-
+              license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/xerions/mariaex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mariaex_0_7_0 = callPackage
       (
-        {  buildMix, fetchHex, decimal_1_1_1, db_connection_0_2_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          decimal_1_1_1,
+          db_connection_0_2_4
+        }:
+          buildMix ({
             name = "mariaex";
             version = "0.7.0";
             src = fetchHex {
@@ -29387,18 +17374,18 @@ let
             meta = {
               description = ''Pure elixir database driver for MariaDB /
                             MySQL.'';
-
+              license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/xerions/mariaex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mariaex = mariaex_0_7_0;
 
     marked_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "marked";
             version = "0.0.1";
             src = fetchHex {
@@ -29412,91 +17399,15 @@ let
               description = ''CommonMark compatible Markdown parser'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     marked = marked_0_0_1;
 
-    markit_0_1_2 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "markit";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "markit";
-              version = "0.1.2";
-              sha256 =
-                "6304ceb1e7a5787555bc7d048bf3c9c0b432fe5378c6d630fb02d0bb871e57b5";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Access stock market data from markit.com'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/col/markit";
-            };
-          }
-      ) {};
-
-    markit = markit_0_1_2;
-
-    markit_skill_0_0_2 = callPackage
-      (
-        {
-          buildMix, fetchHex, markit_0_1_2, inflex_1_5_0, alexa_0_1_12
-        }:
-          buildMix {
-            name = "markit_skill";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "markit_skill";
-              version = "0.0.2";
-              sha256 =
-                "166d8ef88c08c21821dda379a053af761db4de5dff50226bfcb0e3a18fc855db";
-            };
-            beamDeps  = [ markit_0_1_2 inflex_1_5_0 alexa_0_1_12 ];
-
-            meta = {
-              description = ''Amazon Alexa skill that uses data from
-                            Markit.com'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/col/markit_skill";
-            };
-          }
-      ) {};
-
-    markit_skill = markit_skill_0_0_2;
-
-    maru_0_9_5 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_0_3, plug_1_1_3, cowboy_1_0_4 }:
-          buildMix {
-            name = "maru";
-            version = "0.9.5";
-            src = fetchHex {
-              pkg = "maru";
-              version = "0.9.5";
-              sha256 =
-                "36456f36fea5b2fc5cacd280535347f11d949799bfb8506e772e30b062056d3d";
-            };
-            beamDeps  = [ poison_1_0_3 plug_1_1_3 cowboy_1_0_4 ];
-
-            meta = {
-              description = ''REST-like API micro-framework for elixir inspired
-                            by grape.'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/falood/maru";
-            };
-          }
-      ) {};
-
-    maru = maru_0_9_5;
-
     maru_entity_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "maru_entity";
             version = "0.1.2";
             src = fetchHex {
@@ -29510,104 +17421,15 @@ let
               description = ''Elixir copy of grape-entity'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     maru_entity = maru_entity_0_1_2;
 
-    maru_swagger_0_7_3 = callPackage
-      (
-        {  buildMix, fetchHex, maru_0_9_5 }:
-          buildMix {
-            name = "maru_swagger";
-            version = "0.7.3";
-            src = fetchHex {
-              pkg = "maru_swagger";
-              version = "0.7.3";
-              sha256 =
-                "919148f80e76bd4dba89021cbffcf359cfe05028250d05a3eacf2bae5e24ec46";
-            };
-            beamDeps  = [ maru_0_9_5 ];
-
-            meta = {
-              description = ''Add swagger compliant documentation to your maru
-                            API'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/falood/maru_swagger";
-            };
-          }
-      ) {};
-
-    maru_swagger = maru_swagger_0_7_3;
-
-    marvel_1_0_0 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          timex_0_13_5,
-          poison_1_5_2,
-          httpoison_0_8_2
-        }:
-          buildRebar3 {
-            name = "marvel";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "marvel";
-              version = "1.0.0";
-              sha256 =
-                "7b5e99ccfa84954c2e46295aa72ab57b7511e1ec8e0bd13d1c5948efe1a0d23d";
-            };
-
-            beamDeps  = [ timex_0_13_5 poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Marvel API and CLI Client '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bryanjos/marvel";
-            };
-          }
-      ) {};
-
-    marvel = marvel_1_0_0;
-
-    marvin_0_3_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          slack_0_3_0,
-          poison_2_1_0,
-          ibrowse_4_2_2,
-          httpotion_2_2_2
-        }:
-          buildMix {
-            name = "marvin";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "marvin";
-              version = "0.3.0";
-              sha256 =
-                "722a97aef1d0f7fb783948002897ea1ec67ac77cb471016386bf485bb8bd86c7";
-            };
-            beamDeps  = [
-                          slack_0_3_0 poison_2_1_0 ibrowse_4_2_2 httpotion_2_2_2
-                        ];
-
-            meta = {
-              description = ''A Slack bot framework.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/willrax/marvin";
-            };
-          }
-      ) {};
-
-    marvin = marvin_0_3_0;
-
     math_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "math";
             version = "0.0.1";
             src = fetchHex {
@@ -29618,19 +17440,77 @@ let
             };
 
             meta = {
-              description = ''The missing Math module for Elixir.'';
+              longDescription = ''The Math module adds many useful functions
+                                that extend Elixir`s standard library. - General
+                                Functions • a <~> b Comparison of floats, to
+                                check if they are _nearly_ equal. •
+                                Math.pow(x, n) Arithmetic exponentiation. Works
+                                both with integer powers and floats. •
+                                Math.sqrt(x) The square root of x. •
+                                Math.nth_root(x, n) The n-th root of x. •
+                                Math.isqrt(x) The integer square root of x. •
+                                Math.gcd(a, b) The greatest common divisor of a
+                                and b. • Math.lcm(a, b) The least common
+                                multiple of a and b. • Math.factorial(n) The
+                                n-th factorial number. •
+                                Math.k_permutations(n, k) The number of distinct
+                                ways to create groups of size k from n distinct
+                                elements. • Math.k_combinations(n, k) The
+                                number of distinct ways to create groups of size
+                                k from n distinct elements where order does not
+                                matter. - Logarithms • Math.exp(x) Calculates
+                                ℯ to the xth power. • Math.log(x) Calculates
+                                the natural logarithm (base ℯ) of x. •
+                                Math.log(x, b) Calculates the base-b logarithm
+                                of x • Math.log2(x) Calculates the binary
+                                logarithm (base 2) of x. • Math.log10(x)
+                                Calculates the common logarithm (base 10) of x.
+                                • Math.e Returns a floating-point
+                                approximation of the number ℯ. - Trigonometry
+                                • Math.pi Returns a floating-point
+                                approximation of the number π. •
+                                Math.deg2rad(x) converts from degrees to
+                                radians. • Math.rad2deg(x) converts from
+                                radians to degrees. • Math.sin(x) The sine of
+                                x. • Math.cos(x) The cosine of x. •
+                                Math.tan(x) The tangent of x. • Math.asin(x)
+                                The inverse sine of x. • Math.acos(x) The
+                                inverse cosine of x. • Math.atan(x) The
+                                inverse tangent of x. • Math.atan2(x, y) The
+                                inverse tangent of x and y. This variant returns
+                                the inverse tangent in the correct quadrant, as
+                                the signs of both x and y are known. •
+                                Math.sinh(x) The hyperbolic sine of x. •
+                                Math.cosh(x) The hyperbolic cosine of x. •
+                                Math.tanh(x) The hyperbolic tangent of x. •
+                                Math.asinh(x) The inverse hyperbolic sine of x.
+                                • Math.acosh(x) The inverse hyperbolic cosine
+                                of x. • Math.atanh(x) The inverse hyperbolic
+                                tangent of x. - Working with Collections •
+                                Math.Enum.product(collection) The result of
+                                multiplying all elements in the passed
+                                collection. • Math.Enum.mean(collection) the
+                                mean of the numbers in the collection. •
+                                Math.Enum.median(collection) the median of the
+                                numbers in the collection.'';
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/folz/math";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     math = math_0_0_1;
 
     matrix_0_3_1 = callPackage
       (
-        {  buildMix, fetchHex, exprintf_0_1_6, earmark_0_2_1 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          exprintf_0_1_6,
+          earmark_0_2_1
+        }:
+          buildMix ({
             name = "matrix";
             version = "0.3.1";
             src = fetchHex {
@@ -29648,15 +17528,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/twist-vector/elixir-matrix.git";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     matrix = matrix_0_3_1;
 
     maybe_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "maybe";
             version = "0.0.1";
             src = fetchHex {
@@ -29671,7 +17551,7 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/zweifisch/maybe";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     maybe = maybe_0_0_1;
@@ -29680,6 +17560,7 @@ let
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           xml_builder_0_0_8,
           poison_2_1_0,
@@ -29690,7 +17571,7 @@ let
           etude_0_3_7,
           ecto_1_0_7
         }:
-          buildMix {
+          buildMix ({
             name = "mazurka";
             version = "0.3.34";
             src = fetchHex {
@@ -29715,15 +17596,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mazurka/mazurka";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mazurka = mazurka_0_3_34;
 
     mazurka_dsl_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "mazurka_dsl";
             version = "0.1.1";
             src = fetchHex {
@@ -29738,15 +17619,17 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mazurka/mazurka_dsl";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mazurka_dsl = mazurka_dsl_0_1_1;
 
     mazurka_mediatype_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, etude_1_0_0_beta_0 }:
-          buildMix {
+        {
+          buildMix, packageOverrides ? {}, fetchHex, etude_1_0_0_beta_0
+        }:
+          buildMix ({
             name = "mazurka_mediatype";
             version = "0.2.0";
             src = fetchHex {
@@ -29762,7 +17645,7 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mazurka/mazurka_mediatype";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mazurka_mediatype = mazurka_mediatype_0_2_0;
@@ -29771,12 +17654,13 @@ let
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           poison_1_3_1,
           mazurka_mediatype_0_2_0,
           etude_1_0_0_beta_0
         }:
-          buildMix {
+          buildMix ({
             name = "mazurka_mediatype_hyperjson";
             version = "0.2.3";
             src = fetchHex {
@@ -29797,15 +17681,15 @@ let
               homepage =
                 "https://github.com/mazurka/mazurka_mediatype_hyperjson";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mazurka_mediatype_hyperjson = mazurka_mediatype_hyperjson_0_2_3;
 
     mc_data_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
+          buildMix ({
             name = "mc_data";
             version = "0.0.2";
             src = fetchHex {
@@ -29820,17 +17704,17 @@ let
               description = ''Provides access to data from the game
                             Minecraft.'';
               license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/hansihe/elixir_mc_data";
+              homepage = "https://github.com/McEx/McData";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mc_data = mc_data_0_0_2;
 
     mc_protocol_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, uuid_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, uuid_1_1_3 }:
+          buildMix ({
             name = "mc_protocol";
             version = "0.0.1";
             src = fetchHex {
@@ -29851,38 +17735,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/hansihe/elixir_mc_protocol";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mc_protocol = mc_protocol_0_0_1;
 
-    mcrypt_0_1_0 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "mcrypt";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "mcrypt";
-              version = "0.1.0";
-              sha256 =
-                "508a35ba255190f80309dcabf9c81c88b86b9ec13af180627ad51b8e5cf2a4cd";
-            };
-
-            meta = {
-              description = ''NIF wrapper around libmcrypt.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/system76/elixir-mcrypt";
-            };
-          }
-      ) {};
-
-    mcrypt = mcrypt_0_1_0;
-
     mcup_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "mcup";
             version = "0.0.2";
             src = fetchHex {
@@ -29897,100 +17758,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/Joe-noh/mcup";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mcup = mcup_0_0_2;
 
-    mdns_client_0_1_7 = callPackage
-      (
-        {  buildRebar3, fetchHex, lager_2_1_1 }:
-          buildRebar3 {
-            name = "mdns_client";
-            version = "0.1.7";
-            src = fetchHex {
-              pkg = "mdns_client";
-              version = "0.1.7";
-              sha256 =
-                "c707532d693bd19bed8ccd167574b6b0337f07e38b87bd7f9111d9cb9799fac2";
-            };
-
-            beamDeps  = [ lager_2_1_1 ];
-
-            meta = {
-              description = ''mDNS service discovery client'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/Licenser/erlang-mdns-client";
-            };
-          }
-      ) {};
-
-    mdns_client = mdns_client_0_1_7;
-
-    mdns_client_lib_0_1_33 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          pooler_1_4_0,
-          mdns_client_0_1_7,
-          lager_2_1_1
-        }:
-          buildRebar3 {
-            name = "mdns_client_lib";
-            version = "0.1.33";
-            src = fetchHex {
-              pkg = "mdns_client_lib";
-              version = "0.1.33";
-              sha256 =
-                "9ad3723c929acbdfec70021ceb6606e59c7e6189af97652409bfc9624052e0fe";
-            };
-
-            beamDeps  = [ pooler_1_4_0 mdns_client_0_1_7 lager_2_1_1 ];
-
-            meta = {
-              description = ''client lib for mdns aware tcp servers'';
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/Licenser/mdns_client_lib";
-            };
-          }
-      ) {};
-
-    mdns_client_lib_0_1_38 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          pooler_1_5_0,
-          mdns_client_0_1_7,
-          lager_2_1_1
-        }:
-          buildRebar3 {
-            name = "mdns_client_lib";
-            version = "0.1.38";
-            src = fetchHex {
-              pkg = "mdns_client_lib";
-              version = "0.1.38";
-              sha256 =
-                "46b990c883ca02c780a2295ffe75b51888c028ca42cd86b8ad517eca80cbd765";
-            };
-
-            beamDeps  = [ pooler_1_5_0 mdns_client_0_1_7 lager_2_1_1 ];
-
-            meta = {
-              description = ''client lib for mdns aware tcp servers'';
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/Licenser/mdns_client_lib";
-            };
-          }
-      ) {};
-
-    mdns_client_lib = mdns_client_lib_0_1_38;
-
     mdns_server_0_2_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "mdns_server";
             version = "0.2.0";
             src = fetchHex {
@@ -30005,7 +17781,7 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/Licenser/erlang-mdns-server";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mdns_server = mdns_server_0_2_0;
@@ -30014,12 +17790,13 @@ let
       (
         {
           buildRebar3,
+          packageOverrides ? {},
           fetchHex,
           ranch_1_1_0,
           mdns_server_0_2_0,
           lager_3_0_2
         }:
-          buildRebar3 {
+          buildRebar3 ({
             name = "mdns_server_lib";
             version = "0.2.3";
             src = fetchHex {
@@ -30037,64 +17814,15 @@ let
               license = stdenv.lib.licenses.cddl;
               homepage = "https://github.com/Licenser/mdns_server_lib";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mdns_server_lib = mdns_server_lib_0_2_3;
 
-    meck_0_8_4 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "meck";
-            version = "0.8.4";
-            src = fetchHex {
-              pkg = "meck";
-              version = "0.8.4";
-              sha256 =
-                "2cdfbd0edd8f62b3d2061efc03c0e490282dd2ea6de44e15d2006e83f4f8eead";
-            };
-
-            meta = {
-              description = ''A mocking framework for Erlang'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/eproxus/meck";
-            };
-          }
-      ) {};
-
-    meck = meck_0_8_4;
-
-    medex_0_1_2 = callPackage
-      (
-        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4, consul_1_0_3 }:
-          buildMix {
-            name = "medex";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "medex";
-              version = "0.1.2";
-              sha256 =
-                "dd8dd07892a4aedbe7680fa8637b1c17b7615b2aaea0b25b84acad4ed50700d2";
-            };
-            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 consul_1_0_3 ];
-
-            meta = {
-              longDescription = ''Medical Examination - application for
-                                register health check callbacks and represent
-                                their state via HTTP.'';
-
-              homepage = "https://github.com/xerions/medex";
-            };
-          }
-      ) {};
-
-    medex = medex_0_1_2;
-
     meld_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "meld";
             version = "0.1.2";
             src = fetchHex {
@@ -30109,15 +17837,21 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/conflate/meld";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     meld = meld_0_1_2;
 
     mellon_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0, plug_1_1_3 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          plug_1_1_3
+        }:
+          buildMix ({
             name = "mellon";
             version = "0.1.1";
             src = fetchHex {
@@ -30135,15 +17869,15 @@ let
 
               homepage = "https://github.com/sajmoon/mellon";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mellon = mellon_0_1_1;
 
     mem_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "mem";
             version = "0.1.2";
             src = fetchHex {
@@ -30154,11 +17888,11 @@ let
             };
 
             meta = {
-              description = ''ETS based KV cache with TTL and LRU support'';
+              description = ''KV cache with TTL, LRU and Persistence support'';
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/falood/mem";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mem = mem_0_1_2;
@@ -30166,9 +17900,14 @@ let
     memcache_client_1_1_0 = callPackage
       (
         {
-          buildMix, fetchHex, poolboy_1_5_1, poison_2_1_0, connection_1_0_2
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poolboy_1_5_1,
+          poison_2_1_0,
+          connection_1_0_2
         }:
-          buildMix {
+          buildMix ({
             name = "memcache_client";
             version = "1.1.0";
             src = fetchHex {
@@ -30185,38 +17924,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/tsharju/memcache_client";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     memcache_client = memcache_client_1_1_0;
 
-    message_pack_0_2_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "message_pack";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "message_pack";
-              version = "0.2.0";
-              sha256 =
-                "94f31aa2734989e97562fcd1ad0b159e8571f4b97f591995bfdcbbbcfcaadd83";
-            };
-
-            meta = {
-              description = ''MessagePack Implementation for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/mururu/msgpack-elixir";
-            };
-          }
-      ) {};
-
-    message_pack = message_pack_0_2_0;
-
     meta_0_0_1 = callPackage
       (
-        {  buildRebar3, fetchHex, forms_0_0_1 }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex, forms_0_0_1 }:
+          buildRebar3 ({
             name = "meta";
             version = "0.0.1";
             src = fetchHex {
@@ -30226,6 +17942,8 @@ let
                 "9aa1be58e265a16eafb9092d9675427672721ca9d3c924664e561b0857c6dcb8";
             };
 
+            buildPlugins  = [ rebar3_hex ];
+
             beamDeps  = [ forms_0_0_1 ];
 
             meta = {
@@ -30233,15 +17951,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/efcasado/forms";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     meta = meta_0_0_1;
 
     metainvestigator_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, floki_0_8_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, floki_0_8_0 }:
+          buildMix ({
             name = "metainvestigator";
             version = "0.0.3";
             src = fetchHex {
@@ -30258,15 +17976,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/nekova/metainvestigator";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     metainvestigator = metainvestigator_0_0_3;
 
     metrics_1_0_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "metrics";
             version = "1.0.1";
             src = fetchHex {
@@ -30282,13 +18000,13 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/benoitc/erlang-metrics";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     metrics_1_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "metrics";
             version = "1.1.0";
             src = fetchHex {
@@ -30304,15 +18022,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/benoitc/erlang-metrics";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     metrics = metrics_1_1_0;
 
     metrix_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, logfmt_3_0_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, logfmt_3_0_2 }:
+          buildMix ({
             name = "metrix";
             version = "0.2.0";
             src = fetchHex {
@@ -30332,15 +18050,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/rwdaigle/metrix";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     metrix = metrix_0_2_0;
 
     mex_0_0_5 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "mex";
             version = "0.0.5";
             src = fetchHex {
@@ -30355,41 +18073,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mrluc/mex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mex = mex_0_0_5;
 
-    microformats2_0_0_5 = callPackage
-      (
-        {  buildMix, fetchHex, httpotion_2_2_2, floki_0_7_2 }:
-          buildMix {
-            name = "microformats2";
-            version = "0.0.5";
-            src = fetchHex {
-              pkg = "microformats2";
-              version = "0.0.5";
-              sha256 =
-                "890ca1812738869aa65865339a730c5542949cac4b017b25fc276e81b37157b2";
-            };
-            beamDeps  = [ httpotion_2_2_2 floki_0_7_2 ];
-
-            meta = {
-              description = ''A microformats2 parser
-                            (http://microformats.org/wiki/microformats-2) for
-                            Elixir'';
-              license = stdenv.lib.licenses.agpl3;
-              homepage = "https://github.com/ckruse/microformats2-elixir";
-            };
-          }
-      ) {};
-
-    microformats2 = microformats2_0_0_5;
-
     milliseconds_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "milliseconds";
             version = "0.0.1";
             src = fetchHex {
@@ -30401,21 +18093,21 @@ let
 
             meta = {
               longDescription = '' Simple library to work with milliseconds.
-                                Convert text to milliseconds: convert("2d")
+                                Convert text to milliseconds: convert(\"2d\")
                                 Convert milliseconds to text: convert(8640000)
-                                Calculate future time: future_time("6hrs") '';
+                                Calculate future time: future_time(\"6hrs\") '';
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/davebryson/elixir_milliseconds";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     milliseconds = milliseconds_0_0_1;
 
     mime_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "mime";
             version = "0.0.1";
             src = fetchHex {
@@ -30430,15 +18122,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/elixirdrops/mime";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mime = mime_0_0_1;
 
     mimerl_1_0_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "mimerl";
             version = "1.0.0";
             src = fetchHex {
@@ -30448,18 +18140,21 @@ let
                 "a30b01104a29bd3a363db8646e4ce0f7980f9ecd23a98707c46c3ced918c41b4";
             };
 
+            buildPlugins  = [ rebar3_hex ];
+
+
             meta = {
               description = ''Library to handle mimetypes'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/benoitc/mimerl";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mimerl_1_0_2 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "mimerl";
             version = "1.0.2";
             src = fetchHex {
@@ -30474,13 +18169,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/benoitc/mimerl";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mimerl_1_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "mimerl";
             version = "1.1.0";
             src = fetchHex {
@@ -30495,15 +18190,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/benoitc/mimerl";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mimerl = mimerl_1_1_0;
 
     mimetype_parser_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "mimetype_parser";
             version = "0.1.2";
             src = fetchHex {
@@ -30518,15 +18213,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/camshaft/mimetype_parser";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mimetype_parser = mimetype_parser_0_1_2;
 
     mimex_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "mimex";
             version = "0.1.0";
             src = fetchHex {
@@ -30541,15 +18236,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/hex-sh/mimex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mimex = mimex_0_1_0;
 
     minmaxlist_0_0_6 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "minmaxlist";
             version = "0.0.6";
             src = fetchHex {
@@ -30566,15 +18261,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/seantanly/elixir-minmaxlist";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     minmaxlist = minmaxlist_0_0_6;
 
     misc_random_0_2_6 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "misc_random";
             version = "0.2.6";
             src = fetchHex {
@@ -30591,15 +18286,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/gutschilla/elixir-helper-random";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     misc_random = misc_random_0_2_6;
 
     mix_apidoc_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
+          buildMix ({
             name = "mix_apidoc";
             version = "0.1.0";
             src = fetchHex {
@@ -30617,15 +18312,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/sldab/mix_apidoc";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mix_apidoc = mix_apidoc_0_1_0;
 
     mix_deps_tree_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "mix_deps_tree";
             version = "0.1.0";
             src = fetchHex {
@@ -30641,15 +18336,15 @@ let
 
               homepage = "https://github.com/liveforeverx/mix_deps_tree";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mix_deps_tree = mix_deps_tree_0_1_0;
 
     mix_erlang_tasks_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "mix_erlang_tasks";
             version = "0.1.0";
             src = fetchHex {
@@ -30667,15 +18362,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/alco/mix-erlang-tasks";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mix_erlang_tasks = mix_erlang_tasks_0_1_0;
 
     mix_eunit_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "mix_eunit";
             version = "0.1.2";
             src = fetchHex {
@@ -30691,15 +18386,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/dantswain/mix_eunit";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mix_eunit = mix_eunit_0_1_2;
 
     mix_info_0_7_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "mix_info";
             version = "0.7.2";
             src = fetchHex {
@@ -30716,15 +18411,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/pskordilakis/mix_info";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mix_info = mix_info_0_7_2;
 
     mix_test_watch_0_2_6 = callPackage
       (
-        {  buildMix, fetchHex, fs_0_9_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, fs_0_9_2 }:
+          buildMix ({
             name = "mix_test_watch";
             version = "0.2.6";
             src = fetchHex {
@@ -30740,15 +18435,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/lpil/mix-test.watch";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mix_test_watch = mix_test_watch_0_2_6;
 
     mixpanel_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, exjsx_3_1_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, exjsx_3_1_0 }:
+          buildMix ({
             name = "mixpanel";
             version = "0.0.3";
             src = fetchHex {
@@ -30765,89 +18460,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/michihuber/mixpanel_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mixpanel = mixpanel_0_0_3;
 
-    mixpanel_api_ex_0_8_3 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "mixpanel_api_ex";
-            version = "0.8.3";
-            src = fetchHex {
-              pkg = "mixpanel_api_ex";
-              version = "0.8.3";
-              sha256 =
-                "1ff5eb4aa333495a86868873deb8fcd04c5f2e6f2560d77ac6ccbe07e2e3d7b4";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Elixir client for the Mixpanel API.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/agevio/mixpanel_api_ex";
-            };
-          }
-      ) {};
-
-    mixpanel_api_ex = mixpanel_api_ex_0_8_3;
-
-    mixpanel_data_client_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_3_1, httpoison_0_8_2 }:
-          buildMix {
-            name = "mixpanel_data_client";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "mixpanel_data_client";
-              version = "0.0.2";
-              sha256 =
-                "7f3bbd608ae18153655f27bd50ea01ad85630d6c1cc6ab9ed336e95419f06c86";
-            };
-            beamDeps  = [ poison_1_3_1 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Client library for interacting with the Mixpanel
-                            Data API.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jeregrine/mixpanel_data_client";
-            };
-          }
-      ) {};
-
-    mixpanel_data_client = mixpanel_data_client_0_0_2;
-
-    mixstar_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, netrc_0_0_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "mixstar";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "mixstar";
-              version = "0.0.1";
-              sha256 =
-                "d7f9014711d04049c90a8f835857d1bde04647b326d1ec949e2a90477f4d4a39";
-            };
-            beamDeps  = [ netrc_0_0_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''MixStar starred GitHub repository that depends on
-                            your project'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ma2gedev/mix-star";
-            };
-          }
-      ) {};
-
-    mixstar = mixstar_0_0_1;
-
     mixunit_0_9_2 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "mixunit";
             version = "0.9.2";
             src = fetchHex {
@@ -30862,15 +18483,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/talentdeficit/mixunit";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mixunit = mixunit_0_9_2;
 
     mmExchangeRate_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, jsx_2_8_0, httpotion_2_2_2 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          jsx_2_8_0,
+          httpotion_2_2_2
+        }:
+          buildMix ({
             name = "mmExchangeRate";
             version = "0.0.1";
             src = fetchHex {
@@ -30887,63 +18514,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/Arkar-Aung/mmExchangeRate";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mmExchangeRate = mmExchangeRate_0_0_1;
 
-    mmath_0_1_15 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "mmath";
-            version = "0.1.15";
-            src = fetchHex {
-              pkg = "mmath";
-              version = "0.1.15";
-              sha256 =
-                "2ad56c5a321dda866f36981df134b9e2f393b46786cd2549ed626d1423458c86";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''math library for metric sequences and binary
-                            arrays.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/dalmatinerdb/mmath";
-            };
-          }
-      ) {};
-
-    mmath_0_1_16 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "mmath";
-            version = "0.1.16";
-            src = fetchHex {
-              pkg = "mmath";
-              version = "0.1.16";
-              sha256 =
-                "dcf450b5527ba445e0b33ecdb0d546fa9bff96f6efbf6d314447f32344d37ef6";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''math library for metric sequences and binary
-                            arrays.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/dalmatinerdb/mmath";
-            };
-          }
-      ) {};
-
-    mmath = mmath_0_1_16;
-
     mnemonic_slugs_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "mnemonic_slugs";
             version = "0.0.1";
             src = fetchHex {
@@ -30959,64 +18538,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/devshane/mnemonic_slugs";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mnemonic_slugs = mnemonic_slugs_0_0_1;
 
-    mobiledoc_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "mobiledoc";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "mobiledoc";
-              version = "0.0.1";
-              sha256 =
-                "02aaa0168d51cd5d491127128f568ff37a6415115c45076a79bc8f7f449c524a";
-            };
-
-            meta = {
-              description = ''An HTML renderer for the MobileDoc format used by
-                            the ContentKit editor.'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/zeppelin/mobiledoc-renderer-elixir";
-            };
-          }
-      ) {};
-
-    mobiledoc = mobiledoc_0_0_1;
-
-    mochiweb_2_12_2 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "mochiweb";
-            version = "2.12.2";
-            src = fetchHex {
-              pkg = "mochiweb";
-              version = "2.12.2";
-              sha256 =
-                "d3e681d4054b74a96cf2efcd09e94157ab83a5f55ddc4ce69f90b8144673bd7a";
-            };
-
-            meta = {
-              description = ''MochiWeb is an Erlang library for building
-                            lightweight HTTP servers. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/mochi/mochiweb";
-            };
-          }
-      ) {};
-
-    mochiweb = mochiweb_2_12_2;
-
     mochiweb_html_2_13_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "mochiweb_html";
             version = "2.13.0";
             src = fetchHex {
@@ -31031,44 +18561,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mochi/mochiweb";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mochiweb_html = mochiweb_html_2_13_0;
 
-    mock_0_1_3 = callPackage
-      (
-        {  buildMix, fetchHex, meck_0_8_4 }:
-          buildMix {
-            name = "mock";
-            version = "0.1.3";
-            src = fetchHex {
-              pkg = "mock";
-              version = "0.1.3";
-              sha256 =
-                "bf7cf50d528394d870cdecac4920ab719cec0af98eff95759b57cab0e5ee143e";
-            };
-            beamDeps  = [ meck_0_8_4 ];
-
-            meta = {
-              longDescription = ''A mocking libary for the Elixir language. We
-                                use the Erlang meck library to provide module
-                                mocking functionality for Elixir. It uses macros
-                                in Elixir to expose the functionality in a
-                                convenient manner for integrating in Elixir
-                                tests.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jjh42/mock";
-            };
-          }
-      ) {};
-
-    mock = mock_0_1_3;
-
     module_mocker_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "module_mocker";
             version = "0.2.0";
             src = fetchHex {
@@ -31085,54 +18586,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/rohanpujaris/module_mocker";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     module_mocker = module_mocker_0_2_0;
 
-    moebius_1_0_8 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          timex_0_19_5,
-          postgrex_0_9_1,
-          poison_1_5_2,
-          json_0_3_3,
-          inflex_1_5_0
-        }:
-          buildMix {
-            name = "moebius";
-            version = "1.0.8";
-            src = fetchHex {
-              pkg = "moebius";
-              version = "1.0.8";
-              sha256 =
-                "6fb42bfb7a85409e5281d990d9db5a5012221019867eef34de2e49fce245b0d9";
-            };
-            beamDeps  = [
-                          timex_0_19_5
-                          postgrex_0_9_1
-                          poison_1_5_2
-                          json_0_3_3
-                          inflex_1_5_0
-                        ];
-
-            meta = {
-              description = ''A functional approach to data access with
-                            Elixir'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/robconery/moebius";
-            };
-          }
-      ) {};
-
-    moebius = moebius_1_0_8;
-
     mogrify_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "mogrify";
             version = "0.2.0";
             src = fetchHex {
@@ -31147,15 +18609,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/route/mogrify";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mogrify = mogrify_0_2_0;
 
     mojoauth_1_0_2 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, timex_1_0_2 }:
+          buildMix ({
             name = "mojoauth";
             version = "1.0.2";
             src = fetchHex {
@@ -31172,15 +18634,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/adhearsion/mojo-auth.ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mojoauth = mojoauth_1_0_2;
 
     moment_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "moment";
             version = "0.1.0";
             src = fetchHex {
@@ -31196,15 +18658,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/atabary/moment";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     moment = moment_0_1_0;
 
     mon_handler_1_0_2 = callPackage
       (
-        {  buildMix, fetchHex, dialyze_0_2_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, dialyze_0_2_1 }:
+          buildMix ({
             name = "mon_handler";
             version = "1.0.2";
             src = fetchHex {
@@ -31225,15 +18687,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/tattdcodemonkey/mon_handler";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mon_handler = mon_handler_1_0_2;
 
     monad_1_0_5 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "monad";
             version = "1.0.5";
             src = fetchHex {
@@ -31248,15 +18710,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/rmies/monad";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     monad = monad_1_0_5;
 
     monadex_1_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "monadex";
             version = "1.0.2";
             src = fetchHex {
@@ -31271,41 +18733,22 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/rob-brown/MonadEx";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     monadex = monadex_1_0_2;
 
-    mondo_0_1_0 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_2_1_0, plug_1_1_3, httpoison_0_8_2
-        }:
-          buildMix {
-            name = "mondo";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "mondo";
-              version = "0.1.0";
-              sha256 =
-                "f557216314e098137f5140f1194e2eba7a2a030d78affc23ea5943f586ab1095";
-            };
-            beamDeps  = [ poison_2_1_0 plug_1_1_3 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''An Elixir client for the Mondo API.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/stevedomin/mondo_elixir";
-            };
-          }
-      ) {};
-
-    mondo = mondo_0_1_0;
-
     monetized_0_3_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, ecto_1_1_5, decimal_1_1_1 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          ecto_1_1_5,
+          decimal_1_1_1
+        }:
+          buildMix ({
             name = "monetized";
             version = "0.3.2";
             src = fetchHex {
@@ -31322,15 +18765,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/theocodes/monetized";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     monetized = monetized_0_3_2;
 
     money_0_0_1_dev = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "money";
             version = "0.0.1-dev";
             src = fetchHex {
@@ -31347,39 +18790,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/liuggio/money";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     money = money_0_0_1_dev;
 
-    mongo_0_5_4 = callPackage
-      (
-        {  buildMix, fetchHex, bson_0_4_4 }:
-          buildMix {
-            name = "mongo";
-            version = "0.5.4";
-            src = fetchHex {
-              pkg = "mongo";
-              version = "0.5.4";
-              sha256 =
-                "fb6e0ed11bd2f193e12d0f905eb1968525b52dc99441ecbbf90c7745df246ed8";
-            };
-            beamDeps  = [ bson_0_4_4 ];
-
-            meta = {
-              description = ''MongoDB driver for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/checkiz/elixir-mongo";
-            };
-          }
-      ) {};
-
-    mongo = mongo_0_5_4;
-
     mongodb_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex, poolboy_1_5_1, connection_1_0_2 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poolboy_1_5_1,
+          connection_1_0_2
+        }:
+          buildMix ({
             name = "mongodb";
             version = "0.1.1";
             src = fetchHex {
@@ -31395,15 +18820,21 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/ericmj/mongodb";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mongodb = mongodb_0_1_1;
 
     mongodb_ecto_0_1_4 = callPackage
       (
-        {  buildMix, fetchHex, mongodb_0_1_1, ecto_1_0_7 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          mongodb_0_1_1,
+          ecto_1_0_7
+        }:
+          buildMix ({
             name = "mongodb_ecto";
             version = "0.1.4";
             src = fetchHex {
@@ -31419,15 +18850,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/michalmuskala/mongodb_ecto";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mongodb_ecto = mongodb_ecto_0_1_4;
 
     monk_0_1_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "monk";
             version = "0.1.3";
             src = fetchHex {
@@ -31443,15 +18874,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/niahoo/monk";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     monk = monk_0_1_3;
 
     morph_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "morph";
             version = "0.1.0";
             src = fetchHex {
@@ -31466,43 +18897,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/cmoncrief/elixir-morph";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     morph = morph_0_1_0;
 
-    motor_hat_0_6_1 = callPackage
-      (
-        {  buildMix, fetchHex, elixir_ale_0_4_1 }:
-          buildMix {
-            name = "motor_hat";
-            version = "0.6.1";
-            src = fetchHex {
-              pkg = "motor_hat";
-              version = "0.6.1";
-              sha256 =
-                "f555e0ec59ee95d4dc6c14cbc3d9d12014f9bd7882c776dde715b9b1674ffa79";
-            };
-            beamDeps  = [ elixir_ale_0_4_1 ];
-
-            meta = {
-              longDescription = ''Elixir implementation of the pyhton motor_hat
-                                library from Adafruit for there motor_hat board.
-                                Library:
-                                https://github.com/adafruit/Adafruit-Motor-HAT-Python-Library
-                                Board: https://www.adafruit.com/product/2348'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/matthewphilyaw/motor_hat";
-            };
-          }
-      ) {};
-
-    motor_hat = motor_hat_0_6_1;
-
     moxie_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "moxie";
             version = "0.0.1";
             src = fetchHex {
@@ -31516,15 +18919,15 @@ let
                license = stdenv.lib.licenses.free;
               homepage = "https://github.com/molossus/moxie";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     moxie = moxie_0_0_1;
 
     mpinyin_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "mpinyin";
             version = "0.0.2";
             src = fetchHex {
@@ -31539,15 +18942,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/Hor/mpinyin";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mpinyin = mpinyin_0_0_2;
 
     msgpack_0_5_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "msgpack";
             version = "0.5.0";
             src = fetchHex {
@@ -31562,15 +18965,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "http://msgpack.org";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     msgpack = msgpack_0_5_0;
 
     msgpax_0_7_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "msgpax";
             version = "0.7.1";
             src = fetchHex {
@@ -31587,13 +18990,13 @@ let
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/lexmag/msgpax";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     msgpax_0_8_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "msgpax";
             version = "0.8.2";
             src = fetchHex {
@@ -31610,64 +19013,15 @@ let
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/lexmag/msgpax";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     msgpax = msgpax_0_8_2;
 
-    mstore_0_1_9 = callPackage
-      (
-        {  buildRebar3, fetchHex, trie_1_5_0, mmath_0_1_15 }:
-          buildRebar3 {
-            name = "mstore";
-            version = "0.1.9";
-            src = fetchHex {
-              pkg = "mstore";
-              version = "0.1.9";
-              sha256 =
-                "c9b0ac9de587e72d292b923c12fcc1ce8b74946dd688987246a5a4d26679b6ca";
-            };
-
-            beamDeps  = [ trie_1_5_0 mmath_0_1_15 ];
-
-            meta = {
-              description = ''Fast, flat metric store.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/dalmatinerdb/mstore";
-            };
-          }
-      ) {};
-
-    mstore = mstore_0_1_9;
-
-    mt940_0_4_0 = callPackage
-      (
-        {  buildMix, fetchHex, timex_0_19_5, decimal_1_1_1 }:
-          buildMix {
-            name = "mt940";
-            version = "0.4.0";
-            src = fetchHex {
-              pkg = "mt940";
-              version = "0.4.0";
-              sha256 =
-                "7d9f509b4fa43bee0feaba3fa1aceed394145daa522561cd84b584d968be3be4";
-            };
-            beamDeps  = [ timex_0_19_5 decimal_1_1_1 ];
-
-            meta = {
-              description = ''MT940 parser for Elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/my-flow/mt940";
-            };
-          }
-      ) {};
-
-    mt940 = mt940_0_4_0;
-
     mtx_1_0_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "mtx";
             version = "1.0.0";
             src = fetchHex {
@@ -31682,15 +19036,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/synrc/mtx";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mtx = mtx_1_0_0;
 
     multidef_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "multidef";
             version = "0.2.1";
             src = fetchHex {
@@ -31710,15 +19064,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/pragdave/mdef";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     multidef = multidef_0_2_1;
 
     multiset_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "multiset";
             version = "0.0.4";
             src = fetchHex {
@@ -31733,43 +19087,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/hilverd/multiset-elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     multiset = multiset_0_0_4;
 
-    murdoch_0_0_1 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, goth_0_0_3
-        }:
-          buildMix {
-            name = "murdoch";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "murdoch";
-              version = "0.0.1";
-              sha256 =
-                "77ec44ca76d6b4a14df7222104a36cb29ed25f7d52fb3ffe30807ddc82a2d9ad";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 goth_0_0_3 ];
-
-            meta = {
-              longDescription = ''A library for interacting with Google Cloud
-                                Pub/Sub (PubSub). Supports both publication and
-                                pull subscription'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/peburrows/murdoch";
-            };
-          }
-      ) {};
-
-    murdoch = murdoch_0_0_1;
-
     murmur_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "murmur";
             version = "0.2.1";
             src = fetchHex {
@@ -31787,13 +19113,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/gmcabrita/murmur";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     murmur_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "murmur";
             version = "1.0.0";
             src = fetchHex {
@@ -31811,15 +19137,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/gmcabrita/murmur";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     murmur = murmur_1_0_0;
 
     mustache_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "mustache";
             version = "0.0.2";
             src = fetchHex {
@@ -31834,38 +19160,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/schultyy/Mustache.ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mustache = mustache_0_0_2;
 
-    mustachex_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "mustachex";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "mustachex";
-              version = "0.0.1";
-              sha256 =
-                "356a7268e609c77a5b02d4ea4d98a189684a07709ec7db2dafd2b34da79bb402";
-            };
-
-            meta = {
-              description = ''Mustache for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jui/mustachex";
-            };
-          }
-      ) {};
-
-    mustachex = mustachex_0_0_1;
-
     mutant_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "mutant";
             version = "0.0.2";
             src = fetchHex {
@@ -31881,38 +19184,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/hackersguildco/Mutant";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mutant = mutant_0_0_2;
 
-    mynumber_1_0_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "mynumber";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "mynumber";
-              version = "1.0.0";
-              sha256 =
-                "9d95bd6c7a2178c1fe3b9dc2712a6d9567885389a1a20b27518ea6067deeb0f7";
-            };
-
-            meta = {
-              description = ''Mynumber Validation for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/cncgl/elixir_mynumber";
-            };
-          }
-      ) {};
-
-    mynumber = mynumber_1_0_0;
-
     mysql_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "mysql";
             version = "1.0.0";
             src = fetchHex {
@@ -31927,15 +19207,15 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/mysql-otp/mysql-otp";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mysql = mysql_1_0_0;
 
     mysqlex_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, mysql_1_0_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, mysql_1_0_0 }:
+          buildMix ({
             name = "mysqlex";
             version = "0.0.1";
             src = fetchHex {
@@ -31953,15 +19233,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/tjheeta/mysqlex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     mysqlex = mysqlex_0_0_1;
 
     n2o_2_3_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "n2o";
             version = "2.3.0";
             src = fetchHex {
@@ -31976,63 +19256,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/synrc/n2o";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     n2o = n2o_2_3_0;
 
-    nacl_0_3_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "nacl";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "nacl";
-              version = "0.3.0";
-              sha256 =
-                "83a626d0ddd17a9c9528aa57a79e0e19746a42def007bc48c4984f0905098a7b";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''Erlang-NaCl hex package'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/tonyg/erlang-nacl";
-            };
-          }
-      ) {};
-
-    nacl = nacl_0_3_0;
-
-    nadia_0_4_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "nadia";
-            version = "0.4.0";
-            src = fetchHex {
-              pkg = "nadia";
-              version = "0.4.0";
-              sha256 =
-                "e76217333ad6d02ec971bfa781e70268285fc417aebb486318e0584affccb08d";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Telegram Bot API Wrapper written in Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/zhyu/nadia";
-            };
-          }
-      ) {};
-
-    nadia = nadia_0_4_0;
-
     nat_set_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "nat_set";
             version = "0.0.1";
             src = fetchHex {
@@ -32048,15 +19280,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/hilverd/nat-set-elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     nat_set = nat_set_0_0_1;
 
     nativegen_0_4_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "nativegen";
             version = "0.4.1";
             src = fetchHex {
@@ -32072,15 +19304,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/yoavlt/nativegen";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     nativegen = nativegen_0_4_1;
 
     nats_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, poolboy_1_5_1, json_0_3_3 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poolboy_1_5_1,
+          json_0_3_3
+        }:
+          buildMix ({
             name = "nats";
             version = "0.0.1";
             src = fetchHex {
@@ -32097,15 +19335,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/aforward/elixir_nats";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     nats = nats_0_0_1;
 
     nats_msg_0_4_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "nats_msg";
             version = "0.4.1";
             src = fetchHex {
@@ -32121,15 +19359,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/yuce/nats_msg";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     nats_msg = nats_msg_0_4_1;
 
     natsio_0_1_4 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "natsio";
             version = "0.1.4";
             src = fetchHex {
@@ -32144,15 +19382,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/nats-io/elixir-nats";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     natsio = natsio_0_1_4;
 
     natural_sort_0_3_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "natural_sort";
             version = "0.3.0";
             src = fetchHex {
@@ -32168,52 +19406,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/DanCouper/natural_sort";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     natural_sort = natural_sort_0_3_0;
 
-    naughtygram_0_2_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poison_1_5_2,
-          httpoison_0_7_5,
-          floki_0_8_0,
-          exprintf_0_1_6
-        }:
-          buildMix {
-            name = "naughtygram";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "naughtygram";
-              version = "0.2.0";
-              sha256 =
-                "7ae4fb6518c06116139bc6a1fe6e3e52fe590acc4d5dc487c01fc2878ba6819d";
-            };
-            beamDeps  = [
-                          poison_1_5_2
-                          httpoison_0_7_5
-                          floki_0_8_0
-                          exprintf_0_1_6
-                        ];
-
-            meta = {
-              description = ''Instagram Private API client library for
-                            Elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/zensavona/naughtygram";
-            };
-          }
-      ) {};
-
-    naughtygram = naughtygram_0_2_0;
-
     navigation_history_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "navigation_history";
             version = "0.2.0";
             src = fetchHex {
@@ -32230,15 +19431,15 @@ let
               homepage =
                 "https://github.com/tuvistavie/plug-navigation-history";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     navigation_history = navigation_history_0_2_0;
 
     navigation_tree_0_4_4 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "navigation_tree";
             version = "0.4.4";
             src = fetchHex {
@@ -32258,7 +19459,7 @@ let
               homepage =
                 "https://github.com/gutschilla/elixir-navigation-tree";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     navigation_tree = navigation_tree_0_4_4;
@@ -32267,13 +19468,14 @@ let
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           xml_builder_0_0_8,
           pipe_0_0_2,
           ibrowse_4_2_2,
           httpotion_2_2_2
         }:
-          buildMix {
+          buildMix ({
             name = "ndc_ex_sdk";
             version = "0.0.7";
             src = fetchHex {
@@ -32297,15 +19499,15 @@ let
 
               homepage = "https://github.com/open-ndc/ndc-ex-sdk";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ndc_ex_sdk = ndc_ex_sdk_0_0_7;
 
     neat_ex_1_1_0 = callPackage
       (
-        {  buildMix, fetchHex, json_0_3_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, json_0_3_3 }:
+          buildMix ({
             name = "neat_ex";
             version = "1.1.0";
             src = fetchHex {
@@ -32332,15 +19534,15 @@ let
                                 input/output layout, and a fitness function.'';
               license = stdenv.lib.licenses.asl20;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     neat_ex = neat_ex_1_1_0;
 
     nectar_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "nectar";
             version = "0.0.1";
             src = fetchHex {
@@ -32354,116 +19556,15 @@ let
               description = ''Placeholder package for nectar ecommerce'';
               license = stdenv.lib.licenses.mit;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     nectar = nectar_0_0_1;
 
-    neo4j_0_3_0 = callPackage
-      (
-        {  buildErlangMk, fetchHex, jiffy_0_14_7, hackney_1_4_10 }:
-          buildErlangMk {
-            name = "neo4j";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "neo4j";
-              version = "0.3.0";
-              sha256 =
-                "93b07252e5216dbccedda19a28873ab5352f59a3c0f257b85a14d3b4e47d3cf7";
-            };
-            beamDeps  = [ jiffy_0_14_7 hackney_1_4_10 ];
-
-            meta = {
-              longDescription = ''Erlang client library for Neo4J This is a
-                                lightweight wrapper for Neo4j REST API. Exposes
-                                all of the functionality exposed by Neo4J REST
-                                API. Please refer to README to see if you need
-                                version 0.2.1 or 0.3'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/dmitriid/neo4j-erlang";
-            };
-          }
-      ) {};
-
-    neo4j = neo4j_0_3_0;
-
-    neo4j_sips_0_1_25 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poolboy_1_5_1,
-          poison_2_1_0,
-          httpoison_0_8_2,
-          con_cache_0_11_0
-        }:
-          buildMix {
-            name = "neo4j_sips";
-            version = "0.1.25";
-            src = fetchHex {
-              pkg = "neo4j_sips";
-              version = "0.1.25";
-              sha256 =
-                "b81aa758aa45ec67c40d8876e5bf6a69e290e0c8d529e078546e930dbc3dcd8e";
-            };
-            beamDeps  = [
-                          poolboy_1_5_1
-                          poison_2_1_0
-                          httpoison_0_8_2
-                          con_cache_0_11_0
-                        ];
-
-            meta = {
-              description = ''A very simple and versatile Neo4J Elixir
-                            driver'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/florinpatrascu/neo4j_sips";
-            };
-          }
-      ) {};
-
-    neo4j_sips = neo4j_sips_0_1_25;
-
-    neo4j_sips_models_0_1_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          timex_1_0_2,
-          neo4j_sips_0_1_25,
-          inflex_1_5_0,
-          chronos_1_5_1
-        }:
-          buildMix {
-            name = "neo4j_sips_models";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "neo4j_sips_models";
-              version = "0.1.1";
-              sha256 =
-                "6572993cd5acdcdf77490d608236c869ce0cda2931beda2a272f85f2f1831759";
-            };
-            beamDeps  = [
-                          timex_1_0_2
-                          neo4j_sips_0_1_25
-                          inflex_1_5_0
-                          chronos_1_5_1
-                        ];
-
-            meta = {
-              description = ''Add Models support to the Neo4J Elixir driver'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/florinpatrascu/neo4j_sips_models";
-            };
-          }
-      ) {};
-
-    neo4j_sips_models = neo4j_sips_models_0_1_1;
-
     neotoma_1_7_3 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "neotoma";
             version = "1.7.3";
             src = fetchHex {
@@ -32473,44 +19574,23 @@ let
                 "2da322b9b1567ffa0706a7f30f6bbbde70835ae44a1050615f4b4a3d436e0f28";
             };
 
+            buildPlugins  = [ rebar3_hex ];
+
+
             meta = {
               description = ''PEG/Packrat toolkit and parser-generator.'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/seancribbs/neotoma";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     neotoma = neotoma_1_7_3;
 
-    neotomex_0_1_4 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "neotomex";
-            version = "0.1.4";
-            src = fetchHex {
-              pkg = "neotomex";
-              version = "0.1.4";
-              sha256 =
-                "0a15f69aa859882699e30a30386ad47a16abb5e862c27aea56e51040d682fa5a";
-            };
-
-            meta = {
-              description = ''A PEG parser/transformer with a pleasant Elixir
-                            DSL.'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/jtmoulia/neotomex";
-            };
-          }
-      ) {};
-
-    neotomex = neotomex_0_1_4;
-
     nerves_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, exrm_1_0_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, exrm_1_0_3 }:
+          buildMix ({
             name = "nerves";
             version = "0.2.0";
             src = fetchHex {
@@ -32527,39 +19607,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/nerves-project/nerves";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     nerves = nerves_0_2_0;
 
-    nerves_io_neopixel_0_2_0 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "nerves_io_neopixel";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "nerves_io_neopixel";
-              version = "0.2.0";
-              sha256 =
-                "662ca0af01330399eba9aff9806c086027ec5b3a2e235af4cd909282a6d09afa";
-            };
-
-            meta = {
-              description = ''Drive WS2812B "NeoPixel" RGB LED strips from a
-                            Raspberry Pi using Elixir.'';
-              license = with stdenv.lib.licenses; [ mit free ];
-              homepage = "https://github.com/GregMefford/nerves_io_neopixel";
-            };
-          }
-      ) {};
-
-    nerves_io_neopixel = nerves_io_neopixel_0_2_0;
-
     nest_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "nest";
             version = "0.0.1";
             src = fetchHex {
@@ -32576,15 +19632,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/adamzaninovich/nest";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     nest = nest_0_0_1;
 
     nested_set_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, ecto_1_1_5 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, ecto_1_1_5 }:
+          buildMix ({
             name = "nested_set";
             version = "0.0.2";
             src = fetchHex {
@@ -32603,15 +19659,15 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/bansalakhil/elixir_nested_set";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     nested_set = nested_set_0_0_2;
 
     netrc_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "netrc";
             version = "0.0.2";
             src = fetchHex {
@@ -32626,15 +19682,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ma2gedev/netrcex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     netrc = netrc_0_0_2;
 
     netstrings_2_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "netstrings";
             version = "2.0.1";
             src = fetchHex {
@@ -32649,15 +19705,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mwmiller/netstrings_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     netstrings = netstrings_2_0_1;
 
     neural_network_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "neural_network";
             version = "0.1.0";
             src = fetchHex {
@@ -32674,15 +19730,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/kblake/neural-net-elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     neural_network = neural_network_0_1_0;
 
     news_0_3_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "news";
             version = "0.3.0";
             src = fetchHex {
@@ -32697,15 +19753,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/zhongwencool/news";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     news = news_0_3_0;
 
     ngram_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ngram";
             version = "0.0.1";
             src = fetchHex {
@@ -32720,67 +19776,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ardcore/ngram";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ngram = ngram_0_0_1;
 
-    nice_nickname_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_4_0 }:
-          buildMix {
-            name = "nice_nickname";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "nice_nickname";
-              version = "0.0.1";
-              sha256 =
-                "7d5c635290df8fa7a59dbaa22e519102e13ddb8ac4cae5a7a40018c9ff795b42";
-            };
-            beamDeps  = [ poison_1_4_0 ];
-
-            meta = {
-              description = ''A nickname generator and profanity filter for
-                            Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/skylerparr/nice_nickname";
-            };
-          }
-      ) {};
-
-    nice_nickname = nice_nickname_0_0_1;
-
-    nifty_0_0_3 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "nifty";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "nifty";
-              version = "0.0.3";
-              sha256 =
-                "ef5c6ea64835d3371382c7e042c42aec0b85625b232b4b9e1f2587e1c8e5401e";
-            };
-
-            meta = {
-              longDescription = ''A semi-useful tool to generate boilerplate
-                                when you want to use a NIF in your project. You
-                                don`t really want to use a NIF in your project,
-                                until you do. Then this might save you writing
-                                most of the boilerplate.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/rossjones/nifty";
-            };
-          }
-      ) {};
-
-    nifty = nifty_0_0_3;
-
     nile_0_1_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "nile";
             version = "0.1.3";
             src = fetchHex {
@@ -32795,176 +19799,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/camshaft/nile";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     nile = nile_0_1_3;
 
-    ninjaproxies_0_2_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "ninjaproxies";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "ninjaproxies";
-              version = "0.2.0";
-              sha256 =
-                "5524329d00944690b362d30fef9c4032c03c401cc44d0ad9e98e147f5792fade";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Ninjaproxies client library for Elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/zensavona/ninjaproxies";
-            };
-          }
-      ) {};
-
-    ninjaproxies = ninjaproxies_0_2_0;
-
-    nio_google_authenticator_1_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, pot_0_9_4, ecto_2_0_0_beta_2 }:
-          buildMix {
-            name = "nio_google_authenticator";
-            version = "1.0.1";
-            src = fetchHex {
-              pkg = "nio_google_authenticator";
-              version = "1.0.1";
-              sha256 =
-                "a8a82c6c40e9575e8bea2fc7302af05bcd478b3a6a0e9df212617f807fe23758";
-            };
-            beamDeps  = [ pot_0_9_4 ecto_2_0_0_beta_2 ];
-
-            meta = {
-              longDescription = ''NioGoogleAuthenticator is a collection of
-                                Elixir convenience functions to generate secrets
-                                and validate tokens used in conjunction with
-                                Google Authenticator. It also includes functions
-                                that automatically add a secret to an
-                                Ecto.Changeset.'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/maxneuvians/nio_google_authenticator";
-            };
-          }
-      ) {};
-
-    nio_google_authenticator = nio_google_authenticator_1_0_1;
-
-    nio_google_geocoder_0_7_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poison_1_5_2,
-          httpoison_0_8_2,
-          ecto_2_0_0_beta_2
-        }:
-          buildMix {
-            name = "nio_google_geocoder";
-            version = "0.7.0";
-            src = fetchHex {
-              pkg = "nio_google_geocoder";
-              version = "0.7.0";
-              sha256 =
-                "ba551ad6138b133d6b90ac96c0443aa31724084049059bf15710dac4c1f3e701";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ecto_2_0_0_beta_2 ];
-
-            meta = {
-              longDescription = ''NioGoogleGeocoder is a collection of Elixir
-                                convenience functions to geocode a single, or
-                                list of, addresses. It also includes a function
-                                that automatically adds a geo location to an
-                                `Ecto.Changeset`.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/maxneuvians/nio_google_geocoder";
-            };
-          }
-      ) {};
-
-    nio_google_geocoder = nio_google_geocoder_0_7_0;
-
-    njord_0_1_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "njord";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "njord";
-              version = "0.1.1";
-              sha256 =
-                "b438430dbf6ceaf2bede01a285c5032be3041cbedd7c1552653d75179fab4dfb";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''A wrapper over HTTPoison to build client APIs.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/gmtprime/njord";
-            };
-          }
-      ) {};
-
-    njord = njord_0_1_1;
-
-    nodefinder_1_5_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, erlcloud_0_9_2 }:
-          buildRebar3 {
-            name = "nodefinder";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "nodefinder";
-              version = "1.5.1";
-              sha256 =
-                "c617372ee14c344c546a978936d7ceab283609b3b33b6516ed9b3651ad5bfb48";
-            };
-
-            beamDeps  = [ erlcloud_0_9_2 ];
-
-            meta = {
-              description = ''Strategies For Automatic Node Discovery'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/okeuday/nodefinder";
-            };
-          }
-      ) {};
-
-    nodefinder = nodefinder_1_5_1;
-
-    normalixr_0_3_0 = callPackage
-      (
-        {  buildMix, fetchHex, ecto_0_2_7 }:
-          buildMix {
-            name = "normalixr";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "normalixr";
-              version = "0.3.0";
-              sha256 =
-                "22a9c5137c23b1485a6b13027cb2979ce04d5b119b257e863975a7fb336c1e46";
-            };
-            beamDeps  = [ ecto_0_2_7 ];
-
-            meta = {
-              description = ''Normalization and backfilling Ecto Schemas'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/theemuts/normalixr";
-            };
-          }
-      ) {};
-
-    normalixr = normalixr_0_3_0;
-
     normalize_email_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, is_email_0_0_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, is_email_0_0_2 }:
+          buildMix ({
             name = "normalize_email";
             version = "0.0.1";
             src = fetchHex {
@@ -32980,15 +19823,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/johnotander/normalize_email";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     normalize_email = normalize_email_0_0_1;
 
     normalize_url_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "normalize_url";
             version = "0.0.2";
             src = fetchHex {
@@ -33003,15 +19846,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/johnotander/normalize_url";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     normalize_url = normalize_url_0_0_2;
 
     not_qwerty123_1_1_0 = callPackage
       (
-        {  buildMix, fetchHex, gettext_0_10_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, gettext_0_10_0 }:
+          buildMix ({
             name = "not_qwerty123";
             version = "1.1.0";
             src = fetchHex {
@@ -33028,15 +19871,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/riverrun/notqwerty123";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     not_qwerty123 = not_qwerty123_1_1_0;
 
     number_0_4_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "number";
             version = "0.4.1";
             src = fetchHex {
@@ -33052,77 +19895,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/danielberkompas/number";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     number = number_0_4_1;
 
-    oauth2_0_3_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poison_1_5_2,
-          plug_1_1_3,
-          httpoison_0_8_2,
-          hackney_1_6_0
-        }:
-          buildMix {
-            name = "oauth2";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "oauth2";
-              version = "0.3.0";
-              sha256 =
-                "ee23e6fb6ac84abce23713ba93f1df2fd368c9ad7b9288f0ef6fcec0e0249043";
-            };
-            beamDeps  = [
-                          poison_1_5_2 plug_1_1_3 httpoison_0_8_2 hackney_1_6_0
-                        ];
-
-            meta = {
-              description = ''An Elixir OAuth 2.0 Client Library'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/scrogson/oauth2";
-            };
-          }
-      ) {};
-
-    oauth2_0_6_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poison_1_0_3,
-          mimetype_parser_0_1_2,
-          httpoison_0_8_2
-        }:
-          buildMix {
-            name = "oauth2";
-            version = "0.6.0";
-            src = fetchHex {
-              pkg = "oauth2";
-              version = "0.6.0";
-              sha256 =
-                "1fcc76a12fcaa57392c0288be90df0eabd898c0982944c67d0e84e980c423e10";
-            };
-            beamDeps  = [ poison_1_0_3 mimetype_parser_0_1_2 httpoison_0_8_2
-                      ];
-
-            meta = {
-              description = ''An Elixir OAuth 2.0 Client Library'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/scrogson/oauth2";
-            };
-          }
-      ) {};
-
-    oauth2 = oauth2_0_6_0;
-
     oauth2_erlang_0_6_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "oauth2_erlang";
             version = "0.6.1";
             src = fetchHex {
@@ -33137,91 +19918,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/kivra/oauth2";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     oauth2_erlang = oauth2_erlang_0_6_1;
 
-    oauth2cli_0_0_4 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poison_1_5_2,
-          plug_0_9_0,
-          httpoison_0_7_5,
-          hackney_1_6_0,
-          cowboy_1_0_4
-        }:
-          buildMix {
-            name = "oauth2cli";
-            version = "0.0.4";
-            src = fetchHex {
-              pkg = "oauth2cli";
-              version = "0.0.4";
-              sha256 =
-                "16645e7bb9b3af13d1187da955403ff70c0cdaded278d0c51503ea6c29172b5b";
-            };
-            beamDeps  = [
-                          poison_1_5_2
-                          plug_0_9_0
-                          httpoison_0_7_5
-                          hackney_1_6_0
-                          cowboy_1_0_4
-                        ];
-
-            meta = {
-              description = ''Simple OAuth2 client '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/mgamini/oauth2cli-elixir";
-            };
-          }
-      ) {};
-
-    oauth2cli = oauth2cli_0_0_4;
-
-    oauth2ex_0_0_9 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          timex_1_0_0_rc4,
-          plug_1_1_3,
-          httpoison_0_8_2,
-          exjsx_3_2_0,
-          cowboy_1_0_4
-        }:
-          buildMix {
-            name = "oauth2ex";
-            version = "0.0.9";
-            src = fetchHex {
-              pkg = "oauth2ex";
-              version = "0.0.9";
-              sha256 =
-                "46f5f13c0474da8727f45c6d7c455d86d94a1b20176230a2b21be0494066a564";
-            };
-            beamDeps  = [
-                          timex_1_0_0_rc4
-                          plug_1_1_3
-                          httpoison_0_8_2
-                          exjsx_3_2_0
-                          cowboy_1_0_4
-                        ];
-
-            meta = {
-              description = ''An OAuth 2.0 client library for elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/parroty/oauth2ex";
-            };
-          }
-      ) {};
-
-    oauth2ex = oauth2ex_0_0_9;
-
     oauther_1_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "oauther";
             version = "1.0.2";
             src = fetchHex {
@@ -33237,86 +19942,15 @@ let
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/lexmag/oauther";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     oauther = oauther_1_0_2;
 
-    obelisk_0_10_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          rss_0_2_1,
-          plug_0_11_3,
-          mock_0_1_3,
-          earmark_0_1_19,
-          cowboy_1_0_4,
-          chronos_0_3_9,
-          calliope_0_3_0,
-          anubis_0_1_0
-        }:
-          buildMix {
-            name = "obelisk";
-            version = "0.10.0";
-            src = fetchHex {
-              pkg = "obelisk";
-              version = "0.10.0";
-              sha256 =
-                "faf46188e3f79c8ac512ae104016f18d05598198feb35a09c8936c548dfba06e";
-            };
-            beamDeps  = [
-                          rss_0_2_1
-                          plug_0_11_3
-                          mock_0_1_3
-                          earmark_0_1_19
-                          cowboy_1_0_4
-                          chronos_0_3_9
-                          calliope_0_3_0
-                          anubis_0_1_0
-                        ];
-
-            meta = {
-              longDescription = '' obelisk is a static site generator for
-                                Elixir. It is inspired by jekyll, with the goal
-                                of being fast and simple to use and extend. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bennyhallett/obelisk";
-            };
-          }
-      ) {};
-
-    obelisk = obelisk_0_10_0;
-
-    observer_cli_1_0_3 = callPackage
-      (
-        {  buildRebar3, fetchHex, recon_2_2_1 }:
-          buildRebar3 {
-            name = "observer_cli";
-            version = "1.0.3";
-            src = fetchHex {
-              pkg = "observer_cli";
-              version = "1.0.3";
-              sha256 =
-                "18e5d9aa5412ec063cf9719bcfe73bf990c5fed5c9a3c8422c2b5d9529fc8b0d";
-            };
-
-            beamDeps  = [ recon_2_2_1 ];
-
-            meta = {
-              description = ''Visualize Erlang Nodes On The Command Line'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/zhongwencool/observer_cli";
-            };
-          }
-      ) {};
-
-    observer_cli = observer_cli_1_0_3;
-
     octet_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "octet";
             version = "0.0.2";
             src = fetchHex {
@@ -33331,42 +19965,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/kiennt/octet";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     octet = octet_0_0_2;
 
-    octokit_0_1_0 = callPackage
-      (
-        {
-          buildMix, fetchHex, timex_1_0_2, poison_2_1_0, httpoison_0_8_2
-        }:
-          buildMix {
-            name = "octokit";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "octokit";
-              version = "0.1.0";
-              sha256 =
-                "1c761130e94dbbe16a7751ee1289e1334c9208222da03a8ae9fd77c50f5e969b";
-            };
-            beamDeps  = [ timex_1_0_2 poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''An Elixir library for accessing the GitHub
-                            API.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/lee-dohm/octokit.ex";
-            };
-          }
-      ) {};
-
-    octokit = octokit_0_1_0;
-
     odgn_json_pointer_1_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "odgn_json_pointer";
             version = "1.1.0";
             src = fetchHex {
@@ -33382,15 +19989,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/odogono/elixir-jsonpointer";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     odgn_json_pointer = odgn_json_pointer_1_1_0;
 
     odt_potion_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "odt_potion";
             version = "0.0.1";
             src = fetchHex {
@@ -33406,15 +20013,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/andrewcottage/odt_potion";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     odt_potion = odt_potion_0_0_1;
 
     og_0_0_6 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "og";
             version = "0.0.6";
             src = fetchHex {
@@ -33430,15 +20037,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/stephenmoloney/og";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     og = og_0_0_6;
 
     ok_0_1_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ok";
             version = "0.1.3";
             src = fetchHex {
@@ -33453,15 +20060,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/CrowdHailer/OK";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ok = ok_0_1_3;
 
     ok_jose_2_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ok_jose";
             version = "2.0.0";
             src = fetchHex {
@@ -33476,87 +20083,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/vic/ok_jose";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ok_jose = ok_jose_2_0_0;
 
-    okta_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_4_0, httpoison_0_7_5 }:
-          buildMix {
-            name = "okta";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "okta";
-              version = "0.0.1";
-              sha256 =
-                "1fb857a60a917bfe9ff6b1bf87908ba8aa1387ddc4586f9b9465fe19415d825a";
-            };
-            beamDeps  = [ poison_1_4_0 httpoison_0_7_5 ];
-
-            meta = {
-              description = ''An Elixir Library for interfacing Okta'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/Cobenian/okta";
-            };
-          }
-      ) {};
-
-    okta = okta_0_0_1;
-
-    omise_0_1_4 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "omise";
-            version = "0.1.4";
-            src = fetchHex {
-              pkg = "omise";
-              version = "0.1.4";
-              sha256 =
-                "35e7fe1776da9cf5ddeb0138391868d6dbbe976e5a932183c4f445371b1b0c4d";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Omise client library for Elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/teerawat1992/omise";
-            };
-          }
-      ) {};
-
-    omise = omise_0_1_4;
-
-    one_signal_0_0_6 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "one_signal";
-            version = "0.0.6";
-            src = fetchHex {
-              pkg = "one_signal";
-              version = "0.0.6";
-              sha256 =
-                "d90ec5f9e43d164e2942422d3c1e9a6b26a956ea135eb1a316380e12ef6b27d1";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Elixir wrapper of OneSignal'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/yoavlt/one_signal";
-            };
-          }
-      ) {};
-
-    one_signal = one_signal_0_0_6;
-
     onetime_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, timex_1_0_2 }:
+          buildMix ({
             name = "onetime";
             version = "1.0.0";
             src = fetchHex {
@@ -33572,15 +20107,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ryo33/onetime-elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     onetime = onetime_1_0_0;
 
     oop_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "oop";
             version = "0.0.4";
             src = fetchHex {
@@ -33595,138 +20130,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/wojtekmach/oop";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     oop = oop_0_0_4;
 
-    opbeat_0_3_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "opbeat";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "opbeat";
-              version = "0.3.0";
-              sha256 =
-                "20977e8ae08a1789326a3e5c0c8fa3265dd0e6ddc1fb6abe25c3a33d3fc9e692";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Elixir client for opbeat'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/teodor-pripoae/opbeat";
-            };
-          }
-      ) {};
-
-    opbeat = opbeat_0_3_0;
-
-    open_graphx_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2, floki_0_8_0 }:
-          buildMix {
-            name = "open_graphx";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "open_graphx";
-              version = "0.0.2";
-              sha256 =
-                "2eef951c4fbb8a01f11ed3ab6ca62dc695a84baf9ae0fbe7698058eac8020b70";
-            };
-            beamDeps  = [ httpoison_0_8_2 floki_0_8_0 ];
-
-            meta = {
-              description = ''Load Open Graph Protocol'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/yoavlt/open_graphx";
-            };
-          }
-      ) {};
-
-    open_graphx = open_graphx_0_0_2;
-
-    openmaize_0_17_2 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          postgrex_0_11_1,
-          poison_2_1_0,
-          plug_1_1_3,
-          not_qwerty123_1_1_0,
-          ecto_2_0_0_beta_2,
-          cowboy_1_0_4,
-          comeonin_2_3_0
-        }:
-          buildMix {
-            name = "openmaize";
-            version = "0.17.2";
-            src = fetchHex {
-              pkg = "openmaize";
-              version = "0.17.2";
-              sha256 =
-                "d3199c1513d4033ccec4fcc52a0d0dd6afb09b5c58c848a33d43dd4da08eda91";
-            };
-            beamDeps  = [
-                          postgrex_0_11_1
-                          poison_2_1_0
-                          plug_1_1_3
-                          not_qwerty123_1_1_0
-                          ecto_2_0_0_beta_2
-                          cowboy_1_0_4
-                          comeonin_2_3_0
-                        ];
-
-            meta = {
-              description = ''Authentication library for Elixir using Plug.'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/elixircnx/openmaize";
-            };
-          }
-      ) {};
-
-    openmaize = openmaize_0_17_2;
-
-    openstack_0_0_4 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          table_0_0_4,
-          poison_1_5_2,
-          maybe_0_0_1,
-          httpoison_0_8_2
-        }:
-          buildMix {
-            name = "openstack";
-            version = "0.0.4";
-            src = fetchHex {
-              pkg = "openstack";
-              version = "0.0.4";
-              sha256 =
-                "ddc471e2d95edb26b3f826986f730fbb1fb70de62edaa00a0c1cd7fd6de7fde1";
-            };
-            beamDeps  = [
-                          table_0_0_4 poison_1_5_2 maybe_0_0_1 httpoison_0_8_2
-                        ];
-
-            meta = {
-              description = ''Openstack Client'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/zweifisch/openstack.ex";
-            };
-          }
-      ) {};
-
-    openstack = openstack_0_0_4;
-
     ordered_list_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ordered_list";
             version = "0.1.0";
             src = fetchHex {
@@ -33741,15 +20153,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/aarondufall/ordered_list";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ordered_list = ordered_list_0_1_0;
 
     os_utils_0_3_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "os_utils";
             version = "0.3.0";
             src = fetchHex {
@@ -33764,15 +20176,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/orderthruchaos/os_utils";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     os_utils = os_utils_0_3_0;
 
     osc_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "osc";
             version = "0.1.1";
             src = fetchHex {
@@ -33787,89 +20199,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/camshaft/osc_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     osc = osc_0_1_1;
 
-    overpass_0_1_1 = callPackage
-      (
-        {
-          buildMix, fetchHex, sweet_xml_0_5_1, jsx_2_8_0, httpoison_0_7_5
-        }:
-          buildMix {
-            name = "overpass";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "overpass";
-              version = "0.1.1";
-              sha256 =
-                "6a664bd17e7612825fd7c3a0c3e0039412d83ac6d459c84018caf07e800cb6a8";
-            };
-            beamDeps  = [ sweet_xml_0_5_1 jsx_2_8_0 httpoison_0_7_5 ];
-
-            meta = {
-              description = ''A Elixir wrapper to access the Overpass API.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/CodeforChemnitz/elixir-overpass";
-            };
-          }
-      ) {};
-
-    overpass = overpass_0_1_1;
-
-    oxr_0_3_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "oxr";
-            version = "0.3.1";
-            src = fetchHex {
-              pkg = "oxr";
-              version = "0.3.1";
-              sha256 =
-                "85b9525da74c1c36c3e8121d4db79775fc62ba27bb34be1f7f4b5615c70dc57c";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''A thin API wrapper for Open Exchange Rates
-                            (https://openexchangerates.org)'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/marksilvis/oxr-elixir";
-            };
-          }
-      ) {};
-
-    oxr = oxr_0_3_1;
-
-    p1_mysql_1_0_1 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "p1_mysql";
-            version = "1.0.1";
-            src = fetchHex {
-              pkg = "p1_mysql";
-              version = "1.0.1";
-              sha256 =
-                "4235c0d95d4ec01ed7511ebb253f5c54a9635b766a8b923f41e238ed85008e7d";
-            };
-
-            meta = {
-              description = ''Pure Erlang MySQL driver'';
-              license = with stdenv.lib.licenses; [ free asl20 ];
-              homepage = "https://github.com/processone/p1_mysql";
-            };
-          }
-      ) {};
-
-    p1_mysql = p1_mysql_1_0_1;
-
     p1_oauth2_0_6_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "p1_oauth2";
             version = "0.6.1";
             src = fetchHex {
@@ -33879,68 +20217,23 @@ let
                 "304923dcaf1edcc84b7f3f6fab1d5235777604ec3334453cf50de1060300e002";
             };
 
+            buildPlugins  = [ rebar3_hex ];
+
+
             meta = {
               description = ''Erlang OAuth 2.0 implementation'';
               license = with stdenv.lib.licenses; [ mit asl20 ];
               homepage = "https://github.com/processone/p1_oauth2";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     p1_oauth2 = p1_oauth2_0_6_1;
 
-    p1_pgsql_1_1_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "p1_pgsql";
-            version = "1.1.0";
-            src = fetchHex {
-              pkg = "p1_pgsql";
-              version = "1.1.0";
-              sha256 =
-                "d6616a30e8d6964b488cebd6b9ca754783640ca85c4792bf7b1260a15303bf1c";
-            };
-
-            meta = {
-              description = ''PostgreSQL driver'';
-              license = with stdenv.lib.licenses; [ epl10 asl20 ];
-              homepage = "https://github.com/processone/p1_pgsql";
-            };
-          }
-      ) {};
-
-    p1_pgsql = p1_pgsql_1_1_0;
-
-    p1_stringprep_1_0_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, p1_utils_1_0_3 }:
-          buildRebar3 {
-            name = "p1_stringprep";
-            version = "1.0.1";
-            src = fetchHex {
-              pkg = "p1_stringprep";
-              version = "1.0.1";
-              sha256 =
-                "e36ce6434010eba2fb6fc18bf4ba65797be3bba17a686f79a2326d26614071c0";
-            };
-            compilePorts = true;
-            beamDeps  = [ p1_utils_1_0_3 ];
-
-            meta = {
-              description = ''Fast Stringprep Erlang / Elixir implementation'';
-              license = with stdenv.lib.licenses; [ asl20 free ];
-              homepage = "https://github.com/processone/stringprep";
-            };
-          }
-      ) {};
-
-    p1_stringprep = p1_stringprep_1_0_1;
-
     p1_utils_1_0_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "p1_utils";
             version = "1.0.0";
             src = fetchHex {
@@ -33950,90 +20243,21 @@ let
                 "b2c6316286b071f2f667fb1c59b44fe0c996917515fa93374a4a3264affc5105";
             };
 
-            meta = {
-              description = ''Erlang utility modules from ProcessOne'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/processone/p1_utils";
-            };
-          }
-      ) {};
+            buildPlugins  = [ rebar3_hex ];
 
-    p1_utils_1_0_3 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "p1_utils";
-            version = "1.0.3";
-            src = fetchHex {
-              pkg = "p1_utils";
-              version = "1.0.3";
-              sha256 =
-                "6bf7dc7108eee70e036ea745faf5f55b4354e267f14371ea13338f58ce402d5e";
-            };
 
             meta = {
               description = ''Erlang utility modules from ProcessOne'';
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/processone/p1_utils";
             };
-          }
+          } // packageOverrides)
       ) {};
 
-    p1_utils = p1_utils_1_0_3;
-
-    p1_xml_1_1_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, p1_utils_1_0_0 }:
-          buildRebar3 {
-            name = "p1_xml";
-            version = "1.1.1";
-            src = fetchHex {
-              pkg = "p1_xml";
-              version = "1.1.1";
-              sha256 =
-                "ab68956163cc5ff8c749c503507a36c543841259e78c58a2bbe0ebe76a0b7ce3";
-            };
-            compilePorts = true;
-            beamDeps  = [ p1_utils_1_0_0 ];
-
-            meta = {
-              description = ''XML parsing library. Now obsolete. Use fast_xml
-                            instead'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/processone/xml";
-            };
-          }
-      ) {};
-
-    p1_xml = p1_xml_1_1_1;
-
-    p1_xmlrpc_1_15_1 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "p1_xmlrpc";
-            version = "1.15.1";
-            src = fetchHex {
-              pkg = "p1_xmlrpc";
-              version = "1.15.1";
-              sha256 =
-                "4bca3009ad6b6c37c30255e3d63191a188e0fc6b6db41a428fe111d699d1a330";
-            };
-
-            meta = {
-              description = ''XML-RPC server'';
-              license = with stdenv.lib.licenses; [ bsd2 asl20 ];
-              homepage = "https://github.com/processone/p1_xmlrpc";
-            };
-          }
-      ) {};
-
-    p1_xmlrpc = p1_xmlrpc_1_15_1;
-
     pact_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "pact";
             version = "0.2.0";
             src = fetchHex {
@@ -34049,39 +20273,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/BlakeWilliams/pact";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pact = pact_0_2_0;
 
-    pagexduty_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_1_0 }:
-          buildMix {
-            name = "pagexduty";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "pagexduty";
-              version = "0.1.0";
-              sha256 =
-                "7292a63eeb27637ff19f91f50910d2bbbc860e1eb0413aa5a5035ef32b41b232";
-            };
-            beamDeps  = [ httpoison_0_8_2 exjsx_3_1_0 ];
-
-            meta = {
-              description = ''A Pagerduty client for Elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ride/pagexduty";
-            };
-          }
-      ) {};
-
-    pagexduty = pagexduty_0_1_0;
-
     paginex_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "paginex";
             version = "0.0.1";
             src = fetchHex {
@@ -34097,15 +20297,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bhserna/paginex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     paginex = paginex_0_0_1;
 
     painstaking_0_5_8 = callPackage
       (
-        {  buildMix, fetchHex, exoddic_1_3_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, exoddic_1_3_1 }:
+          buildMix ({
             name = "painstaking";
             version = "0.5.8";
             src = fetchHex {
@@ -34121,15 +20321,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mwmiller/painstaking";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     painstaking = painstaking_0_5_8;
 
     palette_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "palette";
             version = "0.0.2";
             src = fetchHex {
@@ -34144,15 +20344,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/lpil/palette";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     palette = palette_0_0_2;
 
     pandex_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "pandex";
             version = "0.1.0";
             src = fetchHex {
@@ -34173,15 +20373,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/filterkaapi/pandex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pandex = pandex_0_1_0;
 
     pangu_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "pangu";
             version = "0.1.0";
             src = fetchHex {
@@ -34196,15 +20396,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/cataska/pangu.ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pangu = pangu_0_1_0;
 
     parabaikElixirConverter_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "parabaikElixirConverter";
             version = "0.0.1";
             src = fetchHex {
@@ -34223,15 +20423,15 @@ let
               homepage =
                 "https://github.com/Arkar-Aung/ParabaikElixirConverter";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     parabaikElixirConverter = parabaikElixirConverter_0_0_1;
 
     parallel_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "parallel";
             version = "0.0.3";
             src = fetchHex {
@@ -34246,15 +20446,15 @@ let
 
               homepage = "https://github.com/Anonyfox/parallel";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     parallel = parallel_0_0_3;
 
     parallel_stream_1_0_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "parallel_stream";
             version = "1.0.3";
             src = fetchHex {
@@ -34269,40 +20469,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/beatrichartz/parallel_stream";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     parallel_stream = parallel_stream_1_0_3;
 
-    params_2_0_0_beta_0 = callPackage
-      (
-        {  buildMix, fetchHex, ecto_0_2_7 }:
-          buildMix {
-            name = "params";
-            version = "2.0.0-beta.0";
-            src = fetchHex {
-              pkg = "params";
-              version = "2.0.0-beta.0";
-              sha256 =
-                "c8db0e2c6d4c592e66d19f6fdef0ecfab8aeb23101cbacf7cd3c5c8624780a72";
-            };
-            beamDeps  = [ ecto_0_2_7 ];
-
-            meta = {
-              description = ''Parameter structure validation and casting with
-                            Ecto.Schema.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/vic/params";
-            };
-          }
-      ) {};
-
-    params = params_2_0_0_beta_0;
-
     paratize_2_1_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "paratize";
             version = "2.1.3";
             src = fetchHex {
@@ -34318,39 +20493,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/seantanly/elixir-paratize";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     paratize = paratize_2_1_3;
 
-    parse_client_0_2_3 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_7_5, exjsx_3_0_2 }:
-          buildMix {
-            name = "parse_client";
-            version = "0.2.3";
-            src = fetchHex {
-              pkg = "parse_client";
-              version = "0.2.3";
-              sha256 =
-                "b80b259f9645ea4767824d47c12f719faf51a8031c4162f316fbe99a77b45c23";
-            };
-            beamDeps  = [ httpoison_0_7_5 exjsx_3_0_2 ];
-
-            meta = {
-              description = ''Elixir client for the parse.com REST API '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/elixircnx/parse_elixir_client";
-            };
-          }
-      ) {};
-
-    parse_client = parse_client_0_2_3;
-
     parse_torrent_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, earmark_0_2_1, bencode_0_3_0 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          earmark_0_2_1,
+          bencode_0_3_0
+        }:
+          buildMix ({
             name = "parse_torrent";
             version = "0.2.0";
             src = fetchHex {
@@ -34366,40 +20523,15 @@ let
               license = stdenv.lib.licenses.unlicense;
               homepage = "https://github.com/preciz/parse_torrent";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     parse_torrent = parse_torrent_0_2_0;
 
-    parse_trans_2_9_0 = callPackage
-      (
-        {  buildRebar3, fetchHex, edown_0_7_0 }:
-          buildRebar3 {
-            name = "parse_trans";
-            version = "2.9.0";
-            src = fetchHex {
-              pkg = "parse_trans";
-              version = "2.9.0";
-              sha256 =
-                "dda020976ad4aafe051ce785c0460a71a11b8b6b8c08a98e2c45b83edfdf2978";
-            };
-
-            beamDeps  = [ edown_0_7_0 ];
-
-            meta = {
-              description = ''Parse transform utilities for Erlang.'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/uwiger/parse_trans";
-            };
-          }
-      ) {};
-
-    parse_trans = parse_trans_2_9_0;
-
     parselix_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "parselix";
             version = "0.1.0";
             src = fetchHex {
@@ -34414,65 +20546,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ryo33/Parselix";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     parselix = parselix_0_1_0;
 
-    parsex_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2, poison_1_1_1 }:
-          buildMix {
-            name = "parsex";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "parsex";
-              version = "0.0.2";
-              sha256 =
-                "024657ae8d29eba99caf90276ac2d7f27cf435a543d4036859fd4ab6ffbceb75";
-            };
-            beamDeps  = [ httpoison_0_8_2 poison_1_1_1 ];
-
-            meta = {
-              description = ''ParsEx is an Elixir HTTP Client for communicating
-                            with Parse.com`s Restful API '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/maarek/ParsEx";
-            };
-          }
-      ) {};
-
-    parsex = parsex_0_0_2;
-
-    passport_0_0_4 = callPackage
-      (
-        {  buildMix, fetchHex, phoenix_1_1_4, comeonin_2_3_0 }:
-          buildMix {
-            name = "passport";
-            version = "0.0.4";
-            src = fetchHex {
-              pkg = "passport";
-              version = "0.0.4";
-              sha256 =
-                "10e8e42cfd5fa834d7c3c3276c39274a3824100f2ffeed26adb4ed8475f0be91";
-            };
-            beamDeps  = [ phoenix_1_1_4 comeonin_2_3_0 ];
-
-            meta = {
-              description = ''Provides authentication for phoenix
-                            applications'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/opendrops/passport";
-            };
-          }
-      ) {};
-
-    passport = passport_0_0_4;
-
     pathway_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
+          buildMix ({
             name = "pathway";
             version = "0.1.0";
             src = fetchHex {
@@ -34489,15 +20571,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/novabyte/pathway";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pathway = pathway_0_1_0;
 
     pattern_tap_0_2_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "pattern_tap";
             version = "0.2.2";
             src = fetchHex {
@@ -34513,43 +20595,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mgwidmann/elixir-pattern_tap";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pattern_tap = pattern_tap_0_2_2;
 
-    pavlov_0_2_3 = callPackage
-      (
-        {  buildMix, fetchHex, meck_0_8_4 }:
-          buildMix {
-            name = "pavlov";
-            version = "0.2.3";
-            src = fetchHex {
-              pkg = "pavlov";
-              version = "0.2.3";
-              sha256 =
-                "4d38e96b7581261a49f00d2046603ad3c9af6d52abd26d16bbf6a0a5a82c9643";
-            };
-            beamDeps  = [ meck_0_8_4 ];
-
-            meta = {
-              longDescription = ''Pavlov is a BDD library for your Elixir
-                                projects, allowing you to write expressive unit
-                                tests that tell the story of how your
-                                application behaves. The syntax tries to follow
-                                RSpec`s wherever possible.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/sproutapp/pavlov";
-            };
-          }
-      ) {};
-
-    pavlov = pavlov_0_2_3;
-
     pbkdf2_2_0_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "pbkdf2";
             version = "2.0.0";
             src = fetchHex {
@@ -34564,15 +20618,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/basho/erlang-pbkdf2";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pbkdf2 = pbkdf2_2_0_0;
 
     pbkdf2_nif_0_3_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "pbkdf2_nif";
             version = "0.3.0";
             src = fetchHex {
@@ -34582,21 +20636,23 @@ let
                 "7ad61389164cceac87e2bed9d8f184cd713cca85d51e096604c40bf86d96a8b7";
             };
             compilePorts = true;
+            buildPlugins  = [ pc ];
+
 
             meta = {
               description = ''PBKDF2 NIF implementation'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/barrel-db/erlang-pbkdf2-nif";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pbkdf2_nif = pbkdf2_nif_0_3_0;
 
     pc_1_2_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "pc";
             version = "1.2.0";
             src = fetchHex {
@@ -34611,15 +20667,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/blt/port_compiler";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pc = pc_1_2_0;
 
     pdf2htmlex_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "pdf2htmlex";
             version = "0.2.0";
             src = fetchHex {
@@ -34635,15 +20691,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ricn/pdf2htmlex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pdf2htmlex = pdf2htmlex_0_2_0;
 
     pdf_generator_0_3_1 = callPackage
       (
-        {  buildMix, fetchHex, porcelain_2_0_1, misc_random_0_2_6 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          porcelain_2_0_1,
+          misc_random_0_2_6
+        }:
+          buildMix ({
             name = "pdf_generator";
             version = "0.3.1";
             src = fetchHex {
@@ -34661,51 +20723,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/gutschilla/elixir-pdf-generator";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pdf_generator = pdf_generator_0_3_1;
 
-    peatio_client_1_5_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poison_1_5_2,
-          httpoison_0_8_2,
-          hackney_1_4_4,
-          decimal_1_1_1
-        }:
-          buildMix {
-            name = "peatio_client";
-            version = "1.5.0";
-            src = fetchHex {
-              pkg = "peatio_client";
-              version = "1.5.0";
-              sha256 =
-                "701489d2b53b76194bb8745003c2e5665045ba4132ec1020813c63671d19081e";
-            };
-            beamDeps  = [
-                          poison_1_5_2
-                          httpoison_0_8_2
-                          hackney_1_4_4
-                          decimal_1_1_1
-                        ];
-
-            meta = {
-              description = ''Peatio Exchange compatibility API for Elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/peatio/peatio-client-elixir";
-            };
-          }
-      ) {};
-
-    peatio_client = peatio_client_1_5_0;
-
     peon_2_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "peon";
             version = "2.0.0";
             src = fetchHex {
@@ -34720,39 +20746,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/supernintendo/peon";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     peon = peon_2_0_0;
 
-    pet_0_1_1 = callPackage
-      (
-        {  buildMix, fetchHex, yomel_0_5_0 }:
-          buildMix {
-            name = "pet";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "pet";
-              version = "0.1.1";
-              sha256 =
-                "5ec25c6c2337e286919c925dce46ecfa4b09311f516ecd922c71391cd4caa697";
-            };
-            beamDeps  = [ yomel_0_5_0 ];
-
-            meta = {
-              description = ''Account management tool compatible with pit'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/Joe-noh/pet";
-            };
-          }
-      ) {};
-
-    pet = pet_0_1_1;
-
     petick_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "petick";
             version = "0.0.1";
             src = fetchHex {
@@ -34767,15 +20769,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/niku/petick";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     petick = petick_0_0_1;
 
     pg2pubsub_0_1_12 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "pg2pubsub";
             version = "0.1.12";
             src = fetchHex {
@@ -34791,42 +20793,22 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/kbremner/pg2pubsub";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pg2pubsub = pg2pubsub_0_1_12;
 
-    pgpool_1_0_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "pgpool";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "pgpool";
-              version = "1.0.0";
-              sha256 =
-                "694ae752dc02734cbe174577d8bdf4058d0353379385a3448aec1bec5d9b49ff";
-            };
-
-            meta = {
-              longDescription = ''A PosgreSQL client that automatically uses
-                                connection pools and reconnects in case of
-                                errors.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ostinelli/pgpool";
-            };
-          }
-      ) {};
-
-    pgpool = pgpool_1_0_0;
-
     phasedb_0_0_1 = callPackage
       (
         {
-          buildMix, fetchHex, inflex_1_5_0, heap_1_0_0, calendar_0_12_4
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          inflex_1_5_0,
+          heap_1_0_0,
+          calendar_0_12_4
         }:
-          buildMix {
+          buildMix ({
             name = "phasedb";
             version = "0.0.1";
             src = fetchHex {
@@ -34841,78 +20823,22 @@ let
               description = ''A real-time time series database.'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     phasedb = phasedb_0_0_1;
 
-    phoenix_0_2_11 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          inflex_0_2_4,
-          ex_conf_0_1_2,
-          plug_0_5_1,
-          jazz_0_1_2
-        }:
-          buildMix {
-            name = "phoenix";
-            version = "0.2.11";
-            src = fetchHex {
-              pkg = "phoenix";
-              version = "0.2.11";
-              sha256 =
-                "49bae6b4308f118942446154a63ea81d40a1ff79a0f20a846498f481c680ebdd";
-            };
-            beamDeps  = [ inflex_0_2_4 ex_conf_0_1_2 plug_0_5_1 jazz_0_1_2 ];
-
-            meta = {
-              longDescription = ''Productive. Reliable. Fast. A productive web
-                                framework that does not compromise speed and
-                                maintainability.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/phoenixframework/phoenix";
-            };
-          }
-      ) {};
-
-    phoenix_0_4_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          cowboy_1_0_4,
-          plug_0_7_0,
-          linguist_0_1_5,
-          poison_1_1_1
-        }:
-          buildMix {
-            name = "phoenix";
-            version = "0.4.1";
-            src = fetchHex {
-              pkg = "phoenix";
-              version = "0.4.1";
-              sha256 =
-                "b1e72759e90a814b6a5d4d94e218b2c975bd156ebdfb4c54f8dc8b590267b4e0";
-            };
-            beamDeps  = [ cowboy_1_0_4 plug_0_7_0 linguist_0_1_5 poison_1_1_1
-                      ];
-
-            meta = {
-              longDescription = ''Productive. Reliable. Fast. A productive web
-                                framework that does not compromise speed and
-                                maintainability.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/phoenixframework/phoenix";
-            };
-          }
-      ) {};
-
     phoenix_1_0_4 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_3, cowboy_1_0_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          plug_1_1_3,
+          cowboy_1_0_4
+        }:
+          buildMix ({
             name = "phoenix";
             version = "1.0.4";
             src = fetchHex {
@@ -34930,164 +20856,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/phoenixframework/phoenix";
             };
-          }
+          } // packageOverrides)
       ) {};
 
-    phoenix_1_1_4 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_0_3, plug_1_1_3, cowboy_1_0_4 }:
-          buildMix {
-            name = "phoenix";
-            version = "1.1.4";
-            src = fetchHex {
-              pkg = "phoenix";
-              version = "1.1.4";
-              sha256 =
-                "5765238fd5caef83a8ce9242d63b4302963f44aefe70510a597aae86b5b6cd10";
-            };
-            beamDeps  = [ poison_1_0_3 plug_1_1_3 cowboy_1_0_4 ];
-
-            meta = {
-              longDescription = ''Productive. Reliable. Fast. A productive web
-                                framework that does not compromise speed and
-                                maintainability.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/phoenixframework/phoenix";
-            };
-          }
-      ) {};
-
-    phoenix = phoenix_1_1_4;
-
-    phoenix_calendar_0_1_2 = callPackage
-      (
-        {  buildMix, fetchHex, phoenix_html_2_5_1, calendar_0_12_4 }:
-          buildMix {
-            name = "phoenix_calendar";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "phoenix_calendar";
-              version = "0.1.2";
-              sha256 =
-                "f22968fd2287b419bf9791845b62501bf0177630d01a92b0ba33e5f00978ca3c";
-            };
-            beamDeps  = [ phoenix_html_2_5_1 calendar_0_12_4 ];
-
-            meta = {
-              description = ''Integration between Phoenix & Calendar'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/lau/phoenix_calendar";
-            };
-          }
-      ) {};
-
-    phoenix_calendar = phoenix_calendar_0_1_2;
-
-    phoenix_dtl_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "phoenix_dtl";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "phoenix_dtl";
-              version = "0.0.1";
-              sha256 =
-                "04e80730e1437dc624bd96207eaef064320209bb73e48915b4b52a9a01271898";
-            };
-
-            meta = {
-              description = ''Phoenix Template Engine for the django template
-                            language '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/andihit/phoenix_dtl";
-            };
-          }
-      ) {};
-
-    phoenix_dtl = phoenix_dtl_0_0_1;
-
-    phoenix_ecto_3_0_0_beta_2 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_1_0_3, phoenix_html_2_5_1, ecto_0_2_7
-        }:
-          buildMix {
-            name = "phoenix_ecto";
-            version = "3.0.0-beta.2";
-            src = fetchHex {
-              pkg = "phoenix_ecto";
-              version = "3.0.0-beta.2";
-              sha256 =
-                "7df3a54eb77846e306255d7953a2c3b6484e8b50c1dac510c779df28f28641b8";
-            };
-            beamDeps  = [ poison_1_0_3 phoenix_html_2_5_1 ecto_0_2_7 ];
-
-            meta = {
-              description = ''Integration between Phoenix & Ecto'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/phoenixframework/phoenix_ecto";
-            };
-          }
-      ) {};
-
-    phoenix_ecto = phoenix_ecto_3_0_0_beta_2;
-
-    phoenix_ember_0_0_1 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, hackney_1_4_10
-        }:
-          buildMix {
-            name = "phoenix_ember";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "phoenix_ember";
-              version = "0.0.1";
-              sha256 =
-                "2d108380a8eb25b88b80b950b7022bc061b77b8bfd2e37769e01499d6a6d2884";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 hackney_1_4_10 ];
-
-            meta = {
-              description = ''Ember.js integration via
-                            ember-phoenix/phoenix-ember'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/levanto-financial/phoenix-ember";
-            };
-          }
-      ) {};
-
-    phoenix_ember = phoenix_ember_0_0_1;
-
-    phoenix_gen_gulp_jspm_1_0_0 = callPackage
-      (
-        {  buildMix, fetchHex, phoenix_1_1_4 }:
-          buildMix {
-            name = "phoenix_gen_gulp_jspm";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "phoenix_gen_gulp_jspm";
-              version = "1.0.0";
-              sha256 =
-                "7124ff1f232d82da40619579d2b3a5d15834f9cf3880ba3e8176cb7321b9eb59";
-            };
-            beamDeps  = [ phoenix_1_1_4 ];
-
-            meta = {
-              description = ''Replaces Brunch with Gulp and adds JSPM'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bryanjos/phoenix_gen_gulp_jspm";
-            };
-          }
-      ) {};
-
-    phoenix_gen_gulp_jspm = phoenix_gen_gulp_jspm_1_0_0;
-
     phoenix_generator_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex, inflex_0_3_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, inflex_0_3_0 }:
+          buildMix ({
             name = "phoenix_generator";
             version = "0.2.1";
             src = fetchHex {
@@ -35104,211 +20879,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/etufe/phoenix_generator";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     phoenix_generator = phoenix_generator_0_2_1;
 
-    phoenix_haml_0_2_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          phoenix_html_2_5_1,
-          phoenix_1_0_4,
-          calliope_0_3_0
-        }:
-          buildMix {
-            name = "phoenix_haml";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "phoenix_haml";
-              version = "0.2.0";
-              sha256 =
-                "ec4f0dae227972a472661f1e8f9c51e8618290c8b6e5ca084ff81f6e7318468e";
-            };
-            beamDeps  = [ phoenix_html_2_5_1 phoenix_1_0_4 calliope_0_3_0 ];
-
-            meta = {
-              description = ''Phoenix Template Engine for Haml'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/chrismccord/phoenix_haml";
-            };
-          }
-      ) {};
-
-    phoenix_haml = phoenix_haml_0_2_0;
-
-    phoenix_html_2_0_0_dev = callPackage
-      (
-        {  buildMix, fetchHex, plug_0_5_2 }:
-          buildMix {
-            name = "phoenix_html";
-            version = "2.0.0-dev";
-            src = fetchHex {
-              pkg = "phoenix_html";
-              version = "2.0.0-dev";
-              sha256 =
-                "3057019ee9159d7916ca80a85aa9b2848250916ccfa08047f821a9b19893c8aa";
-            };
-            beamDeps  = [ plug_0_5_2 ];
-
-            meta = {
-              description = ''Phoenix.HTML functions for working with HTML
-                            strings and templates'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/phoenixframework/phoenix_html";
-            };
-          }
-      ) {};
-
-    phoenix_html_2_5_1 = callPackage
-      (
-        {  buildMix, fetchHex, plug_0_5_2 }:
-          buildMix {
-            name = "phoenix_html";
-            version = "2.5.1";
-            src = fetchHex {
-              pkg = "phoenix_html";
-              version = "2.5.1";
-              sha256 =
-                "a5ebd47c5d0b5e3707fd9364e3ec228d8b84efa83e0ff80de451a42906ed1e60";
-            };
-            beamDeps  = [ plug_0_5_2 ];
-
-            meta = {
-              description = ''Phoenix.HTML functions for working with HTML
-                            strings and templates'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/phoenixframework/phoenix_html";
-            };
-          }
-      ) {};
-
-    phoenix_html = phoenix_html_2_5_1;
-
-    phoenix_html_sanitizer_0_2_0 = callPackage
-      (
-        {
-          buildMix, fetchHex, phoenix_html_2_5_1, html_sanitize_ex_0_3_1
-        }:
-          buildMix {
-            name = "phoenix_html_sanitizer";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "phoenix_html_sanitizer";
-              version = "0.2.0";
-              sha256 =
-                "4cb5ae02d5560ff4e24cc378487065d038f0efd4883925a770b05c1c1d56a13c";
-            };
-            beamDeps  = [ phoenix_html_2_5_1 html_sanitize_ex_0_3_1 ];
-
-            meta = {
-              description = ''HTML sanitizer for Phoenix'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/elixirstatus/phoenix_html_sanitizer";
-            };
-          }
-      ) {};
-
-    phoenix_html_sanitizer = phoenix_html_sanitizer_0_2_0;
-
-    phoenix_html_simplified_helpers_0_3_2 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          timex_ecto_1_0_4,
-          timex_1_0_2,
-          gettext_0_10_0,
-          ecto_2_0_0_beta_2
-        }:
-          buildMix {
-            name = "phoenix_html_simplified_helpers";
-            version = "0.3.2";
-            src = fetchHex {
-              pkg = "phoenix_html_simplified_helpers";
-              version = "0.3.2";
-              sha256 =
-                "e34d2dae01c5803b1fdc1f6514b920541c7028f18322d6c8c8587dc77e5a7837";
-            };
-            beamDeps  = [
-                          timex_ecto_1_0_4
-                          timex_1_0_2
-                          gettext_0_10_0
-                          ecto_2_0_0_beta_2
-                        ];
-
-            meta = {
-              longDescription = ''Some view helpers for phoenix html( truncate,
-                                time_ago_in_words, number_with_delimiter )'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/ikeikeikeike/phoenix_html_simplified_helpers";
-            };
-          }
-      ) {};
-
-    phoenix_html_simplified_helpers =
-      phoenix_html_simplified_helpers_0_3_2;
-
-    phoenix_linguist_0_0_1 = callPackage
-      (
-        {
-          buildMix, fetchHex, phoenix_1_1_4, linguist_0_1_5, cowboy_1_0_4
-        }:
-          buildMix {
-            name = "phoenix_linguist";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "phoenix_linguist";
-              version = "0.0.1";
-              sha256 =
-                "4a27898ab733b3b55c9fe38bd7ae299a92cfb290dc7d9bc940e1af653de1b1eb";
-            };
-            beamDeps  = [ phoenix_1_1_4 linguist_0_1_5 cowboy_1_0_4 ];
-
-            meta = {
-              longDescription = ''A project that integrates Phoenix with
-                                Linguist, providing a plug and view helpers'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jxs/phoenix_linguist";
-            };
-          }
-      ) {};
-
-    phoenix_linguist = phoenix_linguist_0_0_1;
-
-    phoenix_live_reload_1_0_3 = callPackage
-      (
-        {  buildMix, fetchHex, phoenix_0_2_11, fs_0_9_2 }:
-          buildMix {
-            name = "phoenix_live_reload";
-            version = "1.0.3";
-            src = fetchHex {
-              pkg = "phoenix_live_reload";
-              version = "1.0.3";
-              sha256 =
-                "fbb65b7e4f4205b2e5d7061480889bd34d5c943a56feebd20b3dd949332fed85";
-            };
-            beamDeps  = [ phoenix_0_2_11 fs_0_9_2 ];
-
-            meta = {
-              description = ''Provides live-reload functionality for Phoenix'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/phoenixframework/phoenix_live_reload";
-            };
-          }
-      ) {};
-
-    phoenix_live_reload = phoenix_live_reload_1_0_3;
-
     phoenix_pubsub_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "phoenix_pubsub";
             version = "0.0.1";
             src = fetchHex {
@@ -35323,15 +20902,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/phoenixframework/phoenix_pubsub";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     phoenix_pubsub = phoenix_pubsub_0_0_1;
 
     phoenix_pubsub_postgres_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, postgrex_0_11_1, poolboy_1_4_2 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          postgrex_0_11_1,
+          poolboy_1_4_2
+        }:
+          buildMix ({
             name = "phoenix_pubsub_postgres";
             version = "0.0.2";
             src = fetchHex {
@@ -35348,68 +20933,15 @@ let
               homepage =
                 "https://github.com/opendrops/phoenix-pubsub-postgres";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     phoenix_pubsub_postgres = phoenix_pubsub_postgres_0_0_2;
 
-    phoenix_pubsub_rabbitmq_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poolboy_1_4_2, amqp_0_1_4 }:
-          buildMix {
-            name = "phoenix_pubsub_rabbitmq";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "phoenix_pubsub_rabbitmq";
-              version = "0.0.1";
-              sha256 =
-                "e2158052cb3adfedca953fe8318dd5633d276728cc4fae6daa54d0dd7b7401c6";
-            };
-            beamDeps  = [ poolboy_1_4_2 amqp_0_1_4 ];
-
-            meta = {
-              description = ''RabbitMQ adapter for the Phoenix framework PubSub
-                            layer. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/pma/phoenix_pubsub_rabbitmq";
-            };
-          }
-      ) {};
-
-    phoenix_pubsub_rabbitmq = phoenix_pubsub_rabbitmq_0_0_1;
-
-    phoenix_pubsub_redis_2_0_0 = callPackage
-      (
-        {
-          buildMix, fetchHex, redo_2_0_1, poolboy_1_2_1, phoenix_1_1_4
-        }:
-          buildMix {
-            name = "phoenix_pubsub_redis";
-            version = "2.0.0";
-            src = fetchHex {
-              pkg = "phoenix_pubsub_redis";
-              version = "2.0.0";
-              sha256 =
-                "a10e9f4c419bed62d807e8be82f9ed5c9d8dfaef302165a0eec3e51ed1cb1cfa";
-            };
-            beamDeps  = [ redo_2_0_1 poolboy_1_2_1 phoenix_1_1_4 ];
-
-            meta = {
-              description = ''The Redis PubSub adapter for the Phoenix
-                            framework'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/phoenixframework/phoenix_pubsub_redis";
-            };
-          }
-      ) {};
-
-    phoenix_pubsub_redis = phoenix_pubsub_redis_2_0_0;
-
     phoenix_pubsub_vernemq_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "phoenix_pubsub_vernemq";
             version = "0.0.3";
             src = fetchHex {
@@ -35425,212 +20957,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/larshesel/phoenix_pubsub_vernemq";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     phoenix_pubsub_vernemq = phoenix_pubsub_vernemq_0_0_3;
 
-    phoenix_simple_form_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, phoenix_html_2_5_1 }:
-          buildMix {
-            name = "phoenix_simple_form";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "phoenix_simple_form";
-              version = "0.0.2";
-              sha256 =
-                "e059ada8c507168d2267d6a1db1790192c063ca5e2a3579dfd2d1b07e25e9f45";
-            };
-            beamDeps  = [ phoenix_html_2_5_1 ];
-
-            meta = {
-              description = ''Easy form handling for phoenix'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/sbrink/phoenix_simple_form";
-            };
-          }
-      ) {};
-
-    phoenix_simple_form = phoenix_simple_form_0_0_2;
-
-    phoenix_slim_0_4_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          slim_fast_0_10_0,
-          phoenix_html_2_5_1,
-          phoenix_1_1_4
-        }:
-          buildMix {
-            name = "phoenix_slim";
-            version = "0.4.1";
-            src = fetchHex {
-              pkg = "phoenix_slim";
-              version = "0.4.1";
-              sha256 =
-                "4225e74608e29c93c603c6cde61766b604495e04ef65d6ca325ff1a9a492c563";
-            };
-            beamDeps  = [ slim_fast_0_10_0 phoenix_html_2_5_1 phoenix_1_1_4
-                      ];
-
-            meta = {
-              description = ''Phoenix Template Engine for Slim'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/doomspork/phoenix_slim";
-            };
-          }
-      ) {};
-
-    phoenix_slim = phoenix_slim_0_4_1;
-
-    phoenix_slime_0_5_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          slime_0_12_2,
-          phoenix_html_2_5_1,
-          phoenix_1_1_4,
-          cowboy_1_0_4
-        }:
-          buildMix {
-            name = "phoenix_slime";
-            version = "0.5.1";
-            src = fetchHex {
-              pkg = "phoenix_slime";
-              version = "0.5.1";
-              sha256 =
-                "23a0028271f7ad03b199336efa9c3f4df02049de10dc94b5c133b4bb69f5e7e1";
-            };
-            beamDeps  = [
-                          slime_0_12_2
-                          phoenix_html_2_5_1
-                          phoenix_1_1_4
-                          cowboy_1_0_4
-                        ];
-
-            meta = {
-              description = ''Phoenix Template Engine for Slim-like
-                            templates'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/slime-lang/phoenix_slime";
-            };
-          }
-      ) {};
-
-    phoenix_slime = phoenix_slime_0_5_1;
-
-    phoenix_swoosh_0_1_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          swoosh_0_1_0,
-          phoenix_html_2_5_1,
-          phoenix_1_1_4
-        }:
-          buildMix {
-            name = "phoenix_swoosh";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "phoenix_swoosh";
-              version = "0.1.0";
-              sha256 =
-                "cba68c2e421fbe7f54fbe8641918b0a276abbf81bee5a8eb37026cac85af9bd1";
-            };
-            beamDeps  = [ swoosh_0_1_0 phoenix_html_2_5_1 phoenix_1_1_4 ];
-
-            meta = {
-              description = ''Use Swoosh to easily send emails in your Phoenix
-                            project.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/swoosh/phoenix_swoosh";
-            };
-          }
-      ) {};
-
-    phoenix_swoosh = phoenix_swoosh_0_1_0;
-
-    phoenix_timex_0_0_3 = callPackage
-      (
-        {  buildMix, fetchHex, timex_1_0_2, phoenix_html_2_5_1 }:
-          buildMix {
-            name = "phoenix_timex";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "phoenix_timex";
-              version = "0.0.3";
-              sha256 =
-                "47b2c32de83581ef12b58bdd9518c8180684ec7161cc7944d3b27542e414bc84";
-            };
-            beamDeps  = [ timex_1_0_2 phoenix_html_2_5_1 ];
-
-            meta = {
-              description = ''Phoenix and Timex integration'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/Paradem/phoenix_timex";
-            };
-          }
-      ) {};
-
-    phoenix_timex = phoenix_timex_0_0_3;
-
-    phoenix_token_auth_0_4_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          timex_1_0_0_rc4,
-          secure_random_0_1_1,
-          postgrex_0_11_1,
-          poison_1_4_0,
-          phoenix_1_1_4,
-          mailgun_0_1_2,
-          joken_0_13_1,
-          ecto_2_0_0_beta_2,
-          cowboy_1_0_4,
-          comeonin_2_0_3
-        }:
-          buildMix {
-            name = "phoenix_token_auth";
-            version = "0.4.0";
-            src = fetchHex {
-              pkg = "phoenix_token_auth";
-              version = "0.4.0";
-              sha256 =
-                "be1f3ed9d770b4d8650a30b6c091513d44e0c0331616366457713db77de2a620";
-            };
-            beamDeps  = [
-                          timex_1_0_0_rc4
-                          secure_random_0_1_1
-                          postgrex_0_11_1
-                          poison_1_4_0
-                          phoenix_1_1_4
-                          mailgun_0_1_2
-                          joken_0_13_1
-                          ecto_2_0_0_beta_2
-                          cowboy_1_0_4
-                          comeonin_2_0_3
-                        ];
-
-            meta = {
-              longDescription = ''Solution for token auth in Phoenix apps.
-                                Provides an api for registration, account
-                                confirmation and logging in.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/manukall/phoenix_token_auth";
-            };
-          }
-      ) {};
-
-    phoenix_token_auth = phoenix_token_auth_0_4_0;
-
     phoenix_webpack_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "phoenix_webpack";
             version = "0.1.0";
             src = fetchHex {
@@ -35645,15 +20980,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/keathley/phoenix_webpack";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     phoenix_webpack = phoenix_webpack_0_1_0;
 
     phone_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "phone";
             version = "0.0.1";
             src = fetchHex {
@@ -35669,15 +21004,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/fcevado/phone";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     phone = phone_0_0_1;
 
     phst_transform_0_9_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "phst_transform";
             version = "0.9.0";
             src = fetchHex {
@@ -35693,114 +21028,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/philosophers-stone/transform";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     phst_transform = phst_transform_0_9_0;
 
-    picosat_0_1_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "picosat";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "picosat";
-              version = "0.1.0";
-              sha256 =
-                "d9bfa31240906306a6dae6bdd6fb1cb452e9462a391efa63017b17b2877cab51";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''Erlang bindings for PicoSAT'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/tsloughter/picosat";
-            };
-          }
-      ) {};
-
-    picosat = picosat_0_1_0;
-
-    pigeon_0_4_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "pigeon";
-            version = "0.4.1";
-            src = fetchHex {
-              pkg = "pigeon";
-              version = "0.4.1";
-              sha256 =
-                "f27413b863d470a8689e6378b9b36ee68f8bbcf8720f0b616756530f92bc23a0";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''HTTP2-compliant wrapper for sending iOS and
-                            Android push notifications.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/codedge-llc/pigeon";
-            };
-          }
-      ) {};
-
-    pigeon = pigeon_0_4_1;
-
-    pin_elixir_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpotion_2_2_2 }:
-          buildMix {
-            name = "pin_elixir";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "pin_elixir";
-              version = "0.0.1";
-              sha256 =
-                "0140eecb7c714f9dadbcec26c45e2b2d770735029b7dcf98cdba9d793d80130a";
-            };
-            beamDeps  = [ poison_1_5_2 httpotion_2_2_2 ];
-
-            meta = {
-              description = ''A library to wrap the Pin Payments API'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/mfeckie/pin_elixir";
-            };
-          }
-      ) {};
-
-    pin_elixir = pin_elixir_0_0_1;
-
-    pinglix_1_1_1 = callPackage
-      (
-        {  buildMix, fetchHex, timex_0_19_5, poison_1_4_0, plug_1_1_3 }:
-          buildMix {
-            name = "pinglix";
-            version = "1.1.1";
-            src = fetchHex {
-              pkg = "pinglix";
-              version = "1.1.1";
-              sha256 =
-                "bff8166655cc143518c0089aca104755ab188816707fb73a5739dd094f45e895";
-            };
-            beamDeps  = [ timex_0_19_5 poison_1_4_0 plug_1_1_3 ];
-
-            meta = {
-              longDescription = ''Plug compatible health check system in Elixir
-                                based on
-                                https://github.com/jbarnette/pinglish.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/pvdvreede/pinglix";
-            };
-          }
-      ) {};
-
-    pinglix = pinglix_1_1_1;
-
     pinyin_0_1_4 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "pinyin";
             version = "0.1.4";
             src = fetchHex {
@@ -35815,15 +21051,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/lidashuang/pinyin";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pinyin = pinyin_0_1_4;
 
     pipe_0_0_2 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "pipe";
             version = "0.0.2";
             src = fetchHex {
@@ -35839,15 +21075,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/batate/elixir-pipes";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pipe = pipe_0_0_2;
 
     pipe_here_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "pipe_here";
             version = "1.0.0";
             src = fetchHex {
@@ -35863,15 +21099,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/vic/pipe_here";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pipe_here = pipe_here_1_0_0;
 
     pipe_while_ok_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "pipe_while_ok";
             version = "0.0.2";
             src = fetchHex {
@@ -35887,89 +21123,15 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/pragdave/pipe_while_ok";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pipe_while_ok = pipe_while_ok_0_0_2;
 
-    pipette_0_0_4 = callPackage
-      (
-        {  buildMix, fetchHex, mock_0_1_3 }:
-          buildMix {
-            name = "pipette";
-            version = "0.0.4";
-            src = fetchHex {
-              pkg = "pipette";
-              version = "0.0.4";
-              sha256 =
-                "8742ea9b115071c3aa7cec4ddacfa161ff63fd647e0491ac442cb118d7198e26";
-            };
-            beamDeps  = [ mock_0_1_3 ];
-
-            meta = {
-              description = ''new_data = pipette(data, template)'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/liquidz/pipette";
-            };
-          }
-      ) {};
-
-    pipette = pipette_0_0_4;
-
-    pixie_0_3_3 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          timex_0_19_5,
-          secure_random_0_2_0,
-          poolboy_1_5_1,
-          poison_1_5_2,
-          plug_1_0_3,
-          gproc_0_5_0,
-          exredis_0_2_3,
-          ex_minimatch_0_0_1,
-          ex_doc_0_11_4,
-          cowboy_1_0_4,
-          con_cache_0_9_0
-        }:
-          buildMix {
-            name = "pixie";
-            version = "0.3.3";
-            src = fetchHex {
-              pkg = "pixie";
-              version = "0.3.3";
-              sha256 =
-                "b89f9b3db05b68ce79656a4b188bae1065e96b286b5422321c37fcd508350b32";
-            };
-            beamDeps  = [
-                          timex_0_19_5
-                          secure_random_0_2_0
-                          poolboy_1_5_1
-                          poison_1_5_2
-                          plug_1_0_3
-                          gproc_0_5_0
-                          exredis_0_2_3
-                          ex_minimatch_0_0_1
-                          ex_doc_0_11_4
-                          cowboy_1_0_4
-                          con_cache_0_9_0
-                        ];
-
-            meta = {
-              description = ''Bayeux compatible server written in Elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/messagerocket/pixie";
-            };
-          }
-      ) {};
-
-    pixie = pixie_0_3_3;
-
     pkcs7_1_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "pkcs7";
             version = "1.0.2";
             src = fetchHex {
@@ -35984,82 +21146,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/camshaft/pkcs7.erl";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pkcs7 = pkcs7_1_0_2;
 
-    placid_0_1_3 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          xml_builder_0_0_8,
-          poison_1_2_1,
-          plug_0_9_0,
-          linguist_0_1_5,
-          http_router_0_0_8,
-          cowboy_1_0_4
-        }:
-          buildMix {
-            name = "placid";
-            version = "0.1.3";
-            src = fetchHex {
-              pkg = "placid";
-              version = "0.1.3";
-              sha256 =
-                "78d30028ba9238c9b2cb7c5f91dc818aa3746c1c410a38fec9732de8a3c20146";
-            };
-            beamDeps  = [
-                          xml_builder_0_0_8
-                          poison_1_2_1
-                          plug_0_9_0
-                          linguist_0_1_5
-                          http_router_0_0_8
-                          cowboy_1_0_4
-                        ];
-
-            meta = {
-              longDescription = ''A REST toolkit for building highly-scalable
-                                and fault-tolerant HTTP APIs with Elixir '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/slogsdon/placid";
-            };
-          }
-      ) {};
-
-    placid = placid_0_1_3;
-
-    plasm_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, postgrex_0_11_1, ecto_2_0_0_beta_2 }:
-          buildMix {
-            name = "plasm";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "plasm";
-              version = "0.1.0";
-              sha256 =
-                "0eb476cae0b02dedbbc558f59ca22f0791221129d15fba570c0a3b96401d6836";
-            };
-            beamDeps  = [ postgrex_0_11_1 ecto_2_0_0_beta_2 ];
-
-            meta = {
-              longDescription = ''Plasm is a composable query library for Ecto
-                                containing several common query transforms to
-                                make working with Ecto easier.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/atomic-fads/plasm";
-            };
-          }
-      ) {};
-
-    plasm = plasm_0_1_0;
-
     plist_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "plist";
             version = "0.0.4";
             src = fetchHex {
@@ -36075,15 +21170,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ciaran/plist";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plist = plist_0_0_4;
 
     plug_0_11_3 = callPackage
       (
-        {  buildMix, fetchHex, cowboy_1_0_4 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, cowboy_1_0_4 }:
+          buildMix ({
             name = "plug";
             version = "0.11.3";
             src = fetchHex {
@@ -36100,13 +21195,13 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/elixir-lang/plug";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_0_12_2 = callPackage
       (
-        {  buildMix, fetchHex, cowboy_1_0_4 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, cowboy_1_0_4 }:
+          buildMix ({
             name = "plug";
             version = "0.12.2";
             src = fetchHex {
@@ -36123,13 +21218,13 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/elixir-lang/plug";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_0_13_1 = callPackage
       (
-        {  buildMix, fetchHex, cowboy_1_0_4 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, cowboy_1_0_4 }:
+          buildMix ({
             name = "plug";
             version = "0.13.1";
             src = fetchHex {
@@ -36146,13 +21241,13 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/elixir-lang/plug";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_0_14_0 = callPackage
       (
-        {  buildMix, fetchHex, cowboy_1_0_4 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, cowboy_1_0_4 }:
+          buildMix ({
             name = "plug";
             version = "0.14.0";
             src = fetchHex {
@@ -36169,103 +21264,13 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/elixir-lang/plug";
             };
-          }
-      ) {};
-
-    plug_0_5_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "plug";
-            version = "0.5.1";
-            src = fetchHex {
-              pkg = "plug";
-              version = "0.5.1";
-              sha256 =
-                "95271e2372bf794e19ce50c097a439e1586a6b125f432ee21fbea96ab9832fc1";
-            };
-
-            meta = {
-              description = ''A specification and conveniences for composable
-                            modules between web applications'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/elixir-lang/plug";
-            };
-          }
-      ) {};
-
-    plug_0_5_2 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "plug";
-            version = "0.5.2";
-            src = fetchHex {
-              pkg = "plug";
-              version = "0.5.2";
-              sha256 =
-                "d31cde7d9d3867a544e427a3431113f276fe9269cd00054440d38b56e61c53ea";
-            };
-
-            meta = {
-              description = ''A specification and conveniences for composable
-                            modules between web applications'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/elixir-lang/plug";
-            };
-          }
-      ) {};
-
-    plug_0_5_3 = callPackage
-      (
-        {  buildMix, fetchHex, cowboy_1_0_4 }:
-          buildMix {
-            name = "plug";
-            version = "0.5.3";
-            src = fetchHex {
-              pkg = "plug";
-              version = "0.5.3";
-              sha256 =
-                "97457d419def5bf13b17fa953cf56b8ca9f2e3973174d6890cd54fe84110c955";
-            };
-            beamDeps  = [ cowboy_1_0_4 ];
-
-            meta = {
-              description = ''A specification and conveniences for composable
-                            modules between web applications'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/elixir-lang/plug";
-            };
-          }
-      ) {};
-
-    plug_0_7_0 = callPackage
-      (
-        {  buildMix, fetchHex, cowboy_1_0_4 }:
-          buildMix {
-            name = "plug";
-            version = "0.7.0";
-            src = fetchHex {
-              pkg = "plug";
-              version = "0.7.0";
-              sha256 =
-                "c25ceaacbdd0085653d84f8187c179e523b2edd54d393673df2d761f85795867";
-            };
-            beamDeps  = [ cowboy_1_0_4 ];
-
-            meta = {
-              description = ''A specification and conveniences for composable
-                            modules between web applications'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/elixir-lang/plug";
-            };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_0_8_4 = callPackage
       (
-        {  buildMix, fetchHex, cowboy_1_0_4 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, cowboy_1_0_4 }:
+          buildMix ({
             name = "plug";
             version = "0.8.4";
             src = fetchHex {
@@ -36282,13 +21287,13 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/elixir-lang/plug";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_0_9_0 = callPackage
       (
-        {  buildMix, fetchHex, cowboy_1_0_4 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, cowboy_1_0_4 }:
+          buildMix ({
             name = "plug";
             version = "0.9.0";
             src = fetchHex {
@@ -36305,13 +21310,13 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/elixir-lang/plug";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_1_0_3 = callPackage
       (
-        {  buildMix, fetchHex, cowboy_1_0_4 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, cowboy_1_0_4 }:
+          buildMix ({
             name = "plug";
             version = "1.0.3";
             src = fetchHex {
@@ -36328,13 +21333,13 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/elixir-lang/plug";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_1_1_3 = callPackage
       (
-        {  buildMix, fetchHex, cowboy_1_0_4 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, cowboy_1_0_4 }:
+          buildMix ({
             name = "plug";
             version = "1.1.3";
             src = fetchHex {
@@ -36351,39 +21356,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/elixir-lang/plug";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug = plug_1_1_3;
 
-    plug_abort_2_1_1 = callPackage
-      (
-        {  buildMix, fetchHex, plug_0_5_3, cowboy_1_0_4, poison_1_0_3 }:
-          buildMix {
-            name = "plug_abort";
-            version = "2.1.1";
-            src = fetchHex {
-              pkg = "plug_abort";
-              version = "2.1.1";
-              sha256 =
-                "8da98a882ea79e08443e7d26c94ee2b572560efca3f0a5922c69e508ac02d883";
-            };
-            beamDeps  = [ plug_0_5_3 cowboy_1_0_4 poison_1_0_3 ];
-
-            meta = {
-              description = ''Easily abort the processing of a plug stack '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/onkel-dirtus/plug_abort";
-            };
-          }
-      ) {};
-
-    plug_abort = plug_abort_2_1_1;
-
     plug_accept_language_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "plug_accept_language";
             version = "0.1.0";
             src = fetchHex {
@@ -36398,46 +21379,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/camshaft/plug_accept_language";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_accept_language = plug_accept_language_0_1_0;
 
-    plug_accesslog_0_11_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          tzdata_0_5_7,
-          timex_2_1_3,
-          plug_1_1_3,
-          cowboy_1_0_4
-        }:
-          buildMix {
-            name = "plug_accesslog";
-            version = "0.11.0";
-            src = fetchHex {
-              pkg = "plug_accesslog";
-              version = "0.11.0";
-              sha256 =
-                "86ee180fd234a3c6d413153764f2a9e2d57171d3e89df2643a276b8760bcc867";
-            };
-            beamDeps  = [ tzdata_0_5_7 timex_2_1_3 plug_1_1_3 cowboy_1_0_4 ];
-
-            meta = {
-              description = ''Plug for writing access logs'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/mneudert/plug_accesslog";
-            };
-          }
-      ) {};
-
-    plug_accesslog = plug_accesslog_0_11_0;
-
     plug_assign_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_0_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_0_3 }:
+          buildMix ({
             name = "plug_assign";
             version = "1.0.0";
             src = fetchHex {
@@ -36454,89 +21404,17 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/nshafer/plug_assign";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_assign = plug_assign_1_0_0;
 
-    plug_auth_0_3_0 = callPackage
-      (
-        {  buildMix, fetchHex, plug_0_5_2, cowboy_1_0_4 }:
-          buildMix {
-            name = "plug_auth";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "plug_auth";
-              version = "0.3.0";
-              sha256 =
-                "e9935f31526baff0262ef17055f853f0045172adf7b39fd9b1c54c6347477a71";
-            };
-            beamDeps  = [ plug_0_5_2 cowboy_1_0_4 ];
-
-            meta = {
-              description = ''A collection of authentication-related plugs'';
-              license = stdenv.lib.licenses.isc;
-              homepage = "https://github.com/bitgamma/plug_auth";
-            };
-          }
-      ) {};
-
-    plug_auth = plug_auth_0_3_0;
-
-    plug_basic_auth_1_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, plug_0_5_2, cowboy_1_0_4 }:
-          buildMix {
-            name = "plug_basic_auth";
-            version = "1.1.0";
-            src = fetchHex {
-              pkg = "plug_basic_auth";
-              version = "1.1.0";
-              sha256 =
-                "6763e5ad0f17d6693e296cc3a69c1db627f9b66bda2bcded4ddfcc84a42f0c03";
-            };
-            beamDeps  = [ plug_0_5_2 cowboy_1_0_4 ];
-
-            meta = {
-              description = ''A Plug for using HTTP Basic Authentication in
-                            Plug applications'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/rbishop/plug_basic_auth";
-            };
-          }
-      ) {};
-
-    plug_basic_auth = plug_basic_auth_1_1_0;
-
-    plug_byte_serve_0_3_2 = callPackage
-      (
-        {  buildMix, fetchHex, plug_0_11_3 }:
-          buildMix {
-            name = "plug_byte_serve";
-            version = "0.3.2";
-            src = fetchHex {
-              pkg = "plug_byte_serve";
-              version = "0.3.2";
-              sha256 =
-                "f6e4873373b3efd207877ca5f797f4ea539cf2a885aae895c6c3df73ce9b75ac";
-            };
-            beamDeps  = [ plug_0_11_3 ];
-
-            meta = {
-              description = ''A Plug for using HTTP Byte Serving in Plug
-                            applications.'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/masteinhauser/plug_byte_serve";
-            };
-          }
-      ) {};
-
-    plug_byte_serve = plug_byte_serve_0_3_2;
-
     plug_cloudflare_1_3_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3, cidr_1_0_0 }:
-          buildMix {
+        {
+          buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3, cidr_1_0_0
+        }:
+          buildMix ({
             name = "plug_cloudflare";
             version = "1.3.0";
             src = fetchHex {
@@ -36553,65 +21431,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/c-rack/plug_cloudflare";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_cloudflare = plug_cloudflare_1_3_0;
 
-    plug_cors_0_8_2 = callPackage
-      (
-        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
-          buildMix {
-            name = "plug_cors";
-            version = "0.8.2";
-            src = fetchHex {
-              pkg = "plug_cors";
-              version = "0.8.2";
-              sha256 =
-                "286a36b000989538c168d115f6a017aaa15a4031e4f867d300878d81c3b8c6aa";
-            };
-            beamDeps  = [ plug_1_1_3 cowboy_1_0_4 ];
-
-            meta = {
-              description = ''Deprecated: CORS Plug Middleware. Please use
-                            corsica instead'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/bryanjos/plug_cors";
-            };
-          }
-      ) {};
-
-    plug_cors = plug_cors_0_8_2;
-
-    plug_exception_handler_0_0_4 = callPackage
-      (
-        {  buildMix, fetchHex, plug_0_5_3, cowboy_1_0_4 }:
-          buildMix {
-            name = "plug_exception_handler";
-            version = "0.0.4";
-            src = fetchHex {
-              pkg = "plug_exception_handler";
-              version = "0.0.4";
-              sha256 =
-                "477ea599e516bcf8efb399ca43ca3d9cecd50982222b1f5f259092d4c99fca28";
-            };
-            beamDeps  = [ plug_0_5_3 cowboy_1_0_4 ];
-
-            meta = {
-              description = ''Rescue exceptions from your plug stack'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/onkel-dirtus/plug_exception_handler";
-            };
-          }
-      ) {};
-
-    plug_exception_handler = plug_exception_handler_0_0_4;
-
     plug_forwarded_peer_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "plug_forwarded_peer";
             version = "0.0.2";
             src = fetchHex {
@@ -36630,15 +21458,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "http://github.com/awetzel/plug_forwarded_peer";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_forwarded_peer = plug_forwarded_peer_0_0_2;
 
     plug_fprof_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "plug_fprof";
             version = "0.0.1";
             src = fetchHex {
@@ -36654,15 +21482,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/obmarg/plug_fprof";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_fprof = plug_fprof_0_0_1;
 
     plug_geoip2_0_4_2 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3, geolix_0_9_0 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_3,
+          geolix_0_9_0
+        }:
+          buildMix ({
             name = "plug_geoip2";
             version = "0.4.2";
             src = fetchHex {
@@ -36679,47 +21513,21 @@ let
                                 GeoIP2 database.'';
               license = stdenv.lib.licenses.mit;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_geoip2 = plug_geoip2_0_4_2;
 
-    plug_graphql_0_2_0 = callPackage
+    plug_heartbeat_0_2_0 = callPackage
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
-          poison_1_0_3,
-          plug_0_5_2,
-          graphql_0_2_0,
+          plug_1_1_3,
           cowboy_1_0_4
         }:
-          buildMix {
-            name = "plug_graphql";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "plug_graphql";
-              version = "0.2.0";
-              sha256 =
-                "d633309e386fb4feafcadaa390fb1ae2cf26416823b1c1484ed4d018e13c769a";
-            };
-            beamDeps  = [ poison_1_0_3 plug_0_5_2 graphql_0_2_0 cowboy_1_0_4
-                      ];
-
-            meta = {
-              description = ''A Plug integration for GraphQL Elixir'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/graphql-elixir/plug_graphql";
-            };
-          }
-      ) {};
-
-    plug_graphql = plug_graphql_0_2_0;
-
-    plug_heartbeat_0_2_0 = callPackage
-      (
-        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
-          buildMix {
+          buildMix ({
             name = "plug_heartbeat";
             version = "0.2.0";
             src = fetchHex {
@@ -36736,63 +21544,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/whatyouhide/plug_heartbeat";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_heartbeat = plug_heartbeat_0_2_0;
 
-    plug_json_parser_0_0_6 = callPackage
-      (
-        {  buildMix, fetchHex, plug_0_7_0, cowboy_1_0_4, poison_1_1_1 }:
-          buildMix {
-            name = "plug_json_parser";
-            version = "0.0.6";
-            src = fetchHex {
-              pkg = "plug_json_parser";
-              version = "0.0.6";
-              sha256 =
-                "4c07f3adade5ad8730b6ec5d33d50b5dbe1a960e2be29a764b415c5234c79204";
-            };
-            beamDeps  = [ plug_0_7_0 cowboy_1_0_4 poison_1_1_1 ];
-
-            meta = {
-              description = ''JSON parse for Plug.Parsers '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/onkel-dirtus/plug_json_parser";
-            };
-          }
-      ) {};
-
-    plug_json_parser = plug_json_parser_0_0_6;
-
-    plug_jwt_0_7_1 = callPackage
-      (
-        {  buildMix, fetchHex, plug_1_1_3, joken_0_16_1, cowboy_1_0_4 }:
-          buildMix {
-            name = "plug_jwt";
-            version = "0.7.1";
-            src = fetchHex {
-              pkg = "plug_jwt";
-              version = "0.7.1";
-              sha256 =
-                "a87cd8815454093c3300bdae4f2af7ec8c671fd22ce55f598309b5bed4ac3a2a";
-            };
-            beamDeps  = [ plug_1_1_3 joken_0_16_1 cowboy_1_0_4 ];
-
-            meta = {
-              description = ''JWT Plug Middleware'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/bryanjos/plug_jwt.git";
-            };
-          }
-      ) {};
-
-    plug_jwt = plug_jwt_0_7_1;
-
     plug_media_type_router_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "plug_media_type_router";
             version = "0.0.2";
             src = fetchHex {
@@ -36809,15 +21569,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/cazrin/plug_media_type_router";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_media_type_router = plug_media_type_router_0_0_2;
 
     plug_pagecache_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_3,
+          cowboy_1_0_4
+        }:
+          buildMix ({
             name = "plug_pagecache";
             version = "0.2.0";
             src = fetchHex {
@@ -36833,15 +21599,21 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/mneudert/plug_pagecache";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_pagecache = plug_pagecache_0_2_0;
 
     plug_rails_cookie_session_store_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_3,
+          cowboy_1_0_4
+        }:
+          buildMix ({
             name = "plug_rails_cookie_session_store";
             version = "0.1.0";
             src = fetchHex {
@@ -36858,7 +21630,7 @@ let
               homepage =
                 "https://github.com/cconstantin/plug_rails_cookie_session_store";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_rails_cookie_session_store =
@@ -36866,8 +21638,8 @@ let
 
     plug_redirect_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "plug_redirect";
             version = "0.1.2";
             src = fetchHex {
@@ -36883,15 +21655,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/lpil/plug-redirect";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_redirect = plug_redirect_0_1_2;
 
     plug_redirect_https_0_0_6 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "plug_redirect_https";
             version = "0.0.6";
             src = fetchHex {
@@ -36908,15 +21680,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/stocks29/plug_redirect_https.git";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_redirect_https = plug_redirect_https_0_0_6;
 
     plug_require_header_0_8_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, plug_1_1_3 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          plug_1_1_3
+        }:
+          buildMix ({
             name = "plug_require_header";
             version = "0.8.0";
             src = fetchHex {
@@ -36933,15 +21711,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/DevL/plug_require_header";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_require_header = plug_require_header_0_8_0;
 
     plug_response_header_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "plug_response_header";
             version = "0.2.1";
             src = fetchHex {
@@ -36958,15 +21736,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/c-rack/plug_response_header";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_response_header = plug_response_header_0_2_1;
 
     plug_ribbon_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "plug_ribbon";
             version = "0.2.1";
             src = fetchHex {
@@ -36983,15 +21761,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://git.io/plug_ribbon";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_ribbon = plug_ribbon_0_2_1;
 
     plug_runtime_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "plug_runtime";
             version = "1.0.0";
             src = fetchHex {
@@ -37009,47 +21787,23 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/mje113/plug_runtime";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_runtime = plug_runtime_1_0_0;
 
-    plug_secure_headers_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
-            name = "plug_secure_headers";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "plug_secure_headers";
-              version = "0.0.1";
-              sha256 =
-                "727c5b7216aaa4bec2e0f88ed72199082820341602fad49cfc4c74477f55a905";
-            };
-            beamDeps  = [ plug_1_1_3 ];
-
-            meta = {
-              description = ''HTTP security headers with validatation for
-                            Phoenix/Plug'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/anotherhale/plug_secure_headers";
-            };
-          }
-      ) {};
-
-    plug_secure_headers = plug_secure_headers_0_0_1;
-
     plug_session_memcached_0_3_3 = callPackage
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           plug_1_1_3,
           ex_doc_0_11_4,
           earmark_0_2_1,
           cowboy_1_0_4
         }:
-          buildMix {
+          buildMix ({
             name = "plug_session_memcached";
             version = "0.3.3";
             src = fetchHex {
@@ -37068,15 +21822,21 @@ let
               homepage =
                 "https://github.com/gutschilla/plug-session-memcached";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_session_memcached = plug_session_memcached_0_3_3;
 
     plug_session_redis_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, redo_2_0_1, poolboy_1_5_1 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          redo_2_0_1,
+          poolboy_1_5_1
+        }:
+          buildMix ({
             name = "plug_session_redis";
             version = "0.1.0";
             src = fetchHex {
@@ -37093,15 +21853,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/aposto/plug_session_redis";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_session_redis = plug_session_redis_0_1_0;
 
     plug_statsd_0_4_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3, ex_statsd_0_5_3 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_3,
+          ex_statsd_0_5_3
+        }:
+          buildMix ({
             name = "plug_statsd";
             version = "0.4.0";
             src = fetchHex {
@@ -37118,15 +21884,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/jeffweiss/plug_statsd";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_statsd = plug_statsd_0_4_0;
 
     plug_test_helpers_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_0_8_4, cowboy_1_0_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_0_8_4,
+          cowboy_1_0_4
+        }:
+          buildMix ({
             name = "plug_test_helpers";
             version = "0.1.0";
             src = fetchHex {
@@ -37142,15 +21914,21 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/xavier/plug_test_helpers";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_test_helpers = plug_test_helpers_0_1_0;
 
     plug_utm_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_3,
+          cowboy_1_0_4
+        }:
+          buildMix ({
             name = "plug_utm";
             version = "0.0.2";
             src = fetchHex {
@@ -37166,15 +21944,22 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/honeypotio/plug_utm";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_utm = plug_utm_0_0_2;
 
     plug_wait1_0_1_4 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_3_1, plug_0_13_1, cowboy_1_0_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_3_1,
+          plug_0_13_1,
+          cowboy_1_0_4
+        }:
+          buildMix ({
             name = "plug_wait1";
             version = "0.1.4";
             src = fetchHex {
@@ -37190,15 +21975,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/wait1/plug_wait1";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_wait1 = plug_wait1_0_1_4;
 
     plug_x_forwarded_for_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "plug_x_forwarded_for";
             version = "0.1.0";
             src = fetchHex {
@@ -37213,15 +21998,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/camshaft/plug_x_forwarded_for";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plug_x_forwarded_for = plug_x_forwarded_for_0_1_0;
 
     plugin_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "plugin";
             version = "0.1.0";
             src = fetchHex {
@@ -37237,15 +22022,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ruby2elixir/plugin";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plugin = plugin_0_1_0;
 
     plugs_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_3,
+          cowboy_1_0_4
+        }:
+          buildMix ({
             name = "plugs";
             version = "0.1.0";
             src = fetchHex {
@@ -37262,39 +22053,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/sugar-framework/plugs";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plugs = plugs_0_1_0;
 
-    plugsnag_1_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, bugsnag_1_2_0 }:
-          buildMix {
-            name = "plugsnag";
-            version = "1.1.0";
-            src = fetchHex {
-              pkg = "plugsnag";
-              version = "1.1.0";
-              sha256 =
-                "aa3a9e587042f5519d8309fc4cf764a0262eda0da752ddf87c5fcfea176208ad";
-            };
-            beamDeps  = [ bugsnag_1_2_0 ];
-
-            meta = {
-              description = ''Bugsnag reporter for Elixir`s Plug'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jarednorman/plugsnag";
-            };
-          }
-      ) {};
-
-    plugsnag = plugsnag_1_1_0;
-
     plumber_girl_0_9_6 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "plumber_girl";
             version = "0.9.6";
             src = fetchHex {
@@ -37310,15 +22077,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ruby2elixir/plumber_girl";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     plumber_girl = plumber_girl_0_9_6;
 
     png_0_1_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "png";
             version = "0.1.1";
             src = fetchHex {
@@ -37328,6 +22095,9 @@ let
                 "f8d4a17c118dcc16bb18d0fda6e26947001f9312bc6c061d2236b424fc3dd9ea";
             };
 
+            buildPlugins  = [ rebar3_hex ];
+
+
             meta = {
               longDescription = ''A pure Erlang library for creating PNG
                                 images. It can currently create 8 and 16 bit
@@ -37336,103 +22106,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/yuce/png";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     png = png_0_1_1;
 
-    pocketex_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_3_1, httpoison_0_8_2 }:
-          buildMix {
-            name = "pocketex";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "pocketex";
-              version = "0.1.0";
-              sha256 =
-                "b832df8e3f3102b69892cc5cfab4418de876a6ecc5780805458b9946aa407cbf";
-            };
-            beamDeps  = [ poison_1_3_1 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Pocketex is an Elixir client for the Pocket read
-                            later service (getpocket.com) '';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/essenciary/pocketex";
-            };
-          }
-      ) {};
-
-    pocketex = pocketex_0_1_0;
-
-    poison_1_0_3 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "poison";
-            version = "1.0.3";
-            src = fetchHex {
-              pkg = "poison";
-              version = "1.0.3";
-              sha256 =
-                "632b9f5c4c2e56987f123b9f35e52b356c2de28ce7692d66becf12df10cc1012";
-            };
-
-            meta = {
-              description = ''An incredibly fast, pure Elixir JSON library'';
-              license = stdenv.lib.licenses.unlicense;
-              homepage = "https://github.com/devinus/poison";
-            };
-          }
-      ) {};
-
-    poison_1_1_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "poison";
-            version = "1.1.1";
-            src = fetchHex {
-              pkg = "poison";
-              version = "1.1.1";
-              sha256 =
-                "57e77cdafe34769dcc114c6c249847b66304e5489891306b9762e3211520d767";
-            };
-
-            meta = {
-              description = ''An incredibly fast, pure Elixir JSON library'';
-              license = stdenv.lib.licenses.unlicense;
-              homepage = "https://github.com/devinus/poison";
-            };
-          }
-      ) {};
-
-    poison_1_2_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "poison";
-            version = "1.2.1";
-            src = fetchHex {
-              pkg = "poison";
-              version = "1.2.1";
-              sha256 =
-                "7be9f3b2688efdcc689062ccd21e340ee5fd3ef9dcd142136034beb5ed1c2e23";
-            };
-
-            meta = {
-              description = ''An incredibly fast, pure Elixir JSON library'';
-              license = stdenv.lib.licenses.unlicense;
-              homepage = "https://github.com/devinus/poison";
-            };
-          }
-      ) {};
-
     poison_1_3_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "poison";
             version = "1.3.1";
             src = fetchHex {
@@ -37447,13 +22129,13 @@ let
               license = stdenv.lib.licenses.unlicense;
               homepage = "https://github.com/devinus/poison";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     poison_1_4_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "poison";
             version = "1.4.0";
             src = fetchHex {
@@ -37468,13 +22150,13 @@ let
               license = stdenv.lib.licenses.unlicense;
               homepage = "https://github.com/devinus/poison";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     poison_1_5_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "poison";
             version = "1.5.0";
             src = fetchHex {
@@ -37489,13 +22171,13 @@ let
               license = stdenv.lib.licenses.unlicense;
               homepage = "https://github.com/devinus/poison";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     poison_1_5_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "poison";
             version = "1.5.2";
             src = fetchHex {
@@ -37510,13 +22192,13 @@ let
               license = stdenv.lib.licenses.unlicense;
               homepage = "https://github.com/devinus/poison";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     poison_2_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "poison";
             version = "2.0.1";
             src = fetchHex {
@@ -37531,13 +22213,13 @@ let
               license = stdenv.lib.licenses.unlicense;
               homepage = "https://github.com/devinus/poison";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     poison_2_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "poison";
             version = "2.1.0";
             src = fetchHex {
@@ -37552,15 +22234,15 @@ let
               license = stdenv.lib.licenses.unlicense;
               homepage = "https://github.com/devinus/poison";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     poison = poison_2_1_0;
 
     poker_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "poker";
             version = "0.0.2";
             src = fetchHex {
@@ -37575,41 +22257,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/wojtekmach/poker_elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     poker = poker_0_0_2;
 
-    poloniex_0_0_3 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "poloniex";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "poloniex";
-              version = "0.0.3";
-              sha256 =
-                "976011016844c86ddded4310962194dfbbd296f5c7b9af469ea13131987d403b";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              longDescription = ''WIP Poloniex API wrapper for Elixir. Provides
-                                access to market data including trading pairs
-                                between ETH, BTC, DOGE, LTC and others.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/cyberpunk-ventures/poloniex_ex";
-            };
-          }
-      ) {};
-
-    poloniex = poloniex_0_0_3;
-
     poly1305_0_4_0 = callPackage
       (
-        {  buildMix, fetchHex, chacha20_0_3_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, chacha20_0_3_2 }:
+          buildMix ({
             name = "poly1305";
             version = "0.4.0";
             src = fetchHex {
@@ -37625,15 +22281,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mwmiller/poly1305_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     poly1305 = poly1305_0_4_0;
 
     polyglot_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "polyglot";
             version = "0.0.1";
             src = fetchHex {
@@ -37650,15 +22306,15 @@ let
               license = with stdenv.lib.licenses; [ mit free ];
               homepage = "https://github.com/padde/polyglot";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     polyglot = polyglot_0_0_1;
 
     polyline_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, vector_0_1_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, vector_0_1_0 }:
+          buildMix ({
             name = "polyline";
             version = "0.1.0";
             src = fetchHex {
@@ -37674,15 +22330,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/pkinney/polyline_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     polyline = polyline_0_1_0;
 
     polyvox_id3_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "polyvox_id3";
             version = "0.2.1";
             src = fetchHex {
@@ -37698,39 +22354,15 @@ let
               license = stdenv.lib.licenses.gpl3;
               homepage = "https://github.com/polyvox/polyvox_id3";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     polyvox_id3 = polyvox_id3_0_2_1;
 
-    pool_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "pool";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "pool";
-              version = "0.0.2";
-              sha256 =
-                "7be2ade7f9c000393d474dd96751680d5cb567cd68d3ee02c4c8e465d3a4395a";
-            };
-
-            meta = {
-              description = ''Socket acceptor pool Not ready for use at this
-                            time. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/slogsdon/pool";
-            };
-          }
-      ) {};
-
-    pool = pool_0_0_2;
-
     pool_ring_0_1_5 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "pool_ring";
             version = "0.1.5";
             src = fetchHex {
@@ -37745,36 +22377,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/camshaft/pool_ring";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pool_ring = pool_ring_0_1_5;
 
-    poolboy_1_2_1 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "poolboy";
-            version = "1.2.1";
-            src = fetchHex {
-              pkg = "poolboy";
-              version = "1.2.1";
-              sha256 =
-                "5e134d817f04e00b17187c50e7a38362812b7053591479a62f0025c45d622369";
-            };
-
-            meta = {
-              description = ''A hunky Erlang worker pool factory'';
-              license = with stdenv.lib.licenses; [ unlicense asl20 ];
-              homepage = "https://github.com/devinus/poolboy";
-            };
-          }
-      ) {};
-
     poolboy_1_4_2 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "poolboy";
             version = "1.4.2";
             src = fetchHex {
@@ -37789,13 +22400,13 @@ let
               license = with stdenv.lib.licenses; [ unlicense asl20 ];
               homepage = "https://github.com/devinus/poolboy";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     poolboy_1_5_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "poolboy";
             version = "1.5.1";
             src = fetchHex {
@@ -37810,59 +22421,15 @@ let
               license = with stdenv.lib.licenses; [ unlicense asl20 ];
               homepage = "https://github.com/devinus/poolboy";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     poolboy = poolboy_1_5_1;
 
-    pooler_1_4_0 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "pooler";
-            version = "1.4.0";
-            src = fetchHex {
-              pkg = "pooler";
-              version = "1.4.0";
-              sha256 =
-                "08ca384be64045b257a22a3569571c9ef33dafdac44212c7f0596f255e5a0d5c";
-            };
-
-            meta = {
-              description = ''An OTP Process Pool Application'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/seth/pooler";
-            };
-          }
-      ) {};
-
-    pooler_1_5_0 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "pooler";
-            version = "1.5.0";
-            src = fetchHex {
-              pkg = "pooler";
-              version = "1.5.0";
-              sha256 =
-                "f493b4b947967fa4250dd1f96e86a5440ecab51da114d2c256cced58ad991908";
-            };
-
-            meta = {
-              description = ''An OTP Process Pool Application'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/seth/pooler";
-            };
-          }
-      ) {};
-
-    pooler = pooler_1_5_0;
-
     populator_0_4_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "populator";
             version = "0.4.0";
             src = fetchHex {
@@ -37877,15 +22444,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/rubencaro/populator";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     populator = populator_0_4_0;
 
     porcelain_2_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "porcelain";
             version = "2.0.1";
             src = fetchHex {
@@ -37904,40 +22471,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/alco/porcelain";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     porcelain = porcelain_2_0_1;
 
-    portal_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "portal";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "portal";
-              version = "0.0.1";
-              sha256 =
-                "975d2aa4b4e155092214bee9ecc547d4c6603001c78eb824669823e1e116c84c";
-            };
-
-            meta = {
-              longDescription = ''A shooting fault-tolerant doors for
-                                distributed portal data-transfer application in
-                                Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/josevalim/portal";
-            };
-          }
-      ) {};
-
-    portal = portal_0_0_1;
-
     porter_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "porter";
             version = "0.0.1";
             src = fetchHex {
@@ -37954,63 +22496,15 @@ let
                                 to you.'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     porter = porter_0_0_1;
 
-    porterstemmer_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "porterstemmer";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "porterstemmer";
-              version = "0.0.1";
-              sha256 =
-                "8b3987cce8602d6ad16829fd4fefc848f01efcdc46d9e806059eec6a1b9d7cc8";
-            };
-
-            meta = {
-              longDescription = '' Porter stemmer in Elixir. It does not stem
-                                words beginning with an uppercase letter. This
-                                is to prevent stemming of acronyms or names. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/frpaulas/porterstemmer.git";
-            };
-          }
-      ) {};
-
-    porterstemmer = porterstemmer_0_0_1;
-
-    portmidi_3_2_0 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "portmidi";
-            version = "3.2.0";
-            src = fetchHex {
-              pkg = "portmidi";
-              version = "3.2.0";
-              sha256 =
-                "93344ce66905d0c841d1e387eb24572bb2d2214668b45bf926d0363e9c064641";
-            };
-
-            meta = {
-              description = ''Elixir bindings to the portmidi C library'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/lucidstack/ex-portmidi";
-            };
-          }
-      ) {};
-
-    portmidi = portmidi_3_2_0;
-
     positive_13_3_7 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "positive";
             version = "13.3.7";
             src = fetchHex {
@@ -38025,15 +22519,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/jlouis/positive";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     positive = positive_13_3_7;
 
     posterize_0_10_0 = callPackage
       (
-        {  buildMix, fetchHex, postgrex_0_11_1, jsx_2_8_0 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          postgrex_0_11_1,
+          jsx_2_8_0
+        }:
+          buildMix ({
             name = "posterize";
             version = "0.10.0";
             src = fetchHex {
@@ -38049,7 +22549,7 @@ let
               license = with stdenv.lib.licenses; [ asl20 mit ];
               homepage = "https://github.com/talentdeficit/posterize";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     posterize = posterize_0_10_0;
@@ -38058,12 +22558,13 @@ let
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           decimal_1_1_1,
           db_connection_0_2_4,
           connection_1_0_2
         }:
-          buildMix {
+          buildMix ({
             name = "postgrex";
             version = "0.11.1";
             src = fetchHex {
@@ -38080,37 +22581,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/ericmj/postgrex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     postgrex = postgrex_0_11_1;
 
-    postgrex_0_6_0 = callPackage
-      (
-        {  buildMix, fetchHex, decimal_0_2_5 }:
-          buildMix {
-            name = "postgrex";
-            version = "0.6.0";
-            src = fetchHex {
-              pkg = "postgrex";
-              version = "0.6.0";
-              sha256 =
-                "aa2aede73938a952ffbbe2b1173ac52c377a2055fd3e44ac1843bef782f5f8d4";
-            };
-            beamDeps  = [ decimal_0_2_5 ];
-
-            meta = {
-              description = ''PostgreSQL driver for Elixir.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/ericmj/postgrex";
-            };
-          }
-      ) {};
-
     postgrex_0_8_4 = callPackage
       (
-        {  buildMix, fetchHex, decimal_1_1_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, decimal_1_1_1 }:
+          buildMix ({
             name = "postgrex";
             version = "0.8.4";
             src = fetchHex {
@@ -38126,13 +22605,13 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/ericmj/postgrex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     postgrex_0_9_1 = callPackage
       (
-        {  buildMix, fetchHex, decimal_1_1_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, decimal_1_1_1 }:
+          buildMix ({
             name = "postgrex";
             version = "0.9.1";
             src = fetchHex {
@@ -38148,13 +22627,13 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/ericmj/postgrex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pot_0_9_4 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "pot";
             version = "0.9.4";
             src = fetchHex {
@@ -38171,15 +22650,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/yuce/pot";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pot = pot_0_9_4;
 
     power_assert_0_0_8 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "power_assert";
             version = "0.0.8";
             src = fetchHex {
@@ -38195,15 +22674,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/ma2gedev/power_assert_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     power_assert = power_assert_0_0_8;
 
     pqueue_1_5_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "pqueue";
             version = "1.5.1";
             src = fetchHex {
@@ -38218,15 +22697,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/okeuday/pqueue";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pqueue = pqueue_1_5_1;
 
     pragmatic_0_1_6 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "pragmatic";
             version = "0.1.6";
             src = fetchHex {
@@ -38243,15 +22722,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/OnorioCatenacci/pragmatic";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pragmatic = pragmatic_0_1_6;
 
     prefecture_jp_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "prefecture_jp";
             version = "0.0.2";
             src = fetchHex {
@@ -38267,15 +22746,17 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ymmtmsys/prefecture_jp";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     prefecture_jp = prefecture_jp_0_0_2;
 
     prelude_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, etude_1_0_0_beta_0 }:
-          buildMix {
+        {
+          buildMix, packageOverrides ? {}, fetchHex, etude_1_0_0_beta_0
+        }:
+          buildMix ({
             name = "prelude";
             version = "0.0.1";
             src = fetchHex {
@@ -38292,15 +22773,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/camshaft/prelude";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     prelude = prelude_0_0_1;
 
     presentex_0_0_10 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "presentex";
             version = "0.0.10";
             src = fetchHex {
@@ -38316,15 +22797,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/Cobenian/Presentex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     presentex = presentex_0_0_10;
 
     pretty_hex_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "pretty_hex";
             version = "0.0.1";
             src = fetchHex {
@@ -38339,15 +22820,21 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/polsab/pretty_hex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pretty_hex = pretty_hex_0_0_1;
 
     pricing_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_2, porcelain_2_0_1 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          timex_1_0_2,
+          porcelain_2_0_1
+        }:
+          buildMix ({
             name = "pricing";
             version = "0.0.1";
             src = fetchHex {
@@ -38363,15 +22850,15 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/arthurcolle/pricing";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pricing = pricing_0_0_1;
 
     progress_bar_1_4_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "progress_bar";
             version = "1.4.0";
             src = fetchHex {
@@ -38386,39 +22873,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/henrik/progress_bar";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     progress_bar = progress_bar_1_4_0;
 
-    proper_1_1_1_beta = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "proper";
-            version = "1.1.1-beta";
-            src = fetchHex {
-              pkg = "proper";
-              version = "1.1.1-beta";
-              sha256 =
-                "bde5c0fef0f8d804a7c06aab4f293d19f42149e5880b3412b75efa608e86d342";
-            };
-
-            meta = {
-              description = ''QuickCheck-inspired property-based testing tool
-                            for Erlang.'';
-              license = stdenv.lib.licenses.gpl3;
-              homepage = "https://github.com/manopapad/proper";
-            };
-          }
-      ) {};
-
-    proper = proper_1_1_1_beta;
-
     proper_case_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "proper_case";
             version = "0.1.1";
             src = fetchHex {
@@ -38437,15 +22900,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/johnnyji/proper_case";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     proper_case = proper_case_0_1_1;
 
     proplist_1_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "proplist";
             version = "1.1.0";
             src = fetchHex {
@@ -38461,15 +22924,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/knrz/proplist";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     proplist = proplist_1_1_0;
 
     proto_def_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
+          buildMix ({
             name = "proto_def";
             version = "0.0.1";
             src = fetchHex {
@@ -38487,41 +22950,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ProtoDef-io/elixir-protodef";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     proto_def = proto_def_0_0_1;
 
-    protobuffs_0_8_2 = callPackage
-      (
-        {  buildErlangMk, fetchHex, meck_0_8_4 }:
-          buildErlangMk {
-            name = "protobuffs";
-            version = "0.8.2";
-            src = fetchHex {
-              pkg = "protobuffs";
-              version = "0.8.2";
-              sha256 =
-                "b77e9d03518927b290cc5bb5cc9622a177e70289100fea9ccb57873573e54553";
-            };
-            beamDeps  = [ meck_0_8_4 ];
-
-            meta = {
-              longDescription = ''An implementation of Google`s Protocol
-                                Buffers for Erlang, based on
-                                ngerakines/erlang_protobuffs.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/basho/erlang_protobuffs";
-            };
-          }
-      ) {};
-
-    protobuffs = protobuffs_0_8_2;
-
     provider_asn1_0_2_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "provider_asn1";
             version = "0.2.1";
             src = fetchHex {
@@ -38531,20 +22968,23 @@ let
                 "1fbf4a1a9711b6308423a213d45dbe409937cdfbad0816491d18aea5d3c44242";
             };
 
+            buildPlugins  = [ rebar3_hex ];
+
+
             meta = {
               description = ''Compile ASN.1 with Rebar3'';
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/knusbaum/provider_asn1";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     provider_asn1 = provider_asn1_0_2_1;
 
     providers_1_4_1 = callPackage
       (
-        {  buildRebar3, fetchHex, getopt_0_8_2 }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex, getopt_0_8_2 }:
+          buildRebar3 ({
             name = "providers";
             version = "1.4.1";
             src = fetchHex {
@@ -38561,13 +23001,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/tsloughter/providers";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     providers_1_6_0 = callPackage
       (
-        {  buildRebar3, fetchHex, getopt_0_8_2 }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex, getopt_0_8_2 }:
+          buildRebar3 ({
             name = "providers";
             version = "1.6.0";
             src = fetchHex {
@@ -38584,65 +23024,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/tsloughter/providers";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     providers = providers_1_6_0;
 
-    proxy_0_0_1 = callPackage
-      (
-        {
-          buildMix, fetchHex, plug_1_1_3, httpoison_0_8_2, cowboy_1_0_4
-        }:
-          buildMix {
-            name = "proxy";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "proxy";
-              version = "0.0.1";
-              sha256 =
-                "74691b18a0918d6e14df1f254ee9f342a547bc280151a4d88a540839ae75bbae";
-            };
-            beamDeps  = [ plug_1_1_3 httpoison_0_8_2 cowboy_1_0_4 ];
-
-            meta = {
-              description = ''Proxy plug for upstream servers'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/chadwpry/elixir-proxy";
-            };
-          }
-      ) {};
-
-    proxy = proxy_0_0_1;
-
-    pubnub_ex_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_2_0 }:
-          buildMix {
-            name = "pubnub_ex";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "pubnub_ex";
-              version = "0.0.2";
-              sha256 =
-                "83d270cfe2be6728fb96d9145371a87ddc876a97f91cdca2584cc82c2a0b91cb";
-            };
-            beamDeps  = [ httpoison_0_8_2 exjsx_3_2_0 ];
-
-            meta = {
-              description = ''A pubsub tool for pubnub.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ryuone/pubnub_ex";
-            };
-          }
-      ) {};
-
-    pubnub_ex = pubnub_ex_0_0_2;
-
     pubsub_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "pubsub";
             version = "0.0.2";
             src = fetchHex {
@@ -38657,123 +23047,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/simonewebdesign/elixir_pubsub";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     pubsub = pubsub_0_0_2;
 
-    pulse_0_1_3 = callPackage
-      (
-        {  buildMix, fetchHex, sonic_0_1_3 }:
-          buildMix {
-            name = "pulse";
-            version = "0.1.3";
-            src = fetchHex {
-              pkg = "pulse";
-              version = "0.1.3";
-              sha256 =
-                "8d9ab6b8f5b3e8da2feedb32062b97243bfc8c250ad5bab09fd61944e51e6aa0";
-            };
-            beamDeps  = [ sonic_0_1_3 ];
-
-            meta = {
-              longDescription = ''Service registration and discovery library
-                                for Elixir. Relies on etcd as an external
-                                service registry.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/heroiclabs/pulse";
-            };
-          }
-      ) {};
-
-    pulse = pulse_0_1_3;
-
-    pulse_libs_1_0_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "pulse_libs";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "pulse_libs";
-              version = "1.0.0";
-              sha256 =
-                "fda2aee58af502bb58752f6a6fcc3f97b2d6eed1a63d39ab91937e5811dbb2fc";
-            };
-
-            meta = {
-              description = ''Elixir standard libraries instrumented with
-                            PULSE.'';
-              license = stdenv.lib.licenses.asl20;
-            };
-          }
-      ) {};
-
-    pulse_libs = pulse_libs_1_0_0;
-
-    pusher_0_1_3 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          signaturex_1_0_1,
-          httpoison_0_8_2,
-          exjsx_3_2_0
-        }:
-          buildMix {
-            name = "pusher";
-            version = "0.1.3";
-            src = fetchHex {
-              pkg = "pusher";
-              version = "0.1.3";
-              sha256 =
-                "1443c9652d3a3d03fcfef0e8dca817affa80d1c4e0eb582282af0d9c69a087f3";
-            };
-            beamDeps  = [ signaturex_1_0_1 httpoison_0_8_2 exjsx_3_2_0 ];
-
-            meta = {
-              description = ''Pusher HTTP client'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/edgurgel/pusher";
-            };
-          }
-      ) {};
-
-    pusher = pusher_0_1_3;
-
-    pushex_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_0_3, httpoison_0_8_2 }:
-          buildMix {
-            name = "pushex";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "pushex";
-              version = "0.0.2";
-              sha256 =
-                "7330d48e2816b9d3444b96d30f9144607490807684f2f231fa91bc7c6888fe03";
-            };
-            beamDeps  = [ poison_1_0_3 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Mobile push notification library'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/tuvistavie/pushex";
-            };
-          }
-      ) {};
-
-    pushex = pushex_0_0_2;
-
     qdate_0_4_2 = callPackage
       (
         {
           buildRebar3,
+          packageOverrides ? {},
           fetchHex,
           erlware_commons_0_18_0,
           erlang_localtime_1_0_0
         }:
-          buildRebar3 {
+          buildRebar3 ({
             name = "qdate";
             version = "0.4.2";
             src = fetchHex {
@@ -38790,63 +23078,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/choptastic/qdate";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     qdate = qdate_0_4_2;
 
-    qiita_ex_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_2_0 }:
-          buildMix {
-            name = "qiita_ex";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "qiita_ex";
-              version = "0.0.2";
-              sha256 =
-                "0bb9a5535c0915c426ff13350b907cbd2b455bb99d8bcb8324ffadb6c9bcf1eb";
-            };
-            beamDeps  = [ httpoison_0_8_2 exjsx_3_2_0 ];
-
-            meta = {
-              description = ''Qiita API v2 Interface for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ma2gedev/qiita_ex";
-            };
-          }
-      ) {};
-
-    qiita_ex = qiita_ex_0_0_2;
-
-    qiniu_0_2_2 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_3_1, httpoison_0_7_5 }:
-          buildMix {
-            name = "qiniu";
-            version = "0.2.2";
-            src = fetchHex {
-              pkg = "qiniu";
-              version = "0.2.2";
-              sha256 =
-                "6c03aeb2d58a1d44f2476eba83640978f166267b07a4e7ce6cb4b498be5cb1c5";
-            };
-            beamDeps  = [ poison_1_3_1 httpoison_0_7_5 ];
-
-            meta = {
-              description = ''Qiniu Resource (Cloud) Storage SDK for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/tony612/qiniu";
-            };
-          }
-      ) {};
-
-    qiniu = qiniu_0_2_2;
-
     qlc_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "qlc";
             version = "1.0.0";
             src = fetchHex {
@@ -38861,15 +23101,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/k1complete/qlc";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     qlc = qlc_1_0_0;
 
     quantum_1_7_1 = callPackage
       (
-        {  buildMix, fetchHex, timex_2_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, timex_2_1_3 }:
+          buildMix ({
             name = "quantum";
             version = "1.7.1";
             src = fetchHex {
@@ -38885,15 +23125,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/c-rack/quantum-elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     quantum = quantum_1_7_1;
 
     quark_1_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "quark";
             version = "1.0.2";
             src = fetchHex {
@@ -38908,15 +23148,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/robot-overlord/quark";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     quark = quark_1_0_2;
 
     queuex_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "queuex";
             version = "0.2.0";
             src = fetchHex {
@@ -38931,15 +23171,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/falood/queuex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     queuex = queuex_0_2_0;
 
     quickrand_1_5_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "quickrand";
             version = "1.5.1";
             src = fetchHex {
@@ -38957,38 +23197,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/okeuday/quickrand";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     quickrand = quickrand_1_5_1;
 
-    quinn_0_0_4 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "quinn";
-            version = "0.0.4";
-            src = fetchHex {
-              pkg = "quinn";
-              version = "0.0.4";
-              sha256 =
-                "6cafeb8e6d9635b3a26caf1768c70751f0bbdc6afb9acd7067a52316b22c8de2";
-            };
-
-            meta = {
-              description = ''Quinn is Elixir xml parser. '';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/nhu313/Quinn";
-            };
-          }
-      ) {};
-
-    quinn = quinn_0_0_4;
-
     quintana_0_2_0 = callPackage
       (
-        {  buildRebar3, fetchHex, folsom_0_8_3 }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex, folsom_0_8_3 }:
+          buildRebar3 ({
             name = "quintana";
             version = "0.2.0";
             src = fetchHex {
@@ -39004,13 +23221,13 @@ let
               description = ''Wrapper around some Folsom functions'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     quintana_0_2_1 = callPackage
       (
-        {  buildRebar3, fetchHex, folsom_0_8_3 }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex, folsom_0_8_3 }:
+          buildRebar3 ({
             name = "quintana";
             version = "0.2.1";
             src = fetchHex {
@@ -39026,15 +23243,15 @@ let
               description = ''Wrapper around some Folsom functions'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     quintana = quintana_0_2_1;
 
     ra_0_3_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ra";
             version = "0.3.2";
             src = fetchHex {
@@ -39050,15 +23267,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/NobbZ/ra";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ra = ra_0_3_2;
 
     rabbitElixir_1_0_1 = callPackage
       (
-        {  buildMix, fetchHex, exjsx_3_1_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, exjsx_3_1_0 }:
+          buildMix ({
             name = "rabbitElixir";
             version = "1.0.1";
             src = fetchHex {
@@ -39074,15 +23291,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/Rabbit-Converter/Rabbit-Elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rabbitElixir = rabbitElixir_1_0_1;
 
     rabbit_common_3_5_6 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "rabbit_common";
             version = "3.5.6";
             src = fetchHex {
@@ -39099,72 +23316,15 @@ let
               license = stdenv.lib.licenses.mpl11;
               homepage = "https://github.com/jbrisbin/rabbit_common";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rabbit_common = rabbit_common_3_5_6;
 
-    rackla_1_0_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poison_2_1_0,
-          plug_1_1_3,
-          hackney_1_4_10,
-          cowboy_1_0_4
-        }:
-          buildMix {
-            name = "rackla";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "rackla";
-              version = "1.0.0";
-              sha256 =
-                "8d299ccea08686953beb11841eeb70ffba7fa040422bc62eaded785432422032";
-            };
-            beamDeps  = [ poison_2_1_0 plug_1_1_3 hackney_1_4_10 cowboy_1_0_4
-                      ];
-
-            meta = {
-              description = ''Rackla is library for building API-gateways.'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/AntonFagerberg/rackla";
-            };
-          }
-      ) {};
-
-    rackla = rackla_1_0_0;
-
-    radpath_0_0_5 = callPackage
-      (
-        {  buildMix, fetchHex, excoveralls_0_5_1 }:
-          buildMix {
-            name = "radpath";
-            version = "0.0.5";
-            src = fetchHex {
-              pkg = "radpath";
-              version = "0.0.5";
-              sha256 =
-                "0da59ca494b833988c9e2b64e075a63949adf8716bf4470d738754723de9bdca";
-            };
-            beamDeps  = [ excoveralls_0_5_1 ];
-
-            meta = {
-              description = ''A path library for Elixir inspired by Python path
-                            libraries '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/lowks/Radpath";
-            };
-          }
-      ) {};
-
-    radpath = radpath_0_0_5;
-
     rails_4_2_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "rails";
             version = "4.2.0";
             src = fetchHex {
@@ -39181,15 +23341,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/BlakeWilliams/rails";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rails = rails_4_2_0;
 
     ranch_1_1_0 = callPackage
       (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
+        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
+          buildErlangMk ({
             name = "ranch";
             version = "1.1.0";
             src = fetchHex {
@@ -39204,13 +23364,13 @@ let
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/ninenines/ranch";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ranch_1_2_1 = callPackage
       (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
+        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
+          buildErlangMk ({
             name = "ranch";
             version = "1.2.1";
             src = fetchHex {
@@ -39225,41 +23385,15 @@ let
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/ninenines/ranch";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ranch = ranch_1_2_1;
 
-    random_0_2_2 = callPackage
-      (
-        {  buildMix, fetchHex, tinymt_0_3_1 }:
-          buildMix {
-            name = "random";
-            version = "0.2.2";
-            src = fetchHex {
-              pkg = "random";
-              version = "0.2.2";
-              sha256 =
-                "504b6bd71c149a8b24c77df3b64c7261112f48811c91b5b8ab71f54d338c6b37";
-            };
-            beamDeps  = [ tinymt_0_3_1 ];
-
-            meta = {
-              longDescription = ''This module contains pseudo-random number
-                                generators for various distributions ported from
-                                Python 3 random module for Elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/yuce/random";
-            };
-          }
-      ) {};
-
-    random = random_0_2_2;
-
     random_string_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "random_string";
             version = "0.0.1";
             src = fetchHex {
@@ -39275,15 +23409,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/sylph01/random_string";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     random_string = random_string_0_0_1;
 
     range_extras_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "range_extras";
             version = "0.1.0";
             src = fetchHex {
@@ -39299,15 +23433,17 @@ let
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/lnikkila/elixir-range-extras";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     range_extras = range_extras_0_1_0;
 
     rankmatcher_0_1_4 = callPackage
       (
-        {  buildRebar3, fetchHex, libsnarlmatch_0_1_7 }:
-          buildRebar3 {
+        {
+          buildRebar3, packageOverrides ? {}, fetchHex, libsnarlmatch_0_1_7
+        }:
+          buildRebar3 ({
             name = "rankmatcher";
             version = "0.1.4";
             src = fetchHex {
@@ -39324,42 +23460,15 @@ let
               license = stdenv.lib.licenses.cddl;
               homepage = "https://github.com/dalmatinerdb/mstore";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rankmatcher = rankmatcher_0_1_4;
 
-    rapidax_0_0_3 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, cowboy_1_0_4
-        }:
-          buildMix {
-            name = "rapidax";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "rapidax";
-              version = "0.0.3";
-              sha256 =
-                "9912b79b3d2729465bf66315bd955e031aeb038f05a63faa2dc0414026edb18c";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 cowboy_1_0_4 ];
-
-            meta = {
-              description = ''Rapidly develop your API client - based on
-                            rapidash gem'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/victorlcampos/rapidax";
-            };
-          }
-      ) {};
-
-    rapidax = rapidax_0_0_3;
-
     rational_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, earmark_0_2_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, earmark_0_2_1 }:
+          buildMix ({
             name = "rational";
             version = "0.2.0";
             src = fetchHex {
@@ -39379,15 +23488,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/twist-vector/elixir-rational.git";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rational = rational_0_2_0;
 
     ratx_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "ratx";
             version = "0.1.0";
             src = fetchHex {
@@ -39403,96 +23512,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/liveforeverx/ratx";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ratx = ratx_0_1_0;
 
-    raven_0_0_5 = callPackage
-      (
-        {  buildMix, fetchHex, hackney_1_4_8, uuid_1_0_0, poison_1_2_1 }:
-          buildMix {
-            name = "raven";
-            version = "0.0.5";
-            src = fetchHex {
-              pkg = "raven";
-              version = "0.0.5";
-              sha256 =
-                "dac032f4a14adbd174927508709585bd34f9baa2836ff3987b4d071790cb229a";
-            };
-            beamDeps  = [ hackney_1_4_8 uuid_1_0_0 poison_1_2_1 ];
-
-            meta = {
-              description = ''Raven is an Elixir client for Sentry'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/vishnevskiy/raven-elixir";
-            };
-          }
-      ) {};
-
-    raven = raven_0_0_5;
-
-    raygun_0_2_0 = callPackage
+    readme_md_doc_0_1_2 = callPackage
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
-          timex_1_0_2,
-          poison_1_5_2,
-          plug_1_1_3,
-          httpoison_0_8_2
+          ex_doc_0_11_4,
+          argument_parser_0_1_3
         }:
-          buildMix {
-            name = "raygun";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "raygun";
-              version = "0.2.0";
-              sha256 =
-                "742fe2fef4fff5933802566375ce8efe27eaa2afbb8609c1bca50ef43f30bc3f";
-            };
-            beamDeps  = [ timex_1_0_2 poison_1_5_2 plug_1_1_3 httpoison_0_8_2
-                      ];
-
-            meta = {
-              longDescription = ''Send errors in your application to Raygun.
-                                Raygun captures all your application errors in
-                                one place. It can be used as a Plug, via Logger
-                                and/or programmatically.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/cobenian/raygun";
-            };
-          }
-      ) {};
-
-    raygun = raygun_0_2_0;
-
-    reactive_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "reactive";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "reactive";
-              version = "0.0.1";
-              sha256 =
-                "af17deb3beedd24319940000e286a1f8d9f29beb498980475e16cc57857469f9";
-            };
-
-            meta = {
-              description = ''Reactive Programming for Elixir'';
-
-            };
-          }
-      ) {};
-
-    reactive = reactive_0_0_1;
-
-    readme_md_doc_0_1_2 = callPackage
-      (
-        {  buildMix, fetchHex, ex_doc_0_11_4, argument_parser_0_1_3 }:
-          buildMix {
+          buildMix ({
             name = "readme_md_doc";
             version = "0.1.2";
             src = fetchHex {
@@ -39509,39 +23543,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/jisaacstone/readme_md_docgen";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     readme_md_doc = readme_md_doc_0_1_2;
 
-    reagent_0_1_5 = callPackage
-      (
-        {  buildMix, fetchHex, exts_0_2_2, socket_0_2_8 }:
-          buildMix {
-            name = "reagent";
-            version = "0.1.5";
-            src = fetchHex {
-              pkg = "reagent";
-              version = "0.1.5";
-              sha256 =
-                "bc2765571d6358098c2c90f7870aa5111bf726a1abef2ad131f02b9aa55c5c9c";
-            };
-            beamDeps  = [ exts_0_2_2 socket_0_2_8 ];
-
-            meta = {
-              description = ''You need more reagents to conjure this server'';
-              license = stdenv.lib.licenses.wtfpl;
-              homepage = "https://github.com/meh/reagent";
-            };
-          }
-      ) {};
-
-    reagent = reagent_0_1_5;
-
     reap_0_1_3 = callPackage
       (
-        {  buildMix, fetchHex, jsex_2_0_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, jsex_2_0_0 }:
+          buildMix ({
             name = "reap";
             version = "0.1.3";
             src = fetchHex {
@@ -39557,15 +23567,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/Raynes/reap";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     reap = reap_0_1_3;
 
     reaxive_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "reaxive";
             version = "0.1.0";
             src = fetchHex {
@@ -39585,77 +23595,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/alfert/reaxive";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     reaxive = reaxive_0_1_0;
 
-    reaxt_0_3_2 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poolboy_1_5_1,
-          poison_1_4_0,
-          plug_1_1_3,
-          exos_1_0_0,
-          cowboy_1_0_4
-        }:
-          buildMix {
-            name = "reaxt";
-            version = "0.3.2";
-            src = fetchHex {
-              pkg = "reaxt";
-              version = "0.3.2";
-              sha256 =
-                "48413f06e14e26b10ea513f7006625684c8db23ea18bfd61eaa5732c588f769c";
-            };
-            beamDeps  = [
-                          poolboy_1_5_1
-                          poison_1_4_0
-                          plug_1_1_3
-                          exos_1_0_0
-                          cowboy_1_0_4
-                        ];
-
-            meta = {
-              longDescription = ''Use your react components into your elixir
-                                application, using webpack compilation.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/awetzel/reaxt";
-            };
-          }
-      ) {};
-
-    reaxt = reaxt_0_3_2;
-
-    rebar3_abnfc_plugin_0_1_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "rebar3_abnfc_plugin";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "rebar3_abnfc_plugin";
-              version = "0.1.0";
-              sha256 =
-                "7c9cf5608888c0fe149cfc4d25a5911e604a1e63f7c0c73c3cf8792a33be9a7b";
-            };
-
-            meta = {
-              description = ''A rebar plugin for abnfc'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/surik/rebar3_abnfc_plugin";
-            };
-          }
-      ) {};
-
-    rebar3_abnfc_plugin = rebar3_abnfc_plugin_0_1_0;
-
     rebar3_appup_plugin_1_0_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "rebar3_appup_plugin";
             version = "1.0.0";
             src = fetchHex {
@@ -39670,15 +23618,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/lrascao/rebar3_appup_plugin";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rebar3_appup_plugin = rebar3_appup_plugin_1_0_0;
 
     rebar3_asn1_compiler_1_0_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "rebar3_asn1_compiler";
             version = "1.0.0";
             src = fetchHex {
@@ -39693,66 +23641,17 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/pyykkis/rebar3_asn1_compiler";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rebar3_asn1_compiler = rebar3_asn1_compiler_1_0_0;
 
-    rebar3_auto_0_3_0 = callPackage
-      (
-        {  buildRebar3, fetchHex, enotify_0_1_0 }:
-          buildRebar3 {
-            name = "rebar3_auto";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "rebar3_auto";
-              version = "0.3.0";
-              sha256 =
-                "9fcca62411b0b7680426bd911002c0769690aef3838829583ffa4547fd5038b5";
-            };
-
-            beamDeps  = [ enotify_0_1_0 ];
-
-            meta = {
-              description = ''Rebar3 plugin for auto compiling on changes'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/tsloughter/rebar3_auto";
-            };
-          }
-      ) {};
-
-    rebar3_auto = rebar3_auto_0_3_0;
-
-    rebar3_autotest_0_1_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, enotify_0_1_0 }:
-          buildRebar3 {
-            name = "rebar3_autotest";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "rebar3_autotest";
-              version = "0.1.1";
-              sha256 =
-                "7f5856336e772b14a578f0c01ce14b2a195c41d5b595c83662ffd130f7874eac";
-            };
-
-            beamDeps  = [ enotify_0_1_0 ];
-
-            meta = {
-              description = ''A rebar3 plugin to run tests automatically when
-                            there are changes.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/NobbZ/rebar3_autotest";
-            };
-          }
-      ) {};
-
-    rebar3_autotest = rebar3_autotest_0_1_1;
-
     rebar3_cuttlefish_0_10_0 = callPackage
       (
-        {  buildRebar3, fetchHex, cuttlefish_2_0_7 }:
-          buildRebar3 {
+        {
+          buildRebar3, packageOverrides ? {}, fetchHex, cuttlefish_2_0_7
+        }:
+          buildRebar3 ({
             name = "rebar3_cuttlefish";
             version = "0.10.0";
             src = fetchHex {
@@ -39769,15 +23668,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/tsloughter/rebar3_cuttlefish";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rebar3_cuttlefish = rebar3_cuttlefish_0_10_0;
 
     rebar3_diameter_compiler_0_3_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "rebar3_diameter_compiler";
             version = "0.3.1";
             src = fetchHex {
@@ -39793,15 +23692,15 @@ let
               homepage =
                 "https://github.com/carlosedp/rebar3_diameter_compiler";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rebar3_diameter_compiler = rebar3_diameter_compiler_0_3_1;
 
     rebar3_elixirc_0_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "rebar3_elixirc";
             version = "0.1.0";
             src = fetchHex {
@@ -39816,89 +23715,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/tsloughter/rebar3_elixirc";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rebar3_elixirc = rebar3_elixirc_0_1_0;
 
-    rebar3_eqc_0_0_10 = callPackage
-      (
-        {  buildRebar3, fetchHex, cf_0_1_2 }:
-          buildRebar3 {
-            name = "rebar3_eqc";
-            version = "0.0.10";
-            src = fetchHex {
-              pkg = "rebar3_eqc";
-              version = "0.0.10";
-              sha256 =
-                "5f901a542ca237da5106c35ae67224316b4aca7ba16204efc874fd1329414729";
-            };
-
-            beamDeps  = [ cf_0_1_2 ];
-
-            meta = {
-              description = ''Plugin to run EQC properties'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage =
-                "https://github.com/kellymclaughlin/rebar3-eqc-plugin";
-            };
-          }
-      ) {};
-
-    rebar3_eqc = rebar3_eqc_0_0_10;
-
-    rebar3_exunit_0_1_1 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "rebar3_exunit";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "rebar3_exunit";
-              version = "0.1.1";
-              sha256 =
-                "910d2f2038dcf2b32deb40a36082ad5435389106b2dbd6266e0ee3a20a688650";
-            };
-
-            meta = {
-              description = ''Plugin to run exUnit tests'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/processone/rebar3_exunit_plugin";
-            };
-          }
-      ) {};
-
-    rebar3_exunit = rebar3_exunit_0_1_1;
-
-    rebar3_gpb_plugin_1_3_0 = callPackage
-      (
-        {  buildRebar3, fetchHex, gpb_3_20_0 }:
-          buildRebar3 {
-            name = "rebar3_gpb_plugin";
-            version = "1.3.0";
-            src = fetchHex {
-              pkg = "rebar3_gpb_plugin";
-              version = "1.3.0";
-              sha256 =
-                "8708e32b99a98d25179a831a7192ed75b15ed396c7e9b927d8bf705f13b3269c";
-            };
-
-            beamDeps  = [ gpb_3_20_0 ];
-
-            meta = {
-              description = ''A rebar3 gpb plugin for compiling .proto files'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/lrascao/rebar3_gpb_plugin";
-            };
-          }
-      ) {};
-
-    rebar3_gpb_plugin = rebar3_gpb_plugin_1_3_0;
-
     rebar3_hex_1_19_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "rebar3_hex";
             version = "1.19.0";
             src = fetchHex {
@@ -39913,15 +23738,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/tsloughter/rebar3_hex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rebar3_hex = rebar3_hex_1_19_0;
 
     rebar3_idl_compiler_0_3_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "rebar3_idl_compiler";
             version = "0.3.0";
             src = fetchHex {
@@ -39936,40 +23761,15 @@ let
 
               homepage = "https://github.com/sebastiw/rebar3_idl_compiler";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rebar3_idl_compiler = rebar3_idl_compiler_0_3_0;
 
-    rebar3_live_0_1_3 = callPackage
-      (
-        {  buildRebar3, fetchHex, enotify_0_1_0 }:
-          buildRebar3 {
-            name = "rebar3_live";
-            version = "0.1.3";
-            src = fetchHex {
-              pkg = "rebar3_live";
-              version = "0.1.3";
-              sha256 =
-                "d9ee2ff022fc73ac94f206c13ff8aa7591a536704f49c4cbacabf37d181a4391";
-            };
-
-            beamDeps  = [ enotify_0_1_0 ];
-
-            meta = {
-              description = ''Rebar3 live plugin'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/pvmart/rebar3_live";
-            };
-          }
-      ) {};
-
-    rebar3_live = rebar3_live_0_1_3;
-
     rebar3_neotoma_plugin_0_2_0 = callPackage
       (
-        {  buildRebar3, fetchHex, neotoma_1_7_3 }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex, neotoma_1_7_3 }:
+          buildRebar3 ({
             name = "rebar3_neotoma_plugin";
             version = "0.2.0";
             src = fetchHex {
@@ -39987,111 +23787,15 @@ let
               homepage =
                 "https://github.com/zamotivator/rebar3_neotoma_plugin";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rebar3_neotoma_plugin = rebar3_neotoma_plugin_0_2_0;
 
-    rebar3_proper_0_6_0 = callPackage
-      (
-        {  buildRebar3, fetchHex, proper_1_1_1_beta }:
-          buildRebar3 {
-            name = "rebar3_proper";
-            version = "0.6.0";
-            src = fetchHex {
-              pkg = "rebar3_proper";
-              version = "0.6.0";
-              sha256 =
-                "8d951f0ef4cfdf699b1dec0b035a9c00a6ac9544b0145ec28621add21b46298d";
-            };
-
-            beamDeps  = [ proper_1_1_1_beta ];
-
-            meta = {
-              description = ''Run PropEr test suites'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/ferd/rebar3_proper";
-            };
-          }
-      ) {};
-
-    rebar3_proper = rebar3_proper_0_6_0;
-
-    rebar3_proper_plugin_0_1_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "rebar3_proper_plugin";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "rebar3_proper_plugin";
-              version = "0.1.0";
-              sha256 =
-                "7071555afb623e73a2c572de6d4379f9c197b44e68608944eb2835617faed10d";
-            };
-
-            meta = {
-              description = ''A rebar plugin'';
-
-            };
-          }
-      ) {};
-
-    rebar3_proper_plugin = rebar3_proper_plugin_0_1_0;
-
-    rebar3_protobuffs_0_2_0 = callPackage
-      (
-        {  buildRebar3, fetchHex, protobuffs_0_8_2 }:
-          buildRebar3 {
-            name = "rebar3_protobuffs";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "rebar3_protobuffs";
-              version = "0.2.0";
-              sha256 =
-                "b5422c5aee1dcea90fa44e4b769c01e8cefe8b1ab09e44b4d2008d465e80c49c";
-            };
-
-            beamDeps  = [ protobuffs_0_8_2 ];
-
-            meta = {
-              description = ''A rebar plugin'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/benoitc/rebar3_protobuffs";
-            };
-          }
-      ) {};
-
-    rebar3_protobuffs = rebar3_protobuffs_0_2_0;
-
-    rebar3_run_0_2_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "rebar3_run";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "rebar3_run";
-              version = "0.2.0";
-              sha256 =
-                "321e0647893957d1bb05a88d940a8a3b9129097d63529e13f815c4857bf29497";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''A rebar plugin'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/tsloughter/rebar3_run";
-            };
-          }
-      ) {};
-
-    rebar3_run = rebar3_run_0_2_0;
-
     rebar3_vendor_0_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "rebar3_vendor";
             version = "0.1.0";
             src = fetchHex {
@@ -40106,38 +23810,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "http://github.com/tsloughter/rebar3_vendor";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rebar3_vendor = rebar3_vendor_0_1_0;
 
-    rebar3_yang_plugin_0_2_1 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "rebar3_yang_plugin";
-            version = "0.2.1";
-            src = fetchHex {
-              pkg = "rebar3_yang_plugin";
-              version = "0.2.1";
-              sha256 =
-                "8a68890ba67baf25b539acfd20783732a90b57f75f7d868cb62d1f7f061449fa";
-            };
-
-            meta = {
-              description = ''A rebar plugin for yang'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/surik/rebar3_yang_plugin";
-            };
-          }
-      ) {};
-
-    rebar3_yang_plugin = rebar3_yang_plugin_0_2_1;
-
     rebar_alias_0_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "rebar_alias";
             version = "0.1.0";
             src = fetchHex {
@@ -40151,15 +23832,15 @@ let
               description = ''A rebar plugin'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rebar_alias = rebar_alias_0_1_0;
 
     rebar_erl_vsn_0_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "rebar_erl_vsn";
             version = "0.1.0";
             src = fetchHex {
@@ -40173,39 +23854,15 @@ let
               description = ''defines for erlang versions'';
               license = stdenv.lib.licenses.mit;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rebar_erl_vsn = rebar_erl_vsn_0_1_0;
 
-    rebar_protobuffs_0_1_0 = callPackage
-      (
-        {  buildRebar3, fetchHex, gpb_3_18_8 }:
-          buildRebar3 {
-            name = "rebar_protobuffs";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "rebar_protobuffs";
-              version = "0.1.0";
-              sha256 =
-                "1345b2135aed454855bfc74b760feb420924824c937157098b1f8668deb919b5";
-            };
-
-            beamDeps  = [ gpb_3_18_8 ];
-
-            meta = {
-              description = ''A rebar plugin'';
-
-            };
-          }
-      ) {};
-
-    rebar_protobuffs = rebar_protobuffs_0_1_0;
-
     rebind_0_1_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "rebind";
             version = "0.1.3";
             src = fetchHex {
@@ -40220,40 +23877,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/camshaft/rebind";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rebind = rebind_0_1_3;
 
-    recaptcha_1_1_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "recaptcha";
-            version = "1.1.1";
-            src = fetchHex {
-              pkg = "recaptcha";
-              version = "1.1.1";
-              sha256 =
-                "ebfa37443d23d2c70366f3f84f00bd50d59da5583ffde2673bc5ea83667b5751";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''A simple reCaptcha package for Phoenix
-                            applications.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/JustMikey/recaptcha";
-            };
-          }
-      ) {};
-
-    recaptcha = recaptcha_1_1_1;
-
     recon_2_2_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "recon";
             version = "2.2.1";
             src = fetchHex {
@@ -40264,68 +23896,19 @@ let
             };
 
             meta = {
-              longDescription = ''Recon wants to be a set of tools usable in
-                                production to diagnose Erlang problems or
-                                inspect production environment safely.'';
+              description = ''Diagnostic tools for production use'';
               license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/ferd/recon";
+              homepage = "https://github.com/ferd/recon/";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     recon = recon_2_2_1;
 
-    recon_ex_0_9_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "recon_ex";
-            version = "0.9.0";
-            src = fetchHex {
-              pkg = "recon_ex";
-              version = "0.9.0";
-              sha256 =
-                "7a24dcb173e74c0e65357deb6e084cd71b1f24915b4801e12ec38bd4d587c2dd";
-            };
-
-            meta = {
-              description = ''Elixir wrapper for Recon, diagnostic tools for
-                            production use'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/tatsuya6502/recon_ex";
-            };
-          }
-      ) {};
-
-    recon_ex = recon_ex_0_9_0;
-
-    record_translator_0_0_3 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "record_translator";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "record_translator";
-              version = "0.0.3";
-              sha256 =
-                "d6a30b2b23194e58c282c86cc0d3f61a738e1840afcee4007fdbb10e7ad7bf76";
-            };
-
-            meta = {
-              description = ''Erlang`s file of records to Elixir`s maps'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/massn/record_translator";
-            };
-          }
-      ) {};
-
-    record_translator = record_translator_0_0_3;
-
     red_0_0_5 = callPackage
       (
-        {  buildMix, fetchHex, exredis_0_2_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, exredis_0_2_3 }:
+          buildMix ({
             name = "red";
             version = "0.0.5";
             src = fetchHex {
@@ -40343,15 +23926,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/rodrigues/red";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     red = red_0_0_5;
 
     red_black_tree_1_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "red_black_tree";
             version = "1.2.0";
             src = fetchHex {
@@ -40367,41 +23950,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/SenecaSystems/red_black_tree";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     red_black_tree = red_black_tree_1_2_0;
 
-    reddhl_0_0_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, poison_1_4_0, httpoison_0_8_2 }:
-          buildRebar3 {
-            name = "reddhl";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "reddhl";
-              version = "0.0.1";
-              sha256 =
-                "4b2a5b1e3119b5b44e57c10e395fc817d977bf7fd72464605efff08266336871";
-            };
-
-            beamDeps  = [ poison_1_4_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''An headline and link puller for Reddit and its
-                            various subreddits '';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/MonkeyIsNull/reddhl";
-            };
-          }
-      ) {};
-
-    reddhl = reddhl_0_0_1;
-
     redis_pool_0_2_3 = callPackage
       (
-        {  buildMix, fetchHex, poolboy_1_5_1, eredis_1_0_8 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poolboy_1_5_1,
+          eredis_1_0_8
+        }:
+          buildMix ({
             name = "redis_pool";
             version = "0.2.3";
             src = fetchHex {
@@ -40418,15 +23981,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/le0pard/redis_pool";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     redis_pool = redis_pool_0_2_3;
 
     redis_poolex_0_0_5 = callPackage
       (
-        {  buildMix, fetchHex, poolboy_1_5_1, exredis_0_2_3 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poolboy_1_5_1,
+          exredis_0_2_3
+        }:
+          buildMix ({
             name = "redis_poolex";
             version = "0.0.5";
             src = fetchHex {
@@ -40443,15 +24012,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/oivoodoo/redis_poolex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     redis_poolex = redis_poolex_0_0_5;
 
     redix_0_3_6 = callPackage
       (
-        {  buildMix, fetchHex, connection_1_0_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, connection_1_0_2 }:
+          buildMix ({
             name = "redix";
             version = "0.3.6";
             src = fetchHex {
@@ -40468,15 +24037,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/whatyouhide/redix";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     redix = redix_0_3_6;
 
     redo_2_0_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "redo";
             version = "2.0.1";
             src = fetchHex {
@@ -40491,39 +24060,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/heroku/redo";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     redo = redo_2_0_1;
 
-    redtube_1_0_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "redtube";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "redtube";
-              version = "1.0.0";
-              sha256 =
-                "f9c5b83c3f860c448328079f1250b54f06749d9c1adb593f7e11e45fe8131a0d";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''API Wrapper for Redtube'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/kkirsche/Redtube_Elixir";
-            };
-          }
-      ) {};
-
-    redtube = redtube_1_0_0;
-
     ref_inspector_0_8_0 = callPackage
       (
-        {  buildMix, fetchHex, poolboy_1_5_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poolboy_1_5_1 }:
+          buildMix ({
             name = "ref_inspector";
             version = "0.8.0";
             src = fetchHex {
@@ -40539,15 +24084,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/elixytics/ref_inspector";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ref_inspector = ref_inspector_0_8_0;
 
     regdom_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "regdom";
             version = "0.0.1";
             src = fetchHex {
@@ -40562,57 +24107,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/adqio/regdom-lib";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     regdom = regdom_0_0_1;
 
-    relax_0_3_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poison_1_5_2,
-          plug_1_1_3,
-          ja_serializer_0_8_1,
-          ecto_2_0_0_beta_2,
-          cowboy_1_0_4
-        }:
-          buildMix {
-            name = "relax";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "relax";
-              version = "0.3.0";
-              sha256 =
-                "04382f1d8a6d14e3a9b2177a318aa02129665fa3e00fb52d0042e286ea9af392";
-            };
-            beamDeps  = [
-                          poison_1_5_2
-                          plug_1_1_3
-                          ja_serializer_0_8_1
-                          ecto_2_0_0_beta_2
-                          cowboy_1_0_4
-                        ];
-
-            meta = {
-              longDescription = ''A jsonapi.org serializer and optional server
-                                implementation in Elixir. Relax can be used as a
-                                standalone API with Relax.Router and
-                                Relax.Resources, or integrated into Phoenix
-                                using Relax.Serializer.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/AgilionApps/relax";
-            };
-          }
-      ) {};
-
-    relax = relax_0_3_0;
-
     relflow_1_0_5 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "relflow";
             version = "1.0.5";
             src = fetchHex {
@@ -40622,19 +24125,22 @@ let
                 "7a991b7e5e390f1cdb16dd0cbb9327bd70ce785e6cebcb6ea25a6693fd836b18";
             };
 
+            buildPlugins  = [ rebar3_hex ];
+
+
             meta = {
               description = ''Rebar3 release workflow plugin'';
               license = stdenv.lib.licenses.apsl20;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     relflow = relflow_1_0_5;
 
     relief_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "relief";
             version = "0.0.1";
             src = fetchHex {
@@ -40650,40 +24156,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/voidlock/relief";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     relief = relief_0_0_1;
 
-    relisa_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, exrm_0_18_8 }:
-          buildMix {
-            name = "relisa";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "relisa";
-              version = "0.1.0";
-              sha256 =
-                "e771fa9da8363571765374a0cf3f1237da8c1be35ea4109165928ca42895954c";
-            };
-            beamDeps  = [ exrm_0_18_8 ];
-
-            meta = {
-              description = ''Fast, simple, and composable deployment library
-                            for Elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/SenecaSystems/relisa";
-            };
-          }
-      ) {};
-
-    relisa = relisa_0_1_0;
-
     relocker_0_0_8 = callPackage
       (
-        {  buildMix, fetchHex, exredis_0_2_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, exredis_0_2_3 }:
+          buildMix ({
             name = "relocker";
             version = "0.0.8";
             src = fetchHex {
@@ -40699,15 +24180,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/grandCru/relocker";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     relocker = relocker_0_0_8;
 
     reltool_util_1_5_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "reltool_util";
             version = "1.5.1";
             src = fetchHex {
@@ -40723,7 +24204,7 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/okeuday/reltool_util";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     reltool_util = reltool_util_1_5_1;
@@ -40732,6 +24213,7 @@ let
       (
         {
           buildRebar3,
+          packageOverrides ? {},
           fetchHex,
           providers_1_6_0,
           getopt_0_8_2,
@@ -40739,7 +24221,7 @@ let
           cf_0_2_1,
           bbmustache_1_0_4
         }:
-          buildRebar3 {
+          buildRebar3 ({
             name = "relx";
             version = "3.18.0";
             src = fetchHex {
@@ -40762,7 +24244,7 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/erlware/relx";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     relx = relx_3_18_0;
@@ -40771,13 +24253,14 @@ let
       (
         {
           buildRebar3,
+          packageOverrides ? {},
           fetchHex,
           providers_1_4_1,
           getopt_0_8_2,
           erlware_commons_0_15_0,
           bbmustache_1_0_3
         }:
-          buildRebar3 {
+          buildRebar3 ({
             name = "relx";
             version = "3.3.2";
             src = fetchHex {
@@ -40799,20 +24282,21 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/erlware/relx";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     relx_3_5_0 = callPackage
       (
         {
           buildRebar3,
+          packageOverrides ? {},
           fetchHex,
           providers_1_4_1,
           getopt_0_8_2,
           erlware_commons_0_15_0,
           bbmustache_1_0_3
         }:
-          buildRebar3 {
+          buildRebar3 ({
             name = "relx";
             version = "3.5.0";
             src = fetchHex {
@@ -40834,13 +24318,13 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/erlware/relx";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     remix_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "remix";
             version = "0.0.2";
             src = fetchHex {
@@ -40856,15 +24340,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/AgilionApps/remix";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     remix = remix_0_0_2;
 
     remodel_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "remodel";
             version = "0.0.1";
             src = fetchHex {
@@ -40883,39 +24367,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/stavro/remodel";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     remodel = remodel_0_0_1;
 
-    rendezvous_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "rendezvous";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "rendezvous";
-              version = "0.0.1";
-              sha256 =
-                "92aa7157aa2d0c1dcfc1dfeddeaef023aca6f5f0790fd8040828c831f3f7f893";
-            };
-
-            meta = {
-              longDescription = ''Implementation of the Rendezvous or Highest
-                                Random Weight (HRW) hashing algorithm'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/Puddah/Rendezvous";
-            };
-          }
-      ) {};
-
-    rendezvous = rendezvous_0_0_1;
-
     repoquery_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "repoquery";
             version = "0.0.2";
             src = fetchHex {
@@ -40931,52 +24391,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/rentpath/repoquery";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     repoquery = repoquery_0_0_2;
 
-    reporter_0_4_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poison_2_1_0,
-          httpoison_0_8_2,
-          floki_0_8_0,
-          feeder_ex_0_0_2
-        }:
-          buildMix {
-            name = "reporter";
-            version = "0.4.1";
-            src = fetchHex {
-              pkg = "reporter";
-              version = "0.4.1";
-              sha256 =
-                "414bc7874fd551d5559907b88617a9a58aacb556d8b6adf6270cbef34656ebac";
-            };
-            beamDeps  = [
-                          poison_2_1_0
-                          httpoison_0_8_2
-                          floki_0_8_0
-                          feeder_ex_0_0_2
-                        ];
-
-            meta = {
-              description = ''Simple getting reviews library from AppStore and
-                            GooglePlay'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/KazuCocoa/simple_app_reporter_ex";
-            };
-          }
-      ) {};
-
-    reporter = reporter_0_4_1;
-
     reprise_0_5_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "reprise";
             version = "0.5.0";
             src = fetchHex {
@@ -41000,15 +24423,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/herenowcoder/reprise";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     reprise = reprise_0_5_0;
 
     resin_0_4_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "resin";
             version = "0.4.1";
             src = fetchHex {
@@ -41025,15 +24448,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/Frost/resin";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     resin = resin_0_4_1;
 
     rest_1_5_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "rest";
             version = "1.5.0";
             src = fetchHex {
@@ -41048,98 +24471,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/synrc/rest";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rest = rest_1_5_0;
 
-    rest_client_0_0_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poison_1_5_2,
-          mock_0_1_3,
-          inflex_1_4_1,
-          httpotion_2_2_2
-        }:
-          buildMix {
-            name = "rest_client";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "rest_client";
-              version = "0.0.1";
-              sha256 =
-                "b537f9bc91fbf09ecb6c5890c0e5a01f20de869bc804f730688f61d6acd96cf8";
-            };
-            beamDeps  = [
-                          poison_1_5_2 mock_0_1_3 inflex_1_4_1 httpotion_2_2_2
-                        ];
-
-            meta = {
-              longDescription = ''RestClient is a generic REST client library.
-                                It generates structs and functions for use with
-                                APIs.'';
-
-              homepage = "https://github.com/phikes/elixir-restclient";
-            };
-          }
-      ) {};
-
-    rest_client = rest_client_0_0_1;
-
-    rethinkdb_0_4_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_0_3, connection_1_0_2 }:
-          buildMix {
-            name = "rethinkdb";
-            version = "0.4.0";
-            src = fetchHex {
-              pkg = "rethinkdb";
-              version = "0.4.0";
-              sha256 =
-                "ca2d13a226987edf6943f7af968510b1836becc3c14b42667f82cd57bbcd4e8f";
-            };
-            beamDeps  = [ poison_1_0_3 connection_1_0_2 ];
-
-            meta = {
-              description = ''RethinkDB driver for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/hamiltop/rethinkdb-elixir";
-            };
-          }
-      ) {};
-
-    rethinkdb = rethinkdb_0_4_0;
-
-    rethinkdb_changefeed_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, rethinkdb_0_4_0, connection_1_0_2 }:
-          buildMix {
-            name = "rethinkdb_changefeed";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "rethinkdb_changefeed";
-              version = "0.0.1";
-              sha256 =
-                "c895db0d57d55c7c7ab4aeb6ce167c82de1d0f7a884c93d4ea0cdea16df11b82";
-            };
-            beamDeps  = [ rethinkdb_0_4_0 connection_1_0_2 ];
-
-            meta = {
-              description = ''RethinkDB Supervised Changefeeds'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/hamiltop/rethinkdb_changefeed";
-            };
-          }
-      ) {};
-
-    rethinkdb_changefeed = rethinkdb_changefeed_0_0_1;
-
     reup_0_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "reup";
             version = "0.1.0";
             src = fetchHex {
@@ -41149,51 +24489,29 @@ let
                 "949a672190119f8b24160167e3685fdd5397474f98dc875ccfd31378ebd68506";
             };
 
+            buildPlugins  = [ rebar3_hex ];
+
+
             meta = {
               description = ''dev watcher that auto compiles and reloads
                             modules'';
               license = stdenv.lib.licenses.apsl20;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     reup = reup_0_1_0;
 
-    reverse_proxy_0_1_0 = callPackage
-      (
-        {
-          buildMix, fetchHex, plug_1_0_3, httpoison_0_7_5, cowboy_1_0_4
-        }:
-          buildMix {
-            name = "reverse_proxy";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "reverse_proxy";
-              version = "0.1.0";
-              sha256 =
-                "77ab07ca68e758d5ce07878ae4effab8522545e6d491f9ae96c87814f35cbab2";
-            };
-            beamDeps  = [ plug_1_0_3 httpoison_0_7_5 cowboy_1_0_4 ];
-
-            meta = {
-              longDescription = ''A Plug based, reverse proxy server. Upstream
-                                servers can be listed per-domain in the
-                                following forms: - List of remote nodes, e.g.
-                                `["host:4000", "host:4001"]` - A `{plug,
-                                options}` tuple, useful for umbrella
-                                applications'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/slogsdon/elixir-reverse-proxy";
-            };
-          }
-      ) {};
-
-    reverse_proxy = reverse_proxy_0_1_0;
-
     revision_plate_ex_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_3,
+          cowboy_1_0_4
+        }:
+          buildMix ({
             name = "revision_plate_ex";
             version = "0.1.0";
             src = fetchHex {
@@ -41210,15 +24528,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/KazuCocoa/revision_plate_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     revision_plate_ex = revision_plate_ex_0_1_0;
 
     rfc3339_0_9_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "rfc3339";
             version = "0.9.0";
             src = fetchHex {
@@ -41233,98 +24551,15 @@ let
               license = with stdenv.lib.licenses; [ asl20 mit ];
               homepage = "https://github.com/talentdeficit/rfc3339";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rfc3339 = rfc3339_0_9_0;
 
-    riak_1_0_0 = callPackage
-      (
-        {
-          buildMix, fetchHex, riakc_2_1_1, pooler_1_5_0, linguist_0_1_5
-        }:
-          buildMix {
-            name = "riak";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "riak";
-              version = "1.0.0";
-              sha256 =
-                "4171c6e40aba67f8464c807bd70c68e8bf63c9cecf3d28dde88ef1e8f5a21930";
-            };
-            beamDeps  = [ riakc_2_1_1 pooler_1_5_0 linguist_0_1_5 ];
-
-            meta = {
-              description = ''A Riak client written in Elixir.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/drewkerrigan/riak-elixir-client";
-            };
-          }
-      ) {};
-
-    riak = riak_1_0_0;
-
-    riak_core_ng_2_2_3 = callPackage
-      (
-        {
-          buildRebar3,
-          fetchHex,
-          riak_sysmon_2_1_2,
-          riak_ensemble_2_1_3,
-          pbkdf2_2_0_0,
-          lager_3_0_2,
-          goldrush_0_1_7,
-          exometer_core_1_0_0,
-          erocksdb_0_4_1,
-          eleveldb_2_1_3,
-          edown_0_7_0,
-          cuttlefish_2_0_7,
-          clique_3_0_1,
-          chash_0_1_1,
-          basho_stats_1_0_3,
-          basho_poolboy_0_8_1_p3
-        }:
-          buildRebar3 {
-            name = "riak_core_ng";
-            version = "2.2.3";
-            src = fetchHex {
-              pkg = "riak_core_ng";
-              version = "2.2.3";
-              sha256 =
-                "41cc44bf8e0c6a18858d9a5327bc0098526d6c5d272b3e73bf3ff19019b53cd3";
-            };
-
-            beamDeps  = [
-                          riak_sysmon_2_1_2
-                          riak_ensemble_2_1_3
-                          pbkdf2_2_0_0
-                          lager_3_0_2
-                          goldrush_0_1_7
-                          exometer_core_1_0_0
-                          erocksdb_0_4_1
-                          eleveldb_2_1_3
-                          edown_0_7_0
-                          cuttlefish_2_0_7
-                          clique_3_0_1
-                          chash_0_1_1
-                          basho_stats_1_0_3
-                          basho_poolboy_0_8_1_p3
-                        ];
-
-            meta = {
-              description = ''Riak Core'';
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/project-fifo/riak_core";
-            };
-          }
-      ) {};
-
-    riak_core_ng = riak_core_ng_2_2_3;
-
     riak_dt_2_1_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "riak_dt";
             version = "2.1.1";
             src = fetchHex {
@@ -41339,64 +24574,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/basho/riak_dt";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     riak_dt = riak_dt_2_1_1;
 
-    riak_ensemble_2_1_3 = callPackage
-      (
-        {  buildRebar3, fetchHex, lager_3_0_2, eleveldb_2_1_3 }:
-          buildRebar3 {
-            name = "riak_ensemble";
-            version = "2.1.3";
-            src = fetchHex {
-              pkg = "riak_ensemble";
-              version = "2.1.3";
-              sha256 =
-                "593c68745ce3117c2e0beaa57e36ad2971bd3540645f233df866a19468970ae2";
-            };
-
-            beamDeps  = [ lager_3_0_2 eleveldb_2_1_3 ];
-
-            meta = {
-              description = ''Multi-Paxos framework in Erlang'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/basho/riak_ensemble";
-            };
-          }
-      ) {};
-
-    riak_ensemble = riak_ensemble_2_1_3;
-
-    riak_pb_2_1_0 = callPackage
-      (
-        {  buildErlangMk, fetchHex, protobuffs_0_8_2, hamcrest_0_1_1 }:
-          buildErlangMk {
-            name = "riak_pb";
-            version = "2.1.0";
-            src = fetchHex {
-              pkg = "riak_pb";
-              version = "2.1.0";
-              sha256 =
-                "76309b9b831d276bf9abf92362183030ed63910a2e153f1f8a389e97dec6c287";
-            };
-            beamDeps  = [ protobuffs_0_8_2 hamcrest_0_1_1 ];
-
-            meta = {
-              description = ''Riak Protocol Buffers Messages'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/basho/riak_pb";
-            };
-          }
-      ) {};
-
-    riak_pb = riak_pb_2_1_0;
-
     riak_sysmon_2_1_2 = callPackage
       (
-        {  buildRebar3, fetchHex, lager_3_0_2 }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex, lager_3_0_2 }:
+          buildRebar3 ({
             name = "riak_sysmon";
             version = "2.1.2";
             src = fetchHex {
@@ -41413,163 +24599,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/basho/riak_sysmon";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     riak_sysmon = riak_sysmon_2_1_2;
 
-    riakc_2_1_1 = callPackage
-      (
-        {  buildErlangMk, fetchHex, riak_pb_2_1_0 }:
-          buildErlangMk {
-            name = "riakc";
-            version = "2.1.1";
-            src = fetchHex {
-              pkg = "riakc";
-              version = "2.1.1";
-              sha256 =
-                "4f7141c03529d4f1c28c71eafcd797be0a538ba21d5d6923a17a9ca9e64e744e";
-            };
-            beamDeps  = [ riak_pb_2_1_0 ];
-
-            meta = {
-              description = ''Erlang clients for Riak.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/basho/riak-erlang-client";
-            };
-          }
-      ) {};
-
-    riakc = riakc_2_1_1;
-
-    riboflavin_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "riboflavin";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "riboflavin";
-              version = "0.0.2";
-              sha256 =
-                "cc4ac4c80b6d591deaea136a3d055eba4ead6bbe2fc9b220a4432f160d0ddec6";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Backblaze B2 client.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/silentdragonz/riboflavin";
-            };
-          }
-      ) {};
-
-    riboflavin = riboflavin_0_0_2;
-
-    riemann_0_0_14 = callPackage
-      (
-        {  buildMix, fetchHex, honeydew_0_0_8, exprotobuf_0_13_0 }:
-          buildMix {
-            name = "riemann";
-            version = "0.0.14";
-            src = fetchHex {
-              pkg = "riemann";
-              version = "0.0.14";
-              sha256 =
-                "05656878f8aee98f1baa601ca762338014cf2440d1fb043f682669241314a2d5";
-            };
-            beamDeps  = [ honeydew_0_0_8 exprotobuf_0_13_0 ];
-
-            meta = {
-              description = ''A client for the Riemann event stream
-                            processor'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/koudelka/elixir-riemann";
-            };
-          }
-      ) {};
-
-    riemann = riemann_0_0_14;
-
-    robotex_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_1_0 }:
-          buildMix {
-            name = "robotex";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "robotex";
-              version = "0.0.1";
-              sha256 =
-                "ae1c618b20e3847f4c372350bdda3b0dc577e1491310ef97fd5869c4f750533e";
-            };
-            beamDeps  = [ httpoison_0_8_2 exjsx_3_1_0 ];
-
-            meta = {
-              description = ''Robotex is a client for the Telegram Bot API.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/EddyShure/robotex";
-            };
-          }
-      ) {};
-
-    robotex = robotex_0_0_1;
-
-    rogger_0_1_0 = callPackage
-      (
-        {  buildRebar3, fetchHex, timex_0_13_5, amqp_0_1_1 }:
-          buildRebar3 {
-            name = "rogger";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "rogger";
-              version = "0.1.0";
-              sha256 =
-                "2e68650f9ee8f1047410538163e930567c049d91f883cbc96d9f52aea6052b61";
-            };
-
-            beamDeps  = [ timex_0_13_5 amqp_0_1_1 ];
-
-            meta = {
-              description = ''Elixir logger to publish log messages in
-                            RabbitMQ. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/duartejc/rogger";
-            };
-          }
-      ) {};
-
-    rogger = rogger_0_1_0;
-
-    rollbax_0_5_4 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_0_3, hackney_1_6_0 }:
-          buildMix {
-            name = "rollbax";
-            version = "0.5.4";
-            src = fetchHex {
-              pkg = "rollbax";
-              version = "0.5.4";
-              sha256 =
-                "e089f9c2ea51447111c14e2491e0b2d27eaff9efc6f1bfda5edcd64881923197";
-            };
-            beamDeps  = [ poison_1_0_3 hackney_1_6_0 ];
-
-            meta = {
-              description = ''Exception tracking and logging from Elixir to
-                            Rollbar'';
-              license = stdenv.lib.licenses.isc;
-              homepage = "https://github.com/elixir-addicts/rollbax";
-            };
-          }
-      ) {};
-
-    rollbax = rollbax_0_5_4;
-
     rollex_0_4_0 = callPackage
       (
-        {  buildMix, fetchHex, sfmt_0_12_7 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, sfmt_0_12_7 }:
+          buildMix ({
             name = "rollex";
             version = "0.4.0";
             src = fetchHex {
@@ -41585,15 +24623,15 @@ let
                             calculate dice rolls.'';
               license = stdenv.lib.licenses.mit;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rollex = rollex_0_4_0;
 
     roman_numerals_1_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "roman_numerals";
             version = "1.0.1";
             src = fetchHex {
@@ -41608,15 +24646,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/lpil/roman-numerals";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     roman_numerals = roman_numerals_1_0_1;
 
     romanex_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "romanex";
             version = "0.1.0";
             src = fetchHex {
@@ -41631,15 +24669,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/itsgreggreg/romanex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     romanex = romanex_0_1_0;
 
     romeo_0_4_0 = callPackage
       (
-        {  buildMix, fetchHex, connection_1_0_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, connection_1_0_2 }:
+          buildMix ({
             name = "romeo";
             version = "0.4.0";
             src = fetchHex {
@@ -41655,41 +24693,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/scrogson/romeo";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     romeo = romeo_0_4_0;
 
-    roombex_0_0_4 = callPackage
-      (
-        {  buildMix, fetchHex, serial_0_1_2 }:
-          buildMix {
-            name = "roombex";
-            version = "0.0.4";
-            src = fetchHex {
-              pkg = "roombex";
-              version = "0.0.4";
-              sha256 =
-                "93ff6124016e14e2ecdf90628b638f80eb97cc0b21f2c50288585d33fc5d3d54";
-            };
-            beamDeps  = [ serial_0_1_2 ];
-
-            meta = {
-              longDescription = ''Implements the Roomba binary protocol. Send
-                                and receive binary data using elixir data
-                                structures and simple functions.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/mmmries/roombex";
-            };
-          }
-      ) {};
-
-    roombex = roombex_0_0_4;
-
     rop_0_5_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "rop";
             version = "0.5.3";
             src = fetchHex {
@@ -41705,15 +24717,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ruby2elixir/rop";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rop = rop_0_5_3;
 
     rotor_0_2_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "rotor";
             version = "0.2.2";
             src = fetchHex {
@@ -41730,15 +24742,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/HashNuke/rotor";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rotor = rotor_0_2_2;
 
     rquote_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "rquote";
             version = "0.0.1";
             src = fetchHex {
@@ -41754,15 +24766,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/stocks29/rquote";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rquote = rquote_0_0_1;
 
     rsa_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "rsa";
             version = "0.0.1";
             src = fetchHex {
@@ -41777,38 +24789,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/trapped/elixir-rsa";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rsa = rsa_0_0_1;
 
-    rss_0_2_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "rss";
-            version = "0.2.1";
-            src = fetchHex {
-              pkg = "rss";
-              version = "0.2.1";
-              sha256 =
-                "1af49c787fc789740a0fa7e0e197a7cb779a63c4eb703f013fea400126eac1f2";
-            };
-
-            meta = {
-              description = ''A super simple RSS feed builder '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bennyhallett/elixir-rss";
-            };
-          }
-      ) {};
-
-    rss = rss_0_2_1;
-
     rubix_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "rubix";
             version = "0.0.2";
             src = fetchHex {
@@ -41824,40 +24813,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/YellowApple/Rubix";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     rubix = rubix_0_0_2;
 
-    rulex_0_2_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "rulex";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "rulex";
-              version = "0.2.0";
-              sha256 =
-                "41429f27164bb05f2fa4c6326b63a8773f61c89ef9ef0bd93937cbc473d03ab5";
-            };
-
-            meta = {
-              longDescription = ''Rulex contains a very simple macro "defrule"
-                                allowing you to write a rule system using Elixir
-                                pattern matching. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/awetzel/rulex";
-            };
-          }
-      ) {};
-
-    rulex = rulex_0_2_0;
-
     russian_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "russian";
             version = "0.1.0";
             src = fetchHex {
@@ -41872,15 +24836,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/Kr00lIX/russian_elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     russian = russian_0_1_0;
 
     safetybox_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex, earmark_0_2_1, cryptex_0_0_1 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          earmark_0_2_1,
+          cryptex_0_0_1
+        }:
+          buildMix ({
             name = "safetybox";
             version = "0.1.2";
             src = fetchHex {
@@ -41897,15 +24867,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/aforward/safetybox";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     safetybox = safetybox_0_1_2;
 
     salsa20_0_3_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "salsa20";
             version = "0.3.0";
             src = fetchHex {
@@ -41920,38 +24890,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mwmiller/salsa20_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     salsa20 = salsa20_0_3_0;
 
-    saltie_0_3_2 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "saltie";
-            version = "0.3.2";
-            src = fetchHex {
-              pkg = "saltie";
-              version = "0.3.2";
-              sha256 =
-                "6d1eb4b3d0f3a494990a28af3a5e6f79221f230ed7b24063cdfa2ea34c8794f2";
-            };
-
-            meta = {
-              description = ''**DEPRECATED**. See hex.pm/packages/hashids'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/alco/saltie";
-            };
-          }
-      ) {};
-
-    saltie = saltie_0_3_2;
-
     sap_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3, control_0_0_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_3,
+          control_0_0_4
+        }:
+          buildMix ({
             name = "sap";
             version = "0.0.2";
             src = fetchHex {
@@ -41969,15 +24922,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/slogsdon/sap";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     sap = sap_0_0_2;
 
     sasl_ex_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "sasl_ex";
             version = "0.1.0";
             src = fetchHex {
@@ -41993,63 +24946,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/elbow-jason/sasl_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     sasl_ex = sasl_ex_0_1_0;
 
-    sass_elixir_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "sass_elixir";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "sass_elixir";
-              version = "0.0.1";
-              sha256 =
-                "565dc1c40057a9a7ae3a3c27151a8dd87a3d672d346fcc5b4829152d22c4a511";
-            };
-
-            meta = {
-              description = ''A SASS plugin for elixir projects'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/zamith/sass_elixir";
-            };
-          }
-      ) {};
-
-    sass_elixir = sass_elixir_0_0_1;
-
-    savory_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "savory";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "savory";
-              version = "0.0.2";
-              sha256 =
-                "a45ef32a6f45092e1328bc1eb47bda3c8f992afe863aaa73c455f31b0c8591b9";
-            };
-
-            meta = {
-              longDescription = ''An Elixir implementation of Freza`s salt_nif
-                                which interfaces with libsodium, a wrapper for
-                                the cryptographic primitive libary NaCl. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/electricFeel/savory";
-            };
-          }
-      ) {};
-
-    savory = savory_0_0_2;
-
     sbroker_0_7_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "sbroker";
             version = "0.7.0";
             src = fetchHex {
@@ -42065,15 +24970,21 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/fishcakez/sbroker";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     sbroker = sbroker_0_7_0;
 
     scaffold_0_0_5 = callPackage
       (
-        {  buildMix, fetchHex, gitex_0_1_0, configparser_ex_0_2_1 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          gitex_0_1_0,
+          configparser_ex_0_2_1
+        }:
+          buildMix ({
             name = "scaffold";
             version = "0.0.5";
             src = fetchHex {
@@ -42090,15 +25001,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/gausby/scaffold";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     scaffold = scaffold_0_0_5;
 
     schedule_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "schedule";
             version = "0.1.0";
             src = fetchHex {
@@ -42113,15 +25024,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/dvele55/schedule";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     schedule = schedule_0_1_0;
 
     schizo_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "schizo";
             version = "0.0.1";
             src = fetchHex {
@@ -42137,133 +25048,15 @@ let
               license = stdenv.lib.licenses.unlicense;
               homepage = "https://github.com/teerawat1992/Schizo";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     schizo = schizo_0_0_1;
 
-    scrape_1_0_4 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          timex_1_0_0_rc4,
-          parallel_0_0_3,
-          httpoison_0_8_2,
-          floki_0_8_0,
-          codepagex_0_1_2
-        }:
-          buildMix {
-            name = "scrape";
-            version = "1.0.4";
-            src = fetchHex {
-              pkg = "scrape";
-              version = "1.0.4";
-              sha256 =
-                "ff26574b5ab5a6cf1f9aaa1369c2b9880bce2cf53b261a65160fdf9b4e11a361";
-            };
-            beamDeps  = [
-                          timex_1_0_0_rc4
-                          parallel_0_0_3
-                          httpoison_0_8_2
-                          floki_0_8_0
-                          codepagex_0_1_2
-                        ];
-
-            meta = {
-              description = ''Scrape any website, article or RSS/Atom feed with
-                            ease!'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/Anonyfox/elixir-scrape";
-            };
-          }
-      ) {};
-
-    scrape = scrape_1_0_4;
-
-    scrivener_1_1_2 = callPackage
-      (
-        {  buildMix, fetchHex, postgrex_0_11_1, ecto_2_0_0_beta_2 }:
-          buildMix {
-            name = "scrivener";
-            version = "1.1.2";
-            src = fetchHex {
-              pkg = "scrivener";
-              version = "1.1.2";
-              sha256 =
-                "9be46bdce0d8179ece431226eb9eddbe13bc158d647a3daee64a49bc26ca9dcf";
-            };
-            beamDeps  = [ postgrex_0_11_1 ecto_2_0_0_beta_2 ];
-
-            meta = {
-              description = ''Paginate your Ecto queries'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/drewolson/scrivener";
-            };
-          }
-      ) {};
-
-    scrivener = scrivener_1_1_2;
-
-    scrivener_headers_1_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, scrivener_1_1_2, plug_1_1_3 }:
-          buildMix {
-            name = "scrivener_headers";
-            version = "1.0.1";
-            src = fetchHex {
-              pkg = "scrivener_headers";
-              version = "1.0.1";
-              sha256 =
-                "2b004352dc5f394b33d4414ce9ebf379db7a9c4b1c92130d73a52e0a16efc93f";
-            };
-            beamDeps  = [ scrivener_1_1_2 plug_1_1_3 ];
-
-            meta = {
-              description = ''Helpers for paginating API responses with
-                            Scrivener and HTTP headers'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/doomspork/scrivener_headers";
-            };
-          }
-      ) {};
-
-    scrivener_headers = scrivener_headers_1_0_1;
-
-    scrivener_html_1_0_9 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          scrivener_1_1_2,
-          phoenix_html_2_5_1,
-          phoenix_1_1_4
-        }:
-          buildMix {
-            name = "scrivener_html";
-            version = "1.0.9";
-            src = fetchHex {
-              pkg = "scrivener_html";
-              version = "1.0.9";
-              sha256 =
-                "e65645698e35463e1f0f553f76bf24d47a905870837b7c7544220d3e71c3a23b";
-            };
-            beamDeps  = [ scrivener_1_1_2 phoenix_html_2_5_1 phoenix_1_1_4 ];
-
-            meta = {
-              description = ''HTML helpers for Scrivener'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/mgwidmann/scrivener_html";
-            };
-          }
-      ) {};
-
-    scrivener_html = scrivener_html_1_0_9;
-
     seat_json_0_0_18 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "seat_json";
             version = "0.0.18";
             src = fetchHex {
@@ -42277,120 +25070,15 @@ let
               description = ''Simple Elixir Api Testing lib'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     seat_json = seat_json_0_0_18;
 
-    sec_company_filings_rss_feed_parser_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, floki_0_7_2 }:
-          buildMix {
-            name = "sec_company_filings_rss_feed_parser";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "sec_company_filings_rss_feed_parser";
-              version = "0.0.2";
-              sha256 =
-                "b9c07c900a0afd5d8b4df68d4673d6fbb30ff50fe93579bab5133b748dde90a2";
-            };
-            beamDeps  = [ floki_0_7_2 ];
-
-            meta = {
-              longDescription = ''XML Parser for a Company`s SEC Filings Feed
-                                An example of such a feed can be found here:
-                                https://www.sec.gov/cgi-bin/browse-edgar?action=getcompany&CIK=0001418091&CIK=0001418091&type=&dateb=&owner=exclude&start=0&count=40&output=atom'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/vikram7/sec_company_filings_rss_feed_parser";
-            };
-          }
-      ) {};
-
-    sec_company_filings_rss_feed_parser =
-      sec_company_filings_rss_feed_parser_0_0_2;
-
-    sec_recent_filings_rss_feed_parser_0_0_3 = callPackage
-      (
-        {  buildMix, fetchHex, floki_0_7_2 }:
-          buildMix {
-            name = "sec_recent_filings_rss_feed_parser";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "sec_recent_filings_rss_feed_parser";
-              version = "0.0.3";
-              sha256 =
-                "e58bc230abd16e972fc49e25db63afd5d2b7aa5b03c9c2d31f03bbd311ec7cee";
-            };
-            beamDeps  = [ floki_0_7_2 ];
-
-            meta = {
-              longDescription = ''XML Parser for the SEC`s Latest Filings Feed
-                                An example of such a feed can be found here:
-                                https://www.sec.gov/cgi-bin/browse-edgar?action=getcurrent&CIK=&type=10-K&company=&dateb=&owner=include&start=0&count=40&output=atom'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/vikram7/sec_latest_filings_rss_feed_parser";
-            };
-          }
-      ) {};
-
-    sec_recent_filings_rss_feed_parser =
-      sec_recent_filings_rss_feed_parser_0_0_3;
-
-    secure_headers_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, plug_1_1_3, pipe_0_0_2 }:
-          buildMix {
-            name = "secure_headers";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "secure_headers";
-              version = "0.0.1";
-              sha256 =
-                "df5ffa08c91a270da9a167edac6181c87a8467e7c98d65651bd6b1c928e75cb1";
-            };
-            beamDeps  = [ plug_1_1_3 pipe_0_0_2 ];
-
-            meta = {
-              description = ''HTTP Security Headers for Phoenix or Plug'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/anotherhale/secure_headers";
-            };
-          }
-      ) {};
-
-    secure_headers = secure_headers_0_0_1;
-
-    secure_password_0_4_0 = callPackage
-      (
-        {  buildMix, fetchHex, ecto_0_2_7, comeonin_2_3_0 }:
-          buildMix {
-            name = "secure_password";
-            version = "0.4.0";
-            src = fetchHex {
-              pkg = "secure_password";
-              version = "0.4.0";
-              sha256 =
-                "b4f0ffe0bbac3e629356fa508438c23b6a99f6aac17a6b1f6314250e2c5a9a68";
-            };
-            beamDeps  = [ ecto_0_2_7 comeonin_2_3_0 ];
-
-            meta = {
-              description = ''A port of Rails has_secure_password for Ecto
-                            models'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/tuvistavie/ecto-secure-password";
-            };
-          }
-      ) {};
-
-    secure_password = secure_password_0_4_0;
-
     secure_random_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "secure_random";
             version = "0.1.1";
             src = fetchHex {
@@ -42407,13 +25095,13 @@ let
               homepage =
                 "https://github.com/patricksrobertson/secure_random.ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     secure_random_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "secure_random";
             version = "0.2.0";
             src = fetchHex {
@@ -42430,15 +25118,21 @@ let
               homepage =
                 "https://github.com/patricksrobertson/secure_random.ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     secure_random = secure_random_0_2_0;
 
     segment_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_3_1, httpotion_2_2_2 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_3_1,
+          httpotion_2_2_2
+        }:
+          buildMix ({
             name = "segment";
             version = "0.1.0";
             src = fetchHex {
@@ -42454,40 +25148,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/stueccles/analytics-elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     segment = segment_0_1_0;
 
-    select_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, mochiweb_2_12_2 }:
-          buildMix {
-            name = "select";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "select";
-              version = "0.0.1";
-              sha256 =
-                "9f579c2f342b51f6e42d414110a889c8b6a4430e49697b724ccdbbf8265853e9";
-            };
-            beamDeps  = [ mochiweb_2_12_2 ];
-
-            meta = {
-              longDescription = ''An Elixir library to extract useful data from
-                                HTML documents, suitable for web scraping.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/utkarshkukreti/select.ex";
-            };
-          }
-      ) {};
-
-    select = select_0_0_1;
-
     semver_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "semver";
             version = "0.1.2";
             src = fetchHex {
@@ -42503,41 +25172,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/lee-dohm/semver";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     semver = semver_0_1_2;
 
-    sendgrid_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "sendgrid";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "sendgrid";
-              version = "0.0.2";
-              sha256 =
-                "b9f27a1ae636688941998174b8595d9a5a4b24b870019f8a0009202f919bf151";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''A wrapper for SendGrid`s API to create composable
-                            emails.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/alexgaribay/sendgrid_elixir
-";
-            };
-          }
-      ) {};
-
-    sendgrid = sendgrid_0_0_2;
-
     sentient_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
+          buildMix ({
             name = "sentient";
             version = "0.0.2";
             src = fetchHex {
@@ -42553,196 +25196,15 @@ let
                             wordlist'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     sentient = sentient_0_0_2;
 
-    sentinel_0_1_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          ueberauth_0_2_0,
-          secure_random_0_2_0,
-          postgrex_0_11_1,
-          phoenix_1_1_4,
-          jose_1_7_3,
-          guardian_db_0_4_0,
-          guardian_0_10_1,
-          ex_doc_0_11_4,
-          ecto_2_0_0_beta_2,
-          earmark_0_2_1,
-          cowboy_1_0_4,
-          comeonin_2_3_0
-        }:
-          buildMix {
-            name = "sentinel";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "sentinel";
-              version = "0.1.0";
-              sha256 =
-                "8fd20d50c00a9a431308e13aac5910e46d44b347e9bb5147f83da25c768bff82";
-            };
-            beamDeps  = [
-                          ueberauth_0_2_0
-                          secure_random_0_2_0
-                          postgrex_0_11_1
-                          phoenix_1_1_4
-                          jose_1_7_3
-                          guardian_db_0_4_0
-                          guardian_0_10_1
-                          ex_doc_0_11_4
-                          ecto_2_0_0_beta_2
-                          earmark_0_2_1
-                          cowboy_1_0_4
-                          comeonin_2_3_0
-                        ];
-
-            meta = {
-              longDescription = ''Adds helpful extras to Guardian like default
-                                mailer support, as well as out of the box
-                                controllers and routes'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/britton-jb/sentinel";
-            };
-          }
-      ) {};
-
-    sentinel = sentinel_0_1_0;
-
-    sentry_0_3_2 = callPackage
-      (
-        {  buildMix, fetchHex, ecto_2_0_0_beta_2, comeonin_1_6_0 }:
-          buildMix {
-            name = "sentry";
-            version = "0.3.2";
-            src = fetchHex {
-              pkg = "sentry";
-              version = "0.3.2";
-              sha256 =
-                "fd4aa8c6b5d51b85e452a01292fbd437dfbfc5d37515c13f4a9a94441dc89609";
-            };
-            beamDeps  = [ ecto_2_0_0_beta_2 comeonin_1_6_0 ];
-
-            meta = {
-              description = ''Simplified authentication and authorization
-                            package for Phoenix'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/imranismail/sentry";
-            };
-          }
-      ) {};
-
-    sentry = sentry_0_3_2;
-
-    sequences_1_1_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "sequences";
-            version = "1.1.0";
-            src = fetchHex {
-              pkg = "sequences";
-              version = "1.1.0";
-              sha256 =
-                "e087e078b8813052213d0812b4fe1d8ffbdbdf7d6379c174b78cfd22b9058fb0";
-            };
-
-            meta = {
-              longDescription = ''The Sequences module defines multiple methods
-                                that return a Stream of numbers, usually
-                                integers. The different Streams can be tapped in
-                                on-demand, by running any `Enum` function on
-                                them. For efficiency, these sequences are
-                                calculated in a way that re-uses previously
-                                calculated results whenever possible. List of
-                                included sequences: •
-                                Sequences.integers(start, step): a helper
-                                function to create any kind of lazy integer
-                                sequence with a regular step distance. •
-                                Sequences.integers •
-                                Sequences.positive_integers •
-                                Sequences.odd_integers •
-                                Sequences.even_integers • Sequences.zeroes •
-                                Sequences.ones • Sequences.factorials •
-                                Sequences.fibonacci • Sequences.catalan •
-                                Sequences.triangular • Sequences.primes •
-                                Sequences.squareroot_tuple(n): Returns a tuple
-                                with an integer part (single integer number) and
-                                decimal part (digit stream) •
-                                Sequences.squareroot_tuple(n, num_of_digits):
-                                Returns a tuple with an integer part (single
-                                integer number) and decimal part (digit list
-                                with given length) •
-                                Sequences.squareroot_decimals(n): Returns
-                                decimal stream of the decimal expansion of a
-                                square root. •
-                                Sequences.squareroot_expansion/1: Returns a
-                                digit stream of the decimal expansion of a
-                                square root, including the digits of the
-                                integral part at the front.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/Qqwy/elixir-sequences";
-            };
-          }
-      ) {};
-
-    sequences = sequences_1_1_0;
-
-    serial_0_1_2 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "serial";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "serial";
-              version = "0.1.2";
-              sha256 =
-                "c0aed287f565b7ce1e1091a6a3dd08fd99bf0884c81b53ecf978c502ef652231";
-            };
-
-            meta = {
-              description = ''Serial communication through Elixir ports'';
-              license = stdenv.lib.licenses.isc;
-              homepage = "https://github.com/bitgamma/elixir_serial";
-            };
-          }
-      ) {};
-
-    serial = serial_0_1_2;
-
-    service_1_5_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, cloudi_core_1_5_1 }:
-          buildRebar3 {
-            name = "service";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "service";
-              version = "1.5.1";
-              sha256 =
-                "283d29bee5e2170a08c1eccb87f89368e9ce831cc52fb0715ed811f43847d2f8";
-            };
-
-            beamDeps  = [ cloudi_core_1_5_1 ];
-
-            meta = {
-              description = ''Erlang/Elixir Cloud Framework Service Behavior'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "http://cloudi.org";
-            };
-          }
-      ) {};
-
-    service = service_1_5_1;
-
     setup_1_7_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "setup";
             version = "1.7.0";
             src = fetchHex {
@@ -42758,15 +25220,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/uwiger/setup";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     setup = setup_1_7_0;
 
     sfmt_0_12_7 = callPackage
       (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
+        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
+          buildErlangMk ({
             name = "sfmt";
             version = "0.12.7";
             src = fetchHex {
@@ -42782,13 +25244,13 @@ let
               license = stdenv.lib.licenses.bsd2;
               homepage = "https://github.com/jj1bdx/sfmt-erlang/";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     sfmt_0_13_0 = callPackage
       (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
+        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
+          buildErlangMk ({
             name = "sfmt";
             version = "0.13.0";
             src = fetchHex {
@@ -42804,15 +25266,15 @@ let
               license = stdenv.lib.licenses.bsd2;
               homepage = "https://github.com/jj1bdx/sfmt-erlang/";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     sfmt = sfmt_0_13_0;
 
     sfsobject_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "sfsobject";
             version = "0.0.3";
             src = fetchHex {
@@ -42827,15 +25289,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/splattael/sfsobject";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     sfsobject = sfsobject_0_0_3;
 
     sh_1_1_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "sh";
             version = "1.1.2";
             src = fetchHex {
@@ -42850,15 +25312,15 @@ let
               license = stdenv.lib.licenses.unlicense;
               homepage = "https://github.com/devinus/sh";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     sh = sh_1_1_2;
 
     shameless_plug_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "shameless_plug";
             version = "1.0.0";
             src = fetchHex {
@@ -42870,20 +25332,20 @@ let
             beamDeps  = [ plug_1_1_3 ];
 
             meta = {
-              description = ''A novelty Plug to remove the word "shame" from
+              description = ''A novelty Plug to remove the word \"shame\" from
                             the page body.'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/henrik/shameless_plug";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     shameless_plug = shameless_plug_1_0_0;
 
     shape_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "shape";
             version = "0.0.2";
             src = fetchHex {
@@ -42899,15 +25361,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/prio/shape";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     shape = shape_0_0_2;
 
     short_maps_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "short_maps";
             version = "0.1.1";
             src = fetchHex {
@@ -42923,15 +25385,17 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/whatyouhide/short_maps";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     short_maps = short_maps_0_1_1;
 
     shotgun_0_2_2 = callPackage
       (
-        {  buildErlangMk, fetchHex, gun_1_0_0_pre_1 }:
-          buildErlangMk {
+        {
+          buildErlangMk, packageOverrides ? {}, fetchHex, gun_1_0_0_pre_1
+        }:
+          buildErlangMk ({
             name = "shotgun";
             version = "0.2.2";
             src = fetchHex {
@@ -42947,13 +25411,19 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/inaka/shotgun";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     shotgun_0_2_3 = callPackage
       (
-        {  buildErlangMk, fetchHex, gun_1_0_0_pre_1, cowlib_1_0_2 }:
-          buildErlangMk {
+        {
+          buildErlangMk,
+          packageOverrides ? {},
+          fetchHex,
+          gun_1_0_0_pre_1,
+          cowlib_1_0_2
+        }:
+          buildErlangMk ({
             name = "shotgun";
             version = "0.2.3";
             src = fetchHex {
@@ -42969,15 +25439,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/inaka/shotgun";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     shotgun = shotgun_0_2_3;
 
     shouldi_0_3_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "shouldi";
             version = "0.3.0";
             src = fetchHex {
@@ -42993,15 +25463,21 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/batate/shouldi";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     shouldi = shouldi_0_3_0;
 
     shove_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, poolboy_1_5_1, poison_1_5_2 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poolboy_1_5_1,
+          poison_1_5_2
+        }:
+          buildMix ({
             name = "shove";
             version = "0.0.1";
             src = fetchHex {
@@ -43017,15 +25493,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bratsche/shove";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     shove = shove_0_0_1;
 
     shrivel_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "shrivel";
             version = "0.0.3";
             src = fetchHex {
@@ -43040,15 +25516,15 @@ let
 
               homepage = "https://github.com/Qeaql/shrivel";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     shrivel = shrivel_0_0_3;
 
     sidejob_2_0_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "sidejob";
             version = "2.0.0";
             src = fetchHex {
@@ -43076,15 +25552,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/basho/sidejob";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     sidejob = sidejob_2_0_0;
 
     sideshow_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "sideshow";
             version = "0.0.1";
             src = fetchHex {
@@ -43099,15 +25575,15 @@ let
               license = stdenv.lib.licenses.gpl3;
               homepage = "https://github.com/pavlos/sideshow";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     sideshow = sideshow_0_0_1;
 
     sidetask_1_1_0 = callPackage
       (
-        {  buildMix, fetchHex, sidejob_2_0_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, sidejob_2_0_0 }:
+          buildMix ({
             name = "sidetask";
             version = "1.1.0";
             src = fetchHex {
@@ -43132,15 +25608,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/MSch/sidetask";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     sidetask = sidetask_1_1_0;
 
     signaturex_1_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "signaturex";
             version = "1.0.1";
             src = fetchHex {
@@ -43156,15 +25632,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/edgurgel/signaturex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     signaturex = signaturex_1_0_1;
 
     simetric_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "simetric";
             version = "0.1.0";
             src = fetchHex {
@@ -43181,15 +25657,15 @@ let
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/lexmag/simetric";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     simetric = simetric_0_1_0;
 
     simple_agent_0_0_7 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "simple_agent";
             version = "0.0.7";
             src = fetchHex {
@@ -43206,15 +25682,15 @@ let
               homepage =
                 "https://github.com/TheFirstAvenger/elixir-simple_agent.git";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     simple_agent = simple_agent_0_0_7;
 
     simple_bar_0_0_7 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "simple_bar";
             version = "0.0.7";
             src = fetchHex {
@@ -43229,39 +25705,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/jeffreybaird/simple_bar";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     simple_bar = simple_bar_0_0_7;
 
-    simple_format_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, phoenix_html_2_5_1 }:
-          buildMix {
-            name = "simple_format";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "simple_format";
-              version = "0.1.0";
-              sha256 =
-                "747cc74f743f89bcced219282f8639743f679b65183defecc7721f46e31dfcd0";
-            };
-            beamDeps  = [ phoenix_html_2_5_1 ];
-
-            meta = {
-              description = ''Rail`s simple_format helper for Phoenix.HTML'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/michalmuskala/simple_format";
-            };
-          }
-      ) {};
-
-    simple_format = simple_format_0_1_0;
-
     simple_secrets_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex, pkcs7_1_0_2, msgpax_0_8_2 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          pkcs7_1_0_2,
+          msgpax_0_8_2
+        }:
+          buildMix ({
             name = "simple_secrets";
             version = "1.0.0";
             src = fetchHex {
@@ -43278,7 +25736,7 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/camshaft/simple_secrets_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     simple_secrets = simple_secrets_1_0_0;
@@ -43287,6 +25745,7 @@ let
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           timex_1_0_2,
           sweet_xml_0_6_1,
@@ -43294,7 +25753,7 @@ let
           ibrowse_4_2_2,
           httpotion_2_2_2
         }:
-          buildMix {
+          buildMix ({
             name = "simplex";
             version = "0.4.0";
             src = fetchHex {
@@ -43317,42 +25776,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/adamkittelson/simplex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     simplex = simplex_0_4_0;
 
-    simplify_0_2_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, geo_1_0_1, distance_0_1_2 }:
-          buildMix {
-            name = "simplify";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "simplify";
-              version = "0.2.0";
-              sha256 =
-                "1b1af67f19e3a6589361665f4ca80e27873107bc9ef579e08fce43e52f62cffd";
-            };
-            beamDeps  = [ poison_2_1_0 geo_1_0_1 distance_0_1_2 ];
-
-            meta = {
-              longDescription = ''Implementation of the
-                                Ramer–Douglas–Peucker algorithm for reducing
-                                the number of points used to represent a
-                                curve.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/pkinney/simplify_ex";
-            };
-          }
-      ) {};
-
-    simplify = simplify_0_2_0;
-
     simpre_0_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "simpre";
             version = "0.1.0";
             src = fetchHex {
@@ -43367,69 +25799,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/yuce/simpre.git";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     simpre = simpre_0_1_0;
 
-    siphash_3_0_0 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "siphash";
-            version = "3.0.0";
-            src = fetchHex {
-              pkg = "siphash";
-              version = "3.0.0";
-              sha256 =
-                "91b8efc8f3e26713c1bb91a91c9b6a8f6a5f949986622b1d548e8fee1cde7347";
-            };
-
-            meta = {
-              description = ''Elixir implementation of the SipHash hash
-                            family'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/zackehh/siphash-elixir";
-            };
-          }
-      ) {};
-
-    siphash = siphash_3_0_0;
-
-    sips_downloader_0_2_2 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          httpoison_0_8_2,
-          html_entities_0_3_0,
-          floki_0_8_0
-        }:
-          buildMix {
-            name = "sips_downloader";
-            version = "0.2.2";
-            src = fetchHex {
-              pkg = "sips_downloader";
-              version = "0.2.2";
-              sha256 =
-                "358d10e61f2d8b03e644194d09f1ca6c9c339bb9c80371eba21576571a857f94";
-            };
-            beamDeps  = [ httpoison_0_8_2 html_entities_0_3_0 floki_0_8_0 ];
-
-            meta = {
-              description = ''Automatically download new ElixirSips episodes'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/DavsX/SipsDownloader";
-            };
-          }
-      ) {};
-
-    sips_downloader = sips_downloader_0_2_2;
-
     skills_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "skills";
             version = "0.0.1";
             src = fetchHex {
@@ -43445,185 +25823,15 @@ let
               license = stdenv.lib.licenses.mpl20;
               homepage = "https://github.com/folz/skills.ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     skills = skills_0_0_1;
 
-    skroutz_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "skroutz";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "skroutz";
-              version = "0.1.0";
-              sha256 =
-                "af54cd490adf503f378f57806b4c12bbd2506fa24f6e4f7c1cbceaf8c86d2b51";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Elixir library for accessing the Skroutz API'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/skroutz/skroutz.ex";
-            };
-          }
-      ) {};
-
-    skroutz = skroutz_0_1_0;
-
-    slack_0_3_0 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_7_5, exjsx_3_1_0 }:
-          buildMix {
-            name = "slack";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "slack";
-              version = "0.3.0";
-              sha256 =
-                "43983932db6460a915822e12a0d499df5380804184bae3c170f9f918670f5454";
-            };
-            beamDeps  = [ httpoison_0_7_5 exjsx_3_1_0 ];
-
-            meta = {
-              description = ''A Slack Real Time Messaging API client.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/BlakeWilliams/Elixir-Slack";
-            };
-          }
-      ) {};
-
-    slack_0_4_2 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_1_0 }:
-          buildMix {
-            name = "slack";
-            version = "0.4.2";
-            src = fetchHex {
-              pkg = "slack";
-              version = "0.4.2";
-              sha256 =
-                "a32ced7527706b6adaae428eb03836260bdcf560be6ef92662ea6ec1541e687f";
-            };
-            beamDeps  = [ httpoison_0_8_2 exjsx_3_1_0 ];
-
-            meta = {
-              description = ''A Slack Real Time Messaging API client.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/BlakeWilliams/Elixir-Slack";
-            };
-          }
-      ) {};
-
-    slack = slack_0_4_2;
-
-    slack_logger_backend_0_1_3 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "slack_logger_backend";
-            version = "0.1.3";
-            src = fetchHex {
-              pkg = "slack_logger_backend";
-              version = "0.1.3";
-              sha256 =
-                "12e9809e981abb0243f1fe72a4cb331142d9d3ce4425822c28f5b3d51ed7a5fe";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''A logger backend for posting errors to Slack.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/craigp/slack_logger_backend";
-            };
-          }
-      ) {};
-
-    slack_logger_backend = slack_logger_backend_0_1_3;
-
-    slack_webhook_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_7_5 }:
-          buildMix {
-            name = "slack_webhook";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "slack_webhook";
-              version = "0.0.2";
-              sha256 =
-                "7099c22a5b07fd47914a5336469e3696ebe5d5402798ba1e06eec7287d5551ad";
-            };
-            beamDeps  = [ httpoison_0_7_5 ];
-
-            meta = {
-              description = ''Sends simple messages to Slack channel using
-                            webhook API.'';
-              license = stdenv.lib.licenses.cc0;
-              homepage = "https://github.com/remiq/slack_webhook";
-            };
-          }
-      ) {};
-
-    slack_webhook = slack_webhook_0_0_2;
-
-    slacker_0_0_2 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_1_5_2, inflex_1_0_0, httpoison_0_8_2
-        }:
-          buildMix {
-            name = "slacker";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "slacker";
-              version = "0.0.2";
-              sha256 =
-                "4d3a110772e7b273a6d771bf4bc869fd13cb3bb9e99bca8f038e58d384f0ef1b";
-            };
-            beamDeps  = [ poison_1_5_2 inflex_1_0_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''A bot library for the Slack chat service.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/koudelka/slacker";
-            };
-          }
-      ) {};
-
-    slacker = slacker_0_0_2;
-
-    slackex_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_2_0 }:
-          buildMix {
-            name = "slackex";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "slackex";
-              version = "0.0.1";
-              sha256 =
-                "bdd1d523cd576ff054ed3eee4efe22eee87ded127054332ca5a3bc1d6a997f33";
-            };
-            beamDeps  = [ httpoison_0_8_2 exjsx_3_2_0 ];
-
-            meta = {
-              longDescription = ''A Slack wrapper for Elixir Requires an active
-                                account with Slack (http://slack.com).'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/davidstump/slackex";
-            };
-          }
-      ) {};
-
-    slackex = slackex_0_0_1;
-
     slim_fast_0_10_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "slim_fast";
             version = "0.10.0";
             src = fetchHex {
@@ -43639,15 +25847,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/doomspork/slim_fast";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     slim_fast = slim_fast_0_10_0;
 
     slime_0_12_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "slime";
             version = "0.12.2";
             src = fetchHex {
@@ -43663,40 +25871,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/slime-lang/slime";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     slime = slime_0_12_2;
 
-    slp_0_0_2 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "slp";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "slp";
-              version = "0.0.2";
-              sha256 =
-                "27e5f7330c7ce631f16e3ec5781b31cbb2247d2bcdeab1e979a66dcc4397bd77";
-            };
-
-            meta = {
-              longDescription = ''An Elixir application for using the Service
-                                Location Protocol. SLP is a commonly used
-                                service discovery protocol.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/stuart/elixir_slp";
-            };
-          }
-      ) {};
-
-    slp = slp_0_0_2;
-
     slugerl_1_0_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "slugerl";
             version = "1.0.0";
             src = fetchHex {
@@ -43706,20 +25889,23 @@ let
                 "5a06364270afb773b32a7a4e05cf9cb4ccf904faedb2825d7336f3065e4f791b";
             };
 
+            buildPlugins  = [ rebar3_hex ];
+
+
             meta = {
               description = ''slugify'';
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/thraxil/slugerl";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     slugerl = slugerl_1_0_0;
 
     slugger_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "slugger";
             version = "0.1.0";
             src = fetchHex {
@@ -43736,39 +25922,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/h4cc/slugger";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     slugger = slugger_0_1_0;
 
-    smex_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, murmur_0_2_1, amqp_0_1_4 }:
-          buildMix {
-            name = "smex";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "smex";
-              version = "0.0.1";
-              sha256 =
-                "3a84a2b3b3f09965bb0c2d57d04ba435b33c47319ee308feb4a182ddd9e69867";
-            };
-            beamDeps  = [ murmur_0_2_1 amqp_0_1_4 ];
-
-            meta = {
-              description = ''An Elixir library for simplifying the sending of
-                            protocol buffers over rabbitmq.'';
-
-            };
-          }
-      ) {};
-
-    smex = smex_0_0_1;
-
     smurf_0_1_3 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "smurf";
             version = "0.1.3";
             src = fetchHex {
@@ -43783,132 +25945,17 @@ let
               license = stdenv.lib.licenses.cddl;
               homepage = "https://github.com/project-fifo/smurf";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     smurf = smurf_0_1_3;
 
-    snappy_1_1_1 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "snappy";
-            version = "1.1.1";
-            src = fetchHex {
-              pkg = "snappy";
-              version = "1.1.1";
-              sha256 =
-                "7faed3ec6bcac363c2a6f09b4f000a12c8166b42b3bf70228d532f8afcfbcb6a";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''snappy compressor/decompressor Erlang NIF
-                            wrapper'';
-
-              homepage = "https://github.com/barrel-db/snappy";
-            };
-          }
-      ) {};
-
-    snappy = snappy_1_1_1;
-
-    snowflake_client_0_1_1 = callPackage
-      (
-        {  buildMix, fetchHex, oauth2_0_6_0 }:
-          buildMix {
-            name = "snowflake_client";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "snowflake_client";
-              version = "0.1.1";
-              sha256 =
-                "94b21c7ad47775ef5853399e22ba2f8a91d8e174ca3a1da4e2fea05dfad12459";
-            };
-            beamDeps  = [ oauth2_0_6_0 ];
-
-            meta = {
-              description = ''A OAuth 2.0 client for Snowflake.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/IoraHealth/snowflake_client";
-            };
-          }
-      ) {};
-
-    snowflake_client = snowflake_client_0_1_1;
-
-    socket_0_2_8 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "socket";
-            version = "0.2.8";
-            src = fetchHex {
-              pkg = "socket";
-              version = "0.2.8";
-              sha256 =
-                "dc711caa318c31eea35e0cfec62e9a376fda6c1365356de59d9a78a4ebb635c9";
-            };
-
-            meta = {
-              description = ''Socket handling library for Elixir'';
-              license = stdenv.lib.licenses.wtfpl;
-              homepage = "https://github.com/meh/elixir-socket";
-            };
-          }
-      ) {};
-
-    socket_0_3_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "socket";
-            version = "0.3.1";
-            src = fetchHex {
-              pkg = "socket";
-              version = "0.3.1";
-              sha256 =
-                "f016b4e0c2643926cce846b6a744b0cd7c8352106052dcb7c396bf1b7f55d21c";
-            };
-
-            meta = {
-              description = ''Socket handling library for Elixir'';
-              license = stdenv.lib.licenses.wtfpl;
-              homepage = "https://github.com/meh/elixir-socket";
-            };
-          }
-      ) {};
-
-    socket = socket_0_3_1;
-
-    sonic_0_1_3 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, hackney_1_6_0 }:
-          buildMix {
-            name = "sonic";
-            version = "0.1.3";
-            src = fetchHex {
-              pkg = "sonic";
-              version = "0.1.3";
-              sha256 =
-                "2bf88f0e86cf04db4b426569153f26fd41f6202aee1e9175e0a242eb5a0a0586";
-            };
-            beamDeps  = [ poison_2_1_0 hackney_1_6_0 ];
-
-            meta = {
-              description = ''etcd library and bindings for Elixir.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/heroiclabs/sonic";
-            };
-          }
-      ) {};
-
-    sonic = sonic_0_1_3;
-
     sorted_set_1_1_0 = callPackage
       (
-        {  buildMix, fetchHex, red_black_tree_1_2_0 }:
-          buildMix {
+        {
+          buildMix, packageOverrides ? {}, fetchHex, red_black_tree_1_2_0
+        }:
+          buildMix ({
             name = "sorted_set";
             version = "1.1.0";
             src = fetchHex {
@@ -43924,15 +25971,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/SenecaSystems/sorted_set";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     sorted_set = sorted_set_1_1_0;
 
     spaceapi_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
+          buildMix ({
             name = "spaceapi";
             version = "0.1.2";
             src = fetchHex {
@@ -43949,40 +25996,21 @@ let
               license = with stdenv.lib.licenses; [ mit gpl3 ];
               homepage = "https://github.com/geistesk/spaceapi";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     spaceapi = spaceapi_0_1_2;
 
-    spaced_repetitions_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, timex_0_16_2 }:
-          buildMix {
-            name = "spaced_repetitions";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "spaced_repetitions";
-              version = "0.0.1";
-              sha256 =
-                "67e846a7fe32d7ab5b10373dd9f80eccccacc05ad2b9f3e6ca3de09da8b8abc5";
-            };
-            beamDeps  = [ timex_0_16_2 ];
-
-            meta = {
-              description = ''Spaced repetitions library with basic sm2
-                            implementation'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/mrluc/exreps";
-            };
-          }
-      ) {};
-
-    spaced_repetitions = spaced_repetitions_0_0_1;
-
     spacesaving_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, earmark_0_2_1, dialyze_0_2_1 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          earmark_0_2_1,
+          dialyze_0_2_1
+        }:
+          buildMix ({
             name = "spacesaving";
             version = "0.0.3";
             src = fetchHex {
@@ -43995,19 +26023,25 @@ let
 
             meta = {
               description = ''stream count distinct element estimation using
-                            the "space saving" algorithm.'';
+                            the \"space saving\" algorithm.'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/rozap/spacesaving";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     spacesaving = spacesaving_0_0_3;
 
     sparkpost_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_5_2, httpotion_2_2_2 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_5_2,
+          httpotion_2_2_2
+        }:
+          buildMix ({
             name = "sparkpost";
             version = "0.1.0";
             src = fetchHex {
@@ -44024,59 +26058,21 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/SparkPost/elixir-sparkpost";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     sparkpost = sparkpost_0_1_0;
 
-    spawndir_0_1_1 = callPackage
-      (
-        {  buildMix, fetchHex, exrm_0_14_2 }:
-          buildMix {
-            name = "spawndir";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "spawndir";
-              version = "0.1.1";
-              sha256 =
-                "c407c9eb1f6f8ebb622df28b2f19a34447add6555f87208446a458b60ea9750c";
-            };
-            beamDeps  = [ exrm_0_14_2 ];
-
-            meta = {
-              longDescription = ''# SpawnDir Spawns commands from the file
-                                system. This exists to provide a simple
-                                mechanism for spawning and managing processes:
-                                simply add an executable, or a symbolic link to
-                                one, to a monitored directory. The config allows
-                                arguments to be specified by file or directory.
-                                While not as flexible as upstart, monit, et al.,
-                                SpawnDir`s use of the filesystem provides a
-                                simpler UNIX-ish interface. ## Usage To use the
-                                escript executable: ./spawndir DIR [ARGS ...]
-                                where `DIR` is the directory to be monitored,
-                                and each command will be started with the
-                                supplied `ARGS` To run using mix: mix run
-                                --no-halt You can configure what is watched via
-                                the `:spawndir` application environment
-                                variables: :default_opts :: [opt] :watch :: [cmd
-                                | {cmd, [opt]}] where opt :: string() cmd ::
-                                string() ## Future Additions - Check for
-                                executable flag - Package installation - Monitor
-                                filesystem for commands being added/removed
-                                Copyright (c) Thomas Moulia, 2014 '';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/jtmoulia/spawndir";
-            };
-          }
-      ) {};
-
-    spawndir = spawndir_0_1_1;
-
     spell_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_4_0, msgpax_0_8_2 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_4_0,
+          msgpax_0_8_2
+        }:
+          buildMix ({
             name = "spell";
             version = "0.1.0";
             src = fetchHex {
@@ -44094,15 +26090,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/MyMedsAndMe/spell";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     spell = spell_0_1_0;
 
     spf_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "spf";
             version = "0.0.1";
             src = fetchHex {
@@ -44117,15 +26113,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/hex-sh/spf";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     spf = spf_0_0_1;
 
     spherical_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "spherical";
             version = "0.0.1";
             src = fetchHex {
@@ -44140,65 +26136,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/arpunk/spherical";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     spherical = spherical_0_0_1;
 
-    spirit_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, plug_0_14_0, cowboy_1_0_4 }:
-          buildMix {
-            name = "spirit";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "spirit";
-              version = "0.0.1";
-              sha256 =
-                "ffaa22ccfd4999eacaee60464eb494bb9da597a8dad0dcad575fb506e06ee3b6";
-            };
-            beamDeps  = [ poison_1_5_2 plug_0_14_0 cowboy_1_0_4 ];
-
-            meta = {
-              description = ''Elixir microframework for web development.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/emancu/spirit";
-            };
-          }
-      ) {};
-
-    spirit = spirit_0_0_1;
-
-    spotify_ex_0_0_4 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_1_5_2, plug_1_1_3, httpoison_0_8_2
-        }:
-          buildMix {
-            name = "spotify_ex";
-            version = "0.0.4";
-            src = fetchHex {
-              pkg = "spotify_ex";
-              version = "0.0.4";
-              sha256 =
-                "f2e8647410096d34d9baecf8d9622896214320641ed72c11c711f9a463e4a961";
-            };
-            beamDeps  = [ poison_1_5_2 plug_1_1_3 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''An Elixir wrapper for Spotify API O-Auth.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://www.github.com/jsncmgs1/spotify_ex";
-            };
-          }
-      ) {};
-
-    spotify_ex = spotify_ex_0_0_4;
-
     spout_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "spout";
             version = "0.0.1";
             src = fetchHex {
@@ -44214,257 +26160,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/Stratus3D/Spout";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     spout = spout_0_0_1;
 
-    spreedly_0_1_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "spreedly";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "spreedly";
-              version = "0.1.1";
-              sha256 =
-                "a8aa76698a4fe95cb4c5cb77be2cfc4e085685570aacb25382fffdca4c7e1a6f";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''A wrapper for the Spreedly API.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/duff/spreedly-elixir";
-            };
-          }
-      ) {};
-
-    spreedly = spreedly_0_1_1;
-
-    sql_dust_0_3_2 = callPackage
-      (
-        {  buildMix, fetchHex, inflex_1_5_0, ecto_2_0_0_beta_2 }:
-          buildMix {
-            name = "sql_dust";
-            version = "0.3.2";
-            src = fetchHex {
-              pkg = "sql_dust";
-              version = "0.3.2";
-              sha256 =
-                "58282299f10ac2cd2684f043052e0186979cf886d2a9e788d0555d9ef19c7bad";
-            };
-            beamDeps  = [ inflex_1_5_0 ecto_2_0_0_beta_2 ];
-
-            meta = {
-              longDescription = ''Easy. Simple. Powerful. Generate (complex)
-                                SQL queries using magical Elixir SQL dust.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bettyblocks/sql_dust";
-            };
-          }
-      ) {};
-
-    sql_dust = sql_dust_0_3_2;
-
-    sqlite3_1_1_5 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "sqlite3";
-            version = "1.1.5";
-            src = fetchHex {
-              pkg = "sqlite3";
-              version = "1.1.5";
-              sha256 =
-                "fc2beb8b09deec6cf68bd6203ecf28bf827d2073915bc7131c9cd56d5ff27260";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''SQLite3 Interface'';
-              license = stdenv.lib.licenses.epl10;
-              homepage = "https://github.com/processone/erlang-sqlite3";
-            };
-          }
-      ) {};
-
-    sqlite3 = sqlite3_1_1_5;
-
-    sqlite_ecto_0_5_0 = callPackage
-      (
-        {
-          buildMix, fetchHex, sqlitex_0_8_3, poison_1_5_2, ecto_0_15_0
-        }:
-          buildMix {
-            name = "sqlite_ecto";
-            version = "0.5.0";
-            src = fetchHex {
-              pkg = "sqlite_ecto";
-              version = "0.5.0";
-              sha256 =
-                "cb26ae002ee444aa9b12d680ec11570204ba128631ccd7d2d6d3aafcd521880e";
-            };
-            beamDeps  = [ sqlitex_0_8_3 poison_1_5_2 ecto_0_15_0 ];
-
-            meta = {
-              description = ''SQLite3 adapter for Ecto'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jazzyb/sqlite_ecto";
-            };
-          }
-      ) {};
-
-    sqlite_ecto_1_1_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          sqlitex_0_8_3,
-          poison_1_5_2,
-          ecto_2_0_0_beta_2
-        }:
-          buildMix {
-            name = "sqlite_ecto";
-            version = "1.1.0";
-            src = fetchHex {
-              pkg = "sqlite_ecto";
-              version = "1.1.0";
-              sha256 =
-                "88951b424e909d8047f0d03c13418c321df9e94560ac30241d8b1f7e48f49201";
-            };
-            beamDeps  = [ sqlitex_0_8_3 poison_1_5_2 ecto_2_0_0_beta_2 ];
-
-            meta = {
-              description = ''SQLite3 adapter for Ecto'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jazzyb/sqlite_ecto";
-            };
-          }
-      ) {};
-
-    sqlite_ecto = sqlite_ecto_1_1_0;
-
-    sqlitex_0_8_3 = callPackage
-      (
-        {
-          buildMix, fetchHex, pipe_0_0_2, esqlite_0_2_2, decimal_1_1_1
-        }:
-          buildMix {
-            name = "sqlitex";
-            version = "0.8.3";
-            src = fetchHex {
-              pkg = "sqlitex";
-              version = "0.8.3";
-              sha256 =
-                "44daaeb135178165d0a6cd6754e4af05e56e5d2943c0b1108df7df718745ec0f";
-            };
-            beamDeps  = [ pipe_0_0_2 esqlite_0_2_2 decimal_1_1_1 ];
-
-            meta = {
-              description = ''A thin Elixir wrapper around esqlite'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/mmmries/sqlitex";
-            };
-          }
-      ) {};
-
-    sqlitex_1_0_0 = callPackage
-      (
-        {  buildMix, fetchHex, esqlite_0_2_2, decimal_1_1_1 }:
-          buildMix {
-            name = "sqlitex";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "sqlitex";
-              version = "1.0.0";
-              sha256 =
-                "cbd7310e900841aa2dc6071b497330e730de1cd9618003006e0af48afb24d5f8";
-            };
-            beamDeps  = [ esqlite_0_2_2 decimal_1_1_1 ];
-
-            meta = {
-              description = ''A thin Elixir wrapper around esqlite'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/mmmries/sqlitex";
-            };
-          }
-      ) {};
-
-    sqlitex = sqlitex_1_0_0;
-
-    ssdb_0_3_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "ssdb";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "ssdb";
-              version = "0.3.0";
-              sha256 =
-                "a6b71533949a38ef193ccded89d620d2b6808b1b55a2e0f16dae7e1abad9874f";
-            };
-
-            meta = {
-              description = ''SSDB client for Elixir'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/lidashuang/ssdb-elixir";
-            };
-          }
-      ) {};
-
-    ssdb = ssdb_0_3_0;
-
-    ssdb_elixir_0_2_2 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "ssdb_elixir";
-            version = "0.2.2";
-            src = fetchHex {
-              pkg = "ssdb_elixir";
-              version = "0.2.2";
-              sha256 =
-                "3aa4d2b90b4a4c0f73b1fec3e67b90dfee081bce4653f942a05857082b65bc99";
-            };
-
-            meta = {
-              description = ''SSDB client for Elixir'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/lidashuang/ssdb_elixir";
-            };
-          }
-      ) {};
-
-    ssdb_elixir = ssdb_elixir_0_2_2;
-
-    sshex_1_1_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "sshex";
-            version = "1.1.0";
-            src = fetchHex {
-              pkg = "sshex";
-              version = "1.1.0";
-              sha256 =
-                "4e4415547e9dde608d08bf7fff094b6705614a584089356ffbdb6f97821f49ff";
-            };
-
-            meta = {
-              description = ''Simple SSH helpers for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/rubencaro/sshex";
-            };
-          }
-      ) {};
-
     sshex_2_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "sshex";
             version = "2.1.0";
             src = fetchHex {
@@ -44479,84 +26183,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/rubencaro/sshex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     sshex = sshex_2_1_0;
 
-    ssl_verify_fun_1_1_0 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "ssl_verify_fun";
-            version = "1.1.0";
-            src = fetchHex {
-              pkg = "ssl_verify_fun";
-              version = "1.1.0";
-              sha256 =
-                "6c0e0d857fdb031ba67b0a791202bee116bea2313db7b649839000847591ba1e";
-            };
-
-            meta = {
-              description = ''SSL verification functions for Erlang'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/deadtrickster/ssl_verify_fun.erl";
-            };
-          }
-      ) {};
-
-    ssl_verify_fun = ssl_verify_fun_1_1_0;
-
-    ssl_verify_hostname_1_0_5 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "ssl_verify_hostname";
-            version = "1.0.5";
-            src = fetchHex {
-              pkg = "ssl_verify_hostname";
-              version = "1.0.5";
-              sha256 =
-                "f2cb11e6144e10ab39d1e14bf9fb2437b690979c70bf5428e9dc4bfaf1dfeabf";
-            };
-
-            meta = {
-              description = ''Hostname verification library for Erlang'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/deadtrickster/ssl_verify_hostname.erl";
-            };
-          }
-      ) {};
-
-    ssl_verify_hostname_1_0_6 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "ssl_verify_hostname";
-            version = "1.0.6";
-            src = fetchHex {
-              pkg = "ssl_verify_hostname";
-              version = "1.0.6";
-              sha256 =
-                "72b2fc8a8e23d77eed4441137fefa491bbf4a6dc52e9c0045f3f8e92e66243b5";
-            };
-
-            meta = {
-              description = ''Hostname verification library for Erlang'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/deadtrickster/ssl_verify_hostname.erl";
-            };
-          }
-      ) {};
-
-    ssl_verify_hostname = ssl_verify_hostname_1_0_6;
-
     stackd_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "stackd";
             version = "0.0.1";
             src = fetchHex {
@@ -44570,15 +26205,15 @@ let
               description = ''Stackd'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     stackd = stackd_0_0_1;
 
     stash_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "stash";
             version = "1.0.0";
             src = fetchHex {
@@ -44593,15 +26228,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/zackehh/stash";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     stash = stash_1_0_0;
 
     stathat_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "stathat";
             version = "0.0.3";
             src = fetchHex {
@@ -44616,39 +26251,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/travisjeffery/stathat";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     stathat = stathat_0_0_3;
 
-    statistics_0_4_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "statistics";
-            version = "0.4.0";
-            src = fetchHex {
-              pkg = "statistics";
-              version = "0.4.0";
-              sha256 =
-                "550390b85fcb32dcf2e3498b06076352aa332b0a5002830b0438bb3fdb8da37a";
-            };
-
-            meta = {
-              description = ''Functions for descriptive statistics and common
-                            distributions'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/msharp/elixir-statistics";
-            };
-          }
-      ) {};
-
-    statistics = statistics_0_4_0;
-
     statix_0_7_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "statix";
             version = "0.7.0";
             src = fetchHex {
@@ -44664,7 +26275,7 @@ let
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/lexmag/statix";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     statix = statix_0_7_0;
@@ -44673,13 +26284,14 @@ let
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           porcelain_2_0_1,
           poolboy_1_5_1,
           poison_1_5_2,
           fs_0_9_2
         }:
-          buildMix {
+          buildMix ({
             name = "std_json_io";
             version = "0.1.0";
             src = fetchHex {
@@ -44696,40 +26308,15 @@ let
                             IO servers via JSON'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     std_json_io = std_json_io_0_1_0;
 
-    steamex_0_0_5 = callPackage
-      (
-        {  buildMix, fetchHex, sweet_xml_0_6_1, httpoison_0_8_2 }:
-          buildMix {
-            name = "steamex";
-            version = "0.0.5";
-            src = fetchHex {
-              pkg = "steamex";
-              version = "0.0.5";
-              sha256 =
-                "4a290c432c0480cf372fece76cc4f09e231261fda64ef5027e8855e16aa5a2f6";
-            };
-            beamDeps  = [ sweet_xml_0_6_1 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Steam API and Auth (with Phoenix/Plug
-                            integration) for Elixir'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/antipax/steamex";
-            };
-          }
-      ) {};
-
-    steamex = steamex_0_0_5;
-
     stemex_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "stemex";
             version = "0.1.1";
             src = fetchHex {
@@ -44749,15 +26336,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/awetzel/stemex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     stemex = stemex_0_1_1;
 
     stillir_1_0_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "stillir";
             version = "1.0.0";
             src = fetchHex {
@@ -44772,87 +26359,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/heroku/stillir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     stillir = stillir_1_0_0;
 
-    stmd_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, ex_doc_0_11_4, earmark_0_2_1 }:
-          buildMix {
-            name = "stmd";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "stmd";
-              version = "0.0.2";
-              sha256 =
-                "3b45578da652e881b1974bbe836d9b8e0e8db8d6ef0042aee69340d5eaf2d9b3";
-            };
-            beamDeps  = [ ex_doc_0_11_4 earmark_0_2_1 ];
-
-            meta = {
-              description = ''[DEPRECATED] New package: cmark'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/asaaki/cmark.ex";
-            };
-          }
-      ) {};
-
-    stmd = stmd_0_0_2;
-
-    stockastic_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_2_0 }:
-          buildMix {
-            name = "stockastic";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "stockastic";
-              version = "0.0.2";
-              sha256 =
-                "f180915a21d4aa4a64f660696b77c5788334d4bae2639a58814565af0d75ca56";
-            };
-            beamDeps  = [ httpoison_0_8_2 exjsx_3_2_0 ];
-
-            meta = {
-              description = ''Simple Elixir wrapper for the Stockfighter API'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/shanewilton/stockastic";
-            };
-          }
-      ) {};
-
-    stockastic = stockastic_0_0_2;
-
-    stockfighter_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "stockfighter";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "stockfighter";
-              version = "0.0.1";
-              sha256 =
-                "d72726cf055068e2b62ef9091ec17ab9292b60bc7f4a7306c17cad6d022a3bd7";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''a simple wrapper of stockfighter http api'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/lerencao/stockfighter";
-            };
-          }
-      ) {};
-
-    stockfighter = stockfighter_0_0_1;
-
     stopwatch_0_0_7 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, timex_1_0_2 }:
+          buildMix ({
             name = "stopwatch";
             version = "0.0.7";
             src = fetchHex {
@@ -44869,39 +26384,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/matteosister/stopwatch";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     stopwatch = stopwatch_0_0_7;
 
-    strava_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "strava";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "strava";
-              version = "0.0.1";
-              sha256 =
-                "f0b50d8c65fe769c08fd97afc4e3039eb1d3d2eb324adf8a52aaaa93685723e2";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Elixir wrapper for the Strava API (V3)'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/slashdotdash/strava";
-            };
-          }
-      ) {};
-
-    strava = strava_0_0_1;
-
     stream_runner_1_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "stream_runner";
             version = "1.1.0";
             src = fetchHex {
@@ -44916,15 +26407,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/fishcakez/stream_runner";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     stream_runner = stream_runner_1_1_0;
 
     stream_weaver_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "stream_weaver";
             version = "0.0.2";
             src = fetchHex {
@@ -44938,15 +26429,15 @@ let
               description = ''Library for working with streams'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     stream_weaver = stream_weaver_0_0_2;
 
     strftimerl_0_1_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "strftimerl";
             version = "0.1.1";
             src = fetchHex {
@@ -44961,15 +26452,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/gmr/strftimerl";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     strftimerl = strftimerl_0_1_1;
 
     strict_comparison_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "strict_comparison";
             version = "0.0.1";
             src = fetchHex {
@@ -44985,119 +26476,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/antipax/strict_comparison";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     strict_comparison = strict_comparison_0_0_1;
 
-    stringprep_1_0_3 = callPackage
-      (
-        {  buildRebar3, fetchHex, p1_utils_1_0_3 }:
-          buildRebar3 {
-            name = "stringprep";
-            version = "1.0.3";
-            src = fetchHex {
-              pkg = "stringprep";
-              version = "1.0.3";
-              sha256 =
-                "140c8300f29e33649580d9d2416f6684b00f386f690c76cc275b7ee43c735074";
-            };
-            compilePorts = true;
-            beamDeps  = [ p1_utils_1_0_3 ];
-
-            meta = {
-              description = ''Fast Stringprep Erlang / Elixir implementation'';
-              license = with stdenv.lib.licenses; [ asl20 free ];
-              homepage = "https://github.com/processone/stringprep";
-            };
-          }
-      ) {};
-
-    stringprep = stringprep_1_0_3;
-
-    stripe_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, jazz_0_2_1, httpotion_2_2_2 }:
-          buildMix {
-            name = "stripe";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "stripe";
-              version = "0.0.1";
-              sha256 =
-                "99f9920ce562109abb70a1998a4f6b5bcd07f5063237cf28dd81387163df3f02";
-            };
-            beamDeps  = [ jazz_0_2_1 httpotion_2_2_2 ];
-
-            meta = {
-              longDescription = ''Wrapper around Stripe`s API. Full
-                                documentation can be found at
-                                https://stripe.com/docs/api '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/SenecaSystems/stripe";
-            };
-          }
-      ) {};
-
-    stripe = stripe_0_0_1;
-
-    stripex_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, gateway_0_0_6 }:
-          buildMix {
-            name = "stripex";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "stripex";
-              version = "0.1.0";
-              sha256 =
-                "49959c78e677d3e30edd808cce7a013a7120f337705d0e2fd646c000d9b30853";
-            };
-            beamDeps  = [ gateway_0_0_6 ];
-
-            meta = {
-              longDescription = ''A much more ruby-stripe-like wrapper around
-                                Stripe`s API (built with Poison). Full
-                                documentation can be found at
-                                https://stripe.com/docs/api'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/foxnewsnetwork/stripex";
-            };
-          }
-      ) {};
-
-    stripex = stripex_0_1_0;
-
-    stripity_stripe_1_4_0 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_2_0_1, httpoison_0_8_2, hackney_1_4_10
-        }:
-          buildMix {
-            name = "stripity_stripe";
-            version = "1.4.0";
-            src = fetchHex {
-              pkg = "stripity_stripe";
-              version = "1.4.0";
-              sha256 =
-                "1ba06bf31efd899c03c09f1b6faa3ca5da3f48571202c8999f8ea6e5ca47c02f";
-            };
-            beamDeps  = [ poison_2_0_1 httpoison_0_8_2 hackney_1_4_10 ];
-
-            meta = {
-              description = ''A Stripe Library for Elixir'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/robconery/stripity-stripe";
-            };
-          }
-      ) {};
-
-    stripity_stripe = stripity_stripe_1_4_0;
-
     struct_fields_0_3_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "struct_fields";
             version = "0.3.0";
             src = fetchHex {
@@ -45113,158 +26500,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/nTraum/struct_fields";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     struct_fields = struct_fields_0_3_0;
 
-    structurez_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "structurez";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "structurez";
-              version = "0.0.1";
-              sha256 =
-                "acacce1dfcd92854e75f891468c264689aa8223c21c88064f5c6883e11f3ae12";
-            };
-
-            meta = {
-              description = ''Additional Data Structures for use in Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/hamiltop/structurez";
-            };
-          }
-      ) {};
-
-    structurez = structurez_0_0_1;
-
-    stun_1_0_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, p1_utils_1_0_3, fast_tls_1_0_1 }:
-          buildRebar3 {
-            name = "stun";
-            version = "1.0.1";
-            src = fetchHex {
-              pkg = "stun";
-              version = "1.0.1";
-              sha256 =
-                "77c9713436dd51e334698ce1de3e17e3601552c40ced76e2bd321eb5eaa33374";
-            };
-
-            beamDeps  = [ p1_utils_1_0_3 fast_tls_1_0_1 ];
-
-            meta = {
-              description = ''STUN and TURN library for Erlang / Elixir'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/processone/stun";
-            };
-          }
-      ) {};
-
-    stun = stun_1_0_1;
-
-    sugar_0_4_10 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          templates_0_0_5,
-          postgrex_0_11_1,
-          poison_1_5_2,
-          plugs_0_1_0,
-          plug_1_1_3,
-          http_router_0_0_8,
-          ecto_2_0_0_beta_2,
-          cowboy_1_0_4
-        }:
-          buildMix {
-            name = "sugar";
-            version = "0.4.10";
-            src = fetchHex {
-              pkg = "sugar";
-              version = "0.4.10";
-              sha256 =
-                "6a0fe8e12032aa4c8932801c000bb361ddec4ea6cb64e756e56e26306ea08a99";
-            };
-            beamDeps  = [
-                          templates_0_0_5
-                          postgrex_0_11_1
-                          poison_1_5_2
-                          plugs_0_1_0
-                          plug_1_1_3
-                          http_router_0_0_8
-                          ecto_2_0_0_beta_2
-                          cowboy_1_0_4
-                        ];
-
-            meta = {
-              description = ''Modular web framework'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/sugar-framework/sugar";
-            };
-          }
-      ) {};
-
-    sugar = sugar_0_4_10;
-
-    supermemo_1_0_0 = callPackage
-      (
-        {  buildMix, fetchHex, timex_0_13_5 }:
-          buildMix {
-            name = "supermemo";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "supermemo";
-              version = "1.0.0";
-              sha256 =
-                "d8afa9ed4f8d18d835eb60b68c36ef4ee8489d0abed5051fde20dc433ea8a076";
-            };
-            beamDeps  = [ timex_0_13_5 ];
-
-            meta = {
-              longDescription = ''An Elixir implementation of the Supermemo 2
-                                Algorithm as described here:
-                                http://www.supermemo.com/english/ol/sm2.htm. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/edubkendo/supermemo";
-            };
-          }
-      ) {};
-
-    supermemo = supermemo_1_0_0;
-
-    supervisord_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, xmlrpc_0_9_1, httpoison_0_7_5 }:
-          buildMix {
-            name = "supervisord";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "supervisord";
-              version = "0.1.0";
-              sha256 =
-                "628bd1f94bff68048e270fec788250ca4adf888a9b9e20e6963958dec43f8ee0";
-            };
-            beamDeps  = [ xmlrpc_0_9_1 httpoison_0_7_5 ];
-
-            meta = {
-              description = ''Supervisord library for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/pocketberserker/elixir-supervisord";
-            };
-          }
-      ) {};
-
-    supervisord = supervisord_0_1_0;
-
     supool_1_5_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "supool";
             version = "1.5.1";
             src = fetchHex {
@@ -45279,87 +26523,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/okeuday/supool";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     supool = supool_1_5_1;
 
-    swaggerdoc_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, phoenix_1_0_4, ecto_1_0_7 }:
-          buildMix {
-            name = "swaggerdoc";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "swaggerdoc";
-              version = "0.0.1";
-              sha256 =
-                "8131fc20821e2dc4f9dd3322dc2e0b8ff1cd25c36338c3eb7d725440edd01405";
-            };
-            beamDeps  = [ poison_1_5_2 phoenix_1_0_4 ecto_1_0_7 ];
-
-            meta = {
-              longDescription = ''The SwaggerDoc module provides a convenience
-                                task for generating Swagger API documentation
-                                for Phoenix and Ecto-based projects.'';
-              license = stdenv.lib.licenses.mpl20;
-              homepage = "https://github.com/OpenAperture/swaggerdoc.git";
-            };
-          }
-      ) {};
-
-    swaggerdoc = swaggerdoc_0_0_1;
-
-    swapi_1_0_0 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2 }:
-          buildMix {
-            name = "swapi";
-            version = "1.0.0";
-            src = fetchHex {
-              pkg = "swapi";
-              version = "1.0.0";
-              sha256 =
-                "55b40ddd97d632b027463aefccb8d6fa9ffa77f224a25af5565bbaecff5c7a3c";
-            };
-            beamDeps  = [ httpoison_0_8_2 ];
-
-            meta = {
-              description = ''An Elixir wrapper for the Star Wars API.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/twhitacre/swapi.ex";
-            };
-          }
-      ) {};
-
-    swapi = swapi_1_0_0;
-
-    sweet_xml_0_4_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "sweet_xml";
-            version = "0.4.0";
-            src = fetchHex {
-              pkg = "sweet_xml";
-              version = "0.4.0";
-              sha256 =
-                "94b7134a34f95437ad444d9bc3d5d7e69eabec8196e1a36fe181e97123ec5eb4";
-            };
-
-            meta = {
-              description = ''An sweet wrapper of :xmerl to help query xml
-                            docs'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/awetzel/sweet_xml";
-            };
-          }
-      ) {};
-
     sweet_xml_0_5_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "sweet_xml";
             version = "0.5.1";
             src = fetchHex {
@@ -45375,13 +26547,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/awetzel/sweet_xml";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     sweet_xml_0_6_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "sweet_xml";
             version = "0.6.1";
             src = fetchHex {
@@ -45397,7 +26569,7 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/awetzel/sweet_xml";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     sweet_xml = sweet_xml_0_6_1;
@@ -45406,13 +26578,14 @@ let
       (
         {
           buildRebar3,
+          packageOverrides ? {},
           fetchHex,
           lager_3_0_2,
           jsx_2_8_0,
           gproc_0_5_0,
           cowboy_1_0_4
         }:
-          buildRebar3 {
+          buildRebar3 ({
             name = "switchboard";
             version = "0.3.2";
             src = fetchHex {
@@ -45422,6 +26595,8 @@ let
                 "0b1debb284cd63e5220dc56462dafebd1418579bb40a5b8e51dfdf1f50bfbeb3";
             };
 
+            buildPlugins  = [ rebar3_hex ];
+
             beamDeps  = [ lager_3_0_2 jsx_2_8_0 gproc_0_5_0 cowboy_1_0_4 ];
 
             meta = {
@@ -45430,56 +26605,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/thusfresh/switchboard";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     switchboard = switchboard_0_3_2;
 
-    swoosh_0_1_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poison_2_1_0,
-          plug_1_1_3,
-          httpoison_0_8_2,
-          gen_smtp_0_9_0,
-          cowboy_1_0_4
-        }:
-          buildMix {
-            name = "swoosh";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "swoosh";
-              version = "0.1.0";
-              sha256 =
-                "46488cbd7d158e4907869d7b097d7663d608405021c43aeb6a51a6c70cb7ee3b";
-            };
-            beamDeps  = [
-                          poison_2_1_0
-                          plug_1_1_3
-                          httpoison_0_8_2
-                          gen_smtp_0_9_0
-                          cowboy_1_0_4
-                        ];
-
-            meta = {
-              longDescription = ''Compose, deliver and test your emails easily
-                                in Elixir. Supports SMTP, Sendgrid, Mandrill,
-                                Postmark and Mailgun out of the box. Works great
-                                with Phoenix.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/swoosh/swoosh";
-            };
-          }
-      ) {};
-
-    swoosh = swoosh_0_1_0;
-
     syn_1_2_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "syn";
             version = "1.2.1";
             src = fetchHex {
@@ -45495,15 +26629,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ostinelli/syn";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     syn = syn_1_2_1;
 
     syn_osc_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, osc_0_1_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, osc_0_1_1 }:
+          buildMix ({
             name = "syn_osc";
             version = "0.1.0";
             src = fetchHex {
@@ -45519,15 +26653,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/camshaft/syn_osc_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     syn_osc = syn_osc_0_1_0;
 
     synthex_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "synthex";
             version = "0.1.0";
             src = fetchHex {
@@ -45542,40 +26676,15 @@ let
               license = stdenv.lib.licenses.isc;
               homepage = "https://github.com/bitgamma/synthex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     synthex = synthex_0_1_0;
 
-    syslog_1_0_2 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "syslog";
-            version = "1.0.2";
-            src = fetchHex {
-              pkg = "syslog";
-              version = "1.0.2";
-              sha256 =
-                "ca158a84afe482f77cb4668383a6108f1e9190fcdf3035858f426b91b2021bf6";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''Erlang port driver for interacting with syslog
-                            via syslog'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/Vagabond/erlang-syslog";
-            };
-          }
-      ) {};
-
-    syslog = syslog_1_0_2;
-
     system_env_loader_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "system_env_loader";
             version = "0.1.0";
             src = fetchHex {
@@ -45592,15 +26701,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ruby2elixir/system_env_loader";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     system_env_loader = system_env_loader_0_1_0;
 
     table_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "table";
             version = "0.0.4";
             src = fetchHex {
@@ -45615,15 +26724,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/zweifisch/table";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     table = table_0_0_4;
 
     table_rex_0_4_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "table_rex";
             version = "0.4.0";
             src = fetchHex {
@@ -45639,13 +26748,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/djm/table_rex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     table_rex_0_8_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "table_rex";
             version = "0.8.0";
             src = fetchHex {
@@ -45661,15 +26770,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/djm/table_rex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     table_rex = table_rex_0_8_0;
 
     tabula_2_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "tabula";
             version = "2.0.1";
             src = fetchHex {
@@ -45684,15 +26793,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/aerosol/Tabula";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     tabula = tabula_2_0_1;
 
     tachometer_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "tachometer";
             version = "0.1.0";
             src = fetchHex {
@@ -45707,39 +26816,15 @@ let
               license = stdenv.lib.licenses.gpl3;
               homepage = "https://github.com/pavlos/tachometer";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     tachometer = tachometer_0_1_0;
 
-    tagplay_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_7_5, exjsx_3_1_0 }:
-          buildMix {
-            name = "tagplay";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "tagplay";
-              version = "0.1.0";
-              sha256 =
-                "620561f030ad83fc9e9bafec7efb03ded24d9ed81ac32a9ef1bc56c0ab87d61f";
-            };
-            beamDeps  = [ httpoison_0_7_5 exjsx_3_1_0 ];
-
-            meta = {
-              description = ''Tagplay.co API client. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/Tagplay/elixir-tagplay";
-            };
-          }
-      ) {};
-
-    tagplay = tagplay_0_1_0;
-
     tail_1_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "tail";
             version = "1.0.1";
             src = fetchHex {
@@ -45756,15 +26841,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/TheFirstAvenger/elixir-tail.git";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     tail = tail_1_0_1;
 
     tane_0_3_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "tane";
             version = "0.3.1";
             src = fetchHex {
@@ -45779,78 +26864,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/Joe-noh/tane";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     tane = tane_0_3_1;
 
-    tanegashima_0_0_9 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poison_2_1_0,
-          httpoison_0_8_2,
-          ex_doc_0_11_4,
-          earmark_0_2_1,
-          dialyze_0_2_1
-        }:
-          buildMix {
-            name = "tanegashima";
-            version = "0.0.9";
-            src = fetchHex {
-              pkg = "tanegashima";
-              version = "0.0.9";
-              sha256 =
-                "91d0496f57e156a4f5b205ca4743f857cbf7739012b4b5eb704a31d00062cad6";
-            };
-            beamDeps  = [
-                          poison_2_1_0
-                          httpoison_0_8_2
-                          ex_doc_0_11_4
-                          earmark_0_2_1
-                          dialyze_0_2_1
-                        ];
-
-            meta = {
-              description = ''Elixir wrapper for Pushbullet-API'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/massn/Tanegashima";
-            };
-          }
-      ) {};
-
-    tanegashima = tanegashima_0_0_9;
-
-    tanuki_0_2_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "tanuki";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "tanuki";
-              version = "0.2.0";
-              sha256 =
-                "f499d6bcb80fc29f2d0b68d16d8309cb25589583b1f4d0eb23cbc4fe5afbab8c";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''GitLab API wrapper in Elixir, named after GitLabs
-                            mascot'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ZJvandeWeg/Tanuki";
-            };
-          }
-      ) {};
-
-    tanuki = tanuki_0_2_0;
-
     tap_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "tap";
             version = "0.1.0";
             src = fetchHex {
@@ -45865,15 +26887,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/eproxus/tap";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     tap = tap_0_1_0;
 
     tau_0_0_6 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "tau";
             version = "0.0.6";
             src = fetchHex {
@@ -45888,15 +26910,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/FranklinChen/tau";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     tau = tau_0_0_6;
 
     tds_0_5_4 = callPackage
       (
-        {  buildMix, fetchHex, decimal_1_1_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, decimal_1_1_1 }:
+          buildMix ({
             name = "tds";
             version = "0.5.4";
             src = fetchHex {
@@ -45912,41 +26934,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/livehelpnow/tds";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     tds = tds_0_5_4;
 
-    tds_ecto_1_0_2 = callPackage
-      (
-        {
-          buildMix, fetchHex, tds_0_5_4, poison_1_5_2, ecto_2_0_0_beta_2
-        }:
-          buildMix {
-            name = "tds_ecto";
-            version = "1.0.2";
-            src = fetchHex {
-              pkg = "tds_ecto";
-              version = "1.0.2";
-              sha256 =
-                "c592061c97b923fd3f2a7b212eefdd7a35ddb0dac94886b8995ed03b2b9dfd53";
-            };
-            beamDeps  = [ tds_0_5_4 poison_1_5_2 ecto_2_0_0_beta_2 ];
-
-            meta = {
-              description = ''MSSQL / TDS Adapter for Ecto.'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/livehelpnow/tds_ecto";
-            };
-          }
-      ) {};
-
-    tds_ecto = tds_ecto_1_0_2;
-
     tea_crypto_1_0_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "tea_crypto";
             version = "1.0.0";
             src = fetchHex {
@@ -45961,15 +26957,15 @@ let
 
               homepage = "https://github.com/keichan34/tea_crypto";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     tea_crypto = tea_crypto_1_0_0;
 
     teacup_0_3_2 = callPackage
       (
-        {  buildRebar3, fetchHex, simpre_0_1_0 }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex, simpre_0_1_0 }:
+          buildRebar3 ({
             name = "teacup";
             version = "0.3.2";
             src = fetchHex {
@@ -45985,7 +26981,7 @@ let
               description = ''Simple TCP client library for Erlang'';
               license = stdenv.lib.licenses.mit;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     teacup = teacup_0_3_2;
@@ -45993,9 +26989,14 @@ let
     teacup_nats_0_3_1 = callPackage
       (
         {
-          buildRebar3, fetchHex, teacup_0_3_2, nats_msg_0_4_1, jsx_2_8_0
+          buildRebar3,
+          packageOverrides ? {},
+          fetchHex,
+          teacup_0_3_2,
+          nats_msg_0_4_1,
+          jsx_2_8_0
         }:
-          buildRebar3 {
+          buildRebar3 ({
             name = "teacup_nats";
             version = "0.3.1";
             src = fetchHex {
@@ -46009,17 +27010,18 @@ let
 
             meta = {
               description = ''Teacup based NATS Client for Erlang'';
-              license = stdenv.lib.licenses.mit;
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/yuce/teacup_nats.git";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     teacup_nats = teacup_nats_0_3_1;
 
     teamcity_exunit_formatter_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "teamcity_exunit_formatter";
             version = "0.2.0";
             src = fetchHex {
@@ -46036,40 +27038,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/lixhq/teamcity-exunit-formatter";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     teamcity_exunit_formatter = teamcity_exunit_formatter_0_2_0;
 
-    telebot_0_1_2 = callPackage
-      (
-        {  buildRebar3, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
-          buildRebar3 {
-            name = "telebot";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "telebot";
-              version = "0.1.2";
-              sha256 =
-                "cb1f3058dcf182357f1620f58ac289d685b277fb31082c1644bd5f3892ccaf78";
-            };
-
-            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
-
-            meta = {
-              description = ''A Telegram bot plugin system for Elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ottolin/telebot";
-            };
-          }
-      ) {};
-
-    telebot = telebot_0_1_2;
-
     telehashname_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "telehashname";
             version = "0.0.2";
             src = fetchHex {
@@ -46084,15 +27061,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/mwmiller/telehashname_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     telehashname = telehashname_0_0_2;
 
     telephonist_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex, immortal_0_2_0, ex_twiml_2_1_0 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          immortal_0_2_0,
+          ex_twiml_2_1_0
+        }:
+          buildMix ({
             name = "telephonist";
             version = "0.1.2";
             src = fetchHex {
@@ -46107,15 +27090,15 @@ let
                license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/danielberkompas/telephonist";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     telephonist = telephonist_0_1_2;
 
     temp_0_4_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "temp";
             version = "0.4.0";
             src = fetchHex {
@@ -46131,40 +27114,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/tuvistavie/elixir-temp";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     temp = temp_0_4_0;
 
-    templates_0_0_5 = callPackage
-      (
-        {  buildMix, fetchHex, calliope_0_3_0 }:
-          buildMix {
-            name = "templates";
-            version = "0.0.5";
-            src = fetchHex {
-              pkg = "templates";
-              version = "0.0.5";
-              sha256 =
-                "b06a865acfb39fe17cb589ac64696127351015c9ff5d27bae0e223e770b27269";
-            };
-            beamDeps  = [ calliope_0_3_0 ];
-
-            meta = {
-              description = ''A helper library for adding templating to web
-                            applications '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/sugar-framework/templates";
-            };
-          }
-      ) {};
-
-    templates = templates_0_0_5;
-
     temporary_env_1_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "temporary_env";
             version = "1.0.1";
             src = fetchHex {
@@ -46180,63 +27138,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/lpil/temporary-env";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     temporary_env = temporary_env_1_0_1;
 
-    tentabucket_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_2_0 }:
-          buildMix {
-            name = "tentabucket";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "tentabucket";
-              version = "0.0.1";
-              sha256 =
-                "5784dad17f973efcc3c4ea7672927095864d58af1f830614e4c8f06c63d4822d";
-            };
-            beamDeps  = [ httpoison_0_8_2 exjsx_3_2_0 ];
-
-            meta = {
-              description = ''Simple Bitbucket API client library for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/duksis/tentabucket";
-            };
-          }
-      ) {};
-
-    tentabucket = tentabucket_0_0_1;
-
-    tentacat_0_4_0 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_2_0 }:
-          buildMix {
-            name = "tentacat";
-            version = "0.4.0";
-            src = fetchHex {
-              pkg = "tentacat";
-              version = "0.4.0";
-              sha256 =
-                "3fc0ab0b8f218fc3486d00f47d4b71ae70709c4137a8d8d573b44038b4ee43b3";
-            };
-            beamDeps  = [ httpoison_0_8_2 exjsx_3_2_0 ];
-
-            meta = {
-              description = ''Simple Elixir wrapper for the GitHub API'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/edgurgel/tentacat";
-            };
-          }
-      ) {};
-
-    tentacat = tentacat_0_4_0;
-
     term_table_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "term_table";
             version = "0.0.2";
             src = fetchHex {
@@ -46251,15 +27161,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/ske77/term_table";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     term_table = term_table_0_0_2;
 
     termcap_0_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "termcap";
             version = "0.1.0";
             src = fetchHex {
@@ -46273,15 +27183,15 @@ let
               description = ''Pure erlang termcap library'';
               license = stdenv.lib.licenses.mit;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     termcap = termcap_0_1_0;
 
     tesla_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex, exjsx_3_1_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, exjsx_3_1_0 }:
+          buildMix ({
             name = "tesla";
             version = "0.2.1";
             src = fetchHex {
@@ -46298,15 +27208,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/monterail/tesla";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     tesla = tesla_0_2_1;
 
     test_times_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "test_times";
             version = "1.0.0";
             src = fetchHex {
@@ -46322,15 +27232,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/pinfieldharm/test_times";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     test_times = test_times_1_0_0;
 
     tfidf_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "tfidf";
             version = "0.1.2";
             src = fetchHex {
@@ -46346,15 +27256,15 @@ let
               license = stdenv.lib.licenses.unlicense;
               homepage = "https://github.com/OCannings/tf-idf";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     tfidf = tfidf_0_1_2;
 
     the_fuzz_0_2_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "the_fuzz";
             version = "0.2.2";
             src = fetchHex {
@@ -46376,40 +27286,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/smashedtoatoms/the_fuzz";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     the_fuzz = the_fuzz_0_2_2;
 
-    theriac_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, fitex_0_0_1 }:
-          buildMix {
-            name = "theriac";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "theriac";
-              version = "0.0.1";
-              sha256 =
-                "c67162d0bb02629cf3502adba2680c59c058ecbc3dda821384ee00e903d6484f";
-            };
-            beamDeps  = [ fitex_0_0_1 ];
-
-            meta = {
-              description = ''Implementation of clojure style transducers in
-                            elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/timdeputter/theriac";
-            };
-          }
-      ) {};
-
-    theriac = theriac_0_0_1;
-
     thermex_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "thermex";
             version = "0.0.2";
             src = fetchHex {
@@ -46424,54 +27309,15 @@ let
                             sensors'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     thermex = thermex_0_0_2;
 
-    thesis_0_0_8 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          plug_1_1_3,
-          phoenix_html_2_5_1,
-          phoenix_1_1_4,
-          html_sanitize_ex_0_1_2,
-          ecto_2_0_0_beta_2
-        }:
-          buildMix {
-            name = "thesis";
-            version = "0.0.8";
-            src = fetchHex {
-              pkg = "thesis";
-              version = "0.0.8";
-              sha256 =
-                "8fc1a3fd06b66c695a270519009903f1d2d5bd586f5061a614c37d7b46df7896";
-            };
-            beamDeps  = [
-                          plug_1_1_3
-                          phoenix_html_2_5_1
-                          phoenix_1_1_4
-                          html_sanitize_ex_0_1_2
-                          ecto_2_0_0_beta_2
-                        ];
-
-            meta = {
-              description = ''Thesis is a lightweight bolt-on content editing
-                            system for Phoenix websites.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/infinite_red/thesis";
-            };
-          }
-      ) {};
-
-    thesis = thesis_0_0_8;
-
     thrift_1_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "thrift";
             version = "1.2.0";
             src = fetchHex {
@@ -46488,15 +27334,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/pinterest/elixir-thrift";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     thrift = thrift_1_2_0;
 
     time_distance_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_2 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, timex_1_0_2 }:
+          buildMix ({
             name = "time_distance";
             version = "0.0.1";
             src = fetchHex {
@@ -46514,15 +27360,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/aussiegeek/time_distance";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     time_distance = time_distance_0_0_1;
 
     time_seer_0_0_6 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "time_seer";
             version = "0.0.6";
             src = fetchHex {
@@ -46535,263 +27381,27 @@ let
             meta = {
               longDescription = ''TimeSeer is an Elixir library for parsing
                                 dates and times and returning Erlang style date
-                                and time tuples. Eg. "15:12:07" "2:42pm"
-                                "24/12/2014" will become {15,12,7}, {14,42,0},
+                                and time tuples. Eg. \"15:12:07\" \"2:42pm\"
+                                \"24/12/2014\" will become {15,12,7}, {14,42,0},
                                 and {2014,12,24} respectively.'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/lau/time_seer";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     time_seer = time_seer_0_0_6;
 
-    timex_0_12_9 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "timex";
-            version = "0.12.9";
-            src = fetchHex {
-              pkg = "timex";
-              version = "0.12.9";
-              sha256 =
-                "6d5be2480b6aa55b452acaffd1fc91e576ffb1e0bc0f04358c8869a47af9ec60";
-            };
-
-            meta = {
-              longDescription = ''A comprehensive date/time library for Elixir
-                                Fully timezone-aware, using the Olson Timezone
-                                database - Supports local-timezone lookups -
-                                Supports POSIX-style timezones - Supports
-                                lookups of any Olson tzdata timezones - Supports
-                                arbitrary shifts across time and through
-                                timezones, including ambiguous time periods,
-                                non-existent time periods, and leaps. Provides
-                                both Date and DateTime types, for use depending
-                                on your needs, with an AmbiguousDateTime type
-                                for handling those DateTime values which fall on
-                                an ambigouos timezone period. Extendable via
-                                Convertable and Comparable protocols, so you can
-                                use Timex with your own types! Locale-aware,
-                                currently only supports "ru" and "en", but more
-                                will be added over time. Provides a broad array
-                                of date/time helper functions -
-                                shifting/adding/subtracting - diffing -
-                                comparing/before?/after?/between? - conversions
-                                - get day of week, week of year, ISO dates, and
-                                names for each - get the beginning or ending of
-                                a given week - get the beginning or ending of a
-                                year, quarter, week, or month - get days in a
-                                given month - normalization Provides a broad
-                                array of time-specific helpers - convert to and
-                                from units: weeks, days, hours, seconds, ms, and
-                                microseconds - measure execution time -
-                                diff/compare - to/from 12/24 hour clock times -
-                                add/subtract Safe date/time string formatting
-                                and parsing - Informative parser errors -
-                                Supports strftime, as well as an easier to read
-                                formatter, i.e. `{ISO:Basic}`, `{YYYY}` -
-                                Supports many formats out of the box: ISO8601
-                                basic and extended, RFC822, RFC1123, RFC3339,
-                                ANSIC, UNIX - Relative time formatter (i.e. "2
-                                years from now") Extendable - Protocols for core
-                                modules like the parser tokenizer - Easy to wrap
-                                to add extra functionality Can be used with
-                                Phoenix and Ecto when used with timex_ecto
-                                package'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bitwalker/timex";
-            };
-          }
-      ) {};
-
-    timex_0_13_5 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "timex";
-            version = "0.13.5";
-            src = fetchHex {
-              pkg = "timex";
-              version = "0.13.5";
-              sha256 =
-                "2d553f9e4b5ed7f7f9743012b6be8fd5bdf5d727e93951cd5be220dcbf161f75";
-            };
-
-            meta = {
-              longDescription = ''A comprehensive date/time library for Elixir
-                                Fully timezone-aware, using the Olson Timezone
-                                database - Supports local-timezone lookups -
-                                Supports POSIX-style timezones - Supports
-                                lookups of any Olson tzdata timezones - Supports
-                                arbitrary shifts across time and through
-                                timezones, including ambiguous time periods,
-                                non-existent time periods, and leaps. Provides
-                                both Date and DateTime types, for use depending
-                                on your needs, with an AmbiguousDateTime type
-                                for handling those DateTime values which fall on
-                                an ambigouos timezone period. Extendable via
-                                Convertable and Comparable protocols, so you can
-                                use Timex with your own types! Locale-aware,
-                                currently only supports "ru" and "en", but more
-                                will be added over time. Provides a broad array
-                                of date/time helper functions -
-                                shifting/adding/subtracting - diffing -
-                                comparing/before?/after?/between? - conversions
-                                - get day of week, week of year, ISO dates, and
-                                names for each - get the beginning or ending of
-                                a given week - get the beginning or ending of a
-                                year, quarter, week, or month - get days in a
-                                given month - normalization Provides a broad
-                                array of time-specific helpers - convert to and
-                                from units: weeks, days, hours, seconds, ms, and
-                                microseconds - measure execution time -
-                                diff/compare - to/from 12/24 hour clock times -
-                                add/subtract Safe date/time string formatting
-                                and parsing - Informative parser errors -
-                                Supports strftime, as well as an easier to read
-                                formatter, i.e. `{ISO:Basic}`, `{YYYY}` -
-                                Supports many formats out of the box: ISO8601
-                                basic and extended, RFC822, RFC1123, RFC3339,
-                                ANSIC, UNIX - Relative time formatter (i.e. "2
-                                years from now") Extendable - Protocols for core
-                                modules like the parser tokenizer - Easy to wrap
-                                to add extra functionality Can be used with
-                                Phoenix and Ecto when used with timex_ecto
-                                package'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bitwalker/timex";
-            };
-          }
-      ) {};
-
-    timex_0_16_2 = callPackage
-      (
-        {  buildMix, fetchHex, tzdata_0_1_201603 }:
-          buildMix {
-            name = "timex";
-            version = "0.16.2";
-            src = fetchHex {
-              pkg = "timex";
-              version = "0.16.2";
-              sha256 =
-                "951b740468c5de3495ce750d33c9df313100de75060242fd2dfe308f40706793";
-            };
-            beamDeps  = [ tzdata_0_1_201603 ];
-
-            meta = {
-              longDescription = ''A comprehensive date/time library for Elixir
-                                Fully timezone-aware, using the Olson Timezone
-                                database - Supports local-timezone lookups -
-                                Supports POSIX-style timezones - Supports
-                                lookups of any Olson tzdata timezones - Supports
-                                arbitrary shifts across time and through
-                                timezones, including ambiguous time periods,
-                                non-existent time periods, and leaps. Provides
-                                both Date and DateTime types, for use depending
-                                on your needs, with an AmbiguousDateTime type
-                                for handling those DateTime values which fall on
-                                an ambigouos timezone period. Extendable via
-                                Convertable and Comparable protocols, so you can
-                                use Timex with your own types! Locale-aware,
-                                currently only supports "ru" and "en", but more
-                                will be added over time. Provides a broad array
-                                of date/time helper functions -
-                                shifting/adding/subtracting - diffing -
-                                comparing/before?/after?/between? - conversions
-                                - get day of week, week of year, ISO dates, and
-                                names for each - get the beginning or ending of
-                                a given week - get the beginning or ending of a
-                                year, quarter, week, or month - get days in a
-                                given month - normalization Provides a broad
-                                array of time-specific helpers - convert to and
-                                from units: weeks, days, hours, seconds, ms, and
-                                microseconds - measure execution time -
-                                diff/compare - to/from 12/24 hour clock times -
-                                add/subtract Safe date/time string formatting
-                                and parsing - Informative parser errors -
-                                Supports strftime, as well as an easier to read
-                                formatter, i.e. `{ISO:Basic}`, `{YYYY}` -
-                                Supports many formats out of the box: ISO8601
-                                basic and extended, RFC822, RFC1123, RFC3339,
-                                ANSIC, UNIX - Relative time formatter (i.e. "2
-                                years from now") Extendable - Protocols for core
-                                modules like the parser tokenizer - Easy to wrap
-                                to add extra functionality Can be used with
-                                Phoenix and Ecto when used with timex_ecto
-                                package'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bitwalker/timex";
-            };
-          }
-      ) {};
-
-    timex_0_19_5 = callPackage
-      (
-        {  buildMix, fetchHex, tzdata_0_5_7, combine_0_7_0 }:
-          buildMix {
-            name = "timex";
-            version = "0.19.5";
-            src = fetchHex {
-              pkg = "timex";
-              version = "0.19.5";
-              sha256 =
-                "be1985ab99a6aebc3672b1d82b27e409c9a7af4658f3cc5900fa8754e159b02c";
-            };
-            beamDeps  = [ tzdata_0_5_7 combine_0_7_0 ];
-
-            meta = {
-              longDescription = ''A comprehensive date/time library for Elixir
-                                Fully timezone-aware, using the Olson Timezone
-                                database - Supports local-timezone lookups -
-                                Supports POSIX-style timezones - Supports
-                                lookups of any Olson tzdata timezones - Supports
-                                arbitrary shifts across time and through
-                                timezones, including ambiguous time periods,
-                                non-existent time periods, and leaps. Provides
-                                both Date and DateTime types, for use depending
-                                on your needs, with an AmbiguousDateTime type
-                                for handling those DateTime values which fall on
-                                an ambigouos timezone period. Extendable via
-                                Convertable and Comparable protocols, so you can
-                                use Timex with your own types! Locale-aware,
-                                currently only supports "ru" and "en", but more
-                                will be added over time. Provides a broad array
-                                of date/time helper functions -
-                                shifting/adding/subtracting - diffing -
-                                comparing/before?/after?/between? - conversions
-                                - get day of week, week of year, ISO dates, and
-                                names for each - get the beginning or ending of
-                                a given week - get the beginning or ending of a
-                                year, quarter, week, or month - get days in a
-                                given month - normalization Provides a broad
-                                array of time-specific helpers - convert to and
-                                from units: weeks, days, hours, seconds, ms, and
-                                microseconds - measure execution time -
-                                diff/compare - to/from 12/24 hour clock times -
-                                add/subtract Safe date/time string formatting
-                                and parsing - Informative parser errors -
-                                Supports strftime, as well as an easier to read
-                                formatter, i.e. `{ISO:Basic}`, `{YYYY}` -
-                                Supports many formats out of the box: ISO8601
-                                basic and extended, RFC822, RFC1123, RFC3339,
-                                ANSIC, UNIX - Relative time formatter (i.e. "2
-                                years from now") Extendable - Protocols for core
-                                modules like the parser tokenizer - Easy to wrap
-                                to add extra functionality Can be used with
-                                Phoenix and Ecto when used with timex_ecto
-                                package'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bitwalker/timex";
-            };
-          }
-      ) {};
-
     timex_1_0_0_rc4 = callPackage
       (
-        {  buildMix, fetchHex, tzdata_0_1_201603, combine_0_7_0 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          tzdata_0_1_201603,
+          combine_0_7_0
+        }:
+          buildMix ({
             name = "timex";
             version = "1.0.0-rc4";
             src = fetchHex {
@@ -46817,9 +27427,9 @@ let
                                 an ambigouos timezone period. Extendable via
                                 Convertable and Comparable protocols, so you can
                                 use Timex with your own types! Locale-aware,
-                                currently only supports "ru" and "en", but more
-                                will be added over time. Provides a broad array
-                                of date/time helper functions -
+                                currently only supports \"ru\" and \"en\", but
+                                more will be added over time. Provides a broad
+                                array of date/time helper functions -
                                 shifting/adding/subtracting - diffing -
                                 comparing/before?/after?/between? - conversions
                                 - get day of week, week of year, ISO dates, and
@@ -46837,22 +27447,28 @@ let
                                 formatter, i.e. `{ISO:Basic}`, `{YYYY}` -
                                 Supports many formats out of the box: ISO8601
                                 basic and extended, RFC822, RFC1123, RFC3339,
-                                ANSIC, UNIX - Relative time formatter (i.e. "2
-                                years from now") Extendable - Protocols for core
-                                modules like the parser tokenizer - Easy to wrap
-                                to add extra functionality Can be used with
+                                ANSIC, UNIX - Relative time formatter (i.e. \"2
+                                years from now\") Extendable - Protocols for
+                                core modules like the parser tokenizer - Easy to
+                                wrap to add extra functionality Can be used with
                                 Phoenix and Ecto when used with timex_ecto
                                 package'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bitwalker/timex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     timex_1_0_2 = callPackage
       (
-        {  buildMix, fetchHex, tzdata_0_1_201603, combine_0_7_0 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          tzdata_0_1_201603,
+          combine_0_7_0
+        }:
+          buildMix ({
             name = "timex";
             version = "1.0.2";
             src = fetchHex {
@@ -46878,9 +27494,9 @@ let
                                 an ambigouos timezone period. Extendable via
                                 Convertable and Comparable protocols, so you can
                                 use Timex with your own types! Locale-aware,
-                                currently only supports "ru" and "en", but more
-                                will be added over time. Provides a broad array
-                                of date/time helper functions -
+                                currently only supports \"ru\" and \"en\", but
+                                more will be added over time. Provides a broad
+                                array of date/time helper functions -
                                 shifting/adding/subtracting - diffing -
                                 comparing/before?/after?/between? - conversions
                                 - get day of week, week of year, ISO dates, and
@@ -46898,28 +27514,29 @@ let
                                 formatter, i.e. `{ISO:Basic}`, `{YYYY}` -
                                 Supports many formats out of the box: ISO8601
                                 basic and extended, RFC822, RFC1123, RFC3339,
-                                ANSIC, UNIX - Relative time formatter (i.e. "2
-                                years from now") Extendable - Protocols for core
-                                modules like the parser tokenizer - Easy to wrap
-                                to add extra functionality Can be used with
+                                ANSIC, UNIX - Relative time formatter (i.e. \"2
+                                years from now\") Extendable - Protocols for
+                                core modules like the parser tokenizer - Easy to
+                                wrap to add extra functionality Can be used with
                                 Phoenix and Ecto when used with timex_ecto
                                 package'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bitwalker/timex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     timex_2_1_3 = callPackage
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           tzdata_0_1_201603,
           gettext_0_10_0,
           combine_0_7_0
         }:
-          buildMix {
+          buildMix ({
             name = "timex";
             version = "2.1.3";
             src = fetchHex {
@@ -46945,9 +27562,9 @@ let
                                 an ambigouos timezone period. Extendable via
                                 Convertable and Comparable protocols, so you can
                                 use Timex with your own types! Locale-aware,
-                                currently only supports "ru" and "en", but more
-                                will be added over time. Provides a broad array
-                                of date/time helper functions -
+                                currently only supports \"ru\" and \"en\", but
+                                more will be added over time. Provides a broad
+                                array of date/time helper functions -
                                 shifting/adding/subtracting - diffing -
                                 comparing/before?/after?/between? - conversions
                                 - get day of week, week of year, ISO dates, and
@@ -46965,49 +27582,24 @@ let
                                 formatter, i.e. `{ISO:Basic}`, `{YYYY}` -
                                 Supports many formats out of the box: ISO8601
                                 basic and extended, RFC822, RFC1123, RFC3339,
-                                ANSIC, UNIX - Relative time formatter (i.e. "2
-                                years from now") Extendable - Protocols for core
-                                modules like the parser tokenizer - Easy to wrap
-                                to add extra functionality Can be used with
+                                ANSIC, UNIX - Relative time formatter (i.e. \"2
+                                years from now\") Extendable - Protocols for
+                                core modules like the parser tokenizer - Easy to
+                                wrap to add extra functionality Can be used with
                                 Phoenix and Ecto when used with timex_ecto
                                 package'';
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bitwalker/timex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     timex = timex_2_1_3;
 
-    timex_ecto_1_0_4 = callPackage
-      (
-        {  buildMix, fetchHex, timex_2_1_3, ecto_0_2_7 }:
-          buildMix {
-            name = "timex_ecto";
-            version = "1.0.4";
-            src = fetchHex {
-              pkg = "timex_ecto";
-              version = "1.0.4";
-              sha256 =
-                "98818bc66aad2234c78a879b57445ea329dea64d74d8bf67adc331eb4c504a74";
-            };
-            beamDeps  = [ timex_2_1_3 ecto_0_2_7 ];
-
-            meta = {
-              description = ''A plugin for Ecto and Timex which allows use of
-                            Timex types with Ecto'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bitwalker/timex_ecto";
-            };
-          }
-      ) {};
-
-    timex_ecto = timex_ecto_1_0_4;
-
     timex_interval_0_6_0 = callPackage
       (
-        {  buildMix, fetchHex, timex_1_0_0_rc4 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, timex_1_0_0_rc4 }:
+          buildMix ({
             name = "timex_interval";
             version = "0.6.0";
             src = fetchHex {
@@ -47024,15 +27616,15 @@ let
               license = stdenv.lib.licenses.apsl20;
               homepage = "https://github.com/atabary/timex-interval";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     timex_interval = timex_interval_0_6_0;
 
     tinymt_0_3_1 = callPackage
       (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
+        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
+          buildErlangMk ({
             name = "tinymt";
             version = "0.3.1";
             src = fetchHex {
@@ -47047,15 +27639,15 @@ let
               license = stdenv.lib.licenses.bsd2;
               homepage = "https://github.com/jj1bdx/tinymt-erlang/";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     tinymt = tinymt_0_3_1;
 
     tirexs_0_8_0_beta5 = callPackage
       (
-        {  buildMix, fetchHex, exjsx_3_2_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, exjsx_3_2_0 }:
+          buildMix ({
             name = "tirexs";
             version = "0.8.0-beta5";
             src = fetchHex {
@@ -47072,15 +27664,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/Zatvobor/tirexs";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     tirexs = tirexs_0_8_0_beta5;
 
     tlv_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "tlv";
             version = "0.1.0";
             src = fetchHex {
@@ -47095,38 +27687,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/bitgamma/elixir_tlv";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     tlv = tlv_0_1_0;
 
-    tmdb_0_0_6 = callPackage
-      (
-        {
-          buildRebar3, fetchHex, poison_1_4_0, httpoison_0_8_2, exjsx_3_1_0
-        }:
-          buildRebar3 {
-            name = "tmdb";
-            version = "0.0.6";
-            src = fetchHex {
-              pkg = "tmdb";
-              version = "0.0.6";
-              sha256 =
-                "4cbad6ffa556a0eeecb22c3960d47451e918313e5651808439f039403dd38d3a";
-            };
-
-            beamDeps  = [ poison_1_4_0 httpoison_0_8_2 exjsx_3_1_0 ];
-
-            meta = {    };
-          }
-      ) {};
-
-    tmdb = tmdb_0_0_6;
-
     todo_1_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "todo";
             version = "1.2.0";
             src = fetchHex {
@@ -47141,62 +27710,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/niahoo/elixir-todo";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     todo = todo_1_2_0;
 
-    togglex_0_2_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "togglex";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "togglex";
-              version = "0.2.0";
-              sha256 =
-                "725b4299c5aad1c87900e667d6a01c88ba18f8e545283f31d2f726745c174e30";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Simple Elixir wrapper for the Toggl API'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/diacode/togglex";
-            };
-          }
-      ) {};
-
-    togglex = togglex_0_2_0;
-
-    tomlex_0_0_4 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "tomlex";
-            version = "0.0.4";
-            src = fetchHex {
-              pkg = "tomlex";
-              version = "0.0.4";
-              sha256 =
-                "4aa86ca5ede2147156697267a72bafb425fea2ad9c3a5c0bf6fe7f1e57e9ffa9";
-            };
-
-            meta = {
-              description = ''A TOML parser for elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/zamith/tomlex";
-            };
-          }
-      ) {};
-
-    tomlex = tomlex_0_0_4;
-
     toniq_1_0_5 = callPackage
       (
-        {  buildMix, fetchHex, uuid_1_1_3, exredis_0_2_3 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          uuid_1_1_3,
+          exredis_0_2_3
+        }:
+          buildMix ({
             name = "toniq";
             version = "1.0.5";
             src = fetchHex {
@@ -47215,15 +27743,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/joakimk/toniq";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     toniq = toniq_1_0_5;
 
     towel_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "towel";
             version = "0.2.1";
             src = fetchHex {
@@ -47239,15 +27767,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/knrz/towel";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     towel = towel_0_2_1;
 
     tqdm_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "tqdm";
             version = "0.0.1";
             src = fetchHex {
@@ -47264,40 +27792,16 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/antipax/tqdm_elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     tqdm = tqdm_0_0_1;
 
-    tracker_request_0_0_4 = callPackage
-      (
-        {  buildMix, fetchHex, bencoder_0_0_7 }:
-          buildMix {
-            name = "tracker_request";
-            version = "0.0.4";
-            src = fetchHex {
-              pkg = "tracker_request";
-              version = "0.0.4";
-              sha256 =
-                "5a4b20ed43589e9a7bd66ae1a72e5df983489b2d07ae990b32758e3353281584";
-            };
-            beamDeps  = [ bencoder_0_0_7 ];
-
-            meta = {
-              description = ''Deal with bittorrent tracker requests and
-                            responses'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/alehander42/tracker_request";
-            };
-          }
-      ) {};
-
-    tracker_request = tracker_request_0_0_4;
-
     trackline_0_0_1 = callPackage
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           timex_1_0_2,
           exml_0_1_0,
@@ -47305,7 +27809,7 @@ let
           erlsom_1_2_1,
           apex_0_3_7
         }:
-          buildMix {
+          buildMix ({
             name = "trackline";
             version = "0.0.1";
             src = fetchHex {
@@ -47327,54 +27831,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/andrewhao/trackline";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     trackline = trackline_0_0_1;
 
-    tractor_0_1_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          postgrex_0_11_1,
-          phoenix_ecto_3_0_0_beta_2,
-          phoenix_1_1_4,
-          gettext_0_10_0,
-          cowboy_1_0_4
-        }:
-          buildMix {
-            name = "tractor";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "tractor";
-              version = "0.1.0";
-              sha256 =
-                "f88e92d512b9c696bb250c0caa1bd85f60893bbf855eb34d622e0aae156f3063";
-            };
-            beamDeps  = [
-                          postgrex_0_11_1
-                          phoenix_ecto_3_0_0_beta_2
-                          phoenix_1_1_4
-                          gettext_0_10_0
-                          cowboy_1_0_4
-                        ];
-
-            meta = {
-              description = ''A fast and scalable pure Elixir BitTorrent
-                            tracker.'';
-              license = stdenv.lib.licenses.mpl20;
-              homepage = "https://github.com/folz/tractor";
-            };
-          }
-      ) {};
-
-    tractor = tractor_0_1_0;
-
     tradie_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "tradie";
             version = "0.0.1";
             src = fetchHex {
@@ -47392,15 +27857,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/madlep/tradie";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     tradie = tradie_0_0_1;
 
     trailing_format_plug_0_0_4 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3, cowboy_1_0_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          plug_1_1_3,
+          cowboy_1_0_4
+        }:
+          buildMix ({
             name = "trailing_format_plug";
             version = "0.0.4";
             src = fetchHex {
@@ -47418,53 +27889,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "http://github.com/mschae/trailing_format_plug";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     trailing_format_plug = trailing_format_plug_0_0_4;
 
-    traitify_elixir_0_1_1 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poison_1_1_1,
-          httpoison_0_7_5,
-          hackney_1_4_8,
-          exvcr_0_3_9,
-          ex_conf_0_1_3
-        }:
-          buildMix {
-            name = "traitify_elixir";
-            version = "0.1.1";
-            src = fetchHex {
-              pkg = "traitify_elixir";
-              version = "0.1.1";
-              sha256 =
-                "ff8568415b70f2fe6548add244cb06c9a9d8c03f0e3d9568730b926f6a9cdd95";
-            };
-            beamDeps  = [
-                          poison_1_1_1
-                          httpoison_0_7_5
-                          hackney_1_4_8
-                          exvcr_0_3_9
-                          ex_conf_0_1_3
-                        ];
-
-            meta = {
-              description = ''An Elixir client library for the Traitify API '';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/traitify/traitify_elixir";
-            };
-          }
-      ) {};
-
-    traitify_elixir = traitify_elixir_0_1_1;
-
     transducer_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "transducer";
             version = "0.1.0";
             src = fetchHex {
@@ -47489,66 +27922,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/garyposter/elixir-transducer";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     transducer = transducer_0_1_0;
 
-    travis_ex_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "travis_ex";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "travis_ex";
-              version = "0.0.2";
-              sha256 =
-                "80589ec01596dfc1e02cef61ce0adc3c9b73977b56a528e214c37af079efa10a";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Travis-ci API client library for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/duksis/travis_ex";
-            };
-          }
-      ) {};
-
-    travis_ex = travis_ex_0_0_2;
-
-    tributary_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, ecto_2_0_0_beta_2 }:
-          buildMix {
-            name = "tributary";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "tributary";
-              version = "0.0.2";
-              sha256 =
-                "f35f7f025b7db0555d4477ddf10622972f9200523355b09bdbb9ecf0f6c95d73";
-            };
-            beamDeps  = [ ecto_2_0_0_beta_2 ];
-
-            meta = {
-              longDescription = ''A simple stream generation library for Ecto
-                                queries that facilitates more efficient paging
-                                of queries both in the database and in your
-                                Ecto-reliant applicaton.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/davidantaramian/tributary";
-            };
-          }
-      ) {};
-
-    tributary = tributary_0_0_2;
-
     trie_1_5_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "trie";
             version = "1.5.0";
             src = fetchHex {
@@ -47563,13 +27945,13 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/okeuday/trie";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     trie_1_5_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "trie";
             version = "1.5.1";
             src = fetchHex {
@@ -47584,7 +27966,7 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/okeuday/trie";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     trie = trie_1_5_1;
@@ -47593,6 +27975,7 @@ let
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           poison_1_5_2,
           plug_heartbeat_0_2_0,
@@ -47600,7 +27983,7 @@ let
           cowboy_1_0_4,
           calliope_0_3_0
         }:
-          buildMix {
+          buildMix ({
             name = "trot";
             version = "0.5.3";
             src = fetchHex {
@@ -47623,15 +28006,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/hexedpackets/trot";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     trot = trot_0_5_3;
 
     tsuru_1_4_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "tsuru";
             version = "1.4.0";
             src = fetchHex {
@@ -47646,112 +28029,15 @@ let
                             applications'';
               license = stdenv.lib.licenses.mit;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     tsuru = tsuru_1_4_0;
 
-    tubex_0_0_7 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "tubex";
-            version = "0.0.7";
-            src = fetchHex {
-              pkg = "tubex";
-              version = "0.0.7";
-              sha256 =
-                "8b34ade3d0484ee5ebb1155c16454d545284d0c215bf999a206cbcc198acea83";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Elixir wrapper of YouTube Data API v3'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/yoavlt/tubex";
-            };
-          }
-      ) {};
-
-    tubex = tubex_0_0_7;
-
-    tuco_tuco_0_8_1 = callPackage
-      (
-        {  buildMix, fetchHex, webdriver_0_8_1 }:
-          buildMix {
-            name = "tuco_tuco";
-            version = "0.8.1";
-            src = fetchHex {
-              pkg = "tuco_tuco";
-              version = "0.8.1";
-              sha256 =
-                "9c61ae99070047928940100e4bc4808583eae656cfaae03e7d6b7a3b3cc23c74";
-            };
-            beamDeps  = [ webdriver_0_8_1 ];
-
-            meta = {
-              description = ''Testing tool for web applications'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/stuart/tuco-tuco";
-            };
-          }
-      ) {};
-
-    tuco_tuco = tuco_tuco_0_8_1;
-
-    twittertex_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, phoenix_html_2_5_1 }:
-          buildMix {
-            name = "twittertex";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "twittertex";
-              version = "0.1.0";
-              sha256 =
-                "76548d5cc68c098e7b04d2cb5846859ac38adb20aa9c3925436b9967ce785503";
-            };
-            beamDeps  = [ phoenix_html_2_5_1 ];
-
-            meta = {
-              description = ''Formats a tweet as HTML, using the entities from
-                            its JSON structure.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/tomtaylor/twittertex";
-            };
-          }
-      ) {};
-
-    twittertex = twittertex_0_1_0;
-
-    twittex_0_0_4 = callPackage
-      (
-        {  buildMix, fetchHex, oauther_1_0_2, oauth2_0_6_0 }:
-          buildMix {
-            name = "twittex";
-            version = "0.0.4";
-            src = fetchHex {
-              pkg = "twittex";
-              version = "0.0.4";
-              sha256 =
-                "2cfe144fe70ed0d0fcfbc18f232a54a844d1ef79db74cd385c8640e40ea30aa7";
-            };
-            beamDeps  = [ oauther_1_0_2 oauth2_0_6_0 ];
-
-            meta = {
-              description = ''Twitter client library for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/almightycouch/twittex";
-            };
-          }
-      ) {};
-
-    twittex = twittex_0_0_4;
-
     type_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "type";
             version = "0.0.2";
             src = fetchHex {
@@ -47766,40 +28052,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/jeffreybaird/type";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     type = type_0_0_2;
 
-    typeformx_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "typeformx";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "typeformx";
-              version = "0.0.1";
-              sha256 =
-                "8f6f1613f53f8c5012eb6d05276f5d305bdb9d4b0e94926680b536d0e1d94a62";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''An Elixir client library for the Typeform API
-                            (typeform.io)'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/netflakes/TypeformX";
-            };
-          }
-      ) {};
-
-    typeformx = typeformx_0_0_1;
-
     tzdata_0_1_201603 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "tzdata";
             version = "0.1.201603";
             src = fetchHex {
@@ -47815,63 +28076,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/lau/tzdata";
             };
-          }
+          } // packageOverrides)
       ) {};
 
-    tzdata_0_5_7 = callPackage
-      (
-        {  buildMix, fetchHex, hackney_1_6_0 }:
-          buildMix {
-            name = "tzdata";
-            version = "0.5.7";
-            src = fetchHex {
-              pkg = "tzdata";
-              version = "0.5.7";
-              sha256 =
-                "1747ca537ddd0861a56a5f37f9fa480a66eb7dfc0f5f1fcdd0b08ba300c87743";
-            };
-            beamDeps  = [ hackney_1_6_0 ];
-
-            meta = {
-              description = ''Tzdata is a parser and library for the tz
-                            database.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/lau/tzdata";
-            };
-          }
-      ) {};
-
-    tzdata = tzdata_0_5_7;
-
-    u2f_0_1_3 = callPackage
-      (
-        {  buildRebar3, fetchHex, jiffy_0_14_7, base64url_0_0_1 }:
-          buildRebar3 {
-            name = "u2f";
-            version = "0.1.3";
-            src = fetchHex {
-              pkg = "u2f";
-              version = "0.1.3";
-              sha256 =
-                "2a781f1664fac6a4de53b25115c1b00a143e02d7b7bdb583e1965a061d20e30c";
-            };
-
-            beamDeps  = [ jiffy_0_14_7 base64url_0_0_1 ];
-
-            meta = {
-              description = ''Server-side U2F library'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/sharpfin/u2f-erl";
-            };
-          }
-      ) {};
-
-    u2f = u2f_0_1_3;
-
     ua_inspector_0_11_0 = callPackage
       (
-        {  buildMix, fetchHex, poolboy_1_5_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poolboy_1_5_1 }:
+          buildMix ({
             name = "ua_inspector";
             version = "0.11.0";
             src = fetchHex {
@@ -47887,15 +28098,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/elixytics/ua_inspector";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ua_inspector = ua_inspector_0_11_0;
 
     uber_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "uber";
             version = "0.1.0";
             src = fetchHex {
@@ -47911,63 +28122,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/gamache/uber.ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     uber = uber_0_1_0;
 
-    ucol_2_0_0 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "ucol";
-            version = "2.0.0";
-            src = fetchHex {
-              pkg = "ucol";
-              version = "2.0.0";
-              sha256 =
-                "b544b88ce034d1d1ab58e093744cbded9a1e8b05006870b4d3865d6cd5066a21";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''ICU based collation module'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/refuge/ucol_nif";
-            };
-          }
-      ) {};
-
-    ucol = ucol_2_0_0;
-
-    ucol_nif_1_1_5 = callPackage
-      (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
-            name = "ucol_nif";
-            version = "1.1.5";
-            src = fetchHex {
-              pkg = "ucol_nif";
-              version = "1.1.5";
-              sha256 =
-                "a6fad2b92dfe84a2654a085163de39cae88762d14c414cdeaeb66ac41d5c156e";
-            };
-            compilePorts = true;
-
-            meta = {
-              description = ''ICU based collation module'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/refuge/ucol_nif";
-            };
-          }
-      ) {};
-
-    ucol_nif = ucol_nif_1_1_5;
-
     udpflux_0_0_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "udpflux";
             version = "0.0.2";
             src = fetchHex {
@@ -47982,15 +28145,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/timbuchwaldt/udpflux";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     udpflux = udpflux_0_0_2;
 
     ueberauth_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "ueberauth";
             version = "0.2.0";
             src = fetchHex {
@@ -48007,115 +28170,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ueberauth/ueberauth";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ueberauth = ueberauth_0_2_0;
 
-    ueberauth_facebook_0_3_2 = callPackage
-      (
-        {  buildMix, fetchHex, ueberauth_0_2_0, oauth2_0_6_0 }:
-          buildMix {
-            name = "ueberauth_facebook";
-            version = "0.3.2";
-            src = fetchHex {
-              pkg = "ueberauth_facebook";
-              version = "0.3.2";
-              sha256 =
-                "d766a41a0b26bccfc1371b776bfcfb760f09639ac3de9aa8885023af9e5641c5";
-            };
-            beamDeps  = [ ueberauth_0_2_0 oauth2_0_6_0 ];
-
-            meta = {
-              description = ''An Uberauth strategy for Facebook
-                            authentication.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ueberauth/ueberauth_facebook";
-            };
-          }
-      ) {};
-
-    ueberauth_facebook = ueberauth_facebook_0_3_2;
-
-    ueberauth_fitbit_0_2_1 = callPackage
-      (
-        {  buildMix, fetchHex, ueberauth_0_2_0, oauth2_0_6_0 }:
-          buildMix {
-            name = "ueberauth_fitbit";
-            version = "0.2.1";
-            src = fetchHex {
-              pkg = "ueberauth_fitbit";
-              version = "0.2.1";
-              sha256 =
-                "669e2bba8f498651dc4c31fbb978179b9d344264ace2ff8f53e007cc6d243956";
-            };
-            beamDeps  = [ ueberauth_0_2_0 oauth2_0_6_0 ];
-
-            meta = {
-              description = ''An Ueberauth strategy for Fitbit OAuth2
-                            authentication'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/vinniefranco/ueberauth_fitbit";
-            };
-          }
-      ) {};
-
-    ueberauth_fitbit = ueberauth_fitbit_0_2_1;
-
-    ueberauth_github_0_2_0 = callPackage
-      (
-        {  buildMix, fetchHex, ueberauth_0_2_0, oauth2_0_6_0 }:
-          buildMix {
-            name = "ueberauth_github";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "ueberauth_github";
-              version = "0.2.0";
-              sha256 =
-                "b12b3dae8c097d5cd57a3e1cd97286b796ee36794b031f92a76e848f572cb4ab";
-            };
-            beamDeps  = [ ueberauth_0_2_0 oauth2_0_6_0 ];
-
-            meta = {
-              description = ''An Ueberauth strategy for using Github to
-                            authenticate your users.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ueberauth/ueberauth_github";
-            };
-          }
-      ) {};
-
-    ueberauth_github = ueberauth_github_0_2_0;
-
-    ueberauth_google_0_2_0 = callPackage
-      (
-        {  buildMix, fetchHex, ueberauth_0_2_0, oauth2_0_6_0 }:
-          buildMix {
-            name = "ueberauth_google";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "ueberauth_google";
-              version = "0.2.0";
-              sha256 =
-                "b57f13534f37b7062df5a696976453af1faabc00d608ccdce29f9289164fce44";
-            };
-            beamDeps  = [ ueberauth_0_2_0 oauth2_0_6_0 ];
-
-            meta = {
-              description = ''An Uberauth strategy for Google
-                            authentication.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ueberauth/ueberauth_google";
-            };
-          }
-      ) {};
-
-    ueberauth_google = ueberauth_google_0_2_0;
-
     ueberauth_identity_0_2_3 = callPackage
       (
-        {  buildMix, fetchHex, ueberauth_0_2_0, plug_1_1_3 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          ueberauth_0_2_0,
+          plug_1_1_3
+        }:
+          buildMix ({
             name = "ueberauth_identity";
             version = "0.2.3";
             src = fetchHex {
@@ -48132,64 +28201,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ueberauth/ueberauth_identity";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ueberauth_identity = ueberauth_identity_0_2_3;
 
-    ueberauth_slack_0_2_0 = callPackage
-      (
-        {  buildMix, fetchHex, ueberauth_0_2_0, oauth2_0_6_0 }:
-          buildMix {
-            name = "ueberauth_slack";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "ueberauth_slack";
-              version = "0.2.0";
-              sha256 =
-                "1b109ed50d34b3a18d5db04234475baa3ae08893b46a7b5a1726fec4adb6753b";
-            };
-            beamDeps  = [ ueberauth_0_2_0 oauth2_0_6_0 ];
-
-            meta = {
-              description = ''An Ueberauth strategy for using Slack to
-                            authenticate your users'';
-
-            };
-          }
-      ) {};
-
-    ueberauth_slack = ueberauth_slack_0_2_0;
-
-    ueberauth_twitter_0_2_2 = callPackage
-      (
-        {  buildMix, fetchHex, ueberauth_0_2_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "ueberauth_twitter";
-            version = "0.2.2";
-            src = fetchHex {
-              pkg = "ueberauth_twitter";
-              version = "0.2.2";
-              sha256 =
-                "911a227b8290e8d65cee8d45015477d4ea51dbcf637c8a41ff88b34fcc5ab65a";
-            };
-            beamDeps  = [ ueberauth_0_2_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''An Uberauth strategy for Twitter
-                            authentication.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ueberauth/ueberauth_twitter";
-            };
-          }
-      ) {};
-
-    ueberauth_twitter = ueberauth_twitter_0_2_2;
-
     ui_0_1_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "ui";
             version = "0.1.1";
             src = fetchHex {
@@ -48199,19 +28219,22 @@ let
                 "492da59ca39055c0dfc794a2ebd564adb9ed635402c7b46659981f32aa9d94c1";
             };
 
+            buildPlugins  = [ rebar3_hex ];
+
+
             meta = {
               description = ''An OTP application'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ui = ui_0_1_1;
 
     uk_postcode_0_3_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "uk_postcode";
             version = "0.3.0";
             src = fetchHex {
@@ -48228,15 +28251,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/KushalP/uk_postcode";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     uk_postcode = uk_postcode_0_3_0;
 
     ulitos_0_3_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "ulitos";
             version = "0.3.0";
             src = fetchHex {
@@ -48251,15 +28274,15 @@ let
 
               homepage = "https://github.com/palkan/ulitos";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     ulitos = ulitos_0_3_0;
 
     unit_fun_0_5_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "unit_fun";
             version = "0.5.1";
             src = fetchHex {
@@ -48275,15 +28298,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/meadsteve/unit_fun";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     unit_fun = unit_fun_0_5_1;
 
     units_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "units";
             version = "1.0.0";
             src = fetchHex {
@@ -48298,88 +28321,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/solatis/units";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     units = units_1_0_0;
 
-    unsplash_0_3_0 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_1_5_2, oauth2_0_6_0, httpoison_0_8_2
-        }:
-          buildMix {
-            name = "unsplash";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "unsplash";
-              version = "0.3.0";
-              sha256 =
-                "609ded0d452729df1d6272ca7997a6bd6fb65821606f17d078c73a1b2ecbc37a";
-            };
-            beamDeps  = [ poison_1_5_2 oauth2_0_6_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Unsplash API in Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/waynehoover/unsplash-elixir";
-            };
-          }
-      ) {};
-
-    unsplash = unsplash_0_3_0;
-
-    untappd_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2, exjsx_3_2_0 }:
-          buildMix {
-            name = "untappd";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "untappd";
-              version = "0.0.1";
-              sha256 =
-                "f4560612cd78002202234660cf248f004c91ade8c10dc87ad136eb5d8f49d66a";
-            };
-            beamDeps  = [ httpoison_0_8_2 exjsx_3_2_0 ];
-
-            meta = {
-              description = ''Elixir wrapper for the Untappd API'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/nimi/untappd";
-            };
-          }
-      ) {};
-
-    untappd = untappd_0_0_1;
-
-    upyun_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "upyun";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "upyun";
-              version = "0.0.1";
-              sha256 =
-                "a5276f371b667efb1da6e48828279963b23d6eb4b5a5225e6f3e19c77c4e4851";
-            };
-
-            meta = {
-              description = ''UPYun sdk for Elixir. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/Hor/upyun-elixir";
-            };
-          }
-      ) {};
-
-    upyun = upyun_0_0_1;
-
     uri_0_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "uri";
             version = "0.1.0";
             src = fetchHex {
@@ -48393,37 +28343,15 @@ let
               description = ''URI Parsing/Encoding Library'';
 
             };
-          }
+          } // packageOverrides)
       ) {};
 
     uri = uri_0_1_0;
 
-    uri_template_1_2_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "uri_template";
-            version = "1.2.0";
-            src = fetchHex {
-              pkg = "uri_template";
-              version = "1.2.0";
-              sha256 =
-                "c1c97235b8571703926e77449cb272f8ae3a0710b6c91099ec6f66f44425a8c0";
-            };
-
-            meta = {
-              description = ''RFC 6570 complient URI template processor'';
-              license = stdenv.lib.licenses.free;
-            };
-          }
-      ) {};
-
-    uri_template = uri_template_1_2_0;
-
     urilib_0_1_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "urilib";
             version = "0.1.1";
             src = fetchHex {
@@ -48439,63 +28367,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/gmr/urilib";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     urilib = urilib_0_1_1;
 
-    url_unroller_0_0_3 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2 }:
-          buildMix {
-            name = "url_unroller";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "url_unroller";
-              version = "0.0.3";
-              sha256 =
-                "65a46b7335060111bdc5ad164548361f3c7ff5a39ff9493a9109dd20b98498b9";
-            };
-            beamDeps  = [ httpoison_0_8_2 ];
-
-            meta = {
-              description = ''A simple url unroller/unshortener'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/semanticart/url_unroller";
-            };
-          }
-      ) {};
-
-    url_unroller = url_unroller_0_0_3;
-
-    urna_0_1_4 = callPackage
-      (
-        {  buildMix, fetchHex, cauldron_0_1_5, jazz_0_2_1 }:
-          buildMix {
-            name = "urna";
-            version = "0.1.4";
-            src = fetchHex {
-              pkg = "urna";
-              version = "0.1.4";
-              sha256 =
-                "46f531370376bd4730cf7c17eede9b9b92ce46c5a57e9ce1e129fcc17a2b2848";
-            };
-            beamDeps  = [ cauldron_0_1_5 jazz_0_2_1 ];
-
-            meta = {
-              description = ''REST in peace'';
-              license = stdenv.lib.licenses.wtfpl;
-              homepage = "https://github.com/meh/urna";
-            };
-          }
-      ) {};
-
-    urna = urna_0_1_4;
-
     uuid_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "uuid";
             version = "1.0.0";
             src = fetchHex {
@@ -48510,13 +28390,13 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/zyro/elixir-uuid";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     uuid_1_1_3 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "uuid";
             version = "1.1.3";
             src = fetchHex {
@@ -48531,40 +28411,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/zyro/elixir-uuid";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     uuid = uuid_1_1_3;
 
-    uuid_erl_1_5_1 = callPackage
-      (
-        {  buildRebar3, fetchHex, quickrand_1_5_1 }:
-          buildRebar3 {
-            name = "uuid_erl";
-            version = "1.5.1";
-            src = fetchHex {
-              pkg = "uuid_erl";
-              version = "1.5.1";
-              sha256 =
-                "fd2a8d90693631455073d4ae2b34fdb9d58da30c0ee0e63149fbf320c71b74fa";
-            };
-
-            beamDeps  = [ quickrand_1_5_1 ];
-
-            meta = {
-              description = ''Erlang UUID Implementation'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/okeuday/uuid";
-            };
-          }
-      ) {};
-
-    uuid_erl = uuid_erl_1_5_1;
-
     vagrant_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "vagrant";
             version = "0.0.1";
             src = fetchHex {
@@ -48579,40 +28434,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/mobileoverlord/vagrant";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     vagrant = vagrant_0_0_1;
 
-    valid_field_0_3_0 = callPackage
-      (
-        {  buildMix, fetchHex, ecto_2_0_0_beta_2 }:
-          buildMix {
-            name = "valid_field";
-            version = "0.3.0";
-            src = fetchHex {
-              pkg = "valid_field";
-              version = "0.3.0";
-              sha256 =
-                "258591717d45835be4f3b299a2c332dc33702876c272f2fff455956c4a5409dc";
-            };
-            beamDeps  = [ ecto_2_0_0_beta_2 ];
-
-            meta = {
-              description = ''ValidField aids unit testing a changeset for
-                            valid (and invalid) fields'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/dockyard/valid_field";
-            };
-          }
-      ) {};
-
-    valid_field = valid_field_0_3_0;
-
     varpool_1_5_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "varpool";
             version = "1.5.1";
             src = fetchHex {
@@ -48627,15 +28457,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/okeuday/varpool";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     varpool = varpool_1_5_1;
 
     vector_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "vector";
             version = "0.1.0";
             src = fetchHex {
@@ -48651,13 +28481,13 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/pkinney/vector_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     vector_0_2_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "vector";
             version = "0.2.1";
             src = fetchHex {
@@ -48673,43 +28503,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/pkinney/vector_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     vector = vector_0_2_1;
 
-    velkoz_0_0_1 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2, ex_rated_1_2_2
-        }:
-          buildMix {
-            name = "velkoz";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "velkoz";
-              version = "0.0.1";
-              sha256 =
-                "3eaa4d2f1b1904d57811e42a841735eb2eb74eb4ea93c7182e1c0b1e0a01a7e8";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ex_rated_1_2_2 ];
-
-            meta = {
-              longDescription = ''Velkoz is an api wrapper for the game leauge
-                                of legends. You can find the api documentation
-                                :: https://developer.riotgames.com/api'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/tesseract-tech/velkoz";
-            };
-          }
-      ) {};
-
-    velkoz = velkoz_0_0_1;
-
     verify_origin_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "verify_origin";
             version = "0.1.0";
             src = fetchHex {
@@ -48726,7 +28528,7 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/danmcclain/verify_origin";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     verify_origin = verify_origin_0_1_0;
@@ -48735,6 +28537,7 @@ let
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           watcher_1_0_0,
           timex_1_0_2,
@@ -48742,7 +28545,7 @@ let
           poolboy_1_5_1,
           poison_1_5_2
         }:
-          buildMix {
+          buildMix ({
             name = "verk";
             version = "0.9.11";
             src = fetchHex {
@@ -48765,53 +28568,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/edgurgel/verk";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     verk = verk_0_9_11;
 
-    verk_web_0_9_4 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          verk_0_9_11,
-          phoenix_html_2_5_1,
-          phoenix_1_1_4,
-          gettext_0_10_0,
-          cowboy_1_0_4
-        }:
-          buildMix {
-            name = "verk_web";
-            version = "0.9.4";
-            src = fetchHex {
-              pkg = "verk_web";
-              version = "0.9.4";
-              sha256 =
-                "58c5c58515d435eda9f2ddb42d418b8e189b624f2b365e0a70fcd18880c8cb07";
-            };
-            beamDeps  = [
-                          verk_0_9_11
-                          phoenix_html_2_5_1
-                          phoenix_1_1_4
-                          gettext_0_10_0
-                          cowboy_1_0_4
-                        ];
-
-            meta = {
-              description = ''A Verk dashboard'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/edgurgel/verk_web";
-            };
-          }
-      ) {};
-
-    verk_web = verk_web_0_9_4;
-
     vex_0_5_5 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "vex";
             version = "0.5.5";
             src = fetchHex {
@@ -48827,88 +28592,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/CargoSense/vex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     vex = vex_0_5_5;
 
-    viktor_0_0_9 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "viktor";
-            version = "0.0.9";
-            src = fetchHex {
-              pkg = "viktor";
-              version = "0.0.9";
-              sha256 =
-                "876c3b9dbac7503640144fc9850c80e56148daa3aa28029f5d8fb44b35b999ff";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Client API wrapper for League of Legends API.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/josephyi/viktor";
-            };
-          }
-      ) {};
-
-    viktor = viktor_0_0_9;
-
-    vimeo_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_7_5 }:
-          buildMix {
-            name = "vimeo";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "vimeo";
-              version = "0.0.2";
-              sha256 =
-                "62adf724e67b6fefa2ecc2fcc770e320f4133676cf67cd68a39e5ca45ddd3377";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_7_5 ];
-
-            meta = {
-              description = ''Vimeo API v3 client library for Elixir.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/lilfaf/vimeo.ex";
-            };
-          }
-      ) {};
-
-    vimeo = vimeo_0_0_2;
-
-    virus_total_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, jsx_2_8_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "virus_total";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "virus_total";
-              version = "0.0.1";
-              sha256 =
-                "bed3680d17c98f978a90f5b443b6e269ee0a3f2239d2262502d8d10ee042ebfa";
-            };
-            beamDeps  = [ jsx_2_8_0 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Elixir OTP application for the VirusTotal Public
-                            API v2.0'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/dtykocki/virus_total";
-            };
-          }
-      ) {};
-
-    virus_total = virus_total_0_0_1;
-
     voorhees_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_2_1_0, ex_doc_0_11_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_2_1_0,
+          ex_doc_0_11_4
+        }:
+          buildMix ({
             name = "voorhees";
             version = "0.1.1";
             src = fetchHex {
@@ -48924,15 +28622,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/danmcclain/voorhees";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     voorhees = voorhees_0_1_1;
 
     voxpop_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "voxpop";
             version = "0.0.1";
             src = fetchHex {
@@ -48948,51 +28646,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/zovafit/voxpop";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     voxpop = voxpop_0_0_1;
 
-    wallaby_0_1_0 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poolboy_1_5_1,
-          poison_2_1_0,
-          httpoison_0_8_2,
-          dialyze_0_2_1
-        }:
-          buildMix {
-            name = "wallaby";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "wallaby";
-              version = "0.1.0";
-              sha256 =
-                "836fd7f97f1f70befc6e2e3a9bc785ff70b5de053d2e9ca021a5918edfa0a099";
-            };
-            beamDeps  = [
-                          poolboy_1_5_1
-                          poison_2_1_0
-                          httpoison_0_8_2
-                          dialyze_0_2_1
-                        ];
-
-            meta = {
-              description = ''Concurrent feature tests for elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/keathley/wallaby";
-            };
-          }
-      ) {};
-
-    wallaby = wallaby_0_1_0;
-
     watcher_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "watcher";
             version = "1.0.0";
             src = fetchHex {
@@ -49007,38 +28669,22 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/edgurgel/watcher";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     watcher = watcher_1_0_0;
 
-    wayback_archiver_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, httpotion_2_2_2, floki_0_8_0 }:
-          buildMix {
-            name = "wayback_archiver";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "wayback_archiver";
-              version = "0.0.1";
-              sha256 =
-                "9f8bea06d6dcac6c017a3a41859373c10a1b46fb133db47300c2ae7c9fada590";
-            };
-            beamDeps  = [ httpotion_2_2_2 floki_0_8_0 ];
-
-            meta = {
-              description = ''Send URLs to Wayback Machine'';
-              license = stdenv.lib.licenses.free;
-            };
-          }
-      ) {};
-
-    wayback_archiver = wayback_archiver_0_0_1;
-
     web_socket_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_4_0, plug_0_12_2, cowboy_1_0_4 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          poison_1_4_0,
+          plug_0_12_2,
+          cowboy_1_0_4
+        }:
+          buildMix ({
             name = "web_socket";
             version = "0.0.1";
             src = fetchHex {
@@ -49054,15 +28700,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/slogsdon/plug-web-socket";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     web_socket = web_socket_0_0_1;
 
     webassembly_0_6_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "webassembly";
             version = "0.6.1";
             src = fetchHex {
@@ -49084,111 +28730,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/herenowcoder/webassembly";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     webassembly = webassembly_0_6_1;
 
-    webdriver_0_8_1 = callPackage
-      (
-        {  buildMix, fetchHex, jazz_0_2_1, httpotion_2_2_2 }:
-          buildMix {
-            name = "webdriver";
-            version = "0.8.1";
-            src = fetchHex {
-              pkg = "webdriver";
-              version = "0.8.1";
-              sha256 =
-                "fe2009920fb210cd50df3a7d2bb40cd6f2844a538d52a48952f18008e1c5f3d3";
-            };
-            beamDeps  = [ jazz_0_2_1 httpotion_2_2_2 ];
-
-            meta = {
-              description = ''Webdriver protocol for driving web browsers.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/stuart/elixir-webdriver";
-            };
-          }
-      ) {};
-
-    webdriver = webdriver_0_8_1;
-
-    weber_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "weber";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "weber";
-              version = "0.1.0";
-              sha256 =
-                "742c45b3c99e207dd0aeccb818edd2ace4af10699c96fbcee0ce2f692dc5fe12";
-            };
-
-            meta = {
-              description = ''weber - is Elixir MVC web framework.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/elixir-web/weber";
-            };
-          }
-      ) {};
-
-    weber = weber_0_1_0;
-
-    webmentions_0_0_5 = callPackage
-      (
-        {  buildMix, fetchHex, httpotion_2_2_2, floki_0_7_2 }:
-          buildMix {
-            name = "webmentions";
-            version = "0.0.5";
-            src = fetchHex {
-              pkg = "webmentions";
-              version = "0.0.5";
-              sha256 =
-                "8240363589044572bc1ceddef0843d03ccb23e7ca5bb660e9dd11fb7c9e06414";
-            };
-            beamDeps  = [ httpotion_2_2_2 floki_0_7_2 ];
-
-            meta = {
-              description = ''A Webmentions
-                            (https://indiewebcamp.com/Webmention) module for
-                            Elixir'';
-              license = stdenv.lib.licenses.agpl3;
-              homepage = "https://github.com/ckruse/webmentions-elixir";
-            };
-          }
-      ) {};
-
-    webmentions = webmentions_0_0_5;
-
-    webpay_0_0_4 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "webpay";
-            version = "0.0.4";
-            src = fetchHex {
-              pkg = "webpay";
-              version = "0.0.4";
-              sha256 =
-                "abab40fc7fda25a55d3a3dce4327d3f322df378432a9ed5e7c43e553989f467e";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Elixir Webpay API wrapper'';
-
-            };
-          }
-      ) {};
-
-    webpay = webpay_0_0_4;
-
     websocket_client_1_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "websocket_client";
             version = "1.1.0";
             src = fetchHex {
@@ -49203,15 +28753,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/sanmiguel/websocket_client";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     websocket_client = websocket_client_1_1_0;
 
     wechat_check_signature_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "wechat_check_signature";
             version = "0.0.1";
             src = fetchHex {
@@ -49227,15 +28777,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/octocandy/wechat_check_signature";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     wechat_check_signature = wechat_check_signature_0_0_1;
 
     wechatex_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex, plug_1_1_3 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, plug_1_1_3 }:
+          buildMix ({
             name = "wechatex";
             version = "0.0.1";
             src = fetchHex {
@@ -49251,39 +28801,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/octocandy/wechatex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     wechatex = wechatex_0_0_1;
 
-    weebo_0_1_2 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "weebo";
-            version = "0.1.2";
-            src = fetchHex {
-              pkg = "weebo";
-              version = "0.1.2";
-              sha256 =
-                "335367353f5675f3ce0ced41512b554da0f986efc4064479d403726c0a169231";
-            };
-
-            meta = {
-              description = ''An XML-RPC parser/formatter for Elixir, with full
-                            support for datatype mapping!'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/stevenschobert/weebo";
-            };
-          }
-      ) {};
-
-    weebo = weebo_0_1_2;
-
     white_bread_2_5_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "white_bread";
             version = "2.5.0";
             src = fetchHex {
@@ -49300,68 +28826,21 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/meadsteve/white-bread";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     white_bread = white_bread_2_5_0;
 
-    wifi_0_2_0 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_4_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "wifi";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "wifi";
-              version = "0.2.0";
-              sha256 =
-                "0060d0dda9308e9dc652e83f7646485d932188a11e17fb814125ccd7449effc5";
-            };
-            beamDeps  = [ poison_1_4_0 httpoison_0_8_2 ];
-
-            meta = {
-              longDescription = ''Various utility functions for working with
-                                the local Wifi network in Elixir. These
-                                functions are mostly useful in scripts that
-                                could benefit from knowing the current location
-                                of the computer or the Wifi surroundings.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/gausby/wifi";
-            };
-          }
-      ) {};
-
-    wifi = wifi_0_2_0;
-
-    wire_0_2_0 = callPackage
-      (
-        {  buildMix, fetchHex, bencoder_0_0_7 }:
-          buildMix {
-            name = "wire";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "wire";
-              version = "0.2.0";
-              sha256 =
-                "0a2ce1329c321bd675a79152e3ed2e99cc59b3747112498e62b14bf686ca7fba";
-            };
-            beamDeps  = [ bencoder_0_0_7 ];
-
-            meta = {
-              description = ''Encode and decode bittorrent peer wire protocol
-                            messages'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/alehander42/wire";
-            };
-          }
-      ) {};
-
-    wire = wire_0_2_0;
-
     witchcraft_0_4_2 = callPackage
       (
-        {  buildMix, fetchHex, quark_1_0_2, algae_0_10_0 }:
-          buildMix {
+        {
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          quark_1_0_2,
+          algae_0_10_0
+        }:
+          buildMix ({
             name = "witchcraft";
             version = "0.4.2";
             src = fetchHex {
@@ -49377,15 +28856,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/robot-overlord/witchcraft";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     witchcraft = witchcraft_0_4_2;
 
     wizard_0_1_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "wizard";
             version = "0.1.0";
             src = fetchHex {
@@ -49401,40 +28880,17 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/raywan/wizard";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     wizard = wizard_0_1_0;
 
-    wizardry_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, plug_1_1_3, comeonin_1_6_0 }:
-          buildMix {
-            name = "wizardry";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "wizardry";
-              version = "0.0.1";
-              sha256 =
-                "4a85b8c3e5813dee20aa0d5503811568743644883723c9b226436616c9a779a3";
-            };
-            beamDeps  = [ plug_1_1_3 comeonin_1_6_0 ];
-
-            meta = {
-              description = ''Simple, low-level user account framework for
-                            Phoenix Framework'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/knrz/wizardry";
-            };
-          }
-      ) {};
-
-    wizardry = wizardry_0_0_1;
-
     work_queue_0_0_3 = callPackage
       (
-        {  buildMix, fetchHex, pipe_while_ok_0_0_2 }:
-          buildMix {
+        {
+          buildMix, packageOverrides ? {}, fetchHex, pipe_while_ok_0_0_2
+        }:
+          buildMix ({
             name = "work_queue";
             version = "0.0.3";
             src = fetchHex {
@@ -49451,15 +28907,15 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/pragdave/work_queue";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     work_queue = work_queue_0_0_3;
 
     worker_pool_1_0_4 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "worker_pool";
             version = "1.0.4";
             src = fetchHex {
@@ -49474,15 +28930,15 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/inaka/worker_pool";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     worker_pool = worker_pool_1_0_4;
 
     workex_0_10_0 = callPackage
       (
-        {  buildMix, fetchHex, exactor_2_2_0 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, exactor_2_2_0 }:
+          buildMix ({
             name = "workex";
             version = "0.10.0";
             src = fetchHex {
@@ -49499,15 +28955,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/sasa1977/workex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     workex = workex_0_10_0;
 
     workshop_0_5_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "workshop";
             version = "0.5.1";
             src = fetchHex {
@@ -49524,15 +28980,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/gausby/workshop";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     workshop = workshop_0_5_1;
 
     world_json_0_1_6 = callPackage
       (
-        {  buildMix, fetchHex, poison_1_3_1 }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex, poison_1_3_1 }:
+          buildMix ({
             name = "world_json";
             version = "0.1.6";
             src = fetchHex {
@@ -49549,147 +29005,22 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/camshaft/world_json_ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     world_json = world_json_0_1_6;
 
-    wpa_supplicant_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex }:
-          buildMix {
-            name = "wpa_supplicant";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "wpa_supplicant";
-              version = "0.1.0";
-              sha256 =
-                "8a73ca51203401755d42ba636918106540aa3723006dab344dc8a7ec8fa2f3d5";
-            };
-
-            meta = {
-              longDescription = ''Elixir interface to the wpa_supplicant
-                                daemon. The wpa_supplicant provides application
-                                support for scanning for access points, managing
-                                Wi-Fi connections, and handling all of the
-                                security and other parameters associated with
-                                Wi-Fi. '';
-              license = with stdenv.lib.licenses; [ asl20 free ];
-              homepage = "https://github.com/fhunleth/wpa_supplicant.ex";
-            };
-          }
-      ) {};
-
-    wpa_supplicant = wpa_supplicant_0_1_0;
-
-    wykop_api_0_0_4 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "wykop_api";
-            version = "0.0.4";
-            src = fetchHex {
-              pkg = "wykop_api";
-              version = "0.0.4";
-              sha256 =
-                "0c2acade581168e5cdf3d1dbde53183bc1c49882c8ba8793e045f20d5a9a26d0";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Library for Wykop API.'';
-              license = stdenv.lib.licenses.cc0;
-              homepage = "https://github.com/remiq/wykop_api_elixir";
-            };
-          }
-      ) {};
-
-    wykop_api = wykop_api_0_0_4;
-
-    xe_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, httpoison_0_8_2, floki_0_8_0 }:
-          buildMix {
-            name = "xe";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "xe";
-              version = "0.0.1";
-              sha256 =
-                "53d693612db1343c36a7bbe6286c23f7ccfdbd44500c2a38970743238d230a77";
-            };
-            beamDeps  = [ httpoison_0_8_2 floki_0_8_0 ];
-
-            meta = {
-              description = ''Real time conversion for currencies'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/paulodiniz/xe";
-            };
-          }
-      ) {};
-
-    xe = xe_0_0_1;
-
-    xfighter_0_2_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "xfighter";
-            version = "0.2.1";
-            src = fetchHex {
-              pkg = "xfighter";
-              version = "0.2.1";
-              sha256 =
-                "67bb43379cd89b4b95f65f02ad5421719723d262fdbe7e399fb82ac7f3b490a8";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''An API wrapper for the programming game
-                            Stockfighter.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/bitchef/xfighter";
-            };
-          }
-      ) {};
-
-    xfighter = xfighter_0_2_1;
-
-    xkcd_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_2_1_0, httpoison_0_8_2 }:
-          buildMix {
-            name = "xkcd";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "xkcd";
-              version = "0.0.1";
-              sha256 =
-                "1c757360b9c5ff3d098e9c04874ed273289ea890e4d87e7dd99164633fe061b5";
-            };
-            beamDeps  = [ poison_2_1_0 httpoison_0_8_2 ];
-
-            meta = {
-              longDescription = ''Uses the XKCD JSON API to retrieve the
-                                random, specific and the latest XKCD comic.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/notdevinclark/xkcd";
-            };
-          }
-      ) {};
-
-    xkcd = xkcd_0_0_1;
-
     xlsx_parser_0_0_4 = callPackage
       (
         {
           buildMix,
+          packageOverrides ? {},
           fetchHex,
           timex_1_0_2,
           sweet_xml_0_5_1,
           simple_agent_0_0_7
         }:
-          buildMix {
+          buildMix ({
             name = "xlsx_parser";
             version = "0.0.4";
             src = fetchHex {
@@ -49707,7 +29038,7 @@ let
               homepage =
                 "https://github.com/TheFirstAvenger/elixir-xlsx_parser.git";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     xlsx_parser = xlsx_parser_0_0_4;
@@ -49715,9 +29046,14 @@ let
     xlsxir_0_0_2 = callPackage
       (
         {
-          buildMix, fetchHex, sweet_xml_0_6_1, ex_doc_0_11_4, earmark_0_2_1
+          buildMix,
+          packageOverrides ? {},
+          fetchHex,
+          sweet_xml_0_6_1,
+          ex_doc_0_11_4,
+          earmark_0_2_1
         }:
-          buildMix {
+          buildMix ({
             name = "xlsxir";
             version = "0.0.2";
             src = fetchHex {
@@ -49735,15 +29071,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/kennellroxco/xlsxir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     xlsxir = xlsxir_0_0_2;
 
     xml_builder_0_0_8 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "xml_builder";
             version = "0.0.8";
             src = fetchHex {
@@ -49758,15 +29094,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/joshnuss/xml_builder";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     xml_builder = xml_builder_0_0_8;
 
     xmlrpc_0_9_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "xmlrpc";
             version = "0.9.1";
             src = fetchHex {
@@ -49784,41 +29120,17 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/ewildgoose/elixir-xml_rpc";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     xmlrpc = xmlrpc_0_9_1;
 
-    xoauth2_0_0_3 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_1_5_2, mock_0_1_3, httpoison_0_8_2
-        }:
-          buildMix {
-            name = "xoauth2";
-            version = "0.0.3";
-            src = fetchHex {
-              pkg = "xoauth2";
-              version = "0.0.3";
-              sha256 =
-                "4a43a0bca1707b579c6a141524666006dd25ed2efdc19aee5d6eeedf6efc3418";
-            };
-            beamDeps  = [ poison_1_5_2 mock_0_1_3 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''A simple XOAuth2 module for Elixir'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/craigp/elixir_xoauth2";
-            };
-          }
-      ) {};
-
-    xoauth2 = xoauth2_0_0_3;
-
     xref_runner_0_2_5 = callPackage
       (
-        {  buildErlangMk, fetchHex, getopt_0_8_2 }:
-          buildErlangMk {
+        {
+          buildErlangMk, packageOverrides ? {}, fetchHex, getopt_0_8_2
+        }:
+          buildErlangMk ({
             name = "xref_runner";
             version = "0.2.5";
             src = fetchHex {
@@ -49834,15 +29146,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/inaka/xref_runner";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     xref_runner = xref_runner_0_2_5;
 
     xxhash_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "xxhash";
             version = "0.2.0";
             src = fetchHex {
@@ -49857,40 +29169,15 @@ let
               license = stdenv.lib.licenses.free;
               homepage = "https://github.com/ttvd/elixir-xxhash";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     xxhash = xxhash_0_2_0;
 
-    yahoo_fx_0_2_0 = callPackage
-      (
-        {  buildMix, fetchHex, time_seer_0_0_6, httpoison_0_8_2 }:
-          buildMix {
-            name = "yahoo_fx";
-            version = "0.2.0";
-            src = fetchHex {
-              pkg = "yahoo_fx";
-              version = "0.2.0";
-              sha256 =
-                "e06b6986c483cad62081e19fba3089f3eab4a4f1e1cc06cd17aa45d34dd14913";
-            };
-            beamDeps  = [ time_seer_0_0_6 httpoison_0_8_2 ];
-
-            meta = {
-              longDescription = ''YahooFx is an Elixir library for getting
-                                currency exchange rates from Yahoo Finance'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/lau/yahoo_fx";
-            };
-          }
-      ) {};
-
-    yahoo_fx = yahoo_fx_0_2_0;
-
     yaml_elixir_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "yaml_elixir";
             version = "1.0.0";
             src = fetchHex {
@@ -49906,40 +29193,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/KamilLelonek/yaml-elixir";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     yaml_elixir = yaml_elixir_1_0_0;
 
-    yar_0_1_0 = callPackage
-      (
-        {  buildMix, fetchHex, socket_0_3_1 }:
-          buildMix {
-            name = "yar";
-            version = "0.1.0";
-            src = fetchHex {
-              pkg = "yar";
-              version = "0.1.0";
-              sha256 =
-                "23cdbe07714deee32a3d4be77e7c392ef57ab8ad28d10e053edf1cb0a136c2e6";
-            };
-            beamDeps  = [ socket_0_3_1 ];
-
-            meta = {
-              description = ''Yet Another Redis client (implemented in pure
-                            elixir)'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/dantswain/yar";
-            };
-          }
-      ) {};
-
-    yar = yar_0_1_0;
-
     yes_msg_0_1_0 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "yes_msg";
             version = "0.1.0";
             src = fetchHex {
@@ -49954,143 +29216,15 @@ let
                             Erlang.'';
               license = stdenv.lib.licenses.mit;
             };
-          }
+          } // packageOverrides)
       ) {};
 
     yes_msg = yes_msg_0_1_0;
 
-    yggdrasil_1_1_1 = callPackage
-      (
-        {  buildMix, fetchHex, exredis_0_2_3, amqp_0_1_4 }:
-          buildMix {
-            name = "yggdrasil";
-            version = "1.1.1";
-            src = fetchHex {
-              pkg = "yggdrasil";
-              version = "1.1.1";
-              sha256 =
-                "0e83184601187cfc2a7a101085eed98b31911279e442dd761bdbc692b6c87a40";
-            };
-            beamDeps  = [ exredis_0_2_3 amqp_0_1_4 ];
-
-            meta = {
-              longDescription = ''Yggdrasil is an app to manage subscriptions
-                                to several brokers. It has simple
-                                implementations for Redis and RabbitMQ, but they
-                                can easily be extended. Also provides a
-                                `behaviour` to define custom brokers.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/gmtprime/yggdrasil";
-            };
-          }
-      ) {};
-
-    yggdrasil = yggdrasil_1_1_1;
-
-    yocingo_0_0_2 = callPackage
-      (
-        {
-          buildMix, fetchHex, httpoison_0_8_2, exjsx_3_2_0, earmark_0_2_1
-        }:
-          buildMix {
-            name = "yocingo";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "yocingo";
-              version = "0.0.2";
-              sha256 =
-                "3ce350bb833e72edc684dc6ece956146161d4b7215cd9557f95bb2d7dcb1abf4";
-            };
-            beamDeps  = [ httpoison_0_8_2 exjsx_3_2_0 earmark_0_2_1 ];
-
-            meta = {
-              longDescription = ''This is a full Telegram Bot API. With this
-                                module you can create your own Telegram Bot.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/Yawolf/yocingo";
-            };
-          }
-      ) {};
-
-    yocingo = yocingo_0_0_2;
-
-    yodlee_0_1_4 = callPackage
-      (
-        {
-          buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2, hackney_1_4_10
-        }:
-          buildMix {
-            name = "yodlee";
-            version = "0.1.4";
-            src = fetchHex {
-              pkg = "yodlee";
-              version = "0.1.4";
-              sha256 =
-                "a5ecf2c7ec42611f7f6cdaf0980da6028f5881e23484b2bf001d75fb6f0525df";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 hackney_1_4_10 ];
-
-            meta = {
-              description = ''Yodlee API'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/levanto-financial/yodlee-elixir";
-            };
-          }
-      ) {};
-
-    yodlee = yodlee_0_1_4;
-
-    yomel_0_5_0 = callPackage
-      (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
-            name = "yomel";
-            version = "0.5.0";
-            src = fetchHex {
-              pkg = "yomel";
-              version = "0.5.0";
-              sha256 =
-                "737be278c9ae9ed40b24a45a461ea47b4979429e1d51b28961d43ee3a6426827";
-            };
-
-            meta = {
-              description = ''Decodes yaml into elixir terms'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/Joe-noh/yomel";
-            };
-          }
-      ) {};
-
-    yomel = yomel_0_5_0;
-
-    ytx_0_0_5 = callPackage
-      (
-        {  buildMix, fetchHex, rapidax_0_0_3 }:
-          buildMix {
-            name = "ytx";
-            version = "0.0.5";
-            src = fetchHex {
-              pkg = "ytx";
-              version = "0.0.5";
-              sha256 =
-                "a30877517201e1c964627782345273fa7ae2157591d1ae6f5663333f370db6f6";
-            };
-            beamDeps  = [ rapidax_0_0_3 ];
-
-            meta = {
-              description = ''Youtube API Client for Elixir'';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/victorlcampos/ytx";
-            };
-          }
-      ) {};
-
-    ytx = ytx_0_0_5;
-
     yubico_0_1_4 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "yubico";
             version = "0.1.4";
             src = fetchHex {
@@ -50106,15 +29240,15 @@ let
               license = stdenv.lib.licenses.bsd3;
               homepage = "https://github.com/project-fifo/erlang-yubico";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     yubico = yubico_0_1_4;
 
     yuri_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "yuri";
             version = "1.0.0";
             src = fetchHex {
@@ -50129,15 +29263,15 @@ let
               license = stdenv.lib.licenses.wtfpl;
               homepage = "https://github.com/kemonomachi/yuri";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     yuri = yuri_1_0_0;
 
     yyid_0_1_2 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "yyid";
             version = "0.1.2";
             src = fetchHex {
@@ -50153,39 +29287,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/janlelis/yyid.ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     yyid = yyid_0_1_2;
 
-    zanox_0_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_0, httpoison_0_8_0 }:
-          buildMix {
-            name = "zanox";
-            version = "0.0.1";
-            src = fetchHex {
-              pkg = "zanox";
-              version = "0.0.1";
-              sha256 =
-                "30af29400aaa0ff207ca4f24849d563c1691185faf86fc2c7f534b550175dee2";
-            };
-            beamDeps  = [ poison_1_5_0 httpoison_0_8_0 ];
-
-            meta = {
-              description = ''Zanox API'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/rafaelss/zanox";
-            };
-          }
-      ) {};
-
-    zanox = zanox_0_0_1;
-
     zarex_0_2_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "zarex";
             version = "0.2.0";
             src = fetchHex {
@@ -50200,15 +29310,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/ricn/zarex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     zarex = zarex_0_2_0;
 
     zbase32_1_0_0 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "zbase32";
             version = "1.0.0";
             src = fetchHex {
@@ -50236,40 +29346,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/pspdfkit-labs/zbase32";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     zbase32 = zbase32_1_0_0;
 
-    zencoder_1_0_1 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_4_0, httpotion_2_2_2 }:
-          buildMix {
-            name = "zencoder";
-            version = "1.0.1";
-            src = fetchHex {
-              pkg = "zencoder";
-              version = "1.0.1";
-              sha256 =
-                "b2220575aa2ee1da5101774c82e1d68f2e5f86d6cefd6f04811c882fc05473bc";
-            };
-            beamDeps  = [ poison_1_4_0 httpotion_2_2_2 ];
-
-            meta = {
-              description = ''Elixir API wrapper for the Zencoder video
-                            transcoding API.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/zencoder/zencoder-ex";
-            };
-          }
-      ) {};
-
-    zencoder = zencoder_1_0_1;
-
     zigzag_0_0_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "zigzag";
             version = "0.0.1";
             src = fetchHex {
@@ -50285,38 +29370,15 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/utkarshkukreti/zigzag.ex";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     zigzag = zigzag_0_0_1;
 
-    zipcloudx_0_0_2 = callPackage
-      (
-        {  buildMix, fetchHex, poison_1_5_2, httpoison_0_8_2 }:
-          buildMix {
-            name = "zipcloudx";
-            version = "0.0.2";
-            src = fetchHex {
-              pkg = "zipcloudx";
-              version = "0.0.2";
-              sha256 =
-                "1e474ec0229b6dd1404c34fbd2a851d136d9549d5ecccbd01d017baac64b264e";
-            };
-            beamDeps  = [ poison_1_5_2 httpoison_0_8_2 ];
-
-            meta = {
-              description = ''Elixir zipcloud API wrapper'';
-
-            };
-          }
-      ) {};
-
-    zipcloudx = zipcloudx_0_0_2;
-
     zipper_0_2_0 = callPackage
       (
-        {  buildErlangMk, fetchHex }:
-          buildErlangMk {
+        {  buildErlangMk, packageOverrides ? {}, fetchHex }:
+          buildErlangMk ({
             name = "zipper";
             version = "0.2.0";
             src = fetchHex {
@@ -50331,15 +29393,15 @@ let
               license = stdenv.lib.licenses.asl20;
               homepage = "https://github.com/inaka/zipper";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     zipper = zipper_0_2_0;
 
     zipper_tree_0_1_1 = callPackage
       (
-        {  buildMix, fetchHex }:
-          buildMix {
+        {  buildMix, packageOverrides ? {}, fetchHex }:
+          buildMix ({
             name = "zipper_tree";
             version = "0.1.1";
             src = fetchHex {
@@ -50355,15 +29417,15 @@ let
               license = stdenv.lib.licenses.wtfpl;
               homepage = "https://github.com/Dkendal/zipper_tree";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     zipper_tree = zipper_tree_0_1_1;
 
     zlist_1_0_1 = callPackage
       (
-        {  buildRebar3, fetchHex }:
-          buildRebar3 {
+        {  buildRebar3, packageOverrides ? {}, fetchHex }:
+          buildRebar3 ({
             name = "zlist";
             version = "1.0.1";
             src = fetchHex {
@@ -50378,50 +29440,10 @@ let
               license = stdenv.lib.licenses.mit;
               homepage = "https://github.com/egobrain/zlist";
             };
-          }
+          } // packageOverrides)
       ) {};
 
     zlist = zlist_1_0_1;
 
-    zuppler_users_client_0_0_5 = callPackage
-      (
-        {
-          buildMix,
-          fetchHex,
-          poolboy_1_5_1,
-          phoenix_1_1_4,
-          oauth2_0_6_0,
-          lru_cache_0_1_0,
-          httpotion_2_2_2
-        }:
-          buildMix {
-            name = "zuppler_users_client";
-            version = "0.0.5";
-            src = fetchHex {
-              pkg = "zuppler_users_client";
-              version = "0.0.5";
-              sha256 =
-                "519d87847b792db04bf97b6c6d56b26724b65f83b0f5ee17b83e82c5fb371557";
-            };
-            beamDeps  = [
-                          poolboy_1_5_1
-                          phoenix_1_1_4
-                          oauth2_0_6_0
-                          lru_cache_0_1_0
-                          httpotion_2_2_2
-                        ];
-
-            meta = {
-              description = ''An Elixir OAuth 2.0 Client Library to protect
-                            Zuppler API'';
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/zuppler/zuppler-users-client-elixir.git";
-            };
-          }
-      ) {};
-
-    zuppler_users_client = zuppler_users_client_0_0_5;
-
   };
 in stdenv.lib.fix' (stdenv.lib.extends overrides packages)
\ No newline at end of file

From 658a49b81d74fedd654be620c18d442e0f4fd1d8 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Fri, 22 Apr 2016 11:03:39 -0700
Subject: [PATCH 167/712] rebar3: 3.0.0-beta.4 -> 3.1.0

---
 .../tools/build-managers/rebar3/default.nix   |  42 ++---
 .../rebar3/hermetic-bootstrap.patch           | 147 ++++++++++++++----
 .../rebar3/hermetic-rebar3.patch              |  67 ++++----
 3 files changed, 161 insertions(+), 95 deletions(-)

diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index 2b5eee407a4..6fa5578ed67 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -3,16 +3,16 @@
   tree, fetchFromGitHub, hexRegistrySnapshot }:
 
 let
-  version = "3.0.0-beta.4";
+  version = "3.1.0";
 
   bootstrapper = ./rebar3-nix-bootstrap;
 
   # TODO: all these below probably should go into nixpkgs.erlangModules.sources.*
-  # {erlware_commons,     "0.16.0"},
+  # {erlware_commons,     "0.19.0"},
   erlware_commons = fetchHex {
     pkg = "erlware_commons";
-    version = "0.16.0";
-    sha256 = "0kh24d0001390wfx28d0xa874vrsfvjgj41g315vg4hac632krxx";
+    version = "0.19.0";
+    sha256 = "1gfsy9bbhjb94c5ghff2niamn93x2x08lnklh6pp7sfr5i0gkgsv";
   };
   # {ssl_verify_hostname, "1.0.5"},
   ssl_verify_hostname = fetchHex {
@@ -20,17 +20,17 @@ let
     version = "1.0.5";
     sha256 = "1gzavzqzljywx4l59gvhkjbr1dip4kxzjjz1s4wsn42f2kk13jzj";
   };
-  # {certifi,             "0.1.1"},
+  # {certifi,             "0.4.0"},
   certifi = fetchHex {
     pkg = "certifi";
-    version = "0.1.1";
-    sha256 = "0afylwqg74gprbg116asz0my2nipmki0512c8mdiq6xdiyjdvlg6";
+    version = "0.4.0";
+    sha256 = "04bnvsbssdcf6b9h9bfglflds7j0gx6q5igl1xxhx6fnwaz37hhw";
   };
-  # {providers,           "1.5.0"},
+  # {providers,           "1.6.0"},
   providers = fetchHex {
     pkg = "providers";
-    version = "1.5.0";
-    sha256 = "1hc8sp2l1mmx9dfpmh1f8j9hayfg7541rmx05wb9cmvxvih7zyvf";
+    version = "1.6.0";
+    sha256 = "0byfa1h57n46jilz4q132j0vk3iqc0v1vip89li38gb1k997cs0g";
   };
   # {getopt,              "0.8.2"},
   getopt = fetchHex {
@@ -44,11 +44,11 @@ let
     version = "1.0.4";
     sha256 = "04lvwm7f78x8bys0js33higswjkyimbygp4n72cxz1kfnryx9c03";
   };
-  # {relx,                "3.8.0"},
+  # {relx,                "3.17.0"},
   relx = fetchHex {
     pkg = "relx";
-    version = "3.8.0";
-    sha256 = "0y89iirjz3kc1rzkdvc6p3ssmwcm2hqgkklhgm4pkbc14fcz57hq";
+    version = "3.17.0";
+    sha256 = "1xjybi93m8gj9f9z3lkc7xbg3k5cw56yl78rcz5qfirr0223sby2";
   };
   # {cf,                  "0.2.1"},
   cf = fetchHex {
@@ -56,19 +56,19 @@ let
     version = "0.2.1";
     sha256 = "19d0yvg8wwa57cqhn3vqfvw978nafw8j2rvb92s3ryidxjkrmvms";
   };
-  # {cth_readable,        "1.1.0"},
+  # {cth_readable,        "1.2.2"},
   cth_readable = fetchHex {
     pkg = "cth_readable";
-    version = "1.0.1";
-    sha256 = "1cnc4fbypckqllfi5h73rdb24dz576k3177gzvp1kbymwkp1xcz1";
+    version = "1.2.2";
+    sha256 = "0kb9v4998liwyidpjkhcg1nin6djjzxcx6b313pbjicbp4r58n3p";
   };
-  # {eunit_formatters,    "0.2.0"}
+  # {eunit_formatters,    "0.3.1"}
   eunit_formatters = fetchHex {
     pkg = "eunit_formatters";
-    version = "0.2.0";
-    sha256 = "03kiszlbgzscfd2ns7na6bzbfzmcqdb5cx3p6qy3657jk2fai332";
+    version = "0.3.1";
+    sha256 = "0cg9dasv60v09q3q4wja76pld0546mhmlpb0khagyylv890hg934";
   };
-  # {eunit_formatters,    "0.2.0"}
+  # {rebar3_hex,    "1.12.0"}
   rebar3_hex = fetchHex {
     pkg = "rebar3_hex";
     version = "1.12.0";
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/rebar/rebar3/archive/${version}.tar.gz";
-    sha256 = "0px66scjdia9aaa5z36qzxb848r56m0k98g0bxw065a2narsh4xy";
+    sha256 = "0r4wpnpi81ha4iirv9hcif3vrgc82qd51kah7rnhvpym55wcy9ml";
   };
 
   inherit bootstrapper;
diff --git a/pkgs/development/tools/build-managers/rebar3/hermetic-bootstrap.patch b/pkgs/development/tools/build-managers/rebar3/hermetic-bootstrap.patch
index 13d60fdcc91..40f430a558b 100644
--- a/pkgs/development/tools/build-managers/rebar3/hermetic-bootstrap.patch
+++ b/pkgs/development/tools/build-managers/rebar3/hermetic-bootstrap.patch
@@ -1,39 +1,61 @@
 diff --git a/bootstrap b/bootstrap
-index 25bd658..b2a986b 100755
+index 35759b0..939c838 100755
 --- a/bootstrap
 +++ b/bootstrap
-@@ -8,9 +8,6 @@ main(_Args) ->
+@@ -7,9 +7,11 @@ main(_) ->
      application:start(asn1),
      application:start(public_key),
      application:start(ssl),
 -    inets:start(),
 -    inets:start(httpc, [{profile, rebar}]),
 -    set_httpc_options(),
- 
++    %%  Removed for hermeticity on Nix
++    %%
++    %%  inets:start(),
++    %%  inets:start(httpc, [{profile, rebar}]),
++    %%    set_httpc_options(),
+
      %% Fetch and build deps required to build rebar3
      BaseDeps = [{providers, []}
-@@ -33,7 +30,6 @@ main(_Args) ->
- 
-     setup_env(),
-     os:putenv("REBAR_PROFILE", "bootstrap"),
--    rebar3:run(["update"]),
-     {ok, State} = rebar3:run(["compile"]),
-     reset_env(),
-     os:putenv("REBAR_PROFILE", ""),
-@@ -71,33 +67,7 @@ fetch_and_compile({Name, ErlFirstFiles}, Deps) ->
+@@ -74,12 +76,12 @@ default_registry_file() ->
+     filename:join([CacheDir, "hex", "default", "registry"]).
+
+ fetch_and_compile({Name, ErlFirstFiles}, Deps) ->
+-    case lists:keyfind(Name, 1, Deps) of
+-        {Name, Vsn} ->
+-            ok = fetch({pkg, atom_to_binary(Name, utf8), list_to_binary(Vsn)}, Name);
+-        {Name, _, Source} ->
+-            ok = fetch(Source, Name)
+-    end,
++    %% case lists:keyfind(Name, 1, Deps) of
++    %%     {Name, Vsn} ->
++    %%         ok = fetch({pkg, atom_to_binary(Name, utf8), list_to_binary(Vsn)}, Name);
++    %%     {Name, _, Source} ->
++    %%         ok = fetch(Source, Name)
++    %% end,
+
+     %% Hack: erlware_commons depends on a .script file to check if it is being built with
+     %% rebar2 or rebar3. But since rebar3 isn't built yet it can't get the vsn with get_key.
+@@ -88,63 +90,63 @@ fetch_and_compile({Name, ErlFirstFiles}, Deps) ->
+
      compile(Name, ErlFirstFiles).
- 
- fetch({pkg, Name, Vsn}, App) ->
+
+-fetch({pkg, Name, Vsn}, App) ->
 -    Dir = filename:join([filename:absname("_build/default/lib/"), App]),
--    CDN = "https://s3.amazonaws.com/s3.hex.pm/tarballs",
--    Package = binary_to_list(<<Name/binary, "-", Vsn/binary, ".tar">>),
--    Url = string:join([CDN, Package], "/"),
--    case request(Url) of
--        {ok, Binary} ->
--            {ok, Contents} = extract(Binary),
--            ok = erl_tar:extract({binary, Contents}, [{cwd, Dir}, compressed]);
--        _ ->
--            io:format("Error: Unable to fetch package ~p ~p~n", [Name, Vsn])
+-    case filelib:is_dir(Dir) of
+-        false ->
+-            CDN = "https://s3.amazonaws.com/s3.hex.pm/tarballs",
+-            Package = binary_to_list(<<Name/binary, "-", Vsn/binary, ".tar">>),
+-            Url = string:join([CDN, Package], "/"),
+-            case request(Url) of
+-                {ok, Binary} ->
+-                    {ok, Contents} = extract(Binary),
+-                    ok = erl_tar:extract({binary, Contents}, [{cwd, Dir}, compressed]);
+-                _ ->
+-                    io:format("Error: Unable to fetch package ~p ~p~n", [Name, Vsn])
+-            end;
+-        true ->
+-            io:format("Dependency ~s already exists~n", [Name])
 -    end.
 -
 -extract(Binary) ->
@@ -51,14 +73,17 @@ index 25bd658..b2a986b 100755
 -        Error ->
 -            Error
 -    end.
-+    ok.
- 
- get_rebar_config() ->
-     {ok, [[Home]]} = init:get_argument(home),
-@@ -109,20 +79,6 @@ get_rebar_config() ->
-             []
-     end.
- 
+-
+-get_rebar_config() ->
+-    {ok, [[Home]]} = init:get_argument(home),
+-    ConfDir = filename:join(Home, ".config/rebar3"),
+-    case file:consult(filename:join(ConfDir, "rebar.config")) of
+-        {ok, Config} ->
+-            Config;
+-        _ ->
+-            []
+-    end.
+-
 -get_http_vars(Scheme) ->
 -    proplists:get_value(Scheme, get_rebar_config(), []).
 -
@@ -72,7 +97,63 @@ index 25bd658..b2a986b 100755
 -set_httpc_options(Scheme, Proxy) ->
 -    {ok, {_, _, Host, Port, _, _}} = http_uri:parse(Proxy),
 -    httpc:set_options([{Scheme, {{Host, Port}, []}}], rebar).
--
++%% fetch({pkg, Name, Vsn}, App) ->
++%%     Dir = filename:join([filename:absname("_build/default/lib/"), App]),
++%%     case filelib:is_dir(Dir) of
++%%         false ->
++%%             CDN = "https://s3.amazonaws.com/s3.hex.pm/tarballs",
++%%             Package = binary_to_list(<<Name/binary, "-", Vsn/binary, ".tar">>),
++%%             Url = string:join([CDN, Package], "/"),
++%%             case request(Url) of
++%%                 {ok, Binary} ->
++%%                     {ok, Contents} = extract(Binary),
++%%                     ok = erl_tar:extract({binary, Contents}, [{cwd, Dir}, compressed]);
++%%                 _ ->
++%%                     io:format("Error: Unable to fetch package ~p ~p~n", [Name, Vsn])
++%%             end;
++%%         true ->
++%%             io:format("Dependency ~s already exists~n", [Name])
++%%     end.
++
++%% extract(Binary) ->
++%%     {ok, Files} = erl_tar:extract({binary, Binary}, [memory]),
++%%     {"contents.tar.gz", Contents} = lists:keyfind("contents.tar.gz", 1, Files),
++%%     {ok, Contents}.
++
++%% request(Url) ->
++%%     case httpc:request(get, {Url, []},
++%%                        [{relaxed, true}],
++%%                        [{body_format, binary}],
++%%                        rebar) of
++%%         {ok, {{_Version, 200, _Reason}, _Headers, Body}} ->
++%%             {ok, Body};
++%%         Error ->
++%%             Error
++%%     end.
++
++%% get_rebar_config() ->
++%%     {ok, [[Home]]} = init:get_argument(home),
++%%     ConfDir = filename:join(Home, ".config/rebar3"),
++%%     case file:consult(filename:join(ConfDir, "rebar.config")) of
++%%         {ok, Config} ->
++%%             Config;
++%%         _ ->
++%%             []
++%%     end.
++
++%% get_http_vars(Scheme) ->
++%%     proplists:get_value(Scheme, get_rebar_config(), []).
++
++%% set_httpc_options() ->
++%%     set_httpc_options(https_proxy, get_http_vars(https_proxy)),
++%%     set_httpc_options(proxy, get_http_vars(http_proxy)).
++
++%% set_httpc_options(_, []) ->
++%%     ok;
++
++%% set_httpc_options(Scheme, Proxy) ->
++%%     {ok, {_, _, Host, Port, _, _}} = http_uri:parse(Proxy),
++%%     httpc:set_options([{Scheme, {{Host, Port}, []}}], rebar).
+
  compile(App, FirstFiles) ->
      Dir = filename:join(filename:absname("_build/default/lib/"), App),
-     filelib:ensure_dir(filename:join([Dir, "ebin", "dummy.beam"])),
diff --git a/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch b/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch
index 8da323ab823..634dda8c45a 100644
--- a/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch
+++ b/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch
@@ -1,8 +1,8 @@
-diff --git a/src/rebar3.erl b/src/rebar3.erl
-index 2b73844..af1d871 100644
+diff a/src/rebar3.erl b/src/rebar3.erl
+index c1a1ae4..1bf1ea0 100644
 --- a/src/rebar3.erl
 +++ b/src/rebar3.erl
-@@ -282,9 +282,11 @@ start_and_load_apps(Caller) ->
+@@ -294,9 +294,11 @@ start_and_load_apps(Caller) ->
      ensure_running(crypto, Caller),
      ensure_running(asn1, Caller),
      ensure_running(public_key, Caller),
@@ -10,21 +10,14 @@ index 2b73844..af1d871 100644
 -    inets:start(),
 -    inets:start(httpc, [{profile, rebar}]).
 +    ensure_running(ssl, Caller).
-+%%    Removed due to the hermicity requirements of Nix
++%%  Removed due to the hermicity requirements of Nix
 +%%
 +%%    inets:start(),
 +%%    inets:start(httpc, [{profile, rebar}]).
- 
+
  ensure_running(App, Caller) ->
      case application:start(App) of
-@@ -339,4 +341,4 @@ safe_define_test_macro(Opts) ->
- test_defined([{d, 'TEST'}|_]) -> true;
- test_defined([{d, 'TEST', true}|_]) -> true;
- test_defined([_|Rest]) -> test_defined(Rest);
--test_defined([]) -> false.
-\ No newline at end of file
-+test_defined([]) -> false.
-diff --git a/src/rebar_hermicity.erl b/src/rebar_hermicity.erl
+diff a/src/rebar_hermicity.erl b/src/rebar_hermicity.erl
 new file mode 100644
 index 0000000..d814e2a
 --- /dev/null
@@ -72,37 +65,29 @@ index 0000000..d814e2a
 +           "are as follows:", []),
 +    ?ERROR("Requesnt: ~p ~s", [Method, Url]),
 +    erlang:halt(1).
-diff --git a/src/rebar_pkg_resource.erl b/src/rebar_pkg_resource.erl
-index 4f55ad1..f76fd5d 100644
+diff a/src/rebar_pkg_resource.erl b/src/rebar_pkg_resource.erl
+index ec7e09d..03be343 100644
 --- a/src/rebar_pkg_resource.erl
 +++ b/src/rebar_pkg_resource.erl
-@@ -100,10 +100,10 @@ make_vsn(_) ->
+@@ -104,7 +104,7 @@ make_vsn(_) ->
      {error, "Replacing version of type pkg not supported."}.
- 
+
  request(Url, ETag) ->
--    case httpc:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]},
--                       [{ssl, ssl_opts(Url)}, {relaxed, true}],
--                       [{body_format, binary}],
--                       rebar) of
-+    case rebar_hermicity:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]},
-+                                 [{ssl, ssl_opts(Url)}, {relaxed, true}],
-+                                 [{body_format, binary}],
-+                                 rebar) of
-         {ok, {{_Version, 200, _Reason}, Headers, Body}} ->
-             ?DEBUG("Successfully downloaded ~s", [Url]),
-             {"etag", ETag1} = lists:keyfind("etag", 1, Headers),
-diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl
-index 6637ebe..d82c1d8 100644
+-    case httpc:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]++[{"User-Agent", rebar_utils:user_agent()}]},
++    case rebar_hermicity:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]++[{"User-Agent", rebar_utils:user_agent()}]},
+                        [{ssl, ssl_opts(Url)}, {relaxed, true}],
+                        [{body_format, binary}],
+                        rebar) of
+diff a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl
+index 5e1e253..ea25b9e 100644
 --- a/src/rebar_prv_update.erl
 +++ b/src/rebar_prv_update.erl
-@@ -44,8 +44,8 @@ do(State) ->
-         TmpFile = filename:join(TmpDir, "packages.gz"),
- 
-         Url = rebar_state:get(State, rebar_packages_cdn, ?DEFAULT_HEX_REGISTRY),
--        case httpc:request(get, {Url, []},
--                           [], [{stream, TmpFile}, {sync, true}],
-+        case rebar_hermicity:request(get, {Url, []},
-+                                     [], [{stream, TmpFile}, {sync, true}],
-                            rebar) of
-             {ok, saved_to_file} ->
-                 {ok, Data} = file:read_file(TmpFile),
+@@ -52,7 +52,7 @@ do(State) ->
+                 case rebar_utils:url_append_path(CDN, ?REMOTE_REGISTRY_FILE) of
+                     {ok, Url} ->
+                         ?DEBUG("Fetching registry from ~p", [Url]),
+-                        case httpc:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]},
++                        case rebar_hermicity:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]},
+                                            [], [{stream, TmpFile}, {sync, true}],
+                                            rebar) of
+                             {ok, saved_to_file} ->

From b26ecaf3caf0c3ad5d36f832b76e7e7a3d801897 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Wed, 20 Apr 2016 14:07:58 -0700
Subject: [PATCH 168/712] hex2nix: 0.0.3 -> 0.0.5

---
 pkgs/development/tools/erlang/hex2nix/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/erlang/hex2nix/default.nix b/pkgs/development/tools/erlang/hex2nix/default.nix
index e7d237cfea2..982bda41cde 100644
--- a/pkgs/development/tools/erlang/hex2nix/default.nix
+++ b/pkgs/development/tools/erlang/hex2nix/default.nix
@@ -2,16 +2,16 @@
 
 buildRebar3 rec {
     name = "hex2nix";
-    version = "0.0.3";
+    version = "0.0.5";
 
     src = fetchFromGitHub {
-         owner = "erlang-nix";
-         repo = "hex2nix";
-         rev = "${version}";
-         sha256 = "1snlcb60al7fz3z4c4rqrb9gqdyihyhsrr90n40v9rdm98csry3k";
-     };
+      owner = "erlang-nix";
+      repo = "hex2nix";
+      rev = "${version}";
+      sha256 = "07bk18nib4xms8q1i4sv53drvlyllm47map4c95669lsh0j08sax";
+    };
 
-    erlangDeps = [ ibrowse jsx erlware_commons getopt ];
+    beamDeps = [ ibrowse jsx erlware_commons getopt ];
 
     DEBUG=1;
 

From 585c1a8f96bf27fd26cced5015e3e9d3dc434a8a Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Sat, 23 Apr 2016 18:57:39 -0700
Subject: [PATCH 169/712] beam-modules: refactor - remove commented out code

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

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 8a79a0b3e40..1fd899c53c9 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs }: #? import <nixpkgs> {} }:
+{ stdenv, pkgs }:
 
 let
   self = rec {

From 3c4f8612007d9b8f8e4c569d855ca4d8b4303cfe Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 24 Apr 2016 05:51:54 +0300
Subject: [PATCH 170/712] audacity: 2.1.1 -> 2.1.2

---
 pkgs/applications/audio/audacity/default.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index afa8a94d200..a93a445db31 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib, perl, intltool,
+{ stdenv, fetchurl, wxGTK30, pkgconfig, gettext, gtk, glib, zlib, perl, intltool,
   libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame, fetchpatch,
   expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */
   }:
 
 stdenv.mkDerivation rec {
-  version = "2.1.1";
+  version = "2.1.2";
   name = "audacity-${version}";
 
   src = fetchurl {
     url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
-    sha256 = "15c5ff7ac1c0b19b08f4bdcb0f4988743da2f9ed3fab41d6f07600e67cb9ddb6";
+    sha256 = "1ggr6g0mk36rqj7ahsg8b0b1r9kphwajzvxgn43md263rm87n04h";
   };
   patches = [(fetchpatch {
     name = "new-ffmpeg.patch";
@@ -18,12 +18,6 @@ stdenv.mkDerivation rec {
     sha256 = "19fr674mw844zmkp1476yigkcnmb6zyn78av64ccdwi3p68i00rf";
   })];
 
-  # fix with gcc-5 from http://lists.freebsd.org/pipermail/freebsd-ports-bugs/2012-December/245884.html
-  postPatch = ''
-    substituteInPlace lib-src/libnyquist/nyquist/ffts/src/fftlib.c \
-      --replace 'inline void' 'static inline void'
-  '';
-
   preConfigure = /* we prefer system-wide libs */ ''
     mv lib-src lib-src-rm
     mkdir lib-src
@@ -31,11 +25,11 @@ stdenv.mkDerivation rec {
     rm -r lib-src-rm/
   '';
 
-  configureFlags = "--with-libsamplerate";
+  configureFlags = [ "--with-libsamplerate" ];
 
   buildInputs = [
-    pkgconfig gettext wxGTK gtk expat alsaLib
-    libsndfile soxr libid3tag
+    pkgconfig gettext wxGTK30 expat alsaLib
+    libsndfile soxr libid3tag gtk
     ffmpeg libmad lame libvorbis flac soundtouch
   ]; #ToDo: detach sbsms
 

From 022b4a8dd1f0861e5251763b5d79dc5ed5fb4e5d Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sun, 24 Apr 2016 12:28:56 +0200
Subject: [PATCH 171/712] workrave: add missing dependencies

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

diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix
index f0f0b00c927..045767eb413 100644
--- a/pkgs/applications/misc/workrave/default.nix
+++ b/pkgs/applications/misc/workrave/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoconf, automake, gettext, intltool, libtool, pkgconfig,
-  libXtst, cheetah, libXScrnSaver,
+  libXtst, cheetah, libXScrnSaver, xorg,
   glib, glibmm,
   gtk, gtkmm,
   atk,
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     libXScrnSaver
 
     glib glibmm gtk gtkmm atk pango pangomm cairo cairomm
-    dbus dbus_glib GConf gconfmm gdome2 gstreamer libsigcxx
+    dbus dbus_glib GConf gconfmm gdome2 gstreamer libsigcxx xorg.libICE xorg.libSM
   ];
 
   preConfigure = "./autogen.sh";

From dc0d32cab756b3b7c61b031c6b7767f790aba293 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sun, 24 Apr 2016 14:34:25 +0200
Subject: [PATCH 172/712] libu2f-host: Install udev-rules.

This allows users to automatically set up necessary udev-rules by adding
`pkgs.libu2f-host` to `services.udev.packages`.
---
 pkgs/development/libraries/libu2f-host/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix
index de51da51bca..dc2481a2e85 100644
--- a/pkgs/development/libraries/libu2f-host/default.nix
+++ b/pkgs/development/libraries/libu2f-host/default.nix
@@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ json_c hidapi ];
 
+  postInstall = ''
+    mkdir -p $out/lib/udev/rules.d/
+    cp -v *.rules $out/lib/udev/rules.d/
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://developers.yubico.com/libu2f-host;
     description = "A C library and command-line tool thati mplements the host-side of the U2F protocol";

From a9a94df4e644168de200c3689d3c53100256bf74 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 24 Apr 2016 16:20:37 +0300
Subject: [PATCH 173/712] SDL: use mesa_noglu instead of mesa

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

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 6c3920ff8aa..5d97a7fa59e 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap
-, openglSupport ? false, mesa ? null
+, openglSupport ? false, mesa_noglu ? null
 , alsaSupport ? true, alsaLib ? null
 , x11Support ? true, xlibsWrapper ? null, libXrandr ? null
 , pulseaudioSupport ? true, libpulseaudio ? null
@@ -10,7 +10,7 @@
 # PulseAudio.
 assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport;
 
-assert openglSupport -> (mesa != null && x11Support);
+assert openglSupport -> (mesa_noglu != null && x11Support);
 assert x11Support -> (xlibsWrapper != null && libXrandr != null);
 assert alsaSupport -> alsaLib != null;
 assert pulseaudioSupport -> libpulseaudio != null;
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     optionals x11Support [ xlibsWrapper libXrandr ] ++
     optional alsaSupport alsaLib ++
     optional stdenv.isLinux libcap ++
-    optional openglSupport mesa ++
+    optional openglSupport mesa_noglu ++
     optional pulseaudioSupport libpulseaudio ++
     optional stdenv.isDarwin Cocoa;
 

From 953c51f65e399f71fb76c2f1a41932fed675037b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 24 Apr 2016 16:33:11 +0300
Subject: [PATCH 174/712] dwarf-fortress-unfuck: use mesa_noglu instead of mesa

---
 pkgs/games/dwarf-fortress/unfuck.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index 598f795083b..1d6ea1196da 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake
-, mesa, SDL, SDL_image, SDL_ttf, glew, openalSoft
+, mesa_noglu, SDL, SDL_image, SDL_ttf, glew, openalSoft
 , ncurses, glib, gtk2, libsndfile, zlib
 }:
 
@@ -20,8 +20,8 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [
-    mesa SDL SDL_image SDL_ttf glew openalSoft
-    ncurses gtk2 libsndfile zlib
+    SDL SDL_image SDL_ttf glew openalSoft
+    ncurses gtk2 libsndfile zlib mesa_noglu
   ];
 
   installPhase = ''

From 1c08aa2704e0b9d5bf1bb9f3f9b607edf2dbdcea Mon Sep 17 00:00:00 2001
From: ldesgoui <ldesgoui@gmail.com>
Date: Sun, 24 Apr 2016 16:45:09 +0200
Subject: [PATCH 175/712] discord: 0.0.1 -> 0.0.3

---
 .../networking/instant-messengers/discord/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 86b21f90ad9..0d6e6d40284 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -4,22 +4,22 @@
 , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, pango
 , libudev }:
 
-let version = "0.0.1"; in
+let version = "0.0.3"; in
 
 stdenv.mkDerivation {
 
     name = "discord-${version}";
 
     src = fetchurl {
-        url = "https://storage.googleapis.com/discord-developer/test/discord-canary-${version}.tar.gz";
-        sha256 = "1skmwc84s4xqyc167qrplhy5ah06kwfa3d3rxiwi4c8rc55vdd0g";
+        url = "https://cdn-canary.discordapp.com/apps/linux/${version}/discord-canary-${version}.tar.gz";
+        sha256 = "1k1mnfkcx7183qbdc4qx1anngddqim969cribg9gzc7mixvj17ca";
     };
 
     libPath = stdenv.lib.makeLibraryPath [
         stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype
         gdk_pixbuf glib gnome.GConf gtk libnotify libX11 libXcomposite
         libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
-        libXtst nspr nss pango libudev
+        libXtst nspr nss pango libudev.out
      ];
 
     installPhase = ''
@@ -35,12 +35,13 @@ stdenv.mkDerivation {
         ln -s $out/DiscordCanary $out/bin/
 
         # Putting udev in the path won't work :(
-        ln -s ${libudev}/lib/libudev.so.1 $out
+        ln -s ${libudev.out}/lib/libudev.so.1 $out
         '';
 
     meta = with stdenv.lib; {
         description = "All-in-one voice and text chat for gamers that’s free, secure, and works on both your desktop and phone";
         homepage = "https://discordapp.com/";
+        downloadPage = "https://github.com/crmarsh/discord-linux-bugs";
         license = licenses.unfree;
         maintainers = [ maintainers.ldesgoui ];
         platforms = [ "x86_64-linux" ];

From 01bdf515977fb53f02365f104dff9ee1abb0b1b5 Mon Sep 17 00:00:00 2001
From: Stefan Junker <steveeJ@users.noreply.github.com>
Date: Sun, 24 Apr 2016 16:56:31 +0200
Subject: [PATCH 176/712] go tools: 2015-08-24 -> 2016-02-04 (#14943)

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 941f77d9a61..00d5f44128a 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -147,11 +147,11 @@ let
   };
 
   tools = buildFromGitHub {
-    rev = "b48dc8da98ae78c3d11f220e7d327304c84e623a";
-    version = "2015-08-24";
+    rev = "c887be1b2ebd11663d4bf2fbca508c449172339e";
+    version = "2016-02-04";
     owner = "golang";
     repo = "tools";
-    sha256 = "187p3jjxrw2qjnzqwwrq7f9w10zh6vcnwnfl3q7ms8rbiffpjy5c";
+    sha256 = "15cm7wmab5na4hphvriazlz639882z0ipb466xmp7500rn6f5kzf";
     goPackagePath = "golang.org/x/tools";
     goPackageAliases = [ "code.google.com/p/go.tools" ];
 

From af9fcaf910a4087bae0f51be03d9131302fc0201 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 24 Apr 2016 18:08:32 +0300
Subject: [PATCH 177/712] mumble: fix mumble-overlay

---
 pkgs/applications/networking/mumble/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 88b9ae49efd..c46ef561c37 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -83,8 +83,9 @@ let
     NIX_CFLAGS_COMPILE = optional speechdSupport "-I${speechd}/include/speech-dispatcher";
 
     installPhase = ''
-      cp scripts/mumble-overlay $out/bin
+      install -m755 scripts/mumble-overlay $out/bin
       sed -i "s,/usr/lib,$out/lib,g" $out/bin/mumble-overlay
+      ( cd $out/lib; ln -s libmumble.so.1.* libmumble.so.1 )
 
       mkdir -p $out/share/applications
       cp scripts/mumble.desktop $out/share/applications

From 9ad2832b1bf6897d59d7085859b3ed8627aa1cd7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 24 Apr 2016 17:22:40 +0200
Subject: [PATCH 178/712] pgadmin: Fix build

Fixes #14919.
---
 pkgs/applications/misc/pgadmin/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
index 894aeaab425..2f33edc9adc 100644
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/pkgs/applications/misc/pgadmin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl }:
+{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl, zlib }:
 
 stdenv.mkDerivation rec {
   name = "pgadmin3-${version}";
@@ -11,12 +11,17 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ postgresql wxGTK libxml2 libxslt openssl ];
+  buildInputs = [ postgresql wxGTK openssl zlib ];
 
   preConfigure = ''
     substituteInPlace pgadmin/ver_svn.sh --replace "bin/bash" "$shell"
   '';
 
+  configureFlags = [
+    "--with-libxml2=${libxml2}"
+    "--with-libxslt=${libxslt}"
+  ];
+
   meta = with stdenv.lib; { 
     description = "PostgreSQL administration GUI tool";
     homepage = http://www.pgadmin.org;

From 76fc67a083f3140ce5d31c8afe83496ad4d26f2f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 24 Apr 2016 16:49:52 +0200
Subject: [PATCH 179/712] darkice: Fix build due to multiple outputs

---
 pkgs/tools/audio/darkice/default.nix | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix
index e4fc129ef60..8ac9039b57e 100644
--- a/pkgs/tools/audio/darkice/default.nix
+++ b/pkgs/tools/audio/darkice/default.nix
@@ -1,10 +1,20 @@
-{ stdenv, buildEnv, fetchurl, alsaLib, faac, libjack2, lame, libogg, libopus, libpulseaudio, libsamplerate, libvorbis }:
+{ stdenv, buildEnv, fetchurl
+, libjack2, alsaLib, libpulseaudio
+, faac, lame, libogg, libopus, libvorbis, libsamplerate
+}:
 
 let
   oggEnv = buildEnv {
     name = "env-darkice-ogg";
     paths = [
-      libopus libvorbis libogg
+      libopus.dev libopus libvorbis.dev libvorbis libogg.dev libogg
+    ];
+  };
+
+  darkiceEnv = buildEnv {
+    name = "env-darkice";
+    paths = [
+      lame.out lame.lib libpulseaudio libpulseaudio.dev alsaLib alsaLib.dev libsamplerate.out libsamplerate.dev
     ];
   };
 
@@ -18,13 +28,13 @@ in stdenv.mkDerivation rec {
   };
 
   configureFlags = [
-    "--with-alsa-prefix=${alsaLib}"
+    "--with-alsa-prefix=${darkiceEnv}"
     "--with-faac-prefix=${faac}"
     "--with-jack-prefix=${libjack2}"
-    "--with-lame-prefix=${lame}"
+    "--with-lame-prefix=${darkiceEnv}"
     "--with-opus-prefix=${oggEnv}"
-    "--with-pulseaudio-prefix=${libpulseaudio}"
-    "--with-samplerate-prefix=${libsamplerate}"	
+    "--with-pulseaudio-prefix=${darkiceEnv}"
+    "--with-samplerate-prefix=${darkiceEnv}"
     "--with-vorbis-prefix=${oggEnv}"
 #    "--with-aacplus-prefix=${aacplus}" ### missing: aacplus
 #    "--with-twolame-prefix=${twolame}" ### missing: twolame
@@ -34,6 +44,6 @@ in stdenv.mkDerivation rec {
     homepage = http://darkice.org/;
     description = "Live audio streamer";
     license = stdenv.lib.licenses.gpl3;
-    maintainers = with stdenv.lib.maintainers; [ ikervagyok ];
+    maintainers = with stdenv.lib.maintainers; [ ikervagyok fpletz ];
   };
 }

From d1d4bd9a9dc5ee605ed5d06f815da4842b4c1ebe Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 24 Apr 2016 17:32:22 +0200
Subject: [PATCH 180/712] avrdude: 6.1 -> 6.3

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

diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix
index 2026e0ad2c8..e7d5aaceb2b 100644
--- a/pkgs/development/tools/misc/avrdude/default.nix
+++ b/pkgs/development/tools/misc/avrdude/default.nix
@@ -6,11 +6,11 @@
 assert docSupport -> texLive != null && texinfo != null && texi2html != null;
 
 stdenv.mkDerivation rec {
-  name = "avrdude-6.1";
+  name = "avrdude-6.3";
 
   src = fetchurl {
     url = "mirror://savannah/avrdude/${name}.tar.gz";
-    sha256 = "0frxg0q09nrm95z7ymzddx7ysl77ilfbdix1m81d9jjpiv5bm64y";
+    sha256 = "15m1w1qad3dj7r8n5ng1qqcaiyx1gyd6hnc3p2apgjllccdp77qg";
   };
 
   configureFlags = stdenv.lib.optionalString docSupport "--enable-doc";

From 73182fd328b40fedd2f81ab452a8a0ec01d0885c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 24 Apr 2016 18:49:22 +0300
Subject: [PATCH 181/712] mumble_overlay: move from mumble and more fixes

---
 .../networking/mumble/default.nix             |  4 ----
 .../networking/mumble/overlay.nix             | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 +++++
 3 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/networking/mumble/overlay.nix

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index c46ef561c37..53fa7146257 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -83,10 +83,6 @@ let
     NIX_CFLAGS_COMPILE = optional speechdSupport "-I${speechd}/include/speech-dispatcher";
 
     installPhase = ''
-      install -m755 scripts/mumble-overlay $out/bin
-      sed -i "s,/usr/lib,$out/lib,g" $out/bin/mumble-overlay
-      ( cd $out/lib; ln -s libmumble.so.1.* libmumble.so.1 )
-
       mkdir -p $out/share/applications
       cp scripts/mumble.desktop $out/share/applications
 
diff --git a/pkgs/applications/networking/mumble/overlay.nix b/pkgs/applications/networking/mumble/overlay.nix
new file mode 100644
index 00000000000..23f78ff29b3
--- /dev/null
+++ b/pkgs/applications/networking/mumble/overlay.nix
@@ -0,0 +1,24 @@
+{ stdenv, lib, which, file, mumble, mumble_i686
+}:
+
+let
+  binPath = lib.makeBinPath [ which file ];
+in stdenv.mkDerivation {
+  name = "mumble-overlay-${mumble.version}";
+
+  inherit (mumble) src;
+
+  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/lib
+    ln -s ${mumble}/lib/libmumble.so.1.* $out/lib/libmumble.so.1
+    ${lib.optionalString (mumble_i686 != null) ''
+      mkdir -p $out/lib32
+      ln -s ${mumble_i686}/lib/libmumble.so.1.* $out/lib32/libmumble.so.1
+    ''}
+    install -Dm755 scripts/mumble-overlay $out/bin/mumble-overlay
+    sed -i "s,/usr/lib,$out/lib,g" $out/bin/mumble-overlay
+    sed -i '2iPATH="${binPath}:$PATH"' $out/bin/mumble-overlay
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0d6690b3ae..0956dcf680c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13280,6 +13280,12 @@ in
       iceSupport = config.murmur.iceSupport or true;
     }) mumble mumble_git murmur murmur_git;
 
+  mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix {
+    mumble_i686 = if system == "x86_64-linux"
+      then pkgsi686Linux.mumble
+      else null;
+  };
+
   musescore = qt5.callPackage ../applications/audio/musescore { };
 
   mutt = callPackage ../applications/networking/mailreaders/mutt { };

From fb13625a44099fe03b6e6d671b9bbb06ab69ae7f Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@users.noreply.github.com>
Date: Sun, 24 Apr 2016 16:55:20 +0100
Subject: [PATCH 182/712] rofi: 0.15.12 -> 1.0.0 (#14950)

---
 pkgs/applications/misc/rofi/default.nix | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 9f11a141ff4..e1ee9b2d145 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -1,21 +1,31 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig
-, libX11, libXinerama, pango, cairo
+, libX11, libxkbcommon, pango, cairo, glib
+, libxcb, xcbutil, xcbutilwm, which, git
 , libstartup_notification, i3Support ? false, i3
 }:
 
 stdenv.mkDerivation rec {
   name = "rofi-${version}";
-  version = "0.15.12";
+  version = "1.0.0";
 
   src = fetchurl {
-    url = "https://github.com/DaveDavenport/rofi/archive/${version}.tar.gz";
-    sha256 = "112fgx2awsw1xf1983bmy3jvs33qwyi8qj7j59jqc4gx07nv1rp5";
+    url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.xz";
+    sha256 = "0ard95pjgykafm5ga8lfy7x206f07lrc6kara5s9irlhdgblq2m5";
   };
 
-  buildInputs = [ autoreconfHook pkgconfig libX11 libXinerama pango
-                  cairo libstartup_notification
+  preConfigure = ''
+    patchShebangs "script"
+    # root not present in build /etc/passwd
+    sed -i 's/~root/~nobody/g' test/helper-expand.c
+  '';
+
+  buildInputs = [ autoreconfHook pkgconfig libX11 libxkbcommon pango
+                  cairo libstartup_notification libxcb xcbutil xcbutilwm
+                  which git
                 ] ++ stdenv.lib.optional i3Support i3;
 
+  doCheck = true;
+
   meta = {
       description = "Window switcher, run dialog and dmenu replacement";
       homepage = https://davedavenport.github.io/rofi;

From 5ec61652d77cc250d25bb40062a1107ed37e3792 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sun, 24 Apr 2016 16:55:15 +0100
Subject: [PATCH 183/712] perl-packages: Remove Coro and NetRabbitFoot

These are no longer buildable with Perl 5.22 and beyond, and upstream
have confirmed that this won't change.
---
 pkgs/top-level/perl-packages.nix | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 62ebb60c539..b6914325279 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2284,19 +2284,6 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CGICookieXS ];
   };
 
-  Coro = buildPerlPackage rec {
-    name = "Coro-6.41";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz";
-      sha256 = "1r1gam4yyl6w88ga8rkbvj33v1r5ald3ryqlpg13c7y1i79yizxa";
-    };
-    propagatedBuildInputs = [ AnyEvent Guard CommonSense ];
-    meta = {
-      maintainers = with maintainers; [ ocharles ];
-      platforms   = stdenv.lib.platforms.unix;
-    };
-  };
-
   CPAN = buildPerlPackage rec {
     name = "CPAN-2.10";
     src = fetchurl {
@@ -9141,22 +9128,6 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  NetRabbitFoot = buildPerlPackage {
-    name = "Net-RabbitFoot-1.03";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/I/IK/IKUTA/Net-RabbitFoot-1.03.tar.gz;
-      sha256 = "0544b1914e7847b32b60a643abc6f0b1fdc6d4a816afd84bcd3eee0c28b001ac";
-    };
-    buildInputs = [ TestException ];
-    propagatedBuildInputs = [ AnyEventRabbitMQ ConfigAny Coro JSONXS ListMoreUtils Moose MooseXAppCmd MooseXAttributeHelpers MooseXConfigFromFile ];
-    meta = {
-      description = "An Asynchronous and multi channel Perl AMQP client";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
-      platforms   = stdenv.lib.platforms.unix;
-    };
-  };
-
   NetServer = buildPerlPackage {
     name = "Net-Server-2.007";
     src = fetchurl {

From f583efea44fd0fb432bbeed2ae5093e288961d08 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sun, 24 Apr 2016 16:57:10 +0100
Subject: [PATCH 184/712] perl-packages: Remove ocharles from maintainers

I no longer write Perl and it is not productive for me to maintain
things I don't use/track upstream.
---
 pkgs/top-level/perl-packages.nix | 262 +++++++++++++++----------------
 1 file changed, 131 insertions(+), 131 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b6914325279..c2c291e0979 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -83,7 +83,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ AlgorithmDiff ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -125,7 +125,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "16nnqzxy5baiar6gxnq5w296mmjgijcn1jq8rp867nksph03mxz8";
     };
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -154,7 +154,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "An asynchronous and multi channel Perl AMQP client";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -227,7 +227,7 @@ let self = _self // overrides; _self = with self; {
       homepage = https://github.com/rjbs/app-cmd;
       description = "Write command line apps with less suffering";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -581,7 +581,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Wrap OP check callbacks";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -607,7 +607,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [CarpClan];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -727,7 +727,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ StringCRC32 ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -741,7 +741,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Perl client for B<memcached>, in C language";
       license = "perl";
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -755,7 +755,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ TimeDate DBFile DigestSHA1 FileNFSLock HeapFibonacci IOString ];
     doCheck = false; # can time out
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -806,7 +806,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [HTMLTiny LWP];
     buildInputs = [TestPod];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -919,7 +919,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "HTTP Basic and Digest authentication";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -1149,7 +1149,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Flexible caching support for Catalyst";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -1165,7 +1165,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "HTTP/1.1 cache validators for Catalyst";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -1229,7 +1229,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Unicode aware Catalyst";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -1524,7 +1524,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ TestException ];
     meta = {
       description = "Convert flat hash to nested data using TT2's dot convention";
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -1645,7 +1645,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -2250,7 +2250,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ SymbolUtil ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -2509,7 +2509,7 @@ let self = _self // overrides; _self = with self; {
       homepage = http://search.cpan.org/dist/Crypt-Random-Source;
       description = "Get weak or strong random data from pluggable sources";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -2695,7 +2695,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Polymorphic data cloning";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -2942,7 +2942,7 @@ let self = _self // overrides; _self = with self; {
       homepage = https://metacpan.org/release/Data-UUID-MT;
       description = "Fast random UUID generator using the Mersenne Twister algorithm";
       license = stdenv.lib.licenses.asl20;
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -3012,7 +3012,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [CarpClan BitVector];
     doCheck = false; # some of the checks rely on the year being <2015
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -3167,7 +3167,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Parses ISO8601 formats";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -3223,7 +3223,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Parse and format PostgreSQL dates and times";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -3595,7 +3595,7 @@ let self = _self // overrides; _self = with self; {
       homepage = http://search.cpan.org/dist/DBIx-Connector/;
       description = "Fast, safe DBI connection and transaction management";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -3645,7 +3645,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DBI ];
     meta = {
       description = "Very complete easy-to-use OO interface to DBI";
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -3668,7 +3668,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "Find memory cycles in objects";
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -3684,7 +3684,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Adding keywords to perl, in perl";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles rycee ];
+      maintainers = with maintainers; [ rycee ];
     };
   };
 
@@ -3731,7 +3731,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ Moose namespaceclean SubExporter Testuseok TestWarn ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -3815,7 +3815,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Keyed-Hashing for Message Authentication";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -3862,7 +3862,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ LWP ];
     meta = {
       description = "Perl extension for getting MD5 sums for files and urls";
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -4273,7 +4273,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Generate world unique message-ids";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -4289,7 +4289,7 @@ let self = _self // overrides; _self = with self; {
       homepage = https://github.com/rjbs/Email-MIME;
       description = "Easy MIME message handling";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles rycee ];
+      maintainers = with maintainers; [ rycee ];
     };
   };
 
@@ -4303,7 +4303,7 @@ let self = _self // overrides; _self = with self; {
       homepage = https://github.com/rjbs/Email-MIME-ContentType;
       description = "Parse a MIME Content-Type Header";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles rycee ];
+      maintainers = with maintainers; [ rycee ];
     };
   };
 
@@ -4318,7 +4318,7 @@ let self = _self // overrides; _self = with self; {
       homepage = https://github.com/rjbs/Email-MIME-Encodings;
       description = "A unified interface to MIME encoding and decoding";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles rycee ];
+      maintainers = with maintainers; [ rycee ];
     };
   };
 
@@ -4475,7 +4475,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "1qhmj15a66h90pjl2dgnxsb9jj3b1r5mpvnr87cafcl8g69z0jr4";
     };
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -4513,7 +4513,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Lightweight exceptions";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
     };
   };
 
@@ -4535,7 +4535,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestAssert TestUnitLite ];
     propagatedBuildInputs = [ constantboolean ExceptionBase ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -4549,7 +4549,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ TestAssert TestUnitLite ];
     propagatedBuildInputs = [ ExceptionBase ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -4566,7 +4566,7 @@ let self = _self // overrides; _self = with self; {
       homepage = http://open-exodus.net/projects/Exporter-Declare;
       description = "Exporting done right";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -4680,7 +4680,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -4835,7 +4835,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ ExceptionWarning TestAssert TestUnitLite ];
     propagatedBuildInputs = [ ExceptionBase ExceptionDied ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -4871,7 +4871,7 @@ let self = _self // overrides; _self = with self; {
       homepage = http://open-exodus.net/projects/Fennec-Lite;
       description = "Minimalist Fennec, the commonly used bits";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -5096,7 +5096,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "1kclhmyha2xijq49darlz82f3bn7gq3saycxpfiz3dndqhr5i9iz";
     };
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -5123,7 +5123,7 @@ let self = _self // overrides; _self = with self; {
       homepage = https://metacpan.org/release/File-pushd;
       description = "Change directory temporarily for a limited scope";
       license = stdenv.lib.licenses.asl20;
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -5160,7 +5160,7 @@ let self = _self // overrides; _self = with self; {
       homepage = http://github.com/ingydotnet/file-share-pm/tree;
       description = "Extend File::ShareDir to Local Libraries";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -5187,7 +5187,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Install shared files";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -5481,7 +5481,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ pkgs.gnupg1orig ];
     meta = {
       platforms = stdenv.lib.platforms.linux;
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
     };
   };
 
@@ -5588,7 +5588,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "34c4ddf91fc93d1090d86da14df706d175b1610c67372c01e12ce9555d4dd1dc";
     };
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -5661,7 +5661,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ Testuseok ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -5673,7 +5673,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "1plv2djbyhvkdcw2ic54rdqb745cwksxckgzvw7ssxiir7rjknnc";
     };
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -5796,7 +5796,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ClassLoad DataClone DateTime DateTimeFormatStrptime EmailValid FileShareDir HTMLTree JSON ListAllUtils Moose MooseXGetopt MooseXTypes MooseXTypesCommon MooseXTypesLoadableClass SubExporter SubName TryTiny aliased namespaceautoclean ];
     meta = {
       description = "HTML forms using Moose";
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -5879,7 +5879,7 @@ let self = _self // overrides; _self = with self; {
     };
     buildInputs = [ TestBase ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -5977,7 +5977,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Add XPath support to HTML::TreeBuilder";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -6225,7 +6225,7 @@ let self = _self // overrides; _self = with self; {
       homepage = https://github.com/ingydotnet/io-all-pm/tree;
       description = "IO::All of it to Graham and Damian!";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -6405,7 +6405,7 @@ let self = _self // overrides; _self = with self; {
       homepage = https://github.com/rjbs/io-tiecombine;
       description = "Produce tied (and other) separate but combined variables";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -6721,7 +6721,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "1ylz6yhjifblhmnva0k05ch12a4cdii5v0icah69ma1gdhsidnk0";
     };
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -6880,7 +6880,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Combines List::Util and List::MoreUtils in one bite-sized package";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -6914,7 +6914,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "1xcsgz8898h670zmwqd8azfn3a2y9nq7z8cva9dsyhzkk8ajmra1";
     };
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -7005,7 +7005,7 @@ let self = _self // overrides; _self = with self; {
       description = "Perl module for manipulating .po entries from GNU gettext";
       license = "unknown";
       platforms = stdenv.lib.platforms.linux;
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
     };
   };
 
@@ -7054,7 +7054,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Simple logging interface with a contextual log";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -7069,7 +7069,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Dispatches messages to one or more outputs";
       license = stdenv.lib.licenses.artistic2;
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -7263,7 +7263,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ LWP HookLexWrap ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
     # Tests require network connectivity
@@ -7443,7 +7443,7 @@ let self = _self // overrides; _self = with self; {
       homepage = http://search.cpan.org/dist/Math-Random-ISAAC;
       description = "Perl interface to the ISAAC PRNG algorithm";
       license = with stdenv.lib.licenses; [ publicDomain mit artistic2 gpl3 ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -7458,7 +7458,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Auto-seeded Mersenne Twister PRNGs";
       license = "unrestricted";
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -7474,7 +7474,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Cryptographically-secure, cross-platform replacement for rand()";
       license = stdenv.lib.licenses.artistic2;
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -7505,7 +7505,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Tools for creating Meta objects to track custom metrics";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -7520,7 +7520,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Basic method declarations with signatures, without source filters";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -7783,7 +7783,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Declare author-only dependencies";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -7798,7 +7798,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Designate tests only run by module authors";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -7954,7 +7954,7 @@ let self = _self // overrides; _self = with self; {
     };
     buildInputs = [ pkgs.unzip ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -8106,7 +8106,7 @@ let self = _self // overrides; _self = with self; {
       homepage = http://metacpan.org/release/MooseX-ABC;
       description = "Abstract base classes for Moose";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -8133,7 +8133,7 @@ let self = _self // overrides; _self = with self; {
       homepage = http://metacpan.org/release/MooseX-App-Cmd;
       description = "Mashes up MooseX::Getopt and App::Cmd";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -8258,7 +8258,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Extend your attribute interfaces (deprecated)";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -8271,7 +8271,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ DataVisitor HashUtilFieldHashCompat Moose namespaceclean Testuseok ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -8287,7 +8287,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "An abstract Moose role for setting attributes from a configfile";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -8349,7 +8349,7 @@ let self = _self // overrides; _self = with self; {
       homepage = https://github.com/pshangov/moosex-has-options;
       description = "Succinct options for Moose";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -8506,7 +8506,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ Testuseok TestTableDriven ];
     propagatedBuildInputs = [ ListMoreUtils Moose MooseXGetopt MooseXTypes MooseXTypesPathClass namespaceautoclean ParamsUtil ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -8538,7 +8538,7 @@ let self = _self // overrides; _self = with self; {
     };
     buildInputs = [ Moose TestFatal TestRequires ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -8606,7 +8606,7 @@ let self = _self // overrides; _self = with self; {
       homepage = https://github.com/moose/MooseX-Types-Common;
       description = "A library of commonly used type constraints";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles rycee ];
+      maintainers = with maintainers; [ rycee ];
     };
   };
 
@@ -8618,7 +8618,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone Moose MooseXTypes namespaceclean TestException Testuseok ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -8646,7 +8646,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ ModuleBuildTiny Moose TestFatal ];
     propagatedBuildInputs = [ ClassLoad ModuleRuntime Moose MooseXTypes namespaceautoclean ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
       homepage = https://github.com/moose/MooseX-Types-LoadableClass;
       description = "ClassName type constraint with coercion to load the class";
@@ -8679,7 +8679,7 @@ let self = _self // overrides; _self = with self; {
       homepage = https://github.com/karenetheridge/moosex-types-path-tiny;
       description = "Path::Tiny types and coercions for Moose";
       license = stdenv.lib.licenses.asl20;
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -8709,7 +8709,7 @@ let self = _self // overrides; _self = with self; {
       homepage = https://github.com/dagolden/moosex-types-stringlike;
       description = "Moose type constraints for strings or string-like objects";
       license = stdenv.lib.licenses.asl20;
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -8726,7 +8726,7 @@ let self = _self // overrides; _self = with self; {
       homepage = http://metacpan.org/release/MooseX-Types-Structured;
       description = "MooseX::Types::Structured - Structured Type Constraints for Moose";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -8739,7 +8739,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathClass namespaceclean Testuseok URI URIFromHash ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -8914,7 +8914,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ URI ];
     meta = {
       description = "Perl extension to create signatures for AWS requests";
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -8984,7 +8984,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Manage Amazon S3 policies for HTTP POST forms";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -9001,7 +9001,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Advanced Message Queue Protocol (de)serialization and representation";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -9032,7 +9032,7 @@ let self = _self // overrides; _self = with self; {
       homepage = https://github.com/metabrainz/CoverArtArchive;
       description = "Query the coverartarchive.org";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -9261,7 +9261,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Comprehensive inside-out object support module";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -9538,7 +9538,7 @@ let self = _self // overrides; _self = with self; {
       homepage = https://metacpan.org/release/Path-Tiny;
       description = "File path utility";
       license = stdenv.lib.licenses.asl20;
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
     preConfigure =
@@ -9772,7 +9772,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Display information about the current request/response";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -10310,7 +10310,7 @@ let self = _self // overrides; _self = with self; {
       homepage = https://metacpan.org/pod/Redis;
       description = "Perl binding for Redis database";
       license = stdenv.lib.licenses.artistic2;
-      maintainers = with maintainers; [ ocharles rycee ];
+      maintainers = with maintainers; [ rycee ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -10390,7 +10390,7 @@ let self = _self // overrides; _self = with self; {
       homepage = http://jaldhar.github.com/REST-Utils;
       description = "Utility functions for REST applications";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -10475,7 +10475,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ SOAPLite ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -10626,7 +10626,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -10662,7 +10662,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Perl's Web Services Toolkit";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -10855,7 +10855,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ NumberFormat ];
     meta = {
       license = "open_source";
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -10942,7 +10942,7 @@ let self = _self // overrides; _self = with self; {
         sha256 = "0m3hjk292hnxyi8nkfy8hlr1khnbf2clgkb4kzj0ycq8gcd2z0as";
       };
       meta = {
-        maintainers = with maintainers; [ ocharles ];
+        maintainers = with maintainers; [ ];
         platforms   = stdenv.lib.platforms.unix;
       };
   };
@@ -10968,7 +10968,7 @@ let self = _self // overrides; _self = with self; {
         sha256 = "12ls7f7847i4qcikkp3skwraqvjphjiv2zxfhl5d49326f5myr7x";
     };
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -11037,7 +11037,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "0dfxhr6hxc2majkkrm0qbx3qcbykzpphbj2ms93dc86f7183c1p6";
     };
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -11076,7 +11076,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Use TT to interpolate lexical variables";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -11292,7 +11292,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "0cnwwrd5d6i80f33s7n2ak90rh4s53ss7q57wndrpkpr4bfn3djm";
     };
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -11384,7 +11384,7 @@ let self = _self // overrides; _self = with self; {
       description = "Stream TAP from pgTAP test scripts";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       platforms = stdenv.lib.platforms.linux;
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
     };
   };
 
@@ -11455,7 +11455,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ TemplateToolkit ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -11482,7 +11482,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ TemplateToolkit ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -11495,7 +11495,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ JSON TemplateToolkit ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -11718,7 +11718,7 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ ClassInspector TestUnitLite ];
     propagatedBuildInputs = [ constantboolean ExceptionBase SymbolUtil ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -11874,7 +11874,7 @@ let self = _self // overrides; _self = with self; {
       homepage = http://metacpan.org/release/Test-EOL;
       description = "Check the correct line endings in your project";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -11899,7 +11899,7 @@ let self = _self // overrides; _self = with self; {
       homepage = https://metacpan.org/release/Test-FailWarnings;
       description = "Add test failures if warnings are caught";
       license = stdenv.lib.licenses.asl20;
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -12007,7 +12007,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ JSONAny TestDifferences TestTester ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -12041,7 +12041,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DevelCycle PadWalker ];
     meta = {
       description = "Verifies code hasn't left circular references";
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms = stdenv.lib.platforms.unix;
     };
   };
@@ -12057,7 +12057,7 @@ let self = _self // overrides; _self = with self; {
     meta = with stdenv.lib; {
       description = "Simulating other classes";
       license = licenses.lgpl2Plus;
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = platforms.unix;
     };
   };
@@ -12070,7 +12070,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ SUPER ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -12150,7 +12150,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Check the presence of tabs in your project";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -12280,7 +12280,7 @@ let self = _self // overrides; _self = with self; {
       homepage = https://github.com/rjbs/Test-Routine;
       description = "Composable units of assertion";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -12356,7 +12356,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Write tests, not scripts that run them";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -12391,7 +12391,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Unit testing without external dependencies";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -12447,7 +12447,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Test fallback behaviour in absence of modules";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -12490,7 +12490,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ CGI TestWWWMechanize WWWMechanizeCGI ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -12517,7 +12517,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ XMLLibXML ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -12734,7 +12734,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Spy on objects to achieve test doubles (mock testing)";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -12762,7 +12762,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Micro template engine with Perl5 language";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -12965,7 +12965,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Remove leading and/or trailing whitespace from strings";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -12977,7 +12977,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "0avk50kia78kxryh2whmaj5l18q2wvmkdyqyjsf6kwr4kgy6x3i7";
     };
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -13024,7 +13024,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ URI ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -13404,7 +13404,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Wrapper around ICU collation services";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
       broken = true; # tests fail http://hydra.nixos.org/build/25141764/nixlog/1/raw
     };
@@ -13506,7 +13506,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Build a URI from a set of named parameters";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -13615,7 +13615,7 @@ let self = _self // overrides; _self = with self; {
         --replace '#!/usr/bin/perl' '#!${perl}/bin/perl'
     '';
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -13849,7 +13849,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = {
       description = "A re-usable XPath engine for DOM-like trees";
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -13924,7 +13924,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ XMLParser ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
+      maintainers = with maintainers; [ ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };

From bd9d37e6759e3bc3d778e67fe538a87736a230ca Mon Sep 17 00:00:00 2001
From: robbinch <robbinch33@gmail.com>
Date: Mon, 25 Apr 2016 00:32:16 +0800
Subject: [PATCH 185/712] tinc-haskell: Rename package name to avoid conflict
 (#14952)

---
 pkgs/development/tools/misc/{tinc => tinc-haskell}/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/development/tools/misc/{tinc => tinc-haskell}/default.nix (98%)

diff --git a/pkgs/development/tools/misc/tinc/default.nix b/pkgs/development/tools/misc/tinc-haskell/default.nix
similarity index 98%
rename from pkgs/development/tools/misc/tinc/default.nix
rename to pkgs/development/tools/misc/tinc-haskell/default.nix
index 44491fa0ef9..4efdc909673 100644
--- a/pkgs/development/tools/misc/tinc/default.nix
+++ b/pkgs/development/tools/misc/tinc-haskell/default.nix
@@ -6,7 +6,7 @@
 , ghc, cabal2nix, cabal-install, makeWrapper
 }:
 mkDerivation {
-  pname = "tinc";
+  pname = "tinc-haskell";
   version = "20160419";
   src = fetchFromGitHub {
     owner = "sol";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0956dcf680c..2ef9afe98ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6306,7 +6306,7 @@ in
 
   texi2html = callPackage ../development/tools/misc/texi2html { };
 
-  tinc-haskell = haskellPackages.callPackage ../development/tools/misc/tinc { };
+  tinc-haskell = haskellPackages.callPackage ../development/tools/misc/tinc-haskell { };
 
   travis = callPackage ../development/tools/misc/travis { };
 

From e74289decc997a21339471ce25e4eeb436329bd9 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Sun, 24 Apr 2016 17:37:05 +0100
Subject: [PATCH 186/712] maim: 3.4.46 -> 3.4.47

---
 pkgs/tools/graphics/maim/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix
index fe812eac7d4..fb674bc8d80 100644
--- a/pkgs/tools/graphics/maim/default.nix
+++ b/pkgs/tools/graphics/maim/default.nix
@@ -1,17 +1,15 @@
-{ stdenv, fetchurl, cmake, gengetopt, imlib2, libXrandr, libXfixes
-, cppcheck}:
+{ stdenv, fetchurl, cmake, gengetopt, imlib2, libXrandr, libXfixes }:
 
 stdenv.mkDerivation rec {
   name = "maim-${version}";
-  version = "3.4.46";
+  version = "3.4.47";
 
   src = fetchurl {
     url = "https://github.com/naelstrof/maim/archive/v${version}.tar.gz";
-    sha256 = "04gb858g0rrvdiva2dxwsfd7dmq62r67irnc8cpd0r02hr92dr6n";
+    sha256 = "0kfp7k55bxc5h6h0wv8bwmsc5ny66h9ra2z4dzs4yzszq16544pv";
   };
 
-  buildInputs = [ cmake gengetopt imlib2 libXrandr libXfixes ]
-                ++ stdenv.lib.optional doCheck cppcheck;
+  buildInputs = [ cmake gengetopt imlib2 libXrandr libXfixes ];
 
   doCheck = false;
 

From ed6943ecbc1413e0e6aa452027a399e9b274bcbe Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Sun, 24 Apr 2016 13:24:01 -0400
Subject: [PATCH 187/712] virtualgl: fix libturbojpeg library path

Without this, it tries to link to the dev output of libjpeg_turbo, which
breaks the build.
---
 pkgs/tools/X11/virtualgl/lib.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix
index 2df037229ea..6b93c6432c3 100644
--- a/pkgs/tools/X11/virtualgl/lib.nix
+++ b/pkgs/tools/X11/virtualgl/lib.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1mnpljmx8nxnmpbx4ja430b3y535wkz185qknsxmk27yz4dbmm8l";
   };
 
-  cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo}/lib/libturbojpeg.so" ];
+  cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" ];
 
   makeFlags = [ "PREFIX=$(out)" ];
 

From 5c4e00b6b797c444c0a0ca434c3b6fb469558a91 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 24 Apr 2016 19:40:20 +0200
Subject: [PATCH 188/712] gst_all_1: 1.6.1 -> 1.8.0 (#14628)

---
 pkgs/development/libraries/gstreamer/bad/default.nix      | 4 ++--
 pkgs/development/libraries/gstreamer/base/default.nix     | 4 ++--
 pkgs/development/libraries/gstreamer/core/default.nix     | 4 ++--
 pkgs/development/libraries/gstreamer/ges/default.nix      | 4 ++--
 pkgs/development/libraries/gstreamer/good/default.nix     | 8 ++++----
 pkgs/development/libraries/gstreamer/libav/default.nix    | 4 ++--
 pkgs/development/libraries/gstreamer/python/default.nix   | 4 ++--
 pkgs/development/libraries/gstreamer/ugly/default.nix     | 4 ++--
 pkgs/development/libraries/gstreamer/vaapi/default.nix    | 4 ++--
 pkgs/development/libraries/gstreamer/validate/default.nix | 4 ++--
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 330c1d8dfa4..add3026275f 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -14,7 +14,7 @@ let
   inherit (stdenv.lib) optional optionalString;
 in
 stdenv.mkDerivation rec {
-  name = "gst-plugins-bad-1.6.1";
+  name = "gst-plugins-bad-1.8.0";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Bad Plugins";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
-    sha256 = "0rjla9zcal9b5ynagq7cscjs53qrd9bafjkjssrp8s2z2apsjxp1";
+    sha256 = "03m99igngm37653353n5d724bcqw7p6hw6xjw0i2824523fpcqqi";
   };
 
   nativeBuildInputs = [ pkgconfig python ];
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 4f592dbe31e..b2fff30197c 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-base-1.6.1";
+  name = "gst-plugins-base-1.8.0";
 
   meta = {
     description = "Base plugins and helper libraries";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
-    sha256 = "18sbyjcp281zb3bsqji3pglsdsxi0s6ai7rx90sx8cpflkxdqcwm";
+    sha256 = "08hmg7fp519wim1fm04r7f2q2020ssdninawqsbrqjsvs70srh5b";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 754b2bb64b8..40caf4093f0 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-1.6.1";
+  name = "gstreamer-1.8.0";
 
   meta = {
     description = "Open source multimedia framework";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
-    sha256 = "172w1bpnkn6mm1wi37n03apdbb6cdkykhzjf1vfxchcd7hhkyflp";
+    sha256 = "1p5y9bbrhywng0prmpxv29p6jsz6vd039d49bnc98p9b45532yll";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index 1e0ee39667e..e47ecfa01aa 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-editing-services-1.6.1";
+  name = "gstreamer-editing-services-1.8.0";
 
   meta = with stdenv.lib; {
     description = "Library for creation of audio/video non-linear editors";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz";
-    sha256 = "1lkvkrsipn35341hwwkhwn44n90y49sjwra1r5pazbjgn1yykxzm";
+    sha256 = "1gisdfa91kq89bsmbvb47alaxh8lpqmr6f3dzlwmf389nkandw2h";
   };
 
   nativeBuildInputs = [ pkgconfig python gobjectIntrospection flex perl ];
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 75f0760747b..54175fb83fb 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, python
 , gst-plugins-base, orc, bzip2
 , libv4l, libdv, libavc1394, libiec61883
-, libvpx, speex, flac, taglib
+, libvpx, speex, flac, taglib, libshout
 , cairo, gdk_pixbuf, aalib, libcaca
 , libsoup, libpulseaudio, libintlOrEmpty
 }:
@@ -10,7 +10,7 @@ let
   inherit (stdenv.lib) optionals optionalString;
 in
 stdenv.mkDerivation rec {
-  name = "gst-plugins-good-1.6.1";
+  name = "gst-plugins-good-1.8.0";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Good Plugins";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
-    sha256 = "0darc3058kbnql3mnlpizl0sq0hhli7vkm0rpqb7nywz14abim46";
+    sha256 = "0kczdvqxvl8kxiy2d7czv16jp73hv9k3nykh47ckihnv8x6i6362";
   };
 
   nativeBuildInputs = [ pkgconfig python ];
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     gst-plugins-base orc bzip2
     libdv libvpx speex flac taglib
     cairo gdk_pixbuf aalib libcaca
-    libsoup
+    libsoup libshout
   ]
   ++ libintlOrEmpty
   ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ];
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 6d0c28d0e28..e4daa642ba0 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -9,7 +9,7 @@
 assert withSystemLibav -> libav != null;
 
 stdenv.mkDerivation rec {
-  name = "gst-libav-1.6.1";
+  name = "gst-libav-1.8.0";
 
   meta = {
     homepage = "http://gstreamer.freedesktop.org";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
-    sha256 = "1a9pc7zp5rg0cvpx8gqkr21w73i6p9xa505a34day9f8p3lfim94";
+    sha256 = "0719njp8aarhvn038pijq6dmsnli0zlg146hyfs3rsdffs4f472s";
   };
 
   configureFlags = stdenv.lib.optionalString withSystemLibav
diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix
index c1b94a647b8..5320fdfaced 100644
--- a/pkgs/development/libraries/gstreamer/python/default.nix
+++ b/pkgs/development/libraries/gstreamer/python/default.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-python-1.4.0";
+  name = "gst-python-1.8.0";
 
   src = fetchurl {
     urls = [
       "${meta.homepage}/src/gst-python/${name}.tar.xz"
       "mirror://gentoo/distfiles/${name}.tar.xz"
       ];
-    sha256 = "0gixsp46mv7fvhk669q60wfk9w2lc02sdb1qipq066xlrqlhrr5i";
+    sha256 = "1spn49x7yaj69df6mxh9wwcs0y3abswkfpk84njs71lzqlbzyiff";
   };
 
   patches = [ ./different-path-with-pygobject.patch ];
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 540b3ba0be8..8f8437ad4ac 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-ugly-1.6.1";
+  name = "gst-plugins-ugly-1.8.0";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Ugly Plugins";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
-    sha256 = "0mvasl1pwq70w2kmrkcrg77kggl5q7jqybi7fkvy3vr28c7gkhqc";
+    sha256 = "137b6kqykh5nwbmiv28nn1pc1d2x2rb2xxg382pc9pa9gpxpyrak";
   };
 
   nativeBuildInputs = [ pkgconfig python ];
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index bf061b4125b..a9aa3d73fa2 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gst-vaapi-${version}";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchurl {
     url = "${meta.homepage}/software/vaapi/releases/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.bz2";
-    sha256 = "1cv7zlz5wj6b3acv0pr5cq5wqzd5vcs1lrrlvyl9wrzcnzz8mz1n";
+    sha256 = "14jal2g5mf8r59w8420ixl3kg50vcmy56446ncwd0xrizd6yms5b";
   };
 
   nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ];
diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix
index 0b0ba11a793..1c123621664 100644
--- a/pkgs/development/libraries/gstreamer/validate/default.nix
+++ b/pkgs/development/libraries/gstreamer/validate/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-validate-1.6.0";
+  name = "gst-validate-1.8.0";
 
   meta = {
     description = "Integration testing infrastructure for the GStreamer framework";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-validate/${name}.tar.xz";
-    sha256 = "1vmg5mh068zrvhgrjsbnb7y4k632akyhm8ql0g196cinnp3zibiv";
+    sha256 = "1pcy9pfffyk6xiw6aq38kbv7k24x2rljdy8fabjfy1abpmvvfrkn";
   };
 
   nativeBuildInputs = [

From 882391a1620f5179eab0f9f4b96f85af875cbb34 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 24 Apr 2016 19:44:01 +0200
Subject: [PATCH 189/712] redshift service: run as user service

Fixes #14882.
---
 nixos/modules/services/x11/redshift.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index 4318a17a4fa..8f1e317e52b 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -94,11 +94,9 @@ in {
   };
 
   config = mkIf cfg.enable {
-    systemd.services.redshift = {
+    systemd.user.services.redshift = {
       description = "Redshift colour temperature adjuster";
-      requires = [ "display-manager.service" ];
-      after = [ "display-manager.service" ];
-      wantedBy = [ "graphical.target" ];
+      wantedBy = [ "default.target" ];
       serviceConfig = {
         ExecStart = ''
           ${cfg.package}/bin/redshift \
@@ -107,10 +105,10 @@ in {
             -b ${toString cfg.brightness.day}:${toString cfg.brightness.night} \
             ${lib.strings.concatStringsSep " " cfg.extraOptions}
         '';
-	RestartSec = 3;
+        RestartSec = 3;
+        Restart = "always";
       };
       environment = { DISPLAY = ":0"; };
-      serviceConfig.Restart = "always";
     };
   };
 

From 345ea398ad3136c39e208508481fb5116e2d238b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Apr 2016 15:42:02 +0200
Subject: [PATCH 190/712] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20160406-3-gd7a4f81 using the following inputs:

  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/e8b3512fba355d239648e4b90f876a960cfa7692
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/573e5576f28878481839cc7c1dfa545d6c47457e
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/70928b4eec4bee01900f4702c0ea9802336b7878
---
 .../haskell-modules/configuration-lts-0.0.nix |   15 +
 .../haskell-modules/configuration-lts-0.1.nix |   15 +
 .../haskell-modules/configuration-lts-0.2.nix |   15 +
 .../haskell-modules/configuration-lts-0.3.nix |   15 +
 .../haskell-modules/configuration-lts-0.4.nix |   15 +
 .../haskell-modules/configuration-lts-0.5.nix |   15 +
 .../haskell-modules/configuration-lts-0.6.nix |   15 +
 .../haskell-modules/configuration-lts-0.7.nix |   15 +
 .../haskell-modules/configuration-lts-1.0.nix |   15 +
 .../haskell-modules/configuration-lts-1.1.nix |   15 +
 .../configuration-lts-1.10.nix                |   15 +
 .../configuration-lts-1.11.nix                |   15 +
 .../configuration-lts-1.12.nix                |   15 +
 .../configuration-lts-1.13.nix                |   15 +
 .../configuration-lts-1.14.nix                |   15 +
 .../configuration-lts-1.15.nix                |   15 +
 .../haskell-modules/configuration-lts-1.2.nix |   15 +
 .../haskell-modules/configuration-lts-1.4.nix |   15 +
 .../haskell-modules/configuration-lts-1.5.nix |   15 +
 .../haskell-modules/configuration-lts-1.7.nix |   15 +
 .../haskell-modules/configuration-lts-1.8.nix |   15 +
 .../haskell-modules/configuration-lts-1.9.nix |   15 +
 .../haskell-modules/configuration-lts-2.0.nix |   15 +
 .../haskell-modules/configuration-lts-2.1.nix |   15 +
 .../configuration-lts-2.10.nix                |   15 +
 .../configuration-lts-2.11.nix                |   15 +
 .../configuration-lts-2.12.nix                |   15 +
 .../configuration-lts-2.13.nix                |   15 +
 .../configuration-lts-2.14.nix                |   15 +
 .../configuration-lts-2.15.nix                |   15 +
 .../configuration-lts-2.16.nix                |   15 +
 .../configuration-lts-2.17.nix                |   15 +
 .../configuration-lts-2.18.nix                |   15 +
 .../configuration-lts-2.19.nix                |   15 +
 .../haskell-modules/configuration-lts-2.2.nix |   15 +
 .../configuration-lts-2.20.nix                |   15 +
 .../configuration-lts-2.21.nix                |   15 +
 .../configuration-lts-2.22.nix                |   15 +
 .../haskell-modules/configuration-lts-2.3.nix |   15 +
 .../haskell-modules/configuration-lts-2.4.nix |   15 +
 .../haskell-modules/configuration-lts-2.5.nix |   15 +
 .../haskell-modules/configuration-lts-2.6.nix |   15 +
 .../haskell-modules/configuration-lts-2.7.nix |   15 +
 .../haskell-modules/configuration-lts-2.8.nix |   15 +
 .../haskell-modules/configuration-lts-2.9.nix |   15 +
 .../haskell-modules/configuration-lts-3.0.nix |   15 +
 .../haskell-modules/configuration-lts-3.1.nix |   15 +
 .../configuration-lts-3.10.nix                |   15 +
 .../configuration-lts-3.11.nix                |   15 +
 .../configuration-lts-3.12.nix                |   15 +
 .../configuration-lts-3.13.nix                |   15 +
 .../configuration-lts-3.14.nix                |   15 +
 .../configuration-lts-3.15.nix                |   15 +
 .../configuration-lts-3.16.nix                |   15 +
 .../configuration-lts-3.17.nix                |   15 +
 .../configuration-lts-3.18.nix                |   15 +
 .../configuration-lts-3.19.nix                |   15 +
 .../haskell-modules/configuration-lts-3.2.nix |   15 +
 .../configuration-lts-3.20.nix                |   15 +
 .../configuration-lts-3.21.nix                |   15 +
 .../configuration-lts-3.22.nix                |   15 +
 .../haskell-modules/configuration-lts-3.3.nix |   15 +
 .../haskell-modules/configuration-lts-3.4.nix |   15 +
 .../haskell-modules/configuration-lts-3.5.nix |   15 +
 .../haskell-modules/configuration-lts-3.6.nix |   15 +
 .../haskell-modules/configuration-lts-3.7.nix |   15 +
 .../haskell-modules/configuration-lts-3.8.nix |   15 +
 .../haskell-modules/configuration-lts-3.9.nix |   15 +
 .../haskell-modules/configuration-lts-4.0.nix |   15 +
 .../haskell-modules/configuration-lts-4.1.nix |   15 +
 .../haskell-modules/configuration-lts-4.2.nix |   15 +
 .../haskell-modules/configuration-lts-5.0.nix |   15 +
 .../haskell-modules/configuration-lts-5.1.nix |   15 +
 .../configuration-lts-5.10.nix                |   15 +
 .../configuration-lts-5.11.nix                |   15 +
 .../configuration-lts-5.12.nix                |   15 +
 .../configuration-lts-5.13.nix                |   15 +
 .../haskell-modules/configuration-lts-5.2.nix |   15 +
 .../haskell-modules/configuration-lts-5.3.nix |   15 +
 .../haskell-modules/configuration-lts-5.4.nix |   15 +
 .../haskell-modules/configuration-lts-5.5.nix |   15 +
 .../haskell-modules/configuration-lts-5.6.nix |   15 +
 .../haskell-modules/configuration-lts-5.7.nix |   15 +
 .../haskell-modules/configuration-lts-5.8.nix |   15 +
 .../haskell-modules/configuration-lts-5.9.nix |   15 +
 .../haskell-modules/hackage-packages.nix      | 1319 +++++++++++++++--
 86 files changed, 2451 insertions(+), 143 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 6209c4405ad..5d5e07c3a48 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -1219,6 +1219,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2472,6 +2473,7 @@ self: super: {
   "csv-conduit" = doDistribute super."csv-conduit_0_6_3";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4332,6 +4334,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4413,6 +4416,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = dontDistribute super."hindent";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4755,6 +4759,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = dontDistribute super."hspec-smallcheck";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4899,6 +4904,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5087,6 +5093,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5648,6 +5655,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6165,6 +6173,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6636,6 +6645,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7553,6 +7563,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = dontDistribute super."servant-client";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = dontDistribute super."servant-docs";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7641,6 +7652,8 @@ self: super: {
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_6";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8497,6 +8510,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8644,6 +8658,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index d205c4cdff8..994ca185089 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -1219,6 +1219,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2472,6 +2473,7 @@ self: super: {
   "csv-conduit" = doDistribute super."csv-conduit_0_6_3";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4332,6 +4334,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4413,6 +4416,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = dontDistribute super."hindent";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4755,6 +4759,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = dontDistribute super."hspec-smallcheck";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4899,6 +4904,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5087,6 +5093,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5648,6 +5655,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6165,6 +6173,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6636,6 +6645,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7553,6 +7563,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = dontDistribute super."servant-client";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = dontDistribute super."servant-docs";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7641,6 +7652,8 @@ self: super: {
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_6";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8497,6 +8510,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8644,6 +8658,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 22c56ac8a67..13288cf6eef 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -1219,6 +1219,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2472,6 +2473,7 @@ self: super: {
   "csv-conduit" = doDistribute super."csv-conduit_0_6_3";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4332,6 +4334,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4413,6 +4416,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = dontDistribute super."hindent";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4755,6 +4759,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = dontDistribute super."hspec-smallcheck";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4899,6 +4904,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5087,6 +5093,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5648,6 +5655,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6165,6 +6173,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6636,6 +6645,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7553,6 +7563,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = dontDistribute super."servant-client";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = dontDistribute super."servant-docs";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7641,6 +7652,8 @@ self: super: {
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_6";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8497,6 +8510,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8644,6 +8658,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 29ef3a1c4a8..a2a328b65c0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -1219,6 +1219,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2472,6 +2473,7 @@ self: super: {
   "csv-conduit" = doDistribute super."csv-conduit_0_6_3";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4332,6 +4334,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4413,6 +4416,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = dontDistribute super."hindent";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4755,6 +4759,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = dontDistribute super."hspec-smallcheck";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4899,6 +4904,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5087,6 +5093,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5648,6 +5655,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6165,6 +6173,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6636,6 +6645,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7553,6 +7563,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = dontDistribute super."servant-client";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = dontDistribute super."servant-docs";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7641,6 +7652,8 @@ self: super: {
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_6";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8497,6 +8510,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8644,6 +8658,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index 73b991dd378..8947dce5d90 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -1219,6 +1219,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2472,6 +2473,7 @@ self: super: {
   "csv-conduit" = doDistribute super."csv-conduit_0_6_3";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4329,6 +4331,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4410,6 +4413,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = dontDistribute super."hindent";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4752,6 +4756,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = dontDistribute super."hspec-smallcheck";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4896,6 +4901,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5084,6 +5090,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5645,6 +5652,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6162,6 +6170,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6633,6 +6642,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7549,6 +7559,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = dontDistribute super."servant-client";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = dontDistribute super."servant-docs";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7637,6 +7648,8 @@ self: super: {
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_6";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8493,6 +8506,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8640,6 +8654,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 0504c68e1e6..74c95cb7400 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -1219,6 +1219,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2472,6 +2473,7 @@ self: super: {
   "csv-conduit" = doDistribute super."csv-conduit_0_6_3";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4329,6 +4331,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4410,6 +4413,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = dontDistribute super."hindent";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4752,6 +4756,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = dontDistribute super."hspec-smallcheck";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4896,6 +4901,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5084,6 +5090,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5645,6 +5652,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6162,6 +6170,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6633,6 +6642,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7549,6 +7559,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = dontDistribute super."servant-client";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = dontDistribute super."servant-docs";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7637,6 +7648,8 @@ self: super: {
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_6";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8493,6 +8506,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8640,6 +8654,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index 65e9713e303..1e44d58aefd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -1218,6 +1218,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2471,6 +2472,7 @@ self: super: {
   "csv-conduit" = doDistribute super."csv-conduit_0_6_3";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4327,6 +4329,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4408,6 +4411,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = dontDistribute super."hindent";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4750,6 +4754,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = dontDistribute super."hspec-smallcheck";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4894,6 +4899,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5082,6 +5088,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5643,6 +5650,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6160,6 +6168,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6631,6 +6640,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7546,6 +7556,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = dontDistribute super."servant-client";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = dontDistribute super."servant-docs";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7634,6 +7645,8 @@ self: super: {
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_6";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8490,6 +8503,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8637,6 +8651,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 081a214d4db..f5075c4afc2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -1218,6 +1218,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2471,6 +2472,7 @@ self: super: {
   "csv-conduit" = doDistribute super."csv-conduit_0_6_3";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4327,6 +4329,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4408,6 +4411,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = dontDistribute super."hindent";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4750,6 +4754,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = dontDistribute super."hspec-smallcheck";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4894,6 +4899,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5082,6 +5088,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5643,6 +5650,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6160,6 +6168,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6631,6 +6640,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7546,6 +7556,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = dontDistribute super."servant-client";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = dontDistribute super."servant-docs";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7634,6 +7645,8 @@ self: super: {
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_6";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8490,6 +8503,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8637,6 +8651,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index e1c3d165ff7..b1e9391c5f8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -1215,6 +1215,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2464,6 +2465,7 @@ self: super: {
   "csv-conduit" = doDistribute super."csv-conduit_0_6_3";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4319,6 +4321,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4400,6 +4403,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = dontDistribute super."hindent";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4741,6 +4745,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = dontDistribute super."hspec-smallcheck";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4885,6 +4890,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5073,6 +5079,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5634,6 +5641,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6151,6 +6159,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6622,6 +6631,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7536,6 +7546,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = dontDistribute super."servant-client";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = dontDistribute super."servant-docs";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7624,6 +7635,8 @@ self: super: {
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8479,6 +8492,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8626,6 +8640,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index 070631c28b2..4f833f432c8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -1215,6 +1215,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2462,6 +2463,7 @@ self: super: {
   "csv-conduit" = doDistribute super."csv-conduit_0_6_3";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4315,6 +4317,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4396,6 +4399,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = dontDistribute super."hindent";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4735,6 +4739,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = dontDistribute super."hspec-smallcheck";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4879,6 +4884,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5067,6 +5073,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5628,6 +5635,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6144,6 +6152,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6615,6 +6624,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7529,6 +7539,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = dontDistribute super."servant-client";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = dontDistribute super."servant-docs";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7616,6 +7627,8 @@ self: super: {
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8467,6 +8480,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8614,6 +8628,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index ccd32b161ed..988c7e3714a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -1214,6 +1214,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2458,6 +2459,7 @@ self: super: {
   "csv-conduit" = doDistribute super."csv-conduit_0_6_3";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4304,6 +4306,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4385,6 +4388,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = dontDistribute super."hindent";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4724,6 +4728,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = dontDistribute super."hspec-smallcheck";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4868,6 +4873,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5051,6 +5057,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5611,6 +5618,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6126,6 +6134,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6595,6 +6604,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7507,6 +7517,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = dontDistribute super."servant-client";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = dontDistribute super."servant-docs";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7593,6 +7604,8 @@ self: super: {
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8440,6 +8453,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8587,6 +8601,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 3ba65450a7b..0fe6da3b536 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -1214,6 +1214,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2458,6 +2459,7 @@ self: super: {
   "csv-conduit" = doDistribute super."csv-conduit_0_6_3";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4303,6 +4305,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4384,6 +4387,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = dontDistribute super."hindent";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4723,6 +4727,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = dontDistribute super."hspec-smallcheck";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4867,6 +4872,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5048,6 +5054,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5607,6 +5614,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6122,6 +6130,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6591,6 +6600,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7503,6 +7513,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = dontDistribute super."servant-client";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = dontDistribute super."servant-docs";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7589,6 +7600,8 @@ self: super: {
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8436,6 +8449,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8583,6 +8597,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 5f128b69c41..6523554f052 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -1214,6 +1214,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2458,6 +2459,7 @@ self: super: {
   "csv-conduit" = doDistribute super."csv-conduit_0_6_3";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4302,6 +4304,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4383,6 +4386,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = dontDistribute super."hindent";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4722,6 +4726,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = dontDistribute super."hspec-smallcheck";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4866,6 +4871,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5047,6 +5053,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5606,6 +5613,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6121,6 +6129,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6590,6 +6599,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7502,6 +7512,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = dontDistribute super."servant-client";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = dontDistribute super."servant-docs";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7588,6 +7599,8 @@ self: super: {
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8435,6 +8448,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8582,6 +8596,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 64693d1c910..9b192de0166 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -1214,6 +1214,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2458,6 +2459,7 @@ self: super: {
   "csv-conduit" = doDistribute super."csv-conduit_0_6_3";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4301,6 +4303,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4382,6 +4385,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = dontDistribute super."hindent";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4721,6 +4725,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = dontDistribute super."hspec-smallcheck";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4865,6 +4870,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5046,6 +5052,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5605,6 +5612,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6120,6 +6128,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6589,6 +6598,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7501,6 +7511,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = dontDistribute super."servant-client";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = dontDistribute super."servant-docs";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7587,6 +7598,8 @@ self: super: {
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8433,6 +8446,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8580,6 +8594,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index bf089955500..a2021991e50 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -1213,6 +1213,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2455,6 +2456,7 @@ self: super: {
   "csv-conduit" = doDistribute super."csv-conduit_0_6_3";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4298,6 +4300,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4379,6 +4382,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = dontDistribute super."hindent";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4718,6 +4722,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = dontDistribute super."hspec-smallcheck";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4862,6 +4867,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5043,6 +5049,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5602,6 +5609,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6116,6 +6124,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6585,6 +6594,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7496,6 +7506,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = dontDistribute super."servant-client";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = dontDistribute super."servant-docs";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7582,6 +7593,8 @@ self: super: {
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8428,6 +8441,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8575,6 +8589,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index 647c141ef7f..b5fdfd2a4aa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -1212,6 +1212,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2452,6 +2453,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4294,6 +4296,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4375,6 +4378,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = dontDistribute super."hindent";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4714,6 +4718,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = dontDistribute super."hspec-smallcheck";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4858,6 +4863,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5039,6 +5045,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5598,6 +5605,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6110,6 +6118,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6579,6 +6588,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7489,6 +7499,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = dontDistribute super."servant-client";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = dontDistribute super."servant-docs";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7575,6 +7586,8 @@ self: super: {
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8419,6 +8432,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8566,6 +8580,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index 42c898fadf4..2ce53895ab7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -1215,6 +1215,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2460,6 +2461,7 @@ self: super: {
   "csv-conduit" = doDistribute super."csv-conduit_0_6_3";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4312,6 +4314,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4393,6 +4396,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = dontDistribute super."hindent";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4732,6 +4736,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = dontDistribute super."hspec-smallcheck";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4876,6 +4881,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5064,6 +5070,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5625,6 +5632,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6141,6 +6149,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6611,6 +6620,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7523,6 +7533,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = dontDistribute super."servant-client";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = dontDistribute super."servant-docs";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7610,6 +7621,8 @@ self: super: {
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8461,6 +8474,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8608,6 +8622,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 4cf1b11f75d..5092c1f02a7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -1214,6 +1214,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2459,6 +2460,7 @@ self: super: {
   "csv-conduit" = doDistribute super."csv-conduit_0_6_3";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4309,6 +4311,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4390,6 +4393,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = dontDistribute super."hindent";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4729,6 +4733,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = dontDistribute super."hspec-smallcheck";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4873,6 +4878,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5061,6 +5067,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5622,6 +5629,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6137,6 +6145,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6607,6 +6616,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7519,6 +7529,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = dontDistribute super."servant-client";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = dontDistribute super."servant-docs";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7606,6 +7617,8 @@ self: super: {
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8456,6 +8469,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8603,6 +8617,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index 44c6245033c..de2508852e7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -1214,6 +1214,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2458,6 +2459,7 @@ self: super: {
   "csv-conduit" = doDistribute super."csv-conduit_0_6_3";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4308,6 +4310,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4389,6 +4392,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = dontDistribute super."hindent";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4728,6 +4732,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = dontDistribute super."hspec-smallcheck";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4872,6 +4877,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5060,6 +5066,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5621,6 +5628,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6136,6 +6144,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6606,6 +6615,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7518,6 +7528,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = dontDistribute super."servant-client";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = dontDistribute super."servant-docs";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7605,6 +7616,8 @@ self: super: {
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8454,6 +8467,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8601,6 +8615,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index 34799a77d6b..72af4fc6c77 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -1214,6 +1214,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2458,6 +2459,7 @@ self: super: {
   "csv-conduit" = doDistribute super."csv-conduit_0_6_3";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4308,6 +4310,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4389,6 +4392,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = dontDistribute super."hindent";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4728,6 +4732,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = dontDistribute super."hspec-smallcheck";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4872,6 +4877,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5055,6 +5061,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5616,6 +5623,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6131,6 +6139,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6601,6 +6610,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7513,6 +7523,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = dontDistribute super."servant-client";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = dontDistribute super."servant-docs";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7600,6 +7611,8 @@ self: super: {
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8449,6 +8462,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8596,6 +8610,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index 3b19bb0c58d..b7b754a984f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -1214,6 +1214,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2458,6 +2459,7 @@ self: super: {
   "csv-conduit" = doDistribute super."csv-conduit_0_6_3";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4305,6 +4307,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4386,6 +4389,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = dontDistribute super."hindent";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4725,6 +4729,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = dontDistribute super."hspec-smallcheck";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4869,6 +4874,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5052,6 +5058,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5612,6 +5619,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6127,6 +6135,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6597,6 +6606,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7509,6 +7519,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = dontDistribute super."servant-client";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = dontDistribute super."servant-docs";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7596,6 +7607,8 @@ self: super: {
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8444,6 +8457,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8591,6 +8605,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index ecdfc50ad91..6cb77fd1f9b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -1214,6 +1214,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2458,6 +2459,7 @@ self: super: {
   "csv-conduit" = doDistribute super."csv-conduit_0_6_3";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4304,6 +4306,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4385,6 +4388,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = dontDistribute super."hindent";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4724,6 +4728,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = dontDistribute super."hspec-smallcheck";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4868,6 +4873,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5051,6 +5057,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5611,6 +5618,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6126,6 +6134,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6596,6 +6605,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7508,6 +7518,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = dontDistribute super."servant-client";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = dontDistribute super."servant-docs";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7595,6 +7606,8 @@ self: super: {
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly" = doDistribute super."shelly_1_5_7";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8443,6 +8456,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_3_3_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8590,6 +8604,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 6575165571f..fa5928d6b72 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -1206,6 +1206,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2440,6 +2441,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4278,6 +4280,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4358,6 +4361,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_1";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4695,6 +4699,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4840,6 +4845,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5016,6 +5022,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5568,6 +5575,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6073,6 +6081,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6538,6 +6547,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7446,6 +7456,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7531,6 +7542,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8370,6 +8383,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8516,6 +8530,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index cb85183a364..8ff45e0c7df 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -1206,6 +1206,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2439,6 +2440,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4277,6 +4279,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4357,6 +4360,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_1";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4694,6 +4698,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4839,6 +4844,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5015,6 +5021,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5567,6 +5574,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6072,6 +6080,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6537,6 +6546,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7445,6 +7455,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7530,6 +7541,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8369,6 +8382,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8515,6 +8529,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index ede06c7477c..3b13848d98a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -1201,6 +1201,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2427,6 +2428,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4258,6 +4260,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4338,6 +4341,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_2";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4674,6 +4678,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4818,6 +4823,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4993,6 +4999,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5542,6 +5549,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6047,6 +6055,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6511,6 +6520,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7415,6 +7425,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7500,6 +7511,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8329,6 +8342,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8475,6 +8489,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index d54a1f5c3e5..14570e607c8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -1200,6 +1200,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2426,6 +2427,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4255,6 +4257,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4335,6 +4338,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_2";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4671,6 +4675,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4815,6 +4820,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4990,6 +4996,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5538,6 +5545,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6042,6 +6050,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6505,6 +6514,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7408,6 +7418,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7493,6 +7504,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8320,6 +8333,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8466,6 +8480,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 91703369a40..706e342f6b2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -1200,6 +1200,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2426,6 +2427,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4255,6 +4257,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4335,6 +4338,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_2";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4671,6 +4675,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4815,6 +4820,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4990,6 +4996,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5538,6 +5545,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6042,6 +6050,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6505,6 +6514,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7407,6 +7417,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7492,6 +7503,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8319,6 +8332,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8465,6 +8479,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index 30375d21722..7cad852e803 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -1200,6 +1200,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2426,6 +2427,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4254,6 +4256,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4334,6 +4337,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_2";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4670,6 +4674,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4814,6 +4819,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4988,6 +4994,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5536,6 +5543,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6040,6 +6048,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6503,6 +6512,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7405,6 +7415,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7490,6 +7501,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8317,6 +8330,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8463,6 +8477,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index c2d4495820d..951fd6c2f8d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -1200,6 +1200,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2426,6 +2427,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4253,6 +4255,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4333,6 +4336,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_2";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4669,6 +4673,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4812,6 +4817,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4986,6 +4992,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5534,6 +5541,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6038,6 +6046,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6501,6 +6510,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7403,6 +7413,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7488,6 +7499,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8314,6 +8327,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8460,6 +8474,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index e396fc6a908..8adbc6fec84 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -1200,6 +1200,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2426,6 +2427,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4252,6 +4254,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4332,6 +4335,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_2";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4668,6 +4672,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4811,6 +4816,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4985,6 +4991,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5533,6 +5540,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6036,6 +6044,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6499,6 +6508,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7401,6 +7411,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7486,6 +7497,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8311,6 +8324,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8457,6 +8471,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index a34eb76a309..3e319aa5ed4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -1200,6 +1200,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2424,6 +2425,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4248,6 +4250,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4328,6 +4331,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_2";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4664,6 +4668,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4807,6 +4812,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4981,6 +4987,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5528,6 +5535,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6031,6 +6039,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6494,6 +6503,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7396,6 +7406,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7481,6 +7492,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8306,6 +8319,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8452,6 +8466,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index c0365589afd..0a58df94535 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -1200,6 +1200,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2422,6 +2423,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4244,6 +4246,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4324,6 +4327,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_2";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4660,6 +4664,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4803,6 +4808,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4977,6 +4983,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5524,6 +5531,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6027,6 +6035,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6489,6 +6498,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7391,6 +7401,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7476,6 +7487,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8301,6 +8314,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8447,6 +8461,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index d7768a5ed46..e7a9357da6a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -1200,6 +1200,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2421,6 +2422,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4242,6 +4244,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4322,6 +4325,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_2";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4658,6 +4662,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4801,6 +4806,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4975,6 +4981,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5522,6 +5529,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6025,6 +6033,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6486,6 +6495,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7388,6 +7398,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7473,6 +7484,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8297,6 +8310,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8443,6 +8457,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index 44b5e76deb6..de4b6c8fbb8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -1200,6 +1200,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2421,6 +2422,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4241,6 +4243,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4321,6 +4324,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_2";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4657,6 +4661,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4800,6 +4805,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4974,6 +4980,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5521,6 +5528,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6023,6 +6031,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6484,6 +6493,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7386,6 +7396,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7471,6 +7482,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8294,6 +8307,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8440,6 +8454,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 7fe581e10da..b1785347434 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -1205,6 +1205,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2436,6 +2437,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4274,6 +4276,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4354,6 +4357,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_2";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4691,6 +4695,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4836,6 +4841,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5012,6 +5018,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5564,6 +5571,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6069,6 +6077,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6534,6 +6543,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7442,6 +7452,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7527,6 +7538,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8366,6 +8379,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8512,6 +8526,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index 6e6ca82e27d..13fd59373ee 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -1200,6 +1200,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2420,6 +2421,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4240,6 +4242,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4320,6 +4323,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_2";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4656,6 +4660,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4799,6 +4804,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4973,6 +4979,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5520,6 +5527,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6022,6 +6030,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6483,6 +6492,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7384,6 +7394,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7469,6 +7480,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8291,6 +8304,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8437,6 +8451,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 16154f7dbb9..9718fd66f08 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -1200,6 +1200,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2420,6 +2421,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4240,6 +4242,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4320,6 +4323,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_2";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4656,6 +4660,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4799,6 +4804,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4973,6 +4979,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5520,6 +5527,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6022,6 +6030,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6483,6 +6492,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7383,6 +7393,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7468,6 +7479,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8290,6 +8303,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8436,6 +8450,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 1a8df55704d..c9c1be69df4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -1200,6 +1200,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2420,6 +2421,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4240,6 +4242,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4320,6 +4323,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_2";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4655,6 +4659,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4798,6 +4803,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4972,6 +4978,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5519,6 +5526,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6021,6 +6029,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6482,6 +6491,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7382,6 +7392,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7467,6 +7478,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8289,6 +8302,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8435,6 +8449,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index 2000c0c997c..5548314dff3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -1205,6 +1205,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2436,6 +2437,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4273,6 +4275,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4353,6 +4356,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_2";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4690,6 +4694,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4835,6 +4840,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5010,6 +5016,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5562,6 +5569,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6067,6 +6075,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6532,6 +6541,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7440,6 +7450,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7525,6 +7536,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8364,6 +8377,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8510,6 +8524,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 3f2c842fadd..9becf92e39a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -1205,6 +1205,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2435,6 +2436,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4272,6 +4274,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4352,6 +4355,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_2";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4689,6 +4693,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4834,6 +4839,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5009,6 +5015,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5561,6 +5568,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6066,6 +6074,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6530,6 +6539,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7437,6 +7447,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7522,6 +7533,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8361,6 +8374,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8507,6 +8521,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 2f1c3f48a19..c770cc19433 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -1205,6 +1205,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2434,6 +2435,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4271,6 +4273,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4351,6 +4354,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_2";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4688,6 +4692,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4833,6 +4838,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5008,6 +5014,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5560,6 +5567,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6065,6 +6073,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6529,6 +6538,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7436,6 +7446,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7521,6 +7532,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8360,6 +8373,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8506,6 +8520,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index 57c1e6077e4..b18878eda98 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -1203,6 +1203,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2431,6 +2432,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4266,6 +4268,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4346,6 +4349,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_2";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4683,6 +4687,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4828,6 +4833,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5003,6 +5009,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5555,6 +5562,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6059,6 +6067,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6523,6 +6532,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7430,6 +7440,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7515,6 +7526,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8352,6 +8365,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8498,6 +8512,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 2516bf13e66..a310f5c2279 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -1202,6 +1202,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2430,6 +2431,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4265,6 +4267,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4345,6 +4348,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_2";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4682,6 +4686,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4827,6 +4832,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5002,6 +5008,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5554,6 +5561,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6059,6 +6067,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6523,6 +6532,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7430,6 +7440,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7515,6 +7526,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8352,6 +8365,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8498,6 +8512,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index 3d9ad22a9fa..6f38b78b48a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -1201,6 +1201,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2429,6 +2430,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4263,6 +4265,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4343,6 +4346,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_2";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4680,6 +4684,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4825,6 +4830,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -5000,6 +5006,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5552,6 +5559,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6057,6 +6065,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6521,6 +6530,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7427,6 +7437,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7512,6 +7523,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8346,6 +8359,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8492,6 +8506,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index fc5d94955c9..e082c07865a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -1201,6 +1201,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2427,6 +2428,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4259,6 +4261,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4339,6 +4342,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_4_2";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4675,6 +4679,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = dontDistribute super."hspec-snap";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4819,6 +4824,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4994,6 +5000,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5545,6 +5552,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -6050,6 +6058,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6514,6 +6523,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7420,6 +7430,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_2_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7505,6 +7516,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_1_2";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8335,6 +8348,7 @@ self: super: {
   "transformers-compat" = doDistribute super."transformers-compat_0_4_0_3";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-lift" = dontDistribute super."transformers-lift";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
@@ -8481,6 +8495,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus-model" = dontDistribute super."udbus-model";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index 95dd9bd6479..dc44bbbcf45 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -1178,6 +1178,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2362,6 +2363,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4150,6 +4152,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4227,6 +4230,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_4";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4559,6 +4563,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4699,6 +4704,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4865,6 +4871,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5388,6 +5395,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5874,6 +5882,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_0";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6324,6 +6333,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7214,6 +7224,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7295,6 +7306,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_3_3";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8099,6 +8112,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8241,6 +8255,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index d6292298ad9..564fca0b8df 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -1177,6 +1177,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2361,6 +2362,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4148,6 +4150,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4225,6 +4228,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_4";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4557,6 +4561,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4697,6 +4702,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4863,6 +4869,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5386,6 +5393,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5870,6 +5878,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_0";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6320,6 +6329,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7208,6 +7218,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7289,6 +7300,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_3_3";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8093,6 +8106,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8235,6 +8249,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 63e0e4aee90..80084167d43 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -1174,6 +1174,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2350,6 +2351,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4124,6 +4126,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4200,6 +4203,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_4";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4530,6 +4534,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4670,6 +4675,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4834,6 +4840,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5352,6 +5359,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5834,6 +5842,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6280,6 +6289,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7161,6 +7171,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_5";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7242,6 +7253,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8038,6 +8051,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8179,6 +8193,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index eb489c0e4ae..a7a66f37824 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -1174,6 +1174,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2349,6 +2350,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4122,6 +4124,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4198,6 +4201,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_4";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4528,6 +4532,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4668,6 +4673,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4832,6 +4838,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5350,6 +5357,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5832,6 +5840,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6277,6 +6286,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7158,6 +7168,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_5";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7239,6 +7250,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8035,6 +8048,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8176,6 +8190,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index 34063daafaa..928bc177e6a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -1174,6 +1174,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2348,6 +2349,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4120,6 +4122,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4196,6 +4199,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_4";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4526,6 +4530,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4666,6 +4671,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4830,6 +4836,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5348,6 +5355,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5830,6 +5838,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6274,6 +6283,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7155,6 +7165,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_5";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7236,6 +7247,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8030,6 +8043,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8171,6 +8185,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index 341e86d265d..45442c782c0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -1174,6 +1174,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2348,6 +2349,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4120,6 +4122,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4195,6 +4198,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_4";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4525,6 +4529,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4665,6 +4670,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4829,6 +4835,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5346,6 +5353,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5828,6 +5836,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6271,6 +6280,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7152,6 +7162,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_5";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7233,6 +7244,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8027,6 +8040,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8168,6 +8182,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index 89d339d2168..3a2e3d30d4e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -1172,6 +1172,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2344,6 +2345,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4114,6 +4116,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4189,6 +4192,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_5";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4519,6 +4523,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4658,6 +4663,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4822,6 +4828,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5339,6 +5346,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5821,6 +5829,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6264,6 +6273,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7145,6 +7155,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_5";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7226,6 +7237,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8020,6 +8033,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8161,6 +8175,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 8eff983280c..49d22021c49 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -1172,6 +1172,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2344,6 +2345,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4113,6 +4115,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4188,6 +4191,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_5";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4517,6 +4521,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4655,6 +4660,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4819,6 +4825,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5336,6 +5343,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5818,6 +5826,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6261,6 +6270,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7142,6 +7152,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_5";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7222,6 +7233,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8016,6 +8029,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8157,6 +8171,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index c548282e21b..c296a9132a1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -1171,6 +1171,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2343,6 +2344,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4110,6 +4112,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4185,6 +4188,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_5";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4514,6 +4518,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4652,6 +4657,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4816,6 +4822,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5332,6 +5339,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5813,6 +5821,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6256,6 +6265,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7135,6 +7145,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_5";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7215,6 +7226,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8006,6 +8019,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8147,6 +8161,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index 6b0cb8f9d20..501a11cc54c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -1171,6 +1171,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2342,6 +2343,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4108,6 +4110,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4183,6 +4186,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_5";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4512,6 +4516,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4650,6 +4655,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4813,6 +4819,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5329,6 +5336,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5808,6 +5816,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6251,6 +6260,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7130,6 +7140,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_5";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7210,6 +7221,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_4_1";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8001,6 +8014,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8142,6 +8156,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index cfcdee16b15..8eed33d20a2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -1171,6 +1171,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2341,6 +2342,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4103,6 +4105,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4178,6 +4181,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_5";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4507,6 +4511,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4644,6 +4649,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4807,6 +4813,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5323,6 +5330,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5802,6 +5810,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6244,6 +6253,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7123,6 +7133,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_5";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7202,6 +7213,8 @@ self: super: {
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -7993,6 +8006,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8134,6 +8148,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index 31b01ea1cd4..a41538e4805 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -1171,6 +1171,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2336,6 +2337,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4098,6 +4100,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4173,6 +4176,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_5";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4500,6 +4504,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4637,6 +4642,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4800,6 +4806,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5314,6 +5321,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5793,6 +5801,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6234,6 +6243,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7113,6 +7123,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_5";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7192,6 +7203,8 @@ self: super: {
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -7982,6 +7995,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8123,6 +8137,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index fa09ae7b064..53be954857c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -1176,6 +1176,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2359,6 +2360,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4144,6 +4146,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4221,6 +4224,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_4";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4553,6 +4557,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4693,6 +4698,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4859,6 +4865,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5380,6 +5387,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5864,6 +5872,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_0";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6314,6 +6323,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7201,6 +7211,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7282,6 +7293,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_3_3";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8085,6 +8098,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8227,6 +8241,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index 534c62479b0..58bef4e1657 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -1170,6 +1170,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2335,6 +2336,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4097,6 +4099,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4172,6 +4175,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_5";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4499,6 +4503,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4636,6 +4641,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4799,6 +4805,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5313,6 +5320,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5792,6 +5800,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6233,6 +6242,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7111,6 +7121,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_5";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7190,6 +7201,8 @@ self: super: {
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -7979,6 +7992,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8120,6 +8134,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index 6acbf986015..ac0f58b31bd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -1170,6 +1170,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2334,6 +2335,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4094,6 +4096,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4169,6 +4172,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_5";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4496,6 +4500,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4633,6 +4638,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4794,6 +4800,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5308,6 +5315,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5786,6 +5794,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6226,6 +6235,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7101,6 +7111,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_6";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_6";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7177,6 +7188,8 @@ self: super: {
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -7965,6 +7978,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8106,6 +8120,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index 008e4ca4156..438cbbc5a19 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -1170,6 +1170,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2334,6 +2335,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4091,6 +4093,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4166,6 +4169,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_5";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4493,6 +4497,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4630,6 +4635,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4789,6 +4795,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5302,6 +5309,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5780,6 +5788,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6220,6 +6229,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7095,6 +7105,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_6";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_6";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7171,6 +7182,8 @@ self: super: {
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -7959,6 +7972,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8100,6 +8114,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index abe5cc4f36d..0b13ec7c6b0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -1176,6 +1176,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2359,6 +2360,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4143,6 +4145,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4220,6 +4223,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_4";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4551,6 +4555,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4691,6 +4696,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4857,6 +4863,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5378,6 +5385,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5862,6 +5870,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_1";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6312,6 +6321,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7198,6 +7208,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_2";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7279,6 +7290,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_3_3";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8081,6 +8094,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8223,6 +8237,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 8e4b16f193f..70650c9956a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -1176,6 +1176,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2359,6 +2360,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4143,6 +4145,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4220,6 +4223,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_4";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4551,6 +4555,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4691,6 +4696,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4857,6 +4863,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5378,6 +5385,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5862,6 +5870,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_2";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6312,6 +6321,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7198,6 +7208,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_2";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7279,6 +7290,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_3_3";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8080,6 +8093,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8222,6 +8236,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index 3ced8008f73..4f178b4b1cf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -1176,6 +1176,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2358,6 +2359,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4141,6 +4143,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4217,6 +4220,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_4";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4547,6 +4551,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4687,6 +4692,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4851,6 +4857,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5372,6 +5379,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5855,6 +5863,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6304,6 +6313,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7189,6 +7199,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_2";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7270,6 +7281,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_3_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8068,6 +8081,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8210,6 +8224,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index 686ebe66539..cf8d12a6493 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -1176,6 +1176,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2358,6 +2359,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4138,6 +4140,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4214,6 +4217,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_4";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4544,6 +4548,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4684,6 +4689,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4848,6 +4854,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5366,6 +5373,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5849,6 +5857,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6298,6 +6307,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7183,6 +7193,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_2";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_2";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7264,6 +7275,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_3_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8062,6 +8075,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8203,6 +8217,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 82b01af5b5b..3cf88fb2e61 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -1176,6 +1176,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2355,6 +2356,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4134,6 +4136,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4210,6 +4213,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_4";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4540,6 +4544,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4680,6 +4685,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4844,6 +4850,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5362,6 +5369,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5845,6 +5853,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6294,6 +6303,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7177,6 +7187,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_4";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_4";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7258,6 +7269,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8055,6 +8068,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8196,6 +8210,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 12e1101c971..104697b1a4b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -1176,6 +1176,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2353,6 +2354,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4128,6 +4130,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4204,6 +4207,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_4";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4534,6 +4538,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4674,6 +4679,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4838,6 +4844,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5356,6 +5363,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5838,6 +5846,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6287,6 +6296,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7169,6 +7179,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_4";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_4";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7250,6 +7261,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8046,6 +8059,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8187,6 +8201,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 740e11523e7..be7b35aabf7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -1174,6 +1174,7 @@ self: super: {
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2350,6 +2351,7 @@ self: super: {
   "css-syntax" = dontDistribute super."css-syntax";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -4124,6 +4126,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4200,6 +4203,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_5_4";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4530,6 +4534,7 @@ self: super: {
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-setup" = dontDistribute super."hspec-setup";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
   "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
@@ -4670,6 +4675,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
@@ -4834,6 +4840,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5352,6 +5359,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5834,6 +5842,7 @@ self: super: {
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
+  "native" = dontDistribute super."native";
   "nats" = doDistribute super."nats_1";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
@@ -6282,6 +6291,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgp-wordlist" = dontDistribute super."pgp-wordlist";
@@ -7164,6 +7174,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_4";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_4";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -7245,6 +7256,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelly" = doDistribute super."shelly_1_6_4";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -8041,6 +8054,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -8182,6 +8196,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index 5d757751aae..5613b9d9119 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -1146,6 +1146,7 @@ self: super: {
   "airship" = doDistribute super."airship_0_4_1_0";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2281,6 +2282,7 @@ self: super: {
   "css" = dontDistribute super."css";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -3997,6 +3999,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4069,6 +4072,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_6_1";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4382,6 +4386,7 @@ self: super: {
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
@@ -4509,6 +4514,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
@@ -4665,6 +4671,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5167,6 +5174,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5630,6 +5638,7 @@ self: super: {
   "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
+  "native" = dontDistribute super."native";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
   "natural-numbers" = dontDistribute super."natural-numbers";
@@ -6051,6 +6060,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgsql-simple" = dontDistribute super."pgsql-simple";
@@ -6891,6 +6901,7 @@ self: super: {
   "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_6";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_6";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6965,6 +6976,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -7724,6 +7737,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -7860,6 +7874,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index 3104f83dbf8..dad52f109ee 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -1145,6 +1145,7 @@ self: super: {
   "airship" = doDistribute super."airship_0_4_2_0";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2279,6 +2280,7 @@ self: super: {
   "css" = dontDistribute super."css";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -3990,6 +3992,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4062,6 +4065,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_6_1";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4375,6 +4379,7 @@ self: super: {
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
@@ -4502,6 +4507,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
@@ -4654,6 +4660,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5152,6 +5159,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5615,6 +5623,7 @@ self: super: {
   "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
+  "native" = dontDistribute super."native";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
   "natural-numbers" = dontDistribute super."natural-numbers";
@@ -6036,6 +6045,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgsql-simple" = dontDistribute super."pgsql-simple";
@@ -6875,6 +6885,7 @@ self: super: {
   "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_6";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_6";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6949,6 +6960,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -7708,6 +7721,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -7844,6 +7858,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
index 1e63fc7ecdb..53c71284163 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
@@ -1144,6 +1144,7 @@ self: super: {
   "airship" = doDistribute super."airship_0_4_3_0";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2273,6 +2274,7 @@ self: super: {
   "css" = dontDistribute super."css";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -3971,6 +3973,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -4043,6 +4046,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_6_1";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4354,6 +4358,7 @@ self: super: {
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
@@ -4481,6 +4486,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
@@ -4631,6 +4637,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5127,6 +5134,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5587,6 +5595,7 @@ self: super: {
   "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
+  "native" = dontDistribute super."native";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
   "natural-numbers" = dontDistribute super."natural-numbers";
@@ -6008,6 +6017,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgsql-simple" = dontDistribute super."pgsql-simple";
@@ -6839,6 +6849,7 @@ self: super: {
   "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_6";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_6";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6913,6 +6924,8 @@ self: super: {
   "shellmate" = dontDistribute super."shellmate";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -7666,6 +7679,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -7802,6 +7816,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
index 63ad44a1408..17e11586d38 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
@@ -1132,6 +1132,7 @@ self: super: {
   "airship" = doDistribute super."airship_0_4_3_0";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2243,6 +2244,7 @@ self: super: {
   "css" = dontDistribute super."css";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -3917,6 +3919,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -3989,6 +3992,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_6_1";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4300,6 +4304,7 @@ self: super: {
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
@@ -4425,6 +4430,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
@@ -4574,6 +4580,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5066,6 +5073,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5523,6 +5531,7 @@ self: super: {
   "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
+  "native" = dontDistribute super."native";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
   "natural-numbers" = dontDistribute super."natural-numbers";
@@ -5939,6 +5948,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgsql-simple" = dontDistribute super."pgsql-simple";
@@ -6756,6 +6766,7 @@ self: super: {
   "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_6";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_6";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6829,6 +6840,8 @@ self: super: {
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -7570,6 +7583,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -7704,6 +7718,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
index ed02c06a840..bfb3b731998 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
@@ -1131,6 +1131,7 @@ self: super: {
   "airship" = doDistribute super."airship_0_4_3_0";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2238,6 +2239,7 @@ self: super: {
   "css" = dontDistribute super."css";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -3911,6 +3913,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -3983,6 +3986,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_6_1";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4294,6 +4298,7 @@ self: super: {
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
@@ -4419,6 +4424,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
@@ -4567,6 +4573,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5059,6 +5066,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5515,6 +5523,7 @@ self: super: {
   "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
+  "native" = dontDistribute super."native";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
   "natural-numbers" = dontDistribute super."natural-numbers";
@@ -5931,6 +5940,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgsql-simple" = dontDistribute super."pgsql-simple";
@@ -6746,6 +6756,7 @@ self: super: {
   "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_6";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_6";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6819,6 +6830,8 @@ self: super: {
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -7559,6 +7572,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -7693,6 +7707,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.10.nix b/pkgs/development/haskell-modules/configuration-lts-5.10.nix
index 82d33cfb45d..4044a1f41a0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.10.nix
@@ -1119,6 +1119,7 @@ self: super: {
   "airship" = doDistribute super."airship_0_4_3_0";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2202,6 +2203,7 @@ self: super: {
   "css" = dontDistribute super."css";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -3837,6 +3839,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -3907,6 +3910,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_6_1";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4211,6 +4215,7 @@ self: super: {
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
   "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
@@ -4334,6 +4339,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
@@ -4479,6 +4485,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -4962,6 +4969,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5402,6 +5410,7 @@ self: super: {
   "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
+  "native" = dontDistribute super."native";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
   "natural-numbers" = dontDistribute super."natural-numbers";
@@ -5801,6 +5810,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgsql-simple" = dontDistribute super."pgsql-simple";
@@ -6601,6 +6611,7 @@ self: super: {
   "serv-wai" = dontDistribute super."serv-wai";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_3_0_1";
   "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
   "servant-examples" = dontDistribute super."servant-examples";
@@ -6671,6 +6682,8 @@ self: super: {
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -7397,6 +7410,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -7528,6 +7542,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.11.nix b/pkgs/development/haskell-modules/configuration-lts-5.11.nix
index 382e9af2de6..5d5a3767d6f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.11.nix
@@ -1118,6 +1118,7 @@ self: super: {
   "airship" = doDistribute super."airship_0_4_3_0";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2194,6 +2195,7 @@ self: super: {
   "css" = dontDistribute super."css";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -3827,6 +3829,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -3897,6 +3900,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_6_1";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4197,6 +4201,7 @@ self: super: {
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
   "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
@@ -4320,6 +4325,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
@@ -4464,6 +4470,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -4947,6 +4954,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5386,6 +5394,7 @@ self: super: {
   "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
+  "native" = dontDistribute super."native";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
   "natural-numbers" = dontDistribute super."natural-numbers";
@@ -5785,6 +5794,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgsql-simple" = dontDistribute super."pgsql-simple";
@@ -6584,6 +6594,7 @@ self: super: {
   "serv-wai" = dontDistribute super."serv-wai";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_3_0_1";
   "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
   "servant-examples" = dontDistribute super."servant-examples";
@@ -6654,6 +6665,8 @@ self: super: {
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -7377,6 +7390,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -7507,6 +7521,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.12.nix b/pkgs/development/haskell-modules/configuration-lts-5.12.nix
index 517485ffb71..b8353d4f9b3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.12.nix
@@ -1117,6 +1117,7 @@ self: super: {
   "airship" = doDistribute super."airship_0_4_3_0";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2189,6 +2190,7 @@ self: super: {
   "css" = dontDistribute super."css";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -3817,6 +3819,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -3887,6 +3890,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_6_1";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4187,6 +4191,7 @@ self: super: {
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
   "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
@@ -4309,6 +4314,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
@@ -4453,6 +4459,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -4935,6 +4942,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5368,6 +5376,7 @@ self: super: {
   "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
+  "native" = dontDistribute super."native";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
   "natural-numbers" = dontDistribute super."natural-numbers";
@@ -5767,6 +5776,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgsql-simple" = dontDistribute super."pgsql-simple";
@@ -6563,6 +6573,7 @@ self: super: {
   "serv" = dontDistribute super."serv";
   "serv-wai" = dontDistribute super."serv-wai";
   "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
   "servant-examples" = dontDistribute super."servant-examples";
@@ -6633,6 +6644,8 @@ self: super: {
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -7352,6 +7365,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -7481,6 +7495,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.13.nix b/pkgs/development/haskell-modules/configuration-lts-5.13.nix
index 8d104da5586..75d72e126f1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.13.nix
@@ -1114,6 +1114,7 @@ self: super: {
   "airship" = doDistribute super."airship_0_4_3_0";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2179,6 +2180,7 @@ self: super: {
   "css" = dontDistribute super."css";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -3805,6 +3807,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -3875,6 +3878,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_6_1";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4175,6 +4179,7 @@ self: super: {
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
   "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
@@ -4293,6 +4298,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
@@ -4437,6 +4443,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -4917,6 +4924,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5347,6 +5355,7 @@ self: super: {
   "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
+  "native" = dontDistribute super."native";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
   "natural-numbers" = dontDistribute super."natural-numbers";
@@ -5745,6 +5754,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgsql-simple" = dontDistribute super."pgsql-simple";
@@ -6538,6 +6548,7 @@ self: super: {
   "serv" = dontDistribute super."serv";
   "serv-wai" = dontDistribute super."serv-wai";
   "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
   "servant-examples" = dontDistribute super."servant-examples";
@@ -6607,6 +6618,8 @@ self: super: {
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -7325,6 +7338,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -7454,6 +7468,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
index dac1d3017ef..7dbaa3da18b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
@@ -1130,6 +1130,7 @@ self: super: {
   "airship" = doDistribute super."airship_0_4_3_0";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2237,6 +2238,7 @@ self: super: {
   "css" = dontDistribute super."css";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -3904,6 +3906,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -3976,6 +3979,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_6_1";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4287,6 +4291,7 @@ self: super: {
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
@@ -4411,6 +4416,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
@@ -4559,6 +4565,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5050,6 +5057,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5500,6 +5508,7 @@ self: super: {
   "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
+  "native" = dontDistribute super."native";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
   "natural-numbers" = dontDistribute super."natural-numbers";
@@ -5913,6 +5922,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgsql-simple" = dontDistribute super."pgsql-simple";
@@ -6724,6 +6734,7 @@ self: super: {
   "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_6";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_6";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6797,6 +6808,8 @@ self: super: {
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -7536,6 +7549,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -7670,6 +7684,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.3.nix b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
index 0ded8b1b398..4368c640604 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
@@ -1127,6 +1127,7 @@ self: super: {
   "airship" = doDistribute super."airship_0_4_3_0";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2229,6 +2230,7 @@ self: super: {
   "css" = dontDistribute super."css";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -3886,6 +3888,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -3958,6 +3961,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_6_1";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4269,6 +4273,7 @@ self: super: {
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
@@ -4393,6 +4398,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
@@ -4540,6 +4546,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5030,6 +5037,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5478,6 +5486,7 @@ self: super: {
   "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
+  "native" = dontDistribute super."native";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
   "natural-numbers" = dontDistribute super."natural-numbers";
@@ -5890,6 +5899,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgsql-simple" = dontDistribute super."pgsql-simple";
@@ -6698,6 +6708,7 @@ self: super: {
   "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_6";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_6";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6771,6 +6782,8 @@ self: super: {
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -7506,6 +7519,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -7640,6 +7654,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.4.nix b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
index 19a29cacb64..d54a61d0d9d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
@@ -1125,6 +1125,7 @@ self: super: {
   "airship" = doDistribute super."airship_0_4_3_0";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2225,6 +2226,7 @@ self: super: {
   "css" = dontDistribute super."css";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -3872,6 +3874,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -3944,6 +3947,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_6_1";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4252,6 +4256,7 @@ self: super: {
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
@@ -4376,6 +4381,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
@@ -4523,6 +4529,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5012,6 +5019,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5457,6 +5465,7 @@ self: super: {
   "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
+  "native" = dontDistribute super."native";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
   "natural-numbers" = dontDistribute super."natural-numbers";
@@ -5866,6 +5875,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgsql-simple" = dontDistribute super."pgsql-simple";
@@ -6672,6 +6682,7 @@ self: super: {
   "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_6";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_6";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6745,6 +6756,8 @@ self: super: {
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -7479,6 +7492,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -7612,6 +7626,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.5.nix b/pkgs/development/haskell-modules/configuration-lts-5.5.nix
index 0f03cc418ac..3755d3ed35c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.5.nix
@@ -1125,6 +1125,7 @@ self: super: {
   "airship" = doDistribute super."airship_0_4_3_0";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2221,6 +2222,7 @@ self: super: {
   "css" = dontDistribute super."css";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -3867,6 +3869,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -3939,6 +3942,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_6_1";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4246,6 +4250,7 @@ self: super: {
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
@@ -4370,6 +4375,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
@@ -4517,6 +4523,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -5006,6 +5013,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5451,6 +5459,7 @@ self: super: {
   "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
+  "native" = dontDistribute super."native";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
   "natural-numbers" = dontDistribute super."natural-numbers";
@@ -5860,6 +5869,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgsql-simple" = dontDistribute super."pgsql-simple";
@@ -6666,6 +6676,7 @@ self: super: {
   "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_6";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_6";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6739,6 +6750,8 @@ self: super: {
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -7473,6 +7486,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -7606,6 +7620,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.6.nix b/pkgs/development/haskell-modules/configuration-lts-5.6.nix
index 51178e9c80a..53643599858 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.6.nix
@@ -1124,6 +1124,7 @@ self: super: {
   "airship" = doDistribute super."airship_0_4_3_0";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2215,6 +2216,7 @@ self: super: {
   "css" = dontDistribute super."css";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -3856,6 +3858,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -3928,6 +3931,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_6_1";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4235,6 +4239,7 @@ self: super: {
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
@@ -4359,6 +4364,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
@@ -4506,6 +4512,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -4994,6 +5001,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5438,6 +5446,7 @@ self: super: {
   "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
+  "native" = dontDistribute super."native";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
   "natural-numbers" = dontDistribute super."natural-numbers";
@@ -5845,6 +5854,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgsql-simple" = dontDistribute super."pgsql-simple";
@@ -6649,6 +6659,7 @@ self: super: {
   "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_6";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_6";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6722,6 +6733,8 @@ self: super: {
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -7454,6 +7467,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -7587,6 +7601,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.7.nix b/pkgs/development/haskell-modules/configuration-lts-5.7.nix
index db8b1941297..b8ae4e15211 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.7.nix
@@ -1124,6 +1124,7 @@ self: super: {
   "airship" = doDistribute super."airship_0_4_3_0";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2211,6 +2212,7 @@ self: super: {
   "css" = dontDistribute super."css";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -3852,6 +3854,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -3923,6 +3926,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_6_1";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4229,6 +4233,7 @@ self: super: {
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
@@ -4353,6 +4358,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
@@ -4500,6 +4506,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -4988,6 +4995,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5431,6 +5439,7 @@ self: super: {
   "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
+  "native" = dontDistribute super."native";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
   "natural-numbers" = dontDistribute super."natural-numbers";
@@ -5835,6 +5844,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgsql-simple" = dontDistribute super."pgsql-simple";
@@ -6638,6 +6648,7 @@ self: super: {
   "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_6";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_6";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6711,6 +6722,8 @@ self: super: {
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -7441,6 +7454,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -7573,6 +7587,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.8.nix b/pkgs/development/haskell-modules/configuration-lts-5.8.nix
index e4c9eec1feb..ddb17e5922d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.8.nix
@@ -1124,6 +1124,7 @@ self: super: {
   "airship" = doDistribute super."airship_0_4_3_0";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2210,6 +2211,7 @@ self: super: {
   "css" = dontDistribute super."css";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -3851,6 +3853,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -3922,6 +3925,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_6_1";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4228,6 +4232,7 @@ self: super: {
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
@@ -4352,6 +4357,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
@@ -4499,6 +4505,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -4987,6 +4994,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5430,6 +5438,7 @@ self: super: {
   "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
+  "native" = dontDistribute super."native";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
   "natural-numbers" = dontDistribute super."natural-numbers";
@@ -5834,6 +5843,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgsql-simple" = dontDistribute super."pgsql-simple";
@@ -6637,6 +6647,7 @@ self: super: {
   "servant-blaze" = doDistribute super."servant-blaze_0_4_4_6";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-client" = doDistribute super."servant-client_0_4_4_6";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_6";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6710,6 +6721,8 @@ self: super: {
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -7440,6 +7453,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -7572,6 +7586,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.9.nix b/pkgs/development/haskell-modules/configuration-lts-5.9.nix
index 20dfa12f481..3bb8e3ad802 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.9.nix
@@ -1123,6 +1123,7 @@ self: super: {
   "airship" = doDistribute super."airship_0_4_3_0";
   "aivika" = dontDistribute super."aivika";
   "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2208,6 +2209,7 @@ self: super: {
   "css" = dontDistribute super."css";
   "csv-enumerator" = dontDistribute super."csv-enumerator";
   "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
   "csv-to-qif" = dontDistribute super."csv-to-qif";
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
@@ -3845,6 +3847,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
   "herf-time" = dontDistribute super."herf-time";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
@@ -3915,6 +3918,7 @@ self: super: {
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
   "hindent" = doDistribute super."hindent_4_6_1";
+  "hindley-milner" = dontDistribute super."hindley-milner";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4221,6 +4225,7 @@ self: super: {
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
   "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
@@ -4345,6 +4350,7 @@ self: super: {
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
   "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
@@ -4490,6 +4496,7 @@ self: super: {
   "interleavableIO" = dontDistribute super."interleavableIO";
   "interleave" = dontDistribute super."interleave";
   "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
   "intern" = dontDistribute super."intern";
   "internetmarke" = dontDistribute super."internetmarke";
   "interpol" = dontDistribute super."interpol";
@@ -4976,6 +4983,7 @@ self: super: {
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
   "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
   "located-base" = dontDistribute super."located-base";
   "locators" = dontDistribute super."locators";
   "loch" = dontDistribute super."loch";
@@ -5419,6 +5427,7 @@ self: super: {
   "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
+  "native" = dontDistribute super."native";
   "nats-queue" = dontDistribute super."nats-queue";
   "natural-number" = dontDistribute super."natural-number";
   "natural-numbers" = dontDistribute super."natural-numbers";
@@ -5819,6 +5828,7 @@ self: super: {
   "pg-harness" = dontDistribute super."pg-harness";
   "pg-harness-client" = dontDistribute super."pg-harness-client";
   "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
   "pgdl" = dontDistribute super."pgdl";
   "pgm" = dontDistribute super."pgm";
   "pgsql-simple" = dontDistribute super."pgsql-simple";
@@ -6619,6 +6629,7 @@ self: super: {
   "serv-wai" = dontDistribute super."serv-wai";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_3_0_1";
   "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-csharp" = dontDistribute super."servant-csharp";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
   "servant-examples" = dontDistribute super."servant-examples";
@@ -6689,6 +6700,8 @@ self: super: {
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
   "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
   "shivers-cfg" = dontDistribute super."shivers-cfg";
   "shoap" = dontDistribute super."shoap";
   "shortcircuit" = dontDistribute super."shortcircuit";
@@ -7415,6 +7428,7 @@ self: super: {
   "transformers-abort" = dontDistribute super."transformers-abort";
   "transformers-compose" = dontDistribute super."transformers-compose";
   "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
@@ -7547,6 +7561,7 @@ self: super: {
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
   "uberlast" = dontDistribute super."uberlast";
   "uconv" = dontDistribute super."uconv";
   "udbus" = dontDistribute super."udbus";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index be180605a65..903f2c3a3a1 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -440,8 +440,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "AFSM";
-       version = "0.1.2.0";
-       sha256 = "b2b8f50b4c0d8e270a2c8df396afd6bc7d4dbe0859d957907129718e37342004";
+       version = "0.1.3.1";
+       sha256 = "e6438e257446122b63c12dbb22ac58a2ff020ae164a2063a1166a544b325c27b";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/PseudoPower/AFSM";
        description = "Arrowized functional state machines";
@@ -1993,6 +1993,32 @@ self: {
        license = "GPL";
      }) {};
 
+  "BlogLiterately_0_8_2_1" = callPackage
+    ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs
+     , containers, data-default, directory, filepath, HaXml, haxr
+     , highlighting-kate, hscolour, HTTP, lens, mtl, pandoc
+     , pandoc-citeproc, pandoc-types, parsec, process, split, strict
+     , tagsoup, temporary, transformers
+     }:
+     mkDerivation {
+       pname = "BlogLiterately";
+       version = "0.8.2.1";
+       sha256 = "f95097b2bdc6a65328fd90e0007dac0a68c7847041e64e4d15e6dc523cba8c79";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-html bool-extras bytestring cmdargs containers
+         data-default directory filepath HaXml haxr highlighting-kate
+         hscolour HTTP lens mtl pandoc pandoc-citeproc pandoc-types parsec
+         process split strict tagsoup temporary transformers
+       ];
+       executableHaskellDepends = [ base cmdargs ];
+       homepage = "http://byorgey.wordpress.com/blogliterately/";
+       description = "A tool for posting Haskelly articles to blogs";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "BlogLiterately-diagrams_0_1_4_3" = callPackage
     ({ mkDerivation, base, BlogLiterately, containers, diagrams-builder
      , diagrams-cairo, diagrams-lib, directory, filepath, pandoc, safe
@@ -4719,6 +4745,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Diff_0_3_4" = callPackage
+    ({ mkDerivation, array, base, directory, pretty, process
+     , QuickCheck, test-framework, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "Diff";
+       version = "0.3.4";
+       sha256 = "77b7daec5a79ade779706748f11b4d9b8f805e57a68e7406c3b5a1dee16e0c2f";
+       libraryHaskellDepends = [ array base pretty ];
+       testHaskellDepends = [
+         array base directory pretty process QuickCheck test-framework
+         test-framework-quickcheck2
+       ];
+       description = "O(ND) diff algorithm in haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "DifferenceLogic" = callPackage
     ({ mkDerivation, base, containers, fgl, FirstOrderTheory, HUnit }:
      mkDerivation {
@@ -14064,6 +14108,22 @@ self: {
        license = "unknown";
      }) {};
 
+  "MonadRandom_0_4_2_3" = callPackage
+    ({ mkDerivation, base, mtl, random, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "MonadRandom";
+       version = "0.4.2.3";
+       sha256 = "de40b12a70ec6425a9e54b33e2ac652e14d7c005a3b46d701d1e5696b98636c0";
+       libraryHaskellDepends = [
+         base mtl random transformers transformers-compat
+       ];
+       description = "Random-number generation monad";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "MonadRandomLazy" = callPackage
     ({ mkDerivation, base, MonadRandom, mtl, random }:
      mkDerivation {
@@ -16056,8 +16116,8 @@ self: {
      }:
      mkDerivation {
        pname = "Plot-ho-matic";
-       version = "0.9.0.5";
-       sha256 = "2d39740f4bcca543b6fa53faf6dacb1d266f91986bc995fe2d0caeb68578dc3b";
+       version = "0.9.0.7";
+       sha256 = "48b55a36a471db30444ca4118402f2eece7cf20034a9737db5cd4b8723cbbf90";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -22521,9 +22581,10 @@ self: {
     ({ mkDerivation, acme-left-pad, base }:
      mkDerivation {
        pname = "acme-php";
-       version = "0.0.4";
-       sha256 = "c3015f1f75edeec2f42b7334cfaf7d69325b1c6ade573fe35fc487b4b81dc452";
+       version = "0.0.5";
+       sha256 = "545ecb6260ebb26336bdc41fbee7f0e48de390f220ff57ec1cce2c1661bc4ece";
        libraryHaskellDepends = [ acme-left-pad base ];
+       homepage = "http://hackage.haskell.org/package/acme-php-0.0.5/src/docs.html";
        description = "The flexibility of Haskell and the safety of PHP";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24190,13 +24251,12 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-value-parser";
-       version = "0.11.2";
-       sha256 = "a0e64e5c4eb8e75e4ba27c6ea26276f508da407883fb1527102e07a20ed0d454";
+       version = "0.11.3";
+       sha256 = "ac948393647b17a7fe4ccda376c9941000ad99a4c30e48ee4ae39a027cef1b20";
        libraryHaskellDepends = [
          aeson base-prelude mtl-prelude scientific success text
          unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/sannsyn/aeson-value-parser";
        description = "An API for parsing \"aeson\" JSON tree into Haskell types";
        license = stdenv.lib.licenses.mit;
@@ -24623,8 +24683,8 @@ self: {
     ({ mkDerivation, array, base, containers, mtl, random, vector }:
      mkDerivation {
        pname = "aivika";
-       version = "4.3.3";
-       sha256 = "3faa7104a9b51c138b9f3a6f3762de08ccff1e427653fee218466eb256b8cb3a";
+       version = "4.3.4";
+       sha256 = "4d533b39360fef397d948d8e48faed1d526799487f01f60821a7784c727fa8f8";
        libraryHaskellDepends = [
          array base containers mtl random vector
        ];
@@ -24649,6 +24709,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aivika-distributed" = callPackage
+    ({ mkDerivation, aivika, aivika-transformers, base, binary
+     , bytestring, containers, distributed-process, exceptions, mtl
+     , random, stm, time
+     }:
+     mkDerivation {
+       pname = "aivika-distributed";
+       version = "0.1.3";
+       sha256 = "fbfce34de97c3631dcc067726327c10df1325118685beb89458feb58ce860aae";
+       libraryHaskellDepends = [
+         aivika aivika-transformers base binary bytestring containers
+         distributed-process exceptions mtl random stm time
+       ];
+       homepage = "http://www.aivikasoft.com/en/products/aivika.html";
+       description = "Parallel distributed simulation library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aivika-experiment" = callPackage
     ({ mkDerivation, aivika, base, containers, directory, filepath, mtl
      , network-uri, parallel-io, split
@@ -24723,8 +24801,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-transformers";
-       version = "4.3.3";
-       sha256 = "1d05966db50550d92b75338cb4805c8b7f5c074ce7cac431e1b5e8e44902d5f5";
+       version = "4.3.4";
+       sha256 = "dbce6da57d88824135fafcf81c97f1e1905aea9fbd78241fac7f835491fa8ea9";
        libraryHaskellDepends = [
          aivika array base containers mtl random vector
        ];
@@ -34091,6 +34169,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "attoparsec_0_13_0_2" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, deepseq
+     , QuickCheck, quickcheck-unicode, scientific, tasty
+     , tasty-quickcheck, text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "attoparsec";
+       version = "0.13.0.2";
+       sha256 = "69f7f381f644ba4a6f348bbff9b2b4280b7b602e8e25e59eadb6e30ad5f2ec6a";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq scientific text
+         transformers
+       ];
+       testHaskellDepends = [
+         array base bytestring deepseq QuickCheck quickcheck-unicode
+         scientific tasty tasty-quickcheck text transformers vector
+       ];
+       homepage = "https://github.com/bos/attoparsec";
+       description = "Fast combinator parsing for bytestrings and text";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "attoparsec-arff" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring }:
      mkDerivation {
@@ -34642,6 +34743,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "autoexporter_0_2_1" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath }:
+     mkDerivation {
+       pname = "autoexporter";
+       version = "0.2.1";
+       sha256 = "fe46d1f434862dfaa4fd245c66d4a96ea8c4f3f8c3314ca6fc844e97e71097e4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base Cabal directory filepath ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/tfausak/autoexporter#readme";
+       description = "Automatically re-export modules";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "automitive-cse" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cryptonite, memory
      , quickcheck-simple
@@ -38660,8 +38777,8 @@ self: {
        pname = "binary-orphans";
        version = "0.1.4.0";
        sha256 = "0a952a7521747a7aacf4aa1638674130262f2efacb7121727c1932d49017f742";
-       revision = "4";
-       editedCabalFile = "5c473d152fd0cc986ec5330e6138d3c3b62b29f2d3ae7ebfad0832ba82593ce6";
+       revision = "5";
+       editedCabalFile = "76b1ba2893085236d9989cf697d01fca25c7980563c5b5c452a133aeefec2b0d";
        libraryHaskellDepends = [
          aeson base binary hashable scientific semigroups tagged text
          text-binary time unordered-containers vector
@@ -40778,8 +40895,8 @@ self: {
      }:
      mkDerivation {
        pname = "bitx-bitcoin";
-       version = "0.7.0.0";
-       sha256 = "533cad5eb0c66efc407b676b9d2a43259e74b5343b00c35e2ded9382a5a36948";
+       version = "0.7.0.1";
+       sha256 = "808cce7f13d11c7ea5424fa017aada13e787dca3dafe67100e303e976dc6382e";
        libraryHaskellDepends = [
          aeson base bytestring http-client http-client-tls http-types
          microlens microlens-th network QuickCheck scientific split text
@@ -47077,8 +47194,8 @@ self: {
      }:
      mkDerivation {
        pname = "casadi-bindings";
-       version = "2.4.1.8";
-       sha256 = "982f4bd1b6e8f4939795daaadf456faa6ea9ffa96723e5081fbbd13a0d28bd95";
+       version = "2.4.1.9";
+       sha256 = "a5156237cfb2bf64bcee8b1e408ace7b4c69d69733a129ab7d0b15436dab3acd";
        libraryHaskellDepends = [
          base binary casadi-bindings-core casadi-bindings-internal cereal
          containers linear spatial-math vector vector-binary-instances
@@ -48930,6 +49047,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cheapskate_0_1_0_5" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, bytestring, containers
+     , data-default, http-types, mtl, syb, text, uniplate, wai
+     , wai-extra, xss-sanitize
+     }:
+     mkDerivation {
+       pname = "cheapskate";
+       version = "0.1.0.5";
+       sha256 = "7a63b7ffc4976d006c5f693569a5ffd7a887e83d126d1dce9bbe8b5fbaabfa32";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-html containers data-default mtl syb text uniplate
+         xss-sanitize
+       ];
+       executableHaskellDepends = [
+         aeson base blaze-html bytestring http-types text wai wai-extra
+       ];
+       homepage = "http://github.com/jgm/cheapskate";
+       description = "Experimental markdown processor";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cheapskate-highlight" = callPackage
     ({ mkDerivation, base, blaze-html, cheapskate, highlighting-kate
      , text
@@ -60914,6 +61055,18 @@ self: {
        license = "GPL";
      }) {};
 
+  "csv-table" = callPackage
+    ({ mkDerivation, base, containers, csv, filepath, process }:
+     mkDerivation {
+       pname = "csv-table";
+       version = "0.1.0.1";
+       sha256 = "e91959b43226fe79dc00de47560cd25d0b24625c58c70058967d489d1656bcdc";
+       libraryHaskellDepends = [ base containers csv filepath process ];
+       homepage = "https://github.com/ucsd-progsys/csv-table";
+       description = "Scripts for manipulating tables stored as CSV files";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "csv-to-qif" = callPackage
     ({ mkDerivation, base, Cabal, explicit-exception, hspec, regex-tdfa
      , split, spreadsheet
@@ -61640,6 +61793,8 @@ self: {
        pname = "darcs";
        version = "2.10.3";
        sha256 = "ca00c40d08276f94868c7c1bbc6dbd9b6b41a15c1907c34947aaa51d4dbbf642";
+       revision = "1";
+       editedCabalFile = "4f5cceb8b3cdf8974e5672c79a2dc8ce083d597f3b52c4137fb6d77cab5a281f";
        configureFlags = [ "-fforce-char8-encoding" "-flibrary" ];
        isLibrary = true;
        isExecutable = true;
@@ -64639,19 +64794,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "deepseq_1_4_1_2" = callPackage
+  "deepseq_1_4_2_0" = callPackage
     ({ mkDerivation, array, base, HUnit, test-framework
      , test-framework-hunit
      }:
      mkDerivation {
        pname = "deepseq";
-       version = "1.4.1.2";
-       sha256 = "3b7cfa5ff5eb169b3f97285be978f030d664c6e3e84a2525b2fafca4f7380651";
+       version = "1.4.2.0";
+       sha256 = "de0aa1291790409fe36e8b9bdf3c1f340661290eb3258876af2b07b721e94951";
        libraryHaskellDepends = [ array base ];
        testHaskellDepends = [
          array base HUnit test-framework test-framework-hunit
        ];
-       jailbreak = true;
        description = "Deep evaluation of data structures";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65595,6 +65749,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "deriving-compat_0_2" = callPackage
+    ({ mkDerivation, base, base-compat, base-orphans, containers
+     , ghc-prim, hspec, QuickCheck, template-haskell, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "deriving-compat";
+       version = "0.2";
+       sha256 = "763bb09a78ad4ffa00b30a3655bd01a7f2b816ebec8571c7cf059d481998b42a";
+       libraryHaskellDepends = [
+         base containers ghc-prim template-haskell
+       ];
+       testHaskellDepends = [
+         base base-compat base-orphans hspec QuickCheck transformers
+         transformers-compat
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/haskell-compat/deriving-compat";
+       description = "Backports of GHC deriving extensions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "derp" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -66587,6 +66764,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diagrams-contrib_1_3_0_9" = callPackage
+    ({ mkDerivation, base, circle-packing, colour, containers
+     , data-default, data-default-class, diagrams-core, diagrams-lib
+     , diagrams-solve, force-layout, HUnit, lens, linear, MonadRandom
+     , mtl, parsec, QuickCheck, random, semigroups, split
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text
+     }:
+     mkDerivation {
+       pname = "diagrams-contrib";
+       version = "1.3.0.9";
+       sha256 = "b5a1fa28f7ab9d32dab44569a26e5918ec7a09c36399d2f789c22260d42d9b22";
+       libraryHaskellDepends = [
+         base circle-packing colour containers data-default
+         data-default-class diagrams-core diagrams-lib diagrams-solve
+         force-layout lens linear MonadRandom mtl parsec random semigroups
+         split text
+       ];
+       testHaskellDepends = [
+         base containers diagrams-lib HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "Collection of user contributions to diagrams EDSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-core_1_2_0_4" = callPackage
     ({ mkDerivation, base, containers, dual-tree, lens, MemoTrie
      , monoid-extras, newtype, semigroups, vector-space
@@ -77912,6 +78117,22 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "fast-builder_0_0_0_4" = callPackage
+    ({ mkDerivation, base, bytestring, ghc-prim, process, QuickCheck
+     , stm
+     }:
+     mkDerivation {
+       pname = "fast-builder";
+       version = "0.0.0.4";
+       sha256 = "7c9349ff068b2f321fad9d84a4de699058575fd96470ab5d94964cd7ea032a34";
+       libraryHaskellDepends = [ base bytestring ghc-prim ];
+       testHaskellDepends = [ base bytestring process QuickCheck stm ];
+       homepage = "http://github.com/takano-akio/fast-builder";
+       description = "Fast ByteString Builder";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fast-digits" = callPackage
     ({ mkDerivation, base, digits, integer-gmp, QuickCheck, smallcheck
      , tasty, tasty-quickcheck, tasty-smallcheck
@@ -78466,8 +78687,8 @@ self: {
        pname = "fay";
        version = "0.23.1.12";
        sha256 = "3d9c0a64f6d30923e2e45f27c043a7fa4f451c676466c8ca5b69a4121462f727";
-       revision = "2";
-       editedCabalFile = "8b1d2491a1f85893a14f5212460ec030b22e47e2da680f275f7ff619ad15b4b0";
+       revision = "3";
+       editedCabalFile = "eed2ee7a483cbde7f743e6f4cd880fa2ddbf72364159cce09d6c5ad963221c28";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -78613,6 +78834,8 @@ self: {
        pname = "fay-builder";
        version = "0.2.0.5";
        sha256 = "116dea6dc304834be81d70faec7e3de1fd867ebbda0d02d3c1c6a0f96d2b31a2";
+       revision = "1";
+       editedCabalFile = "09fb1a4f71c11547dadf8859e302ede4d65aed7437ed1da16376811724a6b1ef";
        libraryHaskellDepends = [
          base Cabal data-default directory fay filepath safe split text
        ];
@@ -80180,6 +80403,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "file-embed_0_0_10" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "file-embed";
+       version = "0.0.10";
+       sha256 = "f751925cec5773a4fad5a48ca0a86a21091ee5f1efccf618a64a89fa2cf5f711";
+       libraryHaskellDepends = [
+         base bytestring directory filepath template-haskell
+       ];
+       testHaskellDepends = [ base filepath ];
+       homepage = "https://github.com/snoyberg/file-embed";
+       description = "Use Template Haskell to embed file contents directly";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "file-location_0_4_5_3" = callPackage
     ({ mkDerivation, base, containers, lifted-base, process
      , template-haskell, transformers
@@ -85969,6 +86210,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "geniplate-mirror_0_7_4" = callPackage
+    ({ mkDerivation, base, mtl, template-haskell }:
+     mkDerivation {
+       pname = "geniplate-mirror";
+       version = "0.7.4";
+       sha256 = "1bbfc296d598d604e0cf4da0b4a23e36e73f019f83b7911e18621443f04e2c5f";
+       libraryHaskellDepends = [ base mtl template-haskell ];
+       homepage = "https://github.com/danr/geniplate";
+       description = "Use Template Haskell to generate Uniplate-like functions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "geniserver" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, GenI, http-types, json
      , snap-core, snap-server, text, transformers, utf8-string
@@ -90590,8 +90844,8 @@ self: {
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.1.6";
-       sha256 = "3d88c38c096cd3887a18acb6b8947436b9b5a6f64e7d2168e946387b817a0993";
+       version = "0.1.7";
+       sha256 = "282402385403fad10b750146f28f41d447a77592ef23d94b287edf51b7336679";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96363,25 +96617,26 @@ self: {
      }) {};
 
   "hackage-security" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, Cabal
-     , containers, cryptohash, directory, ed25519, filepath, ghc-prim
-     , HUnit, mtl, network, network-uri, parsec, tar, tasty, tasty-hunit
-     , template-haskell, temporary, time, transformers, zlib
+    ({ mkDerivation, base, base16-bytestring, base64-bytestring
+     , bytestring, Cabal, containers, cryptohash-sha256, directory
+     , ed25519, filepath, ghc-prim, HUnit, mtl, network, network-uri
+     , parsec, pretty, QuickCheck, tar, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, temporary, time, transformers
+     , zlib
      }:
      mkDerivation {
        pname = "hackage-security";
-       version = "0.5.0.2";
-       sha256 = "4135221bb74e899fde71ff5e878d0401b8c274af6ade996ca7ac15d2b77dbd98";
-       revision = "1";
-       editedCabalFile = "8b92101ca8da9bb27668763565eaf3c2e461c9c0c429003b196b64dbbd5c0af0";
+       version = "0.5.1.0";
+       sha256 = "5b2effb1e342f00c57db0b1390c46f9c6142e8039bb062ddab589ba438c88eba";
        libraryHaskellDepends = [
-         base base64-bytestring bytestring Cabal containers cryptohash
-         directory ed25519 filepath ghc-prim mtl network network-uri parsec
-         tar template-haskell time transformers zlib
+         base base16-bytestring base64-bytestring bytestring Cabal
+         containers cryptohash-sha256 directory ed25519 filepath ghc-prim
+         mtl network network-uri parsec pretty tar template-haskell time
+         transformers zlib
        ];
        testHaskellDepends = [
-         base bytestring Cabal containers HUnit network-uri tar tasty
-         tasty-hunit temporary time zlib
+         base bytestring Cabal containers HUnit network-uri QuickCheck tar
+         tasty tasty-hunit tasty-quickcheck temporary time zlib
        ];
        homepage = "https://github.com/well-typed/hackage-security";
        description = "Hackage security library";
@@ -96587,27 +96842,30 @@ self: {
      }) {};
 
   "hackport" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-     , deepseq, directory, extensible-exceptions, filepath, HTTP, HUnit
-     , MissingH, network, network-uri, old-locale, old-time, parsec
-     , pretty, process, random, regex-compat, stm, tar, time, unix, xml
-     , zlib
+    ({ mkDerivation, array, base, base64-bytestring, binary, bytestring
+     , containers, cryptohash, deepseq, directory, ed25519
+     , extensible-exceptions, filepath, ghc-prim, hashable, HTTP, HUnit
+     , MissingH, mtl, network, network-uri, old-locale, old-time, parsec
+     , pretty, process, random, regex-compat, split, stm, tar
+     , template-haskell, time, transformers, unix, xml, zlib
      }:
      mkDerivation {
        pname = "hackport";
-       version = "0.4.7";
-       sha256 = "17dc05163b456dceeb00180a03bb56f4218e5c5e1145c7ad12af13a261b0cf36";
+       version = "0.5";
+       sha256 = "90594dc1ff022a8fd2779548835555576df134feaf875cadca24378ece7fd97f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         array base binary bytestring containers deepseq directory
-         extensible-exceptions filepath HTTP MissingH network network-uri
-         old-locale old-time parsec pretty process random regex-compat stm
-         tar time unix xml zlib
+         array base base64-bytestring binary bytestring containers
+         cryptohash deepseq directory ed25519 extensible-exceptions filepath
+         ghc-prim hashable HTTP MissingH mtl network network-uri old-locale
+         old-time parsec pretty process random regex-compat split stm tar
+         template-haskell time transformers unix xml zlib
        ];
        testHaskellDepends = [
          base binary bytestring containers deepseq directory
-         extensible-exceptions filepath HUnit pretty process time unix xml
+         extensible-exceptions filepath HUnit pretty process split time unix
+         xml
        ];
        description = "Hackage and Portage integration tool";
        license = "GPL";
@@ -97652,7 +97910,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hakyll_4_8_0_0" = callPackage
+  "hakyll_4_8_0_1" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
      , cmdargs, containers, cryptohash, data-default, deepseq, directory
      , filepath, fsnotify, http-conduit, http-types, HUnit, lrucache
@@ -97664,8 +97922,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.8.0.0";
-       sha256 = "5e150418e8dd4caef4f9eca372140c7d5b0791166760d011cc11df8f0c7a3fcb";
+       version = "4.8.0.1";
+       sha256 = "c5e860cd6cf8bc525e032da106fbe44667bc5bdc5d3023ca77cc32b3c6bc41d5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106314,6 +106572,19 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "heredocs" = callPackage
+    ({ mkDerivation, base, doctest, parsec, template-haskell }:
+     mkDerivation {
+       pname = "heredocs";
+       version = "0.1.1.0";
+       sha256 = "fb6779b1eba4fade43b1c25d0289152390d37027e9e79f072331e175dbee7fa6";
+       libraryHaskellDepends = [ base doctest parsec template-haskell ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "http://github.com/cutsea110/heredoc.git";
+       description = "heredocument";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "herf-time" = callPackage
     ({ mkDerivation, base, doctest, time }:
      mkDerivation {
@@ -108083,6 +108354,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hindley-milner" = callPackage
+    ({ mkDerivation, base, containers, data-fix, hspec, mtl
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hindley-milner";
+       version = "0.1.0.0";
+       sha256 = "d29f6fd4871c953fa016dd8cb8dadcf0ed0535947bb8e89c8acb12a78d6964ac";
+       libraryHaskellDepends = [
+         base containers data-fix mtl transformers
+       ];
+       testHaskellDepends = [ base containers hspec ];
+       description = "Template for Hindley-Milner based languages";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hinduce-associations-apriori" = callPackage
     ({ mkDerivation, base, containers, deepseq, hinduce-missingh
      , parallel, vector
@@ -117506,6 +117793,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hspec-slow" = callPackage
+    ({ mkDerivation, base, hspec, mtl, stm, time, transformers }:
+     mkDerivation {
+       pname = "hspec-slow";
+       version = "0.1.0.0";
+       sha256 = "18bacf99cc3f081b65a0c3317ba8b291c1279bcba92c00e53f6fd25d71df70db";
+       libraryHaskellDepends = [ base hspec mtl stm time transformers ];
+       testHaskellDepends = [ base hspec mtl stm ];
+       homepage = "https://github.com/bobjflong/hspec-slow#readme";
+       description = "Find slow test cases";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hspec-smallcheck_0_3_0" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck, smallcheck }:
      mkDerivation {
@@ -121914,31 +122214,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-bits_0_0_0_6" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim, mmap
+     , parsec, QuickCheck, resourcet, vector
+     }:
+     mkDerivation {
+       pname = "hw-bits";
+       version = "0.0.0.6";
+       sha256 = "8cfe76cdfe568fb392abe90e1f362c340d32729baa47c113d027657c85ef6c37";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring hw-prim parsec vector ];
+       executableHaskellDepends = [
+         base criterion mmap resourcet vector
+       ];
+       testHaskellDepends = [ base hspec QuickCheck vector ];
+       homepage = "http://github.com/haskell-works/hw-bits#readme";
+       description = "Conduits for tokenizing streams";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-conduit" = callPackage
-    ({ mkDerivation, array, attoparsec, base, bytestring, conduit
-     , criterion, deepseq, ghc-prim, hspec, hw-bits, hw-prim, lens, mmap
-     , mono-traversable, parsec, QuickCheck, random, resourcet, safe
-     , text, transformers, vector, word8
+    ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec
+     , hw-bits, resourcet
      }:
      mkDerivation {
        pname = "hw-conduit";
-       version = "0.0.0.6";
-       sha256 = "4099d43952a4555b18264c3da34b39983d3078375011d7458f978c1e2b17213e";
+       version = "0.0.0.8";
+       sha256 = "574c7d719bd647f03b6b8f3942c45027ac0a4e49507c38330876507ce2d8b301";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array attoparsec base bytestring conduit deepseq ghc-prim hw-bits
-         hw-prim lens mmap mono-traversable parsec QuickCheck random
-         resourcet safe text vector word8
-       ];
-       executableHaskellDepends = [
-         base bytestring conduit criterion hw-bits hw-prim mmap resourcet
-         vector
-       ];
-       testHaskellDepends = [
-         attoparsec base bytestring conduit hspec hw-bits hw-prim mmap
-         parsec QuickCheck resourcet transformers vector
+         array base bytestring conduit hw-bits resourcet
        ];
+       executableHaskellDepends = [ base criterion ];
+       testHaskellDepends = [ base bytestring hspec ];
        homepage = "http://github.com/haskell-works/hw-conduit#readme";
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.bsd3;
@@ -121969,6 +122280,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-diagnostics_0_0_0_2" = callPackage
+    ({ mkDerivation, base, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "hw-diagnostics";
+       version = "0.0.0.2";
+       sha256 = "f90d28865ebd4fd0116270a47ed13f6b2a91255b8ec71c6d04a1cd5675237569";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "http://github.com/haskell-works/hw-diagnostics#readme";
+       description = "Conduits for tokenizing streams";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-prim" = callPackage
     ({ mkDerivation, base, bytestring, hspec, QuickCheck, random
      , vector
@@ -121987,6 +122315,44 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-prim_0_0_0_8" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, QuickCheck, random
+     , vector
+     }:
+     mkDerivation {
+       pname = "hw-prim";
+       version = "0.0.0.8";
+       sha256 = "47c84f878d396475590223529fd9d70b277e8345a1f1b2c0d7956d968a5b14b1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring random vector ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "http://github.com/haskell-works/hw-prim#readme";
+       description = "Primitive functions and data types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hw-rankselect" = callPackage
+    ({ mkDerivation, base, hspec, hw-bits, hw-prim, QuickCheck, vector
+     }:
+     mkDerivation {
+       pname = "hw-rankselect";
+       version = "0.0.0.2";
+       sha256 = "ad79b1fca42093c3db8c7196ab144a2a618c22e4368cc5ccf0d548a15fdc186a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base hw-bits hw-prim vector ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base hspec hw-bits hw-prim QuickCheck vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-rankselect#readme";
+       description = "Conduits for tokenizing streams";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hw-succinct" = callPackage
     ({ mkDerivation, array, attoparsec, base, bytestring, conduit
      , criterion, deepseq, ghc-prim, hspec, hw-bits, hw-prim, lens, mmap
@@ -122017,6 +122383,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-succinct_0_0_0_8" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, conduit, criterion
+     , hspec, hw-bits, hw-conduit, hw-diagnostics, hw-prim
+     , hw-rankselect, mmap, mono-traversable, parsec, QuickCheck
+     , resourcet, text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "hw-succinct";
+       version = "0.0.0.8";
+       sha256 = "70b1e52059a18d9ce9f6b5735f4497bf341cce4ec9265858584a4eea0d7215a2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base bytestring conduit hw-bits hw-conduit hw-prim
+         hw-rankselect mono-traversable text vector
+       ];
+       executableHaskellDepends = [
+         base bytestring conduit criterion hw-bits hw-conduit hw-diagnostics
+         hw-prim hw-rankselect mmap resourcet vector
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring conduit hspec hw-bits hw-conduit hw-prim
+         hw-rankselect mmap parsec QuickCheck resourcet transformers vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-succinct#readme";
+       description = "Conduits for tokenizing streams";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hwall-auth-iitk" = callPackage
     ({ mkDerivation, base, bytestring, haskeline, http-conduit
      , http-types, mtl, regex-compat, unix
@@ -123052,21 +123448,21 @@ self: {
      }) {};
 
   "hylogen" = callPackage
-    ({ mkDerivation, base, bytestring, filepath, fsnotify, network
-     , process, random, text, vector-space, websockets
+    ({ mkDerivation, base, bytestring, filepath, fsnotify, http-types
+     , process, text, vector-space, wai, warp, websockets
      }:
      mkDerivation {
        pname = "hylogen";
-       version = "0.1.0.8";
-       sha256 = "f2b3be1868b32af6d12b50be5ef5c7145d0e7aa7c9052a9d8b87fea2b686b08d";
+       version = "0.1.0.10";
+       sha256 = "a8e59008ec5d4293ae14b52b900a8182f02640e6e5724d56f856e94cd1e5d40a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base vector-space ];
        executableHaskellDepends = [
-         base bytestring filepath fsnotify network process random text
+         base bytestring filepath fsnotify http-types process text wai warp
          websockets
        ];
-       homepage = "https://github.com/sleexyz/hylogen";
+       homepage = "https://hylogen.com";
        description = "an EDSL for live-coding fragment shaders";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -126668,6 +127064,22 @@ self: {
        license = "GPL";
      }) {};
 
+  "interlude-l" = callPackage
+    ({ mkDerivation, aeson, base, exceptions, lens, mtl, protolude
+     , string-conv, witherable
+     }:
+     mkDerivation {
+       pname = "interlude-l";
+       version = "0.1.0.1";
+       sha256 = "0128de332aa2b5520f96555921197e14db1e07990cd1ac5a05fd2618b49e9813";
+       libraryHaskellDepends = [
+         aeson base exceptions lens mtl protolude string-conv witherable
+       ];
+       jailbreak = true;
+       description = "Prelude replacement based on protolude";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "intern" = callPackage
     ({ mkDerivation, array, base, bytestring, hashable, text
      , unordered-containers
@@ -128025,8 +128437,8 @@ self: {
      }:
      mkDerivation {
        pname = "iridium";
-       version = "0.1.5.2";
-       sha256 = "97709297aae761e274de08e9d47cab14e87065e9787357a0e45f817cfefaa640";
+       version = "0.1.5.3";
+       sha256 = "7713b11ea4ea643fbbc99eef0c2bb52cb0968c8d645bf176e196a738e7b18644";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -128038,7 +128450,6 @@ self: {
        executableHaskellDepends = [
          base extra multistate text transformers unordered-containers yaml
        ];
-       jailbreak = true;
        homepage = "https://github.com/lspitzner/iridium";
        description = "Automated Testing and Package Uploading";
        license = stdenv.lib.licenses.bsd3;
@@ -130930,8 +131341,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsontsv";
-       version = "0.1.5.0";
-       sha256 = "85756b958fa6655fc3d438609a4e3dfe45715db91fccae7f1b2f144cc2863462";
+       version = "0.1.6.1";
+       sha256 = "d84484e71b4fd577aafb4674fb5ba6f2aece4f3ed1eb152cef9b50d4cf025ef5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -130939,7 +131350,6 @@ self: {
          optparse-applicative scientific string-qq text unordered-containers
          vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/danchoi/jsontsv";
        description = "JSON to TSV transformer";
        license = stdenv.lib.licenses.mit;
@@ -131494,6 +131904,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "katip_0_2_0_0" = callPackage
+    ({ mkDerivation, aeson, auto-update, base, bytestring, containers
+     , directory, either, exceptions, hostname, microlens, microlens-th
+     , monad-control, mtl, old-locale, quickcheck-instances
+     , regex-tdfa-rc, resourcet, string-conv, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, temporary, text, time
+     , time-locale-compat, transformers, transformers-base
+     , transformers-compat, unix, unordered-containers
+     }:
+     mkDerivation {
+       pname = "katip";
+       version = "0.2.0.0";
+       sha256 = "bd947874e92da876603c1cbb3bc521e8f33cd08a59c2714d0e35e8dd15ad53b9";
+       libraryHaskellDepends = [
+         aeson auto-update base bytestring containers either exceptions
+         hostname microlens microlens-th monad-control mtl old-locale
+         resourcet string-conv template-haskell text time time-locale-compat
+         transformers transformers-base transformers-compat unix
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base directory quickcheck-instances regex-tdfa-rc tasty
+         tasty-hunit tasty-quickcheck template-haskell temporary text time
+         unordered-containers
+       ];
+       homepage = "https://github.com/Soostone/katip";
+       description = "A structured logging framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "katip-elasticsearch" = callPackage
     ({ mkDerivation, aeson, async, base, bloodhound, containers
      , enclosed-exceptions, exceptions, http-client, http-types, katip
@@ -131521,6 +131962,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "katip-elasticsearch_0_2_0_0" = callPackage
+    ({ mkDerivation, aeson, async, base, bloodhound, containers
+     , enclosed-exceptions, exceptions, http-client, http-types, katip
+     , lens, lens-aeson, quickcheck-instances, random, retry, scientific
+     , stm, stm-chans, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , transformers, unordered-containers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "katip-elasticsearch";
+       version = "0.2.0.0";
+       sha256 = "3d7c1326c749b41635b4dbd6044f8ff1e94dc0209a30faca69a2808e91564f0e";
+       libraryHaskellDepends = [
+         aeson async base bloodhound enclosed-exceptions exceptions
+         http-client http-types katip random retry scientific stm stm-chans
+         text time transformers unordered-containers uuid
+       ];
+       testHaskellDepends = [
+         aeson base bloodhound containers http-client http-types katip lens
+         lens-aeson quickcheck-instances scientific stm tasty tasty-hunit
+         tasty-quickcheck text time transformers unordered-containers vector
+       ];
+       jailbreak = true;
+       description = "ElasticSearch scribe for the Katip logging framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "katt" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ConfigFile, containers
      , directory, errors, filepath, lens, mtl, parsec, text, url, wreq
@@ -132380,6 +132848,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "keycode_0_2" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim }:
+     mkDerivation {
+       pname = "keycode";
+       version = "0.2";
+       sha256 = "93f09542fa79993e46a263ff11c3a3c5368c00aa5a11e53bdccf7fbe885459ae";
+       libraryHaskellDepends = [ base containers ghc-prim ];
+       homepage = "https://github.com/RyanGlScott/keycode";
+       description = "Maps web browser keycodes to their corresponding keyboard keys";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "keyed" = callPackage
     ({ mkDerivation, base, containers, vector }:
      mkDerivation {
@@ -133129,14 +133610,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "lackey_0_3_0" = callPackage
+  "lackey_0_3_1" = callPackage
     ({ mkDerivation, base, servant, servant-foreign, tasty, tasty-hspec
      , text
      }:
      mkDerivation {
        pname = "lackey";
-       version = "0.3.0";
-       sha256 = "36f40425c39a7a214d5932b9f2c005335e61c2e95f2dc6fe4cf1172bf45d84c3";
+       version = "0.3.1";
+       sha256 = "a7b552e3c24fbb6e272cabb897b6788712da789a3934d0ad3bae6fe9857d1d2a";
        libraryHaskellDepends = [ base servant servant-foreign text ];
        testHaskellDepends = [ base servant tasty tasty-hspec text ];
        jailbreak = true;
@@ -136059,22 +136540,22 @@ self: {
      }) {};
 
   "learn-physics" = callPackage
-    ({ mkDerivation, base, gloss, gnuplot, not-gloss, spatial-math
-     , vector-space
+    ({ mkDerivation, base, gloss, gnuplot, hmatrix, linear, not-gloss
+     , polynomial, spatial-math, vector-space
      }:
      mkDerivation {
        pname = "learn-physics";
-       version = "0.5.2";
-       sha256 = "473585c2c6c8c3503bba1dcbfc308dcb402a67c942a8edb5ed3bfbad1e91830d";
+       version = "0.6.0.0";
+       sha256 = "6403b807172ceebb2081a580489e4e9a5d7a451f07f0228863db7ac46fdec8de";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base gloss gnuplot not-gloss spatial-math vector-space
+         base gloss gnuplot hmatrix linear not-gloss polynomial spatial-math
+         vector-space
        ];
        executableHaskellDepends = [
          base gloss gnuplot not-gloss spatial-math
        ];
-       jailbreak = true;
        description = "Haskell code for learning physics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140214,6 +140695,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "located" = callPackage
+    ({ mkDerivation, base, text }:
+     mkDerivation {
+       pname = "located";
+       version = "0.1.0.0";
+       sha256 = "80c2fe4b858243b164b9491c0caa97f46108893743c1f18468ea8c805bb756ab";
+       libraryHaskellDepends = [ base text ];
+       homepage = "https://github.com/elliottt/located";
+       description = "Source location helpers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "located-base" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -144288,6 +144781,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "math-functions_0_1_6_0" = callPackage
+    ({ mkDerivation, base, deepseq, erf, HUnit, ieee754, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , vector, vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "math-functions";
+       version = "0.1.6.0";
+       sha256 = "3cb90fc750d28c8f6096ee083aff77dfa4dcf4a4938497957860d222e4436199";
+       libraryHaskellDepends = [
+         base deepseq erf vector vector-th-unbox
+       ];
+       testHaskellDepends = [
+         base HUnit ieee754 QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 vector
+       ];
+       homepage = "https://github.com/bos/math-functions";
+       description = "Special functions and Chebyshev polynomials";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mathblog" = callPackage
     ({ mkDerivation, base, bytestring, ConfigFile, containers
      , data-default, deepseq, directory, either, filepath, fsnotify
@@ -146546,15 +147061,14 @@ self: {
      }:
      mkDerivation {
        pname = "midi-music-box";
-       version = "0.0";
-       sha256 = "ae5ae1f9db61d56ee17035a04e8d1d9a8c68f4bfdb213f619e159d619fb4d442";
+       version = "0.0.0.1";
+       sha256 = "1e830c1f871cbf8f5b478c5923d52f76457b15eda2d64a4bf9e6c2016ed47de9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base containers diagrams-lib diagrams-postscript event-list midi
          non-empty optparse-applicative utility-ht
        ];
-       jailbreak = true;
        homepage = "http://hub.darcs.net/thielema/midi-music-box";
        description = "Convert MIDI file to music box punch tape";
        license = stdenv.lib.licenses.bsd3;
@@ -147035,6 +147549,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mime-types_0_1_0_7" = callPackage
+    ({ mkDerivation, base, bytestring, containers, text }:
+     mkDerivation {
+       pname = "mime-types";
+       version = "0.1.0.7";
+       sha256 = "83164a24963a7ef37543349df095155b30116c208e602a159a5cd3722f66e9b9";
+       libraryHaskellDepends = [ base bytestring containers text ];
+       homepage = "https://github.com/yesodweb/wai";
+       description = "Basic mime-type handling types and functions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mines" = callPackage
     ({ mkDerivation, base, directory, mtl, random }:
      mkDerivation {
@@ -150579,6 +151106,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "morte_1_6_0" = callPackage
+    ({ mkDerivation, alex, array, base, binary, containers, deepseq
+     , Earley, http-client, http-client-tls, microlens, microlens-mtl
+     , mtl, optparse-applicative, pipes, QuickCheck, system-fileio
+     , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text
+     , text-format, transformers
+     }:
+     mkDerivation {
+       pname = "morte";
+       version = "1.6.0";
+       sha256 = "c182fc6f3bdaa4f0ecfaeaf95812bfaa4a170227489940400967a6e6b6e4445a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary containers deepseq Earley http-client
+         http-client-tls microlens microlens-mtl pipes system-fileio
+         system-filepath text text-format transformers
+       ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [ base optparse-applicative text ];
+       testHaskellDepends = [
+         base mtl QuickCheck system-filepath tasty tasty-hunit
+         tasty-quickcheck text transformers
+       ];
+       description = "A bare-bones calculus of constructions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mosaico-lib" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, colour, diagrams-cairo
      , diagrams-core, diagrams-gtk, diagrams-lib, glib, gtk, JuicyPixels
@@ -152248,6 +152804,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mutable-containers_0_3_2_1" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, hspec
+     , mono-traversable, primitive, QuickCheck, vector
+     }:
+     mkDerivation {
+       pname = "mutable-containers";
+       version = "0.3.2.1";
+       sha256 = "fb83475c6a755d1998906f37a71b6aa6f414fd0b5d41b16567c2219fb43e4e4d";
+       libraryHaskellDepends = [
+         base containers ghc-prim mono-traversable primitive vector
+       ];
+       testHaskellDepends = [
+         base containers hspec primitive QuickCheck vector
+       ];
+       homepage = "https://github.com/fpco/mutable-containers";
+       description = "Abstactions and concrete implementations of mutable containers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mutable-iter" = callPackage
     ({ mkDerivation, base, iteratee, MonadCatchIO-transformers
      , transformers, vector
@@ -153182,6 +153758,25 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "native" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath
+     , optparse-applicative, process, shelly, text
+     }:
+     mkDerivation {
+       pname = "native";
+       version = "0.1.0.1";
+       sha256 = "7f18590d63af1dbb134f1768b2173009283865f35bb47eaa04e98377ee66ecaf";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring directory filepath process shelly text
+       ];
+       executableHaskellDepends = [ base optparse-applicative ];
+       testHaskellDepends = [ base ];
+       description = "Native library manager for Windows";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "nats_1" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -157245,6 +157840,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "octane_0_4_18" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, autoexporter, base, binary
+     , binary-bits, bytestring, containers, data-binary-ieee754, deepseq
+     , newtype-generics, tasty, tasty-hspec, text
+     }:
+     mkDerivation {
+       pname = "octane";
+       version = "0.4.18";
+       sha256 = "75662d122bf7eb1f552cda017e45d74b2f0364a45ac0a11eb3af1687d8ce8f44";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty autoexporter base binary binary-bits bytestring
+         containers data-binary-ieee754 deepseq newtype-generics text
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base binary bytestring containers tasty tasty-hspec
+       ];
+       homepage = "https://github.com/tfausak/octane#readme";
+       description = "Parse Rocket League replays";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "octohat" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base16-bytestring
      , base64-bytestring, bytestring, containers, cryptohash, dotenv
@@ -158111,13 +158731,17 @@ self: {
      }) {};
 
   "open-witness" = callPackage
-    ({ mkDerivation, base, mtl, witness }:
+    ({ mkDerivation, base, hashable, random, template-haskell
+     , transformers, witness
+     }:
      mkDerivation {
        pname = "open-witness";
-       version = "0.1.1";
-       sha256 = "74dc0d586b21116cc47ba8614e52301a869c4e30c0f9c51eee40511e3ca468c4";
-       libraryHaskellDepends = [ base mtl witness ];
-       jailbreak = true;
+       version = "0.3.1";
+       sha256 = "f217e4585e706cef7ab7aa3419f56205a929c350dbeb6c868972d7c25e7b82cb";
+       libraryHaskellDepends = [
+         base hashable random template-haskell transformers witness
+       ];
+       homepage = "https://github.com/AshleyYakeley/open-witness";
        description = "open witnesses";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160613,6 +161237,8 @@ self: {
        pname = "pandoc";
        version = "1.17.0.3";
        sha256 = "7b14e1bcb78a7e2ad1e585f127be7efd20225c9f9b5131d507b376b62cd77e32";
+       revision = "1";
+       editedCabalFile = "23dfb2513b8b5352d16fc331cb1b6b4989df239e62905f9cf341c9f519191891";
        configureFlags = [ "-fhttps" ];
        isLibrary = true;
        isExecutable = true;
@@ -164204,16 +164830,20 @@ self: {
 
   "persistent-database-url" = callPackage
     ({ mkDerivation, base, bytestring, fail, hspec
-     , persistent-postgresql, uri-bytestring
+     , persistent-postgresql, string-conversions, text, uri-bytestring
      }:
      mkDerivation {
        pname = "persistent-database-url";
-       version = "1.0.0";
-       sha256 = "4f75cb61373267bbc8a6c7e59312c83c7b60a90373f06158ee50c5222ec4742a";
+       version = "1.1.0";
+       sha256 = "a3e1c0bc2592593beb3bdae36a7b880bda5e38e3b288a71d88e2c99b8f4ec4d1";
        libraryHaskellDepends = [
-         base bytestring fail persistent-postgresql uri-bytestring
+         base bytestring fail persistent-postgresql string-conversions text
+         uri-bytestring
        ];
-       testHaskellDepends = [ base hspec persistent-postgresql ];
+       testHaskellDepends = [
+         base bytestring hspec persistent-postgresql text
+       ];
+       jailbreak = true;
        description = "Parse DATABASE_URL into configuration types for Persistent";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -165556,7 +166186,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
-  "persistent-template_2_5" = callPackage
+  "persistent-template_2_5_1" = callPackage
     ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers
      , ghc-prim, hspec, http-api-data, monad-control, monad-logger
      , path-pieces, persistent, QuickCheck, tagged, template-haskell
@@ -165564,8 +166194,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-template";
-       version = "2.5";
-       sha256 = "17c50172ed2b9f77480dcc616aa248dd62cf1b8e909b6b452ac503c9c8799b1f";
+       version = "2.5.1";
+       sha256 = "24776c5690023cebc85bda7c2cc8b0ebeb6cc87884ac83800f6891b1b32975fa";
        libraryHaskellDepends = [
          aeson aeson-compat base bytestring containers ghc-prim
          http-api-data monad-control monad-logger path-pieces persistent
@@ -165805,6 +166435,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pg-store" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, hspec
+     , postgresql-libpq, QuickCheck, template-haskell, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "pg-store";
+       version = "0.0.1";
+       sha256 = "27032e33207c53c65452bfc3ea3d90620069850297e3edb5aa3e9274e6130c7f";
+       libraryHaskellDepends = [
+         attoparsec base bytestring postgresql-libpq template-haskell text
+         transformers
+       ];
+       testHaskellDepends = [
+         base bytestring hspec postgresql-libpq QuickCheck text
+       ];
+       homepage = "https://github.com/vapourismo/pg-store";
+       description = "Dead simple storage interface to PostgreSQL";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pgdl" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, configurator
      , directory, filepath, HTTP, http-conduit, network-uri, process
@@ -170768,8 +171419,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "prelude-edsl";
-       version = "0.3.1";
-       sha256 = "7b6233ca1eeb916185f87a7ba9ba8007a3b3f3307b795e52b32444fbcce44658";
+       version = "0.4";
+       sha256 = "2ef0353e4386cb64d8911fa2315b24a3581082e9ec8046b148364686df1b4657";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/emilaxelsson/prelude-edsl";
        description = "An EDSL-motivated subset of the Prelude";
@@ -173159,6 +173810,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "psqueues_0_2_2_1" = callPackage
+    ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit
+     , QuickCheck, tagged, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "psqueues";
+       version = "0.2.2.1";
+       sha256 = "1428771180a34c2258bc9ca0f0c12f1df530be018e870c91348975cc7d33ae9b";
+       libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
+       testHaskellDepends = [
+         array base deepseq ghc-prim hashable HUnit QuickCheck tagged
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       description = "Pure priority search queues";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pub" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, ConfigFile, containers
      , groom, hedis, hslogger, mtl, network, pipes, pipes-bytestring
@@ -173886,7 +174556,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "purescript_0_8_4_0" = callPackage
+  "purescript_0_8_5_0" = callPackage
     ({ mkDerivation, aeson, aeson-better-errors, ansi-wl-pprint, base
      , base-compat, bower-json, boxes, bytestring, containers, directory
      , dlist, edit-distance, filepath, fsnotify, Glob, haskeline, hspec
@@ -173894,13 +174564,14 @@ self: {
      , lifted-base, monad-control, monad-logger, mtl, network
      , optparse-applicative, parallel, parsec, pattern-arrows, pipes
      , pipes-http, process, regex-tdfa, safe, semigroups, sourcemap
-     , split, stm, syb, text, time, transformers, transformers-base
-     , transformers-compat, unordered-containers, utf8-string, vector
+     , spdx, split, stm, syb, text, time, transformers
+     , transformers-base, transformers-compat, unordered-containers
+     , utf8-string, vector
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.8.4.0";
-       sha256 = "cb0f75b7c4a9f926b6e183fe825153abdde6170f5da9c2b0ccef27575e3e264e";
+       version = "0.8.5.0";
+       sha256 = "75a253d113b33e79abceff9d280988c1a4cb46eb84547a82eda1ec4bdad60d04";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -173908,9 +174579,9 @@ self: {
          bytestring containers directory dlist edit-distance filepath
          fsnotify Glob http-types language-javascript lifted-base
          monad-control monad-logger mtl parallel parsec pattern-arrows pipes
-         pipes-http process regex-tdfa safe semigroups sourcemap split stm
-         syb text time transformers transformers-base transformers-compat
-         unordered-containers utf8-string vector
+         pipes-http process regex-tdfa safe semigroups sourcemap spdx split
+         stm syb text time transformers transformers-base
+         transformers-compat unordered-containers utf8-string vector
        ];
        executableHaskellDepends = [
          aeson ansi-wl-pprint base base-compat boxes bytestring containers
@@ -176342,6 +177013,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ratel_0_1_3" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , containers, http-client, http-client-tls, http-types, tasty
+     , tasty-hspec, text, uuid
+     }:
+     mkDerivation {
+       pname = "ratel";
+       version = "0.1.3";
+       sha256 = "49fee52e108c70551438f75f997b8c0a3053ee15476422c77509918bfb3ca9b3";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers http-client
+         http-client-tls http-types text uuid
+       ];
+       testHaskellDepends = [ base tasty tasty-hspec ];
+       homepage = "https://github.com/tfausak/ratel#readme";
+       description = "Notify Honeybadger about exceptions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ratel-wai" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , http-client, ratel, wai
@@ -176358,6 +177049,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ratel-wai_0_1_2" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , http-client, ratel, wai
+     }:
+     mkDerivation {
+       pname = "ratel-wai";
+       version = "0.1.2";
+       sha256 = "f8aad4c4f57e58bda51edc56521e095e03810c825ef2333069e9151f51e1468e";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers http-client ratel wai
+       ];
+       homepage = "https://github.com/tfausak/ratel-wai#readme";
+       description = "Notify Honeybadger about exceptions via a WAI middleware";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ratio-int" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -180867,8 +181575,8 @@ self: {
        pname = "rest-core";
        version = "0.38";
        sha256 = "b491b734c2d74729f427ca02370f12b839dd92347fea44b5fb66c66a39b11cec";
-       revision = "1";
-       editedCabalFile = "edcbe69d770149b6e3aeb47cc7ae2a9f4e589fa3cd1c928f1538504ac24b8b2c";
+       revision = "2";
+       editedCabalFile = "ed51d0cdb0e2562b3d3d03bc87c0da6d8da947ccec0f66307cf9455e82bd39dc";
        libraryHaskellDepends = [
          aeson aeson-utils base base-compat bytestring case-insensitive
          errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat
@@ -181290,8 +181998,8 @@ self: {
        pname = "rest-gen";
        version = "0.19.0.2";
        sha256 = "12caa70e7b29b073cb0e066cf7d5c590b13e0fb5b2f924944cd1ae5217c79330";
-       revision = "1";
-       editedCabalFile = "afca13957f1b186ba5922659d6275cdf5c8d49ec2bca6f2319d89c213afa5c4d";
+       revision = "2";
+       editedCabalFile = "e4e4528467c593e7cfc6ae2180bfa4a255097f1921a9daa70b46c48c0e84763a";
        libraryHaskellDepends = [
          aeson base base-compat blaze-html Cabal code-builder directory
          fclabels filepath hashable haskell-src-exts HStringTemplate hxt
@@ -181533,8 +182241,8 @@ self: {
        pname = "rest-stringmap";
        version = "0.2.0.6";
        sha256 = "66e5a32f04cfcf9826296b3c053c22caa745fd890ccc6ea9199c34529507524a";
-       revision = "2";
-       editedCabalFile = "286ce136699cc8dffad47ead93fdaf0538e465edafde510ff7697f96e470ea1d";
+       revision = "3";
+       editedCabalFile = "33fa62a06fc1c77f4e77c603b0a19678eab9695402e20e56556c6fd090e332dd";
        libraryHaskellDepends = [
          aeson base containers hashable hxt json-schema tostring
          unordered-containers
@@ -184734,12 +185442,12 @@ self: {
      , conduit-combinators, conduit-extra, data-binary-ieee754, lens
      , monad-loops, QuickCheck, resourcet, tasty, tasty-hunit
      , tasty-quickcheck, template-haskell, text, unordered-containers
-     , yaml, yaml-light
+     , yaml
      }:
      mkDerivation {
        pname = "sbp";
-       version = "0.52.1";
-       sha256 = "72e53ab77cf026fc5bde9899a5a49a35bbe6a2e3853022b9d62e238eee8450f6";
+       version = "0.52.2";
+       sha256 = "e3510bf821f2af6bc73221a0c35cce3e3436f8651bdddc08db190d389992fa41";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -184753,7 +185461,7 @@ self: {
        ];
        testHaskellDepends = [
          aeson base base64-bytestring basic-prelude bytestring QuickCheck
-         tasty tasty-hunit tasty-quickcheck yaml-light
+         tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "https://github.com/swift-nav/libsbp";
        description = "SwiftNav's SBP Library";
@@ -188369,6 +189077,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-csharp" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath
+     , haskell-src-exts, heredocs, http-types, lens, servant
+     , servant-foreign, text, time, uuid, uuid-types
+     }:
+     mkDerivation {
+       pname = "servant-csharp";
+       version = "0.0.7.1";
+       sha256 = "98bb40bf02a4ed672fe50c1c5c90901e61ebe5ade8d639a1dfdee215ce1de4ff";
+       libraryHaskellDepends = [
+         base bytestring directory filepath haskell-src-exts heredocs
+         http-types lens servant servant-foreign text time uuid uuid-types
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/cutsea110/servant-csharp.git";
+       description = "Generate servant client library for C#";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-docs_0_3_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable
      , lens, servant, string-conversions, system-filepath, text
@@ -191084,6 +191811,33 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
+  "shakespeare_2_0_8_2" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
+     , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
+     , process, scientific, template-haskell, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "shakespeare";
+       version = "2.0.8.2";
+       sha256 = "30797f10420f70164443ba4167fb3901f84d235cb419fd0d0442e746c835b114";
+       libraryHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring containers directory
+         exceptions ghc-prim parsec process scientific template-haskell text
+         time transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring containers directory
+         exceptions ghc-prim hspec HUnit parsec process template-haskell
+         text time transformers
+       ];
+       homepage = "http://www.yesodweb.com/book/shakespearean-templates";
+       description = "A toolkit for making compile-time interpolated templates";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {};
+
   "shakespeare-babel" = callPackage
     ({ mkDerivation, base, classy-prelude, data-default, directory
      , process, shakespeare, template-haskell
@@ -191476,8 +192230,8 @@ self: {
        pname = "shelltestrunner";
        version = "1.3.5";
        sha256 = "4265eb9cc87c352655099da26f49fb7829f5163edd03a20105b7a25609d3a829";
-       revision = "1";
-       editedCabalFile = "4ccce28f099594a89bbb8ff9c8f6408955b4be02a01eb2d552e1ce7165dce3aa";
+       revision = "2";
+       editedCabalFile = "647017bad45490fe4d5f549d21583d80c8ce69f3e4e8e4476c55707126b2e2b4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -191717,6 +192471,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shelly_1_6_6" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, directory
+     , enclosed-exceptions, exceptions, hspec, HUnit, lifted-async
+     , lifted-base, monad-control, mtl, process, system-fileio
+     , system-filepath, text, time, transformers, transformers-base
+     , unix-compat
+     }:
+     mkDerivation {
+       pname = "shelly";
+       version = "1.6.6";
+       sha256 = "9c89e1ed25de9ede0ee6d6a4094ff72ca6af5b1a1f67503ea40a87beb796e1c5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring containers directory enclosed-exceptions
+         exceptions lifted-async lifted-base monad-control mtl process
+         system-fileio system-filepath text time transformers
+         transformers-base unix-compat
+       ];
+       testHaskellDepends = [
+         async base bytestring containers directory enclosed-exceptions
+         exceptions hspec HUnit lifted-async lifted-base monad-control mtl
+         process system-fileio system-filepath text time transformers
+         transformers-base unix-compat
+       ];
+       homepage = "https://github.com/yesodweb/Shelly.hs";
+       description = "shell-like (systems) programming in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "shelly-extra" = callPackage
     ({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore
      , shelly, text
@@ -191734,6 +192519,41 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shine" = callPackage
+    ({ mkDerivation, base, ghcjs-dom, ghcjs-prim, keycode, mtl, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "shine";
+       version = "0.1.0.0";
+       sha256 = "b20ef3b3c40df6f53bf4eefeaf8d53482f3729562626744095c101641ae469a0";
+       revision = "1";
+       editedCabalFile = "650580b5783e188ebeda9d052966052dba2fad5a971cbe078e5046b120ed1f1a";
+       libraryHaskellDepends = [
+         base ghcjs-dom ghcjs-prim keycode mtl time transformers
+       ];
+       testHaskellDepends = [ base ghcjs-dom ];
+       jailbreak = true;
+       homepage = "https://github.com/fgaz/shine";
+       description = "Declarative graphics for the browser using GHCJS";
+       license = stdenv.lib.licenses.mit;
+       broken = true;
+     }) {ghcjs-prim = null;};
+
+  "shine-varying" = callPackage
+    ({ mkDerivation, base, ghcjs-dom, keycode, shine, varying }:
+     mkDerivation {
+       pname = "shine-varying";
+       version = "0.1.0.0";
+       sha256 = "80301d12099fa02193881457cf80603b00d8c0fe59ef3a8e75f1f81491fbb68e";
+       libraryHaskellDepends = [ base ghcjs-dom keycode shine varying ];
+       testHaskellDepends = [ base ghcjs-dom keycode shine varying ];
+       homepage = "https://github.com/fgaz/shine-varying";
+       description = "FRP interface for shine using the varying package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "shivers-cfg" = callPackage
     ({ mkDerivation, base, containers, directory, HPDF, language-dot
      , mtl, pretty, process
@@ -200059,6 +200879,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stateWriter_0_2_7" = callPackage
+    ({ mkDerivation, base, free, hspec, mtl, QuickCheck, transformers
+     }:
+     mkDerivation {
+       pname = "stateWriter";
+       version = "0.2.7";
+       sha256 = "b8c23d83157fef157c44e46190267c5a16e9e6b479066abc1219708726c24da8";
+       libraryHaskellDepends = [ base mtl transformers ];
+       testHaskellDepends = [ base free hspec mtl QuickCheck ];
+       description = "A faster variant of the RWS monad transformers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "statechart" = callPackage
     ({ mkDerivation, base, polyparse }:
      mkDerivation {
@@ -201934,6 +202768,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "streaming-commons_0_1_15_4" = callPackage
+    ({ mkDerivation, array, async, base, blaze-builder, bytestring
+     , deepseq, directory, hspec, network, process, QuickCheck, random
+     , stm, text, transformers, unix, zlib
+     }:
+     mkDerivation {
+       pname = "streaming-commons";
+       version = "0.1.15.4";
+       sha256 = "910831609225700605b9e0111c9f0dd214015b54c0dddb6f29069dc03624afbb";
+       libraryHaskellDepends = [
+         array async base blaze-builder bytestring directory network process
+         random stm text transformers unix zlib
+       ];
+       testHaskellDepends = [
+         array async base blaze-builder bytestring deepseq hspec network
+         QuickCheck text unix zlib
+       ];
+       homepage = "https://github.com/fpco/streaming-commons";
+       description = "Common lower-level functions needed by various streaming data libraries";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "streaming-histogram" = callPackage
     ({ mkDerivation, base, containers, criterion, tasty, tasty-hunit
      , tasty-quickcheck
@@ -205625,6 +206482,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tagged_0_8_4" = callPackage
+    ({ mkDerivation, base, deepseq, template-haskell }:
+     mkDerivation {
+       pname = "tagged";
+       version = "0.8.4";
+       sha256 = "20c861d299445ea810ba39d9d0529fb0b3862f4d0271a4fb168ccd493a234d5e";
+       libraryHaskellDepends = [ base deepseq template-haskell ];
+       homepage = "http://github.com/ekmett/tagged";
+       description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tagged-binary" = callPackage
     ({ mkDerivation, base, binary, bytestring, pureMD5 }:
      mkDerivation {
@@ -208402,6 +209272,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "testing-feat_0_4_0_3" = callPackage
+    ({ mkDerivation, base, mtl, QuickCheck, tagshare, template-haskell
+     }:
+     mkDerivation {
+       pname = "testing-feat";
+       version = "0.4.0.3";
+       sha256 = "34ca9c7849c4054b951cb359dc55ec1d24f5c2f7cf31d6211959778ad35407ce";
+       libraryHaskellDepends = [
+         base mtl QuickCheck tagshare template-haskell
+       ];
+       description = "Functional Enumeration of Algebraic Types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "testing-type-modifiers" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -208841,6 +209726,31 @@ self: {
        license = "GPL";
      }) {};
 
+  "texmath_0_8_6_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , mtl, network-uri, pandoc-types, parsec, process, split, syb
+     , temporary, text, utf8-string, xml
+     }:
+     mkDerivation {
+       pname = "texmath";
+       version = "0.8.6.2";
+       sha256 = "a9aabd507733c80ae86bcaa7129cf43056904047e27571c65606f158fe0f3b05";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers mtl pandoc-types parsec syb xml
+       ];
+       executableHaskellDepends = [ network-uri ];
+       testHaskellDepends = [
+         base bytestring directory filepath process split temporary text
+         utf8-string xml
+       ];
+       homepage = "http://github.com/jgm/texmath";
+       description = "Conversion between formats used to represent mathematics";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "texrunner" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, directory, filepath
      , HUnit, io-streams, lens, mtl, process, temporary, test-framework
@@ -211446,16 +212356,13 @@ self: {
      }:
      mkDerivation {
        pname = "time-recurrence";
-       version = "0.9.2";
-       sha256 = "f5e73d98da00b48422719bc8243809314d1ad92adf6174e0aa91ebfad4ac38ab";
-       revision = "1";
-       editedCabalFile = "7f1fe44ec61160e3fba86a04942d056ac91faa0002817e107e3d8399b71fe427";
+       version = "0.9.3";
+       sha256 = "316db4760478346fa0d0081e00be9b73b873ec2b644e3ea6ea28f4175ffd530d";
        libraryHaskellDepends = [ base data-ordlist mtl time ];
        testHaskellDepends = [
          base data-ordlist HUnit mtl old-locale test-framework
          test-framework-hunit time
        ];
-       jailbreak = true;
        homepage = "http://github.com/hellertime/time-recurrence";
        description = "Generate recurring dates";
        license = stdenv.lib.licenses.gpl3;
@@ -213282,6 +214189,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "transformers-eff" = callPackage
+    ({ mkDerivation, base, free, mmorph, pipes, transformers }:
+     mkDerivation {
+       pname = "transformers-eff";
+       version = "0.1.0.0";
+       sha256 = "577f7ce07459239b1039d9f8c2935c02cc55bc585a5a4d21f5a81ac758f20037";
+       libraryHaskellDepends = [ base free mmorph pipes transformers ];
+       homepage = "https://github.com/ocharles/transformers-eff";
+       description = "An approach to managing composable effects, ala mtl/transformers/extensible-effects/Eff";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "transformers-free" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -216309,6 +217228,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "uber" = callPackage
+    ({ mkDerivation, aeson, base, hspec, text, webapi }:
+     mkDerivation {
+       pname = "uber";
+       version = "0.1.0.0";
+       sha256 = "ab7ecef408cc04b51c1253d5c19274f8e92e974d114b434e48cc7814ecc0da30";
+       libraryHaskellDepends = [ aeson base text webapi ];
+       testHaskellDepends = [ base hspec text ];
+       homepage = "https://github.com/byteally/webapi-uber.git";
+       description = "Uber client for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "uberlast" = callPackage
     ({ mkDerivation, base, lens, tagged, template-haskell }:
      mkDerivation {
@@ -217107,6 +218039,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "union_0_1_1_0" = callPackage
+    ({ mkDerivation, base, deepseq, profunctors, tagged, vinyl }:
+     mkDerivation {
+       pname = "union";
+       version = "0.1.1.0";
+       sha256 = "d83b04349288fe9b73c254312da9850e1c05717beb7f8db6f7fefed83f1a82e6";
+       libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ];
+       description = "Extensible type-safe unions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "union-find" = callPackage
     ({ mkDerivation, base, containers, transformers }:
      mkDerivation {
@@ -220499,6 +221443,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vector-binary-instances_0_2_3_2" = callPackage
+    ({ mkDerivation, base, binary, tasty, tasty-quickcheck, vector }:
+     mkDerivation {
+       pname = "vector-binary-instances";
+       version = "0.2.3.2";
+       sha256 = "e42cf4c80a69c6d661c6be152d43b39291fe22e7e55f4694709266692b50e049";
+       libraryHaskellDepends = [ base binary vector ];
+       testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
+       homepage = "https://github.com/bos/vector-binary-instances";
+       description = "Instances of Data.Binary and Data.Serialize for vector";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vector-buffer" = callPackage
     ({ mkDerivation, base, deepseq, vector }:
      mkDerivation {
@@ -220939,6 +221897,8 @@ self: {
        pname = "vector-th-unbox";
        version = "0.2.1.4";
        sha256 = "a765f8a679d2c59d0ab73d8c158cb020a362ab9e825c845f8202cd11ba660551";
+       revision = "1";
+       editedCabalFile = "5df99c83217a702f6b8e5c8ecce8f74bbaf0b8a7d90d0764c74aca88221140b8";
        libraryHaskellDepends = [ base template-haskell vector ];
        testHaskellDepends = [ base data-default vector ];
        description = "Deriver for Data.Vector.Unboxed using Template Haskell";
@@ -220952,12 +221912,27 @@ self: {
        pname = "vector-th-unbox";
        version = "0.2.1.5";
        sha256 = "f5be54bc96d922bb48d3d1b5b127f88477ade064042f9ced4e5f9d74e75b68e0";
+       revision = "1";
+       editedCabalFile = "88ee583a97da72239a2a931684c4ceab10516f963793858bc553ee0c628c893d";
        libraryHaskellDepends = [ base template-haskell vector ];
        testHaskellDepends = [ base data-default vector ];
        description = "Deriver for Data.Vector.Unboxed using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vector-th-unbox_0_2_1_6" = callPackage
+    ({ mkDerivation, base, data-default, template-haskell, vector }:
+     mkDerivation {
+       pname = "vector-th-unbox";
+       version = "0.2.1.6";
+       sha256 = "be87d4a6f1005ee2d0de6adf521e05c9e83c441568a8a8b60c79efe24ae90235";
+       libraryHaskellDepends = [ base template-haskell vector ];
+       testHaskellDepends = [ base data-default vector ];
+       description = "Deriver for Data.Vector.Unboxed using Template Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "verbalexpressions" = callPackage
     ({ mkDerivation, base, regex-pcre }:
      mkDerivation {
@@ -223420,6 +224395,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-handler-launch_3_0_1" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, http-types
+     , process, streaming-commons, transformers, wai, warp
+     }:
+     mkDerivation {
+       pname = "wai-handler-launch";
+       version = "3.0.1";
+       sha256 = "73cfe38f74f37085e3d8ca355fa32d2773b4d1298ca391fa2678aa956d3f453d";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring http-types process streaming-commons
+         transformers wai warp
+       ];
+       description = "Launch a web app in the default browser";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-handler-scgi" = callPackage
     ({ mkDerivation, base, bytestring, wai, wai-extra }:
      mkDerivation {
@@ -226864,8 +227856,8 @@ self: {
      }:
      mkDerivation {
        pname = "webapi";
-       version = "0.2.1.0";
-       sha256 = "3c3a93a48f25e809601b9f20f16327f7fb730747e441824e53b3b0d83f260233";
+       version = "0.2.2.0";
+       sha256 = "b908d6b1a03750fa6ef45a2ac445eb9d52afb2fd3de73898081d80a791d843eb";
        libraryHaskellDepends = [
          aeson base binary blaze-builder bytestring bytestring-lexing
          bytestring-trie case-insensitive containers cookie exceptions
@@ -226876,7 +227868,6 @@ self: {
          aeson base bytestring case-insensitive hspec hspec-wai http-media
          http-types QuickCheck text time vector wai wai-extra warp
        ];
-       jailbreak = true;
        homepage = "http://byteally.github.io/webapi/";
        description = "WAI based library for web api";
        license = stdenv.lib.licenses.bsd3;
@@ -228321,8 +229312,8 @@ self: {
     ({ mkDerivation, base, categories, constraints, transformers }:
      mkDerivation {
        pname = "witness";
-       version = "0.3";
-       sha256 = "21345b658dfe646b1753658117e92753fa9164259dd426f47825f74857490364";
+       version = "0.3.0.1";
+       sha256 = "dcff8801b082b6805912ed8924c2ab62175d531d6e68f699419123d987a32851";
        libraryHaskellDepends = [
          base categories constraints transformers
        ];
@@ -232203,6 +233194,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xss-sanitize_0_3_5_7" = callPackage
+    ({ mkDerivation, attoparsec, base, containers, css-text, hspec
+     , HUnit, network-uri, tagsoup, text, utf8-string
+     }:
+     mkDerivation {
+       pname = "xss-sanitize";
+       version = "0.3.5.7";
+       sha256 = "955856413e70375c794766d04ac9ab7f0d3337dbb04a412c9b7ff5c415acac00";
+       libraryHaskellDepends = [
+         attoparsec base containers css-text network-uri tagsoup text
+         utf8-string
+       ];
+       testHaskellDepends = [
+         attoparsec base containers css-text hspec HUnit network-uri tagsoup
+         text utf8-string
+       ];
+       homepage = "http://github.com/yesodweb/haskell-xss-sanitize";
+       description = "sanitize untrusted HTML to prevent XSS attacks";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xtc" = callPackage
     ({ mkDerivation, base, wx, wxcore }:
      mkDerivation {
@@ -234322,6 +235335,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-auth-hashdb_1_5" = callPackage
+    ({ mkDerivation, base, bytestring, cryptohash, hspec, persistent
+     , pwstore-fast, text, yesod-auth, yesod-core, yesod-form
+     , yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-auth-hashdb";
+       version = "1.5";
+       sha256 = "396fbe836c291d9d1dce70c18ce39f82671a7e40af3fc743efb14a7faefb7259";
+       libraryHaskellDepends = [
+         base bytestring cryptohash persistent pwstore-fast text yesod-auth
+         yesod-core yesod-form yesod-persistent
+       ];
+       testHaskellDepends = [ base hspec text ];
+       homepage = "https://github.com/paul-rouse/yesod-auth-hashdb";
+       description = "Authentication plugin for Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-auth-kerberos" = callPackage
     ({ mkDerivation, authenticate-kerberos, base, bytestring
      , shakespeare, text, transformers, yesod-auth, yesod-core
@@ -237357,8 +238390,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-job-queue";
-       version = "0.1.0.1";
-       sha256 = "6097526e6fe7167ad2a16ecd883515ec8895581075fc5c6fb01ba82c8906b077";
+       version = "0.2.0.0";
+       sha256 = "42e294394434fcca8ee048a6f6cd365e1979761e24078eb0cc8f090ffcf4070c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [

From 6700ed5f4838a4b8d56ca7a65ca6df34c1c65d50 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 23 Apr 2016 19:20:21 +0200
Subject: [PATCH 191/712] configuration-hackage2nix.yaml: update list of broken
 builds

---
 .../development/haskell-modules/configuration-hackage2nix.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 2eb897d799c..e6be3acaf53 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -123,6 +123,9 @@ dont-distribute-packages:
   Win32-services-wrapper:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   XInput:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
 
+  # Depens on shine, which is a ghcjs project.
+  shine-varying:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+
   # The build succeeds, but takes insanely long (> 2 hours).
   sharc-timbre:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
 

From 9eb107dc52409c5f438402eadf48b5dcd64da6ac Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Apr 2016 07:31:02 -0500
Subject: [PATCH 192/712] Revert "dbus: 1.8.20 -> 1.10.8"

This reverts commit d088e0621e11a03cd50b27863f883fb0f8d3db36.

The D-Bus update breaks logind and polkit.

(cherry picked from commit 2e06e5eb3669408f5b0fa6c64ac50ca54f8a6ee9)

Hydra had rebuilt this on staging, fixing many test problems.
There were also phonon changes in these rebuilds, but the amount of
binaries affected by them is relatively low and I'm not yet fully
convinced of their stability.
---
 pkgs/development/libraries/dbus/default.nix   |  7 +++---
 .../dbus/ignore-missing-includedirs.patch     | 23 +++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/dbus/ignore-missing-includedirs.patch

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index dd86ca54081..83635d9739f 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -6,8 +6,8 @@ assert x11Support -> libX11 != null
                   && libSM != null;
 
 let
-  version = "1.10.8";
-  sha256 = "0560y3hxpgh346w6avcrcz79c8ansmn771y5xpcvvlr6m8mx5wxs";
+  version = "1.8.20";
+  sha256 = "0fkh3d5r57a659hw9lqnw4v0bc5556vx54fsf7l9c732ci6byksw";
 
 self =  stdenv.mkDerivation {
     name = "dbus-${version}";
@@ -17,7 +17,8 @@ self =  stdenv.mkDerivation {
       inherit sha256;
     };
 
-    patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;
+    patches = [ ./ignore-missing-includedirs.patch ]
+      ++ lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;
     postPatch = ''
       substituteInPlace tools/Makefile.in \
         --replace 'install-localstatelibDATA:' 'disabled:' \
diff --git a/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch b/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch
new file mode 100644
index 00000000000..2781f4ae3de
--- /dev/null
+++ b/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch
@@ -0,0 +1,23 @@
+diff -ru -x '*~' dbus-1.2.24-orig/bus/config-parser.c dbus-1.2.24/bus/config-parser.c
+--- dbus-1.2.24-orig/bus/config-parser.c	2010-03-23 20:01:27.000000000 +0100
++++ dbus-1.2.24/bus/config-parser.c	2010-07-20 14:17:20.000000000 +0200
+@@ -2159,12 +2159,16 @@
+ 
+   retval = FALSE;
+   
+-  dir = _dbus_directory_open (dirname, error);
++  dbus_error_init (&tmp_error);
++  
++  dir = _dbus_directory_open (dirname, &tmp_error);
+ 
+   if (dir == NULL)
+-    goto failed;
++    {
++      retval = TRUE;
++      goto failed;
++    }
+ 
+-  dbus_error_init (&tmp_error);
+   while (_dbus_directory_get_next_file (dir, &filename, &tmp_error))
+     {
+       DBusString full_path;

From cf4a69e2ec73c5abf5812e20a558bf45b9646e56 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Apr 2016 20:12:23 +0200
Subject: [PATCH 193/712] haskell-tinc: move the tool into the haskellPackages
 hierarchy like all other Haskell packages

---
 pkgs/development/haskell-modules/configuration-common.nix     | 4 ++++
 .../tools/{misc/tinc-haskell => haskell/tinc}/default.nix     | 2 +-
 pkgs/top-level/all-packages.nix                               | 2 --
 3 files changed, 5 insertions(+), 3 deletions(-)
 rename pkgs/development/tools/{misc/tinc-haskell => haskell/tinc}/default.nix (98%)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 90cef5e92a0..ecae4cb8eb6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1006,4 +1006,8 @@ self: super: {
   c2hs_0_27_1 = if pkgs.stdenv.isDarwin
                 then dontCheck super.c2hs_0_27_1
                 else super.c2hs_0_27_1;
+
+  # tinc is a new build driver a la Stack that's not yet available from Hackage.
+  tinc = self.callPackage ../tools/haskell/tinc {};
+
 }
diff --git a/pkgs/development/tools/misc/tinc-haskell/default.nix b/pkgs/development/tools/haskell/tinc/default.nix
similarity index 98%
rename from pkgs/development/tools/misc/tinc-haskell/default.nix
rename to pkgs/development/tools/haskell/tinc/default.nix
index 4efdc909673..44491fa0ef9 100644
--- a/pkgs/development/tools/misc/tinc-haskell/default.nix
+++ b/pkgs/development/tools/haskell/tinc/default.nix
@@ -6,7 +6,7 @@
 , ghc, cabal2nix, cabal-install, makeWrapper
 }:
 mkDerivation {
-  pname = "tinc-haskell";
+  pname = "tinc";
   version = "20160419";
   src = fetchFromGitHub {
     owner = "sol";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ef9afe98ef..f4de0702e2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6306,8 +6306,6 @@ in
 
   texi2html = callPackage ../development/tools/misc/texi2html { };
 
-  tinc-haskell = haskellPackages.callPackage ../development/tools/misc/tinc-haskell { };
-
   travis = callPackage ../development/tools/misc/travis { };
 
   tweak = callPackage ../applications/editors/tweak { };

From 68691d31b1376417e7d822d031de1ccb72c4748a Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 24 Apr 2016 20:48:27 +0200
Subject: [PATCH 194/712] rsync: fix version typo

Typo introduced at c3b4dd920b50d6fd7625ada250d042b47fbd0217; went
undetected because the checksum was not changed.

Reported by m4t__ on IRC
---
 pkgs/applications/networking/sync/rsync/base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix
index 86b90ea22ef..a95835610d5 100644
--- a/pkgs/applications/networking/sync/rsync/base.nix
+++ b/pkgs/applications/networking/sync/rsync/base.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 rec {
-  version = "3.2.1";
+  version = "3.1.2";
   src = fetchurl {
     # signed with key 0048 C8B0 26D4 C96F 0E58  9C2F 6C85 9FB1 4B96 A8C5
     url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";

From 8601f6907249f3fbc6128893e0526d96d0f3671b Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Sun, 24 Apr 2016 21:51:39 +0200
Subject: [PATCH 195/712] xpra: 0.16.2 -> 0.17.0

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

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index ae869cfb1c4..643e4664f71 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -6,11 +6,11 @@
 , libfakeXinerama }:
 
 buildPythonApplication rec {
-  name = "xpra-0.16.2";
+  name = "xpra-0.17.0";
   namePrefix = "";
   src = fetchurl {
     url = "http://xpra.org/src/${name}.tar.xz";
-    sha256 = "0h55rv46byzv2g8g77bm0a0py8jpz3gbr5fhr5jy9sisyr0vk6ff";
+    sha256 = "0abli2gc174v8zh1dsc3nq8c5aivnni67cjrr8yhsqsl8fwj0c2l";
   };
 
   buildInputs = [

From e252e59a1a3a495ed9facb10e143d986ddd2ed64 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 24 Apr 2016 15:32:05 +0200
Subject: [PATCH 196/712] golden-cheetah: fix version format and tarball name

---
 pkgs/applications/misc/golden-cheetah/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index 56b1d2a0029..8d4339516a6 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -2,9 +2,10 @@
 , qttools, yacc, flex, zlib, config, qmakeHook, makeQtWrapper }:
 stdenv.mkDerivation rec {
   name = "golden-cheetah-${version}";
-  version = "V4.0-DEV1603";
+  version = "4.0-DEV1603";
   src = fetchurl {
-    url = "https://github.com/GoldenCheetah/GoldenCheetah/archive/${version}.tar.gz";
+    name = "${name}.tar.gz";
+    url = "https://github.com/GoldenCheetah/GoldenCheetah/archive/V${version}.tar.gz";
     sha256 = "12knlzqmq8b3nyl3kvcsnzrbjksgd83mzwzj97wccyfiffjl4wah";
   };
   buildInputs = [

From fe5f52599bff0f7dda5846da68c4dc86fa19b98a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 24 Apr 2016 16:04:25 +0200
Subject: [PATCH 197/712] debian-devscripts: 2.16.3 -> 2.16.4

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

diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index edc527484c6..3818b1be134 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.16.3";
+  version = "2.16.4";
   name = "debian-devscripts-${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz";
-    sha256 = "0w030zdvcwaxpashdd6zvqgmy89h107p7gvd3lqx9vdy9zv0agd2";
+    sha256 = "0hxvxf8fc76lmrf57l9liwx1xjbxk2ldamln8xnwqlg37laxi3v2";
   };
 
   buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile 

From 23e3cbeca4331507f4c54a4020b6573d89883480 Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Sun, 24 Apr 2016 21:56:15 +0200
Subject: [PATCH 198/712] kerberos_server: fix evaluation (closes #14928)

---
 nixos/modules/services/system/kerberos.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/system/kerberos.nix b/nixos/modules/services/system/kerberos.nix
index 347302c6090..4f2e2fdf662 100644
--- a/nixos/modules/services/system/kerberos.nix
+++ b/nixos/modules/services/system/kerberos.nix
@@ -4,7 +4,7 @@ let
 
   inherit (lib) mkOption mkIf singleton;
 
-  inherit (pkgs) heimdal;
+  inherit (pkgs) heimdalFull;
 
   stateDir = "/var/heimdal";
 in
@@ -33,7 +33,7 @@ in
 
   config = mkIf config.services.kerberos_server.enable {
 
-    environment.systemPackages = [ heimdal ];
+    environment.systemPackages = [ heimdalFull ];
 
     services.xinetd.enable = true;
     services.xinetd.services = lib.singleton
@@ -42,7 +42,7 @@ in
         protocol = "tcp";
         user = "root";
         server = "${pkgs.tcp_wrappers}/sbin/tcpd";
-        serverArgs = "${pkgs.heimdal}/sbin/kadmind";
+        serverArgs = "${pkgs.heimdalFull}/sbin/kadmind";
       };
 
     systemd.services.kdc = {
@@ -51,13 +51,13 @@ in
       preStart = ''
         mkdir -m 0755 -p ${stateDir}
       '';
-      script = "${heimdal}/sbin/kdc";
+      script = "${heimdalFull}/sbin/kdc";
     };
 
     systemd.services.kpasswdd = {
       description = "Kerberos Password Changing daemon";
       wantedBy = [ "multi-user.target" ];
-      script = "${heimdal}/sbin/kpasswdd";
+      script = "${heimdalFull}/sbin/kpasswdd";
     };
   };
 

From cd6e0814363e3ab5cb221a1dfcc408eee98bff5f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 24 Apr 2016 21:54:54 +0200
Subject: [PATCH 199/712] perl-Math-BigInt: 1.999717 -> 1.999718

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c2c291e0979..a50a6a088de 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7352,10 +7352,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MathBigInt = buildPerlPackage rec {
-    name = "Math-BigInt-1.999717";
+    name = "Math-BigInt-1.999718";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz";
-      sha256 = "871c936cbd943b95c5561b82f077cbb1bbb4c85bdae14b668eca985e2a051fb6";
+      sha256 = "3edb44123d6c03a4031057f449b41a0d05ebc48d25ad64b08a5fe2f4ae2ac240";
     };
     meta = {
       description = "Arbitrary size integer/float math package";

From 620eb5e30855d16028ae68bde1ad438c1bcc2f3c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 24 Apr 2016 21:55:10 +0200
Subject: [PATCH 200/712] perl-Math-BigRat: 0.260802 -> 0.260803

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a50a6a088de..ca29b937c95 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7377,11 +7377,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   MathBigRat = buildPerlPackage rec {
-    name = "Math-BigRat-0.260802";
+    name = "Math-BigRat-0.260803";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz";
-      sha256 = "1b1ed448c355677bf6403705f8428fee5bdf2bb138a3fe721bf51414c1695508";
+      sha256 = "0558fab8ffe0de8751ccfa3bd129d6f34b82cf75454de82b051d4ddffd4ec99b";
     };
+    propagatedBuildInputs = [ MathBigInt ];
     meta = {
       description = "Arbitrary big rational numbers";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From 095e57ab76c67f59228e5f16a3c1491aaaedcdc0 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 24 Apr 2016 21:55:39 +0200
Subject: [PATCH 201/712] perl-MouseXGetopt: fix Perl 5.22 build

Also rename attribute (keeping old as redirect).
---
 pkgs/top-level/perl-packages.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ca29b937c95..4c8e6f80624 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8222,13 +8222,15 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  MouseXGetOpt = buildPerlModule {
-    name = "mousex-getopt-0.36";
+  MouseXGetOpt = self.MouseXGetopt;
+
+  MouseXGetopt = buildPerlModule rec {
+    name = "MouseX-Getopt-0.36";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GF/GFUJI/MouseX-Getopt-0.36.tar.gz;
+      url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz";
       sha256 = "172ab0609f1638c6d8800d2dff1bdaa044e305aaa2e9b1fbb8a9dc722a3bf430";
     };
-    buildInputs = [ MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ];
+    buildInputs = [ ModuleBuild Mouse MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ];
     propagatedBuildInputs = [ GetoptLongDescriptive Mouse ];
     meta = {
       homepage = https://github.com/gfx/mousex-getopt;

From 5d356d58984002b20f40062f139ba0f6a84ea440 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 24 Apr 2016 21:56:34 +0200
Subject: [PATCH 202/712] perl-MooseX-Getopt: 0.68 -> 0.69

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4c8e6f80624..db45322462e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8325,12 +8325,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   MooseXGetopt = buildPerlPackage rec {
-    name = "MooseX-Getopt-0.68";
+    name = "MooseX-Getopt-0.69";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
-      sha256 = "acb5118b4666352e58d4268040869d7dc2b68968fe26b5dd6715f51ebd784483";
+      sha256 = "0ef348a5edb8aca9a8bf4aff9dbcc2ac4281682fdc65b210b3c87cffd7501308";
     };
-    buildInputs = [ CPANMeta ModuleBuildTiny ModuleRuntime Moose PathTiny TestDeep TestFatal TestRequires TestTrap TestWarnings if_ ];
+    buildInputs = [ ModuleBuildTiny Moose PathTiny TestDeep TestFatal TestRequires TestTrap TestWarnings self."if" ];
     propagatedBuildInputs = [ GetoptLongDescriptive Moose MooseXRoleParameterized TryTiny namespaceautoclean ];
     meta = {
       homepage = https://github.com/moose/MooseX-Getopt;

From 6763b27959d4ea8dd1382f2d0fbca99be53d619e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 24 Apr 2016 21:57:46 +0200
Subject: [PATCH 203/712] perl-Pod-Elemental-PerlMunger: 0.200003 -> 0.200005

---
 pkgs/top-level/perl-packages.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index db45322462e..83887a2ff05 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10051,14 +10051,14 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  PodElementalPerlMunger = buildPerlPackage {
-    name = "Pod-Elemental-PerlMunger-0.200003";
+  PodElementalPerlMunger = buildPerlPackage rec {
+    name = "Pod-Elemental-PerlMunger-0.200005";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-PerlMunger-0.200003.tar.gz;
-      sha256 = "94b3abe6894c96b7990cb324a3789af05489dc2b5d1ec8961d37309cc6e8c243";
+      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
+      sha256 = "35146bdcf0d3ac271f9ba2a4d4611b98373215c43de43dd4f012f46c44004d57";
     };
     buildInputs = [ Moose PodElemental ];
-    propagatedBuildInputs = [ ListMoreUtils Moose PPI ParamsUtil PodElemental namespaceautoclean ];
+    propagatedBuildInputs = [ Moose PPI PodElemental namespaceautoclean ];
     meta = {
       homepage = https://github.com/rjbs/Pod-Elemental-PerlMunger;
       description = "A thing that takes a string of Perl and rewrites its documentation";

From 1826c37acae9b6f332b850f95251dc77ebdb6419 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 24 Apr 2016 21:59:09 +0200
Subject: [PATCH 204/712] perl-Role-Tiny: 2.000001 -> 2.000003

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 83887a2ff05..af33ee2f596 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10457,12 +10457,11 @@ let self = _self // overrides; _self = with self; {
   };
 
   RoleTiny = buildPerlPackage rec {
-    name = "Role-Tiny-2.000001";
+    name = "Role-Tiny-2.000003";
     src = fetchurl {
       url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz";
-      sha256 = "31883410a7c85d6dc7501c718b1f83edba013a7b9bbccf0338a1033c391f296d";
+      sha256 = "6e6c967e1154f290a40c9c60a762cc3b2ec5438107a4fbadddbe55a55b393434";
     };
-    buildInputs = [ TestFatal ];
     meta = {
       description = "Roles. Like a nouvelle cuisine portion size slice of Moose";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From 43ce7ac340d151a32353b487a9a2ca847c27d829 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 24 Apr 2016 21:59:22 +0200
Subject: [PATCH 205/712] perl-Software-License: 0.103011 -> 0.103012

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index af33ee2f596..b5f7f50b8d3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10692,10 +10692,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   SoftwareLicense = buildPerlPackage rec {
-    name = "Software-License-0.103011";
+    name = "Software-License-0.103012";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
-      sha256 = "03dyc5sx0asq1m3276l224q5776ng24fw5llf3gr9mbgklkgj05s";
+      sha256 = "47f9acb7f4eeed35e38c1bec37a71b61e651965233d67dadfae6390571517db1";
     };
     propagatedBuildInputs = [ DataSection TextTemplate TryTiny ];
     meta = {

From b3ccc826ee728037aa195bb87c1544f2fea6c475 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 24 Apr 2016 21:59:43 +0200
Subject: [PATCH 206/712] gpsprune: 18.3 -> 18.4

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

diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix
index a6ea5b054c3..789f2d7c3fa 100644
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gpsprune-${version}";
-  version = "18.3";
+  version = "18.4";
 
   src = fetchurl {
     url = "http://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";
-    sha256 = "1sas5n4k3afryg3k6y40w39kifs3d0yrnnk46nqp7axs4ay2aqim";
+    sha256 = "0wrkvff3c1w66373m2w2ib07rkn3rmbp3n7ixz72qd1swvbk6xx1";
   };
 
   phases = [ "installPhase" ];

From 40ea584903d0b68eebb5040c615220567dfc8051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 24 Apr 2016 22:33:30 +0200
Subject: [PATCH 207/712] kodi: 16.0 -> 16.1

---
 pkgs/applications/video/kodi/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 6b21f0f6516..bca0551c001 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -40,16 +40,16 @@ assert rtmpSupport  -> rtmpdump != null;
 let
   rel = "Jarvis";
   ffmpeg_2_8_6 = fetchurl {
-    url = "https://github.com/xbmc/FFmpeg/archive/2.8.6-${rel}-16.0.tar.gz";
-    sha256 = "00cvjwfpz6ladmln4yny4d4viwflrbgrid1na412g5pif70qv3dh";
+    url = "https://github.com/xbmc/FFmpeg/archive/2.8.6-${rel}-16.1.tar.gz";
+    sha256 = "1qp8b97298l2pnhhcp7xczdfwr7q7ibxlk4vp8pfmxli2h272wan";
   };
 in stdenv.mkDerivation rec {
     name = "kodi-" + version;
-    version = "16.0";
+    version = "16.1";
 
     src = fetchurl {
       url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz";
-      sha256 = "0iirspvv7czf785l2lqf232dvdaj87srbn9ni97ngvnd6w9yl884";
+      sha256 = "047xpmz78k3d6nhk1x9s8z0bw1b1w9kca46zxkg86p3iyapwi0kx";
     };
 
     buildInputs = [

From 693942b61a0007b420a78f268e02d1c14f23fde6 Mon Sep 17 00:00:00 2001
From: Nicolas Petton <nicolas@petton.fr>
Date: Sat, 23 Apr 2016 09:19:49 +0200
Subject: [PATCH 208/712] emacs25pre: 25.0.92 -> 25.0.93

joachifm: also update the name & re-use it in the url
---
 pkgs/applications/editors/emacs-25/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-25/default.nix b/pkgs/applications/editors/emacs-25/default.nix
index 93baa43abc3..99343624129 100644
--- a/pkgs/applications/editors/emacs-25/default.nix
+++ b/pkgs/applications/editors/emacs-25/default.nix
@@ -23,13 +23,13 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "emacs-25.0.92";
+  name = "emacs-25.0.93";
 
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = "ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-25.0.92.tar.xz";
-    sha256 = "13jnj1js2l90k4yk219r3z67fff90r6mniprsp0sgip2kaak75y2";
+    url = "ftp://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.xz";
+    sha256 = "1wbr2n723ycg16rlg81v9x17w9ciy7qyckxplnwghlyfj6j9k4dk";
   };
 
   patches = lib.optionals stdenv.isDarwin [

From ba71263545e7bd4c2b5a280d04621b04407e3c2a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 24 Apr 2016 15:09:17 +0200
Subject: [PATCH 209/712] workrave: fix version format and tarball name

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

diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix
index 045767eb413..f8ec86dd2b3 100644
--- a/pkgs/applications/misc/workrave/default.nix
+++ b/pkgs/applications/misc/workrave/default.nix
@@ -10,11 +10,15 @@
   gdome2, gstreamer, libsigcxx }:
 
 stdenv.mkDerivation rec {
-  version = "v1_10_6";
+  version = "1.10.6";
   name = "workrave-${version}";
 
-  src = fetchurl {
-    url = "http://github.com/rcaelers/workrave/archive/${version}.tar.gz";
+  src = let
+    version_ = with stdenv.lib;
+      concatStringsSep "_" (splitString "." version);
+  in fetchurl {
+    name = "${name}.tar.gz";
+    url = "http://github.com/rcaelers/workrave/archive/v${version_}.tar.gz";
     sha256 = "0q2p83n33chbqzdcdm7ykfsy73frfi6drxzm4qidxwzpzsxrysgq";
   };
 

From bea31c31f269594dc70b33e3d08e4cfad9c22019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20=C5=81asocha?= <me+dev@swistak35.com>
Date: Mon, 25 Apr 2016 01:55:07 +0200
Subject: [PATCH 210/712] pws: Init at 1.0.6

---
 lib/maintainers.nix              |  1 +
 pkgs/tools/misc/pws/Gemfile      |  3 +++
 pkgs/tools/misc/pws/Gemfile.lock | 19 ++++++++++++++++++
 pkgs/tools/misc/pws/default.nix  | 33 +++++++++++++++++++++++++++++++
 pkgs/tools/misc/pws/gemset.nix   | 34 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 6 files changed, 92 insertions(+)
 create mode 100644 pkgs/tools/misc/pws/Gemfile
 create mode 100644 pkgs/tools/misc/pws/Gemfile.lock
 create mode 100644 pkgs/tools/misc/pws/default.nix
 create mode 100644 pkgs/tools/misc/pws/gemset.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 63b79ccab0b..6dad71ad564 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -340,6 +340,7 @@
   spwhitt = "Spencer Whitt <sw@swhitt.me>";
   stephenmw = "Stephen Weinberg <stephen@q5comm.com>";
   steveej = "Stefan Junker <mail@stefanjunker.de>";
+  swistak35 = "Rafał Łasocha <me@swistak35.com>";
   szczyp = "Szczyp <qb@szczyp.com>";
   sztupi = "Attila Sztupak <attila.sztupak@gmail.com>";
   taeer = "Taeer Bar-Yam <taeer@necsi.edu>";
diff --git a/pkgs/tools/misc/pws/Gemfile b/pkgs/tools/misc/pws/Gemfile
new file mode 100644
index 00000000000..43b6b931860
--- /dev/null
+++ b/pkgs/tools/misc/pws/Gemfile
@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'pws'
diff --git a/pkgs/tools/misc/pws/Gemfile.lock b/pkgs/tools/misc/pws/Gemfile.lock
new file mode 100644
index 00000000000..c9cf6a3157c
--- /dev/null
+++ b/pkgs/tools/misc/pws/Gemfile.lock
@@ -0,0 +1,19 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    clipboard (1.0.6)
+    paint (1.0.1)
+    pbkdf2-ruby (0.2.1)
+    pws (1.0.6)
+      clipboard (~> 1.0.5)
+      paint (>= 0.8.7)
+      pbkdf2-ruby
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  pws
+
+BUNDLED WITH
+   1.11.2
diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix
new file mode 100644
index 00000000000..811e57c0a08
--- /dev/null
+++ b/pkgs/tools/misc/pws/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, lib, bundlerEnv, ruby, xsel, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "pws-1.0.6";
+
+  env = bundlerEnv {
+    name = "${name}-gems";
+
+    inherit ruby;
+
+    gemfile  = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset   = ./gemset.nix;
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  phases = ["installPhase"];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    makeWrapper ${env}/bin/pws $out/bin/pws \
+      --set PATH '"${xsel}/bin/:$PATH"'
+  '';
+
+  meta = with lib; {
+    description = "Command-line password safe";
+    homepage    = https://github.com/janlelis/pws;
+    license     = licenses.mit;
+    maintainers = maintainers.swistak35;
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/misc/pws/gemset.nix b/pkgs/tools/misc/pws/gemset.nix
new file mode 100644
index 00000000000..2aa26f9a020
--- /dev/null
+++ b/pkgs/tools/misc/pws/gemset.nix
@@ -0,0 +1,34 @@
+{
+  clipboard = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11r5xi1fhll4qxna2sg83vmnphjzqc4pzwdnmc5qwvdps5jbz7cq";
+      type = "gem";
+    };
+    version = "1.0.6";
+  };
+  paint = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1z1fqyyc2jiv6yabv467h652cxr2lmxl5gqqg7p14y28kdqf0nhj";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  pbkdf2-ruby = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "014vb5k8klvh192idqrda2571dxsp7ai2v72hj265zd2awy0zyg1";
+      type = "gem";
+    };
+    version = "0.2.1";
+  };
+  pws = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1brn123mmrw09ji60sa13ylgfjjp7aicz07hm9h0dc3162zlw5wn";
+      type = "gem";
+    };
+    version = "1.0.6";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f4de0702e2b..45f937bac19 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2930,6 +2930,8 @@ in
 
   proxytunnel = callPackage ../tools/misc/proxytunnel { };
 
+  pws = callPackage ../tools/misc/pws { };
+
   cntlm = callPackage ../tools/networking/cntlm { };
 
   pastebinit = callPackage ../tools/misc/pastebinit { };

From 3db3355c835622123245515cdba65edb274e9e7b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 25 Apr 2016 09:12:24 +0200
Subject: [PATCH 211/712] dosbox: pass mesa explicitly (needed for glu.h)

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

diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix
index 2525cafc28b..00202f85df7 100644
--- a/pkgs/misc/emulators/dosbox/default.nix
+++ b/pkgs/misc/emulators/dosbox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL, makeDesktopItem }:
+{ stdenv, fetchurl, SDL, makeDesktopItem, mesa }:
 
 stdenv.mkDerivation rec { 
   name = "dosbox-0.74";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   patchFlags = "-p0";
   
-  buildInputs = [ SDL ];
+  buildInputs = [ SDL mesa ];
     
   desktopItem = makeDesktopItem {
     name = "dosbox";

From 2f6cd0ce335b71ba0adf6e3988f7ce3d01396908 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Fri, 22 Apr 2016 07:52:25 -0700
Subject: [PATCH 212/712] rtl8723bs: improved build

---
 pkgs/os-specific/linux/rtl8723bs/default.nix | 53 +++++++++++---------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix
index 6d55c5522f4..88981c5cf40 100644
--- a/pkgs/os-specific/linux/rtl8723bs/default.nix
+++ b/pkgs/os-specific/linux/rtl8723bs/default.nix
@@ -1,36 +1,43 @@
-{ stdenv, fetchFromGitHub, kernel }:
-
-let
-  ver = "c517f2b";
-in
+{ stdenv, fetchFromGitHub, nukeReferences, kernel }:
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "rtl8723bs-${kernel.version}-c517f2b";
-  
+  name = "rtl8723bs-${kernel.version}-${rev}";
+  rev = "c517f2bf8bcc3d57311252ea7cd49ae81466eead";
+
   src = fetchFromGitHub {
     owner = "hadess";
     repo = "rtl8723bs";
-    rev = "c517f2bf8bcc3d57311252ea7cd49ae81466eead";
+    inherit rev;
     sha256 = "0phzrhq85g52pi2b74a9sr9l2x6dzlz714k3pix486w2x5axw4xb";
   };
-  
-  patchPhase = ''
-    substituteInPlace ./Makefile --replace /lib/modules/ "${kernel.dev}/lib/modules/"
-    substituteInPlace ./Makefile --replace '$(shell uname -r)' "${kernel.modDirVersion}"
-    substituteInPlace ./Makefile --replace /sbin/depmod #
-    substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
-    substituteInPlace ./Makefile --replace '/lib/firmware' "$out/lib/firmware"
+
+  buildInputs = [ nukeReferences ];
+
+  makeFlags = concatStringsSep " " [
+    "ARCH=${stdenv.platform.kernelArch}" # Normally not needed, but the Makefile sets ARCH in a broken way.
+    "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" # Makefile uses $(uname -r); breaks us.
+  ];
+
+  enableParallelBuilding = true;
+
+  # The Makefile doesn't use env-vars well, so install manually:
+  installPhase = ''
+    mkdir -p      $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless
+    cp r8723bs.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless
+
+    mkdir -p                "$out/lib/firmware/rtlwifi"
+    cp rtl8723bs_nic.bin    "$out/lib/firmware/rtlwifi"
+    cp rtl8723bs_wowlan.bin "$out/lib/firmware/rtlwifi"
+
+    nuke-refs $(find $out -name "*.ko")
   '';
-  
-  preInstall = ''
-    mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
-    mkdir -p "$out/lib/firmware/rtlwifi"
-  '';
-   
+
   meta = {
     description = "Realtek SDIO Wi-Fi driver";
     homepage = "https://github.com/hadess/rtl8723bs";
     license = stdenv.lib.licenses.gpl2;
-    platforms = [ "x86_64-linux" "i686-linux" ];
-    broken = !stdenv.lib.versionAtLeast kernel.version "3.19";
+    platforms = [ "x86_64-linux" "i686-linux" "armv7l-linux" ];
+    broken = ! versionAtLeast kernel.version "3.19";
+    maintainers = with maintainers; [ elitak ];
   };
 }

From 4c415e59a427ab18336da21bc6a2b762e3b3ee4e Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Fri, 22 Apr 2016 07:54:11 -0700
Subject: [PATCH 213/712] rtl8723bs-firmware: init, split off from rtl8723bs

---
 nixos/modules/hardware/all-firmware.nix       |  6 +++++-
 .../firmware/rtl8723bs-firmware/default.nix   | 21 +++++++++++++++++++
 pkgs/os-specific/linux/rtl8723bs/default.nix  |  4 ----
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix

diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix
index d0d481f72a4..fb8e1ccab66 100644
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@@ -22,7 +22,11 @@ with lib;
   ###### implementation
 
   config = mkIf config.hardware.enableAllFirmware {
-    hardware.firmware = [ pkgs.firmwareLinuxNonfree pkgs.intel2200BGFirmware ];
+    hardware.firmware = with pkgs; [
+      firmwareLinuxNonfree
+      intel2200BGFirmware
+      rtl8723bs-firmware
+    ];
   };
 
 }
diff --git a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix
new file mode 100644
index 00000000000..dd30003aa40
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, linuxPackages }:
+with stdenv.lib;
+stdenv.mkDerivation {
+  name = "rtl8723bs-firmware-${linuxPackages.rtl8723bs.rev}";
+  inherit (linuxPackages.rtl8723bs) src;
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p                "$out/lib/firmware/rtlwifi"
+    cp rtl8723bs_nic.bin    "$out/lib/firmware/rtlwifi"
+    cp rtl8723bs_wowlan.bin "$out/lib/firmware/rtlwifi"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Firmware for RealTek 8723bs";
+    homepage = https://github.com/hadess/rtl8723bs;
+    license = licenses.unfreeRedistributableFirmware;
+    maintainers = with maintainers; [ elitak ];
+  };
+}
diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix
index 88981c5cf40..05822c4cb42 100644
--- a/pkgs/os-specific/linux/rtl8723bs/default.nix
+++ b/pkgs/os-specific/linux/rtl8723bs/default.nix
@@ -25,10 +25,6 @@ stdenv.mkDerivation rec {
     mkdir -p      $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless
     cp r8723bs.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless
 
-    mkdir -p                "$out/lib/firmware/rtlwifi"
-    cp rtl8723bs_nic.bin    "$out/lib/firmware/rtlwifi"
-    cp rtl8723bs_wowlan.bin "$out/lib/firmware/rtlwifi"
-
     nuke-refs $(find $out -name "*.ko")
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f4de0702e2b..29f055ef5d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11015,6 +11015,8 @@ in
 
   rt5677-firmware = callPackage ../os-specific/linux/firmware/rt5677 { };
 
+  rtl8723bs-firmware = callPackage ../os-specific/linux/firmware/rtl8723bs-firmware { };
+
   s3ql = callPackage ../tools/backup/s3ql { };
 
   sassc = callPackage ../development/tools/sassc { };

From 62551b53185d8c90e58bade93be0fe9d23ad5060 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Fri, 22 Apr 2016 08:00:56 -0700
Subject: [PATCH 214/712] rtl8723bs: version bump

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

diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix
index 05822c4cb42..e8cc1f40067 100644
--- a/pkgs/os-specific/linux/rtl8723bs/default.nix
+++ b/pkgs/os-specific/linux/rtl8723bs/default.nix
@@ -2,13 +2,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "rtl8723bs-${kernel.version}-${rev}";
-  rev = "c517f2bf8bcc3d57311252ea7cd49ae81466eead";
+  rev = "6918e9b2ff297b1cc7fde193e72452c33c10e1c8";
 
   src = fetchFromGitHub {
     owner = "hadess";
     repo = "rtl8723bs";
     inherit rev;
-    sha256 = "0phzrhq85g52pi2b74a9sr9l2x6dzlz714k3pix486w2x5axw4xb";
+    sha256 = "07srd457wnz29nvvq02wz66s387bhjbydnmbs3qr7ljprabhsgmi";
   };
 
   buildInputs = [ nukeReferences ];

From 7cf8daa2bbf7e9ac1b57305a22547271dca28a6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 25 Apr 2016 11:00:26 +0200
Subject: [PATCH 215/712] nixos: rename chroot* to sandbox*

On Nix side this was done months ago:
https://github.com/NixOS/nix/pull/682
---
 .github/PULL_REQUEST_TEMPLATE.md           |  2 +-
 nixos/modules/rename.nix                   |  4 ++++
 nixos/modules/services/misc/nix-daemon.nix | 16 ++++++++--------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ceea615d5d7..324c5f17f7a 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
 ###### Things done
 
-- [ ] Tested using sandboxing (`nix-build --option build-use-chroot true` or [nix.useChroot](http://nixos.org/nixos/manual/options.html#opt-nix.useChroot) on NixOS)
+- [ ] Tested using sandboxing (`nix-build --option build-use-sandbox true` or [nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS)
 - Built on platform(s)
    - [ ] NixOS
    - [ ] OS X
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 84eccfd5129..6b02446d53b 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -68,6 +68,10 @@ with lib;
     # proxy
     (mkRenamedOptionModule [ "nix" "proxy" ] [ "networking" "proxy" "default" ])
 
+    # sandboxing
+    (mkRenamedOptionModule [ "nix" "useChroot" ] [ "nix" "useSandbox" ])
+    (mkRenamedOptionModule [ "nix" "chrootDirs" ] [ "nix" "sandboxPaths" ])
+
     # KDE
     (mkRenamedOptionModule [ "kde" "extraPackages" ] [ "environment" "systemPackages" ])
     (mkRenamedOptionModule [ "environment" "kdePackages" ] [ "environment" "systemPackages" ])
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 10ac6f93cfd..c84c67ff287 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -24,8 +24,8 @@ let
 
   nixConf =
     let
-      # If we're using a chroot for builds, then provide /bin/sh in
-      # the chroot as a bind-mount to bash. This means we also need to
+      # If we're using sandbox for builds, then provide /bin/sh in
+      # the sandbox as a bind-mount to bash. This means we also need to
       # include the entire closure of bash.
       sh = pkgs.stdenv.shell;
       binshDeps = pkgs.writeReferencesToFile sh;
@@ -39,8 +39,8 @@ let
         build-users-group = nixbld
         build-max-jobs = ${toString (cfg.maxJobs)}
         build-cores = ${toString (cfg.buildCores)}
-        build-use-chroot = ${if (builtins.isBool cfg.useChroot) then (if cfg.useChroot then "true" else "false") else cfg.useChroot}
-        build-chroot-dirs = ${toString cfg.chrootDirs} /bin/sh=${sh} $(echo $extraPaths)
+        build-use-sandbox = ${if (builtins.isBool cfg.useSandbox) then (if cfg.useSandbox then "true" else "false") else cfg.useSandbox}
+        build-sandbox-paths = ${toString cfg.sandboxPaths} /bin/sh=${sh} $(echo $extraPaths)
         binary-caches = ${toString cfg.binaryCaches}
         trusted-binary-caches = ${toString cfg.trustedBinaryCaches}
         binary-cache-public-keys = ${toString cfg.binaryCachePublicKeys}
@@ -98,25 +98,25 @@ in
         '';
       };
 
-      useChroot = mkOption {
+      useSandbox = mkOption {
         type = types.either types.bool (types.enum ["relaxed"]);
         default = false;
         description = "
-          If set, Nix will perform builds in a chroot-environment that it
+          If set, Nix will perform builds in a sandboxed environment that it
           will set up automatically for each build.  This prevents
           impurities in builds by disallowing access to dependencies
           outside of the Nix store.
         ";
       };
 
-      chrootDirs = mkOption {
+      sandboxPaths = mkOption {
         type = types.listOf types.str;
         default = [];
         example = [ "/dev" "/proc" ];
         description =
           ''
             Directories from the host filesystem to be included
-            in the chroot.
+            in the sandbox.
           '';
       };
 

From 3895a0b7dd7886f7ad8e1a339f6e18e58334c011 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Mon, 25 Apr 2016 12:12:05 +0200
Subject: [PATCH 216/712] qtpass: 1.1.0 -> 1.1.1

Updates qtpass and fixes the current installation method. It further installs
the desktop file and application icon.
---
 pkgs/applications/misc/qtpass/default.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index 15f249ac906..342a03f8984 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmakeHook }:
+{ stdenv, fetchzip, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmakeHook }:
 
 stdenv.mkDerivation rec {
   name = "qtpass-${version}";
-  version = "1.1.0";
+  version = "1.1.1";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz";
-    sha256 = "60b458062f54184057e55dbd9c93958a8bf845244ffd70b9cb31bf58697f0dc6";
+    sha256 = "1x1ic9as0a60gz664sf8d1qiq64ji7q60g19x0rlm3bvcp2612c8";
   };
 
-  buildInputs = [ git gnupg makeQtWrapper pass qtbase qtsvg qttools qmakeHook ];
+  buildInputs = [ git gnupg pass qtbase qtsvg qttools ];
+
+  nativeBuildInputs = [ makeQtWrapper qmakeHook ];
 
   preConfigure = ''
     qmakeFlags="$qmakeFlags CONFIG+=release DESTDIR=$out"
@@ -18,9 +20,12 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir $out/bin
     mv $out/qtpass $out/bin
+    install -D {,$out/share/applications/}qtpass.desktop
+    install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg
+    runHook postInstall
   '';
 
-  postFixup = ''
+  postInstall = ''
     wrapQtProgram $out/bin/qtpass \
       --suffix PATH : ${git}/bin \
       --suffix PATH : ${gnupg}/bin \
@@ -29,7 +34,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A multi-platform GUI for pass, the standard unix password manager";
-    homepage = https://github.com/IJHack/qtpass;
+    homepage = https://qtpass.org;
     license = licenses.gpl3;
     maintainers = [ maintainers.hrdinka ];
     platforms = platforms.all;

From d1d779fcbc94c7252a95ec0b98dc823d5964585a Mon Sep 17 00:00:00 2001
From: Tiago de Paula Peixoto <tiago@skewed.de>
Date: Mon, 25 Apr 2016 12:37:18 +0200
Subject: [PATCH 217/712] graph-tool: 2.12 -> 2.16 (#14848)

* graph-tool: 2.12 -> 2.16

* graph-tool: Use correct upstream source

* graph-tool: Use correct hash
---
 pkgs/development/python-modules/graph-tool/2.x.x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix
index be1592f864f..4f39d1097b1 100644
--- a/pkgs/development/python-modules/graph-tool/2.x.x.nix
+++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix
@@ -3,7 +3,7 @@ pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir,
 gobjectIntrospection, pygobject3, gtk3, matplotlib }:
 
 stdenv.mkDerivation rec {
-  version = "2.12";
+  version = "2.16";
   name = "${python.libPrefix}-graph-tool-${version}";
 
   meta = with stdenv.lib; {
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "https://github.com/count0/graph-tool/archive/release-${version}.tar.gz";
-    sha256 = "12w58djyx6nn00wixqnxnxby9ksabhzdkkvynl8b89parfvfbpwl";
+    url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
+    sha256 = "03b1pmh2gvsgyq491gvskx8fwgqy9k942faymdnhwpbbbfhx911p";
   };
 
   configureFlags = [

From ddc401ed0a8c768ee784aff3d50dc97f8ba8e279 Mon Sep 17 00:00:00 2001
From: jraygauthier <jraygauthier@users.noreply.github.com>
Date: Mon, 25 Apr 2016 07:16:47 -0400
Subject: [PATCH 218/712] icon-conv-tools: init at 0.0.0 (#13905)

A nix specific set of tools for converting icon files
that are not in a freedesktop ready format.

I plan on using these tools for both `keepass` and
`retroarch` packages. It may benifit many other packages.
---
 .../extractWinRscIconsToStdFreeDesktopDir.sh  | 74 +++++++++++++++++++
 .../icon-conv-tools/bin/icoFileToHiColorTheme | 28 +++++++
 .../build-support/icon-conv-tools/default.nix | 31 ++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 135 insertions(+)
 create mode 100755 pkgs/build-support/icon-conv-tools/bin/extractWinRscIconsToStdFreeDesktopDir.sh
 create mode 100755 pkgs/build-support/icon-conv-tools/bin/icoFileToHiColorTheme
 create mode 100644 pkgs/build-support/icon-conv-tools/default.nix

diff --git a/pkgs/build-support/icon-conv-tools/bin/extractWinRscIconsToStdFreeDesktopDir.sh b/pkgs/build-support/icon-conv-tools/bin/extractWinRscIconsToStdFreeDesktopDir.sh
new file mode 100755
index 00000000000..994adbd91da
--- /dev/null
+++ b/pkgs/build-support/icon-conv-tools/bin/extractWinRscIconsToStdFreeDesktopDir.sh
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+# The file from which to extract *.ico files or a particular *.ico file.
+# (e.g.: './KeePass.exe', './myLibrary.dll', './my/path/to/app.ico'). 
+# As you notived, the utility can extract icons from a windows executable or
+# dll.
+rscFile=$1
+
+# A regexp that can extract the image size from the file name. Because we
+# use 'icotool', this value should usually be set to something like
+# '[^\.]+\.exe_[0-9]+_[0-9]+_[0-9]+_[0-9]+_([0-9]+x[0-9]+)x[0-9]+\.png'.
+# A reg expression may be written at some point that relegate this to
+# an implementation detail.
+sizeRegex=$2
+
+# A regexp replace expression that will be used with 'sizeRegex' to create
+# a proper size directory (e.g.: '48x48'). Usually this is left to '\1'.
+sizeReplaceExp=$3
+
+# A regexp that can extract the name of the target image from the file name
+# of the image (usually png) extracted from the *.ico file(s). A good
+# default is '([^\.]+).+' which gets the basename without extension.
+nameRegex=$4
+
+# A regexp replace expression that will be used alongside 'nameRegex' to create
+# a icon file name. Note that you usually put directly you icon name here
+# without any extension (e.g.: 'my-app'). But in case you've got something
+# fancy, it will usually be '\1'.
+nameReplaceExp=$5
+
+# The 
+# out=./myOut
+out=$6
+
+# An optional temp dir.
+if [ "" != "$7" ]; then
+  tmp=$7
+  isOwnerOfTmpDir=false
+else
+  tmp=`mktemp -d`
+  isOwnerOfTmpDir=true
+fi
+
+rm -rf $tmp/png $tmp/ico
+mkdir -p $tmp/png $tmp/ico
+
+# Extract the ressource file's extension.
+rscFileExt=`echo "$rscFile" | sed -re 's/.+\.(.+)$/\1/'`
+
+if [ "ico" = "$rscFileExt" ]; then
+  cp -p $rscFile $tmp/ico
+else
+  wrestool -x --output=$tmp/ico -t14 $rscFile
+fi
+    
+icotool --icon -x --palette-size=0 -o $tmp/png $tmp/ico/*.ico
+
+mkdir -p $out
+
+for i in $tmp/png/*.png; do
+  fn=`basename "$i"`
+  size=$(echo $fn | sed -re 's/'${sizeRegex}'/'${sizeReplaceExp}'/')
+  name=$(echo $fn | sed -re 's/'${nameRegex}'/'${nameReplaceExp}'/')
+  targetDir=$out/share/icons/hicolor/$size/apps
+  targetFile=$targetDir/$name.png
+  mkdir -p $targetDir
+  mv $i $targetFile
+done
+
+rm -rf "$tmp/png" "$tmp/ico"
+
+if $isOwnerOfTmpDir; then
+  rm -rf "$tmp"
+fi
diff --git a/pkgs/build-support/icon-conv-tools/bin/icoFileToHiColorTheme b/pkgs/build-support/icon-conv-tools/bin/icoFileToHiColorTheme
new file mode 100755
index 00000000000..192f3bb54c2
--- /dev/null
+++ b/pkgs/build-support/icon-conv-tools/bin/icoFileToHiColorTheme
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+SCRIPT_DIR=`cd "$(dirname $0)" && pwd`
+
+# The '*.ico' file that needs to be converted (e.g.: "./my/path/to/file.ico").
+icoFile="$1"
+
+# The desired name of created icon files without extension. (e.g.: "my-app").
+targetIconName="$2"
+
+# The output directory where the free desktop hierarchy will be created.
+# (e.g.: "./path/to/my/out" or usually in nix "$out"). Note that the
+# whole directory hierarchy to the icon will be created in the specified
+# output directory (e.g.: "$out/share/icons/hicolor/48x48/apps/my-app.png").
+out="$3"
+
+# An optional temp directory location (e.g.: ./tmp). If not specified
+# a random '/tmp' directory will be created.
+tmp="$4"
+
+$SCRIPT_DIR/extractWinRscIconsToStdFreeDesktopDir.sh \
+  "$icoFile" \
+  '[^\.]+_[0-9]+_([0-9]+x[0-9]+)x[0-9]+\.png' \
+  '\1' \
+  '([^\.]+).+' \
+  "$targetIconName" \
+  "$out" \
+  "$tmp"
diff --git a/pkgs/build-support/icon-conv-tools/default.nix b/pkgs/build-support/icon-conv-tools/default.nix
new file mode 100644
index 00000000000..739ec485159
--- /dev/null
+++ b/pkgs/build-support/icon-conv-tools/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, icoutils }:
+
+stdenv.mkDerivation {
+  name = "icon-conv-tools-0.0.0";
+
+  src = ./.;
+
+  buildInputs = [ icoutils ];
+
+  patchPhase = ''
+    substituteInPlace "./bin/extractWinRscIconsToStdFreeDesktopDir.sh" \
+      --replace "icotool" "${icoutils}/bin/icotool" \
+      --replace "wrestool" "${icoutils}/bin/wrestool"
+  '';
+
+  buildPhase = ''
+    mkdir -p "$out/bin"
+    cp -p "./bin/"* "$out/bin"
+  '';
+
+  installPhase = "true";
+  
+  dontPatchELF = true;
+  dontStrip = true;
+
+  meta = {
+    description = "Tools for icon conversion specific to nix package manager";
+    maintainers = with stdenv.lib.maintainers; [ jraygauthier ];
+  };
+
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e634ac0f47..0851c5fb941 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -328,6 +328,8 @@ in
 
   useOldCXXAbi = makeSetupHook { } ../build-support/setup-hooks/use-old-cxx-abi.sh;
 
+  iconConvTools = callPackage ../build-support/icon-conv-tools {};
+
 
   ### TOOLS
 

From 130078a73abb2bf334ba11027ac20c75d43f662e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?=
 <theophane.hufschmitt@polytechnique.org>
Date: Thu, 21 Apr 2016 13:56:20 +0200
Subject: [PATCH 219/712] pythonPackages.repeated_test : init at 0.1a3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1232f7a58fd..56a42db00ca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26588,4 +26588,27 @@ in modules // {
       maintainers = with maintainers; [];
     };
   };
+
+  repeated_test = buildPythonPackage rec {
+    name = "repeated_test-${version}";
+    version = "0.1a3";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/r/repeated-test/${name}.tar.gz";
+      sha256 = "062syp7kl2g0x6qx3z8zb5sdycpi7qcpxp9iml2v8dqzqnij9bpg";
+    };
+
+    buildInputs = with self; [
+      unittest2
+    ];
+    propagatedBuildInputs = with self; [
+      six
+    ];
+
+    meta = {
+      description = "A quick unittest-compatible framework for repeating a test function over many fixtures";
+      homepage = "https://github.com/epsy/repeated_test";
+      license = licenses.mit;
+    };
+  };
 }

From f770fe47683f477667b61c921f1eaf8f39388385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?=
 <theophane.hufschmitt@polytechnique.org>
Date: Wed, 20 Apr 2016 07:20:35 +0200
Subject: [PATCH 220/712] pythonPackages.sigtool : init at 1.1a3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 56a42db00ca..99d4c911c52 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26611,4 +26611,34 @@ in modules // {
       license = licenses.mit;
     };
   };
+
+  sigtools = buildPythonPackage rec {
+    name = "sigtools-${version}";
+    version = "1.1a3";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/sigtools/${name}.tar.gz";
+      sha256 = "190w14vzbiyvxcl9jmyyimpahar5b0bq69v9iv7chi852yi71w6w";
+    };
+
+    buildInputs = with self; [
+      repeated_test
+      sphinx
+      mock
+      coverage
+      unittest2
+    ];
+    propagatedBuildInputs = with self; [
+      funcsigs
+      six
+    ];
+
+    patchPhase = ''sed -i s/test_suite="'"sigtools.tests"'"/test_suite="'"unittest2.collector"'"/ setup.py'';
+
+    meta = {
+      description = "Utilities for working with 3.3's inspect.Signature objects.";
+      homepage = "https://pypi.python.org/pypi/sigtools";
+      license = licenses.mit;
+    };
+  };
 }

From 21f6437365a16f57ba221ef2b24c8511b7293284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?=
 <theophane.hufschmitt@polytechnique.org>
Date: Wed, 20 Apr 2016 07:21:10 +0200
Subject: [PATCH 221/712] pythonPackages.clize : init at 3.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 99d4c911c52..8a0f2a34253 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26641,4 +26641,27 @@ in modules // {
       license = licenses.mit;
     };
   };
+
+  clize = buildPythonPackage rec {
+    name = "clize-${version}";
+    version = "3.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/c/clize/${name}.tar.gz";
+      sha256 = "1xkr3h404d7pgj5gdpg6bddv3v3yq2hgx8qlwkgw5abg218k53hm";
+    };
+
+    buildInputs = with self; [
+      dateutil
+    ];
+    propagatedBuildInputs = with self; [
+      sigtools
+    ];
+
+    meta = {
+      description = "Command-line argument parsing for Python";
+      homepage = "https://github.com/epsy/clize";
+      license = licenses.mit;
+    };
+  };
 }

From 22e2cfe92bbdb94d2722008c25967a3e9136a3fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?=
 <theophane.hufschmitt@polytechnique.org>
Date: Wed, 20 Apr 2016 07:21:36 +0200
Subject: [PATCH 222/712] pythonPackages.zerobin : init at 20160108

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8a0f2a34253..304c4932d8e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26664,4 +26664,28 @@ in modules // {
       license = licenses.mit;
     };
   };
+
+  zerobin = buildPythonPackage rec {
+    name = "zerobin-${version}";
+    version = "20160108";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "sametmax";
+      repo = "0bin";
+      rev = "7da1615";
+      sha256 = "1pzcwy454kn5216pvwjqzz311s6jbh7viw9s6kw4xps6f5h44bid";
+    };
+
+    propagatedBuildInputs = with self; [
+      cherrypy
+      bottle
+      lockfile
+      clize
+    ];
+    meta = {
+      description = "A client side encrypted pastebin";
+      homepage = "http://0bin.net/";
+      license = licenses.wtfpl;
+    };
+  };
 }

From 201590fd97d44a56ebcc8ac487c6f8899fd3c153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?=
 <theophane.hufschmitt@polytechnique.org>
Date: Wed, 20 Apr 2016 09:32:11 +0200
Subject: [PATCH 223/712] zerobin service : init

---
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/networking/zerobin.nix | 102 ++++++++++++++++++
 2 files changed, 103 insertions(+)
 create mode 100644 nixos/modules/services/networking/zerobin.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 972802b2341..b238003dd0c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -401,6 +401,7 @@
   ./services/networking/wicd.nix
   ./services/networking/wpa_supplicant.nix
   ./services/networking/xinetd.nix
+  ./services/networking/zerobin.nix
   ./services/networking/zerotierone.nix
   ./services/networking/znc.nix
   ./services/printing/cupsd.nix
diff --git a/nixos/modules/services/networking/zerobin.nix b/nixos/modules/services/networking/zerobin.nix
new file mode 100644
index 00000000000..1c524602f8e
--- /dev/null
+++ b/nixos/modules/services/networking/zerobin.nix
@@ -0,0 +1,102 @@
+{ config, pkgs, lib, nodes, ... }:
+with lib;
+let
+  cfg = config.services.zerobin;
+
+  zerobin_config = pkgs.writeText "zerobin-config.py" ''
+  PASTE_FILES_ROOT = "${cfg.dataDir}"
+  ${cfg.extraConfig}
+  '';
+
+in
+  {
+    options = {
+      services.zerobin = {
+        enable = mkEnableOption "0bin";
+
+        dataDir = mkOption {
+          type = types.str;
+          default = "/var/lib/zerobin";
+          description = ''
+          Path to the 0bin data directory
+          '';
+        };
+
+        user = mkOption {
+          type = types.str;
+          default = "zerobin";
+          description = ''
+          The user 0bin should run as
+          '';
+        };
+
+        group = mkOption {
+          type = types.str;
+          default = "zerobin";
+          description = ''
+          The group 0bin should run as
+          '';
+        };
+
+        listenPort = mkOption {
+          type = types.int;
+          default = 8000;
+          example = 1357;
+          description = ''
+          The port zerobin should listen on
+          '';
+        };
+
+        listenAddress = mkOption {
+          type = types.str;
+          default = "localhost";
+          example = "127.0.0.1";
+          description = ''
+          The address zerobin should listen to
+          '';
+        };
+
+        extraConfig = mkOption {
+          type = types.lines;
+          default = "";
+          example = ''
+          MENU = (
+          ('Home', '/'),
+          )
+          COMPRESSED_STATIC_FILE = True
+          '';
+          description = ''
+          Extra configuration to be appended to the 0bin config file
+          (see https://0bin.readthedocs.org/en/latest/en/options.html)
+          '';
+        };
+      };
+    };
+
+    config = mkIf (cfg.enable) {
+      users.users."${cfg.user}" =
+      if cfg.user == "zerobin" then {
+        isSystemUser = true;
+        group = cfg.group;
+        home = cfg.dataDir;
+        createHome = true;
+      }
+      else {};
+      users.groups."${cfg.group}" = {};
+
+      systemd.services.zerobin = {
+        enable = true;
+        after = [ "network-interfaces.target" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig.ExecStart = "${pkgs.pythonPackages.zerobin}/bin/zerobin ${cfg.listenAddress} ${toString cfg.listenPort} false ${cfg.user} ${cfg.group} ${zerobin_config}";
+        serviceConfig.PrivateTmp="yes";
+        serviceConfig.User = cfg.user;
+        serviceConfig.Group = cfg.group;
+        preStart = ''
+        mkdir -p ${cfg.dataDir}
+        chown ${cfg.user} ${cfg.dataDir}
+        '';
+      };
+    };
+  }
+

From 364181b3173c7a8616efc86f374c91cd778b372a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 25 Apr 2016 13:26:16 +0200
Subject: [PATCH 224/712] fatrace: add patch to fix crash

Will be included in next release.
---
 pkgs/os-specific/linux/fatrace/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix
index ca864091d4b..5a34eee85e4 100644
--- a/pkgs/os-specific/linux/fatrace/default.nix
+++ b/pkgs/os-specific/linux/fatrace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3, which }:
+{ stdenv, fetchurl, fetchpatch, python3, which }:
 
 stdenv.mkDerivation rec {
   name = "fatrace-${version}";
@@ -9,6 +9,15 @@ stdenv.mkDerivation rec {
     sha256 = "1f77v222nlfbf8fv7d28cnpm7x8xz0mhxavgz19c2jc51pjlv84s";
   };
 
+  patchFlags = "-p0";
+  patches = [
+    (fetchpatch {
+      sha256 = "0gym1zg42vb4czpbkz4shnc7z3lskn1ny6dpx10ykwf145xyf9m2";
+      name = "fatrace-fix-crash-when-using-p-option.patch";
+      url = "http://bazaar.launchpad.net/~pitti/fatrace/trunk/diff/67?context=3";
+    })
+  ];
+
   buildInputs = [ python3 which ];
 
   postPatch = ''

From 0f479e3016e443a84b156898fd2dd612e3327c93 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 25 Apr 2016 13:32:04 +0200
Subject: [PATCH 225/712] geolite-legacy: 2016-04-19 -> 2016-04-25

---
 pkgs/data/misc/geolite-legacy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 79c22354aff..051c7de107d 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,7 +8,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "geolite-legacy-${version}";
-  version = "2016-04-19";
+  version = "2016-04-25";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
     "11igx6r0fypih5i3f0mrcv044pivnl45mq6pkq81i81cv28hfcn8";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "0xf5ciqclk9pb82kz9zkv15wb8vm32i456jcwkf6rjv18h3wjl74";
+    "1b7w8sdazxq5sv3nz1s28420374vf4wn6h2zasbg68kc2cxwdh2w";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "0bgxw4xdkvpwhg7fdillnk8qk14hgld4icvp81d15pz4j0b9jwq9";
+    "1iy6myanmx8h4ha493bz80q6wjwgjlbk7cmliyw1806dd7fhqvwi";
 
   meta = with stdenv.lib; {
     description = "GeoLite Legacy IP geolocation databases";

From 0472cc82ea4c4199016732f08a793f49bc3696e2 Mon Sep 17 00:00:00 2001
From: artuuge <artuuge@gmail.com>
Date: Sun, 24 Apr 2016 00:14:04 +0200
Subject: [PATCH 226/712] beignet: init at 1.1.2

---
 .../libraries/beignet/clang_llvm.patch        |  62 +++++++++
 .../development/libraries/beignet/default.nix | 123 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   8 ++
 3 files changed, 193 insertions(+)
 create mode 100644 pkgs/development/libraries/beignet/clang_llvm.patch
 create mode 100644 pkgs/development/libraries/beignet/default.nix

diff --git a/pkgs/development/libraries/beignet/clang_llvm.patch b/pkgs/development/libraries/beignet/clang_llvm.patch
new file mode 100644
index 00000000000..88876f157cd
--- /dev/null
+++ b/pkgs/development/libraries/beignet/clang_llvm.patch
@@ -0,0 +1,62 @@
+diff --git a/./CMake/FindLLVM.cmake b/../Beignet-1.1.2-Source_new/CMake/FindLLVM.cmake
+index a148321..96cafb8 100644
+--- a/./CMake/FindLLVM.cmake
++++ b/../Beignet-1.1.2-Source_new/CMake/FindLLVM.cmake
+@@ -22,6 +22,7 @@ if (LLVM_CONFIG_EXECUTABLE)
+ else (LLVM_CONFIG_EXECUTABLE)
+   message(FATAL_ERROR "Could NOT find LLVM executable, please add -DLLVM_INSTALL_DIR=/path/to/llvm-config/ in cmake command")
+ endif (LLVM_CONFIG_EXECUTABLE)
++
+ execute_process(
+   COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
+   OUTPUT_VARIABLE LLVM_VERSION
+@@ -44,10 +45,16 @@ if (LLVM_FIND_VERSION_MAJOR AND LLVM_FIND_VERSION_MINOR)
+   endif (LLVM_VERSION_NODOT VERSION_LESS LLVM_FIND_VERSION_NODOT)
+ endif (LLVM_FIND_VERSION_MAJOR AND LLVM_FIND_VERSION_MINOR)
+ 
+-if (LLVM_INSTALL_DIR)
++if (CLANG_INSTALL_DIR)
+   find_program(CLANG_EXECUTABLE
+                NAMES clang-${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NOPATCH} clang
+-               PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH)
++               PATHS ${CLANG_INSTALL_DIR} NO_DEFAULT_PATH)
++else (CLANG_INSTALL_DIR)
++  find_program(CLANG_EXECUTABLE
++               NAMES clang-${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NOPATCH} clang)
++endif (CLANG_INSTALL_DIR)
++
++if (LLVM_INSTALL_DIR)
+   find_program(LLVM_AS_EXECUTABLE
+                NAMES llvm-as-${LLVM_VERSION_NODOT} llvm-as-${LLVM_VERSION_NOPATCH} llvm-as
+                PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH)
+@@ -55,8 +62,6 @@ if (LLVM_INSTALL_DIR)
+                NAMES llvm-link-${LLVM_VERSION_NODOT} llvm-link-${LLVM_VERSION_NOPATCH} llvm-link
+                PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH)
+ else (LLVM_INSTALL_DIR)
+-  find_program(CLANG_EXECUTABLE
+-               NAMES clang-${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NOPATCH} clang)
+   find_program(LLVM_AS_EXECUTABLE
+                NAMES llvm-as-${LLVM_VERSION_NODOT} llvm-as-${LLVM_VERSION_NOPATCH} llvm-as)
+   find_program(LLVM_LINK_EXECUTABLE
+@@ -105,7 +110,7 @@ endif (LLVM_VERSION_NODOT VERSION_GREATER 34)
+ macro(add_one_lib name)
+   FIND_LIBRARY(CLANG_LIB
+     NAMES ${name}
+-    PATHS ${LLVM_LIBRARY_DIR} NO_DEFAULT_PATH)
++    PATHS ${CLANG_LIBRARY_DIR} NO_DEFAULT_PATH)
+   set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_LIB})
+ 	unset(CLANG_LIB CACHE)
+ endmacro()
+diff --git a/./CMakeLists.txt b/../Beignet-1.1.2-Source_new/CMakeLists.txt
+index 88985d7..01bca9e 100644
+--- a/./CMakeLists.txt
++++ b/../Beignet-1.1.2-Source_new/CMakeLists.txt
+@@ -205,7 +205,7 @@ IF(OCLIcd_FOUND)
+     "intel-beignet.icd.in"
+     "${ICD_FILE_NAME}"
+   )
+-  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION /etc/OpenCL/vendors)
++  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors)
+ ELSE(OCLIcd_FOUND)
+   MESSAGE(STATUS "Looking for OCL ICD header file - not found")
+ ENDIF(OCLIcd_FOUND)
diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix
new file mode 100644
index 00000000000..5d5c834b4ac
--- /dev/null
+++ b/pkgs/development/libraries/beignet/default.nix
@@ -0,0 +1,123 @@
+{ stdenv
+, fetchurl
+, cmake
+, pkgconfig
+, clang-unwrapped
+, llvm
+, libdrm
+, libX11
+, libXfixes
+, libpthreadstubs
+, libXdmcp
+, libXdamage
+, libXxf86vm
+, python
+, gl
+, ocl-icd
+}: 
+
+stdenv.mkDerivation rec {
+  name = "beignet-${version}";
+  version = "1.1.2"; 
+
+  src = fetchurl {
+    url = "https://01.org/sites/default/files/${name}-source.tar.gz"; 
+    sha256 = "6a8d875afbb5e3c4fc57da1ea80f79abadd9136bfd87ab1f83c02784659f1d96"; 
+  };  
+
+  patches = [ ./clang_llvm.patch ]; 
+
+  postPatch = ''
+    patchShebangs src/git_sha1.sh; 
+
+    for f in $(find utests -type f)
+    do
+      sed -e "s@isnan(@std::isnan(@g" -i $f
+      sed -e "s@_std::isnan@_isnan@g" -i $f
+
+      sed -e "s@isinf(@std::isinf(@g" -i $f
+      sed -e "s@_std::isinf@_isinf@g" -i $f
+    done
+  ''; 
+
+  configurePhase = ''
+    cmake . -DCMAKE_INSTALL_PREFIX=$out \
+            -DCLANG_LIBRARY_DIR="${clang-unwrapped}/lib" \
+            -DLLVM_INSTALL_DIR="${llvm}/bin" \
+            -DCLANG_INSTALL_DIR="${clang-unwrapped}/bin"
+  '';
+
+  postInstall = ''
+    mkdir -p $out/utests/kernels
+    mkdir -p $out/utests/lib
+
+    cp -r kernels $out/utests
+    cp src/libcl.so $out/utests/lib
+
+    cat > $out/utests/setenv.sh << EOF
+#!/bin/sh
+export OCL_BITCODE_LIB_PATH=$out/lib/beignet/beignet.bc
+export OCL_HEADER_FILE_DIR=$out/lib/beignet/include
+export OCL_PCH_PATH=$out/lib/beignet/beignet.pch
+export OCL_GBE_PATH=$out/lib/beignet/libgbe.so
+export OCL_INTERP_PATH=$out/lib/beignet/libgbeinterp.so
+export OCL_KERNEL_PATH=$out/utests/kernels
+export OCL_IGNORE_SELF_TEST=1
+EOF
+
+    function fixRunPath {
+      p0=$(patchelf --print-rpath $1)
+      p1=$(echo $p0 | sed -e "s@$(pwd)/src@$out/utests/lib@g" -)
+      p2=$(echo $p1 | sed -e "s@$(pwd)/utests@$out/utests@g" -)
+      patchelf --set-rpath $p2 $1 
+    }
+    
+    fixRunPath utests/utest_run
+    fixRunPath utests/libutests.so
+
+    cp utests/utest_run $out/utests
+    cp utests/libutests.so $out/utests
+
+    mkdir -p $out/bin
+    ln -s $out/utests/setenv.sh $out/bin/beignet_setenv.sh
+    ln -s $out/utests/utest_run $out/bin/beignet_utest_run
+  ''; 
+
+  # To run the unit tests, the user must be in "video" group. 
+  # The nix builders are members of only "nixbld" group, so 
+  # they are able to compile the tests, but not to run them. 
+  # To verify the installation, add yourself to "video" group, 
+  # switch to a working directory which has both read and write 
+  # permissions, run: nix-shell -p pkgs.beignet, and execute:
+  # . beignet_setenv.sh && beignet_utest_run
+  doCheck = false; 
+
+  buildInputs = [ 
+    llvm 
+    clang-unwrapped
+    cmake 
+    libX11 
+    pkgconfig 
+    libdrm 
+    gl 
+    libXfixes 
+    libpthreadstubs
+    libXdmcp
+    libXdamage
+    libXxf86vm
+    python
+    ocl-icd
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://cgit.freedesktop.org/beignet/;
+    description = "OpenCL Library for Intel Ivy Bridge and newer GPUs";
+    longDescription = ''
+      The package provides an open source implementation of the OpenCL specification for Intel GPUs. 
+      It supports the Intel OpenCL runtime library and compiler. 
+    '';
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ artuuge ];
+    platforms = platforms.linux;
+  }; 
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0851c5fb941..4c9fcef8710 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6449,6 +6449,14 @@ in
 
   beecrypt = callPackage ../development/libraries/beecrypt { };
 
+  beignet = callPackage ../development/libraries/beignet {
+    inherit (llvmPackages) clang-unwrapped; 
+    inherit (xlibs) libX11; 
+    inherit (xorg) libXfixes libpthreadstubs libXdmcp libXdamage libXxf86vm; 
+    inherit (python3Packages) python; 
+    inherit (purePackages) gl; 
+  }; 
+  
   belle-sip = callPackage ../development/libraries/belle-sip { };
 
   bobcat = callPackage ../development/libraries/bobcat { };

From a51da701890fea2d41b58ec1c7142225060f6775 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Mon, 25 Apr 2016 10:15:44 -0300
Subject: [PATCH 227/712] the-powder-toy: 90.2.322 -> 91.3.328

---
 pkgs/games/the-powder-toy/default.nix   |  4 ++--
 pkgs/games/the-powder-toy/fix-env.patch | 23 +++++++++--------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix
index f79d31c7c5c..14f05f8f1a8 100644
--- a/pkgs/games/the-powder-toy/default.nix
+++ b/pkgs/games/the-powder-toy/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, scons, pkgconfig, SDL, lua, fftwFloat }:
 
-let version = "90.2.322";
+let version = "91.3.328";
 in
 stdenv.mkDerivation rec {
   name = "the-powder-toy-${version}";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     owner = "simtr";
     repo = "The-Powder-Toy";
     rev = "v${version}";
-    sha256 = "1rlxnk8icymalnr3j4bgpklq1dhhs0rpsyjx97isqqcwm2ys03q3";
+    sha256 = "0krg4d2m8cnfabm5qq7wr1y53h21i49xjcggzg98xjd0972zvfrk";
   };
 
   patches = [ ./fix-env.patch ];
diff --git a/pkgs/games/the-powder-toy/fix-env.patch b/pkgs/games/the-powder-toy/fix-env.patch
index 79d2bb2a2e0..b09fd4dcbe9 100644
--- a/pkgs/games/the-powder-toy/fix-env.patch
+++ b/pkgs/games/the-powder-toy/fix-env.patch
@@ -1,16 +1,11 @@
-diff --git a/SConscript b/SConscript
-index fd08935..4d879b2 100644
 --- a/SConscript
 +++ b/SConscript
-@@ -93,9 +93,9 @@ if msvc and platform != "Windows":
- 
- #Create SCons Environment
- if platform == "Windows" and not GetOption('msvc'):
--	env = Environment(tools = ['mingw'], ENV = {'PATH' : os.environ['PATH']})
-+	env = Environment(tools = ['mingw'], ENV = os.environ)
- else:
--	env = Environment(tools = ['default'], ENV = {'PATH' : os.environ['PATH']})
-+	env = Environment(tools = ['default'], ENV = os.environ)
- 
- #attempt to automatically find cross compiler
- if not tool and compilePlatform == "Linux" and compilePlatform != platform:
+@@ -99,7 +99,7 @@
+ elif platform == "Windows" and not GetOption('msvc'):
+ 	env = Environment(tools=['mingw'], ENV={'PATH' : os.environ['PATH']})
+ else:
+-	env = Environment(tools=['default'], ENV={'PATH' : os.environ['PATH']})
++	env = Environment(tools=['default'], ENV = os.environ)
+ 
+ #attempt to automatically find cross compiler
+ if not tool and compilePlatform == "Linux" and compilePlatform != platform:

From b6e63fba6deebd3b65b3db0fbcb7f2a18e162f0d Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Mon, 25 Apr 2016 01:00:06 -0430
Subject: [PATCH 228/712] phonon : fix configuration paths

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

diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index 3c731ca19e3..db4c237c989 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -47,8 +47,8 @@ stdenv.mkDerivation rec {
   postPatch = ''
     sed -i PhononConfig.cmake.in \
         -e "/get_filename_component(rootDir/ s/^.*$//" \
-        -e "s,\\(set(PHONON_INCLUDE_DIR\\).*$,\\1 \"''${!outputDev}/include\")," \
-        -e "s,\\(set(PHONON_LIBRARY_DIR\\).*$,\\1 \"''${!outputLib}/lib\")," \
-        -e "s,\\(set(PHONON_BUILDSYSTEM_DIR\\).*$,\\1 \"''${!outputDev}/share/phonon${if withQt5 then "4qt5" else ""}/buildsystem\"),"
+        -e "/^set(PHONON_INCLUDE_DIR/ s,\''${rootDir},''${!outputDev}," \
+        -e "/^set(PHONON_LIBRARY_DIR/ s,\''${rootDir}/,," \
+        -e "/^set(PHONON_BUILDSYSTEM_DIR/ s,\''${rootDir},''${!outputDev},"
   '';
 }

From ecf75f1b4f9d92a632c7903bece848713dcd6185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 25 Apr 2016 15:53:59 +0200
Subject: [PATCH 229/712] perlPackages.EncodeJIS2K: fix build

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b5f7f50b8d3..aed9a82d85b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4433,6 +4433,7 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-JIS2K-0.02.tar.gz;
       sha256 = "5d718add5857f37fc270f24360bc9d100b72e0e13a11ca3149fe4e4d7c7cc4bf";
     };
+    outputs = [ "out" ];
     meta = {
     };
   };

From 1c9234fd6cbd1cd674bed069b2e7190d52e5447f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 25 Apr 2016 16:16:21 +0200
Subject: [PATCH 230/712] foswiki, egypt, wml: fix build

---
 pkgs/development/tools/analysis/egypt/default.nix | 2 ++
 pkgs/development/web/wml/default.nix              | 2 ++
 pkgs/servers/foswiki/default.nix                  | 4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix
index fc63247468c..572e2f74471 100644
--- a/pkgs/development/tools/analysis/egypt/default.nix
+++ b/pkgs/development/tools/analysis/egypt/default.nix
@@ -9,6 +9,8 @@ buildPerlPackage rec {
     url = "http://www.gson.org/egypt/download/${name}.tar.gz";
   };
 
+  outputs = [ "out" ];
+
   enableParallelBuilding = true;
 
   doCheck = true;
diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix
index 22cc5001c92..3d47d32f1c8 100644
--- a/pkgs/development/web/wml/default.nix
+++ b/pkgs/development/web/wml/default.nix
@@ -8,6 +8,8 @@ perlPackages.buildPerlPackage rec {
     sha256 = "0jjxpq91x7y2mgixz7ghqp01m24qa37wl3zz515rrzv7x8cyy4cf";
   };
 
+  setOutputFlags = false;
+
   # Getting lots of Non-ASCII character errors from pod2man.
   # Inserting =encoding utf8 before the first =head occurrence.
   # Wasn't able to fix mp4h.
diff --git a/pkgs/servers/foswiki/default.nix b/pkgs/servers/foswiki/default.nix
index c5831325958..5bfeef6f1fc 100644
--- a/pkgs/servers/foswiki/default.nix
+++ b/pkgs/servers/foswiki/default.nix
@@ -9,6 +9,8 @@ perlPackages.buildPerlPackage rec {
     sha256 = "03286pb966h99zgickm2f20rgnqwp9wga5wfkdvirv084kjdh8vp";
   };
 
+  outputs = [ "out" ];
+
   buildInputs = with perlPackages; [
     # minimum requirements from INSTALL.html#System_Requirements
     AlgorithmDiff ArchiveTar AuthenSASL CGI CGISession CryptPasswdMD5
@@ -30,7 +32,7 @@ perlPackages.buildPerlPackage rec {
 
   # there's even no makefile
   doCheck = false;
-  installPhase = ''cp -r . "$out" ''; # TODO: some fixups will be needed for running it
+  installPhase = ''cp -r . "$out" '';
 
   meta = with stdenv.lib; {
     description = "An open, programmable collaboration platform";

From 40f82550d8fc1fb24ea5ea76b82bd779b7322379 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Fri, 12 Feb 2016 09:48:15 +0200
Subject: [PATCH 231/712] rmilter: use libmilter with patch to socket
 activation

---
 pkgs/servers/mail/rmilter/default.nix         |  7 +-
 .../mail/rmilter/fd-passing-libmilter.patch   | 80 +++++++++++++++++++
 2 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/mail/rmilter/fd-passing-libmilter.patch

diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix
index c12ca525294..455e543b2da 100644
--- a/pkgs/servers/mail/rmilter/default.nix
+++ b/pkgs/servers/mail/rmilter/default.nix
@@ -1,5 +1,10 @@
 { stdenv, fetchFromGitHub, cmake, bison, flex, openssl, pcre, libmilter, opendkim }:
 
+let patchedLibmilter = stdenv.lib.overrideDerivation  libmilter (_ : {
+    patches = libmilter.patches ++ [ ./fd-passing-libmilter.patch ];
+});
+in
+
 stdenv.mkDerivation rec {
   name = "rmilter-${version}";
   version = "1.7.3";
@@ -12,7 +17,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ bison cmake flex ];
-  buildInputs = [ libmilter openssl pcre opendkim ];
+  buildInputs = [ patchedLibmilter openssl pcre opendkim];
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/vstakhov/rmilter";
diff --git a/pkgs/servers/mail/rmilter/fd-passing-libmilter.patch b/pkgs/servers/mail/rmilter/fd-passing-libmilter.patch
new file mode 100644
index 00000000000..3ab61a6fab0
--- /dev/null
+++ b/pkgs/servers/mail/rmilter/fd-passing-libmilter.patch
@@ -0,0 +1,80 @@
+Description: systemd-like socket activation support for libmilter
+Author: Mikhail Gusarov <dottedmag@debian.org
+diff --git a/libmilter/docs/smfi_setconn.html b/libmilter/docs/smfi_setconn.html
+index 70a510e..013f04e 100644
+--- a/libmilter/docs/smfi_setconn.html
++++ b/libmilter/docs/smfi_setconn.html
+@@ -43,6 +43,7 @@ Set the socket through which this filter should communicate with sendmail.
+ 	<LI><CODE>{unix|local}:/path/to/file</CODE> -- A named pipe.
+ 	<LI><CODE>inet:port@{hostname|ip-address}</CODE> -- An IPV4 socket.
+ 	<LI><CODE>inet6:port@{hostname|ip-address}</CODE> -- An IPV6 socket.
++	<LI><CODE>fd:number</CODE> -- Pre-opened file descriptor.
+ 	</UL>
+ 	</TD></TR>
+     </TABLE>
+diff --git a/libmilter/listener.c b/libmilter/listener.c
+index 48c552f..2249a1f 100644
+--- a/libmilter/listener.c
++++ b/libmilter/listener.c
+@@ -197,6 +197,11 @@ mi_milteropen(conn, backlog, rmsocket, name)
+ 			L_socksize = sizeof addr.sin6;
+ 		}
+ #endif /* NETINET6 */
++		else if (strcasecmp(p, "fd") == 0)
++		{
++			addr.sa.sa_family = AF_UNSPEC;
++			L_socksize = sizeof (_SOCK_ADDR);
++		}
+ 		else
+ 		{
+ 			smi_log(SMI_LOG_ERR, "%s: unknown socket type %s",
+@@ -443,7 +448,21 @@ mi_milteropen(conn, backlog, rmsocket, name)
+ 	}
+ #endif /* NETINET || NETINET6 */
+ 
+-	sock = socket(addr.sa.sa_family, SOCK_STREAM, 0);
++	if (addr.sa.sa_family == AF_UNSPEC)
++	{
++		char *end;
++		sock = strtol(colon, &end, 10);
++		if (*end != '\0' || sock < 0)
++		{
++			smi_log(SMI_LOG_ERR, "%s: expected positive integer as fd, got %s", name, colon);
++			return INVALID_SOCKET;
++		}
++	}
++	else
++	{
++		sock = socket(addr.sa.sa_family, SOCK_STREAM, 0);
++	}
++
+ 	if (!ValidSocket(sock))
+ 	{
+ 		smi_log(SMI_LOG_ERR,
+@@ -466,6 +485,7 @@ mi_milteropen(conn, backlog, rmsocket, name)
+ #if NETUNIX
+ 	    addr.sa.sa_family != AF_UNIX &&
+ #endif /* NETUNIX */
++	    addr.sa.sa_family != AF_UNSPEC &&
+ 	    setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *) &sockopt,
+ 		       sizeof(sockopt)) == -1)
+ 	{
+@@ -511,7 +531,8 @@ mi_milteropen(conn, backlog, rmsocket, name)
+ 	}
+ #endif /* NETUNIX */
+ 
+-	if (bind(sock, &addr.sa, L_socksize) < 0)
++	if (addr.sa.sa_family != AF_UNSPEC &&
++	    bind(sock, &addr.sa, L_socksize) < 0)
+ 	{
+ 		smi_log(SMI_LOG_ERR,
+ 			"%s: Unable to bind to port %s: %s",
+@@ -817,7 +838,7 @@ mi_listener(conn, dbg, smfi, timeout, backlog)
+ # ifdef BSD4_4_SOCKADDR
+ 		     cliaddr.sa.sa_len == 0 ||
+ # endif /* BSD4_4_SOCKADDR */
+-		     cliaddr.sa.sa_family != L_family))
++		     (L_family != AF_UNSPEC && cliaddr.sa.sa_family != L_family)))
+ 		{
+ 			(void) closesocket(connfd);
+ 			connfd = INVALID_SOCKET;

From 70f5c840af9ecdb57ec97f6c56e5ce1f3939be1a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Apr 2016 14:01:40 +0300
Subject: [PATCH 232/712] nix-daemon service: Don't have the output in the
 `nix.package' option

1) It unnecessarily exposes implementation details.
2) It breaks all existing configs that have e.g.
   `nix.package = pkgs.nixUnstable;`.
---
 nixos/modules/services/misc/nix-daemon.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index c84c67ff287..5400588d027 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -65,8 +65,8 @@ in
 
       package = mkOption {
         type = types.package;
-        default = pkgs.nix.out;
-        defaultText = "pkgs.nix.out";
+        default = pkgs.nix;
+        defaultText = "pkgs.nix";
         description = ''
           This option specifies the Nix package instance to use throughout the system.
         '';

From bee04a37ad9157fa7992b80df53919759b1ebffd Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Apr 2016 14:00:31 +0300
Subject: [PATCH 233/712] amazon-init.nix: Use makeBinPath

This also fixes the incorrect use of 'dev' outputs from
config.nix.package and pkgs.systemd.
---
 nixos/modules/virtualisation/amazon-init.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix
index 886552f33c2..c9356c9b4ea 100644
--- a/nixos/modules/virtualisation/amazon-init.nix
+++ b/nixos/modules/virtualisation/amazon-init.nix
@@ -8,7 +8,7 @@ let
 
     echo "attempting to fetch configuration from EC2 user data..."
 
-    export PATH=${config.nix.package}/bin:${pkgs.systemd}/bin:${pkgs.gnugrep}/bin:${pkgs.gnused}/bin:${config.system.build.nixos-rebuild}/bin:$PATH
+    export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.gnused config.system.build.nixos-rebuild]}:$PATH
     export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
 
     userData=/etc/ec2-metadata/user-data

From 60f5659dad9ee8dc8b55f5ec814cd50cd6a8ca96 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Apr 2016 13:57:19 +0300
Subject: [PATCH 234/712] treewide: Use correct output in
 ${config.nix.package}/bin

---
 nixos/lib/make-disk-image.nix                         | 6 +++---
 nixos/modules/installer/cd-dvd/channel.nix            | 2 +-
 nixos/modules/installer/cd-dvd/iso-image.nix          | 4 ++--
 nixos/modules/installer/cd-dvd/sd-image.nix           | 4 ++--
 nixos/modules/installer/cd-dvd/system-tarball.nix     | 4 ++--
 nixos/modules/profiles/docker-container.nix           | 4 ++--
 nixos/modules/services/misc/nix-gc.nix                | 2 +-
 nixos/modules/services/misc/nix-ssh-serve.nix         | 2 +-
 nixos/modules/virtualisation/azure-image.nix          | 4 ++--
 nixos/modules/virtualisation/brightbox-image.nix      | 4 ++--
 nixos/modules/virtualisation/google-compute-image.nix | 4 ++--
 nixos/modules/virtualisation/qemu-vm.nix              | 2 +-
 12 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index caf0ab4c07b..63666c99b23 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -81,14 +81,14 @@ pkgs.vmTools.runInLinuxVM (
 
       # Register the paths in the Nix database.
       printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
-          chroot /mnt ${config.nix.package}/bin/nix-store --load-db --option build-users-group ""
+          chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group ""
 
       # Add missing size/hash fields to the database. FIXME:
       # exportReferencesGraph should provide these directly.
-      chroot /mnt ${config.nix.package}/bin/nix-store --verify --check-contents
+      chroot /mnt ${config.nix.package.out}/bin/nix-store --verify --check-contents
 
       # Create the system profile to allow nixos-rebuild to work.
-      chroot /mnt ${config.nix.package}/bin/nix-env --option build-users-group "" \
+      chroot /mnt ${config.nix.package.out}/bin/nix-env --option build-users-group "" \
           -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
 
       # `nixos-rebuild' requires an /etc/NIXOS.
diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix
index 1e5e2b2615c..cd6e72755de 100644
--- a/nixos/modules/installer/cd-dvd/channel.nix
+++ b/nixos/modules/installer/cd-dvd/channel.nix
@@ -34,7 +34,7 @@ in
       if ! [ -e /var/lib/nixos/did-channel-init ]; then
         echo "unpacking the NixOS/Nixpkgs sources..."
         mkdir -p /nix/var/nix/profiles/per-user/root
-        ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels \
+        ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels \
           -i ${channelSources} --quiet --option build-use-substitutes false
         mkdir -m 0700 -p /root/.nix-defexpr
         ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 5702e2d9a1e..c31ded977e6 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -364,12 +364,12 @@ in
       ''
         # After booting, register the contents of the Nix store on the
         # CD in the Nix database in the tmpfs.
-        ${config.nix.package}/bin/nix-store --load-db < /nix/store/nix-path-registration
+        ${config.nix.package.out}/bin/nix-store --load-db < /nix/store/nix-path-registration
 
         # nixos-rebuild also requires a "system" profile and an
         # /etc/NIXOS tag.
         touch /etc/NIXOS
-        ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
+        ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
       '';
 
     # Add vfat support to the initrd to enable people to copy the
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index 9eba542d8c9..23312c073d5 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -113,11 +113,11 @@ in
         ${pkgs.e2fsprogs}/bin/resize2fs $rootPart
 
         # Register the contents of the initial Nix store
-        ${config.nix.package}/bin/nix-store --load-db < /nix-path-registration
+        ${config.nix.package.out}/bin/nix-store --load-db < /nix-path-registration
 
         # nixos-rebuild also requires a "system" profile and an /etc/NIXOS tag.
         touch /etc/NIXOS
-        ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
+        ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
 
         # Prevents this from running on later boots.
         rm -f /nix-path-registration
diff --git a/nixos/modules/installer/cd-dvd/system-tarball.nix b/nixos/modules/installer/cd-dvd/system-tarball.nix
index 90e9b98a457..1962a1959ea 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball.nix
@@ -78,14 +78,14 @@ in
         # After booting, register the contents of the Nix store on the
         # CD in the Nix database in the tmpfs.
         if [ -f /nix-path-registration ]; then
-          ${config.nix.package}/bin/nix-store --load-db < /nix-path-registration &&
+          ${config.nix.package.out}/bin/nix-store --load-db < /nix-path-registration &&
           rm /nix-path-registration
         fi
 
         # nixos-rebuild also requires a "system" profile and an
         # /etc/NIXOS tag.
         touch /etc/NIXOS
-        ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
+        ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
       '';
 
   };
diff --git a/nixos/modules/profiles/docker-container.nix b/nixos/modules/profiles/docker-container.nix
index df762b7ac58..433492b9613 100644
--- a/nixos/modules/profiles/docker-container.nix
+++ b/nixos/modules/profiles/docker-container.nix
@@ -37,12 +37,12 @@ in {
       # After booting, register the contents of the Nix store in the Nix
       # database.
       if [ -f /nix-path-registration ]; then
-        ${config.nix.package}/bin/nix-store --load-db < /nix-path-registration &&
+        ${config.nix.package.out}/bin/nix-store --load-db < /nix-path-registration &&
         rm /nix-path-registration
       fi
 
       # nixos-rebuild also requires a "system" profile
-      ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
+      ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
     '';
 
   # Install new init script
diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix
index 6a7a7f4cee7..5c13da6e83d 100644
--- a/nixos/modules/services/misc/nix-gc.nix
+++ b/nixos/modules/services/misc/nix-gc.nix
@@ -52,7 +52,7 @@ in
 
     systemd.services.nix-gc =
       { description = "Nix Garbage Collector";
-        script = "exec ${config.nix.package}/bin/nix-collect-garbage ${cfg.options}";
+        script = "exec ${config.nix.package.out}/bin/nix-collect-garbage ${cfg.options}";
         startAt = optionalString cfg.automatic cfg.dates;
       };
 
diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixos/modules/services/misc/nix-ssh-serve.nix
index d70bd855c7f..66148431709 100644
--- a/nixos/modules/services/misc/nix-ssh-serve.nix
+++ b/nixos/modules/services/misc/nix-ssh-serve.nix
@@ -41,7 +41,7 @@ with lib;
         PermitTTY no
         PermitTunnel no
         X11Forwarding no
-        ForceCommand ${config.nix.package}/bin/nix-store --serve
+        ForceCommand ${config.nix.package.out}/bin/nix-store --serve
       Match All
     '';
 
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index 9dc0ce11992..9fac543b03d 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -62,10 +62,10 @@ in
 
           echo Register the paths in the Nix database.
           printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
-              chroot /mnt ${config.nix.package}/bin/nix-store --load-db --option build-users-group ""
+              chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group ""
 
           echo Create the system profile to allow nixos-rebuild to work.
-          chroot /mnt ${config.nix.package}/bin/nix-env \
+          chroot /mnt ${config.nix.package.out}/bin/nix-env \
               -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} --option build-users-group ""
 
           echo nixos-rebuild requires an /etc/NIXOS.
diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix
index b6b2bd4f69b..bcafc06e47c 100644
--- a/nixos/modules/virtualisation/brightbox-image.nix
+++ b/nixos/modules/virtualisation/brightbox-image.nix
@@ -62,10 +62,10 @@ in
 
           # Register the paths in the Nix database.
           printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
-              chroot /mnt ${config.nix.package}/bin/nix-store --load-db --option build-users-group ""
+              chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group ""
 
           # Create the system profile to allow nixos-rebuild to work.
-          chroot /mnt ${config.nix.package}/bin/nix-env \
+          chroot /mnt ${config.nix.package.out}/bin/nix-env \
               -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} \
               --option build-users-group ""
 
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 77074b88246..38417315df5 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -66,10 +66,10 @@ in
 
           # Register the paths in the Nix database.
           printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
-              chroot /mnt ${config.nix.package}/bin/nix-store --load-db --option build-users-group ""
+              chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group ""
 
           # Create the system profile to allow nixos-rebuild to work.
-          chroot /mnt ${config.nix.package}/bin/nix-env \
+          chroot /mnt ${config.nix.package.out}/bin/nix-env \
               -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} \
               --option build-users-group ""
 
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index d9b866d2e55..8aa64368755 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -403,7 +403,7 @@ in
     boot.postBootCommands =
       ''
         if [[ "$(cat /proc/cmdline)" =~ regInfo=([^ ]*) ]]; then
-          ${config.nix.package}/bin/nix-store --load-db < ''${BASH_REMATCH[1]}
+          ${config.nix.package.out}/bin/nix-store --load-db < ''${BASH_REMATCH[1]}
         fi
       '';
 

From 1d4b21ef42a41fcecc254f61f279ad306f41e6b3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Apr 2016 14:06:04 +0300
Subject: [PATCH 235/712] treewide: Use correct output of config.nix.package in
 non-string contexts

---
 nixos/modules/installer/tools/auto-upgrade.nix           | 2 +-
 nixos/modules/installer/tools/nixos-rebuild.sh           | 2 +-
 nixos/modules/installer/tools/tools.nix                  | 6 +++---
 nixos/modules/services/misc/nix-daemon.nix               | 2 +-
 nixos/modules/services/networking/nix-serve.nix          | 2 +-
 nixos/modules/system/boot/loader/gummiboot/gummiboot.nix | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/installer/tools/auto-upgrade.nix b/nixos/modules/installer/tools/auto-upgrade.nix
index 79ccb5c3d18..b21b80c666a 100644
--- a/nixos/modules/installer/tools/auto-upgrade.nix
+++ b/nixos/modules/installer/tools/auto-upgrade.nix
@@ -78,7 +78,7 @@ let cfg = config.system.autoUpgrade; in
           HOME = "/root";
         };
 
-      path = [ pkgs.gnutar pkgs.xz.bin config.nix.package ];
+      path = [ pkgs.gnutar pkgs.xz.bin config.nix.package.out ];
 
       script = ''
         ${config.system.build.nixos-rebuild}/bin/nixos-rebuild switch ${toString cfg.flags}
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index cd30958d9e8..5ecdcdb3cdb 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -271,7 +271,7 @@ remotePATH=
 if [ -n "$buildNix" ]; then
     echo "building Nix..." >&2
     nixDrv=
-    if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nix.drv --indirect -A config.nix.package "${extraBuildFlags[@]}")"; then
+    if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nix.drv --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then
         if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nix.drv --indirect -A nixFallback "${extraBuildFlags[@]}")"; then
             if ! nixDrv="$(nix-instantiate '<nixpkgs>' --add-root $tmpDir/nix.drv --indirect -A nix "${extraBuildFlags[@]}")"; then
                 nixStorePath="$(prebuiltNix "$(uname -m)")"
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 9ac3b7a5b16..b8fd9deaf1e 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -22,17 +22,17 @@ let
     src = ./nixos-install.sh;
 
     inherit (pkgs) perl pathsFromGraph;
-    nix = config.nix.package;
+    nix = config.nix.package.out;
 
     nixClosure = pkgs.runCommand "closure"
-      { exportReferencesGraph = ["refs" config.nix.package]; }
+      { exportReferencesGraph = ["refs" config.nix.package.out]; }
       "cp refs $out";
   };
 
   nixos-rebuild = makeProg {
     name = "nixos-rebuild";
     src = ./nixos-rebuild.sh;
-    nix = config.nix.package;
+    nix = config.nix.package.out;
   };
 
   nixos-generate-config = makeProg {
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 5400588d027..d71837737ab 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -6,7 +6,7 @@ let
 
   cfg = config.nix;
 
-  nix = cfg.package;
+  nix = cfg.package.out;
 
   makeNixBuildUser = nr:
     { name = "nixbld${toString nr}";
diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix
index 8f6881441cf..3e865e3b76a 100644
--- a/nixos/modules/services/networking/nix-serve.nix
+++ b/nixos/modules/services/networking/nix-serve.nix
@@ -50,7 +50,7 @@ in
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
 
-      path = [ config.nix.package pkgs.bzip2.bin ];
+      path = [ config.nix.package.out pkgs.bzip2.bin ];
       environment.NIX_REMOTE = "daemon";
       environment.NIX_SECRET_KEY_FILE = cfg.secretKeyFile;
 
diff --git a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
index 6c201eb8212..69ad2c6d44f 100644
--- a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
+++ b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
@@ -14,7 +14,7 @@ let
 
     inherit (pkgs) python gummiboot;
 
-    nix = config.nix.package;
+    nix = config.nix.package.out;
 
     timeout = if cfg.timeout != null then cfg.timeout else "";
 

From cd27abe7513791280a5a450839ee5879241c0b7b Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Mon, 25 Apr 2016 07:55:34 -0700
Subject: [PATCH 236/712] rebar3: refactor

cleanup up the code quite a bit in the bootstrapper
---
 .../tools/build-managers/rebar3/default.nix   | 12 ----
 .../rebar3/rebar3-nix-bootstrap               | 61 +++++++++----------
 2 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index 6fa5578ed67..d8938e2d468 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -7,68 +7,56 @@ let
 
   bootstrapper = ./rebar3-nix-bootstrap;
 
-  # TODO: all these below probably should go into nixpkgs.erlangModules.sources.*
-  # {erlware_commons,     "0.19.0"},
   erlware_commons = fetchHex {
     pkg = "erlware_commons";
     version = "0.19.0";
     sha256 = "1gfsy9bbhjb94c5ghff2niamn93x2x08lnklh6pp7sfr5i0gkgsv";
   };
-  # {ssl_verify_hostname, "1.0.5"},
   ssl_verify_hostname = fetchHex {
     pkg = "ssl_verify_hostname";
     version = "1.0.5";
     sha256 = "1gzavzqzljywx4l59gvhkjbr1dip4kxzjjz1s4wsn42f2kk13jzj";
   };
-  # {certifi,             "0.4.0"},
   certifi = fetchHex {
     pkg = "certifi";
     version = "0.4.0";
     sha256 = "04bnvsbssdcf6b9h9bfglflds7j0gx6q5igl1xxhx6fnwaz37hhw";
   };
-  # {providers,           "1.6.0"},
   providers = fetchHex {
     pkg = "providers";
     version = "1.6.0";
     sha256 = "0byfa1h57n46jilz4q132j0vk3iqc0v1vip89li38gb1k997cs0g";
   };
-  # {getopt,              "0.8.2"},
   getopt = fetchHex {
     pkg = "getopt";
     version = "0.8.2";
     sha256 = "1xw30h59zbw957cyjd8n50hf9y09jnv9dyry6x3avfwzcyrnsvkk";
   };
-  # {bbmustache,          "1.0.4"},
   bbmustache = fetchHex {
     pkg = "bbmustache";
     version = "1.0.4";
     sha256 = "04lvwm7f78x8bys0js33higswjkyimbygp4n72cxz1kfnryx9c03";
   };
-  # {relx,                "3.17.0"},
   relx = fetchHex {
     pkg = "relx";
     version = "3.17.0";
     sha256 = "1xjybi93m8gj9f9z3lkc7xbg3k5cw56yl78rcz5qfirr0223sby2";
   };
-  # {cf,                  "0.2.1"},
   cf = fetchHex {
     pkg = "cf";
     version = "0.2.1";
     sha256 = "19d0yvg8wwa57cqhn3vqfvw978nafw8j2rvb92s3ryidxjkrmvms";
   };
-  # {cth_readable,        "1.2.2"},
   cth_readable = fetchHex {
     pkg = "cth_readable";
     version = "1.2.2";
     sha256 = "0kb9v4998liwyidpjkhcg1nin6djjzxcx6b313pbjicbp4r58n3p";
   };
-  # {eunit_formatters,    "0.3.1"}
   eunit_formatters = fetchHex {
     pkg = "eunit_formatters";
     version = "0.3.1";
     sha256 = "0cg9dasv60v09q3q4wja76pld0546mhmlpb0khagyylv890hg934";
   };
-  # {rebar3_hex,    "1.12.0"}
   rebar3_hex = fetchHex {
     pkg = "rebar3_hex";
     version = "1.12.0";
diff --git a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap b/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
index d75d69f054d..4784f2224cc 100755
--- a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
+++ b/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
@@ -38,15 +38,14 @@
 main(Args) ->
     {ok, ArgData} = parse_args(Args),
     {ok, RequiredData} = gather_required_data_from_the_environment(ArgData),
-    do(RequiredData).
+    do_the_bootstrap(RequiredData).
 
-%% @doc
-%% This actually runs the command. There are two modes 'register_only'
-%% where the register is created from hex and everything else.
--spec do(#data{}) -> ok.
-do(RequiredData = #data{registry_only = true}) ->
+%% @doc There are two modes 'registery_only' where the register is
+%% created from hex and everything else.
+-spec do_the_bootstrap(#data{}) -> ok.
+do_the_bootstrap(RequiredData = #data{registry_only = true}) ->
     ok = bootstrap_registry(RequiredData);
-do(RequiredData) ->
+do_the_bootstrap(RequiredData) ->
     ok = bootstrap_registry(RequiredData),
     ok = bootstrap_configs(RequiredData),
     ok = bootstrap_plugins(RequiredData),
@@ -55,10 +54,15 @@ do(RequiredData) ->
 %% @doc
 %% Argument parsing is super simple only because we want to keep the
 %% dependencies minimal. For now there can be two entries on the
-%% command line, "register-only" and "compile-ports"
+%% command line, "registery-only"
 -spec parse_args([string()]) -> #data{}.
+parse_args(["registry-only"]) ->
+    {ok, #data{registry_only = true}};
+parse_args([]) ->
+    {ok, #data{registry_only = false}};
 parse_args(Args) ->
-    {ok, #data{registry_only = lists:member("registry-only", Args)}}.
+    io:format("Unexpected command line arguments passed in: ~p~n", [Args]),
+    erlang:halt(120).
 
 -spec bootstrap_configs(#data{}) -> ok.
 bootstrap_configs(RequiredData)->
@@ -76,7 +80,7 @@ bootstrap_plugins(#data{plugins = Plugins}) ->
                             gather_dependency(Path) ++ Acc
                     end, [], Paths),
     lists:foreach(fun (Path) ->
-                          link_app(Path, Target)
+                          ok = link_app(Path, Target)
                   end, CopiableFiles).
 
 -spec bootstrap_libs(#data{}) -> ok.
@@ -89,7 +93,7 @@ bootstrap_libs(#data{erl_libs = ErlLibs}) ->
                             gather_directory_contents(Path) ++ Acc
                     end, [], Paths),
     lists:foreach(fun (Path) ->
-                          link_app(Path, Target)
+                          ok = link_app(Path, Target)
                   end, CopiableFiles).
 
 -spec gather_dependency(string()) -> [{string(), string()}].
@@ -199,21 +203,20 @@ guard_env(Name) ->
 %% include the 'pc' plugin.
 -spec if_compile_ports_add_pc_plugin(#data{}) -> ok.
 if_compile_ports_add_pc_plugin(#data{compile_ports = true}) ->
-    ConfigTerms = update_config(read_rebar_config()),
+    ConfigTerms = add_pc_to_plugins(read_rebar_config()),
     Text = lists:map(fun(Term) -> io_lib:format("~tp.~n", [Term]) end,
                      ConfigTerms),
     file:write_file("rebar.config", Text);
 if_compile_ports_add_pc_plugin(_) ->
     ok.
 
--spec update_config([term()]) -> [term()].
-update_config(Config) ->
-    case lists:keysearch(plugins, 1, Config) of
-        {ok, {plugins, PluginList}} ->
-            lists:keystore(plugins, 1, Config, {plugins, [Config | PluginList]});
-        _ ->
-            [{plugins, [pc]} | Config]
-    end.
+-spec add_pc_to_plugins([term()]) -> [term()].
+add_pc_to_plugins(Config) ->
+    PluginList = case lists:keysearch(plugins, 1, Config) of
+                     {ok, {plugins, ExistingPluginList}} -> ExistingPluginList;
+                     _ -> []
+                 end,
+    lists:keystore(plugins, 1, Config, {plugins, [pc | PluginList]}).
 
 -spec read_rebar_config() -> [term()].
 read_rebar_config() ->
@@ -229,10 +232,13 @@ read_rebar_config() ->
 -spec if_single_app_project_update_app_src_version(#data{}) -> ok.
 if_single_app_project_update_app_src_version(#data{name = Name,
                                                    version = Version}) ->
-    case app_src_exists(Name) of
-        {true, SrcFile} ->
+    SrcFile = filename:join("src",
+                            lists:concat([Name, ".app.src"])),
+
+    case filelib:is_file(SrcFile) of
+        true ->
             update_app_src_with_version(SrcFile, Version);
-        {false, _} ->
+        false ->
             ok
     end.
 
@@ -240,14 +246,7 @@ if_single_app_project_update_app_src_version(#data{name = Name,
 update_app_src_with_version(SrcFile, Version) ->
     {ok, [{application, Name, Details}]} = file:consult(SrcFile),
     NewDetails = lists:keyreplace(vsn, 1, Details, {vsn, Version}),
-    file:write_file(SrcFile, io_lib:fwrite("~p.\n", [{application, Name, NewDetails}])).
-
--spec app_src_exists(string()) -> boolean().
-app_src_exists(Name) ->
-    FileName = filename:join("src",
-                             lists:concat([Name, ".app.src"])),
-    {filelib:is_file(FileName), FileName}.
-
+    ok = file:write_file(SrcFile, io_lib:fwrite("~p.\n", [{application, Name, NewDetails}])).
 
 %% @doc
 %% Write the result of the format string out to stderr.

From 983f300d74852b5a4a810085a508d413d9c56a1f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 25 Apr 2016 17:46:06 +0200
Subject: [PATCH 237/712] pythonPackages.numpy: don't propagate blas

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

diff --git a/pkgs/development/python-modules/numpy.nix b/pkgs/development/python-modules/numpy.nix
index 141c8b14fa6..0276d9ede3d 100644
--- a/pkgs/development/python-modules/numpy.nix
+++ b/pkgs/development/python-modules/numpy.nix
@@ -9,8 +9,8 @@ in buildPythonPackage (args // rec {
   name = "numpy-${version}";
 
   disabled = isPyPy;
-  buildInputs = args.buildInputs or [ gfortran nose ];
-  propagatedBuildInputs = args.propagatedBuildInputs or [ passthru.blas ];
+  buildInputs = args.buildInputs or [ gfortran nose passthru.blas ];
+  propagatedBuildInputs = args.propagatedBuildInputs or [ ];
 
   preConfigure = ''
     sed -i 's/-faltivec//' numpy/distutils/system_info.py

From d05783a8d7cc07760542f7f2fc30be576cb29ce6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 25 Apr 2016 17:46:15 +0200
Subject: [PATCH 238/712] pythonPackages.scipy: don't propagate blas

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

diff --git a/pkgs/development/python-modules/scipy.nix b/pkgs/development/python-modules/scipy.nix
index ae312cd32d5..b31f539ebdd 100644
--- a/pkgs/development/python-modules/scipy.nix
+++ b/pkgs/development/python-modules/scipy.nix
@@ -9,8 +9,8 @@ in buildPythonPackage (args // rec {
 
   name = "scipy-${version}";
 
-  buildInputs = (args.buildInputs or [ gfortran nose ]);
-  propagatedBuildInputs = (args.propagatedBuildInputs or [ passthru.blas numpy]);
+  buildInputs = (args.buildInputs or [ gfortran nose passthru.blas ]);
+  propagatedBuildInputs = (args.propagatedBuildInputs or [ numpy]);
 
   preConfigure = ''
     sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py

From 291ec17c5872a1d197581c40f8b71ca6921a40fe Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 25 Apr 2016 17:47:05 +0200
Subject: [PATCH 239/712] pythonPackages.qutip: use numpy.blas

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 429acdd6347..62aafc3f652 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18717,7 +18717,7 @@ in modules // {
     propagatedBuildInputs = with self; [ numpy scipy matplotlib pyqt4
       cython ];
 
-    buildInputs = [ pkgs.gcc pkgs.qt4 pkgs.blas self.nose ];
+    buildInputs = [ pkgs.gcc pkgs.qt4 numpy.blas self.nose ];
 
     meta = {
       description = "QuTiP - Quantum Toolbox in Python";

From 18396e8273cad2870a135a8a8c58a04cbb56deb1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 25 Apr 2016 17:47:25 +0200
Subject: [PATCH 240/712] pythonPackages.scikitlearn: don't propagate blas

---
 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 62aafc3f652..d3aa9ee9b17 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18717,7 +18717,7 @@ in modules // {
     propagatedBuildInputs = with self; [ numpy scipy matplotlib pyqt4
       cython ];
 
-    buildInputs = [ pkgs.gcc pkgs.qt4 numpy.blas self.nose ];
+    buildInputs = [ pkgs.gcc pkgs.qt4 self.numpy.blas self.nose ];
 
     meta = {
       description = "QuTiP - Quantum Toolbox in Python";
@@ -19629,8 +19629,8 @@ in modules // {
       sha256 = "9f4cf58e57d81783289fc503caaed1f210bab49b7a6f680bf3c04b1e0a96e5f0";
     };
 
-    buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ];
-    propagatedBuildInputs = with self; [ numpy scipy numpy.blas ];
+    buildInputs = with self; [ numpy.blas nose pillow pkgs.gfortran pkgs.glibcLocales ];
+    propagatedBuildInputs = with self; [ numpy scipy ];
 
     LC_ALL="en_US.UTF-8";
 

From 564978837139e4f86bccfa0115715c0e70717650 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 25 Apr 2016 17:58:15 +0200
Subject: [PATCH 241/712] pythonPackages.scipy_0_16: use correct numpy

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d3aa9ee9b17..20184bfd8d4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19586,7 +19586,7 @@ in modules // {
       url = "https://pypi.python.org/packages/source/s/scipy/scipy-${version}.tar.gz";
       sha256 = "ecd1efbb1c038accb0516151d1e6679809c6010288765eb5da6051550bf52260";
     };
-    numpy = self.numpy_1_10;
+    numpy = self.numpy;
   };
 
   scipy_0_17 = self.buildScipyPackage rec {

From 8262d7bdd480367b9afd1b8dede4c4635a192a3f Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Mon, 25 Apr 2016 12:04:57 -0400
Subject: [PATCH 242/712] crashplan: always overwrite binaries in /var/lib/ to
 ensure that updates are applied fully

---
 nixos/modules/services/backup/crashplan.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/backup/crashplan.nix b/nixos/modules/services/backup/crashplan.nix
index 94aa3b17b66..a69526f968b 100644
--- a/nixos/modules/services/backup/crashplan.nix
+++ b/nixos/modules/services/backup/crashplan.nix
@@ -50,11 +50,8 @@ with lib;
         ensureDir ${crashplan.vardir}/log 777
         cp -avn ${crashplan}/conf.template/* ${crashplan.vardir}/conf
         for x in app.asar bin EULA.txt install.vars lang lib libjniwrap64.so libjniwrap.so libjtux64.so libjtux.so libmd564.so libmd5.so share skin upgrade; do
-          if [ -e ${crashplan.vardir}/$x ]; then
-            true;
-          else
-            ln -s ${crashplan}/$x ${crashplan.vardir}/$x;
-          fi;
+          rm -f ${crashplan.vardir}/$x;
+          ln -sf ${crashplan}/$x ${crashplan.vardir}/$x;
         done
       '';
 

From 2177bf30740933ae44644643a24e6fde506ee4d0 Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Mon, 25 Apr 2016 09:07:32 -0700
Subject: [PATCH 243/712] fossil: add libiconv on darwin

---
 pkgs/applications/version-management/fossil/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 19c2c1f2ef1..58e3a5cc34f 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, zlib, openssl, tcl, readline, sqlite, withJson ? true}:
+{stdenv, libiconv, fetchurl, zlib, openssl, tcl, readline, sqlite, withJson ? true}:
 
 stdenv.mkDerivation rec {
   name = "fossil-1.33";
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "0gkzd9nj3xyznh9x8whv0phdnj11l5c8164rc3l0jvs5i61c95b2";
   };
 
-  buildInputs = [ zlib openssl readline sqlite ];
+  buildInputs = [ zlib openssl readline sqlite ]
+             ++ stdenv.lib.optional stdenv.isDarwin libiconv;
   nativeBuildInputs = [ tcl ];
 
   doCheck = true;

From 7e92ae903e10cec92f33e288050cc9b5d004fc16 Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Mon, 25 Apr 2016 09:13:06 -0700
Subject: [PATCH 244/712] fish: only use kbd on linux

---
 pkgs/shells/fish/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 5bb7100a620..8916cca0f04 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
     sed -e "s|expr|${coreutils}/bin/expr|" \
   '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
         -e "s|if which unicode_start|if true|" \
+    '' + stdenv.lib.optionalString stdenv.isLinux ''
         -e "s|unicode_start|${kbd}/bin/unicode_start|" \
   '' + ''
         -i "$out/etc/fish/config.fish"

From 344f1c19aa9d606a327edbd07d1bd220b1afcc28 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Mon, 25 Apr 2016 11:41:28 -0400
Subject: [PATCH 245/712] crashplan: 4.6.0-r2 -> 4.6.0-r3

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

diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix
index b9566e9c535..ef2a19c8451 100644
--- a/pkgs/applications/backup/crashplan/default.nix
+++ b/pkgs/applications/backup/crashplan/default.nix
@@ -2,14 +2,14 @@
 
 let
   version = "4.6.0";
-  rev = "2"; #tracks unversioned changes that occur on download.code42.com from time to time
+  rev = "3"; #tracks unversioned changes that occur on download.code42.com from time to time
 
 in stdenv.mkDerivation rec {
   name = "crashplan-${version}-r${rev}";
 
   crashPlanArchive = fetchurl {
     url = "https://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz";
-    sha256 = "13rmmdj048r8k4v7ig4i6pnvwyzc1vasfgksf070bx6ksklgbq47";
+    sha256 = "0crrx8gy132xcpjfah08qhsl8g2arx14p5mpypcihl9j6mldi6mz";
   };
 
   srcs = [ crashPlanArchive ];

From b48e1dd601adebddbdcbf31efff454343c5f07ff Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Mon, 25 Apr 2016 11:14:22 -0500
Subject: [PATCH 246/712] lsof: stop configure script from searching /usr paths

---
 pkgs/development/tools/misc/lsof/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index 2e93c71d801..ab43184a725 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -16,13 +16,15 @@ stdenv.mkDerivation rec {
   };
 
   unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); ";
-  
+
   preBuild = "sed -i Makefile -e 's/^CFGF=/&	-DHASIPv6=1/;';";
-  
-  configurePhase = if stdenv.isDarwin
-    then "./Configure -n darwin;"
-    else "./Configure -n linux;";
-  
+
+  configurePhase = ''
+    # Stop build scripts from searching global include paths
+    export LSOF_INCLUDE=/$(md5sum <(echo $name) | awk '{print $1}')
+    ./Configure -n ${if stdenv.isDarwin then "darwin" else "linux"}
+  '';
+
   installPhase = ''
     mkdir -p $out/bin $out/man/man8
     cp lsof.8 $out/man/man8/

From e16851b900cb62528427186e80f173c1954659b6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 7 Apr 2016 17:30:41 +0200
Subject: [PATCH 247/712] networking module: Add some missing `literalExample`

---
 nixos/modules/tasks/network-interfaces.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 0528012adfd..c52bd904cae 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -523,7 +523,7 @@ in
 
     networking.bonds = mkOption {
       default = { };
-      example = {
+      example = literalExample {
         bond0 = {
           interfaces = [ "eth0" "wlan0" ];
           miimon = 100;
@@ -598,7 +598,7 @@ in
     networking.macvlans = mkOption {
       type = types.attrsOf types.optionSet;
       default = { };
-      example = {
+      example = literalExample {
         wan = {
           interface = "enp2s0";
           mode = "vepa";
@@ -629,7 +629,7 @@ in
     networking.sits = mkOption {
       type = types.attrsOf types.optionSet;
       default = { };
-      example = {
+      example = literalExample {
         hurricane = {
           remote = "10.0.0.1";
           local = "10.0.0.22";
@@ -688,7 +688,7 @@ in
 
     networking.vlans = mkOption {
       default = { };
-      example = {
+      example = literalExample {
         vlan0 = {
           id = 3;
           interface = "enp3s0";
@@ -727,7 +727,7 @@ in
 
     networking.wlanInterfaces = mkOption {
       default = { };
-      example = {
+      example = literalExample {
         "wlan-station0" = {
             device = "wlp6s0";
         };

From a8f1a965402469476e849d86cca1badaa3eb1f9f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 12 Apr 2016 20:32:25 +0200
Subject: [PATCH 248/712] libeatmydata: 82 -> 105

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

diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix
index 2fdd1658f19..ac75e6c8baa 100644
--- a/pkgs/development/libraries/libeatmydata/default.nix
+++ b/pkgs/development/libraries/libeatmydata/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "libeatmydata-82";
+  name = "libeatmydata-105";
   
   src = fetchurl {
     url = "http://www.flamingspork.com/projects/libeatmydata/${name}.tar.gz";
-    sha256 = "0aavq71bf0yxdgyf8gvyzq086shszzwpbsz5rqkjg4cz0rc5yrqb";
+    sha256 = "1pd8sc73cgc41ldsvq6g8ics1m5k8gdcb91as9yg8z5jnrld1lmx";
   };
 
   buildInputs = [ makeWrapper ];

From 3dc10d62deebfe5ef3733fa4d2f0790768d88493 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 25 Apr 2016 18:19:13 +0200
Subject: [PATCH 249/712] Revert "pythonPackages.scikitlearn: don't propagate
 blas"

This reverts commit 18396e8273cad2870a135a8a8c58a04cbb56deb1.
---
 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 23aa0c8d3ce..0564fc9870a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18718,7 +18718,7 @@ in modules // {
     propagatedBuildInputs = with self; [ numpy scipy matplotlib pyqt4
       cython ];
 
-    buildInputs = [ pkgs.gcc pkgs.qt4 self.numpy.blas self.nose ];
+    buildInputs = [ pkgs.gcc pkgs.qt4 numpy.blas self.nose ];
 
     meta = {
       description = "QuTiP - Quantum Toolbox in Python";
@@ -19630,8 +19630,8 @@ in modules // {
       sha256 = "9f4cf58e57d81783289fc503caaed1f210bab49b7a6f680bf3c04b1e0a96e5f0";
     };
 
-    buildInputs = with self; [ numpy.blas nose pillow pkgs.gfortran pkgs.glibcLocales ];
-    propagatedBuildInputs = with self; [ numpy scipy ];
+    buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ];
+    propagatedBuildInputs = with self; [ numpy scipy numpy.blas ];
 
     LC_ALL="en_US.UTF-8";
 

From 164ef75dcc1d42a22800df64cb42e8fa3b95e793 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 25 Apr 2016 18:19:37 +0200
Subject: [PATCH 250/712] Revert "pythonPackages.qutip: use numpy.blas"

This reverts commit 291ec17c5872a1d197581c40f8b71ca6921a40fe.
---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0564fc9870a..846e07c9ac4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18718,7 +18718,7 @@ in modules // {
     propagatedBuildInputs = with self; [ numpy scipy matplotlib pyqt4
       cython ];
 
-    buildInputs = [ pkgs.gcc pkgs.qt4 numpy.blas self.nose ];
+    buildInputs = [ pkgs.gcc pkgs.qt4 pkgs.blas self.nose ];
 
     meta = {
       description = "QuTiP - Quantum Toolbox in Python";

From 443ac8970d61f2140e13a70cbe005adcfe386650 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 25 Apr 2016 18:19:50 +0200
Subject: [PATCH 251/712] Revert "pythonPackages.scipy: don't propagate blas"

This reverts commit d05783a8d7cc07760542f7f2fc30be576cb29ce6.
---
 pkgs/development/python-modules/scipy.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scipy.nix b/pkgs/development/python-modules/scipy.nix
index b31f539ebdd..ae312cd32d5 100644
--- a/pkgs/development/python-modules/scipy.nix
+++ b/pkgs/development/python-modules/scipy.nix
@@ -9,8 +9,8 @@ in buildPythonPackage (args // rec {
 
   name = "scipy-${version}";
 
-  buildInputs = (args.buildInputs or [ gfortran nose passthru.blas ]);
-  propagatedBuildInputs = (args.propagatedBuildInputs or [ numpy]);
+  buildInputs = (args.buildInputs or [ gfortran nose ]);
+  propagatedBuildInputs = (args.propagatedBuildInputs or [ passthru.blas numpy]);
 
   preConfigure = ''
     sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py

From f2f7ec3f973badf953d53c1e91146003d1e06cb6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 25 Apr 2016 18:20:01 +0200
Subject: [PATCH 252/712] Revert "pythonPackages.numpy: don't propagate blas"

This reverts commit 983f300d74852b5a4a810085a508d413d9c56a1f.
---
 pkgs/development/python-modules/numpy.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/numpy.nix b/pkgs/development/python-modules/numpy.nix
index 0276d9ede3d..141c8b14fa6 100644
--- a/pkgs/development/python-modules/numpy.nix
+++ b/pkgs/development/python-modules/numpy.nix
@@ -9,8 +9,8 @@ in buildPythonPackage (args // rec {
   name = "numpy-${version}";
 
   disabled = isPyPy;
-  buildInputs = args.buildInputs or [ gfortran nose passthru.blas ];
-  propagatedBuildInputs = args.propagatedBuildInputs or [ ];
+  buildInputs = args.buildInputs or [ gfortran nose ];
+  propagatedBuildInputs = args.propagatedBuildInputs or [ passthru.blas ];
 
   preConfigure = ''
     sed -i 's/-faltivec//' numpy/distutils/system_info.py

From a4ad51f0c1e676975b87d28e3dfc50be319c72b5 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Mon, 25 Apr 2016 12:33:31 -0400
Subject: [PATCH 253/712] switch from pkgs.blas to numpy.blas

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d10a64c588d..3bc71adfb6c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20105,7 +20105,7 @@ in modules // {
     # the fix for which hasn't been merged yet.
 
     # keep Nose around since running the tests by hand is possible from Python or bash
-    propagatedBuildInputs = [ stdenv pkgs.blas ] ++ (with self; [ nose numpy pydot_ng scipy six ]);
+    propagatedBuildInputs = [ stdenv ] ++ (with self; [ nose numpy numpy.blas pydot_ng scipy six ]);
 
     meta = {
       homepage = http://deeplearning.net/software/theano/;

From 0ec4627d8a407d03233c86c285ca0cf2d331ed18 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Mon, 25 Apr 2016 18:38:23 +0200
Subject: [PATCH 254/712] asciinema: 1.1.1 -> 1.2.0

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 00d5f44128a..17edad071fe 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -244,10 +244,10 @@ let
   };
 
   asciinema = buildFromGitHub {
-    rev = "v1.1.1";
+    rev = "v1.2.0";
     owner = "asciinema";
     repo = "asciinema";
-    sha256 = "0k48k8815k433s25lh8my2swl89kczp0m2gbqzjlpy1xwmk06nxc";
+    sha256 = "0wvrq92ackhfycfs1fircs8al3ji69igqqrc55ic29wbpnvz355x";
   };
 
   asmfmt = buildFromGitHub {

From 88a1b69090106c24d06e23e46ff3986fe9a81fd5 Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Mon, 25 Apr 2016 12:03:23 -0500
Subject: [PATCH 255/712] ordereddict: do not restrict to python2.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 9e3605827d3..ee06f17a163 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13659,8 +13659,8 @@ in modules // {
   # });
 
   ordereddict = buildPythonPackage rec {
-    name = "ordereddict-1.1";
-    disabled = !isPy26;
+    name = "ordereddict-${version}";
+    version = "1.1";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/o/ordereddict/${name}.tar.gz";

From 618c75de7b15d159f0414ce2b940c30ad13efa6c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 25 Apr 2016 20:36:03 +0300
Subject: [PATCH 256/712] tdesktop: fix build

---
 .../networking/instant-messengers/telegram/tdesktop/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index e734ddc5700..41a3c690f7b 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     breakpad ffmpeg openalSoft openssl zlib libexif lzma libopus
     gtk2 glib libappindicator-gtk2 libunity cairo pango gdk_pixbuf atk
-    dee libdbusmenu-glib libva qmakeHook
+    dee libdbusmenu-glib libva qtbase qmakeHook
     # Qt dependencies
     libxcb xcbutilwm xcbutilimage xcbutilkeysyms libxkbcommon
     libpng libjpeg freetype harfbuzz pcre16 xproto libX11

From 74a47fcd4079f12c15550dff51684d9e49610298 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 25 Apr 2016 20:07:10 +0200
Subject: [PATCH 257/712] perlPackages.EncodeEUCJPASCII: fix build

Fixes #14986.
---
 pkgs/top-level/perl-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index aed9a82d85b..89706545031 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4409,6 +4409,7 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/N/NE/NEZUMI/Encode-EUCJPASCII-0.03.tar.gz;
       sha256 = "f998d34d55fd9c82cf910786a0448d1edfa60bf68e2c2306724ca67c629de861";
     };
+    outputs = [ "out" ];
     meta = {
       description = "EucJP-ascii - An eucJP-open mapping";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From 79a215e78d9c3dec421a7a6a088431b2153f3532 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Mon, 25 Apr 2016 20:18:26 +0200
Subject: [PATCH 258/712] dir2opus: 0.12.1 -> 0.12.2

---
 pkgs/tools/audio/dir2opus/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/audio/dir2opus/default.nix b/pkgs/tools/audio/dir2opus/default.nix
index 4875ebf504b..98bcfb3048f 100644
--- a/pkgs/tools/audio/dir2opus/default.nix
+++ b/pkgs/tools/audio/dir2opus/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, python, mutagen, wrapPython, opusTools }:
+{ stdenv, fetchurl, python, mutagen, wrapPython, opusTools, mpg123 }:
 
-let version = "0.12.1"; in
+let version = "0.12.2"; in
 stdenv.mkDerivation rec {
   name = "dir2opus-${version}";
 
   pythonPath = [ mutagen ];
   buildInputs = [ wrapPython ];
-  propagatedBuildInputs = [ opusTools ];
+  propagatedBuildInputs = [ opusTools mpg123 ];
 
   src = fetchurl {
     url = "https://github.com/ehmry/dir2opus/archive/${version}.tar.gz";
     name = "${name}.tar.gz";
-    sha256 = "1d6x3qfcj5lfmc8gzna1vrr7fl31i86ha8l4nz5987rx57fgwf0q";
+    sha256 = "0bl8fa9zhccihnj1v3lpz5jb737frf9za06xb7j5rsjws6xky80d";
   };
 
   postPatch = "sed -i -e 's|#!/usr/bin/python|#!${python}/bin/python|' dir2opus";
@@ -30,4 +30,4 @@ stdenv.mkDerivation rec {
       maintainers = [ maintainers.ehmry ];
       license = licenses.gpl2;
     };
-}
\ No newline at end of file
+}

From ede605e4f1b651ac61f913638fe69698dd7a33ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 25 Apr 2016 20:37:47 +0200
Subject: [PATCH 259/712] calibre: fix #14938 build

Thanks to a hack and qmake help from @ttuegel.
---
 pkgs/applications/misc/calibre/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index d7ab712dae6..7c6f3cfdffb 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng
-, imagemagick, libjpeg, fontconfig, podofo, qtbase, icu, sqlite
+, imagemagick, libjpeg, fontconfig, podofo, qtbase, qmakeHook, icu, sqlite
 , makeWrapper, unrarSupport ? false, chmlib, pythonPackages, xz, libusb1, libmtp
 , xdg_utils
 }:
@@ -26,7 +26,14 @@ stdenv.mkDerivation rec {
       setup/build_environment.py
   '';
 
-  nativeBuildInputs = [ makeWrapper pkgconfig ];
+  dontUseQmakeConfigure = true;
+  # hack around a build problem
+  preBuild = ''
+    mkdir -p ../tmp.*/lib
+    ln -s '${qtbase.out}/lib/libQt5PlatformSupport.a' ../tmp.*/lib/
+  '';
+
+  nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ];
 
   buildInputs =
     [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg

From 769a33bedd909dd9f482d9cbb957e400fd3bac88 Mon Sep 17 00:00:00 2001
From: Christoph Ruegge <c.ruegge@math.uni-goettingen.de>
Date: Mon, 25 Apr 2016 23:37:18 +0200
Subject: [PATCH 260/712] xsession: make updating DBus environment optional

---
 nixos/modules/services/x11/desktop-managers/gnome3.nix  | 2 ++
 nixos/modules/services/x11/desktop-managers/xfce.nix    | 5 ++++-
 nixos/modules/services/x11/display-managers/default.nix | 2 +-
 nixos/modules/services/x11/xserver.nix                  | 9 +++++++++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index b112fc2422a..16996b9f96c 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -165,6 +165,8 @@ in {
         '';
       };
 
+    services.xserver.updateDbusEnvironment = true;
+
     environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules"
                                                 "${gnome3.glib_networking.out}/lib/gio/modules"
                                                 "${gnome3.gvfs}/lib/gio/modules" ];
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 33b6dd32c19..60934ed5f19 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -42,10 +42,13 @@ in
             # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes.
             export GTK_DATA_PREFIX=${config.system.path}
 
-            exec ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc}
+            ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc} &
+            waitPID=$!
           '';
       };
 
+    services.xserver.updateDbusEnvironment = true;
+
     environment.systemPackages =
       [ pkgs.gtk # To get GTK+'s themes.
         pkgs.hicolor_icon_theme
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index ff78964e553..376f9f4b46b 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -126,7 +126,7 @@ let
         (*) echo "$0: Desktop manager '$desktopManager' not found.";;
       esac
 
-      ${optionalString cfg.startDbusSession ''
+      ${optionalString (cfg.startDbusSession && cfg.updateDbusEnvironment) ''
         ${pkgs.glib}/bin/gdbus call --session \
           --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus \
           --method org.freedesktop.DBus.UpdateActivationEnvironment \
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index dcf9f820f59..9cb9c8de31d 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -233,6 +233,15 @@ in
         '';
       };
 
+      updateDbusEnvironment = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to update the DBus activation environment after launching the
+          desktop manager.
+        '';
+      };
+
       layout = mkOption {
         type = types.str;
         default = "us";

From 088601cb51c5c3126f7051aa54baee2a162231d2 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 25 Apr 2016 17:38:19 -0400
Subject: [PATCH 261/712] root: fix chrooted build, workaround 491f7f017c4dd
 (cmake: set LIBDIR and INCLUDEDIR for multiple outputs)

---
 pkgs/applications/science/misc/root/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index 583ba397487..94572301dd2 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -12,8 +12,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cmake pkgconfig python libX11 libXpm libXft libXext zlib lzma ];
 
+  preConfigure = ''
+    patchShebangs build/unix/
+  '';
+
   cmakeFlags = [
     "-Drpath=ON"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
   ]
   ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include";
 

From 8bfff4282fd0e85be45699fc58ee283c1c4f9966 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 25 Apr 2016 23:43:34 +0200
Subject: [PATCH 262/712] fmit: 1.0.8 -> 1.0.13

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

diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index 83367b83e48..d99e2e577eb 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -9,10 +9,10 @@ assert portaudioSupport -> portaudio != null;
 
 stdenv.mkDerivation rec {
   name = "fmit-${version}";
-  version = "1.0.8";
+  version = "1.0.13";
 
   src = fetchFromGitHub {
-    sha256 = "04s7xcgmi5g58lirr48vf203n1jwdxf981x1p6ysbax24qwhs2kd";
+    sha256 = "04cj70q60sqns68nvw4zfy6078x4cc2q1y2y13z3rs5n80jw27by";
     rev = "v${version}";
     repo = "fmit";
     owner = "gillesdegottex";

From d8faa585b04866e53536881155b78ba6054f8bce Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Tue, 4 Aug 2015 04:40:42 -0400
Subject: [PATCH 263/712] dbus-map: init 2015-05-28

---
 pkgs/tools/misc/dbus-map/default.nix | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/tools/misc/dbus-map/default.nix

diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix
new file mode 100644
index 00000000000..4e0790dded6
--- /dev/null
+++ b/pkgs/tools/misc/dbus-map/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, lib, fetchFromGitHub, pkgconfig, glib, procps, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "dbus-map-${version}";
+  version = "2015-05-28";
+  src = fetchFromGitHub {
+    owner = "taviso";
+    repo = "dbusmap";
+    rev = "43703fc5e15743309b67131b5ba457b0d6ea7667";
+    sha256 = "1pjqn6w29ci8hfxkn1aynzfc8nvy3pqv3hixbxwr7qx20g4rwvdc";
+  };
+  buildInputs = [
+    pkgconfig glib procps libxml2
+  ];
+  installPhase = ''
+    mkdir -p $out/bin
+    mv dbus-map $out/bin
+  '';
+  meta = with lib; {
+    description = "Simple utility for enumerating D-Bus endpoints, an nmap for D-Bus";
+    homepage = "https://github.com/taviso/dbusmap";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d278b5d2419..35f3bb523a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16167,6 +16167,8 @@ in
     enableAllFeatures = true;
   });
 
+  dbus-map = callPackage ../tools/misc/dbus-map { };
+
   dosbox = callPackage ../misc/emulators/dosbox { };
 
   dpkg = callPackage ../tools/package-management/dpkg { };

From 3a542c737414d8cc4d8759997983f596fcd6a6a1 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 26 Apr 2016 00:50:10 +0000
Subject: [PATCH 264/712] ostree: v2015.3 -> v2016.5

---
 pkgs/tools/misc/ostree/default.nix | 66 ++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index ff64b65a89b..7d9d5545f40 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -1,32 +1,56 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection
-, libgsystem, xz, e2fsprogs, libsoup, gpgme
+, libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse
+, libcap, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42
 }:
 
-stdenv.mkDerivation {
-  name = "ostree-2015.3";
+let
+  libglnx-src = fetchFromGitHub {
+    owner  = "GNOME";
+    repo   = "libglnx";
+    rev    = "769522753c25537e520adc322fa62e5390272add";
+    sha256 = "0gfc8dl63xpmf73dwb1plj7cymq7z6w6wq5m06yx8jymwhq7x1l8";
+  };
+
+  bsdiff-src = fetchFromGitHub {
+    owner  = "mendsley";
+    repo   = "bsdiff";
+    rev    = "1edf9f656850c0c64dae260960fabd8249ea9c60";
+    sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1";
+  };
+in stdenv.mkDerivation rec {
+  rev = "v2016.5";
+  name = "ostree-${rev}";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner  = "ostreedev";
+    repo   = "ostree";
+    sha256 = "1dfyhzgv94ldjv2l4jxf4xhks2z5ljljqa3k579qskds755n6kvg";
+  };
+
+  nativeBuildInputs = [
+    autoconf automake libtool pkgconfig gtk_doc gobjectIntrospection which yacc
+    libxslt docbook_xsl docbook_xml_dtd_42
+  ];
+
+  buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libcap ];
+
+  prePatch = ''
+    rmdir libglnx bsdiff
+    cp --no-preserve=mode -r ${libglnx-src} libglnx
+    cp --no-preserve=mode -r ${bsdiff-src} bsdiff
+  '';
+
+  preConfigure = ''
+    env NOCONFIGURE=1 ./autogen.sh
+  '';
 
   meta = with stdenv.lib; {
     description = "Git for operating system binaries";
     homepage    = "http://live.gnome.org/OSTree/";
     license     = licenses.lgpl2Plus;
     platforms   = platforms.linux;
+    maintainers = with maintainers; [ copumpkin ];
   };
-
-  src = fetchFromGitHub {
-    owner = "GNOME";
-    repo = "ostree";
-    rev = "v2015.3";
-    sha256 = "1n5q0yxwqx4pqiww3yjmqxl5835kknpw1bnwzbpanmyndnnl88dd";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook pkgconfig gtk_doc gobjectIntrospection
-  ];
-
-  buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme ];
-
-  preAutoreconf = ''
-    mkdir m4
-    gtkdocize
-  '';
 }
+

From cd69c05a5021f8fcf613ed7fb18df5b208c2e915 Mon Sep 17 00:00:00 2001
From: Chris Martin <ch.martin@gmail.com>
Date: Fri, 8 Apr 2016 20:22:09 -0700
Subject: [PATCH 265/712] pythonPackages.closure-linter: init at 2.3.19

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9e3605827d3..270c5c1b4ae 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3266,6 +3266,30 @@ in modules // {
     };
   });
 
+  /* There is a project called "closure-linter" on PyPI that is the
+     same as this, but it does not appear to be owned by Google.
+     So we're pulling from Google's GitHub repo instead. */
+  closure-linter = buildPythonPackage rec {
+    name = "closure-linter-${version}";
+    version = "2.3.19";
+
+    /* This project has no Python 3 support, as noted by
+       https://github.com/google/closure-linter/issues/81 */
+    disabled = isPy3k;
+
+    propagatedBuildInputs = with self; [ gflags ];
+    src = pkgs.fetchgit {
+      url = "https://github.com/google/closure-linter";
+      rev = "5c27529075bb88bdc45e73008f496dec8438d658";
+      sha256 = "076c7q7pr7akfvq5y8lxr1ab81wwps07gw00igdkcxnc5k9dzxwc";
+    };
+    meta = {
+      description = "Checks JavaScript files against Google's style guide.";
+      homepage = "https://developers.google.com/closure/utilities/";
+      license = with licenses; [ asl20 ];
+    };
+  };
+
   cloudpickle = buildPythonPackage rec {
     name = "cloudpickle-${version}";
     version = "0.1.1";

From 4c10d404e7f3d68fb818b6dddc98b162b0d00832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 26 Apr 2016 09:14:39 +0200
Subject: [PATCH 266/712] github PR template: reformulate the sandboxing help

It's been reported that when running through nix daemon,
sandboxing can't be turned on by passing `--option` (silently ignored),
so let's not suggest that way.
https://github.com/NixOS/nixpkgs/issues/14866#issuecomment-214619909
---
 .github/PULL_REQUEST_TEMPLATE.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 324c5f17f7a..d85d9e481f2 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,9 @@
 ###### Things done
 
-- [ ] Tested using sandboxing (`nix-build --option build-use-sandbox true` or [nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS)
+- [ ] Tested using sandboxing
+  ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS,
+    or option `build-use-sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file)
+    on non-NixOS)
 - Built on platform(s)
    - [ ] NixOS
    - [ ] OS X

From 272c87fbdf45cc4a0bf9e58eaeb4e837ed83ecee Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Tue, 26 Apr 2016 10:45:48 +0200
Subject: [PATCH 267/712] antimicro 2.18 -> 2.18.2 The original repo was
 deleted by it's author. I took the one with the most recent releases I could
 find. See:
 https://github.com/Ryochan7/antimicro-packaging/issues/1#issuecomment-205949365

---
 pkgs/tools/misc/antimicro/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix
index 1d7984ac11d..343559bb1e1 100644
--- a/pkgs/tools/misc/antimicro/default.nix
+++ b/pkgs/tools/misc/antimicro/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, cmake, pkgconfig, SDL2, qtbase, qttools, xorg, fetchzip }:
+{ stdenv, cmake, pkgconfig, SDL2, qtbase, qttools, xorg, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "antimicro-${version}";
-  version = "2.18";
+  version = "2.18.2";
 
-  src = fetchzip {
-    url    = "https://github.com/Ryochan7/antimicro/archive/${version}.tar.gz";
-    sha256 = "0kyl4xl2am50v2xscgy2irpcdj78f7flgfhljyjck4ynf8d40vb7";
+  src = fetchFromGitHub {
+    owner = "7185";
+    repo = "antimicro";
+    rev = "${version}";
+    sha256 = "1mqw5idn57yj6c1w8y0byzh0xafcpbhaa6czgljh206abwfixjmk";
   };
 
   buildInputs = [

From 3748cdc791b990ab6df6ee9f66f457f10cd5c949 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 26 Apr 2016 11:15:28 +0200
Subject: [PATCH 268/712] awstats: fix build after closure-size merge

---
 pkgs/tools/system/awstats/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix
index f4a14155d68..2883a364548 100644
--- a/pkgs/tools/system/awstats/default.nix
+++ b/pkgs/tools/system/awstats/default.nix
@@ -14,7 +14,8 @@ perlPackages.buildPerlPackage rec {
       --replace /usr/share/awstats/ "$out/wwwroot/cgi-bin/"
   '';
 
-  outputs = [ "out" "bin" "doc" ];
+  outputs = [ "out" "bin" "doc" ]; # bin just links the user-run executable
+  propagatedBuildOutputs = [ ]; # otherwise out propagates bin -> cycle
 
   buildInputs = with perlPackages; [ ]; # plugins will need some
 

From d7f032e8053a046f03fb8a0f24339e03bc174bd0 Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Tue, 26 Apr 2016 05:24:25 -0500
Subject: [PATCH 269/712] Add new package "lsi" (#12780)

---
 lib/maintainers.nix                |  1 +
 pkgs/top-level/python-packages.nix | 34 +++++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 6dad71ad564..ae38b7acf6a 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -14,6 +14,7 @@
   adev = "Adrien Devresse <adev@adev.name>";
   Adjective-Object = "Maxwell Huang-Hobbs <mhuan13@gmail.com>";
   aespinosa = "Allan Espinosa <allan.espinosa@outlook.com>";
+  adnelson = "Allen Nelson <ithinkican@gmail.com>";
   aflatter = "Alexander Flatter <flatter@fastmail.fm>";
   aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
   afranchuk = "Alex Franchuk <alex.franchuk@gmail.com>";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fe97b927b8d..f00952a4090 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10441,6 +10441,38 @@ in modules // {
     };
   };
 
+  colored = buildPythonPackage rec {
+    name = "colored-${version}";
+    version = "1.1.5";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/c/colored/${name}.tar.gz";
+      sha256 = "1r1vsypk8v7az82d66bidbxlndx1h7xd4m43hpg1a6hsjr30wrm3";
+    };
+  };
+
+
+  lsi = buildPythonPackage rec {
+    name = "lsi-${version}";
+    version = "0.2.2";
+    disabled = isPy3k;
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/l/lsi/${name}.tar.gz";
+      sha256 = "0429iilb06yhsmvj3xp6wyhfh1rp4ndxlhwrm80r97z0w7plrk94";
+    };
+    propagatedBuildInputs = [
+      self.colored
+      self.boto
+      pkgs.openssh
+      pkgs.which
+    ];
+    meta = {
+      description = "CLI for querying and SSHing onto AWS EC2 instances";
+      homepage = https://github.com/NarrativeScience/lsi;
+      maintainers = [maintainers.adnelson];
+      license = licenses.mit;
+    };
+  };
+
   httpretty = buildPythonPackage rec {
     name = "httpretty-${version}";
     version = "0.8.6";
@@ -20118,7 +20150,7 @@ in modules // {
     disabled = isPyPy || isPy26 || isPy27;
 
     checkPhase = ''
-    ${python.interpreter} test/*.py
+    ${python.interpreter} test/*.py                                         #*/
     '';
     meta = {
       description = "Simple and extensible IRC bot";

From ae8a3a14f03cda32340dd55905b4d8c1b18b0446 Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <phile314@users.noreply.github.com>
Date: Tue, 26 Apr 2016 12:49:10 +0200
Subject: [PATCH 270/712] elasticsearch: 2.2.0 -> 2.3.1 (#14993)

---
 pkgs/servers/search/elasticsearch/2.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix
index a37703ae7fd..33a05267395 100644
--- a/pkgs/servers/search/elasticsearch/2.x.nix
+++ b/pkgs/servers/search/elasticsearch/2.x.nix
@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "2.2.0";
+  version = "2.3.1";
   name = "elasticsearch-${version}";
 
   src = fetchurl {
     url = "https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${version}/${name}.tar.gz";
-    sha256 = "0c2d0mpcr8lpvifvgp2pfj7avdi7fa8a5vib0gqdap7mw60wqw7d";
+    sha256 = "1fqf24bv4jfxai507jh91zm94dp1j8kmygljvpy7414f0drjw2gh";
   };
 
   patches = [ ./es-home-2.x.patch ];

From dfe608c8a2ecfdf0ab2838a967440207250a0b95 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 26 Apr 2016 15:10:42 +0300
Subject: [PATCH 271/712] symlinkJoin: accept set as an argument with
 additional options

---
 nixos/modules/services/logging/logcheck.nix |  5 ++++-
 nixos/modules/services/mail/dovecot.nix     |  6 ++++--
 pkgs/build-support/trivial-builders.nix     | 14 +++++++++++---
 pkgs/desktops/kde-5/plasma-5.5/default.nix  |  6 ++++--
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix
index 6069262b470..3a85fa60fe7 100644
--- a/nixos/modules/services/logging/logcheck.nix
+++ b/nixos/modules/services/logging/logcheck.nix
@@ -11,7 +11,10 @@ let
                    rm $out/logcheck.*
                  '';
 
-  rulesDir = pkgs.symlinkJoin "logcheck-rules-dir" ([ defaultRules ] ++ cfg.extraRulesDirs);
+  rulesDir = pkgs.symlinkJoin
+    { name = "logcheck-rules-dir";
+      paths = ([ defaultRules ] ++ cfg.extraRulesDirs);
+    };
 
   configFile = pkgs.writeText "logcheck.conf" cfg.config;
 
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 127c3da69d1..47e374d8edc 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -63,8 +63,10 @@ let
     cfg.extraConfig
   ];
 
-  modulesDir = pkgs.symlinkJoin "dovecot-modules"
-    (map (pkg: "${pkg}/lib/dovecot") ([ dovecotPkg ] ++ map (module: module.override { dovecot = dovecotPkg; }) cfg.modules));
+  modulesDir = pkgs.symlinkJoin {
+    name = "dovecot-modules";
+    paths = map (pkg: "${pkg}/lib/dovecot") ([ dovecotPkg ] ++ map (module: module.override { dovecot = dovecotPkg; }) cfg.modules);
+  };
 
 in
 {
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index fef91e1d89d..b0040cf1817 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -47,16 +47,24 @@ rec {
 
 
   # Create a forest of symlinks to the files in `paths'.
-  symlinkJoin = name: paths:
+  symlinkJoin =
+    { name
+    , paths
+    , preferLocalBuild ? true
+    , allowSubstitutes ? false
+    , postBuild ? ""
+    , buildInputs ? []
+    , meta ? {}
+    }:
     runCommand name
-      { inherit paths;
-        preferLocalBuild = true; allowSubstitutes = false;
+      { inherit paths preferLocalBuild allowSubstitutes buildInputs meta;
       }
       ''
         mkdir -p $out
         for i in $paths; do
           ${lndir}/bin/lndir $i $out
         done
+        ${postBuild}
       '';
 
 
diff --git a/pkgs/desktops/kde-5/plasma-5.5/default.nix b/pkgs/desktops/kde-5/plasma-5.5/default.nix
index a4f5c7c2320..3921f93a41d 100644
--- a/pkgs/desktops/kde-5/plasma-5.5/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/default.nix
@@ -51,8 +51,10 @@ let
       let
         version = (builtins.parseDrvName breeze-qt5.name).version;
       in
-        symlinkJoin "breeze-${version}"
-        (map (pkg: pkg.out or pkg) [ breeze-gtk breeze-qt4 breeze-qt5 ]);
+        symlinkJoin {
+          name = "breeze-${version}";
+          paths = map (pkg: pkg.out or pkg) [ breeze-gtk breeze-qt4 breeze-qt5 ];
+        };
     kde-cli-tools = callPackage ./kde-cli-tools.nix {};
     kde-gtk-config = callPackage ./kde-gtk-config {};
     kdecoration = callPackage ./kdecoration.nix {};

From 5690c6ca071e388e1ff9f9981a6def0a45349be0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 26 Apr 2016 15:26:15 +0300
Subject: [PATCH 272/712] deadbeef-with-plugins: use symlinkJoin

---
 pkgs/applications/audio/deadbeef/wrapper.nix | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/audio/deadbeef/wrapper.nix b/pkgs/applications/audio/deadbeef/wrapper.nix
index b612f195af3..5b14302204e 100644
--- a/pkgs/applications/audio/deadbeef/wrapper.nix
+++ b/pkgs/applications/audio/deadbeef/wrapper.nix
@@ -1,22 +1,14 @@
-{ stdenv, buildEnv, deadbeef, makeWrapper, plugins }:
+{ stdenv, symlinkJoin, deadbeef, makeWrapper, plugins }:
 
-let
-drv = buildEnv {
-  name = "deadbeef-with-plugins-" + (builtins.parseDrvName deadbeef.name).version;
+symlinkJoin {
+  name = "deadbeef-with-plugins-${deadbeef.version}";
 
   paths = [ deadbeef ] ++ plugins;
 
+  buildInputs = [ makeWrapper ];
+
   postBuild = ''
-    # TODO: This could be avoided if buildEnv could be forced to create all directories
-    if [ -L $out/bin ]; then
-      rm $out/bin
-      mkdir $out/bin
-      for i in ${deadbeef}/bin/*; do
-        ln -s $i $out/bin
-      done
-    fi
     wrapProgram $out/bin/deadbeef \
       --set DEADBEEF_PLUGIN_DIR "$out/lib/deadbeef"
   '';
-  };
-in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })
+}

From 41b6a178260ad1fe627c0a9faf795920b4dd68dc Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 26 Apr 2016 15:26:23 +0300
Subject: [PATCH 273/712] puredata-with-plugins: use symlinkJoin

---
 pkgs/applications/audio/puredata/wrapper.nix | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/audio/puredata/wrapper.nix b/pkgs/applications/audio/puredata/wrapper.nix
index 0a30037b226..9c0a48db51c 100644
--- a/pkgs/applications/audio/puredata/wrapper.nix
+++ b/pkgs/applications/audio/puredata/wrapper.nix
@@ -1,23 +1,16 @@
-{ stdenv, buildEnv, puredata, makeWrapper, plugins }:
+{ stdenv, symlinkJoin, puredata, makeWrapper, plugins }:
 
 let
 puredataFlags = map (x: "-path ${x}/") plugins;
-drv = buildEnv {
-  name = "puredata-with-plugins-" + (builtins.parseDrvName puredata.name).version;
+in symlinkJoin {
+  name = "puredata-with-plugins-${puredata.version}";
 
   paths = [ puredata ] ++ plugins;
 
+  buildInputs = [ makeWrapper ];
+
   postBuild = ''
-    # TODO: This could be avoided if buildEnv could be forced to create all directories
-    if [ -L $out/bin ]; then
-      rm $out/bin
-      mkdir $out/bin
-      for i in ${puredata}/bin/*; do
-        ln -s $i $out/bin
-      done
-    fi
     wrapProgram $out/bin/pd \
       --add-flags "${toString puredataFlags}"
   '';
-  };
-in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })
+}

From d04dafd64eaaff5b55ba277662a7ec376cc2f10f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 26 Apr 2016 15:26:45 +0300
Subject: [PATCH 274/712] gimp: add version to derivation, use symlinkJoin for
 a wrapper

---
 pkgs/applications/graphics/gimp/2.8.nix     |  3 ++-
 pkgs/applications/graphics/gimp/wrapper.nix | 19 ++++++-------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index b0983865692..5943cb9cdac 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -4,7 +4,8 @@
 , python, pygtk, libart_lgpl, libexif, gettext, xorg, wrapPython }:
 
 stdenv.mkDerivation rec {
-  name = "gimp-2.8.16";
+  name = "gimp-${version}";
+  version = "2.8.16";
 
   # This declarations for `gimp-with-plugins` wrapper,
   # (used for determining $out/lib/gimp/${majorVersion}/ paths)
diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix
index 53067dc39c9..7455a69dde9 100644
--- a/pkgs/applications/graphics/gimp/wrapper.nix
+++ b/pkgs/applications/graphics/gimp/wrapper.nix
@@ -1,24 +1,18 @@
-{ stdenv, lib, buildEnv, gimp, makeWrapper, gimpPlugins, plugins ? null}:
+{ stdenv, lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, plugins ? null}:
 
 let
 allPlugins = lib.filter (pkg: builtins.isAttrs pkg && pkg.type == "derivation") (lib.attrValues gimpPlugins);
 selectedPlugins = if plugins == null then allPlugins else plugins;
 extraArgs = map (x: x.wrapArgs or "") selectedPlugins;
 
-drv = buildEnv {
-  name = "gimp-with-plugins-" + (builtins.parseDrvName gimp.name).version;
+in symlinkJoin {
+  name = "gimp-with-plugins-${gimp.version}";
 
   paths = [ gimp ] ++ selectedPlugins;
 
+  buildInputs = [ makeWrapper ];
+
   postBuild = ''
-    # TODO: This could be avoided if buildEnv could be forced to create all directories
-    if [ -L $out/bin ]; then
-      rm $out/bin
-      mkdir $out/bin
-      for i in ${gimp}/bin/*; do
-        ln -s $i $out/bin
-      done
-    fi
     for each in gimp-2.8 gimp-console-2.8; do
       wrapProgram $out/bin/$each \
         --set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \
@@ -29,5 +23,4 @@ drv = buildEnv {
       ln -sf "$each-2.8" $out/bin/$each
     done
   '';
-  };
-in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })
+}

From d40e636bdc27341ca8dc72b0dd6763126930138c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 26 Apr 2016 15:26:55 +0300
Subject: [PATCH 275/712] k3b: use symlinkJoin

---
 pkgs/applications/misc/k3b/wrapper.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/k3b/wrapper.nix b/pkgs/applications/misc/k3b/wrapper.nix
index d5c98a2affa..486d3fb7ddf 100644
--- a/pkgs/applications/misc/k3b/wrapper.nix
+++ b/pkgs/applications/misc/k3b/wrapper.nix
@@ -1,22 +1,14 @@
-{ lib, buildEnv, k3b-original, cdrtools, makeWrapper }:
+{ lib, symlinkJoin, k3b-original, cdrtools, makeWrapper }:
 
 let
   binPath = lib.makeBinPath [ cdrtools ];
-in buildEnv {
+in symlinkJoin {
   name = "k3b-${k3b-original.version}";
 
   paths = [ k3b-original ];
   buildInputs = [ makeWrapper ];
 
   postBuild = ''
-    # TODO: This could be avoided if buildEnv could be forced to create all directories
-    if [ -L $out/bin ]; then
-      rm $out/bin
-      mkdir $out/bin
-      for i in ${k3b-original}/bin/*; do
-        ln -s $i $out/bin
-      done
-    fi
     wrapProgram $out/bin/k3b \
       --prefix PATH ':' ${binPath}
   '';

From c1e9ea6c86343541978593fe1af068d9d62d4e2a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 26 Apr 2016 15:27:05 +0300
Subject: [PATCH 276/712] rxvt_unicode-with-plugins: use symlinkJoin

---
 .../misc/rxvt_unicode/wrapper.nix             | 33 ++++++++-----------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/misc/rxvt_unicode/wrapper.nix b/pkgs/applications/misc/rxvt_unicode/wrapper.nix
index 2f68e4ec5f1..c9b0823fb51 100644
--- a/pkgs/applications/misc/rxvt_unicode/wrapper.nix
+++ b/pkgs/applications/misc/rxvt_unicode/wrapper.nix
@@ -1,28 +1,21 @@
-{ stdenv, buildEnv, rxvt_unicode, makeWrapper, plugins }:
+{ stdenv, symlinkJoin, rxvt_unicode, makeWrapper, plugins }:
 
 let
   rxvt = rxvt_unicode.override {
     perlSupport = true;
   };
 
-  drv = buildEnv {
-    name = "${rxvt.name}-with-plugins";
+in symlinkJoin {
+  name = "${rxvt.name}-with-plugins";
 
-    paths = [ rxvt ] ++ plugins;
+  paths = [ rxvt ] ++ plugins;
 
-    postBuild = ''
-      # TODO: This could be avoided if buildEnv could be forced to create all directories
-      if [ -L $out/bin ]; then
-        rm $out/bin
-        mkdir $out/bin
-        for i in ${rxvt}/bin/*; do
-          ln -s $i $out/bin
-        done
-      fi
-      wrapProgram $out/bin/urxvt \
-        --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl"
-      wrapProgram $out/bin/urxvtd \
-        --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl"
-    '';
-  };
-in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })
+  buildInputs = [ makeWrapper ];
+
+  postBuild = ''
+    wrapProgram $out/bin/urxvt \
+      --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl"
+    wrapProgram $out/bin/urxvtd \
+      --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl"
+  '';
+}

From 1f89dbd46b9aa6c8ca3877e2fb4463dd61cf217b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 26 Apr 2016 15:27:17 +0300
Subject: [PATCH 277/712] pidgin-with-plugins: use symlinkJoin

---
 .../instant-messengers/pidgin/wrapper.nix     | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
index 7e637c767cf..cff0f0818ee 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
@@ -1,24 +1,17 @@
-{ stdenv, buildEnv, pidgin, makeWrapper, plugins }:
+{ stdenv, symlinkJoin, pidgin, makeWrapper, plugins }:
 
 let
 extraArgs = map (x: x.wrapArgs or "") plugins;
-drv = buildEnv {
-  name = "pidgin-with-plugins-" + (builtins.parseDrvName pidgin.name).version;
+in symlinkJoin {
+  name = "pidgin-with-plugins-${pidgin.version}";
 
   paths = [ pidgin ] ++ plugins;
 
+  buildInputs = [ makeWrapper ];
+
   postBuild = ''
-    # TODO: This could be avoided if buildEnv could be forced to create all directories
-    if [ -L $out/bin ]; then
-      rm $out/bin
-      mkdir $out/bin
-      for i in ${pidgin}/bin/*; do
-        ln -s $i $out/bin
-      done
-    fi
     wrapProgram $out/bin/pidgin \
       --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.majorVersion} $out/lib/pidgin" \
       ${toString extraArgs}
   '';
-  };
-in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })
+}

From 7b4fc0f5a97aca61a08643938f5104254cc6a39b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 26 Apr 2016 15:27:25 +0300
Subject: [PATCH 278/712] avidemux: use symlinkJoin

---
 pkgs/applications/video/avidemux/wrapper.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/video/avidemux/wrapper.nix b/pkgs/applications/video/avidemux/wrapper.nix
index 1d1c66cb9fe..7f05b81baec 100644
--- a/pkgs/applications/video/avidemux/wrapper.nix
+++ b/pkgs/applications/video/avidemux/wrapper.nix
@@ -1,4 +1,4 @@
-{ buildEnv, avidemux_unwrapped, makeWrapper
+{ symlinkJoin, avidemux_unwrapped, makeWrapper
 # GTK version is broken upstream, see https://bugzilla.redhat.com/show_bug.cgi?id=1244340
 , withUi ? "qt4"
 }:
@@ -7,24 +7,14 @@ let ui = builtins.getAttr "avidemux_${withUi}" avidemux_unwrapped; in
 
 assert ui.isUi;
 
-buildEnv {
-  name = "avidemux-${withUi}-" + ui.version;
+symlinkJoin {
+  name = "avidemux-${withUi}-${ui.version}";
 
   paths = [ ui avidemux_unwrapped.avidemux_common avidemux_unwrapped.avidemux_settings ];
 
-  ignoreCollisions = true;
-
   buildInputs = [ makeWrapper ];
 
   postBuild = ''
-    # TODO: This could be avoided if buildEnv could be forced to create all directories
-    if [ -L $out/bin ]; then
-      rm $out/bin
-      mkdir $out/bin
-      for i in ${ui}/bin/*; do
-        ln -s $i $out/bin
-      done
-    fi
     for i in $out/bin/*; do
       wrapProgram $i --set ADM_ROOT_DIR $out
     done

From aa1a40b63d30e994232bcf69fbadb8873743a1c9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 26 Apr 2016 15:27:48 +0300
Subject: [PATCH 279/712] dwarf-therapist: add version to derivation, use
 symlinkJoin

---
 .../dwarf-therapist/default.nix               |  6 ++---
 .../dwarf-therapist/wrapper.nix               | 22 +++++--------------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index 6c094ff20f8..37eab6d077a 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -1,10 +1,8 @@
 { stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, qmakeHook, texlive }:
 
-let
-  version = "37.0.0";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "dwarf-therapist-original-${version}";
+  version = "37.0.0";
 
   src = fetchFromGitHub {
     owner = "splintermind";
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index a16c1284a67..cbc8d31e675 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -1,4 +1,4 @@
-{ buildEnv, lib, dwarf-therapist-original, dwarf-fortress-original, makeWrapper }:
+{ symlinkJoin, lib, dwarf-therapist-original, dwarf-fortress-original, makeWrapper }:
 
 let
   df = dwarf-fortress-original;
@@ -6,8 +6,8 @@ let
   inifile = "linux/v0${df.baseVersion}.${df.patchVersion}.ini";
   dfHashFile = "${df}/hash.md5";
 
-in buildEnv {
-  name = "dwarf-therapist-${lib.getVersion dt}";
+in symlinkJoin {
+  name = "dwarf-therapist-${dt.version}";
 
   paths = [ dt ];
 
@@ -16,22 +16,10 @@ in buildEnv {
   postBuild = ''
     # DwarfTherapist assumes it's run in $out/share/dwarftherapist and
     # therefore uses many relative paths.
-    rm $out/bin
-    mkdir $out/bin
-    makeWrapper ${dt}/bin/DwarfTherapist $out/bin/DwarfTherapist \
+    wrapProgram $out/bin/DwarfTherapist \
       --run "cd $out/share/dwarftherapist"
 
-    # Fix checksum of memory access directives. We really need #4621 fixed!
-    recreate_dir() {
-      rm "$out/$1"
-      mkdir -p "$out/$1"
-      for i in "${dt}/$1/"*; do
-        ln -s "$i" "$out/$1"
-      done
-    }
-
-    recreate_dir share
-    recreate_dir share/dwarftherapist
+    rm -rf $out/share/dwarftherapist/memory_layouts/linux
     mkdir -p $out/share/dwarftherapist/memory_layouts/linux
     origmd5=$(cat "${dfHashFile}.orig" | cut -c1-8)
     patchedmd5=$(cat "${dfHashFile}" | cut -c1-8)

From 73db7887edc223bde336e84e4001ce692c8a922f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 26 Apr 2016 15:27:59 +0300
Subject: [PATCH 280/712] brasero: use symlinkJoin

---
 pkgs/tools/cd-dvd/brasero/wrapper.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/pkgs/tools/cd-dvd/brasero/wrapper.nix
index 021e0da0e72..839cc1d604e 100644
--- a/pkgs/tools/cd-dvd/brasero/wrapper.nix
+++ b/pkgs/tools/cd-dvd/brasero/wrapper.nix
@@ -1,22 +1,14 @@
-{ lib, buildEnv, brasero-original, cdrtools, makeWrapper }:
+{ lib, symlinkJoin, brasero-original, cdrtools, makeWrapper }:
 
 let
   binPath = lib.makeBinPath [ cdrtools ];
-in buildEnv {
+in symlinkJoin {
   name = "brasero-${brasero-original.version}";
 
   paths = [ brasero-original ];
   buildInputs = [ makeWrapper ];
 
   postBuild = ''
-    # TODO: This could be avoided if buildEnv could be forced to create all directories
-    if [ -L $out/bin ]; then
-      rm $out/bin
-      mkdir $out/bin
-      for i in ${brasero-original}/bin/*; do
-        ln -s $i $out/bin
-      done
-    fi
     wrapProgram $out/bin/brasero \
       --prefix PATH ':' ${binPath}
   '';

From 8415fa35c79214fc2093882ed688f98f9abf7048 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 26 Apr 2016 15:28:06 +0300
Subject: [PATCH 281/712] fcitx-with-plugins: use symlinkJoin

---
 pkgs/tools/inputmethods/fcitx/wrapper.nix | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx/wrapper.nix b/pkgs/tools/inputmethods/fcitx/wrapper.nix
index a0ae2618954..1e1a2b76a4b 100644
--- a/pkgs/tools/inputmethods/fcitx/wrapper.nix
+++ b/pkgs/tools/inputmethods/fcitx/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildEnv, fcitx, fcitx-configtool, makeWrapper, plugins, kde5 }:
+{ stdenv, symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, kde5 }:
 
 # This is based on the pidgin-with-plugins package.
 # Users should be able to configure what plugins are used
@@ -12,24 +12,16 @@
 #     (fcitx-with-plugins.override { plugins = [ fcitx-anthy ]; })
 # }
 
-let
-drv = buildEnv {
-  name = "fcitx-with-plugins-" + (builtins.parseDrvName fcitx.name).version;
+symlinkJoin {
+  name = "fcitx-with-plugins-${fcitx.version}";
 
   paths = [ fcitx fcitx-configtool kde5.fcitx-qt5 ] ++ plugins;
 
+  buildInputs = [ makeWrapper ];
+
   postBuild = ''
-    # TODO: This could be avoided if buildEnv could be forced to create all directories
-    if [ -L $out/bin ]; then
-      rm $out/bin
-      mkdir $out/bin
-      for i in ${fcitx}/bin/*; do
-        ln -s $i $out/bin
-      done
-    fi
     wrapProgram $out/bin/fcitx \
       --set FCITXDIR "$out/"
   '';
-  };
-in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })
+}
 

From d5e6a4494a2eb00e52b309fc7a196d84ff8625ec Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <freddyrietdijk@fridh.nl>
Date: Tue, 26 Apr 2016 14:38:03 +0200
Subject: [PATCH 282/712] Python: use PyPI mirror (#15001)

* mirrors: add pypi

* Python: Use pypi mirror for all PyPI packages
---
 doc/languages-frameworks/python.md            |   14 +-
 pkgs/applications/misc/electrum/default.nix   |    2 +-
 pkgs/applications/misc/khal/default.nix       |    2 +-
 pkgs/applications/misc/pitz/default.nix       |    2 +-
 pkgs/applications/science/spyder/default.nix  |    2 +-
 .../bugseverywhere/default.nix                |    2 +-
 .../window-managers/i3/pystatus.nix           |    2 +-
 pkgs/build-support/fetchurl/mirrors.nix       |    5 +
 pkgs/development/arduino/ino/default.nix      |    2 +-
 pkgs/development/compilers/julia/git.nix      |    2 +-
 .../python-modules/buildout-nix/default.nix   |    2 +-
 .../python-modules/h5py/default.nix           |    2 +-
 .../python-modules/matplotlib/default.nix     |    2 +-
 .../python-modules/pycrypto/default.nix       |    2 +-
 .../python-modules/setuptools/default.nix     |    2 +-
 .../python-modules/tables/default.nix         |    2 +-
 .../python-modules/yolk/default.nix           |    2 +-
 .../build-managers/buildbot-slave/default.nix |    2 +-
 .../tools/build-managers/buildbot/default.nix |    2 +-
 .../tools/devpi-client/default.nix            |    2 +-
 pkgs/servers/matrix-synapse/default.nix       |    2 +-
 pkgs/tools/admin/cli53/default.nix            |    2 +-
 pkgs/tools/admin/salt/default.nix             |    2 +-
 pkgs/tools/admin/salt/testing.nix             |    2 +-
 pkgs/tools/backup/borg/default.nix            |    2 +-
 pkgs/tools/networking/httpie/default.nix      |    2 +-
 .../networking/speedtest-cli/default.nix      |    2 +-
 pkgs/tools/package-management/nox/default.nix |    2 +-
 pkgs/tools/security/sshuttle/default.nix      |    2 +-
 pkgs/tools/text/grin/default.nix              |    2 +-
 pkgs/tools/video/vnc2flv/default.nix          |    2 +-
 pkgs/top-level/python-packages.nix            | 1978 ++++++++---------
 32 files changed, 1030 insertions(+), 1025 deletions(-)

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index fc0a0ba987a..81da5c70439 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -108,7 +108,7 @@ toolz = buildPythonPackage rec{
   version = "0.7.4";
 
   src = pkgs.fetchurl{
-    url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
+    url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz";
     sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
   };
 
@@ -146,7 +146,7 @@ pkgs.python35Packages.buildPythonPackage rec {
   version = "0.7.4";
 
   src = pkgs.fetchurl{
-    url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
+    url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz";
     sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
   };
 
@@ -175,7 +175,7 @@ with import <nixpkgs> {};
       version = "0.7.4";
 
       src = pkgs.fetchurl{
-        url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
+        url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz";
         sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
       };
 
@@ -220,7 +220,7 @@ datashape = buildPythonPackage rec {
   version = "0.4.7";
 
   src = pkgs.fetchurl {
-    url = "https://pypi.python.org/packages/source/D/DataShape/${name}.tar.gz";
+    url = "mirror://pypi/D/DataShape/${name}.tar.gz";
     sha256 = "14b2ef766d4c9652ab813182e866f493475e65e558bed0822e38bf07bba1a278";
   };
 
@@ -251,7 +251,7 @@ lxml = buildPythonPackage rec {
   name = "lxml-3.4.4";
 
   src = pkgs.fetchurl {
-    url = "http://pypi.python.org/packages/source/l/lxml/${name}.tar.gz";
+    url = "mirror://pypi/l/lxml/${name}.tar.gz";
     sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk";
   };
 
@@ -282,7 +282,7 @@ pyfftw = buildPythonPackage rec {
   version = "0.9.2";
 
   src = pkgs.fetchurl {
-    url = "https://pypi.python.org/packages/source/p/pyFFTW/pyFFTW-${version}.tar.gz";
+    url = "mirror://pypi/p/pyFFTW/pyFFTW-${version}.tar.gz";
     sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074";
   };
 
@@ -373,7 +373,7 @@ buildPythonPackage rec {
   version = "0.7.4";
 
   src = pkgs.fetchurl{
-    url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
+    url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz";
     sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
   };
 
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index ca807f80e1b..d5442a2ded8 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -5,7 +5,7 @@ let
     version = "0.1.7";
     name = "jsonrpclib-${version}";
     src = fetchurl {
-      url = "https://pypi.python.org/packages/source/j/jsonrpclib/${name}.tar.gz";
+      url = "mirror://pypi/j/jsonrpclib/${name}.tar.gz";
       sha256 = "02vgirw2bcgvpcxhv5hf3yvvb4h5wzd1lpjx8na5psdmaffj6l3z";
     };
     propagatedBuildInputs = [ pythonPackages.cjson ];
diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 9f083592c40..e1786cc1b08 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec {
   name = "khal-${version}";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/k/khal/khal-${version}.tar.gz";
+    url = "mirror://pypi/k/khal/khal-${version}.tar.gz";
     sha256 = "00llxj7cv31mjsx0j6zxmyi9s1q20yvfkn025xcy8cv1ylfwic66";
   };
 
diff --git a/pkgs/applications/misc/pitz/default.nix b/pkgs/applications/misc/pitz/default.nix
index 1eb65a59470..dcb36082231 100644
--- a/pkgs/applications/misc/pitz/default.nix
+++ b/pkgs/applications/misc/pitz/default.nix
@@ -16,7 +16,7 @@ buildPythonApplication rec {
   namePrefix = "";
 
   src = fetchurl {
-    url = "http://pypi.python.org/packages/source/p/pitz/${name}.tar.gz";
+    url = "mirror://pypi/p/pitz/${name}.tar.gz";
     sha256 = "1k7f3h4acllzqy3mjqnjd4w5jskp03s79b7dx3c85vlmd7824smr";
   };
 
diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix
index 73847624e85..141ef44b77e 100644
--- a/pkgs/applications/science/spyder/default.nix
+++ b/pkgs/applications/science/spyder/default.nix
@@ -13,7 +13,7 @@ buildPythonApplication rec {
   namePrefix = "";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/s/spyder/${name}.zip";
+    url = "mirror://pypi/s/spyder/${name}.zip";
     sha256 = "99fdae2cea325c0f2842c77bd67dd22db19fef3d9c0dde1545b1a2650eae517e";
   };
 
diff --git a/pkgs/applications/version-management/bugseverywhere/default.nix b/pkgs/applications/version-management/bugseverywhere/default.nix
index f8081ade61f..cc4edd54b56 100644
--- a/pkgs/applications/version-management/bugseverywhere/default.nix
+++ b/pkgs/applications/version-management/bugseverywhere/default.nix
@@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
 
     src = fetchurl {
       url =
-      "https://pypi.python.org/packages/source/b/bugs-everywhere/bugs-everywhere-${version}.tar.gz";
+      "mirror://pypi/b/bugs-everywhere/bugs-everywhere-${version}.tar.gz";
       sha256 = "1ikm3ckwpimwcvx32vy7gh5gbp7q750j3327m17nvrj99g3daz2d";
     };
 
diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix
index eac2d9ab9c9..291f5dbe9d9 100644
--- a/pkgs/applications/window-managers/i3/pystatus.nix
+++ b/pkgs/applications/window-managers/i3/pystatus.nix
@@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec {
   disabled = !python3Packages.isPy3k;
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/i/${pname}/${name}.tar.gz";
+    url = "mirror://pypi/i/${pname}/${name}.tar.gz";
     sha256 = "1bpkkf9q4zqq7fh65zynbv26nq24rfznmw71jjvda7g8kjrwjdk5";
   };
 
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 148a72f5d84..6de94ab511b 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -340,4 +340,9 @@ rec {
     http://repo.steampowered.com/steamrt/
     https://abbradar.net/steamrt/
   ];
+
+  # Python PyPI mirrors
+  pypi = [
+    https://pypi.io/packages/source/
+  ];
 }
diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix
index 073a2339720..07dc229bcc2 100644
--- a/pkgs/development/arduino/ino/default.nix
+++ b/pkgs/development/arduino/ino/default.nix
@@ -6,7 +6,7 @@ buildPythonApplication rec {
   namePrefix = "";
 
   src = fetchurl {
-    url = "http://pypi.python.org/packages/source/i/ino/${name}.tar.gz";
+    url = "mirror://pypi/i/ino/${name}.tar.gz";
     sha256 = "0k6lzfcn55favbj0w4afrvnmwyskf7bgzg9javv2ycvskp35srwv";
   };
 
diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix
index 2fbe50fbc9f..b6d917865d8 100644
--- a/pkgs/development/compilers/julia/git.nix
+++ b/pkgs/development/compilers/julia/git.nix
@@ -42,7 +42,7 @@ let
   
   virtualenvVersion = "1.11.6";
   virtualenv = fetchurl {
-    url = "https://pypi.python.org/packages/source/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz";
+    url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz";
     sha256 = "1xq4prmg25n9cz5zcvbqx68lmc3kl39by582vd8pzs9f3qalqyiy";
   };
 in
diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix
index d12702d98ca..b450814b852 100644
--- a/pkgs/development/python-modules/buildout-nix/default.nix
+++ b/pkgs/development/python-modules/buildout-nix/default.nix
@@ -4,7 +4,7 @@ buildPythonPackage {
   name = "zc.buildout-nix-2.5.0";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-2.5.0.tar.gz";
+    url = "mirror://pypi/z/zc.buildout/zc.buildout-2.5.0.tar.gz";
     sha256 = "721bd2231a9f01f2d5c14f3adccb3385f85b093ee05b18d15d0ff2b9f1f1bd02";
   };
 
diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
index 9775b2f70a2..5b1ca192790 100644
--- a/pkgs/development/python-modules/h5py/default.nix
+++ b/pkgs/development/python-modules/h5py/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   version = "2.5.0";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/h/h5py/${name}.tar.gz";
+    url = "mirror://pypi/h/h5py/${name}.tar.gz";
     sha256 = "9833df8a679e108b561670b245bcf9f3a827b10ccb3a5fa1341523852cfac2f6";
   };
 
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 1ebba52ff6f..c60ee54bec8 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   version = "1.5.1";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/m/matplotlib/${name}.tar.gz";
+    url = "mirror://pypi/m/matplotlib/${name}.tar.gz";
     sha256 = "3ab8d968eac602145642d0db63dd8d67c85e9a5444ce0e2ecb2a8fedc7224d40";
   };
 
diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix
index 4faaf20d29c..0cbe4491d67 100644
--- a/pkgs/development/python-modules/pycrypto/default.nix
+++ b/pkgs/development/python-modules/pycrypto/default.nix
@@ -5,7 +5,7 @@ buildPythonPackage rec {
   namePrefix = "";
 
   src = fetchurl {
-    url = "http://pypi.python.org/packages/source/p/pycrypto/${name}.tar.gz";
+    url = "mirror://pypi/p/pycrypto/${name}.tar.gz";
     sha256 = "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj";
   };
 
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index a924a1f3b85..f40974263fa 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "19.4";  # 18.4 and up breaks python34Packages.characteristic and many others
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz";
+    url = "mirror://pypi/s/setuptools/${shortName}.tar.gz";
     sha256 = "214bf29933f47cf25e6faa569f710731728a07a19cae91ea64f826051f68a8cf";
   };
 
diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix
index 3dcf00e9b8c..b3003dfa954 100644
--- a/pkgs/development/python-modules/tables/default.nix
+++ b/pkgs/development/python-modules/tables/default.nix
@@ -6,7 +6,7 @@ buildPythonPackage rec {
   name = "tables-${version}";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/t/tables/${name}.tar.gz";
+    url = "mirror://pypi/t/tables/${name}.tar.gz";
     sha256 = "3564b351a71ec1737b503b001eb7ceae1f65d5d6e3ffe1ea75aafba10f37fa84";
   };
 
diff --git a/pkgs/development/python-modules/yolk/default.nix b/pkgs/development/python-modules/yolk/default.nix
index 7cfcb1e0f0d..33e9cfeab3a 100644
--- a/pkgs/development/python-modules/yolk/default.nix
+++ b/pkgs/development/python-modules/yolk/default.nix
@@ -7,7 +7,7 @@ buildPythonApplication rec {
   version = "0.4.3";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/y/yolk/yolk-${version}.tar.gz";
+    url = "mirror://pypi/y/yolk/yolk-${version}.tar.gz";
     sha256 = "1f6xwx210jnl5nq0m3agh2p1cxmaizawaf3fwq43q4yw050fn1qw";
   };
 
diff --git a/pkgs/development/tools/build-managers/buildbot-slave/default.nix b/pkgs/development/tools/build-managers/buildbot-slave/default.nix
index 30fbe056926..a5f86d105c3 100644
--- a/pkgs/development/tools/build-managers/buildbot-slave/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot-slave/default.nix
@@ -5,7 +5,7 @@ buildPythonApplication (rec {
   namePrefix = "";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/b/buildbot-slave/${name}.tar.gz";
+    url = "mirror://pypi/b/buildbot-slave/${name}.tar.gz";
     sha256 = "09pncw44c7vqrl7zyn1nvfismiqi9s51axk9cqxn9gq7jhj38mpg";
   };
 
diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index a246044d6f1..94d9008a4f3 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -13,7 +13,7 @@ buildPythonApplication (rec {
   namePrefix = "";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/b/buildbot/${name}.tar.gz";
+    url = "mirror://pypi/b/buildbot/${name}.tar.gz";
     sha256 = "1mn4h04sp6smr3ahqfflys15cpn13q9mfkapcs2jc4ppvxv6kdn6";
   };
 
diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix
index bcad521ed52..1e848e5d611 100644
--- a/pkgs/development/tools/devpi-client/default.nix
+++ b/pkgs/development/tools/devpi-client/default.nix
@@ -5,7 +5,7 @@ pythonPackages.buildPythonApplication rec {
   version = "2.3.2";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/d/devpi-client/devpi-client-${version}.tar.gz";
+    url = "mirror://pypi/d/devpi-client/devpi-client-${version}.tar.gz";
     md5= "bfc8cd768f983fd0585c347bca00c8bb";
   };
 
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index ee0e66baa95..7a558a03031 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -5,7 +5,7 @@ let
     version = "0.6.8";
 
     src = fetchurl {
-      url = "https://pypi.python.org/packages/source/m/matrix-angular-sdk/matrix-angular-sdk-${version}.tar.gz";
+      url = "mirror://pypi/m/matrix-angular-sdk/matrix-angular-sdk-${version}.tar.gz";
       sha256 = "0gmx4y5kqqphnq3m7xk2vpzb0w2a4palicw7wfdr1q2schl9fhz2";
     };
   };
diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix
index 3248ac63bf7..ce9f17b1a51 100644
--- a/pkgs/tools/admin/cli53/default.nix
+++ b/pkgs/tools/admin/cli53/default.nix
@@ -6,7 +6,7 @@ buildPythonApplication rec {
   version = "0.4.4";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/c/cli53/${name}.tar.gz";
+    url = "mirror://pypi/c/cli53/${name}.tar.gz";
     sha256 = "0s9jzigq6a16m2c3qklssx2lz16cf13g5zh80vh24kxazaxqzbig";
   };
 
diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index 254b7b9374e..0cd10fcab92 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec {
   disabled = pythonPackages.isPy3k;
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/s/salt/${name}.tar.gz";
+    url = "mirror://pypi/s/salt/${name}.tar.gz";
     sha256 = "1xcfcs50pyammb60myph4f8bi2r6iwkxwsnnhrjwvkv2ymxwxv5j";
   };
 
diff --git a/pkgs/tools/admin/salt/testing.nix b/pkgs/tools/admin/salt/testing.nix
index 8c65defcab5..14105dc2f98 100644
--- a/pkgs/tools/admin/salt/testing.nix
+++ b/pkgs/tools/admin/salt/testing.nix
@@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
   ];
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/S/SaltTesting/${name}.tar.gz";
+    url = "mirror://pypi/S/SaltTesting/${name}.tar.gz";
     sha256 = "0p0y8kb77pis18rcig1kf9dnns4bnfa3mr91q40lq4mw63l1b34h";
   };
 
diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index ada4ef29c84..95c0c26f30b 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec {
   namePrefix = "";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/b/borgbackup/borgbackup-${version}.tar.gz";
+    url = "mirror://pypi/b/borgbackup/borgbackup-${version}.tar.gz";
     sha256 = "1myz10pwxnac9z59gw1w3xjhz6ghx03vngpl97ca527pj0r39shi";
   };
 
diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix
index a3c52f7dd50..702fa208ac2 100644
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/pkgs/tools/networking/httpie/default.nix
@@ -5,7 +5,7 @@ pythonPackages.buildPythonApplication rec {
   namePrefix = "";
 
   src = fetchurl {
-    url = "http://pypi.python.org/packages/source/h/httpie/${name}.tar.gz";
+    url = "mirror://pypi/h/httpie/${name}.tar.gz";
     sha256 = "0s0dsj1iimn17h0xyziwk4kz4ga9s0vy9rhzixh8dna32za84fdg";
   };
 
diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix
index 80bcb7ae987..de5ba4c18e1 100644
--- a/pkgs/tools/networking/speedtest-cli/default.nix
+++ b/pkgs/tools/networking/speedtest-cli/default.nix
@@ -5,7 +5,7 @@ pythonPackages.buildPythonApplication rec {
   version = "0.3.4";
   
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/s/speedtest-cli/speedtest-cli-${version}.tar.gz";
+    url = "mirror://pypi/s/speedtest-cli/speedtest-cli-${version}.tar.gz";
     sha256 = "19i671cd815fcv0x7h2m0a493slzwkzn7r926g8myx1srkss0q6d";
   };
 
diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix
index 89e72307ead..895704ec646 100644
--- a/pkgs/tools/package-management/nox/default.nix
+++ b/pkgs/tools/package-management/nox/default.nix
@@ -6,7 +6,7 @@ pythonPackages.buildPythonApplication rec {
   namePrefix = "";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/n/nix-nox/nix-nox-${version}.tar.gz";
+    url = "mirror://pypi/n/nix-nox/nix-nox-${version}.tar.gz";
     sha256 = "1wpxh5fhj8nx4yx4cvmc087cnf4iqwxf7zd7rdh2ln3pgxrjfral";
   };
 
diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix
index 41119574767..e3d5c892d37 100644
--- a/pkgs/tools/security/sshuttle/default.nix
+++ b/pkgs/tools/security/sshuttle/default.nix
@@ -7,7 +7,7 @@ pythonPackages.buildPythonApplication rec {
 
   src = fetchurl {
     sha256 = "18hrwi2gyri1n2rq0nghvv7hfhbhh5h67am89524vc1yyx40vn3b";
-    url = "https://pypi.python.org/packages/source/s/sshuttle/${name}.tar.gz";
+    url = "mirror://pypi/s/sshuttle/${name}.tar.gz";
   };
 
   patches = [ ./sudo.patch ];
diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix
index da3a77e8d2e..149af7baa2d 100644
--- a/pkgs/tools/text/grin/default.nix
+++ b/pkgs/tools/text/grin/default.nix
@@ -5,7 +5,7 @@ pythonPackages.buildPythonApplication rec {
   namePrefix = "";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/g/grin/${name}.tar.gz";
+    url = "mirror://pypi/g/grin/${name}.tar.gz";
     sha256 = "1swzwb17wibam8jszdv98h557hlx44pg6psv6rjz7i33qlxk0fdz";
   };
 
diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix
index 3675b5ab091..bb72fd2911f 100644
--- a/pkgs/tools/video/vnc2flv/default.nix
+++ b/pkgs/tools/video/vnc2flv/default.nix
@@ -5,7 +5,7 @@ pythonPackages.buildPythonApplication rec {
   namePrefix = "";
 
   src = fetchurl {
-    url = "http://pypi.python.org/packages/source/v/vnc2flv/${name}.tar.gz";
+    url = "mirror://pypi/v/vnc2flv/${name}.tar.gz";
     sha256 = "14d4nm8yim0bm0nd3wyj7z4zdsg5zk3d9bhhvwdc36x03r8d0sbq";
   };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f00952a4090..20fe3795742 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -106,7 +106,7 @@ in modules // {
     };
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/discid/${name}.tar.gz";
+      url = "mirror://pypi/d/discid/${name}.tar.gz";
       sha256 = "b39d443051b26d0230be7a6c616243daae93337a8711dd5d4119bb6a0e516fa8";
     };
 
@@ -203,7 +203,7 @@ in modules // {
     name = "aafigure-0.5";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/aafigure/${name}.tar.gz";
+      url = "mirror://pypi/a/aafigure/${name}.tar.gz";
       sha256 = "090c88beb091d28a233f854e239713aa15d8d1906ea16211855345c912e8a091";
     };
 
@@ -335,7 +335,7 @@ in modules // {
     name = "actdiag-0.5.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/actdiag/${name}.tar.gz";
+      url = "mirror://pypi/a/actdiag/${name}.tar.gz";
       sha256 = "1vr4hnkr0gcvvpaycd8q3vcx029b2f5yv8swhdr8kwspaqb0dvfa";
     };
 
@@ -361,7 +361,7 @@ in modules // {
     name = "adal-${version}";
 
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/a/adal/adal-0.1.0.tar.gz;
+      url = mirror://pypi/a/adal/adal-0.1.0.tar.gz;
       sha256 = "1f32k18ck54adqlgvh6fjhy4yavcyrwy813prjyqppqqq4bn1a09";
     };
 
@@ -415,7 +415,7 @@ in modules // {
     version = "1.0.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/aiodns/${name}.tar.gz";
+      url = "mirror://pypi/a/aiodns/${name}.tar.gz";
       sha256 = "595b78b8d54115d937cf60d778c02dad76b6f789fd527dab308f99e5601e7f3d";
     };
 
@@ -440,7 +440,7 @@ in modules // {
     version = "0.21.5";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/aiohttp/${name}.tar.gz";
+      url = "mirror://pypi/a/aiohttp/${name}.tar.gz";
       sha256 = "0n8517wc8b6yc925f7zhgl4wqf4ay1w2fzar0pj1h20yfa1wiids";
     };
 
@@ -462,7 +462,7 @@ in modules // {
     name = "alabaster-0.7.7";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/alabaster/${name}.tar.gz";
+      url = "mirror://pypi/a/alabaster/${name}.tar.gz";
       sha256 = "f416a84e0d0ddbc288f6b8f2c276d10b40ca1238562cd9ed5a751292ec647b71";
     };
 
@@ -483,7 +483,7 @@ in modules // {
     name = "alembic-0.8.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/alembic/${name}.tar.gz";
+      url = "mirror://pypi/a/alembic/${name}.tar.gz";
       sha256 = "1sgwvwylzd5h14130mwr0cbyy0fil0a1bq0d0ki97wqvkic3db7f";
     };
 
@@ -502,7 +502,7 @@ in modules // {
     version = "0.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-editor/${name}.tar.gz";
+      url = "mirror://pypi/p/python-editor/${name}.tar.gz";
       sha256 = "1gykxn16anmsbcrwhx3rrhwjif95mmwvq9gjcrr9bbzkdc8sf8a4";
     };
 
@@ -517,7 +517,7 @@ in modules // {
     version = "0.3.8";
 
     src = pkgs.fetchurl {
-      url    = "https://pypi.python.org/packages/source/p/python-gnupg/${name}.tar.gz";
+      url    = "mirror://pypi/p/python-gnupg/${name}.tar.gz";
       sha256 = "0nkbs9c8f30lra7ca39kg91x8cyxn0jb61vih4qky839gpbwwwiq";
     };
 
@@ -540,7 +540,7 @@ in modules // {
     name = "almir-0.1.8";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/a/almir/${name}.zip";
+      url = "mirror://pypi/a/almir/${name}.zip";
       sha256 = "5dc0b8a5071f3ff46cd2d92608f567ba446e4c733c063b17d89703caeb9868fe";
     };
 
@@ -634,7 +634,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/a/anyjson/${name}.tar.gz";
+      url = "mirror://pypi/a/anyjson/${name}.tar.gz";
       sha256 = "37812d863c9ad3e35c0734c42e0bf0320ce8c3bed82cd20ad54cb34d158157ba";
     };
 
@@ -653,7 +653,7 @@ in modules // {
     disabled = pythonOlder "2.6";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/amqp/${name}.tar.gz";
+      url = "mirror://pypi/a/amqp/${name}.tar.gz";
       sha256 = "06n6q0kxhjnbfz3vn8x9yz09lwmn1xi9d6wxp31h5jbks0b4vsid";
     };
 
@@ -752,7 +752,7 @@ in modules // {
     name = "apipkg-1.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/apipkg/${name}.tar.gz";
+      url = "mirror://pypi/a/apipkg/${name}.tar.gz";
       sha256 = "2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6";
     };
 
@@ -769,7 +769,7 @@ in modules // {
     name = "appdirs-1.4.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/appdirs/appdirs-1.4.0.tar.gz";
+      url = "mirror://pypi/a/appdirs/appdirs-1.4.0.tar.gz";
       sha256 = "8fc245efb4387a4e3e0ac8ebcc704582df7d72ff6a42a53f5600bbb18fdaadc5";
     };
 
@@ -800,7 +800,7 @@ in modules // {
     name = "appnope-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/appnope/${name}.tar.gz";
+      url = "mirror://pypi/a/appnope/${name}.tar.gz";
       sha256 = "8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71";
     };
 
@@ -838,7 +838,7 @@ in modules // {
 
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/asyncio/${name}.tar.gz";
+      url = "mirror://pypi/a/asyncio/${name}.tar.gz";
       sha256 = "0hfbqwk9y0bbfgxzg93s2wyk6gcjsdxlr5jwy97hx64ppkw0ydl3";
     };
 
@@ -853,7 +853,7 @@ in modules // {
     name = "funcsigs-0.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/f/funcsigs/${name}.tar.gz";
+      url = "mirror://pypi/f/funcsigs/${name}.tar.gz";
       sha256 = "d83ce6df0b0ea6618700fe1db353526391a8a3ada1b7aba52fed7a61da772033";
     };
 
@@ -874,7 +874,7 @@ in modules // {
     disabled = !isPy27;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/A/APScheduler/${name}.tar.gz";
+      url = "mirror://pypi/A/APScheduler/${name}.tar.gz";
       sha256 = "1ljjhn6cv8b1pccsi3mgc887ypi2vim317r9p0zh0amd0bhkk6wb";
     };
 
@@ -907,7 +907,7 @@ in modules // {
     name = "args-0.1.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/args/${name}.tar.gz";
+      url = "mirror://pypi/a/args/${name}.tar.gz";
       sha256 = "a785b8d837625e9b61c39108532d95b85274acd679693b71ebb5156848fcf814";
     };
 
@@ -921,7 +921,7 @@ in modules // {
     name = "Area53-0.94";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/A/Area53/${name}.tar.gz";
+      url = "mirror://pypi/A/Area53/${name}.tar.gz";
       sha256 = "0v9b7f8b6v21y410anx5sr52k2ac8jrzdf19q6m6p0zsdsf9vr42";
     };
 
@@ -937,7 +937,7 @@ in modules // {
     version = "1.1.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/chai/${name}.tar.gz";
+      url = "mirror://pypi/c/chai/${name}.tar.gz";
       sha256 = "016kf3irrclpkpvcm7q0gmkfibq7jgy30a9v73pp42bq9h9a32bl";
     };
 
@@ -951,7 +951,7 @@ in modules // {
     version = "0.7.0";
 
     src = pkgs.fetchurl {
-      url    = "https://pypi.python.org/packages/source/a/arrow/${name}.tar.gz";
+      url    = "mirror://pypi/a/arrow/${name}.tar.gz";
       sha256 = "0yx10dz3hp825fcq9w15zbp26v622npcjscb91da05zig8036lra";
     };
 
@@ -978,7 +978,7 @@ in modules // {
     doCheck = false;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/async/${name}.tar.gz";
+      url = "mirror://pypi/a/async/${name}.tar.gz";
       sha256 = "1lfmjm8apy9qpnpbq8g641fd01qxh9jlya5g2d6z60vf8p04rla1";
     };
   };
@@ -988,7 +988,7 @@ in modules // {
     name = "atomiclong-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/atomiclong/atomiclong-${version}.tar.gz";
+      url = "mirror://pypi/a/atomiclong/atomiclong-${version}.tar.gz";
       sha256 = "1gjbc9lvpkgg8vj7dspif1gz9aq4flkhxia16qj6yvb7rp27h4yb";
     };
     buildInputs = with self; [ pytest ];
@@ -1008,7 +1008,7 @@ in modules // {
     name = "atomicwrites-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/atomicwrites/atomicwrites-${version}.tar.gz";
+      url = "mirror://pypi/a/atomicwrites/atomicwrites-${version}.tar.gz";
       sha256 = "08s05h211r07vs66r4din3swrbzb344vli041fihpg34q3lcxpvw";
     };
 
@@ -1024,7 +1024,7 @@ in modules // {
     name = "argparse-1.4.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/argparse/${name}.tar.gz";
+      url = "mirror://pypi/a/argparse/${name}.tar.gz";
       sha256 = "1r6nznp64j68ih1k537wms7h57nvppq0szmwsaf99n71bfjqkc32";
     };
 
@@ -1057,7 +1057,7 @@ in modules // {
     propagatedBuildInputs = with self; [ logilab_common six lazy-object-proxy wrapt ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/astroid/${name}.tar.gz";
+      url = "mirror://pypi/a/astroid/${name}.tar.gz";
       sha256 = "7f7e5512efe515098e77cbd3a60e87c8db8954097b0e025d8d6f72f2e8ddc298";
     };
 
@@ -1079,7 +1079,7 @@ in modules // {
     name = "attrdict-2.0.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/attrdict/${name}.tar.gz";
+      url = "mirror://pypi/a/attrdict/${name}.tar.gz";
       sha256 = "86aeb6d3809e0344409f8148d7cac9eabce5f0b577c160b5e90d10df3f8d2ad3";
     };
 
@@ -1097,7 +1097,7 @@ in modules // {
     version = "2.1.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/audioread/${name}.tar.gz";
+      url = "mirror://pypi/a/audioread/${name}.tar.gz";
       sha256 = "ffb601de7a9e40850d4ec3256a3a6bbe8fa40466dafb5c65f41b08e4bb963f1e";
     };
 
@@ -1131,7 +1131,7 @@ in modules // {
     name = "autopep8-1.0.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/autopep8/${name}.tar.gz";
+      url = "mirror://pypi/a/autopep8/${name}.tar.gz";
       sha256 = "17lydqm8y9a5qadp6iifxrb5mb0g9fr1vxn5qy1fjpyhazxaw8n1";
     };
 
@@ -1155,7 +1155,7 @@ in modules // {
     version = "0.2.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/av/${name}.tar.gz";
+      url = "mirror://pypi/a/av/${name}.tar.gz";
       sha256 = "bdc7e2e213cb9041d9c5c0497e6f8c47e84f89f1f2673a46d891cca0fb0d19a0";
     };
 
@@ -1179,7 +1179,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/avro/${name}.tar.gz";
+      url = "mirror://pypi/a/avro/${name}.tar.gz";
       sha256 = "edf14143cabb2891f05a73d60a57a9fc5a9ebd305c2188abb3f5db777c707ad5";
     };
 
@@ -1195,7 +1195,7 @@ in modules // {
     disabled = (!isPy3k);
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/avro3k/${name}.tar.gz";
+      url = "mirror://pypi/a/avro3k/${name}.tar.gz";
       sha256 = "15ahl0irwwj558s964abdxg4vp6iwlabri7klsm2am6q5r0ngsky";
     };
 
@@ -1212,7 +1212,7 @@ in modules // {
     version = "1.6.5";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/awesome-slugify/${name}.tar.gz";
+      url = "mirror://pypi/a/awesome-slugify/${name}.tar.gz";
       sha256 = "0wgxrhr8s5vk2xmcz9s1z1aml4ppawmhkbggl9rp94c747xc7pmv";
     };
 
@@ -1232,7 +1232,7 @@ in modules // {
     version = "1.10.18";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/awscli/${name}.tar.gz";
+      url = "mirror://pypi/a/awscli/${name}.tar.gz";
       sha256 = "0vdj7p4cwsbzhanhp5f2c0b0qr2gh76dyanji73avvj4jvdb5d4g";
     };
 
@@ -1272,7 +1272,7 @@ in modules // {
     version = "0.1.0";
     src = pkgs.fetchurl {
         sha256 = "05isyrqbk16dg1bc3mnc4ynxr3nchslvia5wr1sdmxvc3v2y729d";
-        url = "https://pypi.python.org/packages/source/a/aws-shell/aws-shell-0.1.0.tar.gz";
+        url = "mirror://pypi/a/aws-shell/aws-shell-0.1.0.tar.gz";
       };
     propagatedBuildInputs = with self; [
       configobj prompt_toolkit_52 awscli boto3 pygments sqlite3 mock pytest
@@ -1303,7 +1303,7 @@ in modules // {
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/azure/${name}.zip";
+      url = "mirror://pypi/a/azure/${name}.zip";
       sha256 = "89c20b2efaaed3c6f56345d55c32a8d4e7d2a16c032d0acb92f8f490c508fe24";
     };
 
@@ -1321,7 +1321,7 @@ in modules // {
     version = "1.0.0";
     name = "azure-nspkg-${version}";
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/a/azure-nspkg/azure-nspkg-1.0.0.zip;
+      url = mirror://pypi/a/azure-nspkg/azure-nspkg-1.0.0.zip;
       sha256 = "1xqvc8by1lbd7j9dxyly03jz3rgbmnsiqnqgydhkf4pa2mn2hgr9";
     };
     meta = {
@@ -1337,7 +1337,7 @@ in modules // {
     name = "azure-common-${version}";
     disabled = isPyPy;
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/a/azure-common/azure-common-1.0.0.zip;
+      url = mirror://pypi/a/azure-common/azure-common-1.0.0.zip;
       sha256 = "074rwwy8zzs7zw3nww5q2wg5lxgdc4rmypp2gfc9mwsz0gb70491";
     };
     propagatedBuildInputs = with self; [ azure-nspkg ];
@@ -1356,7 +1356,7 @@ in modules // {
     version = "0.20.0";
     name = "azure-mgmt-common-${version}";
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/a/azure-mgmt-common/azure-mgmt-common-0.20.0.zip;
+      url = mirror://pypi/a/azure-mgmt-common/azure-mgmt-common-0.20.0.zip;
       sha256 = "1rmzpz3733wv31rsnqpdy4bbafvk5dhbqx7q0xf62dlz7p0i4f66";
     };
     propagatedBuildInputs = with self; [ azure-common azure-mgmt-nspkg requests2 ];
@@ -1376,7 +1376,7 @@ in modules // {
     version = "0.20.0";
     name = "azure-mgmt-compute-${version}";
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/a/azure-mgmt-compute/azure-mgmt-compute-0.20.0.zip;
+      url = mirror://pypi/a/azure-mgmt-compute/azure-mgmt-compute-0.20.0.zip;
       sha256 = "12hr5vxdg2sk2fzr608a37f4i8nbchca7dgdmly2w5fc7x88jx2v";
     };
     postInstall = ''
@@ -1396,7 +1396,7 @@ in modules // {
     version = "0.20.1";
     name = "azure-mgmt-network-${version}";
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/a/azure-mgmt-network/azure-mgmt-network-0.20.1.zip;
+      url = mirror://pypi/a/azure-mgmt-network/azure-mgmt-network-0.20.1.zip;
       sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx";
     };
     postInstall = ''
@@ -1416,7 +1416,7 @@ in modules // {
     version = "1.0.0";
     name = "azure-mgmt-nspkg-${version}";
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/a/azure-mgmt-nspkg/azure-mgmt-nspkg-1.0.0.zip;
+      url = mirror://pypi/a/azure-mgmt-nspkg/azure-mgmt-nspkg-1.0.0.zip;
       sha256 = "1rq92fj3kvnqkk18596dybw0kvhgscvc6cd8hp1dhy3wrkqnhwmq";
     };
     propagatedBuildInputs = with self; [ azure-nspkg ];
@@ -1432,7 +1432,7 @@ in modules // {
     version = "0.20.1";
     name = "azure-mgmt-resource-${version}";
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/a/azure-mgmt-resource/azure-mgmt-resource-0.20.1.zip;
+      url = mirror://pypi/a/azure-mgmt-resource/azure-mgmt-resource-0.20.1.zip;
       sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml";
     };
     postInstall = ''
@@ -1452,7 +1452,7 @@ in modules // {
     version = "0.20.0";
     name = "azure-mgmt-storage-${version}";
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/a/azure-mgmt-storage/azure-mgmt-storage-0.20.0.zip;
+      url = mirror://pypi/a/azure-mgmt-storage/azure-mgmt-storage-0.20.0.zip;
       sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim";
     };
     postInstall = ''
@@ -1472,7 +1472,7 @@ in modules // {
     version = "0.20.3";
     name = "azure-storage-${version}";
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/a/azure-storage/azure-storage-0.20.3.zip;
+      url = mirror://pypi/a/azure-storage/azure-storage-0.20.3.zip;
       sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb";
     };
     propagatedBuildInputs = with self; [ azure-common futures dateutil requests2 ];
@@ -1491,7 +1491,7 @@ in modules // {
     version = "0.20.1";
     name = "azure-servicemanagement-legacy-${version}";
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/a/azure-servicemanagement-legacy/azure-servicemanagement-legacy-0.20.1.zip;
+      url = mirror://pypi/a/azure-servicemanagement-legacy/azure-servicemanagement-legacy-0.20.1.zip;
       sha256 = "17dwrp99sx5x9cm4vldkaxhki9gbd6dlafa0lpr2n92xhh2838zs";
     };
     propagatedBuildInputs = with self; [ azure-common requests2 ];
@@ -1510,7 +1510,7 @@ in modules // {
     name = "backports.ssl_match_hostname-3.4.0.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/b/backports.ssl_match_hostname/backports.ssl_match_hostname-3.4.0.2.tar.gz";
+      url = "mirror://pypi/b/backports.ssl_match_hostname/backports.ssl_match_hostname-3.4.0.2.tar.gz";
       sha256 = "07410e7fb09aab7bdaf5e618de66c3dac84e2e3d628352814dc4c37de321d6ae";
     };
 
@@ -1525,7 +1525,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/b/backports.lzma/${name}.tar.gz";
+      url = "mirror://pypi/b/backports.lzma/${name}.tar.gz";
       sha256 = "bac58aec8d39ac3d22250840fb24830d0e4a0ef05ad8f3f09172dc0cc80cdbca";
     };
 
@@ -1544,7 +1544,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/b/babelfish/${name}.tar.gz";
+      url = "mirror://pypi/b/babelfish/${name}.tar.gz";
       sha256 = "0wrw21dyq7v6lbffwvi1ik43d7dhmcv8xvgrrihhiv7ys1rd3gag";
     };
 
@@ -1562,7 +1562,7 @@ in modules // {
     disabled = isPy26 || isPy27 || isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/b/${pname}/${name}.tar.gz";
+      url = "mirror://pypi/b/${pname}/${name}.tar.gz";
       sha256 = "1ajmflvvlkflrcmqmkrx0zaira84z8kv4ssb2jprfwvjh8vfkysb";
     };
 
@@ -1582,7 +1582,7 @@ in modules // {
     name = "batinfo-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/b/batinfo/${name}.tar.gz";
+      url = "mirror://pypi/b/batinfo/${name}.tar.gz";
       sha256 = "0gyzkxzvj5l6qrw706bnm3cckqzzzbrjr7jkxc087d7775a73499";
     };
 
@@ -1602,7 +1602,7 @@ in modules // {
     name = "bcdoc-0.14.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/b/bcdoc/${name}.tar.gz";
+      url = "mirror://pypi/b/bcdoc/${name}.tar.gz";
       sha256 = "1s2kdqs1n2mj7wq3w0pq30zs7vxq0l3abik2clqnc4hm2j7crbk8";
     };
 
@@ -1638,7 +1638,7 @@ in modules // {
     name = "beautifulsoup4-4.4.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/b/beautifulsoup4/${name}.tar.gz";
+      url = "mirror://pypi/b/beautifulsoup4/${name}.tar.gz";
       sha256 = "1d36lc4pfkvl74fmzdib2nqnvknm0jddgf2n9yd7im150qyh3m47";
     };
 
@@ -1660,7 +1660,7 @@ in modules // {
     name = "beautifulsoup4-4.1.3";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/b/beautifulsoup4/${name}.tar.gz";
+      url = "mirror://pypi/b/beautifulsoup4/${name}.tar.gz";
       sha256 = "0cbcml88bkx9gf1wznxa0kqz1wpyakfbyh9gmxw0wljhda1q0zk1";
     };
 
@@ -1711,7 +1711,7 @@ in modules // {
     name = "betamax-0.6.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/b/betamax/${name}.tar.gz";
+      url = "mirror://pypi/b/betamax/${name}.tar.gz";
       sha256 = "0vw4d53jbbb2kdl7l891h8iyxklqcd6ldvgcyhw9hl40ljdhv1wz";
     };
 
@@ -1730,7 +1730,7 @@ in modules // {
     version = "0.3.0";
 
     src = pkgs.fetchurl {
-       url = "https://pypi.python.org/packages/source/b/betamax-matchers/${name}.tar.gz";
+       url = "mirror://pypi/b/betamax-matchers/${name}.tar.gz";
       sha256 = "039kvqsdcvvlfxjc3n1x2xvjg6qkqbql0p7rc4z7bnxm9kcm88la";
     };
 
@@ -1812,7 +1812,7 @@ in modules // {
 
     src = pkgs.fetchurl {
       sha256 = "1azd0g0p9qk9wp344jmvqp4wk5f3wpsz3lb750xvnmd7qzf6v377";
-      url = "https://pypi.python.org/packages/source/b/buttersink/${name}.tar.gz";
+      url = "mirror://pypi/b/buttersink/${name}.tar.gz";
     };
 
     meta = {
@@ -1838,7 +1838,7 @@ in modules // {
     name = "cached-property-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/cached-property/${name}.tar.gz";
+      url = "mirror://pypi/c/cached-property/${name}.tar.gz";
       sha256 = "10dwi3s6f154ag9dvqy5jiwp31fs57lbxjcjgn4cwvi8qyqpi3j5";
     };
 
@@ -1880,7 +1880,7 @@ in modules // {
     name = "circus-0.11.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/circus/${name}.tar.gz";
+      url = "mirror://pypi/c/circus/${name}.tar.gz";
       sha256 = "3757344aa5073ea29e6e2607b3de8ba1652502c61964316116931884293fe846";
     };
 
@@ -1894,7 +1894,7 @@ in modules // {
     version = "2.6.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/colorlog/${name}.tar.gz";
+      url = "mirror://pypi/c/colorlog/${name}.tar.gz";
       sha256 = "0djv6ky1yk28s1l093w8plg19kp88q4nyrm1vfxyq0s9j4pix29l";
     };
 
@@ -1914,7 +1914,7 @@ in modules // {
     version = "0.1.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/${pname}/${name}.tar.gz";
+      url = "mirror://pypi/c/${pname}/${name}.tar.gz";
       sha256 = "0w1j43l76zw10dvs2kk7jz7kqj2ss7gfgfdxyls27pckwin89gxb";
     };
 
@@ -1947,7 +1947,7 @@ in modules // {
     version = "1.1.7";
     disabled = isPyPy;
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/${pname}/${name}.tar.gz";
+      url = "mirror://pypi/c/${pname}/${name}.tar.gz";
       sha256 = "f856ea2e9e2947abc1a6557625cc6b0e45228984f397a90c420b2f468dc4cb97";
     };
     doCheck = false;
@@ -1970,7 +1970,7 @@ in modules // {
     version = "0.10.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/C/Cycler/${name}.tar.gz";
+      url = "mirror://pypi/C/Cycler/${name}.tar.gz";
       sha256 = "cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8";
     };
 
@@ -1998,7 +1998,7 @@ in modules // {
     pname = "datadog";
     version = "0.10.0";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/${pname}/${name}.tar.gz";
+      url = "mirror://pypi/d/${pname}/${name}.tar.gz";
       sha256 = "0y2if4jj43n5jis20imragvhhyhr840w4m1g7j7fxh9bn7h273zp";
     };
 
@@ -2017,7 +2017,7 @@ in modules // {
     pname = "python-debian";
     version = "0.1.23";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/${pname}/${name}.tar.gz";
+      url = "mirror://pypi/p/${pname}/${name}.tar.gz";
       sha256 = "193faznwnjc3n5991wyzim6h9gyq1zxifmfrnpm3avgkh7ahyynh";
     };
     propagatedBuildInputs = with self; [ chardet six ];
@@ -2028,7 +2028,7 @@ in modules // {
     pname = "defusedxml";
     version = "0.4.1";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/${pname}/${name}.tar.gz";
+      url = "mirror://pypi/d/${pname}/${name}.tar.gz";
       sha256 = "0y147zy3jqmk6ly7fbhqmzn1hf41xcb53f2vcc3m8x4ba5d1smfd";
     };
   };
@@ -2060,7 +2060,7 @@ in modules // {
     pname = "dugong";
     version = "3.5";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/${pname}/${name}.tar.bz2";
+      url = "mirror://pypi/d/${pname}/${name}.tar.bz2";
       sha256 = "0y0rdxbiwm03zv6vpvapqilrird3h8ijz7xmb0j7ds5j4p6q3g24";
     };
 
@@ -2071,7 +2071,7 @@ in modules // {
     name = "iowait-0.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/iowait/${name}.tar.gz";
+      url = "mirror://pypi/i/iowait/${name}.tar.gz";
       sha256 = "ab1bc2eb84c22ccf61f17a0024f9fb6df781b39f1852764a66a7769d5adfb299";
     };
 
@@ -2085,7 +2085,7 @@ in modules // {
     name = "responses-0.4.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/responses/${name}.tar.gz";
+      url = "mirror://pypi/r/responses/${name}.tar.gz";
       sha256 = "0fs7a4cf4f12mjhcjd5vfh0f3ixcy2nawzxpgsfr3ahf0rg7ppx5";
     };
 
@@ -2099,7 +2099,7 @@ in modules // {
     name = "rarfile-2.6";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/rarfile/rarfile-2.6.tar.gz";
+      url = "mirror://pypi/r/rarfile/rarfile-2.6.tar.gz";
       sha256 = "326700c5450cfb367f612e918866ea27551bac02f4656f340003c88873fa1a56";
     };
 
@@ -2113,7 +2113,7 @@ in modules // {
     name = "proboscis-1.2.6.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/proboscis/proboscis-1.2.6.0.tar.gz";
+      url = "mirror://pypi/p/proboscis/proboscis-1.2.6.0.tar.gz";
       sha256 = "b822b243a7c82030fce0de97bdc432345941306d2c24ef227ca561dd019cd238";
     };
 
@@ -2131,7 +2131,7 @@ in modules // {
     name = "pyechonest-8.0.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyechonest/pyechonest-8.0.2.tar.gz";
+      url = "mirror://pypi/p/pyechonest/pyechonest-8.0.2.tar.gz";
       sha256 = "496265f4b7d33483ec153b9e1b8333fe959b115f7e781510089c8313b7d86560";
     };
 
@@ -2149,7 +2149,7 @@ in modules // {
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/b/billiard/${name}.tar.gz";
+      url = "mirror://pypi/b/billiard/${name}.tar.gz";
       sha256 = "02wxsc6bhqvzh8j6w758kvgqbnj14l796mvmrcms8fgfamd2lak9";
     };
 
@@ -2168,7 +2168,7 @@ in modules // {
     version = "0.4.0";
 
     src = pkgs.fetchurl {
-      url ="https://pypi.python.org/packages/source/b/binaryornot/${name}.tar.gz";
+      url ="mirror://pypi/b/binaryornot/${name}.tar.gz";
       sha256 = "1j4f51dxic39mdwf6alj7gd769wy6mhk916v031wjali51xkh3xb";
     };
 
@@ -2188,7 +2188,7 @@ in modules // {
     name = "bitbucket-api-0.4.4";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/b/bitbucket-api/${name}.tar.gz";
+      url = "mirror://pypi/b/bitbucket-api/${name}.tar.gz";
       sha256 = "e890bc3893d59a6f203c1eb2bae60e78ac4d3869da7ea4fb104dca588aea85b2";
     };
 
@@ -2206,7 +2206,7 @@ in modules // {
   bitbucket-cli = buildPythonPackage rec {
     name = "bitbucket-cli-0.4.1";
     src = pkgs.fetchurl {
-       url = "https://pypi.python.org/packages/source/b/bitbucket-cli/${name}.tar.gz";
+       url = "mirror://pypi/b/bitbucket-cli/${name}.tar.gz";
        sha256 = "d8909627ae7a46519379c6343698d49f9ffd5de839ff44796974828d843a9419";
     };
 
@@ -2245,7 +2245,7 @@ in modules // {
     version = "0.9.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/b/blaze/${name}.tar.gz";
+      url = "mirror://pypi/b/blaze/${name}.tar.gz";
       sha256 = "fde4fd5733d8574345521581078a4fd89bb51ad3814eda88f1f467faa3a9784a";
     };
 
@@ -2320,7 +2320,7 @@ in modules // {
     version = "1.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/b/blinker/${name}.tar.gz";
+      url = "mirror://pypi/b/blinker/${name}.tar.gz";
       sha256 = "6811010809262261e41ab7b92f3f6d23f35cf816fbec2bc05077992eebec6e2f";
     };
 
@@ -2383,7 +2383,7 @@ in modules // {
     version = "6.1.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/b/bsddb3/${name}.tar.gz";
+      url = "mirror://pypi/b/bsddb3/${name}.tar.gz";
       sha256 = "6f21b0252125c07798d784c164ef135ad153d226c01b290258ee1c5b9e7c4dd3";
     };
 
@@ -2412,7 +2412,7 @@ in modules // {
     version = "0.10.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/b/bokeh/${name}.tar.gz";
+      url = "mirror://pypi/b/bokeh/${name}.tar.gz";
       sha256 = "2d8bd8c98e2f62b2a28328d3cc95bfbe257742fa7efc9c382b4c8ae4a141df14";
     };
 
@@ -2519,7 +2519,7 @@ in modules // {
     name = "botocore-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz";
+      url = "mirror://pypi/b/botocore/${name}.tar.gz";
       sha256 = "07rp24lnpjlk0c889g0d8y2ykc711gi04w715nkm9mv734ndsman";
     };
 
@@ -2550,7 +2550,7 @@ in modules // {
     name = "bottle-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/b/bottle/${name}.tar.gz";
+      url = "mirror://pypi/b/bottle/${name}.tar.gz";
       sha256 = "1b2hq0l4nwh75s2w6wgiqlkj4q1qvyx6a94axl2k4lsym1aifpfd";
     };
 
@@ -2571,7 +2571,7 @@ in modules // {
     disabled = (!isPy27);
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/B/Box2D/Box2D-2.3b0.zip";
+      url = "mirror://pypi/B/Box2D/Box2D-2.3b0.zip";
       sha256 = "4519842c650b0153550eb0c9864da46b5a4ec8555c68b70f5cd2952a21c788b0";
     };
 
@@ -2596,7 +2596,7 @@ in modules // {
     version = "1.0.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/b/bugwarrior/${name}.tar.gz";
+      url = "mirror://pypi/b/bugwarrior/${name}.tar.gz";
       sha256 = "efe41756c152789f39006f157add9bedfa2b85d2cac15c067e635e37c70cb8f8";
     };
 
@@ -2641,7 +2641,7 @@ in modules // {
     version = "1.1.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-bugzilla/python-${name}.tar.gz";
+      url = "mirror://pypi/p/python-bugzilla/python-${name}.tar.gz";
       sha256 = "11361635a4f1613803a0b9b93ba9126f7fd36180653f953e2590b1536d107d46";
     };
 
@@ -2672,7 +2672,7 @@ in modules // {
     version = "0.30";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/check-manifest/check-manifest-${version}.tar.gz";
+      url = "mirror://pypi/c/check-manifest/check-manifest-${version}.tar.gz";
       sha256 = "b19fd0d8b9286532ba3dc0282484fd76d11200cf24b340dc3d08f293c7dd0500";
     };
 
@@ -2691,7 +2691,7 @@ in modules // {
     version = "2.0.8";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/devpi-common/devpi-common-${version}.tar.gz";
+      url = "mirror://pypi/d/devpi-common/devpi-common-${version}.tar.gz";
       sha256 = "a059c4099002d4af8f3ccfc8a9f4bf133b20ea404049b21a31fc1003e1d79452";
     };
 
@@ -2715,7 +2715,7 @@ in modules // {
     name = "zc.buildout-2.2.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.buildout/${name}.tar.gz";
+      url = "mirror://pypi/z/zc.buildout/${name}.tar.gz";
       sha256 = "a6122ea5c06c6c044a9efce4a3df452c8573e1aebfda7b24262655daac894ef5";
     };
 
@@ -2733,7 +2733,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.buildout/${name}.tar.gz";
+      url = "mirror://pypi/z/zc.buildout/${name}.tar.gz";
       sha256 = "a5c2fafa4d073ad3dabec267c44a996cbc624700a9a49467cd6b1ef63d35e029";
     };
 
@@ -2751,7 +2751,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.buildout/${name}.tar.gz";
+      url = "mirror://pypi/z/zc.buildout/${name}.tar.gz";
       sha256 = "0ac5a325d3ffbc5a988fb3ba87f4159d4769cc73e3331cb5234edc8839b6506b";
     };
 
@@ -2778,7 +2778,7 @@ in modules // {
 
     src = pkgs.fetchurl {
       inherit sha256;
-      url = "https://pypi.python.org/packages/source/z/zc.recipe.egg/zc.recipe.egg-${version}.tar.gz";
+      url = "mirror://pypi/z/zc.recipe.egg/zc.recipe.egg-${version}.tar.gz";
     };
     meta.broken = true;  # https://bitbucket.org/pypa/setuptools/issues/462/pkg_resourcesfind_on_path-thinks-the
   };
@@ -2798,7 +2798,7 @@ in modules // {
     meta.maintainers = with maintainers; [ mornfall ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/b/bunch/${name}.tar.gz";
+      url = "mirror://pypi/b/bunch/${name}.tar.gz";
       sha256 = "1akalx2pd1fjlvrq69plvcx783ppslvikqdm93z2sdybq07pmish";
     };
     doCheck = false;
@@ -2809,7 +2809,7 @@ in modules // {
     name = "cairocffi-0.7.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/cairocffi/${name}.tar.gz";
+      url = "mirror://pypi/c/cairocffi/${name}.tar.gz";
       sha256 = "e42b4256d27bd960cbf3b91a6c55d602defcdbc2a73f7317849c80279feeb975";
     };
 
@@ -2862,7 +2862,7 @@ in modules // {
     name = "cairosvg-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/C/CairoSVG/CairoSVG-${version}.tar.gz";
+      url = "mirror://pypi/C/CairoSVG/CairoSVG-${version}.tar.gz";
       sha256 = "01lpm38qp7xlnv8jv7qg48j44p5088dwfsrcllgs5fz355lrfds1";
     };
 
@@ -2880,7 +2880,7 @@ in modules // {
     name = "carrot-0.10.7";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/c/carrot/${name}.tar.gz";
+      url = "mirror://pypi/c/carrot/${name}.tar.gz";
       sha256 = "cb46374f3c883c580d142a79d2609883713a867cc86e0514163adce784ce2468";
     };
 
@@ -2923,7 +2923,7 @@ in modules // {
     name = "cassandra-driver-2.6.0c2";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/c/cassandra-driver/${name}.tar.gz";
+      url = "mirror://pypi/c/cassandra-driver/${name}.tar.gz";
       sha256 = "00cc2rkvkxaxn7sf2qzy29s6h394fla73rbdh9krxbswp5nvp27r";
     };
 
@@ -2967,7 +2967,7 @@ in modules // {
     disabled = pythonOlder "2.6";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/celery/${name}.tar.gz";
+      url = "mirror://pypi/c/celery/${name}.tar.gz";
       sha256 = "0614ppp18vmiwdk0rxvz0wn62d7svanwdnx7jgqxpy9pb20rqd8s";
     };
 
@@ -2990,7 +2990,7 @@ in modules // {
     version = "0.9.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/C/Cerberus/${name}.tar.gz";
+      url = "mirror://pypi/C/Cerberus/${name}.tar.gz";
       sha256 = "1km7hvns1snrmcwz58bssi4wv3gwd34zm1z1hwjylmpqrfrcf8mi";
     };
 
@@ -3006,7 +3006,7 @@ in modules // {
     version = "2015.9.6.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/certifi/${name}.tar.gz";
+      url = "mirror://pypi/c/certifi/${name}.tar.gz";
       sha256 = "19mfly763c6bzya9dwm6qgc48z4x3gk6ldl6fprdncqhklnjnfnw";
     };
 
@@ -3021,7 +3021,7 @@ in modules // {
   characteristic = buildPythonPackage rec {
     name = "characteristic-14.1.0";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/characteristic/${name}.tar.gz";
+      url = "mirror://pypi/c/characteristic/${name}.tar.gz";
       sha256 = "91e254948180678dd69e6143202b4686f2fa47cce136936079bb4d9a3b82419d";
     };
 
@@ -3067,7 +3067,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/C/Cheetah/Cheetah-${version}.tar.gz";
+      url = "mirror://pypi/C/Cheetah/Cheetah-${version}.tar.gz";
       sha256 = "be308229f0c1e5e5af4f27d7ee06d90bb19e6af3059794e5fd536a6f29a9b550";
     };
 
@@ -3105,7 +3105,7 @@ in modules // {
     disabled = isPy3k || isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-cjson/${name}.tar.gz";
+      url = "mirror://pypi/p/python-cjson/${name}.tar.gz";
       sha256 = "a01fabb7593728c3d851e1cd9a3efbd18f72650a31a5aa8a74018640da3de8b3";
     };
 
@@ -3122,7 +3122,7 @@ in modules // {
     version = "0.5.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/clf/${name}.tar.gz";
+      url = "mirror://pypi/c/clf/${name}.tar.gz";
       sha256 = "04lqd2i4fjs606b0q075yi9xksk567m0sfph6v6j80za0hvzqyy5";
     };
 
@@ -3148,7 +3148,7 @@ in modules // {
     name = "click-6.6";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/click/${name}.tar.gz";
+      url = "mirror://pypi/c/click/${name}.tar.gz";
       sha256 = "1sggipyz52crrybwbr9xvwxd4aqigvplf53k9w3ygxmzivd1jsnc";
     };
 
@@ -3177,7 +3177,7 @@ in modules // {
     name = "click-5.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/click/${name}.tar.gz";
+      url = "mirror://pypi/c/click/${name}.tar.gz";
       sha256 = "0njsm0wn31l21bi118g5825ma5sa3rwn7v2x4wjd7yiiahkri337";
     };
 
@@ -3198,7 +3198,7 @@ in modules // {
     name = "click-log-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/click-log/${name}.tar.gz";
+      url = "mirror://pypi/c/click-log/${name}.tar.gz";
       sha256 = "0kdd1vminxpcfczxl2kkf285n0dr1gxh2cdbx1p6vkj7b7bci3gx";
     };
 
@@ -3217,7 +3217,7 @@ in modules // {
     name = "click-threading-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/click-threading/${name}.tar.gz";
+      url = "mirror://pypi/c/click-threading/${name}.tar.gz";
       sha256 = "0jmrv4334lfxa2ss53c06dafdwqbk1pb3ihd26izn5igw1bm8145";
     };
 
@@ -3235,7 +3235,7 @@ in modules // {
     name = "clepy-0.3.20";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/clepy/${name}.tar.gz";
+      url = "mirror://pypi/c/clepy/${name}.tar.gz";
       sha256 = "16vibfxms5z4ld8gbkra6dkhqm2cc3jnn0fwp7mw70nlwxnmm51c";
     };
 
@@ -3253,7 +3253,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/C/ClientForm/ClientForm-0.2.10.tar.gz";
+      url = "mirror://pypi/C/ClientForm/ClientForm-0.2.10.tar.gz";
       sha256 = "0dydh3i1sx7rrj6d0gj375wkjpiivm7jjlsimw6hmwv4ck7yf1wm";
     };
 
@@ -3295,7 +3295,7 @@ in modules // {
     version = "0.1.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/cloudpickle/${name}.tar.gz";
+      url = "mirror://pypi/c/cloudpickle/${name}.tar.gz";
       sha256 = "3418303f44c6c4daa184f1dc36c8c0b7ff8261c56d1f922ffd8d09e79caa4b74";
     };
 
@@ -3321,7 +3321,7 @@ in modules // {
     name    = "cogapp-${version}";
 
     src = pkgs.fetchurl {
-      url    = "https://pypi.python.org/packages/source/c/cogapp/${name}.tar.gz";
+      url    = "mirror://pypi/c/cogapp/${name}.tar.gz";
       sha256 = "0gzmzbsk54r1qa6wd0yg4zzdxvn2f19ciprr2acldxaknzrpllnn";
     };
 
@@ -3343,7 +3343,7 @@ in modules // {
     version = "0.3.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/colorama/${name}.tar.gz";
+      url = "mirror://pypi/c/colorama/${name}.tar.gz";
       sha256 = "eb21f2ba718fbf357afdfdf6f641ab393901c7ca8d9f37edd0bee4806ffa269c";
     };
 
@@ -3360,7 +3360,7 @@ in modules // {
     version = "0.6.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/C/CommonMark/${name}.tar.gz";
+      url = "mirror://pypi/C/CommonMark/${name}.tar.gz";
       sha256 = "ee5a88f23678794592efe3fc11033f17fc77b3296a85f5e1d5b715f8e110a773";
     };
 
@@ -3381,7 +3381,7 @@ in modules // {
   CommonMark_54 = self.CommonMark.override rec {
     name = "CommonMark-0.5.4";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/C/CommonMark/${name}.tar.gz";
+      url = "mirror://pypi/C/CommonMark/${name}.tar.gz";
       sha256 = "34d73ec8085923c023930dfc0bcd1c4286e28a2a82de094bb72fabcc0281cbe5";
     };
   };
@@ -3392,7 +3392,7 @@ in modules // {
     version = "1.0.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/C/CoilMQ/${name}.tar.gz";
+      url = "mirror://pypi/C/CoilMQ/${name}.tar.gz";
       sha256 = "0wwa6fsqw1mxsryvgp0yrdjil8axyj0kslzi7lr45cnhgp5ab375";
     };
 
@@ -3415,7 +3415,7 @@ in modules // {
     name = "colander-1.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/c/colander/${name}.tar.gz";
+      url = "mirror://pypi/c/colander/${name}.tar.gz";
       sha256 = "7389413266b9e680c9529c16d56284edf87e0d5de557948e75f41d65683c23b3";
     };
 
@@ -3437,7 +3437,7 @@ in modules // {
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/configparser/${name}.tar.gz";
+      url = "mirror://pypi/c/configparser/${name}.tar.gz";
       sha256 = "6a2318590dfc4013fc5bf53c2bec14a8cb455a232295eb282a13f94786c4b0b2";
     };
 
@@ -3453,7 +3453,7 @@ in modules // {
     version = "0.3.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/C/ColanderAlchemy/${name}.tar.gz";
+      url = "mirror://pypi/C/ColanderAlchemy/${name}.tar.gz";
       sha256 = "11wcni2xmfmy001rj62q2pwf305vvngkrfm5c4zlwvgbvlsrvnnw";
     };
 
@@ -3472,7 +3472,7 @@ in modules // {
     name = "configobj-5.0.6";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/c/configobj/${name}.tar.gz";
+      url = "mirror://pypi/c/configobj/${name}.tar.gz";
       sha256 = "a2f5650770e1c87fb335af19a9b7eb73fc05ccf22144eb68db7d00cd2bcb0902";
     };
 
@@ -3517,7 +3517,7 @@ in modules // {
     name = "construct-2.5.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/construct/${name}.tar.gz";
+      url = "mirror://pypi/c/construct/${name}.tar.gz";
       sha256 = "084h02p0m8lhmlywlwjdg0kd0hd6sz481c96qwcm5wddxrqn4nv6";
     };
 
@@ -3537,7 +3537,7 @@ in modules // {
     name = "python-consul-0.6.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-consul/${name}.tar.gz";
+      url = "mirror://pypi/p/python-consul/${name}.tar.gz";
       sha256 = "0vfyr499sbc4nnhhijp2lznyj507nnak95bvv9w8y78ngxggskbh";
     };
 
@@ -3556,7 +3556,7 @@ in modules // {
     name = "contextlib2-0.4.0";
 
     src = pkgs.fetchurl rec {
-      url = "https://pypi.python.org/packages/source/c/contextlib2/${name}.tar.gz";
+      url = "mirror://pypi/c/contextlib2/${name}.tar.gz";
       sha256 = "55a5dc78f7a742a0e756645134ffb39bbe11da0fea2bc0f7070d40dac208b732";
     };
   };
@@ -3589,7 +3589,7 @@ in modules // {
     name = "cookies-2.2.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/cookies/${name}.tar.gz";
+      url = "mirror://pypi/c/cookies/${name}.tar.gz";
       sha256 = "13pfndz8vbk4p2a44cfbjsypjarkrall71pgc97glk5fiiw9idnn";
     };
 
@@ -3606,7 +3606,7 @@ in modules // {
     name = "coverage-4.0.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/c/coverage/${name}.tar.gz";
+      url = "mirror://pypi/c/coverage/${name}.tar.gz";
       sha256 = "0nrd817pzjw1haaz6gambgwf4jdjnh9kyxkgj6l8qgl6hdxga45w";
     };
 
@@ -3624,7 +3624,7 @@ in modules // {
   covCore = buildPythonPackage rec {
     name = "cov-core-1.15.0";
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/c/cov-core/${name}.tar.gz";
+      url = "mirror://pypi/c/cov-core/${name}.tar.gz";
       sha256 = "4a14c67d520fda9d42b0da6134638578caae1d374b9bb462d8de00587dba764c";
     };
     meta = {
@@ -3636,7 +3636,7 @@ in modules // {
   crcmod = buildPythonPackage rec {
     name = "crcmod-1.7";
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/c/crcmod/crcmod-1.7.tar.gz;
+      url = mirror://pypi/c/crcmod/crcmod-1.7.tar.gz;
       sha256 = "07k0hgr42vw2j92cln3klxka81f33knd7459cn3d8aszvfh52w6w";
     };
     meta = {
@@ -3677,7 +3677,7 @@ in modules // {
     version = "0.7.4";
 
     src = pkgs.fetchurl{
-      url = "https://pypi.python.org/packages/source/c/cytoolz/cytoolz-${version}.tar.gz";
+      url = "mirror://pypi/c/cytoolz/cytoolz-${version}.tar.gz";
       sha256 = "9c2e3dda8232b6cd5b84b8c8df6c8155c2adeb8734eb7ec38e189affc0f2eba5";
     };
 
@@ -3709,7 +3709,7 @@ in modules // {
     propagatedBuildInputs = with self; [ pbkdf2 modules.crypt ];
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/c/cryptacular/${name}.tar.gz";
+      url = "mirror://pypi/c/cryptacular/${name}.tar.gz";
       sha256 = "273f03d03f9b316671ae4f1c1c6b8d3c883da19a5706873e8f3d6543e13dd4a1";
     };
 
@@ -3726,7 +3726,7 @@ in modules // {
     name = "cryptography-1.2.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/cryptography/${name}.tar.gz";
+      url = "mirror://pypi/c/cryptography/${name}.tar.gz";
       sha256 = "0kj511z4g21fhcr649pyzpl0zzkkc7hsgxxjys6z8wwfvmvirccf";
     };
 
@@ -3746,7 +3746,7 @@ in modules // {
     name = "cryptography_vectors-1.2.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/cryptography-vectors/${name}.tar.gz";
+      url = "mirror://pypi/c/cryptography-vectors/${name}.tar.gz";
       sha256 = "0shawgpax79gvjrj0a313sll9gaqys7q1hxngn6j4k24lmz7bwki";
     };
   };
@@ -3756,7 +3756,7 @@ in modules // {
     version = "1.22.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/oslo.vmware/${name}.tar.gz";
+      url = "mirror://pypi/o/oslo.vmware/${name}.tar.gz";
       sha256 = "1119q3x2y3hjz3p784byr13aqay75pbj4cb8v43gjq5piqlpp16x";
     };
 
@@ -3775,7 +3775,7 @@ in modules // {
     version = "3.3.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-barbicanclient/python-barbicanclient-${version}.tar.gz";
+      url = "mirror://pypi/p/python-barbicanclient/python-barbicanclient-${version}.tar.gz";
       sha256 = "1kxnxiijvkkc8ahlfbkslpzxcbah7y5pi86hvkyac62xzda87inm";
     };
 
@@ -3798,7 +3798,7 @@ in modules // {
     version = "0.9.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-ironicclient/python-ironicclient-${version}.tar.gz";
+      url = "mirror://pypi/p/python-ironicclient/python-ironicclient-${version}.tar.gz";
       sha256 = "16kaixrmnx6a32mfv281w22h8lavjh0k9yiqikmwc986ydh85s4d";
     };
 
@@ -3855,7 +3855,7 @@ in modules // {
     version = "0.10.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/tablib/tablib-${version}.tar.gz";
+      url = "mirror://pypi/t/tablib/tablib-${version}.tar.gz";
       sha256 = "14wc8bmz60g35r6gsyhdzfvgfqpd3gw9lfkq49z5bxciykbxmhj1";
     };
 
@@ -3873,7 +3873,7 @@ in modules // {
     version = "1.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/cliff-tablib/cliff-tablib-${version}.tar.gz";
+      url = "mirror://pypi/c/cliff-tablib/cliff-tablib-${version}.tar.gz";
       sha256 = "0fa1qw41lwda5ac3z822qhzbilp51y6p1wlp0h76vrvqcqgxi3ja";
     };
 
@@ -3894,7 +3894,7 @@ in modules // {
     version = "1.7.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-openstackclient/python-openstackclient-${version}.tar.gz";
+      url = "mirror://pypi/p/python-openstackclient/python-openstackclient-${version}.tar.gz";
       sha256 = "0h1jkrwx06l32k50zq5gs9iba132q2x2jjb3z5gkxxlcd3apk8y9";
     };
 
@@ -3921,7 +3921,7 @@ in modules // {
     name = "idna-2.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/idna/${name}.tar.gz";
+      url = "mirror://pypi/i/idna/${name}.tar.gz";
       sha256 = "0frxgmgi234lr9hylg62j69j4ik5zhg0wz05w5dhyacbjfnrl68n";
     };
 
@@ -4006,7 +4006,7 @@ in modules // {
     name = "pkginfo-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pkginfo/${name}.tar.gz";
+      url = "mirror://pypi/p/pkginfo/${name}.tar.gz";
       sha256 = "0g0g6avplfqw1adzqybbrh1a2z0kfjl8qn3annkrc7w3ibz6sgxd";
     };
 
@@ -4032,7 +4032,7 @@ in modules // {
     name = "pretend-1.0.8";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pretend/pretend-1.0.8.tar.gz";
+      url = "mirror://pypi/p/pretend/pretend-1.0.8.tar.gz";
       sha256 = "0r5r7ygz9m6d2bklflbl84cqhjkc2q12xgis8268ygjh30g2q3wk";
     };
 
@@ -4049,7 +4049,7 @@ in modules // {
     propagatedBuildInputs = with self; [ tox py eventlet ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/detox/detox-0.9.3.tar.gz";
+      url = "mirror://pypi/d/detox/detox-0.9.3.tar.gz";
       sha256 = "39d48b6758c43ba579f694507d54da96931195eb1b72ad79b46f50af9520b2f3";
     };
 
@@ -4064,7 +4064,7 @@ in modules // {
     name = "pbkdf2-1.3";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pbkdf2/${name}.tar.gz";
+      url = "mirror://pypi/p/pbkdf2/${name}.tar.gz";
       sha256 = "ac6397369f128212c43064a2b4878038dab78dab41875364554aaf2a684e6979";
     };
 
@@ -4080,7 +4080,7 @@ in modules // {
     name = "bcrypt-2.0.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/b/bcrypt/${name}.tar.gz";
+      url = "mirror://pypi/b/bcrypt/${name}.tar.gz";
       sha256 = "8b2d197ef220d10eb74625dde7af3b10daa973ae9a1eadd6366f763fad4387fa";
     };
 
@@ -4098,7 +4098,7 @@ in modules // {
     name = "cffi-1.5.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/cffi/${name}.tar.gz";
+      url = "mirror://pypi/c/cffi/${name}.tar.gz";
       sha256 = "1p91p1n8n46y0k3q7ddgxxjnfh08rjqsjh7zbjxzfiifhycxx6ys";
     };
 
@@ -4121,7 +4121,7 @@ in modules // {
     name = "pycollada-0.4.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pycollada/${name}.tar.gz";
+      url = "mirror://pypi/p/pycollada/${name}.tar.gz";
       sha256 = "0i50lh98550pwr95zgzrgiqzsspm09wl52xlv83y5nrsz4mblylv";
     };
 
@@ -4145,7 +4145,7 @@ in modules // {
     name = "PyContracts-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/P/PyContracts/${name}.tar.gz";
+      url = "mirror://pypi/P/PyContracts/${name}.tar.gz";
       sha256 = "0rdc9pz08885vqkazjc3lyrrghmf3jzxnlsgpn8akl808x1qrfqf";
     };
 
@@ -4165,7 +4165,7 @@ in modules // {
     version = "2.14";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pycparser/${name}.tar.gz";
+      url = "mirror://pypi/p/pycparser/${name}.tar.gz";
       sha256 = "7959b4a74abdc27b312fed1c21e6caf9309ce0b29ea86b591fd2e99ecdf27f73";
     };
 
@@ -4184,7 +4184,7 @@ in modules // {
     name = "pytest-2.7.3";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pytest/${name}.tar.gz";
+      url = "mirror://pypi/p/pytest/${name}.tar.gz";
       sha256 = "1z4yi986f9n0p8qmzmn21m21m8j1x78hk3505f89baqm6pdw7afm";
     };
 
@@ -4209,7 +4209,7 @@ in modules // {
     name = "pytest-2.8.6";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pytest/${name}.tar.gz";
+      url = "mirror://pypi/p/pytest/${name}.tar.gz";
       sha256 = "ed38a3725b8e4478555dfdb549a4219ca3ba57955751141a1aaa45b706d84194";
     };
   };
@@ -4217,7 +4217,7 @@ in modules // {
   pytestcache = buildPythonPackage rec {
     name = "pytest-cache-1.0";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pytest-cache/pytest-cache-1.0.tar.gz";
+      url = "mirror://pypi/p/pytest-cache/pytest-cache-1.0.tar.gz";
       sha256 = "1a873fihw4rhshc722j4h6j7g3nj7xpgsna9hhg3zn6ksknnhx5y";
     };
 
@@ -4235,7 +4235,7 @@ in modules // {
     version = "1.0.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pytest-flakes/${name}.tar.gz";
+      url = "mirror://pypi/p/pytest-flakes/${name}.tar.gz";
       sha256 = "0vvfprga6k4v2zq1qsr3yq1bjl22vygfsnvyn3hh80cc2386dk6h";
     };
 
@@ -4251,7 +4251,7 @@ in modules // {
   pytestpep8 = buildPythonPackage rec {
     name = "pytest-pep8";
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pytest-pep8/pytest-pep8-1.0.6.tar.gz";
+      url = "mirror://pypi/p/pytest-pep8/pytest-pep8-1.0.6.tar.gz";
       sha256 = "06032agzhw1i9d9qlhfblnl3dw5hcyxhagn7b120zhrszbjzfbh3";
     };
 
@@ -4269,7 +4269,7 @@ in modules // {
      version = "0.0.1";
 
      src = pkgs.fetchurl {
-       url = "https://pypi.python.org/packages/source/p/pytest-pep257/${name}.tar.gz";
+       url = "mirror://pypi/p/pytest-pep257/${name}.tar.gz";
        sha256 = "003vdkxpx37n0kjqpwgj3314hwk2jfz3nz58db7xh68bf8xy75lk";
      };
 
@@ -4287,7 +4287,7 @@ in modules // {
     version = "2.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pytest-raisesregexp/${name}.tar.gz";
+      url = "mirror://pypi/p/pytest-raisesregexp/${name}.tar.gz";
       sha256 = "0fde8aac1a54f9b56e5f9c61fda76727542ed24968c27c6e3688c6f1885f1e61";
     };
 
@@ -4311,7 +4311,7 @@ in modules // {
     name = "pytest-runner-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pytest-runner/${name}.tar.gz";
+      url = "mirror://pypi/p/pytest-runner/${name}.tar.gz";
       sha256 = "e775a40ee4a3a1d45018b199c44cc20bbe7f3df2dc8882f61465bb4141c78cdb";
     };
 
@@ -4331,7 +4331,7 @@ in modules // {
     name = "pytest-quickcheck-0.8.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pytest-quickcheck/pytest-quickcheck-0.8.2.tar.gz";
+      url = "mirror://pypi/p/pytest-quickcheck/pytest-quickcheck-0.8.2.tar.gz";
       sha256 = "047w4zwdsnlzmsc5f3rapzbzd2frlvz9nnp8v4b48fjmqmxassh3";
     };
 
@@ -4348,7 +4348,7 @@ in modules // {
     name = "pytest-cov-2.2.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pytest-cov/${name}.tar.gz";
+      url = "mirror://pypi/p/pytest-cov/${name}.tar.gz";
       sha256 = "1lf9jsmhqk5nc4w3kzwglmdzjvmi7ajvrsnwv826j3bn0wzx8c92";
     };
 
@@ -4365,7 +4365,7 @@ in modules // {
     name = "pytest-xdist-1.8";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pytest-xdist/pytest-xdist-1.8.zip";
+      url = "mirror://pypi/p/pytest-xdist/pytest-xdist-1.8.zip";
       sha256 = "b02135db7080c0978b7ce5d8f43a5879231441c2062a4791bc42b6f98c94fa69";
     };
 
@@ -4383,7 +4383,7 @@ in modules // {
     version = "0.3.5";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pytest-localserver/${name}.tar.gz";
+      url = "mirror://pypi/p/pytest-localserver/${name}.tar.gz";
       sha256 = "0dvqspjr6va55zwmnnc2mmpqc7mm65kxig9ya44x1z8aadzxpa4p";
     };
 
@@ -4406,7 +4406,7 @@ in modules // {
     version = "0.1.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pytest-subtesthack/${name}.tar.gz";
+      url = "mirror://pypi/p/pytest-subtesthack/${name}.tar.gz";
       sha256 = "15kzcr5pchf3id4ikdvlv752rc0j4d912n589l4rifp8qsj19l1x";
     };
 
@@ -4427,7 +4427,7 @@ in modules // {
     version = "0.3";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/t/tinycss/${name}.tar.gz";
+      url = "mirror://pypi/t/tinycss/${name}.tar.gz";
       sha256 = "1pichqra4wk86142hqgvy9s5x6c5k5zhy8l9qxr0620pqk8spbd4";
     };
 
@@ -4454,7 +4454,7 @@ in modules // {
     name = "cssselect-${version}";
     version = "0.9.1";
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/c/cssselect/${name}.tar.gz";
+      url = "mirror://pypi/c/cssselect/${name}.tar.gz";
       sha256 = "10h623qnp6dp1191jri7lvgmnd4yfkl36k9smqklp1qlf3iafd85";
     };
     # AttributeError: 'module' object has no attribute 'tests'
@@ -4465,7 +4465,7 @@ in modules // {
     name = "cssutils-0.9.9";
 
     src = pkgs.fetchurl {
-      url = http://pypi.python.org/packages/source/c/cssutils/cssutils-0.9.9.zip;
+      url = mirror://pypi/c/cssutils/cssutils-0.9.9.zip;
       sha256 = "139yfm9yz9k33kgqw4khsljs10rkhhxyywbq9i82bh2r31cil1pp";
     };
 
@@ -4488,7 +4488,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/d/darcsver/${name}.tar.gz";
+      url = "mirror://pypi/d/darcsver/${name}.tar.gz";
       sha256 = "1yb1c3jxqvy4r3qiwvnb86qi5plw6018h15r3yk5ji3nk54qdcb6";
     };
 
@@ -4516,7 +4516,7 @@ in modules // {
     version = "0.7.6";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/dask/${name}.tar.gz";
+      url = "mirror://pypi/d/dask/${name}.tar.gz";
       sha256 = "ff27419e059715907afefe6cbcc1f8c748855c7a93be25be211dabcb689cee3b";
     };
 
@@ -4543,7 +4543,7 @@ in modules // {
     version = "0.5.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/D/DataShape/${name}.tar.gz";
+      url = "mirror://pypi/D/DataShape/${name}.tar.gz";
       sha256 = "21c424f11604873da9a36d4c55ef1d15cc3960cd208d7828b82315c494bff96a";
     };
 
@@ -4568,7 +4568,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/r/requests-cache/${name}.tar.gz";
+      url = "mirror://pypi/r/requests-cache/${name}.tar.gz";
       sha256 = "671969d00719fa3e80476b128dc9232025926884d0110d4d235abdd9c3508fc0";
     };
 
@@ -4588,7 +4588,7 @@ in modules // {
     version = "1.1.7";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/h/howdoi/${name}.tar.gz";
+      url = "mirror://pypi/h/howdoi/${name}.tar.gz";
       sha256 = "df4e49a219872324875d588e7699a1a82174a267e8487505e86bfcb180aea9b7";
     };
 
@@ -4606,7 +4606,7 @@ in modules // {
     version = "0.5.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/n/nose-parameterized/${name}.tar.gz";
+      url = "mirror://pypi/n/nose-parameterized/${name}.tar.gz";
       sha256 = "a11c41b0cf8218e7cdc19ab7a1bdf5c141d161cd2350daee819473cc63cd0685";
     };
 
@@ -4633,7 +4633,7 @@ in modules // {
     version = "0.3.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/N/NeuroTools/${name}.tar.gz";
+      url = "mirror://pypi/N/NeuroTools/${name}.tar.gz";
       sha256 = "0ly6qa87l3afhksab06vp1iimlbm1kdnsw98mxcnpzz9q07l4nd4";
     };
 
@@ -4667,7 +4667,7 @@ in modules // {
     version = "1.7.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/j/jdatetime/${name}.tar.gz";
+      url = "mirror://pypi/j/jdatetime/${name}.tar.gz";
       sha256 = "c08ba5791c2350b26e87ddf478bf223108146e241b6c949538221b54afd633ac";
     };
 
@@ -4712,7 +4712,7 @@ in modules // {
     version = "2.4.2";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-dateutil/python-${name}.tar.gz";
+      url = "mirror://pypi/p/python-dateutil/python-${name}.tar.gz";
       sha256 = "3e95445c1db500a344079a47b171c45ef18f57d188dffdb0e4165c71bea8eb3d";
     };
 
@@ -4732,7 +4732,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-dateutil/python-${name}.tar.gz";
+      url = "mirror://pypi/p/python-dateutil/python-${name}.tar.gz";
       sha256 = "02dhw57jf5kjcp7ng1if7vdrbnlpb9yjmz7wygwwvf3gni4766bg";
     };
 
@@ -4750,7 +4750,7 @@ in modules // {
     name = "dateutil-2.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-dateutil/python-${name}.tar.gz";
+      url = "mirror://pypi/p/python-dateutil/python-${name}.tar.gz";
       sha256 = "1vlx0lpsxjxz64pz87csx800cwfqznjyr2y7nk3vhmzhkwzyqi2c";
     };
 
@@ -4793,7 +4793,7 @@ in modules // {
     version = "4.0.6";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/d/decorator/${name}.tar.gz";
+      url = "mirror://pypi/d/decorator/${name}.tar.gz";
       sha256 = "1c6254597777fd003da2e8fb503c3dbf3d9e8f8d55f054709c0e65be3467209c";
     };
 
@@ -4808,7 +4808,7 @@ in modules // {
     name = "deform-2.0a2";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/d/deform/${name}.tar.gz";
+      url = "mirror://pypi/d/deform/${name}.tar.gz";
       sha256 = "3fa4d287c8da77a83556e4a5686de006ddd69da359272120b915dc8f5a70cabd";
     };
 
@@ -4835,7 +4835,7 @@ in modules // {
     name = "deform-2.0a2";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/d/deform/${name}.tar.gz";
+      url = "mirror://pypi/d/deform/${name}.tar.gz";
       sha256 = "1gfaf1d8zp0mp4h229srlffxdp86w1nni9g4aqsshxysr23x591z";
     };
 
@@ -4863,7 +4863,7 @@ in modules // {
     name = "deform_bootstrap-0.2.9";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/d/deform_bootstrap/${name}.tar.gz";
+      url = "mirror://pypi/d/deform_bootstrap/${name}.tar.gz";
       sha256 = "1hgq3vqsfqdmlyahnlc40w13viawhpzqf4jzigsggdb41x545fda";
     };
 
@@ -4886,7 +4886,7 @@ in modules // {
     name = "demjson-1.6";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/demjson/${name}.tar.gz";
+      url = "mirror://pypi/d/demjson/${name}.tar.gz";
       sha256 = "0abf7wqqq7rk1sycy47ayn5p93yy7gjq50cb2z69wmik1qqrr60x";
     };
 
@@ -4912,7 +4912,7 @@ in modules // {
     propagatedBuildInputs = with self; [ six ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/derpconf/${name}.tar.gz";
+      url = "mirror://pypi/d/derpconf/${name}.tar.gz";
       sha256 = "9129419e3a6477fe6366c339d2df8c614bdde82a639f33f2f40d4de9a1ed236a";
     };
 
@@ -4962,7 +4962,7 @@ in modules // {
     version = "0.2.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/dill/${name}.tgz";
+      url = "mirror://pypi/d/dill/${name}.tgz";
       sha256 = "deca57da33ad2121ab1b9c4493bf8eb2b3a72b6426d4b9a3a853a073c68b97ca";
     };
 
@@ -4982,7 +4982,7 @@ in modules // {
     name = "discogs-client-2.0.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/discogs-client/${name}.tar.gz";
+      url = "mirror://pypi/d/discogs-client/${name}.tar.gz";
       sha256 = "0a3616a818dd9fa61a61c3d9731d176e9123130d1b1b97a6beee63b4c72306b7";
     };
 
@@ -5000,10 +5000,10 @@ in modules // {
     version = "1.12.0";
 
     src = if isPy3k then pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/dnspython3/dnspython3-${version}.zip";
+      url = "mirror://pypi/d/dnspython3/dnspython3-${version}.zip";
       sha256 = "138wxj702vx6zni9g2y8dbgbpin95v6hk23rh2kwfr3q4130jqz9";
     } else pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/dnspython/${name}.tar.gz";
+      url = "mirror://pypi/d/dnspython/${name}.tar.gz";
       sha256 = "0kvjlkp96qzh3j31szpjlzqbp02brixh4j4clnpw80b0hspq5yq3";
     };
 
@@ -5024,7 +5024,7 @@ in modules // {
     version = "1.7.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/docker-py/${name}.tar.gz";
+      url = "mirror://pypi/d/docker-py/${name}.tar.gz";
       sha256 = "0k6hm3vmqh1d3wr9rryyif5n4rzvcffdlb1k4jvzp7g4996d3ccm";
     };
 
@@ -5044,7 +5044,7 @@ in modules // {
     name = "dockerpty-0.4.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/dockerpty/${name}.tar.gz";
+      url = "mirror://pypi/d/dockerpty/${name}.tar.gz";
       sha256 = "1kjn64wx23jmr8dcc6g7bwlmrhfmxr77gh6iphqsl39sayfxdab9";
     };
 
@@ -5062,7 +5062,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/docker-registry-core/${name}.tar.gz";
+      url = "mirror://pypi/d/docker-registry-core/${name}.tar.gz";
       sha256 = "347e804f1f35b28dbe27bf8d7a0b630fca29d684032139bf26e3940572360360";
     };
 
@@ -5087,7 +5087,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/docker-registry/${name}.tar.gz";
+      url = "mirror://pypi/d/docker-registry/${name}.tar.gz";
       sha256 = "1svm1h59sg4bwj5cy10m016gj0xpiin15nrz5z66h47sbkndvlw3";
     };
 
@@ -5117,7 +5117,7 @@ in modules // {
     name = "docopt-0.6.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/docopt/${name}.tar.gz";
+      url = "mirror://pypi/d/docopt/${name}.tar.gz";
       sha256 = "49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491";
     };
 
@@ -5133,7 +5133,7 @@ in modules // {
     version = "0.1.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/doctest-ignore-unicode/${name}.tar.gz";
+      url = "mirror://pypi/d/doctest-ignore-unicode/${name}.tar.gz";
       sha256= "fc90b2d0846477285c6b67fc4cb4d6f39fcf76d8752f4df0a241486f31512ad5";
     };
 
@@ -5152,7 +5152,7 @@ in modules // {
     propagatedBuildInputs = with self; [ dogpile_core ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/dogpile.cache/dogpile.cache-0.5.4.tar.gz";
+      url = "mirror://pypi/d/dogpile.cache/dogpile.cache-0.5.4.tar.gz";
       sha256 = "9eab7a5dc05ad1b6573144c4a2717226b5c38811f9ec29b514e774535a91ea24";
     };
 
@@ -5169,7 +5169,7 @@ in modules // {
     name = "dogpile.core-0.4.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/dogpile.core/dogpile.core-0.4.1.tar.gz";
+      url = "mirror://pypi/d/dogpile.core/dogpile.core-0.4.1.tar.gz";
       sha256 = "be652fb11a8eaf66f7e5c94d418d2eaa60a2fe81dae500f3743a863cc9dbed76";
     };
 
@@ -5186,7 +5186,7 @@ in modules // {
     name = "dotfiles-0.6.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/dotfiles/${name}.tar.gz";
+      url = "mirror://pypi/d/dotfiles/${name}.tar.gz";
       sha256 = "45ecfd7f2ed9d0f2a7ac632c9bd0ebdca758d8bbc2b6f11562579d525f0467b8";
     };
 
@@ -5246,7 +5246,7 @@ in modules // {
     name = "urllib3-1.12";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/u/urllib3/${name}.tar.gz";
+      url = "mirror://pypi/u/urllib3/${name}.tar.gz";
       sha256 = "1ikj72kd4cdcq7pmmcd5p6s9dvp7wi0zw01635v4xzkid5vi598f";
     };
 
@@ -5283,7 +5283,7 @@ in modules // {
     #doCheck = false; # python 2.7.9 does verify ssl certificates
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/dropbox/${name}.tar.gz";
+      url = "mirror://pypi/d/dropbox/${name}.tar.gz";
       sha256 = "f65c12bd97f09e29a951bc7cb30a74e005fc4b2f8bb48778796be3f73866b173";
     };
 
@@ -5301,7 +5301,7 @@ in modules // {
     name = "ds4drv-${version}";
     version = "0.5.0";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/ds4drv/${name}.tar.gz";
+      url = "mirror://pypi/d/ds4drv/${name}.tar.gz";
       sha256 = "0dq2z1z09zxa6rn3v94vwqaaz29jwiydkss8hbjglixf20krmw3b";
     };
 
@@ -5322,7 +5322,7 @@ in modules // {
     name = "dyn-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/dyn/${name}.tar.gz";
+      url = "mirror://pypi/d/dyn/${name}.tar.gz";
       sha256 = "dc4b4b2a5d9d26f683230fd822641b39494df5fcbfa716281d126ea6425dd4c3";
     };
 
@@ -5349,7 +5349,7 @@ in modules // {
     name = "EasyProcess-0.1.9";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/E/EasyProcess/${name}.tar.gz";
+      url = "mirror://pypi/E/EasyProcess/${name}.tar.gz";
       sha256 = "c9980c0b0eeab97969305d8829bed966a3e28a77284e4f45a9b38fb23ce83633";
     };
 
@@ -5365,7 +5365,7 @@ in modules // {
     name = "elasticsearch-1.9.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/e/elasticsearch/${name}.tar.gz";
+      url = "mirror://pypi/e/elasticsearch/${name}.tar.gz";
       sha256 = "091s60ziwhyl9kjfm833i86rcpjx46v9h16jkgjgkk5441dln3gb";
     };
 
@@ -5388,7 +5388,7 @@ in modules // {
     name = "elasticsearch-dsl-0.0.9";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/e/elasticsearch-dsl/${name}.tar.gz";
+      url = "mirror://pypi/e/elasticsearch-dsl/${name}.tar.gz";
       sha256 = "1gdcdshk881vy18p0czcmbb3i4s5hl8llnfg6961b6x7jkvhihbj";
     };
 
@@ -5413,7 +5413,7 @@ in modules // {
     disabled = isPy34;  # see http://bugs.python.org/issue21121
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/e/evdev/${name}.tar.gz";
+      url = "mirror://pypi/e/evdev/${name}.tar.gz";
       sha256 = "1mz8cfncpxc1wbk2nj7apl0ssqc0vfndysxchq3wabd9vzx5p71k";
     };
 
@@ -5437,7 +5437,7 @@ in modules // {
     name = "Eve-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/E/Eve/${name}.tar.gz";
+      url = "mirror://pypi/E/Eve/${name}.tar.gz";
       sha256 = "0wf1x8qixkld6liz5syqi8i9nrfrhq4lpmh0p9cy3jbkhk34km69";
     };
 
@@ -5495,7 +5495,7 @@ in modules // {
     version = "0.2.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/E/Events/${name}.tar.gz";
+      url = "mirror://pypi/E/Events/${name}.tar.gz";
       sha256 = "0rymyfvarjdi2fdhfz2iqmp4wgd2n2sm0p2mx44c3spm7ylnqzqa";
     };
 
@@ -5547,7 +5547,7 @@ in modules // {
     name = "execnet-1.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/e/execnet/${name}.zip";
+      url = "mirror://pypi/e/execnet/${name}.zip";
       sha256 = "fa1d8bd6b6d2282ff4df474b8ac687e1775bff4fc6462b219a5f89d5e9e6908c";
     };
 
@@ -5565,7 +5565,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/f/facebook-sdk/facebook-sdk-0.4.0.tar.gz";
+      url = "mirror://pypi/f/facebook-sdk/facebook-sdk-0.4.0.tar.gz";
       sha256 = "5a96c54d06213039dff1fe1fabc51972e394666cd6d83ea70f7c2e67472d9b72";
     };
 
@@ -5580,7 +5580,7 @@ in modules // {
     name = "faker-0.0.4";
     disabled = isPy3k;
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/F/Faker/Faker-0.0.4.tar.gz;
+      url = mirror://pypi/F/Faker/Faker-0.0.4.tar.gz;
       sha256 = "09q5jna3j8di0gw5yjx0dvlndkrk2x9vvqzwyfsvg3nlp8h38js1";
     };
     buildInputs = with self; [ nose ];
@@ -5596,7 +5596,7 @@ in modules // {
   fake_factory = buildPythonPackage rec {
     name = "fake-factory-0.2";
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/f/fake-factory/fake-factory-0.2.tar.gz;
+      url = mirror://pypi/f/fake-factory/fake-factory-0.2.tar.gz;
       sha256 = "0qdmk8p4anrj9mf95dh9v7bkhv1pz69hvhlw380kj4iz7b44b6zn";
     };
     meta = {
@@ -5612,7 +5612,7 @@ in modules // {
     name = "Fabric-${version}";
     version = "1.10.2";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/F/Fabric/${name}.tar.gz";
+      url = "mirror://pypi/F/Fabric/${name}.tar.gz";
       sha256 = "0nikc05iz1fx2c9pvxrhrs819cpmg566azm99450yq2m8qmp1cpd";
     };
     disabled = isPy3k;
@@ -5654,7 +5654,7 @@ in modules // {
     name = "frozendict-0.5";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/f/frozendict/${name}.tar.gz";
+      url = "mirror://pypi/f/frozendict/${name}.tar.gz";
       sha256 = "0m4kg6hbadvf99if78nx01q7qnbyhdw3x4znl5dasgciyi54432n";
     };
 
@@ -5670,7 +5670,7 @@ in modules // {
     name = "ftputil-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/f/ftputil/${name}.tar.gz";
+      url = "mirror://pypi/f/ftputil/${name}.tar.gz";
       sha256 = "1714w0v6icw2xjx5m54yv2qgkq49qwxwllq4gdb7wkz25iiapr8b";
     };
 
@@ -5687,7 +5687,7 @@ in modules // {
   fudge = buildPythonPackage rec {
     name = "fudge-1.1.0";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/f/fudge/${name}.tar.gz";
+      url = "mirror://pypi/f/fudge/${name}.tar.gz";
       sha256 = "eba59a926fa1df1ab6dddd69a7a8af21865b16cad800cb4d1af75070b0f52afb";
     };
     buildInputs = with self; [ nose nosejs ];
@@ -5703,7 +5703,7 @@ in modules // {
   fudge_9 = self.fudge.override rec {
     name = "fudge-0.9.6";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/f/fudge/${name}.tar.gz";
+      url = "mirror://pypi/f/fudge/${name}.tar.gz";
       sha256 = "34690c4692e8717f4d6a2ab7d841070c93c8d0ea0d2615b47064e291f750b1a0";
     };
   };
@@ -5713,7 +5713,7 @@ in modules // {
     name = "funcparserlib-0.3.6";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/f/funcparserlib/${name}.tar.gz";
+      url = "mirror://pypi/f/funcparserlib/${name}.tar.gz";
       sha256 = "b7992eac1a3eb97b3d91faa342bfda0729e990bd8a43774c1592c091e563c91d";
     };
 
@@ -5738,7 +5738,7 @@ in modules // {
     propagatedBuildInputs = with self; [ six ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/singledispatch/${name}.tar.gz";
+      url = "mirror://pypi/s/singledispatch/${name}.tar.gz";
       sha256 = "5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c";
     };
 
@@ -5752,7 +5752,7 @@ in modules // {
     version = "3.2.3-2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/f/functools32/functools32-${version}.tar.gz";
+      url = "mirror://pypi/f/functools32/functools32-${version}.tar.gz";
       sha256 = "0v8ya0b58x47wp216n1zamimv4iw57cxz3xxhzix52jkw3xks9gn";
     };
 
@@ -5840,7 +5840,7 @@ in modules // {
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/g/gmpy/${name}.zip";
+      url = "mirror://pypi/g/gmpy/${name}.zip";
       sha256 = "1a79118a5332b40aba6aa24b051ead3a31b9b3b9642288934da754515da8fa14";
     };
 
@@ -5860,7 +5860,7 @@ in modules // {
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/g/gmpy2/${name}.zip";
+      url = "mirror://pypi/g/gmpy2/${name}.zip";
       sha256 = "5041d0ae24407c24487106099f5bcc4abb1a5f58d90e6712cc95321975eddbd4";
     };
 
@@ -5882,7 +5882,7 @@ in modules // {
     name = "gmusicapi-7.0.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/g/gmusicapi/gmusicapi-7.0.0.tar.gz";
+      url = "mirror://pypi/g/gmusicapi/gmusicapi-7.0.0.tar.gz";
       sha256 = "1zji4cgylyzz97cz69lywkbsn5nvvzrhk7iaqnpqpfvj9gwdchwn";
     };
 
@@ -5916,7 +5916,7 @@ in modules // {
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/g/gnureadline/${name}.tar.gz";
+      url = "mirror://pypi/g/gnureadline/${name}.tar.gz";
       sha256 = "1ghck2zz4xbqa3wz73brgjhrqj55p9hc1fq6c9zb09dnyhwb0nd2";
     };
 
@@ -5929,7 +5929,7 @@ in modules // {
   gnutls = buildPythonPackage rec {
     name = "python-gnutls";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-gnutls/python-gnutls-3.0.0.tar.gz";
+      url = "mirror://pypi/p/python-gnutls/python-gnutls-3.0.0.tar.gz";
       sha256 = "1yrdxcj5rzvz8iglircz6icvyggz5fmdcd010n6w3j60yp4p84kc";
     };
 
@@ -5940,7 +5940,7 @@ in modules // {
     name = "gitdb-0.6.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/g/gitdb/${name}.tar.gz";
+      url = "mirror://pypi/g/gitdb/${name}.tar.gz";
       sha256 = "0n4n2c7rxph9vs2l6xlafyda5x1mdr8xy16r9s3jwnh3pqkvrsx3";
     };
 
@@ -5967,7 +5967,7 @@ in modules // {
     name = "GitPython-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/G/GitPython/GitPython-${version}.tar.gz";
+      url = "mirror://pypi/G/GitPython/GitPython-${version}.tar.gz";
       sha256 = "0q7plxnbbkp5dd0k73736l7gf932a89yy920yrgl8amfpixw324w";
     };
 
@@ -6072,7 +6072,7 @@ in modules // {
     name = "gpsoauth-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/g/gpsoauth/${name}.tar.gz";
+      url = "mirror://pypi/g/gpsoauth/${name}.tar.gz";
       sha256 = "1mhd2lkl1f4fmia1cwxwik8gvqr5q16scjip7kfwzadh9a11n9kw";
     };
 
@@ -6147,7 +6147,7 @@ in modules // {
     name = "hglib-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-hglib/python-hglib-${version}.tar.gz";
+      url = "mirror://pypi/p/python-hglib/python-hglib-${version}.tar.gz";
       sha256 = "0dc087d15b774cda82d3c8096fb0e514caeb2ddb60eed38e9056b16e279ba3c5";
     };
 
@@ -6165,7 +6165,7 @@ in modules // {
     name = "humanize-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/h/humanize/${name}.tar.gz";
+      url = "mirror://pypi/h/humanize/${name}.tar.gz";
       sha256 = "a43f57115831ac7c70de098e6ac46ac13be00d69abbf60bdcac251344785bb19";
     };
 
@@ -6189,7 +6189,7 @@ in modules // {
     version = "2.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/h/hovercraft/${name}.tar.gz";
+      url = "mirror://pypi/h/hovercraft/${name}.tar.gz";
       sha256 = "0lqxr816lymgnywln8bbv9nrmkyahjjcjkm9kjyny9bflayz4f1g";
     };
 
@@ -6212,7 +6212,7 @@ in modules // {
     name = "httpauth-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/h/httpauth/${name}.tar.gz";
+      url = "mirror://pypi/h/httpauth/${name}.tar.gz";
       sha256 = "294029b5dfed27bca5746a31e3ffb5ed99268761536705e8bbd44231b7ca15ec";
     };
 
@@ -6231,7 +6231,7 @@ in modules // {
     version = "0.7.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/imagesize/${name}.tar.gz";
+      url = "mirror://pypi/i/imagesize/${name}.tar.gz";
       sha256 = "0msgz4ncp2nb5nbsxnf8kvxsl6nhwvc3b46ik097fvznl3y10gdv";
     };
 
@@ -6275,7 +6275,7 @@ in modules // {
     name = "itsdangerous-0.24";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/itsdangerous/${name}.tar.gz";
+      url = "mirror://pypi/i/itsdangerous/${name}.tar.gz";
       sha256 = "06856q6x675ly542ig0plbqcyab6ksfzijlyf1hzhgg3sgwgrcyb";
     };
 
@@ -6291,7 +6291,7 @@ in modules // {
     version = "0.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/iniparse/iniparse-${version}.tar.gz";
+      url = "mirror://pypi/i/iniparse/iniparse-${version}.tar.gz";
       sha256 = "0m60k46vr03x68jckachzsipav0bwhhnqb8715hm1cngs89fxhdb";
     };
 
@@ -6314,7 +6314,7 @@ in modules // {
     name = "i3-py-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/i3-py/i3-py-${version}.tar.gz";
+      url = "mirror://pypi/i/i3-py/i3-py-${version}.tar.gz";
       sha256 = "1sgl438jrb4cdyl7hbc3ymwsf7y3zy09g1gh7ynilxpllp37jc8y";
     };
 
@@ -6375,7 +6375,7 @@ in modules // {
     name = "jsonpatch-1.11";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/j/jsonpatch/${name}.tar.gz";
+      url = "mirror://pypi/j/jsonpatch/${name}.tar.gz";
       sha256 = "22d0bc0f5522a4a03dd9fb4c4cdf7c1f03256546c88be4c61e5ceabd22280e47";
     };
 
@@ -6392,7 +6392,7 @@ in modules // {
     name = "jsonpointer-1.9";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/j/jsonpointer/${name}.tar.gz";
+      url = "mirror://pypi/j/jsonpointer/${name}.tar.gz";
       sha256 = "39403b47a71aa782de6d80db3b78f8a5f68ad8dfc9e674ca3bb5b32c15ec7308";
     };
 
@@ -6435,7 +6435,7 @@ in modules // {
     name = "ledger-autosync-${version}";
     version = "0.2.3";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/l/ledger-autosync/ledger-autosync-${version}.tar.gz";
+      url = "mirror://pypi/l/ledger-autosync/ledger-autosync-${version}.tar.gz";
       sha256 = "f19fa66e656309825887171d84a462e64676b1cc36b62e4dd8679ff63926a469";
     };
 
@@ -6466,7 +6466,7 @@ in modules // {
     version = "1.2.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/l/libthumbor/${name}.tar.gz";
+      url = "mirror://pypi/l/libthumbor/${name}.tar.gz";
       sha256 = "09bbaf08124ee33ea4ef99881625bd20450b0b43ab90fd678479beba8c03f86e";
     };
 
@@ -6484,7 +6484,7 @@ in modules // {
     name = "lightning-python-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/l/lightning-python/${name}.tar.gz";
+      url = "mirror://pypi/l/lightning-python/${name}.tar.gz";
       sha256 = "3987d7d4a634bdb6db9bcf212cf4d2f72bab5bc039f4f6cbc02c9d01c4ade792";
     };
 
@@ -6510,7 +6510,7 @@ in modules // {
     name = "jupyter-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/j/jupyter/${name}.tar.gz";
+      url = "mirror://pypi/j/jupyter/${name}.tar.gz";
       sha256 = "d9dc4b3318f310e34c82951ea5d6683f67bed7def4b259fafbfe4f1beb1d8e5f";
     };
 
@@ -6536,7 +6536,7 @@ in modules // {
     name = "jupyter_console-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/j/jupyter_console/${name}.tar.gz";
+      url = "mirror://pypi/j/jupyter_console/${name}.tar.gz";
       sha256 = "1qsa9h7db8qzd4hg9l5mfl8299y4i7jkd6p3vpksk3r5ip8wym6p";
     };
 
@@ -6566,7 +6566,7 @@ in modules // {
     ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/P/PyLTI/${name}.tar.gz";
+      url = "mirror://pypi/P/PyLTI/${name}.tar.gz";
       sha256 = "1lkk6qx8yfx1h0rhi4abnd44x0wakggi6zs0nvi572lajf6ydmdh";
     };
 
@@ -6616,7 +6616,7 @@ in modules // {
     name = "mailchimp-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/m/mailchimp/mailchimp-${version}.tar.gz";
+      url = "mirror://pypi/m/mailchimp/mailchimp-${version}.tar.gz";
       sha256 = "0351ai0jqv3dzx0xxm1138sa7mb42si6xfygl5ak8wnfc95ff770";
     };
 
@@ -6732,7 +6732,7 @@ in modules // {
     name = "natsort-4.0.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/natsort/${name}.tar.gz";
+      url = "mirror://pypi/n/natsort/${name}.tar.gz";
       sha256 = "a0d4239bd609eae5cd5163db6f9794378ce0e3f43ae16c10c35472d866ae20cd";
     };
 
@@ -6792,7 +6792,7 @@ in modules // {
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/netCDF4/${name}.tar.gz";
+      url = "mirror://pypi/n/netCDF4/${name}.tar.gz";
       sha256 = "0wzg73zyjjhns4209vrcvh71gs392d16ynz76x3pl1xg2by723iy";
     };
 
@@ -6824,7 +6824,7 @@ in modules // {
     name = "odfpy-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/odfpy/${name}.tar.gz";
+      url = "mirror://pypi/o/odfpy/${name}.tar.gz";
       sha256 = "e458f969f1ccd7ed77d70a45fe69ad656ac61b39e36e4d32c42d4e3216030891";
     };
 
@@ -6844,7 +6844,7 @@ in modules // {
     version = "0.1.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pathtools/${name}.tar.gz";
+      url = "mirror://pypi/p/pathtools/${name}.tar.gz";
       sha256 = "1h7iam33vwxk8bvslfj4qlsdprdnwf8bvzhqh3jq5frr391cadbw";
     };
 
@@ -6861,7 +6861,7 @@ in modules // {
     name    = "Paver-${version}";
 
     src = pkgs.fetchurl {
-      url    = "https://pypi.python.org/packages/source/P/Paver/Paver-${version}.tar.gz";
+      url    = "mirror://pypi/P/Paver/Paver-${version}.tar.gz";
       sha256 = "0lix9d33ndb3yk56sm1zlj80fbmxp0w60yk0d9pr2xqxiwi88sqy";
     };
 
@@ -6885,7 +6885,7 @@ in modules // {
     name    = "passlib-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/passlib/passlib-${version}.tar.gz";
+      url = "mirror://pypi/p/passlib/passlib-${version}.tar.gz";
       sha256 = "e987f6000d16272f75314c7147eb015727e8532a3b747b1a8fb58e154c68392d";
     };
 
@@ -6904,7 +6904,7 @@ in modules // {
     disabled = ! isPy27;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pdfminer/pdfminer-${version}.tar.gz";
+      url = "mirror://pypi/p/pdfminer/pdfminer-${version}.tar.gz";
       sha256 = "0qpjv4b776dwvpf5a7v19g41qsz97bv0qqsyvm7a31k50n9pn65s";
     };
 
@@ -6922,7 +6922,7 @@ in modules // {
     name = "peppercorn-0.5";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/peppercorn/${name}.tar.gz";
+      url = "mirror://pypi/p/peppercorn/${name}.tar.gz";
       sha256 = "921cba5d51fa211e6da0fbd2120b9a98d663422a80f5bb669ad81ffb0909774b";
     };
 
@@ -6939,7 +6939,7 @@ in modules // {
     disabled = pythonOlder "3.4"; # old versions require backported libraries
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pew/${name}.tar.gz";
+      url = "mirror://pypi/p/pew/${name}.tar.gz";
       sha256 = "0p188ah80l0rzbib2srahj2sswz8rcpqwbrbajyv2r5c1m5k6r4b";
     };
 
@@ -6957,7 +6957,7 @@ in modules // {
     name = "pies-2.6.5";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pies/${name}.tar.gz";
+      url = "mirror://pypi/p/pies/${name}.tar.gz";
       sha256 = "d8d6ae4faa0a7da5d634ad8c6ca4bb22b70ad53bb7ecd91af23d490fcd2a88e8";
     };
 
@@ -6979,7 +6979,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pies2overrides/${name}.tar.gz";
+      url = "mirror://pypi/p/pies2overrides/${name}.tar.gz";
       sha256 = "2a91445afc7f692bdbabfbf00d3defb1d47ad7825eb568a6464359758ab35763";
     };
 
@@ -7000,7 +7000,7 @@ in modules // {
     doCheck = false;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pirate-get/${name}.tar.gz";
+      url = "mirror://pypi/p/pirate-get/${name}.tar.gz";
       sha256 = "033dwv0w9fx3dwrna3fzvmynsfhb2qjhx6f2i9sfv82ijvkm8ynz";
     };
 
@@ -7020,7 +7020,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plotly/${name}.tar.gz";
+      url = "mirror://pypi/p/plotly/${name}.tar.gz";
       sha256 = "628679e880caab22e2a46273e85e1d1ce1382b631e1c7bbfe539f804c5269b21";
     };
 
@@ -7040,7 +7040,7 @@ in modules // {
     disabled = isPy3k || isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-poppler-qt4/" +
+      url = "mirror://pypi/p/python-poppler-qt4/" +
             "python-poppler-qt4-${version}.tar.gz";
       sha256 = "00e3f89f4e23a844844d082918a89c2cbb1e8231ecb011b81d592e7e3c33a74c";
     };
@@ -7068,7 +7068,7 @@ in modules // {
     name = "pudb-2013.3.6";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pudb/${name}.tar.gz";
+      url = "mirror://pypi/p/pudb/${name}.tar.gz";
       sha256 = "81b20a995803c4be513e6d36c8ec9a531d3ccb24670b2416abc20f3933ddb8be";
     };
 
@@ -7086,7 +7086,7 @@ in modules // {
     version = "1.0.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pycares/${name}.tar.gz";
+      url = "mirror://pypi/p/pycares/${name}.tar.gz";
       sha256 = "a18341ea030e2cc0743acdf4aa72302bdf6b820938b36ce4bd76e43faa2276a3";
     };
 
@@ -7107,7 +7107,7 @@ in modules // {
     version = "0.1.7";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-axolotl/${name}.tar.gz";
+      url = "mirror://pypi/p/python-axolotl/${name}.tar.gz";
       sha256 = "1i3id1mjl67n4sca31s5zwq96kswgsi6lga6np83ayb45rxggvhx";
     };
 
@@ -7127,7 +7127,7 @@ in modules // {
     version = "0.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-axolotl-curve25519/${name}.tar.gz";
+      url = "mirror://pypi/p/python-axolotl-curve25519/${name}.tar.gz";
       sha256 = "1h1rsdr7m8lvgxwrwng7qv0xxmyc9k0q7g9nbcr6ks2ipyjzcnf5";
     };
 
@@ -7169,7 +7169,7 @@ in modules // {
     name = "pyramid-1.5.7";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyramid/${name}.tar.gz";
+      url = "mirror://pypi/p/pyramid/${name}.tar.gz";
       sha256 = "1d29fj86724z68zcj9ximl2nrn34pflrlr6v9mwyhcv8rdf2sc61";
     };
 
@@ -7213,7 +7213,7 @@ in modules // {
     name = "pyramid_beaker-0.8";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyramid_beaker/${name}.tar.gz";
+      url = "mirror://pypi/p/pyramid_beaker/${name}.tar.gz";
       sha256 = "0hflx3qkcdml1mwpq53sz46s7jickpfn0zy0ns2c7j445j66bp3p";
     };
 
@@ -7231,7 +7231,7 @@ in modules // {
     name = "pyramid_chameleon-0.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyramid_chameleon/${name}.tar.gz";
+      url = "mirror://pypi/p/pyramid_chameleon/${name}.tar.gz";
       sha256 = "d176792a50eb015d7865b44bd9b24a7bd0489fa9a5cebbd17b9e05048cef9017";
     };
 
@@ -7253,7 +7253,7 @@ in modules // {
     version = "2.5";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyramid_jinja2/${name}.tar.gz";
+      url = "mirror://pypi/p/pyramid_jinja2/${name}.tar.gz";
       sha256 = "93c86e3103b454301f4d66640191aba047f2ab85ba75647aa18667b7448396bd";
     };
 
@@ -7271,7 +7271,7 @@ in modules // {
     name = "pyramid_debugtoolbar-1.0.9";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyramid_debugtoolbar/${name}.tar.gz";
+      url = "mirror://pypi/p/pyramid_debugtoolbar/${name}.tar.gz";
       sha256 = "1vnzg1qnnyisv7znxg7pasayfyr3nz7rrs5nqr4fmdgwj9q2pyv0";
     };
 
@@ -7284,7 +7284,7 @@ in modules // {
     name = "pyramid_mako-0.3.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyramid_mako/${name}.tar.gz";
+      url = "mirror://pypi/p/pyramid_mako/${name}.tar.gz";
       sha256 = "00811djmsc4rz20kpy2paam05fbx6dmrv2i5jf90f6xp6zw4isy6";
     };
 
@@ -7297,7 +7297,7 @@ in modules // {
     name = "pyramid_exclog-0.7";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyramid_exclog/${name}.tar.gz";
+      url = "mirror://pypi/p/pyramid_exclog/${name}.tar.gz";
       sha256 = "a58c82866c3e1a350684e6b83b440d5dc5e92ca5d23794b56d53aac06fb65a2c";
     };
 
@@ -7314,7 +7314,7 @@ in modules // {
     name = "pyramid_tm-0.10";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyramid_tm/${name}.tar.gz";
+      url = "mirror://pypi/p/pyramid_tm/${name}.tar.gz";
       sha256 = "99528c54accf2bd5860d10634fe8972e8375b2d0f50ee08f208ed0484ffafc1d";
     };
 
@@ -7331,7 +7331,7 @@ in modules // {
     version = "0.3.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyramid_multiauth/${name}.tar.gz";
+      url = "mirror://pypi/p/pyramid_multiauth/${name}.tar.gz";
       sha256 = "c33f357e0a216cd6ef7d143d40d4679c9fb0796a1eabaf1249aeef63ed000828";
     };
 
@@ -7379,7 +7379,7 @@ in modules // {
     version = "1.1.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/R/Radicale/Radicale-${version}.tar.gz";
+      url = "mirror://pypi/R/Radicale/Radicale-${version}.tar.gz";
       sha256 = "1c5lv8qca21mndkx350wxv34qypqh6gb4rhzms4anr642clq3jg2";
     };
 
@@ -7410,7 +7410,7 @@ in modules // {
     name = "raven-3.4.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/r/raven/${name}.tar.gz";
+      url = "mirror://pypi/r/raven/${name}.tar.gz";
       sha256 = "c27e40ab3ccf37f30a9f77acb4917370d9341e25abda8e94b9bd48c7127f7d48";
     };
 
@@ -7428,7 +7428,7 @@ in modules // {
     name = "roman-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/roman/${name}.zip";
+      url = "mirror://pypi/r/roman/${name}.zip";
       sha256 = "90e83b512b44dd7fc83d67eb45aa5eb707df623e6fc6e66e7f273abd4b2613ae";
     };
 
@@ -7449,7 +7449,7 @@ in modules // {
     name = "librosa-${version}";
     version = "0.4.0";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/l/librosa/librosa-0.4.0.tar.gz";
+      url = "mirror://pypi/l/librosa/librosa-0.4.0.tar.gz";
       sha256 = "cc11dcc41f51c08e442292e8a2fc7d7ee77e0d47ff771259eb63f57fcee6f6e7";
     };
 
@@ -7461,7 +7461,7 @@ in modules // {
     name = "joblib-${version}";
     version = "0.9.4";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/j/joblib/${name}.tar.gz";
+      url = "mirror://pypi/j/joblib/${name}.tar.gz";
       sha256 = "e5faacf0da7b3035dbca9d56210962b86564aafca71a25f4ea376a405455cd60";
     };
 
@@ -7498,7 +7498,7 @@ in modules // {
     version = "0.1.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/sarge/${name}.tar.gz";
+      url = "mirror://pypi/s/sarge/${name}.tar.gz";
       sha256 = "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar";
     };
 
@@ -7517,7 +7517,7 @@ in modules // {
     disabled = !isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/h/hyp-server/${name}.tar.gz";
+      url = "mirror://pypi/h/hyp-server/${name}.tar.gz";
       sha256 = "1lafjdcn9nnq6xc3hhyizfwh6l69lc7rixn6dx65aq71c913jc15";
     };
 
@@ -7534,7 +7534,7 @@ in modules // {
     name = "hypatia-0.3";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/h/hypatia/${name}.tar.gz";
+      url = "mirror://pypi/h/hypatia/${name}.tar.gz";
       sha256 = "fb4d394eeac4b06ff2259cada6174aebbe77edd243ffd1deda320cb327f98bd9";
     };
 
@@ -7550,7 +7550,7 @@ in modules // {
     name = "zope.copy-4.0.2";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.copy/${name}.zip";
+      url = "mirror://pypi/z/zope.copy/${name}.zip";
       sha256 = "eb2a95866df1377741876a3ee62d8600e80089e6246e1a235e86791b29534457";
     };
 
@@ -7566,7 +7566,7 @@ in modules // {
     name = "ssdeep-3.1.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/ssdeep/${name}.tar.gz";
+      url = "mirror://pypi/s/ssdeep/${name}.tar.gz";
       sha256 = "1p9dpykmnfb73cszdiic5wbz5bmbbmkiih08pb4dah5mwq4n7im6";
     };
 
@@ -7580,7 +7580,7 @@ in modules // {
     version = "3.2.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/statsd/${name}.tar.gz";
+      url = "mirror://pypi/s/statsd/${name}.tar.gz";
       sha256 = "3fa92bf0192af926f7a0d9be031fe3fd0fbaa1992d42cf2f07e68f76ac18288e";
     };
 
@@ -7605,7 +7605,7 @@ in modules // {
   py3status = buildPythonPackage rec {
     name = "py3status-2.8";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/py3status/${name}.tar.gz";
+      url = "mirror://pypi/p/py3status/${name}.tar.gz";
       sha256 = "1aq4l1lj6j54a8mh9y3yscbxv41bbhz89fiwnydj2gx0md5sq5v5";
     };
     propagatedBuildInputs = with self; [ requests2 ];
@@ -7622,7 +7622,7 @@ in modules // {
     version = "2.0.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/m/multi_key_dict/multi_key_dict-${version}.tar.gz";
+      url = "mirror://pypi/m/multi_key_dict/multi_key_dict-${version}.tar.gz";
       sha256 = "17lkx4rf4waglwbhc31aak0f28c63zl3gx5k5i1iq2m3gb0xxsyy";
     };
 
@@ -7636,7 +7636,7 @@ in modules // {
     name = "pyramid_zodbconn-0.7";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyramid_zodbconn/${name}.tar.gz";
+      url = "mirror://pypi/p/pyramid_zodbconn/${name}.tar.gz";
       sha256 = "56cfdb6b13dc87b1c51c7abc1557c63960d6b858e14a2d4c9693c3f7877f5f63";
     };
 
@@ -7656,7 +7656,7 @@ in modules // {
     name = "pyramid_mailer-0.13";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyramid_mailer/${name}.tar.gz";
+      url = "mirror://pypi/p/pyramid_mailer/${name}.tar.gz";
       sha256 = "4debfad05ee65a05ba6f43e2af913e6e30db75ba42254e4aa0291500c4caa1fc";
     };
 
@@ -7672,7 +7672,7 @@ in modules // {
     name = "pyrtlsdr-0.2.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyrtlsdr/${name}.zip";
+      url = "mirror://pypi/p/pyrtlsdr/${name}.zip";
       sha256 = "cbb9086efe4320858c48f4856d09f7face191c4156510b1459ef4e5588935b6a";
     };
 
@@ -7694,7 +7694,7 @@ in modules // {
     name = "repoze.sendmail-4.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/r/repoze.sendmail/${name}.tar.gz";
+      url = "mirror://pypi/r/repoze.sendmail/${name}.tar.gz";
       sha256 = "51813730adc24728d5ce2609038f7bb81aa1632539d7a79045ef4aa6942eaba2";
     };
 
@@ -7710,7 +7710,7 @@ in modules // {
     name = "zodburi-2.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zodburi/${name}.tar.gz";
+      url = "mirror://pypi/z/zodburi/${name}.tar.gz";
       sha256 = "c04b9beca032bb7b968a3464417596ba4607a927c5e65929860962ddba1cccc0";
     };
 
@@ -7727,7 +7727,7 @@ in modules // {
     propagatedBuildInputs = with self; [ random2 zodb six transaction persistent zc_lockfile zconfig zdaemon zope_interface ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/Z/ZEO/${name}.tar.gz";
+      url = "mirror://pypi/Z/ZEO/${name}.tar.gz";
       sha256 = "63555b6d2b5f98d215c4b5fdce004fb0475daa6efc8b70f39c77d646c12d7e51";
     };
 
@@ -7742,7 +7742,7 @@ in modules // {
     doCheck = !isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/random2/${name}.zip";
+      url = "mirror://pypi/r/random2/${name}.zip";
       sha256 = "34ad30aac341039872401595df9ab2c9dc36d0b7c077db1cea9ade430ed1c007";
     };
   };
@@ -7796,7 +7796,7 @@ in modules // {
     version = "2.0b1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/svg.path/${name}.zip";
+      url = "mirror://pypi/s/svg.path/${name}.zip";
       sha256 = "038x4wqkbvcs71x6n6kzr4kn99csyv8v4gqzssr8pqylqpxi56bm";
     };
 
@@ -7813,7 +7813,7 @@ in modules // {
     version = "2016.01.10";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/regex/${name}.tar.gz";
+      url = "mirror://pypi/r/regex/${name}.tar.gz";
       sha256 = "1q3rbmnijjzn7y3cm3qy49b5lqw1fq38zv974xma387lwc37d9q2";
     };
 
@@ -7830,7 +7830,7 @@ in modules // {
     name = "repoze.lru-0.6";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/r/repoze.lru/${name}.tar.gz";
+      url = "mirror://pypi/r/repoze.lru/${name}.tar.gz";
       sha256 = "0f7a323bf716d3cb6cb3910cd4fccbee0b3d3793322738566ecce163b01bbd31";
     };
 
@@ -7846,7 +7846,7 @@ in modules // {
     name = "repoze.sphinx.autointerface-0.7.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/r/repoze.sphinx.autointerface/${name}.tar.gz";
+      url = "mirror://pypi/r/repoze.sphinx.autointerface/${name}.tar.gz";
       sha256 = "97ef5fac0ab0a96f1578017f04aea448651fa9f063fc43393a8253bff8d8d504";
     };
 
@@ -7888,7 +7888,7 @@ in modules // {
     version = "1.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/setuptools-git/${name}.tar.gz";
+      url = "mirror://pypi/s/setuptools-git/${name}.tar.gz";
       sha256 = "047d7595546635edebef226bc566579d422ccc48a8a91c7d32d8bd174f68f831";
     };
 
@@ -7915,7 +7915,7 @@ in modules // {
     doCheck = false;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/w/watchdog/${name}.tar.gz";
+      url = "mirror://pypi/w/watchdog/${name}.tar.gz";
       sha256 = "0qj1vqszxwfx6d1s66s96jmfmy2j94bywxiqdydh6ikpvcm8hrby";
     };
 
@@ -7931,7 +7931,7 @@ in modules // {
     name = "pywatchman-${version}";
     version = "1.3.0";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pywatchman/pywatchman-${version}.tar.gz";
+      url = "mirror://pypi/p/pywatchman/pywatchman-${version}.tar.gz";
       sha256 = "c3d5be183b5b04f6ad575fc71b06dd196185dea1558d9f4d0598ba9beaab8245";
     };
     postPatch = ''
@@ -7946,7 +7946,7 @@ in modules // {
     propagatedBuildInputs = with self; [ zope_interface six zope_testrunner ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/z/zope.tales/${name}.zip";
+      url = "mirror://pypi/z/zope.tales/${name}.zip";
       sha256 = "c0485f09c3f23c7a0ceddabcb02d4a40ebecf8f8f36c87fa9a02c415f96c969e";
     };
   };
@@ -7956,7 +7956,7 @@ in modules // {
     name = "zope.deprecation-4.1.2";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.deprecation/${name}.tar.gz";
+      url = "mirror://pypi/z/zope.deprecation/${name}.tar.gz";
       sha256 = "fed622b51ffc600c13cc5a5b6916b8514c115f34f7ea2730409f30c061eb0b78";
     };
 
@@ -7972,7 +7972,7 @@ in modules // {
     name = "validictory-1.0.0a2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/v/validictory/validictory-1.0.0a2.tar.gz";
+      url = "mirror://pypi/v/validictory/validictory-1.0.0a2.tar.gz";
       sha256 = "c02388a70f5b854e71e2e09bd6d762a2d8c2a017557562e866d8ffafb0934b07";
     };
 
@@ -7989,7 +7989,7 @@ in modules // {
     name = "venusian-1.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/v/venusian/${name}.tar.gz";
+      url = "mirror://pypi/v/venusian/${name}.tar.gz";
       sha256 = "1720cff2ca9c369c840c1d685a7c7a21da1afa687bfe62edd93cae4bf429ca5a";
     };
 
@@ -8007,7 +8007,7 @@ in modules // {
     name = "Chameleon-2.15";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/C/Chameleon/${name}.tar.gz";
+      url = "mirror://pypi/C/Chameleon/${name}.tar.gz";
       sha256 = "bd1dfc96742c2a5b0b2adcab823bdd848e70c45a994dc4e51dd2cc31e2bae3be";
     };
 
@@ -8026,7 +8026,7 @@ in modules // {
     name = "ddt-1.0.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/ddt/${name}.tar.gz";
+      url = "mirror://pypi/d/ddt/${name}.tar.gz";
       sha256 = "e24ecb7e2cf0bf43fa9d4255d3ae2bd0b7ce30b1d1b89ace7aa68aca1152f37a";
     };
 
@@ -8089,7 +8089,7 @@ in modules // {
     name = "pyxdg-0.25";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyxdg/${name}.tar.gz";
+      url = "mirror://pypi/p/pyxdg/${name}.tar.gz";
       sha256 = "81e883e0b9517d624e8b0499eb267b82a815c0b7146d5269f364988ae031279d";
     };
 
@@ -8108,7 +8108,7 @@ in modules // {
     name = "chardet-2.3.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/c/chardet/${name}.tar.gz";
+      url = "mirror://pypi/c/chardet/${name}.tar.gz";
       sha256 = "e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa";
     };
 
@@ -8256,7 +8256,7 @@ in modules // {
     version = "1.0.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/django-appconf/django-appconf-${version}.tar.gz";
+      url = "mirror://pypi/d/django-appconf/django-appconf-${version}.tar.gz";
       sha256 = "0q3fg17qi4vwpipbj075zn4wk58p6a946kah8wayks1423xpa4xs";
     };
 
@@ -8275,7 +8275,7 @@ in modules // {
     version = "1.5";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/django_compressor/django_compressor-${version}.tar.gz";
+      url = "mirror://pypi/d/django_compressor/django_compressor-${version}.tar.gz";
       sha256 = "0bp2acagc6b1mmcajlmjf5vvp6zj429bq7p2wks05n47pwfzv281";
     };
 
@@ -8297,7 +8297,7 @@ in modules // {
     disabled = isPy35;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/django-compat/${name}.tar.gz";
+      url = "mirror://pypi/d/django-compat/${name}.tar.gz";
       sha256 = "195dgr55vzpw1fbjvbw2h35k9bfhvm5zchh2p7nzbq57xmwb3sra";
     };
 
@@ -8316,7 +8316,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/django_evolution/${name}.tar.gz";
+      url = "mirror://pypi/d/django_evolution/${name}.tar.gz";
       sha256 = "1qbcx54hq8iy3n2n6cki3bka1m9rp39np4hqddrm9knc954fb7nv";
     };
 
@@ -8333,7 +8333,7 @@ in modules // {
     name = "django-tagging-0.3.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/d/django-tagging/${name}.tar.gz";
+      url = "mirror://pypi/d/django-tagging/${name}.tar.gz";
       sha256 = "e5fbeb7ca6e0c22a9a96239095dff508040ec95171e51c69e6f8ada72ea4bce2";
     };
 
@@ -8354,7 +8354,7 @@ in modules // {
     version = "0.6.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/d/django-classy-tags/${name}.tar.gz";
+      url = "mirror://pypi/d/django-classy-tags/${name}.tar.gz";
       sha256 = "0wxvpmjdzk0aajk33y4himn3wqjx7k0aqlka9j8ay3yfav78bdq0";
     };
 
@@ -8375,7 +8375,7 @@ in modules // {
     version = "2.0.7";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/django-hijack/${name}.tar.gz";
+      url = "mirror://pypi/d/django-hijack/${name}.tar.gz";
       sha256 = "0rpi1bkfx74xfbb2nk874kfdra1jcqp2vzky1r3z7zidlc9kah04";
     };
 
@@ -8393,7 +8393,7 @@ in modules // {
     version = "1.4.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/django-nose/${name}.tar.gz";
+      url = "mirror://pypi/d/django-nose/${name}.tar.gz";
       sha256 = "0rl9ipa98smprlw56xqlhzhps28p84wg0640qlyn0rjyrpsdmf0r";
     };
 
@@ -8414,7 +8414,7 @@ in modules // {
     version = "0.6.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/django-modelcluster/django-modelcluster-${version}.tar.gz";
+      url = "mirror://pypi/d/django-modelcluster/django-modelcluster-${version}.tar.gz";
       sha256 = "1plsdi44dvsj2sfx79lsrccjfg0ymajcsf5n0mln4cwd4qi5mwpx";
     };
 
@@ -8433,7 +8433,7 @@ in modules // {
     version = "3.2.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/djangorestframework/${name}.tar.gz";
+      url = "mirror://pypi/d/djangorestframework/${name}.tar.gz";
       sha256 = "06kp4hg3y4bqy2ixlb1q6bw81gwgsb86l4lanbav7bp1grrbbnj1";
     };
 
@@ -8452,7 +8452,7 @@ in modules // {
     version = "4.2.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/d/django-redis/${name}.tar.gz";
+      url = "mirror://pypi/d/django-redis/${name}.tar.gz";
       sha256 = "9ad6b299458f7e6bfaefa8905f52560017369d82fb8fb0ed4b41adc048dbf11c";
     };
 
@@ -8476,7 +8476,7 @@ in modules // {
     version = "1.10.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/django-reversion/${name}.tar.gz";
+      url = "mirror://pypi/d/django-reversion/${name}.tar.gz";
       sha256 = "01iv8w6lmmq98qjhxmnp8ddjxifmhxcmp612ijd91wc8nv8lk12w";
     };
 
@@ -8495,7 +8495,7 @@ in modules // {
     version = "0.5.6";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/django-silk/${name}.tar.gz";
+      url = "mirror://pypi/d/django-silk/${name}.tar.gz";
       sha256 = "845abc688738858ce06e993c4b7dbbcfcecf33029e828f143463ff96f9a78947";
     };
 
@@ -8527,7 +8527,7 @@ in modules // {
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/django-taggit/django-taggit-${version}.tar.gz";
+      url = "mirror://pypi/d/django-taggit/django-taggit-${version}.tar.gz";
       sha256 = "1xy4mm1y6z6bpakw907859wz7fiw7jfm586dj89w0ggdqlb0767b";
     };
 
@@ -8544,7 +8544,7 @@ in modules // {
     version = "3.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/django-treebeard/${name}.tar.gz";
+      url = "mirror://pypi/d/django-treebeard/${name}.tar.gz";
       sha256 = "10p9rb2m1zccszg7590fjd0in6rabzsh86f5m7qm369mapc3b6dc";
     };
 
@@ -8563,7 +8563,7 @@ in modules // {
     version = "1.5.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/d/django-pipeline/${name}.tar.gz";
+      url = "mirror://pypi/d/django-pipeline/${name}.tar.gz";
       sha256 = "1y49fa8jj7x9qjj5wzhns3zxwj0s73sggvkrv660cqw5qb7d8hha";
     };
 
@@ -8579,7 +8579,7 @@ in modules // {
   django_pipeline_1_3 = self.django_pipeline.overrideDerivation (super: rec {
     name = "django-pipeline-1.3.27";
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/d/django-pipeline/${name}.tar.gz";
+      url = "mirror://pypi/d/django-pipeline/${name}.tar.gz";
       sha256 = "0iva3cmnh5jw54c7w83nx9nqv523hjvkbjchzd2pb6vzilxf557k";
     };
   });
@@ -8607,7 +8607,7 @@ in modules // {
     version = "0.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pillowfight/pillowfight-${version}.tar.gz";
+      url = "mirror://pypi/p/pillowfight/pillowfight-${version}.tar.gz";
       sha256 = "1mh1nhcjjgv7x134sv0krri59ng8bp2w6cwsxc698rixba9f3g0m";
     };
 
@@ -8626,7 +8626,7 @@ in modules // {
     version = "0.5";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/k/keepalive/keepalive-${version}.tar.gz";
+      url = "mirror://pypi/k/keepalive/keepalive-${version}.tar.gz";
       sha256 = "3c6b96f9062a5a76022f0c9d41e9ef5552d80b1cadd4fccc1bf8f183ba1d1ec1";
     };
 
@@ -8645,7 +8645,7 @@ in modules // {
     version = "1.7.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/S/SPARQLWrapper/SPARQLWrapper-${version}.tar.gz";
+      url = "mirror://pypi/S/SPARQLWrapper/SPARQLWrapper-${version}.tar.gz";
       sha256 = "1dpwwlcdk4m8wr3d9lb24g1xcvs202c0ir4q3jcijy88is3bvgmp";
     };
 
@@ -8670,7 +8670,7 @@ in modules // {
     version = "0.10.1a";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/dulwich/${name}.tar.gz";
+      url = "mirror://pypi/d/dulwich/${name}.tar.gz";
       sha256 = "02rknqarwy7p50693cqswbibqwgxzrfzdq4yhwqxbdmhbsmh0rk6";
     };
 
@@ -8691,7 +8691,7 @@ in modules // {
     version = "0.8.2";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/h/hg-git/${name}.tar.gz";
+      url = "mirror://pypi/h/hg-git/${name}.tar.gz";
       sha256 = "0hz0i6qgcn3ic292sny86mdl1psj1bnczcai1b1kzvwcla6z99py";
     };
 
@@ -8744,7 +8744,7 @@ in modules // {
     name = "dtopt-0.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/d/dtopt/${name}.tar.gz";
+      url = "mirror://pypi/d/dtopt/${name}.tar.gz";
       sha256 = "06ae07a12294a7ba708abaa63f838017d1a2faf6147a1e7a14ca4fa28f86da7f";
     };
 
@@ -8762,7 +8762,7 @@ in modules // {
     version = "0.13";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/e/ecdsa/${name}.tar.gz";
+      url = "mirror://pypi/e/ecdsa/${name}.tar.gz";
       sha256 = "1yj31j0asmrx4an9xvsaj2icdmzy6pw0glfpqrrkrphwdpi1xkv4";
     };
 
@@ -8782,7 +8782,7 @@ in modules // {
     name = "elpy-${version}";
     version = "1.9.0";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/e/elpy/${name}.tar.gz";
+      url = "mirror://pypi/e/elpy/${name}.tar.gz";
       sha256 = "419f7b05b19182bc1aedde1ae80812c1534e59a0493476aa01ea819e76ba26f0";
     };
     python2Deps = if isPy3k then [ ] else [ self.rope ];
@@ -8802,7 +8802,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/e/enum/${name}.tar.gz";
+      url = "mirror://pypi/e/enum/${name}.tar.gz";
       sha256 = "9bdfacf543baf2350df7613eb37f598a802f346985ca0dc1548be6494140fdff";
     };
 
@@ -8823,7 +8823,7 @@ in modules // {
     version = "1.0.4";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/e/enum34/${name}.tar.gz";
+      url = "mirror://pypi/e/enum34/${name}.tar.gz";
       sha256 = "0iz4jjdvdgvfllnpmd92qxj5fnfxqpgmjpvpik0jjim3lqk9zhfk";
     };
 
@@ -8839,7 +8839,7 @@ in modules // {
   epc = buildPythonPackage rec {
     name = "epc-0.0.3";
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/e/epc/${name}.tar.gz";
+      url = "mirror://pypi/e/epc/${name}.tar.gz";
       sha256 = "30b594bd4a4acbd5bda0d3fa3d25b4e8117f2ff8f24d2d1e3e36c90374f3c55e";
     };
 
@@ -8857,7 +8857,7 @@ in modules // {
     name = "et_xmlfile-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/e/et_xmlfile/${name}.tar.gz";
+      url = "mirror://pypi/e/et_xmlfile/${name}.tar.gz";
       sha256="0nrkhcb6jdrlb6pwkvd4rycw34y3s931hjf409ij9xkjsli9fkb1";
     };
 
@@ -8888,7 +8888,7 @@ in modules // {
     name = "eventlet-0.17.4";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/e/eventlet/${name}.tar.gz";
+      url = "mirror://pypi/e/eventlet/${name}.tar.gz";
       sha256 = "0vam0qfm8p5jkpp2cv12r5bnpnv902ld7q074h7x5y5g9rqyj8c7";
     };
 
@@ -8912,7 +8912,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/f/fastimport/${name}.tar.gz";
+      url = "mirror://pypi/f/fastimport/${name}.tar.gz";
       sha256 = "0k8x7552ypx9rc14vbsvg2lc6z0r8pv9laah28pdwyynbq10825d";
     };
 
@@ -8932,7 +8932,7 @@ in modules // {
     name = "feedgenerator-1.7";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/f/feedgenerator/${name}.tar.gz";
+      url = "mirror://pypi/f/feedgenerator/${name}.tar.gz";
       sha256 = "5d6b0b10134ac392be0c0c3a39c0e1d7e9c17cc7894590f75981e3f497a4a60f";
     };
 
@@ -8953,7 +8953,7 @@ in modules // {
     name = "feedparser-5.2.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/f/feedparser/${name}.tar.gz";
+      url = "mirror://pypi/f/feedparser/${name}.tar.gz";
       sha256 = "1ycva69bqssalhqg45rbrfipz3l6hmycszy26k0351fhq990c0xx";
     };
 
@@ -8974,7 +8974,7 @@ in modules // {
     disabled = isPy3k || isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyfribidi/${name}.zip";
+      url = "mirror://pypi/p/pyfribidi/${name}.zip";
       sha256 = "6f7d83c09eae0cb98a40b85ba3dedc31af4dbff8fc4425f244c1e9f44392fded";
     };
 
@@ -8991,7 +8991,7 @@ in modules // {
     namePrefix = "";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/docker-compose/${name}.tar.gz";
+      url = "mirror://pypi/d/docker-compose/${name}.tar.gz";
       sha256 = "10i4032d99hm5nj1p74pcad9i3gz1h5x3096byklncgssfyjqki6";
     };
 
@@ -9019,7 +9019,7 @@ in modules // {
     name = "filebrowser_safe-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/f/filebrowser_safe/${name}.tar.gz";
+      url = "mirror://pypi/f/filebrowser_safe/${name}.tar.gz";
       sha256 = "02bn60fdslvng2ckn65fms3hjbzgsa8qa5161a8lr720wbx8gpj2";
     };
 
@@ -9050,7 +9050,7 @@ in modules // {
     version = "2.5.4";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/f/flake8/${name}.tar.gz";
+      url = "mirror://pypi/f/flake8/${name}.tar.gz";
       sha256 = "0bs9cz4fr99r2rwig1b8jwaadl1nan7kgpdzqwj0bwbckwbmh7nc";
     };
 
@@ -9070,7 +9070,7 @@ in modules // {
     version = "3.1.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/f/flaky/${name}.tar.gz";
+      url = "mirror://pypi/f/flaky/${name}.tar.gz";
       sha256 = "1x9ixika7wqjj52x8wnsh1vk7jadkdqpx01plj7mlh8slwyq4s41";
     };
 
@@ -9091,7 +9091,7 @@ in modules // {
     name = "flask-0.10.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/F/Flask/Flask-0.10.1.tar.gz";
+      url = "mirror://pypi/F/Flask/Flask-0.10.1.tar.gz";
       sha256 = "4c83829ff83d408b5e1d4995472265411d2c414112298f2eb4b359d9e4563373";
     };
 
@@ -9109,7 +9109,7 @@ in modules // {
     version = "0.10";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/F/Flask-Assets/${name}.tar.gz";
+      url = "mirror://pypi/F/Flask-Assets/${name}.tar.gz";
       sha256 = "1v6ika3ias21xzhg7kglki99nwfx1i33rdhnw9kdqbwxkpwbwkyl";
     };
 
@@ -9128,7 +9128,7 @@ in modules // {
     name = "Flask-Cache-0.13.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/F/Flask-Cache/${name}.tar.gz";
+      url = "mirror://pypi/F/Flask-Cache/${name}.tar.gz";
       sha256 = "90126ca9bc063854ef8ee276e95d38b2b4ec8e45fd77d5751d37971ee27c7ef4";
     };
 
@@ -9146,7 +9146,7 @@ in modules // {
     version = "2.1.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/F/Flask-Cors/${name}.tar.gz";
+      url = "mirror://pypi/F/Flask-Cors/${name}.tar.gz";
       sha256 = "0fd618a4f88ykqx4x55viz47cm9rl214q1b45a0b4mz5vhxffqpj";
     };
 
@@ -9165,7 +9165,7 @@ in modules // {
     version = "0.2.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/F/Flask-Login/${name}.tar.gz";
+      url = "mirror://pypi/F/Flask-Login/${name}.tar.gz";
       sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p";
     };
 
@@ -9188,7 +9188,7 @@ in modules // {
     version = "1.7.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/F/Flask-Migrate/Flask-Migrate-1.7.0.tar.gz";
+      url = "mirror://pypi/F/Flask-Migrate/Flask-Migrate-1.7.0.tar.gz";
       sha256 = "16d7vnaj9xmxvb3qbcmhahm3ldfdhzzi6y221h62x4v1v1jayx7v";
     };
 
@@ -9213,7 +9213,7 @@ in modules // {
     version = "0.4.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/F/Flask-Principal/${name}.tar.gz";
+      url = "mirror://pypi/F/Flask-Principal/${name}.tar.gz";
       sha256 = "0lwlr5smz8vfm5h9a9i7da3q1c24xqc6vm9jdywdpgxfbi5i7mpm";
     };
 
@@ -9233,7 +9233,7 @@ in modules // {
     version = "0.3.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/F/Flask-PyMongo/${name}.tar.gz";
+      url = "mirror://pypi/F/Flask-PyMongo/${name}.tar.gz";
       sha256 = "0305qngvjrjyyabf8gxqgqvd9ffh00gr5yfrjf4nncr2my9svbyd";
     };
 
@@ -9251,7 +9251,7 @@ in modules // {
     version = "2.0.5";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/F/Flask-Script/${name}.tar.gz";
+      url = "mirror://pypi/F/Flask-Script/${name}.tar.gz";
       sha256 = "0zqh2yq8zk7m9b4xw1ryqmrljkdigfb3hk5155a3b5hkfnn6xxyf";
     };
 
@@ -9272,7 +9272,7 @@ in modules // {
     version = "2.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/F/Flask-SQLAlchemy/${name}.tar.gz";
+      url = "mirror://pypi/F/Flask-SQLAlchemy/${name}.tar.gz";
       sha256 = "1i9ps5d5snih9xlqhrvmi3qfiygkmqzxh92n25kj4pf89kj4s965";
     };
 
@@ -9290,7 +9290,7 @@ in modules // {
     name = "wtforms-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/W/WTForms/WTForms-${version}.zip";
+      url = "mirror://pypi/W/WTForms/WTForms-${version}.zip";
       sha256 = "0vyl26y9cg409cfyj8rhqxazsdnd0jipgjw06civhrd53yyi1pzz";
     };
 
@@ -9313,7 +9313,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/F/FlexGet/${name}.tar.gz";
+      url = "mirror://pypi/F/FlexGet/${name}.tar.gz";
       sha256 = "0f7aaf0bf37860f0c5adfb0ba59ca228aa3f5c582131445623a4c3bc82d45346";
     };
 
@@ -9347,7 +9347,7 @@ in modules // {
     name = "grappelli_safe-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/g/grappelli_safe/${name}.tar.gz";
+      url = "mirror://pypi/g/grappelli_safe/${name}.tar.gz";
       sha256 = "8b21b4724bce449cc4f22dc74ed0be9b3e841d968f3271850bf4836864304eb6";
     };
 
@@ -9375,7 +9375,7 @@ in modules // {
     name = "tvrage-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-tvrage/python-tvrage-${version}.tar.gz";
+      url = "mirror://pypi/p/python-tvrage/python-tvrage-${version}.tar.gz";
       sha256 = "f8a530376c5cf1bc573d1945a8504c3394b228c731a3eff5100c705997a72063";
     };
 
@@ -9397,7 +9397,7 @@ in modules // {
     disabled = !isPy27;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python2-pythondialog/python2-pythondialog-${version}.tar.gz";
+      url = "mirror://pypi/p/python2-pythondialog/python2-pythondialog-${version}.tar.gz";
       sha256 = "1yhkagsh99bfi592ymczf8rnw8rk6n9hdqy3dd98m3yrx8zmjvry";
     };
 
@@ -9415,7 +9415,7 @@ in modules // {
     version = "0.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyRFC3339/pyRFC3339-${version}.tar.gz";
+      url = "mirror://pypi/p/pyRFC3339/pyRFC3339-${version}.tar.gz";
       sha256 = "1pp648xsjaw9h1xq2mgwzda5wis2ypjmzxlksc1a8grnrdmzy155";
     };
 
@@ -9428,7 +9428,7 @@ in modules // {
     version = "0.9.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/C/ConfigArgParse/ConfigArgParse-${version}.tar.gz";
+      url = "mirror://pypi/C/ConfigArgParse/ConfigArgParse-${version}.tar.gz";
       sha256 = "0a984pvv7370yz7zbkl6s6i7yyl9myahx0m9jkjvg3hz5q8mf70l";
     };
 
@@ -9451,7 +9451,7 @@ in modules // {
     name = "jsonschema-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/j/jsonschema/jsonschema-${version}.tar.gz";
+      url = "mirror://pypi/j/jsonschema/jsonschema-${version}.tar.gz";
       sha256 = "0hddbqjm4jq63y8jf44nswina1crjs16l9snb6m3vvgyg31klrrn";
     };
 
@@ -9479,7 +9479,7 @@ in modules // {
     version = "2.14.0.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/v/vcversioner/vcversioner-${version}.tar.gz";
+      url = "mirror://pypi/v/vcversioner/vcversioner-${version}.tar.gz";
       sha256 = "11ivq1bm7v0yb4nsfbv9m7g7lyjn112gbvpjnjz8nv1fx633dm5c";
     };
 
@@ -9492,7 +9492,7 @@ in modules // {
     name = "falcon-0.3.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/f/falcon/${name}.tar.gz";
+      url = "mirror://pypi/f/falcon/${name}.tar.gz";
       sha256 = "10ivzk88m8nn3bqbg6xgv6yfy2dgp6yzbcvr645y93pzlash4xpj";
     };
 
@@ -9538,7 +9538,7 @@ in modules // {
     name = "fonttools-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/F/FontTools/fonttools-${version}.tar.gz";
+      url = "mirror://pypi/F/FontTools/fonttools-${version}.tar.gz";
       sha256 = "0f4iblpbf3y3ghajiccvdwk2f46cim6dsj6fq1kkrbqfv05dr4nz";
     };
 
@@ -9586,7 +9586,7 @@ in modules // {
     name = "forbiddenfruit-${version}";
 
     src = pkgs.fetchurl {
-      url= "https://pypi.python.org/packages/source/f/forbiddenfruit/${name}.tar.gz";
+      url= "mirror://pypi/f/forbiddenfruit/${name}.tar.gz";
       sha256 = "0xra2kw6m8ag29ifwmhi5zqksh4cr0yy1waqd488rm59kcr3zl79";
     };
 
@@ -9601,7 +9601,7 @@ in modules // {
     name = "fs-0.5.4";
 
     src = pkgs.fetchurl {
-      url    = "https://pypi.python.org/packages/source/f/fs/${name}.tar.gz";
+      url    = "mirror://pypi/f/fs/${name}.tar.gz";
       sha256 = "ba2cca8773435a7c86059d57cb4b8ea30fda40f8610941f7822d1ce3ffd36197";
     };
 
@@ -9652,7 +9652,7 @@ in modules // {
     name = "fusepy-2.0.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/f/fusepy/${name}.tar.gz";
+      url = "mirror://pypi/f/fusepy/${name}.tar.gz";
       sha256 = "0v5grm4zyf58hsplwsxfbihddw95lz9w8cy3rpzbyha287swgx8h";
     };
 
@@ -9717,7 +9717,7 @@ in modules // {
     version = "3.0.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/f/futures/${name}.tar.gz";
+      url = "mirror://pypi/f/futures/${name}.tar.gz";
       sha256 = "19485d83f7bd2151c0aeaf88fbba3ee50dadfb222ffc3b66a344ef4952b782a3";
     };
 
@@ -9744,7 +9744,7 @@ in modules // {
     name = "futures-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/f/futures/${name}.tar.gz";
+      url = "mirror://pypi/f/futures/${name}.tar.gz";
       sha256 = "1lqfzl3z3pkxakgbcrfy6x7x0fp3q18mj5lpz103ljj7fdqha70m";
     };
   };
@@ -9753,7 +9753,7 @@ in modules // {
     name = "gcovr-2.4";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/g/gcovr/${name}.tar.gz";
+      url = "mirror://pypi/g/gcovr/${name}.tar.gz";
       sha256 = "2c878e03c2eff2282e64035bec0a30532b2b1173aadf08486401883b79e4dab1";
     };
 
@@ -9833,7 +9833,7 @@ in modules // {
     disabled = isPy3k || isPyPy;  # see https://github.com/surfly/gevent/issues/248
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/g/gevent/${name}.tar.gz";
+      url = "mirror://pypi/g/gevent/${name}.tar.gz";
       sha256 = "0cds7yvwdlqmd590i59vzxaviwxk4js6dkhnmdxb3p1xac7wmq9s";
     };
 
@@ -9860,7 +9860,7 @@ in modules // {
     version = "1.2.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/g/geventhttpclient/${name}.tar.gz";
+      url = "mirror://pypi/g/geventhttpclient/${name}.tar.gz";
       sha256 = "0s1qd1qz0zyzksd5h38ynw06d1012h0k7z8522zhb6mzaq4144yz";
     };
 
@@ -9878,7 +9878,7 @@ in modules // {
     name = "gevent-socketio-0.3.6";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/g/gevent-socketio/${name}.tar.gz";
+      url = "mirror://pypi/g/gevent-socketio/${name}.tar.gz";
       sha256 = "1zra86hg2l1jcpl9nsnqagy3nl3akws8bvrbpgdxk15x7ywllfak";
     };
 
@@ -9891,7 +9891,7 @@ in modules // {
     name = "gevent-websocket-0.9.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/g/gevent-websocket/${name}.tar.gz";
+      url = "mirror://pypi/g/gevent-websocket/${name}.tar.gz";
       sha256 = "07rqwfpbv13mk6gg8mf0bmvcf6siyffjpgai1xd8ky7r801j4xb4";
     };
 
@@ -9903,7 +9903,7 @@ in modules // {
     name = "genzshcomp-0.5.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/g/genzshcomp/genzshcomp-0.5.1.tar.gz";
+      url = "mirror://pypi/g/genzshcomp/genzshcomp-0.5.1.tar.gz";
       sha256 = "c77d007cc32cdff836ecf8df6192371767976c108a75b055e057bb6f4a09cd42";
     };
 
@@ -9935,7 +9935,7 @@ in modules // {
     disabled = !isPy26 && !isPy27;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/g/gipc/${name}.zip";
+      url = "mirror://pypi/g/gipc/${name}.zip";
       sha256 = "08c35xzv7nr12d9xwlywlbyzzz2igy0yy6y52q2nrkmh5d4slbpc";
     };
 
@@ -9961,7 +9961,7 @@ in modules // {
     name = "git-sweep-0.1.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/g/git-sweep/${name}.tar.gz";
+      url = "mirror://pypi/g/git-sweep/${name}.tar.gz";
       sha256 = "1csp0zd049d643d409rfivbswwzrayb4i6gkypp5mc27fb1z2afd";
     };
 
@@ -10007,7 +10007,7 @@ in modules // {
     version = "1.0.0a2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/g/github3.py/${name}.tar.gz";
+      url = "mirror://pypi/g/github3.py/${name}.tar.gz";
       sha256 = "11xvwbzfy04vwbjnpc8wcrjjzghbrbdzffrdfk70v0zdnxqg8hc5";
     };
 
@@ -10037,7 +10037,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url    = "https://pypi.python.org/packages/source/g/goobook/${name}.tar.gz";
+      url    = "mirror://pypi/g/goobook/${name}.tar.gz";
       sha256 = "02xmq8sjavza17av44ks510934wrshxnsm6lvhvazs45s92b671i";
     };
 
@@ -10081,7 +10081,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/g/google-apputils/${name}.tar.gz";
+      url = "mirror://pypi/g/google-apputils/${name}.tar.gz";
       sha256 = "1sxsm5q9vr44qzynj8l7p3l7ffb0zl1jdqhmmzmalkx941nbnj1b";
     };
 
@@ -10110,7 +10110,7 @@ in modules // {
     disabled = isPyPy;  # builtin for pypy
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/g/greenlet/${name}.zip";
+      url = "mirror://pypi/g/greenlet/${name}.zip";
       sha256 = "1zlmsygjw69xlq56vz1z5ivzy9bwc7knjaykn2yy2hv4w2j4yb7k";
     };
 
@@ -10132,7 +10132,7 @@ in modules // {
     name = "gspread-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/g/gspread/${name}.tar.gz";
+      url = "mirror://pypi/g/gspread/${name}.tar.gz";
       sha256 = "dba45ef9e652dcd8cf561ae65569bd6ecd18fcc77b991521490698fb2d847106";
     };
 
@@ -10148,7 +10148,7 @@ in modules // {
     name = "gssapi-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/g/gssapi/${name}.tar.gz";
+      url = "mirror://pypi/g/gssapi/${name}.tar.gz";
       sha256 = "0mdl7m6h57n0zkfmm6fqz0hldfxrb2d7d48k2lhc8hqbr3962c7x";
     };
 
@@ -10198,7 +10198,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/g/guessit/${name}.tar.gz";
+      url = "mirror://pypi/g/guessit/${name}.tar.gz";
       sha256 = "068d3dmyk4v04p2zna0340lsdnpkm10gyza62apd9akgjh9rfs48";
     };
 
@@ -10220,7 +10220,7 @@ in modules // {
     name = "gunicorn-19.1.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/g/gunicorn/${name}.tar.gz";
+      url = "mirror://pypi/g/gunicorn/${name}.tar.gz";
       sha256 = "ae1dd6452f62b3470bc9acaf62cb5301545fbb9c697d863a5bfe35097ed7a0b3";
     };
 
@@ -10248,7 +10248,7 @@ in modules // {
     name = "hcs_utils-1.5";
 
     src = pkgs.fetchurl {
-      url    = "https://pypi.python.org/packages/source/h/hcs_utils/${name}.tar.gz";
+      url    = "mirror://pypi/h/hcs_utils/${name}.tar.gz";
       sha256 = "1d2za9crkgzildx610w3zif2i8phcqhh6n8nzg3yvy2mg0s18mkl";
     };
 
@@ -10293,7 +10293,7 @@ in modules // {
     name = "htmllaundry-2.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/h/htmllaundry/${name}.tar.gz";
+      url = "mirror://pypi/h/htmllaundry/${name}.tar.gz";
       sha256 = "e428cba78d5a965e959f5dac2eb7d5f7d627dd889990d5efa8d4e03f3dd768d9";
     };
 
@@ -10346,7 +10346,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/h/http_signature/${name}.tar.gz";
+      url = "mirror://pypi/h/http_signature/${name}.tar.gz";
       sha256 = "14acc192ef20459d5e11b4e800dd3a4542f6bd2ab191bf5717c696bf30936c62";
     };
 
@@ -10363,7 +10363,7 @@ in modules // {
     name = "httpbin-0.2.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/h/httpbin/${name}.tar.gz";
+      url = "mirror://pypi/h/httpbin/${name}.tar.gz";
       sha256 = "6b57f563900ecfe126015223a259463848daafbdc2687442317c0992773b9054";
     };
 
@@ -10381,7 +10381,7 @@ in modules // {
     name = "httplib2-0.9.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/h/httplib2/${name}.tar.gz";
+      url = "mirror://pypi/h/httplib2/${name}.tar.gz";
       sha256 = "126rsryvw9vhbf3qmsfw9lf4l4xm2srmgs439lgma4cpag4s3ay3";
     };
 
@@ -10401,7 +10401,7 @@ in modules // {
     doCheck = false;  # no tests in source
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/h/hypothesis/${name}.tar.gz";
+      url = "mirror://pypi/h/hypothesis/${name}.tar.gz";
       sha256 = "12dxrvn108q2j20brrk6zcb8w00kn3af1c07c0fv572nf2ngyaxy";
     };
 
@@ -10445,7 +10445,7 @@ in modules // {
     name = "colored-${version}";
     version = "1.1.5";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/colored/${name}.tar.gz";
+      url = "mirror://pypi/c/colored/${name}.tar.gz";
       sha256 = "1r1vsypk8v7az82d66bidbxlndx1h7xd4m43hpg1a6hsjr30wrm3";
     };
   };
@@ -10456,7 +10456,7 @@ in modules // {
     version = "0.2.2";
     disabled = isPy3k;
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/l/lsi/${name}.tar.gz";
+      url = "mirror://pypi/l/lsi/${name}.tar.gz";
       sha256 = "0429iilb06yhsmvj3xp6wyhfh1rp4ndxlhwrm80r97z0w7plrk94";
     };
     propagatedBuildInputs = [
@@ -10480,7 +10480,7 @@ in modules // {
     doCheck = false;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/h/httpretty/${name}.tar.gz";
+      url = "mirror://pypi/h/httpretty/${name}.tar.gz";
       sha256 = "0f295zj272plr9lhf80kgz19dxkargwv3ar83rwavrcy516mgg9n";
     };
 
@@ -10512,7 +10512,7 @@ in modules // {
     name = "icalendar-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/icalendar/${name}.tar.gz";
+      url = "mirror://pypi/i/icalendar/${name}.tar.gz";
       sha256 = "93d0b94eab23d08f62962542309916a9681f16de3d5eca1c75497f30f1b07792";
     };
 
@@ -10535,7 +10535,7 @@ in modules // {
     disabled = (!isPy26) || isPyPy;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/i/importlib/importlib-1.0.2.tar.gz";
+      url = "mirror://pypi/i/importlib/importlib-1.0.2.tar.gz";
       sha256 = "131jvp6ahllcqblszjg6fxrzh4k50w8g60sq924b4nb8lxm9dl14";
     };
   };
@@ -10544,7 +10544,7 @@ in modules // {
     name = "influxdb-0.1.12";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/i/influxdb/${name}.tar.gz";
+      url = "mirror://pypi/i/influxdb/${name}.tar.gz";
       sha256 = "6b5ea154454b86d14f2a3960d180e666ba9863da964032dacf2b50628e774a33";
     };
 
@@ -10629,7 +10629,7 @@ in modules // {
 
     /* Hydra fix exists only on github for now.
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/I/INGInious/INGInious-${version}.tar.gz";
+      url = "mirror://pypi/I/INGInious/INGInious-${version}.tar.gz";
       md5 = "40474dd6b6d4fc26e47a1d9c77bcf943";
     };
     */
@@ -10653,7 +10653,7 @@ in modules // {
     version = "0.6";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/interruptingcow/${name}.tar.gz";
+      url = "mirror://pypi/i/interruptingcow/${name}.tar.gz";
       sha256 = "1cv4pm2h0f87n9w4r3l1f96skwmng95sawn7j00ns0rdp1zshr9d";
     };
 
@@ -10670,7 +10670,7 @@ in modules // {
     name = "iptools-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/i/iptools/iptools-${version}.tar.gz";
+      url = "mirror://pypi/i/iptools/iptools-${version}.tar.gz";
       sha256 = "0f03875a5bed740ba4bf44decb6a78679cca914a1ee8a6cc468114485c4d98e3";
     };
 
@@ -10688,7 +10688,7 @@ in modules // {
     name = "ipy-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/I/IPy/IPy-${version}.tar.gz";
+      url = "mirror://pypi/I/IPy/IPy-${version}.tar.gz";
       sha256 = "5d6abb870c25f946c45c35cf50e66155598660f2765b35cb12e36ed5223c2b89";
     };
 
@@ -10706,7 +10706,7 @@ in modules // {
     name = "ipykernel-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/ipykernel/${name}.tar.gz";
+      url = "mirror://pypi/i/ipykernel/${name}.tar.gz";
       sha256 = "1av769gbzfm1zy9p94wicwwwxmyc7s7zk1ginq16x0wc69hwc57j";
     };
 
@@ -10736,7 +10736,7 @@ in modules // {
     name = "ipyparallel-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/ipyparallel/${name}.tar.gz";
+      url = "mirror://pypi/i/ipyparallel/${name}.tar.gz";
       sha256 = "ffa7e2e29fdc4844b3c1721f46b42eee5a1abe5cbb851ccf79d0f4f89b9fe21a";
     };
 
@@ -10762,7 +10762,7 @@ in modules // {
     name = "ipython-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/ipython/${name}.tar.gz";
+      url = "mirror://pypi/i/ipython/${name}.tar.gz";
       sha256 = "14hnf3m087z39ndn5irj1ficc6l197bmdj6fpvz8bwi7la99cbq5";
     };
 
@@ -10796,7 +10796,7 @@ in modules // {
     name = "ipython_genutils-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/ipython_genutils/${name}.tar.gz";
+      url = "mirror://pypi/i/ipython_genutils/${name}.tar.gz";
       sha256 = "3a0624a251a26463c9dfa0ffa635ec51c4265380980d9a50d65611c3c2bd82a6";
     };
 
@@ -10821,7 +10821,7 @@ in modules // {
     name = "ipywidgets-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/ipywidgets/${name}.tar.gz";
+      url = "mirror://pypi/i/ipywidgets/${name}.tar.gz";
       sha256 = "ceeb325e45ade9537c2d115fed9d522e5c6e90bb161592e2f0807375dc661028";
     };
 
@@ -10841,7 +10841,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/i/ipaddr/${name}.tar.gz";
+      url = "mirror://pypi/i/ipaddr/${name}.tar.gz";
       sha256 = "18ycwkfk3ypb1yd09wg20r7j7zq2a73d7j6j10qpgra7a7abzhyj";
     };
 
@@ -10856,7 +10856,7 @@ in modules // {
     name = "ipaddress-1.0.15";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/ipaddress/${name}.tar.gz";
+      url = "mirror://pypi/i/ipaddress/${name}.tar.gz";
       sha256 = "0dk6ky7akh5j4y3qbpnbi0qby64nyprbkrjm2s32pcfdr77qav5g";
     };
 
@@ -10877,7 +10877,7 @@ in modules // {
 
     disabled = isPyPy;  # setupterm: could not find terminfo database
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/i/ipdb/${name}.zip";
+      url = "mirror://pypi/i/ipdb/${name}.zip";
       sha256 = "1763d1564113f5eb89df77879a8d3213273c4d7ff93dcb37a3070cdf0c34fd7c";
     };
     propagatedBuildInputs = with self; [ ipython ];
@@ -10886,7 +10886,7 @@ in modules // {
   ipdbplugin = buildPythonPackage {
     name = "ipdbplugin-1.4";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/ipdbplugin/ipdbplugin-1.4.tar.gz";
+      url = "mirror://pypi/i/ipdbplugin/ipdbplugin-1.4.tar.gz";
       sha256 = "4778d78b5d0af1a2a6d341aed9e72eb73b1df6b179e145b4845d3a209137029c";
     };
     propagatedBuildInputs = with self; [ self.nose self.ipython ];
@@ -10923,7 +10923,7 @@ in modules // {
     name = "iso8601-${version}";
     version = "0.1.11";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/iso8601/${name}.tar.gz";
+      url = "mirror://pypi/i/iso8601/${name}.tar.gz";
       sha256 = "e8fb52f78880ae063336c94eb5b87b181e6a0cc33a6c008511bac9a6e980ef30";
     };
 
@@ -10944,7 +10944,7 @@ in modules // {
     name = "isort-4.2.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/isort/${name}.tar.gz";
+      url = "mirror://pypi/i/isort/${name}.tar.gz";
       sha256 = "0xqxnkli3j69mj1m0i1r9n68bfkdxfcgxi602lqgy491m21q1rpj";
     };
 
@@ -10962,7 +10962,7 @@ in modules // {
     name = "jedi-0.9.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/j/jedi/${name}.tar.gz";
+      url = "mirror://pypi/j/jedi/${name}.tar.gz";
       sha256 = "0c8x962ynpx001fdvp07m2q5jk4igkxbj3rmnydavphvlgxijk1v";
     };
 
@@ -10988,7 +10988,7 @@ in modules // {
     name = "jellyfish-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/j/jellyfish/${name}.tar.gz";
+      url = "mirror://pypi/j/jellyfish/${name}.tar.gz";
       sha256 = "04p80gwwlhxjp8zpjf70a62x69l9rlvnz1pwi5ar52gyajn8z6z1";
     };
 
@@ -11006,7 +11006,7 @@ in modules // {
     version = "0.3.1-0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/j/j2cli/${name}.tar.gz";
+      url = "mirror://pypi/j/j2cli/${name}.tar.gz";
       sha256 = "0y3w1x9935qzx8w6m2r6g4ghyjmxn33wryiif6xb56q7cj9w1433";
     };
 
@@ -11033,7 +11033,7 @@ in modules // {
     name = "Jinja2-2.8";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/J/Jinja2/${name}.tar.gz";
+      url = "mirror://pypi/J/Jinja2/${name}.tar.gz";
       sha256 = "1x0v41lp5m1pjix3l46zx02b7lqp2hflgpnxwkywxynvi3zz47xw";
     };
 
@@ -11058,7 +11058,7 @@ in modules // {
     name = "jmespath-0.7.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/j/jmespath/${name}.tar.gz";
+      url = "mirror://pypi/j/jmespath/${name}.tar.gz";
       sha256 = "1lazbx65imassd7h24z49za001rvx1lmx8r0l21h4izs7pp14nnd";
     };
 
@@ -11078,7 +11078,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/j/jrnl/${name}.tar.gz";
+      url = "mirror://pypi/j/jrnl/${name}.tar.gz";
       sha256 = "af599a863ac298533685a7236fb86307eebc00a38eb8bb96f4f67b5d83227ec8";
     };
 
@@ -11099,7 +11099,7 @@ in modules // {
     name = "jupyter_client-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/j/jupyter_client/${name}.tar.gz";
+      url = "mirror://pypi/j/jupyter_client/${name}.tar.gz";
       sha256 = "ff1ef5c6c3031a62db46ec6329867b4cb1595e6102a7819b3b5252b0c524bdb8";
     };
 
@@ -11126,7 +11126,7 @@ in modules // {
     name = "jupyter_core-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/j/jupyter_core/${name}.tar.gz";
+      url = "mirror://pypi/j/jupyter_core/${name}.tar.gz";
       sha256 = "96a68a3b1d018ff7776270b26b7cb0cfd7a18a53ef2061421daff435707d198c";
     };
 
@@ -11155,7 +11155,7 @@ in modules // {
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/j/jsonpath-rw/${name}.tar.gz";
+      url = "mirror://pypi/j/jsonpath-rw/${name}.tar.gz";
       sha256 = "05c471281c45ae113f6103d1268ec7a4831a2e96aa80de45edc89b11fac4fbec";
     };
 
@@ -11180,7 +11180,7 @@ in modules // {
     name = "keyring-8.4.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/k/keyring/${name}.tar.gz";
+      url = "mirror://pypi/k/keyring/${name}.tar.gz";
       sha256 = "1286sh5g53168qxbl4g5bmns9ci0ld0jl3h44b7h8is5nw1421ar";
     };
 
@@ -11228,7 +11228,7 @@ in modules // {
     disabled = pythonOlder "2.6";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/k/kombu/${name}.tar.gz";
+      url = "mirror://pypi/k/kombu/${name}.tar.gz";
       sha256 = "09xpxpjz9nk8d14dj361dqdwyjwda3jlf1a7v6jif9wn2xm37ar2";
     };
 
@@ -11278,7 +11278,7 @@ in modules // {
     meta.maintainers = with maintainers; [ mornfall ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/k/kitchen/kitchen-1.1.1.tar.gz";
+      url = "mirror://pypi/k/kitchen/kitchen-1.1.1.tar.gz";
       sha256 = "0ki840hjk1q19w6icv0dj2jxb00966nwy9b1jib0dgdspj00yrr5";
     };
   });
@@ -11288,7 +11288,7 @@ in modules // {
     version = "0.5.11";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pylast/${name}.tar.gz";
+      url = "mirror://pypi/p/pylast/${name}.tar.gz";
       sha256 = "bf35820be35447d55564d36072d40b09ac8a7fd41a6f1a7a9d408f4d0eaefac4";
     };
 
@@ -11307,7 +11307,7 @@ in modules // {
     version = "1.0.9";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pylru/${name}.tar.gz";
+      url = "mirror://pypi/p/pylru/${name}.tar.gz";
       sha256 = "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi";
     };
 
@@ -11325,7 +11325,7 @@ in modules // {
     version = "1.2.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/l/lazy-object-proxy/${name}.tar.gz";
+      url = "mirror://pypi/l/lazy-object-proxy/${name}.tar.gz";
       sha256 = "22ed751a2c63c6cf718674fd7461b1dfc45215bab4751ca32b6c9b8cb2734cb3";
     };
 
@@ -11371,7 +11371,7 @@ in modules // {
     name = "libcloud-0.18.0";
 
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/a/apache-libcloud/apache-libcloud-0.18.0.tar.bz2;
+      url = mirror://pypi/a/apache-libcloud/apache-libcloud-0.18.0.tar.bz2;
       sha256 = "0ahdp14ddly074qg5cksxdhqaws0kj445xmhz1y7lzspsp6fk1xg";
     };
 
@@ -11395,7 +11395,7 @@ in modules // {
     version = "2015.10.04";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/l/limnoria/${name}.tar.gz";
+      url = "mirror://pypi/l/limnoria/${name}.tar.gz";
       sha256 = "1hwwwr0z2vsirgwd92z17nbhnhsz0m25bpxn5sanqlbcjbwhyk9z";
     };
 
@@ -11420,7 +11420,7 @@ in modules // {
     name = "line_profiler-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/l/line_profiler/${name}.tar.gz";
+      url = "mirror://pypi/l/line_profiler/${name}.tar.gz";
       sha256 = "a9e0c9ffa814f1215107c86c890afa8e63bec5a37d951f6f9d3668c1df2b1900";
     };
 
@@ -11441,7 +11441,7 @@ in modules // {
     version = "0.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/l/linode/linode-${version}.tar.gz";
+      url = "mirror://pypi/l/linode/linode-${version}.tar.gz";
       sha256 = "db3c2a7fab8966d903a63f16c515bff241533e4ef2d746aa7aae4a49bba5e573";
     };
 
@@ -11459,7 +11459,7 @@ in modules // {
     name = "llfuse-1.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/l/llfuse/${name}.tar.bz2";
+      url = "mirror://pypi/l/llfuse/${name}.tar.bz2";
       sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps";
     };
 
@@ -11487,7 +11487,7 @@ in modules // {
     name = "locustio-0.7.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/l/locustio/${name}.tar.gz";
+      url = "mirror://pypi/l/locustio/${name}.tar.gz";
       sha256 = "c9ca6fdfe6a6fb187a3d54ddf9b1518196348e8f20537f0a14ca81a264ffafa2";
     };
 
@@ -11507,7 +11507,7 @@ in modules // {
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/l/llvmlite/${name}.tar.gz";
+      url = "mirror://pypi/l/llvmlite/${name}.tar.gz";
       sha256 = "a10d8d5e597c6a54ec418baddd31a51a0b7937a895d75b240d890aead946081c";
     };
 
@@ -11563,7 +11563,7 @@ in modules // {
     name = "logilab-common-0.63.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/l/logilab-common/${name}.tar.gz";
+      url = "mirror://pypi/l/logilab-common/${name}.tar.gz";
       sha256 = "1rr81zlmlgdma3s75i5c1l8q2m25v4ac41i9pniik4mhkc6a0fv0";
     };
 
@@ -11575,7 +11575,7 @@ in modules // {
     version = "0.6.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/l/logilab-constraint/${name}.tar.gz";
+      url = "mirror://pypi/l/logilab-constraint/${name}.tar.gz";
       sha256 = "1n0xim4ij1n4yvyqqvyc0wllhjs22szglsd5av0j8k2qmck4njcg";
     };
 
@@ -11596,7 +11596,7 @@ in modules // {
     # more work is needed before upgrading
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/l/lxml/${name}.tar.gz";
+      url = "mirror://pypi/l/lxml/${name}.tar.gz";
       sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk";
     };
 
@@ -11615,7 +11615,7 @@ in modules // {
     name = "python-magic-0.4.10";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-magic/${name}.tar.gz";
+      url = "mirror://pypi/p/python-magic/${name}.tar.gz";
       sha256 = "1hx2sjd4fdswswj3yydn2azxb59rjmi9b7jzh94lf1wnxijjizbr";
     };
 
@@ -11663,7 +11663,7 @@ in modules // {
     name = "m2crypto-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${version}.tar.gz";
+      url = "mirror://pypi/M/M2Crypto/M2Crypto-${version}.tar.gz";
       sha256 = "1ac3b6eafa5ff7e2a0796675316d7569b28aada45a7ab74042ad089d15a9567f";
     };
 
@@ -11686,7 +11686,7 @@ in modules // {
     name = "Mako-1.0.2";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/M/Mako/${name}.tar.gz";
+      url = "mirror://pypi/M/Mako/${name}.tar.gz";
       sha256 = "17k7jy3byi4hj6ksszib6gxbf6n7snnnirnbrdldn848abjc4l15";
     };
 
@@ -11709,7 +11709,7 @@ in modules // {
     version = "0.23";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${version}.tar.gz";
+      url = "mirror://pypi/M/MarkupSafe/MarkupSafe-${version}.tar.gz";
       sha256 = "a4ec1aff59b95a14b45eb2e23761a0179e98319da5a7eb76b56ea8cdc7b871c3";
     };
 
@@ -11726,7 +11726,7 @@ in modules // {
     version = "1.8.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/m/manuel/${name}.tar.gz";
+      url = "mirror://pypi/m/manuel/${name}.tar.gz";
       sha256 = "1diyj6a8bvz2cdf9m0g2bbx9z2yjjnn3ylbg1zinpcjj6vldfx59";
     };
 
@@ -11744,7 +11744,7 @@ in modules // {
     name = "markdown-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/M/Markdown/Markdown-${version}.tar.gz";
+      url = "mirror://pypi/M/Markdown/Markdown-${version}.tar.gz";
       sha256 = "1kll5b35wqkhvniwm2kh6rqc43wakv9ls0qm6g5318pjmbkywdp4";
     };
 
@@ -11812,7 +11812,7 @@ in modules // {
     name = "mccabe-0.4.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/m/mccabe/${name}.tar.gz";
+      url = "mirror://pypi/m/mccabe/${name}.tar.gz";
       sha256 = "0yr08a36h8lqlif10l4xcikbbig7q8f41gqywir7rrvnv3mi4aws";
     };
 
@@ -11841,7 +11841,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/m/mechanize/${name}.tar.gz";
+      url = "mirror://pypi/m/mechanize/${name}.tar.gz";
       sha256 = "0rj7r166i1dyrq0ihm5rijfmvhs8a04im28lv05c0c3v206v4rrf";
     };
 
@@ -11863,7 +11863,7 @@ in modules // {
     version = "0.4.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/M/MechanicalSoup/${name}.zip";
+      url = "mirror://pypi/M/MechanicalSoup/${name}.zip";
       sha256 = "02jkwly4gw1jqm55l4wwn0j0ggnysx55inw9j96bif5l49z5cacd";
     };
 
@@ -11882,7 +11882,7 @@ in modules // {
     name = "meld3-1.0.0";
 
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/m/meld3/meld3-1.0.0.tar.gz;
+      url = mirror://pypi/m/meld3/meld3-1.0.0.tar.gz;
       sha256 = "57b41eebbb5a82d4a928608962616442e239ec6d611fe6f46343e765e36f0b2b";
     };
 
@@ -11899,7 +11899,7 @@ in modules // {
     name = "memcached-1.51";
 
     src = if isPy3k then pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python3-memcached/python3-${name}.tar.gz";
+      url = "mirror://pypi/p/python3-memcached/python3-${name}.tar.gz";
       sha256 = "0na8b369q8fivh3y0nvzbvhh3lgvxiyyv9xp93cnkvwfsr8mkgkw";
     } else pkgs.fetchurl {
       url = "http://ftp.tummy.com/pub/python-memcached/old-releases/python-${name}.tar.gz";
@@ -11918,7 +11918,7 @@ in modules // {
     version = "0.39";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/m/memory_profiler/${name}.tar.gz";
+      url = "mirror://pypi/m/memory_profiler/${name}.tar.gz";
       sha256 = "61021f2dade7edd6cc09d7924bfdccc453bd1949608412a3e021d44a410d3a23";
     };
 
@@ -12005,7 +12005,7 @@ in modules // {
     version = "2.0.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/m/munch/${name}.tar.gz";
+      url = "mirror://pypi/m/munch/${name}.tar.gz";
       sha256 = "1420683a94f3a2ffc77935ddd28aa9ccb540dd02b75e02ed7ea863db437ab8b2";
     };
 
@@ -12051,7 +12051,7 @@ in modules // {
     version = "1.3.3";
 
     src = pkgs.fetchurl {
-      url    = "https://pypi.python.org/packages/source/r/rainbowstream/${name}.tar.gz";
+      url    = "mirror://pypi/r/rainbowstream/${name}.tar.gz";
       sha256 = "08598slbn8sm2hjs0q1041fv7m56k2ky4q66rsihacjw0mg7blai";
     };
 
@@ -12097,7 +12097,7 @@ in modules // {
     name = "mistune-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/m/mistune/${name}.tar.gz";
+      url = "mirror://pypi/m/mistune/${name}.tar.gz";
       sha256 = "6076dedf768348927d991f4371e5a799c6a0158b16091df08ee85ee231d929a7";
     };
 
@@ -12146,7 +12146,7 @@ in modules // {
     name = "mock-1.3.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/m/mock/${name}.tar.gz";
+      url = "mirror://pypi/m/mock/${name}.tar.gz";
       sha256 = "1xm0xkaz8d8d26kdk09f2n9vn543ssd03vmpkqlmgq3crjz7s90y";
     };
 
@@ -12168,7 +12168,7 @@ in modules // {
     name = "ModestMaps-1.4.6";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/M/ModestMaps/${name}.tar.gz";
+      url = "mirror://pypi/M/ModestMaps/${name}.tar.gz";
       sha256 = "0vyi1m9q4pc34i6rq5agb4x3qicx5sjlbxwmxfk70k2l5mnbjca3";
     };
 
@@ -12205,7 +12205,7 @@ in modules // {
     name = "moretools-0.1a41";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/m/moretools/${name}.tar.gz";
+      url = "mirror://pypi/m/moretools/${name}.tar.gz";
       sha256 = "1n442wprbl3cmg08233m1sr3g4z0i8hv9g6bhch7kzdmbl21399f";
     };
 
@@ -12265,7 +12265,7 @@ in modules // {
     name = "mpmath-0.19";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/m/mpmath/${name}.tar.gz";
+      url = "mirror://pypi/m/mpmath/${name}.tar.gz";
       sha256 = "08ijsr4ifrqv3cjc26mkw0dbvyygsa99in376hr4b96ddm1gdpb8";
     };
 
@@ -12288,7 +12288,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-mpd/python-mpd-0.3.0.tar.gz";
+      url = "mirror://pypi/p/python-mpd/python-mpd-0.3.0.tar.gz";
       sha256 = "02812eba1d2e0f46e37457f5a6fa23ba203622e4bcab0a19b265e66b08cd21b4";
     };
 
@@ -12304,7 +12304,7 @@ in modules // {
     version = "0.5.5";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-mpd2/python-mpd2-${version}.tar.bz2";
+      url = "mirror://pypi/p/python-mpd2/python-mpd2-${version}.tar.bz2";
       sha256 = "1gfrxf71xll1w6zb69znqg5c9j0g7036fsalkvqprh2id640cl3a";
     };
 
@@ -12328,7 +12328,7 @@ in modules // {
     name = "mpv-0.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/m/mpv/${name}.tar.gz";
+      url = "mirror://pypi/m/mpv/${name}.tar.gz";
       sha256 = "0b9kd70mshdr713f3l1lbnz1q0vlg2y76h5d8liy1bzqm7hjcgfw";
     };
     buildInputs = [ pkgs.mpv ];
@@ -12348,7 +12348,7 @@ in modules // {
     version = "0.1.2";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/m/mr.bob/mr.bob-${version}.tar.gz";
+      url = "mirror://pypi/m/mr.bob/mr.bob-${version}.tar.gz";
       sha256 = "6737eaf98aaeae85e07ebef844ee5156df2f06a8b28d7c3dcb056f811c588121";
     };
 
@@ -12372,7 +12372,7 @@ in modules // {
     version = "0.4.6";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/m/msgpack-python/${name}.tar.gz";
+      url = "mirror://pypi/m/msgpack-python/${name}.tar.gz";
       sha256 = "bfcc581c9dbbf07cc2f951baf30c3249a57e20dcbd60f7e6ffc43ab3cc614794";
     };
 
@@ -12398,7 +12398,7 @@ in modules // {
     version = "0.4.8";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/m/multipledispatch/${name}.tar.gz";
+      url = "mirror://pypi/m/multipledispatch/${name}.tar.gz";
       sha256 = "07d41fb3ed25e8424536e48a8566f88a0f9926ca4b6174bff6aa16c98251b92e";
     };
 
@@ -12414,7 +12414,7 @@ in modules // {
     name = "munkres-1.0.6";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/m/munkres/${name}.tar.gz";
+      url = "mirror://pypi/m/munkres/${name}.tar.gz";
       sha256 = "c78f803b9b776bfb20a25c9c7bb44adbf0f9202c2024d51aa5969d21e560208d";
     };
 
@@ -12434,7 +12434,7 @@ in modules // {
     name = "musicbrainzngs-0.5";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/m/musicbrainzngs/${name}.tar.gz";
+      url = "mirror://pypi/m/musicbrainzngs/${name}.tar.gz";
       sha256 = "281388ab750d2996e9feca4580fd4215d616a698e02cd6719cb9b8562945c489";
     };
 
@@ -12472,7 +12472,7 @@ in modules // {
     name = "mutagen-1.27";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/m/mutagen/${name}.tar.gz";
+      url = "mirror://pypi/m/mutagen/${name}.tar.gz";
       sha256 = "cc884fe1e20fe220be7ce7c3b269f4cadc69a8310150a3a41162fba1ca9c88bd";
     };
 
@@ -12584,7 +12584,7 @@ in modules // {
     name = "pygraphviz-1.3.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pygraphviz/${name}.tar.gz";
+      url = "mirror://pypi/p/pygraphviz/${name}.tar.gz";
       sha256 = "7c294cbc9d88946be671cc0d8602aac176d8c56695c0a7d871eadea75a958408";
     };
 
@@ -12625,7 +12625,7 @@ in modules // {
     propagatedBuildInputs = with self; [ pymysql sqlalchemy ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pymysql_sa/pymysql_sa-1.0.tar.gz";
+      url = "mirror://pypi/p/pymysql_sa/pymysql_sa-1.0.tar.gz";
       sha256 = "a2676bce514a29b2d6ab418812259b0c2f7564150ac53455420a20bd7935314a";
     };
 
@@ -12642,7 +12642,7 @@ in modules // {
     __propagatedImpureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libc.dylib";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/m/monotonic/${name}.tar.gz";
+      url = "mirror://pypi/m/monotonic/${name}.tar.gz";
       sha256 = "1diab6hfh3jpa1f0scpqaqrawk4g97ss4v7gkn2yw8znvdm6abw5";
     };
 
@@ -12661,7 +12661,7 @@ in modules // {
     doCheck = false;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/M/MySQL-python/${name}.zip";
+      url = "mirror://pypi/M/MySQL-python/${name}.zip";
       sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441";
     };
 
@@ -12681,7 +12681,7 @@ in modules // {
     name = "mysql-connector-repackaged-0.3.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/m/mysql-connector-repackaged/${name}.tar.gz";
+      url = "mirror://pypi/m/mysql-connector-repackaged/${name}.tar.gz";
       sha256 = "170fbf11c54def1b5fcc919be0a890b760bb2eca81f56123a5dda0c69b5b099e";
     };
 
@@ -12739,7 +12739,7 @@ in modules // {
     version = "0.3.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/nameparser/${name}.tar.gz";
+      url = "mirror://pypi/n/nameparser/${name}.tar.gz";
       sha256 = "1zi94m99ziwwd6kkip3w2xpnl05r2cfv9iq68inz7np81c3g8vag";
     };
 
@@ -12755,7 +12755,7 @@ in modules // {
     name = "nbconvert-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/nbconvert/${name}.tar.gz";
+      url = "mirror://pypi/n/nbconvert/${name}.tar.gz";
       sha256 = "e0296e45293dd127d028f678e3b6aba3f1db3283a134178bdb49eea402d4cf1c";
     };
 
@@ -12783,7 +12783,7 @@ in modules // {
     name = "nbformat-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/nbformat/${name}.tar.gz";
+      url = "mirror://pypi/n/nbformat/${name}.tar.gz";
       sha256 = "5261c957589b9dfcd387c338d59375162ba9ca82c69e378961a1f4e641285db5";
     };
 
@@ -12821,7 +12821,7 @@ in modules // {
     propagatedBuildInputs = with self ; [ dns pyasn1 ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/sleekxmpp/${name}.tar.gz";
+      url = "mirror://pypi/s/sleekxmpp/${name}.tar.gz";
       sha256 = "1krkhkvj8xw5a6c2xlf7h1rg9xdcm9d8x2niivwjahahpvbl6krr";
     };
 
@@ -12839,7 +12839,7 @@ in modules // {
     disabled = (!isPy34);
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/slixmpp/${name}.tar.gz";
+      url = "mirror://pypi/s/slixmpp/${name}.tar.gz";
       sha256 = "030ca7e71cbb7e17fb48f83db97779fdbac0b4424cef01245f3276a110b30a6c";
     };
 
@@ -12857,7 +12857,7 @@ in modules // {
     disabled = isPy35;  # https://github.com/drkjam/netaddr/issues/117
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/netaddr/${name}.tar.gz";
+      url = "mirror://pypi/n/netaddr/${name}.tar.gz";
       sha256 = "06dxjlbcicq7q3vqy8agq11ra01kvvd47j4mk6dmghjsyzyckxd1";
     };
 
@@ -12875,7 +12875,7 @@ in modules // {
     name = "netifaces-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/n/netifaces/${name}.tar.gz";
+      url = "mirror://pypi/n/netifaces/${name}.tar.gz";
       sha256 = "1plw237a4zib4z8s62g0mrs8gm3kjfrp5sxh6bbk9nl3rdls2mln";
     };
 
@@ -12890,7 +12890,7 @@ in modules // {
     version = "2.0.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/h/hpack/hpack-${version}.tar.gz";
+      url = "mirror://pypi/h/hpack/hpack-${version}.tar.gz";
       sha256 = "1k4wa8c52bd6x109bn6hc945595w6aqgzj6ipy6c2q7vxkzalzhd";
     };
 
@@ -12915,7 +12915,7 @@ in modules // {
     version = "0.14.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/netlib/${name}.tar.gz";
+      url = "mirror://pypi/n/netlib/${name}.tar.gz";
       sha256 = "0xcfjym780wjr32p3g50w2gifqy3589898idzd3fwgj93akv04ng";
     };
 
@@ -12936,7 +12936,7 @@ in modules // {
     version = "0.11.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/N/Nevow/Nevow-${version}.tar.gz";
+      url = "mirror://pypi/N/Nevow/Nevow-${version}.tar.gz";
       sha256 = "1z0y8a5q4fa2nmh0dap7cs9pp5xs3jm6q0g4vpwcw77q7jagdmw9";
       name = "${name}.tar.gz";
     };
@@ -12977,7 +12977,7 @@ in modules // {
     name = "nibabel-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/n/nibabel/${name}.tar.gz";
+      url = "mirror://pypi/n/nibabel/${name}.tar.gz";
       sha256 = "0k8mv5zmwb6vc8kwrydl3pp0pnw937rf5mz10figkxczrw6dkk7h";
     };
 
@@ -13007,7 +13007,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/n/nipype/${name}.tar.gz";
+      url = "mirror://pypi/n/nipype/${name}.tar.gz";
       sha256 = "7fb143cd4d05f18db1cb7f0b83dba13d3dcf55b4eb3d16df08c97033ccae507b";
     };
 
@@ -13036,7 +13036,7 @@ in modules // {
     name = "nose-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/n/nose/${name}.tar.gz";
+      url = "mirror://pypi/n/nose/${name}.tar.gz";
       sha256 = "f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98";
     };
 
@@ -13060,7 +13060,7 @@ in modules // {
     version = "0.4.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/nose-exclude/${name}.tar.gz";
+      url = "mirror://pypi/n/nose-exclude/${name}.tar.gz";
       sha256 = "44466a9bcb56d2e568750f91504d1278c74eabb259a305b06e975b87b51635da";
     };
 
@@ -13080,7 +13080,7 @@ in modules // {
     name = "nose-selecttests-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/n/nose-selecttests/${name}.zip";
+      url = "mirror://pypi/n/nose-selecttests/${name}.zip";
       sha256 = "0lgrfgp3sq8xi8d9grrg0z8jsyk0wl8a3rxw31hb7vdncin5b7n5";
     };
 
@@ -13095,7 +13095,7 @@ in modules // {
   nose2 = if isPy26 then null else (buildPythonPackage rec {
     name = "nose2-0.5.0";
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/n/nose2/${name}.tar.gz";
+      url = "mirror://pypi/n/nose2/${name}.tar.gz";
       sha256 = "0595rh6b6dncbj0jigsyrgrh6h8fsl6w1fr69h76mxv9nllv0rlr";
     };
     meta = {
@@ -13111,7 +13111,7 @@ in modules // {
     version = "0.1.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/nose-cover3/${name}.tar.gz";
+      url = "mirror://pypi/n/nose-cover3/${name}.tar.gz";
       sha256 = "1la4hhc1yszjpcchvkqk5xmzlb2g1b3fgxj9wwc58qc549whlcc1";
     };
 
@@ -13131,7 +13131,7 @@ in modules // {
     name = "nosexcover-1.0.10";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/nosexcover/${name}.tar.gz";
+      url = "mirror://pypi/n/nosexcover/${name}.tar.gz";
       sha256 = "f5b3a7c936c4f703f15418c1f325775098184b69fa572f868edb8a99f8f144a8";
     };
 
@@ -13149,7 +13149,7 @@ in modules // {
   nosejs = buildPythonPackage {
     name = "nosejs-0.9.4";
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/N/NoseJS/NoseJS-0.9.4.tar.gz;
+      url = mirror://pypi/N/NoseJS/NoseJS-0.9.4.tar.gz;
       sha256 = "0qrhkd3sga56qf6k0sqyhwfcladwi05gl6aqmr0xriiq1sgva5dy";
     };
     buildInputs = with self; [ nose ];
@@ -13165,7 +13165,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/nose-cprof/${name}.tar.gz";
+      url = "mirror://pypi/n/nose-cprof/${name}.tar.gz";
       sha256 = "d1edd5cb3139e897752294d2968bfb066abdd754743fa416e024e5c688893344";
     };
 
@@ -13181,7 +13181,7 @@ in modules // {
     name = "notebook-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/notebook/${name}.tar.gz";
+      url = "mirror://pypi/n/notebook/${name}.tar.gz";
       sha256 = "b597437ba33538221008e21fea71cd01eda9da1515ca3963d7c74e44f4b03d90";
     };
 
@@ -13262,7 +13262,7 @@ in modules // {
     version = "0.3.9";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/e/emoji/${name}.tar.gz";
+      url = "mirror://pypi/e/emoji/${name}.tar.gz";
       sha256 = "19p5c2nlq0w9972rf9fghyswnijwgig5f8cyzs32kppnmzvzbkxw";
     };
 
@@ -13301,7 +13301,7 @@ in modules // {
   ntplib = buildPythonPackage rec {
     name = "ntplib-0.3.3";
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/n/ntplib/ntplib-0.3.3.tar.gz;
+      url = mirror://pypi/n/ntplib/ntplib-0.3.3.tar.gz;
 
       sha256 = "c4621b64d50be9461d9bd9a71ba0b4af06fbbf818bbd483752d95c1a4e273ede";
     };
@@ -13316,7 +13316,7 @@ in modules // {
     name = "numba-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/numba/${name}.tar.gz";
+      url = "mirror://pypi/n/numba/${name}.tar.gz";
       sha256 = "80ce9968591db7c93e36258cc5e6734eb1e42826332799746dc6c073a6d5d317";
     };
 
@@ -13352,7 +13352,7 @@ in modules // {
     name = "numexpr-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/numexpr/${name}.tar.gz";
+      url = "mirror://pypi/n/numexpr/${name}.tar.gz";
       sha256 = "319cdf4e402177a1c8ed4972cffd09f523446f186d347b7c1974787cdabf0294";
     };
 
@@ -13397,7 +13397,7 @@ in modules // {
   numpy_1_10 = self.buildNumpyPackage rec {
     version = "1.10.4";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/numpy/numpy-${version}.tar.gz";
+      url = "mirror://pypi/n/numpy/numpy-${version}.tar.gz";
       sha256 = "7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b";
     };
   };
@@ -13405,7 +13405,7 @@ in modules // {
   numpy_1_11 = self.buildNumpyPackage rec {
     version = "1.11.0";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/numpy/numpy-${version}.tar.gz";
+      url = "mirror://pypi/n/numpy/numpy-${version}.tar.gz";
       sha256 = "0gml1ng7iqk4xcrvspjd5vnfqdwfinvjfyksfawvy5h8426jdld1";
     };
   };
@@ -13415,7 +13415,7 @@ in modules // {
     version = "0.5";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/numpydoc/${name}.tar.gz";
+      url = "mirror://pypi/n/numpydoc/${name}.tar.gz";
       sha256 = "0d4dnifaxkll50jx6czj05y8cb4ny60njd2wz299sj2jxfy51w4k";
     };
 
@@ -13434,7 +13434,7 @@ in modules // {
     version = "0.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/numtraits/${name}.tar.gz";
+      url = "mirror://pypi/n/numtraits/${name}.tar.gz";
       sha256 = "2fca9a6c9334f7358ef1a3e2e64ccaa6a479fc99fc096910e0d5fbe8edcdfd7e";
     };
 
@@ -13453,7 +13453,7 @@ in modules // {
     name = "nwdiag-1.0.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/nwdiag/${name}.tar.gz";
+      url = "mirror://pypi/n/nwdiag/${name}.tar.gz";
       sha256 = "0n7ary1fngxk8bk15vabc8fhnmxlh098piciwaviwn7l4a5q1zys";
     };
 
@@ -13509,7 +13509,7 @@ in modules // {
     name = "oauth-1.0.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/o/oauth/oauth-1.0.1.tar.gz";
+      url = "mirror://pypi/o/oauth/oauth-1.0.1.tar.gz";
       sha256 = "0pdgi35hczsslil4890xqawnbpdazkgf2v1443847h5hy2gq2sg7";
     };
 
@@ -13526,7 +13526,7 @@ in modules // {
     version = "1.9.0.post1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/o/oauth2/${name}.tar.gz";
+      url = "mirror://pypi/o/oauth2/${name}.tar.gz";
       sha256 = "c006a85e7c60107c7cc6da1b184b5c719f6dd7202098196dfa6e55df669b59bf";
     };
 
@@ -13550,7 +13550,7 @@ in modules // {
     name = "oauth2client-1.4.12";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/oauth2client/${name}.tar.gz";
+      url = "mirror://pypi/o/oauth2client/${name}.tar.gz";
       sha256 = "0phfk6s8bgpap5xihdk1xv2lakdk1pb3rg6hp2wsg94hxcxnrakl";
     };
 
@@ -13616,7 +13616,7 @@ in modules // {
     version = "2.0.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/objgraph/${name}.tar.gz";
+      url = "mirror://pypi/o/objgraph/${name}.tar.gz";
       sha256 = "841de52715774ec1d0e97d9b4462d6e3e10406155f9b61f54ba7db984c45442a";
     };
 
@@ -13637,7 +13637,7 @@ in modules // {
     version= "0.4.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/odo/${name}.tar.gz";
+      url = "mirror://pypi/o/odo/${name}.tar.gz";
       sha256 = "f793df8b212994ea23ce34e90e2048d0237d3b95ecd066ef2cfbb1c2384b79e9";
     };
 
@@ -13661,7 +13661,7 @@ in modules // {
     meta.maintainers = with maintainers; [ mornfall ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/offtrac/${name}.tar.gz";
+      url = "mirror://pypi/o/offtrac/${name}.tar.gz";
       sha256 = "06vd010pa1z7lyfj1na30iqzffr4kzj2k2sba09spik7drlvvl56";
     };
     doCheck = false;
@@ -13672,7 +13672,7 @@ in modules // {
     name = "openpyxl-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/openpyxl/${name}.tar.gz";
+      url = "mirror://pypi/o/openpyxl/${name}.tar.gz";
       sha256 = "1zigyvsq45izkhr1h5gisgi0ag5dm6kz09f01c2cgdfav1bl3mlk";
     };
 
@@ -13719,7 +13719,7 @@ in modules // {
     version = "1.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/o/ordereddict/${name}.tar.gz";
+      url = "mirror://pypi/o/ordereddict/${name}.tar.gz";
       sha256 = "07qvy11nvgxpzarrni3wrww3vpc9yafgi2bch4j2vvvc42nb8d8w";
     };
 
@@ -13759,7 +13759,7 @@ in modules // {
     name = "ply-3.8";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/ply/${name}.tar.gz";
+      url = "mirror://pypi/p/ply/${name}.tar.gz";
       sha256 = "e7d1bdff026beb159c9942f7a17e102c375638d9478a7ecd4cc0c76afd8de0b8";
     };
 
@@ -13817,7 +13817,7 @@ in modules // {
     name = "oslosphinx-3.3.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/oslosphinx/${name}.tar.gz";
+      url = "mirror://pypi/o/oslosphinx/${name}.tar.gz";
       sha256 = "1rjiiahw2y7pg5rl15fvhmfyh26vm433000nwp7c94khx7w85w75";
     };
 
@@ -13833,7 +13833,7 @@ in modules // {
     version = "0.10.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/tempest-lib/${name}.tar.gz";
+      url = "mirror://pypi/t/tempest-lib/${name}.tar.gz";
       sha256 = "0x842a67k9f7yk3zr6755s4qldkfngljqy5whd4jb553y4hn5lyj";
     };
 
@@ -13854,7 +13854,7 @@ in modules // {
     version = "0.4.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/os-testr/${name}.tar.gz";
+      url = "mirror://pypi/o/os-testr/${name}.tar.gz";
       sha256 = "0474z0mxb7y3vfk4s097wf1mzji5d135vh27cvlh9q17rq3x9r3w";
     };
 
@@ -13879,7 +13879,7 @@ in modules // {
     doCheck = !isPyPy; # a test fails
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/b/bandit/${name}.tar.gz";
+      url = "mirror://pypi/b/bandit/${name}.tar.gz";
       sha256 = "0qd9kxknac5n5xfl5zjnlmk6jr94krkcx29zgyna8p9lyb828hsk";
     };
 
@@ -13896,7 +13896,7 @@ in modules // {
     version = "1.10.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/oslo.serialization/${name}.tar.gz";
+      url = "mirror://pypi/o/oslo.serialization/${name}.tar.gz";
       sha256 = "15k8aql2rx5jzv3hfvmd48vsyw172qa64bs3fmsyx25p37zyfy8a";
     };
 
@@ -13913,7 +13913,7 @@ in modules // {
     version = "0.2.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/rfc3986/rfc3986-0.2.2.tar.gz";
+      url = "mirror://pypi/r/rfc3986/rfc3986-0.2.2.tar.gz";
       sha256 = "0yvzz7gp84qqdadbjdh9ch7dz4w19nmhwa704s9m11bljgp3hqmn";
     };
 
@@ -13931,7 +13931,7 @@ in modules // {
     version = "1.1.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pycadf/pycadf-1.1.0.tar.gz";
+      url = "mirror://pypi/p/pycadf/pycadf-1.1.0.tar.gz";
       sha256 = "0lv9nhbvj1pa8qgn3qvyk9k4q8f7w541074n1rhdjnjkinh4n4dg";
     };
 
@@ -13959,7 +13959,7 @@ in modules // {
     version = "2.6.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/oslo.utils/${name}.tar.gz";
+      url = "mirror://pypi/o/oslo.utils/${name}.tar.gz";
       sha256 = "1prgi03nxkcykyja821qkycsqlnpyzw17mpvj8qf3pjmgb9gv1fy";
     };
 
@@ -13976,7 +13976,7 @@ in modules // {
     version = "2.9.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/oslo.middleware/${name}.tar.gz";
+      url = "mirror://pypi/o/oslo.middleware/${name}.tar.gz";
       sha256 = "14acinchdpmc1in39mz9kh1h2rd1ygwg3zdhbwzrlhy8wbzzi4w9";
     };
 
@@ -14002,7 +14002,7 @@ in modules // {
      version = "0.11.0";
 
      src = pkgs.fetchurl {
-       url = "https://pypi.python.org/packages/source/o/oslo.versionedobjects/${name}.tar.gz";
+       url = "mirror://pypi/o/oslo.versionedobjects/${name}.tar.gz";
        sha256 = "1ddcb2zf7a3544ay4sxw200a4mz7p0n1f7826h3vibfdqjlc80y7";
      };
 
@@ -14026,7 +14026,7 @@ in modules // {
      disabled = isPyPy;  # a test fails
 
      src = pkgs.fetchurl {
-       url = "https://pypi.python.org/packages/source/c/cachetools/${name}.tar.gz";
+       url = "mirror://pypi/c/cachetools/${name}.tar.gz";
        sha256 = "0js7qx5pa8ibr8487lcf0x3a7w0xml0wa17snd6hjs0857kqhn20";
      };
 
@@ -14040,7 +14040,7 @@ in modules // {
      version = "0.7.0";
 
      src = pkgs.fetchurl {
-       url = "https://pypi.python.org/packages/source/f/futurist/${name}.tar.gz";
+       url = "mirror://pypi/f/futurist/${name}.tar.gz";
        sha256 = "0wf0k9xf5xzmi79418xq8zxwr7w7a4g4alv3dds9afb2l8bh9crg";
      };
 
@@ -14062,7 +14062,7 @@ in modules // {
     version = "2.7.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/oslo.messaging/${name}.tar.gz";
+      url = "mirror://pypi/o/oslo.messaging/${name}.tar.gz";
       sha256 = "1af7l4ri3xfjcnjp2yhngz34h3ls00yyj1x8i64dxb86ryy43kd1";
     };
 
@@ -14089,7 +14089,7 @@ in modules // {
    version = "0.5.0";
 
    src = pkgs.fetchurl {
-     url = "https://pypi.python.org/packages/source/o/os-brick/${name}.tar.gz";
+     url = "mirror://pypi/o/os-brick/${name}.tar.gz";
      sha256 = "1q05yk5hada470rwsv3hfjn7pdp9n7pprmnslm723l7cfhf7cgm6";
    };
 
@@ -14115,7 +14115,7 @@ in modules // {
     version = "0.6.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/oslo.reports/${name}.tar.gz";
+      url = "mirror://pypi/o/oslo.reports/${name}.tar.gz";
       sha256 = "0j27mbsa5y1fn9lxn98xs7p9vipcig47srm5sgbgma0ilv125b65";
     };
 
@@ -14136,7 +14136,7 @@ in modules // {
     version = "1.4.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-cinderclient/python-cinderclient-${version}.tar.gz";
+      url = "mirror://pypi/p/python-cinderclient/python-cinderclient-${version}.tar.gz";
       sha256 = "1vfcjljfad3034bfhfcrfhphym1ik6qk42nrxzl0gqb9408n6k3l";
     };
 
@@ -14161,7 +14161,7 @@ in modules // {
     version = "3.1.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-neutronclient/python-neutronclient-${version}.tar.gz";
+      url = "mirror://pypi/p/python-neutronclient/python-neutronclient-${version}.tar.gz";
       sha256 = "0g96x5b8lz407in70j6v7jbj613y6sd61b21j1y03x06b2rk5i02";
     };
 
@@ -14190,7 +14190,7 @@ in modules // {
     version = "1.15.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/cliff/${name}.tar.gz";
+      url = "mirror://pypi/c/cliff/${name}.tar.gz";
       sha256 = "1rrbq1nvc84x417hbfm9sc1scia16nilr8nm8ycm8iq5jkh6zfpm";
     };
 
@@ -14211,7 +14211,7 @@ in modules // {
     version = "0.6.8";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/cmd2/${name}.tar.gz";
+      url = "mirror://pypi/c/cmd2/${name}.tar.gz";
       sha256 = "1a346zcd46c8gwbbp2cxsmvgfkyy26kwxjzdnkv7n47w6660sy5c";
     };
 
@@ -14234,7 +14234,7 @@ in modules // {
     version = "3.0.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/oslo.db/${name}.tar.gz";
+      url = "mirror://pypi/o/oslo.db/${name}.tar.gz";
       sha256 = "0jjimsfl53wigzf92dhns813n65qcwilcqlj32m86rxrcz0pjgph";
     };
 
@@ -14252,7 +14252,7 @@ in modules // {
     version = "2.4.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/oslo.rootwrap/${name}.tar.gz";
+      url = "mirror://pypi/o/oslo.rootwrap/${name}.tar.gz";
       sha256 = "1711rlmykizw675ihbaqmk3ph6ah0njbygxr9lrdnacy6yrlmbd5";
     };
 
@@ -14277,7 +14277,7 @@ in modules // {
    version = "1.1.0";
 
    src = pkgs.fetchurl {
-     url = "https://pypi.python.org/packages/source/p/python-glanceclient/python-glanceclient-${version}.tar.gz";
+     url = "mirror://pypi/p/python-glanceclient/python-glanceclient-${version}.tar.gz";
      sha256 = "0ppjafsmf29ps23jsw6g2xm66pdi5jdzpywglqqm28b8fj931zsr";
    };
 
@@ -14304,7 +14304,7 @@ in modules // {
    version = "1.2.0";
 
    src = pkgs.fetchurl {
-     url = "https://pypi.python.org/packages/source/w/warlock/${name}.tar.gz";
+     url = "mirror://pypi/w/warlock/${name}.tar.gz";
      sha256 = "0npgi4ks0nww2d6ci791iayab0j6kz6dx3jr7bhpgkql3s4if3bw";
    };
 
@@ -14326,7 +14326,7 @@ in modules // {
     version = "0.10.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/oslo.service/oslo.service-0.10.0.tar.gz";
+      url = "mirror://pypi/o/oslo.service/oslo.service-0.10.0.tar.gz";
       sha256 = "1pcnimc2a50arcgq355ad9lramf6y1yv974swgfj6w90v5c6p9gz";
     };
 
@@ -14356,7 +14356,7 @@ in modules // {
     version = "0.9.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/oslo.cache/${name}.tar.gz";
+      url = "mirror://pypi/o/oslo.cache/${name}.tar.gz";
       sha256 = "0dzvm5xkfj1alf469d7v3syig9f91kjh4p55k57ykgaww3y4cdjp";
     };
 
@@ -14376,7 +14376,7 @@ in modules // {
     version = "1.0.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pecan/${name}.tar.gz";
+      url = "mirror://pypi/p/pecan/${name}.tar.gz";
       sha256 = "04abmybab8jzbwgmrr0fcpcfhcvvkdsv9q135dss02wyk9q9jv4d";
     };
 
@@ -14398,7 +14398,7 @@ in modules // {
     version = "0.5.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/K/Kajiki/${name}.tar.gz";
+      url = "mirror://pypi/K/Kajiki/${name}.tar.gz";
       sha256 = "1ayhr4g5q2hhh50fd33dkb7l8z8n2hnnx3lmhivzg3paf47b3ssz";
     };
 
@@ -14429,7 +14429,7 @@ in modules // {
     '';
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/ryu/${name}.tar.gz";
+      url = "mirror://pypi/r/ryu/${name}.tar.gz";
       sha256 = "1fhriqi7qnvvx9mbvlfm94i5drh920lg204zy3v0qjz43sinkih6";
     };
   };
@@ -14439,7 +14439,7 @@ in modules // {
     version = "0.8.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/W/WSME/${name}.tar.gz";
+      url = "mirror://pypi/W/WSME/${name}.tar.gz";
       sha256 = "1nw827iz5g9jlfnfbdi8kva565v0kdjzba2lccziimj09r71w900";
     };
 
@@ -14467,7 +14467,7 @@ in modules // {
     version = "1.23.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/taskflow/${name}.tar.gz";
+      url = "mirror://pypi/t/taskflow/${name}.tar.gz";
       sha256 = "15np1rc6g9vksgdj0y930ysx5wbmhvc082g264j5zbj6c479g8qa";
     };
 
@@ -14496,7 +14496,7 @@ in modules // {
     version = "0.9.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/g/glance_store/${name}.tar.gz";
+      url = "mirror://pypi/g/glance_store/${name}.tar.gz";
       sha256 = "16az3lq9szl0ixna9rd82dmn4sfxqyivhn4z3z79vk8qdfip1sr9";
     };
 
@@ -14525,7 +14525,7 @@ in modules // {
     version = "2.6.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-swiftclient/python-swiftclient-${version}.tar.gz";
+      url = "mirror://pypi/p/python-swiftclient/python-swiftclient-${version}.tar.gz";
       sha256 = "1j33l4z9vqh0scfncl4fxg01zr1hgqxhhai6gvcih1gccqm4nd7p";
     };
 
@@ -14552,7 +14552,7 @@ in modules // {
     version = "0.2.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/castellan/${name}.tar.gz";
+      url = "mirror://pypi/c/castellan/${name}.tar.gz";
       sha256 = "1im9b4qzq4yhn17jjc8927b3hn06h404vsx8chddw2jfp0v4ryfj";
     };
 
@@ -14580,7 +14580,7 @@ in modules // {
     version = "0.2.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/z/zake/${name}.tar.gz";
+      url = "mirror://pypi/z/zake/${name}.tar.gz";
       sha256 = "1rp4xxy7qp0s0wnq3ig4ji8xsl31g901qkdp339ndxn466cqal2s";
     };
 
@@ -14601,7 +14601,7 @@ in modules // {
     version = "0.8.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/automaton/${name}.tar.gz";
+      url = "mirror://pypi/a/automaton/${name}.tar.gz";
       sha256 = "040rw7w92mp34a15vzvbfvhv1cg8zf81s9jbdd9rmwxr0gmgp2ya";
     };
 
@@ -14622,7 +14622,7 @@ in modules // {
     disabled = isPy3k;  # failing tests
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/networking-hyperv/${name}.tar.gz";
+      url = "mirror://pypi/n/networking-hyperv/${name}.tar.gz";
       sha256 = "04wfkl8rffxp6gp7qvhhc8y80cy0akmh3z7k7y2sj6savg9q7jdj";
     };
 
@@ -14648,7 +14648,7 @@ in modules // {
     version = "2.2.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/k/kazoo/${name}.tar.gz";
+      url = "mirror://pypi/k/kazoo/${name}.tar.gz";
       sha256 = "10pb864if9qi2pq9lfb9m8f7z7ss6rml80gf1d9h64lap5crjnjj";
     };
 
@@ -14683,7 +14683,7 @@ in modules // {
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/osprofiler/${name}.tar.gz";
+      url = "mirror://pypi/o/osprofiler/${name}.tar.gz";
       sha256 = "01rjym49nn4ry1pr2n8fyal1hf17jqhp2yihg8gr15nfjc5iszkx";
     };
 
@@ -14704,7 +14704,7 @@ in modules // {
     version = "1.3.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/F/FormEncode/${name}.zip";
+      url = "mirror://pypi/F/FormEncode/${name}.zip";
       sha256 = "0y5gywq0l79l85ylr55p4xy0h921zgmfw6zmrvlh83aa4j074xg6";
     };
 
@@ -14729,7 +14729,7 @@ in modules // {
     version = "1.17";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pycountry/${name}.tar.gz";
+      url = "mirror://pypi/p/pycountry/${name}.tar.gz";
       sha256 = "1qvhq0c9xsh6d4apcvjphfzl6xnwhnk4jvhr8x2fdfnmb034lc26";
     };
   };
@@ -14739,7 +14739,7 @@ in modules // {
     version = "0.3.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/nine/${name}.tar.gz";
+      url = "mirror://pypi/n/nine/${name}.tar.gz";
       sha256 = "1zrsbm0hajfvklkhgysp81hy632a3bdakp31m0lcpd9xbp5265zy";
     };
 
@@ -14755,7 +14755,7 @@ in modules // {
     version = "0.3.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/l/logutils/${name}.tar.gz";
+      url = "mirror://pypi/l/logutils/${name}.tar.gz";
       sha256 = "173w55fg3hp5dhx7xvssmgqkcv5fjlaik11w5dah2fxygkjvhhj0";
     };
   };
@@ -14765,7 +14765,7 @@ in modules // {
     version = "0.12.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/oslo.policy/${name}.tar.gz";
+      url = "mirror://pypi/o/oslo.policy/${name}.tar.gz";
       sha256 = "06apaj6fwg7f2g5psmxzr5a9apj2l4k2y8kl1hqzyssykblij8ss";
     };
 
@@ -14782,7 +14782,7 @@ in modules // {
     version = "1.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/l/ldappool/${name}.tar.gz";
+      url = "mirror://pypi/l/ldappool/${name}.tar.gz";
       sha256 = "1akmzf51cjfvmd0nvvm562z1w9vq45zsx6fa72kraqgsgxhnrhqz";
     };
 
@@ -14800,7 +14800,7 @@ in modules // {
    version = "2.7.0";
 
    src = pkgs.fetchurl {
-     url = "https://pypi.python.org/packages/source/o/oslo.concurrency/oslo.concurrency-2.7.0.tar.gz";
+     url = "mirror://pypi/o/oslo.concurrency/oslo.concurrency-2.7.0.tar.gz";
      sha256 = "1yp8c87yi6fx1qbq4y1xkx47iiifg7jqzpcghivhxqra8vna185d";
    };
 
@@ -14826,7 +14826,7 @@ in modules // {
     version = "1.3.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/retrying/retrying-1.3.3.tar.gz";
+      url = "mirror://pypi/r/retrying/retrying-1.3.3.tar.gz";
       sha256 = "0fwp86xv0rvkncjdvy2mwcvbglw4w9k0fva25i7zx8kd19b3kh08";
     };
 
@@ -14845,7 +14845,7 @@ in modules // {
     version = "0.13.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/f/fasteners/fasteners-0.13.0.tar.gz";
+      url = "mirror://pypi/f/fasteners/fasteners-0.13.0.tar.gz";
       sha256 = "0nghdq3zihiqg10dp76ls7yn44m5wjncyz7fk8isagkrspkh9a3n";
     };
 
@@ -14869,7 +14869,7 @@ in modules // {
     version = "0.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/a/aioeventlet/aioeventlet-0.4.tar.gz";
+      url = "mirror://pypi/a/aioeventlet/aioeventlet-0.4.tar.gz";
       sha256 = "19krvycaiximchhv1hcfhz81249m3w3jrbp2h4apn1yf4yrc4y7y";
     };
 
@@ -14893,7 +14893,7 @@ in modules // {
     version = "1.12.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/oslo.log/${name}.tar.gz";
+      url = "mirror://pypi/o/oslo.log/${name}.tar.gz";
       sha256 = "10x596r19zjla5n1bf04j5vncx0c9gpc5wc2jlmgjbl3cyx3vgsv";
     };
 
@@ -14912,7 +14912,7 @@ in modules // {
     version = "0.7.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/oslo.context/${name}.tar.gz";
+      url = "mirror://pypi/o/oslo.context/${name}.tar.gz";
       sha256 = "18fmg9dhgngshk63wfb3ddrgx5br8jxkk3x30z40741mslp1fdjy";
     };
 
@@ -14928,7 +14928,7 @@ in modules // {
     version = "2.7.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/oslo.i18n/${name}.tar.gz";
+      url = "mirror://pypi/o/oslo.i18n/${name}.tar.gz";
       sha256 = "11jgcvj36g97awh7fpar4xxgwrvzfahq6rw7xxqac32ia790ylcz";
     };
 
@@ -14944,7 +14944,7 @@ in modules // {
     version = "2.5.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/oslo.config/${name}.tar.gz";
+      url = "mirror://pypi/o/oslo.config/${name}.tar.gz";
       sha256 = "043mavrzj7vjn7kh1dddci4sf67qwqnnn6cm0k1d19alks9hismz";
     };
 
@@ -14960,7 +14960,7 @@ in modules // {
     version = "1.12.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/oslotest/${name}.tar.gz";
+      url = "mirror://pypi/o/oslotest/${name}.tar.gz";
       sha256 = "17i92hymw1dwmmb5yv90m2gam2x21mc960q1pr7bly93x49h8666";
     };
 
@@ -14977,7 +14977,7 @@ in modules // {
     version = "1.8.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/os-client-config/${name}.tar.gz";
+      url = "mirror://pypi/o/os-client-config/${name}.tar.gz";
       sha256 = "10hz4yp594mi1p7v1pvgsmx5w2rnb9y8d0jvb2lfv03ljnwzv8jz";
     };
 
@@ -14999,7 +14999,7 @@ in modules // {
     disabled = isPyPy; # a test fails
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/k/keystoneauth1/${name}.tar.gz";
+      url = "mirror://pypi/k/keystoneauth1/${name}.tar.gz";
       sha256 = "05fc6xsp5mal52ijvj84sf7mrw706ihadfdf5mnq9zxn7pfl4118";
     };
 
@@ -15017,7 +15017,7 @@ in modules // {
     version = "0.6.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/requests-mock/${name}.tar.gz";
+      url = "mirror://pypi/r/requests-mock/${name}.tar.gz";
       sha256 = "0gmd88c224y53b1ai8cfsrcxm9kw3gdqzysclmnaqspg7zjhxwd1";
     };
 
@@ -15034,7 +15034,7 @@ in modules // {
     version = "0.11.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/m/mox3/${name}.tar.gz";
+      url = "mirror://pypi/m/mox3/${name}.tar.gz";
       sha256 = "09dkgki21v5zqrx575h1aazxsq5akkv0a90z644bk1ry9a4zg1pn";
     };
 
@@ -15051,7 +15051,7 @@ in modules // {
     version = "0.9.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/debtcollector/${name}.tar.gz";
+      url = "mirror://pypi/d/debtcollector/${name}.tar.gz";
       sha256 = "1mvdxdrnwlgfqg26s5himkjq6f06r2khlrignx36kkbyaix6j9xb";
     };
     patchPhase = ''
@@ -15070,7 +15070,7 @@ in modules // {
     doCheck = false;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/w/wrapt/${name}.tar.gz";
+      url = "mirror://pypi/w/wrapt/${name}.tar.gz";
       sha256 = "0cq8rlpzkxzk48b50yrfhzn1d1hrq4gjcdqlrgq4v5palgiv9jwr";
     };
   };
@@ -15081,7 +15081,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-        url = "https://pypi.python.org/packages/source/p/pagerduty/pagerduty-${version}.tar.gz";
+        url = "mirror://pypi/p/pagerduty/pagerduty-${version}.tar.gz";
         sha256 = "e8c237239d3ffb061069aa04fc5b3d8ae4fb0af16a9713fe0977f02261d323e9";
     };
   };
@@ -15096,7 +15096,7 @@ in modules // {
     version = "0.18.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pandas/${name}.tar.gz";
+      url = "mirror://pypi/p/pandas/${name}.tar.gz";
       sha256 = "050qw0ap5bhyv5flp78x3lcq1dlminl3xaj6kbrm0jqmx0672xf9";
     };
 
@@ -15165,7 +15165,7 @@ in modules // {
 
     version = "0.9.4";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/x/xlrd/xlrd-${version}.tar.gz";
+      url = "mirror://pypi/x/xlrd/xlrd-${version}.tar.gz";
       sha256 = "8e8d3359f39541a6ff937f4030db54864836a06e42988c452db5b6b86d29ea72";
     };
 
@@ -15180,7 +15180,7 @@ in modules // {
     name = "Bottleneck-${version}";
     version = "1.0.0";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/B/Bottleneck/Bottleneck-${version}.tar.gz";
+      url = "mirror://pypi/B/Bottleneck/Bottleneck-${version}.tar.gz";
       sha256 = "15dl0ll5xmfzj2fsvajzwxsb9dbw5i9fx9i4r6n4i5nzzba7m6wd";
     };
 
@@ -15198,7 +15198,7 @@ in modules // {
     disabled = isPyPy || isPy26;
 
     src = pkgs.fetchurl {
-        url = "https://pypi.python.org/packages/source/p/paho-mqtt/${name}.tar.gz";
+        url = "mirror://pypi/p/paho-mqtt/${name}.tar.gz";
         sha256 = "07i6k9mw66kgbvjgsrcsd2sjji9ckym50dcxnmhjqfkfzsg64yhg";
     };
 
@@ -15215,7 +15215,7 @@ in modules // {
     name = "pamqp-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pamqp/${name}.tar.gz";
+      url = "mirror://pypi/p/pamqp/${name}.tar.gz";
       sha256 = "1vmyvynqzx5zvbipaxff4fnzy3h3dvl3zicyr15yb816j93jl2ca";
     };
 
@@ -15233,7 +15233,7 @@ in modules // {
     version = "1.4";
 
     src = pkgs.fetchurl {
-        url = "https://pypi.python.org/packages/source/p/parsedatetime/${name}.tar.gz";
+        url = "mirror://pypi/p/parsedatetime/${name}.tar.gz";
         sha256 = "09bfcd8f3c239c75e77b3ff05d782ab2c1aed0892f250ce2adf948d4308fe9dc";
     };
   };
@@ -15242,7 +15242,7 @@ in modules // {
     name = "paramiko-1.15.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/paramiko/${name}.tar.gz";
+      url = "mirror://pypi/p/paramiko/${name}.tar.gz";
       sha256 = "6ed97e2281bb48728692cdc621f6b86a65fdc1d46b178ce250cfec10b977a04c";
     };
 
@@ -15277,7 +15277,7 @@ in modules // {
     version = "0.3.0";
 
     src = pkgs.fetchurl{
-      url = "https://pypi.python.org/packages/source/p/patsy/${name}.zip";
+      url = "mirror://pypi/p/patsy/${name}.zip";
       sha256 = "a55dd4ca09af4b9608b81f30322beb450510964c022708ab50e83a065ccf15f0";
     };
 
@@ -15296,7 +15296,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = http://pypi.python.org/packages/source/P/Paste/Paste-1.7.5.1.tar.gz;
+      url = mirror://pypi/P/Paste/Paste-1.7.5.1.tar.gz;
       sha256 = "11645842ba8ec986ae8cfbe4c6cacff5c35f0f4527abf4f5581ae8b4ad49c0b6";
     };
 
@@ -15316,7 +15316,7 @@ in modules // {
     name = "paste-deploy-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/P/PasteDeploy/PasteDeploy-${version}.tar.gz";
+      url = "mirror://pypi/P/PasteDeploy/PasteDeploy-${version}.tar.gz";
       sha256 = "d5858f89a255e6294e63ed46b73613c56e3b9a2d82a42f1df4d06c8421a9e3cb";
     };
 
@@ -15334,7 +15334,7 @@ in modules // {
     name = "PasterScript-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/P/PasteScript/${name}.tar.gz";
+      url = "mirror://pypi/P/PasteScript/${name}.tar.gz";
       sha256 = "2b685be69d6ac8bc0fe6f558f119660259db26a15e16a4943c515fbee8093539";
     };
 
@@ -15355,7 +15355,7 @@ in modules // {
     disabled = pythonAtLeast "3.4"; # Was added to std library in Python 3.4
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pathlib/${name}.tar.gz";
+      url = "mirror://pypi/p/pathlib/${name}.tar.gz";
       sha256 = "17zajiw4mjbkkv6ahp3xf025qglkj0805m9s41c45zryzj6p2h39";
     };
 
@@ -15371,7 +15371,7 @@ in modules // {
     name = "path.py-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/path.py/${name}.tar.gz";
+      url = "mirror://pypi/p/path.py/${name}.tar.gz";
       sha256 = "ada95d117c4559abe64080961daf5badda68561afdd34c278f8ca20f2fa466d2";
     };
 
@@ -15394,7 +15394,7 @@ in modules // {
     name = "paypalrestsdk-0.7.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/paypalrestsdk/${name}.tar.gz";
+      url = "mirror://pypi/p/paypalrestsdk/${name}.tar.gz";
       sha256 = "117kfipzfahf9ysv414bh1mmm5cc9ck5zb6rhpslx1f8gk3frvd6";
     };
 
@@ -15412,7 +15412,7 @@ in modules // {
     version = "1.8.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pbr/${name}.tar.gz";
+      url = "mirror://pypi/p/pbr/${name}.tar.gz";
       sha256 = "0jcny36cf3s8ar5r4a575npz080hndnrfs4np1fqhv0ym4k7c4p2";
     };
 
@@ -15432,7 +15432,7 @@ in modules // {
     name = "fixtures-1.4.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/f/fixtures/${name}.tar.gz";
+      url = "mirror://pypi/f/fixtures/${name}.tar.gz";
       sha256 = "0djxvdwm8s60dbfn7bhf40x6g818p3b3mlwijm1c3bqg7msn271y";
     };
 
@@ -15495,7 +15495,7 @@ in modules // {
     version = "1.7.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pep8/${name}.tar.gz";
+      url = "mirror://pypi/p/pep8/${name}.tar.gz";
       sha256 = "a113d5f5ad7a7abacef9df5ec3f2af23a20a28005921577b15dd584d099d5900";
     };
 
@@ -15531,7 +15531,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/percol/${name}.tar.gz";
+      url = "mirror://pypi/p/percol/${name}.tar.gz";
       sha256 = "169s5mhw1s60qbsd6pkf9bb2x6wfgx8hn8nw9d4qgc68qnnpp2cj";
     };
 
@@ -15550,7 +15550,7 @@ in modules // {
     version = "0.15";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pexif/pexif-0.15.tar.gz";
+      url = "mirror://pypi/p/pexif/pexif-0.15.tar.gz";
       sha256 = "45a3be037c7ba8b64bbfc48f3586402cc17de55bb9d7357ef2bc99954a18da3f";
     };
 
@@ -15567,7 +15567,7 @@ in modules // {
     name = "pexpect-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pexpect/${name}.tar.gz";
+      url = "mirror://pypi/p/pexpect/${name}.tar.gz";
       sha256 = "dfea618d43e83cfff21504f18f98019ba520f330e4142e5185ef7c73527de5ba";
     };
 
@@ -15602,7 +15602,7 @@ in modules // {
     name = "pg8000-1.10.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pg8000/${name}.tar.gz";
+      url = "mirror://pypi/p/pg8000/${name}.tar.gz";
       sha256 = "188658db63c2ca931ae1bf0167b34efaac0ecc743b707f0118cc4b87e90ce488";
     };
 
@@ -15674,7 +15674,7 @@ in modules // {
     name = "pickleshare-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pickleshare/${name}.tar.gz";
+      url = "mirror://pypi/p/pickleshare/${name}.tar.gz";
       sha256 = "c0be5745035d437dbf55a96f60b7712345b12423f7d0951bd7d8dc2141ca9286";
     };
 
@@ -15693,7 +15693,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/piep/piep-${version}.tar.gz";
+      url = "mirror://pypi/p/piep/piep-${version}.tar.gz";
       sha256 = "1wgkg1kc28jpya5k4zvbc9jmpa60b3d5c3gwxfbp15hw6smyqirj";
     };
 
@@ -15712,7 +15712,7 @@ in modules // {
     name = "pip-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pip/pip-${version}.tar.gz";
+      url = "mirror://pypi/p/pip/pip-${version}.tar.gz";
       sha256 = "160pa7xg0vybidhszd1n0ik2xah0yz6gsym5hp8k7dmfd83d6y1y";
     };
 
@@ -15728,7 +15728,7 @@ in modules // {
     name = "pika-0.9.12";
     disabled = isPy3k;
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/p/pika/pika-0.9.12.tar.gz;
+      url = mirror://pypi/p/pika/pika-0.9.12.tar.gz;
       sha256 = "670787ee6ade47cadd1ec8220876b9b7ae4df7bc4b9dd1d808261a6b47e9ce5d";
     };
     buildInputs = with self; [ nose mock pyyaml ];
@@ -15743,7 +15743,7 @@ in modules // {
     disabled = isPy3k || isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/platformio/platformio-${version}.tar.gz";
+      url = "mirror://pypi/p/platformio/platformio-${version}.tar.gz";
       sha256 = "1l8jcwf8flmx8xcsvly2my8al8nzjr67h3mg5c9wvdr7a42q7dil";
      };
 
@@ -15762,7 +15762,7 @@ in modules // {
     version = "0.2.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pylibconfig2/${name}.tar.gz";
+      url = "mirror://pypi/p/pylibconfig2/${name}.tar.gz";
       sha256 = "0kyg6gldj6hi2jhc5xhi834bb2mcaiy24dvfik963shnldqr7kqg";
     };
 
@@ -15785,7 +15785,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/${pname}/${name}.tar.gz";
+      url = "mirror://pypi/p/${pname}/${name}.tar.gz";
       sha256 = "1rxyg9465cp6nc47pqxqf092wmbvv2zhffzvaf2w74laal43pgxw";
     };
 
@@ -15802,7 +15802,7 @@ in modules // {
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pysftp/${name}.tar.gz";
+      url = "mirror://pypi/p/pysftp/${name}.tar.gz";
       sha256 = "1d69z8yngciksch1i8rivy1xl8f6g6sb7c3kk5cm3pf8304q6hhm";
     };
 
@@ -15825,7 +15825,7 @@ in modules // {
     version = "0.8.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/P/PySoundFile/PySoundFile-${version}.tar.gz";
+      url = "mirror://pypi/P/PySoundFile/PySoundFile-${version}.tar.gz";
       sha256 = "72c3e23b7c9998460ec78176084ea101e3439596ab29df476bc8508708df84df";
     };
 
@@ -15855,7 +15855,7 @@ in modules // {
     doCheck = false;
 
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/p/python3-pika/python3-pika-0.9.14.tar.gz;
+      url = mirror://pypi/p/python3-pika/python3-pika-0.9.14.tar.gz;
       sha256 = "1c3hifwvn04kvlja88iawf0awyz726jynwnpcb6gn7376b4nfch7";
     };
     buildInputs = with self; [ nose mock pyyaml ];
@@ -15868,7 +15868,7 @@ in modules // {
     name = "python-jenkins-${version}";
     version = "0.4.11";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-jenkins/${name}.tar.gz";
+      url = "mirror://pypi/p/python-jenkins/${name}.tar.gz";
       sha256 = "153gm7pmmn0bymglsgcr2ya0752r2v1hajkx73gl1pk4jifb2gdf";
     };
     patchPhase = ''
@@ -15890,7 +15890,7 @@ in modules // {
     name = "Pillow-2.9.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Pillow/${name}.zip";
+      url = "mirror://pypi/P/Pillow/${name}.zip";
       sha256 = "1mal92cwh85z6zqx7lrmg0dbqb2gw2cbb2fm6xh0fivmszz8vnyi";
     };
 
@@ -15947,7 +15947,7 @@ in modules // {
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pkgconfig/${name}.tar.gz";
+      url = "mirror://pypi/p/pkgconfig/${name}.tar.gz";
       sha256 = "709daaf077aa2b33bedac12706373412c3683576a43013bbaa529fc2769d80df";
     };
 
@@ -15976,7 +15976,7 @@ in modules // {
     buildInputs = with self; [ self.six ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plumbum/${name}.tar.gz";
+      url = "mirror://pypi/p/plumbum/${name}.tar.gz";
       sha256 = "b759f9e3b6771dff3332f01bc0683d1a56218f44d97942dabd906a0cd1cfb756";
     };
   };
@@ -16047,7 +16047,7 @@ in modules // {
     name = "praw-3.3.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/praw/${name}.zip";
+      url = "mirror://pypi/p/praw/${name}.zip";
       sha256 = "17s8s4a1yk9rq21f3kmj9k4dbgvfa3650l8b39nhwybvxl3j5nfv";
     };
 
@@ -16076,7 +16076,7 @@ in modules // {
     name = "prettytable-0.7.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/P/PrettyTable/${name}.tar.bz2";
+      url = "mirror://pypi/P/PrettyTable/${name}.tar.bz2";
       sha256 = "599bc5b4b9602e28294cf795733c889c26dd934aa7e0ee9cff9b905d4fbad188";
     };
 
@@ -16099,7 +16099,7 @@ in modules // {
 
     src = pkgs.fetchurl {
       sha256 = "1yq9nis1b2rgpndi2rqh4divf6j22jjva83r5z8jf7iffywmr8hs";
-      url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz";
+      url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz";
     };
 
     buildInputs = with self; [ jedi ipython pygments ];
@@ -16123,7 +16123,7 @@ in modules // {
     version = "0.52";
     src = pkgs.fetchurl {
       sha256 = "00h9ldqmb33nhg2kpks7paldf3n3023ipp124alwp96yz16s7f1m";
-      url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz";
+      url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz";
     };
 
     #Only <3.4 expressly supported.
@@ -16176,7 +16176,7 @@ in modules // {
     version = "3.4.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/psutil/${name}.tar.gz";
+      url = "mirror://pypi/p/psutil/${name}.tar.gz";
       sha256 = "b17fa01aa766daa388362d0eda5c215d77e03a8d37676b68971f37bf3913b725";
     };
 
@@ -16200,7 +16200,7 @@ in modules // {
   psutil_1 = self.psutil.overrideDerivation (self: rec {
     name = "psutil-1.2.1";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/psutil/${name}.tar.gz";
+      url = "mirror://pypi/p/psutil/${name}.tar.gz";
       sha256 = "0ibclqy6a4qmkjhlk3g8jhpvnk0v9aywknc61xm3hfi5r124m3jh";
     };
   });
@@ -16213,7 +16213,7 @@ in modules // {
     doCheck = false;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/psycopg2/${name}.tar.gz";
+      url = "mirror://pypi/p/psycopg2/${name}.tar.gz";
       sha256 = "07ivzl7bq8bjcq5n90w4bsl29gjfm5l8yamw0paxh25si8r3zfi4";
     };
 
@@ -16232,7 +16232,7 @@ in modules // {
     version = "1.0.2";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/publicsuffix/${name}.tar.gz";
+      url = "mirror://pypi/p/publicsuffix/${name}.tar.gz";
       sha256 = "f6dfcb8a33fb3ac4f09e644cd26f8af6a09d1a45a019d105c8da58e289ca0096";
     };
 
@@ -16249,7 +16249,7 @@ in modules // {
     version = "1.4.31";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/py/${name}.tar.gz";
+      url = "mirror://pypi/p/py/${name}.tar.gz";
       sha256 = "a6501963c725fc2554dabfece8ae9a8fb5e149c0ac0a42fd2b02c5c1c57fc114";
     };
 
@@ -16268,7 +16268,7 @@ in modules // {
     name = "pyacoustid-1.1.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyacoustid/${name}.tar.gz";
+      url = "mirror://pypi/p/pyacoustid/${name}.tar.gz";
       sha256 = "0117039cb116af245e6866e8e8bf3c9c8b2853ad087142bd0c2dfc0acc09d452";
     };
 
@@ -16294,7 +16294,7 @@ in modules // {
     name = "pyalogotrade-0.16";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/P/PyAlgoTrade/PyAlgoTrade-0.16.tar.gz";
+      url = "mirror://pypi/P/PyAlgoTrade/PyAlgoTrade-0.16.tar.gz";
       sha256 = "a253617254194b91cfebae7bfd184cb109d4e48a8c70051b9560000a2c0f94b3";
     };
 
@@ -16330,7 +16330,7 @@ in modules // {
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyasn1-modules/${name}.tar.gz";
+      url = "mirror://pypi/p/pyasn1-modules/${name}.tar.gz";
       sha256 = "0hcr6klrzmw4d9j9s5wrhqva5014735pg4zk3rppac4fs87g0rdy";
     };
 
@@ -16349,7 +16349,7 @@ in modules // {
     version = "0.2.9";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/P/PyAudio/PyAudio-${version}.tar.gz";
+      url = "mirror://pypi/P/PyAudio/PyAudio-${version}.tar.gz";
       sha256 = "bfd694272b3d1efc51726d0c27650b3c3ba1345f7f8fdada7e86c9751ce0f2a1";
     };
 
@@ -16369,7 +16369,7 @@ in modules // {
     version = "3.0.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pysaml2/${name}.tar.gz";
+      url = "mirror://pypi/p/pysaml2/${name}.tar.gz";
       sha256 = "0y2iw1dddcvi13xjh3l52z1mvnrbc41ik9k4nn7lwj8x5kimnk9n";
     };
 
@@ -16398,7 +16398,7 @@ in modules // {
     version = "0.3.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/m/mongodict/${name}.tar.gz";
+      url = "mirror://pypi/m/mongodict/${name}.tar.gz";
       sha256 = "0nv5amfs337m0gbxpjb0585s20rndqfc3mfrzq1iwgnds5gxcrlw";
     };
 
@@ -16418,7 +16418,7 @@ in modules // {
     version = "2.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/repoze.who/${name}.tar.gz";
+      url = "mirror://pypi/r/repoze.who/${name}.tar.gz";
       sha256 = "12wsviar45nwn35w2y4i8b929dq2219vmwz8013wx7bpgkn2j9ij";
     };
 
@@ -16470,7 +16470,7 @@ in modules // {
     name = "pycarddav-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyCardDAV/pyCardDAV-${version}.tar.gz";
+      url = "mirror://pypi/p/pyCardDAV/pyCardDAV-${version}.tar.gz";
       sha256 = "0avkrcpisfvhz103v7vmq2jd83hvmpqrb4mlbx6ikkk1wcvclsx8";
     };
 
@@ -16490,7 +16490,7 @@ in modules // {
     name = "pycosat-0.6.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pycosat/${name}.tar.gz";
+      url = "mirror://pypi/p/pycosat/${name}.tar.gz";
       sha256 = "02sdn2998jlrm35smn1530hix3kzwyc1jv49cjdcnvfvrqqi3rww";
     };
 
@@ -16511,7 +16511,7 @@ in modules // {
     name = "pygit2-0.23.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pygit2/${name}.tar.gz";
+      url = "mirror://pypi/p/pygit2/${name}.tar.gz";
       sha256 = "04201vcal7jq8lbpk9ylscrhjxdcf2aihiw25k4imjjqgfmvldf7";
     };
 
@@ -16540,7 +16540,7 @@ in modules // {
     name = "Babel-2.2.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/B/Babel/${name}.tar.gz";
+      url = "mirror://pypi/B/Babel/${name}.tar.gz";
       sha256 = "d8cb4c0e78148aee89560f9fe21587aa57739c975bb89ff66b1e842cc697428f";
     };
 
@@ -16561,7 +16561,7 @@ in modules // {
     disabled = isPyPy || isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pybfd/${name}.tar.gz";
+      url = "mirror://pypi/p/pybfd/${name}.tar.gz";
       sha256 = "d99b32ad077e704ddddc0b488c83cae851c14919e5cbc51715d00464a1932df4";
     };
 
@@ -16613,7 +16613,7 @@ in modules // {
     version = "0.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/py-bcrypt/py-bcrypt-${version}.tar.gz";
+      url = "mirror://pypi/p/py-bcrypt/py-bcrypt-${version}.tar.gz";
       sha256 = "5fa13bce551468350d66c4883694850570f3da28d6866bb638ba44fe5eabda78";
     };
 
@@ -16651,7 +16651,7 @@ in modules // {
     disabled = isPyPy || isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pycapnp/${name}.tar.gz";
+      url = "mirror://pypi/p/pycapnp/${name}.tar.gz";
       sha256 = "1kp97il34419gcrhn866n6a10lvh8qr13bnllnnh9473n4cq0cvk";
     };
 
@@ -16676,7 +16676,7 @@ in modules // {
     disabled = !isPy27;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pycdio/${name}.tar.gz";
+      url = "mirror://pypi/p/pycdio/${name}.tar.gz";
       sha256 = "1mrh233pj584gf7la64d4xlmvdnfl4jwpxs95lnd3i4zd5drid14";
     };
 
@@ -16716,7 +16716,7 @@ in modules // {
     disabled = isPy3k || isPyPy;  # see https://bitbucket.org/pypy/pypy/issue/1190/
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pycryptopp/${name}.tar.gz";
+      url = "mirror://pypi/p/pycryptopp/${name}.tar.gz";
       sha256 = "0n90h1yg7bfvlbhnc54xb6dbqm286ykaksyg04kxlhyjgf8mhq8i";
     };
 
@@ -16815,7 +16815,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pydot/${name}.tar.gz";
+      url = "mirror://pypi/p/pydot/${name}.tar.gz";
       sha256 = "80ea01a7ba75671a3b7890375be0ad8d5321b07bfb6f572192c31409062b59f3";
     };
     propagatedBuildInputs = with self; [pyparsing pkgs.graphviz];
@@ -16829,7 +16829,7 @@ in modules // {
     name = "pydot_ng-1.0.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pydot-ng/${name}.tar.gz";
+      url = "mirror://pypi/p/pydot-ng/${name}.tar.gz";
       sha256 = "0h8k8wlzvnb40v4js7afgfyhp3wasmb1kg4gr6z7ck63iv8fq864";
     };
 
@@ -16853,7 +16853,7 @@ in modules // {
     name = "pyelasticsearch-1.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyelasticsearch/${name}.tar.gz";
+      url = "mirror://pypi/p/pyelasticsearch/${name}.tar.gz";
       sha256 = "18wp6llfjv6hvyhr3f6i8dm9wc5rf46wiqsfxwpvnf6mdrvk6xr7";
     };
 
@@ -16875,7 +16875,7 @@ in modules // {
     name = "${pname}-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/${pname}/${name}.tar.gz";
+      url = "mirror://pypi/p/${pname}/${name}.tar.gz";
       sha256 = "1pi1mdzfffgl5qcz0prsa7hlbriycy7mgagi0fdrp3vf17fslmzw";
     };
 
@@ -16899,7 +16899,7 @@ in modules // {
     name = "pyenchant-1.6.6";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyenchant/pyenchant-1.6.6.tar.gz";
+      url = "mirror://pypi/p/pyenchant/pyenchant-1.6.6.tar.gz";
       sha256 = "25c9d2667d512f8fc4410465fdd2e868377ca07eb3d56e2b6e534a86281d64d3";
     };
 
@@ -16926,7 +16926,7 @@ in modules // {
     name = "pyev-0.9.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyev/${name}.tar.gz";
+      url = "mirror://pypi/p/pyev/${name}.tar.gz";
       sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx";
     };
 
@@ -16970,7 +16970,7 @@ in modules // {
     version = "0.9.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyFFTW/pyFFTW-${version}.tar.gz";
+      url = "mirror://pypi/p/pyFFTW/pyFFTW-${version}.tar.gz";
       sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074";
     };
 
@@ -17002,7 +17002,7 @@ in modules // {
     version = "0.7.2";
 
     src = pkgs.fetchurl {
-      url    = "https://pypi.python.org/packages/source/p/pyfiglet/${name}.tar.gz";
+      url    = "mirror://pypi/p/pyfiglet/${name}.tar.gz";
       sha256 = "0v8a18wvaqnb1jksyv5dc5n6zj0vrkyhz0ivmm8gfwpa0ky6n68y";
     };
 
@@ -17020,7 +17020,7 @@ in modules // {
     version = "1.0.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyflakes/${name}.tar.gz";
+      url = "mirror://pypi/p/pyflakes/${name}.tar.gz";
       sha256 = "f39e33a4c03beead8774f005bd3ecf0c3f2f264fa0201de965fce0aff1d34263";
     };
 
@@ -17040,7 +17040,7 @@ in modules // {
     name = "pygeoip-0.3.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pygeoip/pygeoip-0.3.2.tar.gz";
+      url = "mirror://pypi/p/pygeoip/pygeoip-0.3.2.tar.gz";
       sha256 = "f22c4e00ddf1213e0fae36dc60b46ee7c25a6339941ec1a975539014c1f9a96d";
     };
 
@@ -17061,7 +17061,7 @@ in modules // {
     version = "1.2.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyglet/pyglet-${version}.tar.gz";
+      url = "mirror://pypi/p/pyglet/pyglet-${version}.tar.gz";
       sha256 = "9f62ffbbcf2b202d084bf158685e77d28b8f4f5f2738f4c5e63a947a07503445";
     };
 
@@ -17085,7 +17085,7 @@ in modules // {
     name = "Pygments-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz";
+      url = "mirror://pypi/P/Pygments/${name}.tar.gz";
       sha256 = "10axnp2wpjnq9g8wg53fx0c70dfxqrz498jyz8mrdx9a3flwir48";
     };
 
@@ -17108,7 +17108,7 @@ in modules // {
     name = "Pygments-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz";
+      url = "mirror://pypi/P/Pygments/${name}.tar.gz";
       sha256 = "7320919084e6dac8f4540638a46447a3bd730fca172afc17d2c03eed22cf4f51";
     };
   };
@@ -17141,7 +17141,7 @@ in modules // {
     version = "1.5.4";
 
     src = pkgs.fetchurl {
-        url = "https://pypi.python.org/packages/source/p/pylint/${name}.tar.gz";
+        url = "mirror://pypi/p/pylint/${name}.tar.gz";
         sha256 = "2fe3cc2fc66a56fdc35dbbc2bf1dd96a534abfc79ee6b2ad9ae4fe166e570c4b";
     };
 
@@ -17167,7 +17167,7 @@ in modules // {
     version = "0.7.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyrr/pyrr-${version}.tar.gz";
+      url = "mirror://pypi/p/pyrr/pyrr-${version}.tar.gz";
       sha256 = "04a65a9fb5c746b41209f55b21abf47a0ef80a4271159d670ca9579d9be3b4fa";
     };
 
@@ -17186,7 +17186,7 @@ in modules // {
     version = "1.2.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyshp/pyshp-${version}.tar.gz";
+      url = "mirror://pypi/p/pyshp/pyshp-${version}.tar.gz";
       sha256 = "e18cc19659dadc5ddaa891eb780a6958094da0cf105a1efe0f67e75b4fa1cdf9";
     };
 
@@ -17204,7 +17204,7 @@ in modules // {
     version = "0.14.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/P/PyX/PyX-${version}.tar.gz";
+      url = "mirror://pypi/P/PyX/PyX-${version}.tar.gz";
       sha256 = "05d1b7fc813379d2c12fcb5bd0195cab522b5aabafac88f72913f1d47becd912";
     };
 
@@ -17242,7 +17242,7 @@ in modules // {
     name = "kaa-base-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/k/kaa-base/kaa-base-0.99.2dev-384-2b73caca.tar.gz";
+      url = "mirror://pypi/k/kaa-base/kaa-base-0.99.2dev-384-2b73caca.tar.gz";
       sha256 = "0k3zzz84wzz9q1fl3vvqr2ys96z9pcf4viq9q6s2a63zaysmcfd2";
     };
 
@@ -17313,7 +17313,7 @@ in modules // {
     '';
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/k/kaa-metadata/kaa-metadata-0.7.8dev-r4569-20111003.tar.gz";
+      url = "mirror://pypi/k/kaa-metadata/kaa-metadata-0.7.8dev-r4569-20111003.tar.gz";
       sha256 = "0bkbzfgxvmby8lvzkqjp86anxvv3vjd9nksv2g4l7shsk1n7y27a";
     };
 
@@ -17332,7 +17332,7 @@ in modules // {
     version = "0.9.6";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/${name}/${name}-${version}.tar.gz";
+      url = "mirror://pypi/p/${name}/${name}-${version}.tar.gz";
       sha256 = "1x3i9wmzw33fpkis203alygfnrkcmq9w1aydcm887jh6frfqm6cw";
     };
 
@@ -17421,7 +17421,7 @@ in modules // {
     name = "pyparsing-2.0.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyparsing/${name}.tar.gz";
+      url = "mirror://pypi/p/pyparsing/${name}.tar.gz";
       sha256 = "1r742rjbagf2i166k2w0r192adfw7l9lnsqz7wh4mflf00zws1q0";
     };
 
@@ -17439,7 +17439,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyparsing/${name}.tar.gz";
+      url = "mirror://pypi/p/pyparsing/${name}.tar.gz";
       sha256 = "646e14f90b3689b005c19ac9b6b390c9a39bf976481849993e277d7380e6e79f";
     };
 
@@ -17501,7 +17501,7 @@ in modules // {
     doCheck = false;  # No such file or directory errors on 32bit
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyptlib/pyptlib-${version}.tar.gz";
+      url = "mirror://pypi/p/pyptlib/pyptlib-${version}.tar.gz";
       sha256 = "01y6vbwncqb0hxlnin6whd9wrrm5my4qzjhk76fnix78v7ip515r";
     };
     meta = {
@@ -17517,7 +17517,7 @@ in modules // {
     doCheck = false;  # "PyQtGraph requires either PyQt4 or PySide; neither package could be imported."
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyqtgraph/${name}.tar.gz";
+      url = "mirror://pypi/p/pyqtgraph/${name}.tar.gz";
       sha256 = "188pcxf3sxxjf0aipjn820lx2rf9f42zzp0sibmcl90955a3ipf1";
     };
 
@@ -17537,7 +17537,7 @@ in modules // {
     version = "0.5.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pystache/${name}.tar.gz";
+      url = "mirror://pypi/p/pystache/${name}.tar.gz";
       sha256 = "f7bbc265fb957b4d6c7c042b336563179444ab313fb93a719759111eabd3b85a";
     };
 
@@ -17564,7 +17564,7 @@ in modules // {
     name = "PyStemmer-1.3.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/P/PyStemmer/${name}.tar.gz";
+      url = "mirror://pypi/P/PyStemmer/${name}.tar.gz";
       sha256 = "d1ac14eb64978c1697fcfba76e3ac7ebe24357c9428e775390f634648947cb91";
     };
 
@@ -17585,7 +17585,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/P/Pyro/${name}.tar.gz";
+      url = "mirror://pypi/P/Pyro/${name}.tar.gz";
       sha256 = "1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578";
     };
 
@@ -17602,7 +17602,7 @@ in modules // {
     name = "pyrsistent-0.11.12";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyrsistent/${name}.tar.gz";
+      url = "mirror://pypi/p/pyrsistent/${name}.tar.gz";
       sha256 = "0jgyhkkq36wn36rymn4jiyqh2vdslmradq4a2mjkxfbk2cz6wpi5";
     };
 
@@ -17624,7 +17624,7 @@ in modules // {
     name = "PyRSS2Gen-1.0.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/P/PyRSS2Gen/${name}.tar.gz";
+      url = "mirror://pypi/P/PyRSS2Gen/${name}.tar.gz";
       sha256 = "4929d022713129401160fd47550d5158931e4ea6a7136b5d8dfe3b13ac16f2f0";
     };
 
@@ -17641,7 +17641,7 @@ in modules // {
     name = "pysnmp-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pysnmp/${name}.tar.gz";
+      url = "mirror://pypi/p/pysnmp/${name}.tar.gz";
       sha256 = "0zq7yx8732ad9dxpxqgpqyixj7kfwbvf402q7l5njkv0kbcnavn4";
     };
 
@@ -17661,7 +17661,7 @@ in modules // {
     version = "1.5.0";
 
     src = pkgs.fetchurl {
-      url    = "https://pypi.python.org/packages/source/P/PySocks/PySocks-${version}.tar.gz";
+      url    = "mirror://pypi/P/PySocks/PySocks-${version}.tar.gz";
       sha256 = "10wq5311qrnk8rvzsh6gwzxi7h51pgvzw3d7s1mb39fsvf0vyjdk";
     };
 
@@ -17680,7 +17680,7 @@ in modules // {
     meta.maintainers = with maintainers; [ mornfall ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-fedora/${name}.tar.gz";
+      url = "mirror://pypi/p/python-fedora/${name}.tar.gz";
       sha256 = "15m8lvbb5q4rg508i4ah8my872qrq5xjwgcgca4d3kzjv2x6fhim";
     };
     propagatedBuildInputs = with self; [ kitchen requests bunch paver six munch urllib3
@@ -17698,7 +17698,7 @@ in modules // {
     version = "0.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-simple-hipchat/python-simple-hipchat-${version}.zip";
+      url = "mirror://pypi/p/python-simple-hipchat/python-simple-hipchat-${version}.zip";
       sha256 = "404e5ff7187abb09c2227f22063d06baf0fd525725e9c9ad280176bed1c94a3f";
     };
 
@@ -17709,7 +17709,7 @@ in modules // {
     name = "python-keyczar-0.71c";
 
     src = pkgs.fetchurl {
-      url    = "https://pypi.python.org/packages/source/p/python-keyczar/${name}.tar.gz";
+      url    = "mirror://pypi/p/python-keyczar/${name}.tar.gz";
       sha256 = "18mhiwqq6vp65ykmi8x3i5l3gvrvrrr8z2kv11z1rpixmyr7sw1p";
     };
 
@@ -17729,7 +17729,7 @@ in modules // {
     version = "0.16.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyudev/${name}.tar.gz";
+      url = "mirror://pypi/p/pyudev/${name}.tar.gz";
       sha256 = "765d1c14bd9bd031f64e2612225621984cb2bbb8cbc0c03538bcc4c735ff1c95";
     };
 
@@ -17754,7 +17754,7 @@ in modules // {
     name = "pynzb-0.1.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pynzb/${name}.tar.gz";
+      url = "mirror://pypi/p/pynzb/${name}.tar.gz";
       sha256 = "0735b3889a1174bbb65418ee503629d3f5e4a63f04b16f46ffba18253ec3ef17";
     };
 
@@ -17770,7 +17770,7 @@ in modules // {
     name = "progressbar-2.2";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/progressbar/${name}.tar.gz";
+      url = "mirror://pypi/p/progressbar/${name}.tar.gz";
       sha256 = "dfee5201237ca0e942baa4d451fee8bf8a54065a337fabe7378b8585aeda56a3";
     };
 
@@ -17790,7 +17790,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-ldap/python-${name}.tar.gz";
+      url = "mirror://pypi/p/python-ldap/python-${name}.tar.gz";
       sha256 = "0j5hzaar4d0vhnrlpmkczgwm7ci2wibr99a7zx04xddzrhxdpz82";
     };
 
@@ -17803,7 +17803,7 @@ in modules // {
     name = "ldap3-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/l/ldap3/${name}.tar.gz";
+      url = "mirror://pypi/l/ldap3/${name}.tar.gz";
       sha256 = "0j4qqj9vq022hy7wfqn8s0j4vm2g6paabbzas1vbyspawvcfai98";
     };
 
@@ -17840,7 +17840,7 @@ in modules // {
     version = "0.5";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/ptyprocess/${name}.tar.gz";
+      url = "mirror://pypi/p/ptyprocess/${name}.tar.gz";
       sha256= "dcb78fb2197b49ca1b7b2f37b047bc89c0da7a90f90bd5bc17c3ce388bb6ef59";
     };
 
@@ -17918,7 +17918,7 @@ in modules // {
     name = "pyPdf-1.13";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyPdf/${name}.tar.gz";
+      url = "mirror://pypi/p/pyPdf/${name}.tar.gz";
       sha256 = "3aede4c3c9c6ad07c98f059f90db0b09ed383f7c791c46100f649e1cabda0e3b";
     };
 
@@ -17939,7 +17939,7 @@ in modules // {
     version = "1.25.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/P/PyPDF2/${name}.tar.gz";
+      url = "mirror://pypi/P/PyPDF2/${name}.tar.gz";
       sha256 = "1sw225j9fgsvg1zm7lrij96fihfmq8pc1vg611dc55491zvj9ls3";
     };
 
@@ -17960,7 +17960,7 @@ in modules // {
     version = "3.1.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/P/PyOpenGL/PyOpenGL-${version}.tar.gz";
+      url = "mirror://pypi/P/PyOpenGL/PyOpenGL-${version}.tar.gz";
       sha256 = "9b47c5c3a094fa518ca88aeed35ae75834d53e4285512c61879f67a48c94ddaf";
     };
     propagatedBuildInputs = [ pkgs.mesa pkgs.freeglut self.pillow ];
@@ -17995,7 +17995,7 @@ in modules // {
     version = "0.15.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz";
+      url = "mirror://pypi/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz";
       sha256 = "0wnnq15rhj7fhdcd8ycwiw6r6g3w9f9lcy6cigg8226vsrq618ph";
     };
 
@@ -18011,7 +18011,7 @@ in modules // {
     version = "1.2.9";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyquery/${name}.zip";
+      url = "mirror://pypi/p/pyquery/${name}.zip";
       sha256 = "00p6f1dfma65192hc72dxd506491lsq3g5wgxqafi1xpg2w1xia6";
     };
 
@@ -18025,7 +18025,7 @@ in modules // {
     name = "pyrax-1.8.2";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyrax/${name}.tar.gz";
+      url = "mirror://pypi/p/pyrax/${name}.tar.gz";
       sha256 = "0hvim60bhgfj91m7pp8jfmb49f087xqlgkqa505zw28r7yl0hcfp";
     };
 
@@ -18046,7 +18046,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyreport/${name}.tar.gz";
+      url = "mirror://pypi/p/pyreport/${name}.tar.gz";
       sha256 = "1584607596b7b310bf0b6ce79f424bd44238a017fd870aede11cd6732dbe0d4d";
     };
 
@@ -18065,7 +18065,7 @@ in modules // {
     version = "1.3.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyScss/${name}.tar.gz";
+      url = "mirror://pypi/p/pyScss/${name}.tar.gz";
       sha256 = "03lcp853kgr66aqrw2jd1q9jhs9h049w7zlwp7bfmly7xh832cnh";
     };
 
@@ -18084,7 +18084,7 @@ in modules // {
     name = "pyserial-2.7";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyserial/${name}.tar.gz";
+      url = "mirror://pypi/p/pyserial/${name}.tar.gz";
       sha256 = "3542ec0838793e61d6224e27ff05e8ce4ba5a5c5cc4ec5c6a3e8d49247985477";
     };
 
@@ -18101,7 +18101,7 @@ in modules // {
     name = "pymongo-3.0.3";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pymongo/${name}.tar.gz";
+      url = "mirror://pypi/p/pymongo/${name}.tar.gz";
       sha256 = "3c6b2317f8031bc1e200fd1ea35f00a96f4569e3f3f220a5e66ab6227d96ccaf";
     };
 
@@ -18119,7 +18119,7 @@ in modules // {
     version = "2.9.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pymongo/${name}.tar.gz";
+      url = "mirror://pypi/p/pymongo/${name}.tar.gz";
       sha256 = "1nrr1fxyrlxd69bgxl7bvaj2j4z7v3zaciij5sbhxg0vqiz6ny50";
     };
 
@@ -18138,7 +18138,7 @@ in modules // {
     name = "pyperclip-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyperclip/${name}.zip";
+      url = "mirror://pypi/p/pyperclip/${name}.zip";
       sha256 = "07q8krmi7phizzp192x3j7xbk1gzhc1kc3jp4mxrm32dn84sp1vh";
     };
 
@@ -18173,7 +18173,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pysqlite/${name}.tar.gz";
+      url = "mirror://pypi/p/pysqlite/${name}.tar.gz";
       sha256 = "13djzgnbi71znjjyaw4nybg6smilgszcid646j5qav7mdchkb77y";
     };
 
@@ -18275,7 +18275,7 @@ in modules // {
     disabled = ! (isPy26 || isPy27 );
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-wifi/${name}.tar.bz2";
+      url = "mirror://pypi/p/python-wifi/${name}.tar.bz2";
       sha256 = "504639e5953eaec0e41758900fbe143d33d82ea86762b19b659a118c77d8403d";
     };
 
@@ -18296,7 +18296,7 @@ in modules // {
     version = "2016.3";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pytz/${name}.tar.gz";
+      url = "mirror://pypi/p/pytz/${name}.tar.gz";
       sha256 = "1a3hjclyylc4m1v1dn04b38wm2vl649ijdswpg0d8m8n0lcxlj9l";
     };
 
@@ -18312,7 +18312,7 @@ in modules // {
     name = "pyutil-2.0.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyutil/${name}.tar.gz";
+      url = "mirror://pypi/p/pyutil/${name}.tar.gz";
       sha256 = "1fsg9yz5mi2sb0h6c1vvcqchx56i89nbvdb5gfgv1ia3b2w5ra8c";
     };
 
@@ -18448,7 +18448,7 @@ in modules // {
     disabled = !isPy27;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyaml/${name}.tar.gz";
+      url = "mirror://pypi/p/pyaml/${name}.tar.gz";
       sha256 = "8dfe1b295116115695752acc84d15ecf5c1c469975fbed7672bf41a6bc6d6d51";
     };
 
@@ -18484,7 +18484,7 @@ in modules // {
     name = "rabbitpy-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/rabbitpy/${name}.tar.gz";
+      url = "mirror://pypi/r/rabbitpy/${name}.tar.gz";
       sha256 = "0pgijv7mgxc4sm7p9s716dhl600l8isisxzyg4hz7ng1sk09p1w3";
     };
 
@@ -18503,7 +18503,7 @@ in modules // {
     name = "recaptcha-client-1.0.6";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/r/recaptcha-client/${name}.tar.gz";
+      url = "mirror://pypi/r/recaptcha-client/${name}.tar.gz";
       sha256 = "28c6853c1d13d365b7dc71a6b05e5ffb56471f70a850de318af50d3d7c0dea2f";
     };
 
@@ -18560,7 +18560,7 @@ in modules // {
     name = "reportlab-3.2.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/r/reportlab/${name}.tar.gz";
+      url = "mirror://pypi/r/reportlab/${name}.tar.gz";
       sha256 = "14v212cq2w3p0j5xydfr8rav8c8qas1q845r0xj7fm6q5dk8grkj";
     };
 
@@ -18591,7 +18591,7 @@ in modules // {
     disabled = !pythonOlder "3.4";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz";
+      url = "mirror://pypi/r/requests/${name}.tar.gz";
       sha256 = "156bf3ec27ba9ec7e0cf8fbe02808718099d218de403eb64a714d73ba1a29ab1";
     };
 
@@ -18607,7 +18607,7 @@ in modules // {
     version = "2.9.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz";
+      url = "mirror://pypi/r/requests/${name}.tar.gz";
       sha256 = "0zsqrzlybf25xscgi7ja4s48y2abf9wvjkn47wh984qgs1fq2xy5";
     };
 
@@ -18666,7 +18666,7 @@ in modules // {
   retry_decorator = buildPythonPackage rec {
     name = "retry_decorator-1.0.0";
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/r/retry_decorator/retry_decorator-1.0.0.tar.gz;
+      url = mirror://pypi/r/retry_decorator/retry_decorator-1.0.0.tar.gz;
       sha256 = "086zahyb6yn7ggpc58909c5r5h3jz321i1694l1c28bbpaxnlk88";
     };
     meta = {
@@ -18712,7 +18712,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/q/qserve/${name}.zip";
+      url = "mirror://pypi/q/qserve/${name}.zip";
       sha256 = "0b04b2d4d11b464ff1efd42a9ea9f8136187d59f4076f57c9ba95361d41cd7ed";
     };
 
@@ -18730,7 +18730,7 @@ in modules // {
     name = "qtconsole-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/q/qtconsole/${name}.tar.gz";
+      url = "mirror://pypi/q/qtconsole/${name}.tar.gz";
       sha256 = "741906acae9e02c0df9138ac88b621ef22e438565aa96d783a9ef88faec3de46";
     };
 
@@ -18752,7 +18752,7 @@ in modules // {
     name = "quantities-0.10.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/q/quantities/quantities-0.10.1.tar.gz";
+      url = "mirror://pypi/q/quantities/quantities-0.10.1.tar.gz";
       sha256 = "2d27caf31a5e0c37130ac0c14bfa8f9412a5ff1fbf3378a1d6085594776c4315";
     };
 
@@ -18799,7 +18799,7 @@ in modules // {
     version = "0.4.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/recommonmark/${name}.tar.gz";
+      url = "mirror://pypi/r/recommonmark/${name}.tar.gz";
       sha256 = "6e29c723abcf5533842376d87c4589e62923ecb6002a8e059eb608345ddaff9d";
     };
 
@@ -18819,7 +18819,7 @@ in modules // {
     name = "redis-2.10.5";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/redis/${name}.tar.gz";
+      url = "mirror://pypi/r/redis/${name}.tar.gz";
       sha256 = "0csmrkxb29x7xs9b51zplwkkq2hwnbh9jns1g85dykn5rxmaxysx";
     };
 
@@ -18873,7 +18873,7 @@ in modules // {
     version = "2.5.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/restview/${name}.tar.gz";
+      url = "mirror://pypi/r/restview/${name}.tar.gz";
       sha256 = "18diqmh6vwz6imcmvwa7s2v4562y73n072d5d7az2r2ks0g2bzdb";
     };
 
@@ -18899,7 +18899,7 @@ in modules // {
     version = "0.6.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/readme/readme-${version}.tar.gz";
+      url = "mirror://pypi/r/readme/readme-${version}.tar.gz";
       sha256 = "08j2w67nilczn1i5r7h22vag9673i6vnfhyq2rv27r1bdmi5a30m";
     };
 
@@ -18926,7 +18926,7 @@ in modules // {
     version = "2.7.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/W/Whoosh/Whoosh-${version}.tar.gz";
+      url = "mirror://pypi/W/Whoosh/Whoosh-${version}.tar.gz";
       sha256 = "1xx8rqk1v2xs7mxvy9q4sgz2qmgvhf6ygbqjng3pl83ka4f0xz6d";
     };
 
@@ -18947,7 +18947,7 @@ in modules // {
     version = "3.3.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pysolr/pysolr-${version}.tar.gz";
+      url = "mirror://pypi/p/pysolr/pysolr-${version}.tar.gz";
       sha256 = "1wapg9n7myn7c82r3nzs2gisfzx52nip8w2mrfy0yih1zn02mnd6";
     };
 
@@ -18969,7 +18969,7 @@ in modules // {
     version = "2.4.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/django-haystack/django-haystack-${version}.tar.gz";
+      url = "mirror://pypi/d/django-haystack/django-haystack-${version}.tar.gz";
       sha256 = "04cva8qg79xig4zqhb4dwkpm7734dvhzqclzvrdz70fh59ki5b4f";
     };
 
@@ -18995,7 +18995,7 @@ in modules // {
     version = "0.3.0.dev1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/G/GeoAlchemy2/${name}.tar.gz";
+      url = "mirror://pypi/G/GeoAlchemy2/${name}.tar.gz";
       sha256 = "1j95p860ikpcpcirs5791yjpy8rf18zsz7vvsdy6v3x32hkim0k6";
     };
 
@@ -19014,7 +19014,7 @@ in modules // {
     disabled = !isPy27;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/g/geopy/geopy-${version}.tar.gz";
+      url = "mirror://pypi/g/geopy/geopy-${version}.tar.gz";
       sha256 = "04j1lxcsfyv03h0n0q7p2ig7a4n13x4x20fzxn8bkazpx6lyal22";
     };
 
@@ -19031,7 +19031,7 @@ in modules // {
     version = "0.1.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/django-multiselectfield/django-multiselectfield-${version}.tar.gz";
+      url = "mirror://pypi/d/django-multiselectfield/django-multiselectfield-${version}.tar.gz";
       sha256 = "0v7wf82f8688srdsym9ajv1j54bxfxwvydypc03f8xyl4c1raziv";
     };
 
@@ -19074,7 +19074,7 @@ in modules // {
     name = "rdflib-4.1.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/rdflib/${name}.tar.gz";
+      url = "mirror://pypi/r/rdflib/${name}.tar.gz";
       sha256 = "0kvaf332cqbi47rqzlpdx4mbkvw12mkrzkj8n9l19wk713d4py9w";
     };
 
@@ -19094,7 +19094,7 @@ in modules // {
     version = "0.5.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/isodate/${name}.tar.gz";
+      url = "mirror://pypi/i/isodate/${name}.tar.gz";
       sha256 = "42105c41d037246dc1987e36d96f3752ffd5c0c24834dd12e4fdbe1e79544e31";
     };
 
@@ -19108,7 +19108,7 @@ in modules // {
     name = "robomachine-0.6";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/R/RoboMachine/RoboMachine-0.6.tar.gz";
+      url = "mirror://pypi/R/RoboMachine/RoboMachine-0.6.tar.gz";
       sha256 = "6c9a9bae7bffa272b2a09b05df06c29a3a776542c70cae8041a8975a061d2e54";
     };
 
@@ -19133,7 +19133,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/robotframework/${name}.tar.gz";
+      url = "mirror://pypi/r/robotframework/${name}.tar.gz";
       sha256 = "0mfd0s989j3jrpl8q0lb4wsjy1x280chfr9r74m2dyi9c7rxzc58";
     };
 
@@ -19155,7 +19155,7 @@ in modules // {
     name = "robotframework-selenium2library-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/robotframework-selenium2library/${name}.tar.gz";
+      url = "mirror://pypi/r/robotframework-selenium2library/${name}.tar.gz";
       sha256 = "1asdwrpb4s7q08bx641yrh3yicgba14n3hxmsqs58mqf86ignwly";
     };
 
@@ -19177,7 +19177,7 @@ in modules // {
     name = "robotframework-tools-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/robotframework-tools/${name}.tar.gz";
+      url = "mirror://pypi/r/robotframework-tools/${name}.tar.gz";
       sha256 = "04gkn1zpf3rsvbqdxrrjqqi8sa0md9gqwh6n5w2m03fdwjg4lc7q";
     };
 
@@ -19197,7 +19197,7 @@ in modules // {
     name = "robotsuite-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/robotsuite/${name}.zip";
+      url = "mirror://pypi/r/robotsuite/${name}.zip";
       sha256 = "0sw09vrvwv3gzqb6jvhbrz09l6nzzj3i9av34qjddqfwq7cr1bla";
     };
 
@@ -19254,7 +19254,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/r/rope/${name}.tar.gz";
+      url = "mirror://pypi/r/rope/${name}.tar.gz";
       sha256 = "0rdlvp8h74qs49wz1hx6qy8mgp2ddwlfs7z13h9139ynq04a3z7z";
     };
 
@@ -19271,7 +19271,7 @@ in modules // {
     name = "ropemacs-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/r/ropemacs/${name}.tar.gz";
+      url = "mirror://pypi/r/ropemacs/${name}.tar.gz";
       sha256 = "1x5qf1drcdz9jfiiakc60kzqkb3ahsg9j902c5byf3gjfacdrmqj";
     };
 
@@ -19290,7 +19290,7 @@ in modules // {
     name = "ropemode-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/r/ropemode/${name}.tar.gz";
+      url = "mirror://pypi/r/ropemode/${name}.tar.gz";
       sha256 = "0jw6h1wvk6wk0wknqdf7s9pw76m8472jv546lqdd88jbl2scgcjl";
     };
 
@@ -19310,7 +19310,7 @@ in modules // {
     name = "routes-1.12.3";
 
     src = pkgs.fetchurl {
-      url = http://pypi.python.org/packages/source/R/Routes/Routes-1.12.3.tar.gz;
+      url = mirror://pypi/R/Routes/Routes-1.12.3.tar.gz;
       sha256 = "eacc0dfb7c883374e698cebaa01a740d8c78d364b6e7f3df0312de042f77aa36";
     };
 
@@ -19343,7 +19343,7 @@ in modules // {
     name = "rpy2-2.5.6";
     disabled = isPyPy;
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/rpy2/${name}.tar.gz";
+      url = "mirror://pypi/r/rpy2/${name}.tar.gz";
       sha256 = "d0d584c435b5ed376925a95a4525dbe87de7fa9260117e9f208029e0c919ad06";
     };
     buildInputs = with pkgs; [ readline R pcre lzma bzip2 zlib icu ];
@@ -19361,7 +19361,7 @@ in modules // {
     version = "3.3.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/rpyc/${name}.tar.gz";
+      url = "mirror://pypi/r/rpyc/${name}.tar.gz";
       sha256 = "43fa845314f0bf442f5f5fab15bb1d1b5fe2011a8fc603f92d8022575cef8b4b";
     };
 
@@ -19379,7 +19379,7 @@ in modules // {
     version = "3.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/rsa/${name}.tar.gz";
+      url = "mirror://pypi/r/rsa/${name}.tar.gz";
       sha256 = "03f3d9bebad06681771016b8752a40b12f615ff32363c7aa19b3798e73ccd615";
     };
 
@@ -19402,7 +19402,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/S/SquareMap/SquareMap-1.0.4.tar.gz";
+      url = "mirror://pypi/S/SquareMap/SquareMap-1.0.4.tar.gz";
       sha256 = "feab6cb3b222993df68440e34825d8a16de2c74fdb290ae3974c86b1d5f3eef8";
     };
 
@@ -19418,7 +19418,7 @@ in modules // {
     version = "1.0.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/ruamel.base/${name}.tar.gz";
+      url = "mirror://pypi/r/ruamel.base/${name}.tar.gz";
       sha256 = "1wswxrn4givsm917mfl39rafgadimf1sldpbjdjws00g1wx36hf0";
     };
 
@@ -19435,7 +19435,7 @@ in modules // {
     disabled = isPy3k || isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/ruamel.ordereddict/${name}.tar.gz";
+      url = "mirror://pypi/r/ruamel.ordereddict/${name}.tar.gz";
       sha256 = "1xmkl8v9l9inm2pyxgc1fm5005yxm7fkd5gv74q7lj1iy5qc8n3h";
     };
 
@@ -19451,7 +19451,7 @@ in modules // {
     version = "0.10.13";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/ruamel.yaml/${name}.tar.gz";
+      url = "mirror://pypi/r/ruamel.yaml/${name}.tar.gz";
       sha256 = "0r9mn5lm9dcxpy0wpn18cp7i5hkvjvknv3dxg8d9ca6km39m4asn";
     };
 
@@ -19469,7 +19469,7 @@ in modules // {
 
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/R/RunSnakeRun/RunSnakeRun-2.0.4.tar.gz";
+      url = "mirror://pypi/R/RunSnakeRun/RunSnakeRun-2.0.4.tar.gz";
       sha256 = "61d03a13f1dcb3c1829f5a146da1fe0cc0e27947558a51e848b6d469902815ef";
     };
 
@@ -19503,7 +19503,7 @@ in modules // {
     name = "s3transfer-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/s3transfer/${name}.tar.gz";
+      url = "mirror://pypi/s/s3transfer/${name}.tar.gz";
       sha256 = "0ma31zvv7gy240xgd1zw853lpzkdci6mapzpg3x4vycann6yvf9b";
     };
 
@@ -19535,7 +19535,7 @@ in modules // {
     name = "seqdiag-0.9.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/seqdiag/${name}.tar.gz";
+      url = "mirror://pypi/s/seqdiag/${name}.tar.gz";
       sha256 = "1qa7d0m1wahvmrj95rxkb6128cbwd4w3gy8gbzncls66h46bifiz";
     };
 
@@ -19562,7 +19562,7 @@ in modules // {
     version = "2.0.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pysendfile/pysendfile-${version}.tar.gz";
+      url = "mirror://pypi/p/pysendfile/pysendfile-${version}.tar.gz";
       sha256 = "05qf0m32isflln1zjgxlpw0wf469lj86vdwwqyizp1h94x5l22ji";
     };
 
@@ -19596,7 +19596,7 @@ in modules // {
     name = "xattr-0.7.8";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/x/xattr/${name}.tar.gz";
+      url = "mirror://pypi/x/xattr/${name}.tar.gz";
       sha256 = "0nbqfghgy26jyp5q7wl3rj78wr8s39m5042df2jlldg3fx6j0417";
     };
 
@@ -19640,7 +19640,7 @@ in modules // {
   scipy_0_16 = self.buildScipyPackage rec {
     version = "0.16.1";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/scipy/scipy-${version}.tar.gz";
+      url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz";
       sha256 = "ecd1efbb1c038accb0516151d1e6679809c6010288765eb5da6051550bf52260";
     };
     numpy = self.numpy;
@@ -19649,7 +19649,7 @@ in modules // {
   scipy_0_17 = self.buildScipyPackage rec {
     version = "0.17.0";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/scipy/scipy-${version}.tar.gz";
+      url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz";
       sha256 = "f600b755fb69437d0f70361f9e560ab4d304b1b66987ed5a28bdd9dd7793e089";
     };
     numpy = self.numpy;
@@ -19660,7 +19660,7 @@ in modules // {
     version = "0.11.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/scikit-image/${name}.tar.gz";
+      url = "mirror://pypi/s/scikit-image/${name}.tar.gz";
       sha256 = "768e568f3299966c294b7eb8cd114fc648f7bfaef422ee9cc750dd8d9d09e44b";
     };
 
@@ -19682,7 +19682,7 @@ in modules // {
     disabled = stdenv.isi686;  # https://github.com/scikit-learn/scikit-learn/issues/5534
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/scikit-learn/${name}.tar.gz";
+      url = "mirror://pypi/s/scikit-learn/${name}.tar.gz";
       sha256 = "9f4cf58e57d81783289fc503caaed1f210bab49b7a6f680bf3c04b1e0a96e5f0";
     };
 
@@ -19708,7 +19708,7 @@ in modules // {
     name = "scripttest-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/scripttest/scripttest-${version}.tar.gz";
+      url = "mirror://pypi/s/scripttest/scripttest-${version}.tar.gz";
       sha256 = "951cfc25219b0cd003493a565f2e621fd791beaae9f9a3bdd7024d8626419c38";
     };
 
@@ -19726,7 +19726,7 @@ in modules // {
   seaborn = buildPythonPackage rec {
     name = "seaborn-0.6.0";
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/seaborn/${name}.tar.gz";
+      url = "mirror://pypi/s/seaborn/${name}.tar.gz";
       sha256 = "e078399b56ed0d53a4aa8bd4d6bd4a9a9deebc0b4acad259d0ef81830affdb68";
     };
 
@@ -19751,7 +19751,7 @@ in modules // {
   selenium = buildPythonPackage rec {
     name = "selenium-2.44.0";
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/selenium/${name}.tar.gz";
+      url = "mirror://pypi/s/selenium/${name}.tar.gz";
       sha256 = "0l70pqwg88imbylcd831vg8nj8ipy4zr331f6qjccss7vn56i2h5";
     };
 
@@ -19784,7 +19784,7 @@ in modules // {
     version = "1.10.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/setuptools_scm/${name}.tar.bz2";
+      url = "mirror://pypi/s/setuptools_scm/${name}.tar.bz2";
       sha256 = "1cdea91bbe1ec4d52b3e9c451ab32ae6e1f3aa3fd91e90580490a9eb75bea286";
     };
 
@@ -19803,7 +19803,7 @@ in modules // {
     version = "1.2.11";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/setuptools_darcs/${name}.tar.gz";
+      url = "mirror://pypi/s/setuptools_darcs/${name}.tar.gz";
       sha256 = "1wsh0g1fn10msqk87l5jrvzs0yj5mp6q9ld3gghz6zrhl9kqzdn1";
     };
 
@@ -19828,7 +19828,7 @@ in modules // {
     name = "setuptools-trial-0.5.12";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/setuptools_trial/setuptools_trial-0.5.12.tar.gz";
+      url = "mirror://pypi/s/setuptools_trial/setuptools_trial-0.5.12.tar.gz";
       sha256 = "9cc4ca5fd432944eb95e193f28b5a602e8b07201fea4d7077c0976a40f073432";
     };
 
@@ -19848,7 +19848,7 @@ in modules // {
     name = "simplegeneric-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/simplegeneric/${name}.zip";
+      url = "mirror://pypi/s/simplegeneric/${name}.zip";
       sha256 = "dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173";
     };
 
@@ -19867,7 +19867,7 @@ in modules // {
     disabled = isPy26;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/shortuuid/${name}.tar.gz";
+      url = "mirror://pypi/s/shortuuid/${name}.tar.gz";
       sha256 = "4606dbb19124d98109c00e2cafae2df8117aec02115623e18fb2abe3f766d293";
     };
 
@@ -19886,7 +19886,7 @@ in modules // {
     name = "shouldbe-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/shouldbe/${name}.tar.gz";
+      url = "mirror://pypi/s/shouldbe/${name}.tar.gz";
       sha256 = "07pchxpv1xvjbck0xy44k3a1jrvklg0wbyccn14w0i7d135d4174";
     };
 
@@ -19907,7 +19907,7 @@ in modules // {
     name = "simplejson-3.8.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/simplejson/${name}.tar.gz";
+      url = "mirror://pypi/s/simplejson/${name}.tar.gz";
       sha256 = "14r4l4rcsyf87p2j4ycsbb017n4vzxfmv285rq2gny4w47rwi2j2";
     };
 
@@ -19936,7 +19936,7 @@ in modules // {
     buildInputs = with self; [ pep8 pytest tox ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/simpleldap/simpleldap-${version}.tar.gz";
+      url = "mirror://pypi/s/simpleldap/simpleldap-${version}.tar.gz";
       sha256 = "a5916680a7fe1b2c5d74dc76351be2941d03b7b94a50d8520280e3f588a84e61";
     };
 
@@ -19959,7 +19959,7 @@ in modules // {
     disabled = isPy3k || isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/S/SimpleParse/SimpleParse-${version}.tar.gz";
+      url = "mirror://pypi/S/SimpleParse/SimpleParse-${version}.tar.gz";
       sha256 = "1n8msk71lpl3kv086xr2sv68ppgz6228575xfnbszc6p1mwr64rg";
     };
 
@@ -19977,7 +19977,7 @@ in modules // {
     name = "sigal-1.0.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/sigal/${name}.tar.gz";
+      url = "mirror://pypi/s/sigal/${name}.tar.gz";
       sha256 = "198g2r8bii6a0p44mlk1wg07jjv95xpfvnqhhxxziqpizc776b34";
     };
 
@@ -20001,7 +20001,7 @@ in modules // {
     version = "0.1a1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/slowaes/${name}.tar.gz";
+      url = "mirror://pypi/s/slowaes/${name}.tar.gz";
       sha256 = "83658ae54cc116b96f7fdb12fdd0efac3a4e8c7c7064e3fac3f4a881aa54bf09";
     };
 
@@ -20018,7 +20018,7 @@ in modules // {
     name = "snowballstemmer-1.2.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/snowballstemmer/${name}.tar.gz";
+      url = "mirror://pypi/s/snowballstemmer/${name}.tar.gz";
       sha256 = "919f26a68b2c17a7634da993d91339e288964f93c274f1343e3bbbe2096e1128";
     };
 
@@ -20040,7 +20040,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/sqlite3dbm/${name}.tar.gz";
+      url = "mirror://pypi/s/sqlite3dbm/${name}.tar.gz";
       sha256 = "4721607e0b817b89efdba7e79cab881a03164b94777f4cf796ad5dd59a7612c5";
     };
 
@@ -20057,7 +20057,7 @@ in modules // {
     name = "pgpdump-1.5";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pgpdump/pgpdump-1.5.tar.gz";
+      url = "mirror://pypi/p/pgpdump/pgpdump-1.5.tar.gz";
       sha256 = "1c4700857bf7ba735b08cfe4101aa3a4f5fd839657af249c17b2697c20829668";
     };
 
@@ -20089,7 +20089,7 @@ in modules // {
     version = "1.5.13";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/S/Shapely/${name}.tar.gz";
+      url = "mirror://pypi/S/Shapely/${name}.tar.gz";
       sha256 = "68f8efb43112e8ef1f7e56e2c9eef64e0cbc1c19528c627696fb07345075a348";
     };
 
@@ -20120,7 +20120,7 @@ in modules // {
     version = "1.0.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/sockjs-tornado/${name}.tar.gz";
+      url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz";
       sha256 = "15lcy40h2cm0l8aknbrk48p2sni5wzybsqjx1hxwpk9lfa1xryyv";
     };
 
@@ -20140,7 +20140,7 @@ in modules // {
     name = "sopel-6.3.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/sopel/${name}.tar.gz";
+      url = "mirror://pypi/s/sopel/${name}.tar.gz";
       sha256 = "1swvw7xw8n5anb8ah8jilk4vk1y30y62fkibfd9vm9fbk45d1q48";
     };
 
@@ -20165,7 +20165,7 @@ in modules // {
     version = "0.3.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/sounddevice/${name}.tar.gz";
+      url = "mirror://pypi/s/sounddevice/${name}.tar.gz";
       sha256 = "8e5a6816b369c7aea77e06092b2fee99c8b6efbeef4851f53ea3cb208a7607f5";
     };
 
@@ -20190,7 +20190,7 @@ in modules // {
     name = "stevedore-1.7.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/stevedore/${name}.tar.gz";
+      url = "mirror://pypi/s/stevedore/${name}.tar.gz";
       sha256 = "149pjc0c3z6khjisn4yil3f94qjnzwafz093wc8rrzbw828qdkv8";
     };
 
@@ -20212,7 +20212,7 @@ in modules // {
     disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3");
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/T/Theano/${name}.tar.gz";
+      url = "mirror://pypi/T/Theano/${name}.tar.gz";
       sha256 = "17dikk94r8bzkxg976srqlhj5c7phs9gl837iabyfdpixkbrl79g";
     };
 
@@ -20243,7 +20243,7 @@ in modules // {
     propagatedBuildInputs = [ pkgs.html-tidy ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pytidylib/pytidylib-${version}.tar.gz";
+      url = "mirror://pypi/p/pytidylib/pytidylib-${version}.tar.gz";
       sha256 = "0af07bd8ebd256af70ca925ada9337faf16d85b3072624f975136a5134150ab6";
     };
 
@@ -20273,7 +20273,7 @@ in modules // {
     version = "1.50.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/T/TileStache/TileStache-${version}.tar.gz";
+      url = "mirror://pypi/T/TileStache/TileStache-${version}.tar.gz";
       sha256 = "1z1j35pz77lhhjdn69sq5rmz62b5m444507d8zjnp0in5xqaj6rj";
     };
 
@@ -20293,7 +20293,7 @@ in modules // {
     name = "timelib-0.2.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/timelib/${name}.zip";
+      url = "mirror://pypi/t/timelib/${name}.zip";
       sha256 = "49142233bdb5971d64a41e05a1f80a408a02be0dc7d9f8c99e7bdd0613ba81cb";
     };
 
@@ -20311,7 +20311,7 @@ in modules // {
     version = "2.0.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pid/${name}.tar.gz";
+      url = "mirror://pypi/p/pid/${name}.tar.gz";
       sha256 = "0cylj8p25nwkdfgy4pzai21wyzmrxdqlwwbzqag9gb5qcjfdwk05";
     };
 
@@ -20332,7 +20332,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pydns/${name}.tar.gz";
+      url = "mirror://pypi/p/pydns/${name}.tar.gz";
       sha256 = "0qnv7i9824nb5h9psj0rwzjyprwgfiwh5s5raa9avbqazy5hv5pi";
     };
 
@@ -20345,7 +20345,7 @@ in modules // {
     version = "2.1.1";
 
     src = pkgs.fetchurl {
-      url = " https://pypi.python.org/packages/source/p/python-daemon/${name}.tar.gz";
+      url = " mirror://pypi/p/python-daemon/${name}.tar.gz";
       sha256 = "17v80qb98p1gv4j9mq6wb55cv7hc4j1hzw5y2f4s5hrpxs3w3a2q";
     };
 
@@ -20367,7 +20367,7 @@ in modules // {
     disabled = isPy34 || isPy35 || isPyPy;  # some tests fail
 
     src = pkgs.fetchurl {
-      url    = "https://pypi.python.org/packages/source/s/sympy/${name}.tar.gz";
+      url    = "mirror://pypi/s/sympy/${name}.tar.gz";
       sha256 = "1fc272b51091aabe7d07f1bf9f0a47f3e28657fb2bec52bf3ef0e8f159f5f564";
     };
 
@@ -20390,7 +20390,7 @@ in modules // {
     name = "pilkit-1.1.4";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pilkit/${name}.tar.gz";
+      url = "mirror://pypi/p/pilkit/${name}.tar.gz";
       sha256 = "e00585f5466654ea2cdbf7decef9862cb00e16fd363017fa7ef6623a16b0d2c7";
     };
 
@@ -20412,7 +20412,7 @@ in modules // {
     name = "clint-0.5.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/c/clint/${name}.tar.gz";
+      url = "mirror://pypi/c/clint/${name}.tar.gz";
       sha256 = "1an5lkkqk1zha47198p42ji3m94xmzx1a03dn7866m87n4r4q8h5";
     };
 
@@ -20435,7 +20435,7 @@ in modules // {
     name = "argh-0.26.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/a/argh/${name}.tar.gz";
+      url = "mirror://pypi/a/argh/${name}.tar.gz";
       sha256 = "1nqham81ihffc9xmw85dz3rg3v90rw7h0dp3dy0bh3qkp4n499q6";
     };
 
@@ -20455,7 +20455,7 @@ in modules // {
     name = "nose-progressive-1.5.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/n/nose-progressive/${name}.tar.gz";
+      url = "mirror://pypi/n/nose-progressive/${name}.tar.gz";
       sha256 = "0mfbjv3dcg23q0a130670g7xpfyvgza4wxkj991xxh8w9hs43ga4";
     };
 
@@ -20474,7 +20474,7 @@ in modules // {
     name = "blessings-1.6";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/b/blessings/${name}.tar.gz";
+      url = "mirror://pypi/b/blessings/${name}.tar.gz";
       sha256 = "01rhgn2c3xjf9h1lxij9m05iwf2ba6d0vd7nic26c2gic4q73igd";
     };
 
@@ -20496,7 +20496,7 @@ in modules // {
     propagatedBuildInputs = with self; [ quantities numpy ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/semantic/semantic-1.0.3.tar.gz";
+      url = "mirror://pypi/s/semantic/semantic-1.0.3.tar.gz";
       sha256 = "bbc47dad03dddb1ba5895612fdfa1e43cfb3c497534976cebacd4f3684b505b4";
     };
 
@@ -20523,7 +20523,7 @@ in modules // {
     buildInputs = [ self.pbr ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/sandboxlib/sandboxlib-0.3.1.tar.gz";
+      url = "mirror://pypi/s/sandboxlib/sandboxlib-0.3.1.tar.gz";
       sha256 = "0csj8hbpylqdkxcpqkcfs73dfvdqkyj23axi8m9drqdi4dhxb41h";
     };
 
@@ -20537,7 +20537,7 @@ in modules // {
   semantic-version = buildPythonPackage rec {
     name = "semantic_version-2.4.2";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/semantic_version/${name}.tar.gz";
+      url = "mirror://pypi/s/semantic_version/${name}.tar.gz";
       sha256 = "7e8b7fa74a3bc9b6e90b15b83b9bc2377c78eaeae3447516425f475d5d6932d2";
     };
 
@@ -20551,7 +20551,7 @@ in modules // {
   sexpdata = buildPythonPackage rec {
     name = "sexpdata-0.0.2";
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/sexpdata/${name}.tar.gz";
+      url = "mirror://pypi/s/sexpdata/${name}.tar.gz";
       sha256 = "eb696bc66b35def5fb356de09481447dff4e9a3ed926823134e1d0f35eade428";
     };
 
@@ -20568,7 +20568,7 @@ in modules // {
     name = "sh-1.11";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/sh/${name}.tar.gz";
+      url = "mirror://pypi/s/sh/${name}.tar.gz";
       sha256 = "590fb9b84abf8b1f560df92d73d87965f1e85c6b8330f8a5f6b336b36f0559a4";
     };
 
@@ -20600,7 +20600,7 @@ in modules // {
     name = "six-1.10.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/six/${name}.tar.gz";
+      url = "mirror://pypi/s/six/${name}.tar.gz";
       sha256 = "0snmb8xffb3vsma0z67i0h0w2g2dy0p3gsgh9gi4i0kgc5l8spqh";
     };
 
@@ -20653,7 +20653,7 @@ in modules // {
     name = "smartdc-0.1.12";
 
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/s/smartdc/smartdc-0.1.12.tar.gz;
+      url = mirror://pypi/s/smartdc/smartdc-0.1.12.tar.gz;
       sha256 = "36206f4fddecae080c66faf756712537e650936b879abb23a8c428731d2415fe";
     };
 
@@ -20669,7 +20669,7 @@ in modules // {
   socksipy-branch = buildPythonPackage rec {
     name = "SocksiPy-branch-1.01";
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/S/SocksiPy-branch/SocksiPy-branch-1.01.tar.gz;
+      url = mirror://pypi/S/SocksiPy-branch/SocksiPy-branch-1.01.tar.gz;
       sha256 = "01l41v4g7fy9fzvinmjxy6zcbhgqaif8dhdqm4w90fwcw9h51a8p";
     };
     meta = {
@@ -20683,7 +20683,7 @@ in modules // {
     name = "sorl-thumbnail-11.12";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/sorl-thumbnail/${name}.tar.gz";
+      url = "mirror://pypi/s/sorl-thumbnail/${name}.tar.gz";
       sha256 = "050b9kzbx7jvs3qwfxxshhis090hk128maasy8pi5wss6nx5kyw4";
     };
 
@@ -20703,7 +20703,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/supervisor/${name}.tar.gz";
+      url = "mirror://pypi/s/supervisor/${name}.tar.gz";
       sha256 = "e3c3b35804c24b6325b5ba462553ebee80d5f4d1766274737b5c532cd4a11d59";
     };
 
@@ -20724,7 +20724,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/subprocess32/${name}.tar.gz";
+      url = "mirror://pypi/s/subprocess32/${name}.tar.gz";
       sha256 = "ddf4d46ed2be2c7e7372dfd00c464cabb6b3e29ca4113d85e26f82b3d2c220f6";
     };
 
@@ -20755,7 +20755,7 @@ in modules // {
     # https://github.com/sphinx-doc/sphinx/issues/2394
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz";
+      url = "mirror://pypi/S/Sphinx/${name}.tar.gz";
       sha256 = "12pzlfkjjlwgvsj56k0y809jpx5mgcs9548k1l4kdbr028ifjfqb";
     };
 
@@ -20781,7 +20781,7 @@ in modules // {
   sphinx_1_2 = self.sphinx.override rec {
     name = "sphinx-1.2.3";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/sphinx/sphinx-1.2.3.tar.gz";
+      url = "mirror://pypi/s/sphinx/sphinx-1.2.3.tar.gz";
       sha256 = "94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04";
     };
     patches = [];
@@ -20794,7 +20794,7 @@ in modules // {
     name = "sphinx_rtd_theme-0.1.9";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/sphinx_rtd_theme/${name}.tar.gz";
+      url = "mirror://pypi/s/sphinx_rtd_theme/${name}.tar.gz";
       sha256 = "18d0r63w7jpdrk4q5qy26n08vdlmnj9sar93akwjphyambw4cf17";
     };
 
@@ -20820,7 +20820,7 @@ in modules // {
     doCheck = false;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/sphinxcontrib-httpdomain/${name}.tar.gz";
+      url = "mirror://pypi/s/sphinxcontrib-httpdomain/${name}.tar.gz";
       sha256 = "ba8fbe82eddc96cfa9d7b975b0422801a14ace9d7e051b8b2c725b92ea6137b5";
     };
 
@@ -20840,7 +20840,7 @@ in modules // {
     name = "sphinxcontrib-plantuml-0.7";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/sphinxcontrib-plantuml/${name}.tar.gz";
+      url = "mirror://pypi/s/sphinxcontrib-plantuml/${name}.tar.gz";
       sha256 = "011yprqf41dcm1824zgk2w8vi9115286pmli6apwhlrsxc6b6cwv";
     };
 
@@ -20861,7 +20861,7 @@ in modules // {
     name = "Sphinx-PyPI-upload-0.2.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/S/Sphinx-PyPI-upload/${name}.tar.gz";
+      url = "mirror://pypi/S/Sphinx-PyPI-upload/${name}.tar.gz";
       sha256 = "5f919a47ce7a7e6028dba809de81ae1297ac192347cf6fc54efca919d4865159";
     };
 
@@ -20884,7 +20884,7 @@ in modules // {
     doCheck = !isPyPy;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
+      url = "mirror://pypi/S/SQLAlchemy/${name}.tar.gz";
       sha256 = "0rhxgr85xdhjn467qfs0dkyj8x46zxcv6ad3dfx3w14xbkb3kakp";
     };
 
@@ -20918,7 +20918,7 @@ in modules // {
     doCheck = !isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
+      url = "mirror://pypi/S/SQLAlchemy/${name}.tar.gz";
       sha256 = "9edb47d137db42d57fd26673d6c841e189b1aeb9b566cca908962fcc8448c0bc";
     };
 
@@ -20945,7 +20945,7 @@ in modules // {
     version = "1.0.12";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
+      url = "mirror://pypi/S/SQLAlchemy/${name}.tar.gz";
       sha256 = "1l8qclhd0s90w3pvwhi5mjxdwr5j7gw7cjka2fx6f2vqmq7f4yb6";
     };
 
@@ -21004,7 +21004,7 @@ in modules // {
     name = "sqlalchemy-migrate-0.10.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/sqlalchemy-migrate/${name}.tar.gz";
+      url = "mirror://pypi/s/sqlalchemy-migrate/${name}.tar.gz";
       sha256 = "00z0lzjs4ksr9yr31zs26csyacjvavhpz6r74xaw1r89kk75qg7q";
     };
 
@@ -21040,7 +21040,7 @@ in modules // {
     doCheck = !isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/sqlparse/${name}.tar.gz";
+      url = "mirror://pypi/s/sqlparse/${name}.tar.gz";
       sha256 = "108gy82x7davjrn3jqn7yv4r5v4jrzp892ysfx8l00abr8v6r337";
     };
 
@@ -21060,7 +21060,7 @@ in modules // {
     version = "0.6.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/statsmodels/${name}.tar.gz";
+      url = "mirror://pypi/s/statsmodels/${name}.tar.gz";
       sha256 = "be4e44374aec9e848b73e5a230dee190ac0c4519e1d40f69a5813190b13ec676";
     };
 
@@ -21085,7 +21085,7 @@ in modules // {
     disabled = isPy3k;  # next release will be py3k compatible
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-statsd/${name}.tar.gz";
+      url = "mirror://pypi/p/python-statsd/${name}.tar.gz";
       sha256 = "3d2fc153e0d894aa9983531ef47d20d75bd4ee9fd0e46a9d82f452dde58a0a71";
     };
 
@@ -21104,7 +21104,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/stompclient/${name}.tar.gz";
+      url = "mirror://pypi/s/stompclient/${name}.tar.gz";
       sha256 = "95a4e98dd0bba348714439ea11a25ee8a74acb8953f95a683924b5bf2a527e4e";
     };
 
@@ -21202,7 +21202,7 @@ in modules // {
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/sure/${name}.tar.gz";
+      url = "mirror://pypi/s/sure/${name}.tar.gz";
       sha256 = "1lyjq0rvkbv585dppjdq90lbkm6gyvag3wgrggjzyh7cpyh5c12w";
     };
 
@@ -21221,7 +21221,7 @@ in modules // {
     name = "structlog-15.3.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/structlog/${name}.tar.gz";
+      url = "mirror://pypi/s/structlog/${name}.tar.gz";
       sha256 = "1h9qz4fsd7ph8rf80rqmlyj2q54xapgrmkpnyca01w1z8ww6f9w7";
     };
 
@@ -21243,7 +21243,7 @@ in modules // {
     version = "1.1.6";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/svgwrite/${name}.tar.gz";
+      url = "mirror://pypi/s/svgwrite/${name}.tar.gz";
       sha256 = "1f018813072aa4d7e95e58f133acb3f68fa7de0a0d89ec9402cc38406a0ec5b8";
     };
 
@@ -21262,7 +21262,7 @@ in modules // {
     version = "0.3.5";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/f/freezegun/freezegun-${version}.tar.gz";
+      url = "mirror://pypi/f/freezegun/freezegun-${version}.tar.gz";
       sha256 = "02ly89wwn0plcw8clkkzvxaw6zlpm8qyqpm9x2mfw4a0vppb4ngf";
     };
 
@@ -21336,7 +21336,7 @@ in modules // {
     name = "tabulate-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/tabulate/${name}.tar.gz";
+      url = "mirror://pypi/t/tabulate/${name}.tar.gz";
       sha256 = "9071aacbd97a9a915096c1aaf0dc684ac2672904cd876db5904085d6dac9810e";
     };
 
@@ -21429,7 +21429,7 @@ in modules // {
     name = "taskw-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/taskw/${name}.tar.gz";
+      url = "mirror://pypi/t/taskw/${name}.tar.gz";
       sha256 = "1fa7bv5996ppfbryv02lpnlhk5dra63lhlwrb1i4ifqbziqfqh5n";
     };
 
@@ -21459,7 +21459,7 @@ in modules // {
     name = "tempita-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/T/Tempita/Tempita-${version}.tar.gz";
+      url = "mirror://pypi/T/Tempita/Tempita-${version}.tar.gz";
       sha256 = "cacecf0baa674d356641f1d406b8bff1d756d739c46b869a54de515d08e6fc9c";
     };
 
@@ -21478,7 +21478,7 @@ in modules // {
     version = "0.6";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/terminado/${name}.tar.gz";
+      url = "mirror://pypi/t/terminado/${name}.tar.gz";
       sha256 = "2c0ba1f624067dccaaead7d2247cfe029806355cef124dc2ccb53c83229f0126";
     };
 
@@ -21531,7 +21531,7 @@ in modules // {
     version = "2.4.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/k/keystonemiddleware/${name}.tar.gz";
+      url = "mirror://pypi/k/keystonemiddleware/${name}.tar.gz";
       sha256 = "0avrn1f897rnam9wfdanpdwsmn8is3ncfh3nnzq3d1m31b1yqqr6";
     };
 
@@ -21554,7 +21554,7 @@ in modules // {
     version = "0.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/testscenarios/${name}.tar.gz";
+      url = "mirror://pypi/t/testscenarios/${name}.tar.gz";
       sha256 = "1671jvrvqlmbnc42j7pc5y6vc37q44aiwrq0zic652pxyy2fxvjg";
     };
 
@@ -21572,7 +21572,7 @@ in modules // {
     version = "0.0.20";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/testrepository/${name}.tar.gz";
+      url = "mirror://pypi/t/testrepository/${name}.tar.gz";
       sha256 = "1ssqb07c277010i6gzzkbdd46gd9mrj0bi0i8vn560n2k2y4j93m";
     };
 
@@ -21595,7 +21595,7 @@ in modules // {
     version = "0.2.7";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/testresources/${name}.tar.gz";
+      url = "mirror://pypi/t/testresources/${name}.tar.gz";
       sha256 = "0cbj3plbllyz42c4b5xxgwaa7mml54lakslrn4kkhinxhdri22md";
     };
 
@@ -21614,7 +21614,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/testtools/${name}.tar.gz";
+      url = "mirror://pypi/t/testtools/${name}.tar.gz";
       sha256 = "15yxz8d70iy1b1x6gd7spvblq0mjxjardl4vnaqasxafzc069zca";
     };
 
@@ -21634,7 +21634,7 @@ in modules // {
     name = "traitlets-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/traitlets/${name}.tar.gz";
+      url = "mirror://pypi/t/traitlets/${name}.tar.gz";
       sha256 = "440e38dfa5d2a26c086d4b427cfb7aed17d0a2dca78bce90c33354da2592af5b";
     };
 
@@ -21658,7 +21658,7 @@ in modules // {
     version = "0.1.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-mimeparse/${name}.tar.gz";
+      url = "mirror://pypi/p/python-mimeparse/${name}.tar.gz";
       sha256 = "1hyxg09kaj02ri0rmwjqi86wk4nd1akvv7n0dx77azz76wga4s9w";
     };
 
@@ -21678,7 +21678,7 @@ in modules // {
     version = "0.0.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/e/extras/extras-${version}.tar.gz";
+      url = "mirror://pypi/e/extras/extras-${version}.tar.gz";
       sha256 = "1h7zx4dfyclalg0fqnfjijpn0f793a9mx8sy3b27gd31nr6dhq3s";
     };
 
@@ -21696,7 +21696,7 @@ in modules // {
     name = "texttable-0.8.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/texttable/${name}.tar.gz";
+      url = "mirror://pypi/t/texttable/${name}.tar.gz";
       sha256 = "0bkhs4dx9s6g7fpb969hygq56hyz4ncfamlynw72s0n6nqfbd1w5";
     };
 
@@ -21712,7 +21712,7 @@ in modules // {
     version = "0.4.8";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/tlslite/${name}.tar.gz";
+      url = "mirror://pypi/t/tlslite/${name}.tar.gz";
       sha256 = "1fxx6d3nw5r1hqna1h2jvqhcygn9fyshlm0gh3gp0b1ji824gd6r";
     };
 
@@ -21728,7 +21728,7 @@ in modules // {
     version = "5.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/q/qrcode/${name}.tar.gz";
+      url = "mirror://pypi/q/qrcode/${name}.tar.gz";
       sha256 = "0skzrvhjnnacrz52jml4i050vdx5lfcd3np172srxjaghdgfxg9k";
     };
 
@@ -21750,7 +21750,7 @@ in modules // {
     version = "0.6.17";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/tmdb3/${name}.zip";
+      url = "mirror://pypi/t/tmdb3/${name}.zip";
       sha256 = "64a6c3f1a60a9d8bf18f96a5403f3735b334040345ac3646064931c209720972";
     };
 
@@ -21766,7 +21766,7 @@ in modules // {
     version = "0.7.4";
 
     src = pkgs.fetchurl{
-      url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
+      url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz";
       sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
     };
 
@@ -21793,7 +21793,7 @@ in modules // {
     doCheck = false;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/tox/${name}.tar.gz";
+      url = "mirror://pypi/t/tox/${name}.tar.gz";
       sha256 = "1vj73ar4rimq3fwy5r2z3jv4g9qbh8rmpmncsc00g0k310acqzxz";
     };
   };
@@ -21803,7 +21803,7 @@ in modules // {
     version = "3.7.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/tqdm/${name}.tar.gz";
+      url = "mirror://pypi/t/tqdm/${name}.tar.gz";
       sha256 = "f12d792685f779e8754e623aff1a25a93b98a90457e3a2b7eb89b4401c2c239e";
     };
 
@@ -21829,7 +21829,7 @@ in modules // {
     buildInputs = with self; [ nosexcover ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/smmap/${name}.tar.gz";
+      url = "mirror://pypi/s/smmap/${name}.tar.gz";
       sha256 = "0qlx25f6n2n9ff37w9gg62f217fzj16xlbh0pkz0lpxxjys64aqf";
     };
   };
@@ -21862,7 +21862,7 @@ in modules // {
     version = "4.5.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/t/traits/${name}.tar.gz";
+      url = "mirror://pypi/t/traits/${name}.tar.gz";
       sha256 = "5293a8786030b0b243e059f52004355b6939d7c0f1be2eb5a605b63cca484c84";
     };
 
@@ -21893,7 +21893,7 @@ in modules // {
     version = "1.4.3";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/t/transaction/${name}.tar.gz";
+      url = "mirror://pypi/t/transaction/${name}.tar.gz";
       sha256 = "1b2304a886a85ad014f73d93346c14350fc214ae22a4f565f42f6761cfb9ecc5";
     };
 
@@ -21911,7 +21911,7 @@ in modules // {
     version = "0.11";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/transmissionrpc/${name}.tar.gz";
+      url = "mirror://pypi/t/transmissionrpc/${name}.tar.gz";
       sha256 = "ec43b460f9fde2faedbfa6d663ef495b3fd69df855a135eebe8f8a741c0dde60";
     };
 
@@ -21929,7 +21929,7 @@ in modules // {
      version = "0.4";
 
      src = pkgs.fetchurl {
-       url = "http://pypi.python.org/packages/source/t/tl.eggdeps/tl.${name}.tar.gz";
+       url = "mirror://pypi/t/tl.eggdeps/tl.${name}.tar.gz";
        sha256 = "a99de5e4652865224daab09b2e2574a4f7c1d0d9a267048f9836aa914a2caf3a";
      };
 
@@ -21950,7 +21950,7 @@ in modules // {
     disabled = isPyPy || isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz";
+      url = "mirror://pypi/t/turses/${name}.tar.gz";
       sha256 = "15mkhm3b5ka42h8qph0mhh8izfc1200v7651c62k7ldcs50ib9j6";
     };
 
@@ -21984,7 +21984,7 @@ in modules // {
     name = "tweepy-3.5.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/t/tweepy/${name}.tar.gz";
+      url = "mirror://pypi/t/tweepy/${name}.tar.gz";
       sha256 = "0n2shilamgwhzmvf534xg7f6hrnznbixyl5pw2f5a3f391gwy37h";
     };
 
@@ -22004,7 +22004,7 @@ in modules // {
     version = "0.4.5";
 
     src = pkgs.fetchurl {
-      url    = "https://pypi.python.org/packages/source/T/Twiggy/Twiggy-0.4.5.tar.gz";
+      url    = "mirror://pypi/T/Twiggy/Twiggy-0.4.5.tar.gz";
       sha256 = "4e8f1894e5aee522db6cb245ccbfde3c5d1aa08d31330c7e3af783b0e66eec23";
     };
 
@@ -22025,7 +22025,7 @@ in modules // {
     version = "1.15.0";
 
     src = pkgs.fetchurl {
-      url    = "https://pypi.python.org/packages/source/t/twitter/${name}.tar.gz";
+      url    = "mirror://pypi/t/twitter/${name}.tar.gz";
       sha256 = "1m6b17irb9klc345k8174pni724jzy2973z2x2jg69h83hipjw2c";
     };
 
@@ -22045,7 +22045,7 @@ in modules // {
 
     name = "Twisted-13.2.0";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/T/Twisted/${name}.tar.bz2";
+      url = "mirror://pypi/T/Twisted/${name}.tar.bz2";
       sha256 = "1wrcqv5lvgwk2aq83qb2s2ng2vx14hbjjk2gc30cg6h1iiipal89";
     };
 
@@ -22074,7 +22074,7 @@ in modules // {
 
     name = "Twisted-15.5.0";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/T/Twisted/${name}.tar.bz2";
+      url = "mirror://pypi/T/Twisted/${name}.tar.bz2";
       sha256 = "0zy18lcrris4aaslil5k12i13k56c32hzfdv6h10kbnzl026h158";
     };
 
@@ -22104,7 +22104,7 @@ in modules // {
     propagatedBuildInputs = with self; [ pytz ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/tzlocal/${name}.tar.gz";
+      url = "mirror://pypi/t/tzlocal/${name}.tar.gz";
       sha256 = "0paj7vlsb0np8b5sp4bv64wxv7qk2piyp7xg29pkhdjwsbls9fnb";
     };
 
@@ -22123,7 +22123,7 @@ in modules // {
     version = "0.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/u/umalqurra/umalqurra-0.2.tar.gz";
+      url = "mirror://pypi/u/umalqurra/umalqurra-0.2.tar.gz";
       sha256 = "719f6a36f908ada1c29dae0d934dd0f1e1f6e3305784edbec23ad719397de678";
     };
 
@@ -22146,7 +22146,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/u/umemcache/${name}.zip";
+      url = "mirror://pypi/u/umemcache/${name}.zip";
       sha256 = "211031a03576b7796bf277dbc9c9e3e754ba066bbb7fb601ab5c6291b8ec1918";
     };
 
@@ -22162,7 +22162,7 @@ in modules // {
     name = "unicodecsv-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/u/unicodecsv/${name}.tar.gz";
+      url = "mirror://pypi/u/unicodecsv/${name}.tar.gz";
       sha256 = "1z7pdwkr6lpsa7xbyvaly7pq3akflbnz8gq62829lr28gl1hi301";
     };
 
@@ -22181,7 +22181,7 @@ in modules // {
     name = "unittest2-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/u/unittest2/unittest2-${version}.tar.gz";
+      url = "mirror://pypi/u/unittest2/unittest2-${version}.tar.gz";
       sha256 = "0y855kmx7a8rnf81d3lh5lyxai1908xjp0laf4glwa4c8472m212";
     };
 
@@ -22208,7 +22208,7 @@ in modules // {
     version = "0.3.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/u/uritemplate.py/${name}.tar.gz";
+      url = "mirror://pypi/u/uritemplate.py/${name}.tar.gz";
       sha256 = "0xvvdiwnag2pdi96hjf7v8asdia98flk2rxcjqnwcs3rk99alygx";
     };
 
@@ -22225,7 +22225,7 @@ in modules // {
     name = "traceback2-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/t/traceback2/traceback2-${version}.tar.gz";
+      url = "mirror://pypi/t/traceback2/traceback2-${version}.tar.gz";
       sha256 = "0c1h3jas1jp1fdbn9z2mrgn3jj0hw1x3yhnkxp7jw34q15xcdb05";
     };
 
@@ -22244,7 +22244,7 @@ in modules // {
     version = "1.0.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/l/linecache2/${name}.tar.gz";
+      url = "mirror://pypi/l/linecache2/${name}.tar.gz";
       sha256 = "0z79g3ds5wk2lvnqw0y2jpakjf32h95bd9zmnvp7dnqhf57gy9jb";
     };
 
@@ -22285,7 +22285,7 @@ in modules // {
     name = "update_checker-0.11";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/u/update_checker/${name}.tar.gz";
+      url = "mirror://pypi/u/update_checker/${name}.tar.gz";
       sha256 = "681bc7c26cffd1564eb6f0f3170d975a31c2a9f2224a32f80fe954232b86f173";
     };
 
@@ -22330,7 +22330,7 @@ in modules // {
     doCheck = false;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/u/urwid/${name}.tar.gz";
+      url = "mirror://pypi/u/urwid/${name}.tar.gz";
       sha256 = "29f04fad3bf0a79c5491f7ebec2d50fa086e9d16359896c9204c6a92bc07aba2";
     };
 
@@ -22390,7 +22390,7 @@ in modules // {
     propagatedBuildInputs = with self; [ easy-process ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/P/PyVirtualDisplay/${name}.tar.gz";
+      url = "mirror://pypi/P/PyVirtualDisplay/${name}.tar.gz";
       sha256 = "aa6aef08995e14c20cc670d933bfa6e70d736d0b555af309b2e989e2faa9ee53";
     };
 
@@ -22406,7 +22406,7 @@ in modules // {
     name = "virtualenv-13.1.2";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/v/virtualenv/${name}.tar.gz";
+      url = "mirror://pypi/v/virtualenv/${name}.tar.gz";
       sha256 = "1p732accxwqfjbdna39k8w8lp9gyw91vr4kzkhm8mgfxikqqxg5a";
     };
 
@@ -22431,7 +22431,7 @@ in modules // {
     name = "virtualenv-clone-0.2.5";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/v/virtualenv-clone/${name}.tar.gz";
+      url = "mirror://pypi/v/virtualenv-clone/${name}.tar.gz";
       sha256 = "7087ba4eb48acfd5209a3fd03e15d072f28742619127c98333057e32748d91c4";
     };
 
@@ -22452,7 +22452,7 @@ in modules // {
     name = "virtualenvwrapper-4.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/v/virtualenvwrapper/${name}.tar.gz";
+      url = "mirror://pypi/v/virtualenvwrapper/${name}.tar.gz";
       sha256 = "514cbc22218347bf7b54bdbe49e1a5f550d2d53b1ad2491c10e91ddf48fb528f";
     };
 
@@ -22542,7 +22542,7 @@ in modules // {
     name = "waitress-0.8.9";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/w/waitress/${name}.tar.gz";
+      url = "mirror://pypi/w/waitress/${name}.tar.gz";
       sha256 = "826527dc9d334ed4ed76cdae672fdcbbccf614186657db71679ab58df869458a";
     };
 
@@ -22559,7 +22559,7 @@ in modules // {
     version = "0.11.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/w/webassets/${name}.tar.gz";
+      url = "mirror://pypi/w/webassets/${name}.tar.gz";
       sha256 = "0p1qypcbq9b88ipcylxh3bbnby5n6dr421wb4bwmrlcrgvj4r5lz";
     };
 
@@ -22578,7 +22578,7 @@ in modules // {
     name = "webcolors-1.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/w/webcolors/${name}.tar.gz";
+      url = "mirror://pypi/w/webcolors/${name}.tar.gz";
       sha256 = "304fc95dab2848c7bf64f378356766e692c2f8b4a8b15fa3509544e6412936e8";
     };
 
@@ -22598,7 +22598,7 @@ in modules // {
     name = "Wand-0.3.5";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/W/Wand/${name}.tar.gz";
+      url = "mirror://pypi/W/Wand/${name}.tar.gz";
       sha256 = "31e2186ce8d1da0d2ea84d1428fc4d441c2e9d0e25156cc746b35b781026bcff";
     };
 
@@ -22617,7 +22617,7 @@ in modules // {
     version = "0.1.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/w/wcwidth/${name}.tar.gz";
+      url = "mirror://pypi/w/wcwidth/${name}.tar.gz";
       sha256 = "0awx28xi938nv55qlmai3b5ddqd1w5c294gy95xh4xsx0hik2vch";
     };
 
@@ -22644,7 +22644,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/w/web.py/web.py-${version}.tar.gz";
+      url = "mirror://pypi/w/web.py/web.py-${version}.tar.gz";
       sha256 = "748c7e99ad9e36f62ea19f7965eb7dd7860b530e8f563ed60ce3e53e7409a550";
     };
 
@@ -22665,7 +22665,7 @@ in modules // {
     name = "webob-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/W/WebOb/WebOb-${version}.tar.gz";
+      url = "mirror://pypi/W/WebOb/WebOb-${version}.tar.gz";
       sha256 = "1nz9m6ijf46wfn33zfza13c0k1n4kjnmn3icdlrlgz5yj21vky0j";
     };
 
@@ -22684,7 +22684,7 @@ in modules // {
     name = "websockify-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/w/websockify/websockify-${version}.tar.gz";
+      url = "mirror://pypi/w/websockify/websockify-${version}.tar.gz";
       sha256 = "1v6pmamjprv2x55fvbdaml26ppxdw8v6xz8p0sav3368ajwwgcqc";
     };
 
@@ -22702,7 +22702,7 @@ in modules // {
     name = "webtest-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/W/WebTest/WebTest-${version}.tar.gz";
+      url = "mirror://pypi/W/WebTest/WebTest-${version}.tar.gz";
       sha256 = "0bv0qhdjakdsdgj4sk21gnpp8xp8bga4x03p6gjb83ihrsb7n4xv";
     };
 
@@ -22740,7 +22740,7 @@ in modules // {
     name = "Werkzeug-0.10.4";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/W/Werkzeug/${name}.tar.gz";
+      url = "mirror://pypi/W/Werkzeug/${name}.tar.gz";
       sha256 = "9d2771e4c89be127bc4bac056ab7ceaf0e0064c723d6b6e195739c3af4fd5c1d";
     };
 
@@ -22760,7 +22760,7 @@ in modules // {
     version = "0.29.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/w/wheel/${name}.tar.gz";
+      url = "mirror://pypi/w/wheel/${name}.tar.gz";
       sha256 = "1ebb8ad7e26b448e9caa4773d2357849bf80ff9e313964bcaf79cbf0201a1648";
     };
 
@@ -22779,7 +22779,7 @@ in modules // {
     name = "willie-5.2.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/w/willie/willie-5.2.0.tar.gz";
+      url = "mirror://pypi/w/willie/willie-5.2.0.tar.gz";
       sha256 = "2da2e91b65c471b4c8e5e5e11471b25887635258d24aaf76b5354147b3ab577d";
     };
 
@@ -22814,7 +22814,7 @@ in modules // {
     name = "WSGIProxy2-0.4.2";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/W/WSGIProxy2/${name}.zip";
+      url = "mirror://pypi/W/WSGIProxy2/${name}.zip";
       sha256 = "13kf9bdxrc95y9vriaz0viry3ah11nz4rlrykcfvb8nlqpx3dcm4";
     };
 
@@ -22897,7 +22897,7 @@ in modules // {
     name = "xmltodict-0.9.2";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/x/xmltodict/${name}.tar.gz";
+      url = "mirror://pypi/x/xmltodict/${name}.tar.gz";
       sha256 = "00crqnjh1kbvcgfnn3b8c7vq30lf4ykkxp1xf3pf7mswr5l1wp97";
     };
 
@@ -22915,7 +22915,7 @@ in modules // {
     version = "0.7.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/x/xarray/${name}.tar.gz";
+      url = "mirror://pypi/x/xarray/${name}.tar.gz";
       sha256 = "1swcpq8x0p5pp94r9j4hr2anz1rqh7fnqax16xn9xsgrikdjipj5";
     };
 
@@ -22939,7 +22939,7 @@ in modules // {
     version = "1.0.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/x/xlwt/${name}.tar.gz";
+      url = "mirror://pypi/x/xlwt/${name}.tar.gz";
       sha256 = "1y8w5imsicp01gn749qhw6j0grh9y19zz57ribwaknn8xqwjjhxc";
     };
 
@@ -22972,7 +22972,7 @@ in modules // {
     name = "zbase32-1.1.2";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zbase32/${name}.tar.gz";
+      url = "mirror://pypi/z/zbase32/${name}.tar.gz";
       sha256 = "2f44b338f750bd37b56e7887591bf2f1965bfa79f163b6afcbccf28da642ec56";
     };
 
@@ -22993,7 +22993,7 @@ in modules // {
     version = "3.0.3";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/ZConfig/ZConfig-${version}.tar.gz";
+      url = "mirror://pypi/Z/ZConfig/ZConfig-${version}.tar.gz";
       sha256 = "6577da957511d8c2f805fefd2e31cacc4117bb5c54aec03ad8ce374020c021f3";
     };
 
@@ -23013,7 +23013,7 @@ in modules // {
     version = "1.0.2";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zc.lockfile/${name}.tar.gz";
+      url = "mirror://pypi/z/zc.lockfile/${name}.tar.gz";
       sha256 = "96bb2aa0438f3e29a31e4702316f832ec1482837daef729a92e28c202d8fba5c";
     };
 
@@ -23031,7 +23031,7 @@ in modules // {
     version = "4.0.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zdaemon/${name}.tar.gz";
+      url = "mirror://pypi/z/zdaemon/${name}.tar.gz";
       sha256 = "82d7eaa4d831ff1ecdcffcb274f3457e095c0cc86e630bc72009a863c341ab9f";
     };
 
@@ -23054,7 +23054,7 @@ in modules // {
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zfec/${name}.tar.gz";
+      url = "mirror://pypi/z/zfec/${name}.tar.gz";
       sha256 = "1ks94zlpy7n8sb8380gf90gx85qy0p9073wi1wngg6mccxp9xsg3";
     };
 
@@ -23085,7 +23085,7 @@ in modules // {
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/ZODB3/ZODB3-${version}.tar.gz";
+      url = "mirror://pypi/Z/ZODB3/ZODB3-${version}.tar.gz";
       sha256 = "b5767028e732c619f45c27189dd001e14ec155d7984807991fce751b35b4fcb0";
     };
 
@@ -23106,7 +23106,7 @@ in modules // {
     version = "4.0.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/Z/ZODB/ZODB-${version}.tar.gz";
+      url = "mirror://pypi/Z/ZODB/ZODB-${version}.tar.gz";
       sha256 = "c5d8ffcca37ab4d0a9bfffead6228d58c00cf1c78135abc98a8dbf05b8c8fb58";
     };
 
@@ -23131,7 +23131,7 @@ in modules // {
     disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/z/zodbpickle/${name}.tar.gz";
+      url = "mirror://pypi/z/zodbpickle/${name}.tar.gz";
       sha256 = "f65c00fbc13523fced63de6cc11747aa1a6343aeb2895c89838ed55a5ab12cca";
     };
 
@@ -23150,7 +23150,7 @@ in modules // {
     propagatedBuildInputs = with self; [ persistent zope_interface transaction ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/B/BTrees/${name}.tar.gz";
+      url = "mirror://pypi/B/BTrees/${name}.tar.gz";
       sha256 = "1avvhkd7rvp3rzhw20v6ank8a8m9a1lmh99c4gjjsa1ry0zsri3y";
     };
 
@@ -23169,7 +23169,7 @@ in modules // {
     propagatedBuildInputs = with self; [ zope_interface ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/persistent/${name}.tar.gz";
+      url = "mirror://pypi/p/persistent/${name}.tar.gz";
       sha256 = "678902217c5370d33694c6dc95b89e1e6284b4dc41f04c056326194a3f6f3e22";
     };
 
@@ -23183,7 +23183,7 @@ in modules // {
     name = "xdot-0.6";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/x/xdot/xdot-0.6.tar.gz";
+      url = "mirror://pypi/x/xdot/xdot-0.6.tar.gz";
       sha256 = "c71d82bad0fec696af36af788c2a1dbb5d9975bd70bfbdc14bda15b5c7319e6c";
     };
 
@@ -23200,7 +23200,7 @@ in modules // {
     name = "zope.broken-3.6.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.broken/${name}.zip";
+      url = "mirror://pypi/z/zope.broken/${name}.zip";
       sha256 = "b9b8776002da4f7b6b12dfcce77eb642ae62b39586dbf60e1d9bdc992c9f2999";
     };
 
@@ -23216,7 +23216,7 @@ in modules // {
     name = "zope.browser-2.0.2";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.browser/${name}.zip";
+      url = "mirror://pypi/z/zope.browser/${name}.zip";
       sha256 = "0f9r5rn9lzgi4hvkhgb6vgw8kpz9sv16jsfb9ws4am8gbqcgv2iy";
     };
 
@@ -23239,7 +23239,7 @@ in modules // {
     doCheck = false;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-4.0.1.zip";
+      url = "mirror://pypi/z/zope.browserresource/zope.browserresource-4.0.1.zip";
       sha256 = "d580184562e7098950ae377b5b37fbb88becdaa2256ac2a6760b69a3e86a99b2";
     };
   };
@@ -23250,7 +23250,7 @@ in modules // {
     name = "zope.component-4.2.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.component/zope.component-4.2.1.tar.gz";
+      url = "mirror://pypi/z/zope.component/zope.component-4.2.1.tar.gz";
       sha256 = "1gzbr0j6c2h0cqnpi2cjss38wrz1bcwx8xahl3vykgz5laid15l6";
     };
 
@@ -23272,7 +23272,7 @@ in modules // {
     name = "zope.configuration-4.0.3";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-4.0.3.tar.gz";
+      url = "mirror://pypi/z/zope.configuration/zope.configuration-4.0.3.tar.gz";
       sha256 = "1x9dfqypgympnlm25p9m43xh4qv3p7d75vksv9pzqibrb4cggw5n";
     };
 
@@ -23288,7 +23288,7 @@ in modules // {
     name = "zope.container-4.0.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.container/${name}.tar.gz";
+      url = "mirror://pypi/z/zope.container/${name}.tar.gz";
       sha256 = "5c04e61b52fd04d8b7103476532f557c2278c86281aae30d44f88a5fbe888940";
     };
 
@@ -23311,7 +23311,7 @@ in modules // {
     name = "zope.contenttype-4.0.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.contenttype/${name}.tar.gz";
+      url = "mirror://pypi/z/zope.contenttype/${name}.tar.gz";
       sha256 = "9decc7531ad6925057f1a667ac0ef9d658577a92b0b48dafa7daa97b78a02bbb";
     };
 
@@ -23325,7 +23325,7 @@ in modules // {
     name = "zope.dottedname-3.4.6";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.dottedname/${name}.tar.gz";
+      url = "mirror://pypi/z/zope.dottedname/${name}.tar.gz";
       sha256 = "331d801d98e539fa6c5d50c3835ecc144c429667f483281505de53fc771e6bf5";
     };
     meta = {
@@ -23339,7 +23339,7 @@ in modules // {
     version = "4.0.3";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.event/${name}.tar.gz";
+      url = "mirror://pypi/z/zope.event/${name}.tar.gz";
       sha256 = "1w858k9kmgzfj36h65kp27m9slrmykvi5cjq6c119xqnaz5gdzgm";
     };
 
@@ -23357,7 +23357,7 @@ in modules // {
      version = "4.0.8";
 
      src = pkgs.fetchurl {
-       url = "http://pypi.python.org/packages/source/z/zope.exceptions/${name}.tar.gz";
+       url = "mirror://pypi/z/zope.exceptions/${name}.tar.gz";
        sha256 = "0zwxaaa66sqxg5k7zcrvs0fbg9ym1njnxnr28dfmchzhwjvwnfzl";
      };
 
@@ -23379,7 +23379,7 @@ in modules // {
     name = "zope.filerepresentation-3.6.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.filerepresentation/${name}.tar.gz";
+      url = "mirror://pypi/z/zope.filerepresentation/${name}.tar.gz";
       sha256 = "d775ebba4aff7687e0381f050ebda4e48ce50900c1438f3f7e901220634ed3e0";
     };
 
@@ -23395,7 +23395,7 @@ in modules // {
     name = "zope.i18n-3.8.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.i18n/${name}.tar.gz";
+      url = "mirror://pypi/z/zope.i18n/${name}.tar.gz";
       sha256 = "045nnimmshibcq71yym2d8yrs6wzzhxq5gl7wxjnkpyjm5y0hfkm";
     };
 
@@ -23411,7 +23411,7 @@ in modules // {
     name = "zope.i18nmessageid-4.0.3";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-4.0.3.tar.gz";
+      url = "mirror://pypi/z/zope.i18nmessageid/zope.i18nmessageid-4.0.3.tar.gz";
       sha256 = "1rslyph0klk58dmjjy4j0jxy21k03azksixc3x2xhqbkv97cmzml";
     };
 
@@ -23425,7 +23425,7 @@ in modules // {
     name = "zope.lifecycleevent-3.7.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.lifecycleevent/${name}.tar.gz";
+      url = "mirror://pypi/z/zope.lifecycleevent/${name}.tar.gz";
       sha256 = "0s5brphqzzz89cykg61gy7zcmz0ryq1jj2va7gh2n1b3cccllp95";
     };
 
@@ -23441,7 +23441,7 @@ in modules // {
     name = "zope.location-4.0.3";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.3.tar.gz";
+      url = "mirror://pypi/z/zope.location/zope.location-4.0.3.tar.gz";
       sha256 = "1nj9da4ksiyv3h8n2vpzwd0pb03mdsh7zy87hfpx72b6p2zcwg74";
     };
 
@@ -23464,7 +23464,7 @@ in modules // {
     name = "zope.proxy-4.1.6";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.proxy/${name}.tar.gz";
+      url = "mirror://pypi/z/zope.proxy/${name}.tar.gz";
       sha256 = "0pqwwmvm1prhwv1ziv9lp8iirz7xkwb6n2kyj36p2h0ppyyhjnm4";
     };
 
@@ -23483,7 +23483,7 @@ in modules // {
     name = "zope.publisher-3.12.6";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.publisher/${name}.tar.gz";
+      url = "mirror://pypi/z/zope.publisher/${name}.tar.gz";
       sha256 = "d994d8eddfba504841492115032a9a7d86b1713ebc96d0ca16fbc6ee93168ba4";
     };
 
@@ -23501,7 +23501,7 @@ in modules // {
     name = "zope.schema-4.4.2";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.schema/${name}.tar.gz";
+      url = "mirror://pypi/z/zope.schema/${name}.tar.gz";
       sha256 = "1p943jdxb587dh7php4vx04qvn7b2877hr4qs5zyckvp5afhhank";
     };
 
@@ -23517,7 +23517,7 @@ in modules // {
     name = "zope.security-4.0.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.security/${name}.tar.gz";
+      url = "mirror://pypi/z/zope.security/${name}.tar.gz";
       sha256 = "8da30b03d5491464d59397e03b88192f31f587325ee6c6eb1ca596a1e487e2ec";
     };
 
@@ -23536,7 +23536,7 @@ in modules // {
     name = "zope.size-3.5.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.size/${name}.tar.gz";
+      url = "mirror://pypi/z/zope.size/${name}.tar.gz";
       sha256 = "006xfkhvmypwd3ww9gbba4zly7n9w30bpp1h74d53la7l7fiqk2f";
     };
 
@@ -23554,7 +23554,7 @@ in modules // {
     doCheck = !isPyPy; # https://github.com/zopefoundation/zope.sqlalchemy/issues/12
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.sqlalchemy/${name}.zip";
+      url = "mirror://pypi/z/zope.sqlalchemy/${name}.zip";
       sha256 = "0vxhpdvzihsmg63aralmc7hx62lzrsnlxvskvlcr4mkwzwb22haj";
     };
 
@@ -23573,7 +23573,7 @@ in modules // {
     version = "4.5.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.tar.gz";
+      url = "mirror://pypi/z/zope.testing/${name}.tar.gz";
       sha256 = "1yvglxhzvhl45mndvn9gskx2ph30zz1bz7rrlyfs62fv2pvih90s";
     };
 
@@ -23595,7 +23595,7 @@ in modules // {
     version = "4.4.10";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.testrunner/${name}.zip";
+      url = "mirror://pypi/z/zope.testrunner/${name}.zip";
       sha256 = "1w09wbqiqmq6hvrammi4fzc7fr129v63gdnzlk4qi2b1xy5qpqab";
     };
 
@@ -23614,7 +23614,7 @@ in modules // {
     name = "zope.traversing-4.0.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.traversing/${name}.zip";
+      url = "mirror://pypi/z/zope.traversing/${name}.zip";
       sha256 = "79d38b92ec1d9a2467966ee954b792d83ac66f22e45e928113d4b5dc1f5e74eb";
     };
 
@@ -23633,7 +23633,7 @@ in modules // {
     name = "zope.interface-4.1.3";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/z/zope.interface/${name}.tar.gz";
+      url = "mirror://pypi/z/zope.interface/${name}.tar.gz";
       sha256 = "0ks8h73b2g4bkad821qbv0wzjppdrwys33i7ka45ik3wxjg1l8if";
     };
 
@@ -23650,7 +23650,7 @@ in modules // {
   hgsvn = buildPythonPackage rec {
     name = "hgsvn-0.3.11";
     src = pkgs.fetchurl rec {
-      url = "https://pypi.python.org/packages/source/h/hgsvn/${name}-hotfix.zip";
+      url = "mirror://pypi/h/hgsvn/${name}-hotfix.zip";
       sha256 = "0yvhwdh8xx8rvaqd3pnnyb99hfa0zjdciadlc933p27hp9rf880p";
     };
     disabled = isPy3k || isPyPy;
@@ -23715,7 +23715,7 @@ in modules // {
     propagatedBuildInputs = with self; [ backports_ssl_match_hostname_3_4_0_2 certifi ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/tornado/${name}.tar.gz";
+      url = "mirror://pypi/t/tornado/${name}.tar.gz";
       sha256 = "a16fcdc4f76b184cb82f4f9eaeeacef6113b524b26a2cb331222e4a7fa6f2969";
     };
   };
@@ -23727,7 +23727,7 @@ in modules // {
     propagatedBuildInputs = with self; [ backports_ssl_match_hostname_3_4_0_2 certifi ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/tornado/${name}.tar.gz";
+      url = "mirror://pypi/t/tornado/${name}.tar.gz";
       sha256 = "00crp5vnasxg7qyjv89qgssb69vd7qr13jfghdryrcbnn9l8c1df";
     };
   };
@@ -23804,7 +23804,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/tarman/tarman-${version}.zip";
+      url = "mirror://pypi/t/tarman/tarman-${version}.zip";
       sha256 = "0ri6gj883k042xaxa2d5ymmhbw2bfcxdzhh4bz7700ibxwxxj62h";
     };
 
@@ -23833,7 +23833,7 @@ in modules // {
     name = "libarchive-c-2.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/l/libarchive-c/${name}.tar.gz";
+      url = "mirror://pypi/l/libarchive-c/${name}.tar.gz";
       sha256 = "089lrz6xyrfnk55v35vis6jyqyyl77w093057djyspnd2744wi2n";
     };
 
@@ -23871,7 +23871,7 @@ in modules // {
   pyzmq = buildPythonPackage rec {
     name = "pyzmq-15.2.0";
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pyzmq/${name}.tar.gz";
+      url = "mirror://pypi/p/pyzmq/${name}.tar.gz";
       sha256 = "2dafa322670a94e20283aba2a44b92134d425bd326419b68ad4db8d0831a26ec";
     };
     buildInputs = with self; [ pkgs.zeromq3 pytest tornado ];
@@ -23908,7 +23908,7 @@ in modules // {
     version = "4.5.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/testfixtures/testfixtures-${version}.tar.gz";
+      url = "mirror://pypi/t/testfixtures/testfixtures-${version}.tar.gz";
       sha256 = "0my8zq9d27mc7j78pz9971cn5wz6zi4vxlqa50szr2vq9j2xxkll";
     };
 
@@ -23931,7 +23931,7 @@ in modules // {
   tissue = buildPythonPackage rec {
     name = "tissue-0.9.2";
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/t/tissue/${name}.tar.gz";
+      url = "mirror://pypi/t/tissue/${name}.tar.gz";
       sha256 = "7e34726c3ec8fae358a7faf62de172db15716f5582e5192a109e33348bd76c2e";
     };
 
@@ -23970,7 +23970,7 @@ in modules // {
     name = "translationstring-1.3";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/t/translationstring/${name}.tar.gz";
+      url = "mirror://pypi/t/translationstring/${name}.tar.gz";
       sha256 = "4ee44cfa58c52ade8910ea0ebc3d2d84bdcad9fa0422405b1801ec9b9a65b72d";
     };
 
@@ -24030,7 +24030,7 @@ in modules // {
     name = "websocket_client-0.32.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/w/websocket-client/${name}.tar.gz";
+      url = "mirror://pypi/w/websocket-client/${name}.tar.gz";
       sha256 = "cb3ab95617ed2098d24723e3ad04ed06c4fde661400b96daa1859af965bfe040";
     };
 
@@ -24048,7 +24048,7 @@ in modules // {
     name = "WebHelpers-1.3";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/W/WebHelpers/${name}.tar.gz";
+      url = "mirror://pypi/W/WebHelpers/${name}.tar.gz";
       sha256 = "ea86f284e929366b77424ba9a89341f43ae8dee3cbeb8702f73bcf86058aa583";
     };
 
@@ -24086,7 +24086,7 @@ in modules // {
     version = "0.9.12";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/w/whisper/${name}.tar.gz";
+      url = "mirror://pypi/w/whisper/${name}.tar.gz";
       sha256 = "0eca66449d6ceb29e2ab5457b01618e0fe525710dd130a286a18282d849ae5b2";
     };
 
@@ -24105,7 +24105,7 @@ in modules // {
     version = "0.9.15";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/carbon/${name}.tar.gz";
+      url = "mirror://pypi/c/carbon/${name}.tar.gz";
       sha256 = "f01db6d37726c6fc0a8aaa66a7bf14436b0dd0d62ef3c20ecb31605a4d365d2e";
     };
 
@@ -24125,7 +24125,7 @@ in modules // {
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/u/ujson/${name}.zip";
+      url = "mirror://pypi/u/ujson/${name}.zip";
       sha256 = "68cf825f227c82e1ac61e423cfcad923ff734c27b5bdd7174495d162c42c602b";
     };
 
@@ -24141,7 +24141,7 @@ in modules // {
     name = "Unidecode-0.04.18";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/U/Unidecode/${name}.tar.gz";
+      url = "mirror://pypi/U/Unidecode/${name}.tar.gz";
       sha256 = "12hhblqy1ajvidm38im4171x4arg83pfmziyn53nizp29p3m14gi";
     };
 
@@ -24162,7 +24162,7 @@ in modules // {
     name = "pyusb-1.0.0rc1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyusb/${name}.tar.gz";
+      url = "mirror://pypi/p/pyusb/${name}.tar.gz";
       sha256 = "07cjq11qhngzjd746k7688s6y2x7lpj669fxqfsiy985rg0jsn7j";
     };
 
@@ -24190,7 +24190,7 @@ in modules // {
     version = "1.1.8";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/B/BlinkStick/${name}.tar.gz";
+      url = "mirror://pypi/B/BlinkStick/${name}.tar.gz";
       sha256 = "3edf4b83a3fa1a7bd953b452b76542d54285ff6f1145b6e19f9b5438120fa408";
     };
 
@@ -24252,7 +24252,7 @@ in modules // {
     doCheck = (!isPy3k);
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/v/versiontools/${name}.tar.gz";
+      url = "mirror://pypi/v/versiontools/${name}.tar.gz";
       sha256 = "1xhl6kl7f4srgnw6zw4lr8j2z5vmrbaa83nzn2c9r2m1hwl36sd9";
     };
 
@@ -24263,7 +24263,7 @@ in modules // {
     version = "0.8.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/v/veryprettytable/${name}.tar.gz";
+      url = "mirror://pypi/v/veryprettytable/${name}.tar.gz";
       sha256 = "1k1rifz8x6qcicmx2is9vgxcj0qb2f5pvzrp7zhmvbmci3yack3f";
     };
 
@@ -24281,7 +24281,7 @@ in modules // {
     version = "0.9.12";
 
     src = pkgs.fetchurl rec {
-      url = "https://pypi.python.org/packages/source/g/graphite-web/${name}.tar.gz";
+      url = "mirror://pypi/g/graphite-web/${name}.tar.gz";
       sha256 = "472a4403fd5b5364939aee10e78f171b1489e5f6bfe6f150ed9cae8476410114";
     };
 
@@ -24352,7 +24352,7 @@ in modules // {
     name = "graphite_beacon-0.22.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/g/graphite_beacon/${name}.tar.gz";
+      url = "mirror://pypi/g/graphite_beacon/${name}.tar.gz";
       sha256 = "ebde1aba8030c8aeffaeea39f9d44a2be464b198583ad4a390a2bff5f4172543";
     };
 
@@ -24551,7 +24551,7 @@ in modules // {
     version = "0.11.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/L/Logbook/${name}.tar.gz";
+      url = "mirror://pypi/L/Logbook/${name}.tar.gz";
       sha256 = "0bchn00jj0y4dmrmqsm29ffcx37g79jcxjihadmgz2aj0z6dbsrc";
     };
 
@@ -24619,7 +24619,7 @@ in modules // {
     name = "rpdb-0.1.5";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/r/rpdb/${name}.tar.gz";
+      url = "mirror://pypi/r/rpdb/${name}.tar.gz";
       sha256 = "0rql1hq3lziwcql0h3dy05w074cn866p397ng9bv6qbz85ifw1bk";
     };
 
@@ -24635,7 +24635,7 @@ in modules // {
     name = "grequests-0.2.0";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/g/grequests/${name}.tar.gz";
+      url = "mirror://pypi/g/grequests/${name}.tar.gz";
       sha256 = "0lafzax5igbh8y4x0krizr573wjsxz7bhvwygiah6qwrzv83kv5c";
     };
 
@@ -24653,7 +24653,7 @@ in modules // {
     name = "Flask-Babel-0.9";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/F/Flask-Babel/${name}.tar.gz";
+      url = "mirror://pypi/F/Flask-Babel/${name}.tar.gz";
       sha256 = "0k7vk4k54y55ma0nx2k5s0phfqbriwslhy5shh3b0d046q7ibzaa";
     };
 
@@ -24671,7 +24671,7 @@ in modules // {
     name = "speaklater-1.3";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/speaklater/${name}.tar.gz";
+      url = "mirror://pypi/s/speaklater/${name}.tar.gz";
       sha256 = "1ab5dbfzzgz6cnz4xlwx79gz83id4bhiw67k1cgqrlzfs0va7zjr";
     };
 
@@ -24688,7 +24688,7 @@ in modules // {
     version = "0.10.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pushbullet.py/pushbullet.py-0.10.0.tar.gz";
+      url = "mirror://pypi/p/pushbullet.py/pushbullet.py-0.10.0.tar.gz";
       sha256 = "537d3132e1dbc91e31ade4cccf4c7def6f9d48e904a67f341d35b8a54a9be74d";
     };
 
@@ -24699,7 +24699,7 @@ in modules // {
     name = "power-1.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/power/${name}.tar.gz";
+      url = "mirror://pypi/p/power/${name}.tar.gz";
       sha256 = "7d7d60ec332acbe3a7d00379b45e39abf650bf7ee311d61da5ab921f52f060f0";
     };
 
@@ -24811,7 +24811,7 @@ in modules // {
     name = "toposort-${version}";
     version = "1.1";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/toposort/toposort-1.1.tar.gz";
+      url = "mirror://pypi/t/toposort/toposort-1.1.tar.gz";
       sha256 = "1izmirbwmd9xrk7rq83p486cvnsslfa5ljvl7rijj1r64zkcnf3a";
     };
     meta = {
@@ -24914,7 +24914,7 @@ in modules // {
     name = "funcy-1.6";
 
     src = pkgs.fetchurl {
-        url = "https://pypi.python.org/packages/source/f/funcy/${name}.tar.gz";
+        url = "mirror://pypi/f/funcy/${name}.tar.gz";
         sha256 = "511495db0c5660af18d3151b008c6ce698ae7fbf60887278e79675e35eed1f01";
     };
 
@@ -24933,7 +24933,7 @@ in modules // {
     name = "boto-2.30.0";
     disabled = ! isPy27;
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/b/boto/boto-2.30.0.tar.gz;
+      url = mirror://pypi/b/boto/boto-2.30.0.tar.gz;
       sha256 = "12gl8azmx1vv8dbv9jhnsbhjpc2dd1ng0jlbcg734k6ggwq1h6hh";
     };
     doCheck = false;
@@ -24948,7 +24948,7 @@ in modules // {
     name = "gcs-oauth2-boto-plugin-1.8";
     disabled = ! isPy27;
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8.tar.gz;
+      url = mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8.tar.gz;
       sha256 = "0jy62y5bmaf1mb735lqwry1s5nx2qqrxvl5sxip9yg4miih3qkyb";
     };
     propagatedBuildInputs = with self; [ boto-230 httplib2 google_api_python_client retry_decorator pkgs.pyopenssl socksipy-branch ];
@@ -24971,7 +24971,7 @@ in modules // {
     doCheck = false;
 
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/g/gsutil/gsutil-4.6.tar.gz;
+      url = mirror://pypi/g/gsutil/gsutil-4.6.tar.gz;
       sha256 = "1i0clm60162rbk45ljr8nsw4ndkzjnwb7r440shcqjrvw8jq49mn";
     };
 
@@ -25067,7 +25067,7 @@ in modules // {
     version = "0.2.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/W/WSGIProxy/WSGIProxy-${version}.tar.gz";
+      url = "mirror://pypi/W/WSGIProxy/WSGIProxy-${version}.tar.gz";
       sha256 = "0wqz1q8cvb81a37gb4kkxxpv4w7k8192a08qzyz67rn68ln2wcig";
     };
 
@@ -25087,7 +25087,7 @@ in modules // {
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/b/blist/blist-${version}.tar.gz";
+      url = "mirror://pypi/b/blist/blist-${version}.tar.gz";
       sha256 = "1hqz9pqbwx0czvq9bjdqjqh5bwfksva1is0anfazig81n18c84is";
     };
   };
@@ -25112,7 +25112,7 @@ in modules // {
     version = "2.4.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/daemonize/daemonize-${version}.tar.gz";
+      url = "mirror://pypi/d/daemonize/daemonize-${version}.tar.gz";
       sha256 = "0y139sq657bpzfv6k0aqm4071z4s40i6ybpni9qvngvdcz6r86n2";
     };
   };
@@ -25122,7 +25122,7 @@ in modules // {
     version = "0.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pydenticon/pydenticon-0.2.tar.gz";
+      url = "mirror://pypi/p/pydenticon/pydenticon-0.2.tar.gz";
       sha256 = "035dawcspgjw2rksbnn863s7b0i9ac8cc1nshshvd1l837ir1czp";
     };
     propagatedBuildInputs = with self; [
@@ -25148,7 +25148,7 @@ in modules // {
     version = "0.3.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/P/PyNaCl/PyNaCl-0.3.0.tar.gz";
+      url = "mirror://pypi/P/PyNaCl/PyNaCl-0.3.0.tar.gz";
       sha256 = "1hknxlp3a3f8njn19w92p8nhzl9jkfwzhv5fmxhmyq2m8hqrfj8j";
     };
 
@@ -25160,7 +25160,7 @@ in modules // {
     version = "14.0.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/service_identity/service_identity-${version}.tar.gz";
+      url = "mirror://pypi/s/service_identity/service_identity-${version}.tar.gz";
       sha256 = "0njg9bklkkp4rl2b9vsfh9aasxy3w2dmjkv9cq34jn65lwcs619i";
     };
 
@@ -25228,7 +25228,7 @@ in modules // {
     ] ++ optionals (!isPy3k) [ futures ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/thumbor/${name}.tar.gz";
+      url = "mirror://pypi/t/thumbor/${name}.tar.gz";
       sha256 = "57b0d7e261e792b2e2c53a79c3d8c722964003d1828331995dc3491dc67db7d8";
     };
 
@@ -25244,7 +25244,7 @@ in modules // {
     disabled = ! isPy27;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/thumbor-pexif/${name}.tar.gz";
+      url = "mirror://pypi/t/thumbor-pexif/${name}.tar.gz";
       sha256 = "715cd24760c7c28d6270c79c9e29b55b8d952a24e0e56833d827c2c62451bc3c";
     };
 
@@ -25262,7 +25262,7 @@ in modules // {
     disabled = ! isPy27;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/${baseName}/${name}.tar.gz";
+      url = "mirror://pypi/p/${baseName}/${name}.tar.gz";
       sha256 = "0lc1x0pai85avm1r452xnvxc12wijnhz87xv20yp3is9fs6rnkrh";
     };
 
@@ -25309,7 +25309,7 @@ in modules // {
     disabled = ! isPy27;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/datadiff/datadiff-1.1.6.zip";
+      url = "mirror://pypi/d/datadiff/datadiff-1.1.6.zip";
       sha256 = "f1402701063998f6a70609789aae8dc05703f3ad0a34882f6199653654c55543";
     };
 
@@ -25326,7 +25326,7 @@ in modules // {
     name = "termcolor-1.1.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/termcolor/termcolor-1.1.0.tar.gz";
+      url = "mirror://pypi/t/termcolor/termcolor-1.1.0.tar.gz";
       sha256 = "1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b";
     };
 
@@ -25342,7 +25342,7 @@ in modules // {
     disabled = ! isPy27;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/h/html2text/${name}.tar.gz";
+      url = "mirror://pypi/h/html2text/${name}.tar.gz";
       sha256 = "021pqcshxajhdy4whkawz95v98m8njv5lknzgac0sp8jzl01qls4";
     };
 
@@ -25393,7 +25393,7 @@ in modules // {
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/networkx/${name}.tar.gz";
+      url = "mirror://pypi/n/networkx/${name}.tar.gz";
       sha256 = "ced4095ab83b7451cec1172183eff419ed32e21397ea4e1971d92a5808ed6fb8";
     };
 
@@ -25409,7 +25409,7 @@ in modules // {
   ofxclient = buildPythonPackage rec {
     name = "ofxclient-1.3.8";
 	src = pkgs.fetchurl {
-	  url = "https://pypi.python.org/packages/source/o/ofxclient/${name}.tar.gz";
+	  url = "mirror://pypi/o/ofxclient/${name}.tar.gz";
 	  sha256 = "99ab03bffdb30d9ec98724898f428f8e73129483417d5892799a0f0d2249f233";
 	};
 
@@ -25422,7 +25422,7 @@ in modules // {
   ofxhome = buildPythonPackage rec {
 	name = "ofxhome-0.3.1";
 	src = pkgs.fetchurl {
-	  url = "https://pypi.python.org/packages/source/o/ofxhome/${name}.tar.gz";
+	  url = "mirror://pypi/o/ofxhome/${name}.tar.gz";
 	  sha256 = "0000db437fd1a8c7c65cea5d88ce9d3b54642a1f4844dde04f860e29330ac68d";
 	};
 
@@ -25441,7 +25441,7 @@ in modules // {
   ofxparse = buildPythonPackage rec {
 	name = "ofxparse-0.14";
 	src = pkgs.fetchurl {
-	  url = "https://pypi.python.org/packages/source/o/ofxparse/${name}.tar.gz";
+	  url = "mirror://pypi/o/ofxparse/${name}.tar.gz";
 	  sha256 = "d8c486126a94d912442d040121db44fbc4a646ea70fa935df33b5b4dbfbbe42a";
 	};
 
@@ -25457,7 +25457,7 @@ in modules // {
   ofxtools = buildPythonPackage rec {
     name = "ofxtools-0.3.8";
 	src = pkgs.fetchurl {
-	  url = "https://pypi.python.org/packages/source/o/ofxtools/${name}.tar.gz";
+	  url = "mirror://pypi/o/ofxtools/${name}.tar.gz";
 	  sha256 = "88f289a60f4312a1599c38a8fb3216e2b46d10cc34476f9a16a33ac8aac7ec35";
 	};
     meta = {
@@ -25508,7 +25508,7 @@ in modules // {
     name = "dicttoxml-1.6.4";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/dicttoxml/dicttoxml-1.6.4.tar.gz";
+      url = "mirror://pypi/d/dicttoxml/dicttoxml-1.6.4.tar.gz";
       sha256 = "5f29e95fec56680823dc41911c04c2af08727ee53c1b60e83c489212bab71161";
     };
 
@@ -25526,7 +25526,7 @@ in modules // {
     version = "2.3.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/m/markdown2/${name}.zip";
+      url = "mirror://pypi/m/markdown2/${name}.zip";
       sha256 = "073zyx3caqa9zlzxa82k9k2nhhn8c5imqpgp5nwqnh0fgaj9pqn8";
     };
     propagatedBuildInputs = with self; [];
@@ -25545,7 +25545,7 @@ in modules // {
     disabled = ! isPy27; #some dependencies do not work with py3
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/e/evernote/${name}.tar.gz";
+      url = "mirror://pypi/e/evernote/${name}.tar.gz";
       sha256 = "1lwlg6fpi3530245jzham1400a5b855bm4sbdyck229h9kg1v02d";
     };
 
@@ -25564,7 +25564,7 @@ in modules // {
     version = "1.1.9";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/setproctitle/setproctitle-${version}.tar.gz";
+      url = "mirror://pypi/s/setproctitle/setproctitle-${version}.tar.gz";
       sha256 = "1mqadassxcm0m9r1l02m5vr4bbandn48xz8gifvxmb4wiz8i8d0w";
     };
 
@@ -25581,7 +25581,7 @@ in modules // {
     version = "0.9.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/thrift/${name}.tar.gz";
+      url = "mirror://pypi/t/thrift/${name}.tar.gz";
       sha256 = "dfbc3d3bd19d396718dab05abaf46d93ae8005e2df798ef02e32793cd963877e";
     };
 
@@ -25637,7 +25637,7 @@ in modules // {
     disabled = isPy34;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/trollius/${name}.tar.gz";
+      url = "mirror://pypi/t/trollius/${name}.tar.gz";
       sha256 = "8884cae4ec6a2d593abcffd5e700626ad4618f42b11beb2b75998f2e8247de76";
     };
 
@@ -25695,7 +25695,7 @@ in modules // {
     name = "neovim-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/neovim/${name}.tar.gz";
+      url = "mirror://pypi/n/neovim/${name}.tar.gz";
       sha256 = "93f475d5583a053af919ba0729b32b3fefef1dbde4717b5657d806bdc69b76b3";
     };
 
@@ -25743,7 +25743,7 @@ in modules // {
     version = "0.4.1";
     name = "ghp-import-${version}";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/g/ghp-import/${name}.tar.gz";
+      url = "mirror://pypi/g/ghp-import/${name}.tar.gz";
       sha256 = "6058810e1c46dd3b5b1eee87e203bdfbd566e10cfc77566edda7aa4dbf6a3053";
     };
     disabled = isPyPy;
@@ -25762,7 +25762,7 @@ in modules // {
   typogrify = buildPythonPackage rec {
     name = "typogrify-2.0.7";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/typogrify/${name}.tar.gz";
+      url = "mirror://pypi/t/typogrify/${name}.tar.gz";
       sha256 = "8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed13cb38";
     };
     disabled = isPyPy;
@@ -25800,7 +25800,7 @@ in modules // {
     name = "pypeg2-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyPEG2/pyPEG2-${version}.tar.gz";
+      url = "mirror://pypi/p/pyPEG2/pyPEG2-${version}.tar.gz";
       sha256 = "f4814a5f9c84bbb0794bef8d2a5871f4aed25366791c55e2162681873ad8bd21";
     };
 
@@ -25816,7 +25816,7 @@ in modules // {
     disabled = ! (isPy26 || isPy27);
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/j/jenkins-job-builder/${name}.tar.gz";
+      url = "mirror://pypi/j/jenkins-job-builder/${name}.tar.gz";
       sha256 = "10zipq3dyyfhwvrcyk70zky07b0fssiahwig2h8daw977aszsfqb";
     };
 
@@ -25853,7 +25853,7 @@ in modules // {
     name = "dot2tex-2.9.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/dot2tex/dot2tex-2.9.0.tar.gz";
+      url = "mirror://pypi/d/dot2tex/dot2tex-2.9.0.tar.gz";
       sha256 = "7d3e54add7dccdaeb6cc9e61ceaf7b587914cf8ebd6821cfea008acdc1e50d4a";
     };
 
@@ -25907,7 +25907,7 @@ in modules // {
     name = "potr-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-potr/python-${name}.zip";
+      url = "mirror://pypi/p/python-potr/python-${name}.zip";
       sha256 = "1b3vjbv8hvynwj6amw3rg5zj8bagynbj0ipy09xwksf1mb0kz8m8";
     };
 
@@ -25926,7 +25926,7 @@ in modules // {
     version = "0.3.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pluggy/${name}.tar.gz";
+      url = "mirror://pypi/p/pluggy/${name}.tar.gz";
       sha256 = "18qfzfm40bgx672lkg8q9x5hdh76n7vax99aank7vh2nw21wg70m";
     };
 
@@ -25943,7 +25943,7 @@ in modules // {
     name = "xcffib-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/x/xcffib/${name}.tar.gz";
+      url = "mirror://pypi/x/xcffib/${name}.tar.gz";
       sha256 = "a84eecd5a1bb7570e26c83aca87a2016578ca4e353e1fa56189e95bdef063e6a";
     };
 
@@ -25967,7 +25967,7 @@ in modules // {
     version = "0.5.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pafy/${name}.tar.gz";
+      url = "mirror://pypi/p/pafy/${name}.tar.gz";
       sha256 = "1q699dcnq34nfgm0bg8mp5krhzk9cyirqdcadhs9al4fa5410igw";
     };
 
@@ -25986,7 +25986,7 @@ in modules // {
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/suds/suds-0.4.tar.gz";
+      url = "mirror://pypi/s/suds/suds-0.4.tar.gz";
       sha256 = "1w4s9051iv90c0gs73k80c3d51y2wbx1xgfdgg2hk7mv4gjlllnm";
     };
 
@@ -26005,7 +26005,7 @@ in modules // {
     disabled = isPyPy;  # lots of failures
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/suds-jurko/${name}.zip";
+      url = "mirror://pypi/s/suds-jurko/${name}.zip";
       sha256 = "1s4radwf38kdh3jrn5acbidqlr66sx786fkwi0rgq61hn4n2bdqw";
     };
 
@@ -26030,7 +26030,7 @@ in modules // {
     disabled = !isPy27;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/m/maildir-deduplicate/${name}.tar.gz";
+      url = "mirror://pypi/m/maildir-deduplicate/${name}.tar.gz";
       sha256 = "1xy5z756alrjgpl9qx2gdx898rw1mryrqkwmipbh39mgrvkl3fz9";
     };
 
@@ -26073,7 +26073,7 @@ in modules // {
 
     buildInputs = with self; [ nose ];
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/d/d2to1/d2to1-${version}.tar.gz";
+      url = "mirror://pypi/d/d2to1/d2to1-${version}.tar.gz";
       sha256 = "1a5z367b7dpd6dgi0w8pymb68aj2pblk8w04l2c8hibhj8dpl2b4";
     };
 
@@ -26093,7 +26093,7 @@ in modules // {
     propagatedBuildInputs = with self; [ requests2 ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/o/ovh/ovh-${version}.tar.gz";
+      url = "mirror://pypi/o/ovh/ovh-${version}.tar.gz";
       sha256 = "1y74lrdlgbb786mwas7ynphimfi00dgr67ncjq20kdf31jg5415n";
     };
 
@@ -26111,7 +26111,7 @@ in modules // {
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/W/Willow/Willow-${version}.tar.gz";
+      url = "mirror://pypi/W/Willow/Willow-${version}.tar.gz";
       sha256 = "111c82fbfcda2710ce6201b0b7e0cfa1ff3c4f2f0dc788cc8dfc8db933c39c73";
     };
 
@@ -26136,7 +26136,7 @@ in modules // {
     doCheck = false;  # missing json file from tarball
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/${simpleName}/${name}.tar.gz";
+      url = "mirror://pypi/i/${simpleName}/${name}.tar.gz";
       sha256 = "194bl8l8sc2ibwi6g5kz6xydkbngdqpaj6r2gcsaw1fc73iswwrj";
     };
 
@@ -26164,7 +26164,7 @@ in modules // {
       xstatic-pygments
     ];
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/b/bepasty/bepasty-${version}.tar.gz";
+      url = "mirror://pypi/b/bepasty/bepasty-${version}.tar.gz";
       sha256 = "0bs79pgrjlnkmjfyj2hllbx3rw757va5w2g2aghi9cydmsl7gyi4";
     };
 
@@ -26180,7 +26180,7 @@ in modules // {
     name = "xkcdpass-${version}";
     version = "1.4.2";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/x/xkcdpass/xkcdpass-1.4.2.tar.gz";
+      url = "mirror://pypi/x/xkcdpass/xkcdpass-1.4.2.tar.gz";
       sha256 = "4c1f8bee886820c42ccc64c15c3a2275dc6d01028cf6af7c481ded87267d8269";
     };
 
@@ -26200,7 +26200,7 @@ in modules // {
     name = "XStatic-${version}";
     version = "1.0.1";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/X/XStatic/XStatic-${version}.tar.gz";
+      url = "mirror://pypi/X/XStatic/XStatic-${version}.tar.gz";
       sha256 = "09npcsyf1ccygjs0qc8kdsv4qqy8gm1m6iv63g9y1fgbcry3vj8f";
     };
     meta = {
@@ -26215,7 +26215,7 @@ in modules // {
     name = "xlsx2csv-${version}";
     version = "0.7.2";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/x/xlsx2csv/${name}.tar.gz";
+      url = "mirror://pypi/x/xlsx2csv/${name}.tar.gz";
       sha256 = "7c6c8fa6c2774224d03a6a96049e116822484dccfa3634893397212ebcd23866";
     };
     meta = {
@@ -26251,7 +26251,7 @@ in modules // {
     name = "XStatic-Bootbox-${version}";
     version = "4.3.0.1";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/X/XStatic-Bootbox/XStatic-Bootbox-${version}.tar.gz";
+      url = "mirror://pypi/X/XStatic-Bootbox/XStatic-Bootbox-${version}.tar.gz";
       sha256 = "0wks1lsqngn3gvlhzrvaan1zj8w4wr58xi0pfqhrzckbghvvr0gj";
     };
 
@@ -26267,7 +26267,7 @@ in modules // {
     name = "XStatic-Bootstrap-${version}";
     version = "3.3.5.1";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/X/XStatic-Bootstrap/XStatic-Bootstrap-${version}.tar.gz";
+      url = "mirror://pypi/X/XStatic-Bootstrap/XStatic-Bootstrap-${version}.tar.gz";
       sha256 = "0jzjq3d4vp2shd2n20f9y53jnnk1cvphkj1v0awgrf18qsy2bmin";
     };
 
@@ -26283,7 +26283,7 @@ in modules // {
     name = "XStatic-jQuery-${version}";
     version = "1.10.2.1";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/X/XStatic-jQuery/XStatic-jQuery-${version}.tar.gz";
+      url = "mirror://pypi/X/XStatic-jQuery/XStatic-jQuery-${version}.tar.gz";
       sha256 = "018kx4zijflcq8081xx6kmiqf748bsjdq7adij2k91bfp1mnlhc3";
     };
 
@@ -26300,7 +26300,7 @@ in modules // {
     version = "9.7.0.1";
     propagatedBuildInputs = with self;[ xstatic-jquery ];
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/X/XStatic-jQuery-File-Upload/XStatic-jQuery-File-Upload-${version}.tar.gz";
+      url = "mirror://pypi/X/XStatic-jQuery-File-Upload/XStatic-jQuery-File-Upload-${version}.tar.gz";
       sha256 = "0d5za18lhzhb54baxq8z73wazq801n3qfj5vgcz7ri3ngx7nb0cg";
     };
 
@@ -26317,7 +26317,7 @@ in modules // {
     version = "1.11.0.1";
     propagatedBuildInputs = with self; [ xstatic-jquery ];
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/X/XStatic-jquery-ui/XStatic-jquery-ui-${version}.tar.gz";
+      url = "mirror://pypi/X/XStatic-jquery-ui/XStatic-jquery-ui-${version}.tar.gz";
       sha256 = "0n6sgg9jxrqfz4zg6iqdmx1isqx2aswadf7mk3fbi48dxcv1i6q9";
     };
 
@@ -26333,7 +26333,7 @@ in modules // {
     name = "XStatic-Pygments-${version}";
     version = "1.6.0.1";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/X/XStatic-Pygments/XStatic-Pygments-${version}.tar.gz";
+      url = "mirror://pypi/X/XStatic-Pygments/XStatic-Pygments-${version}.tar.gz";
       sha256 = "0fjqgg433wfdnswn7fad1g6k2x6mf24wfnay2j82j0fwgkdxrr7m";
     };
 
@@ -26350,7 +26350,7 @@ in modules // {
     name = "hidapi-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/h/hidapi/${name}.tar.gz";
+      url = "mirror://pypi/h/hidapi/${name}.tar.gz";
       sha256 = "1jaj0y5vn5yk033q01wacsz379mf3sy66d6gz072ycfr5rahcp59";
     };
 
@@ -26378,7 +26378,7 @@ in modules // {
     name = "mnemonic-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/m/mnemonic/${name}.tar.gz";
+      url = "mirror://pypi/m/mnemonic/${name}.tar.gz";
       sha256 = "0j5jm4v54135qqw455fw4ix2mhxhzjqvxji9gqkpxagk31cvbnj4";
     };
 
@@ -26397,7 +26397,7 @@ in modules // {
     name = "trezor-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/trezor/${name}.tar.gz";
+      url = "mirror://pypi/t/trezor/${name}.tar.gz";
       sha256 = "0nqbjj0mvkp314hpq36px12hxbyidmhsdflq3121l4g9y3scfbnx";
     };
 
@@ -26421,7 +26421,7 @@ in modules // {
     name = "keepkey-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/k/keepkey/${name}.tar.gz";
+      url = "mirror://pypi/k/keepkey/${name}.tar.gz";
       sha256 = "1ikyp4jpydskznsrlwmxh9sn7b64aldwj2lf0phmb19r5kk06qmp";
     };
 
@@ -26445,7 +26445,7 @@ in modules // {
     version = "2.2.1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/semver/${name}.tar.gz";
+      url = "mirror://pypi/s/semver/${name}.tar.gz";
       sha256 = "161gvsfpw0l8lnf1v19rvqc8b9f8n70cc8ppya4l0n6rwc1c1n4m";
     };
 
@@ -26462,7 +26462,7 @@ in modules // {
     version = "1.4";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/e/ed25519/${name}.tar.gz";
+      url = "mirror://pypi/e/ed25519/${name}.tar.gz";
       sha256 = "0ahx1nkxa0xis3cw0h5c4fpgv8mq4znkq7kajly33lc3317bk499";
     };
 
@@ -26479,7 +26479,7 @@ in modules // {
     name = "trezor_agent-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/t/trezor_agent/${name}.tar.gz";
+      url = "mirror://pypi/t/trezor_agent/${name}.tar.gz";
       sha256 = "0wpppxzld7kqqxdvy80qc8629n047vm3m3nk171i7hijfw285p0b";
     };
 
@@ -26498,7 +26498,7 @@ in modules // {
     name = "x11_hash-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/x/x11_hash/${name}.tar.gz";
+      url = "mirror://pypi/x/x11_hash/${name}.tar.gz";
       sha256 = "172skm9xbbrivy1p4xabxihx9lsnzi53hvzryfw64m799k2fmp22";
     };
 
@@ -26514,7 +26514,7 @@ in modules // {
     name = "python-termstyle-${version}";
     version = "0.1.10";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/python-termstyle/${name}.tar.gz";
+      url = "mirror://pypi/p/python-termstyle/${name}.tar.gz";
       sha256 = "1qllzkx1alf14zcfapppf8w87si4cpa7lgjmdp3f5idzdyqnnapl";
     };
 
@@ -26530,7 +26530,7 @@ in modules // {
     name = "green-${version}";
     version = "2.3.0";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/g/green/${name}.tar.gz";
+      url = "mirror://pypi/g/green/${name}.tar.gz";
       sha256 = "1888khfl9yxb8yfxq9b48dxwplqlxx8s0l530z5j7c6bx74v08b4";
     };
 
@@ -26575,7 +26575,7 @@ in modules // {
     buildInputs = with self ; [ six pytest ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/w/w3lib/${name}.tar.gz";
+      url = "mirror://pypi/w/w3lib/${name}.tar.gz";
       sha256 = "bd87eae62d208eef70869951abf05e96a8ee559714074a485168de4c5b190004";
     };
 
@@ -26592,7 +26592,7 @@ in modules // {
     version = "1.4.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/q/queuelib/${name}.tar.gz";
+      url = "mirror://pypi/q/queuelib/${name}.tar.gz";
       sha256 = "a6829918157ed433fafa87b0bb1e93e3e63c885270166db5884a02c34c86f914";
     };
 
@@ -26616,7 +26616,7 @@ in modules // {
     propagatedBuildInputs = with self ; [ six twisted w3lib lxml cssselect queuelib pyopenssl service-identity ];
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/S/Scrapy/${name}.tar.gz";
+      url = "mirror://pypi/S/Scrapy/${name}.tar.gz";
       sha256 = "0a51c785a310d65f6e70285a2da56d48ef7d049bd7fd60a08eef05c52328ca96";
     };
 
@@ -26680,7 +26680,7 @@ in modules // {
     version = "0.1a3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/repeated-test/${name}.tar.gz";
+      url = "mirror://pypi/r/repeated-test/${name}.tar.gz";
       sha256 = "062syp7kl2g0x6qx3z8zb5sdycpi7qcpxp9iml2v8dqzqnij9bpg";
     };
 
@@ -26703,7 +26703,7 @@ in modules // {
     version = "1.1a3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/sigtools/${name}.tar.gz";
+      url = "mirror://pypi/s/sigtools/${name}.tar.gz";
       sha256 = "190w14vzbiyvxcl9jmyyimpahar5b0bq69v9iv7chi852yi71w6w";
     };
 
@@ -26733,7 +26733,7 @@ in modules // {
     version = "3.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/clize/${name}.tar.gz";
+      url = "mirror://pypi/c/clize/${name}.tar.gz";
       sha256 = "1xkr3h404d7pgj5gdpg6bddv3v3yq2hgx8qlwkgw5abg218k53hm";
     };
 

From 07cad5411ef18fa2de2e500d1a78e12a2b3fda6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 26 Apr 2016 13:43:12 +0100
Subject: [PATCH 283/712] pythonPackages.msgpack: 0.4.6 -> 0.4.7

---
 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 20fe3795742..447481db7b3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12369,11 +12369,11 @@ in modules // {
 
   msgpack = buildPythonPackage rec {
     name = "msgpack-python-${version}";
-    version = "0.4.6";
+    version = "0.4.7";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/m/msgpack-python/${name}.tar.gz";
-      sha256 = "bfcc581c9dbbf07cc2f951baf30c3249a57e20dcbd60f7e6ffc43ab3cc614794";
+      sha256 = "0syd7bs83qs9qmxw540jbgsildbqk4yb57fmrlns1021llli402y";
     };
 
     propagatedBuildInputs = with self; [ ];

From 23a093ebe886b2dcf0935d60d36e5f3f24fe5495 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 26 Apr 2016 16:10:30 +0300
Subject: [PATCH 284/712] dbus service: fix path to the launch helper

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

diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index 2e29ef6a8f5..59c2e482e1a 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -121,7 +121,7 @@ in
 
     security.setuidOwners = singleton
       { program = "dbus-daemon-launch-helper";
-        source = "${pkgs.dbus_daemon.lib}/libexec/dbus-daemon-launch-helper";
+        source = "${pkgs.dbus_daemon.out}/libexec/dbus-daemon-launch-helper";
         owner = "root";
         group = "messagebus";
         setuid = true;

From 454eefa63b6f8fbd68139affd46d086e0d869ee3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Apr 2016 16:39:45 +0200
Subject: [PATCH 285/712] linux: 4.4.7 -> 4.4.8

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index c6dfb693523..6b997943d7c 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.7";
+  version = "4.4.8";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "00nkh0klk9b777fvhgf10wsrc7h8ycchgazwirk2926wmisjhl8q";
+    sha256 = "02gf7dkdibhxv8n4qfnyqh645d102g9z7pdid8pcq4jhd99sg9yj";
   };
 
   kernelPatches = args.kernelPatches;

From 5dbb42ce6c41f8245a799f4260d860315e806e2a Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Tue, 26 Apr 2016 18:08:16 +0300
Subject: [PATCH 286/712] qesteidutil: init at 3.12.2.1206

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

diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix
new file mode 100644
index 00000000000..e05dee4ef9a
--- /dev/null
+++ b/pkgs/tools/security/qesteidutil/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, cmake, ccid, qttools, qttranslations, pkgconfig, pcsclite
+, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+
+  version = "3.12.2.1206";
+  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";
+  };
+
+  unpackPhase = ''
+    mkdir src
+    tar xf $src -C src
+    cd src
+  '';
+
+  buildInputs = [ cmake ccid qttools pkgconfig pcsclite qttranslations
+                  hicolor_icon_theme
+                ];
+  
+  meta = with stdenv.lib; {
+    description = "UI application for managing smart card PIN/PUK codes and certificates";
+    homepage = "http://www.id.ee/";
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.jagajaga ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ee6c190ad4..304cdce4cd7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2978,6 +2978,8 @@ in
     qt = qt4;
   };
 
+  qesteidutil = qt5.callPackage ../tools/security/qesteidutil { } ;
+
   qgifer = callPackage ../applications/video/qgifer {
     giflib = giflib_4_1;
     qt = qt4;

From a133a74c8905c58721a2ae129c02c264bf6b3b09 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Apr 2016 17:31:54 +0200
Subject: [PATCH 287/712] Remove cruft

---
 maintainers/scripts/map-files.pl              |   22 -
 .../compilers/visual-c++/builder.sh           |   26 -
 .../compilers/visual-c++/default.nix          |   27 -
 pkgs/development/compilers/visual-c++/filemap |  622 ---
 .../compilers/visual-c++/test/builder.sh      |    6 -
 .../compilers/visual-c++/test/default.nix     |   10 -
 .../compilers/visual-c++/test/hello.c         |    7 -
 pkgs/development/misc/windows-sdk/builder.sh  |   35 -
 pkgs/development/misc/windows-sdk/default.nix |   92 -
 pkgs/development/misc/windows-sdk/filemap     | 3738 -----------------
 pkgs/os-specific/linux/dietlibc/builder.sh    |   36 -
 pkgs/os-specific/linux/dietlibc/default.nix   |   43 -
 pkgs/os-specific/linux/dietlibc/dns64.patch   |  109 -
 .../os-specific/linux/dietlibc/no-wchar.patch |   77 -
 pkgs/os-specific/linux/dietlibc/pc.patch      |   78 -
 .../linux/dietlibc/x86_64-lseek64.patch       |    6 -
 pkgs/os-specific/linux/e3cfsprogs/builder.sh  |   14 -
 pkgs/os-specific/linux/e3cfsprogs/default.nix |   20 -
 .../e3cfsprogs-1.39_bin_links.patch           |  111 -
 .../e3cfsprogs/e3cfsprogs-1.39_etc.patch      |   27 -
 .../os-specific/linux/ifplugd/interface.patch |   13 -
 .../linux/kernel-headers-cross/builder.sh     |   31 -
 .../linux/kernel-headers-cross/default.nix    |   13 -
 .../os-specific/linux/pam_devperm/default.nix |   12 -
 pkgs/os-specific/linux/procps/default.nix     |   30 -
 .../linux/procps/gnumake3.82.patch            |   13 -
 .../linux/procps/linux-ver-init.patch         |   23 -
 pkgs/os-specific/linux/procps/makefile.patch  |   71 -
 .../linux/procps/procps-build.patch           |   50 -
 pkgs/test/rpath/builder.sh                    |   79 -
 pkgs/test/rpath/default.nix                   |   18 -
 pkgs/test/rpath/src/hello1.c                  |    7 -
 pkgs/test/rpath/src/hello2.cc                 |    7 -
 pkgs/test/rpath/src/hello3.c                  |    9 -
 pkgs/test/rpath/src/text.c                    |    4 -
 pkgs/test/simple/default.nix                  |   17 -
 pkgs/top-level/all-packages.nix               |   16 +-
 pkgs/top-level/release.nix                    |    1 -
 38 files changed, 1 insertion(+), 5519 deletions(-)
 delete mode 100644 maintainers/scripts/map-files.pl
 delete mode 100644 pkgs/development/compilers/visual-c++/builder.sh
 delete mode 100644 pkgs/development/compilers/visual-c++/default.nix
 delete mode 100644 pkgs/development/compilers/visual-c++/filemap
 delete mode 100644 pkgs/development/compilers/visual-c++/test/builder.sh
 delete mode 100644 pkgs/development/compilers/visual-c++/test/default.nix
 delete mode 100644 pkgs/development/compilers/visual-c++/test/hello.c
 delete mode 100644 pkgs/development/misc/windows-sdk/builder.sh
 delete mode 100644 pkgs/development/misc/windows-sdk/default.nix
 delete mode 100644 pkgs/development/misc/windows-sdk/filemap
 delete mode 100644 pkgs/os-specific/linux/dietlibc/builder.sh
 delete mode 100644 pkgs/os-specific/linux/dietlibc/default.nix
 delete mode 100644 pkgs/os-specific/linux/dietlibc/dns64.patch
 delete mode 100644 pkgs/os-specific/linux/dietlibc/no-wchar.patch
 delete mode 100644 pkgs/os-specific/linux/dietlibc/pc.patch
 delete mode 100644 pkgs/os-specific/linux/dietlibc/x86_64-lseek64.patch
 delete mode 100755 pkgs/os-specific/linux/e3cfsprogs/builder.sh
 delete mode 100644 pkgs/os-specific/linux/e3cfsprogs/default.nix
 delete mode 100644 pkgs/os-specific/linux/e3cfsprogs/e3cfsprogs-1.39_bin_links.patch
 delete mode 100644 pkgs/os-specific/linux/e3cfsprogs/e3cfsprogs-1.39_etc.patch
 delete mode 100644 pkgs/os-specific/linux/ifplugd/interface.patch
 delete mode 100644 pkgs/os-specific/linux/kernel-headers-cross/builder.sh
 delete mode 100644 pkgs/os-specific/linux/kernel-headers-cross/default.nix
 delete mode 100644 pkgs/os-specific/linux/pam_devperm/default.nix
 delete mode 100644 pkgs/os-specific/linux/procps/default.nix
 delete mode 100644 pkgs/os-specific/linux/procps/gnumake3.82.patch
 delete mode 100644 pkgs/os-specific/linux/procps/linux-ver-init.patch
 delete mode 100644 pkgs/os-specific/linux/procps/makefile.patch
 delete mode 100644 pkgs/os-specific/linux/procps/procps-build.patch
 delete mode 100644 pkgs/test/rpath/builder.sh
 delete mode 100644 pkgs/test/rpath/default.nix
 delete mode 100644 pkgs/test/rpath/src/hello1.c
 delete mode 100644 pkgs/test/rpath/src/hello2.cc
 delete mode 100644 pkgs/test/rpath/src/hello3.c
 delete mode 100644 pkgs/test/rpath/src/text.c
 delete mode 100644 pkgs/test/simple/default.nix

diff --git a/maintainers/scripts/map-files.pl b/maintainers/scripts/map-files.pl
deleted file mode 100644
index 96149a61549..00000000000
--- a/maintainers/scripts/map-files.pl
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /usr/bin/perl -w
-
-use strict;
-
-my %map;
-open LIST1, "<$ARGV[0]" or die;
-while (<LIST1>) {
-    /^(\S+)\s+(.*)$/;
-    $map{$1} = $2;
-}
-
-open LIST1, "<$ARGV[1]" or die;
-while (<LIST1>) {
-    /^(\S+)\s+(.*)$/;
-    if (!defined $map{$1}) {
-        print STDERR "missing file: $2\n";
-        next;
-    }
-    print "$2\n";
-    print "$map{$1}\n";
-}
-
diff --git a/pkgs/development/compilers/visual-c++/builder.sh b/pkgs/development/compilers/visual-c++/builder.sh
deleted file mode 100644
index 5469f3760ca..00000000000
--- a/pkgs/development/compilers/visual-c++/builder.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out
-
-cabextract $src
-
-mkdir tmp
-cd tmp
-cabextract ../vcsetup1.cab
-rm ../vc* # reduce temporary disk usage a bit
-
-while read target; do
-    read source
-    echo "$source -> $target"
-    mkdir -p $out/$(dirname $target)
-    cp -p "$source" $out/"$target"
-done < $filemap
-
-# Make DLLs and executables executable.
-find $out \( -iname "*.dll" -o -iname "*.exe" -o -iname "*.config" \) -print0 | xargs -0 chmod +x
-
-cat > $out/setup  <<EOF
-export PATH="$out/VC/bin:$out/Common7/IDE:\$PATH"
-export LIB="$(cygpath -w -p "$out/VC/lib")"
-export INCLUDE="$(cygpath -w -p "$out/VC/include")"
-EOF
diff --git a/pkgs/development/compilers/visual-c++/default.nix b/pkgs/development/compilers/visual-c++/default.nix
deleted file mode 100644
index e111da6e7a1..00000000000
--- a/pkgs/development/compilers/visual-c++/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{stdenv, fetchurl, cabextract}:
-
-assert stdenv.system == "i686-cygwin";
-
-stdenv.mkDerivation {
-  # Derived from Visual C++ 2005 (= VC 8), followed by cl.exe's
-  # internal version number.
-  name = "visual-c++-8-14.00.50727.42";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://download.microsoft.com/download/0/5/A/05AA45B9-A4BE-4872-8D57-733DF5297284/Ixpvc.exe;
-    md5 = "5b3b07cb048798822582a752f586bab9";
-  };
-
-  # The `filemap' maps the pretty much useless paths in the CAB file
-  # to their intended destinations in the file system, as determined
-  # from a normal Visual C++ Express installation.
-  #
-  # Recipe for reproducing:
-  # $ find -type f /path/to/unpacked-cab -print0 | xargs -0 md5sum > m1
-  # $ find -type f /path/to/visual-c++ -print0 | xargs -0 md5sum > m2
-  # $ nixpkgs/maintainers/scripts/map-files.pl m1 m2 > filemap
-  filemap = ./filemap;
-
-  buildInputs = [cabextract];
-}
diff --git a/pkgs/development/compilers/visual-c++/filemap b/pkgs/development/compilers/visual-c++/filemap
deleted file mode 100644
index 9f17745e737..00000000000
--- a/pkgs/development/compilers/visual-c++/filemap
+++ /dev/null
@@ -1,622 +0,0 @@
-./Common7/IDE/msobj80.dll
-./FL_msobj71_dll_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./Common7/IDE/mspdb80.dll
-./FL_mspdb71_dll_2_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./Common7/IDE/mspdbcore.dll
-./FL_mspdbcore_dll_92167_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./Common7/IDE/mspdbsrv.exe
-./FL_mspdbsrv_exe_92168_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./Common7/IDE/PEVerify.exe
-./FL_PEVerify_exe_142183_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./Common7/IDE/PEVerify.exe.config
-./FL_PEVerify_exe_config_142184________.3643236F_FC70_11D3_A536_0090278A1BB8
-./Common7/IDE/PublicAssemblies/CppCodeProvider.dll
-./FL_CppCodeProvider_dll_72654_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./Common7/IDE/PublicAssemblies/Microsoft.VisualC.VSCodeProvider.dll
-./FL_Microsoft_VisualC_VSCodeProvider_dll_72653_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./Common7/IDE/PublicAssemblies/Microsoft.VisualStudio.VCCodeModel.dll
-./Microsoft_VisualStudio_VCCodeModel_dll_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./Common7/IDE/PublicAssemblies/Microsoft.VisualStudio.VCCodeModel.xml
-./FL_Microsoft_VisualStudio_VCCodeModel_xml_141601_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./Common7/IDE/PublicAssemblies/Microsoft.VisualStudio.VCProject.dll
-./Microsoft_VisualStudio_VCProject_dll_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./Common7/IDE/PublicAssemblies/Microsoft.VisualStudio.VCProject.xml
-./FL_Microsoft_VisualStudio_VCProject_xml_141602_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./Common7/IDE/PublicAssemblies/Microsoft.VisualStudio.VCProjectEngine.dll
-./FL_Microsoft_VisualStudio_VCProjectEngine__72652_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./Common7/IDE/PublicAssemblies/Microsoft.VisualStudio.VCProjectEngine.xml
-./FL_Microsoft_VisualStudio_VCProjectEngine__141603_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./Common7/Tools/errlook.exe
-./FL_errlook_exe_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./Common7/Tools/errlook.hlp
-./FL_errlook_hlp_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./Common7/Tools/makehm.exe
-./FL_makehm_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./Common7/Tools/vcvars.txt
-./FL_vcvars32_bat_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./SDK/v2.0/Bin/AxImp.exe
-./FL_AxImp_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./SDK/v2.0/Bin/gacutil.exe
-./FL_gacutil_exe_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./SDK/v2.0/Bin/gacutil.exe.config
-./FL_PEVerify_exe_config_142184________.3643236F_FC70_11D3_A536_0090278A1BB8
-./SDK/v2.0/Bin/lc.exe
-./FL_lc_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./SDK/v2.0/Bin/PEVerify.exe
-./FL_PEVerify_exe_142183_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./SDK/v2.0/Bin/PEVerify.exe.config
-./FL_PEVerify_exe_config_142184________.3643236F_FC70_11D3_A536_0090278A1BB8
-./SDK/v2.0/Bin/ResGen.exe
-./FL_ResGen_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./SDK/v2.0/Bin/sgen.exe
-./FL_sgen_exe_94980_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./SDK/v2.0/Bin/signtool.exe
-./FL_signtool_exe_102951_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./SDK/v2.0/Bin/sn.exe
-./FL_sn_exe_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./SDK/v2.0/Bin/TlbExp.exe
-./FL_TlbExp_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./SDK/v2.0/Bin/TlbImp.exe
-./TlbImp_exe_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./SDK/v2.0/Bin/TlbRef.dll
-./FL_TlbRef_dll_91955_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./SDK/v2.0/Bin/wsdl.exe
-./FL_wsdl_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./SDK/v2.0/Bin/wsdl.exe.config
-./FL_PEVerify_exe_config_142184________.3643236F_FC70_11D3_A536_0090278A1BB8
-./SDK/v2.0/Bin/xsd.exe
-./FL_xsd_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./SDK/v2.0/Lib/mscoree.lib
-./mscoree_lib_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/1033/atlprovui.dll
-./FL_atlprovui_dll_122786_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/1033/bscmakeui.dll
-./FL_bscmakeui_dll_103043_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/1033/clui.dll
-./FL_clui_dll_95594_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/1033/cvtresui.dll
-./FL_cvtresui_dll_103020_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/1033/linkui.dll
-./FL_linkui_dll_102968_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/1033/nmakeui.dll
-./FL_nmakeui_dll_103025_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/atlprov.dll
-./FL_atlprov_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/bscmake.exe
-./FL_bscmake_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/c1.dll
-./FL_c1_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/c1xx.dll
-./FL_c1xx_dll_67102_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/c2.dll
-./FL_c2_dll_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/cl.exe
-./FL_cl_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/cl.exe.config
-./FL_xdcmake_exe_config_76491_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/cvtres.exe
-./cvtres_exe_4_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/dumpbin.exe
-./FL_dumpbin_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/editbin.exe
-./FL_editbin_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/lib.exe
-./FL_lib_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/link.exe
-./FL_link_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/link.exe.config
-./FL_xdcmake_exe_config_76491_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/nmake.exe
-./FL_nmake_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/rc.exe
-./rc_exe_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/rcdll.dll
-./FL_rcdll_dll_66416_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/undname.exe
-./FL_undname_exe_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/VCExpCmdPromptShortcut.txt
-./FL_blank_txt_120872________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/vcvars32.bat
-./vcvars32_bat_1________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/xdcmake.exe
-./FL_xdcmake_exe_76490_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/bin/xdcmake.exe.config
-./FL_xdcmake_exe_config_76491_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/delayhlp.cpp
-./FL_delayhlp_cpp________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/intrin.h
-./FL_intrin_h_106236_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/memory.h
-./FL_memory_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/time.h
-./FL_time_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/algorithm
-./FL_algrithm________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/assert.h
-./FL_assert_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/bitset
-./FL_bitset________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/cassert
-./FL_cassert________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/cctype
-./FL_cctype________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/cerrno
-./FL_cerrno________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/cfloat
-./FL_cfloat________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/ciso646
-./FL_ciso646________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/climits
-./FL_climits________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/clocale
-./FL_clocale________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/cmath
-./FL_cmath________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/CodeAnalysis/sourceannotations.h
-./FL_sourceannotations_h_126529________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/comdef.h
-./FL_comdef_h________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/comdefsp.h
-./FL_comdefsp_h________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/comip.h
-./FL_comip_h________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/complex
-./FL_complex________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/comutil.h
-./FL_comutil_h________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/conio.h
-./FL_conio_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/crtassem.h
-./FL_crtassem_h_115581_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/crtdbg.h
-./FL_crtdbg_h________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/crtdefs.h
-./FL_crtdefs_h_92449_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/crtwrn.h
-./FL_crtwrn_h_110314_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/csetjmp
-./FL_csetjmp________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/csignal
-./FL_csignal________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/cstdarg
-./FL_cstdarg________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/cstddef
-./FL_cstddef________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/cstdio
-./FL_cstdio________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/cstdlib
-./FL_cstdlib________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/cstring
-./FL_cstring________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/ctime
-./FL_ctime________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/ctype.h
-./FL_ctype_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/cwchar
-./FL_cwchar________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/cwctype
-./FL_cwctype________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/dbgautoattach.h
-./dbgautoattach_h_2________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/minmax.h
-./FL_minmax_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/mm3dnow.h
-./FL_mm3dnow_h________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/mmintrin.h
-./FL_mmintrin_h________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/msclr/all.h
-./FL_all_h_120615________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/msclr/appdomain.h
-./FL_appdomain_h_120616________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/msclr/auto_gcroot.h
-./FL_auto_gcroot_h_120617________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/msclr/auto_handle.h
-./FL_auto_handle_h_120618________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/msclr/com/ptr.h
-./FL_ptr_h_120621________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/msclr/event.h
-./FL_event_h_122275________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/msclr/gcroot.h
-./FL_gcroot_h_134688________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/msclr/lock.h
-./FL_lock_h_120619________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/msclr/safebool.h
-./FL_safebool_h_120620________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/new
-./FL_new________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/new.h
-./FL_new_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/numeric
-./FL_numeric________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/ostream
-./FL_ostream________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/penwin.h
-./FL_penwin_h________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/process.h
-./FL_process_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/queue
-./FL_queue________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/rtcapi.h
-./rtcapi_h_1________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/sal.h
-./FL_sal_h_122276_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/search.h
-./FL_search_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/set
-./FL_set________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/setjmp.h
-./FL_setjmp_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/setjmpex.h
-./FL_setjmpex_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/share.h
-./FL_share_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/signal.h
-./FL_signal_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/sstream
-./FL_sstream________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/stack
-./FL_stack________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/stdarg.h
-./FL_stdarg_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/stddef.h
-./FL_stddef_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/stdexcept
-./FL_stdxcept________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/stdexcpt.h
-./FL_stdexcpt_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/stdio.h
-./FL_stdio_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/stdlib.h
-./FL_stdlib_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/streambuf
-./FL_streambf________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/string
-./FL_string________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/string.h
-./FL_string_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/strstream
-./FL_strstrem________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/swprintf.inl
-./FL_swprintf_inl_114606_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/sys/locking.h
-./locking_h_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/sys/stat.h
-./stat_h_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/sys/stat.inl
-./FL_stat_inl_73772_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/sys/timeb.h
-./timeb_h_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/sys/timeb.inl
-./FL_timeb_inl_73773_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/sys/types.h
-./types_h_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/sys/utime.h
-./utime_h_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/sys/utime.inl
-./FL_utime_inl_73774_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/sys/wstat.inl
-./FL_wstat_inl_73775_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/tchar.h
-./FL_tchar_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/delayimp.h
-./FL_delayimp_h________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/deque
-./FL_deque________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/direct.h
-./FL_direct_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/dos.h
-./FL_dos_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/dvec.h
-./FL_dvec_h________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/eh.h
-./FL_eh_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/emmintrin.h
-./FL_emmintrin_h________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/errno.h
-./FL_errno_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/exception
-./FL_xception________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/excpt.h
-./FL_excpt_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/fcntl.h
-./FL_fcntl_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/float.h
-./FL_float_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/fpieee.h
-./FL_fpieee_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/fstream
-./FL_fstream________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/functional
-./FL_fctional________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/fvec.h
-./FL_fvec_h________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/gcroot.h
-./FL_gcroot_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/hash_map
-./FL_hash_map________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/hash_set
-./FL_hash_set________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/time.inl
-./FL_time_inl_73769_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/typeinfo
-./FL_typeinfo________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/typeinfo.h
-./FL_typeinfo_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/use_ansi.h
-./FL_use_ansi_h________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/utility
-./FL_utility________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/vadefs.h
-./FL_vadefs_h_76352_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/valarray
-./FL_valarray________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/varargs.h
-./FL_varargs_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/vcclr.h
-./FL_vcclr_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/vector
-./FL_vector________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/wchar.h
-./FL_wchar_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/wctype.h
-./FL_wctype_h________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/wtime.inl
-./FL_wtime_inl_73771_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/xcomplex
-./FL_xcomplex________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/xdebug
-./FL_xdebug________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/xhash
-./FL_xhash________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/xiosbase
-./FL_xiosbase________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/xlocale
-./FL_xlocale________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/xlocinfo
-./FL_xlocinfo________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/xlocinfo.h
-./FL_xlocinfo_h________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/xlocmes
-./FL_xlocmes________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/xlocmon
-./FL_xlocmon________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/xlocnum
-./FL_xlocnum________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/xloctime
-./FL_xloctime________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/xmath.h
-./FL_xmath_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/xmemory
-./FL_xmemory________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/xmmintrin.h
-./FL_xmmintrin_h________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/xstddef
-./FL_xstddef________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/xstring
-./FL_xstring________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/xtree
-./FL_xtree________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/xutility
-./FL_xutility________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/ymath.h
-./FL_ymath_h________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/yvals.h
-./FL_yvals_h________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/_vcclrit.h
-./FL__vcclrit_h_103662_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/invkprxy.h
-./FL_invkprxy_h________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/io.h
-./FL_io_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/iomanip
-./FL_iomanip________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/ios
-./FL_ios________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/iosfwd
-./FL_iosfwd________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/iostream
-./FL_iostream________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/iso646.h
-./FL_iso646_h________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/istream
-./FL_istream________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/iterator
-./FL_iterator________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/ivec.h
-./FL_ivec_h________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/limits
-./FL_limits________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/limits.h
-./FL_limits_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/list
-./FL_list________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/listing.inc
-./listing_inc_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/locale
-./FL_locale________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/locale.h
-./FL_locale_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/malloc.h
-./FL_malloc_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/map
-./FL_map________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/math.h
-./FL_math_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/mbctype.h
-./FL_mbctype_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/mbstring.h
-./FL_mbstring_h_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/include/memory
-./FL_memory________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/msvcprtd.lib
-./FL_msvcprtd_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/binmode.obj
-./FL_binmode_obj_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/chkstk.obj
-./chkstk_obj_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/commode.obj
-./FL_commode_obj_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/comsupp.lib
-./FL_comsupp_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/comsuppd.lib
-./comsuppd_lib_1_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/comsuppw.lib
-./FL_comsuppw_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/comsuppwd.lib
-./FL_comsuppwd_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/delayimp.lib
-./FL_delayimp_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/fp10.obj
-./FL_fp10_obj_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/invalidcontinue.obj
-./FL_invalidcontinue_obj_117316_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/kernel32.lib
-./FL_kernel32_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/libcmt.lib
-./FL_libcmt_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/libcmt.pdb
-./FL_libcmt_pdb_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/libcmtd.lib
-./FL_libcmtd_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/libcmtd.pdb
-./FL_libcmtd_pdb_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/libcpmt.lib
-./FL_libcpmt_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/libcpmt.pdb
-./FL_libcpmt_pdb_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/libcpmtd.lib
-./FL_libcpmtd_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/libcpmtd.pdb
-./FL_libcpmtd_pdb_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/libsmanifest.res
-./FL_libsmanifest_res_111130________.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/loosefpmath.obj
-./FL_loosefpmath_obj_106228_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/msvcmrt.lib
-./FL_msvcmrt_lib_92271_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/msvcmrtd.lib
-./FL_msvcmrtd_lib_92272_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/msvcprt.lib
-./FL_msvcprt_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/msvcrt.lib
-./FL_msvcrt_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/msvcrtd.lib
-./FL_msvcrtd_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/msvcurt.lib
-./FL_msvcurt_lib_102954_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/msvcurtd.lib
-./FL_msvcurtd_lib_102955_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/newmode.obj
-./FL_newmode_obj_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/noarg.obj
-./FL_noarg_obj_126544_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/nochkclr.obj
-./FL_nochkclr_obj_110315_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/noenv.obj
-./FL_noenv_obj_126545_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/nothrownew.obj
-./FL_nothrownew_obj_97867_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/oldnames.lib
-./FL_oldnames_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/opends60.lib
-./FL_opends60_lib_127616_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/pbinmode.obj
-./FL_pbinmode_obj_125244_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/pcommode.obj
-./FL_pcommode_obj_125245_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/pinvalidcontinue.obj
-./FL_pinvalidcontinue_obj_125246_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/pnewmode.obj
-./FL_pnewmode_obj_125247_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/pnoarg.obj
-./FL_pnoarg_obj_125248_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/pnoenv.obj
-./FL_pnoenv_obj_125249_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/pnothrownew.obj
-./FL_pnothrownew_obj_125250_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/psetargv.obj
-./FL_psetargv_obj_125251_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/pthreadlocale.obj
-./FL_pthreadlocale_obj_125252_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/ptrustm.lib
-./FL_ptrustm_lib_136980_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/ptrustmd.lib
-./FL_ptrustmd_lib_136981_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/ptrustu.lib
-./FL_ptrustu_lib_136982_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/ptrustud.lib
-./FL_ptrustud_lib_136983_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/pwsetargv.obj
-./FL_pwsetargv_obj_125253_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/RunTmChk.lib
-./FL_RunTmChk_lib_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/setargv.obj
-./FL_setargv_obj_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/smalheap.obj
-./FL_smalheap_obj_126541_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/threadlocale.obj
-./FL_threadlocale_obj_126542_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/lib/wsetargv.obj
-./FL_wsetargv_obj_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/vcpackages/1033/vcbuildui.dll
-./FL_vcbuildui_dll_113019_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/vcpackages/1033/VCProjectUI.dll
-./FL_prjbldui_dll_ENU_X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/vcpackages/vcbuild.exe
-./FL_vsbuild_exe_75031_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/vcpackages/VCProjectEngine.dll.config
-./FL_VCProjectEngine_dll_config_93244_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/vcpackages/VCProjectEngine.Dll.Express.Config
-./FL_VCProjectEngine_Dll_Express_Config_109708_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/ATLDynamic.vsprops
-./FL_ATLDynamic_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/ATLNoCRT.vsprops
-./FL_ATLNoCRT_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/ATLStatic.vsprops
-./FL_ATLStatic_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/ATLWithCRT.vsprops
-./FL_ATLWithCRT_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/BuildBsc.vsprops
-./FL_BuildBsc_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/CoreWin.vsprops
-./FL_CoreWin_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/corewin_express.vsprops
-./FL_corewin_express_vsprops_104010_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/ManagedExtensions.vsprops
-./FL_ManagedExtensions_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/ManagedExtensionsOldSyntax.vsprops
-./FL_ManagedExtensionsOldSyntax_vsprops_103909_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/ManagedExtensionsPure.vsprops
-./FL_ManagedExtensionsPure_vsprops_103907_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/ManagedExtensionsSafe.vsprops
-./FL_ManagedExtensionsSafe_vsprops_103908_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/MfcDynamic.vsprops
-./FL_MfcDynamic_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/MfcStatic.vsprops
-./FL_MfcStatic_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/MultiByteCharSupport.vsprops
-./FL_MultiByteCharSupport_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/pgoinstrument.vsprops
-./FL_pgoinstrument_vsprops_92166_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/pgooptimize.vsprops
-./FL_pgooptimize_vsprops_92165_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/pgoupdate.vsprops
-./FL_pgoupdate_vsprops_92935_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/StaticAnalysis.vsprops
-./FL_StaticAnalysis_vsprops_122128_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/UnicodeSupport.vsprops
-./FL_UnicodeSupport_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/UpgradeFromVC60.vsprops
-./FL_UpgradeFromVC60_vsprops_123105_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/UpgradeFromVC70.vsprops
-./FL_UpgradeFromVC70_vsprops_123106_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/UpgradeFromVC71.vsprops
-./FL_UpgradeFromVC71_vsprops_123107_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/VCMergeModules.xml
-./FL_VCMergeModules_xml_120801_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/WholeProgOptimize.vsprops
-./FL_WholeProgOptimize_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/VCProjectDefaults/WinDLL.vsprops
-./FL_WinDLL_vcstyle_____X86.3643236F_FC70_11D3_A536_0090278A1BB8
-./VC/vcvarsall.bat
-./FL_vcvarsall_bat_103803________.3643236F_FC70_11D3_A536_0090278A1BB8
diff --git a/pkgs/development/compilers/visual-c++/test/builder.sh b/pkgs/development/compilers/visual-c++/test/builder.sh
deleted file mode 100644
index c11ffc574a8..00000000000
--- a/pkgs/development/compilers/visual-c++/test/builder.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-source $stdenv/setup
-source $visualcpp/setup
-source $windowssdk/setup
-
-mkdir -p $out/bin
-cl "$(cygpath -w $src)" /Fe"$(cygpath -w $out/bin/hello.exe)" user32.lib
diff --git a/pkgs/development/compilers/visual-c++/test/default.nix b/pkgs/development/compilers/visual-c++/test/default.nix
deleted file mode 100644
index 9bb7d663d0e..00000000000
--- a/pkgs/development/compilers/visual-c++/test/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl, visualcpp, windowssdk}:
-
-assert stdenv.system == "i686-cygwin";
-
-stdenv.mkDerivation {
-  name = "win32-hello";
-  builder = ./builder.sh;
-  src = ./hello.c;
-  inherit visualcpp windowssdk;
-}
diff --git a/pkgs/development/compilers/visual-c++/test/hello.c b/pkgs/development/compilers/visual-c++/test/hello.c
deleted file mode 100644
index 7c96d6441a9..00000000000
--- a/pkgs/development/compilers/visual-c++/test/hello.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <windows.h>
-int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, LPSTR lpCmdLine,
-                   int nCmdShow)
-{
-    MessageBox(NULL, "Hello World!", "Nix", MB_OK);
-    return 0;
-}
diff --git a/pkgs/development/misc/windows-sdk/builder.sh b/pkgs/development/misc/windows-sdk/builder.sh
deleted file mode 100644
index 8f1eaffbcaf..00000000000
--- a/pkgs/development/misc/windows-sdk/builder.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out
-
-n=1
-for p in $srcs; do
-    ln -s $p PSDK-FULL.$n.cab
-    n=$((n + 1))
-done
-
-mkdir tmp
-cd tmp
-cabextract ../PSDK-FULL.1.cab
-
-mkdir tmp
-cd tmp
-for i in ../Setup/*.cab; do
-    cabextract $i
-done
-
-while read target; do
-    read source
-    echo "$source -> $target"
-    mkdir -p "$out/$(dirname "$target")"
-    cp "$source" "$out/$target"
-done < $filemap
-
-# Make DLLs and executables executable.
-find $out \( -iname "*.dll" -o -iname "*.exe" -o -iname "*.config" \) -print0 | xargs -0 chmod +x
-
-cat > $out/setup  <<EOF
-export PATH="$out/bin:\$PATH"
-export LIB="$(cygpath -w -p "$out/lib");\$LIB"
-export INCLUDE="$(cygpath -w -p "$out/include");\$INCLUDE"
-EOF
diff --git a/pkgs/development/misc/windows-sdk/default.nix b/pkgs/development/misc/windows-sdk/default.nix
deleted file mode 100644
index 2440f59622e..00000000000
--- a/pkgs/development/misc/windows-sdk/default.nix
+++ /dev/null
@@ -1,92 +0,0 @@
-{stdenv, fetchurl, cabextract}:
-
-#assert stdenv.system == "i686-cygwin";
-
-stdenv.mkDerivation {
-  # Windows Server 2003 R2 Platform SDK - March 2006 Edition.
-  name = "windows-sdk-2003-r2";
-  builder = ./builder.sh;
-
-  srcs = [
-    (fetchurl {
-      url = http://download.microsoft.com/download/1/e/a/1ea37493-825f-464e-a874-403c75facd5b/PSDK-FULL.1.cab;
-      md5 = "9b07b16ff1ae4982a5d4bfbe550d383e";
-    })
-    (fetchurl {
-      url = http://download.microsoft.com/download/1/e/a/1ea37493-825f-464e-a874-403c75facd5b/PSDK-FULL.2.cab;
-      md5 = "b8ace0bdda22b267d88149ac3d49f889";
-    })
-    (fetchurl {
-      url = http://download.microsoft.com/download/1/e/a/1ea37493-825f-464e-a874-403c75facd5b/PSDK-FULL.3.cab;
-      md5 = "b7a0109df5a28a5489e84df7d7a61668";
-    })
-    (fetchurl {
-      url = http://download.microsoft.com/download/1/e/a/1ea37493-825f-464e-a874-403c75facd5b/PSDK-FULL.4.cab;
-      md5 = "f3aded09c1ea845785247c45574f27fd";
-    })
-    (fetchurl {
-      url = http://download.microsoft.com/download/1/e/a/1ea37493-825f-464e-a874-403c75facd5b/PSDK-FULL.5.cab;
-      md5 = "978b7124550895358196e3f7de303cf5";
-    })
-    (fetchurl {
-      url = http://download.microsoft.com/download/1/e/a/1ea37493-825f-464e-a874-403c75facd5b/PSDK-FULL.6.cab;
-      md5 = "cf390a0479860e1e74f8e8fcddaf307f";
-    })
-    (fetchurl {
-      url = http://download.microsoft.com/download/1/e/a/1ea37493-825f-464e-a874-403c75facd5b/PSDK-FULL.7.cab;
-      md5 = "c9d1c8790fc5becaff4619d778d192a9";
-    })
-    (fetchurl {
-      url = http://download.microsoft.com/download/1/e/a/1ea37493-825f-464e-a874-403c75facd5b/PSDK-FULL.8.cab;
-      md5 = "d94d61c444ba73702c54d93084b756e1";
-    })
-    (fetchurl {
-      url = http://download.microsoft.com/download/1/e/a/1ea37493-825f-464e-a874-403c75facd5b/PSDK-FULL.9.cab;
-      md5 = "1990b7598960d503b9cd9aa9b7eb9174";
-    })
-    (fetchurl {
-      url = http://download.microsoft.com/download/1/e/a/1ea37493-825f-464e-a874-403c75facd5b/PSDK-FULL.10.cab;
-      md5 = "6437fd9dc2c65017c7bb4e759b13f678";
-    })
-    (fetchurl {
-      url = http://download.microsoft.com/download/1/e/a/1ea37493-825f-464e-a874-403c75facd5b/PSDK-FULL.11.cab;
-      md5 = "98f46cb52a01fae4e56e62f5bfef0fde";
-    })
-    (fetchurl {
-      url = http://download.microsoft.com/download/1/e/a/1ea37493-825f-464e-a874-403c75facd5b/PSDK-FULL.12.cab;
-      md5 = "b5f21fde5965b0f1079fd9c9a3434da6";
-    })
-    (fetchurl {
-      url = http://download.microsoft.com/download/1/e/a/1ea37493-825f-464e-a874-403c75facd5b/PSDK-FULL.13.cab;
-      md5 = "708574a95c51307e40e6da48e909f288";
-    })
-    (fetchurl {
-      url = http://download.microsoft.com/download/1/e/a/1ea37493-825f-464e-a874-403c75facd5b/PSDK-FULL.14.cab;
-      md5 = "19e90769d3500f6448e5ce2e1290fdd5";
-    })
-    (fetchurl {
-      url = http://download.microsoft.com/download/1/e/a/1ea37493-825f-464e-a874-403c75facd5b/PSDK-FULL.15.cab;
-      md5 = "0ccb3484253b3578e60ff1abb89f2f68";
-    })
-    (fetchurl {
-      url = http://download.microsoft.com/download/1/e/a/1ea37493-825f-464e-a874-403c75facd5b/PSDK-FULL.16.cab;
-      md5 = "e94106bb4e217b3c86c529afbb8489eb";
-    })
-    (fetchurl {
-      url = http://download.microsoft.com/download/1/e/a/1ea37493-825f-464e-a874-403c75facd5b/PSDK-FULL.17.cab;
-      md5 = "87eaa56fbd625ec696f16dbf136a3904";
-    })
-  ];
-
-  # The `filemap' maps the pretty much useless paths in the CAB file
-  # to their intended destinations in the file system, as determined
-  # from a normal SDK installation.
-  #
-  # Recipe for reproducing:
-  # $ find -type f /path/to/unpacked-cabs -print0 | xargs -0 md5sum > m1
-  # $ find -type f /path/to/visual-c++ -print0 | xargs -0 md5sum > m2
-  # $ nixpkgs/maintainers/scripts/map-files.pl m1 m2 > filemap
-  filemap = ./filemap;
-
-  buildInputs = [cabextract];
-}
diff --git a/pkgs/development/misc/windows-sdk/filemap b/pkgs/development/misc/windows-sdk/filemap
deleted file mode 100644
index 05498d931c1..00000000000
--- a/pkgs/development/misc/windows-sdk/filemap
+++ /dev/null
@@ -1,3738 +0,0 @@
-./Bin/Ace.Exe
-./Ace_Exe.9D680411_628E_4A25_90E0_D910D59E60C3
-./Bin/AEReadMe.rtf
-./AEReadMe_rtf.31A90105_5D49_495F_B308_CE80D00D924D
-./Bin/AssistPalet.Bmp
-./AssistPalet_Bmp.9D680411_628E_4A25_90E0_D910D59E60C3
-./Bin/Bind.Exe
-./Bind_Exe.FB899C8D_AEDE_4DC6_AEA5_C2060C17E046
-./Bin/CabArc.Exe
-./CabArc_Exe.8FEB9412_EDAC_4C4A_A3CC_D36BE5D86A24
-./Bin/Cert2Spc.Exe
-./Cert2Spc_Exe.C08881EB_C9DE_4A5E_9259_D8031DF805D7
-./Bin/CertAdmL.Dll
-./CertAdmL_Dll.971B641F_B805_43AA_9D98_CB7A9F58DE56
-./Bin/CertCliL.Dll
-./CertCliL_Dll.971B641F_B805_43AA_9D98_CB7A9F58DE56
-./Bin/CertEncL.Dll
-./CertEncL_Dll.971B641F_B805_43AA_9D98_CB7A9F58DE56
-./Bin/CertMgr.Exe
-./CertMgr_Exe.6CC84BAC_FC93_450D_A7D1_D90EA3A25A62
-./Bin/checkv4.exe
-./checkv4_exe.33E12168_7E32_4643_B1F9_8EBA77A82440
-./Bin/consume.exe
-./consume_exe.25169329_7F10_44CD_94AD_76B53FD40C1D
-./Bin/Depends.Cnt
-./Depends_Cnt.4260B6FE_7568_4BCD_AE9A_FCCACBE58592
-./Bin/Depends.Dll
-./Depends_Dll.FFCB8068_C080_43CA_BA8B_8CCE6A6701E2
-./Bin/Depends.Exe
-./Depends_Exe.127AA5A6_7565_4669_8326_8FDB83C9ACDD
-./Bin/Depends.Hlp
-./Depends_Hlp.4260B6FE_7568_4BCD_AE9A_FCCACBE58592
-./Bin/ExtidGen.Exe
-./ExtidGen_Exe.EF9FA63D_E0FF_4BC4_8930_D582F662E111
-./Bin/FiltDump.Exe
-./FiltDump_Exe.7371AF73_13F4_4F84_AC8B_A711E4E79821
-./Bin/FiltReg.Exe
-./FiltReg_Exe.7371AF73_13F4_4F84_AC8B_A711E4E79821
-./Bin/FrameDyD.Dll
-./FrameDyD_Dll.1FE46D04_13C9_4E58_B965_E20C87A5E2EA
-./Bin/graphedit.chm
-./graphedit_chm.D65733DC_AD9D_46F8_9CAE_9DD65CFEB7BC
-./Bin/graphedt.exe
-./graphedt_exe.F524F79A_120D_4F96_82B2_D5F568E8A1E2
-./Bin/GuidGen.exe
-./GuidGen_exe.8CEBE7C4_C33A_43B2_BB09_D9700343CE15
-./Bin/GUtils.Dll
-./GUtils_Dll.96AD660B_9CCE_4BEB_82AC_130CBB29F231
-./Bin/IViewers.Dll
-./IViewers_Dll.02A6C9DE_3977_457B_AA07_978287ADB778
-./Bin/Liset.Exe
-./Liset_Exe.9D680411_628E_4A25_90E0_D910D59E60C3
-./Bin/MakeCat.Exe
-./MakeCat_Exe.FC77A2D4_5CD0_435F_ADA1_66A8973B46C3
-./Bin/makecert.exe
-./makecert_exe.32997D52_01FB_4CBF_B1C7_C68FD4253033
-./Bin/MakeCtl.Exe
-./MakeCtl_Exe.46A5D545_C185_4AC4_98C1_13AD9E13C3B3
-./Bin/MapSym.Exe
-./MapSym_Exe.2B8C04EA_9592_4120_9D05_4B4B0CB18657
-./Bin/MC.Exe
-./MC_Exe.59639336_1464_44C3_9FF9_66EDBFCA8EC6
-./Bin/Mc.Hlp
-./Mc_Hlp.D41C50E7_AA67_48C7_A2BE_CE91AF99CE16
-./Bin/MergeMod.Dll
-./MergeMod_Dll.9BC0D62A_1241_413C_8F4B_20C4B845BC97
-./Bin/Microsoft.Uddi.dll
-./Microsoft_Uddi_dll.6E0C05A4_020E_48B2_A1CE_733117E7F508
-./Bin/Microsoft.Uddi.xml
-./Microsoft_Uddi_xml.6E0C05A4_020E_48B2_A1CE_733117E7F508
-./Bin/Midl.Exe
-./Midl_Exe.7D419645_5565_4CBA_874F_C8F7FF95D870
-./Bin/MidlC.Exe
-./MidlC_Exe.7D419645_5565_4CBA_874F_C8F7FF95D870
-./Bin/mmcproxy.dll
-./mmcproxy_dll.C1D44F4D_D8A9_469C_A759_71DF3BB091EF
-./Bin/MsiCert.exe
-./MsiCert_exe.629D4BFB_E889_4E6C_897C_093DB6D05EBF
-./Bin/MsiDb.Exe
-./MsiDb_Exe.83A5AC83_810D_46F7_8991_A90A4AB51505
-./Bin/MsiFiler.Exe
-./MsiFiler_Exe.03A08BFA_0174_43CB_8B63_8516F8277EFD
-./Bin/MsiInfo.Exe
-./MsiInfo_Exe.AADA8778_B01B_4AB3_9315_8D350F4A5B2C
-./Bin/MsiMerg.Exe
-./MsiMerg_Exe.D92912E9_23AC_4ECF_90B5_D43326C72E2F
-./Bin/MsiMig.Dll
-./MsiMig_Dll.5E25C7B1_E509_4FC0_A8C7_9862AB17BFB1
-./Bin/MsiMig.Exe
-./MsiMig_Exe.5E25C7B1_E509_4FC0_A8C7_9862AB17BFB1
-./Bin/MsiTool.Mak
-./MsiTool_Mak.F4B97E1E_EA99_4808_A5BF_656667DD4267
-./Bin/MsiTran.Exe
-./MsiTran_Exe.3F278AA9_26F5_4915_AC72_3C0E3AE3703F
-./Bin/MsiVal2.Msi
-./MsiVal2_Msi.A3EF8DFF_7CCD_4FA6_9C59_57E28F7F6EF9
-./Bin/MsiZap.Exe
-./MsiZap_Exe.17E01D9E_20F1_4288_95AF_BA38D00C6973
-./Bin/mssnapd.ocx
-./mssnapd_ocx.D66E7744_983C_4AE6_B4AB_1DE53431D3AC
-./Bin/mssnapr.dep
-./mssnapr_dep.395D97FA_C0B5_4D1D_9CC0_6980C3899FBF
-./Bin/mssnapr.dll
-./mssnapr_dll.0F6A9ECE_2DFD_4F23_89C3_B3241A9FD727
-./Bin/mt.exe
-./mt_exe.7BDCA3FD_2654_4C18_9592_E728A8A37516
-./Bin/nmake.exe
-./nmake_exe.23DF85B1_CB01_41EC_BA8A_F53B1201C21E
-./Bin/OleView.Exe
-./OleView_Exe.49DB37E1_7D59_49DC_A72E_37C05E79B6C0
-./Bin/Orca.Msi
-./Orca_Msi.F443CEDC_68B1_4EE7_B9FD_A6C85374EF6E
-./Bin/pktextract.exe
-./pktextract_exe.E4B53D63_3CE8_4D30_BCC7_A22DE6EF1F5F
-./Bin/proppage.dll
-./proppage_dll.4E636F60_B074_45B5_9216_BEA4D548BAE3
-./Bin/pvk2pfx.exe
-./pvk2pfx_exe.40ED341D_22C2_4704_B35D_E00CC4010EBE
-./Bin/RC.Exe
-./RC_Exe.F671962B_91F5_41DC_A710_8A59488B185F
-./Bin/RcDll.Dll
-./RcDll_Dll.812F17D8_4961_40E2_A123_F4F911A1D797
-./Bin/ReBase.Exe
-./ReBase_Exe.72976844_9A15_4956_8A8A_C75951982B24
-./Bin/signtool.exe
-./signtool_exe.9052203A_CBA9_4CBE_A248_DECF46016081
-./Bin/Tb20.Exe
-./Tb20_Exe.222B4FB4_A948_48A6_8E5A_B5DD7C24461B
-./Bin/tracefmt.exe
-./tracefmt_exe.AB646BA8_F27B_454B_9921_68889C4C5750
-./Bin/tracelog.exe
-./tracelog_exe.AB646BA8_F27B_454B_9921_68889C4C5750
-./Bin/tracepdb.exe
-./tracepdb_exe.AB646BA8_F27B_454B_9921_68889C4C5750
-./Bin/traceprt.dll
-./traceprt_dll.AB646BA8_F27B_454B_9921_68889C4C5750
-./Bin/tracewpp.exe
-./tracewpp_exe.B88013CF_6978_4C76_A024_0654BDB2BB08
-./Bin/uddi.publish.wizard.chm
-./uddi_publish_wizard_chm.6E0C05A4_020E_48B2_A1CE_733117E7F508
-./Bin/UddiPublishWizard.exe
-./UddiPublishWizard_exe.6E0C05A4_020E_48B2_A1CE_733117E7F508
-./Bin/UddiReadMe.htm
-./UddiReadMe_htm.6E0C05A4_020E_48B2_A1CE_733117E7F508
-./Bin/UddiSdkRegister.exe
-./UddiSdkRegister_exe.6E0C05A4_020E_48B2_A1CE_733117E7F508
-./Bin/Uuidgen.Exe
-./Uuidgen_Exe.6C98F31D_318E_4180_BAEF_EE4E4BC2E2B8
-./Bin/Where.Exe
-./Where_Exe.77C72A79_0E6D_4001_9CAD_C491FD9AD7B5
-./Bin/WiLogUtl.exe
-./WiLogUtl_exe.793990E2_E949_47AF_88C1_C6F749A19603
-./Bin/WinDiff.Exe
-./WinDiff_Exe.B3623704_1F3E_46E7_B7C5_FD1E9B1AE3BC
-./Bin/WinDiff.Hlp
-./WinDiff_Hlp.671495D7_1765_400A_9A49_A79987B84A35
-./Bin/winnt/Dbmon.Exe
-./Dbmon_Exe.D28CCBD7_CA07_463A_8D42_1E43412A2552
-./Bin/winnt/Esp32.Tsp
-./Esp32_Tsp.F9D12C07_2F6B_42D9_94F8_9B2BDD13E534
-./Bin/winnt/EspExe.Exe
-./EspExe_Exe.46246156_32D0_4323_AF9D_DC048B9B4F1B
-./Bin/winnt/Espui.Dll
-./Espui_Dll.A08614E6_F424_47A9_9F72_205A61063AF6
-./Bin/winnt/IFiltTst.Exe
-./IFiltTst_Exe.9E54116D_31BC_410C_93EB_7085EB623B6E
-./Bin/winnt/IFiltTst.Ini
-./IFiltTst_Ini.F25729BD_3398_4FFC_993F_7D4F7C803765
-./Bin/winnt/PerfMtr.Exe
-./PerfMtr_Exe.8CEA1618_6E2F_4DA1_A53B_6F4A92A8B43E
-./Bin/winnt/Pfmon.Exe
-./Pfmon_Exe.710D7A2A_AB47_4A78_A5C0_244C37991BA5
-./Bin/winnt/PStat.Exe
-./PStat_Exe.A8895EF4_8D6F_45F6_B150_C66379C1B34C
-./Bin/winnt/PView.Exe
-./PView_Exe.A475CBA2_0ED5_44BD_ACA0_530B57DD543E
-./Bin/winnt/Sc.Exe
-./Sc_Exe.EC224196_14C3_4685_BADA_95550432D473
-./Bin/winnt/SpOrder.Dll
-./SpOrder_Dll.9A7CE161_2EF5_47E7_8738_01B94511CADD
-./Bin/winnt/SpOrder.Exe
-./SpOrder_Exe.7540A53B_8DB7_4168_A8D7_4021096101F1
-./Bin/winnt/TB3x.exe
-./TB3x_exe.0241E9C0_DEB7_41A8_8D7B_78B07B283BBC
-./Bin/winnt/utl2idl.exe
-./utl2idl_exe.40BE6063_77B9_40E8_9F70_B654F27C40AC
-./Bin/winnt/VaDump.Exe
-./VaDump_Exe.5D808647_F8A9_4C3C_A173_8010EF6962EF
-./Bin/winnt/validatesd.exe
-./validatesd_exe.40BE6063_77B9_40E8_9F70_B654F27C40AC
-./Bin/wppconfig/rev1/control.tpl
-./control_tpl.092D0B15_4E20_4BF9_9F25_919B12AD9F03
-./Bin/wppconfig/rev1/defaultwpp.ini
-./defaultwpp_ini.092D0B15_4E20_4BF9_9F25_919B12AD9F03
-./Bin/wppconfig/rev1/header.tpl
-./header_tpl.092D0B15_4E20_4BF9_9F25_919B12AD9F03
-./Bin/wppconfig/rev1/km-default.tpl
-./km_default_tpl.092D0B15_4E20_4BF9_9F25_919B12AD9F03
-./Bin/wppconfig/rev1/km-header.tpl
-./km_header_tpl.092D0B15_4E20_4BF9_9F25_919B12AD9F03
-./Bin/wppconfig/rev1/km-init.tpl
-./km_init_tpl.092D0B15_4E20_4BF9_9F25_919B12AD9F03
-./Bin/wppconfig/rev1/mof.tpl
-./mof_tpl.092D0B15_4E20_4BF9_9F25_919B12AD9F03
-./Bin/wppconfig/rev1/r1defwpp.ini
-./r1defwpp_ini.092D0B15_4E20_4BF9_9F25_919B12AD9F03
-./Bin/wppconfig/rev1/simple.tpl
-./simple_tpl.092D0B15_4E20_4BF9_9F25_919B12AD9F03
-./Bin/wppconfig/rev1/stdout.tpl
-./stdout_tpl.092D0B15_4E20_4BF9_9F25_919B12AD9F03
-./Bin/wppconfig/rev1/trmacro.tpl
-./trmacro_tpl.092D0B15_4E20_4BF9_9F25_919B12AD9F03
-./Bin/wppconfig/rev1/um-default.tpl
-./um_default_tpl.092D0B15_4E20_4BF9_9F25_919B12AD9F03
-./Bin/wppconfig/rev1/um-header.tpl
-./um_header_tpl.092D0B15_4E20_4BF9_9F25_919B12AD9F03
-./Bin/wppconfig/rev1/um-init.tpl
-./um_init_tpl.092D0B15_4E20_4BF9_9F25_919B12AD9F03
-./Bin/wppconfig/rev1/um-w2k.tpl
-./um_w2k_tpl.092D0B15_4E20_4BF9_9F25_919B12AD9F03
-./Bin/Ws2_32.dll
-./Ws2_32_dll.01E16487_B2BF_42AC_9980_D4D544D6A192
-./Images/PSDKLogo.gif
-./PSDKLogo_gif.87918550_EDC0_45FB_BA34_9AD0951E7AFB
-./Include/AccCtrl.h
-./AccCtrl_h.40C59884_454B_4CFB_BD36_6D75282E5D30
-./Include/AclAPI.h
-./AclAPI_h.4F463275_49A5_4DB6_B84A_3EF0722E6623
-./Include/AclUI.h
-./AclUI_h.40A37D65_9DFE_4606_BB51_7493400080E2
-./Include/activdbg.h
-./activdbg_h.52E3F94C_E4F4_41B1_A1AF_D8BE72BDEBD3
-./Include/activecf.h
-./activecf_h.8398D889_ACF5_4957_943C_2D96F1020886
-./Include/ActiveDS.h
-./ActiveDS_h.04F0112A_3DDD_48A2_8569_EE83114C57E7
-./Include/ActivScp.h
-./ActivScp_h.5B58ABAE_F131_49B2_99C5_C56A6F6AC62D
-./Include/ActivScp.Idl
-./ActivScp_Idl.55A11AAC_6768_4A9C_9F8E_D0B60A03EB16
-./Include/Adptif.h
-./Adptif_h.EAB9A09C_3691_4DA9_8BAE_051E85F686D3
-./Include/AdsDb.h
-./AdsDb_h.3441AAD4_5B72_4C0C_980C_3B6A411FF8A5
-./Include/AdsErr.h
-./AdsErr_h.73E1A76A_2E32_4A3D_AF82_02B53C9BDDF6
-./Include/AdsHlp.h
-./AdsHlp_h.B29E3291_2EFF_4395_91AF_1CF846E7CBE2
-./Include/ADSIid.h
-./ADSIid_h.36F7F247_37BD_40F0_A149_8708CCA44761
-./Include/Adsnms.h
-./Adsnms_h.FCB45EDA_0CB8_411A_8131_BEE4CD1DF389
-./Include/AdsProp.h
-./AdsProp_h.82D538B9_C14B_48E0_B39B_889C1252E6A4
-./Include/Adssts.h
-./Adssts_h.B9E5DE1C_5972_4C11_A6B3_E0F4351F9DF1
-./Include/AdtGen.h
-./AdtGen_h.99810400_839D_4052_9B6C_88442349808B
-./Include/advpub.h
-./advpub_h.E193DA22_3D5B_4A32_87E5_297629F0E258
-./Include/AF_Irda.h
-./AF_Irda_h.A9FE1621_3974_4BB9_B728_D98FE04124C1
-./Include/AgtCtl.h
-./AgtCtl_h.1BA61262_421C_47EB_8821_A744C4C945C1
-./Include/AgtCtl_i.c
-./AgtCtl_i_c.F418DA6B_7D56_4209_9061_67401D8C6E01
-./Include/AgtErr.h
-./AgtErr_h.CAC7B2B9_320B_4D6D_944F_7BFC033FF71A
-./Include/AgtSvr.h
-./AgtSvr_h.645D121A_2504_427F_BCD2_64CFC3CA2538
-./Include/AgtSvr_i.c
-./AgtSvr_i_c.61FF4575_089A_4CB4_8D73_582B7D1A70A2
-./Include/alg.h
-./alg_h.762DD5E6_9EA0_41BC_B369_3F42EEC596AB
-./Include/alg.idl
-./alg_idl.3CDBD10F_DA75_4218_8217_9E2265F5E345
-./Include/amaudio.h
-./amaudio_h.35F6AEA3_8CE2_4BA7_986D_803E2BE6E2EE
-./Include/amparse.h
-./amparse_h.B4E168B4_1BD1_4F6F_84F5_9106C9547654
-./Include/amstream.h
-./amstream_h.EC64900F_7CD4_4343_A709_88330CAD9AF1
-./Include/amstream.idl
-./amstream_idl.49B88D29_3CFE_4318_BE08_FF096709AD8A
-./Include/amva.h
-./amva_h.2562F562_D5D2_49CA_B4B0_7EC81192551E
-./Include/amvideo.h
-./amvideo_h.433056EF_FB01_4456_845D_8A7AFCD76F4D
-./Include/AppAvCap.h
-./AppAvCap_h.F90E7E8C_0234_44EC_A097_518036B32ACE
-./Include/appcompatapi.h
-./appcompatapi_h.DB14D639_CAB6_4E6F_8FD4_2266199CCF98
-./Include/appmgmt.h
-./appmgmt_h.25B3537C_424A_48D3_90E0_E3D9A6C7CDFA
-./Include/atacct.h
-./atacct_h.A008FCB4_FD09_4F14_A68A_DF062E1FA561
-./Include/AtalkWsh.h
-./AtalkWsh_h.443C576A_B23A_41E6_AA7F_0DC047C49E01
-./Include/atl/atlbase.h
-./atlbase_h.D0386B79_FCB1_458F_A031_4CB28CAC2C99
-./Include/atl/atlcom.h
-./atlcom_h.B8FCDAF0_A4D8_4588_A05E_FFC0DFFAB362
-./Include/atl/atlconv.cpp
-./statreg_cpp.D0386B79_FCB1_458F_A031_4CB28CAC2C99
-./Include/atl/atlconv.h
-./atlconv_h.D0386B79_FCB1_458F_A031_4CB28CAC2C99
-./Include/atl/atlctl.cpp
-./statreg_cpp.D0386B79_FCB1_458F_A031_4CB28CAC2C99
-./Include/atl/atlctl.h
-./atlctl_h.D0386B79_FCB1_458F_A031_4CB28CAC2C99
-./Include/atl/atldb.h
-./atldb_h.D0386B79_FCB1_458F_A031_4CB28CAC2C99
-./Include/atl/atldbcli.h
-./atldbcli_h.D0386B79_FCB1_458F_A031_4CB28CAC2C99
-./Include/atl/atldbsch.h
-./atldbsch_h.D0386B79_FCB1_458F_A031_4CB28CAC2C99
-./Include/atl/atldef.h
-./atldef_h.D0386B79_FCB1_458F_A031_4CB28CAC2C99
-./Include/atl/atlhost.h
-./atlhost_h.D0386B79_FCB1_458F_A031_4CB28CAC2C99
-./Include/atl/atliface.h
-./atliface_h.D0386B79_FCB1_458F_A031_4CB28CAC2C99
-./Include/atl/atliface.idl
-./atliface_idl.D0386B79_FCB1_458F_A031_4CB28CAC2C99
-./Include/atl/atlimpl.cpp
-./atlimpl_cpp.D0386B79_FCB1_458F_A031_4CB28CAC2C99
-./Include/atl/atlsnap.h
-./atlsnap_h.D0386B79_FCB1_458F_A031_4CB28CAC2C99
-./Include/atl/atlwin.cpp
-./statreg_cpp.D0386B79_FCB1_458F_A031_4CB28CAC2C99
-./Include/atl/atlwin.h
-./atlwin_h.B1AAB21C_970C_4E86_BE7E_3EF68240819E
-./Include/atl/license.txt
-./license_txt.D0386B79_FCB1_458F_A031_4CB28CAC2C99
-./Include/atl/statreg.cpp
-./statreg_cpp.D0386B79_FCB1_458F_A031_4CB28CAC2C99
-./Include/atl/statreg.h
-./statreg_h.D0386B79_FCB1_458F_A031_4CB28CAC2C99
-./Include/atsmedia.h
-./atsmedia_h.17313BE5_5F89_433D_B525_4783A65FC892
-./Include/audevcod.h
-./audevcod_h.E039A852_0CF7_47AB_B6AC_51F0006A5EE9
-./Include/austream.h
-./austream_h.199B1A3B_64C4_426E_AD85_D16A7AAAF334
-./Include/austream.idl
-./austream_idl.162BFFFF_6F93_4143_BAAB_D2CBE5B4ED65
-./Include/authen.h
-./authen_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/authen.idl
-./authen_idl.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/Authif.h
-./Authif_h.73E78AB1_50AB_4974_BA2E_8897DA29CC99
-./Include/AuthZ.h
-./AuthZ_h.BFFF87E7_896C_4F41_8B4E_BFFA07A7CDFF
-./Include/AviFmt.h
-./AviFmt_h.B9BECFAF_CD00_47CC_B1D5_8ED2AAA1E827
-./Include/aviriff.h
-./aviriff_h.AA2DF1F1_C921_484B_9E93_C30D21665505
-./Include/Avrfsdk.h
-./Avrfsdk_h.97392435_E9BB_4415_A727_F7AA293C0866
-./Include/axcore.idl
-./axcore_idl.BA03BB54_63B0_40B8_BC3E_E59C1A52571F
-./Include/axextend.idl
-./axextend_idl.214AE2A4_CB61_4CD5_A839_092E518FD12E
-./Include/axextendenums.h
-./axextendenums_h.0578CEAB_A39C_469E_A837_EB7119201BFB
-./Include/azroles.h
-./azroles_h.05638B02_CB82_433A_B0AD_6E984DC5F161
-./Include/BaseTsd.h
-./BaseTsd_h.2F22BB4E_9A86_4B22_987A_4B73F72C5DC0
-./Include/BaseTyps.h
-./BaseTyps_h.DF09C88A_D24E_43B7_8191_DCE91BEAB0BF
-./Include/BatClass.h
-./BatClass_h.5AED5C34_43AD_4B42_9880_9546BF4D18BC
-./Include/bdaiface.h
-./bdaiface_h.C61ADB81_42EB_45F4_B742_3CB8264B48C7
-./Include/bdaiface.idl
-./bdaiface_idl.EA19C407_7D96_43E2_ABF0_C1B0321215FE
-./Include/bdamedia.h
-./bdamedia_h.D24B1A2B_2495_40E5_8B96_C48C12238699
-./Include/bdatif.h
-./bdatif_h.CA62B469_D99A_4AD1_864A_42AF262F9AAF
-./Include/bdatif.idl
-./bdatif_idl.F99AFD2F_FB23_42DA_A8ED_DE7CDA5482F9
-./Include/bdatypes.h
-./bdatypes_h.2DAAFAF6_9CAD_492A_A98C_9B488A8A0026
-./Include/bh.h
-./bh_h.6E62D5BA_591A_4726_9481_51EFE172338D
-./Include/BiDiSpl.h
-./BiDiSpl_h.A32E93E6_42D6_4FEF_8BAA_35F5342C6766
-./Include/Bits.h
-./Bits_h.38FE3DC3_1B9B_4A74_8B1F_0E2C50E81E0A
-./Include/Bits.Idl
-./Bits_Idl.B66000E9_D43D_4A0F_841A_548EFB26C871
-./Include/bits1_5.h
-./bits1_5_h.0C11566B_EBDB_4BBC_AAD8_124E22BDCFC6
-./Include/bits1_5.idl
-./bits1_5_idl.DDD3DBD3_0815_4560_9601_941B7BA90639
-./Include/bits2_0.h
-./bits2_0_h.1AC6E790_EB8C_4BFD_8749_DE498C142D5C
-./Include/bits2_0.idl
-./bits2_0_idl.1AC6E790_EB8C_4BFD_8749_DE498C142D5C
-./Include/bitscfg.h
-./bitscfg_h.5C397435_31A9_42C9_88D9_E3438C0598E3
-./Include/bitscfg.idl
-./bitscfg_idl.5F0E23B1_C205_42BF_8D6C_5A10CC6DDE11
-./Include/BitsMsg.h
-./BitsMsg_h.AA612384_2865_4D9F_A25B_6B14B4F06F5A
-./Include/BkOffice.Mak
-./BkOffice_Mak.E29A1BED_E8F7_4A11_8B8C_7D6CE970FF49
-./Include/BLBErr.h
-./BLBErr_h.748DBD53_53DF_4F7C_9BCC_A6A28A77F100
-./Include/BluetoothAPIs.h
-./BluetoothAPIs_h.251FFCE3_D561_4089_9F89_E9DEB07FA35B
-./Include/bthdef.h
-./bthdef_h.251FFCE3_D561_4089_9F89_E9DEB07FA35B
-./Include/bthsdpdef.h
-./bthsdpdef_h.251FFCE3_D561_4089_9F89_E9DEB07FA35B
-./Include/CallConv.Inc
-./CallConv_Inc.50DC665B_7661_43EF_A412_713EDA76C50D
-./Include/callobj.h
-./callobj_h.81575195_D03D_4C77_B2A5_88809E639749
-./Include/callobj.idl
-./callobj_idl.BC864B1C_37C9_4317_A0DF_704A8614591A
-./Include/CChannel.h
-./CChannel_h.AF4420AF_53CB_4117_BD3F_ACEB242A5DF8
-./Include/CdErr.h
-./CdErr_h.BDF396CA_857B_43C6_B486_C70F1649E63A
-./Include/cdoex.h
-./cdoex_h.66C2F019_CC0B_4865_B24D_51249EA1B656
-./Include/cdoex.idl
-./cdoex_idl.FDFFFF19_27DB_4D71_8390_64B9FD4658A6
-./Include/cdoexerr.h
-./cdoexerr_h.35149B53_DB9F_401F_901D_D0E837E2B094
-./Include/cdoexm.h
-./cdoexm_h.ABF509B7_DA26_4625_B3C3_CAA6A76A162C
-./Include/cdoexm_i.c
-./cdoexm_i_c.7FE08415_E6DE_42B5_8D27_E422A6B0AA6F
-./Include/cdoexstr.h
-./cdoexstr_h.91D71AAC_9721_470E_9796_A1A598B54C63
-./Include/cdoex_i.c
-./cdoex_i_c.C29147E1_1A1C_4E9B_B529_5437A7B4CD56
-./Include/CDONTS.h
-./CDONTS_h.7FAC7AD7_8CDE_4B7D_AF16_F23D62863624
-./Include/CDOSys.h
-./CDOSys_h.7FAC7AD7_8CDE_4B7D_AF16_F23D62863624
-./Include/CDOSys.Idl
-./CDOSys_Idl.E4810F38_2776_4595_A8B0_CF2BE548F9E7
-./Include/CDOSysErr.h
-./CDOSysErr_h.F545547C_5388_4D03_9924_425F268541A0
-./Include/CDOSysStr.h
-./CDOSysStr_h.C1C2707F_7C12_49F2_8363_9426165AC903
-./Include/CDOSys_I.c
-./CDOSys_I_c.E011D811_6E86_4E0B_9C9D_EC321DA60B7A
-./Include/CeLib.h
-./CeLib_h.BF33529F_640F_418A_BD7F_D97E279A3022
-./Include/CertAdm.h
-./CertAdm_h.DE658157_530C_4C92_A8FB_81B15C43CA15
-./Include/CertAdm.Idl
-./CertAdm_Idl.9A35D345_5BA4_452A_8554_666419AE9650
-./Include/CertBase.h
-./CertBase_h.6CD79AE2_99C3_4194_8F19_FC5A4BD10518
-./Include/CertBase.Idl
-./CertBase_Idl.6CD79AE2_99C3_4194_8F19_FC5A4BD10518
-./Include/CertBCli.h
-./CertBCli_h.B73CE375_4743_4887_86A1_5009EB76DD29
-./Include/CertBCli.Idl
-./CertBCli_Idl.B73CE375_4743_4887_86A1_5009EB76DD29
-./Include/CertCli.h
-./CertCli_h.AF5220AB_1C02_4326_8EDB_83DDCF6B345E
-./Include/CertCli.Idl
-./CertCli_Idl.9A35D345_5BA4_452A_8554_666419AE9650
-./Include/CertEnc.h
-./CertEnc_h.1D368E03_F1BF_4FB2_B8BE_2AB9E124BB55
-./Include/CertEnc.Idl
-./CertEnc_Idl.1D368E03_F1BF_4FB2_B8BE_2AB9E124BB55
-./Include/CertExit.h
-./CertExit_h.C98FFC39_4968_482D_83C5_6269EB911606
-./Include/CertExit.Idl
-./CertExit_Idl.C98FFC39_4968_482D_83C5_6269EB911606
-./Include/Certif.h
-./Certif_h.B1B74C7D_6C2A_4E1D_9B34_4265597BDF75
-./Include/Certif.Idl
-./Certif_Idl.9A35D345_5BA4_452A_8554_666419AE9650
-./Include/CertMod.h
-./CertMod_h.6994DF03_FC8B_4345_9DB2_400DED502994
-./Include/CertMod.Idl
-./CertMod_Idl.10D15A39_625C_47E9_BC3A_5FA003AE6471
-./Include/CertPol.h
-./CertPol_h.4CA134F6_2967_419C_BF23_3E4D45756DDE
-./Include/CertPol.Idl
-./CertPol_Idl.4CA134F6_2967_419C_BF23_3E4D45756DDE
-./Include/certreqd.h
-./certreqd_h.7C785865_8F88_45E8_9CDF_5744438F1A04
-./Include/CertSrv.h
-./CertSrv_h.35E403A5_1F41_46BE_8651_2EE32127B7EE
-./Include/CertView.h
-./CertView_h.10D15A39_625C_47E9_BC3A_5FA003AE6471
-./Include/CertView.Idl
-./CertView_Idl.9A35D345_5BA4_452A_8554_666419AE9650
-./Include/cfg.h
-./cfg_h.6D177ECF_6966_48F7_BF90_60DA51FF93EB
-./Include/cfgmgr32.h
-./cfgmgr32_h.96AB8B90_C407_4DD9_AAF3_49CB15ABEF54
-./Include/CGuid.h
-./CGuid_h.B11D5DDA_B206_4CFB_B930_39DDB2186DC1
-./Include/ChanMgr.h
-./ChanMgr_h.D0336E77_7598_4728_B2F2_F172C7A35410
-./Include/ChanMgr.Idl
-./ChanMgr_Idl.4A07A09C_A62B_4948_90AE_CB63114024DA
-./Include/ChPtrArr.h
-./ChPtrArr_h.5A956DC1_AD53_4E1C_8955_09F2065A0C1D
-./Include/ChStrArr.h
-./ChStrArr_h.0E43AAC1_3B07_410E_9D06_D8BD52F9C085
-./Include/ChString.h
-./ChString_h.36BB5ED2_5861_4C60_AE2C_F25346905ADD
-./Include/CiError.h
-./CiError_h.1E7C36C3_CD4D_4422_905A_373F3935408B
-./Include/clfs.h
-./clfs_h.6025AE55_D8FA_49EF_A0DE_02B180F6AD60
-./Include/clfslsn.h
-./clfslsn_h.2D14DFD6_E8C7_43D3_B9D5_AC20CB11E57A
-./Include/clfsmgmt.h
-./clfsmgmt_h.FA402A46_9DEA_49BD_A672_87F26921C9A9
-./Include/clfsmgmtw32.h
-./clfsmgmtw32_h.CCF73BCC_8AB6_43A1_944F_DE4C36B0662D
-./Include/clfsw32.h
-./clfsw32_h.E1417273_37DE_4C2C_A036_0C373948731A
-./Include/CluAdmEx.h
-./CluAdmEx_h.453A91E9_F0DA_4C1C_99D1_30D2F6AABAD4
-./Include/CluAdmEx.Idl
-./CluAdmEx_Idl.687240C7_8046_4D0E_AC29_2139098466AC
-./Include/ClusApi.h
-./ClusApi_h.0B8E58E3_6C63_469F_A52B_A3F2214EC87F
-./Include/ClusCfgGuids.h
-./ClusCfgGuids_h.BED14676_59B5_47B3_B3EE_A65C0D36A5C5
-./Include/ClusCfgServer.h
-./ClusCfgServer_h.F4059DCF_7DFA_4CAE_929D_C931CBE26F2F
-./Include/ClusCfgServer.idl
-./ClusCfgServer_idl.71EC6C4E_8351_45B0_8932_177FB84CE3C8
-./Include/ClusCfgWizard.h
-./ClusCfgWizard_h.015622F7_910E_4969_AD55_6778D8441A08
-./Include/ClusCfgWizard.idl
-./ClusCfgWizard_idl.E2624412_6B1D_48A9_8472_A8E07FD8CE11
-./Include/CmnQuery.h
-./CmnQuery_h.97DF6685_3D05_4004_813B_D92458915E94
-./Include/Codecs.h
-./Codecs_h.89B233FB_EEAF_4CC0_BE0C_0CA2764B2F3C
-./Include/colldispid.h
-./colldispid_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/Color.Dlg
-./Color_Dlg.23F5D34B_CF9E_44A7_9DA9_60D89EC0F57B
-./Include/ColorDlg.h
-./ColorDlg_h.D20C8F87_5BC8_4784_8686_6322927997CC
-./Include/ComAdmin.h
-./ComAdmin_h.42BB4B60_182F_4766_B2D5_7AF3CEA10352
-./Include/ComAdmin.Idl
-./ComAdmin_Idl.28B8E9D4_3FE1_4F3B_AA4F_719B2CF28F7B
-./Include/ComCat.h
-./ComCat_h.97DF6685_3D05_4004_813B_D92458915E94
-./Include/ComCat.Idl
-./ComCat_Idl.0C2F9D6D_6AB1_4823_B992_F4C4BA4A254D
-./Include/ComDef.h
-./ComDef_h.7A95C8DF_F7D6_463E_A0B3_E2A9819E0217
-./Include/comlite.h
-./comlite_h.74CB6FF7_A400_4318_8030_05057C459B8A
-./Include/CommCtrl.h
-./CommCtrl_h.1AF8B6E6_AD99_426A_BA80_967CDD65A12B
-./Include/CommCtrl.rh
-./CommCtrl_rh.49A6AE50_91D9_419E_A370_A4389726D826
-./Include/CommDlg.h
-./CommDlg_h.1CE30A10_73F7_4C67_AAE2_6C0345D8C051
-./Include/common.ver
-./common_ver.7849A3D7_21E8_4E0B_B7A2_E7A37777D290
-./Include/commoncontrols.h
-./commoncontrols_h.5DD52765_925F_48F7_82D0_F19A88F211CA
-./Include/commoncontrols.idl
-./commoncontrols_idl.3D4047C5_DC12_410C_B7D8_F2A6C7A8205F
-./Include/CompObj.h
-./CompObj_h.23FA55CB_560F_471A_B758_94F10C80272A
-./Include/ComSvcs.h
-./ComSvcs_h.E3DF77DE_BB65_47E5_9B59_115EA3C7DB18
-./Include/ConfPriv.h
-./ConfPriv_h.8001213C_88BF_4A68_9DAB_092C722C5C6A
-./Include/ConfPriv.Idl
-./ConfPriv_Idl.E20307C8_6363_4826_BED9_2682B85C860B
-./Include/control.h
-./control_h.3AADE802_E842_41DB_8CC2_A5515534B320
-./Include/control.odl
-./control_odl.1BC3AAE9_2D86_4312_B789_936E43798D11
-./Include/CorReg.h
-./CorReg_h.6E3AE19D_6EB9_46E4_8E68_CBF394F5110D
-./Include/Cpl.h
-./Cpl_h.19EEB4BB_5A5D_40A2_846B_08F06F6AD75F
-./Include/Cplext.h
-./Cplext_h.171A64E3_30C2_417A_94D5_2A010124A145
-./Include/crt/algorithm
-./algorithm.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/assert.h
-./assert_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/bitset
-./bitset.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/cassert
-./cassert.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/cctype
-./cctype.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/cerrno
-./cerrno.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/cfloat
-./cfloat.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/ciso646
-./ciso646.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/climits
-./climits.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/clocale
-./clocale.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/cmath
-./cmath.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/comdef.h
-./ComDef_h.7A95C8DF_F7D6_463E_A0B3_E2A9819E0217
-./Include/crt/comdefsp.h
-./comdefsp_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/comip.h
-./comip_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/complex
-./complex.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/comutil.h
-./comutil_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/conio.h
-./conio_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/crtdbg.h
-./crtdbg_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/csetjmp
-./csetjmp.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/csignal
-./csignal.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/cstdarg
-./cstdarg.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/cstddef
-./cstddef.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/cstdio
-./cstdio.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/cstdlib
-./cstdlib.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/cstring
-./cstring.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/ctime
-./ctime.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/ctype.h
-./ctype_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/cwchar
-./cwchar.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/cwctype
-./cwctype.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/delayimp.h
-./delayimp_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/deque
-./deque.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/direct.h
-./direct_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/dos.h
-./dos_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/eh.h
-./eh_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/errno.h
-./errno_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/exception
-./exception.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/excpt.h
-./excpt_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/fcntl.h
-./fcntl_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/float.h
-./float_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/fpieee.h
-./fpieee_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/fstream
-./fstream.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/fstream.h
-./fstream_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/functional
-./functional.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/intsafe.h
-./intsafe_h.A4FE0D2D_0737_4ABD_B36F_FC006847DD46
-./Include/crt/invkprxy.h
-./invkprxy_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/io.h
-./io_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/iomanip
-./iomanip.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/iomanip.h
-./iomanip_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/ios
-./ios.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/ios.h
-./ios_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/iosfwd
-./iosfwd.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/iostream
-./iostream.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/iostream.h
-./iostream_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/iso646.h
-./iso646_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/istream
-./istream.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/istream.h
-./istream_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/iterator
-./iterator.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/limits
-./limits.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/limits.h
-./limits_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/list
-./list.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/locale
-./locale.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/locale.h
-./locale_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/malloc.h
-./malloc_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/map
-./map.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/math.h
-./math_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/mbctype.h
-./mbctype_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/mbstring.h
-./mbstring_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/memory
-./memory.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/memory.h
-./memory_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/minmax.h
-./minmax_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/new
-./new.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/new.h
-./new_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/numeric
-./numeric.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/ostream
-./ostream.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/ostream.h
-./ostream_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/process.h
-./process_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/queue
-./queue.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/rtcapi.h
-./rtcapi_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/search.h
-./search_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/set
-./set.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/setjmp.h
-./setjmp_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/setjmpex.h
-./setjmpex_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/share.h
-./share_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/signal.h
-./signal_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/sstream
-./sstream.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/stack
-./stack.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/stdarg.h
-./stdarg_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/stddef.h
-./stddef_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/stdexcept
-./stdexcept.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/stdexcpt.h
-./stdexcpt_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/stdio.h
-./stdio_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/stdiostr.h
-./stdiostr_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/stdlib.h
-./stdlib_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/stl.h
-./stl_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/streamb.h
-./streamb_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/streambuf
-./streambuf.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/string
-./string.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/string.h
-./string_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/strstrea.h
-./strstrea_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/strstream
-./strstream.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/sys/locking.h
-./locking_h.4745DFC2_11B4_49A1_8703_DFC969120BF0
-./Include/crt/sys/stat.h
-./stat_h.4745DFC2_11B4_49A1_8703_DFC969120BF0
-./Include/crt/sys/timeb.h
-./timeb_h.4745DFC2_11B4_49A1_8703_DFC969120BF0
-./Include/crt/sys/types.h
-./types_h.4745DFC2_11B4_49A1_8703_DFC969120BF0
-./Include/crt/sys/utime.h
-./utime_h.4745DFC2_11B4_49A1_8703_DFC969120BF0
-./Include/crt/tchar.h
-./tchar_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/time.h
-./time_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/typeinfo
-./typeinfo.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/typeinfo.h
-./typeinfo_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/useoldio.h
-./useoldio_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/use_ansi.h
-./use_ansi_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/utility
-./utility.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/valarray
-./valarray.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/varargs.h
-./varargs_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/vector
-./vector.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/wchar.h
-./wchar_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/wctype.h
-./wctype_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/xcomplex
-./xcomplex.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/xiosbase
-./xiosbase.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/xlocale
-./xlocale.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/xlocinfo
-./xlocinfo.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/xlocinfo.h
-./xlocinfo_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/xlocmon
-./xlocmon.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/xlocnum
-./xlocnum.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/xloctime
-./xloctime.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/xmath.h
-./xmath_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/xmemory
-./xmemory.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/xstddef
-./xstddef.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/xstring
-./xstring.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/xtree
-./xtree.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/xutility
-./xutility.FA1E7979_9AA4_469A_A337_D07412B7A30E
-./Include/crt/ymath.h
-./ymath_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/crt/yvals.h
-./yvals_h.BBD43D5A_6D5C_4770_88B9_A42253FB9B6B
-./Include/cryptdlg.h
-./cryptdlg_h.C1857A54_866B_4CCA_A04E_15815AB4E068
-./Include/cryptuiapi.h
-./cryptuiapi_h.DF42666A_717C_40EA_9CF0_502FE3FD434B
-./Include/ctffunc.h
-./ctffunc_h.0353DC33_163F_4E55_B51B_6918416A4A9A
-./Include/ctffunc.idl
-./ctffunc_idl.393934F0_B9A3_44B3_A7D8_092D97C3975C
-./Include/ctfspui.h
-./ctfspui_h.7B183C4E_90A3_4F54_A88A_A8D091C49A4F
-./Include/ctfspui.idl
-./ctfspui_idl.B8DEB2CE_562E_43A3_8639_602E4DD0ECE6
-./Include/ctfutb.h
-./ctfutb_h.F566A70C_179B_431C_BD29_B6ECCC042771
-./Include/ctfutb.idl
-./ctfutb_idl.E160B7E9_63F8_4CE3_930D_422C2169E725
-./Include/ctxtcall.h
-./ctxtcall_h.AF308CB8_0DE8_46FA_9D55_04D8CE09DA9F
-./Include/ctxtcall.idl
-./ctxtcall_idl.0D908BC8_818D_43B9_A39D_922283C88531
-./Include/CustCntl.h
-./CustCntl_h.7B2060B8_526C_494D_8812_8451F3B1277F
-./Include/CustomAw.h
-./CustomAw_h.EDB9E4CD_A974_443F_B07C_198A8CF294D9
-./Include/daogetrw.h
-./daogetrw_h.A65BA029_6C32_4B4B_94EF_42AF8A583680
-./Include/datacontainer.h
-./datacontainer_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/datacontainer.idl
-./datacontainer_idl.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/datacontainerversion.h
-./datacontainerversion_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/datacontainerversion.idl
-./datacontainerversion_idl.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/DataPath.h
-./DataPath_h.54BDE3E0_A585_42D5_9495_8479D329B1A8
-./Include/dbdao.h
-./dbdao_h.FBA2846C_BAF4_447B_A4B3_F2856932DBF8
-./Include/dbdaoerr.h
-./dbdaoerr_h.808462A6_CAA4_41A4_AAC3_333CC3A537D3
-./Include/dbdaoid.h
-./dbdaoid_h.23E4CBEA_ECBF_453F_8D22_81A4DCE5912E
-./Include/dbdaoint.h
-./dbdaoint_h.D9ECD37E_85ED_436F_9304_18145E04F556
-./Include/DbgEng.h
-./DbgEng_h.86B270F8_317A_4C9A_8F67_A523BB57CB24
-./Include/DbgHelp.h
-./DbgHelp_h.482E6DE5_DE13_471D_8930_BCAFCFC37973
-./Include/DbgProp.h
-./DbgProp_h.5B58ABAE_F131_49B2_99C5_C56A6F6AC62D
-./Include/dbnetlib.h
-./dbnetlib_h.77A1B96D_E801_4006_9543_BB4095AFC6E4
-./Include/Dbt.h
-./Dbt_h.407E7C22_7CF4_4BBA_8F51_CC585B9D0F53
-./Include/dciddi.h
-./dciddi_h.99EDFB94_6508_46A9_A30A_2690B509D0A6
-./Include/dciman.h
-./dciman_h.96AB8B90_C407_4DD9_AAF3_49CB15ABEF54
-./Include/Dde.h
-./Dde_h.D9888C43_F027_41AA_B559_C2A1B4AE1213
-./Include/Dde.rh
-./Dde_rh.64DE7C63_CBE5_4781_AF8A_681B0962F028
-./Include/Ddeml.h
-./Ddeml_h.E68360DB_171F_4B10_898C_2C961F7210CA
-./Include/ddrawgdi.h
-./ddrawgdi_h.794E3F3B_ADEA_4201_9318_AD5F21DC9FA7
-./Include/ddstream.h
-./ddstream_h.76B1C4FC_C1A4_4264_A218_B1BE31FE45F1
-./Include/ddstream.idl
-./ddstream_idl.4D597DF5_4DDF_4CA7_BEEA_C260C4EC9382
-./Include/devenum.idl
-./devenum_idl.25DF5899_4B44_4BBC_B0AC_88CFBC008F34
-./Include/devguid.h
-./devguid_h.B4A76EC7_D754_4ADA_A04A_8458FD280CE4
-./Include/DhcpCSdk.h
-./DhcpCSdk_h.B12AD7F5_702F_4464_9994_85F7A5B506EF
-./Include/dhcpsapi.h
-./dhcpsapi_h.B3C23C22_15CC_48CE_BFD7_9D35187BBE48
-./Include/DhcpSSdk.h
-./DhcpSSdk_h.C2CE4C88_40FC_401A_BBD4_C85CFDE0CAAF
-./Include/DHtmldid.h
-./DHtmldid_h.88DEFDE2_EA2D_45A9_AA02_C9687EF61D83
-./Include/DHtmled.h
-./DHtmled_h.88DEFDE2_EA2D_45A9_AA02_C9687EF61D83
-./Include/DHtmled.idl
-./DHtmled_idl.88DEFDE2_EA2D_45A9_AA02_C9687EF61D83
-./Include/DHtmled.js
-./DHtmled_js.88DEFDE2_EA2D_45A9_AA02_C9687EF61D83
-./Include/DHtmled.vbs
-./DHtmled_vbs.88DEFDE2_EA2D_45A9_AA02_C9687EF61D83
-./Include/DHtmliid.h
-./DHtmliid_h.88DEFDE2_EA2D_45A9_AA02_C9687EF61D83
-./Include/Digitalv.h
-./Digitalv_h.74772540_8AC3_4055_878E_5FD4307BA5C5
-./Include/Dimm.h
-./Dimm_h.A873C499_7702_4E9D_BC2A_5EE6AD156C1D
-./Include/Dimm.Idl
-./Dimm_Idl.2E74A03E_B39B_42B8_B7A2_CB6A7A0DF521
-./Include/Disable.Mak
-./Disable_Mak.DC7448AA_658C_425C_B6F5_AC2308E8E734
-./Include/diskguid.h
-./diskguid_h.54839F83_B760_434A_96C7_317CDCA6AB2C
-./Include/Dispatch.h
-./Dispatch_h.6A4D571E_0B8A_49C2_AC64_E821F55314F2
-./Include/Dispdib.h
-./Dispdib_h.F3E01C12_53E0_4F19_9A52_79A43AC34A58
-./Include/DispEx.h
-./DispEx_h.5B58ABAE_F131_49B2_99C5_C56A6F6AC62D
-./Include/Dispex.Idl
-./Dispex_Idl.0338CDDE_2215_4463_9145_5B1F2BD989ED
-./Include/DlcAPI.h
-./DlcAPI_h.14743CAC_1B72_453B_AB57_C02B464344B8
-./Include/Dlgs.h
-./Dlgs_h.FFA23255_A25C_442B_BAEF_817DF31A7283
-./Include/dmo.h
-./dmo_h.D6FA1D0E_F7B0_437F_85CD_6A78F21AE922
-./Include/dmodshow.h
-./dmodshow_h.3D03BE95_B18D_401C_8797_45ED8CE22BEB
-./Include/dmodshow.idl
-./dmodshow_idl.D39A4020_9641_4B8D_9D6A_B483148DDB31
-./Include/dmoimpl.h
-./dmoimpl_h.62604B02_2B1B_4F3D_A05E_1F6E15C1133B
-./Include/dmoreg.h
-./dmoreg_h.BB3EE4B7_71F9_4A8A_AF2E_2ECED4ACF74A
-./Include/dmort.h
-./dmort_h.336664A7_DBFD_4580_9AC7_62C7332505B4
-./Include/DocObj.h
-./DocObj_h.84C315F1_276B_4F57_AE21_774FB1F57EEF
-./Include/DocObj.Idl
-./DocObj_Idl.95AC5012_AFA7_45FC_A796_C396F1B49EB4
-./Include/Dom.Idl
-./Dom_Idl.88DEFDE2_EA2D_45A9_AA02_C9687EF61D83
-./Include/DomDid.h
-./DomDid_h.57535F0A_681A_4C61_8771_30A573AEB76D
-./Include/dpnathlp.h
-./dpnathlp_h.E75787FA_F2FF_4D58_87B1_35511CEEDD3A
-./Include/drivinit.h
-./drivinit_h.F5C8460F_6ACA_48C9_8D1F_81892C5BCF74
-./Include/DSAdmin.h
-./DSAdmin_h.6B3FDEB1_8A2F_46D2_9A45_2CA08E1C2F30
-./Include/DSClient.h
-./DSClient_h.6A31F8C9_EC6C_4343_9CA0_A56CFA2AF806
-./Include/DsGetDC.h
-./DsGetDC_h.6F2A6C1B_497D_4269_BFCA_70F085E638AF
-./Include/DShow.h
-./DShow_h.ADC94608_FF9F_4CE4_B31D_417DBD77BF20
-./Include/DskQuota.h
-./DskQuota_h.AC15ADCA_6175_45F1_B3E5_4D0B4686A111
-./Include/DSQuery.h
-./DSQuery_h.6B3FDEB1_8A2F_46D2_9A45_2CA08E1C2F30
-./Include/DSRole.h
-./DSRole_h.85A4CF4B_7F48_46BB_9021_88B38652006C
-./Include/dssec.h
-./dssec_h.2304A866_C4B0_4050_8BC7_73D9AA8FD72F
-./Include/DtcHelp.h
-./DtcHelp_h.F21385FC_CA28_495C_A0F9_0761F974B7AB
-./Include/dv.h
-./dv_h.1EED9F3C_3F52_4053_9F76_FD47E6472AF8
-./Include/dvdevcod.h
-./dvdevcod_h.2ABB18E1_AA5A_4B13_9E36_C7E92884353F
-./Include/dvdif.idl
-./dvdif_idl.9C43C88B_B645_4531_A79B_67A7FE44E19A
-./Include/dvdmedia.h
-./dvdmedia_h.C765861C_458F_4B48_A45C_9575B5B060BF
-./Include/dvec.h
-./dvec_h.724EB65B_B14C_48B4_928C_AB87224D2F09
-./Include/DvObj.h
-./DvObj_h.A171027E_3696_4451_AC91_BDA14AE0E789
-./Include/dxtmpl.h
-./dxtmpl_h.DF55D2E8_3096_44BE_80F8_85326449CD65
-./Include/dxva.h
-./dxva_h.37E3FA6F_8235_4054_9FA2_2FEC5D45CE0B
-./Include/dyngraph.idl
-./dyngraph_idl.2C42A90D_1DD3_4E91_AED5_98FCDC75816F
-./Include/edevctrl.h
-./edevctrl_h.F06789AA_E654_4BFE_9D07_89356E351D4D
-./Include/edevdefs.h
-./edevdefs_h.25F94F59_F005_46AD_8EEB_0C8B16A36F6E
-./Include/emmintrin.h
-./emmintrin_h.51539243_210B_46C4_B0B3_3892362B45B3
-./Include/emostore.h
-./emostore_h.7CE0A274_D563_445E_8F22_E38184B90CA9
-./Include/emostore_i.c
-./emostore_i_c.020A3B76_0757_4E0A_8199_64DFC8AEE40E
-./Include/EmptyVC.h
-./EmptyVC_h.3BABB554_C195_4C75_83A4_61ADFEBDF534
-./Include/emptyvc.idl
-./emptyvc_idl.743FF8A6_5B46_4889_B59C_24E9DDAE07E9
-./Include/Error.h
-./Error_h.24B60C5A_298A_4F42_8C6F_494BF0EA1A36
-./Include/ErrorRep.h
-./ErrorRep_h.B91F3786_592D_41AE_B89A_5F7448D06AA6
-./Include/errors.h
-./errors_h.106EE975_0E24_47EA_9065_DA2CEBE210F7
-./Include/esebcli2.h
-./esebcli2_h.2FB03083_E0CF_4E5B_A6A7_B27B8510114A
-./Include/esebkmsg.h
-./esebkmsg_h.2C0D4ABC_F67F_4F29_BB80_648AA5428288
-./Include/esent.h
-./esent_h.9BFCE0A1_6F00_43FC_B192_CEF7D1093283
-./Include/evcode.h
-./evcode_h.A14157EA_1D05_4749_9DEB_BCD2894FA9FE
-./Include/event.h
-./event_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/event.idl
-./event_idl.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/EventSys.h
-./EventSys_h.F06BA2E9_9079_4346_9DFA_F78791079DA8
-./Include/EventSys.Idl
-./EventSys_Idl.993E4C7B_4675_405B_A007_2390500343B0
-./Include/Evntrace.h
-./Evntrace_h.8DF9A186_6341_41C3_BF06_2D4751F9A06E
-./Include/ExchForm.h
-./ExchForm_h.2D9A3CB8_154A_4D24_8E37_DC89835AC580
-./Include/ExDisp.h
-./ExDisp_h.3DB00592_5DC6_4511_BB5F_45B027CE8B28
-./Include/ExDisp.Idl
-./ExDisp_Idl.8315521C_4001_4827_9BB5_094232BEC12F
-./Include/ExDispid.h
-./ExDispid_h.5C06784F_B393_4A7E_B46B_52AF9A6E51A0
-./Include/exevtsnk.idl
-./exevtsnk_idl.04D54D16_ECC6_4CDC_8CD7_AADE22B2071B
-./Include/exposeenums2managed.h
-./exposeenums2managed_h.F193C4A8_FF9F_4463_BCF4_1E085D9D96F2
-./Include/fastcall.h
-./fastcall_h.B21C0F7B_5CC7_4B31_9AE1_21675A3B8B27
-./Include/FaxCom.h
-./FaxCom_h.DBF961BC_0B5F_4072_9F3E_47651B87084A
-./Include/FaxComEx.h
-./FaxComEx_h.A33DE35D_F214_44BA_A8A8_9411CC5544DF
-./Include/FaxComEx_i.c
-./FaxComEx_i_c.4A95BE30_A1D6_4C00_8CCE_7634DABE3D2B
-./Include/FaxCom_i.c
-./FaxCom_i_c.FD1968AE_E9C5_4C33_B81E_5F465D9CBF27
-./Include/FaxDev.h
-./FaxDev_h.0E333E22_2313_4CE1_BCFD_519493119917
-./Include/FaxExt.h
-./FaxExt_h.46D6D8C4_877C_447E_BD22_7860A7D7FB8C
-./Include/FaxMmc.h
-./FaxMmc_h.D3C23646_658A_491A_9A2D_237E58C07AEF
-./Include/FaxRoute.h
-./FaxRoute_h.A22BE1AD_D6D8_4118_B664_FA82798E737C
-./Include/Fci.h
-./Fci_h.4BA634A2_C8D4_4392_8458_544072DD7308
-./Include/Fdi.h
-./Fdi_h.17C48691_29F7_41FB_9A10_6C2136103CE3
-./Include/FileOpen.Dlg
-./FileOpen_Dlg.E713618B_EC27_4D1B_8A43_BDB080829B91
-./Include/Filter.h
-./Filter_h.45027A60_7975_434B_85C8_07B2BB4ED5C2
-./Include/Filterr.h
-./Filterr_h.0C0DDDEB_1814_4796_91E7_E5D912C1AD6D
-./Include/FindText.Dlg
-./FindText_Dlg.51063EC1_94FE_4937_81D2_D29ED3D268C1
-./Include/fltdefs.h
-./fltdefs_h.46FF9DD2_B7E8_4E25_903E_024E4B52B06A
-./Include/Font.Dlg
-./Font_Dlg.93FF2691_B0E0_4EEF_BDDB_DE7E094E80E9
-./Include/FrQuery.h
-./FrQuery_h.D42EEFFA_FB76_4026_8892_02D825D18412
-./Include/FtsIface.h
-./FtsIface_h.3DB4D9DD_32AF_40DD_8CFA_D45E9458AA32
-./Include/fvec.h
-./fvec_h.1AEF7331_0BEB_4C8B_B5D6_A00DE662B130
-./Include/FwCommon.h
-./FwCommon_h.B407CF17_89DD_49D3_BF63_A69A84226CAE
-./Include/gb18030.h
-./gb18030_h.08429FE3_8882_453F_9473_C6267491E2F0
-./Include/GdiPlus.h
-./GdiPlus_h.B8F96192_D70F_446D_BAA5_4832C4E14C7A
-./Include/GdiPlusBase.h
-./GdiPlusBase_h.DC2D43E9_29F9_42F1_AF16_00973182B3A4
-./Include/GdiPlusBitmap.h
-./GdiPlusBitmap_h.166410C0_4438_4678_AD3C_174C6D2AA519
-./Include/GdiPlusBrush.h
-./GdiPlusBrush_h.271F0923_EE61_49DB_B481_7B2D0B3C74EB
-./Include/GdiPlusCachedBitmap.h
-./GdiPlusCachedBitmap_h.56D0F3A2_13AF_4F65_B3FE_90520D17F6A9
-./Include/GdiPlusColor.h
-./GdiPlusColor_h.1385D438_717C_4FA8_B5D3_0E61E0DF8D70
-./Include/GdiPlusColorMatrix.h
-./GdiPlusColorMatrix_h.26685DFF_A21F_4EBF_87A1_67EE09FA1CFF
-./Include/GdiPlusEnums.h
-./GdiPlusEnums_h.5EF6F66F_D797_475E_B8EF_FD49CDD87D48
-./Include/GdiPlusFlat.h
-./GdiPlusFlat_h.5AC5B03F_2628_4930_BA72_E632CAD37FEB
-./Include/GdiPlusFont.h
-./GdiPlusFont_h.71E72F73_43E2_4153_AF02_0B725DB173C3
-./Include/GdiPlusFontCollection.h
-./GdiPlusFontCollection_h.19F67CFA_48C2_4A02_8C86_D5225FDA2D88
-./Include/GdiPlusFontFamily.h
-./GdiPlusFontFamily_h.17D7CCAF_B2B6_4E3B_ABD8_2B5501800007
-./Include/GdiPlusGpStubs.h
-./GdiPlusGpStubs_h.935640B5_297F_49FE_9302_AE4A3711F2D8
-./Include/GdiPlusGraphics.h
-./GdiPlusGraphics_h.A41E2EE5_5ECA_486B_83C7_B16076943A65
-./Include/GdiPlusHeaders.h
-./GdiPlusHeaders_h.E1678F21_7792_46AD_9F58_2BA3DB444767
-./Include/GdiPlusimageAttributes.h
-./GdiPlusimageAttributes_h.D5B6243B_1212_4084_B252_07CB86950C72
-./Include/GdiPlusImageCodec.h
-./GdiPlusImageCodec_h.9635A95E_2775_4977_B3F6_4EE30BE74137
-./Include/GdiPlusImaging.h
-./GdiPlusImaging_h.A5106C5A_BDDA_4F3A_A308_569960DB6C80
-./Include/GdiPlusInit.h
-./GdiPlusInit_h.FA34DFDA_AD3A_4893_958E_FFFF102531A0
-./Include/GdiPlusLineCaps.h
-./GdiPlusLineCaps_h.79EFE096_ADA9_4D60_9DC2_4AAF5009FFC7
-./Include/GdiPlusMatrix.h
-./GdiPlusMatrix_h.AA8965B1_7AB3_4148_AAEC_626DD6115796
-./Include/GdiPlusMem.h
-./GdiPlusMem_h.D783F1D7_3798_40A2_9AD3_E28DB2651882
-./Include/GdiPlusMetaFile.h
-./GdiPlusMetaFile_h.03D37A2E_A4E4_40C6_ADCD_D35B883EE449
-./Include/GdiPlusMetaHeader.h
-./GdiPlusMetaHeader_h.FDAFA155_D681_4CD4_BD15_80C6FC65455D
-./Include/GdiPlusPath.h
-./GdiPlusPath_h.B94A39F8_EC6F_45AF_B496_E4F577667A9B
-./Include/GdiPlusPen.h
-./GdiPlusPen_h.B02E922F_072C_48EE_B4CC_E12339B8DEC4
-./Include/GdiPlusPixelFormats.h
-./GdiPlusPixelFormats_h.B1A789EE_7F15_468C_8BC7_FC5508DD0C6B
-./Include/GdiPlusRegion.h
-./GdiPlusRegion_h.37DE7D1A_222B_43C2_A8B4_38D45D6D87DC
-./Include/GdiPlusStringFormat.h
-./GdiPlusStringFormat_h.5F78047E_2CA8_4F93_A4E4_EE011D19D5D0
-./Include/GdiPlusTypes.h
-./GdiPlusTypes_h.7FC48621_E45D_41D0_A9B6_FA27C3C9022B
-./Include/GenLex.h
-./GenLex_h.8AA20B42_2869_4911_BA73_922DC7F0FC3B
-./Include/gl/GL.h
-./GL_h.1FF3A058_137C_4EE6_A446_4D038EA85229
-./Include/gl/GLAux.h
-./GLAux_h.1FF3A058_137C_4EE6_A446_4D038EA85229
-./Include/gl/GLU.h
-./GLU_h.1FF3A058_137C_4EE6_A446_4D038EA85229
-./Include/GPEdit.h
-./GPEdit_h.C805F61A_70D2_46F8_9187_FCBD467C9817
-./Include/gpmgmt.h
-./gpmgmt_h.8DBCDC8F_CE68_4AC1_AFB5_A0817625AA29
-./Include/gpmgmt.idl
-./gpmgmt_idl.8DBCDC8F_CE68_4AC1_AFB5_A0817625AA29
-./Include/Guiddef.h
-./Guiddef_h.56916BE8_D455_4D49_9DFC_2FEBED0586B5
-./Include/h323priv.h
-./h323priv_h.4133B579_1652_46DC_BB1E_633ADAFF759D
-./Include/HlGuids.h
-./HlGuids_h.7757B55F_1419_4CEF_9138_31454101E25D
-./Include/HlIface.h
-./HlIface_h.8C30A6F6_E93A_48BB_BDE6_0BA489DD7A9D
-./Include/HlIface.Idl
-./HlIface_Idl.3C685DD0_1974_4020_A972_C781D20282D0
-./Include/HLink.h
-./HLink_h.02A7AB86_585E_4F0A_8FE8_31FA312735E1
-./Include/HLink.Idl
-./HLink_Idl.9F841B6E_4F67_4786_BB42_8D247CD4FDB2
-./Include/HostInfo.h
-./HostInfo_h.5B58ABAE_F131_49B2_99C5_C56A6F6AC62D
-./Include/htiface.h
-./htiface_h.BA34196B_93C2_42E8_8BBE_6CB05161A4EE
-./Include/htiface.idl
-./htiface_idl.891F1D76_69BA_4337_BF11_C7C0EF00CB02
-./Include/htiframe.h
-./htiframe_h.0B8BDD86_C8DF_42DD_83CC_7BA6CD369CBE
-./Include/htiframe.idl
-./htiframe_idl.3B144BD7_FB58_4C63_9486_41E50F5B3088
-./Include/HtmlGuid.h
-./HtmlGuid_h.DBADB86E_3193_4996_A649_9C63F68604D4
-./Include/HtmlHelp.h
-./HtmlHelp_h.28765899_CFA3_44F5_9B75_64D8E4B5DF5B
-./Include/http.h
-./http_h.C64B5000_332A_4FE7_9AE6_BD480790DB4A
-./Include/httprequest.idl
-./httprequest_idl.F5133C56_8FC8_41D2_A6F2_D6908874119D
-./Include/httprequestid.h
-./httprequestid_h.FD0D3BEB_2F7A_4D7E_AC23_908826321340
-./Include/ia64reg.h
-./ia64reg_h.17963503_50FB_4B5F_A415_6A2739050599
-./Include/IAccess.h
-./IAccess_h.03671896_1296_484F_A651_EE0A79C83B04
-./Include/IAccess.Idl
-./IAccess_Idl.0F5F57B8_3F2D_4822_972D_88A6C8C8258D
-./Include/Iads.h
-./Iads_h.80D25A52_9746_4A8E_A639_8B90121A9486
-./Include/iapplet.idl
-./iapplet_idl.26E9D96E_40F5_431E_A8C3_D8B584B5BF2B
-./Include/icftypes.h
-./icftypes_h.664AF407_A85E_4A4E_BBEB_11F13E794137
-./Include/icftypes.idl
-./icftypes_idl.664AF407_A85E_4A4E_BBEB_11F13E794137
-./Include/Icm.h
-./Icm_h.DE225CC2_DA5A_460C_B625_500C383AEADA
-./Include/IcmpAPI.h
-./IcmpAPI_h.8FE23ADA_4940_4CDF_B9C7_FBAB37832421
-./Include/Icmui.Dlg
-./Icmui_Dlg.1A9DCDBC_E9A7_43D2_BBBD_090844BA6097
-./Include/icwcfg.h
-./icwcfg_h.E66469DB_2060_4A9C_B17D_0A5CED963A26
-./Include/Idf.h
-./Idf_h.7AB1E9A9_B3DF_4131_AAD3_047CD651B919
-./Include/IDispIds.h
-./IDispIds_h.081284E9_6DD3_47A5_BE9C_39B8405F0C58
-./Include/IEDial.h
-./IEDial_h.E0E74EEA_78C8_4E1D_9312_29BC475BBED7
-./Include/ieverp.h
-./ieverp_h.4CC54C1E_E4B1_4666_B9FD_019B8E71DE66
-./Include/iextag.h
-./iextag_h.AD6E8468_A430_412A_9FE9_EE38B5638120
-./Include/IImgCtx.h
-./IImgCtx_h.469FC0EA_A58A_4CEC_8833_28A7D1FD6DD4
-./Include/il21dec.h
-./il21dec_h.2F684702_9B5B_4EEC_A9F1_3D4A84E88B39
-./Include/ILS.Idl
-./ILS_Idl.157B68EC_CD81_40BA_B808_5D9AE9093736
-./Include/ILSGuid.h
-./ILSGuid_h.23FCAC96_B39B_470B_963A_10A1B2407BB8
-./Include/ImageHlp.h
-./ImageHlp_h.818BD45D_FA07_4BAE_BA34_12912E7A2D93
-./Include/imapi.h
-./imapi_h.DBB40B7E_3A6B_4E85_9622_928A8C5C9FEB
-./Include/imapierror.h
-./imapierror_h.BD197C19_29FA_41C6_8C6A_7E2CA91B2049
-./Include/Ime.h
-./Ime_h.446085C1_7576_4162_80EC_9173E701832E
-./Include/IMessage.h
-./IMessage_h.84F8DE34_2E1D_496C_822D_041F2B0A7607
-./Include/Imm.h
-./Imm_h.AEC0D26D_055B_474B_8EEA_AB4EB231B4D6
-./Include/imnact.idl
-./imnact_idl.A582B9C9_C2B8_485D_9360_845E433BA9DC
-./Include/imnxport.idl
-./imnxport_idl.A582B9C9_C2B8_485D_9360_845E433BA9DC
-./Include/IMSConf2.Idl
-./IMSConf2_Idl.F60C8D16_F0DF_4F51_9366_21E39144E9A6
-./Include/indexsrv.h
-./indexsrv_h.A9BC4940_6127_4886_95CD_39F67E4BF342
-./Include/InetReg.h
-./InetReg_h.E54DA96C_2A33_4D0B_97A9_586210E39E79
-./Include/InetSDK.h
-./InetSDK_h.73B5CC4A_D858_4B83_BF8B_9F4A02B1AEA5
-./Include/InetSDK.Idl
-./InetSDK_Idl.38091F70_26AE_4522_99A9_8A5184C5535D
-./Include/INetSDK.Mak
-./INetSDK_Mak.6AF22B64_993F_4575_AB56_B0609ACF0152
-./Include/InitGuid.h
-./InitGuid_h.1182F75D_EFEE_4B9B_92AD_9242CCD32D88
-./Include/InitOID.h
-./InitOID_h.C978FC92_96AE_42A0_ABE7_5167B9D4A729
-./Include/InputScope.h
-./InputScope_h.63773E93_8D72_4F18_9B0F_11B9F45EEE3D
-./Include/InputScope.idl
-./InputScope_idl.458CE5D3_8E77_48FB_B063_5980E91AC0DB
-./Include/Instance.h
-./Instance_h.0787E551_9AE4_4500_B20A_5B28F5967FED
-./Include/interop_msxml.dll
-./interop_msxml_dll.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/IntShCut.h
-./IntShCut_h.2DA202EB_1D77_456E_A292_EE0479A89696
-./Include/Ioevent.h
-./Ioevent_h.40B04065_9EA0_4CFB_BF2D_7B324DBB9C43
-./Include/IPExport.h
-./IPExport_h.3BAA492A_8171_46A5_A033_5F0004488ADF
-./Include/IPHlpApi.h
-./IPHlpApi_h.46FF9DD2_B7E8_4E25_903E_024E4B52B06A
-./Include/Ipifcons.h
-./Ipifcons_h.00BB28FB_B3F1_4345_B29F_EA5341C9BF95
-./Include/Ipinfoid.h
-./Ipinfoid_h.2B8097BF_911B_4CBC_B191_F6673949EDE7
-./Include/iplgxprt.idl
-./iplgxprt_idl.26E9D96E_40F5_431E_A8C3_D8B584B5BF2B
-./Include/ipmsp.h
-./ipmsp_h.48FC8D7B_1C13_4E78_AA09_30A38AF851D6
-./Include/ipmsp.idl
-./ipmsp_idl.7BA230D6_8692_459A_AE32_080ED771D632
-./Include/Iprtrmib.h
-./Iprtrmib_h.C01F60DD_44F5_4287_AC1A_8A326412D5E6
-./Include/IPTypes.h
-./IPTypes_h.53AB19A4_2F28_48E9_8F8E_CF99739098F5
-./Include/IpxConst.h
-./IpxConst_h.A5CC044E_5308_4B36_9ED3_3740CEDCCAED
-./Include/Ipxrip.h
-./Ipxrip_h.E24E8C47_7C1B_4A95_AA4C_3B36D8915D35
-./Include/Ipxrtdef.h
-./Ipxrtdef_h.EDA447FF_77C1_4671_A5CE_548034B2C016
-./Include/Ipxsap.h
-./Ipxsap_h.5C0A446D_F085_4523_BD2D_2A5D7562F4E7
-./Include/Ipxtfflt.h
-./Ipxtfflt_h.390F009F_D3EB_45BB_A295_E1E916A167D2
-./Include/IsGuids.h
-./IsGuids_h.6D360A38_CC41_4073_B948_B9E72769CDC7
-./Include/IssPer16.h
-./IssPer16_h.AB7EE8DE_85F2_45D5_BA62_337A68444C0F
-./Include/IssPErr.h
-./IssPErr_h.CC08C62E_668D_4353_B3D2_77105A266FD4
-./Include/ivec.h
-./ivec_h.21C4D305_2698_476B_8679_3B8A6FCE88DE
-./Include/iwstdec.h
-./iwstdec_h.D70E26B6_B934_48B1_A8E3_A7E14561011A
-./Include/i_cryptasn1tls.h
-./i_cryptasn1tls_h.CC4996B6_2580_4DDA_8447_A964F4907856
-./Include/Ks.h
-./Ks_h.7BEAA11E_24C3_427F_B14F_ABE3953A6D4E
-./Include/ksamd64.inc
-./ksamd64_inc.63494C76_19BE_4BE6_BDE1_3AF85DBFFEC7
-./Include/KsGuid.h
-./KsGuid_h.066EAD6C_4623_4AD9_B995_D4500C529470
-./Include/KsMedia.h
-./KsMedia_h.F042466B_EA60_4731_A465_69A10DD51485
-./Include/KsProxy.h
-./KsProxy_h.68782797_842B_4ACD_B62B_7F985D93A3C2
-./Include/ksuuids.h
-./ksuuids_h.6ABAE4DB_24B8_40B2_BB70_E3366B6F8A0F
-./Include/kxamd64.inc
-./kxamd64_inc.63494C76_19BE_4BE6_BDE1_3AF85DBFFEC7
-./Include/kxia64.h
-./kxia64_h.757E8D2F_C1C9_4BCC_BDB0_E8A7D60A2659
-./Include/LM.h
-./LM_h.82BA1B10_774B_4610_AAE8_12BD3A5ABE8D
-./Include/LMaccess.h
-./LMaccess_h.5133FF20_6F58_4AAE_B24B_1274F0A934ED
-./Include/LMalert.h
-./LMalert_h.E2C62899_F9FD_4315_80DF_5404C933478E
-./Include/LMAPIbuf.h
-./LMAPIbuf_h.E0E179B8_C0FA_4010_8A87_25F96DCEBA2B
-./Include/LMat.h
-./LMat_h.62D99692_CEC7_4DA8_9A41_B9566516DDFC
-./Include/LMaudit.h
-./LMaudit_h.1BDBDBF3_F55C_4611_9AF9_EFCF9D9969AD
-./Include/LMConfig.h
-./LMConfig_h.5A8E0690_9D88_4246_97EC_709CC7A3910E
-./Include/LMCons.h
-./LMCons_h.1697AF88_99F6_4191_B666_37693CB09186
-./Include/LMDFS.h
-./LMDFS_h.F3AE0998_A58A_4E7A_B05D_260042C07795
-./Include/LMErr.h
-./LMErr_h.CF5FE596_A2CE_4AA3_B09F_6AAA2704E209
-./Include/LMErrlog.h
-./LMErrlog_h.8AB0A004_9793_40C4_BB91_AC79F34E2D23
-./Include/LMJoin.h
-./LMJoin_h.07D8F976_B35B_4460_905E_18F86B2253CD
-./Include/LMMsg.h
-./LMMsg_h.39D1F778_8DA5_436D_84E3_D6E22F51AC6A
-./Include/LMRemUtl.h
-./LMRemUtl_h.7E8FDEE0_DA87_4D9E_86CA_A079F13EEB47
-./Include/LMRepl.h
-./LMRepl_h.3A6747EB_FE07_4C12_A44A_1CBB92A4DEA4
-./Include/LMServer.h
-./LMServer_h.8F3A3014_FA7F_4A93_8DCA_4EA7FE4ADB38
-./Include/LMShare.h
-./LMShare_h.F4407203_4F17_42C7_BE4F_C99293A1F5F0
-./Include/LMSName.h
-./LMSName_h.FBE9A70B_8DDF_44D2_83A2_78CA15BB7EED
-./Include/LMStats.h
-./LMStats_h.2002E682_DFB5_4D84_B501_DDDC4C717E05
-./Include/LMSvc.h
-./LMSvc_h.CE5D5E2B_3089_498C_86D0_5CB563635172
-./Include/LMUse.h
-./LMUse_h.54C17F7C_AA9E_47A0_8D66_5FE6B6ED7B36
-./Include/LMUseFlg.h
-./LMUseFlg_h.362A92A6_726C_4011_88AE_17DA5E33FFC3
-./Include/LMWksta.h
-./LMWksta_h.9D74B0B5_E319_4D23_AB85_125A4310D849
-./Include/LoadPerf.h
-./LoadPerf_h.5856FDE1_FBDF_4E74_BE64_1282C453FE25
-./Include/LpmApi.h
-./LpmApi_h.256B8C43_FA1C_4890_97F5_EFB774DB010C
-./Include/LZExpand.h
-./LZExpand_h.436DF82B_80BE_4B87_B105_6F4C2C8F394D
-./Include/macamd64.inc
-./macamd64_inc.2E9C905D_99ED_4E19_86F8_9F5324C4B44A
-./Include/madcapcl.h
-./madcapcl_h.5133FF20_6F58_4AAE_B24B_1274F0A934ED
-./Include/Make.Inc
-./Make_Inc.55994268_7543_4962_A190_1D36FA6915EE
-./Include/MAPI.h
-./MAPI_h.0339EA7A_7BA7_4854_94E7_865687DC331E
-./Include/MAPICode.h
-./MAPICode_h.D4981EAD_7938_4BBC_9A52_3BE89EDC566D
-./Include/MAPIDbg.h
-./MAPIDbg_h.230DCD2B_2100_4E1F_BAA7_6F9ABF8FC0E3
-./Include/MAPIDefS.h
-./MAPIDefS_h.0534CA0C_CFE6_4D44_94EA_229A4D5AF701
-./Include/MAPIForm.h
-./MAPIForm_h.53EE381D_3AF6_48D4_8111_73F607C91A69
-./Include/MAPIGuid.h
-./MAPIGuid_h.AFAB259E_3CDD_483B_890A_2661873FFC98
-./Include/MAPIHook.h
-./MAPIHook_h.41E401CB_92AE_4533_A677_A5B085B762A8
-./Include/MAPINls.h
-./MAPINls_h.34D85B4B_AF9E_4FEC_B012_9458A55180AB
-./Include/MAPIOID.h
-./MAPIOID_h.2D9028F7_1240_432C_9C1E_BCF4F8134B1B
-./Include/MAPISPI.h
-./MAPISPI_h.946533F8_CABD_4C18_8301_76BD2A566D37
-./Include/MAPITags.h
-./MAPITags_h.51938EEB_7726_4FCE_976B_A2AF567414AC
-./Include/MAPIUtil.h
-./MAPIUtil_h.A676A69E_1AB4_4E83_B768_4CC1FD59DCAA
-./Include/MAPIVal.h
-./MAPIVal_h.C1070DAB_3CEE_444C_B1B7_B25491BEFDFD
-./Include/MAPIWin.h
-./MAPIWin_h.76BD2B88_F65E_43D9_94CC_D3372A02805B
-./Include/MAPIWz.h
-./MAPIWz_h.684C611A_56E9_4178_8D88_FB3D023EDAF0
-./Include/MAPIX.h
-./MAPIX_h.CBB6F12C_FE20_4A6E_B548_7336CC11BC7E
-./Include/MciAvi.h
-./MciAvi_h.3F0A1DE6_69CF_40B5_B498_DBE24ACEB664
-./Include/Mcx.h
-./Mcx_h.FC72E1D9_FD10_4B7F_95FB_0FE3FEE71449
-./Include/mdbrole.hxx
-./mdbrole_hxx.B21C0F7B_5CC7_4B31_9AE1_21675A3B8B27
-./Include/MDhcp.h
-./MDhcp_h.A18AC6F4_8360_4B08_9923_50FB52260EF5
-./Include/mediaerr.h
-./mediaerr_h.1B5767D9_636A_4B76_9652_74DF6397F48E
-./Include/mediaobj.h
-./mediaobj_h.843BA097_797F_4F6E_B8AB_B55E01BF95C5
-./Include/mediaobj.idl
-./mediaobj_idl.67787A44_D051_477C_ADCD_23D69A3418A1
-./Include/medparam.h
-./medparam_h.6945DE81_5F64_4D70_97AC_F827E7771388
-./Include/medparam.idl
-./medparam_idl.D6BD86B7_E451_4463_96DA_CCDF576200AC
-./Include/MergeMod.h
-./MergeMod_h.0D8E1652_B5FD_4D0C_A37D_4E8A7D805964
-./Include/MethodCo.h
-./MethodCo_h.DDA18B35_3F1D_47CF_A71B_2B74DB664D09
-./Include/mfc/AFX.H
-./AFX_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFX.INL
-./AFX_INL.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXBLD_.H
-./AFXBLD__H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXCMN.H
-./AFXCMN_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXCMN.INL
-./AFXCMN_INL.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXCMN2.INL
-./AFXCMN2_INL.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXCOLL.H
-./AFXCOLL_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXCOLL.INL
-./AFXCOLL_INL.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXCOM_.H
-./AFXCOM__H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXCONV.H
-./AFXCONV_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXCTL.H
-./AFXCTL_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXCTL.INL
-./AFXCTL_INL.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXCTL.RC
-./AFXCTL_RC.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXCVIEW.H
-./AFXCVIEW_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXCVIEW.INL
-./AFXCVIEW_INL.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXDAO.H
-./AFXDAO_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXDAO.INL
-./AFXDAO_INL.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXDB.H
-./AFXDB_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXDB.INL
-./AFXDB_INL.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXDB.RC
-./AFXDB_RC.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXDB_.H
-./AFXDB__H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXDD_.H
-./AFXDD__H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXDISP.H
-./AFXDISP_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXDLGS.H
-./AFXDLGS_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXDLGS.INL
-./AFXDLGS_INL.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXDLLX.H
-./AFXDLLX_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXDLL_.H
-./AFXDLL__H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXDOCOB.H
-./AFXDOCOB_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXDTCTL.H
-./AFXDTCTL_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXDTCTL.INL
-./AFXDTCTL_INL.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXEXT.H
-./AFXEXT_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXEXT.INL
-./AFXEXT_INL.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXHELP.HM
-./AFXHELP_HM.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXHTML.H
-./AFXHTML_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXHTML.INL
-./AFXHTML_INL.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXINET.H
-./AFXINET_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXINET.INL
-./AFXINET_INL.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXISAPI.H
-./AFXISAPI_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXISAPI.INL
-./AFXISAPI_INL.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXISAPI.RC
-./AFXISAPI_RC.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXMT.H
-./AFXMT_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXMT.INL
-./AFXMT_INL.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXODLGS.H
-./AFXODLGS_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXOLE.H
-./AFXOLE_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXOLE.INL
-./AFXOLE_INL.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXOLECL.RC
-./AFXOLECL_RC.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXOLEDB.H
-./AFXOLEDB_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXOLESV.RC
-./AFXOLESV_RC.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXPLEX_.H
-./AFXPLEX__H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXPRINT.RC
-./afxprint_rc.2A8B9E91_6C2A_4EAE_9040_B071BE4FCECC
-./Include/mfc/AFXPRIV.H
-./AFXPRIV_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXPRIV2.H
-./AFXPRIV2_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXRES.H
-./AFXRES_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXRES.RC
-./AFXRES_RC.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXRICH.H
-./AFXRICH_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXRICH.INL
-./AFXRICH_INL.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXSOCK.H
-./AFXSOCK_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXSOCK.INL
-./AFXSOCK_INL.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXSTAT_.H
-./AFXSTAT__H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/afxtls_.h
-./afxtls__h.ED6EF61F_3A71_4C7A_9A90_A66246E14285
-./Include/mfc/AFXVER_.H
-./AFXVER__H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXV_CFG.H
-./AFXV_CFG_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXV_CPU.H
-./AFXV_CPU_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXV_DLL.H
-./AFXV_DLL_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXV_W32.H
-./AFXV_W32_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXWIN.H
-./AFXWIN_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXWIN1.INL
-./AFXWIN1_INL.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/AFXWIN2.INL
-./AFXWIN2_INL.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/l.chs/AFXCTL.RC
-./AFXCTL_RC.E3A3A31F_41C6_4271_91C4_F69ABB9DEEDE
-./Include/mfc/l.chs/AFXDB.RC
-./AFXDB_RC.E3A3A31F_41C6_4271_91C4_F69ABB9DEEDE
-./Include/mfc/l.chs/AFXOLECL.RC
-./AFXOLECL_RC.E3A3A31F_41C6_4271_91C4_F69ABB9DEEDE
-./Include/mfc/l.chs/AFXOLESV.RC
-./AFXOLESV_RC.E3A3A31F_41C6_4271_91C4_F69ABB9DEEDE
-./Include/mfc/l.chs/AFXPRINT.RC
-./AFXPRINT_RC.E3A3A31F_41C6_4271_91C4_F69ABB9DEEDE
-./Include/mfc/l.chs/AFXRES.RC
-./AFXRES_RC.E3A3A31F_41C6_4271_91C4_F69ABB9DEEDE
-./Include/mfc/l.cht/AFXCTL.RC
-./AFXCTL_RC.3C814369_7F63_4D0F_9DFC_9E4243A39B6D
-./Include/mfc/l.cht/AFXDB.RC
-./AFXDB_RC.3C814369_7F63_4D0F_9DFC_9E4243A39B6D
-./Include/mfc/l.cht/AFXOLECL.RC
-./AFXOLECL_RC.3C814369_7F63_4D0F_9DFC_9E4243A39B6D
-./Include/mfc/l.cht/AFXOLESV.RC
-./AFXOLESV_RC.3C814369_7F63_4D0F_9DFC_9E4243A39B6D
-./Include/mfc/l.cht/AFXPRINT.RC
-./AFXPRINT_RC.3C814369_7F63_4D0F_9DFC_9E4243A39B6D
-./Include/mfc/l.cht/AFXRES.RC
-./AFXRES_RC.3C814369_7F63_4D0F_9DFC_9E4243A39B6D
-./Include/mfc/l.deu/AFXCTL.RC
-./AFXCTL_RC.50939389_21A9_405A_9503_76A200EADDA3
-./Include/mfc/l.deu/AFXDB.RC
-./AFXDB_RC.50939389_21A9_405A_9503_76A200EADDA3
-./Include/mfc/l.deu/AFXOLECL.RC
-./AFXOLECL_RC.50939389_21A9_405A_9503_76A200EADDA3
-./Include/mfc/l.deu/AFXOLESV.RC
-./AFXOLESV_RC.50939389_21A9_405A_9503_76A200EADDA3
-./Include/mfc/l.deu/AFXPRINT.RC
-./AFXPRINT_RC.50939389_21A9_405A_9503_76A200EADDA3
-./Include/mfc/l.deu/AFXRES.RC
-./AFXRES_RC.50939389_21A9_405A_9503_76A200EADDA3
-./Include/mfc/l.esp/AFXCTL.RC
-./AFXCTL_RC.537788B1_31FA_4646_9F76_7BDB2C03A887
-./Include/mfc/l.esp/AFXDB.RC
-./AFXDB_RC.537788B1_31FA_4646_9F76_7BDB2C03A887
-./Include/mfc/l.esp/AFXOLECL.RC
-./AFXOLECL_RC.537788B1_31FA_4646_9F76_7BDB2C03A887
-./Include/mfc/l.esp/AFXOLESV.RC
-./AFXOLESV_RC.537788B1_31FA_4646_9F76_7BDB2C03A887
-./Include/mfc/l.esp/AFXPRINT.RC
-./AFXPRINT_RC.537788B1_31FA_4646_9F76_7BDB2C03A887
-./Include/mfc/l.esp/AFXRES.RC
-./AFXRES_RC.537788B1_31FA_4646_9F76_7BDB2C03A887
-./Include/mfc/l.fra/AFXCTL.RC
-./AFXCTL_RC.1EB3F86C_A273_45B5_8B2E_86870AD0CEEC
-./Include/mfc/l.fra/AFXDB.RC
-./AFXDB_RC.1EB3F86C_A273_45B5_8B2E_86870AD0CEEC
-./Include/mfc/l.fra/AFXOLECL.RC
-./AFXOLECL_RC.1EB3F86C_A273_45B5_8B2E_86870AD0CEEC
-./Include/mfc/l.fra/AFXOLESV.RC
-./AFXOLESV_RC.1EB3F86C_A273_45B5_8B2E_86870AD0CEEC
-./Include/mfc/l.fra/AFXPRINT.RC
-./AFXPRINT_RC.1EB3F86C_A273_45B5_8B2E_86870AD0CEEC
-./Include/mfc/l.fra/AFXRES.RC
-./AFXRES_RC.1EB3F86C_A273_45B5_8B2E_86870AD0CEEC
-./Include/mfc/l.ita/AFXCTL.RC
-./AFXCTL_RC.379E2DB2_E21D_41C9_A54C_C0DEA71A1C8A
-./Include/mfc/l.ita/AFXDB.RC
-./AFXDB_RC.379E2DB2_E21D_41C9_A54C_C0DEA71A1C8A
-./Include/mfc/l.ita/AFXOLECL.RC
-./AFXOLECL_RC.379E2DB2_E21D_41C9_A54C_C0DEA71A1C8A
-./Include/mfc/l.ita/AFXOLESV.RC
-./AFXOLESV_RC.379E2DB2_E21D_41C9_A54C_C0DEA71A1C8A
-./Include/mfc/l.ita/AFXPRINT.RC
-./AFXPRINT_RC.379E2DB2_E21D_41C9_A54C_C0DEA71A1C8A
-./Include/mfc/l.ita/AFXRES.RC
-./AFXRES_RC.379E2DB2_E21D_41C9_A54C_C0DEA71A1C8A
-./Include/mfc/l.jpn/AFXCTL.RC
-./AFXCTL_RC.50664591_5CE3_459B_B353_2022D6023EB5
-./Include/mfc/l.jpn/AFXDB.RC
-./AFXDB_RC.50664591_5CE3_459B_B353_2022D6023EB5
-./Include/mfc/l.jpn/AFXOLECL.RC
-./AFXOLECL_RC.50664591_5CE3_459B_B353_2022D6023EB5
-./Include/mfc/l.jpn/AFXOLESV.RC
-./AFXOLESV_RC.50664591_5CE3_459B_B353_2022D6023EB5
-./Include/mfc/l.jpn/AFXPRINT.RC
-./AFXPRINT_RC.50664591_5CE3_459B_B353_2022D6023EB5
-./Include/mfc/l.jpn/AFXRES.RC
-./AFXRES_RC.50664591_5CE3_459B_B353_2022D6023EB5
-./Include/mfc/l.kor/AFXCTL.RC
-./AFXCTL_RC.B7FA0B7E_DD72_40DF_96D1_538F4A803082
-./Include/mfc/l.kor/AFXDB.RC
-./AFXDB_RC.B7FA0B7E_DD72_40DF_96D1_538F4A803082
-./Include/mfc/l.kor/AFXOLECL.RC
-./AFXOLECL_RC.B7FA0B7E_DD72_40DF_96D1_538F4A803082
-./Include/mfc/l.kor/AFXOLESV.RC
-./AFXOLESV_RC.B7FA0B7E_DD72_40DF_96D1_538F4A803082
-./Include/mfc/l.kor/AFXPRINT.RC
-./AFXPRINT_RC.B7FA0B7E_DD72_40DF_96D1_538F4A803082
-./Include/mfc/l.kor/AFXRES.RC
-./AFXRES_RC.B7FA0B7E_DD72_40DF_96D1_538F4A803082
-./Include/mfc/MFCSAMPS.MAK
-./MFCSAMPS_MAK.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/mfc/res/3dcheck.bmp
-./_3dcheck_bmp.89C3BD9D_A47B_4B81_8104_85F1A20AC145
-./Include/mfc/res/95CHECK.BMP
-./_95CHECK_BMP.89C3BD9D_A47B_4B81_8104_85F1A20AC145
-./Include/mfc/res/COPY4WAY.CUR
-./COPY4WAY_CUR.89C3BD9D_A47B_4B81_8104_85F1A20AC145
-./Include/mfc/res/HELP.CUR
-./HELP_CUR.89C3BD9D_A47B_4B81_8104_85F1A20AC145
-./Include/mfc/res/HELP.RSC
-./HELP_RSC.89C3BD9D_A47B_4B81_8104_85F1A20AC145
-./Include/mfc/res/MAGNIFY.CUR
-./MAGNIFY_CUR.89C3BD9D_A47B_4B81_8104_85F1A20AC145
-./Include/mfc/res/MAGNIFY.RSC
-./MAGNIFY_RSC.89C3BD9D_A47B_4B81_8104_85F1A20AC145
-./Include/mfc/res/MINIFWND.BMP
-./MINIFWND_BMP.89C3BD9D_A47B_4B81_8104_85F1A20AC145
-./Include/mfc/res/MOVE4WAY.CUR
-./MOVE4WAY_CUR.89C3BD9D_A47B_4B81_8104_85F1A20AC145
-./Include/mfc/res/NODROP.CUR
-./NODROP_CUR.89C3BD9D_A47B_4B81_8104_85F1A20AC145
-./Include/mfc/res/NTCHECK.BMP
-./NTCHECK_BMP.89C3BD9D_A47B_4B81_8104_85F1A20AC145
-./Include/mfc/res/SARROWS.CUR
-./SARROWS_CUR.89C3BD9D_A47B_4B81_8104_85F1A20AC145
-./Include/mfc/res/SPLIT.RSC
-./SPLIT_RSC.89C3BD9D_A47B_4B81_8104_85F1A20AC145
-./Include/mfc/res/SPLITH.CUR
-./SPLITH_CUR.89C3BD9D_A47B_4B81_8104_85F1A20AC145
-./Include/mfc/res/SPLITV.CUR
-./SPLITV_CUR.89C3BD9D_A47B_4B81_8104_85F1A20AC145
-./Include/mfc/res/TRCK4WAY.CUR
-./TRCK4WAY_CUR.89C3BD9D_A47B_4B81_8104_85F1A20AC145
-./Include/mfc/res/TRCKNESW.CUR
-./TRCKNESW_CUR.89C3BD9D_A47B_4B81_8104_85F1A20AC145
-./Include/mfc/res/TRCKNS.CUR
-./TRCKNS_CUR.89C3BD9D_A47B_4B81_8104_85F1A20AC145
-./Include/mfc/res/TRCKNWSE.CUR
-./TRCKNWSE_CUR.89C3BD9D_A47B_4B81_8104_85F1A20AC145
-./Include/mfc/res/TRCKWE.CUR
-./TRCKWE_CUR.89C3BD9D_A47B_4B81_8104_85F1A20AC145
-./Include/mfc/res/TRUETYPE.BMP
-./TRUETYPE_BMP.89C3BD9D_A47B_4B81_8104_85F1A20AC145
-./Include/mfc/WINRES.H
-./WINRES_H.C61C4FD7_52DE_4D49_8479_C23B5510FAB5
-./Include/Mgm.h
-./Mgm_h.B188D039_A14F_4D4A_BB83_A3CE8B67E563
-./Include/MgmtAPI.h
-./MgmtAPI_h.E8E96562_F2EB_43E8_A00F_F83AF415D3B0
-./Include/microsoft.windowsmediaservices.dll
-./microsoft_windowsmediaservices_dll.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/Midles.h
-./Midles_h.0DFAFB88_D3C9_4D25_AFD7_9038FED25DFA
-./Include/mimedisp.h
-./mimedisp_h.C0A5C8BB_1F92_49A7_925E_EED72BE3933B
-./Include/MimeInfo.h
-./MimeInfo_h.767F7E6D_4897_439F_92E9_1EA883141FA8
-./Include/MimeInfo.Idl
-./MimeInfo_Idl.A217FA05_C15C_4BF7_9A82_52BCC5A25573
-./Include/mimeole.idl
-./mimeole_idl.A582B9C9_C2B8_485D_9360_845E433BA9DC
-./Include/mixerocx.h
-./mixerocx_h.934DA7DA_2B20_4191_BED0_DC0F1C5A679F
-./Include/mixerocx.idl
-./mixerocx_idl.ACBE85D0_DBE7_49E4_AB19_EA5D8D64E20F
-./Include/MLang.h
-./MLang_h.14EB3C66_8C71_4ED5_9CF3_F04EF8E2198F
-./Include/MLang.Idl
-./MLang_Idl.5CA764A7_27FF_43C8_A52F_9FD62446C8E8
-./Include/MMC.h
-./MMC_h.CA2FAFB9_31A3_4ABD_BCED_770875EC77C4
-./Include/MMC.Idl
-./MMC_Idl.007985A4_45C9_4E66_B7E2_CB37E5947C87
-./Include/MMCObj.h
-./MMCObj_h.83E52553_6FDF_4FB8_BC9B_91CECD97B637
-./Include/MMCObj.Idl
-./MMCObj_Idl.2FDBE396_6E97_4E72_8866_47365EDC196C
-./Include/mmintrin.h
-./mmintrin_h.E828F002_A3C8_4D93_A1F5_7068CB2A1CB7
-./Include/MMReg.h
-./MMReg_h.9D73BF9C_506A_4FEA_AEF5_04C7E58A6C20
-./Include/mmstream.h
-./mmstream_h.8D93F17B_6965_4D37_806A_BA7FA23E59B7
-./Include/mmstream.idl
-./mmstream_idl.69A3E20E_EF97_4271_9EAC_9171ABABA017
-./Include/MMSystem.h
-./MMSystem_h.295C9690_BBB8_4370_A31B_9F8FB19448CF
-./Include/Mobsync.h
-./Mobsync_h.DBC26BF3_1B67_422A_9836_BE06568B476F
-./Include/Mobsync.Idl
-./Mobsync_Idl.EB3AA1AC_FB50_4F77_BE12_BD19C780A4B6
-./Include/Moniker.h
-./Moniker_h.10F353EA_760F_48F1_B731_16D884E7E332
-./Include/mpconfig.h
-./mpconfig_h.7666150D_331D_49ED_84C1_C08FE9F4FE77
-./Include/mpeg2bits.h
-./mpeg2bits_h.DA70BDC1_1459_46A8_8E44_C6EEB8D8A13C
-./Include/mpeg2data.h
-./mpeg2data_h.DC99349A_ACFB_4514_97C5_71DB4BB0BAC6
-./Include/mpeg2data.idl
-./mpeg2data_idl.E72B169B_AAA8_4116_B2F0_077960A99754
-./Include/mpeg2error.h
-./mpeg2error_h.801DE27E_02E7_47D6_A520_BA21795BCF98
-./Include/Mpeg2Structs.idl
-./Mpeg2Structs_idl.9184022E_7724_48F3_BDF8_BA372001CFA9
-./Include/mpegtype.h
-./mpegtype_h.0864A0D8_EE14_4FA6_8E81_55A85D7CF184
-./Include/Mprapi.h
-./Mprapi_h.36603CC6_1F9B_4BFA_8AF6_F9A28AB610AE
-./Include/MprError.h
-./MprError_h.16E880D2_9204_4831_B2A9_B806B3BAE03E
-./Include/Mq.h
-./Mq_h.DACB7E14_17B9_4BDB_9594_CE4A4AEBBBA4
-./Include/MqMail.h
-./MqMail_h.EBD11E57_F49E_43FA_ABF0_63C5B2D74ABC
-./Include/MqOaI.h
-./MqOaI_h.22FBD632_CA76_49B4_AFAB_0357AD52C81E
-./Include/MSAAText.h
-./MSAAText_h.F51F5217_261B_4A33_8CBD_52CD03AC02F9
-./Include/MSAAText.Idl
-./MSAAText_Idl.DE7947AC_C3E0_4B65_8197_E62D7D56F037
-./Include/MSAcm.h
-./MSAcm_h.C0BA3222_B43F_4BCC_8DE2_2FDE25FA599A
-./Include/MSAcmDlg.Dlg
-./MSAcmDlg_Dlg.975CFBB3_3423_418F_8296_826FE736B76A
-./Include/MSAcmDlg.h
-./MSAcmDlg_h.0D88180D_6060_4209_BA59_F42501113F60
-./Include/msasn1.h
-./msasn1_h.23592FCF_590D_4AEE_93C8_AE0C87245DC7
-./Include/msber.h
-./msber_h.23592FCF_590D_4AEE_93C8_AE0C87245DC7
-./Include/mscat.h
-./mscat_h.C1857A54_866B_4CCA_A04E_15815AB4E068
-./Include/MSChapp.h
-./MSChapp_h.2BBACB95_F15F_427A_9067_42C494562752
-./Include/MSClus.h
-./MSClus_h.DD398B28_5209_4E88_AC13_D2D4C2728E30
-./Include/MSClus.Idl
-./MSClus_Idl.94F46EA8_C82F_4873_9D37_9EF3A49A0B38
-./Include/msctf.h
-./msctf_h.43807256_FAEC_4FD8_A450_B7A55D854567
-./Include/msctf.idl
-./msctf_idl.E12F57A6_D221_479C_B887_5E1DDD882FF7
-./Include/MSDaIpp.h
-./MSDaIpp_h.6CD6AF63_73C3_4980_9B11_8B0995D55463
-./Include/MSDaIppEr.h
-./MSDaIppEr_h.6CD6AF63_73C3_4980_9B11_8B0995D55463
-./Include/MSFS.h
-./MSFS_h.754B4AD2_ECB0_4717_AF53_FF29E4BDF72C
-./Include/MsHtmcid.h
-./MsHtmcid_h.D19ABEF4_02B0_417D_AD10_AC8A99071145
-./Include/MsHtmdid.h
-./MsHtmdid_h.8C53E4A0_C7F2_4CA5_ADF2_38E80B597838
-./Include/MsHtmHst.h
-./MsHtmHst_h.4E0A91CD_127F_4B54_9A8F_3E3B788CCAA1
-./Include/MsHtmHst.Idl
-./MsHtmHst_Idl.1259F412_7859_4A1B_BEF5_625BB2FA2715
-./Include/MsHTML.h
-./MsHTML_h.A58A4412_2778_4BDA_B292_3A6071042E04
-./Include/MsHTML.Idl
-./MsHTML_Idl.CE9E55D2_6927_47D3_A55E_E20A003CC069
-./Include/Mshtmlc.h
-./Mshtmlc_h.E175317C_6396_4A5C_9B90_6CDC51F217D6
-./Include/Msi.h
-./Msi_h.837527D5_E2D7_4B57_8AC4_3B6F80FED41A
-./Include/MsiDefs.h
-./MsiDefs_h.A41E3CA1_6D12_4BDC_AC30_97E5FE134E9C
-./Include/msident.idl
-./msident_idl.A582B9C9_C2B8_485D_9360_845E433BA9DC
-./Include/msimcntl.h
-./msimcntl_h.59894D74_2C9C_4458_9A41_9F003E0FB8A7
-./Include/msimcsdk.h
-./msimcsdk_h.CB063B86_8A66_4A2D_985A_D2FE4DF2A425
-./Include/MsiQuery.h
-./MsiQuery_h.9882232D_F238_41C2_B24C_B2C078F25D46
-./Include/msoav.h
-./msoav_h.E175317C_6396_4A5C_9B90_6CDC51F217D6
-./Include/msoeapi.idl
-./msoeapi_idl.A582B9C9_C2B8_485D_9360_845E433BA9DC
-./Include/Msp.h
-./Msp_h.6743AB03_DDEA_4A65_8CF0_630D2931A9D4
-./Include/Msp.Idl
-./Msp_Idl.A0DFFB38_3668_4A65_8ACF_65CA03B8BD90
-./Include/MSPAB.h
-./MSPAB_h.6E00B7E0_C3A6_46F5_8F86_47910D82D6F0
-./Include/MspAddr.h
-./MspAddr_h.E26E5445_2B53_47E7_96F8_DC37693B9709
-./Include/MspBase.h
-./MspBase_h.30F1334A_4690_427C_A19E_67E60AEBA944
-./Include/MspCall.h
-./MspCall_h.97EB792F_6083_4C16_A26F_7BBC7E592200
-./Include/Mspcoll.h
-./Mspcoll_h.B6ED6461_1D9B_4576_BD61_829F198AE375
-./Include/MspEnum.h
-./MspEnum_h.30F1334A_4690_427C_A19E_67E60AEBA944
-./Include/Msplog.h
-./Msplog_h.2E0CBE5B_7B90_4333_B07F_05C0CBC4E1AD
-./Include/MSPST.h
-./MSPST_h.EAD52161_37C7_4208_B730_8DDEF7CC86C1
-./Include/MspStrm.h
-./MspStrm_h.EDF915D7_FA69_4E4A_9B8A_9F707D1D7FD0
-./Include/Mspterm.h
-./Mspterm_h.6DDB9044_7671_4B56_A242_82DE69FDFCAF
-./Include/Mspthrd.h
-./Mspthrd_h.8E79DE3B_E7AE_47BF_ABB4_1EC6BA8DDB18
-./Include/Msptrmac.h
-./Msptrmac_h.4E0AD16B_2C14_4DED_AB8F_993C11B90760
-./Include/Msptrmar.h
-./Msptrmar_h.E386B0D0_83E6_4E7F_8CB5_8A44A5B79817
-./Include/Msptrmvc.h
-./Msptrmvc_h.D547637D_1F10_46AD_8AB9_B423123DA3F8
-./Include/Msputils.h
-./Msputils_h.C65FE009_3A66_40EA_9442_3AD43A54E474
-./Include/mssip.h
-./mssip_h.4BB5A11A_21C5_4E33_8EC5_A973F8A76FBA
-./Include/msstkppg.h
-./msstkppg_h.5FF5DEEE_F0DB_499B_8890_55AEB3FBEB53
-./Include/MSTask.h
-./MSTask_h.7AB990EA_9ECB_4634_BE8C_C45D4F6F0388
-./Include/MSTask.Idl
-./MSTask_Idl.630CC9E0_B577_4E9D_8083_7D157B7954FE
-./Include/MSTcpIP.h
-./MSTcpIP_h.A9FE1621_3974_4BB9_B728_D98FE04124C1
-./Include/MSTErr.h
-./MSTErr_h.83C62642_224B_4CAF_9D20_B32B26889619
-./Include/mstime.h
-./mstime_h.C267E1BD_6255_4E22_90B7_E4FFF2280007
-./Include/mstimeid.h
-./mstimeid_h.E12F3AA6_26A6_483A_B34A_0DE78ECAAE7D
-./Include/msvidctl.h
-./msvidctl_h.3B3F95D4_0596_4DC5_8DEA_9BB1F515256F
-./Include/msvidctl.idl
-./msvidctl_idl.A8CB30FE_609C_4C54_97EA_ABAD78EB3DD5
-./Include/MSWSock.h
-./MSWSock_h.2872849B_A878_41F4_A56B_DDA714AEF892
-./Include/MsXml.h
-./MsXml_h.AC2EFAFF_0261_4481_BFED_FE8B095D8223
-./Include/MsXml.Idl
-./MsXml_Idl.1DB55F7B_BE87_49C9_91E9_A5E1AC85AA0B
-./Include/MsXml2.h
-./MsXml2_h.FE65544F_258E_4840_AC47_9C42BB2AFE3A
-./Include/MsXml2DId.h
-./MsXml2DId_h.7127B9D2_6B9A_49D0_A936_5317167D8A4B
-./Include/MsXmlDId.h
-./MsXmlDId_h.D674D823_3424_4ABF_9CFB_9335594A4999
-./Include/MtsAdmin.h
-./MtsAdmin_h.244584B0_1900_4331_B938_BD88FC2E6E0E
-./Include/MtsAdmin_i.c
-./MtsAdmin_i_c.9DEF3E9A_BD10_444E_AE7B_FC3D0CA82F28
-./Include/MtsEvents.h
-./MtsEvents_h.9848A40E_A061_4BF9_9523_CE7B40D52559
-./Include/MtsGrp.h
-./TxCtx_h.E3CEB071_B0E3_4710_BC8F_A32DD1C43774
-./Include/Mtx.h
-./Mtx_h.2AC80D44_A137_4188_82FC_C5B5D724880E
-./Include/MtxAdmin.h
-./MtxAdmin_h.26F16C4C_548E_4A6E_ADD9_20BF8B124CCF
-./Include/MtxAdmin_i.c
-./MtxAdmin_i_c.5F1179BC_C36D_4283_8791_35E81016AAD6
-./Include/MtxAttr.h
-./MtxAttr_h.51591BD1_29BC_4597_BEE7_70BEC03882E4
-./Include/Mtxdm.h
-./Mtxdm_h.EC3B9C74_61BB_46F6_967D_097401A26750
-./Include/MultiMon.h
-./MultiMon_h.7D04B950_36A8_41D1_BF3B_88EBA257D979
-./Include/MultInfo.h
-./MultInfo_h.5B58ABAE_F131_49B2_99C5_C56A6F6AC62D
-./Include/natupnp.h
-./natupnp_h.1958A637_F9BC_4EB1_A3FA_D5AAFD8CBB55
-./Include/natupnp.idl
-./natupnp_idl.3D0CF8B6_5D2D_42FA_BF4F_A2358652281C
-./Include/Nb30.h
-./Nb30_h.9E75484D_29C6_42B0_96A1_AAC55777CA00
-./Include/ndr64types.h
-./ndr64types_h.53F89B7F_80F7_4D05_B013_6C1C384ECC3D
-./Include/ndrtypes.h
-./ndrtypes_h.ABCC34E6_8056_4F05_A332_2070940951AB
-./Include/NetCon.h
-./NetCon_h.12F6C265_91AE_4F83_B90A_A989D10DC0C9
-./Include/NetCon.Idl
-./NetCon_Idl.38C8FF9F_E4F4_4419_B5E0_D68822EBBE64
-./Include/neterr.h
-./neterr_h.6E62D5BA_591A_4726_9481_51EFE172338D
-./Include/netfw.h
-./netfw_h.664AF407_A85E_4A4E_BBEB_11F13E794137
-./Include/netfw.idl
-./netfw_idl.664AF407_A85E_4A4E_BBEB_11F13E794137
-./Include/netmeeting.idl
-./netmeeting_idl.26E9D96E_40F5_431E_A8C3_D8B584B5BF2B
-./Include/netmon.h
-./netmon_h.6E62D5BA_591A_4726_9481_51EFE172338D
-./Include/netprov.h
-./netprov_h.1240AFB7_6526_49DE_B78F_E9DE0CD96A0A
-./Include/netprov.idl
-./netprov_idl.8F3704BF_8D72_470D_A121_389BEAD387CF
-./Include/NetSh.h
-./NetSh_h.881E484B_BCAB_43EC_8101_ABB6A7CABF1B
-./Include/NewAPIs.h
-./NewAPIs_h.9B761DDC_8402_4693_9FDF_3F2E28BBD24E
-./Include/nmappstr.h
-./nmappstr_h.26E9D96E_40F5_431E_A8C3_D8B584B5BF2B
-./Include/nmapptyp.h
-./nmapptyp_h.26E9D96E_40F5_431E_A8C3_D8B584B5BF2B
-./Include/nmsupp.h
-./nmsupp_h.6E62D5BA_591A_4726_9481_51EFE172338D
-./Include/NNTPReg.Vbs
-./NNTPReg_Vbs.7DBED699_F5B0_4914_9D26_A59D467841B8
-./Include/Npapi.h
-./Npapi_h.09AD1491_59E3_4BA7_8E43_1EA637FDC104
-./Include/nserror.h
-./nserror_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/NspAPI.h
-./NspAPI_h.A22834BF_305B_4213_AB5F_B6CA74256046
-./Include/nsscore.h
-./nsscore_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/nsscore.idl
-./nsscore_idl.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/NtDDNdis.h
-./NtDDNdis_h.E203C8E7_81BA_432F_A2C3_06ED7CA2AD2C
-./Include/NtDDPSch.h
-./NtDDPSch_h.FA4B0FB9_606A_46EF_A255_0A9024695EEC
-./Include/ntddscsi.h
-./ntddscsi_h.9404D881_48DB_442A_B7D5_41BA264EB726
-./Include/NtDsAPI.h
-./NtDsAPI_h.8FE93977_C65E_4016_B2E8_29E10E8B7B4A
-./Include/NtDsBCli.h
-./NtDsBCli_h.A00CC38E_482B_4925_9AA3_C3427D3679B1
-./Include/NtDsBMsg.h
-./NtDsBMsg_h.B37BA7F9_7E48_43FB_BF22_78F859774136
-./Include/ntgdi.h
-./ntgdi_h.794E3F3B_ADEA_4201_9318_AD5F21DC9FA7
-./Include/NtLdap.h
-./NtLdap_h.47CA7D74_7F38_4175_9DBF_CE5CFCE47E70
-./Include/NTMSAPI.h
-./NTMSAPI_h.7BA6AE7A_1131_406D_915A_D07D88D4025F
-./Include/NTMSMli.h
-./NTMSMli_h.2A9BDC50_9350_4E71_BDAE_61978783391A
-./Include/NTQuery.h
-./NTQuery_h.9C69A29C_CE43_4792_B75B_A63E29F28A32
-./Include/NTSDExts.h
-./NTSDExts_h.7A24CAB7_71EF_45BC_9AF0_60AA048A88C8
-./Include/NTSecAPI.h
-./NTSecAPI_h.7B61077B_D336_43C4_8967_E6F41C0DEF03
-./Include/NTSecPkg.h
-./NTSecPkg_h.7B61077B_D336_43C4_8967_E6F41C0DEF03
-./Include/ntstatus.h
-./ntstatus_h.EFDE8372_0E90_4D3B_AB7B_B2E109E3FB9A
-./Include/ntverp.h
-./ntverp_h.7849A3D7_21E8_4E0B_B7A2_E7A37777D290
-./Include/NtWin32.Mak
-./W32chico_mk.67AF319B_95A7_4C64_809D_D0A8DAB3F54B
-./Include/OAIdl.acf
-./OAIdl_acf.F049E6EF_A201_444C_9019_ED019C7C830F
-./Include/OAIdl.h
-./OAIdl_h.56FF548A_18B4_4A8A_B77D_6909ECE826D8
-./Include/OAIdl.Idl
-./OAIdl_Idl.683F21E0_43B8_4908_AE92_90C669E68110
-./Include/ObjBase.h
-./ObjBase_h.9AD3F4FF_0EC0_4AD2_8005_B1D00F4EB93C
-./Include/ObjError.h
-./ObjError_h.FE14CF98_BFF0_4670_AFD0_286F4F696179
-./Include/ObjIdl.h
-./ObjIdl_h.6637B60C_458B_4A9D_A46C_A5DF4007C96F
-./Include/ObjIdl.Idl
-./ObjIdl_Idl.40FBA21F_D7C9_4C0A_A404_7C37A8ACF8F7
-./Include/ObjPath.h
-./ObjPath_h.D666ADB7_1F38_44A8_9F60_4E99654A5DFF
-./Include/ObjSafe.h
-./ObjSafe_h.E4041280_6A8A_431A_96D7_560D0416D0C6
-./Include/ObjSafe.Idl
-./ObjSafe_Idl.568C74CC_ECE4_49BD_9152_0E820132E1DB
-./Include/ObjSel.h
-./ObjSel_h.3E070023_EAEE_458D_8BB8_F8BDFD52C903
-./Include/OCIdl.acf
-./OCIdl_acf.B059D702_5370_49DF_A5F7_99DA20AAC22E
-./Include/OCIdl.h
-./OCIdl_h.98DA6399_D399_44B6_9E2B_6F9F746ECB84
-./Include/OCIdl.Idl
-./OCIdl_Idl.3A0BE229_0A31_4910_AE1B_91BAE5765F75
-./Include/ocmm.h
-./ocmm_h.176F5BA4_2A87_4CB3_A36F_E882A24DF840
-./Include/ocmm.Idl
-./ocmm_Idl.5B0AC5B1_3169_4A73_8631_4710E0207908
-./Include/oerules.idl
-./oerules_idl.A582B9C9_C2B8_485D_9360_845E433BA9DC
-./Include/ole.h
-./ole_h.3F0696CA_EB55_4F6B_8239_C162BF1ACC58
-./Include/Ole2.h
-./Ole2_h.D4545A8B_D17E_4E53_9B23_1708DF5AE148
-./Include/Ole2Ver.h
-./Ole2Ver_h.C5781570_6814_4C1B_A958_EBE35CFA75A0
-./Include/OleAcc.h
-./OleAcc_h.03ACBFA5_1C3E_45E0_8A2A_9A696B291891
-./Include/OleAcc.idl
-./OleAcc_idl.03ACBFA5_1C3E_45E0_8A2A_9A696B291891
-./Include/OleAuto.h
-./OleAuto_h.F19C0324_8EF7_4314_ABD6_50D225CF0032
-./Include/OleCtl.h
-./OleCtl_h.29A01E87_64D0_4C73_AFDB_09EA9FFF79E1
-./Include/OleCtlId.h
-./OleCtlId_h.13334242_A839_4A53_BE85_7CAD432EB321
-./Include/OleDlg.Dlg
-./OleDlg_Dlg.423F71BA_6E46_4BE4_A9F5_68C7C6AFC570
-./Include/OleDlg.h
-./OleDlg_h.2A22AC28_8612_4330_B42A_4E8D6F18E7F2
-./Include/OleIdl.h
-./OleIdl_h.6C56CC74_3B2D_4528_AE3A_DE3A0CD48788
-./Include/OleIdl.Idl
-./OleIdl_Idl.B90D908E_584B_42FB_91E4_4659FDCDE5EF
-./Include/oleTx2xa.h
-./oleTx2xa_h.A5BCC85C_55D9_43AF_B515_707F5C092599
-./Include/OPathLex.h
-./OPathLex_h.84A209A8_DFF0_4957_9AA6_99E26825BE88
-./Include/p2p.h
-./p2p_h.59F4A4BF_9074_42EB_A39D_E722166D0A41
-./Include/parser.h
-./parser_h.6E62D5BA_591A_4726_9481_51EFE172338D
-./Include/passport.h
-./passport_h.C4AD0587_3DA7_46D7_AFCE_A73130A33ADD
-./Include/passport.idl
-./passport_idl.64880B97_91B4_480A_871A_C810F702BC2D
-./Include/PatchApi.h
-./PatchApi_h.6AAB2D8B_D1C2_4E3A_85D6_A5ABE59C40DB
-./Include/PatchWiz.h
-./PatchWiz_h.D079C723_884A_43AE_BAA7_DD8C5708D9EB
-./Include/Pbt.h
-./Pbt_h.D805CE55_BEF7_422E_844F_DE6F173685EB
-./Include/PChannel.h
-./PChannel_h.428B0CA1_537B_4F18_B28E_746122ACE87D
-./Include/Pcrt32.h
-./Pcrt32_h.EEF55C0C_54E6_4207_9CF0_F5B7331BC479
-./Include/Pdh.h
-./Pdh_h.A64E1363_790F_48FF_BCF4_B96064C6C2F8
-./Include/PdhMsg.h
-./PdhMsg_h.3861474A_9112_476B_BE1A_485C2A22CC77
-./Include/PerHist.h
-./PerHist_h.07FF7965_E263_4ADE_9F4F_B7986CBD4192
-./Include/PerHist.Idl
-./PerHist_Idl.3F194478_6097_4491_A146_5D6598C3FA10
-./Include/playlist.h
-./playlist_h.FAD595FB_B062_4F1D_A7A8_434D1742D41D
-./Include/pnrpdef.h
-./pnrpdef_h.819F3DEB_AC26_4C4C_B411_6B5C8F6A71A0
-./Include/pnrpns.h
-./pnrpns_h.42263231_D9D8_4F54_BC1B_758835F62CC3
-./Include/Polarity.h
-./Polarity_h.7C4D3C9E_AB68_4DB9_9D70_91191143B203
-./Include/PopPack.h
-./PopPack_h.19BD4592_AD9B_43F0_B748_7FA25EC85E06
-./Include/PostMake.Inc
-./PostMake_Inc.93E20086_776F_4937_9D65_D8AC00A5A201
-./Include/powrprof.h
-./powrprof_h.1915D48F_93D8_4750_AD18_CC60A44F18D4
-./Include/pre64pra.h
-./pre64pra_h.548E2D54_2010_4B9C_8E66_F5037147B227
-./Include/PrnSetup.Dlg
-./PrnSetup_Dlg.47EE4A1B_F53A_46FE_8A1B_1E126B3F7B76
-./Include/ProfInfo.h
-./ProfInfo_h.6BB75666_19C1_4FE4_B35D_D1E482D8F78B
-./Include/PropIdl.h
-./PropIdl_h.040E2AAB_4566_4C4F_B11F_3D40589AE5F1
-./Include/PropIdl.Idl
-./PropIdl_Idl.8890B223_02F5_4AC0_A583_7E2F67537BE5
-./Include/ProvExce.h
-./ProvExce_h.BC3458F0_8BAB_403A_9C4C_565BC326A32B
-./Include/Provider.h
-./Provider_h.7F536E4F_1B33_4251_A14A_CBCC35C3502E
-./Include/PrSht.h
-./PrSht_h.389FDE77_9DE0_439F_9701_743EFD6DCD31
-./Include/prsht.idl
-./prsht_idl.331E9169_37FE_4AE2_BE25_27BAB37A359D
-./Include/Psapi.h
-./Psapi_h.9FBFE982_C852_453F_8111_8BDBDD60FF2C
-./Include/PshPack1.h
-./PshPack1_h.631A73F8_CB5D_4DFA_8E25_88A8E53C8137
-./Include/PshPack2.h
-./PshPack2_h.F979C07C_AB30_41B5_B726_8021BC8F0EFE
-./Include/PshPack4.h
-./PshPack4_h.64CE30CC_18EF_4837_9831_3CFE2C7EF881
-./Include/PshPack8.h
-./PshPack8_h.D57ECA9A_804C_4E23_B6EA_726A39544215
-./Include/pstore.h
-./pstore_h.184FE88A_81C5_41CD_BE4B_CF1AEC69F5F5
-./Include/qedit.h
-./qedit_h.0F96BE00_E34D_4248_B32E_98E197CB6679
-./Include/qedit.idl
-./qedit_idl.953824BB_311F_439B_AE44_A5E3B9139859
-./Include/qmgr.h
-./qmgr_h.944EE55D_D255_4837_B29D_B827BEDA9141
-./Include/qmgr.idl
-./qmgr_idl.944EE55D_D255_4837_B29D_B827BEDA9141
-./Include/qnetwork.h
-./qnetwork_h.09D00692_DD32_4D82_A18C_406B938C13D7
-./Include/Qos.h
-./Qos_h.551E01A3_4ED5_42F5_AFFF_DD5F366018BF
-./Include/QosName.h
-./QosName_h.AA9D02AA_D862_4CBE_9119_2F83192E2FA6
-./Include/QosPol.h
-./QosPol_h.70956EE4_894C_48A0_9C81_167C8F99C8C9
-./Include/Qossp.h
-./Qossp_h.57AB9470_EDF1_45D3_94E7_AA361BB309E6
-./Include/Ras.h
-./Ras_h.B780500A_C47F_429D_B150_EE3695900FCA
-./Include/RasDlg.h
-./RasDlg_h.A8F8F383_178A_4986_A60C_8A812FAAF3A4
-./Include/Raseapif.h
-./Raseapif_h.5E119BA6_775F_4E8B_A04C_4DCAE6453CAB
-./Include/RasError.h
-./RasError_h.2C6211FD_35C3_4332_A78F_EEB794D1AA96
-./Include/Rassapi.h
-./Rassapi_h.0ED5C96B_0D6A_405A_A30F_33997D020967
-./Include/RassHost.h
-./RassHost_h.5D295E36_A9A4_4402_83DE_C7966807B241
-./Include/Ratings.h
-./Ratings_h.0B5310B2_1EA8_4C24_BE24_DC6A03F2E667
-./Include/Reason.h
-./Reason_h.55F66060_F010_4CE4_9F3E_515A84A83F6F
-./Include/RecGuids.h
-./RecGuids_h.B68A3AE6_8938_4A7E_AC62_6B74A1CF043F
-./Include/Reconcil.h
-./Reconcil_h.803E5A61_2029_4798_B006_FA1041C24B18
-./Include/RefPtrCo.h
-./RefPtrCo_h.248031EF_2C1F_4F75_9334_B15FD0257EC5
-./Include/regbag.h
-./regbag_h.73738F8B_A801_402D_A037_14DDB150BF56
-./Include/regbag.idl
-./regbag_idl.C5314BF1_A51F_4D8A_8BE6_5A41A2B405C8
-./Include/regpiatypelib.vbs
-./regpiatypelib_vbs.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/RegStr.h
-./RegStr_h.57D4A211_4EB0_4F88_B255_FDFDA00B4F68
-./Include/REND.h
-./REND_h.5999ADEC_6135_49FE_8FEB_80CAA855260C
-./Include/Rend.Idl
-./Rend_Idl.F230096A_2BF0_483C_AA8E_0E930D961DD2
-./Include/Resapi.h
-./Resapi_h.444BB2FF_FC68_4023_990D_634E16F21E7A
-./Include/Richedit.h
-./Richedit_h.B0624E57_A883_4C4D_A265_D1142B4970DB
-./Include/RichOle.h
-./RichOle_h.1EBD477A_AEE4_42AC_9AC6_5FA6868DEB97
-./Include/rkeysvcc.h
-./rkeysvcc_h.B9495D5F_1F18_4CBB_8199_48765A03CA6D
-./Include/RNDErr.h
-./RNDErr_h.43D37602_1648_45BC_92A4_EDA8837EACE9
-./Include/Routprot.h
-./Routprot_h.C8989A14_1B00_4729_B0DE_03C6A87272B7
-./Include/Rpc.h
-./Rpc_h.686E96C3_BD4A_45BA_8AF6_19E7ABD1A56C
-./Include/RpcAsync.h
-./RpcAsync_h.6676D74E_393F_4189_B787_21973FBED734
-./Include/RpcDce.h
-./RpcDce_h.84D855AA_091A_4BD6_A1C3_F7A082BEE269
-./Include/RpcDceP.h
-./RpcDceP_h.83370D9F_671B_4F5C_B828_EC68A2BB8E57
-./Include/RpcNdr.h
-./RpcNdr_h.C259E63A_1C45_4AD6_A5ED_C4B48DA56880
-./Include/RpcNsi.h
-./RpcNsi_h.01BED11A_593A_4830_B10D_49B9251101C3
-./Include/RpcNsip.h
-./RpcNsip_h.D7F23C28_1E0F_40C8_9464_9F935B18D207
-./Include/RpcNtErr.h
-./RpcNtErr_h.6705B765_05EA_46F3_8850_6E2FD0161CCE
-./Include/RpcProxy.h
-./RpcProxy_h.B3E6BC74_C7EE_4A6D_98E0_3D201CFB7B7C
-./Include/rpcssl.h
-./rpcssl_h.686E96C3_BD4A_45BA_8AF6_19E7ABD1A56C
-./Include/RrasCfg.h
-./RrasCfg_h.ABED1E8B_FC54_42C7_AA70_D5AE38871834
-./Include/RrasCfg.Idl
-./RrasCfg_Idl.29AEDE29_BA7C_4E46_9E49_6622FDACFD98
-./Include/rtccore.h
-./rtccore_h.4737EAC9_2A94_410B_985A_E1BB842138C5
-./Include/rtccore.idl
-./rtccore_idl.B2265044_637A_4309_A7FC_8C8D7605680A
-./Include/rtcerr.h
-./rtcerr_h.30C11CFB_5C7E_4637_980A_9B105CEEB5E0
-./Include/RTInfo.h
-./RTInfo_h.21D004CD_6F78_4955_A16B_659DCF5D6A23
-./Include/Rtm.h
-./Rtm_h.21D004CD_6F78_4955_A16B_659DCF5D6A23
-./Include/RtmV2.h
-./RtmV2_h.EAB9A09C_3691_4DA9_8BAE_051E85F686D3
-./Include/Rtutils.h
-./Rtutils_h.65C4D4EB_149E_428A_ADD9_F2EB116E3ECD
-./Include/sbe.h
-./sbe_h.8285784E_7B88_4352_BF47_00D17345C9F0
-./Include/sbe.idl
-./sbe_idl.7A52FA73_1A38_4FEB_9FEC_CA35A4B5658C
-./Include/SCardDat.h
-./SCardDat_h.1C0971A6_91F9_4E2E_B4C2_87B836DB15C6
-./Include/SCardDat.Idl
-./SCardDat_Idl.1C0971A6_91F9_4E2E_B4C2_87B836DB15C6
-./Include/SCardDat.Tlb
-./SCardDat_Tlb.1C0971A6_91F9_4E2E_B4C2_87B836DB15C6
-./Include/SCardErr.h
-./SCardErr_h.EB147806_BF8F_42A1_9A2E_0A8E80BFDDF0
-./Include/SCardMgr.h
-./SCardMgr_h.4BFA143D_8CBD_415B_9E87_D9340C468078
-./Include/SCardMgr.Idl
-./SCardMgr_Idl.4BFA143D_8CBD_415B_9E87_D9340C468078
-./Include/SCardMgr.Tlb
-./SCardMgr_Tlb.4BFA143D_8CBD_415B_9E87_D9340C468078
-./Include/SCardSrv.h
-./SCardSrv_h.C11D6AC0_F377_4DD6_9E2B_3C50276B001D
-./Include/SCardSrv.Idl
-./SCardSrv_Idl.C11D6AC0_F377_4DD6_9E2B_3C50276B001D
-./Include/SCardSrv.Tlb
-./SCardSrv_Tlb.C11D6AC0_F377_4DD6_9E2B_3C50276B001D
-./Include/SCardSsp.h
-./SCardSsp_h.7E97E4DA_D811_44DA_A3E4_900089E14442
-./Include/SCardSsp.Idl
-./SCardSsp_Idl.7E97E4DA_D811_44DA_A3E4_900089E14442
-./Include/SCardSsp_i.c
-./SCardSsp_i_c.7E97E4DA_D811_44DA_A3E4_900089E14442
-./Include/SCardSsp_p.c
-./SCardSsp_p_c.7E97E4DA_D811_44DA_A3E4_900089E14442
-./Include/scesvc.h
-./scesvc_h.8ABD08CF_25A8_4240_A4B3_74C3A4E14C9D
-./Include/schannel.h
-./schannel_h.13BD3CAA_12BF_4FA4_894E_EC64B0C933C5
-./Include/Schedule.h
-./Schedule_h.36076E46_D6D2_4BCB_956F_4C4294AEA174
-./Include/Schemadef.h
-./Schemadef_h.1B2C8CDA_BB0E_42F3_AF19_BC43431264CD
-./Include/schnlsp.h
-./schnlsp_h.13BD3CAA_12BF_4FA4_894E_EC64B0C933C5
-./Include/SCode.h
-./SCode_h.6275A519_5B6F_44D8_8373_8046D9DCF7AD
-./Include/ScrnSave.h
-./ScrnSave_h.5CD1471F_7D93_447B_A22B_137ECC2C86D2
-./Include/ScrptIDs.h
-./ScrptIDs_h.516563C5_C229_47C4_BF2F_4A52EA370FEF
-./Include/Sddl.h
-./Sddl_h.616129E9_CC4C_46DC_BD10_2A979A9DCD5E
-./Include/SDKBld.Mak
-./SDKBld_Mak.F285FE09_02D5_46A6_AE80_3D56F0F07252
-./Include/SDKPropBld.Mak
-./SDKPropBld_Mak.BBA55E64_0A14_4ABA_9F09_EC69DE4A1FD8
-./Include/sdoias.h
-./sdoias_h.8271E530_7B95_43BC_B2F7_F1888105ADAE
-./Include/sdoias.idl
-./sdoias_idl.F2D79E13_6598_4B16_81DE_E2EB15D31760
-./Include/SDPBLB.h
-./SDPBLB_h.0C7F31F1_7FB5_42D5_B196_FA07A3007263
-./Include/SDPErr.h
-./SDPErr_h.D17CF40D_83CD_4525_BD0F_98E4F60C4145
-./Include/SecExt.h
-./SecExt_h.D2C02339_8750_446F_9C0A_A153999CC073
-./Include/Security.h
-./Security_h.E141334F_2FA2_45C5_91C6_21CB4F4CBCD2
-./Include/segment.h
-./segment_h.1D0DB362_AEC4_41F1_82EC_4F03329C0E3E
-./Include/segment.idl
-./segment_idl.E5FDEB9E_E907_4B41_A04A_A56ADF588F59
-./Include/SehMap.h
-./SehMap_h.9F3E8D6F_E932_47F2_A900_D4D8E4E62DEF
-./Include/Sens.h
-./Sens_h.6B70B7E1_3524_44D1_A4C5_7E2A28EEF7C3
-./Include/SensAPI.h
-./SensAPI_h.8A4BC635_6371_44DA_BA65_CF25B0218B3D
-./Include/SensEvts.h
-./SensEvts_h.7D561D43_98C0_4925_977E_9DDDB367637C
-./Include/SensEvts.Idl
-./SensEvts_Idl.3F76AC7E_0EF7_4CEC_8211_D1313231BE87
-./Include/ServProv.h
-./ServProv_h.67101666_13C0_4C31_9077_B2522BEE9F32
-./Include/ServProv.Idl
-./ServProv_Idl.6D6236DB_080D_4614_BB14_FD1F3C81D825
-./Include/SetupAPI.h
-./SetupAPI_h.EEE32654_8257_443C_9E1A_FD6073F33F32
-./Include/SetupDD.h
-./SetupDD_h.1A70767D_4FD6_4A04_B8DF_D2C962DDCD12
-./Include/Sfc.h
-./Sfc_h.C7974167_BBEB_4A53_8427_12237BA4ED57
-./Include/shappmgr.h
-./shappmgr_h.25B3537C_424A_48D3_90E0_E3D9A6C7CDFA
-./Include/shappmgr.idl
-./shappmgr_idl.25B3537C_424A_48D3_90E0_E3D9A6C7CDFA
-./Include/shdispid.h
-./shdispid_h.7EBBA489_EFB2_473F_A439_4AAE0A03B949
-./Include/ShellAPI.h
-./ShellAPI_h.69FD2028_CD30_413B_B266_2A66819863FE
-./Include/ShFolder.h
-./ShFolder_h.136C54C6_210F_4971_968F_ACEC0E44E357
-./Include/ShImgData.h
-./ShImgData_h.6AE73A34_6DD2_4B57_8C56_72F4B243EB14
-./Include/ShImgData.idl
-./ShImgData_idl.8365C328_5258_495B_9DE6_0556B312BCA6
-./Include/ShlDisp.h
-./ShlDisp_h.988E7584_FADA_46D3_A5F2_F9EB14F09E23
-./Include/shldisp.idl
-./shldisp_idl.B27B7B3B_CE20_48ED_AD5E_AA57BB12D0DF
-./Include/ShlGuid.h
-./ShlGuid_h.6DB9B2B2_23E2_4441_B3B7_CDE87F8C8E94
-./Include/ShlObj.h
-./ShlObj_h.A84C2D95_C48E_4249_91F2_06215F795BE8
-./Include/Shlwapi.h
-./Shlwapi_h.B1B8D58D_ABEE_4B49_9B15_394BB367F2B2
-./Include/ShObjIdl.h
-./ShObjIdl_h.ED64C791_3CBF_4CFA_B31F_68E1FD718652
-./Include/ShObjIdl.idl
-./ShObjIdl_idl.331E9169_37FE_4AE2_BE25_27BAB37A359D
-./Include/ShTypes.h
-./ShTypes_h.9886548B_F360_4DD9_9B0A_D482DA83FDE5
-./Include/ShTypes.Idl
-./ShTypes_Idl.9F7B319F_1B5E_4295_A328_55812980E890
-./Include/simpdc.h
-./simpdc_h.88DEFDE2_EA2D_45A9_AA02_C9687EF61D83
-./Include/SipBase.h
-./SipBase_h.492027F4_C6EA_4BE3_BF6D_D197B1740EA5
-./Include/sisbkup.h
-./sisbkup_h.AF835D7F_0104_457E_ABCF_C320A9BBEE46
-./Include/SMPAB.h
-./SMPAB_h.A87D9A93_47E5_44C8_BBB5_75AF2524ED62
-./Include/SMPMS.h
-./SMPMS_h.49789C15_7036_4178_8AEA_F5287027047E
-./Include/SMPXP.h
-./SMPXP_h.C505618A_4B69_4F5A_BE7E_99A990ACFA95
-./Include/SMTPReg.Vbs
-./SMTPReg_Vbs.609DD8F3_FB25_494F_92A7_681987B32247
-./Include/Smx.h
-./Smx_h.637CE459_BF68_407F_B818_8A55ED6033D6
-./Include/Snmp.h
-./Snmp_h.9A7BF3ED_9C60_4713_82EB_BB0A1AA54F29
-./Include/SoftPub.h
-./SoftPub_h.AB491E8B_8482_4123_855C_DDF5CB1E430E
-./Include/specstrings.h
-./specstrings_h.A7E4A9D6_09A4_4DF2_ACD6_FDA88EE001F0
-./Include/SpOrder.h
-./SpOrder_h.9B6E488A_F6AD_4278_898D_9F02735977FE
-./Include/Sql_1.h
-./Sql_1_h.5290A828_110C_41CE_BD60_B97DF179F443
-./Include/SrRestorePtApi.h
-./SrRestorePtApi_h.BCA2370E_0B43_4F8C_9817_61CC344CC489
-./Include/SspGuid.h
-./SspGuid_h.221CC243_6A2B_4D8C_BC77_51D35968B074
-./Include/Sspi.h
-./Sspi_h.516F8C44_FB8C_45FF_A1E2_8751FEB8D6C3
-./Include/SspsErr.h
-./SspsErr_h.3AF11FAB_F267_4805_83CF_9B1A637B3A4A
-./Include/SspsIdl.h
-./SspsIdl_h.0380A336_EF59_4095_B4D5_C68327CF8DBC
-./Include/SspsIdl.Idl
-./SspsIdl_Idl.0380A336_EF59_4095_B4D5_C68327CF8DBC
-./Include/Sti.h
-./Sti_h.20464414_274D_4B84_BBD8_7BA0159B34AB
-./Include/Stierr.h
-./Stierr_h.8C8246BA_DB46_46F1_A643_B013BF70B6B5
-./Include/Stireg.h
-./Stireg_h.E8E72B0E_E6AE_4286_8BB4_11956499EAE2
-./Include/StlLock.h
-./StlLock_h.5290A828_110C_41CE_BD60_B97DF179F443
-./Include/Stm.h
-./Stm_h.70A27E5F_FF75_42CA_9D5A_F2B4355533B7
-./Include/Storage.h
-./Storage_h.16ABCD01_36AD_4A60_A153_DBCA2272FA71
-./Include/storprop.h
-./storprop_h.C8C8B1B4_8072_4DD4_BF7A_CCED7D692960
-./Include/StrAlign.h
-./StrAlign_h.A1552497_0C9D_4771_B7E4_7D4E10809242
-./Include/streamcache.h
-./streamcache_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/streamcache.idl
-./streamcache_idl.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/streamdescription.h
-./streamdescription_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/streamdescription.idl
-./streamdescription_idl.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/strmif.h
-./strmif_h.3AADE802_E842_41DB_8CC2_A5515534B320
-./Include/strmif.idl
-./strmif_idl.6F815396_566D_486D_B928_172D4A943671
-./Include/strsafe.h
-./strsafe_h.99B75D06_8146_460D_9C06_CC9FF72BA757
-./Include/SubAuth.h
-./SubAuth_h.3CCC2DFA_E410_42CF_B234_6ED96F1484B1
-./Include/SubsMgr.h
-./SubsMgr_h.D773667D_FF5C_4066_9459_DBEAFAF01681
-./Include/SubsMgr.Idl
-./SubsMgr_Idl.0A592170_B96F_4FE4_8476_CE56BB861CF8
-./Include/SvcGuid.h
-./SvcGuid_h.4504448E_241E_448D_BB0F_EBB4C99247E9
-./Include/SvrAPI.h
-./SvrAPI_h.29CDDC33_7599_41B9_AE7B_0FEE1A799AED
-./Include/Tapi.h
-./Tapi_h.B919B4DC_4012_46C4_8648_A8A09AB4F174
-./Include/Tapi3.h
-./Tapi3_h.3874C7E0_1C3B_4996_8AE9_B70DE540FB3F
-./Include/Tapi3cc.h
-./Tapi3cc_h.72F07100_42BA_4F7F_A4BC_D2B2C63E9D11
-./Include/Tapi3cc.Idl
-./Tapi3cc_Idl.7EE32FB6_4981_4922_8409_851D1C150CAF
-./Include/Tapi3ds.h
-./Tapi3ds_h.8954E1A9_AB36_4649_A32C_D8B945D6BC0A
-./Include/Tapi3ds.Idl
-./Tapi3ds_Idl.67C0E12E_EEE6_4851_A14C_2BF761EA4178
-./Include/Tapi3Err.h
-./Tapi3Err_h.6EAECF84_CBEF_4959_B935_2C5F7D4926D4
-./Include/Tapi3if.h
-./Tapi3if_h.248AFE10_42F6_4CBD_A8F7_7EBC322832ED
-./Include/Tapi3if.Idl
-./Tapi3if_Idl.45307D66_587A_4128_9EE4_BAF24A065735
-./Include/TCError.h
-./TCError_h.480D22A4_2211_4115_A92E_706E9F9FB7CF
-./Include/TCGuid.h
-./TCGuid_h.B3BCDF07_218A_4FE8_89BB_3DE4B36168AA
-./Include/tcpioctl.h
-./tcpioctl_h.46FB67C8_70DD_430F_88F9_F9701E0557DB
-./Include/TermMgr.h
-./TermMgr_h.BF7BADA3_4499_42FB_A843_BB351ED4883A
-./Include/TermMgr.Idl
-./TermMgr_Idl.D31339EF_9B9F_4E43_8984_53EC0AE2919D
-./Include/TextServ.h
-./TextServ_h.775ABBA7_F8C6_4E0D_8FEF_E308FC215B13
-./Include/TextStor.h
-./TextStor_h.DBB9FF29_2C5C_490C_8523_108976F8D732
-./Include/TextStor.idl
-./TextStor_idl.F4BB4DE7_5876_4E61_950D_F0F69EF39705
-./Include/ThrdBase.h
-./ThrdBase_h.00F30509_4929_432E_8BD1_E7F85A715823
-./Include/TimeProv.h
-./TimeProv_h.0F9B3271_E3D9_4A6E_828F_31392FD0B9C2
-./Include/TlHelp32.h
-./TlHelp32_h.E897C532_4CE8_484B_AA1C_1B16AB7E36EF
-./Include/tlogstg.h
-./tlogstg_h.68DE44EB_BE83_418A_8593_F060377F08D6
-./Include/tlogstg.idl
-./tlogstg_idl.68DE44EB_BE83_418A_8593_F060377F08D6
-./Include/Tmschema.h
-./Tmschema_h.C946715B_1375_41BB_A55D_4CFD47BFE17A
-./Include/TNEF.h
-./TNEF_h.7AB5EC44_6C7E_4532_91A5_1290978B0A95
-./Include/TOM.h
-./TOM_h.B5B3C5B6_AF73_4236_A512_B06F80092815
-./Include/Traffic.h
-./Traffic_h.16066953_79AB_46D1_B785_81630262751F
-./Include/Transact.h
-./Transact_h.2374BD40_5007_46F1_97FB_DE70308ADE75
-./Include/triedcid.h
-./triedcid_h.88DEFDE2_EA2D_45A9_AA02_C9687EF61D83
-./Include/triediid.h
-./triediid_h.88DEFDE2_EA2D_45A9_AA02_C9687EF61D83
-./Include/triedit.h
-./triedit_h.88DEFDE2_EA2D_45A9_AA02_C9687EF61D83
-./Include/triedit.idl
-./triedit_idl.88DEFDE2_EA2D_45A9_AA02_C9687EF61D83
-./Include/tsattrs.h
-./tsattrs_h.3FAB8599_F5E3_4099_AA7D_00DADBBB7B32
-./Include/TSPI.h
-./TSPI_h.6EF704EB_E96A_434F_A9FC_FFDFC64A3F67
-./Include/tsuserex.h
-./tsuserex_h.C1DAE510_7E0C_413C_BCAE_26C4362567E2
-./Include/tsuserex_i.c
-./tsuserex_i_c.FA282DBB_64C7_4113_8AB1_F99E8075F728
-./Include/tune.h
-./tune_h.2663DB6E_72C2_4E12_A7C1_BBD0636CE639
-./Include/tuner.h
-./tuner_h.D7EBA75E_B740_4AA7_A3ED_3A3803FD0086
-./Include/tuner.idl
-./tuner_idl.9AB22E0A_19C5_4855_ADD0_FD19795F887F
-./Include/Tvout.h
-./Tvout_h.9408A6E9_FFEB_45CD_A421_518A1C078ECA
-./Include/tvratings.h
-./tvratings_h.72E1BCC8_7119_4737_9219_3D6F76603F2D
-./Include/tvratings.idl
-./tvratings_idl.10A41012_52F3_42F5_AFC1_4B446368A163
-./Include/TxCoord.h
-./TxCoord_h.C743DE82_2591_4093_8CAA_8DEACD874A20
-./Include/TxCtx.h
-./TxCtx_h.E3CEB071_B0E3_4710_BC8F_A32DD1C43774
-./Include/TxDtc.h
-./TxDtc_h.C719189C_D834_4A8E_A37A_276B2F8C3E45
-./Include/UaStrFnc.h
-./UaStrFnc_h.5FA45208_827C_4027_B7B9_361026D9029E
-./Include/Umx.h
-./Umx_h.12220205_1E6A_4490_ACE1_BAC25CB86047
-./Include/unexposeenums2managed.h
-./unexposeenums2managed_h.D32E8ADF_A27B_4376_9ECC_04FB1D59CF8B
-./Include/Unknwn.h
-./Unknwn_h.29FFD2D8_B228_4964_BF48_03B36D4054A1
-./Include/Unknwn.Idl
-./Unknwn_Idl.4C59733F_E214_45DE_9321_D7291B452605
-./Include/UPnP.h
-./UPnP_h.F8442D34_BD20_478B_A3F4_486D729F44D1
-./Include/UPnP.Idl
-./UPnP_Idl.9798F88F_DCC5_43F8_84C8_85F64B511789
-./Include/upnphost.h
-./upnphost_h.F8442D34_BD20_478B_A3F4_486D729F44D1
-./Include/upnphost.idl
-./upnphost_idl.F8442D34_BD20_478B_A3F4_486D729F44D1
-./Include/UrlHist.h
-./UrlHist_h.DF004D08_D087_4369_BBB2_EE77A489A5FA
-./Include/UrlHist.Idl
-./UrlHist_Idl.B319085D_1AF0_434A_9E11_FFE80FFB9F84
-./Include/UrlMon.h
-./UrlMon_h.FF5B5E62_FF21_4387_A017_EC838646AA8F
-./Include/UrlMon.Idl
-./UrlMon_Idl.22BF75B6_BBF9_4D4D_9AE0_764D3E8E656E
-./Include/UserEnv.h
-./UserEnv_h.ACCF379D_140D_434C_8E0A_CC7AD7B5FAE5
-./Include/usp10.h
-./usp10_h.F5C8460F_6ACA_48C9_8D1F_81892C5BCF74
-./Include/UtilLib.h
-./UtilLib_h.8C59EE30_5554_4669_B761_3B6E3F316D3E
-./Include/uuids.h
-./uuids_h.3AADE802_E842_41DB_8CC2_A5515534B320
-./Include/Uxtheme.h
-./Uxtheme_h.8660B580_8880_4CB5_9A96_A0F643B97218
-./Include/vbinterf.h
-./vbinterf_h.2296FBEF_95EB_45BB_B4C6_C875400D5EF7
-./Include/Vcr.h
-./Vcr_h.1292D5BF_1715_4AE2_9371_993777FB6ACB
-./Include/VdmDbg.h
-./VdmDbg_h.2EDE5ECB_1490_4344_984C_EFF1A9189C22
-./Include/VerInfo.Ver
-./VerInfo_Ver.0DC0FE49_F19A_46CE_8C81_AE6B5670F715
-./Include/Vfw.h
-./Vfw_h.679B6ADA_8C6B_4896_8BC1_0571858F7803
-./Include/vfwmsgs.h
-./vfwmsgs_h.BA35D56B_4623_4B06_B6E5_4241A88EDB54
-./Include/vidcap.h
-./vidcap_h.8111C2C1_5692_45A4_AB7E_EB40EF913FBA
-./Include/vidcap.idl
-./vidcap_idl.D1BCA148_DDD0_49D4_8B16_7D4CDF0061C4
-./Include/videoacc.h
-./videoacc_h.8199C354_9222_49E9_AB4B_FB1152845978
-./Include/videoacc.idl
-./videoacc_idl.062A7D03_1BB1_41E4_9941_20A55D08911B
-./Include/vmr9.h
-./vmr9_h.4A99AC3D_110A_4791_B087_697F7FED4175
-./Include/vmr9.idl
-./vmr9_idl.35898D57_7DB3_46B6_9D08_20EFA783300A
-./Include/vmrender.idl
-./vmrender_idl.9C2C4627_15D1_4903_AE44_DE6FE43862DC
-./Include/vpconfig.h
-./vpconfig_h.CA508B0A_AC4A_4562_8A72_4A739C5B5EBA
-./Include/vpnotify.h
-./vpnotify_h.448F933A_5AD0_4765_AC3B_DE9AC06352F7
-./Include/vptype.h
-./vptype_h.E49D7F9C_6392_486D_BEB2_3DA6356B1C60
-./Include/W32chico.mk
-./W32chico_mk.67AF319B_95A7_4C64_809D_D0A8DAB3F54B
-./Include/Wab.h
-./Wab_h.1F9915CD_04E0_461D_ACD5_9DE3C6AC3870
-./Include/WabApi.h
-./WabApi_h.814D267B_97E2_41F7_B3D9_A9E44B4E82C3
-./Include/WabCode.h
-./WabCode_h.E3D1A1E3_0070_43CE_9D66_8A9DAE55B33B
-./Include/WabDefs.h
-./WabDefs_h.9093150B_9A24_47FE_B765_D4F83EBB7FD9
-./Include/WabIab.h
-./WabIab_h.0FC2491D_8588_4E93_A011_5D8AE0DB13DA
-./Include/WabMem.h
-./WabMem_h.50C7E724_CD9C_4A14_AD4B_9CAEF2D91126
-./Include/WabNot.h
-./WabNot_h.0233511A_3F4D_4980_8DB9_D0798A958D44
-./Include/WabTags.h
-./WabTags_h.CD3409EB_F674_4D82_8D67_DE9B6140A1A2
-./Include/WabUtil.h
-./WabUtil_h.88C7C6A7_67A4_4935_BC82_E54B2A38114F
-./Include/WbemAds.h
-./WbemAds_h.3B6C3C2D_78CF_4749_B73D_1AC85D7FADEC
-./Include/WbemAds.Idl
-./WbemAds_Idl.14005787_9CD6_4599_8500_C65D18EF4249
-./Include/WbemCli.h
-./WbemCli_h.0D619B5A_B3B2_4F21_89A2_DFCA7283852A
-./Include/WbemCli.Idl
-./WbemCli_Idl.CCE3F436_2AE1_4716_A1A6_F806348F5A38
-./Include/WbemDisp.h
-./WbemDisp_h.A2AAA253_CED9_4C8A_936D_8E6076B97CC4
-./Include/WbemDisp.Idl
-./WbemDisp_Idl.049653D7_200E_4E72_BA24_C05590804DF7
-./Include/WbemGlue.h
-./WbemGlue_h.F41116F6_1A71_475D_9C4B_C72EBAC7F1B8
-./Include/WbemIdl.h
-./WbemIdl_h.E088A32F_5299_4DD8_8C36_AF75F1810C7E
-./Include/WbemProv.h
-./WbemProv_h.05FFBB7D_FE1B_46D0_BB7B_EA53D9294F54
-./Include/WbemProv.Idl
-./WbemProv_Idl.5CA1D41A_8EC1_41C2_8303_275D2AD376EB
-./Include/WbemTime.h
-./WbemTime_h.3B2A8984_A911_427E_889E_F2C26706C1C4
-./Include/WbemTran.h
-./WbemTran_h.0F715259_B6FE_4587_A7FB_7CD7970E887C
-./Include/WbemTran.Idl
-./WbemTran_Idl.EF06FB62_2043_4FC4_98CD_16892911EF99
-./Include/wdigest.h
-./wdigest_h.87444149_3C25_4020_9220_66D89C616C38
-./Include/WFExt.h
-./WFExt_h.4046170D_A6E3_431A_B672_167DA8BB2DD6
-./Include/Wia.h
-./Wia_h.F5185231_8DDF_4283_A640_8E40ABDD3B8E
-./Include/WiaDef.h
-./WiaDef_h.F5185231_8DDF_4283_A640_8E40ABDD3B8E
-./Include/WiaDevD.h
-./WiaDevD_h.A131ECC5_124A_4A54_938F_F24444626079
-./Include/WiaVideo.h
-./WiaVideo_h.FE491F65_ED04_461D_AD59_78A8FA81165D
-./Include/Win32.Mak
-./Win32_Mak.32CC3E31_83F0_4225_A559_1529850FBE22
-./Include/WinAble.h
-./WinAble_h.5754CDF1_A401_4532_B665_952B5F5C7FFC
-./Include/WinBase.h
-./WinBase_h.98FEB1D2_3B2B_4CD3_BB79_CD15228A5129
-./Include/WinBase.Inl
-./WinBase_Inl.36381470_9072_4963_A182_EDBAC7C4BB47
-./Include/WinBer.h
-./WinBer_h.AACBE31D_20E4_4E0E_989A_9C73A685A186
-./Include/WinCon.h
-./WinCon_h.520BC5A5_BEDB_416C_86CA_112BE4DCEF3E
-./Include/wincred.h
-./wincred_h.49744C78_1148_4A1F_A2D7_1FA6A8345933
-./Include/WinCrypt.h
-./WinCrypt_h.C6E443DD_58DD_4490_B595_C1E7BE0B598D
-./Include/WinDef.h
-./WinDef_h.4E5056AB_9C4E_4C98_8F0D_3E096C589151
-./Include/WinDNS.h
-./WinDNS_h.A8C333C4_852D_47D1_A113_D0A48EC3B477
-./Include/Windows.h
-./Windows_h.28582AD5_027C_4A81_B0D5_D8CBD0B318EC
-./Include/WindowsX.h
-./WindowsX_h.5FBB1A44_E68C_4B79_A7D0_79F719E56FE2
-./Include/Windowsx.h16
-./Windowsx_h16.9B3CF5CD_E7B2_4AC4_92CB_4E4D7384753A
-./Include/WinEFS.h
-./WinEFS_h.A8C333C4_852D_47D1_A113_D0A48EC3B477
-./Include/WinError.h
-./WinError_h.609CB3A1_4CD9_44B6_91C9_B1247F3182A4
-./Include/WinFax.h
-./WinFax_h.8128B6C9_91E6_439A_BA7F_4F59C0BE6DF1
-./Include/WinGDI.h
-./WinGDI_h.F5C8460F_6ACA_48C9_8D1F_81892C5BCF74
-./Include/winhttp.h
-./winhttp_h.F5133C56_8FC8_41D2_A6F2_D6908874119D
-./Include/WinInet.h
-./WinInet_h.2E446360_59B1_493D_95C5_89B0B2E7036B
-./Include/WinIoCtl.h
-./WinIoCtl_h.AB7EF0F8_E722_46A9_BD7C_84D0C4FAC37C
-./Include/Winldap.h
-./Winldap_h.47CA7D74_7F38_4175_9DBF_CE5CFCE47E70
-./Include/WinNetWk.h
-./WinNetWk_h.5EE18030_718A_4794_A5A8_7A4FED9B024A
-./Include/WinNls.h
-./WinNls_h.B4F7CED1_2696_4AA1_B6A5_3AC624A7D266
-./Include/WinNls32.h
-./WinNls32_h.34C54F59_BC74_4516_AE93_6FB4D1CD8670
-./Include/WinNT.h
-./WinNT_h.32234913_5E7B_4D0B_8433_96531AF0C513
-./Include/WinNT.rh
-./WinNT_rh.B7E118AC_F736_46A7_99EE_C1BDB7AC2206
-./Include/WinPerf.h
-./WinPerf_h.838008B8_D8A2_454B_B57A_5FC783ADCE27
-./Include/WinReg.h
-./WinReg_h.33A89CA4_AFBA_4352_85BD_7B4BF3DE1538
-./Include/WinResrc.h
-./WinResrc_h.E2B07E3C_D396_4498_B02D_281236B0E9EE
-./Include/winsafer.h
-./winsafer_h.C0F7A7C4_F5A5_4226_9C91_CC1E6764897F
-./Include/WinSCard.h
-./WinSCard_h.48F96F95_938E_4F50_AD05_A46ACE1FEC49
-./Include/WinSmCrd.h
-./WinSmCrd_h.1359F694_26C9_4747_BE5D_0AD98737FEAD
-./Include/WinSnmp.h
-./WinSnmp_h.DD111F2F_C1BD_4C30_89D9_27DF2C7361F9
-./Include/WinSock.h
-./WinSock_h.4775E2BA_6838_4D56_B6FB_8ECCADE487F6
-./Include/WinSock2.h
-./WinSock2_h.103B9608_3EFE_4377_813B_D790EC6D950C
-./Include/WinSpool.h
-./WinSpool_h.D587E440_91BD_4546_AF25_6736A5B3C9F2
-./Include/WinSvc.h
-./WinSvc_h.852E9034_6AF3_4CB5_899B_C3736A1356CB
-./Include/winternl.h
-./winternl_h.98FEB1D2_3B2B_4CD3_BB79_CD15228A5129
-./Include/WinTrust.h
-./WinTrust_h.66B7FD4F_7910_4084_BD92_621489148889
-./Include/WinUser.h
-./WinUser_h.A91E985D_2676_4981_A4AC_EEFEACBC7ECF
-./Include/WinUser.Inl
-./WinUser_Inl.11E24A77_AFEE_4E4B_AA6A_ACC92E0CBE0A
-./Include/WinUser.rh
-./WinUser_rh.54C20B60_1461_4CAD_A667_DB71413909AD
-./Include/WinVer.h
-./WinVer_h.BB8A24ED_88B1_4CA0_840A_25BB555557C7
-./Include/WinWlx.h
-./WinWlx_h.11136E1A_61F6_4146_8032_C228B3222859
-./Include/Wmistr.h
-./Wmistr_h.EB11C6D9_1296_41FC_9D91_04FC97A948F7
-./Include/WMIUtils.h
-./WMIUtils_h.54CC0E71_AAF5_4790_9556_697438943CD1
-./Include/WMIUtils.Idl
-./WMIUtils_Idl.81AE6D89_A17C_4EFF_9AA9_6F4743427874
-./Include/wmsbasicplugin.h
-./wmsbasicplugin_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/WMSBasicPlugin.idl
-./WMSBasicPlugin_idl.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsbuffer.h
-./wmsbuffer_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsbuffer.idl
-./wmsbuffer_idl.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmscatid.h
-./wmscatid_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmscontext.h
-./wmscontext_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmscontext.idl
-./wmscontext_idl.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsContextNames.h
-./wmsContextNames_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsdatapath.h
-./wmsdatapath_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsdatapath.idl
-./wmsdatapath_idl.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsdefs.h
-./wmsdefs_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsevent.h
-./wmsevent_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsevent.idl
-./wmsevent_idl.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmseventlog.h
-./wmseventlog_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmseventlog.idl
-./wmseventlog_idl.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsheaderline.h
-./wmsheaderline_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsHeaderline.idl
-./wmsHeaderline_idl.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsincomingcounters.h
-./wmsincomingcounters_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsincomingcounters.idl
-./wmsincomingcounters_idl.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsnamedvalues.h
-./wmsnamedvalues_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsnamedvalues.idl
-./wmsnamedvalues_idl.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmspacket.h
-./wmspacket_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmspacket.idl
-./wmspacket_idl.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsplaylistparser.h
-./wmsplaylistparser_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/WMSPlaylistParser.idl
-./WMSPlaylistParser_idl.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsplugin.h
-./wmsplugin_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsplugin.idl
-./wmsplugin_idl.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsproxy.h
-./wmsproxy_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsproxy.idl
-./wmsproxy_idl.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsserver.h
-./wmsserver_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsserver.idl
-./wmsserver_idl.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/WMSServerTypeLib.dll
-./WMSServerTypeLib_dll.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsxmldomextensions.h
-./wmsxmldomextensions_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/wmsXMLDOMExtensions.idl
-./wmsXMLDOMExtensions_idl.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/WowNT16.h
-./WowNT16_h.DEC9183D_2F17_4F9A_BDB0_31D2D7C357C6
-./Include/WowNT32.h
-./WowNT32_h.C2AF23C8_1712_4691_BAB3_DA701D8364D0
-./Include/WPApi.h
-./WPApi_h.812A531C_87B6_42B5_A165_2BCE700E2AF3
-./Include/WPApiMsg.h
-./WPApiMsg_h.91A4B0E1_9F0E_4924_B763_5A1E2A8F7C92
-./Include/WPCrsMsg.h
-./WPCrsMsg_h.E326575F_A5B3_475A_A76F_BABF3F895F11
-./Include/WPFtpMsg.h
-./WPFtpMsg_h.ED2324EE_4229_44A3_866A_3E0B68D2C7D0
-./Include/WPObj.Idl
-./WPObj_Idl.BFFC9932_25E2_49B4_981C_D2507CB010E1
-./Include/WPPstMsg.h
-./WPPstMsg_h.1644EF3F_238D_4B90_8865_879BE9F547D8
-./Include/WPSpi.Idl
-./WPSpi_Idl.5A7493DC_D4DD_433D_863C_208BB280C8D6
-./Include/WPSpiHlp.h
-./WPSpiHlp_h.E03EFDF1_D9C5_479C_88FD_84FD532FB5F0
-./Include/wptypes.h
-./wptypes_h.88DEFDE2_EA2D_45A9_AA02_C9687EF61D83
-./Include/WPWizMsg.h
-./WPWizMsg_h.9B9C2555_5CBA_4AD8_ABBC_1B4152E4330A
-./Include/WS2atm.h
-./WS2atm_h.13B34B03_17DF_4676_9A0D_92ED5D9E4CA8
-./Include/ws2bth.h
-./ws2bth_h.251FFCE3_D561_4089_9F89_E9DEB07FA35B
-./Include/WS2dnet.h
-./WS2dnet_h.4D0848D2_6BB2_4053_BC04_92750E8939F4
-./Include/WS2spi.h
-./WS2spi_h.289F6E25_5761_47A9_8EDF_453B11BA35A9
-./Include/WS2tcpip.h
-./WS2tcpip_h.4DD0212E_A8BD_484D_BE03_0AD3D6F54DE3
-./Include/WShisotp.h
-./WShisotp_h.80FC65EB_7FF4_46E9_8936_D799FB01EE1B
-./Include/wsipv6ok.h
-./wsipv6ok_h.FA5A89C6_E25E_4CF9_9FFA_A77AA2D61785
-./Include/WSipx.h
-./WSipx_h.13C78969_D41D_4ABE_A6FF_116EE77578C2
-./Include/WSnetbs.h
-./WSnetbs_h.D7C31035_44E3_4CFA_A8A4_F8CB1CC87404
-./Include/WSNwLink.h
-./WSNwLink_h.5DE51140_B483_45AF_8177_D6989858DBD9
-./Include/WSPiApi.h
-./WSPiApi_h.BEFA7ED6_FC39_4146_9EB2_5C95E14F137E
-./Include/wsrm.h
-./wsrm_h.7BBE1837_FC5C_4083_93A2_E7823DFFB0B2
-./Include/WSvns.h
-./WSvns_h.3CCC2DFA_E410_42CF_B234_6ED96F1484B1
-./Include/WtsApi32.h
-./WtsApi32_h.1B223AAF_BC94_4BF9_B843_EF75BBF8DFF8
-./Include/WTypes.h
-./WTypes_h.ECC4D2C4_2FC9_47C4_96ED_E6BF3923D561
-./Include/WTypes.Idl
-./WTypes_Idl.FB36E427_62AF_41F8_AD24_25EFF7DCE79C
-./Include/wuapi.h
-./wuapi_h.D8BAB654_276B_464C_AB60_4287E66587F8
-./Include/wuapi.idl
-./wuapi_idl.0D30EBE9_A053_43E5_8903_BCF057F39584
-./Include/wuerror.h
-./wuerror_h.2A651221_9DA4_4FF5_80AB_19011BFA3022
-./Include/xa.h
-./xa_h.347A116E_2A2B_4B3A_8D38_B65119978278
-./Include/XCMC.h
-./XCMC_h.C2A30016_81F6_48EC_9250_B7857EB09446
-./Include/XCMCExt.h
-./XCMCExt_h.BE2E7F86_ACF8_4596_B4A7_A19CC8CC1484
-./Include/XCMCMSX2.h
-./XCMCMSX2_h.56ECF8A0_8D04_4505_AC98_FCF6A541CB8C
-./Include/XCMCMSXT.h
-./XCMCMSXT_h.0B38CB3F_5F0A_49CF_AA61_8ED566DDD627
-./Include/xenroll.h
-./xenroll_h.3EC2F34E_A4EB_4F7B_BC3F_92AE9A24634F
-./Include/xmldom.h
-./xmldom_h.DDD934DA_AA2F_45E0_942F_24B79477F5AF
-./Include/XmlDom.Idl
-./XmlDom_Idl.9C80BF6B_6483_4E4F_A5DE_6F9D928D0B0A
-./Include/XmlDomDid.h
-./XmlDomDid_h.19B17D86_F027_4043_A576_0557D5F64435
-./Include/XmlDso.Idl
-./XmlDso_Idl.A1452C9C_2610_4C2B_9CF9_2A1F8CAFB09D
-./Include/XmlDsodid.h
-./XmlDsodid_h.C9A4FCFF_3432_4FB7_ABEB_0FA74A21C426
-./Include/XMLTrnsF.h
-./XMLTrnsF_h.61A721A5_B08A_4EE4_B81D_AEFCCEDF72D5
-./Include/XMLTrnsF.Idl
-./XMLTrnsF_Idl.80728B11_7B2B_4DE6_9B3C_D8F80B25AB56
-./Include/xmmintrin.h
-./xmmintrin_h.1C6C3797_206B_47D5_96AE_B46EE72E2290
-./Include/xoleHlp.h
-./xoleHlp_h.4116419D_F6D4_4172_B340_389389809A2C
-./Include/xprtdefs.h
-./xprtdefs_h.277EC9DC_FFBE_4492_B28C_75E8ECB772DF
-./Include/zmouse.h
-./zmouse_h.DA7A9A5A_DA68_478A_833A_F4FC31868A1C
-./Include/_dbdao.h
-./_dbdao_h.231C3B04_E959_439A_86C4_B9DD9BAF6414
-./Lib/AclUI.Lib
-./AclUI_Lib.9A15A36F_8A8C_4898_833C_C5DA38AB7068
-./Lib/ActiveDS.Lib
-./ActiveDS_Lib.AEEC69F0_7F97_4EC7_ADAC_11B582264202
-./Lib/Ad1.Lib
-./Ad1_Lib.6F6C857F_5B22_4FBE_BF3C_4BFA324FB0E2
-./Lib/Adptif.Lib
-./Adptif_Lib.4618B0D6_CD10_4684_8D00_39B0C11C49B3
-./Lib/ADSIid.Lib
-./ADSIid_Lib.16DA5533_8F0C_4A7B_8DAE_AF81A91DAE2D
-./Lib/AdvAPI32.Lib
-./AdvAPI32_Lib.0CD78343_1C13_4859_8E6E_6D1188DD4561
-./Lib/AMD64/amstrmid.lib
-./strmiids_lib.C064EC07_DFB3_41F3_8B67_CFED1A5774F0
-./Lib/AMD64/AuthZ.Lib
-./AuthZ_Lib.02431FC6_DF7A_45CA_BF1C_A61A2825CBF7
-./Lib/AMD64/clfsw32.lib
-./clfsw32_lib.73F64881_4A87_4A4F_BA4E_D096B0982E10
-./Lib/AMD64/dmoguids.lib
-./dmoguids_lib.E1CF6DD7_C7D1_4E82_99E4_667053F23791
-./Lib/AMD64/FrameDyD.Lib
-./FrameDyD_Lib.D5508E7B_3C44_48D8_A0AD_892930BB42B4
-./Lib/AMD64/FrameDyn.Lib
-./FrameDyn_Lib.6FA4B0BA_8526_465C_A418_AA71A5076667
-./Lib/AMD64/irprops.lib
-./irprops_lib.19C26F36_08C9_44CA_9D92_175E47BE34D6
-./Lib/AMD64/msdmo.lib
-./msdmo_lib.E3C16984_3568_44CF_B567_F27BE9576A8E
-./Lib/AMD64/Msi.Lib
-./Msi_Lib.A1E07DC9_A3D6_41FF_938A_5600B250C0BE
-./Lib/AMD64/p2p.lib
-./p2p_lib.AC11103C_7DAE_43F2_A541_31B493E291CA
-./Lib/AMD64/p2pgraph.lib
-./p2pgraph_lib.271F53C4_20A3_455B_9EDA_99C2C405E7F9
-./Lib/AMD64/quartz.lib
-./quartz_lib.74B50B64_F2E5_45D0_83A6_428724419EFC
-./Lib/AMD64/strmiids.lib
-./strmiids_lib.C064EC07_DFB3_41F3_8B67_CFED1A5774F0
-./Lib/AMD64/WbemUuid.Lib
-./WbemUuid_Lib.CB6803C1_B2CF_4EC9_916C_CE73214B3D59
-./Lib/AMD64/WinFax.Lib
-./WinFax_Lib.0A31F126_D8AC_4CEE_8313_88694B86616C
-./Lib/AMD64/wmiutils.lib
-./wmiutils_lib.014FFE1B_99A9_42FD_83D3_CFD1201113FC
-./Lib/AMD64/wuguid.lib
-./wuguid_lib.4139E85B_BFCE_4628_A127_14A7C3CAF266
-./Lib/amstrmid.lib
-./strmiids_lib.0DB203F5_D714_4EDC_BB66_5C04C287593A
-./Lib/ASycFilt.Lib
-./ASycFilt_Lib.C1F353E4_23AD_40AB_9B28_953F002CACDF
-./Lib/atlsd.pdb
-./atlsd_pdb.E09F1B9F_A836_4595_80BB_1095F46C1D07
-./Lib/AuthZ.Lib
-./AuthZ_Lib.F067DB96_7635_4501_97D8_13FA0E787648
-./Lib/bhsupp.lib
-./bhsupp_lib.F4AF8576_361F_4294_A151_6152486CDB43
-./Lib/Bits.Lib
-./Bits_Lib.FFCFFD01_01B3_4741_B42C_D9CD593867E6
-./Lib/bufferoverflowu.lib
-./bufferoverflowu_lib.80541E77_F628_4FAD_B1B2_8B79E9987352
-./Lib/Cabinet.Lib
-./Cabinet_Lib.24F0A612_9E3E_4EED_ACAB_0EACCF0CF28A
-./Lib/Cap.Lib
-./Cap_Lib.916C6B9F_3653_45D3_BA92_381B9EDC5F9C
-./Lib/cdoex.tlb
-./cdoex_tlb.FE314838_0827_4DA3_ABF1_65F3C78D3C10
-./Lib/cdoexm.tlb
-./cdoexm_tlb.F92DE74A_5F57_481B_ADA4_A41DD86B05CE
-./Lib/CDOSys.Tlb
-./CDOSys_Tlb.16BBD390_1C48_4286_881F_2BC54FA44ACE
-./Lib/certadm.lib
-./certadm_lib.7D2B5BC3_6D79_4A17_8A44_9F7E8AD2F656
-./Lib/certidl.lib
-./certidl_lib.7D2B5BC3_6D79_4A17_8A44_9F7E8AD2F656
-./Lib/CiUuid.Lib
-./CiUuid_Lib.CC9681FB_1CB2_48CA_8985_0755BD87ABED
-./Lib/clfsw32.lib
-./clfsw32_lib.9AF3D907_9FA7_4857_B163_F59603D89F61
-./Lib/ClusApi.Lib
-./ClusApi_Lib.11AB98BA_3E0A_456E_89FB_3C334E95F9BA
-./Lib/ComCtl32.Lib
-./ComCtl32_Lib.8FFE832C_F04C_4C28_A6B8_7E7FBF7C629C
-./Lib/ComDlg32.Lib
-./ComDlg32_Lib.A526F3F6_F952_43C7_93BC_6D84BDF7D9A6
-./Lib/ComMode.Obj
-./ComMode_Obj.2EA33CC1_3539_4E80_A72B_FEF56B43D9EA
-./Lib/ComSvcs.Lib
-./ComSvcs_Lib.3D8CF04C_306E_4CFC_B87B_75227675F26D
-./Lib/credui.lib
-./credui_lib.BB90E752_F1C6_4AF0_91A9_C6A033274773
-./Lib/Crypt32.Lib
-./Crypt32_Lib.20163454_1762_49EF_B8BD_91F0C396DFCE
-./Lib/CryptNet.Lib
-./CryptNet_Lib.505BA3BE_ECE3_4371_8DD9_8D69FA86088C
-./Lib/cryptui.lib
-./cryptui_lib.F64BCB34_CA8D_4E75_A28E_16F26B85EDDA
-./Lib/d3d8thk.lib
-./d3d8thk_lib.B5870F76_AA76_4F54_9DAF_6B259592563B
-./Lib/daouuid.lib
-./daouuid_lib.A0CF24DE_9DE9_427A_ABE0_E1D5A4DAC06E
-./Lib/DbgEng.Lib
-./DbgEng_Lib.F2F687FA_3908_4C6A_9885_10CC1176BA7D
-./Lib/DbgHelp.Lib
-./DbgHelp_Lib.9632CD46_E9EC_418A_B71A_96145D5E6EB2
-./Lib/dciman32.lib
-./dciman32_lib.4CA404D6_C317_4C53_9D27_F808A783201B
-./Lib/ddao35.lib
-./ddao35_lib.81BD4D37_BA60_4C6C_8E3E_513C269F5F26
-./Lib/ddao35d.lib
-./ddao35d_lib.5B422C2E_6710_4456_BAD1_A899856EF7FD
-./Lib/ddao35u.lib
-./ddao35u_lib.16516F51_73F4_4A73_BC78_7DDDB26973A3
-./Lib/ddao35ud.lib
-./ddao35ud_lib.F1A17DBC_BC2D_4177_A820_A16EB7EBC835
-./Lib/DhcpCSvc.Lib
-./DhcpCSvc_Lib.78034C53_7EBA_4EE4_A1D6_234C0380B6D2
-./Lib/dhcpsapi.lib
-./dhcpsapi_lib.B078BD2F_593F_4258_A218_E80AF5AB6AC1
-./Lib/DlcAPI.Lib
-./DlcAPI_Lib.A451EBCF_9D55_4AD6_858C_0B998963B109
-./Lib/dmoguids.lib
-./dmoguids_lib.0323C054_642D_44EB_9F25_78316D700E20
-./Lib/DnsAPI.Lib
-./DnsAPI_Lib.3F010595_2C0B_4787_9107_A2F5C84EA3FE
-./Lib/DSProp.Lib
-./DSProp_Lib.03116C90_2554_4543_A5F1_E9979E73C3A8
-./Lib/DSUIExt.Lib
-./DSUIExt_Lib.49D2B62F_28F4_4C2A_8361_DFC1B041A4F7
-./Lib/DtcHelp.Lib
-./DtcHelp_Lib.F3540DF1_46E6_4686_A04A_63A12C61F5C4
-./Lib/encapi.lib
-./encapi_lib.5DB86A2F_D54F_45C0_9221_F7101D152817
-./Lib/esebcli2.lib
-./esebcli2_lib.35FD9A9C_F0E9_439E_BBEB_C23A439ACB09
-./Lib/Esent.Lib
-./Esent_Lib.F0A54786_DB52_4315_9FA5_B80DC9D66313
-./Lib/exevtsnk.tlb
-./exevtsnk_tlb.5DA3BCCE_05E5_46F2_B7AF_7D2330821965
-./Lib/FaultRep.Lib
-./FaultRep_Lib.344CE5CC_5C49_4374_A7BB_C875DF3F389C
-./Lib/Fci.Lib
-./Fci_Lib.85D4EF0A_7CF1_4E45_A3E7_AD03F4519998
-./Lib/Fdi.Lib
-./Fdi_Lib.2FCDE2D4_A1FB_4BB4_B957_F0FAF39A2AFF
-./Lib/FrameDyD.Lib
-./FrameDyD_Lib.F8560B5B_F431_4D2A_9FB5_9F87169B04FC
-./Lib/FrameDyn.Lib
-./FrameDyn_Lib.CC2BEF0B_70DE_4F5C_A69F_7AB77C20DD30
-./Lib/Gdi32.Lib
-./Gdi32_Lib.0D632DC3_BB1F_4E2D_ABF7_8491468D50BE
-./Lib/GdiPlus.lib
-./GdiPlus_lib.EE97B0F6_1FE7_4542_890E_EBD631ADC199
-./Lib/GlAux.Lib
-./GlAux_Lib.E2F48DBA_DC60_47DF_A09F_518D5B301A79
-./Lib/GlU32.Lib
-./GlU32_Lib.03AC33CE_35E0_4F59_8105_AFB0FBFAD34F
-./Lib/GPEdit.Lib
-./GPEdit_Lib.42AAB786_65B6_4D59_BE71_DB6DEB5CF2D1
-./Lib/gpmuuid.lib
-./gpmuuid_lib.5CAAE8C3_6BFD_4777_8FCE_2A4946CD2BAA
-./Lib/HelpCenterInterfaces.tlb
-./HelpCenterInterfaces_tlb.6B2EDAAC_34DF_4763_9B5D_C6C24FA9ED4E
-./Lib/HelpServiceInterfaces.tlb
-./HelpServiceInterfaces_tlb.09FB54EC_E4F2_49CB_9496_11B8FFE93EA3
-./Lib/HLink.Lib
-./HLink_Lib.383AC439_340C_4A4E_861A_99D4CAA369AF
-./Lib/Htmlhelp.Lib
-./Htmlhelp_Lib.5E1F2358_3DC1_46C7_BFB0_EC70C0BCACEE
-./Lib/httpapi.lib
-./httpapi_lib.E86A0C57_4744_488F_B781_BA6BFBB4155B
-./Lib/IA64/amstrmid.lib
-./strmiids_lib.52F1CDE7_9DDB_4AB4_AFCF_463CD2608C9D
-./Lib/IA64/AuthZ.Lib
-./AuthZ_Lib.D93A5E28_3F45_4660_AE5B_1C78C81DD7C9
-./Lib/IA64/clfsw32.lib
-./clfsw32_lib.0004A60C_157F_4A1C_AD8E_476D26B1649E
-./Lib/IA64/dmoguids.lib
-./dmoguids_lib.EE0200CA_470C_4AF7_ABE1_93B3340EE47C
-./Lib/IA64/FrameDyD.Lib
-./FrameDyD_Lib.815A2736_25DA_48F4_B2AA_61FEF5635762
-./Lib/IA64/FrameDyn.Lib
-./FrameDyn_Lib.4E0AFA9B_6AD0_4087_AA56_E017784968CE
-./Lib/IA64/irprops.lib
-./irprops_lib.A549EE51_6C57_469A_815C_818023F9B560
-./Lib/IA64/msdmo.lib
-./msdmo_lib.C308405B_70B6_462F_868E_185ECDDD119C
-./Lib/IA64/Msi.Lib
-./Msi_Lib.CD051EAF_49FE_415F_AB48_2E229C8DF261
-./Lib/IA64/p2p.lib
-./p2p_lib.CD80BF42_3527_4C83_83C3_A1D9E182A0A3
-./Lib/IA64/p2pgraph.lib
-./p2pgraph_lib.CA91CED1_C766_44BC_A36A_1AEF39F3B89C
-./Lib/IA64/quartz.lib
-./quartz_lib.B11F6138_FD79_4072_B1D6_6D714E5FC9F8
-./Lib/IA64/strmiids.lib
-./strmiids_lib.52F1CDE7_9DDB_4AB4_AFCF_463CD2608C9D
-./Lib/IA64/WbemUuid.Lib
-./WbemUuid_Lib.8E7EA6E4_06D2_4687_B10A_FB265A50FA4B
-./Lib/IA64/WinFax.Lib
-./WinFax_Lib.96D024FA_D730_483E_B212_8E9B52D863D9
-./Lib/IA64/wmiutils.lib
-./wmiutils_lib.E4BAA10C_C5BB_4135_B1E7_05061545C38E
-./Lib/IA64/wuguid.lib
-./wuguid_lib.9917994D_2824_4BD0_9D52_7DAD3DFC82F2
-./Lib/Icm32.Lib
-./Icm32_Lib.9F4D73CC_ED71_4634_A33B_5C9DEC62074D
-./Lib/Icmui.Lib
-./Icmui_Lib.5FA51D8B_3D44_4DBF_809F_B05F76496189
-./Lib/ImageHlp.Lib
-./ImageHlp_Lib.368D4A34_7E69_4A3C_B987_F56FFF784590
-./Lib/Imm32.Lib
-./Imm32_Lib.2FD92C77_BAF0_4DBE_9AA8_1523DECEF10F
-./Lib/IPHlpApi.Lib
-./IPHlpApi_Lib.3FE06992_9558_443B_9BDB_7B52F64CD274
-./Lib/Iprop.Lib
-./Iprop_Lib.534FA736_8D92_409D_8699_7BE1A1F4F555
-./Lib/irprops.lib
-./irprops_lib.1973B836_9EAC_4700_897C_DB35115C892C
-./Lib/Kernel32.Lib
-./Kernel32_Lib.A9BCE7E5_14B7_4059_874F_75389CCE54B7
-./Lib/KSGuid.Lib
-./KSGuid_Lib.A6888BC0_CCA1_40A3_A3D5_B4C992D84B2C
-./Lib/KSProxy.Lib
-./KSProxy_Lib.E4591F72_1F54_44B1_94CC_75BB6779C240
-./Lib/ksuser.lib
-./ksuser_lib.64FB2349_E73B_4A40_8662_EF514EB189DE
-./Lib/libcp.lib
-./libcp_lib.A17F9274_1A32_41B6_AFC8_54B37630E973
-./Lib/LoadPerf.Lib
-./LoadPerf_Lib.AED813E8_50E1_48E2_A916_584D6097BC35
-./Lib/Lz32.Lib
-./Lz32_Lib.5C7E3FE3_E15D_46AF_9C86_D55D254C80C6
-./Lib/MAPI.Lib
-./MAPI_Lib.86F82B90_A89B_4770_AB9D_5C60E04AFE7F
-./Lib/MAPI32.Lib
-./MAPI32_Lib.E961A89C_2243_4F06_BB90_8E95D6AC466A
-./Lib/MgmtAPI.Lib
-./MgmtAPI_Lib.C5EC3B13_4A8A_49A7_96EE_2E0358ECBA39
-./Lib/MiniDump.Lib
-./MiniDump_Lib.2E77CDEF_5864_462F_BB96_3A042C9EEA5E
-./Lib/MMC.Lib
-./MMC_Lib.AEF68E07_B3EF_49B9_ACEC_A9B62E61EE89
-./Lib/mmcutil.lib
-./mmcutil_lib.E18E150D_2A78_4F3B_BE60_5A8EB37DFF9C
-./Lib/MobSync.Lib
-./MobSync_Lib.81B50CA5_D5A5_40BF_9243_DD648DDC0783
-./Lib/Mpr.Lib
-./Mpr_Lib.289B440E_9D42_4BB1_B874_40E440E311F9
-./Lib/Mprapi.Lib
-./Mprapi_Lib.61A3426E_5130_449C_9437_5831AD0D5C16
-./Lib/MqOA.Lib
-./MqOA_Lib.2578C743_8666_4818_B79A_60E516FF351D
-./Lib/MqOA.Tlb
-./MqOA_Tlb.64EB45FB_C2C0_4A5E_AACB_036309D1BB90
-./Lib/MqOA10.Tlb
-./MqOA10_Tlb.FBE8D3ED_66D2_4CA7_89AF_9DD5A6EA9FA8
-./Lib/MqOA20.Tlb
-./MqOA20_Tlb.2C57A5CB_DB76_47C9_8300_90EBBA70B9F6
-./Lib/MqRt.Lib
-./MqRt_Lib.80BCBAD7_1D21_4553_A86A_7AC7B7B3F5DF
-./Lib/MSAcm32.Lib
-./MSAcm32_Lib.CF850E44_96BD_471E_96D4_6B23581E4AE0
-./Lib/MSClus.Tlb
-./MSClus_Tlb.2175AEC2_8049_4FD8_B4CF_76F878EA6E25
-./Lib/Mscms.Lib
-./Mscms_Lib.33DCF768_5B9C_4E15_A2FB_6935D7C9C02F
-./Lib/mscoree.lib
-./mscoree_lib.E0E1D8FD_BA26_4312_AA3E_A4170BBF8695
-./Lib/msdmo.lib
-./msdmo_lib.1E32782E_A0BF_4712_AE4F_255251BF7CA0
-./Lib/Msi.Lib
-./Msi_Lib.67084657_30A9_4EFF_B197_B11DCD485A0F
-./Lib/MSImg32.Lib
-./MSImg32_Lib.42A082C8_1D43_4B12_BF92_66B6AB8FE0C0
-./Lib/MsPatchC.lib
-./MsPatchC_lib.918CCAE6_8D3B_4E0B_84EA_E8F0E3BA6221
-./Lib/MSRating.Lib
-./MSRating_Lib.1662590C_E0D2_45D7_9803_F851DCC4FE73
-./Lib/MSTask.Lib
-./MSTask_Lib.050DA632_4030_44EB_B574_879FB8B1E841
-./Lib/msvidctl.tlb
-./msvidctl_tlb.A06015DC_CDFF_4C99_8E1C_2A3865483580
-./Lib/MsWSock.Lib
-./MsWSock_Lib.469B101C_2360_4B3A_B3C9_0E5558B6046F
-./Lib/MsXml.Tlb
-./MsXml_Tlb.82963235_CF3C_44A0_B8C5_F8DAAC9A3AE1
-./Lib/MsXml2.Lib
-./MsXml2_Lib.9EDC55D1_9BCC_447B_8702_0BF14996C03F
-./Lib/Mtx.Lib
-./Mtx_Lib.3A3BDFED_9B85_40E9_9F9A_F8E7DF03E962
-./Lib/mtxdm.lib
-./mtxdm_lib.F55F560D_7F6B_4A6A_B066_589546F975D4
-./Lib/NetAPI32.Lib
-./NetAPI32_Lib.92FE6B31_5B2E_41C9_8A9F_02F9D635F3A5
-./Lib/NetSh.Lib
-./NetSh_Lib.D55E9B11_6D01_4790_9B41_AF658643381B
-./Lib/nmapi.lib
-./nmapi_lib.6DBB88FE_06BC_4A47_90C7_17C56415295D
-./Lib/NMSupp.Lib
-./NMSupp_Lib.D60D98A3_D6FC_4840_BE91_4FAE2EFA76C8
-./Lib/normaliz.lib
-./normaliz_lib.6BD4CCC7_ABE9_477A_9E7A_7B4E901E5B0A
-./Lib/npptools.lib
-./npptools_lib.B4A415FA_3843_49A9_B323_364EAB2CC100
-./Lib/NtDsAPI.Lib
-./NtDsAPI_Lib.D7349744_C6DF_4EA6_811D_48EE52DCBA9A
-./Lib/NtDsBCli.Lib
-./NtDsBCli_Lib.25D50058_43DF_4155_84C4_5BE0D17A521A
-./Lib/NTMSAPI.Lib
-./NTMSAPI_Lib.EC495AE3_1256_4642_8C8C_9364488BDFFE
-./Lib/NtQuery.Lib
-./NtQuery_Lib.DF456C15_8F6B_433D_BCC4_E89AE3C6C943
-./Lib/Ole32.Lib
-./Ole32_Lib.DA843F44_7115_435F_80DB_242BAC6E912F
-./Lib/OleAcc.Lib
-./OleAcc_Lib.A62926F7_8D12_4B14_AB10_108E281A6BC9
-./Lib/OleAut32.Lib
-./OleAut32_Lib.26836FE1_E3FC_4A1B_913A_6F946F2DFC15
-./Lib/OleDlg.Lib
-./OleDlg_Lib.A74B7DE4_5C86_4A5E_A437_F93B6EB4CB2A
-./Lib/OlePro32.Lib
-./OlePro32_Lib.D736CB1B_E847_41C5_95E4_6CDDE306BC73
-./Lib/OpenGL32.Lib
-./OpenGL32_Lib.3DF9DD3A_BB1E_4181_9A5C_8CCA2F338824
-./Lib/p2p.lib
-./p2p_lib.8B601DD2_E333_4CB4_9025_3F58C40B7DA7
-./Lib/p2pgraph.lib
-./p2pgraph_lib.F9C0C721_F1BF_487B_8875_4E43667557F1
-./Lib/parser.lib
-./parser_lib.BF46AAF9_7F39_4611_B52E_AF5D78129257
-./Lib/PatchWiz.lib
-./PatchWiz_lib.2297E45B_2AF3_4B86_9264_6C41FA560BE6
-./Lib/Pdh.Lib
-./Pdh_Lib.2D665DCE_03FF_4EFB_A4A3_5BD60C3A5647
-./Lib/PEnter.Lib
-./PEnter_Lib.66191BD5_685B_49EE_A3BE_43D25A37A329
-./Lib/powrprof.lib
-./powrprof_lib.5DA8AB9E_F3DB_4579_AA04_09145CB2EF4C
-./Lib/Psapi.Lib
-./Psapi_Lib.28C32E8C_CFFF_434F_B495_9997F2F639DB
-./Lib/QosName.Lib
-./QosName_Lib.E41563C4_0C4C_453F_98EF_6B5BE01BB7DB
-./Lib/quartz.lib
-./quartz_lib.635DCB23_9E81_4F16_90C5_3403A6D70263
-./Lib/RASAPI32.Lib
-./RASAPI32_Lib.66954DC1_0C82_4A2B_B85A_5EBBBF3D95B1
-./Lib/RASDlg.Lib
-./RASDlg_Lib.556530FF_DC51_4561_8F55_3857B18B3030
-./Lib/RASsAPI.Lib
-./RASsAPI_Lib.94DC5BC9_CB86_436C_AFC6_03D8A1F7F20C
-./Lib/ResUtils.Lib
-./ResUtils_Lib.98CA52CC_6B9A_49A0_8916_53A0799FEB0E
-./Lib/RichEd20.Lib
-./RichEd20_Lib.CCD09395_F01D_4F00_994E_46F9FDEF7A65
-./Lib/RpcNdr.Lib
-./RpcNdr_Lib.33E78590_00C3_42A5_AB30_DCD0D440E28A
-./Lib/Rpcns4.Lib
-./Rpcns4_Lib.07F81972_6359_424D_BE25_3EEA9E73DE6D
-./Lib/RpcRT4.Lib
-./RpcRT4_Lib.F3A09BF3_691E_4FD2_8DD1_8966554A1A2F
-./Lib/Rtm.Lib
-./Rtm_Lib.2BE85D76_63FC_45BA_BE1D_9A90AA5ECA00
-./Lib/Rtutils.Lib
-./Rtutils_Lib.EF519131_F4D6_4B9A_809B_8D0188EEB016
-./Lib/SCardDlg.Lib
-./SCardDlg_Lib.EBB53095_8B4A_419F_9788_A611616455C3
-./Lib/SCardSsp.Tlb
-./SCardSsp_Tlb.C8B36CCC_270B_4720_B103_A7516C9FFD36
-./Lib/ScrnSave.Lib
-./ScrnSave_Lib.F0CFB5D3_4AE4_4804_84EF_7B2533567F71
-./Lib/ScrnSavW.Lib
-./ScrnSavW_Lib.F1DE5EAF_5FEC_4D8A_A9F1_8315321D3884
-./Lib/Secur32.Lib
-./Secur32_Lib.7D8D711E_A160_4977_9C73_A30B4E554075
-./Lib/sehprolg.obj
-./sehprolg_obj.2F3CEF2E_8AE4_4ADE_A4AF_A408E1CA7A61
-./Lib/SensAPI.Lib
-./SensAPI_Lib.21A554E1_0BB2_48A9_AE8D_F606CC7843FB
-./Lib/SensEvts.Tlb
-./SensEvts_Tlb.133800EC_4095_46CE_AE89_5DD70E8A6AD4
-./Lib/SetupAPI.Lib
-./SetupAPI_Lib.D8281416_2CE0_4C89_8BDC_B23428130A33
-./Lib/Sfc.Lib
-./Sfc_Lib.8623014B_DC77_4661_BC86_3573E4FCF214
-./Lib/Shell32.Lib
-./Shell32_Lib.41AAC18D_5C4B_446A_B46A_BA0D403C825D
-./Lib/ShFolder.Lib
-./ShFolder_Lib.CFC19A2C_7F20_407D_96ED_AC3A5B50C6DA
-./Lib/ShLwApi.Lib
-./ShLwApi_Lib.5F1B7162_E01E_4899_9F77_E3DF32164040
-./Lib/sisbkup.lib
-./sisbkup_lib.805AE76E_EF0F_4947_A5F8_891DD9246671
-./Lib/SnmpAPI.Lib
-./SnmpAPI_Lib.3944F76B_66F5_40E5_BB20_6084DAD98D4D
-./Lib/SpOrder.Lib
-./SpOrder_Lib.02B27258_E8D0_4FBE_B75D_79AA14B7A186
-./Lib/SrClient.lib
-./SrClient_lib.05E0BBF9_0CA4_4F1A_8BD1_B5B0709DCE3F
-./Lib/StdOle2.Tlb
-./StdOle2_Tlb.9108CD20_8C71_4EB8_991F_9813CDB77AE6
-./Lib/StdOle32.Tlb
-./StdOle32_Tlb.5C3E3978_6F4B_4545_9911_59168CF3C6DD
-./Lib/Sti.Lib
-./Sti_Lib.2266B54A_8F4B_4FD9_B640_49040122B797
-./Lib/strmiids.lib
-./strmiids_lib.0DB203F5_D714_4EDC_BB66_5C04C287593A
-./Lib/strsafe.lib
-./strsafe_lib.805AE76E_EF0F_4947_A5F8_891DD9246671
-./Lib/Svcguid.Lib
-./Svcguid_Lib.932567CC_D8D1_4670_B830_39FD8E055926
-./Lib/Tapi32.Lib
-./Tapi32_Lib.A4073DE6_B509_4B4A_86A1_4BA9CB1DCA4F
-./Lib/Thunk32.Lib
-./Thunk32_Lib.301FF4C4_4C83_4408_91C4_7114F79D1E10
-./Lib/Traffic.Lib
-./Traffic_Lib.3A322E29_3581_4337_8CDC_1CFA3D35985E
-./Lib/tsuserex.tlb
-./tsuserex_tlb.89ECCD8D_A533_4AE3_8AE8_79C3B9E36F2F
-./Lib/tuner.tlb
-./tuner_tlb.D4545203_3F85_4A28_B3C6_EAC6DF7260BF
-./Lib/unicows.lib
-./unicows_lib.ACFDC68E_01BC_4053_B76C_94B767BE9E7C
-./Lib/Url.Lib
-./Url_Lib.E56CCB00_4F01_470C_AEBA_6EFFC1A7E131
-./Lib/Urlmon.Lib
-./Urlmon_Lib.FA9B8CB6_6D46_4D89_BDA8_98BF76224A33
-./Lib/User32.Lib
-./User32_Lib.BF17B2A2_33E9_4EA4_9074_789953369A35
-./Lib/UserEnv.Lib
-./UserEnv_Lib.88838305_19E3_4C68_8D12_BE6A880E5EBD
-./Lib/USP10.Lib
-./USP10_Lib.F2B34FA4_3F7B_4650_A54D_CC91F30CDA0F
-./Lib/Uuid.Lib
-./Uuid_Lib.D81E361C_01D3_4860_B25C_49C6BE57EF4D
-./Lib/Uxtheme.lib
-./Uxtheme_lib.183FDE5E_921A_47B6_8179_074E3447D308
-./Lib/VdmDbg.Lib
-./VdmDbg_Lib.07125EEB_83BC_4622_A39C_C9092C90DCA6
-./Lib/Version.Lib
-./Version_Lib.BFC67761_1208_43DE_90BF_379553C01674
-./Lib/Vfw32.Lib
-./Vfw32_Lib.E27E59E8_61B4_44A4_8326_B96CAE35E28F
-./Lib/WbemUuid.Lib
-./WbemUuid_Lib.DEA7F2C6_8D83_4D4C_AEC3_ECAC4967A6D4
-./Lib/WebPost.Lib
-./WebPost_Lib.2E2559BF_540E_426E_9168_1731F59F4A86
-./Lib/WiaGuid.Lib
-./WiaGuid_Lib.3F17949E_5982_42CA_97D3_08A4BAB4984B
-./Lib/WiaScr.Tlb
-./WiaScr_Tlb.97A6B7DC_7FCC_4892_99CE_3CF112FBABED
-./Lib/Win95/MfcUIa32.Lib
-./MfcUIa32_Lib.29977AFB_C62A_4C2E_A477_D69D66CF2DDC
-./Lib/Win95/Pkpd32.Lib
-./Pkpd32_Lib.49B9EF8D_D702_4DBF_BC06_3AEF7401AC59
-./Lib/Win95/SvrAPI.Lib
-./SvrAPI_Lib.6C95A398_509D_4643_BA5D_2B39D5305475
-./Lib/Win95/TH32.Lib
-./TH32_Lib.28F997B6_6FE1_4DD7_8191_EA1F7A6B1D51
-./Lib/WinFax.Lib
-./WinFax_Lib.EF9F7132_C56A_4D28_A97A_F78C8212767D
-./Lib/winhttp.lib
-./winhttp_lib.6559BAA9_79CE_48B7_A1F1_431B3CF69D19
-./Lib/WinInet.Lib
-./WinInet_Lib.1DA37F1C_12A0_4DA6_8CE2_B78AEC842AD9
-./Lib/WinMM.Lib
-./WinMM_Lib.C406CE37_5769_41C6_A699_558DDFC104FE
-./Lib/WinSCard.Lib
-./WinSCard_Lib.BF6751D8_0981_4E8E_B193_6502A2CC108B
-./Lib/WinSpool.Lib
-./WinSpool_Lib.3C5F33C9_AB6F_42E1_B02D_F80CC22ABFB9
-./Lib/WinStrm.Lib
-./WinStrm_Lib.ED3E95D0_3B13_402F_A4B1_2A60B68B96E0
-./Lib/WinTrust.Lib
-./WinTrust_Lib.4108E20E_2433_4F6A_9DF4_5E15A9D48829
-./Lib/Wldap32.Lib
-./Wldap32_Lib.BAB4B052_B301_4A12_8313_336E8B180B4F
-./Lib/wmiutils.lib
-./wmiutils_lib.60937378_0F12_4612_8BF1_C757D7554624
-./Lib/Wow32.Lib
-./Wow32_Lib.7A51B477_4136_4C1C_8C5B_B847036F6BF3
-./Lib/WS2_32.Lib
-./WS2_32_Lib.B198A824_2582_48FE_8FA1_4401C9ED6AE1
-./Lib/WSnmp32.Lib
-./WSnmp32_Lib.6373F81C_538E_4C03_BA73_D15454348E6F
-./Lib/WSock32.Lib
-./WSock32_Lib.D53A91D7_C344_453E_A80E_C91A8E3CB7C8
-./Lib/Wst.Lib
-./Wst_Lib.B6F56B19_6D8C_4D19_A438_0BA8AD04692D
-./Lib/WtsApi32.Lib
-./WtsApi32_Lib.36F2240E_FA3C_4C6F_A2FD_0550BB23EB9D
-./Lib/wuguid.lib
-./wuguid_lib.D333901D_E84A_4E7D_B544_3B47C59BC8FC
-./Lib/xaSwitch.Lib
-./xaSwitch_Lib.92487B6B_AD50_45D7_BBE4_0BFA29BDD613
-./Lib/xoleHlp.Lib
-./xoleHlp_Lib.2F857097_12F1_443D_A21A_ADC3F4563502
-./License/License.htm
-./License_htm.9887FB35_5374_45FA_A711_2319AFA78483
-./License/Redist.Txt
-./Redist_Txt.5B1BBCBA_B610_4527_8813_F9752C4293DB
-./misc/Include Updates/exdisp.idl
-./exdisp_idl.2B6A4E41_704F_4E5C_95E6_BE84F50D20A4
-./misc/Include Updates/ReadMe.txt
-./ReadMe_txt.2B6A4E41_704F_4E5C_95E6_BE84F50D20A4
-./misc/Include Updates/ShDeprecated.h
-./ShDeprecated_h.2B6A4E41_704F_4E5C_95E6_BE84F50D20A4
-./misc/Include Updates/ShDeprecated.idl
-./ShDeprecated_idl.2B6A4E41_704F_4E5C_95E6_BE84F50D20A4
-./misc/WMI/Schema.Txt
-./Schema_Txt.0F08FA77_3015_4C2C_9B40_818571A1735C
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1213.Txt
-./Rfc1213_Txt.2D4567BA_DDCC_4CFD_AD65_114102478F0A
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1229.Txt
-./Rfc1229_Txt.FCB7C73F_05BA_4BBF_9ED6_775D6E546E51
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1230.Txt
-./Rfc1230_Txt.AE4B1666_9478_4626_B928_533A56763CFD
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1231.Txt
-./Rfc1231_Txt.DA9B6BF3_42BA_4355_AC63_D107AAFA7046
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1238.Txt
-./Rfc1238_Txt.1D6FA0A5_3ABA_45B3_B692_4D0FECEF7D42
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1253.Txt
-./Rfc1253_Txt.75CDCD33_48E1_42BF_B3B8_4F6D952933A2
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1269.Txt
-./Rfc1269_Txt.9AA7180F_2755_421A_99C2_5CC596EBF297
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1271.Txt
-./Rfc1271_Txt.26F02B91_841B_4A3A_92C5_5ADDCCEA27D6
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1285.Txt
-./Rfc1285_Txt.835DFB40_61DA_4211_B6C8_49CE94179E46
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1304.Txt
-./Rfc1304_Txt.0C005360_5FCB_4BD2_8013_2CAE56ABA3FA
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1315.Txt
-./Rfc1315_Txt.1C0C58BC_AF8C_40E2_B628_0BF3844B5955
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1316.Txt
-./Rfc1316_Txt.9FC47225_89BD_433F_9308_D4C20CD4B7E1
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1317.Txt
-./Rfc1317_Txt.4A6C9040_D28E_4A57_A7D2_F77024F0A2EE
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1318.Txt
-./Rfc1318_Txt.F8AAAB54_5DFB_47F9_A3D0_5246B4A01DA4
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1354.Txt
-./Rfc1354_Txt.FFA1C1B9_BB9E_472B_8CC5_7D3799CC0070
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1381.Txt
-./Rfc1381_Txt.DB1330FB_A198_4D48_B817_1D94156A4587
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1382.Txt
-./Rfc1382_Txt.C55180F7_C83C_4F2B_AADD_F582F352FE64
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1389.Txt
-./Rfc1389_Txt.22A12DDD_4F95_4CCA_9FF0_698CBB10FAC3
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1398.Txt
-./Rfc1398_Txt.61418C3E_2FB7_4FD6_9701_7C157F786B0B
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1406.Txt
-./Rfc1406_Txt.A2FC9AE9_38BC_41B4_9D26_6F68C5378408
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1407.Txt
-./Rfc1407_Txt.DB52F953_84CC_4656_8A1D_4815CA3A37D9
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1414.Txt
-./Rfc1414_Txt.DF6BE755_0360_4577_B662_7311E0CD834C
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1461.Txt
-./Rfc1461_Txt.860F2B0C_06E0_4B3D_AE2F_9474B06E5883
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1471.Txt
-./Rfc1471_Txt.C2C1F222_F12C_4F0B_B7AB_0337DEE73062
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1472.Txt
-./Rfc1472_Txt.C4C3650A_674D_4C41_BC44_F1295D970FFC
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1473.Txt
-./Rfc1473_Txt.D49BC855_B3E7_47D4_8B9E_0E591C5439AF
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1474.Txt
-./Rfc1474_Txt.6C561344_5A56_4329_8894_2C3D5DD387AE
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1493.Txt
-./Rfc1493_Txt.402BCF82_ECD2_48E3_A1C4_9281BC4D61AF
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1512.Txt
-./Rfc1512_Txt.FEF62AD5_08B0_4251_8178_6FA2068CBADD
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1513.Txt
-./Rfc1513_Txt.0957C208_17FF_417F_B325_4A46EC630A29
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1514.Txt
-./Rfc1514_Txt.2B2F792D_F5A8_4057_B900_61B122589CC3
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1515.Txt
-./Rfc1515_Txt.465D403B_2C7F_427B_923B_B68DC9D57209
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1516.Txt
-./Rfc1516_Txt.E6106030_66BF_49FE_B6B9_011D7F194CBD
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1525.Txt
-./Rfc1525_Txt.6C2FE650_9318_420D_A214_4D3D30C7BF7E
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1559.Txt
-./Rfc1559_Txt.FAD98094_6D57_4536_AB8E_7F1EBF122FAC
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1593.Txt
-./Rfc1593_Txt.D4963087_02FD_4D69_8E6F_99013105CA32
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1742.Txt
-./Rfc1742_Txt.338E584B_A3F9_4C3E_B5FB_02E6C3B92B16
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1757.Txt
-./Rfc1757_Txt.19FD971D_EC9A_43F2_90DE_10AC399DA21E
-./misc/WMI/SNMP/MIBS/SNMPV1/RFCs/Rfc1792.Txt
-./Rfc1792_Txt.460528CE_7755_4000_8728_68C13E1DABEB
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1213.Mof
-./Rfc1213_Mof.3EB277DC_DF53_4187_917C_539FE652C383
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1229.Mof
-./Rfc1229_Mof.58FAD9AF_9E9A_4B7F_8FB1_FCB3967D8547
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1230.Mof
-./Rfc1230_Mof.23629C7A_2508_4CB0_BFF0_1D6D9386E026
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1231.Mof
-./Rfc1231_Mof.82BDC0CD_315A_46DC_8619_594B7C253A74
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1238.Mof
-./Rfc1238_Mof.FDF76E60_0888_4D96_A325_6A5A50F15C83
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1253.Mof
-./Rfc1253_Mof.E1C8C086_D62A_499F_B1D3_78AFE29363F6
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1269.Mof
-./Rfc1269_Mof.70875F27_897C_4330_AC6A_1D801E8B1B9A
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1271.Mof
-./Rfc1271_Mof.A66D2763_9CF5_422B_969E_5B9820D708A1
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1285.Mof
-./Rfc1285_Mof.C6231CEE_8981_4D6F_855C_74835523FAEB
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1304.Mof
-./Rfc1304_Mof.E6AE99DE_DCA4_45FD_8AFD_A90931C2B67A
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1315.Mof
-./Rfc1315_Mof.3E742107_508B_438C_8882_56CB1736445B
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1316.Mof
-./Rfc1316_Mof.6A075F01_592F_427C_80B8_535FA313989C
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1317.Mof
-./Rfc1317_Mof.98B51F6F_FA80_4EA5_BF6C_BAED3A334612
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1318.Mof
-./Rfc1318_Mof.C56E4080_FEB2_4072_8381_D7C3C874CACE
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1354.Mof
-./Rfc1354_Mof.D7096037_610A_47CA_8ED8_5366ED4BB308
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1381.Mof
-./Rfc1381_Mof.9526F02F_E95A_4440_B41A_4ECF928DF973
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1382.Mof
-./Rfc1382_Mof.C4BDCAE3_60FE_4450_8449_CA5EE496B8CA
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1389.Mof
-./Rfc1389_Mof.F5B2920E_8344_4F8D_BE77_7D48A6789A33
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1398.Mof
-./Rfc1398_Mof.BA42D037_2EE2_4F60_93B5_B40179D0EFBB
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1406.Mof
-./Rfc1406_Mof.5A5B57A9_793E_4964_B2C6_4C6F8445AD5C
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1407.Mof
-./Rfc1407_Mof.AFB7FF54_DE53_4F34_B598_47C0B3E2B7E5
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1414.Mof
-./Rfc1414_Mof.FF0D3249_2135_403E_A89F_A3808C5A66F7
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1461.Mof
-./Rfc1461_Mof.C5F4976B_A274_44BB_B146_316882974014
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1471.Mof
-./Rfc1471_Mof.EE7E2FDF_9779_4954_AB5C_7F6437E90EB9
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1472.Mof
-./Rfc1472_Mof.D345FAB0_E25E_4FB7_B949_3373CAEB71AA
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1473.Mof
-./Rfc1473_Mof.271A95D6_529C_4C70_8DBD_EC30EAE2CF54
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1474.Mof
-./Rfc1474_Mof.1BB2732F_55C9_49E8_87D8_5F40922C3AD2
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1493.Mof
-./Rfc1493_Mof.75CF82ED_1B7E_43CC_AC27_F616134B957D
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1512.Mof
-./Rfc1512_Mof.997ACB47_908E_4A68_8ACA_FE90D4BA39DA
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1513.Mof
-./Rfc1513_Mof.F2326119_44AF_478F_A10B_245AA0CA54AD
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1514.Mof
-./Rfc1514_Mof.6C25DA9D_4F6D_4F68_AD8C_FF828B50545F
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1515.Mof
-./Rfc1515_Mof.3989A670_8987_479B_9A21_5830A5CB3B13
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1516.Mof
-./Rfc1516_Mof.81CF8CA6_DAA7_4091_BABA_DDDDDAC5E7BD
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1525.Mof
-./Rfc1525_Mof.D56E66C2_C214_40E6_A243_4D04A7CADD32
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1559.Mof
-./Rfc1559_Mof.A10850F8_32F6_43E8_A4C4_1B4F56CB7185
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1593.Mof
-./Rfc1593_Mof.3A09E0BA_69FA_425D_94CC_651E80BC8E62
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1742.Mof
-./Rfc1742_Mof.DFD5EB87_DEE3_4820_83BC_19419BF187FB
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1757.Mof
-./Rfc1757_Mof.5403E9A8_01BA_4C08_BD2E_5C2372469B25
-./misc/WMI/SNMP/MOFS/SNMPV1/RFCs/Rfc1792.Mof
-./Rfc1792_Mof.3A511978_08E7_41F8_B484_0C60AD1ABB69
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1213.Mof
-./Rfc1213_Mof.33A62C66_47C3_48C9_B8FA_0CBCDA383A41
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1229.Mof
-./Rfc1229_Mof.0DAE491D_E62B_4A1F_AB27_51B55B6E620C
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1230.Mof
-./Rfc1230_Mof.92BA16E9_ADCC_478C_BF91_54E3D0F8F1F9
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1231.Mof
-./Rfc1231_Mof.6EDDCEEB_3B3F_4CB2_B3F6_CADEE7E61491
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1238.Mof
-./Rfc1238_Mof.C4FBEAC9_2FB2_4432_A239_E6D1AE4CA496
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1253.Mof
-./Rfc1253_Mof.552F82B0_57E2_4AF7_8281_2FA0831885BA
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1269.Mof
-./Rfc1269_Mof.665808BA_3A8D_4268_8524_896B0DB97300
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1271.Mof
-./Rfc1271_Mof.F869A964_A897_4A44_B520_D7248C27EB54
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1285.Mof
-./Rfc1285_Mof.556C966B_1CA6_4955_8723_60314CBD094B
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1304.Mof
-./Rfc1304_Mof.7F93703A_A500_44B0_904F_568C522815CD
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1315.Mof
-./Rfc1315_Mof.75603B43_D008_4E78_970F_B6FE6F536493
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1316.Mof
-./Rfc1316_Mof.8D088613_D5F7_4D4D_B644_DE36E2A1BB54
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1317.Mof
-./Rfc1317_Mof.2B4DC7DB_6F11_4F2B_82C1_7DA9FA899462
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1318.Mof
-./Rfc1318_Mof.C8616C59_DA59_4AE8_A3F8_51F7C7DA96FF
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1354.Mof
-./Rfc1354_Mof.56E44714_AA09_4483_95FF_77F7D4229314
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1381.Mof
-./Rfc1381_Mof.C05BCB7B_4AFF_431A_BE2D_0F7ED4D3C596
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1382.Mof
-./Rfc1382_Mof.A9D213EC_8EBE_4DA3_9629_4056AAD58612
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1389.Mof
-./Rfc1389_Mof.7D838E9C_5A64_409C_944C_7E92746AF58C
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1398.Mof
-./Rfc1398_Mof.689F1765_7901_46AE_987F_41816AD6D866
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1406.Mof
-./Rfc1406_Mof.32886393_4BEF_4260_847E_C7699D3404E3
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1407.Mof
-./Rfc1407_Mof.6B5A5092_08B8_4551_92CC_F417D6014904
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1414.Mof
-./Rfc1414_Mof.5CBBE172_7D1A_4B35_A4D8_783F19C7527A
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1461.Mof
-./Rfc1461_Mof.A6359471_0073_4D01_8E5B_9B43D9ED596B
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1471.Mof
-./Rfc1471_Mof.F03F08E2_D78C_4C85_A4CD_FB50E7E7C4FF
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1472.Mof
-./Rfc1472_Mof.98F7E2D3_29CA_4154_BF11_26C17D1713C4
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1473.Mof
-./Rfc1473_Mof.EE87CE7F_4B8C_412D_B5B6_D6ACF1F8218E
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1474.Mof
-./Rfc1474_Mof.C6608AE2_B981_4D42_AB21_CEBB0BF99ED5
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1493.Mof
-./Rfc1493_Mof.A7D7F0CB_9C8D_4959_B117_15DF76BA5FB6
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1512.Mof
-./Rfc1512_Mof.AEAE60B6_08C8_45F4_9FE4_B4ADF36C980E
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1513.Mof
-./Rfc1513_Mof.4F84025C_F110_4DBB_BFA9_7F9D64CE0A86
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1514.Mof
-./Rfc1514_Mof.ED551775_05BB_4F74_9004_B1D82D185A18
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1515.Mof
-./Rfc1515_Mof.2BC31FC7_6761_4EE4_A762_C077B819A96A
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1516.Mof
-./Rfc1516_Mof.0AB0D69D_D303_48B5_857A_43D7D0949675
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1525.Mof
-./Rfc1525_Mof.3EAE0682_96DF_407F_8943_9ED39580CE0C
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1559.Mof
-./Rfc1559_Mof.6AF09E1C_12D7_46BB_BDEA_EA579219A119
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1593.Mof
-./Rfc1593_Mof.6CE623EE_1546_49EE_B47C_902EBAC6531E
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1742.Mof
-./Rfc1742_Mof.CBD26CBD_35DD_458B_8406_92D6C111B5B1
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1757.Mof
-./Rfc1757_Mof.74A8375A_19A8_4C5F_9A4B_F11DD3704B05
-./misc/WMI/SNMP/SMIR_MOFS/SNMPV1/RFCs/Rfc1792.Mof
-./Rfc1792_Mof.1363C821_E13F_48FF_A06B_4369872CDA67
-./redist/CAPICOM/license.txt
-./license_txt.8325A2B3_232F_44CE_9877_8F568416FE5C
-./redist/CAPICOM/readme.txt
-./readme_txt.8325A2B3_232F_44CE_9877_8F568416FE5C
-./redist/CAPICOM/Redist.txt
-./Redist_txt.496436CC_D054_4979_A8C1_DD6D0F4C47F3
-./redist/CAPICOM/x86/CapiCom.Dll
-./CapiCom_Dll.13AD387D_B77D_4B96_83F6_8314EC63F226
-./redist/readme.txt
-./readme_txt.6778A002_F469_42B7_8EAD_47BA9D0A1885
-./ReleaseNotes.Htm
-./ReleaseNotes_Htm.2E494322_3849_4926_B4AA_190C82A6503F
diff --git a/pkgs/os-specific/linux/dietlibc/builder.sh b/pkgs/os-specific/linux/dietlibc/builder.sh
deleted file mode 100644
index ee0cb2b7522..00000000000
--- a/pkgs/os-specific/linux/dietlibc/builder.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-source $stdenv/setup
-
-makeFlags="prefix=$out"
-installFlags="prefix=$out"
-
-postInstall() {
-    (cd $out && ln -s lib-* lib)
-    (cd $out/lib && ln -s start.o crt1.o)
-
-    # Fake crti.o and crtn.o.
-    touch empty.c
-    gcc -c empty.c -o $out/lib/crti.o
-    gcc -c empty.c -o $out/lib/crtn.o
-
-    # Copy <sys/user.h> from Glibc; binutils wants it.
-    cp $glibc/include/sys/user.h $out/include/sys/
-
-    # Remove <dlfcn.h>, it makes some packages think we can load
-    # dynamic libraries.
-    rm $out/include/dlfcn.h
-
-    # Dietlibc has a asm include directory, whose presence makes the
-    # asm directory of kernel-headers unreachable.  So make symlinks
-    # from the dietlibc asm to the kernel-headers asm.
-    ln -s $kernelHeaders/include/asm/* $out/include/asm/ || true
-
-    # Make asm-x86_64 etc. available.
-    for i in $kernelHeaders/include/asm-*; do
-        ln -s $i $out/include/
-    done
-
-    # Idem for include/linux.
-    ln -s $kernelHeaders/include/linux/* $out/include/linux/ || true
-}
-
-genericBuild
diff --git a/pkgs/os-specific/linux/dietlibc/default.nix b/pkgs/os-specific/linux/dietlibc/default.nix
deleted file mode 100644
index d98bfb96735..00000000000
--- a/pkgs/os-specific/linux/dietlibc/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{stdenv, fetchurl, glibc}:
-
-assert stdenv.isLinux;
-
-stdenv.mkDerivation {
-  name = "dietlibc-0.30";
-  src = fetchurl {
-    url = mirror://kernel/linux/libs/dietlibc/dietlibc-0.30.tar.bz2;
-    md5 = "2465d652fff6f1fad3da3b98e60e83c9";
-  };
-  builder = ./builder.sh;
-  
-  inherit glibc;
-  kernelHeaders = glibc.linuxHeaders;
-
-  patches = [
-
-    # dietlibc's sigcontext.h provides a macro called PC(), which is
-    # rather intrusive (e.g., binutils fails to compile because of
-    # it).  Rename it.
-    ./pc.patch
-
-    # wchar.h declares lots of functions that don't actually exist.
-    # Remove them.
-    ./no-wchar.patch
-
-    # Fix to get DNS resolution to work on 64-bit platforms.  Taken
-    # from 0.31 CVS.
-    ./dns64.patch
-
-    # Get lseek64 working on x86_64.  From
-    # http://svn.annvix.org/cgi-bin/viewvc.cgi/packages/releases/2.0-CURRENT/dietlibc/SOURCES
-    ./x86_64-lseek64.patch
-    #./x86_64-stat64.patch
-
-  ];
-
-  meta = {
-    homepage = http://www.fefe.de/dietlibc/;
-    description = "A small implementation of the C library";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/os-specific/linux/dietlibc/dns64.patch b/pkgs/os-specific/linux/dietlibc/dns64.patch
deleted file mode 100644
index 47d54d1d16b..00000000000
--- a/pkgs/os-specific/linux/dietlibc/dns64.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Only in dietlibc-0.30: CHANGES.orig
-diff -rc dietlibc-0.30-orig/libcruft/dnscruft2.c dietlibc-0.30/libcruft/dnscruft2.c
-*** dietlibc-0.30-orig/libcruft/dnscruft2.c	2005-05-01 22:08:25.000000000 +0200
---- dietlibc-0.30/libcruft/dnscruft2.c	2007-01-22 15:32:18.000000000 +0100
-***************
-*** 5,11 ****
-  #include <netdb.h>
-  #include <stdlib.h>
-  #include <arpa/inet.h>
-- #include <sys/poll.h>
-  #include <unistd.h>
-  #include <errno.h>
-  #include <arpa/nameser.h>
---- 5,10 ----
-diff -rc dietlibc-0.30-orig/libcruft/dnscruft.c dietlibc-0.30/libcruft/dnscruft.c
-*** dietlibc-0.30-orig/libcruft/dnscruft.c	2006-06-18 20:32:35.000000000 +0200
---- dietlibc-0.30/libcruft/dnscruft.c	2007-01-22 15:32:18.000000000 +0100
-***************
-*** 45,53 ****
-    tmp=socket(PF_INET6,SOCK_DGRAM,IPPROTO_UDP);
-    if (tmp<0) return;
-    fcntl(tmp,F_SETFD,FD_CLOEXEC);
-    si.sin6_family=AF_INET6;
--   si.sin6_port=0;
--   memset(&si.sin6_addr,0,16);
-    if (bind(tmp,(struct sockaddr*)&si,sizeof(si))) return;
-    __dns_fd6=tmp;
-  }
---- 45,52 ----
-    tmp=socket(PF_INET6,SOCK_DGRAM,IPPROTO_UDP);
-    if (tmp<0) return;
-    fcntl(tmp,F_SETFD,FD_CLOEXEC);
-+   memset(&si,0,sizeof(si));
-    si.sin6_family=AF_INET6;
-    if (bind(tmp,(struct sockaddr*)&si,sizeof(si))) return;
-    __dns_fd6=tmp;
-  }
-diff -rc dietlibc-0.30-orig/libcruft/res_mkquery.c dietlibc-0.30/libcruft/res_mkquery.c
-*** dietlibc-0.30-orig/libcruft/res_mkquery.c	2004-11-10 18:45:17.000000000 +0100
---- dietlibc-0.30/libcruft/res_mkquery.c	2007-01-22 15:32:18.000000000 +0100
-***************
-*** 42,51 ****
-  int res_mkquery(int op, const char *dname, int class, int type, char* data,
-  		int datalen, const unsigned char* newrr, char* buf, int buflen) {
-    unsigned char packet[512];
-!   unsigned long len=0;
-!   memmove(packet,dnspacket,12);
-    if ((_res.options&RES_RECURSE)==0) packet[2]=0;
--   *(unsigned short*)packet=rand();
-    {
-      unsigned char* x;
-      const char* y,* tmp;
---- 42,55 ----
-  int res_mkquery(int op, const char *dname, int class, int type, char* data,
-  		int datalen, const unsigned char* newrr, char* buf, int buflen) {
-    unsigned char packet[512];
-!   unsigned long len;
-! 
-!   memcpy(packet,dnspacket,12);
-!   len=rand();
-!   packet[0]=len;
-!   packet[1]=len>>8;
-!   len=0;
-    if ((_res.options&RES_RECURSE)==0) packet[2]=0;
-    {
-      unsigned char* x;
-      const char* y,* tmp;
-diff -rc dietlibc-0.30-orig/libcruft/res_query.c dietlibc-0.30/libcruft/res_query.c
-*** dietlibc-0.30-orig/libcruft/res_query.c	2005-10-14 17:37:59.000000000 +0200
---- dietlibc-0.30/libcruft/res_query.c	2007-01-22 15:32:18.000000000 +0100
-***************
-*** 99,105 ****
-  	duh[1].fd=pnpfd;
-        } else {
-  	duh[1].fd=-1;
-! 	duh[1].revents=0;
-        }
-  
-  #endif
---- 99,105 ----
-  	duh[1].fd=pnpfd;
-        } else {
-  	duh[1].fd=-1;
-! 	duh[1].events=0;
-        }
-  
-  #endif
-diff -rc dietlibc-0.30-orig/syscalls.s/__guard.S dietlibc-0.30/syscalls.s/__guard.S
-*** dietlibc-0.30-orig/syscalls.s/__guard.S	2006-04-07 17:33:20.000000000 +0200
---- dietlibc-0.30/syscalls.s/__guard.S	2007-01-22 15:32:18.000000000 +0100
-***************
-*** 1,3 ****
---- 1,4 ----
-+ #include <endian.h>
-  .data
-  .type __guard,@object
-  .global __guard
-***************
-*** 5,9 ****
---- 6,14 ----
-  .global __stack_chk_guard
-  __guard:
-  __stack_chk_guard:
-+ #if __WORDSIZE == 64
-+ .quad 0xaff00
-+ #else
-  .long 0xaff00
-+ #endif
-  
diff --git a/pkgs/os-specific/linux/dietlibc/no-wchar.patch b/pkgs/os-specific/linux/dietlibc/no-wchar.patch
deleted file mode 100644
index 92be2cd2fea..00000000000
--- a/pkgs/os-specific/linux/dietlibc/no-wchar.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -rc dietlibc-0.30-orig/include/wchar.h dietlibc-0.30/include/wchar.h
-*** dietlibc-0.30-orig/include/wchar.h	2005-09-21 09:33:08.000000000 +0200
---- dietlibc-0.30/include/wchar.h	2006-10-20 15:04:04.000000000 +0200
-***************
-*** 30,99 ****
-    unsigned long sofar;
-  } mbstate_t;
-  
-- wint_t btowc(int);
-- wint_t fgetwc(FILE *);
-- wchar_t* fgetws(wchar_t *__restrict__, int, FILE *__restrict__);
-- wint_t fputwc(wchar_t, FILE *);
-- int fputws(const wchar_t *__restrict__, FILE *__restrict__);
-- int fwide(FILE *, int);
-- int fwprintf(FILE *__restrict__, const wchar_t *__restrict__, ...);
-- int fwscanf(FILE *__restrict__, const wchar_t *__restrict__, ...);
-- wint_t getwc(FILE *);
-- wint_t getwchar(void);
-- 
-- size_t mbrlen(const char *__restrict__, size_t, mbstate_t *__restrict__);
-- size_t mbrtowc(wchar_t *__restrict__, const char *__restrict__, size_t, mbstate_t *__restrict__);
-- int mbsinit(const mbstate_t *);
-- size_t mbsrtowcs(wchar_t *__restrict__, const char **__restrict__, size_t, mbstate_t *__restrict__);
-- wint_t putwc(wchar_t, FILE *);
-- wint_t putwchar(wchar_t);
-- int swprintf(wchar_t *__restrict__, size_t, const wchar_t *__restrict__, ...);
-- int swscanf(const wchar_t *__restrict__, const wchar_t *__restrict__, ...);
-- 
-- wint_t ungetwc(wint_t, FILE *);
-- int vfwprintf(FILE *__restrict__, const wchar_t *__restrict__, va_list);
-- int vfwscanf(FILE *__restrict__, const wchar_t *__restrict__, va_list);
-- int vwprintf(const wchar_t *__restrict__, va_list);
-- int vswprintf(wchar_t *__restrict__, size_t, const wchar_t *__restrict__, va_list);
-- int vswscanf(const wchar_t *__restrict__, const wchar_t *__restrict__, va_list);
-- int vwscanf(const wchar_t *__restrict__, va_list);
-- size_t wcrtomb(char *__restrict__, wchar_t, mbstate_t *__restrict__);
-- wchar_t *wcscat(wchar_t *__restrict__, const wchar_t *__restrict__);
-- wchar_t *wcschr(const wchar_t *, wchar_t);
-- int wcscmp(const wchar_t *, const wchar_t *);
-- int wcscoll(const wchar_t *, const wchar_t *);
-- wchar_t* wcscpy(wchar_t *__restrict__, const wchar_t *__restrict__);
-- size_t wcscspn(const wchar_t *, const wchar_t *);
-- size_t wcsftime(wchar_t *__restrict__, size_t, const wchar_t *__restrict__, const struct tm *__restrict__);
-- size_t wcslen(const wchar_t *) __pure;
-- wchar_t *wcsncat(wchar_t *__restrict__, const wchar_t *__restrict__, size_t);
-- int wcsncmp(const wchar_t *, const wchar_t *, size_t);
-- wchar_t *wcsncpy(wchar_t *__restrict__, const wchar_t *__restrict__, size_t);
-- wchar_t *wcspbrk(const wchar_t *, const wchar_t *);
-- wchar_t *wcsrchr(const wchar_t *, wchar_t);
-- size_t wcsrtombs(char *__restrict__, const wchar_t **__restrict__, size_t, mbstate_t *__restrict__);
-- size_t wcsspn(const wchar_t *, const wchar_t *);
-- wchar_t *wcsstr(const wchar_t *__restrict__, const wchar_t *__restrict__);
-- double wcstod(const wchar_t *__restrict__, wchar_t **__restrict__);
-- float wcstof(const wchar_t *__restrict__, wchar_t **__restrict__);
-- wchar_t *wcstok(wchar_t *__restrict__, const wchar_t *__restrict__, wchar_t **__restrict__);
-- long wcstol(const wchar_t *__restrict__, wchar_t **__restrict__, int);
-- long double wcstold(const wchar_t *__restrict__, wchar_t **__restrict__);
-- long long wcstoll(const wchar_t *__restrict__, wchar_t **__restrict__, int);
-- unsigned long wcstoul(const wchar_t *__restrict__, wchar_t **__restrict__, int);
-- unsigned long long wcstoull(const wchar_t *__restrict__, wchar_t **__restrict__, int);
-- 
-- size_t wcsxfrm(wchar_t *__restrict__, const wchar_t *__restrict__, size_t);
-- int wctob(wint_t);
-- 
-- wchar_t *wmemchr(const wchar_t *, wchar_t, size_t);
-- int wmemcmp(const wchar_t *, const wchar_t *, size_t);
-- wchar_t *wmemcpy(wchar_t *__restrict__, const wchar_t *__restrict__, size_t);
-- wchar_t *wmemmove(wchar_t *, const wchar_t *, size_t);
-- wchar_t *wmemset(wchar_t *, wchar_t, size_t);
-- int wprintf(const wchar_t *__restrict__, ...);
-- int wscanf(const wchar_t *__restrict__, ...);
-- 
-  __END_DECLS
-  
-  #endif
---- 30,35 ----
-Only in dietlibc-0.30/include: wchar.h~
diff --git a/pkgs/os-specific/linux/dietlibc/pc.patch b/pkgs/os-specific/linux/dietlibc/pc.patch
deleted file mode 100644
index fd274d24f03..00000000000
--- a/pkgs/os-specific/linux/dietlibc/pc.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -rc dietlibc-0.30-orig/include/asm/arm-sigcontext.h dietlibc-0.30/include/asm/arm-sigcontext.h
-*** dietlibc-0.30-orig/include/asm/arm-sigcontext.h	2002-05-09 03:05:10.000000000 +0200
---- dietlibc-0.30/include/asm/arm-sigcontext.h	2006-10-19 12:40:30.000000000 +0200
-***************
-*** 1,5 ****
-  
-! #define PC(ctx) (ctx.arm_pc)
-  
-  /*
-   * Signal context structure - contains all info to do with the state
---- 1,5 ----
-  
-! #define __DIETLIBC_PC(ctx) (ctx.arm_pc)
-  
-  /*
-   * Signal context structure - contains all info to do with the state
-diff -rc dietlibc-0.30-orig/include/asm/i386-sigcontext.h dietlibc-0.30/include/asm/i386-sigcontext.h
-*** dietlibc-0.30-orig/include/asm/i386-sigcontext.h	2005-09-21 09:33:08.000000000 +0200
---- dietlibc-0.30/include/asm/i386-sigcontext.h	2006-10-19 12:40:41.000000000 +0200
-***************
-*** 38,44 ****
-  };
-  
-  #define X86_FXSR_MAGIC		0x0000
-! #define PC(ctx) (ctx.eip)
-  
-  struct sigcontext {
-  	__u16         gs, __gsh;
---- 38,44 ----
-  };
-  
-  #define X86_FXSR_MAGIC		0x0000
-! #define __DIETLIBC_PC(ctx) (ctx.eip)
-  
-  struct sigcontext {
-  	__u16         gs, __gsh;
-diff -rc dietlibc-0.30-orig/include/asm/ia64-sigcontext.h dietlibc-0.30/include/asm/ia64-sigcontext.h
-*** dietlibc-0.30-orig/include/asm/ia64-sigcontext.h	2002-07-20 18:47:48.000000000 +0200
---- dietlibc-0.30/include/asm/ia64-sigcontext.h	2006-10-19 12:39:40.000000000 +0200
-***************
-*** 1,6 ****
-  #include <sys/ptrace.h>
-  
-! #define PC(ctx) (ctx.sc_ip)
-  
-  struct sigcontext {
-  	unsigned long		sc_flags;
---- 1,6 ----
-  #include <sys/ptrace.h>
-  
-! #define __DIETLIBC_PC(ctx) (ctx.sc_ip)
-  
-  struct sigcontext {
-  	unsigned long		sc_flags;
-diff -rc dietlibc-0.30-orig/profiling/profil.c dietlibc-0.30/profiling/profil.c
-*** dietlibc-0.30-orig/profiling/profil.c	2002-04-08 00:13:53.000000000 +0200
---- dietlibc-0.30/profiling/profil.c	2006-10-19 12:40:58.000000000 +0200
-***************
-*** 43,51 ****
-  static void
-  profiler (int signal, struct sigcontext ctx)
-  {
-! 	size_t s = PC(ctx)-low_pc;
-  	(void)signal;
-! 	if ((PC(ctx)) < low_pc) return;
-  	s >>= 1;
-  	if (s < maxhits)
-  		++buffer[s];
---- 43,51 ----
-  static void
-  profiler (int signal, struct sigcontext ctx)
-  {
-! 	size_t s = __DIETLIBC_PC(ctx)-low_pc;
-  	(void)signal;
-! 	if ((__DIETLIBC_PC(ctx)) < low_pc) return;
-  	s >>= 1;
-  	if (s < maxhits)
-  		++buffer[s];
diff --git a/pkgs/os-specific/linux/dietlibc/x86_64-lseek64.patch b/pkgs/os-specific/linux/dietlibc/x86_64-lseek64.patch
deleted file mode 100644
index 47187a310d2..00000000000
--- a/pkgs/os-specific/linux/dietlibc/x86_64-lseek64.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- dietlibc-0.27/x86_64/lseek64.S.x86_64-lseek64	2005-03-29 08:46:09.074515293 -0500
-+++ dietlibc-0.27/x86_64/lseek64.S	2005-03-29 08:46:09.074515293 -0500
-@@ -0,0 +1,3 @@
-+#include "syscalls.h"
-+
-+syscall_weak(lseek,lseek64,__libc_lseek64)
diff --git a/pkgs/os-specific/linux/e3cfsprogs/builder.sh b/pkgs/os-specific/linux/e3cfsprogs/builder.sh
deleted file mode 100755
index c3352ec84ae..00000000000
--- a/pkgs/os-specific/linux/e3cfsprogs/builder.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-source $stdenv/setup
-
-tar -zxvf $src
-cd e3cfsprogs*/
-
-mkdir build; 
-cd build;
-../configure --prefix=$out
-make
-#make check			#almost all checks fail... maybe they have to be done on a ext3cow fs ???
-make install
-
-#we must rename according to the manual of e3cfprogs
-cp misc/mke2fs $out/sbin/mkfs.ext3cow
diff --git a/pkgs/os-specific/linux/e3cfsprogs/default.nix b/pkgs/os-specific/linux/e3cfsprogs/default.nix
deleted file mode 100644
index ef25d59a9df..00000000000
--- a/pkgs/os-specific/linux/e3cfsprogs/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{stdenv, fetchurl, gettext}:
-
-stdenv.mkDerivation {
-  name = "e3cfsprogs-1.39";
-  builder = ./builder.sh;
-
-  patches = [ ./e3cfsprogs-1.39_bin_links.patch ./e3cfsprogs-1.39_etc.patch ];
-
-  src = fetchurl {
-    url = http://ext3cow.com/e3cfsprogs/e3cfsprogs-1.39.tgz;
-    sha256 = "8dd3de546aeb1ae42fb05409aeb724a145fe9aa1dbe1115441c2297c9d48cf31";
-  };
-
-  configureFlags ="--enable-dynamic-e2fsck --enable-elf-shlibs";
-  buildInputs = [gettext];
-  preInstall = "installFlagsArray=('LN=ln -s')";
-  postInstall = "make install-libs";
-}
-
-#note that ext3cow requires the ext3cow kernel patch !!!!
diff --git a/pkgs/os-specific/linux/e3cfsprogs/e3cfsprogs-1.39_bin_links.patch b/pkgs/os-specific/linux/e3cfsprogs/e3cfsprogs-1.39_bin_links.patch
deleted file mode 100644
index cf8c819c97a..00000000000
--- a/pkgs/os-specific/linux/e3cfsprogs/e3cfsprogs-1.39_bin_links.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff -Naur e3cfsprogs-1.39/config/config.guess e3cfsprogs-1.39_mod/config/config.guess
---- e3cfsprogs-1.39/config/config.guess	2006-04-10 00:34:21.000000000 +0200
-+++ e3cfsprogs-1.39_mod/config/config.guess	2007-07-20 16:28:58.000000000 +0200
-@@ -319,7 +319,7 @@
- 	echo sparc-icl-nx6
- 	exit ;;
-     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
--	case `/usr/bin/uname -p` in
-+	case `uname -p` in
- 	    sparc) echo sparc-icl-nx7; exit ;;
- 	esac ;;
-     sun4H:SunOS:5.*:*)
-@@ -460,7 +460,7 @@
- 	exit ;;
-     AViiON:dgux:*:*)
-         # DG/UX returns AViiON for all architectures
--        UNAME_PROCESSOR=`/usr/bin/uname -p`
-+        UNAME_PROCESSOR=`uname -p`
- 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
- 	then
- 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-@@ -1054,7 +1054,7 @@
- 	exit ;;
-     i*86:*:5:[678]*)
-     	# UnixWare 7.x, OpenUNIX and OpenServer 6.
--	case `/bin/uname -X | grep "^Machine"` in
-+	case `uname -X | grep "^Machine"` in
- 	    *486*)	     UNAME_MACHINE=i486 ;;
- 	    *Pentium)	     UNAME_MACHINE=i586 ;;
- 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-@@ -1065,14 +1065,14 @@
- 	if test -f /usr/options/cb.name; then
- 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
- 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
--	elif /bin/uname -X 2>/dev/null >/dev/null ; then
--		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
--		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
--		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-+	elif uname -X 2>/dev/null >/dev/null ; then
-+		UNAME_REL=`(uname -X|grep Release|sed -e 's/.*= //')`
-+		(uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-+		(uname -X|grep '^Machine.*Pentium' >/dev/null) \
- 			&& UNAME_MACHINE=i586
--		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-+		(uname -X|grep '^Machine.*Pent *II' >/dev/null) \
- 			&& UNAME_MACHINE=i686
--		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-+		(uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
- 			&& UNAME_MACHINE=i686
- 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
- 	else
-@@ -1114,12 +1114,12 @@
- 	OS_REL=''
- 	test -r /etc/.relid \
- 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
--	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	uname -p 2>/dev/null | grep 86 >/dev/null \
- 	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
--	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+	uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
--        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+        uname -p 2>/dev/null | grep 86 >/dev/null \
-           && { echo i486-ncr-sysv4; exit; } ;;
-     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- 	echo m68k-unknown-lynxos${UNAME_RELEASE}
-@@ -1471,8 +1471,8 @@
- uname -s = `(uname -s) 2>/dev/null || echo unknown`
- uname -v = `(uname -v) 2>/dev/null || echo unknown`
- 
--/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
--/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-+uname -p = `(uname -p) 2>/dev/null`
-+uname -X     = `(uname -X) 2>/dev/null`
- 
- hostinfo               = `(hostinfo) 2>/dev/null`
- /bin/universe          = `(/bin/universe) 2>/dev/null`
-diff -Naur e3cfsprogs-1.39/lib/blkid/test_probe.in e3cfsprogs-1.39_mod/lib/blkid/test_probe.in
---- e3cfsprogs-1.39/lib/blkid/test_probe.in	2005-09-10 20:08:42.000000000 +0200
-+++ e3cfsprogs-1.39_mod/lib/blkid/test_probe.in	2007-07-20 16:26:02.000000000 +0200
-@@ -21,7 +21,7 @@
- 	fi
- 	bunzip2 < $SRCDIR/tests/$i.img.bz2 > /tmp/test.img.$$
- 	./tst_probe /tmp/test.img.$$ > tests/$i.out
--	/bin/rm -f /tmp/test.img.$$ tests/$i.ok tests/$i.failed
-+	rm -f /tmp/test.img.$$ tests/$i.ok tests/$i.failed
- 	cmp -s tests/$i.out $SRCDIR/tests/$i.results
- 	if [ $? = 0 ];  then
- 		echo ok
-diff -Naur e3cfsprogs-1.39/tests/defaults/e_script e3cfsprogs-1.39_mod/tests/defaults/e_script
---- e3cfsprogs-1.39/tests/defaults/e_script	2005-09-06 11:40:14.000000000 +0200
-+++ e3cfsprogs-1.39_mod/tests/defaults/e_script	2007-07-20 16:26:26.000000000 +0200
-@@ -25,7 +25,7 @@
- elif [ "$class" = icount ]; then
- 	TEST_PROG=$TEST_ICOUNT
- else
--	TEST_PROG=/bin/cat
-+	TEST_PROG=cat
- fi
- 
- cat $SRCDIR/progs/test_data/$instance.setup $SRCDIR/progs/test_data/test.$class \
-diff -Naur e3cfsprogs-1.39/util/gcc-wall-cleanup e3cfsprogs-1.39_mod/util/gcc-wall-cleanup
---- e3cfsprogs-1.39/util/gcc-wall-cleanup	2005-09-06 11:40:15.000000000 +0200
-+++ e3cfsprogs-1.39_mod/util/gcc-wall-cleanup	2007-07-20 16:30:04.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/bin/sed -f
-+#!sed -f
- #
- # This script filters out gcc-wall crud that we're not interested in seeing.
- #
diff --git a/pkgs/os-specific/linux/e3cfsprogs/e3cfsprogs-1.39_etc.patch b/pkgs/os-specific/linux/e3cfsprogs/e3cfsprogs-1.39_etc.patch
deleted file mode 100644
index 5997d431f4c..00000000000
--- a/pkgs/os-specific/linux/e3cfsprogs/e3cfsprogs-1.39_etc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur e3cfsprogs-1.39/misc/Makefile.in e3cfsprogs-1.39_path_mod/misc/Makefile.in
---- e3cfsprogs-1.39/misc/Makefile.in	2006-03-27 07:58:10.000000000 +0200
-+++ e3cfsprogs-1.39_path_mod/misc/Makefile.in	2007-07-20 16:45:04.000000000 +0200
-@@ -223,12 +223,12 @@
- 	@$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
- 
- installdirs:
--	@echo "	MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir)"
-+	@echo "	MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
- 	@$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
- 		$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
- 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
- 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
--		$(DESTDIR)$(libdir) $(DESTDIR)/etc
-+		$(DESTDIR)$(libdir) $(DESTDIR)$(root_sysconfdir)/etc
- 
- install: all $(SMANPAGES) $(UMANPAGES) installdirs
- 	@for i in $(SPROGS); do \
-@@ -291,7 +291,7 @@
- 	@if ! test -f $(DESTDIR)/etc/mke2fs.conf; then \
- 		echo "	INSTALL_DATA /etc/mke2fs.conf"; \
- 		$(INSTALL_DATA) $(srcdir)/mke2fs.conf \
--			$(DESTDIR)/etc/mke2fs.conf; \
-+			$(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
- 	fi
- 
- install-strip: install
diff --git a/pkgs/os-specific/linux/ifplugd/interface.patch b/pkgs/os-specific/linux/ifplugd/interface.patch
deleted file mode 100644
index 9c2de464bbd..00000000000
--- a/pkgs/os-specific/linux/ifplugd/interface.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/interface.c	2004/12/19 00:08:01	114
-+++ src/interface.c	2006/03/07 13:15:11	133
-@@ -22,9 +22,9 @@
- #include <config.h>
- #endif
- 
-+#include <sys/types.h>
- #include <linux/sockios.h>
- #include <linux/if_ether.h>
--#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <linux/if.h>
diff --git a/pkgs/os-specific/linux/kernel-headers-cross/builder.sh b/pkgs/os-specific/linux/kernel-headers-cross/builder.sh
deleted file mode 100644
index 3bc4abc9233..00000000000
--- a/pkgs/os-specific/linux/kernel-headers-cross/builder.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-source $stdenv/setup
-
-
-buildPhase() {
-    make include/linux/version.h
-}
-
-
-installPhase() {
-    mkdir $out
-    mkdir $out/include
-    #cd $out/include
-    #ln -s asm-arm asm
-    if test $cross = "arm-linux"; then
-       arch=arm
-    elif test $cross = "mips-linux"; then
-           arch=mips
-    elif test $cross = "sparc-linux"; then
-           arch=sparc
-    elif test $cross = "powerpc-linux"; then
-           arch=ppc
-    elif test $cross = "ppc-linux"; then
-           arch=ppc
-    fi
-    make include/asm ARCH=$arch
-    cp -prvd include/linux include/asm include/asm-$arch include/asm-generic $out/include
-    echo -n > $out/include/linux/autoconf.h
-}
-
-
-genericBuild
diff --git a/pkgs/os-specific/linux/kernel-headers-cross/default.nix b/pkgs/os-specific/linux/kernel-headers-cross/default.nix
deleted file mode 100644
index e2d4dedf799..00000000000
--- a/pkgs/os-specific/linux/kernel-headers-cross/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, cross}:
-
-assert stdenv.system == "i686-linux";
-
-stdenv.mkDerivation {
-  name = "linux-headers-2.6.14.5";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = mirror://kernel/linux/kernel/v2.6/linux-2.6.14.5.tar.bz2;
-    md5 = "9f057e3bd31c50dc48553def01bc8037";
-  };
-  inherit cross;
-}
diff --git a/pkgs/os-specific/linux/pam_devperm/default.nix b/pkgs/os-specific/linux/pam_devperm/default.nix
deleted file mode 100644
index 1e5a7095e04..00000000000
--- a/pkgs/os-specific/linux/pam_devperm/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, pam}:
-   
-stdenv.mkDerivation {
-  name = "pam_devperm-1.6";
-   
-  src = fetchurl {
-    url = http://ftp.suse.com/pub/people/kukuk/pam/pam_devperm/pam_devperm-1.6.tar.bz2;
-    sha256 = "0rvndh6yvcgmjnkqxv24pjy3ayy4p8r29w25xscwjfzqmrdyfbpw";
-  };
-
-  buildInputs = [pam];
-}
diff --git a/pkgs/os-specific/linux/procps/default.nix b/pkgs/os-specific/linux/procps/default.nix
deleted file mode 100644
index 9c894256413..00000000000
--- a/pkgs/os-specific/linux/procps/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, ncurses }:
-
-stdenv.mkDerivation {
-  name = "procps-3.2.8";
-  
-  src = fetchurl {
-    url = http://procps.sourceforge.net/procps-3.2.8.tar.gz;
-    sha256 = "0d8mki0q4yamnkk4533kx8mc0jd879573srxhg6r2fs3lkc6iv8i";
-  };
-  
-  patches =
-    [ ./makefile.patch
-      ./procps-build.patch
-      ./gnumake3.82.patch
-      ./linux-ver-init.patch
-    ];
-    
-  buildInputs = [ ncurses ];
-  
-  makeFlags = "DESTDIR=$(out)";
-
-  crossAttrs = {
-    CC = stdenv.cross.config + "-gcc";
-  };
-
-  meta = {
-    homepage = http://procps.sourceforge.net/;
-    description = "Utilities that give information about processes using the /proc filesystem";
-  };
-}
diff --git a/pkgs/os-specific/linux/procps/gnumake3.82.patch b/pkgs/os-specific/linux/procps/gnumake3.82.patch
deleted file mode 100644
index 2b1f28d4bce..00000000000
--- a/pkgs/os-specific/linux/procps/gnumake3.82.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 09fb3ed..59eba16 100644
---- a/Makefile
-+++ b/Makefile
-@@ -174,7 +174,7 @@ INSTALL := $(BINFILES) $(MANFILES)
- # want this rule first, use := on ALL, and ALL not filled in yet
- all: do_all
- 
---include */module.mk
-+-include proc/module.mk ps/module.mk
- 
- do_all:    $(ALL)
- 
diff --git a/pkgs/os-specific/linux/procps/linux-ver-init.patch b/pkgs/os-specific/linux/procps/linux-ver-init.patch
deleted file mode 100644
index 9f93784a1fd..00000000000
--- a/pkgs/os-specific/linux/procps/linux-ver-init.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/303120
-
-make sure the linux version constructor runs before the libproc constructor
-since the latter uses variables setup by the former
-
-fix by Chris Coleman
-
-Index: proc/version.c
-===================================================================
-RCS file: /cvsroot/procps/procps/proc/version.c,v
-retrieving revision 1.7
-diff -u -p -r1.7 version.c
---- a/proc/version.c	9 Feb 2003 07:27:16 -0000	1.7
-+++ b/proc/version.c	14 Nov 2010 00:22:44 -0000
-@@ -33,7 +33,7 @@ void display_version(void) {
- 
- int linux_version_code;
- 
--static void init_Linux_version(void) __attribute__((constructor));
-+static void init_Linux_version(void) __attribute__((constructor(100)));
- static void init_Linux_version(void) {
-     static struct utsname uts;
-     int x = 0, y = 0, z = 0;	/* cleared in case sscanf() < 3 */
diff --git a/pkgs/os-specific/linux/procps/makefile.patch b/pkgs/os-specific/linux/procps/makefile.patch
deleted file mode 100644
index 20ff71ecdc1..00000000000
--- a/pkgs/os-specific/linux/procps/makefile.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -rc procps-orig/Makefile procps-3.2.4/Makefile
-*** procps-orig/Makefile	2004-10-10 23:31:12.000000000 +0200
---- procps-3.2.4/Makefile	2005-01-21 19:33:49.700437229 +0100
-***************
-*** 24,47 ****
-  ############ vars
-  
-  # so you can disable them or choose alternates
-! ldconfig := ldconfig
-  ln_f     := ln -f
-  ln_sf    := ln -sf
-! install  := install -D --owner 0 --group 0
-  
-  # Lame x86-64 /lib64 and /usr/lib64 abomination:
-  lib64    := lib$(shell [ -d /lib64 ] && echo 64)
-  
-! usr/bin                  := $(DESTDIR)/usr/bin/
-  bin                      := $(DESTDIR)/bin/
-  sbin                     := $(DESTDIR)/sbin/
-! usr/proc/bin             := $(DESTDIR)/usr/bin/
-! man1                     := $(DESTDIR)/usr/share/man/man1/
-! man5                     := $(DESTDIR)/usr/share/man/man5/
-! man8                     := $(DESTDIR)/usr/share/man/man8/
-! lib                      := $(DESTDIR)/$(lib64)/
-! usr/lib                  := $(DESTDIR)/usr/$(lib64)/
-! usr/include              := $(DESTDIR)/usr/include/
-  
-  #SKIP     := $(bin)kill $(man1)kill.1
-  
---- 24,47 ----
-  ############ vars
-  
-  # so you can disable them or choose alternates
-! ldconfig := true
-  ln_f     := ln -f
-  ln_sf    := ln -sf
-! install  := install -D
-  
-  # Lame x86-64 /lib64 and /usr/lib64 abomination:
-  lib64    := lib$(shell [ -d /lib64 ] && echo 64)
-  
-! usr/bin                  := $(DESTDIR)/bin/
-  bin                      := $(DESTDIR)/bin/
-  sbin                     := $(DESTDIR)/sbin/
-! usr/proc/bin             := $(DESTDIR)/bin/
-! man1                     := $(DESTDIR)/share/man/man1/
-! man5                     := $(DESTDIR)/share/man/man5/
-! man8                     := $(DESTDIR)/share/man/man8/
-! lib                      := $(DESTDIR)/lib/
-! usr/lib                  := $(DESTDIR)/lib/
-! usr/include              := $(DESTDIR)/include/
-  
-  #SKIP     := $(bin)kill $(man1)kill.1
-  
-***************
-*** 71,77 ****
-  
-  # Preprocessor flags.
-  PKG_CPPFLAGS := -D_GNU_SOURCE -I proc
-! CPPFLAGS     := -I/usr/include/ncurses
-  ALL_CPPFLAGS := $(PKG_CPPFLAGS) $(CPPFLAGS)
-  
-  # Left out -Wconversion due to noise in glibc headers.
---- 71,77 ----
-  
-  # Preprocessor flags.
-  PKG_CPPFLAGS := -D_GNU_SOURCE -I proc
-! CPPFLAGS     := 
-  ALL_CPPFLAGS := $(PKG_CPPFLAGS) $(CPPFLAGS)
-  
-  # Left out -Wconversion due to noise in glibc headers.
diff --git a/pkgs/os-specific/linux/procps/procps-build.patch b/pkgs/os-specific/linux/procps/procps-build.patch
deleted file mode 100644
index 67141715bb6..00000000000
--- a/pkgs/os-specific/linux/procps/procps-build.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ruN procps-3.2.6/Makefile procps-3.2.6.new/Makefile
---- procps-3.2.6/Makefile	2005-10-30 07:27:04.000000000 +0100
-+++ procps-3.2.6.new/Makefile	2005-12-13 16:52:02.000000000 +0100
-@@ -43,7 +43,7 @@
- usr/lib                  := $(DESTDIR)/usr/$(lib64)/
- usr/include              := $(DESTDIR)/usr/include/
- 
--#SKIP     := $(bin)kill $(man1)kill.1
-+SKIP     := $(bin)kill $(man1)kill.1 $(usr/bin)uptime $(man1)uptime.1
- 
- BINFILES := $(usr/bin)uptime $(usr/bin)tload $(usr/bin)free $(usr/bin)w \
-             $(usr/bin)top $(usr/bin)vmstat $(usr/bin)watch $(usr/bin)skill \
-@@ -127,26 +127,26 @@
- # produce separate executables for ppc and ppc64, s390 and s390x,
- # i386 and x86-64, mips and mips64, sparc and sparc64, and so on.
- # Failure to do so will cause data corruption.
--m64 := $(call check_gcc,-m64,$(call check_gcc,-mabi=64,))
--ALL_CFLAGS += $(m64)
-+#m64 := $(call check_gcc,-m64,$(call check_gcc,-mabi=64,))
-+#ALL_CFLAGS += $(m64)
- 
--ALL_CFLAGS += $(call check_gcc,-Wdeclaration-after-statement,)
--ALL_CFLAGS += $(call check_gcc,-Wpadded,)
--ALL_CFLAGS += $(call check_gcc,-Wstrict-aliasing,)
-+#ALL_CFLAGS += $(call check_gcc,-Wdeclaration-after-statement,)
-+#ALL_CFLAGS += $(call check_gcc,-Wpadded,)
-+#ALL_CFLAGS += $(call check_gcc,-Wstrict-aliasing,)
- 
- # Adding -fno-gcse might be good for those files which
- # use computed goto.
- #ALL_CFLAGS += $(call check_gcc,-fno-gcse,)
- 
- # if not debugging, enable things that could confuse gdb
--ifeq (,$(findstring -g,$(filter -g%,$(CFLAGS))))
--ALL_CFLAGS += $(call check_gcc,-fweb,)
--ALL_CFLAGS += $(call check_gcc,-frename-registers,)
--ALL_CFLAGS += $(call check_gcc,-fomit-frame-pointer,)
--endif
-+#ifeq (,$(findstring -g,$(filter -g%,$(CFLAGS))))
-+#ALL_CFLAGS += $(call check_gcc,-fweb,)
-+#ALL_CFLAGS += $(call check_gcc,-frename-registers,)
-+#ALL_CFLAGS += $(call check_gcc,-fomit-frame-pointer,)
-+#endif
- 
- # in case -O3 is enabled, avoid bloat
--ALL_CFLAGS += $(call check_gcc,-fno-inline-functions,)
-+#ALL_CFLAGS += $(call check_gcc,-fno-inline-functions,)
- 
- endif
- endif
diff --git a/pkgs/test/rpath/builder.sh b/pkgs/test/rpath/builder.sh
deleted file mode 100644
index 2bf62462146..00000000000
--- a/pkgs/test/rpath/builder.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-export NIX_DEBUG=1
-
-source $stdenv/setup
-
-mkdir $out
-mkdir $out/bin
-
-
-# 1: link statically against glibc.
-res=$out/bin/hello1
-gcc -static $src/hello1.c -o $res
-
-case $(ldd $res) in
-  *"not a dynamic executable"*)
-        ;;
-  *)
-        echo "$res not statically linked!"
-        exit 1
-esac
-
-
-# 2: link dynamically against glibc.
-res=$out/bin/hello2
-gcc $src/hello1.c -o $res
-
-case $(ldd $res) in
-  */store/*glibc*/lib/libc.so*/store/*glibc*/lib/ld-linux.so*)
-        ;;
-  *)
-        echo "$res not dynamically linked / bad rpath!"
-        exit 1
-        ;;
-esac
-
-
-# 3: link C++ dynamically against glibc / libstdc++.
-res=$out/bin/hello3
-g++ $src/hello2.cc -o $res
-
-case $(ldd $res) in
-  */store/*gcc*/lib/*libstdc++*/store/*glibc*/lib/libm*/store/*gcc*/lib/libgcc_s*/store/*glibc*/lib/libc.so*/store/*glibc*/lib/ld-linux.so*)
-        ;;
-  *)
-        echo "$res not dynamically linked / bad rpath!"
-        exit 1
-        ;;
-esac
-
-
-# 4: build dynamic library locally, link against it, copy it.
-res=$out/bin/hello4
-mkdir bla
-gcc -shared $src/text.c -o bla/libtext.so 
-gcc $src/hello3.c -o $res -L$(pwd)/bla -ltext
-mkdir $out/lib
-
-case $(ldd $res) in
-  */tmp*)
-        echo "$res depends on file in /tmp!"
-        exit 1
-        ;;
-esac
-
-cp bla/libtext.so $out/lib
-
-case $(ldd $res) in
-  */store/*glibc*/lib/libc.so*/store/*glibc*/lib/ld-linux.so*)
-        ;;
-  *)
-        echo "$res not dynamically linked / bad rpath!"
-        exit 1
-        ;;
-esac
-
-
-# Run the programs we just made.
-for i in $out/bin/*; do
-    $i
-done
diff --git a/pkgs/test/rpath/default.nix b/pkgs/test/rpath/default.nix
deleted file mode 100644
index f0903420c96..00000000000
--- a/pkgs/test/rpath/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-let {
-  system = "i686-linux";
-
-  stdenvs = (import ../../system/stdenvs.nix) {
-    inherit system;
-    allPackages = import ../../system/all-packages-generic.nix;
-  };
-
-  stdenv = stdenvs.stdenvLinuxBoot2;
-
-  test = stdenv.mkDerivation {
-    name = "rpath-test";
-    builder = ./builder.sh;
-    src = ./src;
-  };
-
-  body = test;
-}
diff --git a/pkgs/test/rpath/src/hello1.c b/pkgs/test/rpath/src/hello1.c
deleted file mode 100644
index c44d7c4a936..00000000000
--- a/pkgs/test/rpath/src/hello1.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdio.h>
-
-int main(int argc, char * * argv)
-{
-    printf("Hello World!\n");
-    return 0;
-}
diff --git a/pkgs/test/rpath/src/hello2.cc b/pkgs/test/rpath/src/hello2.cc
deleted file mode 100644
index 0dc34766f5f..00000000000
--- a/pkgs/test/rpath/src/hello2.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <iostream>
-
-int main(int argc, char * * argv)
-{
-    std::cout << "Hello World!\n";
-    return 0;
-}
diff --git a/pkgs/test/rpath/src/hello3.c b/pkgs/test/rpath/src/hello3.c
deleted file mode 100644
index 2b2308360da..00000000000
--- a/pkgs/test/rpath/src/hello3.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <stdio.h>
-
-char * text();
-
-int main(int argc, char * * argv)
-{
-    printf(text());
-    return 0;
-}
diff --git a/pkgs/test/rpath/src/text.c b/pkgs/test/rpath/src/text.c
deleted file mode 100644
index 3d85ca23f79..00000000000
--- a/pkgs/test/rpath/src/text.c
+++ /dev/null
@@ -1,4 +0,0 @@
-char * text()
-{
-    return "Hello World!\n";
-}
diff --git a/pkgs/test/simple/default.nix b/pkgs/test/simple/default.nix
deleted file mode 100644
index b7d9446bac7..00000000000
--- a/pkgs/test/simple/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-let {
-  system = "i686-linux";
-
-  stdenvs = (import ../../system/stdenvs.nix) {
-    inherit system;
-    allPackages = import ../../system/all-packages-generic.nix;
-  };
-
-  stdenv = stdenvs.stdenvNix;
-
-  test = stdenv.mkDerivation {
-    name = "simple-test";
-    builder = ./builder.sh;
-  };
-
-  body = test;
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d278b5d2419..36239d29431 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5205,14 +5205,10 @@ in
 
   vala_0_28 = callPackage ../development/compilers/vala/0.28.nix { };
 
-  visualcpp = callPackage ../development/compilers/visual-c++ { };
-
   vs90wrapper = callPackage ../development/compilers/vs90wrapper { };
 
   webdsl = callPackage ../development/compilers/webdsl { };
 
-  win32hello = callPackage ../development/compilers/visual-c++/test { };
-
   wla-dx = callPackage ../development/compilers/wla-dx { };
 
   wrapCCWith = ccWrapper: libc: extraBuildCommands: baseCC: ccWrapper {
@@ -5678,11 +5674,9 @@ in
 
   srecord = callPackage ../development/tools/misc/srecord { };
 
-  windowssdk = (
-    callPackage ../development/misc/windows-sdk {});
-
   xidel = callPackage ../tools/text/xidel { };
 
+
   ### DEVELOPMENT / TOOLS
 
   activator = callPackage ../development/tools/activator { };
@@ -10279,8 +10273,6 @@ in
 
   dmtcp = callPackage ../os-specific/linux/dmtcp { };
 
-  dietlibc = callPackage ../os-specific/linux/dietlibc { };
-
   directvnc = callPackage ../os-specific/linux/directvnc { };
 
   dmraid = callPackage ../os-specific/linux/dmraid {
@@ -10320,8 +10312,6 @@ in
 
   lightum = callPackage ../os-specific/linux/lightum { };
 
-  e3cfsprogs = callPackage ../os-specific/linux/e3cfsprogs { };
-
   ebtables = callPackage ../os-specific/linux/ebtables { };
 
   eject = self.utillinux;
@@ -10960,8 +10950,6 @@ in
 
   pam_ccreds = callPackage ../os-specific/linux/pam_ccreds { };
 
-  pam_devperm = callPackage ../os-specific/linux/pam_devperm { };
-
   pam_krb5 = callPackage ../os-specific/linux/pam_krb5 { };
 
   pam_ldap = callPackage ../os-specific/linux/pam_ldap { };
@@ -11009,8 +10997,6 @@ in
 
   procps = procps-ng;
 
-  procps-old = lowPrio (callPackage ../os-specific/linux/procps { });
-
   procps-ng = callPackage ../os-specific/linux/procps-ng { };
 
   watch = callPackage ../os-specific/linux/procps/watch.nix { };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 24ea9bdc470..dcdd27bfe50 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -96,7 +96,6 @@ let
       ddrescue = linux;
       dhcp = linux;
       dico = linux;
-      dietlibc = linux;
       diffutils = all;
       disnix = all;
       disnixos = linux;

From fc941899a356efd76e2390c829c59459bfd0d8e9 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Mon, 25 Apr 2016 23:13:03 +0200
Subject: [PATCH 288/712] fail2ban: rework service

---
 nixos/modules/services/security/fail2ban.nix | 28 +++++++++-----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix
index afbd81be91f..33c4910fc0c 100644
--- a/nixos/modules/services/security/fail2ban.nix
+++ b/nixos/modules/services/security/fail2ban.nix
@@ -99,34 +99,32 @@ in
 
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
+        partOf = optional config.networking.firewall.enable "firewall.service";
 
         restartTriggers = [ fail2banConf jailConf ];
         path = [ pkgs.fail2ban pkgs.iptables ];
 
         preStart =
           ''
-            mkdir -p /run/fail2ban -m 0755
             mkdir -p /var/lib/fail2ban
           '';
 
+        unitConfig.Documentation = "man:fail2ban(1)";
+
         serviceConfig =
-          { ExecStart = "${pkgs.fail2ban}/bin/fail2ban-server -f";
+          { Type = "forking";
+            ExecStart = "${pkgs.fail2ban}/bin/fail2ban-client -x start";
+            ExecStop = "${pkgs.fail2ban}/bin/fail2ban-client stop";
+            ExecReload = "${pkgs.fail2ban}/bin/fail2ban-client reload";
+            PIDFile = "/run/fail2ban/fail2ban.pid";
+            Restart = "always";
+
             ReadOnlyDirectories = "/";
-            ReadWriteDirectories = "/run /var/tmp /var/lib";
+            ReadWriteDirectories = "/run/fail2ban /var/tmp /var/lib";
+            PrivateTmp = "true";
+            RuntimeDirectory = "fail2ban";
             CapabilityBoundingSet = "CAP_DAC_READ_SEARCH CAP_NET_ADMIN CAP_NET_RAW";
           };
-
-        postStart =
-          ''
-            # Wait for the server to start listening.
-            for ((n = 0; n < 20; n++)); do
-              if fail2ban-client ping; then break; fi
-              sleep 0.5
-            done
-
-            # Reload its configuration.
-            fail2ban-client reload
-          '';
       };
 
     # Add some reasonable default jails.  The special "DEFAULT" jail

From d3eea5ae359ba36e1bd70bad0f13d6840dde29ac Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 26 Apr 2016 14:00:20 -0500
Subject: [PATCH 289/712] melpa-packages 2016-04-26

---
 .../editors/emacs-modes/melpa-generated.nix   | 19375 +++++++++-------
 1 file changed, 10896 insertions(+), 8479 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 138c53dfe9a..ebb24f826be 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -6,17 +6,17 @@
         src = fetchFromGitHub {
           owner = "etu";
           repo = "0blayout-mode";
-          rev = "e256da71d4e0f126a0fd8a9b8fb77f54931f4dfc";
+          rev = "6e4ef20e70aed88489c31c48c73da8ff0ce4572b";
           sha256 = "1xigpz2aswlmpcsc1f7gfakyw7041pbyl9zfd8nz38iq036n5b96";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/0blayout";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/0blayout";
           sha256 = "027k85h34998i8vmbg2hi4q1m4f7jfva5jm38k0g9m1db700gk92";
           name = "_0blayout";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/0blayout";
+          homepage = "https://melpa.org/#/0blayout";
           license = lib.licenses.free;
         };
       }) {};
@@ -30,13 +30,13 @@
           sha256 = "1p9qn9n8mfb4z62h1s94mlg0vshpzafbhsxgzvx78sqlf6bfc80l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/2048-game";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/2048-game";
           sha256 = "0z7x9bnyi3qlq7l0fskb61i6yr9gm7w7wplqd28wz8p1j5yw8aa0";
           name = "_2048-game";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/2048-game";
+          homepage = "https://melpa.org/#/2048-game";
           license = lib.licenses.free;
         };
       }) {};
@@ -45,19 +45,40 @@
         pname = "_4clojure";
         version = "20131014.1707";
         src = fetchFromGitHub {
-          owner = "joshuarh";
+          owner = "losingkeys";
           repo = "4clojure.el";
           rev = "3cdfd356c24cd3518397d29ae833f56a4d20b4ca";
           sha256 = "1fybicg46fc5jjqv7g2d3dnj1x9n58m2fg9x6qxn9l8qlzk9yxkq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/4clojure";
-          sha256 = "1w9zxy6jwiln28cmdgkbbdfk3pdscqlfahrqi6lbgpjvkw9z44mb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/4clojure";
+          sha256 = "09bmdxkkp676sn1sbbly44k99i47w83yznq950nkxv6x8753ifgk";
           name = "_4clojure";
         };
         packageRequires = [ json request ];
         meta = {
-          homepage = "http://melpa.org/#/4clojure";
+          homepage = "https://melpa.org/#/4clojure";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aa-edit-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, navi2ch }:
+    melpaBuild {
+        pname = "aa-edit-mode";
+        version = "20160228.17";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "aa-edit-mode";
+          rev = "573cbd75fc8f866088bf4780d9d7132c0689cef5";
+          sha256 = "0d7q0fhcw4cvy9140hwxp8zdh0g37zhfsq6kmsdngxdx7lw3wryi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/aa-edit-mode";
+          sha256 = "00b99ik04xx4b2a1cm1z8dl42hjnb5r32qypjyyx8924n1dhxzgn";
+          name = "aa-edit-mode";
+        };
+        packageRequires = [ emacs navi2ch ];
+        meta = {
+          homepage = "https://melpa.org/#/aa-edit-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -72,13 +93,13 @@
           sha256 = "1h4gwp2gyd4jhbkb8ai1zbzhhmlhmihbwzr0wsxg5yq074n72ifs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/abc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/abc-mode";
           sha256 = "0qf5lbszyscmagiqhc0d05vzkhdky7ini4w33z1h3j5417sscrcx";
           name = "abc-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/abc-mode";
+          homepage = "https://melpa.org/#/abc-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -93,34 +114,34 @@
           sha256 = "09hy7rj27h7xbvasd87146di4vhpg5cmqc9f39fy0ihmv9gy56za";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/abl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/abl-mode";
           sha256 = "0h25lc87pa8irgxflnmnmkr9dcv4kz841nfc45fcz4awrn75kkzb";
           name = "abl-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/abl-mode";
+          homepage = "https://melpa.org/#/abl-mode";
           license = lib.licenses.free;
         };
       }) {};
     abyss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "abyss-theme";
-        version = "20160130.425";
+        version = "20160420.712";
         src = fetchFromGitHub {
           owner = "mgrbyte";
           repo = "emacs-abyss-theme";
-          rev = "953bab8dd567c9a49a74f7c9d6ac52504405d517";
-          sha256 = "1zifkqkxb0wzddfcapm71g3k52fn36ink779imyncg72plg216g0";
+          rev = "e860499a0b2ae0d6d2a27eab12b67dec896a7afc";
+          sha256 = "1yr6cqycd7ljkqzfp4prz9ilcpjq8wxg5yf645m24gy9v4w365ia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/abyss-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/abyss-theme";
           sha256 = "0ckrgfd7fjls6g510v8fqpkd0fd18lr0spg3lf5s88gky8ihdg6c";
           name = "abyss-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/abyss-theme";
+          homepage = "https://melpa.org/#/abyss-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -135,13 +156,13 @@
           sha256 = "19msfx3f3px1maj41bzh139s6sv2pjk9vm3bphn7758fqhzyin0f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-alchemist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-alchemist";
           sha256 = "02ll3hcixgdb8zyszn78714gy1h2q0vkhpbnwap9302mr2racwl0";
           name = "ac-alchemist";
         };
         packageRequires = [ alchemist auto-complete cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/ac-alchemist";
+          homepage = "https://melpa.org/#/ac-alchemist";
           license = lib.licenses.free;
         };
       }) {};
@@ -156,13 +177,13 @@
           sha256 = "092m8y38h4irh2ig6n6510gw2scjjxah37zim6mk92jzn1xv06d0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-anaconda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-anaconda";
           sha256 = "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf";
           name = "ac-anaconda";
         };
         packageRequires = [ anaconda-mode auto-complete dash ];
         meta = {
-          homepage = "http://melpa.org/#/ac-anaconda";
+          homepage = "https://melpa.org/#/ac-anaconda";
           license = lib.licenses.free;
         };
       }) {};
@@ -177,13 +198,13 @@
           sha256 = "1z6rj15p5gjv0jwnnck8789n9csf1pwxfvsz37graihgfy2khj0y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-c-headers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-c-headers";
           sha256 = "1cq5rz2w79bj185va7y13x7bciihrpsvyxwk6msmcxb4g86s9phv";
           name = "ac-c-headers";
         };
         packageRequires = [ auto-complete ];
         meta = {
-          homepage = "http://melpa.org/#/ac-c-headers";
+          homepage = "https://melpa.org/#/ac-c-headers";
           license = lib.licenses.free;
         };
       }) {};
@@ -198,13 +219,13 @@
           sha256 = "1llpnb9vy612sg214i76rxnzcl3qx8pqnixczc5pik9kd3fdaz5f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-cake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-cake";
           sha256 = "0s2pgf0m98ixgadsnn201vm5gnawanpvxv56sf599f33krqnxzkl";
           name = "ac-cake";
         };
         packageRequires = [ auto-complete cake ];
         meta = {
-          homepage = "http://melpa.org/#/ac-cake";
+          homepage = "https://melpa.org/#/ac-cake";
           license = lib.licenses.free;
         };
       }) {};
@@ -219,13 +240,13 @@
           sha256 = "0mlmhdl9s28z981y8bnpj8jpfzm6bgfiyl0zmpgvhyqw1wzqywwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-cake2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-cake2";
           sha256 = "0qxilldx23wqf8ilif2nin119bvd0l7b6f6wifixx28a6kl1vsgy";
           name = "ac-cake2";
         };
         packageRequires = [ auto-complete cake2 ];
         meta = {
-          homepage = "http://melpa.org/#/ac-cake2";
+          homepage = "https://melpa.org/#/ac-cake2";
           license = lib.licenses.free;
         };
       }) {};
@@ -240,34 +261,34 @@
           sha256 = "0nyq34yq4jcp3p30ygma3iz1h0q551p33792byj76pa5ps09g1da";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-capf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-capf";
           sha256 = "1drgk5iz2wp3rxzd39pj0n4cfmm5z8zqlp50jw5z7ffbbg35qxbm";
           name = "ac-capf";
         };
         packageRequires = [ auto-complete cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/ac-capf";
+          homepage = "https://melpa.org/#/ac-capf";
           license = lib.licenses.free;
         };
       }) {};
     ac-cider = callPackage ({ auto-complete, cider, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ac-cider";
-        version = "20151012.508";
+        version = "20160305.924";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "ac-cider";
-          rev = "eeb4b3ae1e91d03d765f6c39994792e4f05f6600";
-          sha256 = "1k4zk27zvxmcffwwg0zx19rcy2ysd65nnrifwspdw699glpwx2l5";
+          rev = "cc8efb877cb80475392860a478c985421a25acd5";
+          sha256 = "0j8bbliijycnvpqbl1x3a0nbixhr57czfch2s8phn7v3zzdr8k3h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-cider";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-cider";
           sha256 = "1dszpb706h34miq2bxqyq1ycbran5ax36vcniwp8vvhgcjsw5sz6";
           name = "ac-cider";
         };
         packageRequires = [ auto-complete cider cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/ac-cider";
+          homepage = "https://melpa.org/#/ac-cider";
           license = lib.licenses.free;
         };
       }) {};
@@ -282,13 +303,13 @@
           sha256 = "0n9zagwh3rz7b76irj4ya8wskffns9v1c1pivsdqgpd76spvl7n5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-clang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-clang";
           sha256 = "070s06xhkzaqfc3j8c4i44rks6gn8z66lwd54j17p8d91x3qjpr4";
           name = "ac-clang";
         };
         packageRequires = [ auto-complete cl-lib emacs pos-tip yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/ac-clang";
+          homepage = "https://melpa.org/#/ac-clang";
           license = lib.licenses.free;
         };
       }) {};
@@ -296,38 +317,38 @@
         pname = "ac-dabbrev";
         version = "20130906.18";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/ac-dabbrev.el";
+          url = "https://www.emacswiki.org/emacs/download/ac-dabbrev.el";
           sha256 = "0q0lbhdng5s5hqa342yyvg02hf2bfbwq513lj1rlaqz4ykvpd7fh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-dabbrev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-dabbrev";
           sha256 = "03lndw7y55bzz4rckl80j0kh66qa82xxxhfakzs1dh1h9f1f0azh";
           name = "ac-dabbrev";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ac-dabbrev";
+          homepage = "https://melpa.org/#/ac-dabbrev";
           license = lib.licenses.free;
         };
       }) {};
     ac-dcd = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, flycheck-dmd-dub, lib, melpaBuild }:
     melpaBuild {
         pname = "ac-dcd";
-        version = "20150702.924";
+        version = "20160311.817";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "ac-dcd";
-          rev = "8fe1a48fcfeeafa1970e5041b0e71a4fcd10f336";
-          sha256 = "1dydjkilvyzxl7wwy3afmn1cjf8jv0385im4nhn8c3xr8iiil7yv";
+          rev = "bfb4fe768c8bf6fc7b7ee880f54e2052ebb23e3b";
+          sha256 = "1hlijh415wgl450ry16a1072jjrkqqqkk862hfhswfr2l6rjfw98";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-dcd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-dcd";
           sha256 = "086jp9c6bilc361n1hscza3pbhgvqlq944z7cil2jm1kicsf8s7r";
           name = "ac-dcd";
         };
         packageRequires = [ auto-complete flycheck-dmd-dub ];
         meta = {
-          homepage = "http://melpa.org/#/ac-dcd";
+          homepage = "https://melpa.org/#/ac-dcd";
           license = lib.licenses.free;
         };
       }) {};
@@ -342,13 +363,13 @@
           sha256 = "1lkhqmfkjga7qi4r1m7mjax3pyf9m6minsn57cbzm2z2kvkhq22g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-emmet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-emmet";
           sha256 = "09ycjllfpdgqaf5iis5bkkhal1vxvl3qkxrn2759p67s97c49f3x";
           name = "ac-emmet";
         };
         packageRequires = [ auto-complete emmet-mode ];
         meta = {
-          homepage = "http://melpa.org/#/ac-emmet";
+          homepage = "https://melpa.org/#/ac-emmet";
           license = lib.licenses.free;
         };
       }) {};
@@ -363,13 +384,13 @@
           sha256 = "19981mzxnqqdb8dsdizy2i8byb8sx9138x3nrvi6ap2qbcsabjmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-emoji";
           sha256 = "0msh3dh89jzk6hxva34gp9d5pazchgdknxjbi72z26rss9bkp1mw";
           name = "ac-emoji";
         };
         packageRequires = [ auto-complete cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/ac-emoji";
+          homepage = "https://melpa.org/#/ac-emoji";
           license = lib.licenses.free;
         };
       }) {};
@@ -384,13 +405,13 @@
           sha256 = "140i02b2ipyfmki945l1xd1nsqdpganhmi3bmwj1h9w8cg078bd4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-etags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-etags";
           sha256 = "0ag49k9izrs4ikzac9lifvvwhcn5n89lr2vb20pngsvg1czdyhzb";
           name = "ac-etags";
         };
         packageRequires = [ auto-complete ];
         meta = {
-          homepage = "http://melpa.org/#/ac-etags";
+          homepage = "https://melpa.org/#/ac-etags";
           license = lib.licenses.free;
         };
       }) {};
@@ -405,13 +426,13 @@
           sha256 = "02ifz25rq64z0ifxs52aqdz0iz4mi6xvj88hcn3aakkmsj749vvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-geiser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-geiser";
           sha256 = "0v558qz1mp8b1bgk8kgdk5sx5mpd353mw77n5b0pw4b2ikzpz2mx";
           name = "ac-geiser";
         };
         packageRequires = [ auto-complete geiser ];
         meta = {
-          homepage = "http://melpa.org/#/ac-geiser";
+          homepage = "https://melpa.org/#/ac-geiser";
           license = lib.licenses.free;
         };
       }) {};
@@ -426,34 +447,34 @@
           sha256 = "0m33v9iy3y37sicfmpx7kvmn8v1a8k6cs7d0v9v5k93p4d5ila41";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-haskell-process";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-haskell-process";
           sha256 = "0kv4z850kv03wiax1flnrp6sgqja25j23l719w7rkr7ck110q8rw";
           name = "ac-haskell-process";
         };
         packageRequires = [ auto-complete haskell-mode ];
         meta = {
-          homepage = "http://melpa.org/#/ac-haskell-process";
+          homepage = "https://melpa.org/#/ac-haskell-process";
           license = lib.licenses.free;
         };
       }) {};
     ac-helm = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "ac-helm";
-        version = "20140919.1117";
+        version = "20160318.2133";
         src = fetchFromGitHub {
           owner = "yasuyk";
           repo = "ac-helm";
-          rev = "0cde22dac4726d08c27801c926cf40b1165c8a07";
-          sha256 = "1ycchpiiavxw8n08gra0bsp9pxp6ln8cgjrkz9jjq7i6ixi8f9d6";
+          rev = "baf2b1e04bcffa835084389c0fab415f26efbf32";
+          sha256 = "1fyikdwn0gzng7pbmfg7zb7jphjv228776vsjc12j7g1aqz92n4l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-helm";
           sha256 = "16ajxlhcah5zbvywpc6l4l1arr308gjpgvdx6l1nrv2zvpckhlwq";
           name = "ac-helm";
         };
         packageRequires = [ auto-complete cl-lib helm popup ];
         meta = {
-          homepage = "http://melpa.org/#/ac-helm";
+          homepage = "https://melpa.org/#/ac-helm";
           license = lib.licenses.free;
         };
       }) {};
@@ -468,13 +489,13 @@
           sha256 = "1sip87j4wvlf9pfnpr0zyyhys1dd9smh6hy3zs08ihbdh98krgs5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-html";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-html";
           sha256 = "0qf8f75b6dvy844dq8vh8d9c6k599rh1ynjcif9bwvdpf6pxwvqa";
           name = "ac-html";
         };
         packageRequires = [ auto-complete dash f s ];
         meta = {
-          homepage = "http://melpa.org/#/ac-html";
+          homepage = "https://melpa.org/#/ac-html";
           license = lib.licenses.free;
         };
       }) {};
@@ -489,34 +510,34 @@
           sha256 = "1v3ia439h4n2i204n0sazzbwwm0l5k6j31gq58iv2rqrq2ysikny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-html-angular";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-html-angular";
           sha256 = "05rbxf5kbr4jlskrhvfvhf82qvb55zl5cb6z1ymfh9l3h9j9xk3s";
           name = "ac-html-angular";
         };
         packageRequires = [ web-completion-data ];
         meta = {
-          homepage = "http://melpa.org/#/ac-html-angular";
+          homepage = "https://melpa.org/#/ac-html-angular";
           license = lib.licenses.free;
         };
       }) {};
     ac-html-bootstrap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }:
     melpaBuild {
         pname = "ac-html-bootstrap";
-        version = "20151222.1512";
+        version = "20160302.1101";
         src = fetchFromGitHub {
           owner = "osv";
           repo = "ac-html-bootstrap";
-          rev = "ea9f7e351e1f39e0c2da5f518948db5ee751d15b";
-          sha256 = "0v33p6lnsq1nwyxfbgs6vg6fidfyqwxd5wls2yza95yxzl30m9r7";
+          rev = "481e6e441cd566554ce71cd8cb28c9e7ebb1c24b";
+          sha256 = "0ry398awbsyswc87v275x4mdyv64kr0s647y6nagqg1h3n3jhvsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-html-bootstrap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-html-bootstrap";
           sha256 = "0z71m6xws0k9smhsswaivpikr64mv0wh6klnmi5cwhwcqas6kdi1";
           name = "ac-html-bootstrap";
         };
         packageRequires = [ web-completion-data ];
         meta = {
-          homepage = "http://melpa.org/#/ac-html-bootstrap";
+          homepage = "https://melpa.org/#/ac-html-bootstrap";
           license = lib.licenses.free;
         };
       }) {};
@@ -531,13 +552,13 @@
           sha256 = "0swbw62zh5rjjf73pvmp8brrrmk6bp061k793z4z83v7ic0cicrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-html-csswatcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-html-csswatcher";
           sha256 = "0jb9dnm2lxadrxssf0rjqw8yvvskcq4hys8c21shjyj3gkvwbfqn";
           name = "ac-html-csswatcher";
         };
         packageRequires = [ web-completion-data ];
         meta = {
-          homepage = "http://melpa.org/#/ac-html-csswatcher";
+          homepage = "https://melpa.org/#/ac-html-csswatcher";
           license = lib.licenses.free;
         };
       }) {};
@@ -552,13 +573,13 @@
           sha256 = "0xdqk0qr1mmm5q3049ldwlmrcfgz6rzk4yxc8qgz6kll27kciia0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-inf-ruby";
           sha256 = "04jclf0yxz78x1fsaf5sh1p466947nqrcx337kyhqn0nkj3hplqr";
           name = "ac-inf-ruby";
         };
         packageRequires = [ auto-complete inf-ruby ];
         meta = {
-          homepage = "http://melpa.org/#/ac-inf-ruby";
+          homepage = "https://melpa.org/#/ac-inf-ruby";
           license = lib.licenses.free;
         };
       }) {};
@@ -573,13 +594,13 @@
           sha256 = "1cq73bdv3lkn8v3nx6aznygqaac9s5i7pvirl8wz9ib31hsgwpbk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-ispell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-ispell";
           sha256 = "1vsy2qjh60n5lavivpqhhcpg5pk8zz2r0wy1sb65capn841zdi67";
           name = "ac-ispell";
         };
         packageRequires = [ auto-complete cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/ac-ispell";
+          homepage = "https://melpa.org/#/ac-ispell";
           license = lib.licenses.free;
         };
       }) {};
@@ -594,13 +615,13 @@
           sha256 = "0yn9333rjs2pzb1wk1japclsqagdcl28j0yjl3q5b70g5gi5vx7k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-js2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-js2";
           sha256 = "0gcr0xdi89nj3854v2z3nndfgazmcdzmd6wdndl0i4s7pdfl96fa";
           name = "ac-js2";
         };
         packageRequires = [ js2-mode skewer-mode ];
         meta = {
-          homepage = "http://melpa.org/#/ac-js2";
+          homepage = "https://melpa.org/#/ac-js2";
           license = lib.licenses.free;
         };
       }) {};
@@ -609,19 +630,19 @@
         pname = "ac-math";
         version = "20141116.1527";
         src = fetchFromGitHub {
-          owner = "vitoshka";
+          owner = "vspinu";
           repo = "ac-math";
           rev = "c012a8f620a48cb18db7d78995035d65eae28f11";
           sha256 = "0p5cdaw9v8jgnmjqpb95bxy4khwbdgg19wzg8jkr2j2p55dpfbd6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-math";
-          sha256 = "1gx35m0wv60cfgm87y2c7vrpwdsqjzk9bz4pp9dbs8dhxvji0ay4";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-math";
+          sha256 = "02c821zabxp9qkwx252pxjmssdbmas0iwanw09r03bmiby9d4nsl";
           name = "ac-math";
         };
         packageRequires = [ auto-complete math-symbol-lists ];
         meta = {
-          homepage = "http://melpa.org/#/ac-math";
+          homepage = "https://melpa.org/#/ac-math";
           license = lib.licenses.free;
         };
       }) {};
@@ -636,13 +657,13 @@
           sha256 = "19cb8kq8gmrplkxil22ahvbyq5cng1l2vh2lrfiyqpjsap7zfjz5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-mozc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-mozc";
           sha256 = "1v3iiid8cq50i076q98ycks9m827xzncgxqwqs2rqhab0ncy3h0f";
           name = "ac-mozc";
         };
         packageRequires = [ auto-complete cl-lib mozc ];
         meta = {
-          homepage = "http://melpa.org/#/ac-mozc";
+          homepage = "https://melpa.org/#/ac-mozc";
           license = lib.licenses.free;
         };
       }) {};
@@ -657,28 +678,28 @@
           sha256 = "16bg2zg08223x7q54rmfjziaccgm64h9vc8z59sjljkw1bgx9m7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-octave";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-octave";
           sha256 = "1g5s4dk1rcgkjn17jfw6g201pw0vfhqcx1nhigmnizpnzy0man9z";
           name = "ac-octave";
         };
         packageRequires = [ auto-complete ];
         meta = {
-          homepage = "http://melpa.org/#/ac-octave";
+          homepage = "https://melpa.org/#/ac-octave";
           license = lib.licenses.free;
         };
       }) {};
     ac-php = callPackage ({ auto-complete, company, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope, yasnippet }:
     melpaBuild {
         pname = "ac-php";
-        version = "20160203.2053";
+        version = "20160416.213";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "bf5e3b82ac81b420613edc9e67a35bd4650605f2";
-          sha256 = "013j8iv62jiq3pbammh3ia6dcf9dm28w938nkh7hljh1c26hg4hp";
+          rev = "11acb76d2eeeecd3041a0b237db729a795a7711c";
+          sha256 = "1h06s6bn9ld868zbnp7zmgkk6b3m9rmgghf897slmqnqd3wdq3pa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-php";
           sha256 = "0p9qq8nszp5jb71s35cxnmcxp50b62y2jv1ha7vvqfz5p8miallk";
           name = "ac-php";
         };
@@ -695,7 +716,7 @@
           yasnippet
         ];
         meta = {
-          homepage = "http://melpa.org/#/ac-php";
+          homepage = "https://melpa.org/#/ac-php";
           license = lib.licenses.free;
         };
       }) {};
@@ -710,13 +731,13 @@
           sha256 = "0g7xbfsfqpmcay56y8xbmif52ccz430s3rjxf5bgl9ahkk7zgkzl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-racer";
           sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp";
           name = "ac-racer";
         };
         packageRequires = [ auto-complete cl-lib racer ];
         meta = {
-          homepage = "http://melpa.org/#/ac-racer";
+          homepage = "https://melpa.org/#/ac-racer";
           license = lib.licenses.free;
         };
       }) {};
@@ -731,13 +752,13 @@
           sha256 = "1nvz0jfz4x99xc5ywspl8fdpyqns5zd0j7i4bwzlwplmy3qakjwm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-skk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-skk";
           sha256 = "0iycyfgv8v15ygngvyx66m3w3sv8p9h6q6j1hbpzwd8azl8fzj5z";
           name = "ac-skk";
         };
         packageRequires = [ auto-complete cl-lib ddskk tinysegmenter ];
         meta = {
-          homepage = "http://melpa.org/#/ac-skk";
+          homepage = "https://melpa.org/#/ac-skk";
           license = lib.licenses.free;
         };
       }) {};
@@ -752,13 +773,13 @@
           sha256 = "13yghv7p6c91fn8mrxbwrb6ldk5n3b6nj6a7pwsvks1q73i1pl88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-slime";
           sha256 = "0mk3k1lcbqa16xvsbgk28x09vzqyaidqaqpq934xdbrwhdgwgckg";
           name = "ac-slime";
         };
         packageRequires = [ auto-complete cl-lib slime ];
         meta = {
-          homepage = "http://melpa.org/#/ac-slime";
+          homepage = "https://melpa.org/#/ac-slime";
           license = lib.licenses.free;
         };
       }) {};
@@ -773,13 +794,13 @@
           sha256 = "0mif35chyj4ai1bj4gq8qi38dyfsp72yi1xchhzy9zi2plpvqa7a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-sly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-sly";
           sha256 = "1ng81b5f8w2s9mm9s7h5kwyx8fdwndnlsbzx50slmqyaz2ad15mx";
           name = "ac-sly";
         };
         packageRequires = [ auto-complete cl-lib sly ];
         meta = {
-          homepage = "http://melpa.org/#/ac-sly";
+          homepage = "https://melpa.org/#/ac-sly";
           license = lib.licenses.free;
         };
       }) {};
@@ -794,13 +815,13 @@
           sha256 = "1msj0dbzfan0jax5wh5rmv4l7cp5zhrp5wy5k1n9s7xdgz2dprzj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-flyspell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ace-flyspell";
           sha256 = "0f24qrpcvyg7h6ylyggn4zrbydci537iigshac1d8yywsr0j47gd";
           name = "ace-flyspell";
         };
         packageRequires = [ ace-jump-mode ];
         meta = {
-          homepage = "http://melpa.org/#/ace-flyspell";
+          homepage = "https://melpa.org/#/ace-flyspell";
           license = lib.licenses.free;
         };
       }) {};
@@ -815,55 +836,55 @@
           sha256 = "02i3gxk7kfv3a0pcc82z69hgvjw8bvn40y8h7d59chg8bixcwbyr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ace-isearch";
           sha256 = "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm";
           name = "ace-isearch";
         };
         packageRequires = [ ace-jump-mode avy emacs helm-swoop ];
         meta = {
-          homepage = "http://melpa.org/#/ace-isearch";
+          homepage = "https://melpa.org/#/ace-isearch";
           license = lib.licenses.free;
         };
       }) {};
     ace-jump-buffer = callPackage ({ avy, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-jump-buffer";
-        version = "20160219.1756";
+        version = "20160229.1658";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "ace-jump-buffer";
-          rev = "d652091416bbe01d1a839809976b8fd6b8eddf32";
-          sha256 = "154p332ikyc06hl0paqjyq3hzmf1afv9mwspx6333frsif0g0bds";
+          rev = "9224e279a53fba06ed5561e22bf89ab94f74b9e7";
+          sha256 = "1y2rl4faj1nfjqbh393yp460cbv24simllak31ag1ischpcbqjy4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-jump-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ace-jump-buffer";
           sha256 = "0hkxa0ps0v1hwmjafqbnyr6rc4s0w95igk8y3w53asl7f5sj5mpi";
           name = "ace-jump-buffer";
         };
         packageRequires = [ avy dash ];
         meta = {
-          homepage = "http://melpa.org/#/ace-jump-buffer";
+          homepage = "https://melpa.org/#/ace-jump-buffer";
           license = lib.licenses.free;
         };
       }) {};
     ace-jump-helm-line = callPackage ({ avy, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-jump-helm-line";
-        version = "20160220.136";
+        version = "20160329.1418";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "ace-jump-helm-line";
-          rev = "cda9ef9c8d5efdcd027600fe0628b990e32d698f";
-          sha256 = "0qd49jbm4rlkv6idjfhfyhifmjlqfag0n06rm7wmyhbzg11lfynf";
+          rev = "8779050e4794279946892b6a156d0086554a9c9e";
+          sha256 = "1d4bxxcnjbdr6cjr3jmz2zrnzjv5pwrypbp4xqgqyv9rz02n7ac1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-jump-helm-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ace-jump-helm-line";
           sha256 = "04q8wh6jskvbiq6y2xsp2ir23vgz5zw09rm127sgiqrmn0jc61b9";
           name = "ace-jump-helm-line";
         };
         packageRequires = [ avy helm ];
         meta = {
-          homepage = "http://melpa.org/#/ace-jump-helm-line";
+          homepage = "https://melpa.org/#/ace-jump-helm-line";
           license = lib.licenses.free;
         };
       }) {};
@@ -878,13 +899,13 @@
           sha256 = "17axrgd99glnl6ma4ls3k01ysdqmiqr581wnrbsn3s4gp53mm2x6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-jump-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ace-jump-mode";
           sha256 = "0yk0kppjyblr5wamncrjm3ym3n8jcl0r0g0cbnwni89smvpngij6";
           name = "ace-jump-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ace-jump-mode";
+          homepage = "https://melpa.org/#/ace-jump-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -899,34 +920,55 @@
           sha256 = "0z0rblr41r94l4b2gh9fcw50nk82ifxrr3ilxqzbb8wmvil54gh4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-jump-zap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ace-jump-zap";
           sha256 = "07bkmly3lvlbby2m13nj3m1q0gcnwy5sas7d6ws6vr9jh0d36byb";
           name = "ace-jump-zap";
         };
         packageRequires = [ ace-jump-mode dash ];
         meta = {
-          homepage = "http://melpa.org/#/ace-jump-zap";
+          homepage = "https://melpa.org/#/ace-jump-zap";
           license = lib.licenses.free;
         };
       }) {};
     ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-link";
-        version = "20160105.2354";
+        version = "20160326.820";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "ace-link";
-          rev = "bfcfb9bf3ae003dc343d3c69ff31553d0f532737";
-          sha256 = "1vs5rwd3gwpydr2fyszjxdkvpzl0vrr48g8f0180fz5b3phh1h1i";
+          rev = "9a81b3f3e799d80e400bf3dd87b3eab7b4b07aa2";
+          sha256 = "1z8vjks817m328sh3qw48072fi905w5a6mjwymqiqfkzpmf9n48j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ace-link";
           sha256 = "1jl805r2s3wa0xyhss1q28rcy6y2fngf0yfcrcd9wf8kamhpajk5";
           name = "ace-link";
         };
         packageRequires = [ avy ];
         meta = {
-          homepage = "http://melpa.org/#/ace-link";
+          homepage = "https://melpa.org/#/ace-link";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ace-mc = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
+    melpaBuild {
+        pname = "ace-mc";
+        version = "20160408.1937";
+        src = fetchFromGitHub {
+          owner = "mm--";
+          repo = "ace-mc";
+          rev = "b106bf6a6c78c3e026fbe9a99a34d6239adce4fd";
+          sha256 = "1zgmqgh5dff914dw7i8s142znd849gv4xh86f8q8agx5r7almx14";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ace-mc";
+          sha256 = "1kca6ha2glhv7lkamqx3sxp7dy05c7f6xxy3lr3v2bik8r50jss8";
+          name = "ace-mc";
+        };
+        packageRequires = [ ace-jump-mode dash multiple-cursors ];
+        meta = {
+          homepage = "https://melpa.org/#/ace-mc";
           license = lib.licenses.free;
         };
       }) {};
@@ -941,13 +983,13 @@
           sha256 = "1zx94dysd817i4xgapzm6fb8fcqb90sqym212b57qlqimyi3f59m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-pinyin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ace-pinyin";
           sha256 = "18gmj71zd0i6yx8ifjxsqz2v81jx0j37f5kxllf31w7fj32ymbkc";
           name = "ace-pinyin";
         };
         packageRequires = [ ace-jump-mode avy ];
         meta = {
-          homepage = "http://melpa.org/#/ace-pinyin";
+          homepage = "https://melpa.org/#/ace-pinyin";
           license = lib.licenses.free;
         };
       }) {};
@@ -962,34 +1004,34 @@
           sha256 = "1qiiivkwa95bhyym8ly7fnwwglc9dcifkyr314bsq8m4rp1mgry4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-popup-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ace-popup-menu";
           sha256 = "1cq1mpv7v98bqrpsm598krq1741b6rwih71cx3yjifpbagrv4m5s";
           name = "ace-popup-menu";
         };
         packageRequires = [ avy-menu emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ace-popup-menu";
+          homepage = "https://melpa.org/#/ace-popup-menu";
           license = lib.licenses.free;
         };
       }) {};
     ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-window";
-        version = "20150803.1037";
+        version = "20160225.1019";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "ace-window";
-          rev = "f6653fb5d8bfe8d7bcad94fc72ca9561e28180f0";
-          sha256 = "053074jyinr3a2zkr1jfgmizdbhk5s37vrvf490x2hwf19dzis4a";
+          rev = "77cc05f7284577ed396f292de0e7bb8ec561ea81";
+          sha256 = "1afc0f8ax334gv644zdrrp55754gxa353iijvmfzxmlr67v23j96";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ace-window";
           sha256 = "1k0x8m1phmvgdxb5aj841iai9q96a5lfq8i4b5vnlbc3w888n3xa";
           name = "ace-window";
         };
         packageRequires = [ avy ];
         meta = {
-          homepage = "http://melpa.org/#/ace-window";
+          homepage = "https://melpa.org/#/ace-window";
           license = lib.licenses.free;
         };
       }) {};
@@ -1003,13 +1045,13 @@
           sha256 = "0zjncby2884cv8nz2ss7i0p17l15lsk88zwvb7b0gr3apbfpcpa3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/achievements";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/achievements";
           sha256 = "1pwlibq87ph20z2pssk5hbgs6v8kdym9193jjdx2rxp0nic4k0cr";
           name = "achievements";
         };
         packageRequires = [ keyfreq ];
         meta = {
-          homepage = "http://melpa.org/#/achievements";
+          homepage = "https://melpa.org/#/achievements";
           license = lib.licenses.free;
         };
       }) {};
@@ -1024,13 +1066,13 @@
           sha256 = "02ba4d8qkvgy52g0zcbyfvsnhr9685gq569nkwa2as30xdcq3khm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ack-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ack-menu";
           sha256 = "1d2kw04ndxji2qjcm1b65qnxpp08zx8gbia8bl6x6mnjb2isc2d9";
           name = "ack-menu";
         };
         packageRequires = [ mag-menu ];
         meta = {
-          homepage = "http://melpa.org/#/ack-menu";
+          homepage = "https://melpa.org/#/ack-menu";
           license = lib.licenses.free;
         };
       }) {};
@@ -1045,55 +1087,55 @@
           sha256 = "1rxx2j7kkzjdsk06zgisiydg8dc18vqll4wl6q9mfhrg2y12lq94";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/actionscript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/actionscript-mode";
           sha256 = "1dkiay9jmizvslji5kzab4dxm1dq0jm8ps7sjq6710g7a5aqdvwq";
           name = "actionscript-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/actionscript-mode";
+          homepage = "https://melpa.org/#/actionscript-mode";
           license = lib.licenses.free;
         };
       }) {};
     addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "addressbook-bookmark";
-        version = "20160205.133";
+        version = "20160317.103";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "addressbook-bookmark";
-          rev = "4bac9327e8ccfbe48d0928c2167c4392d14e7019";
-          sha256 = "044piw8jrg6j313cijry38x9mrwvl4b2a46ak2949xqrljh766k6";
+          rev = "f58b944d11f8522ab85bbaf52a9591518e296545";
+          sha256 = "0dk7hyp7cs0ws4w7i32g7di5aqkkxlxkvmrllg43bi5ivlji7pvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/addressbook-bookmark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/addressbook-bookmark";
           sha256 = "15p00v4ndrsbadal0ss176mks4ynj39786bmrnil29b6sqibd43r";
           name = "addressbook-bookmark";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/addressbook-bookmark";
+          homepage = "https://melpa.org/#/addressbook-bookmark";
           license = lib.licenses.free;
         };
       }) {};
     adoc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markup-faces, melpaBuild }:
     melpaBuild {
         pname = "adoc-mode";
-        version = "20151119.1114";
+        version = "20160314.1630";
         src = fetchFromGitHub {
           owner = "sensorflo";
           repo = "adoc-mode";
-          rev = "168ffa3f8efc3a635cc8f9422b7117a3a99af804";
-          sha256 = "01fn73vyhdcy84s60r2jjy9a0xm3zwagpzi6b4qlankbvswypask";
+          rev = "745884359a1b8826ede2c4cfd2f0b5478953ac40";
+          sha256 = "199da15f6p84809z33w3m35lrk9bgx8qpgnxsxgisli373mpzvd8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/adoc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/adoc-mode";
           sha256 = "0wgagcsh0fkb51fy17ilrs20z2vzdpmz97vpwijcfy2b9rypxq15";
           name = "adoc-mode";
         };
         packageRequires = [ markup-faces ];
         meta = {
-          homepage = "http://melpa.org/#/adoc-mode";
+          homepage = "https://melpa.org/#/adoc-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -1108,13 +1150,13 @@
           sha256 = "1p90yv2xl1hhpjm0mmhdjyf1jagf79610hkzhw8nycy2p1y4gvl6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/aes";
           sha256 = "11vl9x3ldrv7q7rd29xk4xmlvfxs0m6iys84f6mlgf00190l5r5v";
           name = "aes";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/aes";
+          homepage = "https://melpa.org/#/aes";
           license = lib.licenses.free;
         };
       }) {};
@@ -1129,116 +1171,116 @@
           sha256 = "19d5d6qs5nwmpf26rsb86ranb5p4236qp7p2b4i88cimcmzspylb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/afternoon-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/afternoon-theme";
           sha256 = "13xgdw8px58sxpl7nyhkcdxwqdpp13i8wghvlb3l4471plw3vqgj";
           name = "afternoon-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/afternoon-theme";
+          homepage = "https://melpa.org/#/afternoon-theme";
           license = lib.licenses.free;
         };
       }) {};
     ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ag";
-        version = "20160126.1335";
+        version = "20160321.1806";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "ag.el";
-          rev = "b4b0e39b7fb706fc3208e238c2a7e517ebdb999c";
-          sha256 = "1ra5nrc4nvp41rcdc4nkjs9lk7131zd54v63c6lyi3zkg3dyl7im";
+          rev = "29d40fdaa4f605e9a6bf689050f0767f3ba22307";
+          sha256 = "1hwjd1ln99595xwakynhgr3azs4h8rziy75kfz8k5b7i3hns7z08";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ag";
           sha256 = "1r4ai09vdckkg4h4i7dp781qqmm4kky53p4q8azp3n2c78i1vz6g";
           name = "ag";
         };
         packageRequires = [ cl-lib dash s ];
         meta = {
-          homepage = "http://melpa.org/#/ag";
+          homepage = "https://melpa.org/#/ag";
           license = lib.licenses.free;
         };
       }) {};
     aggressive-fill-paragraph = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aggressive-fill-paragraph";
-        version = "20151112.141";
+        version = "20160301.1614";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "aggressive-fill-paragraph-mode";
-          rev = "9af6a31b7c47306fb524bcc8582e0a3738701f25";
-          sha256 = "18zlxgwcvqhlw9y7zn6fywmy04f7rs71fd5ihcx28j4rx9ay929c";
+          rev = "0a0f8ff42b0964751889b9ce2477bab82acee3fe";
+          sha256 = "05lci7hpla4f0z124zr58aj282pgmabqkzgcqadf0hbnqbz2jwcs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aggressive-fill-paragraph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/aggressive-fill-paragraph";
           sha256 = "1df4bk3ks09805y67af6z1gpfln0lz773jzbbckfl0fy3yli0dja";
           name = "aggressive-fill-paragraph";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/aggressive-fill-paragraph";
+          homepage = "https://melpa.org/#/aggressive-fill-paragraph";
           license = lib.licenses.free;
         };
       }) {};
     aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aggressive-indent";
-        version = "20160209.1156";
+        version = "20160416.1130";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "aggressive-indent-mode";
-          rev = "1b831d21ac9688e3f31703f0b492202f6d24a75b";
-          sha256 = "0g8mhfab55a4jvb00kcv9f8cyx4l4d5qyfvp7sf7z12qnkik7b6w";
+          rev = "97eaa5778ce0cd596a0807ef2e676d2681aabf84";
+          sha256 = "0lr6n680ys7c6g6ah9xrid31640yjjkrqavb4164lwydfj5yy1xa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aggressive-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/aggressive-indent";
           sha256 = "1qi8jbr28gax35siim3hnnkiy8pa2vcrzqzc6axr98wzny46x0i2";
           name = "aggressive-indent";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/aggressive-indent";
+          homepage = "https://melpa.org/#/aggressive-indent";
           license = lib.licenses.free;
         };
       }) {};
     ahg = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "ahg";
-        version = "20151223.501";
+        version = "20160323.525";
         src = fetchhg {
           url = "https://bitbucket.com/agriggio/ahg";
-          rev = "e8eda2f41471";
-          sha256 = "0fnn52b2prai8dlsj4759mbcgbbbvhr2lbqs3f0k5d2q8vvqrch1";
+          rev = "5cfc31e14578";
+          sha256 = "10l3m322kh41yzal0wvbbdk8mk2yp8q9wx7asq3v1w5m2cwiylwq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ahg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ahg";
           sha256 = "0kw138lfzwp54fmly3jzzml11y7fhcjp3w0irmwdzr68lc206lr4";
           name = "ahg";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ahg";
+          homepage = "https://melpa.org/#/ahg";
           license = lib.licenses.free;
         };
       }) {};
-    ahk-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ahk-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ahk-mode";
-        version = "20160214.1922";
+        version = "20160320.1721";
         src = fetchFromGitHub {
           owner = "ralesi";
           repo = "ahk-mode";
-          rev = "d437ed0b3d3d38d0d0eec794ded019459b32f42a";
-          sha256 = "1ff0am1j619ypvjkmihrc8zxvv45grllj6wyka0r6mb3z189xyjl";
+          rev = "9cfc4840507f6cc8016fdede84ad90df53285359";
+          sha256 = "07qpwa990bgs9028rqqk344c3z4hnr1jkfzcx9fi4z5k756zmw3b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ahk-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ahk-mode";
           sha256 = "066l4hsb49wbyv381qgn9k4hn8gxlzi20h3qaim9grngjj5ljbni";
           name = "ahk-mode";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ahk-mode";
+          homepage = "https://melpa.org/#/ahk-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -1253,13 +1295,13 @@
           sha256 = "1436i7vdzaqykimfrm2y1s3dw2q398dzv1hyr9mr5z4kxa5f0rjj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ahungry-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ahungry-theme";
           sha256 = "0fhim0qscpqx9siprp3ax1azxzmqkzvrjx517d9bnd68z7xxbpqy";
           name = "ahungry-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ahungry-theme";
+          homepage = "https://melpa.org/#/ahungry-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -1274,13 +1316,13 @@
           sha256 = "0blrpqn8wy9pwzikgzb0v6x4hk7axv93j4byfci62fh1905zfkkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/airline-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/airline-themes";
           sha256 = "0jkhb6nigyjmwqny7g59h4ssfy64vl3qnwcw46wnx5k9i73cjyih";
           name = "airline-themes";
         };
         packageRequires = [ powerline ];
         meta = {
-          homepage = "http://melpa.org/#/airline-themes";
+          homepage = "https://melpa.org/#/airline-themes";
           license = lib.licenses.free;
         };
       }) {};
@@ -1295,76 +1337,76 @@
           sha256 = "1lxpfswp1bjrz192px79f155dycf2kazpr7dfrcr1gyshlgxkpf7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/airplay";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/airplay";
           sha256 = "095nibgs197iplphk6csvkgsrgh1fcfyy33py860v6qmihvk538f";
           name = "airplay";
         };
         packageRequires = [ deferred request simple-httpd ];
         meta = {
-          homepage = "http://melpa.org/#/airplay";
+          homepage = "https://melpa.org/#/airplay";
           license = lib.licenses.free;
         };
       }) {};
     alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "alchemist";
-        version = "20160215.144";
+        version = "20160426.7";
         src = fetchFromGitHub {
           owner = "tonini";
           repo = "alchemist.el";
-          rev = "091a6f3b5e2785dcac3ae1a514eb73b0e8dbf469";
-          sha256 = "0vc1nadbj16wv75xfl4l662ifmhgsankldj6c580v4clj3ck482b";
+          rev = "6cb2b967c3461b440d64d729381b14e87a53ee2c";
+          sha256 = "03hm0jdhy9yh4lslckbpkzsy9fs5019c03i0q3f167y33hjpi4g0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/alchemist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/alchemist";
           sha256 = "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369";
           name = "alchemist";
         };
         packageRequires = [ company dash elixir-mode emacs pkg-info ];
         meta = {
-          homepage = "http://melpa.org/#/alchemist";
+          homepage = "https://melpa.org/#/alchemist";
           license = lib.licenses.free;
         };
       }) {};
     alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "alda-mode";
-        version = "20160220.923";
+        version = "20160322.200";
         src = fetchFromGitHub {
           owner = "jgkamat";
           repo = "alda-mode";
-          rev = "a77e835d117375eb31c975f4eda61f6513d07142";
-          sha256 = "0pyfilaqwcnvllwmy575ldi8ac5is2dj4qhxaw19300iqa1hpfkj";
+          rev = "6b74648e9e78f3e8e01d0c4eb9894d67581ba4fe";
+          sha256 = "1bzw713rvih6p2h7c6vw6iyjyiqrrgwr46p5r0l57zklj279m37r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/alda-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/alda-mode";
           sha256 = "0vpxiw3k0qxp6s19n93qkkyrr44rbw38ygriqdrfpp84pa09wprh";
           name = "alda-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/alda-mode";
+          homepage = "https://melpa.org/#/alda-mode";
           license = lib.licenses.free;
         };
       }) {};
     alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "alect-themes";
-        version = "20150920.1324";
+        version = "20160414.314";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "alect-themes";
-          rev = "05d7515d936bbf48ad3fa961220f076d2e5d2312";
-          sha256 = "0hvf7ydd2p3dfk5hqjqcbaajhgihkyvlwvqcr97a8jknznk7hfzp";
+          rev = "6fd786c0ccd5a07e8968942d0a868753503ab4c4";
+          sha256 = "1g9fai2i8izswiih4ba0l2wamhfl6pvmkq7is8x0wr45waldcga9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/alect-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/alect-themes";
           sha256 = "04fq65qnxlvl5nc2q037c6yb4nf422dfw2913gv6zfh9rdmxsks8";
           name = "alect-themes";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/alect-themes";
+          homepage = "https://melpa.org/#/alect-themes";
           license = lib.licenses.free;
         };
       }) {};
@@ -1379,13 +1421,13 @@
           sha256 = "0z7yfjg14bzndpm9ski1a1mdixvrykg7d08cd86dc82bghb3px2z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/alert";
           sha256 = "0x3cvczq09jvshz435jw2fjm69457x2wxdvvbbjq46nfnybhi118";
           name = "alert";
         };
         packageRequires = [ gntp log4e ];
         meta = {
-          homepage = "http://melpa.org/#/alert";
+          homepage = "https://melpa.org/#/alert";
           license = lib.licenses.free;
         };
       }) {};
@@ -1400,13 +1442,13 @@
           sha256 = "0l2rgs0rd4nmv4v7m10zhf2znzfvdifv1vlhpa3zbppg0fj8zph1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/align-cljlet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/align-cljlet";
           sha256 = "0pnhhv33rvlmb3823xpy9v5h6q99fa7fn38djbwry4rymi4jmlih";
           name = "align-cljlet";
         };
         packageRequires = [ clojure-mode ];
         meta = {
-          homepage = "http://melpa.org/#/align-cljlet";
+          homepage = "https://melpa.org/#/align-cljlet";
           license = lib.licenses.free;
         };
       }) {};
@@ -1414,32 +1456,32 @@
         pname = "all-ext";
         version = "20130824.706";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/all-ext.el";
+          url = "https://www.emacswiki.org/emacs/download/all-ext.el";
           sha256 = "10j70bwa28xpmqwigvls76jg6vz0iky88lmkq4pk35bg3rz09r4m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/all-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/all-ext";
           sha256 = "1zi266cm5hpfhnnnzbsm4s1w0lsy4sj5z8d020y0cg57yn2v62dv";
           name = "all-ext";
         };
         packageRequires = [ all ];
         meta = {
-          homepage = "http://melpa.org/#/all-ext";
+          homepage = "https://melpa.org/#/all-ext";
           license = lib.licenses.free;
         };
       }) {};
     amd-mode = callPackage ({ ag, dash, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s }:
     melpaBuild {
         pname = "amd-mode";
-        version = "20160210.732";
+        version = "20160320.431";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "amd-mode.el";
-          rev = "e3dc1a3d02734a2b6194aa80e7c0ec1c82e68c6f";
-          sha256 = "09vzcy842lzi67lbx5kkhn868nsxvbahkp13697p6dhb58b71rlk";
+          rev = "fd94a88ac92e2f5b45bb87212bf44dc22d3e0ccd";
+          sha256 = "090qmjg3jf7m0cvx5pi5fmrkjfanwg60wiimcli7kq4gxpjvzwp9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/amd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/amd-mode";
           sha256 = "17ry6vm5xlmdfs0mykdyn05cik38yswq5axdgn8hxrvvb6f58d06";
           name = "amd-mode";
         };
@@ -1454,7 +1496,7 @@
           s
         ];
         meta = {
-          homepage = "http://melpa.org/#/amd-mode";
+          homepage = "https://melpa.org/#/amd-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -1469,13 +1511,13 @@
           sha256 = "18cicz11i19cpabrq6khnl9ks1khn6gw5a4ckaq4y65r40x0cr6g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ample-regexps";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ample-regexps";
           sha256 = "00y07pd438v7ldkn5f1w84cpxa1mvcnzjkj6sf5l5pm97xqiz7j2";
           name = "ample-regexps";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ample-regexps";
+          homepage = "https://melpa.org/#/ample-regexps";
           license = lib.licenses.free;
         };
       }) {};
@@ -1490,13 +1532,13 @@
           sha256 = "0x72czw5rmz89w5fa27z54bz8qirrr882g0r37pb8li04j1hk7kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ample-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ample-theme";
           sha256 = "055c6jy2q761za4cl1vlqdskcd3mc1j58k8b4418q7h2lv2zc0ry";
           name = "ample-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ample-theme";
+          homepage = "https://melpa.org/#/ample-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -1511,34 +1553,34 @@
           sha256 = "18z9jl5d19a132k6g1dvwqfbbdh5cx66b2qxlcjsfiqxlxglc2sa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ample-zen-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ample-zen-theme";
           sha256 = "0xygk80mh05qssrbfj4h6k50pg557dyj6kzc2pdlmnr5r4gnzdn3";
           name = "ample-zen-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ample-zen-theme";
+          homepage = "https://melpa.org/#/ample-zen-theme";
           license = lib.licenses.free;
         };
       }) {};
     anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
     melpaBuild {
         pname = "anaconda-mode";
-        version = "20160221.1323";
+        version = "20160411.850";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "anaconda-mode";
-          rev = "395b111de79cc204a976be5d37133a08d794b54c";
-          sha256 = "0ripdiyr93c6cdb42inni18p1p39gl9pjjgbzkp1b072y8dgrv10";
+          rev = "6a8c20683dc818cf0e9faba3f511131e37708c3e";
+          sha256 = "0p51c8vvm8j11bzf8a64xvmpvbajs0r72m34x80zgcfkg4wij8b6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anaconda-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anaconda-mode";
           sha256 = "0gz16aam4zrm3s9ms13h4qcdflf55506kgkpyncq3bi54cvv8n1r";
           name = "anaconda-mode";
         };
         packageRequires = [ dash emacs f pythonic s ];
         meta = {
-          homepage = "http://melpa.org/#/anaconda-mode";
+          homepage = "https://melpa.org/#/anaconda-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -1553,13 +1595,13 @@
           sha256 = "1ym43y0wqifkzpkm7ayf8cq2wz8pc2wgg9zvdyi0cn9lr9mwpbav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anaphora";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anaphora";
           sha256 = "1wb7fb3pc4gxvpjlm6gjbyx0rbhjiwd93qwc4vfw6p865ikl19y2";
           name = "anaphora";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/anaphora";
+          homepage = "https://melpa.org/#/anaphora";
           license = lib.licenses.free;
         };
       }) {};
@@ -1568,38 +1610,38 @@
         pname = "anchored-transpose";
         version = "20080905.54";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/anchored-transpose.el";
+          url = "https://www.emacswiki.org/emacs/download/anchored-transpose.el";
           sha256 = "1hklypbp79pgaf1yklbm3qx4skm3xlml0cm1r9b9js3dbqyha651";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anchored-transpose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anchored-transpose";
           sha256 = "19dgj1605qxc2znvzj0cj6x29zyrh00qnzk2rlwpn9hvzypg9v7w";
           name = "anchored-transpose";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/anchored-transpose";
+          homepage = "https://melpa.org/#/anchored-transpose";
           license = lib.licenses.free;
         };
       }) {};
     android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "android-mode";
-        version = "20150106.744";
+        version = "20160408.723";
         src = fetchFromGitHub {
           owner = "remvee";
           repo = "android-mode";
-          rev = "80629ff38e4c2f72ba1dbebd4a0abadb94d8a231";
-          sha256 = "1ms338qq17nwivpq8c1xsnld5k532rfhgvfxx1zg3l8wrjh235d2";
+          rev = "35d51c5f09f62c3d744037582d72c18ba803bd89";
+          sha256 = "1gr2rlk4w842m98ii1swxd7n65qjiy5169cfj31fs1zx0zj4n59y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/android-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/android-mode";
           sha256 = "1nqrvq411yg4b9xb5cvc7ai7lfalwc2rfhclzprvymc4vxh6k4cc";
           name = "android-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/android-mode";
+          homepage = "https://melpa.org/#/android-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -1608,19 +1650,19 @@
         pname = "angry-police-captain";
         version = "20120829.752";
         src = fetchFromGitHub {
-          owner = "rolando2424";
+          owner = "rolpereira";
           repo = "angry-police-captain-el";
           rev = "d11931c5cb63368dcc4a48797962428cca6d3e9d";
           sha256 = "1m0c7ns7aiycg86cgglir8bkw730fslyg1n15m9ki0da4cnmm97a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/angry-police-captain";
-          sha256 = "1cshhd4bkgbkg0n6m8gz53z47z4nq0hcriz2qh3v7m4cqgkw1m9r";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/angry-police-captain";
+          sha256 = "00r3dx33h0wjxj0687ln8nbl1ff2badm3mk3r3bplfrd61z2qzld";
           name = "angry-police-captain";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/angry-police-captain";
+          homepage = "https://melpa.org/#/angry-police-captain";
           license = lib.licenses.free;
         };
       }) {};
@@ -1635,13 +1677,13 @@
           sha256 = "04kg2x0lif91knmkkh05mj42xw3dkzsnysjda6ian95v57wfg377";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/angular-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/angular-mode";
           sha256 = "1bwfmjldnxki0lqi3ys6r2a3nlhbwm1dibsg2dvzirq8qql02w1i";
           name = "angular-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/angular-mode";
+          homepage = "https://melpa.org/#/angular-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -1656,13 +1698,13 @@
           sha256 = "0hdm1a323mzxjfdply8ri3addk146f21d8cmpd18r7dw3j3cdfrn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/angular-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/angular-snippets";
           sha256 = "057phgizn1c6njvdfigb23ljs31knq247gr0rcpqfrdaxsnnzm5c";
           name = "angular-snippets";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/angular-snippets";
+          homepage = "https://melpa.org/#/angular-snippets";
           license = lib.licenses.free;
         };
       }) {};
@@ -1677,13 +1719,13 @@
           sha256 = "08gs96r9mbdg0s5l504yp6i5nmi9qr4nwxq3xprsbx9bdzv5l2dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/annotate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/annotate";
           sha256 = "1ajykgara2m713blj2kfmdz12fzm8jw7klyakkyi6i3c3a9m44jy";
           name = "annotate";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/annotate";
+          homepage = "https://melpa.org/#/annotate";
           license = lib.licenses.free;
         };
       }) {};
@@ -1698,13 +1740,13 @@
           sha256 = "1ppq3kszzj2fgr7mwj565bjs8bs285ymy384cnnw7paddgcr9z02";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/annoying-arrows-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/annoying-arrows-mode";
           sha256 = "13bwqv3mv7kgi1gms58f5g03q5g7q98n4vv6n28zqmppxm5z33s7";
           name = "annoying-arrows-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/annoying-arrows-mode";
+          homepage = "https://melpa.org/#/annoying-arrows-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -1714,39 +1756,39 @@
         version = "20150703.326";
         src = fetchFromGitHub {
           owner = "rejeep";
-          repo = "ansi";
+          repo = "ansi.el";
           rev = "12b4c5d91b3da1902838f421e5af6d40e2cd57dd";
           sha256 = "19k71dj83kvc8mks6zhl45vsrsb61via53dqxjv9bny1ybh2av85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ansi";
-          sha256 = "04n0kvaqq8214prdk20bplqyzlsnlzfzsg23ifkrzjgqjjpdcyi1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ansi";
+          sha256 = "0b5xnv6z471jm53g37njxin6l8yflsgm80y4wxahfgy8apipcq89";
           name = "ansi";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/ansi";
+          homepage = "https://melpa.org/#/ansi";
           license = lib.licenses.free;
         };
       }) {};
     ansible = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ansible";
-        version = "20151123.1953";
+        version = "20160326.1031";
         src = fetchFromGitHub {
           owner = "k1LoW";
           repo = "emacs-ansible";
-          rev = "e9b9431738de4808d8ef70871069f68885cc0d98";
-          sha256 = "03d240jngxw51ybrsjw8kdxygrr0ymdckzwga2jr1bqf26v559j2";
+          rev = "950e24319940526aa14ac33e2b67f7567dd5dc17";
+          sha256 = "0k927pwhmn1cfl6jqs7ww1g6f64nq5i8f6a732d4q2rbl3aqzbdi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ansible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ansible";
           sha256 = "1xdc05fdglqfbizra6s1zl6knnvaq526dkxqnw9g7w269j8f4z8g";
           name = "ansible";
         };
         packageRequires = [ f s ];
         meta = {
-          homepage = "http://melpa.org/#/ansible";
+          homepage = "https://melpa.org/#/ansible";
           license = lib.licenses.free;
         };
       }) {};
@@ -1761,13 +1803,13 @@
           sha256 = "1h3rqrjrl8wx7xvvd631jkbbczq3srd4mgz7y9wh3cvz1njdpy62";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ansible-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ansible-doc";
           sha256 = "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w";
           name = "ansible-doc";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ansible-doc";
+          homepage = "https://melpa.org/#/ansible-doc";
           license = lib.licenses.free;
         };
       }) {};
@@ -1776,40 +1818,40 @@
         pname = "ant";
         version = "20160211.943";
         src = fetchFromGitHub {
-          owner = "apgwoz";
+          owner = "apg";
           repo = "ant-el";
           rev = "510b5a3f57ee4b2855422d88d359a28922c1ab70";
           sha256 = "0jb5vl3cq5m3r23fjhcxgxl4g011zkjkkyn5mqqxx22a1sydsvab";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ant";
-          sha256 = "03rxn2dh0xj89kl24jd19q7kmrn1hnr2cdl3519bpng298kxwni6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ant";
+          sha256 = "06028xjic14yv3rfqyc3k6jyjgm6fqfrf1mv8lvbh2sri2d5ifqa";
           name = "ant";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ant";
+          homepage = "https://melpa.org/#/ant";
           license = lib.licenses.free;
         };
       }) {};
     anti-zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anti-zenburn-theme";
-        version = "20160205.2009";
+        version = "20160416.1806";
         src = fetchFromGitHub {
           owner = "m00natic";
           repo = "anti-zenburn-theme";
-          rev = "bbb3517dcba4ea3b03bb6e0469b8e71c8b9a76e1";
-          sha256 = "02m991awps2b0h31ybrwxznbz88f10a241fmy34r671lrni2ymgi";
+          rev = "53591a18aee564c6d08a5be69b4060a299903255";
+          sha256 = "06cn81sksvl88l1g3cfgp1kf8xzfv00b31j2rf58f45zlbl5ckv9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anti-zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anti-zenburn-theme";
           sha256 = "1sp9p6m2jy4m9fdn1hz25cmasy0mwwgn46qmvm92i56f5x6jlzzk";
           name = "anti-zenburn-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/anti-zenburn-theme";
+          homepage = "https://melpa.org/#/anti-zenburn-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -1824,13 +1866,13 @@
           sha256 = "0fzxzar8m9qznfxv3wr7vfj9y2110wf6mm5cj55k3sd5djdjhmf1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anx-api";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anx-api";
           sha256 = "1vzg3wsqyfb9rsfxrpz8k2gazjlz2nwnf4gnn1dypsjspjnzcb8r";
           name = "anx-api";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/anx-api";
+          homepage = "https://melpa.org/#/anx-api";
           license = lib.licenses.free;
         };
       }) {};
@@ -1845,13 +1887,13 @@
           sha256 = "0qy5q4rq68nb21k7w3xpil8k8k5awcpjrjlxjwnhcklwb83w3dhf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anybar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anybar";
           sha256 = "0prnr8wjhishpf2zmn4b7054vfahk10w05nzsg2p6whaxywcachm";
           name = "anybar";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/anybar";
+          homepage = "https://melpa.org/#/anybar";
           license = lib.licenses.free;
         };
       }) {};
@@ -1866,13 +1908,13 @@
           sha256 = "05lq0bllgn44zs85mgnfdcyjasm6j8m70jdcxksf798i0qdqnk7n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anyins";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anyins";
           sha256 = "0ncf3kn8rackcidkgda2zs60km3hx87rwr9daj7ksmbb6am09s7c";
           name = "anyins";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/anyins";
+          homepage = "https://melpa.org/#/anyins";
           license = lib.licenses.free;
         };
       }) {};
@@ -1883,16 +1925,16 @@
         src = fetchgit {
           url = "http://repo.or.cz/r/anything-config.git";
           rev = "2d7e0450e13ab04b20f4dff08f32936e78677e58";
-          sha256 = "e90ded84609e59a4cef22bfd9d9a543ec6b677b78ab44fb4eb6cbae9eb248669";
+          sha256 = "0sc64kmykfkcxfs4zd4anxvvdiiyajd9vz9byb7a8ncyc22fs3g9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anything";
           sha256 = "13pmks0bsby57v3vp6jcvvzwb771d4qq62djgvrw4ykxqzkcb8fj";
           name = "anything";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/anything";
+          homepage = "https://melpa.org/#/anything";
           license = lib.licenses.free;
         };
       }) {};
@@ -1907,13 +1949,13 @@
           sha256 = "0dbf510gcd0m191samih0r4lx6d7sgk0ls0sx2jrdkyacy82ridy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything-exuberant-ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anything-exuberant-ctags";
           sha256 = "0p0jq2ggdgaxv2gd9m5iza0y3mjjc82xmgp899yr15pfffa4wihk";
           name = "anything-exuberant-ctags";
         };
         packageRequires = [ anything ];
         meta = {
-          homepage = "http://melpa.org/#/anything-exuberant-ctags";
+          homepage = "https://melpa.org/#/anything-exuberant-ctags";
           license = lib.licenses.free;
         };
       }) {};
@@ -1928,13 +1970,13 @@
           sha256 = "0gj0p7420wx5c186kdccjb9icn656sg5b0zwnwy3fjvhsbbvrb2r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything-git-files";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anything-git-files";
           sha256 = "13giasg8lh5968plva449ki9nc3478a63700f8c0yghnwjb77asw";
           name = "anything-git-files";
         };
         packageRequires = [ anything ];
         meta = {
-          homepage = "http://melpa.org/#/anything-git-files";
+          homepage = "https://melpa.org/#/anything-git-files";
           license = lib.licenses.free;
         };
       }) {};
@@ -1949,13 +1991,13 @@
           sha256 = "06fyvk7cjz1aag6fj52qraqmr23b0fqwml41yyid8gjxl4ygmkpv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything-git-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anything-git-grep";
           sha256 = "1kw88fvxil9l80w8zn16az7avqplyf2m0l7kp431wb5b1b1508jl";
           name = "anything-git-grep";
         };
         packageRequires = [ anything ];
         meta = {
-          homepage = "http://melpa.org/#/anything-git-grep";
+          homepage = "https://melpa.org/#/anything-git-grep";
           license = lib.licenses.free;
         };
       }) {};
@@ -1970,13 +2012,13 @@
           sha256 = "1jw6gqwcl3fx1m7w0a15w2pnzzlqyr1fbg0m81ay358s4w3jn6v7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything-milkode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anything-milkode";
           sha256 = "1apc865a01jyx602ldzj32rrjk6xmgnxdccpjpcfgh24h2aqpdan";
           name = "anything-milkode";
         };
         packageRequires = [ anything milkode ];
         meta = {
-          homepage = "http://melpa.org/#/anything-milkode";
+          homepage = "https://melpa.org/#/anything-milkode";
           license = lib.licenses.free;
         };
       }) {};
@@ -1991,13 +2033,13 @@
           sha256 = "16a7i01q8qqkgph1s3jnwdr2arjq3cm3jpv5bk5sqs29c003q0pp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anything-project";
           sha256 = "10crwm34igb4kjh97alni15xzhsb2s0d4ghva86f2gpjidka9fhr";
           name = "anything-project";
         };
         packageRequires = [ anything imakado ];
         meta = {
-          homepage = "http://melpa.org/#/anything-project";
+          homepage = "https://melpa.org/#/anything-project";
           license = lib.licenses.free;
         };
       }) {};
@@ -2012,13 +2054,13 @@
           sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything-prosjekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anything-prosjekt";
           sha256 = "15kgn0wrnbh666kchijdlssf2gp7spgbymr2nwgv6k730cb4mfa8";
           name = "anything-prosjekt";
         };
         packageRequires = [ anything prosjekt ];
         meta = {
-          homepage = "http://melpa.org/#/anything-prosjekt";
+          homepage = "https://melpa.org/#/anything-prosjekt";
           license = lib.licenses.free;
         };
       }) {};
@@ -2033,13 +2075,13 @@
           sha256 = "1834yj2vgs4dasdfnppc8iw8ll3yif948biq9hj0sbpsa2d8y44k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything-replace-string";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anything-replace-string";
           sha256 = "1fagi6cn88p6sf1yhx1qsi7nw9zpyx9hdfl66iyskqwddfvywp71";
           name = "anything-replace-string";
         };
         packageRequires = [ anything ];
         meta = {
-          homepage = "http://melpa.org/#/anything-replace-string";
+          homepage = "https://melpa.org/#/anything-replace-string";
           license = lib.licenses.free;
         };
       }) {};
@@ -2054,34 +2096,34 @@
           sha256 = "08xr6fkk1r4r5jqh349d4dfal9nbs2a8y2fp8zn3zlrj2cd0g80k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anything-sage";
           sha256 = "1878vj8hzrwfyd2yvxcm0f1vm9m0ndwnj0pcq7j8zm9lxj0w48p3";
           name = "anything-sage";
         };
         packageRequires = [ anything cl-lib sage-shell-mode ];
         meta = {
-          homepage = "http://melpa.org/#/anything-sage";
+          homepage = "https://melpa.org/#/anything-sage";
           license = lib.licenses.free;
         };
       }) {};
     anzu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anzu";
-        version = "20160130.2055";
+        version = "20160405.18";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-anzu";
-          rev = "dde4d83cfa4887db7deaf74232c9e051afb33050";
-          sha256 = "1dxaf68przg0hh0p1zhxsq2dysp3ln178yxhbqalxw67bjy8ikny";
+          rev = "174b940c7e53e9e8180abc718d61dd200f7748be";
+          sha256 = "1l0frc62i542avx8mmirdbwp6x3iy2ysdpwycpradmx4hsriin2c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anzu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anzu";
           sha256 = "0i2ia0jisj31vc2pjx9bhv8jccbp24q7c406x3nhh9hxjzs1f41i";
           name = "anzu";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/anzu";
+          homepage = "https://melpa.org/#/anzu";
           license = lib.licenses.free;
         };
       }) {};
@@ -2089,17 +2131,17 @@
         pname = "aok";
         version = "20130824.627";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/aok.el";
+          url = "https://www.emacswiki.org/emacs/download/aok.el";
           sha256 = "10vdmxzifxx3fkpyg76ngnj79k3d2pq0f322rd8ssc66alxhkz3g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aok";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/aok";
           sha256 = "1nkkbfwqp5r44wjwl902gm0xc8p3d2qj5mk1cchilr2rib52zd46";
           name = "aok";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/aok";
+          homepage = "https://melpa.org/#/aok";
           license = lib.licenses.free;
         };
       }) {};
@@ -2114,13 +2156,13 @@
           sha256 = "0528z3axjmplg2fdbv4jxgy1p39vr4rnsm4a3ps2fanf8bwsyx3l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aozora-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/aozora-view";
           sha256 = "0pd2574a6dkhrfr0jf5gvv34ganp6ddylyb6cfpg2d4znwbc2r2w";
           name = "aozora-view";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/aozora-view";
+          homepage = "https://melpa.org/#/aozora-view";
           license = lib.licenses.free;
         };
       }) {};
@@ -2128,17 +2170,17 @@
         pname = "apache-mode";
         version = "20150828.914";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/apache-mode.el";
+          url = "https://www.emacswiki.org/emacs/download/apache-mode.el";
           sha256 = "1jndhcjvj6s1clmyyphl5ss5267c7b5a58fz8gbp1ffk1d9ylfik";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/apache-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/apache-mode";
           sha256 = "1a1pj3bk0gplfx217yd6qdn7qrhfbkx2bhkk33k0gq5sia6rzs44";
           name = "apache-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/apache-mode";
+          homepage = "https://melpa.org/#/apache-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -2153,13 +2195,13 @@
           sha256 = "0sdxnf4b8rqs1cbjxh23wvxmj7ll3zddv8yfdgif6zmgyy8xhc9m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/apel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/apel";
           sha256 = "0zhlm8lfri3zkhj62cycvdhkkgrn72lqb0dalh8qgr049bdv816y";
           name = "apel";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/apel";
+          homepage = "https://melpa.org/#/apel";
           license = lib.licenses.free;
         };
       }) {};
@@ -2174,13 +2216,13 @@
           sha256 = "0br0jl6xnajdx37s5cvs13srn9lldg58y9587a11s3s651xjdq0z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/apples-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/apples-mode";
           sha256 = "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s";
           name = "apples-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/apples-mode";
+          homepage = "https://melpa.org/#/apples-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -2194,13 +2236,13 @@
           sha256 = "0n3y0314ajqhn5hzih09gl72110ifw4vzcgdxm8n6npjbx7irbml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/applescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/applescript-mode";
           sha256 = "1ya0dh7gz7qfflhn6dq43rapb2zg7djvxwn7p4jajyjnwbxmk611";
           name = "applescript-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/applescript-mode";
+          homepage = "https://melpa.org/#/applescript-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -2215,13 +2257,13 @@
           sha256 = "1wyz8jvdy4m0cn75mm3zvxagm2gl10q51479f91gnqv14b4rndfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aproject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/aproject";
           sha256 = "0v3gx2mff2s7knm69y253pm1yr4svy8w00pqbn1chrvymb62jhp2";
           name = "aproject";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/aproject";
+          homepage = "https://melpa.org/#/aproject";
           license = lib.licenses.free;
         };
       }) {};
@@ -2230,17 +2272,17 @@
         pname = "apropos-fn-plus-var";
         version = "20151231.1405";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/apropos-fn+var.el";
+          url = "https://www.emacswiki.org/emacs/download/apropos-fn+var.el";
           sha256 = "0wc9zg30a48cj2ssfj9wc7ga0ip9igcxcdbn1wr0qmndzxxa7x5k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/apropos-fn+var";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/apropos-fn+var";
           sha256 = "1s5gnsipsj7dhc8ca806grg32i6vlwm78hcxhrbs830vx9k84g5x";
           name = "apropos-fn-plus-var";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/apropos-fn+var";
+          homepage = "https://melpa.org/#/apropos-fn+var";
           license = lib.licenses.free;
         };
       }) {};
@@ -2255,13 +2297,13 @@
           sha256 = "0j0k5ak5pzh3n2grf7b6b7ajxsp4ssv2l5gmg08kmbdwscavzc4r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/apropospriate-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/apropospriate-theme";
           sha256 = "10bj2bsi7b104m686z8mgvbh493liidsvivxfvfxzbndc8wyjsw9";
           name = "apropospriate-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/apropospriate-theme";
+          homepage = "https://melpa.org/#/apropospriate-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -2269,17 +2311,17 @@
         pname = "apu";
         version = "20151231.1408";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/apu.el";
+          url = "https://www.emacswiki.org/emacs/download/apu.el";
           sha256 = "1xbvky0mspmbi8ghqhqhgbjn70acipwf0qwn6s5zdarwch10nljj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/apu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/apu";
           sha256 = "0399rmjwcs7fykj10s9m0lm2wb1cr2bzw2bkgm5rp4n3va0rzaa2";
           name = "apu";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/apu";
+          homepage = "https://melpa.org/#/apu";
           license = lib.licenses.free;
         };
       }) {};
@@ -2287,17 +2329,17 @@
         pname = "archive-region";
         version = "20140201.1745";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/archive-region.el";
+          url = "https://www.emacswiki.org/emacs/download/archive-region.el";
           sha256 = "1mhj6x0n2ya3xd7gykmkcf70ji5g8qd8xawz764ykdlcribpsq52";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/archive-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/archive-region";
           sha256 = "03x2fqhx4w0c7xd8x8zlnyzdwyay6r2yxf4jzgkcg87q7rqjk9nd";
           name = "archive-region";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/archive-region";
+          homepage = "https://melpa.org/#/archive-region";
           license = lib.licenses.free;
         };
       }) {};
@@ -2312,13 +2354,13 @@
           sha256 = "1yvaqjc9hadbnnay5fprnh890xsp53kidad1zpb4a5z4a5z61n3c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/arduino-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/arduino-mode";
           sha256 = "1lpsjpc7par12zsmg9sf4r1h039kxa4n68anjr3mhpp3d6rapjcx";
           name = "arduino-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/arduino-mode";
+          homepage = "https://melpa.org/#/arduino-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -2329,16 +2371,16 @@
         src = fetchgit {
           url = "https://bitbucket.org/ukaszg/aria2.git";
           rev = "3c54254e424c6c8b4eb0d8e7c4907b094c27a3f0";
-          sha256 = "2713755e56b03e28a5a6e10c85865c1ace0247e71caeb8b89ec65d5618addafc";
+          sha256 = "1z6smlc5cpf6kswbibhwwx3h5khsbj38a371lsjjhgmharg7a4r7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aria2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/aria2";
           sha256 = "10x2k99m3kl6y0k0mw590gq1ac162nmdwk58i8i7a4mb72zmsmhc";
           name = "aria2";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/aria2";
+          homepage = "https://melpa.org/#/aria2";
           license = lib.licenses.free;
         };
       }) {};
@@ -2353,34 +2395,34 @@
           sha256 = "0vh9wfc3657sd12ybjcrxpg6f757x2ghkcl1lw01szmyy5vmj27h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ariadne";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ariadne";
           sha256 = "0lfhving19wcfr40gjb2gnginiz8cncixiyyxhwx08lm84qb3a7p";
           name = "ariadne";
         };
         packageRequires = [ bert ];
         meta = {
-          homepage = "http://melpa.org/#/ariadne";
+          homepage = "https://melpa.org/#/ariadne";
           license = lib.licenses.free;
         };
       }) {};
     arjen-grey-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "arjen-grey-theme";
-        version = "20150731.845";
+        version = "20160403.1415";
         src = fetchFromGitHub {
           owner = "credmp";
           repo = "arjen-grey-theme";
-          rev = "d67a1da021269cb1aeb25ff1aa56249d67371266";
-          sha256 = "1i6y3kv2vii6f8gpd845vv6h832hqx0vxb3fmb1x80kwx3gda682";
+          rev = "b795dcb5760a5ccc3597733c5933b91252542135";
+          sha256 = "0p8k6sxmvmf535sawis6rn6lfyl5ph263i1phf2d5wl3dzs0xj5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/arjen-grey-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/arjen-grey-theme";
           sha256 = "18q66f7hhys2ab9ljsdp9013mp7d6v6d1lrb0d1bb035r1b4pfj7";
           name = "arjen-grey-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/arjen-grey-theme";
+          homepage = "https://melpa.org/#/arjen-grey-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -2395,13 +2437,34 @@
           sha256 = "133c1n4ra7z3vb6y47400y71a6ac19pyji0bgd4kr9fcbx0flx91";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/artbollocks-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/artbollocks-mode";
           sha256 = "0dlnxicn6nzyiz44y92pbl4nzr9jxfb9a99wacjrwq2ahdrwhhjp";
           name = "artbollocks-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/artbollocks-mode";
+          homepage = "https://melpa.org/#/artbollocks-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    arview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "arview";
+        version = "20160419.1609";
+        src = fetchFromGitHub {
+          owner = "afainer";
+          repo = "arview";
+          rev = "5437b4221b64b238c273a651d4792c577dba6d45";
+          sha256 = "1yvirfmvf6v5khl7zhx2ddv9bbxnx1qhwfzi0gy2nmbxlykb6s2j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/arview";
+          sha256 = "0d935lj0x3rbar94l7288xrgbcp1wmz6r2l0b7i89r5piczyiy1y";
+          name = "arview";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/arview";
           license = lib.licenses.free;
         };
       }) {};
@@ -2409,17 +2472,17 @@
         pname = "ascii";
         version = "20130824.700";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/ascii.el";
+          url = "https://www.emacswiki.org/emacs/download/ascii.el";
           sha256 = "05fjsj5nmc05cmsi0qj914dqdwk8rll1d4dwhn0crw36p2ivql75";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ascii";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ascii";
           sha256 = "0jb63f7qwhfbz0n4yrvnvx03cjqly3mqsc3rq9mgf4svy2zw702r";
           name = "ascii";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ascii";
+          homepage = "https://melpa.org/#/ascii";
           license = lib.licenses.free;
         };
       }) {};
@@ -2434,13 +2497,13 @@
           sha256 = "1s973vzivibaqjb8acn4ylrdasxh17jcfmmvqp4wm05nwhg75597";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/asilea";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/asilea";
           sha256 = "1lb8nr6r6yy06m4pxg8w9ja4zv8k5xwhl95v2wv95y1qwhgnwg3j";
           name = "asilea";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/asilea";
+          homepage = "https://melpa.org/#/asilea";
           license = lib.licenses.free;
         };
       }) {};
@@ -2455,34 +2518,55 @@
           sha256 = "0h18x9nh152dnyqjv5b1zjksl8wb75s8zmx3v8vvmwqyy6ql8gcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/asn1-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/asn1-mode";
           sha256 = "0iswisb08dqz7jc5ra4wcdhbmglildgyrb547dm5362xmvm9ifmy";
           name = "asn1-mode";
         };
         packageRequires = [ emacs s ];
         meta = {
-          homepage = "http://melpa.org/#/asn1-mode";
+          homepage = "https://melpa.org/#/asn1-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    assess = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
+    melpaBuild {
+        pname = "assess";
+        version = "20160405.306";
+        src = fetchFromGitHub {
+          owner = "phillord";
+          repo = "assess";
+          rev = "4bf702a08adb4b99f590716cb4c721c273ccaae8";
+          sha256 = "0sk361w6pciqjfpa9ic1npwwyhan5si22qjsmxcnfyp9i94d8nbg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/assess";
+          sha256 = "0xj3f48plwxmibax00qn15ya7s0h560xzwr8nkwl5r151v1mc9rr";
+          name = "assess";
+        };
+        packageRequires = [ dash emacs m-buffer ];
+        meta = {
+          homepage = "https://melpa.org/#/assess";
           license = lib.licenses.free;
         };
       }) {};
     async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "async";
-        version = "20160108.1449";
+        version = "20160425.751";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "emacs-async";
-          rev = "22de0f5792c9140f1da7c7459f30da0863b07e78";
-          sha256 = "074wdciq62jfc41f829590p4y52dnkn3nxicj9lcabgxwz7cahjp";
+          rev = "1763517b556646f81ad14e166d19f4352beb03bd";
+          sha256 = "0yb6qj1m0chzswndkf486y8kxf2yk7xs0v46f140yydkqkxihfyh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/async";
           sha256 = "063ci4f35x1zm9ixy110i5ds0vsrcafpixrz3xkvpnfqdn29si3f";
           name = "async";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/async";
+          homepage = "https://melpa.org/#/async";
           license = lib.licenses.free;
         };
       }) {};
@@ -2497,13 +2581,13 @@
           sha256 = "0rnnvr8x1czphbinby2z2dga7ikwgd13d7zhgmp3ggamzyaz6nf1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/@";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/@";
           sha256 = "0w91qx955z67w2yh8kf86b58bb3b6s6490mmbky8467knf2q83qz";
           name = "at";
         };
         packageRequires = [ emacs queue ];
         meta = {
-          homepage = "http://melpa.org/#/@";
+          homepage = "https://melpa.org/#/@";
           license = lib.licenses.free;
         };
       }) {};
@@ -2518,13 +2602,13 @@
           sha256 = "0jfpzv8dmvl4nr6kvq5aii830s5h632bq2q3jbnfc4zdql7id464";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/atom-dark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/atom-dark-theme";
           sha256 = "1ci61blm7wc83wm2iyax017ai4jljyag5j1mvw86rimmmjzr0v8f";
           name = "atom-dark-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/atom-dark-theme";
+          homepage = "https://melpa.org/#/atom-dark-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -2539,34 +2623,34 @@
           sha256 = "027j027w2nbplg1gi28hg9iyiirigydj5n4npf7y9a6g626snxz0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/atom-one-dark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/atom-one-dark-theme";
           sha256 = "0wwnkhq7vyysqiqcxc1jsn98155ri4mf4w03k7inl1f8ffpwahvw";
           name = "atom-one-dark-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/atom-one-dark-theme";
+          homepage = "https://melpa.org/#/atom-one-dark-theme";
           license = lib.licenses.free;
         };
       }) {};
     auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "auctex-latexmk";
-        version = "20151217.757";
+        version = "20160307.552";
         src = fetchFromGitHub {
           owner = "tom-tan";
           repo = "auctex-latexmk";
-          rev = "b7d36658c8a9102055a720e9102e1d3514089659";
-          sha256 = "1h0044zfzklc9sy0a02vcdr75ly6wlhjx3n5bvq7yiicqd012316";
+          rev = "fa1953f72c9f4d5cb6c2de6ca471523dd9d11aac";
+          sha256 = "0fa39mzgw8sc7rn31jsfg9pwr05hyk8jjrkk6qa6r91r02ksac8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auctex-latexmk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auctex-latexmk";
           sha256 = "1rdlgkiwlgm06i1gjxcfciz6wgdskfhln8qhixyfxk7pnz0ax327";
           name = "auctex-latexmk";
         };
         packageRequires = [ auctex ];
         meta = {
-          homepage = "http://melpa.org/#/auctex-latexmk";
+          homepage = "https://melpa.org/#/auctex-latexmk";
           license = lib.licenses.free;
         };
       }) {};
@@ -2581,13 +2665,13 @@
           sha256 = "0lgfgvnaln5rhhwgcrzwrhbj0gz8sgaf6xxdl7njf3sa6bfgngsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auctex-lua";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auctex-lua";
           sha256 = "0v999jvinljkvhbn205p36a6jfzppn0xvflvzr8mid1hnqlrpjhf";
           name = "auctex-lua";
         };
         packageRequires = [ auctex lua-mode ];
         meta = {
-          homepage = "http://melpa.org/#/auctex-lua";
+          homepage = "https://melpa.org/#/auctex-lua";
           license = lib.licenses.free;
         };
       }) {};
@@ -2602,34 +2686,34 @@
           sha256 = "0q79kblcbz5vlzj0f49vpc1902767ydmvkmwwjs60x3w2f3aq3cm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/audio-notes-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/audio-notes-mode";
           sha256 = "0q88xmi7jbrx47nvbbmwggbm6i7agzpnv5y7cpdh73lg165xsz2h";
           name = "audio-notes-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/audio-notes-mode";
+          homepage = "https://melpa.org/#/audio-notes-mode";
           license = lib.licenses.free;
         };
       }) {};
     aurel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aurel";
-        version = "20151219.2340";
+        version = "20160309.236";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "aurel";
-          rev = "bcabf49c1410b89d592d8aa78f896428c492879a";
-          sha256 = "0z0wq79ks8251fflk2iwrhd885h5qbki2m19f0jy4a8c00ydmxyz";
+          rev = "2b462d08c0e21f7fee0039457a02fa766fc6181c";
+          sha256 = "0dqr1yrzf7a8655dsbcch4622rc75j9yjbn9zhkyikqjicddnlda";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aurel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/aurel";
           sha256 = "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl";
           name = "aurel";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/aurel";
+          homepage = "https://melpa.org/#/aurel";
           license = lib.licenses.free;
         };
       }) {};
@@ -2639,18 +2723,18 @@
         version = "20140520.403";
         src = fetchFromGitHub {
           owner = "bdd";
-          repo = "aurora-config.el";
+          repo = "aurora-config-mode.el";
           rev = "0a7ca7987c3a0824e25470389c7d25c337a81593";
           sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aurora-config-mode";
-          sha256 = "0yqmpwj1vp0d5w9zw1hbyxzsbvw165dsgk1v1dxizkqwn7b1v7jm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/aurora-config-mode";
+          sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c";
           name = "aurora-config-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/aurora-config-mode";
+          homepage = "https://melpa.org/#/aurora-config-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -2665,34 +2749,34 @@
           sha256 = "1z2n6gd63mgj2wj45n6g1gmfrk0iwzlrzb6g1rdd9r9a03c03qi6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aurora-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/aurora-theme";
           sha256 = "1fhlng30v25ycr502vfvajl70vimscqkipva6ghr670j35ac5vz5";
           name = "aurora-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/aurora-theme";
+          homepage = "https://melpa.org/#/aurora-theme";
           license = lib.licenses.free;
         };
       }) {};
     auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }:
     melpaBuild {
         pname = "auth-password-store";
-        version = "20151112.1547";
+        version = "20160228.823";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "auth-password-store";
-          rev = "d7fc1f026c3f43190cacedfa6eff8da916e607f5";
-          sha256 = "0gi65n1np63zi2ylc4y1licwvk97jl92s1v98fv5y61kppi1d8sq";
+          rev = "209663c772105ae87d244cce9247695823914a00";
+          sha256 = "1b6g7qvrxv6gkl4izq1y7k0x0l7izyfnpki10di5vdv3jp6xg9b2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auth-password-store";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auth-password-store";
           sha256 = "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5";
           name = "auth-password-store";
         };
         packageRequires = [ cl-lib emacs password-store seq ];
         meta = {
-          homepage = "http://melpa.org/#/auth-password-store";
+          homepage = "https://melpa.org/#/auth-password-store";
           license = lib.licenses.free;
         };
       }) {};
@@ -2701,17 +2785,17 @@
         pname = "auto-async-byte-compile";
         version = "20151029.916";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/auto-async-byte-compile.el";
+          url = "https://www.emacswiki.org/emacs/download/auto-async-byte-compile.el";
           sha256 = "1c8nm4sz9a67q8w0b1jahg5ldy185zws7nilj9yv3miklg07zq17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-async-byte-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-async-byte-compile";
           sha256 = "108jhrdx67chbdd4h824072i2wrn90zdh2hw5vqd4a5svhhf28jj";
           name = "auto-async-byte-compile";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/auto-async-byte-compile";
+          homepage = "https://melpa.org/#/auto-async-byte-compile";
           license = lib.licenses.free;
         };
       }) {};
@@ -2726,73 +2810,73 @@
           sha256 = "1whbvqylwnxg8d8gn55kcky39rgyc49rakyxlbkplh813lk6lxb7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-auto-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-auto-indent";
           sha256 = "08s73pnyrmklb660jl5rshncpq31z3m9fl55v7453ch8syp7gzh7";
           name = "auto-auto-indent";
         };
         packageRequires = [ cl-lib es-lib ];
         meta = {
-          homepage = "http://melpa.org/#/auto-auto-indent";
+          homepage = "https://melpa.org/#/auto-auto-indent";
           license = lib.licenses.free;
         };
       }) {};
     auto-capitalize = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "auto-capitalize";
-        version = "20131014.5";
+        version = "20160415.1603";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/auto-capitalize.el";
-          sha256 = "1lk9zwng7wkjvb8hprlgyrab1s56n8a61xjva931h0bgypwl1dfi";
+          url = "https://www.emacswiki.org/emacs/download/auto-capitalize.el";
+          sha256 = "0xywyfpsi64g9lihm5ncmjrj06iq9s6pp9fmsgj1hdf9y0z65lg0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-capitalize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-capitalize";
           sha256 = "18fygc71n9bc0vrpymz2f7sw9hzkpqxzfglh53shmbm1zns3wkw0";
           name = "auto-capitalize";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/auto-capitalize";
+          homepage = "https://melpa.org/#/auto-capitalize";
           license = lib.licenses.free;
         };
       }) {};
     auto-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }:
     melpaBuild {
         pname = "auto-compile";
-        version = "20151107.1608";
+        version = "20160424.618";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "auto-compile";
-          rev = "90eddfb63bd2b58be8a3fe9400b67ea45f67bb29";
-          sha256 = "07vnk8az4lcxncqn01jvks38b4hpdmg43nbby2b39zy50agqnwsg";
+          rev = "61c6bec0ab4e44fe68628a5ee0c8b3b7f50c001f";
+          sha256 = "05crb8cm7s1nggrqq0xcs2xiabjw3vh44fnkdiilq1c5cnajdcrj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-compile";
           sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks";
           name = "auto-compile";
         };
         packageRequires = [ dash emacs packed ];
         meta = {
-          homepage = "http://melpa.org/#/auto-compile";
+          homepage = "https://melpa.org/#/auto-compile";
           license = lib.licenses.free;
         };
       }) {};
     auto-complete = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "auto-complete";
-        version = "20160107.208";
+        version = "20160416.804";
         src = fetchFromGitHub {
           owner = "auto-complete";
           repo = "auto-complete";
-          rev = "ab01ce9fe07fb30f156276dcb2ce795fdc54e241";
-          sha256 = "07ib2pd3apm97v7kalavpc6fyk00cjky8kfwahn37zmw2j2fdhpf";
+          rev = "08af29236e686c876ac7a45670562f3487ff02e0";
+          sha256 = "19sdjwnjryzaq1rpjkvr3mjz9mg7cqzrrx5mqzic3aklgg71d53j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-complete";
           sha256 = "1c4ij5bnclg94jdzhkqvq2vxwv6wvs051mbki1ibjm5f2hlacvh3";
           name = "auto-complete";
         };
         packageRequires = [ cl-lib popup ];
         meta = {
-          homepage = "http://melpa.org/#/auto-complete";
+          homepage = "https://melpa.org/#/auto-complete";
           license = lib.licenses.free;
         };
       }) {};
@@ -2807,13 +2891,13 @@
           sha256 = "1wri8q5llpy1q1h4ac4kjnnkgj6fby8i9vrpr6mrb13d4gnk4gr2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-auctex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-complete-auctex";
           sha256 = "00npvryds5wd3d5a13r9prlvw6vvjlag8d32x5xf9bfmmvs0fgqh";
           name = "auto-complete-auctex";
         };
         packageRequires = [ auto-complete yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/auto-complete-auctex";
+          homepage = "https://melpa.org/#/auto-complete-auctex";
           license = lib.licenses.free;
         };
       }) {};
@@ -2828,13 +2912,13 @@
           sha256 = "12mzi6bwg702sp0f0wd1ag555blbpk252rr9rqs03bn8pkw89h4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-c-headers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-complete-c-headers";
           sha256 = "02pkrxvzrpyjrr2fkxnl1qw06aspzv8jlp2c1piln6zcjd92l3j7";
           name = "auto-complete-c-headers";
         };
         packageRequires = [ auto-complete ];
         meta = {
-          homepage = "http://melpa.org/#/auto-complete-c-headers";
+          homepage = "https://melpa.org/#/auto-complete-c-headers";
           license = lib.licenses.free;
         };
       }) {};
@@ -2849,13 +2933,13 @@
           sha256 = "1zhbpxpl443ghpkl9i68jcjfcw1vnf8ky06pf5qjjmqbxlcyd9li";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-chunk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-complete-chunk";
           sha256 = "1937j1xm20vfcqm9ig4nvciqfkz7rpw0nsfhlg69gkmv0nqszdr3";
           name = "auto-complete-chunk";
         };
         packageRequires = [ auto-complete ];
         meta = {
-          homepage = "http://melpa.org/#/auto-complete-chunk";
+          homepage = "https://melpa.org/#/auto-complete-chunk";
           license = lib.licenses.free;
         };
       }) {};
@@ -2870,13 +2954,13 @@
           sha256 = "12y6f47xbjl4gy14j2f5wlisy5vl6rhx74n27w61pjv38m0a7mi1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-clang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-complete-clang";
           sha256 = "1rnmphl7ml5ryjl5ka2l58hddir8b34iz1rm905wdwh164piljva";
           name = "auto-complete-clang";
         };
         packageRequires = [ auto-complete ];
         meta = {
-          homepage = "http://melpa.org/#/auto-complete-clang";
+          homepage = "https://melpa.org/#/auto-complete-clang";
           license = lib.licenses.free;
         };
       }) {};
@@ -2891,13 +2975,13 @@
           sha256 = "1sw0wxrjcjqk0w1llfj376g6axa5bnk2lq2vv66746bkz14h0s8f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-clang-async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-complete-clang-async";
           sha256 = "1jj0jn1v3070g7g0j5gvpybv145kki8nsjxqb8fjf9qag8ilfkjh";
           name = "auto-complete-clang-async";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/auto-complete-clang-async";
+          homepage = "https://melpa.org/#/auto-complete-clang-async";
           license = lib.licenses.free;
         };
       }) {};
@@ -2912,13 +2996,13 @@
           sha256 = "1fqgyg986fg1dzac5wa97bx82mfddqb6qrfnpr3zksmw3vgykxr0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-exuberant-ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-complete-exuberant-ctags";
           sha256 = "1i2s3ycc8jafkzdsz3kbvx1hh95ydi5s6rq6n0wzw1kyy3km35gd";
           name = "auto-complete-exuberant-ctags";
         };
         packageRequires = [ auto-complete ];
         meta = {
-          homepage = "http://melpa.org/#/auto-complete-exuberant-ctags";
+          homepage = "https://melpa.org/#/auto-complete-exuberant-ctags";
           license = lib.licenses.free;
         };
       }) {};
@@ -2933,13 +3017,13 @@
           sha256 = "18bf1kw85mab0zp7rn85cm1nxjxg5c1dmiv0j0mjwzsv8an4px5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-nxml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-complete-nxml";
           sha256 = "0viscr5k1carn9vhflry16kgihr6fvh6h36b049pgnk6ww085k6a";
           name = "auto-complete-nxml";
         };
         packageRequires = [ auto-complete ];
         meta = {
-          homepage = "http://melpa.org/#/auto-complete-nxml";
+          homepage = "https://melpa.org/#/auto-complete-nxml";
           license = lib.licenses.free;
         };
       }) {};
@@ -2954,13 +3038,13 @@
           sha256 = "1hf2f903hy9afahrgy2fx9smgn631drs6733188zgqi3nkyizj26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-pcmp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-complete-pcmp";
           sha256 = "1mpgkwj8jwpvxphlm6iaprwjrldmihbgg97jav0fbm1kjnm4azna";
           name = "auto-complete-pcmp";
         };
         packageRequires = [ auto-complete log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/auto-complete-pcmp";
+          homepage = "https://melpa.org/#/auto-complete-pcmp";
           license = lib.licenses.free;
         };
       }) {};
@@ -2975,13 +3059,13 @@
           sha256 = "107svb82cgfns9kcrmy3hh56cab81782jkbz5i9959ms81xizfb8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-rst";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-complete-rst";
           sha256 = "0dazkpnzzr0imb2a01qq8l60jxhhlknzjx7wccnbm7d2rk3338m6";
           name = "auto-complete-rst";
         };
         packageRequires = [ auto-complete ];
         meta = {
-          homepage = "http://melpa.org/#/auto-complete-rst";
+          homepage = "https://melpa.org/#/auto-complete-rst";
           license = lib.licenses.free;
         };
       }) {};
@@ -2996,13 +3080,13 @@
           sha256 = "0l49ciic7g30vklxq6l1ny3mz87l5p8qc30rmkjvkzvg8r52ksn3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-complete-sage";
           sha256 = "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1";
           name = "auto-complete-sage";
         };
         packageRequires = [ auto-complete sage-shell-mode ];
         meta = {
-          homepage = "http://melpa.org/#/auto-complete-sage";
+          homepage = "https://melpa.org/#/auto-complete-sage";
           license = lib.licenses.free;
         };
       }) {};
@@ -3017,13 +3101,13 @@
           sha256 = "0rfjx0x2an28821shgb4v5djza4kwn5nnrsl2cvh3px4wrvw3izp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-dictionary";
           sha256 = "1va485a8lxvb3507kr83cr6wpssxnf8y4l42mamn9daa8sjx3q16";
           name = "auto-dictionary";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/auto-dictionary";
+          homepage = "https://melpa.org/#/auto-dictionary";
           license = lib.licenses.free;
         };
       }) {};
@@ -3038,13 +3122,13 @@
           sha256 = "0lqfnv8wqnbb5ddwmh9svphc3bgmwdpwx40qw9sgqdzpj3xh7v8g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-dim-other-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-dim-other-buffers";
           sha256 = "0n9d23sfcmkjfqlm80vrgf856wy08ak4n4rk0z7vadq07yj46zxh";
           name = "auto-dim-other-buffers";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/auto-dim-other-buffers";
+          homepage = "https://melpa.org/#/auto-dim-other-buffers";
           license = lib.licenses.free;
         };
       }) {};
@@ -3059,34 +3143,34 @@
           sha256 = "0jfiax1qqnyznhlnqkjsr9nnv7fpjywvfhj9jq59460j0nbrgs5c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-highlight-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-highlight-symbol";
           sha256 = "02mkji4sxym07jf5ww5kgv1c18x0xdfn8cmvgns5h4gij64lnr66";
           name = "auto-highlight-symbol";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/auto-highlight-symbol";
+          homepage = "https://melpa.org/#/auto-highlight-symbol";
           license = lib.licenses.free;
         };
       }) {};
     auto-indent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "auto-indent-mode";
-        version = "20140505.855";
+        version = "20160422.930";
         src = fetchFromGitHub {
           owner = "mattfidler";
           repo = "auto-indent-mode.el";
-          rev = "1a12448ce3a030ed905226450dfb01bba37f127c";
-          sha256 = "1hlsgsdxpx42kmqkjgy9b9ldz5i4dbi879v87pjd2qbkj8iywb6y";
+          rev = "b887b866b23f0d773df464c68b9b12f9b30cc991";
+          sha256 = "1jr4g6a40bp8p0hcgb2bganm8bxjsn26mylc3qd15ys955rm8pnk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-indent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-indent-mode";
           sha256 = "1nk78p8lqs8cx90asfs8iaqnwwyy8fi5bafaprm9c0nrxz299ibz";
           name = "auto-indent-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/auto-indent-mode";
+          homepage = "https://melpa.org/#/auto-indent-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -3094,17 +3178,17 @@
         pname = "auto-install";
         version = "20150418.1902";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/auto-install.el";
+          url = "https://www.emacswiki.org/emacs/download/auto-install.el";
           sha256 = "043pb2wk7jh0jgxphdl4848rjyabna26gj0vlhpiyd8zc361pg9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-install";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-install";
           sha256 = "1gaxc2ya4r903k0jf3319wg7wg5kzq7k8rfy8ac9b0wfzv247ixk";
           name = "auto-install";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/auto-install";
+          homepage = "https://melpa.org/#/auto-install";
           license = lib.licenses.free;
         };
       }) {};
@@ -3119,13 +3203,34 @@
           sha256 = "05llpa6g4nb4qswmcn7j3bs7hnmkrkax7hsk7wvklr0wrljyg9a2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-package-update";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-package-update";
           sha256 = "0fdcniq5mrwbc7yvma4088r0frdfvc2ydfil0s003faz0nrjcp8k";
           name = "auto-package-update";
         };
         packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/auto-package-update";
+          homepage = "https://melpa.org/#/auto-package-update";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-pause = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-pause";
+        version = "20160426.716";
+        src = fetchFromGitHub {
+          owner = "lujun9972";
+          repo = "auto-pause";
+          rev = "a4d778de774ca3895542cb559a953e0d98657338";
+          sha256 = "1pxhqwvg059pslin6z87jd8d0q44ljwvdn6y23ffrz9kfpn3m5m2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-pause";
+          sha256 = "0cdak2kicxylj5f161kia0bzzqad426y8cj4zf04gcl0nndijyrc";
+          name = "auto-pause";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/auto-pause";
           license = lib.licenses.free;
         };
       }) {};
@@ -3140,13 +3245,13 @@
           sha256 = "10aw3bpvawkqj1l8brvzq057wx3mkzpxs4zc3yhppkhq2cpvx7i2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-save-buffers-enhanced";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-save-buffers-enhanced";
           sha256 = "123vf6nnvdhrrfjn8n8h8a11mkqmy2zm3w3yn99np0zj31x8z7bb";
           name = "auto-save-buffers-enhanced";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/auto-save-buffers-enhanced";
+          homepage = "https://melpa.org/#/auto-save-buffers-enhanced";
           license = lib.licenses.free;
         };
       }) {};
@@ -3161,13 +3266,13 @@
           sha256 = "1h8zsgw30axprs7a5kkygbhvilillzazxgqz01ng36il65fi28s6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-shell-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-shell-command";
           sha256 = "1i78fh72i8yv91rnabf0vs78r43qrjkr36hndmn5ya2xs3b1g41j";
           name = "auto-shell-command";
         };
         packageRequires = [ deferred popwin ];
         meta = {
-          homepage = "http://melpa.org/#/auto-shell-command";
+          homepage = "https://melpa.org/#/auto-shell-command";
           license = lib.licenses.free;
         };
       }) {};
@@ -3182,55 +3287,55 @@
           sha256 = "1ya5rn55sclh2w5bjy4b2b75gd6bgavfqmhdisz6afp8w4l4a2bv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-virtualenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-virtualenv";
           sha256 = "0xv51g74l5pxa3s185867dpc98m6y26xbj5wgz7f9177qchvdbhk";
           name = "auto-virtualenv";
         };
         packageRequires = [ cl-lib pyvenv s ];
         meta = {
-          homepage = "http://melpa.org/#/auto-virtualenv";
+          homepage = "https://melpa.org/#/auto-virtualenv";
           license = lib.licenses.free;
         };
       }) {};
     auto-yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "auto-yasnippet";
-        version = "20151218.1031";
+        version = "20160223.508";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "auto-yasnippet";
-          rev = "9e126461d4473fb734f7e33dc2019cd71856dc42";
-          sha256 = "14qr8c4i4644vwqvlh5d3xhw1dzmqz3v74hqlp7g8991yaka72va";
+          rev = "e7576721b165f191257dfc23e412634fad6619a4";
+          sha256 = "13g0vc0wsq7yn4qgxy3g64pdm30dafi75z6bsxnf3iq77zkqai0p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-yasnippet";
           sha256 = "02281gyy07cy72a29fjsixg9byqq3izb9m1jxv98ni8pcy3bpsqa";
           name = "auto-yasnippet";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/auto-yasnippet";
+          homepage = "https://melpa.org/#/auto-yasnippet";
           license = lib.licenses.free;
         };
       }) {};
     autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "autobookmarks";
-        version = "20151120.1645";
+        version = "20160413.528";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "autobookmarks";
-          rev = "cec3a2ac60a382ee61996c17bd962bc5a2e45c4b";
-          sha256 = "01q3k8i8vrs7pcr507kh48np0bc6smanh0ald1hv9h4dylkq89k7";
+          rev = "6090bb0f24396d35de39c8d522f40b29885c867e";
+          sha256 = "1b9bzfnvkzn6r79r5rm9w9affy8hknqqzcphifrm4g6sm9c3f9jg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/autobookmarks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/autobookmarks";
           sha256 = "11zhg3y9fb5mq67fwsnjrql9mnwkp3hwib7fpllb3yyf2yywc8zp";
           name = "autobookmarks";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
-          homepage = "http://melpa.org/#/autobookmarks";
+          homepage = "https://melpa.org/#/autobookmarks";
           license = lib.licenses.free;
         };
       }) {};
@@ -3245,13 +3350,13 @@
           sha256 = "1pf2mwnicj5x2kksxwmrzz2vfxj9y9r6rzgc1fl8028mfrmrmg8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/autodisass-java-bytecode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/autodisass-java-bytecode";
           sha256 = "1k19nkbxnysm3qkpdhz4gv2x9nnrp94xl40x84q8n84s6xaan4dc";
           name = "autodisass-java-bytecode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/autodisass-java-bytecode";
+          homepage = "https://melpa.org/#/autodisass-java-bytecode";
           license = lib.licenses.free;
         };
       }) {};
@@ -3266,13 +3371,13 @@
           sha256 = "1fq4h5fmamyh7z8nq6pigx74p5v8k3qfm64k66vwsm8bl5jdkw17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/autodisass-llvm-bitcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/autodisass-llvm-bitcode";
           sha256 = "0bh73nzll9jp7kiqfnb5dwkipw85p3c3cyq58s0nghig02z63j01";
           name = "autodisass-llvm-bitcode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/autodisass-llvm-bitcode";
+          homepage = "https://melpa.org/#/autodisass-llvm-bitcode";
           license = lib.licenses.free;
         };
       }) {};
@@ -3281,17 +3386,17 @@
         pname = "autofit-frame";
         version = "20151231.1409";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/autofit-frame.el";
+          url = "https://www.emacswiki.org/emacs/download/autofit-frame.el";
           sha256 = "1af45z1w69dkdk4mzjphwn420m9rrkc3djv5kpp6lzbxxnmswbqw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/autofit-frame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/autofit-frame";
           sha256 = "0p24qqnfa1vfn5pgnpvbxwi11zjkd6f3cv5igwg6h0pr5s7spnvw";
           name = "autofit-frame";
         };
         packageRequires = [ fit-frame ];
         meta = {
-          homepage = "http://melpa.org/#/autofit-frame";
+          homepage = "https://melpa.org/#/autofit-frame";
           license = lib.licenses.free;
         };
       }) {};
@@ -3306,34 +3411,34 @@
           sha256 = "02nnyncfh6g0xizy7wa8721ahpnwk451kngd6n0y0249f50p3962";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/automargin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/automargin";
           sha256 = "0llqz01wmacc0f8j3h7r0j57vkmzksl9vj1h0igfxzpm347mm9q8";
           name = "automargin";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/automargin";
+          homepage = "https://melpa.org/#/automargin";
           license = lib.licenses.free;
         };
       }) {};
     autopair = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "autopair";
-        version = "20140825.627";
+        version = "20160304.637";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "autopair";
-          rev = "4f4bd30b341e7fb15a452b59f3e5c34cbd5c97d8";
-          sha256 = "1z3hd2jkibwz2ijvyh066ki5g30pdqgh2vj2r35prpp12bqabw4a";
+          rev = "2b6d72bccb0ebba6e7e711528872b898b0c65b0a";
+          sha256 = "09p56vi5zgm2djglimwyhv4n4gyydjndzn46vg9qzzlxvvmw66i1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/autopair";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/autopair";
           sha256 = "161qhk8rc1ldj9hpg0k9phka0gflz9vny7gc8rnylk90p6asmr28";
           name = "autopair";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/autopair";
+          homepage = "https://melpa.org/#/autopair";
           license = lib.licenses.free;
         };
       }) {};
@@ -3344,17 +3449,17 @@
         src = fetchFromGitHub {
           owner = "zenspider";
           repo = "elisp";
-          rev = "ec4ef9dc2d018053bed7fb44837b4c66f1a14c36";
-          sha256 = "109il2s5ynfam510yli4xmi5zgw7xhr5gv096li24idqdp0gpf9n";
+          rev = "df58c83a5f1e0b9889858407eae0e383bd759473";
+          sha256 = "184ghdi2m4hagddi71c1pmc408fad1cmw0q2n4k737w6j8537hph";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/autotest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/autotest";
           sha256 = "0f46m5pc40i531dzfnhkcn192dcs1q20y083c1c0wg2zhjcdr5iy";
           name = "autotest";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/autotest";
+          homepage = "https://melpa.org/#/autotest";
           license = lib.licenses.free;
         };
       }) {};
@@ -3369,13 +3474,13 @@
           sha256 = "162zay36mmkkpbfvp0lagv2js4cr1z75dc1z5l2505814m5sx3az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/autotetris-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/autotetris-mode";
           sha256 = "0k4yq4pvrs1zaf9aqxmlb6l2v4k774zbxj4zcx49w3l1h8gwxpbb";
           name = "autotetris-mode";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/autotetris-mode";
+          homepage = "https://melpa.org/#/autotetris-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -3390,34 +3495,34 @@
           sha256 = "1lip7282g41ghn64dvx2ab437s83cj9l8ps1rd8rbhqyz4bx5wb9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/autumn-light-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/autumn-light-theme";
           sha256 = "0g3wqv1yw3jycq30mcj3w4sn9nj6i6gyd2ljzimf547ggcai536a";
           name = "autumn-light-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/autumn-light-theme";
+          homepage = "https://melpa.org/#/autumn-light-theme";
           license = lib.licenses.free;
         };
       }) {};
     avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "avy";
-        version = "20160203.157";
+        version = "20160421.324";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "avy";
-          rev = "730581ae8720c255dd000ca6f0d44e1845de3f45";
-          sha256 = "0awxmd2lf5rzkw9zdlsxm614asqrl324x2qv9lgakc1f663q72sl";
+          rev = "53706d2ebf8ea5d02e3d0229656f8e5369b9440a";
+          sha256 = "0jr8m2bhklwfq0rav4ai918ywr7837q849awmfv7j2vvf4jqkja1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/avy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/avy";
           sha256 = "0gjq79f8jagbngp0shkcqmwhisc3hpgwfk34kq30nb929nbnlmag";
           name = "avy";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/avy";
+          homepage = "https://melpa.org/#/avy";
           license = lib.licenses.free;
         };
       }) {};
@@ -3432,55 +3537,55 @@
           sha256 = "1a6h44a6id4ash8kp0a59f34658p7czcl2d3i1880k8hckhy445j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/avy-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/avy-menu";
           sha256 = "1g2bsm0jpig51jwn9f9mx6z5glb0bn4s21194xam768qin0rf4iw";
           name = "avy-menu";
         };
         packageRequires = [ avy emacs ];
         meta = {
-          homepage = "http://melpa.org/#/avy-menu";
+          homepage = "https://melpa.org/#/avy-menu";
           license = lib.licenses.free;
         };
       }) {};
     avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
     melpaBuild {
         pname = "avy-migemo";
-        version = "20160210.1114";
+        version = "20160426.950";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "avy-migemo";
-          rev = "d95d0485f2fc580a918c4769f669d273c7a6c334";
-          sha256 = "0n1c5xvr782zgvby38w6wxrqac1lx35n0m7rl4ki325c6dchkgsx";
+          rev = "4ce85afd01bfcdbd5c06b46bccb1c9ac63f79863";
+          sha256 = "06fjkz8y2w0d3giyiacvbj8n8i3lx3ffd78bcgzgwpylibxm3saw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/avy-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/avy-migemo";
           sha256 = "1zvgkhma445gj1zjl8j25prw95bdpjbvfy8yr0r5liay6g2hf296";
           name = "avy-migemo";
         };
         packageRequires = [ avy emacs migemo ];
         meta = {
-          homepage = "http://melpa.org/#/avy-migemo";
+          homepage = "https://melpa.org/#/avy-migemo";
           license = lib.licenses.free;
         };
       }) {};
     avy-zap = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "avy-zap";
-        version = "20151211.1348";
+        version = "20160330.1330";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "avy-zap";
-          rev = "ee3a2ad9911384e21537bc641a2f794dd192bbe8";
-          sha256 = "0s7lhls6gs055kw0893nkb9myv7m2q2p251lq9wh2r3bmia9d6pg";
+          rev = "173dbb6339e683ff8ed0114cdd5a6490ab6b28f0";
+          sha256 = "0nv6y9jwy2z4rlnd6qklhqww367kaqjc5id7yr4hsmxmxw2jj43p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/avy-zap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/avy-zap";
           sha256 = "1zbkf21ggrmg1w0xaw40i3swgc1g4fz0j8p0r9djm9j120d94zkx";
           name = "avy-zap";
         };
         packageRequires = [ avy ];
         meta = {
-          homepage = "http://melpa.org/#/avy-zap";
+          homepage = "https://melpa.org/#/avy-zap";
           license = lib.licenses.free;
         };
       }) {};
@@ -3488,37 +3593,37 @@
         pname = "awk-it";
         version = "20130917.1348";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/awk-it.el";
+          url = "https://www.emacswiki.org/emacs/download/awk-it.el";
           sha256 = "1r1vbi1r3rdbkyb2naciqwja7hxigjhqfxsfcinnygabsi7fw9aw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/awk-it";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/awk-it";
           sha256 = "1rnrm9jf9wvfrwyylhj0bfrz9140945lc87lrh21caf7q88fpvkw";
           name = "awk-it";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/awk-it";
+          homepage = "https://melpa.org/#/awk-it";
           license = lib.licenses.free;
         };
       }) {};
     axiom-environment = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "axiom-environment";
-        version = "20160123.1226";
+        version = "20160325.1715";
         src = fetchhg {
           url = "https://bitbucket.com/pdo/axiom-environment";
-          rev = "f7b3a13f54ea";
-          sha256 = "1qq0b92mf73fnx2viwzlsxr6672wkskf0vjimymyhv9aq3gw165w";
+          rev = "bc294e47f51c";
+          sha256 = "0z15n7cpprbhiamq26240g5bqsiw5mgyzdisi7j6hpybyk2zyl9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/axiom-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/axiom-environment";
           sha256 = "1d3h1fn5zfbh7kpm2i02kza3bq9s6if4yd2vvfjdhgrykvl86h66";
           name = "axiom-environment";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/axiom-environment";
+          homepage = "https://melpa.org/#/axiom-environment";
           license = lib.licenses.free;
         };
       }) {};
@@ -3533,13 +3638,13 @@
           sha256 = "140lbpqq4qz45ykycdn8nvcn8pv0xqfwpapgprvyg8z5fjkyc4sg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/babel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/babel";
           sha256 = "0sdpp4iym61ni32zv75n48ylj4jib8ca6n9hyqwj1b7nqg76mm1c";
           name = "babel";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/babel";
+          homepage = "https://melpa.org/#/babel";
           license = lib.licenses.free;
         };
       }) {};
@@ -3554,13 +3659,13 @@
           sha256 = "1wfssdv6ag36ww6v7al2x04mbpaajlx92wfm8rbq8rp8887724s5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/babel-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/babel-repl";
           sha256 = "0h11i8w8s4ia1x0lm5n7bnc3db4bv0a7f7hzl27qrg38m3c7dl6x";
           name = "babel-repl";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/babel-repl";
+          homepage = "https://melpa.org/#/babel-repl";
           license = lib.licenses.free;
         };
       }) {};
@@ -3575,7 +3680,7 @@
           sha256 = "0rj6a8rdwa0h2ckz7h4d91hnxqcin98l4ikbfyak2whfb47z909l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/back-button";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/back-button";
           sha256 = "0vyhvm445d0rs14j5xi419akk5nd88d4hvm4251z62fmnvs50j85";
           name = "back-button";
         };
@@ -3588,7 +3693,7 @@
           ucs-utils
         ];
         meta = {
-          homepage = "http://melpa.org/#/back-button";
+          homepage = "https://melpa.org/#/back-button";
           license = lib.licenses.free;
         };
       }) {};
@@ -3596,17 +3701,17 @@
         pname = "backup-each-save";
         version = "20130704.932";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/backup-each-save.el";
+          url = "https://www.emacswiki.org/emacs/download/backup-each-save.el";
           sha256 = "0b9vvi2m0fdv36wj8mvawl951gjmg3pypg08a8n6rzn3rwg0fwz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/backup-each-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/backup-each-save";
           sha256 = "1fv9sf6vkjyv93vil4l9hjm2fg73zlxbnif0xfm3kpmva9xin337";
           name = "backup-each-save";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/backup-each-save";
+          homepage = "https://melpa.org/#/backup-each-save";
           license = lib.licenses.free;
         };
       }) {};
@@ -3621,13 +3726,13 @@
           sha256 = "0z4d8x9lkad50720lgvr8f85p1ligv07865i30lgr9ck0q04w68v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/backup-walker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/backup-walker";
           sha256 = "0hfr27yiiblrd0p3zhpapbj4vijfdk7wqh406xnlwf2yvnfsqycd";
           name = "backup-walker";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/backup-walker";
+          homepage = "https://melpa.org/#/backup-walker";
           license = lib.licenses.free;
         };
       }) {};
@@ -3642,55 +3747,55 @@
           sha256 = "0g8smx6pi2wqv78mhxfgwg51mx5msqsgcc55xcz29aq0q3naw4z1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/badger-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/badger-theme";
           sha256 = "01h5bsqllgn6gs0wpl0y2h041007mn3ldjswkz6f3mayrgl4c6yf";
           name = "badger-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/badger-theme";
+          homepage = "https://melpa.org/#/badger-theme";
           license = lib.licenses.free;
         };
       }) {};
     badwolf-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "badwolf-theme";
-        version = "20160218.1631";
+        version = "20160413.1605";
         src = fetchFromGitHub {
           owner = "bkruczyk";
           repo = "badwolf-emacs";
-          rev = "1e3a9c50b884578d6add6149bf5fcab6f7d1e55c";
-          sha256 = "0rymxwxp6gi9ir8crvnv1mz4pns72xdhd9pnpzdqxvawwc76h4cc";
+          rev = "92afd11dacad4f9df92028f2606f622472d4d21e";
+          sha256 = "1kk50gxrr95w4qadnnn6ai4szhjqpmkj4l4fmjvpzgjwb24n6yxq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/badwolf-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/badwolf-theme";
           sha256 = "03plkzpmlh0pgfp1c9padsh4w2g23clsznym8x4jabxnk0ynhq41";
           name = "badwolf-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/badwolf-theme";
+          homepage = "https://melpa.org/#/badwolf-theme";
           license = lib.licenses.free;
         };
       }) {};
     baidu-life = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "baidu-life";
-        version = "20151210.615";
+        version = "20160426.719";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "el-baidu-life";
-          rev = "4cb251d44e97da54306af9d99444d9b8525f043e";
-          sha256 = "00skx1aywzvnqqsm41n2mwry5i6ifib8kzq5klymbrc7qfnbb55f";
+          rev = "5c4b3dbc016a2656cc2febaa2ac2268c05725b5c";
+          sha256 = "024gpdjr1lbqjg6md526g4wz2shpgfpdrrd2m1bn4fissbzj70i1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/baidu-life";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/baidu-life";
           sha256 = "0rib50hja33qk8dmw5i62gaxhx7mscj2y0n25jmnds7k88ms8z19";
           name = "baidu-life";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/baidu-life";
+          homepage = "https://melpa.org/#/baidu-life";
           license = lib.licenses.free;
         };
       }) {};
@@ -3705,13 +3810,13 @@
           sha256 = "16240dj0hvxkljas9973wjdgkbx213sqws77j167yr5xf761dlsr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/base16-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/base16-theme";
           sha256 = "1zxbvfj6gvz1ynhj6i9q9y65hq7aq41qx4vnx738cjizcq0rc8bs";
           name = "base16-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/base16-theme";
+          homepage = "https://melpa.org/#/base16-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -3726,13 +3831,13 @@
           sha256 = "06c42531dy5ngscwfvg8rksg6jcsakfn7104hmlg1jp4kvfiy1kg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bash-completion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bash-completion";
           sha256 = "0l41yj0sb87i27hw6dh35l32hg4qkka6r3bpkckjnfm0xifrd9hj";
           name = "bash-completion";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bash-completion";
+          homepage = "https://melpa.org/#/bash-completion";
           license = lib.licenses.free;
         };
       }) {};
@@ -3747,13 +3852,13 @@
           sha256 = "1pbnw6ccphxynbhnc4g687jfcg33p1sa7a0mfxc2ai0i3z59gn78";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/basic-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/basic-theme";
           sha256 = "16rgff1d0s65alh328lr93zc06zmgbzgwx1rf3k3l4d10ki4cc27";
           name = "basic-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/basic-theme";
+          homepage = "https://melpa.org/#/basic-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -3761,17 +3866,17 @@
         pname = "batch-mode";
         version = "20140807.1550";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/batch-mode.el";
+          url = "https://www.emacswiki.org/emacs/download/batch-mode.el";
           sha256 = "1aa611jrzw4svmxvw1ghgh53x4nry0sl7mxmp4kxiaybqqvz6a1p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/batch-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/batch-mode";
           sha256 = "1p0rh5r8w00jag64sbjy8xb9g6lqhm2fz476v201kbrj9ggp643x";
           name = "batch-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/batch-mode";
+          homepage = "https://melpa.org/#/batch-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -3786,13 +3891,13 @@
           sha256 = "1fy9qnwsxvb8qnyk13bnjjbnlhdads5qf1byg5agg6lq5np3w5jf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bats-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bats-mode";
           sha256 = "1l5winy30w8fs3f5cylc3a3j3mfkvchwanlgsin7q76jivn87h7w";
           name = "bats-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bats-mode";
+          homepage = "https://melpa.org/#/bats-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -3807,13 +3912,13 @@
           sha256 = "17ip24fk13aj9zldn2qsr4naa8anqhm484m1an5l5i9m9awfiyn7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbcode-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bbcode-mode";
           sha256 = "0ixxavmilr6na56yc148prbh3nlhcwir6rxqvh332cr8vr9gmp89";
           name = "bbcode-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bbcode-mode";
+          homepage = "https://melpa.org/#/bbcode-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -3823,16 +3928,16 @@
         src = fetchgit {
           url = "git://git.savannah.nongnu.org/bbdb.git";
           rev = "8fce6df3ab09250d545a2ed373ae64e68d12ff4c";
-          sha256 = "e20dfe8085782948c1411685d45bad0cb7ff088bc2d1d2c1654c276356382b26";
+          sha256 = "09ib71b669sccp0x5lf2ic4gzdqcmmdx918n870lhabqhn0gw3g2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bbdb";
           sha256 = "0zhs4psa9b9yf9hxm19q5znsny11cdp23pya3rrlmj39j4jfn73j";
           name = "bbdb";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bbdb";
+          homepage = "https://melpa.org/#/bbdb";
           license = lib.licenses.free;
         };
       }) {};
@@ -3847,13 +3952,13 @@
           sha256 = "17nbnkg0zn6p89r27mk9hl6qhv6xscwdsq8iyikdw03svpr16lnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb-";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bbdb-";
           sha256 = "1vzbalcchay4pxl9f1sxg0zclgc095f59dlj15pj0bqq61sbl9jf";
           name = "bbdb-";
         };
         packageRequires = [ bbdb log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/bbdb-";
+          homepage = "https://melpa.org/#/bbdb-";
           license = lib.licenses.free;
         };
       }) {};
@@ -3868,13 +3973,13 @@
           sha256 = "0m80k87dahzdpfa4snbl4p9zm5d5anc8s91535mwzsnfbr98qmhm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb-android";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bbdb-android";
           sha256 = "0v3njygqkcrwjkf7jrqmza6bwk2jp3956cx1qvf9ph7dfxsq7rn3";
           name = "bbdb-android";
         };
         packageRequires = [ bbdb-vcard ];
         meta = {
-          homepage = "http://melpa.org/#/bbdb-android";
+          homepage = "https://melpa.org/#/bbdb-android";
           license = lib.licenses.free;
         };
       }) {};
@@ -3889,13 +3994,13 @@
           sha256 = "07plwm5nh58qya03l8z0iaqh8bmyhywx7qiffkf803n8wwjb3kdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb-china";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bbdb-china";
           sha256 = "111lf256zxlnylfmwis0pngbpj73p59s520v8abbm7pn82k2m72b";
           name = "bbdb-china";
         };
         packageRequires = [ bbdb-vcard chinese-pyim ];
         meta = {
-          homepage = "http://melpa.org/#/bbdb-china";
+          homepage = "https://melpa.org/#/bbdb-china";
           license = lib.licenses.free;
         };
       }) {};
@@ -3910,13 +4015,13 @@
           sha256 = "1h9vi9wb3dzzjrw5zfypk60afzzshxa3qmnbc24ypby5dr7qy91l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb-csv-import";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bbdb-csv-import";
           sha256 = "0r7pc2ypd1ydqrnvcqmsg69rm047by7k0zhm563538ra82597wnm";
           name = "bbdb-csv-import";
         };
         packageRequires = [ bbdb dash pcsv ];
         meta = {
-          homepage = "http://melpa.org/#/bbdb-csv-import";
+          homepage = "https://melpa.org/#/bbdb-csv-import";
           license = lib.licenses.free;
         };
       }) {};
@@ -3931,13 +4036,13 @@
           sha256 = "1ydf89mmp3zjfqdymnrwg18wclyf7psarz9f2k82pl58h0khh71g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bbdb-ext";
           sha256 = "0fnxcvzdyh0602rdfz3lz3vmvza4s0syz1vn2fgsn2lg3afqq7li";
           name = "bbdb-ext";
         };
         packageRequires = [ bbdb ];
         meta = {
-          homepage = "http://melpa.org/#/bbdb-ext";
+          homepage = "https://melpa.org/#/bbdb-ext";
           license = lib.licenses.free;
         };
       }) {};
@@ -3952,13 +4057,13 @@
           sha256 = "04yxky7qxh0s4y4addry85qd1074l97frhp0hw77xd1bc7n5zzg0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb-handy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bbdb-handy";
           sha256 = "0qv1lw4fv9w9c1ypzpbnvkm6ypqrzqpwyw5gpi7n9almxpd8d68z";
           name = "bbdb-handy";
         };
         packageRequires = [ bbdb ];
         meta = {
-          homepage = "http://melpa.org/#/bbdb-handy";
+          homepage = "https://melpa.org/#/bbdb-handy";
           license = lib.licenses.free;
         };
       }) {};
@@ -3973,13 +4078,13 @@
           sha256 = "1zlf9xhpirln72xr7v6kgndkg5wyz5ipsl4gpq9lbmp92jlgbwlj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb-vcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bbdb-vcard";
           sha256 = "1kn98b7mh9a28933r4yl8qfl9p92rpix4vkp71sar9cka0m71ilj";
           name = "bbdb-vcard";
         };
         packageRequires = [ bbdb ];
         meta = {
-          homepage = "http://melpa.org/#/bbdb-vcard";
+          homepage = "https://melpa.org/#/bbdb-vcard";
           license = lib.licenses.free;
         };
       }) {};
@@ -3994,13 +4099,13 @@
           sha256 = "1zkh7dcas80wwjvigl27wj8sp4b5z6lh3qj7zkziinwamwnxbdbs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb2erc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bbdb2erc";
           sha256 = "0k1f6mq9xd3568vg01dqqvcdbdshbdsi4ivkjyxis6dqfnqhlfdd";
           name = "bbdb2erc";
         };
         packageRequires = [ bbdb ];
         meta = {
-          homepage = "http://melpa.org/#/bbdb2erc";
+          homepage = "https://melpa.org/#/bbdb2erc";
           license = lib.licenses.free;
         };
       }) {};
@@ -4015,13 +4120,13 @@
           sha256 = "1cdm4d6fjf3m495phynq0dzvv0wc0gfsw6fdq4d47iyxs0p4q2dl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbyac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bbyac";
           sha256 = "19s9fqcdyqz22m981vr0p8jwghbs267yrlxsv9xkfzd7fccnx170";
           name = "bbyac";
         };
         packageRequires = [ browse-kill-ring cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/bbyac";
+          homepage = "https://melpa.org/#/bbyac";
           license = lib.licenses.free;
         };
       }) {};
@@ -4036,34 +4141,34 @@
           sha256 = "0d5b7zyl2vg621w1ll2lw3kjz5hx6lqxc0jivh0i449gckk5pzkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bdo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bdo";
           sha256 = "0vp8am2x11abxganw90025w9qxnqjdkj015592glbbzpa6338nfl";
           name = "bdo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bdo";
+          homepage = "https://melpa.org/#/bdo";
           license = lib.licenses.free;
         };
       }) {};
     beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "beacon";
-        version = "20160206.1117";
+        version = "20160404.808";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "beacon";
-          rev = "9e55c293a80c6173db756200742e74cb06468ab0";
-          sha256 = "04gnbil12ixkvgmmdw5fx90b9hbz2jf0hzic1v96fnzq9280ccjf";
+          rev = "d666642d7ad905997d0ac5ecd4b27353506ce79e";
+          sha256 = "0v1lpn4jrhr3b4681lc3b17mzr6jd1p1xiy51m6n7pdivnzrrxi2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/beacon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/beacon";
           sha256 = "1pwxvdfzs9qjd44wvgimipi2hg4qw5sh5wlsl8h8mq2kyx09s7hq";
           name = "beacon";
         };
         packageRequires = [ seq ];
         meta = {
-          homepage = "http://melpa.org/#/beacon";
+          homepage = "https://melpa.org/#/beacon";
           license = lib.licenses.free;
         };
       }) {};
@@ -4072,19 +4177,19 @@
         pname = "beeminder";
         version = "20160209.2103";
         src = fetchFromGitHub {
-          owner = "sodaware";
+          owner = "Sodaware";
           repo = "beeminder.el";
           rev = "a4e159250bac89bc25ced8523a5eac2a951cd5b6";
           sha256 = "0ki9q3ylssjabh15dr49k7dxv88snpj4564g0myp3c61qzyy82lk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/beeminder";
-          sha256 = "0aj7ix7nrsl89f9c449kik8fbzhfk9li50wrh50cdwgfh8gda0fx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/beeminder";
+          sha256 = "1cb8xmgsv23b464hpchm9f9i64p3fyf7aillrwk1aa2l1008kyww";
           name = "beeminder";
         };
         packageRequires = [ org ];
         meta = {
-          homepage = "http://melpa.org/#/beeminder";
+          homepage = "https://melpa.org/#/beeminder";
           license = lib.licenses.free;
         };
       }) {};
@@ -4099,13 +4204,13 @@
           sha256 = "1hyiz7iwnzbg1616q0w7fndllbnx4m98kakgxn04bsqib5fqk78p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/beginend";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/beginend";
           sha256 = "1y81kr9q0zrsr3c3s14rm6l86y5wf1a0kia6d98112fy4fwdm7kq";
           name = "beginend";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/beginend";
+          homepage = "https://melpa.org/#/beginend";
           license = lib.licenses.free;
         };
       }) {};
@@ -4120,13 +4225,13 @@
           sha256 = "058mic9jkwiqvmp3k9sfd6gb70ysdphnb1iynlszhixbrz5w7zs2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/benchmark-init";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/benchmark-init";
           sha256 = "0dknch4b1j7ff1079z2fhqng7kp4903b3v7mhj15b5vzspbp3wal";
           name = "benchmark-init";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/benchmark-init";
+          homepage = "https://melpa.org/#/benchmark-init";
           license = lib.licenses.free;
         };
       }) {};
@@ -4141,13 +4246,13 @@
           sha256 = "06izbc0ksyhgh4gsjiifhj11v0gx9x5xjx9aqci5mc4kc6mg05sf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bert";
           sha256 = "1zhz1dcy1nf84p244x6lc4ajancv5fgmqmbrm080yhb2ral1z8x7";
           name = "bert";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bert";
+          homepage = "https://melpa.org/#/bert";
           license = lib.licenses.free;
         };
       }) {};
@@ -4162,13 +4267,13 @@
           sha256 = "1rxznx2l0cdpiz8mad8s6q17m1fngpgb1cki7ch6yh18r3qz8ysr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/better-defaults";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/better-defaults";
           sha256 = "13bqcmx2gagm2ykg921ik3awp8zvw5d4lb69rr6gkpjlqp7nq2cm";
           name = "better-defaults";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/better-defaults";
+          homepage = "https://melpa.org/#/better-defaults";
           license = lib.licenses.free;
         };
       }) {};
@@ -4176,17 +4281,17 @@
         pname = "better-registers";
         version = "20140813.319";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/better-registers.el";
+          url = "https://www.emacswiki.org/emacs/download/better-registers.el";
           sha256 = "05dlhhvd1m9q642gqqj6klif13shbinqi6bi72fldidi1z6wcqlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/better-registers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/better-registers";
           sha256 = "01i0qjrwsc5way2h9z3pmsgccsbdifsq1dh6zhka4h6qfgrmn3bx";
           name = "better-registers";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/better-registers";
+          homepage = "https://melpa.org/#/better-registers";
           license = lib.licenses.free;
         };
       }) {};
@@ -4201,13 +4306,13 @@
           sha256 = "02b2m0cq04ynjcmr4j8gpdzjv9mpf1fysn736xv724xgaymj396n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bf-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bf-mode";
           sha256 = "0b1yf9bx1ldkzry7v5qvcnl059rq62a50dvpa10i2f5v0y96n1q9";
           name = "bf-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bf-mode";
+          homepage = "https://melpa.org/#/bf-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -4222,13 +4327,55 @@
           sha256 = "1y9fxs1nbf0xsn8mw45m9ghmji3h64wdbfnyr1npmf5fb27rmd17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bfbuilder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bfbuilder";
           sha256 = "16ckybqd0a8l75ascm3k4cdzp969lzq7m050aymdyjhwif6ld2r7";
           name = "bfbuilder";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/bfbuilder";
+          homepage = "https://melpa.org/#/bfbuilder";
+          license = lib.licenses.free;
+        };
+      }) {};
+    biblio = callPackage ({ biblio-core, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "biblio";
+        version = "20160407.427";
+        src = fetchFromGitHub {
+          owner = "cpitclaudel";
+          repo = "biblio.el";
+          rev = "1d37beac6024bb0e354966f20cd860fc8260bdc6";
+          sha256 = "0mlbpmf6l9hvdw2pdx1qbad6q54r8zjb514d89znd461vs9ipjya";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/biblio";
+          sha256 = "0ym7xvcfd7hh3qdpfb8zpa7w8s4lpg0vngh9d0ns3s3lnhz4mi0g";
+          name = "biblio";
+        };
+        packageRequires = [ biblio-core emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/biblio";
+          license = lib.licenses.free;
+        };
+      }) {};
+    biblio-core = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, seq }:
+    melpaBuild {
+        pname = "biblio-core";
+        version = "20160407.426";
+        src = fetchFromGitHub {
+          owner = "cpitclaudel";
+          repo = "biblio.el";
+          rev = "1d37beac6024bb0e354966f20cd860fc8260bdc6";
+          sha256 = "0mlbpmf6l9hvdw2pdx1qbad6q54r8zjb514d89znd461vs9ipjya";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/biblio-core";
+          sha256 = "0zpfamrb2gka41h834a05hxdbw4h55777kh6rhjikjfmy765nl97";
+          name = "biblio-core";
+        };
+        packageRequires = [ dash emacs let-alist seq ];
+        meta = {
+          homepage = "https://melpa.org/#/biblio-core";
           license = lib.licenses.free;
         };
       }) {};
@@ -4243,13 +4390,13 @@
           sha256 = "0rwy4k06nd9a31hpyqs0fxp45dpddbvbhwcw1gzx4f73qmgawq9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bibretrieve";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bibretrieve";
           sha256 = "1mf884c6adx7rq5c2z5wrnjpb6znljy30mscxskwqiyfs8c62mii";
           name = "bibretrieve";
         };
         packageRequires = [ auctex emacs ];
         meta = {
-          homepage = "http://melpa.org/#/bibretrieve";
+          homepage = "https://melpa.org/#/bibretrieve";
           license = lib.licenses.free;
         };
       }) {};
@@ -4264,13 +4411,13 @@
           sha256 = "077shjz9sd0k0akvxzzgjd8a626ck650xxlhp2ws4gs7rjd7a823";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bibslurp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bibslurp";
           sha256 = "178nhng87bdi8s0r2bdh2gk31w9mmjkyi6ncnddk3v7p8fsh4jjp";
           name = "bibslurp";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/bibslurp";
+          homepage = "https://melpa.org/#/bibslurp";
           license = lib.licenses.free;
         };
       }) {};
@@ -4285,13 +4432,13 @@
           sha256 = "1qf45s53vcbd90v2d2brynv3xmp8sy9w9jp611cf0dzfl1k7x8p8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bibtex-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bibtex-utils";
           sha256 = "13llsyyvy0xc9s51cqqc1rz13m3qdqh8jw07gwywfbixlma59z8l";
           name = "bibtex-utils";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bibtex-utils";
+          homepage = "https://melpa.org/#/bibtex-utils";
           license = lib.licenses.free;
         };
       }) {};
@@ -4302,59 +4449,59 @@
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "use-package-chords";
-          rev = "cbf623c867f911732077b026692f9312401791ad";
-          sha256 = "05lhxbrgwbyz0nkb19yln9a46jh91ic685943hd58cn91lxsw3al";
+          rev = "b7de6b2a1270d37a1aca3bd8f29f67ec578527d7";
+          sha256 = "06jsa0scvf12kznm0ngv76y726rzh93prc7ymw3fvknvg0xivb8v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bind-chord";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bind-chord";
           sha256 = "01a3c298kq8cfsxsscpic0shkjm77adiamgbgk8laqkbrlsrrcsb";
           name = "bind-chord";
         };
         packageRequires = [ bind-key key-chord ];
         meta = {
-          homepage = "http://melpa.org/#/bind-chord";
+          homepage = "https://melpa.org/#/bind-chord";
           license = lib.licenses.free;
         };
       }) {};
     bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bind-key";
-        version = "20160206.1456";
+        version = "20160227.248";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "6b1956813f0f0e553a7eb6923ff846f9c3556146";
-          sha256 = "13yzxlxkykv3qkaaifn3pf0y94dgqysxz5p7vh71jpqxi6d7jmgr";
+          rev = "22c63c8f98fc318c357b51a658cee62d64601e16";
+          sha256 = "19vc1hblbqlns2c28aqwjpmj8k35ih7akqi04wrqv1b6pljfy3jg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bind-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bind-key";
           sha256 = "1qw2c27016d3yfg0w10is1v72y2jvzhq07ca4h6v17yi94ahj5xm";
           name = "bind-key";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bind-key";
+          homepage = "https://melpa.org/#/bind-key";
           license = lib.licenses.free;
         };
       }) {};
     bind-map = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bind-map";
-        version = "20160211.1121";
+        version = "20160309.725";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-bind-map";
-          rev = "f4fad049d0bb6ebdc729bc6d356288f2dd96e2f3";
-          sha256 = "023rck51m264qx38270ai5ib8wipa8q952bagi1dqi6xp5k6lsjs";
+          rev = "6f84c0254f9ef7580ee32fb66190cc694cc05629";
+          sha256 = "047qzylycx3r06dd0q9q9f37pvfigmlv59gi3wqvlg6k3gcmdvy0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bind-map";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bind-map";
           sha256 = "1jzkp010b4vs1bdhccf5igmymfxab4vxs1pccpk9n5n5a4xaa358";
           name = "bind-map";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/bind-map";
+          homepage = "https://melpa.org/#/bind-map";
           license = lib.licenses.free;
         };
       }) {};
@@ -4369,13 +4516,13 @@
           sha256 = "0pmpg54faq0l886f2cmnmwm28d2yfg8adk7gp7623gx0ifggn332";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bing-dict";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bing-dict";
           sha256 = "0s5pd08rcnvmgi1hw17xbzvswlv0yni6h2h2gccrjmf6izi8whh1";
           name = "bing-dict";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bing-dict";
+          homepage = "https://melpa.org/#/bing-dict";
           license = lib.licenses.free;
         };
       }) {};
@@ -4390,13 +4537,13 @@
           sha256 = "1n5icy29ks5rxrxp7v4sf0523z7wxn0fh9lx4y6jb7ppdjnff12s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/birds-of-paradise-plus-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/birds-of-paradise-plus-theme";
           sha256 = "0vdv2siy30kf1qhzrc39sygjk17lwm3ix58pcs3shwkg1y5amj3m";
           name = "birds-of-paradise-plus-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/birds-of-paradise-plus-theme";
+          homepage = "https://melpa.org/#/birds-of-paradise-plus-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -4411,13 +4558,13 @@
           sha256 = "0iccafawm9ah62f7qq1k77kjpafhcpjcaiqh5xjig1wxnpc43ck7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bison-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bison-mode";
           sha256 = "097gimlzmyrsfnl76cbzyyi9dm0d2y3f9107672h56ncri35mh66";
           name = "bison-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bison-mode";
+          homepage = "https://melpa.org/#/bison-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -4432,34 +4579,34 @@
           sha256 = "14dsjbw4ss3i6ydynm121v5j3idvy85sk1vqbr5r871d32179xan";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bitbake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bitbake";
           sha256 = "1k2n1i8g0jc78sp1icm64rlhi1q0vqar2a889nldp134a1l7bfah";
           name = "bitbake";
         };
         packageRequires = [ dash emacs mmm-mode s ];
         meta = {
-          homepage = "http://melpa.org/#/bitbake";
+          homepage = "https://melpa.org/#/bitbake";
           license = lib.licenses.free;
         };
       }) {};
     bitlbee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bitlbee";
-        version = "20130328.1218";
+        version = "20151202.1800";
         src = fetchFromGitHub {
           owner = "pjones";
-          repo = "elisp";
-          rev = "5eafcd3ff0725b5826d1e01bfe4c7ed01563b75e";
-          sha256 = "1cnx5kr0hah4h4b6arp7hb2i556vpx1dwmziny2csil39hkcjgbs";
+          repo = "bitlbee-el";
+          rev = "3a92a4119e0c007df2c7dcf1b1c3a5f23ee40e05";
+          sha256 = "0mccvpf8f87i7rqga3s4slrqz80rp3kyj071rrimhzpx8pnsrxx9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bitlbee";
-          sha256 = "15xb0vjamnfwi25yqd37zwfm6xb6p71if88hk2ymxikza4i47x0f";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bitlbee";
+          sha256 = "1lmbmlshr8b645qsb88rswmbbcbbawzl04xdjlygq4dnpkxc8w0f";
           name = "bitlbee";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bitlbee";
+          homepage = "https://melpa.org/#/bitlbee";
           license = lib.licenses.free;
         };
       }) {};
@@ -4474,13 +4621,13 @@
           sha256 = "09blh9cbcbqr3pdaiwm9fmh5kzqm1v9mffy623z3jn87g5wadrmb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bitly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bitly";
           sha256 = "032s7ax8qp3qzcj1njbyyxiyadjirphswqdlr45zj6hzajfsr247";
           name = "bitly";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bitly";
+          homepage = "https://melpa.org/#/bitly";
           license = lib.licenses.free;
         };
       }) {};
@@ -4488,17 +4635,17 @@
         pname = "blank-mode";
         version = "20130824.659";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/blank-mode.el";
+          url = "https://www.emacswiki.org/emacs/download/blank-mode.el";
           sha256 = "1wdplnmdllbydwr9gyyq4fbkxl5xjh7220vd4iajyv74pg2jkkkv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/blank-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/blank-mode";
           sha256 = "1pyx5xwflnni9my5aqpgf8xz4q4rvmj67pwb4zxx1lghrca97z87";
           name = "blank-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/blank-mode";
+          homepage = "https://melpa.org/#/blank-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -4513,13 +4660,13 @@
           sha256 = "1pslwyaq18d1z7fay2ih3n27i6b49ss62drqqb095l1jxk42xxm0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/blgrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/blgrep";
           sha256 = "0w7453vh9c73hdfgr06693kwvhznn9xr1hqa65izlsx2fjhqc9gm";
           name = "blgrep";
         };
         packageRequires = [ clmemo ];
         meta = {
-          homepage = "http://melpa.org/#/blgrep";
+          homepage = "https://melpa.org/#/blgrep";
           license = lib.licenses.free;
         };
       }) {};
@@ -4534,34 +4681,55 @@
           sha256 = "0dn0i3nxrqd82b9d17p1v0ddlpxnlfclkc8sqzrwq6cf19wcrmdr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bliss-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bliss-theme";
           sha256 = "1kzvi6zymfgirr41l8r2kazfz1y4xkigbp5qa1fafcdmw81anmdh";
           name = "bliss-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/bliss-theme";
+          homepage = "https://melpa.org/#/bliss-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    blockdiag-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "blockdiag-mode";
+        version = "20160406.1301";
+        src = fetchFromGitHub {
+          owner = "xcezx";
+          repo = "blockdiag-mode";
+          rev = "1637338e962c054336d964e2667b0631bea03eee";
+          sha256 = "0gzfn775ipx1wmqi4l5yyb45a7w1hqdbdqyy06j44a2lfwq6grqw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/blockdiag-mode";
+          sha256 = "0v48w4slzx8baxrf10jrzcpqmcv9d3z2pz0xqn8czlzm2f6id3ya";
+          name = "blockdiag-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/blockdiag-mode";
           license = lib.licenses.free;
         };
       }) {};
     blog-admin = callPackage ({ ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, org, s }:
     melpaBuild {
         pname = "blog-admin";
-        version = "20160202.803";
+        version = "20160425.2149";
         src = fetchFromGitHub {
-          owner = "codefalling";
+          owner = "CodeFalling";
           repo = "blog-admin";
-          rev = "0935b0c5e7ed6c7a26a7ff16cd38a168a8fb93a3";
-          sha256 = "0zhcjg68nzqdrlnbm7akzgn4px3prrqjjym2qzfirmdbq6dxifgg";
+          rev = "3ac6c3715dbeef80c5aabdad66ac8575d1d9046a";
+          sha256 = "1fx8y1xy1azyi8cnldiqq4354mhbywbljc45ilvlx13kj0fr439j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/blog-admin";
-          sha256 = "0l2si3fyi7kz4px3m8m0i71xvlsrx0y81247j1kcl7iax53zkl8c";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/blog-admin";
+          sha256 = "03wnci5903c6jikkvlzc2vfma9h9qk673cc3wm756rx94jxinmyk";
           name = "blog-admin";
         };
         packageRequires = [ ctable f names org s ];
         meta = {
-          homepage = "http://melpa.org/#/blog-admin";
+          homepage = "https://melpa.org/#/blog-admin";
           license = lib.licenses.free;
         };
       }) {};
@@ -4576,55 +4744,55 @@
           sha256 = "1ggqg0lgvxg2adq91damvh55m36qsa23n3z6zyf5z6855ilzaa4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bm";
           sha256 = "07459r7m12j2nsb7qrb26bx32alylhaaq3z448n42lz02a8dc63g";
           name = "bm";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bm";
+          homepage = "https://melpa.org/#/bm";
           license = lib.licenses.free;
         };
       }) {};
     bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bog";
-        version = "20160124.1737";
+        version = "20160306.2305";
         src = fetchFromGitHub {
           owner = "kyleam";
           repo = "bog";
-          rev = "0ba8df3f2d31d24f86deadc4369b7330efbac8c3";
-          sha256 = "0fy2jwpgvqlff5bn0l971xxb76krm3idjqjl61qgim6a45kip057";
+          rev = "18e2da1e27c4366cf0969225984f4c8cef7db006";
+          sha256 = "04x0gw83x3y0xq2g2vkn27qmvqia04dvwq6yhjif0zz9jr2s7a10";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bog";
           sha256 = "1ci8xxca7dclmi5v37y5k45qlmzs6a9hi6m7czgiwxii902w5pkl";
           name = "bog";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/bog";
+          homepage = "https://melpa.org/#/bog";
           license = lib.licenses.free;
         };
       }) {};
-    bongo = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    bongo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bongo";
-        version = "20151205.1009";
+        version = "20160313.917";
         src = fetchFromGitHub {
           owner = "dbrock";
           repo = "bongo";
-          rev = "4cdacc10a530d4edbfdf6c95891f3cf229518e9d";
-          sha256 = "0ghjfrwc2i04rxg3nqc5fg2kgfyjlhk8n2qcz53p9i7ncc3zgpha";
+          rev = "029e02b782e25b7bfbc946956d9e99aef277cdcc";
+          sha256 = "109r51flzhva8npch6ykqkcd2j5jpffhw6ziq3rmlqb7yc04wghb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bongo";
           sha256 = "07i9gw067r2igp6s2g2iakm1ybvw04q6zznna2cfdf08nax64ghv";
           name = "bongo";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/bongo";
+          homepage = "https://melpa.org/#/bongo";
           license = lib.licenses.free;
         };
       }) {};
@@ -4639,73 +4807,73 @@
           sha256 = "06cpbjbv8ysz81szwgglgy5r1aay8rrzw5k86wyqg9jdzwpmilpn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bonjourmadame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bonjourmadame";
           sha256 = "0d36yradh37359fjk59s54hxkbh4qcc17sblj2ylcdyw7181iwfn";
           name = "bonjourmadame";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bonjourmadame";
+          homepage = "https://melpa.org/#/bonjourmadame";
           license = lib.licenses.free;
         };
       }) {};
     boogie-friends = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "boogie-friends";
-        version = "20151121.1549";
+        version = "20160423.1103";
         src = fetchFromGitHub {
           owner = "boogie-org";
           repo = "boogie-friends";
-          rev = "d7b67730e9d4ac2ad5dc886bdc27e9b441497b96";
-          sha256 = "11m0w8i2nq0nqrpg6m7vnn9sd3v1ln5b3rka7m9fnasadf77nmpv";
+          rev = "06a58186106e4dd5446daa8ed401a7caacb19ac2";
+          sha256 = "1vf05zdn9ync6p0pfg570z040lvlb5f6zm7wx2l356pvl129d67a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/boogie-friends";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/boogie-friends";
           sha256 = "0cfs7gvjxsx2027dbzh4yypz500nmk503ikiiprbww8jyvc8grk7";
           name = "boogie-friends";
         };
         packageRequires = [ cl-lib company dash flycheck yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/boogie-friends";
+          homepage = "https://melpa.org/#/boogie-friends";
           license = lib.licenses.free;
         };
       }) {};
     bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bookmark-plus";
-        version = "20151231.1419";
+        version = "20160423.1727";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/bookmark+.el";
+          url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
           sha256 = "06621js3bvslfmzmkphzzcrd8hbixin2nx30ammcqaa6572y14ad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bookmark+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bookmark+";
           sha256 = "0121xx7dp2pakk9g7sg6par4mkxd9ky746yk4wh2wrhprc9dqzni";
           name = "bookmark-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bookmark+";
+          homepage = "https://melpa.org/#/bookmark+";
           license = lib.licenses.free;
         };
       }) {};
     boon = callPackage ({ emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
     melpaBuild {
         pname = "boon";
-        version = "20160208.1544";
+        version = "20160228.1635";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "boon";
-          rev = "61ba05750964a765c4cff89ecd13092bcf420549";
-          sha256 = "061alzr4w0xxyc71ri8ramafmzj5c4iwvd3zcq6i0p67qyic4nsx";
+          rev = "4eb0305c7130a3b36af69b5ec6a30162138d2180";
+          sha256 = "0ab9wmm1i5ws77dfa6y21ds39gh28i2xw0xbqrf4mc147bsgfz4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/boon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/boon";
           sha256 = "0gryw7x97jd46jgrm93cjagj4p7w93cjc36i2ps9ajf0d8m4gajb";
           name = "boon";
         };
         packageRequires = [ emacs expand-region multiple-cursors ];
         meta = {
-          homepage = "http://melpa.org/#/boon";
+          homepage = "https://melpa.org/#/boon";
           license = lib.licenses.free;
         };
       }) {};
@@ -4720,13 +4888,13 @@
           sha256 = "0yzfxxv2bw4x320268bixfc7yf97851804bz3829vbdhnr4kp6y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/borland-blue-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/borland-blue-theme";
           sha256 = "1sc8qngm40bwdym8k1dgbahg48i73c00zxd99kqqwm9fnd6nm7qx";
           name = "borland-blue-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/borland-blue-theme";
+          homepage = "https://melpa.org/#/borland-blue-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -4741,13 +4909,13 @@
           sha256 = "1gys5ri56s2s525wdji3m72sxzswmb8cmhmw5iha84v7hlqkrahb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/boron-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/boron-theme";
           sha256 = "1rrqlq08jnh9ihb99ji1vvmamj742assnm4a7xqz6gp7f248nb81";
           name = "boron-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/boron-theme";
+          homepage = "https://melpa.org/#/boron-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -4762,13 +4930,13 @@
           sha256 = "0235l4f1cxj7nysfnay4fz52mg0c13pzqxbhw65vdpfzz1gl1p73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/boxquote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/boxquote";
           sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s";
           name = "boxquote";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/boxquote";
+          homepage = "https://melpa.org/#/boxquote";
           license = lib.licenses.free;
         };
       }) {};
@@ -4783,13 +4951,13 @@
           sha256 = "0chmarbpqingdma54d6chbr6v6jg8lapbw56cpvcpbl04fz980r0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bpe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bpe";
           sha256 = "08zfqcgs7i2ram2qpy8vrzksx5722aahr66vdi4d9bcxm03s19fm";
           name = "bpe";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/bpe";
+          homepage = "https://melpa.org/#/bpe";
           license = lib.licenses.free;
         };
       }) {};
@@ -4804,34 +4972,34 @@
           sha256 = "05x9fmxlybas3gcv3qf1vcfh5k265hjwh73232fyg2v562if748z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bpr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bpr";
           sha256 = "0rjxn40n4s4xdq51bq0w3455g9pli2pvcf1gnbr96zawbngrw6x2";
           name = "bpr";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/bpr";
+          homepage = "https://melpa.org/#/bpr";
           license = lib.licenses.free;
         };
       }) {};
     bracketed-paste = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bracketed-paste";
-        version = "20140222.2001";
+        version = "20160407.1848";
         src = fetchFromGitHub {
           owner = "hchbaw";
           repo = "bracketed-paste.el";
-          rev = "6c2aee346e2f5cdb4ed1386c3e3c853cecd72eff";
-          sha256 = "00463z740xrkr4yz46g9zxz23zy878jgvba81pnwvg4l6hd3kc8s";
+          rev = "843ce3bbb63d560face889e13a57a2f7543957d5";
+          sha256 = "1l6j2zs12psc15cfhqq6hm1bg012jr49zd2i36cmappbsiax1l8m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bracketed-paste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bracketed-paste";
           sha256 = "1v7zwi29as0218vy6ch21iqqcxfhyh373m3dbcdzm2pb8bpcg58j";
           name = "bracketed-paste";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/bracketed-paste";
+          homepage = "https://melpa.org/#/bracketed-paste";
           license = lib.licenses.free;
         };
       }) {};
@@ -4846,13 +5014,13 @@
           sha256 = "1nzgjgzidyrplfs4jl8nikd5wwvb4rmrnm51qxmw9y2if0hpq0jd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/brainfuck-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/brainfuck-mode";
           sha256 = "08jzx329mrr3c2pifs3hb4i79dsw606b0iviagaaja8s808m40cd";
           name = "brainfuck-mode";
         };
         packageRequires = [ langdoc ];
         meta = {
-          homepage = "http://melpa.org/#/brainfuck-mode";
+          homepage = "https://melpa.org/#/brainfuck-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -4867,34 +5035,34 @@
           sha256 = "0w6b9rxdciy1365kgf6fh3vgrjr8xd5ar6xcn0g4h56f2zg9hdmj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/broadcast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/broadcast";
           sha256 = "1h2c3mb49q3vlpalrsrx8q3rmy1zg0y45ayvzbvzdkfgs8idgbib";
           name = "broadcast";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/broadcast";
+          homepage = "https://melpa.org/#/broadcast";
           license = lib.licenses.free;
         };
       }) {};
     browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "browse-at-remote";
-        version = "20151226.1628";
+        version = "20160413.1921";
         src = fetchFromGitHub {
           owner = "rmuslimov";
           repo = "browse-at-remote";
-          rev = "d7e155e9ea7acfc9dadd334fe41ac57e93f38674";
-          sha256 = "0q71ah62q6acivhxzsw9j1ky54i9hhlnj97sjn8bxrxx7nw01gf7";
+          rev = "8134dffac11d750cdeb5eec1fe169c11a94aac49";
+          sha256 = "12m24n9yif9km4b2sw6am1bdfhxg05wdrq2jnp56jy1i7cgjrm1c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/browse-at-remote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/browse-at-remote";
           sha256 = "1d40b9j3pc6iy3l25062k7f52aq0vk9sizdwd7wii3v5nciczv6w";
           name = "browse-at-remote";
         };
         packageRequires = [ cl-lib f s ];
         meta = {
-          homepage = "http://melpa.org/#/browse-at-remote";
+          homepage = "https://melpa.org/#/browse-at-remote";
           license = lib.licenses.free;
         };
       }) {};
@@ -4909,13 +5077,13 @@
           sha256 = "0sndzhza9k4vcf70fzxsyzrfryaz92lm1y7bbb0dx10m65qljpbi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/browse-kill-ring";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/browse-kill-ring";
           sha256 = "1d97ap0vrg5ymp96z7y6si98fspxzy02jh1i4clvw5lggjfibhq4";
           name = "browse-kill-ring";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/browse-kill-ring";
+          homepage = "https://melpa.org/#/browse-kill-ring";
           license = lib.licenses.free;
         };
       }) {};
@@ -4924,17 +5092,17 @@
         pname = "browse-kill-ring-plus";
         version = "20151231.1421";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/browse-kill-ring+.el";
+          url = "https://www.emacswiki.org/emacs/download/browse-kill-ring+.el";
           sha256 = "1z6pix1ml3s97jh34fwjj008ihlrz4hkipdh5yzcvc6nhrimjw2f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/browse-kill-ring+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/browse-kill-ring+";
           sha256 = "1flw7vmqgsjjvr2zlgz2909gvpq9mhz8qkg6hvsrzwg95f4l548w";
           name = "browse-kill-ring-plus";
         };
         packageRequires = [ browse-kill-ring ];
         meta = {
-          homepage = "http://melpa.org/#/browse-kill-ring+";
+          homepage = "https://melpa.org/#/browse-kill-ring+";
           license = lib.licenses.free;
         };
       }) {};
@@ -4949,13 +5117,13 @@
           sha256 = "1rcihwdxrzhgcz573rh1yp3770ihkwqjqvd39yhic1d3sgwxz2hy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/browse-url-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/browse-url-dwim";
           sha256 = "13bv2ka5pp9k4kwrxfqfawwxzsqlakvpi9a32gxgx7qfi0dcb1rf";
           name = "browse-url-dwim";
         };
         packageRequires = [ string-utils ];
         meta = {
-          homepage = "http://melpa.org/#/browse-url-dwim";
+          homepage = "https://melpa.org/#/browse-url-dwim";
           license = lib.licenses.free;
         };
       }) {};
@@ -4963,17 +5131,17 @@
         pname = "bs-ext";
         version = "20130824.659";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/bs-ext.el";
+          url = "https://www.emacswiki.org/emacs/download/bs-ext.el";
           sha256 = "1yslzlx54n17330sf6b2pynz01y6ifnkhipz4hggn1i55bz8hvrw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bs-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bs-ext";
           sha256 = "0dddligqr71qdakgfkx0r45k9py85qlym7y5f204bxppyw5jmwb6";
           name = "bs-ext";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bs-ext";
+          homepage = "https://melpa.org/#/bs-ext";
           license = lib.licenses.free;
         };
       }) {};
@@ -4988,13 +5156,13 @@
           sha256 = "022j0gw5qkxjz8f70vqjxysifv2mz6cigf9n5z03zmpvwwvxmx2z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/btc-ticker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/btc-ticker";
           sha256 = "1vfnx114bvnly1k3fmcpkqq4m9558wqr5c9k9yj8f046dgfh8dp1";
           name = "btc-ticker";
         };
         packageRequires = [ json request ];
         meta = {
-          homepage = "http://melpa.org/#/btc-ticker";
+          homepage = "https://melpa.org/#/btc-ticker";
           license = lib.licenses.free;
         };
       }) {};
@@ -5009,13 +5177,13 @@
           sha256 = "1qgasaqhqm0birjmb6k6isd2f5pn58hva8db8qfhva9g5kg1f38w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bts";
           sha256 = "1i1lbjracrgdxr52agxhxxgkra4w291dmz85s195lcx38rva7ib3";
           name = "bts";
         };
         packageRequires = [ dash log4e pos-tip s widget-mvc yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/bts";
+          homepage = "https://melpa.org/#/bts";
           license = lib.licenses.free;
         };
       }) {};
@@ -5030,13 +5198,13 @@
           sha256 = "1sfr3j11jz4k9jnfa9i05bp4v5vkil38iyrgsp3kxf15797b9dg9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bts-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bts-github";
           sha256 = "03lz12bbkjqbs82alc97k6s1pmk721qip3h9cifq8a5ww5cbq9ln";
           name = "bts-github";
         };
         packageRequires = [ bts gh ];
         meta = {
-          homepage = "http://melpa.org/#/bts-github";
+          homepage = "https://melpa.org/#/bts-github";
           license = lib.licenses.free;
         };
       }) {};
@@ -5051,13 +5219,13 @@
           sha256 = "1aha8rzilv4k300rr4l9qjfygydfwllkbw17lhm8jz0kh9w6bd28";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bubbleberry-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bubbleberry-theme";
           sha256 = "056pcr9ynsl34wqa2pw6sh4bdl5kpp1r0pl1vvw15p4866l9bdz3";
           name = "bubbleberry-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/bubbleberry-theme";
+          homepage = "https://melpa.org/#/bubbleberry-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -5072,13 +5240,13 @@
           sha256 = "1p5a29bpjqr1gs6sb6rr7y0j06nlva23wxkwfskap25zvjpgwbvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buffer-buttons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/buffer-buttons";
           sha256 = "1p0ydbrff9197sann3s0d7hpav7r9g461w4llncafmy31w7m1dn6";
           name = "buffer-buttons";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/buffer-buttons";
+          homepage = "https://melpa.org/#/buffer-buttons";
           license = lib.licenses.free;
         };
       }) {};
@@ -5093,13 +5261,13 @@
           sha256 = "0s43cvkr1za5sd2cvl55ig34wbp8xyjf85snmf67ps04swyyk92q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buffer-flip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/buffer-flip";
           sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098";
           name = "buffer-flip";
         };
         packageRequires = [ key-chord ];
         meta = {
-          homepage = "http://melpa.org/#/buffer-flip";
+          homepage = "https://melpa.org/#/buffer-flip";
           license = lib.licenses.free;
         };
       }) {};
@@ -5114,13 +5282,13 @@
           sha256 = "1yzga2zs9flbarsh704hh7k4l3w09g4li9a7r3fsvl4kll80x393";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buffer-move";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/buffer-move";
           sha256 = "0wysywff2bggrha7lpl83c8x6ln7zgdj9gsqmjva6gramqb260fg";
           name = "buffer-move";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/buffer-move";
+          homepage = "https://melpa.org/#/buffer-move";
           license = lib.licenses.free;
         };
       }) {};
@@ -5128,17 +5296,17 @@
         pname = "buffer-stack";
         version = "20101223.420";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/buffer-stack.el";
+          url = "https://www.emacswiki.org/emacs/download/buffer-stack.el";
           sha256 = "0d87cl7a4rcd6plbjyf26vaar7imwd18z24xdi4dz734m9zbkg6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buffer-stack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/buffer-stack";
           sha256 = "00vxfd4ki5pqf9n9vbmn1441vn2y14bdr1v05h46hswf13b4hzrn";
           name = "buffer-stack";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/buffer-stack";
+          homepage = "https://melpa.org/#/buffer-stack";
           license = lib.licenses.free;
         };
       }) {};
@@ -5153,13 +5321,13 @@
           sha256 = "1mnf0dgr6g58k0jyia7985jsinrla04vm5sjl2iajwphbhadjk8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buffer-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/buffer-utils";
           sha256 = "0cfipdn4fc4fvz513mwiaihvbdi05mza3z5z1379wlljw6r539z2";
           name = "buffer-utils";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/buffer-utils";
+          homepage = "https://melpa.org/#/buffer-utils";
           license = lib.licenses.free;
         };
       }) {};
@@ -5174,13 +5342,13 @@
           sha256 = "1plh77xzpbhgmjdagm5rhqx6nkhc0g39ir0b6s5yh003wmx6r1hh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bufshow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bufshow";
           sha256 = "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h";
           name = "bufshow";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/bufshow";
+          homepage = "https://melpa.org/#/bufshow";
           license = lib.licenses.free;
         };
       }) {};
@@ -5195,13 +5363,13 @@
           sha256 = "0zr1raf0q5wi3vr66kglxcfxswlm8g2l501adm8c27clvqizpnrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bug-reference-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bug-reference-github";
           sha256 = "18yzxwanbrxsab6ba75z1196x0m6dapdhbvy6df5b5x5viz99cf6";
           name = "bug-reference-github";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bug-reference-github";
+          homepage = "https://melpa.org/#/bug-reference-github";
           license = lib.licenses.free;
         };
       }) {};
@@ -5216,13 +5384,13 @@
           sha256 = "0gr4v6fmg0im17f6i3pw6h8l401n5l5lzxz0hgi8lrisvx73iqa5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bundler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bundler";
           sha256 = "0i5ybc6i8ackxpaa75kwrg44zdq3jkvy48c42vaaafpddjwjnsy4";
           name = "bundler";
         };
         packageRequires = [ cl-lib inf-ruby ];
         meta = {
-          homepage = "http://melpa.org/#/bundler";
+          homepage = "https://melpa.org/#/bundler";
           license = lib.licenses.free;
         };
       }) {};
@@ -5233,17 +5401,17 @@
         src = fetchFromGitHub {
           owner = "EricCrosson";
           repo = "bury-successful-compilation";
-          rev = "0c05c006ab5d0a7262701d003aed5cf5fc9dd621";
-          sha256 = "1bzilpjibyyj97z5j7zz89jx0kfqr842lrjlnq1qki8r5kj18p4j";
+          rev = "565a6f9cad7f7d5ef161eb9c7f2305bae9971c02";
+          sha256 = "0mirb3yvs4aq6n53lx690k06zllyzr29ms0888v5svjirxjazvh8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bury-successful-compilation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bury-successful-compilation";
           sha256 = "1gkq4r1573m6m57fp7x69k7kcpqchpcqfcz3792v0wxr22zhkwr3";
           name = "bury-successful-compilation";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bury-successful-compilation";
+          homepage = "https://melpa.org/#/bury-successful-compilation";
           license = lib.licenses.free;
         };
       }) {};
@@ -5258,13 +5426,13 @@
           sha256 = "1viq7cb41r8klr8i38c5zjrhdnww31gh4j51xdgy4v2lc3z321zi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buster-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/buster-mode";
           sha256 = "1qndhchc8y27x49znhnc4rny1ynfcplr64rczrlbj53qmkxn5am7";
           name = "buster-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/buster-mode";
+          homepage = "https://melpa.org/#/buster-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -5279,13 +5447,13 @@
           sha256 = "11djqlw4qf3qs2rwiz7dn5q2zw5i8sykwdf4hg4awsgv8g0bbxn6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buster-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/buster-snippets";
           sha256 = "0k36c2k7wwix10rgmjxipc77fkn9jahjyvl191af6w41wla47x4x";
           name = "buster-snippets";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/buster-snippets";
+          homepage = "https://melpa.org/#/buster-snippets";
           license = lib.licenses.free;
         };
       }) {};
@@ -5300,13 +5468,13 @@
           sha256 = "11z987frzswnsym8g3l0s9wwdly1zn5inl2l558m6kcvfy7g59cx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/busybee-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/busybee-theme";
           sha256 = "0w0z5x2fbnalv404av3mapfkqbfgyk81a1mzvngll8x0pirbyi10";
           name = "busybee-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/busybee-theme";
+          homepage = "https://melpa.org/#/busybee-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -5321,34 +5489,34 @@
           sha256 = "0pp604r2gzzdpfajw920607pklwflk842difdyl4hy9w87fgc0jg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/butler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/butler";
           sha256 = "1jv74l9jy55qpwf5np9nlj6a1wqsm3xirm7wm89d1h2mbsfcr0mq";
           name = "butler";
         };
         packageRequires = [ deferred emacs json ];
         meta = {
-          homepage = "http://melpa.org/#/butler";
+          homepage = "https://melpa.org/#/butler";
           license = lib.licenses.free;
         };
       }) {};
     buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buttercup";
-        version = "20160217.1542";
+        version = "20160410.658";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "emacs-buttercup";
-          rev = "2aa840cb0e99251d299507859e98eb7341758fc9";
-          sha256 = "0lskdb1bxgnpamxvg5c5kdqafp0k770zy3ic38945nb6bnd1bimv";
+          rev = "06c9699d6a1af54c08a4a164b40b87ba4a873f31";
+          sha256 = "06zpygv1dgb4bijv7ybgmc2wb2mclh3sszvsi7j7z9rf5hyd8hi2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buttercup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/buttercup";
           sha256 = "1grrrdk5pl9l1jvnwzl8g0102gipvxb5qn6k2nmv28jpl57v8dkb";
           name = "buttercup";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/buttercup";
+          homepage = "https://melpa.org/#/buttercup";
           license = lib.licenses.free;
         };
       }) {};
@@ -5363,13 +5531,13 @@
           sha256 = "06qjvybf65ffrcnhhbqs333lg51fawaxnva3jvdg7zbrsv4m9acl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/button-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/button-lock";
           sha256 = "1arrdmb3nm570hgs18y9sz3z9v0wlkr3vwa2zgfnc15lmf0y34mp";
           name = "button-lock";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/button-lock";
+          homepage = "https://melpa.org/#/button-lock";
           license = lib.licenses.free;
         };
       }) {};
@@ -5384,13 +5552,13 @@
           sha256 = "040mcq2cwzbrf96f9mghb4314cd8xwp7ki2ix9fxpmbwiy323ld5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/c-c-combo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/c-c-combo";
           sha256 = "09rvh6n2hqls7qki5dc34s2hmcmlvdsbgzcxgglhcmrhwx5w4vxn";
           name = "c-c-combo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/c-c-combo";
+          homepage = "https://melpa.org/#/c-c-combo";
           license = lib.licenses.free;
         };
       }) {};
@@ -5405,13 +5573,13 @@
           sha256 = "0mlm5f66541namqn04vx6csf14mxhsiknbm36yqdnp1lxb7knv7a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/c-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/c-eldoc";
           sha256 = "13grkww14w39y2x6mrbfa9nzljsnl5l7il8dnj6sjdyv0hz9x8vm";
           name = "c-eldoc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/c-eldoc";
+          homepage = "https://melpa.org/#/c-eldoc";
           license = lib.licenses.free;
         };
       }) {};
@@ -5426,13 +5594,13 @@
           sha256 = "10k90r4ckkkdjn9pqcbfyp6ynvrd5k0ngqcn5d0v1qvkn6jifxjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/c0-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/c0-mode";
           sha256 = "0s3h4b3lpz4jsk222yyfdxh780dvykhaqgyv6r3ambz95vrmmpl4";
           name = "c0-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/c0-mode";
+          homepage = "https://melpa.org/#/c0-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -5447,13 +5615,13 @@
           sha256 = "1h395hvia7r76zlgr10qdr9q2159qyrs89znhkp2czikwm8kjiqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cabledolphin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cabledolphin";
           sha256 = "04slrx0vkcm66q59158limn0cpxn18ghlqyx7z8nrn7frrc03z03";
           name = "cabledolphin";
         };
         packageRequires = [ emacs seq ];
         meta = {
-          homepage = "http://melpa.org/#/cabledolphin";
+          homepage = "https://melpa.org/#/cabledolphin";
           license = lib.licenses.free;
         };
       }) {};
@@ -5468,13 +5636,13 @@
           sha256 = "1hp6dk84vvgkmj5lzghvqlpq3axwzgx9c7gly2yx6497fgf9jlby";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cache";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cache";
           sha256 = "0lzj0h23g6alqcmd20ack53p72g9i09dp9x0bp3rdw5izcfkvhh3";
           name = "cache";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cache";
+          homepage = "https://melpa.org/#/cache";
           license = lib.licenses.free;
         };
       }) {};
@@ -5489,13 +5657,13 @@
           sha256 = "07kzhyqr8ycjvkknijqhsfr26zd5jc8wxm9sl8bp6pzn4jbs1dmx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cacoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cacoo";
           sha256 = "0kri4vi6dpsf0zk24psm16f3aa27cq5b54ga7zygmr02csq24a6z";
           name = "cacoo";
         };
         packageRequires = [ concurrent ];
         meta = {
-          homepage = "http://melpa.org/#/cacoo";
+          homepage = "https://melpa.org/#/cacoo";
           license = lib.licenses.free;
         };
       }) {};
@@ -5510,13 +5678,13 @@
           sha256 = "0bvrwzjx93qyx97qqw0imvnkkx4w91yk99rnhcmk029zj1fy0kzg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cake";
           sha256 = "06qlqrazz2jr08g44q73hx9vpp6xnjvkpd6ky108g0xc5p9q2hcr";
           name = "cake";
         };
         packageRequires = [ anything cake-inflector historyf ];
         meta = {
-          homepage = "http://melpa.org/#/cake";
+          homepage = "https://melpa.org/#/cake";
           license = lib.licenses.free;
         };
       }) {};
@@ -5531,13 +5699,13 @@
           sha256 = "0xq10jkbk3crdhbh4lab39xhfw6vvcqz3if5q3yy4gzhx7zp94i4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cake-inflector";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cake-inflector";
           sha256 = "04mrqcm1igb638skaq2b3nr5yzxnck2vwhln61rnh7lkfxq7wbwf";
           name = "cake-inflector";
         };
         packageRequires = [ s ];
         meta = {
-          homepage = "http://melpa.org/#/cake-inflector";
+          homepage = "https://melpa.org/#/cake-inflector";
           license = lib.licenses.free;
         };
       }) {};
@@ -5552,13 +5720,13 @@
           sha256 = "15w21r0gqblbn9wlvb4wlm3706wf01r38mp465snjzi839f6sazb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cake2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cake2";
           sha256 = "03q8vqqjlhahgnyy976c46x52splwdjpmb9ngrj5c2z7d8n9145x";
           name = "cake2";
         };
         packageRequires = [ anything cake-inflector dash f historyf ht json s ];
         meta = {
-          homepage = "http://melpa.org/#/cake2";
+          homepage = "https://melpa.org/#/cake2";
           license = lib.licenses.free;
         };
       }) {};
@@ -5573,34 +5741,34 @@
           sha256 = "03hi0ggq81nm1kd0mcf8fwnya4axzd80vfdjdbhgpxbkvnxldzpv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cal-china-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cal-china-x";
           sha256 = "06mh2p14m2axci8vy1hr7jpy53jj215z0djyn8h7zpr0k62ajhka";
           name = "cal-china-x";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/cal-china-x";
+          homepage = "https://melpa.org/#/cal-china-x";
           license = lib.licenses.free;
         };
       }) {};
     calfw = callPackage ({ fetchFromGitHub, fetchurl, google-maps, lib, melpaBuild }:
     melpaBuild {
         pname = "calfw";
-        version = "20150923.2149";
+        version = "20160302.2058";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-calfw";
-          rev = "50e0e0261568f84f31fe7f87c9f863e21d30132f";
-          sha256 = "1rv6slk3a7ca2q16isjlkmgxbxmbqx4lx2ip7z33fvnq10r5h60n";
+          rev = "e03ae470788778e7714b73520014eadc03a88abd";
+          sha256 = "0rhasr818qijd2pcgifi0j3q4fkbiw2ck1nivajk7m810p53bxbj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/calfw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/calfw";
           sha256 = "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8";
           name = "calfw";
         };
         packageRequires = [ google-maps ];
         meta = {
-          homepage = "http://melpa.org/#/calfw";
+          homepage = "https://melpa.org/#/calfw";
           license = lib.licenses.free;
         };
       }) {};
@@ -5615,13 +5783,13 @@
           sha256 = "14n5rci4bkbl7037xvkd69gfxnjlgvd2j1xzciqcgz92f06ir3xi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/calfw-gcal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/calfw-gcal";
           sha256 = "182p56wiycrm2cjzmlqabksyshpk7nga68jf80vjjmaavp5xqsq8";
           name = "calfw-gcal";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/calfw-gcal";
+          homepage = "https://melpa.org/#/calfw-gcal";
           license = lib.licenses.free;
         };
       }) {};
@@ -5636,34 +5804,34 @@
           sha256 = "0n6y4z3qg04qnlsrjysf8ldxl2f2bk7n8crijydwabyy672qxd9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/calmer-forest-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/calmer-forest-theme";
           sha256 = "0riz5n8fzvxdnzgg650xqc2zwc4xvhwjlrrzls5h0pl5adaxz96p";
           name = "calmer-forest-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/calmer-forest-theme";
+          homepage = "https://melpa.org/#/calmer-forest-theme";
           license = lib.licenses.free;
         };
       }) {};
     camcorder = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
     melpaBuild {
         pname = "camcorder";
-        version = "20151208.1012";
+        version = "20160404.2334";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "camcorder.el";
-          rev = "bfef46deae617825089fb06591e5c25c82a2d4be";
-          sha256 = "1fxmk9ykvxkd0ldmldqnwdn5grzzzigla7zsw1yqqmlfwd48ggf8";
+          rev = "c96b3392c99b9f83c968bffa330ec4356c41518e";
+          sha256 = "0am8asrzjs3iwak9c86fxb4zwgx5smbb9ywp0zn4y7j37blygswj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/camcorder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/camcorder";
           sha256 = "1kbnpz3kn8ycpy8nlp8bsnnd1k1h7m02h7w5f7raw97sk4cnpvbi";
           name = "camcorder";
         };
         packageRequires = [ cl-lib emacs names ];
         meta = {
-          homepage = "http://melpa.org/#/camcorder";
+          homepage = "https://melpa.org/#/camcorder";
           license = lib.licenses.free;
         };
       }) {};
@@ -5676,13 +5844,13 @@
           sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/caml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/caml";
           sha256 = "0kxrn9s1h2l05akcdcj6fd3g6x5wbi511mf14g9glcn8azyfs698";
           name = "caml";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/caml";
+          homepage = "https://melpa.org/#/caml";
           license = lib.licenses.free;
         };
       }) {};
@@ -5697,55 +5865,55 @@
           sha256 = "08cp45snhyir5w8gyp6xws1q7c54pz06q099l0m3zmwn9277g68z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/capture";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/capture";
           sha256 = "1hxrvyq8my5886q7wj5w3mhyja7d6cf19gyclap492ci7kmrkdk2";
           name = "capture";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/capture";
+          homepage = "https://melpa.org/#/capture";
           license = lib.licenses.free;
         };
       }) {};
     cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
     melpaBuild {
         pname = "cargo";
-        version = "20160126.1538";
+        version = "20160426.309";
         src = fetchFromGitHub {
           owner = "kwrooijen";
           repo = "cargo.el";
-          rev = "dafbecb43e540d6dcd5e410becaedcf6eaf61a5d";
-          sha256 = "07szswvfzvyd9sx1r4x8hyyc3984k4qqj8m24ybnjgmiax57hgkm";
+          rev = "8540ed61bc5c8ee4b4247ee6e7f4e6884376e97a";
+          sha256 = "15arbbksq4y0h4ns8blygk512ngyxp1nfh6bq2nvhhymzg58pwpb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cargo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cargo";
           sha256 = "06zq657cxfk5l4867qqsvhskcqc9wswyl030wj27a43idj8n41jx";
           name = "cargo";
         };
         packageRequires = [ emacs rust-mode ];
         meta = {
-          homepage = "http://melpa.org/#/cargo";
+          homepage = "https://melpa.org/#/cargo";
           license = lib.licenses.free;
         };
       }) {};
     caroline-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "caroline-theme";
-        version = "20151030.1804";
+        version = "20160318.20";
         src = fetchFromGitHub {
           owner = "xjackk";
           repo = "caroline-theme";
-          rev = "742bf4ac4521ff9905294812919051cec768b1a0";
-          sha256 = "14ijcb9qp1gv8ianqm7cdvwjkgpwdaw3lz34j29c3rmg5ir26bjb";
+          rev = "222fd483db304509f9e422dc82883d808e023ceb";
+          sha256 = "055w1spba0q9rqqg4rjds0iakr9d8xg66959xahxq8268mq5446n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/caroline-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/caroline-theme";
           sha256 = "07flxggnf0lb1fnvprac1daplgx4bi5fnnkgfc58wnw805s12k32";
           name = "caroline-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/caroline-theme";
+          homepage = "https://melpa.org/#/caroline-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -5756,17 +5924,17 @@
         src = fetchFromGitHub {
           owner = "HKey";
           repo = "caseformat";
-          rev = "1cff5ee7a6938a0493a2b335628c7661c71e983d";
-          sha256 = "1nibzay3nb1n7z36w55m6kjqsj5yqj89way81f647jgbjggr6bih";
+          rev = "92a31f6a7cae0b4e2af106cd6f2b0abe6c2d8921";
+          sha256 = "1cp9i69npvyn72fqv0w8q1hlkcawkhbah4jblc341ycxwxb48mkl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/caseformat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/caseformat";
           sha256 = "1qwyr74jbx4jpfcw8sccg47q1vdg094rr06m111gsz2yaj9m0gfk";
           name = "caseformat";
         };
         packageRequires = [ cl-lib dash emacs s ];
         meta = {
-          homepage = "http://melpa.org/#/caseformat";
+          homepage = "https://melpa.org/#/caseformat";
           license = lib.licenses.free;
         };
       }) {};
@@ -5777,17 +5945,38 @@
         src = fetchFromGitHub {
           owner = "cask";
           repo = "cask";
-          rev = "acd19283ff2da1c37c30015bcd83b012b33cf3c5";
-          sha256 = "0zky8d9kdrcfh4vh8v6wbzs80nixr1xnnyjgg1zdingyklrxl79y";
+          rev = "de7814799a43640f814e8a04834e43cad8c7ba9c";
+          sha256 = "0i57pn5vdqzpsg7gqn1jsbn8hvk4dm4jqjkyd85j4gcziwpxh5kj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cask";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cask";
           sha256 = "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5";
           name = "cask";
         };
         packageRequires = [ cl-lib dash epl f package-build s shut-up ];
         meta = {
-          homepage = "http://melpa.org/#/cask";
+          homepage = "https://melpa.org/#/cask";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cask-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cask-mode";
+        version = "20160410.949";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "cask-mode";
+          rev = "c97755267b7215f02df7b0c16b4210c04aee6566";
+          sha256 = "162vvyycvv9pd93hsb8blbjqf22d40xinm5340b3vnsqgg33l4jl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cask-mode";
+          sha256 = "0fs9zyihipr3klnh3w22h43qz0wnxplm62x4kx7pm1chq9bc9kz6";
+          name = "cask-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/cask-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -5802,13 +5991,13 @@
           sha256 = "1m40s9q00l06fz525m3zrvwd6s60lggdqls5k5njkn671aa3h71s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cask-package-toolset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cask-package-toolset";
           sha256 = "13ix093c0a58rjqj7zfp3914xj3hvj276gb2d8zhvrx9vvs1345g";
           name = "cask-package-toolset";
         };
         packageRequires = [ ansi cl-lib commander dash emacs f s shut-up ];
         meta = {
-          homepage = "http://melpa.org/#/cask-package-toolset";
+          homepage = "https://melpa.org/#/cask-package-toolset";
           license = lib.licenses.free;
         };
       }) {};
@@ -5823,13 +6012,13 @@
           sha256 = "15sq5vrkhb7c5j6ny6wy4bkyl5pggch4l7zw46an29rzni3pffr3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/caskxy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/caskxy";
           sha256 = "0x4s3c8m75zxsvqpgfc5xwll0489zzdnngmnq048z9gkgcd7pd2s";
           name = "caskxy";
         };
         packageRequires = [ log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/caskxy";
+          homepage = "https://melpa.org/#/caskxy";
           license = lib.licenses.free;
         };
       }) {};
@@ -5844,13 +6033,13 @@
           sha256 = "125d5i7ycdn2hgffc1l3jqcfzvk70m1ciywj4h53qakkl15r9m38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cbm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cbm";
           sha256 = "02ch0gdw610c8dfxxjxs7ijsc9lzbhklj7hqgwfwksnyc36zcjmn";
           name = "cbm";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/cbm";
+          homepage = "https://melpa.org/#/cbm";
           license = lib.licenses.free;
         };
       }) {};
@@ -5861,17 +6050,17 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "4cb5da1418f447423cb81ca99539f77a6067ad77";
-          sha256 = "145n50vspxaslvhf3ahlp435h5slz24csa2h62zly18xprw1ai1h";
+          rev = "444991051df5d8bd2babd4249d2311dc39890e37";
+          sha256 = "1mqz83yqgad7p5ssjil10w0bw0vm642xp18ms4id8pzcbxz8ygsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ccc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ccc";
           sha256 = "0fckhmz4svcg059v4acbn13yf3ijs09fxmq1axc1b9bm3xxig2cq";
           name = "ccc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ccc";
+          homepage = "https://melpa.org/#/ccc";
           license = lib.licenses.free;
         };
       }) {};
@@ -5886,13 +6075,13 @@
           sha256 = "1a93cim1w96aaj81clhjv25r7v9bwqm9a818mn8lk4aj1bmhgc4c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cd-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cd-compile";
           sha256 = "1a24rv1jbb883vwhjkw6qxv3h3qy039iqkhkx3jkq1ydidr9f0hv";
           name = "cd-compile";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cd-compile";
+          homepage = "https://melpa.org/#/cd-compile";
           license = lib.licenses.free;
         };
       }) {};
@@ -5903,17 +6092,17 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "4cb5da1418f447423cb81ca99539f77a6067ad77";
-          sha256 = "145n50vspxaslvhf3ahlp435h5slz24csa2h62zly18xprw1ai1h";
+          rev = "444991051df5d8bd2babd4249d2311dc39890e37";
+          sha256 = "1mqz83yqgad7p5ssjil10w0bw0vm642xp18ms4id8pzcbxz8ygsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cdb";
           sha256 = "1gx34062h25gqsl3j1fjlklha19snvmfaw068q6bv6x9r92niqnf";
           name = "cdb";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cdb";
+          homepage = "https://melpa.org/#/cdb";
           license = lib.licenses.free;
         };
       }) {};
@@ -5928,13 +6117,13 @@
           sha256 = "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cdlatex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cdlatex";
           sha256 = "1jsfmzl13fykbg7l4wv9si7z11ai5lzvkndzbxh9cyqlvznq0m64";
           name = "cdlatex";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cdlatex";
+          homepage = "https://melpa.org/#/cdlatex";
           license = lib.licenses.free;
         };
       }) {};
@@ -5949,13 +6138,13 @@
           sha256 = "0aspci0zg8waa3l234l0f8fjfzm67z2gydfdwwpxksz49sm2s1jk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cdnjs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cdnjs";
           sha256 = "1clm86n643z1prxrlxlg59jg43l9wwm34x5d88bj6yvix8g6wkb7";
           name = "cdnjs";
         };
         packageRequires = [ cl-lib dash deferred f pkg-info ];
         meta = {
-          homepage = "http://melpa.org/#/cdnjs";
+          homepage = "https://melpa.org/#/cdnjs";
           license = lib.licenses.free;
         };
       }) {};
@@ -5970,13 +6159,13 @@
           sha256 = "1f8gdj3p54q3410c66716y3l7i7nnkmq6hqz0dg1a1sc6jwdij3v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cedit";
           sha256 = "169sy7a1bgczwfxkkzjiggb7vdjxhrx7i3a39g6zv9f1zs6byk6m";
           name = "cedit";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cedit";
+          homepage = "https://melpa.org/#/cedit";
           license = lib.licenses.free;
         };
       }) {};
@@ -5991,13 +6180,13 @@
           sha256 = "0974bxy85rcxia6dkfryas2g46nanjdf8fv90adbc7kyj07xsf7c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/celery";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/celery";
           sha256 = "0m3hmvp6xz2m7z1kbb0ii0j3c95zi19652gfixq5a5x23kz8y59h";
           name = "celery";
         };
         packageRequires = [ dash-functional deferred emacs s ];
         meta = {
-          homepage = "http://melpa.org/#/celery";
+          homepage = "https://melpa.org/#/celery";
           license = lib.licenses.free;
         };
       }) {};
@@ -6006,17 +6195,17 @@
         pname = "centered-cursor-mode";
         version = "20151001.834";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/centered-cursor-mode.el";
+          url = "https://www.emacswiki.org/emacs/download/centered-cursor-mode.el";
           sha256 = "15psyizjz8wf9wfxwwcdmg1bxf8jbv0qy40rskz7si7vxin8hhxl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/centered-cursor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/centered-cursor-mode";
           sha256 = "0a5mymnkwjvpra8iffxjwa5fq3kq4vc8fw7pr7gmrwq8ml7il5zl";
           name = "centered-cursor-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/centered-cursor-mode";
+          homepage = "https://melpa.org/#/centered-cursor-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -6025,19 +6214,19 @@
         pname = "centered-window-mode";
         version = "20160210.447";
         src = fetchFromGitHub {
-          owner = "ikame";
+          owner = "anler";
           repo = "centered-window-mode";
           rev = "ff2350f5258249bbc9e07ac60c76028f4ae07190";
           sha256 = "1i5ipll7jlrxqb0kcwq0rlrpfaxsyp663bwjdnhj84c50wlv052f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/centered-window-mode";
-          sha256 = "0f5qwv4f8gn5nxsqn57bbb3y0w5whjvhv3pls88d5n68lkd1k4si";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/centered-window-mode";
+          sha256 = "08pmk3rqgbk5fzhxx1kd8rp2k5r5vd2jc9k2phrqg75pf89h3zf4";
           name = "centered-window-mode";
         };
         packageRequires = [ s ];
         meta = {
-          homepage = "http://melpa.org/#/centered-window-mode";
+          homepage = "https://melpa.org/#/centered-window-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -6052,13 +6241,13 @@
           sha256 = "0zqrpaq9c3lm12jxnvysh8f3m3193k22zaj0ycscdqd1jpq4wcgh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/centimacro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/centimacro";
           sha256 = "1qbyfi6s4hdp5sv394w3sib8g2kx06i06q8gh6hdv5pis5kq9fx6";
           name = "centimacro";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/centimacro";
+          homepage = "https://melpa.org/#/centimacro";
           license = lib.licenses.free;
         };
       }) {};
@@ -6073,13 +6262,13 @@
           sha256 = "17jg5d5afh9zpnjx8wkys8bjllxq99j0yhz8j3fvkskisvhkz1im";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cerbere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cerbere";
           sha256 = "1g3svmh5dlh5mvyag3hmiy90dfkk6f7ppd9qpwckxqyll9vl7r06";
           name = "cerbere";
         };
         packageRequires = [ f pkg-info s ];
         meta = {
-          homepage = "http://melpa.org/#/cerbere";
+          homepage = "https://melpa.org/#/cerbere";
           license = lib.licenses.free;
         };
       }) {};
@@ -6090,17 +6279,17 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "5f96d077e8eec87b0e718ee200d29ea50f404936";
-          sha256 = "1yl5j5zshgwidvvpdqqjnzndvpw11b30q340db57ywh6vlgkgl88";
+          rev = "e2d729f9861671b3e143e27bc90b88593a4e7556";
+          sha256 = "10yrq2f1qs72b1qmlyhl32hd4f36r9nhfih5bwjkrf6w481yq9q3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cfengine-code-style";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cfengine-code-style";
           sha256 = "1ny8xvdnz740qmw9m81xnwd0gh0a516arpvl3nfimglaai5bfc9a";
           name = "cfengine-code-style";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cfengine-code-style";
+          homepage = "https://melpa.org/#/cfengine-code-style";
           license = lib.licenses.free;
         };
       }) {};
@@ -6115,32 +6304,32 @@
           sha256 = "019vqjmq6hb2f5lddqy0ya5q0fd47xix29cashlchz0r034rc32r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cff";
           sha256 = "04b2ck1jkhsrka6dbyn6rpsmmc2bn13kpyhzibd781hj73d93jgc";
           name = "cff";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/cff";
+          homepage = "https://melpa.org/#/cff";
           license = lib.licenses.free;
         };
       }) {};
     cg = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "cg";
-        version = "20150819.604";
+        version = "20160414.909";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "11350";
-          sha256 = "1v8wgm3cvz4xx2jlx95ipd9340mxfxgk5hqialp76y74x03vfzq1";
+          rev = "11487";
+          sha256 = "1ninfjra12s9agrzb115wrcphkb38flacnjgw1czw6sdqjjxcnp4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cg";
           sha256 = "0ra6mxf8l9fjn1vszjj71fs6f6l08hwypka8zsb3si96fzb6sgjh";
           name = "cg";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cg";
+          homepage = "https://melpa.org/#/cg";
           license = lib.licenses.free;
         };
       }) {};
@@ -6155,13 +6344,13 @@
           sha256 = "1m9sq93bwajbld3lnlzkjbsby5zlm9sxjzqynryyvsb9zr1d0a9z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/change-inner";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/change-inner";
           sha256 = "0r693056wykg4bs7inbfzfniyawmb91igk6kjjpq3njk0v84y1sj";
           name = "change-inner";
         };
         packageRequires = [ expand-region ];
         meta = {
-          homepage = "http://melpa.org/#/change-inner";
+          homepage = "https://melpa.org/#/change-inner";
           license = lib.licenses.free;
         };
       }) {};
@@ -6176,13 +6365,13 @@
           sha256 = "0d2zac02zqf3al4x412cnz3hr57j3xpc34i30z1q6g429v4krkam";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chapel-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/chapel-mode";
           sha256 = "0hmnsv8xf85fc4jqkaqz5j3sf56hgib4jp530vvyc2dl2sps6vzz";
           name = "chapel-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/chapel-mode";
+          homepage = "https://melpa.org/#/chapel-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -6197,53 +6386,53 @@
           sha256 = "0jq5xicf0y7z1v68cgsg9vniw6pa793izz350a4wgdq8f5fcm24f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/char-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/char-menu";
           sha256 = "11jkwghrmmvpv7piznkpa0wilwjdsps9rix3950pfabhlllw268l";
           name = "char-menu";
         };
         packageRequires = [ avy-menu emacs ];
         meta = {
-          homepage = "http://melpa.org/#/char-menu";
+          homepage = "https://melpa.org/#/char-menu";
           license = lib.licenses.free;
         };
       }) {};
     character-fold-plus = callPackage ({ fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "character-fold-plus";
-        version = "20151231.1429";
+        version = "20160227.1703";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/character-fold+.el";
-          sha256 = "00b0jv58wkvhahfnqwbfawz1z3nbm6d8s8cq0nn631w4m509kgq0";
+          url = "https://www.emacswiki.org/emacs/download/character-fold+.el";
+          sha256 = "0xvgxjyl6s6hds7m9brzly6vxj06m47hxkw5h2riscq6l4nwc9vz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/character-fold+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/character-fold+";
           sha256 = "01ibdwd7vap9m64w0bhyknxa3iank3wfss49gsgg4xbbxibyrjh3";
           name = "character-fold-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/character-fold+";
+          homepage = "https://melpa.org/#/character-fold+";
           license = lib.licenses.free;
         };
       }) {};
     charmap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "charmap";
-        version = "20160124.722";
+        version = "20160309.346";
         src = fetchFromGitHub {
           owner = "lateau";
           repo = "charmap";
-          rev = "3302ee8a94a04fa9b14dbe7163b0d62f31de69a2";
-          sha256 = "0zf9i7ajjm639hw34iqwjvni6gn0smzi79582d5l36jvr0z4gnkq";
+          rev = "e0477f08c56c93c420e01452bba64b0da732f309";
+          sha256 = "05k19q7iihvhi0gflmkpsg5q3ydkdlvf0xh7kjk4lx9yvi0am7m2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/charmap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/charmap";
           sha256 = "1j7762d2i17ysn9ys8j7wfv989avmax8iylml2hc26mwbpyfpm84";
           name = "charmap";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/charmap";
+          homepage = "https://melpa.org/#/charmap";
           license = lib.licenses.free;
         };
       }) {};
@@ -6258,13 +6447,13 @@
           sha256 = "1r2s3fszblk5wa6v3hnbzsri550gi5qsmp2w1spvmf1726n900cb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chatwork";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/chatwork";
           sha256 = "0p71swcpfqbx2zmp5nh57f0m30cn68g3019005wa5x4fg7dx746p";
           name = "chatwork";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/chatwork";
+          homepage = "https://melpa.org/#/chatwork";
           license = lib.licenses.free;
         };
       }) {};
@@ -6279,13 +6468,13 @@
           sha256 = "15kam5hf2f4nwp29nvxqm5bs8nyhqf5m44fdb21qljgbmjdlh38y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cheatsheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cheatsheet";
           sha256 = "11z3svlzvmhdy0pkxbx9qz9bnq056cgkbfyw9z34aq1yxazi2cpq";
           name = "cheatsheet";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/cheatsheet";
+          homepage = "https://melpa.org/#/cheatsheet";
           license = lib.licenses.free;
         };
       }) {};
@@ -6300,34 +6489,55 @@
           sha256 = "0660ix17ksxy5a5v8yqy7adr9d4bs6p1mnkc6lpyw96k4pn62h45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/checkbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/checkbox";
           sha256 = "17gw6w1m6bs3sfx8nqa8nzdq26m8w85a0fca5qw3bmd18bcmknqa";
           name = "checkbox";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/checkbox";
+          homepage = "https://melpa.org/#/checkbox";
+          license = lib.licenses.free;
+        };
+      }) {};
+    chee = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "chee";
+        version = "20160411.811";
+        src = fetchFromGitHub {
+          owner = "eikek";
+          repo = "chee";
+          rev = "29e598d2742d11f4c27a274a09e063ec7aa78f52";
+          sha256 = "1p709rds9b6pdv4nhl0i2gggp093sbk5hjbfjl0yp7b896ss9553";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/chee";
+          sha256 = "1njldlp9bnwq7izmdlz5a97kfgxxnycv43djrvx4b01j4v2yz4zv";
+          name = "chee";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "https://melpa.org/#/chee";
           license = lib.licenses.free;
         };
       }) {};
     cheerilee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xelb }:
     melpaBuild {
         pname = "cheerilee";
-        version = "20160219.1743";
+        version = "20160313.1335";
         src = fetchFromGitHub {
           owner = "Vannil";
           repo = "cheerilee.el";
-          rev = "6c1a31a03a29871df1cef43ca3a3529b8db5142e";
-          sha256 = "08jna2rpads54fp8mi47np046ap3yzgzqp0v632n8r8mcrdg02rn";
+          rev = "41bd81b5b0bb657241ceda5be6af5e07254d7376";
+          sha256 = "1jdlp5cnsiza55vx4kxacqgk7yqg9fvd9swhwdxkczadb2d5l9p1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cheerilee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cheerilee";
           sha256 = "15igjlnq35cg9nslyqa63i1inqipx3y8g7zg4r26m69k25simqrv";
           name = "cheerilee";
         };
         packageRequires = [ xelb ];
         meta = {
-          homepage = "http://melpa.org/#/cheerilee";
+          homepage = "https://melpa.org/#/cheerilee";
           license = lib.licenses.free;
         };
       }) {};
@@ -6342,13 +6552,13 @@
           sha256 = "1mnskri5r1lyzzcag60x7amn00613jyl7by7hd4sqm2a7zd4r5aa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chef-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/chef-mode";
           sha256 = "1pz82s82d4z3vkm8mpmwdxb9pd11kq09g23mg461lzqxjjw734rr";
           name = "chef-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/chef-mode";
+          homepage = "https://melpa.org/#/chef-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -6363,13 +6573,13 @@
           sha256 = "0m97xr6lddy2jdmd4bl4kbp2568p4n110yfa9k7fqc20ihq8jkyd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cherry-blossom-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cherry-blossom-theme";
           sha256 = "1i3kafj3m7iij5mr0vhg45zdnkl9pg9ndrq0b0i3k3mw7d5siq7w";
           name = "cherry-blossom-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/cherry-blossom-theme";
+          homepage = "https://melpa.org/#/cherry-blossom-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -6384,13 +6594,13 @@
           sha256 = "0j61lvr99viaharg4553whcppp7lxhimkk5lps0izz9mnd8y2wm5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chicken-scheme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/chicken-scheme";
           sha256 = "0ns49p7nsifpi7wrzr02ljrr0p6hxanrg54zaixakvjkxwcgfabr";
           name = "chicken-scheme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/chicken-scheme";
+          homepage = "https://melpa.org/#/chicken-scheme";
           license = lib.licenses.free;
         };
       }) {};
@@ -6401,59 +6611,59 @@
         src = fetchFromGitHub {
           owner = "gucong";
           repo = "emacs-chinese-conv";
-          rev = "07417e2e01e77d6f0eac69d54f7dcb41729e39c8";
-          sha256 = "1b1zarbjiz5w1aw49a153d8s2hk0jgissl39s9smknmay0hynwyk";
+          rev = "2e5ba28b24c32d8d1da81cf9877c79abbf2e9bbb";
+          sha256 = "1vfyb8gfrvfrvaaw0p7c6xji2kz6cqm6km2cmjixw0qjikxxlkv1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chinese-conv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/chinese-conv";
           sha256 = "1lqpq7pg0nqqqj29f8is6c724vl75wscmm1v08j480pfks3l8cnr";
           name = "chinese-conv";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/chinese-conv";
+          homepage = "https://melpa.org/#/chinese-conv";
           license = lib.licenses.free;
         };
       }) {};
     chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-fonts-setup";
-        version = "20160102.553";
+        version = "20160419.2359";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-fonts-setup";
-          rev = "4deafe82b792b28fb640c2bd3388ece8852cad73";
-          sha256 = "08ln66kx73019klzw0rsvlz3cs4ch8wxjfljmkyswjjd179h882c";
+          rev = "eeb0bb29539f7f65f886a7aefafb75acd4492f33";
+          sha256 = "0j0a1aqpayyxlay0mfj5gv1h27pqa3lj4z4x790y5lkgnlmwzsc0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chinese-fonts-setup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/chinese-fonts-setup";
           sha256 = "141ri6a6mnxf7fn17gw48kxk8pvl3khdxkb4pw8brxwrr9rx0xd5";
           name = "chinese-fonts-setup";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/chinese-fonts-setup";
+          homepage = "https://melpa.org/#/chinese-fonts-setup";
           license = lib.licenses.free;
         };
       }) {};
     chinese-pyim = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
     melpaBuild {
         pname = "chinese-pyim";
-        version = "20160214.2358";
+        version = "20160425.427";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim";
-          rev = "213222ce67d1a30ef53d22b632c0a35cf44b5d49";
-          sha256 = "0k7na7wlpq5fagr10f8ryn2vwf0d1ymakhyfal4gbrhrbwz595zk";
+          rev = "3ace78589370536f526d944437dbaa5c7f101587";
+          sha256 = "1s9gcfxsbbwdck42gc9syscnrc8mjsx159pgfxcw7bpcbhknclkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chinese-pyim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/chinese-pyim";
           sha256 = "0zdx5zhgj1ly89pl48vigjzd8g74fxnxcd9bxrqykcn7y5qvim8l";
           name = "chinese-pyim";
         };
         packageRequires = [ cl-lib popup pos-tip ];
         meta = {
-          homepage = "http://melpa.org/#/chinese-pyim";
+          homepage = "https://melpa.org/#/chinese-pyim";
           license = lib.licenses.free;
         };
       }) {};
@@ -6468,13 +6678,13 @@
           sha256 = "06k13wk659qw40aczq3i9gj0nyz6vb9z1nwsz7c1bgjbl2lh6hcv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chinese-remote-input";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/chinese-remote-input";
           sha256 = "0nnccm6w9i0qsgiif22hi1asr0xqdivk8fgg76mp26a2fv8d3dag";
           name = "chinese-remote-input";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/chinese-remote-input";
+          homepage = "https://melpa.org/#/chinese-remote-input";
           license = lib.licenses.free;
         };
       }) {};
@@ -6489,13 +6699,13 @@
           sha256 = "0cx1g6drkr8gyqqdxjf7j4wprxcbq30gam2racgnvdicgij0apwg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chinese-wbim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/chinese-wbim";
           sha256 = "1pax3kpmvg170mpvfrjbpj9czq0xykmfbany2f7vbn96jb5xfmsb";
           name = "chinese-wbim";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/chinese-wbim";
+          homepage = "https://melpa.org/#/chinese-wbim";
           license = lib.licenses.free;
         };
       }) {};
@@ -6510,13 +6720,13 @@
           sha256 = "1jsy43avingxxccs0zw2qm5ysx8g76xhhh1mnyypxskl9m60qb4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chinese-word-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/chinese-word-at-point";
           sha256 = "0pjs4ckncv84qrdj0pyibrbiy86f1gmjla9n2cgh10xbc7j9y0c4";
           name = "chinese-word-at-point";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/chinese-word-at-point";
+          homepage = "https://melpa.org/#/chinese-word-at-point";
           license = lib.licenses.free;
         };
       }) {};
@@ -6531,13 +6741,13 @@
           sha256 = "14yzmyzkf846yjrwnqrbzmvyhfav39qa5fr8jnb7lyz8rm7y9pnq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chinese-yasdcv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/chinese-yasdcv";
           sha256 = "1y2qywldf8b8b0km1lcf74p0w6rd8gr86qcj7ikwhhbvd19dfglm";
           name = "chinese-yasdcv";
         };
         packageRequires = [ chinese-pyim cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/chinese-yasdcv";
+          homepage = "https://melpa.org/#/chinese-yasdcv";
           license = lib.licenses.free;
         };
       }) {};
@@ -6545,17 +6755,17 @@
         pname = "chm-view";
         version = "20110616.1219";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/chm-view.el";
+          url = "https://www.emacswiki.org/emacs/download/chm-view.el";
           sha256 = "1r274pf0xrcdml4sy2nhhp3v5pr3y3s4lvk45hd3pmw1i4pw2fd8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chm-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/chm-view";
           sha256 = "1acz0fvl3inn7g4himq680yf64bgm7n61hsv2zpm1k6smrdl78nz";
           name = "chm-view";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/chm-view";
+          homepage = "https://melpa.org/#/chm-view";
           license = lib.licenses.free;
         };
       }) {};
@@ -6570,13 +6780,13 @@
           sha256 = "1mqdz3rvx0jm80fgzw3s3lqn448kqrlrifdwcg36cqq4qmkpalq4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chronos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/chronos";
           sha256 = "1fwpll0mk6pc37qagbq3b3z32d2qwz993nxp9pjw4qbmlnq6sy9d";
           name = "chronos";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/chronos";
+          homepage = "https://melpa.org/#/chronos";
           license = lib.licenses.free;
         };
       }) {};
@@ -6591,34 +6801,34 @@
           sha256 = "0gx0bd7j71rlniq64vw8k59yzl070mdia05ry18br8kpsbk3bhrl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/chruby";
           sha256 = "0pk6vdvmifiq52n452lbrkklxa69c40bfyzra9qhrghxr2q5v3mk";
           name = "chruby";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/chruby";
+          homepage = "https://melpa.org/#/chruby";
           license = lib.licenses.free;
         };
       }) {};
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20160218.447";
+        version = "20160426.28";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "212023a86fbb76f37202a8b62acacc98edddceaf";
-          sha256 = "137h2s1nl10h60j8papm6rairs1yxln3ihbfvwyh9xf27mnndmzg";
+          rev = "8068a65138e0f0851f58a5f78a5409d45f3dcc94";
+          sha256 = "1zm12c5qsmlhmhjhv4fmv6h0l7d3av53gl6kjj1qnwkhgsym2548";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cider";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cider";
           sha256 = "1a6hb728a3ir18c2dn9zfd3jn79fi5xjn5gqr7ljy6qb063xd4qx";
           name = "cider";
         };
         packageRequires = [ clojure-mode emacs pkg-info queue seq spinner ];
         meta = {
-          homepage = "http://melpa.org/#/cider";
+          homepage = "https://melpa.org/#/cider";
           license = lib.licenses.free;
         };
       }) {};
@@ -6633,34 +6843,34 @@
           sha256 = "1w4y65s3m2irga4iqfqqkcmvl6ss24zmaxqzbfib8jmi84r4lpac";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cider-decompile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cider-decompile";
           sha256 = "0jhsm31zcfwkbpsdh1lvmjm1fv2m7y849930sjvf5nxv3ffhx3b4";
           name = "cider-decompile";
         };
         packageRequires = [ cider javap-mode ];
         meta = {
-          homepage = "http://melpa.org/#/cider-decompile";
+          homepage = "https://melpa.org/#/cider-decompile";
           license = lib.licenses.free;
         };
       }) {};
     cider-eval-sexp-fu = callPackage ({ emacs, eval-sexp-fu, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }:
     melpaBuild {
         pname = "cider-eval-sexp-fu";
-        version = "20150320.2215";
+        version = "20160412.128";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider-eval-sexp-fu";
-          rev = "7c54327e6ff8914c7dbc9f8de289e1b255d01fbc";
-          sha256 = "1gpklkrw6iishfb3yilnqysh6zij67l1sl3ixq1bi3f6r237v1pg";
+          rev = "63b849b8f996032f662364c451c8e950ce94c8d9";
+          sha256 = "0g8yzfpaz1glxd0dxrd19bvk469pdjkr4b11xifcvamxa2slryij";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cider-eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cider-eval-sexp-fu";
           sha256 = "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq";
           name = "cider-eval-sexp-fu";
         };
         packageRequires = [ emacs eval-sexp-fu highlight ];
         meta = {
-          homepage = "http://melpa.org/#/cider-eval-sexp-fu";
+          homepage = "https://melpa.org/#/cider-eval-sexp-fu";
           license = lib.licenses.free;
         };
       }) {};
@@ -6675,34 +6885,34 @@
           sha256 = "0lgq4p7rs4prqfqd83v1l36xxacrd65jsfzbp7q62b2pjqikpgk0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cider-profile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cider-profile";
           sha256 = "14jc98h4r9rb7pxfb60ps4ss8p0bm66wdl6n8z1357hk93h9kmfs";
           name = "cider-profile";
         };
         packageRequires = [ cider ];
         meta = {
-          homepage = "http://melpa.org/#/cider-profile";
+          homepage = "https://melpa.org/#/cider-profile";
           license = lib.licenses.free;
         };
       }) {};
-    cider-spy = callPackage ({ cider, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    cider-spy = callPackage ({ cider, cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, noflet }:
     melpaBuild {
         pname = "cider-spy";
-        version = "20160219.401";
+        version = "20160313.940";
         src = fetchFromGitHub {
           owner = "jonpither";
           repo = "cider-spy";
-          rev = "db4372880e65b1ab1cfe61f0e1b960a8c954c8d0";
-          sha256 = "1jk180l1n3w2k32v9mw7iwr9q7xs3cc65420g1jlks5m7yzb5z55";
+          rev = "0224608d240e9900e588b6df049c2a87c24fc936";
+          sha256 = "1x96f5wc916dcwb75a34b6x1mas20gdgy34c7rg59n91ydn1mfaf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cider-spy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cider-spy";
           sha256 = "0478jlg76h0mrjwk2b1kdj16s1q1b03b7ygacai45jh89bc025fh";
           name = "cider-spy";
         };
-        packageRequires = [ cider cl-lib dash ];
+        packageRequires = [ cider cl-lib dash emacs noflet ];
         meta = {
-          homepage = "http://melpa.org/#/cider-spy";
+          homepage = "https://melpa.org/#/cider-spy";
           license = lib.licenses.free;
         };
       }) {};
@@ -6717,13 +6927,13 @@
           sha256 = "1w0ya0446rqsg1j59fd1mp4wavv2f3h1k3mw9svm5glymdirw4d1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cil-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cil-mode";
           sha256 = "1h18r086bqspyn5n252yzw8x2zgyaqzdd8pbcf5gqlh1w8kapq4y";
           name = "cil-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cil-mode";
+          homepage = "https://melpa.org/#/cil-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -6738,34 +6948,55 @@
           sha256 = "190n4kdcqdwglhnawnj9mqjarmcaqylxipc07whmrii0jv279kjw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cinspect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cinspect";
           sha256 = "0djh61mrfgcm3767ll1l5apw6646j4fdcaripksrmvn5aqfn8rjj";
           name = "cinspect";
         };
         packageRequires = [ cl-lib deferred emacs python-environment ];
         meta = {
-          homepage = "http://melpa.org/#/cinspect";
+          homepage = "https://melpa.org/#/cinspect";
           license = lib.licenses.free;
         };
       }) {};
     circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "circe";
-        version = "20160207.435";
+        version = "20160422.1336";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "ca3e957f41e47afa05f73962c1ad72f401666384";
-          sha256 = "0gwkm8c9g501g80rvqlzmn24q4ylkb94bklsf173yiinqmz1jhkc";
+          rev = "fed52c2b4b49f75aec3e3238ceacf44ef0c75b5c";
+          sha256 = "1wh3kwya2hpmaaj0c18g2las7jq0vkkik4n0q6whpch3r7ak6k8m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/circe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/circe";
           sha256 = "1f54d8490gfx0r0cdvgmcjdxqpni43msy0k2mgqd1qz88a4b5l07";
           name = "circe";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/circe";
+          homepage = "https://melpa.org/#/circe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cl-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cl-format";
+        version = "20160412.1945";
+        src = fetchFromGitHub {
+          owner = "alvinfrancis";
+          repo = "cl-format";
+          rev = "4380cb8009c47cc6d9098b383082b93b1aefa460";
+          sha256 = "108s96viral3s62a77jfgvjam08hdk97frfmxjg3xpp2ifccjs7h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cl-format";
+          sha256 = "1259ykj6z6m6gaqhkmj5f3q9vyk7idpvlvlma5likpknxj5f444v";
+          name = "cl-format";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/cl-format";
           license = lib.licenses.free;
         };
       }) {};
@@ -6780,13 +7011,13 @@
           sha256 = "1mc8kayw8fmvpl0z09v6i68s2lharlwpzff0cvcsfn0an2imj2d0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cl-lib-highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cl-lib-highlight";
           sha256 = "13qdrvpxq928p27b1xdcbsscyhqk042rwfa17037gp9h02fd42j8";
           name = "cl-lib-highlight";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/cl-lib-highlight";
+          homepage = "https://melpa.org/#/cl-lib-highlight";
           license = lib.licenses.free;
         };
       }) {};
@@ -6796,17 +7027,17 @@
         version = "20151116.638";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "261504";
-          sha256 = "180s33f8ngcc432x7639vxwchgvd5nwy4irby8ldzckdf5a4gd4h";
+          rev = "267566";
+          sha256 = "1miz9ycxk0vvvnfi0hn0jl3sipvsyibc7j4cf59l4drz34zi8y5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clang-format";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clang-format";
           sha256 = "19qaihb0lqnym2in4465lv8scw6qba6fdn8rcbkpsq09hpzikbah";
           name = "clang-format";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/clang-format";
+          homepage = "https://melpa.org/#/clang-format";
           license = lib.licenses.free;
         };
       }) {};
@@ -6821,34 +7052,55 @@
           sha256 = "1h6k6kzim1zb87y1kzpqjzk3ip9bmfxyg54kdh2sfp4xy0g5h3p0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clean-aindent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clean-aindent-mode";
           sha256 = "1whzbs2gg2ar24kw29ffv94dgvrlfy2v4zdn0g7ksjjmmdr8ahh4";
           name = "clean-aindent-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/clean-aindent-mode";
+          homepage = "https://melpa.org/#/clean-aindent-mode";
           license = lib.licenses.free;
         };
       }) {};
     clean-buffers = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clean-buffers";
-        version = "20151226.922";
+        version = "20160426.718";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "clean-buffers";
-          rev = "f9fdc31746e0b31661af53b63f68d436d0c6bec4";
-          sha256 = "03dbxg51zs4wbfwjv1qxlm5w06j89mvniisnyyahjkvpiqrp96yd";
+          rev = "fa1abbd49ee4c2b126cd7e2a7520633b34376db6";
+          sha256 = "1gkxmsjabnr9g36srxihs1d5n7p8ckqcmzcgpgsbp6s1990gzcig";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clean-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clean-buffers";
           sha256 = "025sxrqxm24yg1wpfncrjw1nm91h0h7jy2xd5g20xqlinqqvdihj";
           name = "clean-buffers";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/clean-buffers";
+          homepage = "https://melpa.org/#/clean-buffers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clear-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "clear-text";
+        version = "20160406.1543";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "clear-text.el";
+          rev = "b50669b6077d6948f72cb3c649281d206e0c2f2b";
+          sha256 = "0y5z2pfhzpv67w2lnw1q06mflww90sfcilj89kqx2jhhrnrnn2ka";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clear-text";
+          sha256 = "1cx2lbcbhd024pq9njan7xrlvj3k4c3wdsvgbz5qyna0k06ix8dv";
+          name = "clear-text";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/clear-text";
           license = lib.licenses.free;
         };
       }) {};
@@ -6863,34 +7115,34 @@
           sha256 = "19q6zbnl9fg4cwgi56d7p4qp6y3g0fdyihinpakby49xv2n2k8dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clevercss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clevercss";
           sha256 = "189f2l4za1j9ds0bhxrzyp7da9p6svh5dx2vnzf4vql7qhjk3gf0";
           name = "clevercss";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/clevercss";
+          homepage = "https://melpa.org/#/clevercss";
           license = lib.licenses.free;
         };
       }) {};
     click-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "click-mode";
-        version = "20160219.2013";
+        version = "20160331.1648";
         src = fetchFromGitHub {
           owner = "bmalehorn";
           repo = "click-mode";
-          rev = "4e39ef28e65124671f53fb5eaef8c7b87c4deab8";
-          sha256 = "1n8114h0azjyavq4bzny2nasl4wsz8k7li002gqjvi0snw16yypn";
+          rev = "10b129740907155fd8290f24efe0f374358a02f3";
+          sha256 = "0hbdk1xdh753g59dgyqjj6wgjkf3crsd6pzaq7p5ifbfhrph0qjl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/click-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/click-mode";
           sha256 = "1p5dz4a74w5zxdlw17h5z9dglapia4p29880liw3bif2c7dzkg0r";
           name = "click-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/click-mode";
+          homepage = "https://melpa.org/#/click-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -6905,13 +7157,13 @@
           sha256 = "07q8naxhag2q0m5cb9c2n5js6j5qdrjyyiqbcpxmq598b8mw8kzd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cliphist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cliphist";
           sha256 = "0mg6pznijba3kvp3r57pi54v6mgih2vfwj2kg6qmcy1abrc0xq29";
           name = "cliphist";
         };
         packageRequires = [ popup ];
         meta = {
-          homepage = "http://melpa.org/#/cliphist";
+          homepage = "https://melpa.org/#/cliphist";
           license = lib.licenses.free;
         };
       }) {};
@@ -6926,13 +7178,13 @@
           sha256 = "07a55q97j2vsqpha0akri2kq90v1l97mc1mgr97pq39gc1bbc5d3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clipmon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clipmon";
           sha256 = "1gvy1722px4fh88jyb8xx7k1dgyjgq7zjadr5fghdir42l0byw7i";
           name = "clipmon";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/clipmon";
+          homepage = "https://melpa.org/#/clipmon";
           license = lib.licenses.free;
         };
       }) {};
@@ -6947,13 +7199,13 @@
           sha256 = "0msmigzip7hpjxwkz0khhlc2lj9wgb2919i4k0kv8ppi9j2f9hjc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clippy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clippy";
           sha256 = "0nqmc8f2qrsp25vzc66xw6b232n7fyw6g06mwn2cdpm3d2pgb7rg";
           name = "clippy";
         };
         packageRequires = [ pos-tip ];
         meta = {
-          homepage = "http://melpa.org/#/clippy";
+          homepage = "https://melpa.org/#/clippy";
           license = lib.licenses.free;
         };
       }) {};
@@ -6968,28 +7220,28 @@
           sha256 = "0i6sj5rs4b9v8aqq9l6wr15080qb101hdxspx6innhijhajgmssd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clips-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clips-mode";
           sha256 = "083wrhjn04rg8vr6j0ziffdbdhbfn63wzl4q7yzpkf8qckh6mxhf";
           name = "clips-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/clips-mode";
+          homepage = "https://melpa.org/#/clips-mode";
           license = lib.licenses.free;
         };
       }) {};
     clj-refactor = callPackage ({ cider, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }:
     melpaBuild {
         pname = "clj-refactor";
-        version = "20160221.914";
+        version = "20160425.311";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clj-refactor.el";
-          rev = "39e4cea6de61be0a062875c4de67245212c5ff66";
-          sha256 = "1ra00h3zksgifyfy7h5pijzfcqx1y7fsdq6dz3jylfh6ikria9gy";
+          rev = "f1fde528055f6877a5df9a40192dc401096826e6";
+          sha256 = "0i8sxr27w6l6jacmshmmf9lvp1da6hxx641xbdd3hj2vv12p2kwq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clj-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clj-refactor";
           sha256 = "1qvds6dylazvrzz1ji2z2ldw72pa2nxqacb9d04gasmkqc32ipvz";
           name = "clj-refactor";
         };
@@ -7006,7 +7258,7 @@
           yasnippet
         ];
         meta = {
-          homepage = "http://melpa.org/#/clj-refactor";
+          homepage = "https://melpa.org/#/clj-refactor";
           license = lib.licenses.free;
         };
       }) {};
@@ -7021,55 +7273,55 @@
           sha256 = "0ydv2prnw1j3m5nk23fqn4iv202kjswr8z0ip4zacdm8bl0q25ln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cljr-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cljr-helm";
           sha256 = "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc";
           name = "cljr-helm";
         };
         packageRequires = [ clj-refactor helm ];
         meta = {
-          homepage = "http://melpa.org/#/cljr-helm";
+          homepage = "https://melpa.org/#/cljr-helm";
           license = lib.licenses.free;
         };
       }) {};
     cljsbuild-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cljsbuild-mode";
-        version = "20140619.326";
+        version = "20160402.1200";
         src = fetchFromGitHub {
           owner = "kototama";
           repo = "cljsbuild-mode";
-          rev = "7edfc199b5daf972f6b2110d13a96e0bd974cd65";
-          sha256 = "1cdim8fancrsrm9avzv4m2v384i7n4632nibyfnxkhq03bj00j1z";
+          rev = "fa2315660cb3ce944b5e16c679dcf5afd6a97f4c";
+          sha256 = "0flnfivz6w3pkham3g08m3xzy3jg1rzvxfa00vkr7ll8iyv4ypqc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cljsbuild-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cljsbuild-mode";
           sha256 = "0qvb990dgq4v75lwnd661wxszbdbhlgxpsyv4zaj6h10gp1vi214";
           name = "cljsbuild-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cljsbuild-mode";
+          homepage = "https://melpa.org/#/cljsbuild-mode";
           license = lib.licenses.free;
         };
       }) {};
     clmemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clmemo";
-        version = "20150220.747";
+        version = "20160326.1123";
         src = fetchFromGitHub {
           owner = "ataka";
           repo = "clmemo";
-          rev = "553d62f80b6c3e0f281e09d377d490795bdcaabf";
-          sha256 = "0za8j7pwcmvjm2ls62z9f8sjryzzsmms4slikzixc0rxyiqnqyd1";
+          rev = "846a81b984d71edf8278a4d9f9b886e44d5b8365";
+          sha256 = "152qf7i5bf7xvr35gyawl8abkh7v5dsz957zxslrbbnc8bb1k6bz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clmemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clmemo";
           sha256 = "03qa79ip0gqinj1kk898lcvixk98hf6gknz0yc2fnqcrm642k2vs";
           name = "clmemo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/clmemo";
+          homepage = "https://melpa.org/#/clmemo";
           license = lib.licenses.free;
         };
       }) {};
@@ -7084,13 +7336,13 @@
           sha256 = "1rflc00yrbb7xzfh8c54ajf4qnhsp3mq07gkr257gjyrwsdw762v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cloc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cloc";
           sha256 = "1ny5wixa9x4fq5jvhs01jmyvwkfvwwi9aamrcqsl42s9sx6ygz7a";
           name = "cloc";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/cloc";
+          homepage = "https://melpa.org/#/cloc";
           license = lib.licenses.free;
         };
       }) {};
@@ -7105,13 +7357,13 @@
           sha256 = "0hz6a7gj0zfsdaifkhwf965c96rkjc3kivvqlf50zllsw0ysbnn0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clocker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clocker";
           sha256 = "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k";
           name = "clocker";
         };
         packageRequires = [ dash projectile ];
         meta = {
-          homepage = "http://melpa.org/#/clocker";
+          homepage = "https://melpa.org/#/clocker";
           license = lib.licenses.free;
         };
       }) {};
@@ -7126,76 +7378,76 @@
           sha256 = "1r189c0xm6vh05k0y715i5ldj1pxzvwkxqbq0n85m489mjnf2wv6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clojars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clojars";
           sha256 = "1skvd29347hwapgdqznbzwfcp2nf077qkdzknxc8ylmqa32yf5w1";
           name = "clojars";
         };
         packageRequires = [ cl-lib request ];
         meta = {
-          homepage = "http://melpa.org/#/clojars";
+          homepage = "https://melpa.org/#/clojars";
           license = lib.licenses.free;
         };
       }) {};
     clojure-cheatsheet = callPackage ({ cider, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-cheatsheet";
-        version = "20151112.717";
+        version = "20160320.515";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-cheatsheet";
-          rev = "7f1ee3facf131609ac1b987439b9b14daa4d7402";
-          sha256 = "1ljb0g4yvrqgjqgmz8qz0c0swbx1m6gldmcdqnmxd72bs3w9p0k8";
+          rev = "d277b4eea6bb91886f10f57a46d1c7e950a547b0";
+          sha256 = "0943fh8309mvg73paf97i2mfkrnl04x11gy8iz73c9622bkkmpcb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clojure-cheatsheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clojure-cheatsheet";
           sha256 = "05sw3bkdcadslpsk64ds0ciavmdgqk7fr5q3z505vvafmszfnaqv";
           name = "clojure-cheatsheet";
         };
         packageRequires = [ cider helm ];
         meta = {
-          homepage = "http://melpa.org/#/clojure-cheatsheet";
+          homepage = "https://melpa.org/#/clojure-cheatsheet";
           license = lib.licenses.free;
         };
       }) {};
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "20160213.1637";
+        version = "20160414.745";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "affd573660b2112e5b4629e6634fd8a5abcbdaa4";
-          sha256 = "0pn1a1w6x5678ssy0p5f5bc4d5qsgnr2d1qyrd7pxz47w78c3hlz";
+          rev = "1f82425e3f87394b27432b4dfb6f4f504232bf84";
+          sha256 = "0y7fgbcgnpdrclkbqrrdlydv55m37czmhfn4s1hmb203kb5a1mlr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clojure-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clojure-mode";
           sha256 = "11n0rjhs1mmlzdqy711g432an5ybdka5xj0ipsk8dx6xcyab70np";
           name = "clojure-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/clojure-mode";
+          homepage = "https://melpa.org/#/clojure-mode";
           license = lib.licenses.free;
         };
       }) {};
     clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode-extra-font-locking";
-        version = "20160116.521";
+        version = "20160307.614";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "affd573660b2112e5b4629e6634fd8a5abcbdaa4";
-          sha256 = "0pn1a1w6x5678ssy0p5f5bc4d5qsgnr2d1qyrd7pxz47w78c3hlz";
+          rev = "1f82425e3f87394b27432b4dfb6f4f504232bf84";
+          sha256 = "0y7fgbcgnpdrclkbqrrdlydv55m37czmhfn4s1hmb203kb5a1mlr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clojure-mode-extra-font-locking";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clojure-mode-extra-font-locking";
           sha256 = "00nff9mkj61i76dj21x87vhz0bbkzgvkx1ypkxcv6yf3pfhq7r8n";
           name = "clojure-mode-extra-font-locking";
         };
         packageRequires = [ clojure-mode ];
         meta = {
-          homepage = "http://melpa.org/#/clojure-mode-extra-font-locking";
+          homepage = "https://melpa.org/#/clojure-mode-extra-font-locking";
           license = lib.licenses.free;
         };
       }) {};
@@ -7210,34 +7462,76 @@
           sha256 = "1vgahik2q2sn6vqm9wg5b9jc74mkbc1md8pl69apz4cg397kjkzr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clojure-quick-repls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clojure-quick-repls";
           sha256 = "10glzyd4y3918pwp048pc1y7y7fa34fkqckn1nbys841dbssmay0";
           name = "clojure-quick-repls";
         };
         packageRequires = [ cider dash ];
         meta = {
-          homepage = "http://melpa.org/#/clojure-quick-repls";
+          homepage = "https://melpa.org/#/clojure-quick-repls";
           license = lib.licenses.free;
         };
       }) {};
     clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "clojure-snippets";
-        version = "20160217.242";
+        version = "20160305.802";
         src = fetchFromGitHub {
           owner = "mpenet";
           repo = "clojure-snippets";
-          rev = "21b17dd388db62e8713289478623c72a2c7180d0";
-          sha256 = "0wlzhj2mfxxkffsx14n1c0r89l3pszn71brx4l3dfyzmb806xrig";
+          rev = "7c80ba4bb91777a10784f042c137b9245ab23573";
+          sha256 = "08sswxmrb94an95cjxxcppn3f8gvy99jdr4cbwlwk2yswdrxdlg0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clojure-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clojure-snippets";
           sha256 = "15622mdd6b3fpwp22d32p78yap08pyscs2vc83sv1xz4338i0lij";
           name = "clojure-snippets";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/clojure-snippets";
+          homepage = "https://melpa.org/#/clojure-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "clomacs";
+        version = "20160419.458";
+        src = fetchFromGitHub {
+          owner = "clojure-emacs";
+          repo = "clomacs";
+          rev = "4b55c5befa80cbd0dce8d4a11ba8800283c7a6df";
+          sha256 = "13wm02s36yl24v6nr1s7l00mgi7nqg01jz404mnflgbzhd35rbfl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clomacs";
+          sha256 = "1vfjzrzp58ap75i0dh5bwnlkb8qbpfmrd3fg9n6aaibvvd2m3hyh";
+          name = "clomacs";
+        };
+        packageRequires = [ cider emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/clomacs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "closql";
+        version = "20160415.2116";
+        src = fetchFromGitLab {
+          owner = "tarsius";
+          repo = "closql";
+          rev = "a8b6b2beaa10528b2fd5ed9759136e3959529266";
+          sha256 = "1p251vyh8fc6xzaf0v7yvf4wkrvcfjdb3qr88ll4xcb61gj3vi3a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/closql";
+          sha256 = "0a8fqw8n03x9mygvzb95m8mmfqp3j8hynwafvryjsl0np0695b6l";
+          name = "closql";
+        };
+        packageRequires = [ emacs emacsql-sqlite ];
+        meta = {
+          homepage = "https://melpa.org/#/closql";
           license = lib.licenses.free;
         };
       }) {};
@@ -7252,13 +7546,13 @@
           sha256 = "0v0wdq0b5jz4x0d7dl3ilgf3aqp2hk375db366ij6gxwd0b9i3na";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/closure-lint-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/closure-lint-mode";
           sha256 = "1xmi1gjgayd5xbm3xx721xv57ns3x56r8ps94zpwyf2znpdchqfy";
           name = "closure-lint-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/closure-lint-mode";
+          homepage = "https://melpa.org/#/closure-lint-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -7273,13 +7567,13 @@
           sha256 = "07kvnb6p35swkyj92c4wymsqq4r2885wdpqhv7nhicvi6n658kpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cloud-to-butt-erc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cloud-to-butt-erc";
           sha256 = "061mmw39dq8sqzi2589lf7svy15n2iyiwbfiram48r2yhma5dd0f";
           name = "cloud-to-butt-erc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cloud-to-butt-erc";
+          homepage = "https://melpa.org/#/cloud-to-butt-erc";
           license = lib.licenses.free;
         };
       }) {};
@@ -7294,34 +7588,34 @@
           sha256 = "0fnl3b62clg9llcs2l511sxp4yishan4pqk45sqp8ih4rdzvy7ar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clues-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clues-theme";
           sha256 = "12g7373js5a2fa0m396k9kjhxvx3qws7n1r435nr9zgwaw7xvciy";
           name = "clues-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/clues-theme";
+          homepage = "https://melpa.org/#/clues-theme";
           license = lib.licenses.free;
         };
       }) {};
-    cm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cm-mode";
-        version = "20160113.523";
+        version = "20160310.1029";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "criticmarkup-emacs";
-          rev = "c38624070235ce25129516203f3bf6ac6f509846";
-          sha256 = "0m94692gkq299sf56m4c637j5xp78dvgv0ad1hv4ys1hzp1qw1l5";
+          rev = "1ac0d64842eb303323f2ebea61b4b6ba9f72969c";
+          sha256 = "1rwln3ms71fys3rdv3sx8w706aqn874im3kqcfrkxz86wiazm2d5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cm-mode";
           sha256 = "1rgfpxbnp8wiq9j8aywm2n07rxzkhqljigwynrkyvrnsgxlq2a9x";
           name = "cm-mode";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/cm-mode";
+          homepage = "https://melpa.org/#/cm-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -7336,55 +7630,55 @@
           sha256 = "030kg3m546gcm6cf1k928ld51znsfrzhlpm005dvqap3gkcrg4sf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cmake-font-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cmake-font-lock";
           sha256 = "0ws4kd94m8fh55d7whsf3rj9qrxjp1wsgxh0valsjxyp2ck9zrz0";
           name = "cmake-font-lock";
         };
         packageRequires = [ cmake-mode ];
         meta = {
-          homepage = "http://melpa.org/#/cmake-font-lock";
+          homepage = "https://melpa.org/#/cmake-font-lock";
           license = lib.licenses.free;
         };
       }) {};
     cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "cmake-ide";
-        version = "20160211.750";
+        version = "20160421.327";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "cmake-ide";
-          rev = "816ac6c19d664f584e21c3449d5fe12e50332e09";
-          sha256 = "1hagmcg7303ckbfdbz30s84vavg3a89m7mq71gf044jdx6nyci97";
+          rev = "1ab2511319f34f0e37e6e041c1ee813428636b0f";
+          sha256 = "1p1c742i3nzw24z276ypcicf5zpm7gdbbl2map6prjn34aiivglv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cmake-ide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cmake-ide";
           sha256 = "0xvy7l80zw67jgvk1rkhwzjvsqjqckmd8zj6s67rgbm56z6ypmcg";
           name = "cmake-ide";
         };
         packageRequires = [ cl-lib emacs levenshtein seq ];
         meta = {
-          homepage = "http://melpa.org/#/cmake-ide";
+          homepage = "https://melpa.org/#/cmake-ide";
           license = lib.licenses.free;
         };
       }) {};
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "20151012.926";
+        version = "20160317.841";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "7e32bd945a9f32144ac63fdcd085197658229f9c";
-          sha256 = "012pzl5258f14xdpjmmfgz6mn76902s153ps4yrvhhj5mmcs2knm";
+          rev = "b8a8dfec3688f1dc44f95528a65135fc76511c7b";
+          sha256 = "1cp79rqhqlgj6x3zlnhbc33yzj7xrifkvw2sm334bacjsgan8p4z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cmake-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cmake-mode";
           sha256 = "0zbn8syb5lw5xp1qcy3qcl75zfiyik30xvqyl38gdqddm9h7qmz7";
           name = "cmake-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cmake-mode";
+          homepage = "https://melpa.org/#/cmake-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -7399,13 +7693,13 @@
           sha256 = "0fyzi8xac80wnhnwwm1j6yxpvpg1n4diq2lcl3qkj8klvk5gpxr6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cmake-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cmake-project";
           sha256 = "13n6j9ljvzjzkknbm9zkhxljcn12avl39gxqq95hah44dr11rns3";
           name = "cmake-project";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cmake-project";
+          homepage = "https://melpa.org/#/cmake-project";
           license = lib.licenses.free;
         };
       }) {};
@@ -7413,17 +7707,17 @@
         pname = "cmds-menu";
         version = "20151231.1430";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/cmds-menu.el";
+          url = "https://www.emacswiki.org/emacs/download/cmds-menu.el";
           sha256 = "13r8pjxknsfd6ywzlgcy4bm7fvr768ba34k6b7y365y3c1asz6y3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cmds-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cmds-menu";
           sha256 = "12s75y9d75cxqgg3hj0s4w0d10zy8y230b5gy09685ab5lcajfks";
           name = "cmds-menu";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cmds-menu";
+          homepage = "https://melpa.org/#/cmds-menu";
           license = lib.licenses.free;
         };
       }) {};
@@ -7438,13 +7732,13 @@
           sha256 = "0xdcw329d2gssx86iajwrgpr7yv69b9nflmzjgb4jvg4pskj4pgx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cmm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cmm-mode";
           sha256 = "184b8x19cnvx8z4dr9alv62wchzc7vr7crzz8jiyqw9d544zs50h";
           name = "cmm-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cmm-mode";
+          homepage = "https://melpa.org/#/cmm-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -7459,13 +7753,13 @@
           sha256 = "1635k51ppivq6v2702fihq8dvi33445smds9zhqm0drnpv9rv5cr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cn-outline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cn-outline";
           sha256 = "0cw1rr56hdngvhmx59j76hvkfzgybasn0fwhd6vwm709jqiiiwiz";
           name = "cn-outline";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cn-outline";
+          homepage = "https://melpa.org/#/cn-outline";
           license = lib.licenses.free;
         };
       }) {};
@@ -7480,34 +7774,34 @@
           sha256 = "1sx8grp3j7zcma3nb7zj6kijkdqx166vw1qgmm29hvx48bys6vlp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cobra-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cobra-mode";
           sha256 = "11jscpbclxlq2xqy2nsfa4y575bp8h0kpkp8cfjqb05lm5ybcp89";
           name = "cobra-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cobra-mode";
+          homepage = "https://melpa.org/#/cobra-mode";
           license = lib.licenses.free;
         };
       }) {};
     code-library = callPackage ({ fetchFromGitHub, fetchurl, gist, lib, melpaBuild }:
     melpaBuild {
         pname = "code-library";
-        version = "20151216.1011";
+        version = "20160426.718";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "code-library";
-          rev = "6004c12b199f0a78bc6c11adaa5091a90bc6926b";
-          sha256 = "0mcf0xyh4p6pk2hf1f554vy4amd0qcimspgnncff2a0qc2bsg5sy";
+          rev = "3c79338eae5c892bfb4e4882298422d9fd65d2d7";
+          sha256 = "0gc56pdyzcnv3q1a82c79i8w58q9r6ccfix9s1s6msjxzxkznap5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/code-library";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/code-library";
           sha256 = "0gi8lz2q0vis4nyziykq15jp3m3vykfwycbk6amhf1ybkn9k3ywj";
           name = "code-library";
         };
         packageRequires = [ gist ];
         meta = {
-          homepage = "http://melpa.org/#/code-library";
+          homepage = "https://melpa.org/#/code-library";
           license = lib.licenses.free;
         };
       }) {};
@@ -7522,13 +7816,13 @@
           sha256 = "11v671c4338bsizbmm7ypp4x9s5hiwyddsg2ig6h157gfv2597pp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/codebug";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/codebug";
           sha256 = "1cb2wvawp3wqslhgbmbw9xwcqgwfscqg0jfgqzi3nr42mjp9zgqj";
           name = "codebug";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/codebug";
+          homepage = "https://melpa.org/#/codebug";
           license = lib.licenses.free;
         };
       }) {};
@@ -7543,13 +7837,13 @@
           sha256 = "0ch3naqp3ji0q4blpjfr1xbzgzxhw10h08y2akik96kk1pnkwism";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/codesearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/codesearch";
           sha256 = "0z7zvain9n0rm6bvrh3j7z275l32fmp46p4b33mizqd1y86w89nx";
           name = "codesearch";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/codesearch";
+          homepage = "https://melpa.org/#/codesearch";
           license = lib.licenses.free;
         };
       }) {};
@@ -7564,13 +7858,13 @@
           sha256 = "14jcxrs3b02pbppvdsabr7c74i3c6d1lmd6l1p9dj8gv413pghsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/codic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/codic";
           sha256 = "0fq2qfqhkd6injgl66vcpd61j67shl9xj260aj6cgb2nriq0jxgn";
           name = "codic";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/codic";
+          homepage = "https://melpa.org/#/codic";
           license = lib.licenses.free;
         };
       }) {};
@@ -7585,34 +7879,34 @@
           sha256 = "010v886ak0rbbhqwxwj6m0mkgh19s232igy7wwbv07l2pdqszf3p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/coffee-fof";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/coffee-fof";
           sha256 = "02cqza46qp8y69jd33cg4nmcgvrpwz23vyxqnmzwwvlmnbky96yc";
           name = "coffee-fof";
         };
         packageRequires = [ coffee-mode ];
         meta = {
-          homepage = "http://melpa.org/#/coffee-fof";
+          homepage = "https://melpa.org/#/coffee-fof";
           license = lib.licenses.free;
         };
       }) {};
     coffee-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "coffee-mode";
-        version = "20160208.2102";
+        version = "20160419.2147";
         src = fetchFromGitHub {
           owner = "defunkt";
           repo = "coffee-mode";
-          rev = "cb1e997c0195a8a51bfa77d6bdec919e68a88904";
-          sha256 = "0f7v6zjmsgsip17jazbhn6667gn5ialfv4nl58bhjhkrb21j9zbk";
+          rev = "e1331a2b1f29fe54a0d8b4facfa02ab2e115b7b2";
+          sha256 = "0fh04pg114ngx7c6gcasl3dqaw41mggn6cnilj43nl1mpk0hdm4s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/coffee-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/coffee-mode";
           sha256 = "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1";
           name = "coffee-mode";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/coffee-mode";
+          homepage = "https://melpa.org/#/coffee-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -7621,17 +7915,17 @@
         pname = "col-highlight";
         version = "20151231.1433";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/col-highlight.el";
+          url = "https://www.emacswiki.org/emacs/download/col-highlight.el";
           sha256 = "1fpkymmgv58b734d2rr7cfj2j2if1qkwgrpk3yp2ibw2n2567y0s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/col-highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/col-highlight";
           sha256 = "1kycjdlrg7a5x37b0pzqhg56yn7kaisryrk303qx1084kwq9464i";
           name = "col-highlight";
         };
         packageRequires = [ vline ];
         meta = {
-          homepage = "http://melpa.org/#/col-highlight";
+          homepage = "https://melpa.org/#/col-highlight";
           license = lib.licenses.free;
         };
       }) {};
@@ -7646,13 +7940,13 @@
           sha256 = "0jjj1miwc7hw2fbb1fnmfnydim81djswla8iy4waam9014yraqci";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/colemak-evil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/colemak-evil";
           sha256 = "1bfzs5px1k6g3cnwjdaq2m78bbnfy3lxhjzkcch7zdv3nyacwl5z";
           name = "colemak-evil";
         };
         packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/colemak-evil";
+          homepage = "https://melpa.org/#/colemak-evil";
           license = lib.licenses.free;
         };
       }) {};
@@ -7667,13 +7961,13 @@
           sha256 = "1k3sd07ffgpfhzg7d9mb1gc3n02zsvilxc30bgiycbjrbjgqq0i6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/colonoscopy-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/colonoscopy-theme";
           sha256 = "0x9bfr4j0sp41jkgnyjlaxnnjjrc102x6sznn6cgcmqk5qhswl4q";
           name = "colonoscopy-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/colonoscopy-theme";
+          homepage = "https://melpa.org/#/colonoscopy-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -7688,13 +7982,13 @@
           sha256 = "0m98i8w513zdzkskw9a96dd73lnfbfwvr947b0djsrazn8grh6hv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-identifiers-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/color-identifiers-mode";
           sha256 = "1hxp8lzn7kfckn5ngxic6qiz3nbynilqlxhlq9k1n1llfg216gfq";
           name = "color-identifiers-mode";
         };
         packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/color-identifiers-mode";
+          homepage = "https://melpa.org/#/color-identifiers-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -7709,13 +8003,13 @@
           sha256 = "1p1f30qz4nd5a8ym2iwrgp6vhws0dls2qlc0apblj9nj3b0ziv0x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-moccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/color-moccur";
           sha256 = "17b9walfc5c9qfdvl9pcwb2gjikc3wxk1d3v878ckypmxd38vciq";
           name = "color-moccur";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/color-moccur";
+          homepage = "https://melpa.org/#/color-moccur";
           license = lib.licenses.free;
         };
       }) {};
@@ -7729,13 +8023,13 @@
           sha256 = "17bidzq9kiz250gal1fn9mg8gf8l749nz69z0awpc4x2222wxxiz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/color-theme";
           sha256 = "1p4bjh8a9f6ixmwwnyjb520myk3bww1v9w6427za07v68m9cdh79";
           name = "color-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/color-theme";
+          homepage = "https://melpa.org/#/color-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -7750,13 +8044,13 @@
           sha256 = "1b0ymwszqsjcihcbfp7s4fjam983ixh3yb7sdc0rmqlyric1zwxq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-theme-approximate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/color-theme-approximate";
           sha256 = "1wdnia9q42x7vky3ks555iic5s50g4mx7ss5ppaljvgxvbxyxqh1";
           name = "color-theme-approximate";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/color-theme-approximate";
+          homepage = "https://melpa.org/#/color-theme-approximate";
           license = lib.licenses.free;
         };
       }) {};
@@ -7771,76 +8065,76 @@
           sha256 = "0gvc9jy34a8wvzwjpmqhshbx2kpk6ckmdrdj5v00iya7c4afnckx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-theme-buffer-local";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/color-theme-buffer-local";
           sha256 = "1448rffyzn5k5mr31hwd28wlj7if7rp5sjlqcsvbxd2mnbgkgjz0";
           name = "color-theme-buffer-local";
         };
         packageRequires = [ color-theme ];
         meta = {
-          homepage = "http://melpa.org/#/color-theme-buffer-local";
+          homepage = "https://melpa.org/#/color-theme-buffer-local";
           license = lib.licenses.free;
         };
       }) {};
     color-theme-modern = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-modern";
-        version = "20151109.2106";
+        version = "20160411.2046";
         src = fetchFromGitHub {
           owner = "emacs-jp";
           repo = "replace-colorthemes";
-          rev = "0a804c611da57b2d7c02c95f26eb8a7fc305f159";
-          sha256 = "0q9ss11i31iiv0vn8238922fkic7j6d02f9ykbip04sm46p5k6kj";
+          rev = "7107540d22e8ff045e0707de84c8b179fd829302";
+          sha256 = "0apvqrva3f7valjrxpslln8460kpr82z4zazj3lg3j82k102zla9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-theme-modern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/color-theme-modern";
           sha256 = "0f662ham430fgxpqw96zcl1whcm28cv710g6wvg4fma60sblaxcm";
           name = "color-theme-modern";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/color-theme-modern";
+          homepage = "https://melpa.org/#/color-theme-modern";
           license = lib.licenses.free;
         };
       }) {};
     color-theme-sanityinc-solarized = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-sanityinc-solarized";
-        version = "20150803.1620";
+        version = "20160228.1928";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-solarized";
-          rev = "14beb86aeb5b17451980f192bad72d7edb17321c";
-          sha256 = "07703v8xyia1vx9s636aaql99i29a4r5v9z0lvaypixgsidshx10";
+          rev = "58016a2177440ace10357b42bc121e99ee9ed2de";
+          sha256 = "11axrf7ns3gj1b0109z8zl63pv3jfpad83rnn5vfg3cp61qivia5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-theme-sanityinc-solarized";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/color-theme-sanityinc-solarized";
           sha256 = "0xg79hgb893f1nqx6q4q6hp4w6rvgp1aah1v2r3scg2jk057qxkf";
           name = "color-theme-sanityinc-solarized";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/color-theme-sanityinc-solarized";
+          homepage = "https://melpa.org/#/color-theme-sanityinc-solarized";
           license = lib.licenses.free;
         };
       }) {};
     color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
-        version = "20160205.2000";
+        version = "20160413.350";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "9a8f304477500baa2a782f9c9cafd76c6030ccdf";
-          sha256 = "0la3xwk0s5qx9n2s4lv4n8ilkj82spxk46mjih7zch8xpydfl15w";
+          rev = "c814d1263837cd68ec4d1aac3b529cef678556d1";
+          sha256 = "1k91d8cwavrs52vhgrdjip0irvi4yhhj7b8nq2hl3wz94giy9448";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-theme-sanityinc-tomorrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/color-theme-sanityinc-tomorrow";
           sha256 = "1k8iwjc7iidq5sxybs47rnswa6c5dwqfdzfw7w0by2h1id2z6nqd";
           name = "color-theme-sanityinc-tomorrow";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/color-theme-sanityinc-tomorrow";
+          homepage = "https://melpa.org/#/color-theme-sanityinc-tomorrow";
           license = lib.licenses.free;
         };
       }) {};
@@ -7855,13 +8149,13 @@
           sha256 = "1yn0wacicf218212d9qgn67pf16i7x6bih67zdfcplq4i9lqbpg3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-theme-solarized";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/color-theme-solarized";
           sha256 = "011rzq38ffmq7f2nzwrq96wwz67p82p1f0p5nib4nwqa47xlx7kf";
           name = "color-theme-solarized";
         };
         packageRequires = [ color-theme ];
         meta = {
-          homepage = "http://melpa.org/#/color-theme-solarized";
+          homepage = "https://melpa.org/#/color-theme-solarized";
           license = lib.licenses.free;
         };
       }) {};
@@ -7876,13 +8170,13 @@
           sha256 = "18hzm7yzwlfjlbkx46rgdl31p9xyfqnxlvg8337h2bicpks7kjia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/colorsarenice-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/colorsarenice-theme";
           sha256 = "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi";
           name = "colorsarenice-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/colorsarenice-theme";
+          homepage = "https://melpa.org/#/colorsarenice-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -7897,13 +8191,13 @@
           sha256 = "0ay4wrnyrdp4v3vjxr99hy8fpq6zsyh246c0gbp7bh63l5fx8nwr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/column-enforce-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/column-enforce-mode";
           sha256 = "1qh7kwr65spbbnzvq744gkksx50x04zs0nwn5ly60swc05d05lcg";
           name = "column-enforce-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/column-enforce-mode";
+          homepage = "https://melpa.org/#/column-enforce-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -7911,38 +8205,59 @@
         pname = "column-marker";
         version = "20121128.243";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/column-marker.el";
+          url = "https://www.emacswiki.org/emacs/download/column-marker.el";
           sha256 = "05bv198zhqw5hqq6cr11mhz02dpca74hhp1ycwq369m0yb2naxy9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/column-marker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/column-marker";
           sha256 = "1xgfsiw46aib2vb9bbjlgnhcgfnlfhdcxd0cl0jqj4fjfxzbz0bq";
           name = "column-marker";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/column-marker";
+          homepage = "https://melpa.org/#/column-marker";
           license = lib.licenses.free;
         };
       }) {};
     command-log-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "command-log-mode";
-        version = "20150615.916";
+        version = "20160412.2347";
         src = fetchFromGitHub {
           owner = "lewang";
           repo = "command-log-mode";
-          rev = "7408c0cb96709b8449f25a58a2203ed90bb5b850";
-          sha256 = "0fnyksbynlmmvl39f4is0xjp6b13yshfazigbksv012hxp0whslm";
+          rev = "af600e6b4129c8115f464af576505ea8e789db27";
+          sha256 = "06hll2frlx4sg9fj13a7ipq9y24isbjkjm6034xswhak40m7g1ii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/command-log-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/command-log-mode";
           sha256 = "11jq6055bvpwvrm0b8cgab25wa2mcyylpz4j56h1nqj7cnhb6ppj";
           name = "command-log-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/command-log-mode";
+          homepage = "https://melpa.org/#/command-log-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    command-queue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "command-queue";
+        version = "20160328.1225";
+        src = fetchFromGitHub {
+          owner = "Yuki-Inoue";
+          repo = "command-queue";
+          rev = "f327c6f852592229a755ec6de0c62c6aeafd6659";
+          sha256 = "0216hzdl4h1jssw5g2y95z4yx7abqsaxpk1s78r35w5cnx7kplrc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/command-queue";
+          sha256 = "1jaywdg8vcf1v6ayy1zd5mjs0x3s96845ig9ssb08397lfqasx1k";
+          name = "command-queue";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/command-queue";
           license = lib.licenses.free;
         };
       }) {};
@@ -7957,13 +8272,13 @@
           sha256 = "06y7ika4781gkh94ygdaz7a760s7ahrma6af6n7cqhgjyikz7lg1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/commander";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/commander";
           sha256 = "17y0hg6a90hflgwn24ww23qmvc1alzivpipca8zvpf0nih4fl393";
           name = "commander";
         };
         packageRequires = [ cl-lib dash f s ];
         meta = {
-          homepage = "http://melpa.org/#/commander";
+          homepage = "https://melpa.org/#/commander";
           license = lib.licenses.free;
         };
       }) {};
@@ -7978,13 +8293,13 @@
           sha256 = "0kzlv2my0cc7d3nki2rlm32nmb2nyjb38inmvlf13z0m2kybg2ps";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/comment-dwim-2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/comment-dwim-2";
           sha256 = "1w9w2a72ygsj5w47vjqcljajmmbz0mi8dhz5gjnpwxjwsr6fn6lj";
           name = "comment-dwim-2";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/comment-dwim-2";
+          homepage = "https://melpa.org/#/comment-dwim-2";
           license = lib.licenses.free;
         };
       }) {};
@@ -7999,13 +8314,13 @@
           sha256 = "1jwd3whag39qhzhbsfivzdlcr6vj37dv5ychkhmilw8v6dfdnpdb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/commenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/commenter";
           sha256 = "01bm8jbj6xw23nls4fps6zwjkgvcsjhmn3l3ncqd764kwhxdx8q3";
           name = "commenter";
         };
         packageRequires = [ emacs let-alist ];
         meta = {
-          homepage = "http://melpa.org/#/commenter";
+          homepage = "https://melpa.org/#/commenter";
           license = lib.licenses.free;
         };
       }) {};
@@ -8020,13 +8335,13 @@
           sha256 = "04bma9sdn7h8fjz62wlcwayzhr7lvzhidh48wc5rk195zlbgagwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/commify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/commify";
           sha256 = "1jc6iqa4hna3277hx13scfcqzkr43yv6gndbxv7qf4ydi01ysd0m";
           name = "commify";
         };
         packageRequires = [ s ];
         meta = {
-          homepage = "http://melpa.org/#/commify";
+          homepage = "https://melpa.org/#/commify";
           license = lib.licenses.free;
         };
       }) {};
@@ -8037,59 +8352,59 @@
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "common-lisp-snippets";
-          rev = "3b2b50fda8b1526d45a74e3d30f560d6b6bbb284";
-          sha256 = "1cc9ak9193m92g6l4mrfxbkkmvljl3c51d0xzdidwww978q3x6ad";
+          rev = "7dc8da55ee7182c95ff3e4dfb59b8e7aef6fdd6d";
+          sha256 = "14giiif043yvdaykq700v3n12j295a2pw1aygrl6gr42a3srbnpl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/common-lisp-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/common-lisp-snippets";
           sha256 = "0ig8cz00cbfx0jckqk1xhsvm18ivl2mjvcn65s941nblsywfvxjl";
           name = "common-lisp-snippets";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/common-lisp-snippets";
+          homepage = "https://melpa.org/#/common-lisp-snippets";
           license = lib.licenses.free;
         };
       }) {};
     company = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "20160211.720";
+        version = "20160424.1721";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "e251568e99de9e684b21cc74306fa1c3678444b5";
-          sha256 = "15zkaq3vc74f8vbdjrxd1ha4mh7p0hn7x5nyg4dh0i3qchinlkjn";
+          rev = "e0d2bf0ae6df94eca9d2d8afca6d1de4db0d4796";
+          sha256 = "19vg9l786izw27ly6j55s5sg7kscl5d2hvzww6cfa7ckwnn81xhv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company";
           sha256 = "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4";
           name = "company";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/company";
+          homepage = "https://melpa.org/#/company";
           license = lib.licenses.free;
         };
       }) {};
     company-anaconda = callPackage ({ anaconda-mode, cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "company-anaconda";
-        version = "20160221.1323";
+        version = "20160418.849";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "company-anaconda";
-          rev = "23a21e17e24f1f673d86bc8a0ace80df516636ce";
-          sha256 = "0hfhkpy8qpai6qspqcf1pnxygnnyn7ncmhp5bmg2p4b6qm328yxi";
+          rev = "360275039dab6286995a0113229063ea3a087205";
+          sha256 = "1wyhpihsf4pyzbim7nf9fwndjg568k49g1q6lzs8n3azw00d6fi9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-anaconda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-anaconda";
           sha256 = "1s7y47ghy7q35qpfqavh4p9wr91i6r579mdbpvv6h5by856yn4gl";
           name = "company-anaconda";
         };
         packageRequires = [ anaconda-mode cl-lib company dash s ];
         meta = {
-          homepage = "http://melpa.org/#/company-anaconda";
+          homepage = "https://melpa.org/#/company-anaconda";
           license = lib.licenses.free;
         };
       }) {};
@@ -8104,28 +8419,28 @@
           sha256 = "06gh33qzglv40r62dsapzhxwparw8ciblv80g7h6y6ilyazwcidn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-ansible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-ansible";
           sha256 = "084l9dr2hvm00952y4m3jhchzxjhcd61sfn5ywj9b9a1d4sr110d";
           name = "company-ansible";
         };
         packageRequires = [ company emacs ];
         meta = {
-          homepage = "http://melpa.org/#/company-ansible";
+          homepage = "https://melpa.org/#/company-ansible";
           license = lib.licenses.free;
         };
       }) {};
     company-arduino = callPackage ({ arduino-mode, cl-lib ? null, company, company-c-headers, company-irony, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }:
     melpaBuild {
         pname = "company-arduino";
-        version = "20150614.326";
+        version = "20160306.1139";
         src = fetchFromGitHub {
           owner = "yuutayamada";
           repo = "company-arduino";
-          rev = "fd31103ab73acd6c77e4361db86e472619903f80";
-          sha256 = "067xb4mwfnmbqjyfv4717417fg7ysvz9flnx1nrk6iv96gnf4vfx";
+          rev = "5958b917cc5cc729dc64d74d947da5ee91c48980";
+          sha256 = "08766m35s0r2fyv32y0h3sns9d5jykbgg24d2z8czklnc8hay7jc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-arduino";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-arduino";
           sha256 = "1bch447lllikip1xd90kdgssgc67sl04a70fxqkqlrc1bs6gkkws";
           name = "company-arduino";
         };
@@ -8139,7 +8454,7 @@
           irony
         ];
         meta = {
-          homepage = "http://melpa.org/#/company-arduino";
+          homepage = "https://melpa.org/#/company-arduino";
           license = lib.licenses.free;
         };
       }) {};
@@ -8154,13 +8469,13 @@
           sha256 = "0mkyg9y1rhl6hdzhr51psnvy2q0zw4y29m9p0ivb7s643k3fjjp5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-auctex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-auctex";
           sha256 = "1jia80sqmm83kzjcf1h1d9iz2k4k9albzvfka5hx6hpa4h8nm5q4";
           name = "company-auctex";
         };
         packageRequires = [ auctex company yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/company-auctex";
+          homepage = "https://melpa.org/#/company-auctex";
           license = lib.licenses.free;
         };
       }) {};
@@ -8171,17 +8486,17 @@
         src = fetchFromGitHub {
           owner = "randomphrase";
           repo = "company-c-headers";
-          rev = "0b8c63cdc7864c3e3939c4b8cda314d05ae0a352";
-          sha256 = "16cva7ccc0hrc6yf659kpsznlk1bkgv525lqr4nj8a12q0avjdxf";
+          rev = "0450f429bd5745e91e984651c932264481953142";
+          sha256 = "0jh2j260x1smlm4362dvgfpfpba7kg6hqvszjirc6mpm74zdcnp8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-c-headers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-c-headers";
           sha256 = "1715vnjr5cjiq8gjcd3idnpnijg5cg3sw3f8gr5x2ixcrip1hx3a";
           name = "company-c-headers";
         };
         packageRequires = [ company emacs ];
         meta = {
-          homepage = "http://melpa.org/#/company-c-headers";
+          homepage = "https://melpa.org/#/company-c-headers";
           license = lib.licenses.free;
         };
       }) {};
@@ -8196,49 +8511,49 @@
           sha256 = "0ll9dxzsgrpy4psz3dqhzny990lfccn63swcyfvl8mnqgwbrq8k0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-cabal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-cabal";
           sha256 = "0pbjidj88c9qri6xw8023yqwnczad5ig224cbsz6vsmdla2nlxra";
           name = "company-cabal";
         };
         packageRequires = [ cl-lib company emacs ];
         meta = {
-          homepage = "http://melpa.org/#/company-cabal";
+          homepage = "https://melpa.org/#/company-cabal";
           license = lib.licenses.free;
         };
       }) {};
     company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "company-coq";
-        version = "20160212.808";
+        version = "20160316.1314";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "company-coq";
-          rev = "f99c17b693c29d0d385c28c3c0409e083aeba440";
-          sha256 = "003fbj21a8sb8fv33svbwyhdjywqrmh2y08d1hwmmp0vhd38333i";
+          rev = "43d96b0148661e52b982728765b99bbcbda6974b";
+          sha256 = "0lnb3qf1xhb0nbqy6ry0bkz2xrzfgkvavb7a3cbllawyz5idhfg5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-coq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-coq";
           sha256 = "1iagm07ckf60kg4i8m4n0gfmv0brqc4dcn7lkcz229r3f4kyqksa";
           name = "company-coq";
         };
         packageRequires = [ cl-lib company company-math dash yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/company-coq";
+          homepage = "https://melpa.org/#/company-coq";
           license = lib.licenses.free;
         };
       }) {};
     company-dcd = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, flycheck-dmd-dub, helm, lib, melpaBuild, popwin, yasnippet }:
     melpaBuild {
         pname = "company-dcd";
-        version = "20150901.604";
+        version = "20160406.2248";
         src = fetchFromGitHub {
           owner = "tsukimizake";
           repo = "company-dcd";
-          rev = "1d121dc42906fc58fa3a7febff8dabd29fba34f2";
-          sha256 = "0qbis9jqcrgj71cf8i9yfxsm7yj6d546gxw6linqd7slqn97l8rl";
+          rev = "8448d1871bcd799d31b6db0cafdfb0a157980195";
+          sha256 = "0jkshkh44cgahpz2d7lrwfyl4kmhinivlbp08yn4zz6hpcvz87x9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-dcd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-dcd";
           sha256 = "03849k4jzs23iglk9ghcq6283c9asffcq4dznypcjax7y4x113vd";
           name = "company-dcd";
         };
@@ -8251,7 +8566,28 @@
           yasnippet
         ];
         meta = {
-          homepage = "http://melpa.org/#/company-dcd";
+          homepage = "https://melpa.org/#/company-dcd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-dict = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-dict";
+        version = "20160222.940";
+        src = fetchFromGitHub {
+          owner = "hlissner";
+          repo = "emacs-company-dict";
+          rev = "94e648cb9fd0f98829d3fd1395fcf5f3d72b4402";
+          sha256 = "1i1b0v2qwb8bmjs8xjahnizf68m1qf2kll39l84ska47vn7csc3c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-dict";
+          sha256 = "1377b40f1j4rmw7lnhy1zsm6r234ds5zsn02v1ajm3bzrpkkmin0";
+          name = "company-dict";
+        };
+        packageRequires = [ company ];
+        meta = {
+          homepage = "https://melpa.org/#/company-dict";
           license = lib.licenses.free;
         };
       }) {};
@@ -8266,118 +8602,118 @@
           sha256 = "0n2hvrfbybsp57w6m9mm7ywjq30fwwx9bzc2rllfr06d2ms7naai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-edbi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-edbi";
           sha256 = "067ff1xdyqy4qzgk5pmqf4kksfjk1glkrslcj3rk4zmhcalwrfrm";
           name = "company-edbi";
         };
         packageRequires = [ cl-lib company edbi s ];
         meta = {
-          homepage = "http://melpa.org/#/company-edbi";
+          homepage = "https://melpa.org/#/company-edbi";
           license = lib.licenses.free;
         };
       }) {};
     company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-emoji";
-        version = "20151108.20";
+        version = "20160331.1841";
         src = fetchFromGitHub {
           owner = "dunn";
           repo = "company-emoji";
-          rev = "c3665bf150c43a1c9830e817cf6de950be8c0fde";
-          sha256 = "1lm26av6z18p70gxz23h87l25airawljr5lm7hw6krg706cp3aq6";
+          rev = "00ff8210cf80b4bc4ec0fe8f42b8a00315241f32";
+          sha256 = "1ipknikwyd6h2w72s5sn32mfql4p2cmgv868n13r3wg42c619blq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-emoji";
           sha256 = "1mflqqw9gnfcqjb6g8ivdfl7s4mdyjg7j0457hamgyvgvpxsh8x3";
           name = "company-emoji";
         };
         packageRequires = [ cl-lib company ];
         meta = {
-          homepage = "http://melpa.org/#/company-emoji";
+          homepage = "https://melpa.org/#/company-emoji";
           license = lib.licenses.free;
         };
       }) {};
     company-flx = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }:
     melpaBuild {
         pname = "company-flx";
-        version = "20160110.1904";
+        version = "20160423.1913";
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "company-flx";
-          rev = "411f6b8cc6dd6bfd37b04684b6aade643706a1a1";
-          sha256 = "1rg6jynzp37qnaq4lj48sfrhmv7mgcd2rzkixbpb3hgsy10dj9j0";
+          rev = "bd2035390c285769c39a2bd2fdd0f24da0cd7ec9";
+          sha256 = "1di3nndif2gkzwvs8bvqg994z422ql308lh47hbjdjnqm182mwy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-flx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-flx";
           sha256 = "1r4jcfzrhdpclblfrmi4qbl8dnhc2d7d4c1425xnslg7bhwd2vxn";
           name = "company-flx";
         };
         packageRequires = [ company emacs flx ];
         meta = {
-          homepage = "http://melpa.org/#/company-flx";
+          homepage = "https://melpa.org/#/company-flx";
           license = lib.licenses.free;
         };
       }) {};
     company-ghc = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, ghc, lib, melpaBuild }:
     melpaBuild {
         pname = "company-ghc";
-        version = "20151217.859";
+        version = "20160315.910";
         src = fetchFromGitHub {
           owner = "iquiw";
           repo = "company-ghc";
-          rev = "96c78650da0030a55daee11668b04e313468294e";
-          sha256 = "0iydcp02x8mqbvxzihzzd1mnq065s19dpi0pq33a2v4nnlddlj1q";
+          rev = "4d1f1e3c9529b1a833fa58e835226cebf0e415b7";
+          sha256 = "1mc7y4j772x54n2wc2dskb5wjc46r7sg2jwyvmnj44cyaasxqmck";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-ghc";
           sha256 = "07adykza4dqs64bk8vjmgryr54khxmcy28hms5z8i1qpsk9vmvnn";
           name = "company-ghc";
         };
         packageRequires = [ cl-lib company emacs ghc ];
         meta = {
-          homepage = "http://melpa.org/#/company-ghc";
+          homepage = "https://melpa.org/#/company-ghc";
           license = lib.licenses.free;
         };
       }) {};
     company-ghci = callPackage ({ company, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "company-ghci";
-        version = "20160118.924";
+        version = "20160310.2000";
         src = fetchFromGitHub {
           owner = "juiko";
           repo = "company-ghci";
-          rev = "3ba0dd5607dc4b90e4ad32a4e23176882405d3b7";
-          sha256 = "0jsnf60nz37s4csk8pnyr45fjdsac1ls64fvsh5gzi6hipxz5y6z";
+          rev = "c2d74a41166e76de2e78c87f582ba3a1179b2aa6";
+          sha256 = "02gq083lpbszy8pf7s5j61bjlm0hacv4md4g17n0q6448rix9yny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-ghci";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-ghci";
           sha256 = "0h9hqfb8fm90h87bi3myl84nppbbminhnvv6jqg62qi9k6snn1iq";
           name = "company-ghci";
         };
         packageRequires = [ company haskell-mode ];
         meta = {
-          homepage = "http://melpa.org/#/company-ghci";
+          homepage = "https://melpa.org/#/company-ghci";
           license = lib.licenses.free;
         };
       }) {};
     company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "company-go";
-        version = "20151211.1224";
+        version = "20160306.1555";
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "659c0a429af764118d27692d02b77c544a32cfe3";
-          sha256 = "1gfad94acp7qxm6yg0prjfkx370caq309zc8dy20ssi4x19j4n0x";
+          rev = "3b7488f4e4c234abbea9c5ff313a3a7139fc56e8";
+          sha256 = "0sw12mzgxq5nh7yzkzzpca3y4chd2i81amzynlaz46ci16wa6gpb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-go";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-go";
           sha256 = "1ncy5wlg3ywr17zrxb1d1bap4gdvwr35w9a8b0crz5h3l3y4cp29";
           name = "company-go";
         };
         packageRequires = [ company go-mode ];
         meta = {
-          homepage = "http://melpa.org/#/company-go";
+          homepage = "https://melpa.org/#/company-go";
           license = lib.licenses.free;
         };
       }) {};
@@ -8392,34 +8728,34 @@
           sha256 = "0fnv4rvvs9rqzrs86g23jcrpg0rcgk25299hm6jm08ia0kjjby1m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-inf-ruby";
           sha256 = "0cb1w0sxgb5jf0p2a5s2i4d511lsjjhyaqkqlwjz8nk4w14n0zxm";
           name = "company-inf-ruby";
         };
         packageRequires = [ company emacs inf-ruby ];
         meta = {
-          homepage = "http://melpa.org/#/company-inf-ruby";
+          homepage = "https://melpa.org/#/company-inf-ruby";
           license = lib.licenses.free;
         };
       }) {};
     company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }:
     melpaBuild {
         pname = "company-irony";
-        version = "20150810.439";
+        version = "20160321.1603";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "company-irony";
-          rev = "09f16eade551201548455285a2d977a0889761da";
-          sha256 = "0y1a9wxk9w2jk4177hkqzgqzknswikxc1dc60hzj4samyp2jhvfl";
+          rev = "c51b3997f0a847d971917a4401277bf283250021";
+          sha256 = "15xv59c6pwdysr9hqvaj7jgsa9pnicy7cnn9dq53zngjh3f5mf83";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-irony";
           sha256 = "15adamk1b9y1i6k06i5ahf1wn70cgwlhgk0x6fk8pl5izg05z1km";
           name = "company-irony";
         };
         packageRequires = [ cl-lib company emacs irony ];
         meta = {
-          homepage = "http://melpa.org/#/company-irony";
+          homepage = "https://melpa.org/#/company-irony";
           license = lib.licenses.free;
         };
       }) {};
@@ -8434,13 +8770,13 @@
           sha256 = "1x2dfjmy86icyv2g1y5bjlr87w8rixqdcndkwm1sba6ha277wp9i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-irony-c-headers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-irony-c-headers";
           sha256 = "0kiag5ggmc2f5c3gd8nn40x16i686jpdrfrflgrz2aih8p3g6af8";
           name = "company-irony-c-headers";
         };
         packageRequires = [ cl-lib company irony ];
         meta = {
-          homepage = "http://melpa.org/#/company-irony-c-headers";
+          homepage = "https://melpa.org/#/company-irony-c-headers";
           license = lib.licenses.free;
         };
       }) {};
@@ -8451,38 +8787,59 @@
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-company-jedi";
-          rev = "ad49407451c7f28fe137f9c8f3a7fc89e8693a1b";
-          sha256 = "1ihqapp4dv92794rsgyq0rmhwika60cmradqd4bn9b72ss6plxs1";
+          rev = "2f54e791e10f5dc0ff164bfe97f1878359fab6f6";
+          sha256 = "0bpqswcc6a65wms0pdk9rsad9jiigmx2l1jaqr8bz4va945qdlhg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-jedi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-jedi";
           sha256 = "1krrgrjq967c3j02y0i345yx6w4crisnj1k3bhih6j849fvy3fvj";
           name = "company-jedi";
         };
         packageRequires = [ cl-lib company emacs jedi-core ];
         meta = {
-          homepage = "http://melpa.org/#/company-jedi";
+          homepage = "https://melpa.org/#/company-jedi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-lua = callPackage ({ company, f, fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild, s }:
+    melpaBuild {
+        pname = "company-lua";
+        version = "20160330.513";
+        src = fetchFromGitHub {
+          owner = "ptrv";
+          repo = "company-lua";
+          rev = "d1384d7c709ed157bc7dcd8f2cfdf6212299b2bf";
+          sha256 = "151hpai8dagvgyg5fxiydp5x42sqksvp2y5znssclw7654f08fgn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-lua";
+          sha256 = "13sm7ya2ndqxwdjarhxbmg7fvr3413c7p3n6yf1i4rabbliqsf2c";
+          name = "company-lua";
+        };
+        packageRequires = [ company f lua-mode s ];
+        meta = {
+          homepage = "https://melpa.org/#/company-lua";
           license = lib.licenses.free;
         };
       }) {};
     company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
     melpaBuild {
         pname = "company-math";
-        version = "20160119.748";
+        version = "20160229.932";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "company-math";
-          rev = "21ac1c7a4077a20746bff00a85150f82f6c3130a";
-          sha256 = "114z2p5ivdsfhkir9yzrm4zw34c8jlilwqyyd4y5ing8awc9jhv2";
+          rev = "9407824d2b29d427ed5732aa01cb0a8530a8259f";
+          sha256 = "1xsk02ymgj0gfblz2f6pzwh96crgx4m524ia6m95kcxrd7y63004";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-math";
           sha256 = "0chig8k8l65bnd0a6734fiy0ikl20k9v2wlndh3ckz5a8h963g87";
           name = "company-math";
         };
         packageRequires = [ company math-symbol-lists ];
         meta = {
-          homepage = "http://melpa.org/#/company-math";
+          homepage = "https://melpa.org/#/company-math";
           license = lib.licenses.free;
         };
       }) {};
@@ -8497,13 +8854,34 @@
           sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-nand2tetris";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-nand2tetris";
           sha256 = "1g2i33jjh7kbpzk835kbnqicf0w4cq5rqv934bqzz5kavj9cg886";
           name = "company-nand2tetris";
         };
         packageRequires = [ cl-lib company names nand2tetris ];
         meta = {
-          homepage = "http://melpa.org/#/company-nand2tetris";
+          homepage = "https://melpa.org/#/company-nand2tetris";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-ngram";
+        version = "20160330.1626";
+        src = fetchFromGitHub {
+          owner = "kshramt";
+          repo = "company-ngram";
+          rev = "6c9315933984e7741b9d044f06a8cecc5ddaf788";
+          sha256 = "0yxnylpbjrwmqx6px0q3pff4dh00fmfzb09gp4xvn9w9hrxdsx7g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-ngram";
+          sha256 = "1y9k9s8c248m91xld4f5l75j4swml333rpwq590bsx7mrsq131xx";
+          name = "company-ngram";
+        };
+        packageRequires = [ cl-lib company ];
+        meta = {
+          homepage = "https://melpa.org/#/company-ngram";
           license = lib.licenses.free;
         };
       }) {};
@@ -8514,17 +8892,17 @@
         src = fetchFromGitHub {
           owner = "travisbhartwell";
           repo = "nix-emacs";
-          rev = "63061d379460c53abbe88ec695a61e22feae438f";
-          sha256 = "100vjppa6nipn227v871nkmjmqln2l1lv1v8in1lcjhsz4rxrhs9";
+          rev = "9e84e7f93307b72a1c0decfc2eff9d4943631de3";
+          sha256 = "1r2qbd19kkqf70gq04jfpsrap75qcy359k3ian9rhapi8cj0n23w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-nixos-options";
           sha256 = "1yrqqdadmf7qfxpqp8wwb325zjnwwjmn2hhnl7i3j0ckg6hqyqf0";
           name = "company-nixos-options";
         };
         packageRequires = [ cl-lib company nixos-options ];
         meta = {
-          homepage = "http://melpa.org/#/company-nixos-options";
+          homepage = "https://melpa.org/#/company-nixos-options";
           license = lib.licenses.free;
         };
       }) {};
@@ -8539,13 +8917,13 @@
           sha256 = "0sl59b9wwnpz6p2kxsc87b3q28vvfxg7pwk67c51q8qyrl0c1klv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-qml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-qml";
           sha256 = "0sva7i93dam8mc2z3cp785vmgcg7cphrpkwyvqyqhq8w51qg8mxx";
           name = "company-qml";
         };
         packageRequires = [ company qml-mode ];
         meta = {
-          homepage = "http://melpa.org/#/company-qml";
+          homepage = "https://melpa.org/#/company-qml";
           license = lib.licenses.free;
         };
       }) {};
@@ -8560,13 +8938,13 @@
           sha256 = "1b2v84ss5k43nnbsnvabgvb19ardsacbs1prn2h9i1k2d5mb8icw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-quickhelp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-quickhelp";
           sha256 = "042bwv0wd4hksbm528zb7pbllzk83p8qjq5f8z46p84c8mmxfp9g";
           name = "company-quickhelp";
         };
         packageRequires = [ company emacs pos-tip ];
         meta = {
-          homepage = "http://melpa.org/#/company-quickhelp";
+          homepage = "https://melpa.org/#/company-quickhelp";
           license = lib.licenses.free;
         };
       }) {};
@@ -8581,13 +8959,13 @@
           sha256 = "1lk3fqsgbi6mg4hrpc9gy4hbfp9snyj4yvc0zh8iqqw5nx12dab4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-racer";
           sha256 = "0zc8dzvsjz5qsrwhv7x9f7djzvb9awacc3pgjirsv8f8sp7p3am4";
           name = "company-racer";
         };
         packageRequires = [ cl-lib company deferred emacs ];
         meta = {
-          homepage = "http://melpa.org/#/company-racer";
+          homepage = "https://melpa.org/#/company-racer";
           license = lib.licenses.free;
         };
       }) {};
@@ -8602,7 +8980,7 @@
           sha256 = "04829y7510zxjww9pq8afvnzwyyv30c0b3a71mxwf6ympfxb9rx5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-restclient";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-restclient";
           sha256 = "1md0n4k4wmbh9rmbwqh3kg2fj0c34rzqfd56jsq8lcdg14k0kdcb";
           name = "company-restclient";
         };
@@ -8614,7 +8992,7 @@
           restclient
         ];
         meta = {
-          homepage = "http://melpa.org/#/company-restclient";
+          homepage = "https://melpa.org/#/company-restclient";
           license = lib.licenses.free;
         };
       }) {};
@@ -8629,34 +9007,34 @@
           sha256 = "097v261fp0j7sjg6fkxwywpqf1vg1i2gq3i7m34vxzvs9l7ahagl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-shell";
           sha256 = "0my9jghf3s4idkgrpki8mj1lm5ichfvznb09lfwf07fjhg0q1apz";
           name = "company-shell";
         };
         packageRequires = [ cl-lib company dash ];
         meta = {
-          homepage = "http://melpa.org/#/company-shell";
+          homepage = "https://melpa.org/#/company-shell";
           license = lib.licenses.free;
         };
       }) {};
     company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }:
     melpaBuild {
         pname = "company-sourcekit";
-        version = "20151209.714";
+        version = "20160323.2009";
         src = fetchFromGitHub {
           owner = "nathankot";
           repo = "company-sourcekit";
-          rev = "5e1adf8d201fd94a942b40983415db1b28b6eef1";
-          sha256 = "1xzwalchl9lnq9848dlvhhbzyh1wkwbciz20d1iw0fsigj5g156c";
+          rev = "c9694cd8e84f4c7deffa6111297cb80eb7cb02a6";
+          sha256 = "04nm015408gzybfka0sc3czkf5y61x76h3sx3vlijf67i54bz7pi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-sourcekit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-sourcekit";
           sha256 = "0hr5j1ginf43h4qf3fvsh3z53z0c7w5a9lhrvdwmlzj396qhqmzs";
           name = "company-sourcekit";
         };
         packageRequires = [ company dash dash-functional emacs sourcekit ];
         meta = {
-          homepage = "http://melpa.org/#/company-sourcekit";
+          homepage = "https://melpa.org/#/company-sourcekit";
           license = lib.licenses.free;
         };
       }) {};
@@ -8671,13 +9049,13 @@
           sha256 = "0zjgw8v93z4dyj9g1dny6digqkh9v8m9x44zkx5magq8dbv69qsc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-tern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-tern";
           sha256 = "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh";
           name = "company-tern";
         };
         packageRequires = [ cl-lib company dash dash-functional s tern ];
         meta = {
-          homepage = "http://melpa.org/#/company-tern";
+          homepage = "https://melpa.org/#/company-tern";
           license = lib.licenses.free;
         };
       }) {};
@@ -8688,17 +9066,17 @@
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "company-try-hard";
-          rev = "0401e8afa6bd4d3e9d2cf18e58955b83aef93005";
-          sha256 = "18hy60fm3b3dmp29cmzbs6grlihkwifjbzv30gprwj5f6x7m8knf";
+          rev = "70b94cfc40c576af404e743133979048e1bd2610";
+          sha256 = "1isnk2i64kppsr23nr6qm5kwxxwcp4xazjwvm2chyzl4vbvp03p2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-try-hard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-try-hard";
           sha256 = "1rwn521dc8kxh43vcd3rf0h8jc53d4gmid3szj2msi0da1sk0mmj";
           name = "company-try-hard";
         };
         packageRequires = [ company dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/company-try-hard";
+          homepage = "https://melpa.org/#/company-try-hard";
           license = lib.licenses.free;
         };
       }) {};
@@ -8713,13 +9091,13 @@
           sha256 = "1a9qx041w7i1ahg6rmi82hv161k57z4aljzm8wpa9wrfj8a6df2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-web";
           sha256 = "0dj0m6wcc8cyvblp9b5b3am95gc18j9y4va44hvljxv1h7l5hhvy";
           name = "company-web";
         };
         packageRequires = [ cl-lib company dash web-completion-data ];
         meta = {
-          homepage = "http://melpa.org/#/company-web";
+          homepage = "https://melpa.org/#/company-web";
           license = lib.licenses.free;
         };
       }) {};
@@ -8734,34 +9112,55 @@
           sha256 = "0znchya89zzk30mwl4qfm0q9sfa5m3jspapb892ydj0mck5n4nyj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-ycm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-ycm";
           sha256 = "1q4d63c7nr3g7q0smd55pp636vqa9lf1pkwjn9iq265369npvina";
           name = "company-ycm";
         };
         packageRequires = [ ycm ];
         meta = {
-          homepage = "http://melpa.org/#/company-ycm";
+          homepage = "https://melpa.org/#/company-ycm";
           license = lib.licenses.free;
         };
       }) {};
-    company-ycmd = callPackage ({ company, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, s, ycmd }:
+    company-ycmd = callPackage ({ company, dash, deferred, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }:
     melpaBuild {
         pname = "company-ycmd";
-        version = "20160215.629";
+        version = "20160417.1713";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "61601543ca9b70f6a92a87fb9057af6143ba5ed1";
-          sha256 = "10j8zv5m36400wwkwbncqnsm616v59ww0bbkhrxcf6mn56iq8162";
+          rev = "1984e49b7894b77438f2257d8058900ab82109e3";
+          sha256 = "0dwii83m6cngsnyhzhnmv53p588d4pkkybmcmsj6gsar157l4azi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-ycmd";
           sha256 = "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk";
           name = "company-ycmd";
         };
-        packageRequires = [ company dash deferred s ycmd ];
+        packageRequires = [ company dash deferred let-alist s ycmd ];
         meta = {
-          homepage = "http://melpa.org/#/company-ycmd";
+          homepage = "https://melpa.org/#/company-ycmd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    composable = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "composable";
+        version = "20160424.1317";
+        src = fetchFromGitHub {
+          owner = "paldepind";
+          repo = "composable.el";
+          rev = "be01ee5c2ee25bd25cfc6ac525d00223e66d9446";
+          sha256 = "15gmp49zjmwn72q9w5vxydv8lhzih9sclinm4h1fy4rr5m1j5f8l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/composable";
+          sha256 = "1fs4pczjn9sv12sladf6zbkz0cmzxr0jaqkiwryydal1l5nqqxcy";
+          name = "composable";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/composable";
           license = lib.licenses.free;
         };
       }) {};
@@ -8776,34 +9175,34 @@
           sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/concurrent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/concurrent";
           sha256 = "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf";
           name = "concurrent";
         };
         packageRequires = [ deferred ];
         meta = {
-          homepage = "http://melpa.org/#/concurrent";
+          homepage = "https://melpa.org/#/concurrent";
           license = lib.licenses.free;
         };
       }) {};
     config-parser = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "config-parser";
-        version = "20160112.544";
+        version = "20160426.719";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "el-config-parser";
-          rev = "3e42c2a61902b9de268e491efd0fe3b1a68fd4f9";
-          sha256 = "0zz1k4h16pjdwiqavfbfbrbvi83ww93kgf838ap4f3n034hqfx20";
+          rev = "85d559e7889d8f5b98b8794b79426ae25ec3caa5";
+          sha256 = "09vq7hcsw4027whn3xrnfz9hkgkakva619hyz0zfgpvppqah9n1p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/config-parser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/config-parser";
           sha256 = "0wncg1v4wccb9j16rcmwz8fcmrscj7knfisq0r4qqx3skrmpccah";
           name = "config-parser";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/config-parser";
+          homepage = "https://melpa.org/#/config-parser";
           license = lib.licenses.free;
         };
       }) {};
@@ -8817,13 +9216,13 @@
           sha256 = "1l6970ng046hw2izzb15cbbbf83l6m8c9mvic8fzjixfi3g1dl55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/confluence";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/confluence";
           sha256 = "003lykwd3ya0xwlahmm35nx9p6mk8vylq57yxrmgdcc64630bdpf";
           name = "confluence";
         };
         packageRequires = [ xml-rpc ];
         meta = {
-          homepage = "http://melpa.org/#/confluence";
+          homepage = "https://melpa.org/#/confluence";
           license = lib.licenses.free;
         };
       }) {};
@@ -8838,13 +9237,13 @@
           sha256 = "0sz3qx1bn0lwjhka2l6wfl4b5486ji9dklgjs7fdlkg3dgpp1ahx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/conkeror-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/conkeror-minor-mode";
           sha256 = "1ch108f20k7xbf79azsp31hh4wmw7iycsxddcszgxkbm7pj11933";
           name = "conkeror-minor-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/conkeror-minor-mode";
+          homepage = "https://melpa.org/#/conkeror-minor-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -8859,13 +9258,13 @@
           sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/connection";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/connection";
           sha256 = "1y68d2kay8p5vapailxhrc5dl7b8k8nkvp7pa54md3fsivwp1d0q";
           name = "connection";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/connection";
+          homepage = "https://melpa.org/#/connection";
           license = lib.licenses.free;
         };
       }) {};
@@ -8880,13 +9279,13 @@
           sha256 = "0ykc3lzdypf543dgm7jpi70z08kz9hwhn2gvp06ylb22id8b3fai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/contextual";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/contextual";
           sha256 = "0vribs0fa1xf5kwkmvzjwhiawni0p3v56c5l4dkz8d7wn2g6wfdx";
           name = "contextual";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/contextual";
+          homepage = "https://melpa.org/#/contextual";
           license = lib.licenses.free;
         };
       }) {};
@@ -8901,13 +9300,13 @@
           sha256 = "1qsq543rb0z2fq716a2khs8zqyh13npzmbj58f00s8b3w3andpbh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/control-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/control-mode";
           sha256 = "1biq4p2w8rqcbvr09gxbchjqlaixjf1fzv7xv8lpv81dlhi7dgz6";
           name = "control-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/control-mode";
+          homepage = "https://melpa.org/#/control-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -8922,55 +9321,76 @@
           sha256 = "1x87rra9pxvcs8jxnzhg2jr9wq0l3kp3qqqsw77bc4jsizdndss1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/corral";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/corral";
           sha256 = "1drccqk4qzkgvkgkzlrrfd1dcgj8ziqriijrjihrzjgjsbpzv6da";
           name = "corral";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/corral";
+          homepage = "https://melpa.org/#/corral";
           license = lib.licenses.free;
         };
       }) {};
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20160221.1109";
+        version = "20160425.507";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "4af5c2e4e83f51da91675b0de7301b09c4b24b2c";
-          sha256 = "0ra5sa0dfrh1bv1q3r81r92i6xzazvw3lzz5n5qfbxcpnf8lygzk";
+          rev = "c24a3728538dd7d11de9f141b3ad1d8e0996c330";
+          sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/counsel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/counsel";
           sha256 = "0y8cb2q4mqvzan5n8ws5pjpm7bkjcghg5q19mzc3gqrq9vrvyzi6";
           name = "counsel";
         };
         packageRequires = [ emacs swiper ];
         meta = {
-          homepage = "http://melpa.org/#/counsel";
+          homepage = "https://melpa.org/#/counsel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    melpaBuild {
+        pname = "counsel-projectile";
+        version = "20160414.531";
+        src = fetchFromGitHub {
+          owner = "ericdanan";
+          repo = "counsel-projectile";
+          rev = "a724fc0941d22620b0a783be449ff619d240d38e";
+          sha256 = "12mzbnby865r011ai678wnp88c538zchz2n6mqdvmpg4fph5kxq2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/counsel-projectile";
+          sha256 = "1gshphxaa902kq878rnizn3k1zycakwqkciz92z3xxb3bdyy0hnl";
+          name = "counsel-projectile";
+        };
+        packageRequires = [ counsel projectile ];
+        meta = {
+          homepage = "https://melpa.org/#/counsel-projectile";
           license = lib.licenses.free;
         };
       }) {};
     coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }:
     melpaBuild {
         pname = "coverage";
-        version = "20160219.1753";
+        version = "20160222.314";
         src = fetchFromGitHub {
           owner = "trezona-lecomte";
           repo = "coverage";
-          rev = "57476dc0523a702e9772ebf2d500b1e1b56920b2";
-          sha256 = "0ss00jqwvgb9xk2fjx7z023lqfsfz6axw7ylfp5ji60lp5wbi0qs";
+          rev = "d68e5d20108e280b11a802a671bd009c7dcfff89";
+          sha256 = "0glnvr10lwi17g44653qqswn9vnyh5r2nmpaa0y6lvfb952zn0k0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/coverage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/coverage";
           sha256 = "0ja7wsx2sj0h01sk1l3c0aidbs1ld4gj3kiwq6brs7r018sz45pm";
           name = "coverage";
         };
         packageRequires = [ cl-lib ov ];
         meta = {
-          homepage = "http://melpa.org/#/coverage";
+          homepage = "https://melpa.org/#/coverage";
           license = lib.licenses.free;
         };
       }) {};
@@ -8985,34 +9405,55 @@
           sha256 = "1z67x4a0aricd9q6i2w33k74alddl6w0rijjhzyxwml7ibhbvphz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cp5022x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cp5022x";
           sha256 = "0v1jhkix01l299m67jag43rnps68m19zy83vvdglxa8dj3naz5dl";
           name = "cp5022x";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cp5022x";
+          homepage = "https://melpa.org/#/cp5022x";
           license = lib.licenses.free;
         };
       }) {};
     cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cpputils-cmake";
-        version = "20160216.2240";
+        version = "20160313.1858";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "cpputils-cmake";
-          rev = "f18c96750b1b2f4e1537fac7df2818524ccda665";
-          sha256 = "0ky59gz5pvi4m5b9rh13ywfmclrmiwalynpqw652rmc6yfzv0fnz";
+          rev = "6821b63b82caed769bd679a5753b721225bafa91";
+          sha256 = "0wrg84szxnqy95piyxyd7w6jiwsfimnjfaprl1g9szdyi3w99kmq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cpputils-cmake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cpputils-cmake";
           sha256 = "0fswmmmrjv897n51nidmn8gs8yp00595g35vwjafsq6rzfg58j60";
           name = "cpputils-cmake";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cpputils-cmake";
+          homepage = "https://melpa.org/#/cpputils-cmake";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cql-mode";
+        version = "20160413.1943";
+        src = fetchFromGitHub {
+          owner = "Yuki-Inoue";
+          repo = "cql-mode";
+          rev = "060610c5570a26838b1502fd7576777ff713ea25";
+          sha256 = "18nxsd1axd3m70p7cw4ifcj33z9v5w25v6g09q38maixymlad962";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cql-mode";
+          sha256 = "0wdal8w0i73xjak2g0wazs54z957f4lj4n8qdmzpcylzpl1lqd88";
+          name = "cql-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/cql-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -9027,13 +9468,13 @@
           sha256 = "0y37fx4ghx8a74cp7ci6p5yfpji8g42hlah2xcwfnyw0qlpqfbnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/crab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/crab";
           sha256 = "1jz26bw2h7ahcb7y2qhpqrlfald244c92m6pvfrb0jg0z384i6aj";
           name = "crab";
         };
         packageRequires = [ json websocket ];
         meta = {
-          homepage = "http://melpa.org/#/crab";
+          homepage = "https://melpa.org/#/crab";
           license = lib.licenses.free;
         };
       }) {};
@@ -9048,13 +9489,13 @@
           sha256 = "12g6l6xlbs9h24q5lk8yjgk91xqd7r3v7r6czy10r09cmfjmkxbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/crappy-jsp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/crappy-jsp-mode";
           sha256 = "00wj61maib77qldzq06l9v0pbvp9jih75w1xw0ry9mij0r6ca8ii";
           name = "crappy-jsp-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/crappy-jsp-mode";
+          homepage = "https://melpa.org/#/crappy-jsp-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -9069,13 +9510,13 @@
           sha256 = "0l4bvk3m355b25d7pdnhczn3fckbq0rg2l4r0a0d94004ksvylqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/creds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/creds";
           sha256 = "0n11xxaf93bbc9ih25wj09zzw4sj32wb99qig4zcy8bpkl5y3llk";
           name = "creds";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/creds";
+          homepage = "https://melpa.org/#/creds";
           license = lib.licenses.free;
         };
       }) {};
@@ -9090,13 +9531,13 @@
           sha256 = "18c4jfjnhb7asdhwj41g06cp9rz5xd7bbx2s1xvk6gahay27rlrv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/creole";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/creole";
           sha256 = "1pqgm7m2gzkn65v3qic71c38qiira29cwx11l96qph8h8sf47zw5";
           name = "creole";
         };
         packageRequires = [ kv noflet ];
         meta = {
-          homepage = "http://melpa.org/#/creole";
+          homepage = "https://melpa.org/#/creole";
           license = lib.licenses.free;
         };
       }) {};
@@ -9111,13 +9552,13 @@
           sha256 = "0japww5x89vd1ahjm2bc3biz6wxv94vvqq5fyyzkqsblgk5bys0h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/creole-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/creole-mode";
           sha256 = "1lj9a0bgn7lmc2wyjzzvmpaz1f1spj02l51ki2wydjbfhxq61k0s";
           name = "creole-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/creole-mode";
+          homepage = "https://melpa.org/#/creole-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -9132,13 +9573,13 @@
           sha256 = "1kl6blr4dlz40gfc845071nhfms4fm59284ja2177bhghy3wmw6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/crm-custom";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/crm-custom";
           sha256 = "14w15skxr44p9ilhpswlgdbqfw8jghxi69l37yk4m449m7g9694c";
           name = "crm-custom";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/crm-custom";
+          homepage = "https://melpa.org/#/crm-custom";
           license = lib.licenses.free;
         };
       }) {};
@@ -9153,13 +9594,13 @@
           sha256 = "1r9dhk8h8lq18vi0hjai8y4z42yjxg18786mcr2qs5m3q1ampf9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/crontab-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/crontab-mode";
           sha256 = "16qc2isvf6cgl5ihdbwmvv0gbhns4mkhd5lxkl6f8f6h0za054ci";
           name = "crontab-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/crontab-mode";
+          homepage = "https://melpa.org/#/crontab-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -9168,38 +9609,38 @@
         pname = "crosshairs";
         version = "20151231.1438";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/crosshairs.el";
+          url = "https://www.emacswiki.org/emacs/download/crosshairs.el";
           sha256 = "120hxk82i0r4qan4hfk9ldmw5a8bzv7p683lrnlcx9gyxgkia3am";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/crosshairs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/crosshairs";
           sha256 = "1gf73li6q5rg1dimzihxq0rdxiqzbl2w78r1qzc9mxw3qj7azxqp";
           name = "crosshairs";
         };
         packageRequires = [ col-highlight hl-line-plus vline ];
         meta = {
-          homepage = "http://melpa.org/#/crosshairs";
+          homepage = "https://melpa.org/#/crosshairs";
           license = lib.licenses.free;
         };
       }) {};
     crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "crux";
-        version = "20160214.437";
+        version = "20160405.4";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "crux";
-          rev = "ca62859c495732b720faebf9a08e40fd5db0d947";
-          sha256 = "0skwj8cp8x2v8443jp03safrfx9adabdgsp01x95jhlc5hf2hfdc";
+          rev = "6d11d2e6b56e237bb871af7e21ba6ef30e0a10da";
+          sha256 = "0yxs0bqb2z2zpvbysbmlsiyij49cxfjkb1a46vms6s2gpbj940h7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/crux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/crux";
           sha256 = "10lim1sngqbdqqwyq6ksqjjqpkm97aj1jk550sgwj28338lnw73c";
           name = "crux";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/crux";
+          homepage = "https://melpa.org/#/crux";
           license = lib.licenses.free;
         };
       }) {};
@@ -9214,13 +9655,13 @@
           sha256 = "00wgbcw09xn9xi52swi4wyi9dj9p9hyin7i431xi6zkhxysw4q7w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cryptol-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cryptol-mode";
           sha256 = "08iq69gqmps8cckybhj9065b8a2a49p0rpzgx883qxnypsmjfmf2";
           name = "cryptol-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cryptol-mode";
+          homepage = "https://melpa.org/#/cryptol-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -9229,61 +9670,61 @@
         pname = "cryptsy-public-api";
         version = "20141008.728";
         src = fetchFromGitHub {
-          owner = "sodaware";
+          owner = "Sodaware";
           repo = "cryptsy-public-api.el";
           rev = "59bdf2425dccc27cc1598868a1a810885508cff5";
           sha256 = "0ry0087g1br3397js7a9iy6k2x6p0dgqlggxx9gaqhms7pmpq14b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cryptsy-public-api";
-          sha256 = "1v78rm44af3vgsml5f6kpwvnb4ks6n49br2fhjgh6nc7g3jmz97n";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cryptsy-public-api";
+          sha256 = "1331nrx57136k09a7p6imv0k9g6w8ibpwn5xmv33dxc22hsmc41j";
           name = "cryptsy-public-api";
         };
         packageRequires = [ json ];
         meta = {
-          homepage = "http://melpa.org/#/cryptsy-public-api";
+          homepage = "https://melpa.org/#/cryptsy-public-api";
           license = lib.licenses.free;
         };
       }) {};
     csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "csharp-mode";
-        version = "20160217.1411";
+        version = "20160414.422";
         src = fetchFromGitHub {
           owner = "josteink";
           repo = "csharp-mode";
-          rev = "57b23533673b39da9cd6d76f69a52ac4a2a607cb";
-          sha256 = "1q5kpzxgv14dj1q2dmlpxw2yj01gv3mjl2shhr1n89z8zpf6figl";
+          rev = "a631944161af0de659695dcfad19940f65716175";
+          sha256 = "00gccc5sl6ng2g9hayckjp6ib93v5azhmhiksmxxddkqwhgw0qg3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/csharp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/csharp-mode";
           sha256 = "17j84qrprq492dsn103dji8mvh29mbdlqlpsszbgfdgnpvfr1rv0";
           name = "csharp-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/csharp-mode";
+          homepage = "https://melpa.org/#/csharp-mode";
           license = lib.licenses.free;
         };
       }) {};
     css-comb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "css-comb";
-        version = "20150502.1528";
+        version = "20160416.59";
         src = fetchFromGitHub {
           owner = "channikhabra";
           repo = "css-comb.el";
-          rev = "980251dc5d3ce0e607498f8a793f6d67a77d9cda";
-          sha256 = "0ljhar80kk7k54jz1xiq4r0w6s1wkacl7qz9wkvvbzhjb0z049hq";
+          rev = "6fa45e5af8a8bd3af6c1154cde3540e32c4206ee";
+          sha256 = "0nvl6y90p9crk12j7aw0cqdjhli7xbrx3hqckxsnvrnxy4zax7nk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/css-comb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/css-comb";
           sha256 = "1axwrvbc3xl1ixhh72bii3hhbi9d96y6i1my1rpvwqyd6f7wb2cf";
           name = "css-comb";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/css-comb";
+          homepage = "https://melpa.org/#/css-comb";
           license = lib.licenses.free;
         };
       }) {};
@@ -9298,13 +9739,13 @@
           sha256 = "1mgc6bd0dzrp1dq1yj8m2qxjnpysd8ppdk2yp96d3zd07zllw4rx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/css-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/css-eldoc";
           sha256 = "1f079q3ccrr4drk2hvn4xs4vbrd3hg87xqbk3r9mmjvkagd1v7rf";
           name = "css-eldoc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/css-eldoc";
+          homepage = "https://melpa.org/#/css-eldoc";
           license = lib.licenses.free;
         };
       }) {};
@@ -9319,13 +9760,13 @@
           sha256 = "0hyf4im7b8zka065daw7yxrb3670dpp8q92vd2gcsva1jla92h9y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cssfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cssfmt";
           sha256 = "12yq4dhyv3p5gxnd2w193ilpj2d3gx5ns09w0z1zkg7ax3a4q4b8";
           name = "cssfmt";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cssfmt";
+          homepage = "https://melpa.org/#/cssfmt";
           license = lib.licenses.free;
         };
       }) {};
@@ -9340,13 +9781,13 @@
           sha256 = "1xf2hy077frfz8qf91c0l0qppcjxzr4bsbb622bx6fidqkpa3a1a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cssh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cssh";
           sha256 = "10yvvyzqr06jvijmzis9clb1slzp2mn80yclis8wvrmg4p8djljk";
           name = "cssh";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cssh";
+          homepage = "https://melpa.org/#/cssh";
           license = lib.licenses.free;
         };
       }) {};
@@ -9354,17 +9795,17 @@
         pname = "csv-nav";
         version = "20130407.1320";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/csv-nav.el";
+          url = "https://www.emacswiki.org/emacs/download/csv-nav.el";
           sha256 = "15rfg3326xcs3zj3siy9rn7yff101vfch1srskdi2650c3l3krva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/csv-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/csv-nav";
           sha256 = "0626vsm2f5zc2wi5pyx4xrwcr4ai8w9a3l7gi9883smvayr619sj";
           name = "csv-nav";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/csv-nav";
+          homepage = "https://melpa.org/#/csv-nav";
           license = lib.licenses.free;
         };
       }) {};
@@ -9379,13 +9820,13 @@
           sha256 = "07vasdlai49qs0nsmq2cz1kcq1adqyarv8199imgwwcbh4vn7dqb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ctable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ctable";
           sha256 = "040qmlgfvjc1f908n52m5ll2fizbrhjzbd0kgrsw37bvm3029rx1";
           name = "ctable";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ctable";
+          homepage = "https://melpa.org/#/ctable";
           license = lib.licenses.free;
         };
       }) {};
@@ -9398,13 +9839,13 @@
           sha256 = "1xgrb4ivgz7gmingfafmclqqflxdvkarmfkqqv1zjk6yrjhlcvwf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ctags";
           sha256 = "11fp8l99rj4fmi0vd3hkffgpfhk1l82ggglzb74jr3qfzv3dcn6y";
           name = "ctags";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ctags";
+          homepage = "https://melpa.org/#/ctags";
           license = lib.licenses.free;
         };
       }) {};
@@ -9419,13 +9860,13 @@
           sha256 = "1va394nls4yi77rgm0kz5r00xiidj6lwcabhqxisz08m3h8gfkh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ctags-update";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ctags-update";
           sha256 = "1k43l667mvr2y33nblachdlvdqvn256gysc1iwv5zgv7gj9i65qf";
           name = "ctags-update";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ctags-update";
+          homepage = "https://melpa.org/#/ctags-update";
           license = lib.licenses.free;
         };
       }) {};
@@ -9440,13 +9881,13 @@
           sha256 = "1d89gxyzv0z0nk7v1aa4qa0xfms2g2dsrr07cw0d99xsnyxfky31";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ctl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ctl-mode";
           sha256 = "0fydq779b0y6hmh8srfdimr5rl9mk3sj08rbvlljxv3kqv5ajczj";
           name = "ctl-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ctl-mode";
+          homepage = "https://melpa.org/#/ctl-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -9461,13 +9902,13 @@
           sha256 = "1jlr2miwqsg06hk2clvsrw9fa98m2n76qfq8qv5svrb8dpil04wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ctxmenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ctxmenu";
           sha256 = "03g9px858mg19wapqszwav3599slljdyam8bvn1ri85fpa5ydvdp";
           name = "ctxmenu";
         };
         packageRequires = [ log4e popup yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/ctxmenu";
+          homepage = "https://melpa.org/#/ctxmenu";
           license = lib.licenses.free;
         };
       }) {};
@@ -9482,13 +9923,13 @@
           sha256 = "184plai32sn0indvi1dma6ykz907zgnrdyxdw6f5mghwca96g5kx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cucumber-goto-step";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cucumber-goto-step";
           sha256 = "1ydsd455dvaw6a180b6570bfgg0kxn01sn6cb57smqj835am6gx8";
           name = "cucumber-goto-step";
         };
         packageRequires = [ pcre2el ];
         meta = {
-          homepage = "http://melpa.org/#/cucumber-goto-step";
+          homepage = "https://melpa.org/#/cucumber-goto-step";
           license = lib.licenses.free;
         };
       }) {};
@@ -9503,13 +9944,13 @@
           sha256 = "1ms0z5zplcbdwwdbgsjsbm32i57z9i2i8j9y3wm0pwzyz4zr36zy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cuda-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cuda-mode";
           sha256 = "0ip4vax93x72bjrh6prik6ddmrvszpsmgm0fxfz772rp24smc300";
           name = "cuda-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cuda-mode";
+          homepage = "https://melpa.org/#/cuda-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -9517,17 +9958,17 @@
         pname = "cursor-chg";
         version = "20151231.1440";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/cursor-chg.el";
+          url = "https://www.emacswiki.org/emacs/download/cursor-chg.el";
           sha256 = "1w0msh4mfhwglkwgb8ksqfdzbd1bvspllydnjzhc0yl3s7qrifbd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cursor-chg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cursor-chg";
           sha256 = "0d1ilall8c1y4w014wks9yx4fz743hvx5lc8jqxxlrq7pmqyqdxk";
           name = "cursor-chg";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cursor-chg";
+          homepage = "https://melpa.org/#/cursor-chg";
           license = lib.licenses.free;
         };
       }) {};
@@ -9542,13 +9983,13 @@
           sha256 = "0wmnhizv4jfcl1w9za4ydxf6xwxgm5vwmn1zi5vn70zmv4d6r49l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cursor-test";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cursor-test";
           sha256 = "1c1d5xq4alamlwyqxjx557aykz5dw87acp0lyglsrzzkdynbwlb1";
           name = "cursor-test";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/cursor-test";
+          homepage = "https://melpa.org/#/cursor-test";
           license = lib.licenses.free;
         };
       }) {};
@@ -9556,17 +9997,17 @@
         pname = "cus-edit-plus";
         version = "20151231.1441";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/cus-edit+.el";
+          url = "https://www.emacswiki.org/emacs/download/cus-edit+.el";
           sha256 = "1p0kacbw5zfrd7zplhlh7j1890spvn8p0bryvqqmyf8w5873pcmh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cus-edit+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cus-edit+";
           sha256 = "1kazcdfajcnrzvhsgsmwwx96rkry0dglprrc02hbd7ky1fppp4sz";
           name = "cus-edit-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cus-edit+";
+          homepage = "https://melpa.org/#/cus-edit+";
           license = lib.licenses.free;
         };
       }) {};
@@ -9581,13 +10022,13 @@
           sha256 = "1yhizh8j745hv5ancpvijds9dasvsr2scwjscksp2x3krnd26ssp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cyberpunk-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cyberpunk-theme";
           sha256 = "0l2bwb5afkkhrbh99v2gns1vil9s5911hbnlq5w35nmg1wvbmbc9";
           name = "cyberpunk-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cyberpunk-theme";
+          homepage = "https://melpa.org/#/cyberpunk-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -9602,13 +10043,13 @@
           sha256 = "1d5i8sm1xrsp4v4myidfyb40hm3wp7hgva7dizg9gbb7prmn1p5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cycbuf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cycbuf";
           sha256 = "0gyj48h5wgjawqq3j4hgk5a8d23nffmhd1q53kg7b9vfsda51hbw";
           name = "cycbuf";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cycbuf";
+          homepage = "https://melpa.org/#/cycbuf";
           license = lib.licenses.free;
         };
       }) {};
@@ -9623,13 +10064,13 @@
           sha256 = "0hf3r89n9zn7wkay71drxadsnd9zm6p6kvg5mvwzdy3x3z4cfyi3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cycle-resize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cycle-resize";
           sha256 = "0vp57plwqx4nf3pbv5g4frjriq8niiia9xc3bv6c3gzd4a0zm7xi";
           name = "cycle-resize";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cycle-resize";
+          homepage = "https://melpa.org/#/cycle-resize";
           license = lib.licenses.free;
         };
       }) {};
@@ -9644,13 +10085,13 @@
           sha256 = "125s6vwbb9zpx6h3vrxnn7nr8pb45vhxd70ba2r3f87dlxah93am";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cycle-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cycle-themes";
           sha256 = "1whp9q26sgyf59wygbrvdf9gc94bn4dmhr2f2qivpajx550fjfbc";
           name = "cycle-themes";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/cycle-themes";
+          homepage = "https://melpa.org/#/cycle-themes";
           license = lib.licenses.free;
         };
       }) {};
@@ -9658,17 +10099,17 @@
         pname = "cygwin-mount";
         version = "20131111.1546";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/cygwin-mount.el";
+          url = "https://www.emacswiki.org/emacs/download/cygwin-mount.el";
           sha256 = "09my4gj3qm9rdpk8lg6n6ki8ywj7kwzwd4hhgwascfnfi1hzwdvw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cygwin-mount";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cygwin-mount";
           sha256 = "0ik2c8ab9bsx58mgcv511p50h45cpv7455n4b0kri83sx9xf5abb";
           name = "cygwin-mount";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cygwin-mount";
+          homepage = "https://melpa.org/#/cygwin-mount";
           license = lib.licenses.free;
         };
       }) {};
@@ -9683,13 +10124,13 @@
           sha256 = "1xcd8j5chh5j3fibi8bg2il6r09vza5xlb5fqm9j8sg3vkab26z8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cyphejor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cyphejor";
           sha256 = "18l5km4xm5j3vv19k3fxs8i3rg4qnhrvx7b62vmyfcqmpiasrh6g";
           name = "cyphejor";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/cyphejor";
+          homepage = "https://melpa.org/#/cyphejor";
           license = lib.licenses.free;
         };
       }) {};
@@ -9704,13 +10145,13 @@
           sha256 = "0vbcq807jpjssabmyjcdkpp6nnx1288is2c6x79dkrviw2xxw3qf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cypher-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cypher-mode";
           sha256 = "174rfbm7yzkznkfjmh9bdnm5fgqv9bjwm85h39317pv1g8c3mgv0";
           name = "cypher-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cypher-mode";
+          homepage = "https://melpa.org/#/cypher-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -9721,17 +10162,17 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "eca0803d7ce59597cdaf35fd54ce7cda193f262b";
-          sha256 = "1r9mky9qm8y49pwr3qqbgydvvjnxkd1c0wfj6h0izrmpwjz35r0r";
+          rev = "d591d500d9b0505ffd01021c0cebc35b872efa15";
+          sha256 = "1923rizwm73vy9pkr4lznywq1d2rfswy387k3l6wp00c9fxp9yqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cython-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cython-mode";
           sha256 = "0asai1f1pncrfxx296fn6ky09hj1qam5j0dpxxkzhy0a34xz0k2i";
           name = "cython-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cython-mode";
+          homepage = "https://melpa.org/#/cython-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -9746,34 +10187,34 @@
           sha256 = "1ck1a61m0kjynqwzbw9hnc7y2a6gd6l1430wm7mw3qqsq959qwm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/czech-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/czech-holidays";
           sha256 = "10c0zscbn7pr9xqdqksy4kh0cxjg9bhw8p4qzlk18fd4c8rhqn84";
           name = "czech-holidays";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/czech-holidays";
+          homepage = "https://melpa.org/#/czech-holidays";
           license = lib.licenses.free;
         };
       }) {};
     d-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "d-mode";
-        version = "20151206.154";
+        version = "20160416.1138";
         src = fetchFromGitHub {
           owner = "Emacs-D-Mode-Maintainers";
           repo = "Emacs-D-Mode";
-          rev = "5501b77a1e212e27dd78e8c0e86424064b439cbb";
-          sha256 = "0fqirypxhbvnhz86rznwdx553ppg0z0hxh1h04qg7y58g01vpsdq";
+          rev = "600c70be3b9d925caa63d8396a166dd8173f30f5";
+          sha256 = "1zp73jy6wpjvd2xsclqazxqih1zp27gm43aiw9v35xsjh92w79z1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/d-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/d-mode";
           sha256 = "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2";
           name = "d-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/d-mode";
+          homepage = "https://melpa.org/#/d-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -9788,13 +10229,13 @@
           sha256 = "0fp40cyamchc9qq5vbpxgq3yp6vs8p3ncg46mjzr54psy3fc86dm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dactyl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dactyl-mode";
           sha256 = "0ppcabddcpwshfd04x42nbrbkagbyi1bg4vslysnlxn4kaxjs7pm";
           name = "dactyl-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dactyl-mode";
+          homepage = "https://melpa.org/#/dactyl-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -9809,34 +10250,55 @@
           sha256 = "0fd0h07m42q2h1ggsjra20kzv209rpb4apjv408h2dxqm8sy0jiy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dakrone-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dakrone-theme";
           sha256 = "0ma4rfmgwd6k24jzn6pgk46b88jfix7mz0ib7c7r90h5vmpiq814";
           name = "dakrone-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dakrone-theme";
+          homepage = "https://melpa.org/#/dakrone-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "danneskjold-theme";
+        version = "20160409.1217";
+        src = fetchFromGitHub {
+          owner = "rails-to-cosmos";
+          repo = "danneskjold-theme";
+          rev = "fb851230b9c0b87216a0974d038328cd44ab6d33";
+          sha256 = "1shysnf34qxd5rabad14a26m5id88g4wl4y4mwap53l2p3mcxq38";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/danneskjold-theme";
+          sha256 = "0cwab7qp293g92n9mjjz2vpg1pz2q3d40hfszf29rci89wsf3yxl";
+          name = "danneskjold-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/danneskjold-theme";
           license = lib.licenses.free;
         };
       }) {};
     darcula-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darcula-theme";
-        version = "20160123.1627";
+        version = "20160305.421";
         src = fetchFromGitHub {
           owner = "fommil";
           repo = "darcula-theme-emacs";
-          rev = "05c98433e23f2018e2e065dcdc534d73dac8e88e";
-          sha256 = "1abwx7fqbr395z3l3dshh242lxqpwr1mszmj1pxj420qi1qria6n";
+          rev = "eb799be242a9420a8e6730d659939d4703d44b43";
+          sha256 = "128a9iv1vrassmk4sy4cs4nj6lggr5v4rhjj04v1xssj5nn5flxf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/darcula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/darcula-theme";
           sha256 = "13d21gwzv66ibn0gs56ff3sn76sa2mkjvjmpd2ncxq3mcgxajnjg";
           name = "darcula-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/darcula-theme";
+          homepage = "https://melpa.org/#/darcula-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -9851,34 +10313,34 @@
           sha256 = "07w5aycgaps904q8lk52d0g28wxq41c82xgl5mw2q56n3s5iixfx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dark-krystal-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dark-krystal-theme";
           sha256 = "056aql35502sgvdpbgphpqdxzbjf4ay01rra6pm11c1dya8avv0j";
           name = "dark-krystal-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/dark-krystal-theme";
+          homepage = "https://melpa.org/#/dark-krystal-theme";
           license = lib.licenses.free;
         };
       }) {};
     dark-mint-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dark-mint-theme";
-        version = "20160217.1502";
+        version = "20160302.42";
         src = fetchFromGitHub {
           owner = "shaunvxc";
           repo = "dark-mint-theme";
-          rev = "1a6d7e49982832c0a282128e011512161c8f2b21";
-          sha256 = "0xsbmhpyis0c0hfk6qzx298pw042ns44qmm80qf8hwhhqp38mfyx";
+          rev = "95c30a26de31549cd341184ba9ab2be8fdc67eba";
+          sha256 = "052k8mqxx8lkadxyz6rwa7l741rwbd1blk2ggpsj2s1g6p9l68a1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dark-mint-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dark-mint-theme";
           sha256 = "0rljpwycarbn8rnac9vz7n23j69wmx35gn5dx77v0f0ws8ni4k9m";
           name = "dark-mint-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dark-mint-theme";
+          homepage = "https://melpa.org/#/dark-mint-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -9893,13 +10355,13 @@
           sha256 = "1w0y2j0j9n107dbk7ksr9bipshjfs9dk08qbs9m6h5aqh4hmwa4r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dark-souls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dark-souls";
           sha256 = "1ilsn657mpl7v8vkbzqf3gp0gmvy0dgynfsn8w4cb49qaiy337xc";
           name = "dark-souls";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dark-souls";
+          homepage = "https://melpa.org/#/dark-souls";
           license = lib.licenses.free;
         };
       }) {};
@@ -9914,55 +10376,55 @@
           sha256 = "19vrxfzhi0sqf7frzjx5z02d65r2jp1w2nhhf0527g7baid5hqvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/darkburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/darkburn-theme";
           sha256 = "18hwdnwmkf640vcyx8d66i424wwazbzjq3k0w0xjmwsn2mpyhm9w";
           name = "darkburn-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/darkburn-theme";
+          homepage = "https://melpa.org/#/darkburn-theme";
           license = lib.licenses.free;
         };
       }) {};
     darkmine-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darkmine-theme";
-        version = "20151216.832";
+        version = "20160406.124";
         src = fetchFromGitHub {
           owner = "pierre-lecocq";
           repo = "darkmine-theme";
-          rev = "8cd5ff16bede4c8e1d063bc46fc1089a36a05bd3";
-          sha256 = "0ajxlrnz1228w8ldgraw6a4s605isbr67p8s382jvia2zf821fmp";
+          rev = "7f7e82ca03bcad52911fa41fb3e204e32d6ee63e";
+          sha256 = "0d2g4iyp8gyfrcc1gkvl40p1shlw1sadswzhry0m1lgbyxiiklrz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/darkmine-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/darkmine-theme";
           sha256 = "06vzldyqlmfd11g8dqrqh5x244ikfa20qwpsmbgsiry3041k8iw5";
           name = "darkmine-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/darkmine-theme";
+          homepage = "https://melpa.org/#/darkmine-theme";
           license = lib.licenses.free;
         };
       }) {};
     darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darktooth-theme";
-        version = "20151121.1922";
+        version = "20160406.1024";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-darktooth";
-          rev = "ce2d8d5faeb72205bdcb192dfc1e4769e7088fa3";
-          sha256 = "1p7ih9fmcxnnxkj2mz56xa403m828wyyqvliabf5amklzjlhb3z9";
+          rev = "b9c8bd4d513b422412be92bb807782905001b101";
+          sha256 = "0qqak05w8y5734d78wc22l82y9riz12mxsg0b4zrjbd2l16bxf1c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/darktooth-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/darktooth-theme";
           sha256 = "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs";
           name = "darktooth-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/darktooth-theme";
+          homepage = "https://melpa.org/#/darktooth-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -9977,34 +10439,34 @@
           sha256 = "0ylzgaf4g0fh16rc061iaw3jrl2sjiwpr4x1ndk2bp0j14n7hqid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dart-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dart-mode";
           sha256 = "0wxfh8v716dhrmx1klhpnsrlsj66llk8brmwryjg2h7c391sb5ff";
           name = "dart-mode";
         };
         packageRequires = [ cl-lib dash flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/dart-mode";
+          homepage = "https://melpa.org/#/dart-mode";
           license = lib.licenses.free;
         };
       }) {};
     dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dash";
-        version = "20151216.1515";
+        version = "20160306.1422";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "8a46d3c7c126d3e979f7f9b36867a413694cd8df";
-          sha256 = "1g7vrfhafmkqwdpfllfiwirl4pi437pyaws38jsd8laxmsa4m4wb";
+          rev = "a9f90d7834337dadee1a69f2089e39fd81b22ba7";
+          sha256 = "04fdhxns5vn5iljni1sc8sw0mj53rlgyzafikddj7c7x7bpdc0iz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dash";
           sha256 = "0azm47900bk2frpjsgy108fr3p1jk4h9kmp4b5j5pibgsm26azgz";
           name = "dash";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dash";
+          homepage = "https://melpa.org/#/dash";
           license = lib.licenses.free;
         };
       }) {};
@@ -10019,13 +10481,13 @@
           sha256 = "0zd50sr51mmvndjb9qfc3sn502nhc939rhd454jbkmlrzqsxvphj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dash-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dash-at-point";
           sha256 = "0x4nq42nbh2qgbg111lgbknc7w7m7lxd14mp9s8dcrpwsaxz960m";
           name = "dash-at-point";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dash-at-point";
+          homepage = "https://melpa.org/#/dash-at-point";
           license = lib.licenses.free;
         };
       }) {};
@@ -10036,17 +10498,17 @@
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "8a46d3c7c126d3e979f7f9b36867a413694cd8df";
-          sha256 = "1g7vrfhafmkqwdpfllfiwirl4pi437pyaws38jsd8laxmsa4m4wb";
+          rev = "a9f90d7834337dadee1a69f2089e39fd81b22ba7";
+          sha256 = "04fdhxns5vn5iljni1sc8sw0mj53rlgyzafikddj7c7x7bpdc0iz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dash-functional";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dash-functional";
           sha256 = "0hx36hs12mf4nmskaaqrqpcgwrfjdqj6qcxn6bwb0s5m2jf9hs8p";
           name = "dash-functional";
         };
         packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/dash-functional";
+          homepage = "https://melpa.org/#/dash-functional";
           license = lib.licenses.free;
         };
       }) {};
@@ -10061,13 +10523,13 @@
           sha256 = "0l4z9rjla4xvm2hmp07xil69q1cg0v8iff0ya41svaqr944qf7hf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/date-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/date-at-point";
           sha256 = "0r26df6px6q5jlxj29nhl3qbp6kzy9hs5vd72kpiirgn4wlmagp0";
           name = "date-at-point";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/date-at-point";
+          homepage = "https://melpa.org/#/date-at-point";
           license = lib.licenses.free;
         };
       }) {};
@@ -10082,13 +10544,13 @@
           sha256 = "1lmwnj2fnvijj9qp4rjggl7c4x91vnpb47rqaam6m2wmr5wbrx3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/date-field";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/date-field";
           sha256 = "0fmw13sa4ajs1xkrkdpcjpbp0jl9d81cgvwh93myg8yjjn7wbmvk";
           name = "date-field";
         };
         packageRequires = [ dash log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/date-field";
+          homepage = "https://melpa.org/#/date-field";
           license = lib.licenses.free;
         };
       }) {};
@@ -10103,13 +10565,13 @@
           sha256 = "0ry7magy9x63xv2apjbpgszp0slch92g23gqwl4rd564qafajmf0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/datomic-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/datomic-snippets";
           sha256 = "0lax0pj4k9c9n0gmrvil240pc9p25535q3n5m8nb2ar4sli8dn8r";
           name = "datomic-snippets";
         };
         packageRequires = [ dash s yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/datomic-snippets";
+          homepage = "https://melpa.org/#/datomic-snippets";
           license = lib.licenses.free;
         };
       }) {};
@@ -10124,13 +10586,13 @@
           sha256 = "1j0mk8vyr6sniliq0ix77jldx8vzl73nd5yhh82klzgyymal58ms";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dayone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dayone";
           sha256 = "0hi09dj00h6g5r84jxglwkgbijhfxknx4mq5gcl5jzjis5affk8l";
           name = "dayone";
         };
         packageRequires = [ ht mustache uuid ];
         meta = {
-          homepage = "http://melpa.org/#/dayone";
+          homepage = "https://melpa.org/#/dayone";
           license = lib.licenses.free;
         };
       }) {};
@@ -10145,13 +10607,13 @@
           sha256 = "0syv4kr319d34yqi4q61b8jh5yy22wvd148x1m3pc511znh2ry5k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/db";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/db";
           sha256 = "05jhga9n6gh1bmj8gda14sb703gn7jgjlvy55mlr5kdb2z3rqw1n";
           name = "db";
         };
         packageRequires = [ kv ];
         meta = {
-          homepage = "http://melpa.org/#/db";
+          homepage = "https://melpa.org/#/db";
           license = lib.licenses.free;
         };
       }) {};
@@ -10166,34 +10628,34 @@
           sha256 = "15r0qwjkl33p8kh2k5kxz9wnbkv1k470b1h0i6svvljkx9ynk68a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/db-pg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/db-pg";
           sha256 = "06nfibw01ijv7nr0m142y80jbbpg9kk1dh19s5wq7i6fqf7g08xg";
           name = "db-pg";
         };
         packageRequires = [ db pg ];
         meta = {
-          homepage = "http://melpa.org/#/db-pg";
+          homepage = "https://melpa.org/#/db-pg";
           license = lib.licenses.free;
         };
       }) {};
     ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ddskk";
-        version = "20160130.2300";
+        version = "20160315.908";
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "4cb5da1418f447423cb81ca99539f77a6067ad77";
-          sha256 = "145n50vspxaslvhf3ahlp435h5slz24csa2h62zly18xprw1ai1h";
+          rev = "444991051df5d8bd2babd4249d2311dc39890e37";
+          sha256 = "1mqz83yqgad7p5ssjil10w0bw0vm642xp18ms4id8pzcbxz8ygsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ddskk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ddskk";
           sha256 = "01pb00p126q7swsl12yjrhghln2wgaj65jhjr0k7dkk64x4psyc9";
           name = "ddskk";
         };
         packageRequires = [ ccc cdb ];
         meta = {
-          homepage = "http://melpa.org/#/ddskk";
+          homepage = "https://melpa.org/#/ddskk";
           license = lib.licenses.free;
         };
       }) {};
@@ -10208,13 +10670,13 @@
           sha256 = "1darxggvyv100cfb7imyzvgif8a09pnky62pf3bl2612hhvaijfb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/debpaste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/debpaste";
           sha256 = "1vgirfy4vdqkhllnnmcplhwmzqqwca3la5jfvvansykqriwbq9lw";
           name = "debpaste";
         };
         packageRequires = [ xml-rpc ];
         meta = {
-          homepage = "http://melpa.org/#/debpaste";
+          homepage = "https://melpa.org/#/debpaste";
           license = lib.licenses.free;
         };
       }) {};
@@ -10229,13 +10691,34 @@
           sha256 = "1n99nrp42slmyp5228d1nz174bysjn122jgs8fn1x0qxywg7jyxp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/debug-print";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/debug-print";
           sha256 = "01dsqq2qdsbxny6j9dhvg770493awxjhk1m85c14ysgh6sl199rm";
           name = "debug-print";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/debug-print";
+          homepage = "https://melpa.org/#/debug-print";
+          license = lib.licenses.free;
+        };
+      }) {};
+    decide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "decide";
+        version = "20160314.1448";
+        src = fetchFromGitHub {
+          owner = "lifelike";
+          repo = "decide-mode";
+          rev = "f243afc7cff11d9696552695e2dfc0ca91e1c5b6";
+          sha256 = "05n57djagbkm8im4168d5d2fr2ibfnckya7qzrca1f9rmm0ah15j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/decide";
+          sha256 = "1gjkays48lhrifi9jwja5n2dpxjbl7f9rmka1nsqg9vf7s59vhhc";
+          name = "decide";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/decide";
           license = lib.licenses.free;
         };
       }) {};
@@ -10250,13 +10733,13 @@
           sha256 = "01bafkc99g9vi45y95mi3sqin2lsfw885z63f7llpqvnfav86n4y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/decl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/decl";
           sha256 = "0wdhmp226wmrjvjgpbz8ihvhxxv3rrxh97sdqm3mgsav3n071n6k";
           name = "decl";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/decl";
+          homepage = "https://melpa.org/#/decl";
           license = lib.licenses.free;
         };
       }) {};
@@ -10271,34 +10754,34 @@
           sha256 = "0pba9s0h37sxyqh733vi6k5raa4cs7aradipf3826inw36jcw414";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dedicated";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dedicated";
           sha256 = "1ka8n02r3nd2ksbid23g2qd6707c7xsjx7lbbdi6pcmwam5mglw9";
           name = "dedicated";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dedicated";
+          homepage = "https://melpa.org/#/dedicated";
           license = lib.licenses.free;
         };
       }) {};
     dedukti-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dedukti-mode";
-        version = "20150820.908";
+        version = "20160329.1202";
         src = fetchFromGitHub {
           owner = "rafoo";
           repo = "dedukti-mode";
-          rev = "7d9f459c87c84f1067eb87542da4549de5e38650";
-          sha256 = "1haixiy94r50rfza64dypb7fi256231pf06g6p2il9kyscqg0zz2";
+          rev = "dab509952b6c64d0bb12b5f60dd93e3b38b01d62";
+          sha256 = "1lnvr1rxgf1i0dh1gqlkghz6r4lm1llpv3vhky313220ibxrpsvm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dedukti-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dedukti-mode";
           sha256 = "17adfmrhfks5f45ddr6ygjq870ac50vfzc5872ycv414zg0w4sa9";
           name = "dedukti-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dedukti-mode";
+          homepage = "https://melpa.org/#/dedukti-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -10313,13 +10796,13 @@
           sha256 = "1ysv1q7n7k2l4x8x7hlzmxmawyxl5lx627sbdv3phkvjh5zccsm8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/default-text-scale";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/default-text-scale";
           sha256 = "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi";
           name = "default-text-scale";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/default-text-scale";
+          homepage = "https://melpa.org/#/default-text-scale";
           license = lib.licenses.free;
         };
       }) {};
@@ -10334,13 +10817,13 @@
           sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/deferred";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/deferred";
           sha256 = "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr";
           name = "deferred";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/deferred";
+          homepage = "https://melpa.org/#/deferred";
           license = lib.licenses.free;
         };
       }) {};
@@ -10355,13 +10838,13 @@
           sha256 = "02i621yq2ih0zp7mna8iykj41prv77hvcadz7rx8c942zyvjzxqd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/define-word";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/define-word";
           sha256 = "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a";
           name = "define-word";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/define-word";
+          homepage = "https://melpa.org/#/define-word";
           license = lib.licenses.free;
         };
       }) {};
@@ -10376,50 +10859,50 @@
           sha256 = "07jzr571q02l0lg5d40rnmzg16hmybi1nkjgslmvlx46z3c4xvyr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/defproject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/defproject";
           sha256 = "1gld2fkssrjh4smpp54017549d6aw3n1zisp5s4kkb6cmszwj5gm";
           name = "defproject";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/defproject";
+          homepage = "https://melpa.org/#/defproject";
           license = lib.licenses.free;
         };
       }) {};
     deft = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "deft";
-        version = "20151222.725";
+        version = "20160422.1251";
         src = fetchgit {
           url = "git://jblevins.org/git/deft.git";
-          rev = "2dd64ddc798a009e62289d65abfa621735461b7a";
-          sha256 = "15c3ec6fcfae63201652394205fee951f3c1db8d3c6fc5f48c306b9b775c8e63";
+          rev = "5f8b46c984edf935cf130f761bf7a5b21ee25f33";
+          sha256 = "158krhblmjz87zyx308c66v5hncw8s2wvy3qsk8qv7rg9d7xg13g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/deft";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/deft";
           sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p";
           name = "deft";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/deft";
+          homepage = "https://melpa.org/#/deft";
           license = lib.licenses.free;
         };
       }) {};
     delight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "delight";
-        version = "20141128.837";
+        version = "20160305.1751";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/delight.el";
-          sha256 = "1gap2icsqi7cryfvcffh41zqg2ghl4y7kg9pngzdfjrc3m7sf635";
+          url = "https://www.emacswiki.org/emacs/download/delight.el";
+          sha256 = "0lqg23mpzcbcfkn84wm8i1bma73wpyh3m5f0zjrrzbwpgsmw8fqd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/delight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/delight";
           sha256 = "1d9m5k18k73vhidwd50mcbq7mlvwdn4sb9ih8r5gri9a9whi2nkj";
           name = "delight";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/delight";
+          homepage = "https://melpa.org/#/delight";
           license = lib.licenses.free;
         };
       }) {};
@@ -10434,13 +10917,13 @@
           sha256 = "06a20sd8nc273azrgha40l1fbqvv9qmxsmkjiqbf6dcf1blkwjyf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/delim-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/delim-kill";
           sha256 = "1pplc456771hi52ap1p87y7pabxlvm6raszcxjvnxff3xzw56pig";
           name = "delim-kill";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/delim-kill";
+          homepage = "https://melpa.org/#/delim-kill";
           license = lib.licenses.free;
         };
       }) {};
@@ -10455,34 +10938,34 @@
           sha256 = "13jfhc9gavvb9dxmgi3k7ivp5iwh4yw4m11r2s8wpwn6p056bmfl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/demangle-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/demangle-mode";
           sha256 = "0ky0bb6rc99vrdli4lhs656qjndnla9b7inc2ji9l4n1zki5qxzk";
           name = "demangle-mode";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/demangle-mode";
+          homepage = "https://melpa.org/#/demangle-mode";
           license = lib.licenses.free;
         };
       }) {};
     demo-it = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "demo-it";
-        version = "20160116.2141";
+        version = "20160413.1431";
         src = fetchFromGitHub {
           owner = "howardabrams";
           repo = "demo-it";
-          rev = "ca0e5b93d104d31152da13ee4c8d4d48c910a29f";
-          sha256 = "1hdnjwsmwbwn0ziyw805jjpaj3zpm374g9y4yn5ip4l9x4vq73xv";
+          rev = "85b6dcdbb0d257afc0ee4455340432d190aa6114";
+          sha256 = "0bilf8q2y28vymvi796qs20whw12wi2n2apyxwgcghwmlddzz29c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/demo-it";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/demo-it";
           sha256 = "063v115xy9mcga4qv16v538k12rn9maz92khzwa35wx56bwz4gg7";
           name = "demo-it";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/demo-it";
+          homepage = "https://melpa.org/#/demo-it";
           license = lib.licenses.free;
         };
       }) {};
@@ -10497,54 +10980,76 @@
           sha256 = "13fasbhdjwc4jh3cy25gm5sbbg56hq8la271098qpx6dhqm2wycq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/describe-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/describe-number";
           sha256 = "0gvriailni2ppz69g0bwnb1ik1ghjkj341k45vllz30j0frp9iji";
           name = "describe-number";
         };
         packageRequires = [ yabin ];
         meta = {
-          homepage = "http://melpa.org/#/describe-number";
+          homepage = "https://melpa.org/#/describe-number";
           license = lib.licenses.free;
         };
       }) {};
     desktop-plus = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "desktop-plus";
-        version = "20151004.1440";
+        version = "20160330.812";
         src = fetchFromGitHub {
           owner = "ffevotte";
           repo = "desktop-plus";
-          rev = "8ef242d0aa6f715ff4c5abbc4ee6be66a90ffedd";
-          sha256 = "18k5898r4n96h93xsvjrpm90hz3rd0ir6x3axjzqwwrgs2ik7pj2";
+          rev = "a9cb8dd0af5071d9f148211b408c54306239381c";
+          sha256 = "10f5dkrwfd6a1ab98j2kywkh1h01pnanvj2i7fv9a9vxnmiywrcf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/desktop+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/desktop+";
           sha256 = "0w7i6k4814hwb19l7ly9yq59674xiw57ylrwxq7yprwx52sgs2r8";
           name = "desktop-plus";
         };
         packageRequires = [ dash emacs f ];
         meta = {
-          homepage = "http://melpa.org/#/desktop+";
+          homepage = "https://melpa.org/#/desktop+";
           license = lib.licenses.free;
         };
       }) {};
-    desktop-registry = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    desktop-registry = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "desktop-registry";
         version = "20140119.1543";
-        src = fetchgit {
-          url = "git://ryuslash.org/desktop-registry.git";
+        src = fetchFromGitHub {
+          owner = "ryuslash";
+          repo = "desktop-registry";
           rev = "244c2e7f9f0a1050aa8a47ad0b38f4e4584682dd";
-          sha256 = "7c7727dd1d63be98e428700bfe340f2c4e7ff713fcc9b2b743a3366d786ae02d";
+          sha256 = "11qvhbz7149vqh61fgqqn4inw0ic6ib9lz2xgr9m54pdw9a901mp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/desktop-registry";
-          sha256 = "02mj0nlawx6vpksqsvp1q7l8rd6b1bs8f9c8c2rmda46jaf5npyr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/desktop-registry";
+          sha256 = "1sfj0w6hlrx37js63fn1v5xc9ngmahv07g42z68717md6w3c8g0v";
           name = "desktop-registry";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/desktop-registry";
+          homepage = "https://melpa.org/#/desktop-registry";
+          license = lib.licenses.free;
+        };
+      }) {};
+    devdocs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "devdocs";
+        version = "20160412.1408";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "devdocs.el";
+          rev = "502ccc623b58c75ebefc10e41b8c635fc5d0baf9";
+          sha256 = "0m4gw6jsdj8pq6wxvvczwvp8pcjnz57ybnb9zib4bq1cajny42zg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/devdocs";
+          sha256 = "04a1yspk3dwx0lzyg03lrbvig4g6sqmavzwicshdyr7q1bny7ikn";
+          name = "devdocs";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/devdocs";
           license = lib.licenses.free;
         };
       }) {};
@@ -10553,18 +11058,18 @@
         pname = "dic-lookup-w3m";
         version = "20140513.1941";
         src = fetchsvn {
-          url = "http://svn.sourceforge.jp/svnroot/dic-lookup-w3m/";
-          rev = "79";
-          sha256 = "0lg6i9vw6xsnaamfjczz0cr41vlv1bs03h8c8y2jxpdkgaab31nc";
+          url = "http://svn.osdn.jp/svnroot/dic-lookup-w3m/";
+          rev = "82";
+          sha256 = "0h1648yk5fx3d4i9ik4ij7r4xb3ddv083dj8irf49ndd51hcwdxc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dic-lookup-w3m";
-          sha256 = "0myv7sns9ajyr7fzn6kd8a64pfapjdksgby5ilh9mr99imm8dcfv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dic-lookup-w3m";
+          sha256 = "0zc0phym431bjqg0r8n5xsa98m52xnbhpqlh0jcvcy02nbmdc584";
           name = "dic-lookup-w3m";
         };
         packageRequires = [ stem w3m ];
         meta = {
-          homepage = "http://melpa.org/#/dic-lookup-w3m";
+          homepage = "https://melpa.org/#/dic-lookup-w3m";
           license = lib.licenses.free;
         };
       }) {};
@@ -10579,13 +11084,13 @@
           sha256 = "0b8yg03h5arfl5rlzlg2a6q7nhx452mdyngizjzxlvkmrqnlra4v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dictcc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dictcc";
           sha256 = "0x1y742hb3dm7xmh5810dlqki38kybw68rmg9adcchm2rn86jqlm";
           name = "dictcc";
         };
         packageRequires = [ cl-lib dash emacs helm s ];
         meta = {
-          homepage = "http://melpa.org/#/dictcc";
+          homepage = "https://melpa.org/#/dictcc";
           license = lib.licenses.free;
         };
       }) {};
@@ -10600,13 +11105,13 @@
           sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dictionary";
           sha256 = "0zr9sm5rmr0frxdr0za72wiffip9391fn9dm5y5x0aj1z4c1n28w";
           name = "dictionary";
         };
         packageRequires = [ connection link ];
         meta = {
-          homepage = "http://melpa.org/#/dictionary";
+          homepage = "https://melpa.org/#/dictionary";
           license = lib.licenses.free;
         };
       }) {};
@@ -10621,13 +11126,13 @@
           sha256 = "0sjwpvzd4x9c1b9iv66b33llvp96ryyzyp8pn1rnhvxfvjv43cnz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/diff-hl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/diff-hl";
           sha256 = "0kw0v9xcqidhf26qzrqwdlav2zhq32xx91k7akd2536jpji5pbn6";
           name = "diff-hl";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/diff-hl";
+          homepage = "https://melpa.org/#/diff-hl";
           license = lib.licenses.free;
         };
       }) {};
@@ -10642,13 +11147,13 @@
           sha256 = "14ccak3cmv36pd085188lypal9gd3flyikcrxn0wi6hn60w2dgvr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/diffscuss-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/diffscuss-mode";
           sha256 = "06jd7wh4yzryz0yjwa4a0xddz7srl5mif8ff1wvcpxsb66m2zbvh";
           name = "diffscuss-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/diffscuss-mode";
+          homepage = "https://melpa.org/#/diffscuss-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -10663,13 +11168,13 @@
           sha256 = "0diw887x4q7kbgdvxbbnxdw51z33kqwxw3v9m45fczxbywyi4cxf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/diffview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/diffview";
           sha256 = "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k";
           name = "diffview";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/diffview";
+          homepage = "https://melpa.org/#/diffview";
           license = lib.licenses.free;
         };
       }) {};
@@ -10684,13 +11189,13 @@
           sha256 = "0qxdfv1p0140fqcxh677hhxwpx1fihvwhvh76pysn4q4pcfr6ldr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/digistar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/digistar-mode";
           sha256 = "0khzxlrm09h31i1nqz6rnzhrdssb3kppc4klpxza612l306fih0s";
           name = "digistar-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/digistar-mode";
+          homepage = "https://melpa.org/#/digistar-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -10705,13 +11210,13 @@
           sha256 = "17jfmgyras32w9xr8fldqj924bijgng4bjg9fy6ckwb3mgihyil8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dim";
           sha256 = "0gsyily47g3g55qmhp1wzfz319l1pkgjz4lbigafjzlzqxyclz52";
           name = "dim";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/dim";
+          homepage = "https://melpa.org/#/dim";
           license = lib.licenses.free;
         };
       }) {};
@@ -10726,13 +11231,13 @@
           sha256 = "0bw1gkaycbbv2glnaa36gwzkl1l6lsq7i2i7jinka92b27zvrans";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dim-autoload";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dim-autoload";
           sha256 = "0lhzzjrgfvbqnzwhjywrk3skdb7x10xdq7d21q6kdk3h5r0np9f9";
           name = "dim-autoload";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dim-autoload";
+          homepage = "https://melpa.org/#/dim-autoload";
           license = lib.licenses.free;
         };
       }) {};
@@ -10747,13 +11252,13 @@
           sha256 = "04vfc5zgcjp0pax5zk1x98ivx5g349c5g3748lb9pgsijqaprgg4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/diminish";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/diminish";
           sha256 = "1h6a31jllypk47akjflz89xk6h47na96pim17d6g4rpqcafc2k43";
           name = "diminish";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/diminish";
+          homepage = "https://melpa.org/#/diminish";
           license = lib.licenses.free;
         };
       }) {};
@@ -10768,13 +11273,13 @@
           sha256 = "1ldqxdwy6r0fd2vh0ckkhgpincvybghavi8c7vvyd24j91i57y2f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dionysos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dionysos";
           sha256 = "1wjgj74dnlwd79gc3l7ymbx75jka8rw9smzbb10dsfppw3rrzfmz";
           name = "dionysos";
         };
         packageRequires = [ alert cl-lib dash libmpdee pkg-info s ];
         meta = {
-          homepage = "http://melpa.org/#/dionysos";
+          homepage = "https://melpa.org/#/dionysos";
           license = lib.licenses.free;
         };
       }) {};
@@ -10789,13 +11294,13 @@
           sha256 = "0mcsfsybpsxhzkd2m9bzc0np49azm6qf5x4x9h9lbxc8vfgh4z8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dircmp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dircmp";
           sha256 = "0cnj7b0s8vc83sh9sai1cldw54krk5qbz1qmlvvd1whryf2pc95c";
           name = "dircmp";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dircmp";
+          homepage = "https://melpa.org/#/dircmp";
           license = lib.licenses.free;
         };
       }) {};
@@ -10810,13 +11315,13 @@
           sha256 = "06m2p5sf47ykhkl958x4k0j0rxzrq0wfwf86mvnarlgc1215dbaf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-atool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-atool";
           sha256 = "0qljx6fmz1hal9r2smjyc957wcvcpg16vp5mv65ip6d26k5qsj0w";
           name = "dired-atool";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/dired-atool";
+          homepage = "https://melpa.org/#/dired-atool";
           license = lib.licenses.free;
         };
       }) {};
@@ -10831,13 +11336,13 @@
           sha256 = "0hdpn2q55qqvqffb70c8z72ah516l1d3gbzibrr5d0i31xggx4g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-avfs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-avfs";
           sha256 = "1q42pvrpmd525887iicd3m5gw4w2a78xb72v7fjfl30ay1kir4bm";
           name = "dired-avfs";
         };
         packageRequires = [ dash dired-hacks-utils ];
         meta = {
-          homepage = "http://melpa.org/#/dired-avfs";
+          homepage = "https://melpa.org/#/dired-avfs";
           license = lib.licenses.free;
         };
       }) {};
@@ -10845,17 +11350,17 @@
         pname = "dired-details";
         version = "20130824.658";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/dired-details.el";
+          url = "https://www.emacswiki.org/emacs/download/dired-details.el";
           sha256 = "1ddrhj1kw0wl7jbs9jn067vfffsvqhz4izfw9f7ihxz34fdl2iza";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-details";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-details";
           sha256 = "1390vl3i4qbnl7lbia98wznhf6x887d24f8p7146fpqjsiwbm5ck";
           name = "dired-details";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dired-details";
+          homepage = "https://melpa.org/#/dired-details";
           license = lib.licenses.free;
         };
       }) {};
@@ -10864,17 +11369,17 @@
         pname = "dired-details-plus";
         version = "20151231.1450";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/dired-details+.el";
+          url = "https://www.emacswiki.org/emacs/download/dired-details+.el";
           sha256 = "07z4h5l8763ks6b6m8dcmq78jiyq4xvan1mb0z8fbasmi1bsrya4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-details+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-details+";
           sha256 = "1gzr3z4nyzip299z08mignhigxr7drak7rv9z6gmdjrika9a29lx";
           name = "dired-details-plus";
         };
         packageRequires = [ dired-details ];
         meta = {
-          homepage = "http://melpa.org/#/dired-details+";
+          homepage = "https://melpa.org/#/dired-details+";
           license = lib.licenses.free;
         };
       }) {};
@@ -10889,13 +11394,13 @@
           sha256 = "1lcmpzwj43gix2q56bh2gw3gfqh8vl5j3mqr8s7v3k0aw816j0ni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-dups";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-dups";
           sha256 = "05s02gw8b339yvsr7vvka1r2140y7mbjzs8px4kn4acgb5y7rk71";
           name = "dired-dups";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dired-dups";
+          homepage = "https://melpa.org/#/dired-dups";
           license = lib.licenses.free;
         };
       }) {};
@@ -10910,13 +11415,13 @@
           sha256 = "0jj9da880b4zwxba140fldai1x9p2sxc6hdf3wz6lnbvz1pyn1mv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-efap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-efap";
           sha256 = "01j5v6584qi8ia7zmk03kx3i3kmm6hn6ycfgqlh5va6lp2h9sr00";
           name = "dired-efap";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dired-efap";
+          homepage = "https://melpa.org/#/dired-efap";
           license = lib.licenses.free;
         };
       }) {};
@@ -10931,13 +11436,13 @@
           sha256 = "1lnqjkbzryv655n16xj1c5bxck2jb5ccy8yckz1wp5yikkr06ba8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-fdclone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-fdclone";
           sha256 = "11aikq2q3m9h4zpgl24f8npvpwd98jgh8ygjwy2x5q8as8i89vf9";
           name = "dired-fdclone";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dired-fdclone";
+          homepage = "https://melpa.org/#/dired-fdclone";
           license = lib.licenses.free;
         };
       }) {};
@@ -10952,13 +11457,13 @@
           sha256 = "06hxcxgivxds42qilraqa6q1mlrhkn21w2adb1dg70p8qyrjqfk6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-filetype-face";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-filetype-face";
           sha256 = "1g9wzkkqmlkxlxwx43446q9mlam035zwq0wzpf7m6394rw2xlwx6";
           name = "dired-filetype-face";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dired-filetype-face";
+          homepage = "https://melpa.org/#/dired-filetype-face";
           license = lib.licenses.free;
         };
       }) {};
@@ -10973,13 +11478,13 @@
           sha256 = "0hdpn2q55qqvqffb70c8z72ah516l1d3gbzibrr5d0i31xggx4g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-filter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-filter";
           sha256 = "1mw94210i57wrqfyif6rh689xbwbpv1qp6bgc0j7z6g4xypvd52p";
           name = "dired-filter";
         };
         packageRequires = [ cl-lib dash dired-hacks-utils f ];
         meta = {
-          homepage = "http://melpa.org/#/dired-filter";
+          homepage = "https://melpa.org/#/dired-filter";
           license = lib.licenses.free;
         };
       }) {};
@@ -10994,13 +11499,13 @@
           sha256 = "0hdpn2q55qqvqffb70c8z72ah516l1d3gbzibrr5d0i31xggx4g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-hacks-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-hacks-utils";
           sha256 = "1vgl0wqf7gc2nbiqjn0rkrdlnxfm3wrgspx5b3cixv2n8rqx8kyi";
           name = "dired-hacks-utils";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/dired-hacks-utils";
+          homepage = "https://melpa.org/#/dired-hacks-utils";
           license = lib.licenses.free;
         };
       }) {};
@@ -11015,34 +11520,34 @@
           sha256 = "088h9yn6wndq4pq6f7q4iz17f9f4ci29z9nh595idljp3vwr7qid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-imenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-imenu";
           sha256 = "09yix4fkr03jq6j2rmvyg6gkmcnraw49a8m9649r3m525qdnhxs1";
           name = "dired-imenu";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dired-imenu";
+          homepage = "https://melpa.org/#/dired-imenu";
           license = lib.licenses.free;
         };
       }) {};
     dired-k = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-k";
-        version = "20151107.2036";
+        version = "20160330.2113";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-dired-k";
-          rev = "4c5ae87f0198eaa4789a1fe85e9ef7cf5a8633e7";
-          sha256 = "13xpbbdd190lklz8jmj8nw8qm414kpkij9wrd7a9ws9j1jzj8x6s";
+          rev = "b12ea34303862d3fd05a9cedbc436f5a533437d0";
+          sha256 = "1bg7msz672rp2l490l3wm99i18b30r6033yfkrq6ia742nagn040";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-k";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-k";
           sha256 = "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8";
           name = "dired-k";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/dired-k";
+          homepage = "https://melpa.org/#/dired-k";
           license = lib.licenses.free;
         };
       }) {};
@@ -11057,13 +11562,13 @@
           sha256 = "0hdpn2q55qqvqffb70c8z72ah516l1d3gbzibrr5d0i31xggx4g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-narrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-narrow";
           sha256 = "1rgqiscbizalh78jwc53zbj599dd13a6vzdgf75vzllc1w7jsg6d";
           name = "dired-narrow";
         };
         packageRequires = [ dash dired-hacks-utils ];
         meta = {
-          homepage = "http://melpa.org/#/dired-narrow";
+          homepage = "https://melpa.org/#/dired-narrow";
           license = lib.licenses.free;
         };
       }) {};
@@ -11078,13 +11583,13 @@
           sha256 = "0hdpn2q55qqvqffb70c8z72ah516l1d3gbzibrr5d0i31xggx4g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-open";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-open";
           sha256 = "0a4ksz2jkva4gvhprywjc1fzrbf95xdk8gn25nv1h1c1ckhr91qx";
           name = "dired-open";
         };
         packageRequires = [ dash dired-hacks-utils ];
         meta = {
-          homepage = "http://melpa.org/#/dired-open";
+          homepage = "https://melpa.org/#/dired-open";
           license = lib.licenses.free;
         };
       }) {};
@@ -11092,17 +11597,17 @@
         pname = "dired-plus";
         version = "20160124.2107";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/dired+.el";
+          url = "https://www.emacswiki.org/emacs/download/dired+.el";
           sha256 = "0fhag6jhb97jg50rb32s93mml0adncsd58z9grs7l95zva439pc2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired+";
           sha256 = "1dmp6wcynran03nsa0fd26b9q0zj9wp8ngaafx1i1ybwn2gx32g5";
           name = "dired-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dired+";
+          homepage = "https://melpa.org/#/dired+";
           license = lib.licenses.free;
         };
       }) {};
@@ -11117,13 +11622,13 @@
           sha256 = "0hdpn2q55qqvqffb70c8z72ah516l1d3gbzibrr5d0i31xggx4g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-rainbow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-rainbow";
           sha256 = "1b9yh8p2x1dg7dyqhjhnqqiiymyl6bwsam65j0lpvbdx8r4iw882";
           name = "dired-rainbow";
         };
         packageRequires = [ dash dired-hacks-utils ];
         meta = {
-          homepage = "http://melpa.org/#/dired-rainbow";
+          homepage = "https://melpa.org/#/dired-rainbow";
           license = lib.licenses.free;
         };
       }) {};
@@ -11138,13 +11643,13 @@
           sha256 = "0hdpn2q55qqvqffb70c8z72ah516l1d3gbzibrr5d0i31xggx4g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-ranger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-ranger";
           sha256 = "19lbbzqflqda5b0alqfzdhpbgqssghqb4n4viq8x4l1fac8mby6h";
           name = "dired-ranger";
         };
         packageRequires = [ dash dired-hacks-utils ];
         meta = {
-          homepage = "http://melpa.org/#/dired-ranger";
+          homepage = "https://melpa.org/#/dired-ranger";
           license = lib.licenses.free;
         };
       }) {};
@@ -11159,13 +11664,13 @@
           sha256 = "01xvaqckyr31ywsn1fp9sz9wq4h4dd1hgghfqypc9s4akrxmgnf2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-single";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-single";
           sha256 = "13h8dsn7bkz8ji2rrb7vyrqb2znxarpiynqi65mfli7dn5k086vf";
           name = "dired-single";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dired-single";
+          homepage = "https://melpa.org/#/dired-single";
           license = lib.licenses.free;
         };
       }) {};
@@ -11173,17 +11678,17 @@
         pname = "dired-sort";
         version = "20090208.2238";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/dired-sort.el";
+          url = "https://www.emacswiki.org/emacs/download/dired-sort.el";
           sha256 = "1dpxkxxfs14sdm3hwxv0j26lq0qzx4gryw42vrcdi680aj24962z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-sort";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-sort";
           sha256 = "1dzy2601yikmmbfqivf9s5xi4vd1f5g3c53f8rc74kfnxr1qn59x";
           name = "dired-sort";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dired-sort";
+          homepage = "https://melpa.org/#/dired-sort";
           license = lib.licenses.free;
         };
       }) {};
@@ -11191,17 +11696,17 @@
         pname = "dired-sort-menu";
         version = "20130824.707";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/dired-sort-menu.el";
+          url = "https://www.emacswiki.org/emacs/download/dired-sort-menu.el";
           sha256 = "1i42r7j1c8677qf79ig33bia24d2yvcj26y92migfvrlbi03w4qi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-sort-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-sort-menu";
           sha256 = "0n7zh8s3vdw3pcax8wkas9rykf917wn2dzikdlyrl5bbil9ijblb";
           name = "dired-sort-menu";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dired-sort-menu";
+          homepage = "https://melpa.org/#/dired-sort-menu";
           license = lib.licenses.free;
         };
       }) {};
@@ -11210,17 +11715,17 @@
         pname = "dired-sort-menu-plus";
         version = "20151231.1451";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/dired-sort-menu+.el";
+          url = "https://www.emacswiki.org/emacs/download/dired-sort-menu+.el";
           sha256 = "1hjci4zfzig04ji1jravxg9n67rdr4wyhmxmahbrzq9kjnql510i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-sort-menu+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-sort-menu+";
           sha256 = "19ah8qgbfdvyhfszdr6hlw8l01lbdb84vf5snldw8qh3x6lw8cfq";
           name = "dired-sort-menu-plus";
         };
         packageRequires = [ dired-sort-menu ];
         meta = {
-          homepage = "http://melpa.org/#/dired-sort-menu+";
+          homepage = "https://melpa.org/#/dired-sort-menu+";
           license = lib.licenses.free;
         };
       }) {};
@@ -11235,13 +11740,13 @@
           sha256 = "0hdpn2q55qqvqffb70c8z72ah516l1d3gbzibrr5d0i31xggx4g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-subtree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-subtree";
           sha256 = "1vqcnkh3g6dwi2hwfkb534q0j19pkqzqk3yb7ah8ck4z4ln4ppfk";
           name = "dired-subtree";
         };
         packageRequires = [ dash dired-hacks-utils ];
         meta = {
-          homepage = "http://melpa.org/#/dired-subtree";
+          homepage = "https://melpa.org/#/dired-subtree";
           license = lib.licenses.free;
         };
       }) {};
@@ -11256,13 +11761,13 @@
           sha256 = "1yx20h16hc1b04knsqhrxni0j8qgwnq7i5b0dlggq3dakcvqfxma";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-toggle";
           sha256 = "18v571kp440n5g1d7pj86rr8dgbbm324f9vblkdbdvn13c5dczf5";
           name = "dired-toggle";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dired-toggle";
+          homepage = "https://melpa.org/#/dired-toggle";
           license = lib.licenses.free;
         };
       }) {};
@@ -11277,13 +11782,13 @@
           sha256 = "0ajj8d6k5in2hclcrqckinfh80ylddplva0ryfbkzsjkfq167cv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-toggle-sudo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-toggle-sudo";
           sha256 = "0fy05af9aq9791ij4j9pscdk5j44pbg0kmhpqli41qiazjw7v2va";
           name = "dired-toggle-sudo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dired-toggle-sudo";
+          homepage = "https://melpa.org/#/dired-toggle-sudo";
           license = lib.licenses.free;
         };
       }) {};
@@ -11298,13 +11803,13 @@
           sha256 = "1rx7vq6yl83fbmb76sczbb1bv972s4cyg160sm2yap1i6nzhd10p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/diredful";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/diredful";
           sha256 = "0y8x6q1yfsk0srxsh4g5nbsms1g9pk9d103jx7cfdac79mcigw7x";
           name = "diredful";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/diredful";
+          homepage = "https://melpa.org/#/diredful";
           license = lib.licenses.free;
         };
       }) {};
@@ -11319,13 +11824,13 @@
           sha256 = "0mis3m6lg3vlvp8qm8iajprgx3pm3gcbhdszsm9mvrcgkahdjqnr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/direx";
           sha256 = "1x3rnrhhyrrvgry9n7kc0734la1zp4gc4bpy50f2qpfd452jwqdm";
           name = "direx";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/direx";
+          homepage = "https://melpa.org/#/direx";
           license = lib.licenses.free;
         };
       }) {};
@@ -11340,13 +11845,13 @@
           sha256 = "0swdh0qynpijsv6a2d308i42hfa0jwqsnmf4sm8vrhaf3vv25f5h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/direx-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/direx-grep";
           sha256 = "0y2wrzq06prm55akwgaqjg56znknyvbayav13asirqzg258skvm2";
           name = "direx-grep";
         };
         packageRequires = [ direx ];
         meta = {
-          homepage = "http://melpa.org/#/direx-grep";
+          homepage = "https://melpa.org/#/direx-grep";
           license = lib.licenses.free;
         };
       }) {};
@@ -11355,17 +11860,17 @@
         pname = "dirtree";
         version = "20140129.232";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/dirtree.el";
+          url = "https://www.emacswiki.org/emacs/download/dirtree.el";
           sha256 = "1q03q4j0wkbg9p2nzf1kb7l517b21mskp2v52i95jbxh09igbjjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dirtree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dirtree";
           sha256 = "0wfz9ks5iha2n0rya9yjmrb6f9lhp620iaqi92lw9smm7w83zj29";
           name = "dirtree";
         };
         packageRequires = [ tree-mode windata ];
         meta = {
-          homepage = "http://melpa.org/#/dirtree";
+          homepage = "https://melpa.org/#/dirtree";
           license = lib.licenses.free;
         };
       }) {};
@@ -11380,13 +11885,13 @@
           sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dirtree-prosjekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dirtree-prosjekt";
           sha256 = "0pyb6c0gvc16z5rc5h0kpl8021hz2hzv86cmjsd20gbhz7imrqwk";
           name = "dirtree-prosjekt";
         };
         packageRequires = [ dirtree prosjekt ];
         meta = {
-          homepage = "http://melpa.org/#/dirtree-prosjekt";
+          homepage = "https://melpa.org/#/dirtree-prosjekt";
           license = lib.licenses.free;
         };
       }) {};
@@ -11401,13 +11906,13 @@
           sha256 = "1srlz63pncxndh1kmb6dl5sxaanspxa444wg998dld3dkdflwavq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/disaster";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/disaster";
           sha256 = "1ad8q81n0s13cwmm216wqx3s92195pda1amc4wxvpb3lq7dbd3yn";
           name = "disaster";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/disaster";
+          homepage = "https://melpa.org/#/disaster";
           license = lib.licenses.free;
         };
       }) {};
@@ -11422,13 +11927,13 @@
           sha256 = "0f7h2rhh37lrs6xclj182li6s1fawv5m8w3hgy6qgm06dam45lka";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/discover";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/discover";
           sha256 = "1hf57p90jn1zzhjl63zv9ascbgkcbr0p0zmd3fvzpjsw84235dga";
           name = "discover";
         };
         packageRequires = [ makey ];
         meta = {
-          homepage = "http://melpa.org/#/discover";
+          homepage = "https://melpa.org/#/discover";
           license = lib.licenses.free;
         };
       }) {};
@@ -11443,13 +11948,13 @@
           sha256 = "0l2g58f55p8zmzv2q2hf163ggm9p0wk8hg93wlkyldrgyb94dgf4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/discover-clj-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/discover-clj-refactor";
           sha256 = "08bz60fxcgzab77690mmv0f7wdxcpygmasazcss427k37z9ysm7r";
           name = "discover-clj-refactor";
         };
         packageRequires = [ clj-refactor discover ];
         meta = {
-          homepage = "http://melpa.org/#/discover-clj-refactor";
+          homepage = "https://melpa.org/#/discover-clj-refactor";
           license = lib.licenses.free;
         };
       }) {};
@@ -11464,13 +11969,13 @@
           sha256 = "1vnbn4asz3lifscvy4shzisl6r0gkgq0qsa3kpgif3853wcd2rvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/discover-js2-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/discover-js2-refactor";
           sha256 = "139zq66cpcn4dnidf22h7x88p812ywrrz4c3c62w3915b75f71ki";
           name = "discover-js2-refactor";
         };
         packageRequires = [ discover js2-refactor ];
         meta = {
-          homepage = "http://melpa.org/#/discover-js2-refactor";
+          homepage = "https://melpa.org/#/discover-js2-refactor";
           license = lib.licenses.free;
         };
       }) {};
@@ -11485,13 +11990,13 @@
           sha256 = "0b73nc4jkf9bggnlp0l34jfcgx91vxbpavz6bpnf5rjvm0v1bil9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/discover-my-major";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/discover-my-major";
           sha256 = "0ch2y4grdjp7pvw2kxqnqdl7jd3q609n3pm3r0gn6k0xmcw85fgg";
           name = "discover-my-major";
         };
         packageRequires = [ makey ];
         meta = {
-          homepage = "http://melpa.org/#/discover-my-major";
+          homepage = "https://melpa.org/#/discover-my-major";
           license = lib.licenses.free;
         };
       }) {};
@@ -11499,17 +12004,17 @@
         pname = "disk";
         version = "20081128.906";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/disk.el";
+          url = "https://www.emacswiki.org/emacs/download/disk.el";
           sha256 = "1c0pgqvl1z2f5hprszln53pn2v2pqy110r3wx3g84v71w6378bbv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/disk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/disk";
           sha256 = "0bij9gr4zv6jmc6dwsy3lb06vsxvmyzl8xrm8wzasxisk1qd2l6n";
           name = "disk";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/disk";
+          homepage = "https://melpa.org/#/disk";
           license = lib.licenses.free;
         };
       }) {};
@@ -11524,13 +12029,13 @@
           sha256 = "075gj81rnhrvv061wnldixpfmlsyfbnvacnk107z6f9v3m2m3vl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dispass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dispass";
           sha256 = "08c1s4zgl4rha10mva48cfkxzrqnpdhy03pxq51ihw94v6vxzg3z";
           name = "dispass";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/dispass";
+          homepage = "https://melpa.org/#/dispass";
           license = lib.licenses.free;
         };
       }) {};
@@ -11545,13 +12050,13 @@
           sha256 = "0r560bpgw5p2pfcgkgcrlpp1bprv1f23dl4y5fjk06dg93fgaysa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/display-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/display-theme";
           sha256 = "07nqscmfa6iykll1m6gyiqca1g5ncx3rx468iyf2ahygpvqvnbxa";
           name = "display-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/display-theme";
+          homepage = "https://melpa.org/#/display-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -11566,13 +12071,34 @@
           sha256 = "03d8zb2is7n2y2z0k6j37cijjc3ndgasxsm9gqyq7drlq9bqwzsm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/distinguished-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/distinguished-theme";
           sha256 = "0h03aqgijrmisbgqga42zlb5yz4x3jn9jgr29rq8canyhayr3rk4";
           name = "distinguished-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/distinguished-theme";
+          homepage = "https://melpa.org/#/distinguished-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dix";
+        version = "20160426.900";
+        src = fetchFromGitHub {
+          owner = "unhammer";
+          repo = "dix";
+          rev = "10b45f078437761ee1739e6e817c3583b7199cce";
+          sha256 = "1czwsbm547bdzsr7h3gyj7w3s1j2n3pz2xblslam8rkn7v72z7qr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dix";
+          sha256 = "0c5fmknpy6kwlz7nx0csbbia1maz0szj7yha1p7wq28s3a5426xq";
+          name = "dix";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/dix";
           license = lib.licenses.free;
         };
       }) {};
@@ -11587,13 +12113,13 @@
           sha256 = "120zgp38nz4ssid6bv0zy5rnf2claa5s880incgljqyl0vmj9nq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dizzee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dizzee";
           sha256 = "1axydags80jkyhpzp3m4gyplwr9k3a13w6vmrrzcv161nln7jhhs";
           name = "dizzee";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dizzee";
+          homepage = "https://melpa.org/#/dizzee";
           license = lib.licenses.free;
         };
       }) {};
@@ -11608,13 +12134,13 @@
           sha256 = "15i25zh54b2fqji0qmkg502051ymccih6pgqnzq02c43dpnsqhqv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/django-manage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/django-manage";
           sha256 = "0j95g7fps28xhlrikkg61xgpbpf52xb56swmns2qdib6x1xzd6rh";
           name = "django-manage";
         };
         packageRequires = [ hydra ];
         meta = {
-          homepage = "http://melpa.org/#/django-manage";
+          homepage = "https://melpa.org/#/django-manage";
           license = lib.licenses.free;
         };
       }) {};
@@ -11629,13 +12155,13 @@
           sha256 = "0dw0m77w7kdwxxh53b4k15jjkpfl5vha17hw9dn29ap77pf820va";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/django-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/django-mode";
           sha256 = "1rdkzqvicjpfh9k66m31ky6jshx9fqw7pza7add36bk6xg8lbara";
           name = "django-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/django-mode";
+          homepage = "https://melpa.org/#/django-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -11650,13 +12176,13 @@
           sha256 = "0dw0m77w7kdwxxh53b4k15jjkpfl5vha17hw9dn29ap77pf820va";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/django-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/django-snippets";
           sha256 = "1qs9fw104kidbr5zbxc1q71yy033nq3wxh98vvzk4z4fppnd29sw";
           name = "django-snippets";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/django-snippets";
+          homepage = "https://melpa.org/#/django-snippets";
           license = lib.licenses.free;
         };
       }) {};
@@ -11671,13 +12197,13 @@
           sha256 = "1azf4p6salga7269l0kf13bqlxf9idp0ys8mm20qpyjpj79p5g9w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/django-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/django-theme";
           sha256 = "1rydl857zfpbvd7aziz6h7n3rrh584z2cbfxlss3wgfclzmbyhgf";
           name = "django-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/django-theme";
+          homepage = "https://melpa.org/#/django-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -11692,13 +12218,13 @@
           sha256 = "1nbvdnw9g3zbbb0n2sn2kxfzs5wichhl9qid3qjp8dsiq1wpv459";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dkdo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dkdo";
           sha256 = "0p7ybgldjs046jrkkbpli1iicfmblpxfz9lql8m8sz7lpjn7h300";
           name = "dkdo";
         };
         packageRequires = [ dkmisc emacs ];
         meta = {
-          homepage = "http://melpa.org/#/dkdo";
+          homepage = "https://melpa.org/#/dkdo";
           license = lib.licenses.free;
         };
       }) {};
@@ -11713,13 +12239,13 @@
           sha256 = "063nnln5m42qf190vr2z0ibacyn7n0xkxm3v5vaa4gxdvdwzhshs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dklrt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dklrt";
           sha256 = "11ss5x9sxgxp1wx2r1m0vsp5z5qm8m4ww20ybr6bqjw0a1gax561";
           name = "dklrt";
         };
         packageRequires = [ dkmisc emacs ledger-mode ];
         meta = {
-          homepage = "http://melpa.org/#/dklrt";
+          homepage = "https://melpa.org/#/dklrt";
           license = lib.licenses.free;
         };
       }) {};
@@ -11734,34 +12260,34 @@
           sha256 = "1nz71g8pb19aqjcb4s94hhn6j30cc04q05kmwvcbxpjb11qqrv49";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dkmisc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dkmisc";
           sha256 = "0nnbl272hldcmhyj47r463yvj7b06rjdkpkl5xk0gw9ikyja7w0z";
           name = "dkmisc";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/dkmisc";
+          homepage = "https://melpa.org/#/dkmisc";
           license = lib.licenses.free;
         };
       }) {};
     dmenu = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dmenu";
-        version = "20151220.702";
+        version = "20160228.827";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "el-dmenu";
-          rev = "b9be62dc33b59fdd34b449699801c1772af84284";
-          sha256 = "0spj80vq6m2kqbdy6y1vh9fzwqyqkij30457d2n39kjn2gzbyar8";
+          rev = "8dffd614e37d3971f989cbce5849d04d84ee8c76";
+          sha256 = "1xx4ccr3mfxay2j3wgd93qw5dpjasaq9mkmmjww3ibpf86ahf7l3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dmenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dmenu";
           sha256 = "1w1pgaj2yasfhsd1ibvrwy11ykq8v17h913g298h3ycsvqv8gic0";
           name = "dmenu";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/dmenu";
+          homepage = "https://melpa.org/#/dmenu";
           license = lib.licenses.free;
         };
       }) {};
@@ -11776,13 +12302,13 @@
           sha256 = "0z28j7x7wgkc1cg1q1kz1lhdx1v1n6s88ixgkm8hn458h9bfnr3n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dna-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dna-mode";
           sha256 = "0ak3g152q3xxkiz1a4pl5y2vgbigbbmbc95fggirbcrh52zkzgk9";
           name = "dna-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dna-mode";
+          homepage = "https://melpa.org/#/dna-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -11797,13 +12323,13 @@
           sha256 = "1nbm3wzd12rsrhnwlcc6b72b1ala328mfpcp5bwlfcdshw6mfcrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/docbook-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/docbook-snippets";
           sha256 = "1ipqfylgiw9iyjc1nckbay890clfkhda81nr00cq06sjmm71iniq";
           name = "docbook-snippets";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/docbook-snippets";
+          homepage = "https://melpa.org/#/docbook-snippets";
           license = lib.licenses.free;
         };
       }) {};
@@ -11818,34 +12344,55 @@
           sha256 = "055kr0qknjgnjs7dn6gdmahrdbs8piwldbz7vg1hgq3b046x8lky";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/docean";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/docean";
           sha256 = "1mqmn2i9axnv5vnkg9gwfdjpzr6gxx4ia9mcdpm200ix297dg7x9";
           name = "docean";
         };
         packageRequires = [ cl-lib emacs request ];
         meta = {
-          homepage = "http://melpa.org/#/docean";
+          homepage = "https://melpa.org/#/docean";
           license = lib.licenses.free;
         };
       }) {};
-    docker = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, s }:
+    docker = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, s, tablist }:
     melpaBuild {
         pname = "docker";
-        version = "20151126.413";
+        version = "20160424.357";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "docker.el";
-          rev = "c6abb2fceaaab92a722eade09306643dae3b5f1a";
-          sha256 = "12n63z4kkgfzkc2xji1z0k924af0v633qhvrr0rm83db9hz9j318";
+          rev = "7ac17efce5e7a80cef28f8d32d81bb4200e06401";
+          sha256 = "0a5n8xb5qx82raf3nsrbs0rlg64wf0wdxb9mx384jwkcrwd32x2f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/docker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/docker";
           sha256 = "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk";
           name = "docker";
         };
-        packageRequires = [ dash emacs magit-popup s ];
+        packageRequires = [ dash emacs magit-popup s tablist ];
         meta = {
-          homepage = "http://melpa.org/#/docker";
+          homepage = "https://melpa.org/#/docker";
+          license = lib.licenses.free;
+        };
+      }) {};
+    docker-api = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "docker-api";
+        version = "20160421.153";
+        src = fetchFromGitHub {
+          owner = "Silex";
+          repo = "docker-api.el";
+          rev = "397286872d462a5bc00419f629380ef77e87edbe";
+          sha256 = "0lamp8xkn84q14xswvzwcamp2rk2rvgm15zf8iki5yp6zz1dppb2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/docker-api";
+          sha256 = "1giqiapm4hf4dhfm3x69qqpir3jg7qz3parhbx88xxqrd1z18my0";
+          name = "docker-api";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "https://melpa.org/#/docker-api";
           license = lib.licenses.free;
         };
       }) {};
@@ -11860,13 +12407,13 @@
           sha256 = "0bvnvs17cbisymiqp96q4y2w2jqy5hd0zyk6rv7mihr9p97ak9kv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/docker-tramp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/docker-tramp";
           sha256 = "19kky80qm68n2izpjfyiy4gjywav7ljcmp101kmziklpqdldgh1w";
           name = "docker-tramp";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/docker-tramp";
+          homepage = "https://melpa.org/#/docker-tramp";
           license = lib.licenses.free;
         };
       }) {};
@@ -11881,13 +12428,13 @@
           sha256 = "0vx7lv54v4bznn4mik4i6idb9dl7fpp3gw7nyhymbkr6hx884haw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dockerfile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dockerfile-mode";
           sha256 = "1dxvzn35a9qd3x8pjvrvb2g71yf84404g6vz81y0p353rf2zknpa";
           name = "dockerfile-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dockerfile-mode";
+          homepage = "https://melpa.org/#/dockerfile-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -11896,19 +12443,19 @@
         pname = "dokuwiki-mode";
         version = "20160129.207";
         src = fetchFromGitHub {
-          owner = "kbkbkbkb1";
+          owner = "kai2nenobu";
           repo = "emacs-dokuwiki-mode";
           rev = "0e8f11572b6842b5b9d6e1a5123d988b26af04bf";
           sha256 = "1qfmq8l4jqyrhfplsr1zd8bg9qqqwbh3mhipqzja0px0knjpqj85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dokuwiki-mode";
-          sha256 = "0q5ybyj35dyh8k0nfvbglsq3ad2apc8cdijw4wqczc5180fckgy9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dokuwiki-mode";
+          sha256 = "1jc3sn61mipkhgr91wp74s673jk2w5991p54jlw05qqpf5gmxd7v";
           name = "dokuwiki-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dokuwiki-mode";
+          homepage = "https://melpa.org/#/dokuwiki-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -11923,13 +12470,13 @@
           sha256 = "1xyqsnymgdd8ic3az2lgwv7s7vld6d4pcycb234bxm4in9fixgdj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dollaro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dollaro";
           sha256 = "06kaqzb0nh8sndhk7p5n4acn5nc27dyxw3ldgcbp81wj6ipii26h";
           name = "dollaro";
         };
         packageRequires = [ s ];
         meta = {
-          homepage = "http://melpa.org/#/dollaro";
+          homepage = "https://melpa.org/#/dollaro";
           license = lib.licenses.free;
         };
       }) {};
@@ -11944,13 +12491,13 @@
           sha256 = "04h1hlsc83w4dppw9m44jq7mkcpy0bblvnzrhvsh06pibjywdd73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/doom";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/doom";
           sha256 = "098q77lix7kwpmarv26yndyk1yy1h4k3l9kaf3g7sg6ji6k7d3wl";
           name = "doom";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/doom";
+          homepage = "https://melpa.org/#/doom";
           license = lib.licenses.free;
         };
       }) {};
@@ -11958,17 +12505,17 @@
         pname = "doremi";
         version = "20151231.1455";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/doremi.el";
+          url = "https://www.emacswiki.org/emacs/download/doremi.el";
           sha256 = "0201clwq9nbl8336lddcbwah8d6xipr7q8135yq79szfxq2bdg6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/doremi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/doremi";
           sha256 = "11i4cdxgrspx44p44zz5py89ypji5li6p5w77wy0b07i8a5gq2gb";
           name = "doremi";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/doremi";
+          homepage = "https://melpa.org/#/doremi";
           license = lib.licenses.free;
         };
       }) {};
@@ -11977,17 +12524,17 @@
         pname = "doremi-cmd";
         version = "20151231.1452";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/doremi-cmd.el";
+          url = "https://www.emacswiki.org/emacs/download/doremi-cmd.el";
           sha256 = "1m7jn80apya6s9d8phd859rq1m13xf2wz9664pqpr1p65yz2pyvl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/doremi-cmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/doremi-cmd";
           sha256 = "1qzspirn1abqps0dn5z8w6ymffc6b02dyki5hr8v74wfs8fhzx05";
           name = "doremi-cmd";
         };
         packageRequires = [ doremi ];
         meta = {
-          homepage = "http://melpa.org/#/doremi-cmd";
+          homepage = "https://melpa.org/#/doremi-cmd";
           license = lib.licenses.free;
         };
       }) {};
@@ -11996,17 +12543,17 @@
         pname = "doremi-frm";
         version = "20151231.1453";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/doremi-frm.el";
+          url = "https://www.emacswiki.org/emacs/download/doremi-frm.el";
           sha256 = "0v7ycmddh1ds64m1y5yai5nh34bd32q3wcm5y2pdzhj6jk7nj5wz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/doremi-frm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/doremi-frm";
           sha256 = "1rj3p665q32acsxxwygv1j5nbmjqrhi0b4glzrk88xki4lyz0ihz";
           name = "doremi-frm";
         };
         packageRequires = [ doremi faces-plus frame-fns hexrgb ];
         meta = {
-          homepage = "http://melpa.org/#/doremi-frm";
+          homepage = "https://melpa.org/#/doremi-frm";
           license = lib.licenses.free;
         };
       }) {};
@@ -12014,17 +12561,17 @@
         pname = "doremi-mac";
         version = "20151231.1454";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/doremi-mac.el";
+          url = "https://www.emacswiki.org/emacs/download/doremi-mac.el";
           sha256 = "157kvlb4dqiyk1h7b4p0dhrr6crdakwnrxydyl6yh51w2hdnnigw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/doremi-mac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/doremi-mac";
           sha256 = "0n9fffgxnpqc7cch7aci5kxbwzk36iljdz2r8gcp5y5n1p7aamls";
           name = "doremi-mac";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/doremi-mac";
+          homepage = "https://melpa.org/#/doremi-mac";
           license = lib.licenses.free;
         };
       }) {};
@@ -12032,17 +12579,17 @@
         pname = "dos";
         version = "20140808.1635";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/dos.el";
+          url = "https://www.emacswiki.org/emacs/download/dos.el";
           sha256 = "0sfmcd1rq6wih9q7d9vkcfrw6gf7309mm7491jx091ij8m4p8ypp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dos";
           sha256 = "0cpijbqpci96s0d6rwqz5bbi9b0zkan1bg8vdgib1f87r7g980nc";
           name = "dos";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dos";
+          homepage = "https://melpa.org/#/dos";
           license = lib.licenses.free;
         };
       }) {};
@@ -12050,17 +12597,17 @@
         pname = "dot-mode";
         version = "20151029.855";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/dot-mode.el";
+          url = "https://www.emacswiki.org/emacs/download/dot-mode.el";
           sha256 = "0xhbzq3yvfvvvl6mfihrzkd3pn5p5yxvbcyf2jhsppk7lscifsgk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dot-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dot-mode";
           sha256 = "1fik32635caq3r5f9k62qbj2dkwczz2z1v28mc7bcj7jv2p93nvh";
           name = "dot-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dot-mode";
+          homepage = "https://melpa.org/#/dot-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -12075,13 +12622,13 @@
           sha256 = "0gc7z5ribp5yvadclq07l731m65pja00wgch4bgxsihiy7wvwknr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/download-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/download-region";
           sha256 = "1mrl2x6j708nchyh9y5avbf2cq10kpnhfj553l6akarvl5n5pvkl";
           name = "download-region";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/download-region";
+          homepage = "https://melpa.org/#/download-region";
           license = lib.licenses.free;
         };
       }) {};
@@ -12096,34 +12643,34 @@
           sha256 = "0s7swvfd7h8r0n3cjmkps6ary9vwg61jylfm4qrkp3idsz6is548";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/downplay-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/downplay-mode";
           sha256 = "1v6nga101ljzza8qj3lkmkzzl0vvzj4lsh1m69698s8prnczxr9b";
           name = "downplay-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/downplay-mode";
+          homepage = "https://melpa.org/#/downplay-mode";
           license = lib.licenses.free;
         };
       }) {};
     dpaste = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dpaste";
-        version = "20150528.800";
+        version = "20160303.1512";
         src = fetchFromGitHub {
           owner = "gregnewman";
           repo = "dpaste.el";
-          rev = "d073030e6b7feae84f0e2118e5fc454833848629";
-          sha256 = "11s4vxr6waswyx4lz3q70s8xdz0v7354sn0pfwj42mmww4pzkizs";
+          rev = "5ebabb466a6ae70882549855b6b2194fc32189f8";
+          sha256 = "03n3k6a40lw9m1ycf62g6vll4gr2kr2509vjp1dkfq722xwrw7zk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dpaste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dpaste";
           sha256 = "17mrdkldv4gfwm6ggc047l4a69xg2fy9f9mjbphkjl0p5nr6b4kz";
           name = "dpaste";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dpaste";
+          homepage = "https://melpa.org/#/dpaste";
           license = lib.licenses.free;
         };
       }) {};
@@ -12138,34 +12685,34 @@
           sha256 = "1avpg0cgzk8d6g1q0ryx41lkcdgkm0mkzr5xr32xm28dzrfmgd4z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dpaste_de";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dpaste_de";
           sha256 = "0dql9qsl5gj51i3l2grl7nhw0ign8h4xa4jnhwn196j71c0rdwwp";
           name = "dpaste_de";
         };
         packageRequires = [ web ];
         meta = {
-          homepage = "http://melpa.org/#/dpaste_de";
+          homepage = "https://melpa.org/#/dpaste_de";
           license = lib.licenses.free;
         };
       }) {};
     dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dracula-theme";
-        version = "20151109.1045";
+        version = "20160228.2113";
         src = fetchFromGitHub {
           owner = "zenorocha";
           repo = "dracula-theme";
-          rev = "a97d71234a9cb07b03caab684601b7b40d67c063";
-          sha256 = "1ly5d5dbhbmgflcl3gvwkd1i4bikffmdc4c42rmxxf1xw6gp7s2c";
+          rev = "d3abff6e5307227858d5323cf8aaf108c542ad2b";
+          sha256 = "0678xbwsa8yg175yn1xllp0aaihx0ikfyc2jh6q338xfrfnd89bm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dracula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dracula-theme";
           sha256 = "0ayv00wvajia8kbfrqkrkpb3qp3k70qcnqkav7am16p5kbvzp10r";
           name = "dracula-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/dracula-theme";
+          homepage = "https://melpa.org/#/dracula-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -12180,13 +12727,13 @@
           sha256 = "0z3w58zplm5ks195zfsaq8kwbc944p3kbzs702jgz02wcrm4c28y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/draft-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/draft-mode";
           sha256 = "1wg9cx39f4dhrykb4zx4fh0x5cfrh5aicwwfh1h3yzpc4zlr7xfh";
           name = "draft-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/draft-mode";
+          homepage = "https://melpa.org/#/draft-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -12196,39 +12743,39 @@
         version = "20150717.732";
         src = fetchFromGitHub {
           owner = "rejeep";
-          repo = "drag-stuff";
-          rev = "0d7e28bf234037380dbcb24b9175b96ae34ef8fb";
-          sha256 = "08kkiqhfy1i6j9156gbl85jvyj592vd08qy24ng2dj0prjvap8w1";
+          repo = "drag-stuff.el";
+          rev = "83405a36ddb289eb62c765b6d2ec31026cc969df";
+          sha256 = "162bwywgzyjzv48rzfpsd4nzn63yrrqlzs73n50kmpx2dkrn1sjc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/drag-stuff";
-          sha256 = "0hzbh58ijv1akamav8r0zs76pwda2zd9mjaj31ffalzhhsm5jnyc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/drag-stuff";
+          sha256 = "1q67q20gfhixzkmddhzp6fd8z2qfpsmyyvymmaffjcscnjaz21w4";
           name = "drag-stuff";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/drag-stuff";
+          homepage = "https://melpa.org/#/drag-stuff";
           license = lib.licenses.free;
         };
       }) {};
     drawille = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "drawille";
-        version = "20160114.607";
+        version = "20160418.1338";
         src = fetchFromGitHub {
           owner = "sshbio";
           repo = "drawille";
-          rev = "79ba6bf4f7e4a98063afbac47034a3248535e1d6";
-          sha256 = "1yvg3w9gm5vs26qhw3xb72v9fgdhqq9w5pksiz2gj5m19l81irar";
+          rev = "d582b455c01432bc80933650c52a1f586bd1b5ad";
+          sha256 = "1z3akh0ywzihr0ghk6f8x9z38mwqy3zg29p0q69h4i6yzhxpdmxa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/drawille";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/drawille";
           sha256 = "01rl21hbj3hwy072yr27jl6iql331v131d3mr9zifg9v6f3jqbil";
           name = "drawille";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/drawille";
+          homepage = "https://melpa.org/#/drawille";
           license = lib.licenses.free;
         };
       }) {};
@@ -12243,13 +12790,13 @@
           sha256 = "0lzq0mkhhj3s5yrcbs576qxkd8h0m2ikc4iplk97ddpzh4nz4127";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/drill-instructor-AZIK-force";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/drill-instructor-AZIK-force";
           sha256 = "1bb698r11m58csd2rm17fmiw691p25npphzqgjiiqbn4vx35ja7f";
           name = "drill-instructor-AZIK-force";
         };
         packageRequires = [ popup ];
         meta = {
-          homepage = "http://melpa.org/#/drill-instructor-AZIK-force";
+          homepage = "https://melpa.org/#/drill-instructor-AZIK-force";
           license = lib.licenses.free;
         };
       }) {};
@@ -12264,13 +12811,13 @@
           sha256 = "1s4cz5s0mw733ak9ps62fs150y3psqmb6v5s6s88jjfsi0r03c0s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dropbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dropbox";
           sha256 = "0ak6g2d2sq026ml6cmn6v1qz7sczkplgv2j9zq9zgzafihyyzs5f";
           name = "dropbox";
         };
         packageRequires = [ json oauth ];
         meta = {
-          homepage = "http://melpa.org/#/dropbox";
+          homepage = "https://melpa.org/#/dropbox";
           license = lib.licenses.free;
         };
       }) {};
@@ -12278,38 +12825,38 @@
         pname = "dropdown-list";
         version = "20120329.1136";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/dropdown-list.el";
+          url = "https://www.emacswiki.org/emacs/download/dropdown-list.el";
           sha256 = "1szy46sk3nvlbb3yzk1s983281kkf507xr3fkclkki3d3x31n08a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dropdown-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dropdown-list";
           sha256 = "14i9w897gnb3mvnkbzhzij04bgr551r8km310mbrmzzag54w077z";
           name = "dropdown-list";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dropdown-list";
+          homepage = "https://melpa.org/#/dropdown-list";
           license = lib.licenses.free;
         };
       }) {};
     drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }:
     melpaBuild {
         pname = "drupal-mode";
-        version = "20150830.1427";
+        version = "20160420.1458";
         src = fetchFromGitHub {
           owner = "arnested";
           repo = "drupal-mode";
-          rev = "b4a66092bddc471884b2746d69fd7e8853b4b79f";
-          sha256 = "0am3n25qcfjkqfp4wjj1d2zigrmi8hg7p5sy2h91zg3blypqmpsr";
+          rev = "2ed0a8139812f4215c733913c1891d4fdab40550";
+          sha256 = "1hbm3zdmd28fjl8fky0kq4gs2bxsrn2zxk9rd1wa2wky43ycnd35";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/drupal-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/drupal-mode";
           sha256 = "14jvk4phq3wcff3yvhygix0c9cpbphh0dvm961i93jpsx7g9awgn";
           name = "drupal-mode";
         };
         packageRequires = [ php-mode ];
         meta = {
-          homepage = "http://melpa.org/#/drupal-mode";
+          homepage = "https://melpa.org/#/drupal-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -12324,13 +12871,13 @@
           sha256 = "156cscpavrp695lp8pgjg5jnq3b8n9c2h8qg8w89dd4vfkc3iikd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/drupal-spell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/drupal-spell";
           sha256 = "117rr2bfnc99g3qsr127grxwaqp54cxjaj3nl2nr6z78nja0fij3";
           name = "drupal-spell";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/drupal-spell";
+          homepage = "https://melpa.org/#/drupal-spell";
           license = lib.licenses.free;
         };
       }) {};
@@ -12339,17 +12886,17 @@
         version = "20130120.1457";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1731575";
+          rev = "1741054";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dsvn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dsvn";
           sha256 = "12cviq6v08anif762a5qav3l8ircp81kmnl9q4yl6bkh9zxv7vy6";
           name = "dsvn";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dsvn";
+          homepage = "https://melpa.org/#/dsvn";
           license = lib.licenses.free;
         };
       }) {};
@@ -12364,34 +12911,34 @@
           sha256 = "1blfx3r2xd3idbfjrx44ma3x1d83xp67il2s2bmdwa8qz92z99lf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dtrace-script-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dtrace-script-mode";
           sha256 = "0v29rzlyccrc37052w2qmvjaii84jihhp736l807b0hjjfryras4";
           name = "dtrace-script-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dtrace-script-mode";
+          homepage = "https://melpa.org/#/dtrace-script-mode";
           license = lib.licenses.free;
         };
       }) {};
     dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dtrt-indent";
-        version = "20151013.414";
+        version = "20160329.543";
         src = fetchFromGitHub {
           owner = "jscheid";
           repo = "dtrt-indent";
-          rev = "7f212888fbacc262080ab2740eda673b376c6b7b";
-          sha256 = "0x8c3h3jvyn2462r0sagz63vv9pr5ivfzkshr69603ibyfgqxxkp";
+          rev = "a47fcfc43da794f38e17a0a6010fe932039dc3b7";
+          sha256 = "1nqh4l1qdycpsmccf8pmwdwylcxxnikhrgj550ab8jx3yi7i24af";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dtrt-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dtrt-indent";
           sha256 = "1npn2jngy1wq0jpwmg1hkn8lx6ncbqsi587jl38lyp2xwchshfk5";
           name = "dtrt-indent";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dtrt-indent";
+          homepage = "https://melpa.org/#/dtrt-indent";
           license = lib.licenses.free;
         };
       }) {};
@@ -12406,13 +12953,13 @@
           sha256 = "0cafvhbpfqd8ajqg2757fs64kryrl2ckvbp5abldb4y8fa14pb9l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dts-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dts-mode";
           sha256 = "1k8cbiayajbzwkm0s0kyin0qpq9yhymidz0srs4hbvsnb6hvp234";
           name = "dts-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dts-mode";
+          homepage = "https://melpa.org/#/dts-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -12427,52 +12974,55 @@
           sha256 = "1ixb78dv66lmqlbv4zl5ysvv1xqafvqh1h5cfdv03jdkqlfk34jz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ducpel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ducpel";
           sha256 = "1cqrkgg7n9bhjswnpl7yc6w6yjs4gfbliaqsimmf9z43wk2ml4pc";
           name = "ducpel";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/ducpel";
+          homepage = "https://melpa.org/#/ducpel";
           license = lib.licenses.free;
         };
       }) {};
-    dumb-jump = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    dumb-jump = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "20160220.2341";
+        version = "20160426.56";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "27c0826a6b078e7483e002aa8b3a9f03d2ec6da1";
-          sha256 = "1saz5ysy99i2l97kzy5acxxzy7iy3v4zxszmpw2b9ppbbxrwanfk";
+          rev = "5313ef651b58dd9b8b9fcb388856b8dcbf1b791b";
+          sha256 = "1czw5z6w8pcc7ra5d82v06padyiy7c3ds00chw5xgyvq6s73gzn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dumb-jump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dumb-jump";
           sha256 = "1pgbs2k1g8w7gr65w50fazrmcky6w37c9rvyxqfmh06yx90nj4kc";
           name = "dumb-jump";
         };
-        packageRequires = [ dash f s ];
+        packageRequires = [ dash f popup s ];
         meta = {
-          homepage = "http://melpa.org/#/dumb-jump";
+          homepage = "https://melpa.org/#/dumb-jump";
           license = lib.licenses.free;
         };
       }) {};
-    dummy-h-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    dummy-h-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "dummy-h-mode";
-        version = "20140816.733";
-        src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/dummy-h-mode.el";
-          sha256 = "0zq94x4br3sk6n4chrfnw7hpnsicxa02fcpk8hw1hfsaq3327n6v";
+        version = "20160209.529";
+        src = fetchFromGitHub {
+          owner = "yascentur";
+          repo = "dummy-h-mode-el";
+          rev = "f94779ea046d6dc1334a4c896c9aeafcf79c1b52";
+          sha256 = "0qsjp1xh8cp5wl4xi9yg2nwy982jgxji41hpbg7rff5hcn7svii9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dummy-h-mode";
-          sha256 = "1h2pm37y9kz62id0rm0zzgh1hpkhd9gvq95kjd29w0awsp9b6ca4";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dummy-h-mode";
+          sha256 = "10lzfzq7md6s28w2zzlhswn3d6765g4vqzyjn2q5ms8pd2i4b4in";
           name = "dummy-h-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dummy-h-mode";
+          homepage = "https://melpa.org/#/dummy-h-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -12487,13 +13037,13 @@
           sha256 = "0g72nnz0j6dvllyxyrw20z1vg6p7sy46yy0fq017pa77sgqm0xzh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dummyparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dummyparens";
           sha256 = "1yah8kpqkk9ygm73iy51fzwc8q5nw0xlwqir2qld1fc5y1lkb7dk";
           name = "dummyparens";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dummyparens";
+          homepage = "https://melpa.org/#/dummyparens";
           license = lib.licenses.free;
         };
       }) {};
@@ -12508,54 +13058,54 @@
           sha256 = "1qaiwm8mf4656gc1pdj8ivgy4abkjsypr52pvf4nrdkkln9qzfli";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/duplicate-thing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/duplicate-thing";
           sha256 = "1jx2b6h23dj561xhizzbpxp3av69ic8zdw4kkf0py1jm3gnrmlm4";
           name = "duplicate-thing";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/duplicate-thing";
+          homepage = "https://melpa.org/#/duplicate-thing";
           license = lib.licenses.free;
         };
       }) {};
     dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dyalog-mode";
-        version = "20151111.854";
+        version = "20160315.1049";
         src = fetchhg {
           url = "https://bitbucket.com/harsman/dyalog-mode";
-          rev = "ce795beb8747";
-          sha256 = "0ghxnzi2iy1g633fshl9wdpg2asrcl0v5rkk61gqd6axm7fjaxcj";
+          rev = "4dac440334f0";
+          sha256 = "19aid1rqpqj0fvln98db5imfk1griqld55xsr9plm6kwrr174syq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dyalog-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dyalog-mode";
           sha256 = "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq";
           name = "dyalog-mode";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/dyalog-mode";
+          homepage = "https://melpa.org/#/dyalog-mode";
           license = lib.licenses.free;
         };
       }) {};
     dylan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dylan-mode";
-        version = "20140611.37";
+        version = "20160405.1714";
         src = fetchFromGitHub {
           owner = "dylan-lang";
           repo = "dylan-mode";
-          rev = "2a5b8a65a3e3e9543e935dceea1a121e69e78c8e";
-          sha256 = "011423kvbfcd7jifg9425j89hlzmnw4j751s4mdz9wyr979k19ny";
+          rev = "7e8ba16bf125f0066d3e1caeefaba94a6d32ac72";
+          sha256 = "0fxdv594k6p4kv6nc598rw51sy4x10dvbyhzn3gni2linb3v1c5h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dylan-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dylan-mode";
           sha256 = "0kimvz8vmcvgxi0wvf7dqv6plj31xlksmvgip8h3bhyy7slxj3yy";
           name = "dylan-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dylan-mode";
+          homepage = "https://melpa.org/#/dylan-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -12570,13 +13120,13 @@
           sha256 = "150dj1g49q9x9zx9wkymq30l5gc8c4mhsq91fm6q0yj6ip7hlfxh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dynamic-fonts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dynamic-fonts";
           sha256 = "0a210ca41maa755lv1n7hhpxp0f7lfxrxbi0x34icbkfkmijhl6q";
           name = "dynamic-fonts";
         };
         packageRequires = [ font-utils pcache persistent-soft ];
         meta = {
-          homepage = "http://melpa.org/#/dynamic-fonts";
+          homepage = "https://melpa.org/#/dynamic-fonts";
           license = lib.licenses.free;
         };
       }) {};
@@ -12591,13 +13141,13 @@
           sha256 = "1jsjk4fkisgprn2w1d1385kbc9w1bd707biapd1y453k20q5c4h5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dynamic-ruler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dynamic-ruler";
           sha256 = "13jc3xbsyc3apkdfy0iafmsfvgqs0zfa5w8jxp7zj4dhb7pxpnmc";
           name = "dynamic-ruler";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dynamic-ruler";
+          homepage = "https://melpa.org/#/dynamic-ruler";
           license = lib.licenses.free;
         };
       }) {};
@@ -12612,13 +13162,13 @@
           sha256 = "0d18kdpw4zfbq4bkqh19cf42xlinxqa71lr2d994phaxqxqq195w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2ansi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/e2ansi";
           sha256 = "0ns1sldipx5kyqpi0bw79kdmhi1ry5glwxfzfx8r01hbbkf0cc94";
           name = "e2ansi";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/e2ansi";
+          homepage = "https://melpa.org/#/e2ansi";
           license = lib.licenses.free;
         };
       }) {};
@@ -12633,13 +13183,13 @@
           sha256 = "1lx0c7s810x6prf7x1lnx412gll8nn8gqpmi56n319n406cxhnhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/e2wm";
           sha256 = "0dp360jr3fgxqywkp7g88cp02g37kw2hdsc0f70hjak9n3sy03la";
           name = "e2wm";
         };
         packageRequires = [ window-layout ];
         meta = {
-          homepage = "http://melpa.org/#/e2wm";
+          homepage = "https://melpa.org/#/e2wm";
           license = lib.licenses.free;
         };
       }) {};
@@ -12654,13 +13204,13 @@
           sha256 = "1g77gf24abwcvf7z52vs762s6jp978pnvza8zmzwkwfvp1mkx233";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-R";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/e2wm-R";
           sha256 = "09v4fz178lch4d6m801ipclfxm2qrap5601aysnzyvc2apvyr3sh";
           name = "e2wm-R";
         };
         packageRequires = [ e2wm ess inlineR ];
         meta = {
-          homepage = "http://melpa.org/#/e2wm-R";
+          homepage = "https://melpa.org/#/e2wm-R";
           license = lib.licenses.free;
         };
       }) {};
@@ -12675,13 +13225,13 @@
           sha256 = "121vd44f42bxqvdjswmjlghf1jalbs974b6cip2i049k1n08xgh0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-bookmark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/e2wm-bookmark";
           sha256 = "1myaqxzrgff5gxcn3zn1bsmyf5122ql1mwr05wamd450lq8nmbw5";
           name = "e2wm-bookmark";
         };
         packageRequires = [ e2wm ];
         meta = {
-          homepage = "http://melpa.org/#/e2wm-bookmark";
+          homepage = "https://melpa.org/#/e2wm-bookmark";
           license = lib.licenses.free;
         };
       }) {};
@@ -12696,13 +13246,13 @@
           sha256 = "09i7d2rc9zd4s3nqrhd3ggs1ykdpxf0pyhxixxw2xy0q6nbswjia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/e2wm-direx";
           sha256 = "0nv8aciq0swxi9ahwc2pvk9c7i3rmlp7vrzqcan58ml0i3nm17wg";
           name = "e2wm-direx";
         };
         packageRequires = [ direx e2wm ];
         meta = {
-          homepage = "http://melpa.org/#/e2wm-direx";
+          homepage = "https://melpa.org/#/e2wm-direx";
           license = lib.licenses.free;
         };
       }) {};
@@ -12717,13 +13267,13 @@
           sha256 = "1vrlfzy1wynm7x4m7pl8vim7ykqd6qkcilwz7sjc1lbckz11ig0d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-pkgex4pl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/e2wm-pkgex4pl";
           sha256 = "0hgdbqfw3015fr929m36kfiqqzsid6afs3222iqq0apg7gfj7jil";
           name = "e2wm-pkgex4pl";
         };
         packageRequires = [ e2wm plsense-direx ];
         meta = {
-          homepage = "http://melpa.org/#/e2wm-pkgex4pl";
+          homepage = "https://melpa.org/#/e2wm-pkgex4pl";
           license = lib.licenses.free;
         };
       }) {};
@@ -12738,13 +13288,13 @@
           sha256 = "0h1fnlpvy2mqfxjv64znghmiadh9qimj9q9a60cxhyc0bq0prz6f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-svg-clock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/e2wm-svg-clock";
           sha256 = "0q02lksrbn43s8d9rzpglqybalglpi6qi9lix0cllag6i7fzcbms";
           name = "e2wm-svg-clock";
         };
         packageRequires = [ e2wm svg-clock ];
         meta = {
-          homepage = "http://melpa.org/#/e2wm-svg-clock";
+          homepage = "https://melpa.org/#/e2wm-svg-clock";
           license = lib.licenses.free;
         };
       }) {};
@@ -12759,13 +13309,13 @@
           sha256 = "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-sww";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/e2wm-sww";
           sha256 = "0x45j62cjivf9v7jp1b41yya3f9akp92md6cbv0v7bwz98g2vsk8";
           name = "e2wm-sww";
         };
         packageRequires = [ e2wm ];
         meta = {
-          homepage = "http://melpa.org/#/e2wm-sww";
+          homepage = "https://melpa.org/#/e2wm-sww";
           license = lib.licenses.free;
         };
       }) {};
@@ -12780,13 +13330,13 @@
           sha256 = "0qv3kh6q3q7vgfsd8x25x8agi3fp96dkpjnxdidkwk6k8h9n0jzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/e2wm-term";
           sha256 = "0wrq06yap80a96l9l0hs7x7rng7sx6vi1hz778kknb6il4f2f45g";
           name = "e2wm-term";
         };
         packageRequires = [ e2wm log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/e2wm-term";
+          homepage = "https://melpa.org/#/e2wm-term";
           license = lib.licenses.free;
         };
       }) {};
@@ -12801,13 +13351,13 @@
           sha256 = "09ikwg5s42b50lfj0796pa2h32larkf5j6cy042dzh8c441vgih4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/easy-after-load";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/easy-after-load";
           sha256 = "1mn4hpx82nifphzx71yw3rbixbgis8bhvl3iyxcgcd88n5hqwvys";
           name = "easy-after-load";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/easy-after-load";
+          homepage = "https://melpa.org/#/easy-after-load";
           license = lib.licenses.free;
         };
       }) {};
@@ -12822,13 +13372,13 @@
           sha256 = "1qn0givyh07w41sv5xayfzlwbpbq7p39wbhmwsgffgfqzzz5r2ys";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/easy-escape";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/easy-escape";
           sha256 = "1zspb79x6s151wwiian45j1nh0xps8y8yd98byyn5lbwbj2pp2gk";
           name = "easy-escape";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/easy-escape";
+          homepage = "https://melpa.org/#/easy-escape";
           license = lib.licenses.free;
         };
       }) {};
@@ -12843,34 +13393,34 @@
           sha256 = "0i2plbvaalapx3svryn5lrc68m0qj1xm0z577xxzq7i9z91nanq7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/easy-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/easy-kill";
           sha256 = "10jcv7a4vcnaj3wkabip2xwzcwlmvdlqkl409a9lnzfasxcpf32i";
           name = "easy-kill";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/easy-kill";
+          homepage = "https://melpa.org/#/easy-kill";
           license = lib.licenses.free;
         };
       }) {};
     easy-kill-extras = callPackage ({ easy-kill, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-kill-extras";
-        version = "20151209.2117";
+        version = "20160418.2119";
         src = fetchFromGitHub {
           owner = "knu";
           repo = "easy-kill-extras.el";
-          rev = "aff957b4fd699331d21648780b2f0f6ffc3cb70b";
-          sha256 = "18fn9qnm0cwdy47nv6wafiy6cf7rnv4av4w8zmjwjj0n8ql4jl08";
+          rev = "65fc4fdfb79c6dd679b4a1a57fa657b4b39919cc";
+          sha256 = "0mmhqid0x56m0p3b18a757147fy8km3p4kmi0y94kjq04a4ysg3k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/easy-kill-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/easy-kill-extras";
           sha256 = "0xzlzv57nvrc142saydwfib51fyqcdzjccc1hj6xvgcdbwadlnjy";
           name = "easy-kill-extras";
         };
         packageRequires = [ easy-kill ];
         meta = {
-          homepage = "http://melpa.org/#/easy-kill-extras";
+          homepage = "https://melpa.org/#/easy-kill-extras";
           license = lib.licenses.free;
         };
       }) {};
@@ -12885,13 +13435,13 @@
           sha256 = "0qpabig0qrkyhhiifjpq9a7qv7h3nlqmpz79xy8lk58xy6rj0zk0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/easy-lentic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/easy-lentic";
           sha256 = "1j141lncgcgfpa42m505xndiy6lh848xymfvb3cz4d6h73421khg";
           name = "easy-lentic";
         };
         packageRequires = [ cl-lib lentic ];
         meta = {
-          homepage = "http://melpa.org/#/easy-lentic";
+          homepage = "https://melpa.org/#/easy-lentic";
           license = lib.licenses.free;
         };
       }) {};
@@ -12906,13 +13456,13 @@
           sha256 = "18bm5ns1qrxq0rrz9sylshr62wkymh1m6b7ch2y74f8rcwdwjgnq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/easy-repeat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/easy-repeat";
           sha256 = "1vx57gpw0nbxh976s18va4ali1nqxqffhaxv1c5rhf4pwlk2fa06";
           name = "easy-repeat";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/easy-repeat";
+          homepage = "https://melpa.org/#/easy-repeat";
           license = lib.licenses.free;
         };
       }) {};
@@ -12927,13 +13477,13 @@
           sha256 = "0ysym38xaqyx1wc7xd3fvjm62dmiq4727dnjvyxv7hs4czff1gcb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ebal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ebal";
           sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg";
           name = "ebal";
         };
         packageRequires = [ emacs f ido-completing-read-plus ];
         meta = {
-          homepage = "http://melpa.org/#/ebal";
+          homepage = "https://melpa.org/#/ebal";
           license = lib.licenses.free;
         };
       }) {};
@@ -12944,38 +13494,38 @@
         src = fetchFromGitHub {
           owner = "rexim";
           repo = "ebf";
-          rev = "b52dd2fa8c6a4a7acf4d93c16f54fbd9fbe087df";
-          sha256 = "1yyx6z251bgvcfi3jzdq4cnmyd8vmz3gffbzii5bdga4ms288j5d";
+          rev = "4cd9c26354d8be6571354b2954d21fba882e78a2";
+          sha256 = "1pgn6fcg5cnbpk93hc2vw95sna07x0s1v2i6lq9bmij2msvar611";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ebf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ebf";
           sha256 = "072w1hczzb4z0dadvqy8px9zfnfd2z0w8nwa7q2qm5njg30rrqpb";
           name = "ebf";
         };
         packageRequires = [ cl-lib dash dash-functional ];
         meta = {
-          homepage = "http://melpa.org/#/ebf";
+          homepage = "https://melpa.org/#/ebf";
           license = lib.licenses.free;
         };
       }) {};
     ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }:
     melpaBuild {
         pname = "ebib";
-        version = "20160219.408";
+        version = "20160410.1944";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "09211cde0a56ac38781269fb1db24424c76d0ad9";
-          sha256 = "1pzx6izs9zg9fivplzagjf3a8477f4cka1py7mq8na6cv5wijyam";
+          rev = "069ecbe32a4d5f1273e2d749204750652fbb5d91";
+          sha256 = "1kcmbr4a2jxd62s4nc8xshrksb36xwb17j6c0hjzvb75r544xy6s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ebib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ebib";
           sha256 = "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid";
           name = "ebib";
         };
         packageRequires = [ dash emacs parsebib ];
         meta = {
-          homepage = "http://melpa.org/#/ebib";
+          homepage = "https://melpa.org/#/ebib";
           license = lib.licenses.free;
         };
       }) {};
@@ -12990,13 +13540,13 @@
           sha256 = "1hs069m4m6vhb37ac2x6hzbp9mfmpd3zhp4m631lx8dlmx11rydz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ecb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ecb";
           sha256 = "097hdskhfh255znrqamcssx4ns1sgkxchlbc7pjqwzpflsi0fx89";
           name = "ecb";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ecb";
+          homepage = "https://melpa.org/#/ecb";
           license = lib.licenses.free;
         };
       }) {};
@@ -13004,17 +13554,17 @@
         pname = "echo-bell";
         version = "20151231.1456";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/echo-bell.el";
+          url = "https://www.emacswiki.org/emacs/download/echo-bell.el";
           sha256 = "0jk7pb2sr4qbxwcn4ipcjc9phl9zjmgg8sf91qj113112xx7vvxa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/echo-bell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/echo-bell";
           sha256 = "0adhdfbcpmdhd9252rh0jik2z3v9bzf0brpzfvcjn5py2x6724ws";
           name = "echo-bell";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/echo-bell";
+          homepage = "https://melpa.org/#/echo-bell";
           license = lib.licenses.free;
         };
       }) {};
@@ -13029,13 +13579,13 @@
           sha256 = "1vxa6d8kp4h1havr9cq7zqgqm1xsjxhbgbi4hvi842ma6xwh4m5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eclipse-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eclipse-theme";
           sha256 = "0mww0jysxqky1zkkhvhj7fn20w970n2w6501rdm5jwqfb58ivxfx";
           name = "eclipse-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/eclipse-theme";
+          homepage = "https://melpa.org/#/eclipse-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -13050,34 +13600,34 @@
           sha256 = "0h6vh719ai0cxyja6wpfi6m76d42vskj56wg666j0h6j0qw6h3i2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ecukes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ecukes";
           sha256 = "0ava8hrc7r1mzv6xgbrb84qak5xrf6fj8g9qr4i4g0cr7843nrw0";
           name = "ecukes";
         };
         packageRequires = [ ansi commander dash espuds f s ];
         meta = {
-          homepage = "http://melpa.org/#/ecukes";
+          homepage = "https://melpa.org/#/ecukes";
           license = lib.licenses.free;
         };
       }) {};
     edbi = callPackage ({ concurrent, ctable, epc, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "edbi";
-        version = "20140920.235";
+        version = "20160224.1941";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-edbi";
-          rev = "3edb409245d8a3bca7a5b25c70c98954c0ab42b2";
-          sha256 = "1x5y1d5crc48iddlsf6irkr017p32a9xjcmlm9wf3zggmr95fr3s";
+          rev = "6f50aaf4bde75255221f2292c7a4ad3fa9d918c0";
+          sha256 = "0x0igyvdcm4863n7zndvcv6wgzwgn7324cbfjja6xd7r0k936zdy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edbi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/edbi";
           sha256 = "0qq0j16n8lyvkqqlcsrq1m7r7f0in6b92d74mpx5c6siv6z2vxlr";
           name = "edbi";
         };
         packageRequires = [ concurrent ctable epc ];
         meta = {
-          homepage = "http://melpa.org/#/edbi";
+          homepage = "https://melpa.org/#/edbi";
           license = lib.licenses.free;
         };
       }) {};
@@ -13092,13 +13642,13 @@
           sha256 = "0f59s0a7zpa3dny1k7x6zrymrnzba184smq8v1vvz8hkc0ym1j1v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edbi-database-url";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/edbi-database-url";
           sha256 = "018rxijmy0lvisy281d501ra9lnh5xi0wmvz5avbjpb0fi4q1zdn";
           name = "edbi-database-url";
         };
         packageRequires = [ edbi emacs ];
         meta = {
-          homepage = "http://melpa.org/#/edbi-database-url";
+          homepage = "https://melpa.org/#/edbi-database-url";
           license = lib.licenses.free;
         };
       }) {};
@@ -13109,17 +13659,17 @@
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "edbi-django";
-          rev = "bdafb3f0a7b20aad4c1898d19d03f56e0554c850";
-          sha256 = "16qpficprg1xw1paz0m2988bw436ykx1lr6bwffp1d7hjvccp9d5";
+          rev = "01c44a330a8d6ff08932d63dec4d9512d582bcda";
+          sha256 = "1029b7p1lnyqkg0jm9an6s1l7la0kb38gx42g7212wbj71s3krga";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edbi-django";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/edbi-django";
           sha256 = "1s59hab35hwnspyklxbhi0js0sgdn0rc7y33dqjk0psjcikqymg1";
           name = "edbi-django";
         };
         packageRequires = [ edbi emacs f ];
         meta = {
-          homepage = "http://melpa.org/#/edbi-django";
+          homepage = "https://melpa.org/#/edbi-django";
           license = lib.licenses.free;
         };
       }) {};
@@ -13134,13 +13684,13 @@
           sha256 = "176954d4agk4by5w8a5ky65iwjky1dqxxvz8vdf8fxj82r5k9fhh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edbi-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/edbi-minor-mode";
           sha256 = "0p7vdf9cp6i7mhjxj82670pfflf1kacalmakb7ssgigs1nsf3spi";
           name = "edbi-minor-mode";
         };
         packageRequires = [ edbi ];
         meta = {
-          homepage = "http://melpa.org/#/edbi-minor-mode";
+          homepage = "https://melpa.org/#/edbi-minor-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -13155,13 +13705,13 @@
           sha256 = "1vll81386fx90lq5sy4rlxcik6mvw7zx5cc51f0yaca9bkcckp51";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edbi-sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/edbi-sqlite";
           sha256 = "1w53ypz3pdqaml3vq9j3f1w443n8s9hb2ys090kxvjqnb8x8v44y";
           name = "edbi-sqlite";
         };
         packageRequires = [ edbi emacs ];
         meta = {
-          homepage = "http://melpa.org/#/edbi-sqlite";
+          homepage = "https://melpa.org/#/edbi-sqlite";
           license = lib.licenses.free;
         };
       }) {};
@@ -13176,13 +13726,13 @@
           sha256 = "1cfjw9b1lm29s5cbh0qqmkchbq2382s71w4rpb0gyf603s0yg13m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ede-compdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ede-compdb";
           sha256 = "1ypi7rxbgg2qck1b571hcw5m4ipllb48g6sindpdf180kbfbfpn7";
           name = "ede-compdb";
         };
         packageRequires = [ cl-lib ede semantic ];
         meta = {
-          homepage = "http://melpa.org/#/ede-compdb";
+          homepage = "https://melpa.org/#/ede-compdb";
           license = lib.licenses.free;
         };
       }) {};
@@ -13197,13 +13747,13 @@
           sha256 = "1zgiifi1k2d9g8sarfpjzamk8g1yx4ilgn60mqhy2pznp30b5qb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edebug-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/edebug-x";
           sha256 = "0mzrip6y346mix4ny1xj8rkji1w531ix24k3cczmlmm4hm7l29ql";
           name = "edebug-x";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/edebug-x";
+          homepage = "https://melpa.org/#/edebug-x";
           license = lib.licenses.free;
         };
       }) {};
@@ -13218,13 +13768,13 @@
           sha256 = "0crwdgng377sy1zbq7kqkz24v697mlzgdsvkdp1m8r7ympikkj6w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edit-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/edit-at-point";
           sha256 = "0sn5a644zm165li44yffcpcai8bhl3yfvqcljghlwaa0w45sc9im";
           name = "edit-at-point";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/edit-at-point";
+          homepage = "https://melpa.org/#/edit-at-point";
           license = lib.licenses.free;
         };
       }) {};
@@ -13239,13 +13789,13 @@
           sha256 = "0vk954f44m2bq7qb122pzlb8fibrisx47ihvn3h96m8nmx0fv32r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edit-color-stamp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/edit-color-stamp";
           sha256 = "1f8v8w3w7vb8jv29w06mplah8yfcs5qfjz2w4irv0rg7dwzy3zk8";
           name = "edit-color-stamp";
         };
         packageRequires = [ cl-lib es-lib ];
         meta = {
-          homepage = "http://melpa.org/#/edit-color-stamp";
+          homepage = "https://melpa.org/#/edit-color-stamp";
           license = lib.licenses.free;
         };
       }) {};
@@ -13260,13 +13810,13 @@
           sha256 = "10c84aad1lnr7z9f75k5ylgchykr3srcdmn88hlcx2n2c4jfbkds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edit-indirect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/edit-indirect";
           sha256 = "0q5jjmrvx5kaajllmhaxihsab2kr1vmcsfqrhxdhw3x3nf41s439";
           name = "edit-indirect";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/edit-indirect";
+          homepage = "https://melpa.org/#/edit-indirect";
           license = lib.licenses.free;
         };
       }) {};
@@ -13281,13 +13831,13 @@
           sha256 = "0981hy1n50yizc3k06vbxqrpfml817a67kab1hkgkw5v6ymm1hc9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edit-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/edit-list";
           sha256 = "0mi12jfgx06i0yr8k5nk80xryqszjv0xykdnri505862rb90xakv";
           name = "edit-list";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/edit-list";
+          homepage = "https://melpa.org/#/edit-list";
           license = lib.licenses.free;
         };
       }) {};
@@ -13302,13 +13852,13 @@
           sha256 = "0ssmhwg4wfh5cxgqv8bl55449204h4zi863m7jhvas4c9zq005kd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edit-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/edit-server";
           sha256 = "0ffxcgmnz0f2c1i3vfwm8vlm6jyd7ibf4kq5z8c6n50zkwfdmns0";
           name = "edit-server";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/edit-server";
+          homepage = "https://melpa.org/#/edit-server";
           license = lib.licenses.free;
         };
       }) {};
@@ -13323,76 +13873,34 @@
           sha256 = "174xq45xc632zrb916aw7q4bch96pbi6zgy3dk77qla3ky9cfpl3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edit-server-htmlize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/edit-server-htmlize";
           sha256 = "007lv3698a88wxan7kplz2117azxxpzzgshin9c1aabg059hszlj";
           name = "edit-server-htmlize";
         };
         packageRequires = [ edit-server ];
         meta = {
-          homepage = "http://melpa.org/#/edit-server-htmlize";
+          homepage = "https://melpa.org/#/edit-server-htmlize";
           license = lib.licenses.free;
         };
       }) {};
-    editorconfig = callPackage ({ editorconfig-core, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig";
-        version = "20160217.2152";
+        version = "20160422.1640";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "c8ab99b94929ab86a18128464b9c464f21e0d0b7";
-          sha256 = "1qsmx1wamjfdbhzj45kmkiprakfvfivm9fgy51byqk0sh84r2pkk";
+          rev = "9e5606f0fe7d202ecf4ceb4c01be271fd594fbdd";
+          sha256 = "0drqa91h0n25ydd6mn5w2js7d0acavzhr04f69m1qn5cjg3dm7l8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/editorconfig";
-          sha256 = "0na5lfi9bs4k1q73pph3ff0v8k8vzrfpzh47chyzk8nxsmvklw35";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/editorconfig";
+          sha256 = "0zv96m07ml8i3k7zm7sdci4hn611n3ypna7zppfkwbdyr7d5k2gc";
           name = "editorconfig";
         };
-        packageRequires = [ editorconfig-core ];
-        meta = {
-          homepage = "http://melpa.org/#/editorconfig";
-          license = lib.licenses.free;
-        };
-      }) {};
-    editorconfig-core = callPackage ({ cl-lib ? null, editorconfig-fnmatch, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "editorconfig-core";
-        version = "20160212.306";
-        src = fetchFromGitHub {
-          owner = "editorconfig";
-          repo = "editorconfig-emacs";
-          rev = "c8ab99b94929ab86a18128464b9c464f21e0d0b7";
-          sha256 = "1qsmx1wamjfdbhzj45kmkiprakfvfivm9fgy51byqk0sh84r2pkk";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/editorconfig-core";
-          sha256 = "18d7byqkxn6lyw3nqsvqs5vyj9alh9wjd2mim44a3zcc9r2j061r";
-          name = "editorconfig-core";
-        };
-        packageRequires = [ cl-lib editorconfig-fnmatch ];
-        meta = {
-          homepage = "http://melpa.org/#/editorconfig-core";
-          license = lib.licenses.free;
-        };
-      }) {};
-    editorconfig-fnmatch = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "editorconfig-fnmatch";
-        version = "20160212.306";
-        src = fetchFromGitHub {
-          owner = "editorconfig";
-          repo = "editorconfig-emacs";
-          rev = "c8ab99b94929ab86a18128464b9c464f21e0d0b7";
-          sha256 = "1qsmx1wamjfdbhzj45kmkiprakfvfivm9fgy51byqk0sh84r2pkk";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/editorconfig-fnmatch";
-          sha256 = "0ji243vrw527jc3alsgmqi9rdnslxyq48zzx33rbpkqcjssm11iv";
-          name = "editorconfig-fnmatch";
-        };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/editorconfig-fnmatch";
+          homepage = "https://melpa.org/#/editorconfig";
           license = lib.licenses.free;
         };
       }) {};
@@ -13407,13 +13915,13 @@
           sha256 = "1xp2hjhn52k6l1g6ypva6dsklpawni7gvjafbz6404f9dyxflh7l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/edn";
           sha256 = "00cy8axhy2p3zalzl8k2083l5a7s3aswb9qfk9wsmf678m8pqwqg";
           name = "edn";
         };
         packageRequires = [ cl-lib emacs peg ];
         meta = {
-          homepage = "http://melpa.org/#/edn";
+          homepage = "https://melpa.org/#/edn";
           license = lib.licenses.free;
         };
       }) {};
@@ -13428,7 +13936,7 @@
           sha256 = "0vsrcvrd02nx647gxp65r548qlxg50w73dy0rs1lxwy6mdgp0npv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/edts";
           sha256 = "0f0rbd0mqqwn743qmr1g5mmi1sbmlcglclww8jxvbvb61jq8vspr";
           name = "edts";
         };
@@ -13443,7 +13951,7 @@
           s
         ];
         meta = {
-          homepage = "http://melpa.org/#/edts";
+          homepage = "https://melpa.org/#/edts";
           license = lib.licenses.free;
         };
       }) {};
@@ -13458,55 +13966,76 @@
           sha256 = "1c2iyv392ap35nss4j901h33d3lx9lmq5v43flf2rid1766pam6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/efire";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/efire";
           sha256 = "1c8vdc58i0k7vvanwhckfc31226d3rb5xq77lh9ydgnd4i97gq2w";
           name = "efire";
         };
         packageRequires = [ circe ];
         meta = {
-          homepage = "http://melpa.org/#/efire";
+          homepage = "https://melpa.org/#/efire";
           license = lib.licenses.free;
         };
       }) {};
     egg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "egg";
-        version = "20160111.231";
+        version = "20160330.2247";
         src = fetchFromGitHub {
           owner = "byplayer";
           repo = "egg";
-          rev = "d0721515131f9a9bdfa55c22dae817dd6b1a4585";
-          sha256 = "1l9p8nairqr3ym5ydy0rwczcmkx2jq9b2g9r0r96n0vnjpybk6q2";
+          rev = "cadc5c7fd21142d7ea41732200ab52eac0b96d3f";
+          sha256 = "1qrblglkafwzfds8x5wp4yrn1gq8iz823iilxcp9mwycbw57ajw8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/egg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/egg";
           sha256 = "144g1fvs2cmn3px0a98nvxl5cz70kx30v936k5ppyi8gvbj0md5i";
           name = "egg";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/egg";
+          homepage = "https://melpa.org/#/egg";
           license = lib.licenses.free;
         };
       }) {};
     egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "egison-mode";
-        version = "20160217.1805";
+        version = "20160415.327";
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "04b6a26e4e9abc9791bc5c4f230282628623d25a";
-          sha256 = "0ykjddp8jc2a2b2dkbnp96sda4qb9c70f8vqzndykzvccfhl7kan";
+          rev = "7b3902a8b08a6e6e74ef37983287bcf00bc1900f";
+          sha256 = "09i7bczfqxsnqswa7dg2zslka2bj4yzhjks2vhmb97576dg6pwir";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/egison-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/egison-mode";
           sha256 = "0x11fhv8kkx34h831k2q70y5qfz7wnfia4ka5mbmps7mpr68zcwi";
           name = "egison-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/egison-mode";
+          homepage = "https://melpa.org/#/egison-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
+    melpaBuild {
+        pname = "ego";
+        version = "20160423.2001";
+        src = fetchFromGitHub {
+          owner = "emacs-china";
+          repo = "EGO";
+          rev = "214817db1816710bdf13ddb07b01d1a1b7e00fa3";
+          sha256 = "04sjq2gfnfapkwpk4l2jbpsivshps74yjwxddssbr85r6qq57bvw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ego";
+          sha256 = "02s840chz3v4gdyq01b5i5w2vxl94001jk9j1nsp5b8xm10w985j";
+          name = "ego";
+        };
+        packageRequires = [ dash emacs ht htmlize mustache org simple-httpd ];
+        meta = {
+          homepage = "https://melpa.org/#/ego";
           license = lib.licenses.free;
         };
       }) {};
@@ -13516,55 +14045,58 @@
         src = fetchgit {
           url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git";
           rev = "9d7fb8c50568ece04bb0382caca42d3ab68fbb01";
-          sha256 = "200307116b3617feeb5b52fb7234ad1a13a2afd89830afbdc291c265fa762ae2";
+          sha256 = "1qiafvx6bhliqaysyc4qv2ps44qsmls75ysjbgmzw5rndc8hf0r0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eide";
           sha256 = "16cf32n2l4wy1px7fm6x4vxx7pbqdp7zh2jn3bymg0b40i2321sz";
           name = "eide";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/eide";
+          homepage = "https://melpa.org/#/eide";
           license = lib.licenses.free;
         };
       }) {};
-    eimp = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    eimp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "eimp";
-        version = "20140630.947";
-        src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/eimp.el";
-          sha256 = "024qyipwlj3g0fff06cgq357blkh3hyr14vpmkqsv15x6gb9snir";
+        version = "20120826.1539";
+        src = fetchFromGitHub {
+          owner = "nicferrier";
+          repo = "eimp";
+          rev = "2e7536fe6d8f7faf1bad7a8ae37faba0162c3b4f";
+          sha256 = "154d57yafxbcf39r89n5j43c86rp2fki3lw3gwy7ww2g6qkclcra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eimp";
-          sha256 = "11z23kx89yy03hzs1xlbcih70lsp2lplxs8nkc8jvfcpsjwypsl0";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eimp";
+          sha256 = "00g77bg49m38cjfbh17ccnmksz05qx7yvgl6i4i4hysbr2d8pgxd";
           name = "eimp";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/eimp";
+          homepage = "https://melpa.org/#/eimp";
           license = lib.licenses.free;
         };
       }) {};
     ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20160203.2226";
+        version = "20160422.829";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "261576f94bb6eddc566c9d7aa557bf7cd20a2c05";
-          sha256 = "05nvfjslfwzr54m1h2xjq3icd29khxpy0mka5r05gmlj3xzhkldv";
+          rev = "b26c972ec89842ac21d4076b9d5719d26e7d5745";
+          sha256 = "1b20cz9grxyjpbmc91csfygkg6rnclj39cc6pnlxxy6ikcn5xywn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ein";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ein";
           sha256 = "1nksj1cpf4d9brr3rb80bgp2x05qdq9xmlp8mwbic1s27mw80bpp";
           name = "ein";
         };
         packageRequires = [ cl-generic request websocket ];
         meta = {
-          homepage = "http://melpa.org/#/ein";
+          homepage = "https://melpa.org/#/ein";
           license = lib.licenses.free;
         };
       }) {};
@@ -13579,34 +14111,34 @@
           sha256 = "1w0b3giy9ca35pp2ni4afnqas64a2vriilab7jiw9anp3ryh6570";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ein-mumamo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ein-mumamo";
           sha256 = "029sk90xz9fhv2s56f5hp0aks1d6ybz517009vv4892bbzkpjv1w";
           name = "ein-mumamo";
         };
         packageRequires = [ ein ];
         meta = {
-          homepage = "http://melpa.org/#/ein-mumamo";
+          homepage = "https://melpa.org/#/ein-mumamo";
           license = lib.licenses.free;
         };
       }) {};
     eink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eink-theme";
-        version = "20160221.702";
+        version = "20160321.458";
         src = fetchFromGitHub {
           owner = "maio";
           repo = "eink-emacs";
-          rev = "61f5ecbb165b2e18fc131c8056a2522e8bf8802a";
-          sha256 = "0bbaxg8g7gs75ih6shc3hxy9mwq7ci3q9iyly2snssaa613hijyv";
+          rev = "93d25c097b105594472c4f99d693f439b4b709f0";
+          sha256 = "0m7qsk378c30fva2n2ag99rsdklx5nsqc395msg1ab11sbpxvis0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eink-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eink-theme";
           sha256 = "0z437cpf1b8bqyi7bv0w0dnc52q4f5g17530lwdcxjkr38s9b1zn";
           name = "eink-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/eink-theme";
+          homepage = "https://melpa.org/#/eink-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -13621,34 +14153,34 @@
           sha256 = "0dbp2zz993cm7mrd58c4iflbzqwg50wzgn2cpwfivk14w1mznh4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-autoyas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/el-autoyas";
           sha256 = "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c";
           name = "el-autoyas";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/el-autoyas";
+          homepage = "https://melpa.org/#/el-autoyas";
           license = lib.licenses.free;
         };
       }) {};
     el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-get";
-        version = "20160206.140";
+        version = "20160413.2057";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "9126044d31ab5e266472d9921fcb61c62c47beb3";
-          sha256 = "1c64ln6b6ddhac5wq66y51h693iiwwawgxhsjkw5kmimv2rkygrs";
+          rev = "0e9000ce31521d7a2f1d9cab5359c46af73ac530";
+          sha256 = "0jg4514vql9icsr34mdcq9hcnjfnh2nq424d2zg3kcbc3jmhymi7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-get";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/el-get";
           sha256 = "1438v2sw5n67q404c93y2py226v469nagqwp4w9l6yyy40h4myhz";
           name = "el-get";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/el-get";
+          homepage = "https://melpa.org/#/el-get";
           license = lib.licenses.free;
         };
       }) {};
@@ -13663,13 +14195,13 @@
           sha256 = "0qk5jk0n7ga2cxqnm69rsy5cjjn5b4l4yqgaafvmmrrp70p8drmi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-init";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/el-init";
           sha256 = "121n6z8p9kzi7axp4i2kyi621gw20635w4j81i1bryblaqrv5kl5";
           name = "el-init";
         };
         packageRequires = [ anaphora cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/el-init";
+          homepage = "https://melpa.org/#/el-init";
           license = lib.licenses.free;
         };
       }) {};
@@ -13684,13 +14216,13 @@
           sha256 = "0flf0pa3xwrdhfkshyr6nqrm957sgx9jkganbasqavbq1dvlw6lj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-init-viewer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/el-init-viewer";
           sha256 = "0kkmsml9xf2n8nlrcicfg2l78s3dlhd6ssx0s62v77v4wdpl297m";
           name = "el-init-viewer";
         };
         packageRequires = [ anaphora cl-lib ctable dash el-init emacs ];
         meta = {
-          homepage = "http://melpa.org/#/el-init-viewer";
+          homepage = "https://melpa.org/#/el-init-viewer";
           license = lib.licenses.free;
         };
       }) {};
@@ -13705,13 +14237,13 @@
           sha256 = "1jiq2hpym3wpk80zsl4lffpv4kgkykc2zp08sb01wa7pl8d1knmm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-mock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/el-mock";
           sha256 = "07m7w7n202nijnxidy0j0r4nbcvlnbkm9b0n8qb2bwi3d4cfp77l";
           name = "el-mock";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/el-mock";
+          homepage = "https://melpa.org/#/el-mock";
           license = lib.licenses.free;
         };
       }) {};
@@ -13726,13 +14258,13 @@
           sha256 = "1iykhicc1ic1r6h4vj3701rm0vfy41b16w3d98amf8jjypv54wv7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-pocket";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/el-pocket";
           sha256 = "0fgylpfixsx5l1nrgz6n1c2ayf52p60f9q290hmkn36siyx5hixw";
           name = "el-pocket";
         };
         packageRequires = [ emacs web ];
         meta = {
-          homepage = "http://melpa.org/#/el-pocket";
+          homepage = "https://melpa.org/#/el-pocket";
           license = lib.licenses.free;
         };
       }) {};
@@ -13747,13 +14279,13 @@
           sha256 = "1lsq7980pwcwlg7z37hrig8ddm9nyvaqrlczv1w0vy631vc5z2az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-spec";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/el-spec";
           sha256 = "017syizs8qw5phwvpzzffzdnj6rh9q4n7s51qjvj8qfb3088igkh";
           name = "el-spec";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/el-spec";
+          homepage = "https://melpa.org/#/el-spec";
           license = lib.licenses.free;
         };
       }) {};
@@ -13768,13 +14300,13 @@
           sha256 = "1sba405h1sy5vxg4ki631p4979gyaqv8wnwbgca5jp2pm8l3viri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-spice";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/el-spice";
           sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg";
           name = "el-spice";
         };
         packageRequires = [ thingatpt-plus ];
         meta = {
-          homepage = "http://melpa.org/#/el-spice";
+          homepage = "https://melpa.org/#/el-spice";
           license = lib.licenses.free;
         };
       }) {};
@@ -13789,13 +14321,13 @@
           sha256 = "04k1fz0ypmfzgwamncp2vz0lq54bq6y7c8k9nm39csp2564vmbbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-sprunge";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/el-sprunge";
           sha256 = "0rb1cr7zrfl1s5prxy3xwdqgnm8ddw33pcvk049km2qbccb08v6a";
           name = "el-sprunge";
         };
         packageRequires = [ emacs htmlize web-server ];
         meta = {
-          homepage = "http://melpa.org/#/el-sprunge";
+          homepage = "https://melpa.org/#/el-sprunge";
           license = lib.licenses.free;
         };
       }) {};
@@ -13810,13 +14342,13 @@
           sha256 = "016l3inzb7dby0w58najj2pvymwk6gllsxvqj2fkz3599i36p1pn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-spy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/el-spy";
           sha256 = "1bgv4mgsnkmjdyay7lhkqdszvnwpjy4dxxw11kq45w866ba8645n";
           name = "el-spy";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/el-spy";
+          homepage = "https://melpa.org/#/el-spy";
           license = lib.licenses.free;
         };
       }) {};
@@ -13824,17 +14356,17 @@
         pname = "el-swank-fuzzy";
         version = "20130824.657";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/el-swank-fuzzy.el";
+          url = "https://www.emacswiki.org/emacs/download/el-swank-fuzzy.el";
           sha256 = "1g2jhm9m5qcj6a231n5ch6b8bqwzq3kj275nd4s89p89v1252qhn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-swank-fuzzy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/el-swank-fuzzy";
           sha256 = "1m7y4c0r1w8ndmr1wgc2llrbfawbbxnvcvgjpsckb3704s87yxr1";
           name = "el-swank-fuzzy";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/el-swank-fuzzy";
+          homepage = "https://melpa.org/#/el-swank-fuzzy";
           license = lib.licenses.free;
         };
       }) {};
@@ -13849,13 +14381,13 @@
           sha256 = "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/el-x";
           sha256 = "1721d9mljlcbdwb5b9934q7a48y30x6706pp4bjvgys0r64dml5g";
           name = "el-x";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/el-x";
+          homepage = "https://melpa.org/#/el-x";
           license = lib.licenses.free;
         };
       }) {};
@@ -13870,13 +14402,13 @@
           sha256 = "03xlxx57z1id9mr7afkvf77m2f9rrknrm1380p51vka84v2hl3mh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el2markdown";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/el2markdown";
           sha256 = "1a52qm0jrcvvpb01blr5l7apaxqn4bvhkgha53cr48rdkmmq318g";
           name = "el2markdown";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/el2markdown";
+          homepage = "https://melpa.org/#/el2markdown";
           license = lib.licenses.free;
         };
       }) {};
@@ -13891,13 +14423,13 @@
           sha256 = "1wikmzl9gi72h6fxawj0h20828n4vypw9rrv35kqnl4gfrdmxzkk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elang";
           sha256 = "0frhn3hm8351qzljicpzars28af1fghgv45717ml79rwb4vi6yiy";
           name = "elang";
         };
         packageRequires = [ names ];
         meta = {
-          homepage = "http://melpa.org/#/elang";
+          homepage = "https://melpa.org/#/elang";
           license = lib.licenses.free;
         };
       }) {};
@@ -13912,13 +14444,13 @@
           sha256 = "0vppa9xihn8777rphiw1aqp96xn16vgjwff1dwvp8z861silp8ar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eldoc-eval";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eldoc-eval";
           sha256 = "0z4scgi2xgrgd47aqqmyv1ww8alh43s0qny5qmh3f1nnppz3nd7c";
           name = "eldoc-eval";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/eldoc-eval";
+          homepage = "https://melpa.org/#/eldoc-eval";
           license = lib.licenses.free;
         };
       }) {};
@@ -13926,17 +14458,17 @@
         pname = "eldoc-extension";
         version = "20140306.845";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/eldoc-extension.el";
+          url = "https://www.emacswiki.org/emacs/download/eldoc-extension.el";
           sha256 = "13ncpp3hrwk0h030c5nnm2zfiingilr5b876jsf2wxmylg57nbch";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eldoc-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eldoc-extension";
           sha256 = "0azkdx4ncjhb7qyhyg1a5pxgqqf2z1wq9iz802j0nxxnjzh9ny24";
           name = "eldoc-extension";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/eldoc-extension";
+          homepage = "https://melpa.org/#/eldoc-extension";
           license = lib.licenses.free;
         };
       }) {};
@@ -13951,34 +14483,34 @@
           sha256 = "0s4y1319sr4xc0k6h2zhzzxsx2kc3pc2m6saah18y4kip0hjyhr8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/electric-case";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/electric-case";
           sha256 = "11mab7799kxs3w47srmds5prmwh6ldxzial9kqbqy33vybpkprmd";
           name = "electric-case";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/electric-case";
+          homepage = "https://melpa.org/#/electric-case";
           license = lib.licenses.free;
         };
       }) {};
     electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
     melpaBuild {
         pname = "electric-operator";
-        version = "20160207.643";
+        version = "20160403.443";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "electric-operator";
-          rev = "cc5da970863c0b8d241cc716cc5cfbcb34bf6c3d";
-          sha256 = "1ihy7cmflp8wghm0708y6fsw7cxrjkdimk6ixm2in7q56qijx4d4";
+          rev = "cac8c6de50eca75d4209027dc291b368792cea10";
+          sha256 = "08ihnbcg2h078v3k4c1pgk4f8kc0k5wbxspax0q02gsqlf7n7mgx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/electric-operator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/electric-operator";
           sha256 = "043bkpvvk42lmkll5jnz4q8i0m44y4wdxvkz6hiqhqcp1rv03nw2";
           name = "electric-operator";
         };
         packageRequires = [ dash emacs names ];
         meta = {
-          homepage = "http://melpa.org/#/electric-operator";
+          homepage = "https://melpa.org/#/electric-operator";
           license = lib.licenses.free;
         };
       }) {};
@@ -13993,13 +14525,13 @@
           sha256 = "0q1pb01h48wdbjgi04a6ck2jn7yfh92wpq1vka5pg54wv2k9b5fn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/electric-spacing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/electric-spacing";
           sha256 = "0fcsz9wmibqp6ci0pa5r4gzlrsyj5klajxpgfksa0nfj3dc94cvg";
           name = "electric-spacing";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/electric-spacing";
+          homepage = "https://melpa.org/#/electric-spacing";
           license = lib.licenses.free;
         };
       }) {};
@@ -14014,49 +14546,49 @@
           sha256 = "1ijrhm9vrzh5wl1rr9ayl11dwm05bh1i43fnbz3ga58l6whgkfpw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elein";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elein";
           sha256 = "0af263zq4xxaxhpypn769q8h1dla0ygpnd6l8xc13zlni6jjwdsg";
           name = "elein";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/elein";
+          homepage = "https://melpa.org/#/elein";
           license = lib.licenses.free;
         };
       }) {};
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "20160127.1930";
+        version = "20160314.1444";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "75deddd0de79c66b2f50aa3d32a7b7a3a352966d";
-          sha256 = "1c3xwjzln5grxp7cci2mmly73mzl02f8wjm4hbd9napx72wjcxiy";
+          rev = "6213e60638b3bd780ccf6a655585e520fa292992";
+          sha256 = "1w25xd1vnf6y1idq849rqbpx38zng05g4vvp6nk3s8ibj9hm2zfz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elfeed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elfeed";
           sha256 = "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9";
           name = "elfeed";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/elfeed";
+          homepage = "https://melpa.org/#/elfeed";
           license = lib.licenses.free;
         };
       }) {};
     elfeed-goodies = callPackage ({ ace-jump-mode, cl-lib ? null, elfeed, fetchFromGitHub, fetchurl, lib, melpaBuild, noflet, popwin, powerline }:
     melpaBuild {
         pname = "elfeed-goodies";
-        version = "20151224.358";
+        version = "20160317.624";
         src = fetchFromGitHub {
           owner = "algernon";
           repo = "elfeed-goodies";
-          rev = "5983e70a3ed5d62d218e1149cfe777b10c3168e5";
-          sha256 = "1r2liqjww0yscxjpg13dsfhhv3yjahlbas0dabqlh4f9q0jdrgj4";
+          rev = "4e0f45a4fa459e1acd1282a063190311ca2aaa81";
+          sha256 = "10dbf292l1pd6a4jchdlvpp4yf2kxmf2j6zqigh4wlg125px1drk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elfeed-goodies";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elfeed-goodies";
           sha256 = "0zpk6nx757hasgzcww90fzkcdn078my33p7yax7xslvi4msm37bi";
           name = "elfeed-goodies";
         };
@@ -14069,7 +14601,7 @@
           powerline
         ];
         meta = {
-          homepage = "http://melpa.org/#/elfeed-goodies";
+          homepage = "https://melpa.org/#/elfeed-goodies";
           license = lib.licenses.free;
         };
       }) {};
@@ -14084,13 +14616,13 @@
           sha256 = "0cp8sbhym83db88ii7gyab6iqxppinjlrkzb9627gq7xgb5mqj5j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elfeed-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elfeed-org";
           sha256 = "0xf2r5ca3gnx2cv9f8rr4s1hds2ggqsbllvfr229gznkcqjnglik";
           name = "elfeed-org";
         };
         packageRequires = [ dash elfeed org s ];
         meta = {
-          homepage = "http://melpa.org/#/elfeed-org";
+          homepage = "https://melpa.org/#/elfeed-org";
           license = lib.licenses.free;
         };
       }) {};
@@ -14101,17 +14633,17 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "75deddd0de79c66b2f50aa3d32a7b7a3a352966d";
-          sha256 = "1c3xwjzln5grxp7cci2mmly73mzl02f8wjm4hbd9napx72wjcxiy";
+          rev = "6213e60638b3bd780ccf6a655585e520fa292992";
+          sha256 = "1w25xd1vnf6y1idq849rqbpx38zng05g4vvp6nk3s8ibj9hm2zfz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elfeed-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elfeed-web";
           sha256 = "14ydwvjjc6wbhkj4g4xdh0c3nh4asqsz8ln7my5vjib881vmaq1n";
           name = "elfeed-web";
         };
         packageRequires = [ elfeed emacs simple-httpd ];
         meta = {
-          homepage = "http://melpa.org/#/elfeed-web";
+          homepage = "https://melpa.org/#/elfeed-web";
           license = lib.licenses.free;
         };
       }) {};
@@ -14126,31 +14658,34 @@
           sha256 = "0rdhnnyn0xsmnshnf289kxk974r57i6nx0vii1w36j6p6q0b7f9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elhome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elhome";
           sha256 = "1k7936wxgslr29511dz9az38i9vi35rcxk68gzv35v9lpj89lalh";
           name = "elhome";
         };
         packageRequires = [ initsplit ];
         meta = {
-          homepage = "http://melpa.org/#/elhome";
+          homepage = "https://melpa.org/#/elhome";
           license = lib.licenses.free;
         };
       }) {};
-    elisp-depend = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    elisp-depend = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "elisp-depend";
-        version = "20120426.2023";
-        src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/elisp-depend.el";
-          sha256 = "0khc3gacw27aw9pkfrnla9844lqbspgm0hrz7q0h5nr73d9pnc02";
+        version = "20120428.1504";
+        src = fetchFromGitHub {
+          owner = "tehom";
+          repo = "elisp-depend";
+          rev = "817ab94db56e3c23da6d7d4ae0422c48f260a7e3";
+          sha256 = "1a73zdh4jkx8f74cq802b5j4bx8k1z7cbsp10lz40lmwwxbl3czq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elisp-depend";
-          sha256 = "08zxzvj60v23b7d5q0hvgffm1jxq7lc5y9w22m6nv2fp29yadyiy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elisp-depend";
+          sha256 = "1x3acgkpd9a8xxjg5zjw0d4nv4q9xx30ipr6v3544mn16sv4ab7c";
           name = "elisp-depend";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/elisp-depend";
+          homepage = "https://melpa.org/#/elisp-depend";
           license = lib.licenses.free;
         };
       }) {};
@@ -14165,13 +14700,13 @@
           sha256 = "1ci6nyk1vvb3wgxzarbf6448i9rjb74zzrhcmls634gfxbryxdyy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elisp-lint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elisp-lint";
           sha256 = "102hrxdw72bm11a29i15g09lv7jlnd7vkv7292fm3mcxf5f4hkw9";
           name = "elisp-lint";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/elisp-lint";
+          homepage = "https://melpa.org/#/elisp-lint";
           license = lib.licenses.free;
         };
       }) {};
@@ -14186,13 +14721,13 @@
           sha256 = "168ljhscqyvp24lw70ylv4a3c0y51sx4f66lfahbs7zpjvwf25x0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elisp-sandbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elisp-sandbox";
           sha256 = "1bazm1cf9ghh9b7jzqqgyfcalnrfg7vmxqbn4fiy2c76gbzlr2bp";
           name = "elisp-sandbox";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/elisp-sandbox";
+          homepage = "https://melpa.org/#/elisp-sandbox";
           license = lib.licenses.free;
         };
       }) {};
@@ -14207,34 +14742,34 @@
           sha256 = "11vyy0bvzbs1h1kggikrvhd658j7c730w0pdp6qkm60rigvfi1ih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elisp-slime-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elisp-slime-nav";
           sha256 = "009zgp68i4naprpjr8lcp06lh3i5ickn0nh0lgvrqs0niprnzh8c";
           name = "elisp-slime-nav";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/elisp-slime-nav";
+          homepage = "https://melpa.org/#/elisp-slime-nav";
           license = lib.licenses.free;
         };
       }) {};
     elixir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "elixir-mode";
-        version = "20160103.254";
+        version = "20160421.1512";
         src = fetchFromGitHub {
           owner = "elixir-lang";
           repo = "emacs-elixir";
-          rev = "344d77dd0d23e17a4438171d3194184b209a0de6";
-          sha256 = "18dhijvgnx2hr9vnprcc1fl0k49bb3lpnghrqbkf7fj599kcjl7b";
+          rev = "bf2ddc0a693aba18a12468d7ba7ef27a08536450";
+          sha256 = "0ln7ldfr4xha5x9v7cfxvfd53zxb6msx31bnf5vbx39w8fwxv2yy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elixir-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elixir-mode";
           sha256 = "1dba3jfg210i2rw8qy866396xn2xjgmbcyl006d6fibpr3j4lxaf";
           name = "elixir-mode";
         };
         packageRequires = [ emacs pkg-info ];
         meta = {
-          homepage = "http://melpa.org/#/elixir-mode";
+          homepage = "https://melpa.org/#/elixir-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -14249,55 +14784,76 @@
           sha256 = "1sdq4372i19wdxpdp3347a1rf5zf5w6sa0da6lr511m7ri0lj6hd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elixir-yasnippets";
-          sha256 = "0927znqd9j91wc51hdwcl2rxb66i1h549nyr1h39r13353gbwk3a";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elixir-yasnippets";
+          sha256 = "0vmkcd88wfafv31lyw0983p4qjj387qf258q7py1ij47fcmfp579";
           name = "elixir-yasnippets";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/elixir-yasnippets";
+          homepage = "https://melpa.org/#/elixir-yasnippets";
           license = lib.licenses.free;
         };
       }) {};
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "20160211.226";
+        version = "20160426.136";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "47ea2e8d06e9f39be4e1d5a79b6cc634f9d46e58";
-          sha256 = "0qiwzcpwiwlkjy89pxvss3gvjvbp4d6qpaxnbm50va1gbn21n72v";
+          rev = "4fb26ae8e10d7b88e05a9e3a5c1b2cf3c8c2d6c3";
+          sha256 = "0ly8i5x9ii781681xf9iisj5g83sfj2wf786072clll36ym4a7c1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elm-mode";
           sha256 = "1gw9szkyr1spcx7qijddhxlm36h0hmfd53b4yzp1336yx44mlnd1";
           name = "elm-mode";
         };
         packageRequires = [ emacs f let-alist s ];
         meta = {
-          homepage = "http://melpa.org/#/elm-mode";
+          homepage = "https://melpa.org/#/elm-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elm-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "elm-yasnippets";
+        version = "20160401.24";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "elm-yasnippets";
+          rev = "45a11a0cef0c36633fb3477d3dc4167e82779ba4";
+          sha256 = "1zb5yra6znkr7yaq6wqlmlr054wkv9cy1dih8h4j2gp2wnfwg968";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elm-yasnippets";
+          sha256 = "0nnr0sxkxviw2i7b5s8jgvsv7lgqxqvirmvmband84q9gxlz24zb";
+          name = "elm-yasnippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "https://melpa.org/#/elm-yasnippets";
           license = lib.licenses.free;
         };
       }) {};
     elmacro = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elmacro";
-        version = "20141109.1006";
+        version = "20160224.1131";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "elmacro";
-          rev = "ff5d8a0d7f5154707f1d0a2b22894c6c0b0b9f94";
-          sha256 = "181hcyg5v62nxrgmb7pl9672rm9fy8crc4lqhdwvdvd7ngki1fiz";
+          rev = "d4a54dc41bd15e2acb6edb12f9b4f8bdad784478";
+          sha256 = "085ab50q3jdy3vh22lz2p5ivcjlhfki3zzfsp1n0939myw6vqcsm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elmacro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elmacro";
           sha256 = "0644rgwawivrq1shsjx1x2p53z7jgr6bxqgn2smzql8pp6azy7xz";
           name = "elmacro";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/elmacro";
+          homepage = "https://melpa.org/#/elmacro";
           license = lib.licenses.free;
         };
       }) {};
@@ -14312,13 +14868,13 @@
           sha256 = "1463y4zc6yabd30k6806yw0am18fjv0bkxm56p2siqrwn9pbsh8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elmine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elmine";
           sha256 = "1gi94dyz9x50swkvryd4vj36rqgz4s58nrb4h4vwwviiiqmc8fvz";
           name = "elmine";
         };
         packageRequires = [ s ];
         meta = {
-          homepage = "http://melpa.org/#/elmine";
+          homepage = "https://melpa.org/#/elmine";
           license = lib.licenses.free;
         };
       }) {};
@@ -14333,34 +14889,34 @@
           sha256 = "0p3cj5vgka388i4dk9r7bx8pv8mywnfij9ahgqak5jlsddflh8hw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elnode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elnode";
           sha256 = "0piy5gy9a7c8s10b99fmdyh6glhvjvdyrz0x2bv30h7wplx5szi6";
           name = "elnode";
         };
         packageRequires = [ creole dash db fakir kv noflet s web ];
         meta = {
-          homepage = "http://melpa.org/#/elnode";
+          homepage = "https://melpa.org/#/elnode";
           license = lib.licenses.free;
         };
       }) {};
     elog = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elog";
-        version = "20151116.1937";
+        version = "20160426.722";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "elog";
-          rev = "03c275877301c72fbc61d5fdd72efe5fdc0b6e98";
-          sha256 = "19yvhyg34w1idsh712cahmcy1pzbxcipw9j6xk567lvkqkinqg7s";
+          rev = "f13aaf326ab01c95e089dda08ea3c488cd4831c5";
+          sha256 = "0z3g7jddsjf4hmhwvi8mhd90255ylaix0ysljscqsixacknzcjm9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elog";
           sha256 = "0hixsi60nf0khm9xmya3saf95ahn1gydp0l5wxawsc491qwg4vqd";
           name = "elog";
         };
         packageRequires = [ eieio ];
         meta = {
-          homepage = "http://melpa.org/#/elog";
+          homepage = "https://melpa.org/#/elog";
           license = lib.licenses.free;
         };
       }) {};
@@ -14375,13 +14931,13 @@
           sha256 = "1jcr8bxffvnfs0ym6zkgs79hd6a0m81r4x4jr3v5l9zwxw04sy15";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elogcat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elogcat";
           sha256 = "0sqdqlpg4firswr742nrb6b8sz3bpijf6pbxvandq3ddpm0rx9ia";
           name = "elogcat";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/elogcat";
+          homepage = "https://melpa.org/#/elogcat";
           license = lib.licenses.free;
         };
       }) {};
@@ -14396,13 +14952,13 @@
           sha256 = "1dadf24x6v1vk57bp6w0g2dysigy5cqjzwldc8dn129f4pfrhipy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elpa-audit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elpa-audit";
           sha256 = "0l8har14zrlh9kdkh9vlmkmzg49vb0r8j1wnznryaidalvk84a52";
           name = "elpa-audit";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/elpa-audit";
+          homepage = "https://melpa.org/#/elpa-audit";
           license = lib.licenses.free;
         };
       }) {};
@@ -14417,13 +14973,13 @@
           sha256 = "1hjmvn3kls63alh0ihb5c8gf90lrfvq1hxrlf4162qiaa0s15f8a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elpa-mirror";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elpa-mirror";
           sha256 = "1jnviav2ybr13cgllg26kfjrwrl25adggnqiiwyjwgbbzxfycah8";
           name = "elpa-mirror";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/elpa-mirror";
+          homepage = "https://melpa.org/#/elpa-mirror";
           license = lib.licenses.free;
         };
       }) {};
@@ -14438,7 +14994,7 @@
           sha256 = "1xjm9b32a9nfzvphj6vm0dqcr4i072zcx29kcgiyyni8zbgbwmwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elpy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elpy";
           sha256 = "051irp7k0cp1hqp3hzrmapllf2iim7cq0iz38489g4fkh2ybk709";
           name = "elpy";
         };
@@ -14450,7 +15006,7 @@
           yasnippet
         ];
         meta = {
-          homepage = "http://melpa.org/#/elpy";
+          homepage = "https://melpa.org/#/elpy";
           license = lib.licenses.free;
         };
       }) {};
@@ -14465,13 +15021,13 @@
           sha256 = "055kam18k4ni1zw3310cpsvdnrp62d579r30lq67ig2lq3yxzc1m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elscreen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elscreen";
           sha256 = "1mlqbw14ilk6d3ba38kfw50pnlhb9f6sm5hy9dw58gp59siark5s";
           name = "elscreen";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/elscreen";
+          homepage = "https://melpa.org/#/elscreen";
           license = lib.licenses.free;
         };
       }) {};
@@ -14486,13 +15042,13 @@
           sha256 = "0bbashrqpyhs282w5i15rzravvj0fjnydbh9vfnfnfnk8a9sssxz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elscreen-buffer-group";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elscreen-buffer-group";
           sha256 = "1clmhpk9zp6hsgz6a4jpmbrr9fr6k8b324s0x61n5yi4yzgdmc0v";
           name = "elscreen-buffer-group";
         };
         packageRequires = [ cl-lib elscreen emacs ];
         meta = {
-          homepage = "http://melpa.org/#/elscreen-buffer-group";
+          homepage = "https://melpa.org/#/elscreen-buffer-group";
           license = lib.licenses.free;
         };
       }) {};
@@ -14507,13 +15063,13 @@
           sha256 = "091dxsb73bhqmrddwnmvblmfpwa7v7fa0ha18daxc8j0lrhzdhlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elscreen-mew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elscreen-mew";
           sha256 = "06g4wcfjs036nn64ac0zsvr08cfmak2hyj83y7a0r35yxr1853w4";
           name = "elscreen-mew";
         };
         packageRequires = [ elscreen ];
         meta = {
-          homepage = "http://melpa.org/#/elscreen-mew";
+          homepage = "https://melpa.org/#/elscreen-mew";
           license = lib.licenses.free;
         };
       }) {};
@@ -14528,13 +15084,13 @@
           sha256 = "1cninrbgxzg0gykkpjx0i8pk2yc7sgr2kliqd35lgcxz2q4jlr51";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elscreen-multi-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elscreen-multi-term";
           sha256 = "1zwrzblkag1d18xz450b7khsdssvsxyl1x6a682vy0dkn1y5qh1n";
           name = "elscreen-multi-term";
         };
         packageRequires = [ elscreen emacs multi-term ];
         meta = {
-          homepage = "http://melpa.org/#/elscreen-multi-term";
+          homepage = "https://melpa.org/#/elscreen-multi-term";
           license = lib.licenses.free;
         };
       }) {};
@@ -14549,13 +15105,13 @@
           sha256 = "06g7fl2c7cvwsrgi462wf6j13ny56y6zvgkizz9f256xjjq77ymf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elscreen-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elscreen-persist";
           sha256 = "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k";
           name = "elscreen-persist";
         };
         packageRequires = [ elscreen revive ];
         meta = {
-          homepage = "http://melpa.org/#/elscreen-persist";
+          homepage = "https://melpa.org/#/elscreen-persist";
           license = lib.licenses.free;
         };
       }) {};
@@ -14570,13 +15126,13 @@
           sha256 = "1w34nnl4zalxzmyfbc81qd82m7qp3zvz608dx6hfi44pjz0dp36f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elscreen-separate-buffer-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elscreen-separate-buffer-list";
           sha256 = "1d8kc137cd8i3wglir1rlvk7w8mrdhd3xvcihi2f2f2g5nh2n5jk";
           name = "elscreen-separate-buffer-list";
         };
         packageRequires = [ elscreen emacs ];
         meta = {
-          homepage = "http://melpa.org/#/elscreen-separate-buffer-list";
+          homepage = "https://melpa.org/#/elscreen-separate-buffer-list";
           license = lib.licenses.free;
         };
       }) {};
@@ -14591,13 +15147,13 @@
           sha256 = "1k7npf93xbmrsq607x8zlgrpzqvplgia3ixz5w1lr1jlv1m2m8x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elwm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elwm";
           sha256 = "0rf663ih3lfg4n4pj4dpp133967zha5m1wr46riaxpha7xr59al9";
           name = "elwm";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/elwm";
+          homepage = "https://melpa.org/#/elwm";
           license = lib.licenses.free;
         };
       }) {};
@@ -14612,34 +15168,34 @@
           sha256 = "0n5y3xq5dmqpsd9hhg9ac1jkj5qi9y7lgvg5nir3ghd8ldmrg09s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elx";
           sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x";
           name = "elx";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/elx";
+          homepage = "https://melpa.org/#/elx";
           license = lib.licenses.free;
         };
       }) {};
     emacs-eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "emacs-eclim";
-        version = "20151226.1815";
+        version = "20160411.1117";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "968da3c06d674417a46b2f6db7d0e8277c35141d";
-          sha256 = "171xgznpgvwl03kzqa9nbpvj3mfznnf050pl2wih390nk5djpg12";
+          rev = "b6daef5acf3e8cece565f410853ec4eebb4f8925";
+          sha256 = "1fj84r3r0kdprjy2sbzxgx7icfn6fbhvylbzfcv4wq5g7qbn45sz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacs-eclim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emacs-eclim";
           sha256 = "1l55jhz5mb3bqw90cbf4jhcqgwj962br706qhm2wn5i2a1mg8xlv";
           name = "emacs-eclim";
         };
         packageRequires = [ cl-lib dash json popup s ];
         meta = {
-          homepage = "http://melpa.org/#/emacs-eclim";
+          homepage = "https://melpa.org/#/emacs-eclim";
           license = lib.licenses.free;
         };
       }) {};
@@ -14654,13 +15210,13 @@
           sha256 = "15l3ab11vcmzqibkd6h5zqw5a83k8dmgcp4n26px29c0gv6bkpy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacs-setup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emacs-setup";
           sha256 = "1x4rh8vx6fsb2d6dz2g9j6jamin1vmpppwy3yzbl1dnf7w4hx4kh";
           name = "emacs-setup";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/emacs-setup";
+          homepage = "https://melpa.org/#/emacs-setup";
           license = lib.licenses.free;
         };
       }) {};
@@ -14675,13 +15231,13 @@
           sha256 = "0ciqxyahlzaxq854jm25zbrbmrhcaj5csdhxa0az9crwha8wkmw2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsagist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emacsagist";
           sha256 = "1cyz7nf0zxa21979jf5kdmkgwiyd17vsmpcmrw1af37ly27l8l64";
           name = "emacsagist";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/emacsagist";
+          homepage = "https://melpa.org/#/emacsagist";
           license = lib.licenses.free;
         };
       }) {};
@@ -14696,55 +15252,55 @@
           sha256 = "1rqr08gj07hw37mqd0flmq4a10wn16vy7wg0msqq0ab2smwjhns7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emacsc";
           sha256 = "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk";
           name = "emacsc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/emacsc";
+          homepage = "https://melpa.org/#/emacsc";
           license = lib.licenses.free;
         };
       }) {};
     emacsist-view = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emacsist-view";
-        version = "20160217.2240";
+        version = "20160426.723";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "emacsist-view";
-          rev = "4bfda87db63825bd40a2a3aad5c5a7760e2d4f38";
-          sha256 = "0wrv2pkp8hf56lk5snxvypizydwyjpki7f4q6la4vbbf43zr1z2s";
+          rev = "f67761259ed779a9bc95c9a4e0474522990c5c6b";
+          sha256 = "1vhs9725fyl2j65lk014qz76iv4hsvyim06361h4lai634hp7ck6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsist-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emacsist-view";
           sha256 = "0lf280ppi3zksqvx81y8mm9479j26kd5wywfghhwk36kz410hk99";
           name = "emacsist-view";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/emacsist-view";
+          homepage = "https://melpa.org/#/emacsist-view";
           license = lib.licenses.free;
         };
       }) {};
     emacsql = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }:
     melpaBuild {
         pname = "emacsql";
-        version = "20151003.2131";
+        version = "20160424.947";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "74bd11bc0998d7019a05eecc0486fee09c84a93b";
-          sha256 = "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad";
+          rev = "3042597a723157f7a69765d833107b5e9efb3562";
+          sha256 = "012x6cx3rbxysvsmbx56y295ijdlpgy8z7ggcfp0cq0khki67yva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emacsql";
           sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax";
           name = "emacsql";
         };
         packageRequires = [ cl-lib emacs finalize ];
         meta = {
-          homepage = "http://melpa.org/#/emacsql";
+          homepage = "https://melpa.org/#/emacsql";
           license = lib.licenses.free;
         };
       }) {};
@@ -14755,17 +15311,17 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "74bd11bc0998d7019a05eecc0486fee09c84a93b";
-          sha256 = "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad";
+          rev = "3042597a723157f7a69765d833107b5e9efb3562";
+          sha256 = "012x6cx3rbxysvsmbx56y295ijdlpgy8z7ggcfp0cq0khki67yva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsql-mysql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emacsql-mysql";
           sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy";
           name = "emacsql-mysql";
         };
         packageRequires = [ cl-lib emacs emacsql ];
         meta = {
-          homepage = "http://melpa.org/#/emacsql-mysql";
+          homepage = "https://melpa.org/#/emacsql-mysql";
           license = lib.licenses.free;
         };
       }) {};
@@ -14776,59 +15332,59 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "74bd11bc0998d7019a05eecc0486fee09c84a93b";
-          sha256 = "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad";
+          rev = "3042597a723157f7a69765d833107b5e9efb3562";
+          sha256 = "012x6cx3rbxysvsmbx56y295ijdlpgy8z7ggcfp0cq0khki67yva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsql-psql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emacsql-psql";
           sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3";
           name = "emacsql-psql";
         };
         packageRequires = [ cl-lib emacs emacsql pg ];
         meta = {
-          homepage = "http://melpa.org/#/emacsql-psql";
+          homepage = "https://melpa.org/#/emacsql-psql";
           license = lib.licenses.free;
         };
       }) {};
     emacsql-sqlite = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emacsql-sqlite";
-        version = "20151004.915";
+        version = "20160311.1438";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "74bd11bc0998d7019a05eecc0486fee09c84a93b";
-          sha256 = "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad";
+          rev = "3042597a723157f7a69765d833107b5e9efb3562";
+          sha256 = "012x6cx3rbxysvsmbx56y295ijdlpgy8z7ggcfp0cq0khki67yva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsql-sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emacsql-sqlite";
           sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i";
           name = "emacsql-sqlite";
         };
         packageRequires = [ cl-lib emacs emacsql ];
         meta = {
-          homepage = "http://melpa.org/#/emacsql-sqlite";
+          homepage = "https://melpa.org/#/emacsql-sqlite";
           license = lib.licenses.free;
         };
       }) {};
     emacsshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emacsshot";
-        version = "20150516.1633";
+        version = "20160303.205";
         src = fetchFromGitHub {
           owner = "marcowahl";
           repo = "emacsshot";
-          rev = "8615aa841a37c20f8cc0f0efdc89c8d79acbb84b";
-          sha256 = "0jn4xj206idh5kgbklgcrngx6wvz9gwfm61wygar6pbfzqyx1y9b";
+          rev = "50684e5d3d703f353333317d13dca5026f7affd0";
+          sha256 = "0qx874j4bj2791vkas77vfsnw9m7br940p6n7238zjgn7bccj6dv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsshot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emacsshot";
           sha256 = "08xqx017yfizdj8wz7nbh9i7qpar6398sri78abzf78inv828s9j";
           name = "emacsshot";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/emacsshot";
+          homepage = "https://melpa.org/#/emacsshot";
           license = lib.licenses.free;
         };
       }) {};
@@ -14843,34 +15399,34 @@
           sha256 = "00iklf97mszrsdv20q55qhml1dscvmmalpfnlkwi9mabklyq3i6z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emagician-fix-spell-memory";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emagician-fix-spell-memory";
           sha256 = "0ffjrpiph21dn8bplklsz3hrsai25l67yyr7n8qjxlwlibwqzv6j";
           name = "emagician-fix-spell-memory";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/emagician-fix-spell-memory";
+          homepage = "https://melpa.org/#/emagician-fix-spell-memory";
           license = lib.licenses.free;
         };
       }) {};
     emamux = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emamux";
-        version = "20160101.817";
+        version = "20160426.517";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-emamux";
-          rev = "92420150f7951dc867fd6e18c262d778e6456a4e";
-          sha256 = "0j9vpiybpklf7kgmwpkdyywk29vpigzbn39d0m54z1kvy23xvx6x";
+          rev = "3cdad568e4cb9a36c2f87b8ee57bdffb4d7ad2e0";
+          sha256 = "0bpiwdzy40hw47zad5rxrzgjdx5isqil7vh5sg1qk8jzypy9shpm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emamux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emamux";
           sha256 = "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz";
           name = "emamux";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/emamux";
+          homepage = "https://melpa.org/#/emamux";
           license = lib.licenses.free;
         };
       }) {};
@@ -14885,13 +15441,13 @@
           sha256 = "1idsvilsvlxh72waalhl8vrsmh0vfvz56qcv56fc2c0pb1i90icn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emamux-ruby-test";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emamux-ruby-test";
           sha256 = "1l1hp2dggjlc287qkfyj21w9lri4agh91g5x707qqq8nicdlv3xm";
           name = "emamux-ruby-test";
         };
         packageRequires = [ emamux projectile ];
         meta = {
-          homepage = "http://melpa.org/#/emamux-ruby-test";
+          homepage = "https://melpa.org/#/emamux-ruby-test";
           license = lib.licenses.free;
         };
       }) {};
@@ -14906,13 +15462,13 @@
           sha256 = "0cv8y6hr719648yxr2fbgb1hyg36m60bsbd57f2vvvqvg87si4jz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ember-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ember-mode";
           sha256 = "0fwd34cim29dg802ibsfd120px9sj54d4wzp3ggmjjzwkl9ky7dx";
           name = "ember-mode";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/ember-mode";
+          homepage = "https://melpa.org/#/ember-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -14927,13 +15483,34 @@
           sha256 = "1sj033acw1q80accdfkrxw4kzfl8p1ld16y188ikbizvq75lfkpp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ember-yasnippets";
-          sha256 = "1alqrv9yhc1f8dhvh2kjcv8qbn1hdgza5iasmchr1wggxds3s50i";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ember-yasnippets";
+          sha256 = "1jwkzcqcpy7ykdjhsqmg8ds6qyl4jglyjbgg7v301x068dsxkja6";
           name = "ember-yasnippets";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/ember-yasnippets";
+          homepage = "https://melpa.org/#/ember-yasnippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    embrace = callPackage ({ emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "embrace";
+        version = "20160425.1538";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "embrace.el";
+          rev = "c3a0b30811693cb0aa7d68caed5e5d9a7946a79e";
+          sha256 = "0vwxq4qhzajb1nlijd97a0jjl178jpy6n42ny41sm43395q8xnb2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/embrace";
+          sha256 = "1w9zp9n91703d6jd4adl2xk574wsr7fm2a9v32b1i9bi3hr0hdjc";
+          name = "embrace";
+        };
+        packageRequires = [ emacs expand-region ];
+        meta = {
+          homepage = "https://melpa.org/#/embrace";
           license = lib.licenses.free;
         };
       }) {};
@@ -14943,37 +15520,37 @@
         version = "20151213.938";
         src = fetchFromGitHub {
           owner = "smihica";
-          repo = "emmet";
+          repo = "emmet-mode";
           rev = "3a29a1ae17271a3dfe3cd47db034ee4036b2b144";
           sha256 = "0037nikvlcw6i228jym76pl1mgw4fn5dpz8hfr86b3m0zb012inj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emmet-mode";
-          sha256 = "0w5nnhha70mndpk2a58raaxqanv868z05mfy1a8prgapm56mm819";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emmet-mode";
+          sha256 = "0wjv4hqddjvbdrmsxzav5rpwnm2n6lr86jzkrnav8f2kyzypdsnr";
           name = "emmet-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/emmet-mode";
+          homepage = "https://melpa.org/#/emmet-mode";
           license = lib.licenses.free;
         };
       }) {};
     emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "emms";
-        version = "20160207.620";
+        version = "20160304.1120";
         src = fetchgit {
           url = "git://git.sv.gnu.org/emms.git";
-          rev = "141ab95c2a0a2554b205f6eec991fa36d7d0531f";
-          sha256 = "7a3dcd8e93e7c2261f1af64d5dc2381b4c94db927326a577895a68c4325ae4d0";
+          rev = "ac15f46e19d259e5d49acdac877d0793be1c1ebe";
+          sha256 = "1y6l74sr553vygwpyf7di8cdg98hqpzccz81n24vj11a8g9qly1q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emms";
           sha256 = "0kzli8b0z5maizfwhlhph1f5w3v6pwxvs2dfs90l8c0h97m4yy2m";
           name = "emms";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/emms";
+          homepage = "https://melpa.org/#/emms";
           license = lib.licenses.free;
         };
       }) {};
@@ -14988,13 +15565,13 @@
           sha256 = "07qbbs2i05bqndr4dxb84z50wav8ffbc56f6saw6pdx6n0sw6n6n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emms-info-mediainfo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emms-info-mediainfo";
           sha256 = "17x8vvfhx739hcj9j1nh6j4r6zqnwa5zq9zpi9b6lxc8979k3m4w";
           name = "emms-info-mediainfo";
         };
         packageRequires = [ emms ];
         meta = {
-          homepage = "http://melpa.org/#/emms-info-mediainfo";
+          homepage = "https://melpa.org/#/emms-info-mediainfo";
           license = lib.licenses.free;
         };
       }) {};
@@ -15009,13 +15586,13 @@
           sha256 = "03a7sn8pl0pnr05rmrrbw4hjyi8vpjqbvkvh0fqnij913a6qc64l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emms-mark-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emms-mark-ext";
           sha256 = "13h6hy8y0as0xfc1cg8balw63as81fzar32q9h4zhnndl3hc1081";
           name = "emms-mark-ext";
         };
         packageRequires = [ emms ];
         meta = {
-          homepage = "http://melpa.org/#/emms-mark-ext";
+          homepage = "https://melpa.org/#/emms-mark-ext";
           license = lib.licenses.free;
         };
       }) {};
@@ -15030,55 +15607,55 @@
           sha256 = "0q80f0plch6k4lhs8c9qm3mfycfbp3kn5sjrk9zxgxwnn901y9mp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emms-mode-line-cycle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emms-mode-line-cycle";
           sha256 = "1jdmfh1i9v84iy7bj2dbc3s2wfzkrby3pabd99gnqzd9gn1cn8ca";
           name = "emms-mode-line-cycle";
         };
         packageRequires = [ emacs emms ];
         meta = {
-          homepage = "http://melpa.org/#/emms-mode-line-cycle";
+          homepage = "https://melpa.org/#/emms-mode-line-cycle";
           license = lib.licenses.free;
         };
       }) {};
     emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emms-player-mpv";
-        version = "20151208.102";
+        version = "20160319.208";
         src = fetchFromGitHub {
           owner = "dochang";
           repo = "emms-player-mpv";
-          rev = "a1be1d266530ede3780dd69a7243d898f1016127";
-          sha256 = "1yy4dmjp53l2df5qix31g4vizhv80wm88vjqq6qqa9p822732n0m";
+          rev = "69ebe6d9539769d4c4daa484693ec0d6f67a3cca";
+          sha256 = "104iw4bl6y33diqs5ayrvdljkhb6f9g2m5p5kh8klgy7z1yjhp4p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emms-player-mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emms-player-mpv";
           sha256 = "175rmqx3bgys4chw8ylyf9rk07sg0llwbs9ivrv2d3ayhcz1lg9y";
           name = "emms-player-mpv";
         };
         packageRequires = [ emms ];
         meta = {
-          homepage = "http://melpa.org/#/emms-player-mpv";
+          homepage = "https://melpa.org/#/emms-player-mpv";
           license = lib.licenses.free;
         };
       }) {};
     emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emms-player-mpv-jp-radios";
-        version = "20160130.940";
+        version = "20160408.611";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "emms-player-mpv-jp-radios";
-          rev = "552779cd56d1aad54593dbf84db60ec50d3a42a1";
-          sha256 = "05n7jcd3nsnchv0swakf068klhlvckfcb3xjmxf5nnjibffjz77r";
+          rev = "cda5e90055fbb5e62dccc0a70395c540be694e0b";
+          sha256 = "1m6p8vf98galhrzv83ys2srvmzb52bimv872ibl0iib9d4hrkps8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emms-player-mpv-jp-radios";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emms-player-mpv-jp-radios";
           sha256 = "0gdap5cv08pz370fl92v9lyvgkbbyjhp9wsc4kyjm4f4pwx9fybv";
           name = "emms-player-mpv-jp-radios";
         };
         packageRequires = [ cl-lib emacs emms emms-player-simple-mpv ];
         meta = {
-          homepage = "http://melpa.org/#/emms-player-mpv-jp-radios";
+          homepage = "https://melpa.org/#/emms-player-mpv-jp-radios";
           license = lib.licenses.free;
         };
       }) {};
@@ -15093,13 +15670,13 @@
           sha256 = "0ajxyv7yx4ni8dizs7acpsxnmy3c9s0dx28vw9y1ym0bxkgfyzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emms-player-simple-mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emms-player-simple-mpv";
           sha256 = "15aljprjd74ha7wpzsmv3d873i6fy3x1jwhzm03hvw0sw18m25i1";
           name = "emms-player-simple-mpv";
         };
         packageRequires = [ cl-lib emacs emms ];
         meta = {
-          homepage = "http://melpa.org/#/emms-player-simple-mpv";
+          homepage = "https://melpa.org/#/emms-player-simple-mpv";
           license = lib.licenses.free;
         };
       }) {};
@@ -15114,13 +15691,34 @@
           sha256 = "0nx5bb5fjmaa1nhkbfnhd1aydqrq390x4rl1vfh11ilnf52wzzld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emms-soundcloud";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emms-soundcloud";
           sha256 = "0nf1f719m4pvxn0mf4qyx8mzwhrhv6kchnrpiy9clx520y8x3dqi";
           name = "emms-soundcloud";
         };
         packageRequires = [ emms json ];
         meta = {
-          homepage = "http://melpa.org/#/emms-soundcloud";
+          homepage = "https://melpa.org/#/emms-soundcloud";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emms-status = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emms-status";
+        version = "20150314.735";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "emms-status.el";
+          rev = "770f23ff4f7e3b994325687302eac2c7131500b2";
+          sha256 = "1vanlvszm05x8kyxqjmmywmzbi4bxnkc5jxfgg5b58z5ad7kmld8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emms-status";
+          sha256 = "1nfyhp8l22ylh60hpk8fvr4hgmww8k2xi3q7dzpn5m2ph06fkdqa";
+          name = "emms-status";
+        };
+        packageRequires = [ emms ];
+        meta = {
+          homepage = "https://melpa.org/#/emms-status";
           license = lib.licenses.free;
         };
       }) {};
@@ -15135,13 +15733,13 @@
           sha256 = "1rk7am0xvpnv98yi7a62wlyh576md4n2ddj7nm201bjd4wdl2yxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emoji-cheat-sheet-plus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emoji-cheat-sheet-plus";
           sha256 = "1ciwlbw0ihm0p5gnnl3safcj7dxwiy53bkj8cmw3i334al0gjnnv";
           name = "emoji-cheat-sheet-plus";
         };
         packageRequires = [ emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/emoji-cheat-sheet-plus";
+          homepage = "https://melpa.org/#/emoji-cheat-sheet-plus";
           license = lib.licenses.free;
         };
       }) {};
@@ -15156,13 +15754,13 @@
           sha256 = "0sh4q4sb4j58ryvvmlsx7scry9inzgv2ssa87vbyzpxq0435l229";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emoji-display";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emoji-display";
           sha256 = "04cf18z26d64l0sv8qkbxjixi2wbw23awd5fznvg1cs8ixss01j9";
           name = "emoji-display";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/emoji-display";
+          homepage = "https://melpa.org/#/emoji-display";
           license = lib.licenses.free;
         };
       }) {};
@@ -15177,34 +15775,34 @@
           sha256 = "0qi7p1grann3mhaq8kc0yc27cp9fm983g2gaqddljchn7lmgagrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emoji-fontset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emoji-fontset";
           sha256 = "19affsvlm1rzrzdh1k6xsv79icdkzx4izxivrd2ia6y2wcg9wc5d";
           name = "emoji-fontset";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/emoji-fontset";
+          homepage = "https://melpa.org/#/emoji-fontset";
           license = lib.licenses.free;
         };
       }) {};
     emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "emojify";
-        version = "20151230.521";
+        version = "20160316.1148";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "emacs-emojify";
-          rev = "0dfe1bb23c5035eca15a92ea7e9925f384ad9395";
-          sha256 = "1fqhydv9anhw0z8zjbz17kbl01bdzif9ncd25vdaa5dzddd16rb1";
+          rev = "6016e30bf5f76993506e0a95338686d2364cd555";
+          sha256 = "1zz6q5jf22nwb9qlyxxrz56gz7x5gcxh6q6d0ybf4bapk35g3v0q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emojify";
-          sha256 = "15v2h5jfksfc208qphiczplg56yka07qv4w4482c10yzwq76zp17";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emojify";
+          sha256 = "1sgd32qm43hwby75a9q2pz1yfzj988i35d8p9f18zvbxypy7b2yp";
           name = "emojify";
         };
         packageRequires = [ emacs ht seq ];
         meta = {
-          homepage = "http://melpa.org/#/emojify";
+          homepage = "https://melpa.org/#/emojify";
           license = lib.licenses.free;
         };
       }) {};
@@ -15219,13 +15817,13 @@
           sha256 = "0bm0cxnv7g2dzfvfhkyy16kzn6shvy9gzypiqyjj42ng54xmhs0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/empos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/empos";
           sha256 = "0wbrszl9rq4is0ymxq9lxpqzlfg93gljh6almjy0hp3cs7pkzyl4";
           name = "empos";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/empos";
+          homepage = "https://melpa.org/#/empos";
           license = lib.licenses.free;
         };
       }) {};
@@ -15240,7 +15838,7 @@
           sha256 = "1frcn6694q74is8qbvrjkcsw0q1wz56z4gl35n4v3wakr9wvdvd1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emr";
           sha256 = "05vpfxg6lviclnms2zyrza8dc87m60mimlwd11ihvsbngi9gcw8x";
           name = "emr";
         };
@@ -15258,7 +15856,7 @@
           s
         ];
         meta = {
-          homepage = "http://melpa.org/#/emr";
+          homepage = "https://melpa.org/#/emr";
           license = lib.licenses.free;
         };
       }) {};
@@ -15268,18 +15866,18 @@
         version = "20121008.1114";
         src = fetchFromGitHub {
           owner = "rejeep";
-          repo = "enclose";
+          repo = "enclose.el";
           rev = "2747653e84af39017f503064bc66ed1812a77259";
           sha256 = "0dz5xm05d7irh1j8iy08jk521p19cjai1kw68z2nngnyf1az7cim";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/enclose";
-          sha256 = "04gs468qqhdc9avx7lgibr0f1i444714i7rifad37dfmim8qk759";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/enclose";
+          sha256 = "1bkrv3cwhbiydgfjhmyjr96cvsgr9zi8n0ir1akgamccm2ln73d6";
           name = "enclose";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/enclose";
+          homepage = "https://melpa.org/#/enclose";
           license = lib.licenses.free;
         };
       }) {};
@@ -15294,13 +15892,13 @@
           sha256 = "0k5ns40s5nskn0zialwq96qll1v5k50lfa5xh8hxbpcamsfym6h8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/encourage-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/encourage-mode";
           sha256 = "0fwn6w7s61c08z0d8z3awclqrhszia9is30gm2kx4hwr9dhhwh63";
           name = "encourage-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/encourage-mode";
+          homepage = "https://melpa.org/#/encourage-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -15311,17 +15909,17 @@
         src = fetchFromGitHub {
           owner = "hrs";
           repo = "engine-mode";
-          rev = "a1b3e4fb71155c01963a3451c3e45d3a08215ede";
-          sha256 = "1hxvla26j6zm287cbn5mpwhrkbn4grgglh2rk9hrrzhm7xcb21mx";
+          rev = "244610231f48af10e9cd0931827543e1fcdb3f32";
+          sha256 = "066pxfv4rpxgi7jxdyc0a3g5z9m1j66sbi5gh2l7m4rwhzkqchn9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/engine-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/engine-mode";
           sha256 = "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c";
           name = "engine-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/engine-mode";
+          homepage = "https://melpa.org/#/engine-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -15336,13 +15934,13 @@
           sha256 = "008wggl6xxk339njrgpj2fndbil7k9f3i2hg1mjwqk033j87nbz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/enh-ruby-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/enh-ruby-mode";
           sha256 = "0r486yajjf7vsaz92ypxpfmz2nsvw9giffpxb9szj7fcry3nfdns";
           name = "enh-ruby-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/enh-ruby-mode";
+          homepage = "https://melpa.org/#/enh-ruby-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -15357,13 +15955,13 @@
           sha256 = "0vd7zy06nqb1ayjlnf2wl0bfv1cqv2qcb3cgy3zr9k9c4whcd8jh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/enlive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/enlive";
           sha256 = "1dyayk37zik12qfh8zbjmhsch64yqsx3acrlm7hcnavx465hmhnz";
           name = "enlive";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/enlive";
+          homepage = "https://melpa.org/#/enlive";
           license = lib.licenses.free;
         };
       }) {};
@@ -15378,13 +15976,13 @@
           sha256 = "1qimqrvk0myqfi2l3viigkx1ld90qpjgi1gs6xhw2g51r8x4i3in";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eno";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eno";
           sha256 = "0k4n4vw261v3bcxg7pqhxr99vh673l963yjridl0dp1663gcrfpk";
           name = "eno";
         };
         packageRequires = [ dash edit-at-point ];
         meta = {
-          homepage = "http://melpa.org/#/eno";
+          homepage = "https://melpa.org/#/eno";
           license = lib.licenses.free;
         };
       }) {};
@@ -15399,28 +15997,28 @@
           sha256 = "0v5p97dvzrk3j59yjc6iny71j3fdw9bb8737wnnzm098ff42dfmd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/enotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/enotify";
           sha256 = "0mii6m6zw9y8njgzi79rcf1n251iw7qz3yqjjij3c19rk3zpm5qi";
           name = "enotify";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/enotify";
+          homepage = "https://melpa.org/#/enotify";
           license = lib.licenses.free;
         };
       }) {};
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode2, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20160219.1431";
+        version = "20160416.337";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "6ce0d22ba4f4cc9a8420ae5a8902a1c8a4218c7e";
-          sha256 = "1s3fpigsm988jp9jpcyk1zr7khby12m5cy71k1ag0cbgrv66l4za";
+          rev = "989a1333d294bcaa6bb9671e42e77f6716c7f436";
+          sha256 = "00fcy1f0p8ibymaza3mmysjlchc79yzjgd7pp31fiq3y3hkriq2j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ensime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ensime";
           sha256 = "1d8y72l7bh93x9zdj3d3qjhrrzr804rgi6kjifyrin772dffjwby";
           name = "ensime";
         };
@@ -15434,7 +16032,7 @@
           yasnippet
         ];
         meta = {
-          homepage = "http://melpa.org/#/ensime";
+          homepage = "https://melpa.org/#/ensime";
           license = lib.licenses.free;
         };
       }) {};
@@ -15449,13 +16047,13 @@
           sha256 = "1jyhr9gv3d0rxv5iks2g9x6xbxqv1bvf1fnih96h4pgsfxz8wrp6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/envdir";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/envdir";
           sha256 = "085bfm4w7flrv8jvzdnzbdg3j5n29xfzbs1wlrr29mg9dja6s8g8";
           name = "envdir";
         };
         packageRequires = [ dash emacs f ];
         meta = {
-          homepage = "http://melpa.org/#/envdir";
+          homepage = "https://melpa.org/#/envdir";
           license = lib.licenses.free;
         };
       }) {};
@@ -15470,13 +16068,13 @@
           sha256 = "0pmawjfyihqygqz7y0nvyrs6jcvckqzkq9k6z6yanpvkd2x5g13x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eopengrok";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eopengrok";
           sha256 = "0756x78113286hwk1i1m5s8xq04gh7zxb4fkmw58lg2ssff8q6av";
           name = "eopengrok";
         };
         packageRequires = [ cl-lib dash magit s ];
         meta = {
-          homepage = "http://melpa.org/#/eopengrok";
+          homepage = "https://melpa.org/#/eopengrok";
           license = lib.licenses.free;
         };
       }) {};
@@ -15491,13 +16089,13 @@
           sha256 = "11z08y61xd00rlw5mcyrix8nx41mqs127wighhjsxsyzbfqydxdr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/epc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/epc";
           sha256 = "1l9rcx07pa4b9z5654gyw6b64c95lcigzg15amphwr56v2g3rbzx";
           name = "epc";
         };
         packageRequires = [ concurrent ctable ];
         meta = {
-          homepage = "http://melpa.org/#/epc";
+          homepage = "https://melpa.org/#/epc";
           license = lib.licenses.free;
         };
       }) {};
@@ -15512,13 +16110,34 @@
           sha256 = "18gfi1287skv5xvh12arkvxy2c4fism8bdk42wc5q3y21h8nsiim";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/epic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/epic";
           sha256 = "0gfl8if83jbs0icz6gcjkwxvcz5v744k1kvqnbx3ga481kds9rqf";
           name = "epic";
         };
         packageRequires = [ htmlize ];
         meta = {
-          homepage = "http://melpa.org/#/epic";
+          homepage = "https://melpa.org/#/epic";
+          license = lib.licenses.free;
+        };
+      }) {};
+    epkg = callPackage ({ closql, dash, emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "epkg";
+        version = "20160415.2116";
+        src = fetchFromGitLab {
+          owner = "tarsius";
+          repo = "epkg";
+          rev = "99df36a50fb39976c6b6086db2f5f640f5d917b7";
+          sha256 = "0z60g9ln651cjfrjhwdm28x53kcpmap8zw26v0vjng288hlj8f9c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/epkg";
+          sha256 = "0vc1g29rfmgd2ks4lbz4599rbgcax7rgdva53ahhvp6say8fy22q";
+          name = "epkg";
+        };
+        packageRequires = [ closql dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/epkg";
           license = lib.licenses.free;
         };
       }) {};
@@ -15533,34 +16152,34 @@
           sha256 = "0s4k2grikhibd075435giv3bmba1mx71ndxlr0k1i0q0xawpyyb4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/epl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/epl";
           sha256 = "0zr3r2hn9jaxscrl83hyixznb8l5dzfr6fsac76aa8x12xgsc5hn";
           name = "epl";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/epl";
+          homepage = "https://melpa.org/#/epl";
           license = lib.licenses.free;
         };
       }) {};
-    epresent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    epresent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "epresent";
-        version = "20150324.810";
+        version = "20160410.2101";
         src = fetchFromGitHub {
-          owner = "eschulte";
+          owner = "dakrone";
           repo = "epresent";
-          rev = "c185826a464f780467dff240fd63ec385bd1d9c2";
-          sha256 = "1a8gzf7abda0zgcllyl351m47avnf995i9lvwjf05nyx2jb31dnw";
+          rev = "6c8abedcf46ff08091fa2bba52eb905c6290057d";
+          sha256 = "1qa1nq63kax767gs53s75ihspirvh69l4xdm89mj57qvrbpz36z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/epresent";
-          sha256 = "1x16wqfjfrh7kaqar5px61bf3lnlibvcbr5xaf3mcgph37sgi6la";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/epresent";
+          sha256 = "176d1nwsafi6fb0dnv35bfskp0xczyzf2939gi4bz69zh0161jg8";
           name = "epresent";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib org ];
         meta = {
-          homepage = "http://melpa.org/#/epresent";
+          homepage = "https://melpa.org/#/epresent";
           license = lib.licenses.free;
         };
       }) {};
@@ -15575,13 +16194,13 @@
           sha256 = "1wwg46xdb488wxvglwvsy08vznrnmdmmbcvm9vb60dy3gqjmz7cw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eprime-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eprime-mode";
           sha256 = "0vswjcs24f3mdyw6ai7p21ab8pdn327lr2d6css0a5nrg539cn2g";
           name = "eprime-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/eprime-mode";
+          homepage = "https://melpa.org/#/eprime-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -15596,13 +16215,13 @@
           sha256 = "13ds5z2nvanx8cvxrzi0da6ixx7kw222z6mrlbs8cldqcmzm7xh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eproject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eproject";
           sha256 = "0kpg4r57khbyinc73v9kj32b9m3b4nb5014r5fkl5mzzpzmd85b4";
           name = "eproject";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/eproject";
+          homepage = "https://melpa.org/#/eproject";
           license = lib.licenses.free;
         };
       }) {};
@@ -15617,34 +16236,34 @@
           sha256 = "18r66yl52xm1gjbn0dm8z80gv4p3794pi91qa8i2sri4grbsyi5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-colorize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/erc-colorize";
           sha256 = "1m941q7ql3yb71s71783nvz822bwhn1krmin18fvh0fbsbbnck2a";
           name = "erc-colorize";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/erc-colorize";
+          homepage = "https://melpa.org/#/erc-colorize";
           license = lib.licenses.free;
         };
       }) {};
     erc-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erc-crypt";
-        version = "20160203.1824";
+        version = "20160323.2039";
         src = fetchFromGitHub {
           owner = "atomontage";
           repo = "erc-crypt";
-          rev = "08ff044c1c9ef042913623295e57590e72bd1270";
-          sha256 = "0v2ly3q1r169lxwp6ml70plm6i0s96d0a1wy91ngvqgqpnpk4746";
+          rev = "e0c9951aae52b54d766c666214b25a64ede116a4";
+          sha256 = "0yiv16k0b2399asghc7qv9c9pj6ih0rwc863dskr2isnpl39amra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-crypt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/erc-crypt";
           sha256 = "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3";
           name = "erc-crypt";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/erc-crypt";
+          homepage = "https://melpa.org/#/erc-crypt";
           license = lib.licenses.free;
         };
       }) {};
@@ -15658,13 +16277,13 @@
           sha256 = "0bk4vr26abhbiwkmpns4hdlg23pxa25lca78fhz1900jkv4imk0f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-hipchatify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/erc-hipchatify";
           sha256 = "1a4gl05i757vvap0rzrfwms7mhw80sa84gvbwafrvj3x11rja24x";
           name = "erc-hipchatify";
         };
         packageRequires = [ alert emacs request s ];
         meta = {
-          homepage = "http://melpa.org/#/erc-hipchatify";
+          homepage = "https://melpa.org/#/erc-hipchatify";
           license = lib.licenses.free;
         };
       }) {};
@@ -15679,13 +16298,13 @@
           sha256 = "1k0g3bwp3w0dd6zwdv6k2wpqs2krjayilrzsr1hli649ljcx55d7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-hl-nicks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/erc-hl-nicks";
           sha256 = "1lhw77n2nrjnb5yhnpm6yhbcp022xxjcmdgqf21z9rd0igss9mja";
           name = "erc-hl-nicks";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/erc-hl-nicks";
+          homepage = "https://melpa.org/#/erc-hl-nicks";
           license = lib.licenses.free;
         };
       }) {};
@@ -15700,13 +16319,13 @@
           sha256 = "03r13x2hxy4hk0n0ri5wld8rp8frx4j3mig6mn2v25k0cr52689f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-image";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/erc-image";
           sha256 = "1cgzygkysjyrsdr6jwqkxlnisxccsvh4kxgn19rk4n61ms7bafvf";
           name = "erc-image";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/erc-image";
+          homepage = "https://melpa.org/#/erc-image";
           license = lib.licenses.free;
         };
       }) {};
@@ -15721,13 +16340,13 @@
           sha256 = "0k3gp4c74g5awk7v9lzb6py3dvf59nggh6dw7530cswxb6kg2psa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-social-graph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/erc-social-graph";
           sha256 = "07arn3k89cqxab5x5lczv8bpgrbirmlw9p6c37fgrl3df6f46h4h";
           name = "erc-social-graph";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/erc-social-graph";
+          homepage = "https://melpa.org/#/erc-social-graph";
           license = lib.licenses.free;
         };
       }) {};
@@ -15742,13 +16361,13 @@
           sha256 = "0cfqbqskh260zfq1lx1s8jz2351w2ij9m73rqim16fy7zr0s0670";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-terminal-notifier";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/erc-terminal-notifier";
           sha256 = "0vrxkg62qr3ki8n9mdn02sdni5fkj79fpkn0drx0a4kqp0nrrj7c";
           name = "erc-terminal-notifier";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/erc-terminal-notifier";
+          homepage = "https://melpa.org/#/erc-terminal-notifier";
           license = lib.licenses.free;
         };
       }) {};
@@ -15763,13 +16382,13 @@
           sha256 = "0n107d77z04ahypa7hn2165kkb6490v4vkzdm5zwm4lfhvlmp0x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-track-score";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/erc-track-score";
           sha256 = "19wjwah2n8ri6gyrsbzxnrvxwr5cj48sxrar1226n9miqvgj5whx";
           name = "erc-track-score";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/erc-track-score";
+          homepage = "https://melpa.org/#/erc-track-score";
           license = lib.licenses.free;
         };
       }) {};
@@ -15784,13 +16403,34 @@
           sha256 = "118q4zj9dh5xnimcsi229j5pflhcd8qz0p212kc4p9dmyrx2iw0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-tweet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/erc-tweet";
           sha256 = "0bazwq21mah4qrzwaji6w13m91l6v9dqh9svxrd13ij8yycr184b";
           name = "erc-tweet";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/erc-tweet";
+          homepage = "https://melpa.org/#/erc-tweet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    erc-twitch = callPackage ({ erc ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "erc-twitch";
+        version = "20160421.2330";
+        src = fetchFromGitHub {
+          owner = "vibhavp";
+          repo = "erc-twitch";
+          rev = "6938191c787d66fef4c13674e0a98a9d64eff364";
+          sha256 = "1xsxykmhz34gmyj4jb26qfai7j95kzlc7vfydrajc6is7xlrwhfk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/erc-twitch";
+          sha256 = "08vlwcxrzc2ndm52112z1r0qnz6jlmjhiwq2j3j59fbw82ys61ia";
+          name = "erc-twitch";
+        };
+        packageRequires = [ erc json ];
+        meta = {
+          homepage = "https://melpa.org/#/erc-twitch";
           license = lib.licenses.free;
         };
       }) {};
@@ -15805,13 +16445,13 @@
           sha256 = "0bzi2sh2fhrz49j5y53h6jgf41av6rx78smb3bbk6m74is8vim2y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-view-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/erc-view-log";
           sha256 = "1k6fawblz0d7kz1y7sa3q43s7ci28jsmzkp9vnl1nf55p9xvv4cf";
           name = "erc-view-log";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/erc-view-log";
+          homepage = "https://melpa.org/#/erc-view-log";
           license = lib.licenses.free;
         };
       }) {};
@@ -15826,13 +16466,13 @@
           sha256 = "0kh4amx3l3a14qaiyvjyak1jbybs6n49mdvzjrd1i2vd1y74zj5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-youtube";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/erc-youtube";
           sha256 = "12ylxkskkgfv5x7vlkib963ichb3rlmdzkf4zh8a39cgl8wsmacx";
           name = "erc-youtube";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/erc-youtube";
+          homepage = "https://melpa.org/#/erc-youtube";
           license = lib.licenses.free;
         };
       }) {};
@@ -15847,13 +16487,13 @@
           sha256 = "1dlw34kaslyvnsrahf4rm76r2b7qqqn589i4mmhr23prl8xbz9z9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-yt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/erc-yt";
           sha256 = "0yrwvahv4l2s1aavy6y6mjlrw8l11i00a249825ab5yaxrkzz7xc";
           name = "erc-yt";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/erc-yt";
+          homepage = "https://melpa.org/#/erc-yt";
           license = lib.licenses.free;
         };
       }) {};
@@ -15868,32 +16508,34 @@
           sha256 = "0xw3d9fz4kmn1myrsy44ki4bgg0aclv41wldl6r9nhvkrnri41cv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ercn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ercn";
           sha256 = "0yvis02bypw6v1zv7i326y8s6j0id558n0bdri52hr5pw85imnlp";
           name = "ercn";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ercn";
+          homepage = "https://melpa.org/#/ercn";
           license = lib.licenses.free;
         };
       }) {};
-    eredis = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild {
+    eredis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "eredis";
         version = "20120808.2207";
-        src = fetchsvn {
-          url = "http://eredis.googlecode.com/svn/trunk/";
-          rev = "28";
+        src = fetchFromGitHub {
+          owner = "justinhj";
+          repo = "eredis";
+          rev = "f6d4697620212b5ce77d5b4ff4e0cd6d7caf74e6";
           sha256 = "0cdyhklmsv0xfcq97c3wqh8scs6910jzvvp04w0jxlayd1dbzx49";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eredis";
-          sha256 = "1j0y4h97pqsw6k18w6r3rza3ql04ag3cixyndji7i1smbfsh4v95";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eredis";
+          sha256 = "087lln2izn5bv7bprmbaciivf17vv4pz2cjl91hy2f0sww6nsiw8";
           name = "eredis";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/eredis";
+          homepage = "https://melpa.org/#/eredis";
           license = lib.licenses.free;
         };
       }) {};
@@ -15908,34 +16550,55 @@
           sha256 = "1v8x6qmhywfxs7crzv7hfl5n4zq5y3ar40l873946l4wyk0wclng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erefactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/erefactor";
           sha256 = "0ma9sbrq4n8y5w7vvbhhgmw25aiykbq5yhxzm0knj32bgpviprw7";
           name = "erefactor";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/erefactor";
+          homepage = "https://melpa.org/#/erefactor";
           license = lib.licenses.free;
         };
       }) {};
-    ergoemacs-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
+    ergoemacs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ergoemacs-mode";
-        version = "20160221.103";
+        version = "20160419.3";
         src = fetchFromGitHub {
           owner = "ergoemacs";
           repo = "ergoemacs-mode";
-          rev = "80780ef8603577cb0ab8c64630d1301f7afef2ec";
-          sha256 = "1dfl8qwzjygnhfivf9w2dkv0vqyg0grnfganl7vh2l0lszps735d";
+          rev = "6c5d5bc7a4e366dec328dfd3430f20b7b977f781";
+          sha256 = "1swpwk0wrxn689cc5kqnh9rpis8k1an4k7sispj1b5k0916zp7wi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ergoemacs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ergoemacs-mode";
           sha256 = "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62";
           name = "ergoemacs-mode";
         };
-        packageRequires = [ emacs undo-tree ];
+        packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ergoemacs-mode";
+          homepage = "https://melpa.org/#/ergoemacs-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ergoemacs-status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mode-icons, powerline }:
+    melpaBuild {
+        pname = "ergoemacs-status";
+        version = "20160318.38";
+        src = fetchFromGitHub {
+          owner = "ergoemacs";
+          repo = "ergoemacs-status";
+          rev = "d952cc2361adf6eb4d6af60950ad4ab699c81320";
+          sha256 = "06pdwrhflpi5rkigqnr5h3jzv3dm1p9nydpvql9w33ixm6qhjj71";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ergoemacs-status";
+          sha256 = "065pw31s8dmqpag7zj40iv6dbl0qln7c65gcyp7pz9agg9rp6vbb";
+          name = "ergoemacs-status";
+        };
+        packageRequires = [ mode-icons powerline ];
+        meta = {
+          homepage = "https://melpa.org/#/ergoemacs-status";
           license = lib.licenses.free;
         };
       }) {};
@@ -15946,17 +16609,17 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "d0002b70b1f948dcef3e08781b9db589907776c5";
-          sha256 = "19cm7zq3n78a3qb1299rhc6n7diy5a5ix94k9ljkww5qydx9qi77";
+          rev = "523e048754f5086a6cc4fd9a250e1b495fc5b9b8";
+          sha256 = "1ss9jl5zasn7y7xk395igbbmaa2vw5pwhc120hs7hp07qqyqgyh0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erlang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/erlang";
           sha256 = "1gmrdkfanivb9l5lmkl0853snlhl62w34537r82w11z2fbk9lxhc";
           name = "erlang";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/erlang";
+          homepage = "https://melpa.org/#/erlang";
           license = lib.licenses.free;
         };
       }) {};
@@ -15971,13 +16634,13 @@
           sha256 = "0hn9i405nfhjd1h9vnwj43nxbbz00khrwkjq0acfyxjaz1shfac9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ert-async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ert-async";
           sha256 = "004798ckri5j72j0xvzkyciss1iz4lw9gya2749hkjxlamg14cn5";
           name = "ert-async";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ert-async";
+          homepage = "https://melpa.org/#/ert-async";
           license = lib.licenses.free;
         };
       }) {};
@@ -15985,17 +16648,17 @@
         pname = "ert-expectations";
         version = "20130824.700";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/ert-expectations.el";
+          url = "https://www.emacswiki.org/emacs/download/ert-expectations.el";
           sha256 = "0cwy3ilsid90abzzjb7ha2blq9kmv3gfp3icwwfcz6qczgirq6g7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ert-expectations";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ert-expectations";
           sha256 = "094lkf1h83rc0dkvdv8923xjrzj5pnpnsb4izk8n5n7g0rbz1l9w";
           name = "ert-expectations";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ert-expectations";
+          homepage = "https://melpa.org/#/ert-expectations";
           license = lib.licenses.free;
         };
       }) {};
@@ -16006,16 +16669,16 @@
         src = fetchgit {
           url = "https://bitbucket.org/olanilsson/ert-junit";
           rev = "c303c04da7a3ba4d2c46b00b79b67ff7ec57cc6d";
-          sha256 = "eedfdd6753c32d16baa341e6d20abee8713921d8eb850d16782cde55bdbeec46";
+          sha256 = "0ipcpsymbpicg0b0v1gbv0hkjwg8pq5d5rj1lfx1cbf3adkxvpzf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ert-junit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ert-junit";
           sha256 = "0bv22mhh1ahbjwi6s1csxkh11dmy0srabkddjd33l4havykxlg6g";
           name = "ert-junit";
         };
         packageRequires = [ ert ];
         meta = {
-          homepage = "http://melpa.org/#/ert-junit";
+          homepage = "https://melpa.org/#/ert-junit";
           license = lib.licenses.free;
         };
       }) {};
@@ -16030,34 +16693,34 @@
           sha256 = "08yfq3qzscxvzyxvyvdqpkrm787278yhkdd9prbvrgjj80p8n7vq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ert-modeline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ert-modeline";
           sha256 = "06pc50q9ggin20cbfafxd53x35ac3kh85dap0nbws7514f473m7b";
           name = "ert-modeline";
         };
         packageRequires = [ dash emacs projectile s ];
         meta = {
-          homepage = "http://melpa.org/#/ert-modeline";
+          homepage = "https://melpa.org/#/ert-modeline";
           license = lib.licenses.free;
         };
       }) {};
     ert-runner = callPackage ({ ansi, commander, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
     melpaBuild {
         pname = "ert-runner";
-        version = "20151023.313";
+        version = "20160330.106";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "ert-runner.el";
-          rev = "0a88a6cc9d970660c9f1205a623bc80d9bd5a05b";
-          sha256 = "0ivnfc42pw9pc9glx2m4klzx4csy4m60hj1x12js7492bd0ri933";
+          rev = "691a8f17870a654a4cf315a1e5aa03e6e8e8678b";
+          sha256 = "0cjdpk0v07yzxbxqhxlgrk0nh9cj31yx6dd90d9f7jd4bxyzkzbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ert-runner";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ert-runner";
           sha256 = "0fnb8rmjr5lvc3dq0fnyxhws8ync1lj5xp8ycs63z4ax6gmdqr48";
           name = "ert-runner";
         };
         packageRequires = [ ansi commander dash f s shut-up ];
         meta = {
-          homepage = "http://melpa.org/#/ert-runner";
+          homepage = "https://melpa.org/#/ert-runner";
           license = lib.licenses.free;
         };
       }) {};
@@ -16072,34 +16735,34 @@
           sha256 = "0jq4yp80wiphlpsc0429rg8n50g8l4lf78q0l3nywz2p93smjy9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/es-lib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/es-lib";
           sha256 = "0mwvgf5385qsp91zsdw75ipif1h90xy277xdmrpwixsxd7abbn0n";
           name = "es-lib";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/es-lib";
+          homepage = "https://melpa.org/#/es-lib";
           license = lib.licenses.free;
         };
       }) {};
     es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "es-mode";
-        version = "20160220.2252";
+        version = "20160408.2129";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "es-mode";
-          rev = "4424f5e3731852a16468d4aaa4ef7f5fab78d4d5";
-          sha256 = "0km7nvagipjqqppv1njm40cm4l7iyajqnqjy9a3j0r7civ4cz5y6";
+          rev = "8d0f4872846be9f117736179cb5dff781fc9d9c9";
+          sha256 = "0gap1n1611wx18zcnnb03zgmpmagiyfgnnq0jpbrcpv84c9svrkh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/es-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/es-mode";
           sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp";
           name = "es-mode";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
-          homepage = "http://melpa.org/#/es-mode";
+          homepage = "https://melpa.org/#/es-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -16114,13 +16777,34 @@
           sha256 = "14rsifcx2kwdmwq9zh41fkb848l0f4igp5v9pk3x4jd2yw9gay7m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/es-windows";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/es-windows";
           sha256 = "112ngkan0hv3y7m71479f46x5gwdmf0vhbqrzs5kcjwlacqlrahx";
           name = "es-windows";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/es-windows";
+          homepage = "https://melpa.org/#/es-windows";
+          license = lib.licenses.free;
+        };
+      }) {};
+    esa = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "esa";
+        version = "20160407.850";
+        src = fetchFromGitHub {
+          owner = "nabinno";
+          repo = "esa.el";
+          rev = "846ab3d970792cd741141f9e652a4c50aae3920c";
+          sha256 = "1p5ycfiir5b40hfv4iwyj7qv0ljlpcg630a47w8rx557vbwv7jdz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/esa";
+          sha256 = "1kbsv4xsp7p9v0g22had0dr7w5zsr24bgi2xzryy76699pxq4h6c";
+          name = "esa";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/esa";
           license = lib.licenses.free;
         };
       }) {};
@@ -16135,13 +16819,13 @@
           sha256 = "0id7820vjbprlpprj4fyhylkjvx00b87mw4n7jnxn1gczvjgafmc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/escreen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/escreen";
           sha256 = "0yis27362jc63jkzdndz1wpysmf1b51rrbv3swvi6b36da5i6b54";
           name = "escreen";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/escreen";
+          homepage = "https://melpa.org/#/escreen";
           license = lib.licenses.free;
         };
       }) {};
@@ -16156,13 +16840,13 @@
           sha256 = "1k8k9hl9m4vjqdw3x9wg04cy2lb9x64mq0mm0i3i6w59zrsnkn4q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/esh-buf-stack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/esh-buf-stack";
           sha256 = "0zmwlsm98m9vbjk9mldfj2nf6cip7mlvb71j33ddix76yqggp4qg";
           name = "esh-buf-stack";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/esh-buf-stack";
+          homepage = "https://melpa.org/#/esh-buf-stack";
           license = lib.licenses.free;
         };
       }) {};
@@ -16177,13 +16861,13 @@
           sha256 = "1yfvdx763xxhxf2r6kjjjyafaxrj1lpgrz1sgbhzkyj6nspmm9ms";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/esh-help";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/esh-help";
           sha256 = "1k925wmn8jy9rxxsxxawasxq6r4yzwl116digdx314gd3i04sh3w";
           name = "esh-help";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/esh-help";
+          homepage = "https://melpa.org/#/esh-help";
           license = lib.licenses.free;
         };
       }) {};
@@ -16198,13 +16882,13 @@
           sha256 = "13crzgkx1lham1nfsg6hj2zg875majvnig0v4ydg691zk1qi4hc2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eshell-autojump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eshell-autojump";
           sha256 = "09l2680hknmdbwr4cncv1v4b0adik0c3sm5i9m3qbwyyxm8m41i5";
           name = "eshell-autojump";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/eshell-autojump";
+          homepage = "https://melpa.org/#/eshell-autojump";
           license = lib.licenses.free;
         };
       }) {};
@@ -16219,13 +16903,13 @@
           sha256 = "0v0wshck5n4hspcv1zk1g2nm6xiigcjp16lx0dc8wzkl6ymljvbg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eshell-did-you-mean";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eshell-did-you-mean";
           sha256 = "1z1wpn3sj1gi5nn0a71wg0i3av0dijnk79dc32zh3qlh500kz8mz";
           name = "eshell-did-you-mean";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/eshell-did-you-mean";
+          homepage = "https://melpa.org/#/eshell-did-you-mean";
           license = lib.licenses.free;
         };
       }) {};
@@ -16240,34 +16924,34 @@
           sha256 = "1b94pamb92a26lvlbwyr7kgaiwax4hkgmmalh8l5ldcwxkscq09c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eshell-git-prompt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eshell-git-prompt";
           sha256 = "0a8pyppqvnavvb8rwsjxagb76hra9zhs5gwa0ylyznmql83f8w8s";
           name = "eshell-git-prompt";
         };
         packageRequires = [ cl-lib dash emacs s ];
         meta = {
-          homepage = "http://melpa.org/#/eshell-git-prompt";
+          homepage = "https://melpa.org/#/eshell-git-prompt";
           license = lib.licenses.free;
         };
       }) {};
     eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eshell-prompt-extras";
-        version = "20160213.1950";
+        version = "20160418.1030";
         src = fetchFromGitHub {
-          owner = "kaihaosw";
+          owner = "hiddenlotus";
           repo = "eshell-prompt-extras";
-          rev = "61973d732c1e6b24d3fd0374162669dec83f5ed6";
-          sha256 = "1k8falfyd5rfgn56pdin36k4afx0zp0z00jldg1jn22c6p3ndsfl";
+          rev = "4ebc7952c8892ba60bd37dc59481934d80e12ebb";
+          sha256 = "0lhmqnqrcnwnir0kqhkhnda6dyn7ggcidmk6lf24p57n3sf33pww";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eshell-prompt-extras";
-          sha256 = "1plvc8azpmb3phlrxhw3y18dv5y0xljsr5fqym4w84m66lq5csfj";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eshell-prompt-extras";
+          sha256 = "0kh4lvjkayjdz5lqvdqmdcblxizxk9kwmigjwa68kx8z6ngmfwa5";
           name = "eshell-prompt-extras";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/eshell-prompt-extras";
+          homepage = "https://melpa.org/#/eshell-prompt-extras";
           license = lib.licenses.free;
         };
       }) {};
@@ -16282,13 +16966,13 @@
           sha256 = "0znk2wmvk7b5mi727cawbddvzx74dlm1lwsxgkiylx2qp299ark0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eshell-z";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eshell-z";
           sha256 = "14ixazj0nscyqsdv7brqnfr0q8llir1pwb91yhl9jdqypmadpm6d";
           name = "eshell-z";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/eshell-z";
+          homepage = "https://melpa.org/#/eshell-z";
           license = lib.licenses.free;
         };
       }) {};
@@ -16303,13 +16987,13 @@
           sha256 = "0ir7j4dgy0fq9ybixaqs52kiqk73p9v6prgqzjs8nyicjrpmnpyq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/espresso-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/espresso-theme";
           sha256 = "1bsff8fnq5z0f6cwg6wprz8qi3ivsqxpxx6v6fxfammn74qqyvb5";
           name = "espresso-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/espresso-theme";
+          homepage = "https://melpa.org/#/espresso-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -16324,13 +17008,13 @@
           sha256 = "16r4j27j9yfdiy841w9q5ykkc6n3wrm7hvfacagb32mydk821ijg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/espuds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/espuds";
           sha256 = "16yzw9l64ahf5v92jzb7vyb4zqxxplq6qh0y9rkfmvm59s4nhk6c";
           name = "espuds";
         };
         packageRequires = [ dash f s ];
         meta = {
-          homepage = "http://melpa.org/#/espuds";
+          homepage = "https://melpa.org/#/espuds";
           license = lib.licenses.free;
         };
       }) {};
@@ -16345,13 +17029,13 @@
           sha256 = "05f8n24yvzm3zjvc1523ib44wv76ms5sn6mv8s1wrjsl190av0rn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/esqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/esqlite";
           sha256 = "1dny5qjzl9gaj90ihzbhliwk0n0x7jz333hzf6gaw7wsjmx91wlh";
           name = "esqlite";
         };
         packageRequires = [ pcsv ];
         meta = {
-          homepage = "http://melpa.org/#/esqlite";
+          homepage = "https://melpa.org/#/esqlite";
           license = lib.licenses.free;
         };
       }) {};
@@ -16366,34 +17050,34 @@
           sha256 = "05f8n24yvzm3zjvc1523ib44wv76ms5sn6mv8s1wrjsl190av0rn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/esqlite-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/esqlite-helm";
           sha256 = "00y2nwyx13xlny40afczr31lvbpnw1cgmj5wc3iycyznizg5kvhq";
           name = "esqlite-helm";
         };
         packageRequires = [ esqlite helm ];
         meta = {
-          homepage = "http://melpa.org/#/esqlite-helm";
+          homepage = "https://melpa.org/#/esqlite-helm";
           license = lib.licenses.free;
         };
       }) {};
     ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ess";
-        version = "20160208.653";
+        version = "20160426.1056";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "9ef548725d8fd8bd301ff2b4c8f292c309871110";
-          sha256 = "0376yic7aldqxrzc91f7g3licc8svvqdqn4jdbnhw4cdk94w46fm";
+          rev = "09e32812327b7c349501334a24c6f9f8d576aa48";
+          sha256 = "0954p9kwp40r6gxidpr92al4vjiqcbzljmi87r2f33nayrrz3gd6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ess";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ess";
           sha256 = "02kz4fjxr0vrj5mg13cq758nzykizq4dmsijraxv46snvh337v5i";
           name = "ess";
         };
         packageRequires = [ julia-mode ];
         meta = {
-          homepage = "http://melpa.org/#/ess";
+          homepage = "https://melpa.org/#/ess";
           license = lib.licenses.free;
         };
       }) {};
@@ -16408,13 +17092,13 @@
           sha256 = "1ya2ay52gkrd31pmw45ban8kkxgnzhhwkzkypwdhjfccq3ys835x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ess-R-data-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ess-R-data-view";
           sha256 = "0r2fzwayf3yb7fqk6f31x4xfqiiczwik8qw4rrvkqx2h3s1kz7i0";
           name = "ess-R-data-view";
         };
         packageRequires = [ ctable ess popup ];
         meta = {
-          homepage = "http://melpa.org/#/ess-R-data-view";
+          homepage = "https://melpa.org/#/ess-R-data-view";
           license = lib.licenses.free;
         };
       }) {};
@@ -16429,13 +17113,13 @@
           sha256 = "0q8pbaa6wahli6fh0kng5zmnypsxi1fr2bzs2mfk3h8vf4nikpv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ess-R-object-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ess-R-object-popup";
           sha256 = "1dxwgahfki6d6ywh85ifk3kq6f2a1114kkd8xcv4lcpzqykp93zj";
           name = "ess-R-object-popup";
         };
         packageRequires = [ ess popup ];
         meta = {
-          homepage = "http://melpa.org/#/ess-R-object-popup";
+          homepage = "https://melpa.org/#/ess-R-object-popup";
           license = lib.licenses.free;
         };
       }) {};
@@ -16450,13 +17134,13 @@
           sha256 = "0ici253mllqyzcbhxrazfj2kl50brr8qid99fk9nlyfgh516ms1x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ess-smart-equals";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ess-smart-equals";
           sha256 = "0mfmxmsqr2byj56psx4h08cjc2j3aac3xqr04yd47k2mlivnyrxp";
           name = "ess-smart-equals";
         };
         packageRequires = [ emacs ess ];
         meta = {
-          homepage = "http://melpa.org/#/ess-smart-equals";
+          homepage = "https://melpa.org/#/ess-smart-equals";
           license = lib.licenses.free;
         };
       }) {};
@@ -16471,34 +17155,34 @@
           sha256 = "01xa98q0pqsf4gyl6ixlpjjdqazqsxg1sf7a3j2wbh7196ps61v5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ess-smart-underscore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ess-smart-underscore";
           sha256 = "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2";
           name = "ess-smart-underscore";
         };
         packageRequires = [ ess ];
         meta = {
-          homepage = "http://melpa.org/#/ess-smart-underscore";
+          homepage = "https://melpa.org/#/ess-smart-underscore";
           license = lib.licenses.free;
         };
       }) {};
     ess-view = callPackage ({ ess, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ess-view";
-        version = "20160218.344";
+        version = "20160309.1515";
         src = fetchFromGitHub {
           owner = "GioBo";
           repo = "ess-view";
-          rev = "d2eecbf43a1e68bd9716b52853aca46d6667ef18";
-          sha256 = "0wz6n41aqph1b460m8vnxvz6mnmh6n7kxbx4wriknjlacxamksyy";
+          rev = "5ae35d37ac625b16640401d19f9a51b340da9420";
+          sha256 = "1fdg8a4nsyjhwqsslawfvij77g3fp9klpas7m8vwjsjpc85iwh3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ess-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ess-view";
           sha256 = "1zx5sbxmbs6ya349ic7yvnx56v3km2cb27p8kan5ygisnwwq2wc4";
           name = "ess-view";
         };
         packageRequires = [ ess f s ];
         meta = {
-          homepage = "http://melpa.org/#/ess-view";
+          homepage = "https://melpa.org/#/ess-view";
           license = lib.licenses.free;
         };
       }) {};
@@ -16513,13 +17197,13 @@
           sha256 = "034rs6mmc5f6y8ply2a90b5s4pi4qx9m49wsxc9v0zwa9i5skmx1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/esup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/esup";
           sha256 = "0cv3zc2zzm38ki3kxq58g9sp4gsk3dffa398wky6z83a3zc02zs0";
           name = "esup";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/esup";
+          homepage = "https://melpa.org/#/esup";
           license = lib.licenses.free;
         };
       }) {};
@@ -16534,13 +17218,13 @@
           sha256 = "0mrfkq3jcsjfccqir02yijl24hllc347b02y7gk3b2yn0b676dv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/esxml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/esxml";
           sha256 = "0nn074abkxz7p4w59l1za586p5ya392xhl3sx92yys8a3194n6hz";
           name = "esxml";
         };
         packageRequires = [ kv ];
         meta = {
-          homepage = "http://melpa.org/#/esxml";
+          homepage = "https://melpa.org/#/esxml";
           license = lib.licenses.free;
         };
       }) {};
@@ -16555,13 +17239,13 @@
           sha256 = "1k361bbwd9z17qlycymb1x7scidvgvrh9bdp06rhwfh9j3slrbxy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/etable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/etable";
           sha256 = "0m4h24mmhp680wfhb90im228mrcyxapzyi4kla8xdmss83gc0c32";
           name = "etable";
         };
         packageRequires = [ dash emacs interval-list ];
         meta = {
-          homepage = "http://melpa.org/#/etable";
+          homepage = "https://melpa.org/#/etable";
           license = lib.licenses.free;
         };
       }) {};
@@ -16569,17 +17253,17 @@
         pname = "etags-select";
         version = "20130824.700";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/etags-select.el";
+          url = "https://www.emacswiki.org/emacs/download/etags-select.el";
           sha256 = "0gmlmxlwfsfk5axn3x5cfvqy9bx26ynpbg50mdxiljk7wzqs5dyb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/etags-select";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/etags-select";
           sha256 = "0j6mxj10n7jf087l7j86s3a8si5hzpwmvrpqisfvlnvn6a0rdy7h";
           name = "etags-select";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/etags-select";
+          homepage = "https://melpa.org/#/etags-select";
           license = lib.licenses.free;
         };
       }) {};
@@ -16587,59 +17271,80 @@
         pname = "etags-table";
         version = "20130824.657";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/etags-table.el";
+          url = "https://www.emacswiki.org/emacs/download/etags-table.el";
           sha256 = "0apm8as606bbkpa7i1hkwcbajzsmsyxn6cwfk9dkkll5bh4vglqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/etags-table";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/etags-table";
           sha256 = "1jzij9jknab42jmx358g7f1c0d8lsp9baxbk3xsy7w4nl0l53d84";
           name = "etags-table";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/etags-table";
+          homepage = "https://melpa.org/#/etags-table";
           license = lib.licenses.free;
         };
       }) {};
     ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ethan-wspace";
-        version = "20151217.2010";
+        version = "20160317.1120";
         src = fetchFromGitHub {
           owner = "glasserc";
           repo = "ethan-wspace";
-          rev = "477444d95adc2cb86c82e498cbaa5fbb1fc293a8";
-          sha256 = "098mfyw63b23h7jajaik1rfj307sxs82nnwf6b81j550kl2n05y6";
+          rev = "8b63c8fb7ace322a7f4a72b07efbcb0debe8ee37";
+          sha256 = "0lp8rvwxyk7bz2yl3vgpql4rqb7xcs2xllnf2arpzzg0xcndxyg3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ethan-wspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ethan-wspace";
           sha256 = "0k4kqkf5c6ysyhh1vpi9v4220yxm5ir3ippq2gmvvhnk77pg6hws";
           name = "ethan-wspace";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ethan-wspace";
+          homepage = "https://melpa.org/#/ethan-wspace";
+          license = lib.licenses.free;
+        };
+      }) {};
+    euslisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "euslisp-mode";
+        version = "20160422.255";
+        src = fetchFromGitHub {
+          owner = "iory";
+          repo = "euslisp-mode";
+          rev = "1427b1c704437016dbd9319a8c9f46bcaaa4eba2";
+          sha256 = "116n07fqg0q3y9c6b745mfl3w475wf6nch2y4nnill5mxg951c3l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/euslisp-mode";
+          sha256 = "0qrd35jdr8p13x34972scyk6d0zrj1zh6vx9d740rjc8gmq0z5l4";
+          name = "euslisp-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/euslisp-mode";
           license = lib.licenses.free;
         };
       }) {};
     eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
     melpaBuild {
         pname = "eval-in-repl";
-        version = "20160117.957";
+        version = "20160418.2043";
         src = fetchFromGitHub {
           owner = "kaz-yos";
           repo = "eval-in-repl";
-          rev = "c5072e60bff11de48944476ef361e9d48a55e2ff";
-          sha256 = "0vd2crs261na9a682d74ycz1il661kavsz1bvs0bkak09lplc1qz";
+          rev = "4ac77eb80f6df21f5a8621982bcafc71ac2ef7dd";
+          sha256 = "07jlrngmnfp1jp30hx9vk42h065c74dz92b38sa18swzfmhwd4y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eval-in-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eval-in-repl";
           sha256 = "10h5vy9wdiqf9dgk1d1bsvp93y8sfcxghzg8zbhhn7m5cqg2wh63";
           name = "eval-in-repl";
         };
         packageRequires = [ ace-window dash paredit ];
         meta = {
-          homepage = "http://melpa.org/#/eval-in-repl";
+          homepage = "https://melpa.org/#/eval-in-repl";
           license = lib.licenses.free;
         };
       }) {};
@@ -16654,13 +17359,13 @@
           sha256 = "1syqakdyg3ydnq9gvkjf2rw9rz3kyhzp7avhy6dvyy65pv2ndyc2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eval-sexp-fu";
           sha256 = "17cazf81z4cszflnfp66zyq2cclw5sp9539pxskdf267cf7r0ycs";
           name = "eval-sexp-fu";
         };
         packageRequires = [ highlight ];
         meta = {
-          homepage = "http://melpa.org/#/eval-sexp-fu";
+          homepage = "https://melpa.org/#/eval-sexp-fu";
           license = lib.licenses.free;
         };
       }) {};
@@ -16675,13 +17380,13 @@
           sha256 = "1llxxdprs8yw2hqj4dhrkrrzmkl25h7p4rcaa2cw544fmg3kvlz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evalator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evalator";
           sha256 = "0k6alxwg89gc4v5m2bxmzmj7l6kywhbh4036xgz19q28xnlbr9xk";
           name = "evalator";
         };
         packageRequires = [ helm-core ];
         meta = {
-          homepage = "http://melpa.org/#/evalator";
+          homepage = "https://melpa.org/#/evalator";
           license = lib.licenses.free;
         };
       }) {};
@@ -16696,54 +17401,33 @@
           sha256 = "1q5s1ffmfh5dby92853xm8kjhgjfd5vbvcg1xbf8lswc1i41k7n7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evalator-clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evalator-clojure";
           sha256 = "10mxlgirnsq3z7l1izrf2v1l1yr4sbdjsaszz7llqv6l80y4bji3";
           name = "evalator-clojure";
         };
         packageRequires = [ cider evalator ];
         meta = {
-          homepage = "http://melpa.org/#/evalator-clojure";
+          homepage = "https://melpa.org/#/evalator-clojure";
           license = lib.licenses.free;
         };
       }) {};
     evil = callPackage ({ fetchhg, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20160215.1148";
+        version = "20160420.123";
         src = fetchhg {
           url = "https://bitbucket.com/lyro/evil";
-          rev = "70005dd4c11e";
-          sha256 = "0hdysszfc3796d19nyw1f4cqzisspih1if0hh9hp2xjgxh3vj0mw";
+          rev = "5bbbfd0c8832";
+          sha256 = "037d5skihr3z1v3pvd1qg10pgygb4adznf6z0bysdvisjny298nv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil";
           sha256 = "09qrhy7l229w0qk3ba1i2xg4vqz8525v8scrbm031lqp30jp54hc";
           name = "evil";
         };
         packageRequires = [ goto-chg undo-tree ];
         meta = {
-          homepage = "http://melpa.org/#/evil";
-          license = lib.licenses.free;
-        };
-      }) {};
-    evil-annoying-arrows = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "evil-annoying-arrows";
-        version = "20150509.1618";
-        src = fetchFromGitHub {
-          owner = "endrebak";
-          repo = "evil-annoying-arrows";
-          rev = "1ec60cea0e67d782e5b8d093d19da6d0d4fd1e7f";
-          sha256 = "05fba10yvxl82g2xl48mxwz7cwjp4pylb7n8a4b08i8f9xasny7f";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-annoying-arrows";
-          sha256 = "024zz9l43y1kk2hm8l96h1ahril23cj35f0x72jrcfjysid7wpry";
-          name = "evil-annoying-arrows";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "http://melpa.org/#/evil-annoying-arrows";
+          homepage = "https://melpa.org/#/evil";
           license = lib.licenses.free;
         };
       }) {};
@@ -16758,13 +17442,13 @@
           sha256 = "0cnj91lwpmk4c8nf3xi80yvv6anvkg8h1kbzbp16glkgmy6jpmy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-anzu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-anzu";
           sha256 = "19cmc61l370mm4h2m6jw5pdcsvj4wcv9zpa8z7k1fjg57mwmmn70";
           name = "evil-anzu";
         };
         packageRequires = [ anzu evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-anzu";
+          homepage = "https://melpa.org/#/evil-anzu";
           license = lib.licenses.free;
         };
       }) {};
@@ -16779,13 +17463,13 @@
           sha256 = "1nh7wa4ynr7ln42x32znzqsmh7ijzy5ymd7rszf49l8677alvazq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-args";
           sha256 = "1bwdvf1i3jc77bw2as1wr1djm8z3a7wms60694xkyqh0m909hs2w";
           name = "evil-args";
         };
         packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-args";
+          homepage = "https://melpa.org/#/evil-args";
           license = lib.licenses.free;
         };
       }) {};
@@ -16800,13 +17484,13 @@
           sha256 = "1q6znbnshk45mdglx519qlbfhb7g47qsm245i93ka4djsjy55j9l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-avy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-avy";
           sha256 = "1hc96dd78yxgr8cs9sk9y1i5h1qnyk110vlb3wnlxv1hwn92qvrd";
           name = "evil-avy";
         };
         packageRequires = [ avy cl-lib emacs evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-avy";
+          homepage = "https://melpa.org/#/evil-avy";
           license = lib.licenses.free;
         };
       }) {};
@@ -16821,13 +17505,13 @@
           sha256 = "08cpgbwsrk8n88qiq2z90s6wx0ayvrrb38m8dks595x2qzzpa1gi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-cleverparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-cleverparens";
           sha256 = "10zkyaxy52ixh26hzm9v1y0gakcn5sdwz4ny8v1vcmjqjphnk799";
           name = "evil-cleverparens";
         };
         packageRequires = [ dash emacs evil paredit smartparens ];
         meta = {
-          homepage = "http://melpa.org/#/evil-cleverparens";
+          homepage = "https://melpa.org/#/evil-cleverparens";
           license = lib.licenses.free;
         };
       }) {};
@@ -16842,55 +17526,55 @@
           sha256 = "183fdg7rmnnbps0knnj2kmhf1hxk0q91wbqx1flhciq6wq4rilni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-commentary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-commentary";
           sha256 = "151iiimmkpn58pl9zn40qssfahbrqy83axyl9dcd6kx2ywv5gcxz";
           name = "evil-commentary";
         };
         packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-commentary";
+          homepage = "https://melpa.org/#/evil-commentary";
           license = lib.licenses.free;
         };
       }) {};
-    evil-dvorak = callPackage ({ ace-jump-mode, evil, evil-surround, fetchFromGitHub, fetchurl, helm, helm-swoop, lib, melpaBuild }:
+    evil-dvorak = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-dvorak";
-        version = "20160127.615";
+        version = "20160416.1341";
         src = fetchFromGitHub {
           owner = "jbranso";
           repo = "evil-dvorak";
-          rev = "86f7ebd4dc5db6cd126ef2e12a113c9af1354e53";
-          sha256 = "0fdlj2m8bzdwqh43qb34il3fmang0zpdgxfkrsmxy9kpc0bsx940";
+          rev = "824f7c56980d72a0ff04c662223540cd66f13754";
+          sha256 = "15rnxhqc56g4ydr8drvcgzvjp8blxsarm86dqc36rym7g5gnxr20";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-dvorak";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-dvorak";
           sha256 = "1iq9wzcb625vs942khja39db1js8r46vrdiqcm47yfji98g39gsn";
           name = "evil-dvorak";
         };
-        packageRequires = [ ace-jump-mode evil evil-surround helm helm-swoop ];
+        packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-dvorak";
+          homepage = "https://melpa.org/#/evil-dvorak";
           license = lib.licenses.free;
         };
       }) {};
-    evil-easymotion = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    evil-easymotion = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-easymotion";
-        version = "20160217.2043";
+        version = "20160425.2337";
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "evil-easymotion";
-          rev = "5b77d65b0a8d93b8b9602d4757a40c548a3bc997";
-          sha256 = "01nk89wkqbi6jpggdj6yl74k8jzlh329i4p77wljyr18akbrdz9l";
+          rev = "8d653125103ab1454ef5fa8e46025f4426b78668";
+          sha256 = "11j1d59nk5v12h30dc93b5ic4piijwgy4gj7d8vf8rr8d3r2bicb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-easymotion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-easymotion";
           sha256 = "0zixgdhc228y6yqr044cbyls0pihzacqsgvybhhar916p4h8izgv";
           name = "evil-easymotion";
         };
-        packageRequires = [ avy emacs ];
+        packageRequires = [ avy cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/evil-easymotion";
+          homepage = "https://melpa.org/#/evil-easymotion";
           license = lib.licenses.free;
         };
       }) {};
@@ -16905,55 +17589,76 @@
           sha256 = "16pz48gdpl68azaqwyixh10y1x9xzi1lnhq2v0nrd0y6bfcqcvc7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-ediff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-ediff";
           sha256 = "1xwl2511byb00ybfnm6q6mbkgzarrq8bfv5rbip67zqbw2qgmb6i";
           name = "evil-ediff";
         };
         packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-ediff";
+          homepage = "https://melpa.org/#/evil-ediff";
           license = lib.licenses.free;
         };
       }) {};
     evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-escape";
-        version = "20151214.1311";
+        version = "20160313.1405";
         src = fetchFromGitHub {
           owner = "syl20bnr";
           repo = "evil-escape";
-          rev = "32a6c6c31eaa5678205ce658baaab7eb5ca9c9e3";
-          sha256 = "1dl201jx7kfmkhd7ism6wlmlnbgfg1qn17faryz7kc5v2mms69b4";
+          rev = "58ec625a94c3a7f1d8f45fae29f26e890a190062";
+          sha256 = "0v30yfkyy21nl45f9c05rbkbpfivf173bn2470r1b9vxgx6gcj8g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-escape";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-escape";
           sha256 = "0rlwnnshcvsb5kn7db5qy39s89qmqlllvg2z8cnxyri8bsssks4k";
           name = "evil-escape";
         };
         packageRequires = [ cl-lib emacs evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-escape";
+          homepage = "https://melpa.org/#/evil-escape";
           license = lib.licenses.free;
         };
       }) {};
     evil-exchange = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-exchange";
-        version = "20160117.2202";
+        version = "20160407.2318";
         src = fetchFromGitHub {
           owner = "Dewdrops";
           repo = "evil-exchange";
-          rev = "55375945729140ce6bd8806c3da1536801fbf0f5";
-          sha256 = "0gbpd1wmlcvddiym0r410rch8bjg4gxslynwmfqywwgbva8zm46c";
+          rev = "29bd39d942a1401a714e43daf11573eab6abfaa8";
+          sha256 = "0avaw5pgyv75nhbinjjpy30pgkwfq79fx2k9z034f1x76ls9s683";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-exchange";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-exchange";
           sha256 = "1mvw7w23yfbfmhzj6wimslbryb0gppryw24ac0wh4fzl9rdcma4r";
           name = "evil-exchange";
         };
         packageRequires = [ cl-lib evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-exchange";
+          homepage = "https://melpa.org/#/evil-exchange";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-extra-operator = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-extra-operator";
+        version = "20160407.122";
+        src = fetchFromGitHub {
+          owner = "Dewdrops";
+          repo = "evil-extra-operator";
+          rev = "96d611b557876caefbc64731ad2d0385edbb0c23";
+          sha256 = "10vwyrg833imja3ak9fx0zackdjwlcncl7wm9dym3kjs6qf2rvv0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-extra-operator";
+          sha256 = "066apin0yrjx7zr007p2h9p2nq58lz7qikzjzg0spqkb8vy7vkc5";
+          name = "evil-extra-operator";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "https://melpa.org/#/evil-extra-operator";
           license = lib.licenses.free;
         };
       }) {};
@@ -16968,34 +17673,34 @@
           sha256 = "1cv24qnxxf6n1grf4n5969v8y9xll5zb9mbfdnq9iavdvhnndk2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-god-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-god-state";
           sha256 = "1g547d58zf11qw0zz3fk5kmrzmfx1rhawyh5d2h8bll8hwygnrxf";
           name = "evil-god-state";
         };
         packageRequires = [ evil god-mode ];
         meta = {
-          homepage = "http://melpa.org/#/evil-god-state";
+          homepage = "https://melpa.org/#/evil-god-state";
           license = lib.licenses.free;
         };
       }) {};
     evil-iedit-state = callPackage ({ evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-iedit-state";
-        version = "20141217.1934";
+        version = "20160313.1356";
         src = fetchFromGitHub {
           owner = "syl20bnr";
           repo = "evil-iedit-state";
-          rev = "153de161d5a272e3740dd862a3b7530b4240bcf8";
-          sha256 = "1kdigwpl9pp88l11bkpxkw91pvs8z3gachxccibivzgjxd2pnvfl";
+          rev = "eab7d5e3e7d25c4a852fedb6c0c7f50dd9e9bd7c";
+          sha256 = "0r9gif2sgf84z8qniz6chr32av9g2i38rlyms81m8ssghf0j86ss";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-iedit-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-iedit-state";
           sha256 = "1dihyh7vqcp7kvfic613k7v33czr93hz04d635awrsyzgy8savhl";
           name = "evil-iedit-state";
         };
         packageRequires = [ evil iedit ];
         meta = {
-          homepage = "http://melpa.org/#/evil-iedit-state";
+          homepage = "https://melpa.org/#/evil-iedit-state";
           license = lib.licenses.free;
         };
       }) {};
@@ -17010,13 +17715,13 @@
           sha256 = "1g6r1ydscwjvmhh1zg4q3nap4avk8lb9msdqrh7dff6pla0r2qs6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-indent-plus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-indent-plus";
           sha256 = "15vnvch0qsaram22d44k617bqhr9rrf8qc86sf20yvdyy3gi5j12";
           name = "evil-indent-plus";
         };
         packageRequires = [ cl-lib evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-indent-plus";
+          homepage = "https://melpa.org/#/evil-indent-plus";
           license = lib.licenses.free;
         };
       }) {};
@@ -17031,34 +17736,13 @@
           sha256 = "0nghisnc49ivh56mddfdlcbqv3y2vqzjvkpgwv3zp80ga6ghvdmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-indent-textobject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-indent-textobject";
           sha256 = "172a3krid5lrx1w9xcifkhjnvlxg1nbz4w102d99d0grr9465r09";
           name = "evil-indent-textobject";
         };
         packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-indent-textobject";
-          license = lib.licenses.free;
-        };
-      }) {};
-    evil-jumper = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "evil-jumper";
-        version = "20160214.1515";
-        src = fetchFromGitHub {
-          owner = "bling";
-          repo = "evil-jumper";
-          rev = "3fdbf356b8d86bfcdbd32a476420bec9da370596";
-          sha256 = "1bcravq8z2bj9dvfhmmv82vxx2lfhc1pqb4kq5b1nfvajjy1g8pn";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-jumper";
-          sha256 = "0zwsk7slzvcgvgh8fjrwangylishrwc1w0glxcr71sybxph2g46x";
-          name = "evil-jumper";
-        };
-        packageRequires = [ cl-lib evil ];
-        meta = {
-          homepage = "http://melpa.org/#/evil-jumper";
+          homepage = "https://melpa.org/#/evil-indent-textobject";
           license = lib.licenses.free;
         };
       }) {};
@@ -17073,55 +17757,55 @@
           sha256 = "10xrlimsxk09z9cw6rxdz8qvvn1i0vhc1gdicwxri0j10p0hacl3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-leader";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-leader";
           sha256 = "154s2nb170hzksmc87wnzlwg3ic3w3ravgsfvwkyfi2q285vmra6";
           name = "evil-leader";
         };
         packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-leader";
+          homepage = "https://melpa.org/#/evil-leader";
           license = lib.licenses.free;
         };
       }) {};
     evil-lisp-state = callPackage ({ bind-map, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
     melpaBuild {
         pname = "evil-lisp-state";
-        version = "20151201.924";
+        version = "20160403.2148";
         src = fetchFromGitHub {
           owner = "syl20bnr";
           repo = "evil-lisp-state";
-          rev = "f4da21900563f4ac1abf79f3fe73eaf1edcd633d";
-          sha256 = "0lvjqs40caxj3781cs41qavk10vlz2mjw0r6fmxa2z3c087cxnxw";
+          rev = "3c65fecd9917a41eaf6460f22187e2323821f3ce";
+          sha256 = "1n6r8xs670r5qp4b5f72nr9g8nlqcrx1v7yqqlbkgv8gns8n5xgh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-lisp-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-lisp-state";
           sha256 = "117irac05fs73n7sgja3zd7yh4nz9h0gw5b1b57lfkav6y3ndgcy";
           name = "evil-lisp-state";
         };
         packageRequires = [ bind-map evil smartparens ];
         meta = {
-          homepage = "http://melpa.org/#/evil-lisp-state";
+          homepage = "https://melpa.org/#/evil-lisp-state";
           license = lib.licenses.free;
         };
       }) {};
     evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "evil-magit";
-        version = "20160211.709";
+        version = "20160420.615";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "evil-magit";
-          rev = "593a0e5b3118aca28de672870fa7b8611f6760ef";
-          sha256 = "0dqhxl9df9d6s9rx5dvgzf0i88y0y2jq3vzr2v2q8vh3ffvj2s2g";
+          rev = "acc6af408ca08181103b2d4b5d37b207b5d56624";
+          sha256 = "17dc48qc8sicmqngy8kpw7r0qm1gnzsal1106d4lx4z7d8lyhpvz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-magit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-magit";
           sha256 = "10mhq6mzpklk5sj28lvd478dv9k84s81ax5jkwwxj26mqdw1ybg6";
           name = "evil-magit";
         };
         packageRequires = [ evil magit ];
         meta = {
-          homepage = "http://melpa.org/#/evil-magit";
+          homepage = "https://melpa.org/#/evil-magit";
           license = lib.licenses.free;
         };
       }) {};
@@ -17136,55 +17820,55 @@
           sha256 = "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-mark-replace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-mark-replace";
           sha256 = "03cq43vlv1b53w4kw7mjvk026i8rzhhryfb27ddn6ipgc6xh68a0";
           name = "evil-mark-replace";
         };
         packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-mark-replace";
+          homepage = "https://melpa.org/#/evil-mark-replace";
           license = lib.licenses.free;
         };
       }) {};
     evil-matchit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-matchit";
-        version = "20151120.535";
+        version = "20160413.825";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-matchit";
-          rev = "8b80b3df9472217d55962981025539f2da603296";
-          sha256 = "0kf4m1ghpxfalqx2zwm1d8xav4d6l6bpk79g5cvssk5jz5913fbi";
+          rev = "6346825fd89ee115fab974746fdba338adee856c";
+          sha256 = "0x6rc98g7hvvmlgq31n7qanylrld6dzvg6n8qgzp4s544l0dwfw6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-matchit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-matchit";
           sha256 = "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq";
           name = "evil-matchit";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/evil-matchit";
+          homepage = "https://melpa.org/#/evil-matchit";
           license = lib.licenses.free;
         };
       }) {};
     evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-mc";
-        version = "20160205.1942";
+        version = "20160418.2349";
         src = fetchFromGitHub {
           owner = "gabesoft";
           repo = "evil-mc";
-          rev = "97c81605a627fec0eaa32466615b8c2f4b3feb17";
-          sha256 = "1i9m827ffwqphkw2b5nmj11y7c5jn5dc8ds6k0dpdiq5whjklplh";
+          rev = "c5634386d66d3505e15f0c0876b123c1f7f22d2b";
+          sha256 = "1dzcy4hlipwwb0j3jcaywapdrj8vwv8w4gcag7sawj2ywi06cljr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-mc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-mc";
           sha256 = "0cq4xg6svb5gz4ra607wy768as2igla4h1xcrfnxldknk476fqqs";
           name = "evil-mc";
         };
         packageRequires = [ cl-lib emacs evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-mc";
+          homepage = "https://melpa.org/#/evil-mc";
           license = lib.licenses.free;
         };
       }) {};
@@ -17199,13 +17883,34 @@
           sha256 = "0zqmmv3if9zzq9fgjg8wj62pk1qn65nax9hsk9m7lx2ncdv8cph1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-mu4e";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-mu4e";
           sha256 = "1ks4vnga7dkz27a7gza5hakzbcsiqgkq1ysc0lcx7g82ihpmrrcq";
           name = "evil-mu4e";
         };
         packageRequires = [ dash emacs evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-mu4e";
+          homepage = "https://melpa.org/#/evil-mu4e";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-multiedit";
+        version = "20160412.210";
+        src = fetchFromGitHub {
+          owner = "hlissner";
+          repo = "evil-multiedit";
+          rev = "39163cb968848bd4c60871f617365a861b011020";
+          sha256 = "16rrd02yr6rz4xlc35gr5d7ds3h168yhz4iinq8zmnlw778waz5j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-multiedit";
+          sha256 = "0p02q9skqw2zhx7sfadqgs7vn518s72856962dam0xw4sqasplfp";
+          name = "evil-multiedit";
+        };
+        packageRequires = [ cl-lib emacs evil iedit ];
+        meta = {
+          homepage = "https://melpa.org/#/evil-multiedit";
           license = lib.licenses.free;
         };
       }) {};
@@ -17220,13 +17925,13 @@
           sha256 = "0msk65smj05wgs8dr42wy0w265pgcffrpgbvclahxhyj9ypscwsb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-nerd-commenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-nerd-commenter";
           sha256 = "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d";
           name = "evil-nerd-commenter";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/evil-nerd-commenter";
+          homepage = "https://melpa.org/#/evil-nerd-commenter";
           license = lib.licenses.free;
         };
       }) {};
@@ -17241,13 +17946,13 @@
           sha256 = "1aq95hj8x13py0pwsnc6wvd8cc5yv5qin8ym9js42y5966vwj4np";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-numbers";
           sha256 = "1lpmkklwjdf7ayhv99g9zh3l9hzrwm0hr0ijvbc7yz3n398zn1b2";
           name = "evil-numbers";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/evil-numbers";
+          homepage = "https://melpa.org/#/evil-numbers";
           license = lib.licenses.free;
         };
       }) {};
@@ -17262,13 +17967,13 @@
           sha256 = "0pir7a3xxbcp5f3q9pi36rpdpi8pbx18afmh0r3501ynssyjfq53";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-org";
           sha256 = "18w07fbafry3wb87f55kd8y0yra3s18a52f3m5kkdlcz5zwagi1c";
           name = "evil-org";
         };
         packageRequires = [ evil evil-leader org ];
         meta = {
-          homepage = "http://melpa.org/#/evil-org";
+          homepage = "https://melpa.org/#/evil-org";
           license = lib.licenses.free;
         };
       }) {};
@@ -17283,13 +17988,13 @@
           sha256 = "0b08y4spapl4g2292j3l4cr84gjlvm3rpma3gqld4yb1sxd7v78p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-paredit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-paredit";
           sha256 = "0xvxxa3gjgsrv10a61y0591bn3gj8v1ff2wck8s0svwfl076gyfy";
           name = "evil-paredit";
         };
         packageRequires = [ evil paredit ];
         meta = {
-          homepage = "http://melpa.org/#/evil-paredit";
+          homepage = "https://melpa.org/#/evil-paredit";
           license = lib.licenses.free;
         };
       }) {};
@@ -17304,13 +18009,13 @@
           sha256 = "1ja9ggj70wf0nmma4xnc1zdzg2crq9h1cv3cj7cgwjmllflgkfq7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-quickscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-quickscope";
           sha256 = "0xym1mh4p68i00l1lshywf5fdg1vw3szxp3fk9fwfcg04z6vd489";
           name = "evil-quickscope";
         };
         packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-quickscope";
+          homepage = "https://melpa.org/#/evil-quickscope";
           license = lib.licenses.free;
         };
       }) {};
@@ -17325,13 +18030,13 @@
           sha256 = "12rdx5zjp5pck008cykpw200rr1y0b3lj2dpzf82llfyfaxzh7wi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-rails";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-rails";
           sha256 = "0ah0nvzl30z19566kacyrsznsdm3cpij8n3bw3dfng7263rh60gj";
           name = "evil-rails";
         };
         packageRequires = [ evil projectile-rails ];
         meta = {
-          homepage = "http://melpa.org/#/evil-rails";
+          homepage = "https://melpa.org/#/evil-rails";
           license = lib.licenses.free;
         };
       }) {};
@@ -17346,13 +18051,13 @@
           sha256 = "1xz629qv1ss1fap397k48piawcwl8lrybraq5449bw1vvn1a4d9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-rsi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-rsi";
           sha256 = "0mc39n72420n36kwyf9zpw1pgyih0aigfnmkbywb0yxgj7myc345";
           name = "evil-rsi";
         };
         packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-rsi";
+          homepage = "https://melpa.org/#/evil-rsi";
           license = lib.licenses.free;
         };
       }) {};
@@ -17367,13 +18072,13 @@
           sha256 = "1jfi2k9dm0cc9bx8klppm965ydhdw17a2n664199vhxrap6g27yk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-search-highlight-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-search-highlight-persist";
           sha256 = "0iia136js364iygi1mydyzwvizhic6w5z9pbwmhva4654pq8dzqy";
           name = "evil-search-highlight-persist";
         };
         packageRequires = [ highlight ];
         meta = {
-          homepage = "http://melpa.org/#/evil-search-highlight-persist";
+          homepage = "https://melpa.org/#/evil-search-highlight-persist";
           license = lib.licenses.free;
         };
       }) {};
@@ -17384,38 +18089,38 @@
         src = fetchFromGitHub {
           owner = "expez";
           repo = "evil-smartparens";
-          rev = "0e89b23924b2e0baa0d11841ea5126967a072fa8";
-          sha256 = "0xwrg03w40pncdy5ppn7f77ravcbimj1ylc1r4clpqiha1d4xkhi";
+          rev = "37c99cbbfbe637f98850adea3dee9dc14a3b7d76";
+          sha256 = "18iwbxwdiicx2xrfdrh0cx1d90ykwh3a0fy96s6sl1mvnv9z50sw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-smartparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-smartparens";
           sha256 = "1viwrd6gfqmwhlil80pk68dikn3cjf9ddsy0z781z3qfx0j35qza";
           name = "evil-smartparens";
         };
         packageRequires = [ emacs evil smartparens ];
         meta = {
-          homepage = "http://melpa.org/#/evil-smartparens";
+          homepage = "https://melpa.org/#/evil-smartparens";
           license = lib.licenses.free;
         };
       }) {};
-    evil-snipe = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    evil-snipe = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-snipe";
-        version = "20151106.1602";
+        version = "20160413.1249";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-snipe";
-          rev = "71f0f7df2300be390227e3f78619630c32bddbe9";
-          sha256 = "0iyk8pn7pc3js3ppn46myzfr2i0b47wwrzv72939aydpw64rx76q";
+          rev = "396d6b0f80790781cce834ce8535249542d11c7c";
+          sha256 = "17l5g1zg3dhnjmdlx486x3b3v7vp4z0l9fv12anmw442k37xwia4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-snipe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-snipe";
           sha256 = "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn";
           name = "evil-snipe";
         };
-        packageRequires = [ evil ];
+        packageRequires = [ cl-lib evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-snipe";
+          homepage = "https://melpa.org/#/evil-snipe";
           license = lib.licenses.free;
         };
       }) {};
@@ -17430,34 +18135,34 @@
           sha256 = "1x4nphjq8lvg8qsm1pj04mk9n59xc6jlxiv5s3bih1nl4xkssrxy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-space";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-space";
           sha256 = "1asvh873r1xgffvz3nr653yn8h5ifaphnafp6wf1b1mja6as7f23";
           name = "evil-space";
         };
         packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-space";
+          homepage = "https://melpa.org/#/evil-space";
           license = lib.licenses.free;
         };
       }) {};
     evil-surround = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-surround";
-        version = "20160128.1228";
+        version = "20160331.1021";
         src = fetchFromGitHub {
           owner = "timcharper";
           repo = "evil-surround";
-          rev = "bfa438cf62e29074b3fc68c582765a7e0f9907e4";
-          sha256 = "01p02h17ls0pmisnfbyna7xf6fz2c7fyyvdb1yq38dwv2j4zi1b4";
+          rev = "a4a04c6f016528502f0d7d05ea7a8c6c0912e3ed";
+          sha256 = "0r4wkj2sbk814kxdd1q6523p1fdzk7a1sr54krvhmxhnl666l3xb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-surround";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-surround";
           sha256 = "1bcjxw0yrk2bqj5ihl5r2c4id0m9wbnj7fpd0wwmw9444xvwp8ag";
           name = "evil-surround";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/evil-surround";
+          homepage = "https://melpa.org/#/evil-surround";
           license = lib.licenses.free;
         };
       }) {};
@@ -17472,13 +18177,13 @@
           sha256 = "1qklx0j3fz3mp87v64yqbyyq5csfymbjfwvy2s4nk634wbnrra93";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-tabs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-tabs";
           sha256 = "0qgvpv5hcai8wmkv2fp6i2vdy7qp4gwidwpzz8j6vl9519x73s62";
           name = "evil-tabs";
         };
         packageRequires = [ elscreen evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-tabs";
+          homepage = "https://melpa.org/#/evil-tabs";
           license = lib.licenses.free;
         };
       }) {};
@@ -17493,13 +18198,13 @@
           sha256 = "10aic2r1akk38hh761hr5vp9fjlh1m5nimag0nzdq5x9g9467cc8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-terminal-cursor-changer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-terminal-cursor-changer";
           sha256 = "1300ch6f8mkz45na1hdffglhw0cdrrxmwnbd3g4m3sl5z4midian";
           name = "evil-terminal-cursor-changer";
         };
         packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-terminal-cursor-changer";
+          homepage = "https://melpa.org/#/evil-terminal-cursor-changer";
           license = lib.licenses.free;
         };
       }) {};
@@ -17514,13 +18219,13 @@
           sha256 = "1v4z2snllgg32cy8glv7xl0m9ib7rwi5ixgdydz1d0sx0z62jyhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-textobj-anyblock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-textobj-anyblock";
           sha256 = "03vk30s2wkcszcjxmh5ww39rihnag9cp678wdzq4bnqy0c6rnjwa";
           name = "evil-textobj-anyblock";
         };
         packageRequires = [ cl-lib evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-textobj-anyblock";
+          homepage = "https://melpa.org/#/evil-textobj-anyblock";
           license = lib.licenses.free;
         };
       }) {};
@@ -17535,13 +18240,13 @@
           sha256 = "0nff90v6d97n2xizvfz126ksrf7ngd5rp0j7k7lhbv0v5zcqgxiv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-textobj-column";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-textobj-column";
           sha256 = "13q3nawx05rn3k6kzq1889vxjznr454cib96pc9lmrq7h65lym2h";
           name = "evil-textobj-column";
         };
         packageRequires = [ emacs evil names ];
         meta = {
-          homepage = "http://melpa.org/#/evil-textobj-column";
+          homepage = "https://melpa.org/#/evil-textobj-column";
           license = lib.licenses.free;
         };
       }) {};
@@ -17556,34 +18261,34 @@
           sha256 = "00yfq8aflxvp2nnz7smgq0c5wlb7cips5irj8qs6193ixlkpffvx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-tutor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-tutor";
           sha256 = "1hvc2w5ykrgh62n4sxqqqcdk5sd7nmh6xzv4mir5vf9y2dgqcvsn";
           name = "evil-tutor";
         };
         packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-tutor";
+          homepage = "https://melpa.org/#/evil-tutor";
           license = lib.licenses.free;
         };
       }) {};
     evil-vimish-fold = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }:
     melpaBuild {
         pname = "evil-vimish-fold";
-        version = "20151006.2326";
+        version = "20160224.603";
         src = fetchFromGitHub {
           owner = "alexmurray";
           repo = "evil-vimish-fold";
-          rev = "d187a685d9610ec8159040c90030cb8ada4f54a5";
-          sha256 = "0m4ipz3x5k3gbyjgsnhl6rr4jvhqn61cyc1gmv0mkc2pbqqs1ijq";
+          rev = "ec7064f267b9ef04f6ed0a68490bf0f5cd026c32";
+          sha256 = "0cn5dzyaicrf63hyg9mbqlkza1rmz0qh0hx06nawvagmh5xpkbv4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-vimish-fold";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-vimish-fold";
           sha256 = "01wp4h97hjyzbpd7iighjj26m79499wp5pn8m4pa7v59f6r3sdk6";
           name = "evil-vimish-fold";
         };
         packageRequires = [ emacs evil vimish-fold ];
         meta = {
-          homepage = "http://melpa.org/#/evil-vimish-fold";
+          homepage = "https://melpa.org/#/evil-vimish-fold";
           license = lib.licenses.free;
         };
       }) {};
@@ -17598,34 +18303,34 @@
           sha256 = "07cmql8zsqz1qchq2mp3qybbay499dk1yglisig6jfddcmrbbggz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-visual-mark-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-visual-mark-mode";
           sha256 = "1qgr2dfhfz6imnlznicl7lplajd1s8wny7mlxs1bkms3xjcjfi48";
           name = "evil-visual-mark-mode";
         };
         packageRequires = [ dash evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-visual-mark-mode";
+          homepage = "https://melpa.org/#/evil-visual-mark-mode";
           license = lib.licenses.free;
         };
       }) {};
     evil-visualstar = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-visualstar";
-        version = "20150514.1610";
+        version = "20160222.1848";
         src = fetchFromGitHub {
           owner = "bling";
           repo = "evil-visualstar";
-          rev = "eb996eca0081b6e8bab70b2c0a86ef1c71087bf6";
-          sha256 = "11y2jrwbsw4fcx77zkhj1cn2hl1zcdqy00bv3mpbcrs03jywssrk";
+          rev = "06c053d8f7381f91c53311b1234872ca96ced752";
+          sha256 = "0mkbzw12fav945icibc2293m5haxqr3hzkyli2cf4ssk6yvn0x4c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-visualstar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-visualstar";
           sha256 = "135l9hjfbpn0a6p53picnpydi9qs5vrk2rfn64gxa5ag2apcyycy";
           name = "evil-visualstar";
         };
         packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-visualstar";
+          homepage = "https://melpa.org/#/evil-visualstar";
           license = lib.licenses.free;
         };
       }) {};
@@ -17640,13 +18345,13 @@
           sha256 = "0739v0m9vj70a55z0canslyqgafzys815i7a0r6bxj2f9iwq6rhb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evm";
           sha256 = "19l6cs5schbnph0pwhhj66gkxsswd4bmjpy79l9kxzpjf107wc03";
           name = "evm";
         };
         packageRequires = [ dash f ];
         meta = {
-          homepage = "http://melpa.org/#/evm";
+          homepage = "https://melpa.org/#/evm";
           license = lib.licenses.free;
         };
       }) {};
@@ -17661,13 +18366,13 @@
           sha256 = "1frhcgkiys0pqrlcsi5zcl3ngblr38wrwfi6wzqk75x21rnwnbqv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ewmctrl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ewmctrl";
           sha256 = "1w60pb7szai1kh06jd3qvgpzq3z1ci4a77ysnpqjfk326s6zv7hl";
           name = "ewmctrl";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ewmctrl";
+          homepage = "https://melpa.org/#/ewmctrl";
           license = lib.licenses.free;
         };
       }) {};
@@ -17682,13 +18387,13 @@
           sha256 = "1i6zf17rwa390c33cbspz81dz86vwlphyhjjsia4gp205nfk3s20";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eww-lnum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eww-lnum";
           sha256 = "1y745z4wa90snizq2g0amdwwgjafd6hkrayn93ca50f1wghdbk79";
           name = "eww-lnum";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/eww-lnum";
+          homepage = "https://melpa.org/#/eww-lnum";
           license = lib.licenses.free;
         };
       }) {};
@@ -17703,13 +18408,13 @@
           sha256 = "0xxk0cr28g7vw8cwsnwrdrc8xqr50g6m9h0v43mx2iws9pn9dd47";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/exec-path-from-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/exec-path-from-shell";
           sha256 = "1j6f52qs1m43878ikl6nplgb72pdbxfznkfn66wyzcfiz2hrvvm9";
           name = "exec-path-from-shell";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/exec-path-from-shell";
+          homepage = "https://melpa.org/#/exec-path-from-shell";
           license = lib.licenses.free;
         };
       }) {};
@@ -17724,13 +18429,13 @@
           sha256 = "0wz4h5hrr5ci0w8pynd2nr1b2zl5hl4pa8gc16mcabik5927rf7z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/expand-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/expand-line";
           sha256 = "07nfgp6jlrb9wxqy835j79i4g88714zndidkda84z16qn2y901a9";
           name = "expand-line";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/expand-line";
+          homepage = "https://melpa.org/#/expand-line";
           license = lib.licenses.free;
         };
       }) {};
@@ -17745,13 +18450,13 @@
           sha256 = "0qqqv0pp25xg1zh72i6fsb7l9vi14nd96rx0qdj1f3pdwfidqms1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/expand-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/expand-region";
           sha256 = "1c7f1nqsqdc75h22fxxnyg0m4yxj6l23sirk3c71fqj14paxqnwg";
           name = "expand-region";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/expand-region";
+          homepage = "https://melpa.org/#/expand-region";
           license = lib.licenses.free;
         };
       }) {};
@@ -17766,34 +18471,34 @@
           sha256 = "0ah8zayipwp760909llb9whcdvmbsdgkg0x5y4qlcicm1r9kwcc7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/express";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/express";
           sha256 = "0lhisy4ds96bwpc7k8w9ws1zi1qh0d36nhxsp36bqzfi09ig0nb9";
           name = "express";
         };
         packageRequires = [ string-utils ];
         meta = {
-          homepage = "http://melpa.org/#/express";
+          homepage = "https://melpa.org/#/express";
           license = lib.licenses.free;
         };
       }) {};
     extempore-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "extempore-mode";
-        version = "20160218.2301";
+        version = "20160323.134";
         src = fetchFromGitHub {
           owner = "extemporelang";
           repo = "extempore-emacs-mode";
-          rev = "7ef138c18abbe78fafdc7da71f73e323be88ac5a";
-          sha256 = "0vpxrwaghzffj3rhsvmia4ykj8z059gjxws5vkgjjffh35d72ask";
+          rev = "462989a184a182264b4b0e6b449264d0dcf4a913";
+          sha256 = "0sx3kywaqb8sgywqgcx9gllz8zm53pr5vp82vlv7aj5h93lxhxzh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/extempore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/extempore-mode";
           sha256 = "1z8nzpcj27s74kxfjz7wyr3848jpd6mbyjkssd06ri5p694j9php";
           name = "extempore-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/extempore-mode";
+          homepage = "https://melpa.org/#/extempore-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -17808,13 +18513,34 @@
           sha256 = "15dwl1rb3186k328a83dz9xmslc0px60ah16fifvmr3migis9hwz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/extend-dnd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/extend-dnd";
           sha256 = "0rknpvp8yw051pg3blvmjpp3c9a82jw7f10mq67ggbz98w227417";
           name = "extend-dnd";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/extend-dnd";
+          homepage = "https://melpa.org/#/extend-dnd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    exwm-x = callPackage ({ cl-lib ? null, dmenu, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, start-menu, switch-window }:
+    melpaBuild {
+        pname = "exwm-x";
+        version = "20160307.255";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "exwm-x";
+          rev = "cda2bc2b3b3347af34349e5f33d2d90f1ef27157";
+          sha256 = "1i9lklzg7fyi4rl0vv1lidx0shlhih0474bbjsvc74p19p5cmlrq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/exwm-x";
+          sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3";
+          name = "exwm-x";
+        };
+        packageRequires = [ cl-lib dmenu exwm start-menu switch-window ];
+        meta = {
+          homepage = "https://melpa.org/#/exwm-x";
           license = lib.licenses.free;
         };
       }) {};
@@ -17829,13 +18555,13 @@
           sha256 = "0w2g7rpw26j65j4r23w6j8nw3arw73l601kyy6qv9p9bkk1yc072";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eyebrowse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eyebrowse";
           sha256 = "09fkzm8z8nkr4s9fbmfcjc80h50051f48v6n14l76xicglr5p861";
           name = "eyebrowse";
         };
         packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/eyebrowse";
+          homepage = "https://melpa.org/#/eyebrowse";
           license = lib.licenses.free;
         };
       }) {};
@@ -17844,17 +18570,17 @@
         pname = "eyedropper";
         version = "20151231.1501";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/eyedropper.el";
+          url = "https://www.emacswiki.org/emacs/download/eyedropper.el";
           sha256 = "1fg3j0jlww2rqc6k2nq95hcg6i26nqdp043h7kyjcwrgqbjfsigl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eyedropper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eyedropper";
           sha256 = "07kdn90vm2nbdprw9hwdgi4py6gqzmrad09y1fwqdy49hrvbwdzk";
           name = "eyedropper";
         };
         packageRequires = [ hexrgb ];
         meta = {
-          homepage = "http://melpa.org/#/eyedropper";
+          homepage = "https://melpa.org/#/eyedropper";
           license = lib.licenses.free;
         };
       }) {};
@@ -17869,13 +18595,13 @@
           sha256 = "1rgzydxv7c455vj1jm44vvs6xc4qgivqqb0g6zh5x4wdcpgdi2g9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eyuml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eyuml";
           sha256 = "0ada2gcl8bw9nn0fz8g9lbqy8a8w1554q03fzd7lv8qla33ri3wx";
           name = "eyuml";
         };
         packageRequires = [ request s ];
         meta = {
-          homepage = "http://melpa.org/#/eyuml";
+          homepage = "https://melpa.org/#/eyuml";
           license = lib.licenses.free;
         };
       }) {};
@@ -17890,34 +18616,34 @@
           sha256 = "15qa09x206s7rxmk35rslqniydh6hdb3n2kbspm5zrndcmsqz4zi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ez-query-replace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ez-query-replace";
           sha256 = "1h9ijr1qagwp9vvikh7ajby0dqgfypjgc45s7d93zb9jrg2n5cgx";
           name = "ez-query-replace";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/ez-query-replace";
+          homepage = "https://melpa.org/#/ez-query-replace";
           license = lib.licenses.free;
         };
       }) {};
     f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "f";
-        version = "20151113.323";
+        version = "20160426.727";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "f.el";
-          rev = "e0259ee060ff9a3f12204adcc8630869080acd68";
-          sha256 = "0lzqfr5xgc3qvpbs6vf63yiw7pc2mybfvsrhczf9ghlmlawqa6k1";
+          rev = "de85171132fc0d3bdb8ca9264845b478e28c7b81";
+          sha256 = "0v6y897ibs589gry7xrs1vj14h9qd6riach6r27xf7386ji5hb6s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/f";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/f";
           sha256 = "0s7fqav0dc9g4y5kqjjyqjs90gi34cahaxyx2s0kf9fwcgn23ja2";
           name = "f";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/f";
+          homepage = "https://melpa.org/#/f";
           license = lib.licenses.free;
         };
       }) {};
@@ -17932,13 +18658,13 @@
           sha256 = "0crhkdbxz1ldbrvppi95g005ni5zg99z1271rkrnk5i6cvc4hlq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fabric";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fabric";
           sha256 = "1mkblsakdhvi10b67bv3j0jsf7hr8lf9sibmprvx8smqsih7l88m";
           name = "fabric";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fabric";
+          homepage = "https://melpa.org/#/fabric";
           license = lib.licenses.free;
         };
       }) {};
@@ -17946,17 +18672,17 @@
         pname = "face-remap-plus";
         version = "20151231.1502";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/face-remap+.el";
+          url = "https://www.emacswiki.org/emacs/download/face-remap+.el";
           sha256 = "0yr3fqpn9pj6y8bsb6g7hkg75sl703pzngn8gp0sgs3v90c180l5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/face-remap+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/face-remap+";
           sha256 = "0vq6xjrv3qic89pxzi6mx1s08k4ba27g8wqm1ap4fxh3l14wkg0y";
           name = "face-remap-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/face-remap+";
+          homepage = "https://melpa.org/#/face-remap+";
           license = lib.licenses.free;
         };
       }) {};
@@ -17964,17 +18690,17 @@
         pname = "facemenu-plus";
         version = "20151231.1505";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/facemenu+.el";
+          url = "https://www.emacswiki.org/emacs/download/facemenu+.el";
           sha256 = "1kayc4hsalvqnn577y3f97w9kz94c53vcxwx01s0k34ffav919c2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/facemenu+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/facemenu+";
           sha256 = "0lbggalgkj59wj67z95949jmppmqrzrp63mdhw42r2x0fz1ir0iv";
           name = "facemenu-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/facemenu+";
+          homepage = "https://melpa.org/#/facemenu+";
           license = lib.licenses.free;
         };
       }) {};
@@ -17982,17 +18708,17 @@
         pname = "faces-plus";
         version = "20151231.1505";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/faces+.el";
+          url = "https://www.emacswiki.org/emacs/download/faces+.el";
           sha256 = "0sqrymmr583cgqmv4bs6rjms5ij5cm8vvxjrfc9alacwyz5f7w8m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/faces+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/faces+";
           sha256 = "0k3m434f3d3061pvir0dnykmv6r9jswl7pzybzja3afiy591hh92";
           name = "faces-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/faces+";
+          homepage = "https://melpa.org/#/faces+";
           license = lib.licenses.free;
         };
       }) {};
@@ -18007,13 +18733,13 @@
           sha256 = "0sjmjydapfnv979dx8dwiz67wffamiaf41s4skkwa0wn2h4p6wja";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/faceup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/faceup";
           sha256 = "0l41xp38iji55dv20lk7r187ywcz8s1g2jmwbjwkspzmcf763xvx";
           name = "faceup";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/faceup";
+          homepage = "https://melpa.org/#/faceup";
           license = lib.licenses.free;
         };
       }) {};
@@ -18028,34 +18754,34 @@
           sha256 = "19zm9my7fl1r3q48axjv2f8x9hcjk6qah4y4r92b90bzfmcdc30y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/factlog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/factlog";
           sha256 = "163482vfpa52b5ya5xps4qnclbaql1x0q54gqdwwmm04as8qbfz7";
           name = "factlog";
         };
         packageRequires = [ deferred ];
         meta = {
-          homepage = "http://melpa.org/#/factlog";
+          homepage = "https://melpa.org/#/factlog";
           license = lib.licenses.free;
         };
       }) {};
     faff-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "faff-theme";
-        version = "20151027.717";
+        version = "20160424.1052";
         src = fetchFromGitHub {
           owner = "WJCFerguson";
           repo = "emacs-faff-theme";
-          rev = "8ec2bee09b386c711b0753ab12ace926d06fca7e";
-          sha256 = "1sc5f867h7i0n2gd9qcydqn1b2pk227l92ad4bf9nnpl3jmdr26v";
+          rev = "66d67b355c8be03483fbf4519daff698870cb165";
+          sha256 = "1iv9xnpylw2mw18993yy5s9bkxs1rjrn4q92b1wvrx1n51kcw2ny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/faff-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/faff-theme";
           sha256 = "1dmwbkp94zsddy0brs3mkdjr09n69maw2mrdfhriqcdk56qpwp4g";
           name = "faff-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/faff-theme";
+          homepage = "https://melpa.org/#/faff-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -18070,13 +18796,13 @@
           sha256 = "11fm0h9rily5731s137mgv8rdbfqi99s6f36bgr0arwbq3f2j3fs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fakespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fakespace";
           sha256 = "09dsmrqax4wfcw8fd5jf07bjxm5dizpc2qvjkqwg74j2n352wv27";
           name = "fakespace";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fakespace";
+          homepage = "https://melpa.org/#/fakespace";
           license = lib.licenses.free;
         };
       }) {};
@@ -18091,13 +18817,13 @@
           sha256 = "1w5apzbzr1jd983b0rzsy9ldb0z0zcq6mpyb5r8czl5wd4vvj69h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fakir";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fakir";
           sha256 = "07bicglgpm6qkcsxwj6rswhx4hgh27rfg8s1cki7g8qcvk2f7b25";
           name = "fakir";
         };
         packageRequires = [ dash kv noflet ];
         meta = {
-          homepage = "http://melpa.org/#/fakir";
+          homepage = "https://melpa.org/#/fakir";
           license = lib.licenses.free;
         };
       }) {};
@@ -18112,13 +18838,13 @@
           sha256 = "0m7rjzl9js2gjfcaqp2n5pn5ykpqnv8qfv35l5m5kpfigsi9cbb0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fancy-battery";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fancy-battery";
           sha256 = "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii";
           name = "fancy-battery";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/fancy-battery";
+          homepage = "https://melpa.org/#/fancy-battery";
           license = lib.licenses.free;
         };
       }) {};
@@ -18133,13 +18859,13 @@
           sha256 = "0825hyz8b2biil0pd2bgjxqd2zm3gw9si7br5hnh51qasbaw9hid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fancy-narrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fancy-narrow";
           sha256 = "15i86jz6rdpva1az7gqp1wbm8kispcfc8h6v9fqsbag9sbzvgcyv";
           name = "fancy-narrow";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fancy-narrow";
+          homepage = "https://melpa.org/#/fancy-narrow";
           license = lib.licenses.free;
         };
       }) {};
@@ -18154,13 +18880,13 @@
           sha256 = "08lgfa2k42qpcs4999b77ycsg76zb56qbcxbsvmg0pcwjwa1ambz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/farmhouse-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/farmhouse-theme";
           sha256 = "0hbqdrw6x25b331qhbg3yaaa45c2b896wknsjm0a1kg142klq229";
           name = "farmhouse-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/farmhouse-theme";
+          homepage = "https://melpa.org/#/farmhouse-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -18175,13 +18901,13 @@
           sha256 = "0m2qn3rd16s7ahyw6f9a4jb73sdc8bqp6d03p450yzcn36lw78z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fasd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fasd";
           sha256 = "0i49z50bpi7fx0dm5jywlndnq9hb0dm5a906k4017w8y7sfpfl6c";
           name = "fasd";
         };
         packageRequires = [ grizzl ];
         meta = {
-          homepage = "http://melpa.org/#/fasd";
+          homepage = "https://melpa.org/#/fasd";
           license = lib.licenses.free;
         };
       }) {};
@@ -18196,13 +18922,13 @@
           sha256 = "0y95lrdqd9i2kbb266s1wdiim4m8vrn3br19d8s55ib6xlywf8cx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fastnav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fastnav";
           sha256 = "08hg256w8k9f5nzgpyl1jykbf28vmvv09kkhzs0s2zhwbl2158a5";
           name = "fastnav";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fastnav";
+          homepage = "https://melpa.org/#/fastnav";
           license = lib.licenses.free;
         };
       }) {};
@@ -18217,34 +18943,34 @@
           sha256 = "0m9nzl0z3gc6fjpfqklwrsxlcgbbyydls004a39wfppyz0wr94fy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/faust-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/faust-mode";
           sha256 = "1lfn4q1wcc3vzazv2yzcnpvnmq6bqcczq8lpkz7w8yj8i5kpjvsc";
           name = "faust-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/faust-mode";
+          homepage = "https://melpa.org/#/faust-mode";
           license = lib.licenses.free;
         };
       }) {};
     fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fcitx";
-        version = "20160209.2240";
+        version = "20160422.1244";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "fcitx.el";
-          rev = "f0a6d309de52893331c002fdc69b937abe9a4831";
-          sha256 = "0xknl32hglmkj85h69cpwqpar589ylfzr3mxx730fy2gkaqzd2nf";
+          rev = "550b410cbaf2aca72d29b9549c66c7ee12836478";
+          sha256 = "01942hw783v2fzvx76pz03855jsax8c5x6bxp6kf59fnq7hs4sqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fcitx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fcitx";
           sha256 = "0a8wd588c26p3czfp5hn2n46f2vwyg5v301sv0y07b55b1i3ynmx";
           name = "fcitx";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fcitx";
+          homepage = "https://melpa.org/#/fcitx";
           license = lib.licenses.free;
         };
       }) {};
@@ -18259,13 +18985,13 @@
           sha256 = "0c56j8ip2fyma9yvwaanz89jyzgi9k11xwwkflzlzc4smnvgfibr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fcopy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fcopy";
           sha256 = "13337ymf8vlbk8c4jpj6paqi06xdmk39yf72s40kmfrbvgmi8qy1";
           name = "fcopy";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fcopy";
+          homepage = "https://melpa.org/#/fcopy";
           license = lib.licenses.free;
         };
       }) {};
@@ -18280,13 +19006,13 @@
           sha256 = "0ylm4zcf82f5rl4lps5p6p8dc3i5p2v7w93caadgzv5qbl400h5d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/feature-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/feature-mode";
           sha256 = "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg";
           name = "feature-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/feature-mode";
+          homepage = "https://melpa.org/#/feature-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -18301,31 +19027,55 @@
           sha256 = "0pjw9fb3n08yd38680ifdn2wlnw2k6q97lzhqb2259mywsycyqy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fetch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fetch";
           sha256 = "1jqc6pspgcrdzm7ij46r1q6vpjq7il5dy2xyxwn2c1ky5a80paby";
           name = "fetch";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fetch";
+          homepage = "https://melpa.org/#/fetch";
           license = lib.licenses.free;
         };
       }) {};
-    fic-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    fic-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "fic-mode";
-        version = "20140421.1122";
-        src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/fic-mode.el";
-          sha256 = "110h0ff7bkwx7icph0j997hq53zpyz426dji4vs89zf75cf1nl7s";
+        version = "20160209.1211";
+        src = fetchFromGitHub {
+          owner = "lewang";
+          repo = "fic-mode";
+          rev = "8182f5be875fdefc5bd7142ab45adea89ac20705";
+          sha256 = "06xd5rvn037g1kjdw7aa1n71i1mpnp4qz3a7wcmzbls0amhhnx1m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fic-mode";
-          sha256 = "037f2jr8bs2sfxw28cal2d49bsbrg0zkz2xdham627l04qnkgv8x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fic-mode";
+          sha256 = "0yy1zw0b0s93qkzyq0n17gzn33ma5h56mh40ysz6adwsi68af84c";
           name = "fic-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fic-mode";
+          homepage = "https://melpa.org/#/fic-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fifo-class = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fifo-class";
+        version = "20160425.58";
+        src = fetchFromGitHub {
+          owner = "mola-T";
+          repo = "fifo-class";
+          rev = "8fe4cf690727f4ac7b67f29c55f845df023c3f21";
+          sha256 = "0dkng4zkd5xdyvqy67bnfp4z6w8byx66bssq1zl7bhga45vihfjg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fifo-class";
+          sha256 = "0yyjrvdjiq5166vrys13c3dqy5807a3x99597iw5v6mcxg37jg3h";
+          name = "fifo-class";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/fifo-class";
           license = lib.licenses.free;
         };
       }) {};
@@ -18338,13 +19088,13 @@
           sha256 = "1c18b1h154sdxkksqwk8snyk8n43bwzgavi75l8mnz8dnl1ciaxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/figlet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/figlet";
           sha256 = "1m7hw56awdbvgzdnjysb3wqkhkjqy68jxsxh9f7fx266wjqhp6yj";
           name = "figlet";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/figlet";
+          homepage = "https://melpa.org/#/figlet";
           license = lib.licenses.free;
         };
       }) {};
@@ -18352,17 +19102,17 @@
         pname = "files-plus";
         version = "20151231.1507";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/files+.el";
+          url = "https://www.emacswiki.org/emacs/download/files+.el";
           sha256 = "0s79b5jj3jfl3aih6r3fa0zix40arysk6mz4fijapd8ybaflz25n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/files+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/files+";
           sha256 = "1m1pxf6knrnyc9ygmyr27gm709ydxf0kkh1xrfcza6n476frmwr8";
           name = "files-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/files+";
+          homepage = "https://melpa.org/#/files+";
           license = lib.licenses.free;
         };
       }) {};
@@ -18370,17 +19120,17 @@
         pname = "filesets-plus";
         version = "20151231.1508";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/filesets+.el";
+          url = "https://www.emacswiki.org/emacs/download/filesets+.el";
           sha256 = "020rpjrjp2gh4w6mrphrvk27kdizfqbjsw2sxraf8jz0dibg9gfg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/filesets+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/filesets+";
           sha256 = "06n8pw8c65bmrkxda2akvv57ndfijgbp95l40j7sjg8bjp385spn";
           name = "filesets-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/filesets+";
+          homepage = "https://melpa.org/#/filesets+";
           license = lib.licenses.free;
         };
       }) {};
@@ -18395,13 +19145,13 @@
           sha256 = "0gbqspqn4y7f2fwqq8210b6k5q22c0zr7b4ws8qgz9swav8g3vrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fill-column-indicator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fill-column-indicator";
           sha256 = "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma";
           name = "fill-column-indicator";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fill-column-indicator";
+          homepage = "https://melpa.org/#/fill-column-indicator";
           license = lib.licenses.free;
         };
       }) {};
@@ -18416,13 +19166,13 @@
           sha256 = "1x9wmxbcmd6qgdyzrl978nczfqrgyk6xz3rnh5hffbapy1v1rw47";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fillcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fillcode";
           sha256 = "0bfsw55vjhx88jpy6npnzfwinvggivbvkk7fa3iwzq19005fkag2";
           name = "fillcode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fillcode";
+          homepage = "https://melpa.org/#/fillcode";
           license = lib.licenses.free;
         };
       }) {};
@@ -18437,13 +19187,13 @@
           sha256 = "0f76cgh97z0rbbg2bp217nqmxfimzkvw85k9mx8bj78i9s2cdmwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/finalize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/finalize";
           sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq";
           name = "finalize";
         };
         packageRequires = [ cl-lib eieio emacs ];
         meta = {
-          homepage = "http://melpa.org/#/finalize";
+          homepage = "https://melpa.org/#/finalize";
           license = lib.licenses.free;
         };
       }) {};
@@ -18458,52 +19208,52 @@
           sha256 = "18a4ydp30ycx5w80j3xgghclzmzbvrkl2awxixy4aj68nmljk480";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/find-by-pinyin-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/find-by-pinyin-dired";
           sha256 = "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq";
           name = "find-by-pinyin-dired";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/find-by-pinyin-dired";
+          homepage = "https://melpa.org/#/find-by-pinyin-dired";
           license = lib.licenses.free;
         };
       }) {};
     find-dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "find-dired-plus";
-        version = "20151231.1510";
+        version = "20160325.1606";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/find-dired+.el";
-          sha256 = "1pch1kjbgnbf8zmlxh6wg4ch9bpfg7hmwkw1mrr1hiym05xvza0m";
+          url = "https://www.emacswiki.org/emacs/download/find-dired+.el";
+          sha256 = "19da93v605db8jfkl9j2rl8vxzlxl9lr5f07pl5xjq108mrkwr7i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/find-dired+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/find-dired+";
           sha256 = "06a6lwx61xindlchh3ps8khhxc6sr7i9d7i60rjw1h07nxmh0fli";
           name = "find-dired-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/find-dired+";
+          homepage = "https://melpa.org/#/find-dired+";
           license = lib.licenses.free;
         };
       }) {};
     find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "find-file-in-project";
-        version = "20151216.2050";
+        version = "20160405.130";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "908cc56c0fd715001da4d97b30cba5eb7af3a609";
-          sha256 = "0bf32nhpmjvvgnr6g9xqh8pqnhr3dl24y3g40lsv4pc8ffs70ydm";
+          rev = "b89910f133d7ffbd00a164b675828609d335ee40";
+          sha256 = "1ddy7797br58zqn9fgm8r25ikm24f7768iq73531wzck9k5z59qj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/find-file-in-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/find-file-in-project";
           sha256 = "0aznnv82xhnilc9j4cdmcgh6ksv7bhjjm3pa76hynnyrfn7kq7wy";
           name = "find-file-in-project";
         };
         packageRequires = [ emacs swiper ];
         meta = {
-          homepage = "http://melpa.org/#/find-file-in-project";
+          homepage = "https://melpa.org/#/find-file-in-project";
           license = lib.licenses.free;
         };
       }) {};
@@ -18518,13 +19268,13 @@
           sha256 = "090m5647dpc8r8fwi3mszvc8kp0420ma5sv0lmqr2fpxyn9ybkjh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/find-file-in-repository";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/find-file-in-repository";
           sha256 = "0q1ym06w2yn3nzpj018dj6h68f7rmkxczyl061mirjp8z9c6a9q6";
           name = "find-file-in-repository";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/find-file-in-repository";
+          homepage = "https://melpa.org/#/find-file-in-repository";
           license = lib.licenses.free;
         };
       }) {};
@@ -18539,13 +19289,13 @@
           sha256 = "1d6zn3qsg4lpk13cvn5r1w88dnhfydnhwf59x6cb4sy5q1ihk0g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/find-temp-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/find-temp-file";
           sha256 = "0c98zm94958rb9kdvqr3pad744nh63y3vy3lshfm0lsg85k9j62p";
           name = "find-temp-file";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/find-temp-file";
+          homepage = "https://melpa.org/#/find-temp-file";
           license = lib.licenses.free;
         };
       }) {};
@@ -18560,13 +19310,13 @@
           sha256 = "1r6cs7p43pi6n2inbrv9q924m679izxwxqgyr4sjjj3lg6an4cnx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/find-things-fast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/find-things-fast";
           sha256 = "1fs3wf61lzm1hxh5sx8pr74g7g9np3npdwg7xmk81b5f2jx2vy6m";
           name = "find-things-fast";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/find-things-fast";
+          homepage = "https://melpa.org/#/find-things-fast";
           license = lib.licenses.free;
         };
       }) {};
@@ -18574,17 +19324,17 @@
         pname = "finder-plus";
         version = "20151231.1513";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/finder+.el";
+          url = "https://www.emacswiki.org/emacs/download/finder+.el";
           sha256 = "0x3f9qygp26c4yw32cgyy35bb4f1fq0fg7q8s9vs777skyl3rvp4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/finder+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/finder+";
           sha256 = "1ichxghp2vzx01n129fmjm6iwx4b98ay3xk1ja1i8vzyd2p0z8vh";
           name = "finder-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/finder+";
+          homepage = "https://melpa.org/#/finder+";
           license = lib.licenses.free;
         };
       }) {};
@@ -18592,17 +19342,17 @@
         pname = "findr";
         version = "20130824.707";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/findr.el";
+          url = "https://www.emacswiki.org/emacs/download/findr.el";
           sha256 = "0a04mgya59w468jv2bmkqlayzgh0r8sdz0qg3n70wn9rhdcwnl9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/findr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/findr";
           sha256 = "0pxyfnn3f70gknxv09mfkjixqkzn77rdbql703wsslrj2v1l7bfq";
           name = "findr";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/findr";
+          homepage = "https://melpa.org/#/findr";
           license = lib.licenses.free;
         };
       }) {};
@@ -18617,13 +19367,13 @@
           sha256 = "1vjgcxyzv2p74igr3y0z6hk7bj6yqwjawx90xvvmp9z7m91d4yrg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fingers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fingers";
           sha256 = "1r8fy6q6isjxz9mvaa8in4imdghzla3gg1l93dfm1v2rlr7bhzbg";
           name = "fingers";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fingers";
+          homepage = "https://melpa.org/#/fingers";
           license = lib.licenses.free;
         };
       }) {};
@@ -18632,19 +19382,19 @@
         pname = "fiplr";
         version = "20140724.145";
         src = fetchFromGitHub {
-          owner = "d11wtq";
+          owner = "grizzl";
           repo = "fiplr";
           rev = "bb6b90ba3c558988c195048c4c40140b2ee17530";
           sha256 = "14yy7kr2iv549xaf5gkav48lk2hzmvipwbs0rzljzw60il6k05hk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fiplr";
-          sha256 = "0l68rl5cy2maynny6iq6c4qr6c99y44i0i1z613k9rk08z7h0k5i";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fiplr";
+          sha256 = "1a4w0yqdkz477lfyin4lb9k9qkfpx4350kfxmrqx6dj3aadkikca";
           name = "fiplr";
         };
         packageRequires = [ cl-lib grizzl ];
         meta = {
-          homepage = "http://melpa.org/#/fiplr";
+          homepage = "https://melpa.org/#/fiplr";
           license = lib.licenses.free;
         };
       }) {};
@@ -18659,13 +19409,13 @@
           sha256 = "02ajday0lnk37dnzf4747ha3w0azisq35fmdhq322hx0hfb1c66x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/firebelly-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/firebelly-theme";
           sha256 = "0lns846l70wcrzqb6p5cy5hpd0szh4gvjxd4xq4zsb0z5nfz97jr";
           name = "firebelly-theme";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/firebelly-theme";
+          homepage = "https://melpa.org/#/firebelly-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -18680,34 +19430,34 @@
           sha256 = "0v8liv6aq10f8dxbl3d4rph1qk891dlxm9wqdc6w8aj318750hfm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/firecode-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/firecode-theme";
           sha256 = "10lxd93lkrvz8884dv4sh6fzzg355j7ab4p5dpvwry79rhs7f739";
           name = "firecode-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/firecode-theme";
+          homepage = "https://melpa.org/#/firecode-theme";
           license = lib.licenses.free;
         };
       }) {};
     firefox-controller = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, moz, popwin }:
     melpaBuild {
         pname = "firefox-controller";
-        version = "20160125.1721";
+        version = "20160320.1347";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "emacs-firefox-controller";
-          rev = "0282bccb8ef7edcacb54a4991cc2c51bfdbf04a7";
-          sha256 = "1hr4mfvaz8rc60fn5xi7sp1xn72rk2fg346di3mmcfnb9na9cbzq";
+          rev = "5b1bedec83206f41672b1b65bba859f235bff48b";
+          sha256 = "04afwxgydrn23bv93zqf9bd2cp02i9dcfqbi809arkmh8723qf6k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/firefox-controller";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/firefox-controller";
           sha256 = "03y96b3l75w9al8ylijnlb8pcfkwddyfnh8xwig1b6k08zxfgal6";
           name = "firefox-controller";
         };
         packageRequires = [ cl-lib moz popwin ];
         meta = {
-          homepage = "http://melpa.org/#/firefox-controller";
+          homepage = "https://melpa.org/#/firefox-controller";
           license = lib.licenses.free;
         };
       }) {};
@@ -18722,34 +19472,34 @@
           sha256 = "1smg4mqc5qdwzk5mp2hfm6l4s7k408x46xfl7fl45csb18islmrp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fireplace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fireplace";
           sha256 = "1apcypznq23fc7xgy4xy1c5hvfvjx1xhyq3aaq1lf59v99zchciw";
           name = "fireplace";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fireplace";
+          homepage = "https://melpa.org/#/fireplace";
           license = lib.licenses.free;
         };
       }) {};
     firestarter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "firestarter";
-        version = "20151213.815";
+        version = "20160318.1542";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "firestarter";
-          rev = "4b7428477980e12578ebbbb121115696b352d6b2";
-          sha256 = "0s8rml5xbskvnjpi8qp7vqflxhh5yis6zr6ay2bxmd2chjlhli55";
+          rev = "e40af9b4ff53e5d2eccbce66159cffd5f2481edd";
+          sha256 = "0ssx3qjv600n8x83g34smphiyywgl97dh4wx8kzm9pp42jnp29cj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/firestarter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/firestarter";
           sha256 = "1cpx664hyrdnpb1jps1x6lm7idwlfjblkfygj48cjz9pzd6ld5mp";
           name = "firestarter";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/firestarter";
+          homepage = "https://melpa.org/#/firestarter";
           license = lib.licenses.free;
         };
       }) {};
@@ -18764,13 +19514,13 @@
           sha256 = "17djaz79spms9il71m4xdfjhm58dzswb6fpncngkgx8kxvcy9y24";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fish-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fish-mode";
           sha256 = "0l6k06bs0qdhj3h8vf5fv8c3rbhiqfwszrpb0v2cgnb6xhwzmq14";
           name = "fish-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/fish-mode";
+          homepage = "https://melpa.org/#/fish-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -18778,17 +19528,17 @@
         pname = "fit-frame";
         version = "20151231.1514";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/fit-frame.el";
+          url = "https://www.emacswiki.org/emacs/download/fit-frame.el";
           sha256 = "082c6yyb1269va6k602hxpdf7ylfxz8gq8swqzwf07qaas0b5qxd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fit-frame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fit-frame";
           sha256 = "1xcq4n9gj0npjjl98vqacms0a0wnzw62a9iplyf7bgj7n77pgkjb";
           name = "fit-frame";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fit-frame";
+          homepage = "https://melpa.org/#/fit-frame";
           license = lib.licenses.free;
         };
       }) {};
@@ -18803,13 +19553,13 @@
           sha256 = "16rd23ygh76fs4i7rni94k8gwa9n360h40qmhm65snp31kqnpr1p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fix-input";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fix-input";
           sha256 = "03xpr7rlv0xq1d9126j1fk0c2j7ssf366n0yc8yzm9vq32n9pp4p";
           name = "fix-input";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/fix-input";
+          homepage = "https://melpa.org/#/fix-input";
           license = lib.licenses.free;
         };
       }) {};
@@ -18824,13 +19574,13 @@
           sha256 = "17f11v9sd5fay3i4k6lmpsjicdw9j3zvx3fvhx0a86mp7ay2ywwf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fix-word";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fix-word";
           sha256 = "0a8w09cx8p5pkkd4533nd199axkhdhs2a7blp7syfn40bkscx6xc";
           name = "fix-word";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/fix-word";
+          homepage = "https://melpa.org/#/fix-word";
           license = lib.licenses.free;
         };
       }) {};
@@ -18845,7 +19595,7 @@
           sha256 = "1x4k8890pzdcizzl0p6v96ylrx5xid9ykgrmggx0b3y0gx0vhwic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fixmee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fixmee";
           sha256 = "0wnp6h8f547fsi1lkk4ajny7g21dnr76qfhxl82n0l5h1ps4w8mp";
           name = "fixmee";
         };
@@ -18858,7 +19608,7 @@
           tabulated-list
         ];
         meta = {
-          homepage = "http://melpa.org/#/fixmee";
+          homepage = "https://melpa.org/#/fixmee";
           license = lib.licenses.free;
         };
       }) {};
@@ -18873,13 +19623,13 @@
           sha256 = "07hv6l80ka10qszm16fpan8sas4b0qvl5s6qixxlz02fm7m0s7m5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flappymacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flappymacs";
           sha256 = "0dcpl5n7wwsk62ddgfrkq5dkm91569y4i4f0yqa61pdmzhgllx7d";
           name = "flappymacs";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/flappymacs";
+          homepage = "https://melpa.org/#/flappymacs";
           license = lib.licenses.free;
         };
       }) {};
@@ -18894,13 +19644,13 @@
           sha256 = "0z77lm6jv2w5z551pwarcx6xg9kx8fgms9dlskngfvnzbqkldj1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flash-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flash-region";
           sha256 = "1rgg7j34ka0nj1yjl688asim07bbz4aavh67kly6dzzwndr0nw8c";
           name = "flash-region";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/flash-region";
+          homepage = "https://melpa.org/#/flash-region";
           license = lib.licenses.free;
         };
       }) {};
@@ -18915,13 +19665,13 @@
           sha256 = "0ib6r6q4wbkkxdwgqsd25nx7ccxhk16lqkvwikign80j9n11g7s1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flatland-black-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flatland-black-theme";
           sha256 = "0cl2qbry56nb4prbsczffx8h35x91pgicw5pld0ndw3pxid9h2da";
           name = "flatland-black-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/flatland-black-theme";
+          homepage = "https://melpa.org/#/flatland-black-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -18936,13 +19686,13 @@
           sha256 = "0cl8m1i1aaw4zmkrkhfchhp0gxhpvhcmpjglsisjni47y5mydypf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flatland-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flatland-theme";
           sha256 = "14drqwcp9nv269aqm34d426a7gx1a7kr9ygnqa2c8ia1fsizybl3";
           name = "flatland-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/flatland-theme";
+          homepage = "https://melpa.org/#/flatland-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -18957,13 +19707,13 @@
           sha256 = "0j8pklgd2sk01glgkr24b5n5521425vws8zwdi4sxcv74922j5zr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flatui-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flatui-theme";
           sha256 = "0s88xihw44ks4b07wcb9swr52f3l1ls0jn629mxvfkv4a6hn7rmz";
           name = "flatui-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/flatui-theme";
+          homepage = "https://melpa.org/#/flatui-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -18978,13 +19728,13 @@
           sha256 = "187ah7yhmr3ckw23bf4fivx8v79yj0zmilrkjj7k6l198w8wmvql";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flex-autopair";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flex-autopair";
           sha256 = "0hphrqwryp3c0wwyf2f16hj8nc7jlg2dkvljgm2rdvmh2kgj3007";
           name = "flex-autopair";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/flex-autopair";
+          homepage = "https://melpa.org/#/flex-autopair";
           license = lib.licenses.free;
         };
       }) {};
@@ -18998,34 +19748,34 @@
           sha256 = "02z1w8z9fqdshyyf03c26zjwhmmclb02caw3b6nhhk4w1rkbh6is";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flex-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flex-isearch";
           sha256 = "1msgrimi2a0xm5h23p78jflh00bl5bx44xpc3sc9pspznjv1d0k3";
           name = "flex-isearch";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/flex-isearch";
+          homepage = "https://melpa.org/#/flex-isearch";
           license = lib.licenses.free;
         };
       }) {};
     flim = callPackage ({ apel, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flim";
-        version = "20151213.150";
+        version = "20160311.1737";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "flim";
-          rev = "60fa2c74a72358658603480addc75b1d23f6431a";
-          sha256 = "1w913kw4b3dipawn567847jxl89j0prnf6656yqi2rp96axx3lhp";
+          rev = "96fb2de481f5fa543f730f370042e94bc7152e13";
+          sha256 = "10sayqyf5jwmz7h9gpp4657v6v8vmcd8ahzbshwwqbakjqwnn08c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flim";
           sha256 = "1gkaq549svflx8qyqrk0ccb52b7wp17wmd5jgzkw1109bpc4k6jc";
           name = "flim";
         };
         packageRequires = [ apel ];
         meta = {
-          homepage = "http://melpa.org/#/flim";
+          homepage = "https://melpa.org/#/flim";
           license = lib.licenses.free;
         };
       }) {};
@@ -19033,38 +19783,38 @@
         pname = "fliptext";
         version = "20131113.2018";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/fliptext.el";
+          url = "https://www.emacswiki.org/emacs/download/fliptext.el";
           sha256 = "1viigj04kla20dk46xm913jzqrmx05rpjrpghnc0ylbqppqdwzpw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fliptext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fliptext";
           sha256 = "0cmyan9hckjsv5wk1mvjzif9nrc07frhzkhhl6pkgm0j0f1q30ji";
           name = "fliptext";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fliptext";
+          homepage = "https://melpa.org/#/fliptext";
           license = lib.licenses.free;
         };
       }) {};
     floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "floobits";
-        version = "20160111.2348";
+        version = "20160307.1904";
         src = fetchFromGitHub {
           owner = "Floobits";
           repo = "floobits-emacs";
-          rev = "9c052942524169c1ba98e644ccbeaea583275530";
-          sha256 = "12b1b7avjdbfm184mcg3bh3s6k0ygfz1sraz8q7qnrsyw4170893";
+          rev = "87ae6b1257f7c2ae91b100920b03363dd26d7dd9";
+          sha256 = "10irvd9bi25fbx66dlc3v6zcqznng0aqcdb8656cz0qx7hrz56pw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/floobits";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/floobits";
           sha256 = "1jpk0q4mkf9ag1rqyai993nz5ngzfvxq9n9avmaaq59gkk9cjraf";
           name = "floobits";
         };
         packageRequires = [ highlight json ];
         meta = {
-          homepage = "http://melpa.org/#/floobits";
+          homepage = "https://melpa.org/#/floobits";
           license = lib.licenses.free;
         };
       }) {};
@@ -19075,17 +19825,17 @@
         src = fetchFromGitHub {
           owner = "lewang";
           repo = "flx";
-          rev = "807d69455585d89804ecef233a9462db7d0524d8";
-          sha256 = "10f9135i9z2y4k0x6fbwm0g6vhsj6ag41xq504zpygqzp6y6ikmz";
+          rev = "ae0981b253b17b52dec666e2f739f889e7952291";
+          sha256 = "0csflhd69vz3wwq5j7872xx2l62hwiz1f5nggl5nz7h7v9anjx3r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flx";
           sha256 = "04plfhrnw7jx2jaxhbhw4ypydfcb8v0x2m5hyacvrli1mca2iyf9";
           name = "flx";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/flx";
+          homepage = "https://melpa.org/#/flx";
           license = lib.licenses.free;
         };
       }) {};
@@ -19096,17 +19846,17 @@
         src = fetchFromGitHub {
           owner = "lewang";
           repo = "flx";
-          rev = "807d69455585d89804ecef233a9462db7d0524d8";
-          sha256 = "10f9135i9z2y4k0x6fbwm0g6vhsj6ag41xq504zpygqzp6y6ikmz";
+          rev = "ae0981b253b17b52dec666e2f739f889e7952291";
+          sha256 = "0csflhd69vz3wwq5j7872xx2l62hwiz1f5nggl5nz7h7v9anjx3r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flx-ido";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flx-ido";
           sha256 = "00wcwbvfjbcx8kyap7rl1b6nsgqdwjzlpv6al2cdpdd19rm1vgdc";
           name = "flx-ido";
         };
         packageRequires = [ cl-lib flx ];
         meta = {
-          homepage = "http://melpa.org/#/flx-ido";
+          homepage = "https://melpa.org/#/flx-ido";
           license = lib.licenses.free;
         };
       }) {};
@@ -19121,34 +19871,55 @@
           sha256 = "1cmjw1zrb1nq9nx0d634ajli1di8x48k6s88zi2s2q0mbi28lzz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flx-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flx-isearch";
           sha256 = "14cshv5xb57ch5g3m3hfhawnnabdnbacp4kx40d0pw6jxw677gqd";
           name = "flx-isearch";
         };
         packageRequires = [ cl-lib emacs flx ];
         meta = {
-          homepage = "http://melpa.org/#/flx-isearch";
+          homepage = "https://melpa.org/#/flx-isearch";
           license = lib.licenses.free;
         };
       }) {};
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20160220.935";
+        version = "20160420.1512";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "12099e93422c75fb1a0d5b731543d469e19b5455";
-          sha256 = "1lhp53r7n7j4lv7gl9lnqpa6b9ip7xyy9rdm5gygqkp27pdjx39y";
+          rev = "9a213998d0467d43ecb67a7c1f8d14fdb6082031";
+          sha256 = "13qs4g9991n8mz5ls3ih0jkxalb86nkwh9gv96lviv833gg0z6z1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck";
           sha256 = "045k214dq8bmrai13da6gwdz97a2i998gggxqswqs4g52l1h6hvr";
           name = "flycheck";
         };
         packageRequires = [ dash emacs let-alist pkg-info seq ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck";
+          homepage = "https://melpa.org/#/flycheck";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-apertium = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-apertium";
+        version = "20160406.818";
+        src = fetchFromGitHub {
+          owner = "unhammer";
+          repo = "flycheck-apertium";
+          rev = "71cf49d5aaee962b995583384bfa045a1d4c3db7";
+          sha256 = "14idjjz6fhmq806mmncmqnr9bvcjks6spin8z6jb0gqcg1dbhm06";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-apertium";
+          sha256 = "1cc15sljqs6gvb3wiw7n1wkd714qkvfpw6l1kg4lfx9r4jalcvw7";
+          name = "flycheck-apertium";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-apertium";
           license = lib.licenses.free;
         };
       }) {};
@@ -19163,13 +19934,13 @@
           sha256 = "0fh5z68gnggm0qjb8ncmfngv195lbp1dxz9jbmdi418d47mlba9c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-ats2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-ats2";
           sha256 = "0xm7zzz6hs5qnqkmv7hwxpvp3jjca57agx71sj0m12v0h53gbzhr";
           name = "flycheck-ats2";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-ats2";
+          homepage = "https://melpa.org/#/flycheck-ats2";
           license = lib.licenses.free;
         };
       }) {};
@@ -19184,34 +19955,34 @@
           sha256 = "0klnhq0zfn5zbkwl7y9kja7x49n1w6r1qbphk7a7v9svgm3h9s7n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-cask";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-cask";
           sha256 = "1lq559nyhkpnagncj68h84i3cq85vhdikr534kj018n2zcilsyw7";
           name = "flycheck-cask";
         };
         packageRequires = [ dash emacs flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-cask";
+          homepage = "https://melpa.org/#/flycheck-cask";
           license = lib.licenses.free;
         };
       }) {};
     flycheck-checkbashisms = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-checkbashisms";
-        version = "20160120.2007";
+        version = "20160224.1106";
         src = fetchFromGitHub {
           owner = "Gnouc";
           repo = "flycheck-checkbashisms";
-          rev = "6acb957a33a21e61764792b80ba4e33e88f2271f";
-          sha256 = "18nhfj0vx8rg2236nb9475s27rhyb34m81i7l6zkhifqba6rb0bb";
+          rev = "39362240b8e38e6ddc1da2e2c2229e3fecdf6057";
+          sha256 = "1s2zq97d7ryif6rlbvriz36dh23wmwi67v4q6krl77dfzcs705b3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-checkbashisms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-checkbashisms";
           sha256 = "1rq0ymlr1dl39v0sfyjmdv4pq3q9116cz9wvgpvfgalq8759q5sz";
           name = "flycheck-checkbashisms";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-checkbashisms";
+          homepage = "https://melpa.org/#/flycheck-checkbashisms";
           license = lib.licenses.free;
         };
       }) {};
@@ -19226,34 +19997,34 @@
           sha256 = "1ckzs32wzqpnw89rrw3l7i4gbyn25wagbadsc4mcrixml5nf0mck";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-clangcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-clangcheck";
           sha256 = "1316cj3ynl80j39ha0371ss7cqw5hcr3m8944pdacdzbmp2sak2m";
           name = "flycheck-clangcheck";
         };
         packageRequires = [ cl-lib flycheck seq ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-clangcheck";
+          homepage = "https://melpa.org/#/flycheck-clangcheck";
           license = lib.licenses.free;
         };
       }) {};
     flycheck-clojure = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-clojure";
-        version = "20150831.831";
+        version = "20160319.958";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "squiggly-clojure";
-          rev = "d677cde2720fa1b9f66b551af28f006e09474ca7";
-          sha256 = "0flpma49m99i6pr0gx43ifhhgb222zsbqgcwyvfrpi90s9wny7mr";
+          rev = "c432f07dc8ba548043f3b02ecf0f23020e87ef04";
+          sha256 = "04qyylw868mn7wvml8l23vxgca9pwq1hrv6xlcd3xqgn7102n3w2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-clojure";
           sha256 = "1b20gcs6fvq9pm4nl2qwsf34sg6wxngdql921q2pyh5n1xsxhm28";
           name = "flycheck-clojure";
         };
         packageRequires = [ cider emacs flycheck let-alist ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-clojure";
+          homepage = "https://melpa.org/#/flycheck-clojure";
           license = lib.licenses.free;
         };
       }) {};
@@ -19268,13 +20039,13 @@
           sha256 = "11xc08xld758xx9myqjsiqz8vk3gh4d9c4yswswvky6mrx34c0y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-color-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-color-mode-line";
           sha256 = "0hw19nsh5h2l8qbp7brqmml2fhs8a0x850vlvq3qfd7z248gvhrq";
           name = "flycheck-color-mode-line";
         };
         packageRequires = [ dash emacs flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-color-mode-line";
+          homepage = "https://melpa.org/#/flycheck-color-mode-line";
           license = lib.licenses.free;
         };
       }) {};
@@ -19289,34 +20060,55 @@
           sha256 = "073vkjgcyqp8frsi05s6x8ml3ar6hwjmn2c7ryfab5b35kp9gmdi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-css-colorguard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-css-colorguard";
           sha256 = "1n56j5nicac94jl7kp8fbqxmd115vbhzklzgfz5jbib2ab8y60jc";
           name = "flycheck-css-colorguard";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-css-colorguard";
+          homepage = "https://melpa.org/#/flycheck-css-colorguard";
           license = lib.licenses.free;
         };
       }) {};
     flycheck-cstyle = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-cstyle";
-        version = "20160209.22";
+        version = "20160320.1808";
         src = fetchFromGitHub {
           owner = "alexmurray";
           repo = "flycheck-cstyle";
-          rev = "7c4cc5ab4909a80ade184a0bd6a36fa9deff678c";
-          sha256 = "019h17p24cvsn1ny1fxlhwpjs3fz5gfar7dj0m2znjmx6qm72577";
+          rev = "997f55402b9f5af64ba5f9029015db23b649029d";
+          sha256 = "1fric65r33bgn2h1s1m3pxnm3d1gk2z4pwnj72in6p7glj3kg24w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-cstyle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-cstyle";
           sha256 = "0p3lzpcgwk4nkq1w0iq40njz8ll2h3vi9z5fbvv1ar4r80fqd909";
           name = "flycheck-cstyle";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-cstyle";
+          homepage = "https://melpa.org/#/flycheck-cstyle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-cython = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-cython";
+        version = "20160327.1428";
+        src = fetchFromGitHub {
+          owner = "lbolla";
+          repo = "emacs-flycheck-cython";
+          rev = "45097658a16eeabf2bd5e0464355f8f37a1aeffc";
+          sha256 = "0994346iyp7143476i3y6pc5m1n6z7g1r6n1rldivsj0qr4gjh01";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-cython";
+          sha256 = "1mbrwhpbs8in11mp79cnl4bd3m33qdgrvnbvi1mqvrsvz1ay28g4";
+          name = "flycheck-cython";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-cython";
           license = lib.licenses.free;
         };
       }) {};
@@ -19331,13 +20123,13 @@
           sha256 = "0b4yq39c8m03pv5cgvvqcippc3yfphpgjw3bh2bnxch1pwfik3xm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-d-unittest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-d-unittest";
           sha256 = "0n4m4f0zqcx966582af1nqff5sla7jcr0wrmgzzxnn97yjrlnzk2";
           name = "flycheck-d-unittest";
         };
         packageRequires = [ dash flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-d-unittest";
+          homepage = "https://melpa.org/#/flycheck-d-unittest";
           license = lib.licenses.free;
         };
       }) {};
@@ -19352,34 +20144,34 @@
           sha256 = "1hw875dirz041vzw1pxjpk5lr1zmrp2kp9m6pazs9j19d686hyn6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-dedukti";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-dedukti";
           sha256 = "00nc18w4nsi6vicpbqqpr4xcdh48g95vnay3kirb2xp5hc2rw3x8";
           name = "flycheck-dedukti";
         };
         packageRequires = [ dedukti-mode flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-dedukti";
+          homepage = "https://melpa.org/#/flycheck-dedukti";
           license = lib.licenses.free;
         };
       }) {};
     flycheck-dialyzer = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-dialyzer";
-        version = "20151024.37";
+        version = "20160326.930";
         src = fetchFromGitHub {
           owner = "lbolla";
           repo = "emacs-flycheck-dialyzer";
-          rev = "3560214658cbdbd454f8b3d4f108cb51537afa36";
-          sha256 = "15dc76r047pnxll229z0pmpn76zw3cc6qs81b7wg7yc5czsk8axh";
+          rev = "a5df0db95ac69f397b5f85d325a6d88cf8974f64";
+          sha256 = "1i5wm2r6rck6864a60mm6kv31vgvqnq49hi9apvhyywfn6sycwkf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-dialyzer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-dialyzer";
           sha256 = "0bn81yzijmnfg5xcnvcvxvqxz995iaafhgbfckgcal974s229kd2";
           name = "flycheck-dialyzer";
         };
         packageRequires = [ flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-dialyzer";
+          homepage = "https://melpa.org/#/flycheck-dialyzer";
           license = lib.licenses.free;
         };
       }) {};
@@ -19394,13 +20186,34 @@
           sha256 = "0dqkd9h54qmr9cv2gmic010j2h03i80psajrv4wq3c4pvxyqyn2j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-dmd-dub";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-dmd-dub";
           sha256 = "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm";
           name = "flycheck-dmd-dub";
         };
         packageRequires = [ flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-dmd-dub";
+          homepage = "https://melpa.org/#/flycheck-dmd-dub";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-elixir = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-elixir";
+        version = "20160404.231";
+        src = fetchFromGitHub {
+          owner = "lbolla";
+          repo = "emacs-flycheck-elixir";
+          rev = "96683d19c41b29933be69b2fb7100e2b85ac90fc";
+          sha256 = "1aa7x25a70ldbm6rl0s1wa1ncd6p6z1a7f75lk5a3274ghq8jv8p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-elixir";
+          sha256 = "0f78fai6q15smh9rvsliv8r0hh3kpwn1lz37yvqkkbx9vl7rlwld";
+          name = "flycheck-elixir";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-elixir";
           license = lib.licenses.free;
         };
       }) {};
@@ -19415,13 +20228,13 @@
           sha256 = "08dlm3g2d8rl53hq0b4z7gp8529almlkyf69d3c8f9didmlhizk7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-elm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-elm";
           sha256 = "06dpv19wgbw48gbf701c77vw1dkpddx8056wpim3zbvwwfwk8ra4";
           name = "flycheck-elm";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-elm";
+          homepage = "https://melpa.org/#/flycheck-elm";
           license = lib.licenses.free;
         };
       }) {};
@@ -19436,13 +20249,13 @@
           sha256 = "0lk7da7axn9fm0kzlzx10ir014rsdsycffi8jcy4biqllw6yi4dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-flow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-flow";
           sha256 = "0p4vvk09vjgk98dwzr2qzldvij3v6af56pradssi6sm3shbqhkk3";
           name = "flycheck-flow";
         };
         packageRequires = [ flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-flow";
+          homepage = "https://melpa.org/#/flycheck-flow";
           license = lib.licenses.free;
         };
       }) {};
@@ -19457,34 +20270,34 @@
           sha256 = "0q1m1f3vhw1wy0pa3njy55z28psznbw2xwmwk2v1p5c86n74ns8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-ghcmod";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-ghcmod";
           sha256 = "0mqxg622lqnkb52a0wff7h8b0k6mm1k7fhkfi95fi5sahclja0rp";
           name = "flycheck-ghcmod";
         };
         packageRequires = [ dash flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-ghcmod";
+          homepage = "https://melpa.org/#/flycheck-ghcmod";
           license = lib.licenses.free;
         };
       }) {};
     flycheck-gometalinter = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-gometalinter";
-        version = "20160113.2221";
+        version = "20160301.2105";
         src = fetchFromGitHub {
           owner = "favadi";
           repo = "flycheck-gometalinter";
-          rev = "4b6f26aa5062f9d4164b24ce021bc18d00f9308e";
-          sha256 = "0j2mvf3zjznwkm8dykcgs1v5sz0i882mrivghxqr3h6n3ni4wag4";
+          rev = "6da19fbf8f750f56891c5b57bfb37997af09de77";
+          sha256 = "0frgyj57mrggq5ib6xi71696m97ch0bw6cc208d2qbnb55sf4fgb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-gometalinter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-gometalinter";
           sha256 = "1bnvj5kwgbh0dv989rsjcvmcij1ahwcz0vpr6a8f2p6wwvksw1h2";
           name = "flycheck-gometalinter";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-gometalinter";
+          homepage = "https://melpa.org/#/flycheck-gometalinter";
           license = lib.licenses.free;
         };
       }) {};
@@ -19495,38 +20308,38 @@
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-google-cpplint";
-          rev = "dc23300757c6762c018d536a5831aef2486f7a17";
-          sha256 = "0fykawnq9ch1vj76rsimwbmn2xxdamsnvbj4ahqaqhq7adb2wyrq";
+          rev = "1d8a090861572258ab704915263feeb3a436c3d2";
+          sha256 = "0l6sg83f6z8x2alnblpv03rj442sbnkkkcbf8i0agjmx3713a5yx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-google-cpplint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-google-cpplint";
           sha256 = "0llrvg6mhcsj5aascsndhbv99122zj32agxk1w6s8xn8ksk2i90b";
           name = "flycheck-google-cpplint";
         };
         packageRequires = [ flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-google-cpplint";
+          homepage = "https://melpa.org/#/flycheck-google-cpplint";
           license = lib.licenses.free;
         };
       }) {};
     flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "flycheck-haskell";
-        version = "20160118.1051";
+        version = "20160413.331";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-haskell";
-          rev = "7ff353c8bc7e1a02fe2c14b0b8f9cecb748e0025";
-          sha256 = "01y3nv4h5zz4w2bydw7f2w98rbyhbyq80w5w5y5nal5w4vd76qb7";
+          rev = "927abe14bfb2da632267ef95a9fa8db92fcdd08a";
+          sha256 = "1yyjh649ag6h3wnflsjlndmrlanjqbf59zg4gm9qqyhksqy4hyyv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-haskell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-haskell";
           sha256 = "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7";
           name = "flycheck-haskell";
         };
         packageRequires = [ dash emacs flycheck haskell-mode let-alist seq ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-haskell";
+          homepage = "https://melpa.org/#/flycheck-haskell";
           license = lib.licenses.free;
         };
       }) {};
@@ -19541,34 +20354,34 @@
           sha256 = "1x61q0fqr1jbqs9kk59f565a02qjxh1gnp1aigys0yz6qnshvzbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-hdevtools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-hdevtools";
           sha256 = "0ahvai1q4x59ryiyccvqvjisgqbaiahx4gk8ssaxhblhj0sqga93";
           name = "flycheck-hdevtools";
         };
         packageRequires = [ dash flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-hdevtools";
+          homepage = "https://melpa.org/#/flycheck-hdevtools";
           license = lib.licenses.free;
         };
       }) {};
     flycheck-irony = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, irony, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-irony";
-        version = "20150728.1431";
+        version = "20160317.1736";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "flycheck-irony";
-          rev = "b92e881fdf9c9cea192bfb8fa228784af5e27ea4";
-          sha256 = "1ax55yhf9q8i8z1f97zp3r08dqv8npd2llllbwa67d1bj49bsf2h";
+          rev = "34940ae5ab8f4c721d9c1118ebfc3496d7e67a84";
+          sha256 = "0qa5a8wzvzxwqql92ibc9s43k8sj3vwn7skz9hfr8av0skkhx996";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-irony";
           sha256 = "0qk814m5s7mjba659llml0gy1g3045w8l1g73w2pnm1pbpqdfn3z";
           name = "flycheck-irony";
         };
         packageRequires = [ emacs flycheck irony ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-irony";
+          homepage = "https://melpa.org/#/flycheck-irony";
           license = lib.licenses.free;
         };
       }) {};
@@ -19583,13 +20396,13 @@
           sha256 = "15cgqbl6n3nyqiizgs2zvcvfs6bcnjk3bj81lhhwrzizbjvap3rv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-ledger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-ledger";
           sha256 = "0807pd2km4r60wgd6jakscbx63ab22d9kvf1cml0ad8wynsap7jl";
           name = "flycheck-ledger";
         };
         packageRequires = [ flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-ledger";
+          homepage = "https://melpa.org/#/flycheck-ledger";
           license = lib.licenses.free;
         };
       }) {};
@@ -19604,13 +20417,13 @@
           sha256 = "0isqa6ybdd4166h3rdcg0b8pcxn00v8dav58xwfcj92nhzvs0qca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-mercury";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-mercury";
           sha256 = "1z2y6933f05yv9y2aapmn876jnsydh642zqid3j88bb9kqi67x0h";
           name = "flycheck-mercury";
         };
         packageRequires = [ dash flycheck s ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-mercury";
+          homepage = "https://melpa.org/#/flycheck-mercury";
           license = lib.licenses.free;
         };
       }) {};
@@ -19625,13 +20438,13 @@
           sha256 = "01r2ycbayhsxh3dq4d3qky5s0gcv3fjlp8j08y8dgyl406pkzhdz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-mypy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-mypy";
           sha256 = "1w418jm6x3vcg2x31nzc8a3b8asx6gznl6m76ip8w98riz7vy02f";
           name = "flycheck-mypy";
         };
         packageRequires = [ flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-mypy";
+          homepage = "https://melpa.org/#/flycheck-mypy";
           license = lib.licenses.free;
         };
       }) {};
@@ -19646,13 +20459,13 @@
           sha256 = "06hs41l41hm08dv93wldd98hmnd3jqbg58pj5ymn15kgdsy1rirg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-nim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-nim";
           sha256 = "0w6f6998rqx8a3i4xhga7mrmvhxrm690wkqwfzspidid2z7v71az";
           name = "flycheck-nim";
         };
         packageRequires = [ dash flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-nim";
+          homepage = "https://melpa.org/#/flycheck-nim";
           license = lib.licenses.free;
         };
       }) {};
@@ -19667,13 +20480,13 @@
           sha256 = "0fm8w7126vf04n76qhh33rzybvl1n7va2whbqzafbvmv2nny3v94";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-ocaml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-ocaml";
           sha256 = "1cv2bb66aql2kj1y1gsl4xji8yrzrq6rd8hxxs5vpfsk47052lf7";
           name = "flycheck-ocaml";
         };
         packageRequires = [ emacs flycheck let-alist merlin ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-ocaml";
+          homepage = "https://melpa.org/#/flycheck-ocaml";
           license = lib.licenses.free;
         };
       }) {};
@@ -19688,13 +20501,13 @@
           sha256 = "0aa8cnh9f0f2zr2kkba2kf9djzjnsd51fzj8l578pbj016zdarwd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-package";
           sha256 = "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d";
           name = "flycheck-package";
         };
         packageRequires = [ cl-lib emacs flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-package";
+          homepage = "https://melpa.org/#/flycheck-package";
           license = lib.licenses.free;
         };
       }) {};
@@ -19709,34 +20522,55 @@
           sha256 = "0ffas4alqhijvm8wl1p5nqjhnxki8gs6b5bxb4nsqwnma8qmlcx3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-perl6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-perl6";
           sha256 = "0czc0fqx7g543afzkbjyz4bhxfl4s3v5swn9xrkayv8cgk8acvp4";
           name = "flycheck-perl6";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-perl6";
+          homepage = "https://melpa.org/#/flycheck-perl6";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-pkg-config = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "flycheck-pkg-config";
+        version = "20160401.1824";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "flycheck-pkg-config";
+          rev = "fc8912fb27d549bf947b7dc6943f76b405852736";
+          sha256 = "1m183k3j2grr8462y2hi4fxi8sinyfrrwi8983ax904vhza8lclc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-pkg-config";
+          sha256 = "0w7h4fa4mv8377sdbkilqcw4b9qda98c1k01nxic7a8i3iyq02d6";
+          name = "flycheck-pkg-config";
+        };
+        packageRequires = [ cl-lib dash s ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-pkg-config";
           license = lib.licenses.free;
         };
       }) {};
     flycheck-pos-tip = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }:
     melpaBuild {
         pname = "flycheck-pos-tip";
-        version = "20160122.905";
+        version = "20160323.329";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-pos-tip";
-          rev = "f0f8a4232b53494d6cf13934b53c61ed6c32273f";
-          sha256 = "11brmradnsz3qqj11rviwdh6hqhbicgycr2zs5wrfbq8rifx4cv1";
+          rev = "2ad60d92610596672b830328b5837b58350ca7cf";
+          sha256 = "0wca22jp0alknmllfl22j89aasiwms6ipqyv1pnvbrgmrbzcmlp7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-pos-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-pos-tip";
           sha256 = "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9";
           name = "flycheck-pos-tip";
         };
         packageRequires = [ dash flycheck pos-tip ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-pos-tip";
+          homepage = "https://melpa.org/#/flycheck-pos-tip";
           license = lib.licenses.free;
         };
       }) {};
@@ -19751,13 +20585,13 @@
           sha256 = "1adcijysw4v8rrxzswi8zhd6w99iaqq7asps0jp21gr9nqci8vdj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-protobuf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-protobuf";
           sha256 = "0cn5b9pr9i9hrix7dbrylwb2812al8ipbpqvlb9bm2f8hc9kgsmc";
           name = "flycheck-protobuf";
         };
         packageRequires = [ protobuf-mode ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-protobuf";
+          homepage = "https://melpa.org/#/flycheck-protobuf";
           license = lib.licenses.free;
         };
       }) {};
@@ -19772,13 +20606,13 @@
           sha256 = "1r8k38ldw7mldhl2hsqc8gvb99svc1vlhlqfnj8hqd3vvqxd5r1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-purescript";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-purescript";
           sha256 = "05j1iscyg9khw0zq63676zrisragklxp48hmbc7vrbmbiy964lwd";
           name = "flycheck-purescript";
         };
         packageRequires = [ dash emacs flycheck let-alist seq ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-purescript";
+          homepage = "https://melpa.org/#/flycheck-purescript";
           license = lib.licenses.free;
         };
       }) {};
@@ -19793,13 +20627,13 @@
           sha256 = "16albss527dq4ncpiy8p326fib038qc6wjbh985lw2p1f9babswa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-pyflakes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-pyflakes";
           sha256 = "186h5ky48i1xmjbvvhn1i0rzhsy8bgdv1d8f7rlr2z4brb52f9c1";
           name = "flycheck-pyflakes";
         };
         packageRequires = [ flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-pyflakes";
+          homepage = "https://melpa.org/#/flycheck-pyflakes";
           license = lib.licenses.free;
         };
       }) {};
@@ -19814,13 +20648,13 @@
           sha256 = "08ar85p5llk0lxlm2rd7rfc8s449vrknsrzzxqg8kvakgpd0nx7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-rust";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-rust";
           sha256 = "1k0n0y6lbp71v4465dwq7864vp1qqyx7zjz0kssszcpx5gl1596w";
           name = "flycheck-rust";
         };
         packageRequires = [ dash emacs flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-rust";
+          homepage = "https://melpa.org/#/flycheck-rust";
           license = lib.licenses.free;
         };
       }) {};
@@ -19835,76 +20669,76 @@
           sha256 = "0v7d0yijqn3mhgjwqiv1rsdhw2ay6ffbn8i45x0dlp960v7k2k8f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-status-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-status-emoji";
           sha256 = "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p";
           name = "flycheck-status-emoji";
         };
         packageRequires = [ emacs flycheck let-alist ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-status-emoji";
+          homepage = "https://melpa.org/#/flycheck-status-emoji";
           license = lib.licenses.free;
         };
       }) {};
     flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "flycheck-tip";
-        version = "20150726.356";
+        version = "20160318.2034";
         src = fetchFromGitHub {
           owner = "yuutayamada";
           repo = "flycheck-tip";
-          rev = "9eefbea4ccc9e348d356faf28c9a1902ba28f29e";
-          sha256 = "0hn3qjff1lcpd2ghjixkkq2bpmrmqab3860vy38yw201yy4xmn5r";
+          rev = "302f19a3e8df71ddd30c74fa46836443395667b0";
+          sha256 = "0lrgww53xzz2hnc8c83hqxczzfm1bvixfswhsav4i8aakk3idjxi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-tip";
           sha256 = "0zab1zknrnsw5xh5pwzzcpz7p40bbywkf9zx99sgsd6b5j1jz656";
           name = "flycheck-tip";
         };
         packageRequires = [ emacs flycheck popup ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-tip";
+          homepage = "https://melpa.org/#/flycheck-tip";
           license = lib.licenses.free;
         };
       }) {};
     flycheck-typescript-tslint = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-typescript-tslint";
-        version = "20160213.1249";
+        version = "20160404.230";
         src = fetchFromGitHub {
           owner = "Simplify";
           repo = "flycheck-typescript-tslint";
-          rev = "05505563dc980be078aab3642d499ced8f625da3";
-          sha256 = "1a9rmp0m5w68qvypxgwvixz32z13xcianyl6hjd6xmaax7f6r0bh";
+          rev = "3286d6fad3f891238ed5a9ff31e2f125ba684285";
+          sha256 = "0v0xmkl09lrxp20yamw7s9fszljx3g1yrvn1y4c86is8dszm9hdh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-typescript-tslint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-typescript-tslint";
           sha256 = "141x4scl13gqxyg0nlc8vig1iaybc3g95il5r51k4k83isi62iyq";
           name = "flycheck-typescript-tslint";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-typescript-tslint";
+          homepage = "https://melpa.org/#/flycheck-typescript-tslint";
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, ycmd }:
+    flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }:
     melpaBuild {
         pname = "flycheck-ycmd";
-        version = "20160206.150";
+        version = "20160320.624";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "61601543ca9b70f6a92a87fb9057af6143ba5ed1";
-          sha256 = "10j8zv5m36400wwkwbncqnsm616v59ww0bbkhrxcf6mn56iq8162";
+          rev = "1984e49b7894b77438f2257d8058900ab82109e3";
+          sha256 = "0dwii83m6cngsnyhzhnmv53p588d4pkkybmcmsj6gsar157l4azi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-ycmd";
           sha256 = "0m99ssynrqxgzf32d35n17iqyh1lyc6948inxpnwgcb98rfamchv";
           name = "flycheck-ycmd";
         };
-        packageRequires = [ dash emacs flycheck ycmd ];
+        packageRequires = [ dash emacs flycheck let-alist ycmd ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-ycmd";
+          homepage = "https://melpa.org/#/flycheck-ycmd";
           license = lib.licenses.free;
         };
       }) {};
@@ -19919,13 +20753,13 @@
           sha256 = "10i0rbvk6vyifgbgskdyspmw9q64x99fzi8i1h8bgv58xhfx6pm7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-coffee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-coffee";
           sha256 = "1aig1d4fgjdg31vrg8k43z5hbqiydgfvxi45p1695s3kbdm8pr2d";
           name = "flymake-coffee";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-coffee";
+          homepage = "https://melpa.org/#/flymake-coffee";
           license = lib.licenses.free;
         };
       }) {};
@@ -19940,13 +20774,13 @@
           sha256 = "1dlxn8hhz3gfrhvkwhlxjmby6zc0g8yy9n9j9dn8c4cbi2fhyx5m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-cppcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-cppcheck";
           sha256 = "11brzgq2zl32a8a2dgj2imsldjqaqvxwk2jypf4bmfwa3mkcqh3d";
           name = "flymake-cppcheck";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-cppcheck";
+          homepage = "https://melpa.org/#/flymake-cppcheck";
           license = lib.licenses.free;
         };
       }) {};
@@ -19961,13 +20795,13 @@
           sha256 = "00cnz3snhs44aknq6wmf19hq9bzb5pj0hvfzz93l6n7ngd8vvpzy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-css";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-css";
           sha256 = "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5";
           name = "flymake-css";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-css";
+          homepage = "https://melpa.org/#/flymake-css";
           license = lib.licenses.free;
         };
       }) {};
@@ -19975,17 +20809,17 @@
         pname = "flymake-cursor";
         version = "20130822.532";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/flymake-cursor.el";
+          url = "https://www.emacswiki.org/emacs/download/flymake-cursor.el";
           sha256 = "10cpzrd588ya52blghxss5zkn6x8hc7bx1h0qbcdlybbmkjgpkxr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-cursor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-cursor";
           sha256 = "1s065w0z3sfv3d348w4zhlw96xf3j28bcz14sl46963mj2dm90lr";
           name = "flymake-cursor";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/flymake-cursor";
+          homepage = "https://melpa.org/#/flymake-cursor";
           license = lib.licenses.free;
         };
       }) {};
@@ -20000,13 +20834,13 @@
           sha256 = "1mylcsklnv3q27q1gvf7wrila39rmxab1ypmvjh5p56d91y6pszc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-easy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-easy";
           sha256 = "19p6s9fllgvs35v167xf624k5dn16l9fnvaqcj9ks162gl9vymn7";
           name = "flymake-easy";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/flymake-easy";
+          homepage = "https://melpa.org/#/flymake-easy";
           license = lib.licenses.free;
         };
       }) {};
@@ -20021,13 +20855,13 @@
           sha256 = "04w6g4wixrpfidxbk2bwazhvf0cx3c2v2mxnycqqlqkg0m0sb0fn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-elixir";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-elixir";
           sha256 = "15r3m58hnc75l3j02xdr8yg25fbn2sbz1295ac44widzis82m792";
           name = "flymake-elixir";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/flymake-elixir";
+          homepage = "https://melpa.org/#/flymake-elixir";
           license = lib.licenses.free;
         };
       }) {};
@@ -20042,13 +20876,13 @@
           sha256 = "14kbqyw4v1c51dx7pfgqbn8x4j8j3rgyyq2fa9klqzxpldcskl24";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-gjshint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-gjshint";
           sha256 = "19jcd5z4883z3fzlrdn4fzmsvn16f4hfnhgw4vbs5b0ma6a8ka44";
           name = "flymake-gjshint";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/flymake-gjshint";
+          homepage = "https://melpa.org/#/flymake-gjshint";
           license = lib.licenses.free;
         };
       }) {};
@@ -20063,13 +20897,13 @@
           sha256 = "03gh0y988pksghmmvb5av2vnlbcsncafvn4nwihsis0bhys8k28q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-go";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-go";
           sha256 = "030m67d8g60ljm7ny3jh4vwj3cshypsklgbjpcvh32y109ga1hy1";
           name = "flymake-go";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/flymake-go";
+          homepage = "https://melpa.org/#/flymake-go";
           license = lib.licenses.free;
         };
       }) {};
@@ -20084,13 +20918,13 @@
           sha256 = "0zldhlvxmk0xcjmj4ns48pp4h3bvijrzs1md69ya7m3dmsbayfrc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-google-cpplint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-google-cpplint";
           sha256 = "0q7v70xbprh03f1yabq216q4q82a58s2c1ykr6ig49cg1jdgzkf3";
           name = "flymake-google-cpplint";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-google-cpplint";
+          homepage = "https://melpa.org/#/flymake-google-cpplint";
           license = lib.licenses.free;
         };
       }) {};
@@ -20105,13 +20939,13 @@
           sha256 = "08rcsg76qdq2l6z8q339yw770kv1q657ywqvq6a20pxxz2158a8l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-haml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-haml";
           sha256 = "0dmdhh12h4xrx6mc0qrwavngk2sx0l4pfqkjjyavabsgcs9wlgp1";
           name = "flymake-haml";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-haml";
+          homepage = "https://melpa.org/#/flymake-haml";
           license = lib.licenses.free;
         };
       }) {};
@@ -20126,13 +20960,13 @@
           sha256 = "0hwcgas83wwhk0szwgw7abf70400knb8dfabknwv0qrcsk4gqffd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-haskell-multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-haskell-multi";
           sha256 = "0cyzmmghwkkv6020s6n436lwymi6dr49i7gkci5n0hw5pdywcaij";
           name = "flymake-haskell-multi";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-haskell-multi";
+          homepage = "https://melpa.org/#/flymake-haskell-multi";
           license = lib.licenses.free;
         };
       }) {};
@@ -20147,13 +20981,13 @@
           sha256 = "003fdrgxlyhs595ndcdzhmdkcpsf9bpw53hrlrrrh07qlnqxwrvp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-hlint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-hlint";
           sha256 = "0wq1ijhn3ypy31yk8jywl5hnz0r0vlhcxjyznzccwqbdc5vf7b2x";
           name = "flymake-hlint";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-hlint";
+          homepage = "https://melpa.org/#/flymake-hlint";
           license = lib.licenses.free;
         };
       }) {};
@@ -20168,13 +21002,13 @@
           sha256 = "0ywm9fpb7d7ry2fly8719fa41q97yj9za3phqhv6j1chzaxvcv3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-jshint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-jshint";
           sha256 = "0j4djylz6mrq14qmbm35k3gvvsw6i9qc4gd9ma4fykiqzkdjsg7j";
           name = "flymake-jshint";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-jshint";
+          homepage = "https://melpa.org/#/flymake-jshint";
           license = lib.licenses.free;
         };
       }) {};
@@ -20189,13 +21023,13 @@
           sha256 = "0y01albwwcnhj4pnpvcry0zw7z2g9py9q2p3sw5zhgw3g0v5p9ls";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-jslint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-jslint";
           sha256 = "1cq8fni4p0qhigx0qh34ypmcsbnilra1ixgnrn9mgg8x3cvcm4cm";
           name = "flymake-jslint";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-jslint";
+          homepage = "https://melpa.org/#/flymake-jslint";
           license = lib.licenses.free;
         };
       }) {};
@@ -20210,13 +21044,13 @@
           sha256 = "1qn15pr7c07fmki484z5xpqyn8546qb5dr9gcp5n1172wnh2a534";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-json";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-json";
           sha256 = "1p5kajiycpqy2id664bs0fb1mbf73a43qqfdi4c57n6j9x7fxp4d";
           name = "flymake-json";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-json";
+          homepage = "https://melpa.org/#/flymake-json";
           license = lib.licenses.free;
         };
       }) {};
@@ -20231,13 +21065,13 @@
           sha256 = "0ggi8a4j4glpsar0sqg8q06rscajjaziis5ann31wphx88rc5wd7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-less";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-less";
           sha256 = "05k5daphxy94164c73ia7f4l1gv2cmlw8xzs8xnddg7ly22gjhi0";
           name = "flymake-less";
         };
         packageRequires = [ flymake-easy less-css-mode ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-less";
+          homepage = "https://melpa.org/#/flymake-less";
           license = lib.licenses.free;
         };
       }) {};
@@ -20252,13 +21086,13 @@
           sha256 = "1fz7kywp1y2nhp50b2v961wz604sw1gzqcid4k8igz9aii3ygxcv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-lua";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-lua";
           sha256 = "0pa66ymhazcfgd9jmxizq5w2sgj008hph42wsa9ljr2rina1gai6";
           name = "flymake-lua";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/flymake-lua";
+          homepage = "https://melpa.org/#/flymake-lua";
           license = lib.licenses.free;
         };
       }) {};
@@ -20273,13 +21107,13 @@
           sha256 = "1f4l2r4gp03s18255jawc7s5abpjjrw54937wzygmvzvqvmaiikj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-perlcritic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-perlcritic";
           sha256 = "0hibnh463wzhvpix7gygpgs04gi6salwjrsjc6d43lxlsn3y1im8";
           name = "flymake-perlcritic";
         };
         packageRequires = [ flymake ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-perlcritic";
+          homepage = "https://melpa.org/#/flymake-perlcritic";
           license = lib.licenses.free;
         };
       }) {};
@@ -20294,13 +21128,13 @@
           sha256 = "09mibjdji5mf3qvngspv1zmik1zd9jwp4mb4c1w4256202359sf4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-php";
           sha256 = "12ds2l5kvs7fz38syp4amasbjkpqd36rlpajnb3xxll0hbk6vffk";
           name = "flymake-php";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-php";
+          homepage = "https://melpa.org/#/flymake-php";
           license = lib.licenses.free;
         };
       }) {};
@@ -20315,13 +21149,13 @@
           sha256 = "140rlp6m0aqibwa0bhv8w6l3giziybqdw7x271nq8f3r60ch13bi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-phpcs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-phpcs";
           sha256 = "0zzxi3c203fiw6jp1ar9bb9f28x2lg23bczgy8n5cicrq59jfsn9";
           name = "flymake-phpcs";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-phpcs";
+          homepage = "https://melpa.org/#/flymake-phpcs";
           license = lib.licenses.free;
         };
       }) {};
@@ -20336,13 +21170,13 @@
           sha256 = "1r3yjqxig2j7l50l787qsi96mkvjcgqll9vb4ci51j7b43d53c5m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-puppet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-puppet";
           sha256 = "1izq6s33p74dy4wzfnjii8wjs723bm5ggl0w6hkvzgbmyjc01hxv";
           name = "flymake-puppet";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-puppet";
+          homepage = "https://melpa.org/#/flymake-puppet";
           license = lib.licenses.free;
         };
       }) {};
@@ -20357,13 +21191,13 @@
           sha256 = "1aijapvpw4skfhfmz09v5kpaxay6b0bp77bbjkrvgyizsqdd39vp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-python-pyflakes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-python-pyflakes";
           sha256 = "0asbjxv03zkbcjayanv13qzbv4z7b6fi0z1j6yv7fl6q9mgvm497";
           name = "flymake-python-pyflakes";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-python-pyflakes";
+          homepage = "https://melpa.org/#/flymake-python-pyflakes";
           license = lib.licenses.free;
         };
       }) {};
@@ -20378,13 +21212,13 @@
           sha256 = "13yk9cncp3zw6d7zkgdpgprpw6wrirk2gxgjvkr15dwcyx1g3109";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-ruby";
           sha256 = "1shr6d03vx85nmyxnysglzlc1pz0zy3n28nrcmxqgdm02g197bzr";
           name = "flymake-ruby";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-ruby";
+          homepage = "https://melpa.org/#/flymake-ruby";
           license = lib.licenses.free;
         };
       }) {};
@@ -20393,19 +21227,19 @@
         pname = "flymake-rust";
         version = "20141004.1752";
         src = fetchFromGitHub {
-          owner = "joaoxsouls";
+          owner = "jxs";
           repo = "flymake-rust";
           rev = "72ec92c261670b7384ee2593d0f1946ea29f429a";
           sha256 = "1qxb3vhh83ikhmm89ms7irdip2l03hnjcq5ncmgywkaqkpslaacv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-rust";
-          sha256 = "080cvgl2cg08kyvmgg080zqb6k6bngga3m5lfwb2dpmi1bajywc1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-rust";
+          sha256 = "0fgpkz1d4y2ywizwwrhqdqncdmhdnbgf3mcv3hjpa82x44yb7j32";
           name = "flymake-rust";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-rust";
+          homepage = "https://melpa.org/#/flymake-rust";
           license = lib.licenses.free;
         };
       }) {};
@@ -20420,13 +21254,13 @@
           sha256 = "0rwjiplpqw3rrh76llnx2fn78f6avxsg0la5br46q1rgw4n8r1w1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-sass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-sass";
           sha256 = "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d";
           name = "flymake-sass";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-sass";
+          homepage = "https://melpa.org/#/flymake-sass";
           license = lib.licenses.free;
         };
       }) {};
@@ -20441,13 +21275,34 @@
           sha256 = "0c2lz1p91yhprmlbmp0756d96yiy0w92zf0c9vlp0i9abvd0cvkc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-shell";
           sha256 = "13ff4r0k29yqgx8ybxz7hh50cjsadcjb7pd0075s9xcrzia5x63i";
           name = "flymake-shell";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-shell";
+          homepage = "https://melpa.org/#/flymake-shell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-solidity = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-solidity";
+        version = "20160424.920";
+        src = fetchFromGitHub {
+          owner = "kootenpv";
+          repo = "flymake-solidity";
+          rev = "07f33ed52aac5d958fc0f50026a9bf111e1a5308";
+          sha256 = "1rq47qhp3jdrw1n22cnhvhcxqzbi6v9r94kgf3200vrfp435rvkn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-solidity";
+          sha256 = "10d1g14y3l670lqgfdsnyxanzcjs2jpgnliih56n1xhcpyz551l3";
+          name = "flymake-solidity";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "https://melpa.org/#/flymake-solidity";
           license = lib.licenses.free;
         };
       }) {};
@@ -20462,13 +21317,13 @@
           sha256 = "0qpr0frcn3w0f6yz8vgavwbxvn6wb0qkfk653v4cfy57dvslr4wf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-vala";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-vala";
           sha256 = "0yp81phd96z594ckav796qrjm0wlkrfsl0rwpmgg840qn49w71vx";
           name = "flymake-vala";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-vala";
+          homepage = "https://melpa.org/#/flymake-vala";
           license = lib.licenses.free;
         };
       }) {};
@@ -20483,13 +21338,13 @@
           sha256 = "0mdam39a85csi9b90wak9j3zkd25lj6x54affwkg3fym8yphmplm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-yaml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-yaml";
           sha256 = "17wghm797np4hlidf3wwb47w4klwc6qyk6ry1z05psl3nykws1g7";
           name = "flymake-yaml";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-yaml";
+          homepage = "https://melpa.org/#/flymake-yaml";
           license = lib.licenses.free;
         };
       }) {};
@@ -20504,13 +21359,13 @@
           sha256 = "07hy1kyw4cbxydmhp4scsy3dcbk2s50rmdp8rch1vbcjk5lj4mvb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flyparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flyparens";
           sha256 = "1mvbfq062qj8vmgzk6rymg3idlfc1makfp1scmjvpw98h30j2a0a";
           name = "flyparens";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/flyparens";
+          homepage = "https://melpa.org/#/flyparens";
           license = lib.licenses.free;
         };
       }) {};
@@ -20525,13 +21380,13 @@
           sha256 = "1g09s57b773nm9xqslzbin5i2h18k55nx00s5nnkvx1qg0n0mzkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flyspell-lazy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flyspell-lazy";
           sha256 = "0lzazrhsfh5m7n57dzx0v46d5mg87wpwwkjzf5j9gpv1mc1xfg1y";
           name = "flyspell-lazy";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/flyspell-lazy";
+          homepage = "https://melpa.org/#/flyspell-lazy";
           license = lib.licenses.free;
         };
       }) {};
@@ -20546,13 +21401,13 @@
           sha256 = "1rdpggnw9mz3qr4kp5gh9nvwncivj446vdhpc04d4jgrl568bhqb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flyspell-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flyspell-popup";
           sha256 = "0wp15ra1ry6xpwal6mb53ixh3f0s4nps0rdyfli7hhaiwbr9bhql";
           name = "flyspell-popup";
         };
         packageRequires = [ popup ];
         meta = {
-          homepage = "http://melpa.org/#/flyspell-popup";
+          homepage = "https://melpa.org/#/flyspell-popup";
           license = lib.licenses.free;
         };
       }) {};
@@ -20567,13 +21422,13 @@
           sha256 = "1fk4zsb4jliwz10sqz5bpqgj1p479mc506dmvy4zq3vqnpbypqvs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fm";
           sha256 = "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f";
           name = "fm";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fm";
+          homepage = "https://melpa.org/#/fm";
           license = lib.licenses.free;
         };
       }) {};
@@ -20588,13 +21443,13 @@
           sha256 = "0984fhf1nlpdh9mh3gd2xak3v2rlv76qxppqvr6a4kl1dxwg37r3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fm-bookmarks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fm-bookmarks";
           sha256 = "12ami0k6rfwhrr6xgj0dls4mkk6dp0r9smwzhr4897dv0lw89bdj";
           name = "fm-bookmarks";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/fm-bookmarks";
+          homepage = "https://melpa.org/#/fm-bookmarks";
           license = lib.licenses.free;
         };
       }) {};
@@ -20609,13 +21464,13 @@
           sha256 = "0vqjyc00ba9wy2rn454hhy9rnnghljc1i8f3zrpkdmkqn5cg3336";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/focus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/focus";
           sha256 = "0jw26j8npyl3dgsrs7ap2djxmkafn2hl6gfqvi7v76bccs4jkyv8";
           name = "focus";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/focus";
+          homepage = "https://melpa.org/#/focus";
           license = lib.licenses.free;
         };
       }) {};
@@ -20624,19 +21479,19 @@
         pname = "focus-autosave-mode";
         version = "20151012.442";
         src = fetchFromGitHub {
-          owner = "vifon";
+          owner = "Vifon";
           repo = "focus-autosave-mode.el";
           rev = "592e2c0642ee86b2000b728ea346de084447dda8";
           sha256 = "1k5xhnr1jkfw8896kf2nl4633r6ni5bnc53rs6lxn8y9lj0srafb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/focus-autosave-mode";
-          sha256 = "1zwp99mk360mqk4mjnnjr6islavginc9732p0jn9g5yz62xypxpc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/focus-autosave-mode";
+          sha256 = "10cd1x5b1w7apgxd2kq45lv0jlj7az4zmn2iz4iymf2r2hancrcd";
           name = "focus-autosave-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/focus-autosave-mode";
+          homepage = "https://melpa.org/#/focus-autosave-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -20651,13 +21506,13 @@
           sha256 = "1mnak9k0hz99jq2p7gydxajzvx2vcql8yzwcm0v80a6xji2whl70";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/foggy-night-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/foggy-night-theme";
           sha256 = "03x3dhkk81d2zh9nflq6wd7v3khpy9046v8qhq4i9dw6davvy9j4";
           name = "foggy-night-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/foggy-night-theme";
+          homepage = "https://melpa.org/#/foggy-night-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -20672,13 +21527,13 @@
           sha256 = "1yz1wis31asw6xa5maliyd1ck2q02xnnh7dc6swgj9cb4wi7k6i1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fold-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fold-dwim";
           sha256 = "0c9yxx45zlhb1h4ldgkjv7bndwlagpyingaaqn9dcsxidrvp3p5x";
           name = "fold-dwim";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fold-dwim";
+          homepage = "https://melpa.org/#/fold-dwim";
           license = lib.licenses.free;
         };
       }) {};
@@ -20693,13 +21548,13 @@
           sha256 = "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fold-dwim-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fold-dwim-org";
           sha256 = "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn";
           name = "fold-dwim-org";
         };
         packageRequires = [ fold-dwim ];
         meta = {
-          homepage = "http://melpa.org/#/fold-dwim-org";
+          homepage = "https://melpa.org/#/fold-dwim-org";
           license = lib.licenses.free;
         };
       }) {};
@@ -20714,13 +21569,13 @@
           sha256 = "1cbabpyp66nl5j8yhyj2jih4mhaljxvjh9ij05clai71z4598ahn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fold-this";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fold-this";
           sha256 = "1iri4a6ixw3q7qr803cj2ik7rvmww1b6ybj5q2pvkf1v25r8655d";
           name = "fold-this";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fold-this";
+          homepage = "https://melpa.org/#/fold-this";
           license = lib.licenses.free;
         };
       }) {};
@@ -20735,13 +21590,13 @@
           sha256 = "1z2dkyzj1gq3gp9cc3lhi240f8f3yjpjnw520xszm0wvx1rp06ny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/folding";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/folding";
           sha256 = "0rb4f4llc4z502znmmc0hfi7n07lp01msx4y1iyqijvqzlq2i93y";
           name = "folding";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/folding";
+          homepage = "https://melpa.org/#/folding";
           license = lib.licenses.free;
         };
       }) {};
@@ -20749,17 +21604,17 @@
         pname = "font-lock-plus";
         version = "20151231.1519";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/font-lock+.el";
+          url = "https://www.emacswiki.org/emacs/download/font-lock+.el";
           sha256 = "04j9xybn9an3bm2p2aqmqnswxxg3gwq2mc96brkgxkr88h316d4q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/font-lock+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/font-lock+";
           sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g";
           name = "font-lock-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/font-lock+";
+          homepage = "https://melpa.org/#/font-lock+";
           license = lib.licenses.free;
         };
       }) {};
@@ -20774,13 +21629,13 @@
           sha256 = "04n32rgdz7m24jji8p0j42zmf2r60sdbbr4mkr6435fqyvmdd20k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/font-lock-studio";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/font-lock-studio";
           sha256 = "0swwbfaypc78cg4ak24cc92kgxmr1x9vcpaw3jz4zgpm2wzbgmrq";
           name = "font-lock-studio";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/font-lock-studio";
+          homepage = "https://melpa.org/#/font-lock-studio";
           license = lib.licenses.free;
         };
       }) {};
@@ -20795,13 +21650,13 @@
           sha256 = "1k90w8v5rpswqb8fn1cc8sq5w12gf4sn6say5dhvqd63512b0055";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/font-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/font-utils";
           sha256 = "0k33jdchjkj7j211a23kfp5axg74cfsrrq4axsb1pfp124swh2n5";
           name = "font-utils";
         };
         packageRequires = [ pcache persistent-soft ];
         meta = {
-          homepage = "http://melpa.org/#/font-utils";
+          homepage = "https://melpa.org/#/font-utils";
           license = lib.licenses.free;
         };
       }) {};
@@ -20816,55 +21671,55 @@
           sha256 = "103xz042h8w6c85hn19cglfsa34syjh18asm41rjhr9krp15sdl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fontawesome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fontawesome";
           sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3";
           name = "fontawesome";
         };
         packageRequires = [ cl-lib helm-core ];
         meta = {
-          homepage = "http://melpa.org/#/fontawesome";
+          homepage = "https://melpa.org/#/fontawesome";
           license = lib.licenses.free;
         };
       }) {};
     forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "forecast";
-        version = "20160208.1748";
+        version = "20160419.748";
         src = fetchFromGitHub {
           owner = "cadadr";
           repo = "forecast.el";
-          rev = "7531c979a8756a9c78e4e3d221534a4143f5804d";
-          sha256 = "091v9iazqiyarabpdh0v71ddsw018mhy5nnis7jfkafp60psn0nj";
+          rev = "95bb9c92aad42ed0195fb93551b442a4fc45f452";
+          sha256 = "05m1ryn9fi4m49d7p68q25svrzfxpl1h9sisa8jlvbiapwmghvgj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/forecast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/forecast";
           sha256 = "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc";
           name = "forecast";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/forecast";
+          homepage = "https://melpa.org/#/forecast";
           license = lib.licenses.free;
         };
       }) {};
     foreign-regexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "foreign-regexp";
-        version = "20140823.1942";
+        version = "20160318.1107";
         src = fetchFromGitHub {
           owner = "k-talo";
           repo = "foreign-regexp.el";
-          rev = "c7251fce89c8585f2595e687d8d7bc65cf465b5e";
-          sha256 = "1fczg710a0rjs932yv6vv9rwr9g5ii6cwva82nqfzyhlkf0b1sn5";
+          rev = "e368c4dbd3b7a95a14cbc3c25617b5f1bc5a7fb4";
+          sha256 = "1459hy5kgp0dkzy1jab41aibixgmrk9lk6ysn1801spd8gwph371";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/foreign-regexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/foreign-regexp";
           sha256 = "189cq8n759f28nx10fn3w4qbq7q49bb788kp9l70pj38jgnjn7n7";
           name = "foreign-regexp";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/foreign-regexp";
+          homepage = "https://melpa.org/#/foreign-regexp";
           license = lib.licenses.free;
         };
       }) {};
@@ -20879,13 +21734,13 @@
           sha256 = "00wqn8h50xr90pyvwk4sv552yiajlzq56wh6f6lad5w90j47q1lx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/foreman-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/foreman-mode";
           sha256 = "0p3kwbld05wf3dwcv0k6ynz727fiy0ik2srx4js9wvagy57x98kv";
           name = "foreman-mode";
         };
         packageRequires = [ dash dash-functional emacs f s ];
         meta = {
-          homepage = "http://melpa.org/#/foreman-mode";
+          homepage = "https://melpa.org/#/foreman-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -20900,13 +21755,13 @@
           sha256 = "0nj056x87gcpdqkgx3li5syp6wbj58a1mw2aqa48zflbqwyvs03i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/form-feed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/form-feed";
           sha256 = "1abwjkzi3irw0jwpv3f584zc72my9n8iq8zp5s0354xk6iwrl1rh";
           name = "form-feed";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/form-feed";
+          homepage = "https://melpa.org/#/form-feed";
           license = lib.licenses.free;
         };
       }) {};
@@ -20921,13 +21776,13 @@
           sha256 = "0mikksamljps1czacgqavlnzzhgs8s3f8q4jza6v3csf8kgp5zd0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/format-sql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/format-sql";
           sha256 = "0684xqzs933vj9d3n3lv7afk4gii41kaqykbb05cribaswapsanj";
           name = "format-sql";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/format-sql";
+          homepage = "https://melpa.org/#/format-sql";
           license = lib.licenses.free;
         };
       }) {};
@@ -20942,13 +21797,13 @@
           sha256 = "1nqx2igxmwswjcrnzdjpx5qcjr60zjy3q9cadq5disms17wdcr6y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fortpy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fortpy";
           sha256 = "1nn5vx1rspfsijwhilnjhiy0mjw154ds3lwxvkpwxpchygirlyxj";
           name = "fortpy";
         };
         packageRequires = [ auto-complete epc pos-tip python-environment ];
         meta = {
-          homepage = "http://melpa.org/#/fortpy";
+          homepage = "https://melpa.org/#/fortpy";
           license = lib.licenses.free;
         };
       }) {};
@@ -20963,13 +21818,13 @@
           sha256 = "1kk04hl2y2svrs07w4pq9f4g7vs9qzy2qpw9prvi1gravmnfrzc4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fortune-cookie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fortune-cookie";
           sha256 = "0xg0zk7hnyhnbhqpxnzrgqs5yz0sy6wb0n9982qc0pa6jqnl9z78";
           name = "fortune-cookie";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fortune-cookie";
+          homepage = "https://melpa.org/#/fortune-cookie";
           license = lib.licenses.free;
         };
       }) {};
@@ -20984,13 +21839,13 @@
           sha256 = "1zy45s1m1injwr4d1qvpnvfvv4nkkv9mricshxjannsjfbz09ra7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fountain-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fountain-mode";
           sha256 = "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840";
           name = "fountain-mode";
         };
         packageRequires = [ emacs s ];
         meta = {
-          homepage = "http://melpa.org/#/fountain-mode";
+          homepage = "https://melpa.org/#/fountain-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -20999,17 +21854,17 @@
         pname = "frame-cmds";
         version = "20160124.1026";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/frame-cmds.el";
+          url = "https://www.emacswiki.org/emacs/download/frame-cmds.el";
           sha256 = "1867zmm3pyqz8p9ig44jf598z9jkyvbp04mfg6j6ys3hyqfkw942";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/frame-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/frame-cmds";
           sha256 = "0xwzp6sgcb5ap76hpzm8g4kl08a8cgq7i2x9w64njyfink7frwc0";
           name = "frame-cmds";
         };
         packageRequires = [ frame-fns ];
         meta = {
-          homepage = "http://melpa.org/#/frame-cmds";
+          homepage = "https://melpa.org/#/frame-cmds";
           license = lib.licenses.free;
         };
       }) {};
@@ -21017,17 +21872,17 @@
         pname = "frame-fns";
         version = "20151231.1522";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/frame-fns.el";
+          url = "https://www.emacswiki.org/emacs/download/frame-fns.el";
           sha256 = "0lvlyxb62sgrm37hc21dn7qzlrq2yagiwpspa926q6dpzcsbam15";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/frame-fns";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/frame-fns";
           sha256 = "1wq8wva9q1hdzkvjk582a3fgig0lpqz9ch1p2jd6p29kb1i15f5p";
           name = "frame-fns";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/frame-fns";
+          homepage = "https://melpa.org/#/frame-fns";
           license = lib.licenses.free;
         };
       }) {};
@@ -21042,13 +21897,13 @@
           sha256 = "0n6jhm1198c8slvdymsfjif0dfx3wlf8q4mm0yvpiln46shhwldx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/frame-restore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/frame-restore";
           sha256 = "0b321iyf57nkrm6xv8d1aydivrdapdgng35zcnrg298ws2naysvm";
           name = "frame-restore";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/frame-restore";
+          homepage = "https://melpa.org/#/frame-restore";
           license = lib.licenses.free;
         };
       }) {};
@@ -21063,13 +21918,13 @@
           sha256 = "1vvkdgj8warl40kqmd0408q46dxy9qp2sclq4q92b6falry9qy30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/frame-tag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/frame-tag";
           sha256 = "1n13xcc3ny9j9h1h4vslpjl6k9mqksr73kgmqrmkq301p8zps94q";
           name = "frame-tag";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/frame-tag";
+          homepage = "https://melpa.org/#/frame-tag";
           license = lib.licenses.free;
         };
       }) {};
@@ -21077,17 +21932,17 @@
         pname = "framemove";
         version = "20130328.633";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/framemove.el";
+          url = "https://www.emacswiki.org/emacs/download/framemove.el";
           sha256 = "03ll68d0j0b55rfxymzcirdigkmxcy8556d0i67ghdzmcqfwily7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/framemove";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/framemove";
           sha256 = "10qf017j0zfnzmcs1i56pznhbvgw7mv4232p8znqaaxphgh6r0ar";
           name = "framemove";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/framemove";
+          homepage = "https://melpa.org/#/framemove";
           license = lib.licenses.free;
         };
       }) {};
@@ -21102,13 +21957,13 @@
           sha256 = "11h9xw6jnw7dacyv1jch2a77xp7hfb93690m7hhazy6l87xmm4dk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/framesize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/framesize";
           sha256 = "1rwiwx3n7gkpfihbf6ndl1lxza4zi2rlj5av6lfp5qypbw9wddkf";
           name = "framesize";
         };
         packageRequires = [ key-chord ];
         meta = {
-          homepage = "http://melpa.org/#/framesize";
+          homepage = "https://melpa.org/#/framesize";
           license = lib.licenses.free;
         };
       }) {};
@@ -21123,13 +21978,13 @@
           sha256 = "12rmwf7gm9ib2c99jangygh2yswy41vxlp90rg0hvlhdfmbqa8p0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/free-keys";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/free-keys";
           sha256 = "0j9cfgy2nkbska4lm5z32p804i9n8pdgn50bs5zzk1ilwd5vbalj";
           name = "free-keys";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/free-keys";
+          homepage = "https://melpa.org/#/free-keys";
           license = lib.licenses.free;
         };
       }) {};
@@ -21144,13 +21999,13 @@
           sha256 = "0zwlnzbi91hkfz1jgj9s9pxwi21s21cwp6psdm687wj2a3wy4231";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fringe-current-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fringe-current-line";
           sha256 = "125yn0wbrrxrmdn7qfxj0f4538sb3xnqb3r2inz3gpblc1vxnqb8";
           name = "fringe-current-line";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fringe-current-line";
+          homepage = "https://melpa.org/#/fringe-current-line";
           license = lib.licenses.free;
         };
       }) {};
@@ -21165,34 +22020,34 @@
           sha256 = "0ra9rc53l1gvkqank8apasl3r7wz2yfjrcvmfk3wpxhh24ppxv9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fringe-helper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fringe-helper";
           sha256 = "1vki5jd8jfrlrjcfd12gisgk12y20q3943i2qjgg4qvcj9k28cbv";
           name = "fringe-helper";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fringe-helper";
+          homepage = "https://melpa.org/#/fringe-helper";
           license = lib.licenses.free;
         };
       }) {};
-    fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, s }:
+    fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, s }:
     melpaBuild {
         pname = "fsharp-mode";
-        version = "20160205.900";
+        version = "20160414.1020";
         src = fetchFromGitHub {
           owner = "rneatherway";
           repo = "emacs-fsharp-mode-bin";
-          rev = "3dd9cb858266608570ca264ec308f9776c370045";
-          sha256 = "0q802gykb3rmn4ssqhs92d23r38jgshl8pjy2y6shmizmixzykml";
+          rev = "29fa2a8c62b6ee564977d86ec815ad7a8899f7f1";
+          sha256 = "0rj4dyhygn8bhhwf4cbs6mfz5vwl4x6f0664vi0rmhc6ghwbzy6k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fsharp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fsharp-mode";
           sha256 = "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z";
           name = "fsharp-mode";
         };
-        packageRequires = [ company company-quickhelp dash pos-tip s ];
+        packageRequires = [ company company-quickhelp dash popup pos-tip s ];
         meta = {
-          homepage = "http://melpa.org/#/fsharp-mode";
+          homepage = "https://melpa.org/#/fsharp-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -21203,37 +22058,37 @@
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "247c9fc0a5f59a6df137d7cd82644b13ab4050ee";
-          sha256 = "1257wsxvxp412s5vvaqf541kj1fr5whhlyalkfb0b2k1madal2al";
+          rev = "26a7f489cc553e93a50595f45f000bbca66573ee";
+          sha256 = "0vw6z68b99llcj10jy7vbmirlx62j23rgzxgdngl7kj6rfg9llpy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fstar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fstar-mode";
           sha256 = "0kyzkghdkrnqqbd5b969pjyz9jxgq0j8hkmvlcwikl7ynnhm9lgy";
           name = "fstar-mode";
         };
         packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/fstar-mode";
+          homepage = "https://melpa.org/#/fstar-mode";
           license = lib.licenses.free;
         };
       }) {};
     fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fuel";
-        version = "20151204.543";
+        version = "20160328.729";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "69d5a3a276439b1b7b249dbfce2f8c46549536c1";
-          sha256 = "c05f9f72c6a0f3582aecc258d8187a9e809041fd79ebcaed735b6803cdb7e4ac";
+          rev = "20e8ca1f9e8fcfdbe8898e06b149d51b7254933d";
+          sha256 = "072cbl5n4lyshnyij7vdyz5xhv0lbh0z4kjx9rcvwr1zcmw2w75x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fuel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fuel";
           sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
           name = "fuel";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/fuel";
+          homepage = "https://melpa.org/#/fuel";
           license = lib.licenses.free;
         };
       }) {};
@@ -21248,34 +22103,34 @@
           sha256 = "0bjny4ryrs788myhiaf3ir99vadf2v4swa5gkz9i36a7j6wzpgk5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/full-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/full-ack";
           sha256 = "09ikhyhpvkcl6yl6pa4abnw6i7yfsx5jkmzypib94w7khikvb309";
           name = "full-ack";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/full-ack";
+          homepage = "https://melpa.org/#/full-ack";
           license = lib.licenses.free;
         };
       }) {};
     fullframe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fullframe";
-        version = "20160210.118";
+        version = "20160223.242";
         src = fetchFromGitHub {
           owner = "tomterl";
           repo = "fullframe";
-          rev = "3c046dd4c27a5c96d9dc3bc50a44eb1e7fd68912";
-          sha256 = "1narmlcd8ycwkmsrgk64l7q0ljsbq2fsikl8hjbrsc20nma032m4";
+          rev = "53872482447c46554760a73d99e6a4822d676664";
+          sha256 = "06f5qqhqgdrdc2dk7vyb5l6z5nsa5gpkfbm36vnfydj4mchvlr8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fullframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fullframe";
           sha256 = "08sh8lmb6g8asv28fcb36ilcn0ka4fc6ka0pnslid0h4c32fxp2a";
           name = "fullframe";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/fullframe";
+          homepage = "https://melpa.org/#/fullframe";
           license = lib.licenses.free;
         };
       }) {};
@@ -21290,32 +22145,34 @@
           sha256 = "067fmk46wk6jpc01wylagw948sgs3ndrq18mp3x81pdv3dykzmr6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/function-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/function-args";
           sha256 = "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak";
           name = "function-args";
         };
         packageRequires = [ swiper ];
         meta = {
-          homepage = "http://melpa.org/#/function-args";
+          homepage = "https://melpa.org/#/function-args";
           license = lib.licenses.free;
         };
       }) {};
-    furl = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+    furl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "furl";
-        version = "20110112.1907";
-        src = fetchhg {
-          url = "https://code.google.com/p/furl-el/";
-          rev = "9a96eeea0046";
-          sha256 = "109z1d0zrya1s9wy28nz5ynpg4zl7i1p6q1n57m1b1kkhhckjcv5";
+        version = "20150508.2216";
+        src = fetchFromGitHub {
+          owner = "nex3";
+          repo = "furl-el";
+          rev = "014438271e0ef27333dfcd599cb247f12a20d870";
+          sha256 = "0wrmbvx0risdjkaxqmh4li6iwvg4635cdpjvw32k2wkdsyn2dlsb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/furl";
-          sha256 = "15njmanpj3qb8ic3k4sbrngqnsg85lvlj32dmii3y9bpgvis3k6f";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/furl";
+          sha256 = "1z3yqx95qmvpi6vkkgcwvkmw96s24h8ssd5gc06988picw6vj76f";
           name = "furl";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/furl";
+          homepage = "https://melpa.org/#/furl";
           license = lib.licenses.free;
         };
       }) {};
@@ -21330,13 +22187,13 @@
           sha256 = "0rzp8c2164w775ggm2fs4j5dz33vqcah84ysp81majirwfql1niv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fuzzy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fuzzy";
           sha256 = "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h";
           name = "fuzzy";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fuzzy";
+          homepage = "https://melpa.org/#/fuzzy";
           license = lib.licenses.free;
         };
       }) {};
@@ -21344,17 +22201,17 @@
         pname = "fuzzy-format";
         version = "20130824.700";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/fuzzy-format.el";
+          url = "https://www.emacswiki.org/emacs/download/fuzzy-format.el";
           sha256 = "1iv0x1cb12kknnxyq2gca7m3c3rg9s4cxz397sazkh1csrn0b2i7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fuzzy-format";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fuzzy-format";
           sha256 = "055b8710yxbi2sdqsqk6jqgnzky4nykv8jgqgwy8q2isgj6q98jb";
           name = "fuzzy-format";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fuzzy-format";
+          homepage = "https://melpa.org/#/fuzzy-format";
           license = lib.licenses.free;
         };
       }) {};
@@ -21362,38 +22219,38 @@
         pname = "fuzzy-match";
         version = "20151231.1523";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/fuzzy-match.el";
+          url = "https://www.emacswiki.org/emacs/download/fuzzy-match.el";
           sha256 = "1q3gbv9xp2jxrf9vfarjqk9k805xc9z72zbaw7aqdxrj1bafxwnz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fuzzy-match";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fuzzy-match";
           sha256 = "0mpy84f2zdyzmipzhs06b8rl2pxiypazf35ls1nc1yj8r16ijrds";
           name = "fuzzy-match";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fuzzy-match";
+          homepage = "https://melpa.org/#/fuzzy-match";
           license = lib.licenses.free;
         };
       }) {};
     fvwm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fvwm-mode";
-        version = "20160217.859";
+        version = "20160411.638";
         src = fetchFromGitHub {
           owner = "theBlackDragon";
           repo = "fvwm-mode";
-          rev = "89d5dad68224ada08378014c0fee1111a5830c2b";
-          sha256 = "14nr19skannq60cvvxg359vb45jxs593mmz370v1hi6k652z4pny";
+          rev = "6832a1c1f68bf6249c3fd6672ea8e27dc7a5c79e";
+          sha256 = "03zmk4v259pqx7gkwqq95lccn78rwmh7iq5j0d5jj4jf9h39rr20";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fvwm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fvwm-mode";
           sha256 = "07y32cnp4qfhncp7s24gmlxljdrj5miicinfaf4gc7hihb4bkrkb";
           name = "fvwm-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fvwm-mode";
+          homepage = "https://melpa.org/#/fvwm-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -21408,34 +22265,34 @@
           sha256 = "08qnyr945938hwjg1ypkf2x4mfxbh3bbf1xrgz1rk2ddrfv7hmkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fwb-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fwb-cmds";
           sha256 = "0wnjvi0v0l2h1mhwlsk2d8ggwh3nk7pks48l55gp18nmj00jxycx";
           name = "fwb-cmds";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fwb-cmds";
+          homepage = "https://melpa.org/#/fwb-cmds";
           license = lib.licenses.free;
         };
       }) {};
     fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "fxrd-mode";
-        version = "20160210.1733";
+        version = "20160311.1815";
         src = fetchFromGitHub {
           owner = "msherry";
           repo = "fxrd-mode";
-          rev = "28792b17878c5e8c45b81c53bef83b751a73119c";
-          sha256 = "1p0l3fvbpvwdg4p82yj9ab7fxmsyvrvqsbclrvns6k3xlgpcrcbc";
+          rev = "841e9d26ed5020b7320ca5a2daed0577bbd670be";
+          sha256 = "1w0h369s8rii1n88xqy4rnkyr5y5w6zybbnmjcw68gp43jzqfkjw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fxrd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fxrd-mode";
           sha256 = "17zimg64lqc1yh9gnp5izshkvviz996aym7q6n9p61a4kqq37z4r";
           name = "fxrd-mode";
         };
         packageRequires = [ s ];
         meta = {
-          homepage = "http://melpa.org/#/fxrd-mode";
+          homepage = "https://melpa.org/#/fxrd-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -21450,13 +22307,13 @@
           sha256 = "08x5li0mshrlamr7vswy7xh358bqhh3pngjr4ckswfi0l2r5fjbd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fyure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fyure";
           sha256 = "0k5z2xqlrzp5lyvp2lr462x38kqdmqld845bvyvkfjd2k4yri71x";
           name = "fyure";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fyure";
+          homepage = "https://melpa.org/#/fyure";
           license = lib.licenses.free;
         };
       }) {};
@@ -21471,13 +22328,34 @@
           sha256 = "0rjn4z7ssl1jy0brvsci44mhpig3zkdbcj8gcylzznhz0qfk1ljj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fzf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fzf";
           sha256 = "0jjzm1gq85fx1gmj6nqaijnjws9bm8hmk40ws3x7fmsp41qq5py0";
           name = "fzf";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/fzf";
+          homepage = "https://melpa.org/#/fzf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gams-mode";
+        version = "20160320.428";
+        src = fetchFromGitHub {
+          owner = "ShiroTakeda";
+          repo = "gams-mode";
+          rev = "268ee8b4554446104d200de3ffbd2f067b20cb3f";
+          sha256 = "16x3fz2ljrmqhjy7w96fhp3j9ja2gib042c363yfrzwa7q5rxzd2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gams-mode";
+          sha256 = "0hx9mv4sqskz4nn7aks64hqd4vn3m7b34abzhy9bnmyw6d5zzfci";
+          name = "gams-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/gams-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -21492,13 +22370,13 @@
           sha256 = "0sn3y1ilbg532mg941qmzipvzq86q31x86ypaf0h0m4015r7l59v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gandalf-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gandalf-theme";
           sha256 = "0wkmsg3pdw98gyp3q508wsqkzw821qsqi796ynm53zd7a4jfap4p";
           name = "gandalf-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gandalf-theme";
+          homepage = "https://melpa.org/#/gandalf-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -21511,13 +22389,13 @@
           sha256 = "1jsw2mywc0y8sf7yl7y3i3l8vs3jv1srjf34lgb5xfz6p8wc5lc0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gap-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gap-mode";
           sha256 = "07whab3gi4b8gsvy5ijmjnj700lw0rm3bnr1769byhnpi7qpqin2";
           name = "gap-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gap-mode";
+          homepage = "https://melpa.org/#/gap-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -21532,13 +22410,13 @@
           sha256 = "0j0dg7nl9kmanayvw0712x5c5x9h48qmqdsyi0pijvgmv8l5slg5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gather";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gather";
           sha256 = "1f0cqqp1a7w8g1pfvzxxb0hjrxq4m79a4n85dncqj2xhjxrkm0xk";
           name = "gather";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gather";
+          homepage = "https://melpa.org/#/gather";
           license = lib.licenses.free;
         };
       }) {};
@@ -21551,13 +22429,13 @@
           sha256 = "01kbvmylymm6qww45mbjjxmb8ccdl9c2pxdyqfq3g73vwzrvndk4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/geben";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/geben";
           sha256 = "1hvvy1kp8wrb1qasm42fslgdkg095g4jxgzbnwpa4vp5cq270qbm";
           name = "geben";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/geben";
+          homepage = "https://melpa.org/#/geben";
           license = lib.licenses.free;
         };
       }) {};
@@ -21572,34 +22450,55 @@
           sha256 = "14v5gm931dcsfflhsvijr4ihx7cs6jymvnjzph3arvhvqwyqhwgq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/geeknote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/geeknote";
           sha256 = "1ci82fj3layd95lqj2w40y87xps6bs7x05z8ai9m59k244g26m8v";
           name = "geeknote";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/geeknote";
+          homepage = "https://melpa.org/#/geeknote";
           license = lib.licenses.free;
         };
       }) {};
     geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "geiser";
-        version = "20160215.1932";
+        version = "20160422.1920";
         src = fetchFromGitHub {
           owner = "jaor";
           repo = "geiser";
-          rev = "c425acc5528bd24ca90fa7b5b3c3edba12b8f4fb";
-          sha256 = "1na5wq15prn1qkla1bxg0jb8k86kdczvm4if878f7djj4vhkvxx5";
+          rev = "dcaf849ccdfd488fb26e0d9131bbc59928690e0d";
+          sha256 = "018kcbmwm8nqv2hgg0sfsdb2fz6ikhrqgzf1l1rr4knpcrrj8s6g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/geiser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/geiser";
           sha256 = "067rrjvyn5sz60w9h7qn542d9iycm2q4ryvx3n6xlard0dky5596";
           name = "geiser";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/geiser";
+          homepage = "https://melpa.org/#/geiser";
+          license = lib.licenses.free;
+        };
+      }) {};
+    general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "general";
+        version = "20160424.1829";
+        src = fetchFromGitHub {
+          owner = "noctuid";
+          repo = "general.el";
+          rev = "10f0a0e6b308c8f59011edc13c5b184fcb949d58";
+          sha256 = "0kng0bfb0wsa1ds907yhcrynv4cvzsf805l1kiqd736bkqi17vjq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/general";
+          sha256 = "104ywsfylfymly64p1i3hsy9pnpz3dkpmcq1ygafnld8zjd08gpc";
+          name = "general";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/general";
           license = lib.licenses.free;
         };
       }) {};
@@ -21610,17 +22509,17 @@
         src = fetchFromGitHub {
           owner = "emacs-berlin";
           repo = "general-close";
-          rev = "e12d26ffc59f62aeee31ad16a823cb4a390d85c8";
-          sha256 = "1l3ps28a1wdrg2fgvvkdxdadfgpplijs4ig1yqq8yi7k13k046p4";
+          rev = "5d3beb49c06c5df0ba7c305f64d31db2c93760af";
+          sha256 = "1x9v8w224ifww0mn4a1rj60pi53h9iv1vli1n74a778bqv54vz3d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/general-close";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/general-close";
           sha256 = "17v0aprfvxbygx5517a8hrl88qm5lb9k7523yd0ps5p9l5x96964";
           name = "general-close";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/general-close";
+          homepage = "https://melpa.org/#/general-close";
           license = lib.licenses.free;
         };
       }) {};
@@ -21635,13 +22534,13 @@
           sha256 = "08cw1fa25kbhbq2sp1cpn90bz38i9hjfdj93xf6wvki55b52s0nn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/genrnc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/genrnc";
           sha256 = "1nwbdscl0yh9j1n421can93m6s8j9dkyb3xmpampr6x528g6z0lm";
           name = "genrnc";
         };
         packageRequires = [ concurrent deferred log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/genrnc";
+          homepage = "https://melpa.org/#/genrnc";
           license = lib.licenses.free;
         };
       }) {};
@@ -21656,13 +22555,13 @@
           sha256 = "0344w4sbd6wlgl13j163v0hzjw9nwhvpr5s7658xsdd90wp4i701";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/german-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/german-holidays";
           sha256 = "0fgrxdgyl6va6axjc5l4sp90pyqaz5zha1g73xyhbxblshm5dwxn";
           name = "german-holidays";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/german-holidays";
+          homepage = "https://melpa.org/#/german-holidays";
           license = lib.licenses.free;
         };
       }) {};
@@ -21677,13 +22576,13 @@
           sha256 = "1ch8yp0mgk57x0pny9bvkknsqj27fd1rcmpm9s7qpryrwqkp1ix4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gerrit-download";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gerrit-download";
           sha256 = "1rlz0iqgvr8yxnv5qmk29xs1jwf0g0ckzanlyldcxvs7n6mhkjjp";
           name = "gerrit-download";
         };
         packageRequires = [ emacs magit ];
         meta = {
-          homepage = "http://melpa.org/#/gerrit-download";
+          homepage = "https://melpa.org/#/gerrit-download";
           license = lib.licenses.free;
         };
       }) {};
@@ -21698,13 +22597,13 @@
           sha256 = "0bwjiq4a4f5pg0ngvc3lmkk7aki8n9zqfa1dym0lk4vy6yfhcbhp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ggo-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ggo-mode";
           sha256 = "1403x530n90jlfz3lq2vfiqx84cxsrhgs6hhmniq960cjj31q35p";
           name = "ggo-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ggo-mode";
+          homepage = "https://melpa.org/#/ggo-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -21719,34 +22618,34 @@
           sha256 = "1qjh7av046ax4240iw40hv5fc0k23c36my9hili7fp4y2ak99l8n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ggtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ggtags";
           sha256 = "1cmry4knxbx9257ivhfxsd09z07z3g3wjihi99nrwmhb9h4mpqyw";
           name = "ggtags";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ggtags";
+          homepage = "https://melpa.org/#/ggtags";
           license = lib.licenses.free;
         };
       }) {};
     gh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, logito, melpaBuild, pcache }:
     melpaBuild {
         pname = "gh";
-        version = "20151216.946";
+        version = "20160222.2011";
         src = fetchFromGitHub {
           owner = "sigma";
           repo = "gh.el";
-          rev = "3ceef078d9418cf19e1fe6be15cf34794a14880a";
-          sha256 = "0fkq3yl9jpakfnahymjv28fcal38c210garnq055rgmyhyhhpdwd";
+          rev = "202cbd71f9b7fff1547589fab7e4fba2c79f0fc5";
+          sha256 = "10iy5sfyqnz3mrl951j9skxp1s8zm6cqmsadgbxnl9fj3br3ygd1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gh";
           sha256 = "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0";
           name = "gh";
         };
         packageRequires = [ emacs logito pcache ];
         meta = {
-          homepage = "http://melpa.org/#/gh";
+          homepage = "https://melpa.org/#/gh";
           license = lib.licenses.free;
         };
       }) {};
@@ -21761,13 +22660,13 @@
           sha256 = "0g3bjpnwgqczw6ddh4mv7pby0zyqzqgywjrjz2ib6hwmdqzyp1s0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gh-md";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gh-md";
           sha256 = "0b72fl1hj7gkqlqrr8hklq0w3ryqqqfn5qpb7a9i6q0vh98652xm";
           name = "gh-md";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/gh-md";
+          homepage = "https://melpa.org/#/gh-md";
           license = lib.licenses.free;
         };
       }) {};
@@ -21776,19 +22675,19 @@
         pname = "ghc";
         version = "20160108.901";
         src = fetchFromGitHub {
-          owner = "kazu-yamamoto";
+          owner = "DanielG";
           repo = "ghc-mod";
-          rev = "add699af4831b7b7df5d65ed7203427a125d1888";
-          sha256 = "0lpxiqjyqsqjf36q3j078xcv10llljqyvm4knwgijd35axsxrcvf";
+          rev = "c925e920a0b913d0c93f1400e416312bc73fcc14";
+          sha256 = "19g2pq3l8zsd8c5r594071b610dsxch2wbprmw91myhydrvaz3zz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ghc";
-          sha256 = "0xqriwggd1ahla5aff7k0j4admx6q18rmqsx3ipn4nfk86wrhb8g";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ghc";
+          sha256 = "02nc7a9khqpd4ca2snam8dq72m53q8x7v5awx56bjq31z6vcmav5";
           name = "ghc";
         };
         packageRequires = [ haskell-mode ];
         meta = {
-          homepage = "http://melpa.org/#/ghc";
+          homepage = "https://melpa.org/#/ghc";
           license = lib.licenses.free;
         };
       }) {};
@@ -21803,13 +22702,13 @@
           sha256 = "1ywwyc2kz1c1s26c412nmzh55cinh84cfiazyyi3jsy5zzwhrbhi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ghc-imported-from";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ghc-imported-from";
           sha256 = "10cxz4c341lknyz4ns63bri00mya39278xav12c73if03llsyzy5";
           name = "ghc-imported-from";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ghc-imported-from";
+          homepage = "https://melpa.org/#/ghc-imported-from";
           license = lib.licenses.free;
         };
       }) {};
@@ -21824,13 +22723,13 @@
           sha256 = "17fl3k2sqiavbv3bp6rnp3p89j6pnpkkp7wi26pzzk4675r5k45q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ghci-completion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ghci-completion";
           sha256 = "1a6k47z5kmacj1s5479393jyj27bjx0911yaqfmmwg2hr0yz7vll";
           name = "ghci-completion";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ghci-completion";
+          homepage = "https://melpa.org/#/ghci-completion";
           license = lib.licenses.free;
         };
       }) {};
@@ -21845,13 +22744,13 @@
           sha256 = "0lcbyw6yrl6c8py5v2hqghcbsf9cbiplzil90al4lwqps7rw09a8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gherkin-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gherkin-mode";
           sha256 = "0dhrsz24hn0sdf22wpmzbkn66g4540vdkl03pc27kv21gwa9ixxv";
           name = "gherkin-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gherkin-mode";
+          homepage = "https://melpa.org/#/gherkin-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -21866,13 +22765,13 @@
           sha256 = "1aj5j0y244r1fbbbl0lzb53wnyhljw91kb4n3hi2gagm7zwp8jcf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ghq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ghq";
           sha256 = "0prvywcgwdhx5pw66rv5kkfriahal2mli2ibam5np3z6bwcq4ngh";
           name = "ghq";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ghq";
+          homepage = "https://melpa.org/#/ghq";
           license = lib.licenses.free;
         };
       }) {};
@@ -21887,13 +22786,13 @@
           sha256 = "1na8pp1g940zi22jgqi6drsm12db0hyw99v493i5j1p2y67c4hxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gildas-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gildas-mode";
           sha256 = "0bc3d8bnvg1w2chrr4rp9daq1x8p41qgklrniq0bbkr2h93cmkgv";
           name = "gildas-mode";
         };
         packageRequires = [ emacs polymode ];
         meta = {
-          homepage = "http://melpa.org/#/gildas-mode";
+          homepage = "https://melpa.org/#/gildas-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -21908,13 +22807,13 @@
           sha256 = "18433gjhra0gqrwnxssd3njpxbvqhh64bds9rym1vq9l7w09z024";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gist";
           sha256 = "053fl8aw0ram9wsabzvmlm5w2klwd2pgcn2w9r1yqfs4xqja5sd3";
           name = "gist";
         };
         packageRequires = [ emacs gh ];
         meta = {
-          homepage = "http://melpa.org/#/gist";
+          homepage = "https://melpa.org/#/gist";
           license = lib.licenses.free;
         };
       }) {};
@@ -21929,13 +22828,13 @@
           sha256 = "0471xm0h6jkmxnrcqy5agq42i8immdb2qpnw7q7czrbsl521al8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git";
           sha256 = "1nd2yvfgin13m368gjn7xah99glspnam4g4fh348x4makxcaw8w5";
           name = "git";
         };
         packageRequires = [ dash f s ];
         meta = {
-          homepage = "http://melpa.org/#/git";
+          homepage = "https://melpa.org/#/git";
           license = lib.licenses.free;
         };
       }) {};
@@ -21950,13 +22849,13 @@
           sha256 = "0d2blcnyqd1br7zhwprdxpx2jphjhsb4jgaw9dr4gvv0xdb2sr87";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-annex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-annex";
           sha256 = "0194y24vq1w6m2cjgqgx9dqp99cq8y9licyry2zxa5brbrsxi94l";
           name = "git-annex";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/git-annex";
+          homepage = "https://melpa.org/#/git-annex";
           license = lib.licenses.free;
         };
       }) {};
@@ -21971,13 +22870,13 @@
           sha256 = "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-auto-commit-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-auto-commit-mode";
           sha256 = "0nf4n63xnzcsizjk1yl8qvqj9wjdqy57kvn6r736xvsxwzd44xgl";
           name = "git-auto-commit-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/git-auto-commit-mode";
+          homepage = "https://melpa.org/#/git-auto-commit-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -21992,13 +22891,13 @@
           sha256 = "0g839pzmipjlv32r0gh166jn3na5d0wh2w1sia2k4yx1w0ch1bsx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-blame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-blame";
           sha256 = "0glmnj77vya8ivjin4qja7lis67wyibzy9k6z8b54z7mqf9ikx06";
           name = "git-blame";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/git-blame";
+          homepage = "https://melpa.org/#/git-blame";
           license = lib.licenses.free;
         };
       }) {};
@@ -22013,34 +22912,34 @@
           sha256 = "1irqmypgc4l1jlzj4g65ihpic3ffnnkcg1hlysj7qpip5nbflqgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-command";
           sha256 = "1hsxak63y6648n0jkzl5ajxg45w84qq8vljvjh0bmwfrbb67kwbg";
           name = "git-command";
         };
         packageRequires = [ term-run with-editor ];
         meta = {
-          homepage = "http://melpa.org/#/git-command";
+          homepage = "https://melpa.org/#/git-command";
           license = lib.licenses.free;
         };
       }) {};
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "20160130.849";
+        version = "20160425.630";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "08c61ea85ca62e8cc04c4e8a0a55a5d947a8d01f";
-          sha256 = "18jk5bl30kncbc5n7sra5i0n4d57c2nd348kmw154xq1dc7w8b64";
+          rev = "d1f678316f2c27e9677760938757b38168e36ebc";
+          sha256 = "01pcx8bx07vqzd3b3rb3y4hgv8fhrlal7ayn0f70nr01f3v0gfl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-commit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-commit";
           sha256 = "1i7122fydqga68cilgzir80xfq77hnrw75zrvn52mjymfli6aza2";
           name = "git-commit";
         };
         packageRequires = [ dash emacs with-editor ];
         meta = {
-          homepage = "http://melpa.org/#/git-commit";
+          homepage = "https://melpa.org/#/git-commit";
           license = lib.licenses.free;
         };
       }) {};
@@ -22055,13 +22954,13 @@
           sha256 = "1vdyrqg2w5q4xmazqqh2ymjnrp9p1x5172nllwryz43jvvxaw05s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-commit-insert-issue";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-commit-insert-issue";
           sha256 = "0mhpszm2y178dxgjv3kh2n744hg2kd60h16zbgmjf4f8228xw8j3";
           name = "git-commit-insert-issue";
         };
         packageRequires = [ github-issues helm projectile s ];
         meta = {
-          homepage = "http://melpa.org/#/git-commit-insert-issue";
+          homepage = "https://melpa.org/#/git-commit-insert-issue";
           license = lib.licenses.free;
         };
       }) {};
@@ -22069,38 +22968,38 @@
         pname = "git-dwim";
         version = "20130130.1550";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/git-dwim.el";
+          url = "https://www.emacswiki.org/emacs/download/git-dwim.el";
           sha256 = "074k1r8rkvyhhwnqy4gnyd7shidxgc25l1xq4hmnwjn13nsyqfnv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-dwim";
           sha256 = "0vdd2cksiqbnxplqbpb16bcmp137fj3p9a7pa0622wx8vd5p0rkr";
           name = "git-dwim";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/git-dwim";
+          homepage = "https://melpa.org/#/git-dwim";
           license = lib.licenses.free;
         };
       }) {};
     git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-gutter";
-        version = "20160210.228";
+        version = "20160409.913";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-git-gutter";
-          rev = "b680e11144863f67813cd8139bff7b13df9c6d8c";
-          sha256 = "0h4ascd1ywfx9mjssl9py6xj7g4q6h4ab7g8y7dgbs6yzjjyhyn4";
+          rev = "331643894d5be532b12e480d936014e2a9694f7d";
+          sha256 = "1493302p60gxi15v9zcz0s3pac4w1x2zmxas1lvj9micv379khhh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-gutter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-gutter";
           sha256 = "19s344i95piixlzq4mjgmgjw7cy8af02z6hg89jjjdbxrfl4i2fg";
           name = "git-gutter";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/git-gutter";
+          homepage = "https://melpa.org/#/git-gutter";
           license = lib.licenses.free;
         };
       }) {};
@@ -22115,13 +23014,13 @@
           sha256 = "0vc1da72vwlys723xi7xvv4ii43sjxgsywb2ss0l0kcm0rays6lv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-gutter-fringe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-gutter-fringe";
           sha256 = "10k07dzmkxsxzwc70vpv05rxjyps9494y6k7yhlv8d46x7xjyp0z";
           name = "git-gutter-fringe";
         };
         packageRequires = [ cl-lib emacs fringe-helper git-gutter ];
         meta = {
-          homepage = "http://melpa.org/#/git-gutter-fringe";
+          homepage = "https://melpa.org/#/git-gutter-fringe";
           license = lib.licenses.free;
         };
       }) {};
@@ -22136,13 +23035,13 @@
           sha256 = "1rsj193zpblndki4khjjlwl2njxb329d42l75ki55msxifqrn4fi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-gutter-fringe+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-gutter-fringe+";
           sha256 = "1zkjb8p08cq2nqskn79rjszlhp9mrblplgamgi66yskz8qb1bgcc";
           name = "git-gutter-fringe-plus";
         };
         packageRequires = [ fringe-helper git-gutter-plus ];
         meta = {
-          homepage = "http://melpa.org/#/git-gutter-fringe+";
+          homepage = "https://melpa.org/#/git-gutter-fringe+";
           license = lib.licenses.free;
         };
       }) {};
@@ -22157,13 +23056,13 @@
           sha256 = "0bhrrgdzzj8gwxjx7b2kibp1b6s0vgvykfg0n47iq49m6rqkgi5q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-gutter+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-gutter+";
           sha256 = "1w78p5cz6kyl9kmndgvwnfrs80ha707s8952hycrihgfb6lixmp0";
           name = "git-gutter-plus";
         };
         packageRequires = [ dash git-commit ];
         meta = {
-          homepage = "http://melpa.org/#/git-gutter+";
+          homepage = "https://melpa.org/#/git-gutter+";
           license = lib.licenses.free;
         };
       }) {};
@@ -22178,34 +23077,34 @@
           sha256 = "02p73q0kl9z44b9a2bhqg03mkqx6gf61n88qlwwg4420dxrf7sbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-lens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-lens";
           sha256 = "1vv3s89vk5ncinqh2f724z0qbbzp8g4y5y670ryy56w1l6v2acfb";
           name = "git-lens";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/git-lens";
+          homepage = "https://melpa.org/#/git-lens";
           license = lib.licenses.free;
         };
       }) {};
     git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-link";
-        version = "20150927.1225";
+        version = "20160401.2050";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "git-link";
-          rev = "00a8ed924d837d43bfdc486ab389ee400b6c2a8f";
-          sha256 = "1la3zzcjnmzgxkd4ljr9b5335ddbrvid47kfzp2s358xknzmbsdf";
+          rev = "3cb4ced58c48d372230efd10ee4a7f55f54945ea";
+          sha256 = "0a1kxdz05ly9wbzyxcb79xlmy11q38xplf5s8w8klmyajdn43g1j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-link";
           sha256 = "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7";
           name = "git-link";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/git-link";
+          homepage = "https://melpa.org/#/git-link";
           license = lib.licenses.free;
         };
       }) {};
@@ -22220,13 +23119,13 @@
           sha256 = "082g2gqbf8yjgvj2c32ix6j3wwba5fmgcyi75bf0q0bbg4ck5rab";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-messenger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-messenger";
           sha256 = "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn";
           name = "git-messenger";
         };
         packageRequires = [ cl-lib popup ];
         meta = {
-          homepage = "http://melpa.org/#/git-messenger";
+          homepage = "https://melpa.org/#/git-messenger";
           license = lib.licenses.free;
         };
       }) {};
@@ -22241,34 +23140,34 @@
           sha256 = "1v0jk35ynfg9hivw9gdz2snk73pac67xlfx7av8argdcss1bmyb0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-ps1-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-ps1-mode";
           sha256 = "15gswi9s0m3hrsl1qqyjnjgbglsai95klbdp51h3pcq7zj22wkn6";
           name = "git-ps1-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/git-ps1-mode";
+          homepage = "https://melpa.org/#/git-ps1-mode";
           license = lib.licenses.free;
         };
       }) {};
     git-timemachine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-timemachine";
-        version = "20160120.616";
+        version = "20160323.1440";
         src = fetchFromGitHub {
           owner = "pidu";
           repo = "git-timemachine";
-          rev = "7c66a878ee89861dcd59b5dfc598520daa156052";
-          sha256 = "1brz9dc7ngywndlxbqbi3pbjbjydgqc9bjzf05lgx0pzr1ppc3w3";
+          rev = "2e1674b1b5f2fcc485e19bb259eb2e4ab51aa914";
+          sha256 = "1iz5cy3fc7y56s4005syxnb1y3sn1q0s0nlpa01bnxksrfy5zahl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-timemachine";
           sha256 = "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq";
           name = "git-timemachine";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/git-timemachine";
+          homepage = "https://melpa.org/#/git-timemachine";
           license = lib.licenses.free;
         };
       }) {};
@@ -22283,34 +23182,34 @@
           sha256 = "1ivnf4vsqk6c7iw1cid7q1hxp7047ajd1mpg0fl002d7m7ginhyl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-wip-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-wip-timemachine";
           sha256 = "02fi51k6l23cgnwjp507ylkiwb8azmnhc0fips68nwn9dghzp6dw";
           name = "git-wip-timemachine";
         };
         packageRequires = [ s ];
         meta = {
-          homepage = "http://melpa.org/#/git-wip-timemachine";
+          homepage = "https://melpa.org/#/git-wip-timemachine";
           license = lib.licenses.free;
         };
       }) {};
     gitattributes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gitattributes-mode";
-        version = "20150330.1248";
+        version = "20160319.502";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "git-modes";
-          rev = "9d8f6eda6ee97963e4085da8988cad2c0547b8df";
-          sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
+          rev = "7ccc5de55fc370c328d7ec08de559e351b1ac94c";
+          sha256 = "0ksqfr0l415ynhxpqpcb84bk2bapvczwnpikp45kmfqq91p61xfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitattributes-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gitattributes-mode";
           sha256 = "1gjs0pjh6ap0h54savamzx94lq6vqrg58jxqaq5n5qplrbg15a6x";
           name = "gitattributes-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gitattributes-mode";
+          homepage = "https://melpa.org/#/gitattributes-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -22325,34 +23224,34 @@
           sha256 = "184q3vsxa9rvhc1n57ms47r73f3zap25wswzi66rm6rmfi2k7678";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitconfig";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gitconfig";
           sha256 = "126znl1c4vwgskj7ka9id8v2bdrdn5nkyx3mmc6cz9ylc27ainm7";
           name = "gitconfig";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gitconfig";
+          homepage = "https://melpa.org/#/gitconfig";
           license = lib.licenses.free;
         };
       }) {};
     gitconfig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gitconfig-mode";
-        version = "20150330.1248";
+        version = "20160319.502";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "git-modes";
-          rev = "9d8f6eda6ee97963e4085da8988cad2c0547b8df";
-          sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
+          rev = "7ccc5de55fc370c328d7ec08de559e351b1ac94c";
+          sha256 = "0ksqfr0l415ynhxpqpcb84bk2bapvczwnpikp45kmfqq91p61xfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitconfig-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gitconfig-mode";
           sha256 = "0hqky40kcgxdnghnf56gpi0xp7ik45ssia1x84v0mvfwqc50dgn1";
           name = "gitconfig-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gitconfig-mode";
+          homepage = "https://melpa.org/#/gitconfig-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -22367,13 +23266,13 @@
           sha256 = "0i3dkm0j4gh21b7r5vxr6dddql5rj7lg8xlaairvild0ccf3bhdl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/github-browse-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/github-browse-file";
           sha256 = "03xvgxlw7wmfby898din7dfcg87ihahkhlav1n7qklw6qi7skjcr";
           name = "github-browse-file";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/github-browse-file";
+          homepage = "https://melpa.org/#/github-browse-file";
           license = lib.licenses.free;
         };
       }) {};
@@ -22388,13 +23287,13 @@
           sha256 = "000m6w2akx1z1lb32nvy6qzyggpcvlbdjh1i8419rzaidxf5gaxg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/github-clone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/github-clone";
           sha256 = "0ffrm4lmcj3d9kx3g2d5xbiih7hn4frs0prjrvcjq8acvsbc50q9";
           name = "github-clone";
         };
         packageRequires = [ emacs gh magit ];
         meta = {
-          homepage = "http://melpa.org/#/github-clone";
+          homepage = "https://melpa.org/#/github-clone";
           license = lib.licenses.free;
         };
       }) {};
@@ -22409,13 +23308,13 @@
           sha256 = "065gpnllsk4x574fn9d6m4ajxl7mj5w2w5g9in421sp5r80fp9fv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/github-issues";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/github-issues";
           sha256 = "12c6yb3v7xwkzc51binfgl4jb3sm3al5nlrklbsxhn44alazsvb0";
           name = "github-issues";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/github-issues";
+          homepage = "https://melpa.org/#/github-issues";
           license = lib.licenses.free;
         };
       }) {};
@@ -22430,34 +23329,34 @@
           sha256 = "11nfpy39xdkjxaxbfn8rppj4rcz57wl15gyibp01j9w7wmb5b4pr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/github-notifier";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/github-notifier";
           sha256 = "1jqc2wx1pvkca8syj97ds32404szm0wn12b7zpa98265sg3n64nw";
           name = "github-notifier";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/github-notifier";
+          homepage = "https://melpa.org/#/github-notifier";
           license = lib.licenses.free;
         };
       }) {};
     gitignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gitignore-mode";
-        version = "20150330.1248";
+        version = "20160319.502";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "git-modes";
-          rev = "9d8f6eda6ee97963e4085da8988cad2c0547b8df";
-          sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
+          rev = "7ccc5de55fc370c328d7ec08de559e351b1ac94c";
+          sha256 = "0ksqfr0l415ynhxpqpcb84bk2bapvczwnpikp45kmfqq91p61xfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitignore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gitignore-mode";
           sha256 = "1i98ribmnxr4hwphd95f9hcfm5wfwgdbcxw3g0w17ws7z0ir61mn";
           name = "gitignore-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gitignore-mode";
+          homepage = "https://melpa.org/#/gitignore-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -22472,13 +23371,13 @@
           sha256 = "00mma30r7ixbrxjmmddz4klh517fcr3yn6ss4zw33fh2hzj3w6rl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitlab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gitlab";
           sha256 = "0vxsqfnipgapnd2ijvdnkspk68dlnki3pkpkzg2h6hyazmzrsqnq";
           name = "gitlab";
         };
         packageRequires = [ dash pkg-info request s ];
         meta = {
-          homepage = "http://melpa.org/#/gitlab";
+          homepage = "https://melpa.org/#/gitlab";
           license = lib.licenses.free;
         };
       }) {};
@@ -22493,13 +23392,13 @@
           sha256 = "1h66wywhl5ipryx0s0w1vxp3ydg57zpizjz61wvf6qd8zn07nhng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitolite-clone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gitolite-clone";
           sha256 = "1la1nrfns9j6wii6lriwwsd44cx3ksyhh09h8lf9dai6wp67kjac";
           name = "gitolite-clone";
         };
         packageRequires = [ dash emacs pcache s ];
         meta = {
-          homepage = "http://melpa.org/#/gitolite-clone";
+          homepage = "https://melpa.org/#/gitolite-clone";
           license = lib.licenses.free;
         };
       }) {};
@@ -22514,13 +23413,13 @@
           sha256 = "0y8msn22lzfwh7d417abay9by2zhs9zswhcj8a0l7ln2ksljl500";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitty";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gitty";
           sha256 = "1z6w4vbn0aaajyqanc7h1m5ali7dbrnh4ngw87a2x2pkxarx6x16";
           name = "gitty";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gitty";
+          homepage = "https://melpa.org/#/gitty";
           license = lib.licenses.free;
         };
       }) {};
@@ -22535,13 +23434,13 @@
           sha256 = "14ziljq34k585scwn606hqbkcvy8h1iylsc4h2n1grfmm8ilf0ws";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/glsl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/glsl-mode";
           sha256 = "0d05qb60k5f7wwpsp3amzghayfbwcha6rh8nrslhnklpjbg87aw5";
           name = "glsl-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/glsl-mode";
+          homepage = "https://melpa.org/#/glsl-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -22556,13 +23455,13 @@
           sha256 = "0j3pay3gd1wdnpc853gy5j68hbavrwy6cc2bgmd12ag29xki3hcg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gmail-message-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gmail-message-mode";
           sha256 = "0py0i7b893ihb8l1hmk3jfl0xil450znadcd18q7svr3zl2m0gkk";
           name = "gmail-message-mode";
         };
         packageRequires = [ ham-mode ];
         meta = {
-          homepage = "http://melpa.org/#/gmail-message-mode";
+          homepage = "https://melpa.org/#/gmail-message-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -22577,13 +23476,13 @@
           sha256 = "01hhanijqlh741f9wh6xn88qvghwqnfj5j0rvys5mghssfspqs3z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gmail2bbdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gmail2bbdb";
           sha256 = "03jhrk4vpjim3ybzjxy7s9r1cgjysj9vlc4criz5k0w7vqz3r28j";
           name = "gmail2bbdb";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gmail2bbdb";
+          homepage = "https://melpa.org/#/gmail2bbdb";
           license = lib.licenses.free;
         };
       }) {};
@@ -22598,13 +23497,13 @@
           sha256 = "08d6j5wws2ngngf3p31ic0lrsrp9i9lkpr3nxgmiiadm617x8hv4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gmpl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gmpl-mode";
           sha256 = "1f60xim8h85jmqpvgfg402ff8mjd66gla8fa0cwi7l18ijnjblpz";
           name = "gmpl-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/gmpl-mode";
+          homepage = "https://melpa.org/#/gmpl-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -22619,13 +23518,13 @@
           sha256 = "160qm8xf0yghygb52p8cykhb5vpg9ww3gjprcdkcxplr4b230nnc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnome-calendar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gnome-calendar";
           sha256 = "00clamlm5b42zqggxywdqrf6s2dnsxir5rpd8mjpyc502kqmsfn6";
           name = "gnome-calendar";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gnome-calendar";
+          homepage = "https://melpa.org/#/gnome-calendar";
           license = lib.licenses.free;
         };
       }) {};
@@ -22640,13 +23539,13 @@
           sha256 = "1svnvm9fqqx4mrk9jjn11pzqwk71w8kyyd9wwxam8gz22ykw5jb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnomenm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gnomenm";
           sha256 = "01vmr64j6hcvdbzg945c5a2g4fiidl18dsk4px7mdf85cv45kzqm";
           name = "gnomenm";
         };
         packageRequires = [ dash kv s ];
         meta = {
-          homepage = "http://melpa.org/#/gnomenm";
+          homepage = "https://melpa.org/#/gnomenm";
           license = lib.licenses.free;
         };
       }) {};
@@ -22661,34 +23560,34 @@
           sha256 = "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gntp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gntp";
           sha256 = "1ywj3p082g54dcpy8q4jnkqfr12npikx8yz14r0njxdlr0janh4f";
           name = "gntp";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gntp";
+          homepage = "https://melpa.org/#/gntp";
           license = lib.licenses.free;
         };
       }) {};
     gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gnu-apl-mode";
-        version = "20151224.1059";
+        version = "20160306.2106";
         src = fetchFromGitHub {
           owner = "lokedhs";
           repo = "gnu-apl-mode";
-          rev = "fb1686403e4842b6f44eebe80e5acf86a5151d88";
-          sha256 = "1dfkjzx33wzafj9cfm1bpj99bmnq5a8qrvzmhjykr7mfkca79ymz";
+          rev = "8fd695391c7668c8e11519b80deed73d3a9ce597";
+          sha256 = "0vgamjc5qr968i96xdd75p6589f9xvx5b4yv6j19ypnyw8d0fnq6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnu-apl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gnu-apl-mode";
           sha256 = "0971pzc14gw8f0b4lzvicxww1k3wc58gbr3fd0qvdra2jifk2is6";
           name = "gnu-apl-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/gnu-apl-mode";
+          homepage = "https://melpa.org/#/gnu-apl-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -22703,13 +23602,13 @@
           sha256 = "1gm116479gdwc4hr3nyv1id692dcd1sx7w2a80pvmgr35ybccn7c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnuplot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gnuplot";
           sha256 = "06c5gqf02fkra8c52xck1lqvf4yg45zfibyf9zqmnbwk7p2jxrds";
           name = "gnuplot";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gnuplot";
+          homepage = "https://melpa.org/#/gnuplot";
           license = lib.licenses.free;
         };
       }) {};
@@ -22724,13 +23623,13 @@
           sha256 = "1pss9a60dh6i277pkp8j5g1v5h7qlh11w2fki50qcp0zglyw1kaq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnuplot-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gnuplot-mode";
           sha256 = "1avpik06cmi4h6v6039c64b4zw1r1nsg3nrryl254gl881pysfxg";
           name = "gnuplot-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gnuplot-mode";
+          homepage = "https://melpa.org/#/gnuplot-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -22745,13 +23644,13 @@
           sha256 = "1i278npayv3kfxxd1ypi9n83q5l402sbc1zkm11pf8g006ifqsp4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnus-alias";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gnus-alias";
           sha256 = "0mbq9v8fiqqyldpb66v9bc777mzxywaq2dabivabxjg6554s8chf";
           name = "gnus-alias";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gnus-alias";
+          homepage = "https://melpa.org/#/gnus-alias";
           license = lib.licenses.free;
         };
       }) {};
@@ -22761,18 +23660,18 @@
         version = "20160210.447";
         src = fetchFromGitHub {
           owner = "wavexx";
-          repo = "gnus-desktop-notify";
+          repo = "gnus-desktop-notify.el";
           rev = "c363af85f341cc878d6c0be53fd32efa8ca9423b";
           sha256 = "1zizmxjf55bkm9agmrym80h2mnyvpc9bamkjy2azs42fqgi9pqjn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnus-desktop-notify";
-          sha256 = "0hf2dszk5d7vn80bm0msaqv7iji384n85dxgw8ng64c0f9f6752b";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gnus-desktop-notify";
+          sha256 = "08k32vhdp6i8c03rp1k6b5jmvj5ijplj26mdblrgasklcqbdnlfs";
           name = "gnus-desktop-notify";
         };
         packageRequires = [ gnus ];
         meta = {
-          homepage = "http://melpa.org/#/gnus-desktop-notify";
+          homepage = "https://melpa.org/#/gnus-desktop-notify";
           license = lib.licenses.free;
         };
       }) {};
@@ -22780,38 +23679,38 @@
         pname = "gnus-spotlight";
         version = "20130901.935";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/gnus-spotlight.el";
+          url = "https://www.emacswiki.org/emacs/download/gnus-spotlight.el";
           sha256 = "1r6bck1hsvk39ccri1h128jj8zd0fh9bsrlp8ijb0v9f6x3cysw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnus-spotlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gnus-spotlight";
           sha256 = "065jcix6a4mxwq8wc8gkr0x9lxmn6hlvf0rqmhi8hb840km1syjx";
           name = "gnus-spotlight";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gnus-spotlight";
+          homepage = "https://melpa.org/#/gnus-spotlight";
           license = lib.licenses.free;
         };
       }) {};
     gnus-summary-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gnus-summary-ext";
-        version = "20150119.2033";
+        version = "20160301.2134";
         src = fetchFromGitHub {
           owner = "vapniks";
           repo = "gnus-summary-ext";
-          rev = "6be01a82819dc73b0650d726e17d0adb44b72c2b";
-          sha256 = "1dzb3h5swvmwwy7x1lhz79cq2kpmamk35jb4dwmmxz6j248kmv6b";
+          rev = "9c0f410f9d3c94a7b35752a83835c0715ecb45ac";
+          sha256 = "0csr5nd8lgn9yzqw1vxrvww8af6nf419ab9zh3y2rc0rr47plz94";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnus-summary-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gnus-summary-ext";
           sha256 = "0svyz8fy4k9ba6gpdymf4cf8zjjpgm71y48vlybxbv507xjm17qf";
           name = "gnus-summary-ext";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gnus-summary-ext";
+          homepage = "https://melpa.org/#/gnus-summary-ext";
           license = lib.licenses.free;
         };
       }) {};
@@ -22826,13 +23725,13 @@
           sha256 = "1i3f67x2l9l5c5agspbkxr2mmh3rpq3009d8yzh6r1lih0b4hril";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnus-x-gm-raw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gnus-x-gm-raw";
           sha256 = "1a5iccghzqmcndql2bppvr48535sf6jbvc83iypr1031z1b5k4wg";
           name = "gnus-x-gm-raw";
         };
         packageRequires = [ log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/gnus-x-gm-raw";
+          homepage = "https://melpa.org/#/gnus-x-gm-raw";
           license = lib.licenses.free;
         };
       }) {};
@@ -22843,17 +23742,17 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "659c0a429af764118d27692d02b77c544a32cfe3";
-          sha256 = "1gfad94acp7qxm6yg0prjfkx370caq309zc8dy20ssi4x19j4n0x";
+          rev = "3b7488f4e4c234abbea9c5ff313a3a7139fc56e8";
+          sha256 = "0sw12mzgxq5nh7yzkzzpca3y4chd2i81amzynlaz46ci16wa6gpb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-autocomplete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-autocomplete";
           sha256 = "1ldsq81a167dk2r2mvzyp3v3j2mxc4l9p6b12i7pv8zrjlkhma5a";
           name = "go-autocomplete";
         };
         packageRequires = [ auto-complete ];
         meta = {
-          homepage = "http://melpa.org/#/go-autocomplete";
+          homepage = "https://melpa.org/#/go-autocomplete";
           license = lib.licenses.free;
         };
       }) {};
@@ -22868,13 +23767,13 @@
           sha256 = "0phy24cra8cza89xrqsx9xrwg98v9qwqx0fzgm1gwlf333zb3hha";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-complete";
           sha256 = "0dl0ibw145f84kd709r5i2kaw07z1sjzn3dmsiqn8dncspcf2vb4";
           name = "go-complete";
         };
         packageRequires = [ cl-lib go-mode ];
         meta = {
-          homepage = "http://melpa.org/#/go-complete";
+          homepage = "https://melpa.org/#/go-complete";
           license = lib.licenses.free;
         };
       }) {};
@@ -22889,13 +23788,13 @@
           sha256 = "09rxz40bkr0l75v3lmf8lcwqsgjiv5c8zjmwzy2d4syj4qv69c5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-direx";
           sha256 = "0dq5d7fsld4hww8fl68c18qp6fl3781dqqwd98cg68bihw2wwni7";
           name = "go-direx";
         };
         packageRequires = [ cl-lib direx ];
         meta = {
-          homepage = "http://melpa.org/#/go-direx";
+          homepage = "https://melpa.org/#/go-direx";
           license = lib.licenses.free;
         };
       }) {};
@@ -22910,34 +23809,34 @@
           sha256 = "0wha1h5mnnh3nsiaf5q1drrvk1gj2cn18bapi8ysy5jdpzi4xqsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-dlv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-dlv";
           sha256 = "13mk7mg2xk7v65r1rs6rmvi4g5nvm8jqg3p9nhk62d46i7dzp61i";
           name = "go-dlv";
         };
         packageRequires = [ go-mode ];
         meta = {
-          homepage = "http://melpa.org/#/go-dlv";
+          homepage = "https://melpa.org/#/go-dlv";
           license = lib.licenses.free;
         };
       }) {};
     go-eldoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "go-eldoc";
-        version = "20160217.2131";
+        version = "20160307.816";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-go-eldoc";
-          rev = "ef18dd32e76cab22f17a704943338ffddf283791";
-          sha256 = "1y4zrslmvg88c1q1asf9g509w69cyr3zgknfakdd98xrgfbg580n";
+          rev = "ebf17e486bb64af494278f851f674303c954432c";
+          sha256 = "1n5fnlfq9cy9rbn2hizqqsy0iryw5g2blaa7nd75ya03gxm10p8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-eldoc";
           sha256 = "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk";
           name = "go-eldoc";
         };
         packageRequires = [ cl-lib go-mode ];
         meta = {
-          homepage = "http://melpa.org/#/go-eldoc";
+          homepage = "https://melpa.org/#/go-eldoc";
           license = lib.licenses.free;
         };
       }) {};
@@ -22952,55 +23851,117 @@
           sha256 = "1fm6xd3vsi8mqh0idddjpfxlsmz1ljmjppw3qkxl1vr0qz3598k3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-errcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-errcheck";
           sha256 = "11a75h32cd5h5xjv30x83k60s49k9fhgis31358q46y2gbvqp5bs";
           name = "go-errcheck";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/go-errcheck";
+          homepage = "https://melpa.org/#/go-errcheck";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-gopath = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-gopath";
+        version = "20160311.248";
+        src = fetchFromGitHub {
+          owner = "iced";
+          repo = "go-gopath";
+          rev = "573bcad96a8c13ed996196a395b4da1e84ed0337";
+          sha256 = "1hfyxf07m73jf8zca8dna3w828ypvx8a3p70f8nfr5mijy4q3i4c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-gopath";
+          sha256 = "0jfy2r3axqpn2cnibp8f9vw36kmx0icixhj6zy43d9xa4znvdqal";
+          name = "go-gopath";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/go-gopath";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-guru = callPackage ({ cl-lib ? null, fetchgit, fetchurl, go-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-guru";
+        version = "20160417.1315";
+        src = fetchgit {
+          url = "https://go.googlesource.com/tools";
+          rev = "4e3242e000c9086052d8d700ca255d64e2b9fdfb";
+          sha256 = "0i4cdmh701vdxjykc3vndri2syg0hvgf4nma5kmyzzxc4g0zrr9s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-guru";
+          sha256 = "0c62rvsfqcx2g02iwaga2zp1266w0zhkc73ihpi0iq7cd6nr4wn0";
+          name = "go-guru";
+        };
+        packageRequires = [ cl-lib go-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/go-guru";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-impl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-impl";
+        version = "20160320.1716";
+        src = fetchFromGitHub {
+          owner = "dominikh";
+          repo = "go-impl.el";
+          rev = "d4b7f4575360d560609e735bfaa65b691fa9df40";
+          sha256 = "199aa2crddx2a5lvl0wrzylzdc23rcm3wcbbwas17ary3gl4z8jg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-impl";
+          sha256 = "0yhcl6y26s4wxaa3jj8d13i4zr879kp1lwnhlnqskpq8l8n3nmpz";
+          name = "go-impl";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/go-impl";
           license = lib.licenses.free;
         };
       }) {};
     go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "go-mode";
-        version = "20160220.1951";
+        version = "20160404.202";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "27b74155dc2896a1809c905a7326b1d6d36014f3";
-          sha256 = "1x29shbz3hmljr92f07kpplj2hpyz64c4miy11a20xlymixchnzb";
+          rev = "b7675005349d5faaf6c6cf3d4322309f6c94b90c";
+          sha256 = "1lx7bf962zf4zg7ly99v1cjgcaf8555z451jlr27bdvw6panv98s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-mode";
           sha256 = "1852zjxandmq0cpbf7m56ar3rbdi7bx613gdgsf1bg8hsdvkgzfx";
           name = "go-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/go-mode";
+          homepage = "https://melpa.org/#/go-mode";
           license = lib.licenses.free;
         };
       }) {};
     go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }:
     melpaBuild {
         pname = "go-playground";
-        version = "20151031.1610";
+        version = "20160424.1049";
         src = fetchFromGitHub {
           owner = "grafov";
           repo = "go-playground";
-          rev = "6de119fe6d1ecb8db2dad1f70831561695c5da58";
-          sha256 = "1hpxvp0slqafbxhkashnmfjssb0ccjq67x01b4p7gznf6rwji166";
+          rev = "1f8afea9315228ea0951cc400e9b43eeb6a7edab";
+          sha256 = "02a0pzm6xv6yxl2wzmv04k95lcyik16b1vgpk1kfv7vfx1bfdm8x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-playground";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-playground";
           sha256 = "1rabwc80qwkafq833m6a199zfiwwmf0hha89721gc7i0myk9pac6";
           name = "go-playground";
         };
         packageRequires = [ emacs go-mode gotest ];
         meta = {
-          homepage = "http://melpa.org/#/go-playground";
+          homepage = "https://melpa.org/#/go-playground";
           license = lib.licenses.free;
         };
       }) {};
@@ -23015,54 +23976,54 @@
           sha256 = "0xm3v6snsxv1x8i4jdq3k2aax7v1xm4zvgc9khabwhc2y63xja46";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-playground-cli";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-playground-cli";
           sha256 = "00h89rh8d7lq1di77nv609xbzxmjmffq6mz3cmagylxncflg81jc";
           name = "go-playground-cli";
         };
         packageRequires = [ cl-lib deferred emacs f let-alist names request s ];
         meta = {
-          homepage = "http://melpa.org/#/go-playground-cli";
+          homepage = "https://melpa.org/#/go-playground-cli";
           license = lib.licenses.free;
         };
       }) {};
-    go-projectile = callPackage ({ fetchFromGitHub, fetchurl, go-eldoc, go-mode, go-rename, lib, melpaBuild, projectile }:
+    go-projectile = callPackage ({ fetchFromGitHub, fetchurl, go-eldoc, go-guru, go-mode, go-rename, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "go-projectile";
-        version = "20151215.1058";
+        version = "20160418.1817";
         src = fetchFromGitHub {
           owner = "dougm";
           repo = "go-projectile";
-          rev = "0a974097ef74b6045585c6120309c208b002f6e6";
-          sha256 = "16n8655i7qidakxijymx1n84pnkn3hxpj7lsr901j03blxdrij5y";
+          rev = "0c36c5abd1510a2b35bab2b8b36fcd4a26a8d05c";
+          sha256 = "0010dgkk521pn4cwir5lvkxxzfzzw2nyz1cr5zx1h1ahxvhrzsqm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-projectile";
           sha256 = "07diik27gr82n11a8k62v1jxq8rhi16f02ybk548f6cn7iqgp2ml";
           name = "go-projectile";
         };
-        packageRequires = [ go-eldoc go-mode go-rename projectile ];
+        packageRequires = [ go-eldoc go-guru go-mode go-rename projectile ];
         meta = {
-          homepage = "http://melpa.org/#/go-projectile";
+          homepage = "https://melpa.org/#/go-projectile";
           license = lib.licenses.free;
         };
       }) {};
     go-rename = callPackage ({ fetchgit, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "go-rename";
-        version = "20151027.838";
+        version = "20160307.944";
         src = fetchgit {
           url = "https://go.googlesource.com/tools";
-          rev = "86372b3255bd23c074d3112bdb87052e725463ed";
-          sha256 = "b57e416275e60520686e1f40df43ac646b19e84723e93619497d6800d9d21a4f";
+          rev = "4e3242e000c9086052d8d700ca255d64e2b9fdfb";
+          sha256 = "0i4cdmh701vdxjykc3vndri2syg0hvgf4nma5kmyzzxc4g0zrr9s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-rename";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-rename";
           sha256 = "1sc3iwxiydgs787a6pi778i0qzqv3bf498r47jwiw5b6mmib3fah";
           name = "go-rename";
         };
         packageRequires = [ go-mode ];
         meta = {
-          homepage = "http://melpa.org/#/go-rename";
+          homepage = "https://melpa.org/#/go-rename";
           license = lib.licenses.free;
         };
       }) {};
@@ -23077,13 +24038,13 @@
           sha256 = "1a6vg2vwgnafb61pwrd837fwlq5gs80wawbzjsnykawnmcaag8pm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-scratch";
           sha256 = "11ahvmxbh67wa39cymymxmcpkq0kcn5jz0rrvazjy2p1hx3x1ma5";
           name = "go-scratch";
         };
         packageRequires = [ emacs go-mode ];
         meta = {
-          homepage = "http://melpa.org/#/go-scratch";
+          homepage = "https://melpa.org/#/go-scratch";
           license = lib.licenses.free;
         };
       }) {};
@@ -23098,13 +24059,13 @@
           sha256 = "0di6xwpl6pi0430q208gliz8dgrzwqnmp997q7xcczbkk8zfwn0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-snippets";
           sha256 = "1wcbnfzxailv18spxyv4a0nwlqh9l7yf5vxg0qcjcp5ajd2w12kn";
           name = "go-snippets";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/go-snippets";
+          homepage = "https://melpa.org/#/go-snippets";
           license = lib.licenses.free;
         };
       }) {};
@@ -23119,13 +24080,13 @@
           sha256 = "0n5nsyfwx2pdlwx6bl35wrfyady5dwraimv92f58mhc344ajd70y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-stacktracer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-stacktracer";
           sha256 = "1laz2ggqydnyr7b36ggb7sphlib79dhp7nszw42wssmv212v94cy";
           name = "go-stacktracer";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/go-stacktracer";
+          homepage = "https://melpa.org/#/go-stacktracer";
           license = lib.licenses.free;
         };
       }) {};
@@ -23140,13 +24101,13 @@
           sha256 = "1am415k4xxcva6y3vbvyvknzc6bma49pq3p85zmpjsdmsp18qdix";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/god-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/god-mode";
           sha256 = "01xx2byjh6vlckaxamm2x2qzicd9qc8h6amyjg0bxz3932a4llaa";
           name = "god-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/god-mode";
+          homepage = "https://melpa.org/#/god-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -23161,13 +24122,13 @@
           sha256 = "1k4i9z9h4m0h0y92mncr96jir63q5h1bix5bpnlfxhxl5w8pvk1q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gold-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gold-mode";
           sha256 = "1b67hd1fp6xcj65xxp5jcpdjspxsbzxy26v6lqg5kiy8knls57kf";
           name = "gold-mode";
         };
         packageRequires = [ sws-mode ];
         meta = {
-          homepage = "http://melpa.org/#/gold-mode";
+          homepage = "https://melpa.org/#/gold-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -23182,13 +24143,13 @@
           sha256 = "0wdw89n7ngxpcdigv8c01h4i84hsdh0y7xq6jdj1i6mnajl8gk92";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/golden-ratio";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/golden-ratio";
           sha256 = "15fkrv0sgpzmnw2h4fp2gb83d8s42khkfq1h76l241njjayk1f81";
           name = "golden-ratio";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/golden-ratio";
+          homepage = "https://melpa.org/#/golden-ratio";
           license = lib.licenses.free;
         };
       }) {};
@@ -23203,13 +24164,13 @@
           sha256 = "18a7dv8yshspyq4bi30j0l4ap9qp696syfc29mgvly4xyqh9x4qm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/golden-ratio-scroll-screen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/golden-ratio-scroll-screen";
           sha256 = "1ygh104vr65s7frlkzyhrfi6shrbvp2b2j3ynj5dip253v85xki5";
           name = "golden-ratio-scroll-screen";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/golden-ratio-scroll-screen";
+          homepage = "https://melpa.org/#/golden-ratio-scroll-screen";
           license = lib.licenses.free;
         };
       }) {};
@@ -23220,17 +24181,17 @@
         src = fetchFromGitHub {
           owner = "golang";
           repo = "lint";
-          rev = "32a87160691b3c96046c0c678fe57c5bef761456";
-          sha256 = "16lghkdi0rd7l1fph0a254k6axxivmpmc6grx4ryvza3f4yf7483";
+          rev = "8f348af5e29faa4262efdc14302797f23774e477";
+          sha256 = "1xz53lak1gswgzh05d687crjzbw7lz3pm0ggwsvmsqwwsdwiwavw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/golint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/golint";
           sha256 = "1q4y6mgll8wyp0c7zx810nzsm0k4wvz0wkly1fbja9z63sjzzxwb";
           name = "golint";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/golint";
+          homepage = "https://melpa.org/#/golint";
           license = lib.licenses.free;
         };
       }) {};
@@ -23245,34 +24206,34 @@
           sha256 = "1anjzlg53kjdqfjcdahbxy8zk9hdha075c1f9nzrnnbbqvmirbbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gom-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gom-mode";
           sha256 = "07zr38gzqb3ds9mpf94c1vhl1rqd0cjh4g4j2bz86q16c0rnmp7m";
           name = "gom-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gom-mode";
+          homepage = "https://melpa.org/#/gom-mode";
           license = lib.licenses.free;
         };
       }) {};
     google = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "google";
-        version = "20140330.1056";
+        version = "20140416.1248";
         src = fetchFromGitHub {
-          owner = "steckerhalter";
+          owner = "hober";
           repo = "google-el";
-          rev = "1ec11138bdd237e668ced1470c54f740e6c629a4";
+          rev = "3b3189a8b201c8d36fed6e61496274e530dd40bd";
           sha256 = "06p1dpnmg7lhdff1g7c04qq8f9srgkmnm42jlqy85k87j3p5ys2i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/google";
-          sha256 = "15z8l3adw8il0simk8phjgksh0v88cffb6gg3hv8a7nf5bla43my";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/google";
+          sha256 = "11a521cq5bj7afl7bqiilg0c81dy00lnhak7h3d9c9kwg7kfljiq";
           name = "google";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/google";
+          homepage = "https://melpa.org/#/google";
           license = lib.licenses.free;
         };
       }) {};
@@ -23283,17 +24244,17 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "styleguide";
-          rev = "b43afc71a5ae4a2585a583333b45ce664cd2c3c6";
-          sha256 = "0ksbrnca7zyapz874m4kvfvzv7m30d08gpqdi50q8v5197b1h0rv";
+          rev = "8c09ccf840eab50b1323c931668661ac357fa08c";
+          sha256 = "0jspkl67c8l5hdayl1bs8hq5h8i63ai2bxxnl6qd1hlicfypy3zi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/google-c-style";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/google-c-style";
           sha256 = "10gsbg880jbvxs4291vi2ww30ird2f313lbgcb11lswivmhrmd1r";
           name = "google-c-style";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/google-c-style";
+          homepage = "https://melpa.org/#/google-c-style";
           license = lib.licenses.free;
         };
       }) {};
@@ -23308,13 +24269,13 @@
           sha256 = "1h7nj570drp2l9x6475gwzcjrp75ms8dkixa7qsgszjdk58qyhnb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/google-contacts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/google-contacts";
           sha256 = "0wgi244zy2am90alimgzazshk2z756bk1hchphssfa4j15n16jgn";
           name = "google-contacts";
         };
         packageRequires = [ oauth2 ];
         meta = {
-          homepage = "http://melpa.org/#/google-contacts";
+          homepage = "https://melpa.org/#/google-contacts";
           license = lib.licenses.free;
         };
       }) {};
@@ -23329,13 +24290,13 @@
           sha256 = "183igr5lp20zcqi7rc01fk76sfxdhksd74i11v16gdsifdkjimd0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/google-maps";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/google-maps";
           sha256 = "0a0wqs3cnlpar2dzdi6h14isw78vgqr2r6psmrzbdl00s4fcyxwx";
           name = "google-maps";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/google-maps";
+          homepage = "https://melpa.org/#/google-maps";
           license = lib.licenses.free;
         };
       }) {};
@@ -23350,13 +24311,13 @@
           sha256 = "0r6hngf3h5x55lk2qwfgd6bhjhkax5nz8ml43d1x23y5bjnrricq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/google-this";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/google-this";
           sha256 = "0hg9y1b03aiamyn3mam3hyxmxy21wygxrnrww91zcbwlzgp4dd2c";
           name = "google-this";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/google-this";
+          homepage = "https://melpa.org/#/google-this";
           license = lib.licenses.free;
         };
       }) {};
@@ -23371,13 +24332,34 @@
           sha256 = "0hvxyqkxv5hfsa9sv71m7d98g25a1xc962r961nw6vmbvsf64z6b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/google-translate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/google-translate";
           sha256 = "1crgzdd32mk6hrawdypg496dwh51wzwfb5wqw4a2j5l8y958xf47";
           name = "google-translate";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/google-translate";
+          homepage = "https://melpa.org/#/google-translate";
+          license = lib.licenses.free;
+        };
+      }) {};
+    goose-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "goose-theme";
+        version = "20160401.33";
+        src = fetchFromGitHub {
+          owner = "thwg";
+          repo = "goose-theme";
+          rev = "7112c459fc1a6aea9b0ab47a0ac774a8892ccaed";
+          sha256 = "1ms5f6imzw5klxi1mqqjxgb02iflvpam8cfxii3ljcr4fz093m4h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/goose-theme";
+          sha256 = "18kfz61mhf8pvp3z5cdvjklla9p840p1dazylrgjb1g5hdwqw0n9";
+          name = "goose-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/goose-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -23392,13 +24374,13 @@
           sha256 = "0l022aqpnb38q6kgdqpbxrc1r7fljwl7xq14yi5jb7qgzw2v43cz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gore-mode";
           sha256 = "0nljybh2pw8pbbajfsz57r11rs4bvzfxmwpbm5qrdn6dzzv65nq3";
           name = "gore-mode";
         };
         packageRequires = [ go-mode ];
         meta = {
-          homepage = "http://melpa.org/#/gore-mode";
+          homepage = "https://melpa.org/#/gore-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -23413,55 +24395,55 @@
           sha256 = "1abb78xxsggawl43hspl0cr0f7i1b3jd9r6xl1nl5jg97i4byg0b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gorepl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gorepl-mode";
           sha256 = "12h9r4kf9y2v601myhzzdw2c4jc5cb7s94r5dkzriq578digxphl";
           name = "gorepl-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/gorepl-mode";
+          homepage = "https://melpa.org/#/gorepl-mode";
           license = lib.licenses.free;
         };
       }) {};
     gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "gotest";
-        version = "20160125.800";
+        version = "20160414.325";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "gotest.el";
-          rev = "57f894e68b47352aeacaf0d9c61039b24ba42918";
-          sha256 = "0vf42j9jpa75879pxb1h7qgflcrrg78dgq5lg8v0sbpy7z86zaxr";
+          rev = "c7ead398b69ab25db695f5dab73ceaa0aba572fa";
+          sha256 = "1idhnsl8vkq3v3nbvhkmxmvgqp97aycxvmkj7894mj9hvhib68l9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gotest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gotest";
           sha256 = "1kan3gykhci33jgg67jjiiz7rqlz5mpxp8sh6mb0n6kpfmgb4ly9";
           name = "gotest";
         };
         packageRequires = [ emacs f go-mode s ];
         meta = {
-          homepage = "http://melpa.org/#/gotest";
+          homepage = "https://melpa.org/#/gotest";
           license = lib.licenses.free;
         };
       }) {};
     gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gotham-theme";
-        version = "20160102.1654";
+        version = "20160414.1335";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "gotham-theme";
-          rev = "3cc07bd3cf1406d41cfc0a422673d524d52c22d3";
-          sha256 = "12lglll20w321vvl6zpqd8r9745y58g6zzfm83iifyzd9hzx7v30";
+          rev = "25e2a3af8a8cc786b1b03e27a5eec6bf0537cb14";
+          sha256 = "0b52aib5m6n76fd814yigipnsfsrx2qpyckfra8hfc04zwx2hhlr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gotham-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gotham-theme";
           sha256 = "0jars6rvf7hkyf71vq06mqki1r840i1dvv43dissqjg5i4lr79cl";
           name = "gotham-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gotham-theme";
+          homepage = "https://melpa.org/#/gotham-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -23469,17 +24451,17 @@
         pname = "goto-chg";
         version = "20131228.859";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/goto-chg.el";
+          url = "https://www.emacswiki.org/emacs/download/goto-chg.el";
           sha256 = "078d6p4br5vips7b9x4v6cy0wxf6m5ij9gpqd4g33bryn22gnpij";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/goto-chg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/goto-chg";
           sha256 = "0fs0fc1mksbb1266sywasl6pppdn1f9a4q9dwycl9zycr588yjyv";
           name = "goto-chg";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/goto-chg";
+          homepage = "https://melpa.org/#/goto-chg";
           license = lib.licenses.free;
         };
       }) {};
@@ -23494,13 +24476,13 @@
           sha256 = "0j2hdxqfsifm0d8ilwcw7np6mvn4xm58xglzh42gigj2fxv87g99";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/goto-gem";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/goto-gem";
           sha256 = "06vy9m01qccvahxr5xn0plzw9knl5ig7gi5q5r1smfx92bmzkg3a";
           name = "goto-gem";
         };
         packageRequires = [ s ];
         meta = {
-          homepage = "http://melpa.org/#/goto-gem";
+          homepage = "https://melpa.org/#/goto-gem";
           license = lib.licenses.free;
         };
       }) {};
@@ -23515,13 +24497,13 @@
           sha256 = "1f0zlvva7d7iza1v79yjp0bm7vd011q4cy14g1saryll32z115z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/goto-last-change";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/goto-last-change";
           sha256 = "1yl9p95ls04bkmf4d6az72pycp27bv7q7wxxzvj8sj97bgwvwajx";
           name = "goto-last-change";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/goto-last-change";
+          homepage = "https://melpa.org/#/goto-last-change";
           license = lib.licenses.free;
         };
       }) {};
@@ -23532,17 +24514,17 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "227420a68c86f8890c8c768fd908e1ef3a816702";
-          sha256 = "0hm5w34z6wghmaf4d6j9pzcbpz6nsmz6xwzx6rd1gr73v5marayp";
+          rev = "68d94eefbead1504e260ecfaeae0d76ba0a143f2";
+          sha256 = "0m23i2gci38ch562vfm21az55m19ahagz556mv4g6cw4ab996pga";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/govc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/govc";
           sha256 = "1ivgaziv25wlzg6y4zh8x7mv97pnyhi7p8jpvgh5fg5lnqpzhl4v";
           name = "govc";
         };
         packageRequires = [ dash emacs json-mode magit-popup s ];
         meta = {
-          homepage = "http://melpa.org/#/govc";
+          homepage = "https://melpa.org/#/govc";
           license = lib.licenses.free;
         };
       }) {};
@@ -23557,13 +24539,13 @@
           sha256 = "1fzf43my7qs4n37yh1jm6fyp76dfgknc5g4zin7x5b5lc63g0wxb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/govet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/govet";
           sha256 = "1rpgngixf1xnnqf0l2vvh6y9q3395qyj9ln1rh0xz5lm7d4pq4hy";
           name = "govet";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/govet";
+          homepage = "https://melpa.org/#/govet";
           license = lib.licenses.free;
         };
       }) {};
@@ -23578,13 +24560,13 @@
           sha256 = "1l43h008l7n6waclb2km32dy8aj7m5yavm1pkq38p9ppzayfxqq1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gplusify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gplusify";
           sha256 = "0fgkcvppkq6pba1giddkfxp9z4c8v2cid9nb8a190b3g85wcwycr";
           name = "gplusify";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gplusify";
+          homepage = "https://melpa.org/#/gplusify";
           license = lib.licenses.free;
         };
       }) {};
@@ -23599,13 +24581,34 @@
           sha256 = "0xs2278gamzg0710bm1fkhjh1p75m2l1jcl98ldhyjhvaf9d0ysc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gradle-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gradle-mode";
           sha256 = "0lx9qi93wmiy9pxjxqp68scbcb4bx88b6jiqk3y8jg5cajizh24g";
           name = "gradle-mode";
         };
         packageRequires = [ s ];
         meta = {
-          homepage = "http://melpa.org/#/gradle-mode";
+          homepage = "https://melpa.org/#/gradle-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    grails = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "grails";
+        version = "20160417.136";
+        src = fetchFromGitHub {
+          owner = "lifeisfoo";
+          repo = "emacs-grails";
+          rev = "fa638abe5c37f3f8af4fcd32f212453185ce50b1";
+          sha256 = "1npsjniazaq20vz3kvwr8p30ivc6x24r9a16rfcwhr5wjx3nn91b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/grails";
+          sha256 = "177y6xv35d2dhc3pdx5qhpywlmlqgfnjpzfm9yxc8l6q2rgs8irw";
+          name = "grails";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/grails";
           license = lib.licenses.free;
         };
       }) {};
@@ -23620,34 +24623,34 @@
           sha256 = "0gvz0zdpspl8dhsm17f0q9020ayvxmgmm15yy7hnl4z0xrv9yvjr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grails-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/grails-mode";
           sha256 = "1zdlmdkwyaj2zns3xwmqpil83j7857aj2070kvx8xza66dxcnlm4";
           name = "grails-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/grails-mode";
+          homepage = "https://melpa.org/#/grails-mode";
           license = lib.licenses.free;
         };
       }) {};
     grails-projectile-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "grails-projectile-mode";
-        version = "20141229.1329";
+        version = "20160327.824";
         src = fetchFromGitHub {
           owner = "yveszoundi";
           repo = "grails-projectile-mode";
-          rev = "6cb3b7890ce869a911a7b1d5892a6eef7992c199";
-          sha256 = "11ry4p5r0hg3jlmfhp6hfkryzrp6snl38v8j7ds8limhbpdh5wr4";
+          rev = "8efca50ce92b556fe9d467b157d7aec635bcc017";
+          sha256 = "0xnj0wp0na53l0y8fiaah50ij4r80j8a29hbjbcicska21p5w1s1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grails-projectile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/grails-projectile-mode";
           sha256 = "0dy8v2mila7ccvb7j5jlfkhfjsjfk3bm3rcy84m0rgbqjai67amn";
           name = "grails-projectile-mode";
         };
         packageRequires = [ cl-lib emacs projectile ];
         meta = {
-          homepage = "http://melpa.org/#/grails-projectile-mode";
+          homepage = "https://melpa.org/#/grails-projectile-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -23658,17 +24661,17 @@
         src = fetchFromGitHub {
           owner = "steckerhalter";
           repo = "grandshell-theme";
-          rev = "6bf34fb1a3117244629a7fb23daf610f50854bed";
-          sha256 = "1202fwwwdr74q6s5jv1n0mvmq4n9mra85l14hdhwh2kks513s6vs";
+          rev = "2ca20ace2fc9757ebf4e0acf8b08dfd819163667";
+          sha256 = "0803j6r447br0nszzcy6pc65l53j871icyr91dd7x10xi7ygw0lj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grandshell-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/grandshell-theme";
           sha256 = "1mnnjsw1kx40b6ws8wmk25fz9rq8rd70xia9cjpwdfkg7kh8xvsa";
           name = "grandshell-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/grandshell-theme";
+          homepage = "https://melpa.org/#/grandshell-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -23683,7 +24686,7 @@
           sha256 = "1f34bhjxmbf2jjrkpdvqg2gwp83ka6d5vrxmsxdl3r57yc6rbrwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/graphene";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/graphene";
           sha256 = "1wz3rvd8b7gx5d0k7yi4dd69ax5bybcm10vdc7xp4yn296lmyl9k";
           name = "graphene";
         };
@@ -23701,7 +24704,7 @@
           web-mode
         ];
         meta = {
-          homepage = "http://melpa.org/#/graphene";
+          homepage = "https://melpa.org/#/graphene";
           license = lib.licenses.free;
         };
       }) {};
@@ -23716,13 +24719,13 @@
           sha256 = "1bidfn4x5lb6dylhadyf05g4l2k7jg83mi058cmv76av1glawk17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/graphene-meta-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/graphene-meta-theme";
           sha256 = "1cqdr93lccdpxkzgap3r3qc92dh8vqgdlnxvqkw7lrcbs31fvf3q";
           name = "graphene-meta-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/graphene-meta-theme";
+          homepage = "https://melpa.org/#/graphene-meta-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -23737,13 +24740,13 @@
           sha256 = "12r6a3hikzqcdbplmraa4p4w136c006yamylxfjf8580v15xngrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/graphviz-dot-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/graphviz-dot-mode";
           sha256 = "04rkynsrsk6w4sxn1pc0b9b6pij1p7yraywbrk7qvv05fv69kri2";
           name = "graphviz-dot-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/graphviz-dot-mode";
+          homepage = "https://melpa.org/#/graphviz-dot-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -23758,33 +24761,33 @@
           sha256 = "0nvl8mh7jxailisq31h5bi64s9b74ah1465wiwh18x502swr2s3c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grapnel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/grapnel";
           sha256 = "019cdx1wdx8sc2ibqwgp1akgckzxxvrayyp2sv806gha0kn6yf6r";
           name = "grapnel";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/grapnel";
+          homepage = "https://melpa.org/#/grapnel";
           license = lib.licenses.free;
         };
       }) {};
     grass-mode = callPackage ({ cl-lib ? null, dash, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "grass-mode";
-        version = "20151030.1120";
+        version = "20160317.814";
         src = fetchhg {
           url = "https://bitbucket.com/tws/grass-mode.el";
-          rev = "aa8cc5eff764";
-          sha256 = "0djv2ps2ahw9b1b5i45hgy7l7cch7cgh7rzq601c0r6vi7gm2ac5";
+          rev = "25414dff1fc5";
+          sha256 = "0mnwmsn078hz317xfz6c05r7narx3k8956v1ajz5myxx8xrcr24z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grass-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/grass-mode";
           sha256 = "1lq6bk4bwgcy4ra3d9rlca3fk87ydg7xnnqcqjg0pw4m9xnr3f7v";
           name = "grass-mode";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
-          homepage = "http://melpa.org/#/grass-mode";
+          homepage = "https://melpa.org/#/grass-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -23799,13 +24802,13 @@
           sha256 = "0rgv96caigcjffg1983274p4ff1icx1xh5bj7rcd53hai5ag16mp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/green-phosphor-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/green-phosphor-theme";
           sha256 = "1p4l75lahmbjcx74ca5jcyc04828vlcahk7gzv5lr7z9mhvq6fbh";
           name = "green-phosphor-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/green-phosphor-theme";
+          homepage = "https://melpa.org/#/green-phosphor-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -23820,13 +24823,13 @@
           sha256 = "1670pxgmqflzw5d02mzsmqjf3gp0c4wf25z0crmaamyfmwdz9pag";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gregorio-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gregorio-mode";
           sha256 = "0f226l67bqqc6m8wb97m7lkxvwrfbw74b1riasirca1anzjl8jfx";
           name = "gregorio-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gregorio-mode";
+          homepage = "https://melpa.org/#/gregorio-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -23841,13 +24844,13 @@
           sha256 = "1f8262mrlinzgnn4m49hbj1hm3c1mvzza24py4b37sasn49546lw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grep-a-lot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/grep-a-lot";
           sha256 = "1513vnm5b587r15hcbnplgsfv7kv8g5fd0w4nwb6pq7myzv53ra1";
           name = "grep-a-lot";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/grep-a-lot";
+          homepage = "https://melpa.org/#/grep-a-lot";
           license = lib.licenses.free;
         };
       }) {};
@@ -23855,17 +24858,17 @@
         pname = "grep-plus";
         version = "20160212.825";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/grep+.el";
+          url = "https://www.emacswiki.org/emacs/download/grep+.el";
           sha256 = "08jl4xhh25znyc6cm7288x4b55pykrpcsyym78fdlrw3xxr77cxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grep+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/grep+";
           sha256 = "1qj4f6d3l88bdcnq825pylnc76m22x2i15yxdhc2b6rv80df7zsx";
           name = "grep-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/grep+";
+          homepage = "https://melpa.org/#/grep+";
           license = lib.licenses.free;
         };
       }) {};
@@ -23880,13 +24883,13 @@
           sha256 = "14c09m9p6556rrf0qfad4zsv7qxa5flamzg6fa83cxh0qfg7wjbp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/greymatters-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/greymatters-theme";
           sha256 = "10cxajyws5rwk62i4vk26c1ih0dq490kcfx7gijw38q3b5r1l8nr";
           name = "greymatters-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/greymatters-theme";
+          homepage = "https://melpa.org/#/greymatters-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -23899,13 +24902,13 @@
           sha256 = "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/grin";
           sha256 = "0mvzwmws5pi6hpzgkc43fjxs98ngkr0jvqbclza2jbbqawifzzbk";
           name = "grin";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/grin";
+          homepage = "https://melpa.org/#/grin";
           license = lib.licenses.free;
         };
       }) {};
@@ -23914,19 +24917,19 @@
         pname = "grizzl";
         version = "20160131.151";
         src = fetchFromGitHub {
-          owner = "d11wtq";
+          owner = "grizzl";
           repo = "grizzl";
           rev = "b0996a9e2e5f6a9c4327ba7665ab29b633e404eb";
           sha256 = "1d2kwiq3zy8wdg5zig0q9rrdcs4xdv6zsgvgc21b3kv83daq1dsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grizzl";
-          sha256 = "1klds0w9qrsgfppq105qr69c26zi91y575db2hxr6h9vypf2rq24";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/grizzl";
+          sha256 = "0354xskqzxc38l14zxqs31hadwh27v9lyx67y3hnd94d8abr0qcb";
           name = "grizzl";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/grizzl";
+          homepage = "https://melpa.org/#/grizzl";
           license = lib.licenses.free;
         };
       }) {};
@@ -23941,55 +24944,55 @@
           sha256 = "0gvz0zdpspl8dhsm17f0q9020ayvxmgmm15yy7hnl4z0xrv9yvjr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/groovy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/groovy-mode";
           sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal";
           name = "groovy-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/groovy-mode";
+          homepage = "https://melpa.org/#/groovy-mode";
           license = lib.licenses.free;
         };
       }) {};
     gruber-darker-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gruber-darker-theme";
-        version = "20160209.416";
+        version = "20160417.630";
         src = fetchFromGitHub {
           owner = "rexim";
           repo = "gruber-darker-theme";
-          rev = "87bb44be343676b622dd7fb7f09e2861b21e2346";
-          sha256 = "0mb38niiscl0jljq43z9scl6zarqqgavhal3c4dzwbjyfy21c16a";
+          rev = "0c2a75d170547a808ce4d22fb63a1d86b4ddf3b2";
+          sha256 = "0dn1iscy0vw2bcnh5s675wjnfk9f20i30b8slyffvpzbbi369pys";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gruber-darker-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gruber-darker-theme";
           sha256 = "0vn4msixb77xj6p5mlfchjyyjhzah0lcmp0z82s8849zd194fxqi";
           name = "gruber-darker-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gruber-darker-theme";
+          homepage = "https://melpa.org/#/gruber-darker-theme";
           license = lib.licenses.free;
         };
       }) {};
     grunt = callPackage ({ ansi-color ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "grunt";
-        version = "20151110.1029";
+        version = "20160316.1028";
         src = fetchFromGitHub {
           owner = "gempesaw";
           repo = "grunt.el";
-          rev = "42bcab2990a27e0f8cf22eee87089c95eb9fae29";
-          sha256 = "1js849s8b9x0n6ak2qwv90lk6zr71mgkk9f0xccdhikz4c8vxk0r";
+          rev = "4c269e2738658643ec2ed9ef61a2a3d71b08d304";
+          sha256 = "1xd6gv9bkqnj7j5mcnwvl1mxjmzvxqhp135hxj0ijc0ybdybacf7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grunt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/grunt";
           sha256 = "1qdzqcrff9x97kyy0d4j636d5i751qja10liw8i0lf4lk6n0lywz";
           name = "grunt";
         };
         packageRequires = [ ansi-color dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/grunt";
+          homepage = "https://melpa.org/#/grunt";
           license = lib.licenses.free;
         };
       }) {};
@@ -24004,13 +25007,13 @@
           sha256 = "04jknwkax9gdmzz0yq0m21grl9c43vr3abdam3g8zjh5sjx5gs14";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gruvbox-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gruvbox-theme";
           sha256 = "042mnwlmixygk2mf24ygk7rkv1rfavc5a36hs9x8b68jnf3khj32";
           name = "gruvbox-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gruvbox-theme";
+          homepage = "https://melpa.org/#/gruvbox-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -24025,34 +25028,34 @@
           sha256 = "1d89gxyzv0z0nk7v1aa4qa0xfms2g2dsrr07cw0d99xsnyxfky31";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gs-mode";
           sha256 = "02ldd92fv1k28nygl34i8gv0b0i1v5qd7nl1l17cf5f3akdwc6iq";
           name = "gs-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gs-mode";
+          homepage = "https://melpa.org/#/gs-mode";
           license = lib.licenses.free;
         };
       }) {};
     gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gscholar-bibtex";
-        version = "20151022.1225";
+        version = "20160412.1619";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "gscholar-bibtex";
-          rev = "00b32521de3aa689bc58516ae10ba7f3ef1b6c92";
-          sha256 = "1dfd22629gz0c8r4wplvbn0n7bm20549mg5chq289s826ca0kxqk";
+          rev = "df504cf9d1aecccb99551067861e9e1bae932d99";
+          sha256 = "1xc5lzrq9nz3cxx6gm89c9p00ki53gxa3bri5yn6yk4g7hbwqvz0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gscholar-bibtex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gscholar-bibtex";
           sha256 = "0d41gr9amf9vdn9pl9lamhp2swqllxslv9r3wsgzqvjl7zayd1az";
           name = "gscholar-bibtex";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gscholar-bibtex";
+          homepage = "https://melpa.org/#/gscholar-bibtex";
           license = lib.licenses.free;
         };
       }) {};
@@ -24067,13 +25070,13 @@
           sha256 = "14sx5m6fpkm2q8ljkicl1yy1sw003k4rzz9hi7lm1nfqr2l4n6q0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/guide-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/guide-key";
           sha256 = "0zjrdvppcg8b2k6hfdj45rswc1ks9xgimcr2yvgpc8prrwk1yjsf";
           name = "guide-key";
         };
         packageRequires = [ dash popwin s ];
         meta = {
-          homepage = "http://melpa.org/#/guide-key";
+          homepage = "https://melpa.org/#/guide-key";
           license = lib.licenses.free;
         };
       }) {};
@@ -24088,34 +25091,34 @@
           sha256 = "1s6p4ysdbqx5fk68s317ckj5rjmpkwwb0324sbqqa6byhw3j0xyj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/guide-key-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/guide-key-tip";
           sha256 = "0h2vkkbxq361dkn6irm1v19qj7bkhxcjljiksd5wwlq5zsq6bd06";
           name = "guide-key-tip";
         };
         packageRequires = [ guide-key pos-tip ];
         meta = {
-          homepage = "http://melpa.org/#/guide-key-tip";
+          homepage = "https://melpa.org/#/guide-key-tip";
           license = lib.licenses.free;
         };
       }) {};
     guru-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "guru-mode";
-        version = "20151028.28";
+        version = "20160415.2121";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "guru-mode";
-          rev = "062a41794431d5e263f9f0e6ae1ec4a8d79980dd";
-          sha256 = "16h1g88y4q737sxcjkm1kxirv5m2x3l9wgmz0s4hlxjzli8fc7jr";
+          rev = "81db5611dd29f2c3d9ea91fb7f086a2cf9847553";
+          sha256 = "1jymhjjpn600svd5jbj42m3vnpaza838zby507ynbwc95nja29vs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/guru-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/guru-mode";
           sha256 = "0j25nxs3ndybq1ik36qyqdprmhav4ba8ny7v2z61s23id8hz3xjs";
           name = "guru-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/guru-mode";
+          homepage = "https://melpa.org/#/guru-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -24130,34 +25133,34 @@
           sha256 = "0060qw4gr9fv6db20xf3spgl2fwg2iid5ckfjm3vj3ydyv62q13s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gvpr-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gvpr-mode";
           sha256 = "19p6f06qdjvh2vmgbabajvkfxpn13j899jrivw9mqyssz0cyvzgw";
           name = "gvpr-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gvpr-mode";
+          homepage = "https://melpa.org/#/gvpr-mode";
           license = lib.licenses.free;
         };
       }) {};
     hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "hackernews";
-        version = "20150901.1017";
+        version = "20160326.925";
         src = fetchFromGitHub {
           owner = "clarete";
           repo = "hackernews.el";
-          rev = "676d72da9fa4743dae34da95138fd022a51fbfdd";
-          sha256 = "15d7zjxjp9h8jmxq3dqakwzlymqk6hqsg7zklkjs0ih7fz0d25pl";
+          rev = "452e939211ebc0af7256a2f0e8cdad5c426694e6";
+          sha256 = "1c49lfm5saafxks591qyy2nilymxz3aqlxpsmnad5d0kfhvjr47z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hackernews";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hackernews";
           sha256 = "1x1jf5gkhmpiby5rmy0sziywh6c1f1n0p4f6dlz6ifbwns7har6a";
           name = "hackernews";
         };
         packageRequires = [ json ];
         meta = {
-          homepage = "http://melpa.org/#/hackernews";
+          homepage = "https://melpa.org/#/hackernews";
           license = lib.licenses.free;
         };
       }) {};
@@ -24172,13 +25175,13 @@
           sha256 = "0d3xmagl18pas19zbpg27j0lmdiry23df48z4vkjsrcllqg25v5g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ham-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ham-mode";
           sha256 = "000qrdby7d6zmp5066vs4gjlc9ik0ybrgcwzcbfgxb16w1g9xpmz";
           name = "ham-mode";
         };
         packageRequires = [ html-to-markdown markdown-mode ];
         meta = {
-          homepage = "http://melpa.org/#/ham-mode";
+          homepage = "https://melpa.org/#/ham-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -24193,13 +25196,13 @@
           sha256 = "1rnkzl51h263nck1bd0jyb7q58b54d764gcsh7wqxfgzs1jfr4am";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hamburg-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hamburg-theme";
           sha256 = "149ln7670kjyhdfj5j9akxch47dlff2hd58amla7j3297z1nhg4k";
           name = "hamburg-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/hamburg-theme";
+          homepage = "https://melpa.org/#/hamburg-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -24214,13 +25217,13 @@
           sha256 = "0fmcm4pcivigz9xhf7z9wsxz9pg1yfx9qv8na2dxj426bibk0a6w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/haml-mode";
           sha256 = "0ih0m7zr6kgn6zd45zbp1jgs1ydc5i5gmq6l080wma83v5w1436f";
           name = "haml-mode";
         };
         packageRequires = [ ruby-mode ];
         meta = {
-          homepage = "http://melpa.org/#/haml-mode";
+          homepage = "https://melpa.org/#/haml-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -24235,13 +25238,13 @@
           sha256 = "1njrpb1s2v9skyfbgb28clrxyvyp8i4b8kwa68ynvq3vjb4fnws6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hamlet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hamlet-mode";
           sha256 = "0ils4w8ry1inlfj4931ypibj3n60xq6ah74hig62y4vrs4d47gyx";
           name = "hamlet-mode";
         };
         packageRequires = [ cl-lib dash s ];
         meta = {
-          homepage = "http://melpa.org/#/hamlet-mode";
+          homepage = "https://melpa.org/#/hamlet-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -24256,13 +25259,13 @@
           sha256 = "0w443knp6kvjm2m79cni5d17plyhbsl0a4kip7yrpv5nmg370q3p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/handlebars-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/handlebars-mode";
           sha256 = "11ahrm4n588v7ir2r7sp4dkbypl5nhnr22px849hdxjcrwal24vj";
           name = "handlebars-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/handlebars-mode";
+          homepage = "https://melpa.org/#/handlebars-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -24277,13 +25280,13 @@
           sha256 = "1z37di9vk1l35my8kl8jnyqlkr1rnp0iz13hpc0r065mib67v58k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/handlebars-sgml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/handlebars-sgml-mode";
           sha256 = "10sxm7v94yxa92mqbwj3shqjs6f3zbxjvwgbvg9m2fh3b7xj617w";
           name = "handlebars-sgml-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/handlebars-sgml-mode";
+          homepage = "https://melpa.org/#/handlebars-sgml-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -24298,13 +25301,13 @@
           sha256 = "0whn8rc98dhncgizzrb22nx6b6cm655q1cf2fpn6g3knq1c2471r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/handoff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/handoff";
           sha256 = "0iqqvygx50wi2vcbs6bfgqzhcz9a89zrwb7sg0ang9qrkiz5k36w";
           name = "handoff";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/handoff";
+          homepage = "https://melpa.org/#/handoff";
           license = lib.licenses.free;
         };
       }) {};
@@ -24319,55 +25322,76 @@
           sha256 = "124k803pgxc7fz325yy6jcyam69f5fk9kdwfgmnwwca9ablq4cfb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hardcore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hardcore-mode";
           sha256 = "1bgi1acpw4z7i03d0i8mrd2hpjn6hyvkdsk0ks9q380yp9mqmiwd";
           name = "hardcore-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hardcore-mode";
+          homepage = "https://melpa.org/#/hardcore-mode";
           license = lib.licenses.free;
         };
       }) {};
     hardhat = callPackage ({ fetchFromGitHub, fetchurl, ignoramus, lib, melpaBuild }:
     melpaBuild {
         pname = "hardhat";
-        version = "20140827.2056";
+        version = "20160414.913";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "hardhat";
-          rev = "9355d174d49a514f3e176995ba93d5da7a25cbba";
-          sha256 = "13pgxskddir74lqknkkflzkrv6q455cf5s7wjww1zgvw95j7q50v";
+          rev = "9038a49ab55cd4c502cf7f07ed0d1b9b6bc3626e";
+          sha256 = "0j9z46j777y3ljpai5czdlwl07f0irp4fsk4677n11ndyqm1amb5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hardhat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hardhat";
           sha256 = "16pdbpm647ag9cadmdm75nwwyzrqsd9y1b4zgkl3pg669mi5vl5z";
           name = "hardhat";
         };
         packageRequires = [ ignoramus ];
         meta = {
-          homepage = "http://melpa.org/#/hardhat";
+          homepage = "https://melpa.org/#/hardhat";
+          license = lib.licenses.free;
+        };
+      }) {};
+    harvest = callPackage ({ fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, s, swiper }:
+    melpaBuild {
+        pname = "harvest";
+        version = "20160405.1143";
+        src = fetchFromGitHub {
+          owner = "kostajh";
+          repo = "harvest.el";
+          rev = "016d04b63023b083b9d2deb61612fe7336713a17";
+          sha256 = "1nswlbw4x461zksjcy2kllgiz8h270iyk44bls3m3l9y2nx82fxm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/harvest";
+          sha256 = "1qfhfzjwlnqpbq4kfxvs97fa3xks8zi02fnwv0ik8wb1ppbb77qd";
+          name = "harvest";
+        };
+        packageRequires = [ hydra s swiper ];
+        meta = {
+          homepage = "https://melpa.org/#/harvest";
           license = lib.licenses.free;
         };
       }) {};
     haskell-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-emacs";
-        version = "20160104.1652";
+        version = "20160223.550";
         src = fetchFromGitHub {
           owner = "knupfer";
           repo = "haskell-emacs";
-          rev = "73dbda903b3fcb1225bf69d5ed7f9d013d7ae1fd";
-          sha256 = "1l08d6qn7ixs3yg6svh8fd2x6zwjkbv0s34vm5aa7krx7yhydblx";
+          rev = "382d72a14a15c88d6b1d61db8262ce7a0db236fb";
+          sha256 = "114qg91mb53ib7alnn1i9wjcr4psqps6ncpyqyklllmbdm0q660n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-emacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/haskell-emacs";
           sha256 = "1wkh7qws35c32hha0p9rpjz5pls2844920nh919lvp2wmq9l6jd6";
           name = "haskell-emacs";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/haskell-emacs";
+          homepage = "https://melpa.org/#/haskell-emacs";
           license = lib.licenses.free;
         };
       }) {};
@@ -24378,17 +25402,17 @@
         src = fetchFromGitHub {
           owner = "knupfer";
           repo = "haskell-emacs";
-          rev = "73dbda903b3fcb1225bf69d5ed7f9d013d7ae1fd";
-          sha256 = "1l08d6qn7ixs3yg6svh8fd2x6zwjkbv0s34vm5aa7krx7yhydblx";
+          rev = "382d72a14a15c88d6b1d61db8262ce7a0db236fb";
+          sha256 = "114qg91mb53ib7alnn1i9wjcr4psqps6ncpyqyklllmbdm0q660n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-emacs-base";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/haskell-emacs-base";
           sha256 = "1fwkds6qyhbxxdgxfzmgd7dlcxr08ynrrg5jdp9r7f924pd536vb";
           name = "haskell-emacs-base";
         };
         packageRequires = [ haskell-emacs ];
         meta = {
-          homepage = "http://melpa.org/#/haskell-emacs-base";
+          homepage = "https://melpa.org/#/haskell-emacs-base";
           license = lib.licenses.free;
         };
       }) {};
@@ -24399,38 +25423,38 @@
         src = fetchFromGitHub {
           owner = "knupfer";
           repo = "haskell-emacs";
-          rev = "73dbda903b3fcb1225bf69d5ed7f9d013d7ae1fd";
-          sha256 = "1l08d6qn7ixs3yg6svh8fd2x6zwjkbv0s34vm5aa7krx7yhydblx";
+          rev = "382d72a14a15c88d6b1d61db8262ce7a0db236fb";
+          sha256 = "114qg91mb53ib7alnn1i9wjcr4psqps6ncpyqyklllmbdm0q660n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-emacs-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/haskell-emacs-text";
           sha256 = "1j18fhhra6lv32xrq8jc6l8i56fgn68da81wymcimpmpbp0hl5fy";
           name = "haskell-emacs-text";
         };
         packageRequires = [ haskell-emacs ];
         meta = {
-          homepage = "http://melpa.org/#/haskell-emacs-text";
+          homepage = "https://melpa.org/#/haskell-emacs-text";
           license = lib.licenses.free;
         };
       }) {};
-    haskell-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20160221.351";
+        version = "20160425.1432";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "2193190a271cc99e09399f53164c06d62826a490";
-          sha256 = "0alyyffv8x74nfgp2alai711hvwhgqh7xl38gcvpdfdl7w1msfzi";
+          rev = "773540c8781a8abb9e799fa420983b1ac3e34a74";
+          sha256 = "0gj91ffh2fahs68s8ml281frdb1dg89mrkw9446z8l8q7pwjqajm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/haskell-mode";
           sha256 = "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp";
           name = "haskell-mode";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/haskell-mode";
+          homepage = "https://melpa.org/#/haskell-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -24445,13 +25469,13 @@
           sha256 = "1wha5f2zx5hr6y0wvpmkg7jnxcgbzx99gd70h96c3dqqqhqz6d2a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/haskell-snippets";
           sha256 = "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2";
           name = "haskell-snippets";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/haskell-snippets";
+          homepage = "https://melpa.org/#/haskell-snippets";
           license = lib.licenses.free;
         };
       }) {};
@@ -24462,16 +25486,16 @@
         src = fetchgit {
           url = "https://git.spwhitton.name/haskell-tab-indent";
           rev = "150f52176242ba3bc4f58179cd2dbee4d89580f4";
-          sha256 = "7e41c910d6901638b9dfb697206659f5441e26e0558f9227c4ba7c6f2f47d841";
+          sha256 = "0hfq8wpnyz5sqhkr53smw0k1wi7mb5k215xnvywkh5lhsq8cjhby";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-tab-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/haskell-tab-indent";
           sha256 = "0vdfmy56w5yi202nbd28v1bzj97v1wxnfnb5z3dh9687p2abgnr7";
           name = "haskell-tab-indent";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/haskell-tab-indent";
+          homepage = "https://melpa.org/#/haskell-tab-indent";
           license = lib.licenses.free;
         };
       }) {};
@@ -24486,13 +25510,13 @@
           sha256 = "1gmh455ahd9if11f8mrqbfky24c784bb4fgdl3pj8i0n5sl51i88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/haste";
           sha256 = "0wz15p58g4mxvwbpy9k60gixs1g4jw7pay5pbxnlggc39x1py8nf";
           name = "haste";
         };
         packageRequires = [ json ];
         meta = {
-          homepage = "http://melpa.org/#/haste";
+          homepage = "https://melpa.org/#/haste";
           license = lib.licenses.free;
         };
       }) {};
@@ -24506,13 +25530,13 @@
           sha256 = "106a7kpjj4laxl7x8aqpv75ih54569b3bs2a1b8z4rghmikqc4aw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haxe-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/haxe-mode";
           sha256 = "032h0nxlsrk30bsqb02by842ycrw1qscpfprifjjkaiq08wigh1l";
           name = "haxe-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/haxe-mode";
+          homepage = "https://melpa.org/#/haxe-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -24527,13 +25551,13 @@
           sha256 = "1si5r86zvnp4wbzvvqyc4zhap14k8pcq5nqigx45mgvpdnwdvzln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haxor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/haxor-mode";
           sha256 = "1y4m058whdqnkkf9s6hzi0h6w0fc8ajfawhpjj0wqjam4adnfkq5";
           name = "haxor-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/haxor-mode";
+          homepage = "https://melpa.org/#/haxor-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -24548,13 +25572,13 @@
           sha256 = "0pjxyhh8a02i54a9jsqr8p1mcqfl6k9b8gv9lnzb242gy4518y3l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hayoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hayoo";
           sha256 = "1rqvnv5nxlsyvsa5my1wpfm82sw21s7kfbg80vrjmxh0mwlyv4p9";
           name = "hayoo";
         };
         packageRequires = [ emacs json ];
         meta = {
-          homepage = "http://melpa.org/#/hayoo";
+          homepage = "https://melpa.org/#/hayoo";
           license = lib.licenses.free;
         };
       }) {};
@@ -24569,34 +25593,34 @@
           sha256 = "0rgcj47h7a67qkw6696pcm1a4g4ryx8nrz55s69fw86958fp08hk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hc-zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hc-zenburn-theme";
           sha256 = "0jcddk9ppgcizyyciabj3sgk1pmingl97knf9nmr0mi89h7n2g5y";
           name = "hc-zenburn-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hc-zenburn-theme";
+          homepage = "https://melpa.org/#/hc-zenburn-theme";
           license = lib.licenses.free;
         };
       }) {};
-    hcl-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    hcl-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hcl-mode";
-        version = "20151002.2249";
+        version = "20160426.538";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-hcl-mode";
-          rev = "5a5e490509452a1882bea43952e248682577ed2d";
-          sha256 = "1vf5130bj1ii9j8qq9vdw0ga0qgfk8brjz34ysfmz9l2ihlcxvl0";
+          rev = "2ce5f28e3ebb7cd8e4279a507c27822875b475b0";
+          sha256 = "1xadbyhzfbl75rm8n9kv0kmcbxd82c9w6p88ds394f3hjmjji3gg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hcl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hcl-mode";
           sha256 = "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin";
           name = "hcl-mode";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/hcl-mode";
+          homepage = "https://melpa.org/#/hcl-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -24604,17 +25628,17 @@
         pname = "header2";
         version = "20151231.1526";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/header2.el";
+          url = "https://www.emacswiki.org/emacs/download/header2.el";
           sha256 = "00j74cqdnaf5rl7w4wabm4z88cm20s152y0yxnv73z9pvqbknrmm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/header2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/header2";
           sha256 = "1dg25krx3wxma2l5vb2ji7rpfp17qbrl62jyjpa52cjfsvyp6v06";
           name = "header2";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/header2";
+          homepage = "https://melpa.org/#/header2";
           license = lib.licenses.free;
         };
       }) {};
@@ -24629,34 +25653,34 @@
           sha256 = "06hq6p6a4fzprbj4r885vsvzddlvx0wxqk5kik06v5bm7hjmnyrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/headlong";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/headlong";
           sha256 = "042ybplkqjb30qf5cpbw5d91j1rdc71b789v277h036bri7hgxz6";
           name = "headlong";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/headlong";
+          homepage = "https://melpa.org/#/headlong";
           license = lib.licenses.free;
         };
       }) {};
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20160217.1158";
+        version = "20160426.758";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "27baadfe942d7b3a2b5049029c002d6a1cc9fea2";
-          sha256 = "04fw48six952jxcp9mriz7pcfj223z80am9ig1y4rp3yanqm6z1x";
+          rev = "3099cfca9e35b3df9bd1e80057f96246ef2e1705";
+          sha256 = "1xspnqdg18rzjnd55vawcj74ypx430lzj19i70bhgzghb22pw3rl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm";
           sha256 = "0xsf4rg7kn0m5wjlbwhd1mc38lg2822037dyd0h66h6x2gbs3fd9";
           name = "helm";
         };
         packageRequires = [ async emacs helm-core popup ];
         meta = {
-          homepage = "http://melpa.org/#/helm";
+          homepage = "https://melpa.org/#/helm";
           license = lib.licenses.free;
         };
       }) {};
@@ -24671,13 +25695,13 @@
           sha256 = "0nip0zrmn944wy0x2dc5ryr0m7a948rn2a8cbaajghs7a7zai4cr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-R";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-R";
           sha256 = "0zq9f2xhgap3ihnrlsrsaxaz0nx014k0820bfsq7lckwcnm0mng1";
           name = "helm-R";
         };
         packageRequires = [ ess helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-R";
+          homepage = "https://melpa.org/#/helm-R";
           license = lib.licenses.free;
         };
       }) {};
@@ -24692,13 +25716,13 @@
           sha256 = "04rvbafa77blps7x7cmlsciys8fgmvhfhq4v51pk8z5q3j1lrgc5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-ack";
           sha256 = "1a8sc5gd2g57dl9g18wyydfmihy74yniwhjr27h7vxylnf2g3pni";
           name = "helm-ack";
         };
         packageRequires = [ cl-lib helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-ack";
+          homepage = "https://melpa.org/#/helm-ack";
           license = lib.licenses.free;
         };
       }) {};
@@ -24713,34 +25737,34 @@
           sha256 = "0hxfgdn56c7qr64r59g9hvxxwa4mw0ad9c9m0z5cj85bsdd7rlx4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ad";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-ad";
           sha256 = "0h2zjfj9hy7bkpmmjjs0a4a06asbw0yww8mw9rk2xi1gc2aqq4hi";
           name = "helm-ad";
         };
         packageRequires = [ dash helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-ad";
+          homepage = "https://melpa.org/#/helm-ad";
           license = lib.licenses.free;
         };
       }) {};
     helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ag";
-        version = "20160126.2347";
+        version = "20160424.746";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-ag";
-          rev = "e8af4023bcd49700751c2b6dc3591b5e48016413";
-          sha256 = "0ig7d8a0ikslm3yvq8yjzc83rg2xxs0gl54g01bi4rydl3p9b6s3";
+          rev = "edc264067b1b4e695e689cab4fd429f605ceef8e";
+          sha256 = "1riaih9f74mv1kyy5g47p1s9idynjv11bi99mr4mdrr1gqwi2c8i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-ag";
           sha256 = "050qh5xqh8lwkgmz3jxm8gql5nd7bq8sp9q6mzm2z7367qy4qqyf";
           name = "helm-ag";
         };
         packageRequires = [ emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-ag";
+          homepage = "https://melpa.org/#/helm-ag";
           license = lib.licenses.free;
         };
       }) {};
@@ -24755,13 +25779,13 @@
           sha256 = "1rifdkhzvf7xd2npban0i8v3rjcji69063dw9rs1d32w4n7fzlfa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ag-r";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-ag-r";
           sha256 = "0ivh7f021lbmbaj6gs4y8m99s63js57w04q7cwx7v4i32cpas7r9";
           name = "helm-ag-r";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-ag-r";
+          homepage = "https://melpa.org/#/helm-ag-r";
           license = lib.licenses.free;
         };
       }) {};
@@ -24776,13 +25800,13 @@
           sha256 = "153zq1q3s3ihjh15wyci9qdic3pin8f1j1gq2qlzyhmy0njlvgjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-anything";
           sha256 = "0yjlwsiahb7n4q3522d68xrdb8caad9gpnglz5php245yqy3n5vx";
           name = "helm-anything";
         };
         packageRequires = [ anything helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-anything";
+          homepage = "https://melpa.org/#/helm-anything";
           license = lib.licenses.free;
         };
       }) {};
@@ -24797,13 +25821,13 @@
           sha256 = "1bnypr906gfc1fbyrqfsfilsl6wiacrnhr8flpa0gmdjhvmrw7af";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-aws";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-aws";
           sha256 = "0sjgdjpznjxsf6nlv2ah45fw17j8j5apdphd1fp43rjv1lskkgc5";
           name = "helm-aws";
         };
         packageRequires = [ cl-lib helm s ];
         meta = {
-          homepage = "http://melpa.org/#/helm-aws";
+          homepage = "https://melpa.org/#/helm-aws";
           license = lib.licenses.free;
         };
       }) {};
@@ -24818,34 +25842,34 @@
           sha256 = "0d6h4gbb69abxxgm85pdi5rsaf9h72yryg72ykd5633i1g4s8a76";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-backup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-backup";
           sha256 = "182jbm36yzayxi9y3vhpyn25ivrgay37sncqvah35vbw52lnjcn3";
           name = "helm-backup";
         };
         packageRequires = [ cl-lib helm s ];
         meta = {
-          homepage = "http://melpa.org/#/helm-backup";
+          homepage = "https://melpa.org/#/helm-backup";
           license = lib.licenses.free;
         };
       }) {};
-    helm-bibtex = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
+    helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
     melpaBuild {
         pname = "helm-bibtex";
-        version = "20160210.1638";
+        version = "20160422.1800";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "7895ac0f016cca71b6e171a98fee236d5ed312dd";
-          sha256 = "0j6ygwkwmjs7hblllj3mv2byc7lcqxx9vyjxs34j8q1vpam972p3";
+          rev = "62593c6289a3d17566edb1aa8ef4700bc83e9df7";
+          sha256 = "1zrs1gk95mna1kipgrq8mfhk0gqimvsb4b583f900fh86019nn1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-bibtex";
-          sha256 = "1rsplnh18w1fqr6da79vj8x9q2lyss9sssy8pfz3hfw7p6qi6zkg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-bibtex";
+          sha256 = "037pqgyyb2grg88yfxx1r8yp4lrgz2fyzz9fbbp34l8s6vk3cp4z";
           name = "helm-bibtex";
         };
-        packageRequires = [ cl-lib dash f helm parsebib s ];
+        packageRequires = [ biblio cl-lib dash f helm parsebib s ];
         meta = {
-          homepage = "http://melpa.org/#/helm-bibtex";
+          homepage = "https://melpa.org/#/helm-bibtex";
           license = lib.licenses.free;
         };
       }) {};
@@ -24860,13 +25884,13 @@
           sha256 = "10k7hjfz9jmfpbmsv20jy9vr6fqxx1yp8v115hprqvw057iifsl9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-bibtexkey";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-bibtexkey";
           sha256 = "00i7ni4r73mmxavhfcm0fd7jhx6gxvxx7prax1yxmhs46fpz8jwj";
           name = "helm-bibtexkey";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-bibtexkey";
+          homepage = "https://melpa.org/#/helm-bibtexkey";
           license = lib.licenses.free;
         };
       }) {};
@@ -24881,34 +25905,34 @@
           sha256 = "1wmcy7q4ys2sf8ya5l4n7a6bq5m9d6m19amjfwkmkh4ajkwl041y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-bind-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-bind-key";
           sha256 = "1yfj6mmxc165in1i85ccanssch6bg19ib1fcm7sa4i4hv0mgwaid";
           name = "helm-bind-key";
         };
         packageRequires = [ bind-key helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-bind-key";
+          homepage = "https://melpa.org/#/helm-bind-key";
           license = lib.licenses.free;
         };
       }) {};
     helm-bm = callPackage ({ bm, cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-bm";
-        version = "20131224.905";
+        version = "20160321.831";
         src = fetchFromGitHub {
           owner = "yasuyk";
           repo = "helm-bm";
-          rev = "1764c0139cb2f04b9fd520c7aca0b6d0152913bd";
-          sha256 = "1gcx7imq9gxfgmh188a8xlpmmlrdif1vsnnff49qvk82082ghbfz";
+          rev = "d66341f5646c23178d4d8bffb6cfebe3fb73f1d7";
+          sha256 = "011k37p4vnzm1x8vyairllanvjfknskl20bdfv0glf64xgbdpfil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-bm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-bm";
           sha256 = "1dnlcvn0zv4qv4ii4j0h9r8w6vhi3l0c5aa768kblh5r2rf4bjjh";
           name = "helm-bm";
         };
         packageRequires = [ bm cl-lib helm s ];
         meta = {
-          homepage = "http://melpa.org/#/helm-bm";
+          homepage = "https://melpa.org/#/helm-bm";
           license = lib.licenses.free;
         };
       }) {};
@@ -24923,13 +25947,13 @@
           sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-bundle-show";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-bundle-show";
           sha256 = "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7";
           name = "helm-bundle-show";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-bundle-show";
+          homepage = "https://melpa.org/#/helm-bundle-show";
           license = lib.licenses.free;
         };
       }) {};
@@ -24944,13 +25968,13 @@
           sha256 = "0w4svbg32y63v049plvk7djc1m2amjzrr1v979d9s6jbnnpzlb5c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-c-moccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-c-moccur";
           sha256 = "1i6a4jqjy9amlhdbj5d26wzagndfgszha09vs5qf4760vjl7kn4b";
           name = "helm-c-moccur";
         };
         packageRequires = [ color-moccur helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-c-moccur";
+          homepage = "https://melpa.org/#/helm-c-moccur";
           license = lib.licenses.free;
         };
       }) {};
@@ -24965,13 +25989,13 @@
           sha256 = "03c4w34r0q7xpz1ny8dya8f96rhjpc9r2c24n7vg9x6x4i2wl204";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-c-yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-c-yasnippet";
           sha256 = "0jwj4giv6lxb3h7vqqb2alkwq5kp0shy2nraik33956p4l8dfs90";
           name = "helm-c-yasnippet";
         };
         packageRequires = [ cl-lib helm yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/helm-c-yasnippet";
+          homepage = "https://melpa.org/#/helm-c-yasnippet";
           license = lib.licenses.free;
         };
       }) {};
@@ -24986,13 +26010,13 @@
           sha256 = "0wkskm0d1mvh49l65xg6pgwd7yxy02llflkzx59ayqv4wjvsyayb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-chrome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-chrome";
           sha256 = "0p3n2pna83mp4ym8x69lk4r3q4apbj5v2blg2mwcsd9zij153nxz";
           name = "helm-chrome";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-chrome";
+          homepage = "https://melpa.org/#/helm-chrome";
           license = lib.licenses.free;
         };
       }) {};
@@ -25007,13 +26031,13 @@
           sha256 = "1dmj4f8pris1i7wvfplp4dbnyfm403l6rplxfrfi0cd9afg7m68i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-chronos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-chronos";
           sha256 = "1a65b680741cx4cyyizyl2c3bss36x3j2m9sh9hjc87xrzarg0s3";
           name = "helm-chronos";
         };
         packageRequires = [ chronos helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-chronos";
+          homepage = "https://melpa.org/#/helm-chronos";
           license = lib.licenses.free;
         };
       }) {};
@@ -25028,13 +26052,13 @@
           sha256 = "18j4ikb3q8ygdq74zqzm83wgb39x7w209n3186mm051n8lfmkaif";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-cider-history";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-cider-history";
           sha256 = "12l8jyl743zqk8m2xzcz75y1ybdkbkvcbvfkn1k88k09s31kdq4h";
           name = "helm-cider-history";
         };
         packageRequires = [ cider helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-cider-history";
+          homepage = "https://melpa.org/#/helm-cider-history";
           license = lib.licenses.free;
         };
       }) {};
@@ -25049,34 +26073,34 @@
           sha256 = "1gwg299s8ps0q97iw6p515gwn73rjk1icgl3j7cj1s143njjg122";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-circe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-circe";
           sha256 = "12jfzg03573lih2aapvv5h2mi3pwqc9nrmv538ivjywix5117k3v";
           name = "helm-circe";
         };
         packageRequires = [ circe cl-lib emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-circe";
+          homepage = "https://melpa.org/#/helm-circe";
           license = lib.licenses.free;
         };
       }) {};
     helm-clojuredocs = callPackage ({ edn, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-clojuredocs";
-        version = "20160221.1512";
+        version = "20160405.223";
         src = fetchFromGitHub {
           owner = "mbuczko";
           repo = "helm-clojuredocs";
-          rev = "ac9e82c56f269f284968acbdf831b30b61b8ea70";
-          sha256 = "0c6gicql7jl0ygwp30axy5wrvwjj1xjnm3x0cjqg07pbycjhl65x";
+          rev = "5a7f0f2cb401be0b09e73262a1c18265ab9a3cea";
+          sha256 = "015b8zxh91ljhqvn6z43gy08di54xcw9skw0i7frj3d7gk984qhl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-clojuredocs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-clojuredocs";
           sha256 = "0yz0wlyay9286by8i30gs3ispswq8ayqlcnna1s7bgspjvb7scmk";
           name = "helm-clojuredocs";
         };
         packageRequires = [ edn helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-clojuredocs";
+          homepage = "https://melpa.org/#/helm-clojuredocs";
           license = lib.licenses.free;
         };
       }) {};
@@ -25085,19 +26109,19 @@
         pname = "helm-cmd-t";
         version = "20150823.1357";
         src = fetchFromGitHub {
-          owner = "lewang";
+          owner = "emacs-helm";
           repo = "helm-cmd-t";
           rev = "8749f0b2b8527423cd146fa2d5c0e7a9e159eefb";
           sha256 = "10cp21v8vwgp8hv2rkdn9x8v2n8wqbphgslb561rlwc2rfpvzqvs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-cmd-t";
-          sha256 = "04fmhravd3ld4n1n820wlnr1jvmk7c7cdazd15gazixrlz6fm4fk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-cmd-t";
+          sha256 = "1w870ldq029wgicgv4cqm31zw2i8vkap3m9hsr9d0i3gv2virnc6";
           name = "helm-cmd-t";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/helm-cmd-t";
+          homepage = "https://melpa.org/#/helm-cmd-t";
           license = lib.licenses.free;
         };
       }) {};
@@ -25112,13 +26136,13 @@
           sha256 = "05nvbwz3inbmfj88am69sz032wsj8jkfpjk5drgfijw98il9blk9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-codesearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-codesearch";
           sha256 = "1v21zwcyx73bc1lcfk60v8xim31bwdk4p06g9i4qag3cijdlli9q";
           name = "helm-codesearch";
         };
         packageRequires = [ cl-lib dash helm s ];
         meta = {
-          homepage = "http://melpa.org/#/helm-codesearch";
+          homepage = "https://melpa.org/#/helm-codesearch";
           license = lib.licenses.free;
         };
       }) {};
@@ -25133,13 +26157,13 @@
           sha256 = "0fxrmvb64lav4aqs61z3a4d2mcp9s2nw7fvysyjn0r1291pkzk9j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-commandlinefu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-commandlinefu";
           sha256 = "150nqib0sr4n35vdj1xrxcja8gkv3chzhdbgkjxqgkz2yq10xxnd";
           name = "helm-commandlinefu";
         };
         packageRequires = [ emacs helm json let-alist ];
         meta = {
-          homepage = "http://melpa.org/#/helm-commandlinefu";
+          homepage = "https://melpa.org/#/helm-commandlinefu";
           license = lib.licenses.free;
         };
       }) {};
@@ -25154,34 +26178,34 @@
           sha256 = "189qmc6fdj5a01a7w45r0qpn9qjf2q9g83qic9sgnrccc841zpyg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-company";
           sha256 = "1pbsg7zrz447siwd8pasw2hz5z21wa1xpqs5nrylhbghsk076ld3";
           name = "helm-company";
         };
         packageRequires = [ company helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-company";
+          homepage = "https://melpa.org/#/helm-company";
           license = lib.licenses.free;
         };
       }) {};
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20160217.1158";
+        version = "20160420.155";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "27baadfe942d7b3a2b5049029c002d6a1cc9fea2";
-          sha256 = "04fw48six952jxcp9mriz7pcfj223z80am9ig1y4rp3yanqm6z1x";
+          rev = "3099cfca9e35b3df9bd1e80057f96246ef2e1705";
+          sha256 = "1xspnqdg18rzjnd55vawcj74ypx430lzj19i70bhgzghb22pw3rl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-core";
           sha256 = "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda";
           name = "helm-core";
         };
         packageRequires = [ async emacs ];
         meta = {
-          homepage = "http://melpa.org/#/helm-core";
+          homepage = "https://melpa.org/#/helm-core";
           license = lib.licenses.free;
         };
       }) {};
@@ -25196,13 +26220,13 @@
           sha256 = "0nhi8xhcf7qpsibpyy5v364xx7lqkhskzai7awkg0xcdq8b5090x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-cscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-cscope";
           sha256 = "13a76wc1ia4c0v701dxqc9ycbb43d5k09m5pfsvs8mccisfzk9y4";
           name = "helm-cscope";
         };
         packageRequires = [ cl-lib emacs helm xcscope ];
         meta = {
-          homepage = "http://melpa.org/#/helm-cscope";
+          homepage = "https://melpa.org/#/helm-cscope";
           license = lib.licenses.free;
         };
       }) {};
@@ -25217,13 +26241,13 @@
           sha256 = "01a3pahpsxb7d15dkfgxypl7gzqb4dy4f36lmid1w77b9rhs6nph";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-css-scss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-css-scss";
           sha256 = "0iflwl0rijbkx1b7i1s7984dw7sz1wa1cb74fqij0kcn76kal7ak";
           name = "helm-css-scss";
         };
         packageRequires = [ emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-css-scss";
+          homepage = "https://melpa.org/#/helm-css-scss";
           license = lib.licenses.free;
         };
       }) {};
@@ -25238,34 +26262,34 @@
           sha256 = "18d96alik66nw3rkk7k8740b4rx2bnh3pwn27ahpgj5yf51wm0ry";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ctest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-ctest";
           sha256 = "1mphc9fsclbw19p5i1xf52qg6ljljbajvbcsl95hisrnvhg89vpm";
           name = "helm-ctest";
         };
         packageRequires = [ dash helm-core s ];
         meta = {
-          homepage = "http://melpa.org/#/helm-ctest";
+          homepage = "https://melpa.org/#/helm-ctest";
           license = lib.licenses.free;
         };
       }) {};
     helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-dash";
-        version = "20160220.635";
+        version = "20160416.1908";
         src = fetchFromGitHub {
           owner = "areina";
           repo = "helm-dash";
-          rev = "372bba923904d229ecfbd44990f7fb4edec4d6a6";
-          sha256 = "1g02vk1pfk969c3zvc307wg7kzgiwzwa861hk60zsffhinhw795y";
+          rev = "238d60e329f58bee08b6fb800be56dc7201d560b";
+          sha256 = "03h9p3z6n9mi6hld86i6wj01glx4p058iifygrph0vvzczisixcq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-dash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-dash";
           sha256 = "1cnxssj2ilszq94v5cc4ixblar1nlilv9askqjp9gfnkj2z1n9cy";
           name = "helm-dash";
         };
         packageRequires = [ cl-lib helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-dash";
+          homepage = "https://melpa.org/#/helm-dash";
           license = lib.licenses.free;
         };
       }) {};
@@ -25280,13 +26304,13 @@
           sha256 = "0y0xxs67bzh6j68j3f4zxzrl2ij5g1qvvxqklw7nz305xliis29g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-descbinds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-descbinds";
           sha256 = "1890ss4pimjxskzzllf57fg07xbs8zqcrp6r8r6x989llrfvd1h7";
           name = "helm-descbinds";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-descbinds";
+          homepage = "https://melpa.org/#/helm-descbinds";
           license = lib.licenses.free;
         };
       }) {};
@@ -25301,34 +26325,34 @@
           sha256 = "0li9bi1lm5ldwfpvzahxp7hyfd94jr1kl43rprx0myxb016yk2p5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-describe-modes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-describe-modes";
           sha256 = "0ajy9kwspm8rzafl0df57fad5867s86yjqj29shznqb12r91lpqb";
           name = "helm-describe-modes";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-describe-modes";
+          homepage = "https://melpa.org/#/helm-describe-modes";
           license = lib.licenses.free;
         };
       }) {};
     helm-dictionary = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-dictionary";
-        version = "20141226.1336";
+        version = "20160408.1145";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-dictionary";
-          rev = "2aeafba1556c76cc5ff949ca50f341fc2aa687b0";
-          sha256 = "05mb7kb4x7kzh0w9r531ppd92hzsa2v3wqcmafkcn1z5wfp7zw68";
+          rev = "d6839ff60da6e5c6936a1f59e48f0ded13dda0b0";
+          sha256 = "0v5n46vkbhzsasz41dsllpmkn71y124zz9ycpdql4wsl3mlkhlcs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-dictionary";
           sha256 = "1pak8qn0qvbzyclhzvr5ka3pl370i4kiykypfkwbfgvqqwczhl3n";
           name = "helm-dictionary";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-dictionary";
+          homepage = "https://melpa.org/#/helm-dictionary";
           license = lib.licenses.free;
         };
       }) {};
@@ -25343,13 +26367,13 @@
           sha256 = "14sifdrfg8ydvi9mj8qm2bfphbffglxrkb5ky4q5b3j96bn8v110";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-dired-recent-dirs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-dired-recent-dirs";
           sha256 = "0kh0n5674ksswjzi9gji2qmx8v8g0axx8xbi0m3zby9nwcpv4qzs";
           name = "helm-dired-recent-dirs";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-dired-recent-dirs";
+          homepage = "https://melpa.org/#/helm-dired-recent-dirs";
           license = lib.licenses.free;
         };
       }) {};
@@ -25364,13 +26388,13 @@
           sha256 = "183vj5yi575aqkak19hl8k4mw38r0ki9p1fnpa8nny2srjyy34yb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-dirset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-dirset";
           sha256 = "0vng52axp7r01s00cqbbclbm5bx1qbhmlrx9h9kj7smx1al4daml";
           name = "helm-dirset";
         };
         packageRequires = [ cl-lib f helm s ];
         meta = {
-          homepage = "http://melpa.org/#/helm-dirset";
+          homepage = "https://melpa.org/#/helm-dirset";
           license = lib.licenses.free;
         };
       }) {};
@@ -25385,13 +26409,13 @@
           sha256 = "0c3mn5w98phsv7gsljyp5vxxmr2w6n3nczh5zm4hcpwsra3wh1v9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-emmet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-emmet";
           sha256 = "1dkn9qa3dv2im11lm19wfh5jwwwp42sv7jc0p6qg35rhzwdpfg03";
           name = "helm-emmet";
         };
         packageRequires = [ emmet-mode helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-emmet";
+          homepage = "https://melpa.org/#/helm-emmet";
           license = lib.licenses.free;
         };
       }) {};
@@ -25406,13 +26430,13 @@
           sha256 = "0330s07b41nw9q32xhjdl7yw83p8ikj6b2qkir3y0jyx16gk10dl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-emms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-emms";
           sha256 = "1vq7cxnacmhyczsa4s5h1nnzc08m66harfnxsqxyrdsnggv9hbf5";
           name = "helm-emms";
         };
         packageRequires = [ cl-lib emacs emms helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-emms";
+          homepage = "https://melpa.org/#/helm-emms";
           license = lib.licenses.free;
         };
       }) {};
@@ -25427,76 +26451,76 @@
           sha256 = "00yhmpv5xjlw1gwbcrznz83gkaby8zlqv74d3p7plca2cwjll1g9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-filesets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-filesets";
           sha256 = "1yhhchksi0r4r5c5q1mggz2hykkvk93baq91b5hkaflqi30d1v8f";
           name = "helm-filesets";
         };
         packageRequires = [ filesets-plus helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-filesets";
+          homepage = "https://melpa.org/#/helm-filesets";
           license = lib.licenses.free;
         };
       }) {};
     helm-firefox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-firefox";
-        version = "20160101.1542";
+        version = "20160419.758";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-firefox";
-          rev = "ca1a800c2564650e67651ee62159e9f1c1ba1135";
-          sha256 = "0vmlpj6zfif5f3wzgq8lkfqprl3z5gjsqj86347krblgfzhqlz30";
+          rev = "c6880653face6b6a033558c97ff038168cf991c2";
+          sha256 = "04zvpdb6hrkss6mvvl2676b8blvykf6w6ks03ljrfb7sdw9d17ll";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-firefox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-firefox";
           sha256 = "0677nj0zsk11vvp3q3xl9nk8dhz3ki9yl3kfb57wgnmprp109wgs";
           name = "helm-firefox";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-firefox";
+          homepage = "https://melpa.org/#/helm-firefox";
           license = lib.licenses.free;
         };
       }) {};
     helm-flx = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-flx";
-        version = "20160129.1504";
+        version = "20160227.1852";
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "helm-flx";
-          rev = "0001a85e88164e8ba6a674a19c44772ce946c9d4";
-          sha256 = "1j2ziyzyhd177b3rhrdbkqjmqbr3a8aj670mayy6l2r4ydp5xmaq";
+          rev = "3cb3587297c3b6e863d79b7d4d7564043c888b61";
+          sha256 = "0mrck7qbqjqz5kpih3zb1yn2chjgv5ghrqc5cp80kmsmxasvk8zw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-flx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-flx";
           sha256 = "03vxr5f5m4s6k6rm0976w8h3s4c3b5mrdqgmkd281hmyh9q3cslq";
           name = "helm-flx";
         };
         packageRequires = [ emacs flx helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-flx";
+          homepage = "https://melpa.org/#/helm-flx";
           license = lib.licenses.free;
         };
       }) {};
     helm-flycheck = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-flycheck";
-        version = "20140915.952";
+        version = "20160319.117";
         src = fetchFromGitHub {
           owner = "yasuyk";
           repo = "helm-flycheck";
-          rev = "361d7f0359cea3dd0bfef1647d65ab61c9e52925";
-          sha256 = "0k5703nj838qh0h6hzgffjrp0df9rs7psczg4r9mxpi19vqk8ff0";
+          rev = "83c069abd896b481407234cd0132649245d81194";
+          sha256 = "062s08k8v657fpkqvdspv32awvj7dq929ks27w29k3kbzlqlrihp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-flycheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-flycheck";
           sha256 = "038f9294qc0jnkzrrjxm97hyhwa4sca3wdsjbaya50cf0g4cmk7b";
           name = "helm-flycheck";
         };
         packageRequires = [ dash flycheck helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-flycheck";
+          homepage = "https://melpa.org/#/helm-flycheck";
           license = lib.licenses.free;
         };
       }) {};
@@ -25511,13 +26535,13 @@
           sha256 = "1liaid4l4x8sb133lj944gwwpqngsf8hzibdwyfdmsi4m4abh73h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-flymake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-flymake";
           sha256 = "0h87yd56nhxpahrcpk6hin142hzv3sdr5bvz0injbv8a2lwnny3b";
           name = "helm-flymake";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-flymake";
+          homepage = "https://melpa.org/#/helm-flymake";
           license = lib.licenses.free;
         };
       }) {};
@@ -25532,13 +26556,13 @@
           sha256 = "1k7invgzqrcm11plyvinqwf98yxibr8i4r9yw3csfsicc8b6if59";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-flyspell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-flyspell";
           sha256 = "1g6xry2y6396pg7rg8hc0l84z5r3j2df7dpd1jgffxa8xa3i661f";
           name = "helm-flyspell";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-flyspell";
+          homepage = "https://melpa.org/#/helm-flyspell";
           license = lib.licenses.free;
         };
       }) {};
@@ -25553,13 +26577,13 @@
           sha256 = "15am2dpva3fzj68sw9n4mpdxkw75l97l1k2j9vlvi2lbqk1h46pi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-fuzzier";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-fuzzier";
           sha256 = "0qdgf0phs3iz29zj3qjhdgb3i4xvf5r2vi0709pwxx2s6r13pvcc";
           name = "helm-fuzzier";
         };
         packageRequires = [ emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-fuzzier";
+          homepage = "https://melpa.org/#/helm-fuzzier";
           license = lib.licenses.free;
         };
       }) {};
@@ -25574,13 +26598,13 @@
           sha256 = "1yxnmxq6ppfgwxrk5ryc5xfn82kjf4j65j14hy077gphr0q61q6a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-fuzzy-find";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-fuzzy-find";
           sha256 = "0lczlrpd5jy2vhy9jl3rjcdyiwr136spqm8k2rj8m9s8wpn0v75i";
           name = "helm-fuzzy-find";
         };
         packageRequires = [ emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-fuzzy-find";
+          homepage = "https://melpa.org/#/helm-fuzzy-find";
           license = lib.licenses.free;
         };
       }) {};
@@ -25595,13 +26619,13 @@
           sha256 = "16p1gisbza48qircsvrwx020n96ss1c6s68d7cgqqfc0bf2467is";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-ghc";
           sha256 = "1q5ia8sgpflv2hhvw7hjpkfb25vmrjwlrqz1f9qj2qgmki5mix2d";
           name = "helm-ghc";
         };
         packageRequires = [ cl-lib emacs ghc helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-ghc";
+          homepage = "https://melpa.org/#/helm-ghc";
           license = lib.licenses.free;
         };
       }) {};
@@ -25616,13 +26640,13 @@
           sha256 = "0y379qap3mssz9nslb08vfzq5ihqcm156fbx0dszgz9d6xgkpdhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ghq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-ghq";
           sha256 = "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6";
           name = "helm-ghq";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-ghq";
+          homepage = "https://melpa.org/#/helm-ghq";
           license = lib.licenses.free;
         };
       }) {};
@@ -25637,13 +26661,13 @@
           sha256 = "1yfy4a52hx44r32i0b75bka8gfcn5lp61jl86lzrsi2cr9wg10pn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-git";
           sha256 = "1ib73p7cmkw96csxxpkqwn6m60k1xrd46z6vyp29gj85cs4fpsb8";
           name = "helm-git";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/helm-git";
+          homepage = "https://melpa.org/#/helm-git";
           license = lib.licenses.free;
         };
       }) {};
@@ -25658,34 +26682,34 @@
           sha256 = "157b525h0kiaknn12fsw67fg26lzb20apx8sssmvlcicqcd51iaw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-git-files";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-git-files";
           sha256 = "02109r956nc1dmqh4v082vkr9wdixh03xhl7icwkzl7ipr5453s6";
           name = "helm-git-files";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-git-files";
+          homepage = "https://melpa.org/#/helm-git-files";
           license = lib.licenses.free;
         };
       }) {};
     helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-git-grep";
-        version = "20140222.2022";
+        version = "20160408.2152";
         src = fetchFromGitHub {
           owner = "yasuyk";
           repo = "helm-git-grep";
-          rev = "9e602f79ea58fe12c6a48ce3c2f749b817ef8c86";
-          sha256 = "1mp5gbda81szbx19rvaa6ybb28v64q49hqic8d478ggnjjsqhfyr";
+          rev = "f8639362a6b96cbe2c5456d895d8a43ec84ff339";
+          sha256 = "1b29g71a2hwr83j6mamlzrczz5sydvds23wf50ja7svy2qvzyvp3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-git-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-git-grep";
           sha256 = "1ww6a4q78w5hnwikq7y93ic2b7x070c27r946lh6p8cz1k4b8vqi";
           name = "helm-git-grep";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-git-grep";
+          homepage = "https://melpa.org/#/helm-git-grep";
           license = lib.licenses.free;
         };
       }) {};
@@ -25700,13 +26724,13 @@
           sha256 = "1sbhh3dmb47sy3r2iw6vmvbq5bpjac4xdg8i5a0m0c392a38nfqn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-github-stars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-github-stars";
           sha256 = "1r4mc4v71171sq9rbbhm346s92fb7jnvvl91y2q52jqmrnzzl9zy";
           name = "helm-github-stars";
         };
         packageRequires = [ emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-github-stars";
+          homepage = "https://melpa.org/#/helm-github-stars";
           license = lib.licenses.free;
         };
       }) {};
@@ -25721,13 +26745,13 @@
           sha256 = "0pd755s5zcg8y1svxj3g8m0znkp6cyx5y6lsj4lxczrk7lynzc3g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-gitignore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-gitignore";
           sha256 = "01l7mx8g1m5qnwz973hzrgds4gywm56jgl4hcdxqvpi1n56md3x6";
           name = "helm-gitignore";
         };
         packageRequires = [ cl-lib gitignore-mode helm request ];
         meta = {
-          homepage = "http://melpa.org/#/helm-gitignore";
+          homepage = "https://melpa.org/#/helm-gitignore";
           license = lib.licenses.free;
         };
       }) {};
@@ -25742,76 +26766,76 @@
           sha256 = "00mma30r7ixbrxjmmddz4klh517fcr3yn6ss4zw33fh2hzj3w6rl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-gitlab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-gitlab";
           sha256 = "010ihx3yddhb8j3jqcssc49qnf3i7xlz0s380mpgrdxgz6yahsmd";
           name = "helm-gitlab";
         };
         packageRequires = [ dash gitlab helm s ];
         meta = {
-          homepage = "http://melpa.org/#/helm-gitlab";
+          homepage = "https://melpa.org/#/helm-gitlab";
           license = lib.licenses.free;
         };
       }) {};
     helm-go-package = callPackage ({ deferred, fetchFromGitHub, fetchurl, go-mode, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-go-package";
-        version = "20150603.804";
+        version = "20160321.315";
         src = fetchFromGitHub {
           owner = "yasuyk";
           repo = "helm-go-package";
-          rev = "1909156510a4e73697a86b8c040d38e4d352851a";
-          sha256 = "1r01nl1k9jjb70214rkmbqaa4qrkyd3apiyq00w02wsymy12wwic";
+          rev = "469bbbe4c6cdd4c80444ece10f07cfb62fc4f13e";
+          sha256 = "0iyfn58h50xms5915i29b54wfyxh6vi9vy3v3r91g6dwlxrjibka";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-go-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-go-package";
           sha256 = "102yhn1xg83l67yaq3brn35a03fkvqqhad10rq0h39n4i1slq3z6";
           name = "helm-go-package";
         };
         packageRequires = [ deferred go-mode helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-go-package";
+          homepage = "https://melpa.org/#/helm-go-package";
           license = lib.licenses.free;
         };
       }) {};
     helm-google = callPackage ({ fetchFromGitHub, fetchurl, google, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-google";
-        version = "20141228.540";
+        version = "20160226.1420";
         src = fetchFromGitHub {
           owner = "steckerhalter";
           repo = "helm-google";
-          rev = "21443456eefab39a2bfef00f1387c015e7dfac51";
-          sha256 = "0ml5mv282dz73hmgjalcsypdvc30pwhsfbamyz46744j7wxn6ik2";
+          rev = "73485b901c306c7bc25100e0e7433124fb657654";
+          sha256 = "1addskcm325lb9plcbxfp1f6fsj3dcccb87gzihrp7ahiy7pmvih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-google";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-google";
           sha256 = "0d1y7232rm888car3h40fba1m1pna2nh1a3fcvpra74igwarfi32";
           name = "helm-google";
         };
         packageRequires = [ google helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-google";
+          homepage = "https://melpa.org/#/helm-google";
           license = lib.licenses.free;
         };
       }) {};
     helm-grepint = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-grepint";
-        version = "20160220.1240";
+        version = "20160303.1426";
         src = fetchFromGitHub {
           owner = "kopoli";
           repo = "helm-grepint";
-          rev = "2c0a2a95c3403bb1090665f4d56e6e1ed085a91e";
-          sha256 = "0n1nfi1zbp70bjyik7s8mif2vwyadacikvasrdry0s3mnrx0hsnx";
+          rev = "95e4c10ef0c0a18f660caaebb07bf5c5887efcfc";
+          sha256 = "1f88vd31fc7ksrhlc72i6c0wbbz62lxw9yakxdk0m72pfz345mz2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-grepint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-grepint";
           sha256 = "00wr3wk41sbpamxbjkqlby49g8y5z9n79p51sg7ginban4qy91gf";
           name = "helm-grepint";
         };
         packageRequires = [ emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-grepint";
+          homepage = "https://melpa.org/#/helm-grepint";
           license = lib.licenses.free;
         };
       }) {};
@@ -25826,34 +26850,34 @@
           sha256 = "0p0mk44y2z875ra8mzcb6vlf4rbkiq9yank5hdxvg2x2sxsaambk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-growthforecast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-growthforecast";
           sha256 = "0716rhs5dam6p8ym83vy19svl6jr49lcfgb29mm3cqi9jcch3ckh";
           name = "helm-growthforecast";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-growthforecast";
+          homepage = "https://melpa.org/#/helm-growthforecast";
           license = lib.licenses.free;
         };
       }) {};
     helm-gtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-gtags";
-        version = "20160202.703";
+        version = "20160417.755";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-gtags";
-          rev = "f14ff7140d0f070b089df7567f2cc6b437ab9924";
-          sha256 = "1hqmwbdcjssvvl7prdykhlgbfrf4qylkvqp0nnnxp8r1wy6h6aws";
+          rev = "dbe0d2d9d08058d469ad2d729bd782515b5b3b62";
+          sha256 = "0zyspn9rqfs3hkq8qx0q1w5qiv30ignbmycyv0vn3a6q7a5fsnhx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-gtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-gtags";
           sha256 = "1kbpfqhhbxmp3f70h91x2fws9mhx87zx4nzjjl29lpl93vf8xckl";
           name = "helm-gtags";
         };
         packageRequires = [ emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-gtags";
+          homepage = "https://melpa.org/#/helm-gtags";
           license = lib.licenses.free;
         };
       }) {};
@@ -25868,13 +26892,13 @@
           sha256 = "189dv3qqqmfyhsqa1n52cgcn1xv7k49f92ndn43y2v20234nhl9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-hatena-bookmark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-hatena-bookmark";
           sha256 = "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id";
           name = "helm-hatena-bookmark";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-hatena-bookmark";
+          homepage = "https://melpa.org/#/helm-hatena-bookmark";
           license = lib.licenses.free;
         };
       }) {};
@@ -25889,13 +26913,13 @@
           sha256 = "08pfzs030d8g5s7vkpgicz4srp5cr3xpd84lhrr24ncrhbszxar9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-hayoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-hayoo";
           sha256 = "0xdvl6q2rpfsma4hx8m4snbd05s4z0bi8psdalixywlp5s4vzr32";
           name = "helm-hayoo";
         };
         packageRequires = [ haskell-mode helm json ];
         meta = {
-          homepage = "http://melpa.org/#/helm-hayoo";
+          homepage = "https://melpa.org/#/helm-hayoo";
           license = lib.licenses.free;
         };
       }) {};
@@ -25910,34 +26934,34 @@
           sha256 = "05ksfx54ar2j4mypzwh0gfir8r26s4f1i4xw319q5pa1y2100cpn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-helm-commands";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-helm-commands";
           sha256 = "0dq9p37i5rrp2nb1vhqzzqfmdg11va2xr3yz8hdxpwykm1ldqdcf";
           name = "helm-helm-commands";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-helm-commands";
+          homepage = "https://melpa.org/#/helm-helm-commands";
           license = lib.licenses.free;
         };
       }) {};
     helm-hoogle = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-hoogle";
-        version = "20150919.421";
+        version = "20150919.232";
         src = fetchFromGitHub {
           owner = "jwiegley";
-          repo = "haskell-config";
-          rev = "8e4e28c3852376510861f64f00009a63b8ec0c7d";
-          sha256 = "052hzybign54qawdm1fflsaz4bcwflycksv6wb1nw1jv79s2qbap";
+          repo = "helm-hoogle";
+          rev = "f4a02784dd7c3f6e8ecda31dea23b2faae260636";
+          sha256 = "1l85kip4zd08d38sk7cdafmx0v68dh419cs86g7x0mgi0wn00kfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-hoogle";
-          sha256 = "0672mqm0c261mknbgc3a4pahq27gw2pfklflxl1y4ykbs6q7vcyw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-hoogle";
+          sha256 = "0vhk4vwqfirdm5d0pppplfpqyc2sfj6jybhzp9n1w8xgrh2d1c0x";
           name = "helm-hoogle";
         };
         packageRequires = [ emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-hoogle";
+          homepage = "https://melpa.org/#/helm-hoogle";
           license = lib.licenses.free;
         };
       }) {};
@@ -25952,13 +26976,13 @@
           sha256 = "0128nrhwyzslzl0l7wcjxn3dlx3h1sjmwnbbnp2fj4bjk7chc59q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-idris";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-idris";
           sha256 = "1y52675j4kcq14jypxjw1rflxrxwaxyn1n3m613klad55wpfaamf";
           name = "helm-idris";
         };
         packageRequires = [ helm idris-mode ];
         meta = {
-          homepage = "http://melpa.org/#/helm-idris";
+          homepage = "https://melpa.org/#/helm-idris";
           license = lib.licenses.free;
         };
       }) {};
@@ -25973,13 +26997,13 @@
           sha256 = "0py4xs27z2jvg99i6qaf2ccz0mvk6bb9cvdyz8v8ngmnj3rw2vla";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-img";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-img";
           sha256 = "0sq9l1wgm97ppfc45w3bdcv0qq5m85ygnanv1bdcp8bxbdl4vg0q";
           name = "helm-img";
         };
         packageRequires = [ cl-lib helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-img";
+          homepage = "https://melpa.org/#/helm-img";
           license = lib.licenses.free;
         };
       }) {};
@@ -25994,13 +27018,13 @@
           sha256 = "04vdin0n3514c8bycdjrwk3l6pkarrwanlklnm75315b91nkkbcp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-img-tiqav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-img-tiqav";
           sha256 = "1m083hiih2rpyy8i439745mj4ldqy85fpnvms8qnv3042b8x35y0";
           name = "helm-img-tiqav";
         };
         packageRequires = [ helm-img ];
         meta = {
-          homepage = "http://melpa.org/#/helm-img-tiqav";
+          homepage = "https://melpa.org/#/helm-img-tiqav";
           license = lib.licenses.free;
         };
       }) {};
@@ -26015,13 +27039,13 @@
           sha256 = "04ddjdia09y14gq4h6m8g6aiwkqvdxp66yjx3j5dh2xrkyxhlxpz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ispell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-ispell";
           sha256 = "0qyj6whgb2p0v231wn6pvx4awvl1wxppppqqbx5255j8r1f3l1b0";
           name = "helm-ispell";
         };
         packageRequires = [ helm-core ];
         meta = {
-          homepage = "http://melpa.org/#/helm-ispell";
+          homepage = "https://melpa.org/#/helm-ispell";
           license = lib.licenses.free;
         };
       }) {};
@@ -26030,19 +27054,19 @@
         pname = "helm-itunes";
         version = "20151013.148";
         src = fetchFromGitHub {
-          owner = "daschwa";
+          owner = "anschwa";
           repo = "helm-itunes";
           rev = "966de755a5aadbe02311a6cef77bd4790e84c263";
           sha256 = "1czgf5br89x192g3lh3x2n998f79hi1n2f309ll264qnl35kv14w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-itunes";
-          sha256 = "15z5lgh5x1ykz5p31i994fig8v05s7ckkgw6p9jifn11sn1a39nb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-itunes";
+          sha256 = "0zi4wyraqkjwp954pkng8b23giv1q9618apd9v3dczsvlmaar9hf";
           name = "helm-itunes";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-itunes";
+          homepage = "https://melpa.org/#/helm-itunes";
           license = lib.licenses.free;
         };
       }) {};
@@ -26057,13 +27081,13 @@
           sha256 = "0f2psp7p82sa2fip282w152zc1rjd3l0sna1g7rgwi9x29gcsh0v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-j-cheatsheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-j-cheatsheet";
           sha256 = "0lppzk60vl3ps9fqnrh020awiy5w46gwlb6d91pr889x24ryphmm";
           name = "helm-j-cheatsheet";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-j-cheatsheet";
+          homepage = "https://melpa.org/#/helm-j-cheatsheet";
           license = lib.licenses.free;
         };
       }) {};
@@ -26078,13 +27102,13 @@
           sha256 = "0vhqpcv8xi6a6q7n6xxahdzijr1x5s40fvk9nc44q55psbyv627g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-jstack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-jstack";
           sha256 = "0giix1rv2jrmdxyg990w90ivl8bvgbbvah6nkpj7gb6vbnm15ldz";
           name = "helm-jstack";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-jstack";
+          homepage = "https://melpa.org/#/helm-jstack";
           license = lib.licenses.free;
         };
       }) {};
@@ -26099,34 +27123,34 @@
           sha256 = "0nkmc17ggyfi7iz959mvzh6q7116j44zqwi7ydm9i8z49xfpzafy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-lobsters";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-lobsters";
           sha256 = "0dkb78n373kywxj8zba2s5a2g85vx19rdswv9i78xjwv1lqh8cpp";
           name = "helm-lobsters";
         };
         packageRequires = [ cl-lib helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-lobsters";
+          homepage = "https://melpa.org/#/helm-lobsters";
           license = lib.licenses.free;
         };
       }) {};
     helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ls-git";
-        version = "20151101.56";
+        version = "20160407.2340";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-ls-git";
-          rev = "8cddd84ee4361b9d21f800adbaeeacf72645ab62";
-          sha256 = "129mlpx5vqxyg2scrdiajxp71phxamrvijpc054k1q1an8vgn0kv";
+          rev = "841400ff302c5fdcba55fd6b2a18a01b420fcfd2";
+          sha256 = "0yridy54p53zps33766hl7p2hq5pc4vxm08rb5vzbjw84vwaq07b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ls-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-ls-git";
           sha256 = "08rsy9479nk03kinjfkxddrq6wi4sx2a0wrz37cl2q517qi7sibj";
           name = "helm-ls-git";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-ls-git";
+          homepage = "https://melpa.org/#/helm-ls-git";
           license = lib.licenses.free;
         };
       }) {};
@@ -26141,13 +27165,13 @@
           sha256 = "1msrsqiwk7bg5gry5cia8a6c7ifymfyn738hk8g2qwzzw4vkxxcs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ls-hg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-ls-hg";
           sha256 = "0ca0xn7n8bagxb504xgkcv04rpm1vxhx2m77biqrx5886pwl25bh";
           name = "helm-ls-hg";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-ls-hg";
+          homepage = "https://melpa.org/#/helm-ls-hg";
           license = lib.licenses.free;
         };
       }) {};
@@ -26157,38 +27181,38 @@
         version = "20150717.239";
         src = fetchsvn {
           url = "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el";
-          rev = "145939";
+          rev = "148084";
           sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ls-svn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-ls-svn";
           sha256 = "08mwzi340akw4ar20by0q981mzmzvf0wz3mn738q4inn2kqgs60d";
           name = "helm-ls-svn";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-ls-svn";
+          homepage = "https://melpa.org/#/helm-ls-svn";
           license = lib.licenses.free;
         };
       }) {};
     helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "helm-make";
-        version = "20151117.1120";
+        version = "20160331.954";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "helm-make";
-          rev = "0f29d09002653a2b3cb21ffdecaf33e7911747d8";
-          sha256 = "05z1s01wgdj2s7qln42cg7nnjq0hmq2ji4xjldzj6w770a5nvb7g";
+          rev = "83f11a9bf9db3570b547eade58346b5887e016c0";
+          sha256 = "1zxahr48s17di8mcy2sxvy4006ch9vwbvkbgkxdphijgqz41irqz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-make";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-make";
           sha256 = "1r6jjy1rlsii6p6pinbz7h6gcw4vmcycd3vj338bfbnqp5rrf2mc";
           name = "helm-make";
         };
         packageRequires = [ helm projectile ];
         meta = {
-          homepage = "http://melpa.org/#/helm-make";
+          homepage = "https://melpa.org/#/helm-make";
           license = lib.licenses.free;
         };
       }) {};
@@ -26203,13 +27227,13 @@
           sha256 = "0gzlprf5js4y3vzkf7si2xc7ai5j97b5cqrs002hyjj5ij4f2vix";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-migemo";
           sha256 = "1cjvb1lm1fsg5ky63fvrphwl5a7r7xf6qzb4mvl06ikj8hv2h33x";
           name = "helm-migemo";
         };
         packageRequires = [ cl-lib emacs helm-core migemo ];
         meta = {
-          homepage = "http://melpa.org/#/helm-migemo";
+          homepage = "https://melpa.org/#/helm-migemo";
           license = lib.licenses.free;
         };
       }) {};
@@ -26224,13 +27248,13 @@
           sha256 = "1lbxb4vnnv6s46m90qihkj99qdbdylwncwaijjfd7i2kap2ayawh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-mode-manager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-mode-manager";
           sha256 = "1w9svq1kyyj8mmljardhbdvykb334nq1y18s956g4rvqyas2ciyd";
           name = "helm-mode-manager";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-mode-manager";
+          homepage = "https://melpa.org/#/helm-mode-manager";
           license = lib.licenses.free;
         };
       }) {};
@@ -26245,34 +27269,34 @@
           sha256 = "09rb8aq7fnf661w3liwbkkaczjph3dzvg26slm9cwcnl7pqnvagl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-mt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-mt";
           sha256 = "04hx8cg8wmm2w8g942nc9mvm12ammmjnx4k61ljrq76smd8s3x2a";
           name = "helm-mt";
         };
         packageRequires = [ cl-lib emacs helm multi-term ];
         meta = {
-          homepage = "http://melpa.org/#/helm-mt";
+          homepage = "https://melpa.org/#/helm-mt";
           license = lib.licenses.free;
         };
       }) {};
     helm-mu = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-mu";
-        version = "20160124.1957";
+        version = "20160404.1053";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-mu";
-          rev = "20a2a8a43403f5ff9ee32510c78551f63d2e0e57";
-          sha256 = "0zcpdkh2ycmnv2nkv02khqp5r7za3x3vji2sj4nwz1wd86rrpbv5";
+          rev = "f5e1cb2cd16798efb7a38c6c25db8890878af2c9";
+          sha256 = "1q55x1rygqxriwxyp88azfp3phnibjfz9bwq4dwsvqah1zpzdzma";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-mu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-mu";
           sha256 = "0pydp6scj5icaqfp3dp5h0q1y2i7z9mfyw1ll6iphsz9qh3x2bj2";
           name = "helm-mu";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-mu";
+          homepage = "https://melpa.org/#/helm-mu";
           license = lib.licenses.free;
         };
       }) {};
@@ -26283,17 +27307,38 @@
         src = fetchFromGitHub {
           owner = "travisbhartwell";
           repo = "nix-emacs";
-          rev = "63061d379460c53abbe88ec695a61e22feae438f";
-          sha256 = "100vjppa6nipn227v871nkmjmqln2l1lv1v8in1lcjhsz4rxrhs9";
+          rev = "9e84e7f93307b72a1c0decfc2eff9d4943631de3";
+          sha256 = "1r2qbd19kkqf70gq04jfpsrap75qcy359k3ian9rhapi8cj0n23w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-nixos-options";
           sha256 = "1nsi4hfw53iwn29fp33dkri1c6w8kdyn4sa0yn2fi6144ilmq933";
           name = "helm-nixos-options";
         };
         packageRequires = [ helm nixos-options ];
         meta = {
-          homepage = "http://melpa.org/#/helm-nixos-options";
+          homepage = "https://melpa.org/#/helm-nixos-options";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-notmuch = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, notmuch }:
+    melpaBuild {
+        pname = "helm-notmuch";
+        version = "20160412.1406";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "helm-notmuch";
+          rev = "e3c41e6b1458c6fb686bbcc8c8827dca98f306d0";
+          sha256 = "04c6k1rxdi175kwn146sb2nxd13mvx3irr9fbqykcfv81609kqx3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-notmuch";
+          sha256 = "1ixdc1ba4ygxl0lpg6ijk06dgj2hfv5p5k6ivq60ss0axyisnnv0";
+          name = "helm-notmuch";
+        };
+        packageRequires = [ helm notmuch ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-notmuch";
           license = lib.licenses.free;
         };
       }) {};
@@ -26308,13 +27353,34 @@
           sha256 = "1wkmbc7247f209krvw4dzja3z0wyny12x5yi1cn3fnfh5nx04851";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-open-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-open-github";
           sha256 = "1wqlwg21s9pjgcrwr8kdrppinmjn235nadkp4003g0md1d64zxpx";
           name = "helm-open-github";
         };
         packageRequires = [ cl-lib gh helm-core ];
         meta = {
-          homepage = "http://melpa.org/#/helm-open-github";
+          homepage = "https://melpa.org/#/helm-open-github";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "helm-org-rifle";
+        version = "20160420.1018";
+        src = fetchFromGitHub {
+          owner = "alphapapa";
+          repo = "helm-org-rifle";
+          rev = "66b85c6ff1c73186ee9248c00f9221e023f18aa8";
+          sha256 = "0glrbln15wang9n1h76dk19ykcgmc8hwphg1qcmc4fbbcgmh1a1p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-org-rifle";
+          sha256 = "0hx764vql2qgw9i8qrr3kkn23lw6jx3x604dm1y33ig6a15gy3a3";
+          name = "helm-org-rifle";
+        };
+        packageRequires = [ dash emacs f helm s ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-org-rifle";
           license = lib.licenses.free;
         };
       }) {};
@@ -26329,13 +27395,13 @@
           sha256 = "1zyjxrrda7nxxjqczv2p3sfimxy2pq734kf51j6v2y0biclc4bk3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-orgcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-orgcard";
           sha256 = "1a56y8fny7qxxidc357n7l3yi7h66hidhvwhkam8y5wk6k61460p";
           name = "helm-orgcard";
         };
         packageRequires = [ helm-core ];
         meta = {
-          homepage = "http://melpa.org/#/helm-orgcard";
+          homepage = "https://melpa.org/#/helm-orgcard";
           license = lib.licenses.free;
         };
       }) {};
@@ -26350,34 +27416,34 @@
           sha256 = "14ad0b9d07chabjclffjyvnmrasar1di9wmpzf78bw5yg99cbisw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-package";
           sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y";
           name = "helm-package";
         };
         packageRequires = [ cl-lib helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-package";
+          homepage = "https://melpa.org/#/helm-package";
           license = lib.licenses.free;
         };
       }) {};
     helm-pages = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-pages";
-        version = "20151209.1400";
+        version = "20160321.2113";
         src = fetchFromGitHub {
           owner = "david-christiansen";
           repo = "helm-pages";
-          rev = "60f52edb11e54f553251234f4d336c0947ca0a2b";
-          sha256 = "0yngs3q6142g2nn1wwdaifylyfjjs3gmmy0jck5zh8mhmdgdqr06";
+          rev = "0366be2f89b92edc0d4a8c5f0f0e8674e0124d0c";
+          sha256 = "1dyi3rs72jl7739knnikv8pawam54k0sxz5a4a33i6s2bg3ghxcd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-pages";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-pages";
           sha256 = "1v3w8100invb5wsmm3dyl41pjs7s889s3b1rlr6vlcspa1ncv3wj";
           name = "helm-pages";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-pages";
+          homepage = "https://melpa.org/#/helm-pages";
           license = lib.licenses.free;
         };
       }) {};
@@ -26392,13 +27458,13 @@
           sha256 = "13wnagmgicl2mi4iksqckrjbaiz05j9ykbmvj26jy8zcbll5imfs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-perldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-perldoc";
           sha256 = "1qx0g81qcqanjiz5fxysagjhsxaj31g6nsi2hhdgq4x4nqrlmrhb";
           name = "helm-perldoc";
         };
         packageRequires = [ cl-lib deferred helm-core ];
         meta = {
-          homepage = "http://melpa.org/#/helm-perldoc";
+          homepage = "https://melpa.org/#/helm-perldoc";
           license = lib.licenses.free;
         };
       }) {};
@@ -26413,13 +27479,13 @@
           sha256 = "076yhcf447fas14k8gg67rc743x049xf66627sd9lgjv7107r8vr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-proc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-proc";
           sha256 = "1bq60giy2bs9m3hlbc5nwvy51702a98s0vqass3b290hdgki4bnx";
           name = "helm-proc";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-proc";
+          homepage = "https://melpa.org/#/helm-proc";
           license = lib.licenses.free;
         };
       }) {};
@@ -26434,34 +27500,34 @@
           sha256 = "0j54c1kzsjgr05qx25rg3ylawvyw6n6liypiwaas47vpyfswbxhv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-project-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-project-persist";
           sha256 = "1n87kn1n3453mpdj6amyrgivslskmnzdafpspvkz7b0smf9mv2ld";
           name = "helm-project-persist";
         };
         packageRequires = [ helm project-persist ];
         meta = {
-          homepage = "http://melpa.org/#/helm-project-persist";
+          homepage = "https://melpa.org/#/helm-project-persist";
           license = lib.licenses.free;
         };
       }) {};
     helm-projectile = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "helm-projectile";
-        version = "20160221.26";
+        version = "20160330.331";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "helm-projectile";
-          rev = "64880aad1828044db113c9f455c971bc90dea56b";
-          sha256 = "1c4x1zidabysyi5cms93zn3naczhfagd8q4mvg9jkhd1z0lk19gc";
+          rev = "87476ab9f5113d6c4e5de9920911b951b4092c19";
+          sha256 = "09sw0mhsi5ifcwa3ldx9hgybvmv1xwvxh7sm57pvywaw77vg8k95";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-projectile";
           sha256 = "18y7phrvbpdi3cnghwyhh0v1bwm95nwq1lymzf8lrcbmrwcvh36a";
           name = "helm-projectile";
         };
         packageRequires = [ cl-lib dash helm projectile ];
         meta = {
-          homepage = "http://melpa.org/#/helm-projectile";
+          homepage = "https://melpa.org/#/helm-projectile";
           license = lib.licenses.free;
         };
       }) {};
@@ -26476,13 +27542,13 @@
           sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-prosjekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-prosjekt";
           sha256 = "019rya3bf13cnval8iz680wby3sqlmqg4nbn0a13l1pkhlnv9fvm";
           name = "helm-prosjekt";
         };
         packageRequires = [ helm prosjekt ];
         meta = {
-          homepage = "http://melpa.org/#/helm-prosjekt";
+          homepage = "https://melpa.org/#/helm-prosjekt";
           license = lib.licenses.free;
         };
       }) {};
@@ -26497,13 +27563,13 @@
           sha256 = "03ys40rr0pvgp35j5scw9c28j184f1c9m58a3x0c8f0lgyfpssjk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-pt";
           sha256 = "1imhy0bsm9aldv0pvf88280qdya01lznxpx5gi5wffhrz17yh4pi";
           name = "helm-pt";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-pt";
+          homepage = "https://melpa.org/#/helm-pt";
           license = lib.licenses.free;
         };
       }) {};
@@ -26518,13 +27584,13 @@
           sha256 = "1lxknzjfhl6irrspynlkc1dp02s0byp94y4qp69gcl9sla9262ip";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-purpose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-purpose";
           sha256 = "0am8fy7ihk4hv07a6bnk9mwy986h6i6qxwpdmfhajzga71ixchg6";
           name = "helm-purpose";
         };
         packageRequires = [ emacs helm window-purpose ];
         meta = {
-          homepage = "http://melpa.org/#/helm-purpose";
+          homepage = "https://melpa.org/#/helm-purpose";
           license = lib.licenses.free;
         };
       }) {};
@@ -26535,17 +27601,17 @@
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-pydoc";
-          rev = "d4f409127bc77e7c79dcc87320b2db10466caed2";
-          sha256 = "1hlbyw6jvh6pm3ivmhd6qvs9j7km322fki9g4yd4qw7w15a3wkyy";
+          rev = "8eebf6535b4669b5d9e50bbe4f319cd54a2878c7";
+          sha256 = "0admgfy0p13nilb4fi3dq8pm48w1fib8h8avi7h9ybi9k5h6x4ii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-pydoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-pydoc";
           sha256 = "1sh7gqqiwk85kx89l1sihlkb8ff1g9n460nwj1y1bsrpfl6if4j7";
           name = "helm-pydoc";
         };
         packageRequires = [ cl-lib helm-core ];
         meta = {
-          homepage = "http://melpa.org/#/helm-pydoc";
+          homepage = "https://melpa.org/#/helm-pydoc";
           license = lib.licenses.free;
         };
       }) {};
@@ -26560,13 +27626,13 @@
           sha256 = "1a26r21jvgzk21vh3mf29s1dhvvv70jh860zaq9ihrpfrrl91158";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-rails";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-rails";
           sha256 = "1iihfsmnkpfp08pldghf3w5k8v5dlmy5ns0l4niwdwp5w8lyjcd6";
           name = "helm-rails";
         };
         packageRequires = [ helm inflections ];
         meta = {
-          homepage = "http://melpa.org/#/helm-rails";
+          homepage = "https://melpa.org/#/helm-rails";
           license = lib.licenses.free;
         };
       }) {};
@@ -26581,13 +27647,13 @@
           sha256 = "1b74jsr28ldz80mrqz3d1bmykpcprdbhf3fzhc0awd5i5xdnfaid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-rb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-rb";
           sha256 = "14pkrj1rpi2ihpb7c1hx6xwzvc1x7l41lwr9znp5vn7z93i034fr";
           name = "helm-rb";
         };
         packageRequires = [ helm helm-ag-r ];
         meta = {
-          homepage = "http://melpa.org/#/helm-rb";
+          homepage = "https://melpa.org/#/helm-rb";
           license = lib.licenses.free;
         };
       }) {};
@@ -26602,34 +27668,34 @@
           sha256 = "0nbny1a41sy4w3k2irp7rh6663jhbssqqshxd3y82iq0hs9h2wda";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-recoll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-recoll";
           sha256 = "0pr2pllplml55k1xx9inr3dm90ichg2wb62dvgvmbq2sqdf4606b";
           name = "helm-recoll";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-recoll";
+          homepage = "https://melpa.org/#/helm-recoll";
           license = lib.licenses.free;
         };
       }) {};
     helm-rhythmbox = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-rhythmbox";
-        version = "20150813.808";
+        version = "20160310.634";
         src = fetchFromGitHub {
           owner = "mrBliss";
           repo = "helm-rhythmbox";
-          rev = "3bdff00fd9d7b39f8b1dfb35e6843da307ef4d98";
-          sha256 = "05mf0021jhr4zmysy28cgilkfxyp08qmkc20v9wlykksg73l2crk";
+          rev = "068ddb16356d85267d510607313153cb2ecc151b";
+          sha256 = "114maxzybs3sn32nv12fgm6aqsdqzn59fjdk6ra5cbbfyjvin16l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-rhythmbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-rhythmbox";
           sha256 = "0pnm7yvas0q3b38ch5idm7v4ih2fjyfai8217j74xhkpcc2w4g4a";
           name = "helm-rhythmbox";
         };
         packageRequires = [ cl-lib helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-rhythmbox";
+          homepage = "https://melpa.org/#/helm-rhythmbox";
           license = lib.licenses.free;
         };
       }) {};
@@ -26644,13 +27710,13 @@
           sha256 = "163ljqar3vvbavzc8sk6rnf8awyc2rhh2g117fglswich3c8lnqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-robe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-robe";
           sha256 = "1gi4nkm9xvnxv0frmhiiw8dkmnmhfpr9n0b6jpidlvr8xr4s5kyw";
           name = "helm-robe";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-robe";
+          homepage = "https://melpa.org/#/helm-robe";
           license = lib.licenses.free;
         };
       }) {};
@@ -26659,19 +27725,19 @@
         pname = "helm-rubygems-local";
         version = "20130711.2011";
         src = fetchFromGitHub {
-          owner = "f-kubotar";
+          owner = "hadashiA";
           repo = "helm-rubygems-local";
           rev = "289cb33d41c703af9791d6da46b55f070013c2e3";
           sha256 = "0s4hb1fvwr9za5gkz8s5w1kh9qjyygz6g59w7vmrg2d8ds2an03d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-rubygems-local";
-          sha256 = "18p18bly15a8xjc34k11jbvxlmr127sll0vh5ma2p787x6a3mc7c";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-rubygems-local";
+          sha256 = "134qyqnh9l05lfj0vizlx35631q8ih6cdblrvka3p8i571300ikh";
           name = "helm-rubygems-local";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-rubygems-local";
+          homepage = "https://melpa.org/#/helm-rubygems-local";
           license = lib.licenses.free;
         };
       }) {};
@@ -26686,34 +27752,34 @@
           sha256 = "1sff8kagyhmwcxf9062il1077d4slvr2kq76abj496610gpb75i0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-rubygems-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-rubygems-org";
           sha256 = "04ni03ak53z3rggdgf68qh7ksgcf3s0f2cv6skwjqw7v8qhph6qs";
           name = "helm-rubygems-org";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-rubygems-org";
+          homepage = "https://melpa.org/#/helm-rubygems-org";
           license = lib.licenses.free;
         };
       }) {};
     helm-safari = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-safari";
-        version = "20160116.134";
+        version = "20160403.2224";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "helm-safari";
-          rev = "a1e17b7a75df62e84b1b5fdedb969cc291c90beb";
-          sha256 = "0qm5wlqklwf0y8grqhl2hfyfbkyj8200cdmbcf9cfr51lrh3cn8v";
+          rev = "664c7f4488829228eed7e90cd53002e14bec555b";
+          sha256 = "1ws5zxanaiaaxpgkcb2914qa8wxp6ml019hfnfcp7amjnajq9pyz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-safari";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-safari";
           sha256 = "0lvwghcl5w67g0lc97r7hfvca7ss0mysy2mxj9axxbpyiq6fmh0y";
           name = "helm-safari";
         };
         packageRequires = [ emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-safari";
+          homepage = "https://melpa.org/#/helm-safari";
           license = lib.licenses.free;
         };
       }) {};
@@ -26728,13 +27794,13 @@
           sha256 = "1s6aw1viyzhhrfiazzi82n7bkvshp7clwi6539660m72lfwc5zdl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-sage";
           sha256 = "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj";
           name = "helm-sage";
         };
         packageRequires = [ cl-lib helm sage-shell-mode ];
         meta = {
-          homepage = "http://melpa.org/#/helm-sage";
+          homepage = "https://melpa.org/#/helm-sage";
           license = lib.licenses.free;
         };
       }) {};
@@ -26749,34 +27815,34 @@
           sha256 = "00wnqcgpf4hqdnqj5zrizr4s0pffb93xwya8k5c3rp4plncrcdzx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-sheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-sheet";
           sha256 = "0lx70l5gq43hckgdfna8s6wx287sw5ms9l1z3n6vg2x8nr9m61kc";
           name = "helm-sheet";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-sheet";
+          homepage = "https://melpa.org/#/helm-sheet";
           license = lib.licenses.free;
         };
       }) {};
     helm-spaces = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, spaces }:
     melpaBuild {
         pname = "helm-spaces";
-        version = "20130605.1100";
+        version = "20160319.954";
         src = fetchFromGitHub {
           owner = "yasuyk";
           repo = "helm-spaces";
-          rev = "7545fed3880effe079bb27bfbf22e902ac0bc828";
-          sha256 = "0sw7g1zcs1jfqcpprxwjq97lsk4qfngwamkj3q8jhm77zh7kfa3b";
+          rev = "8b20a229d7a932a54ac6a4239638789215e18597";
+          sha256 = "0j3b5ypxq8k7mg6zlx3r15jpk3x2f0gx9p9bjr0h78h0sc0f46l7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-spaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-spaces";
           sha256 = "0hdvkk173k98iycvii5xpbiblx044125pl7jyz4kb8r1vvwcv791";
           name = "helm-spaces";
         };
         packageRequires = [ helm spaces ];
         meta = {
-          homepage = "http://melpa.org/#/helm-spaces";
+          homepage = "https://melpa.org/#/helm-spaces";
           license = lib.licenses.free;
         };
       }) {};
@@ -26791,34 +27857,55 @@
           sha256 = "133dcqk42nq5gh5qlcbcmx3lczisfgymcnypnld318jvjgd2ma8a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-spotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-spotify";
           sha256 = "1rzvxnaqh8bm78qp0rhpqs971pc855qrq589r3s8z3gpqzmwlnmf";
           name = "helm-spotify";
         };
         packageRequires = [ helm multi ];
         meta = {
-          homepage = "http://melpa.org/#/helm-spotify";
+          homepage = "https://melpa.org/#/helm-spotify";
           license = lib.licenses.free;
         };
       }) {};
     helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-swoop";
-        version = "20160131.733";
+        version = "20160417.1657";
         src = fetchFromGitHub {
           owner = "ShingoFukuyama";
           repo = "helm-swoop";
-          rev = "002338d9685d82ef10aaf97d2e8084e61dfc94b4";
-          sha256 = "0n7fma8zp6shyz814mxfljj8x23gcwnkrbghkmfjp87cr1zkmw41";
+          rev = "fd01dac3d647544f4ca297ca9963859b07ebe354";
+          sha256 = "1iid2jcnqpd5b2g0jgas76n06i8m20kp3j4lhmalg9jnyvgrlf7s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-swoop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-swoop";
           sha256 = "1fqbhj75hcmy7c2vdd0m7fk3m34njmv5s6k1i9y94djpbd13i3d8";
           name = "helm-swoop";
         };
         packageRequires = [ emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-swoop";
+          homepage = "https://melpa.org/#/helm-swoop";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, with-editor }:
+    melpaBuild {
+        pname = "helm-systemd";
+        version = "20160424.854";
+        src = fetchFromGitHub {
+          owner = "lompik";
+          repo = "helm-systemd";
+          rev = "f716006030aea2675e4c51705033f2ba980f964c";
+          sha256 = "171yym0jkhgbvxwmqk4xla7bbhmnijdwkyrzqppa5nzl86g2g3kg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-systemd";
+          sha256 = "1kcf9218l8aygrcj1h3czyklk1cxc5c73qmv4d3r3bzpxbxgf6ib";
+          name = "helm-systemd";
+        };
+        packageRequires = [ emacs helm with-editor ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-systemd";
           license = lib.licenses.free;
         };
       }) {};
@@ -26833,13 +27920,13 @@
           sha256 = "0a9h6rmjc6c6krkvxbgrzv35if260d9ma9a2k47jzm9psnyp9s2w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-themes";
           sha256 = "0r7kyd0i0spwi7xkjrpm2kyphrsl3hqm5pw96nd3ia0jiwp8550j";
           name = "helm-themes";
         };
         packageRequires = [ helm-core ];
         meta = {
-          homepage = "http://melpa.org/#/helm-themes";
+          homepage = "https://melpa.org/#/helm-themes";
           license = lib.licenses.free;
         };
       }) {};
@@ -26854,13 +27941,13 @@
           sha256 = "1ypnsbx623gg3q07gxrbkn82jzy38sj4p52hj1wcb54qjqzyznkg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-unicode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-unicode";
           sha256 = "052xqzvcfzpsbl75ylqb1khqndvc2dqdymqlwivs0darlds0w8y4";
           name = "helm-unicode";
         };
         packageRequires = [ emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-unicode";
+          homepage = "https://melpa.org/#/helm-unicode";
           license = lib.licenses.free;
         };
       }) {};
@@ -26875,13 +27962,13 @@
           sha256 = "0xlz9rxx7y9pkrzvxmv42vgys5iwx75zv9g50k8ihwc08z80dhcq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-w32-launcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-w32-launcher";
           sha256 = "0bzn2vhspn6lla815qxwsl9gwfyiwgwmnysr6rjpyacmi17d73ri";
           name = "helm-w32-launcher";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-w32-launcher";
+          homepage = "https://melpa.org/#/helm-w32-launcher";
           license = lib.licenses.free;
         };
       }) {};
@@ -26896,13 +27983,13 @@
           sha256 = "0d47mqib4zkfadq26vpy0ih7j18d6n5v4c21wvr4hhg6hg205iiz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-w3m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-w3m";
           sha256 = "1rr83ija93iqz74k236hk3v75jk0iwcccwqpqgys7spvrld0b9pz";
           name = "helm-w3m";
         };
         packageRequires = [ cl-lib emacs helm w3m ];
         meta = {
-          homepage = "http://melpa.org/#/helm-w3m";
+          homepage = "https://melpa.org/#/helm-w3m";
           license = lib.licenses.free;
         };
       }) {};
@@ -26917,13 +28004,13 @@
           sha256 = "03a5hzgqak8wg6i2h2p3fr9ij55lqarcsblml8qrnrj27ghcvzzh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-wordnet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-wordnet";
           sha256 = "0di8gxsa9r8mzja4akhz0wpgrhlidqyn1s1ix5szplwxklwf2r2f";
           name = "helm-wordnet";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-wordnet";
+          homepage = "https://melpa.org/#/helm-wordnet";
           license = lib.licenses.free;
         };
       }) {};
@@ -26938,13 +28025,13 @@
           sha256 = "19l8vysjygscr1nsddjz2yv0fjhbsswfq40rdny8zsmaa6qhpj35";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-words";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-words";
           sha256 = "0l9mb7g3xzasna1bw2p7vh2wdg1hmjkff40p8kpqvwwzszdm9v76";
           name = "helm-words";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/helm-words";
+          homepage = "https://melpa.org/#/helm-words";
           license = lib.licenses.free;
         };
       }) {};
@@ -26959,13 +28046,13 @@
           sha256 = "1yqr5z5sw7schvaq9pmwg79anp806gikm28s6xvrayzyn4idz2n6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-xcdoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-xcdoc";
           sha256 = "1ikphlnj053i4g1l8r2pqaljvdqglj1yk0xx4vygnw98qyzdsx4v";
           name = "helm-xcdoc";
         };
         packageRequires = [ emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-xcdoc";
+          homepage = "https://melpa.org/#/helm-xcdoc";
           license = lib.licenses.free;
         };
       }) {};
@@ -26980,13 +28067,13 @@
           sha256 = "11fznbfcv4rac4h50mkax1g66wd2f91f5dw2v4jxjq2f5y4h4w0g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-zhihu-daily";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-zhihu-daily";
           sha256 = "0hkgail60s9qhxl0pskqxjvfz93iq1qh1kcmcq0x5kq7d08b911r";
           name = "helm-zhihu-daily";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-zhihu-daily";
+          homepage = "https://melpa.org/#/helm-zhihu-daily";
           license = lib.licenses.free;
         };
       }) {};
@@ -26994,17 +28081,17 @@
         pname = "help-fns-plus";
         version = "20151215.837";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/help-fns+.el";
+          url = "https://www.emacswiki.org/emacs/download/help-fns+.el";
           sha256 = "00x3ln7x4d6r422x845smf3h0x1z85l5jqyjkrllqcs7qijcrk5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/help-fns+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/help-fns+";
           sha256 = "10vz7w79k3barlcs3ph3pc7914xdhcygagdk2wj3bq0wmwxa1lia";
           name = "help-fns-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/help-fns+";
+          homepage = "https://melpa.org/#/help-fns+";
           license = lib.licenses.free;
         };
       }) {};
@@ -27012,17 +28099,17 @@
         pname = "help-mode-plus";
         version = "20151231.1531";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/help-mode+.el";
+          url = "https://www.emacswiki.org/emacs/download/help-mode+.el";
           sha256 = "0qmf81maq6yvs68b8vlbxwkjk72qldamq75znrma9mhvlv8igrgx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/help-mode+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/help-mode+";
           sha256 = "1pmb845bxa5kazjpdxm12rm2wcshmv2cmisigs3kyva1pmi1shra";
           name = "help-mode-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/help-mode+";
+          homepage = "https://melpa.org/#/help-mode+";
           license = lib.licenses.free;
         };
       }) {};
@@ -27030,17 +28117,17 @@
         pname = "help-plus";
         version = "20151231.1528";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/help+.el";
+          url = "https://www.emacswiki.org/emacs/download/help+.el";
           sha256 = "1r7kf9plnsjx87bhflsdh47wybvhis7gb10izqa1p6w0aqsg178s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/help+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/help+";
           sha256 = "1jx0wa4md1mvdsvjyx2yvi4hhm5w061qqcafsrw4axsz7gjpd4yi";
           name = "help-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/help+";
+          homepage = "https://melpa.org/#/help+";
           license = lib.licenses.free;
         };
       }) {};
@@ -27055,13 +28142,13 @@
           sha256 = "178dvigiw162m01x7dm8pf61w2n3bq51lvk5q7jzpb9s35pz1697";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hemisu-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hemisu-theme";
           sha256 = "0byzrz74yvk12m8dl47kkmkziwrrql193q72qx974zbqdj8h2sph";
           name = "hemisu-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hemisu-theme";
+          homepage = "https://melpa.org/#/hemisu-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -27076,13 +28163,13 @@
           sha256 = "0c45pib8qpwgyr271g5ddnsn7hzq68mqflv0yyc8803ni06w9vhj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/heroku";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/heroku";
           sha256 = "1kadmxmqhc60cb5k14943rad1gbril2hlcnqxnsy4h3j2ykmcdyy";
           name = "heroku";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/heroku";
+          homepage = "https://melpa.org/#/heroku";
           license = lib.licenses.free;
         };
       }) {};
@@ -27097,13 +28184,34 @@
           sha256 = "15hk0v6ck076mahsz4spq75jcnv587fx4d3w50c7bdh423fl0xvx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/heroku-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/heroku-theme";
           sha256 = "0mchh9y3pqwamry6105qrv1bp1qg1g0jmz7rzc5svz9giynypwf9";
           name = "heroku-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/heroku-theme";
+          homepage = "https://melpa.org/#/heroku-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hexo";
+        version = "20160423.1017";
+        src = fetchFromGitHub {
+          owner = "kuanyui";
+          repo = "hexo.el";
+          rev = "3e41f90f4954e75dc584dd3563e68e11757ea3b9";
+          sha256 = "1ghknn1fd6lwxq035amrawx9ixw3qwjsfarsjyqss7rhs70wrn5a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hexo";
+          sha256 = "0fgrxf6gdw0kzs6x6y8qr511cazaaiyk7licgkgznngj4w6g7jyn";
+          name = "hexo";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/hexo";
           license = lib.licenses.free;
         };
       }) {};
@@ -27111,17 +28219,38 @@
         pname = "hexrgb";
         version = "20151231.1532";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/hexrgb.el";
+          url = "https://www.emacswiki.org/emacs/download/hexrgb.el";
           sha256 = "0rqjidjxa5j6rjknklfks743lczbq3qsyiranrf2z3ghzi0gf7fd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hexrgb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hexrgb";
           sha256 = "0mzqslrrf7sc262syj3ja7b7rnbg80dwf2p9bzxdrzx6b8vvsx06";
           name = "hexrgb";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hexrgb";
+          homepage = "https://melpa.org/#/hexrgb";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hfst-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hfst-mode";
+        version = "20160402.628";
+        src = fetchFromGitHub {
+          owner = "unhammer";
+          repo = "hfst-mode";
+          rev = "d145a21e3e175b0fe2b0592981533c9492bd289c";
+          sha256 = "1zr59kcnkd9bm5676shmz63n0wpnfr7yl9g4l01ng0xcili1n13i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hfst-mode";
+          sha256 = "1w342n5k9ak1m5znysvrplpr9dhmi7hxbkr4d1dx51dn0azbpjh7";
+          name = "hfst-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/hfst-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -27136,13 +28265,13 @@
           sha256 = "06hm98aq87l91fhb2bqz8jw427k8fb280ygz5g44fy6sqc6js7v0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hgignore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hgignore-mode";
           sha256 = "0ja71l3cghhn1c6w2pff80km8h8xgzf0j9gcldfyc72ar6ifhjkj";
           name = "hgignore-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hgignore-mode";
+          homepage = "https://melpa.org/#/hgignore-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -27157,13 +28286,13 @@
           sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hi2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hi2";
           sha256 = "1wxkjg1jnw05lqzggi20jy2jl20d8brvv76vmrf6lnz62g6jv9h2";
           name = "hi2";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hi2";
+          homepage = "https://melpa.org/#/hi2";
           license = lib.licenses.free;
         };
       }) {};
@@ -27171,17 +28300,17 @@
         pname = "hide-comnt";
         version = "20151231.1533";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/hide-comnt.el";
+          url = "https://www.emacswiki.org/emacs/download/hide-comnt.el";
           sha256 = "1l5jvgjgd0kzv1sn6h467fbnl487hma4h4pkwq4x1dhbc26yvfpz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hide-comnt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hide-comnt";
           sha256 = "181kns2rg4rc0pyyxw305qc06d10v025ad7v2m037y72vfwb0igx";
           name = "hide-comnt";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hide-comnt";
+          homepage = "https://melpa.org/#/hide-comnt";
           license = lib.licenses.free;
         };
       }) {};
@@ -27189,17 +28318,17 @@
         pname = "hide-lines";
         version = "20151127.1240";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/hide-lines.el";
+          url = "https://www.emacswiki.org/emacs/download/hide-lines.el";
           sha256 = "1q87yp1pr62cza3pqimqd09a39yyij4c7pncdww84zz7cii9qrn2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hide-lines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hide-lines";
           sha256 = "146sgvd88w20rqvd8y8kc76cb1nqk6dvqsz9rgl4rcrf0xfqvp7q";
           name = "hide-lines";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hide-lines";
+          homepage = "https://melpa.org/#/hide-lines";
           license = lib.licenses.free;
         };
       }) {};
@@ -27207,17 +28336,17 @@
         pname = "hide-region";
         version = "20140201.514";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/hide-region.el";
+          url = "https://www.emacswiki.org/emacs/download/hide-region.el";
           sha256 = "1zxrygpf47bzj6p808r3qhj3dfr3m8brp1xgxs33c7f88rinfval";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hide-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hide-region";
           sha256 = "0nsc6m3yza658xsxvjz8766vkp71rcm6vwnvcv225r2pr94mq7vm";
           name = "hide-region";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hide-region";
+          homepage = "https://melpa.org/#/hide-region";
           license = lib.licenses.free;
         };
       }) {};
@@ -27232,13 +28361,13 @@
           sha256 = "1dr06b9njzih8z97k62l9w3x0a801x4bp043zvk7av9qkz8izl2r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hideshow-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hideshow-org";
           sha256 = "1bzx5ii06r64nra92zv1dvw5zv3im7la2dd3md801hxyfrpb74gc";
           name = "hideshow-org";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hideshow-org";
+          homepage = "https://melpa.org/#/hideshow-org";
           license = lib.licenses.free;
         };
       }) {};
@@ -27246,17 +28375,17 @@
         pname = "hideshowvis";
         version = "20130824.700";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/hideshowvis.el";
+          url = "https://www.emacswiki.org/emacs/download/hideshowvis.el";
           sha256 = "15ax1j3j7kylyc8a91ja825sp4mhbdgx0j4i5kqxwhvmwvpmyrv6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hideshowvis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hideshowvis";
           sha256 = "1ajr71fch3v5g8brb83kwmlakcam5w21i3yr8df00c5j2pnc6v1f";
           name = "hideshowvis";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hideshowvis";
+          homepage = "https://melpa.org/#/hideshowvis";
           license = lib.licenses.free;
         };
       }) {};
@@ -27264,17 +28393,17 @@
         pname = "highlight";
         version = "20151231.1537";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/highlight.el";
+          url = "https://www.emacswiki.org/emacs/download/highlight.el";
           sha256 = "15s4463damlszd5wqi22a6w25i8l0m5rvqdg73k3yp01i65jc29z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight";
           sha256 = "0clv4mzy9kllcvc0cgsbx3a9anw68dc2c7vzwbrv13sw5gh9skc0";
           name = "highlight";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/highlight";
+          homepage = "https://melpa.org/#/highlight";
           license = lib.licenses.free;
         };
       }) {};
@@ -27289,13 +28418,13 @@
           sha256 = "0c65jk00j88qxfki2g88hy9g6n92rzskwcn1fbmwcw3qgaz4b6w5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-blocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-blocks";
           sha256 = "1a32iv5kgf6g6ygbs559w156dh578k45m860czazfx0d6ap3k5m1";
           name = "highlight-blocks";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/highlight-blocks";
+          homepage = "https://melpa.org/#/highlight-blocks";
           license = lib.licenses.free;
         };
       }) {};
@@ -27303,17 +28432,17 @@
         pname = "highlight-chars";
         version = "20151231.1535";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/highlight-chars.el";
+          url = "https://www.emacswiki.org/emacs/download/highlight-chars.el";
           sha256 = "18y6cw43mhizccvwfydv6g2kz8w7vff0n3k9sq5ghwq3rb3z14b2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-chars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-chars";
           sha256 = "19jawbjvqx1hsjbynx0jgpziap3r64k8s1xfckajrx8aq8m4c6i0";
           name = "highlight-chars";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/highlight-chars";
+          homepage = "https://melpa.org/#/highlight-chars";
           license = lib.licenses.free;
         };
       }) {};
@@ -27321,17 +28450,17 @@
         pname = "highlight-cl";
         version = "20091012.1230";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/highlight-cl.el";
+          url = "https://www.emacswiki.org/emacs/download/highlight-cl.el";
           sha256 = "0r3kzs2fsi3kl5gqmsv75dc7lgfl4imrrqhg09ij6kq1ri8gjxjw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-cl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-cl";
           sha256 = "164h3c3rzriahb7v5hk2pw4i0gk2vk5ak722bai6x4zx4l1xp20w";
           name = "highlight-cl";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/highlight-cl";
+          homepage = "https://melpa.org/#/highlight-cl";
           license = lib.licenses.free;
         };
       }) {};
@@ -27340,17 +28469,17 @@
         pname = "highlight-current-line";
         version = "20051013.1256";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/highlight-current-line.el";
+          url = "https://www.emacswiki.org/emacs/download/highlight-current-line.el";
           sha256 = "1aki7a7nnj9n7vh19k4fr0v7cqbwkrpc6b3f3yv95vcqj8a4y34c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-current-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-current-line";
           sha256 = "01bga6is3frzlzfajpvpgz224vhl0jnc2bl2ipvlygdcmv4h8973";
           name = "highlight-current-line";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/highlight-current-line";
+          homepage = "https://melpa.org/#/highlight-current-line";
           license = lib.licenses.free;
         };
       }) {};
@@ -27365,13 +28494,13 @@
           sha256 = "1l10xnjyvcbv1v8xlldaca7z3fk5qav7nsbhfnjxxd0bgh5v9by2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-defined";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-defined";
           sha256 = "1vjxm35wf4c2qphpkjh57hf03a5qdssdlmfj0n0gwxsdw1q5rpms";
           name = "highlight-defined";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/highlight-defined";
+          homepage = "https://melpa.org/#/highlight-defined";
           license = lib.licenses.free;
         };
       }) {};
@@ -27386,13 +28515,13 @@
           sha256 = "0rs8zyjz5mh26n8bdxn6fmyw2809nihz1vp7ih59dq11lx3mf9az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-escape-sequences";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-escape-sequences";
           sha256 = "0938b29cqapid9v9q4w2jwh8kdb0p70qwzy9xm2nxaairm7436d6";
           name = "highlight-escape-sequences";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/highlight-escape-sequences";
+          homepage = "https://melpa.org/#/highlight-escape-sequences";
           license = lib.licenses.free;
         };
       }) {};
@@ -27407,13 +28536,13 @@
           sha256 = "10m1cr5plzsxbq08lck4c2w0whcdrnl9h2qm4bbr9srhnpry7fxj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-indent-guides";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-indent-guides";
           sha256 = "00ghp677qgb5clxhdjarfl8ab3mbp6v7yfsldm9bn0s14lyaq5pm";
           name = "highlight-indent-guides";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/highlight-indent-guides";
+          homepage = "https://melpa.org/#/highlight-indent-guides";
           license = lib.licenses.free;
         };
       }) {};
@@ -27428,13 +28557,13 @@
           sha256 = "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-indentation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-indentation";
           sha256 = "0iblrrbssjwfn71n8xxjcl98pjv1qw1igf3hlz6mh8740fsca3d6";
           name = "highlight-indentation";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/highlight-indentation";
+          homepage = "https://melpa.org/#/highlight-indentation";
           license = lib.licenses.free;
         };
       }) {};
@@ -27449,13 +28578,13 @@
           sha256 = "1vy6j63jp83ljdqkrqglpys74yfh7p61sd0lqiwczgr5nqyc60rl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-leading-spaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-leading-spaces";
           sha256 = "0h2ww2vqmarghf4zg0wbwn0wgndmkcjy696mc885rwavck2dav4p";
           name = "highlight-leading-spaces";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/highlight-leading-spaces";
+          homepage = "https://melpa.org/#/highlight-leading-spaces";
           license = lib.licenses.free;
         };
       }) {};
@@ -27470,13 +28599,13 @@
           sha256 = "0ffhc5s0h34064bix4qyiiyx30m4hpv0phmxwcrwiyvanj9ggfai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-numbers";
           sha256 = "1bywrjv9ybr65mwkrxggb52jdqn16z8acgs5vqm0faq43an8i5yv";
           name = "highlight-numbers";
         };
         packageRequires = [ emacs parent-mode ];
         meta = {
-          homepage = "http://melpa.org/#/highlight-numbers";
+          homepage = "https://melpa.org/#/highlight-numbers";
           license = lib.licenses.free;
         };
       }) {};
@@ -27485,19 +28614,19 @@
         pname = "highlight-parentheses";
         version = "20151108.116";
         src = fetchFromGitHub {
-          owner = "nschum";
+          owner = "tsdh";
           repo = "highlight-parentheses.el";
           rev = "a821a314942f409cd69660d816cd9a0aebd1ae8f";
           sha256 = "0kzqx1y6rr4ryxi2md9087saad4g4bzysckmp8272k521d46xa1r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-parentheses";
-          sha256 = "1b0n9mz4a6baljvvgb881w53391smm35c9pwd45g861hk1qvrk5k";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-parentheses";
+          sha256 = "1d38wxk5bwblddr74crzwjwpgyr8zgcl5h5ilywg35jpv7n66lp5";
           name = "highlight-parentheses";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/highlight-parentheses";
+          homepage = "https://melpa.org/#/highlight-parentheses";
           license = lib.licenses.free;
         };
       }) {};
@@ -27512,13 +28641,13 @@
           sha256 = "1gq8inxfni9zgz2brqm4nlswgr8b0spq15wr532xfrgr456g10ks";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-quoted";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-quoted";
           sha256 = "0x6gxi0jfxvpx7r1fm43ikxlxilnbk2xbhdy9xivhgmmdyqiqqkl";
           name = "highlight-quoted";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/highlight-quoted";
+          homepage = "https://melpa.org/#/highlight-quoted";
           license = lib.licenses.free;
         };
       }) {};
@@ -27533,13 +28662,13 @@
           sha256 = "0gnr1dqkcmc9gfzqjaixh76g1kq7xp20mg1h6vl3c4na7nk6a3fg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-stages";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-stages";
           sha256 = "0r4kmjmrpi38q3y0q9h5xkxh7x728ha2nbnc152lzw6zfsxnm4x4";
           name = "highlight-stages";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/highlight-stages";
+          homepage = "https://melpa.org/#/highlight-stages";
           license = lib.licenses.free;
         };
       }) {};
@@ -27554,13 +28683,13 @@
           sha256 = "19cgyk0sh8nsmf3jbi92i8qsdx4l4yilfq5jj9zfdbj9p5gvwx96";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-symbol";
           sha256 = "0gw8ffr64s58qdbvm034s1b9xz1hynzvbk8ld67j06fxpc98qaj4";
           name = "highlight-symbol";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/highlight-symbol";
+          homepage = "https://melpa.org/#/highlight-symbol";
           license = lib.licenses.free;
         };
       }) {};
@@ -27568,17 +28697,17 @@
         pname = "highlight-tail";
         version = "20140415.2041";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/highlight-tail.el";
+          url = "https://www.emacswiki.org/emacs/download/highlight-tail.el";
           sha256 = "1bbiyqddqkrp3c7xsg1m4143611bhg1kkakrwscqjb4cfmx29qqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-tail";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-tail";
           sha256 = "187kv3n262l38jdapi9bwcafz8fh61pdq2zliwiz7m7xdspp2iws";
           name = "highlight-tail";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/highlight-tail";
+          homepage = "https://melpa.org/#/highlight-tail";
           license = lib.licenses.free;
         };
       }) {};
@@ -27593,13 +28722,13 @@
           sha256 = "00s2nm0rfdgkpn2v9m36y0l42jyfah5hp5hd3bkwljgs99cp1ihk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-thing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-thing";
           sha256 = "0rvdb1lx9xn9drqw0sw9ih759n10g7k0af39w6n8g0wfr67p96w1";
           name = "highlight-thing";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/highlight-thing";
+          homepage = "https://melpa.org/#/highlight-thing";
           license = lib.licenses.free;
         };
       }) {};
@@ -27614,13 +28743,13 @@
           sha256 = "0hhc2l4pz6q8injpplv6b5l08l8q2lnjdpwabp7gwmhraq54rhjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-unique-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-unique-symbol";
           sha256 = "0lwl8pkmq0q4dvyflarggnn8vzpvk5hhcnk508r6xml2if1sg9zx";
           name = "highlight-unique-symbol";
         };
         packageRequires = [ deferred ];
         meta = {
-          homepage = "http://melpa.org/#/highlight-unique-symbol";
+          homepage = "https://melpa.org/#/highlight-unique-symbol";
           license = lib.licenses.free;
         };
       }) {};
@@ -27635,13 +28764,13 @@
           sha256 = "06nnqry36ncqacfzd8yvc4q59bwk3vgf9a14rkpph2hk2rfvq2m6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight2clipboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight2clipboard";
           sha256 = "19r7abbpm31b0azf2v3xn0rjagg9h01i8g72qapp8dhqb4d9n9r0";
           name = "highlight2clipboard";
         };
         packageRequires = [ htmlize ];
         meta = {
-          homepage = "http://melpa.org/#/highlight2clipboard";
+          homepage = "https://melpa.org/#/highlight2clipboard";
           license = lib.licenses.free;
         };
       }) {};
@@ -27652,17 +28781,17 @@
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "575a7a19f9c86b9699a6222072c79fe02da18c4c";
-          sha256 = "1phyaf6fwaxi2plq38m09cfb5ls401ay8jw0yf5rix8nyvm8nrn9";
+          rev = "546025b34a259ea4556505feee301462ac0e9def";
+          sha256 = "03mnvhav2bm51s430z3vyig5z5q8rg9glr8zqxwdnw297ln2f3l6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hindent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hindent";
           sha256 = "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz";
           name = "hindent";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/hindent";
+          homepage = "https://melpa.org/#/hindent";
           license = lib.licenses.free;
         };
       }) {};
@@ -27670,17 +28799,17 @@
         pname = "hippie-exp-ext";
         version = "20151011.345";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/hippie-exp-ext.el";
+          url = "https://www.emacswiki.org/emacs/download/hippie-exp-ext.el";
           sha256 = "1jkjg7zxpc06plzlyvj1a8dcvj8ijqzhkxwlsd12cgkymvp411yl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hippie-exp-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hippie-exp-ext";
           sha256 = "14py5hz523847f7bhw67v81x5cfhzz5la15mrqavc4z4yicy63iq";
           name = "hippie-exp-ext";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hippie-exp-ext";
+          homepage = "https://melpa.org/#/hippie-exp-ext";
           license = lib.licenses.free;
         };
       }) {};
@@ -27695,13 +28824,13 @@
           sha256 = "1l76r8hzhaapx76f6spm5jmjbrrm5zf79cpd5024xw3hpj1jbkjp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hippie-expand-slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hippie-expand-slime";
           sha256 = "0kxyv1lpkg33qgfv1jfqx03640py7525bcnc9dk98w6y6y92zf4m";
           name = "hippie-expand-slime";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hippie-expand-slime";
+          homepage = "https://melpa.org/#/hippie-expand-slime";
           license = lib.licenses.free;
         };
       }) {};
@@ -27716,13 +28845,13 @@
           sha256 = "0b5wrid428s11afc48d6mdifmd31gmzyrj9zcpd3jwk63ydiihdc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hippie-namespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hippie-namespace";
           sha256 = "1bzjhq116ci9c9f0aw121fn3drmg2pw5ny1w6wcasa4p30syxxf0";
           name = "hippie-namespace";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hippie-namespace";
+          homepage = "https://melpa.org/#/hippie-namespace";
           license = lib.licenses.free;
         };
       }) {};
@@ -27737,13 +28866,13 @@
           sha256 = "17dcpwx2y464g8qi3ixlsf3la8dn0bkxax296bhfg4vh73dxccl3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hipster-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hipster-theme";
           sha256 = "1xrgpqlzp4lhh5h3sv7pg1nqzc9wcv1hs6ybv2h4x6jangicwfl2";
           name = "hipster-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hipster-theme";
+          homepage = "https://melpa.org/#/hipster-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -27758,13 +28887,13 @@
           sha256 = "1dmrg39g0faqqkgrpcbybjbb91vcpkwawxsplckkj92y59zanq3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/history";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/history";
           sha256 = "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g";
           name = "history";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/history";
+          homepage = "https://melpa.org/#/history";
           license = lib.licenses.free;
         };
       }) {};
@@ -27779,13 +28908,13 @@
           sha256 = "1y275fchhx0n6dv038hsr44a3bjghqdhc8j1dcpm2rvs8chgm8g0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/historyf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/historyf";
           sha256 = "15pcaqfjpkfwcy46yqqw10q8kpw7aamcg0gr4frbdgzbv0yld08s";
           name = "historyf";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/historyf";
+          homepage = "https://melpa.org/#/historyf";
           license = lib.licenses.free;
         };
       }) {};
@@ -27800,13 +28929,13 @@
           sha256 = "097lrj9lgfa7szww324hlqywwkbi31n1pxfqyg0zbfj45djkp9bx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hive";
           sha256 = "1marz8gmk824hb0nkhaw48d4qw1xjk1aad27gviya7f5ilypxrya";
           name = "hive";
         };
         packageRequires = [ sql ];
         meta = {
-          homepage = "http://melpa.org/#/hive";
+          homepage = "https://melpa.org/#/hive";
           license = lib.licenses.free;
         };
       }) {};
@@ -27821,34 +28950,34 @@
           sha256 = "177blksgncxpxd1zi9kmbcfjnpd3ll1szjxiyc4am8a6hs1dyyqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hiwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hiwin";
           sha256 = "0klhxwxsz7xan2vsknw79r1dj4qhhjbfpddr67mk9qzccp8q0w8g";
           name = "hiwin";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hiwin";
+          homepage = "https://melpa.org/#/hiwin";
           license = lib.licenses.free;
         };
       }) {};
     hl-anything = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hl-anything";
-        version = "20150219.731";
+        version = "20160422.1208";
         src = fetchFromGitHub {
-          owner = "boyw165";
-          repo = "hl-anything";
-          rev = "018da4cdf891529b4769d59c0400b6cf3456b9c4";
-          sha256 = "0889dzrwizpkyh3wms13k8zx27ipsrsxfa4j4yzk4cwk3aicckcr";
+          owner = "hl-anything";
+          repo = "hl-anything-emacs";
+          rev = "8696bc55a8cba408f0fc83a907a9ec529d79e558";
+          sha256 = "10ps1rb5fqwaw4lz3nz2rbsry4y81asmi5557g229h8xjhp6gpnm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-anything";
-          sha256 = "15n998nhirvg3f719b7x9s7jpqv6gzkr22kp4zbbq99lbx2wfc1k";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hl-anything";
+          sha256 = "0czpc82j5hbzprc66aall72lqnk38dxgpzx4rs8sbx95cag12dxa";
           name = "hl-anything";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/hl-anything";
+          homepage = "https://melpa.org/#/hl-anything";
           license = lib.licenses.free;
         };
       }) {};
@@ -27856,17 +28985,17 @@
         pname = "hl-defined";
         version = "20151231.1538";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/hl-defined.el";
+          url = "https://www.emacswiki.org/emacs/download/hl-defined.el";
           sha256 = "170sz6hjd85cw1x0y2g81ks3x3niib4f7y2xz6k8x0dpw357ggv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-defined";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hl-defined";
           sha256 = "1y7vbhvpwxz70kja5hfm4i57mdd1cv43m4y9fr978y3nk265p8xx";
           name = "hl-defined";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hl-defined";
+          homepage = "https://melpa.org/#/hl-defined";
           license = lib.licenses.free;
         };
       }) {};
@@ -27881,13 +29010,13 @@
           sha256 = "17apqs7yqd89mv5283kmwp7byaaimj7j0vis0z1d89jlmp8i6zbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hl-indent";
           sha256 = "1z42kcwcyinjay65mv042ijh4xfaaiyri368g0sjw0fflsg0ikcr";
           name = "hl-indent";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/hl-indent";
+          homepage = "https://melpa.org/#/hl-indent";
           license = lib.licenses.free;
         };
       }) {};
@@ -27895,17 +29024,17 @@
         pname = "hl-line-plus";
         version = "20151231.1539";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/hl-line+.el";
+          url = "https://www.emacswiki.org/emacs/download/hl-line+.el";
           sha256 = "1kxq79pfs83gp12p2g093m6shsf25q88mi29bvhapxx77ahmxpkn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-line+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hl-line+";
           sha256 = "13yv2nmx1wb80z4yifnh6d67rag17wirmp7z8ssq3havjl8lbpix";
           name = "hl-line-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hl-line+";
+          homepage = "https://melpa.org/#/hl-line+";
           license = lib.licenses.free;
         };
       }) {};
@@ -27920,13 +29049,13 @@
           sha256 = "0pjfbm8p077frk475bx8xkygn8r4vdsvnx4rcqbjlpjawj0ndgxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-sentence";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hl-sentence";
           sha256 = "16sjfs0nnpwzj1cqfna9vhmxgznwwhb2qdmjci25hlgrdxwwyahs";
           name = "hl-sentence";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hl-sentence";
+          homepage = "https://melpa.org/#/hl-sentence";
           license = lib.licenses.free;
         };
       }) {};
@@ -27941,13 +29070,13 @@
           sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-sexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hl-sexp";
           sha256 = "0kg0m20i9ylphf4w0qcvii8yp65abdl2q5flyphilk0jahwbj9jy";
           name = "hl-sexp";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hl-sexp";
+          homepage = "https://melpa.org/#/hl-sexp";
           license = lib.licenses.free;
         };
       }) {};
@@ -27955,38 +29084,38 @@
         pname = "hl-spotlight";
         version = "20151231.1540";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/hl-spotlight.el";
+          url = "https://www.emacswiki.org/emacs/download/hl-spotlight.el";
           sha256 = "0m84d1rdsp9r5ip79jlrp69pf1daw0ch8c378q3kc328606i3p2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-spotlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hl-spotlight";
           sha256 = "1166g27fp2pj4j3a8904pzvp5idlq4l22i0w6lbk5c9zh5pqyyf3";
           name = "hl-spotlight";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hl-spotlight";
+          homepage = "https://melpa.org/#/hl-spotlight";
           license = lib.licenses.free;
         };
       }) {};
     hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hl-todo";
-        version = "20151025.1420";
+        version = "20160424.649";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "hl-todo";
-          rev = "4a5958b90d35c0ba368778274c2a3ab9df941d1c";
-          sha256 = "0lwcvwnkbfpjw92k4qfj57nlhv8xbl614p5dfi8qy76y8bs71cvd";
+          rev = "6507868d63f3569a6f196716c38e09cf2b57d4e9";
+          sha256 = "1ljakm15bsl9hv1rbg6lj0mnbc4qna5fr9rwkalnlwknjpka1bx3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hl-todo";
           sha256 = "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4";
           name = "hl-todo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hl-todo";
+          homepage = "https://melpa.org/#/hl-todo";
           license = lib.licenses.free;
         };
       }) {};
@@ -28001,13 +29130,13 @@
           sha256 = "02mkfrs55d32948x739f94v35343gw6a0f7fknbcigbz56mzsvsp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hlint-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hlint-refactor";
           sha256 = "1311z6y7ycwx0mj67bya7a39j5hiypg72y6yg93dhgpk23wk7frq";
           name = "hlint-refactor";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hlint-refactor";
+          homepage = "https://melpa.org/#/hlint-refactor";
           license = lib.licenses.free;
         };
       }) {};
@@ -28022,13 +29151,13 @@
           sha256 = "0yw89kxvz53i9rbq3lsbp5xkgfl1986s23vyra5pipakfv85gmq4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hlinum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hlinum";
           sha256 = "04b6m0njr7yrbcbpkhqz4hmqpfacmyca3lw75dyw3vpjpsj2g0iv";
           name = "hlinum";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/hlinum";
+          homepage = "https://melpa.org/#/hlinum";
           license = lib.licenses.free;
         };
       }) {};
@@ -28039,16 +29168,16 @@
         src = fetchgit {
           url = "https://gitlab.lrde.epita.fr/spot/emacs-modes.git";
           rev = "3c608e15b655d2375c5f81323ac561c7848dc029";
-          sha256 = "bf4056192044808554a5dfd537512ec939cbcf628a9becd61736d6409f7e7ce8";
+          sha256 = "1s3wgsgl1min2zbfr6wacb7wnff95r8kgmfzlma8b02440cmch5z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hoa-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hoa-mode";
           sha256 = "06rfqn7sqvmgpvwhfmk17qqs4q0frfzhm597z3p1q7kys2035kiv";
           name = "hoa-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hoa-mode";
+          homepage = "https://melpa.org/#/hoa-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -28063,34 +29192,34 @@
           sha256 = "0g2r4d0ivbadqw1k8jsv0jwv8krpfahsg0qmzyi909p2yfddqk1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hoa-pp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hoa-pp-mode";
           sha256 = "01ijfn0hd645j6j88rids5dsanmzwmky37slf50yqffnv69jwvla";
           name = "hoa-pp-mode";
         };
         packageRequires = [ emacs names ];
         meta = {
-          homepage = "http://melpa.org/#/hoa-pp-mode";
+          homepage = "https://melpa.org/#/hoa-pp-mode";
           license = lib.licenses.free;
         };
       }) {};
     homebrew-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
     melpaBuild {
         pname = "homebrew-mode";
-        version = "20151030.851";
+        version = "20160406.1125";
         src = fetchFromGitHub {
           owner = "dunn";
           repo = "homebrew-mode";
-          rev = "767b4934c02c7b4117b6bd6cae8224848bc49db2";
-          sha256 = "1sj8pz48cilk8l6zn47fv1wkv833wrkvrf2mrmbdkvj3lqjrz0b3";
+          rev = "11e952b9fd9c7aa9c18933f7605cd10bac31e227";
+          sha256 = "0yh9v5zng1j2kfjjadfkdds67jws79q52kvl2mx9s8mq28263idm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/homebrew-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/homebrew-mode";
           sha256 = "088wc5fq4r5yj1nbh7mriyqf0xwqmbxvblj9d2wwrkkdm5flc8mj";
           name = "homebrew-mode";
         };
         packageRequires = [ dash emacs inf-ruby ];
         meta = {
-          homepage = "http://melpa.org/#/homebrew-mode";
+          homepage = "https://melpa.org/#/homebrew-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -28101,17 +29230,17 @@
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "hookify";
-          rev = "e76127230716f7fab6662410c03c3872d17a172b";
-          sha256 = "1yvz9d5h7npxhsdf6s9fgxpmqk5ixx91iwivbhzcz935gs2886hc";
+          rev = "b4aa586b24ff63f84baa8de4ed2fd93be6479ade";
+          sha256 = "1d3dlkrv95xrpv4rv3jgn58mxs71f6vi2lr88bddhxz702vb11d8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hookify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hookify";
           sha256 = "0prls539ifk2fsqklcxmbrwmgbm9hya50z486d7sw426lh648qmy";
           name = "hookify";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/hookify";
+          homepage = "https://melpa.org/#/hookify";
           license = lib.licenses.free;
         };
       }) {};
@@ -28126,13 +29255,13 @@
           sha256 = "1gm5nczq5lsxqkfb38ajffg65zwxkfqvqhk33bwnnd00rpa1ix6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hound";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hound";
           sha256 = "0qri6bddd3c4sqvaqvmqw6xg46vwlfi1by3gc9i3izpq4xl1cr1v";
           name = "hound";
         };
         packageRequires = [ cl-lib web ];
         meta = {
-          homepage = "http://melpa.org/#/hound";
+          homepage = "https://melpa.org/#/hound";
           license = lib.licenses.free;
         };
       }) {};
@@ -28141,19 +29270,19 @@
         pname = "how-many-lines-in-project";
         version = "20140806.2342";
         src = fetchFromGitHub {
-          owner = "kaihaosw";
+          owner = "hiddenlotus";
           repo = "how-many-lines-in-project";
           rev = "8a37ef885d004fe2ce231bfe05ed4867c6192d9b";
           sha256 = "0vygbdjy2dv7n50vrkcnqyswq48sgas0zzjfsac8x5g9vhxjkawj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/how-many-lines-in-project";
-          sha256 = "145zmfmsxcbmfh9s0mvxxgfh1d51q66396zc29k1c0hw94ffhkdd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/how-many-lines-in-project";
+          sha256 = "1dfh1ydpjbrawqpsj6kydvy8sz3rlwn4ma5cizfw5spd2gcmj1zb";
           name = "how-many-lines-in-project";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/how-many-lines-in-project";
+          homepage = "https://melpa.org/#/how-many-lines-in-project";
           license = lib.licenses.free;
         };
       }) {};
@@ -28168,13 +29297,33 @@
           sha256 = "01sj9c8mxqaif8wh6zz9v2czjaq7vcdi66drldyjmifkln6rg2v8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/howdoi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/howdoi";
           sha256 = "12vgbypawxhhrnjp8dgh0wrcp7pvjccfaxw4yhq7msai7ik3h83b";
           name = "howdoi";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/howdoi";
+          homepage = "https://melpa.org/#/howdoi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    howm = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "howm";
+        version = "20160405.718";
+        src = fetchgit {
+          url = "git://git.osdn.jp/gitroot/howm/howm.git";
+          rev = "6d6b4ca60e5c164a3e284ba82156b8ae33e83b7a";
+          sha256 = "0q9rjy8i263d6fcyj0s1l95s7vajf15i2fkbkbmhh4rp63nd04g3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/howm";
+          sha256 = "007r8mjn7m7m1mvsb1gaiqbizlwykh23k72g48nwan8bw556gfcr";
+          name = "howm";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/howm";
           license = lib.licenses.free;
         };
       }) {};
@@ -28189,13 +29338,13 @@
           sha256 = "17x5w5kzam8cgaphyasnqzm2yhc0hwm38azvmin7ra4h912vlisd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ht";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ht";
           sha256 = "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd";
           name = "ht";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ht";
+          homepage = "https://melpa.org/#/ht";
           license = lib.licenses.free;
         };
       }) {};
@@ -28210,13 +29359,13 @@
           sha256 = "10lbxf56gvy26grzrhhx2p710fzs0h866jd2zmmgkisvyb0vaiay";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/html-check-frag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/html-check-frag";
           sha256 = "0drancb9ryifiln44b40l6cal0c7nyp597a6q26288s3v909yk2a";
           name = "html-check-frag";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/html-check-frag";
+          homepage = "https://melpa.org/#/html-check-frag";
           license = lib.licenses.free;
         };
       }) {};
@@ -28226,18 +29375,18 @@
         version = "20120403.1315";
         src = fetchFromGitHub {
           owner = "rejeep";
-          repo = "html-script-src";
+          repo = "html-script-src.el";
           rev = "66460f8ab1b24656e6f3ce5bd50cff6a81be8422";
           sha256 = "0k9ga0qi6h33akip2vrpclfp4zljnbw5ax40lxyxc1813hwkdrmh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/html-script-src";
-          sha256 = "1pin1x6g68y75pa3vz2i9h5pmhjamh5rd5ladb1z3flcavsls64j";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/html-script-src";
+          sha256 = "0pdyc2a9wxxc9rivjm2kgh4ysdxmdp73wg37nfy2nzka1m7qni7j";
           name = "html-script-src";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/html-script-src";
+          homepage = "https://melpa.org/#/html-script-src";
           license = lib.licenses.free;
         };
       }) {};
@@ -28252,13 +29401,13 @@
           sha256 = "09n3zm9ivln8ng80fv5vwwzh9mj355ni685axda3m85xfxgai8gi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/html-to-markdown";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/html-to-markdown";
           sha256 = "1gjh9ndqsb3nfb7w5h7carjckkgy6qh63b4mg141j19dsyx9rrjv";
           name = "html-to-markdown";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/html-to-markdown";
+          homepage = "https://melpa.org/#/html-to-markdown";
           license = lib.licenses.free;
         };
       }) {};
@@ -28268,16 +29417,16 @@
         src = fetchgit {
           url = "http://fly.srk.fer.hr/~hniksic/emacs/htmlize.git";
           rev = "aa6e2f6dba6fdfa200c7c55efe29ff63380eac8f";
-          sha256 = "8afaf87b30628afd8d376965247a6b2791129339ad7238c5529f4b173f908251";
+          sha256 = "0lc2j0zifjwzab2khwmd769i5497ddx28rb96y6zv2k261xziyla";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/htmlize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/htmlize";
           sha256 = "15pym76iwqb1dqkbmkgc1yar450g2xinfl89fyss2ifyi4am1nxp";
           name = "htmlize";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/htmlize";
+          homepage = "https://melpa.org/#/htmlize";
           license = lib.licenses.free;
         };
       }) {};
@@ -28292,13 +29441,13 @@
           sha256 = "1i0r677zwnl5xl64cqk47y0gfd87vw49nf6ry5v2imbc95ni56wc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/http";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/http";
           sha256 = "1176jhm8m7s1pzp0zv1sqawcgn4m5zvxghypmsrjyyb5p7m6dalm";
           name = "http";
         };
         packageRequires = [ emacs request ];
         meta = {
-          homepage = "http://melpa.org/#/http";
+          homepage = "https://melpa.org/#/http";
           license = lib.licenses.free;
         };
       }) {};
@@ -28306,17 +29455,17 @@
         pname = "http-post-simple";
         version = "20131010.2258";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/http-post-simple.el";
+          url = "https://www.emacswiki.org/emacs/download/http-post-simple.el";
           sha256 = "1wp2rwc1hgd5c3yr6b96yzzakd1qmy5d95mhc6q4f6lx279nx0my";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/http-post-simple";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/http-post-simple";
           sha256 = "1b2fh0hp5z3712ncgc5ns1f3sww84khkq7zb3k9xclsp1p12a4cf";
           name = "http-post-simple";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/http-post-simple";
+          homepage = "https://melpa.org/#/http-post-simple";
           license = lib.licenses.free;
         };
       }) {};
@@ -28331,13 +29480,13 @@
           sha256 = "008iq5fhsw4qklw2l457a1cfqq8diadpnf1c1di5p07sc0za5562";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/http-twiddle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/http-twiddle";
           sha256 = "153qavpcwvk2g15w5a814xjsnsv54xksx4iz6yjffvvzq14a08ry";
           name = "http-twiddle";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/http-twiddle";
+          homepage = "https://melpa.org/#/http-twiddle";
           license = lib.licenses.free;
         };
       }) {};
@@ -28352,13 +29501,13 @@
           sha256 = "02jz8qwxl69zhwvpmlqc15znr8x4f30paqszmm7xrrrz5x1c1rn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/httpcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/httpcode";
           sha256 = "05k1al1j119x6zf03p7jn2r9qql33859583nbf85k41bhicknpgh";
           name = "httpcode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/httpcode";
+          homepage = "https://melpa.org/#/httpcode";
           license = lib.licenses.free;
         };
       }) {};
@@ -28373,13 +29522,13 @@
           sha256 = "0wd4wmy99mx677x4sdbp57bxxll1fsnnf8hk97r85xdmmjsmrkld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/httprepl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/httprepl";
           sha256 = "0899qb1yfnsyf04hhvnk47qnq4d1f4vd5ghj43x4743wd2b9qawh";
           name = "httprepl";
         };
         packageRequires = [ dash emacs s ];
         meta = {
-          homepage = "http://melpa.org/#/httprepl";
+          homepage = "https://melpa.org/#/httprepl";
           license = lib.licenses.free;
         };
       }) {};
@@ -28394,13 +29543,13 @@
           sha256 = "1vy521ljn16a1lcmpj09mr9y0m15lfjhl6xk04sb7nisps3vljyl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hungry-delete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hungry-delete";
           sha256 = "0hcsm3yndkyfqzb77ibx7df6bjppc34x5yabi6nd389pdscp9rpz";
           name = "hungry-delete";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hungry-delete";
+          homepage = "https://melpa.org/#/hungry-delete";
           license = lib.licenses.free;
         };
       }) {};
@@ -28411,38 +29560,38 @@
         src = fetchFromGitHub {
           owner = "hylang";
           repo = "hy-mode";
-          rev = "af0d848b069ca0cda3ed177d37d94de117f7ffec";
-          sha256 = "16z43mpj839bzafhyzpcbw6bmv4ckrf9ryslvg6z6q4g93k64q2m";
+          rev = "50d7d24a52aefd7079c3f26a90c8eaf3065884a1";
+          sha256 = "0wn83n1780bvrzx9p870wln51n9rfdghsxl79dp968dxycyhyxvj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hy-mode";
           sha256 = "1vxrqla3p82x7s3kn7x4h33vcdfms21srxgxzidr02k37f0vi82m";
           name = "hy-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hy-mode";
+          homepage = "https://melpa.org/#/hy-mode";
           license = lib.licenses.free;
         };
       }) {};
     hyai = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hyai";
-        version = "20160216.825";
+        version = "20160319.2035";
         src = fetchFromGitHub {
           owner = "iquiw";
           repo = "hyai";
-          rev = "256c0e2a1a7188bce7ed808804a1f4216ff9db9d";
-          sha256 = "1w490lcncl3zfm694x7xpi847527qkqmy0qkpzf72ak2zhywldj0";
+          rev = "1ad6876a090dc54a5be1feab1c7f83b9a679e43a";
+          sha256 = "0k7r5zddlfipnf6za467lmjx8s6h68dflj7gk05vqr4n4xniwgja";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hyai";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hyai";
           sha256 = "00ns7q5b11c5amwkq11fs4p5vrmdfmjljfrcxbwb39gc12yrhn7s";
           name = "hyai";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/hyai";
+          homepage = "https://melpa.org/#/hyai";
           license = lib.licenses.free;
         };
       }) {};
@@ -28457,13 +29606,13 @@
           sha256 = "11vgz64f8vs8vqp4scj9qvrfdshag7bs615ly9zvzzlk68jivdya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hydandata-light-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hydandata-light-theme";
           sha256 = "0jw43m91m10ifqg335y6d52r6ri77hcmxkird8wsyrpsnk3cfb60";
           name = "hydandata-light-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hydandata-light-theme";
+          homepage = "https://melpa.org/#/hydandata-light-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -28478,34 +29627,34 @@
           sha256 = "14gxbza26ccah8jl0fm7ksvaag0mv3c348bgqjy88dqq2qlwcrav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hyde";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hyde";
           sha256 = "18kjcxm7qmv9bfh4crw37zgax8khjqs9zkp4lrb490zlad2asbs3";
           name = "hyde";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hyde";
+          homepage = "https://melpa.org/#/hyde";
           license = lib.licenses.free;
         };
       }) {};
     hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hydra";
-        version = "20160126.257";
+        version = "20160415.623";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "hydra";
-          rev = "04cd3e4270ff5d0d51e783c86e87314054f1a018";
-          sha256 = "13ghz8mvnqn59m9alwcrxlml1k4cbw4a9wwwgf211ap4q618qjqs";
+          rev = "585db09f588805f9c49f679aa1f6d702fe115665";
+          sha256 = "1h6pj6bgsh3z8azikxxvwqrbk7pg3zr5q2h3cha88fvxsrzxfhy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hydra";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hydra";
           sha256 = "1c59l43p39ins3dn9690gm6llwm4b9p0pk78lip0dwlx736drdbw";
           name = "hydra";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/hydra";
+          homepage = "https://melpa.org/#/hydra";
           license = lib.licenses.free;
         };
       }) {};
@@ -28520,13 +29669,13 @@
           sha256 = "17k41rah17l9kf7bvlm83x71nzz4aizgn7254cl5sb59mdhcm8pm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/i2b2-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/i2b2-mode";
           sha256 = "172qnprmfliic3rszzg3g7q015i3dchd23skrbdikg0kxj5c57lf";
           name = "i2b2-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/i2b2-mode";
+          homepage = "https://melpa.org/#/i2b2-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -28541,13 +29690,13 @@
           sha256 = "1gl21li9vqfjvls4ffjw8a4bicas2c7hmaa621k3hpllgpy6qdg5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iasm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/iasm-mode";
           sha256 = "09xh41ayaha07fi5crk3c6pn17gwm3samsf6h71ldkywvz74kipv";
           name = "iasm-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/iasm-mode";
+          homepage = "https://melpa.org/#/iasm-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -28562,13 +29711,13 @@
           sha256 = "1s5qvlf310b0z7q9k1xhcf4qmyfqd37jpqd67ciahaxk7cp224rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ibuffer-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ibuffer-git";
           sha256 = "048888y07bzmi9x5i43fg6bgqbzdqi3nfjfnn6zr29jvlx366r5z";
           name = "ibuffer-git";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ibuffer-git";
+          homepage = "https://melpa.org/#/ibuffer-git";
           license = lib.licenses.free;
         };
       }) {};
@@ -28583,13 +29732,13 @@
           sha256 = "1zcnp61c9cp2kvns3v499hifk072rxm4rhw4pvdv2mm966vcxzvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ibuffer-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ibuffer-projectile";
           sha256 = "1qh4krggmsc6lx5mg60n8aakmi3f6ppl1gw094vfcsni96jl34fk";
           name = "ibuffer-projectile";
         };
         packageRequires = [ projectile ];
         meta = {
-          homepage = "http://melpa.org/#/ibuffer-projectile";
+          homepage = "https://melpa.org/#/ibuffer-projectile";
           license = lib.licenses.free;
         };
       }) {};
@@ -28604,13 +29753,13 @@
           sha256 = "15lapyj7qkkw1i1g1aizappm7gxkfnxhvd4fq66lghkzb76clz2m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ibuffer-rcirc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ibuffer-rcirc";
           sha256 = "1y6pyc6g8j42hs103yynjsdkkxvcq0q4xsz4r93rqwsr3za3wcmc";
           name = "ibuffer-rcirc";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/ibuffer-rcirc";
+          homepage = "https://melpa.org/#/ibuffer-rcirc";
           license = lib.licenses.free;
         };
       }) {};
@@ -28625,13 +29774,13 @@
           sha256 = "1mfrbr725p27p3s5nxh7xhm81pdr78ysz8l3kwrlp97bb6dmljmq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ibuffer-tramp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ibuffer-tramp";
           sha256 = "11a9b9g1jk2r3fldi012zka4jzy68kfn4991xp046qm2fbc7la32";
           name = "ibuffer-tramp";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ibuffer-tramp";
+          homepage = "https://melpa.org/#/ibuffer-tramp";
           license = lib.licenses.free;
         };
       }) {};
@@ -28646,31 +29795,31 @@
           sha256 = "0fwxhkx5rkyv3w5vs2swhmly9siahlww2ipsmk7v8xmvk4a63bhp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ibuffer-vc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ibuffer-vc";
           sha256 = "0bn5qyiq07cgzci10xl57ss5wsk7bfhi3hjq2v6yvpy9v704dvla";
           name = "ibuffer-vc";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/ibuffer-vc";
+          homepage = "https://melpa.org/#/ibuffer-vc";
           license = lib.licenses.free;
         };
       }) {};
     icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "icicles";
-        version = "20160131.1203";
+        version = "20160328.1";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/icicles.el";
-          sha256 = "16fsxw7w0l4dxgdi71q2izcki9ykqbjxaffsjh4k0zl7nxyyvv6q";
+          url = "https://www.emacswiki.org/emacs/download/icicles.el";
+          sha256 = "1ppximw1j433hfp63apnsz9wgq1nj1lh5cd0zfchrkmgfyhymq7k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/icicles";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/icicles";
           sha256 = "15h2511gm38q14avsd86j5mnxhsjvcdmwbnhj66ashj5p5nxhr92";
           name = "icicles";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/icicles";
+          homepage = "https://melpa.org/#/icicles";
           license = lib.licenses.free;
         };
       }) {};
@@ -28678,59 +29827,59 @@
         pname = "icomplete-plus";
         version = "20151231.1600";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/icomplete+.el";
+          url = "https://www.emacswiki.org/emacs/download/icomplete+.el";
           sha256 = "0z7v4pj0m6pwrjzyzz2xmwf6a53kmka9hxlzd1dxcpzx47pyvz3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/icomplete+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/icomplete+";
           sha256 = "0gxqkj4bjrxb046qisfz22wvanxx6bzl4hfv91rfwm78q3484slx";
           name = "icomplete-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/icomplete+";
+          homepage = "https://melpa.org/#/icomplete+";
           license = lib.licenses.free;
         };
       }) {};
     id-manager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "id-manager";
-        version = "20150605.2239";
+        version = "20160425.416";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-id-manager";
-          rev = "0d968929bbaff813dd7e098c7f69e0b54434ce09";
-          sha256 = "0bzbp0vgnzvd1m3lhbcrxmknpi0cjisff6jd49f1nvkdx3p2ks40";
+          rev = "cf0c3743f6a1a1d63637e25fff2ffa948ba40f3a";
+          sha256 = "0xd0zhbabb9cx4rsapvq6qs40w4q2cav6p16vrka54rmr98544vl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/id-manager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/id-manager";
           sha256 = "13g5fi06hvx0x2wn1d1d8rkfq5n6wbk9g5bhx2b5sar2yw0akmwm";
           name = "id-manager";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/id-manager";
+          homepage = "https://melpa.org/#/id-manager";
           license = lib.licenses.free;
         };
       }) {};
     idea-darkula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "idea-darkula-theme";
-        version = "20160209.111";
+        version = "20160416.1803";
         src = fetchFromGitHub {
           owner = "fourier";
           repo = "idea-darkula-theme";
-          rev = "ecff87b3bad30243848edad57d3c43580b0f7dae";
-          sha256 = "01irrj41rnbsmyny7vai01prwdkwh3ig1x5zmpmqa5spwq2lgack";
+          rev = "52602d9b91883e1f297d000951aeed48bf60176e";
+          sha256 = "1hknhbm3b5rsba2s84iwspylhzjsm91zdckz22j9gyrq37wjgyrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/idea-darkula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/idea-darkula-theme";
           sha256 = "0lanhwlhd7pbzjc047vd5sgsmi2bx66gr3inr8y57swgrfw3l8sk";
           name = "idea-darkula-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/idea-darkula-theme";
+          homepage = "https://melpa.org/#/idea-darkula-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -28745,13 +29894,13 @@
           sha256 = "047gzycr49cs8wlmm9j4ry7b7jxmfhmbayx6rbbxs49lba8dgwlk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/identica-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/identica-mode";
           sha256 = "1r69ylykjap305g23cry4wajiqhpgw08nw3b5d9i1y3mwx0j253q";
           name = "identica-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/identica-mode";
+          homepage = "https://melpa.org/#/identica-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -28766,13 +29915,13 @@
           sha256 = "0x4w1ksrw7dicl84zpf4d4scg672dyan9g95jkn6zvri0lr8xciv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/idle-highlight-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/idle-highlight-mode";
           sha256 = "1i5ky61bq0dpk71yasfpjhsrv29mmp9nly9f5xxin7gz3x0f36fc";
           name = "idle-highlight-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/idle-highlight-mode";
+          homepage = "https://melpa.org/#/idle-highlight-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -28787,13 +29936,13 @@
           sha256 = "0f8rxvc3dk2hi4x524l18fx73xrxy0qqwbybdma4ca67ck9n6xam";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/idle-require";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/idle-require";
           sha256 = "1lr330bqj4rfh2jgn3562sliani4yw5y4j2hr6cq9cfjjp18qgsj";
           name = "idle-require";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/idle-require";
+          homepage = "https://melpa.org/#/idle-require";
           license = lib.licenses.free;
         };
       }) {};
@@ -28808,13 +29957,13 @@
           sha256 = "1bii7vj8pmmijcpvq3a1scky4ais7k6d7zympb3m9dmz355m9rpp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-at-point";
           sha256 = "0jpgq2iiwgqifwdhwhqv0cd3lp846pdqar6rxqgw9fvvb8bijqm0";
           name = "ido-at-point";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ido-at-point";
+          homepage = "https://melpa.org/#/ido-at-point";
           license = lib.licenses.free;
         };
       }) {};
@@ -28829,13 +29978,13 @@
           sha256 = "14nmldahr0pj2x4vkzpnpx0bsxafmiihgjylk5j5linqvy8q6wk6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-clever-match";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-clever-match";
           sha256 = "081i6cjvqyfpgj0nvzc94zrl2v3l6nv6mhfda4zf7c8qqbvx1m8m";
           name = "ido-clever-match";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ido-clever-match";
+          homepage = "https://melpa.org/#/ido-clever-match";
           license = lib.licenses.free;
         };
       }) {};
@@ -28850,34 +29999,34 @@
           sha256 = "1aih8n10lcrw0bdgvlrkxzhkpxpmphw07cvbp6zd27ia25037fzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-complete-space-or-hyphen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-complete-space-or-hyphen";
           sha256 = "1wk0cq5gjnprmpyvhh80ksz3fash42hckvmx8m95crbzjg9j0gbc";
           name = "ido-complete-space-or-hyphen";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ido-complete-space-or-hyphen";
+          homepage = "https://melpa.org/#/ido-complete-space-or-hyphen";
           license = lib.licenses.free;
         };
       }) {};
     ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-completing-read-plus";
-        version = "20160220.1842";
+        version = "20160320.138";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "a491b106d9da87bfe45121078563389a77f8788c";
-          sha256 = "1ddy590xgv982zsgs1civqy0ch0a88z98qhq0bqqjivf9gq3v0pf";
+          rev = "7354d985d4f529877bd8dcb782940e3e87cf36b2";
+          sha256 = "13mcpc8qlv0mvabd33cah1zqybfa0hrzanp16ikbsc449zyz3889";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-completing-read+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-completing-read+";
           sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh";
           name = "ido-completing-read-plus";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ido-completing-read+";
+          homepage = "https://melpa.org/#/ido-completing-read+";
           license = lib.licenses.free;
         };
       }) {};
@@ -28892,13 +30041,13 @@
           sha256 = "0055dda1la7yah33xsi19j4hcdmqp17ily2dvkipm4y6d3ww8yqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-describe-bindings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-describe-bindings";
           sha256 = "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2";
           name = "ido-describe-bindings";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/ido-describe-bindings";
+          homepage = "https://melpa.org/#/ido-describe-bindings";
           license = lib.licenses.free;
         };
       }) {};
@@ -28913,13 +30062,13 @@
           sha256 = "1s93q47cadanynvm1y4y08s68yq0l8q8vfasdk7w39vrjsxxsj3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-exit-target";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-exit-target";
           sha256 = "17vmg47xwk6yjlbcsswirl8s2q565k291ajzjglnz7qg2fwx6spi";
           name = "ido-exit-target";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ido-exit-target";
+          homepage = "https://melpa.org/#/ido-exit-target";
           license = lib.licenses.free;
         };
       }) {};
@@ -28934,13 +30083,13 @@
           sha256 = "0ifdwd5vnjv2iyb5bnz8pij35lc0ymmyx8j8zhpkbgjigz8f05ip";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-gnus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-gnus";
           sha256 = "14ijb8q4s846984h102h72ij713v5bj3k2vfdvr94gw1f0iya2yg";
           name = "ido-gnus";
         };
         packageRequires = [ gnus ];
         meta = {
-          homepage = "http://melpa.org/#/ido-gnus";
+          homepage = "https://melpa.org/#/ido-gnus";
           license = lib.licenses.free;
         };
       }) {};
@@ -28955,13 +30104,13 @@
           sha256 = "1ip8g0r0aimhc4a1f06m711zmbs0krxn8hmayk99gk5kkz12igkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-grid-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-grid-mode";
           sha256 = "1wl1yclcxmkbfnvp0il23csdf6gprzf7fkcknpivk784fhl19acr";
           name = "ido-grid-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ido-grid-mode";
+          homepage = "https://melpa.org/#/ido-grid-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -28976,13 +30125,13 @@
           sha256 = "01p4az128k1jvd9i1gshgg87z6048cw9cnm57l8qdlw01c3h6dkx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-hacks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-hacks";
           sha256 = "05f9pdkqppnp7wafka2d2yj84gqchjd7vnrl5rcywy1l47gbxiw0";
           name = "ido-hacks";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ido-hacks";
+          homepage = "https://melpa.org/#/ido-hacks";
           license = lib.licenses.free;
         };
       }) {};
@@ -28997,13 +30146,13 @@
           sha256 = "0l69sr3g1n2x61j6sv6hnbiyk8a2qra6y2kh413qp0sfpx4fzchv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-load-library";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-load-library";
           sha256 = "13f83gqh39p3yjy7r7qc7kzgdcmqh4b5c07zl7rwzb8y9rz59lhj";
           name = "ido-load-library";
         };
         packageRequires = [ pcache persistent-soft ];
         meta = {
-          homepage = "http://melpa.org/#/ido-load-library";
+          homepage = "https://melpa.org/#/ido-load-library";
           license = lib.licenses.free;
         };
       }) {};
@@ -29018,13 +30167,13 @@
           sha256 = "15iajhrgy989pn91ijcd1mq2015bkaacaplm79rmb0ggxhh8vq38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-migemo";
           sha256 = "02hbwchwx2bcwdxz7gz555699l7n9wisfikax1j6idn167n4wdpi";
           name = "ido-migemo";
         };
         packageRequires = [ migemo ];
         meta = {
-          homepage = "http://melpa.org/#/ido-migemo";
+          homepage = "https://melpa.org/#/ido-migemo";
           license = lib.licenses.free;
         };
       }) {};
@@ -29039,13 +30188,13 @@
           sha256 = "0zlkq29wxd3a4vg0w6ds2jad5h1pja7ccd3l6ppl0kz1b1517qlr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-occasional";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-occasional";
           sha256 = "1vdh5i9qznzd9r148a6jw9v47swf7ykwyciqfzc3ismv5q909bl2";
           name = "ido-occasional";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ido-occasional";
+          homepage = "https://melpa.org/#/ido-occasional";
           license = lib.licenses.free;
         };
       }) {};
@@ -29060,13 +30209,13 @@
           sha256 = "0j12li001yq08vzwh1b25qyq09llizrkgaay9k07g9pvfxlx6zb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-occur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-occur";
           sha256 = "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji";
           name = "ido-occur";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/ido-occur";
+          homepage = "https://melpa.org/#/ido-occur";
           license = lib.licenses.free;
         };
       }) {};
@@ -29081,13 +30230,13 @@
           sha256 = "0qvf3h2ljlbf3z36dhywzza62mfi6mqbrfc0sqfsbyia9bn1df4f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-select-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-select-window";
           sha256 = "03xqfpnagy2sk67yq7n7s6ma3im37d558zzx8sdzd9pbfxy9ij23";
           name = "ido-select-window";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ido-select-window";
+          homepage = "https://melpa.org/#/ido-select-window";
           license = lib.licenses.free;
         };
       }) {};
@@ -29102,13 +30251,13 @@
           sha256 = "149cznbybwj0gkjyvpnh4kn258kxw449m7cn95n9jbh1r45vljvy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-skk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-skk";
           sha256 = "1fyzjkw9xp126bzfv1254bvyakh323iw3wdzrkd9gb4ir39k5jzw";
           name = "ido-skk";
         };
         packageRequires = [ ddskk emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ido-skk";
+          homepage = "https://melpa.org/#/ido-skk";
           license = lib.licenses.free;
         };
       }) {};
@@ -29123,13 +30272,13 @@
           sha256 = "0w3cr2yf8644i0g8w6r147vi9wanibn41sg7dzws51yb9q0y92vd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-sort-mtime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-sort-mtime";
           sha256 = "1dkny9y3x49dv1vjwz78x2qhb6kdq3fa8qh1xkm30jyapvgiwdg2";
           name = "ido-sort-mtime";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ido-sort-mtime";
+          homepage = "https://melpa.org/#/ido-sort-mtime";
           license = lib.licenses.free;
         };
       }) {};
@@ -29140,38 +30289,38 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "springboard";
-          rev = "d12119d9dd2b0b64f0af0ba82c273326c8c12268";
-          sha256 = "14py5amh66jzhqyqjz5pxq0g19vzlmqnrr5wij1ix64xwfr3xdy8";
+          rev = "ffcfaade6f69328084a0613d43d323f790d23048";
+          sha256 = "0p13q8xax2h3m6rddvmh1p9biw3d1shvwwmqfhg0c93xajlwdfqi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-springboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-springboard";
           sha256 = "04jqnag8jiyfbwvc3vd9ikrsmf6cajld7dz2gz9y0zkj1k4gs7zv";
           name = "ido-springboard";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ido-springboard";
+          homepage = "https://melpa.org/#/ido-springboard";
           license = lib.licenses.free;
         };
       }) {};
     ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-ubiquitous";
-        version = "20160220.1842";
+        version = "20160320.138";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "a491b106d9da87bfe45121078563389a77f8788c";
-          sha256 = "1ddy590xgv982zsgs1civqy0ch0a88z98qhq0bqqjivf9gq3v0pf";
+          rev = "7354d985d4f529877bd8dcb782940e3e87cf36b2";
+          sha256 = "13mcpc8qlv0mvabd33cah1zqybfa0hrzanp16ikbsc449zyz3889";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-ubiquitous";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-ubiquitous";
           sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp";
           name = "ido-ubiquitous";
         };
         packageRequires = [ cl-lib emacs ido-completing-read-plus ];
         meta = {
-          homepage = "http://melpa.org/#/ido-ubiquitous";
+          homepage = "https://melpa.org/#/ido-ubiquitous";
           license = lib.licenses.free;
         };
       }) {};
@@ -29186,13 +30335,13 @@
           sha256 = "1vl87phswkciijq0j07lqlgmha5dmff8yd4j4jn7cfrkrdjp6jbx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-vertical-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-vertical-mode";
           sha256 = "1vg5s6nd6v2g8ychz1q9cdqvsdw6vag7d9w68sn7blpmlr0nqhfm";
           name = "ido-vertical-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ido-vertical-mode";
+          homepage = "https://melpa.org/#/ido-vertical-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -29207,13 +30356,13 @@
           sha256 = "046ns1nqisz830f6xwlly1qgmi4v2ikw6vmj0f93jprv4vkjylpq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-yes-or-no";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-yes-or-no";
           sha256 = "0glag4yb9xyf1lxxbdhph2nq6s1vg44i6f2z1ii8bkxpambz2ana";
           name = "ido-yes-or-no";
         };
         packageRequires = [ ido-completing-read-plus ];
         meta = {
-          homepage = "http://melpa.org/#/ido-yes-or-no";
+          homepage = "https://melpa.org/#/ido-yes-or-no";
           license = lib.licenses.free;
         };
       }) {};
@@ -29228,55 +30377,55 @@
           sha256 = "1vx2g1xgxpcabr49mkl6ggzrpa3k2zhm479j6262vb64swzx33jw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/idomenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/idomenu";
           sha256 = "0mg601ak9mhp2fg5n13npcfzphgyms4vkqd18ldmv098z2z1412h";
           name = "idomenu";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/idomenu";
+          homepage = "https://melpa.org/#/idomenu";
           license = lib.licenses.free;
         };
       }) {};
     idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }:
     melpaBuild {
         pname = "idris-mode";
-        version = "20151030.607";
+        version = "20160302.835";
         src = fetchFromGitHub {
           owner = "idris-hackers";
           repo = "idris-mode";
-          rev = "f2f0a19f1a23fac618442d7d2187cc3ac5d9e445";
-          sha256 = "16gk7ry4yiaxk9dp6s2m4g79klw344yvr86d7hr0qdjkkf229m56";
+          rev = "dc122c178c2a0ddda36fccdd0d3976fc7cd27245";
+          sha256 = "0ngqsh0ncwcr377ifvnx5j352bf1f7lhcq7qc8avcn5pwlshri4w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/idris-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/idris-mode";
           sha256 = "0hiiizz976hz3z3ciwg1gs9y10qhxbs8givhz89kvyn4s4861a1s";
           name = "idris-mode";
         };
         packageRequires = [ cl-lib emacs prop-menu ];
         meta = {
-          homepage = "http://melpa.org/#/idris-mode";
+          homepage = "https://melpa.org/#/idris-mode";
           license = lib.licenses.free;
         };
       }) {};
     ids-edit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ids-edit";
-        version = "20151128.635";
+        version = "20160324.1722";
         src = fetchFromGitHub {
           owner = "kawabata";
           repo = "ids-edit";
-          rev = "f40495ecd434c6b39d52cadfed25098f08ce78cb";
-          sha256 = "1k7h1795kaczmhd21hzqgns7blqc6zjh2xg4w3rj986ll8lb9fpr";
+          rev = "3073f03267dd3527718e1edf1010055b6e55929e";
+          sha256 = "18dca47ds5fiihijd1vv7nif44n4b4nv4za2djjfqbhbvizra1fd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ids-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ids-edit";
           sha256 = "0jzmcynr6lvsr36nblqzrjwxawyqcdz972zsv4rqkihdydpqfz7m";
           name = "ids-edit";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ids-edit";
+          homepage = "https://melpa.org/#/ids-edit";
           license = lib.licenses.free;
         };
       }) {};
@@ -29291,13 +30440,13 @@
           sha256 = "1n2yz6jzbminrviadhd3h42fwvfrdy0v2nw7sk5plkzc8zrs3x25";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/iedit";
           sha256 = "02gjshvkcvyr58yf6vlg3s2pzls5sd54xpxggdmqajfg8xmpkq04";
           name = "iedit";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/iedit";
+          homepage = "https://melpa.org/#/iedit";
           license = lib.licenses.free;
         };
       }) {};
@@ -29312,13 +30461,13 @@
           sha256 = "0b86x675g95yrlc0alffx0z9fmficlwv3gpy5cy86z1xvvyh3nzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ietf-docs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ietf-docs";
           sha256 = "0wnk36z9g7lksmynd04hb2m6rx45wpxnxj1lhrlpjnzsrknhf4k3";
           name = "ietf-docs";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ietf-docs";
+          homepage = "https://melpa.org/#/ietf-docs";
           license = lib.licenses.free;
         };
       }) {};
@@ -29333,34 +30482,34 @@
           sha256 = "18rlyjsn9w0zbs0c002s84qzark3rrcmjn9vq4nap7i6zpaq8hki";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iflipb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/iflipb";
           sha256 = "1nfrrxgi9nlhn477z8ay7jxycpcghhhmmg9dagdhrlrr20fx697d";
           name = "iflipb";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/iflipb";
+          homepage = "https://melpa.org/#/iflipb";
           license = lib.licenses.free;
         };
       }) {};
     ignoramus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ignoramus";
-        version = "20150216.1542";
+        version = "20160414.909";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "ignoramus";
-          rev = "cab192aa621d1087f2d574b65fffd295c5efb919";
-          sha256 = "161algqrrjbc1ja08416q5wzz34rrg6shr2sim7vba0j3svyggnf";
+          rev = "b37dc7c07edd9d152436f9019c14df158b599be3";
+          sha256 = "1b4r4h8yrs8zkyr1hnnx2wjrmm39wbqxfhyxpjb5pxi4zk3fh4rj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ignoramus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ignoramus";
           sha256 = "1czqdmlrds1l5afi8ldg7nrxcwav86538z2w1npad3dz8xk67da9";
           name = "ignoramus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ignoramus";
+          homepage = "https://melpa.org/#/ignoramus";
           license = lib.licenses.free;
         };
       }) {};
@@ -29368,17 +30517,17 @@
         pname = "igrep";
         version = "20130824.707";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/igrep.el";
+          url = "https://www.emacswiki.org/emacs/download/igrep.el";
           sha256 = "0qiv69v7ig38iizif7zg8aljdmpa1jk8bsfa0iyhqqqrkvsmhc29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/igrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/igrep";
           sha256 = "1vyhrziy29q6w8w9vvanb7d29r1n7nfkznbcd62il991n48d08i3";
           name = "igrep";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/igrep";
+          homepage = "https://melpa.org/#/igrep";
           license = lib.licenses.free;
         };
       }) {};
@@ -29388,16 +30537,16 @@
         src = fetchgit {
           url = "https://bitbucket.org/sbarbit/eigv";
           rev = "47ac6ceede252f451348a2c696398c0cb5279555";
-          sha256 = "cefc95ead9e5d425d3763f8d63afa10dea416493cafd7144f4d3cdeee0d0fa86";
+          sha256 = "11pss3hfxkfkyi273zfajdj43shdl6pn739zfv9jbm75v7m9bz6f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/igv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/igv";
           sha256 = "01igm3cb0lncmcyy72mjf93byh42k2hvscqhg8r7iljbxm58460z";
           name = "igv";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/igv";
+          homepage = "https://melpa.org/#/igv";
           license = lib.licenses.free;
         };
       }) {};
@@ -29412,13 +30561,13 @@
           sha256 = "068z3ygq9p139ikm04xqhhqhc994an5isba5c7kpqs009y09xw3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/image-archive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/image-archive";
           sha256 = "0x0lv5dr1gc9bnr3dn26bc9s1ccq2rp8c4a1licbi929f0jyxxfp";
           name = "image-archive";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/image-archive";
+          homepage = "https://melpa.org/#/image-archive";
           license = lib.licenses.free;
         };
       }) {};
@@ -29433,13 +30582,13 @@
           sha256 = "1n2ya9s0ld257a8iryjd0dz0z2zs1xhzfiwsdkq4l4azwxl54m29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/image-dired+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/image-dired+";
           sha256 = "0hhwqfn490n7p12n7ij4xbjh15gfvicmn21fvwbnrmfqc343pcdy";
           name = "image-dired-plus";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/image-dired+";
+          homepage = "https://melpa.org/#/image-dired+";
           license = lib.licenses.free;
         };
       }) {};
@@ -29454,13 +30603,13 @@
           sha256 = "0v66wk9nh0raih4jhrzmmyi5lbysjnmbv791vm2230ffi2hmwxnd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/image+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/image+";
           sha256 = "1a9dxswnqn6cvx28180kclpjc0vc6fimzp7n91gpdwnmy123x6hg";
           name = "image-plus";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/image+";
+          homepage = "https://melpa.org/#/image+";
           license = lib.licenses.free;
         };
       }) {};
@@ -29475,34 +30624,55 @@
           sha256 = "0f3xdqhq9nprvl8bnmgrx20h08ddkfak0is29bsqwckkfgn7pmqp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/imakado";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/imakado";
           sha256 = "18mj0vpv3dybfpa8hl9jwlagsivbhgqgz8lwb8cswsq9hwv3jgd3";
           name = "imakado";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/imakado";
+          homepage = "https://melpa.org/#/imakado";
+          license = lib.licenses.free;
+        };
+      }) {};
+    imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "imapfilter";
+        version = "20160419.446";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "imapfilter";
+          rev = "f3aca4c07178c56080e4c85875f78321e94a9649";
+          sha256 = "15lflvpapm5749qq7jzdwbd0isb89i6df3np4wn9y9gjl7y92wk7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/imapfilter";
+          sha256 = "0i893kqj6yzadhza800r6ri7fihl01r57z8yrzzh3d09qaias5vz";
+          name = "imapfilter";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/imapfilter";
           license = lib.licenses.free;
         };
       }) {};
     imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "imenu-anywhere";
-        version = "20160213.732";
+        version = "20160426.1132";
         src = fetchFromGitHub {
-          owner = "vitoshka";
+          owner = "vspinu";
           repo = "imenu-anywhere";
-          rev = "e2419b1558cecdbc8fe8a31806334b8ce2556622";
-          sha256 = "0h4x8wbg6kp8iqhka0f5m67hxh3yd5kb95j12k30wbgqgabi01md";
+          rev = "a1c0d4acc2abc366ac5a4c975524c14c5804233f";
+          sha256 = "1hdfnbxcawwhlff9yndh4n5z7a1dgyab3qid6pm6xzbckmhbqss3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/imenu-anywhere";
-          sha256 = "0p93g7ay9n4nhf1qk24mbax0w9sr06xd2kjmrz00gbg75sr9r2s8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/imenu-anywhere";
+          sha256 = "1ylqzdnd3nzcpyyd6rh6i5q9mvf8c99rvpk51fzfm3yq2kyw4dbq";
           name = "imenu-anywhere";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/imenu-anywhere";
+          homepage = "https://melpa.org/#/imenu-anywhere";
           license = lib.licenses.free;
         };
       }) {};
@@ -29517,13 +30687,13 @@
           sha256 = "1j0p0zkk89lg5xk5qzdnj9nxxiaxhff2y9iv9lw456kvb3lsyvjk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/imenu-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/imenu-list";
           sha256 = "092fsn7hnbfabcyakbqyk20pk62sr8xrs45aimkv1l91681np98s";
           name = "imenu-list";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/imenu-list";
+          homepage = "https://melpa.org/#/imenu-list";
           license = lib.licenses.free;
         };
       }) {};
@@ -29531,38 +30701,38 @@
         pname = "imenu-plus";
         version = "20151231.1601";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/imenu+.el";
+          url = "https://www.emacswiki.org/emacs/download/imenu+.el";
           sha256 = "00w88d37mg2hdrzpw5cxrgqz5jbf7rylmir95hs8j1cm8fk787bb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/imenu+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/imenu+";
           sha256 = "1v2h3xs5pnv7z5qphkn2y5pa1p8pivrknkw7xihm5yr4a4dqjv5d";
           name = "imenu-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/imenu+";
+          homepage = "https://melpa.org/#/imenu+";
           license = lib.licenses.free;
         };
       }) {};
     imenus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "imenus";
-        version = "20160219.458";
+        version = "20160220.1532";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "imenus.el";
-          rev = "e492fcdcd2fa4c0fda0356ae6e23500514e544d3";
-          sha256 = "1zg9rv9qpzxsc3r6gmbcyizx7jvhfdyn08dfgim3g382czbapfbc";
+          rev = "ee1bbd2228dbb86df2865dc9004d375421b171ba";
+          sha256 = "1y57xp0w0c6hg3gn4f1l3612a18li4gwhfa4dy18fy94gr54ycpx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/imenus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/imenus";
           sha256 = "1q0j6r2n5vjlbgchkz9zdglmmbpd8agawzcg61knqrgzpc4lk82r";
           name = "imenus";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/imenus";
+          homepage = "https://melpa.org/#/imenus";
           license = lib.licenses.free;
         };
       }) {};
@@ -29577,13 +30747,13 @@
           sha256 = "1q53r3f3x0hpzryxd1v1w3qgs54p384q0azi7xj2gppi1q49sa42";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/imgix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/imgix";
           sha256 = "0dh7qsz5c9mflldcw60vc8mrxrw76n2ydd7blv6jfmsnr19ila4q";
           name = "imgix";
         };
         packageRequires = [ cl-lib dash ht json s ];
         meta = {
-          homepage = "http://melpa.org/#/imgix";
+          homepage = "https://melpa.org/#/imgix";
           license = lib.licenses.free;
         };
       }) {};
@@ -29598,13 +30768,13 @@
           sha256 = "0nzgfj083im8lc62ifgsh1pmbw0j9wivimjgih7k6ny3jgw834rs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/imgur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/imgur";
           sha256 = "0hr2zz7nq65jig2036g5sa8q2lhb42jv40ijikcz8s4f5v3y14i7";
           name = "imgur";
         };
         packageRequires = [ anything ];
         meta = {
-          homepage = "http://melpa.org/#/imgur";
+          homepage = "https://melpa.org/#/imgur";
           license = lib.licenses.free;
         };
       }) {};
@@ -29619,13 +30789,13 @@
           sha256 = "0rbamm9qvipgswxng8g1d7rbdbcj7sgwrccg7imcfapwwq7xhj4h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/immutant-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/immutant-server";
           sha256 = "15vcxag1ni41ja4b3q0444sq5ysrisis59la7li6h3617wy8r02i";
           name = "immutant-server";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/immutant-server";
+          homepage = "https://melpa.org/#/immutant-server";
           license = lib.licenses.free;
         };
       }) {};
@@ -29640,13 +30810,13 @@
           sha256 = "0vr4i3ayp1n8zg3v9rfv81qnr0vrdbkzphwd5kyadjgy4sbfjykj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/impatient-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/impatient-mode";
           sha256 = "05vp04zh5w0ss959galdrnridv268dzqymqzqfpkfjbg8kryzfxg";
           name = "impatient-mode";
         };
         packageRequires = [ cl-lib htmlize simple-httpd ];
         meta = {
-          homepage = "http://melpa.org/#/impatient-mode";
+          homepage = "https://melpa.org/#/impatient-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -29657,17 +30827,17 @@
         src = fetchFromGitHub {
           owner = "trotzig";
           repo = "import-js";
-          rev = "288fe97646d19a4185dad4a034752e6f79a23155";
-          sha256 = "0210mxcbb470h6k1b0nny9jpa7bfy1c46v901gjlpzqxz41r0fiy";
+          rev = "0635ef3a17ccc985e707117f6ab753fdbf90573c";
+          sha256 = "1px5ym5mpna5vkbl07liqyw46x9n13nf98k44xx9papzb0ss6hf1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/import-js";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/import-js";
           sha256 = "1grvzy378qj14wlbmhb3j7fx2zkl9wp65b5g0brjimav08nz7bls";
           name = "import-js";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/import-js";
+          homepage = "https://melpa.org/#/import-js";
           license = lib.licenses.free;
         };
       }) {};
@@ -29682,13 +30852,13 @@
           sha256 = "0ycsdwwfb27g85aby4jix1aj41a4vq6bf541iwla0xh3wsyxb01w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/import-popwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/import-popwin";
           sha256 = "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy";
           name = "import-popwin";
         };
         packageRequires = [ cl-lib popwin ];
         meta = {
-          homepage = "http://melpa.org/#/import-popwin";
+          homepage = "https://melpa.org/#/import-popwin";
           license = lib.licenses.free;
         };
       }) {};
@@ -29703,13 +30873,13 @@
           sha256 = "1p54w9dwkc76nvc4m0q9a0lh4bdxp4ad1wzscadayqy8qbrylf97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/indent-guide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/indent-guide";
           sha256 = "029fj9rr9vfmkysi6lzpwra92j6ppw675qpj3sinfq7fqqlicvp7";
           name = "indent-guide";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/indent-guide";
+          homepage = "https://melpa.org/#/indent-guide";
           license = lib.licenses.free;
         };
       }) {};
@@ -29724,13 +30894,13 @@
           sha256 = "1zsw68zzvjjh93cldc0w83k67hzcgi226vz3d0nzqc9sczqk8civ";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/indicators";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/indicators";
           sha256 = "1rhmz8sfi2gnv72sbw6kgyzidk43mnp05wnscw9vjvz9v0vwirss";
           name = "indicators";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/indicators";
+          homepage = "https://melpa.org/#/indicators";
           license = lib.licenses.free;
         };
       }) {};
@@ -29745,34 +30915,34 @@
           sha256 = "0kv0aj444i2rzksvcfz8sw0yyig3ca3m05agnhw9jzr01y05yl1n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/indy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/indy";
           sha256 = "118n3n07h1vx576fdv6v5a94aa004q0gmy9hlsnrswpxa30ahnw7";
           name = "indy";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/indy";
+          homepage = "https://melpa.org/#/indy";
           license = lib.licenses.free;
         };
       }) {};
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20160206.1019";
+        version = "20160404.2338";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "3e7896a7cb467ce28e2d5eca6a8d6c2ad2335983";
-          sha256 = "04ydxjh3wcs1qnack9f1sgq67chl9ihypplhj9i3shnj4zx1a6n8";
+          rev = "aa81e316c2a0fcb2026ac036a7c1e5ab01a3d377";
+          sha256 = "1632q7zbqqs5nvvxly3b2fj9b9q9mgxwh5sspamj7442s7i0j645";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inf-clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/inf-clojure";
           sha256 = "0n8w0vx1dnbfz88j45a57z9bsmkxr2zyh6ld72ady8asanf17zhl";
           name = "inf-clojure";
         };
         packageRequires = [ clojure-mode emacs ];
         meta = {
-          homepage = "http://melpa.org/#/inf-clojure";
+          homepage = "https://melpa.org/#/inf-clojure";
           license = lib.licenses.free;
         };
       }) {};
@@ -29787,13 +30957,13 @@
           sha256 = "14kf3zvms1w8cbixhpgw3m2xxc2r87i57gmx00jwh89282i6kgsi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inf-mongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/inf-mongo";
           sha256 = "09hf3jmacsk4hl0rxk35cza8vjl0xfmv19dagb8h8fli97fb65hh";
           name = "inf-mongo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/inf-mongo";
+          homepage = "https://melpa.org/#/inf-mongo";
           license = lib.licenses.free;
         };
       }) {};
@@ -29808,34 +30978,34 @@
           sha256 = "1z5ns94xgj2dkv2sc2ckax6bzwdxsm19pkvni24ys2w7d5nhajzr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inf-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/inf-php";
           sha256 = "011sc6f0ka7mmik8z0df8qk24mf6ygq22jy781f2ikhjh94gy83d";
           name = "inf-php";
         };
         packageRequires = [ php-mode ];
         meta = {
-          homepage = "http://melpa.org/#/inf-php";
+          homepage = "https://melpa.org/#/inf-php";
           license = lib.licenses.free;
         };
       }) {};
     inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-ruby";
-        version = "20160221.610";
+        version = "20160423.1037";
         src = fetchFromGitHub {
           owner = "nonsequitur";
           repo = "inf-ruby";
-          rev = "aad537f010a64e8123b610329fd09fedc82abb41";
-          sha256 = "0r0gjv6wg60v6xc4a0zmyib07ac04h7vcwjbshjgjwybfvx98raj";
+          rev = "db89398caabccce307bee11b39cc9cad1b58d6a1";
+          sha256 = "12qjz6bp6p6yh5nxin6w7snil9954mhd4kfnk0wwbijpd1lqw73l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/inf-ruby";
           sha256 = "02f01vwzr6j9iqcdns4l579bhia99sw8hwdqfwqjs9gk3xampfpp";
           name = "inf-ruby";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/inf-ruby";
+          homepage = "https://melpa.org/#/inf-ruby";
           license = lib.licenses.free;
         };
       }) {};
@@ -29850,13 +31020,13 @@
           sha256 = "0061hcmj63g13bvacwkmcb5iggwnk27dvb04fz4hihqis6jg01c5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inflections";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/inflections";
           sha256 = "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70";
           name = "inflections";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/inflections";
+          homepage = "https://melpa.org/#/inflections";
           license = lib.licenses.free;
         };
       }) {};
@@ -29864,37 +31034,38 @@
         pname = "info-plus";
         version = "20151231.1603";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/info+.el";
+          url = "https://www.emacswiki.org/emacs/download/info+.el";
           sha256 = "068y1p44ynimxfrqgrrhrj4gldf661dr0kbc9p7dqm1mw928hxmm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/info+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/info+";
           sha256 = "0flpmi8dsaalg14xd86xcr087j51899sm8ghsa150ag4g4acfggr";
           name = "info-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/info+";
+          homepage = "https://melpa.org/#/info+";
           license = lib.licenses.free;
         };
       }) {};
-    inform7-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild, sws-mode }:
+    inform7-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sws-mode }:
     melpaBuild {
         pname = "inform7-mode";
         version = "20131010.154";
-        src = fetchgit {
-          url = "https://github.com/fred-o/inform7-mode.git";
+        src = fetchFromGitHub {
+          owner = "fred-o";
+          repo = "inform7-mode";
           rev = "42458733947f2fbd44bc78f7264be247a5d8980b";
-          sha256 = "3c00805529518edba788671fed0c3e56810d1dbec2a0dbd3cb42f42991326ca6";
+          sha256 = "19kc6a8jkx22rg9xp862pqfhv0an7q6fs7v7i2kxp3ji55aq001w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inform7-mode";
-          sha256 = "1kbyl69vwhp1wdivr3ijmj7mghdnjaw7adk8az7bwyzjvpq73171";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/inform7-mode";
+          sha256 = "0fpnf9rgizsfz9pn06k87v4s0dr7z1pn0gdxfi6hnnv68qni8hg3";
           name = "inform7-mode";
         };
         packageRequires = [ sws-mode ];
         meta = {
-          homepage = "http://melpa.org/#/inform7-mode";
+          homepage = "https://melpa.org/#/inform7-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -29909,13 +31080,13 @@
           sha256 = "1zykh80k2sy0as1rn7qaa2hyvkagcvzzmxik4jpb0apw0ha1bf6s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/init-loader";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/init-loader";
           sha256 = "0rq7759abp0ml0l8dycvdl0j5wsxw9z5y9pyx68973a4ssbx2i0r";
           name = "init-loader";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/init-loader";
+          homepage = "https://melpa.org/#/init-loader";
           license = lib.licenses.free;
         };
       }) {};
@@ -29930,13 +31101,13 @@
           sha256 = "0xk7lyhd9pgahbscqwa2qkh2vgnbs5yz78am3zh930k4ig9lbmjh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/init-open-recentf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/init-open-recentf";
           sha256 = "0xlmfxhxb2car8vfx7krxmxb3d56x0r3zzkj8ds7yqvr65z85x2r";
           name = "init-open-recentf";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/init-open-recentf";
+          homepage = "https://melpa.org/#/init-open-recentf";
           license = lib.licenses.free;
         };
       }) {};
@@ -29951,13 +31122,13 @@
           sha256 = "1qvkxpxdv0n9qlzigvi25iw485824pgbpb10lwhh8bs2074dvrgq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/initsplit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/initsplit";
           sha256 = "0n9dk3x62vgxfn39jkmdg8wxsik0xqkprifgvqzyvn8xcx1blyyq";
           name = "initsplit";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/initsplit";
+          homepage = "https://melpa.org/#/initsplit";
           license = lib.licenses.free;
         };
       }) {};
@@ -29972,13 +31143,13 @@
           sha256 = "063v3a783si5fi8jrnysss60qma1c3whvyb48i10qbrrrx750cmv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inkpot-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/inkpot-theme";
           sha256 = "0w4q74w769n88zb2q7x326cxji42278lf95wnpslgjybnaxycgw7";
           name = "inkpot-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/inkpot-theme";
+          homepage = "https://melpa.org/#/inkpot-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -29993,13 +31164,13 @@
           sha256 = "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inline-crypt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/inline-crypt";
           sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n";
           name = "inline-crypt";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/inline-crypt";
+          homepage = "https://melpa.org/#/inline-crypt";
           license = lib.licenses.free;
         };
       }) {};
@@ -30014,34 +31185,34 @@
           sha256 = "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inlineR";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/inlineR";
           sha256 = "1fflq2gkpfn3jkv4a6yywzmxsq6qszfid1ri85ass1ppw6scdvzw";
           name = "inlineR";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/inlineR";
+          homepage = "https://melpa.org/#/inlineR";
           license = lib.licenses.free;
         };
       }) {};
     insert-shebang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "insert-shebang";
-        version = "20141119.627";
+        version = "20160413.912";
         src = fetchFromGitHub {
           owner = "psachin";
           repo = "insert-shebang";
-          rev = "a6e520280b1cb64d70adba2ba38dd9b728960b36";
-          sha256 = "1np3ih2bz9831p97rx5bssq78grjxj7f9241z372l6ggimrqhkbx";
+          rev = "a750edbe20fb7815dd199f5f449b426704e4e79b";
+          sha256 = "198pgj0xsfyp8s1kkjjp48w7j3i5cf6zsp46vdwiifj64yfmq7yi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/insert-shebang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/insert-shebang";
           sha256 = "0z88l1q925v9lwzr6nas9qjy0f57qxilg6smgpx9wj6lll3f7p5v";
           name = "insert-shebang";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/insert-shebang";
+          homepage = "https://melpa.org/#/insert-shebang";
           license = lib.licenses.free;
         };
       }) {};
@@ -30056,13 +31227,13 @@
           sha256 = "112s3c0ii8zjc6vlj2im2qd2pl3hb95pq4zibm86gjpw428wd8iy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/insfactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/insfactor";
           sha256 = "0c6q1d864qc78sqk9iadjpd01xc7myipgnf89pqa2z75yprndvyn";
           name = "insfactor";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/insfactor";
+          homepage = "https://melpa.org/#/insfactor";
           license = lib.licenses.free;
         };
       }) {};
@@ -30076,34 +31247,34 @@
           sha256 = "0krscid3yz2b7kv75gd9fs92zgfl7pnl77dbp5gycv5rmw5mivp8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/instapaper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/instapaper";
           sha256 = "1yibdpj3lx6vr33s75s1y415lxqljrk7pqc901f8nfa01kca7axn";
           name = "instapaper";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/instapaper";
+          homepage = "https://melpa.org/#/instapaper";
           license = lib.licenses.free;
         };
       }) {};
     interaction-log = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "interaction-log";
-        version = "20150603.1210";
+        version = "20160305.701";
         src = fetchFromGitHub {
           owner = "michael-heerdegen";
           repo = "interaction-log.el";
-          rev = "977a3d276b73a4e239addc6c30214bc55ac6fd1f";
-          sha256 = "0jdm4xjzpl5dr5s8n2hhd5md6hfl6m6v10nwd1n54pb7bv98aqsl";
+          rev = "0f2d773269d1f7b93c9281226719113f5410cbd0";
+          sha256 = "0mvhydb4lfm2kazmb7fab8zh7sd8l9casghn8wl42mqji3v7lfwh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/interaction-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/interaction-log";
           sha256 = "1r9qbvgssc2zdwgwmmwv5kapvmg1y3px7268gkiakkfanw3kqk6j";
           name = "interaction-log";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/interaction-log";
+          homepage = "https://melpa.org/#/interaction-log";
           license = lib.licenses.free;
         };
       }) {};
@@ -30118,13 +31289,13 @@
           sha256 = "1qs6j9cz152wfy54c5d1a558l0df6wxv3djlvfl2mx58wf0sk73h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/interleave";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/interleave";
           sha256 = "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy";
           name = "interleave";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/interleave";
+          homepage = "https://melpa.org/#/interleave";
           license = lib.licenses.free;
         };
       }) {};
@@ -30139,13 +31310,13 @@
           sha256 = "1zv6m24ryls9hvla3hf8wzp6r7fzbxa1lzr1mb0wz0s292l38wjz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/interval-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/interval-list";
           sha256 = "0926z3lxkmpxalpq7hj355cjzbgpdiw7z4s8xdrpa1pi818d35zf";
           name = "interval-list";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/interval-list";
+          homepage = "https://melpa.org/#/interval-list";
           license = lib.licenses.free;
         };
       }) {};
@@ -30160,13 +31331,13 @@
           sha256 = "0fqnn9xhrc9hkaiziafjgg288l6m05416z9kz8l5845fnqsb7pb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/interval-tree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/interval-tree";
           sha256 = "13zynac3h50x68f1ja72kqdrapjks2zmgqd4g7qwscq92mmh60i9";
           name = "interval-tree";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/interval-tree";
+          homepage = "https://melpa.org/#/interval-tree";
           license = lib.licenses.free;
         };
       }) {};
@@ -30181,13 +31352,13 @@
           sha256 = "10xpxmbzhmi0lmby2rpmxrbr3qf1vlbif2inmfsvkj85wyh8a7rp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/io-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/io-mode";
           sha256 = "1fpiml7lvbl4s2xw4wk2y10iifvfza24kd9j8qvi1bgd85qkx42q";
           name = "io-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/io-mode";
+          homepage = "https://melpa.org/#/io-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -30202,13 +31373,13 @@
           sha256 = "1ard88kc13c57y9zdkyr012w8rdrwahz8a3fb5v6hwqymg16m20s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/io-mode-inf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/io-mode-inf";
           sha256 = "0hwhvf1qwkmzzlzdda1flw6p1jjh9rzxsfwm2sc4795ac2xm6dhc";
           name = "io-mode-inf";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/io-mode-inf";
+          homepage = "https://melpa.org/#/io-mode-inf";
           license = lib.licenses.free;
         };
       }) {};
@@ -30223,13 +31394,13 @@
           sha256 = "1rz5wf19lg1lnm0h73ynhb0vl3c99k7vpipay2f8jls24pv60bra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ioccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ioccur";
           sha256 = "1a9iy6x4lkm4wgkcb0pv86c2kvpq8ymrc4ssp109r67kwqw7lrr6";
           name = "ioccur";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ioccur";
+          homepage = "https://melpa.org/#/ioccur";
           license = lib.licenses.free;
         };
       }) {};
@@ -30244,13 +31415,13 @@
           sha256 = "14zfxa8fc7h4rkz1hyplwf4q2lga3l5dd7a2xq5kk0kvf2fs4mk3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iodine-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/iodine-theme";
           sha256 = "05mnq0bgcla0pxsgywpvcdgd4sk2xr7bjlp87l0dx8j121vqripj";
           name = "iodine-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/iodine-theme";
+          homepage = "https://melpa.org/#/iodine-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -30265,13 +31436,13 @@
           sha256 = "043dnij48zdyg081sa7y64lm35z7zvrv8gcymv3l3a98r1yhy3v6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iplayer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/iplayer";
           sha256 = "0wnxvdlnvlmspqsaqx0ldw8j03qjckkqzvx3cbpc2yfs55pm3p7r";
           name = "iplayer";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/iplayer";
+          homepage = "https://melpa.org/#/iplayer";
           license = lib.licenses.free;
         };
       }) {};
@@ -30286,13 +31457,13 @@
           sha256 = "0skyd9c7pz68v17aj3h47ralszbmc4gqg552q8jpimcjd1lacc7l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ipretty";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ipretty";
           sha256 = "1zysip6cb8s4nzsxiwk052gq6higz2xnd376r9wxmgj7w8him2c4";
           name = "ipretty";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ipretty";
+          homepage = "https://melpa.org/#/ipretty";
           license = lib.licenses.free;
         };
       }) {};
@@ -30307,13 +31478,13 @@
           sha256 = "1cy9xwhswj9vahg8zr16r2crm2mm3vczqs73gc580iidasb1q1i2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ir-black-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ir-black-theme";
           sha256 = "1qpq9zbv63ywzk5mlr8x53g3rn37k0mdv6x1l1hcd90gka7vga9v";
           name = "ir-black-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ir-black-theme";
+          homepage = "https://melpa.org/#/ir-black-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -30328,13 +31499,13 @@
           sha256 = "1ch610b3d0x3nxglp749305syliivamc108rgv9if4ihb67gp8b5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iregister";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/iregister";
           sha256 = "0iq1nlj5czi4nblrszfv3grkl1fni7blh8bhcfccidms8v9r3mdm";
           name = "iregister";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/iregister";
+          homepage = "https://melpa.org/#/iregister";
           license = lib.licenses.free;
         };
       }) {};
@@ -30342,38 +31513,38 @@
         pname = "irfc";
         version = "20130824.707";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/irfc.el";
+          url = "https://www.emacswiki.org/emacs/download/irfc.el";
           sha256 = "197ybqwbj8qjh2p9pkf5mvqnrkpcgmv8c5s2gvl6msyrabk0mnca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/irfc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/irfc";
           sha256 = "0186l6zk5l427vjvmjvi0xhwk8a4fjhsvw9kd0yw88q3ggpdl25i";
           name = "irfc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/irfc";
+          homepage = "https://melpa.org/#/irfc";
           license = lib.licenses.free;
         };
       }) {};
     irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "irony";
-        version = "20160203.1407";
+        version = "20160317.1727";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "7ff87b256650b553dcb0fdd3708d7e3b3531e3c1";
-          sha256 = "11mwl22i4r9an992xprzyi24rc3ci3l13s461yjavkgl3nbnlf7q";
+          rev = "3d64dec24b01bc582801db537ed12a5812f4f0ee";
+          sha256 = "1y72xhs978ah53fmp10pa8riscx94y9bjvr26wk2f3zc94c6cq3d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/irony";
           sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a";
           name = "irony";
         };
         packageRequires = [ cl-lib json ];
         meta = {
-          homepage = "http://melpa.org/#/irony";
+          homepage = "https://melpa.org/#/irony";
           license = lib.licenses.free;
         };
       }) {};
@@ -30388,13 +31559,13 @@
           sha256 = "01fjpfixfcca01a5fnnpd2wga4j30p0kwhbai25prvib4qcp1kqn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/irony-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/irony-eldoc";
           sha256 = "03m0h13jd37vfvn4mavaq3vbzx4x0lklbs0mbc29zaz8pwqlcwz6";
           name = "irony-eldoc";
         };
         packageRequires = [ cl-lib emacs irony ];
         meta = {
-          homepage = "http://melpa.org/#/irony-eldoc";
+          homepage = "https://melpa.org/#/irony-eldoc";
           license = lib.licenses.free;
         };
       }) {};
@@ -30409,31 +31580,31 @@
           sha256 = "17d0816awadvsw1qc7r0p6ira75jmgxaj9hsk9ypayxsaf6ynyrb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/isearch-dabbrev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/isearch-dabbrev";
           sha256 = "1hl7zl5vjcsk3z452874g4nfcnmna8m2242dc9cgpl5jddzwqa7x";
           name = "isearch-dabbrev";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/isearch-dabbrev";
+          homepage = "https://melpa.org/#/isearch-dabbrev";
           license = lib.licenses.free;
         };
       }) {};
     isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "isearch-plus";
-        version = "20160212.1523";
+        version = "20160227.1617";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/isearch+.el";
-          sha256 = "0rfvaz0fa458nk5lyb87vhaxpygbkh4wzfk9ynghp5778faqabgq";
+          url = "https://www.emacswiki.org/emacs/download/isearch+.el";
+          sha256 = "00m4kh2j4a2rqlagz4b5wdhnrk266whbncwkjbxx0rlxzvsi5skh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/isearch+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/isearch+";
           sha256 = "1rzlsf08nmc3p3vhpwbiy8cgnnl2c10xrnsr2rlpv0g2kxkrd69r";
           name = "isearch-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/isearch+";
+          homepage = "https://melpa.org/#/isearch+";
           license = lib.licenses.free;
         };
       }) {};
@@ -30441,17 +31612,17 @@
         pname = "isearch-prop";
         version = "20151231.1607";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/isearch-prop.el";
+          url = "https://www.emacswiki.org/emacs/download/isearch-prop.el";
           sha256 = "1i1ypganr2ivwgi0vgjihgk1s4yglwj8nbqnqjiiwdywf8g5hcmr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/isearch-prop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/isearch-prop";
           sha256 = "1z9y88b23m4ffil8p3wcq61q1fiyqjxphyd3wacs5fnc53mdzad9";
           name = "isearch-prop";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/isearch-prop";
+          homepage = "https://melpa.org/#/isearch-prop";
           license = lib.licenses.free;
         };
       }) {};
@@ -30466,13 +31637,13 @@
           sha256 = "09z49850c32x0rchxg203cxg504xi2b6cjgnd0i4axcs5fmq7gv9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/isearch-symbol-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/isearch-symbol-at-point";
           sha256 = "0j5fr7qdvpd5b096h5a83fz8sh9wybdnsgix6v94gv8lkzdsqkr8";
           name = "isearch-symbol-at-point";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/isearch-symbol-at-point";
+          homepage = "https://melpa.org/#/isearch-symbol-at-point";
           license = lib.licenses.free;
         };
       }) {};
@@ -30487,13 +31658,13 @@
           sha256 = "022j39r2vvppnh3p5rp9i4cgc3lg24ksjcmcjmbmna1vf624izn0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/isend-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/isend-mode";
           sha256 = "0sk80a08ny9vqw94klqfgii297qm633000wlcldha76ip8viikdv";
           name = "isend-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/isend-mode";
+          homepage = "https://melpa.org/#/isend-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -30508,13 +31679,13 @@
           sha256 = "09hx28lmldm7z3x22a0qx34id09fdp3z61pdr61flgny213q1ach";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/isgd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/isgd";
           sha256 = "0yc9mkjzj3w64f48flnjvd193mk9gndrrqbxz3cvmvq3vgahhzyi";
           name = "isgd";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/isgd";
+          homepage = "https://melpa.org/#/isgd";
           license = lib.licenses.free;
         };
       }) {};
@@ -30529,13 +31700,13 @@
           sha256 = "0992lzgar0kz9i1sk5vz17q9qzfgl8fkyxa1q0hmhgnpjf503cnj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iss-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/iss-mode";
           sha256 = "1my4vi1x07hg0dva97i685lx6m6fcbfk16j1zy93zriyd7z5plkc";
           name = "iss-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/iss-mode";
+          homepage = "https://melpa.org/#/iss-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -30550,34 +31721,55 @@
           sha256 = "1az986mk8j8hyvr1mi9hirixwcd73jcqkjsw4xy34vjbwxi122r9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/itail";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/itail";
           sha256 = "0mcyly88a3c15hl3wll56agpdsyvd26r501h0v64lasfr4k634m7";
           name = "itail";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/itail";
+          homepage = "https://melpa.org/#/itail";
+          license = lib.licenses.free;
+        };
+      }) {};
+    itasca = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "itasca";
+        version = "20160406.742";
+        src = fetchFromGitHub {
+          owner = "jkfurtney";
+          repo = "itasca-emacs";
+          rev = "bf0b6a66b57c8a0e7d692d306a50b587a2da8284";
+          sha256 = "1174f75p3rkq812gl2rs1x51nqbz4fqxwsbrd7djh1vkd2zii3aw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/itasca";
+          sha256 = "01075ad0sb5q7aql6j5wmjdk2qhdgbbm5xb0ikrnl7rzc1afvv6j";
+          name = "itasca";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/itasca";
           license = lib.licenses.free;
         };
       }) {};
     iterator = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "iterator";
-        version = "20150321.2325";
+        version = "20160406.1406";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "iterator";
-          rev = "7bd349d559a6e1c3da575e579a7cb35a7bee9190";
-          sha256 = "08gagq74702x65dy75n2f53fsh806nppnidim9z6ycp8qw1ibyfp";
+          rev = "1523f1dcbf4086e91561ec5dec4c2f6fcba778bd";
+          sha256 = "006lw8zjxz0702wlrs0nb0ijwh5air3yc3cam7dbkyy7mh632vhi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iterator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/iterator";
           sha256 = "17q10fw6y0icsv6vv9n968bwmbjlihrpkkyw62d1kfxhs9yw659z";
           name = "iterator";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/iterator";
+          homepage = "https://melpa.org/#/iterator";
           license = lib.licenses.free;
         };
       }) {};
@@ -30592,13 +31784,13 @@
           sha256 = "12nqpzcmz724wpk8p16lc3z26rxma3wp6pf6dvrsqagnlixrs9si";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ivariants";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ivariants";
           sha256 = "00fgcm62g4fw4306lw9ld2k7w0c358fcbkxn969k5p009g7pk5bw";
           name = "ivariants";
         };
         packageRequires = [ emacs ivs-edit ];
         meta = {
-          homepage = "http://melpa.org/#/ivariants";
+          homepage = "https://melpa.org/#/ivariants";
           license = lib.licenses.free;
         };
       }) {};
@@ -30613,13 +31805,55 @@
           sha256 = "1926pyfsbr6j7cn3diq8ibs0db94rgsf0aifvbqrqp4grs85pkva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ivs-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ivs-edit";
           sha256 = "0gzhvzrfk17j2vwlg82f5ifk4dcfc1yv7barcij38ckran8cqmb2";
           name = "ivs-edit";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ivs-edit";
+          homepage = "https://melpa.org/#/ivs-edit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ivy";
+        version = "20160425.507";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "swiper";
+          rev = "c24a3728538dd7d11de9f141b3ad1d8e0996c330";
+          sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ivy";
+          sha256 = "1w6dh05k1m1b1m3qy1mhfrl9rck0h1x6kh2b2llidwbv346wp17g";
+          name = "ivy";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
+    melpaBuild {
+        pname = "ivy-bibtex";
+        version = "20160422.1800";
+        src = fetchFromGitHub {
+          owner = "tmalsburg";
+          repo = "helm-bibtex";
+          rev = "62593c6289a3d17566edb1aa8ef4700bc83e9df7";
+          sha256 = "1zrs1gk95mna1kipgrq8mfhk0gqimvsb4b583f900fh86019nn1l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ivy-bibtex";
+          sha256 = "0qni48s09lgzqr98r49dhrzpfqp9yfwga11h7vhqclscjvlalpc2";
+          name = "ivy-bibtex";
+        };
+        packageRequires = [ biblio cl-lib dash f parsebib s swiper ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-bibtex";
           license = lib.licenses.free;
         };
       }) {};
@@ -30634,31 +31868,34 @@
           sha256 = "069alh9vs6is3hvbwxbwr9g8qq9md5c92wg5bfswi99yciqdvc4i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ix";
           sha256 = "1fl76dk8vgw3mrh5iz99lrsllwya6ij9d1lj3szcrs4qnj0b5ql3";
           name = "ix";
         };
         packageRequires = [ grapnel ];
         meta = {
-          homepage = "http://melpa.org/#/ix";
+          homepage = "https://melpa.org/#/ix";
           license = lib.licenses.free;
         };
       }) {};
-    iy-go-to-char = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    iy-go-to-char = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "iy-go-to-char";
-        version = "20141029.1049";
-        src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/iy-go-to-char.el";
-          sha256 = "19l9d5gp1xj40iyy35r8hh7v6bjnzjx7pb8dvwrmndzg0rlsp7mi";
+        version = "20141029.1046";
+        src = fetchFromGitHub {
+          owner = "doitian";
+          repo = "iy-go-to-char";
+          rev = "04ab4f5f3a241cbbc9b8c178a22b412a62f632f9";
+          sha256 = "0bcm3y3qvsrk7gd23xfzz5bgcnm3h4l63w9hv8cr9n86sm8475m1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iy-go-to-char";
-          sha256 = "055qj2pc32l824vyjl2w2j8c3rpd9g4x0sazi8svqf923lgcs5s8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/iy-go-to-char";
+          sha256 = "10szn9y7gl8947p3f9w6p6vzjf1a9cjif9mbj3qdqx4vbsl9mqpz";
           name = "iy-go-to-char";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/iy-go-to-char";
+          homepage = "https://melpa.org/#/iy-go-to-char";
           license = lib.licenses.free;
         };
       }) {};
@@ -30673,13 +31910,13 @@
           sha256 = "07kbicf760nw4qlb2lkf1ns8yzqy0r5jqqwqjbsnqxx4sm52hml9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/j-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/j-mode";
           sha256 = "0f9lsr9hjhdvmzx565ivlncfzb4iq4rjjn6a41053cjy50bl066i";
           name = "j-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/j-mode";
+          homepage = "https://melpa.org/#/j-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -30690,16 +31927,16 @@
         src = fetchgit {
           url = "git://git.code.sf.net/p/emacs-jabber/git";
           rev = "98dc8e429ba6f79065f1c9fc3878d92314d4b510";
-          sha256 = "994d5c2d917a2874c660ec30827d041ee1f1be55b4d8130cb7a780d60c90158d";
+          sha256 = "138mj06dd057nw617n5lanzg3q8y0iyq4c7cc3378a3sj4nmqkcr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jabber";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jabber";
           sha256 = "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8";
           name = "jabber";
         };
         packageRequires = [ fsm ];
         meta = {
-          homepage = "http://melpa.org/#/jabber";
+          homepage = "https://melpa.org/#/jabber";
           license = lib.licenses.free;
         };
       }) {};
@@ -30714,13 +31951,13 @@
           sha256 = "0yv86nadp6dfzl05vhk8c1kahg2pcrhfmd3mnfjrngp7ksac5lyf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jabber-otr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jabber-otr";
           sha256 = "114z5bwhkza03yvfa4nmicaih2jdq83lh6micxjimpddsc8fjgi0";
           name = "jabber-otr";
         };
         packageRequires = [ emacs jabber ];
         meta = {
-          homepage = "http://melpa.org/#/jabber-otr";
+          homepage = "https://melpa.org/#/jabber-otr";
           license = lib.licenses.free;
         };
       }) {};
@@ -30731,16 +31968,16 @@
         src = fetchgit {
           url = "https://bitbucket.org/sbarbit/jack-connect";
           rev = "b00658dfe3d5d67431c18ffa693d5a3705067ba0";
-          sha256 = "7036a0eddf25a2274a6fd1584ff497d2b8078869fa6cc9d61504e6540ff863a8";
+          sha256 = "1a33z07m9rh42pbcjv7sd640gf6jjzs4yn6idx52g8i5vzns0dkh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jack-connect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jack-connect";
           sha256 = "1ssl126wihaf8m2f6ms0l5ai6pz5wn348a09k6l0h3jfww032g1q";
           name = "jack-connect";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jack-connect";
+          homepage = "https://melpa.org/#/jack-connect";
           license = lib.licenses.free;
         };
       }) {};
@@ -30755,34 +31992,34 @@
           sha256 = "1q6wpjb7vhsy92li6fag34pwyil4zvcchbvfjml612aaykiys506";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jade-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jade-mode";
           sha256 = "156j0d9wx6hrhph0nsjsi1jha4h65rcbrbff1j2yr8vdsszjrs94";
           name = "jade-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jade-mode";
+          homepage = "https://melpa.org/#/jade-mode";
           license = lib.licenses.free;
         };
       }) {};
     jammer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jammer";
-        version = "20151213.814";
+        version = "20160310.259";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "jammer";
-          rev = "1ba232b71507b468c60dc53c2bc8888bef36c858";
-          sha256 = "0x0vz7m9kn7b2aiqvrdqx8qh84ynbpzy2asz2b18l47bcwa7r5bh";
+          rev = "48aa795df6df7ae6484518bcd0398293ca49d7c6";
+          sha256 = "1gnj8vmpxds2wdkz49swiby5vq2hvbf64q5hhvwymfdvwlk54v55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jammer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jammer";
           sha256 = "01c4bii7gswhp6z9dgx4bhvsywiwbbdv7mg1zj6vp1530l74zx6z";
           name = "jammer";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jammer";
+          homepage = "https://melpa.org/#/jammer";
           license = lib.licenses.free;
         };
       }) {};
@@ -30797,13 +32034,13 @@
           sha256 = "1mwm9wpnxqq3nw7fl0jf40a92ha51yd95vvr58zllhbxdpy3q9pv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/japanese-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/japanese-holidays";
           sha256 = "0pxpkikkn2ys0kgf3lbrdxv8iym50h5ik2xzza0qk7cw1v93jza9";
           name = "japanese-holidays";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/japanese-holidays";
+          homepage = "https://melpa.org/#/japanese-holidays";
           license = lib.licenses.free;
         };
       }) {};
@@ -30818,13 +32055,13 @@
           sha256 = "1lrsm282lhp7pf0gwr3aad2228lvpqnqs1qdv2xk0zljqnqc0bhx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/japanlaw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/japanlaw";
           sha256 = "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa";
           name = "japanlaw";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/japanlaw";
+          homepage = "https://melpa.org/#/japanlaw";
           license = lib.licenses.free;
         };
       }) {};
@@ -30839,13 +32076,13 @@
           sha256 = "0xmv7gw5xms6nhjcl51cw33yvjgw0c6bpnlyca3195x7g34sg1zj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jape-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jape-mode";
           sha256 = "1gd685r86h0kr36msw81gfgwv7d35hihz6h0jkc6vd22wf6qc3ly";
           name = "jape-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jape-mode";
+          homepage = "https://melpa.org/#/jape-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -30860,13 +32097,13 @@
           sha256 = "0nydj0y58yhfh16492q5gzkkz7qrxbdhp4gh2xbiykcbynygj2mq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jar-manifest-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jar-manifest-mode";
           sha256 = "0kx358m3p23r8m7z45454i62ijmdlf4mljlbqc20jkihfanr6wqd";
           name = "jar-manifest-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jar-manifest-mode";
+          homepage = "https://melpa.org/#/jar-manifest-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -30881,13 +32118,13 @@
           sha256 = "1zcrxijcwqfs6r1cd6w4jq8g3ly0a69nf0cbx93w5v86x2kjpz0l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jasminejs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jasminejs-mode";
           sha256 = "1a70j3aglrwmaw9g8m99sxad2vs53y4swxh97gqjsgx1rrx03g52";
           name = "jasminejs-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jasminejs-mode";
+          homepage = "https://melpa.org/#/jasminejs-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -30902,55 +32139,55 @@
           sha256 = "1bv0al89wlwdv3bhasxnwhsv84phgnixclgrh4l52385rjn8v53f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jaunte";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jaunte";
           sha256 = "0chqiai7fv1idga71gc5dw4rdv1rblg5rrbdijh3glyi8yfr4snf";
           name = "jaunte";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jaunte";
+          homepage = "https://melpa.org/#/jaunte";
           license = lib.licenses.free;
         };
       }) {};
     java-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
     melpaBuild {
         pname = "java-imports";
-        version = "20160127.929";
+        version = "20160311.1715";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "emacs-java-imports";
-          rev = "42e1f92dd60d3adb69d6fac4c59af49d6ab2ccfe";
-          sha256 = "0d8r7pw6v2b3b6brspkpra7q7fmmjh6zm23gmnhdrk72f37fgzdz";
+          rev = "f1631adacdd9fcb7a92ee4fdfb9e592a1a9c3b0b";
+          sha256 = "1wk9i43b147bjcvhq27vcqxi6y1yl6w3n4i2sw3krk4vxcm1mwnm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/java-imports";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/java-imports";
           sha256 = "1waz6skyrm1n8wpc0pwa652l11wz8qz1m89mqxk27k3lwyd84n98";
           name = "java-imports";
         };
         packageRequires = [ emacs pcache s ];
         meta = {
-          homepage = "http://melpa.org/#/java-imports";
+          homepage = "https://melpa.org/#/java-imports";
           license = lib.licenses.free;
         };
       }) {};
     java-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "java-snippets";
-        version = "20140728.36";
+        version = "20160328.2210";
         src = fetchFromGitHub {
           owner = "nekop";
           repo = "yasnippet-java-mode";
-          rev = "701e84d91d6e8bf53c0088687ee385c1954792d8";
-          sha256 = "09pa1hmk0dyh7vw0lb9awyrvdarakgaxn66gag5fzbg5vgdfz32i";
+          rev = "de118b991a1a770283777146c7b437ee1a1e4f01";
+          sha256 = "0w67vjpazbrgd9j5xzsrj3m45iw6lyqkgxx1ap5afvgyn5hqhkih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/java-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/java-snippets";
           sha256 = "0bsmp6sc3khdadkmwqy8khz8kzqijcsv70gimm2cs1kwnbyj6pfp";
           name = "java-snippets";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/java-snippets";
+          homepage = "https://melpa.org/#/java-snippets";
           license = lib.licenses.free;
         };
       }) {};
@@ -30965,13 +32202,13 @@
           sha256 = "16gywcma1s8kslwznlxwlx0xj0gs5g31637kb74vfdplk48f04zj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/javadoc-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/javadoc-lookup";
           sha256 = "1fffs0iqkk9rg5vbxifvn09j4i2751p81bzcvy5fslr3r1r2nv79";
           name = "javadoc-lookup";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/javadoc-lookup";
+          homepage = "https://melpa.org/#/javadoc-lookup";
           license = lib.licenses.free;
         };
       }) {};
@@ -30986,13 +32223,13 @@
           sha256 = "070r4mg4v937n4h2bmzdbn3vsmmq7ijz69nankqs761jxv5gcwlg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/javap-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/javap-mode";
           sha256 = "19p39l4nwgxm52yimy4j6l43845cpk8g5qdrldlwfxd7dvay09ay";
           name = "javap-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/javap-mode";
+          homepage = "https://melpa.org/#/javap-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -31007,97 +32244,97 @@
           sha256 = "1430xwd86fdlv1gzkdlp9a0x3w4blbplw24z0m7y8b0j9rhl4fka";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jaword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jaword";
           sha256 = "05pzh99zfl8n3p6lxdd9abr52m24hqcb105458i1cy0ra840bf4d";
           name = "jaword";
         };
         packageRequires = [ tinysegmenter ];
         meta = {
-          homepage = "http://melpa.org/#/jaword";
+          homepage = "https://melpa.org/#/jaword";
           license = lib.licenses.free;
         };
       }) {};
     jazz-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jazz-theme";
-        version = "20150910.1044";
+        version = "20160412.1236";
         src = fetchFromGitHub {
           owner = "donderom";
           repo = "jazz-theme";
-          rev = "b9f66600fe33d25a230ed26a69f3abaaca03b453";
-          sha256 = "00havgs6xc44plnr3vbs13xxiwygr93izm6nx4y98zhcv389ajb0";
+          rev = "da91369cbf72b08cd11f6f3dee843ff3efe0fed7";
+          sha256 = "0dikmd1w6jh152hvawgvzlpv87xqnf669a8x427rbshnbj2bly64";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jazz-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jazz-theme";
           sha256 = "0ad8kvrmd3gyb8wfghcl4r3kwzplk5gxlw3p23wsbx6c2xq6xr7g";
           name = "jazz-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jazz-theme";
+          homepage = "https://melpa.org/#/jazz-theme";
           license = lib.licenses.free;
         };
       }) {};
     jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jbeans-theme";
-        version = "20160218.1012";
+        version = "20160406.1457";
         src = fetchFromGitHub {
           owner = "synic";
           repo = "jbeans-emacs";
-          rev = "25007aa6c241b8891a5609cc05d29e94442f7934";
-          sha256 = "0mmvq3kp90fllj3ix0iqbnmpfmzr1ykhpz5q066930kjlgz25nvp";
+          rev = "b2ecf9bfad26a15afc75bfae1db097baa5c29f03";
+          sha256 = "1gns0y05kyxl2fcyiawgdx2hi0vslz97kvirbckg19id50cv9ac1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jbeans-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jbeans-theme";
           sha256 = "0y7ccycfnpykgzr88968w7dl45qazf8b9zlf7ydw3ghkl4f6lbwl";
           name = "jbeans-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/jbeans-theme";
+          homepage = "https://melpa.org/#/jbeans-theme";
           license = lib.licenses.free;
         };
       }) {};
     jdee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jdee";
-        version = "20160207.228";
+        version = "20160304.736";
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "0296ef1c25c0d75ed5ac1bb951e0d82d1a85c05e";
-          sha256 = "04l2p1lhg88jhnsi1v4a5rqra6fkwbhnyk2vc94j7j6gzzzxg71l";
+          rev = "df9716c27740d4dd0a508bc2948fb633d1d679ee";
+          sha256 = "01dcxf47qlp089sf3b23kzaad7zrxzgcxf4s2awcj69ips8zkbik";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jdee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jdee";
           sha256 = "1yn8vszj0hs2jwwd4x55f11hs2wrxjjvxpngsj7lkcwax04kkvq3";
           name = "jdee";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/jdee";
+          homepage = "https://melpa.org/#/jdee";
           license = lib.licenses.free;
         };
       }) {};
     jedi = callPackage ({ auto-complete, emacs, fetchFromGitHub, fetchurl, jedi-core, lib, melpaBuild }:
     melpaBuild {
         pname = "jedi";
-        version = "20151214.905";
+        version = "20160425.2356";
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "emacs-jedi";
-          rev = "e6b0139cba46bd4e53afaf044bc84c618b8afb38";
-          sha256 = "1zh7jbks0c6swzdm0wwxv4bbpvh15ab7bgs0w7ca1dnlvm07ybjm";
+          rev = "1521c525483263b7241c4881b15299b38700070c";
+          sha256 = "1xj6rswsnicwcgcqid4qji1x4yhdhrgvvjdd3jhb4z8mfahpnpp6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jedi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jedi";
           sha256 = "1777060q25k9n2g6h1lm5lkki900pmjqkxq72mrk3j19jr4pk9m4";
           name = "jedi";
         };
         packageRequires = [ auto-complete emacs jedi-core ];
         meta = {
-          homepage = "http://melpa.org/#/jedi";
+          homepage = "https://melpa.org/#/jedi";
           license = lib.licenses.free;
         };
       }) {};
@@ -31108,17 +32345,17 @@
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "emacs-jedi";
-          rev = "e6b0139cba46bd4e53afaf044bc84c618b8afb38";
-          sha256 = "1zh7jbks0c6swzdm0wwxv4bbpvh15ab7bgs0w7ca1dnlvm07ybjm";
+          rev = "1521c525483263b7241c4881b15299b38700070c";
+          sha256 = "1xj6rswsnicwcgcqid4qji1x4yhdhrgvvjdd3jhb4z8mfahpnpp6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jedi-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jedi-core";
           sha256 = "0pzi32zdb4g9n4kvpmkdflmqypa7nckmnjq60a3ngym4wlzbb32f";
           name = "jedi-core";
         };
         packageRequires = [ cl-lib emacs epc python-environment ];
         meta = {
-          homepage = "http://melpa.org/#/jedi-core";
+          homepage = "https://melpa.org/#/jedi-core";
           license = lib.licenses.free;
         };
       }) {};
@@ -31133,13 +32370,13 @@
           sha256 = "1pgi5vnwz5agrpvy7nwg3gv2nfbbmimhk8dxkg81k6yf1iiqxcap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jedi-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jedi-direx";
           sha256 = "1y4n4c2imnm3f1q129bvbi4gzk0iazd8qq959gvq9j9fl1aziiz1";
           name = "jedi-direx";
         };
         packageRequires = [ direx jedi ];
         meta = {
-          homepage = "http://melpa.org/#/jedi-direx";
+          homepage = "https://melpa.org/#/jedi-direx";
           license = lib.licenses.free;
         };
       }) {};
@@ -31154,13 +32391,13 @@
           sha256 = "0rx72rid7922mhw21j85kxmx0fhpkmkv9jvxmj9izy01xnjbk00c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jekyll-modes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jekyll-modes";
           sha256 = "1305f1yg1mamyw3bkzrk5q3q58ihs8f5k9vjknsww5xvrzz3r1si";
           name = "jekyll-modes";
         };
         packageRequires = [ polymode ];
         meta = {
-          homepage = "http://melpa.org/#/jekyll-modes";
+          homepage = "https://melpa.org/#/jekyll-modes";
           license = lib.licenses.free;
         };
       }) {};
@@ -31175,13 +32412,13 @@
           sha256 = "08ywfmsjv3vjqy95hx095kasy8knh3asl7mrlkgmv9wjwnxw45zs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jenkins";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jenkins";
           sha256 = "0ji42r7p3f3hh643839xf74gb231vr7anycr2xhkga8qy2vwa53s";
           name = "jenkins";
         };
         packageRequires = [ dash emacs json ];
         meta = {
-          homepage = "http://melpa.org/#/jenkins";
+          homepage = "https://melpa.org/#/jenkins";
           license = lib.licenses.free;
         };
       }) {};
@@ -31196,33 +32433,34 @@
           sha256 = "0jayhv8j7b527dimhvcs0d7ax25x7v50dk0k6apisqc23psvkq66";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jenkins-watch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jenkins-watch";
           sha256 = "0brgjgbw804x0gf2vq01yv6bd0ilp3x9kvr1nnsqxb9c03ffmb2m";
           name = "jenkins-watch";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jenkins-watch";
+          homepage = "https://melpa.org/#/jenkins-watch";
           license = lib.licenses.free;
         };
       }) {};
-    jg-quicknav = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild, s }:
+    jg-quicknav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "jg-quicknav";
         version = "20160216.2235";
-        src = fetchgit {
-          url = "https://github.com/jeffgran/jg-quicknav";
+        src = fetchFromGitHub {
+          owner = "jeffgran";
+          repo = "jg-quicknav";
           rev = "1b598ee3d691b68dc64f1727a959eab538893d07";
-          sha256 = "e442217463a1aa1ed4f05415a56d7d36617acfcab85e385b62e28ead06aa9c98";
+          sha256 = "164wm83av3p2c9dkhpmqrb7plq9ngmnsa5aly3a1xam1cds22hp4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jg-quicknav";
-          sha256 = "1v46ck9imffhrmx6s4c3kbi5g5spf2mn2axy5nfpn7q8sc8bf0s3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jg-quicknav";
+          sha256 = "1pxyv1nbnqb0s177kczy6b6q4l8d2r52xqhx2rdb0wxdmp6m5x9c";
           name = "jg-quicknav";
         };
         packageRequires = [ cl-lib s ];
         meta = {
-          homepage = "http://melpa.org/#/jg-quicknav";
+          homepage = "https://melpa.org/#/jg-quicknav";
           license = lib.licenses.free;
         };
       }) {};
@@ -31237,13 +32475,13 @@
           sha256 = "0l26wcy496k6xk7q5sf905xir0p73ziy6c44is77854lv3y0z381";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jinja2-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jinja2-mode";
           sha256 = "0480fh719r4v7xdwyf4jlg1k36y54i5zrv7gxlhfm66pil75zafx";
           name = "jinja2-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jinja2-mode";
+          homepage = "https://melpa.org/#/jinja2-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -31251,17 +32489,17 @@
         pname = "jira";
         version = "20131210.1222";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/jira.el";
+          url = "https://www.emacswiki.org/emacs/download/jira.el";
           sha256 = "18b6hdqk59gnqh4ibq8lj59kbsg5gbyfb7vfcvpgmxjikpl3cgkz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jira";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jira";
           sha256 = "0cf5zgkxagvka5v6scgyxqx4mz1n7lxbynn3gl2a4s9s64jycsy6";
           name = "jira";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jira";
+          homepage = "https://melpa.org/#/jira";
           license = lib.licenses.free;
         };
       }) {};
@@ -31276,13 +32514,13 @@
           sha256 = "1ack7dmapva3wc2gm22prd5wd3cmq19sl4xl9f04a3nk2msr6ksx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jira-markup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jira-markup-mode";
           sha256 = "0f3sw41b4wl0aajq0ap66942rb2015d9iks0ss016jgzashw7zsp";
           name = "jira-markup-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jira-markup-mode";
+          homepage = "https://melpa.org/#/jira-markup-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -31297,13 +32535,13 @@
           sha256 = "0mh7990zqrprsa1g9jzpqm666pynlqd2nh9z236zyzykf8d8il8c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jist";
           sha256 = "11m9li1016cfkm4931h69d7g1dc59lwjl83wy3yipswdg3zlw0ar";
           name = "jist";
         };
         packageRequires = [ dash emacs let-alist magit pkg-info request ];
         meta = {
-          homepage = "http://melpa.org/#/jist";
+          homepage = "https://melpa.org/#/jist";
           license = lib.licenses.free;
         };
       }) {};
@@ -31318,13 +32556,13 @@
           sha256 = "1idby2rjkslw85593qd4zy6an9zz71yzwqc6rck57r54xyfs8mij";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jknav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jknav";
           sha256 = "0c0a8plqrlsw8lhmyj9c1lfkj2b48cjkbw9pna8qcizvwgym9089";
           name = "jknav";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jknav";
+          homepage = "https://melpa.org/#/jknav";
           license = lib.licenses.free;
         };
       }) {};
@@ -31339,34 +32577,34 @@
           sha256 = "1a0091r1xs3fpvg1wynh53xibdsiaf2khz1gp6s8dc45z8r0bclx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jonprl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jonprl-mode";
           sha256 = "0763ad65dmpl2l5lw91mlppfdvrjg6ym45brhi8sdwwri1xnyv9z";
           name = "jonprl-mode";
         };
         packageRequires = [ cl-lib emacs yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/jonprl-mode";
+          homepage = "https://melpa.org/#/jonprl-mode";
           license = lib.licenses.free;
         };
       }) {};
     jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jq-mode";
-        version = "20160217.1831";
+        version = "20160222.640";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "jq-mode";
-          rev = "7f03354a4c1e26796482c39ce543d1d1f075a18d";
-          sha256 = "0ws0297v6sairvsk665wrfzymfi599g5ljshfnpmi81qnnnbwjgf";
+          rev = "ce63cb10e5a69c9017ceccf8adb7ab33450b057e";
+          sha256 = "08wffbljnaxz2sh72vsqpq1lc47mnh4d47fl71dvw4pqs50zp8v0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jq-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jq-mode";
           sha256 = "1xvh641pdkvbppb2nzwn1ljdk7sv6laq29kdv09kxaqd89vm0vin";
           name = "jq-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/jq-mode";
+          homepage = "https://melpa.org/#/jq-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -31381,13 +32619,13 @@
           sha256 = "0gh2bgmsbi9lby89ssvl49kpz07jqrfnyg47g6b9xmf5rw42s1z9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jquery-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jquery-doc";
           sha256 = "0pyg90izdrb9mvpbz9nx21mp8m3svqjnz1jr8i7wqgfjxsxdklxj";
           name = "jquery-doc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jquery-doc";
+          homepage = "https://melpa.org/#/jquery-doc";
           license = lib.licenses.free;
         };
       }) {};
@@ -31402,13 +32640,13 @@
           sha256 = "1f1zad423q5adycbbh62094m622gl8ncwbr8vxad1a6zcga70cgi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js-comint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/js-comint";
           sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1";
           name = "js-comint";
         };
         packageRequires = [ nvm ];
         meta = {
-          homepage = "http://melpa.org/#/js-comint";
+          homepage = "https://melpa.org/#/js-comint";
           license = lib.licenses.free;
         };
       }) {};
@@ -31423,13 +32661,13 @@
           sha256 = "12kwjkhw5x6jb79m49gbypb6br482bpi73788h71lgl5i3g95s5q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/js-doc";
           sha256 = "0nafqgb4kf8jgrb7ijfcvigq8kf043ki89h61izda4hccm3c42pk";
           name = "js-doc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/js-doc";
+          homepage = "https://melpa.org/#/js-doc";
           license = lib.licenses.free;
         };
       }) {};
@@ -31444,13 +32682,13 @@
           sha256 = "0105vx7bc681q9v2x6wj2r63pwp7g0cjjgpg7k4r852zmndfbzsc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js2-closure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/js2-closure";
           sha256 = "19732bf98lk2ah2ssgkr1ngxx7rz3nhsiw84lsfmydb0vvm4fpk7";
           name = "js2-closure";
         };
         packageRequires = [ js2-mode ];
         meta = {
-          homepage = "http://melpa.org/#/js2-closure";
+          homepage = "https://melpa.org/#/js2-closure";
           license = lib.licenses.free;
         };
       }) {};
@@ -31465,55 +32703,55 @@
           sha256 = "1gad5a18m3jfhnklsj0ka3p2wbihh1yvpcn7mwlmm7cjjxcaly9g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js2-highlight-vars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/js2-highlight-vars";
           sha256 = "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475";
           name = "js2-highlight-vars";
         };
         packageRequires = [ js2-mode ];
         meta = {
-          homepage = "http://melpa.org/#/js2-highlight-vars";
+          homepage = "https://melpa.org/#/js2-highlight-vars";
           license = lib.licenses.free;
         };
       }) {};
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20160124.1332";
+        version = "20160409.1313";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "7b430a37d2a77c8bc0f384e11e061e914f2d31de";
-          sha256 = "09hwxh353w6wk47sqx871fn59la7kncqlskxdrz316jyps6kj890";
+          rev = "812df519069555a7b670f6d300239092642aa02e";
+          sha256 = "1j6g801skbx27ajymxlyswlpv6xf06jkih3z51rmjcaq2n55h8r6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js2-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/js2-mode";
           sha256 = "0f9cj3n55qnlifxwk1yp8n1kfd319jf7qysnkk28xpvglzw24yjv";
           name = "js2-mode";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/js2-mode";
+          homepage = "https://melpa.org/#/js2-mode";
           license = lib.licenses.free;
         };
       }) {};
     js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }:
     melpaBuild {
         pname = "js2-refactor";
-        version = "20151029.707";
+        version = "20160315.555";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "js2-refactor.el";
-          rev = "ac3da94a33b714d44d4f0adc670a829fdc522e34";
-          sha256 = "08wxsz90x5zhma3q8kqfd01avhzxjmcrjc95s757l5xaynsc2bly";
+          rev = "30b7d218bde230adef6608de68f936edb7d52beb";
+          sha256 = "04gbap3mfc5r46vdxymfmr15b9zxdzqdddhfg3v327n40n3djrsd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js2-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/js2-refactor";
           sha256 = "09dcfwpxxyw0ffgjjjaaxbsj0x2nwfrmxy1a05h8ba3r3jl4kl1r";
           name = "js2-refactor";
         };
         packageRequires = [ dash js2-mode multiple-cursors s yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/js2-refactor";
+          homepage = "https://melpa.org/#/js2-refactor";
           license = lib.licenses.free;
         };
       }) {};
@@ -31528,13 +32766,13 @@
           sha256 = "137lypg6jwsisn2g5h0wiqh57icj46zv3albxjf2q1k5isszhy1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js3-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/js3-mode";
           sha256 = "12s5qf6zfcv4m5kqxvh9b4zgwf433x39a210d957gjjp5mywbb1r";
           name = "js3-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/js3-mode";
+          homepage = "https://melpa.org/#/js3-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -31549,13 +32787,13 @@
           sha256 = "1bqsv2drhcs8ia7nxss33f80p2mhcl4mr1nalphzw6s1f4mq2sgy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jscs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jscs";
           sha256 = "1yw251f6vpj2bikjw79arywprk8qnmmfcki99mvwnqhsqlv1a8iv";
           name = "jscs";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/jscs";
+          homepage = "https://melpa.org/#/jscs";
           license = lib.licenses.free;
         };
       }) {};
@@ -31570,13 +32808,13 @@
           sha256 = "0h9gx5cl3lashk0n8pv9yzb0mm8dyziddfbwfqfm70638p93ylhc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jsfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jsfmt";
           sha256 = "1syy32sv2d57b3gja0ly65h36mfnyq6hzf5lnnl3r58yvbdzngqd";
           name = "jsfmt";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jsfmt";
+          homepage = "https://melpa.org/#/jsfmt";
           license = lib.licenses.free;
         };
       }) {};
@@ -31591,13 +32829,13 @@
           sha256 = "0sxkp9m68rvff8dbr8jlsx85w5ngifn19lwhcydysm7grbwzrdi3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/json-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/json-mode";
           sha256 = "014j10wgxsqy6d6aksnkz2dr5cmpsi8c7v4a825si1vgb4622a70";
           name = "json-mode";
         };
         packageRequires = [ json-reformat json-snatcher ];
         meta = {
-          homepage = "http://melpa.org/#/json-mode";
+          homepage = "https://melpa.org/#/json-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -31612,13 +32850,13 @@
           sha256 = "05bjyw0hkpiyfadsx3giawykbj4qinfr1ilzd0xvx8akzq2ipq0y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/json-reformat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/json-reformat";
           sha256 = "1m5p895w9qdgb8f67xykhzriribgmp20a1lvj64iap4aam6wp8na";
           name = "json-reformat";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/json-reformat";
+          homepage = "https://melpa.org/#/json-reformat";
           license = lib.licenses.free;
         };
       }) {};
@@ -31633,13 +32871,13 @@
           sha256 = "0xgrb0zfxyfmfnvx1l7ca99lzl6f2qyal798rcra45167c0j0vbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/json-rpc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/json-rpc";
           sha256 = "1v1pfmm9g18p6kgn27q1m1bjgwbzvwfm0jbsxp8gdsssaygky71k";
           name = "json-rpc";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/json-rpc";
+          homepage = "https://melpa.org/#/json-rpc";
           license = lib.licenses.free;
         };
       }) {};
@@ -31654,13 +32892,13 @@
           sha256 = "05zsgnk7grgw9jzwl80h5sxfpifxlr37b4mkbvx7mjq4z14xc2jw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/json-snatcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/json-snatcher";
           sha256 = "0f6j9g3c5fz3wlqa88706cbzinrs3dnfpgsr2d3h3117gic4iwp4";
           name = "json-snatcher";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/json-snatcher";
+          homepage = "https://melpa.org/#/json-snatcher";
           license = lib.licenses.free;
         };
       }) {};
@@ -31675,13 +32913,13 @@
           sha256 = "07yd7sxb5f2mbm2nva7b2nwyxxkmsi2rdd5qig0bq1b2mf3g5l83";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jss";
           sha256 = "050hskqcjz5kc8nni255vj3hc9m936w1rybvg5kqyz4p4lpzj00k";
           name = "jss";
         };
         packageRequires = [ emacs js2-mode websocket ];
         meta = {
-          homepage = "http://melpa.org/#/jss";
+          homepage = "https://melpa.org/#/jss";
           license = lib.licenses.free;
         };
       }) {};
@@ -31696,13 +32934,13 @@
           sha256 = "16jgmabcqrjb3v9c6q711jqn9dna88bmzm4880mdry69ixwcydxy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jst";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jst";
           sha256 = "0hp1f7p6m1gfv1a3plavzkzn87dllb5g2xrgg3mch4qsgdbqx65i";
           name = "jst";
         };
         packageRequires = [ dash emacs f pcache s ];
         meta = {
-          homepage = "http://melpa.org/#/jst";
+          homepage = "https://melpa.org/#/jst";
           license = lib.licenses.free;
         };
       }) {};
@@ -31717,13 +32955,13 @@
           sha256 = "1g648r0wrd8m5ggl5jrplmj7jmr68bh2ykyii5wv30zfba97r1sh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jsx-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jsx-mode";
           sha256 = "1lnjnyn8qf3biqr92z443z6b58dly7glksp1g986vgqzdprq3n1b";
           name = "jsx-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jsx-mode";
+          homepage = "https://melpa.org/#/jsx-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -31733,37 +32971,37 @@
         src = fetchgit {
           url = "git://git.code.sf.net/p/jtags/code";
           rev = "b50daa48510f71e74ce0ec2eb85030896a79cf96";
-          sha256 = "1eedc86541cc3dcb0b0d0c6acc7ddf8b4755c757addb6eacbe33811058f2850f";
+          sha256 = "03w5y9c1109kpsn6xnxdaz3maiwbvxywqshc1l5wngfc85jwiv8y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jtags";
           sha256 = "0in5ybgwmghlpa5d7wz0477ba6n14f1mwp5dxcl4y11f1lsq041r";
           name = "jtags";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jtags";
+          homepage = "https://melpa.org/#/jtags";
           license = lib.licenses.free;
         };
       }) {};
     julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "julia-mode";
-        version = "20160219.1903";
+        version = "20160407.1501";
         src = fetchFromGitHub {
           owner = "JuliaLang";
-          repo = "julia";
-          rev = "772d903709276ef83fe01df9ef17aec70311036f";
-          sha256 = "1d04y5dildjc1zw0i33n0kfds776b2632y2m9layqhm58fiby9d8";
+          repo = "julia-emacs";
+          rev = "4f72dfa5af900212299133170ddefb45ebfafef4";
+          sha256 = "0b6fk40yhzi2iy75gpi7fx3qa6zhr83wgvkmcn140i74f92wc1yk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/julia-mode";
-          sha256 = "0c5bdgh98hw7484s2is84af7hznd8c4z5vlzfd98s8qxi7bldqjm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/julia-mode";
+          sha256 = "0m49v67fs5yq0q3lwkcfmrzsjdzi1qrkfjyvjcdwnfmp29w14kq6";
           name = "julia-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/julia-mode";
+          homepage = "https://melpa.org/#/julia-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -31778,13 +33016,13 @@
           sha256 = "0r4ajn3f1c8n0r831ihvzwyzy94aiv0ijqrwhpq0s85cqvzr7pq8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/julia-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/julia-shell";
           sha256 = "0182irlvk6nn71zk4j8xjgcqp4bxi7a2dbj44frrssy6018cd410";
           name = "julia-shell";
         };
         packageRequires = [ julia-mode ];
         meta = {
-          homepage = "http://melpa.org/#/julia-shell";
+          homepage = "https://melpa.org/#/julia-shell";
           license = lib.licenses.free;
         };
       }) {};
@@ -31799,13 +33037,13 @@
           sha256 = "1f0kai4cz3r25fqlnryyvnyf80cf57xa655dvv1rx8si3xd20x4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jumblr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jumblr";
           sha256 = "1wnawz1m6x95iyzac453p55h7hlr5q0ry5437aqqx0bw7gdwg3dp";
           name = "jumblr";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/jumblr";
+          homepage = "https://melpa.org/#/jumblr";
           license = lib.licenses.free;
         };
       }) {};
@@ -31820,13 +33058,13 @@
           sha256 = "0061hcmj63g13bvacwkmcb5iggwnk27dvb04fz4hihqis6jg01c5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jump";
           sha256 = "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364";
           name = "jump";
         };
         packageRequires = [ findr inflections ];
         meta = {
-          homepage = "http://melpa.org/#/jump";
+          homepage = "https://melpa.org/#/jump";
           license = lib.licenses.free;
         };
       }) {};
@@ -31841,13 +33079,13 @@
           sha256 = "0vpla6lyr30fyq9gi7g9zmnhysbm077m0qgi7w3axppfbxdvg67q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jump-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jump-char";
           sha256 = "0l8zvfwpngkgcxl1a36jwwxdh23hi390mikz7xrq63w5zwm0007n";
           name = "jump-char";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jump-char";
+          homepage = "https://melpa.org/#/jump-char";
           license = lib.licenses.free;
         };
       }) {};
@@ -31862,13 +33100,13 @@
           sha256 = "1s9plmg323m1p625xqnks0yqz0zlsjacdj7pv8f783r0d9jmfq3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jump-to-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jump-to-line";
           sha256 = "09ifhsggl5mrb6l8nqnl38yph0v26v30y98ic8hl23i455hqkkdr";
           name = "jump-to-line";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jump-to-line";
+          homepage = "https://melpa.org/#/jump-to-line";
           license = lib.licenses.free;
         };
       }) {};
@@ -31883,13 +33121,13 @@
           sha256 = "0ykzvy8034mchq6ffyi7vqnwyrj6gnqqgn39ki81pv97qh8hh8yl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jumplist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jumplist";
           sha256 = "06xjg1q8b2fwfhfmdkb76bw2id8pgqc61fmwlgri5746jgdmd7nf";
           name = "jumplist";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/jumplist";
+          homepage = "https://melpa.org/#/jumplist";
           license = lib.licenses.free;
         };
       }) {};
@@ -31904,13 +33142,13 @@
           sha256 = "0k91cdjlpil8npc4d3zsgx2gk41crl7qgm9r85khcgxs59kmkniw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jvm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jvm-mode";
           sha256 = "1r283b4s0pzq4hgwcz5cnhlvdvq4gy0x51g3vp0762s8qx969a5w";
           name = "jvm-mode";
         };
         packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/jvm-mode";
+          homepage = "https://melpa.org/#/jvm-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -31925,13 +33163,13 @@
           sha256 = "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kaesar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kaesar";
           sha256 = "0zhi1dv1ay1azh7afq4x6bdg91clwpsr13nrzy7539yrn9sglj5l";
           name = "kaesar";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/kaesar";
+          homepage = "https://melpa.org/#/kaesar";
           license = lib.licenses.free;
         };
       }) {};
@@ -31946,13 +33184,13 @@
           sha256 = "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kaesar-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kaesar-file";
           sha256 = "0dcizg82maad98mbqqw5lamwz7n2lpai09jsrc66x3wy8k784alc";
           name = "kaesar-file";
         };
         packageRequires = [ kaesar ];
         meta = {
-          homepage = "http://melpa.org/#/kaesar-file";
+          homepage = "https://melpa.org/#/kaesar-file";
           license = lib.licenses.free;
         };
       }) {};
@@ -31967,13 +33205,13 @@
           sha256 = "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kaesar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kaesar-mode";
           sha256 = "0yqnlchbpmhsqc8j531n08vybwa32cy0v9sy4f9fgxa90rfqczry";
           name = "kaesar-mode";
         };
         packageRequires = [ cl-lib kaesar ];
         meta = {
-          homepage = "http://melpa.org/#/kaesar-mode";
+          homepage = "https://melpa.org/#/kaesar-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -31988,13 +33226,13 @@
           sha256 = "0b6af8hnrn0v4z1xpahjfpw5iga2bmgd3qwfn3is2rygsn5rkm40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kakapo-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kakapo-mode";
           sha256 = "0a99cqflpzasl4wcmmf99aj8xgywkym37j7mvnsajrsk5wawdlss";
           name = "kakapo-mode";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/kakapo-mode";
+          homepage = "https://melpa.org/#/kakapo-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -32007,13 +33245,13 @@
           sha256 = "14g0f51jig8b1y6zfaw7b1cp692lddqzkc0ngf4y89sw9gbmsh3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kanban";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kanban";
           sha256 = "1sif2ayb8fq5vjz9lpkaq40aw9wiciz84yipab2qczszlgw1l1hb";
           name = "kanban";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/kanban";
+          homepage = "https://melpa.org/#/kanban";
           license = lib.licenses.free;
         };
       }) {};
@@ -32024,17 +33262,17 @@
         src = fetchFromGitHub {
           owner = "wsgac";
           repo = "kanji-mode";
-          rev = "3caaee58f00f69a8c9ee2491b8a2050add9df962";
-          sha256 = "0vfagfzhh4rkmvjzfhfcm7w3z1x31aqzxwigk5yw9scnfb77pinz";
+          rev = "ce6a755d034311059381c3a2c5a97f2de7f38f20";
+          sha256 = "0rxf44kszxazkpjmccz3wnks7si3g8vsfi2lamwynmksk8sw5d7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kanji-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kanji-mode";
           sha256 = "0nnkv7lp7ks9qhkbhz15ixm53grc2q0xfspzykxi9c4b59kypcq5";
           name = "kanji-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/kanji-mode";
+          homepage = "https://melpa.org/#/kanji-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -32049,13 +33287,13 @@
           sha256 = "0vqjbv3pqlbyibqylfsqqjzkvjhdg01hlxszfblpg72fziyzcci5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kaomoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kaomoji";
           sha256 = "1p61pbqf2lnwr6ryxxc4jkd5bmlgknrc27lg89h3b4pw7k39cqy1";
           name = "kaomoji";
         };
         packageRequires = [ emacs helm-core ];
         meta = {
-          homepage = "http://melpa.org/#/kaomoji";
+          homepage = "https://melpa.org/#/kaomoji";
           license = lib.licenses.free;
         };
       }) {};
@@ -32070,13 +33308,13 @@
           sha256 = "12v242kfcx849j8w95v2g7djh9xqbx8n033iaxyavfxnz0pp7zdl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/karma";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/karma";
           sha256 = "19wl7js7wmw7jv2q3l4r5zl718lhy2a0jhl79k57ihwhxdc58fwc";
           name = "karma";
         };
         packageRequires = [ emacs pkg-info ];
         meta = {
-          homepage = "http://melpa.org/#/karma";
+          homepage = "https://melpa.org/#/karma";
           license = lib.licenses.free;
         };
       }) {};
@@ -32091,31 +33329,31 @@
           sha256 = "1kkzs7nrcr74qn1m456vaj52a9j3ah4biakimz06hls415l56yk9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kerl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kerl";
           sha256 = "0f8n7cm5c432pwj28bcpv2jj5z3br3k164xj6nwfis3dvijwsgss";
           name = "kerl";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/kerl";
+          homepage = "https://melpa.org/#/kerl";
           license = lib.licenses.free;
         };
       }) {};
     key-chord = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "key-chord";
-        version = "20151209.304";
+        version = "20160227.638";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/key-chord.el";
+          url = "https://www.emacswiki.org/emacs/download/key-chord.el";
           sha256 = "03m44pqggfrd53nh9dvpdjgm0rvca34qxmd30hr33hzprzjambxg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/key-chord";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/key-chord";
           sha256 = "0cr9lx1pvr0qc762nn5pbh8w93dx1hh1zzf806cag2b9pgk6d4an";
           name = "key-chord";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/key-chord";
+          homepage = "https://melpa.org/#/key-chord";
           license = lib.licenses.free;
         };
       }) {};
@@ -32130,13 +33368,13 @@
           sha256 = "1is7s50lgn77lxxwgakiaywx6jqdfg8045d18m4zn3ilxg6k8ljf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/key-combo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/key-combo";
           sha256 = "1v8saw92jphvjkyy7j9jx7cxzgisl4zpf4wjzdjfw3la5lz11waf";
           name = "key-combo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/key-combo";
+          homepage = "https://melpa.org/#/key-combo";
           license = lib.licenses.free;
         };
       }) {};
@@ -32151,13 +33389,13 @@
           sha256 = "143nfs8pgi5yy3mjq7nirffplk4vb8kik4q7zypynh2pddip30a4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/key-intercept";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/key-intercept";
           sha256 = "1z776jbpjks5bir6bd0748mlrmz05nf0jy9l4hlmwgyn72dcbx16";
           name = "key-intercept";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/key-intercept";
+          homepage = "https://melpa.org/#/key-intercept";
           license = lib.licenses.free;
         };
       }) {};
@@ -32172,13 +33410,13 @@
           sha256 = "14xk0crl25alcckkcg0wx7gwb65hmicfn01db1zip8swk249g9w3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/key-leap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/key-leap";
           sha256 = "0z1fhpf8g0c4rh3bf8dfmdgyhj5w686kavjr214czaga0x7mwlwj";
           name = "key-leap";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/key-leap";
+          homepage = "https://melpa.org/#/key-leap";
           license = lib.licenses.free;
         };
       }) {};
@@ -32193,34 +33431,34 @@
           sha256 = "05vpydcgiaya35b62cdjxna9y02vnwzzg6p8jh0dkr9k44h4iy3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/key-seq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/key-seq";
           sha256 = "166k6hl9vvsnnksvhrv5cbhv9bdiclnbfv7qf67q4c1an9xzqi74";
           name = "key-seq";
         };
         packageRequires = [ key-chord ];
         meta = {
-          homepage = "http://melpa.org/#/key-seq";
+          homepage = "https://melpa.org/#/key-seq";
           license = lib.licenses.free;
         };
       }) {};
     keychain-environment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "keychain-environment";
-        version = "20150416.1458";
+        version = "20160424.646";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "keychain-environment";
-          rev = "c4c87cf3b3f13c1d73efe8fccf5f2c68ebe04abe";
-          sha256 = "0xm7vybqgglacm0xz6fa7ipfvsx14qqws629gi9i16maxn3by9ci";
+          rev = "1ca091f72ad1d1a7620552289ae43484d853e968";
+          sha256 = "0xgm80dbg45bs3k8psd3pv49z1xbvzm156xs55gmxdzbgxbzpazr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/keychain-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/keychain-environment";
           sha256 = "1w77cg00bwx68h0d6k6r1fzwdwz97q12ch2hmpzjnblqs0i4sv8v";
           name = "keychain-environment";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/keychain-environment";
+          homepage = "https://melpa.org/#/keychain-environment";
           license = lib.licenses.free;
         };
       }) {};
@@ -32235,13 +33473,13 @@
           sha256 = "0dkc51bmix4b8czs2wg6vz8vk32qlll1b9fjmx6xshrxm85cyhvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/keydef";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/keydef";
           sha256 = "0yb2vgj7abyg8j7qmv74nsanv50lf350q1m58rjv8wm31yykg992";
           name = "keydef";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/keydef";
+          homepage = "https://melpa.org/#/keydef";
           license = lib.licenses.free;
         };
       }) {};
@@ -32256,34 +33494,34 @@
           sha256 = "18qiw2324gx5w12pqka9njsysxym8dpglk7dzadg0k1wji73nn6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/keyfreq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/keyfreq";
           sha256 = "1rw6hzmw7h5ngvndy7aa41pq911y2hr9kqc9w4gdd5v2p4ln1qh7";
           name = "keyfreq";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/keyfreq";
+          homepage = "https://melpa.org/#/keyfreq";
           license = lib.licenses.free;
         };
       }) {};
     keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "keymap-utils";
-        version = "20151128.844";
+        version = "20160212.1729";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "keymap-utils";
-          rev = "d5d09bc13cecbe334747be23112c99c4ba9f19c7";
-          sha256 = "07x52cybb0m94wgbi0rw2ldx9zg1i6l309gfmi9c199g1zj4wsh5";
+          rev = "dbb5ec9fa28ff3c0fbb9efcc9f75329a5aca3798";
+          sha256 = "1c4qqfq7c1d31v9ap7fgq019l5vds7jzqq9c2dp4gj7j00d9vvlx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/keymap-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/keymap-utils";
           sha256 = "0nbcwz4nls0pva79lbx91bpzkl38g98yavwkvg2rxbhn9vjbhzs9";
           name = "keymap-utils";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/keymap-utils";
+          homepage = "https://melpa.org/#/keymap-utils";
           license = lib.licenses.free;
         };
       }) {};
@@ -32298,34 +33536,34 @@
           sha256 = "0cm6naqlwk65xy9lwnn5r7m6nc1l7ims2ckydmyzny5ak8y5jbws";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/keyset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/keyset";
           sha256 = "1kfw0pfb6qm2ji1v0kb8xgz8q2yd2k9kxmaz5vxcdixdlax3xiqg";
           name = "keyset";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
-          homepage = "http://melpa.org/#/keyset";
+          homepage = "https://melpa.org/#/keyset";
           license = lib.licenses.free;
         };
       }) {};
     keyword-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "keyword-search";
-        version = "20150911.432";
+        version = "20160415.441";
         src = fetchFromGitHub {
           owner = "keyword-search";
           repo = "keyword-search";
-          rev = "1a01e3d5a43e48701cfab0332876284f5d3a1bba";
-          sha256 = "0zw4klp9ifb6yylr9yab3p3vjv18as6clpg2i3w4r2xah9chxgqq";
+          rev = "8a529ebe3ff43a5b21c5fe05a2afd530e52a8dea";
+          sha256 = "0li7x72ppxjh111njkkrc00lvsfm14h784m6yh3cvgsbx02lywbq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/keyword-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/keyword-search";
           sha256 = "0wvci1v8pblfbdslfzpi46c149y8pi49kza9jf33jzhj357lp5qa";
           name = "keyword-search";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/keyword-search";
+          homepage = "https://melpa.org/#/keyword-search";
           license = lib.licenses.free;
         };
       }) {};
@@ -32340,13 +33578,13 @@
           sha256 = "0xq835xzywks4b4kaz5i0pp759i23kibs5gkvvxasw0dncqh7j5c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kfg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kfg";
           sha256 = "0vvvxl6a4ac27igwmsgzpf0whf9h2pjl9d89fd9fizad6gi8x1fs";
           name = "kfg";
         };
         packageRequires = [ f ];
         meta = {
-          homepage = "http://melpa.org/#/kfg";
+          homepage = "https://melpa.org/#/kfg";
           license = lib.licenses.free;
         };
       }) {};
@@ -32361,13 +33599,13 @@
           sha256 = "0s2hb2lvfmcvm3n1fg4biaafc1p7j7w990d7w15gicaw6rr2j4nr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kibit-helper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kibit-helper";
           sha256 = "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s";
           name = "kibit-helper";
         };
         packageRequires = [ emacs s ];
         meta = {
-          homepage = "http://melpa.org/#/kibit-helper";
+          homepage = "https://melpa.org/#/kibit-helper";
           license = lib.licenses.free;
         };
       }) {};
@@ -32382,13 +33620,13 @@
           sha256 = "0a2jmk4wryngs56rqh6sxiyk5yh25l2qvping86yipic2wia17n8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kill-or-bury-alive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kill-or-bury-alive";
           sha256 = "0mm0m8hpy5v98cap4f0s38dcviirm7s6ra4l94mknyvnx0f73lz8";
           name = "kill-or-bury-alive";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/kill-or-bury-alive";
+          homepage = "https://melpa.org/#/kill-or-bury-alive";
           license = lib.licenses.free;
         };
       }) {};
@@ -32403,13 +33641,13 @@
           sha256 = "0yrc09k64rv5is4wvss938mkj2pkvbr98lr3ahsi7p0aqn7s444v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kill-ring-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kill-ring-search";
           sha256 = "1pg4j1rrji64rrdv2xpwz33vlyk8r0hz4j4fikzwpbcbmni3skan";
           name = "kill-ring-search";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/kill-ring-search";
+          homepage = "https://melpa.org/#/kill-ring-search";
           license = lib.licenses.free;
         };
       }) {};
@@ -32424,13 +33662,13 @@
           sha256 = "05rbh5hkj3jsn9pw0qa4d5a5pi6367vdqkijcn9k14fdfbmyd30x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/killer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/killer";
           sha256 = "10z4vqwrpss7mk0gq8xdsbsl0qibpp7s1g0l8wlmrsgn6kjkr2ma";
           name = "killer";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/killer";
+          homepage = "https://melpa.org/#/killer";
           license = lib.licenses.free;
         };
       }) {};
@@ -32445,13 +33683,13 @@
           sha256 = "1cr4i66lws6yhyxmyx5jw6d5x7i75435mafkkych4nfa0mv4vicd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kite";
           sha256 = "04x92qcvx428l2cvm2nk9px7r8i159k0ra0haq2sjncjr1ajhg9m";
           name = "kite";
         };
         packageRequires = [ json websocket ];
         meta = {
-          homepage = "http://melpa.org/#/kite";
+          homepage = "https://melpa.org/#/kite";
           license = lib.licenses.free;
         };
       }) {};
@@ -32466,13 +33704,13 @@
           sha256 = "1m0f1hiczq88qjy573rhlkw2lmjy814cgdl42zxsjbf78wg4qx8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kite-mini";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kite-mini";
           sha256 = "1g644406zm3db0fjyv704aa8dbd20v1apmysb3mmh2vldbch4iyh";
           name = "kite-mini";
         };
         packageRequires = [ dash websocket ];
         meta = {
-          homepage = "http://melpa.org/#/kite-mini";
+          homepage = "https://melpa.org/#/kite-mini";
           license = lib.licenses.free;
         };
       }) {};
@@ -32483,17 +33721,17 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "546e8857b427de32e95cfd15b5ffdc230e5edeea";
-          sha256 = "0hd48iii48bi0nrpy0qz5713m0rlgcla42708m8znhzw69myvbna";
+          rev = "ef4e311a67416a6642e62db140aa458b1492b934";
+          sha256 = "1fdkca63ii2lhss2mff9swxbhymf9hq8znjyfkji5bhq517158qx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kivy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kivy-mode";
           sha256 = "02l230rwivr7rbiqm4vg70458z35f9v9w3mdapcrqd5d07y5mvi1";
           name = "kivy-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/kivy-mode";
+          homepage = "https://melpa.org/#/kivy-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -32508,13 +33746,13 @@
           sha256 = "1ld3ccg8q7hmjrj60rxvmmfy4dpm2lvlshjqdf9ifgjzp221g4vb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kixtart-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kixtart-mode";
           sha256 = "079bw4lgxbmk65rrfyy8givs8j5wsyhpcjjw915ifkg577gj87qp";
           name = "kixtart-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/kixtart-mode";
+          homepage = "https://melpa.org/#/kixtart-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -32529,13 +33767,13 @@
           sha256 = "1lppggnii2r9fvlhh33gbdrwb50za8lnalavlq9s86ngndn4n94k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/know-your-http-well";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/know-your-http-well";
           sha256 = "0k2x0ajxkivim8nfpli716y7f4ssrmvwi56r94y34x4j3ib3px3q";
           name = "know-your-http-well";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/know-your-http-well";
+          homepage = "https://melpa.org/#/know-your-http-well";
           license = lib.licenses.free;
         };
       }) {};
@@ -32550,13 +33788,13 @@
           sha256 = "0yr4yxwxgxp5pm9f8gaqlikxp26inv01inq0ya42dzam5yphkafw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kolon-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kolon-mode";
           sha256 = "0wcg8ph3mk4zcmzqpvl2w6rfgvrfvhmgwb14y8agh9b7v5d9xwj3";
           name = "kolon-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/kolon-mode";
+          homepage = "https://melpa.org/#/kolon-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -32567,38 +33805,38 @@
         src = fetchFromGitHub {
           owner = "kootenpv";
           repo = "emacs-kooten-theme";
-          rev = "7caf9e31219281a7c5a2a7b60404d9c18460de4b";
-          sha256 = "02217kskgy82dnq3cqrss8hf355aypfm1dxx6ijv6s855kww2zjc";
+          rev = "f703b3a9227b505008e2f07d5dd2e087fad563ba";
+          sha256 = "1bh2zpprh2zwhfgdw131lm0j7zm0hmnb0zqcahps104xna9s5x60";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kooten-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kooten-theme";
           sha256 = "1kkk8nl1xykc4c487icmjrc2xsv8i4s2r5h5gbcpyrk2myqi4179";
           name = "kooten-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/kooten-theme";
+          homepage = "https://melpa.org/#/kooten-theme";
           license = lib.licenses.free;
         };
       }) {};
     kpm-list = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kpm-list";
-        version = "20130131.348";
+        version = "20160310.1250";
         src = fetchFromGitHub {
           owner = "KMahoney";
           repo = "kpm-list";
-          rev = "397912496d42e57c261ff6d33edc8fc029479b8b";
-          sha256 = "1m9hixlclynph2i5q18miq077dyvhx14pfzgawrwj82j1kslz50x";
+          rev = "6fb7db35f7dac7fb8f956c67ee2eea9d3fa54034";
+          sha256 = "0hbzr5x9ykzrbwzfsf6rc4pbiw9m59ny3cgcx26nbi6ijbjl2fxj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kpm-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kpm-list";
           sha256 = "0022bhy1mzngjmjydyqnmlgnhww05v4dxsfav034r8nyyc7677z0";
           name = "kpm-list";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/kpm-list";
+          homepage = "https://melpa.org/#/kpm-list";
           license = lib.licenses.free;
         };
       }) {};
@@ -32613,13 +33851,13 @@
           sha256 = "11axxmhdpwgrcyjz200pf5bqzjw9wz4085r8p1n2vr5gx98374fr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kroman";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kroman";
           sha256 = "0y9ji3c8kndrz605n7b4w5xq0qp093d61hxwhblm3qrh3370mws7";
           name = "kroman";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/kroman";
+          homepage = "https://melpa.org/#/kroman";
           license = lib.licenses.free;
         };
       }) {};
@@ -32634,13 +33872,13 @@
           sha256 = "0da4y9pf6vq0i6w7bmvrszg9bji3ylhr44hmyrmxvah28pigb2fz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kurecolor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kurecolor";
           sha256 = "0q0q0dfv376h7j3sgwxqwfpxy1qjbvb6i5clsxz9xp4ly89w4d4f";
           name = "kurecolor";
         };
         packageRequires = [ emacs s ];
         meta = {
-          homepage = "http://melpa.org/#/kurecolor";
+          homepage = "https://melpa.org/#/kurecolor";
           license = lib.licenses.free;
         };
       }) {};
@@ -32655,13 +33893,13 @@
           sha256 = "0r0lz2s6gvy04fwnafai668jsf4546h4k6zd6isx5wpk0n33pj5m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kv";
           sha256 = "1vzifi6zpkmsh1a3c2njrw7mpfdgyjvpbz3bj42j8cg3vwjnjznb";
           name = "kv";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/kv";
+          homepage = "https://melpa.org/#/kv";
           license = lib.licenses.free;
         };
       }) {};
@@ -32676,13 +33914,34 @@
           sha256 = "0irbfgip493hyh45msnb7climgfwr8f05nvc97bzaqggnay88scy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kwin";
           sha256 = "1pxnyj81py3ygadmyfrqndb0jkk6xlbf0rg3857hsy3ccblzm7ki";
           name = "kwin";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/kwin";
+          homepage = "https://melpa.org/#/kwin";
+          license = lib.licenses.free;
+        };
+      }) {};
+    labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "labburn-theme";
+        version = "20160411.321";
+        src = fetchFromGitHub {
+          owner = "ksjogo";
+          repo = "labburn-theme";
+          rev = "24e2cd2385cf7026512b0bd58dcb2c3442bfb8dd";
+          sha256 = "0ldjkwfxac3lkfl5r1qgbjf74yc6k2b7f5imgcina34vd3jk0s3h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/labburn-theme";
+          sha256 = "09qqb62hfga88zka0pc27rc8i43cxi84cv1x8wj0vvzx6mvic1lm";
+          name = "labburn-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/labburn-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -32690,17 +33949,17 @@
         pname = "lacarte";
         version = "20151231.1609";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/lacarte.el";
+          url = "https://www.emacswiki.org/emacs/download/lacarte.el";
           sha256 = "01vs0v17l76zwyrblf9c6x0xg5fagd4qv8pr1fwfw7kl64hb9aa2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lacarte";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lacarte";
           sha256 = "0a0n1lqakgsbz0scn6617rkkkvzwranzlvkzw9q4zapiz1s9xqp9";
           name = "lacarte";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lacarte";
+          homepage = "https://melpa.org/#/lacarte";
           license = lib.licenses.free;
         };
       }) {};
@@ -32715,13 +33974,13 @@
           sha256 = "135k7inkvdz51j7al3nndaamrkyn989vlv1mxcp8lwx8cgq0rqfj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lang-refactor-perl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lang-refactor-perl";
           sha256 = "02fv25d76rvxqzxs48j4lkrifdhqayyb1in05ryyz2pk9x5hbax9";
           name = "lang-refactor-perl";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lang-refactor-perl";
+          homepage = "https://melpa.org/#/lang-refactor-perl";
           license = lib.licenses.free;
         };
       }) {};
@@ -32736,13 +33995,13 @@
           sha256 = "0svci7xs4iysv8ysf93g382arip0xpgi0fllw8xx2vrd70sz7lff";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/langdoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/langdoc";
           sha256 = "19i6ys58wswl5ckf33swl6lsfzg4znx850br4icik15yrry65yj7";
           name = "langdoc";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/langdoc";
+          homepage = "https://melpa.org/#/langdoc";
           license = lib.licenses.free;
         };
       }) {};
@@ -32757,13 +34016,13 @@
           sha256 = "1rj0j4vxfwss0w6bwh591w5mbyzjg5rkbwyjaphyi6p7wq5w6np1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/langtool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/langtool";
           sha256 = "1xq70jyhzg0qmvialy015crbdk9rdibhwpl36khab9hi2999wxyw";
           name = "langtool";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/langtool";
+          homepage = "https://melpa.org/#/langtool";
           license = lib.licenses.free;
         };
       }) {};
@@ -32778,55 +34037,55 @@
           sha256 = "1cqbdgk3sd0xbw76qrhlild9dvgds3vgldq0rcl200kh7y8l6g4k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/latest-clojure-libraries";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/latest-clojure-libraries";
           sha256 = "1vnm9piq71nx7q1843izm4vydfjq1564ax4ffwmqmlpisqzd6wq5";
           name = "latest-clojure-libraries";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/latest-clojure-libraries";
+          homepage = "https://melpa.org/#/latest-clojure-libraries";
           license = lib.licenses.free;
         };
       }) {};
     latex-extra = callPackage ({ auctex, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "latex-extra";
-        version = "20160209.945";
+        version = "20160328.1921";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "latex-extra";
-          rev = "efb76e4bfb3282da2dcefb8e9a472f0021ab7c61";
-          sha256 = "04dz7ab0bxg5j3s5qh7jdidg1x8jvy9hdp2xkm6irblxhsh64dsk";
+          rev = "d5b759fa61da968c3ca998ba0d2ef4a73647e5fd";
+          sha256 = "07aavdr1dlw8hca27l8a0i8cs5ga1wqqdf1v1iyvjz61vygld77a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/latex-extra";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/latex-extra";
           sha256 = "1w98ngxymafigjpfalybhs12jcf4916wk4nlxflfjcx8ryd9wjcj";
           name = "latex-extra";
         };
         packageRequires = [ auctex cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/latex-extra";
+          homepage = "https://melpa.org/#/latex-extra";
           license = lib.licenses.free;
         };
       }) {};
     latex-math-preview = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "latex-math-preview";
-        version = "20160104.1858";
+        version = "20160321.2359";
         src = fetchFromGitLab {
           owner = "latex-math-preview";
           repo = "latex-math-preview";
-          rev = "c1c87c4c5501f98b97af19f7e3454a2369265edc";
-          sha256 = "118xrgrnwsmsysmframf6bmb0gkrdrm3jbkgivzxs41cw92fhbzw";
+          rev = "2c7a526a4e46f7154befc9009b131dfbab22ac03";
+          sha256 = "0cxmvadkiqhvhmvmx3vvwxasw7wll8abhviss7wgizwqf4i2p3v4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/latex-math-preview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/latex-math-preview";
           sha256 = "14bn0q5czrrkb1vjdkwx6f2x4zwjkxgrc0bcncv23l13qls1gkmr";
           name = "latex-math-preview";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/latex-math-preview";
+          homepage = "https://melpa.org/#/latex-math-preview";
           license = lib.licenses.free;
         };
       }) {};
@@ -32840,13 +34099,13 @@
           sha256 = "0h9hncf2ghfkd3i3342ajj1niykhfr0aais3j6sjg1vkm16xbr3b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/latex-pretty-symbols";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/latex-pretty-symbols";
           sha256 = "1f2s2f64bmsx89a3crm4skhdi4pq9w18z9skxw3i3ydaj15s8jgl";
           name = "latex-pretty-symbols";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/latex-pretty-symbols";
+          homepage = "https://melpa.org/#/latex-pretty-symbols";
           license = lib.licenses.free;
         };
       }) {};
@@ -32861,34 +34120,34 @@
           sha256 = "1bvhrh9xfl7p474b8jcczw255d2pjmrz5b60wis0lmmxdljplrfa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/latex-preview-pane";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/latex-preview-pane";
           sha256 = "1id1l473azmc9hm5vq5wba8gad9np7sv38x94qd2zkf8b78pzkbw";
           name = "latex-preview-pane";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/latex-preview-pane";
+          homepage = "https://melpa.org/#/latex-preview-pane";
           license = lib.licenses.free;
         };
       }) {};
     latex-unicode-math-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "latex-unicode-math-mode";
-        version = "20160209.1117";
+        version = "20160411.730";
         src = fetchFromGitHub {
           owner = "Christoph-D";
           repo = "latex-unicode-math-mode";
-          rev = "71da85b55870aa870be722ced9d1f7df54b17f97";
-          sha256 = "165qhh6cfrr24yg0qvpq4vk64a70z30nchkbbhhwg4f6ib7v5f5h";
+          rev = "79edf60793eb6928a5b4831268bf09694fd092ec";
+          sha256 = "10i4r81pm95990d4yrabzdm49gp47mqpv15h4r4sih10p1kbn83h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/latex-unicode-math-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/latex-unicode-math-mode";
           sha256 = "1p9gpp28vylibv1s95bzfgscznw146ybgk6f3qdbbnafrcrmifcr";
           name = "latex-unicode-math-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/latex-unicode-math-mode";
+          homepage = "https://melpa.org/#/latex-unicode-math-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -32903,13 +34162,13 @@
           sha256 = "0ciycsqzyj6ld60c7sfqjq59ln3jvk3w9vy606kqzpcvj01ihmv1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/launch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/launch";
           sha256 = "043gwz583pa1wv84fl634p1v86lcsldsw7qkjbm6y678q5mms0m6";
           name = "launch";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/launch";
+          homepage = "https://melpa.org/#/launch";
           license = lib.licenses.free;
         };
       }) {};
@@ -32924,13 +34183,13 @@
           sha256 = "154z7bhb7qagvl3dlgrlsxdg4chz2863ijglg47xs3yhjp5ypanj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/launchctl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/launchctl";
           sha256 = "07fq445cjpv4ndi7hnjmsrmskm2rlp6ghq0k3bcbjxl21smd9vs9";
           name = "launchctl";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/launchctl";
+          homepage = "https://melpa.org/#/launchctl";
           license = lib.licenses.free;
         };
       }) {};
@@ -32945,13 +34204,13 @@
           sha256 = "1mg923rs2dk104bcr461dif3mg42r081ii8ipnnr588w7il0xh7k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lavender-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lavender-theme";
           sha256 = "1x7mk3dpk44fkzll6xmh2dw270cgb3a9qs3h8bmiq2dw0wrcwcd1";
           name = "lavender-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/lavender-theme";
+          homepage = "https://melpa.org/#/lavender-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -32966,34 +34225,34 @@
           sha256 = "03mv2r6k9syr7bk4vmdafmpa8kz19hv5h68ahj2bmdcmwlvwhkf3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ldap-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ldap-mode";
           sha256 = "0lkfpbzsry9jigrx5zp14bkrvqnavnk4y3s0whnbigc4fgpf94rq";
           name = "ldap-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ldap-mode";
+          homepage = "https://melpa.org/#/ldap-mode";
           license = lib.licenses.free;
         };
       }) {};
     ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ledger-mode";
-        version = "20160111.2034";
+        version = "20160228.1934";
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger";
-          rev = "b7f84d69001f75a18807772dee514f5918e3a926";
-          sha256 = "0vm32jv36s6kprmqbij5rpjg9djj3qsla4gpbpm8nycfg73bgylw";
+          rev = "b08c03f05e2cfe7c4071a51075e83221edb24c33";
+          sha256 = "0g0lz66lclr8fjlv6rr86l3sx3ib6s78ryvzffc3yy7pwz4xl0gx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ledger-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ledger-mode";
           sha256 = "0hi9waxmw1bbg88brlr3816vhdi0jj05wcwvrvfc1agvrvzyqq8s";
           name = "ledger-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ledger-mode";
+          homepage = "https://melpa.org/#/ledger-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -33008,31 +34267,34 @@
           sha256 = "0yrrlwmxg1wy65bqyacjpzd5ksljgp41x4zyizl7h0zx9rmqcdvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/leerzeichen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/leerzeichen";
           sha256 = "0h7zpskcgkswr110vckfdbxggz5b3g9grk1j1cbd98pmrpgfqrvp";
           name = "leerzeichen";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/leerzeichen";
+          homepage = "https://melpa.org/#/leerzeichen";
           license = lib.licenses.free;
         };
       }) {};
-    legalese = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    legalese = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "legalese";
-        version = "20100119.1548";
-        src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/legalese.el";
-          sha256 = "0vjf2f5kpmgnw7904jsv2wnn6dcv654v7h1v917wmj72sy941xml";
+        version = "20150820.1224";
+        src = fetchFromGitHub {
+          owner = "jorgenschaefer";
+          repo = "legalese";
+          rev = "ec23e69d18329456beed9546a1d6c72f96db91cf";
+          sha256 = "05zpc8b2pyjz76fvmgr7zkl56g6nf6hi4nmxdg6gkw8fx6p8i19f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/legalese";
-          sha256 = "0xsf3w5h4g7wigrv5kbys7lf9lfv2cab5ch320p74l3l3r2lj9wz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/legalese";
+          sha256 = "18rkvfknaqwkmhsjpgrf2hknrb2zj61aw8rb4907gsbs9rciqpdd";
           name = "legalese";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/legalese";
+          homepage = "https://melpa.org/#/legalese";
           license = lib.licenses.free;
         };
       }) {};
@@ -33047,13 +34309,13 @@
           sha256 = "0n6jrm5ilm5wzfrh7yjxn3sr5m10hwdm55b179ild32lh4795zj7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lemon-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lemon-mode";
           sha256 = "0jdf3556kmv55jh85ljqh2gdx0jl2b8zgvpz9a4kf53xifk3lqz5";
           name = "lemon-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lemon-mode";
+          homepage = "https://melpa.org/#/lemon-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -33068,13 +34330,13 @@
           sha256 = "0ab84qiqaz3swiraks8lx0y1kzwylpy9wz2104xgnpwnc5169z65";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lenlen-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lenlen-theme";
           sha256 = "1bddkcl9kzj3v071qpzmxzjwywqfj5j6cldz240qgp5mx685r0a9";
           name = "lenlen-theme";
         };
         packageRequires = [ color-theme-solarized ];
         meta = {
-          homepage = "http://melpa.org/#/lenlen-theme";
+          homepage = "https://melpa.org/#/lenlen-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -33089,13 +34351,13 @@
           sha256 = "04h6vk7w25yp4kzkwqnsmc59bm0182qqkyk5nxm3a1lv1v1590lf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lentic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lentic";
           sha256 = "0y94y1qwj23kqp491b1fzqsrjak96k1dmmzmakbl7q8vc9bncl5m";
           name = "lentic";
         };
         packageRequires = [ dash emacs f m-buffer s ];
         meta = {
-          homepage = "http://melpa.org/#/lentic";
+          homepage = "https://melpa.org/#/lentic";
           license = lib.licenses.free;
         };
       }) {};
@@ -33110,13 +34372,13 @@
           sha256 = "0c6wkfz6sdcs4aglvx6h3slhma2vbj7idckwzvp8ji6s7p1mavlv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lentic-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lentic-server";
           sha256 = "1y9idhf9qcsw3dbdj7rwa7bdrn1q0m3bg3r2jzwdnvkq8aas1w56";
           name = "lentic-server";
         };
         packageRequires = [ lentic web-server ];
         meta = {
-          homepage = "http://melpa.org/#/lentic-server";
+          homepage = "https://melpa.org/#/lentic-server";
           license = lib.licenses.free;
         };
       }) {};
@@ -33131,13 +34393,13 @@
           sha256 = "1w6mbk4gc63sh2p9rsy851x2kid0dp2ja4ai5badkr5prxkcpfdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/less-css-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/less-css-mode";
           sha256 = "188iplnwwhawq3dby3388kimy0jh1k9r8v9nxz52hy9rhh9hykf8";
           name = "less-css-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/less-css-mode";
+          homepage = "https://melpa.org/#/less-css-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -33152,34 +34414,34 @@
           sha256 = "06hggcbz98qhfbvp0fxn89j98d0mmki4wc4k8kfzp5fhg071chbi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/letcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/letcheck";
           sha256 = "1sjwi1ldg6b1qvj9cvfwxq3qlkfas6pm8zasf43baljmnz38mxh2";
           name = "letcheck";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/letcheck";
+          homepage = "https://melpa.org/#/letcheck";
           license = lib.licenses.free;
         };
       }) {};
     leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "leuven-theme";
-        version = "20160207.1243";
+        version = "20160319.1019";
         src = fetchFromGitHub {
           owner = "fniessen";
           repo = "emacs-leuven-theme";
-          rev = "ea5c7891573f9fefe937801b3e6365218893958d";
-          sha256 = "15qixxvg0az3z8q8plrwyind40acr1wv392q81vlad0ngvl81v4r";
+          rev = "b49a9a10012e262cb8949c4ebfd7312caa2e5eff";
+          sha256 = "1av1dpi1spddb1w0q370qq8zi5rjfr1d9a0f0xqy877i66wc51xf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/leuven-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/leuven-theme";
           sha256 = "0pm5majr9cmj6g4zr7vb55ypk9fmfbvxx78mgmgignknbasq9g9a";
           name = "leuven-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/leuven-theme";
+          homepage = "https://melpa.org/#/leuven-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -33187,17 +34449,17 @@
         pname = "levenshtein";
         version = "20051013.1256";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/levenshtein.el";
+          url = "https://www.emacswiki.org/emacs/download/levenshtein.el";
           sha256 = "0m94z18i1428bispxi285flvjf22kjm33s4sm0ad11m0w0jizir6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/levenshtein";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/levenshtein";
           sha256 = "1iypnz0bw3baqxa9gldz8cikxvdhw60pvqp00kq5p3v4x3xcy4z2";
           name = "levenshtein";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/levenshtein";
+          homepage = "https://melpa.org/#/levenshtein";
           license = lib.licenses.free;
         };
       }) {};
@@ -33212,34 +34474,34 @@
           sha256 = "167ayfl1k8dnajw173hh67nbwbk4frmjc4fzc515q67m9d7m5932";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lexbind-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lexbind-mode";
           sha256 = "1hs9wg45mwp3fwi827rc4g0gjx4fk87zlibq3id9fcqic8q7nrnl";
           name = "lexbind-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lexbind-mode";
+          homepage = "https://melpa.org/#/lexbind-mode";
           license = lib.licenses.free;
         };
       }) {};
     lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lfe-mode";
-        version = "20151227.2031";
+        version = "20160422.1406";
         src = fetchFromGitHub {
           owner = "rvirding";
           repo = "lfe";
-          rev = "f0c613e6ebe9cd185782de224dfb5c1f261403cc";
-          sha256 = "0bqqgjzx8wj9sbdc146crmmskm9jmnmbp858kd67bnzdhpw3jf6k";
+          rev = "0406467fc129bebfb72e36b20839007cd09d7cf9";
+          sha256 = "1wysncb3bs795wj1ysq206im14zwc04460pb329vlwzvl9hygmx7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lfe-mode";
-          sha256 = "06b382ncgk4zz3q8akyzfy55j86a53r97gf0l92qvlca7fbs8jjx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lfe-mode";
+          sha256 = "0smncyby53ipm8yqslz88sqjafk0x6r8d0qwk4wzk0pbgfyklhgs";
           name = "lfe-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lfe-mode";
+          homepage = "https://melpa.org/#/lfe-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -33247,17 +34509,17 @@
         pname = "lib-requires";
         version = "20151231.1610";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/lib-requires.el";
+          url = "https://www.emacswiki.org/emacs/download/lib-requires.el";
           sha256 = "077cy2clllrvabw44wb1pzcqz97r3y92j7cb9lnhd9pix0wpcq6g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lib-requires";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lib-requires";
           sha256 = "1g22jh56z8rnq0h80wj10gs38yig1rk9xmk3kmhmm5mm6b14iwdx";
           name = "lib-requires";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lib-requires";
+          homepage = "https://melpa.org/#/lib-requires";
           license = lib.licenses.free;
         };
       }) {};
@@ -33272,13 +34534,13 @@
           sha256 = "039awlam3nrgkxrarcapfyc2myvc77aw7whrkcsjjybzylpzv0pr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/libmpdee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/libmpdee";
           sha256 = "0z4d8y8jlsjw20b31akkaikh5xl0c05lj77d2i1xbgzam4iixma0";
           name = "libmpdee";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/libmpdee";
+          homepage = "https://melpa.org/#/libmpdee";
           license = lib.licenses.free;
         };
       }) {};
@@ -33293,13 +34555,13 @@
           sha256 = "11c3vmxyddx7zm8fpxmzhq2xygyijbszinfiwllgb4l738bxwljb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lice";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lice";
           sha256 = "1hv2hz3153x0gk7f2js18dbx5pyprfdf2pfxb658fj16vxpp7y6x";
           name = "lice";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lice";
+          homepage = "https://melpa.org/#/lice";
           license = lib.licenses.free;
         };
       }) {};
@@ -33314,13 +34576,13 @@
           sha256 = "04dik8z2mg6qr4d3fkd26kg29b4c5crvbnc1lfsrzyrik7ipvsi8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/light-soap-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/light-soap-theme";
           sha256 = "09p4w51d5szhi81a6a3l0r4zd4ixkrkzxldr938bcmj0qmj62iyk";
           name = "light-soap-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/light-soap-theme";
+          homepage = "https://melpa.org/#/light-soap-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -33335,13 +34597,13 @@
           sha256 = "0rkx0hk3y79rwhjqs3wvgxhg1rj83mxbqkhhm3jfawp8c1av4f40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lingr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lingr";
           sha256 = "1445bxiirsxl9kgm0j86xc9d0pbaa5f07c1i66pw2vl40bvhrjff";
           name = "lingr";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lingr";
+          homepage = "https://melpa.org/#/lingr";
           license = lib.licenses.free;
         };
       }) {};
@@ -33356,34 +34618,34 @@
           sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/link";
           sha256 = "17jpsg3f2954b740vyj37ikygrg5gmp0bjhbid8bh8vbz7xx9zy8";
           name = "link";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/link";
+          homepage = "https://melpa.org/#/link";
           license = lib.licenses.free;
         };
       }) {};
-    link-hint = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    link-hint = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "link-hint";
-        version = "20160128.1454";
+        version = "20160413.18";
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "link-hint.el";
-          rev = "a34fcdfef646e3f9861fc5513e0d8ab46ef720e2";
-          sha256 = "1glwsc1a3nhw7xwqlf1pgswgnwkvfy2a6a0k0lxshdajxiayyh7d";
+          rev = "64afe6492609144d0d4edded349e6c1a299acd7f";
+          sha256 = "0xkpnp5rccxf8184c4hpi3zlik5l89s64yizj0vwc2z73xah8alq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/link-hint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/link-hint";
           sha256 = "12fb2zm9jnh92fc2nzmzmwjlhi64rhakwbh9lsydx9svsvkgcs89";
           name = "link-hint";
         };
-        packageRequires = [ avy emacs ];
+        packageRequires = [ avy cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/link-hint";
+          homepage = "https://melpa.org/#/link-hint";
           license = lib.licenses.free;
         };
       }) {};
@@ -33398,13 +34660,13 @@
           sha256 = "01yv6239z90hvncwmm9g5nh4xvyxv2ig3h4hsmxdn4kacfxvc84n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/linphone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/linphone";
           sha256 = "0q7mw1npxq24szhwswc93qz5h6magcxw63ymba7hwhif6my65zx7";
           name = "linphone";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/linphone";
+          homepage = "https://melpa.org/#/linphone";
           license = lib.licenses.free;
         };
       }) {};
@@ -33419,13 +34681,13 @@
           sha256 = "1pvgp76n2qnm01l5f9mkb9yqwfxag9x23wwqbsna66rmvsag69w0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/linum-off";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/linum-off";
           sha256 = "1yilsdsyxlzmh64dpzirzga9c7lhp1phps9cdgp2898zpnzaclay";
           name = "linum-off";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/linum-off";
+          homepage = "https://melpa.org/#/linum-off";
           license = lib.licenses.free;
         };
       }) {};
@@ -33440,13 +34702,34 @@
           sha256 = "01r8vbblpqfyfafmgbcw02f371j6c2g940bwmvi54rmjf9kjd6h7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/linum-relative";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/linum-relative";
           sha256 = "0s1lc3lppazv0481dxknm6qrxhvkv0r9hw8xmdrpjc282l91whkj";
           name = "linum-relative";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/linum-relative";
+          homepage = "https://melpa.org/#/linum-relative";
+          license = lib.licenses.free;
+        };
+      }) {};
+    liso-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "liso-theme";
+        version = "20160410.1529";
+        src = fetchFromGitHub {
+          owner = "caisah";
+          repo = "liso-theme";
+          rev = "844688245eb860d23043455e165ee24503454c81";
+          sha256 = "01ycjy3amzbplp3zf0x5fahsja92gyg2252xhzcyiazmhaz7gkrd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/liso-theme";
+          sha256 = "014a71dnhnr0dr36sl2h8ffp6il9nasij31ahqz0bjgn4r16s5gy";
+          name = "liso-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/liso-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -33461,13 +34744,13 @@
           sha256 = "1r2yhjfby4mibbr7d14m1rifchdy7bvwy50xz2wx4004zqhjmnjd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lisp-extra-font-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lisp-extra-font-lock";
           sha256 = "1xchqwhav9x7b02787ghka567fihdc14aamx92jg549c6d14qpwk";
           name = "lisp-extra-font-lock";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lisp-extra-font-lock";
+          homepage = "https://melpa.org/#/lisp-extra-font-lock";
           license = lib.licenses.free;
         };
       }) {};
@@ -33475,38 +34758,38 @@
         pname = "lispxmp";
         version = "20130824.707";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/lispxmp.el";
+          url = "https://www.emacswiki.org/emacs/download/lispxmp.el";
           sha256 = "1m07gb3v1a7al0h4nj3914y8lqrwzi8fwb1ih66nxzn6kb0qj3mf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lispxmp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lispxmp";
           sha256 = "02gfbyng3dh2445jfkasxzjc9dlk02dafbfkjm40iwmb8h0fzji4";
           name = "lispxmp";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lispxmp";
+          homepage = "https://melpa.org/#/lispxmp";
           license = lib.licenses.free;
         };
       }) {};
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "lispy";
-        version = "20160218.432";
+        version = "20160424.1244";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "91c05e6bfb7dbabfee08be9dbe3ad32e86aae1e3";
-          sha256 = "1gi6f1kpjjj5ik4fxmycj53lk7j4ppmv7jrwhwfn97nj4p5kd43s";
+          rev = "c70eca49a451fc58b308f2c7a4b991367a5eb633";
+          sha256 = "18hcjnra7ibmaavy883gs1v6ybi6fb1i08brmc6y6gjk84grm4jp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lispy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lispy";
           sha256 = "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g";
           name = "lispy";
         };
         packageRequires = [ ace-window emacs hydra iedit swiper ];
         meta = {
-          homepage = "http://melpa.org/#/lispy";
+          homepage = "https://melpa.org/#/lispy";
           license = lib.licenses.free;
         };
       }) {};
@@ -33521,13 +34804,13 @@
           sha256 = "0n0mk01h9c3f24gzpws5xf6syrdwkq4kzs9mgwl74x9l0x904rgf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lispyscript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lispyscript-mode";
           sha256 = "02biai45l5xl2m9l1drphrlj6r01msmadhyg774ijdk1x4gm5nhr";
           name = "lispyscript-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lispyscript-mode";
+          homepage = "https://melpa.org/#/lispyscript-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -33542,13 +34825,13 @@
           sha256 = "1szbs16jlxfj71986dbg0d3j5raaxcwz0xq5ar352731r5mdcqw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/list-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/list-environment";
           sha256 = "1zdhrlp8vk8knjwh56pws6dyn003r6avjzvhghlkgnw9nfrdk57h";
           name = "list-environment";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/list-environment";
+          homepage = "https://melpa.org/#/list-environment";
           license = lib.licenses.free;
         };
       }) {};
@@ -33563,13 +34846,13 @@
           sha256 = "02l7q5376ydz6a8i9x74bsx5bbxz8xkasmv1lzvf79d3jbg28l1s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/list-packages-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/list-packages-ext";
           sha256 = "15m4888fm5xv697y7jspghg1ra49fyrny4y2x7h8ivcbslvpglvk";
           name = "list-packages-ext";
         };
         packageRequires = [ ht persistent-soft s ];
         meta = {
-          homepage = "http://melpa.org/#/list-packages-ext";
+          homepage = "https://melpa.org/#/list-packages-ext";
           license = lib.licenses.free;
         };
       }) {};
@@ -33578,35 +34861,38 @@
         pname = "list-processes-plus";
         version = "20131117.1335";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/list-processes+.el";
+          url = "https://www.emacswiki.org/emacs/download/list-processes+.el";
           sha256 = "1bssvyjgk1h1wiaxxdi2m5gjy6a790a9rwvi0r22hin7iskg300a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/list-processes+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/list-processes+";
           sha256 = "10x7hkba2bmryyl68w769fggw65dl4f3a9g0gqdzmkdj80rcipky";
           name = "list-processes-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/list-processes+";
+          homepage = "https://melpa.org/#/list-processes+";
           license = lib.licenses.free;
         };
       }) {};
-    list-register = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    list-register = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "list-register";
-        version = "20130824.700";
-        src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/list-register.el";
-          sha256 = "1sv1x2bc1xg7z3q4r9pbvjspj041q4zn883w9m071h7dgx8i9a6l";
+        version = "20091203.1215";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "list-register";
+          rev = "f8bec5dc3765174de1089549947d9ca9a1cdbe5f";
+          sha256 = "1pr7vmjmyildg44n7psg0zmj8a3kfsw5xmgh600fhs95wqxn3sag";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/list-register";
-          sha256 = "06q7q3j9qvqbp25cx9as2ckmgcz2myfvi2n34jp60v3ayhna79r4";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/list-register";
+          sha256 = "0kza9xfhmxc8qia5yixx5z2y9j4wb1530rcvgxn545b903fs55kv";
           name = "list-register";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/list-register";
+          homepage = "https://melpa.org/#/list-register";
           license = lib.licenses.free;
         };
       }) {};
@@ -33621,34 +34907,34 @@
           sha256 = "05nn4db8s8h4mn3fxhwsa111ayvlq1raf6bifh7jciyw7a2c3aww";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/list-unicode-display";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/list-unicode-display";
           sha256 = "01x9i5k5vhjscmkx0l6r27w1cdp9n6xk1pdjf98z3y88dnsmyfha";
           name = "list-unicode-display";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/list-unicode-display";
+          homepage = "https://melpa.org/#/list-unicode-display";
           license = lib.licenses.free;
         };
       }) {};
     list-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "list-utils";
-        version = "20140508.1541";
+        version = "20160414.902";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "list-utils";
-          rev = "36ade42f7cac835d1b8e3dcaf6beeba55ce89832";
-          sha256 = "0b6pnkhm5hnim2lpari93la08ic8qyh4nv0d7mw0cyfyk8phzzvn";
+          rev = "acf18aca1131a90f8d673974673e3c5d8fdc6a86";
+          sha256 = "0ql159v7sxs33yh2l080kchrj52vk34knz50cvqi3ykpb7djg3sz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/list-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/list-utils";
           sha256 = "0bknprr4jb1d20i9lj2aa17vpg1kqwdyzzwmy1kfydnkpf5scnr3";
           name = "list-utils";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/list-utils";
+          homepage = "https://melpa.org/#/list-utils";
           license = lib.licenses.free;
         };
       }) {};
@@ -33663,13 +34949,13 @@
           sha256 = "0mr0king5dj20vdycpszxnfs9ch808fhcz3q7svxfngj3d3671wd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lit-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lit-mode";
           sha256 = "05rf7ki060nqnvircn0dkpdrg7xbh7phb8bqgsab89ycc7l9vv59";
           name = "lit-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lit-mode";
+          homepage = "https://melpa.org/#/lit-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -33684,13 +34970,13 @@
           sha256 = "1nbz119ldwjvkm3xd9m0dx820lc177frz5mn585fsd7kqdbkam99";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/litable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/litable";
           sha256 = "073yw3ivkl093xxppn5vqyh69jhfc97al505mnyn34fwdj5v8fji";
           name = "litable";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/litable";
+          homepage = "https://melpa.org/#/litable";
           license = lib.licenses.free;
         };
       }) {};
@@ -33705,13 +34991,13 @@
           sha256 = "1pxcm4dxb0mggjzcv6r0a34qwq6jyih1afplysh01wk5p3nqlpyk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/litecoin-ticker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/litecoin-ticker";
           sha256 = "14gak0av8wljmyq9lcf44dc2bvlfjb86filanqh0wkf2swpbdw85";
           name = "litecoin-ticker";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/litecoin-ticker";
+          homepage = "https://melpa.org/#/litecoin-ticker";
           license = lib.licenses.free;
         };
       }) {};
@@ -33726,13 +35012,13 @@
           sha256 = "1wxysnsigjw40ykdwngg0gqfaag0dx6zg029i2zx25kl3gr1lflc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/literate-coffee-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/literate-coffee-mode";
           sha256 = "1bll1y9q3kcg3v250asjvx2k9kb314qadaq1iwanwgdlp3qvvs40";
           name = "literate-coffee-mode";
         };
         packageRequires = [ coffee-mode ];
         meta = {
-          homepage = "http://melpa.org/#/literate-coffee-mode";
+          homepage = "https://melpa.org/#/literate-coffee-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -33747,13 +35033,13 @@
           sha256 = "1v37bii372w2g3pl09n5dcrk6y7glhpg8qiv17zsk9jy3ps2xm1b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/literate-starter-kit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/literate-starter-kit";
           sha256 = "1n2njf007fmrmsb8zrgxbz1cpxmr5nsp8w41yxa934iqc7qygkjy";
           name = "literate-starter-kit";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/literate-starter-kit";
+          homepage = "https://melpa.org/#/literate-starter-kit";
           license = lib.licenses.free;
         };
       }) {};
@@ -33768,52 +35054,55 @@
           sha256 = "1j0qa96vlsqybhp0082a466qb1hd2b0621306brl9pfl5srf5jsj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/live-code-talks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/live-code-talks";
           sha256 = "173mjmxanva13vk2f3a06s4dy62x271kynsa7pbhdg4fd72hdjma";
           name = "live-code-talks";
         };
         packageRequires = [ cl-lib emacs narrowed-page-navigation ];
         meta = {
-          homepage = "http://melpa.org/#/live-code-talks";
+          homepage = "https://melpa.org/#/live-code-talks";
           license = lib.licenses.free;
         };
       }) {};
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "20160204.1914";
+        version = "20160329.2335";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "185babbba069742f81ec39cc0fb3fb542b457921";
-          sha256 = "1w3598ivxcffqfa8147sp3if5scnx3w88a5syf49afvfca2hvd0b";
+          rev = "f040dab8f3f09c3cc68f5ffaa06df92b50422c8f";
+          sha256 = "03ickn42s7a4rxx6p596l13nsh1vgq2s3194bgd6gbm3i0f3mlhy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/live-py-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/live-py-mode";
           sha256 = "0yn1a0gf9yn068xifpv8p77d917mnalc56pll800zlpsdk8ljicq";
           name = "live-py-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/live-py-mode";
+          homepage = "https://melpa.org/#/live-py-mode";
           license = lib.licenses.free;
         };
       }) {};
-    lively = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    lively = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "lively";
-        version = "20120728.913";
-        src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/lively.el";
-          sha256 = "1z9b0arn7vby4fkwzgj3ml537lh94gvf61vs03cqfkc95lv14r76";
+        version = "20160208.1235";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "lively";
+          rev = "12df5ccaec03670de87c01b0b4cd3e2b96e0738a";
+          sha256 = "1qxw7i23z6c4yimrzpaqna8j39rashgbswdv4m0x4qg4sqc7szdp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lively";
-          sha256 = "1wjd6kfnknhw9lc2p9iipaxfm9phpkqqmjw43bhc70ybsq1xaln7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lively";
+          sha256 = "0qnyqlhqmmfq2f47zmy29hn6wqrx5yvsax8kn63nmxw380gw1z18";
           name = "lively";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lively";
+          homepage = "https://melpa.org/#/lively";
           license = lib.licenses.free;
         };
       }) {};
@@ -33828,13 +35117,13 @@
           sha256 = "0kqjz0i0zapyhh8z57cvc8ifiizngix3ca01mjnvyq3zxg1bqrsg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/livescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/livescript-mode";
           sha256 = "1fdfhp39zr2mhy5rd6mwqv5fwd8xaypdqig7v3ksv77m5zq7cmmj";
           name = "livescript-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/livescript-mode";
+          homepage = "https://melpa.org/#/livescript-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -33849,13 +35138,13 @@
           sha256 = "178ldzpk8a9m9abn8xlplxn5jgcca71dpkp82bs5g7bsccp3rx6p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/livid-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/livid-mode";
           sha256 = "0jy16m6injqznx4gmxzvhys480pclw9g07z4qll2dna37177ww9d";
           name = "livid-mode";
         };
         packageRequires = [ s skewer-mode ];
         meta = {
-          homepage = "http://melpa.org/#/livid-mode";
+          homepage = "https://melpa.org/#/livid-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -33865,17 +35154,38 @@
         version = "20150910.844";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "b51e7cd7a3a0d1323325623369d6893340fa526e";
-          sha256 = "222ae816ac005033cad4164b6f530b2d824dba86ca78b20f79acd4f74cb2d6df";
+          rev = "5571fd88f171cbeba3f7d0eaaf4ea67b9e02b1de";
+          sha256 = "0d5djnz6nn6h5p2vfw9sv441rq6cmz9lswxmqm87b0sbikzk7sxc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/llvm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/llvm-mode";
           sha256 = "0j3zsd0shd7kbi65a2ha7kmr0zy3my05378swx6m5m9x7miyr4y7";
           name = "llvm-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/llvm-mode";
+          homepage = "https://melpa.org/#/llvm-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    load-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "load-relative";
+        version = "20150224.1922";
+        src = fetchFromGitHub {
+          owner = "rocky";
+          repo = "emacs-load-relative";
+          rev = "9514dcd0130666d1ec583fd4df5f2d578b19df33";
+          sha256 = "0zf7f84g1022j2ha5pxy6ibg3i0blik00lv9s9sm3crdfcn35jik";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/load-relative";
+          sha256 = "0j8ybbjzhzgjx47pqqdbsqi8n6pzqcf6zqc38x7cf1kkklgc87ay";
+          name = "load-relative";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/load-relative";
           license = lib.licenses.free;
         };
       }) {};
@@ -33890,13 +35200,13 @@
           sha256 = "0gvc9jy34a8wvzwjpmqhshbx2kpk6ckmdrdj5v00iya7c4afnckx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/load-theme-buffer-local";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/load-theme-buffer-local";
           sha256 = "13829yrh36qac7gpxanizlk4n7av99ngvv06y6mmi5rq06a4hjx4";
           name = "load-theme-buffer-local";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/load-theme-buffer-local";
+          homepage = "https://melpa.org/#/load-theme-buffer-local";
           license = lib.licenses.free;
         };
       }) {};
@@ -33911,13 +35221,13 @@
           sha256 = "0i0ainawjvfl3qix329hx01x7rxyfin2xgpjk7y5dgmh4p3xhv94";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/loc-changes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/loc-changes";
           sha256 = "1akgij61b2ixpkchrriabwvx68cg4v5r5w9ncjrjh91hskjprfxh";
           name = "loc-changes";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/loc-changes";
+          homepage = "https://melpa.org/#/loc-changes";
           license = lib.licenses.free;
         };
       }) {};
@@ -33932,13 +35242,13 @@
           sha256 = "1npz90zf91wqf35bqd3zmkh0b538i69w8ygc78x5w2x5005aqr0p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/loccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/loccur";
           sha256 = "06pv2i05yzjzal4q21krbnp9rp4bsainxcwvpc98020vsmms0z8h";
           name = "loccur";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/loccur";
+          homepage = "https://melpa.org/#/loccur";
           license = lib.licenses.free;
         };
       }) {};
@@ -33953,13 +35263,13 @@
           sha256 = "1cdnm270kzixa0kpis0xw2ybkw8lqh7kykc7blxkxjrr9yjvbawl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lodgeit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lodgeit";
           sha256 = "1ax2w5yxscycjz90g4jdbhd64g9sipzxpfjs7gq3na77s5dcjzsq";
           name = "lodgeit";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lodgeit";
+          homepage = "https://melpa.org/#/lodgeit";
           license = lib.licenses.free;
         };
       }) {};
@@ -33974,13 +35284,13 @@
           sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/log4e";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/log4e";
           sha256 = "1klj59dv8k4r0hily489dp12ra5hq1jnsdc0wcakh6zirmakhs34";
           name = "log4e";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/log4e";
+          homepage = "https://melpa.org/#/log4e";
           license = lib.licenses.free;
         };
       }) {};
@@ -33991,16 +35301,16 @@
         src = fetchgit {
           url = "git://git.code.sf.net/p/log4j-mode/code";
           rev = "26171b1e723502055e085393b0ecdcb6db406010";
-          sha256 = "c552abe449a7288210e8490070dc58e037d7d9571633d316dc6b91799119a697";
+          sha256 = "15x6368pk4bbvhbd6cqnazcxfdz0b3f70029x0884a5797janln5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/log4j-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/log4j-mode";
           sha256 = "06lam4iqxlbl9ib2n2db2nj6jbjzrw2ak8r99n6w4s3fny1q3yxx";
           name = "log4j-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/log4j-mode";
+          homepage = "https://melpa.org/#/log4j-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -34015,13 +35325,13 @@
           sha256 = "0lj3i9i3mg17xws13gzx8myc6d7djgsj47yx4kaq5hycgkni1p7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/logalimacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/logalimacs";
           sha256 = "0ai7a01bdi3a0amgi63pwgdp8wgcgx10an4nhc627wgb1cqxb7p6";
           name = "logalimacs";
         };
         packageRequires = [ popup popwin stem ];
         meta = {
-          homepage = "http://melpa.org/#/logalimacs";
+          homepage = "https://melpa.org/#/logalimacs";
           license = lib.licenses.free;
         };
       }) {};
@@ -34036,13 +35346,13 @@
           sha256 = "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/logito";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/logito";
           sha256 = "0bk4qnz66kvhzsk88lw45209778y53kg17iih70ix4ma1x6a3v5l";
           name = "logito";
         };
         packageRequires = [ eieio ];
         meta = {
-          homepage = "http://melpa.org/#/logito";
+          homepage = "https://melpa.org/#/logito";
           license = lib.licenses.free;
         };
       }) {};
@@ -34057,34 +35367,34 @@
           sha256 = "05px3zc3is7k2jmh7mal0al5zx5cqvn1bzmhgqq02pp6lwsx5xqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/logstash-conf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/logstash-conf";
           sha256 = "03i2ilphf3fdjag7m9z5gi23n6ik36qn42mzc22432m4y3c7iksh";
           name = "logstash-conf";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/logstash-conf";
+          homepage = "https://melpa.org/#/logstash-conf";
           license = lib.licenses.free;
         };
       }) {};
     logview = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "logview";
-        version = "20151030.1649";
+        version = "20160306.1455";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "logview";
-          rev = "03b2f0fc325a557ccee0dbcb9226a1d733f21c84";
-          sha256 = "1wglgjf45rl4rl5zp1p1z318p2d1hy1w77m65wwg35v6pkl1mikr";
+          rev = "4008fc5085a9f399e64e87b79220949b7b88b0ae";
+          sha256 = "14mrj3c8b5dhcl262dd6nh8zfyqgmvl75lyd7319jzwlliyxz673";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/logview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/logview";
           sha256 = "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh";
           name = "logview";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/logview";
+          homepage = "https://melpa.org/#/logview";
           license = lib.licenses.free;
         };
       }) {};
@@ -34099,13 +35409,13 @@
           sha256 = "0pyfgywmmnlz1arvdxwyw96gr6xcg2sp3bqjli8xfcl8i0nww4kb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lolcode-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lolcode-mode";
           sha256 = "0dxdqr3z5bw0vcfxhhhc1499vrfk1xqwxshr0kvlhdalpf59rqiw";
           name = "lolcode-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lolcode-mode";
+          homepage = "https://melpa.org/#/lolcode-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -34120,13 +35430,13 @@
           sha256 = "0w9pbjcp4d2w3qb3nnyzq2d0d9f0pgz5lyzapidxa9z1xcj51ccj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/look-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/look-dired";
           sha256 = "0dddx5nxr519wqdgrbglh0pqjl3alg4ddmank42g4llzycy61wsd";
           name = "look-dired";
         };
         packageRequires = [ look-mode ];
         meta = {
-          homepage = "http://melpa.org/#/look-dired";
+          homepage = "https://melpa.org/#/look-dired";
           license = lib.licenses.free;
         };
       }) {};
@@ -34134,17 +35444,17 @@
         pname = "look-mode";
         version = "20151211.1226";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/look-mode.el";
+          url = "https://www.emacswiki.org/emacs/download/look-mode.el";
           sha256 = "0sl6hqggi6qn2qp9khw11qp5hamngwxrrwx98k3pwpj9kgicdpgp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/look-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/look-mode";
           sha256 = "0y3wjfjx0g5jclmv9m3vimv7zd18pk5im7smr41qk09hswi63yqj";
           name = "look-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/look-mode";
+          homepage = "https://melpa.org/#/look-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -34159,13 +35469,13 @@
           sha256 = "1wmd7s3dk9krgmhs4f92mig18vx6y551n45ai7cvj92f4fbrsd08";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/loop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/loop";
           sha256 = "0pav16kinzljmzx84vfz63fvi39af4628vk1jw79jk0pyg9rjbar";
           name = "loop";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/loop";
+          homepage = "https://melpa.org/#/loop";
           license = lib.licenses.free;
         };
       }) {};
@@ -34180,13 +35490,13 @@
           sha256 = "0grzl4kqpc1x6569yfh9xdzzbgmhcskxwk6f7scjpl32acr88cmx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lorem-ipsum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lorem-ipsum";
           sha256 = "0p62yifbrknjn8z0613wy2aaknj44liyrgbknhpa0qn0d4fcrp4h";
           name = "lorem-ipsum";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lorem-ipsum";
+          homepage = "https://melpa.org/#/lorem-ipsum";
           license = lib.licenses.free;
         };
       }) {};
@@ -34201,13 +35511,13 @@
           sha256 = "179r4pz3hlb5p6bjfhdikkx1zvh09ln5dbw3c3rmlyww1q7v26yl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/love-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/love-minor-mode";
           sha256 = "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m";
           name = "love-minor-mode";
         };
         packageRequires = [ lua-mode ];
         meta = {
-          homepage = "http://melpa.org/#/love-minor-mode";
+          homepage = "https://melpa.org/#/love-minor-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -34222,13 +35532,13 @@
           sha256 = "1psk4202rmkkfy1ir1ax4x4djfngd5pfry7x30ybq2ifqzymb9qb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lua-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lua-mode";
           sha256 = "0gyi7w2h192h3pmrhq39lxwlwd9qyqs303lnp2655pikdzk9js94";
           name = "lua-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lua-mode";
+          homepage = "https://melpa.org/#/lua-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -34243,13 +35553,13 @@
           sha256 = "0mv73s89n59m44szc37086wq55py5sx0lc0jxncfybawhsqyd0ar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lush-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lush-theme";
           sha256 = "03kqws8dzm0ay5k86f4v7g2g2ygwk4fzmz2vyzhzhbsj8hrniq9p";
           name = "lush-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/lush-theme";
+          homepage = "https://melpa.org/#/lush-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -34264,13 +35574,13 @@
           sha256 = "1r1xfn0dyc4m49064g9n6hpwn4r763kpbg3dgprsv30i5ska61qa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lusty-explorer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lusty-explorer";
           sha256 = "0xqanmmkyvzcg2g4zvascq5j004bqz7vmz1a19c25g9cs3rdh0ps";
           name = "lusty-explorer";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lusty-explorer";
+          homepage = "https://melpa.org/#/lusty-explorer";
           license = lib.licenses.free;
         };
       }) {};
@@ -34285,13 +35595,13 @@
           sha256 = "090gk0il4yyypzjbh2qrjdaldwf90fi30impmh4zcfl73bic5q9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lxc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lxc";
           sha256 = "1rv1ybmbjx7n3cavx21nzmvckw63q3jmjsfdr2pcgavrr2ck6lka";
           name = "lxc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lxc";
+          homepage = "https://melpa.org/#/lxc";
           license = lib.licenses.free;
         };
       }) {};
@@ -34306,13 +35616,13 @@
           sha256 = "1rrfvshl6zbsrswg5hrvq1p0rd9vacqwbr4s44kln7vg4ybcgr24";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/m-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/m-buffer";
           sha256 = "0l2rayglv48pcwnr1ggmn8c0az0mffgv02ivnzr9jcfs55ki07fc";
           name = "m-buffer";
         };
         packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/m-buffer";
+          homepage = "https://melpa.org/#/m-buffer";
           license = lib.licenses.free;
         };
       }) {};
@@ -34327,13 +35637,13 @@
           sha256 = "119c77s3qp1vqc5m2yf7m4s81aphkhsvsnwqmpq6xl08r3592zxz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/macro-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/macro-math";
           sha256 = "1r7splwq5kdrdhbmw5zn81vxymsrllgil48g8dl0r60293384h00";
           name = "macro-math";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/macro-math";
+          homepage = "https://melpa.org/#/macro-math";
           license = lib.licenses.free;
         };
       }) {};
@@ -34341,17 +35651,17 @@
         pname = "macros-plus";
         version = "20151231.1619";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/macros+.el";
+          url = "https://www.emacswiki.org/emacs/download/macros+.el";
           sha256 = "07iw9iarz6z9n6vnhqqljfjpvq6vb97ca2hwj9v0k5k8mafdqg7d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/macros+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/macros+";
           sha256 = "0aihszxsjnc93pbbkmkr1iwzvii3jw8yh1f6dpnjykgvb328pvqi";
           name = "macros-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/macros+";
+          homepage = "https://melpa.org/#/macros+";
           license = lib.licenses.free;
         };
       }) {};
@@ -34366,13 +35676,13 @@
           sha256 = "0g9bnq4p3ffvva30hpll80dn3i41m51mcvw3qf787zg1nmc5a0j6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/macrostep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/macrostep";
           sha256 = "1wjibxbdsp5qfhq8xy0mcf3ms0q74qhdrhqndprn6jh3kcn5q63c";
           name = "macrostep";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/macrostep";
+          homepage = "https://melpa.org/#/macrostep";
           license = lib.licenses.free;
         };
       }) {};
@@ -34387,13 +35697,13 @@
           sha256 = "1flamyk7z3r723cczqra0f4yabc6kmgwjaw2bvs3kisppqmmz72g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mag-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mag-menu";
           sha256 = "1r1yisjnqxl9llpf91rwqp4q47jc4qp32xnkl8wzsgr0r2qf5yk2";
           name = "mag-menu";
         };
         packageRequires = [ splitter ];
         meta = {
-          homepage = "http://melpa.org/#/mag-menu";
+          homepage = "https://melpa.org/#/mag-menu";
           license = lib.licenses.free;
         };
       }) {};
@@ -34408,13 +35718,13 @@
           sha256 = "1km5g9g1jmyx1r3fhd9w8091xainmmvmhi6bzqr1l4nx138wwf2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magic-filetype";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magic-filetype";
           sha256 = "0gcys45cqn5ghppkn0rmyvfybprlfz1x6hqr21yv93mf79h75zhg";
           name = "magic-filetype";
         };
         packageRequires = [ emacs s ];
         meta = {
-          homepage = "http://melpa.org/#/magic-filetype";
+          homepage = "https://melpa.org/#/magic-filetype";
           license = lib.licenses.free;
         };
       }) {};
@@ -34429,28 +35739,28 @@
           sha256 = "1gmhb8g1pl4qqk1d32hlvmhx2jqfsn3hkc4lkzhgk1n3qzfrq4hf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magic-latex-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magic-latex-buffer";
           sha256 = "0xm4vk4aggyfw96cgya5cp97jzx5ha0xwpf2yfh7c3m8d9cca4y8";
           name = "magic-latex-buffer";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/magic-latex-buffer";
+          homepage = "https://melpa.org/#/magic-latex-buffer";
           license = lib.licenses.free;
         };
       }) {};
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20160219.1702";
+        version = "20160425.630";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "08c61ea85ca62e8cc04c4e8a0a55a5d947a8d01f";
-          sha256 = "18jk5bl30kncbc5n7sra5i0n4d57c2nd348kmw154xq1dc7w8b64";
+          rev = "d1f678316f2c27e9677760938757b38168e36ebc";
+          sha256 = "01pcx8bx07vqzd3b3rb3y4hgv8fhrlal7ayn0f70nr01f3v0gfl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit";
           sha256 = "0518ax2y7y2ji4jp7yghy84yxm0zgb059aqfa4v17grm4kr8p16q";
           name = "magit";
         };
@@ -34463,7 +35773,7 @@
           with-editor
         ];
         meta = {
-          homepage = "http://melpa.org/#/magit";
+          homepage = "https://melpa.org/#/magit";
           license = lib.licenses.free;
         };
       }) {};
@@ -34474,17 +35784,17 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-annex";
-          rev = "db655ed50f38af8940e808afc30447746e2c648a";
-          sha256 = "18xvcw6rbkzrvk7b9cl42fdcaphnx08klnss1vw1b7q9ijbinpbp";
+          rev = "8c8ff39e640c6bd02cf094830ca52ab2c5a74e22";
+          sha256 = "0fc8g1lba8pfd04i084djfn11c1yqf2rildf7w5jr9l0cryv6f7h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-annex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-annex";
           sha256 = "1ri58s1ly416ksmb7mql6vnmx7hq59lmhi7qijknjarw7qs3bqys";
           name = "magit-annex";
         };
         packageRequires = [ cl-lib magit ];
         meta = {
-          homepage = "http://melpa.org/#/magit-annex";
+          homepage = "https://melpa.org/#/magit-annex";
           license = lib.licenses.free;
         };
       }) {};
@@ -34499,13 +35809,13 @@
           sha256 = "0nkxxhxkhy314jv1l3hza84vigl8q7fc8hjjvrx58gfgsfgifx6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-filenotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-filenotify";
           sha256 = "00a77czdi24n3zkx6jwaj2asablzpxq16iqd8s84kkqxcfiiahn7";
           name = "magit-filenotify";
         };
         packageRequires = [ emacs magit ];
         meta = {
-          homepage = "http://melpa.org/#/magit-filenotify";
+          homepage = "https://melpa.org/#/magit-filenotify";
           license = lib.licenses.free;
         };
       }) {};
@@ -34514,145 +35824,166 @@
         pname = "magit-find-file";
         version = "20150702.330";
         src = fetchFromGitHub {
-          owner = "bradleywright";
+          owner = "bradwright";
           repo = "magit-find-file.el";
           rev = "c3ea91bab37d10a814a829728ec972811f728d60";
           sha256 = "1j3jsrp0qpaa2xd98d1g9z0zc4b93knwajrlnlsc7l6g0vlfsddb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-find-file";
-          sha256 = "1d5flydyhwhvhlhi541zcnz2b03bi07zrp21bfz5sm069bf2c96b";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-find-file";
+          sha256 = "1y66nsq1hbv1sb4n71gdxv7p1rz37vd9lkf7zl7avy0dchs499ik";
           name = "magit-find-file";
         };
         packageRequires = [ dash magit ];
         meta = {
-          homepage = "http://melpa.org/#/magit-find-file";
+          homepage = "https://melpa.org/#/magit-find-file";
           license = lib.licenses.free;
         };
       }) {};
     magit-gerrit = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-gerrit";
-        version = "20160128.2126";
+        version = "20160226.330";
         src = fetchFromGitHub {
           owner = "terranpro";
           repo = "magit-gerrit";
-          rev = "04fc4b7ad7366db9559618ace1a61a4e571dde66";
-          sha256 = "0f8bcrvnffpcfxgxwp3rvrd4m0apdc7k93952l4v1mqc762lql1s";
+          rev = "ece6f369694aca17f3ac166ed2801b432acfe20d";
+          sha256 = "0mms0gxv9a3ns8lk5k2wjibm3088y1cmpr3axjdh6ppv7r5wdvii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-gerrit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-gerrit";
           sha256 = "1iwvg10ly6dlf8llz9f8d4qfdbvd3s28wf48qgn1wjlxpka6zrd4";
           name = "magit-gerrit";
         };
         packageRequires = [ magit ];
         meta = {
-          homepage = "http://melpa.org/#/magit-gerrit";
+          homepage = "https://melpa.org/#/magit-gerrit";
           license = lib.licenses.free;
         };
       }) {};
     magit-gh-pulls = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild, pcache, s }:
     melpaBuild {
         pname = "magit-gh-pulls";
-        version = "20160215.432";
+        version = "20160413.1651";
         src = fetchFromGitHub {
           owner = "sigma";
           repo = "magit-gh-pulls";
-          rev = "323dbd8f67e3cc307da12e93b1799583902d46a5";
-          sha256 = "08742hdjzcgl12g2i7f37fnwx7mil28i3kdh96wir9pci2jvjcxw";
+          rev = "a0ceca0b0bf2d782a039fa07848b8da5abd7f2bb";
+          sha256 = "0j2gj7lnbwzhbhhccsq4gws7gkzlafz25bp47907rf7a3vq8714a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-gh-pulls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-gh-pulls";
           sha256 = "0qn9vjxi33pya9s8v3g95scmhwrn2yf5pjm7d24frq766wigjv8d";
           name = "magit-gh-pulls";
         };
         packageRequires = [ emacs gh magit pcache s ];
         meta = {
-          homepage = "http://melpa.org/#/magit-gh-pulls";
+          homepage = "https://melpa.org/#/magit-gh-pulls";
           license = lib.licenses.free;
         };
       }) {};
     magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "magit-gitflow";
-        version = "20160208.1504";
+        version = "20160318.900";
         src = fetchFromGitHub {
           owner = "jtatarik";
           repo = "magit-gitflow";
-          rev = "46dc3f20b6f6d5e91e9765da372c909e9cc7b355";
-          sha256 = "1ar9gdp4svymibr9arrlxil1xm1x41gxinlifdb8lgpmawb62d9w";
+          rev = "e65ac501b603f245737b0fb73e71520356924f3f";
+          sha256 = "0g9wqd4dbd0spal7ss9k679nak02hr1z0mgq6k4g5nkgngwn6l2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-gitflow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-gitflow";
           sha256 = "0wsqq3xpqqfak4aqwsh5sxjb1m62z3z0ysgdmnrch3qsh480r8vf";
           name = "magit-gitflow";
         };
         packageRequires = [ magit magit-popup ];
         meta = {
-          homepage = "http://melpa.org/#/magit-gitflow";
+          homepage = "https://melpa.org/#/magit-gitflow";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-p4 = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild, p4 }:
+    melpaBuild {
+        pname = "magit-p4";
+        version = "20160311.1109";
+        src = fetchFromGitHub {
+          owner = "qoocku";
+          repo = "magit-p4";
+          rev = "14e40cba11e73fae3bc300dbdb65274ebf1278b4";
+          sha256 = "01ifl1bg3sd5d4b5ms9kyw074as8bkzqpwhxppp79ml46vp1np2x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-p4";
+          sha256 = "19p7h3a21jjr2h52ika14lyczdv6z36gl7hk1v17bffffac8q069";
+          name = "magit-p4";
+        };
+        packageRequires = [ cl-lib magit magit-popup p4 ];
+        meta = {
+          homepage = "https://melpa.org/#/magit-p4";
           license = lib.licenses.free;
         };
       }) {};
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20160130.849";
+        version = "20160425.630";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "08c61ea85ca62e8cc04c4e8a0a55a5d947a8d01f";
-          sha256 = "18jk5bl30kncbc5n7sra5i0n4d57c2nd348kmw154xq1dc7w8b64";
+          rev = "d1f678316f2c27e9677760938757b38168e36ebc";
+          sha256 = "01pcx8bx07vqzd3b3rb3y4hgv8fhrlal7ayn0f70nr01f3v0gfl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-popup";
           sha256 = "0w6m384bbmp3bd4qbss5h1jvcfp4qnpqvzlfykhdgjwpv2b2a2fj";
           name = "magit-popup";
         };
         packageRequires = [ async dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/magit-popup";
+          homepage = "https://melpa.org/#/magit-popup";
           license = lib.licenses.free;
         };
       }) {};
     magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-rockstar";
-        version = "20160117.1858";
+        version = "20160424.632";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "magit-rockstar";
-          rev = "6d572b9371c366814b3b071aa6301e503a47fbdd";
-          sha256 = "1pqbrrp4366kwfk1d32h2lb70id32ynfc03i7m2832w97f1xp16c";
+          rev = "16b576c45d5ce1ffda80f0db5d779b9c548a5adb";
+          sha256 = "1wxk7h1v123h4m20fk5h70an17zzkfr437xyqjpcy085qqz679jr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-rockstar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-rockstar";
           sha256 = "1i4fmraiypyd3q6vvibkg9xqfxiq83kcz64b1dr3wmwn30j7986n";
           name = "magit-rockstar";
         };
         packageRequires = [ dash magit ];
         meta = {
-          homepage = "http://melpa.org/#/magit-rockstar";
+          homepage = "https://melpa.org/#/magit-rockstar";
           license = lib.licenses.free;
         };
       }) {};
     magit-stgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-stgit";
-        version = "20160217.947";
+        version = "20160224.903";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-stgit";
-          rev = "082a2e89eb769ffb95fb3895c9b32163e4c476ae";
-          sha256 = "1xkzgakm83djf91a5n3cbid0k15439lfgmq8hw0vmb3vb2fz3h9b";
+          rev = "9d13effdbc213a0c8dcce78e1825011631fa0652";
+          sha256 = "163a1rddl54jgxm5dygnbp1pz1as4hhjszan1rcabvzcfnfdpakj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-stgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-stgit";
           sha256 = "12wg1ig2jzy2np76brpwxdix9pwv75chviq3c24qyv4y80pd11sv";
           name = "magit-stgit";
         };
         packageRequires = [ emacs magit ];
         meta = {
-          homepage = "http://melpa.org/#/magit-stgit";
+          homepage = "https://melpa.org/#/magit-stgit";
           license = lib.licenses.free;
         };
       }) {};
@@ -34667,55 +35998,55 @@
           sha256 = "0r3nkrisyjawjwbm74yi6fqiwcqzlfkypsdscfhii0q50ky8plph";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-svn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-svn";
           sha256 = "02n732z06f0bhxqkxzlvm36bpqr40pas09zbzpfdk4pb6f9f80s0";
           name = "magit-svn";
         };
         packageRequires = [ emacs magit ];
         meta = {
-          homepage = "http://melpa.org/#/magit-svn";
+          homepage = "https://melpa.org/#/magit-svn";
           license = lib.licenses.free;
         };
       }) {};
     magit-topgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-topgit";
-        version = "20160215.1039";
+        version = "20160313.1454";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-topgit";
-          rev = "baa503babf7e15bfb448122f5213398a8b4ef8a1";
-          sha256 = "1qwq51b4ihk6nfa00fzzv4qkkxf1vpxh5l69bxrgwgyqbxvci0c6";
+          rev = "243fdfa7ce62dce4efd01b6b818a2791868db2f0";
+          sha256 = "06fbjv3zd92lvg4xjsp9l4jkxx2glhng3ys3s9jmvy5y49pymwb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-topgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-topgit";
           sha256 = "1ngrgf40n1g6ncd5nqgr0zgxwlkmv9k4fik96dgzysgwincx683i";
           name = "magit-topgit";
         };
         packageRequires = [ emacs magit ];
         meta = {
-          homepage = "http://melpa.org/#/magit-topgit";
+          homepage = "https://melpa.org/#/magit-topgit";
           license = lib.licenses.free;
         };
       }) {};
     magma-mode = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magma-mode";
-        version = "20150923.340";
+        version = "20160304.608";
         src = fetchFromGitHub {
           owner = "ThibautVerron";
           repo = "magma-mode";
-          rev = "4c858609b0f36c6f8b395441920c9510dcbddca8";
-          sha256 = "0v3ikqv2m5hcg1rkfbw58a9w4y6sk51bblp0k2h0srcvim6sqlpm";
+          rev = "528c96a269980dcc6b65e2e973510ff07e6b9fc4";
+          sha256 = "1pq6ckxp3dcb2f6xfsd4jwd43r9d0920m30ammp39glgc39p9lsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magma-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magma-mode";
           sha256 = "1gq6yi51h1h7ivrm1xr6nfrpabx8ylbk0waaw04gnw3bb54dmmvc";
           name = "magma-mode";
         };
         packageRequires = [ cl-lib dash f ];
         meta = {
-          homepage = "http://melpa.org/#/magma-mode";
+          homepage = "https://melpa.org/#/magma-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -34730,13 +36061,13 @@
           sha256 = "1hqz26zm4bdz5wavna4j9yia3ns4z19dnszl7k0lcpgbgmb0wh8y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magnatune";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magnatune";
           sha256 = "0fmxlrq5ls6fpbk5fv67aan8gg1c61i1chfw5lhf496pwqzq901d";
           name = "magnatune";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/magnatune";
+          homepage = "https://melpa.org/#/magnatune";
           license = lib.licenses.free;
         };
       }) {};
@@ -34745,40 +36076,40 @@
         pname = "main-line";
         version = "20151120.2006";
         src = fetchFromGitHub {
-          owner = "jasonm23";
+          owner = "emacsfodder";
           repo = "emacs-mainline";
           rev = "0e88f91e49ef27cb77d74f6a8d8140063549d67f";
           sha256 = "06sjwl0bk648wnnrmyh6qgnlqmxypjmy0gkfl6kpv01r8vh7x2q5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/main-line";
-          sha256 = "0c9c5kmixvhk9il8hsxzf2k14fggb9b9mw59g8q3hgpn5g7kgpkv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/main-line";
+          sha256 = "06rihx9h2h8ayrirbx74d9qdf26laz9yxffvxyldzm9hymlbzadd";
           name = "main-line";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/main-line";
+          homepage = "https://melpa.org/#/main-line";
           license = lib.licenses.free;
         };
       }) {};
     majapahit-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "majapahit-theme";
-        version = "20160203.829";
+        version = "20160412.632";
         src = fetchFromGitLab {
           owner = "franksn";
           repo = "majapahit-theme";
-          rev = "ccb069c3dc632e27e416716aaf705c1a215ead70";
-          sha256 = "1wwc9byjihpdm08a0c0mzbw2r55lhr7c4k0gbcl05hygphymwng7";
+          rev = "017b6072560a6e3a4a9bd17652a9a9995cb53d52";
+          sha256 = "1s4sm59wz03yz4srqzav7myq6p0gmijw5zj2kbpvxfanlr8b2rb1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/majapahit-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/majapahit-theme";
           sha256 = "04k2smrya27rrjlzvnl3a6llg8vj8x4mm9qyk4kwrmckhd6jd68s";
           name = "majapahit-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/majapahit-theme";
+          homepage = "https://melpa.org/#/majapahit-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -34793,13 +36124,13 @@
           sha256 = "1ky3scyjb69wi76xg6a8qx4ja6lr6mk530bv5gmhj7fxbq8b3x5c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/make-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/make-color";
           sha256 = "0mrv8b67lpid5m8rfbhcik76bvnjlw4xmcrd2c2iinyl02y07r5k";
           name = "make-color";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/make-color";
+          homepage = "https://melpa.org/#/make-color";
           license = lib.licenses.free;
         };
       }) {};
@@ -34814,13 +36145,13 @@
           sha256 = "00j5n9pil1qik4mrzvam4rp6213w8jm4qw7c4z8sxpq57xa0b679";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/make-it-so";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/make-it-so";
           sha256 = "0a8abz54mb60mfr0bl9ry8yawq99vx9hjl4fm2sivns58qjgfy73";
           name = "make-it-so";
         };
         packageRequires = [ emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/make-it-so";
+          homepage = "https://melpa.org/#/make-it-so";
           license = lib.licenses.free;
         };
       }) {};
@@ -34835,13 +36166,13 @@
           sha256 = "0w3kar52yf8clf9801c4jzfrixi10clc8fs8ni2d4pzhdwwca2zw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/maker-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/maker-mode";
           sha256 = "03q09jxmhwqy7g09navj08z9ir0rbh7w26c1av7hwhmq4i6xwg8a";
           name = "maker-mode";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/maker-mode";
+          homepage = "https://melpa.org/#/maker-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -34856,13 +36187,13 @@
           sha256 = "1rr7vpm3xxzcaam3m8xni3ajy8ycyljix07n2jzczayri9sd8csy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/makey";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/makey";
           sha256 = "06xgrlkqvg288yd4lyhx4vi80jlfarhblxk5m5zzs5as7n08cvk4";
           name = "makey";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/makey";
+          homepage = "https://melpa.org/#/makey";
           license = lib.licenses.free;
         };
       }) {};
@@ -34877,34 +36208,34 @@
           sha256 = "0hlxs9gi2vml2id9q0r1r0xdm0zshjzc1w3phjf2ab0aa3hl5k6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/malabar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/malabar-mode";
           sha256 = "026ing7v22rz1pfzs2j9z09pm6dajpys992n45gzhwirz5f0q1rk";
           name = "malabar-mode";
         };
         packageRequires = [ fringe-helper groovy-mode ];
         meta = {
-          homepage = "http://melpa.org/#/malabar-mode";
+          homepage = "https://melpa.org/#/malabar-mode";
           license = lib.licenses.free;
         };
       }) {};
     malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }:
     melpaBuild {
         pname = "malinka";
-        version = "20151107.216";
+        version = "20160402.329";
         src = fetchFromGitHub {
           owner = "LefterisJP";
           repo = "malinka";
-          rev = "cd451d32dcdfa3e6b34f47c6956ff310de8a9a06";
-          sha256 = "1a22xkhnmpfffllarsjdw10n5cd3nwifcl1iv98kb4j4x96kd4xg";
+          rev = "bfb25297fd2dc13813da593305906e18bbedbebe";
+          sha256 = "04j7x7kkilfrk4i76aizkdhmghi9a5hc63mj6mhm8x0v1c4f15lj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/malinka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/malinka";
           sha256 = "1245mpxsxwnnpdsf0pd28mddgdfhh7x32a2l3sxfq0dyg2xlgvrp";
           name = "malinka";
         };
         packageRequires = [ cl-lib dash f projectile rtags s ];
         meta = {
-          homepage = "http://melpa.org/#/malinka";
+          homepage = "https://melpa.org/#/malinka";
           license = lib.licenses.free;
         };
       }) {};
@@ -34919,13 +36250,13 @@
           sha256 = "18x3cssfn81k8hg4frj7dhzphg784321z51wbbvn3bjhq7s6j3a2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mallard-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mallard-mode";
           sha256 = "0y2ikjgy107kb85pz50vv7ywslqgbrrkcfsrd8gsk1jky4qn8izd";
           name = "mallard-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mallard-mode";
+          homepage = "https://melpa.org/#/mallard-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -34940,13 +36271,13 @@
           sha256 = "0qk7i47nmyp4llwp6x0i1i5dk82ck26iyz1sjvvlihaw8a5akny2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mallard-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mallard-snippets";
           sha256 = "0437qd7q9i32pmhxaz3vi2dnfpj4nddmzgnqpwsgl28slhjw2hv8";
           name = "mallard-snippets";
         };
         packageRequires = [ mallard-mode yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/mallard-snippets";
+          homepage = "https://melpa.org/#/mallard-snippets";
           license = lib.licenses.free;
         };
       }) {};
@@ -34961,13 +36292,13 @@
           sha256 = "1lfq4hsq2n33l58ja5kzy6bwk9jxbcdsg6y8gqlk71lcslzqldrk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/man-commands";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/man-commands";
           sha256 = "1yl7y0k24gydldfs406v1n523q46m9x6in6pgljgjnjravc67wnq";
           name = "man-commands";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/man-commands";
+          homepage = "https://melpa.org/#/man-commands";
           license = lib.licenses.free;
         };
       }) {};
@@ -34982,34 +36313,34 @@
           sha256 = "10wl7kc76dyijrmdlcl5cx821jg7clsj35r22955mbbgh7zl1x07";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/manage-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/manage-minor-mode";
           sha256 = "11jdj8kd401q0y8bbyyn72f27f51bckqid10dnh64z8w7hv59cw6";
           name = "manage-minor-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/manage-minor-mode";
+          homepage = "https://melpa.org/#/manage-minor-mode";
           license = lib.licenses.free;
         };
       }) {};
     mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "mandoku";
-        version = "20160126.2226";
+        version = "20160417.539";
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "b1ac72baebc4df601fb94e40922d4f95719de1ef";
-          sha256 = "0065fxw0zc7vbxcl37nl8v5cgxcr3gzx3k1n16gpw7fgbdp060d4";
+          rev = "977dcc41e90465c8d1a35f07289d8631b389495f";
+          sha256 = "0mqvbniz9qwi2cawyrgi8a99mwpvi7n5pbxgqh5bw844y54yfhnd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mandoku";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mandoku";
           sha256 = "1pg7ir3y6yk92kfs5agbxapcxf7gy60m353rjv8g3kfkx5zyh3mv";
           name = "mandoku";
         };
         packageRequires = [ git github-clone magit org ];
         meta = {
-          homepage = "http://melpa.org/#/mandoku";
+          homepage = "https://melpa.org/#/mandoku";
           license = lib.licenses.free;
         };
       }) {};
@@ -35024,13 +36355,13 @@
           sha256 = "0pd6bh7wrrh59blp86a2jl2vi4qkzx49z0hy7dkc71ccg0wjsgz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/map-progress";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/map-progress";
           sha256 = "0zc5vii72gbfwbb35w8m30c8r9zck971hwgcn1a4wjczgn4vkln7";
           name = "map-progress";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/map-progress";
+          homepage = "https://melpa.org/#/map-progress";
           license = lib.licenses.free;
         };
       }) {};
@@ -35045,34 +36376,34 @@
           sha256 = "0kk1sk3cr4dbmgq4wzml8kdf14dn9jbyq4bwmvk0i7dic9vwn21c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/map-regexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/map-regexp";
           sha256 = "0yiif0033lhaqggywzfizfia3siggwcz7yv4z7przhnr04akdmbj";
           name = "map-regexp";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/map-regexp";
+          homepage = "https://melpa.org/#/map-regexp";
           license = lib.licenses.free;
         };
       }) {};
     marcopolo = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
     melpaBuild {
         pname = "marcopolo";
-        version = "20150326.1118";
+        version = "20160421.504";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "marcopolo";
-          rev = "ce6ad40d7feab0568924e3bd9659b76e3eecd55e";
-          sha256 = "0y4b69r2l6kvh7g8f1y9v1pdall3n668ci24lp04lcms6rxcrsnh";
+          rev = "85db828f2bb4346a811b3326349b1c6d0aae4601";
+          sha256 = "1qf724y1zq3z6fzm23qhwjl2knhs49nbz0vizwf8g9s51bk6bny2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/marcopolo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/marcopolo";
           sha256 = "1nbck1m7lhync7n474578d2g1zc72c841hi236xjbdd2lnxz3zz0";
           name = "marcopolo";
         };
         packageRequires = [ dash pkg-info request s ];
         meta = {
-          homepage = "http://melpa.org/#/marcopolo";
+          homepage = "https://melpa.org/#/marcopolo";
           license = lib.licenses.free;
         };
       }) {};
@@ -35087,13 +36418,13 @@
           sha256 = "1x3anvy3hlmydxyfzr1rhaiy502yi1yz3v54sg8wc1w7jrvwaj29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mark-multiple";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mark-multiple";
           sha256 = "179wd9g0smm76k92n7j2vgg8gz5wn9lczrns5ggq2yhbc77j0gn4";
           name = "mark-multiple";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mark-multiple";
+          homepage = "https://melpa.org/#/mark-multiple";
           license = lib.licenses.free;
         };
       }) {};
@@ -35108,34 +36439,34 @@
           sha256 = "0k4zvbs09mkr8vdffv18s55rn9cyxldzav9vw04lm7v296k94ivz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mark-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mark-tools";
           sha256 = "1688y7lnzhwdva2ildjabzi10i87klfsgvs947i7gfgxl7jwhisq";
           name = "mark-tools";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mark-tools";
+          homepage = "https://melpa.org/#/mark-tools";
           license = lib.licenses.free;
         };
       }) {};
-    markdown-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20160219.1113";
+        version = "20160409.850";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "3e88d58ab783f4c9c8b932b1b30a2742ddda2c50";
-          sha256 = "1zmq7g9rlf3n36rrgarbw3xwn4zrhc1qg9ammfp08n9pd0vahy77";
+          rev = "f3928b79dc2afa471f2093ef123377ba04b5350b";
+          sha256 = "0dx084n2l93hss161z3v87rjpfhv03cmn0hylnsv81hfim8iwi5c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markdown-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/markdown-mode";
           sha256 = "0gfb3hp87kpcrvxax3m5hsaclwwk1qmxc73cg26smzd1kjfwgz14";
           name = "markdown-mode";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/markdown-mode";
+          homepage = "https://melpa.org/#/markdown-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -35150,13 +36481,13 @@
           sha256 = "1adl36fj506kgfw40gpagzsd7aypfdvy60141raggd5844i6y96r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markdown-mode+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/markdown-mode+";
           sha256 = "1535kcj9nmcgmk2448jxc0jmnqy7f50cw2ngffjq5w8bfhgf7q00";
           name = "markdown-mode-plus";
         };
         packageRequires = [ markdown-mode ];
         meta = {
-          homepage = "http://melpa.org/#/markdown-mode+";
+          homepage = "https://melpa.org/#/markdown-mode+";
           license = lib.licenses.free;
         };
       }) {};
@@ -35171,13 +36502,13 @@
           sha256 = "1i5gr3j9dq41p2zl4bfyvzv6i5z7hgrxzrycmbdc3s7nja36k9z4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markdown-preview-eww";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/markdown-preview-eww";
           sha256 = "0j6924f84is41dspib68y5lnz1f8nm7pqyhv47alxra50cjrpxnx";
           name = "markdown-preview-eww";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/markdown-preview-eww";
+          homepage = "https://melpa.org/#/markdown-preview-eww";
           license = lib.licenses.free;
         };
       }) {};
@@ -35192,34 +36523,34 @@
           sha256 = "1yi5hsgf8hr7v1wyn3bw650g3ysbglwn5qfrmb6yl3s08lvi1vlf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markdown-preview-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/markdown-preview-mode";
           sha256 = "0i0mld45d8y96nkqn2r77nvbyw6wgsf8r54d3c2jrv04mnaxs7pg";
           name = "markdown-preview-mode";
         };
         packageRequires = [ cl-lib markdown-mode websocket ];
         meta = {
-          homepage = "http://melpa.org/#/markdown-preview-mode";
+          homepage = "https://melpa.org/#/markdown-preview-mode";
           license = lib.licenses.free;
         };
       }) {};
     markdown-toc = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, s }:
     melpaBuild {
         pname = "markdown-toc";
-        version = "20160207.1058";
+        version = "20160227.508";
         src = fetchFromGitHub {
           owner = "ardumont";
           repo = "markdown-toc";
-          rev = "ddaba5fde8e15dad74ebc20abc71c7766c8fd980";
-          sha256 = "17ninp3hpy8k1r6a4mz28dbk4kwg3myhzny2r7mix50rbvcf0y8n";
+          rev = "c5d44470f8fb0f61bc96e58dec998010edcc0e95";
+          sha256 = "0l687bna8rrc49y1fyn1ldjcwh290qgvi3p86c63yj4xy24fmdm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markdown-toc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/markdown-toc";
           sha256 = "0slky735yzmbfi4ld264vw64b4a4nllhywp19ya0sljbsfycbihv";
           name = "markdown-toc";
         };
         packageRequires = [ dash markdown-mode s ];
         meta = {
-          homepage = "http://melpa.org/#/markdown-toc";
+          homepage = "https://melpa.org/#/markdown-toc";
           license = lib.licenses.free;
         };
       }) {};
@@ -35234,13 +36565,13 @@
           sha256 = "1i95b15mvkkki2iq8hysdr7jr1d5nix9jjkh7jz0alvaybqlsnqi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/markup";
           sha256 = "0yw4b42nc2n7nanqvj596hwjf0p4qc7x6g2d9g5cwi7975iak8pf";
           name = "markup";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/markup";
+          homepage = "https://melpa.org/#/markup";
           license = lib.licenses.free;
         };
       }) {};
@@ -35255,13 +36586,13 @@
           sha256 = "1w6i1m7xdr9cijnmdj35cl99r12vl83qws0qlfhrgvisilshnr27";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markup-faces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/markup-faces";
           sha256 = "12z92j9f0mpn7w2qkiwg54wh743q3inx56q3f8qcpfzyks546grq";
           name = "markup-faces";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/markup-faces";
+          homepage = "https://melpa.org/#/markup-faces";
           license = lib.licenses.free;
         };
       }) {};
@@ -35276,13 +36607,13 @@
           sha256 = "1ygznmqb3fqy94p8qi71i223m7cpw3f596pkls2ybjlbpb4psjcl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/marmalade";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/marmalade";
           sha256 = "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s";
           name = "marmalade";
         };
         packageRequires = [ furl ];
         meta = {
-          homepage = "http://melpa.org/#/marmalade";
+          homepage = "https://melpa.org/#/marmalade";
           license = lib.licenses.free;
         };
       }) {};
@@ -35297,13 +36628,13 @@
           sha256 = "017k109nfif5mzkj547py8pdnzlr4sxb74yqqsl944znflq67blr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/marmalade-client";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/marmalade-client";
           sha256 = "0llwqwwxrf7qdkpdb03ij0iinll0vc9qr557zyr3bn5zb4fad1sq";
           name = "marmalade-client";
         };
         packageRequires = [ gh kv web ];
         meta = {
-          homepage = "http://melpa.org/#/marmalade-client";
+          homepage = "https://melpa.org/#/marmalade-client";
           license = lib.licenses.free;
         };
       }) {};
@@ -35318,55 +36649,55 @@
           sha256 = "0fwhhzfd6vgpaf5mrw90hvm35j2kzhk9h3gbrwd7y7q08nrmsx9p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/marshal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/marshal";
           sha256 = "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl";
           name = "marshal";
         };
         packageRequires = [ eieio json ];
         meta = {
-          homepage = "http://melpa.org/#/marshal";
+          homepage = "https://melpa.org/#/marshal";
           license = lib.licenses.free;
         };
       }) {};
     material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "material-theme";
-        version = "20160212.154";
+        version = "20160302.1534";
         src = fetchFromGitHub {
           owner = "cpaulik";
           repo = "emacs-material-theme";
-          rev = "3bdb927099e58a71fac0f73b80bf223342b31cc8";
-          sha256 = "108n2w8f0vsazw8wl50af8cb8amyb1qrg30nxwfwqgvi8d8iba4f";
+          rev = "149ef120a2f5c3af72b040261dd455baea7ceb2a";
+          sha256 = "0qw7m82gx2dqcrs5ycg0hn7y9qjzmkp5afdlx5ddxc2igp2a5q7h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/material-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/material-theme";
           sha256 = "1d259avldc5fq121xrqv53h8s4f4bp6b89nz2rvjhygz7f8hargq";
           name = "material-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/material-theme";
+          homepage = "https://melpa.org/#/material-theme";
           license = lib.licenses.free;
         };
       }) {};
     math-symbol-lists = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "math-symbol-lists";
-        version = "20151215.1243";
+        version = "20160302.1631";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "math-symbol-lists";
-          rev = "56319989e7ac6bd625b46e8a28f8005077b5957b";
-          sha256 = "186gb83y3g1q7d0sdrxqz22nr62qq6fy7m74qwirlsf7vnnm4gpx";
+          rev = "5bf2a050127228fda36ab6c492806f1f0f8af686";
+          sha256 = "1cpwa5cwnkxf4n1bd4cji3v9wdp057jdw7vckr02ra3s9s2ay5n3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/math-symbol-lists";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/math-symbol-lists";
           sha256 = "01j11k29acj0b1pcapmgi2d2s3p50bkms21i2qcj0cbqgz8h6s27";
           name = "math-symbol-lists";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/math-symbol-lists";
+          homepage = "https://melpa.org/#/math-symbol-lists";
           license = lib.licenses.free;
         };
       }) {};
@@ -35381,73 +36712,74 @@
           sha256 = "1chyxi096krjbi9zgbrnrkvwgmn4wygnia9m57m0jh4arlbm28la";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/math-symbols";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/math-symbols";
           sha256 = "0sx9cgyk56npjd6z78y9cldbvjl5ipl7k1nc1sylg1iggkbwxnqx";
           name = "math-symbols";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/math-symbols";
+          homepage = "https://melpa.org/#/math-symbols";
           license = lib.licenses.free;
         };
       }) {};
     matlab-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "matlab-mode";
-        version = "20160210.427";
+        version = "20160416.234";
         src = fetchgit {
           url = "git://git.code.sf.net/p/matlab-emacs/src";
-          rev = "e08bf6d49b9c1a325dd0e3bb71881b65c6348d66";
-          sha256 = "787c5ea50aa906d387c7cef39d44a86cd0d6998e391239bd0ff30a47fd75681d";
+          rev = "4e052dea36a6bbdf81c8ada5be5eca3297f54bd6";
+          sha256 = "0pwbq6hpvd4n9aw94dfpzynli6xc8r21q6kjpiwpfmyvag0lvyg9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/matlab-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/matlab-mode";
           sha256 = "1bybc5xv5hbjh8afmh03qda5g3m2wcgsk6lgj6jkyyxzdfxqkrck";
           name = "matlab-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/matlab-mode";
+          homepage = "https://melpa.org/#/matlab-mode";
           license = lib.licenses.free;
         };
       }) {};
     matrix-client = callPackage ({ fetchgit, fetchurl, json ? null, lib, melpaBuild, request }:
     melpaBuild {
         pname = "matrix-client";
-        version = "20160205.1800";
+        version = "20160424.2359";
         src = fetchgit {
           url = "git://fort.kickass.systems/personal/rrix/pub/matrix.el";
-          rev = "3b00bd20739268d60a029bae580372d7f4cdecd4";
-          sha256 = "006b30332ec67e837b6d822fd926adc7ea3afb9073fa9c5dac05292a3c13af01";
+          rev = "087e5520a3a1f9a8fcaa1ce61b4c06bc55a63605";
+          sha256 = "0z79l8md683vvc51fz0nmbazb6i7hklkm0asglflr96pldil50l8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/matrix-client";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/matrix-client";
           sha256 = "09mgxk0xngw8j46vz6f5nwkb01iq96bf9m51w2q61wxivypnsyr6";
           name = "matrix-client";
         };
         packageRequires = [ json request ];
         meta = {
-          homepage = "http://melpa.org/#/matrix-client";
+          homepage = "https://melpa.org/#/matrix-client";
           license = lib.licenses.free;
         };
       }) {};
-    maude-mode = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }:
+    maude-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "maude-mode";
-        version = "20140212.502";
-        src = fetchsvn {
-          url = "svn://svn.code.sf.net/p/maude-mode/code/trunk";
-          rev = "63";
-          sha256 = "06k07qvhm2mbqasn72649lx3pwzb0r466854a18g6lciwhiww7vy";
+        version = "20160222.1007";
+        src = fetchFromGitHub {
+          owner = "rudi";
+          repo = "maude-mode";
+          rev = "c9543bb8a172fa77af592388e7f520a4a6d38987";
+          sha256 = "1sn9bdaq3mf2vss5gzmxhnp9fz43cakxh36qjdgqrvx302nlnv52";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/maude-mode";
-          sha256 = "04b6q328hj0w33z4c50nqyark0pn5sqi0s8096m9di4rjwxaw0ma";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/maude-mode";
+          sha256 = "1w5v3r905xkwchkm2gzvzpswba5p2m7hqpyg9fzq2ldlr8kk7ah3";
           name = "maude-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/maude-mode";
+          homepage = "https://melpa.org/#/maude-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -35462,13 +36794,13 @@
           sha256 = "1xn2yyr8mr90cynbxgv0h5v180pzf0ydnjr9spg34mrdicqlki6c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/maven-test-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/maven-test-mode";
           sha256 = "1k9w51rh003p67yalzq1w8am40nnr2khyyb5y4bwxgpms8z391fm";
           name = "maven-test-mode";
         };
         packageRequires = [ emacs s ];
         meta = {
-          homepage = "http://melpa.org/#/maven-test-mode";
+          homepage = "https://melpa.org/#/maven-test-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -35483,13 +36815,13 @@
           sha256 = "0g9kpsg6623nmxnshj49q8k952xybrkmqqy6m892m8wnm22pjdz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/maxframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/maxframe";
           sha256 = "10cwy3gi3xb3pfdh6xiafxp3vvssawci3y26jda6550d0w5vardj";
           name = "maxframe";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/maxframe";
+          homepage = "https://melpa.org/#/maxframe";
           license = lib.licenses.free;
         };
       }) {};
@@ -35497,17 +36829,17 @@
         pname = "mb-depth-plus";
         version = "20151231.1621";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/mb-depth+.el";
+          url = "https://www.emacswiki.org/emacs/download/mb-depth+.el";
           sha256 = "0w8clp96jblsc9v87404zpc280ms0d644in34jdgjc5r33f4i0g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mb-depth+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mb-depth+";
           sha256 = "031hh227rh7l818p3di4h34i4698yynw5g9a5sl2hj47c0734q6w";
           name = "mb-depth-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mb-depth+";
+          homepage = "https://melpa.org/#/mb-depth+";
           license = lib.licenses.free;
         };
       }) {};
@@ -35518,17 +36850,17 @@
         src = fetchFromGitHub {
           owner = "dochang";
           repo = "mb-url";
-          rev = "e1d9af92f8f3c4fc96760558ee1a4df7bbbc537c";
-          sha256 = "1qd4vya49sy7iwcpnyd91d0zx3niwsavhdcq6387rsb0j64hwybl";
+          rev = "0ffd1a67161ebbe10fa6ad8064343eead2f79eae";
+          sha256 = "1g90f8ysj35bw9686gb3sczxqg3ilj3a7xnfskrkbp2llpvd5y43";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mb-url";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mb-url";
           sha256 = "1nf8ssan00qsn3d4dc6h6qzdwqzh977qb5d2m33kiwi6qb98988h";
           name = "mb-url";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/mb-url";
+          homepage = "https://melpa.org/#/mb-url";
           license = lib.licenses.free;
         };
       }) {};
@@ -35543,13 +36875,13 @@
           sha256 = "1zywygdgnp2zr8fxqhl0cbrgbl43931k936b9imhqi96p6622pb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mbe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mbe";
           sha256 = "0h18mbcjy8nh4gl12kg2v8x6ps320yk7sbgq5alqnx2shp80kri3";
           name = "mbe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/mbe";
+          homepage = "https://melpa.org/#/mbe";
           license = lib.licenses.free;
         };
       }) {};
@@ -35564,13 +36896,13 @@
           sha256 = "1vr85fdlb4zwgid1v00ndppla9fqqk25g2x2f5alm69pfqssr75z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mbo70s-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mbo70s-theme";
           sha256 = "1abx2rw09xxp122ff7i9sry5djd4l6vn4lfzxs92rknjzkyc40pb";
           name = "mbo70s-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/mbo70s-theme";
+          homepage = "https://melpa.org/#/mbo70s-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -35585,13 +36917,13 @@
           sha256 = "0252wdq4sd6jhzfy0pn3gdm6aq2h13nnp8hvrn1mpml9x473a5n1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mc-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mc-extras";
           sha256 = "0b110x6ygc95v5pb9lk1i731x5s6dagl5afzv37l1qchys36xrym";
           name = "mc-extras";
         };
         packageRequires = [ multiple-cursors ];
         meta = {
-          homepage = "http://melpa.org/#/mc-extras";
+          homepage = "https://melpa.org/#/mc-extras";
           license = lib.licenses.free;
         };
       }) {};
@@ -35606,13 +36938,13 @@
           sha256 = "1j8gp3byanf1mq8sc4hv838rgcywlv35d8q1vjwzsjaznvz8hvc3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/md-readme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/md-readme";
           sha256 = "1krq0f79jjrlihr2aqq87pxdqixv2zdjw4hm732sz79g996yxyw3";
           name = "md-readme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/md-readme";
+          homepage = "https://melpa.org/#/md-readme";
           license = lib.licenses.free;
         };
       }) {};
@@ -35627,34 +36959,34 @@
           sha256 = "136lh39hakwx46rd1gsmsfhsj78mrpamid766v2vjx9rkkprk0zv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/meacupla-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/meacupla-theme";
           sha256 = "09q88q2xghj5vn5y3mjrcparfwdzavkgjyg2ay55h7wf5f2zpw2d";
           name = "meacupla-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/meacupla-theme";
+          homepage = "https://melpa.org/#/meacupla-theme";
           license = lib.licenses.free;
         };
       }) {};
     mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mediawiki";
-        version = "20160123.2037";
+        version = "20160425.902";
         src = fetchFromGitHub {
           owner = "hexmode";
           repo = "mediawiki-el";
-          rev = "e5e2905f1f81228c34f7ce531246bbdc07c5122c";
-          sha256 = "0f0p6ppgj1w0gfyja9hbah6wsw7glx9ybpbs6kn7lwm0ir9rd33s";
+          rev = "40387ad7ae03f1589846518d7361c19774bcc4e3";
+          sha256 = "0kzmvsbzqrkrlnr5sf1xwazm9zyzbrflb4d1jrkp206q9yk439cr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mediawiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mediawiki";
           sha256 = "17cbrzfdp6jbbf74mn2fi1cwv7d1hvdbw9j84p43jzscnaa5ikx6";
           name = "mediawiki";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mediawiki";
+          homepage = "https://melpa.org/#/mediawiki";
           license = lib.licenses.free;
         };
       }) {};
@@ -35669,13 +37001,13 @@
           sha256 = "0bilwhvprzk634sk5hnxilrvrl0yv593swzznch0p38hqxl585ld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mellow-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mellow-theme";
           sha256 = "0kl1psykx7akxwabszk4amszh3zil8ia4bfbjjvr6h9phgx66pb0";
           name = "mellow-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/mellow-theme";
+          homepage = "https://melpa.org/#/mellow-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -35690,13 +37022,13 @@
           sha256 = "12cp56ppmwpdgf5afx7hd2qb8d1qq8z27191fbbf5zqw8cq5zkpd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/melpa-upstream-visit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/melpa-upstream-visit";
           sha256 = "0j4afy9ipzr7pwkij8ab207mabd7srganlyyif9h1hvclj9svdmf";
           name = "melpa-upstream-visit";
         };
         packageRequires = [ s ];
         meta = {
-          homepage = "http://melpa.org/#/melpa-upstream-visit";
+          homepage = "https://melpa.org/#/melpa-upstream-visit";
           license = lib.licenses.free;
         };
       }) {};
@@ -35711,13 +37043,13 @@
           sha256 = "0pjqax3pi6pb650yb8iwa4brwwl6cdka7jym3cfkpppyy782dm0q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/memento";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/memento";
           sha256 = "0f8ajhj677r2kxszmad6h1j1b827ja0vaz2my1vx145y3gf160b8";
           name = "memento";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/memento";
+          homepage = "https://melpa.org/#/memento";
           license = lib.licenses.free;
         };
       }) {};
@@ -35732,13 +37064,13 @@
           sha256 = "0fjwlrdm270qcrqffvarw5yhijk656q4lam79ybhaznzj0dq3xpw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/memoize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/memoize";
           sha256 = "0mzz3hghnbkmxf9wgjqv3sbyxyqqzvvscazq9ybb0b41qrzm73s6";
           name = "memoize";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/memoize";
+          homepage = "https://melpa.org/#/memoize";
           license = lib.licenses.free;
         };
       }) {};
@@ -35753,13 +37085,13 @@
           sha256 = "1jd4rjv812iv7kp4wyxdz8sk7j0442m8x2ypk6hiqis0braxnspm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/memolist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/memolist";
           sha256 = "1whajbwmz1v01dirv795bhvs27vq9dh0qmj10dk2xia7vhn42mgh";
           name = "memolist";
         };
         packageRequires = [ ag markdown-mode ];
         meta = {
-          homepage = "http://melpa.org/#/memolist";
+          homepage = "https://melpa.org/#/memolist";
           license = lib.licenses.free;
         };
       }) {};
@@ -35774,13 +37106,13 @@
           sha256 = "11hyydc13jdai6lkxx8nqf8xljh0gx7fcmywhik4f1hf3pdv7i2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mentor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mentor";
           sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s";
           name = "mentor";
         };
         packageRequires = [ xml-rpc ];
         meta = {
-          homepage = "http://melpa.org/#/mentor";
+          homepage = "https://melpa.org/#/mentor";
           license = lib.licenses.free;
         };
       }) {};
@@ -35788,38 +37120,38 @@
         pname = "menu-bar-plus";
         version = "20151231.1622";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/menu-bar+.el";
+          url = "https://www.emacswiki.org/emacs/download/menu-bar+.el";
           sha256 = "1i96s0z0q9z2ws2b1lz1n50j6hih9y4rsy7mwx0k8a4ikll0gx82";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/menu-bar+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/menu-bar+";
           sha256 = "181jxjnzdckmvpsdknhm21xwimvsp0qxn8azfn58dz41gl4xcg90";
           name = "menu-bar-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/menu-bar+";
+          homepage = "https://melpa.org/#/menu-bar+";
           license = lib.licenses.free;
         };
       }) {};
     merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "merlin";
-        version = "20151228.934";
+        version = "20160229.828";
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
-          rev = "a532512e15b10d04ffd8281ac5406160f2764005";
-          sha256 = "1amb375dpy5al1ddh2ln9l1lw6xqfjigld6y5k7vvh730zild824";
+          rev = "708b083ac8081c5b07e8bfb6e179a0c6e7d171ac";
+          sha256 = "09yjgf3li4hgljcrwlg195wa6a8l7zm8ia1slbpsrjgwnc15wqrs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/merlin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/merlin";
           sha256 = "177cy9xcrjckxv8gvi1zhg2ndfr8cmsr37inyvpi5dxqy6d6alhp";
           name = "merlin";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/merlin";
+          homepage = "https://melpa.org/#/merlin";
           license = lib.licenses.free;
         };
       }) {};
@@ -35827,17 +37159,17 @@
         pname = "message-x";
         version = "20151029.918";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/message-x.el";
+          url = "https://www.emacswiki.org/emacs/download/message-x.el";
           sha256 = "05ic97plsysh4nqwdrsl5m9f24m11w24bahj8bxzfdawfima2bkf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/message-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/message-x";
           sha256 = "0z12alizwrqp5f9wq3qllym9k5xljh904c9qhlfhp9biazj6yqwj";
           name = "message-x";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/message-x";
+          homepage = "https://melpa.org/#/message-x";
           license = lib.licenses.free;
         };
       }) {};
@@ -35852,34 +37184,34 @@
           sha256 = "1x425ah3ymjyp3pxvyzyp4gd8zrjx8lgdzprml8qvf1yk82iv45l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/meta-presenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/meta-presenter";
           sha256 = "0f70cfa91wavchlx8d9hdlgq90cmnylhbg2dbw603rzjkyvslp5d";
           name = "meta-presenter";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/meta-presenter";
+          homepage = "https://melpa.org/#/meta-presenter";
           license = lib.licenses.free;
         };
       }) {};
     metafmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "metafmt";
-        version = "20160127.359";
+        version = "20160221.1055";
         src = fetchFromGitHub {
           owner = "lvillani";
           repo = "metafmt";
-          rev = "19dc36b3d085bba6f8e59ddbb1cbb7e2c085c461";
-          sha256 = "0zxal6alf99a2zfzizckibp5iwdk9kklfhml2r0r3wfvswb0rb3z";
+          rev = "bd20fc67d0affd48c1199315b7da06a7182e7d76";
+          sha256 = "0n4nv1s25z70xfy3bl1wy467abz3agj4qmpx4rwdwzbarnqp9ps3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/metafmt";
-          sha256 = "0vx1xrjr10nd90cr6ppgd3kc3c8bhkg3m4clnb50zagkpfqsy9ma";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/metafmt";
+          sha256 = "1ca102al7r3k2g92b4jkqv53crnmxy3z7cz31w1rprf41s69mn75";
           name = "metafmt";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/metafmt";
+          homepage = "https://melpa.org/#/metafmt";
           license = lib.licenses.free;
         };
       }) {};
@@ -35894,13 +37226,13 @@
           sha256 = "1rascpmv17dksyn9y0llmjb8r4484x5ax54w6r83k1x7ha1iacx5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/metascript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/metascript-mode";
           sha256 = "1kgs4ki0s6bxx2ri6zxmsy2b2w56gnr9hjkr6302wcmp3qy7clwn";
           name = "metascript-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/metascript-mode";
+          homepage = "https://melpa.org/#/metascript-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -35910,18 +37242,18 @@
         version = "20141130.805";
         src = fetchFromGitHub {
           owner = "punchagan";
-          repo = "metaweblog.el";
+          repo = "metaweblog";
           rev = "c8b50a6edf0fd2f396570c9a1c2ef8cd207606fb";
           sha256 = "06mbdb4zb07skq1jpv05hr45k5x96d9hgkb358jiq0kfsqlrbbb4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/metaweblog";
-          sha256 = "11y5x3a8iv0hjj7ppi2sa7vawn7r475qfsh1jg415j4y4fzwpk6y";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/metaweblog";
+          sha256 = "10kwqnfafby4ap0572mfkkdssr13y9p2gl9z3nmxqjjy04fkfi8b";
           name = "metaweblog";
         };
         packageRequires = [ xml-rpc ];
         meta = {
-          homepage = "http://melpa.org/#/metaweblog";
+          homepage = "https://melpa.org/#/metaweblog";
           license = lib.licenses.free;
         };
       }) {};
@@ -35936,13 +37268,13 @@
           sha256 = "1rkipcv53p7zra3gbjc77ywyxn8d1kx2gniyfqq16d2p2jw0lbzb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mew";
           sha256 = "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk";
           name = "mew";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mew";
+          homepage = "https://melpa.org/#/mew";
           license = lib.licenses.free;
         };
       }) {};
@@ -35957,13 +37289,13 @@
           sha256 = "0bhllmyk1r9y63jw5gx10v09791w33lc54qs31gcxbnss094l6py";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mexican-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mexican-holidays";
           sha256 = "0awf4vv6mbp1xr92nsgdn513g4adqhp21k12q4fbm85b2l3jlspb";
           name = "mexican-holidays";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mexican-holidays";
+          homepage = "https://melpa.org/#/mexican-holidays";
           license = lib.licenses.free;
         };
       }) {};
@@ -35978,31 +37310,55 @@
           sha256 = "0ahbf4cd9q65xrvsc1clym3swdwwsl8llccrl5l1qgxqx5xg61hv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mhc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mhc";
           sha256 = "02ikn9hx0kcfc2xrx4f38zpkfi6vgz7chcxk6q5d0vcsp93b4lql";
           name = "mhc";
         };
         packageRequires = [ calfw ];
         meta = {
-          homepage = "http://melpa.org/#/mhc";
+          homepage = "https://melpa.org/#/mhc";
           license = lib.licenses.free;
         };
       }) {};
-    mic-paren = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    mic-paren = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "mic-paren";
-        version = "20140714.219";
-        src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/mic-paren.el";
-          sha256 = "1ibim60fx0srmvchwbb2s04dmcc7mv7zyg1vqavas24ya2gmixc5";
+        version = "20150110.2016";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "mic-paren";
+          rev = "d0332fae515af2fa461d19afa7f933588afc327f";
+          sha256 = "0l7xfana2cb894w5qi6wwx7w9k89c3i8k40fpsd93sm3hgi5ryii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mic-paren";
-          sha256 = "1kdmp0wd7838nk58lby8gx91pjan47lq3izk4vdb2vm0h0iq57sa";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mic-paren";
+          sha256 = "042dzp0nal18nxq94qlwwksh0nnypsyc0yykmc6l3kayp9pv4hw7";
           name = "mic-paren";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mic-paren";
+          homepage = "https://melpa.org/#/mic-paren";
+          license = lib.licenses.free;
+        };
+      }) {};
+    micgoline = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
+    melpaBuild {
+        pname = "micgoline";
+        version = "20160414.2226";
+        src = fetchFromGitHub {
+          owner = "yzprofile";
+          repo = "micgoline";
+          rev = "837504263bb1711203b0f7efecd6b7b5f272fae0";
+          sha256 = "0r6l6iqn5z9wp4w58flnls7kk6300qlxyy04fw0np00nvwsy4qvp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/micgoline";
+          sha256 = "0xixcy006my2s0wn0isiag0b4rm38kswa5m0xnhg5n30qjjfzf4i";
+          name = "micgoline";
+        };
+        packageRequires = [ emacs powerline ];
+        meta = {
+          homepage = "https://melpa.org/#/micgoline";
           license = lib.licenses.free;
         };
       }) {};
@@ -36017,13 +37373,13 @@
           sha256 = "1cigsr0hkbi1860w38k2j8fw6j4w43pgv2bpkmdsifbqy6l8grpg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/midje-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/midje-mode";
           sha256 = "0069hwy5cyrsv5b1yvjhmjasywbmc8x3daq9hkzidy3a2fmqgqv3";
           name = "midje-mode";
         };
         packageRequires = [ cider clojure-mode ];
         meta = {
-          homepage = "http://melpa.org/#/midje-mode";
+          homepage = "https://melpa.org/#/midje-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -36038,13 +37394,13 @@
           sha256 = "1az4mnmanhz9ga0g46jf33w8axcw8lnrb9lmszajwv7y5j9nk7yr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/migemo";
           sha256 = "0y49imdwygv5zd7cyh9ngda4gyb2mld2a4s7zh4yzlh7z5ha9qkr";
           name = "migemo";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/migemo";
+          homepage = "https://melpa.org/#/migemo";
           license = lib.licenses.free;
         };
       }) {};
@@ -36059,13 +37415,13 @@
           sha256 = "1qg64mxsm2cswk52mlj7sx7k6gfnrsdwnf68i7cachri0i8aq4ap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/milkode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/milkode";
           sha256 = "07v6xgalx7vcw5sghckwvz584746cba05ql8flv8n556glm7hibh";
           name = "milkode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/milkode";
+          homepage = "https://melpa.org/#/milkode";
           license = lib.licenses.free;
         };
       }) {};
@@ -36079,34 +37435,34 @@
           sha256 = "1b2kn4c90hl07lzdg10wamd4lq8f24wmaj4zvr728pwyga99b2av";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minesweeper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/minesweeper";
           sha256 = "1n6r3a3rl09pv4jvb7ald1gaipqylfchggza973qv9rgh5g90nag";
           name = "minesweeper";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/minesweeper";
+          homepage = "https://melpa.org/#/minesweeper";
           license = lib.licenses.free;
         };
       }) {};
     mingus = callPackage ({ fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild }:
     melpaBuild {
         pname = "mingus";
-        version = "20160206.310";
+        version = "20160321.1117";
         src = fetchFromGitHub {
           owner = "pft";
           repo = "mingus";
-          rev = "8c8b3ba4d9295f2eacb2d073c2405ffc2b2c0f58";
-          sha256 = "0h4di0z6df28sv596hn38snvq2xv9pj1a0xwbsifxj4nrzglq1fc";
+          rev = "940ac6e96c713eaa9dde636b6755ee34f03654ff";
+          sha256 = "14dqa37z96nhmrhiczri0cyrzmjc3larw8sszvdal9prj47363sh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mingus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mingus";
           sha256 = "0vw09qk56l792706vvp465f40shf678mcmdh7iw8wsjix4401bzi";
           name = "mingus";
         };
         packageRequires = [ libmpdee ];
         meta = {
-          homepage = "http://melpa.org/#/mingus";
+          homepage = "https://melpa.org/#/mingus";
           license = lib.licenses.free;
         };
       }) {};
@@ -36121,13 +37477,13 @@
           sha256 = "1n4b039448826w2jcsv4r2iw3v2vlrsxw8dbci8wcfigmkbfc879";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minibuf-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/minibuf-isearch";
           sha256 = "0n36d152lc53zj9jy38b0c7hlww0z6hx94y3x2njy6cmh3p5g8nh";
           name = "minibuf-isearch";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/minibuf-isearch";
+          homepage = "https://melpa.org/#/minibuf-isearch";
           license = lib.licenses.free;
         };
       }) {};
@@ -36142,13 +37498,13 @@
           sha256 = "1zyb6c3xwdzk7dpn7xi0mvbcjdfxvzz1a0zlbs053pfar8iim5fk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minibuffer-complete-cycle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/minibuffer-complete-cycle";
           sha256 = "0y1mxs6q9a8lzprrlb22qff6x5mvkw4gp2l6p2js2r0j9jzyffq2";
           name = "minibuffer-complete-cycle";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/minibuffer-complete-cycle";
+          homepage = "https://melpa.org/#/minibuffer-complete-cycle";
           license = lib.licenses.free;
         };
       }) {};
@@ -36163,13 +37519,13 @@
           sha256 = "011kg76zr4hfhi2gngnc7jlmp0l0nvhmlgyc0y9bir2jbjf4yyvz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minibuffer-cua";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/minibuffer-cua";
           sha256 = "1ragvr73ykbvpgynnq3z0z4yzrlfhfqlwc1vbxclb8x2xmxq7pzw";
           name = "minibuffer-cua";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/minibuffer-cua";
+          homepage = "https://melpa.org/#/minibuffer-cua";
           license = lib.licenses.free;
         };
       }) {};
@@ -36184,13 +37540,13 @@
           sha256 = "1850z96gly0jnr50472idqz1drzqarr0n23bbasslrc501xkg0bq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/miniedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/miniedit";
           sha256 = "10s407q7igdi2hsaaahbw8vckalrl7z3s6l9cflf51q16xh2ih87";
           name = "miniedit";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/miniedit";
+          homepage = "https://melpa.org/#/miniedit";
           license = lib.licenses.free;
         };
       }) {};
@@ -36205,13 +37561,13 @@
           sha256 = "1sj5sq932w079y3vy55q5b6wybwrzz30y092iq1mpfg5xvl42sbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minimal-session-saver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/minimal-session-saver";
           sha256 = "1ay7wvriga28bdmarpfwagqzmmk93ri9f3idhr6z6iivwggwyy2i";
           name = "minimal-session-saver";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/minimal-session-saver";
+          homepage = "https://melpa.org/#/minimal-session-saver";
           license = lib.licenses.free;
         };
       }) {};
@@ -36226,34 +37582,34 @@
           sha256 = "1iy1z2kwnbzxhz5r4gsy4zm0l3xbwy314dqxliprbl8n2m9w0lmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minimal-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/minimal-theme";
           sha256 = "0l4xj5q06h5fk634d6v3idm0zniq8grz4rjm6qzi7b4jr9sc60gm";
           name = "minimal-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/minimal-theme";
+          homepage = "https://melpa.org/#/minimal-theme";
           license = lib.licenses.free;
         };
       }) {};
     minitest = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "minitest";
-        version = "20160111.1349";
+        version = "20160422.2241";
         src = fetchFromGitHub {
           owner = "arthurnn";
           repo = "minitest-emacs";
-          rev = "263d3f03cdee0b84c8e122b4eae333ffbb793cda";
-          sha256 = "08sy08bzn2as4n6jydrzvn0h0xahyihr2snfr3ps25gkfwxsk4aq";
+          rev = "82097e692b96860b60061ea13cdb7caadc75032f";
+          sha256 = "1yvr04z5dw39mippg6ngif1j3bb6m21zizrwpsxsra7ikdb06avc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minitest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/minitest";
           sha256 = "0x6nd4kkhiw8hh79r69861pf41j8p1y39kzf2rl61zlmyjz9zpmw";
           name = "minitest";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/minitest";
+          homepage = "https://melpa.org/#/minitest";
           license = lib.licenses.free;
         };
       }) {};
@@ -36268,13 +37624,13 @@
           sha256 = "0808cl5ixvmhd8pa6fc8rn7wbxzvqjgz43mz1pambj89vbkzmw1c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minizinc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/minizinc-mode";
           sha256 = "1blb6mbyqvmdvwp477p1ggs3n6rzi9sdfvi0v1wfzmd7k749b10c";
           name = "minizinc-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/minizinc-mode";
+          homepage = "https://melpa.org/#/minizinc-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -36282,17 +37638,17 @@
         pname = "minor-mode-hack";
         version = "20141226.1420";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/minor-mode-hack.el";
+          url = "https://www.emacswiki.org/emacs/download/minor-mode-hack.el";
           sha256 = "0vwvvhzqiad82qvfwygb2arq1mdvh1lj6q2as0a92fg1vc95qcb0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minor-mode-hack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/minor-mode-hack";
           sha256 = "1f2wy25iphk3hzjy39ls5j04173g7gaq2rdp2grkawfhwx0ld4pj";
           name = "minor-mode-hack";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/minor-mode-hack";
+          homepage = "https://melpa.org/#/minor-mode-hack";
           license = lib.licenses.free;
         };
       }) {};
@@ -36307,13 +37663,13 @@
           sha256 = "12k9ii4090dn03xvgqisl4zl4qi33054zxyfkqzzpa9wv72h4knc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mip-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mip-mode";
           sha256 = "1wx5zg4kimd29vqipbzm4vjphn0mldri12g6b18kc290nhgj22ar";
           name = "mip-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mip-mode";
+          homepage = "https://melpa.org/#/mip-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -36321,17 +37677,17 @@
         pname = "misc-cmds";
         version = "20151231.1623";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/misc-cmds.el";
+          url = "https://www.emacswiki.org/emacs/download/misc-cmds.el";
           sha256 = "0sc4l0prwmakxmdq22xd5mj8ddwhzrs034zmx2swi2k3s07x15id";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/misc-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/misc-cmds";
           sha256 = "0bylb84icddgznmim18fwq1mhh3qz8yh8ch6lpadf9p3h420qgcl";
           name = "misc-cmds";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/misc-cmds";
+          homepage = "https://melpa.org/#/misc-cmds";
           license = lib.licenses.free;
         };
       }) {};
@@ -36339,17 +37695,17 @@
         pname = "misc-fns";
         version = "20151231.1708";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/misc-fns.el";
+          url = "https://www.emacswiki.org/emacs/download/misc-fns.el";
           sha256 = "1mksmxy741sv7d5lr9wlj4klb0sg06bg5z1zpd5hj0bd4b3mx7x0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/misc-fns";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/misc-fns";
           sha256 = "1spjbkcac33lyfsgkd6z186a3432x9nw3akmx194gaap2863xcam";
           name = "misc-fns";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/misc-fns";
+          homepage = "https://melpa.org/#/misc-fns";
           license = lib.licenses.free;
         };
       }) {};
@@ -36364,13 +37720,13 @@
           sha256 = "1d08i2cfn1q446nyyji0hi9vlw7bzkpxhn6653jz2k77vd2y0wmk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mkdown";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mkdown";
           sha256 = "1b2vi8q6jhq1xv7yr5f3aiyp1w8j59w19vxys0pv6bqr2gra07i1";
           name = "mkdown";
         };
         packageRequires = [ markdown-mode ];
         meta = {
-          homepage = "http://melpa.org/#/mkdown";
+          homepage = "https://melpa.org/#/mkdown";
           license = lib.licenses.free;
         };
       }) {};
@@ -36385,13 +37741,13 @@
           sha256 = "1lcc2p9qz70kpykgx82isv0qiqlsajp4vvcj6bvag92d7h9yk9bv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mmm-jinja2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mmm-jinja2";
           sha256 = "0579sv77dyzishhcw4xxi444inwy4jgh9vmxwd856nd05j3cyc7z";
           name = "mmm-jinja2";
         };
         packageRequires = [ mmm-mode ];
         meta = {
-          homepage = "http://melpa.org/#/mmm-jinja2";
+          homepage = "https://melpa.org/#/mmm-jinja2";
           license = lib.licenses.free;
         };
       }) {};
@@ -36405,13 +37761,13 @@
           sha256 = "0rpp748ym79sxccp9pyrwri14m7624zzb80srfgjfdpysrrs0jrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mmm-mako";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mmm-mako";
           sha256 = "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn";
           name = "mmm-mako";
         };
         packageRequires = [ mmm-mode ];
         meta = {
-          homepage = "http://melpa.org/#/mmm-mako";
+          homepage = "https://melpa.org/#/mmm-mako";
           license = lib.licenses.free;
         };
       }) {};
@@ -36426,13 +37782,13 @@
           sha256 = "04rapmqblfjvmdccm9kqi8gn0him1x2q7hjwsyb8mg4lwxcd7qp9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mmm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mmm-mode";
           sha256 = "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw";
           name = "mmm-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mmm-mode";
+          homepage = "https://melpa.org/#/mmm-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -36447,13 +37803,13 @@
           sha256 = "05nmcx3f63ds31cj3qwwp03ksflkfwlcn3z2xyxbny83r0dxbgvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mmt";
           sha256 = "0hal3qcw6x9658xpdaw6q9l2rr2z107pvg5bdzshf67p1b3lf9dq";
           name = "mmt";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/mmt";
+          homepage = "https://melpa.org/#/mmt";
           license = lib.licenses.free;
         };
       }) {};
@@ -36468,13 +37824,13 @@
           sha256 = "1dh92hzpicfvrlg6swrw4igwb771xbsmsf7hxp1a4iry4w8dk398";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mo-git-blame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mo-git-blame";
           sha256 = "1dp9pxhggappb70m5hyp8sxlnh06y996adabq7x6qvm745mk6f0x";
           name = "mo-git-blame";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mo-git-blame";
+          homepage = "https://melpa.org/#/mo-git-blame";
           license = lib.licenses.free;
         };
       }) {};
@@ -36489,13 +37845,13 @@
           sha256 = "0k0scl9z35d8x4ikxm2db1frpbx151p2m181fa1armxbd9lbfvnn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mo-vi-ment-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mo-vi-ment-mode";
           sha256 = "1pg889mgpv0waccm135mlvag7q13gzfkzchv2532jngwrn6amqc7";
           name = "mo-vi-ment-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mo-vi-ment-mode";
+          homepage = "https://melpa.org/#/mo-vi-ment-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -36510,34 +37866,34 @@
           sha256 = "04hbd7mv29v3fv4ld0b3skrir0wp9dix2n5nbqp63fj6n5i4cyyz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mobdebug-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mobdebug-mode";
           sha256 = "19k0c7igqsqvib6hx0nssig4l5f959dlr4wijd1hp5h1hmcb5vv8";
           name = "mobdebug-mode";
         };
         packageRequires = [ emacs lua-mode ];
         meta = {
-          homepage = "http://melpa.org/#/mobdebug-mode";
+          homepage = "https://melpa.org/#/mobdebug-mode";
           license = lib.licenses.free;
         };
       }) {};
     mocha = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "mocha";
-        version = "20160203.1808";
+        version = "20160223.2255";
         src = fetchFromGitHub {
           owner = "scottaj";
           repo = "mocha.el";
-          rev = "811772fd498c7cff4c25ba4a6977973d8187e23c";
-          sha256 = "1jyqj7qdpaf0p8d7csc24ch0kgg3vfigadn118gh84xvr1brvvwk";
+          rev = "2417d16bb0a28a392cec41fe904236728ff35dcb";
+          sha256 = "1xhmmdwbypjwdcp0bciy1dqxy6nmslyiybdysgb5ii6man512wgd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mocha";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mocha";
           sha256 = "0kjgrl5iy7cd3b9csgpjg3y0wp0q6c7c8cvf0mx8gdbsj7296kyx";
           name = "mocha";
         };
         packageRequires = [ js2-mode ];
         meta = {
-          homepage = "http://melpa.org/#/mocha";
+          homepage = "https://melpa.org/#/mocha";
           license = lib.licenses.free;
         };
       }) {};
@@ -36552,13 +37908,13 @@
           sha256 = "1f8h5c9vvwynq92b1ii5hdpqmf52l5j443ir5hdbiigq30wkwlhx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mocha-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mocha-snippets";
           sha256 = "0dbsdk4jpzxv2sxx0nia9zhd0a0wmkz1qcqmbd15m1909ccdwxds";
           name = "mocha-snippets";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/mocha-snippets";
+          homepage = "https://melpa.org/#/mocha-snippets";
           license = lib.licenses.free;
         };
       }) {};
@@ -36573,13 +37929,13 @@
           sha256 = "0dngznaraphpc5amn9n120la7ga3rj7h67pnnal6qwflh5rqcmss";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mocker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mocker";
           sha256 = "1g90jp1czrrzrmn7n4linby3q4fb4gcflzv2amjv0sdimw1ln1w3";
           name = "mocker";
         };
         packageRequires = [ eieio el-x ];
         meta = {
-          homepage = "http://melpa.org/#/mocker";
+          homepage = "https://melpa.org/#/mocker";
           license = lib.licenses.free;
         };
       }) {};
@@ -36594,33 +37950,34 @@
           sha256 = "0r24186d1q9436h3qhqz1z8q978d01an0dvpvzirf4x9ickrib3k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/modalka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/modalka";
           sha256 = "0bkjykvl6sw797h7j76dzn1viy598asly98gcl5wrq13n4w1md4c";
           name = "modalka";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/modalka";
+          homepage = "https://melpa.org/#/modalka";
           license = lib.licenses.free;
         };
       }) {};
-    mode-icons = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }:
+    mode-icons = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mode-icons";
-        version = "20160221.803";
-        src = fetchgit {
-          url = "git://ryuslash.org/mode-icons.git";
-          rev = "d2c9926a8e79e13ef9942fe96b8109add24a9978";
-          sha256 = "cb98bc1e199688337efd03bbd18a340514740257f9ede19089f01f5ad6e69b74";
+        version = "20160425.425";
+        src = fetchFromGitHub {
+          owner = "ryuslash";
+          repo = "mode-icons";
+          rev = "26625e0dfa78305863eff1551c04735d9e0d241c";
+          sha256 = "067dmkzkrdbgvwmrxw7pgjdjln5vii2r79i3xcqxjn5xjvsii47x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mode-icons";
-          sha256 = "18w221zjrrsfcymprv5x75i3qv04zy4bxl9mqjv0ys7qcc8xf1dp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mode-icons";
+          sha256 = "1dqcry27rz7afyvjg7345wysp6wmh8fpj32ysk5iw5i7v5scf6kf";
           name = "mode-icons";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/mode-icons";
+          homepage = "https://melpa.org/#/mode-icons";
           license = lib.licenses.free;
         };
       }) {};
@@ -36635,13 +37992,13 @@
           sha256 = "1lkw9nnlns6v7r6nx915f85whq1ri4w8lccwyxrvam40hfvq60s1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mode-line-debug";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mode-line-debug";
           sha256 = "0ppj14bm3rx3xgg4mfxa5zcm2r129jgmsx817wq3h7akjngcbfkd";
           name = "mode-line-debug";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mode-line-debug";
+          homepage = "https://melpa.org/#/mode-line-debug";
           license = lib.licenses.free;
         };
       }) {};
@@ -36649,17 +38006,17 @@
         pname = "modeline-char";
         version = "20151231.1719";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/modeline-char.el";
+          url = "https://www.emacswiki.org/emacs/download/modeline-char.el";
           sha256 = "1dlprk1jlfw7b7vnxi0d0mf85737wkjc5fkvycx8nawngb2fqhbw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/modeline-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/modeline-char";
           sha256 = "1cb6pm69db0jbksmc4mkawf643i74is9v7ka34pv3mb21nj095qp";
           name = "modeline-char";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/modeline-char";
+          homepage = "https://melpa.org/#/modeline-char";
           license = lib.licenses.free;
         };
       }) {};
@@ -36667,17 +38024,17 @@
         pname = "modeline-posn";
         version = "20160112.849";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/modeline-posn.el";
+          url = "https://www.emacswiki.org/emacs/download/modeline-posn.el";
           sha256 = "1r4zq355h570hk7qq0ik121bwsr4hjnhacal4d4h119d11gq2p8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/modeline-posn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/modeline-posn";
           sha256 = "0dngfcbcdh22fl6nd47dhg9z9iivj67six67zjr9j1cbngp10dwk";
           name = "modeline-posn";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/modeline-posn";
+          homepage = "https://melpa.org/#/modeline-posn";
           license = lib.licenses.free;
         };
       }) {};
@@ -36692,34 +38049,34 @@
           sha256 = "0ri841cwx2mx8ri50lhvifmxnysdc022421mlmklql0252kn775l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/modtime-skip-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/modtime-skip-mode";
           sha256 = "1drafwf4kqp83jp47j2ddl2n4a92zf1589fnp6c72hmjqcxv3l28";
           name = "modtime-skip-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/modtime-skip-mode";
+          homepage = "https://melpa.org/#/modtime-skip-mode";
           license = lib.licenses.free;
         };
       }) {};
     moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "moe-theme";
-        version = "20160216.2021";
+        version = "20160322.315";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "moe-theme.el";
-          rev = "b6dcf5f5dc822bee8e6d6b6a79ae6889910ed247";
-          sha256 = "05lh052dnwdpf6iqypipa8yjhl9mwka3h77d4pnfwq8wdz7ywp12";
+          rev = "d7c4aa29ca55a394e6ebf698fda93215c0df1123";
+          sha256 = "1567k0zacdf9zlmypb8fywz49n37hm8p60vrq2jqql8n8nq325gq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/moe-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/moe-theme";
           sha256 = "1nqvj8spvffgjvqlf25rcm3dc6w1axb6qlwwsjhq401a6xhw67f6";
           name = "moe-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/moe-theme";
+          homepage = "https://melpa.org/#/moe-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -36734,13 +38091,13 @@
           sha256 = "1hqa59pdrnwfykyl58lr8pfbh2f13sygvmrh707hbwc2aii0jjv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/molokai-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/molokai-theme";
           sha256 = "0srdh3yx7j6xs7rgpzmsyzz6ds00kq887rs2sfa0nvk0j0ga6baf";
           name = "molokai-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/molokai-theme";
+          homepage = "https://melpa.org/#/molokai-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -36755,34 +38112,34 @@
           sha256 = "0z8mcfhj425hb91fkj1pyg3apw1kf4mgy8lx6n1sc8zmib38py0x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mongo";
           sha256 = "103zkslqdihjyl81688fvkq96rzk3an1vf3gz8rlmmz5anbql8ai";
           name = "mongo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mongo";
+          homepage = "https://melpa.org/#/mongo";
           license = lib.licenses.free;
         };
       }) {};
     monky = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monky";
-        version = "20150404.218";
+        version = "20160315.2251";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "monky";
-          rev = "48c0200910739b6521f26f6423b2bfb8c38b4482";
-          sha256 = "0ddkcb5rzpcqpsrwkhvm9kzpx2mlrrsp7psljkz5q5qfvy3wdagh";
+          rev = "988571711a350d0cedff8ff394c6ffa0e0042cc5";
+          sha256 = "1p9p0yp68wb7f1qf0c02fk7ayb7dw6gv57368ksa6nw76w58hhfm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/monky";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/monky";
           sha256 = "1m7hy3ijwgxqjk3vjvqkxqj8b5bqnd201bmf302k45n0dpjmhshz";
           name = "monky";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/monky";
+          homepage = "https://melpa.org/#/monky";
           license = lib.licenses.free;
         };
       }) {};
@@ -36797,55 +38154,55 @@
           sha256 = "1sxhpvxapzgrwvzibkg7zd3ppmfcz5rhrbvg73b8rggjg4m5snyf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/monochrome-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/monochrome-theme";
           sha256 = "191ikqns1sxcz6ca6xp6mb2vyfj19x19cmcf17snrf46kmx60qk9";
           name = "monochrome-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/monochrome-theme";
+          homepage = "https://melpa.org/#/monochrome-theme";
           license = lib.licenses.free;
         };
       }) {};
     monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monokai-theme";
-        version = "20160104.1512";
+        version = "20160419.1644";
         src = fetchFromGitHub {
           owner = "oneKelvinSmith";
           repo = "monokai-emacs";
-          rev = "8bd39a186bf4e1bd4ce115aef39b2831561ba28b";
-          sha256 = "0rszr7p5v47s66kj872mz68apkbykhl51lp4v1apwj1ay32lbx9h";
+          rev = "8683dceadcb4072bb33723bd1d4b1fa6555810a1";
+          sha256 = "0djgxmd1nqfhyxzag3hq1q7lhsgx5d8cid11i64il9rpiqfyysip";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/monokai-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/monokai-theme";
           sha256 = "13mv4vgsmdbf3v748lqi7b42hvr3yp86n97rb6792bcgd3kbdx7a";
           name = "monokai-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/monokai-theme";
+          homepage = "https://melpa.org/#/monokai-theme";
           license = lib.licenses.free;
         };
       }) {};
     monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monroe";
-        version = "20141111.307";
+        version = "20160421.640";
         src = fetchFromGitHub {
           owner = "sanel";
           repo = "monroe";
-          rev = "7f42a0139a8030407da736ddb0f67132634b70c0";
-          sha256 = "1z1gyknxscvk2qpfcrgzymf9w5m8jcnj525q852b8s6yf5fnffmh";
+          rev = "f497e134f754ee62178eb41844fce3ffe204d50a";
+          sha256 = "0jac2i5hwdi65rrif0xq86wsimxlpwcfbzsv7fjhc5f16bs6dmnk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/monroe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/monroe";
           sha256 = "04rhninxppvilk7s90g0wwa0g9vfcg7mk8mrb2m2c7cb9vj6wyig";
           name = "monroe";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/monroe";
+          homepage = "https://melpa.org/#/monroe";
           license = lib.licenses.free;
         };
       }) {};
@@ -36860,13 +38217,13 @@
           sha256 = "1ndgw4799d816pkn2bwja5kmigydpmj9znn8cax4dxsd9fg2hzjy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/morlock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/morlock";
           sha256 = "0693jr1k8mzd7hwp52azkl62c1g1p5yinarjcmdksfyqblqq5jna";
           name = "morlock";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/morlock";
+          homepage = "https://melpa.org/#/morlock";
           license = lib.licenses.free;
         };
       }) {};
@@ -36881,13 +38238,13 @@
           sha256 = "10mf96r75558scn71pri71aa8nhp6hmnb5rwjxlh5dlf80r5dfd7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mote-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mote-mode";
           sha256 = "1lg5z5d0d35sh21maiwmgzvc31iki9yg6x0awy5xrfsains7ykn9";
           name = "mote-mode";
         };
         packageRequires = [ ruby-mode ];
         meta = {
-          homepage = "http://melpa.org/#/mote-mode";
+          homepage = "https://melpa.org/#/mote-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -36902,13 +38259,13 @@
           sha256 = "17570labnwdnwca2cg4ga0mrrm00n0h3wlxry823k5yn3k93rnj1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/motion-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/motion-mode";
           sha256 = "1lfsc8ayiz2v3dfn8c0mmfch8vpzqyddxw8kscan2lzl2lcj50h0";
           name = "motion-mode";
         };
         packageRequires = [ flymake-cursor flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/motion-mode";
+          homepage = "https://melpa.org/#/motion-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -36916,17 +38273,17 @@
         pname = "mouse-plus";
         version = "20151231.1725";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/mouse+.el";
+          url = "https://www.emacswiki.org/emacs/download/mouse+.el";
           sha256 = "0rakxcpqdx175hic3ykwbd5if53dvvf0sxhq0gplpsybpqvkimyv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mouse+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mouse+";
           sha256 = "1fv7jnqzskx9iv92dm2pf0mqy2accl0svjl2kkb6v273n1day3f8";
           name = "mouse-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mouse+";
+          homepage = "https://melpa.org/#/mouse+";
           license = lib.licenses.free;
         };
       }) {};
@@ -36941,13 +38298,13 @@
           sha256 = "05pzplb3gmlnlvn2azbxdlf4vrkvk8fc9dkgi2nq4shysnh4c9v7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mouse-slider-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mouse-slider-mode";
           sha256 = "0aqxjm78k7i8c59w6mw9wsfw3rail1pg40ac1dbcjkm62fjbh5hy";
           name = "mouse-slider-mode";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/mouse-slider-mode";
+          homepage = "https://melpa.org/#/mouse-slider-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -36955,17 +38312,17 @@
         pname = "mouse3";
         version = "20151231.1726";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/mouse3.el";
+          url = "https://www.emacswiki.org/emacs/download/mouse3.el";
           sha256 = "1831jpi06hi5v2jdjgs83jma7fp8xiqdmvvwxfyp2zpbfwi1lkb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mouse3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mouse3";
           sha256 = "1rppn55axjpqwqm2lq4dvwi3z7xkd5jkyqi1x8jqgcsfc9w6m777";
           name = "mouse3";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mouse3";
+          homepage = "https://melpa.org/#/mouse3";
           license = lib.licenses.free;
         };
       }) {};
@@ -36980,13 +38337,13 @@
           sha256 = "0baynb6gq04rxh10l6rn0myrhg7c7fwqaryiiyddp4jy7llf83c8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/move-dup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/move-dup";
           sha256 = "0b0lmiisl9yckblwf7619if88qsmbka3bl4qiaqam7fka7psxs7f";
           name = "move-dup";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/move-dup";
+          homepage = "https://melpa.org/#/move-dup";
           license = lib.licenses.free;
         };
       }) {};
@@ -37001,13 +38358,13 @@
           sha256 = "0f7gwwkyxk9rv6rhpc88w8vz4x0ww6r9cxmy7bs9lqsf8a7y2095";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/move-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/move-text";
           sha256 = "04bfrkanafmbrdyw06ciw9kiyn7h3kpikxk3clx2gc04jl67hzgy";
           name = "move-text";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/move-text";
+          homepage = "https://melpa.org/#/move-text";
           license = lib.licenses.free;
         };
       }) {};
@@ -37022,13 +38379,13 @@
           sha256 = "179mc70x3dvj0cz6yyhs00ndh0xvk71gmiscln9y0f1ngxr5h338";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mowedline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mowedline";
           sha256 = "0c2hvvwa7s5iyz517jaskshdcq9zs15zr6xsvrcb3biahrh4bmfb";
           name = "mowedline";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mowedline";
+          homepage = "https://melpa.org/#/mowedline";
           license = lib.licenses.free;
         };
       }) {};
@@ -37043,13 +38400,13 @@
           sha256 = "1g06i3d8xv8ja6nfww4k60l3467xr1s9xsk7i6dbicq0lf8559h9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/moz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/moz";
           sha256 = "0ar2xgsi7csjj6fgiamrjwjc58j942dm32j3f3lz21yn2c4pnyxi";
           name = "moz";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/moz";
+          homepage = "https://melpa.org/#/moz";
           license = lib.licenses.free;
         };
       }) {};
@@ -37064,13 +38421,13 @@
           sha256 = "0fssn33ld6xhjlwg1dbrjg8sa0pjmglq0dw792yrmvm4fj0zjph8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/moz-controller";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/moz-controller";
           sha256 = "18gca1csl9dfi9995mky8cbgi3xzf1if8pzdjiz5404gzcqk0rfd";
           name = "moz-controller";
         };
         packageRequires = [ moz ];
         meta = {
-          homepage = "http://melpa.org/#/moz-controller";
+          homepage = "https://melpa.org/#/moz-controller";
           license = lib.licenses.free;
         };
       }) {};
@@ -37081,38 +38438,38 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "mozc";
-          rev = "80c7fb819873621addab82767100d3dfba703063";
-          sha256 = "10674ch2svx8w1hh59whac579hsf3bcgimsasalidkw3cd9w69d3";
+          rev = "0ccaad35074f21caeb3732348b71b60af6b2a461";
+          sha256 = "1l1qds7mzn7cx0ijdwcdihqbmidwh16a96v4la9ris07k5fxqiph";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mozc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mozc";
           sha256 = "0nslh4xyqpvzdxcgrd1bzaqcdz77bghizh6n2w6wk46cflir8xba";
           name = "mozc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mozc";
+          homepage = "https://melpa.org/#/mozc";
           license = lib.licenses.free;
         };
       }) {};
     mozc-im = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mozc }:
     melpaBuild {
         pname = "mozc-im";
-        version = "20150419.649";
+        version = "20160411.1922";
         src = fetchFromGitHub {
           owner = "d5884";
           repo = "mozc-im";
-          rev = "eaba71ee15d0822631e2023e2ee244e98782cb2d";
-          sha256 = "03j5fy2xw204807wi7ivwcqlgkh1f7msshh5yrk6c7qdpp08062r";
+          rev = "df614a1076c28a11551fb3e822868bae47e855a5";
+          sha256 = "0cpcldizgyr125j7lzkl8l6jw1hc3fb12cwgkpjrl6pjpr80vb15";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mozc-im";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mozc-im";
           sha256 = "1gqzmm712npj36qfi506zgl0ycd6k7l5m46c7zz2z2lb6jpssw10";
           name = "mozc-im";
         };
         packageRequires = [ mozc ];
         meta = {
-          homepage = "http://melpa.org/#/mozc-im";
+          homepage = "https://melpa.org/#/mozc-im";
           license = lib.licenses.free;
         };
       }) {};
@@ -37127,13 +38484,34 @@
           sha256 = "1mbpkjc6sk7qqmgsmr5a5l2ycwnqp8bkwgikdavgs6hnal10bkmn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mozc-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mozc-popup";
           sha256 = "1n43lwflxzzyskxgzg19rg3hiqqkf5l7vfgaydryf4sk8480x687";
           name = "mozc-popup";
         };
         packageRequires = [ mozc popup ];
         meta = {
-          homepage = "http://melpa.org/#/mozc-popup";
+          homepage = "https://melpa.org/#/mozc-popup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mozc-temp = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mozc }:
+    melpaBuild {
+        pname = "mozc-temp";
+        version = "20160228.240";
+        src = fetchFromGitHub {
+          owner = "HKey";
+          repo = "mozc-temp";
+          rev = "9d6b645eff901ea79dbc43a55d5a97ead3f4bad7";
+          sha256 = "1vwciy6hcbcyid41bykibx6ii1y9ln7kdxn7cjwfjrgd3kl9wg19";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mozc-temp";
+          sha256 = "0x1bsa1py0kn73hzbsb4ijl0bqng8nib191vgn6xq8f5cx55044d";
+          name = "mozc-temp";
+        };
+        packageRequires = [ dash emacs mozc ];
+        meta = {
+          homepage = "https://melpa.org/#/mozc-temp";
           license = lib.licenses.free;
         };
       }) {};
@@ -37148,13 +38526,13 @@
           sha256 = "11c8pr3s77aq34ic32lnsialwh8bw3m78kj838xl2aab2pgrlny2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mpages";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mpages";
           sha256 = "11scjjwwrpgaz6i4jq9y7m864nfak46vnbfb0w15625znz926jcs";
           name = "mpages";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mpages";
+          homepage = "https://melpa.org/#/mpages";
           license = lib.licenses.free;
         };
       }) {};
@@ -37169,13 +38547,13 @@
           sha256 = "09731mwm23b6ic53366lnxy2p7dfd245yh75gaf6ijfa22jks7gb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mpg123";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mpg123";
           sha256 = "184ip9pvv4zkfxnrzxbfajjadc9f4dz4psn33f9x3sfh7s1y4nw8";
           name = "mpg123";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mpg123";
+          homepage = "https://melpa.org/#/mpg123";
           license = lib.licenses.free;
         };
       }) {};
@@ -37190,13 +38568,13 @@
           sha256 = "193j90sgn1zgl00mji86wll4djj57vk5arhwbmhhf5b1qx3wpbhm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mpv";
           sha256 = "1vq308ac6jj1h8qa2b2sypisb38hbvwjimqndhpfir06fghkw94l";
           name = "mpv";
         };
         packageRequires = [ cl-lib emacs json names org ];
         meta = {
-          homepage = "http://melpa.org/#/mpv";
+          homepage = "https://melpa.org/#/mpv";
           license = lib.licenses.free;
         };
       }) {};
@@ -37211,13 +38589,13 @@
           sha256 = "1draiwbwb8zfi6rdr5irv8091xv2pmnifq7pzi3rrvjb8swb28z3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/msvc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/msvc";
           sha256 = "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3";
           name = "msvc";
         };
         packageRequires = [ ac-clang cedet cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/msvc";
+          homepage = "https://melpa.org/#/msvc";
           license = lib.licenses.free;
         };
       }) {};
@@ -37232,13 +38610,13 @@
           sha256 = "1gxspy50gh7j4sysvr17fvvp8p417ww39ii5dy0fxncfwczdsa19";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mu-cite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mu-cite";
           sha256 = "0ap21sw4r2x774q2np6rhrxh2m2rf3f6ak3k71iar159chx32y6q";
           name = "mu-cite";
         };
         packageRequires = [ flim ];
         meta = {
-          homepage = "http://melpa.org/#/mu-cite";
+          homepage = "https://melpa.org/#/mu-cite";
           license = lib.licenses.free;
         };
       }) {};
@@ -37253,13 +38631,13 @@
           sha256 = "0klnpbb47l3s8cdv1ikldiqw83mggxcbnhlvs3g13a36vx6cxxp4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mu4e-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mu4e-alert";
           sha256 = "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm";
           name = "mu4e-alert";
         };
         packageRequires = [ alert emacs ht s ];
         meta = {
-          homepage = "http://melpa.org/#/mu4e-alert";
+          homepage = "https://melpa.org/#/mu4e-alert";
           license = lib.licenses.free;
         };
       }) {};
@@ -37274,13 +38652,13 @@
           sha256 = "1cvpzs65fjmhdza1vi2lpk68vkvivb0igrpgm42andi42gc6k50b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mu4e-maildirs-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mu4e-maildirs-extension";
           sha256 = "1xz19dxrj1grnl7wy9qglh08xb3dr509232l3xizpkxgqqk8pwbi";
           name = "mu4e-maildirs-extension";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/mu4e-maildirs-extension";
+          homepage = "https://melpa.org/#/mu4e-maildirs-extension";
           license = lib.licenses.free;
         };
       }) {};
@@ -37295,34 +38673,34 @@
           sha256 = "0f5hc6mgq0hg1wwnvqd4fp7ck58lcavvgqjggz9zlhrjgkmynjxx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/multi";
           sha256 = "1c240d1c1g8wb2ld944344zklnv86d9rycmya4z53b2ai10642ig";
           name = "multi";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/multi";
+          homepage = "https://melpa.org/#/multi";
           license = lib.licenses.free;
         };
       }) {};
-    multi-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    multi-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "multi-compile";
-        version = "20160215.1419";
+        version = "20160306.1623";
         src = fetchFromGitHub {
           owner = "ReanGD";
           repo = "emacs-multi-compile";
-          rev = "ac128d246971fb43a1c33d4cdf3e3bd1557f37cf";
-          sha256 = "10fnps2mw2n8y456qxsxqx4cmlhk0fag9p0c6kwx78mwz8akk07w";
+          rev = "bd0331854774e7a269ce8a7dd49580cd397c0ec2";
+          sha256 = "1aswpv1m02n26620hgkcfd38f06bzmmijlr9rs5krv6snq5gdb8g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multi-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/multi-compile";
           sha256 = "16fv0hpwcjw1771zlbgznph0fix9fbm6yqj2rcz1f9l26iih6apz";
           name = "multi-compile";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/multi-compile";
+          homepage = "https://melpa.org/#/multi-compile";
           license = lib.licenses.free;
         };
       }) {};
@@ -37330,17 +38708,17 @@
         pname = "multi-eshell";
         version = "20120608.1335";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/multi-eshell.el";
+          url = "https://www.emacswiki.org/emacs/download/multi-eshell.el";
           sha256 = "1w1jwfznpl214a1xx46zlgqbx9c5yjzpyqqrkn3xqjgnj485yhkl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multi-eshell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/multi-eshell";
           sha256 = "1i0mvgqxsc99dwp9qcdrijqxsxflrbxw846rgw89p1jfs8mp4l7d";
           name = "multi-eshell";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/multi-eshell";
+          homepage = "https://melpa.org/#/multi-eshell";
           license = lib.licenses.free;
         };
       }) {};
@@ -37355,13 +38733,13 @@
           sha256 = "13rp6kbabjy9dy0x4696065yyaxlgmfnwcqq9vcw2jhbb2gl9gs5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multi-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/multi-line";
           sha256 = "1aadmijnjr029s1qq4gk8xyl9m8xb5x5774b8i3jyfixyjqvhvwp";
           name = "multi-line";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/multi-line";
+          homepage = "https://melpa.org/#/multi-line";
           license = lib.licenses.free;
         };
       }) {};
@@ -37375,13 +38753,13 @@
           sha256 = "0lcx73vzm7zwvzzc53pfb5y16bhvq9cm9fdy63d3242s8v834z3c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multi-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/multi-project";
           sha256 = "19dy2wl5ad1xldiznlw2vjvr9ja8h9wiv6igcggixq56fhngp40x";
           name = "multi-project";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/multi-project";
+          homepage = "https://melpa.org/#/multi-project";
           license = lib.licenses.free;
         };
       }) {};
@@ -37389,17 +38767,17 @@
         pname = "multi-term";
         version = "20150220.720";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/multi-term.el";
+          url = "https://www.emacswiki.org/emacs/download/multi-term.el";
           sha256 = "062c52xd469jdmsq4fvdhsmgfjrlanv0bb1w5vglz7bsn68d2bim";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multi-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/multi-term";
           sha256 = "1va4ihngwv5qvwps3m9jj0150gbrmq3zllnyq1hbx5ap8hjrhvdx";
           name = "multi-term";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/multi-term";
+          homepage = "https://melpa.org/#/multi-term";
           license = lib.licenses.free;
         };
       }) {};
@@ -37414,13 +38792,13 @@
           sha256 = "0mc4kkgwnwfk27wwc21nw5ly7qcsl7y5bd8wf2y8r6pxhvwran4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multi-web-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/multi-web-mode";
           sha256 = "0vi4yvahr10aqpcz4127c8pcqpr5srwc1yhgipnbnm86qnh34ql5";
           name = "multi-web-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/multi-web-mode";
+          homepage = "https://melpa.org/#/multi-web-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -37435,13 +38813,13 @@
           sha256 = "1ispa0wxpkydm0cyj4scyyacfrbilrip5v8bsrcqfc6qs597z8rf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multicolumn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/multicolumn";
           sha256 = "1ylnc3s4ixvnqn7g2p6nzz8x29ggqc703waci430f1rp1lsd3q09";
           name = "multicolumn";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/multicolumn";
+          homepage = "https://melpa.org/#/multicolumn";
           license = lib.licenses.free;
         };
       }) {};
@@ -37456,34 +38834,34 @@
           sha256 = "065l04ylplng1vgykkbn2vnkcs3sn1k2cikx1ha2q8wmgx6bkvai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multifiles";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/multifiles";
           sha256 = "0m0pi2qjis9p6z9cd8hlxm1r88ynwmd2ks8wg65sffffwsdbg4kz";
           name = "multifiles";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/multifiles";
+          homepage = "https://melpa.org/#/multifiles";
           license = lib.licenses.free;
         };
       }) {};
     multiple-cursors = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "multiple-cursors";
-        version = "20160213.1017";
+        version = "20160304.859";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "multiple-cursors.el";
-          rev = "68961b4cf39b6d56d21ece0246f8c215f95cc3e1";
-          sha256 = "07g03z1jx0d8gr9m30vn33jm7ym3afqcj83j499wa2hj3wqnaf9f";
+          rev = "8297f1f210f263fd96dfc28e9fb43522fd102c23";
+          sha256 = "065qni8q25awpa8bdajz51vx96labigq3mk4094gn1np84zxg13g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multiple-cursors";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/multiple-cursors";
           sha256 = "0mky5p9wpd3270wr5vfna8rkk2ff81wk7vicyxli39195m0qgg0x";
           name = "multiple-cursors";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/multiple-cursors";
+          homepage = "https://melpa.org/#/multiple-cursors";
           license = lib.licenses.free;
         };
       }) {};
@@ -37498,13 +38876,13 @@
           sha256 = "1n2ymd92qpvsby6ms0l3kjhdzzc47rri2aiscc6bs07hm4mjpr9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mustache";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mustache";
           sha256 = "1pjr00xx77mlfw1myxaz6i3y2gbivhbiq5hyjxxbjlfrkm1vxc8g";
           name = "mustache";
         };
         packageRequires = [ dash ht s ];
         meta = {
-          homepage = "http://melpa.org/#/mustache";
+          homepage = "https://melpa.org/#/mustache";
           license = lib.licenses.free;
         };
       }) {};
@@ -37519,13 +38897,13 @@
           sha256 = "15gw4d0hp15rglsj8hzd290li4p0kadj2dsz0dgfcxld7hnimihk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mustache-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mustache-mode";
           sha256 = "076ar57qhwcpl4n634ma827r2rh61670778wqr5za2444a6ax1gs";
           name = "mustache-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mustache-mode";
+          homepage = "https://melpa.org/#/mustache-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -37540,13 +38918,13 @@
           sha256 = "19qd34dcfspv621p4y07zhq2pr8pwss3lcssm9sfhr6w2vmvgcr4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mustang-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mustang-theme";
           sha256 = "0771l3x6109ki914nwpfz3fj7pbvpcg9vf485mrccq2wlxymr5dr";
           name = "mustang-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mustang-theme";
+          homepage = "https://melpa.org/#/mustang-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -37561,13 +38939,13 @@
           sha256 = "170qhbbvcv9dg6jzfd9r95in5m8z1k647mn0gaqflfj0hvq5hwgf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mustard-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mustard-theme";
           sha256 = "0izxhivhmv49dja4wy9n0ipd41xdzdza2ql7pfa7ny35ji5hskik";
           name = "mustard-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/mustard-theme";
+          homepage = "https://melpa.org/#/mustard-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -37578,17 +38956,17 @@
         src = fetchFromGitHub {
           owner = "p-lambert";
           repo = "mutant.el";
-          rev = "aff50603a70a110f4ecd7142963ef719e8c11c06";
-          sha256 = "1faqbkff0v6pigsnnq2dxnzdra8q62cvlxigscwalwxd27bbz548";
+          rev = "de9cdefe48c880128a8f62c6699d7416e9c8ced1";
+          sha256 = "0w9blrm3596hmip8jg2hlz9sl31ci89b90jglmg4ipldgrgj3ly6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mutant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mutant";
           sha256 = "0m5l5r37zb0ig96757ldyl9hbb01lknzqf08ap6dsmdwr1zayvp1";
           name = "mutant";
         };
         packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/mutant";
+          homepage = "https://melpa.org/#/mutant";
           license = lib.licenses.free;
         };
       }) {};
@@ -37596,17 +38974,17 @@
         pname = "muttrc-mode";
         version = "20090804.1752";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/muttrc-mode.el";
+          url = "https://www.emacswiki.org/emacs/download/muttrc-mode.el";
           sha256 = "1xihp3zdqs9054j3bfrd9wnahsvvxjk1ags1iy50ncv5850ppjis";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/muttrc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/muttrc-mode";
           sha256 = "0ym6rfrhrmpnlqhkxv9ck5893qm0yhswslvgc9vb4nl9hyc1b5jn";
           name = "muttrc-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/muttrc-mode";
+          homepage = "https://melpa.org/#/muttrc-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -37615,19 +38993,19 @@
         pname = "mvn";
         version = "20160211.943";
         src = fetchFromGitHub {
-          owner = "apgwoz";
+          owner = "apg";
           repo = "mvn-el";
           rev = "8a65b4eb88c9801aa3bff1921b600c72dfb8791a";
           sha256 = "1jg3xrk44lspxli0zr02jcsl8phj0ns7ly3dkd7rx2wgsk69ari3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mvn";
-          sha256 = "1ykiz5fviq2n2474izwp0vvqanpbmxg7lzh1xbpn281kwmp0mwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mvn";
+          sha256 = "0bpg9zpyfdyn9xvrbmq4gb10hd701mc49np8arlmnilphb3fdgzs";
           name = "mvn";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mvn";
+          homepage = "https://melpa.org/#/mvn";
           license = lib.licenses.free;
         };
       }) {};
@@ -37642,13 +39020,13 @@
           sha256 = "0qdlbyq47gr65yq5ri8s9lxw4wp9fmyqc2prkh560d4hkvw60aw3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mwe-log-commands";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mwe-log-commands";
           sha256 = "05z2ax9mgyxldd3ds44xnh9f5w5q4ziy4rxmnfiqjykan2f5hnkn";
           name = "mwe-log-commands";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mwe-log-commands";
+          homepage = "https://melpa.org/#/mwe-log-commands";
           license = lib.licenses.free;
         };
       }) {};
@@ -37663,13 +39041,13 @@
           sha256 = "0hvq6z754niqjyv79jzb833wrwbspc7npfg85scwdv8vzwassjx4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mwim";
           sha256 = "0bsibwplvyv96y5i5svm2b0jwzs5a7jr2aara7v7xnpj0nqaxm8k";
           name = "mwim";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mwim";
+          homepage = "https://melpa.org/#/mwim";
           license = lib.licenses.free;
         };
       }) {};
@@ -37684,13 +39062,13 @@
           sha256 = "0cf0c9g9k2lk1ifi2dlw7c601sh1ycxf3fgl2hy5wliyd6l9rf86";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/myanmar-input-methods";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/myanmar-input-methods";
           sha256 = "1yg8zy2z18pbyr507ms2b162c0819rna1ilwyp6hb3iv2zjw45sd";
           name = "myanmar-input-methods";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/myanmar-input-methods";
+          homepage = "https://melpa.org/#/myanmar-input-methods";
           license = lib.licenses.free;
         };
       }) {};
@@ -37705,13 +39083,13 @@
           sha256 = "0a9a6hmv8vjmp6h9mnzin9vc0sncg79v5z72pasvbrplfxijzan0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mykie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mykie";
           sha256 = "12ram39fp3m9ar6q184rsnpkxb14y0ajibng7ia2ck54ck7n36cj";
           name = "mykie";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/mykie";
+          homepage = "https://melpa.org/#/mykie";
           license = lib.licenses.free;
         };
       }) {};
@@ -37726,13 +39104,13 @@
           sha256 = "18ml0qz3iipm9w36zvwz77cbbrg885jgvzk6z4a33xcfp524xhma";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mynt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mynt-mode";
           sha256 = "17s0wdwgh2dcpww6h3qszc9dcs7ki00xkyisvsfn4xqajrmmp75b";
           name = "mynt-mode";
         };
         packageRequires = [ virtualenvwrapper ];
         meta = {
-          homepage = "http://melpa.org/#/mynt-mode";
+          homepage = "https://melpa.org/#/mynt-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -37747,13 +39125,13 @@
           sha256 = "0q5809hq22hyzxx5xr2hwwf3jh3qlpf3mkbl3fxqq93gm16plh1i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mysql2sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mysql2sqlite";
           sha256 = "1jblrbw4rq2jwpb8d1dyna0fiv52b9va3sj881cb17rqx200y3nd";
           name = "mysql2sqlite";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mysql2sqlite";
+          homepage = "https://melpa.org/#/mysql2sqlite";
           license = lib.licenses.free;
         };
       }) {};
@@ -37768,13 +39146,13 @@
           sha256 = "18wqgjn38jxzsbivmf2fkcq3r1y4lffh3dbpv1jj7s9qn91pyp6a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/myterminal-controls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/myterminal-controls";
           sha256 = "0ipk5s2whf3l68q0dydm1j6rcb6jhk61hgjwxygdphifvih7c5y2";
           name = "myterminal-controls";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/myterminal-controls";
+          homepage = "https://melpa.org/#/myterminal-controls";
           license = lib.licenses.free;
         };
       }) {};
@@ -37789,13 +39167,13 @@
           sha256 = "1lp1bx9110vqzjww94va8pdks39qvqzl8rf0p8na1q0qn06rnk9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/n3-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/n3-mode";
           sha256 = "0hasxq39phgyc259dgxskhqxjsp0yi98vx1bs8ynvwa26la4ddzh";
           name = "n3-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/n3-mode";
+          homepage = "https://melpa.org/#/n3-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -37810,13 +39188,13 @@
           sha256 = "1pd6c0jc1zxx3i3nk4qdx7gdf1qn8sc9jgqd72pkkpzvdwv998cp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/n4js";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/n4js";
           sha256 = "0x7smxs91ffriyxx2df61fh1abpl39gqy4m62k77h7xb6fg7af6m";
           name = "n4js";
         };
         packageRequires = [ cypher-mode emacs ];
         meta = {
-          homepage = "http://melpa.org/#/n4js";
+          homepage = "https://melpa.org/#/n4js";
           license = lib.licenses.free;
         };
       }) {};
@@ -37824,17 +39202,17 @@
         pname = "naked";
         version = "20151231.1727";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/naked.el";
+          url = "https://www.emacswiki.org/emacs/download/naked.el";
           sha256 = "0zq13qjqfpxjba1bhdqqxkvgxq1dxyb7hd1bpnk6cbhsxr6mr50i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/naked";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/naked";
           sha256 = "06p6dzhn34dva3677mrvwq2a2x3bhw7f486y654hszla7i75pilq";
           name = "naked";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/naked";
+          homepage = "https://melpa.org/#/naked";
           license = lib.licenses.free;
         };
       }) {};
@@ -37849,13 +39227,13 @@
           sha256 = "0amhw630hgc0j8wr8m6aav399ixi3vbwrck79hhlr3pmyh91vv7n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/name-this-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/name-this-color";
           sha256 = "12nrk1ww766jb4gb4iz6w485nimh2iv8wni2jq4l38v8ndh490zb";
           name = "name-this-color";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/name-this-color";
+          homepage = "https://melpa.org/#/name-this-color";
           license = lib.licenses.free;
         };
       }) {};
@@ -37870,13 +39248,13 @@
           sha256 = "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nameframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nameframe";
           sha256 = "0iq8cfii39ha8sxn9w7kyfvys8kwyax8g4l0pkl05q0a0s95padp";
           name = "nameframe";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nameframe";
+          homepage = "https://melpa.org/#/nameframe";
           license = lib.licenses.free;
         };
       }) {};
@@ -37891,13 +39269,13 @@
           sha256 = "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nameframe-perspective";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nameframe-perspective";
           sha256 = "0wgr90m2pazc514slgdl1lin4mr3xxizasc82k7qinvdvdja515x";
           name = "nameframe-perspective";
         };
         packageRequires = [ nameframe perspective ];
         meta = {
-          homepage = "http://melpa.org/#/nameframe-perspective";
+          homepage = "https://melpa.org/#/nameframe-perspective";
           license = lib.licenses.free;
         };
       }) {};
@@ -37912,34 +39290,34 @@
           sha256 = "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nameframe-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nameframe-projectile";
           sha256 = "11z64wy8mnnrjmgfs2sjbv3mh136aki8r5f89myx861nfx18hc3k";
           name = "nameframe-projectile";
         };
         packageRequires = [ nameframe projectile ];
         meta = {
-          homepage = "http://melpa.org/#/nameframe-projectile";
+          homepage = "https://melpa.org/#/nameframe-projectile";
           license = lib.licenses.free;
         };
       }) {};
     nameless = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nameless";
-        version = "20151014.639";
+        version = "20160403.1313";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "Nameless";
-          rev = "a3dfd7ecf9c58898241c8d1145eb8e0c875f5448";
-          sha256 = "13v0v90vrc2w0wi7wmzmpql6yjbr6lpzh29kxggq9fy38lahd3ks";
+          rev = "49225f379efedf228636985a92ca6fb84cfdea5a";
+          sha256 = "1g8852c68ca4b4wf781aiyhbgk2a3g39jw1mijzpp0lmmnsbmmwc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nameless";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nameless";
           sha256 = "14agx54h2vqfb0656n12z761ywyxsdskd6xa1ccar70l9vwj85vq";
           name = "nameless";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/nameless";
+          homepage = "https://melpa.org/#/nameless";
           license = lib.licenses.free;
         };
       }) {};
@@ -37954,13 +39332,13 @@
           sha256 = "0m82g27gwf9mvicivmcilqghz5b24ijmnw0jf0wl2skfbbg0sydh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/names";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/names";
           sha256 = "1q784606jlakw1z6sx2g2x8hz8c8arywrm2r626wj0v105v510vg";
           name = "names";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/names";
+          homepage = "https://melpa.org/#/names";
           license = lib.licenses.free;
         };
       }) {};
@@ -37975,13 +39353,13 @@
           sha256 = "157hhb253m6a9l5wy6x8w5ar3x0qz1326l7a0npxif6pma0dd140";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/namespaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/namespaces";
           sha256 = "02pb7762khxpah4q6xg8r7dmlv1kwyzinffi7pcaps6ycj29q2fr";
           name = "namespaces";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/namespaces";
+          homepage = "https://melpa.org/#/namespaces";
           license = lib.licenses.free;
         };
       }) {};
@@ -37996,13 +39374,13 @@
           sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nand2tetris";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nand2tetris";
           sha256 = "1zg9xx7mj8334m2v2zqqfkr5vkj4dzqbj8y13qk6xhzb7qkppyqd";
           name = "nand2tetris";
         };
         packageRequires = [ names ];
         meta = {
-          homepage = "http://melpa.org/#/nand2tetris";
+          homepage = "https://melpa.org/#/nand2tetris";
           license = lib.licenses.free;
         };
       }) {};
@@ -38017,13 +39395,13 @@
           sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nand2tetris-assembler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nand2tetris-assembler";
           sha256 = "1761kgrflipxba8894cnx90ks7f3ba4nj6ci515zzxcx9s45mfyy";
           name = "nand2tetris-assembler";
         };
         packageRequires = [ names nand2tetris ];
         meta = {
-          homepage = "http://melpa.org/#/nand2tetris-assembler";
+          homepage = "https://melpa.org/#/nand2tetris-assembler";
           license = lib.licenses.free;
         };
       }) {};
@@ -38037,13 +39415,13 @@
           sha256 = "1nzkamy53kl1g4y1jm7j5zgpkdsyg5ykp8zp1f0bg5mhy8mmf75w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nanowrimo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nanowrimo";
           sha256 = "1nhyj38qyn1x6a5rbrwhcxwfwzyqqjm3dvksdnmam6vfwn3s2r31";
           name = "nanowrimo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nanowrimo";
+          homepage = "https://melpa.org/#/nanowrimo";
           license = lib.licenses.free;
         };
       }) {};
@@ -38058,13 +39436,13 @@
           sha256 = "0mxf61ky1dd7r2qd4j7k6bdppmkilkq5l9gv257a12539wkw5yq2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/naquadah-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/naquadah-theme";
           sha256 = "1aml1f2lgn530i86218nrc1pk3zw5n3qd2gw4gylwi7g75i0cqn1";
           name = "naquadah-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/naquadah-theme";
+          homepage = "https://melpa.org/#/naquadah-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -38072,17 +39450,17 @@
         pname = "narrow-indirect";
         version = "20151231.1739";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/narrow-indirect.el";
+          url = "https://www.emacswiki.org/emacs/download/narrow-indirect.el";
           sha256 = "1lyszm94pd3jxs73v7k0aaazm0sd2rpz2pphcdag7lk7k6vppd9n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/narrow-indirect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/narrow-indirect";
           sha256 = "10aq4gssayh3adw8yz2lza1xbypyffi8r03lsc0kiis6gd9ibiyj";
           name = "narrow-indirect";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/narrow-indirect";
+          homepage = "https://melpa.org/#/narrow-indirect";
           license = lib.licenses.free;
         };
       }) {};
@@ -38097,13 +39475,13 @@
           sha256 = "10yn215xb4s6kshk108y75im1xbdp0vwc9kah5bbaflp9234i0zh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/narrow-reindent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/narrow-reindent";
           sha256 = "0fybal70kk62zlra63x4jb72694m0mzv4cx746prx9anvq1ss2i0";
           name = "narrow-reindent";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/narrow-reindent";
+          homepage = "https://melpa.org/#/narrow-reindent";
           license = lib.licenses.free;
         };
       }) {};
@@ -38118,13 +39496,13 @@
           sha256 = "0ydxj6dc10knambma2hpimqrhfz216nbj96w1dcwgjixs4cd4nax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/narrowed-page-navigation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/narrowed-page-navigation";
           sha256 = "1yrmih60dd69qnin505jlmfidm2svzpdrz46286r7nm6pk7s4pb7";
           name = "narrowed-page-navigation";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/narrowed-page-navigation";
+          homepage = "https://melpa.org/#/narrowed-page-navigation";
           license = lib.licenses.free;
         };
       }) {};
@@ -38139,32 +39517,34 @@
           sha256 = "19v1qp4rzqvyzrk5zaxdjhki8cjl4fg6lr4ai3vi06yf62ds9mcs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nasm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nasm-mode";
           sha256 = "1626yf9mmqlsw8w01vzqsyb5ipa56259d4kl6w871k7rvhxwff17";
           name = "nasm-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/nasm-mode";
+          homepage = "https://melpa.org/#/nasm-mode";
           license = lib.licenses.free;
         };
       }) {};
-    nav = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+    nav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "nav";
         version = "20120507.207";
-        src = fetchhg {
-          url = "https://code.google.com/p/emacs-nav/";
-          rev = "d7f54ce8536e";
+        src = fetchFromGitHub {
+          owner = "ijt";
+          repo = "emacs-nav";
+          rev = "c5eb234c063f435dbdcd1f8bdc46cfc68c973ebe";
           sha256 = "0kfqpji6z3ra8sc951vmm1bzyhkws7vb5q6djvl45wlf1wrgkc4p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nav";
-          sha256 = "036lf6iirxamlqzq3w6m0hji36l480yx5c9wnwypms85hi8hq0vl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nav";
+          sha256 = "0ly1fk4ak1p8gkz3qmmxyslcjgicnfm8bpqqgndvwcznp8pvpjml";
           name = "nav";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nav";
+          homepage = "https://melpa.org/#/nav";
           license = lib.licenses.free;
         };
       }) {};
@@ -38179,34 +39559,34 @@
           sha256 = "07wjicbvzg7cz983hv0p2qw1qlln07djigkmbqfpwvg3fk50fdyg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nav-flash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nav-flash";
           sha256 = "0936kr0s6zxxmjwaqm7ywdw2im4dxai1xb7j6xa2gp7c70qvvsx3";
           name = "nav-flash";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nav-flash";
+          homepage = "https://melpa.org/#/nav-flash";
           license = lib.licenses.free;
         };
       }) {};
     navi-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, outorg, outshine }:
     melpaBuild {
         pname = "navi-mode";
-        version = "20151203.957";
+        version = "20160327.334";
         src = fetchFromGitHub {
           owner = "tj64";
           repo = "navi";
-          rev = "78c0c227d06254d1aec9d8a1301b9a5a785b8b31";
-          sha256 = "1yywbfa0syhb8zmn2qjjw2hxy7vz9ky3xd7kv3nz3gd2x989nb9a";
+          rev = "a6b824ab2591e89e47f7399987f4fb3fa5d9306b";
+          sha256 = "0vmrh8y8q7zch48iz9lk4n0b3s1b8zp3wki3906s709b5ajfvk7h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/navi-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/navi-mode";
           sha256 = "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi";
           name = "navi-mode";
         };
         packageRequires = [ outorg outshine ];
         meta = {
-          homepage = "http://melpa.org/#/navi-mode";
+          homepage = "https://melpa.org/#/navi-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -38221,13 +39601,13 @@
           sha256 = "15l2zmm8bp4ip8m1hfxkvswfwa29pg72kisfya2n5v900r184a4m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/navi2ch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/navi2ch";
           sha256 = "13xwvyy27dz1abjkkazm3s1p6cw32l2klr1bnln02w0azkbdy7x3";
           name = "navi2ch";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/navi2ch";
+          homepage = "https://melpa.org/#/navi2ch";
           license = lib.licenses.free;
         };
       }) {};
@@ -38242,13 +39622,13 @@
           sha256 = "0g7rmvfm0ldv0d2x7f8k761mgmi47siyspfi1ns40ijhkpc15x8l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/navorski";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/navorski";
           sha256 = "0dnzpsm0ya8rbcik5wp378hc9k7gjb3gwmkqqj889c38q5cdwsx7";
           name = "navorski";
         };
         packageRequires = [ dash multi-term s ];
         meta = {
-          homepage = "http://melpa.org/#/navorski";
+          homepage = "https://melpa.org/#/navorski";
           license = lib.licenses.free;
         };
       }) {};
@@ -38263,13 +39643,13 @@
           sha256 = "0gbv5fv401z58ycbqlivqamf5kp3x6krhi36q7q0m4gvy448xz0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ncl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ncl-mode";
           sha256 = "0hmd606xgapzbc79px9l1q6pphrhdzip495yprvg20xsdpmjlfw9";
           name = "ncl-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ncl-mode";
+          homepage = "https://melpa.org/#/ncl-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -38284,13 +39664,13 @@
           sha256 = "178gjv7kq97p9i4naxql7xabvmchw5x8idkpyjqqky3b24v5wkis";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nclip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nclip";
           sha256 = "016jp1rqrf1baxlxbi3476m88a0l3r405dh6pmly519wm2k8pipw";
           name = "nclip";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nclip";
+          homepage = "https://melpa.org/#/nclip";
           license = lib.licenses.free;
         };
       }) {};
@@ -38301,38 +39681,38 @@
         src = fetchFromGitHub {
           owner = "rsdn";
           repo = "nemerle";
-          rev = "0be91a256921594bb81c76d813cd41a2a3a78ce7";
-          sha256 = "15akpl5b3k37hsiw364hn38901gplai6sjc1j563w8ygnfans6vn";
+          rev = "a3000868469dacc44893207e8eec3c836e78b9ea";
+          sha256 = "0xij6gqa6xmjz041vmi4k1xfp7bsp51vk4x6mdy4rv7556sznrrb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nemerle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nemerle";
           sha256 = "0698hbgk80w7wp0ssx9pl13aapm7rc6l3y2zydfkyqdfwy5y71v6";
           name = "nemerle";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nemerle";
+          homepage = "https://melpa.org/#/nemerle";
           license = lib.licenses.free;
         };
       }) {};
     neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neotree";
-        version = "20160214.732";
+        version = "20160306.930";
         src = fetchFromGitHub {
           owner = "jaypei";
           repo = "emacs-neotree";
-          rev = "c61f21aeb7ec42af4f3687d6f670a1363bea4df9";
-          sha256 = "1v3ifr3ndkyxkfyg1n6yknb74313pv96yfq93k80ncxyj40ci5jl";
+          rev = "543b75943b573d9c8b3a22476bdabb331306fd68";
+          sha256 = "1sf8yw1vg01r4969jk1x1k4nad4q7bf1fd8vnranxvhz9md34262";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/neotree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/neotree";
           sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06";
           name = "neotree";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/neotree";
+          homepage = "https://melpa.org/#/neotree";
           license = lib.licenses.free;
         };
       }) {};
@@ -38347,13 +39727,13 @@
           sha256 = "1kkflj2qnrn6kzh1l6bjl5n5507qilb22pqj3h0f2m6hfyn0sw5z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/netherlands-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/netherlands-holidays";
           sha256 = "181linsbg5wrx1z7zbj3in2d3d4zd2v7drspkj0b6l0c5yfxwayf";
           name = "netherlands-holidays";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/netherlands-holidays";
+          homepage = "https://melpa.org/#/netherlands-holidays";
           license = lib.licenses.free;
         };
       }) {};
@@ -38368,34 +39748,34 @@
           sha256 = "0p00mmid04pfsna4ify3cy0b9lx431q1r5h772hihsg4f1rs2ppy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/never-comment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/never-comment";
           sha256 = "0sn8y57895bfpgiynnj4m9b3x3dbb9v5fwkcwmf9jr39dbf98v6s";
           name = "never-comment";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/never-comment";
+          homepage = "https://melpa.org/#/never-comment";
           license = lib.licenses.free;
         };
       }) {};
     newlisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "newlisp-mode";
-        version = "20150120.1240";
+        version = "20160226.945";
         src = fetchFromGitHub {
           owner = "kosh04";
           repo = "newlisp-mode";
-          rev = "7f44e7c763bd16481e78bced5ff310b8113883e5";
-          sha256 = "05jwaj7wlrdpmylawv14ypwpg9qz9pqqqd1nvb94b9gbs79j86z5";
+          rev = "ac23be40c81a360988ab803d365f1510733f6db4";
+          sha256 = "1zzsfyqwj1k4zh30gl491ipavr9pp9djwjq3zz2q3xh7jys68w8r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/newlisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/newlisp-mode";
           sha256 = "0i2d2gyzzvpr5qm2cqzbn9my21lfb66315hg9fj86ac5pkc25zrd";
           name = "newlisp-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/newlisp-mode";
+          homepage = "https://melpa.org/#/newlisp-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -38410,13 +39790,13 @@
           sha256 = "1xnx6v49i6abzbhq4fl4bp9d0pp9gby40splpcj211xsb8yiry27";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nexus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nexus";
           sha256 = "1mdphgsqg6n4hryr53rk42z58vfv0g5wkar5ipanr4h4iclkf5vd";
           name = "nexus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nexus";
+          homepage = "https://melpa.org/#/nexus";
           license = lib.licenses.free;
         };
       }) {};
@@ -38431,13 +39811,34 @@
           sha256 = "08bpyk0brx0x2l0y8hn8zpkaxb2ndmxz22kzxxypj6hdz303wf38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nginx-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nginx-mode";
           sha256 = "07k17m64zhv6gik8v4n73d8l1k6fsp4qp8cl94r384ny0187y65c";
           name = "nginx-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nginx-mode";
+          homepage = "https://melpa.org/#/nginx-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    niceify-info = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "niceify-info";
+        version = "20160416.744";
+        src = fetchFromGitHub {
+          owner = "aaron-em";
+          repo = "niceify-info.el";
+          rev = "38df5062bc3b99d1074cab3e788b5ed66732111c";
+          sha256 = "0hgrf628ris94pmvmgibkq6zmwrqkv9q70c5a2gsbdpqmfikj8m1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/niceify-info";
+          sha256 = "1s9c8yxbab9zl5jx38alwa2hpp4zj5cb9a5gfm3x09jf3iw768bl";
+          name = "niceify-info";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/niceify-info";
           license = lib.licenses.free;
         };
       }) {};
@@ -38452,34 +39853,34 @@
           sha256 = "147vw3qlsply5h8cjmjzqr5dv9jzf9xlmhjnmcpyb1r7krh1l8xm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/niflheim-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/niflheim-theme";
           sha256 = "1dipxwaar7rghmz7s733v035vrbijcg1dla9f7cld1gkgiq9iq36";
           name = "niflheim-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/niflheim-theme";
+          homepage = "https://melpa.org/#/niflheim-theme";
           license = lib.licenses.free;
         };
       }) {};
-    nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
+    nim-mode = callPackage ({ commenter, company, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "nim-mode";
-        version = "20160219.924";
+        version = "20160418.218";
         src = fetchFromGitHub {
           owner = "nim-lang";
           repo = "nim-mode";
-          rev = "b75968ee3191861110d0e5a6bedca5d698e6fd44";
-          sha256 = "0hag9mzy9h4nnbqggzwfn2p31m5p7vx0qqfgpm0z9qbbxcf49w00";
+          rev = "78eb58a3d8d857ba41dbfe7afd745b5c6e612a55";
+          sha256 = "0dmh04kss6krp2nz6i43k2ii7glpwgcw12n5mvd1k20bhp1dybm1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nim-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nim-mode";
           sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6";
           name = "nim-mode";
         };
-        packageRequires = [ commenter emacs epc let-alist ];
+        packageRequires = [ commenter company emacs epc flycheck let-alist ];
         meta = {
-          homepage = "http://melpa.org/#/nim-mode";
+          homepage = "https://melpa.org/#/nim-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -38490,17 +39891,17 @@
         src = fetchFromGitHub {
           owner = "martine";
           repo = "ninja";
-          rev = "d1763746b65cc7349d4ed9478befdb651aa24589";
-          sha256 = "0n64966sb8lyy4gcasmnmsjni7viabwrq1f2gwbvlbcq7mrpqvnj";
+          rev = "aa79fbe25f55e4eeac384d322df8a44bbeb4fe23";
+          sha256 = "0yfm81355mz4m9xjlvxfjp60s9iibcd6268s3nqi54kgxn3m82m6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ninja-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ninja-mode";
           sha256 = "1m7f25sbkz8k343giczrnw2ah5i3mk4c7csi8kk9x5y16030asik";
           name = "ninja-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ninja-mode";
+          homepage = "https://melpa.org/#/ninja-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -38511,38 +39912,38 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "4f011bccf87a494586039a773548be94d6365467";
-          sha256 = "1bly30ds9kbpq877fdqnfmpb9grdycllzx6wy4bcxy3258m7pq3d";
+          rev = "c879a20850f2035cd87b1693da26cadf30affe11";
+          sha256 = "03rk3g52d6kkn5i6g4vx8fl169jcrww66dyzs3ajdcgf8j3hnk2w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nix-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nix-mode";
           sha256 = "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s";
           name = "nix-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nix-mode";
+          homepage = "https://melpa.org/#/nix-mode";
           license = lib.licenses.free;
         };
       }) {};
     nix-sandbox = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "nix-sandbox";
-        version = "20160214.418";
+        version = "20160223.753";
         src = fetchFromGitHub {
           owner = "travisbhartwell";
           repo = "nix-emacs";
-          rev = "63061d379460c53abbe88ec695a61e22feae438f";
-          sha256 = "100vjppa6nipn227v871nkmjmqln2l1lv1v8in1lcjhsz4rxrhs9";
+          rev = "9e84e7f93307b72a1c0decfc2eff9d4943631de3";
+          sha256 = "1r2qbd19kkqf70gq04jfpsrap75qcy359k3ian9rhapi8cj0n23w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nix-sandbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nix-sandbox";
           sha256 = "13zr0jbc6if2wvyiplay2gkd5548imfm38x1qy1dw6m2vhbzwp0k";
           name = "nix-sandbox";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/nix-sandbox";
+          homepage = "https://melpa.org/#/nix-sandbox";
           license = lib.licenses.free;
         };
       }) {};
@@ -38553,17 +39954,17 @@
         src = fetchFromGitHub {
           owner = "travisbhartwell";
           repo = "nix-emacs";
-          rev = "63061d379460c53abbe88ec695a61e22feae438f";
-          sha256 = "100vjppa6nipn227v871nkmjmqln2l1lv1v8in1lcjhsz4rxrhs9";
+          rev = "9e84e7f93307b72a1c0decfc2eff9d4943631de3";
+          sha256 = "1r2qbd19kkqf70gq04jfpsrap75qcy359k3ian9rhapi8cj0n23w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nixos-options";
           sha256 = "1m3jipidk10zj68rzjbacgjlal31jf80gqjxlgj4qs8lm671gxmm";
           name = "nixos-options";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/nixos-options";
+          homepage = "https://melpa.org/#/nixos-options";
           license = lib.licenses.free;
         };
       }) {};
@@ -38578,13 +39979,13 @@
           sha256 = "1skbjmyikzyiic470sngskggs05r35m8vzm69wbmrjapczginnak";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nm";
           sha256 = "004rjbrkc7jalbd8ih170sy97w2g16k3whqrqwywh09pzrzb05kw";
           name = "nm";
         };
         packageRequires = [ company emacs notmuch peg ];
         meta = {
-          homepage = "http://melpa.org/#/nm";
+          homepage = "https://melpa.org/#/nm";
           license = lib.licenses.free;
         };
       }) {};
@@ -38599,13 +40000,13 @@
           sha256 = "0gzxcq0gki89dz9ad26683zhq1nif3wdz185cdplwy68z9szbdx1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nnir-est";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nnir-est";
           sha256 = "04ih47pipph8sl84nv6ka4xlpd8vhnpwhs5cchgk5k1zv3l5scxv";
           name = "nnir-est";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nnir-est";
+          homepage = "https://melpa.org/#/nnir-est";
           license = lib.licenses.free;
         };
       }) {};
@@ -38620,13 +40021,13 @@
           sha256 = "0wk86gm0by9c8mfbvydz5va07qd30n6wx067inqfa7wjffaq0xr7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/noccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/noccur";
           sha256 = "0a8l50v09bgap7rsls808k9wyjpjbcxaffsvz7hh9rw9s7m5fz5g";
           name = "noccur";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/noccur";
+          homepage = "https://melpa.org/#/noccur";
           license = lib.licenses.free;
         };
       }) {};
@@ -38641,13 +40042,13 @@
           sha256 = "1a1pp3sd5g4wkhywb5jfchcdpjsjb0iyhk2sxvd0gpc4kk4zh6xs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/noctilux-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/noctilux-theme";
           sha256 = "15ymyv3rq0n31d8h0ry0l4w4r5a8as0q63ajm9wb6yrxxjl1imfp";
           name = "noctilux-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/noctilux-theme";
+          homepage = "https://melpa.org/#/noctilux-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -38662,13 +40063,13 @@
           sha256 = "1cgmq00ackabwcl4h0n2bb8y08wz0ir5rzca2q3sk4asly6d02m7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/node-resolver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/node-resolver";
           sha256 = "1ng4rgm8f745fajqnbjhi2rshvn6icwdpbh5dzpzhim1w9kb3bhh";
           name = "node-resolver";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/node-resolver";
+          homepage = "https://melpa.org/#/node-resolver";
           license = lib.licenses.free;
         };
       }) {};
@@ -38683,13 +40084,13 @@
           sha256 = "03vcs458rcn1hgfvmgmijadjvri7zlh2z4lxgaplzfnga13mapym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nodejs-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nodejs-repl";
           sha256 = "0rvhhrsw87kfrwdhm8glq6b3nr0v90ivm7fcc0da4yc2jmcyk907";
           name = "nodejs-repl";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nodejs-repl";
+          homepage = "https://melpa.org/#/nodejs-repl";
           license = lib.licenses.free;
         };
       }) {};
@@ -38704,13 +40105,13 @@
           sha256 = "0g70gnmfi8n24jzfci9nrj0n9bn1qig7b8f9f325rin8h7x32ypf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/noflet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/noflet";
           sha256 = "0vzamqb52n330mi6rydrd4ls8nbwh5s42fc2gs5y15zakp6mvhr3";
           name = "noflet";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/noflet";
+          homepage = "https://melpa.org/#/noflet";
           license = lib.licenses.free;
         };
       }) {};
@@ -38723,32 +40124,32 @@
           sha256 = "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nose";
           sha256 = "0l77hsmn3qk934ppdav1gy9sq48g0v1dzc5qy0rp9vv4yz2jx2jk";
           name = "nose";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nose";
+          homepage = "https://melpa.org/#/nose";
           license = lib.licenses.free;
         };
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "20160220.652";
+        version = "20160416.740";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "c689d1ff13ed48507230ca7035021ce42d3dcd64";
-          sha256 = "077a58f04748f71f99da39c3609497a16dbfccf93b8ce70470eda0239d7f832b";
+          rev = "1819d03c2744246ad4158c616969d4a911a988d6";
+          sha256 = "07x3lg3hjsnb5wnlsikynabsrv2yqrys8xrhjjwiy265zhz3b0kc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/notmuch";
-          sha256 = "1sy9k6xbfl035qhnp8sdq9cb3xvgw3lkmdczyd6fw6yrzm5n0g1r";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/notmuch";
+          sha256 = "173d1gf5rd4nbjwg91486ibg54n3qlpwgyvkcy4d30jm4vqwqrqv";
           name = "notmuch";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/notmuch";
+          homepage = "https://melpa.org/#/notmuch";
           license = lib.licenses.free;
         };
       }) {};
@@ -38763,13 +40164,13 @@
           sha256 = "1ss87vlp7625lnn2iah3rc1xfxcbpx4kmiww9n16jx073fs2rj18";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/notmuch-labeler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/notmuch-labeler";
           sha256 = "1c0cbkk5k8ps01xl63a0xa2adkqaj0znw8qs8ca4ai8v1420bpl0";
           name = "notmuch-labeler";
         };
         packageRequires = [ notmuch ];
         meta = {
-          homepage = "http://melpa.org/#/notmuch-labeler";
+          homepage = "https://melpa.org/#/notmuch-labeler";
           license = lib.licenses.free;
         };
       }) {};
@@ -38777,17 +40178,17 @@
         pname = "novice-plus";
         version = "20151231.1740";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/novice+.el";
+          url = "https://www.emacswiki.org/emacs/download/novice+.el";
           sha256 = "0mmdf3z9299hbs3wr8hqgpmg74sb2xm0rxyh38sjcqmk8f310rqh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/novice+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/novice+";
           sha256 = "0r4w4c6y4fny8k0kipzqjsn7idwbi9jq6x9yw51d41ra3pkpvfzf";
           name = "novice-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/novice+";
+          homepage = "https://melpa.org/#/novice+";
           license = lib.licenses.free;
         };
       }) {};
@@ -38802,13 +40203,13 @@
           sha256 = "0jahr1380919p272srym1pp16ifdz69fn1m45ppglm54q4a741d8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/noxml-fold";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/noxml-fold";
           sha256 = "11dninxxwhflf2qrmvwmrryspd9j6m95kdlmyx59ykqvw8j0siqc";
           name = "noxml-fold";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/noxml-fold";
+          homepage = "https://melpa.org/#/noxml-fold";
           license = lib.licenses.free;
         };
       }) {};
@@ -38823,13 +40224,13 @@
           sha256 = "1nwj1ax2qmmlab4lik0b7japhqd424d0rb995dfv89p99gp8vmvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nrepl-eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nrepl-eval-sexp-fu";
           sha256 = "17g4nih9kz2483ylp651lwfxkvmaj7wpinpgnifwbciyrplfvx2j";
           name = "nrepl-eval-sexp-fu";
         };
         packageRequires = [ highlight smartparens thingatpt ];
         meta = {
-          homepage = "http://melpa.org/#/nrepl-eval-sexp-fu";
+          homepage = "https://melpa.org/#/nrepl-eval-sexp-fu";
           license = lib.licenses.free;
         };
       }) {};
@@ -38844,13 +40245,13 @@
           sha256 = "1129r3rzmfbl8nxjz71xnlyaszhhldawj467zbl36brdadp014n1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nrepl-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nrepl-sync";
           sha256 = "01b504b4d8rrhlf3sfq3kk9i222fch6jd5jbm02kqw20fgv6q3jd";
           name = "nrepl-sync";
         };
         packageRequires = [ cider ];
         meta = {
-          homepage = "http://melpa.org/#/nrepl-sync";
+          homepage = "https://melpa.org/#/nrepl-sync";
           license = lib.licenses.free;
         };
       }) {};
@@ -38865,13 +40266,13 @@
           sha256 = "1w80mbwlvmpd5ff7vy84z61b27klzh9z4wa6m2g7cy674fw4r1xp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nsis-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nsis-mode";
           sha256 = "0pc047ryw906sz5mv0awvl67kh20prsgx6fbh0j1qm0cali2792l";
           name = "nsis-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nsis-mode";
+          homepage = "https://melpa.org/#/nsis-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -38886,13 +40287,13 @@
           sha256 = "0nbmpnljl0wdkwmxzg6lqd3mand9w043qmwp727hb84gxy0j4dib";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nu-mode";
-          sha256 = "0h5jaw577vgm3hfiwc2c0k1wn8zda8ps06vj6mqj952m8bqhf4i7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nu-mode";
+          sha256 = "0nzv3p62k8yyyww6idlxyi94q4d07nis7ydypar8d01jfqlrybkn";
           name = "nu-mode";
         };
         packageRequires = [ helm undo-tree ];
         meta = {
-          homepage = "http://melpa.org/#/nu-mode";
+          homepage = "https://melpa.org/#/nu-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -38907,13 +40308,13 @@
           sha256 = "045m83rdqryjpqh6y9s6x0yf9fw9xrwmxbm4qgg8ka164x9szv0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/number";
           sha256 = "1nwcdv5ibirxx3sqadh6mnpj40ni3wna7wnjh343mx38dk2dzncf";
           name = "number";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/number";
+          homepage = "https://melpa.org/#/number";
           license = lib.licenses.free;
         };
       }) {};
@@ -38928,13 +40329,13 @@
           sha256 = "1i0yymsx8kin28bkrgwkk9ngsmjh0gh5j4hb0k03bq4fy799f2xx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nummm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nummm-mode";
           sha256 = "10khhc6q0zjzrhsv4fgfdbs7qcwi1bgkwq4yqzidqcdndsailyh0";
           name = "nummm-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nummm-mode";
+          homepage = "https://melpa.org/#/nummm-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -38949,34 +40350,34 @@
           sha256 = "0prag0ks511ifa5mdpqmizp5n8190dxp4vdr81ld9w9xv7migpd7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nvm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nvm";
           sha256 = "03gy7wavc2q02lnr9pmp3l1pn0lzbdq0kwnmg9fvklmq6r6n3x34";
           name = "nvm";
         };
         packageRequires = [ dash dash-functional f s ];
         meta = {
-          homepage = "http://melpa.org/#/nvm";
+          homepage = "https://melpa.org/#/nvm";
           license = lib.licenses.free;
         };
       }) {};
     nyan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nyan-mode";
-        version = "20151018.35";
+        version = "20160425.1937";
         src = fetchFromGitHub {
           owner = "TeMPOraL";
           repo = "nyan-mode";
-          rev = "eb940664cbca6165644d97989f402c8c5bd0e384";
-          sha256 = "1v8ndr8hdbqhd7nca8882g05y36pigv6lj7hpxl50lr1lvp1kmmf";
+          rev = "95034cefb34df3b11a547e75a4b85c423502341d";
+          sha256 = "1gxwss5rr4j6pv74fadmvnhdzlhk839am15cr9bj4qm47vrr98jl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nyan-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nyan-mode";
           sha256 = "1z2wnsbjllqa533g1ab5cgbv3d9hjix7fsd7z9c45nqh5cmadmyv";
           name = "nyan-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nyan-mode";
+          homepage = "https://melpa.org/#/nyan-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -38991,13 +40392,13 @@
           sha256 = "0bgspjy8h3d7v12sfjnd2ghj4183pdf0z48g5xs129jwd3nycykp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nyan-prompt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nyan-prompt";
           sha256 = "1s0qyhpfpncsv9qfxy07rbp4gv8pp5xzb48rbd3r14nkjlnylnfb";
           name = "nyan-prompt";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nyan-prompt";
+          homepage = "https://melpa.org/#/nyan-prompt";
           license = lib.licenses.free;
         };
       }) {};
@@ -39012,13 +40413,13 @@
           sha256 = "0xs6787a4v7djgd2zz2v1pk14x27mg2ganz30j9f0gdiai7da6ch";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/o-blog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/o-blog";
           sha256 = "08grkyvg27wd5232q3y8p0v7higfq7bmsdzmvhja96v6qy2xsbja";
           name = "o-blog";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/o-blog";
+          homepage = "https://melpa.org/#/o-blog";
           license = lib.licenses.free;
         };
       }) {};
@@ -39033,33 +40434,33 @@
           sha256 = "058dyk1c3iw0ip8n8rfpskvqiriqilpclkzc18x73msp5svrh3lj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/oauth";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/oauth";
           sha256 = "18z3i5brxm60z373cwx2sa3hx7v38a5s62gbs9b0lxb20ah4p9rz";
           name = "oauth";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/oauth";
+          homepage = "https://melpa.org/#/oauth";
           license = lib.licenses.free;
         };
       }) {};
     ob-axiom = callPackage ({ axiom-environment, emacs, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-axiom";
-        version = "20150804.1700";
+        version = "20160310.1553";
         src = fetchhg {
           url = "https://bitbucket.com/pdo/axiom-environment";
-          rev = "f7b3a13f54ea";
-          sha256 = "1qq0b92mf73fnx2viwzlsxr6672wkskf0vjimymyhv9aq3gw165w";
+          rev = "bc294e47f51c";
+          sha256 = "0z15n7cpprbhiamq26240g5bqsiw5mgyzdisi7j6hpybyk2zyl9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-axiom";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-axiom";
           sha256 = "12cmzhgzk8314y6nvzdjwidalccz6h440lil83c1h4lz4ddlwmf6";
           name = "ob-axiom";
         };
         packageRequires = [ axiom-environment emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ob-axiom";
+          homepage = "https://melpa.org/#/ob-axiom";
           license = lib.licenses.free;
         };
       }) {};
@@ -39074,13 +40475,34 @@
           sha256 = "1nzli8wk3nd05j2z2fw511857qbawirhg8mfw21wqclkz8zqn813";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-browser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-browser";
           sha256 = "1yqbzmmazamgf8fi8ipq14ffm8h1pp5d2lkflbxjsagdq61hirxm";
           name = "ob-browser";
         };
         packageRequires = [ org ];
         meta = {
-          homepage = "http://melpa.org/#/ob-browser";
+          homepage = "https://melpa.org/#/ob-browser";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-coffee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ob-coffee";
+        version = "20160415.2236";
+        src = fetchFromGitHub {
+          owner = "zweifisch";
+          repo = "ob-coffee";
+          rev = "dbfa5827df91ed1cdc5b0f3247da6b93fa632507";
+          sha256 = "01l8zvnfpc1vihnpqj75xlvjkk2hkvxpb1872jdzv2k1na2ajfxm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-coffee";
+          sha256 = "16k8r9rqz4mayxl85pjdfsrz43k2hwcf8k7aff8wnic0ldzp6ivf";
+          name = "ob-coffee";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "https://melpa.org/#/ob-coffee";
           license = lib.licenses.free;
         };
       }) {};
@@ -39095,13 +40517,34 @@
           sha256 = "1xbczyqfqdig5w6jvx2kg57mk16sbiz5ysv445v83wqk0sz6nc9n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-cypher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-cypher";
           sha256 = "1ygmx0rjvxjl8hifkkwrkk9gpsmdsk6ndb6pg7y78p8hfp5jpyq3";
           name = "ob-cypher";
         };
         packageRequires = [ cypher-mode dash dash-functional s ];
         meta = {
-          homepage = "http://melpa.org/#/ob-cypher";
+          homepage = "https://melpa.org/#/ob-cypher";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-diagrams = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ob-diagrams";
+        version = "20160407.737";
+        src = fetchFromGitHub {
+          owner = "bergey";
+          repo = "org-babel-diagrams";
+          rev = "ed6649616325ca5b2d2109f74aded8bcb8aa5186";
+          sha256 = "0kx95lvkvg6h6lhs9knlp8rwi05y8y0i8w8vs7mwm378syls0qk0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-diagrams";
+          sha256 = "1r1p9l61az1jb5m4k2dwnkp9j8xlcb588gq4mcg796vnbdscfcy2";
+          name = "ob-diagrams";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/ob-diagrams";
           license = lib.licenses.free;
         };
       }) {};
@@ -39116,76 +40559,76 @@
           sha256 = "0qknm1h2ijnzs1km51hqwpnv5083m9ngi3nbxd90r7d6vva5fhhk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-elixir";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-elixir";
           sha256 = "1l5b9hww2vmqnjlsd6lbjpz9walck82ngang1amfnk4xn6d0gdhi";
           name = "ob-elixir";
         };
         packageRequires = [ org ];
         meta = {
-          homepage = "http://melpa.org/#/ob-elixir";
+          homepage = "https://melpa.org/#/ob-elixir";
           license = lib.licenses.free;
         };
       }) {};
-    ob-go = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
+    ob-go = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-go";
-        version = "20151211.1801";
+        version = "20160318.1452";
         src = fetchFromGitHub {
           owner = "pope";
           repo = "ob-go";
-          rev = "70684286f7344eaa30c47a680a81b74b0d11ea36";
-          sha256 = "0iwyldw8pfy88hvzrqmh9fbx8zj092ycl9wjf9ddji2zxnm44499";
+          rev = "b1f32f888cda6c7e9601ff74d08e653a1c03868c";
+          sha256 = "1pa7zclci87rd4fx731z37pdbdjabmknbr0xmdk1g92g0hjhk2rb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-go";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-go";
           sha256 = "09d8jrzijf8gr08615rdmf366zgip43dxvyihy0yzhk7j0p3iahj";
           name = "ob-go";
         };
-        packageRequires = [ go-mode ];
+        packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ob-go";
+          homepage = "https://melpa.org/#/ob-go";
           license = lib.licenses.free;
         };
       }) {};
     ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ob-http";
-        version = "20160210.458";
+        version = "20160415.2332";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-http";
-          rev = "e10b35accd4c758d781ab9f6e00b7b792dccf380";
-          sha256 = "0bqr6yl1hpykpykjpfb247xnpnz510zrg9yv7nkxlrig4pjgdcx1";
+          rev = "358dded7372a250b316b5e4690933231dc0fcde2";
+          sha256 = "00mnpnlsd774z87ziqmaq9h4rbxmf197cm2kk4v6s15rs3np617m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-http";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-http";
           sha256 = "0b7ghz9pqbyn3b52cpmnwa2wnd4svj23p6gc48ybwzwiid42wiss";
           name = "ob-http";
         };
         packageRequires = [ cl-lib s ];
         meta = {
-          homepage = "http://melpa.org/#/ob-http";
+          homepage = "https://melpa.org/#/ob-http";
           license = lib.licenses.free;
         };
       }) {};
     ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ob-ipython";
-        version = "20151010.507";
+        version = "20160424.1505";
         src = fetchFromGitHub {
           owner = "gregsexton";
           repo = "ob-ipython";
-          rev = "15011a8e1694d09a74094c5361a588bf586458f6";
-          sha256 = "0r5p2gr7ri4w79lmhil4fgh6g8cmxs1qp8glkbvycvlaxwrzszhs";
+          rev = "a12ad0c137c3b935080d1cecb4953252cbcb8da4";
+          sha256 = "071ma803l6ixg12brbc8p2bxnvl2skmr8r913pz07qh0n8k83zqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-ipython";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-ipython";
           sha256 = "06llf365k8m81ljmlajqvxlh84qg6h0flp3m6gb0zx71xilvw186";
           name = "ob-ipython";
         };
         packageRequires = [ dash dash-functional emacs f s ];
         meta = {
-          homepage = "http://melpa.org/#/ob-ipython";
+          homepage = "https://melpa.org/#/ob-ipython";
           license = lib.licenses.free;
         };
       }) {};
@@ -39200,13 +40643,13 @@
           sha256 = "01cjwg27m0iqndkwwl0v5w8vvk270xvi81za3y5hyrmb7dq6bfy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-kotlin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-kotlin";
           sha256 = "19g4s9dnipg9aa360mp0affmnslm6h7byg595rnaz6rz25a3qdpx";
           name = "ob-kotlin";
         };
         packageRequires = [ org ];
         meta = {
-          homepage = "http://melpa.org/#/ob-kotlin";
+          homepage = "https://melpa.org/#/ob-kotlin";
           license = lib.licenses.free;
         };
       }) {};
@@ -39221,13 +40664,34 @@
           sha256 = "1mk7qcf4svf4yk4mimcyhbw5imq3zps2vh2zzq9gwjcn17jnplhn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-lfe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-lfe";
           sha256 = "11cpaxk9wb27b9zhyns75dqpds4gh3cbjcvia4p2bnvmbm8lz4y8";
           name = "ob-lfe";
         };
         packageRequires = [ org ];
         meta = {
-          homepage = "http://melpa.org/#/ob-lfe";
+          homepage = "https://melpa.org/#/ob-lfe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-lua = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ob-lua";
+        version = "20160411.2224";
+        src = fetchFromGitHub {
+          owner = "stardiviner";
+          repo = "ob-lua";
+          rev = "1b5fd9bf529c50f8121afae0472e057daa5e95f9";
+          sha256 = "11cdf5nfmn5cc1i4kqxq0hks8d19sf5rwavpfmz39xysbnr65s68";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-lua";
+          sha256 = "13ailb285bs9sm9qmjrpq0wjk7sp3w019p94pzrwmzqf52y1dapg";
+          name = "ob-lua";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "https://melpa.org/#/ob-lua";
           license = lib.licenses.free;
         };
       }) {};
@@ -39242,13 +40706,13 @@
           sha256 = "0qibnn908a59jyfslsnpjanbm85f8xw9zywsqsh37nv27ncbx0hr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-mongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-mongo";
           sha256 = "1cgmqsl5dzi8xy3sh5xsfkczl555fpd4q6kgsh9xkn74sz227907";
           name = "ob-mongo";
         };
         packageRequires = [ org ];
         meta = {
-          homepage = "http://melpa.org/#/ob-mongo";
+          homepage = "https://melpa.org/#/ob-mongo";
           license = lib.licenses.free;
         };
       }) {};
@@ -39263,34 +40727,76 @@
           sha256 = "14scbds1rlmii52i0zr3s0r1wmga7qysj63c2dpinhagxa36d51n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-prolog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-prolog";
           sha256 = "0ki8yd20yk5xwn0zpk06zjxzgrsf8paydif9n98svb9s2l9wrh1s";
           name = "ob-prolog";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ob-prolog";
+          homepage = "https://melpa.org/#/ob-prolog";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-redis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ob-redis";
+        version = "20160411.2213";
+        src = fetchFromGitHub {
+          owner = "stardiviner";
+          repo = "ob-redis";
+          rev = "244a21569499a3d8cb39f651fbf00ce26accf983";
+          sha256 = "1f8qz5bwz5yd3clvjc0zw3yf9m9fh5vn2gil69ay1a2n00qwkq78";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-redis";
+          sha256 = "1xsz4cc8cqx03ckpcwi7dc3l6v4c5mdbby37a9i0n5q6wd4r92mm";
+          name = "ob-redis";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "https://melpa.org/#/ob-redis";
           license = lib.licenses.free;
         };
       }) {};
     ob-restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, restclient }:
     melpaBuild {
         pname = "ob-restclient";
-        version = "20160201.656";
+        version = "20160324.105";
         src = fetchFromGitHub {
           owner = "alf";
           repo = "ob-restclient.el";
-          rev = "c2686286b7d17fc8c059c7a5b301142718fdf2de";
-          sha256 = "18b5k02mnswsv6jijvh9kb5ps5r0imkvr9r3r3x8fkyjh3k4f5il";
+          rev = "08b82b9ea668631968ae4fb531fd74494630f840";
+          sha256 = "09zxf158sspwv7j0kjjxzlymxi9ax7xpk5d5fry2jljskgn17csv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-restclient";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-restclient";
           sha256 = "0nv2wsqmpschym6ch8fr4a79hlnpz31jc8y2flsygaqj0annjkfk";
           name = "ob-restclient";
         };
         packageRequires = [ restclient ];
         meta = {
-          homepage = "http://melpa.org/#/ob-restclient";
+          homepage = "https://melpa.org/#/ob-restclient";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }:
+    melpaBuild {
+        pname = "ob-sagemath";
+        version = "20160414.852";
+        src = fetchFromGitHub {
+          owner = "stakemori";
+          repo = "ob-sagemath";
+          rev = "fec3fbabaef5f5d679ef1ccbbc39958a4d01b839";
+          sha256 = "0hapjgzbd4s5jif8jdm9svl58h6a504gxc8jq57sibfcbwkjbfk4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-sagemath";
+          sha256 = "02ispac1y4g7p7iyscf5p8lvp92ncrn6281jm9igyiny1w6hivy7";
+          name = "ob-sagemath";
+        };
+        packageRequires = [ emacs s sage-shell-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/ob-sagemath";
           license = lib.licenses.free;
         };
       }) {};
@@ -39305,13 +40811,13 @@
           sha256 = "1ax78ggmzz4lmaw62j0cm8l0n60nyhp6c8f02mdszvv6vnpvyncm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-scala";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-scala";
           sha256 = "1cjbdfxkj5rk164wrad7r470xynfjjaa1aj130zbw9zmn36m6lza";
           name = "ob-scala";
         };
         packageRequires = [ ensime ];
         meta = {
-          homepage = "http://melpa.org/#/ob-scala";
+          homepage = "https://melpa.org/#/ob-scala";
           license = lib.licenses.free;
         };
       }) {};
@@ -39326,34 +40832,34 @@
           sha256 = "0gymna48igcixrapjmg842pnlsshhw8zplxwyyn0x2yrma9fjyyg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-sml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-sml";
           sha256 = "04qvzhwjr8ipvq3znnhn0wbl4pbb1rwxi90iidavzk3phbkpaskn";
           name = "ob-sml";
         };
         packageRequires = [ sml-mode ];
         meta = {
-          homepage = "http://melpa.org/#/ob-sml";
+          homepage = "https://melpa.org/#/ob-sml";
           license = lib.licenses.free;
         };
       }) {};
     ob-translate = callPackage ({ fetchFromGitHub, fetchurl, google-translate, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ob-translate";
-        version = "20130718.929";
+        version = "20160411.324";
         src = fetchFromGitHub {
           owner = "krisajenkins";
           repo = "ob-translate";
-          rev = "c068f8710ec3019a345b7dc5a5433bee23c87afb";
-          sha256 = "1yaqs6zcx8228pwzsm19h6272bw9lhib6xz5xzzq8x8n54l81225";
+          rev = "bba3bd1e2dbb5c672543129460c2713f78b26120";
+          sha256 = "086z3smcfn5g599967vmxj3akppyqk9d64acm8zzj76zj29xfk1k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-translate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-translate";
           sha256 = "1hi0rxbyxvk9sbk2fy3kqw7l4lgri921vya1mn4i1q2i1979r2gz";
           name = "ob-translate";
         };
         packageRequires = [ google-translate org ];
         meta = {
-          homepage = "http://melpa.org/#/ob-translate";
+          homepage = "https://melpa.org/#/ob-translate";
           license = lib.licenses.free;
         };
       }) {};
@@ -39368,13 +40874,13 @@
           sha256 = "1ycqdjqn5361pcnc95hxhjqd3y96cjjnaylrnzwhmacl38jm3vai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-typescript";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-typescript";
           sha256 = "1wpy928ndvc076jzi14f6k5fsw8had0pz7f1yjdqql4icszhqa0p";
           name = "ob-typescript";
         };
         packageRequires = [ emacs org ];
         meta = {
-          homepage = "http://melpa.org/#/ob-typescript";
+          homepage = "https://melpa.org/#/ob-typescript";
           license = lib.licenses.free;
         };
       }) {};
@@ -39389,13 +40895,13 @@
           sha256 = "16462cgq91jg7i97h440zss5vw2qkxgdy7gm148ns4djr2fchnf6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/oberon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/oberon";
           sha256 = "1wna7ld670r6ljdg5yx0ga0grbq1ma8q92gkari0d5czr7s9lggv";
           name = "oberon";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/oberon";
+          homepage = "https://melpa.org/#/oberon";
           license = lib.licenses.free;
         };
       }) {};
@@ -39410,13 +40916,13 @@
           sha256 = "138c1nm579vr37dqprqsakfkhs2awm3klzyyd6bv9rhkrysrpbqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/objc-font-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/objc-font-lock";
           sha256 = "0njslpgdcph3p3gamrbd6pc04szks07yv4ij3p1l7p5dc2p06rs6";
           name = "objc-font-lock";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/objc-font-lock";
+          homepage = "https://melpa.org/#/objc-font-lock";
           license = lib.licenses.free;
         };
       }) {};
@@ -39431,13 +40937,13 @@
           sha256 = "00v21iw9wwxap8jhg9035cp47fm5v2djmldq6nprv860m01xlwh1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/obsidian-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/obsidian-theme";
           sha256 = "17ckshimdma6fqiis4kxczxkbrsfpm2a0b41m5f3qz3qlhcw2xgr";
           name = "obsidian-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/obsidian-theme";
+          homepage = "https://melpa.org/#/obsidian-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -39452,13 +40958,13 @@
           sha256 = "0pnliw02crqw8hbg088klz54z6s1ih8q2lcn9mq5f12xi752hxm8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/occidental-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/occidental-theme";
           sha256 = "1ra5p8k96wvb04v69xm87jl4jlgi57v4jw2xxzkwbwxbydncnv0b";
           name = "occidental-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/occidental-theme";
+          homepage = "https://melpa.org/#/occidental-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -39473,13 +40979,13 @@
           sha256 = "1v1c2481v2xgnw8kgbbqhqkdd41lzvki9hm3iypbf3n0jxz8nnzy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/occur-context-resize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/occur-context-resize";
           sha256 = "0sp5v4rwqgqdj26gdkrmjvkmbp4g6jq4lrn2c3zm8s2gq0s3l6ri";
           name = "occur-context-resize";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/occur-context-resize";
+          homepage = "https://melpa.org/#/occur-context-resize";
           license = lib.licenses.free;
         };
       }) {};
@@ -39494,13 +41000,13 @@
           sha256 = "1zj0xhvl5qx42injv0av4lyzd3jsjls1m368dqd2qnswhfw8wfn6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/occur-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/occur-x";
           sha256 = "1xq1k9rq7k1zw90shbgiidwvcn0ys1d53q03b5mpvvfqhj4n0i1g";
           name = "occur-x";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/occur-x";
+          homepage = "https://melpa.org/#/occur-x";
           license = lib.licenses.free;
         };
       }) {};
@@ -39515,13 +41021,13 @@
           sha256 = "155gmls6cz3zf4lcj89kzb96y7k0glx0f659jg5z0skgxq79hf48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ocodo-svg-modelines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ocodo-svg-modelines";
           sha256 = "0fa88ns70wsr9i9gf4zx3fvmn1a32mrjsda105n0cx6c965kfmay";
           name = "ocodo-svg-modelines";
         };
         packageRequires = [ svg-mode-line-themes ];
         meta = {
-          homepage = "http://melpa.org/#/ocodo-svg-modelines";
+          homepage = "https://melpa.org/#/ocodo-svg-modelines";
           license = lib.licenses.free;
         };
       }) {};
@@ -39536,13 +41042,13 @@
           sha256 = "00fm6xg3q7d0vrx5wdg9badv587g4v9k3szwj00wscn9jb0bjhd3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ocp-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ocp-indent";
           sha256 = "0wc4z9dsnnyr24n3vg1npvc3rm53av8bpbvrl8kldxxdiwgnbkjw";
           name = "ocp-indent";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ocp-indent";
+          homepage = "https://melpa.org/#/ocp-indent";
           license = lib.licenses.free;
         };
       }) {};
@@ -39557,13 +41063,13 @@
           sha256 = "0dp7dhmgrq078rjhpm1cr993qjqz7qgy2z4sn73qw6j55va7d9kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/octicons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/octicons";
           sha256 = "02f37bvnc5qvkvfbyx5wp54nz71bqm747mq1p5361sx091lllkxk";
           name = "octicons";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/octicons";
+          homepage = "https://melpa.org/#/octicons";
           license = lib.licenses.free;
         };
       }) {};
@@ -39578,13 +41084,13 @@
           sha256 = "0p9ph62vnw1r9dbvrjyw356a9bjnzh0hglssi97dr0qd6cs8whf3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/octopress";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/octopress";
           sha256 = "0zsir6chjvn5i1irmf5aj6mmb401c553r5wykq796sz7jnjhrjg0";
           name = "octopress";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/octopress";
+          homepage = "https://melpa.org/#/octopress";
           license = lib.licenses.free;
         };
       }) {};
@@ -39599,13 +41105,13 @@
           sha256 = "1bjrgj8klg7ly63vx90jpaih9virn02bhqi16p6z0mw36q1q7ysq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/offlineimap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/offlineimap";
           sha256 = "0nza7lrz7cn06njcblwh9hy3050j8ja4awbxx7jzv6nazjg7201b";
           name = "offlineimap";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/offlineimap";
+          homepage = "https://melpa.org/#/offlineimap";
           license = lib.licenses.free;
         };
       }) {};
@@ -39620,34 +41126,34 @@
           sha256 = "0y9fxrsxp1158fyjp4f69r7g2s7b6nbxlsmsb8clwqc8pmmg2z82";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/oldlace-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/oldlace-theme";
           sha256 = "1pxiqqh5x4wsayqgwplzvsbalbj44zvby7x0pijdvwcnsh74znj8";
           name = "oldlace-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/oldlace-theme";
+          homepage = "https://melpa.org/#/oldlace-theme";
           license = lib.licenses.free;
         };
       }) {};
     olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "olivetti";
-        version = "20160105.555";
+        version = "20160412.2322";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "olivetti";
-          rev = "ef3d85e65d46370702e04359cc22068678336d0c";
-          sha256 = "1mh4dlx5j2zwv7zx8x52vl6h38jr41ly5bn6zqsncnafd1a8l7x7";
+          rev = "4095b761e12352a0862e6fadbc56483e7c756f21";
+          sha256 = "1hx1yv0fd64832y15c2chz9d50hqs4ap5vry4x6745vify6mchlj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/olivetti";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/olivetti";
           sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd";
           name = "olivetti";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/olivetti";
+          homepage = "https://melpa.org/#/olivetti";
           license = lib.licenses.free;
         };
       }) {};
@@ -39662,13 +41168,13 @@
           sha256 = "03szb2i2xk3nq578cz1drsddsbld03ryvykdfzmfvwcmlpaknvzb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/om-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/om-mode";
           sha256 = "1q2h9wjnyg7wlk913px4vj1cxqynd6xfh9ind7kjyra436yw3l4j";
           name = "om-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/om-mode";
+          homepage = "https://melpa.org/#/om-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -39683,13 +41189,13 @@
           sha256 = "1925mh47n4x9v780qp5l6cksl64v9mpyb87znsg93x6sxr0cvv4c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omni-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/omni-kill";
           sha256 = "03kydl16rd9mnc1rnan2byqa6f70891fhcj16wkavl2r68rfj75k";
           name = "omni-kill";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/omni-kill";
+          homepage = "https://melpa.org/#/omni-kill";
           license = lib.licenses.free;
         };
       }) {};
@@ -39704,13 +41210,13 @@
           sha256 = "1nvgh9wvgswcs3r958b579rsx540xrhlnafc6cmcd63z6yck19w0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omni-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/omni-log";
           sha256 = "0c29243zq8r89ax4rxlmb8imag12icnldcb0q0xsnhjccw8lyw1r";
           name = "omni-log";
         };
         packageRequires = [ dash emacs ht s ];
         meta = {
-          homepage = "http://melpa.org/#/omni-log";
+          homepage = "https://melpa.org/#/omni-log";
           license = lib.licenses.free;
         };
       }) {};
@@ -39725,13 +41231,13 @@
           sha256 = "1x8af8jv4n83sl4rgj0d2rpmw9g78rknm1h523f3b1a5x4kdvsz6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omni-quotes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/omni-quotes";
           sha256 = "0dqki0ibabs9cpcjvnh8lc2114x46i1xmnyjc6qqblfxa3ggdygs";
           name = "omni-quotes";
         };
         packageRequires = [ dash omni-log ];
         meta = {
-          homepage = "http://melpa.org/#/omni-quotes";
+          homepage = "https://melpa.org/#/omni-quotes";
           license = lib.licenses.free;
         };
       }) {};
@@ -39746,13 +41252,13 @@
           sha256 = "1icdk19vwihc8mn04yxl2brql2gssn3gxd5bv7ljdd6mn5hkw500";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omni-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/omni-scratch";
           sha256 = "190dkqcw8xywzrq8a99w4rqi0y1h2aj23s84g2ln1sf7jaf6d6n9";
           name = "omni-scratch";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/omni-scratch";
+          homepage = "https://melpa.org/#/omni-scratch";
           license = lib.licenses.free;
         };
       }) {};
@@ -39767,34 +41273,34 @@
           sha256 = "1lvnkdrav7h15p8d5ayhfsjynllwp4br1vqxmw0ppxnlyq7337n5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omni-tags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/omni-tags";
           sha256 = "133ww1jf14jbw02ssbx2a46mp52j18a2wwzb6x77azb0akmf1lzl";
           name = "omni-tags";
         };
         packageRequires = [ cl-lib pcre2el ];
         meta = {
-          homepage = "http://melpa.org/#/omni-tags";
+          homepage = "https://melpa.org/#/omni-tags";
           license = lib.licenses.free;
         };
       }) {};
     omniref = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "omniref";
-        version = "20151118.221";
+        version = "20160225.1624";
         src = fetchFromGitHub {
           owner = "dotemacs";
           repo = "omniref.el";
-          rev = "0026e0472c7071e06cfdc24be91d3f4989ba8115";
-          sha256 = "1hzvpajq58py6k7z2rwwax1c7pm65m534mq8mr9g9kxn9hqiz9n8";
+          rev = "cc18a41e9717bae439d66c945788e3e19b4624ad";
+          sha256 = "0d6kjggi2p937ydpvw3fr2cxy5vj46dmfqbkb7a9jdhnzxadnwh5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omniref";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/omniref";
           sha256 = "0lgw1knqppdg046zqx4m7nbzvsasr89wa9i4594hf46w1094dabj";
           name = "omniref";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/omniref";
+          homepage = "https://melpa.org/#/omniref";
           license = lib.licenses.free;
         };
       }) {};
@@ -39809,7 +41315,7 @@
           sha256 = "1iq8yzjv7wb0jfi3lqqyx4n7whvb7xf8ls0q0w7pgsrsslrxbwcm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omnisharp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/omnisharp";
           sha256 = "0dwya22y92k7x2s223az1g8hmrpfmk1sgwbr9z47raaa8kd52iad";
           name = "omnisharp";
         };
@@ -39824,28 +41330,28 @@
           s
         ];
         meta = {
-          homepage = "http://melpa.org/#/omnisharp";
+          homepage = "https://melpa.org/#/omnisharp";
           license = lib.licenses.free;
         };
       }) {};
     omtose-phellack-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "omtose-phellack-theme";
-        version = "20160212.547";
+        version = "20160412.628";
         src = fetchFromGitHub {
           owner = "franksn";
           repo = "omtose-phellack-theme";
-          rev = "33c7f6a96bf9aaf7e46939a38e821bab9466958a";
-          sha256 = "0jpxnfxgc7xpbk6894hygbr5qq6wkvy866l87jrprj8klvp2c0b9";
+          rev = "ebd13c54ea6f417bada5f5734c66e351ea431f03";
+          sha256 = "01cssk6dxinfy1h431cx1yq5nbk0pc5j0h3iir2anzz1kfzbzilz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omtose-phellack-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/omtose-phellack-theme";
           sha256 = "09nyc7sdhzy4vmngzdj6r7cv2nbbwqlcyyi2mcg5a8lml4f6fj5i";
           name = "omtose-phellack-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/omtose-phellack-theme";
+          homepage = "https://melpa.org/#/omtose-phellack-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -39860,34 +41366,55 @@
           sha256 = "1616bdvrf1bawcqgj7balbxaw26waw81gxiw7yspnvpyb009j66y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/on-parens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/on-parens";
           sha256 = "19kyzpkgfl0ipbcgnl8fbfbapnfdxr8w9i7prfkm6rjp6amxyqab";
           name = "on-parens";
         };
         packageRequires = [ dash emacs evil smartparens ];
         meta = {
-          homepage = "http://melpa.org/#/on-parens";
+          homepage = "https://melpa.org/#/on-parens";
           license = lib.licenses.free;
         };
       }) {};
     on-screen = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "on-screen";
-        version = "20151108.2308";
+        version = "20160302.350";
         src = fetchFromGitHub {
           owner = "michael-heerdegen";
           repo = "on-screen.el";
-          rev = "80b00ddef6dffad7086174c2c57f29ef28b69d27";
-          sha256 = "1rksk0j9b27w913bzbq7w2ws75yi66m24ic6ljdhhbrq3z2ic7dy";
+          rev = "206468aa4de299ad26c2db12b757f5ad7290912f";
+          sha256 = "1rrby3mbh24qd43nsb3ymcrjxh1cz6iasf1gv0a8fmivmb4f7dyz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/on-screen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/on-screen";
           sha256 = "104jisc2bckzrajxlvj1cfx1drnjj7jhqjblvm89ry32xdnjxmqb";
           name = "on-screen";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/on-screen";
+          homepage = "https://melpa.org/#/on-screen";
+          license = lib.licenses.free;
+        };
+      }) {};
+    one-time-pad-encrypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "one-time-pad-encrypt";
+        version = "20160329.1013";
+        src = fetchFromGitHub {
+          owner = "garvinguan";
+          repo = "emacs-one-time-pad";
+          rev = "87cc1f124024ce3d277299ca0ac703f182937d9f";
+          sha256 = "0g2hvpnmgyy1k393prv97nqwlqc58nqf71hkrmaijw0cyy9q03nz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/one-time-pad-encrypt";
+          sha256 = "0aa7qcii7yf4527nhlwwp0hbhamhyp2xg0fsscnq2m28l5d5kmn6";
+          name = "one-time-pad-encrypt";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/one-time-pad-encrypt";
           license = lib.licenses.free;
         };
       }) {};
@@ -39895,17 +41422,17 @@
         pname = "oneonone";
         version = "20151231.1741";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/oneonone.el";
+          url = "https://www.emacswiki.org/emacs/download/oneonone.el";
           sha256 = "05njigqi9061d34530d76kwsdzqgk9qxnwhn9xis64w59f5nzf1h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/oneonone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/oneonone";
           sha256 = "0v4nvhzgq97zbi18jd3ds57yh1fpv57b2a1cd7r8jbxwaaz3gpg9";
           name = "oneonone";
         };
         packageRequires = [ hexrgb ];
         meta = {
-          homepage = "http://melpa.org/#/oneonone";
+          homepage = "https://melpa.org/#/oneonone";
           license = lib.licenses.free;
         };
       }) {};
@@ -39920,13 +41447,13 @@
           sha256 = "1yqrp9icci5snp1485wb6y8mr2hjp9006ahch58lvmnq98bn7j45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/opam";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/opam";
           sha256 = "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa";
           name = "opam";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/opam";
+          homepage = "https://melpa.org/#/opam";
           license = lib.licenses.free;
         };
       }) {};
@@ -39934,17 +41461,17 @@
         pname = "open-junk-file";
         version = "20130131.120";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/open-junk-file.el";
+          url = "https://www.emacswiki.org/emacs/download/open-junk-file.el";
           sha256 = "1vjmgayksdgg54b46aqmvhd7a9arjx9p3jyrjs2z9262f6r288lj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/open-junk-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/open-junk-file";
           sha256 = "0ybycprs5di9niai4hbmfq4xdacfgrzf1mwq1aj1hi53phl8l4di";
           name = "open-junk-file";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/open-junk-file";
+          homepage = "https://melpa.org/#/open-junk-file";
           license = lib.licenses.free;
         };
       }) {};
@@ -39955,17 +41482,17 @@
         src = fetchFromGitHub {
           owner = "salmanebah";
           repo = "opencl-mode";
-          rev = "14109a4bb56105a9c052ae49ad4c638b4cc210b2";
-          sha256 = "0n64l1jrrk60g192nn0240qcv2p9r138mi9gb38qq5k65wffbc21";
+          rev = "bb39190bb4fdffa188ce4e6849853a07c682b999";
+          sha256 = "094r6fx1s76m8anqqg2qrddidn1dp08kmv8p8md27yy9mm49d91n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/opencl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/opencl-mode";
           sha256 = "1g351wiaycwmg1bnf4s2mdnc3lb2ml5l54g19184xqssfqlx7y79";
           name = "opencl-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/opencl-mode";
+          homepage = "https://melpa.org/#/opencl-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -39980,13 +41507,13 @@
           sha256 = "0086pfk4pq6xmknk7a42fihcjgzkcplqqc1rk9fhwmn9j7djbq70";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/openstack-cgit-browse-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/openstack-cgit-browse-file";
           sha256 = "05dl28a4npnnzzipypfcqb21sdww715lwji2xnsabx3fb1h1w5jl";
           name = "openstack-cgit-browse-file";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/openstack-cgit-browse-file";
+          homepage = "https://melpa.org/#/openstack-cgit-browse-file";
           license = lib.licenses.free;
         };
       }) {};
@@ -39999,13 +41526,13 @@
           sha256 = "1wl6gnxsyhaad4cl9bxjc0qbc5jzvlwbwjbajs0n1s6qr07d6r01";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/openwith";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/openwith";
           sha256 = "05lkx3yfv2445fp07bhqv2aqz5hgf3dxp39lmz3nfxn4c9v8nkqi";
           name = "openwith";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/openwith";
+          homepage = "https://melpa.org/#/openwith";
           license = lib.licenses.free;
         };
       }) {};
@@ -40020,13 +41547,13 @@
           sha256 = "0iw3c8sn702ziki59mvd5gxm484i7f0bwsy8fz95y08s9gknjjf9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/operate-on-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/operate-on-number";
           sha256 = "1rw3fqbzfizgcbz3yaf99rr2546msna4z7dyfa8dbi8h7yzl4fhk";
           name = "operate-on-number";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/operate-on-number";
+          homepage = "https://melpa.org/#/operate-on-number";
           license = lib.licenses.free;
         };
       }) {};
@@ -40041,13 +41568,13 @@
           sha256 = "1xckin2d6s40kgr2293g72ipc57f8gp6y63303kmqcv3qm8q13ca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-ac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-ac";
           sha256 = "059jr3v3558cgw626zbqfwmwwv5f4637ai26h7b6psqh0x9sf3mr";
           name = "org-ac";
         };
         packageRequires = [ auto-complete-pcmp log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/org-ac";
+          homepage = "https://melpa.org/#/org-ac";
           license = lib.licenses.free;
         };
       }) {};
@@ -40062,13 +41589,13 @@
           sha256 = "15xgkm5p30qfghyhkjivh5n4770794qf4pza462vb0xl5v6kffbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-agenda-property";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-agenda-property";
           sha256 = "0zsjzjw52asl609q7a2s4jcsm478p4cxzhnd3azyr9ypxydjf6qk";
           name = "org-agenda-property";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/org-agenda-property";
+          homepage = "https://melpa.org/#/org-agenda-property";
           license = lib.licenses.free;
         };
       }) {};
@@ -40083,13 +41610,13 @@
           sha256 = "0yzvir2gmyv9k43q3sf37lc9xcmfyaj5wh825xax7305j3b2hhvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-alert";
           sha256 = "0n5a24iv8cj395xr0gfgi0hs237dd98zm2fws05k47vy3ygni152";
           name = "org-alert";
         };
         packageRequires = [ alert dash s ];
         meta = {
-          homepage = "http://melpa.org/#/org-alert";
+          homepage = "https://melpa.org/#/org-alert";
           license = lib.licenses.free;
         };
       }) {};
@@ -40104,13 +41631,13 @@
           sha256 = "0f4ja4m1r6bbgachipswb2001ryg8cqcxjvwmnab951mw0cbg7v4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-attach-screenshot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-attach-screenshot";
           sha256 = "0108kahyd499q87wzvirv5d6p7jrb7ckz8r96pwqzgflj3njbnmn";
           name = "org-attach-screenshot";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-attach-screenshot";
+          homepage = "https://melpa.org/#/org-attach-screenshot";
           license = lib.licenses.free;
         };
       }) {};
@@ -40125,13 +41652,13 @@
           sha256 = "0j6fqgzvbmvvdh0dgwsxq004wxys2zwnq9wa3idm087ynp2a2ani";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-autolist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-autolist";
           sha256 = "1jvspxhxlvd7h1srk9dbk1v5dykmf8jsjaqicpll7ial6i0qgikj";
           name = "org-autolist";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-autolist";
+          homepage = "https://melpa.org/#/org-autolist";
           license = lib.licenses.free;
         };
       }) {};
@@ -40146,13 +41673,34 @@
           sha256 = "00iklf97mszrsdv20q55qhml1dscvmmalpfnlkwi9mabklyq3i6z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-beautify-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-beautify-theme";
           sha256 = "1j2gi3f72kvavdcj6xs7zng0dcnivrhc7pjzm2g4mjm5ad5s1flq";
           name = "org-beautify-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-beautify-theme";
+          homepage = "https://melpa.org/#/org-beautify-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-bookmark-heading = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-bookmark-heading";
+        version = "20160326.159";
+        src = fetchFromGitHub {
+          owner = "alphapapa";
+          repo = "org-bookmark-heading";
+          rev = "5d8023c068049d4805e07ed220ae316ee6fbd2e8";
+          sha256 = "084ij85pw53pzr220ql97544zkh23xb8gr81397asfdhc5wrzkqw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-bookmark-heading";
+          sha256 = "1q92rg9d945ypcpb7kig2r0cr7nb7avsylaa7nxjib25advx80n9";
+          name = "org-bookmark-heading";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/org-bookmark-heading";
           license = lib.licenses.free;
         };
       }) {};
@@ -40167,55 +41715,55 @@
           sha256 = "10nr4sjffnqbllv6gmak6pviyynrb7pi5nvrq331h5alm3xcpq0w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-bullets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-bullets";
           sha256 = "1kxhlabaqi1g6pz215afp65d9cp324s8mvabjh7q1h7ari32an75";
           name = "org-bullets";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-bullets";
+          homepage = "https://melpa.org/#/org-bullets";
           license = lib.licenses.free;
         };
       }) {};
     org-caldav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-caldav";
-        version = "20150131.352";
+        version = "20160306.837";
         src = fetchFromGitHub {
           owner = "dengste";
           repo = "org-caldav";
-          rev = "8aff005f431e5f677950b73f710fdf968ff4ac65";
-          sha256 = "0lq2rx6wgz0aymwhw597xs2pabinhk3jpnnhjwq0jk8ggp3afqaz";
+          rev = "97a70cbd478a665c24b910d8ce082059e042a64b";
+          sha256 = "0fq9d1q16fs0i3x9gs8k1n98nvh971r6g5bk2bswpfbpvndgwbi1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-caldav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-caldav";
           sha256 = "0166y04gxrwnynm4jshm2kqk5jbvl5g5078dxvw18nicrgq3y4r8";
           name = "org-caldav";
         };
         packageRequires = [ org ];
         meta = {
-          homepage = "http://melpa.org/#/org-caldav";
+          homepage = "https://melpa.org/#/org-caldav";
           license = lib.licenses.free;
         };
       }) {};
-    org-cliplink = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    org-cliplink = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-cliplink";
-        version = "20151229.1300";
+        version = "20160319.700";
         src = fetchFromGitHub {
           owner = "rexim";
           repo = "org-cliplink";
-          rev = "82f46c1355ef6cfbf884171c0410570bcc525027";
-          sha256 = "1g9fanikdcbkmvbh9bp5dg3s2maawkqinjavn5158p0gy68ab240";
+          rev = "d4853156961f81210ae1a6742f11ea1ee297fde6";
+          sha256 = "048mcjgls405wwvn2r90cxkyw9z2nf97gif86k0gxk7yrbbkiy2x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-cliplink";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-cliplink";
           sha256 = "19l3k9w9csgvdr7n824bzg7jja0f28dmz6caldxh43vankpmlg3p";
           name = "org-cliplink";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/org-cliplink";
+          homepage = "https://melpa.org/#/org-cliplink";
           license = lib.licenses.free;
         };
       }) {};
@@ -40230,13 +41778,13 @@
           sha256 = "0l0r44brs3fcgpjjirfrbf5cgxmsc0siqakv5mlvmr64xd1vi2lw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-clock-convenience";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-clock-convenience";
           sha256 = "1zis0fp7q253qfxypm7a69zb3w8jb4cbrbj2rk34d1jisvnn4irw";
           name = "org-clock-convenience";
         };
         packageRequires = [ cl-lib emacs org ];
         meta = {
-          homepage = "http://melpa.org/#/org-clock-convenience";
+          homepage = "https://melpa.org/#/org-clock-convenience";
           license = lib.licenses.free;
         };
       }) {};
@@ -40251,13 +41799,13 @@
           sha256 = "0q4v216ihhwv8rlb9xc8xy7nj1p058xabfflglhgcd7mfjrsyayx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-context";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-context";
           sha256 = "19y8aln7wix9p506ajvfkl641147c5mdmjm98jnq68cx2r4wp6zz";
           name = "org-context";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-context";
+          homepage = "https://melpa.org/#/org-context";
           license = lib.licenses.free;
         };
       }) {};
@@ -40266,19 +41814,19 @@
         pname = "org-cua-dwim";
         version = "20120202.2334";
         src = fetchFromGitHub {
-          owner = "mlf176f2";
+          owner = "mattfidler";
           repo = "org-cua-dwim.el";
           rev = "a55d6c7009fc0b22f1110c07de629acc955c85e4";
           sha256 = "0nrfvmqb70phnq0k4wbdj6z666wq6xvabg4pgv8qn62rbrw4yyhm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-cua-dwim";
-          sha256 = "0p7v564p8n1hm7rzlrbm2pnhyha8aif2r9g7g4kg0iqln89f5yhc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-cua-dwim";
+          sha256 = "0ib3m41b4lh0p0xxhsmfv42qs00xm2cfwwl2cgfdjjp1s57p19xy";
           name = "org-cua-dwim";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-cua-dwim";
+          homepage = "https://melpa.org/#/org-cua-dwim";
           license = lib.licenses.free;
         };
       }) {};
@@ -40293,13 +41841,13 @@
           sha256 = "1nqfi139cag3ll8wxk8rh59hay97vi8i0mlgnams4jla285zydj5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-dashboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-dashboard";
           sha256 = "1hvhhbmyx12wsf2n1hd0hg5cy05zyspd82xxcdh04g4s9r3ikqj5";
           name = "org-dashboard";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/org-dashboard";
+          homepage = "https://melpa.org/#/org-dashboard";
           license = lib.licenses.free;
         };
       }) {};
@@ -40314,13 +41862,13 @@
           sha256 = "1wrgqdrfdxc1vrcr6dsa8dcxrwj6zgjr9h1fzilwnxlzfvdilnsm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-doing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-doing";
           sha256 = "17w49z78fvbz182sxv9mnryj124gm9jbdmbybppjqz4rk6wvnm2j";
           name = "org-doing";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-doing";
+          homepage = "https://melpa.org/#/org-doing";
           license = lib.licenses.free;
         };
       }) {};
@@ -40335,55 +41883,55 @@
           sha256 = "15zrnd168n4pwa1bj5fz79hcrgw61braf0b095rsfhjh5w2sasy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-dotemacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-dotemacs";
           sha256 = "1vc391fdkdqd4g0piq66zhrlgqx5s2ijv7qd1rc3a235sjb9i2n4";
           name = "org-dotemacs";
         };
         packageRequires = [ cl-lib org ];
         meta = {
-          homepage = "http://melpa.org/#/org-dotemacs";
+          homepage = "https://melpa.org/#/org-dotemacs";
           license = lib.licenses.free;
         };
       }) {};
     org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-download";
-        version = "20151030.916";
+        version = "20160411.910";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "org-download";
-          rev = "501920e273b32f96dfbafcf769d330296a612847";
-          sha256 = "12k3iqzmj92cvi0d99mn3ylxj00p2f2f8049dd2nxnp1gxs2k4dq";
+          rev = "39e810e114553fdf09785d2a81923103f689e907";
+          sha256 = "02344qyhz4bjz0rg4lmmqpn43lf03ag5v384ppczqks61rq7zpq9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-download";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-download";
           sha256 = "19yjx0qqpmrdwagp3d6lwwv7dcb745m9ccq3m29sin74f5p4svsi";
           name = "org-download";
         };
         packageRequires = [ async ];
         meta = {
-          homepage = "http://melpa.org/#/org-download";
+          homepage = "https://melpa.org/#/org-download";
           license = lib.licenses.free;
         };
       }) {};
     org-dp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-dp";
-        version = "20160206.402";
+        version = "20160326.803";
         src = fetchFromGitHub {
           owner = "tj64";
           repo = "org-dp";
-          rev = "ffd4a133f5b39235eaa00e4eb29fba9e8f72750c";
-          sha256 = "1a1j654n0if9yh74j7xwrjmsi3aiy1bw7nzzbqda1zd7qbr6r253";
+          rev = "d9a18e8fb04c94d5d35236b37ee7db0afcb7d580";
+          sha256 = "0misv6g1cql7qc3xhy56cn79pzvn811fvhvivvq0bdx4g0hpp2fg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-dp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-dp";
           sha256 = "0fnrzpgw8l0g862j20yy4mw1wfcm2i04r6dxi4yd7yay8bw2i4yq";
           name = "org-dp";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/org-dp";
+          homepage = "https://melpa.org/#/org-dp";
           license = lib.licenses.free;
         };
       }) {};
@@ -40398,13 +41946,13 @@
           sha256 = "0m5c9x0vazciq6czpg5y9nr5yzjf6nl0qp5cfajv49cw2h0cwqyy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-drill-table";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-drill-table";
           sha256 = "1gb5b4hj4xr8nv8bxfar145i38zcic6c34gk98wpshvwzvb43r69";
           name = "org-drill-table";
         };
         packageRequires = [ cl-lib dash emacs org-plus-contrib s ];
         meta = {
-          homepage = "http://melpa.org/#/org-drill-table";
+          homepage = "https://melpa.org/#/org-drill-table";
           license = lib.licenses.free;
         };
       }) {};
@@ -40419,13 +41967,13 @@
           sha256 = "0jjdsng7fm4wbhvd9naqzdfsmkvj1sf1d9rikprg1pd58azv6idx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-dropbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-dropbox";
           sha256 = "0qfvdz13ncqn7qaz03lwabzsnk62z6wqzlxlvdqv5xyllcy9m6ln";
           name = "org-dropbox";
         };
         packageRequires = [ dash emacs names ];
         meta = {
-          homepage = "http://melpa.org/#/org-dropbox";
+          homepage = "https://melpa.org/#/org-dropbox";
           license = lib.licenses.free;
         };
       }) {};
@@ -40440,13 +41988,13 @@
           sha256 = "0kqvwqmwnwg2h7r38fpjg6qlkcj9v8011df8nmsgs1w1mfdvnjsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-ehtml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-ehtml";
           sha256 = "0n82fbd7aircqg2c9m138qfv8csrv0amhya3xlwswdkqn51vn3gw";
           name = "org-ehtml";
         };
         packageRequires = [ emacs web-server ];
         meta = {
-          homepage = "http://melpa.org/#/org-ehtml";
+          homepage = "https://melpa.org/#/org-ehtml";
           license = lib.licenses.free;
         };
       }) {};
@@ -40461,34 +42009,34 @@
           sha256 = "0va8wm319vvw7w0j102mx656icy3fi4mz3b6bxira6z6xl9b92s0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-elisp-help";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-elisp-help";
           sha256 = "0a4wvz52hkcw5nrml3h1yp8w97vg5jw22wnpfbb827zh7iwb259h";
           name = "org-elisp-help";
         };
         packageRequires = [ cl-lib org ];
         meta = {
-          homepage = "http://melpa.org/#/org-elisp-help";
+          homepage = "https://melpa.org/#/org-elisp-help";
           license = lib.licenses.free;
         };
       }) {};
-    org-eww = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    org-eww = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-eww";
-        version = "20160104.836";
+        version = "20160425.751";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "org-eww";
-          rev = "c0d3b141780c2e12d2dc4877a5f1c99897dff33a";
-          sha256 = "1mpdk34l08m53r7dk8qaza7kvscy9jxv7bjwc232s1xhgy3mcin5";
+          rev = "c6b53bfd0464ab61926ec51f74a57ba26ca314b0";
+          sha256 = "0bcwxly77yc2i4x1lz4584k6pd9gx1mawci8ibsxcmjvgzch6x84";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-eww";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-eww";
           sha256 = "132asshgfpphjckd5vz1vcs18lj55mrqs1l4ggfa89rc6aj8xrca";
           name = "org-eww";
         };
-        packageRequires = [ emacs org ];
+        packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-eww";
+          homepage = "https://melpa.org/#/org-eww";
           license = lib.licenses.free;
         };
       }) {};
@@ -40499,37 +42047,37 @@
         src = fetchgit {
           url = "http://repo.or.cz/r/org-fstree.git";
           rev = "24e305c6443be9f45198185772eecfddc390a9ce";
-          sha256 = "35000fb42e317ec1a6e6c7b448bfdec7ecf65fd9f5ab4723062513c3a4acba79";
+          sha256 = "0ydsmjjc64r50qilgazmv5gzdv67vszlid67wskc2zii5ss0y01m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-fstree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-fstree";
           sha256 = "11ddkfddmsy26mmhgw24757f753ssh056v9vxn89pxp4qypxidfz";
           name = "org-fstree";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-fstree";
+          homepage = "https://melpa.org/#/org-fstree";
           license = lib.licenses.free;
         };
       }) {};
     org-gcal = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred }:
     melpaBuild {
         pname = "org-gcal";
-        version = "20151230.324";
+        version = "20160307.1406";
         src = fetchFromGitHub {
           owner = "myuhe";
           repo = "org-gcal.el";
-          rev = "496a04affbeaf21ac78dd29ea4f9c8f3b9e8fc8a";
-          sha256 = "0r5w85bflmky3xzwqr7g7x7srdm43i93vg0gqnhh6k0ldy7ypc06";
+          rev = "51fae3a77fab26f81705e9cdcfc62a524ea902e0";
+          sha256 = "1di32pvkqbd90f4j4d07gdbba6d0fzyhw5lsynz7cl6yrh5y9cpr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-gcal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-gcal";
           sha256 = "1mp6cm0rhd4r9pfvsjjp86sdqxjbbg7gk41zx0zf0s772smddy3q";
           name = "org-gcal";
         };
         packageRequires = [ alert cl-lib emacs org request-deferred ];
         meta = {
-          homepage = "http://melpa.org/#/org-gcal";
+          homepage = "https://melpa.org/#/org-gcal";
           license = lib.licenses.free;
         };
       }) {};
@@ -40544,13 +42092,13 @@
           sha256 = "0b57ik05iax2h3nrj96kysbk4hxmxlaabd0n6lv1xsayrlli3sj1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-gnome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-gnome";
           sha256 = "0c37gfs6xs0jbvg6ypd4z5ip1khm26wr5lxgmv1dzcc383ynzg0v";
           name = "org-gnome";
         };
         packageRequires = [ alert gnome-calendar telepathy ];
         meta = {
-          homepage = "http://melpa.org/#/org-gnome";
+          homepage = "https://melpa.org/#/org-gnome";
           license = lib.licenses.free;
         };
       }) {};
@@ -40565,13 +42113,13 @@
           sha256 = "10jwqzs431mnwz717qdmcn0v8raklw41sbxbnkb36yrgznk8c09c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-grep";
           sha256 = "0kpgizy0zxnlmyh0prwdll62ri2c1l4sb0yrkl7yw17cr4gxmkkz";
           name = "org-grep";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/org-grep";
+          homepage = "https://melpa.org/#/org-grep";
           license = lib.licenses.free;
         };
       }) {};
@@ -40586,13 +42134,13 @@
           sha256 = "1iyqv34b7q2k73srshcnpvfzcadq47w4rzkqp6m1d3ajk8x2vypq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-if";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-if";
           sha256 = "0h0jdyawz2j4mp33w85z8q77l37qid8palvw5n4z379qa0wr5h96";
           name = "org-if";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-if";
+          homepage = "https://melpa.org/#/org-if";
           license = lib.licenses.free;
         };
       }) {};
@@ -40607,13 +42155,13 @@
           sha256 = "1n7l70pl9x6mh7dyyiihg4zi1advzlaq2x7vivhas1i2120884i6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-iv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-iv";
           sha256 = "1akhabp6mdw1h7zms6ahlfvwizl07fwsizwxpdzi4viggfccsfwx";
           name = "org-iv";
         };
         packageRequires = [ cl-lib impatient-mode org ];
         meta = {
-          homepage = "http://melpa.org/#/org-iv";
+          homepage = "https://melpa.org/#/org-iv";
           license = lib.licenses.free;
         };
       }) {};
@@ -40628,13 +42176,13 @@
           sha256 = "0whv8nsla93194jjpxrhlr6g230spdxbac8ibmzmyad075vx97z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-jekyll";
           sha256 = "0jh3rla8s8prprvhnlg0psdrj7swz7v6vf2xy1m6ff66p9saiv8i";
           name = "org-jekyll";
         };
         packageRequires = [ org ];
         meta = {
-          homepage = "http://melpa.org/#/org-jekyll";
+          homepage = "https://melpa.org/#/org-jekyll";
           license = lib.licenses.free;
         };
       }) {};
@@ -40649,13 +42197,13 @@
           sha256 = "0b5f8qkyzh4jwj3kvbaj3m4dpjbvh1fql7v1nb9bi5n7iwkv3lxp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-jira";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-jira";
           sha256 = "11h7kbkf38p2xycw8hvabpaacp72xdgy8c7kzcgjb2a8qlbs5ifm";
           name = "org-jira";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-jira";
+          homepage = "https://melpa.org/#/org-jira";
           license = lib.licenses.free;
         };
       }) {};
@@ -40665,18 +42213,18 @@
         version = "20151228.803";
         src = fetchFromGitHub {
           owner = "bastibe";
-          repo = "emacs-journal";
+          repo = "org-journal";
           rev = "0ddd54c1112b077d0061f22dfa9c187e0ec7cb1b";
           sha256 = "15swkzq5v9jnpmsziy8mj9rkriilxrm1c24lbfg0a4pwax5nkzp9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-journal";
-          sha256 = "078z9b9hxbvmmxib6098f49rn7n3d0v4x37p7xxb0v8cv4izlb4s";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-journal";
+          sha256 = "1npzqxn1ssigq7k1nrxz3xymxaazby0ddgxq6lgw2a1zjmjm4h2b";
           name = "org-journal";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-journal";
+          homepage = "https://melpa.org/#/org-journal";
           license = lib.licenses.free;
         };
       }) {};
@@ -40691,13 +42239,13 @@
           sha256 = "1797pd264zn19zk93nifyw6pwk2a7wrpfir373qclk601yv2g5h8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-link-travis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-link-travis";
           sha256 = "0hj4x7cw7a3ry8xislkz9bnavy77z4cpmnvns02yi3gnib53mlfs";
           name = "org-link-travis";
         };
         packageRequires = [ org ];
         meta = {
-          homepage = "http://melpa.org/#/org-link-travis";
+          homepage = "https://melpa.org/#/org-link-travis";
           license = lib.licenses.free;
         };
       }) {};
@@ -40712,13 +42260,13 @@
           sha256 = "0lqxzmjxs80z3z90f66f3zfrdajiamdcwpvfv5j2w40js9xz4x37";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-linkany";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-linkany";
           sha256 = "0arjj3c23yqm1ljvbnl7v9cqvd9lbz4381g8f3jyqbafs25bdc3c";
           name = "org-linkany";
         };
         packageRequires = [ log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/org-linkany";
+          homepage = "https://melpa.org/#/org-linkany";
           license = lib.licenses.free;
         };
       }) {};
@@ -40728,17 +42276,17 @@
         version = "20140107.719";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "2b3c72e231de4bd5f9f1d3ddfeff45c1edd901dd";
-          sha256 = "096532e2cd59fe5d54ffe34f8767e007fc0f6e2c422ea9e3cc68e8a671df07d7";
+          rev = "ce748a7ed5fd7b9b57c0a0e8cdcc65a28c8ee06a";
+          sha256 = "16vy6nd3wdqlkyk4dkav5a66xh9q9qfmh03a6j8dbx1wxy9y8g09";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-mac-iCal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-mac-iCal";
           sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw";
           name = "org-mac-iCal";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-mac-iCal";
+          homepage = "https://melpa.org/#/org-mac-iCal";
           license = lib.licenses.free;
         };
       }) {};
@@ -40748,17 +42296,17 @@
         version = "20160109.1643";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "2b3c72e231de4bd5f9f1d3ddfeff45c1edd901dd";
-          sha256 = "096532e2cd59fe5d54ffe34f8767e007fc0f6e2c422ea9e3cc68e8a671df07d7";
+          rev = "ce748a7ed5fd7b9b57c0a0e8cdcc65a28c8ee06a";
+          sha256 = "16vy6nd3wdqlkyk4dkav5a66xh9q9qfmh03a6j8dbx1wxy9y8g09";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-mac-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-mac-link";
           sha256 = "02rmhrwikppppw8adnzvwj43kp9wsyk60csj5pygg7cd7wah7khw";
           name = "org-mac-link";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-mac-link";
+          homepage = "https://melpa.org/#/org-mac-link";
           license = lib.licenses.free;
         };
       }) {};
@@ -40773,13 +42321,13 @@
           sha256 = "0d22q57mizw70qxbvwi4yz15jg86icqq1z963rliwss3wgpirndh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-mobile-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-mobile-sync";
           sha256 = "1cj0pxcjngiipmyl0w1p0g4wrxgm2y98a8862x1lcbali9lqbrwj";
           name = "org-mobile-sync";
         };
         packageRequires = [ emacs org ];
         meta = {
-          homepage = "http://melpa.org/#/org-mobile-sync";
+          homepage = "https://melpa.org/#/org-mobile-sync";
           license = lib.licenses.free;
         };
       }) {};
@@ -40794,13 +42342,13 @@
           sha256 = "0zbpzm9lni6z180s7n52x8s5by5zkq2nlhx82l2h9i7in9y4r6c3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-multiple-keymap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-multiple-keymap";
           sha256 = "16iv5575634asvn1b2k535ml8g4lqgy8z5w6ykma5f9phq5idb9f";
           name = "org-multiple-keymap";
         };
         packageRequires = [ cl-lib emacs org ];
         meta = {
-          homepage = "http://melpa.org/#/org-multiple-keymap";
+          homepage = "https://melpa.org/#/org-multiple-keymap";
           license = lib.licenses.free;
         };
       }) {};
@@ -40815,13 +42363,13 @@
           sha256 = "132jv1zvp3yp4pa4ysl0n3a81d39cdi3nqfziz1ha1pl10qbn6wr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-octopress";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-octopress";
           sha256 = "0r6ms9j4xxsrik4206g7gz4wz41wr4ylpal6yfqs4hhz88yhxrhw";
           name = "org-octopress";
         };
         packageRequires = [ ctable org orglue ];
         meta = {
-          homepage = "http://melpa.org/#/org-octopress";
+          homepage = "https://melpa.org/#/org-octopress";
           license = lib.licenses.free;
         };
       }) {};
@@ -40836,34 +42384,43 @@
           sha256 = "10dddbs9jppqqzwwv5y6pj2szdkw3223gvzzd4pzn9biv5d9kzsb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-outlook";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-outlook";
           sha256 = "0cn8h6yy67jr5h1yxsfqmr8q7ii4f99pgghfp821m01pj55qyjx9";
           name = "org-outlook";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-outlook";
+          homepage = "https://melpa.org/#/org-outlook";
           license = lib.licenses.free;
         };
       }) {};
-    org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
+    org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "org-page";
-        version = "20160216.647";
+        version = "20160413.529";
         src = fetchFromGitHub {
           owner = "kelvinh";
           repo = "org-page";
-          rev = "268761d12b1bd0905cd767efa3513d2b6df01aaf";
-          sha256 = "1mnghhc07727fcp0vd8qjm2v7amv5mv6357l5cjjs4c24qchxiy0";
+          rev = "5bf99d7c0d6e53cbbab12990fb4b778fdfc1446a";
+          sha256 = "1w853v4fsrvgczl2rvmy3dv9shyhv8f4bc0gqnk4r5ihmgf46a1s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-page";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-page";
           sha256 = "1326m3w7vz22zk7rx40z28fddsccy5fl1qhbb7clci8l69blcc2v";
           name = "org-page";
         };
-        packageRequires = [ cl-lib dash ht htmlize mustache org simple-httpd ];
+        packageRequires = [
+          cl-lib
+          dash
+          git
+          ht
+          htmlize
+          mustache
+          org
+          simple-httpd
+        ];
         meta = {
-          homepage = "http://melpa.org/#/org-page";
+          homepage = "https://melpa.org/#/org-page";
           license = lib.licenses.free;
         };
       }) {};
@@ -40878,34 +42435,33 @@
           sha256 = "022qqas919aziq4scs5j1wdbvd0qyw8kkirn2vzfb5k2fjl8z7iq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-pandoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-pandoc";
           sha256 = "1r6j6rkwfv7fv7kp73gh1bdz3y5ffwk5f2wyv4mpxs885cfbsm8v";
           name = "org-pandoc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-pandoc";
+          homepage = "https://melpa.org/#/org-pandoc";
           license = lib.licenses.free;
         };
       }) {};
-    org-password-manager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
+    org-password-manager = callPackage ({ fetchgit, fetchurl, lib, melpaBuild, org, s }:
     melpaBuild {
         pname = "org-password-manager";
         version = "20150729.1715";
-        src = fetchFromGitHub {
-          owner = "leafac";
-          repo = "org-password-manager";
-          rev = "85b61fb513cee8f4311998c4fc22f981c47ccefa";
-          sha256 = "0b02d6x8kmq5h3x2fk1cl59jq10c1wy6xmmcsrn37di8bpygdwhy";
+        src = fetchgit {
+          url = "https://git.leafac.com/leafac/org-password-manager";
+          rev = "200aff149a8a089e352316d5ed438f919932e4e9";
+          sha256 = "0j193rllhm5n65qyirj99ifxhzk5y5z003g6qpr1261mylycngp8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-password-manager";
-          sha256 = "1l3h0qhv0ad9l933d47as8y3h9x94zw315ax4qsgiw3046nzkdwv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-password-manager";
+          sha256 = "021yhp417b9c8cjh8ynmz2fqyplpr2qvc0djxf74kd8lhn4pl397";
           name = "org-password-manager";
         };
         packageRequires = [ org s ];
         meta = {
-          homepage = "http://melpa.org/#/org-password-manager";
+          homepage = "https://melpa.org/#/org-password-manager";
           license = lib.licenses.free;
         };
       }) {};
@@ -40920,13 +42476,13 @@
           sha256 = "16z44kdsg8w1p27fsi72k8wqr35xbb0777rq7h7swv6j2jn1b6hc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-pdfview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-pdfview";
           sha256 = "1z4gb5lw7ngphixw06b5484kwlxbc098w2xshzml5sywr16a4iab";
           name = "org-pdfview";
         };
         packageRequires = [ org pdf-tools ];
         meta = {
-          homepage = "http://melpa.org/#/org-pdfview";
+          homepage = "https://melpa.org/#/org-pdfview";
           license = lib.licenses.free;
         };
       }) {};
@@ -40941,13 +42497,13 @@
           sha256 = "015idpk66835jdg1sbvpksyr07xk4vn17z8cng2qw87fss688ihb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-pomodoro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-pomodoro";
           sha256 = "1vdi07hrhniyhhvg0hcr5mlixy6bjynvwm89z2lvfyvnnxpx0r27";
           name = "org-pomodoro";
         };
         packageRequires = [ alert cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/org-pomodoro";
+          homepage = "https://melpa.org/#/org-pomodoro";
           license = lib.licenses.free;
         };
       }) {};
@@ -40962,34 +42518,34 @@
           sha256 = "1n9magg7r7xnw16d43fh6nzjf42s70l3mxq6ph727zi4lz5ngmfm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-present";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-present";
           sha256 = "09h0cjqjwhqychyrdv1hmiyak677vgf1b94392sdsq3ns70zyjk7";
           name = "org-present";
         };
         packageRequires = [ org ];
         meta = {
-          homepage = "http://melpa.org/#/org-present";
+          homepage = "https://melpa.org/#/org-present";
           license = lib.licenses.free;
         };
       }) {};
     org-projectile = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "org-projectile";
-        version = "20160101.1750";
+        version = "20160324.959";
         src = fetchFromGitHub {
           owner = "IvanMalison";
           repo = "org-projectile";
-          rev = "863712082708ed2c6f9e22e0de7e4e7e20629b30";
-          sha256 = "1jxw9r1mn9zf0vlvy89w9w6v6mhl8i210hkx86c9vcrkpcrpzmvi";
+          rev = "8c79a5f9f039ba607d5cf9fc3fa97118e0d1bc0f";
+          sha256 = "1cxg4qci0k2nrafhipsb223ania29n9w4h33z6n62wk2q5yp1yhr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-projectile";
           sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm";
           name = "org-projectile";
         };
         packageRequires = [ dash projectile ];
         meta = {
-          homepage = "http://melpa.org/#/org-projectile";
+          homepage = "https://melpa.org/#/org-projectile";
           license = lib.licenses.free;
         };
       }) {};
@@ -41004,13 +42560,13 @@
           sha256 = "1jzp65sf1am6pz533kg1z666h4jlynvjyx1mf24gyksiiwdhypsy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-protocol-jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-protocol-jekyll";
           sha256 = "18wg489n2d1sx9jk00ki6p2rxkqz67kqwnmy2kb1ga1rmb6x9wfs";
           name = "org-protocol-jekyll";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/org-protocol-jekyll";
+          homepage = "https://melpa.org/#/org-protocol-jekyll";
           license = lib.licenses.free;
         };
       }) {};
@@ -41025,13 +42581,13 @@
           sha256 = "06apaa8pjrw14g2gyjpxjd6bjv1w0md4vl5jx78krcyr0bcc08mx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-random-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-random-todo";
           sha256 = "0yflppdbkfn2phd21zkjdlidzasfm846mzniay83v3akz0qx31lr";
           name = "org-random-todo";
         };
         packageRequires = [ alert emacs ];
         meta = {
-          homepage = "http://melpa.org/#/org-random-todo";
+          homepage = "https://melpa.org/#/org-random-todo";
           license = lib.licenses.free;
         };
       }) {};
@@ -41046,7 +42602,7 @@
           sha256 = "1q3s12s0ll7jhrnd3adkaxv7ff69ppprv0pyl5f6gy8y51y63k8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-readme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-readme";
           sha256 = "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh";
           name = "org-readme";
         };
@@ -41058,7 +42614,7 @@
           yaoddmuse
         ];
         meta = {
-          homepage = "http://melpa.org/#/org-readme";
+          homepage = "https://melpa.org/#/org-readme";
           license = lib.licenses.free;
         };
       }) {};
@@ -41073,55 +42629,55 @@
           sha256 = "0q26knckq213r885i5947970qagjmb7ybs4ag0ignls4dzbqlbmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-redmine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-redmine";
           sha256 = "0y2pm18nnyzm9wjc0j15v46nf3xi7a0wvspfzi360qv08i54skqv";
           name = "org-redmine";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-redmine";
+          homepage = "https://melpa.org/#/org-redmine";
           license = lib.licenses.free;
         };
       }) {};
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20160221.1737";
+        version = "20160426.958";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "d336811c11844c0f5dcf62fa4f2d398c174e463d";
-          sha256 = "1xnwpl28d742406fhrwl39r9l9z3wbapjz556zc9km376f7sx9d8";
+          rev = "ff3aef81d7b2df9e19512cfe62152fe035f769a6";
+          sha256 = "126rah7709mcfl40s2lp8h26h0xkh5m134r230n8f26ha81fw2q6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-ref";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-ref";
           sha256 = "087isxf3z8cgmmniaxr3lpq9jg3sriw88dwp4f0ky286hlvgzw08";
           name = "org-ref";
         };
         packageRequires = [ dash emacs f helm helm-bibtex hydra key-chord s ];
         meta = {
-          homepage = "http://melpa.org/#/org-ref";
+          homepage = "https://melpa.org/#/org-ref";
           license = lib.licenses.free;
         };
       }) {};
     org-repo-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-repo-todo";
-        version = "20141204.1541";
+        version = "20160307.1229";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "org-repo-todo";
-          rev = "904a26089d87db59a40421d6f857b189e70dfbe3";
-          sha256 = "03c88jzwvl95dl39703mknkvnk3cmw4gss5c1y2k9py2rgh6bpr9";
+          rev = "b164bacefcd3c55dd40cd1a9e91ffefd315b400d";
+          sha256 = "0as82hf81czks9fcmhy9wjwl8d4mbylrm13c02y8abp0am41r28f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-repo-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-repo-todo";
           sha256 = "0l5ns1hs3i4dhrpmvzl34zc9zysgjkfa7j8apbda59n9jdvml5v1";
           name = "org-repo-todo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-repo-todo";
+          homepage = "https://melpa.org/#/org-repo-todo";
           license = lib.licenses.free;
         };
       }) {};
@@ -41136,13 +42692,13 @@
           sha256 = "1hn8y9933x5x6lxpijcqx97p3hln69ahabqdsl2bmzda3mxm4bn2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-rtm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-rtm";
           sha256 = "1paiy5zmdlxb3a1cjk9d30mqbl60bkairw6xkix2qw36p07jwlj5";
           name = "org-rtm";
         };
         packageRequires = [ rtm ];
         meta = {
-          homepage = "http://melpa.org/#/org-rtm";
+          homepage = "https://melpa.org/#/org-rtm";
           license = lib.licenses.free;
         };
       }) {};
@@ -41157,13 +42713,13 @@
           sha256 = "14zn0b8qs740ls1069kg2lwm0b9yc4qv525fg8km0hgi0yp8qw7z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-sync";
           sha256 = "0n8fz2d1vg9r8dszgasbnb6pgaxr2i8mqrp953prf1nhmfpjpxad";
           name = "org-sync";
         };
         packageRequires = [ cl-lib emacs org ];
         meta = {
-          homepage = "http://melpa.org/#/org-sync";
+          homepage = "https://melpa.org/#/org-sync";
           license = lib.licenses.free;
         };
       }) {};
@@ -41178,34 +42734,34 @@
           sha256 = "1qx3kd02sxs9k7adlvdlbmyhkc5kr7ni5lw4gxjw3nphnc536bkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-table-comment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-table-comment";
           sha256 = "1d40vl8aa1x27z4gwnkzxgrqp7vd3ln2pc445ijjxp1wr8bjxvdz";
           name = "org-table-comment";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-table-comment";
+          homepage = "https://melpa.org/#/org-table-comment";
           license = lib.licenses.free;
         };
       }) {};
     org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-tfl";
-        version = "20160131.1444";
+        version = "20160407.1640";
         src = fetchFromGitHub {
           owner = "storax";
           repo = "org-tfl";
-          rev = "c9e024ac55d9e0c61a273e75bd68981a623c9ab2";
-          sha256 = "1x241jaw726zjsplwf6svbvr8af09k6kqj7icpvcbyayivkbhxy2";
+          rev = "308251618e215eb78d5436e7412a0c14216fa890";
+          sha256 = "1qz1qhd7v6ynmvz7j1xscz85z6zwy9dcarwhbz020l4bk4g9zf94";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-tfl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-tfl";
           sha256 = "1rqmmw0222vbxfn5wxq9ni2j813x92lpv99jjszqjvgnf2rkhjhf";
           name = "org-tfl";
         };
         packageRequires = [ cl-lib emacs org ];
         meta = {
-          homepage = "http://melpa.org/#/org-tfl";
+          homepage = "https://melpa.org/#/org-tfl";
           license = lib.licenses.free;
         };
       }) {};
@@ -41220,13 +42776,13 @@
           sha256 = "1apd5yyr12skagma7xpzrh22rhplmhhv0pma4zf5b0i6nkxy06j2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-themis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-themis";
           sha256 = "08rajz5y7h88fh94s2ad0f66va4vi31k9hwdv8p212bs276rp7ln";
           name = "org-themis";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/org-themis";
+          homepage = "https://melpa.org/#/org-themis";
           license = lib.licenses.free;
         };
       }) {};
@@ -41241,13 +42797,13 @@
           sha256 = "04adkz950vvwyzy3da468nnqsknpr5kw5369w2yqhnph16cwwfxb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-time-budgets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-time-budgets";
           sha256 = "0r8km586n6xdnjha7xnzlh03nw1dp066hydaz8kxfmhvygl9cpah";
           name = "org-time-budgets";
         };
         packageRequires = [ alert cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/org-time-budgets";
+          homepage = "https://melpa.org/#/org-time-budgets";
           license = lib.licenses.free;
         };
       }) {};
@@ -41262,34 +42818,34 @@
           sha256 = "014337wimvzy0rxh2p2c647ly215zcyhgym2hcljkdriv15cafna";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-toodledo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-toodledo";
           sha256 = "0c7qr0jsc4iyrwkc22xp9nmk6984v7q1k0rvpd62m07lb5gvbiq3";
           name = "org-toodledo";
         };
         packageRequires = [ cl-lib emacs request-deferred ];
         meta = {
-          homepage = "http://melpa.org/#/org-toodledo";
+          homepage = "https://melpa.org/#/org-toodledo";
           license = lib.licenses.free;
         };
       }) {};
     org-tracktable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-tracktable";
-        version = "20151129.1441";
+        version = "20160420.845";
         src = fetchFromGitHub {
           owner = "tty-tourist";
           repo = "org-tracktable";
-          rev = "28ef6772cdcf436cf38095f15c6bb681473180ce";
-          sha256 = "053wf36lq9piyzq7rv2lid34zanj6l9fvawp3r3nsniy5nlfckqx";
+          rev = "2a2a81ffc2807b80559bdae5840a9b7529c8fd3f";
+          sha256 = "0jh9i41zqs9rvghfjhp5nl2ycav1pj1yv2hsr6skwqdpkwggvvmq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-tracktable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-tracktable";
           sha256 = "0mngf9q2ffxq32cgng0xl30661mj15wmr9y4hr3xddj626kxrp00";
           name = "org-tracktable";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/org-tracktable";
+          homepage = "https://melpa.org/#/org-tracktable";
           license = lib.licenses.free;
         };
       }) {};
@@ -41304,13 +42860,13 @@
           sha256 = "1h15fr16kgbyrxambmk4hsmha6hx4c4yqkccb82g3wlvzmnqj5x3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-transform-tree-table";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-transform-tree-table";
           sha256 = "0n68cw769nk90ms6w1w6cc1nxjwn1navkz56mf11bsiqvsk3km7r";
           name = "org-transform-tree-table";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/org-transform-tree-table";
+          homepage = "https://melpa.org/#/org-transform-tree-table";
           license = lib.licenses.free;
         };
       }) {};
@@ -41325,28 +42881,28 @@
           sha256 = "19id53sjv0r0xnm3l8d694s27dxlmdfm9dal57zlf60s5lg8hykq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-tree-slide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-tree-slide";
           sha256 = "0v857zplv0wdbg4li667v2p5pn5zcf9fgbqcwa75x8babilkl6jn";
           name = "org-tree-slide";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-tree-slide";
+          homepage = "https://melpa.org/#/org-tree-slide";
           license = lib.licenses.free;
         };
       }) {};
     org-trello = callPackage ({ dash, dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }:
     melpaBuild {
         pname = "org-trello";
-        version = "20160213.1307";
+        version = "20160301.1141";
         src = fetchFromGitHub {
           owner = "org-trello";
           repo = "org-trello";
-          rev = "1ecb8f4f1dd41c8f41073c13a9557c0c583d7c88";
-          sha256 = "0pinp7485mwi99f8qx8xhcdymn5yyd7irxh514j3f23n4b90hk4l";
+          rev = "321a74585bceafdd82f96433e014f13b4f3fa674";
+          sha256 = "061nf6gwrzi36q3m3b1hn4bj33a6q4yic3fxdxxwvwrzi42bl74a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-trello";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-trello";
           sha256 = "14lq8nn1x6qb3jx518zaaz5582m4npd593w056igqhahkfm0qp8i";
           name = "org-trello";
         };
@@ -41359,7 +42915,7 @@
           s
         ];
         meta = {
-          homepage = "http://melpa.org/#/org-trello";
+          homepage = "https://melpa.org/#/org-trello";
           license = lib.licenses.free;
         };
       }) {};
@@ -41374,13 +42930,13 @@
           sha256 = "1m2xdp6wfg11wi7s4i675c3m5qancm8bpizcf380r6vmkcdfkrdy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-vcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-vcard";
           sha256 = "0l6azshvzl1wws582njqr3qx4h73gwrdqwa3jcic1qbs9hg2l4yl";
           name = "org-vcard";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-vcard";
+          homepage = "https://melpa.org/#/org-vcard";
           license = lib.licenses.free;
         };
       }) {};
@@ -41395,34 +42951,34 @@
           sha256 = "08yww77697kck1ld9xcrcx8amqdh28rdc4fsavp5d3my78qk7rac";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-wc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-wc";
           sha256 = "1sa9fcy0bnn06swwq2gfrgmppd6dsbmw2mq0v73mizg3l6has1zb";
           name = "org-wc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-wc";
+          homepage = "https://melpa.org/#/org-wc";
           license = lib.licenses.free;
         };
       }) {};
     org-webpage = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, web-server }:
     melpaBuild {
         pname = "org-webpage";
-        version = "20160108.326";
+        version = "20160307.226";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "org-webpage";
-          rev = "6aedac36f584e99190572ca74768095512f17503";
-          sha256 = "1izf0lxycg4wh3wfki1sfy283qwgfdf8rzb365z3sk1zzijjaw6j";
+          rev = "478fd463c3c406397b2e5d2d7e3bb97fb7940e01";
+          sha256 = "18idnl2hx1s5hv1xm5akd35favnjnj2pxw6h00956lrapg01d1fn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-webpage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-webpage";
           sha256 = "0vwv8cv38gx8rnfskbmnaf8y8sffjqy1408655bwhjz6dp69qmah";
           name = "org-webpage";
         };
         packageRequires = [ cl-lib dash ht htmlize mustache org web-server ];
         meta = {
-          homepage = "http://melpa.org/#/org-webpage";
+          homepage = "https://melpa.org/#/org-webpage";
           license = lib.licenses.free;
         };
       }) {};
@@ -41437,13 +42993,13 @@
           sha256 = "1cagmwl3acanwc2nky7m61cawi0i0x703sjc6zlw968lacyw86wa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-wunderlist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-wunderlist";
           sha256 = "08zg3wgr80rp89c53ffqzz22ws9bp62a1m74xvxa74x6nq9i4xl0";
           name = "org-wunderlist";
         };
         packageRequires = [ alert cl-lib emacs org request-deferred s ];
         meta = {
-          homepage = "http://melpa.org/#/org-wunderlist";
+          homepage = "https://melpa.org/#/org-wunderlist";
           license = lib.licenses.free;
         };
       }) {};
@@ -41454,59 +43010,80 @@
         src = fetchFromGitHub {
           owner = "punchagan";
           repo = "org2blog";
-          rev = "11e4cbc8df34461b02d6d93cb2164ec16925b3a1";
-          sha256 = "180mhqf56vvl6y5ff1lsy33b1xxz0zrzy826g2qllw9w5g77xxzq";
+          rev = "a0262931c79f59d79993e4d0237d9dcd6693f7ef";
+          sha256 = "1q7207sn949s2xf2wj6p7yb3q4kjbrbxsz0jyp7xnrg3w762g6zm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org2blog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org2blog";
           sha256 = "0ancvn4ji4552k4nfd2ijclsd027am93ngg241ll8f6h6k0wpmzq";
           name = "org2blog";
         };
         packageRequires = [ metaweblog org xml-rpc ];
         meta = {
-          homepage = "http://melpa.org/#/org2blog";
+          homepage = "https://melpa.org/#/org2blog";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org2issue = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild, org, ox-gfm, s }:
+    melpaBuild {
+        pname = "org2issue";
+        version = "20160420.142";
+        src = fetchFromGitHub {
+          owner = "lujun9972";
+          repo = "org2issue";
+          rev = "7547c528d42e9133f64927e82173083777b459f9";
+          sha256 = "139y1ql7x95bmyz7sk6g3lpsivmzyz1naykayb6bhby69xr4cwb2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org2issue";
+          sha256 = "1qd5l9ga26smgp1gkc8r9ja2n974kq1jf2z876s5v0489ipa59bz";
+          name = "org2issue";
+        };
+        packageRequires = [ emacs gh org ox-gfm s ];
+        meta = {
+          homepage = "https://melpa.org/#/org2issue";
           license = lib.licenses.free;
         };
       }) {};
     org2jekyll = callPackage ({ dash-functional, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org2jekyll";
-        version = "20150906.847";
+        version = "20160418.1050";
         src = fetchFromGitHub {
           owner = "ardumont";
           repo = "org2jekyll";
-          rev = "a12173b9507b3ef54dfebb5751503ba1ee93c6aa";
-          sha256 = "064kw64w9snm0lbshxn8d6yd9xvyislhg37fmhq1w7vy8lm61xvf";
+          rev = "35e11ffa24b140d2e247df195489fca344bd0c08";
+          sha256 = "089nqbda5mg1ippqnsl5wcx9n1gpnaqhl6kz54n47kivb400bidh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org2jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org2jekyll";
           sha256 = "1j9d6xf5nsakifxwd4zmjc29lbj46ffn3z109k2y2yhz7q3r9hzv";
           name = "org2jekyll";
         };
         packageRequires = [ dash-functional deferred s ];
         meta = {
-          homepage = "http://melpa.org/#/org2jekyll";
+          homepage = "https://melpa.org/#/org2jekyll";
           license = lib.licenses.free;
         };
       }) {};
     organic-green-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "organic-green-theme";
-        version = "20160202.820";
+        version = "20160324.1444";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "organic-green-theme";
-          rev = "463c8216b33561263e0f605665ff3d705d39423a";
-          sha256 = "194mcm7xlzlwm4phy3b9pz7na3sdw6galnidf8aqjk97mgw9z74r";
+          rev = "bb0e4c6ddd299abb975bcb92cb1309b95cd7aa90";
+          sha256 = "06n6qz6f0z5kn9r5rq44dxf3x5j2avfzixrfi8nm5r6g7bfkfa5c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/organic-green-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/organic-green-theme";
           sha256 = "1fdj3dpcdqx0db5q8dlxag6pr2qn4yiz1hmg3c7dkmh51n85ssw2";
           name = "organic-green-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/organic-green-theme";
+          homepage = "https://melpa.org/#/organic-green-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -41521,13 +43098,13 @@
           sha256 = "0hwmr67nky9xp5xlrkp54nw6b72d29lmna28dnbgqs2i5rccbk55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/orgbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/orgbox";
           sha256 = "12wfqlpjh9nr7zgqs4h8kmfsk825n68qcbn8z2fw2mpshg3nj7l8";
           name = "orgbox";
         };
         packageRequires = [ cl-lib org ];
         meta = {
-          homepage = "http://melpa.org/#/orgbox";
+          homepage = "https://melpa.org/#/orgbox";
           license = lib.licenses.free;
         };
       }) {};
@@ -41542,34 +43119,34 @@
           sha256 = "1wxxdx3c5qacsii4kysk438cjr1hnmpir78kp6xgk9xw5g9snlnj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/orgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/orgit";
           sha256 = "0askccb3h98v8gmylwxaph3gbyv5b1sp4slws76aqz1kq9x0jy7w";
           name = "orgit";
         };
         packageRequires = [ dash emacs magit org ];
         meta = {
-          homepage = "http://melpa.org/#/orgit";
+          homepage = "https://melpa.org/#/orgit";
           license = lib.licenses.free;
         };
       }) {};
-    orglink = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "orglink";
-        version = "20151106.1206";
+        version = "20160424.920";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "orglink";
-          rev = "8ba8c54395cd1818c4d58d5cd24712405f9810e0";
-          sha256 = "12y395ld36jnlbcrfycnvr4g723w6vahfv9iqf1wr6m94ka9pz3d";
+          rev = "09c564022acda5973256e71a467849637473d7e6";
+          sha256 = "076q8j70vqabirri6ckl1f0y60pq4bnilds6s34mxsxz1k3z3m1s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/orglink";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/orglink";
           sha256 = "0ldrvvqs3hlazj0dch162gsbnbxcg6fgrxid8p7w9gj19vbcl52b";
           name = "orglink";
         };
-        packageRequires = [ dash org ];
+        packageRequires = [ dash emacs org ];
         meta = {
-          homepage = "http://melpa.org/#/orglink";
+          homepage = "https://melpa.org/#/orglink";
           license = lib.licenses.free;
         };
       }) {};
@@ -41584,34 +43161,34 @@
           sha256 = "1w0hadpslxcjn29yxl9i37sja4qf4kp7ffjpwij5hs73r518c2z6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/orglue";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/orglue";
           sha256 = "14g4q2k9zjzipzrp5mg72s40b0rwiaixgq3rvi15wh4vvcw5xajn";
           name = "orglue";
         };
         packageRequires = [ epic org org-mac-link ];
         meta = {
-          homepage = "http://melpa.org/#/orglue";
+          homepage = "https://melpa.org/#/orglue";
           license = lib.licenses.free;
         };
       }) {};
     orgtbl-aggregate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "orgtbl-aggregate";
-        version = "20150104.1018";
+        version = "20160421.926";
         src = fetchFromGitHub {
           owner = "tbanel";
           repo = "orgaggregate";
-          rev = "16b54b2be7cbb87aab9498c0ab7b8bca0f73cb59";
-          sha256 = "0am2yfnaxwc6f2wvrg4d508pdcs88cynr32k7bgyyadwq4xq3zsg";
+          rev = "a33a02ba70639cadaef5f6ea028c2fe73f76cf14";
+          sha256 = "0zh8n8jb479ilmz88kj0q5wx8a9zqkfqds0rr8jbk2rqmj6j72v3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/orgtbl-aggregate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/orgtbl-aggregate";
           sha256 = "0gnyjwn6jshs8bzdssm2xppg2s9p2x3rrhp523q39aydskc6ggc9";
           name = "orgtbl-aggregate";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/orgtbl-aggregate";
+          homepage = "https://melpa.org/#/orgtbl-aggregate";
           license = lib.licenses.free;
         };
       }) {};
@@ -41626,13 +43203,13 @@
           sha256 = "1vbnp37xz0nrpyi0hah345928zsb1xw915mdb0wybq1fzn93mp1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/orgtbl-ascii-plot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/orgtbl-ascii-plot";
           sha256 = "1ssjbdprbn34nsfx1xjc382l2195rbh8mybpn31d4kcjx6fqf78h";
           name = "orgtbl-ascii-plot";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/orgtbl-ascii-plot";
+          homepage = "https://melpa.org/#/orgtbl-ascii-plot";
           license = lib.licenses.free;
         };
       }) {};
@@ -41647,13 +43224,13 @@
           sha256 = "06nc82wiha11i79izqil53dkd95fl55nb5m739gyyzvx3sksb0dg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/orgtbl-join";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/orgtbl-join";
           sha256 = "1kq2h0lb521z8q2xb9bsi37xzzdsa0hw4mm3qkzidi5j9fi3apf1";
           name = "orgtbl-join";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/orgtbl-join";
+          homepage = "https://melpa.org/#/orgtbl-join";
           license = lib.licenses.free;
         };
       }) {};
@@ -41668,34 +43245,34 @@
           sha256 = "0zfiq9d5jqzpmscngb1s2jgfiqmbi4dyw0fqa59v2g84gxjg793x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/orgtbl-show-header";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/orgtbl-show-header";
           sha256 = "1xgqjg3lmcczdblxaka47cc1ad8p8jhyb2nqwq0qnbqw46fqjp3k";
           name = "orgtbl-show-header";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/orgtbl-show-header";
+          homepage = "https://melpa.org/#/orgtbl-show-header";
           license = lib.licenses.free;
         };
       }) {};
     origami = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "origami";
-        version = "20150822.650";
+        version = "20160313.1613";
         src = fetchFromGitHub {
           owner = "gregsexton";
           repo = "origami.el";
-          rev = "56140b4d3f9f2694ab1e8869972a19bd7f3e12e1";
-          sha256 = "0p53l0s8rxr8v77kj83qjrbln7nck16q0zgdp4sqmqb1121ily48";
+          rev = "4e98f118c3e292c68e3739ac0f9f1b1fce0bac0e";
+          sha256 = "18f5b6902zqayhhcchhsvszw1kryvhkhpc5vv0s187dkj38agsv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/origami";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/origami";
           sha256 = "0rkb55zcvsgxzp190vrnbzdfbcjd8zi6vhbhwpqxi0qmyq6a08pr";
           name = "origami";
         };
         packageRequires = [ dash emacs s ];
         meta = {
-          homepage = "http://melpa.org/#/origami";
+          homepage = "https://melpa.org/#/origami";
           license = lib.licenses.free;
         };
       }) {};
@@ -41710,13 +43287,13 @@
           sha256 = "1iybrhp607a5rb3ynlaf8w2x9wdgdbril702z44dgcg3wxih2zy1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-browse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/osx-browse";
           sha256 = "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm";
           name = "osx-browse";
         };
         packageRequires = [ browse-url-dwim string-utils ];
         meta = {
-          homepage = "http://melpa.org/#/osx-browse";
+          homepage = "https://melpa.org/#/osx-browse";
           license = lib.licenses.free;
         };
       }) {};
@@ -41731,13 +43308,13 @@
           sha256 = "1ykn48src7qhx9cmpjkaqsz7h36p75kkq1h9wlcpv5fhaky2d4n4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-clipboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/osx-clipboard";
           sha256 = "0gjgr451v6rlyarz96v6h8kfbvkk7npvhgvkgwdi0bjighrhlv4f";
           name = "osx-clipboard";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/osx-clipboard";
+          homepage = "https://melpa.org/#/osx-clipboard";
           license = lib.licenses.free;
         };
       }) {};
@@ -41752,34 +43329,34 @@
           sha256 = "04fh4i8mydmvq58hd60lf0dglpcjqgzpwk93wqss72kpifwh68vc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/osx-dictionary";
           sha256 = "13033fxc5vjd1f7mm6znmprcp3mwxbvblb2d25shr8d4imqqhv82";
           name = "osx-dictionary";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/osx-dictionary";
+          homepage = "https://melpa.org/#/osx-dictionary";
           license = lib.licenses.free;
         };
       }) {};
     osx-lib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "osx-lib";
-        version = "20160125.2328";
+        version = "20160402.136";
         src = fetchFromGitHub {
           owner = "raghavgautam";
           repo = "osx-lib";
-          rev = "9334c0614be7dbcc3d763ff7061979643fa08b4a";
-          sha256 = "0kh7mrgwalys2vmf1dyrl2cc9v58zah2r8lr43nsky8dkszrz2al";
+          rev = "c4a24288ea2e69d752e6adedfdf8f7d596c757ad";
+          sha256 = "1wbmqxx1qzjc5kxzkwx7c2wvq71iic1f5f29lj6ckpjn743dnb0d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-lib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/osx-lib";
           sha256 = "12wvki8jhzqsanxv5yqzjmfx6ifwz9ab9zh6r8nss86bk8864ix4";
           name = "osx-lib";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/osx-lib";
+          homepage = "https://melpa.org/#/osx-lib";
           license = lib.licenses.free;
         };
       }) {};
@@ -41794,13 +43371,13 @@
           sha256 = "1csnxpsfnv9lv07kgvc60qx5c33sshmnz60p3qjz7ym7rnjy9b5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-location";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/osx-location";
           sha256 = "1p12mmrw70p3b04zlprkdxdfnb7m3vkm6gci3fwhr5zyfvwxvn0c";
           name = "osx-location";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/osx-location";
+          homepage = "https://melpa.org/#/osx-location";
           license = lib.licenses.free;
         };
       }) {};
@@ -41815,13 +43392,13 @@
           sha256 = "1rgykby1ysbapq53lnk9yy04r9q4qirnzs2abgvz7g2qjq5fyzag";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-org-clock-menubar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/osx-org-clock-menubar";
           sha256 = "1y5qxslxl0d93f387nyj8zngz5nh1p4rzdfx0lnbvya6shfaxaf6";
           name = "osx-org-clock-menubar";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/osx-org-clock-menubar";
+          homepage = "https://melpa.org/#/osx-org-clock-menubar";
           license = lib.licenses.free;
         };
       }) {};
@@ -41836,13 +43413,13 @@
           sha256 = "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-plist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/osx-plist";
           sha256 = "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8";
           name = "osx-plist";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/osx-plist";
+          homepage = "https://melpa.org/#/osx-plist";
           license = lib.licenses.free;
         };
       }) {};
@@ -41857,13 +43434,13 @@
           sha256 = "1j601gzizxjsvkw6bvih4a49iq05yfkw0ni77xbc5klc7x7s80hk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-pseudo-daemon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/osx-pseudo-daemon";
           sha256 = "150fxj2phj5axnh5i8ws5fv2qzzmpyisch452wgxb604p56j7vy8";
           name = "osx-pseudo-daemon";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/osx-pseudo-daemon";
+          homepage = "https://melpa.org/#/osx-pseudo-daemon";
           license = lib.licenses.free;
         };
       }) {};
@@ -41878,13 +43455,34 @@
           sha256 = "1l231168bjqz6lwzs0r9vihxi53d46csrr2gq7g33lg1zm3696ah";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-trash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/osx-trash";
           sha256 = "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj";
           name = "osx-trash";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/osx-trash";
+          homepage = "https://melpa.org/#/osx-trash";
+          license = lib.licenses.free;
+        };
+      }) {};
+    otama = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "otama";
+        version = "20160404.532";
+        src = fetchFromGitHub {
+          owner = "yoshinari-nomura";
+          repo = "otama";
+          rev = "c114fd8006762f891bc120a7c0ea213872e7ab31";
+          sha256 = "1jzyfvc25ls0l4kpxg6857ccynl1pzgxfif7bppz2nfmf99z4534";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/otama";
+          sha256 = "04ffyscldb2sn2n26ixrnc07ybvl7iclv2hi1kmhr5hdgxwpyjq9";
+          name = "otama";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/otama";
           license = lib.licenses.free;
         };
       }) {};
@@ -41899,13 +43497,13 @@
           sha256 = "116cwlhn7s47rhivz6113lh8lvaz3bjb3ynjlbx9hyf7gq3nfnxn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/outline-magic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/outline-magic";
           sha256 = "085yayzph3y7fh6pd5sdjdkhdcvwfzcyqd6y3xlbz7wni5ac6b5f";
           name = "outline-magic";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/outline-magic";
+          homepage = "https://melpa.org/#/outline-magic";
           license = lib.licenses.free;
         };
       }) {};
@@ -41920,55 +43518,55 @@
           sha256 = "0d9hfr4kb6rkhwacdn70bkfchgam26gj92zfyaqw77a2sgwcmwwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/outlined-elisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/outlined-elisp-mode";
           sha256 = "165sivmv5h4nvh08ampq95x6b0bkzxgrdjbxjxlq6rv00vaidn7v";
           name = "outlined-elisp-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/outlined-elisp-mode";
+          homepage = "https://melpa.org/#/outlined-elisp-mode";
           license = lib.licenses.free;
         };
       }) {};
     outorg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "outorg";
-        version = "20150910.1440";
+        version = "20160327.332";
         src = fetchFromGitHub {
           owner = "tj64";
           repo = "outorg";
-          rev = "9d6d6f1fb8c68ee044ffba1ae1aed8146bcff1f1";
-          sha256 = "0jhqpm31rsmc2r01ra48nbnd9rx9am90qk6i0qrhgfzx9q1svmj9";
+          rev = "456b1500b560ead633ce723986a48c33fb52ab76";
+          sha256 = "0szvynvw16vr7br95pssqkil0xnfdh46x8lgan4z9v6impdav0nf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/outorg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/outorg";
           sha256 = "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx";
           name = "outorg";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/outorg";
+          homepage = "https://melpa.org/#/outorg";
           license = lib.licenses.free;
         };
       }) {};
     outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }:
     melpaBuild {
         pname = "outshine";
-        version = "20160204.1546";
+        version = "20160416.1046";
         src = fetchFromGitHub {
           owner = "tj64";
           repo = "outshine";
-          rev = "c7764a408095b3e822b02a70b934e9049af02b3b";
-          sha256 = "0bc4lq6gadmjpnag6j7vhq5bf2hgmvgnqy2nxiwnk4glrmks7imm";
+          rev = "61b2df38068ebd2fd12452485916eea2914daa3b";
+          sha256 = "1smfdfw0swvfbqlxi7nkrgbmfqhs0x47ky6xhgf38la1s6ivh29n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/outshine";
-          sha256 = "1i8c3q6n9hpfbpg2f8n8brwgaq36af1jn3g5js88yiyyb5dknxq4";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/outshine";
+          sha256 = "1ajddzcrnvfgx3xa5wm0bcll9dax52syg1p521mv0ffkld63jyfl";
           name = "outshine";
         };
         packageRequires = [ cl-lib outorg ];
         meta = {
-          homepage = "http://melpa.org/#/outshine";
+          homepage = "https://melpa.org/#/outshine";
           license = lib.licenses.free;
         };
       }) {};
@@ -41983,34 +43581,34 @@
           sha256 = "1rk5pzm5wmdq68d99hhhbq8pq37bnph0dip5j2jnfj6zsw70whr2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ov";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ov";
           sha256 = "0d71mpv74cfxcnwixbrl90nr22cw4kv5sdgpny5wycvh6cgmd6qb";
           name = "ov";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ov";
+          homepage = "https://melpa.org/#/ov";
           license = lib.licenses.free;
         };
       }) {};
-    overseer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+    overseer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "overseer";
-        version = "20150801.1202";
+        version = "20160416.358";
         src = fetchFromGitHub {
           owner = "tonini";
           repo = "overseer.el";
-          rev = "db27cbbb10fb9b072d638a1b345102b42b20a37d";
-          sha256 = "1bfj56ackza8c1jja660v6ss9ii7prcaim5plnfqsv3k149r8qlh";
+          rev = "e66033c7dd43d7180ac68e7d38892f88fffa9a1d";
+          sha256 = "1s6q253nhalqbykh95ns0mnh4piasfh8i0l76k9nxvw1ksh88b4k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/overseer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/overseer";
           sha256 = "04wfwcal051jrnmm5dga6vl4c9j10pm416586yxb8smi6fxws2jg";
           name = "overseer";
         };
-        packageRequires = [ dash emacs pkg-info ];
+        packageRequires = [ dash emacs f pkg-info ];
         meta = {
-          homepage = "http://melpa.org/#/overseer";
+          homepage = "https://melpa.org/#/overseer";
           license = lib.licenses.free;
         };
       }) {};
@@ -42025,13 +43623,13 @@
           sha256 = "0f2psx4lq98l3q3fnibsfqxp2hvvwk7b30zjvjlry3bffg3l7pfk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/owdriver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/owdriver";
           sha256 = "0j8z7ynan0zj581x50gsi9lljkbi6bwmzpfyha3i6q8ch5qkdxfd";
           name = "owdriver";
         };
         packageRequires = [ log4e smartrep yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/owdriver";
+          homepage = "https://melpa.org/#/owdriver";
           license = lib.licenses.free;
         };
       }) {};
@@ -42046,34 +43644,34 @@
           sha256 = "03ivnvqxc5xdcik4skk32fhr686yv2y5mj8w7v27dhyc0vdpfhvy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-asciidoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ox-asciidoc";
           sha256 = "07b549dqyh1gk226d7zbls1mw6q4mas7kbfwkansmyykax0r2zyr";
           name = "ox-asciidoc";
         };
         packageRequires = [ org ];
         meta = {
-          homepage = "http://melpa.org/#/ox-asciidoc";
+          homepage = "https://melpa.org/#/ox-asciidoc";
           license = lib.licenses.free;
         };
       }) {};
     ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ox-gfm";
-        version = "20150604.226";
+        version = "20160324.520";
         src = fetchFromGitHub {
           owner = "larstvei";
           repo = "ox-gfm";
-          rev = "dc324f0f4239e151744d59e784da748d4db4f6b8";
-          sha256 = "0gfkb12rn40m71xv292dn3nj3h1bnn81698pinirp0nd8p4bvnin";
+          rev = "4889adc219aedfbb463aad0b98b1ff26201352e8";
+          sha256 = "0hsbbsy0kyrmrcc6rkq75v5walrb8krvly5mm3vlmcahm1g4x2vb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-gfm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ox-gfm";
           sha256 = "065ngmzfd3g2h8n903hc4d363hz4z5rrdgizh2xpz03kf3plca6q";
           name = "ox-gfm";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ox-gfm";
+          homepage = "https://melpa.org/#/ox-gfm";
           license = lib.licenses.free;
         };
       }) {};
@@ -42088,13 +43686,13 @@
           sha256 = "19h3w3fcas60jv02v7hxjmh05804sb7bif70jssq3qwisj0j09xm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-html5slide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ox-html5slide";
           sha256 = "0nqk6chg0ky98ap2higa74786prj7dbwx2a3l67m0llmdajw76qn";
           name = "ox-html5slide";
         };
         packageRequires = [ org ];
         meta = {
-          homepage = "http://melpa.org/#/ox-html5slide";
+          homepage = "https://melpa.org/#/ox-html5slide";
           license = lib.licenses.free;
         };
       }) {};
@@ -42109,13 +43707,13 @@
           sha256 = "1kf2si2lyy0xc971bx5zd2j9mnz1smc9s8l0dwc6iksh2v9q8cy9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-impress-js";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ox-impress-js";
           sha256 = "0p0cc51lmxgl0xv951ybdg5n8gbzv8qf0chfgigijizzjypxc21l";
           name = "ox-impress-js";
         };
         packageRequires = [ org ];
         meta = {
-          homepage = "http://melpa.org/#/ox-impress-js";
+          homepage = "https://melpa.org/#/ox-impress-js";
           license = lib.licenses.free;
         };
       }) {};
@@ -42130,13 +43728,34 @@
           sha256 = "0p03xzldz5v8lx3ip2pgll0da00ldfxmhr6r3jahwp6692kxpr6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-ioslide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ox-ioslide";
           sha256 = "0z0qnvpw64wxbgz8203rphswlh9hd2i11pz2mlay8l3bzz4gx4vc";
           name = "ox-ioslide";
         };
         packageRequires = [ cl-lib emacs f makey org ];
         meta = {
-          homepage = "http://melpa.org/#/ox-ioslide";
+          homepage = "https://melpa.org/#/ox-ioslide";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ox-jira";
+        version = "20160426.753";
+        src = fetchFromGitHub {
+          owner = "stig";
+          repo = "ox-jira.el";
+          rev = "c4b8fd30c3bc48621759c9d128644d2d386e591e";
+          sha256 = "0csl9fcfwnpl6x3ld7xrlvgz6gwmgcd15a4zdc570w8vp26ra5k9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ox-jira";
+          sha256 = "0bm7i1ambd71xmy1y9jcdh52irgcsziwwb9d3y3rq0pnsqv5cpvp";
+          name = "ox-jira";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "https://melpa.org/#/ox-jira";
           license = lib.licenses.free;
         };
       }) {};
@@ -42151,13 +43770,13 @@
           sha256 = "0c2m02g6csg5fqizj3zqcm88q7w17kgvgi7swcx4fzz6rixnpsji";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-mediawiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ox-mediawiki";
           sha256 = "0lijj2n4saw0xd3jaghbvx9v6a4ldl5gd8wy7s7hfcm30wb75cdb";
           name = "ox-mediawiki";
         };
         packageRequires = [ cl-lib s ];
         meta = {
-          homepage = "http://melpa.org/#/ox-mediawiki";
+          homepage = "https://melpa.org/#/ox-mediawiki";
           license = lib.licenses.free;
         };
       }) {};
@@ -42172,13 +43791,13 @@
           sha256 = "0cc14p6c3d4djfmrkac0abb2jq128vlmayv2a8cyvnyjffyvjbk7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-nikola";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ox-nikola";
           sha256 = "1amplnazs9igfd382djq23d8j7r0knr0hwlpasd01aypc25c82a4";
           name = "ox-nikola";
         };
         packageRequires = [ emacs org ox-rst ];
         meta = {
-          homepage = "http://melpa.org/#/ox-nikola";
+          homepage = "https://melpa.org/#/ox-nikola";
           license = lib.licenses.free;
         };
       }) {};
@@ -42193,13 +43812,13 @@
           sha256 = "0bawigwc6v5420642xlkyxdd0i82gicx69wqlnjf6lvhfvs990is";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-pandoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ox-pandoc";
           sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc";
           name = "ox-pandoc";
         };
         packageRequires = [ dash emacs ht org ];
         meta = {
-          homepage = "http://melpa.org/#/ox-pandoc";
+          homepage = "https://melpa.org/#/ox-pandoc";
           license = lib.licenses.free;
         };
       }) {};
@@ -42214,34 +43833,34 @@
           sha256 = "0adj6gm39qw4ivb7csfh21qqqipcnw1sgm1xdqvrk86kbs9k1b2g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-pukiwiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ox-pukiwiki";
           sha256 = "10sfbri5hv5hyx9jc1bzlk4qmzfmpfgfy8wkjkpv7lv2x0axqd8a";
           name = "ox-pukiwiki";
         };
         packageRequires = [ org ];
         meta = {
-          homepage = "http://melpa.org/#/ox-pukiwiki";
+          homepage = "https://melpa.org/#/ox-pukiwiki";
           license = lib.licenses.free;
         };
       }) {};
     ox-reveal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-reveal";
-        version = "20151023.106";
+        version = "20160224.2019";
         src = fetchFromGitHub {
           owner = "yjwen";
           repo = "org-reveal";
-          rev = "b92d0e843f2526788caa08bda5284f23e15e09cd";
-          sha256 = "196bjiij0nj19qsz95y9l44sr63673mxxj0cv6aa3ijpm48vmj9p";
+          rev = "c4b6e7c3d6cb637cae65c0b1fe13755546ab690e";
+          sha256 = "15yzfd3bc91lfhf64spyhm94byih6fgn8s7wknkz7znvw2fbjwzv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-reveal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ox-reveal";
           sha256 = "092swxkkisvj2y18ynal8dn7wcfi7h4y6n0dlzqq28bfflarbwik";
           name = "ox-reveal";
         };
         packageRequires = [ org ];
         meta = {
-          homepage = "http://melpa.org/#/ox-reveal";
+          homepage = "https://melpa.org/#/ox-reveal";
           license = lib.licenses.free;
         };
       }) {};
@@ -42256,13 +43875,13 @@
           sha256 = "1js4n8iwimc86fp2adzhbhy4ixss1yqngjd8gq7pxgpgmnhd66x3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-rst";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ox-rst";
           sha256 = "1vyj6frrl7328n2x7vc3qwv3ssdhi8bp6ja5h2q4bqalc6bl1pq0";
           name = "ox-rst";
         };
         packageRequires = [ emacs org ];
         meta = {
-          homepage = "http://melpa.org/#/ox-rst";
+          homepage = "https://melpa.org/#/ox-rst";
           license = lib.licenses.free;
         };
       }) {};
@@ -42277,13 +43896,13 @@
           sha256 = "1r9c4s9f7cvxxzf9h07rg75bil0295zq1inh5i4r6za5jabkr4dg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-textile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ox-textile";
           sha256 = "01kri7vh16xhy8x5qd6s5z08xr0q964rk6xrligdb3i6x78wfvi4";
           name = "ox-textile";
         };
         packageRequires = [ org ];
         meta = {
-          homepage = "http://melpa.org/#/ox-textile";
+          homepage = "https://melpa.org/#/ox-textile";
           license = lib.licenses.free;
         };
       }) {};
@@ -42294,17 +43913,17 @@
         src = fetchFromGitHub {
           owner = "dfeich";
           repo = "org8-wikiexporters";
-          rev = "4a7028751aa6b6875466c0acee60cddee3dd2efc";
-          sha256 = "1wmjmkx2nz7alhdrbbm59dsrhrhn9fm3kjsvv3lmwgqg029vi3fp";
+          rev = "57538ada07d1c631cfd07410cd8f47523be54c9a";
+          sha256 = "05rlfykwvfir177bvqa7nvwmzn1amhpaizfmyjzi73d78h062vcl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-tiddly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ox-tiddly";
           sha256 = "196i8lzxv2smpj5yhmiqwazn4pvc14yqyzasrgimhv3vi2xnxlfb";
           name = "ox-tiddly";
         };
         packageRequires = [ cl-lib org ];
         meta = {
-          homepage = "http://melpa.org/#/ox-tiddly";
+          homepage = "https://melpa.org/#/ox-tiddly";
           license = lib.licenses.free;
         };
       }) {};
@@ -42319,55 +43938,55 @@
           sha256 = "0w6963jvz1sk732nh18735dxivd6nl59jd4m26ps6l4wqhqby0db";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-trac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ox-trac";
           sha256 = "0f8b3i83vzxzfa91p4ahlqz6njql18xy5nk265sjxpy9zr898rsa";
           name = "ox-trac";
         };
         packageRequires = [ org ];
         meta = {
-          homepage = "http://melpa.org/#/ox-trac";
+          homepage = "https://melpa.org/#/ox-trac";
           license = lib.licenses.free;
         };
       }) {};
     ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ox-twbs";
-        version = "20160221.834";
+        version = "20160307.58";
         src = fetchFromGitHub {
           owner = "marsmining";
           repo = "ox-twbs";
-          rev = "38fdd35e483c9fec4a055f60c6bdf6b24e63ae5c";
-          sha256 = "126afhg2v14zimh1cwm0ydgkhmhap4yrkfdcdzfssiy5kpf4p7yk";
+          rev = "b55cd6b51dfe6d339d8ad018ef159d37b60acee1";
+          sha256 = "0yrac13xiyfxipy5qyq56jg7151wjs3xv4gpsarx4hkrxi96apbi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-twbs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ox-twbs";
           sha256 = "15csgnph5wh2dvcc2dnvrlm7whh428rq8smqji1509ib7aw9y5mx";
           name = "ox-twbs";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ox-twbs";
+          homepage = "https://melpa.org/#/ox-twbs";
           license = lib.licenses.free;
         };
       }) {};
     ox-twiki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-twiki";
-        version = "20151206.440";
+        version = "20160306.1115";
         src = fetchFromGitHub {
           owner = "dfeich";
           repo = "org8-wikiexporters";
-          rev = "4a7028751aa6b6875466c0acee60cddee3dd2efc";
-          sha256 = "1wmjmkx2nz7alhdrbbm59dsrhrhn9fm3kjsvv3lmwgqg029vi3fp";
+          rev = "57538ada07d1c631cfd07410cd8f47523be54c9a";
+          sha256 = "05rlfykwvfir177bvqa7nvwmzn1amhpaizfmyjzi73d78h062vcl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-twiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ox-twiki";
           sha256 = "1p1k0yg5fxcjgwpq2ix9ckh2kn69m7d5rnz76h14hw9p72cb54r0";
           name = "ox-twiki";
         };
         packageRequires = [ cl-lib org ];
         meta = {
-          homepage = "http://melpa.org/#/ox-twiki";
+          homepage = "https://melpa.org/#/ox-twiki";
           license = lib.licenses.free;
         };
       }) {};
@@ -42382,55 +44001,55 @@
           sha256 = "12jsnfppif4l548wymvakx0f2zlm63xs6kfrb49hicmk668cq4ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/p4";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/p4";
           sha256 = "0215li17gn35wmvd84gnp4hkwa2jd81wz4frb1cba2b5j33rlprc";
           name = "p4";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/p4";
+          homepage = "https://melpa.org/#/p4";
           license = lib.licenses.free;
         };
       }) {};
     pabbrev = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pabbrev";
-        version = "20150806.645";
+        version = "20160320.1601";
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "pabbrev";
-          rev = "d28cf8632d2691dc93afbb28500126242d37961c";
-          sha256 = "0cbsl184szbl486454jkn28zj4p7danp92h0zv8yscrlnyl68p0y";
+          rev = "56400d5d256b42ffe45c229ea9827f026b650cf5";
+          sha256 = "09bn19ydyz1hncmvyyh87gczp3lmlczpm352p0107z1gw6xmpjil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pabbrev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pabbrev";
           sha256 = "1mbfa40pbzbi00sp155zm43sj6nw221mcayc2rk3ppin9ps95hx3";
           name = "pabbrev";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pabbrev";
+          homepage = "https://melpa.org/#/pabbrev";
           license = lib.licenses.free;
         };
       }) {};
     package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-build";
-        version = "20160129.1532";
+        version = "20160326.2052";
         src = fetchFromGitHub {
           owner = "melpa";
           repo = "melpa";
-          rev = "fdd35b0df7b71661561c155a8f7ba7c2236f3e30";
-          sha256 = "0nl17brqf53pcjgrl4c608zvb82xl27xsliknkvl0zysx0kynkhm";
+          rev = "e64cad81615ef3ec34fab1f438b0c55134833c97";
+          sha256 = "1lvpzdg5wqnhdqhf2026mcznpyrslwmzpxzy6n3i193p3q2haqnd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/package-build";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/package-build";
           sha256 = "0618z43j6628jjj448hcigvsfwcs7p0n4bbcmqscrb6p59b7n4wx";
           name = "package-build";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/package-build";
+          homepage = "https://melpa.org/#/package-build";
           license = lib.licenses.free;
         };
       }) {};
@@ -42445,13 +44064,13 @@
           sha256 = "0i7f8ambcrhyqq15xwlk31jjdcii2hr37y45va8m5w6n9mkpz8c6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/package-filter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/package-filter";
           sha256 = "0am73zch2fy1hfjwzk8kg0j3lgbcz3hzxjrdf0j0a9w0myp0mmjm";
           name = "package-filter";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/package-filter";
+          homepage = "https://melpa.org/#/package-filter";
           license = lib.licenses.free;
         };
       }) {};
@@ -42466,13 +44085,13 @@
           sha256 = "1xv0ra130qg0ksgqi4npspnv0ckq77k7f5kcibavj030h578kj97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/package+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/package+";
           sha256 = "1mbsxr4llz8ny7n7w3lykld9yvbaywlfqnvr9l0aiv9rvmdv03bn";
           name = "package-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/package+";
+          homepage = "https://melpa.org/#/package+";
           license = lib.licenses.free;
         };
       }) {};
@@ -42487,55 +44106,55 @@
           sha256 = "1pdv6d6bm5jmpgjqf9ycvzasxz1205zdi0zjrmkr33c03azwz7rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/package-safe-delete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/package-safe-delete";
           sha256 = "12ss5yjhnyxsif4vlbgxamn5jfa0wxkkphffxnv6drhvmpq226jw";
           name = "package-safe-delete";
         };
         packageRequires = [ emacs epl ];
         meta = {
-          homepage = "http://melpa.org/#/package-safe-delete";
+          homepage = "https://melpa.org/#/package-safe-delete";
           license = lib.licenses.free;
         };
       }) {};
-    package-utils = callPackage ({ epl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    package-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-utils";
-        version = "20150126.606";
+        version = "20160307.320";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "package-utils";
-          rev = "4a56f411f98fd455556a3f1d6c16a577a22057a2";
-          sha256 = "138l07qmxj4fkvf43f1hdn4skadxb50c023bc5101l3njzmf74wa";
+          rev = "68789a94c764dddd247ba62c47107b20ead59db7";
+          sha256 = "1pcpr8ls0sqph098lrb6n8fbsm8rq8imglfx3m8zzyw78q9hwcjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/package-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/package-utils";
           sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r";
           name = "package-utils";
         };
-        packageRequires = [ epl ];
+        packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/package-utils";
+          homepage = "https://melpa.org/#/package-utils";
           license = lib.licenses.free;
         };
       }) {};
     packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "packed";
-        version = "20160209.1105";
+        version = "20160409.1151";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "packed";
-          rev = "a6ed874d4c637ec62ed7d1e56a079d9e1b035bbb";
-          sha256 = "0phs3ycp2vak95b3n0ppzlq4z83vf5q04cf3ms23qhsyr2y4y04v";
+          rev = "4b278931c3694c467e5aaa0246956227806065a0";
+          sha256 = "1zzm43x0y90j4cr4zpwn3fs8apl7n0jhl6qlfkcbar7bb62pi66q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/packed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/packed";
           sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z";
           name = "packed";
         };
         packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/packed";
+          homepage = "https://melpa.org/#/packed";
           license = lib.licenses.free;
         };
       }) {};
@@ -42550,13 +44169,13 @@
           sha256 = "0zx72qbqy2n1r6mjylw67zb6nnchp2b49vsdyl0k5bdaq2xyqv6i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pacmacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pacmacs";
           sha256 = "0w0r6z365jrglpbifb94w6c22wqi9x93qgkss9pn820hrndqbqxy";
           name = "pacmacs";
         };
         packageRequires = [ cl-lib dash dash-functional emacs f ];
         meta = {
-          homepage = "http://melpa.org/#/pacmacs";
+          homepage = "https://melpa.org/#/pacmacs";
           license = lib.licenses.free;
         };
       }) {};
@@ -42571,13 +44190,13 @@
           sha256 = "0mqd18w98p6z0i08xx7jga10ljh9360x6sqfyvfq6bjfi2jvxdbk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/page-break-lines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/page-break-lines";
           sha256 = "0q1166z190dxznzgf2f29klj2jkaqlic483p4h3bylihkqp93ij7";
           name = "page-break-lines";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/page-break-lines";
+          homepage = "https://melpa.org/#/page-break-lines";
           license = lib.licenses.free;
         };
       }) {};
@@ -42592,13 +44211,13 @@
           sha256 = "1dq5ibz7rx9a7gm9zq2pz4c1sxgrm59yibyq92bvmi68lvf2q851";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pager";
           sha256 = "0s5zwimkbsivbwlyd7g8dpnjyzqcfc5plg53ij4sljiipgjh5brl";
           name = "pager";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pager";
+          homepage = "https://melpa.org/#/pager";
           license = lib.licenses.free;
         };
       }) {};
@@ -42613,13 +44232,13 @@
           sha256 = "11msqs8v9wn8sj45dw1fl0ldi3sw33v0xclynbxgmawyabfq3bqm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pager-default-keybindings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pager-default-keybindings";
           sha256 = "0vqb3s1fxkl1fxxspq89344s55sfcplz26z0pbh347l1681h3pci";
           name = "pager-default-keybindings";
         };
         packageRequires = [ pager ];
         meta = {
-          homepage = "http://melpa.org/#/pager-default-keybindings";
+          homepage = "https://melpa.org/#/pager-default-keybindings";
           license = lib.licenses.free;
         };
       }) {};
@@ -42627,17 +44246,17 @@
         pname = "palette";
         version = "20151231.1745";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/palette.el";
+          url = "https://www.emacswiki.org/emacs/download/palette.el";
           sha256 = "1qnv84y0s437xcsjxh0gs9rb36pydba3qfrihvz5pqs9g9w7m94k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/palette";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/palette";
           sha256 = "1v6dsph18rqfbvda2c25mqgdwap2a4zrg6qqq57n205zprpcwxc0";
           name = "palette";
         };
         packageRequires = [ hexrgb ];
         meta = {
-          homepage = "http://melpa.org/#/palette";
+          homepage = "https://melpa.org/#/palette";
           license = lib.licenses.free;
         };
       }) {};
@@ -42652,13 +44271,13 @@
           sha256 = "1kbja107smdjqv82p84jx13jk1410c9vms89p1iy1jvn7s8g9fiq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/palimpsest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/palimpsest";
           sha256 = "18kklfdlcg982pdrslh0xqa42h28f91bdm7q2zn890d6dcivp6bk";
           name = "palimpsest";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/palimpsest";
+          homepage = "https://melpa.org/#/palimpsest";
           license = lib.licenses.free;
         };
       }) {};
@@ -42673,34 +44292,34 @@
           sha256 = "03mlg6dmpjw8fq2s3c4gpqj20kjhzldz3m51bf6s0mxq9bclx2xw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pallet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pallet";
           sha256 = "0q50cdwnn2w1n5h4bappncjjyi5yaixxannwgy23fngdrz1mxwd7";
           name = "pallet";
         };
         packageRequires = [ cask dash f s ];
         meta = {
-          homepage = "http://melpa.org/#/pallet";
+          homepage = "https://melpa.org/#/pallet";
           license = lib.licenses.free;
         };
       }) {};
     pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "pandoc-mode";
-        version = "20160210.600";
+        version = "20160406.149";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "pandoc-mode";
-          rev = "60d3abea189467e04b5ce7dbe38d8b76ce5686cf";
-          sha256 = "0g2iab5fmz85z532102lqn2wp1wgqy07bxkca95azi2gkbg0kbmj";
+          rev = "cb72eefbbe3a3846cff565466686416b4871b13e";
+          sha256 = "0hdrhjghr570w50ilc0q4wl89msgdlhb19p2k5m84qc8m6qdl2v0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pandoc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pandoc-mode";
           sha256 = "0qvc6cf87h1jqf590kd68jfg25snxaxayfds634wj4z6gp70l781";
           name = "pandoc-mode";
         };
         packageRequires = [ dash hydra ];
         meta = {
-          homepage = "http://melpa.org/#/pandoc-mode";
+          homepage = "https://melpa.org/#/pandoc-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -42711,17 +44330,17 @@
         src = fetchFromGitHub {
           owner = "coldnew";
           repo = "pangu-spacing";
-          rev = "4662e66d5cb72738d46d3296ac7626536fc88acb";
-          sha256 = "01zc2cvkyfx80snwrm3cs8cbwgxmd56rgvvbsyq53r4q3zhdk1li";
+          rev = "e3dbbe87b91ab3e368fdcbcd0761ce403020db36";
+          sha256 = "0bcqc4r0v02v99llphk8s0mj38gxk87a3jqcp8v4sb9040dkm8gd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pangu-spacing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pangu-spacing";
           sha256 = "082qh26vlk7kifz1800lyai17yvngwjygrfrsh1dsd8dxhk6l9j8";
           name = "pangu-spacing";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pangu-spacing";
+          homepage = "https://melpa.org/#/pangu-spacing";
           license = lib.licenses.free;
         };
       }) {};
@@ -42736,53 +44355,53 @@
           sha256 = "1xh614czldjvfl66vhkyaai5k4qsg1l3mz6wd5b1w6kd45qrc54i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paper-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/paper-theme";
           sha256 = "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50";
           name = "paper-theme";
         };
         packageRequires = [ emacs hexrgb ];
         meta = {
-          homepage = "http://melpa.org/#/paper-theme";
+          homepage = "https://melpa.org/#/paper-theme";
           license = lib.licenses.free;
         };
       }) {};
     paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }:
     melpaBuild {
         pname = "paradox";
-        version = "20160119.2027";
+        version = "20160323.1410";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "paradox";
-          rev = "ecc0190cef9f6edb11c602374126054bcf8615f0";
-          sha256 = "1s1lmnrnwm2sq4kdw1byyn03k2qzjkb9fgngn2rrc2vm4wbmx8l7";
+          rev = "494608fc9032bb4fc6eb7feac641066a8c4ae174";
+          sha256 = "0bbpmrprc1bzil8xh2grnivxlfbjs252717rn7rq0nccdflp4akz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paradox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/paradox";
           sha256 = "1xq14nfvprsq18464qr4mhphq7cl1f570lji5n8z6j9vpfm9a4p2";
           name = "paradox";
         };
         packageRequires = [ emacs hydra let-alist seq spinner ];
         meta = {
-          homepage = "http://melpa.org/#/paradox";
+          homepage = "https://melpa.org/#/paradox";
           license = lib.licenses.free;
         };
       }) {};
     paredit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "paredit";
-        version = "20150217.913";
+        version = "20160324.1415";
         src = fetchgit {
           url = "http://mumble.net/~campbell/git/paredit.git";
-          rev = "9a696fdcce87c9d9eec4569a9929d0300ac6ae5c";
-          sha256 = "34dd7d8c07c697b54ea943566e6967012f7366d6f5a21e31e3d768716bc4928f";
+          rev = "2f6f67283c6c41af5a74271fc025c2e837f3d2a2";
+          sha256 = "14k1xakdr58647cnq8ky73sh5j94jc6vls05jdxkbv681krdvqvj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paredit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/paredit";
           sha256 = "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr";
           name = "paredit";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/paredit";
+          homepage = "https://melpa.org/#/paredit";
           license = lib.licenses.free;
         };
       }) {};
@@ -42797,13 +44416,13 @@
           sha256 = "1jkpb67h96sm3fnga9hrg3kwhlp3czdv66v49a9szq174zpsnrgv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paredit-everywhere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/paredit-everywhere";
           sha256 = "0gbkwk8mrbjr2l8pz3q4y6j8q4m12zmzl31c88ngs1k5d86wav36";
           name = "paredit-everywhere";
         };
         packageRequires = [ paredit ];
         meta = {
-          homepage = "http://melpa.org/#/paredit-everywhere";
+          homepage = "https://melpa.org/#/paredit-everywhere";
           license = lib.licenses.free;
         };
       }) {};
@@ -42818,13 +44437,13 @@
           sha256 = "15xkanrwxh3qqay3vkfqvhzs88g7nnfv9bqk509qflyhqnvc9sxr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paredit-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/paredit-menu";
           sha256 = "05jp4cc548x5f07k096dgizhivdpaajxq38hin831sm0p9cibm4p";
           name = "paredit-menu";
         };
         packageRequires = [ paredit ];
         meta = {
-          homepage = "http://melpa.org/#/paredit-menu";
+          homepage = "https://melpa.org/#/paredit-menu";
           license = lib.licenses.free;
         };
       }) {};
@@ -42839,34 +44458,34 @@
           sha256 = "0fds9s16c0dgq6ah98x4pv5bgwbikqwiikcxjzmk9g1m3s232fl8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paren-completer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/paren-completer";
           sha256 = "0xh17h8vmsgbrq6yf5sfy3kpia4za68f43gwgkvi2m430g15fr0x";
           name = "paren-completer";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/paren-completer";
+          homepage = "https://melpa.org/#/paren-completer";
           license = lib.licenses.free;
         };
       }) {};
     paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "paren-face";
-        version = "20151105.2106";
+        version = "20160424.635";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "paren-face";
-          rev = "09bb594f0c9614fb336fd8b5598215cf7c2d2c7e";
-          sha256 = "0ggpb58dw4dv9i0czj064a8fdcalgjqgl4cm5zsk7hcvjcmal9af";
+          rev = "932cd9681be30096b766717869ad0d3180d3b637";
+          sha256 = "1l0rq3k78k68ky58bv1mhya3mnl7n5wgr88n95na2lcil1dk8ghh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paren-face";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/paren-face";
           sha256 = "0dmzk66m3rd8x0rb925pyrfpc2qsvayks4kmhpb2ccdrx68pg8gf";
           name = "paren-face";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/paren-face";
+          homepage = "https://melpa.org/#/paren-face";
           license = lib.licenses.free;
         };
       }) {};
@@ -42881,13 +44500,13 @@
           sha256 = "0i5bc7lyyrx6swqlrp9l5x72yzwi53qn6ldrfs99gh08b3yvsnni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/parent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/parent-mode";
           sha256 = "1ndn6m6aasmk9yrml9xqj8141100nw7qi1bhnlsss3v8b6njwwig";
           name = "parent-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/parent-mode";
+          homepage = "https://melpa.org/#/parent-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -42902,13 +44521,13 @@
           sha256 = "1z8cp1cdkxmdqislixxvncj0s1jx42i6arx48kdl5paymnnp282s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/parse-csv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/parse-csv";
           sha256 = "0khpfxbarw0plx8kka357d8wl1vvdih5797xlld9adc0g3cng0zz";
           name = "parse-csv";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/parse-csv";
+          homepage = "https://melpa.org/#/parse-csv";
           license = lib.licenses.free;
         };
       }) {};
@@ -42923,13 +44542,13 @@
           sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/parsebib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/parsebib";
           sha256 = "07br2x68scsxykdk2ajc4mfqhdb7vjkcfgz3vnpy91sirxzgfjdd";
           name = "parsebib";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/parsebib";
+          homepage = "https://melpa.org/#/parsebib";
           license = lib.licenses.free;
         };
       }) {};
@@ -42944,13 +44563,13 @@
           sha256 = "0npm5kv00fcnb5ajj76jp1dc84zxp7fgrkn472yxdq4hppvx0ixv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pass";
           sha256 = "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr";
           name = "pass";
         };
         packageRequires = [ emacs f password-store ];
         meta = {
-          homepage = "http://melpa.org/#/pass";
+          homepage = "https://melpa.org/#/pass";
           license = lib.licenses.free;
         };
       }) {};
@@ -42965,13 +44584,13 @@
           sha256 = "0yckh61v9a798gpyk8x2z9990h3b61lwsw0kish571pygfyqhjkq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/passthword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/passthword";
           sha256 = "076jayziipjx260yk3p37pf5k0qsagalidah3y6hiflrlq4sfgjn";
           name = "passthword";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/passthword";
+          homepage = "https://melpa.org/#/passthword";
           license = lib.licenses.free;
         };
       }) {};
@@ -42986,13 +44605,13 @@
           sha256 = "1pw401ar114wpayibphv3n6m0gz68zjmiwz60r4lbar45bmxvihx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/password-generator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/password-generator";
           sha256 = "0aahpplmiwmp6a06y6hl4zvv8lvzkmakmaazlckl5r3rqbsf24cb";
           name = "password-generator";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/password-generator";
+          homepage = "https://melpa.org/#/password-generator";
           license = lib.licenses.free;
         };
       }) {};
@@ -43003,16 +44622,16 @@
         src = fetchgit {
           url = "http://git.zx2c4.com/password-store";
           rev = "0b2f803fe61992af02b8820c400984b1f615a299";
-          sha256 = "36b4cf6025f52ac74daa0026f712951ee7a45c63401cce7f2286fd533e3f9885";
+          sha256 = "11cq7wz57zc649zww720cdfa9rqyjl9gf9h0m96wfapm4mhczd1n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/password-store";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/password-store";
           sha256 = "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss";
           name = "password-store";
         };
         packageRequires = [ f s ];
         meta = {
-          homepage = "http://melpa.org/#/password-store";
+          homepage = "https://melpa.org/#/password-store";
           license = lib.licenses.free;
         };
       }) {};
@@ -43027,31 +44646,34 @@
           sha256 = "0921xwg3d3345hiqz4c1iyqwvfyg8rv0wggcnig7xh9qivspag4c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/password-vault";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/password-vault";
           sha256 = "17i556xwq6yaxv9v18l1abcpbaz6hygsa4vf4b68fc98vcy7396a";
           name = "password-vault";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/password-vault";
+          homepage = "https://melpa.org/#/password-vault";
           license = lib.licenses.free;
         };
       }) {};
-    pastebin = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    pastebin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "pastebin";
-        version = "20101125.1355";
-        src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/pastebin.el";
-          sha256 = "17br64snqby465bjb0l1hzw0pcms5m2knrvb6y9gn3kir4sdi6kn";
+        version = "20101125.1402";
+        src = fetchFromGitHub {
+          owner = "nicferrier";
+          repo = "elpastebin";
+          rev = "8e9a829298ce0f747ab80758aa26caeb2af6cb30";
+          sha256 = "1hjzpza8zmzb83sacmqcnh9a52m4x5d8xbwvcqvld1ajglv4y124";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pastebin";
-          sha256 = "19fgjcbxgmnm59qjkxhvy2aib5qs5d5a43hwvjdhxq2k6rn3f2gj";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pastebin";
+          sha256 = "0ff01vzslgdmsj1jp1m2lvnan6immd4l7vz466g1glb5nkb7qfcr";
           name = "pastebin";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pastebin";
+          homepage = "https://melpa.org/#/pastebin";
           license = lib.licenses.free;
         };
       }) {};
@@ -43066,13 +44688,13 @@
           sha256 = "0m6qjsq6qfwwszm95lj8c58l75vbmx9r5hm9bfywyympfgy0fa1n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pastehub";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pastehub";
           sha256 = "1slvqn5ay6gkbi0ai1gy1wmc02h4g3n6srrh4fqn72y7b9nv5i0v";
           name = "pastehub";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pastehub";
+          homepage = "https://melpa.org/#/pastehub";
           license = lib.licenses.free;
         };
       }) {};
@@ -43087,13 +44709,13 @@
           sha256 = "1v5mpjb8kavbqhvg4rizwg8cypgmi6ngdiy8qp9pimmkb56y42ly";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pastelmac-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pastelmac-theme";
           sha256 = "168zzqhp2dbfcnknwfqxk68rgmibfw71ksghvi6h2j2c1m08l23f";
           name = "pastelmac-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/pastelmac-theme";
+          homepage = "https://melpa.org/#/pastelmac-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -43104,16 +44726,16 @@
         src = fetchgit {
           url = "https://gist.github.com/1974259.git";
           rev = "854839a0b4bf8c3f6a7d947926bf41d690547002";
-          sha256 = "c53b4f2c7449bf74648c091f249c33da3ddd8f621474a8901745b4e985cb26ab";
+          sha256 = "1ar6rf2ykd252y8ahx0lca7xsgfs6ff287q9iij79gs9fhn4yfy5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pastels-on-dark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pastels-on-dark-theme";
           sha256 = "0zdr29793gg229r47yjb3plagxc9pszqyy4sx81ffp3rpdf0nlbh";
           name = "pastels-on-dark-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pastels-on-dark-theme";
+          homepage = "https://melpa.org/#/pastels-on-dark-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -43128,13 +44750,34 @@
           sha256 = "1ffnkw8djs8kvfjd1crnaqram1vl4w3g1zhsqp74ds0mccsd6830";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/path-headerline-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/path-headerline-mode";
           sha256 = "0dwr8iyq62ad5xkh7r4kpywpypdq1wljsdzwqbq9zdr79yfqx337";
           name = "path-headerline-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/path-headerline-mode";
+          homepage = "https://melpa.org/#/path-headerline-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pathify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pathify";
+        version = "20160423.346";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "pathify.el";
+          rev = "401b184c743694a60b3bc4273fc43de05cd5ac4b";
+          sha256 = "0wsq11qffw1lx9x79law7jrz0sxm6km83gh891ic9ak2y6j5shxf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pathify";
+          sha256 = "1z970xnzbhmfikj1rkfx24jvwc7f1xxw6hk7kmahxvphjxrvgc2f";
+          name = "pathify";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/pathify";
           license = lib.licenses.free;
         };
       }) {};
@@ -43149,13 +44792,13 @@
           sha256 = "0kkgqaxyrv65rfg2ng1vmmmrc9bm98yqpsv2pcb760287dn0l27m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paxedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/paxedit";
           sha256 = "06ymilr0zrwfpyzql7dcpg48lhkx73f2jlaw3caxgsjaz7x3n4ic";
           name = "paxedit";
         };
         packageRequires = [ cl-lib paredit ];
         meta = {
-          homepage = "http://melpa.org/#/paxedit";
+          homepage = "https://melpa.org/#/paxedit";
           license = lib.licenses.free;
         };
       }) {};
@@ -43170,13 +44813,13 @@
           sha256 = "138w0dlp3msjmr2x09kfcnxwhdldbz9xjfy7l6lig1x9ima0z5w6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pbcopy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pbcopy";
           sha256 = "1989pkhaha6s2rmgyswnzps92x9hhzymjz4ng4a5jda1b9snp60q";
           name = "pbcopy";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pbcopy";
+          homepage = "https://melpa.org/#/pbcopy";
           license = lib.licenses.free;
         };
       }) {};
@@ -43191,13 +44834,13 @@
           sha256 = "1jj5h92qakrn9d5d88dvl43b7ppw96rm11hqg3791i6k48nx1d1m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pc-bufsw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pc-bufsw";
           sha256 = "01d7735ininlsjkql7dy57irgwgk4k9br8bl18wq51vgkg90i5k5";
           name = "pc-bufsw";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pc-bufsw";
+          homepage = "https://melpa.org/#/pc-bufsw";
           license = lib.licenses.free;
         };
       }) {};
@@ -43212,13 +44855,13 @@
           sha256 = "0xbbq8ddlirhvv921nrf7bwazh0i98bk0a9xzyx8iqpyg66vbfa8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pcache";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pcache";
           sha256 = "1q2wlbc58lyf3dxfs9ppdxvdsp81jmkq874zbd7f39wvc5ckbz0l";
           name = "pcache";
         };
         packageRequires = [ eieio ];
         meta = {
-          homepage = "http://melpa.org/#/pcache";
+          homepage = "https://melpa.org/#/pcache";
           license = lib.licenses.free;
         };
       }) {};
@@ -43233,13 +44876,13 @@
           sha256 = "0pwx1nbgciy28rivvrgka46zihmag9ljrs40bvscgd9rkragm4zy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pcmpl-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pcmpl-args";
           sha256 = "0sry4zvr8xmzyygf2m5dms52srkd1apj3i7a3aj23qa8jvndx8vr";
           name = "pcmpl-args";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pcmpl-args";
+          homepage = "https://melpa.org/#/pcmpl-args";
           license = lib.licenses.free;
         };
       }) {};
@@ -43254,13 +44897,13 @@
           sha256 = "0pspxgicc0mkypp94r0jydmkjr3ngv8y4w1xpj93kp79hnvyls0a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pcmpl-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pcmpl-git";
           sha256 = "12y9pg1g4i1ghnjvgfdpa6p84h4bcqrr23y9bazwl9n6aj20cmxk";
           name = "pcmpl-git";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pcmpl-git";
+          homepage = "https://melpa.org/#/pcmpl-git";
           license = lib.licenses.free;
         };
       }) {};
@@ -43269,19 +44912,19 @@
         pname = "pcmpl-homebrew";
         version = "20150506.2052";
         src = fetchFromGitHub {
-          owner = "kaihaosw";
+          owner = "hiddenlotus";
           repo = "pcmpl-homebrew";
           rev = "a2b9026a1b3c8206d0eca90c491c0397fb275f94";
           sha256 = "17i5j5005dhzgwzds5jj1a7d31xvbshjc139vawwz2xip5aynji4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pcmpl-homebrew";
-          sha256 = "1gckzcwpg4am1ryjy08aic98mbafb64wkfmnm98d64kiwbpaacly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pcmpl-homebrew";
+          sha256 = "11yd18s79iszp8gas97hqpa0b0whgh7dvlyci3nd4z28467p83v8";
           name = "pcmpl-homebrew";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pcmpl-homebrew";
+          homepage = "https://melpa.org/#/pcmpl-homebrew";
           license = lib.licenses.free;
         };
       }) {};
@@ -43290,19 +44933,19 @@
         pname = "pcmpl-pip";
         version = "20141024.348";
         src = fetchFromGitHub {
-          owner = "kaihaosw";
+          owner = "hiddenlotus";
           repo = "pcmpl-pip";
           rev = "b775bef9fa3ae9fb8015409554ecdd165c4bc325";
           sha256 = "14pz15by9gp0307bcdv9h90mcr35ya89wbn3y13n7k0z5r45gn58";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pcmpl-pip";
-          sha256 = "17nmgq4wgv4yl2rsdf32585hfa58j0825mzzajrlwgmjiqx9i778";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pcmpl-pip";
+          sha256 = "19a3np5swpqvrx133yvziqnr2pvj8zi0b725j8kxhp2bj1g1c6hr";
           name = "pcmpl-pip";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pcmpl-pip";
+          homepage = "https://melpa.org/#/pcmpl-pip";
           license = lib.licenses.free;
         };
       }) {};
@@ -43317,13 +44960,13 @@
           sha256 = "0h0p4c08z0dqxmg55fzch1d2f38rywfk1j0an2f4sc94lj7ckbm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pcomplete-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pcomplete-extension";
           sha256 = "0m0c9ir44p21rj93fkisvpvi08936717ljmzsr4qdf69b3i54cwc";
           name = "pcomplete-extension";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/pcomplete-extension";
+          homepage = "https://melpa.org/#/pcomplete-extension";
           license = lib.licenses.free;
         };
       }) {};
@@ -43338,13 +44981,13 @@
           sha256 = "1dpfhrxbaqpgjzac3m9hclbzlnrxq9b8bx6za53aqvml72yzxc6i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pcre2el";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pcre2el";
           sha256 = "1l72hv9843qk5p8gi9ibr15wczm804j3ws2v1x7nx4dr7pc5c7l3";
           name = "pcre2el";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/pcre2el";
+          homepage = "https://melpa.org/#/pcre2el";
           license = lib.licenses.free;
         };
       }) {};
@@ -43359,13 +45002,13 @@
           sha256 = "0aaprjczjf3al5vcypw1fsnz5a0xnnlhmvy0lc83i9aqbsa2y8af";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pcsv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pcsv";
           sha256 = "1zphndkbva59g1fd319a240yvq8fjk315b1fyrb8zvmqpgk9n0dl";
           name = "pcsv";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pcsv";
+          homepage = "https://melpa.org/#/pcsv";
           license = lib.licenses.free;
         };
       }) {};
@@ -43380,34 +45023,34 @@
           sha256 = "1xkkyz7y08jr71rzdacb9v7gk95qsxlsshkdsxq8jp70irq51099";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pdb-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pdb-mode";
           sha256 = "1ihkxd15kx5m5xb9yxwz8wqbmyk9iaskry9szzdz1j4gjlczb6hy";
           name = "pdb-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pdb-mode";
+          homepage = "https://melpa.org/#/pdb-mode";
           license = lib.licenses.free;
         };
       }) {};
     pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
     melpaBuild {
         pname = "pdf-tools";
-        version = "20160203.1257";
+        version = "20160410.414";
         src = fetchFromGitHub {
           owner = "politza";
           repo = "pdf-tools";
-          rev = "6b7b10a746695e22ef9aa7d29de20c05e71c7e75";
-          sha256 = "1cj489dv8dw7qkczwib47n7zsdw4k53jkxcqm57a2jpv42bhxz4i";
+          rev = "786fad7f95db74c06a7a569aad33acba978aad7b";
+          sha256 = "00h35j1rhqqnfj7y6z3fblcq2kijnhl51h44424x0xjhydkk3kxv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pdf-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pdf-tools";
           sha256 = "1hnc8cci00mw78h7d7gs8smzrgihqz871sdc9hfvamb7iglmdlxw";
           name = "pdf-tools";
         };
         packageRequires = [ emacs let-alist tablist ];
         meta = {
-          homepage = "http://melpa.org/#/pdf-tools";
+          homepage = "https://melpa.org/#/pdf-tools";
           license = lib.licenses.free;
         };
       }) {};
@@ -43422,13 +45065,13 @@
           sha256 = "1clvrmvijwpffigh5f29vnwcvffqk0nrvlz26158hip1z9x7nah3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/peacock-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/peacock-theme";
           sha256 = "0jpdq090r37d07bm52yx3x9y3gsip6fyxxq1ax1k5k0r0js45kq9";
           name = "peacock-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/peacock-theme";
+          homepage = "https://melpa.org/#/peacock-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -43443,34 +45086,34 @@
           sha256 = "11nv6pll0zj9dkgzlzgav39a6x3sfi7kvfhwm96fa3iy4v8bixrb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/peek-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/peek-mode";
           sha256 = "07wcnh3jmp2gi9xhd3d8i2n0pr2g9kav497nnz94i85awhzf8fi4";
           name = "peek-mode";
         };
         packageRequires = [ elnode ];
         meta = {
-          homepage = "http://melpa.org/#/peek-mode";
+          homepage = "https://melpa.org/#/peek-mode";
           license = lib.licenses.free;
         };
       }) {};
     peep-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "peep-dired";
-        version = "20150518.900";
+        version = "20160321.1737";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "peep-dired";
-          rev = "6c18727fc58e2a19638f133810e35bd5d918a559";
-          sha256 = "1qi9qzcvclyw9wiamsw0z8q09hs0mfhaj2giny42nd6sqacvfr7m";
+          rev = "c88a9a3050197840edfe145f11e0bb9488de32f4";
+          sha256 = "1wy5qpnfri1gha2cnl6q20qar8dbl2mimpb43bnhmm2g3wgjyad6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/peep-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/peep-dired";
           sha256 = "16k5y3h2ip96k071vhx83avg4r4nplnd973b1271vvxbx2bly735";
           name = "peep-dired";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/peep-dired";
+          homepage = "https://melpa.org/#/peep-dired";
           license = lib.licenses.free;
         };
       }) {};
@@ -43485,33 +45128,33 @@
           sha256 = "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/peg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/peg";
           sha256 = "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm";
           name = "peg";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/peg";
+          homepage = "https://melpa.org/#/peg";
           license = lib.licenses.free;
         };
       }) {};
     per-buffer-theme = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "per-buffer-theme";
-        version = "20151013.1212";
+        version = "20160318.1701";
         src = fetchhg {
           url = "https://bitbucket.com/inigoserna/per-buffer-theme.el";
-          rev = "2b82a04b28d0";
-          sha256 = "1rh87jf0a15q35a8h00bx6k5wa931rb6gh600zbs7j4r3y8qsylf";
+          rev = "9e6200da91b3";
+          sha256 = "0w02l91x624cgzdg33a9spgcwy12m607dsfnr1xbc1fi08np4sd1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/per-buffer-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/per-buffer-theme";
           sha256 = "1czcaybpfmx4mwff7hs07iayyvgvlhifkickccap6kpd0cp4n6hn";
           name = "per-buffer-theme";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/per-buffer-theme";
+          homepage = "https://melpa.org/#/per-buffer-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -43526,13 +45169,13 @@
           sha256 = "0fzypcxxd5zlkcybz0xppf09l0vf4vsfisr2y3ijsmxhg7yrwzj5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/perl-completion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/perl-completion";
           sha256 = "01p17mlkwjm60f14arda3ly8ng0r98nn3rly94ghn6jr7r7fv14b";
           name = "perl-completion";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/perl-completion";
+          homepage = "https://melpa.org/#/perl-completion";
           license = lib.licenses.free;
         };
       }) {};
@@ -43547,13 +45190,13 @@
           sha256 = "11fs78b7ssz18wr35vxf6h4zpfj4l4vsikfzayq6hyqjnchv7b45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/perl6-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/perl6-mode";
           sha256 = "0af1djypd8n0n1fq10sl8mrdg27354kg9g87d6xz4q5phvi48cqv";
           name = "perl6-mode";
         };
         packageRequires = [ emacs pkg-info ];
         meta = {
-          homepage = "http://melpa.org/#/perl6-mode";
+          homepage = "https://melpa.org/#/perl6-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -43568,34 +45211,55 @@
           sha256 = "0wg0cpqxzfgln6xdngzspsbfirn9a5jxpgk66m0fpi33215z9q26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/perlbrew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/perlbrew";
           sha256 = "1qadwkcic2qckqy8hgrnj08ajhxayknhpyxkc6ir15vfqjk5crr8";
           name = "perlbrew";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/perlbrew";
+          homepage = "https://melpa.org/#/perlbrew";
+          license = lib.licenses.free;
+        };
+      }) {};
+    persistent-overlays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "persistent-overlays";
+        version = "20160311.1910";
+        src = fetchFromGitHub {
+          owner = "mneilly";
+          repo = "Emacs-Persistent-Overlays";
+          rev = "524166fcf1dd6d69e1af3c8b36ecb15efb0b90fe";
+          sha256 = "0kscx5phq84bxjwfjxqdj2jxk39jz4blw0y91vj6rw2y12k9jign";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/persistent-overlays";
+          sha256 = "136acbxqykvsw8a5il1zgpxr7llxmc3347847vf0jnmbzb1b472a";
+          name = "persistent-overlays";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/persistent-overlays";
           license = lib.licenses.free;
         };
       }) {};
     persistent-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persistent-scratch";
-        version = "20160112.339";
+        version = "20160404.1115";
         src = fetchFromGitHub {
           owner = "Fanael";
           repo = "persistent-scratch";
-          rev = "f0554b9edb4b05150f297b5c14a2da003209d3bf";
-          sha256 = "0h05j55y3csq91a5m2fg99y4rzsh7zca7hnifb6kic5zb3nahi00";
+          rev = "107cf4022bed13692e6ac6a544c06227f30e3535";
+          sha256 = "0j72rqd96dz9pp9zwc88q3358m4b891dg0szmbyvs4myp3yandz2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/persistent-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/persistent-scratch";
           sha256 = "0iai65lsg3zxj07hdb9201w3rwrvdb3wffr6k2jdl8hzg5idghn1";
           name = "persistent-scratch";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/persistent-scratch";
+          homepage = "https://melpa.org/#/persistent-scratch";
           license = lib.licenses.free;
         };
       }) {};
@@ -43610,34 +45274,34 @@
           sha256 = "14p20br8vzxs39d4hswzrrkgwql5nnmn5j17cpbabzjvck42rixc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/persistent-soft";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/persistent-soft";
           sha256 = "0a4xiwpgyyynjf69s8p183mqd3z53absv544ggvhb2gkpm6jravc";
           name = "persistent-soft";
         };
         packageRequires = [ list-utils pcache ];
         meta = {
-          homepage = "http://melpa.org/#/persistent-soft";
+          homepage = "https://melpa.org/#/persistent-soft";
           license = lib.licenses.free;
         };
       }) {};
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "20160221.655";
+        version = "20160426.109";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "d38deb4f09be1c945862e37d673e236bf948107b";
-          sha256 = "0p18290a79ccnv7dmfqy69jhdayj3fj2q82w5y9dzv0ln641rgxr";
+          rev = "6449c8511da1de2ddd1cb05bb4e1e7314c136535";
+          sha256 = "0044029nrv6ricaddwg7nsz43qwnsahsy7v6k2fx38qss5cv35yr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/persp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/persp-mode";
           sha256 = "1bgni7y5xsn4a21494npr90w3320snfzw1hvql30xrr57pw3765w";
           name = "persp-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/persp-mode";
+          homepage = "https://melpa.org/#/persp-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -43652,13 +45316,13 @@
           sha256 = "0b9hz253m6d58dwsjsk9d1fw0ql33m9wfvyx10ncsqbr0j0s98k5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/persp-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/persp-projectile";
           sha256 = "10l2kqjyigg98qbbpf3qf4d5bm63kkk4vp7ip8fibgj1p9gqmnxm";
           name = "persp-projectile";
         };
         packageRequires = [ cl-lib perspective projectile ];
         meta = {
-          homepage = "http://melpa.org/#/persp-projectile";
+          homepage = "https://melpa.org/#/persp-projectile";
           license = lib.licenses.free;
         };
       }) {};
@@ -43669,17 +45333,17 @@
         src = fetchFromGitHub {
           owner = "nex3";
           repo = "perspective-el";
-          rev = "add79422bf742c2d605137ba5fa02f1ec9bad9e2";
-          sha256 = "1acbhnqnajk21jz0m575yq4fvdxfwjbq90nvwp7ikz690nhvjb0k";
+          rev = "c075205313b23cc816c72f1f43b846ce608a22d5";
+          sha256 = "11slq43p6gjvmi4pqwh76a26c2v6l1dmnihgaskn4g0s65qw3kqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/perspective";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/perspective";
           sha256 = "150dxcsd0ylvfi9mmfpcki1wd3nl8q9mbszd3dgqfnm40yncklml";
           name = "perspective";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/perspective";
+          homepage = "https://melpa.org/#/perspective";
           license = lib.licenses.free;
         };
       }) {};
@@ -43694,13 +45358,13 @@
           sha256 = "1zh7v4nnpzvbi8yj1ynlqlawk5bmlxi6s80b5f2y7hkdqb5q26k0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pg";
           sha256 = "0n0187ndvwza1nis9a12h584qdqkwqfzhdw21kz5d1i6c43g7gji";
           name = "pg";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pg";
+          homepage = "https://melpa.org/#/pg";
           license = lib.licenses.free;
         };
       }) {};
@@ -43715,13 +45379,13 @@
           sha256 = "0c9d4c24ic67y07y74bv5b7vc56b6l0lbh2fbzm870r1dl5zbzcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pgdevenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pgdevenv";
           sha256 = "0za35sdwwav81wpk4jjqh56icaswwxxyg3bqqp0qiz24llb5ln1w";
           name = "pgdevenv";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pgdevenv";
+          homepage = "https://melpa.org/#/pgdevenv";
           license = lib.licenses.free;
         };
       }) {};
@@ -43736,13 +45400,13 @@
           sha256 = "1qxsc5wyk8l9gkgmqy3mzwxdhji1ljqw9s1jfxkax7fyv4d1v31p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ph";
           sha256 = "0azx4cpfdn01yrqyn0q1gg9z7w0h0rn7zl39v3dx6yidd76ysh0l";
           name = "ph";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ph";
+          homepage = "https://melpa.org/#/ph";
           license = lib.licenses.free;
         };
       }) {};
@@ -43757,13 +45421,13 @@
           sha256 = "0y77ld1cmfpv9p7yx2mlbvjm5ivsrf2j0g0h4zabfrahz22v39d4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phabricator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/phabricator";
           sha256 = "07988f2xyp76xjs25b3rdblhmijs2piriz4p0q92jw69bdvkl14c";
           name = "phabricator";
         };
         packageRequires = [ dash emacs f projectile s ];
         meta = {
-          homepage = "http://melpa.org/#/phabricator";
+          homepage = "https://melpa.org/#/phabricator";
           license = lib.licenses.free;
         };
       }) {};
@@ -43778,13 +45442,13 @@
           sha256 = "14g06ndxrqz80kdyhil6ajcqqxkfa77r1gr7vwqa9sq6jgm8dpx5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phi-autopair";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/phi-autopair";
           sha256 = "1ya1bvh28qgz1zg9kdh2lzbsf0w0lx4xr42mdrjwaz3bbfa9asg4";
           name = "phi-autopair";
         };
         packageRequires = [ paredit ];
         meta = {
-          homepage = "http://melpa.org/#/phi-autopair";
+          homepage = "https://melpa.org/#/phi-autopair";
           license = lib.licenses.free;
         };
       }) {};
@@ -43799,13 +45463,13 @@
           sha256 = "1rchxhp4kji5kbg8kzkzdbfy8sdbgbqd5g59cch7ia9agh5jvwyx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phi-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/phi-grep";
           sha256 = "1y5lq6lq9qdydbypb1pjnxryh94a295nnqqh2x27whiwdiysirjj";
           name = "phi-grep";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/phi-grep";
+          homepage = "https://melpa.org/#/phi-grep";
           license = lib.licenses.free;
         };
       }) {};
@@ -43820,13 +45484,13 @@
           sha256 = "0d2c579rg8wdfmn94nzaix9332jch4wlr939jszls330s38d0iv4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phi-rectangle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/phi-rectangle";
           sha256 = "08yw04wmbgbbr60i638m0rspfwn3cp47ky5ssgjcgcmmdgg9yfvy";
           name = "phi-rectangle";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/phi-rectangle";
+          homepage = "https://melpa.org/#/phi-rectangle";
           license = lib.licenses.free;
         };
       }) {};
@@ -43841,13 +45505,13 @@
           sha256 = "10kyq3lkhmbmj1hl9awzc0w8073dn9mbjd5skh660ljg5mmi6x62";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phi-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/phi-search";
           sha256 = "0nj06ixl76dd80zg83q4bi8k224mcwb612mr4gd1xppj5k8xl03g";
           name = "phi-search";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/phi-search";
+          homepage = "https://melpa.org/#/phi-search";
           license = lib.licenses.free;
         };
       }) {};
@@ -43862,34 +45526,34 @@
           sha256 = "1b44947hncw4q42fxxrz6fm21habzp4pyp0569xdwysrx2rca2fn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phi-search-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/phi-search-dired";
           sha256 = "1gf3vs3vrp5kbq4ixnj7adazmnqixi63qswgc2512p10gf7inf8p";
           name = "phi-search-dired";
         };
         packageRequires = [ phi-search ];
         meta = {
-          homepage = "http://melpa.org/#/phi-search-dired";
+          homepage = "https://melpa.org/#/phi-search-dired";
           license = lib.licenses.free;
         };
       }) {};
     phi-search-mc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors, phi-search }:
     melpaBuild {
         pname = "phi-search-mc";
-        version = "20150218.55";
+        version = "20160324.1003";
         src = fetchFromGitHub {
           owner = "knu";
           repo = "phi-search-mc.el";
-          rev = "4c6d2d39feb502febb81fc98b7b5854d88150c69";
-          sha256 = "0r6cl1ng41s6wsy5syjlkaip0mp8h491diipdc1psbhnpk4vabsv";
+          rev = "7aa671910f766437089aec26c3aa7814222d1356";
+          sha256 = "0wr86ad0yl52im6b9z0b9pzmhcn39qg5m9878yfv1nbxliw40lcd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phi-search-mc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/phi-search-mc";
           sha256 = "07hd80rbyzr5n3yd7hv1j51nl6pvcxmln20g6xvw8gh5yfl9k0m8";
           name = "phi-search-mc";
         };
         packageRequires = [ multiple-cursors phi-search ];
         meta = {
-          homepage = "http://melpa.org/#/phi-search-mc";
+          homepage = "https://melpa.org/#/phi-search-mc";
           license = lib.licenses.free;
         };
       }) {};
@@ -43904,13 +45568,13 @@
           sha256 = "1k8hjnkinzdxy9qxldsyvj6npa2sv48m905d1cvxr8lyzpc5hikh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phi-search-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/phi-search-migemo";
           sha256 = "0qk73s09sasm438w29j5z2bmlb60p1mgbv2ch43rgq8c6kjzg6h6";
           name = "phi-search-migemo";
         };
         packageRequires = [ migemo phi-search ];
         meta = {
-          homepage = "http://melpa.org/#/phi-search-migemo";
+          homepage = "https://melpa.org/#/phi-search-migemo";
           license = lib.licenses.free;
         };
       }) {};
@@ -43925,13 +45589,13 @@
           sha256 = "1fg63g1cm9mp50sf3ldcb0pr4bvlfxx010arisxdkj102pmib2ri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phoenix-dark-mono-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/phoenix-dark-mono-theme";
           sha256 = "15in299j170n0wxmkg3cx1zzx1n7r1ifraqqzfqhcnk8i8lmc939";
           name = "phoenix-dark-mono-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/phoenix-dark-mono-theme";
+          homepage = "https://melpa.org/#/phoenix-dark-mono-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -43946,13 +45610,13 @@
           sha256 = "042yw44d5pwykl177sdh209drc5f17yzhq0mxrf7qhycbjs4h8cg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phoenix-dark-pink-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/phoenix-dark-pink-theme";
           sha256 = "0bz6iw73d85bi12qqx6fdw3paqknrxvn0asbwjmgdcrlqrfczjlr";
           name = "phoenix-dark-pink-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/phoenix-dark-pink-theme";
+          homepage = "https://melpa.org/#/phoenix-dark-pink-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -43967,13 +45631,13 @@
           sha256 = "1l64rka9wrnwdgfgwv8xh7mq9f1937z2v3r82qcfi6il3anw4zm0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/php-auto-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/php-auto-yasnippets";
           sha256 = "1hhddvpc80b6wvjpbpibsf24rp5a5p45m0bg7m0c8mx181h9mqgn";
           name = "php-auto-yasnippets";
         };
         packageRequires = [ php-mode yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/php-auto-yasnippets";
+          homepage = "https://melpa.org/#/php-auto-yasnippets";
           license = lib.licenses.free;
         };
       }) {};
@@ -43988,13 +45652,13 @@
           sha256 = "10lzbyr7z95mynz885k75n2ibsy92dh3mg3s5m69n03jnf9gv1jy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/php-boris";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/php-boris";
           sha256 = "19yfbrlfqikix2lnnlbpzm6yakjhl84ix0zra2ycpvgg2pl88r0g";
           name = "php-boris";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/php-boris";
+          homepage = "https://melpa.org/#/php-boris";
           license = lib.licenses.free;
         };
       }) {};
@@ -44009,13 +45673,13 @@
           sha256 = "1wk7vq80v97psxfg0pwy4mc6kdc61gm6h1vgl9p71ii6g6zvzcqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/php-boris-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/php-boris-minor-mode";
           sha256 = "1cmpd303chldss7kylpinv8qc3c78srz02a9cp9x79c8arq7apwl";
           name = "php-boris-minor-mode";
         };
         packageRequires = [ highlight php-boris ];
         meta = {
-          homepage = "http://melpa.org/#/php-boris-minor-mode";
+          homepage = "https://melpa.org/#/php-boris-minor-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -44030,34 +45694,34 @@
           sha256 = "0hm6myvf91f4d2yfc7fs2xky9m8hfnimx1gkfzmn9f5pcc2l2p0i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/php-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/php-eldoc";
           sha256 = "1q5fkl8crqrgxik2mxbkqv10qnqhqrazd66rgfw797s3jcchv58j";
           name = "php-eldoc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/php-eldoc";
+          homepage = "https://melpa.org/#/php-eldoc";
           license = lib.licenses.free;
         };
       }) {};
-    php-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-mode";
-        version = "20151002.2230";
+        version = "20160413.228";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "9b1e7736ce014f26f40635af3c781127a5e32dfa";
-          sha256 = "0206jv7rz9gm016lpfdwh2l0z6da25szc6hfxgcz2qvkzjpvrlr6";
+          rev = "9083f3ac3f61f2cbf30f034151518860b992c782";
+          sha256 = "1ybx2kb719xm4ld24kki7x5x6pygcxvnbp9dr49s8xh60g5h4b47";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/php-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/php-mode";
           sha256 = "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y";
           name = "php-mode";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/php-mode";
+          homepage = "https://melpa.org/#/php-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -44072,34 +45736,34 @@
           sha256 = "0f1n0jcla157ngqshq5n8iws216ar63ynjd6743cbdrzj0v030wg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/php+-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/php+-mode";
           sha256 = "1ibcsky6la3l7gawpgx814w1acjf73b68i6wbb4p6saxhwg6adik";
           name = "php-plus--mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/php+-mode";
+          homepage = "https://melpa.org/#/php+-mode";
           license = lib.licenses.free;
         };
       }) {};
     php-refactor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-refactor-mode";
-        version = "20140920.1611";
+        version = "20160417.1646";
         src = fetchFromGitHub {
           owner = "keelerm84";
           repo = "php-refactor-mode.el";
-          rev = "9010e5e8dde2ad3a2c7a65ff1752b5482dfd4f61";
-          sha256 = "163albjkq7ldc9fki368540m7nl58qa70wfpff08gx3gsvywfnyi";
+          rev = "de47bb705c58e7ac06bdb1b403697013c77306ae";
+          sha256 = "01i552ch8r8i6nzw8prwxcafzrq6xnzyc4cn36w3my1xq0k2ljvz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/php-refactor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/php-refactor-mode";
           sha256 = "0gj0nv6ii7pya0hcxs8haz5pahj0sa12c2ls53c3j85in645zb3s";
           name = "php-refactor-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/php-refactor-mode";
+          homepage = "https://melpa.org/#/php-refactor-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -44114,13 +45778,13 @@
           sha256 = "09rinyx0621d7613xmbyvrrlav6d4ia332wkgg0m9dn265g3h56z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phpcbf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/phpcbf";
           sha256 = "1hf88ys4grffpqgavrbc72dn3m7crafgid2ygzx9c5j55syh8mfv";
           name = "phpcbf";
         };
         packageRequires = [ s ];
         meta = {
-          homepage = "http://melpa.org/#/phpcbf";
+          homepage = "https://melpa.org/#/phpcbf";
           license = lib.licenses.free;
         };
       }) {};
@@ -44135,13 +45799,13 @@
           sha256 = "1zghw5nfm4a9j98vsaw4fc8r4f98s5fhgvgbnbyyxapl851fa9i6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phpunit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/phpunit";
           sha256 = "0nj8ss1yjkcqnbnn4jgbp0403ljjk2xhipzikdrl3dbxlf14i4f8";
           name = "phpunit";
         };
         packageRequires = [ f pkg-info s ];
         meta = {
-          homepage = "http://melpa.org/#/phpunit";
+          homepage = "https://melpa.org/#/phpunit";
           license = lib.licenses.free;
         };
       }) {};
@@ -44156,13 +45820,13 @@
           sha256 = "053jqzl0sp3dnl4919vi30xqrdcpi9jsqx5hndj1bprf7926w11d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pianobar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pianobar";
           sha256 = "16vsf2cig9qjbh9s58zb5byjmyghxbsxpzpm5hyyrv251jap1jjn";
           name = "pianobar";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pianobar";
+          homepage = "https://melpa.org/#/pianobar";
           license = lib.licenses.free;
         };
       }) {};
@@ -44177,13 +45841,13 @@
           sha256 = "0p91ysyjksbravnw3l78mshay6swgb5k1zi5bbppppk8zkmdp115";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/picolisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/picolisp-mode";
           sha256 = "1n56knbapyfs8n23arzlz27y0q4846r64krwlwh8agfqkcdw9dp5";
           name = "picolisp-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/picolisp-mode";
+          homepage = "https://melpa.org/#/picolisp-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -44198,13 +45862,13 @@
           sha256 = "1yg9n265ljdjlh6a3jrjwyvj3f76wp68x25bl0p8dxrrsyr9kvfx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pig-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pig-mode";
           sha256 = "0gmvc4rrqkn0cx8fk1sxk6phfbpf8dcba3k6i24k3idcx8rxsw3x";
           name = "pig-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pig-mode";
+          homepage = "https://melpa.org/#/pig-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -44219,13 +45883,13 @@
           sha256 = "1yg9n265ljdjlh6a3jrjwyvj3f76wp68x25bl0p8dxrrsyr9kvfx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pig-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pig-snippets";
           sha256 = "1sqi0a2dsqgmabkrncxiyrhibyryyy25d11b15ybhlngd05wqbx2";
           name = "pig-snippets";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/pig-snippets";
+          homepage = "https://melpa.org/#/pig-snippets";
           license = lib.licenses.free;
         };
       }) {};
@@ -44240,13 +45904,13 @@
           sha256 = "19i8hgzr7kdj4skf0cnv6vlsklq9qcyxcv3p33k9vgq7y4f9mah8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pillar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pillar";
           sha256 = "1lklky3shyvm1iygp621hbldpx37m0a9vd5l6mxs4y60ksj6z0js";
           name = "pillar";
         };
         packageRequires = [ makey ];
         meta = {
-          homepage = "http://melpa.org/#/pillar";
+          homepage = "https://melpa.org/#/pillar";
           license = lib.licenses.free;
         };
       }) {};
@@ -44261,13 +45925,13 @@
           sha256 = "0wy9c37g6m5khchlp8qvfnjgkwq4r38659adcm5prvzjgzqhlfja";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pinboard-api";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pinboard-api";
           sha256 = "0yzvgnpkj2fhl01id36nc5pj8vyb05bllraiz3lwwcc66y98h9n0";
           name = "pinboard-api";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pinboard-api";
+          homepage = "https://melpa.org/#/pinboard-api";
           license = lib.licenses.free;
         };
       }) {};
@@ -44282,13 +45946,13 @@
           sha256 = "1wc31r5fpcia4n4vbpg7vv3rzrnjzh18yygi3kp4wvl2wzx2azqh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pinot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pinot";
           sha256 = "1kjzq02pddnkia637xz2mnjjyglyh6qzragnf7nnxbw9ayiim58i";
           name = "pinot";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pinot";
+          homepage = "https://melpa.org/#/pinot";
           license = lib.licenses.free;
         };
       }) {};
@@ -44303,13 +45967,13 @@
           sha256 = "096izagfjw8cnxjq3v70x8a55npyxnr40mg1fc9b1jnqw6qwf491";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pinyin-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pinyin-search";
           sha256 = "1si693nmmxgg0kp5mxvj5nq946kfc5cv3wfsl4znbqzps8qb2b7z";
           name = "pinyin-search";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pinyin-search";
+          homepage = "https://melpa.org/#/pinyin-search";
           license = lib.licenses.free;
         };
       }) {};
@@ -44324,13 +45988,13 @@
           sha256 = "0j4h6q1s2s9dw1pp22xsajchwg8nh3x4x5qxbzf19i1xbpcghw7h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pip-requirements";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pip-requirements";
           sha256 = "1wsjfyqga7pzp8gsm5x53qrkn40srairbjpifyrqbi2fpzmwhrnz";
           name = "pip-requirements";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/pip-requirements";
+          homepage = "https://melpa.org/#/pip-requirements";
           license = lib.licenses.free;
         };
       }) {};
@@ -44345,13 +46009,13 @@
           sha256 = "1sbwqrk9nciqwm53sfbq3nr9f9zzpz79dmxs8yp005dk7accdlls";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pivotal-tracker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pivotal-tracker";
           sha256 = "195wcfn434yp0p93zqih1snkkg1v7nxgb4gn0klajahmyrrjq2a2";
           name = "pivotal-tracker";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pivotal-tracker";
+          homepage = "https://melpa.org/#/pivotal-tracker";
           license = lib.licenses.free;
         };
       }) {};
@@ -44366,13 +46030,13 @@
           sha256 = "0nnvf2p593gn8sbyrvczyll030xgnkxn900a2hy7ia7xh0wmvddp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pixie-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pixie-mode";
           sha256 = "16z15yh78837k548xk5widdmy6fv03vym6q54i40knmgf5cllsl8";
           name = "pixie-mode";
         };
         packageRequires = [ clojure-mode inf-clojure ];
         meta = {
-          homepage = "http://melpa.org/#/pixie-mode";
+          homepage = "https://melpa.org/#/pixie-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -44387,13 +46051,13 @@
           sha256 = "18rvnvm097ca4yc1nfswdv7dfqg36insnif5kfj19aa60m9qxl09";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pixiv-novel-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pixiv-novel-mode";
           sha256 = "0f1rxvf9nrw984122i6dzsgik9axfjv6yscmg203s065n9lz17px";
           name = "pixiv-novel-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pixiv-novel-mode";
+          homepage = "https://melpa.org/#/pixiv-novel-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -44408,13 +46072,13 @@
           sha256 = "1xkdbyhz9mgdz5zmjm4hh050klsl12w5lkckw2l77ihcxv0vjnf2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pkg-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pkg-info";
           sha256 = "0whcvralk76mfmvbvwn57va5dkb1irj7iwffgddi7r0ima49iszx";
           name = "pkg-info";
         };
         packageRequires = [ epl ];
         meta = {
-          homepage = "http://melpa.org/#/pkg-info";
+          homepage = "https://melpa.org/#/pkg-info";
           license = lib.licenses.free;
         };
       }) {};
@@ -44429,13 +46093,13 @@
           sha256 = "077vp3fxwxj7b98ydw6iyi391w3acp73qwk6615yqdylpp66m750";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pkgbuild-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pkgbuild-mode";
           sha256 = "1lp7frjahcpr4xnzxz77qj5hbpxbxm2g28apkixrnc1xjha66v3x";
           name = "pkgbuild-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pkgbuild-mode";
+          homepage = "https://melpa.org/#/pkgbuild-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -44450,76 +46114,97 @@
           sha256 = "0rpiyp95k14fsc5hdbnj4hs3snh0vm8a2skcplsdwkmb5j9547w1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/plan9-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/plan9-theme";
           sha256 = "0bvr877mc79s1shr82b33ipspz09jzc3809c6pkbw0jqpfid44cc";
           name = "plan9-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/plan9-theme";
+          homepage = "https://melpa.org/#/plan9-theme";
           license = lib.licenses.free;
         };
       }) {};
     planet-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "planet-theme";
-        version = "20150627.951";
+        version = "20160425.2258";
         src = fetchFromGitHub {
           owner = "cmack";
           repo = "emacs-planet-theme";
-          rev = "e2bd6645535a3044fceafb1ce5d296cc111d5f2a";
-          sha256 = "0q4zdw58yawqp9rhx04lhq0v7iaf61ydbw19gpw4an85j2hxrkzq";
+          rev = "29cc5915d55b7cec9094a5faacebfbc75ce1d1b8";
+          sha256 = "1aahyxmjsz9i5d22654bnmis8isbf5fydh0yy03sbiybm2hlyimi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/planet-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/planet-theme";
           sha256 = "1mhbydvk7brmkgmij5gpp6l9ixcyh1g3r4fw3kpq8nvgbwknsqc9";
           name = "planet-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/planet-theme";
+          homepage = "https://melpa.org/#/planet-theme";
           license = lib.licenses.free;
         };
       }) {};
-    plantuml-mode = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    plantuml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "plantuml-mode";
-        version = "20131031.1832";
+        version = "20150601.131";
         src = fetchFromGitHub {
-          owner = "wildsoul";
+          owner = "zwz";
           repo = "plantuml-mode";
-          rev = "4bc4cdf7974c8b8956b848ef69f1a2b5767597aa";
-          sha256 = "0jvs051ncpv7pwx2kr14fm1wqakabwc031xcv7lba0mx7shxzqdg";
+          rev = "574f5e79605a028912bb90c03487c80b1db612e7";
+          sha256 = "03nw4af1lgfppsbfq945c9pcz6ynhvpzlfdx3az83zi24b10az8n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/plantuml-mode";
-          sha256 = "0fg313mx9jz92lf9lr5apvma9ixfz02dvyzw1phsgzawi7hai264";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/plantuml-mode";
+          sha256 = "14imiqfgc2j9kjr3aqwzlw8xr1w5hb8i7d4ch709qky036i3lsci";
           name = "plantuml-mode";
         };
-        packageRequires = [ auto-complete ];
+        packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/plantuml-mode";
+          homepage = "https://melpa.org/#/plantuml-mode";
           license = lib.licenses.free;
         };
       }) {};
     platformio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "platformio-mode";
-        version = "20160109.2235";
+        version = "20160327.2020";
         src = fetchFromGitHub {
-          owner = "zachmassia";
-          repo = "platformio-mode";
-          rev = "6d12f34548f93dec3c6fe40843d87a8a67ec25c7";
-          sha256 = "1k3bqv5y2xp1jl2hpf8qhs11yzhcl8k40fxqjzv7mvc0ysq9y6wb";
+          owner = "ZachMassia";
+          repo = "PlatformIO-Mode";
+          rev = "5f7c70f6749172a822ee7dd8291ee987eee8947b";
+          sha256 = "04xnk9s5mjr55y36y07k4vnsf841pg70c9wr6vcj5s16h3fhx9nw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/platformio-mode";
-          sha256 = "022l20sfyfkvp6kmmqxr7gcmcdx6b1dgsakjjnx8fknrpxr5kyps";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/platformio-mode";
+          sha256 = "1v1pp3365wj19a5wmsxyyy5n548z3lmcbm2pwl914wip3ca7546f";
           name = "platformio-mode";
         };
         packageRequires = [ projectile ];
         meta = {
-          homepage = "http://melpa.org/#/platformio-mode";
+          homepage = "https://melpa.org/#/platformio-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    play-routes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "play-routes-mode";
+        version = "20160322.1200";
+        src = fetchFromGitHub {
+          owner = "brocode";
+          repo = "play-routes-mode";
+          rev = "d7eb682cd474d90b3a3d005290cd6d4fe9f94cae";
+          sha256 = "0slfaclbhjm5paw8l7rr3y9xxjyhkizp9lwyvlgpkd38n4pgj2bx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/play-routes-mode";
+          sha256 = "17phqil2zf5rfvhs5v743dh4lix4v2azbf33z9n97ahs7j66y2gz";
+          name = "play-routes-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/play-routes-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -44534,13 +46219,13 @@
           sha256 = "11cbpgjsnw8fiqf1s12hbm9qxgjcw6y2zxx7wz4wg7idmi7m0b7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/plenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/plenv";
           sha256 = "0dw9fy5wd9wm76ag6yyw3f9jnlj7rcdcxgdjm30h514qfi9hxbw4";
           name = "plenv";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/plenv";
+          homepage = "https://melpa.org/#/plenv";
           license = lib.licenses.free;
         };
       }) {};
@@ -44555,13 +46240,13 @@
           sha256 = "07hspp4bkb3f5dm0l1arm0w1m04cq4glg81x4a9kf7bl601wzki2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/plim-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/plim-mode";
           sha256 = "0247fpvxki5jhxw6swv7pcw0qwxrqnp75acnfss2lf984vggzhxi";
           name = "plim-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/plim-mode";
+          homepage = "https://melpa.org/#/plim-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -44576,13 +46261,13 @@
           sha256 = "1r2yxa7gqr0z9fwhx38siwjpg73a93rdmnhr4h6nm6lr32vviyxm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/plsense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/plsense";
           sha256 = "1ka06r4ashhjkfyzql9mfvs3gj7n684h4gaycj29w4nfqrhcw9va";
           name = "plsense";
         };
         packageRequires = [ auto-complete log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/plsense";
+          homepage = "https://melpa.org/#/plsense";
           license = lib.licenses.free;
         };
       }) {};
@@ -44597,13 +46282,13 @@
           sha256 = "0s34nbqqy6aqi113xj452pbmqp43046wfbfbbfv1xwhybgq0c1j1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/plsense-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/plsense-direx";
           sha256 = "0qd4b7gkmn5ydadhp70995rap3643s1aa8gfi5izgllzhg0i864j";
           name = "plsense-direx";
         };
         packageRequires = [ direx log4e plsense yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/plsense-direx";
+          homepage = "https://melpa.org/#/plsense-direx";
           license = lib.licenses.free;
         };
       }) {};
@@ -44611,17 +46296,17 @@
         pname = "plsql";
         version = "20121115.443";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/plsql.el";
+          url = "https://www.emacswiki.org/emacs/download/plsql.el";
           sha256 = "1v0wvy9fd1qq3aq83x5jv3953n0n51x7y2r2ql11j0h8xasy42p1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/plsql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/plsql";
           sha256 = "1jvppmfdll34b8dav5dvbabfxiapv92p7lciblj59a707bbdb7l1";
           name = "plsql";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/plsql";
+          homepage = "https://melpa.org/#/plsql";
           license = lib.licenses.free;
         };
       }) {};
@@ -44634,34 +46319,34 @@
           sha256 = "0x3s9fj41n6a21la762qm1si9ysv3zj5bbp6ykfskr73sxq6s9ff";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pmdm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pmdm";
           sha256 = "1zmy6cbnqhsbwc5vx30mx45xn88d2186hgrl75ws7vvbl197j03b";
           name = "pmdm";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pmdm";
+          homepage = "https://melpa.org/#/pmdm";
           license = lib.licenses.free;
         };
       }) {};
     point-stack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "point-stack";
-        version = "20140102.1423";
+        version = "20141225.2310";
         src = fetchFromGitHub {
-          owner = "mattharrison";
+          owner = "dgutov";
           repo = "point-stack";
-          rev = "2d2a5e90988792cf49ba4c5a839ef6a1400f5a24";
-          sha256 = "1p1j2kfwj7gzir7q5ls34k8764kwbnb6d0dhlw4zb4kvwlidp6c1";
+          rev = "86b37666882398f4db93f3aba0ebb7b7965032cd";
+          sha256 = "0nqv63yy0qpxhblzmkyvla90p9a7729fqxvhkfld9jxfqpgv1xyp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/point-stack";
-          sha256 = "17z9mc49x4092axs7lq6b6z7yrrhkl8bdx5f8gq6qy5lampgyzch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/point-stack";
+          sha256 = "0201gka1izqgxyivan60jbg9x1mmsw5dscxacasg97ffsciwbfr9";
           name = "point-stack";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/point-stack";
+          homepage = "https://melpa.org/#/point-stack";
           license = lib.licenses.free;
         };
       }) {};
@@ -44669,17 +46354,17 @@
         pname = "point-undo";
         version = "20100504.329";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/point-undo.el";
+          url = "https://www.emacswiki.org/emacs/download/point-undo.el";
           sha256 = "13c1iw77ccvrfrv4lyljg8fpm7xqhnv29yzvig8wr8b5j2vsd8bz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/point-undo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/point-undo";
           sha256 = "0by7ifj1lf0w9pp7v1j9liqjs40k8kk9yjnznxchq172816zbg3k";
           name = "point-undo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/point-undo";
+          homepage = "https://melpa.org/#/point-undo";
           license = lib.licenses.free;
         };
       }) {};
@@ -44694,34 +46379,34 @@
           sha256 = "016cjy5pnnqccjqb0njqc9jq6kf6p165nlki83b8c0sj75yxghav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pointback";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pointback";
           sha256 = "198q511hixvzc13b3ih89xs9g47rdvbiixn5baqakpmpx3a12hz4";
           name = "pointback";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pointback";
+          homepage = "https://melpa.org/#/pointback";
           license = lib.licenses.free;
         };
       }) {};
     polymode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "polymode";
-        version = "20160217.1428";
+        version = "20160413.1600";
         src = fetchFromGitHub {
-          owner = "vitoshka";
+          owner = "vspinu";
           repo = "polymode";
-          rev = "e90497a1e44adb95ec3cd761a95a47e4775849ee";
-          sha256 = "0cg7pgzd19pq9m6gbj6pl2cnaq2impjbnss2w177i3ahkfm4rl4k";
+          rev = "46b17263b5cb904dcfc12d06c1d4d32f7bd9ff40";
+          sha256 = "0h6vg9msr8iw3iiy8s13dl8wdhay82q7dqir6dnj0868vdhnl3fb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/polymode";
-          sha256 = "0ndavaan7k55l3ghm5h08i0slmmzc82c0gl4b8w91fa8bi2lq4h4";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/polymode";
+          sha256 = "0md02l7vhghvzplxa04sphimhphmksvmz079zykxajcvpm2rgwc8";
           name = "polymode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/polymode";
+          homepage = "https://melpa.org/#/polymode";
           license = lib.licenses.free;
         };
       }) {};
@@ -44736,13 +46421,13 @@
           sha256 = "1dlk0ypw8316vgvb7z2p7fvaiz1wcy1l8crixypaya1zdsnh9v1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pomodoro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pomodoro";
           sha256 = "075sbypas8xlhsw8wg3mgi3fn5yf7xb3klyjgyy8wfkgdz0269f8";
           name = "pomodoro";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pomodoro";
+          homepage = "https://melpa.org/#/pomodoro";
           license = lib.licenses.free;
         };
       }) {};
@@ -44757,13 +46442,13 @@
           sha256 = "1g1yw0ykwswl9dnicyi7kxskqqry40wjykshgrqhs4k09j3jnacr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pony-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pony-mode";
           sha256 = "1hgiryhpxv30bjlgv9pywzqn2ypimwzdhx03znqvn56zrwn1frnl";
           name = "pony-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pony-mode";
+          homepage = "https://melpa.org/#/pony-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -44772,40 +46457,40 @@
         pname = "pony-snippets";
         version = "20160204.2211";
         src = fetchFromGitHub {
-          owner = "seantallen";
+          owner = "SeanTAllen";
           repo = "pony-snippets";
           rev = "a6615ab0693f17fc47ec45753202010238157810";
           sha256 = "002jhj47b9aqrfjy8b31ccbqhah5sn9wn7dmrhm1wbbgj9rfyw6s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pony-snippets";
-          sha256 = "06rrzfg20kzpscnqr2lin9jvrcydq4wnrv7nj1d0lm6988qz88jx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pony-snippets";
+          sha256 = "12ygvpfkzldq6s4mwbrxs4x9927i7pa7ywn7lf1r3gg4h29ar9gn";
           name = "pony-snippets";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/pony-snippets";
+          homepage = "https://melpa.org/#/pony-snippets";
           license = lib.licenses.free;
         };
       }) {};
     ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ponylang-mode";
-        version = "20160123.1637";
+        version = "20160403.1917";
         src = fetchFromGitHub {
           owner = "SeanTAllen";
           repo = "ponylang-mode";
-          rev = "d05425eca7c924109263bdac72083137a7967454";
-          sha256 = "0jlycv0ck5kbszwc0v2gbka6k5h39nz8763ws0v8jada7zzmyvxm";
+          rev = "e6c713a1e43f4e5a3ee78e102050fff4efe334fb";
+          sha256 = "0ay44hp82ly4kdsgwhhk16gvw26kyvpl8h3fziyicfl5swy954nb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ponylang-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ponylang-mode";
           sha256 = "02fq0qp7f4bzmynzszrwskfs78nzsmf413qjxqndrh3hamixzpi1";
           name = "ponylang-mode";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/ponylang-mode";
+          homepage = "https://melpa.org/#/ponylang-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -44820,13 +46505,13 @@
           sha256 = "0n1w1adglbavqgrv16rzhym72c3q083mh0c8yl5lj7adn4nr4gr3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pophint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pophint";
           sha256 = "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72";
           name = "pophint";
         };
         packageRequires = [ log4e popup yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/pophint";
+          homepage = "https://melpa.org/#/pophint";
           license = lib.licenses.free;
         };
       }) {};
@@ -44841,34 +46526,34 @@
           sha256 = "0ja1kq4pl62zxlzwv2m8zzb55lg2fl366bi9pzvxl38frvbqg8qx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/poporg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/poporg";
           sha256 = "08s42689kd78h2fmw230ja5dd3c3b4lx5mzadncwq0lj91y86kd8";
           name = "poporg";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/poporg";
+          homepage = "https://melpa.org/#/poporg";
           license = lib.licenses.free;
         };
       }) {};
     popup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "popup";
-        version = "20151222.1539";
+        version = "20160409.2333";
         src = fetchFromGitHub {
           owner = "auto-complete";
           repo = "popup-el";
-          rev = "004d58c47f6406b6555cf112f8a6eed6114cb63b";
-          sha256 = "19sbdxs6l66nflfb4kmx4lb6z0shwpfq79b5h9hhi0xr70xacd4b";
+          rev = "8eee9c57288d12073d331a9eb4c172358d268455";
+          sha256 = "0a85ih4r8scxadfrj18kvd8k7p9s4wpi780w0rp5iby0fyh94bwl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/popup";
           sha256 = "151g00h9rkid76qf6c53n8bncsfaikmhj8fqcb3r3a6mbngcd5k2";
           name = "popup";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/popup";
+          homepage = "https://melpa.org/#/popup";
           license = lib.licenses.free;
         };
       }) {};
@@ -44883,34 +46568,34 @@
           sha256 = "1q9zajv6g7mi6k98kzq3498nhmdkp1z9d2b8vgzbk7745d39gm9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/popup-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/popup-complete";
           sha256 = "04bpm31zx87j390r2xi1yl4kyqgalmyqc48xarsm67zfww9fw9c1";
           name = "popup-complete";
         };
         packageRequires = [ popup ];
         meta = {
-          homepage = "http://melpa.org/#/popup-complete";
+          homepage = "https://melpa.org/#/popup-complete";
           license = lib.licenses.free;
         };
       }) {};
     popup-imenu = callPackage ({ dash, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "popup-imenu";
-        version = "20160214.1104";
+        version = "20160409.710";
         src = fetchFromGitHub {
           owner = "ancane";
           repo = "popup-imenu";
-          rev = "29ac87726987ab5d451e04251336fd8c2a782450";
-          sha256 = "07gwfmp53gwk2zpip5m1vrn3i36c22c71z3grn65hm3k3ykl2a1y";
+          rev = "540e8c0473fd50ff0a85c870057e397a0d3c5eb5";
+          sha256 = "19mqzfpki2zlnibp2vzymhdld1m20jinxwgdhmbl6zdfx74zbz7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/popup-imenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/popup-imenu";
           sha256 = "0lxwfaa9vhdn55dj3idp8c3fg1g26qsqq46y5bimfd0s89bjbaxn";
           name = "popup-imenu";
         };
         packageRequires = [ dash flx-ido popup ];
         meta = {
-          homepage = "http://melpa.org/#/popup-imenu";
+          homepage = "https://melpa.org/#/popup-imenu";
           license = lib.licenses.free;
         };
       }) {};
@@ -44925,34 +46610,34 @@
           sha256 = "1zdwlmk3vr0mq0dxrnkqjncalnbmvpxc0lma2sv3a4czl8yv0inn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/popup-kill-ring";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/popup-kill-ring";
           sha256 = "1jfw669xi2983jj3hiw5lyhc0rc0318qrmqx03f7m4ylg70dgxip";
           name = "popup-kill-ring";
         };
         packageRequires = [ popup pos-tip ];
         meta = {
-          homepage = "http://melpa.org/#/popup-kill-ring";
+          homepage = "https://melpa.org/#/popup-kill-ring";
           license = lib.licenses.free;
         };
       }) {};
     popup-switcher = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "popup-switcher";
-        version = "20160123.1600";
+        version = "20160405.438";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "popup-switcher";
-          rev = "df48ac506dbd5b1c611d6cd0066ebeb91b4d97d1";
-          sha256 = "19c916bz354di7p4md8456xhf3i72db86mwlk2wrq0d4kx16dh0c";
+          rev = "66c1b2491de92c05752267ff3cba3e8c9015c644";
+          sha256 = "02d6rzxwzw1pbcjh8lxkaw1j77vq5jcryl8ajkmm6jp5daqyjjyc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/popup-switcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/popup-switcher";
           sha256 = "1888xiqhrn7fcpjnr3smchmmqwfayfbbyvdkdb79c6drzjcvidp1";
           name = "popup-switcher";
         };
         packageRequires = [ cl-lib popup ];
         meta = {
-          homepage = "http://melpa.org/#/popup-switcher";
+          homepage = "https://melpa.org/#/popup-switcher";
           license = lib.licenses.free;
         };
       }) {};
@@ -44967,13 +46652,13 @@
           sha256 = "0nips9npm4zmz3f37vvb4s0g1ci0p9cl6w0z4sc6agg4rybjhpdp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/popwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/popwin";
           sha256 = "1zp54nv8rh0b3g8y5aj4793miiw2r1ijwbzq31lkwmbdr09mixmf";
           name = "popwin";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/popwin";
+          homepage = "https://melpa.org/#/popwin";
           license = lib.licenses.free;
         };
       }) {};
@@ -44988,13 +46673,13 @@
           sha256 = "1pm4x74pw67m2izr9dir201dn5g9icgk6h2j8rqvasgx8v8krv3i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/portage-navi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/portage-navi";
           sha256 = "1wjkh8xj5120v9fz1nrpkd6x4f22ni8h2lfkd82df7kjz6bzdfwg";
           name = "portage-navi";
         };
         packageRequires = [ concurrent ctable ];
         meta = {
-          homepage = "http://melpa.org/#/portage-navi";
+          homepage = "https://melpa.org/#/portage-navi";
           license = lib.licenses.free;
         };
       }) {};
@@ -45009,13 +46694,13 @@
           sha256 = "168hl76rhj6f5ncmrij4rd3z55228h6kb23384h2phsjw0avgf23";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pos-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pos-tip";
           sha256 = "13qjz112qlrnq34lr70087gshzq8m44knfl6694hfprzjgix84vh";
           name = "pos-tip";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pos-tip";
+          homepage = "https://melpa.org/#/pos-tip";
           license = lib.licenses.free;
         };
       }) {};
@@ -45030,13 +46715,13 @@
           sha256 = "14silfng5rbdc8hnzswjmqk705pncjlk8iphjcxcm799h44pnlcr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pov-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pov-mode";
           sha256 = "1xzdmlfi5ixdh08v0ca80zkh9n3gfn4ql5pnl3jh745wbj9azxp9";
           name = "pov-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pov-mode";
+          homepage = "https://melpa.org/#/pov-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -45051,34 +46736,34 @@
           sha256 = "1jzqav2lchr0ggckjq9rwlxwryi7m7xnmn8471zgiamd1h04ddqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pow";
           sha256 = "05wc4ylp0xjqbzrm046lcsv4aw2a6s2rfv1ra38bfr0dai6qrsrn";
           name = "pow";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/pow";
+          homepage = "https://melpa.org/#/pow";
           license = lib.licenses.free;
         };
       }) {};
     powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "powerline";
-        version = "20151008.1649";
+        version = "20160224.2252";
         src = fetchFromGitHub {
           owner = "milkypostman";
           repo = "powerline";
-          rev = "e886f6fe46c7413befb1de3799a185366fd8b39c";
-          sha256 = "0dq7fqlv72p72hbshzbwz5k40mqfdw10v9hsd1m18s2rf7082570";
+          rev = "b0793ac11cdd6de17848ac654d61b1255416789e";
+          sha256 = "1dmxnail0w4v5d29qiycqwd27mkxfk9cs5p2l9nm0fajm4mm5wa2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/powerline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/powerline";
           sha256 = "0gsffr6ilmckrzifsmhwd42vr85vs42pc26f1205pbxb7ma34dhx";
           name = "powerline";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/powerline";
+          homepage = "https://melpa.org/#/powerline";
           license = lib.licenses.free;
         };
       }) {};
@@ -45093,13 +46778,13 @@
           sha256 = "1c8y4r7zdr6764kzs5bc64idv2pfjvi78lg2f1d2hp1595ia8y5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/powerline-evil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/powerline-evil";
           sha256 = "0cdnmq9f06lzkj0hs948a7j5sgg6fl5f36bfnyaxgss23akbfjhr";
           name = "powerline-evil";
         };
         packageRequires = [ evil powerline ];
         meta = {
-          homepage = "http://melpa.org/#/powerline-evil";
+          homepage = "https://melpa.org/#/powerline-evil";
           license = lib.licenses.free;
         };
       }) {};
@@ -45114,13 +46799,13 @@
           sha256 = "1ym373mjyk3vfbw2c918zgaf9m35j8bkrpcj9d8m9drf4h7a8d3b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/powershell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/powershell";
           sha256 = "162k8y9k2n48whaq93sqk86zy3p9qvsfxgyfv9n1nvk4l5wn70wk";
           name = "powershell";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/powershell";
+          homepage = "https://melpa.org/#/powershell";
           license = lib.licenses.free;
         };
       }) {};
@@ -45128,17 +46813,17 @@
         pname = "pp-c-l";
         version = "20151231.1747";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/pp-c-l.el";
+          url = "https://www.emacswiki.org/emacs/download/pp-c-l.el";
           sha256 = "10gsdjdr8qngimqh57qxcljjnypbf38asxqb3zlfwc2ls52fc19q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pp-c-l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pp-c-l";
           sha256 = "0gbqxlrsh9lcdkrj8bqh1mpxyhdlwbaxz4ndp5s90inmisaqb83v";
           name = "pp-c-l";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pp-c-l";
+          homepage = "https://melpa.org/#/pp-c-l";
           license = lib.licenses.free;
         };
       }) {};
@@ -45146,17 +46831,17 @@
         pname = "pp-plus";
         version = "20151231.1746";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/pp+.el";
+          url = "https://www.emacswiki.org/emacs/download/pp+.el";
           sha256 = "0zlmcrg8gx812gm04cil7p2z0g4814c158yv1ghmrbxshn8p45fg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pp+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pp+";
           sha256 = "1ng5x7dp85y6yqj6q43h08qdnapg2j1ab8rmc47w4w79d1pryniq";
           name = "pp-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pp+";
+          homepage = "https://melpa.org/#/pp+";
           license = lib.licenses.free;
         };
       }) {};
@@ -45171,13 +46856,13 @@
           sha256 = "0pv671j8g09pn61kkfb3pa9axfa9zd2jdrkgr81rm2gqb2vh1hsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ppd-sr-speedbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ppd-sr-speedbar";
           sha256 = "1m2918hqvb9c6rgb5szs95ds99gdjdxggcbdfqzmbb5sz2936av8";
           name = "ppd-sr-speedbar";
         };
         packageRequires = [ project-persist-drawer sr-speedbar ];
         meta = {
-          homepage = "http://melpa.org/#/ppd-sr-speedbar";
+          homepage = "https://melpa.org/#/ppd-sr-speedbar";
           license = lib.licenses.free;
         };
       }) {};
@@ -45192,13 +46877,13 @@
           sha256 = "0yrfd9qaz16nqcvjyjm9qci526qgkv6k51q5752h3iyqkxnss1pd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/preproc-font-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/preproc-font-lock";
           sha256 = "1ra0lgjv6713zym2h8pblf2ryf0f658l1khbxbwnxl023gkyj9v4";
           name = "preproc-font-lock";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/preproc-font-lock";
+          homepage = "https://melpa.org/#/preproc-font-lock";
           license = lib.licenses.free;
         };
       }) {};
@@ -45207,19 +46892,19 @@
         pname = "preseed-generic-mode";
         version = "20150119.1441";
         src = fetchFromGitHub {
-          owner = "suntong001";
+          owner = "suntong";
           repo = "preseed-generic-mode";
           rev = "19bce980d41607bef8af4b1901343abfca0f0855";
           sha256 = "1dyi9nc2q43jf87xiz9xw42irrbla2vyixifdiibh6nm9misnfj0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/preseed-generic-mode";
-          sha256 = "0c0zs07lspwczbcba56fai0rshjzx9zd3jqxgj9nwjf9xlcr8m3j";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/preseed-generic-mode";
+          sha256 = "14vbx6y7h4vqc5kkgj4mbr9zj6gqf6ib3hh2917m203s8y87lsfl";
           name = "preseed-generic-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/preseed-generic-mode";
+          homepage = "https://melpa.org/#/preseed-generic-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -45227,38 +46912,38 @@
         pname = "pretty-lambdada";
         version = "20151231.1748";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/pretty-lambdada.el";
+          url = "https://www.emacswiki.org/emacs/download/pretty-lambdada.el";
           sha256 = "1fn24399wsn12453py0hw2vbbkrkakiwi06cjvjzsdk7g3326ma4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pretty-lambdada";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pretty-lambdada";
           sha256 = "16v5fgifz672c37xyzv557mm6za4rldvdrb26vdymxqg4fy62fd6";
           name = "pretty-lambdada";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pretty-lambdada";
+          homepage = "https://melpa.org/#/pretty-lambdada";
           license = lib.licenses.free;
         };
       }) {};
     pretty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pretty-mode";
-        version = "20141207.1352";
+        version = "20160416.934";
         src = fetchFromGitHub {
           owner = "akatov";
           repo = "pretty-mode";
-          rev = "3e0b88d3db20f89fda2cdce3f54371728dcfd05b";
-          sha256 = "0ccqym98c6zdyrparj5n97bpp9rspxb3z5lqfcrjypp0kn04z1ss";
+          rev = "019c65b25042a202a1374cb8b359d4cfa062cb60";
+          sha256 = "0lrxd87p62s16bcp9r7hj1dnn67mgy2akslq4m9vb0xc7qckwr7y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pretty-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pretty-mode";
           sha256 = "1zxi4nj7vnchiiz1ndx17b719a1wipiqniykzn4pa1w7dsnqg21f";
           name = "pretty-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pretty-mode";
+          homepage = "https://melpa.org/#/pretty-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -45273,13 +46958,13 @@
           sha256 = "1n0594msgy53ia58gjfkm3z3cnmq52wrq5992fm28s4jgazbgdfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pretty-sha-path";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pretty-sha-path";
           sha256 = "0qqsg383391dnsk46xm8plq7xmdmnis3iv7h7dmchpzd99bkm9lq";
           name = "pretty-sha-path";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pretty-sha-path";
+          homepage = "https://melpa.org/#/pretty-sha-path";
           license = lib.licenses.free;
         };
       }) {};
@@ -45294,13 +46979,13 @@
           sha256 = "1f00l9f6an1mh8yhf629mw0p37m4jcpl8giz47xbdyw1k6bqn830";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pretty-symbols";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pretty-symbols";
           sha256 = "0d1ad2x4md0n3fad3s2355wm8hl311qdhih1gkdqwdaj4i1d6gvb";
           name = "pretty-symbols";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pretty-symbols";
+          homepage = "https://melpa.org/#/pretty-symbols";
           license = lib.licenses.free;
         };
       }) {};
@@ -45315,13 +47000,13 @@
           sha256 = "0zng64f5vwnpkf9fk59yv1ndc646q608a6awr1y9qk0mhzbfzhqm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/private";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/private";
           sha256 = "1glpcwcyndyn683q9mg99hr0h3l8pz7rrhbnfak01v826d5cnk9g";
           name = "private";
         };
         packageRequires = [ aes ];
         meta = {
-          homepage = "http://melpa.org/#/private";
+          homepage = "https://melpa.org/#/private";
           license = lib.licenses.free;
         };
       }) {};
@@ -45336,13 +47021,13 @@
           sha256 = "1pxr5a9ik09k0f58lawhxiv179n5j8q24zhrs9vjk93yskl1ydwn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/private-diary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/private-diary";
           sha256 = "0dgnf375c00nlkp66kbkzsf469063l03b9miiplbhd63zshlv1i1";
           name = "private-diary";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/private-diary";
+          homepage = "https://melpa.org/#/private-diary";
           license = lib.licenses.free;
         };
       }) {};
@@ -45357,13 +47042,13 @@
           sha256 = "0nly5h0d6w8dc08ifb2fiqcn4cqcn9crkh2wn0jzlz4zd2x75qrb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/proc-net";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/proc-net";
           sha256 = "0562x2s3kk9vlaavak4lya1nlmn4mwlzlc7nw1l3687q023z4hmv";
           name = "proc-net";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/proc-net";
+          homepage = "https://melpa.org/#/proc-net";
           license = lib.licenses.free;
         };
       }) {};
@@ -45378,13 +47063,13 @@
           sha256 = "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/processing-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/processing-mode";
           sha256 = "184yg9z14ighz9djg53ji5dgnb98dnxkkwx55m8f0f879x31i89m";
           name = "processing-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/processing-mode";
+          homepage = "https://melpa.org/#/processing-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -45399,34 +47084,34 @@
           sha256 = "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/processing-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/processing-snippets";
           sha256 = "09vkm9asmjz1in0f63s7bf4amifspsqf5w9pxiy5y0qvmn28fr2r";
           name = "processing-snippets";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/processing-snippets";
+          homepage = "https://melpa.org/#/processing-snippets";
           license = lib.licenses.free;
         };
       }) {};
     prodigy = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "prodigy";
-        version = "20141109.452";
+        version = "20160420.442";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "prodigy.el";
-          rev = "1f3b5a3309122bae01150738c3d8da910ffbee71";
-          sha256 = "18j0jwp8z4ff7xfiijyh09cvb14mbjfaygin2qjp6bxgx3c1mpin";
+          rev = "983049811a14415583c90f14530b19cdcf448512";
+          sha256 = "0br2nxi4wpla4rwknipv6y5f07wsi0j8f2gs52mxx48wnaiq1q1i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/prodigy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/prodigy";
           sha256 = "032868bgy2wmb2ws48lfibs4118inpna7mmml8m7i4m4y9ll6g85";
           name = "prodigy";
         };
         packageRequires = [ dash emacs f s ];
         meta = {
-          homepage = "http://melpa.org/#/prodigy";
+          homepage = "https://melpa.org/#/prodigy";
           license = lib.licenses.free;
         };
       }) {};
@@ -45441,13 +47126,13 @@
           sha256 = "0hx7rxa3smdippcpj4j63k0r5l4wflllb0vpnwwknc9j93r7042b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/professional-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/professional-theme";
           sha256 = "1l8nisn2c124cpylyahr76hfpdim2125zrns2897p466l5wcxcx5";
           name = "professional-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/professional-theme";
+          homepage = "https://melpa.org/#/professional-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -45462,13 +47147,13 @@
           sha256 = "1szxsbk470fg3jp70r20va9hnnf4jj0mb7kxdkn6rd7ky6w34lwm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/prognth";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/prognth";
           sha256 = "0hr5a3s0ij4hvn424v885z7pcs62yqm9mamw5b096hgjxgjf6ylm";
           name = "prognth";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/prognth";
+          homepage = "https://melpa.org/#/prognth";
           license = lib.licenses.free;
         };
       }) {};
@@ -45483,13 +47168,13 @@
           sha256 = "1yklm43d0ppyf4simhqab6m892z4mmxs2145lzw6kpizixavcv00";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/programmer-dvorak";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/programmer-dvorak";
           sha256 = "1w8r35hkl6qy9a89l0m74x9q2vcc4h2hvmi3r2hqcy2ypkn5l5bv";
           name = "programmer-dvorak";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/programmer-dvorak";
+          homepage = "https://melpa.org/#/programmer-dvorak";
           license = lib.licenses.free;
         };
       }) {};
@@ -45504,13 +47189,13 @@
           sha256 = "04l4m3kxbwvyw9xy6cwakrdxxdswrrs7sya8zn6m738aawbr1mcd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/project-explorer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/project-explorer";
           sha256 = "076lzmyi1n7yrgdgyh9qinq271qk6k64x0msbzarihr3p4psrn8m";
           name = "project-explorer";
         };
         packageRequires = [ cl-lib emacs es-lib es-windows ];
         meta = {
-          homepage = "http://melpa.org/#/project-explorer";
+          homepage = "https://melpa.org/#/project-explorer";
           license = lib.licenses.free;
         };
       }) {};
@@ -45519,17 +47204,17 @@
         pname = "project-local-variables";
         version = "20080502.1152";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/project-local-variables.el";
+          url = "https://www.emacswiki.org/emacs/download/project-local-variables.el";
           sha256 = "1bb5b6hxg3gvwf0sqwkd97nnipsmr60py0rnsfhgvizn4cj3khhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/project-local-variables";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/project-local-variables";
           sha256 = "0mrf7p420rmjm8ydwc5blpxr6299pdg3sy3jwz2zz0420gkp0ihl";
           name = "project-local-variables";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/project-local-variables";
+          homepage = "https://melpa.org/#/project-local-variables";
           license = lib.licenses.free;
         };
       }) {};
@@ -45544,13 +47229,13 @@
           sha256 = "1fvjap0bsyw5q92q50wk8c81yv4g8nqb6jdlnarf80glwk50avrs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/project-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/project-persist";
           sha256 = "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24";
           name = "project-persist";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/project-persist";
+          homepage = "https://melpa.org/#/project-persist";
           license = lib.licenses.free;
         };
       }) {};
@@ -45565,13 +47250,13 @@
           sha256 = "1nq320ph8fs9a197ji4mnw2xa24dld0r1nka476yvkg4azmcc9x8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/project-persist-drawer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/project-persist-drawer";
           sha256 = "1jv2y2hcqakyvfibclzm7g4diw0bvsv3a8fa43yf19wb64jm8hdb";
           name = "project-persist-drawer";
         };
         packageRequires = [ project-persist ];
         meta = {
-          homepage = "http://melpa.org/#/project-persist-drawer";
+          homepage = "https://melpa.org/#/project-persist-drawer";
           license = lib.licenses.free;
         };
       }) {};
@@ -45585,34 +47270,34 @@
           sha256 = "08dd2y6hdsj1rxcqa2hnjypnn9c2z43y7z2hz0fi4vny547qybz8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/project-root";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/project-root";
           sha256 = "0xjir204zk254y2x70k9vqwirx2ljmrikpsgn5kn170d1bxvhwmb";
           name = "project-root";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/project-root";
+          homepage = "https://melpa.org/#/project-root";
           license = lib.licenses.free;
         };
       }) {};
     projectile = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "projectile";
-        version = "20160221.240";
+        version = "20160420.1708";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "7c484a56ef2cce5034f759185f53e47f827b91c2";
-          sha256 = "1lvkpwy17c0d2yqvrf3b6cawzk65k7mwi0qrk30bmbz9mxq3337w";
+          rev = "025bd85b713e79bd8ad3bc3a8ad8ea7e0175ee7e";
+          sha256 = "088jdw031wq1zrxd2rf72hzfhxxzsn2wnkbchibn41a3vr0w19zx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/projectile";
           sha256 = "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn";
           name = "projectile";
         };
         packageRequires = [ dash pkg-info ];
         meta = {
-          homepage = "http://melpa.org/#/projectile";
+          homepage = "https://melpa.org/#/projectile";
           license = lib.licenses.free;
         };
       }) {};
@@ -45627,34 +47312,55 @@
           sha256 = "0ch3naqp3ji0q4blpjfr1xbzgzxhw10h08y2akik96kk1pnkwism";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projectile-codesearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/projectile-codesearch";
           sha256 = "0jgvs9is59q45wh2a7k5sb6vj179ixqgj5dlndj9r6fh59qgrzdk";
           name = "projectile-codesearch";
         };
         packageRequires = [ codesearch projectile ];
         meta = {
-          homepage = "http://melpa.org/#/projectile-codesearch";
+          homepage = "https://melpa.org/#/projectile-codesearch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    projectile-direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, s }:
+    melpaBuild {
+        pname = "projectile-direnv";
+        version = "20160305.1938";
+        src = fetchFromGitHub {
+          owner = "christianromney";
+          repo = "projectile-direnv";
+          rev = "33455b93576855065ba4ba9ed1b05dc36e692f1a";
+          sha256 = "09zyzfqy1i3i8knvh1ajr5jcidjx3jpsyx8qarxfr5kv16pwyfvj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/projectile-direnv";
+          sha256 = "1s5dapdcblcbcqyv8df26v8wxl8bhrs9ybl5h5qbzz49gigd8nqh";
+          name = "projectile-direnv";
+        };
+        packageRequires = [ dash emacs projectile s ];
+        meta = {
+          homepage = "https://melpa.org/#/projectile-direnv";
           license = lib.licenses.free;
         };
       }) {};
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "20160211.1640";
+        version = "20160417.706";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "7fa21453f97801eb44ed45b92e14d6b665387970";
-          sha256 = "1x9jp5bb14gc08irq3dhcn2j6a4kqfp0h3vpriz939dianz580ih";
+          rev = "630976485dbbf21bf27d2f192442a14ea5f8f25e";
+          sha256 = "1q72n08znhbi2v0hd4cnwfhc1y0xc2017cms49d0ay9m6k10wi85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projectile-rails";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/projectile-rails";
           sha256 = "0fgvignqdqh0ma91z9385782l89mvwfn77rp1gmy8cbkwi3b7fkq";
           name = "projectile-rails";
         };
         packageRequires = [ emacs f inf-ruby inflections projectile rake ];
         meta = {
-          homepage = "http://melpa.org/#/projectile-rails";
+          homepage = "https://melpa.org/#/projectile-rails";
           license = lib.licenses.free;
         };
       }) {};
@@ -45669,13 +47375,13 @@
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projectile-sift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/projectile-sift";
           sha256 = "1wbgpwq9yy3v7hqidaczrvvsw5ajj7m3n4gsy3b169xv5h673a0i";
           name = "projectile-sift";
         };
         packageRequires = [ projectile sift ];
         meta = {
-          homepage = "http://melpa.org/#/projectile-sift";
+          homepage = "https://melpa.org/#/projectile-sift";
           license = lib.licenses.free;
         };
       }) {};
@@ -45690,13 +47396,13 @@
           sha256 = "0lr3vx1byf0i9jdzbyrvvzyzi1nfddvw5r9f9wm7gpfp5l8772la";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projectile-speedbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/projectile-speedbar";
           sha256 = "0dli4gzsiycivh8dwa00lfpbimyg42qygfachzrhi8qy5413pwlp";
           name = "projectile-speedbar";
         };
         packageRequires = [ projectile ];
         meta = {
-          homepage = "http://melpa.org/#/projectile-speedbar";
+          homepage = "https://melpa.org/#/projectile-speedbar";
           license = lib.licenses.free;
         };
       }) {};
@@ -45711,13 +47417,13 @@
           sha256 = "0y8zbywin99nhcrs5nzx4d179r84rdy39admajpi0j76v0b9pwl3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projector";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/projector";
           sha256 = "0hrinplk607wcc2ibn05pl8ghikv9f3zvymncp6nz95jw9brdapf";
           name = "projector";
         };
         packageRequires = [ alert cl-lib projectile ];
         meta = {
-          homepage = "http://melpa.org/#/projector";
+          homepage = "https://melpa.org/#/projector";
           license = lib.licenses.free;
         };
       }) {};
@@ -45732,13 +47438,13 @@
           sha256 = "0hvvlh24157qjxz82sbg22d4cbrf95xyx202cybp0n1vyxsmjcmw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/projekt";
           sha256 = "1bhb24701flihl54w8xrj6yxhynpq4dk0fp5ciac7k28n4930lw8";
           name = "projekt";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/projekt";
+          homepage = "https://melpa.org/#/projekt";
           license = lib.licenses.free;
         };
       }) {};
@@ -45753,13 +47459,13 @@
           sha256 = "1sxxy0s96sgm6i743qwjs0qjpsdr03gqc1cddvvpxbryh42vw9jn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projmake-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/projmake-mode";
           sha256 = "192gvmhcz1anl80hpmcjwwd08dljyrap9sk6qj0y85mcnaafm882";
           name = "projmake-mode";
         };
         packageRequires = [ dash indicators ];
         meta = {
-          homepage = "http://melpa.org/#/projmake-mode";
+          homepage = "https://melpa.org/#/projmake-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -45774,13 +47480,13 @@
           sha256 = "1hq8426i8rpb3qzkd5akv3i08pa4jsp9lwsskn38bfgp71pwild2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/prompt-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/prompt-text";
           sha256 = "1b9sj9kzx5ydq2zsfmkwsx78pzg0vsvrn92397js6b2cm24vrwwc";
           name = "prompt-text";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/prompt-text";
+          homepage = "https://melpa.org/#/prompt-text";
           license = lib.licenses.free;
         };
       }) {};
@@ -45795,13 +47501,13 @@
           sha256 = "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/prop-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/prop-menu";
           sha256 = "0dhy52fxxpa058mhhx0slw3sly3dlxm9vkax6fd1sap6f6v00p5i";
           name = "prop-menu";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/prop-menu";
+          homepage = "https://melpa.org/#/prop-menu";
           license = lib.licenses.free;
         };
       }) {};
@@ -45816,13 +47522,13 @@
           sha256 = "0lch20njy248w7bnvgs7jz0zqasskf5dakmykxwpb48llm6kx95v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/propfont-mixed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/propfont-mixed";
           sha256 = "19k0ydpkiviznsngwcqwn4k30r6j8w34pchgpjlsfwq1bndaai9y";
           name = "propfont-mixed";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/propfont-mixed";
+          homepage = "https://melpa.org/#/propfont-mixed";
           license = lib.licenses.free;
         };
       }) {};
@@ -45837,13 +47543,13 @@
           sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/prosjekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/prosjekt";
           sha256 = "1fn7ii1bq7bjkz27hihclpvx0aabgwy3kv47r9qibjl2jin97rck";
           name = "prosjekt";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/prosjekt";
+          homepage = "https://melpa.org/#/prosjekt";
           license = lib.licenses.free;
         };
       }) {};
@@ -45854,38 +47560,38 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "32daf513ced8d51e8de6cc8d800cfc972c4df5d6";
-          sha256 = "03mi6g58y9j9pqrh8qjygcv20f3q58cry4phv5q6807rxj4q2hpf";
+          rev = "40574479978f80bd86caf44edae5b0a22d596c79";
+          sha256 = "10058qk9jz9810s7ak2cbbjhyl4q0qp1qh0rznrwqc0ixsql78kl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/protobuf-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/protobuf-mode";
           sha256 = "1hh0w93fg6mfwsbb9wvp335ry8kflj50k8hybchpjcn6f4x39xsj";
           name = "protobuf-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/protobuf-mode";
+          homepage = "https://melpa.org/#/protobuf-mode";
           license = lib.licenses.free;
         };
       }) {};
     psc-ide = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "psc-ide";
-        version = "20160203.1732";
+        version = "20160408.1353";
         src = fetchFromGitHub {
           owner = "epost";
           repo = "psc-ide-emacs";
-          rev = "43552df23d65a6ef9bf410c0fa992c9d2342fc67";
-          sha256 = "0awlkvbll2cxc9rzzm1ln5qhp05jikihcay1wz74dkwzwlfjlp17";
+          rev = "02e83f506ebc9212b852dcf36e867b3ddf842e5b";
+          sha256 = "1q30jvml32claqa259zzfrpdpjcv1m4al3gq5pfcj5x0wcckm2k7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/psc-ide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/psc-ide";
           sha256 = "1f8bphrbksz7si9flyhz54brb7w1lcz19pmn92hjwx7kd4nl18i9";
           name = "psc-ide";
         };
         packageRequires = [ cl-lib company dash s ];
         meta = {
-          homepage = "http://melpa.org/#/psc-ide";
+          homepage = "https://melpa.org/#/psc-ide";
           license = lib.licenses.free;
         };
       }) {};
@@ -45900,13 +47606,13 @@
           sha256 = "08j31bg5vwgirv5n5fsw7w6gncrkpwpjlj2m00dhj8wbvhp503sn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/psci";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/psci";
           sha256 = "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g";
           name = "psci";
         };
         packageRequires = [ dash deferred f purescript-mode s ];
         meta = {
-          homepage = "http://melpa.org/#/psci";
+          homepage = "https://melpa.org/#/psci";
           license = lib.licenses.free;
         };
       }) {};
@@ -45921,13 +47627,13 @@
           sha256 = "1b8w9wnrwk4j2gn543phz9qp8813ksqakr5pi509m6ijwcv0cp7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/psession";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/psession";
           sha256 = "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a";
           name = "psession";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/psession";
+          homepage = "https://melpa.org/#/psession";
           license = lib.licenses.free;
         };
       }) {};
@@ -45942,34 +47648,34 @@
           sha256 = "1jz1g0igpnsjn2r144205bffj10iyp8izm8678mzkhnricxkn0d6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/psvn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/psvn";
           sha256 = "1wdww25pjla7c8zf04mvgia1ws8cal9rb7z8g3vn2s3gp68py12n";
           name = "psvn";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/psvn";
+          homepage = "https://melpa.org/#/psvn";
           license = lib.licenses.free;
         };
       }) {};
     psysh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "psysh";
-        version = "20160123.958";
+        version = "20160423.336";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "psysh.el";
-          rev = "14fa252628009463f05fdf573c23e166536d3b76";
-          sha256 = "1q8fk25qwnnm9z1zcf9f1k3b060lk6g6f16c8db90psp6za0xdwz";
+          rev = "be170b6050bed30c76721e424c8003055de7dbe4";
+          sha256 = "0mnxvh5yd8v8a5mfi53isknc88kv2kdjjv0qffblz0sgshkpl30x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/psysh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/psysh";
           sha256 = "0ygnfmfx1ifppg6j3vfz10srbcpr5ird2bhw6pvydijxkyd75vy5";
           name = "psysh";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/psysh";
+          homepage = "https://melpa.org/#/psysh";
           license = lib.licenses.free;
         };
       }) {};
@@ -45984,34 +47690,34 @@
           sha256 = "0ca8j7xlqxbidqfz2iarwn7qq4v12pwvsq6vzj2473n2g1c09xzj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pt";
           sha256 = "0zmz1hcr4ajc2ydvpdxhy1dlhp7hvlkv6y6w1b79ffvq6acdd5mj";
           name = "pt";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pt";
+          homepage = "https://melpa.org/#/pt";
           license = lib.licenses.free;
         };
       }) {};
     puml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "puml-mode";
-        version = "20151212.1023";
+        version = "20160324.1725";
         src = fetchFromGitHub {
           owner = "skuro";
           repo = "puml-mode";
-          rev = "966064f37164800cd2c9891387ffcd10339b7137";
-          sha256 = "024g793y6vqhk5h6vqjv5hljvfyb0j6b6j51fjhijgdxmqhlk9vm";
+          rev = "463aa0d54b5568189e6e93eafb98612ce0b11bbc";
+          sha256 = "1bwlkv87nxqrdvq3682x5jqxhhiya2wjp3162mh801pnglaw1mv4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/puml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/puml-mode";
           sha256 = "131ghjq6lsbhbx5hdg36swnkqijdb9bx6zg73hg0nw8qk0z742vn";
           name = "puml-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/puml-mode";
+          homepage = "https://melpa.org/#/puml-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -46026,13 +47732,13 @@
           sha256 = "1bkkgs2agy00wivilljkj3a9fsb2ba935icjmhbk46zjc6yf3y6q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/punctuality-logger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/punctuality-logger";
           sha256 = "0q9s74hkfqvcx67xpq9rlvh38nyjnz230bll6ks7y5yzxvl4qhcm";
           name = "punctuality-logger";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/punctuality-logger";
+          homepage = "https://melpa.org/#/punctuality-logger";
           license = lib.licenses.free;
         };
       }) {};
@@ -46047,34 +47753,55 @@
           sha256 = "1viw95y6fha782n1jw7snr7xc00iyf94r4whsm1a2q11vm2d1h21";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pungi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pungi";
           sha256 = "1v9fsd764z5wdcips63z53rcipdz7bha4q6s4pnn114jn3a93ls1";
           name = "pungi";
         };
         packageRequires = [ jedi pyvenv ];
         meta = {
-          homepage = "http://melpa.org/#/pungi";
+          homepage = "https://melpa.org/#/pungi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    punpun-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "punpun-theme";
+        version = "20160324.1245";
+        src = fetchFromGitHub {
+          owner = "wasamasa";
+          repo = "punpun-theme";
+          rev = "00eac7d50f4fc4702a375ca6ed39df395cb140e8";
+          sha256 = "1qqfv5qn336p6yk5fydphqpnp0p1ar6185ph2la32vy26k44nahd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/punpun-theme";
+          sha256 = "1l7nphh8v7w5w790cwmnp6nw5rciwhgzkvynkrvpiv9chhacx0xg";
+          name = "punpun-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/punpun-theme";
           license = lib.licenses.free;
         };
       }) {};
     puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "puppet-mode";
-        version = "20150730.1408";
+        version = "20160416.1136";
         src = fetchFromGitHub {
           owner = "lunaryorn";
           repo = "puppet-mode";
-          rev = "268ec790603a4121f62822ca6c26e9038a1b0375";
-          sha256 = "11mkf9gvjz63szdvhwlqnd6j2r9ij2fh8l6zkf7hl2zlwyyivcmp";
+          rev = "3321cd25f742bcb4466f4a736d936e9da773a83c";
+          sha256 = "1ly7gkxlkfgx3nzw35f7rwx7x9w6jrhql15jgsrh9slcw3q2rksl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/puppet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/puppet-mode";
           sha256 = "1s2hap6fs6rg5q80dmzhaf4qqaf5sglhs8p896i3i5hq51w0ciyc";
           name = "puppet-mode";
         };
         packageRequires = [ emacs pkg-info ];
         meta = {
-          homepage = "http://melpa.org/#/puppet-mode";
+          homepage = "https://melpa.org/#/puppet-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -46089,13 +47816,13 @@
           sha256 = "0k2plyvd6842yryzrfadbf4h7a9hrjvkcvixclbca2bkvfik3864";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/purescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/purescript-mode";
           sha256 = "00gz752mh7144nsaka5q3q4681jp845kc5vcy2nbfnqp9b24l55m";
           name = "purescript-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/purescript-mode";
+          homepage = "https://melpa.org/#/purescript-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -46110,13 +47837,13 @@
           sha256 = "15myw5rkbnnpgzpiipm5xl4cyzymv8hh66x9al4aalb5nf52dckc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/purple-haze-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/purple-haze-theme";
           sha256 = "0ld8k53823786y6f0dqcp0hlqlnmy323vdkanjfs5wg5ib60az1m";
           name = "purple-haze-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/purple-haze-theme";
+          homepage = "https://melpa.org/#/purple-haze-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -46125,19 +47852,19 @@
         pname = "purty-mode";
         version = "20131004.1759";
         src = fetchFromGitHub {
-          owner = "hackscience";
+          owner = "jcatw";
           repo = "purty-mode";
           rev = "8eef77317a3bab07ade212353a50fbd3f20f365a";
           sha256 = "0qm2xv762cz196aqs445crqrmsks8hpwzpaykzn0chlvdk0m5cv1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/purty-mode";
-          sha256 = "1ackqv95sdphbsjwydbc4dmdzwpaj74v329f55zcwa8hn3li9d5m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/purty-mode";
+          sha256 = "0gbbwl5kg74jf1i1zsr40zg3gw43qmz1l87k0r578v1xvyqmhm1i";
           name = "purty-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/purty-mode";
+          homepage = "https://melpa.org/#/purty-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -46152,13 +47879,13 @@
           sha256 = "03ivg3ddhy5zh410wgwxa17m98wywqhk62jgijhjd00b6l8i4aym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pushbullet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pushbullet";
           sha256 = "1swzl25rcw7anl7q099qh14yhnwlbn3m20ib9kis0l1rv59kkarl";
           name = "pushbullet";
         };
         packageRequires = [ grapnel json ];
         meta = {
-          homepage = "http://melpa.org/#/pushbullet";
+          homepage = "https://melpa.org/#/pushbullet";
           license = lib.licenses.free;
         };
       }) {};
@@ -46173,13 +47900,13 @@
           sha256 = "10g4imxgpv7a0j40qkx7xf2qnyz80ypd0mv0lf47n9dwln5byln3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/px";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/px";
           sha256 = "0xjmz18m2dslh6yq5z32r43zq3svfxn8mhrfbmihglyv2mkwxw44";
           name = "px";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/px";
+          homepage = "https://melpa.org/#/px";
           license = lib.licenses.free;
         };
       }) {};
@@ -46194,13 +47921,13 @@
           sha256 = "1iw94m1bvsmadlj16f8ymwx0q6f9lqysy7by76hkpiwqqhd2i8rv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/py-autopep8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/py-autopep8";
           sha256 = "1argjdmh0x9c90zkb6cr4z3zkpgjp2mkpsw0dr4v6gg83jcggfpp";
           name = "py-autopep8";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/py-autopep8";
+          homepage = "https://melpa.org/#/py-autopep8";
           license = lib.licenses.free;
         };
       }) {};
@@ -46215,13 +47942,13 @@
           sha256 = "05803wi7rj73sy9ihkilr6pcn72szfsvgf2dgbdpnqra508rxyb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/py-gnitset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/py-gnitset";
           sha256 = "0f6ivq4ignb4gfxw2q8qvigvv3fbvvyr87x25wcaz6yipg1lr18r";
           name = "py-gnitset";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/py-gnitset";
+          homepage = "https://melpa.org/#/py-gnitset";
           license = lib.licenses.free;
         };
       }) {};
@@ -46236,13 +47963,13 @@
           sha256 = "1416hbc64gwn9c8g9lxfx58w60ysi0x8rbps6mfxalavdhbs20sv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/py-import-check";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/py-import-check";
           sha256 = "1261dki0q44sw9h0g1305i2fj1dg9xgwzry50jbn2idcrqg4xf7k";
           name = "py-import-check";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/py-import-check";
+          homepage = "https://melpa.org/#/py-import-check";
           license = lib.licenses.free;
         };
       }) {};
@@ -46257,13 +47984,13 @@
           sha256 = "0150q6xcnzzrkn9fa9njm973l1d49c48ad8qia71k4jwrxjjj6zr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/py-isort";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/py-isort";
           sha256 = "0k5gn3bjn5pv6dn6p0m9xghn0sx3m29bj3pfrmyh6gd5ic0l00yb";
           name = "py-isort";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/py-isort";
+          homepage = "https://melpa.org/#/py-isort";
           license = lib.licenses.free;
         };
       }) {};
@@ -46278,13 +48005,13 @@
           sha256 = "05gi17n488r2n6x33nj4a23ci89c9smsbanmap4i302dy0mnmwgd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/py-smart-operator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/py-smart-operator";
           sha256 = "1n0bdr9z2s1ikhmfz642k94gjzb88anwlb61mh27ay8wqdgm74c4";
           name = "py-smart-operator";
         };
         packageRequires = [ s ];
         meta = {
-          homepage = "http://melpa.org/#/py-smart-operator";
+          homepage = "https://melpa.org/#/py-smart-operator";
           license = lib.licenses.free;
         };
       }) {};
@@ -46299,13 +48026,13 @@
           sha256 = "1s39407z3rxz10r5sshv2vj7s23ylkhg59ixasgnpjk82gl4igpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/py-test";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/py-test";
           sha256 = "1mbwbzg606winf5af7qkg6a1hg79lc7k2miq4d3mwih496l5sinb";
           name = "py-test";
         };
         packageRequires = [ dash emacs f ];
         meta = {
-          homepage = "http://melpa.org/#/py-test";
+          homepage = "https://melpa.org/#/py-test";
           license = lib.licenses.free;
         };
       }) {};
@@ -46320,13 +48047,13 @@
           sha256 = "09z739w4fjg9xnv3mbh7v8j59mnbsfq4ygq616pj4xcw3nsh0rbg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/py-yapf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/py-yapf";
           sha256 = "1381x0ffpllxwgkr2d8xxbv1nd4k475m1aff8l5qijw7d1fqga2f";
           name = "py-yapf";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/py-yapf";
+          homepage = "https://melpa.org/#/py-yapf";
           license = lib.licenses.free;
         };
       }) {};
@@ -46341,34 +48068,55 @@
           sha256 = "09glwrb9q65qdm4yd0mbi5hwdy2434zm8699ywhs6hqpjacadlmi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pycarddavel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pycarddavel";
           sha256 = "12k2mnzkd8yv17csfhclsnd479vcabawmac23yw6dsw7ic53jf1a";
           name = "pycarddavel";
         };
         packageRequires = [ emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/pycarddavel";
+          homepage = "https://melpa.org/#/pycarddavel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pycoverage = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pycoverage";
+        version = "20160324.2012";
+        src = fetchFromGitHub {
+          owner = "mattharrison";
+          repo = "pycoverage.el";
+          rev = "dbc152a807efcaac4e50bedb64c026674009a279";
+          sha256 = "0qap6iz865l43mixga7541c2z9kdx8zkkdcgdlgn6n8pyv8iz7qs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pycoverage";
+          sha256 = "1jaanmpnawk0r6zfzx18crqml7lv412l2l0iabp345xvfvsh8h1m";
+          name = "pycoverage";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/pycoverage";
           license = lib.licenses.free;
         };
       }) {};
     pydoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pydoc";
-        version = "20150525.2045";
+        version = "20160403.1933";
         src = fetchFromGitHub {
           owner = "statmobile";
           repo = "pydoc";
-          rev = "74fb1a66e9d81661ddd371a03e916ea5e0b01dc8";
-          sha256 = "1q9fmdrnsqmisykndxzy9bvjl6n1rsmfgvh3h8fkg6b44ypcyyw7";
+          rev = "6fa87463b6eb4e951c4b8d53f7093fb072b0afd7";
+          sha256 = "0vg06snvy3rq5jgnb2xj3sp71mjmpsp1d9cn2vqvahpgpa05c968";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pydoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pydoc";
           sha256 = "0sf52cb80yiridsl1pffdr3wpbgxrn2l8vnq03l70djckild477n";
           name = "pydoc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pydoc";
+          homepage = "https://melpa.org/#/pydoc";
           license = lib.licenses.free;
         };
       }) {};
@@ -46382,13 +48130,13 @@
           sha256 = "1mzyr6yznkyv99x9q8zx2f270ngjh8s94zvnhcbhidi57inpd1nh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pydoc-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pydoc-info";
           sha256 = "0l80g0rzkk3a1wrw2riiywz9wdyxwr5i64jb2h5r8alp9qq1k7mf";
           name = "pydoc-info";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pydoc-info";
+          homepage = "https://melpa.org/#/pydoc-info";
           license = lib.licenses.free;
         };
       }) {};
@@ -46403,13 +48151,13 @@
           sha256 = "049wgwygdaa0p8p4pl37wkc06nam9ph17i9gzcg7w0hfwghjrc5j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pyenv-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pyenv-mode";
           sha256 = "00yqrk92knv9gq1m9xcg78gavv70jsjlwzkllzxl63iva9qrch59";
           name = "pyenv-mode";
         };
         packageRequires = [ pythonic ];
         meta = {
-          homepage = "http://melpa.org/#/pyenv-mode";
+          homepage = "https://melpa.org/#/pyenv-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -46424,13 +48172,13 @@
           sha256 = "1sclhzv3w9fg54dg4qhlfbc0p1z5clyr8phrckhypvlwfgbar4b4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pyenv-mode-auto";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pyenv-mode-auto";
           sha256 = "1l7h4fas1vshkh4skxzpw7v2a11s1hwnb20n6a81yh701pbikqnd";
           name = "pyenv-mode-auto";
         };
         packageRequires = [ f pyenv-mode s ];
         meta = {
-          homepage = "http://melpa.org/#/pyenv-mode-auto";
+          homepage = "https://melpa.org/#/pyenv-mode-auto";
           license = lib.licenses.free;
         };
       }) {};
@@ -46445,13 +48193,13 @@
           sha256 = "1rp8zchvclh29rl9a1i82pcqghnhpaqnppaydxc2qx23y9pdgz9i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pyfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pyfmt";
           sha256 = "112kjsp763c2plhqlhydpngrabhc58ya7cszvi4119xqw2s699g6";
           name = "pyfmt";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pyfmt";
+          homepage = "https://melpa.org/#/pyfmt";
           license = lib.licenses.free;
         };
       }) {};
@@ -46466,13 +48214,13 @@
           sha256 = "05qx1p19dw3nr264shihfn33k579hd0wf4cxki5cqrxi7xzpjgrc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pyimpsort";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pyimpsort";
           sha256 = "0kdk3bmryfzvwf8vshfszbih8mwncf4xlb0n0n0yjn0p1n98q99k";
           name = "pyimpsort";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/pyimpsort";
+          homepage = "https://melpa.org/#/pyimpsort";
           license = lib.licenses.free;
         };
       }) {};
@@ -46483,38 +48231,38 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "b3f6242886a82f5723f584e6743f3c3e188e0c32";
-          sha256 = "0vl60jr7zfv74psngin95qq0ykx0zxxzsdqi78ankarylzzxb0wp";
+          rev = "2b9afbb95722ef3b76c0649c01a2d8066f812327";
+          sha256 = "1b7rqhjw3xkmpb5zwhf9l5gflwn4qc1mpdn3qmfhmqw7yx2z4dwd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pylint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pylint";
           sha256 = "1138a8dn9y4ypbphs1zfvr8gr4vdjcy0adsl4xfbgsls4kcdwpxx";
           name = "pylint";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pylint";
+          homepage = "https://melpa.org/#/pylint";
           license = lib.licenses.free;
         };
       }) {};
     pytest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "pytest";
-        version = "20151104.2325";
+        version = "20160330.847";
         src = fetchFromGitHub {
           owner = "ionrock";
           repo = "pytest-el";
-          rev = "71bd43c4eb7254d05104ec1bcca7851d7a203da3";
-          sha256 = "1nlybqvy64lc0c65j9wbk4lx932lz0b8hxw8zm1vgmqppqcyn0p5";
+          rev = "b3574f81c372ebf84a1f9092187c6611d374410c";
+          sha256 = "0bg8pqqia9l39ac3s9xrnlyrg1pj2w00vc742qpjdk5349lazdl6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pytest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pytest";
           sha256 = "0ssib65wa20h8r6156f392l481vns5fcax6w70hcawmn84nficdh";
           name = "pytest";
         };
         packageRequires = [ s ];
         meta = {
-          homepage = "http://melpa.org/#/pytest";
+          homepage = "https://melpa.org/#/pytest";
           license = lib.licenses.free;
         };
       }) {};
@@ -46529,13 +48277,13 @@
           sha256 = "1cnjdgw3x6yb5k06z57xifywlg0kdx9ai4f1ajc0wx9aax8r5gav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/python-cell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/python-cell";
           sha256 = "07i3vyci52jvslq28djwkgx1r157wvxd99rvqlxnmmsl5yj4k1jf";
           name = "python-cell";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/python-cell";
+          homepage = "https://melpa.org/#/python-cell";
           license = lib.licenses.free;
         };
       }) {};
@@ -46550,13 +48298,13 @@
           sha256 = "1qckn5bi1ib54hgqbym5qqwzvbv70ria1w3c2x543xlr0l7zga6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/python-django";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/python-django";
           sha256 = "02whx8g8r02mzng7d7bnbkz5n7gyzp5hcnmvd6a3lq106c0h7w9k";
           name = "python-django";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/python-django";
+          homepage = "https://melpa.org/#/python-django";
           license = lib.licenses.free;
         };
       }) {};
@@ -46571,13 +48319,13 @@
           sha256 = "07nnj2rkpcfad8m9pynai1a3w5k9zazl1xpgm2mldy162snrwpql";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/python-docstring";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/python-docstring";
           sha256 = "1vi30y71vflsbprp5j4phbp7x1j24vxn9d6sifaddari0g0zxpfw";
           name = "python-docstring";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/python-docstring";
+          homepage = "https://melpa.org/#/python-docstring";
           license = lib.licenses.free;
         };
       }) {};
@@ -46592,13 +48340,13 @@
           sha256 = "0q6bib9nr6xiq6npzbngyfcjk87yyvwzq1zirr3z1h5wadm34lsk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/python-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/python-environment";
           sha256 = "1pq16rddw76ic5d02j5bswl9qcydi47hqmhs7r06jk46vsfzxpl7";
           name = "python-environment";
         };
         packageRequires = [ deferred ];
         meta = {
-          homepage = "http://melpa.org/#/python-environment";
+          homepage = "https://melpa.org/#/python-environment";
           license = lib.licenses.free;
         };
       }) {};
@@ -46613,55 +48361,55 @@
           sha256 = "0zk6014dzfrb3y3nhs890x082xf044w0a8nmy6rlrj375lvhfn99";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/python-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/python-info";
           sha256 = "0kvpz1r2si94rs1iajn1ffmx7a5bgyjnzri36ajdgd5gcgh41dhy";
           name = "python-info";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/python-info";
+          homepage = "https://melpa.org/#/python-info";
           license = lib.licenses.free;
         };
       }) {};
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20160217.708";
+        version = "20160425.1227";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "3e3ef05f0533647bf21ccd9826b8dc61848c48ff";
-          sha256 = "0mf0w4jx3w91b57q989fi06f0r9km8nypsgbmqx03ljxv5i3pdhi";
+          rev = "9e115cd8e75e4790a14974ca705826d811eadb3a";
+          sha256 = "0lml6lmnc40qcc1yd41asqwd85a5h3das4s9777qaywclg4wjms5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/python-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/python-mode";
           sha256 = "1m7c6c97xpr5mrbyzhcl2cy7ykdz5yjj90mrakd4lknnsbcq205k";
           name = "python-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/python-mode";
+          homepage = "https://melpa.org/#/python-mode";
           license = lib.licenses.free;
         };
       }) {};
     python-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }:
     melpaBuild {
         pname = "python-x";
-        version = "20160219.956";
+        version = "20160313.836";
         src = fetchFromGitHub {
           owner = "wavexx";
           repo = "python-x.el";
-          rev = "8b7446fb30c9f217e3e7cca06a20c3dac63b7824";
-          sha256 = "0hzx7v49j1xvn2k1hpql455i63s2rcd6nyjr1ni2ns5vi0pgb6ym";
+          rev = "852ca78c70c22fc76f0cb15d57046d510e295ba6";
+          sha256 = "1shz8qha2cqv89hz27aazwd6qbf4qnz17h6hh8in5qxgfsndi7pp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/python-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/python-x";
           sha256 = "115mvhqfa0fa8kdk64biba7ri4xjk74qqi6vm1a5z3psam9mjcmn";
           name = "python-x";
         };
         packageRequires = [ cl-lib folding python ];
         meta = {
-          homepage = "http://melpa.org/#/python-x";
+          homepage = "https://melpa.org/#/python-x";
           license = lib.licenses.free;
         };
       }) {};
@@ -46676,13 +48424,13 @@
           sha256 = "1w29l4zyvcchjdywz2py95qq7bszhldpga2ng75g7p07pq7f2w1p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/python3-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/python3-info";
           sha256 = "1hma8sphxk95m25s56adgyk7d4blsc02gq5a7vw1pawwvxm2qlz3";
           name = "python3-info";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/python3-info";
+          homepage = "https://melpa.org/#/python3-info";
           license = lib.licenses.free;
         };
       }) {};
@@ -46697,34 +48445,34 @@
           sha256 = "16sp3mg5jzx89lgr3kr61fqw1p9gc5zxq2mi9rpgqi5hkkcpnpgj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pythonic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pythonic";
           sha256 = "1hq0r3vg8vmgw89wfjdqknwm76pimlk0dy56wmh9vffh06gqsb51";
           name = "pythonic";
         };
         packageRequires = [ cl-lib dash emacs f s ];
         meta = {
-          homepage = "http://melpa.org/#/pythonic";
+          homepage = "https://melpa.org/#/pythonic";
           license = lib.licenses.free;
         };
       }) {};
     pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pyvenv";
-        version = "20160108.228";
+        version = "20160413.256";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "pyvenv";
-          rev = "0a79b926f030a1737f8dec40fb877208f1eb7bea";
-          sha256 = "1llm8vlmwkhdnr07xgcjx59d4na96kkhmfncww6rqkfc5i6zfarm";
+          rev = "d8121a1c31cbae6fe39a44378629d8905deaa14e";
+          sha256 = "19q0hlhnjz77akax01cwbib7b71f8magd3k0nqdlg2p3xm8g07l8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pyvenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pyvenv";
           sha256 = "0gai9idss1wvryxyqk3pv854mc2xg9hd0r55r2blql8n5rd2yv8v";
           name = "pyvenv";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pyvenv";
+          homepage = "https://melpa.org/#/pyvenv";
           license = lib.licenses.free;
         };
       }) {};
@@ -46739,13 +48487,13 @@
           sha256 = "0ggivlaj29rbbhkjpf3bf7vr96xjzffas0sf5m54qh6nyz6nnha5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/qiita";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/qiita";
           sha256 = "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl";
           name = "qiita";
         };
         packageRequires = [ helm markdown-mode ];
         meta = {
-          homepage = "http://melpa.org/#/qiita";
+          homepage = "https://melpa.org/#/qiita";
           license = lib.licenses.free;
         };
       }) {};
@@ -46760,34 +48508,34 @@
           sha256 = "1mlka59gyylj4cabi1b552h11qx54kjqwx3bkmsdngjrd4da222a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/qml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/qml-mode";
           sha256 = "123mlibviplzra558x87da4zx0kpbhsgfigjjgjgp3mdg897084n";
           name = "qml-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/qml-mode";
+          homepage = "https://melpa.org/#/qml-mode";
           license = lib.licenses.free;
         };
       }) {};
     quack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "quack";
-        version = "20130126.1823";
+        version = "20160410.407";
         src = fetchFromGitHub {
           owner = "emacsmirror";
           repo = "quack";
-          rev = "ce00cb151dde121e156c9543949d088d5ddafdbb";
-          sha256 = "0q7krn16dja0ifnc8h587lh5nilwbixxgsh5179clx5l57naix62";
+          rev = "c1c8e448d295cc1b5752104a63a5759a9c5fdf6d";
+          sha256 = "0vhzwr2adkprjibi3x4lnsvjxishysma7fhpwzgg28l21qjqc0nm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/quack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/quack";
           sha256 = "1l7jw8sx2llbzp3sg5755qdhhyq8jdaggxzzn7icjxxrmj1ji6ii";
           name = "quack";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/quack";
+          homepage = "https://melpa.org/#/quack";
           license = lib.licenses.free;
         };
       }) {};
@@ -46798,38 +48546,38 @@
         src = fetchFromGitHub {
           owner = "lbolla";
           repo = "emacs-quasi-monochrome";
-          rev = "b2456aaa71b51d4f9b06c5dfb529e60732574fc7";
-          sha256 = "09vw8nf9yj3v2ks25n39fbn2qk1fld0hmaq1dpzaqsavsbd4dwc1";
+          rev = "cc363fc72b6824122aadf6b7d27dfeac38f61901";
+          sha256 = "0y7mdizx6km3000cqjrirlgwzkq56asnzl8n1bl56pk5d9grfx9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/quasi-monochrome-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/quasi-monochrome-theme";
           sha256 = "0h5pqrklyga40jg8qc47lwmf8khn0vcs5jx2sdycl2ipy0ikmfs0";
           name = "quasi-monochrome-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/quasi-monochrome-theme";
+          homepage = "https://melpa.org/#/quasi-monochrome-theme";
           license = lib.licenses.free;
         };
       }) {};
     quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build }:
     melpaBuild {
         pname = "quelpa";
-        version = "20160220.919";
+        version = "20160325.829";
         src = fetchFromGitHub {
           owner = "quelpa";
           repo = "quelpa";
-          rev = "a5349ea2d11c046b1834b7bae29e90b26b2003d2";
-          sha256 = "1gmxyhv47yjyaik7bkxl8ndziz2ls5qpij8nz18ynx7s521hm3hj";
+          rev = "867c5c1ba65ef977fe69760d6baf17379a894d40";
+          sha256 = "0l9wrx93pf6638fny1qa6a25hs15dpb0mklxcaz2l9bd7r7sx8ri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/quelpa";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/quelpa";
           sha256 = "1g53fcy837hpyn9lnmmri0h4c5va61vszhblz4caadqq265hknvs";
           name = "quelpa";
         };
         packageRequires = [ emacs package-build ];
         meta = {
-          homepage = "http://melpa.org/#/quelpa";
+          homepage = "https://melpa.org/#/quelpa";
           license = lib.licenses.free;
         };
       }) {};
@@ -46844,13 +48592,13 @@
           sha256 = "00wnvyw2daiwwd1jyq1ag5jsws8k8jxs3lsj73dagbvqnlywmkm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/quelpa-use-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/quelpa-use-package";
           sha256 = "0p09w419kldgl913hgqfzyv2pck27vqq2i1xsx7g29biwgnp9hl9";
           name = "quelpa-use-package";
         };
         packageRequires = [ emacs quelpa use-package ];
         meta = {
-          homepage = "http://melpa.org/#/quelpa-use-package";
+          homepage = "https://melpa.org/#/quelpa-use-package";
           license = lib.licenses.free;
         };
       }) {};
@@ -46865,13 +48613,13 @@
           sha256 = "0kh63nzdzwxksn2ar2i1ds7n96jga2dhhc9gg27p1g2ca66fs6h5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/quick-buffer-switch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/quick-buffer-switch";
           sha256 = "1fsnha3x3pgq582libb3dmxb93aagv1avnc0rigpfd7hv6bagj40";
           name = "quick-buffer-switch";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/quick-buffer-switch";
+          homepage = "https://melpa.org/#/quick-buffer-switch";
           license = lib.licenses.free;
         };
       }) {};
@@ -46886,55 +48634,55 @@
           sha256 = "1cp3z05qjy7qvjjv105ws1j9qykx8sl4s13xff0ijwvjza6ga44c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/quick-preview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/quick-preview";
           sha256 = "18janbmhbwb6a46fgc1sxl9ww591v60y3wgh2wqh62vdy4ix3bd9";
           name = "quick-preview";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/quick-preview";
+          homepage = "https://melpa.org/#/quick-preview";
           license = lib.licenses.free;
         };
       }) {};
     quickref = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "quickref";
-        version = "20130113.1700";
+        version = "20160326.1136";
         src = fetchFromGitHub {
           owner = "pd";
           repo = "quickref.el";
-          rev = "cfedf98c6b8b679b93296f7436e1fb4c2cc7ad25";
-          sha256 = "1i7qqpqdwifd6vxpyyxyzq0b3wc82r7pqcw07bj0x2lhrjnqrxby";
+          rev = "9cad569c6eaeacf0b393a2c520ba444f6521ff38";
+          sha256 = "13svdvww8dbv75lg66xhca6xi08k7k44rsx2ckdf82j9i52y5lw6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/quickref";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/quickref";
           sha256 = "0jahi84ra9g7h0cvz3c02zkbkknrzgv48zq32n72lkxl958swqn1";
           name = "quickref";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/quickref";
+          homepage = "https://melpa.org/#/quickref";
           license = lib.licenses.free;
         };
       }) {};
     quickrun = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "quickrun";
-        version = "20160216.816";
+        version = "20160307.518";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-quickrun";
-          rev = "fe23f324b0198f8827cc0768e8507a02194eec68";
-          sha256 = "1iypwvdgdh30c9br7jnibgwbdca2mqjy95x2ppsc51sik2mz2db1";
+          rev = "ce788ae2272f00aec4740f8507807117163f803b";
+          sha256 = "0czmv7bdsayckg854jfpmaqs4qj9pdhhn0gsqkfa510d7qz032bj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/quickrun";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/quickrun";
           sha256 = "0f989d6niw6ghf9mq454kqyp0gy7gj34vx5l6krwc52agckyfacy";
           name = "quickrun";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/quickrun";
+          homepage = "https://melpa.org/#/quickrun";
           license = lib.licenses.free;
         };
       }) {};
@@ -46949,34 +48697,34 @@
           sha256 = "0dhljmdlg4p832w9s7rp8vznkpjkwpg8k9hj95cn2h76c0afwz3j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/r-autoyas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/r-autoyas";
           sha256 = "18zifadsgbwnga205jvpx61wa2dvjxmxs5v7cjqhny45a524nbv4";
           name = "r-autoyas";
         };
         packageRequires = [ ess yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/r-autoyas";
+          homepage = "https://melpa.org/#/r-autoyas";
           license = lib.licenses.free;
         };
       }) {};
     racer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }:
     melpaBuild {
         pname = "racer";
-        version = "20160120.1429";
+        version = "20160419.1625";
         src = fetchFromGitHub {
           owner = "racer-rust";
           repo = "emacs-racer";
-          rev = "0d605b943a71279396c5a6251fac63498a91363c";
-          sha256 = "197llsjhxjvk5wp6iz3siyv3911y82r08s9bavma3dgzj2s978s6";
+          rev = "49743e6d840261cd1985d9eef2dbf9451c6e8638";
+          sha256 = "1d128mamvwpjnk2dazhcxvfjw3lf0ix56l85gwsb377v05pn3wzf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/racer";
           sha256 = "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi";
           name = "racer";
         };
         packageRequires = [ dash emacs rust-mode s ];
         meta = {
-          homepage = "http://melpa.org/#/racer";
+          homepage = "https://melpa.org/#/racer";
           license = lib.licenses.free;
         };
       }) {};
@@ -46991,13 +48739,13 @@
           sha256 = "1clpwjnph2ygmkn4r98wv3nxkvw4hg6nc01xph517lc7n15a3vri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/racket-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/racket-mode";
           sha256 = "04sr55zrgwyi48sj4ssm4rmm327yxs7hvjhxclnkhaaigrmrv7jb";
           name = "racket-mode";
         };
         packageRequires = [ emacs faceup s ];
         meta = {
-          homepage = "http://melpa.org/#/racket-mode";
+          homepage = "https://melpa.org/#/racket-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -47012,13 +48760,13 @@
           sha256 = "00x09vjd3jz5f73qkf5v1y402zn8vl8dsyfwlq9z646p18ba7gyh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/railgun";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/railgun";
           sha256 = "1a3fplfipk1nv3py1sy0p2adf3w1h4api01h2j5rjlq2jw06kyr0";
           name = "railgun";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/railgun";
+          homepage = "https://melpa.org/#/railgun";
           license = lib.licenses.free;
         };
       }) {};
@@ -47033,13 +48781,13 @@
           sha256 = "1fh8wsb0pa2isr1kgh3v9zmmxq1nlmqwqk4z34dw5wpaiyihmk84";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rails-log-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rails-log-mode";
           sha256 = "0h7gfg0c5pwfh18qzg1mx7an9p958ygdfqb54s85mbkv8x3rh1a0";
           name = "rails-log-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rails-log-mode";
+          homepage = "https://melpa.org/#/rails-log-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -47054,13 +48802,13 @@
           sha256 = "0cqp2vns7gq377bm6q9n5q0ra1d5yy2x2aiw9q1hswk82xpibj9l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rails-new";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rails-new";
           sha256 = "0wgbm6qxqkpsbzj9wccicsphajaii07dl27b8x2vidsyw6ambj5h";
           name = "rails-new";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rails-new";
+          homepage = "https://melpa.org/#/rails-new";
           license = lib.licenses.free;
         };
       }) {};
@@ -47075,13 +48823,13 @@
           sha256 = "021x1l5kzsbm0qj5a3bngxa7ickm4lbwsdz81a2ks9pi1ivmw205";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/railscasts-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/railscasts-theme";
           sha256 = "1z5m8ccx2k18gbzqvg0051mp2myy2qncf4xvv47k80f83pk2hw6r";
           name = "railscasts-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/railscasts-theme";
+          homepage = "https://melpa.org/#/railscasts-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -47096,13 +48844,13 @@
           sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rainbow-blocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rainbow-blocks";
           sha256 = "08p41wvrw1j3h7j7lyl8nxk1gcc2id9ikljmiklg0kc6s8ijhng8";
           name = "rainbow-blocks";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rainbow-blocks";
+          homepage = "https://melpa.org/#/rainbow-blocks";
           license = lib.licenses.free;
         };
       }) {};
@@ -47117,13 +48865,13 @@
           sha256 = "0gxc8j5a14bc9mp43cbcz41ipc0z1yvmypg52dnl8hadirry20gd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rainbow-delimiters";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rainbow-delimiters";
           sha256 = "132nslbnszvbgkl0819z811yar3lms1hp5na4ybi9gkmnb7bg4rg";
           name = "rainbow-delimiters";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rainbow-delimiters";
+          homepage = "https://melpa.org/#/rainbow-delimiters";
           license = lib.licenses.free;
         };
       }) {};
@@ -47138,13 +48886,13 @@
           sha256 = "05i0jpmxzsj2lsj48cafn3v93z37l7k5kaza2ik3yirdpjdibyrh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rainbow-identifiers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rainbow-identifiers";
           sha256 = "0lw790ymrgpyh0sxwmzinl2ik5vl5vggbg14cd0cx5yagkw5y3mp";
           name = "rainbow-identifiers";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/rainbow-identifiers";
+          homepage = "https://melpa.org/#/rainbow-identifiers";
           license = lib.licenses.free;
         };
       }) {};
@@ -47159,13 +48907,34 @@
           sha256 = "1wcs8j8rdls0n3v8zdpk2n5riwzz2yvjf6b70a5bj7p20gyafhj2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rake";
           sha256 = "0cw47g6cjnkh3z4hbwwq1f8f5vrvs84spn06k53bx898brqdh8ns";
           name = "rake";
         };
         packageRequires = [ cl-lib dash f ];
         meta = {
-          homepage = "http://melpa.org/#/rake";
+          homepage = "https://melpa.org/#/rake";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rally-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }:
+    melpaBuild {
+        pname = "rally-mode";
+        version = "20160326.1102";
+        src = fetchFromGitHub {
+          owner = "seanleblanc";
+          repo = "rally-mode";
+          rev = "722b9a8e6d8a6aee5c4c4b16be0194f7bb4bfa5b";
+          sha256 = "13pkp80cv1v3pjff1588cgyx18a31i668lwywll5dk4fxl4zdjvb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rally-mode";
+          sha256 = "1vzsh5855bzln3p3235yccl2azpndpc4rh95zrx6p1k62h2kv0y1";
+          name = "rally-mode";
+        };
+        packageRequires = [ popwin ];
+        meta = {
+          homepage = "https://melpa.org/#/rally-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -47180,13 +48949,13 @@
           sha256 = "0fmajgqf9j21qn7h35sky5di8cnma432g0ki9d5m41byxp9y1bdl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rand-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rand-theme";
           sha256 = "0h0n1lsxnl12mjrjpra62vblrg8kbp1hk7w1v6makj074d037j2h";
           name = "rand-theme";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/rand-theme";
+          homepage = "https://melpa.org/#/rand-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -47201,34 +48970,34 @@
           sha256 = "1z25xmz8pl3rsfahw6ay8wx5wbnlxabnzr2dq20m0i5jyci8lqll";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/random-splash-image";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/random-splash-image";
           sha256 = "1j454jy4ia2wrgi3fxzjfdqi3z8x13hq8kh62lnb84whs7a1nhik";
           name = "random-splash-image";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/random-splash-image";
+          homepage = "https://melpa.org/#/random-splash-image";
           license = lib.licenses.free;
         };
       }) {};
     ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ranger";
-        version = "20160203.701";
+        version = "20160413.934";
         src = fetchFromGitHub {
           owner = "ralesi";
           repo = "ranger.el";
-          rev = "aa9a72d013a3d095bf92e91244241fc0867c8355";
-          sha256 = "0dm5k0g39dlwag3rqyiq8vzsg2z6ypajicjs7g5lcd88nypjl461";
+          rev = "942f3bccf7cf081010708e2dddc30d92d01fdda9";
+          sha256 = "1wgjjrr0m9x93q9q1lg52rl2i3k74csdbvlr1q8hdi9dnsrdm55x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ranger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ranger";
           sha256 = "14g4r4iaz0nzfsklslrswsik670pvfd0605xfjghvpngn2a8ych4";
           name = "ranger";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ranger";
+          homepage = "https://melpa.org/#/ranger";
           license = lib.licenses.free;
         };
       }) {};
@@ -47243,13 +49012,34 @@
           sha256 = "1i16361klpdsxphcjdpxqswab3ing69j1wb9nygws7ghil85h0bx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rase";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rase";
           sha256 = "1g7v2z7l4csl5by64hc3zg4kgrkvv81iq30mfqq4nvy1jc0xa6j0";
           name = "rase";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rase";
+          homepage = "https://melpa.org/#/rase";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rats = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "rats";
+        version = "20160315.1345";
+        src = fetchFromGitHub {
+          owner = "ane";
+          repo = "rats.el";
+          rev = "a5c519b88455a8eacd5e3b72286c96dfc484479d";
+          sha256 = "0dd9yhxwwk16xkwld9c3hpf9bw8zzc1lyvisp0vn6vcd240j02w0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rats";
+          sha256 = "0jhwiq9yzwpyqhk3c32vqx8nryingzh58psxbzjl3812b7xdqphr";
+          name = "rats";
+        };
+        packageRequires = [ cl-lib go-mode s ];
+        meta = {
+          homepage = "https://melpa.org/#/rats";
           license = lib.licenses.free;
         };
       }) {};
@@ -47264,13 +49054,13 @@
           sha256 = "0yd0rs6fnc6lsfi7pivw5sivh698055r8ifj9vrxb82dcx2y6v2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rbenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rbenv";
           sha256 = "09nw7sz6rdgs7hdw517qwgzgyrdmxb16sgldfkifk41rhiyqhr65";
           name = "rbenv";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rbenv";
+          homepage = "https://melpa.org/#/rbenv";
           license = lib.licenses.free;
         };
       }) {};
@@ -47285,13 +49075,13 @@
           sha256 = "0q5giixk6pv82cf34a0mxmnzh2gdiyq6dzv4ypkkdpz6wsm2ffhx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rbt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rbt";
           sha256 = "1mrb6v8zybvhh242vvq0kdvg6cvws7gabfhcydrw5g2njhyqkygm";
           name = "rbt";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rbt";
+          homepage = "https://melpa.org/#/rbt";
           license = lib.licenses.free;
         };
       }) {};
@@ -47306,13 +49096,13 @@
           sha256 = "0xdyrp0zs2v2glpfwlajmj97wygwi0y492zbp6rp3caa5bj3j4z2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rcirc-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rcirc-alert";
           sha256 = "0lyd3gz1sflp93xb7xbvk1gh69w468ync1p144avyh2pybl40q4a";
           name = "rcirc-alert";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rcirc-alert";
+          homepage = "https://melpa.org/#/rcirc-alert";
           license = lib.licenses.free;
         };
       }) {};
@@ -47327,13 +49117,13 @@
           sha256 = "1mpk5rzsil298q3ppv5v9jrn274v71jffyz0jihrksh1wbjzwhlx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rcirc-alertify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rcirc-alertify";
           sha256 = "13448bykmy0jqcajhn2gjiar3m8cingyr8394vxybp2m1zvv0pws";
           name = "rcirc-alertify";
         };
         packageRequires = [ alert ];
         meta = {
-          homepage = "http://melpa.org/#/rcirc-alertify";
+          homepage = "https://melpa.org/#/rcirc-alertify";
           license = lib.licenses.free;
         };
       }) {};
@@ -47348,13 +49138,13 @@
           sha256 = "173lhi48dwfp9k7jmgivhcc9f38snz5xlciyjhrafpadq1pir497";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rcirc-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rcirc-color";
           sha256 = "1a8qqwdc0gw6m1xsnwrj3xldp05p7pabyj6l4bccpg3vf5wbgkn5";
           name = "rcirc-color";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rcirc-color";
+          homepage = "https://melpa.org/#/rcirc-color";
           license = lib.licenses.free;
         };
       }) {};
@@ -47369,13 +49159,13 @@
           sha256 = "0d99x7dfw5xrn62knvs65lvn6xyy7399xwqyy47bs4n81v25aqbh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rcirc-groups";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rcirc-groups";
           sha256 = "1iws3f8vkwrflcj6ni8nmf1wcw1jrlnssm76kzzhag77ry3iswgx";
           name = "rcirc-groups";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rcirc-groups";
+          homepage = "https://melpa.org/#/rcirc-groups";
           license = lib.licenses.free;
         };
       }) {};
@@ -47390,13 +49180,13 @@
           sha256 = "1k4knsrca626pikgaalqbqwy7im4wz1vrmzzhdrdb4lhdz6sq3q3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rcirc-notify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rcirc-notify";
           sha256 = "0mwhzkbzhpq4jws05p7qp0kbay8kcblb9xikznm0i8drpdyc617v";
           name = "rcirc-notify";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rcirc-notify";
+          homepage = "https://melpa.org/#/rcirc-notify";
           license = lib.licenses.free;
         };
       }) {};
@@ -47411,34 +49201,34 @@
           sha256 = "1kwn33rxaqik5jls66c2indvswhwmxdmd60n7a1h9siqm5qhy9d6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rcirc-styles";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rcirc-styles";
           sha256 = "01dxhnzsnljig769dk9axdi970b3lw2s6p1z3ljf29qlb5j4548r";
           name = "rcirc-styles";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/rcirc-styles";
+          homepage = "https://melpa.org/#/rcirc-styles";
           license = lib.licenses.free;
         };
       }) {};
     rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rdf-prefix";
-        version = "20151205.816";
+        version = "20160326.1204";
         src = fetchFromGitHub {
           owner = "simenheg";
           repo = "rdf-prefix";
-          rev = "1ab1464172c7563a7dbf1224572e4ffbfc6608e6";
-          sha256 = "0r95fzi0x8r18x7r574mp503qaiqyicrq78zlggyz6qihi95pmqj";
+          rev = "5e4b0ab384a55974ffa3e5efdd1e437cce8e1562";
+          sha256 = "0h54mpi8jd21vjifc0yy0hvpygiam1rlmypijpi4kv42x5mxkn3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rdf-prefix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rdf-prefix";
           sha256 = "1vxgn5f2kws17ndfdv1vj5p9ks3rp6sikzpc258j07bhsfpjz5qm";
           name = "rdf-prefix";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rdf-prefix";
+          homepage = "https://melpa.org/#/rdf-prefix";
           license = lib.licenses.free;
         };
       }) {};
@@ -47453,13 +49243,13 @@
           sha256 = "08l96bhghmnckar4i6afj9csqglasmpmby1r7j38ic9bp37z2yqd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rdp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rdp";
           sha256 = "0lj3idwv4fxz8pi8mnxkbhwhzaa1gs6ib4nzly3fc6yiix9ampkz";
           name = "rdp";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rdp";
+          homepage = "https://melpa.org/#/rdp";
           license = lib.licenses.free;
         };
       }) {};
@@ -47474,13 +49264,13 @@
           sha256 = "00j0iqa37yzd7xrgd8xcgpgmjcarhn0yx4zpbnr7z7kzmg24ywa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/react-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/react-snippets";
           sha256 = "0chs0h41nb2fdz02hdsaynz7ma8fg66a8m1q1np0464skrsdaj73";
           name = "react-snippets";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/react-snippets";
+          homepage = "https://melpa.org/#/react-snippets";
           license = lib.licenses.free;
         };
       }) {};
@@ -47495,13 +49285,13 @@
           sha256 = "0kg18ybgwcxhv5fiya5d3wn5w9si4914q946gjannk67d6jcq08g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/readability";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/readability";
           sha256 = "0kg91ma9k3p5ps467jjz2lw13rv1l8ivwc3zpg6c1rl474ds0qqv";
           name = "readability";
         };
         packageRequires = [ emacs oauth ov ];
         meta = {
-          homepage = "http://melpa.org/#/readability";
+          homepage = "https://melpa.org/#/readability";
           license = lib.licenses.free;
         };
       }) {};
@@ -47516,13 +49306,13 @@
           sha256 = "1j5b5xapflwzh8a297gva0l12ralwa9vl5z3bb75c9ksjkhi4nm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/readline-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/readline-complete";
           sha256 = "1qymk5ypv6ljk8x49z4jcifz7c2dqcg5181f4hqh67g1byvj2277";
           name = "readline-complete";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/readline-complete";
+          homepage = "https://melpa.org/#/readline-complete";
           license = lib.licenses.free;
         };
       }) {};
@@ -47537,34 +49327,118 @@
           sha256 = "1kghhps8mqys5l59qwzv3fgy1fvb15cnyaxmk29v818a6khjc5l2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/real-auto-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/real-auto-save";
           sha256 = "03dbbizpyg62v6zbq8hd16ikrifz8m2bdlbb3g67f2834xqmxha8";
           name = "real-auto-save";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/real-auto-save";
+          homepage = "https://melpa.org/#/real-auto-save";
           license = lib.licenses.free;
         };
       }) {};
     realgud = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, load-relative, loc-changes, melpaBuild, test-simple }:
     melpaBuild {
         pname = "realgud";
-        version = "20160217.2022";
+        version = "20160305.357";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-dbgr";
-          rev = "74ee75c3b7b74ae173374592ce82ad3a58b35424";
-          sha256 = "089hyydlhnlawa7wflnf0mph4h96npxvr8czyffsyng88jy46cqa";
+          rev = "cfe2be3d8851de6937da2a9f771e13280ecd60ce";
+          sha256 = "0qzwg3g8cqms1xx1yw8h7xck8ym8gb6avnnqx737r078yaa9l8hj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/realgud";
-          sha256 = "15vlln4w4wlgrk5i5nhgvjcbardpahgs9kwwayb1vmj10c8a837s";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/realgud";
+          sha256 = "0qmvd35ng1aqclwj3pskn58c0fi98kvx9666wp3smgj3n88vgy15";
           name = "realgud";
         };
         packageRequires = [ list-utils load-relative loc-changes test-simple ];
         meta = {
-          homepage = "http://melpa.org/#/realgud";
+          homepage = "https://melpa.org/#/realgud";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud-byebug = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }:
+    melpaBuild {
+        pname = "realgud-byebug";
+        version = "20160303.640";
+        src = fetchFromGitHub {
+          owner = "rocky";
+          repo = "realgud-byebug";
+          rev = "1eb87d101b2145cadb2ed1d781aa38fdd2ff5b02";
+          sha256 = "01wa8jwwlx5qmn5w83r3ak74hjp89zyhsx13c4ijqfns7d92xjd0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/realgud-byebug";
+          sha256 = "1m4pqnvnnfzq7b9bv5fkz70pifklddwqrwbwnrfyiawx9vdgrpz9";
+          name = "realgud-byebug";
+        };
+        packageRequires = [ realgud ];
+        meta = {
+          homepage = "https://melpa.org/#/realgud-byebug";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud-old-debuggers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }:
+    melpaBuild {
+        pname = "realgud-old-debuggers";
+        version = "20160303.254";
+        src = fetchFromGitHub {
+          owner = "rocky";
+          repo = "realgud-old-debuggers";
+          rev = "eee3d9d88bfe94d21f08716217184e44a4161e55";
+          sha256 = "0jxi5a6mlgwjj14gfajs951180m8r8m4vqx09xz1yyc9qq8ywfk9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/realgud-old-debuggers";
+          sha256 = "0iwi1byfwcpviaizdw9wzdcjlbk35ql4wfzj0ynh331g0hmibhs9";
+          name = "realgud-old-debuggers";
+        };
+        packageRequires = [ realgud ];
+        meta = {
+          homepage = "https://melpa.org/#/realgud-old-debuggers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud-pry = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }:
+    melpaBuild {
+        pname = "realgud-pry";
+        version = "20160303.254";
+        src = fetchFromGitHub {
+          owner = "rocky";
+          repo = "realgud-pry";
+          rev = "60c24ab619fba3adc4aac6ba6cf73fdb4e11e696";
+          sha256 = "1dgxlmdzp1m6xr94nkvh6whvg23yq2d3v6k95vacx0khfbc16w17";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/realgud-pry";
+          sha256 = "1p5ijig5rczndcykllq0vy6w4askwl0yd8b5fqg7yl5yx45r8xgs";
+          name = "realgud-pry";
+        };
+        packageRequires = [ realgud ];
+        meta = {
+          homepage = "https://melpa.org/#/realgud-pry";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud-rdb2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }:
+    melpaBuild {
+        pname = "realgud-rdb2";
+        version = "20160303.243";
+        src = fetchFromGitHub {
+          owner = "rocky";
+          repo = "realgud-ruby-debugger2";
+          rev = "8d1bf53e250d10bc4b051b32ee6a89161706c66a";
+          sha256 = "1ip22z48vj6a6xh54s26ss10pxhqrdm5k9h28i1vgv5x75kqgxii";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/realgud-rdb2";
+          sha256 = "0wqvgb3h2b0ys76sq2z462cjv0fajqc41f7wqvf53wfcs2zw4l9y";
+          name = "realgud-rdb2";
+        };
+        packageRequires = [ realgud ];
+        meta = {
+          homepage = "https://melpa.org/#/realgud-rdb2";
           license = lib.licenses.free;
         };
       }) {};
@@ -47579,13 +49453,13 @@
           sha256 = "1xh9nxqfg9abcl41ni69rnwjfgyfr0pbl55dzyxsbh6sb36r3h8z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rebox2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rebox2";
           sha256 = "06ra50afjqac9ck1s9gaxy0sqxcb612wzd28s4q4imicqpgfxzjw";
           name = "rebox2";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rebox2";
+          homepage = "https://melpa.org/#/rebox2";
           license = lib.licenses.free;
         };
       }) {};
@@ -47593,17 +49467,17 @@
         pname = "recentf-ext";
         version = "20130130.1550";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/recentf-ext.el";
+          url = "https://www.emacswiki.org/emacs/download/recentf-ext.el";
           sha256 = "15kwkphrlxq6nbmqm95sxv4rykl1d35sjm59ncy07ncqm706h33l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/recentf-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/recentf-ext";
           sha256 = "1m54w1n3ci5j7i1jhw6cs7dgzmxrj1hsrrarqlrd1d4iqhixjzbq";
           name = "recentf-ext";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/recentf-ext";
+          homepage = "https://melpa.org/#/recentf-ext";
           license = lib.licenses.free;
         };
       }) {};
@@ -47618,13 +49492,13 @@
           sha256 = "0wk28blnfks987iby0p3qpd4nxnz6sqn4fx8g59gyddjhav51lri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/recompile-on-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/recompile-on-save";
           sha256 = "0bg2p7pk4jlpqc7lg48mxd6zkwnx15r0r7lmsxgx9dv1ilfwrmgn";
           name = "recompile-on-save";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
-          homepage = "http://melpa.org/#/recompile-on-save";
+          homepage = "https://melpa.org/#/recompile-on-save";
           license = lib.licenses.free;
         };
       }) {};
@@ -47639,13 +49513,13 @@
           sha256 = "114ssmby614xjs7mrpbbsdd4gj5ra6klfh8h6z8iij8xn3kii83q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/recover-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/recover-buffers";
           sha256 = "0g40d7440hzlc9b45v63ng0anvmgip4dhbd9wcm2sn8qjfr4w11b";
           name = "recover-buffers";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/recover-buffers";
+          homepage = "https://melpa.org/#/recover-buffers";
           license = lib.licenses.free;
         };
       }) {};
@@ -47660,34 +49534,34 @@
           sha256 = "1vpsihrl03hkd6n6b7mrjccm0a023qf3154a8rw4chihikxw27pj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rect+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rect+";
           sha256 = "0vk0jwpl6yp2md9nh0ghp2qn883a8lr3cq8c9mgq0g552dwdiv5m";
           name = "rect-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rect+";
+          homepage = "https://melpa.org/#/rect+";
           license = lib.licenses.free;
         };
       }) {};
     rectangle-utils = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rectangle-utils";
-        version = "20150528.1428";
+        version = "20160426.545";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "rectangle-utils";
-          rev = "81071e62862c0062b8559eb217e6658878c34a1e";
-          sha256 = "14ysbjdndsmcc4j3zhc3nfjxhdm9310jx237mrp98ancxdhsh4q9";
+          rev = "602183e5e57725a41f9da10b23b070ad95089bf0";
+          sha256 = "15kl72vias2b72bpji743aknml4kywqbb39kb8qm4bzbmc9ymfdx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rectangle-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rectangle-utils";
           sha256 = "1w5z2gykydsfp30ahqjihpvq04c5v0cfslbrrg429hycys8apws7";
           name = "rectangle-utils";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/rectangle-utils";
+          homepage = "https://melpa.org/#/rectangle-utils";
           license = lib.licenses.free;
         };
       }) {};
@@ -47702,13 +49576,13 @@
           sha256 = "1mj7lyadzn3bwig3f9zariq5z4fg6liqnjvfd34yx88xc52nwf33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/recursive-narrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/recursive-narrow";
           sha256 = "1bx8l8wjxrkv949c73dp93knbn1iwnblcm8iw822mq2mgbgwsa7f";
           name = "recursive-narrow";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/recursive-narrow";
+          homepage = "https://melpa.org/#/recursive-narrow";
           license = lib.licenses.free;
         };
       }) {};
@@ -47723,13 +49597,13 @@
           sha256 = "1rjpf23a8rggjmmxvm1997d3xz03kz84xams486b9ky0n2v02d57";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/redis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/redis";
           sha256 = "1awnilb8bk0izp6yw0187ybh9slf1hc51014xvvmj90darxby79a";
           name = "redis";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/redis";
+          homepage = "https://melpa.org/#/redis";
           license = lib.licenses.free;
         };
       }) {};
@@ -47737,38 +49611,38 @@
         pname = "redo-plus";
         version = "20131117.551";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/redo+.el";
+          url = "https://www.emacswiki.org/emacs/download/redo+.el";
           sha256 = "1jc4n60spzssa57i3jwrqwy20f741hb271vmmx49riycx1ybx3d3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/redo+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/redo+";
           sha256 = "1alfs7k5mydgvzsjmdifcizqgrqjrk2kbh3mabai7nlrwi47w9n2";
           name = "redo-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/redo+";
+          homepage = "https://melpa.org/#/redo+";
           license = lib.licenses.free;
         };
       }) {};
     redpen-paragraph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "redpen-paragraph";
-        version = "20151206.941";
+        version = "20160321.519";
         src = fetchFromGitHub {
           owner = "karronoli";
           repo = "redpen-paragraph.el";
-          rev = "dcba4dc48593fedd48e398af50f6cdc60f453a07";
-          sha256 = "0s38mi9w1dm9fzhd3l8xvq9x33rkb5vvd66jibza50dhn9dmakax";
+          rev = "aa90b9a0e0cb24dad239ac9e4b8ecbc51798afc5";
+          sha256 = "1idm3mp016p5d6jyxl58rlhirbc5qmglmjpncj3s1qg3yarlxw2j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/redpen-paragraph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/redpen-paragraph";
           sha256 = "0jr707ik6fhznq0q421l986w85ah0n9b4is91zrgbk1v6miqrhca";
           name = "redpen-paragraph";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/redpen-paragraph";
+          homepage = "https://melpa.org/#/redpen-paragraph";
           license = lib.licenses.free;
         };
       }) {};
@@ -47779,16 +49653,37 @@
         src = fetchgit {
           url = "http://www.foldr.org/~michaelw/projects/redshank.git";
           rev = "f98e68f532e622bcd464292ca4a9cf5fbea14ebb";
-          sha256 = "5547c5db0caa147ae2fa0099b9c58a8629b47bf4facb6c5cc72cee45e84be392";
+          sha256 = "14p39gl4bvicqxf6rjzsyixv8ac6ib2vk680zbi7l55a1kdwaism";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/redshank";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/redshank";
           sha256 = "07s4gja1w8piabkajbzrgq77mkdkxr0jy9bmy2qb9w2svfsyns9b";
           name = "redshank";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/redshank";
+          homepage = "https://melpa.org/#/redshank";
+          license = lib.licenses.free;
+        };
+      }) {};
+    redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "redtick";
+        version = "20160410.1734";
+        src = fetchFromGitHub {
+          owner = "ferfebles";
+          repo = "redtick";
+          rev = "66c10c4984557ac8d6861ba57444e4debb85c4a8";
+          sha256 = "0ciw1qgbnlhr1ys4m9r6yi0zrmq99dja7vm959yb22zyggw5dqn4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/redtick";
+          sha256 = "0qnx9s2rch4xn98vbgiq8ll2hxrwi4fi4vg4bccyvwh21nj51iq0";
+          name = "redtick";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/redtick";
           license = lib.licenses.free;
         };
       }) {};
@@ -47803,13 +49698,13 @@
           sha256 = "08kzi2jcfqnlanqzvbk5gq1if7k8qc9gmz5bmvd2mvmx6z436398";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/refheap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/refheap";
           sha256 = "0pzark1db9k2pavd5sn89a28gd9j5jlkx3wkhwfzln3y5c1wnvdk";
           name = "refheap";
         };
         packageRequires = [ json ];
         meta = {
-          homepage = "http://melpa.org/#/refheap";
+          homepage = "https://melpa.org/#/refheap";
           license = lib.licenses.free;
         };
       }) {};
@@ -47824,13 +49719,13 @@
           sha256 = "1d34jd7is979vfgdy56zkd1m15ng3waiabfpak6dv6ak3cdh5fgx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/regex-dsl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/regex-dsl";
           sha256 = "129sapsmvcqqqgcr9xlmxwszsxvsb4nj9g2fxsl4y6r383840jbr";
           name = "regex-dsl";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/regex-dsl";
+          homepage = "https://melpa.org/#/regex-dsl";
           license = lib.licenses.free;
         };
       }) {};
@@ -47845,13 +49740,13 @@
           sha256 = "1wr12j16hckvc8bxxgxw280frl12h23cp44sxg28lczl16d9693l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/regex-tool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/regex-tool";
           sha256 = "1nd23vjij5h5gk5l7hbd5ks9ljisn054wp138jx2v6i51izxvh2v";
           name = "regex-tool";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/regex-tool";
+          homepage = "https://melpa.org/#/regex-tool";
           license = lib.licenses.free;
         };
       }) {};
@@ -47866,13 +49761,13 @@
           sha256 = "02kfi3c6ydnr7xw611ck66kfjyl5w86dr9vfjv3wjl6ad9jya4zy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/region-bindings-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/region-bindings-mode";
           sha256 = "141q4x6rilidpnsm9s78qks9i1v6ng0ydhbzqi39xcaccfyyjb69";
           name = "region-bindings-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/region-bindings-mode";
+          homepage = "https://melpa.org/#/region-bindings-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -47887,13 +49782,13 @@
           sha256 = "0gsh0x1rqxvzrszdyna9d8b8w22mqnd9yqcwzay2prc6rpl26g1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/region-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/region-state";
           sha256 = "1iq2x1w8lqjjiwjja7r3qki6drvydnk171k9fj9g6rk7wslknz8x";
           name = "region-state";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/region-state";
+          homepage = "https://melpa.org/#/region-state";
           license = lib.licenses.free;
         };
       }) {};
@@ -47908,13 +49803,13 @@
           sha256 = "01k3v4yiilz1k6drv7b2x6zbjx6dlz7cch8rq63mwc7v8kvdnqmi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/register-channel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/register-channel";
           sha256 = "037i2fgxxsfb85vd6xk17wyh7ny6fqfixvb0a18lf8m1hib1gyhr";
           name = "register-channel";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/register-channel";
+          homepage = "https://melpa.org/#/register-channel";
           license = lib.licenses.free;
         };
       }) {};
@@ -47929,13 +49824,13 @@
           sha256 = "0100maanb1v0hl4pj8ykzlqpr3cvs6ldak5japndm5yngzp6m8ks";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/relative-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/relative-buffers";
           sha256 = "131182yb0pr0d6jibqd8aag4w8hywdyi87ldp77b95gw4bqhr96i";
           name = "relative-buffers";
         };
         packageRequires = [ cl-lib dash f s ];
         meta = {
-          homepage = "http://melpa.org/#/relative-buffers";
+          homepage = "https://melpa.org/#/relative-buffers";
           license = lib.licenses.free;
         };
       }) {};
@@ -47950,13 +49845,13 @@
           sha256 = "1r8fhs7d2vkrbv15ic2bm79i9a8swbc38vk566vnxkhl3rfd5a0a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/relative-line-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/relative-line-numbers";
           sha256 = "0mj1w5a4ax8hwz41vn02bacxlnifd14hvf3p288ljvwchvlf0hn3";
           name = "relative-line-numbers";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/relative-line-numbers";
+          homepage = "https://melpa.org/#/relative-line-numbers";
           license = lib.licenses.free;
         };
       }) {};
@@ -47971,13 +49866,13 @@
           sha256 = "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/relax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/relax";
           sha256 = "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk";
           name = "relax";
         };
         packageRequires = [ json ];
         meta = {
-          homepage = "http://melpa.org/#/relax";
+          homepage = "https://melpa.org/#/relax";
           license = lib.licenses.free;
         };
       }) {};
@@ -47992,13 +49887,13 @@
           sha256 = "0w40cx58c0hmc0yzs8maq1389hwha0qwfbz76pc6kpcx14v1gkhh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/remark-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/remark-mode";
           sha256 = "1zl8k3h4acbgb3hmjs2b4a14g0s0vl3xamrqxrr742zmqpr1h0w0";
           name = "remark-mode";
         };
         packageRequires = [ markdown-mode ];
         meta = {
-          homepage = "http://melpa.org/#/remark-mode";
+          homepage = "https://melpa.org/#/remark-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -48013,13 +49908,13 @@
           sha256 = "007lqahjbig6yygqik6fgbq114784z6l40a3vrc4qs9361zqizck";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/repeatable-motion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/repeatable-motion";
           sha256 = "12z4z8apd8ksf6dfvqm54l71mx68j0yg4hrjypa9p77fpcd6p0zw";
           name = "repeatable-motion";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/repeatable-motion";
+          homepage = "https://melpa.org/#/repeatable-motion";
           license = lib.licenses.free;
         };
       }) {};
@@ -48034,13 +49929,13 @@
           sha256 = "12wylmyz54n1f3kaw9clhvs66dg43xvcvll4pl5ii0ibfv6pls1b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/repl-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/repl-toggle";
           sha256 = "1jyaksxgyygfv1wn9c6y8sykb4hicwgs9n5vrdikd2i0iix29zpb";
           name = "repl-toggle";
         };
         packageRequires = [ fullframe ];
         meta = {
-          homepage = "http://melpa.org/#/repl-toggle";
+          homepage = "https://melpa.org/#/repl-toggle";
           license = lib.licenses.free;
         };
       }) {};
@@ -48049,17 +49944,17 @@
         pname = "replace-from-region";
         version = "20150406.1930";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/replace-from-region.el";
+          url = "https://www.emacswiki.org/emacs/download/replace-from-region.el";
           sha256 = "1clxkzxqsm91zbzv8nffav224ldr04ww5lppga2l41xjfl6z12qb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/replace-from-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/replace-from-region";
           sha256 = "19q8hz2xiyamhw8hzpahqwd4352k1m9r9wlh9kdh6hbb6sjgllnb";
           name = "replace-from-region";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/replace-from-region";
+          homepage = "https://melpa.org/#/replace-from-region";
           license = lib.licenses.free;
         };
       }) {};
@@ -48074,13 +49969,13 @@
           sha256 = "169p85rmgashm0g26apkxynmypqk9ndh76kvh572db5kqb8ix0c6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/replace-pairs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/replace-pairs";
           sha256 = "0l9674rba25wh6fskvfwkhv99lwlszb177hsfzx39s6b4hshvlsb";
           name = "replace-pairs";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/replace-pairs";
+          homepage = "https://melpa.org/#/replace-pairs";
           license = lib.licenses.free;
         };
       }) {};
@@ -48088,17 +49983,17 @@
         pname = "replace-plus";
         version = "20151231.1749";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/replace+.el";
+          url = "https://www.emacswiki.org/emacs/download/replace+.el";
           sha256 = "1af4sdhkzxknqzdkzc5gpm5j3s5k776j293hqq7cqzk533fdh4iz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/replace+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/replace+";
           sha256 = "1imsgr3v8g2p2mnkzp92ga3nvckr758pblmlha8gh8mb80089krn";
           name = "replace-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/replace+";
+          homepage = "https://melpa.org/#/replace+";
           license = lib.licenses.free;
         };
       }) {};
@@ -48113,13 +50008,13 @@
           sha256 = "0ks884jhxqkr8j38r9m4s56krm2gpkm0v5d51zzivcfhs30s6nff";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/replace-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/replace-symbol";
           sha256 = "07ljmw6aw9hsqffhwmiq2pvhry27acg6f4vgxgi91vjr8jj3r4ng";
           name = "replace-symbol";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/replace-symbol";
+          homepage = "https://melpa.org/#/replace-symbol";
           license = lib.licenses.free;
         };
       }) {};
@@ -48134,76 +50029,76 @@
           sha256 = "0hs80g3npgb6qfcaivdfkpsc9mss1kdmyp5j7s922qcy2k4yxmgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/repo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/repo";
           sha256 = "0z4lcswh0c6xnsxlv33bsxh0nh26ydzfl8sv8xabdp5a2gk6bhpb";
           name = "repo";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/repo";
+          homepage = "https://melpa.org/#/repo";
           license = lib.licenses.free;
         };
       }) {};
     req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }:
     melpaBuild {
         pname = "req-package";
-        version = "20151220.254";
+        version = "20160227.1205";
         src = fetchFromGitHub {
           owner = "edvorg";
           repo = "req-package";
-          rev = "e52f0b0a8cfc28ae1d13c83fdcf3998a9973e7e5";
-          sha256 = "05a88r2jp169x99abz9wrr1i8ch0bg3dlmaalxwqfmlzci0lksx2";
+          rev = "312c17182e63c67c9e8d65eb06e1ae039bee3b83";
+          sha256 = "0905525nw78bz7qs1scmqss5dffp2aabvmwvcvgl6b2bz92w9nb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/req-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/req-package";
           sha256 = "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf";
           name = "req-package";
         };
         packageRequires = [ dash ht log4e use-package ];
         meta = {
-          homepage = "http://melpa.org/#/req-package";
+          homepage = "https://melpa.org/#/req-package";
           license = lib.licenses.free;
         };
       }) {};
-    request = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    request = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "request";
-        version = "20160108.233";
+        version = "20160424.2232";
         src = fetchFromGitHub {
-          owner = "abingham";
+          owner = "tkf";
           repo = "emacs-request";
-          rev = "48a35969f7c41810d550e6cdf784cb86c5a05a20";
-          sha256 = "1fiyxbd87cdlsdhpm3b3z8ypkrkvya6lamn0qx9hsxl1yv27vx4m";
+          rev = "efbe231346f368a3079bf185ce25997ac6104d9c";
+          sha256 = "0rpw9is8sx2gmbc7l6mv5qdd0jrh497lyj5f0zx0lqwjl8imw401";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/request";
-          sha256 = "09gxfy34a13wr0agmhn0nldxaiyc72rx9xi56jirsvji4dg5j6mm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/request";
+          sha256 = "0h4jqg98px9dqqvjp08vi2z1lhmk0ca59lnrcl96bi7gkkj3jiji";
           name = "request";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/request";
+          homepage = "https://melpa.org/#/request";
           license = lib.licenses.free;
         };
       }) {};
     request-deferred = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "request-deferred";
-        version = "20130526.1215";
+        version = "20160419.1805";
         src = fetchFromGitHub {
-          owner = "abingham";
+          owner = "tkf";
           repo = "emacs-request";
-          rev = "48a35969f7c41810d550e6cdf784cb86c5a05a20";
-          sha256 = "1fiyxbd87cdlsdhpm3b3z8ypkrkvya6lamn0qx9hsxl1yv27vx4m";
+          rev = "efbe231346f368a3079bf185ce25997ac6104d9c";
+          sha256 = "0rpw9is8sx2gmbc7l6mv5qdd0jrh497lyj5f0zx0lqwjl8imw401";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/request-deferred";
-          sha256 = "19s8q9a01v0g897s9ass1mr5wbzy82rrfcnqpvcvp05q4y787dn9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/request-deferred";
+          sha256 = "1dcxqnzmvddk61dzmfx8vjbzd8m44lscr3pjdp3r7211zhwfk40n";
           name = "request-deferred";
         };
         packageRequires = [ deferred request ];
         meta = {
-          homepage = "http://melpa.org/#/request-deferred";
+          homepage = "https://melpa.org/#/request-deferred";
           license = lib.licenses.free;
         };
       }) {};
@@ -48218,13 +50113,13 @@
           sha256 = "1bfj2zjn3x41jal6c136wnwkgmag27bmrwbfwdylafc7qqk6dflv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/requirejs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/requirejs";
           sha256 = "09z6r9wcag3gj075wq215zcslyknl1izap595rn48xvizxi06c6k";
           name = "requirejs";
         };
         packageRequires = [ cl-lib js2-mode popup s yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/requirejs";
+          homepage = "https://melpa.org/#/requirejs";
           license = lib.licenses.free;
         };
       }) {};
@@ -48233,19 +50128,19 @@
         pname = "requirejs-mode";
         version = "20130215.1504";
         src = fetchFromGitHub {
-          owner = "ricardmo";
+          owner = "moricard";
           repo = "requirejs-mode";
           rev = "bbb0c09f8eb2d6a33c17319be8137f68bb16bc92";
           sha256 = "02wva5q8mvc0a5kms2wm1gyaag2x3zd6fkkpl4218nrbb0mbficv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/requirejs-mode";
-          sha256 = "1sq1kim17bcmh39106vfgm7gq9nj9943lw8by0bpi5qr8xdjsn5r";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/requirejs-mode";
+          sha256 = "00bl5dz56f77hl9wy3xvjhq81641mv9jbskcd8mcgcz9ycj9g5k2";
           name = "requirejs-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/requirejs-mode";
+          homepage = "https://melpa.org/#/requirejs-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -48260,13 +50155,13 @@
           sha256 = "055km3g4bwl73kca6ky3qzzmy103w0mqcfscj33ppdhg2n7m94n0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/resize-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/resize-window";
           sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l";
           name = "resize-window";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/resize-window";
+          homepage = "https://melpa.org/#/resize-window";
           license = lib.licenses.free;
         };
       }) {};
@@ -48281,34 +50176,55 @@
           sha256 = "0gbm208hmmmpjyj0x3z0cszphawkgvjqzi5idbdca3gikyiqw80n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/restart-emacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/restart-emacs";
           sha256 = "03aabz7fmy99nwimvjn7qz6pvc94i470hfgiwmjz3348cw02k0n6";
           name = "restart-emacs";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/restart-emacs";
+          homepage = "https://melpa.org/#/restart-emacs";
           license = lib.licenses.free;
         };
       }) {};
     restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "restclient";
-        version = "20151128.1712";
+        version = "20160414.1724";
         src = fetchFromGitHub {
           owner = "pashky";
           repo = "restclient.el";
-          rev = "2075b17e2f8e118cf0739e4087f791ed724be1ad";
-          sha256 = "08j4m70j9xdl731bwa4vh656lji0w0f9mm1aki0qqd5msglw6kvx";
+          rev = "224d4e2ec8e195bba80cae3278f481b1e92ab3e0";
+          sha256 = "0r3q9cbf39pf4diynw4q8g7p5i6ylyk8jwxi2z2afwiblnnr9gsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/restclient";
-          sha256 = "14wxfhb17n2f9wil68lb05abj7m0whwkqvrm3y9dg9mh14lcpbvc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/restclient";
+          sha256 = "0wzp8i89a4hwm7qyxvdk10frknbqcni0isnp8k63nhq7c30s7md4";
           name = "restclient";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/restclient";
+          homepage = "https://melpa.org/#/restclient";
+          license = lib.licenses.free;
+        };
+      }) {};
+    restclient-helm = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, restclient }:
+    melpaBuild {
+        pname = "restclient-helm";
+        version = "20160407.449";
+        src = fetchFromGitHub {
+          owner = "pashky";
+          repo = "restclient.el";
+          rev = "224d4e2ec8e195bba80cae3278f481b1e92ab3e0";
+          sha256 = "0r3q9cbf39pf4diynw4q8g7p5i6ylyk8jwxi2z2afwiblnnr9gsz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/restclient-helm";
+          sha256 = "0cpf02ippfr9w6kiw3kng8smabv256ff388322hhn8a8icyjl24j";
+          name = "restclient-helm";
+        };
+        packageRequires = [ helm restclient ];
+        meta = {
+          homepage = "https://melpa.org/#/restclient-helm";
           license = lib.licenses.free;
         };
       }) {};
@@ -48323,13 +50239,13 @@
           sha256 = "1q13cgpz4wzhnqv84ablawy3y2wgdwy46sp7454mmfx9m77jzb2v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/reveal-in-osx-finder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/reveal-in-osx-finder";
           sha256 = "00jgrmh5s3vlpj1jjf8l3c3h4hjk5x781m95sidw6chimizvfmfc";
           name = "reveal-in-osx-finder";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/reveal-in-osx-finder";
+          homepage = "https://melpa.org/#/reveal-in-osx-finder";
           license = lib.licenses.free;
         };
       }) {};
@@ -48337,17 +50253,17 @@
         pname = "reveal-next";
         version = "20151231.1750";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/reveal-next.el";
+          url = "https://www.emacswiki.org/emacs/download/reveal-next.el";
           sha256 = "1h27kg2k8f6smbqxandmvg859qk66jydbbbiwwjmk7316k66w8qa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/reveal-next";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/reveal-next";
           sha256 = "0fp6ssd4fad0s2pbxbw75bnx7fcgasig8xvcx7nls8m9p6zbbmh2";
           name = "reveal-next";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/reveal-next";
+          homepage = "https://melpa.org/#/reveal-next";
           license = lib.licenses.free;
         };
       }) {};
@@ -48362,13 +50278,13 @@
           sha256 = "002ywhjms8ybk7cma2p2i11z3fz6kb0w8mlafysm911rvcq2hg5f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/reverse-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/reverse-theme";
           sha256 = "163kk5qnz9bk3l2fam79n264s764jfxbwqbiwgid8kw9cmk0v776";
           name = "reverse-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/reverse-theme";
+          homepage = "https://melpa.org/#/reverse-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -48383,13 +50299,13 @@
           sha256 = "0lzsy68k7sm9d3r8lzhzx9alc1f0cgfclry40pa4x0ilkcr7ysch";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/review-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/review-mode";
           sha256 = "0wapicggkngpdzi0yxc0b24s526fs819rc2d6miv6ix3gnw11n0n";
           name = "review-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/review-mode";
+          homepage = "https://melpa.org/#/review-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -48404,13 +50320,13 @@
           sha256 = "037sac5fvz6l2zgzlf8ykk4jf9zhj7ybzyz013jqzjj47a6sn1r1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/revive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/revive";
           sha256 = "1l7c6zq3ga2k1488qb0hgxlk08p3vrcf0sx116c1f8z8nf4c8ny5";
           name = "revive";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/revive";
+          homepage = "https://melpa.org/#/revive";
           license = lib.licenses.free;
         };
       }) {};
@@ -48425,13 +50341,13 @@
           sha256 = "0zmby92mjszh77r5wh8sccqv3a5bb9sfhac8g55nasavw8hfplvj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/reykjavik-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/reykjavik-theme";
           sha256 = "1f0q2gfzkmpd374jryrd1lgg8xj6rwdq181jhppj3rfjizgw4l35";
           name = "reykjavik-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/reykjavik-theme";
+          homepage = "https://melpa.org/#/reykjavik-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -48439,17 +50355,17 @@
         pname = "rfringe";
         version = "20110405.1020";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/rfringe.el";
+          url = "https://www.emacswiki.org/emacs/download/rfringe.el";
           sha256 = "02i5znln0aphvmvaia3sz75bvjhqwyjq1blf5qkcbprnn95lm3yh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rfringe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rfringe";
           sha256 = "171gzfciz78l6b653acgfailxpwmh8m1dm0dzpg0b1k0ny3aiwf6";
           name = "rfringe";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rfringe";
+          homepage = "https://melpa.org/#/rfringe";
           license = lib.licenses.free;
         };
       }) {};
@@ -48464,13 +50380,13 @@
           sha256 = "1qlpv5lzj4yfyjgdykhm6q9izg6g0z5pf5nmynj42vsx7v8bhy1x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rhtml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rhtml-mode";
           sha256 = "038j5jkcckmhlq3vz4h07s5y2scljh1fdn9r614hiyxwgk48lc35";
           name = "rhtml-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rhtml-mode";
+          homepage = "https://melpa.org/#/rhtml-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -48485,13 +50401,13 @@
           sha256 = "11hwf9y5ax207w6rwrsmi3pmn7pn7ap6iys0z8hni2f5zzxjrmx3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rich-minority";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rich-minority";
           sha256 = "11xd76w5k3b3q5bxqjb55vi6dsal9drvyc1nh7z83awm59hvgczc";
           name = "rich-minority";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/rich-minority";
+          homepage = "https://melpa.org/#/rich-minority";
           license = lib.licenses.free;
         };
       }) {};
@@ -48506,13 +50422,13 @@
           sha256 = "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rigid-tabs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rigid-tabs";
           sha256 = "06n0bcvc3nnp84pcq3lywwga7l92jz8hnkilhbq59kydf5zbjldp";
           name = "rigid-tabs";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/rigid-tabs";
+          homepage = "https://melpa.org/#/rigid-tabs";
           license = lib.licenses.free;
         };
       }) {};
@@ -48527,13 +50443,13 @@
           sha256 = "1kg83z10jw4ik0aapv9cjqlvqy31rln2am8vh3f77zh61qha37hx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rinari";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rinari";
           sha256 = "0qknicg3vzl7zbkwsdvp10hrvlng6mbi8hgslx4ir522dflrf9p0";
           name = "rinari";
         };
         packageRequires = [ inf-ruby jump ruby-compilation ruby-mode ];
         meta = {
-          homepage = "http://melpa.org/#/rinari";
+          homepage = "https://melpa.org/#/rinari";
           license = lib.licenses.free;
         };
       }) {};
@@ -48548,13 +50464,13 @@
           sha256 = "0imsc44mcy5abmfin28d13l8mjjvyx6hxcsk81r0i8h12mxlmfkp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rings";
           sha256 = "1ncsb4jip07hbrf1l4j9yzn3l0kb63ylhzzsb4bb2yx6as4a66k7";
           name = "rings";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rings";
+          homepage = "https://melpa.org/#/rings";
           license = lib.licenses.free;
         };
       }) {};
@@ -48569,34 +50485,55 @@
           sha256 = "1drvyf5asjp3lgpss7llff35q8r89vmh73n1axaj2qp9jx5a5jih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rnc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rnc-mode";
           sha256 = "09ly7ln6qrcmmim9bl7kd50h4axrhy6ig406r352xm4a9zc8n22q";
           name = "rnc-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rnc-mode";
+          homepage = "https://melpa.org/#/rnc-mode";
           license = lib.licenses.free;
         };
       }) {};
     robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
     melpaBuild {
         pname = "robe";
-        version = "20160121.1751";
+        version = "20160303.1027";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "robe";
-          rev = "7c56895b6c2fd5d6c9572182f5de10ebe5bfc977";
-          sha256 = "01xd3nc7bmf4r4d37x08rw2dlsg6gns8mraahi4rwkg6a9lwl44n";
+          rev = "b260da4812d9cba53622a95d5464697f90761006";
+          sha256 = "1by1r0fycvbrbvzrc1z2kd644hyndcrzi6gvplqaz8jkyy88nnny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/robe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/robe";
           sha256 = "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk";
           name = "robe";
         };
         packageRequires = [ inf-ruby ];
         meta = {
-          homepage = "http://melpa.org/#/robe";
+          homepage = "https://melpa.org/#/robe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    robots-txt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "robots-txt-mode";
+        version = "20160312.951";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "robots-txt-mode";
+          rev = "7b524685036d339a8aff1481697fbcd529dfa8f7";
+          sha256 = "0dimmdz4aqcif4lp23nqxfg7kngzym2yivn6h3p7bn1821vgzq9s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/robots-txt-mode";
+          sha256 = "1q3fqaf9nysy9bhx4h9idgshxr65hfwnx05vlwazx7jd6bq6kxfh";
+          name = "robots-txt-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/robots-txt-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -48611,34 +50548,34 @@
           sha256 = "0rgv4y9aa5cc2ddz3y5z8d22xmr8kf5c60h0r3g8h91jmcw3rb4z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/roguel-ike";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/roguel-ike";
           sha256 = "1a7sa6nhgi0s4gjh55bhk5cg6q6s7564fk008ibmrm05gfq9wlg8";
           name = "roguel-ike";
         };
         packageRequires = [ popup ];
         meta = {
-          homepage = "http://melpa.org/#/roguel-ike";
+          homepage = "https://melpa.org/#/roguel-ike";
           license = lib.licenses.free;
         };
       }) {};
     rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rope-read-mode";
-        version = "20160208.1710";
+        version = "20160416.421";
         src = fetchFromGitHub {
           owner = "marcowahl";
           repo = "rope-read-mode";
-          rev = "a763ebdbc9876cddf00794b08566ff6b87364064";
-          sha256 = "07jvk55asxn9lqqzgfl16zxgj2s30jqkygiha067rasbh4hs1ihi";
+          rev = "5b9d44b5af74e909092efed6f732dc7d20529eb0";
+          sha256 = "0kbi4f6v289v25n9silf7z0sdd8930pcaqdjrrrs7nkkjcl12sd0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rope-read-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rope-read-mode";
           sha256 = "0grnn5k6rbck0hz4c6cadgj3a4dv62habyingznisg2kx9i3m0dw";
           name = "rope-read-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rope-read-mode";
+          homepage = "https://melpa.org/#/rope-read-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -48653,13 +50590,13 @@
           sha256 = "13xrjd5p2zq0r8ifbqbrgjfm0jj09nyxcbhk262jr6f171rf0y2m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rotate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rotate";
           sha256 = "0dygdd24flbgqp049sl4p8rymvv8h881hz9lvz8hnfwq687yyclx";
           name = "rotate";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rotate";
+          homepage = "https://melpa.org/#/rotate";
           license = lib.licenses.free;
         };
       }) {};
@@ -48674,13 +50611,13 @@
           sha256 = "04jbnm9is2cis75h40znqzjvyjq27ncr2vfank6zglzi4fhxsl0r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/roy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/roy-mode";
           sha256 = "0ch0hamvw4gsqs2pap0h6w4cj6n73jqa75if0ymh73hk5i3acm8g";
           name = "roy-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/roy-mode";
+          homepage = "https://melpa.org/#/roy-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -48695,13 +50632,13 @@
           sha256 = "01rb6qfsk4f33nkfdzvvjkw96ip1dv0py8i30l8ix9cqbk07svsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rpm-spec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rpm-spec-mode";
           sha256 = "01vggdv8sac4p0szwk7xgxcglmd5a1hv5q0ylf8zcp1lsyyh8ypd";
           name = "rpm-spec-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rpm-spec-mode";
+          homepage = "https://melpa.org/#/rpm-spec-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -48716,13 +50653,13 @@
           sha256 = "0i5qwbhhdnspgs2y67kkgbk9zq6fx2j509q92mgfzbvjnf54h1r8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rpn-calc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rpn-calc";
           sha256 = "04dj2r4035k0c3x6iyjydshzmq381d60pmscp2hg5m7sp7bqn5xs";
           name = "rpn-calc";
         };
         packageRequires = [ popup ];
         meta = {
-          homepage = "http://melpa.org/#/rpn-calc";
+          homepage = "https://melpa.org/#/rpn-calc";
           license = lib.licenses.free;
         };
       }) {};
@@ -48737,55 +50674,55 @@
           sha256 = "0xkr1qn8fm3kv5c11janq5acp1q02abvxc463zijvm2qk735yl4d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rsense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rsense";
           sha256 = "1901xqlpc8fg4sl9j58jn40i2djs8s0cdcqcrzrq02lvk8ssfdf5";
           name = "rsense";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rsense";
+          homepage = "https://melpa.org/#/rsense";
           license = lib.licenses.free;
         };
       }) {};
     rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
     melpaBuild {
         pname = "rspec-mode";
-        version = "20160124.1607";
+        version = "20160425.1657";
         src = fetchFromGitHub {
           owner = "pezra";
           repo = "rspec-mode";
-          rev = "c6eb793e46e6ce5a9be8871235f0911a412f68ad";
-          sha256 = "1zbpp9n35l589i7yla4l93nvp5ngwsj9p44glhz9jxzlkjwig9a1";
+          rev = "87a89718839d96796da10fd91f7a6f08fb775f71";
+          sha256 = "1mlcr4br831cbxd90z61kynvir704mafv4avas44bzk8m1m188kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rspec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rspec-mode";
           sha256 = "0nyib9rx9w9cbsgkcjx9n8fp77xkzxg923z0rdm3f9kc7njcn0zx";
           name = "rspec-mode";
         };
         packageRequires = [ cl-lib ruby-mode ];
         meta = {
-          homepage = "http://melpa.org/#/rspec-mode";
+          homepage = "https://melpa.org/#/rspec-mode";
           license = lib.licenses.free;
         };
       }) {};
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20160221.1307";
+        version = "20160420.1258";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "9f912e5ca5e1f8bfd53b76031be76c20141f8871";
-          sha256 = "0bkjqqmr3zc4wq2j1afpvnrsdhmp33kl9dbw5169xja6znn4sn92";
+          rev = "1576dc4931039caa2193bf7d043f90407dd12bc3";
+          sha256 = "0c06jaywcnbh2fr3ias9q4cz89fcp9nbf8in83jap8f4l94a4zf6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rtags";
           sha256 = "08clwydx2b9cl4wv61b0p564jpvq7gzkrlcdkchpi4yz6djbp0lw";
           name = "rtags";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rtags";
+          homepage = "https://melpa.org/#/rtags";
           license = lib.licenses.free;
         };
       }) {};
@@ -48800,13 +50737,13 @@
           sha256 = "1gqvp0h5zy2023gdzf7pw28rl27lzml87vpbi1zaw4bmj82zgh3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rtm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rtm";
           sha256 = "1ni2610svxziq1gq6s6igkhqyafvgn02gnw7jbm3ir7ks4w2imzf";
           name = "rtm";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/rtm";
+          homepage = "https://melpa.org/#/rtm";
           license = lib.licenses.free;
         };
       }) {};
@@ -48821,13 +50758,13 @@
           sha256 = "1y5z0kr4qwd4fyvhk0rhpbbp6dw2jpzrawx62jid5539wrdjcabk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rubocop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rubocop";
           sha256 = "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q";
           name = "rubocop";
         };
         packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/rubocop";
+          homepage = "https://melpa.org/#/rubocop";
           license = lib.licenses.free;
         };
       }) {};
@@ -48837,17 +50774,17 @@
         version = "20091002.545";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "53886";
-          sha256 = "0wrjx25qg1dpgw0gih7fd679fv3q78cwaqyrf5dh1kq8g8cr5xhs";
+          rev = "54789";
+          sha256 = "07j1lclp6jqhyzfw8h4a21kx39nz946h6lgmn959rvckhkijr514";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-additional";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ruby-additional";
           sha256 = "0h0cxik8lp8g81bvp06mddikkk5bjdlch2wffcvsvi01is408w4w";
           name = "ruby-additional";
         };
         packageRequires = [ emacs ruby-mode ];
         meta = {
-          homepage = "http://melpa.org/#/ruby-additional";
+          homepage = "https://melpa.org/#/ruby-additional";
           license = lib.licenses.free;
         };
       }) {};
@@ -48855,17 +50792,17 @@
         pname = "ruby-block";
         version = "20131210.2131";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/ruby-block.el";
+          url = "https://www.emacswiki.org/emacs/download/ruby-block.el";
           sha256 = "0c4vy9xsw44g6q9nc8aaav5avgp34h24mvgcnww468afiimivdcq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-block";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ruby-block";
           sha256 = "0jfimjq1xpwxkxya452kp27h0fdiy87aj713w3zsm04k7l6i12hm";
           name = "ruby-block";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ruby-block";
+          homepage = "https://melpa.org/#/ruby-block";
           license = lib.licenses.free;
         };
       }) {};
@@ -48880,13 +50817,13 @@
           sha256 = "1kg83z10jw4ik0aapv9cjqlvqy31rln2am8vh3f77zh61qha37hx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-compilation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ruby-compilation";
           sha256 = "1x1vpkjpx95sfcjhkx4cafypj0nkbd1i0mzxx3lmcrsmg8iv0rjc";
           name = "ruby-compilation";
         };
         packageRequires = [ inf-ruby ];
         meta = {
-          homepage = "http://melpa.org/#/ruby-compilation";
+          homepage = "https://melpa.org/#/ruby-compilation";
           license = lib.licenses.free;
         };
       }) {};
@@ -48901,13 +50838,13 @@
           sha256 = "1cy5zmdfwsjw8jla8mxjm1cmvrv727fwq1kqhjr5nxj0flwsm4x1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-dev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ruby-dev";
           sha256 = "0mf2ra3p5976qn4ryc2s20vi0nrzwcg3xvsgppsc0bsirjw2l0fh";
           name = "ruby-dev";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ruby-dev";
+          homepage = "https://melpa.org/#/ruby-dev";
           license = lib.licenses.free;
         };
       }) {};
@@ -48917,17 +50854,17 @@
         version = "20150424.952";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "53886";
-          sha256 = "0wrjx25qg1dpgw0gih7fd679fv3q78cwaqyrf5dh1kq8g8cr5xhs";
+          rev = "54789";
+          sha256 = "07j1lclp6jqhyzfw8h4a21kx39nz946h6lgmn959rvckhkijr514";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-electric";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ruby-electric";
           sha256 = "04j04dsknzb7xc8v6alawgcbymdfmh27xnpr98yc8b05nzafw056";
           name = "ruby-electric";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ruby-electric";
+          homepage = "https://melpa.org/#/ruby-electric";
           license = lib.licenses.free;
         };
       }) {};
@@ -48937,18 +50874,18 @@
         version = "20141215.623";
         src = fetchFromGitHub {
           owner = "rejeep";
-          repo = "ruby-end";
+          repo = "ruby-end.el";
           rev = "ea453f5ac6259f09667fa26b865b6afacd06aa97";
           sha256 = "1x4nvrq5nk50c1l3b5wcr4g1n5nmwafcz1zzc12qzsl5sya7si55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-end";
-          sha256 = "0cx121hji8ws6s3p2xfdgidm363y05g2n880fqrmzyz27cqkljis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ruby-end";
+          sha256 = "1cnmdlkhm8xsifbjs6ymvi92gdnxiaghb04h10qg41phj6v7m9mg";
           name = "ruby-end";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ruby-end";
+          homepage = "https://melpa.org/#/ruby-end";
           license = lib.licenses.free;
         };
       }) {};
@@ -48963,13 +50900,13 @@
           sha256 = "15b2rs6m4d511qqkc2gc8k15mbqzrgv6s3hpypajl8nvqa79xnyd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-factory";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ruby-factory";
           sha256 = "0v8009pad0l41zh9r1wzcx1h6vpzhr5rgpq6rb002prxz2lcbd37";
           name = "ruby-factory";
         };
         packageRequires = [ inflections ];
         meta = {
-          homepage = "http://melpa.org/#/ruby-factory";
+          homepage = "https://melpa.org/#/ruby-factory";
           license = lib.licenses.free;
         };
       }) {};
@@ -48984,13 +50921,13 @@
           sha256 = "080hmrh7pgpaj33w1rkhcqb1yp70w4cap0rq9hsxaaajj0sn47z3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-guard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ruby-guard";
           sha256 = "0hwxhirdvaysw9hxcgfdf0l12wilr6b9f9w91pk1hfwfi1w0lfwr";
           name = "ruby-guard";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ruby-guard";
+          homepage = "https://melpa.org/#/ruby-guard";
           license = lib.licenses.free;
         };
       }) {};
@@ -49005,13 +50942,13 @@
           sha256 = "0knl8zrd4pplnzk5z19cf9rqdfr3ymzfssrwp6jhndjzjdwvc2bv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-hash-syntax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ruby-hash-syntax";
           sha256 = "0bvwyagfh7mn457iibrpv1ay75089gp8pg608gbm24m0ix82xvb5";
           name = "ruby-hash-syntax";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ruby-hash-syntax";
+          homepage = "https://melpa.org/#/ruby-hash-syntax";
           license = lib.licenses.free;
         };
       }) {};
@@ -49026,13 +50963,13 @@
           sha256 = "1r2f5jxi6wnkmr1ssvqgshi97gjvxvf3qqc0njg1s33cy39wpqq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-interpolation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ruby-interpolation";
           sha256 = "07idndxw8vgfrk5zfmjjhmixza35mqxwjhsrbjrq5yy72i5ivznp";
           name = "ruby-interpolation";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ruby-interpolation";
+          homepage = "https://melpa.org/#/ruby-interpolation";
           license = lib.licenses.free;
         };
       }) {};
@@ -49047,13 +50984,13 @@
           sha256 = "13008ih4hwa80bn2dbgj551knbvgpriz5sb241rkf7mifmlfzgsi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ruby-refactor";
           sha256 = "0nwinnnhy72h1ihjlnjl8k8z3yf4nl2z7hfv085gwiacr6nn2rby";
           name = "ruby-refactor";
         };
         packageRequires = [ ruby-mode ];
         meta = {
-          homepage = "http://melpa.org/#/ruby-refactor";
+          homepage = "https://melpa.org/#/ruby-refactor";
           license = lib.licenses.free;
         };
       }) {};
@@ -49068,13 +51005,13 @@
           sha256 = "06fhrn04whqb3n40wkzrwmzbzv7b1m48rd18rx8zpgxhbw8v7rdc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-test-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ruby-test-mode";
           sha256 = "113ysf08bfh2ipk55f8h741j05999yrgx57mzh53rim5n63a312w";
           name = "ruby-test-mode";
         };
         packageRequires = [ ruby-mode ];
         meta = {
-          homepage = "http://melpa.org/#/ruby-test-mode";
+          homepage = "https://melpa.org/#/ruby-test-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -49084,18 +51021,18 @@
         version = "20151209.1015";
         src = fetchFromGitHub {
           owner = "rejeep";
-          repo = "ruby-tools";
+          repo = "ruby-tools.el";
           rev = "6b97066b58a4f82eb2ecea6434a0a7e981aa4c18";
           sha256 = "0jd9acycpbdd90hallrl0k5055rypp502qv4c6i286p7f9is4kvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-tools";
-          sha256 = "1zs2vzcrw11xyj2a7lgqzw4slcha20206jvjbxkm68d57rffpk8y";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ruby-tools";
+          sha256 = "0zpk55rkrqyangyyljxzf0n1icgqnpdzycwack5rji556h5grvjy";
           name = "ruby-tools";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ruby-tools";
+          homepage = "https://melpa.org/#/ruby-tools";
           license = lib.licenses.free;
         };
       }) {};
@@ -49110,13 +51047,13 @@
           sha256 = "17dzr5w12ai2q15yv81gchk360yjs71w74vsgs2fyy2yznvclpq9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/runner";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/runner";
           sha256 = "09apmk22swj05z77ziij31jj6b3g221qv3mw3mymffzxn5ap2rbx";
           name = "runner";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/runner";
+          homepage = "https://melpa.org/#/runner";
           license = lib.licenses.free;
         };
       }) {};
@@ -49131,34 +51068,34 @@
           sha256 = "18w6gkpxp0g7rzvnrk8vvr267y768dfik447ssq8jpz3jlr5jnq6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/runtests";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/runtests";
           sha256 = "0m9rqjb5c0yqr2wv5dsdiba21knr63b5pxsqgbkbybi15zgxcicb";
           name = "runtests";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/runtests";
+          homepage = "https://melpa.org/#/runtests";
           license = lib.licenses.free;
         };
       }) {};
-    rust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rust-mode";
-        version = "20160216.1934";
+        version = "20160425.2319";
         src = fetchFromGitHub {
           owner = "rust-lang";
           repo = "rust-mode";
-          rev = "b1cca0fa73633dcee5704423d9421bfccf12385d";
-          sha256 = "0124w1br75aldnlsavd7r06y7k7q7cc1szmza8f6mwbpfzy038sr";
+          rev = "b23efef0b6a6a632b70c1db5579a835059239e4c";
+          sha256 = "1qsxxpr80y7fz5zh2i8hyifqmhbkrlnqls6gcck2n3ahv30sa1i3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rust-mode";
-          sha256 = "0h4gblg6ls8a2wa43r990lanl6ykx8j7c8yg5i3n151imzic2n33";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rust-mode";
+          sha256 = "1i1mw1v99nyikscg2s1m216b0h8svbzmf5kjvjgk9zjiba4cbqzc";
           name = "rust-mode";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/rust-mode";
+          homepage = "https://melpa.org/#/rust-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -49173,13 +51110,13 @@
           sha256 = "0c22cxa4f6plz67vxmp1zgaylkfrky313cj0zybn9akrbcxpbc34";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rustfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rustfmt";
           sha256 = "1znav2pbax0rsvdl85mmbgbmxy7gnrm4nx54ij1ff6yd831r5jyl";
           name = "rustfmt";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/rustfmt";
+          homepage = "https://melpa.org/#/rustfmt";
           license = lib.licenses.free;
         };
       }) {};
@@ -49194,34 +51131,34 @@
           sha256 = "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rvm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rvm";
           sha256 = "08i7cmav2cz73jp88ww0ay2yjhk9dj8146836q4sij1bl1slbaf8";
           name = "rvm";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rvm";
+          homepage = "https://melpa.org/#/rvm";
           license = lib.licenses.free;
         };
       }) {};
     s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "s";
-        version = "20160115.258";
+        version = "20160405.1120";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "s.el";
-          rev = "a56f0d0fedf9754e1728067ac868100f2499357d";
-          sha256 = "08vf62fcrnbmf2ppb759kzznjdz8x72fqdwbc4n8nbswrwgm2ikl";
+          rev = "b2436c2ee5c1f3284b567c4cd48e5b4ed953d49e";
+          sha256 = "1lk8vjrbjpw8z5gdadx86b0554djpg928s7wkq8qkr8qm7dd85aa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/s";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/s";
           sha256 = "0b2lj6nj08pk5fnxvjkc1d9hvi29rnjjy4n5ns4pq6wxpfnlcw64";
           name = "s";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/s";
+          homepage = "https://melpa.org/#/s";
           license = lib.licenses.free;
         };
       }) {};
@@ -49236,13 +51173,13 @@
           sha256 = "06ng960fj2ivnwb0hrn0qic5x8hb0sswjzph01zmwhbfnwykhr85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/s-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/s-buffer";
           sha256 = "07kivgzv24psjq1240gwj9wkndq4bhvjh38x552k90m9v6jz8l6m";
           name = "s-buffer";
         };
         packageRequires = [ noflet s ];
         meta = {
-          homepage = "http://melpa.org/#/s-buffer";
+          homepage = "https://melpa.org/#/s-buffer";
           license = lib.licenses.free;
         };
       }) {};
@@ -49257,34 +51194,34 @@
           sha256 = "06gqqbkn85l2p05whmr4wkg9axqyzb7r7sgm3r8wfshm99kgpxvl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sackspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sackspace";
           sha256 = "1m10iw83k6m7v7sg2dxzdy83zxq6svk8h9fh4ankyn3baqrdxg5z";
           name = "sackspace";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sackspace";
+          homepage = "https://melpa.org/#/sackspace";
           license = lib.licenses.free;
         };
       }) {};
     sage-shell-mode = callPackage ({ cl-lib ? null, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sage-shell-mode";
-        version = "20160220.2028";
+        version = "20160414.2114";
         src = fetchFromGitHub {
           owner = "stakemori";
           repo = "sage-shell-mode";
-          rev = "30461322fc8530b8be87d873aafff5a7c5044c24";
-          sha256 = "1z171hrm6fscrdw9z1b2wh0br6axg53r853n2mdk33k3yvwyd6z8";
+          rev = "b062bb138d137bf0c96fecaad6f67b8033d551d5";
+          sha256 = "17pxr7y60im9gpi50v3b1hswahrkdwc2hqycxpb5x9g0xd6w797b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sage-shell-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sage-shell-mode";
           sha256 = "18k7yh8rczng0kn2wsawjml70cb5bnc5jr2gj0hini5f7jq449wx";
           name = "sage-shell-mode";
         };
         packageRequires = [ cl-lib deferred ];
         meta = {
-          homepage = "http://melpa.org/#/sage-shell-mode";
+          homepage = "https://melpa.org/#/sage-shell-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -49299,13 +51236,13 @@
           sha256 = "1hl227bmjch0vq7n47mwydkyxnd6wkbz9klk3c4398qmc2qxm5kn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/salt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/salt-mode";
           sha256 = "1r5k7022vxgj3p5l16y839lff85z0m9hpifq59knij61g9hxadsp";
           name = "salt-mode";
         };
         packageRequires = [ mmm-jinja2 mmm-mode yaml-mode ];
         meta = {
-          homepage = "http://melpa.org/#/salt-mode";
+          homepage = "https://melpa.org/#/salt-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -49320,13 +51257,13 @@
           sha256 = "1r6b6n2bzjznjfimgcm0vnmln4sbyasm4icmdgbpzahdmbkfzq3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sane-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sane-term";
           sha256 = "0iz63b62x5jrz7c23i850634k4bk73kg1h4wj1ravx3wlgvzs8y8";
           name = "sane-term";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/sane-term";
+          homepage = "https://melpa.org/#/sane-term";
           license = lib.licenses.free;
         };
       }) {};
@@ -49341,13 +51278,13 @@
           sha256 = "0srz4j7484v5h7hmdlyrcl2k27jhy414689wphbbyj63rvg321cm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sass-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sass-mode";
           sha256 = "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800";
           name = "sass-mode";
         };
         packageRequires = [ cl-lib haml-mode ];
         meta = {
-          homepage = "http://melpa.org/#/sass-mode";
+          homepage = "https://melpa.org/#/sass-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -49362,13 +51299,13 @@
           sha256 = "0y6a0z2ydc5li3990mfhcgz5mrb89sj8s8dvdgmnv8pgdhn1xmb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sauron";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sauron";
           sha256 = "01fk1xfh7r16fb1xg5ibbs7gci9dja49msdlf7964hiq7pnnhxgb";
           name = "sauron";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sauron";
+          homepage = "https://melpa.org/#/sauron";
           license = lib.licenses.free;
         };
       }) {};
@@ -49376,17 +51313,17 @@
         pname = "save-load-path";
         version = "20131228.1352";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/save-load-path.el";
+          url = "https://www.emacswiki.org/emacs/download/save-load-path.el";
           sha256 = "1p8p5b85sdnq45rdjq5wcr3xz7c22mr5bz41a21mkabc4j4fvd3z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/save-load-path";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/save-load-path";
           sha256 = "01hm1rm9x3bqs6vf65l4xv2n4ramh3qwgmrp632fyfz5dlrvbssi";
           name = "save-load-path";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/save-load-path";
+          homepage = "https://melpa.org/#/save-load-path";
           license = lib.licenses.free;
         };
       }) {};
@@ -49401,13 +51338,13 @@
           sha256 = "00jvl1npc889f3isi7cbdzwvf9x4rq67zgl7br8npxf8jlc2mwhm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/save-visited-files";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/save-visited-files";
           sha256 = "1pmjz27dlp5yrihgsy8q1bwbhkkj3sn7d79ccvljvzxg5jn1grkd";
           name = "save-visited-files";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/save-visited-files";
+          homepage = "https://melpa.org/#/save-visited-files";
           license = lib.licenses.free;
         };
       }) {};
@@ -49415,38 +51352,38 @@
         pname = "savekill";
         version = "20140417.2134";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/savekill.el";
+          url = "https://www.emacswiki.org/emacs/download/savekill.el";
           sha256 = "1qfq83cb4qixdl15j28rlslkq6g88ig55ydg747jqb3dqyp3qaah";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/savekill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/savekill";
           sha256 = "1l14p6wkzfhlqxnd9fpw123vg9q5k20ld7rciyzbfdb99pk9z02i";
           name = "savekill";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/savekill";
+          homepage = "https://melpa.org/#/savekill";
           license = lib.licenses.free;
         };
       }) {};
     sbt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, scala-mode2 }:
     melpaBuild {
         pname = "sbt-mode";
-        version = "20160219.448";
+        version = "20160316.220";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "fc4fa63c8f788625030092c4450112ec67ae27ed";
-          sha256 = "16ckzn2pv8lh16xna9wqisiflhrk0f6kj5zgrygbmsl86kc0rk2a";
+          rev = "f1514212d86643c4bf1657ff6682b66472a69362";
+          sha256 = "0fi07445hyfifcfzxim9947mjcdj5m40minaq89mrxpfndj9jk8l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sbt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sbt-mode";
           sha256 = "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8";
           name = "sbt-mode";
         };
         packageRequires = [ scala-mode2 ];
         meta = {
-          homepage = "http://melpa.org/#/sbt-mode";
+          homepage = "https://melpa.org/#/sbt-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -49457,17 +51394,17 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "a2fc2044a9302332427315decc4b925e0b0ad310";
-          sha256 = "0ckns5sqpjlw4ndgyl3bij5pidlm6xjc534fxzwz2s2h2bqbz9q8";
+          rev = "50441e85a2d0920af6a1a886b97edc001f4dc0ae";
+          sha256 = "0051bgs1lfdsy84b4j1746clslc3fmn0nsnig3f8ks9ndfav3rj4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scad-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/scad-mode";
           sha256 = "04b4y9jks8sslgmkx54fds8fba9xv54z0cfab52dy99v1301ms3k";
           name = "scad-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/scad-mode";
+          homepage = "https://melpa.org/#/scad-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -49482,13 +51419,13 @@
           sha256 = "13x00dls59zshz69260pnqmx6ydrjg8p2jdjn1rzgf5dsmwfy3sc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scad-preview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/scad-preview";
           sha256 = "0wcd2r60ibbc2mzpq8fvyfc1fy172rf9kzdj51p4jyl51r76i86z";
           name = "scad-preview";
         };
         packageRequires = [ scad-mode ];
         meta = {
-          homepage = "http://melpa.org/#/scad-preview";
+          homepage = "https://melpa.org/#/scad-preview";
           license = lib.licenses.free;
         };
       }) {};
@@ -49503,13 +51440,13 @@
           sha256 = "0qd3yi2as30kacr74vbzvyq97684s8sz585z30d47shqcvp6l1a6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scala-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/scala-mode";
           sha256 = "1vbgphmvvsj5jl8f78rpsidlmlgyp1kq3nkmziqhwkcq8hfywssm";
           name = "scala-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/scala-mode";
+          homepage = "https://melpa.org/#/scala-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -49524,13 +51461,13 @@
           sha256 = "07928cll5n3s7xx75nfbil73zilrhdfh19hp4s75c7hh8sdwmig6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scala-mode2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/scala-mode2";
           sha256 = "0rnkln6jwwqc968w3qpc6zjjv8ylw0w6c2hsjpq2slja3jn5khch";
           name = "scala-mode2";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/scala-mode2";
+          homepage = "https://melpa.org/#/scala-mode2";
           license = lib.licenses.free;
         };
       }) {};
@@ -49545,13 +51482,13 @@
           sha256 = "1wf3d5spvi9kr4q2w7f18g1bm10fh2zbh4sdbqkf78afv6sbqzrz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scala-outline-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/scala-outline-popup";
           sha256 = "1fq0k6l57wkya1ycm4cc190kg90j2k9clnl0sc70achp4i47qbk7";
           name = "scala-outline-popup";
         };
         packageRequires = [ dash flx-ido popup scala-mode2 ];
         meta = {
-          homepage = "http://melpa.org/#/scala-outline-popup";
+          homepage = "https://melpa.org/#/scala-outline-popup";
           license = lib.licenses.free;
         };
       }) {};
@@ -49566,33 +51503,34 @@
           sha256 = "0m7hanpc2skmsz783m0212xd10y31gkj5n6w8gx9s989l1y4i1b8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scf-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/scf-mode";
           sha256 = "0acbrw94q6cr9b29mz1wcbwi1g90pbm7ly2xbaqb2g8081r5rgg0";
           name = "scf-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/scf-mode";
+          homepage = "https://melpa.org/#/scf-mode";
           license = lib.licenses.free;
         };
       }) {};
-    scheme-complete = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+    scheme-complete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "scheme-complete";
-        version = "20130220.603";
-        src = fetchhg {
-          url = "http://code.google.com/p/scheme-complete/";
-          rev = "e2ec67dfb1ff";
-          sha256 = "13pym1kwi8ah3h2l557pvbg4lgpp5lhldj3qxyg7gyvgkwr91a7g";
+        version = "20160408.849";
+        src = fetchFromGitHub {
+          owner = "ashinn";
+          repo = "scheme-complete";
+          rev = "3f49e2935d89e387ce6649c9adc764d15eecee3a";
+          sha256 = "0555rmhcm9cvm0wljcbz3j04qwgl9cnjmcz324kwlv94ph5gp752";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scheme-complete";
-          sha256 = "1nam7xzw8hrykz73q9x24szpjv2kpkp48lcmzf02kzj3cg6l76qm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/scheme-complete";
+          sha256 = "1mp9gssd2fx3ra2bjd7w311hwmflhybr5x574qb12603gjkgrp1h";
           name = "scheme-complete";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/scheme-complete";
+          homepage = "https://melpa.org/#/scheme-complete";
           license = lib.licenses.free;
         };
       }) {};
@@ -49601,19 +51539,19 @@
         pname = "scheme-here";
         version = "20141028.218";
         src = fetchFromGitHub {
-          owner = "judevc";
+          owner = "hiddenlotus";
           repo = "scheme-here";
           rev = "430ba017cc530865218de23a8f7985095a58343f";
           sha256 = "09cvrphrnbj8avnlqqv6scjz17cn6zm6mzghjn3vxfr4hql66rir";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scheme-here";
-          sha256 = "137qqfnla3hjm6qcnzpsgrw173px0k5dwq9apns5cdryxx3ahcvv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/scheme-here";
+          sha256 = "04lmkf3zc396anlp9s9irdkqavsc0lzlpzprswd4r2kp4xp7kcks";
           name = "scheme-here";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/scheme-here";
+          homepage = "https://melpa.org/#/scheme-here";
           license = lib.licenses.free;
         };
       }) {};
@@ -49628,13 +51566,13 @@
           sha256 = "0ark720g0nrdqri5bjdpss6kn6k3hz3w3zdvy334wws05mkb17y4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/scion";
           sha256 = "17qmc7fpvbamqkzyk8jspp2i0nw93iya4iwddvas7vdpjy7mk81d";
           name = "scion";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/scion";
+          homepage = "https://melpa.org/#/scion";
           license = lib.licenses.free;
         };
       }) {};
@@ -49649,13 +51587,13 @@
           sha256 = "0v36zd8lnsbc7jvnhv5pidfxabq2qqmwg1nm2jdxfj6vvcg3vx0x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sclang-extensions";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sclang-extensions";
           sha256 = "00nirxawsngvlx7bmf5hqg2wk0l1v5pi09r6phzd0q8gyq3kmbbn";
           name = "sclang-extensions";
         };
         packageRequires = [ auto-complete dash emacs s ];
         meta = {
-          homepage = "http://melpa.org/#/sclang-extensions";
+          homepage = "https://melpa.org/#/sclang-extensions";
           license = lib.licenses.free;
         };
       }) {};
@@ -49670,13 +51608,13 @@
           sha256 = "0vbcghgapwdf3jgjnjdla17dhf5mkmwapz4a8fmlr7sw1wqvj857";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sclang-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sclang-snippets";
           sha256 = "0q1bh316v737a0hm9afijk1spvg144cgrf45jm0bpd60zhiv7bb2";
           name = "sclang-snippets";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/sclang-snippets";
+          homepage = "https://melpa.org/#/sclang-snippets";
           license = lib.licenses.free;
         };
       }) {};
@@ -49691,13 +51629,13 @@
           sha256 = "1jgg116rhhgs5qrngrmqi8ir7yj1h470f57dc7fyijw0ly5mp6ii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scpaste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/scpaste";
           sha256 = "02dqmx6v3jxdn5yz1z74624sc6sz2bm4qjyi78w9akhp2jplwlk1";
           name = "scpaste";
         };
         packageRequires = [ htmlize ];
         meta = {
-          homepage = "http://melpa.org/#/scpaste";
+          homepage = "https://melpa.org/#/scpaste";
           license = lib.licenses.free;
         };
       }) {};
@@ -49712,13 +51650,13 @@
           sha256 = "0ykhr24vpx3byn2n346nqqvmwcg34hk22s3lpdx7lpnkrn5z41aq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/scratch";
           sha256 = "1c6vxpd9c24d2flzwgvzqz0wr70xzqqs3f59pp897h0f7j91im5d";
           name = "scratch";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/scratch";
+          homepage = "https://melpa.org/#/scratch";
           license = lib.licenses.free;
         };
       }) {};
@@ -49733,13 +51671,13 @@
           sha256 = "0ng0by647r49mia7vmjqc97gwlwgs8kmaz0lw2y54jdz8m0bbngp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scratch-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/scratch-ext";
           sha256 = "031wxz10k1q4bi5hywhcw1vzi41d5pv5hc09x8jk9s5nzyssvc0y";
           name = "scratch-ext";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/scratch-ext";
+          homepage = "https://melpa.org/#/scratch-ext";
           license = lib.licenses.free;
         };
       }) {};
@@ -49754,13 +51692,34 @@
           sha256 = "030mcq0cmamizvra8jh2x76f71g5apiavwb10c28j62rl0r5bisk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scratch-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/scratch-log";
           sha256 = "1yp3p0dzhmqrd0krqii3x79k4zc3p59148cijhk6my4n1xqnhs69";
           name = "scratch-log";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/scratch-log";
+          homepage = "https://melpa.org/#/scratch-log";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scratch-message = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "scratch-message";
+        version = "20160323.1546";
+        src = fetchFromGitHub {
+          owner = "thisirs";
+          repo = "scratch-message";
+          rev = "fc78fe1197e68dda4e86e1806feed09f78abbd92";
+          sha256 = "1qic0saz5pflgaf48sqsnw18y9amfkkflf8c534hdd053w77h8qh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/scratch-message";
+          sha256 = "1dl9d4gvicwnb662ir9azywjmmm7xv4d0sz42z7mmwy8hl9hi91b";
+          name = "scratch-message";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/scratch-message";
           license = lib.licenses.free;
         };
       }) {};
@@ -49775,13 +51734,13 @@
           sha256 = "00b4r8bqlxc29k18vig0164d5c9fp5bp5q26d28lwr4f0s4a71d2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scratch-palette";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/scratch-palette";
           sha256 = "0m6hc2amwnnii4y189kkridhapl9jipkmadvrmwvspgy3lxhlafs";
           name = "scratch-palette";
         };
         packageRequires = [ popwin ];
         meta = {
-          homepage = "http://melpa.org/#/scratch-palette";
+          homepage = "https://melpa.org/#/scratch-palette";
           license = lib.licenses.free;
         };
       }) {};
@@ -49796,13 +51755,13 @@
           sha256 = "1yvmfiv1s83r0jcxzbxyrx3b263d73lbap6agansmrhkxp914xr1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scratch-pop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/scratch-pop";
           sha256 = "0s7g1fbnc5hgz8gqmp1lynj5g7vvxisj7scxx5wil9qpn2zyggq1";
           name = "scratch-pop";
         };
         packageRequires = [ popwin ];
         meta = {
-          homepage = "http://melpa.org/#/scratch-pop";
+          homepage = "https://melpa.org/#/scratch-pop";
           license = lib.licenses.free;
         };
       }) {};
@@ -49817,13 +51776,13 @@
           sha256 = "10hmy0p4pkrzvvyisk4rjc6hqqyk2sir1rszqgmkhrdywl010vlc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scratches";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/scratches";
           sha256 = "0409v1wi10q48rrh8iib6dw9icmswfrpjx9x7xcma994z080d2fy";
           name = "scratches";
         };
         packageRequires = [ dash f ];
         meta = {
-          homepage = "http://melpa.org/#/scratches";
+          homepage = "https://melpa.org/#/scratches";
           license = lib.licenses.free;
         };
       }) {};
@@ -49831,17 +51790,17 @@
         pname = "screenshot";
         version = "20120509.605";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/screenshot.el";
+          url = "https://www.emacswiki.org/emacs/download/screenshot.el";
           sha256 = "0q7yxaaa0fic4d2xwr0qk28clkinwz4xvw3wf8dv1g322s0xx2cw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/screenshot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/screenshot";
           sha256 = "0aw2343as38y26r2g7wpn1rq1n6xpw4y5c7ir8qh1crkc1y513hs";
           name = "screenshot";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/screenshot";
+          homepage = "https://melpa.org/#/screenshot";
           license = lib.licenses.free;
         };
       }) {};
@@ -49856,13 +51815,13 @@
           sha256 = "113pi7nsaksaacy74ngbvrvr6qcl7199xy662nj58bz5307yi9q0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scss-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/scss-mode";
           sha256 = "1g27xnp6bjaicxjlb9m0njc6fg962j3hlvvzmxvmyk7gsdgcgpkv";
           name = "scss-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/scss-mode";
+          homepage = "https://melpa.org/#/scss-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -49877,13 +51836,13 @@
           sha256 = "08yc67a4ji7z8s0zh500wiscziqsxi92i1d33fjla2mcr8sxxn0i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/search-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/search-web";
           sha256 = "0qqx9l8dn1as4gqpq80jfacn6lz0132m91pjzxv0fx6al2iz0m36";
           name = "search-web";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/search-web";
+          homepage = "https://melpa.org/#/search-web";
           license = lib.licenses.free;
         };
       }) {};
@@ -49898,13 +51857,13 @@
           sha256 = "0zs08vxmjb3y4dnfq6djnrhmkgyhhwd5zylrjisrd4y7f089fyh4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/searchq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/searchq";
           sha256 = "0flsc07v887pm62mslrv7zqnhl62l6348nkm77mizm1592q3kjgr";
           name = "searchq";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/searchq";
+          homepage = "https://melpa.org/#/searchq";
           license = lib.licenses.free;
         };
       }) {};
@@ -49919,13 +51878,13 @@
           sha256 = "15cjhwjiwmrfzmr74hbw5s92si2qdb8i97nmkbsgkj3444rxg239";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/seclusion-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/seclusion-mode";
           sha256 = "0ff10x6yr37vpp6ffbk1nb027lgmrydwjrb332fskwlf3xmy6v0m";
           name = "seclusion-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/seclusion-mode";
+          homepage = "https://melpa.org/#/seclusion-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -49933,17 +51892,17 @@
         pname = "second-sel";
         version = "20151231.1753";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/second-sel.el";
+          url = "https://www.emacswiki.org/emacs/download/second-sel.el";
           sha256 = "143vg6z3aa0znmsx88r675vv5g2c13giz25dcbzazsp4wcr46wvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/second-sel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/second-sel";
           sha256 = "1nzy5ms5qf5big507kg3z5m6d6zgnsv2fswn359r2j59cval3fvr";
           name = "second-sel";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/second-sel";
+          homepage = "https://melpa.org/#/second-sel";
           license = lib.licenses.free;
         };
       }) {};
@@ -49958,13 +51917,13 @@
           sha256 = "19p3zp4cj7ik2gwzc5k6klqc4b8jc2hvm80yhczc5b7k223gp2bv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/seeing-is-believing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/seeing-is-believing";
           sha256 = "05aja5xycb3kpmxyi234l50h98f5m1fil6ll4f2xkpxwv31ba5rb";
           name = "seeing-is-believing";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/seeing-is-believing";
+          homepage = "https://melpa.org/#/seeing-is-believing";
           license = lib.licenses.free;
         };
       }) {};
@@ -49979,13 +51938,13 @@
           sha256 = "0qd462qbqdx53xh3ddf76chiljxf6s43r28v2ix85gsig7nm5pgr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/seethru";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/seethru";
           sha256 = "1lcwslkki9s15xr2dmh2iic4ax8ia0j20hjnjmkv612wv04b806v";
           name = "seethru";
         };
         packageRequires = [ shadchen ];
         meta = {
-          homepage = "http://melpa.org/#/seethru";
+          homepage = "https://melpa.org/#/seethru";
           license = lib.licenses.free;
         };
       }) {};
@@ -50000,13 +51959,13 @@
           sha256 = "1as3llcs7jgcw9pafz4mbfml1cqd1fw8yl64bb4467nmhq2p18p7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sekka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sekka";
           sha256 = "1jj4ly9p7m3xvb31nfn171lbpm9y70y8cbf8p24w0fhv665dx0cp";
           name = "sekka";
         };
         packageRequires = [ cl-lib concurrent popup ];
         meta = {
-          homepage = "http://melpa.org/#/sekka";
+          homepage = "https://melpa.org/#/sekka";
           license = lib.licenses.free;
         };
       }) {};
@@ -50021,13 +51980,13 @@
           sha256 = "1c9yv1kjcd0jrzgw99q9p4kzj980f261mjcsggbcw806wb0iw1xn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/select-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/select-themes";
           sha256 = "18ydv7240vcqppg1i7n8sy18hy0lhpxz17947kxs7mvj4rl4wd84";
           name = "select-themes";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/select-themes";
+          homepage = "https://melpa.org/#/select-themes";
           license = lib.licenses.free;
         };
       }) {};
@@ -50042,34 +52001,55 @@
           sha256 = "18xdkisxvdizsk51pnyimp9mwc6k9cpcxqr5hgndkz9q97p5dp79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/selectric-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/selectric-mode";
           sha256 = "1k4l0lr68rqyi37wvqp1cnfci6jfkz0gvrd1hwbgx04cjgmz56n4";
           name = "selectric-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/selectric-mode";
+          homepage = "https://melpa.org/#/selectric-mode";
           license = lib.licenses.free;
         };
       }) {};
     semi = callPackage ({ fetchFromGitHub, fetchurl, flim, lib, melpaBuild }:
     melpaBuild {
         pname = "semi";
-        version = "20160211.255";
+        version = "20160301.900";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "semi";
-          rev = "33289fb506d22d639351e8a867fc7f34a1b86ff0";
-          sha256 = "17w6mf9khcmja7ikl0c895dv7s7g7pqm15svv7spfcb1p30lrh39";
+          rev = "f83561fb551fad1f899bf4f0ba68dae739da1761";
+          sha256 = "0x4n2d7jsadwknscnwj64s5320wbj4pc0zrcm2c8xfwwgr9wl47k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/semi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/semi";
           sha256 = "01wk3lgln5lac65hp6v83d292bdk7544z23xa1v6a756nhybwv25";
           name = "semi";
         };
         packageRequires = [ flim ];
         meta = {
-          homepage = "http://melpa.org/#/semi";
+          homepage = "https://melpa.org/#/semi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sendto = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sendto";
+        version = "20160425.750";
+        src = fetchFromGitHub {
+          owner = "lujun9972";
+          repo = "sendto.el";
+          rev = "076b81d7a53f75b0a59b0ef3448f35570567054c";
+          sha256 = "13qqprxz87cv3sjlq5hj0jp0qcfm3djfgasga8cc84ykrcc47p9f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sendto";
+          sha256 = "00ifasqpmggr4bhdyymzr215840y0ayfnfp0mh7wj99mr6f3zfq0";
+          name = "sendto";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/sendto";
           license = lib.licenses.free;
         };
       }) {};
@@ -50084,13 +52064,13 @@
           sha256 = "0g4jfcc5k26yh192bmmxnim9mqv993v2jjd9g9ssvnd42ihpx1n3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sensitive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sensitive";
           sha256 = "0v988k0x3mdp7ank2ihghphh8sanvv96s4sg6pnszg5hczak1vr3";
           name = "sensitive";
         };
         packageRequires = [ emacs sequences ];
         meta = {
-          homepage = "http://melpa.org/#/sensitive";
+          homepage = "https://melpa.org/#/sensitive";
           license = lib.licenses.free;
         };
       }) {};
@@ -50099,17 +52079,17 @@
         pname = "sentence-highlight";
         version = "20121026.950";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/sentence-highlight.el";
+          url = "https://www.emacswiki.org/emacs/download/sentence-highlight.el";
           sha256 = "01qj57zpqpr4rxk9bsx828c7baac1xaa58cz22fncirdx00svn2k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sentence-highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sentence-highlight";
           sha256 = "16kh6567hb9lczh8zpqwbzz5bikg2fsabifhhky8qwxp4dy07v9m";
           name = "sentence-highlight";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sentence-highlight";
+          homepage = "https://melpa.org/#/sentence-highlight";
           license = lib.licenses.free;
         };
       }) {};
@@ -50124,13 +52104,13 @@
           sha256 = "0ikiv12ahndvk5w9pdayqlmafwj8d1vkcshfnqmgy6ykqbcdpqk6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sentence-navigation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sentence-navigation";
           sha256 = "1p3ch1ab06v038h130fsxpbq45d1yadl67i2ih4l4fh3xah5997m";
           name = "sentence-navigation";
         };
         packageRequires = [ ample-regexps emacs ];
         meta = {
-          homepage = "http://melpa.org/#/sentence-navigation";
+          homepage = "https://melpa.org/#/sentence-navigation";
           license = lib.licenses.free;
         };
       }) {};
@@ -50145,13 +52125,13 @@
           sha256 = "15vmd1qmj8a6a5mmvdcnbav6mi5rhrp39m85idzv02zm0x9x6lyc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/seoul256-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/seoul256-theme";
           sha256 = "0mgyq725x5hmhs3h8v5macv8bfkginjghhwr9kli60vdb4skgjvp";
           name = "seoul256-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/seoul256-theme";
+          homepage = "https://melpa.org/#/seoul256-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -50166,13 +52146,13 @@
           sha256 = "1np6ip28ksms6fig67scwvwj43zgblny50ccvz8aclbl0z8nxswl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sequences";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sequences";
           sha256 = "12wnkywkmxfk2sx40h90k53d5qmc8hiky5vhlyf0ws3n39zvhplh";
           name = "sequences";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/sequences";
+          homepage = "https://melpa.org/#/sequences";
           license = lib.licenses.free;
         };
       }) {};
@@ -50181,17 +52161,17 @@
         pname = "sequential-command";
         version = "20151207.1603";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/sequential-command.el";
+          url = "https://www.emacswiki.org/emacs/download/sequential-command.el";
           sha256 = "0vg8rqzzi29swznhra2mnf45czr2vb77dpcxn3j0fi7gynx3wcwk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sequential-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sequential-command";
           sha256 = "03qybacgy5fs3lam73x0rds4f68s173mhbah6rr97272nikd50v1";
           name = "sequential-command";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sequential-command";
+          homepage = "https://melpa.org/#/sequential-command";
           license = lib.licenses.free;
         };
       }) {};
@@ -50200,19 +52180,19 @@
         pname = "servant";
         version = "20140216.619";
         src = fetchFromGitHub {
-          owner = "rejeep";
-          repo = "servant.el";
+          owner = "cask";
+          repo = "servant";
           rev = "4d2aa8250b54b28e6e7ee4cd5ebd98a33db2c134";
           sha256 = "15lx6qvmq3vp84ys8dzbx1nzxcnzlq41whawc2yhrnd1dbq4mv2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/servant";
-          sha256 = "048xg0gcwnf4l2p56iw4iawi3ywjz7f6icnjfi8qzk1z912iyl9h";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/servant";
+          sha256 = "0h8xsg37cvc5r8vkclf7d3gbf6gh4k5pmbiyhwpkbrxwjyl1sl21";
           name = "servant";
         };
         packageRequires = [ ansi commander dash epl f s shut-up web-server ];
         meta = {
-          homepage = "http://melpa.org/#/servant";
+          homepage = "https://melpa.org/#/servant";
           license = lib.licenses.free;
         };
       }) {};
@@ -50227,13 +52207,13 @@
           sha256 = "1h58q41wixjlapia1ggf83jxcllq7492k55mc0fq7hbx3hw1q1y2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/serverspec";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/serverspec";
           sha256 = "001d57yd0wmz4d7qmhnanac8g29wls0sqw194003hrgirakg82id";
           name = "serverspec";
         };
         packageRequires = [ dash f helm s ];
         meta = {
-          homepage = "http://melpa.org/#/serverspec";
+          homepage = "https://melpa.org/#/serverspec";
           license = lib.licenses.free;
         };
       }) {};
@@ -50248,13 +52228,13 @@
           sha256 = "0sp952abz7dkq8b8kkzzmnwnkq5w15zsx5dr3h8lzxb92lnank9v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/session";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/session";
           sha256 = "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx";
           name = "session";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/session";
+          homepage = "https://melpa.org/#/session";
           license = lib.licenses.free;
         };
       }) {};
@@ -50269,13 +52249,13 @@
           sha256 = "18igxblmrbxwhd2d68cz1bpj4524djh2dw2rwhxlij76f9v805wn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/seti-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/seti-theme";
           sha256 = "1mwkx3hynabwr0a2rm1bh91h7xf38a11h1fb6ys8s3mnr68csd9z";
           name = "seti-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/seti-theme";
+          homepage = "https://melpa.org/#/seti-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -50290,13 +52270,13 @@
           sha256 = "11h5z2gmwq07c4gqzj2c9apksvqk3k8kpbb9kg78bbif2xfajr3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sexp-move";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sexp-move";
           sha256 = "0lcxmr2xqh8z7xinxbv1wyrh786zlahhhj5nnbv83i8m23i3ymmd";
           name = "sexp-move";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sexp-move";
+          homepage = "https://melpa.org/#/sexp-move";
           license = lib.licenses.free;
         };
       }) {};
@@ -50311,13 +52291,13 @@
           sha256 = "1nfvb2vmbdqfyj25hvwrz7ajb4ilxgrvd3rbf3im3mb3skic1wn9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shackle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shackle";
           sha256 = "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6";
           name = "shackle";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/shackle";
+          homepage = "https://melpa.org/#/shackle";
           license = lib.licenses.free;
         };
       }) {};
@@ -50332,13 +52312,13 @@
           sha256 = "0phivbhjdw76gzrx35rp0zybqfb0fdy2hjllf72qf1r0r5gxahl8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shadchen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shadchen";
           sha256 = "1r1mfmv4cdlc8kzjiqz81kpqdrwbnyciwdgg6n5x0yi4apwpvnl4";
           name = "shadchen";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/shadchen";
+          homepage = "https://melpa.org/#/shadchen";
           license = lib.licenses.free;
         };
       }) {};
@@ -50353,13 +52333,13 @@
           sha256 = "0l094nrrvan8v6j1xdgb51cbjvwicvxih29b7iyga13adb9dy9j4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shader-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shader-mode";
           sha256 = "12y84fa1wc82js53rpadaysmbshhqf6wb97889qkksx19n3xmb9g";
           name = "shader-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/shader-mode";
+          homepage = "https://melpa.org/#/shader-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -50370,17 +52350,17 @@
         src = fetchFromGitHub {
           owner = "CodyReichert";
           repo = "shakespeare-mode";
-          rev = "4bff63eeac2b7ec1220f17e8bbcddbea4c11cb02";
-          sha256 = "0vkxl3w4y4yacs1s4v0gwggvzrss8g74d3dgk8h3gphl4dlgx496";
+          rev = "d8c80a8bc91c970563852b723413143844b0881b";
+          sha256 = "1y9bgpz96zgjw5fvq2ma7q6392i9j1rrj5axp085ccgn7w24mii7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shakespeare-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shakespeare-mode";
           sha256 = "1i9fr9l3x7pwph654hqd8s74swy5gmn3wzs85a2ibmpcjq8mz9rd";
           name = "shakespeare-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/shakespeare-mode";
+          homepage = "https://melpa.org/#/shakespeare-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -50395,13 +52375,13 @@
           sha256 = "15a8gs4lrqxn0jyfw16rc6vm7z1i10pzzlnp30x6nly9a7xra47x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shampoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shampoo";
           sha256 = "01ssgw4cnnx8d86g3r1d5hqcib4qyhmpqvcvx47xs7zh0jscps61";
           name = "shampoo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/shampoo";
+          homepage = "https://melpa.org/#/shampoo";
           license = lib.licenses.free;
         };
       }) {};
@@ -50409,17 +52389,17 @@
         pname = "shell-command";
         version = "20090621.832";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/shell-command.el";
+          url = "https://www.emacswiki.org/emacs/download/shell-command.el";
           sha256 = "0jr5sbmg4zrx2dfdrajh2didm6dxx9ri5ib9qnwhc1jlppinyi7l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shell-command";
           sha256 = "1jxn721i4s1k5x1qldiynnl5khsl22x9k3whm698nzv8m786spxl";
           name = "shell-command";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/shell-command";
+          homepage = "https://melpa.org/#/shell-command";
           license = lib.licenses.free;
         };
       }) {};
@@ -50434,13 +52414,13 @@
           sha256 = "1w42j5cdddr0riz1xjq3wiz5i9f71i9jdzd1l92ir0mlj05wjyic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-current-directory";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shell-current-directory";
           sha256 = "0bj2gs96ivm5x8l7gwvfckyalr1amh4cb1v2dbl323zmrqddhgkd";
           name = "shell-current-directory";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/shell-current-directory";
+          homepage = "https://melpa.org/#/shell-current-directory";
           license = lib.licenses.free;
         };
       }) {};
@@ -50455,13 +52435,13 @@
           sha256 = "0z04z07r7p5p05zhaka37s48y82hg2dbk0ynap4inph3frn4yyfl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-here";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shell-here";
           sha256 = "0csi70v89bqdpbsizji6c5z0jmkx4x4vk1zfclkpap4dalmxxcsh";
           name = "shell-here";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/shell-here";
+          homepage = "https://melpa.org/#/shell-here";
           license = lib.licenses.free;
         };
       }) {};
@@ -50469,38 +52449,38 @@
         pname = "shell-history";
         version = "20100504.350";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/shell-history.el";
+          url = "https://www.emacswiki.org/emacs/download/shell-history.el";
           sha256 = "0biqjm0fpd7c7jilgkcwp6c32car05r5akimbcdii3clllavma7r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-history";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shell-history";
           sha256 = "1blad7ggv27qzpai2ib1pmr23ljj8asq880g3d7w8fhqv0p1pjs7";
           name = "shell-history";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/shell-history";
+          homepage = "https://melpa.org/#/shell-history";
           license = lib.licenses.free;
         };
       }) {};
     shell-pop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shell-pop";
-        version = "20160208.348";
+        version = "20160425.954";
         src = fetchFromGitHub {
           owner = "kyagi";
           repo = "shell-pop-el";
-          rev = "272ed7dba1a32a900339167e02fbe052513b9a6c";
-          sha256 = "0pnj11cba3g3kmnp0sr0gd085pzqwcpzmg3wyywpbinrr5ilagwp";
+          rev = "8041cc758f02b17ba96bda0a47903540fb78d9d0";
+          sha256 = "1ddd32f3k1mqk4h88kn0m9c3xd9y6yszkzm4s23fd6d96daw4smc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-pop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shell-pop";
           sha256 = "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8";
           name = "shell-pop";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/shell-pop";
+          homepage = "https://melpa.org/#/shell-pop";
           license = lib.licenses.free;
         };
       }) {};
@@ -50515,13 +52495,13 @@
           sha256 = "16srngml5xmpaxb0wzhx91jil0r0dmn673bwai3lzxrkmjnl748l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-split-string";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shell-split-string";
           sha256 = "1yj1h7za4ylxh2nikj7s1qqlilpsk05x9571a2fymfyznm3iq77m";
           name = "shell-split-string";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/shell-split-string";
+          homepage = "https://melpa.org/#/shell-split-string";
           license = lib.licenses.free;
         };
       }) {};
@@ -50536,13 +52516,13 @@
           sha256 = "1bcrxq43a45alv6x0wms4d4nykiqz2mzk04kwk5lmf5pw3dqm900";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-switcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shell-switcher";
           sha256 = "07g9naiv2jk9jxwjywrbb05dy0pbfdx6g8pkra38rn3vqrjzvhyx";
           name = "shell-switcher";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/shell-switcher";
+          homepage = "https://melpa.org/#/shell-switcher";
           license = lib.licenses.free;
         };
       }) {};
@@ -50557,13 +52537,13 @@
           sha256 = "0ssaccdacabpja9nqzhr8x8ggfwmlian7y4p0fa6gvr7qsvjpgr9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shell-toggle";
           sha256 = "1ai0ks7smr8b221j9hmsikswpxqraa9b13fpwv4wwagavnlah446";
           name = "shell-toggle";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/shell-toggle";
+          homepage = "https://melpa.org/#/shell-toggle";
           license = lib.licenses.free;
         };
       }) {};
@@ -50578,13 +52558,13 @@
           sha256 = "1mc7y79h5p9cxqwsl40b1j5la5bm8b70n6fn4rx9wr4bi7rwph5i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shelldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shelldoc";
           sha256 = "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx";
           name = "shelldoc";
         };
         packageRequires = [ cl-lib s ];
         meta = {
-          homepage = "http://melpa.org/#/shelldoc";
+          homepage = "https://melpa.org/#/shelldoc";
           license = lib.licenses.free;
         };
       }) {};
@@ -50595,17 +52575,38 @@
         src = fetchFromGitHub {
           owner = "rtrn";
           repo = "shelltest-mode";
-          rev = "e2513832ce6b994631335be299736cabe291d0f7";
-          sha256 = "1ns2w7zhbi96a3gilmzs69187jngqhcvik17ylsjdfrk42hw5s6r";
+          rev = "b4bdd547bcdac427561aa1452f2aeb65e3a3c9f5";
+          sha256 = "0f45q8j9m0ic3l69i7qjhf0l19cprn56fxw61al4xd3wxv4pr9gy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shelltest-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shelltest-mode";
           sha256 = "1inb0vq34fbwkr0jg4dv2lljag8djggi8kyssrzhfawri50m81nh";
           name = "shelltest-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/shelltest-mode";
+          homepage = "https://melpa.org/#/shelltest-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shift-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shift-number";
+        version = "20160419.1457";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "shift-number.el";
+          rev = "e59840cb7fb142b21e8b1e30b95dc3b4688dca65";
+          sha256 = "0dlwcifw5mlski0mbvqqgmpb0jgf5i67x04s8yab1sq9rr07is57";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shift-number";
+          sha256 = "1sbzkmd336d0dcdpk29pzk2b5bhlahrn083x62l6m150n2xzxn4p";
+          name = "shift-number";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/shift-number";
           license = lib.licenses.free;
         };
       }) {};
@@ -50620,13 +52621,13 @@
           sha256 = "13zsws8gq9a8nfk4yzlvfsvqjh9zbnanmw68rcna93yc5nc634nr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shift-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shift-text";
           sha256 = "1v9zk7ycc8k1qk1cfs2y1knygl686msmlilqy5a7mh0w0z9f3a2i";
           name = "shift-text";
         };
         packageRequires = [ cl-lib es-lib ];
         meta = {
-          homepage = "http://melpa.org/#/shift-text";
+          homepage = "https://melpa.org/#/shift-text";
           license = lib.licenses.free;
         };
       }) {};
@@ -50641,13 +52642,13 @@
           sha256 = "1lgvdaghzj1fzh8p6ans0f62zg1bfp086icbsqmyvbgpgcxia9cs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shimbun";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shimbun";
           sha256 = "0k54886bh7zxsfnvga3wg3bsij4bixxrah2rrkq1lj0k8ay7nfxh";
           name = "shimbun";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/shimbun";
+          homepage = "https://melpa.org/#/shimbun";
           license = lib.licenses.free;
         };
       }) {};
@@ -50662,13 +52663,13 @@
           sha256 = "0xs19xpadxdl1wgapqj6xrscnb4ch6kj1qm3h93kj95x51427afz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shm";
           sha256 = "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c";
           name = "shm";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/shm";
+          homepage = "https://melpa.org/#/shm";
           license = lib.licenses.free;
         };
       }) {};
@@ -50683,13 +52684,13 @@
           sha256 = "19p47a4hwl6h2w5ay09hjhl4kf7cydwqp8s2iyrx2i0k58az8i8i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shoulda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shoulda";
           sha256 = "0lmlhx34nwvn636y2wvw3sprhhh6q3mdg7dzgpjj7ybibvhp1lzk";
           name = "shoulda";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/shoulda";
+          homepage = "https://melpa.org/#/shoulda";
           license = lib.licenses.free;
         };
       }) {};
@@ -50698,19 +52699,19 @@
         pname = "show-css";
         version = "20160210.808";
         src = fetchFromGitHub {
-          owner = "smmcg";
+          owner = "8cylinder";
           repo = "showcss-mode";
           rev = "771daeddd4df7a7c10f66419a837145649bab63b";
           sha256 = "11kzjm12hbcdzrshq20r20l29k3555np1sva7afqrhgvd239fdq1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/show-css";
-          sha256 = "1b3n8h39m85inxsqvzwgb9fqnqn2sgib91hrisn1gpgfyjydzkr7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/show-css";
+          sha256 = "0sq15l58macy2affdgbimnchn491fnrqr3bbgn30k3l3xkvkmc7k";
           name = "show-css";
         };
         packageRequires = [ doom s ];
         meta = {
-          homepage = "http://melpa.org/#/show-css";
+          homepage = "https://melpa.org/#/show-css";
           license = lib.licenses.free;
         };
       }) {};
@@ -50725,13 +52726,13 @@
           sha256 = "15vkk7lnnfwgzkiwpqz1l1qpnz2d10l82m10m0prbw03k1zx22c7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/show-marks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/show-marks";
           sha256 = "1jgxdclj88ca106vcvf1k8zbf7iwamy80c2ad8b3myz0f4zscjzb";
           name = "show-marks";
         };
         packageRequires = [ fm ];
         meta = {
-          homepage = "http://melpa.org/#/show-marks";
+          homepage = "https://melpa.org/#/show-marks";
           license = lib.licenses.free;
         };
       }) {};
@@ -50739,17 +52740,17 @@
         pname = "showkey";
         version = "20151231.1759";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/showkey.el";
+          url = "https://www.emacswiki.org/emacs/download/showkey.el";
           sha256 = "0pq88kz5h0hzgfk8fyf3lppxalmadg5czbik824bpykp9l9gnf1m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/showkey";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/showkey";
           sha256 = "1m280ll07i5c6s4w0s227jygdlpvd87dq45039v0sljyxm4bfrsv";
           name = "showkey";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/showkey";
+          homepage = "https://melpa.org/#/showkey";
           license = lib.licenses.free;
         };
       }) {};
@@ -50757,17 +52758,17 @@
         pname = "showtip";
         version = "20080329.2159";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/showtip.el";
+          url = "https://www.emacswiki.org/emacs/download/showtip.el";
           sha256 = "01ibg36lvmdk7ac1k0f0r6wyds4rq0wb7gzw26nkiwykn14gxaql";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/showtip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/showtip";
           sha256 = "1fdhdmkvyz1dcy3x0im1iab6yhhh8gqvxmm6ccwr6rl1r1m5zwc8";
           name = "showtip";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/showtip";
+          homepage = "https://melpa.org/#/showtip";
           license = lib.licenses.free;
         };
       }) {};
@@ -50782,13 +52783,13 @@
           sha256 = "1mizhbwvnsxxjz6m94qziibvhghhp8v8db3wxrq3z9gsaqqkcndn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shpec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shpec-mode";
           sha256 = "155hc1nym3fsvflps8d3ixaqw1cafqp97zcaywdppp47n7vj8zjl";
           name = "shpec-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/shpec-mode";
+          homepage = "https://melpa.org/#/shpec-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -50803,13 +52804,13 @@
           sha256 = "07zzyfibs2c7w4gpvdh9003frznbg7zdnrx0nv8bvn0b68d3yz0m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shrink-whitespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shrink-whitespace";
           sha256 = "12if0000i3rrxcm732layrv2h464wbb4xflbbfc844c83dbx1jmq";
           name = "shrink-whitespace";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/shrink-whitespace";
+          homepage = "https://melpa.org/#/shrink-whitespace";
           license = lib.licenses.free;
         };
       }) {};
@@ -50824,13 +52825,13 @@
           sha256 = "00c11s664hwj1l1hw7qshygy3wb6wbd0hn6qqnyq1xr0r87nnhjs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shut-up";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shut-up";
           sha256 = "1bcqrnnafnimfcg1s7vrgq4cb4rxi5sgpd92jj7xywvkalr3kh26";
           name = "shut-up";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/shut-up";
+          homepage = "https://melpa.org/#/shut-up";
           license = lib.licenses.free;
         };
       }) {};
@@ -50845,13 +52846,13 @@
           sha256 = "0cjqh6qbbmgxd6zgqnikw6bh8wpjydydkkqs5wcmblpi5awqmnb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sibilant-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sibilant-mode";
           sha256 = "0jd6dsk93nvwi5yia3623hfc4v6zz4s2n8m1wx9bw8x6kv3h3qbq";
           name = "sibilant-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sibilant-mode";
+          homepage = "https://melpa.org/#/sibilant-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -50866,13 +52867,13 @@
           sha256 = "102ssiz4sp7y816s1iy8i98c314jbn3sy0v87b0qgpgjiq913ffq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sicp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sicp";
           sha256 = "1q7pbhjk8qgwvj27ianrdbmj98pwf3xv10gmpchh7bypmbyir4wz";
           name = "sicp";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sicp";
+          homepage = "https://melpa.org/#/sicp";
           license = lib.licenses.free;
         };
       }) {};
@@ -50887,13 +52888,34 @@
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sift";
           sha256 = "0mv5zk140kjilwvzccj75ym7wlkkqryb532mbsy7i9bs3q7m916d";
           name = "sift";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sift";
+          homepage = "https://melpa.org/#/sift";
+          license = lib.licenses.free;
+        };
+      }) {};
+    signal = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "signal";
+        version = "20160424.210";
+        src = fetchFromGitHub {
+          owner = "Mola-T";
+          repo = "signal";
+          rev = "88c3f3c82a8a295b66b7eb8c64bd35b8ef834dd6";
+          sha256 = "1n6mjfw655a5q0ifq52yf6nyc0zxcahr47dvxg0p8x8v3f4jskvz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/signal";
+          sha256 = "0pvl5qxi0rjbxkpa8kk1q9vz11i9yjmph42si3n7gmm9kc28pk61";
+          name = "signal";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/signal";
           license = lib.licenses.free;
         };
       }) {};
@@ -50908,13 +52930,13 @@
           sha256 = "1g4rr7hpy9r3y4vdpv48xpmy8kqvs4j64kvnhnj2rw2wv1grw78j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/signature";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/signature";
           sha256 = "11n3id1iiip99lj8c0iffbrf59s2yvmwlhqbf8xzxkhws7vwdl5q";
           name = "signature";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/signature";
+          homepage = "https://melpa.org/#/signature";
           license = lib.licenses.free;
         };
       }) {};
@@ -50929,55 +52951,55 @@
           sha256 = "0vzkgrc54j4a3g90jxc7vxkqwqi3047gnn7gng65pfar0i76lzlb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/silkworm-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/silkworm-theme";
           sha256 = "1zbrjqmhf80qs3i910sixirrv42rxkqdrg2z03gnz1g885gpcn13";
           name = "silkworm-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/silkworm-theme";
+          homepage = "https://melpa.org/#/silkworm-theme";
           license = lib.licenses.free;
         };
       }) {};
     simp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "simp";
-        version = "20150427.1132";
+        version = "20160315.1124";
         src = fetchFromGitHub {
           owner = "re5et";
           repo = "simp";
-          rev = "334b20287b3160f77e25c8e0ee2a73dd41fbe0ab";
-          sha256 = "1m8azyb4nxxdh6pwik9qb0zqp4z8z4vk3dlpfgklsq9rss8gwbaf";
+          rev = "f74467507983a3c8a8b61268e07219fbaa628ae5";
+          sha256 = "177bhvynqsdfwwqhhlh1v0pqvscy3xv6hhxi7fb42l5dmsw5b97z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/simp";
           sha256 = "0x4lssjkj3fk9fw603f0sggvcj25iw0zbzsm5c949lhl4a3wvc9c";
           name = "simp";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/simp";
+          homepage = "https://melpa.org/#/simp";
           license = lib.licenses.free;
         };
       }) {};
-    simple-call-tree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    simple-call-tree = callPackage ({ anaphora, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "simple-call-tree";
-        version = "20151203.1625";
+        version = "20160319.1216";
         src = fetchFromGitHub {
           owner = "vapniks";
           repo = "simple-call-tree";
-          rev = "9f2fd423a3b86878d84e8c97e3ba45647b4d165e";
-          sha256 = "09blcc1aj1lbqr1jcjm8dlq13s3plrg1qbp9vr3sp4dxyhjpimjj";
+          rev = "02082ae57c492a8dfb98cb5b73f265d7c2132775";
+          sha256 = "0cj4w62b6glz7sfqj08sdlyfnnhy7z1v1gmjkvy1j0fv9i2n2z48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simple-call-tree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/simple-call-tree";
           sha256 = "1cbv4frsrwd8d3rg8r4sylwnc1hl3hgh595qwbpx0zd3dp5na2yl";
           name = "simple-call-tree";
         };
-        packageRequires = [];
+        packageRequires = [ anaphora emacs ];
         meta = {
-          homepage = "http://melpa.org/#/simple-call-tree";
+          homepage = "https://melpa.org/#/simple-call-tree";
           license = lib.licenses.free;
         };
       }) {};
@@ -50987,18 +53009,18 @@
         version = "20150430.1955";
         src = fetchFromGitHub {
           owner = "skeeto";
-          repo = "emacs-http-server";
+          repo = "emacs-web-server";
           rev = "4b7a6bc6a6df6b932f8c9e9aded9103397c0c18f";
           sha256 = "0jn46fk0ljqs40kz6ngp0sk6hg1334835r2rmagx4qm0mdaqy7p8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simple-httpd";
-          sha256 = "18dharsdiwfkmhd9ibz9f47yfq9c2d78i886pi6gsjh8iwcpzx59";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/simple-httpd";
+          sha256 = "1g9m8dx62pql6dqz490pifcli96i5pv6sar18w4lwrfgpfisfz8c";
           name = "simple-httpd";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/simple-httpd";
+          homepage = "https://melpa.org/#/simple-httpd";
           license = lib.licenses.free;
         };
       }) {};
@@ -51013,13 +53035,13 @@
           sha256 = "1bnc3ykgf727lc0ajxa8qsx616baljdgav78fkz57irm65dqr18q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simple-mpc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/simple-mpc";
           sha256 = "05x2xyys5mf6k7ndh0l6ykyiygaznb4f8bx3npbhvihrsz9ilf8r";
           name = "simple-mpc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/simple-mpc";
+          homepage = "https://melpa.org/#/simple-mpc";
           license = lib.licenses.free;
         };
       }) {};
@@ -51028,38 +53050,38 @@
         pname = "simple-plus";
         version = "20151231.1800";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/simple+.el";
+          url = "https://www.emacswiki.org/emacs/download/simple+.el";
           sha256 = "01fdk790jlpxy95y67yv6944ws4zjh7gs6ymnj1yflf19ccsdsnn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simple+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/simple+";
           sha256 = "12fsgjk53fq2316j8nm6wvdckpyg9hq3v65j5c52i0g0cwmx62ra";
           name = "simple-plus";
         };
         packageRequires = [ strings ];
         meta = {
-          homepage = "http://melpa.org/#/simple+";
+          homepage = "https://melpa.org/#/simple+";
           license = lib.licenses.free;
         };
       }) {};
-    simple-rtm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, rtm }:
+    simple-rtm = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, rtm }:
     melpaBuild {
         pname = "simple-rtm";
-        version = "20160118.1211";
+        version = "20160222.934";
         src = fetchFromGitHub {
           owner = "mbunkus";
           repo = "simple-rtm";
-          rev = "b10db02da508ec26d791ec6705205c74722acb27";
-          sha256 = "15y1kxck6gxqs6pv4qxz8rrc61bsk73pzbz6f30f5l0r0750i1rm";
+          rev = "8c7cd96cf66ef112be5c363e3378e304f8f83999";
+          sha256 = "1kkhnsxr8zrb21k4ckyg69nsndwy4zdkvfw2drk4v1vnbgx8144f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simple-rtm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/simple-rtm";
           sha256 = "1aadzaf73clhyny2qiryg6z84k34yx3ghy6pyl0px9qhqc1ak271";
           name = "simple-rtm";
         };
-        packageRequires = [ rtm ];
+        packageRequires = [ dash rtm ];
         meta = {
-          homepage = "http://melpa.org/#/simple-rtm";
+          homepage = "https://melpa.org/#/simple-rtm";
           license = lib.licenses.free;
         };
       }) {};
@@ -51074,13 +53096,13 @@
           sha256 = "0zf9wgyp0n00i00zl1lxr0d60569zgcjdnmdvgpcibvny5s1fp2i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simple-screen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/simple-screen";
           sha256 = "16zvsmqn882w320h26hjjz5lcyl9y0x4amkf2zfps77xxmkmi5n0";
           name = "simple-screen";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/simple-screen";
+          homepage = "https://melpa.org/#/simple-screen";
           license = lib.licenses.free;
         };
       }) {};
@@ -51095,13 +53117,13 @@
           sha256 = "09286h2q9dqghgfj9a4cniz6djw7867vcy3ixs7cn4wghvhyxm8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simpleclip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/simpleclip";
           sha256 = "07qkfwlg8vw5kb097qbsv082hxir047q2bcvc8scbak2dr6pl12s";
           name = "simpleclip";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/simpleclip";
+          homepage = "https://melpa.org/#/simpleclip";
           license = lib.licenses.free;
         };
       }) {};
@@ -51116,34 +53138,34 @@
           sha256 = "0xq4vy3ggdjiycd3aa62k94kd43zcpm8bfdgi8grwkb1lpvwq9i9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simplenote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/simplenote";
           sha256 = "0rnvm3q2spfj15kx2c8ic1p8hxg7rwiqgf3x2zg34j1xxayn3h2j";
           name = "simplenote";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/simplenote";
+          homepage = "https://melpa.org/#/simplenote";
           license = lib.licenses.free;
         };
       }) {};
     simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }:
     melpaBuild {
         pname = "simplenote2";
-        version = "20150630.916";
+        version = "20160318.803";
         src = fetchFromGitHub {
           owner = "alpha22jp";
           repo = "simplenote2.el";
-          rev = "2a6c539d98968837ec09d2754e9235ff278057a8";
-          sha256 = "1a0l0f6by1nmnnq0n52la9g3d357bmwak4qgy6p8g66qb9rx6rzv";
+          rev = "a0941475c5fd71a31280f3219424af4586288719";
+          sha256 = "0k16sjbrhxbv3fj5rzjzvs03230nwlzmvw18dhdhzzblk08f28dp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simplenote2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/simplenote2";
           sha256 = "1qdzbwhzmsga65wmrd0mb3rbs71nlyqqb6f4v7kvfxzyis50cswm";
           name = "simplenote2";
         };
         packageRequires = [ request-deferred ];
         meta = {
-          homepage = "http://melpa.org/#/simplenote2";
+          homepage = "https://melpa.org/#/simplenote2";
           license = lib.licenses.free;
         };
       }) {};
@@ -51158,34 +53180,13 @@
           sha256 = "0108q2b5h73rjxg9k2kmc8z6la9kgqdnz9z1x7rn61v3vbxlzqvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simplezen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/simplezen";
           sha256 = "13f2anhfsxmx1vdd209gxkhpywsi3nn6pazhc6bkswmn27yiig7j";
           name = "simplezen";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/simplezen";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sisyphus = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
-    melpaBuild {
-        pname = "sisyphus";
-        version = "20160126.1619";
-        src = fetchFromGitHub {
-          owner = "phillord";
-          repo = "sisyphus";
-          rev = "f521db4101ac853da8d7a7ce4e83872b33038e20";
-          sha256 = "1v7xn0a1x4036spmzrfi6syhpbm6bg9a22h6ybzmvzmbp90cs25a";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sisyphus";
-          sha256 = "08400jazj7w63l8g9ypy6w9dj8r0xh4d2yg3nfwqqf5lhfnj9bnj";
-          name = "sisyphus";
-        };
-        packageRequires = [ dash emacs m-buffer ];
-        meta = {
-          homepage = "http://melpa.org/#/sisyphus";
+          homepage = "https://melpa.org/#/simplezen";
           license = lib.licenses.free;
         };
       }) {};
@@ -51200,13 +53201,13 @@
           sha256 = "0kbgxjfdf88h7hfds1kbdxx84wvkvy773r98ym1fzfm54m2kddvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/skeletor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/skeletor";
           sha256 = "1vfvg5l12dzksr24dxwc6ngawsqzpxjs97drw48qav9dy1vyl10v";
           name = "skeletor";
         };
         packageRequires = [ cl-lib dash emacs f let-alist s ];
         meta = {
-          homepage = "http://melpa.org/#/skeletor";
+          homepage = "https://melpa.org/#/skeletor";
           license = lib.licenses.free;
         };
       }) {};
@@ -51221,13 +53222,13 @@
           sha256 = "16757xz5ank3jsh8xglyly7pwdn5xm0yngampy1n1vgcwsp5080a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/skewer-less";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/skewer-less";
           sha256 = "0fhv5cnp5bgw3krfmb0jl18kw2hzx2p81falj57lg3p8rn23dryl";
           name = "skewer-less";
         };
         packageRequires = [ skewer-mode ];
         meta = {
-          homepage = "http://melpa.org/#/skewer-less";
+          homepage = "https://melpa.org/#/skewer-less";
           license = lib.licenses.free;
         };
       }) {};
@@ -51242,13 +53243,13 @@
           sha256 = "0yj7r5f751lra9jj7lg90qp66sgnb7fcjw5v9hfna7r13qdn9f20";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/skewer-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/skewer-mode";
           sha256 = "1zp4myi9f7pw6zkgc0xg12585iihn7khcsf20pvqyc0vn4ajdwqm";
           name = "skewer-mode";
         };
         packageRequires = [ emacs js2-mode simple-httpd ];
         meta = {
-          homepage = "http://melpa.org/#/skewer-mode";
+          homepage = "https://melpa.org/#/skewer-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -51263,13 +53264,13 @@
           sha256 = "1q0qc4jc83k7dfhq2y06zy0fg38kvp219gb3icysdhs88zi2v9s3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/skewer-reload-stylesheets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/skewer-reload-stylesheets";
           sha256 = "1rxn0ha2yhvyc195alg31nk1sjghnbha33xrqwc9z3j71w211frm";
           name = "skewer-reload-stylesheets";
         };
         packageRequires = [ skewer-mode ];
         meta = {
-          homepage = "http://melpa.org/#/skewer-reload-stylesheets";
+          homepage = "https://melpa.org/#/skewer-reload-stylesheets";
           license = lib.licenses.free;
         };
       }) {};
@@ -51284,34 +53285,34 @@
           sha256 = "0gzj7cf42nhp3ac1a2gxcfbmn80z1z46zxsfr2f5xil2gjag39fx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/skype";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/skype";
           sha256 = "06p5s5agajbm9vg9xxpzv817xmjw2kmcahiw4iypn5yzwhv1aykl";
           name = "skype";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/skype";
+          homepage = "https://melpa.org/#/skype";
           license = lib.licenses.free;
         };
       }) {};
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20160201.2108";
+        version = "20160422.1108";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "455bff044ad3d2e789a605c5f1716f7a4fb24d01";
-          sha256 = "184hc4wvm3y33g6ka8m90ysh1s8cdynsnni5abf2lzmgl4jgpcpl";
+          rev = "5b372fddff5c084b8da88195baea134cf36f3b1e";
+          sha256 = "0av1n6qzlm6vdp9anix8dka64hl5mlq15gw3l2mga1k5jj5nwl7i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/slack";
           sha256 = "0mybjx08yskk9vi06ayiknl5ddyd8h0mnr8c0a3zr61p1x4s6anp";
           name = "slack";
         };
         packageRequires = [ alert circe emojify oauth2 request websocket ];
         meta = {
-          homepage = "http://melpa.org/#/slack";
+          homepage = "https://melpa.org/#/slack";
           license = lib.licenses.free;
         };
       }) {};
@@ -51326,13 +53327,13 @@
           sha256 = "108zcb7hdaaq3sxjfr9nrwzqxx71q6aygzik7l3ab854xknkjfad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slamhound";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/slamhound";
           sha256 = "14zlcw0zw86awd6g98l4h2whav9amz4m8ik877d1wsdjf69g7k9x";
           name = "slamhound";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/slamhound";
+          homepage = "https://melpa.org/#/slamhound";
           license = lib.licenses.free;
         };
       }) {};
@@ -51347,13 +53348,13 @@
           sha256 = "11p1pghx55a4gcn45cadw7c594134b21cdim723k2h99z14f89az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slideview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/slideview";
           sha256 = "0zr08yrnrz49zds1651ysmgjqgbnhfdcqbg90sbsb086iw89rxl1";
           name = "slideview";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/slideview";
+          homepage = "https://melpa.org/#/slideview";
           license = lib.licenses.free;
         };
       }) {};
@@ -51368,34 +53369,34 @@
           sha256 = "0vgyc2ny9qmn8f5r149y4g398mh4gnwsp4yim85z4vmdikqg8vi1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slim-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/slim-mode";
           sha256 = "1hip0r22irr9sah3b65ky71ic508bhqvj9hj95a81qvy1zi9rcac";
           name = "slim-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/slim-mode";
+          homepage = "https://melpa.org/#/slim-mode";
           license = lib.licenses.free;
         };
       }) {};
     slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
     melpaBuild {
         pname = "slime";
-        version = "20160219.1320";
+        version = "20160419.1058";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "899b5ca7e1ce8173cb8ce4b7609dd88d05a050c9";
-          sha256 = "07gfd8k0gbzylr9y8asp35p9139w79c36pbnixp4y2fimgbfri2c";
+          rev = "32fc742ea4ebecfd3c599c98515ad762a692cc17";
+          sha256 = "0br910d6ph4db9ad2xrb9v1crjys3sbgg71j89kighyg1pq1h2k2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/slime";
           sha256 = "04zcvjg0bbx5mdbsk9yn7rlprakl89dq6jmnq5v2g0n6q0mh6ign";
           name = "slime";
         };
         packageRequires = [ cl-lib macrostep ];
         meta = {
-          homepage = "http://melpa.org/#/slime";
+          homepage = "https://melpa.org/#/slime";
           license = lib.licenses.free;
         };
       }) {};
@@ -51410,13 +53411,13 @@
           sha256 = "1wq1gs9jjd5m6iwrv06c2d7i5dvqsfjcljgbspfbc93cg5xahk4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime-annot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/slime-annot";
           sha256 = "14x9lzpkgkc96jsbfpahl027qh6y5azwdk0cmk9pbd1xm95kxj6n";
           name = "slime-annot";
         };
         packageRequires = [ slime ];
         meta = {
-          homepage = "http://melpa.org/#/slime-annot";
+          homepage = "https://melpa.org/#/slime-annot";
           license = lib.licenses.free;
         };
       }) {};
@@ -51431,34 +53432,34 @@
           sha256 = "0cc8xb2p1j2vs00h4sq6x0mwwrxkidqj4l7kg3n3150bj37v55rs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/slime-company";
           sha256 = "195s5fi2dl3h2jyy4d45q22jac35sciz81n13b4lgw94mkxx4rq2";
           name = "slime-company";
         };
         packageRequires = [ company slime ];
         meta = {
-          homepage = "http://melpa.org/#/slime-company";
+          homepage = "https://melpa.org/#/slime-company";
           license = lib.licenses.free;
         };
       }) {};
     slime-docker = callPackage ({ cl-lib ? null, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
     melpaBuild {
         pname = "slime-docker";
-        version = "20160221.1715";
+        version = "20160307.1426";
         src = fetchFromGitHub {
           owner = "daewok";
           repo = "slime-docker";
-          rev = "61bed969887c8556299ee643d1bab567ef36d926";
-          sha256 = "0jrsilyvzdi3xdmkm6gsniw4zdg9zsxb4i6k3fm5byxvhpbwd3k4";
+          rev = "f806596a0e2901c5196f70bd23cd56a12bafefcd";
+          sha256 = "18099jxgprz03akn5sa1x8zsja6d0bxhwhqzj9wqm4rv05y3wdcq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime-docker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/slime-docker";
           sha256 = "18v62y4f613d7mpqpb8sc8hzvyhcgzrbqrc0k7w9pqf00jnl192h";
           name = "slime-docker";
         };
         packageRequires = [ cl-lib docker-tramp emacs slime ];
         meta = {
-          homepage = "http://melpa.org/#/slime-docker";
+          homepage = "https://melpa.org/#/slime-docker";
           license = lib.licenses.free;
         };
       }) {};
@@ -51473,13 +53474,13 @@
           sha256 = "0rsh0bbhyx74yz1gjfqyi0bkqq5n3scpyh5mmc3d6dkpv8wa7bwz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime-ritz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/slime-ritz";
           sha256 = "1y1439y07l1a0sp9wn110hw4yyxj8n1cnd6h17rmsr549m2qbg1a";
           name = "slime-ritz";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/slime-ritz";
+          homepage = "https://melpa.org/#/slime-ritz";
           license = lib.licenses.free;
         };
       }) {};
@@ -51494,13 +53495,13 @@
           sha256 = "13rm9pmshgssmydhpirri38s38z3kvkhqama40qdzqq96dsxlnjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/slime-theme";
           sha256 = "1b709cplxip48a6qjdnzcn5qcgsy0jq1m05d7vc8p5ywgr1f9a00";
           name = "slime-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/slime-theme";
+          homepage = "https://melpa.org/#/slime-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -51515,13 +53516,13 @@
           sha256 = "00v4mh04affd8kkw4rn51djpyga2rb8f63mgy86napglqnkz40r3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime-volleyball";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/slime-volleyball";
           sha256 = "1dzvj8z3l5l9ixjl3nc3c7zzi23zc2300r7jzw2l3bvg64cfbdg7";
           name = "slime-volleyball";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/slime-volleyball";
+          homepage = "https://melpa.org/#/slime-volleyball";
           license = lib.licenses.free;
         };
       }) {};
@@ -51536,13 +53537,13 @@
           sha256 = "0srj0zcvzr0sjcs37zz11xz8w0yv94m69av9ny7mx8ssf4qp0pxa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slirm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/slirm";
           sha256 = "061xjj3vjdkkvd979fhp7bc12g5zkxqxywvcz3z9dlkgdks41ld7";
           name = "slirm";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/slirm";
+          homepage = "https://melpa.org/#/slirm";
           license = lib.licenses.free;
         };
       }) {};
@@ -51557,55 +53558,55 @@
           sha256 = "1y1gay1h91c0690gly4qibx1my0l1zpb6s3x58lks8m21jdwfw28";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slovak-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/slovak-holidays";
           sha256 = "1dcw8pa3r9b7n7dc8fgzijz7ywwxb3nlfg7n0by8dnvpjq2c30bg";
           name = "slovak-holidays";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/slovak-holidays";
+          homepage = "https://melpa.org/#/slovak-holidays";
           license = lib.licenses.free;
         };
       }) {};
     sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sly";
-        version = "20160218.402";
+        version = "20160407.953";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly";
-          rev = "ead2144dd581cbabf11b326f5f482a277225110f";
-          sha256 = "0brb6h19j28jypvrdwsi45qkgjrx5ssbvcyj0samwncrlbjfp9rk";
+          rev = "023db50446ea1a689f07da5ce78399ec8eb6d855";
+          sha256 = "0dsyq4h7raf2gfml6pksr2p1vnyilzll77nad0imcv2yyqmdnh8v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sly";
           sha256 = "1pmyqjk8fdlzwvrlx8h6fq0savksfny78fhmr8r7b07pi20y6n9l";
           name = "sly";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/sly";
+          homepage = "https://melpa.org/#/sly";
           license = lib.licenses.free;
         };
       }) {};
     sly-company = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
     melpaBuild {
         pname = "sly-company";
-        version = "20160219.338";
+        version = "20160308.757";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly-company";
-          rev = "0ad0b12874dae2289c990db20b3d31146d6e80eb";
-          sha256 = "1dga7y06p0j5iq478g857i6xa06j9zpgbjx3a1sqyhk16m1v7ssi";
+          rev = "08aef69394fbef31dfeb3d3bb72a4557df9d7624";
+          sha256 = "128gb6hsb7zig4czwgwjcm58lgqk6rmj7qi17a9cz5gsnggjcwii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sly-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sly-company";
           sha256 = "1n8bx0qis2bs49c589cbh59xcv06r8sx6y4lxprc9pfpycx7h6v2";
           name = "sly-company";
         };
         packageRequires = [ company emacs sly ];
         meta = {
-          homepage = "http://melpa.org/#/sly-company";
+          homepage = "https://melpa.org/#/sly-company";
           license = lib.licenses.free;
         };
       }) {};
@@ -51620,13 +53621,13 @@
           sha256 = "1fxsv83fcv5l7cndsysd8salvfwsabvd84sm7zli2ksf678774gp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sly-hello-world";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sly-hello-world";
           sha256 = "03ybjgczp6ssk4hmwd486vshlk7ql27k1lyhmvk26gmrf554z90n";
           name = "sly-hello-world";
         };
         packageRequires = [ sly ];
         meta = {
-          homepage = "http://melpa.org/#/sly-hello-world";
+          homepage = "https://melpa.org/#/sly-hello-world";
           license = lib.licenses.free;
         };
       }) {};
@@ -51641,13 +53642,13 @@
           sha256 = "00lw6hkxs71abjyi7nhzi8j6n55jyhzsp81ycn6f2liyp4rmqgi7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sly-macrostep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sly-macrostep";
           sha256 = "1i004mb0bg13j3zhdsjz1795dh0ry8winzvdghr1wardc9np60h7";
           name = "sly-macrostep";
         };
         packageRequires = [ macrostep sly ];
         meta = {
-          homepage = "http://melpa.org/#/sly-macrostep";
+          homepage = "https://melpa.org/#/sly-macrostep";
           license = lib.licenses.free;
         };
       }) {};
@@ -51662,13 +53663,34 @@
           sha256 = "1xi625pn3mg77mjvr94v6a5pjyvgjavpkdbbh1lqjx1halaa2qb7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sly-named-readtables";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sly-named-readtables";
           sha256 = "11ymzbj1ji7avfjqafj9p5zx0m4y1jfjcmyanpjq1frdcz639ir9";
           name = "sly-named-readtables";
         };
         packageRequires = [ sly ];
         meta = {
-          homepage = "http://melpa.org/#/sly-named-readtables";
+          homepage = "https://melpa.org/#/sly-named-readtables";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sly-quicklisp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
+    melpaBuild {
+        pname = "sly-quicklisp";
+        version = "20160204.1015";
+        src = fetchFromGitHub {
+          owner = "capitaomorte";
+          repo = "sly-quicklisp";
+          rev = "fccc00b2e9c123c4fb88131ce471191c3ad289ea";
+          sha256 = "1mb78cdkmik9rwccvzl8slv4dfy8sdq69dkys7q11jyn8lfm476y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sly-quicklisp";
+          sha256 = "1hpcz84g9c6g0x8qal02xgjj02gxqz3bysyz0l59jxiga0m634v8";
+          name = "sly-quicklisp";
+        };
+        packageRequires = [ sly ];
+        meta = {
+          homepage = "https://melpa.org/#/sly-quicklisp";
           license = lib.licenses.free;
         };
       }) {};
@@ -51683,13 +53705,34 @@
           sha256 = "194bdibpxpqsag86h583b62ybmfqmq4442a0czbijqwngbgjpj3l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sly-repl-ansi-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sly-repl-ansi-color";
           sha256 = "0wz24kfjl6rp4qss0iq2ilav0mkg2spy2ziikypy7v0iqbssmssi";
           name = "sly-repl-ansi-color";
         };
         packageRequires = [ cl-lib sly ];
         meta = {
-          homepage = "http://melpa.org/#/sly-repl-ansi-color";
+          homepage = "https://melpa.org/#/sly-repl-ansi-color";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smart-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smart-comment";
+        version = "20160322.1339";
+        src = fetchFromGitHub {
+          owner = "paldepind";
+          repo = "smart-comment";
+          rev = "17ddbd83205818763e6d68aa7a1aa9aaf414cbd4";
+          sha256 = "0r181rdnymr96kj74c73212n6157cfiq1d6hk2lfc54yl6h76zf4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smart-comment";
+          sha256 = "0lbrasdrkyj7zybz0f3xick8p0bvci5bhb2kg6pqzz9pw2iaxw12";
+          name = "smart-comment";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/smart-comment";
           license = lib.licenses.free;
         };
       }) {};
@@ -51697,17 +53740,17 @@
         pname = "smart-compile";
         version = "20150519.1147";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/smart-compile.el";
+          url = "https://www.emacswiki.org/emacs/download/smart-compile.el";
           sha256 = "0sm4nxynwhwypzw008fz56axai9lrphjczwzfdy7da3akan18rbd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smart-compile";
           sha256 = "0vgxqyzl7jw2j96rmjw75b5lmjwrvzajrdvfyabss4xmv96dy2r3";
           name = "smart-compile";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smart-compile";
+          homepage = "https://melpa.org/#/smart-compile";
           license = lib.licenses.free;
         };
       }) {};
@@ -51722,13 +53765,13 @@
           sha256 = "1xbd42q60pmg0hw4bn2fndjwgrfgj6ggm757fyp8m08jqh0zkarn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-cursor-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smart-cursor-color";
           sha256 = "11875pwlx2rm8d86541na9g3yiq0j472vg63mryqv6pzq3n8q6jx";
           name = "smart-cursor-color";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smart-cursor-color";
+          homepage = "https://melpa.org/#/smart-cursor-color";
           license = lib.licenses.free;
         };
       }) {};
@@ -51743,13 +53786,13 @@
           sha256 = "19l47xqzjhhm9j3izik0imssip5ygg3lnflb9ixsz1js571aaxha";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-forward";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smart-forward";
           sha256 = "032yc45c19fl886jmi5q04r6q47xz5rphb040wjvpd4fnb06hr8c";
           name = "smart-forward";
         };
         packageRequires = [ expand-region ];
         meta = {
-          homepage = "http://melpa.org/#/smart-forward";
+          homepage = "https://melpa.org/#/smart-forward";
           license = lib.licenses.free;
         };
       }) {};
@@ -51764,13 +53807,13 @@
           sha256 = "0q5hxg265ad9gpclv2kzikg6jvbf3zzb1mrykxn0n7mnvdfdlhsi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-indent-rigidly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smart-indent-rigidly";
           sha256 = "12qggg1m28mlvkdn52dig8bwv58pvipkvn1mlc4r7w569arar44x";
           name = "smart-indent-rigidly";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smart-indent-rigidly";
+          homepage = "https://melpa.org/#/smart-indent-rigidly";
           license = lib.licenses.free;
         };
       }) {};
@@ -51785,34 +53828,34 @@
           sha256 = "0sqvm7iwdjk057fwid4kz6wj71igiqhdarj59s17pzy6xz34afhg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-mark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smart-mark";
           sha256 = "1vv65sa0pwl407mbxcp653kycgx8jz87n6wshias1dp9lv21pj6v";
           name = "smart-mark";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smart-mark";
+          homepage = "https://melpa.org/#/smart-mark";
           license = lib.licenses.free;
         };
       }) {};
     smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }:
     melpaBuild {
         pname = "smart-mode-line";
-        version = "20160125.1100";
+        version = "20160306.1303";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "smart-mode-line";
-          rev = "76bc5cc9f6810b252c0e312a4f3ad5869e2b9504";
-          sha256 = "0jr0yvaih5d2a5fkwszhf25cyk3q0fqfbgybb3nbrbkcf0mja22q";
+          rev = "9715b5151d9ee669c4fecebd26508cb3fcbde887";
+          sha256 = "08g696hpsv4fp3s2isbga4yrh65lxwrn10vv8mnicxhicn178h9a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smart-mode-line";
           sha256 = "0qmhzlkc6mfqyaw4jaw6195b8sw0wg9pfjcijb4p0mlywf5mh5q6";
           name = "smart-mode-line";
         };
         packageRequires = [ emacs rich-minority ];
         meta = {
-          homepage = "http://melpa.org/#/smart-mode-line";
+          homepage = "https://melpa.org/#/smart-mode-line";
           license = lib.licenses.free;
         };
       }) {};
@@ -51823,17 +53866,17 @@
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "smart-mode-line";
-          rev = "76bc5cc9f6810b252c0e312a4f3ad5869e2b9504";
-          sha256 = "0jr0yvaih5d2a5fkwszhf25cyk3q0fqfbgybb3nbrbkcf0mja22q";
+          rev = "9715b5151d9ee669c4fecebd26508cb3fcbde887";
+          sha256 = "08g696hpsv4fp3s2isbga4yrh65lxwrn10vv8mnicxhicn178h9a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-mode-line-powerline-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smart-mode-line-powerline-theme";
           sha256 = "0hv3mx39m3l35xhz351zp98321ilr6qq9wzwn1f0ziiv814khcn4";
           name = "smart-mode-line-powerline-theme";
         };
         packageRequires = [ emacs powerline smart-mode-line ];
         meta = {
-          homepage = "http://melpa.org/#/smart-mode-line-powerline-theme";
+          homepage = "https://melpa.org/#/smart-mode-line-powerline-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -51848,13 +53891,13 @@
           sha256 = "1q74b0mbhly84g252a0arbyxc720rgs9a3yqf8b8s2fpfkzb95sg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-newline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smart-newline";
           sha256 = "1kyk865vkgh05vzlggs3ii81v86fcbcxybfkv5rkyl3fyqpkza1w";
           name = "smart-newline";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smart-newline";
+          homepage = "https://melpa.org/#/smart-newline";
           license = lib.licenses.free;
         };
       }) {};
@@ -51869,13 +53912,13 @@
           sha256 = "0h559cdyln5f4ignx1r86ryi7wizys0gj03dj7lfzaxr7wkd0jaf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smart-region";
           sha256 = "1bcvxf62bfi5lmhprma9rh670kka9p9ygbkgmv6dg6ajjfsplgwc";
           name = "smart-region";
         };
         packageRequires = [ cl-lib emacs expand-region multiple-cursors ];
         meta = {
-          homepage = "http://melpa.org/#/smart-region";
+          homepage = "https://melpa.org/#/smart-region";
           license = lib.licenses.free;
         };
       }) {};
@@ -51890,13 +53933,13 @@
           sha256 = "0azhfffm1bkgjx4i3p9f6x2gmw8kc3fafzqj4vxxdibhn0nizqk8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-shift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smart-shift";
           sha256 = "0azahlflnh6sk081k5dcqal6nmwkjnj4dq8pv8ckwf8684zp23d3";
           name = "smart-shift";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smart-shift";
+          homepage = "https://melpa.org/#/smart-shift";
           license = lib.licenses.free;
         };
       }) {};
@@ -51911,13 +53954,13 @@
           sha256 = "0aighpby8khrljb67m533bwkzlsckyvv7d09cnzr1rfwxiil0ml4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-tab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smart-tab";
           sha256 = "0qi8jph2c9fdsv2mqgxd7wb3q4dax3g5x2hc53kbgkjxylagjvp5";
           name = "smart-tab";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smart-tab";
+          homepage = "https://melpa.org/#/smart-tab";
           license = lib.licenses.free;
         };
       }) {};
@@ -51932,13 +53975,13 @@
           sha256 = "1s65hr7b8aggvdd1i6gkkpz6j1kqilggfnf46xvjnvdw9awmwk6b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-tabs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smart-tabs-mode";
           sha256 = "1fmbi0ypzhsizzb1vm92hfaq23swiyiqvg0pmibavzqyc9lczhhl";
           name = "smart-tabs-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smart-tabs-mode";
+          homepage = "https://melpa.org/#/smart-tabs-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -51953,34 +53996,34 @@
           sha256 = "15834lnh7dq9kz31k06ifpnc0vz86rycz0ryildi5qd2nb7s3lw9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smart-window";
           sha256 = "1x1ncldl9njil9hhvzj5ac1l5aiyfm0f7j0d7lw8ady7xx2cy26m";
           name = "smart-window";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smart-window";
+          homepage = "https://melpa.org/#/smart-window";
           license = lib.licenses.free;
         };
       }) {};
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20160221.739";
+        version = "20160411.919";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "dc7f7e17eff62c716638ea6a96ffaa60868a3ee9";
-          sha256 = "034rmng04q1ralj16pxygscn13fswz5vm77lgj29hqrgizb72jnl";
+          rev = "2f0dc4e784a72914987ac88b6d628c815ee8914b";
+          sha256 = "0shlx8pmcw3jip9y816rg6340df542vzhn65gg8lf7zzpaipxm4i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smartparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smartparens";
           sha256 = "025nfrfw0992024i219jzm4phwf29smc5hib45s6h1s67942mqh6";
           name = "smartparens";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
-          homepage = "http://melpa.org/#/smartparens";
+          homepage = "https://melpa.org/#/smartparens";
           license = lib.licenses.free;
         };
       }) {};
@@ -51995,13 +54038,13 @@
           sha256 = "1sjwqi8w83qxihqmcm7z0vwmrz1az0y266qgj2nwfv39bri6y4i6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smartrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smartrep";
           sha256 = "1ypls52d51lcqhz737rqg73c6jwl6q8b3bwb29z51swyamf37rbn";
           name = "smartrep";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smartrep";
+          homepage = "https://melpa.org/#/smartrep";
           license = lib.licenses.free;
         };
       }) {};
@@ -52016,13 +54059,13 @@
           sha256 = "193cxfnh263yw628ipf9gssvyq3j7mffrdmnjhvzzcsnhd1k145p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smartscan";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smartscan";
           sha256 = "0vghgmx8vnjbvsw7q5zs0qz2wm6dcng9m69b8dq81g2cq9dflbwb";
           name = "smartscan";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smartscan";
+          homepage = "https://melpa.org/#/smartscan";
           license = lib.licenses.free;
         };
       }) {};
@@ -52037,13 +54080,13 @@
           sha256 = "1qfa6i59zhi8d6175py8id8gq7b3hdaqq4naa86r1rb7x8ringff";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smartwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smartwin";
           sha256 = "0rg92j0aa8qxhr91hjj2f4w8vj5w9b4d2nmkggng44nxk8zafdif";
           name = "smartwin";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/smartwin";
+          homepage = "https://melpa.org/#/smartwin";
           license = lib.licenses.free;
         };
       }) {};
@@ -52058,13 +54101,34 @@
           sha256 = "1vl3nx0y2skb8sibqxvmc3wrmmd6z88hknbry348d0ik3cbr0ijx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smarty-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smarty-mode";
           sha256 = "06cyr2330asy2dlx81g3h9gq0yhd4pbnmzfvmla7amh4pfnjg14v";
           name = "smarty-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smarty-mode";
+          homepage = "https://melpa.org/#/smarty-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smblog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smblog";
+        version = "20160317.630";
+        src = fetchFromGitHub {
+          owner = "aaptel";
+          repo = "smblog-mode";
+          rev = "25bf9374f692aec845d911286f10a11aaa0945d8";
+          sha256 = "1ca8i45dj41vif2hm87ircwm9alxdm98irfi586ybrc72s24036r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smblog";
+          sha256 = "1byalkpc1bcb6p4j4g1cwc4q2i7irxjcphb0hqh1b2k1zixrw5rr";
+          name = "smblog";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/smblog";
           license = lib.licenses.free;
         };
       }) {};
@@ -52079,13 +54143,13 @@
           sha256 = "1smv91ggvaw37597ilvhra8cnj4p71n6v5pfazii8k85kvs6x460";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smeargle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smeargle";
           sha256 = "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd";
           name = "smeargle";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/smeargle";
+          homepage = "https://melpa.org/#/smeargle";
           license = lib.licenses.free;
         };
       }) {};
@@ -52100,13 +54164,13 @@
           sha256 = "0xrbkpc3w7yadpjih169cpp75gilsnx4y9akgci5vfcggv4ffm26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smex";
           sha256 = "1rwyi7gdzswafkwpfqd6zkxka1mrf4xz17kld95d2ram6cxl6zda";
           name = "smex";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/smex";
+          homepage = "https://melpa.org/#/smex";
           license = lib.licenses.free;
         };
       }) {};
@@ -52120,13 +54184,13 @@
           sha256 = "1p10q1b5bvc8fvgfxynrq2kf1ygr6gad92x40zhaa5r1ksf6ryk4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sml-modeline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sml-modeline";
           sha256 = "086hslzznv6fmlhkf28mcl8nh4xk802mv6w0a4zwd5px2wyyaysd";
           name = "sml-modeline";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sml-modeline";
+          homepage = "https://melpa.org/#/sml-modeline";
           license = lib.licenses.free;
         };
       }) {};
@@ -52141,34 +54205,34 @@
           sha256 = "1kkg7qhb2lmwr4siiazqny9w2z9nk799lzl5i159lfivlxcgixmk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smooth-scroll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smooth-scroll";
           sha256 = "1b0mjpd4dqgk7ij37145ry2jqbn1msf8rrvymn7zyckbccg83zsf";
           name = "smooth-scroll";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smooth-scroll";
+          homepage = "https://melpa.org/#/smooth-scroll";
           license = lib.licenses.free;
         };
       }) {};
     smooth-scrolling = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smooth-scrolling";
-        version = "20131219.2239";
+        version = "20160227.1915";
         src = fetchFromGitHub {
           owner = "aspiers";
           repo = "smooth-scrolling";
-          rev = "0d9b228f952c53ad456f98e2c761dda70ed72174";
-          sha256 = "05kf3hb3nb32jzw50a2z9vlf3f0pj40klzxvqj4fxlci777imsvk";
+          rev = "6a1420be510decde0a5eabc56cff229ae554417e";
+          sha256 = "1dkqix0iyjyiqf34h3p8faqcpffc0pwkxqqn80ys9jvj4f27kkrg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smooth-scrolling";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smooth-scrolling";
           sha256 = "0zy2xsmr05l2narslfgril36d7qfb55f52qm2ki6fy1r18lfiyc6";
           name = "smooth-scrolling";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smooth-scrolling";
+          homepage = "https://melpa.org/#/smooth-scrolling";
           license = lib.licenses.free;
         };
       }) {};
@@ -52183,13 +54247,13 @@
           sha256 = "1a097f1x9l0m4dizvnb742svlqsm6hlif73rk7qjar081sk1gjxx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smotitah";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smotitah";
           sha256 = "1m5qjl3r96riljp48il8k4rb6rwys1xf1pl93d4qjhprwvz57mv2";
           name = "smotitah";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smotitah";
+          homepage = "https://melpa.org/#/smotitah";
           license = lib.licenses.free;
         };
       }) {};
@@ -52204,13 +54268,13 @@
           sha256 = "0zknryfpg4791l7d7xv9hn2fx00rmbqw3737lfm75484hr10lymz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smtpmail-multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smtpmail-multi";
           sha256 = "0nc3k8ly4nx7fm3b2apga3p4svz5c9sldnlk86pz2lzra5h3b4ss";
           name = "smtpmail-multi";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smtpmail-multi";
+          homepage = "https://melpa.org/#/smtpmail-multi";
           license = lib.licenses.free;
         };
       }) {};
@@ -52225,55 +54289,55 @@
           sha256 = "1z2sdnf11wh5hz1rkrbg7fs4ha3zrbj9qnvfzq9005y89d7cs95x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smyx-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smyx-theme";
           sha256 = "1r85yxr864df5akqknl3hsrmzikr4085bqr6ijrbdj27nz00vl61";
           name = "smyx-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smyx-theme";
+          homepage = "https://melpa.org/#/smyx-theme";
           license = lib.licenses.free;
         };
       }) {};
-    snakemake-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "snakemake-mode";
-        version = "20160209.2027";
+        version = "20160422.1336";
         src = fetchFromGitHub {
           owner = "kyleam";
           repo = "snakemake-mode";
-          rev = "0ad1db40d996e9ab15b01cbbaf971d508556a4bc";
-          sha256 = "1q3v4izah7j5n0ln44f1g1idl1rwd2jar975d5rza4pcy9c875x8";
+          rev = "5ed0569defa7ca6ab37d70ee9c92d3dbc0e96a2b";
+          sha256 = "1zvmkr3ria7m1h21mam2f0czfmzlz7kx3c4zbs3i0g8gh3ckfmp6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/snakemake-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/snakemake-mode";
           sha256 = "1xxd3dms5vgvpn18a70wjprka5xvri2pj9cw8qz09s640f5jf3r4";
           name = "snakemake-mode";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ cl-lib emacs magit-popup ];
         meta = {
-          homepage = "http://melpa.org/#/snakemake-mode";
+          homepage = "https://melpa.org/#/snakemake-mode";
           license = lib.licenses.free;
         };
       }) {};
     snapshot-timemachine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "snapshot-timemachine";
-        version = "20150501.1300";
+        version = "20160222.332";
         src = fetchFromGitHub {
           owner = "mrBliss";
           repo = "snapshot-timemachine";
-          rev = "5c1e29fc771ffc65180faa1366c85aa50a335773";
-          sha256 = "17nbm8692ihrlcikihspdqg8wvp80ryq4h06da34d0awqm0w027m";
+          rev = "7a1ebd73e9da146f1a9f258c5d2a7b54660f87a4";
+          sha256 = "0m5j1v9br7vp9m2km8xccy5vv8gis0mcgwjxfc6qhnv7kbx0sx2k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/snapshot-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/snapshot-timemachine";
           sha256 = "0pvh1ilzv0ambc5cridyhjcxs58wq92bxjkisqv42yar3h3z6f8p";
           name = "snapshot-timemachine";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/snapshot-timemachine";
+          homepage = "https://melpa.org/#/snapshot-timemachine";
           license = lib.licenses.free;
         };
       }) {};
@@ -52288,13 +54352,13 @@
           sha256 = "1nyrfbjrg74wrqlh8229rf7ym07k2a0wscjm0kbg3sam9ryc546y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/snippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/snippet";
           sha256 = "1lgpw69k5a82y70j7nximdj0bl5nzr4jhjr5fkx1cvz8hhvgdz6j";
           name = "snippet";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/snippet";
+          homepage = "https://melpa.org/#/snippet";
           license = lib.licenses.free;
         };
       }) {};
@@ -52309,13 +54373,13 @@
           sha256 = "07056pnjgsgw06c67776qp7jci96iqbzlprbavzz2l1j8ywz8cwm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/soft-charcoal-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/soft-charcoal-theme";
           sha256 = "0i29ais1m2h9v4ghcg41zfbnaj8klgm4509nkyfkxm7wqnjd166a";
           name = "soft-charcoal-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/soft-charcoal-theme";
+          homepage = "https://melpa.org/#/soft-charcoal-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -52330,13 +54394,13 @@
           sha256 = "06q82v1hndvznsqg0r6jrxvgxhycg9m65kay4db4yy0gmc66v2xf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/soft-morning-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/soft-morning-theme";
           sha256 = "0lzg478ax6idzh6m5sf2ds4gbv096y0c0gn15dai19f58bs63xzr";
           name = "soft-morning-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/soft-morning-theme";
+          homepage = "https://melpa.org/#/soft-morning-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -52351,55 +54415,55 @@
           sha256 = "030mf8b0sf9mmzwhg85zh0ccvcg768kckwvbm0yzg7vmq1x46hjl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/soft-stone-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/soft-stone-theme";
           sha256 = "05jjw9z6hqln9yj8ya2xrmjnylp7psfdj9206n30m3lwnlwx399v";
           name = "soft-stone-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/soft-stone-theme";
+          homepage = "https://melpa.org/#/soft-stone-theme";
           license = lib.licenses.free;
         };
       }) {};
     solarized-theme = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "solarized-theme";
-        version = "20160106.215";
+        version = "20160419.1027";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "solarized-emacs";
-          rev = "d518af81dbe14c4ae710115e6b7de94587436f21";
-          sha256 = "1vkrl8xvr5la8rj5gmafamzlqr0q2l1immyfnmfzf3r4n14kdywk";
+          rev = "a8cb8af769db056f80b2020b60f6b22b37f31c4d";
+          sha256 = "0km81a058y9biw2ydh98r6k78x0xv4zaagdiwqfx9h9szrz7m21i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/solarized-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/solarized-theme";
           sha256 = "15d8k32sj8i11806byvf7r57rivz391ljr0zb4dx8n8vjjkyja12";
           name = "solarized-theme";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
-          homepage = "http://melpa.org/#/solarized-theme";
+          homepage = "https://melpa.org/#/solarized-theme";
           license = lib.licenses.free;
         };
       }) {};
     solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "solidity-mode";
-        version = "20151124.1111";
+        version = "20160426.231";
         src = fetchFromGitHub {
           owner = "ethereum";
           repo = "emacs-solidity";
-          rev = "8bbd7d9e1e823b524d882d996b5c4e7b6a523b41";
-          sha256 = "0drb237750lry18arbfx37drf16znwz8fhx5fawxy1q4z7bl7z5n";
+          rev = "fb611258ac68c57226c7c2595990097cd757963e";
+          sha256 = "0wk6q5q2lbczy63jaqlb65lw6z420lvp0nnqkfzqp9wvw19dv8wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/solidity-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/solidity-mode";
           sha256 = "1qdzdivrf5yaa80p61b9r1gryw112v5l2m2jkvkc7glhkhrcvwsx";
           name = "solidity-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/solidity-mode";
+          homepage = "https://melpa.org/#/solidity-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -52414,13 +54478,13 @@
           sha256 = "1ga35d3rhdf6ffd36q58ay6380gjvkmaiid4vscga3v7ca0dkhl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sonic-pi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sonic-pi";
           sha256 = "07qxm1rkw2cbxf4g2vqk3s7xnqldqkdm2zw1qh2kqjscg5gwpkqp";
           name = "sonic-pi";
         };
         packageRequires = [ cl-lib dash emacs osc ];
         meta = {
-          homepage = "http://melpa.org/#/sonic-pi";
+          homepage = "https://melpa.org/#/sonic-pi";
           license = lib.licenses.free;
         };
       }) {};
@@ -52435,13 +54499,13 @@
           sha256 = "10gh1hvxq9gm29r6qzlnva7vjidd7n4kih4z2ihyvbvy9za20xqw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/soothe-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/soothe-theme";
           sha256 = "000hikpsmqpbb6v13az2dv319d0f7jjpkkpgi4vzv59z6cdlrlp3";
           name = "soothe-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/soothe-theme";
+          homepage = "https://melpa.org/#/soothe-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -52452,59 +54516,59 @@
         src = fetchFromGitHub {
           owner = "omouse";
           repo = "emacs-sos";
-          rev = "96b7d951a5f0a8ae401c0813745fc1aca0cb816c";
-          sha256 = "16x039imyf4p5d4rn92nlqcsvb5vlvdgq1m5g856b9dzwa89x733";
+          rev = "3ddee278ab5d22ee3363841b26cfede4955117fb";
+          sha256 = "086a66jlnkiv044i4japs4czw8gfs8p0n80p42ck83zm2jnznc49";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sos";
           sha256 = "1gkd0plx7152s3dj8a9lwlwh8bgs1m006s80l10agclx6aay8rvb";
           name = "sos";
         };
         packageRequires = [ org ];
         meta = {
-          homepage = "http://melpa.org/#/sos";
+          homepage = "https://melpa.org/#/sos";
           license = lib.licenses.free;
         };
       }) {};
     sotclojure = callPackage ({ cider, clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sotlisp }:
     melpaBuild {
         pname = "sotclojure";
-        version = "20160121.1240";
+        version = "20160421.2011";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "speed-of-thought-clojure";
-          rev = "6ffb9f002b9fe94cba397e4aa75f9233346c7a24";
-          sha256 = "0wl21pgjf9p6cf4d51cd2z974m6ph1cjspi3vdbf91pd13b72sdq";
+          rev = "8d879ef41c004726cca3c27a81b7543cc273c19b";
+          sha256 = "13yn2yadkpmykaly3l3xsq1bhm4sxyk8k1px555y11qi0mfdcjhh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sotclojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sotclojure";
           sha256 = "12byqjzg0pffqyq958265qq8yxxmf3iyy4m7zib492qcj8ccy090";
           name = "sotclojure";
         };
         packageRequires = [ cider clojure-mode emacs sotlisp ];
         meta = {
-          homepage = "http://melpa.org/#/sotclojure";
+          homepage = "https://melpa.org/#/sotclojure";
           license = lib.licenses.free;
         };
       }) {};
     sotlisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sotlisp";
-        version = "20151105.934";
+        version = "20160225.758";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "speed-of-thought-lisp";
-          rev = "d5d5ae44e6a31e231024cc7ad9861aa451165413";
-          sha256 = "027jmqx4240hym2is9q1iyjdws9ijyyck8dnsbm9xc5lhpsdrl69";
+          rev = "b67364d4825a9bf0a22261809ee9e9060b268198";
+          sha256 = "0xykm4yayb8gw83arv5p205cx18j14q9407rqw3sbcj9cj5nbk34";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sotlisp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sotlisp";
           sha256 = "0zjnn6hhwy6cjvc5rhvhxcq5pmrhcyil14a48fcgwvg4lv7fbljk";
           name = "sotlisp";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/sotlisp";
+          homepage = "https://melpa.org/#/sotlisp";
           license = lib.licenses.free;
         };
       }) {};
@@ -52519,13 +54583,13 @@
           sha256 = "1h6h65gwxb07pscyhhhdn11h3lx3jgyfw8v1kw5m2qfrv5kh6ylq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sound-wav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sound-wav";
           sha256 = "1vrwzk6zqma7r0w5ivbx16shys6hsifj52fwlf5rxs6jg1gqdb4f";
           name = "sound-wav";
         };
         packageRequires = [ cl-lib deferred ];
         meta = {
-          homepage = "http://melpa.org/#/sound-wav";
+          homepage = "https://melpa.org/#/sound-wav";
           license = lib.licenses.free;
         };
       }) {};
@@ -52534,14 +54598,14 @@
         pname = "soundcloud";
         version = "20150501.2226";
         src = fetchFromGitHub {
-          owner = "tthieman";
+          owner = "thieman";
           repo = "soundcloud.el";
           rev = "f998d4276ea90258909c698f6a5a51fccb667c08";
           sha256 = "1m8wcm6y80gq5rrm4brd3f20kmk54s6ph26j4lz4cmilxk6gj56v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/soundcloud";
-          sha256 = "1jl9sk372j4162av9kfcbqp0cc5wpm86nkqg8rskfgmsi4ncp4ph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/soundcloud";
+          sha256 = "06cbr1h03k5ixam6lsr82lx3nh2kkp0416mlig0zfkd4b8a9mf8c";
           name = "soundcloud";
         };
         packageRequires = [
@@ -52553,70 +54617,49 @@
           string-utils
         ];
         meta = {
-          homepage = "http://melpa.org/#/soundcloud";
+          homepage = "https://melpa.org/#/soundcloud";
           license = lib.licenses.free;
         };
       }) {};
-    soundklaus = callPackage ({ cl-lib ? null, dash, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
+    soundklaus = callPackage ({ cl-lib ? null, dash, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
     melpaBuild {
         pname = "soundklaus";
-        version = "20160210.1517";
+        version = "20160314.731";
         src = fetchFromGitHub {
           owner = "r0man";
           repo = "soundklaus.el";
-          rev = "4e69c5521f3196bd2dac81f683eb91885f614317";
-          sha256 = "1dj48i0s521x81sdm7sg76q2pz04jsdxi63l8j9qbhn0l08q66fz";
+          rev = "09ec030843482594beae2664b8fe1e0ad1e66472";
+          sha256 = "0w5ac515ymj43p5j19nhfqk0c3251c7x3i97r550g780niby1nc5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/soundklaus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/soundklaus";
           sha256 = "0b63sbgwp99ff94dxrqqp2p99j268fjkkzx0g42g726hv80d4fxb";
           name = "soundklaus";
         };
-        packageRequires = [ cl-lib dash emacs emms pkg-info s ];
+        packageRequires = [ cl-lib dash emacs emms pkg-info request s ];
         meta = {
-          homepage = "http://melpa.org/#/soundklaus";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sourcegraph = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "sourcegraph";
-        version = "20150403.2127";
-        src = fetchFromGitHub {
-          owner = "sourcegraph";
-          repo = "emacs-sourcegraph-mode";
-          rev = "554c55734c23588fce66a8fa966945509b03d395";
-          sha256 = "18iv7jhy08smpdksplngj1mxcm2mm9gvbylimgr3211l8jr9gq8r";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sourcegraph";
-          sha256 = "0rl6s1d0y2pggbfiq4f4xg9qp7nhkd708himzilfqyfa4jwna8yz";
-          name = "sourcegraph";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "http://melpa.org/#/sourcegraph";
+          homepage = "https://melpa.org/#/soundklaus";
           license = lib.licenses.free;
         };
       }) {};
     sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sourcekit";
-        version = "20151209.714";
+        version = "20160323.2009";
         src = fetchFromGitHub {
           owner = "nathankot";
           repo = "company-sourcekit";
-          rev = "5e1adf8d201fd94a942b40983415db1b28b6eef1";
-          sha256 = "1xzwalchl9lnq9848dlvhhbzyh1wkwbciz20d1iw0fsigj5g156c";
+          rev = "c9694cd8e84f4c7deffa6111297cb80eb7cb02a6";
+          sha256 = "04nm015408gzybfka0sc3czkf5y61x76h3sx3vlijf67i54bz7pi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sourcekit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sourcekit";
           sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks";
           name = "sourcekit";
         };
         packageRequires = [ dash dash-functional emacs ];
         meta = {
-          homepage = "http://melpa.org/#/sourcekit";
+          homepage = "https://melpa.org/#/sourcekit";
           license = lib.licenses.free;
         };
       }) {};
@@ -52631,13 +54674,13 @@
           sha256 = "085xd5fqxgv9bam9k4aa3w0sa9q41cg275i60c8njy3bkbqcalh5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sourcemap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sourcemap";
           sha256 = "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5";
           name = "sourcemap";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/sourcemap";
+          homepage = "https://melpa.org/#/sourcemap";
           license = lib.licenses.free;
         };
       }) {};
@@ -52652,13 +54695,13 @@
           sha256 = "0j4qm1y7rhb95k1zbl3c60a46l9rchzslzq36mayyw61s6yysjnv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sourcetalk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sourcetalk";
           sha256 = "0qaf2q784xgl1s3m88jpwdzghpi4f3nybga3lnr1w7sb7b3yvj3z";
           name = "sourcetalk";
         };
         packageRequires = [ request ];
         meta = {
-          homepage = "http://melpa.org/#/sourcetalk";
+          homepage = "https://melpa.org/#/sourcetalk";
           license = lib.licenses.free;
         };
       }) {};
@@ -52673,55 +54716,55 @@
           sha256 = "1a8jp7m9zarvljg5d9c8ydir3qcmwx05c3frs696p9nwvapf6lsb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/spacegray-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/spacegray-theme";
           sha256 = "0khiddpsywpv9qvynpfdmybd80lbrhm68j3py6ranxlv7p79j9dx";
           name = "spacegray-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/spacegray-theme";
+          homepage = "https://melpa.org/#/spacegray-theme";
           license = lib.licenses.free;
         };
       }) {};
     spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
     melpaBuild {
         pname = "spaceline";
-        version = "20160120.559";
+        version = "20160420.1401";
         src = fetchFromGitHub {
           owner = "TheBB";
           repo = "spaceline";
-          rev = "88e22c1c9c69093efc7310ca996d2efb3cbbba1d";
-          sha256 = "1ncwv6sqm1ch396qi1c8276dc910rnm0f3m8xjkskplv3cjaq0ai";
+          rev = "d8492f0caeaf37f308236e04d097e180fec0e2c1";
+          sha256 = "1sw9i8x3cr28nb5mikf8lcxcnvjjz8dwa5ylf94gcw1q62hy5lvz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/spaceline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/spaceline";
           sha256 = "0jpcj0i8ckdylrisx9b4l9kam6kkjzhhv1s7mwwi4b744rx942iw";
           name = "spaceline";
         };
         packageRequires = [ cl-lib dash emacs powerline s ];
         meta = {
-          homepage = "http://melpa.org/#/spaceline";
+          homepage = "https://melpa.org/#/spaceline";
           license = lib.licenses.free;
         };
       }) {};
     spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spacemacs-theme";
-        version = "20160219.1206";
+        version = "20160411.925";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "3402e5cbeebcabc70ea1ce084f479752140121a3";
-          sha256 = "0dp8zrljwfdkfp3vwx0y902di02893n56bz1l32iah72kapws4xa";
+          rev = "0c88ced718942fbfda85ac5992bf8ac424f10121";
+          sha256 = "1ny203z4cbra97gas1ymixiwlcd80g4wvaxqi93gq1ljkfd6jb27";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/spacemacs-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/spacemacs-theme";
           sha256 = "0riiim6qb6x9g5hz0k3qgdymgikynlb9l07mrbfmybkv4919p992";
           name = "spacemacs-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/spacemacs-theme";
+          homepage = "https://melpa.org/#/spacemacs-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -52736,13 +54779,34 @@
           sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/spaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/spaces";
           sha256 = "152x7fzjnjjdk9d9h0hbixdp3haqn5vdx3bq1nfqfrkvzychyr06";
           name = "spaces";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/spaces";
+          homepage = "https://melpa.org/#/spaces";
+          license = lib.licenses.free;
+        };
+      }) {};
+    spark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "spark";
+        version = "20160414.2101";
+        src = fetchFromGitHub {
+          owner = "alvinfrancis";
+          repo = "spark";
+          rev = "eec8feae7dbc8547f878fac302f03e0ff7bc9803";
+          sha256 = "155ap3vcypcj0pxvjhi2p0a5a9a2rp63hqnsjczsbabmbz1mdsd5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/spark";
+          sha256 = "0dv7ixv9gw6xxhw5zm4gmv2ll4lja8hmn2pdizlqxaizpm245rkn";
+          name = "spark";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/spark";
           license = lib.licenses.free;
         };
       }) {};
@@ -52757,34 +54821,34 @@
           sha256 = "1fqd3ycywxxmln2kzqwflc69xmqlvi9gwvmf7frn0rfv73w09cvp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sparkline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sparkline";
           sha256 = "081jzaxjb32nydvr1kmyafxqxi610n0yf8lwz9vldm84famf3g7y";
           name = "sparkline";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/sparkline";
+          homepage = "https://melpa.org/#/sparkline";
           license = lib.licenses.free;
         };
       }) {};
-    sparql-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    sparql-mode = callPackage ({ async, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sparql-mode";
-        version = "20151104.1114";
+        version = "20160316.1004";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "sparql-mode";
-          rev = "303858e7f91829ec720141482c777460e66f310b";
-          sha256 = "1gk2ps7fn9z8n6r923qzn518gz9mrj7mb6j726cz8qb585ndjbij";
+          rev = "04a3ad8a5aaf409cfe2256c833e3a3b697a259dc";
+          sha256 = "1bwa7vi97xlgwzyrc9cdz8i8rajlvkp4ajs8nklsqwrvzngly9lx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sparql-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sparql-mode";
           sha256 = "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d";
           name = "sparql-mode";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ async cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/sparql-mode";
+          homepage = "https://melpa.org/#/sparql-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -52792,38 +54856,38 @@
         pname = "speck";
         version = "20140901.1335";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/speck.el";
+          url = "https://www.emacswiki.org/emacs/download/speck.el";
           sha256 = "1i2z57aasljia6xd2xn1mryklc2gc9c2q1fad8wn7982sl277d10";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/speck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/speck";
           sha256 = "19h3syk4kjmcy7jy9nlsbq6gyxwl4xsi84dy66a3cpvmknm25kyg";
           name = "speck";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/speck";
+          homepage = "https://melpa.org/#/speck";
           license = lib.licenses.free;
         };
       }) {};
     speech-tagger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "speech-tagger";
-        version = "20160103.1712";
+        version = "20160224.202";
         src = fetchFromGitHub {
           owner = "cosmicexplorer";
           repo = "speech-tagger";
-          rev = "994f61753f78cd2b2139f6e5eef9254f28fb9bed";
-          sha256 = "05qx3wqsqs9lxv5lgpaw1wsd6qb5hh599ggi3c17ig5663q7pjsd";
+          rev = "60ce97b0fc34eb32f507957646679fff77b5f0fd";
+          sha256 = "0v4v2nr680zgljr9k7rgf7mhy49bv5ixc8ksba3g1bbrz0qv5ny6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/speech-tagger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/speech-tagger";
           sha256 = "0sqil949ny9qjxq7kpb4zmjd7770r0qvq4sz80agw6a27mqnaajc";
           name = "speech-tagger";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/speech-tagger";
+          homepage = "https://melpa.org/#/speech-tagger";
           license = lib.licenses.free;
         };
       }) {};
@@ -52834,16 +54898,16 @@
         src = fetchgit {
           url = "git://git.freebsoft.org/git/speechd-el";
           rev = "3d729817296b2ed8ad414a6aa044a8aa762259eb";
-          sha256 = "2c1bff3e5a182b8150c6ba6c3be7e70ab2b733cac0a758521c0b941dff215c32";
+          sha256 = "0cjw47ziv50b3i95i9y0r8rvgchawzkknv5sqr882aqqb8zgy6rc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/speechd-el";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/speechd-el";
           sha256 = "07g6jwymmwkx26p3as3r370viz1cqq360cagw9ji6i0hvgrr66a0";
           name = "speechd-el";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/speechd-el";
+          homepage = "https://melpa.org/#/speechd-el";
           license = lib.licenses.free;
         };
       }) {};
@@ -52858,13 +54922,13 @@
           sha256 = "102hjyr9ii2rmq8762irbwansbi023s7dg4a8n6lkadcvzfibmag";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/speed-type";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/speed-type";
           sha256 = "14q423an7v5hhfx1x039fizxcn5hcscqf2jfn9rqifg4jpq8bq5g";
           name = "speed-type";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/speed-type";
+          homepage = "https://melpa.org/#/speed-type";
           license = lib.licenses.free;
         };
       }) {};
@@ -52879,13 +54943,13 @@
           sha256 = "1wif9wf8hwxk0q09cdnrmyas7zjg8l5b8jd6sjxd40ypn6dmz2ch";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sphinx-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sphinx-doc";
           sha256 = "00h3wx2p5hzbw6sggggdrzv4jrn1wc051iqql5y2m1hsh772ic5z";
           name = "sphinx-doc";
         };
         packageRequires = [ cl-lib dash s ];
         meta = {
-          homepage = "http://melpa.org/#/sphinx-doc";
+          homepage = "https://melpa.org/#/sphinx-doc";
           license = lib.licenses.free;
         };
       }) {};
@@ -52900,13 +54964,13 @@
           sha256 = "1mfp4777ppg7zg7zqj755zpfk9lmcq73hxv055ig66pz30m7x5rw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sphinx-frontend";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sphinx-frontend";
           sha256 = "0hdn6zjnhzyka0lzdxqfzbj3lrj767ij406zha9zw8ibbkk7cmag";
           name = "sphinx-frontend";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sphinx-frontend";
+          homepage = "https://melpa.org/#/sphinx-frontend";
           license = lib.licenses.free;
         };
       }) {};
@@ -52921,13 +54985,13 @@
           sha256 = "1qdy9nc2h7mwxh7zg2p1x7yg96hxkwxqimjp6zb1119jx0s8grjc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/splitjoin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/splitjoin";
           sha256 = "0l1x98fvvia8qx8g125h4d76slv0xnb3h1zxiq9xb5qh7a1h069l";
           name = "splitjoin";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/splitjoin";
+          homepage = "https://melpa.org/#/splitjoin";
           license = lib.licenses.free;
         };
       }) {};
@@ -52942,13 +55006,13 @@
           sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/splitter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/splitter";
           sha256 = "02vdhvipzwnh6mlj25lirzxkc0shfzqfs1p4gn3smkxqx6g7mdb2";
           name = "splitter";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/splitter";
+          homepage = "https://melpa.org/#/splitter";
           license = lib.licenses.free;
         };
       }) {};
@@ -52963,13 +55027,13 @@
           sha256 = "1f0dl2zzxnqsyic87jl9wbg6lf42d8g61sj4d9fb3yhxy6jf07jv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/spotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/spotify";
           sha256 = "0pmsvxi1dsi580wkhhx8iw329agkh5yzk61bqvxzign3cd6fbq6k";
           name = "spotify";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/spotify";
+          homepage = "https://melpa.org/#/spotify";
           license = lib.licenses.free;
         };
       }) {};
@@ -52984,55 +55048,55 @@
           sha256 = "05knlca2dvpyqp9lw8dc47fl5kh2jb04q57cygkzfjjkzvywdwq8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/spotlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/spotlight";
           sha256 = "0mmr1spr21pi8sfy95dsgqcxn8qfsphdkfjm5w5q97lh7496z65p";
           name = "spotlight";
         };
         packageRequires = [ counsel emacs swiper ];
         meta = {
-          homepage = "http://melpa.org/#/spotlight";
+          homepage = "https://melpa.org/#/spotlight";
           license = lib.licenses.free;
         };
       }) {};
     spray = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spray";
-        version = "20150626.145";
+        version = "20160304.1620";
         src = fetchFromGitHub {
           owner = "ian-kelling";
           repo = "spray";
-          rev = "11623f45955a18115459a2c18dc95bc967980a53";
-          sha256 = "0fvywcwn0zd06yy4b6cxpasiwfbps17jz9dy3jr0y0mdx5lzfxa9";
+          rev = "69fe48e7bb079e3011476b9f4eb6ac9ae94d6d9b";
+          sha256 = "0anidv7w2vwsjv8rwkvhs3x51av3y8dp435456czy5yfq6i6vfbl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/spray";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/spray";
           sha256 = "11b3wn53309ws60w8sfpfxij7vnibj6kxxsx6w1agglqx9zqngz4";
           name = "spray";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/spray";
+          homepage = "https://melpa.org/#/spray";
           license = lib.licenses.free;
         };
       }) {};
     springboard = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "springboard";
-        version = "20150505.1211";
+        version = "20160329.1309";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "springboard";
-          rev = "d12119d9dd2b0b64f0af0ba82c273326c8c12268";
-          sha256 = "14py5amh66jzhqyqjz5pxq0g19vzlmqnrr5wij1ix64xwfr3xdy8";
+          rev = "ffcfaade6f69328084a0613d43d323f790d23048";
+          sha256 = "0p13q8xax2h3m6rddvmh1p9biw3d1shvwwmqfhg0c93xajlwdfqi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/springboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/springboard";
           sha256 = "17rmsidsbb4p08vr07mfn25m17wnpadcwr4nxvp79glp5a0wyyib";
           name = "springboard";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/springboard";
+          homepage = "https://melpa.org/#/springboard";
           license = lib.licenses.free;
         };
       }) {};
@@ -53047,13 +55111,13 @@
           sha256 = "06rk07h92s5sljprs41y3q31q64cprx9kgs56c2j6v4c8cmsq5h6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sprintly-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sprintly-mode";
           sha256 = "15i3rrv27ccpn12wwj9raaxpj7nlnrrj3lsp8vdfwph6ydvnfza4";
           name = "sprintly-mode";
         };
         packageRequires = [ furl ];
         meta = {
-          homepage = "http://melpa.org/#/sprintly-mode";
+          homepage = "https://melpa.org/#/sprintly-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -53068,13 +55132,34 @@
           sha256 = "11igl9n2zwwar1xg651g5v0r0w6xl0grm8xns9wg80351ijrci7x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sproto-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sproto-mode";
           sha256 = "19l6si3sx2i542r5lyr9axby9hblx76m77f17vnsjf32n3r0qgma";
           name = "sproto-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sproto-mode";
+          homepage = "https://melpa.org/#/sproto-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sprunge = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "sprunge";
+        version = "20160229.2043";
+        src = fetchFromGitHub {
+          owner = "tomjakubowski";
+          repo = "sprunge.el";
+          rev = "0fd386b8b29c4175022a04ad70ea5643185b6726";
+          sha256 = "03wjzk1ljclfjgqzkg6m7v8saaajgavyd0xskd8fg8rdkx13ki0l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sprunge";
+          sha256 = "199vfl6i881aks8fi9d9w4w7mnc7n443h79p3s4srcpmbyfg6g3w";
+          name = "sprunge";
+        };
+        packageRequires = [ cl-lib request ];
+        meta = {
+          homepage = "https://melpa.org/#/sprunge";
           license = lib.licenses.free;
         };
       }) {};
@@ -53089,13 +55174,13 @@
           sha256 = "17nbcaqx58fq4rz501xcqqcjhmibdlkaavmmzwcfwra7jv8hqljy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sql-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sql-indent";
           sha256 = "13s38zdd9j127p6jxbcj4d4va8mkri5dx5zh39g465mnlzx7fp8g";
           name = "sql-indent";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sql-indent";
+          homepage = "https://melpa.org/#/sql-indent";
           license = lib.licenses.free;
         };
       }) {};
@@ -53110,13 +55195,13 @@
           sha256 = "0zlrx8sk7gwwr6a23mc22d7iinwf8p9ff16r9krqp86fyzbhnq1d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sqlite";
           sha256 = "1j23rqgq00as90nk6csi489ida6b83h1myl3icxivj2iw1iikgj1";
           name = "sqlite";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sqlite";
+          homepage = "https://melpa.org/#/sqlite";
           license = lib.licenses.free;
         };
       }) {};
@@ -53124,17 +55209,17 @@
         pname = "sqlplus";
         version = "20141009.939";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/sqlplus.el";
+          url = "https://www.emacswiki.org/emacs/download/sqlplus.el";
           sha256 = "0xixdddcrzx6k0s8w9rp6q7b9qjpdb4l888gmcis42yvawb1i53d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sqlplus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sqlplus";
           sha256 = "1z9pf36b1581flykis9cjv7pynnp94fm4ijzjy6hvqyj81aikxpz";
           name = "sqlplus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sqlplus";
+          homepage = "https://melpa.org/#/sqlplus";
           license = lib.licenses.free;
         };
       }) {};
@@ -53143,19 +55228,19 @@
         pname = "sqlup-mode";
         version = "20151121.830";
         src = fetchFromGitHub {
-          owner = "trevoke";
+          owner = "Trevoke";
           repo = "sqlup-mode.el";
           rev = "9cb9662673b7bed891582cfc1080d91a254048f7";
           sha256 = "0p2g4ss3bf2asxcibrd8l70ll04nm47znr99l5xyzzwhyfzi61w4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sqlup-mode";
-          sha256 = "06a0v2qagpd9p2bh19bfw14a6if8kjjc4yyhm5nwp8a8d2vnl5l7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sqlup-mode";
+          sha256 = "0ngs58iri3fwv5ny707kvb6xjq98x19pzak8c9nq4qnpw3nkr83b";
           name = "sqlup-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sqlup-mode";
+          homepage = "https://melpa.org/#/sqlup-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -53163,38 +55248,38 @@
         pname = "sr-speedbar";
         version = "20150804.1151";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/sr-speedbar.el";
+          url = "https://www.emacswiki.org/emacs/download/sr-speedbar.el";
           sha256 = "1ffnm2kfh8cg5rdhrkqmh4krggbxvqg3s6lc1nssv88av1c5cs3i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sr-speedbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sr-speedbar";
           sha256 = "1zq3ysz1vpc98sz2kpq307v1fp1l4ivwgrfh2kdqkkdjm4fkya23";
           name = "sr-speedbar";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sr-speedbar";
+          homepage = "https://melpa.org/#/sr-speedbar";
           license = lib.licenses.free;
         };
       }) {};
     srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "srefactor";
-        version = "20151202.2204";
+        version = "20160420.233";
         src = fetchFromGitHub {
           owner = "tuhdo";
           repo = "semantic-refactor";
-          rev = "e0482b08425894431fa67109615d4f0c971471c8";
-          sha256 = "1n5p51iy79z60fnhxklc03pp0jbs5rgyb02z3wndbyzy73bhfh7b";
+          rev = "a12eecfab02c10a6b8090df6fa376c1d98a1b9dc";
+          sha256 = "02jr9cgar2r71rrrx13rj83nd19bxajmzzgj4awzn0d93i4l5qkc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/srefactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/srefactor";
           sha256 = "01cd40jm4h00c5q2ix7cskp7klbkcd3n5763y5lqfv59bjxwdqd2";
           name = "srefactor";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/srefactor";
+          homepage = "https://melpa.org/#/srefactor";
           license = lib.licenses.free;
         };
       }) {};
@@ -53209,13 +55294,13 @@
           sha256 = "1rdhdkwdhb727rj53xyxk6i00sjr58a48hfig14m12niy1k739vd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ssh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ssh";
           sha256 = "1jywn8wlqzc2mfylp0kbpzxv3kwzak3vxdbjabiawqv1m4bfpk5g";
           name = "ssh";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ssh";
+          homepage = "https://melpa.org/#/ssh";
           license = lib.licenses.free;
         };
       }) {};
@@ -53230,34 +55315,34 @@
           sha256 = "0076g1yb8xvn6s8gz5jxiz8mn448fmab574yizgakbxaxd91s1dj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ssh-agency";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ssh-agency";
           sha256 = "0lci3fhl2p9mwilvq1njzy13dkq5cp5ighymf3zs4gzm3w0ih3h8";
           name = "ssh-agency";
         };
         packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ssh-agency";
+          homepage = "https://melpa.org/#/ssh-agency";
           license = lib.licenses.free;
         };
       }) {};
     ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-config-mode";
-        version = "20141219.1046";
+        version = "20160326.752";
         src = fetchFromGitHub {
           owner = "jhgorrell";
           repo = "ssh-config-mode-el";
-          rev = "3d194c772d428144acd84c85be560ca96fb323ba";
-          sha256 = "1v6srqiqq5xsjiw4d3kfgp218dks8mm6f9i88ngjri6sb3slpfb6";
+          rev = "da93f32cfe7d8a43b093b7a2c0b4845afb7a96a7";
+          sha256 = "08nx1iwvxqs1anng32w3c2clhnjf45527j0gxz5fy6h9svmb921q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ssh-config-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ssh-config-mode";
           sha256 = "0aihyig6q3pmk9ld519f4n3kychrg3l7r29ijd2dpvs0530md4wb";
           name = "ssh-config-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ssh-config-mode";
+          homepage = "https://melpa.org/#/ssh-config-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -53272,13 +55357,13 @@
           sha256 = "10a5havjg4yjshpfzkhgjdwbrvl44narg09ddzynczmyzm4f01wh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ssh-tunnels";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ssh-tunnels";
           sha256 = "0zlf22wg9adkhycsasv6bfim2h0cknsvihyi1q2l2l4pjdp9ypqj";
           name = "ssh-tunnels";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ssh-tunnels";
+          homepage = "https://melpa.org/#/ssh-tunnels";
           license = lib.licenses.free;
         };
       }) {};
@@ -53293,13 +55378,13 @@
           sha256 = "1f2dxlc3dsf9ay417h1l43fxjkrb0a4gg96zd3asx9v2alpzgcim";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stack-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/stack-mode";
           sha256 = "0s0m2lj40php7bc2i3fy9ikd5rmx4v7zbxfkp9vadmlc5s7w25gf";
           name = "stack-mode";
         };
         packageRequires = [ cl-lib flycheck haskell-mode ];
         meta = {
-          homepage = "http://melpa.org/#/stack-mode";
+          homepage = "https://melpa.org/#/stack-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -53314,13 +55399,13 @@
           sha256 = "0nkrpx1rmzg48mi5871mgdizasv80vpald513ycx4nshyln0ymv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stan-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/stan-mode";
           sha256 = "17ph5khwwrcpyl96xnp3rsbmnk7mpwmgskxka3cfgkm190qihfqy";
           name = "stan-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/stan-mode";
+          homepage = "https://melpa.org/#/stan-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -53335,13 +55420,13 @@
           sha256 = "0nkrpx1rmzg48mi5871mgdizasv80vpald513ycx4nshyln0ymv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stan-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/stan-snippets";
           sha256 = "021skkvak645483s7haz1hsz98q3zd8hqi9k5zdzaqlabwdjwh85";
           name = "stan-snippets";
         };
         packageRequires = [ stan-mode yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/stan-snippets";
+          homepage = "https://melpa.org/#/stan-snippets";
           license = lib.licenses.free;
         };
       }) {};
@@ -53356,34 +55441,34 @@
           sha256 = "09gjhg923jck35c1nvcdfk4dc0r559myzmfbcd9jvjamzh50ngcr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/standoff-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/standoff-mode";
           sha256 = "127bzpm1cz103f1pb860yqrh7mr0rdaivrm9p6ssd01kchl9nskp";
           name = "standoff-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/standoff-mode";
+          homepage = "https://melpa.org/#/standoff-mode";
           license = lib.licenses.free;
         };
       }) {};
     start-menu = callPackage ({ cl-lib ? null, config-parser, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "start-menu";
-        version = "20160115.2339";
+        version = "20160426.725";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "el-start-menu";
-          rev = "259ec3e5f8564bd03edc12a0f539b294ad1d841f";
-          sha256 = "1v3rzy842mfzm850vs273ssr4hg00q1wz2rpky8lk3wbbw2qq3f0";
+          rev = "f7d33fed7ad2dc61156f1c1cff9e1805366fbd69";
+          sha256 = "1w3l8ahal9hjisny382bcw9w1nh2swpb1jzf2djww5h0i4r2h36c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/start-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/start-menu";
           sha256 = "1k1lc9i9vcl2am9afq0ksrxwsy6kppl4i0v10h0w2fq5z374rdkv";
           name = "start-menu";
         };
         packageRequires = [ cl-lib config-parser ];
         meta = {
-          homepage = "http://melpa.org/#/start-menu";
+          homepage = "https://melpa.org/#/start-menu";
           license = lib.licenses.free;
         };
       }) {};
@@ -53398,34 +55483,34 @@
           sha256 = "0cl2y72iagmv87kg72a46a3kap2xigwnrbk2hjgvsbxv2ng5f9cr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/stash";
           sha256 = "116k40ispv7sq3jskwc1lvmhmk3jjz4j967r732s07f5h11vk1z9";
           name = "stash";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/stash";
+          homepage = "https://melpa.org/#/stash";
           license = lib.licenses.free;
         };
       }) {};
     state = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "state";
-        version = "20160108.736";
+        version = "20160422.750";
         src = fetchFromGitHub {
           owner = "thisirs";
           repo = "state";
-          rev = "bd74ed144cebae926f54cbaf18600b24dd1a9aaf";
-          sha256 = "1b17v4xghmki0g9yr5855891mlcrrbkr68xc3qyals5xw0dhb3xb";
+          rev = "4a5fa2e37186408df3e98d936514387ceef80bd5";
+          sha256 = "1rjp1zsbh476njjznbsxr47x4lqs4i887yi9xvwvpcb2wcwfly81";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/state";
           sha256 = "19y3n8wnbpgbpz4jxy2p7hjqxykg09arjp7s5v22yz7il3gn48l2";
           name = "state";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/state";
+          homepage = "https://melpa.org/#/state";
           license = lib.licenses.free;
         };
       }) {};
@@ -53440,13 +55525,13 @@
           sha256 = "0jpxmzfvg4k5q3h3gn6lrg891wjzlcps2kkij1jbdjk4jkgq386i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/status";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/status";
           sha256 = "0a9lqa7a5nki5711bjrmx214kah5ndqpwh3i240gdd08mcm07ps3";
           name = "status";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/status";
+          homepage = "https://melpa.org/#/status";
           license = lib.licenses.free;
         };
       }) {};
@@ -53461,13 +55546,13 @@
           sha256 = "0w1qb8r6nrxi5hbf8l4247yqq754zfbxz64pqqcnw43cxk0qd4j3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stekene-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/stekene-theme";
           sha256 = "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1";
           name = "stekene-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/stekene-theme";
+          homepage = "https://melpa.org/#/stekene-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -53482,13 +55567,13 @@
           sha256 = "1xc4v8a35c2vpfhza15j4f89x7vyg9bbgm7xnprij7814k8iy7p0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stem";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/stem";
           sha256 = "1625nbi2bmb7vzjz0s7y1cy7dp8lp83dayiib3nr2bfkv76fwkcq";
           name = "stem";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/stem";
+          homepage = "https://melpa.org/#/stem";
           license = lib.licenses.free;
         };
       }) {};
@@ -53498,16 +55583,16 @@
         src = fetchgit {
           url = "git://repo.or.cz/stgit.git";
           rev = "e4e04764009f749665636c4d11e0cafd9c4971e1";
-          sha256 = "c5d424f34ca33d2c19e3888a9dc249d0398203e5199bf2b4bdd9e604390b500b";
+          sha256 = "02sh1cwh9rnrpnsg56qrwl1q4ffh9719v2l8wccjqgd39krj9m65";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/stgit";
           sha256 = "102s9lllrcxsqs0lgbrcljwq1l3s8ri4276wck6rcypck5zgzj89";
           name = "stgit";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/stgit";
+          homepage = "https://melpa.org/#/stgit";
           license = lib.licenses.free;
         };
       }) {};
@@ -53515,17 +55600,17 @@
         pname = "sticky";
         version = "20101129.2052";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/sticky.el";
+          url = "https://www.emacswiki.org/emacs/download/sticky.el";
           sha256 = "18izyia1j3w2c07qhkp9h6rnvw35m5k1brrrjhm51fpdv2xj65fy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sticky";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sticky";
           sha256 = "1xjkdwphq3m4jrazsfnzrrcrqikfdxzph3jdzkpbzk3grd4af96w";
           name = "sticky";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sticky";
+          homepage = "https://melpa.org/#/sticky";
           license = lib.licenses.free;
         };
       }) {};
@@ -53540,13 +55625,13 @@
           sha256 = "16dxjsr5nj20blww4xpd4jzgjprzzh1nwvb810ggdmp9paf4iy0g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stickyfunc-enhance";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/stickyfunc-enhance";
           sha256 = "13dh19c3bljs83l847syqlg07g33hz6sapg6j4s4xv4skix8zfks";
           name = "stickyfunc-enhance";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/stickyfunc-enhance";
+          homepage = "https://melpa.org/#/stickyfunc-enhance";
           license = lib.licenses.free;
         };
       }) {};
@@ -53561,13 +55646,13 @@
           sha256 = "191sg32z1iagyxmbn49i1lpfihld9g9741cw2kj830s4vag4kinx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stock-ticker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/stock-ticker";
           sha256 = "1slcjk2avybr4v9s7gglizmaxbb3yqg6s6gdbg12m3vvj3b72lfi";
           name = "stock-ticker";
         };
         packageRequires = [ request s ];
         meta = {
-          homepage = "http://melpa.org/#/stock-ticker";
+          homepage = "https://melpa.org/#/stock-ticker";
           license = lib.licenses.free;
         };
       }) {};
@@ -53576,40 +55661,40 @@
         pname = "strie";
         version = "20160211.1622";
         src = fetchFromGitHub {
-          owner = "hackscience";
+          owner = "jcatw";
           repo = "strie.el";
           rev = "eb7efb0cccc127c414f6a64db11454869d9c10a8";
           sha256 = "1kcbkf0wbmqy9slxfqg7wsyw5n2rsaz832ibrxszb642j0l8s7pr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/strie";
-          sha256 = "0i1bgjlwcc2ks8hzjkyrw924q4k8pcz8335z9935m73js0sq0lxl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/strie";
+          sha256 = "1ngvpbws7laqxk6mm023r5295msap12h8bh9zrsbr05yxfzhlx83";
           name = "strie";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/strie";
+          homepage = "https://melpa.org/#/strie";
           license = lib.licenses.free;
         };
       }) {};
     string-edit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "string-edit";
-        version = "20151213.1130";
+        version = "20160411.156";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "string-edit.el";
-          rev = "c380e20ca169bd4e7117a99edd5711e673168cbe";
-          sha256 = "0nx303bdi8mq18isgf79y8f1cjhqnxv3g3ynm09llrg73qr7r4zw";
+          rev = "c44b65b4c5e9f52be9c14d88ca2f402a18d9e1dd";
+          sha256 = "1xm7bb3cp99ahr5jrwi0p0258qcvlbddy98wmbq00kk5pihqbzsg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/string-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/string-edit";
           sha256 = "1l1hqsfyi6pp4x4g1rk4s7x9zjc03wfmhy16izia8nkjhzz88fi8";
           name = "string-edit";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/string-edit";
+          homepage = "https://melpa.org/#/string-edit";
           license = lib.licenses.free;
         };
       }) {};
@@ -53624,13 +55709,13 @@
           sha256 = "06qs8v2pai3pyg0spmarssmrq06xg9q60wjj46s5xxichlw9pgcf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/string-inflection";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/string-inflection";
           sha256 = "1vrjcg1fa5adw16s4v9dq0fid0gfazxk15z9cawz0kmnpyzz3fg2";
           name = "string-inflection";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/string-inflection";
+          homepage = "https://melpa.org/#/string-inflection";
           license = lib.licenses.free;
         };
       }) {};
@@ -53645,13 +55730,13 @@
           sha256 = "1frdspm1qgksa8cpx5gkj50xk9mgz8202pgp11lqir6l3yjcj3wq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/string-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/string-utils";
           sha256 = "1vsvxc06fd3wardldb83i5hjfibvmiqnxvcgdns7i5i8qlsrsx4v";
           name = "string-utils";
         };
         packageRequires = [ list-utils ];
         meta = {
-          homepage = "http://melpa.org/#/string-utils";
+          homepage = "https://melpa.org/#/string-utils";
           license = lib.licenses.free;
         };
       }) {};
@@ -53659,17 +55744,17 @@
         pname = "strings";
         version = "20151231.1807";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/strings.el";
+          url = "https://www.emacswiki.org/emacs/download/strings.el";
           sha256 = "1sa6wd2z2qkcnjprkkm9b945qz8d0l702sv9w15wl0lngbhw84na";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/strings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/strings";
           sha256 = "0n3239y7biq3rlg74m7nqimhf654w4snnw2zm7z84isgwzz2dphk";
           name = "strings";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/strings";
+          homepage = "https://melpa.org/#/strings";
           license = lib.licenses.free;
         };
       }) {};
@@ -53684,13 +55769,13 @@
           sha256 = "0dxajh72wdcwdb9ydbcm19fmp0p1drmh1niq4r69jnbn8sah0zax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stripe-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/stripe-buffer";
           sha256 = "02wkb9y6vykrn6a5nfnimaplj7ig8i8h6m2rvwv08f5ilbccj16a";
           name = "stripe-buffer";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/stripe-buffer";
+          homepage = "https://melpa.org/#/stripe-buffer";
           license = lib.licenses.free;
         };
       }) {};
@@ -53701,16 +55786,16 @@
         src = fetchgit {
           url = "git://git.savannah.nongnu.org/stumpwm.git";
           rev = "61a7cf27e49e0779a53c018b2342f5f1c5cc70b4";
-          sha256 = "3547616b9e5694fd09014bbbf29458ee0dea828428b6bf7a6231670aacfb8271";
+          sha256 = "0wc2zfn0lrric9xbzdi8hj1fl3gfb2ag5fsb044zv52nkrmn2irm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stumpwm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/stumpwm-mode";
           sha256 = "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86";
           name = "stumpwm-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/stumpwm-mode";
+          homepage = "https://melpa.org/#/stumpwm-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -53721,16 +55806,16 @@
         src = fetchgit {
           url = "https://gist.github.com/5487564.git";
           rev = "e26ff5a2c4a582c6c1940bbcd204cfeed8e65222";
-          sha256 = "242b90e4c403fbcadd40777cd98899c96aab78b84dea88dfa97583b734c9876b";
+          sha256 = "0sw7r4sbg0vmm7gqisjdp1wansn9k64djz3p83fwmyq3qkj90ar4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stupid-indent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/stupid-indent-mode";
           sha256 = "12y8qxxs04qzy09m734qg0857g4612qdswx2bh9jk7dp886fpd7p";
           name = "stupid-indent-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/stupid-indent-mode";
+          homepage = "https://melpa.org/#/stupid-indent-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -53745,13 +55830,13 @@
           sha256 = "1q6wpjb7vhsy92li6fag34pwyil4zvcchbvfjml612aaykiys506";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stylus-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/stylus-mode";
           sha256 = "152k74q6qn2xa38v2zyd5y7ya5n26nvai5v7z5fmq7jrcndp27r5";
           name = "stylus-mode";
         };
         packageRequires = [ sws-mode ];
         meta = {
-          homepage = "http://melpa.org/#/stylus-mode";
+          homepage = "https://melpa.org/#/stylus-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -53766,13 +55851,13 @@
           sha256 = "1j63rzxnrzzqizh7fpd99dcgsy5hd7w4d2lpwl5armmixlycl5m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/subatomic-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/subatomic-theme";
           sha256 = "0mqas67qms492n3hn74c5nrkjpsgf9b42lp02s2dh366c075dpqc";
           name = "subatomic-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/subatomic-theme";
+          homepage = "https://melpa.org/#/subatomic-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -53787,13 +55872,13 @@
           sha256 = "1w7mimyqc25phlww20l49wlafnxp6c7dwibvphg3vwl61g0llpq8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/subatomic256-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/subatomic256-theme";
           sha256 = "1whjlkpkkirpnvvjryhlpzwphr1syz5zfyg4pb66i0db03hxwwcy";
           name = "subatomic256-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/subatomic256-theme";
+          homepage = "https://melpa.org/#/subatomic256-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -53808,13 +55893,13 @@
           sha256 = "10pirwc7g9vii5cyk4vg6m5g5hlap0yg9w4qy257744c67jmaxvg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/subemacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/subemacs";
           sha256 = "0sqh80jhh3v37l5af7w6k9lqvj39bd91pn6a9rwdlfk389hp90zm";
           name = "subemacs";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/subemacs";
+          homepage = "https://melpa.org/#/subemacs";
           license = lib.licenses.free;
         };
       }) {};
@@ -53825,17 +55910,17 @@
         src = fetchFromGitHub {
           owner = "owainlewis";
           repo = "emacs-color-themes";
-          rev = "2b37d0def434871a2c0d3476f5b7eeeed9bb90b2";
-          sha256 = "0lhbmcpzpxlqvw4mgh79v9y2f0xqjd1m36dbxcvhb67rwq6nrw3r";
+          rev = "4648b68e96bfde26d6e4af9f919971eef2768e5f";
+          sha256 = "0q9p974xvswr2sijz1rs858x9sdx0rb00lkhj5cd90abn33lb260";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sublime-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sublime-themes";
           sha256 = "1nahcfcy831c7w3c69i2na0r8jsdgprffgfdvh4c41cnk4rkgdqj";
           name = "sublime-themes";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sublime-themes";
+          homepage = "https://melpa.org/#/sublime-themes";
           license = lib.licenses.free;
         };
       }) {};
@@ -53850,13 +55935,13 @@
           sha256 = "1kpq7kpmhgq3vjd62rr4qsc824qcyjxm50m49r7invgnmgd78h4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sublimity";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sublimity";
           sha256 = "1xwggaalad65cxcfvmy30f141bxhpzc3fgvwziwbzi8fygbdv4nw";
           name = "sublimity";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sublimity";
+          homepage = "https://melpa.org/#/sublimity";
           license = lib.licenses.free;
         };
       }) {};
@@ -53864,17 +55949,17 @@
         pname = "subr-plus";
         version = "20151231.1807";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/subr+.el";
+          url = "https://www.emacswiki.org/emacs/download/subr+.el";
           sha256 = "1xxf8kgxzcwwjm96isj4zg31vw63ahivr6xch5dw8wsvk0mjks9y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/subr+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/subr+";
           sha256 = "1vrv64768f7rk58mqr4pq1fjyi5n5kfqk90hzrwbvblkkrmilmfs";
           name = "subr-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/subr+";
+          homepage = "https://melpa.org/#/subr+";
           license = lib.licenses.free;
         };
       }) {};
@@ -53889,13 +55974,13 @@
           sha256 = "09izm28jrzfaj469v6yd1xgjgvy6pmxarcy0rzn2ihn3c0z7mdg4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/subshell-proc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/subshell-proc";
           sha256 = "1fnp49yhnhsj7paj0b25vr6r03hr5kpgcrci439ffpbd2c85fkw2";
           name = "subshell-proc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/subshell-proc";
+          homepage = "https://melpa.org/#/subshell-proc";
           license = lib.licenses.free;
         };
       }) {};
@@ -53910,13 +55995,34 @@
           sha256 = "1007xz4x1wgvxilv1qwf0a4y7hd7sqnnzwk2bdr12kfk7vq9cw2b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sudden-death";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sudden-death";
           sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh";
           name = "sudden-death";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sudden-death";
+          homepage = "https://melpa.org/#/sudden-death";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sudo-edit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sudo-edit";
+        version = "20160304.26";
+        src = fetchFromGitHub {
+          owner = "nflath";
+          repo = "sudo-edit";
+          rev = "ba33dbcff6746b988a58e38d4f72e52364f0ba79";
+          sha256 = "0bscj6nziansx846rmmrpbc4wbsngq1jg70g5ncf0f14b3achaq3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sudo-edit";
+          sha256 = "10vz7q8m0l2dyhiy9r9nj17qlwyv032glshzljzhm1n20w8y1fq4";
+          name = "sudo-edit";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/sudo-edit";
           license = lib.licenses.free;
         };
       }) {};
@@ -53924,17 +56030,17 @@
         pname = "sudo-ext";
         version = "20130130.1551";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/sudo-ext.el";
+          url = "https://www.emacswiki.org/emacs/download/sudo-ext.el";
           sha256 = "0fpz73r52j7sk1w7my0002wg7isrp54w28nnrwk9xb9il4qpxag2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sudo-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sudo-ext";
           sha256 = "1iirrpa4rnz7rm85yjg60vdfca1ipxbk3qkld8lgwwm242pvvkw3";
           name = "sudo-ext";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sudo-ext";
+          homepage = "https://melpa.org/#/sudo-ext";
           license = lib.licenses.free;
         };
       }) {};
@@ -53942,17 +56048,17 @@
         pname = "summarye";
         version = "20130328.527";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/summarye.el";
+          url = "https://www.emacswiki.org/emacs/download/summarye.el";
           sha256 = "0q5m8d6p9aqbfx17zgznkqw2jgh027xix4894wrdz91670zxd3py";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/summarye";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/summarye";
           sha256 = "1znd96ixg1n90yjiny84igb7m8qsbiibn7s6bky8g6n2k7zzmq65";
           name = "summarye";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/summarye";
+          homepage = "https://melpa.org/#/summarye";
           license = lib.licenses.free;
         };
       }) {};
@@ -53967,34 +56073,34 @@
           sha256 = "0mhyhkjjwszwl5wzkys9pgvgx9sps9r46k1s1hpzzf4s3vi015mc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sunny-day-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sunny-day-theme";
           sha256 = "1wsfnmmbzzyggzip66vr38yyzy27blxp91wx97bafj7jpg5cyhzw";
           name = "sunny-day-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sunny-day-theme";
+          homepage = "https://melpa.org/#/sunny-day-theme";
           license = lib.licenses.free;
         };
       }) {};
     sunshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sunshine";
-        version = "20151013.814";
+        version = "20160410.1517";
         src = fetchFromGitHub {
           owner = "aaronbieber";
           repo = "sunshine.el";
-          rev = "8783923f0aa4b835b90359443b941b10758c28d7";
-          sha256 = "1x3ivhwyapxw7v3ygam3bn2i9djrsp9mcd5zdn8q84c583ppanll";
+          rev = "11e49846a116bdec6e2e463bed2db4c2df9c8ad2";
+          sha256 = "0jv1shacpxqbw6pv9rlkk8z84si85alhillhb9a2s6s36kjmybk0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sunshine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sunshine";
           sha256 = "1lxiqw7k8cpq0v6p5whgxgzqrbx3sd9174r0d4qlkrpn6rcp44vv";
           name = "sunshine";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/sunshine";
+          homepage = "https://melpa.org/#/sunshine";
           license = lib.licenses.free;
         };
       }) {};
@@ -54009,34 +56115,34 @@
           sha256 = "1b637p2cyc8a83qv9vba4yamzhk08f62zykqh5p35jwvym8wkann";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/suomalainen-kalenteri";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/suomalainen-kalenteri";
           sha256 = "1wzijbgcr3jc47ccr7nrdkqha16s6gw0xiccnmdczi48cvnvvlkh";
           name = "suomalainen-kalenteri";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/suomalainen-kalenteri";
+          homepage = "https://melpa.org/#/suomalainen-kalenteri";
           license = lib.licenses.free;
         };
       }) {};
     super-save = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "super-save";
-        version = "20160211.456";
+        version = "20160426.929";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "super-save";
-          rev = "73397501fa5b01c02b9ae94f82a8cb37d1ed105f";
-          sha256 = "0cw3yf2npy2ah00q2whpn52kaybbccw1qvfzsww0x4zshlrwvvvq";
+          rev = "701c98eef4b9b21cd6cfd31f190f9988d32353aa";
+          sha256 = "1frm90kssrp4s6x0g4vq4jkssh8rnrfjbgwa05igsjnsbnnfxxd1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/super-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/super-save";
           sha256 = "0ikfw7n2rvm3xcgnj1si92ly8w75x26071ki551ims7a8sawh52p";
           name = "super-save";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/super-save";
+          homepage = "https://melpa.org/#/super-save";
           license = lib.licenses.free;
         };
       }) {};
@@ -54051,34 +56157,34 @@
           sha256 = "0m02snzka243adhwwgriml133n4312lhdia3wdqjcq8y2mlp3331";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/supergenpass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/supergenpass";
           sha256 = "0ldy6j6l6rf72w0hl195rdnrabml2a5k91200s186k0r5aja4b95";
           name = "supergenpass";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/supergenpass";
+          homepage = "https://melpa.org/#/supergenpass";
           license = lib.licenses.free;
         };
       }) {};
     suscolors-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "suscolors-theme";
-        version = "20160217.1234";
+        version = "20160319.1943";
         src = fetchFromGitHub {
           owner = "TheSuspiciousWombat";
           repo = "suscolors-emacs";
-          rev = "f186aab5d21d1cfb8bb0722332388cfdcb45c052";
-          sha256 = "0hwlp1zwfi0qkzzxkqxxjjshgl2h5i5jjn13ky51zb733bazpifx";
+          rev = "9eb6708a8f02527b5e7cae75be727d4f2edcbfc1";
+          sha256 = "09m2ayx8wf7impns1mkc0phkl1ql91ljgzv3ivk94vrgni7n5f93";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/suscolors-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/suscolors-theme";
           sha256 = "08sh20lmhqzpxb55nmqwsfv4xd6sjirh592in7s6vl52r3hl0jkh";
           name = "suscolors-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/suscolors-theme";
+          homepage = "https://melpa.org/#/suscolors-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -54093,13 +56199,13 @@
           sha256 = "14h40s0arc2i898r9yysn256z6l8jkrnmqvrdg7p7658c0klz5ic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/svg-mode-line-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/svg-mode-line-themes";
           sha256 = "12lnszcb9bl32n9wir7vf8xiyyv7njw4xg21aj9x4dasmidyx506";
           name = "svg-mode-line-themes";
         };
         packageRequires = [ xmlgen ];
         meta = {
-          homepage = "http://melpa.org/#/svg-mode-line-themes";
+          homepage = "https://melpa.org/#/svg-mode-line-themes";
           license = lib.licenses.free;
         };
       }) {};
@@ -54114,13 +56220,34 @@
           sha256 = "1kn70570r6x0h1xfs1vr8as27pjfanyhml140yms60gdjb4ssf9r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/swap-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swap-buffers";
           sha256 = "0ih5dhnqy3c9nlfz9m2zwy4q4jaam09ykbdqhsxx2hnwjk7p35bw";
           name = "swap-buffers";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/swap-buffers";
+          homepage = "https://melpa.org/#/swap-buffers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    swap-regions = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "swap-regions";
+        version = "20160413.1223";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "swap-regions.el";
+          rev = "2789091b6f34c0d4b82546eb39c4e73dc96e8679";
+          sha256 = "1m0apxjcj6xhbic36il1mbbril6pw2h6d9kmsb0jhibyy6mc8r78";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swap-regions";
+          sha256 = "0gl4vr7wjh5gjskrwbqypaqyfigpgh379bm4l2gvbsbhahsmbj67";
+          name = "swap-regions";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/swap-regions";
           license = lib.licenses.free;
         };
       }) {};
@@ -54128,17 +56255,17 @@
         pname = "swbuff-x";
         version = "20130607.514";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/swbuff-x.el";
+          url = "https://www.emacswiki.org/emacs/download/swbuff-x.el";
           sha256 = "1fkicyjvanh8yk2y27sq075sarcyqhsdz0r4xhillpnv34ji98r5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/swbuff-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swbuff-x";
           sha256 = "1wglcxgfr839lynwsl8i7fm70sxxjidy3ib6ibz0kgiwr41rh49y";
           name = "swbuff-x";
         };
         packageRequires = [ swbuff ];
         meta = {
-          homepage = "http://melpa.org/#/swbuff-x";
+          homepage = "https://melpa.org/#/swbuff-x";
           license = lib.licenses.free;
         };
       }) {};
@@ -54153,13 +56280,13 @@
           sha256 = "10blwlwg1ry9jznf1a6iss5s0z8sj9gc02ayf5qv92mgxvjhrhdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sweetgreen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sweetgreen";
           sha256 = "1v75wk0gq5fkz8i1r8pl4gqnxbv1d80isyn48w2hxj2fmdn2xhpy";
           name = "sweetgreen";
         };
         packageRequires = [ cl-lib dash helm request ];
         meta = {
-          homepage = "http://melpa.org/#/sweetgreen";
+          homepage = "https://melpa.org/#/sweetgreen";
           license = lib.licenses.free;
         };
       }) {};
@@ -54174,34 +56301,34 @@
           sha256 = "08397a8y8hgyzwny4z9f6kgwy8d37h0iypcjps3l6lhnk35mshv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/swift-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swift-mode";
           sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d";
           name = "swift-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/swift-mode";
+          homepage = "https://melpa.org/#/swift-mode";
           license = lib.licenses.free;
         };
       }) {};
-    swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "swiper";
-        version = "20160221.235";
+        version = "20160425.507";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "4af5c2e4e83f51da91675b0de7301b09c4b24b2c";
-          sha256 = "0ra5sa0dfrh1bv1q3r81r92i6xzazvw3lzz5n5qfbxcpnf8lygzk";
+          rev = "c24a3728538dd7d11de9f141b3ad1d8e0996c330";
+          sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/swiper";
-          sha256 = "1hsj6vh0vldnvwg2qmszdi0p2ig7l63vgq2kn5nv883239bxpziz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
+          sha256 = "0qaia5pgsjsmrfmcdj72jmj39zq82wg4i5l2mb2z6jlf1jpbk6y9";
           name = "swiper";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ emacs ivy ];
         meta = {
-          homepage = "http://melpa.org/#/swiper";
+          homepage = "https://melpa.org/#/swiper";
           license = lib.licenses.free;
         };
       }) {};
@@ -54216,34 +56343,34 @@
           sha256 = "1fr9vs0574g93mq88d25nmj93hrx4d4s2d0im6wk156k2yb8ha2b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/swiper-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper-helm";
           sha256 = "011ln6vny7z5vw67cpzldxf5n6sk2hjdkllyf7v6sf4m62ws93ph";
           name = "swiper-helm";
         };
         packageRequires = [ emacs helm swiper ];
         meta = {
-          homepage = "http://melpa.org/#/swiper-helm";
+          homepage = "https://melpa.org/#/swiper-helm";
           license = lib.licenses.free;
         };
       }) {};
-    switch-window = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "switch-window";
-        version = "20150114.415";
+        version = "20160229.534";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "switch-window";
-          rev = "cd4b06121aa5bac4c4b13b63526a99008def5f2b";
-          sha256 = "1zpfilcaycj0l2q3zyvpjbwp5j3d9rrkacd5swzlr1n1klvbji48";
+          rev = "c1bbe51573a19ff6adae8531bf20601e5da5f7db";
+          sha256 = "09ba45zbya2a72prq13pjg9pgbs86c6kayf8q2papvr9f5yv57xa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/switch-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/switch-window";
           sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2";
           name = "switch-window";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/switch-window";
+          homepage = "https://melpa.org/#/switch-window";
           license = lib.licenses.free;
         };
       }) {};
@@ -54258,13 +56385,13 @@
           sha256 = "10ka6f86n07xlf0z7w35db0mzp2zk4xhr6jd19kjdrn2j0ynlcw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/swoop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swoop";
           sha256 = "0r265rwfbl1iyclnspxpbzf2w1q0w8dnc0wv5mz5g6hhcrr0iv6g";
           name = "swoop";
         };
         packageRequires = [ async emacs ht pcre2el ];
         meta = {
-          homepage = "http://melpa.org/#/swoop";
+          homepage = "https://melpa.org/#/swoop";
           license = lib.licenses.free;
         };
       }) {};
@@ -54279,13 +56406,13 @@
           sha256 = "1q6wpjb7vhsy92li6fag34pwyil4zvcchbvfjml612aaykiys506";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sws-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sws-mode";
           sha256 = "0b12dsad0piih1qygjj0n7rni0pl8cizbzwqm9h1dr8imy53ak4i";
           name = "sws-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sws-mode";
+          homepage = "https://melpa.org/#/sws-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -54300,13 +56427,13 @@
           sha256 = "0d0c2i8hh0wrz8vnhxpxzwj7vlrjx6lrb3cx56pn4ny9qyqfzmw3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sx";
           sha256 = "1ml1rkhhk3hkd16ij2zwng591rxs2yppsfq9gwd4ppk02if4v517";
           name = "sx";
         };
         packageRequires = [ cl-lib emacs json let-alist markdown-mode ];
         meta = {
-          homepage = "http://melpa.org/#/sx";
+          homepage = "https://melpa.org/#/sx";
           license = lib.licenses.free;
         };
       }) {};
@@ -54321,13 +56448,13 @@
           sha256 = "1mb068vgf0bbj0bdxjhd6c794bwc3wp7r6q1s49w8b24g1pfrjkq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/symon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/symon";
           sha256 = "11llnvngyc3xz8nd6nj86ism0hhs8p54wkscvs4yycbakbyn61lz";
           name = "symon";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/symon";
+          homepage = "https://melpa.org/#/symon";
           license = lib.licenses.free;
         };
       }) {};
@@ -54342,34 +56469,55 @@
           sha256 = "030bglxnvrkf1f9grbhd8n11j4c6sxpabpjdr1ryx522v01fvx8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/symon-lingr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/symon-lingr";
           sha256 = "0kyhmw25cn10b4jv2yx7bvp8zkwcswiidpk4amyaisw25820gkv1";
           name = "symon-lingr";
         };
         packageRequires = [ cl-lib symon ];
         meta = {
-          homepage = "http://melpa.org/#/symon-lingr";
+          homepage = "https://melpa.org/#/symon-lingr";
           license = lib.licenses.free;
         };
       }) {};
     sync-recentf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sync-recentf";
-        version = "20151005.526";
+        version = "20160326.1501";
         src = fetchFromGitHub {
           owner = "ffevotte";
           repo = "sync-recentf";
-          rev = "530254b1f1b569ce958dadad2620c67c31835d5c";
-          sha256 = "00lx6081h1nzwga5jg4cik4h667vfkn128yvnhkd0vw7b5g4ji5x";
+          rev = "0052561d5c5b5c2684faedc3eead776aec06c3ed";
+          sha256 = "006siydqxqds0qqds0zxn821dk4pw14wyymyp03n594wgqzw7m8q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sync-recentf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sync-recentf";
           sha256 = "17aji2vcw6zfd823anzwj8pcgyxamxr87bnni085jvlz0vx6gh9c";
           name = "sync-recentf";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sync-recentf";
+          homepage = "https://melpa.org/#/sync-recentf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    syndicate = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "syndicate";
+        version = "20160409.1119";
+        src = fetchFromGitHub {
+          owner = "KNX32542";
+          repo = "syndicate";
+          rev = "36d2edb542c7ae10847cfd828a828db5e02f967f";
+          sha256 = "0593fx8mfl0vaaxcj65mi8hg79xhhwa4scan2nmic9grh25hs77m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/syndicate";
+          sha256 = "06nmldcw5dy2shhpk6nyix7gs57gsr5s9ksj57xgg8y2j3j0da95";
+          name = "syndicate";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "https://melpa.org/#/syndicate";
           license = lib.licenses.free;
         };
       }) {};
@@ -54384,31 +56532,31 @@
           sha256 = "02xnfkmpvjicckmp9is42fnavy9pd95s99zmf1wylxdji2hhpjxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/synonymous";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/synonymous";
           sha256 = "0vawa9qwvv6z1i7vzhkjdl1l9r1yham48yn5y8w8g1xyhxxp6rs5";
           name = "synonymous";
         };
         packageRequires = [ cl-lib emacs request ];
         meta = {
-          homepage = "http://melpa.org/#/synonymous";
+          homepage = "https://melpa.org/#/synonymous";
           license = lib.licenses.free;
         };
       }) {};
     synonyms = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "synonyms";
-        version = "20151231.1808";
+        version = "20160328.854";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/synonyms.el";
-          sha256 = "01l7z6l9pdxzvh851pbq2fn62r28gzwldibffb69jkdln47bph50";
+          url = "https://www.emacswiki.org/emacs/download/synonyms.el";
+          sha256 = "1zkrh1krhjmhb924dlihfnmjf4gigk9lqkai8aal67h90g2q2dsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/synonyms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/synonyms";
           sha256 = "0rnq97jpr047gpkxhw22jj3gw09r45vn6fwkzxnxjzcmsyk492d0";
           name = "synonyms";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/synonyms";
+          homepage = "https://melpa.org/#/synonyms";
           license = lib.licenses.free;
         };
       }) {};
@@ -54417,19 +56565,19 @@
         pname = "synosaurus";
         version = "20151119.1249";
         src = fetchFromGitHub {
-          owner = "rootzlevel";
+          owner = "hpdeifel";
           repo = "synosaurus";
           rev = "9be71a2df0c19ddb5e0cb8cba29ded5368a0fcae";
           sha256 = "1zz9rnwaclr95fpjyabv5rlhk36n2k8f1lzz6yqh964hv8i9562s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/synosaurus";
-          sha256 = "16i2ag4l824h1kq4cy01zf01zrms4v6ldwlsixwfyb1mh97lqljg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/synosaurus";
+          sha256 = "06a48ajpickf4qr1bc14skfr8khnjjph7c35b7ajfy8jw2zwavpn";
           name = "synosaurus";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/synosaurus";
+          homepage = "https://melpa.org/#/synosaurus";
           license = lib.licenses.free;
         };
       }) {};
@@ -54444,13 +56592,13 @@
           sha256 = "0zi11540wwcl93xcgd2yf6b72zv01zkaqbf1jfbksg82k9038m2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/syntactic-sugar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/syntactic-sugar";
           sha256 = "12b2vpvz5h4wzxrk8jrbgc8v0w6bzzvxcyfs083fi1791qq1rw7r";
           name = "syntactic-sugar";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/syntactic-sugar";
+          homepage = "https://melpa.org/#/syntactic-sugar";
           license = lib.licenses.free;
         };
       }) {};
@@ -54464,13 +56612,13 @@
           sha256 = "15zvh6dk02rm16zs6c9zvw1w76ycn61g3cpx6jb3456ff9zn6m9m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/syntax-subword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/syntax-subword";
           sha256 = "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm";
           name = "syntax-subword";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/syntax-subword";
+          homepage = "https://melpa.org/#/syntax-subword";
           license = lib.licenses.free;
         };
       }) {};
@@ -54485,13 +56633,13 @@
           sha256 = "1sxpda380c9wnnf5d72lrcqm6dkihf48cgsjcckzf706cc00ksf4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/syslog-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/syslog-mode";
           sha256 = "15kh2v8jsw04vyh2lmh1ndpxli3cwp6yq66hl8mwb1i3g429az19";
           name = "syslog-mode";
         };
         packageRequires = [ hide-lines ];
         meta = {
-          homepage = "http://melpa.org/#/syslog-mode";
+          homepage = "https://melpa.org/#/syslog-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -54506,13 +56654,13 @@
           sha256 = "1hixilnnybv2v3p1wpn7a0ybwah17grawszs3jycsjgzahpgckv7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/system-specific-settings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/system-specific-settings";
           sha256 = "1ydmxi8aw2lf78wv4m39yswbqkmcadqg0wmzg9s8b5h9bxxwvppp";
           name = "system-specific-settings";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/system-specific-settings";
+          homepage = "https://melpa.org/#/system-specific-settings";
           license = lib.licenses.free;
         };
       }) {};
@@ -54527,13 +56675,13 @@
           sha256 = "1z7zi0wcms55x0ar9jv02g7gbzsn4k887aigpgv4xghbdiyp7lp0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/systemd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/systemd";
           sha256 = "1biais0cmidy3d0hf2ifdlr6qv1z8k8c8bczi07bsfk4md3idbir";
           name = "systemd";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/systemd";
+          homepage = "https://melpa.org/#/systemd";
           license = lib.licenses.free;
         };
       }) {};
@@ -54548,13 +56696,13 @@
           sha256 = "0343ss3y9i40y3i9rr7p7bb4k9dj950zyvdv44q1abw2xrfd2xwd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/systemtap-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/systemtap-mode";
           sha256 = "1l2jx6mvph0q2pdlhq7p4vwfw72rfl8k1rwi504bbkr5n5xwhhhz";
           name = "systemtap-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/systemtap-mode";
+          homepage = "https://melpa.org/#/systemtap-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -54569,13 +56717,13 @@
           sha256 = "054l3imxk9ivq361cr15q1wym07mw3s8xzjkzqlihrfvadsq37ym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ta";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ta";
           sha256 = "0kn2k4n0xfwsrniaqb36v3rxj2pf2sai3bmjksbn1g2kf5g156ll";
           name = "ta";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ta";
+          homepage = "https://melpa.org/#/ta";
           license = lib.licenses.free;
         };
       }) {};
@@ -54590,13 +56738,13 @@
           sha256 = "0lfvgbgvsm61kv5mcjnhnfjcnr7fy1015y0hndkf9xvdlw4hahr4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tab-group";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tab-group";
           sha256 = "1i5lxpf3wmqnqj9mzgcn4gp1gjxp737awrzl1dml5wnarbbj4fs9";
           name = "tab-group";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tab-group";
+          homepage = "https://melpa.org/#/tab-group";
           license = lib.licenses.free;
         };
       }) {};
@@ -54611,13 +56759,13 @@
           sha256 = "0h7sfbca1nzcjylwl7zp25yj6wxnlx8g8a50zc6sg6jg4rggi2fm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tab-jump-out";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tab-jump-out";
           sha256 = "0nlbyzym8l8g9w2xvykpcl5r449v30gal2k1dnz74rq4y8w4rh7n";
           name = "tab-jump-out";
         };
         packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/tab-jump-out";
+          homepage = "https://melpa.org/#/tab-jump-out";
           license = lib.licenses.free;
         };
       }) {};
@@ -54632,34 +56780,34 @@
           sha256 = "0n23nnig1lgjamrzsa91p2aplh7gpj2vkp951i9fpf49c6xpyj3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tabbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tabbar";
           sha256 = "1y376nz1xmchwns4fz8dixbb7hbqh4mln78zvsh7y32il98wzvx9";
           name = "tabbar";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tabbar";
+          homepage = "https://melpa.org/#/tabbar";
           license = lib.licenses.free;
         };
       }) {};
-    tabbar-ruler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mode-icons, powerline, tabbar }:
+    tabbar-ruler = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, mode-icons, powerline, tabbar }:
     melpaBuild {
         pname = "tabbar-ruler";
-        version = "20160216.2132";
+        version = "20160426.612";
         src = fetchFromGitHub {
           owner = "mattfidler";
           repo = "tabbar-ruler.el";
-          rev = "5f3bb41436b00298e494c74701f0609569840a58";
-          sha256 = "1d0nf6mf5vkz7mx0iwn6bgrzsf96h55khd04wf3iv39v1x4gwc6p";
+          rev = "9f41bb3cdceefedb2f4ee291c1c3a67d111b6c97";
+          sha256 = "0nsd2dngxs9fr211isfhvifzn0lzalgl6bx9j8p24gxyprkjpg3d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tabbar-ruler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tabbar-ruler";
           sha256 = "10dwjj6r74g9rzdd650wa1wxhqc0q6dmff4j0qbbhmjsxvsr3y0d";
           name = "tabbar-ruler";
         };
-        packageRequires = [ mode-icons powerline tabbar ];
+        packageRequires = [ cl-lib mode-icons powerline tabbar ];
         meta = {
-          homepage = "http://melpa.org/#/tabbar-ruler";
+          homepage = "https://melpa.org/#/tabbar-ruler";
           license = lib.licenses.free;
         };
       }) {};
@@ -54674,13 +56822,13 @@
           sha256 = "0gy9hxm7bca0l1hfy2pzn86avpifrz3bs8xzpicj4kxw5wi4ygns";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tablist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tablist";
           sha256 = "0c10g86xjhzpmc2sqjmzcmi393qskyw6d9bydqzjk3ffjzklm45p";
           name = "tablist";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/tablist";
+          homepage = "https://melpa.org/#/tablist";
           license = lib.licenses.free;
         };
       }) {};
@@ -54690,39 +56838,39 @@
         version = "20141215.2347";
         src = fetchFromGitHub {
           owner = "idomagal";
-          repo = "tabula-rasa";
+          repo = "Tabula-Rasa";
           rev = "e85fff9de18dc31bc6a7aca726e34a95cc5459f5";
           sha256 = "1dbjfq9a7a5s9c18nrp4kcda64jkg5cp8na31kxw0hjcn98dgqa8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tabula-rasa";
-          sha256 = "186lph964swg7rs5gvby3p1d0znq9x3xzsmirfb3cdbazvz6hhxi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tabula-rasa";
+          sha256 = "14j92inssmm61bn475gyn0dn0rv8kvfnqyl1zq3xliy7a0jn58zz";
           name = "tabula-rasa";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/tabula-rasa";
+          homepage = "https://melpa.org/#/tabula-rasa";
           license = lib.licenses.free;
         };
       }) {};
     tagedit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "tagedit";
-        version = "20150727.424";
+        version = "20160418.231";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "tagedit";
-          rev = "458ff5bb23aa4816a2d5ff5d66c4e95996b4a4e1";
-          sha256 = "00hjc6ax4659ww6vygpzzsb3zzr2ddz2z33mkp5j6hmj2s4g2viy";
+          rev = "81a038b26213252700162a9dccd1848dc8d4cc75";
+          sha256 = "0h6gfy39dd0fcz625d255nykybkjvd16qmd3icpg5qzn41cgc96x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tagedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tagedit";
           sha256 = "0vfkbrxmrw4fwdz324s734zxdxm2nj3df6i8m6lgb9pizqyp2g6z";
           name = "tagedit";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/tagedit";
+          homepage = "https://melpa.org/#/tagedit";
           license = lib.licenses.free;
         };
       }) {};
@@ -54737,13 +56885,13 @@
           sha256 = "13zwlb5805cpv0pbr7fj5b4crlg7lb0ibslvcpszm0cz6rlifcvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/take-off";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/take-off";
           sha256 = "05vlajmirbp62rpbdwa2bimpzyl9xc331gg0lhn2rkivc0hma2ar";
           name = "take-off";
         };
         packageRequires = [ emacs web-server ];
         meta = {
-          homepage = "http://melpa.org/#/take-off";
+          homepage = "https://melpa.org/#/take-off";
           license = lib.licenses.free;
         };
       }) {};
@@ -54754,16 +56902,16 @@
         src = fetchgit {
           url = "https://gist.github.com/2024464.git";
           rev = "64e44c98e41ebbe3b827d54280e3b9615787daaa";
-          sha256 = "7342a670559cd296dba4b676607641a05d6203255951b17473ccdda4e35713d3";
+          sha256 = "1lqkazis9pfcfdsb2lar4l1n4pd085v60xmnlkdrdllwamqachkk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tango-2-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tango-2-theme";
           sha256 = "1a9qmz99h99gpd0sxqb71c08wr8pm3bzsg3p4cvf3vcirvav9lq6";
           name = "tango-2-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tango-2-theme";
+          homepage = "https://melpa.org/#/tango-2-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -54778,13 +56926,13 @@
           sha256 = "1gfn1yyyb9p2fi17wra1yf2j96cfjw0sifgk3c0vl63h3vmiyvjf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tango-plus-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tango-plus-theme";
           sha256 = "1bx9qcwvybgd0rg8a9rag8xvb5ljrwfnm5nvq793ncvbdvq6vrh5";
           name = "tango-plus-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tango-plus-theme";
+          homepage = "https://melpa.org/#/tango-plus-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -54799,34 +56947,34 @@
           sha256 = "11xb7xpmxvgv7mrjd2vlbjz3h5fa541aydv6bdxngjq6y3qn6wsp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tangotango-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tangotango-theme";
           sha256 = "05cnvyqmh5h5mqys7qs7d9knzxzmi2x0j1avp77x5l5njzzv59s2";
           name = "tangotango-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tangotango-theme";
+          homepage = "https://melpa.org/#/tangotango-theme";
           license = lib.licenses.free;
         };
       }) {};
     tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tao-theme";
-        version = "20151217.1040";
+        version = "20160330.850";
         src = fetchFromGitHub {
           owner = "11111000000";
           repo = "tao-theme-emacs";
-          rev = "48a69f5568b2d16496960aa92b312cd02be80ecc";
-          sha256 = "1zhr6vrzf511mxrj4fkc9k8wfr1hixn733f5g28j4qzykr4zl2mh";
+          rev = "d6879082413f38c36a1d7f76e1c4dead676ce2dc";
+          sha256 = "0y9dd39wajiafh7kql870wg2da60nvls35pymhmzrvnwnbsw8pys";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tao-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tao-theme";
           sha256 = "0gl6zzk5ha6vl2xxf5fcnv1k42cw4axdjdcirr1c4r8jwdq3nl3a";
           name = "tao-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tao-theme";
+          homepage = "https://melpa.org/#/tao-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -54841,13 +56989,13 @@
           sha256 = "1jp80qywcphql1ngd4fr24lqdfwrw0bw6q9hgq5vmzgjwfxwxwd4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tbx2org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tbx2org";
           sha256 = "1yvkw65la4w12c4w6l9ai73lzng170wv4b8gry99m2bakw3wr8m8";
           name = "tbx2org";
         };
         packageRequires = [ cl-lib dash s ];
         meta = {
-          homepage = "http://melpa.org/#/tbx2org";
+          homepage = "https://melpa.org/#/tbx2org";
           license = lib.licenses.free;
         };
       }) {};
@@ -54862,13 +57010,13 @@
           sha256 = "1xpkrlfqb0np9zyxk41f3pxfkw98ii4q0xh8whq4llv5bmfxynzk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tc";
           sha256 = "13qdnfslnik4f97lz9bxayyhgcp1knh5gaqy00ps863j3vpzjb9s";
           name = "tc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tc";
+          homepage = "https://melpa.org/#/tc";
           license = lib.licenses.free;
         };
       }) {};
@@ -54883,13 +57031,13 @@
           sha256 = "1krway6iw62dlr4ak3kj9llqh48xjf3d84nlincap7gkrw886l4q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tco";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tco";
           sha256 = "0hfrzwjlgynk3mydrpmic9mckak37r22fdglrfas6zdihgrg152f";
           name = "tco";
         };
         packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/tco";
+          homepage = "https://melpa.org/#/tco";
           license = lib.licenses.free;
         };
       }) {};
@@ -54904,13 +57052,13 @@
           sha256 = "1jyz6z5bk1gvmknphcnvjvbl329zm8m40yl0a1hfaj8fvhwyzdw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tdd-status-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tdd-status-mode-line";
           sha256 = "0z1q1aw14xq72nfx7mmvz7pr2x4960l45z02jva35zxzvb1mvsgq";
           name = "tdd-status-mode-line";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tdd-status-mode-line";
+          homepage = "https://melpa.org/#/tdd-status-mode-line";
           license = lib.licenses.free;
         };
       }) {};
@@ -54919,19 +57067,19 @@
         pname = "tea-time";
         version = "20120331.320";
         src = fetchFromGitHub {
-          owner = "krick";
+          owner = "konzeptual";
           repo = "tea-time";
           rev = "1f6cf0bdd27c5eb3508989c5095427781f858eca";
           sha256 = "0b4cwkwkc4i8lc4j30xc9d6xskm3gqrc2dij60ya75h92aj0lj40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tea-time";
-          sha256 = "18fsbh78c5408zg5bk44gxdynp6kn8253xdg7ap2pr3mjknq9kld";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tea-time";
+          sha256 = "0qypwf0pgsixq6c5avbwp81i3ayy9dd2fngzdvq14pax913q8pg1";
           name = "tea-time";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tea-time";
+          homepage = "https://melpa.org/#/tea-time";
           license = lib.licenses.free;
         };
       }) {};
@@ -54946,34 +57094,55 @@
           sha256 = "16kr1p4lzi1ysd5r2dh0mxk60zsm5fvwa9345nfyrgdic340yscc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/telepathy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/telepathy";
           sha256 = "0c3d6vk7d6vqzjndlym2kk7d2zm0b15ac4142ir03p6f19rqq9pr";
           name = "telepathy";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/telepathy";
+          homepage = "https://melpa.org/#/telepathy";
           license = lib.licenses.free;
         };
       }) {};
-    telephone-line = callPackage ({ cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
+    telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "telephone-line";
-        version = "20151116.642";
+        version = "20160302.1715";
         src = fetchFromGitHub {
           owner = "dbordak";
           repo = "telephone-line";
-          rev = "0715ee7d156086098b375f3d93de2f50e76f3d75";
-          sha256 = "0mg870s60by22ripxhqrgxjx16506n4llj9nnxlqgr4mdsi77cf5";
+          rev = "32245b5e301c408354cb34cd22c7b25b7ab390d8";
+          sha256 = "1m5224k1chb788mgj7j6cbma2xh5p7avvb1ax0jdafv5lfgikka4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/telephone-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/telephone-line";
           sha256 = "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3";
           name = "telephone-line";
         };
-        packageRequires = [ cl-lib eieio emacs s seq ];
+        packageRequires = [ cl-generic cl-lib emacs seq ];
         meta = {
-          homepage = "http://melpa.org/#/telephone-line";
+          homepage = "https://melpa.org/#/telephone-line";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ten-hundred-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ten-hundred-mode";
+        version = "20160409.751";
+        src = fetchFromGitHub {
+          owner = "aaron-em";
+          repo = "ten-hundred-mode.el";
+          rev = "fc1d7cdb72c21dc1953ed2e2ecf28233b8b3e305";
+          sha256 = "17633jachcgnibmvx433ygcfmz3j6hzli5mqbqg83r27chiq5mjx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ten-hundred-mode";
+          sha256 = "17v38h33ka70ynq72mvma2chvlnm1k2amyvk62c65iv67rwilky3";
+          name = "ten-hundred-mode";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/ten-hundred-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -54988,13 +57157,13 @@
           sha256 = "0sa3chk16s830lqhcd8d3bwdfmjg239ywb7jm6lhwshydssh34nk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/term-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/term-alert";
           sha256 = "0x4rc1y311ivaj6mlks1j8sgzrrwqn8vx171vw7s1kgf1qzk826n";
           name = "term-alert";
         };
         packageRequires = [ alert term-cmd ];
         meta = {
-          homepage = "http://melpa.org/#/term-alert";
+          homepage = "https://melpa.org/#/term-alert";
           license = lib.licenses.free;
         };
       }) {};
@@ -55009,34 +57178,34 @@
           sha256 = "15fcl5amivjdcwprj3dwrkn17z8a0q0zl8smyryjcqpkw66xrb7i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/term-cmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/term-cmd";
           sha256 = "0fn4f32zpl0p2lid159q59lzjv4xqmc23a64kcclqp9db8b1m5fy";
           name = "term-cmd";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/term-cmd";
+          homepage = "https://melpa.org/#/term-cmd";
           license = lib.licenses.free;
         };
       }) {};
     term-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "term-plus";
-        version = "20130612.852";
+        version = "20160404.555";
         src = fetchFromGitHub {
           owner = "tarao";
           repo = "term-plus-el";
-          rev = "090807985673755720c5533b2fc684f88a3554ad";
-          sha256 = "1ayr34smxf94c09ssdwl4hyhzgahsmbj7j4h25cdm6wcwii2br86";
+          rev = "f4a8c3aa616f21fa0b4381874149db3cf4e3a360";
+          sha256 = "0ca82vj61inn41xzk36a91g73gpg38nya4r9ajc2ldjqa5z1zdj8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/term+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/term+";
           sha256 = "12lvfspqmyrapmbz3x997vf160927d325y50kxdx3s6p81r7n2n8";
           name = "term-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/term+";
+          homepage = "https://melpa.org/#/term+";
           license = lib.licenses.free;
         };
       }) {};
@@ -55051,13 +57220,13 @@
           sha256 = "1dql2w8xkdw52zlrc2p9x391zn8wv4dj8a6293p4s08if7gg260w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/term+key-intercept";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/term+key-intercept";
           sha256 = "1564a86950xdwsrwinrs118bjsfmbv8gicq0c2dfr827v5b6zrlb";
           name = "term-plus-key-intercept";
         };
         packageRequires = [ key-intercept term-plus ];
         meta = {
-          homepage = "http://melpa.org/#/term+key-intercept";
+          homepage = "https://melpa.org/#/term+key-intercept";
           license = lib.licenses.free;
         };
       }) {};
@@ -55072,13 +57241,13 @@
           sha256 = "12gfvcf7hl29xhg231cx76q04ll7cvfpvhkb0qs3qn1sqb50fs2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/term+mux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/term+mux";
           sha256 = "129kzjpi5nzagqkjfikx9i7k6489dy7d3pd7ggn59p4cnh3r2rhh";
           name = "term-plus-mux";
         };
         packageRequires = [ tab-group term-plus ];
         meta = {
-          homepage = "http://melpa.org/#/term+mux";
+          homepage = "https://melpa.org/#/term+mux";
           license = lib.licenses.free;
         };
       }) {};
@@ -55093,13 +57262,13 @@
           sha256 = "149pl3zxg5kriydk5h6j95jyly6i23w4w4g4a99s4zi6ljiny6c6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/term-run";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/term-run";
           sha256 = "1bx3s68rgr9slsw9k01gfg7sxd4z7sarg4pi2ivril7108mhg2cs";
           name = "term-run";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/term-run";
+          homepage = "https://melpa.org/#/term-run";
           license = lib.licenses.free;
         };
       }) {};
@@ -55114,34 +57283,34 @@
           sha256 = "0gfsqpza8phvma5y3ck0n6p197x1i33w39m3c7jmja4ml121n73d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/termbright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/termbright-theme";
           sha256 = "14q88qdbnyzxr8sr8i5glj674sb4150b9y6nag0dqrxs629is6xj";
           name = "termbright-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/termbright-theme";
+          homepage = "https://melpa.org/#/termbright-theme";
           license = lib.licenses.free;
         };
       }) {};
     tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "tern";
-        version = "20151228.711";
+        version = "20160425.859";
         src = fetchFromGitHub {
-          owner = "marijnh";
+          owner = "ternjs";
           repo = "tern";
-          rev = "adf9dac372d3521a06d01d35fda254554c154e8b";
-          sha256 = "0fxaibs7kizlxh73vlv7mn4wa8sxbx67gl17rcfhm14lnk63nvcw";
+          rev = "2dcbf9bb143fe47631b3c20862643ec5b555c496";
+          sha256 = "1ylwz7pxd63qafbvjwafxqgl9m4ri37q4yw4r9lsffhc1vrc8sy3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tern";
-          sha256 = "06bgwizn9dcd8hsvimjvb28j0mpxg7rrv9knhv5kkdapa6gggxif";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tern";
+          sha256 = "1am97ssslkyijpvgk4nldi67ws48g1kpj6gisqzajrrlw5q93wvd";
           name = "tern";
         };
         packageRequires = [ cl-lib emacs json ];
         meta = {
-          homepage = "http://melpa.org/#/tern";
+          homepage = "https://melpa.org/#/tern";
           license = lib.licenses.free;
         };
       }) {};
@@ -55150,19 +57319,19 @@
         pname = "tern-auto-complete";
         version = "20151123.853";
         src = fetchFromGitHub {
-          owner = "marijnh";
+          owner = "ternjs";
           repo = "tern";
-          rev = "adf9dac372d3521a06d01d35fda254554c154e8b";
-          sha256 = "0fxaibs7kizlxh73vlv7mn4wa8sxbx67gl17rcfhm14lnk63nvcw";
+          rev = "2dcbf9bb143fe47631b3c20862643ec5b555c496";
+          sha256 = "1ylwz7pxd63qafbvjwafxqgl9m4ri37q4yw4r9lsffhc1vrc8sy3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tern-auto-complete";
-          sha256 = "0lq924c5f6bhlgyqqzc346n381qf0fp66h50a0zqz2ch66kanni1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tern-auto-complete";
+          sha256 = "1i99b4awph50ygcqsnppm1h48hbf8cpq1ppd4swakrwgmcy2mn26";
           name = "tern-auto-complete";
         };
         packageRequires = [ auto-complete cl-lib emacs tern ];
         meta = {
-          homepage = "http://melpa.org/#/tern-auto-complete";
+          homepage = "https://melpa.org/#/tern-auto-complete";
           license = lib.licenses.free;
         };
       }) {};
@@ -55173,17 +57342,17 @@
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "tern-django";
-          rev = "856fc98dc5e7cb4c8bc200f99150cc6187c82861";
-          sha256 = "15jzqwfr1958s21qzimvv87kckqyq01bimqgawb51b6xi9ib3biv";
+          rev = "b6a884609047ba49976d5bb6b150f17d3d956d5b";
+          sha256 = "00nv6j18s6983raajfcrxfg5rfz68cgf88zrdp7fhf9l0iicim1q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tern-django";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tern-django";
           sha256 = "1pjaaffadaw8h2n7yv01ks19gw59dmh8bp8vw51hx1082r3yfvv0";
           name = "tern-django";
         };
         packageRequires = [ emacs f tern ];
         meta = {
-          homepage = "http://melpa.org/#/tern-django";
+          homepage = "https://melpa.org/#/tern-django";
           license = lib.licenses.free;
         };
       }) {};
@@ -55198,13 +57367,13 @@
           sha256 = "0mz2yl9jaw7chzv9d9hhv7gcvdwwvi676y9wpn7vp85hxpda7xg7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/terraform-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/terraform-mode";
           sha256 = "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn";
           name = "terraform-mode";
         };
         packageRequires = [ cl-lib hcl-mode ];
         meta = {
-          homepage = "http://melpa.org/#/terraform-mode";
+          homepage = "https://melpa.org/#/terraform-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -55219,13 +57388,13 @@
           sha256 = "1r3fmb8cshgh9pppdvydfcrzlmb9cgz4m04rgv69c5xv8clwcmbr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/test-case-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/test-case-mode";
           sha256 = "1iba97yvbi5vr7gvc58gq2ah6jg2s7apc9ssq7mdzki823n8z2qi";
           name = "test-case-mode";
         };
         packageRequires = [ fringe-helper ];
         meta = {
-          homepage = "http://melpa.org/#/test-case-mode";
+          homepage = "https://melpa.org/#/test-case-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -55240,34 +57409,34 @@
           sha256 = "125k13sqgxk963c04zn49jidvzx0hl0s4vvc9jpffgq8aq0mnnmr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/test-kitchen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/test-kitchen";
           sha256 = "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0";
           name = "test-kitchen";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/test-kitchen";
+          homepage = "https://melpa.org/#/test-kitchen";
           license = lib.licenses.free;
         };
       }) {};
-    test-simple = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    test-simple = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "test-simple";
-        version = "20151110.2143";
+        version = "20160303.236";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-test-simple";
-          rev = "95e58b52ff36ed7c0c50e84dcf5458cb71c380dc";
-          sha256 = "0h2g02r1spj8vbwgvjn3dddyj89j1qcqzdf2kdggvyyisssj81s3";
+          rev = "e199434a2ba2e19f9854504bfb0cee22fcd03975";
+          sha256 = "0i38pzqi2ih3ckfjz323d3bc3p8y9syfjr96im16wxrs1c77h814";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/test-simple";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/test-simple";
           sha256 = "1l6y77fqd0l0mh2my23psi66v5ya6pbr2hgvcbsaqjnpmfm90w3g";
           name = "test-simple";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/test-simple";
+          homepage = "https://melpa.org/#/test-simple";
           license = lib.licenses.free;
         };
       }) {};
@@ -55282,13 +57451,13 @@
           sha256 = "1qcd7vdg63q80zwz8ziaznllq1x7micmljm72s6sh3720rb5aiz2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/textile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/textile-mode";
           sha256 = "0c1l7ml9b1zipk5fhmhirrh070h0qwwiagdk84i04yvdmmcjw2nf";
           name = "textile-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/textile-mode";
+          homepage = "https://melpa.org/#/textile-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -55303,34 +57472,34 @@
           sha256 = "1b7xxz1i84azmbz8rqpxdn18avmnqlj87hfrpbngbf6pj5h9jqjh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/textmate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/textmate";
           sha256 = "119w944pwarpqzcr9vys17svy1rkfs9hiln8903q9ff4lnjkpf1v";
           name = "textmate";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/textmate";
+          homepage = "https://melpa.org/#/textmate";
           license = lib.licenses.free;
         };
       }) {};
     textmate-to-yas = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "textmate-to-yas";
-        version = "20150914.746";
+        version = "20160409.1208";
         src = fetchFromGitHub {
           owner = "mattfidler";
           repo = "textmate-to-yas.el";
-          rev = "74cbf0877ab6391f920d2d7a588e363423d61227";
-          sha256 = "1idhhfp0jhnykyms7dp3lfk6imddg6a315pfklbjpcys4y3fdz89";
+          rev = "be3a768b7ac4c2e24b9d4aa6e9ac1d916cdc5a73";
+          sha256 = "1bz5ys36wd00clq9w3ahqpras368aj2b9d4bl32qc6dyp8jfknmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/textmate-to-yas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/textmate-to-yas";
           sha256 = "04agz4a41h0givfdw88qjd3c7pd418qyigsij4la5f37j5rh338l";
           name = "textmate-to-yas";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/textmate-to-yas";
+          homepage = "https://melpa.org/#/textmate-to-yas";
           license = lib.licenses.free;
         };
       }) {};
@@ -55338,17 +57507,17 @@
         pname = "tfs";
         version = "20120508.1320";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/tfs.el";
+          url = "https://www.emacswiki.org/emacs/download/tfs.el";
           sha256 = "16byw8ix7bjh5ldr8rymisq2bhc5sh7db6rhpf0x28yd6mmzn73v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tfs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tfs";
           sha256 = "10szb9mni37s2blvhl1spj96narmkrv8zhrryw9q1251z8laq5v0";
           name = "tfs";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tfs";
+          homepage = "https://melpa.org/#/tfs";
           license = lib.licenses.free;
         };
       }) {};
@@ -55363,13 +57532,13 @@
           sha256 = "0njmn5dy773v9kmwclw1m79rh52xnxl8mswcaagni2z3dvlvw4m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/theme-changer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/theme-changer";
           sha256 = "1qbmsghkl5gs728q0gaalc7p8q7nzv3l045jc0jdxxnb7na3gc5w";
           name = "theme-changer";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/theme-changer";
+          homepage = "https://melpa.org/#/theme-changer";
           license = lib.licenses.free;
         };
       }) {};
@@ -55384,13 +57553,13 @@
           sha256 = "1kd4mazrcy5xamkvvrwsmcx63g0gp5w4264kxbk3d25bjqcf8rmj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/theme-looper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/theme-looper";
           sha256 = "02hz9k4ybpp4i8ik2av9rg240sjgicbf6w24zn67dmw4nc4lp9c5";
           name = "theme-looper";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/theme-looper";
+          homepage = "https://melpa.org/#/theme-looper";
           license = lib.licenses.free;
         };
       }) {};
@@ -55405,13 +57574,13 @@
           sha256 = "12kz4alyf3y2i7lkvi26hcxy55v0blsrxv5srx9fv5jhxkdz1vq1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/therapy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/therapy";
           sha256 = "0y040ghb0y6aq0nchqr09vapz6h6112rkwxkqsx0v7xmqrqfjvhh";
           name = "therapy";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/therapy";
+          homepage = "https://melpa.org/#/therapy";
           license = lib.licenses.free;
         };
       }) {};
@@ -55419,17 +57588,17 @@
         pname = "thesaurus";
         version = "20121125.1337";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/thesaurus.el";
+          url = "https://www.emacswiki.org/emacs/download/thesaurus.el";
           sha256 = "0zcyasdzb7dvmld8418cy2mg8mpdx01bv44cm0sp5950scrypsaq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/thesaurus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/thesaurus";
           sha256 = "1nyjk9jr1xvdkil13ylfsgg7q2sx71za05gi8m2v5f45pbmbi50h";
           name = "thesaurus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/thesaurus";
+          homepage = "https://melpa.org/#/thesaurus";
           license = lib.licenses.free;
         };
       }) {};
@@ -55438,17 +57607,17 @@
         pname = "thing-cmds";
         version = "20151231.1809";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/thing-cmds.el";
+          url = "https://www.emacswiki.org/emacs/download/thing-cmds.el";
           sha256 = "1nclwxb63ffbc4wsga9ngkfcxsw88za0c4663fh9x64rl4db4hn8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/thing-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/thing-cmds";
           sha256 = "133bm2cw9ar6m2amj0rrq4wbj9c3zl61gaprx0vlasxj2cyxs7yw";
           name = "thing-cmds";
         };
         packageRequires = [ hide-comnt ];
         meta = {
-          homepage = "http://melpa.org/#/thing-cmds";
+          homepage = "https://melpa.org/#/thing-cmds";
           license = lib.licenses.free;
         };
       }) {};
@@ -55456,17 +57625,17 @@
         pname = "thingatpt-plus";
         version = "20151231.1810";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/thingatpt+.el";
+          url = "https://www.emacswiki.org/emacs/download/thingatpt+.el";
           sha256 = "0ijz0mj095wycpc3as5fiikrwazljk0c04rh089ch0mzc95g3vqq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/thingatpt+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/thingatpt+";
           sha256 = "0w031lzjl5phvzsmbbxn2fpziwkmdyxsn08h6b9lxbss1prhx7aa";
           name = "thingatpt-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/thingatpt+";
+          homepage = "https://melpa.org/#/thingatpt+";
           license = lib.licenses.free;
         };
       }) {};
@@ -55481,13 +57650,13 @@
           sha256 = "0imzrb3vqnm36illqnpfc6x7rbq9rrrlpcw9n2yzl4n309mqdwr6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/thingopt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/thingopt";
           sha256 = "0yvzq1z2nrldr8vhcvxqgzvh4gbrjjwfmprg59p4v5hlxvhxsb1y";
           name = "thingopt";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/thingopt";
+          homepage = "https://melpa.org/#/thingopt";
           license = lib.licenses.free;
         };
       }) {};
@@ -55502,13 +57671,13 @@
           sha256 = "0rjcrvw9v2y10ahycra53bwbccpwqxxwn2c21wjj1kfs0kdwhs9p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/thread-dump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/thread-dump";
           sha256 = "0dzr86jyf2j49gq40q6qd6lppa57n65n94xzpdjjbs182hxzavp2";
           name = "thread-dump";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/thread-dump";
+          homepage = "https://melpa.org/#/thread-dump";
           license = lib.licenses.free;
         };
       }) {};
@@ -55519,17 +57688,17 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "33de26cf658450513ef5731ac55b635addb4d43d";
-          sha256 = "1893s2sn6gmyd4s8slzh3hc6rffh6x17wvhlgfm4xlgzk4wyd1rj";
+          rev = "e363a34e63e851f17061a912a77e75a8ed8474bc";
+          sha256 = "0zg907qfj26qiv5l9ab24vssr1449s9l5y6ib0dzx1rhnjx1sdpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/thrift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/thrift";
           sha256 = "0p1hxmm7gvhyigz8aylncgqbhk6cyf75rbcqis7x552g605mhiy9";
           name = "thrift";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/thrift";
+          homepage = "https://melpa.org/#/thrift";
           license = lib.licenses.free;
         };
       }) {};
@@ -55538,17 +57707,17 @@
         pname = "thumb-frm";
         version = "20151231.1812";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/thumb-frm.el";
+          url = "https://www.emacswiki.org/emacs/download/thumb-frm.el";
           sha256 = "0nyp1sp55l3mlhlxw8kyp6hxan3rbgwc4fmfs174n6hlj3zr5vg8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/thumb-frm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/thumb-frm";
           sha256 = "1fjjd80drm8banni909lww9zqazr1kk9m40xwwa1ln2zicaf091c";
           name = "thumb-frm";
         };
         packageRequires = [ frame-cmds frame-fns ];
         meta = {
-          homepage = "http://melpa.org/#/thumb-frm";
+          homepage = "https://melpa.org/#/thumb-frm";
           license = lib.licenses.free;
         };
       }) {};
@@ -55557,40 +57726,40 @@
         pname = "thumb-through";
         version = "20120118.2334";
         src = fetchFromGitHub {
-          owner = "apgwoz";
+          owner = "apg";
           repo = "thumb-through";
           rev = "08d8fb720f93c6172653e035191a8fa9c3305e63";
           sha256 = "0nypcryqwwsdawqxi7hgsv6fp28zqslj9phw7zscqqxzc3svaywn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/thumb-through";
-          sha256 = "1krn7zn2y8p51m8dxai5nbrwbdviz6zrjzz0kykya9cqz4n9dhln";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/thumb-through";
+          sha256 = "1544xw9lar199idk135z4d6i3n9w0v7g2bq7fnz0rjjw10kxvpcx";
           name = "thumb-through";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/thumb-through";
+          homepage = "https://melpa.org/#/thumb-through";
           license = lib.licenses.free;
         };
       }) {};
     tide = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20160221.142";
+        version = "20160425.803";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "20e4748f2fa002b4cd53caf426b52734e51254c1";
-          sha256 = "1g530aq7vflnpigw7cii9z86263kxjv6f78dyiy7zvab6rzc9vyh";
+          rev = "31d6b1ac1b6139461623aab7834935d984c13d77";
+          sha256 = "0rc922v96gv62zg3ryf6ihca84b6bkrdc4fks32vdrxfnaz8npx2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tide";
           sha256 = "1z2xr25s23sz6nrzzw2xg1l2j8jvjhxi53qh7nvxmmq6n6jjpwg1";
           name = "tide";
         };
         packageRequires = [ dash emacs flycheck typescript-mode ];
         meta = {
-          homepage = "http://melpa.org/#/tide";
+          homepage = "https://melpa.org/#/tide";
           license = lib.licenses.free;
         };
       }) {};
@@ -55598,17 +57767,17 @@
         pname = "tidy";
         version = "20111222.1156";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/tidy.el";
+          url = "https://www.emacswiki.org/emacs/download/tidy.el";
           sha256 = "0psci55a3angwv45z9i8wz8jw634rxg1xawkrb57m878zcxxddwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tidy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tidy";
           sha256 = "09xb2k3k99hp3m725f31s6hlaxgl4fsaa1dylahxvdfddhbh290m";
           name = "tidy";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tidy";
+          homepage = "https://melpa.org/#/tidy";
           license = lib.licenses.free;
         };
       }) {};
@@ -55616,17 +57785,17 @@
         pname = "time-ext";
         version = "20130130.1551";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/time-ext.el";
+          url = "https://www.emacswiki.org/emacs/download/time-ext.el";
           sha256 = "0kxgzjwgd979aypjak07k8ss6hnm3x9f96z1rz2zsz2i3vvh6sqv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/time-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/time-ext";
           sha256 = "15b3m1jvr7kg5sc4c8cp0aaiiyivfx8ip1zf7w5m702krv4lfvpk";
           name = "time-ext";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/time-ext";
+          homepage = "https://melpa.org/#/time-ext";
           license = lib.licenses.free;
         };
       }) {};
@@ -55641,13 +57810,13 @@
           sha256 = "1hidvbd1xzz9m0fc55wac1mpv4dpcf8qnw1myh3646bfvivj9c2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/timer-revert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/timer-revert";
           sha256 = "0lvm2irfx9rb5psm1lf53fv2jjx745n1c172xmyqip5xwgmf6msy";
           name = "timer-revert";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/timer-revert";
+          homepage = "https://melpa.org/#/timer-revert";
           license = lib.licenses.free;
         };
       }) {};
@@ -55662,13 +57831,13 @@
           sha256 = "1ghvnmswq6rg17pjnys58mak6crfcvv1vb6q7spagq143y2ar24z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/timesheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/timesheet";
           sha256 = "1gy6bf4wqvp8cw2wjnrr9ijnzwav3p7j46m7qrn6l0517shwl506";
           name = "timesheet";
         };
         packageRequires = [ auctex org s ];
         meta = {
-          homepage = "http://melpa.org/#/timesheet";
+          homepage = "https://melpa.org/#/timesheet";
           license = lib.licenses.free;
         };
       }) {};
@@ -55683,13 +57852,13 @@
           sha256 = "0rf177kr0qfhg8g5xrpi405dhp2va1yk170zm3f8hghi2575ciy2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tinkerer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tinkerer";
           sha256 = "0qh6pzjn98jlpxcm9zf25ga0y3d3v53275a9zgswyhz33mafd7pd";
           name = "tinkerer";
         };
         packageRequires = [ s ];
         meta = {
-          homepage = "http://melpa.org/#/tinkerer";
+          homepage = "https://melpa.org/#/tinkerer";
           license = lib.licenses.free;
         };
       }) {};
@@ -55704,13 +57873,13 @@
           sha256 = "0mmz8b0fzffybc2jws9fif982zfx0l6kn1l4qxc67mf9nafbdca3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tiny";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tiny";
           sha256 = "183qczyb6c8zmdgmsjsj4hddmvnzzq4c7syslm861xcyxia94icy";
           name = "tiny";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tiny";
+          homepage = "https://melpa.org/#/tiny";
           license = lib.licenses.free;
         };
       }) {};
@@ -55725,13 +57894,13 @@
           sha256 = "1n8cn6mr26hgmsm2mkbj5gs6dv61d0pap8ija4g0n1vsibfhzd8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tinysegmenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tinysegmenter";
           sha256 = "005yy2f8vghvwdcwakz5sr9n1gzk6cfyglm6d8b74y90d8fng0r6";
           name = "tinysegmenter";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/tinysegmenter";
+          homepage = "https://melpa.org/#/tinysegmenter";
           license = lib.licenses.free;
         };
       }) {};
@@ -55746,74 +57915,76 @@
           sha256 = "1zvykanmn065rlk9hlv85vary1l6y52bsnaa51fkpckpr6dicmcl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tj-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tj-mode";
           sha256 = "1i7dvxgj00p4n2fh8irgdfsjl2dpvfjjnkkv0cw71441f79p79mf";
           name = "tj-mode";
         };
         packageRequires = [ emacs js2-mode tern ];
         meta = {
-          homepage = "http://melpa.org/#/tj-mode";
+          homepage = "https://melpa.org/#/tj-mode";
           license = lib.licenses.free;
         };
       }) {};
     tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tldr";
-        version = "20160221.811";
+        version = "20160312.808";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "tldr.el";
-          rev = "79e1e37214d5a8cce829eec3db43154fb78cf2ff";
-          sha256 = "1bkv3wm8nfn1pa6v9s79ckv7pn8g2fdd43vac4mfii94wmvz0zaj";
+          rev = "f5e093349ebccc0355acf6f591ba9bc6076a7639";
+          sha256 = "0z94m84q7j35dffpnbz1yh6axd6c787hj358bkq2qk0irsvh5n79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tldr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tldr";
           sha256 = "1f1xsmkbf4j1c876qqr9h8fgx3zxjgdfzvzf6capxlx2svhxzvc9";
           name = "tldr";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/tldr";
+          homepage = "https://melpa.org/#/tldr";
           license = lib.licenses.free;
         };
       }) {};
-    tmmofl = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+    tmmofl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "tmmofl";
         version = "20121025.601";
-        src = fetchhg {
-          url = "https://code.google.com/p/phillord-emacs-packages/";
-          rev = "e14e67d6a5b7";
-          sha256 = "0pq9x73hrp7qwhms7x3dvjfh9imapglba9yd7nkyw68mc0b9wlnl";
+        src = fetchFromGitHub {
+          owner = "phillord";
+          repo = "tmmofl";
+          rev = "532aa6978e994e2b069ffe37aaf9a0011a07dadc";
+          sha256 = "1ypbv9jbdnwv3xjsfzq8i3nmqdvziynv2rqsd6fm2r1xw0q06xd6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tmmofl";
-          sha256 = "1hqv2xqnhwnbj4sqcbdial4987yj1y3ry7niaaz2hh0f5qzrzwa8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tmmofl";
+          sha256 = "1idflc5ky8hwdkps1rihdqy3i6cmhrh83sxz3kgf2kqjh365yr8b";
           name = "tmmofl";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tmmofl";
+          homepage = "https://melpa.org/#/tmmofl";
           license = lib.licenses.free;
         };
       }) {};
     toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "toc-org";
-        version = "20150921.905";
+        version = "20160422.805";
         src = fetchFromGitHub {
           owner = "snosov1";
           repo = "toc-org";
-          rev = "72883a08b01d08b74cc03c565eac8d0422770fcf";
-          sha256 = "0gzv45yxjy0bkdnx9kki0svmc7gxrdaarblvi1pyvl7id31ssw70";
+          rev = "114dcc9813e2d8784b8c21165c95408c1b26d86e";
+          sha256 = "084nqdrpzgg1qpbqgvi893iglmz9dk3r0vwqxjkyxa3z3a0f5v17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/toc-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/toc-org";
           sha256 = "06mx2b0zjck82vp3i4bwbqlrzn05i2rkf8080cn34nkizi59wlbs";
           name = "toc-org";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/toc-org";
+          homepage = "https://melpa.org/#/toc-org";
           license = lib.licenses.free;
         };
       }) {};
@@ -55821,17 +57992,17 @@
         pname = "todochiku";
         version = "20150112.1454";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/todochiku.el";
+          url = "https://www.emacswiki.org/emacs/download/todochiku.el";
           sha256 = "0fhlyjl0a3fd25as185j6dmch0wsrf1zc59q29lhjximg9lk3hr5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/todochiku";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/todochiku";
           sha256 = "1iq08s5ji6hd8as80qxqkbavnjbx0kcmmjjvhjchmvv93vsn1f96";
           name = "todochiku";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/todochiku";
+          homepage = "https://melpa.org/#/todochiku";
           license = lib.licenses.free;
         };
       }) {};
@@ -55846,13 +58017,13 @@
           sha256 = "0ms4mapjg9mbpmcmpn68r0mhwaibwfr4v25sin74b2281h4q7gal";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/todotxt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/todotxt";
           sha256 = "13jcbkasvcczf7qnrh89ncqp6az6hm1s0ycrv7msva145n5bk1kr";
           name = "todotxt";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/todotxt";
+          homepage = "https://melpa.org/#/todotxt";
           license = lib.licenses.free;
         };
       }) {};
@@ -55867,13 +58038,13 @@
           sha256 = "1k9ywi7cdgb6i600wr04r2l00423l6vr7k93qa7i7svv856nbbc7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/todotxt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/todotxt-mode";
           sha256 = "1bs4air13ifx3xkhcfi80z29alsd63r436gnyvjyxlph2ip37v7k";
           name = "todotxt-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/todotxt-mode";
+          homepage = "https://melpa.org/#/todotxt-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -55888,34 +58059,34 @@
           sha256 = "1falf86mm2206szkkwiwa5yk65y12asv84j1pdbcy6n8y6hha796";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/togetherly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/togetherly";
           sha256 = "01ks160dfmgh05lx0lmyg020hba8nw49mj51dp1afcsmx4dkis2f";
           name = "togetherly";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/togetherly";
+          homepage = "https://melpa.org/#/togetherly";
           license = lib.licenses.free;
         };
       }) {};
-    toggle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    toggle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "toggle";
-        version = "20151210.1727";
+        version = "20160331.300";
         src = fetchFromGitHub {
           owner = "zenspider";
           repo = "elisp";
-          rev = "ec4ef9dc2d018053bed7fb44837b4c66f1a14c36";
-          sha256 = "109il2s5ynfam510yli4xmi5zgw7xhr5gv096li24idqdp0gpf9n";
+          rev = "df58c83a5f1e0b9889858407eae0e383bd759473";
+          sha256 = "184ghdi2m4hagddi71c1pmc408fad1cmw0q2n4k737w6j8537hph";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/toggle";
           sha256 = "08lk8h2dk5s8k93j5vmxdlgg453pif8wbcx2w3xkjlh43dw1vdfq";
           name = "toggle";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/toggle";
+          homepage = "https://melpa.org/#/toggle";
           license = lib.licenses.free;
         };
       }) {};
@@ -55930,13 +58101,13 @@
           sha256 = "1w1lmqgzn9bp59h9y9plv80y53k6qhjgfmnnlqyyqfl45z3si7kg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/toggle-quotes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/toggle-quotes";
           sha256 = "16w453v4g7ww93bydim62p785x7w4vssp9l5liy0h3ppfmgvmxhp";
           name = "toggle-quotes";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/toggle-quotes";
+          homepage = "https://melpa.org/#/toggle-quotes";
           license = lib.licenses.free;
         };
       }) {};
@@ -55951,13 +58122,13 @@
           sha256 = "0sgaslqxj806byidh06h5pqmqz8jzjfz9ky8jvkif3cq3a479jby";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/toggle-test";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/toggle-test";
           sha256 = "0n8m325jcjhz8g75ysb9whsd12gpxw8598y5065j7c7gxjzv45l1";
           name = "toggle-test";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/toggle-test";
+          homepage = "https://melpa.org/#/toggle-test";
           license = lib.licenses.free;
         };
       }) {};
@@ -55972,13 +58143,13 @@
           sha256 = "0f86aij1glmvgpbhmfpi441zy0r37zblb0q3ycgq0dp92x8yny5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/toggle-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/toggle-window";
           sha256 = "1z080jywqj99xiwbvfclr6gjkc6spr3dqjb9kq1g4971vx4w8n9g";
           name = "toggle-window";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/toggle-window";
+          homepage = "https://melpa.org/#/toggle-window";
           license = lib.licenses.free;
         };
       }) {};
@@ -55993,13 +58164,13 @@
           sha256 = "0a3zvhy3jxs88zk4nhdc7lzybz4qji9baw5gm88sxlgcjgn7ip6n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tomatinho";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tomatinho";
           sha256 = "1ad3kr73v75vjrc09mdvb7a3ws834k5y5xha3v0ldah38cl1pmjz";
           name = "tomatinho";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tomatinho";
+          homepage = "https://melpa.org/#/tomatinho";
           license = lib.licenses.free;
         };
       }) {};
@@ -56014,13 +58185,13 @@
           sha256 = "1b3bkla6i5nvanifxchph6ab6ldrskdf240hy4d27dkmmnr3pban";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/toml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/toml";
           sha256 = "0kqv6zkywa7kqh8kg1dzcgkbi91lwx335przdakndm1lfai38i9b";
           name = "toml";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/toml";
+          homepage = "https://melpa.org/#/toml";
           license = lib.licenses.free;
         };
       }) {};
@@ -56035,13 +58206,13 @@
           sha256 = "1w9vkh6c4g80zykcy77k3r0bdc99mq8yh58bqkyd6gsr7pnp16gj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/toml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/toml-mode";
           sha256 = "0yghf2ixl3dkcaxnkr4qzxfa9k1rrac7w5qpw1jx2bvic0cfs40l";
           name = "toml-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/toml-mode";
+          homepage = "https://melpa.org/#/toml-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -56056,13 +58227,13 @@
           sha256 = "0pwbd5gzmpr6js20438870w605671930291070nhmhswvxfcdvay";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tommyh-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tommyh-theme";
           sha256 = "0nb9r407h08yxxdihxqx0c645bcz6qywbh2l654s3zfzdsqi1aj4";
           name = "tommyh-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tommyh-theme";
+          homepage = "https://melpa.org/#/tommyh-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -56070,17 +58241,17 @@
         pname = "tool-bar-plus";
         version = "20151231.1815";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/tool-bar+.el";
+          url = "https://www.emacswiki.org/emacs/download/tool-bar+.el";
           sha256 = "1sqflxj3hzxdlwn5qmpqm4dwik5vsyp7lypkvshcghdplxymb38a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tool-bar+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tool-bar+";
           sha256 = "07nsas600w5kxx7yzg52ax9avry8kq429mqlrs38jg5ycf3b1l6d";
           name = "tool-bar-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tool-bar+";
+          homepage = "https://melpa.org/#/tool-bar+";
           license = lib.licenses.free;
         };
       }) {};
@@ -56088,17 +58259,17 @@
         pname = "top-mode";
         version = "20130605.1239";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/top-mode.el";
+          url = "https://www.emacswiki.org/emacs/download/top-mode.el";
           sha256 = "0a5rl1cgznycqwx4r48mh69lgm8ixbnlfzbqdyvclgm8fldbannn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/top-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/top-mode";
           sha256 = "0hrjlbiz827v9yf4086wlghw64rhvvlsbzv8lzs6pprdwbpr9pdx";
           name = "top-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/top-mode";
+          homepage = "https://melpa.org/#/top-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -56113,13 +58284,13 @@
           sha256 = "0wv49gn1daylnjmnallpqsqy7630ynrp45agpiwi6kwyyqk1kdvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tornado-template-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tornado-template-mode";
           sha256 = "1sdv9rlhnabydws2sppsjcgqr0lg6bjapv753ksq5aaq21qsps0h";
           name = "tornado-template-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tornado-template-mode";
+          homepage = "https://melpa.org/#/tornado-template-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -56134,13 +58305,13 @@
           sha256 = "188cdgic25wrb4jdgdcj070a0pxsh3m0rd9d2r6i1s1n1nalrs6g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/totd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/totd";
           sha256 = "1bp07xl9yh9x6bi6cn8wz11x90jhv1rhxaig540iydjn5b0ny9m0";
           name = "totd";
         };
         packageRequires = [ cl-lib s ];
         meta = {
-          homepage = "http://melpa.org/#/totd";
+          homepage = "https://melpa.org/#/totd";
           license = lib.licenses.free;
         };
       }) {};
@@ -56155,33 +58326,33 @@
           sha256 = "16217i8rjhgaa5kv8iq0s14b42v5rs8m2qlr60a0x6qzy65chq39";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tox";
           sha256 = "1z81x8fs5q6r19hpqphsilk8wdwwnfr8w78x5x298x74s9mcsywl";
           name = "tox";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tox";
+          homepage = "https://melpa.org/#/tox";
           license = lib.licenses.free;
         };
       }) {};
     toxi-theme = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "toxi-theme";
-        version = "20130418.1439";
+        version = "20160424.1626";
         src = fetchhg {
           url = "https://bitbucket.com/postspectacular/toxi-theme";
-          rev = "fc4274055149";
-          sha256 = "0hfzbrw9ik3yxdwmgsm80k0n045z6az6pgvxc1nqcjmiwh80h9mk";
+          rev = "b322fc7497a5";
+          sha256 = "1pnsky541m8kzcv81w98jkv0hgajh04hxqlmgddc1y0wbvi849j0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/toxi-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/toxi-theme";
           sha256 = "032m3qbxfd0qp81qwayd5g9k7vz55g4yhw0d35qkxzf4qf58x9sd";
           name = "toxi-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/toxi-theme";
+          homepage = "https://melpa.org/#/toxi-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -56196,7 +58367,7 @@
           sha256 = "1yh9dxf986dl74sgn71qxwxsg67lr0yg1z7b9h2254lmxq0mgni6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/traad";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/traad";
           sha256 = "08gxh5c01xfbbj9g4992jah494rw3d3bbs8j79r3mpqxllkp2znf";
           name = "traad";
         };
@@ -56208,7 +58379,7 @@
           request-deferred
         ];
         meta = {
-          homepage = "http://melpa.org/#/traad";
+          homepage = "https://melpa.org/#/traad";
           license = lib.licenses.free;
         };
       }) {};
@@ -56219,17 +58390,17 @@
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "ca3e957f41e47afa05f73962c1ad72f401666384";
-          sha256 = "0gwkm8c9g501g80rvqlzmn24q4ylkb94bklsf173yiinqmz1jhkc";
+          rev = "fed52c2b4b49f75aec3e3238ceacf44ef0c75b5c";
+          sha256 = "1wh3kwya2hpmaaj0c18g2las7jq0vkkik4n0q6whpch3r7ak6k8m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tracking";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tracking";
           sha256 = "096h5bl7jcwz5hpbm2139bf8a784hijfy40vzf42y1c9794al46z";
           name = "tracking";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tracking";
+          homepage = "https://melpa.org/#/tracking";
           license = lib.licenses.free;
         };
       }) {};
@@ -56244,13 +58415,13 @@
           sha256 = "1m25l1lyff4h0h4vjrcsziwbf8svqg2llvvgl8i2b4jbh7k7pk5f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tracwiki-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tracwiki-mode";
           sha256 = "1k983f0lj42rxr5szpq9l9harykfn8jr13y3y6fav86zzd1fb8j0";
           name = "tracwiki-mode";
         };
         packageRequires = [ xml-rpc ];
         meta = {
-          homepage = "http://melpa.org/#/tracwiki-mode";
+          homepage = "https://melpa.org/#/tracwiki-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -56261,17 +58432,17 @@
         src = fetchFromGitHub {
           owner = "raghavgautam";
           repo = "tramp-hdfs";
-          rev = "4a3ccaf931ecffeae283cb1766425afbc0f81101";
-          sha256 = "057a3z42j4s0npl35p5rl6n767s2wq0a3c49wii3f1w8p40fh7qc";
+          rev = "82683b45eabc09f327ea45a9e8faba0524eada29";
+          sha256 = "0llzfn9y3yyz2wwdbv8whx8vy2lazbnww6hjj0r621gkfxjml7wd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tramp-hdfs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tramp-hdfs";
           sha256 = "1l7s2z8yk3cbnffig9fds75jkjlkng76qglx5ankzva61dz1kf2b";
           name = "tramp-hdfs";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tramp-hdfs";
+          homepage = "https://melpa.org/#/tramp-hdfs";
           license = lib.licenses.free;
         };
       }) {};
@@ -56286,52 +58457,55 @@
           sha256 = "0cgx6h9a49qj7x6bgsnsa20hi1yj5k080x4x0jpn6l9bj5nqiaip";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tramp-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tramp-term";
           sha256 = "1vbdwj8q66j6h5ijqzxhyaqf8wf9rbs03x8ppfijxl5qd2bhc1dy";
           name = "tramp-term";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tramp-term";
+          homepage = "https://melpa.org/#/tramp-term";
           license = lib.licenses.free;
         };
       }) {};
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20160215.2255";
+        version = "20160419.2151";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "1c6f3ca3f07d8364f7514e27f5808d97cf984854";
-          sha256 = "05cq0gbhfrd91fd625hq2qyk5dpjzc1jgph80slm7b6c45vdll4l";
+          rev = "a236ac0fba69e53f8b38608a0e5659e6190a08b0";
+          sha256 = "109s5rk1793vqyj2qz84cqw1k23avkl0gjbzy72ygdiim9xwvm6z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/transmission";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/transmission";
           sha256 = "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9";
           name = "transmission";
         };
         packageRequires = [ emacs let-alist ];
         meta = {
-          homepage = "http://melpa.org/#/transmission";
+          homepage = "https://melpa.org/#/transmission";
           license = lib.licenses.free;
         };
       }) {};
-    transpose-frame = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    transpose-frame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "transpose-frame";
-        version = "20151126.826";
-        src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/transpose-frame.el";
-          sha256 = "1f67yksgw9s6j0033hmqzaxx2a93jm11sd5ys7cc3li5gfh680m4";
+        version = "20140827.1406";
+        src = fetchFromGitHub {
+          owner = "pyluyten";
+          repo = "emacs-nu";
+          rev = "e2b509a9b631e98f6feabdc783c01a6b57d05fc2";
+          sha256 = "0nbmpnljl0wdkwmxzg6lqd3mand9w043qmwp727hb84gxy0j4dib";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/transpose-frame";
-          sha256 = "0bqip7vckic3kfq3d31ifs1zics1djxwj2jadafj6f1agv02sdz5";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/transpose-frame";
+          sha256 = "14zb9xvv4jcawihs6qh36n3xdh45il5ry8pq6hcrk9qsa0icvh28";
           name = "transpose-frame";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/transpose-frame";
+          homepage = "https://melpa.org/#/transpose-frame";
           license = lib.licenses.free;
         };
       }) {};
@@ -56346,13 +58520,13 @@
           sha256 = "03wc50vn1kmrgnzzhs06pwpap2p2rx84wwzxw0hawsg1f1l35m2x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/transpose-mark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/transpose-mark";
           sha256 = "1q1icp1szm1bxz9ywwyrfbsm1wmx0h4cvzywrh9q0fj1fq387qvv";
           name = "transpose-mark";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/transpose-mark";
+          homepage = "https://melpa.org/#/transpose-mark";
           license = lib.licenses.free;
         };
       }) {};
@@ -56367,13 +58541,13 @@
           sha256 = "1jd7xsvs4m55fscp62a9lk59ip4sgifv4kazl55b7543nz1i31bz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/travis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/travis";
           sha256 = "1km496cq1vni9gy2d3z4c9524q62750ywz745rjz4r7178ip9mix";
           name = "travis";
         };
         packageRequires = [ dash pkg-info request s ];
         meta = {
-          homepage = "http://melpa.org/#/travis";
+          homepage = "https://melpa.org/#/travis";
           license = lib.licenses.free;
         };
       }) {};
@@ -56381,17 +58555,17 @@
         pname = "tree-mode";
         version = "20151104.731";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/tree-mode.el";
+          url = "https://www.emacswiki.org/emacs/download/tree-mode.el";
           sha256 = "0hffnzvzbvmzf23z9z7n7y53l5i7kza9hgfl39qqcnw4njg48llx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tree-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tree-mode";
           sha256 = "0xwyhlc5lagj46nd70l81rvb43hs08pic96grk62zknig8354c24";
           name = "tree-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tree-mode";
+          homepage = "https://melpa.org/#/tree-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -56406,13 +58580,13 @@
           sha256 = "08484fhc69rk16g52f9bzc1kzpif61ddfchxjbj1qqqammbx11ym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/trident-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/trident-mode";
           sha256 = "0l81hs7bp46jlk41b9fk1lkvlp17fqc5hcz8k8kkal7rh7ari1fd";
           name = "trident-mode";
         };
         packageRequires = [ dash emacs skewer-mode slime ];
         meta = {
-          homepage = "http://melpa.org/#/trident-mode";
+          homepage = "https://melpa.org/#/trident-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -56427,13 +58601,13 @@
           sha256 = "06wm3qwxjhzwjn9nnrqm5wwj1z5gfghg9d2qbg8w3zyqzva5dmvm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tronesque-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tronesque-theme";
           sha256 = "1bk73zawl1922aq739r3rz30flxd6nq87k8ahzbix139g7gxf19j";
           name = "tronesque-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tronesque-theme";
+          homepage = "https://melpa.org/#/tronesque-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -56448,34 +58622,34 @@
           sha256 = "1mm6rrprsmx4hc622qmllm7c81yhwbqmdr0n6020krq92zmilmlm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/truthy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/truthy";
           sha256 = "1a56zmqars9fd03bkqzwpvgblq5fvq19n4jw04c4hpga92sq8wqg";
           name = "truthy";
         };
         packageRequires = [ list-utils ];
         meta = {
-          homepage = "http://melpa.org/#/truthy";
+          homepage = "https://melpa.org/#/truthy";
           license = lib.licenses.free;
         };
       }) {};
     try = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "try";
-        version = "20160204.1255";
+        version = "20160226.930";
         src = fetchFromGitHub {
           owner = "larstvei";
           repo = "Try";
-          rev = "d50b4b5550cae33910f9ff4ee6586599830d2fe2";
-          sha256 = "1i2bw3d834ibk3aj16rcs8g81r7n5qa37g8k7lgpl255mfpyfzlq";
+          rev = "f5a930105e81826682cd71ff3f23e5fcb5502e30";
+          sha256 = "0gvwavsq9s4a75qz7xq9wl219fnzz085zjqpnrxxgmaqbi9m8l7a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/try";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/try";
           sha256 = "0dv0i77agva215bf1gj1x1k7f7g3pvccyyd7vslapf9z8brccn7n";
           name = "try";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/try";
+          homepage = "https://melpa.org/#/try";
           license = lib.licenses.free;
         };
       }) {};
@@ -56490,13 +58664,13 @@
           sha256 = "1bk5v9dffs65qsay0dp336s2ly065nd0cg572zz058ikwxd44zd3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tss";
           sha256 = "0d16x5r2xfy6mrwy0mqzpr9b3inqmyyxgawrxlfh83j1xb903dhm";
           name = "tss";
         };
         packageRequires = [ auto-complete json-mode log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/tss";
+          homepage = "https://melpa.org/#/tss";
           license = lib.licenses.free;
         };
       }) {};
@@ -56511,13 +58685,13 @@
           sha256 = "1gvqxk67cf779szyg907815i4m9jzrpmn5cnsmnwd62k3r3z4nxm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tt-mode";
           sha256 = "02dzyycn5znbibbz50b243bh1kcccp8xwknjqwljk00gpf196vzf";
           name = "tt-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tt-mode";
+          homepage = "https://melpa.org/#/tt-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -56532,34 +58706,34 @@
           sha256 = "0a8f9p1im6k7mnp2bq733rfx2x246gfwpvi5ccym1y5lakx37fil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ttrss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ttrss";
           sha256 = "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z";
           name = "ttrss";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ttrss";
+          homepage = "https://melpa.org/#/ttrss";
           license = lib.licenses.free;
         };
       }) {};
     tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tuareg";
-        version = "20160105.1224";
+        version = "20160408.1331";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "8c3f604ad3b393403baaa93fc53898217e675ab8";
-          sha256 = "0knp7nbzhzahkn97zs2aw0ly7x40cbh8m5xb4rk1ynw0n09zq3d0";
+          rev = "f1eb7b500e892662a970ecdaf592c33949e43ba7";
+          sha256 = "0hscvsdp25aw7h4x8kq1ws72zx08bs2kw1s6axsi5576cl4d5yvg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tuareg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tuareg";
           sha256 = "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q";
           name = "tuareg";
         };
         packageRequires = [ caml ];
         meta = {
-          homepage = "http://melpa.org/#/tuareg";
+          homepage = "https://melpa.org/#/tuareg";
           license = lib.licenses.free;
         };
       }) {};
@@ -56574,13 +58748,13 @@
           sha256 = "1xdkgvr1pnlg3nrjmma4ra80ysr8xbslvczg7cq1x1mqw6gn9xq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tumble";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tumble";
           sha256 = "1c9ybq0mb2a0pw15fmm13vfwcnr2h9fb1xsm5nrff1cg7913pgv9";
           name = "tumble";
         };
         packageRequires = [ cl-lib http-post-simple ];
         meta = {
-          homepage = "http://melpa.org/#/tumble";
+          homepage = "https://melpa.org/#/tumble";
           license = lib.licenses.free;
         };
       }) {};
@@ -56595,13 +58769,13 @@
           sha256 = "1g7y7czan7mcs5lwc5r6cllgksrj3b9lpn1bj7khwkd1ll391jc2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tumblesocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tumblesocks";
           sha256 = "11ky69icsnxwsinv2j3f4c0764wm6i9g9mlvwsdrd6w1lchq1dg9";
           name = "tumblesocks";
         };
         packageRequires = [ htmlize markdown-mode oauth ];
         meta = {
-          homepage = "http://melpa.org/#/tumblesocks";
+          homepage = "https://melpa.org/#/tumblesocks";
           license = lib.licenses.free;
         };
       }) {};
@@ -56616,13 +58790,34 @@
           sha256 = "0y1b9zvwbw3vp41siyzj04bis939fgz3j27hc5ljjzy92kd39nzm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tup-mode";
           sha256 = "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l";
           name = "tup-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tup-mode";
+          homepage = "https://melpa.org/#/tup-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    turkish = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "turkish";
+        version = "20160324.523";
+        src = fetchFromGitHub {
+          owner = "emres";
+          repo = "turkish-mode";
+          rev = "237b696e2f513149f1a77ef58b5ba7d44b6f4661";
+          sha256 = "1jb6par116mm5l4z27wk6m2sfh6j9nmgrya352sdagcvjbcpnzcl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/turkish";
+          sha256 = "0pdapxjbpj3lg3hxvwjn9v51jqaiz7a8053z2bmk4485vzs34532";
+          name = "turkish";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/turkish";
           license = lib.licenses.free;
         };
       }) {};
@@ -56637,13 +58832,13 @@
           sha256 = "0khl4q22x6vdn87xdqqg5f535d4dqpnfbhk6qhlh187p1w7qaiq4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/turnip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/turnip";
           sha256 = "1vfqv71j47fn53klz3jl8r8hscywd01kkl4w96a308sac3lhbrps";
           name = "turnip";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/turnip";
+          homepage = "https://melpa.org/#/turnip";
           license = lib.licenses.free;
         };
       }) {};
@@ -56658,13 +58853,13 @@
           sha256 = "0wvmih2y3hy7casxx2y1w8csmzfnfgbb5ivpggr94sc86p6bg8sa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/twig-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/twig-mode";
           sha256 = "1m3xjgmkqg8aj536wcg2f2hf4y6whscbsh7z7448hl4b5qjwii4n";
           name = "twig-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/twig-mode";
+          homepage = "https://melpa.org/#/twig-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -56679,13 +58874,13 @@
           sha256 = "1bj2mpiklqcangjzbnz5wz7klsfvp0x397lidvf42awn7s2aax0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/twilight-anti-bright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/twilight-anti-bright-theme";
           sha256 = "1qfybk5akaxdahmjffqaw712v8d7kk4jqkj3hzp96kys2zv1r6f9";
           name = "twilight-anti-bright-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/twilight-anti-bright-theme";
+          homepage = "https://melpa.org/#/twilight-anti-bright-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -56700,13 +58895,13 @@
           sha256 = "1awqc4rvg8693myynb1d4y4dfdaxkd5blnixxs3mdv81l07zyn8c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/twilight-bright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/twilight-bright-theme";
           sha256 = "074cqs55gwy5jlaay3m9bpdpdfb45nmlijvapz96nibl64pyk83d";
           name = "twilight-bright-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/twilight-bright-theme";
+          homepage = "https://melpa.org/#/twilight-bright-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -56721,34 +58916,34 @@
           sha256 = "0d7vd1h0rwwgrh7f9kmdgy2ni0p20da9c8ylwlg33nsb26345wfs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/twilight-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/twilight-theme";
           sha256 = "1wkca66q4k94h9njsy15n83wjzn90rcbmv44x0hdwqj92yxjf3y7";
           name = "twilight-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/twilight-theme";
+          homepage = "https://melpa.org/#/twilight-theme";
           license = lib.licenses.free;
         };
       }) {};
     twittering-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "twittering-mode";
-        version = "20160207.356";
+        version = "20160313.1136";
         src = fetchFromGitHub {
           owner = "hayamiz";
           repo = "twittering-mode";
-          rev = "17c2c0dacea31c81b03d1f27bce6aa6f0d327cca";
-          sha256 = "0kg27nl9lg6zrx18glkwbgfxbclzw5fmvhldkkbs388ghp53mxar";
+          rev = "7c67fe66e7ccaf2ca6021ecc12dc0d2036ee2f60";
+          sha256 = "1dk2s16p33fjx29la1zg35ax1mmwmrl33ww9qmg88ssxfcdj2jr0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/twittering-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/twittering-mode";
           sha256 = "0v9ijxw5jazh2hc0qab48y71za2l9ryff0mpkxhr3f79irlqy0a1";
           name = "twittering-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/twittering-mode";
+          homepage = "https://melpa.org/#/twittering-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -56763,13 +58958,13 @@
           sha256 = "1i826xq77nh4s7qlj63r2iznbn319l1l3fzpbjb2nj0m00bwvxl6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/typed-clojure-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/typed-clojure-mode";
           sha256 = "1579zkhk2lwl5ij7dm9n2drggs5fmhpljrshc4ghhvig7nlyqjy3";
           name = "typed-clojure-mode";
         };
         packageRequires = [ cider clojure-mode ];
         meta = {
-          homepage = "http://melpa.org/#/typed-clojure-mode";
+          homepage = "https://melpa.org/#/typed-clojure-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -56784,13 +58979,13 @@
           sha256 = "17q7f433x8i484scwdbfsd0vh8lshzkwjlarhqw6ic53mzakgjiq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/typescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/typescript-mode";
           sha256 = "01jyqy44ir59n9c2f6gh4xzwfmzdpnys1lw4lnsy6kirqgbsq9ha";
           name = "typescript-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/typescript-mode";
+          homepage = "https://melpa.org/#/typescript-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -56798,38 +58993,59 @@
         pname = "typing";
         version = "20121026.1618";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/typing.el";
+          url = "https://www.emacswiki.org/emacs/download/typing.el";
           sha256 = "0mgvpdp3vlvjy32d163h2mzsf9j2ij2f542sdr3rsy8l80n6nx31";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/typing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/typing";
           sha256 = "0b72lbzji105wzvsi58l6pjc08qcwrm5ddf42irdxi956081pzp3";
           name = "typing";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/typing";
+          homepage = "https://melpa.org/#/typing";
           license = lib.licenses.free;
         };
       }) {};
     typing-game = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "typing-game";
-        version = "20151111.940";
+        version = "20160426.720";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "el-typing-game";
-          rev = "b58c19a4a14895cc24ce01a73cf624b5c54a12b8";
-          sha256 = "0i5pipciwsl6cj3inxiz6ybkv5jglacjwhcyqdfzi4mrbic7g848";
+          rev = "616435a5270274f4c7b698697674dbb2039049a4";
+          sha256 = "0dkrnn9fzqv793wvd3nc7dbslayj37q5na1w1g63g32z2s8aq09j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/typing-game";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/typing-game";
           sha256 = "0k85j9bcqp0gbzdh44q5a9wlkv5mc0g0m42ziq1bzmp6993wkmy2";
           name = "typing-game";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/typing-game";
+          homepage = "https://melpa.org/#/typing-game";
+          license = lib.licenses.free;
+        };
+      }) {};
+    typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }:
+    melpaBuild {
+        pname = "typit";
+        version = "20160407.749";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "typit";
+          rev = "cd64e87af2621fff8b943f494c9bcd7ed46def2e";
+          sha256 = "0jfyfwg9548ba5lvy9dvs459b9fm90w9k8s6pbqnnnks964jrhg9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/typit";
+          sha256 = "05m7ymcq6fgbhh93ninrf3qi7csdnf2ahhf01mkm8gxxyaqq6m4n";
+          name = "typit";
+        };
+        packageRequires = [ emacs f mmt ];
+        meta = {
+          homepage = "https://melpa.org/#/typit";
           license = lib.licenses.free;
         };
       }) {};
@@ -56844,13 +59060,13 @@
           sha256 = "0bn1bvs334wb64bli9h613zf1vzjyi0pz8bgyq1wy12qmbwwmfwk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/typo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/typo";
           sha256 = "07hmqrnbxbrhcbxdls8i4786lkqmfr3hv6va41xih1lxj0mk60bx";
           name = "typo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/typo";
+          homepage = "https://melpa.org/#/typo";
           license = lib.licenses.free;
         };
       }) {};
@@ -56865,13 +59081,13 @@
           sha256 = "1v8d1pc0vjc7wz0prr5w5vp2qb19f3gcyl6jx5130plajbvv23rc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ubuntu-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ubuntu-theme";
           sha256 = "160z59aaxb2v6c24nki6bn7pjm9r4jl1mgxs4h4sivzxkaw811s2";
           name = "ubuntu-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ubuntu-theme";
+          homepage = "https://melpa.org/#/ubuntu-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -56879,17 +59095,17 @@
         pname = "ucs-cmds";
         version = "20151231.1816";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/ucs-cmds.el";
+          url = "https://www.emacswiki.org/emacs/download/ucs-cmds.el";
           sha256 = "0qy211rxrmzhwl9qfrcmfnwayysvb5rghjginbvx3wf2s6hrbpya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ucs-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ucs-cmds";
           sha256 = "1n0f0qf8w8ark78fs67aaxnqpk0km97hy59pnxwfyahgjl2qz6d1";
           name = "ucs-cmds";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ucs-cmds";
+          homepage = "https://melpa.org/#/ucs-cmds";
           license = lib.licenses.free;
         };
       }) {};
@@ -56904,55 +59120,55 @@
           sha256 = "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ucs-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ucs-utils";
           sha256 = "111fwg2cqqzpa79rcqxidppb12c8g12zszppph2ydfvkgkryb6z2";
           name = "ucs-utils";
         };
         packageRequires = [ list-utils pcache persistent-soft ];
         meta = {
-          homepage = "http://melpa.org/#/ucs-utils";
+          homepage = "https://melpa.org/#/ucs-utils";
           license = lib.licenses.free;
         };
       }) {};
     uimage = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "uimage";
-        version = "20151012.804";
+        version = "20160426.726";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "uimage";
-          rev = "29ca0f4b9f27a8d1649931cc2ce5a3c0eb655413";
-          sha256 = "19qvn1vzal5k86pqn6a4ins869qmp2i586qqbl97z84szn8mn7j3";
+          rev = "0fdcf6622bcb6c683f1910a73c4fdf071e627d21";
+          sha256 = "13zznakgqyy3hw385f6w40rz4agxz6fmgaxzgmrz3kjpn19bc2fa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/uimage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/uimage";
           sha256 = "0i6qpk6v4pmpk3zswygdy0dd7rxy8kl7qn8a1xanpi4aqg7wlbmd";
           name = "uimage";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/uimage";
+          homepage = "https://melpa.org/#/uimage";
           license = lib.licenses.free;
         };
       }) {};
     ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ujelly-theme";
-        version = "20150807.2336";
+        version = "20160409.453";
         src = fetchFromGitHub {
           owner = "marktran";
           repo = "color-theme-ujelly";
-          rev = "ff4b9fb4a9469cd807ed712e05cf739a1a900218";
-          sha256 = "0cryprvns1qdnp2qif2g187lj15810w472m7nwrfiwgvqv4v3p1l";
+          rev = "12eb073ef0a9f32d8234805ee5e6c8e5762a201d";
+          sha256 = "1j2zrvgjvhwqjam49bbppazvzfc97w1a8jil28lrxdrg4f41rvv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ujelly-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ujelly-theme";
           sha256 = "0b7zgmpsdn5p3jx4kif7phxz8pb85snmmfr3yz98xf6p7h6w60gw";
           name = "ujelly-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ujelly-theme";
+          homepage = "https://melpa.org/#/ujelly-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -56967,13 +59183,13 @@
           sha256 = "033v4ck979lhkpwblci5clacfc1xnkq03p5d1m566wff8dp5flwz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ukrainian-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ukrainian-holidays";
           sha256 = "0kbfj2l1rcv74c88nabkwkcl7k9pkim835l24q61zv3i6wf9sykf";
           name = "ukrainian-holidays";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ukrainian-holidays";
+          homepage = "https://melpa.org/#/ukrainian-holidays";
           license = lib.licenses.free;
         };
       }) {};
@@ -56981,17 +59197,17 @@
         pname = "unbound";
         version = "20140307.328";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/unbound.el";
+          url = "https://www.emacswiki.org/emacs/download/unbound.el";
           sha256 = "0i5km1naxprd4lj20097ph50mjs2364xwxcdw0j3g5569mk5nc06";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unbound";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/unbound";
           sha256 = "1ys6pgb3lhx4ihhv8i28vrchp1ad37md7lnana40macf5n72d77x";
           name = "unbound";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/unbound";
+          homepage = "https://melpa.org/#/unbound";
           license = lib.licenses.free;
         };
       }) {};
@@ -57006,34 +59222,34 @@
           sha256 = "0366h4jfi0c7yda9wcrz4zxgf2qqdd08b8z2dr8c1rkvkdd67iam";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/uncrustify-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/uncrustify-mode";
           sha256 = "0amdxdfc8i99zjrw4iqmxzb47h0airs60fwmc32bc8b0ds66c3kd";
           name = "uncrustify-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/uncrustify-mode";
+          homepage = "https://melpa.org/#/uncrustify-mode";
           license = lib.licenses.free;
         };
       }) {};
     undercover = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, shut-up }:
     melpaBuild {
         pname = "undercover";
-        version = "20160221.304";
+        version = "20160329.937";
         src = fetchFromGitHub {
           owner = "sviridov";
           repo = "undercover.el";
-          rev = "e72b8c924272f65d7cc6e884478e26d0b1e1e4e8";
-          sha256 = "06qcvbp5rd0kh3ibrxj5p6r578lwsrgd7yj5c6slwmkdmna2fj33";
+          rev = "f96c6033db6ff316fb6ba31db9c0d60736d35e5f";
+          sha256 = "1860hnsbvndaahqs233adk8piz7nyj8v3b0gziv1lrnq864hrq5i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/undercover";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/undercover";
           sha256 = "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf";
           name = "undercover";
         };
         packageRequires = [ dash emacs shut-up ];
         meta = {
-          homepage = "http://melpa.org/#/undercover";
+          homepage = "https://melpa.org/#/undercover";
           license = lib.licenses.free;
         };
       }) {};
@@ -57048,13 +59264,13 @@
           sha256 = "1ypxpv5vw2ls757iwrq3zld6k0s29q3kg3spcsl5ks4aqpnkxpva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/underwater-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/underwater-theme";
           sha256 = "0ab2bcqfdi9ml3z9d511pbfwcbp8hkkd36xxp61k36gkyi3acvlr";
           name = "underwater-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/underwater-theme";
+          homepage = "https://melpa.org/#/underwater-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -57065,16 +59281,16 @@
         src = fetchgit {
           url = "http://www.dr-qubit.org/git/undo-tree.git";
           rev = "a3e81b682053a81e082139300ef0a913a7a610a2";
-          sha256 = "1ef5db7cf476dd37348fd1f11dd199613a89a2351dc583a42afd9d35a53d8ae2";
+          sha256 = "1qla7njkb7gx5aj87i8x6ni8jfk1k78ivwfiiws3gpbnyiydpx8y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/undo-tree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/undo-tree";
           sha256 = "0vrjxprpk854989wcp4wjb07jhhxqi25p6c758gz264z3xa8g9cr";
           name = "undo-tree";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/undo-tree";
+          homepage = "https://melpa.org/#/undo-tree";
           license = lib.licenses.free;
         };
       }) {};
@@ -57089,13 +59305,13 @@
           sha256 = "1c0daw246ky7b1x5b8h55x79pl1pjqk1k348l487bdd8zdj4w9wx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/undohist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/undohist";
           sha256 = "0zzfzh8sf2dkz8h3kidv7zmwz2c2qq9n9qz2mab2lk0y44njzwhn";
           name = "undohist";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/undohist";
+          homepage = "https://melpa.org/#/undohist";
           license = lib.licenses.free;
         };
       }) {};
@@ -57110,13 +59326,13 @@
           sha256 = "0fd9k5m1yw2274m2w9rkrg7vqagzf0rjbybglqi7d200b3hmjin3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unfill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/unfill";
           sha256 = "0b21dk45vbz4vqdbdx0n6wx30rm38w1jjqbsxfj7b96p3i5shwqv";
           name = "unfill";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/unfill";
+          homepage = "https://melpa.org/#/unfill";
           license = lib.licenses.free;
         };
       }) {};
@@ -57131,13 +59347,13 @@
           sha256 = "015gjf8chd6h9azhyarmskk41cm0cmg981jif7q81hakl9av6rhh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unicode-emoticons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/unicode-emoticons";
           sha256 = "15s6qjhrrqrhm87vmvd6akdclzba19613im85kfkhc24p6nxyhbn";
           name = "unicode-emoticons";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/unicode-emoticons";
+          homepage = "https://melpa.org/#/unicode-emoticons";
           license = lib.licenses.free;
         };
       }) {};
@@ -57152,7 +59368,7 @@
           sha256 = "0936dqxyp72if9wvn2dcci670yp1gqrmpnll9xq00skp85yq9zs5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unicode-enbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/unicode-enbox";
           sha256 = "1phb2qq3pg6z6bl96kl9yfq4jxhgardjpaa4lhgqbxymmqdm7gzv";
           name = "unicode-enbox";
         };
@@ -57164,7 +59380,7 @@
           ucs-utils
         ];
         meta = {
-          homepage = "http://melpa.org/#/unicode-enbox";
+          homepage = "https://melpa.org/#/unicode-enbox";
           license = lib.licenses.free;
         };
       }) {};
@@ -57179,7 +59395,7 @@
           sha256 = "0fbwncna6gxlynq9196djpkjhayzk8kxlsxg0gasdgqx1nyxl0mk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unicode-fonts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/unicode-fonts";
           sha256 = "0plipwb30qqay8691qzqdyg6smpbs9dsxxi49psb8sq0xnxl84q3";
           name = "unicode-fonts";
         };
@@ -57191,7 +59407,7 @@
           ucs-utils
         ];
         meta = {
-          homepage = "http://melpa.org/#/unicode-fonts";
+          homepage = "https://melpa.org/#/unicode-fonts";
           license = lib.licenses.free;
         };
       }) {};
@@ -57205,13 +59421,13 @@
           sha256 = "0kzcg1wxi1z424jdn7pibk9zyfyi85kligav08sl1c2hdldzya4l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unicode-input";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/unicode-input";
           sha256 = "17sf3xnl8yyx4ln4mrjlrvfinb8dvabh81l3qyr9pkn5skpgqgj8";
           name = "unicode-input";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/unicode-input";
+          homepage = "https://melpa.org/#/unicode-input";
           license = lib.licenses.free;
         };
       }) {};
@@ -57226,13 +59442,13 @@
           sha256 = "16jgm70ldsngxldiagjkw3ragypalpiidnf82g5hss9ciybkd3j4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unicode-progress-reporter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/unicode-progress-reporter";
           sha256 = "03z7p27470fqy3gd356l9cpp44a35sfrxz94dxmx388rzlygk7y7";
           name = "unicode-progress-reporter";
         };
         packageRequires = [ emacs list-utils pcache persistent-soft ucs-utils ];
         meta = {
-          homepage = "http://melpa.org/#/unicode-progress-reporter";
+          homepage = "https://melpa.org/#/unicode-progress-reporter";
           license = lib.licenses.free;
         };
       }) {};
@@ -57247,13 +59463,13 @@
           sha256 = "0ny260mr1h810fvqsfj2hpd3zql4g309m60qj4vk6kmd83p5b60f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unicode-troll-stopper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/unicode-troll-stopper";
           sha256 = "0a10lq0xsfyp052iw4xjbhsdkbyg25x2gk68gys4k7p6l92la0k5";
           name = "unicode-troll-stopper";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/unicode-troll-stopper";
+          homepage = "https://melpa.org/#/unicode-troll-stopper";
           license = lib.licenses.free;
         };
       }) {};
@@ -57268,13 +59484,13 @@
           sha256 = "1ayb15nd5vqr0xaghrnp55kqw7bblrjipmfrag6bqpn7jk9bvbdz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unicode-whitespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/unicode-whitespace";
           sha256 = "1b3jgha8va42b89pdp41sab2w9wllp7dicqg4lxl67bg6wn147wy";
           name = "unicode-whitespace";
         };
         packageRequires = [ list-utils pcache persistent-soft ucs-utils ];
         meta = {
-          homepage = "http://melpa.org/#/unicode-whitespace";
+          homepage = "https://melpa.org/#/unicode-whitespace";
           license = lib.licenses.free;
         };
       }) {};
@@ -57289,13 +59505,13 @@
           sha256 = "1jvr1k8zd40m1rvwmxzidz1dvr4j8cbh78nqgc3vfb410fj619gw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unidecode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/unidecode";
           sha256 = "0h058mvb6x53zywpwg85dzhaynlgq577yyqhrn5qqyqjg1n8lhc1";
           name = "unidecode";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/unidecode";
+          homepage = "https://melpa.org/#/unidecode";
           license = lib.licenses.free;
         };
       }) {};
@@ -57310,13 +59526,13 @@
           sha256 = "1vbx10s2zmhpxjg26ik947bcg9f7w3g2w45wmm0shjp743fsdq8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unify-opening";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/unify-opening";
           sha256 = "1gpmklbdbmv8va8d3yr94r1ydkcyvdzcgxv56rp0bxwbcgmk0as8";
           name = "unify-opening";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/unify-opening";
+          homepage = "https://melpa.org/#/unify-opening";
           license = lib.licenses.free;
         };
       }) {};
@@ -57325,40 +59541,40 @@
         pname = "unipoint";
         version = "20140113.1624";
         src = fetchFromGitHub {
-          owner = "apgwoz";
+          owner = "apg";
           repo = "unipoint";
           rev = "5da04aebac35a5c9e1d8704f2231808d42f4b36a";
           sha256 = "1wl9rzys1zr2c41h5i57y6hxsavix1b26f453l2izmb6r0b1dvh0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unipoint";
-          sha256 = "1nym2wlr50wk62cbagq1qyjczzf56nb6i9dfzcwikdck8p4p2dr7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/unipoint";
+          sha256 = "0fm7anwcmga9adyfwlri7x014rpvfl1r6nccyi6lrpx126wy008s";
           name = "unipoint";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/unipoint";
+          homepage = "https://melpa.org/#/unipoint";
           license = lib.licenses.free;
         };
       }) {};
     unison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "unison-mode";
-        version = "20150104.614";
+        version = "20160319.511";
         src = fetchFromGitHub {
           owner = "impaktor";
           repo = "unison-mode";
-          rev = "7e1bfee1a6796cc749a583605a9c948eccbc8cc5";
-          sha256 = "0l8h084xkbjvx2vbg67hxmg4hb9175k858z3k3c93d2b6x2kh7ni";
+          rev = "aebba94c7c1327223ad1a86bf90f359ab01f624c";
+          sha256 = "1qpj8a4r1x781wqiqm11273sra0n9d9d6l397dkkx02wmv1l8kcy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unison-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/unison-mode";
           sha256 = "03kyr1h5pm51vn4bykj13rm4ybln266rpnxh65y2ygw8f8md88gl";
           name = "unison-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/unison-mode";
+          homepage = "https://melpa.org/#/unison-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -57373,34 +59589,34 @@
           sha256 = "0xpaifmrvq5bbzpjhbzbxaac8kymmvqgg7lb2q1s7b5qf47fhqac";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unkillable-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/unkillable-scratch";
           sha256 = "0ghbpa9pf7k6vd2mjxkpqg2qfl4sd40ir6mrk1rxr1rv8s0afkf7";
           name = "unkillable-scratch";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/unkillable-scratch";
+          homepage = "https://melpa.org/#/unkillable-scratch";
           license = lib.licenses.free;
         };
       }) {};
     url-shortener = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "url-shortener";
-        version = "20150806.113";
+        version = "20160404.2159";
         src = fetchFromGitHub {
           owner = "yuyang0";
           repo = "url-shortener";
-          rev = "2ce3fedbdc44f778f28a5a08f06958bc5dccae88";
-          sha256 = "118c23dsfgkhwhv65dx3wbg2dn7qyrd80d78cykl732c68d6wvi0";
+          rev = "48182912d4f3a704d0b53f1664b995cfbf2ccd28";
+          sha256 = "179hi6hsp2naczlcym3qxx9wbqx96bkkzvqygf3iffa0rmik4j7h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/url-shortener";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/url-shortener";
           sha256 = "12r01dyk55bs01jk0ab9f24lfvm63h8kvix223pii5y9890dr6ys";
           name = "url-shortener";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/url-shortener";
+          homepage = "https://melpa.org/#/url-shortener";
           license = lib.licenses.free;
         };
       }) {};
@@ -57415,13 +59631,13 @@
           sha256 = "0xwr0v4f64d7hi5ldig4r5yjn8h3f8by49g5820187lsp7ng2nw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/urlenc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/urlenc";
           sha256 = "0n6shh95m11162zsnf62zy1ljswdjznjilxx2dbqyqdrn7qr2dgh";
           name = "urlenc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/urlenc";
+          homepage = "https://melpa.org/#/urlenc";
           license = lib.licenses.free;
         };
       }) {};
@@ -57429,59 +59645,59 @@
         pname = "usage-memo";
         version = "20110722.1051";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/usage-memo.el";
+          url = "https://www.emacswiki.org/emacs/download/usage-memo.el";
           sha256 = "00g1zj5fjykdi6gh2wkswpwx132xa6jmwfnrgfg5r96zwb8pib4i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/usage-memo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/usage-memo";
           sha256 = "05n50adjnavl7ag24wfjwlnbv5x55qlhmplgsm8j57gjig01nd95";
           name = "usage-memo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/usage-memo";
+          homepage = "https://melpa.org/#/usage-memo";
           license = lib.licenses.free;
         };
       }) {};
     use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "use-package";
-        version = "20160209.1833";
+        version = "20160403.1329";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "6b1956813f0f0e553a7eb6923ff846f9c3556146";
-          sha256 = "13yzxlxkykv3qkaaifn3pf0y94dgqysxz5p7vh71jpqxi6d7jmgr";
+          rev = "22c63c8f98fc318c357b51a658cee62d64601e16";
+          sha256 = "19vc1hblbqlns2c28aqwjpmj8k35ih7akqi04wrqv1b6pljfy3jg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/use-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/use-package";
           sha256 = "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8";
           name = "use-package";
         };
         packageRequires = [ bind-key diminish ];
         meta = {
-          homepage = "http://melpa.org/#/use-package";
+          homepage = "https://melpa.org/#/use-package";
           license = lib.licenses.free;
         };
       }) {};
     use-package-chords = callPackage ({ bind-chord, bind-key, fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }:
     melpaBuild {
         pname = "use-package-chords";
-        version = "20160107.1054";
+        version = "20160407.1107";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "use-package-chords";
-          rev = "cbf623c867f911732077b026692f9312401791ad";
-          sha256 = "05lhxbrgwbyz0nkb19yln9a46jh91ic685943hd58cn91lxsw3al";
+          rev = "b7de6b2a1270d37a1aca3bd8f29f67ec578527d7";
+          sha256 = "06jsa0scvf12kznm0ngv76y726rzh93prc7ymw3fvknvg0xivb8v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/use-package-chords";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/use-package-chords";
           sha256 = "18av8gkz3nzyqigyd88ajvylsz2nswsfywxrk2w8d0ykc3p37ass";
           name = "use-package-chords";
         };
         packageRequires = [ bind-chord bind-key use-package ];
         meta = {
-          homepage = "http://melpa.org/#/use-package-chords";
+          homepage = "https://melpa.org/#/use-package-chords";
           license = lib.licenses.free;
         };
       }) {};
@@ -57492,17 +59708,17 @@
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "2f48c9f512c36e195dfe26c57ff3373fc6463507";
-          sha256 = "1fzs9y0k1cl6jda0vhra1v20cmdf9z8cp6yha6iv7f2d1l2srggd";
+          rev = "9e9ebbfa4a1023eb4823fc8361282593790a54c8";
+          sha256 = "1vacc4l5jsyxdfcinxja3r1qyc4cskmd9xvxp6zxkjfw4x6nr71c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/utop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/utop";
           sha256 = "0lv16kl29gc9hdcpn04l85pf7x93vkl41s4mgqp678cllzyr0cq7";
           name = "utop";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/utop";
+          homepage = "https://melpa.org/#/utop";
           license = lib.licenses.free;
         };
       }) {};
@@ -57517,13 +59733,13 @@
           sha256 = "0r74gw8gcbrr62rvj4anz0c3n6kwi1xpb42d3pkzlh4igblhi5zj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/uuid";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/uuid";
           sha256 = "13xjnawir9i83j2abxxkl12gz3wapgbk56cps3qyfgql02bfk2rw";
           name = "uuid";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/uuid";
+          homepage = "https://melpa.org/#/uuid";
           license = lib.licenses.free;
         };
       }) {};
@@ -57538,13 +59754,13 @@
           sha256 = "19bf6vpc2b9hfjkjanji96fflvk1lbillasnpwcb6zzyq0cs47bw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/uuidgen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/uuidgen";
           sha256 = "1qaz7hg0wsdkl0jb7v7vrkjs554i2zgpxl8xq2f8q7m4bs2m5k48";
           name = "uuidgen";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/uuidgen";
+          homepage = "https://melpa.org/#/uuidgen";
           license = lib.licenses.free;
         };
       }) {};
@@ -57559,34 +59775,34 @@
           sha256 = "0fx18m688wfflbzwv8h3051439fwql69v1ip5q6xn958rdq4pi3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/uzumaki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/uzumaki";
           sha256 = "1fvhzz2qpyc819rjvzyf42jmb70hlg7a9ybqwi81w7rydpabg61q";
           name = "uzumaki";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/uzumaki";
+          homepage = "https://melpa.org/#/uzumaki";
           license = lib.licenses.free;
         };
       }) {};
     vagrant = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vagrant";
-        version = "20141125.2159";
+        version = "20160411.218";
         src = fetchFromGitHub {
           owner = "ottbot";
           repo = "vagrant.el";
-          rev = "dabf69b7146f8a035bba15285b1fafc1e9ef4b3c";
-          sha256 = "04r73s3fhvdcryv0l57awkpg1hi3kg6zcqxbxb03jc89h0f9vdlh";
+          rev = "6d043d8f2c9e0c7039639504a88b2f8cbf519f67";
+          sha256 = "0w4a4mxy81vbr5r4kaaddi5zbisvr9ry5x4skmmlib2k0j84niiv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vagrant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vagrant";
           sha256 = "0g6sqzsx3lixcn09fkxhhcfp45qnqgf1ms0l7nkzyljavb7151cf";
           name = "vagrant";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/vagrant";
+          homepage = "https://melpa.org/#/vagrant";
           license = lib.licenses.free;
         };
       }) {};
@@ -57601,13 +59817,13 @@
           sha256 = "1xslw0whxmqsd79jwxgz1k7h55shffq3985im96pdzf4iivkr3ln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vagrant-tramp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vagrant-tramp";
           sha256 = "0ij7k27zj22sl7inx141l4dg0ymywnvyabjvaqzc0xjdj0cky5c5";
           name = "vagrant-tramp";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/vagrant-tramp";
+          homepage = "https://melpa.org/#/vagrant-tramp";
           license = lib.licenses.free;
         };
       }) {};
@@ -57622,13 +59838,13 @@
           sha256 = "10vs4d8csww781j1ps3f6dczy5zzza36z7a8zqk40fg4x57ikw44";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vala-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vala-mode";
           sha256 = "164dhlsiflhpdymk3q5x0bv8gpbwfp34lnkhm2x90kdakfzqf91p";
           name = "vala-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/vala-mode";
+          homepage = "https://melpa.org/#/vala-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -57643,13 +59859,13 @@
           sha256 = "0iscaz8lm4fk6w13f68ysqk8ppng2wj9fkkkq1rfqz77ws66f8nq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vala-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vala-snippets";
           sha256 = "14hmmic0px3z38dm2dg0kis6cz1p3p1hj7xaqnqjmv02dkx2mmcy";
           name = "vala-snippets";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/vala-snippets";
+          homepage = "https://melpa.org/#/vala-snippets";
           license = lib.licenses.free;
         };
       }) {};
@@ -57664,13 +59880,13 @@
           sha256 = "19j5q2f6pybvjq3ryjcyihzlw348hqyjhfcy3qflry6w786dqcgn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vbasense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vbasense";
           sha256 = "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n";
           name = "vbasense";
         };
         packageRequires = [ auto-complete log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/vbasense";
+          homepage = "https://melpa.org/#/vbasense";
           license = lib.licenses.free;
         };
       }) {};
@@ -57685,13 +59901,13 @@
           sha256 = "09h7yg44hbxv3pyazfypkvk8j3drlwz0zn8x1wj0kbsviksl1wxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vc-auto-commit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vc-auto-commit";
           sha256 = "1xpp7vbld3jgcr249m5h7il919kfg7d5ap3zs64i27axzdhv26zk";
           name = "vc-auto-commit";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/vc-auto-commit";
+          homepage = "https://melpa.org/#/vc-auto-commit";
           license = lib.licenses.free;
         };
       }) {};
@@ -57706,13 +59922,13 @@
           sha256 = "0icc4kqfpimxlja4jgcy9gjj4myc8y84vbvacyf79lxixygpaxi1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vc-check-status";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vc-check-status";
           sha256 = "1kwnxa0ndfj8b211xy5d47sxkwmsay0kk8q7azfm5ag5dkg56zgi";
           name = "vc-check-status";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/vc-check-status";
+          homepage = "https://melpa.org/#/vc-check-status";
           license = lib.licenses.free;
         };
       }) {};
@@ -57727,13 +59943,13 @@
           sha256 = "1zpvinbc3nrnjm931fgzrlkl31xcsg9ikh041s1fkfjkhfq0h82h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vc-darcs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vc-darcs";
           sha256 = "1xskl9wjxkbdpi0fm769ymbvya70vssi944x5252w2d3layibm6m";
           name = "vc-darcs";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/vc-darcs";
+          homepage = "https://melpa.org/#/vc-darcs";
           license = lib.licenses.free;
         };
       }) {};
@@ -57748,13 +59964,13 @@
           sha256 = "0whzfzg0m03wbmqsxml8hislnbfvawcniq83hj66lbrnbivxsqj4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vc-osc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vc-osc";
           sha256 = "0rp33945xk5d986brganqnn55psmlkj6glbimxakhgv9a1r85sxz";
           name = "vc-osc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/vc-osc";
+          homepage = "https://melpa.org/#/vc-osc";
           license = lib.licenses.free;
         };
       }) {};
@@ -57769,13 +59985,13 @@
           sha256 = "1jfis26lmghl30ydzq1xdkrrj3d85q7g44ns6kmfg119ccapllbj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vcl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vcl-mode";
           sha256 = "1h0a1briinp9ka7ga3ipdhyf7yfinwvf7babv36myi720900wcq5";
           name = "vcl-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/vcl-mode";
+          homepage = "https://melpa.org/#/vcl-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -57790,13 +60006,13 @@
           sha256 = "0fzz26c1pdaz3i58ndhzd2520mhny487daqs21yajxi9x2m00zrl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vcomp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vcomp";
           sha256 = "02cj2nlyxvgvl2rjfgacljvcsnfm9crmmkhcm2pznj9xw10y8pq0";
           name = "vcomp";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/vcomp";
+          homepage = "https://melpa.org/#/vcomp";
           license = lib.licenses.free;
         };
       }) {};
@@ -57811,13 +60027,13 @@
           sha256 = "1lh8nv0ayl9ipl2aqc8npzz84g5q7w6v60l14v61mmk34fc23lnc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vdirel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vdirel";
           sha256 = "11cc7bw7x5h3bwnlsjyhw6k5fh2fk7wffarrcny562v4cmr013cj";
           name = "vdirel";
         };
         packageRequires = [ emacs helm org-vcard seq ];
         meta = {
-          homepage = "http://melpa.org/#/vdirel";
+          homepage = "https://melpa.org/#/vdirel";
           license = lib.licenses.free;
         };
       }) {};
@@ -57832,34 +60048,34 @@
           sha256 = "1wa03gb98x650q798aqshm43kh6gfxaz1rlyrmvka5dxgf48whmf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vector-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vector-utils";
           sha256 = "07armr23pq5pd47lqhir6a59r86c84zikbc51d8vfcaw8y71yr5n";
           name = "vector-utils";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/vector-utils";
+          homepage = "https://melpa.org/#/vector-utils";
           license = lib.licenses.free;
         };
       }) {};
     verify-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "verify-url";
-        version = "20160203.159";
+        version = "20160426.728";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "verify-url";
-          rev = "7961223979ad01723ada3c48b034e91592b3d1cc";
-          sha256 = "0vlkg77a0h5z36f370phl2xdzykz9h9in3vng68zn1pfhx2allyx";
+          rev = "d6f3623cda8cd526a2d198619b137059cb1ba1ab";
+          sha256 = "1y6vjw5qzaxr37spg5d4nxffmhiipzsrd7mvh8bs3jcfrsg3080n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/verify-url";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/verify-url";
           sha256 = "1gd83rb1q0kywchd0345p5axqj1sv4f5kadympx5pbp4n5p1dqb2";
           name = "verify-url";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/verify-url";
+          homepage = "https://melpa.org/#/verify-url";
           license = lib.licenses.free;
         };
       }) {};
@@ -57874,55 +60090,76 @@
           sha256 = "1mp71axs3vdrdwlhgywfldvnr6a1g2qbxiywmpfmcv59n5n58p1j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vertica";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vertica";
           sha256 = "1ljjk6zrbr2k0s0iaqd9iq3j45cavijcx0rqdidliswnfllav4ng";
           name = "vertica";
         };
         packageRequires = [ sql ];
         meta = {
-          homepage = "http://melpa.org/#/vertica";
+          homepage = "https://melpa.org/#/vertica";
           license = lib.licenses.free;
         };
       }) {};
     vertigo = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vertigo";
-        version = "20151110.2213";
+        version = "20160322.2006";
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "vertigo.el";
-          rev = "fecc566e9039408303f9b1c979624d546152b7df";
-          sha256 = "0v884gbqq5vrx5gwg9dqn97kaqgnzhrqv8kam8dy9g7hx4fm6b2l";
+          rev = "ebfa068d9e2fc39ba6d1744618c4e31dad6f629b";
+          sha256 = "1yk7qqg8i3970kpfk34wvi0gh16qf0b0sfnf18g3s21dd4gk5a6g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vertigo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vertigo";
           sha256 = "0x0wy1z601sk1x96bl2xx18qm4avd77iybq1a3ss8x8ykwqlgf83";
           name = "vertigo";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/vertigo";
+          homepage = "https://melpa.org/#/vertigo";
           license = lib.licenses.free;
         };
       }) {};
-    vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, lib, melpaBuild, outshine }:
+    vhdl-capf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vhdl-capf";
+        version = "20160221.1134";
+        src = fetchFromGitHub {
+          owner = "sh-ow";
+          repo = "vhdl-capf";
+          rev = "290abe217050f33532bc9ccb04f894123402f414";
+          sha256 = "185a7962h94122q783ih7s8r28xifm0bcrqvkd0g4p64mijlbh3d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vhdl-capf";
+          sha256 = "06dkw5ra9wnscpgrnx851vyfgr5797xd60qdimsr2v1bqd8si9km";
+          name = "vhdl-capf";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/vhdl-capf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine, projectile }:
     melpaBuild {
         pname = "vhdl-tools";
-        version = "20160114.449";
+        version = "20160308.509";
         src = fetchFromGitHub {
           owner = "csantosb";
           repo = "vhdl-tools";
-          rev = "6478a055e0e6bac56c65a5ecd45b82e0a074e9bb";
-          sha256 = "0ba22j368w6jac94hwmy27bhm3h1r7kpiwdzy8ggfxfzwn0sd4dy";
+          rev = "17b49fad72269fb987f88fe783248a9252f21faf";
+          sha256 = "0ggblkaz214vl1j4i5gv5qj2q6ahnr0k3c3l9sd0w5vdkbw8n5jb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vhdl-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vhdl-tools";
           sha256 = "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw";
           name = "vhdl-tools";
         };
-        packageRequires = [ emacs ggtags outshine ];
+        packageRequires = [ emacs ggtags helm outshine projectile ];
         meta = {
-          homepage = "http://melpa.org/#/vhdl-tools";
+          homepage = "https://melpa.org/#/vhdl-tools";
           license = lib.licenses.free;
         };
       }) {};
@@ -57937,13 +60174,13 @@
           sha256 = "0wdm8k49zl6i6wnh7vjkswdh5m9lix56jv37xvc90inipwgs402z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vi-tilde-fringe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vi-tilde-fringe";
           sha256 = "0jhwv46gjwjbs1ai65nm6k15y0q4yl9m5mawgp3n4f45dh02cawp";
           name = "vi-tilde-fringe";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/vi-tilde-fringe";
+          homepage = "https://melpa.org/#/vi-tilde-fringe";
           license = lib.licenses.free;
         };
       }) {};
@@ -57951,17 +60188,17 @@
         pname = "viewer";
         version = "20141021.1338";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/viewer.el";
+          url = "https://www.emacswiki.org/emacs/download/viewer.el";
           sha256 = "0lns0ic3zjz1km02674d9hxgnp6wlhk168wyr6h4vhpr8a71x9mb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/viewer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/viewer";
           sha256 = "0aqwkymq5f0qfgs1hmcg1jb1rd0vcnlqwiyjrjjkfff2xlbpagqf";
           name = "viewer";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/viewer";
+          homepage = "https://melpa.org/#/viewer";
           license = lib.licenses.free;
         };
       }) {};
@@ -57976,13 +60213,13 @@
           sha256 = "11qh6fpf6269j9syf06v5wnkgi65wnn7dbyjwb6yz72rvq7ihhcz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vim-empty-lines-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vim-empty-lines-mode";
           sha256 = "17bl1g4ais73ws596mha0l8dgckfqhx9k2v9m9k0gw7kg7dcjhnb";
           name = "vim-empty-lines-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/vim-empty-lines-mode";
+          homepage = "https://melpa.org/#/vim-empty-lines-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -57997,13 +60234,13 @@
           sha256 = "13g2hin100c8h5bd7hzhyqzj02ab9c35giyv963l7y044v7sbwig";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vim-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vim-region";
           sha256 = "1dcnx799lpjsdnnjxqzgskkfj2nx7f4kwf0xjhbg35ny4nyn81dx";
           name = "vim-region";
         };
         packageRequires = [ expand-region ];
         meta = {
-          homepage = "http://melpa.org/#/vim-region";
+          homepage = "https://melpa.org/#/vim-region";
           license = lib.licenses.free;
         };
       }) {};
@@ -58018,13 +60255,13 @@
           sha256 = "1i407ilhmk2qrk66ygbvizq964bdk502x7lvrzs4wxwfr5y8ciyj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vimgolf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vimgolf";
           sha256 = "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn";
           name = "vimgolf";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/vimgolf";
+          homepage = "https://melpa.org/#/vimgolf";
           license = lib.licenses.free;
         };
       }) {};
@@ -58039,13 +60276,13 @@
           sha256 = "0rl9pcw1dcqpivmcrwpbsd11ym643zccp4sh5k11rmal77gb36sl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vimish-fold";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vimish-fold";
           sha256 = "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3";
           name = "vimish-fold";
         };
         packageRequires = [ cl-lib emacs f ];
         meta = {
-          homepage = "http://melpa.org/#/vimish-fold";
+          homepage = "https://melpa.org/#/vimish-fold";
           license = lib.licenses.free;
         };
       }) {};
@@ -58060,13 +60297,13 @@
           sha256 = "000fs2h5zcv8aq8an16r6zwwf9x1qnfs7xxn39iahiwfzvnljqp0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vimrc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vimrc-mode";
           sha256 = "06hisgsn0czvzbq8m4dz86h4q75j54a0gxkg5shnr8s654d450bp";
           name = "vimrc-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/vimrc-mode";
+          homepage = "https://melpa.org/#/vimrc-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -58081,13 +60318,13 @@
           sha256 = "0rd7hyv66278dj32yva5q9z1749y84c6fwl2iqrns512j1l4kl8q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/virtualenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/virtualenv";
           sha256 = "1djqzzlbwsp9xyjqjbjwdck73wzikbpq19irzamybk90nc98wirl";
           name = "virtualenv";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/virtualenv";
+          homepage = "https://melpa.org/#/virtualenv";
           license = lib.licenses.free;
         };
       }) {};
@@ -58098,17 +60335,17 @@
         src = fetchFromGitHub {
           owner = "porterjamesj";
           repo = "virtualenvwrapper.el";
-          rev = "e6b78e56c204ba6aea17c934e0a0a86b14bac832";
-          sha256 = "0gywi1irsmgrhxb76k5nnycb66l6xpkql195w4h90x1q4lx34dk1";
+          rev = "62df8c1af39c5a8fec5b4e3fd1a063db06d38d21";
+          sha256 = "05rzjlb04h7xyq7l7z87hqqcsf907p2nsxqnh7r6wm24kddfb0ab";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/virtualenvwrapper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/virtualenvwrapper";
           sha256 = "0rn5vwncx8z69xp8hspr06nzkf28l9flchpb2936c2nalmhx6m8i";
           name = "virtualenvwrapper";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/virtualenvwrapper";
+          homepage = "https://melpa.org/#/virtualenvwrapper";
           license = lib.licenses.free;
         };
       }) {};
@@ -58123,13 +60360,13 @@
           sha256 = "15zdbvv6c114mv6hdq375l7ax70sss06p9d7m86hgssc3kiv9vsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/visible-mark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/visible-mark";
           sha256 = "1rp0gnz28m1drwb1hhsf0mwxzdppdi88hscf788qw8cw65gckv80";
           name = "visible-mark";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/visible-mark";
+          homepage = "https://melpa.org/#/visible-mark";
           license = lib.licenses.free;
         };
       }) {};
@@ -58144,76 +60381,76 @@
           sha256 = "1cv8mf3l92a9p8qmkfiphk3r81f2ihg2gyw2r4jbbd5ppwbxkl0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/visual-ascii-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/visual-ascii-mode";
           sha256 = "1h0143h39dq61afswlzlgpknk0gv574x91ar6klqmnaf1snab59g";
           name = "visual-ascii-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/visual-ascii-mode";
+          homepage = "https://melpa.org/#/visual-ascii-mode";
           license = lib.licenses.free;
         };
       }) {};
     visual-fill-column = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "visual-fill-column";
-        version = "20151121.1751";
+        version = "20160411.720";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "visual-fill-column";
-          rev = "043485d16a645c8c6df5d82bc77b8fc155a818aa";
-          sha256 = "126qm63ik1n1agvcp4mgk1gr7dnnyjif8zbw0l336q74d5cy6h6w";
+          rev = "865c9b32ead54ac3c0a6f0a92164e9963bacdd5d";
+          sha256 = "0r1iylk7r25wmlba4vlrc6k1apbkrbplb9id1h9q91wqhwdnxqal";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/visual-fill-column";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/visual-fill-column";
           sha256 = "19y0pwaybjal2rc7migdbnafpi4dfbxvrzgfqr8dlvd9q68v08y5";
           name = "visual-fill-column";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/visual-fill-column";
+          homepage = "https://melpa.org/#/visual-fill-column";
           license = lib.licenses.free;
         };
       }) {};
     visual-regexp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "visual-regexp";
-        version = "20151206.719";
+        version = "20160409.441";
         src = fetchFromGitHub {
           owner = "benma";
           repo = "visual-regexp.el";
-          rev = "58566c09e593dda9c3e3a348310a9bdc42dcb3d8";
-          sha256 = "04wds01yzhia508852gm18rp7dkg0838j0w8cr1l1qmc8p0jjsz9";
+          rev = "b625cec147dd1ac185aac52e2ae27acb2a662b28";
+          sha256 = "00sf1qzd6g8p2zlq4baslzccxq47fi3yi9dbwx4ich6f0b9021dg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/visual-regexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/visual-regexp";
           sha256 = "16bdqq2j7pnjq3j6qa4rhxzidqdhyg80c7nazd93smis8rcv5d0z";
           name = "visual-regexp";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/visual-regexp";
+          homepage = "https://melpa.org/#/visual-regexp";
           license = lib.licenses.free;
         };
       }) {};
     visual-regexp-steroids = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, visual-regexp }:
     melpaBuild {
         pname = "visual-regexp-steroids";
-        version = "20150411.616";
+        version = "20160409.441";
         src = fetchFromGitHub {
           owner = "benma";
           repo = "visual-regexp-steroids.el";
-          rev = "2a50710dea5be872b31ea56f74b4cd57d6e61461";
-          sha256 = "03jggsnz5j0c36inxqa16vrdwlzn3wrniyl2i9b8c5bx7az7210m";
+          rev = "b724d2a30efbcf2a13f6c34b798aeb453ff076be";
+          sha256 = "10czcdkhbjjkadrbas4wl2x65r6jxpbwj7hwvvngm9166vg44kh0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/visual-regexp-steroids";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/visual-regexp-steroids";
           sha256 = "1xkrzyyll8wmb67m75lfm9k8qcm068km8r1k8hcsadpkd01bx1lr";
           name = "visual-regexp-steroids";
         };
         packageRequires = [ visual-regexp ];
         meta = {
-          homepage = "http://melpa.org/#/visual-regexp-steroids";
+          homepage = "https://melpa.org/#/visual-regexp-steroids";
           license = lib.licenses.free;
         };
       }) {};
@@ -58228,13 +60465,13 @@
           sha256 = "0hb845pnh2yska6alca8hbbxh65x7g81pr7852h8fddm0qd1agkd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vkill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vkill";
           sha256 = "09siqsip6d2h3jrxbdbhylkqm42dx3d2dqlkkdw3a81c7ga9lpwm";
           name = "vkill";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/vkill";
+          homepage = "https://melpa.org/#/vkill";
           license = lib.licenses.free;
         };
       }) {};
@@ -58249,13 +60486,13 @@
           sha256 = "0vl0hwxzzvgna8sysf517qq08fi1zsff3dmcgwvsgzhc47sq8mng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vlf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vlf";
           sha256 = "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8";
           name = "vlf";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/vlf";
+          homepage = "https://melpa.org/#/vlf";
           license = lib.licenses.free;
         };
       }) {};
@@ -58263,17 +60500,17 @@
         pname = "vline";
         version = "20120108.645";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/vline.el";
+          url = "https://www.emacswiki.org/emacs/download/vline.el";
           sha256 = "1ys6928fgk8mswa4gv10cxggir8acck27g78cw1z3pdz5gakbgnj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vline";
           sha256 = "0p59xhyrv7fmcn3qi51sp8v9v2y71ray2s756zbhzgzg63h3nbjp";
           name = "vline";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/vline";
+          homepage = "https://melpa.org/#/vline";
           license = lib.licenses.free;
         };
       }) {};
@@ -58288,13 +60525,13 @@
           sha256 = "183pvfp5nnqpgdmfxm84qrnid0lijgk79l5lhwzmnznzkrb7bgxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/voca-builder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/voca-builder";
           sha256 = "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y";
           name = "voca-builder";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/voca-builder";
+          homepage = "https://melpa.org/#/voca-builder";
           license = lib.licenses.free;
         };
       }) {};
@@ -58309,13 +60546,13 @@
           sha256 = "1yrpqlpxnw7jckhhc18i058vcpi12y687181h0azcwb0wq9p2c26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/volatile-highlights";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/volatile-highlights";
           sha256 = "1r6in919aqdziv6bgzp4k7jqa87bd287pacq615sd5m1nzva1a4d";
           name = "volatile-highlights";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/volatile-highlights";
+          homepage = "https://melpa.org/#/volatile-highlights";
           license = lib.licenses.free;
         };
       }) {};
@@ -58330,13 +60567,34 @@
           sha256 = "0ymibjq6iwab5ia1fglhz4gm5cnbi792018fmrabcqkisj2zsjb7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/volume";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/volume";
           sha256 = "1r01v453bpyh561j8ja36609hy60gc30arvmz4z3c1cybhv8sk1i";
           name = "volume";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/volume";
+          homepage = "https://melpa.org/#/volume";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }:
+    melpaBuild {
+        pname = "vue-mode";
+        version = "20160411.2254";
+        src = fetchFromGitHub {
+          owner = "CodeFalling";
+          repo = "vue-mode";
+          rev = "28e2cc06f8ba8e0ac7027b33300b999493e73505";
+          sha256 = "1d9rwgyvizn1zas8v98v86g5kck0m567cprpcakdawwamn155k49";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vue-mode";
+          sha256 = "0gy7a5sliaijq0666l55vbkg15anrw7k1828szdn1ppkraw14bn0";
+          name = "vue-mode";
+        };
+        packageRequires = [ mmm-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/vue-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -58344,17 +60602,17 @@
         pname = "w32-browser";
         version = "20151231.1820";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/w32-browser.el";
+          url = "https://www.emacswiki.org/emacs/download/w32-browser.el";
           sha256 = "0vb5ss30mz0kqq8cscjckw647vqn6xprp2sfjcbpg2fx59z4agma";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/w32-browser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/w32-browser";
           sha256 = "14vc2cipwlwwc0b5ld4x0zvydkg8nbjmp0z2x6ca0nmxw8sfsnc6";
           name = "w32-browser";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/w32-browser";
+          homepage = "https://melpa.org/#/w32-browser";
           license = lib.licenses.free;
         };
       }) {};
@@ -58363,17 +60621,17 @@
         pname = "w32browser-dlgopen";
         version = "20151231.1821";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/w32browser-dlgopen.el";
+          url = "https://www.emacswiki.org/emacs/download/w32browser-dlgopen.el";
           sha256 = "0nyara81bnd0rvgyljqrrbvjvndkngdc7qzf6scl5iz3vlglfgy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/w32browser-dlgopen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/w32browser-dlgopen";
           sha256 = "0dnvsnahnbnvjlhfmb0q6agzikv9d42fbnfrwsz6hni92937gz39";
           name = "w32browser-dlgopen";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/w32browser-dlgopen";
+          homepage = "https://melpa.org/#/w32browser-dlgopen";
           license = lib.licenses.free;
         };
       }) {};
@@ -58388,13 +60646,13 @@
           sha256 = "1lgvdaghzj1fzh8p6ans0f62zg1bfp086icbsqmyvbgpgcxia9cs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/w3m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/w3m";
           sha256 = "0vh882b44vxnij3l01sig87c1jmbymgirf6s98mvag1p9rm8agxw";
           name = "w3m";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/w3m";
+          homepage = "https://melpa.org/#/w3m";
           license = lib.licenses.free;
         };
       }) {};
@@ -58409,13 +60667,13 @@
           sha256 = "0nvlni3iy2sq76z8d4kj5492m0w7qv96shjqkynvlj0avf528hv4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wacspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wacspace";
           sha256 = "1xy0mprvyi37zmgj1yrlh5ni08j47lpag1jm3a76cgghgmlfjxrl";
           name = "wacspace";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
-          homepage = "http://melpa.org/#/wacspace";
+          homepage = "https://melpa.org/#/wacspace";
           license = lib.licenses.free;
         };
       }) {};
@@ -58430,34 +60688,34 @@
           sha256 = "0w59ix8cbbcyhh882c8vkrbh84i8d03h9w7dchr3qy233b8wcxlc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/waher-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/waher-theme";
           sha256 = "091kipkb6z6x9ic4chprim9rvnmx4yj4419ijmvpn70w69aspnb5";
           name = "waher-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/waher-theme";
+          homepage = "https://melpa.org/#/waher-theme";
           license = lib.licenses.free;
         };
       }) {};
     wakatime-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wakatime-mode";
-        version = "20151117.1830";
+        version = "20160417.309";
         src = fetchFromGitHub {
           owner = "wakatime";
           repo = "wakatime-mode";
-          rev = "883f969c1502994b55912c6ade7155220e3c2cea";
-          sha256 = "1bcdvk5bg5yi0qq0wd3w9wl38s0brrafz52bzsracj3wffswjg1n";
+          rev = "a0d279ac7d17c927ca3c52b9e072751b987b8333";
+          sha256 = "06d6ywc0hq6jn5ahq96qa8v8fnps464f2gjmdhsgvj8b0d0c5jl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wakatime-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wakatime-mode";
           sha256 = "1rhy2bwkqlha4bj3zmb0iassiglch7yb2kbas0bbpl3d0hdki2i8";
           name = "wakatime-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/wakatime-mode";
+          homepage = "https://melpa.org/#/wakatime-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -58472,55 +60730,55 @@
           sha256 = "09gqsssc2sk0vwfg0h4zxq9a779sdjdgvxsw7p6n2k0g4wk0phri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wand";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wand";
           sha256 = "052zq5dp800hynd9fb6c645kjb9rp3bpkz41ifazjnx4h4864r0l";
           name = "wand";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/wand";
+          homepage = "https://melpa.org/#/wand";
           license = lib.licenses.free;
         };
       }) {};
-    wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
     melpaBuild {
         pname = "wandbox";
-        version = "20160124.1040";
+        version = "20160418.1314";
         src = fetchFromGitHub {
           owner = "kosh04";
           repo = "emacs-wandbox";
-          rev = "4522d488ecee418573ab2cdc55923f802b1dba31";
-          sha256 = "114f7sqwq6whbdsidg6wlzjayy6dla06h7fmg1gjkhkbdqq4h94d";
+          rev = "490eed2ac5f3cc375bace345f1060583d166a385";
+          sha256 = "06jqlvy2078fd8py59z5rraf2ymlkv6wizmw91vq63f87vpw71zg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wandbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wandbox";
           sha256 = "0myyln82nx462bj79acvqxwvmblxild4vbygcrzw5chcwy6crvlz";
           name = "wandbox";
         };
-        packageRequires = [ emacs json ];
+        packageRequires = [ emacs request s ];
         meta = {
-          homepage = "http://melpa.org/#/wandbox";
+          homepage = "https://melpa.org/#/wandbox";
           license = lib.licenses.free;
         };
       }) {};
     wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }:
     melpaBuild {
         pname = "wanderlust";
-        version = "20160129.1736";
+        version = "20160409.520";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "wanderlust";
-          rev = "154d38e6a7d2355483087f6ddd2ce075a6cfe3a1";
-          sha256 = "0pa7657zzd0hpf9wsrmvh396nyfp8458s6gh4852ajiyj5pfpvdp";
+          rev = "3418105fcc6a7e63f8b293341efed282480ccc22";
+          sha256 = "0nqlp7wp6c857zrm74fxdh7i1v7xakm7zgva5kcc4c8bgb8fagqc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wanderlust";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wanderlust";
           sha256 = "0lq7fvqc0isv49lcm7ql6prc3hpcj5cx4kf8f4gcnfv5k8159cq9";
           name = "wanderlust";
         };
         packageRequires = [ semi ];
         meta = {
-          homepage = "http://melpa.org/#/wanderlust";
+          homepage = "https://melpa.org/#/wanderlust";
           license = lib.licenses.free;
         };
       }) {};
@@ -58535,13 +60793,13 @@
           sha256 = "1x472s5qr6wvla7nj5i9mas8z9qhkj4zj5qghfwn5chb9igvfkif";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/warm-night-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/warm-night-theme";
           sha256 = "1nrjkrr64rry6fjya22b0lcs0f8a2ijvr87192z311y9mw5rvb29";
           name = "warm-night-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/warm-night-theme";
+          homepage = "https://melpa.org/#/warm-night-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -58556,13 +60814,13 @@
           sha256 = "0i84ndnxma8s07kf5ixqyhv5f89mzc4iymgazj5inmxhvbc7s7r2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/watch-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/watch-buffer";
           sha256 = "18sxgihmqmkrbgs66qgnrsjqbp90l93531hns31fbnif10bkx2j5";
           name = "watch-buffer";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/watch-buffer";
+          homepage = "https://melpa.org/#/watch-buffer";
           license = lib.licenses.free;
         };
       }) {};
@@ -58577,13 +60835,13 @@
           sha256 = "0zw8z2r82986likz0b0zy37bywicrvz9dizzw9p52gs1lx0is1fy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wavefront-obj-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wavefront-obj-mode";
           sha256 = "0qqismh6g2fvi45q2q52lq0n9nrh95wgamlsy5j4rx4syfgzxbrk";
           name = "wavefront-obj-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/wavefront-obj-mode";
+          homepage = "https://melpa.org/#/wavefront-obj-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -58598,31 +60856,34 @@
           sha256 = "0p7j4hvcxfyjf0na9s3xv29dvmwq82s56lincfasd0ydcpz4fbwc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wc-goal-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wc-goal-mode";
           sha256 = "0l3gh96njjldp7n13jn1zjrp17h7ivjak102j6wwspgg6v2h5419";
           name = "wc-goal-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/wc-goal-mode";
+          homepage = "https://melpa.org/#/wc-goal-mode";
           license = lib.licenses.free;
         };
       }) {};
-    wc-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    wc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "wc-mode";
-        version = "20150116.2302";
-        src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/wc-mode.el";
-          sha256 = "15wz0c0rsn02zl6yr8mpwzy2hvp2146krhdbjpq63l75w4i98w4d";
+        version = "20131121.1026";
+        src = fetchFromGitHub {
+          owner = "bnbeckwith";
+          repo = "wc-mode";
+          rev = "c465751b434b20f848f0b8fa2b4e2dec5717f217";
+          sha256 = "1j1k3ab0ymr66w23z3r4yd1g6410n5y80jfyg2f9i9rdk7vq18gd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wc-mode";
-          sha256 = "0n9hc22rp18dxx33l2l1xla78m5zjybgh3mmsp91fbdiq92b446s";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wc-mode";
+          sha256 = "191dmxfpqnj7d43cr0fhdmj5ldfs7w9zg5pb2lv9wvlfl7asdid6";
           name = "wc-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/wc-mode";
+          homepage = "https://melpa.org/#/wc-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -58637,13 +60898,13 @@
           sha256 = "0irw76inj3gdmi88hiayplv6fzjjjsvvvmr121ahh3p73mb14cjd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wcheck-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wcheck-mode";
           sha256 = "0cmdvhgax6r5svn3wkwll4j271qj70g8182c58riwnkhiajxmn3k";
           name = "wcheck-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/wcheck-mode";
+          homepage = "https://melpa.org/#/wcheck-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -58658,13 +60919,13 @@
           sha256 = "05gfc67724b0mwg8kvk3dsazx3dld50b9xjq8h1nc6jvdz3zxb9z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/weather-metno";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/weather-metno";
           sha256 = "0h7p4l8y75h27pgk45f0mk3gjd43jk8q97gjf85a9b0afd63d3f6";
           name = "weather-metno";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/weather-metno";
+          homepage = "https://melpa.org/#/weather-metno";
           license = lib.licenses.free;
         };
       }) {};
@@ -58679,76 +60940,76 @@
           sha256 = "03xcadplw1hg5hxw6bfrhw5xkkxk3i4105f114c6m3d2525jq4y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/web";
           sha256 = "0ynnmqw0vsf7wyhp9m5a05dfb19vkj8dnj5glhjdzjvg30dhjp3a";
           name = "web";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/web";
+          homepage = "https://melpa.org/#/web";
           license = lib.licenses.free;
         };
       }) {};
     web-beautify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-beautify";
-        version = "20131118.426";
+        version = "20160410.1205";
         src = fetchFromGitHub {
           owner = "yasuyk";
           repo = "web-beautify";
-          rev = "be2b9a7f510e1719396ebeab9135bc64f0785b78";
-          sha256 = "0ky2rg16xrbnsvqc6gcfhgi69fdzbx6jlsq73n8hr0n4562czhzl";
+          rev = "1ca9841e9ae951d60d591befa5efaaf839916b75";
+          sha256 = "0j8v8p4w586wz80q9scdby6b80sbxz4lqg9zb5pbr2w8bsps8n4m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/web-beautify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/web-beautify";
           sha256 = "06ky2svhca8hjgmvxrg3h6ya7prl72q1r88x967yc6b0qq3r7g0f";
           name = "web-beautify";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/web-beautify";
+          homepage = "https://melpa.org/#/web-beautify";
           license = lib.licenses.free;
         };
       }) {};
     web-completion-data = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-completion-data";
-        version = "20150623.533";
+        version = "20160318.348";
         src = fetchFromGitHub {
           owner = "osv";
           repo = "web-completion-data";
-          rev = "81482f9ff17e13906bdbd9db6bc4e1cbdc0e1870";
-          sha256 = "12j8ql9v9mrg8hlsminpm3ydcacc2fbdjsfw7l604sc3qvgza1lm";
+          rev = "c272c94e8a71b779c29653a532f619acad433a4f";
+          sha256 = "19nzjgvd2i5745283ck3k2vylrr6lnk9h3ggzwrwdhyd3m9433vm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/web-completion-data";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/web-completion-data";
           sha256 = "1zzdmhyn6bjaidk808s4pdk25a5rn4287949ps5vbpyniaf6gny9";
           name = "web-completion-data";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/web-completion-data";
+          homepage = "https://melpa.org/#/web-completion-data";
           license = lib.licenses.free;
         };
       }) {};
     web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20160212.738";
+        version = "20160424.1556";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "e82d71b4bf21da2f00120c4e00dddab9d741f35a";
-          sha256 = "1ai3chja063my6lh2q5gfsphdxhwp41jjgpsqnqh0p5dy2f1kvhx";
+          rev = "7477e48dd68ccc77c325637b8ea1bd00b1f93aba";
+          sha256 = "12bz4n7kjad3c3bc8s7hb4n46qybahjzxmc0a6vnfs6b5zggw9yn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/web-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/web-mode";
           sha256 = "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i";
           name = "web-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/web-mode";
+          homepage = "https://melpa.org/#/web-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -58763,13 +61024,13 @@
           sha256 = "0mbhyk7sgisx0l0xiz2xgy4jfbgwazlnxjvajsh4nysyig5rys05";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/web-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/web-server";
           sha256 = "1f0iyvwq1kq3zfxx2v596cmah7jfk2a04g2rjllbgxxnzwms29z3";
           name = "web-server";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/web-server";
+          homepage = "https://melpa.org/#/web-server";
           license = lib.licenses.free;
         };
       }) {};
@@ -58783,34 +61044,34 @@
           sha256 = "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/weblogger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/weblogger";
           sha256 = "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk";
           name = "weblogger";
         };
         packageRequires = [ xml-rpc ];
         meta = {
-          homepage = "http://melpa.org/#/weblogger";
+          homepage = "https://melpa.org/#/weblogger";
           license = lib.licenses.free;
         };
       }) {};
     websocket = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "websocket";
-        version = "20160124.2220";
+        version = "20160227.2322";
         src = fetchFromGitHub {
           owner = "ahyatt";
           repo = "emacs-websocket";
-          rev = "fca05614306c455af1cf783bc97021527050dcc6";
-          sha256 = "1vj10jcraxpwk896zyscpmgd55r1czzlqj1gz29skbq2zan1l042";
+          rev = "bcbd5258b2fd14e12e9a8c9d89cc2d727b5a8da0";
+          sha256 = "104c8dvyxrgyy3dwh3bmqc96c0xrvagbghwflfbhxplib22v7mly";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/websocket";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/websocket";
           sha256 = "1v8jlpahp30lihz7mdznwl6pyrbsdbqznli2wb5gfblnlxil04lg";
           name = "websocket";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/websocket";
+          homepage = "https://melpa.org/#/websocket";
           license = lib.licenses.free;
         };
       }) {};
@@ -58825,34 +61086,55 @@
           sha256 = "19hgb5knqqc4rb8yl8s604xql8ar6m9r4d379cfakn15jvwqnl98";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wedge-ws";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wedge-ws";
           sha256 = "07i2dr807np4fwq3ryxlw11vbc1sik1iv7x5740q258jyc9zfgll";
           name = "wedge-ws";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/wedge-ws";
+          homepage = "https://melpa.org/#/wedge-ws";
           license = lib.licenses.free;
         };
       }) {};
     weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }:
     melpaBuild {
         pname = "weechat";
-        version = "20151206.647";
+        version = "20160229.1448";
         src = fetchFromGitHub {
           owner = "the-kenny";
           repo = "weechat.el";
-          rev = "a191b4c52e2cca33acfdd82145da42fb2798b185";
-          sha256 = "03xsh3fc7if6rkdp2s8lmrzpqm3pjakgqi3faap44y9i84q6mc6k";
+          rev = "41f06299b2a691473b6b26c15dc46367542c79f0";
+          sha256 = "0vg3w18xj6i320jsivsml3mi1fdxr8dgxmn7qy2780ajy5ndxnw1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/weechat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/weechat";
           sha256 = "0sxrms5024bi4irv8x8s8j1zcyd62cpqm0zv4dgpm65wnpc7xc46";
           name = "weechat";
         };
         packageRequires = [ cl-lib emacs s tracking ];
         meta = {
-          homepage = "http://melpa.org/#/weechat";
+          homepage = "https://melpa.org/#/weechat";
+          license = lib.licenses.free;
+        };
+      }) {};
+    weechat-alert = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, weechat }:
+    melpaBuild {
+        pname = "weechat-alert";
+        version = "20160416.748";
+        src = fetchFromGitHub {
+          owner = "Kungi";
+          repo = "weechat-alert";
+          rev = "a8fd557c8f335322f132c1c6c08b6741d6394e2e";
+          sha256 = "1hkhim2jfdywx6ks4qfcizycp5qsx4ms6929kbgmzzb8i7j380x6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/weechat-alert";
+          sha256 = "026hkddvd4a6wy7s8s0lklw8b99fpjawdgi7amvpcrn79ylwbf22";
+          name = "weechat-alert";
+        };
+        packageRequires = [ alert cl-lib weechat ];
+        meta = {
+          homepage = "https://melpa.org/#/weechat-alert";
           license = lib.licenses.free;
         };
       }) {};
@@ -58867,13 +61149,13 @@
           sha256 = "0hc5iyjpcik996ns84akrl28scndmn0gd1zfdf1nnqq6n2m5zvgh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/weibo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/weibo";
           sha256 = "1ndgfqqb0gvy8p2fisi57s9bsa2nrnv80smg78m89i4cwagbz6yd";
           name = "weibo";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/weibo";
+          homepage = "https://melpa.org/#/weibo";
           license = lib.licenses.free;
         };
       }) {};
@@ -58888,13 +61170,13 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wgrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wgrep";
           sha256 = "09xs420lvbsmz5z28rf6f1iwa0ixkk0w24qbj6zhl9hidh4mv9y4";
           name = "wgrep";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/wgrep";
+          homepage = "https://melpa.org/#/wgrep";
           license = lib.licenses.free;
         };
       }) {};
@@ -58909,13 +61191,13 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wgrep-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wgrep-ack";
           sha256 = "03l1a681cwnn06m77xg0a547892gy8mh415v9rg3h6lkxwcld8wh";
           name = "wgrep-ack";
         };
         packageRequires = [ wgrep ];
         meta = {
-          homepage = "http://melpa.org/#/wgrep-ack";
+          homepage = "https://melpa.org/#/wgrep-ack";
           license = lib.licenses.free;
         };
       }) {};
@@ -58930,13 +61212,13 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wgrep-ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wgrep-ag";
           sha256 = "1b2mj06kws29ha7g16l5d1s3p3nwyw8rprbpaiijdk9nxqcm0a8a";
           name = "wgrep-ag";
         };
         packageRequires = [ wgrep ];
         meta = {
-          homepage = "http://melpa.org/#/wgrep-ag";
+          homepage = "https://melpa.org/#/wgrep-ag";
           license = lib.licenses.free;
         };
       }) {};
@@ -58951,13 +61233,13 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wgrep-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wgrep-helm";
           sha256 = "1hh7isc9xifkrdfw88jw0z0xmfazrbcis6d355bcaxlnjy6fzm8b";
           name = "wgrep-helm";
         };
         packageRequires = [ wgrep ];
         meta = {
-          homepage = "http://melpa.org/#/wgrep-helm";
+          homepage = "https://melpa.org/#/wgrep-helm";
           license = lib.licenses.free;
         };
       }) {};
@@ -58972,13 +61254,13 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wgrep-pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wgrep-pt";
           sha256 = "1gphdf85spsywj3s3ypb7dwrqh0zd70n2vrbgjqkbnfbwqjp9qbg";
           name = "wgrep-pt";
         };
         packageRequires = [ wgrep ];
         meta = {
-          homepage = "http://melpa.org/#/wgrep-pt";
+          homepage = "https://melpa.org/#/wgrep-pt";
           license = lib.licenses.free;
         };
       }) {};
@@ -58993,34 +61275,34 @@
           sha256 = "04w62davpqqqvympkr52bg54c2i45p09q9bs70p9ff5jvc6i3g76";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/what-the-commit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/what-the-commit";
           sha256 = "0nnyb6hq6r21wf1x3q41ab48b3dmcz5lyli771a59dk1gs8qpgak";
           name = "what-the-commit";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/what-the-commit";
+          homepage = "https://melpa.org/#/what-the-commit";
           license = lib.licenses.free;
         };
       }) {};
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "20160213.854";
+        version = "20160426.1008";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "69a1435dffc88af1b6e1e974945102b340798141";
-          sha256 = "18bq95k6zah7nn0cyjv0siyw1hrm0vpjnhh9gjmcnd2h3k8g95cc";
+          rev = "88fd7608c5201b1a36b8eed2e9cc688677e96a77";
+          sha256 = "1jh6c4mb35f2xmv70phmris9a52jvh2a1dfansksv9dw46cfkd5g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/which-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/which-key";
           sha256 = "0vqbhfzcv9m58w41zdhpiymhgl38n15c6d7ffd99narxlkckcj59";
           name = "which-key";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/which-key";
+          homepage = "https://melpa.org/#/which-key";
           license = lib.licenses.free;
         };
       }) {};
@@ -59035,13 +61317,13 @@
           sha256 = "1y75cylvqgn54h8yqahz4wi1qj5yhbs66i7x23jmbmah3q0rycab";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/whitaker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/whitaker";
           sha256 = "17fnvb3jh6fi4wddn5qnp6i6ndidg8jf9ac69q9j032c2msr07nj";
           name = "whitaker";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/whitaker";
+          homepage = "https://melpa.org/#/whitaker";
           license = lib.licenses.free;
         };
       }) {};
@@ -59056,13 +61338,13 @@
           sha256 = "0sh92g5vd518f80klvljqkjpw4ji909439dpc3sfaccf5jiwn9xn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/white-sand-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/white-sand-theme";
           sha256 = "19qsiic6yf7g60ygjmw7kg1i28nqpm3zja8cmdh33ny2bbkwxsz5";
           name = "white-sand-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/white-sand-theme";
+          homepage = "https://melpa.org/#/white-sand-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -59077,13 +61359,13 @@
           sha256 = "15yhbyyr0ksd9ziinlylyddny2szlj35x2548awj9ijnqqgjd23r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/whitespace-cleanup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/whitespace-cleanup-mode";
           sha256 = "1fhdjrxxyfx4xsgfjqq9p7vhj98wmqf2r00mv8k27vdaxwsnm5p3";
           name = "whitespace-cleanup-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/whitespace-cleanup-mode";
+          homepage = "https://melpa.org/#/whitespace-cleanup-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -59098,13 +61380,13 @@
           sha256 = "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/whole-line-or-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/whole-line-or-region";
           sha256 = "1vs2i4cy1zc6nj660i9h36jbfgc3kvqivjnzlq5zwlxk5hcibqa1";
           name = "whole-line-or-region";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/whole-line-or-region";
+          homepage = "https://melpa.org/#/whole-line-or-region";
           license = lib.licenses.free;
         };
       }) {};
@@ -59112,37 +61394,38 @@
         pname = "wid-edit-plus";
         version = "20151231.1822";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/wid-edit+.el";
+          url = "https://www.emacswiki.org/emacs/download/wid-edit+.el";
           sha256 = "18bnwwjk8jj4ns08sxhnznj0d8n1bxm2kj43r06nwyibh6ajpl7f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wid-edit+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wid-edit+";
           sha256 = "1wwrsk14hc0wrvy7hm94aw6zg50n2smlqwr6frwpi7yp8y394wiv";
           name = "wid-edit-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/wid-edit+";
+          homepage = "https://melpa.org/#/wid-edit+";
           license = lib.licenses.free;
         };
       }) {};
-    wide-column = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+    wide-column = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wide-column";
         version = "20120814.312";
-        src = fetchhg {
-          url = "https://code.google.com/p/phillord-emacs-packages/";
-          rev = "e14e67d6a5b7";
-          sha256 = "0pq9x73hrp7qwhms7x3dvjfh9imapglba9yd7nkyw68mc0b9wlnl";
+        src = fetchFromGitHub {
+          owner = "phillord";
+          repo = "wide-column";
+          rev = "0b382e7a3ceecafcea6c9e7e742fb6d11641b04b";
+          sha256 = "0bq39sfipad16skh5q26gp7z24kk93hgnaxb378dzfq1306kmn8q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wide-column";
-          sha256 = "1r9mh7756jgf1hdnprci988z07xxh2jvh8d0c1h5rmxmldlbx8az";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wide-column";
+          sha256 = "1kyyvq9fgaypvhiy9vbvr99xsac5vhylkbjsxn5fhylyc5n867sb";
           name = "wide-column";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/wide-column";
+          homepage = "https://melpa.org/#/wide-column";
           license = lib.licenses.free;
         };
       }) {};
@@ -59157,13 +61440,13 @@
           sha256 = "0036alzp66k7w3z45lj8qzh3plxv9vwcw17wibkz90mlb27vy6yz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/widget-mvc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/widget-mvc";
           sha256 = "0njzvdlxb7z480r6dvmksgivhz7rvnil517aj86qx0jbc5mr3l2f";
           name = "widget-mvc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/widget-mvc";
+          homepage = "https://melpa.org/#/widget-mvc";
           license = lib.licenses.free;
         };
       }) {};
@@ -59178,13 +61461,13 @@
           sha256 = "06qjvybf65ffrcnhhbqs333lg51fawaxnva3jvdg7zbrsv4m9acl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wiki-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wiki-nav";
           sha256 = "19mabz0y3fcqsm68ijwwbbqylxgp71anc0a31zgc1blha9jivvwy";
           name = "wiki-nav";
         };
         packageRequires = [ button-lock nav-flash ];
         meta = {
-          homepage = "http://melpa.org/#/wiki-nav";
+          homepage = "https://melpa.org/#/wiki-nav";
           license = lib.licenses.free;
         };
       }) {};
@@ -59199,13 +61482,13 @@
           sha256 = "02bczc1mb1cs1aryz5pw6cmpydjmxja2zj91893cz8rnfn1r031i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wiki-summary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wiki-summary";
           sha256 = "1hiyi3w6rvins8hfxd96bgpihxarmv192q96sadqcwshcqi14zmw";
           name = "wiki-summary";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/wiki-summary";
+          homepage = "https://melpa.org/#/wiki-summary";
           license = lib.licenses.free;
         };
       }) {};
@@ -59220,13 +61503,13 @@
           sha256 = "1n45m8xn65a2lg8ff7m6hbqnp2j49n9sfyr924laljvhjbi37knd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wilt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wilt";
           sha256 = "0nw6zr06zq60j72qfjmbqrxyz022fnisb0bsh6xmlnd1k1kqlrz6";
           name = "wilt";
         };
         packageRequires = [ dash emacs s ];
         meta = {
-          homepage = "http://melpa.org/#/wilt";
+          homepage = "https://melpa.org/#/wilt";
           license = lib.licenses.free;
         };
       }) {};
@@ -59234,17 +61517,17 @@
         pname = "wimpy-del";
         version = "20151231.1823";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/wimpy-del.el";
+          url = "https://www.emacswiki.org/emacs/download/wimpy-del.el";
           sha256 = "142ql6886h418f73h3wjblhnd16qvbap7mfr4g2yv4xybh88d4x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wimpy-del";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wimpy-del";
           sha256 = "10qw5lfq2392fr5sdz5a9bc6rvsg0j4dkrwvdhip1kqvajznw49x";
           name = "wimpy-del";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/wimpy-del";
+          homepage = "https://melpa.org/#/wimpy-del";
           license = lib.licenses.free;
         };
       }) {};
@@ -59259,13 +61542,13 @@
           sha256 = "0ib20zl8l1fs69ca9rry27qz69sgf6ws1ca5nhm5llvpkjcgv53i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/win-switch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/win-switch";
           sha256 = "1s6inp5kf763rngn58r02fd7n7z3dd55j6hb7s9dgvc856d5z3my";
           name = "win-switch";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/win-switch";
+          homepage = "https://melpa.org/#/win-switch";
           license = lib.licenses.free;
         };
       }) {};
@@ -59273,17 +61556,17 @@
         pname = "windata";
         version = "20080412.955";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/windata.el";
+          url = "https://www.emacswiki.org/emacs/download/windata.el";
           sha256 = "0dcbnqcqw7jzwwdn0rxxlixga1zw1x3a2zbpxvd90xp7zig4f0yz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/windata";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/windata";
           sha256 = "0xq51rdanq5as6kfyi97hsqmig5g35w7xv8c96bhzyflranw7jw5";
           name = "windata";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/windata";
+          homepage = "https://melpa.org/#/windata";
           license = lib.licenses.free;
         };
       }) {};
@@ -59298,13 +61581,13 @@
           sha256 = "0g69r64gyz4p3k6n8l0i1837mszycbrp23acnp0iy0y3mg67x3pn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/window-end-visible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/window-end-visible";
           sha256 = "1p78n7yysj18404cdc6vahfrzwn5pixyfnja8ch48rj4fm4jbxwq";
           name = "window-end-visible";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/window-end-visible";
+          homepage = "https://melpa.org/#/window-end-visible";
           license = lib.licenses.free;
         };
       }) {};
@@ -59319,13 +61602,13 @@
           sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/window-jump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/window-jump";
           sha256 = "1gmqb7j5fb3q3krgx7arrln5nvyg9vcpph6wlxj6py679wfa3lwr";
           name = "window-jump";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/window-jump";
+          homepage = "https://melpa.org/#/window-jump";
           license = lib.licenses.free;
         };
       }) {};
@@ -59340,13 +61623,13 @@
           sha256 = "08chi9b4bap78n069aavvx3850kabk2jflrgymy4jxv08ybqikdg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/window-layout";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/window-layout";
           sha256 = "1n4a6z00lxsffirjrmbaaw432w798b9vv34qawgn1k17y9l7gb85";
           name = "window-layout";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/window-layout";
+          homepage = "https://melpa.org/#/window-layout";
           license = lib.licenses.free;
         };
       }) {};
@@ -59354,17 +61637,17 @@
         pname = "window-number";
         version = "20140123.2102";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/window-number.el";
+          url = "https://www.emacswiki.org/emacs/download/window-number.el";
           sha256 = "1as3qbvj6d171qp2s8ycqqi16bgqm47vfk3fbxrl9szjzaxh9nw6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/window-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/window-number";
           sha256 = "1qhlsdhs40cyly87pj3f1n6ckr7z5pmhqndgay5jyxwxxdpknpap";
           name = "window-number";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/window-number";
+          homepage = "https://melpa.org/#/window-number";
           license = lib.licenses.free;
         };
       }) {};
@@ -59379,13 +61662,13 @@
           sha256 = "1f4c6q4larifm745fr8f3w8sxs1sbs77vna29rw120jz8rnlz0jy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/window-numbering";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/window-numbering";
           sha256 = "0x3n0ni16q69lfpyjz61spqghmhvc3cwa4aj80ihii3pk80f769x";
           name = "window-numbering";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/window-numbering";
+          homepage = "https://melpa.org/#/window-numbering";
           license = lib.licenses.free;
         };
       }) {};
@@ -59393,38 +61676,38 @@
         pname = "window-plus";
         version = "20151231.1824";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/window+.el";
+          url = "https://www.emacswiki.org/emacs/download/window+.el";
           sha256 = "0mqdcgk6mdxgl9if7jzgg16zqdwnsp8icrdhnygphw5m9h2dqcnm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/window+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/window+";
           sha256 = "0fhzb0ay9g9qgcaxpb2qaw15dh0lfmv3x4akyipi3zx11446d06j";
           name = "window-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/window+";
+          homepage = "https://melpa.org/#/window+";
           license = lib.licenses.free;
         };
       }) {};
     window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "window-purpose";
-        version = "20160217.1132";
+        version = "20160310.628";
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "emacs-purpose";
-          rev = "3820ff87df683a1880f5c81427d656e51b0e2865";
-          sha256 = "1m3879zr8dc73vn5l6lsmbvnz3lhial2gai4jbldjc1br9jsq1q2";
+          rev = "f00cbc038b900ff79ea64028b8d89562d3c7e334";
+          sha256 = "16471dng4iknh5wa3931iz9mm8bgd6lsrnhrjkd5ava2bv484gz6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/window-purpose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/window-purpose";
           sha256 = "1ib5ia7armghvmcw8qywcil4nxzwwakmfsp7ybawb0xr53h1w96d";
           name = "window-purpose";
         };
         packageRequires = [ cl-lib emacs imenu-list let-alist ];
         meta = {
-          homepage = "http://melpa.org/#/window-purpose";
+          homepage = "https://melpa.org/#/window-purpose";
           license = lib.licenses.free;
         };
       }) {};
@@ -59439,13 +61722,13 @@
           sha256 = "0hijf56ahbc5inn7n39nj96d948c4d05n9d5ci3g3vbl5hsyb121";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/windsize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/windsize";
           sha256 = "1xhfw77168942rcn246qndii0hv0q6vkgzj67jg4mxh8n46m50m9";
           name = "windsize";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/windsize";
+          homepage = "https://melpa.org/#/windsize";
           license = lib.licenses.free;
         };
       }) {};
@@ -59460,33 +61743,54 @@
           sha256 = "1qrbvidnmgg7jyasb28bc0z1x4a4ayzq5jmv38dsx0qs080s85wy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/winpoint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/winpoint";
           sha256 = "10ji7xd9ipmy6c2qxljqdxgqf5sb8h7lwz43mr6ixbn7v1b7pp6w";
           name = "winpoint";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/winpoint";
+          homepage = "https://melpa.org/#/winpoint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    winring = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "winring";
+        version = "20150804.1308";
+        src = fetchFromGitLab {
+          owner = "warsaw";
+          repo = "winring";
+          rev = "ad400939b420b5a7914103b7cfe3f0f6574ea48f";
+          sha256 = "1igld3zkvm3qbg1k77cn7rlxi8jqy8cvvp7z5mqwx9ifyihiwd0b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/winring";
+          sha256 = "1mgr5z4h7mf677xx8md3pqd31k17qs62z9iamfih206fcwgh24k4";
+          name = "winring";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/winring";
           license = lib.licenses.free;
         };
       }) {};
     wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wisp-mode";
-        version = "20150623.1234";
+        version = "20160419.1432";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "f41388ee99f1";
-          sha256 = "16711d1ds508nmjw81jm2cfdpqzc55gc175fkhayk0f5swlvd11m";
+          rev = "4d512e8e0e0f";
+          sha256 = "059m9w0m0rqjwdzdn4l1ib25ys0vym54lvb9bkd40rd0yqd36xfw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wisp-mode";
           sha256 = "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc";
           name = "wisp-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/wisp-mode";
+          homepage = "https://melpa.org/#/wisp-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -59501,34 +61805,34 @@
           sha256 = "188h1sy4mxzrkwi3zgiw108c5f71rkj5agdkf9yy9v8c1bkawm4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wispjs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wispjs-mode";
           sha256 = "0qzm0dcvjndasnbqpkdc56f1qv66gxv8dfgfcwq5l1bp5wyx813p";
           name = "wispjs-mode";
         };
         packageRequires = [ clojure-mode ];
         meta = {
-          homepage = "http://melpa.org/#/wispjs-mode";
+          homepage = "https://melpa.org/#/wispjs-mode";
           license = lib.licenses.free;
         };
       }) {};
     with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "with-editor";
-        version = "20160128.1401";
+        version = "20160408.401";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "with-editor";
-          rev = "580f225a6c4476feb36b707c6c705b027339717b";
-          sha256 = "0dymhkbkzicjw0379bdzbb594x5xcjbgbn428a30i2i0jwv66pfz";
+          rev = "d28d07497f67fea4c62fe7a2d3201fd86fb64fe2";
+          sha256 = "0rzq2fbz523fyy2p6ddx9iws89sfgw3pwillw8yz965f3hxx3dj3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/with-editor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/with-editor";
           sha256 = "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb";
           name = "with-editor";
         };
         packageRequires = [ async dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/with-editor";
+          homepage = "https://melpa.org/#/with-editor";
           license = lib.licenses.free;
         };
       }) {};
@@ -59543,13 +61847,13 @@
           sha256 = "1c7g8f3jr7bb0xxprammfg433gd63in5iiiaq8rjmc94h6hdcys3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/with-namespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/with-namespace";
           sha256 = "1199k1xvvv7ald6ywrh2sfpw2v42ckpcsw6mcj617bg3b5m7770i";
           name = "with-namespace";
         };
         packageRequires = [ dash loop ];
         meta = {
-          homepage = "http://melpa.org/#/with-namespace";
+          homepage = "https://melpa.org/#/with-namespace";
           license = lib.licenses.free;
         };
       }) {};
@@ -59564,13 +61868,13 @@
           sha256 = "12rfpkyjkhikjh0mihhp5h5pzbm4br68nwf8k1ja9djl77vfzv36";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wn-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wn-mode";
           sha256 = "1qy1pkfdnm4pska4cnff9cx2c812ilymajhpmsfc9jdbvhzwrwg3";
           name = "wn-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/wn-mode";
+          homepage = "https://melpa.org/#/wn-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -59585,13 +61889,13 @@
           sha256 = "1xna0cjgi9m87pws2h0cza67qbpdhjmdi5h4wv6v4g14nr26hi3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wolfram-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wolfram-mode";
           sha256 = "1bq95lamzz45macpklnq1kxw9ak4x4f41kx16f472dn650ff0zlf";
           name = "wolfram-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/wolfram-mode";
+          homepage = "https://melpa.org/#/wolfram-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -59606,13 +61910,13 @@
           sha256 = "0hacc8ha5w44cgwkipa3nwh1q5gdrcxhjkmw2gnvb1l01crgnack";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wonderland";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wonderland";
           sha256 = "1b4p49mbzqffm2b2y8sbbi56vnkxap2jscsmla9l6l8brybqjppi";
           name = "wonderland";
         };
         packageRequires = [ dash dash-functional emacs multi ];
         meta = {
-          homepage = "http://melpa.org/#/wonderland";
+          homepage = "https://melpa.org/#/wonderland";
           license = lib.licenses.free;
         };
       }) {};
@@ -59627,13 +61931,13 @@
           sha256 = "1b9pya342ikyxnlyxp86wx8xk6zcdws7jsqs7a9xk027prwkfngj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wordnut";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wordnut";
           sha256 = "1gqmjb2f9izra0x9ds1jyk7h204qsll6viwkvdnmxczyyc0wx44n";
           name = "wordnut";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/wordnut";
+          homepage = "https://melpa.org/#/wordnut";
           license = lib.licenses.free;
         };
       }) {};
@@ -59648,34 +61952,34 @@
           sha256 = "0d2byl3si2r0zh5ih6xpsgcd9r114ry0lzg5vcf31rr2gqf0j06h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wordsmith-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wordsmith-mode";
           sha256 = "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n";
           name = "wordsmith-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/wordsmith-mode";
+          homepage = "https://melpa.org/#/wordsmith-mode";
           license = lib.licenses.free;
         };
       }) {};
     worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "worf";
-        version = "20160207.848";
+        version = "20160422.916";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "worf";
-          rev = "f36755447b588b739b2bf6ab0fb5eb5f4d8db3df";
-          sha256 = "0l2n3vwk251ba06xdrs9z0bp4ligfdjd259a84ap2z3sqdfa98x4";
+          rev = "8e5c45d7435a5f15e3c03f0b09fb45808203d3d6";
+          sha256 = "1ndvwribh0i49rc6v89sfmxv5alr43995ccslviid563xn3yskii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/worf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/worf";
           sha256 = "1fkb2ddl684dijsb0cqgmfbg1nz4xv43rb7g5rah05rchy5sgkpi";
           name = "worf";
         };
         packageRequires = [ ace-link hydra swiper ];
         meta = {
-          homepage = "http://melpa.org/#/worf";
+          homepage = "https://melpa.org/#/worf";
           license = lib.licenses.free;
         };
       }) {};
@@ -59690,13 +61994,13 @@
           sha256 = "0q32z54qafj8ap3ybx82i3fm1msmzwvpxgmkaglzhi8nccgzbn2n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/workgroups";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/workgroups";
           sha256 = "1v01yr3lk6l0qn80i3r8fq3di0a8bmqjyhwx19hcgiap57xl80h8";
           name = "workgroups";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/workgroups";
+          homepage = "https://melpa.org/#/workgroups";
           license = lib.licenses.free;
         };
       }) {};
@@ -59711,13 +62015,13 @@
           sha256 = "0prj2b33h6rya7y9ff91r72bva1y6hg0sv9l11bn1gikmc6lc18n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/workgroups2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/workgroups2";
           sha256 = "0vhj6mb3iflli0l3rjlvlbxz5yk6z3ii5r71gx0m4vp4lhxncy3v";
           name = "workgroups2";
         };
         packageRequires = [ anaphora cl-lib dash f ];
         meta = {
-          homepage = "http://melpa.org/#/workgroups2";
+          homepage = "https://melpa.org/#/workgroups2";
           license = lib.licenses.free;
         };
       }) {};
@@ -59732,13 +62036,13 @@
           sha256 = "0i00xm4rynbp2v3gm6h46ajgj8h8nxnsjh6db1659b0hbpnah0ji";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/world-time-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/world-time-mode";
           sha256 = "10gdlz4l9iqw1zdlk5i3knysn36iqxdh3xabjq8kq04jkl7i36dl";
           name = "world-time-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/world-time-mode";
+          homepage = "https://melpa.org/#/world-time-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -59748,18 +62052,18 @@
         version = "20140117.120";
         src = fetchFromGitHub {
           owner = "rejeep";
-          repo = "wrap-region";
+          repo = "wrap-region.el";
           rev = "0eff3165db36464d28ed303ab25b715307cbdee0";
           sha256 = "09fzbbrdgq19c3gylj4i0c5g070k65w943wz28mzis8b403vzh3n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wrap-region";
-          sha256 = "0mby3m49vm2pw127divspgivqam27zd4r70wx5ra05xwfxywaibq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wrap-region";
+          sha256 = "058518smxj3j3mr6ljzh7c9x5g23d24104p58sl9nhpw0cq9k28i";
           name = "wrap-region";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/wrap-region";
+          homepage = "https://melpa.org/#/wrap-region";
           license = lib.licenses.free;
         };
       }) {};
@@ -59774,34 +62078,34 @@
           sha256 = "1nnjn1r669hvvzfycllwap4w04m8rfsk4nzcg8057m1f263kj31b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/writegood-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/writegood-mode";
           sha256 = "1lxammisaj04g5vr5lwms64ywf39w8knrq72x4i94wwzwx5ywi1d";
           name = "writegood-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/writegood-mode";
+          homepage = "https://melpa.org/#/writegood-mode";
           license = lib.licenses.free;
         };
       }) {};
     writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }:
     melpaBuild {
         pname = "writeroom-mode";
-        version = "20151111.301";
+        version = "20160413.1433";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "writeroom-mode";
-          rev = "57aeef137b04134fe05c7e701e42b05f3edbcc30";
-          sha256 = "0an36zra25r0l482irxbwrq90fd3rik53yqw3gccjkgdf3lpkc4x";
+          rev = "aed9803e8eb7178361fbac75df98c19a45eff4ee";
+          sha256 = "11a3h5v7knj8y360cxin59c1ipd9y4qsqlanrw69yb5k4816ayyr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/writeroom-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/writeroom-mode";
           sha256 = "1kpsrp3agw8bg3qbf5rf5k1a7ww30q5xsa8z5ywxajsaywjzx1bk";
           name = "writeroom-mode";
         };
         packageRequires = [ emacs visual-fill-column ];
         meta = {
-          homepage = "http://melpa.org/#/writeroom-mode";
+          homepage = "https://melpa.org/#/writeroom-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -59816,34 +62120,55 @@
           sha256 = "1x2ybnv0h52i24vd1n95s4vglc6p79cyxh91a20cwza34svhz152";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ws-butler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ws-butler";
           sha256 = "072k67z2lx0ampwzdiszi64xs0w6frp4nbmrd2r0wpx0pd211vbn";
           name = "ws-butler";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ws-butler";
+          homepage = "https://melpa.org/#/ws-butler";
           license = lib.licenses.free;
         };
       }) {};
     wsd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wsd-mode";
-        version = "20160213.1417";
+        version = "20160317.330";
         src = fetchFromGitHub {
           owner = "josteink";
           repo = "wsd-mode";
-          rev = "6909b4ea3b82e36819f6cd42ac2330af6c8e54e6";
-          sha256 = "1jxpcfslball488lcfjl5qlipwdcfbniz531i6nc87vqp9rf7q1q";
+          rev = "53cda783dcb2198be8bbe72f31d37a2fa93e024c";
+          sha256 = "1qzz5z1n0a47k6lw31x7yc4vqq90f70jdb4z1vic7yx5ypfar697";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wsd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wsd-mode";
           sha256 = "07vclmnj18wx9wlrcnsl99f9jlk3sb9g6pcdv8x1smk84gccpakc";
           name = "wsd-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/wsd-mode";
+          homepage = "https://melpa.org/#/wsd-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wttrin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }:
+    melpaBuild {
+        pname = "wttrin";
+        version = "20160414.1037";
+        src = fetchFromGitHub {
+          owner = "bcbcarl";
+          repo = "emacs-wttrin";
+          rev = "e2a02cc58920a4f34ba01f7015c9e6bfcce51f61";
+          sha256 = "1bq552mxlhq9sd2c9p2yir52p0jnfdav6vcdgs3xklcf89b1403m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wttrin";
+          sha256 = "0msp8lja9nz6khz3dkasv8hnhkaayqxd7m58kma03hpkcjxnaxil";
+          name = "wttrin";
+        };
+        packageRequires = [ emacs xterm-color ];
+        meta = {
+          homepage = "https://melpa.org/#/wttrin";
           license = lib.licenses.free;
         };
       }) {};
@@ -59858,13 +62183,13 @@
           sha256 = "0ba193ilqmp7l35hhzfym4kvbnj9h57m8mwsxdj6rdj2cwrifx8r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wwtime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wwtime";
           sha256 = "0n37k23lkjgaj9wxnr41yk3mwvy62mc9im5l86czqmw5gy4l63ic";
           name = "wwtime";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/wwtime";
+          homepage = "https://melpa.org/#/wwtime";
           license = lib.licenses.free;
         };
       }) {};
@@ -59879,13 +62204,13 @@
           sha256 = "0i7bgbhk4lvdkdjh6z4xs69mbdi49985j82cjikzyyskjcqd2klq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/x-dict";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/x-dict";
           sha256 = "1w51xhiaxk50wlch262dxs2ybjvjj8qzx01xlgiimvggb8h5arlc";
           name = "x-dict";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/x-dict";
+          homepage = "https://melpa.org/#/x-dict";
           license = lib.licenses.free;
         };
       }) {};
@@ -59900,34 +62225,34 @@
           sha256 = "0lssri13f3c7drkirh3cyxzxm3lix5myfrqb9iy178nybrifgf8l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/x86-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/x86-lookup";
           sha256 = "1clv1npvdkzsy0a08xrb880yflwzl4d5cc2c5xrs7b837mqpj8hd";
           name = "x86-lookup";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/x86-lookup";
+          homepage = "https://melpa.org/#/x86-lookup";
           license = lib.licenses.free;
         };
       }) {};
     xah-elisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-elisp-mode";
-        version = "20160211.1510";
+        version = "20160409.527";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-elisp-mode";
-          rev = "c52e643ed1b7991211191ba4eab390019530860a";
-          sha256 = "0rb4cshfcicazd35dph3lws22yfvnp6cxww2hy7yl9878m53jxak";
+          rev = "4b36e58e1e6268b5b3a3f9c76747860d20518fec";
+          sha256 = "1x3h69c2n82db8jkmd66c5i3x4rhmas5difm73msbx198w5i6lm7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xah-elisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xah-elisp-mode";
           sha256 = "0cl07hw1hd3hj7wrzkh20m8vcs7mqsajxjmnlbnk2yg927yyijij";
           name = "xah-elisp-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xah-elisp-mode";
+          homepage = "https://melpa.org/#/xah-elisp-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -59942,34 +62267,34 @@
           sha256 = "00ydkpkdgnj9v6dkf4pw9wj5skbq2v5y71xsr37d1fqmdzsb03g7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xah-find";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xah-find";
           sha256 = "1d3x9yhm7my3yhvgqnjxr2v28g5w1h4ri40sy6dqcx09bjf3jhyq";
           name = "xah-find";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xah-find";
+          homepage = "https://melpa.org/#/xah-find";
           license = lib.licenses.free;
         };
       }) {};
     xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20160214.205";
+        version = "20160425.813";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "0300a8f05b39c61083797c504f79a454c9559202";
-          sha256 = "0d6byc87bkadw8yssjpkw7mp7lm4bc290vh5skihgk5mphn8mc9i";
+          rev = "9a0ae74169a423132c3af49e175a701a02cf8711";
+          sha256 = "11cc208b29hcknnza0yvkfp7889ni5vbihk0ac922j17xf413lah";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xah-fly-keys";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xah-fly-keys";
           sha256 = "0bzfz8q7yd1jai0pgngxwjp82nsfx5ivn24cb20vc5r8hhzj17cs";
           name = "xah-fly-keys";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xah-fly-keys";
+          homepage = "https://melpa.org/#/xah-fly-keys";
           license = lib.licenses.free;
         };
       }) {};
@@ -59984,13 +62309,13 @@
           sha256 = "0abknznp2si80zq5pc0hqr3w3pca2vrv3msm6jz1s8l8zi2hwx72";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xah-get-thing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xah-get-thing";
           sha256 = "0m61bmfgqy19h4ivw655mqj547ga8hrpaswcp48hx00hx8mqzcvg";
           name = "xah-get-thing";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xah-get-thing";
+          homepage = "https://melpa.org/#/xah-get-thing";
           license = lib.licenses.free;
         };
       }) {};
@@ -60005,13 +62330,13 @@
           sha256 = "1adyww9jbjvcn9p3z9ggs3gijdmnab275a81ch8sir1xp59pfm3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xah-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xah-lookup";
           sha256 = "0z0h1myw6wmybyd0z2lw4l59vgm6q6kh492q77kf3s0fssc0facc";
           name = "xah-lookup";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xah-lookup";
+          homepage = "https://melpa.org/#/xah-lookup";
           license = lib.licenses.free;
         };
       }) {};
@@ -60026,13 +62351,13 @@
           sha256 = "1wsdnqpfgk7f1dbz90k6sf13hjh0x3xjjgappfkmhcy36g7sshl7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xah-math-input";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xah-math-input";
           sha256 = "1afikjk46sjf97fb5fc8h63h7b9af010wxhsbpnmabsb4j72rx5a";
           name = "xah-math-input";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xah-math-input";
+          homepage = "https://melpa.org/#/xah-math-input";
           license = lib.licenses.free;
         };
       }) {};
@@ -60047,13 +62372,13 @@
           sha256 = "18msj947w6msma6zm23slk2v0h92n5ych5j12zbzkzzir49sffql";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xah-replace-pairs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xah-replace-pairs";
           sha256 = "0r4aq9davh3ypzcjixr3aw9g659dhiblwbmcyhm8iqhkavcpqr1x";
           name = "xah-replace-pairs";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xah-replace-pairs";
+          homepage = "https://melpa.org/#/xah-replace-pairs";
           license = lib.licenses.free;
         };
       }) {};
@@ -60068,13 +62393,13 @@
           sha256 = "0dc74kqwi0hpihdbb9a9lrqb7823w6j96mah47zyd9d4rd3vx850";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xahk-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xahk-mode";
           sha256 = "1bs12z7lnqlhm44hq0l98d0ka1bjgvm2yv97yivaj9akd53znca9";
           name = "xahk-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xahk-mode";
+          homepage = "https://melpa.org/#/xahk-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -60089,13 +62414,13 @@
           sha256 = "08hzsqf4gawcr9q2h3rxrf1igvdja84aaa821657k04kdq4dpcbj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xbm-life";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xbm-life";
           sha256 = "1pglxjd4cs630sayx17ai1xflpbyj3hry3156682bgwhqs1vw68q";
           name = "xbm-life";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xbm-life";
+          homepage = "https://melpa.org/#/xbm-life";
           license = lib.licenses.free;
         };
       }) {};
@@ -60110,34 +62435,34 @@
           sha256 = "0p8cs5mh6ab6m0ff6ljs2vd1g8xx0jgc9ybh0j4aj2zcp22avz2n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xcscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xcscope";
           sha256 = "06xh29cm5v3b5xwj32y0i0h0kvvy995840db4hvab2wn9jw68m8w";
           name = "xcscope";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xcscope";
+          homepage = "https://melpa.org/#/xcscope";
           license = lib.licenses.free;
         };
       }) {};
     xkcd = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "xkcd";
-        version = "20151016.2353";
+        version = "20160419.630";
         src = fetchFromGitHub {
           owner = "vibhavp";
           repo = "emacs-xkcd";
-          rev = "8f0009f15926f37f2ea02471425ab6dbac00e50d";
-          sha256 = "0gd7ag7cqzkfk8y9rbkrjpnyjnwad5bx86a30vxamd1ql8xp57ap";
+          rev = "2c538d41a9728939cc5e8292faa78ed50997877d";
+          sha256 = "0p9p3w8i5w1pzh3y3yxz0rg5gywfq4m5anbiyrdn84vdd42jij4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xkcd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xkcd";
           sha256 = "1r88yhs8vnkak8xl16vw3xdpm7ncz4ydkml8932bqk8xix8l8f0w";
           name = "xkcd";
         };
         packageRequires = [ json ];
         meta = {
-          homepage = "http://melpa.org/#/xkcd";
+          homepage = "https://melpa.org/#/xkcd";
           license = lib.licenses.free;
         };
       }) {};
@@ -60152,13 +62477,13 @@
           sha256 = "0c30xh7qxg3y2p5jqkbssz5z53rx0yp64qqyy9f87qzgkcd2jd8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xml+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xml+";
           sha256 = "0xgqyfdn6kkp89zj4h54r009a44sbff0nrhh582zw5rlklypwdz1";
           name = "xml-plus";
         };
         packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/xml+";
+          homepage = "https://melpa.org/#/xml+";
           license = lib.licenses.free;
         };
       }) {};
@@ -60173,13 +62498,13 @@
           sha256 = "0z3yd3dzcsd7584jchv9q55fx04ig4yjzp8ay2pa112lykv4jxxd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xml-quotes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xml-quotes";
           sha256 = "1lmafa695xkhd90k6yiv8a57ch1jx33l1zpm39z0kj546mn6y8aq";
           name = "xml-quotes";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xml-quotes";
+          homepage = "https://melpa.org/#/xml-quotes";
           license = lib.licenses.free;
         };
       }) {};
@@ -60194,13 +62519,13 @@
           sha256 = "0kkjfg1l2wg3d5wrgkwnww4d3fca0xpd3k5z9j9gwmjnkxqd95ca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xml-rpc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xml-rpc";
           sha256 = "14r6xgnpqsb2jlv52vgrhqf3qw8a6gmdyap3ylhilyxw71lxf1js";
           name = "xml-rpc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xml-rpc";
+          homepage = "https://melpa.org/#/xml-rpc";
           license = lib.licenses.free;
         };
       }) {};
@@ -60215,34 +62540,55 @@
           sha256 = "1nk50iwb6az01r1s2l9wwdqrz3k4ywr00q0zmd9vvi3y9v4cjah0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xmlgen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xmlgen";
           sha256 = "1mvnjqb9zxf9ml605w10v4cbbajwv9if93apr4xrh79l00scj383";
           name = "xmlgen";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xmlgen";
+          homepage = "https://melpa.org/#/xmlgen";
           license = lib.licenses.free;
         };
       }) {};
     xmlunicode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xmlunicode";
-        version = "20160130.1109";
+        version = "20160319.1112";
         src = fetchFromGitHub {
           owner = "ndw";
           repo = "xmlunicode";
-          rev = "b3ccf49b9e344748d72cccb3134e7c49d250645f";
-          sha256 = "1k5zilvq64xjhy9lrwf9ss0y7j0v9ppg10xzcrj1hy6jbx54nn8j";
+          rev = "f5d185da46414c0509ebd0aa0fab416becf94612";
+          sha256 = "178bdfwiinhf98qm88ivmgy6rd0qjx5gnckkclanybva0r8l6832";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xmlunicode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xmlunicode";
           sha256 = "1ylpvx2p5l863r9qv9jdsm9rbv989c8xn0zpjl8zkcfxqxix4h4p";
           name = "xmlunicode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xmlunicode";
+          homepage = "https://melpa.org/#/xmlunicode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xo";
+        version = "20160403.146";
+        src = fetchFromGitHub {
+          owner = "j-em";
+          repo = "xo-emacs";
+          rev = "72fcd867cfa332fdb82f732925cf8977e690af78";
+          sha256 = "0761amc73mbgaydp3iyfzgyjxp77yk440s24h69hvk87c5vn1cz3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xo";
+          sha256 = "0kpbnxh8sa2dk8anrvgc7d39qap13pyjxh154gpm8xdb9zhfwl25";
+          name = "xo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/xo";
           license = lib.licenses.free;
         };
       }) {};
@@ -60257,13 +62603,13 @@
           sha256 = "09fpxr55b2adqmca8xhpy8z5cify5091fjdjyxjd1jh5wdp1658v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xquery-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xquery-mode";
           sha256 = "0b5k2ihbjm5drv4lf64ap31yj873x1fcq85y6yq1ayahn6s52rql";
           name = "xquery-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xquery-mode";
+          homepage = "https://melpa.org/#/xquery-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -60278,55 +62624,76 @@
           sha256 = "1yy759qc4njc8bqh8hmgc0mq5vk5spz5syxgflqhjijk8nrvyfgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xquery-tool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xquery-tool";
           sha256 = "069injmvv9zzcbqbms94qx5wjj740jnik6sf3b4xjhln7z1yskp0";
           name = "xquery-tool";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xquery-tool";
+          homepage = "https://melpa.org/#/xquery-tool";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xref-js2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xref-js2";
+        version = "20160421.403";
+        src = fetchFromGitHub {
+          owner = "NicolasPetton";
+          repo = "xref-js2";
+          rev = "9342014d3b86fcadc13469cf78404712c3178d63";
+          sha256 = "1mppy0fk4qrhvjzapz95jiiki2bpijvxalrw0h81wqzf62d259va";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xref-js2";
+          sha256 = "1mfyszdi1wx2lqd9fyqm0ra227dcsjs8asc1dw2li0alwh7n4xs3";
+          name = "xref-js2";
+        };
+        packageRequires = [ emacs js2-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/xref-js2";
           license = lib.licenses.free;
         };
       }) {};
     xresources-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xresources-theme";
-        version = "20141219.1117";
+        version = "20160331.902";
         src = fetchFromGitHub {
           owner = "CQQL";
           repo = "xresources-theme";
-          rev = "4842144f9f83e9d6f71f5ba2fd3abdcf6887de8f";
-          sha256 = "1n3biybylvq5c1lpf7zsjsgdrg7mzrhkaw251fp8qmsss0s3sv4g";
+          rev = "09a0bfc1684161dd1cdc899c027808a99646a652";
+          sha256 = "171vffga2yzxqmgh77vila6x96bz1i6818f1pfaxblw1hz2ga341";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xresources-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xresources-theme";
           sha256 = "0spqa3xn3p2lmvlc5hdn7prq4vb70nkyrryx1kavha9igzhlyaga";
           name = "xresources-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xresources-theme";
+          homepage = "https://melpa.org/#/xresources-theme";
           license = lib.licenses.free;
         };
       }) {};
     xterm-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xterm-color";
-        version = "20150823.846";
+        version = "20160401.2225";
         src = fetchFromGitHub {
           owner = "atomontage";
           repo = "xterm-color";
-          rev = "1bc4ddb0e1bf7562cbf4b6b3bdd2ce3f9b596b39";
-          sha256 = "064fpjcj1sp8m5x106dw6zgy0p0rfd5fxcx57h533q263l7z00ny";
+          rev = "8e8bfca742d21f3b9bc76089cbd3aa736e86a46a";
+          sha256 = "19l9w373ysh1avakz4pmisn0d2mpym8pdxgz7k0m1bbqqzf2war7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xterm-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xterm-color";
           sha256 = "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj";
           name = "xterm-color";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xterm-color";
+          homepage = "https://melpa.org/#/xterm-color";
           license = lib.licenses.free;
         };
       }) {};
@@ -60341,13 +62708,13 @@
           sha256 = "10dsf2lgjjqvjzzyc5kwggfk511v8ypmx173bixry3djcc15dsf3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xterm-frobs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xterm-frobs";
           sha256 = "02v8kh2g6a2fpxy911630zsg985hyakvqbd6v2xyfbz0vnd6i1lf";
           name = "xterm-frobs";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xterm-frobs";
+          homepage = "https://melpa.org/#/xterm-frobs";
           license = lib.licenses.free;
         };
       }) {};
@@ -60362,13 +62729,13 @@
           sha256 = "1jwimgglhqgp259wjqmpp1wi9j51qxcl1l356jlhjnfp1zh1ihmg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xterm-keybinder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xterm-keybinder";
           sha256 = "1n0zp1mc7x7z0671lf7p9r4qxic90bkf5q3zwz4vinpiw2qh88lz";
           name = "xterm-keybinder";
         };
         packageRequires = [ cl-lib emacs let-alist ];
         meta = {
-          homepage = "http://melpa.org/#/xterm-keybinder";
+          homepage = "https://melpa.org/#/xterm-keybinder";
           license = lib.licenses.free;
         };
       }) {};
@@ -60383,13 +62750,13 @@
           sha256 = "06cbr7y3wp7j8lnbys57g6md4fdx9xhlnxl73pj7xpfa5i2x9ifl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xterm-title";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xterm-title";
           sha256 = "08z8qg9x6vjpybbhxa8x46qnp3951miz1264fivg776y76cg3ck6";
           name = "xterm-title";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xterm-title";
+          homepage = "https://melpa.org/#/xterm-title";
           license = lib.licenses.free;
         };
       }) {};
@@ -60404,13 +62771,13 @@
           sha256 = "09mn8s7gzzxgs7kskld8l68zjrcgnvml3fqj69wrfq7b1g62hhxy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xtest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xtest";
           sha256 = "1vbs4sb4frzg8d3l96ip9cc6lc86nbj50vpdfqazvxmdfd1sg4i7";
           name = "xtest";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/xtest";
+          homepage = "https://melpa.org/#/xtest";
           license = lib.licenses.free;
         };
       }) {};
@@ -60425,13 +62792,13 @@
           sha256 = "0f6pvwzhncycw8gnjy24h6q1qglfgvdjfs5dzqx9s43j3yg63lzm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yabin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yabin";
           sha256 = "1kmpm2rbb43c9cgp44qwd24d90mj48k3gyiir3vb6zf6k3syrc17";
           name = "yabin";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/yabin";
+          homepage = "https://melpa.org/#/yabin";
           license = lib.licenses.free;
         };
       }) {};
@@ -60446,55 +62813,55 @@
           sha256 = "0b252m7vb5kg5bjhpgag6nhm32cac8dhlmy4pr0kpa860lh2xlz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yafolding";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yafolding";
           sha256 = "1z70ismfwmh9a83a7h5lbhw7iywfib5fis7y8gx8020wfjq9g2yq";
           name = "yafolding";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/yafolding";
+          homepage = "https://melpa.org/#/yafolding";
           license = lib.licenses.free;
         };
       }) {};
     yagist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yagist";
-        version = "20150425.751";
+        version = "20160418.8";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "yagist.el";
-          rev = "ab19ce3607873a6c523f87fffd653a1e7fbb66c2";
-          sha256 = "0sqwz37y6mpc378pp8p6bq9fmhgwfr6rlbngiwgvsp30iq6vjsn4";
+          rev = "dcdbd84f348414815d02f3da8a6ee0ac271632d4";
+          sha256 = "0lgy9b893mq4harxh80n0n2zia00s2c6ga8p654q563idrskgz17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yagist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yagist";
           sha256 = "1mz86fq0pb4w54c66vd19m2492mkrzq2qi6ssnn2xwmn8vv02wdd";
           name = "yagist";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/yagist";
+          homepage = "https://melpa.org/#/yagist";
           license = lib.licenses.free;
         };
       }) {};
     yahoo-weather = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yahoo-weather";
-        version = "20160111.639";
+        version = "20160426.729";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "yahoo-weather-mode";
-          rev = "593695c4ed2d53948ff8586afd3267373c1879f2";
-          sha256 = "030dcp5iq0jvr2m6lb5ar7bqzp1l7f835yl7d7fa8zp46fc3a6d5";
+          rev = "f6dbc133f3d8685dcb7851a182da5cb95b041c07";
+          sha256 = "1r29x9gkj5cfcg2ac4j5vw55n1niainhl2316mfq0zpxjjp2bhwq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yahoo-weather";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yahoo-weather";
           sha256 = "1kzi6yp186wfcqh5q1v9vw6b1h8x89sba6wlnacfpjbarwapfif0";
           name = "yahoo-weather";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/yahoo-weather";
+          homepage = "https://melpa.org/#/yahoo-weather";
           license = lib.licenses.free;
         };
       }) {};
@@ -60509,34 +62876,34 @@
           sha256 = "12dd4ahg9f1493982d49g7sxx0n6ss4xcfhxwzyaqxckwzfranp0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yalinum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yalinum";
           sha256 = "0jzsvkcvy2mkfmri4bzgrlgw2y0z3hxz44md83s5zmw09mshkahf";
           name = "yalinum";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/yalinum";
+          homepage = "https://melpa.org/#/yalinum";
           license = lib.licenses.free;
         };
       }) {};
     yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yaml-mode";
-        version = "20160220.540";
+        version = "20160426.338";
         src = fetchFromGitHub {
           owner = "yoshiki";
           repo = "yaml-mode";
-          rev = "c7573962216f79e93642b91e7aa8552f7be46b41";
-          sha256 = "1l60zz9yii5z6aqhysjccmsdw0zaxpdwxlz57mkrggh54p1jnazv";
+          rev = "e73adcebb1689a4a878dd6d56f3a52cd4ed04c4c";
+          sha256 = "03hcm3rv0na79dbivycg78bp08zfxfrgz8rf0i1wdk5sc9hzg105";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yaml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yaml-mode";
           sha256 = "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc";
           name = "yaml-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/yaml-mode";
+          homepage = "https://melpa.org/#/yaml-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -60551,34 +62918,34 @@
           sha256 = "1xgqqgg4q3hrhiap8gmr8iifdr1mg4dl0j236b6alhrgmykbhimy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yaml-tomato";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yaml-tomato";
           sha256 = "0bja213l6mvh8ap5d04x8dik1z9px5jr52zpw1py7shw5asvp5s2";
           name = "yaml-tomato";
         };
         packageRequires = [ s ];
         meta = {
-          homepage = "http://melpa.org/#/yaml-tomato";
+          homepage = "https://melpa.org/#/yaml-tomato";
           license = lib.licenses.free;
         };
       }) {};
     yandex-weather = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yandex-weather";
-        version = "20150821.614";
+        version = "20160311.1437";
         src = fetchFromGitHub {
           owner = "abstractionlayer";
           repo = "yandex-weather.el";
-          rev = "41cb91bd1e5aa0e4a317a99e88742631f487ab37";
-          sha256 = "17ymdqi19bs9xn0pxylzv7m99f7cn14hx73xljm6bg0qfb8m53f3";
+          rev = "6f823fd9e04ff9efb2aa65f333079e9f7e6e5b28";
+          sha256 = "0pw44klm8ldsdjphybzkknv8yh23xhzwg76w3d9cqs79jkd0rw8w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yandex-weather";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yandex-weather";
           sha256 = "11hspadm520cjlv1wk2bdpzg7hg2g0chbh26qijj9jgvca26x0md";
           name = "yandex-weather";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/yandex-weather";
+          homepage = "https://melpa.org/#/yandex-weather";
           license = lib.licenses.free;
         };
       }) {};
@@ -60586,38 +62953,38 @@
         pname = "yaoddmuse";
         version = "20150712.621";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/yaoddmuse.el";
+          url = "https://www.emacswiki.org/emacs/download/yaoddmuse.el";
           sha256 = "0svy6zp5f22z7mblap4psh7h4i52d1qasi9yk22l39przhsrjar4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yaoddmuse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yaoddmuse";
           sha256 = "07sqcsad3k23agwwws7hxnc46cp9mkc9qinzva7qvjgs8pa9dh54";
           name = "yaoddmuse";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/yaoddmuse";
+          homepage = "https://melpa.org/#/yaoddmuse";
           license = lib.licenses.free;
         };
       }) {};
     yard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yard-mode";
-        version = "20140816.1244";
+        version = "20160310.1050";
         src = fetchFromGitHub {
           owner = "pd";
           repo = "yard-mode.el";
-          rev = "aa303f6f1c348cbee1dbab3be2ad04b0aaa590cf";
-          sha256 = "06mjjxa0blgxd8dbahgyni3b1rscbwjpxby5abrgfbb0fvs2bnfa";
+          rev = "78792f6a6fbff4f1bc955f494fdb11378e7f8095";
+          sha256 = "096ay60hrd14b459cyxxcf9g7i1ivsxg6yhc0q162px6kl1x0m2y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yard-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yard-mode";
           sha256 = "0jmlcba8qapjwaaliz9gzs99if3wglkhmlpjzcdy3icx18sw8kzx";
           name = "yard-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/yard-mode";
+          homepage = "https://melpa.org/#/yard-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -60632,13 +62999,13 @@
           sha256 = "0w9a6j0ndpfwaz1g974vv5jqgbzxw26l19kq51j3ah73063cavpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yari";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yari";
           sha256 = "0sch9x899mzwdacg55w5j583k2r4vn71ish7gqpghd7cj13ii66h";
           name = "yari";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/yari";
+          homepage = "https://melpa.org/#/yari";
           license = lib.licenses.free;
         };
       }) {};
@@ -60653,34 +63020,34 @@
           sha256 = "08wa97hsfy1rc8ify3rz2ncfij4z6l16p4s20naygqccjv3ir6z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yascroll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yascroll";
           sha256 = "11g7wn4hgdwnx3n7ra0sh8gk6rykwvrg9g2cihvcv7mjbqgcv53f";
           name = "yascroll";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/yascroll";
+          homepage = "https://melpa.org/#/yascroll";
           license = lib.licenses.free;
         };
       }) {};
-    yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20160131.1148";
+        version = "20160423.1536";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "yasnippet";
-          rev = "88b79505547be31f534a03a871ac98788e1455e3";
-          sha256 = "0vpsicap1sk2i78y4ysszhksinh6qvic709n3gbzaz2d4mm0bsya";
+          rev = "7f03a2319eba95a5117f0424df6990e4d02741a8";
+          sha256 = "1iy2rmsfyaln7c4vn63wr9k6w4v5r4mwvanx15a4k7bha9w97w2v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yasnippet";
           sha256 = "1j6hcpzxljz1axh0xfbwr4ysbixkwgxawsvsgicls8r8kl2xvjvf";
           name = "yasnippet";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/yasnippet";
+          homepage = "https://melpa.org/#/yasnippet";
           license = lib.licenses.free;
         };
       }) {};
@@ -60695,13 +63062,13 @@
           sha256 = "1gxn302kwjfq6s6rxxvy0jpp37r2vh4ry899giqbdfr0cc1qnw0c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yatemplate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yatemplate";
           sha256 = "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q";
           name = "yatemplate";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/yatemplate";
+          homepage = "https://melpa.org/#/yatemplate";
           license = lib.licenses.free;
         };
       }) {};
@@ -60714,13 +63081,13 @@
           sha256 = "08iwfpsjs36pqr2l85avxhsjx8z0sdfw8cqwwf3brn7i4x67f7z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yatex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yatex";
           sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
           name = "yatex";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/yatex";
+          homepage = "https://melpa.org/#/yatex";
           license = lib.licenses.free;
         };
       }) {};
@@ -60735,13 +63102,13 @@
           sha256 = "0nqyn1b01v1qxv7rcf46qypca61lmpm8d7kqv63jazw3n05qdnj8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yaxception";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yaxception";
           sha256 = "18n2kjbgfhkhcwigxmv8dk72jp57vsqqd20lc26v5amx6mrhgh58";
           name = "yaxception";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/yaxception";
+          homepage = "https://melpa.org/#/yaxception";
           license = lib.licenses.free;
         };
       }) {};
@@ -60756,34 +63123,43 @@
           sha256 = "0znchya89zzk30mwl4qfm0q9sfa5m3jspapb892ydj0mck5n4nyj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ycm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ycm";
           sha256 = "16ahgvi85ddjlrjxld14zm2vvam0m89mwskizjd5clcz0snk51sc";
           name = "ycm";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ycm";
+          homepage = "https://melpa.org/#/ycm";
           license = lib.licenses.free;
         };
       }) {};
-    ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, popup, request, request-deferred }:
     melpaBuild {
         pname = "ycmd";
-        version = "20160215.144";
+        version = "20160426.634";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "61601543ca9b70f6a92a87fb9057af6143ba5ed1";
-          sha256 = "10j8zv5m36400wwkwbncqnsm616v59ww0bbkhrxcf6mn56iq8162";
+          rev = "1984e49b7894b77438f2257d8058900ab82109e3";
+          sha256 = "0dwii83m6cngsnyhzhnmv53p588d4pkkybmcmsj6gsar157l4azi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ycmd";
-          sha256 = "06psmcr5132vn72l0amzj14dy43aradnbmlvvms55srvici6r60q";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ycmd";
+          sha256 = "1mg2b0wgfimrc0hp84q7lc654z2hysrhbzswpq1x812hgq895v8p";
           name = "ycmd";
         };
-        packageRequires = [ cl-lib dash deferred emacs f popup ];
+        packageRequires = [
+          cl-lib
+          dash
+          deferred
+          emacs
+          let-alist
+          popup
+          request
+          request-deferred
+        ];
         meta = {
-          homepage = "http://melpa.org/#/ycmd";
+          homepage = "https://melpa.org/#/ycmd";
           license = lib.licenses.free;
         };
       }) {};
@@ -60798,13 +63174,34 @@
           sha256 = "1fyvvkx6pa41bcr9cyh4yclwdzc5bs742s9fxr6wb4a5scq3hg9m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yesql-ghosts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yesql-ghosts";
           sha256 = "1hxzbnfd15f0ifdqjbw9nhxd0z46x705v2bc0xl71nav78fgpswf";
           name = "yesql-ghosts";
         };
         packageRequires = [ cider dash s ];
         meta = {
-          homepage = "http://melpa.org/#/yesql-ghosts";
+          homepage = "https://melpa.org/#/yesql-ghosts";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yoshi-theme";
+        version = "20160304.1718";
+        src = fetchFromGitHub {
+          owner = "ryuslash";
+          repo = "yoshi-theme";
+          rev = "8e8f2f5f37c071bff36e68c83d9ca2ef80575995";
+          sha256 = "1a40kpl5b4sar15s7l8vkfm2iyr5ma3c1n6w5r4z37w5kn59bkk5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yoshi-theme";
+          sha256 = "1kzdjs3rzg9rxrjgsk0wk75rwvbip6ixg1apcxv2c1a6biqqf2hv";
+          name = "yoshi-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/yoshi-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -60819,13 +63216,13 @@
           sha256 = "0016qff7hdnd0xkyhxakfzzscwlwkpzppvc4wxfw0iacpjkz1fnr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/youdao-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/youdao-dictionary";
           sha256 = "1qfk7s18br9jask1bpida0cjxks098qpz0ssmw8misi3bjax0fym";
           name = "youdao-dictionary";
         };
         packageRequires = [ chinese-word-at-point emacs names popup ];
         meta = {
-          homepage = "http://melpa.org/#/youdao-dictionary";
+          homepage = "https://melpa.org/#/youdao-dictionary";
           license = lib.licenses.free;
         };
       }) {};
@@ -60840,13 +63237,13 @@
           sha256 = "1k7m3xk5ksbr2s3ypz5yqafz9sfav1m0qk2jz1xyi3fdaw2j0w2z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/z3-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/z3-mode";
           sha256 = "183lzhgjj480ca2939za3rlnsbfn24mgi501n66h5wim950v7vgd";
           name = "z3-mode";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/z3-mode";
+          homepage = "https://melpa.org/#/z3-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -60861,33 +63258,33 @@
           sha256 = "16k8hha798hrs0qfdwqdr6n7y13ffgm6jj3msrk0zl8117jhaany";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zeal-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zeal-at-point";
           sha256 = "1cz53plk5bax5azm13y7xz530qcfh0scm0cgrkrgwja2wwlxirnw";
           name = "zeal-at-point";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/zeal-at-point";
+          homepage = "https://melpa.org/#/zeal-at-point";
           license = lib.licenses.free;
         };
       }) {};
-    zeitgeist = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild }:
+    zeitgeist = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zeitgeist";
         version = "20131228.1209";
-        src = fetchbzr {
-          url = "lp:zeitgeist-datasources";
-          rev = "181";
-          sha256 = "0f80fxh0y9lfa08fnic7ln0jn8vngfbiygy6sizdmrcxz67559vc";
+        src = fetchgit {
+          url = "git://anongit.freedesktop.org/zeitgeist/zeitgeist-datasources";
+          rev = "cdd1c219ed3afa9500403c3c499f49583d599034";
+          sha256 = "0xg67asvgav5js03i3bqmh7apndrn0jy5vai0bsh22pq8wgvq083";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zeitgeist";
-          sha256 = "0gzmiwxmzcrl5mf0s7vs09p2wl7slq8xbl6ynl76iwzwjxjizahk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zeitgeist";
+          sha256 = "0m6drp3c6hp70ypbva3ji2dndl9an1jm2zlhnpwmjxsmw47cd732";
           name = "zeitgeist";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/zeitgeist";
+          homepage = "https://melpa.org/#/zeitgeist";
           license = lib.licenses.free;
         };
       }) {};
@@ -60902,34 +63299,34 @@
           sha256 = "0dnaxhsw549k54j0mgydm7qbl4pizgipfyzc15f9afsxa107rpnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zen-and-art-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zen-and-art-theme";
           sha256 = "0b2lflji955z90xl9iz2y1vm04yljghbw4948gh5vv5p7mwibgf2";
           name = "zen-and-art-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/zen-and-art-theme";
+          homepage = "https://melpa.org/#/zen-and-art-theme";
           license = lib.licenses.free;
         };
       }) {};
     zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zenburn-theme";
-        version = "20160204.1416";
+        version = "20160416.1211";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "zenburn-emacs";
-          rev = "3d7463ecac9c4668a4d2ceaddea2fd43e677bfba";
-          sha256 = "0xihq1bpgckv9jcs6xdnhn8l4hbxywh1krk8ydv099l56r4w1269";
+          rev = "e5dc3962fd30005914b79b14e9821d298f2c305a";
+          sha256 = "1n7ka608lk0xp7vg4zcw282zna0cwvcwvmhic6ym1ag7lq5cjrhc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zenburn-theme";
           sha256 = "1kb371j9aissj0vy07jw4ydfn554blc8b2rbi0x1dvfksr2rhsn9";
           name = "zenburn-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/zenburn-theme";
+          homepage = "https://melpa.org/#/zenburn-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -60944,34 +63341,54 @@
           sha256 = "1y3wj15kfbgskl29glmba6lzq43rcm141p4i5s180aqcw7ydp5vr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zencoding-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zencoding-mode";
           sha256 = "1fclad1dyngyg9ncfkcqfxybvy8482i2bd409cgxi9y4h1wc7ws7";
           name = "zencoding-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/zencoding-mode";
+          homepage = "https://melpa.org/#/zencoding-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zenity-color-picker = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zenity-color-picker";
+        version = "20160302.554";
+        src = fetchgit {
+          url = "https://bitbucket.org/Soft/zenity-color-picker.el.git";
+          rev = "4f4f46676a461ebc881487fb70c8c181e323db5e";
+          sha256 = "1abm0wmfkhbwdnqnvjd9r0pm7ahkcj7ip7jcz6rm49qam815g7rk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zenity-color-picker";
+          sha256 = "1v6ks922paacdgpv5v8cpic1g66670x73ixsy2nixs5qdw241wzl";
+          name = "zenity-color-picker";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/zenity-color-picker";
           license = lib.licenses.free;
         };
       }) {};
     zerodark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zerodark-theme";
-        version = "20160216.911";
+        version = "20160406.1028";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "4d5cc77642164c925f5d0f46bb9c2ef2dafc578f";
-          sha256 = "11ym5kx4rkm7ylyx51dlxh165mj350kfxm1qikavy3bqysh7cqrq";
+          rev = "ebf2a20ee5cb043d2f84e12ab68f1a8330da07d9";
+          sha256 = "0wc5m1xszccfby762k0w2j0vw39vsam730j6p04kbwmhawvjgdh4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zerodark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zerodark-theme";
           sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9";
           name = "zerodark-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/zerodark-theme";
+          homepage = "https://melpa.org/#/zerodark-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -60986,13 +63403,13 @@
           sha256 = "1gb51bqdf87yibs1zngk6q090p05293cpwlwbwzhnih9sl6wkq8x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zlc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zlc";
           sha256 = "0qw0qf14l09mcnw7h0ccbw17psfpra76qfawkc10zpdb5a2167d0";
           name = "zlc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/zlc";
+          homepage = "https://melpa.org/#/zlc";
           license = lib.licenses.free;
         };
       }) {};
@@ -61007,13 +63424,13 @@
           sha256 = "1xsxmvbh3xm3zh9yc6q28h48nar6pwyd51xw04b1x7amwkp8qdnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/znc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/znc";
           sha256 = "1z2kzbapgh55wwr5jp7v1wz5kpz4l7n3k94mkh3s068xag9xs6zz";
           name = "znc";
         };
         packageRequires = [ cl-lib erc ];
         meta = {
-          homepage = "http://melpa.org/#/znc";
+          homepage = "https://melpa.org/#/znc";
           license = lib.licenses.free;
         };
       }) {};
@@ -61028,13 +63445,13 @@
           sha256 = "1gm3ly6czbw4vrxcslm50jy6nxf2qsl656cjwbyhw251wppn75cg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zombie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zombie";
           sha256 = "0ji3nsxwbxmmygd6plpbc1lkw6i5zw4y6x3r5n2ah3ds4vjr7cnv";
           name = "zombie";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/zombie";
+          homepage = "https://melpa.org/#/zombie";
           license = lib.licenses.free;
         };
       }) {};
@@ -61049,13 +63466,13 @@
           sha256 = "04m53hzk5n9vxh0gxi8jzpdhsdjlxnvz7hmsisr3bs99v603ha01";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zombie-trellys-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zombie-trellys-mode";
           sha256 = "19xzvppw7f35s82hm0y7sga8dyjjyy0dxy6vji4hxdpjziz7lggv";
           name = "zombie-trellys-mode";
         };
         packageRequires = [ cl-lib emacs haskell-mode ];
         meta = {
-          homepage = "http://melpa.org/#/zombie-trellys-mode";
+          homepage = "https://melpa.org/#/zombie-trellys-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -61066,17 +63483,17 @@
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "zone-nyan";
-          rev = "033e9e7d23584fb15e30639dd9e3b2ffeb54618a";
-          sha256 = "1zg8fiv62bz7zmalczmfkbgjc6km7n66pzvidivc0p9b9sfxslkp";
+          rev = "a9299ec7cc412d10cf7bddd392608fc3efba0899";
+          sha256 = "0b8m0mdxbskkqsx86i6942235i8x0pk67a7s8lhsp2anahksazla";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zone-nyan";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zone-nyan";
           sha256 = "165sgjaahz038isii971m02hr2g5iqhbhiwf5kdn8c739cjaa17b";
           name = "zone-nyan";
         };
         packageRequires = [ esxml ];
         meta = {
-          homepage = "http://melpa.org/#/zone-nyan";
+          homepage = "https://melpa.org/#/zone-nyan";
           license = lib.licenses.free;
         };
       }) {};
@@ -61091,13 +63508,13 @@
           sha256 = "0w550l9im3mhxhja1b7cr9phdcbvx5lprw551lj0d1lv7qvjasz0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zone-rainbow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zone-rainbow";
           sha256 = "0l51fmhvx9vsxbs62cbjgqphb691397f651nqin7cj3dfvchzh4j";
           name = "zone-rainbow";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/zone-rainbow";
+          homepage = "https://melpa.org/#/zone-rainbow";
           license = lib.licenses.free;
         };
       }) {};
@@ -61112,13 +63529,13 @@
           sha256 = "17mrzf85ym0x5ih4l6sjdjlcmviabf8c8rpvpkd90gp9qxd8pyx1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zone-select";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zone-select";
           sha256 = "05kc211invmy4ajwf71vgr2b7bdgn99c4a26m95gcjqgy3sh5xzz";
           name = "zone-select";
         };
         packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/zone-select";
+          homepage = "https://melpa.org/#/zone-select";
           license = lib.licenses.free;
         };
       }) {};
@@ -61133,13 +63550,13 @@
           sha256 = "0m1q45pza61j0fp8cxkgmds5fyjrk0nqpwhg8m91610m3pvyc3ap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zone-sl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zone-sl";
           sha256 = "04rwd6vj3abk3bzhq3swxwcq5da2n9cldrcmvnqgjr975np4cgs3";
           name = "zone-sl";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/zone-sl";
+          homepage = "https://melpa.org/#/zone-sl";
           license = lib.licenses.free;
         };
       }) {};
@@ -61147,38 +63564,38 @@
         pname = "zones";
         version = "20160209.1120";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/zones.el";
+          url = "https://www.emacswiki.org/emacs/download/zones.el";
           sha256 = "1g6dpyihwaz28ppndhkw3jzmph6pmcnfhaff926j0zr1j701sqdd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zones";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zones";
           sha256 = "08sl7i7cy22nd1jijc5l7lp75k9z83gfr8q41n72l0vxrpdasc9w";
           name = "zones";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/zones";
+          homepage = "https://melpa.org/#/zones";
           license = lib.licenses.free;
         };
       }) {};
     zonokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zonokai-theme";
-        version = "20150408.2202";
+        version = "20160321.2125";
         src = fetchFromGitHub {
           owner = "ZehCnaS34";
           repo = "zonokai-emacs";
-          rev = "b6f9eb7eb7e3f9954d786144e74dc6e392df3a69";
-          sha256 = "0ls9x2r12z9ki2fy3cbf05mp28x4ws2gk3knacvw7gvvg4sjdq5w";
+          rev = "38ee819b711e848437ba6d563594129a0ecac598";
+          sha256 = "16ni0va1adpqdnrkiwmpxwrhyanxp5jwbknii2wnbhgq62s7gv43";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zonokai-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zonokai-theme";
           sha256 = "1hrpgh03mp7yynqamgzkw7fa70c5pmyjfmfblkfhspnsif8j4v29";
           name = "zonokai-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/zonokai-theme";
+          homepage = "https://melpa.org/#/zonokai-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -61187,17 +63604,17 @@
         pname = "zoom-frm";
         version = "20151231.1825";
         src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/zoom-frm.el";
+          url = "https://www.emacswiki.org/emacs/download/zoom-frm.el";
           sha256 = "1whpd97yjby5zbcr4fcn0nxhqvn6k3jn8k2d15i6ss579kziwdqn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zoom-frm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zoom-frm";
           sha256 = "111lr29zhj8w8j7dbzl58iisqxjhccxpw4spfxx08zxh4623g5mk";
           name = "zoom-frm";
         };
         packageRequires = [ frame-cmds frame-fns ];
         meta = {
-          homepage = "http://melpa.org/#/zoom-frm";
+          homepage = "https://melpa.org/#/zoom-frm";
           license = lib.licenses.free;
         };
       }) {};
@@ -61212,13 +63629,13 @@
           sha256 = "1kl01dlggsrffvakmwixw9j8cncdmlsw805wvzls6l1711r1zjwj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zoom-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zoom-window";
           sha256 = "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3";
           name = "zoom-window";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/zoom-window";
+          homepage = "https://melpa.org/#/zoom-window";
           license = lib.licenses.free;
         };
       }) {};
@@ -61233,13 +63650,13 @@
           sha256 = "1hq5ycnj0kwqs25z5rm095d55r768458vc5h5dpjhka5n6c099p1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zop-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zop-to-char";
           sha256 = "0jnspvqqvnaplld083j7cqqxw122qazh88ab7hymci36m3ka9hga";
           name = "zop-to-char";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/zop-to-char";
+          homepage = "https://melpa.org/#/zop-to-char";
           license = lib.licenses.free;
         };
       }) {};
@@ -61254,13 +63671,13 @@
           sha256 = "0fgwxw7r3zfv0b7xi8bx7kxff2r5hdw9gxf16kwq04fnh18nhi39";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zossima";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zossima";
           sha256 = "11kmnbqv4s8arindg7cxcdhbvfxsckks332wn7aiyb3bjhcgzwjb";
           name = "zossima";
         };
         packageRequires = [ inf-ruby ];
         meta = {
-          homepage = "http://melpa.org/#/zossima";
+          homepage = "https://melpa.org/#/zossima";
           license = lib.licenses.free;
         };
       }) {};
@@ -61269,40 +63686,40 @@
         pname = "zotelo";
         version = "20160118.2245";
         src = fetchFromGitHub {
-          owner = "vitoshka";
+          owner = "vspinu";
           repo = "zotelo";
           rev = "4cabb7342668e146c5565dc5454ece4b4040f1a9";
           sha256 = "1335z1v4889njnm98pz2sjk6n7r3vncsz83bk3z6gj5i0ig7wjap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zotelo";
-          sha256 = "0ai516lqj9yw7ymvfm4n5inv53sp6mg90wy56lr1laflizwxzg8z";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zotelo";
+          sha256 = "0y6s5ma7633h5pf9zj7vkazidlf211va7nk47ppb1q0iyfkyln36";
           name = "zotelo";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/zotelo";
+          homepage = "https://melpa.org/#/zotelo";
           license = lib.licenses.free;
         };
       }) {};
     zotxt = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild, request-deferred }:
     melpaBuild {
         pname = "zotxt";
-        version = "20151031.1159";
+        version = "20160315.132";
         src = fetchFromGitLab {
           owner = "egh";
           repo = "zotxt-emacs";
-          rev = "3809f0932660c09910639eaecb3d0a8e784420b3";
-          sha256 = "015xgsisgsv4w5h6r68f7iw3vwrqvc0az1gcdkd5dfr3nl1h4yzl";
+          rev = "3470dd0cb6686f91d4c8b7fb9879f0d13e317d63";
+          sha256 = "1azgcmpayxci2xa1rpghrwr1mgnn4a56khc81mlil27nmaj4ay46";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zotxt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zotxt";
           sha256 = "18jla05g2k8zfrmp7q9kpr1mpw6smxzdyn8nfghm306wvv9ff8y5";
           name = "zotxt";
         };
         packageRequires = [ request-deferred ];
         meta = {
-          homepage = "http://melpa.org/#/zotxt";
+          homepage = "https://melpa.org/#/zotxt";
           license = lib.licenses.free;
         };
       }) {};
@@ -61317,13 +63734,13 @@
           sha256 = "1sxjpbgi7ydmrlv34l16n40qpg969wfcb6kknndrh3fgjjc3p41b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ztree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ztree";
           sha256 = "1fk5xz8qq3azc66f954x5qvym94xnv4fg6wy83ihdfwycsas7j20";
           name = "ztree";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/ztree";
+          homepage = "https://melpa.org/#/ztree";
           license = lib.licenses.free;
         };
       }) {};
@@ -61332,19 +63749,19 @@
         pname = "zygospore";
         version = "20140703.352";
         src = fetchFromGitHub {
-          owner = "louiskottmann";
+          owner = "LouisKottmann";
           repo = "zygospore.el";
           rev = "1af5ee663f5a7aa08d96a77cacff834dcdf55ea8";
           sha256 = "0v73fgb0gf81vlihiicy32v6x86rr2hv0bxlpw7d3pk4ng1a0l3z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zygospore";
-          sha256 = "03mmxqbliwd1g73cxd9kqkngdy4jdavcs6j12b4wp27xmhgaj40z";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zygospore";
+          sha256 = "0n9qs6fymdjly0i4rmx87y8gapfn5sqivsivcffi42vcb5f17kxj";
           name = "zygospore";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/zygospore";
+          homepage = "https://melpa.org/#/zygospore";
           license = lib.licenses.free;
         };
       }) {};
@@ -61359,13 +63776,13 @@
           sha256 = "0y0hhar3krkvbpb5y9k197mb0wfpz8cl6fmxazq8msjml7hkk339";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zzz-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zzz-to-char";
           sha256 = "16vwp0krshmn5x3ry1j512g4kydx39znjqzri4j7wgg49bz1n7vh";
           name = "zzz-to-char";
         };
         packageRequires = [ avy cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/zzz-to-char";
+          homepage = "https://melpa.org/#/zzz-to-char";
           license = lib.licenses.free;
         };
       }) {};

From bf0ae7d45c496454066748cf1698ad7e145914b9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 26 Apr 2016 14:00:33 -0500
Subject: [PATCH 290/712] melpa-packages: update package generation
 instructions

---
 .../editors/emacs-modes/melpa-packages.nix            | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index f213ba396a7..3106336a48d 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -4,11 +4,12 @@
 
 To update the list of packages from MELPA,
 
-1. Clone https://github.com/ttuegel/emacs2nix
-2. Clone https://github.com/milkypostman/melpa
-3. Run `./melpa-packages.sh PATH_TO_MELPA_CLONE` from emacs2nix
-4. Copy the new melpa-packages.json file into Nixpkgs
-5. `git commit -m "melpa-packages $(date -Idate)"`
+1. Clone https://github.com/ttuegel/emacs2nix.
+2. Clone https://github.com/milkypostman/melpa.
+3. Run `./melpa-packages.sh --melpa PATH_TO_MELPA_CLONE` from emacs2nix.
+4. Copy the new `melpa-generated.nix` file into Nixpkgs.
+5. Check for evaluation errors: `nix-instantiate ./. -A emacsPackagesNg.melpaPackages`.
+6. `git add pkgs/applications/editors/emacs-modes/melpa-generated.nix && git commit -m "melpa-packages $(date -Idate)"`
 
 */
 

From f6828eb247e99dfff45bb91692c10ebf728d5ed3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 26 Apr 2016 14:05:00 -0500
Subject: [PATCH 291/712] melpa-stable-packages: update package generation
 instructions

---
 .../editors/emacs-modes/melpa-stable-packages.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
index e026625398a..20ac4f4c091 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
@@ -2,15 +2,14 @@
 
 # Updating
 
-To update the list of packages from MELPA Stable,
+To update the list of packages from MELPA,
 
-1. Clone https://github.com/ttuegel/emacs2nix
-2. Clone https://github.com/milkypostman/melpa
-3. Run `./melpa-stable-packages.sh PATH_TO_MELPA_CLONE` from emacs2nix.
-   Error messages about missing versions are normal; most packages in
-   MELPA do not have a stable version.
-4. Copy the new melpa-stable-packages.json file into Nixpkgs
-5. `git commit -m "melpa-stable-packages $(date -Idate)"`
+1. Clone https://github.com/ttuegel/emacs2nix.
+2. Clone https://github.com/milkypostman/melpa.
+3. Run `./melpa-stable-packages.sh --melpa PATH_TO_MELPA_CLONE` from emacs2nix.
+4. Copy the new `melpa-stable-generated.nix` file into Nixpkgs.
+5. Check for evaluation errors: `nix-instantiate ./. -A emacsPackagesNg.melpaStablePackages`.
+6. `git add pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix && git commit -m "melpa-stable-packages $(date -Idate)"`
 
 */
 

From 559010fa9c11f819a76c006902088aeff0765526 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 26 Apr 2016 14:05:25 -0500
Subject: [PATCH 292/712] melpa-stable-packages 2016-04-26

---
 .../emacs-modes/melpa-stable-generated.nix    | 8027 ++++++++++-------
 1 file changed, 4707 insertions(+), 3320 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 559418bd05c..001f4f7adc5 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -1,4 +1,25 @@
 { callPackage }: {
+    _0blayout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "_0blayout";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "etu";
+          repo = "0blayout-mode";
+          rev = "6e4ef20e70aed88489c31c48c73da8ff0ce4572b";
+          sha256 = "1xigpz2aswlmpcsc1f7gfakyw7041pbyl9zfd8nz38iq036n5b96";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/0blayout";
+          sha256 = "027k85h34998i8vmbg2hi4q1m4f7jfva5jm38k0g9m1db700gk92";
+          name = "_0blayout";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/0blayout";
+          license = lib.licenses.free;
+        };
+      }) {};
     abc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "abc-mode";
@@ -10,13 +31,34 @@
           sha256 = "13f4l9xzx4xm5m80kkb49zh31w0bn0kw9m5ca28rrx4aysqmwryv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/abc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/abc-mode";
           sha256 = "0qf5lbszyscmagiqhc0d05vzkhdky7ini4w33z1h3j5417sscrcx";
           name = "abc-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/abc-mode";
+          homepage = "https://melpa.org/#/abc-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    abyss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "abyss-theme";
+        version = "0.5";
+        src = fetchFromGitHub {
+          owner = "mgrbyte";
+          repo = "emacs-abyss-theme";
+          rev = "e860499a0b2ae0d6d2a27eab12b67dec896a7afc";
+          sha256 = "1yr6cqycd7ljkqzfp4prz9ilcpjq8wxg5yf645m24gy9v4w365ia";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/abyss-theme";
+          sha256 = "0ckrgfd7fjls6g510v8fqpkd0fd18lr0spg3lf5s88gky8ihdg6c";
+          name = "abyss-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/abyss-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -31,13 +73,13 @@
           sha256 = "0a8widshsm39cbala17pmnk1sazazhhyqppwalysli170whk49c5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-alchemist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-alchemist";
           sha256 = "02ll3hcixgdb8zyszn78714gy1h2q0vkhpbnwap9302mr2racwl0";
           name = "ac-alchemist";
         };
         packageRequires = [ alchemist auto-complete cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/ac-alchemist";
+          homepage = "https://melpa.org/#/ac-alchemist";
           license = lib.licenses.free;
         };
       }) {};
@@ -52,13 +94,13 @@
           sha256 = "0vrd6g9cl02jjxrjxpshq4pd748b5xszhpmakywrw8s08nh8jf44";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-anaconda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-anaconda";
           sha256 = "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf";
           name = "ac-anaconda";
         };
         packageRequires = [ anaconda-mode auto-complete dash ];
         meta = {
-          homepage = "http://melpa.org/#/ac-anaconda";
+          homepage = "https://melpa.org/#/ac-anaconda";
           license = lib.licenses.free;
         };
       }) {};
@@ -73,13 +115,13 @@
           sha256 = "12z8nq797hjy0bq5vzpcm7z7bdn0ixc3ma4cj3v51xnwmgknzk6c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-cake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-cake";
           sha256 = "0s2pgf0m98ixgadsnn201vm5gnawanpvxv56sf599f33krqnxzkl";
           name = "ac-cake";
         };
         packageRequires = [ auto-complete cake ];
         meta = {
-          homepage = "http://melpa.org/#/ac-cake";
+          homepage = "https://melpa.org/#/ac-cake";
           license = lib.licenses.free;
         };
       }) {};
@@ -94,13 +136,13 @@
           sha256 = "0mlmhdl9s28z981y8bnpj8jpfzm6bgfiyl0zmpgvhyqw1wzqywwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-cake2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-cake2";
           sha256 = "0qxilldx23wqf8ilif2nin119bvd0l7b6f6wifixx28a6kl1vsgy";
           name = "ac-cake2";
         };
         packageRequires = [ auto-complete cake2 ];
         meta = {
-          homepage = "http://melpa.org/#/ac-cake2";
+          homepage = "https://melpa.org/#/ac-cake2";
           license = lib.licenses.free;
         };
       }) {};
@@ -115,13 +157,13 @@
           sha256 = "0nyq34yq4jcp3p30ygma3iz1h0q551p33792byj76pa5ps09g1da";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-capf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-capf";
           sha256 = "1drgk5iz2wp3rxzd39pj0n4cfmm5z8zqlp50jw5z7ffbbg35qxbm";
           name = "ac-capf";
         };
         packageRequires = [ auto-complete cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/ac-capf";
+          homepage = "https://melpa.org/#/ac-capf";
           license = lib.licenses.free;
         };
       }) {};
@@ -136,13 +178,13 @@
           sha256 = "1vpj0lxbvlxffj2z29l109w70hcphiavyvglsw524agxql3c8yf9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-cider";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-cider";
           sha256 = "1dszpb706h34miq2bxqyq1ycbran5ax36vcniwp8vvhgcjsw5sz6";
           name = "ac-cider";
         };
         packageRequires = [ auto-complete cider cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/ac-cider";
+          homepage = "https://melpa.org/#/ac-cider";
           license = lib.licenses.free;
         };
       }) {};
@@ -157,13 +199,13 @@
           sha256 = "1sdgpyq5p824dnxv6r7djwvhyhdmnis8k6992klr8iz7anhxzdam";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-clang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-clang";
           sha256 = "070s06xhkzaqfc3j8c4i44rks6gn8z66lwd54j17p8d91x3qjpr4";
           name = "ac-clang";
         };
         packageRequires = [ auto-complete cl-lib emacs pos-tip yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/ac-clang";
+          homepage = "https://melpa.org/#/ac-clang";
           license = lib.licenses.free;
         };
       }) {};
@@ -178,13 +220,13 @@
           sha256 = "0a3s880nswc2s6yh2v5zsmws550q917i7av8nrxc5sp1d03xqwmn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-dcd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-dcd";
           sha256 = "086jp9c6bilc361n1hscza3pbhgvqlq944z7cil2jm1kicsf8s7r";
           name = "ac-dcd";
         };
         packageRequires = [ auto-complete flycheck-dmd-dub ];
         meta = {
-          homepage = "http://melpa.org/#/ac-dcd";
+          homepage = "https://melpa.org/#/ac-dcd";
           license = lib.licenses.free;
         };
       }) {};
@@ -199,13 +241,13 @@
           sha256 = "0cc3jpc4pihbyznyzvf6i3xwc2x78gb5m36ba9gkvxhabsljnlfg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-emoji";
           sha256 = "0msh3dh89jzk6hxva34gp9d5pazchgdknxjbi72z26rss9bkp1mw";
           name = "ac-emoji";
         };
         packageRequires = [ auto-complete cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/ac-emoji";
+          homepage = "https://melpa.org/#/ac-emoji";
           license = lib.licenses.free;
         };
       }) {};
@@ -220,13 +262,13 @@
           sha256 = "0ijni3qgd68jhznhirhgcl59cr7hwfvbwgf6z120x56jmp8h01d2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-etags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-etags";
           sha256 = "0ag49k9izrs4ikzac9lifvvwhcn5n89lr2vb20pngsvg1czdyhzb";
           name = "ac-etags";
         };
         packageRequires = [ auto-complete ];
         meta = {
-          homepage = "http://melpa.org/#/ac-etags";
+          homepage = "https://melpa.org/#/ac-etags";
           license = lib.licenses.free;
         };
       }) {};
@@ -241,13 +283,13 @@
           sha256 = "02ifz25rq64z0ifxs52aqdz0iz4mi6xvj88hcn3aakkmsj749vvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-geiser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-geiser";
           sha256 = "0v558qz1mp8b1bgk8kgdk5sx5mpd353mw77n5b0pw4b2ikzpz2mx";
           name = "ac-geiser";
         };
         packageRequires = [ auto-complete geiser ];
         meta = {
-          homepage = "http://melpa.org/#/ac-geiser";
+          homepage = "https://melpa.org/#/ac-geiser";
           license = lib.licenses.free;
         };
       }) {};
@@ -262,13 +304,13 @@
           sha256 = "0m33v9iy3y37sicfmpx7kvmn8v1a8k6cs7d0v9v5k93p4d5ila41";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-haskell-process";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-haskell-process";
           sha256 = "0kv4z850kv03wiax1flnrp6sgqja25j23l719w7rkr7ck110q8rw";
           name = "ac-haskell-process";
         };
         packageRequires = [ auto-complete haskell-mode ];
         meta = {
-          homepage = "http://melpa.org/#/ac-haskell-process";
+          homepage = "https://melpa.org/#/ac-haskell-process";
           license = lib.licenses.free;
         };
       }) {};
@@ -283,13 +325,13 @@
           sha256 = "1gw38phyaslpql7szvlpwgyfngdgd21f6lq406vq0gjwwmxgig34";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-helm";
           sha256 = "16ajxlhcah5zbvywpc6l4l1arr308gjpgvdx6l1nrv2zvpckhlwq";
           name = "ac-helm";
         };
         packageRequires = [ auto-complete helm popup ];
         meta = {
-          homepage = "http://melpa.org/#/ac-helm";
+          homepage = "https://melpa.org/#/ac-helm";
           license = lib.licenses.free;
         };
       }) {};
@@ -304,13 +346,13 @@
           sha256 = "19v9515ixg22m7h7riix8w3vyhzax1m2pbwdirp59v532xn9b0cz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-html";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-html";
           sha256 = "0qf8f75b6dvy844dq8vh8d9c6k599rh1ynjcif9bwvdpf6pxwvqa";
           name = "ac-html";
         };
         packageRequires = [ auto-complete web-completion-data ];
         meta = {
-          homepage = "http://melpa.org/#/ac-html";
+          homepage = "https://melpa.org/#/ac-html";
           license = lib.licenses.free;
         };
       }) {};
@@ -325,13 +367,13 @@
           sha256 = "1zmjqnlbfchnb7n2v7ms7q06xma1lmf9ry3v6f4pfnwlmz5lsf3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-html-bootstrap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-html-bootstrap";
           sha256 = "0z71m6xws0k9smhsswaivpikr64mv0wh6klnmi5cwhwcqas6kdi1";
           name = "ac-html-bootstrap";
         };
         packageRequires = [ web-completion-data ];
         meta = {
-          homepage = "http://melpa.org/#/ac-html-bootstrap";
+          homepage = "https://melpa.org/#/ac-html-bootstrap";
           license = lib.licenses.free;
         };
       }) {};
@@ -346,13 +388,13 @@
           sha256 = "0p18wxyyc1jmcwx9y5i77s25v4jszv7cmm4bkwm4dzhkxd33kh1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-html-csswatcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-html-csswatcher";
           sha256 = "0jb9dnm2lxadrxssf0rjqw8yvvskcq4hys8c21shjyj3gkvwbfqn";
           name = "ac-html-csswatcher";
         };
         packageRequires = [ web-completion-data ];
         meta = {
-          homepage = "http://melpa.org/#/ac-html-csswatcher";
+          homepage = "https://melpa.org/#/ac-html-csswatcher";
           license = lib.licenses.free;
         };
       }) {};
@@ -367,13 +409,13 @@
           sha256 = "1acm13n59sdgvvzicscxzrr5j1x5sa5x4rc4cnkbwb28nw5a5ysm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-inf-ruby";
           sha256 = "04jclf0yxz78x1fsaf5sh1p466947nqrcx337kyhqn0nkj3hplqr";
           name = "ac-inf-ruby";
         };
         packageRequires = [ auto-complete inf-ruby ];
         meta = {
-          homepage = "http://melpa.org/#/ac-inf-ruby";
+          homepage = "https://melpa.org/#/ac-inf-ruby";
           license = lib.licenses.free;
         };
       }) {};
@@ -388,13 +430,13 @@
           sha256 = "16qsj3wni4xhcrjx2rnxdzq6jb7jrl4bngi4an37vgdlrx3w8m6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-ispell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-ispell";
           sha256 = "1vsy2qjh60n5lavivpqhhcpg5pk8zz2r0wy1sb65capn841zdi67";
           name = "ac-ispell";
         };
         packageRequires = [ auto-complete cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/ac-ispell";
+          homepage = "https://melpa.org/#/ac-ispell";
           license = lib.licenses.free;
         };
       }) {};
@@ -409,13 +451,13 @@
           sha256 = "19cb8kq8gmrplkxil22ahvbyq5cng1l2vh2lrfiyqpjsap7zfjz5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-mozc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-mozc";
           sha256 = "1v3iiid8cq50i076q98ycks9m827xzncgxqwqs2rqhab0ncy3h0f";
           name = "ac-mozc";
         };
         packageRequires = [ auto-complete cl-lib mozc ];
         meta = {
-          homepage = "http://melpa.org/#/ac-mozc";
+          homepage = "https://melpa.org/#/ac-mozc";
           license = lib.licenses.free;
         };
       }) {};
@@ -430,28 +472,28 @@
           sha256 = "16f8hvdz6y8nsfj7094yrvw194ag3w1jvz81h287vcgcvmyb7wdf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-octave";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-octave";
           sha256 = "1g5s4dk1rcgkjn17jfw6g201pw0vfhqcx1nhigmnizpnzy0man9z";
           name = "ac-octave";
         };
         packageRequires = [ auto-complete ];
         meta = {
-          homepage = "http://melpa.org/#/ac-octave";
+          homepage = "https://melpa.org/#/ac-octave";
           license = lib.licenses.free;
         };
       }) {};
     ac-php = callPackage ({ auto-complete, company, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope, yasnippet }:
     melpaBuild {
         pname = "ac-php";
-        version = "1.7.2";
+        version = "1.7.3";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "109c8fa6410e98bb4374c117590d2a58580571b6";
-          sha256 = "0qz8q9qzr7nqdhyjf01p50949bkps62nckampahv9bli4w92xckz";
+          rev = "76f0f559905bfb63100aa5d8ddd4d567fff9e5bf";
+          sha256 = "0ca4viakvc09mvhk7d01pxnc3v3ydra6413asvdjx555njm9ic0f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-php";
           sha256 = "0p9qq8nszp5jb71s35cxnmcxp50b62y2jv1ha7vvqfz5p8miallk";
           name = "ac-php";
         };
@@ -468,7 +510,7 @@
           yasnippet
         ];
         meta = {
-          homepage = "http://melpa.org/#/ac-php";
+          homepage = "https://melpa.org/#/ac-php";
           license = lib.licenses.free;
         };
       }) {};
@@ -483,13 +525,13 @@
           sha256 = "0g7xbfsfqpmcay56y8xbmif52ccz430s3rjxf5bgl9ahkk7zgkzl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-racer";
           sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp";
           name = "ac-racer";
         };
         packageRequires = [ auto-complete cl-lib racer ];
         meta = {
-          homepage = "http://melpa.org/#/ac-racer";
+          homepage = "https://melpa.org/#/ac-racer";
           license = lib.licenses.free;
         };
       }) {};
@@ -504,13 +546,13 @@
           sha256 = "13yghv7p6c91fn8mrxbwrb6ldk5n3b6nj6a7pwsvks1q73i1pl88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ac-slime";
           sha256 = "0mk3k1lcbqa16xvsbgk28x09vzqyaidqaqpq934xdbrwhdgwgckg";
           name = "ac-slime";
         };
         packageRequires = [ auto-complete cl-lib slime ];
         meta = {
-          homepage = "http://melpa.org/#/ac-slime";
+          homepage = "https://melpa.org/#/ac-slime";
           license = lib.licenses.free;
         };
       }) {};
@@ -525,13 +567,13 @@
           sha256 = "1pzh5l8dybrrmglj55nbff6065pxlbx14501p3a1qx1wvf24g1sv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-flyspell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ace-flyspell";
           sha256 = "0f24qrpcvyg7h6ylyggn4zrbydci537iigshac1d8yywsr0j47gd";
           name = "ace-flyspell";
         };
         packageRequires = [ ace-jump-mode ];
         meta = {
-          homepage = "http://melpa.org/#/ace-flyspell";
+          homepage = "https://melpa.org/#/ace-flyspell";
           license = lib.licenses.free;
         };
       }) {};
@@ -546,13 +588,13 @@
           sha256 = "0233ai62zhsy5yhv72016clygwp2pcg80y6kr4cjm2k1k2wwy7m9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ace-isearch";
           sha256 = "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm";
           name = "ace-isearch";
         };
         packageRequires = [ ace-jump-mode avy emacs helm-swoop ];
         meta = {
-          homepage = "http://melpa.org/#/ace-isearch";
+          homepage = "https://melpa.org/#/ace-isearch";
           license = lib.licenses.free;
         };
       }) {};
@@ -567,13 +609,13 @@
           sha256 = "1z82a0lrb61msamqpsy7rxcgs2nfhhckkk4zw0aw49l248p2nrgs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-jump-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ace-jump-buffer";
           sha256 = "0hkxa0ps0v1hwmjafqbnyr6rc4s0w95igk8y3w53asl7f5sj5mpi";
           name = "ace-jump-buffer";
         };
         packageRequires = [ ace-jump-mode dash ];
         meta = {
-          homepage = "http://melpa.org/#/ace-jump-buffer";
+          homepage = "https://melpa.org/#/ace-jump-buffer";
           license = lib.licenses.free;
         };
       }) {};
@@ -588,13 +630,13 @@
           sha256 = "1hsnsncarhvkhl2r6cg1x23vgfqzrwcbmdfkwasfgs7pgnd722m7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-jump-helm-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ace-jump-helm-line";
           sha256 = "04q8wh6jskvbiq6y2xsp2ir23vgz5zw09rm127sgiqrmn0jc61b9";
           name = "ace-jump-helm-line";
         };
         packageRequires = [ avy helm ];
         meta = {
-          homepage = "http://melpa.org/#/ace-jump-helm-line";
+          homepage = "https://melpa.org/#/ace-jump-helm-line";
           license = lib.licenses.free;
         };
       }) {};
@@ -609,13 +651,13 @@
           sha256 = "1bwvzh056ls2v7y26a0s4j5mj582dmds04lx4x6iqihs04ss74bb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-jump-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ace-jump-mode";
           sha256 = "0yk0kppjyblr5wamncrjm3ym3n8jcl0r0g0cbnwni89smvpngij6";
           name = "ace-jump-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ace-jump-mode";
+          homepage = "https://melpa.org/#/ace-jump-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -630,13 +672,13 @@
           sha256 = "0yng6qayzqadk4cdviri84ghld4can35q134hm3n3j3vprhpbmca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-jump-zap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ace-jump-zap";
           sha256 = "07bkmly3lvlbby2m13nj3m1q0gcnwy5sas7d6ws6vr9jh0d36byb";
           name = "ace-jump-zap";
         };
         packageRequires = [ ace-jump-mode dash ];
         meta = {
-          homepage = "http://melpa.org/#/ace-jump-zap";
+          homepage = "https://melpa.org/#/ace-jump-zap";
           license = lib.licenses.free;
         };
       }) {};
@@ -651,13 +693,13 @@
           sha256 = "1v127ld04gn16bgismbcz91kfjk71f3g8yf10r4scfp603y41zgz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ace-link";
           sha256 = "1jl805r2s3wa0xyhss1q28rcy6y2fngf0yfcrcd9wf8kamhpajk5";
           name = "ace-link";
         };
         packageRequires = [ ace-jump-mode ];
         meta = {
-          homepage = "http://melpa.org/#/ace-link";
+          homepage = "https://melpa.org/#/ace-link";
           license = lib.licenses.free;
         };
       }) {};
@@ -672,13 +714,13 @@
           sha256 = "1614xypwiv8xri7w921w7gj26zx7pvwk3212k71qn0capq7hs32g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-pinyin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ace-pinyin";
           sha256 = "18gmj71zd0i6yx8ifjxsqz2v81jx0j37f5kxllf31w7fj32ymbkc";
           name = "ace-pinyin";
         };
         packageRequires = [ ace-jump-mode avy ];
         meta = {
-          homepage = "http://melpa.org/#/ace-pinyin";
+          homepage = "https://melpa.org/#/ace-pinyin";
           license = lib.licenses.free;
         };
       }) {};
@@ -693,13 +735,13 @@
           sha256 = "1qiiivkwa95bhyym8ly7fnwwglc9dcifkyr314bsq8m4rp1mgry4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-popup-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ace-popup-menu";
           sha256 = "1cq1mpv7v98bqrpsm598krq1741b6rwih71cx3yjifpbagrv4m5s";
           name = "ace-popup-menu";
         };
         packageRequires = [ avy-menu emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ace-popup-menu";
+          homepage = "https://melpa.org/#/ace-popup-menu";
           license = lib.licenses.free;
         };
       }) {};
@@ -714,13 +756,13 @@
           sha256 = "07mcdzjmgrqdvjs94f2n5bkrf5vrq2fwzz256wbm3wzqxqkfy1q6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ace-window";
           sha256 = "1k0x8m1phmvgdxb5aj841iai9q96a5lfq8i4b5vnlbc3w888n3xa";
           name = "ace-window";
         };
         packageRequires = [ avy ];
         meta = {
-          homepage = "http://melpa.org/#/ace-window";
+          homepage = "https://melpa.org/#/ace-window";
           license = lib.licenses.free;
         };
       }) {};
@@ -735,13 +777,13 @@
           sha256 = "0hib4a8385q2czi1yqs0hwnva2xi7kw0bdfnrgha1hrl30rilp2f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ack-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ack-menu";
           sha256 = "1d2kw04ndxji2qjcm1b65qnxpp08zx8gbia8bl6x6mnjb2isc2d9";
           name = "ack-menu";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ack-menu";
+          homepage = "https://melpa.org/#/ack-menu";
           license = lib.licenses.free;
         };
       }) {};
@@ -756,34 +798,34 @@
           sha256 = "0zybch8hz3mj63i0pxynb4d76ywqcy7b4fsa4hh71c2kb0bnczb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/actionscript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/actionscript-mode";
           sha256 = "1dkiay9jmizvslji5kzab4dxm1dq0jm8ps7sjq6710g7a5aqdvwq";
           name = "actionscript-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/actionscript-mode";
+          homepage = "https://melpa.org/#/actionscript-mode";
           license = lib.licenses.free;
         };
       }) {};
     adoc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markup-faces, melpaBuild }:
     melpaBuild {
         pname = "adoc-mode";
-        version = "0.6.4";
+        version = "0.6.6";
         src = fetchFromGitHub {
           owner = "sensorflo";
           repo = "adoc-mode";
-          rev = "b6d54d9007b97f2553c238e0c36586079b666f4f";
-          sha256 = "1mb7dlyd5w161xagwn6w5h4q660dppkd50m71vz0w3zmxsc9a0vq";
+          rev = "995785538489e573ad208f73c4e833ba60c5cfdb";
+          sha256 = "0kp2aafjhqxz3mjr9hkkss85r4n51chws5a2qj1xzb63dh36liwm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/adoc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/adoc-mode";
           sha256 = "0wgagcsh0fkb51fy17ilrs20z2vzdpmz97vpwijcfy2b9rypxq15";
           name = "adoc-mode";
         };
         packageRequires = [ markup-faces ];
         meta = {
-          homepage = "http://melpa.org/#/adoc-mode";
+          homepage = "https://melpa.org/#/adoc-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -798,76 +840,76 @@
           sha256 = "1y9bw2vkl952pha2dsi18swyr94mihgwlcg5m8hg4d5bfg2fzcb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/aes";
           sha256 = "11vl9x3ldrv7q7rd29xk4xmlvfxs0m6iys84f6mlgf00190l5r5v";
           name = "aes";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/aes";
+          homepage = "https://melpa.org/#/aes";
           license = lib.licenses.free;
         };
       }) {};
     ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ag";
-        version = "0.46";
+        version = "0.47";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "ag.el";
-          rev = "12f22a4a9f4ff3c8a0b6f089b8cf6d85a3f8b7eb";
-          sha256 = "0hpsv2zyhhfm53hrd2lzvc9gpvfn6g5dpwmzxfl8l1sqjisips2a";
+          rev = "f2cfea210b165564e8d44f4c980b2fedac2462c1";
+          sha256 = "15kp99vwyi7hb1jkq3lwvqzw3v62ycixsq6y4pd1x0nn2v5p5m5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ag";
           sha256 = "1r4ai09vdckkg4h4i7dp781qqmm4kky53p4q8azp3n2c78i1vz6g";
           name = "ag";
         };
         packageRequires = [ cl-lib dash s ];
         meta = {
-          homepage = "http://melpa.org/#/ag";
+          homepage = "https://melpa.org/#/ag";
           license = lib.licenses.free;
         };
       }) {};
     aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aggressive-indent";
-        version = "1.5";
+        version = "1.6";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "aggressive-indent-mode";
-          rev = "1b831d21ac9688e3f31703f0b492202f6d24a75b";
-          sha256 = "0g8mhfab55a4jvb00kcv9f8cyx4l4d5qyfvp7sf7z12qnkik7b6w";
+          rev = "97eaa5778ce0cd596a0807ef2e676d2681aabf84";
+          sha256 = "0lr6n680ys7c6g6ah9xrid31640yjjkrqavb4164lwydfj5yy1xa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aggressive-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/aggressive-indent";
           sha256 = "1qi8jbr28gax35siim3hnnkiy8pa2vcrzqzc6axr98wzny46x0i2";
           name = "aggressive-indent";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/aggressive-indent";
+          homepage = "https://melpa.org/#/aggressive-indent";
           license = lib.licenses.free;
         };
       }) {};
-    ahk-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ahk-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ahk-mode";
-        version = "1.5.5";
+        version = "1.5.6";
         src = fetchFromGitHub {
           owner = "ralesi";
           repo = "ahk-mode";
-          rev = "7b47b40952708ea4e9a0f1969f00caa92700513a";
-          sha256 = "1qqrf9ncc3blkv4p2bhh9q6y41pp9p4wr667mm80vb5j8rkpsaa8";
+          rev = "bf3205efe7b7a40f3c8978f68f14ea3a939cffa8";
+          sha256 = "02nkcin0piv7s93c9plhy361dbqr78m0gd19myc7qb7gnm36kzpn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ahk-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ahk-mode";
           sha256 = "066l4hsb49wbyv381qgn9k4hn8gxlzi20h3qaim9grngjj5ljbni";
           name = "ahk-mode";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ahk-mode";
+          homepage = "https://melpa.org/#/ahk-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -882,34 +924,34 @@
           sha256 = "0blrpqn8wy9pwzikgzb0v6x4hk7axv93j4byfci62fh1905zfkkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/airline-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/airline-themes";
           sha256 = "0jkhb6nigyjmwqny7g59h4ssfy64vl3qnwcw46wnx5k9i73cjyih";
           name = "airline-themes";
         };
         packageRequires = [ powerline ];
         meta = {
-          homepage = "http://melpa.org/#/airline-themes";
+          homepage = "https://melpa.org/#/airline-themes";
           license = lib.licenses.free;
         };
       }) {};
     alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "alchemist";
-        version = "1.7.0";
+        version = "1.8.0";
         src = fetchFromGitHub {
           owner = "tonini";
           repo = "alchemist.el";
-          rev = "19e70b7eea28ee33e1c7f023a82eaee541d75c36";
-          sha256 = "0m05wxvvygc4rpkgnnmk6zrp3d8fylzzjz5ag7lh0jk5al4gfay5";
+          rev = "d6e65ee1b041ea59b20f7b01e3ee9b3242780794";
+          sha256 = "1y5nmcrlsmniv37x7w6yhihmb335n82d96yz7xclhwg59n652pjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/alchemist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/alchemist";
           sha256 = "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369";
           name = "alchemist";
         };
         packageRequires = [ company dash elixir-mode emacs pkg-info ];
         meta = {
-          homepage = "http://melpa.org/#/alchemist";
+          homepage = "https://melpa.org/#/alchemist";
           license = lib.licenses.free;
         };
       }) {};
@@ -924,13 +966,13 @@
           sha256 = "1pk5dgjqrynap85700wdivq41bdqvwd5hkfimgmcd48l5lhj9pbj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/alect-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/alect-themes";
           sha256 = "04fq65qnxlvl5nc2q037c6yb4nf422dfw2913gv6zfh9rdmxsks8";
           name = "alect-themes";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/alect-themes";
+          homepage = "https://melpa.org/#/alect-themes";
           license = lib.licenses.free;
         };
       }) {};
@@ -945,13 +987,13 @@
           sha256 = "1vpc3q40m6dcrslki4bg725j4kv6c6xfxwjjl1ilg7la49fwwf26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/alert";
           sha256 = "0x3cvczq09jvshz435jw2fjm69457x2wxdvvbbjq46nfnybhi118";
           name = "alert";
         };
         packageRequires = [ gntp log4e ];
         meta = {
-          homepage = "http://melpa.org/#/alert";
+          homepage = "https://melpa.org/#/alert";
           license = lib.licenses.free;
         };
       }) {};
@@ -966,13 +1008,13 @@
           sha256 = "00kfnkr0rclzbir2xxzr9wf2g0hf1alc004v8i9mqf3ab6dgdqiy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/amd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/amd-mode";
           sha256 = "17ry6vm5xlmdfs0mykdyn05cik38yswq5axdgn8hxrvvb6f58d06";
           name = "amd-mode";
         };
         packageRequires = [ dash f js2-mode js2-refactor makey projectile s ];
         meta = {
-          homepage = "http://melpa.org/#/amd-mode";
+          homepage = "https://melpa.org/#/amd-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -987,13 +1029,13 @@
           sha256 = "0sj6cr2bghy80dnwgl7rg61abdlvgfzi0jjc7jrxz7fdzwkcq714";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anaconda-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anaconda-mode";
           sha256 = "0gz16aam4zrm3s9ms13h4qcdflf55506kgkpyncq3bi54cvv8n1r";
           name = "anaconda-mode";
         };
         packageRequires = [ dash emacs f pythonic s ];
         meta = {
-          homepage = "http://melpa.org/#/anaconda-mode";
+          homepage = "https://melpa.org/#/anaconda-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -1008,13 +1050,13 @@
           sha256 = "0fnxxvw81c34zhmiyr5awl92wr5941n4gklvzjc4jphaf2nhkg4w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anaphora";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anaphora";
           sha256 = "1wb7fb3pc4gxvpjlm6gjbyx0rbhjiwd93qwc4vfw6p865ikl19y2";
           name = "anaphora";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/anaphora";
+          homepage = "https://melpa.org/#/anaphora";
           license = lib.licenses.free;
         };
       }) {};
@@ -1029,13 +1071,13 @@
           sha256 = "0gjynmzqlqz0d57fb4np6xrklqdn11y4vjbm18rlpvmk92bgw740";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/android-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/android-mode";
           sha256 = "1nqrvq411yg4b9xb5cvc7ai7lfalwc2rfhclzprvymc4vxh6k4cc";
           name = "android-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/android-mode";
+          homepage = "https://melpa.org/#/android-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -1050,13 +1092,13 @@
           sha256 = "1798nv4djhxzbin68zf6w7dbfm9sc39d0kygky52ii36arg5r1zp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/angular-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/angular-mode";
           sha256 = "1bwfmjldnxki0lqi3ys6r2a3nlhbwm1dibsg2dvzirq8qql02w1i";
           name = "angular-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/angular-mode";
+          homepage = "https://melpa.org/#/angular-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -1071,13 +1113,13 @@
           sha256 = "0h9i0iimanbvhbqy0cj9na335rs961pvhxjj4k8y53qc73xm102a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/angular-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/angular-snippets";
           sha256 = "057phgizn1c6njvdfigb23ljs31knq247gr0rcpqfrdaxsnnzm5c";
           name = "angular-snippets";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/angular-snippets";
+          homepage = "https://melpa.org/#/angular-snippets";
           license = lib.licenses.free;
         };
       }) {};
@@ -1092,13 +1134,13 @@
           sha256 = "18ninv1z8zdqpqnablbds4zgxgk4c1nmznlfdicj6qs738c5c30s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/annotate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/annotate";
           sha256 = "1ajykgara2m713blj2kfmdz12fzm8jw7klyakkyi6i3c3a9m44jy";
           name = "annotate";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/annotate";
+          homepage = "https://melpa.org/#/annotate";
           license = lib.licenses.free;
         };
       }) {};
@@ -1113,13 +1155,13 @@
           sha256 = "1ppq3kszzj2fgr7mwj565bjs8bs285ymy384cnnw7paddgcr9z02";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/annoying-arrows-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/annoying-arrows-mode";
           sha256 = "13bwqv3mv7kgi1gms58f5g03q5g7q98n4vv6n28zqmppxm5z33s7";
           name = "annoying-arrows-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/annoying-arrows-mode";
+          homepage = "https://melpa.org/#/annoying-arrows-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -1129,18 +1171,18 @@
         version = "0.4.1";
         src = fetchFromGitHub {
           owner = "rejeep";
-          repo = "ansi";
+          repo = "ansi.el";
           rev = "a042c5954453bab9a74177e2b78ad17a824caebc";
           sha256 = "1hbddxarr40ygvaw4pwaivq2l4f0brszw73w1r50lkjlggb7bl3g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ansi";
-          sha256 = "04n0kvaqq8214prdk20bplqyzlsnlzfzsg23ifkrzjgqjjpdcyi1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ansi";
+          sha256 = "0b5xnv6z471jm53g37njxin6l8yflsgm80y4wxahfgy8apipcq89";
           name = "ansi";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/ansi";
+          homepage = "https://melpa.org/#/ansi";
           license = lib.licenses.free;
         };
       }) {};
@@ -1155,13 +1197,13 @@
           sha256 = "03d240jngxw51ybrsjw8kdxygrr0ymdckzwga2jr1bqf26v559j2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ansible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ansible";
           sha256 = "1xdc05fdglqfbizra6s1zl6knnvaq526dkxqnw9g7w269j8f4z8g";
           name = "ansible";
         };
         packageRequires = [ f s ];
         meta = {
-          homepage = "http://melpa.org/#/ansible";
+          homepage = "https://melpa.org/#/ansible";
           license = lib.licenses.free;
         };
       }) {};
@@ -1176,34 +1218,34 @@
           sha256 = "05z379k6a7xq9d2zapf687x3f37jpmh6kfghpgxdd18v0hzca8ds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ansible-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ansible-doc";
           sha256 = "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w";
           name = "ansible-doc";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ansible-doc";
+          homepage = "https://melpa.org/#/ansible-doc";
           license = lib.licenses.free;
         };
       }) {};
     anti-zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anti-zenburn-theme";
-        version = "2.3.1";
+        version = "2.4";
         src = fetchFromGitHub {
           owner = "m00natic";
           repo = "anti-zenburn-theme";
-          rev = "ed9760daa4224666105d9449ea1d77710c297fe2";
-          sha256 = "1i1xb04g17f6029w0n8fp55gklgr9kh6c24m9dfrkn5q3dlvd26p";
+          rev = "53591a18aee564c6d08a5be69b4060a299903255";
+          sha256 = "06cn81sksvl88l1g3cfgp1kf8xzfv00b31j2rf58f45zlbl5ckv9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anti-zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anti-zenburn-theme";
           sha256 = "1sp9p6m2jy4m9fdn1hz25cmasy0mwwgn46qmvm92i56f5x6jlzzk";
           name = "anti-zenburn-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/anti-zenburn-theme";
+          homepage = "https://melpa.org/#/anti-zenburn-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -1218,13 +1260,13 @@
           sha256 = "1z6l72dn98icqsmxb3rrj6l63ijc3xgfa3vdl19yqa2rfy6ya721";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anyins";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anyins";
           sha256 = "0ncf3kn8rackcidkgda2zs60km3hx87rwr9daj7ksmbb6am09s7c";
           name = "anyins";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/anyins";
+          homepage = "https://melpa.org/#/anyins";
           license = lib.licenses.free;
         };
       }) {};
@@ -1235,16 +1277,16 @@
         src = fetchgit {
           url = "http://repo.or.cz/r/anything-config.git";
           rev = "6b9718fba257e6c2912ba70f9895251ab1926928";
-          sha256 = "86b90766ccb31a492998299092a3d0b892a8ac0bdb8e1833ef75fa6d79c7c721";
+          sha256 = "08f7qxwnvykmxwrii3nv1fnai4mqs2ir5419k0llj6mkrik0gfc6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anything";
           sha256 = "13pmks0bsby57v3vp6jcvvzwb771d4qq62djgvrw4ykxqzkcb8fj";
           name = "anything";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/anything";
+          homepage = "https://melpa.org/#/anything";
           license = lib.licenses.free;
         };
       }) {};
@@ -1259,13 +1301,13 @@
           sha256 = "01lw9159axg5w9bpdy55m4zc902zmsqvk213ky1nmgnln0fvq3rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything-exuberant-ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anything-exuberant-ctags";
           sha256 = "0p0jq2ggdgaxv2gd9m5iza0y3mjjc82xmgp899yr15pfffa4wihk";
           name = "anything-exuberant-ctags";
         };
         packageRequires = [ anything ];
         meta = {
-          homepage = "http://melpa.org/#/anything-exuberant-ctags";
+          homepage = "https://melpa.org/#/anything-exuberant-ctags";
           license = lib.licenses.free;
         };
       }) {};
@@ -1280,13 +1322,13 @@
           sha256 = "1834yj2vgs4dasdfnppc8iw8ll3yif948biq9hj0sbpsa2d8y44k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything-replace-string";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anything-replace-string";
           sha256 = "1fagi6cn88p6sf1yhx1qsi7nw9zpyx9hdfl66iyskqwddfvywp71";
           name = "anything-replace-string";
         };
         packageRequires = [ anything ];
         meta = {
-          homepage = "http://melpa.org/#/anything-replace-string";
+          homepage = "https://melpa.org/#/anything-replace-string";
           license = lib.licenses.free;
         };
       }) {};
@@ -1301,13 +1343,13 @@
           sha256 = "1bcvin2694ypqgiw0mqk82riq7gw6ra10vbkzng1yp9jp2qr6wmm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anything-sage";
           sha256 = "1878vj8hzrwfyd2yvxcm0f1vm9m0ndwnj0pcq7j8zm9lxj0w48p3";
           name = "anything-sage";
         };
         packageRequires = [ anything cl-lib sage-shell-mode ];
         meta = {
-          homepage = "http://melpa.org/#/anything-sage";
+          homepage = "https://melpa.org/#/anything-sage";
           license = lib.licenses.free;
         };
       }) {};
@@ -1322,13 +1364,13 @@
           sha256 = "1dxaf68przg0hh0p1zhxsq2dysp3ln178yxhbqalxw67bjy8ikny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anzu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/anzu";
           sha256 = "0i2ia0jisj31vc2pjx9bhv8jccbp24q7c406x3nhh9hxjzs1f41i";
           name = "anzu";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/anzu";
+          homepage = "https://melpa.org/#/anzu";
           license = lib.licenses.free;
         };
       }) {};
@@ -1343,13 +1385,13 @@
           sha256 = "13j2r4nx2x6j3qx50d5rdnqd8nl5idxdkhizsk7ccz3v2607fbyy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/apples-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/apples-mode";
           sha256 = "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s";
           name = "apples-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/apples-mode";
+          homepage = "https://melpa.org/#/apples-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -1364,13 +1406,13 @@
           sha256 = "1wyz8jvdy4m0cn75mm3zvxagm2gl10q51479f91gnqv14b4rndfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aproject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/aproject";
           sha256 = "0v3gx2mff2s7knm69y253pm1yr4svy8w00pqbn1chrvymb62jhp2";
           name = "aproject";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/aproject";
+          homepage = "https://melpa.org/#/aproject";
           license = lib.licenses.free;
         };
       }) {};
@@ -1385,13 +1427,34 @@
           sha256 = "133c1n4ra7z3vb6y47400y71a6ac19pyji0bgd4kr9fcbx0flx91";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/artbollocks-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/artbollocks-mode";
           sha256 = "0dlnxicn6nzyiz44y92pbl4nzr9jxfb9a99wacjrwq2ahdrwhhjp";
           name = "artbollocks-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/artbollocks-mode";
+          homepage = "https://melpa.org/#/artbollocks-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    arview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "arview";
+        version = "1.2";
+        src = fetchFromGitHub {
+          owner = "afainer";
+          repo = "arview";
+          rev = "5437b4221b64b238c273a651d4792c577dba6d45";
+          sha256 = "1yvirfmvf6v5khl7zhx2ddv9bbxnx1qhwfzi0gy2nmbxlykb6s2j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/arview";
+          sha256 = "0d935lj0x3rbar94l7288xrgbcp1wmz6r2l0b7i89r5piczyiy1y";
+          name = "arview";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/arview";
           license = lib.licenses.free;
         };
       }) {};
@@ -1406,55 +1469,76 @@
           sha256 = "1s973vzivibaqjb8acn4ylrdasxh17jcfmmvqp4wm05nwhg75597";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/asilea";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/asilea";
           sha256 = "1lb8nr6r6yy06m4pxg8w9ja4zv8k5xwhl95v2wv95y1qwhgnwg3j";
           name = "asilea";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/asilea";
+          homepage = "https://melpa.org/#/asilea";
           license = lib.licenses.free;
         };
       }) {};
-    async = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    assess = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
-        pname = "async";
-        version = "1.6";
+        pname = "assess";
+        version = "0.1";
         src = fetchFromGitHub {
-          owner = "jwiegley";
-          repo = "emacs-async";
-          rev = "c25bf17b34a1608da45e8a1ca02e1c89a34acd34";
-          sha256 = "0z91alzf4ajj3r7pnwazynvp81cg67csy9kf87fk98024xldpkdp";
+          owner = "phillord";
+          repo = "assess";
+          rev = "880d519d6b1e7202a72b1632733690310efb197f";
+          sha256 = "0jy08kj7cy744lbdyil0j50b08vm76bzxwmzd99v4sz12s3qcd2s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/async";
-          sha256 = "063ci4f35x1zm9ixy110i5ds0vsrcafpixrz3xkvpnfqdn29si3f";
-          name = "async";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "http://melpa.org/#/async";
-          license = lib.licenses.free;
-        };
-      }) {};
-    aurel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "aurel";
-        version = "0.7";
-        src = fetchFromGitHub {
-          owner = "alezost";
-          repo = "aurel";
-          rev = "3458214e0d2942b03c2926de67ca06cbe42b37d0";
-          sha256 = "01ig5v5f2xya7hyq678nd8j8x972yfbni813c0imxkkba996a2k7";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aurel";
-          sha256 = "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl";
-          name = "aurel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/assess";
+          sha256 = "0xj3f48plwxmibax00qn15ya7s0h560xzwr8nkwl5r151v1mc9rr";
+          name = "assess";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/aurel";
+          homepage = "https://melpa.org/#/assess";
+          license = lib.licenses.free;
+        };
+      }) {};
+    async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "async";
+        version = "1.7";
+        src = fetchFromGitHub {
+          owner = "jwiegley";
+          repo = "emacs-async";
+          rev = "22de0f5792c9140f1da7c7459f30da0863b07e78";
+          sha256 = "074wdciq62jfc41f829590p4y52dnkn3nxicj9lcabgxwz7cahjp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/async";
+          sha256 = "063ci4f35x1zm9ixy110i5ds0vsrcafpixrz3xkvpnfqdn29si3f";
+          name = "async";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/async";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aurel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "aurel";
+        version = "0.8";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "aurel";
+          rev = "2b462d08c0e21f7fee0039457a02fa766fc6181c";
+          sha256 = "0dqr1yrzf7a8655dsbcch4622rc75j9yjbn9zhkyikqjicddnlda";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/aurel";
+          sha256 = "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl";
+          name = "aurel";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/aurel";
           license = lib.licenses.free;
         };
       }) {};
@@ -1464,81 +1548,81 @@
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "bdd";
-          repo = "aurora-config.el";
+          repo = "aurora-config-mode.el";
           rev = "0a7ca7987c3a0824e25470389c7d25c337a81593";
           sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aurora-config-mode";
-          sha256 = "0yqmpwj1vp0d5w9zw1hbyxzsbvw165dsgk1v1dxizkqwn7b1v7jm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/aurora-config-mode";
+          sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c";
           name = "aurora-config-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/aurora-config-mode";
+          homepage = "https://melpa.org/#/aurora-config-mode";
           license = lib.licenses.free;
         };
       }) {};
     auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }:
     melpaBuild {
         pname = "auth-password-store";
-        version = "1.0.3";
+        version = "1.0.4";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "auth-password-store";
-          rev = "d7fc1f026c3f43190cacedfa6eff8da916e607f5";
-          sha256 = "0gi65n1np63zi2ylc4y1licwvk97jl92s1v98fv5y61kppi1d8sq";
+          rev = "209663c772105ae87d244cce9247695823914a00";
+          sha256 = "1b6g7qvrxv6gkl4izq1y7k0x0l7izyfnpki10di5vdv3jp6xg9b2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auth-password-store";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auth-password-store";
           sha256 = "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5";
           name = "auth-password-store";
         };
         packageRequires = [ cl-lib emacs password-store seq ];
         meta = {
-          homepage = "http://melpa.org/#/auth-password-store";
+          homepage = "https://melpa.org/#/auth-password-store";
           license = lib.licenses.free;
         };
       }) {};
     auto-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }:
     melpaBuild {
         pname = "auto-compile";
-        version = "1.3.0";
+        version = "1.3.1";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "auto-compile";
-          rev = "90eddfb63bd2b58be8a3fe9400b67ea45f67bb29";
-          sha256 = "07vnk8az4lcxncqn01jvks38b4hpdmg43nbby2b39zy50agqnwsg";
+          rev = "61c6bec0ab4e44fe68628a5ee0c8b3b7f50c001f";
+          sha256 = "05crb8cm7s1nggrqq0xcs2xiabjw3vh44fnkdiilq1c5cnajdcrj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-compile";
           sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks";
           name = "auto-compile";
         };
         packageRequires = [ dash emacs packed ];
         meta = {
-          homepage = "http://melpa.org/#/auto-compile";
+          homepage = "https://melpa.org/#/auto-compile";
           license = lib.licenses.free;
         };
       }) {};
     auto-complete = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "auto-complete";
-        version = "1.5.0";
+        version = "1.5.1";
         src = fetchFromGitHub {
           owner = "auto-complete";
           repo = "auto-complete";
-          rev = "70770b17168c30fe482467d7219cfbe8650c5e1c";
-          sha256 = "0q880dksf3bj1hixa4zhj3ybvrqf1wcnjnmb37i49qwdy6p1ma06";
+          rev = "0655b7f1e6c0f8475adc55f2b86404a877f26a77";
+          sha256 = "04i9b11iksg6acn885wl3qgi5xpsm3yszlqmd2x21yhprndlz7gb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-complete";
           sha256 = "1c4ij5bnclg94jdzhkqvq2vxwv6wvs051mbki1ibjm5f2hlacvh3";
           name = "auto-complete";
         };
         packageRequires = [ cl-lib popup ];
         meta = {
-          homepage = "http://melpa.org/#/auto-complete";
+          homepage = "https://melpa.org/#/auto-complete";
           license = lib.licenses.free;
         };
       }) {};
@@ -1553,13 +1637,13 @@
           sha256 = "1kp2l1cgzlg2g3wllz4gl1ssn4lnx2sn26xqigfrpr8y5rj2bsfj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-clang-async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-complete-clang-async";
           sha256 = "1jj0jn1v3070g7g0j5gvpybv145kki8nsjxqb8fjf9qag8ilfkjh";
           name = "auto-complete-clang-async";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/auto-complete-clang-async";
+          homepage = "https://melpa.org/#/auto-complete-clang-async";
           license = lib.licenses.free;
         };
       }) {};
@@ -1574,13 +1658,13 @@
           sha256 = "1fqgyg986fg1dzac5wa97bx82mfddqb6qrfnpr3zksmw3vgykxr0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-exuberant-ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-complete-exuberant-ctags";
           sha256 = "1i2s3ycc8jafkzdsz3kbvx1hh95ydi5s6rq6n0wzw1kyy3km35gd";
           name = "auto-complete-exuberant-ctags";
         };
         packageRequires = [ auto-complete ];
         meta = {
-          homepage = "http://melpa.org/#/auto-complete-exuberant-ctags";
+          homepage = "https://melpa.org/#/auto-complete-exuberant-ctags";
           license = lib.licenses.free;
         };
       }) {};
@@ -1595,13 +1679,13 @@
           sha256 = "18bf1kw85mab0zp7rn85cm1nxjxg5c1dmiv0j0mjwzsv8an4px5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-nxml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-complete-nxml";
           sha256 = "0viscr5k1carn9vhflry16kgihr6fvh6h36b049pgnk6ww085k6a";
           name = "auto-complete-nxml";
         };
         packageRequires = [ auto-complete ];
         meta = {
-          homepage = "http://melpa.org/#/auto-complete-nxml";
+          homepage = "https://melpa.org/#/auto-complete-nxml";
           license = lib.licenses.free;
         };
       }) {};
@@ -1616,13 +1700,13 @@
           sha256 = "1hf2f903hy9afahrgy2fx9smgn631drs6733188zgqi3nkyizj26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-pcmp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-complete-pcmp";
           sha256 = "1mpgkwj8jwpvxphlm6iaprwjrldmihbgg97jav0fbm1kjnm4azna";
           name = "auto-complete-pcmp";
         };
         packageRequires = [ auto-complete log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/auto-complete-pcmp";
+          homepage = "https://melpa.org/#/auto-complete-pcmp";
           license = lib.licenses.free;
         };
       }) {};
@@ -1637,13 +1721,13 @@
           sha256 = "0l49ciic7g30vklxq6l1ny3mz87l5p8qc30rmkjvkzvg8r52ksn3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-complete-sage";
           sha256 = "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1";
           name = "auto-complete-sage";
         };
         packageRequires = [ auto-complete sage-shell-mode ];
         meta = {
-          homepage = "http://melpa.org/#/auto-complete-sage";
+          homepage = "https://melpa.org/#/auto-complete-sage";
           license = lib.licenses.free;
         };
       }) {};
@@ -1658,13 +1742,13 @@
           sha256 = "191294k92qp8gmfypf0q8j8qrym96aqikzvyb9p03wqvbr3r1dsk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-dictionary";
           sha256 = "1va485a8lxvb3507kr83cr6wpssxnf8y4l42mamn9daa8sjx3q16";
           name = "auto-dictionary";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/auto-dictionary";
+          homepage = "https://melpa.org/#/auto-dictionary";
           license = lib.licenses.free;
         };
       }) {};
@@ -1679,13 +1763,13 @@
           sha256 = "1hlsgsdxpx42kmqkjgy9b9ldz5i4dbi879v87pjd2qbkj8iywb6y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-indent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-indent-mode";
           sha256 = "1nk78p8lqs8cx90asfs8iaqnwwyy8fi5bafaprm9c0nrxz299ibz";
           name = "auto-indent-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/auto-indent-mode";
+          homepage = "https://melpa.org/#/auto-indent-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -1700,13 +1784,13 @@
           sha256 = "05llpa6g4nb4qswmcn7j3bs7hnmkrkax7hsk7wvklr0wrljyg9a2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-package-update";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-package-update";
           sha256 = "0fdcniq5mrwbc7yvma4088r0frdfvc2ydfil0s003faz0nrjcp8k";
           name = "auto-package-update";
         };
         packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/auto-package-update";
+          homepage = "https://melpa.org/#/auto-package-update";
           license = lib.licenses.free;
         };
       }) {};
@@ -1721,13 +1805,13 @@
           sha256 = "1h8zsgw30axprs7a5kkygbhvilillzazxgqz01ng36il65fi28s6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-shell-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-shell-command";
           sha256 = "1i78fh72i8yv91rnabf0vs78r43qrjkr36hndmn5ya2xs3b1g41j";
           name = "auto-shell-command";
         };
         packageRequires = [ deferred popwin ];
         meta = {
-          homepage = "http://melpa.org/#/auto-shell-command";
+          homepage = "https://melpa.org/#/auto-shell-command";
           license = lib.licenses.free;
         };
       }) {};
@@ -1742,13 +1826,13 @@
           sha256 = "0n3r7j83csby2s7284hy5pycynazyrkljxkn6xqn08gvxbbbdpdq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/auto-yasnippet";
           sha256 = "02281gyy07cy72a29fjsixg9byqq3izb9m1jxv98ni8pcy3bpsqa";
           name = "auto-yasnippet";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/auto-yasnippet";
+          homepage = "https://melpa.org/#/auto-yasnippet";
           license = lib.licenses.free;
         };
       }) {};
@@ -1763,13 +1847,13 @@
           sha256 = "1pf2mwnicj5x2kksxwmrzz2vfxj9y9r6rzgc1fl8028mfrmrmg8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/autodisass-java-bytecode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/autodisass-java-bytecode";
           sha256 = "1k19nkbxnysm3qkpdhz4gv2x9nnrp94xl40x84q8n84s6xaan4dc";
           name = "autodisass-java-bytecode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/autodisass-java-bytecode";
+          homepage = "https://melpa.org/#/autodisass-java-bytecode";
           license = lib.licenses.free;
         };
       }) {};
@@ -1784,13 +1868,13 @@
           sha256 = "1hyp49bidwc53cr25wwwyzcd0cbbqzxkfcpnccimphv24qfsai85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/autodisass-llvm-bitcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/autodisass-llvm-bitcode";
           sha256 = "0bh73nzll9jp7kiqfnb5dwkipw85p3c3cyq58s0nghig02z63j01";
           name = "autodisass-llvm-bitcode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/autodisass-llvm-bitcode";
+          homepage = "https://melpa.org/#/autodisass-llvm-bitcode";
           license = lib.licenses.free;
         };
       }) {};
@@ -1805,13 +1889,13 @@
           sha256 = "0g6kd1r0wizamw26bhp5jkvpsd98rcybkfchc622b9v5b89a07nq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/autopair";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/autopair";
           sha256 = "161qhk8rc1ldj9hpg0k9phka0gflz9vny7gc8rnylk90p6asmr28";
           name = "autopair";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/autopair";
+          homepage = "https://melpa.org/#/autopair";
           license = lib.licenses.free;
         };
       }) {};
@@ -1826,13 +1910,13 @@
           sha256 = "0rq9ab264565z83cly743nbhrd9m967apmnlhqr1gy8dm4hcy7nm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/avy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/avy";
           sha256 = "0gjq79f8jagbngp0shkcqmwhisc3hpgwfk34kq30nb929nbnlmag";
           name = "avy";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/avy";
+          homepage = "https://melpa.org/#/avy";
           license = lib.licenses.free;
         };
       }) {};
@@ -1847,34 +1931,34 @@
           sha256 = "1564yv9330vjymw3xnikc2lz20f65n40fbl8m1zs1gp4nlgzkk38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/avy-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/avy-menu";
           sha256 = "1g2bsm0jpig51jwn9f9mx6z5glb0bn4s21194xam768qin0rf4iw";
           name = "avy-menu";
         };
         packageRequires = [ avy emacs ];
         meta = {
-          homepage = "http://melpa.org/#/avy-menu";
+          homepage = "https://melpa.org/#/avy-menu";
           license = lib.licenses.free;
         };
       }) {};
     avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
     melpaBuild {
         pname = "avy-migemo";
-        version = "0.3";
+        version = "0.3.2";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "avy-migemo";
-          rev = "d95d0485f2fc580a918c4769f669d273c7a6c334";
-          sha256 = "0n1c5xvr782zgvby38w6wxrqac1lx35n0m7rl4ki325c6dchkgsx";
+          rev = "ce87777bea76c45be5f185e9fe356a8efe5c2d16";
+          sha256 = "0s6m44b49jm5cnrx1pvk7rfw3zhwiw5xasdlgmlvv7wws7m5snd9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/avy-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/avy-migemo";
           sha256 = "1zvgkhma445gj1zjl8j25prw95bdpjbvfy8yr0r5liay6g2hf296";
           name = "avy-migemo";
         };
         packageRequires = [ avy emacs migemo ];
         meta = {
-          homepage = "http://melpa.org/#/avy-migemo";
+          homepage = "https://melpa.org/#/avy-migemo";
           license = lib.licenses.free;
         };
       }) {};
@@ -1889,13 +1973,13 @@
           sha256 = "0lmv34pi9qdh76fi3w4lrfyfhzr824nsiif4nyjvpnmrabxgk309";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/avy-zap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/avy-zap";
           sha256 = "1zbkf21ggrmg1w0xaw40i3swgc1g4fz0j8p0r9djm9j120d94zkx";
           name = "avy-zap";
         };
         packageRequires = [ avy ];
         meta = {
-          homepage = "http://melpa.org/#/avy-zap";
+          homepage = "https://melpa.org/#/avy-zap";
           license = lib.licenses.free;
         };
       }) {};
@@ -1910,13 +1994,13 @@
           sha256 = "0px1xggk6qyrwkma1p3d7b4z2id2gbrsxkliw3nwc1q4zndg1zr7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/babel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/babel";
           sha256 = "0sdpp4iym61ni32zv75n48ylj4jib8ca6n9hyqwj1b7nqg76mm1c";
           name = "babel";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/babel";
+          homepage = "https://melpa.org/#/babel";
           license = lib.licenses.free;
         };
       }) {};
@@ -1931,7 +2015,7 @@
           sha256 = "0hmn3jlsqgpc602lbcs9wzw0hgr5qpjdcxi2hjlc1cp27ilyscnf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/back-button";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/back-button";
           sha256 = "0vyhvm445d0rs14j5xi419akk5nd88d4hvm4251z62fmnvs50j85";
           name = "back-button";
         };
@@ -1943,7 +2027,7 @@
           ucs-utils
         ];
         meta = {
-          homepage = "http://melpa.org/#/back-button";
+          homepage = "https://melpa.org/#/back-button";
           license = lib.licenses.free;
         };
       }) {};
@@ -1958,13 +2042,13 @@
           sha256 = "1plh7i4zhs5p7qkv7p7lnfrmkszn8b3znwvbxgp7wpxay5safc5j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/badwolf-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/badwolf-theme";
           sha256 = "03plkzpmlh0pgfp1c9padsh4w2g23clsznym8x4jabxnk0ynhq41";
           name = "badwolf-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/badwolf-theme";
+          homepage = "https://melpa.org/#/badwolf-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -1979,13 +2063,13 @@
           sha256 = "11rlmrjdpa3vnf0h9vcd75946q9jyf1mpbm7h12hmpj6g2pavgdd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bash-completion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bash-completion";
           sha256 = "0l41yj0sb87i27hw6dh35l32hg4qkka6r3bpkckjnfm0xifrd9hj";
           name = "bash-completion";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bash-completion";
+          homepage = "https://melpa.org/#/bash-completion";
           license = lib.licenses.free;
         };
       }) {};
@@ -2000,13 +2084,13 @@
           sha256 = "1xvxz9sk9l57a4kiiavxxdp0v241mfgiy2lg5ilacq1cd6xrrhky";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbcode-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bbcode-mode";
           sha256 = "0ixxavmilr6na56yc148prbh3nlhcwir6rxqvh332cr8vr9gmp89";
           name = "bbcode-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bbcode-mode";
+          homepage = "https://melpa.org/#/bbcode-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -2021,13 +2105,13 @@
           sha256 = "17nbnkg0zn6p89r27mk9hl6qhv6xscwdsq8iyikdw03svpr16lnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb-";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bbdb-";
           sha256 = "1vzbalcchay4pxl9f1sxg0zclgc095f59dlj15pj0bqq61sbl9jf";
           name = "bbdb-";
         };
         packageRequires = [ bbdb log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/bbdb-";
+          homepage = "https://melpa.org/#/bbdb-";
           license = lib.licenses.free;
         };
       }) {};
@@ -2042,13 +2126,13 @@
           sha256 = "0fg72qnb40djyciy4gzj359lqlcbbrq0indbkzd0dj09zipkx0df";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb-vcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bbdb-vcard";
           sha256 = "1kn98b7mh9a28933r4yl8qfl9p92rpix4vkp71sar9cka0m71ilj";
           name = "bbdb-vcard";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bbdb-vcard";
+          homepage = "https://melpa.org/#/bbdb-vcard";
           license = lib.licenses.free;
         };
       }) {};
@@ -2063,13 +2147,13 @@
           sha256 = "1zkh7dcas80wwjvigl27wj8sp4b5z6lh3qj7zkziinwamwnxbdbs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb2erc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bbdb2erc";
           sha256 = "0k1f6mq9xd3568vg01dqqvcdbdshbdsi4ivkjyxis6dqfnqhlfdd";
           name = "bbdb2erc";
         };
         packageRequires = [ bbdb ];
         meta = {
-          homepage = "http://melpa.org/#/bbdb2erc";
+          homepage = "https://melpa.org/#/bbdb2erc";
           license = lib.licenses.free;
         };
       }) {};
@@ -2078,19 +2162,19 @@
         pname = "beeminder";
         version = "1.0.0";
         src = fetchFromGitHub {
-          owner = "sodaware";
+          owner = "Sodaware";
           repo = "beeminder.el";
           rev = "54cc1277f2a7667a7b0d999dc49ceffcf2862b44";
           sha256 = "01d10algmi9a4xd7mzf7n3zxfs2qf5as66wx17mff5cd8dahxj1q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/beeminder";
-          sha256 = "0aj7ix7nrsl89f9c449kik8fbzhfk9li50wrh50cdwgfh8gda0fx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/beeminder";
+          sha256 = "1cb8xmgsv23b464hpchm9f9i64p3fyf7aillrwk1aa2l1008kyww";
           name = "beeminder";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/beeminder";
+          homepage = "https://melpa.org/#/beeminder";
           license = lib.licenses.free;
         };
       }) {};
@@ -2105,13 +2189,13 @@
           sha256 = "1agrci37bni1vfkxg171l53fvsnjdryhf05v54wj07jngnwf3cw9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/beginend";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/beginend";
           sha256 = "1y81kr9q0zrsr3c3s14rm6l86y5wf1a0kia6d98112fy4fwdm7kq";
           name = "beginend";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/beginend";
+          homepage = "https://melpa.org/#/beginend";
           license = lib.licenses.free;
         };
       }) {};
@@ -2126,13 +2210,55 @@
           sha256 = "1rxznx2l0cdpiz8mad8s6q17m1fngpgb1cki7ch6yh18r3qz8ysr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/better-defaults";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/better-defaults";
           sha256 = "13bqcmx2gagm2ykg921ik3awp8zvw5d4lb69rr6gkpjlqp7nq2cm";
           name = "better-defaults";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/better-defaults";
+          homepage = "https://melpa.org/#/better-defaults";
+          license = lib.licenses.free;
+        };
+      }) {};
+    biblio = callPackage ({ biblio-core, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "biblio";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "cpitclaudel";
+          repo = "biblio.el";
+          rev = "2550042b647b2b5c400c9cd8ec5fc80adb0fa6df";
+          sha256 = "0skg8wcgdfzd59ay4fbbbdd258cm8q7v321iml46bdipzk0r5lnw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/biblio";
+          sha256 = "0ym7xvcfd7hh3qdpfb8zpa7w8s4lpg0vngh9d0ns3s3lnhz4mi0g";
+          name = "biblio";
+        };
+        packageRequires = [ biblio-core emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/biblio";
+          license = lib.licenses.free;
+        };
+      }) {};
+    biblio-core = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, seq }:
+    melpaBuild {
+        pname = "biblio-core";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "cpitclaudel";
+          repo = "biblio.el";
+          rev = "2550042b647b2b5c400c9cd8ec5fc80adb0fa6df";
+          sha256 = "0skg8wcgdfzd59ay4fbbbdd258cm8q7v321iml46bdipzk0r5lnw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/biblio-core";
+          sha256 = "0zpfamrb2gka41h834a05hxdbw4h55777kh6rhjikjfmy765nl97";
+          name = "biblio-core";
+        };
+        packageRequires = [ dash emacs let-alist seq ];
+        meta = {
+          homepage = "https://melpa.org/#/biblio-core";
           license = lib.licenses.free;
         };
       }) {};
@@ -2147,13 +2273,34 @@
           sha256 = "07vwg0bg719gb8ln1n5a33103903vvrphnkbvvfn43904pkrf14w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bind-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bind-key";
           sha256 = "1qw2c27016d3yfg0w10is1v72y2jvzhq07ca4h6v17yi94ahj5xm";
           name = "bind-key";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bind-key";
+          homepage = "https://melpa.org/#/bind-key";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bind-map = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bind-map";
+        version = "1.0.4";
+        src = fetchFromGitHub {
+          owner = "justbur";
+          repo = "emacs-bind-map";
+          rev = "6f84c0254f9ef7580ee32fb66190cc694cc05629";
+          sha256 = "047qzylycx3r06dd0q9q9f37pvfigmlv59gi3wqvlg6k3gcmdvy0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bind-map";
+          sha256 = "1jzkp010b4vs1bdhccf5igmymfxab4vxs1pccpk9n5n5a4xaa358";
+          name = "bind-map";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/bind-map";
           license = lib.licenses.free;
         };
       }) {};
@@ -2168,13 +2315,13 @@
           sha256 = "0pmpg54faq0l886f2cmnmwm28d2yfg8adk7gp7623gx0ifggn332";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bing-dict";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bing-dict";
           sha256 = "0s5pd08rcnvmgi1hw17xbzvswlv0yni6h2h2gccrjmf6izi8whh1";
           name = "bing-dict";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bing-dict";
+          homepage = "https://melpa.org/#/bing-dict";
           license = lib.licenses.free;
         };
       }) {};
@@ -2189,13 +2336,13 @@
           sha256 = "1r3f5d67x257g8kvdbdsl4w3y1dvc1d6s9x8bygbkvyahfi5m5hn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/birds-of-paradise-plus-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/birds-of-paradise-plus-theme";
           sha256 = "0vdv2siy30kf1qhzrc39sygjk17lwm3ix58pcs3shwkg1y5amj3m";
           name = "birds-of-paradise-plus-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/birds-of-paradise-plus-theme";
+          homepage = "https://melpa.org/#/birds-of-paradise-plus-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -2210,13 +2357,13 @@
           sha256 = "1j2ar9sinbrraqvymqmjray48xbr1arhpigzgkgnhkc2zzqv8dwb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bog";
           sha256 = "1ci8xxca7dclmi5v37y5k45qlmzs6a9hi6m7czgiwxii902w5pkl";
           name = "bog";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/bog";
+          homepage = "https://melpa.org/#/bog";
           license = lib.licenses.free;
         };
       }) {};
@@ -2231,13 +2378,13 @@
           sha256 = "1q3ws2vn062dh7ci6jn2k2bcn7szh3ap64sgwkzdd6f1pas37fnr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bongo";
           sha256 = "07i9gw067r2igp6s2g2iakm1ybvw04q6zznna2cfdf08nax64ghv";
           name = "bongo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bongo";
+          homepage = "https://melpa.org/#/bongo";
           license = lib.licenses.free;
         };
       }) {};
@@ -2252,13 +2399,13 @@
           sha256 = "1apxgj14hgfpz6hjp3384yjf2zrkv4pcncf2zklijs668igvaskq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/boon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/boon";
           sha256 = "0gryw7x97jd46jgrm93cjagj4p7w93cjc36i2ps9ajf0d8m4gajb";
           name = "boon";
         };
         packageRequires = [ emacs expand-region multiple-cursors ];
         meta = {
-          homepage = "http://melpa.org/#/boon";
+          homepage = "https://melpa.org/#/boon";
           license = lib.licenses.free;
         };
       }) {};
@@ -2273,13 +2420,13 @@
           sha256 = "0235l4f1cxj7nysfnay4fz52mg0c13pzqxbhw65vdpfzz1gl1p73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/boxquote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/boxquote";
           sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s";
           name = "boxquote";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/boxquote";
+          homepage = "https://melpa.org/#/boxquote";
           license = lib.licenses.free;
         };
       }) {};
@@ -2294,13 +2441,13 @@
           sha256 = "0y9m6cv70pzcm0v2v8nwmyh1xx40831chx72m85h5ic5db03gy7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/browse-kill-ring";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/browse-kill-ring";
           sha256 = "1d97ap0vrg5ymp96z7y6si98fspxzy02jh1i4clvw5lggjfibhq4";
           name = "browse-kill-ring";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/browse-kill-ring";
+          homepage = "https://melpa.org/#/browse-kill-ring";
           license = lib.licenses.free;
         };
       }) {};
@@ -2315,13 +2462,13 @@
           sha256 = "08qz9l0gb7fvknzkp67srhldzkk8cylnbn0qwkflxgcs6ndfk95y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/browse-url-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/browse-url-dwim";
           sha256 = "13bv2ka5pp9k4kwrxfqfawwxzsqlakvpi9a32gxgx7qfi0dcb1rf";
           name = "browse-url-dwim";
         };
         packageRequires = [ string-utils ];
         meta = {
-          homepage = "http://melpa.org/#/browse-url-dwim";
+          homepage = "https://melpa.org/#/browse-url-dwim";
           license = lib.licenses.free;
         };
       }) {};
@@ -2336,13 +2483,13 @@
           sha256 = "0s43cvkr1za5sd2cvl55ig34wbp8xyjf85snmf67ps04swyyk92q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buffer-flip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/buffer-flip";
           sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098";
           name = "buffer-flip";
         };
         packageRequires = [ key-chord ];
         meta = {
-          homepage = "http://melpa.org/#/buffer-flip";
+          homepage = "https://melpa.org/#/buffer-flip";
           license = lib.licenses.free;
         };
       }) {};
@@ -2357,13 +2504,13 @@
           sha256 = "0xdks4jfqyhkh34y48iq3gz8swp0f526kwnaai5mhgvazvs4za8c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buffer-move";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/buffer-move";
           sha256 = "0wysywff2bggrha7lpl83c8x6ln7zgdj9gsqmjva6gramqb260fg";
           name = "buffer-move";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/buffer-move";
+          homepage = "https://melpa.org/#/buffer-move";
           license = lib.licenses.free;
         };
       }) {};
@@ -2378,13 +2525,13 @@
           sha256 = "0rp9hiysy13c4in7b420r7yjza2knlmvphj7l01xbxphbilplqk5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buffer-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/buffer-utils";
           sha256 = "0cfipdn4fc4fvz513mwiaihvbdi05mza3z5z1379wlljw6r539z2";
           name = "buffer-utils";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/buffer-utils";
+          homepage = "https://melpa.org/#/buffer-utils";
           license = lib.licenses.free;
         };
       }) {};
@@ -2399,13 +2546,13 @@
           sha256 = "0x9q4amsmawi8jqj9xxg81khvb3gyyf9hjvb0w6vhrgjwpxiq8sy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bufshow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bufshow";
           sha256 = "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h";
           name = "bufshow";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bufshow";
+          homepage = "https://melpa.org/#/bufshow";
           license = lib.licenses.free;
         };
       }) {};
@@ -2420,13 +2567,13 @@
           sha256 = "07jzg58a3jxs4mmsgb35f5f8awazlvzak9wrhif6xb60jq1wrp0v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bug-reference-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bug-reference-github";
           sha256 = "18yzxwanbrxsab6ba75z1196x0m6dapdhbvy6df5b5x5viz99cf6";
           name = "bug-reference-github";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bug-reference-github";
+          homepage = "https://melpa.org/#/bug-reference-github";
           license = lib.licenses.free;
         };
       }) {};
@@ -2441,13 +2588,13 @@
           sha256 = "18d74nwcpk1i8adxzfwz1lgqqcxsc4wkrb490v64pph79dxsi80h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bundler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bundler";
           sha256 = "0i5ybc6i8ackxpaa75kwrg44zdq3jkvy48c42vaaafpddjwjnsy4";
           name = "bundler";
         };
         packageRequires = [ inf-ruby ];
         meta = {
-          homepage = "http://melpa.org/#/bundler";
+          homepage = "https://melpa.org/#/bundler";
           license = lib.licenses.free;
         };
       }) {};
@@ -2462,13 +2609,13 @@
           sha256 = "03hab3iw2jjckal20zwsw7cm38nf7pan0m96d8ab4i75phy6liyw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bury-successful-compilation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/bury-successful-compilation";
           sha256 = "1gkq4r1573m6m57fp7x69k7kcpqchpcqfcz3792v0wxr22zhkwr3";
           name = "bury-successful-compilation";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/bury-successful-compilation";
+          homepage = "https://melpa.org/#/bury-successful-compilation";
           license = lib.licenses.free;
         };
       }) {};
@@ -2483,34 +2630,34 @@
           sha256 = "1pii9dw4skq7nr4na6qxqasl36av8cwjp71bf1fgppqpcd9z8skj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/butler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/butler";
           sha256 = "1jv74l9jy55qpwf5np9nlj6a1wqsm3xirm7wm89d1h2mbsfcr0mq";
           name = "butler";
         };
         packageRequires = [ deferred emacs json ];
         meta = {
-          homepage = "http://melpa.org/#/butler";
+          homepage = "https://melpa.org/#/butler";
           license = lib.licenses.free;
         };
       }) {};
     buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buttercup";
-        version = "1.4";
+        version = "1.5";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "emacs-buttercup";
-          rev = "e1f71acdef3de3033d24be1cb41933eefc75029f";
-          sha256 = "0lpfx7q0qrclxii4ffrrjffb678bsx908za91nsy7mc2g0cxcapb";
+          rev = "657acef2132a6fdf0796f8ec62c5f261c1beebf0";
+          sha256 = "0wkivh8x75gfsks6hy1ps9mlk101hrwsk8hqxx7qhs7f5iv0a082";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buttercup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/buttercup";
           sha256 = "1grrrdk5pl9l1jvnwzl8g0102gipvxb5qn6k2nmv28jpl57v8dkb";
           name = "buttercup";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/buttercup";
+          homepage = "https://melpa.org/#/buttercup";
           license = lib.licenses.free;
         };
       }) {};
@@ -2525,13 +2672,13 @@
           sha256 = "1kqcc1d56jz107bswlzvdng6ny6qwp93yck2i2j921msn62qvbb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/button-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/button-lock";
           sha256 = "1arrdmb3nm570hgs18y9sz3z9v0wlkr3vwa2zgfnc15lmf0y34mp";
           name = "button-lock";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/button-lock";
+          homepage = "https://melpa.org/#/button-lock";
           license = lib.licenses.free;
         };
       }) {};
@@ -2546,13 +2693,13 @@
           sha256 = "1k2hmc87ifww95k3m8ksiswkk2z0y8grssba7381g8dnlp6jgprx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cacoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cacoo";
           sha256 = "0kri4vi6dpsf0zk24psm16f3aa27cq5b54ga7zygmr02csq24a6z";
           name = "cacoo";
         };
         packageRequires = [ concurrent ];
         meta = {
-          homepage = "http://melpa.org/#/cacoo";
+          homepage = "https://melpa.org/#/cacoo";
           license = lib.licenses.free;
         };
       }) {};
@@ -2567,13 +2714,13 @@
           sha256 = "0bvrwzjx93qyx97qqw0imvnkkx4w91yk99rnhcmk029zj1fy0kzg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cake";
           sha256 = "06qlqrazz2jr08g44q73hx9vpp6xnjvkpd6ky108g0xc5p9q2hcr";
           name = "cake";
         };
         packageRequires = [ anything cake-inflector historyf ];
         meta = {
-          homepage = "http://melpa.org/#/cake";
+          homepage = "https://melpa.org/#/cake";
           license = lib.licenses.free;
         };
       }) {};
@@ -2588,13 +2735,13 @@
           sha256 = "1w7yq35gzzwyf480d8gc5r6jbnawg09l6663q068ir6zr9pp4far";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cake-inflector";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cake-inflector";
           sha256 = "04mrqcm1igb638skaq2b3nr5yzxnck2vwhln61rnh7lkfxq7wbwf";
           name = "cake-inflector";
         };
         packageRequires = [ s ];
         meta = {
-          homepage = "http://melpa.org/#/cake-inflector";
+          homepage = "https://melpa.org/#/cake-inflector";
           license = lib.licenses.free;
         };
       }) {};
@@ -2609,13 +2756,13 @@
           sha256 = "15w21r0gqblbn9wlvb4wlm3706wf01r38mp465snjzi839f6sazb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cake2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cake2";
           sha256 = "03q8vqqjlhahgnyy976c46x52splwdjpmb9ngrj5c2z7d8n9145x";
           name = "cake2";
         };
         packageRequires = [ anything cake-inflector dash f historyf ht json s ];
         meta = {
-          homepage = "http://melpa.org/#/cake2";
+          homepage = "https://melpa.org/#/cake2";
           license = lib.licenses.free;
         };
       }) {};
@@ -2630,13 +2777,13 @@
           sha256 = "1rv6slk3a7ca2q16isjlkmgxbxmbqx4lx2ip7z33fvnq10r5h60n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/calfw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/calfw";
           sha256 = "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8";
           name = "calfw";
         };
         packageRequires = [ google-maps ];
         meta = {
-          homepage = "http://melpa.org/#/calfw";
+          homepage = "https://melpa.org/#/calfw";
           license = lib.licenses.free;
         };
       }) {};
@@ -2651,34 +2798,34 @@
           sha256 = "0v927m3l5cf0j0rs0nfk5whwqmmxs941d8qalxi19j1ihspjz8d6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/camcorder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/camcorder";
           sha256 = "1kbnpz3kn8ycpy8nlp8bsnnd1k1h7m02h7w5f7raw97sk4cnpvbi";
           name = "camcorder";
         };
         packageRequires = [ cl-lib emacs names ];
         meta = {
-          homepage = "http://melpa.org/#/camcorder";
+          homepage = "https://melpa.org/#/camcorder";
           license = lib.licenses.free;
         };
       }) {};
     cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
     melpaBuild {
         pname = "cargo";
-        version = "0.1.1";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "kwrooijen";
           repo = "cargo.el";
-          rev = "e6a02346fc033d6342183a76a49156d4091ef402";
-          sha256 = "152d5ym4bqnlnp6rafgy8fafx8246n78ymlcx9k2nyfar4c0lir2";
+          rev = "9db98208c1086dffdb351c85a74a096b48e6141f";
+          sha256 = "0xgnq21fb37y05535ipy0z584pnaglxy5bfqzdppyzsy7lpbb4k3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cargo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cargo";
           sha256 = "06zq657cxfk5l4867qqsvhskcqc9wswyl030wj27a43idj8n41jx";
           name = "cargo";
         };
         packageRequires = [ emacs rust-mode ];
         meta = {
-          homepage = "http://melpa.org/#/cargo";
+          homepage = "https://melpa.org/#/cargo";
           license = lib.licenses.free;
         };
       }) {};
@@ -2693,13 +2840,13 @@
           sha256 = "0mg49rpz362ipn5qzqhyfs3d6fpb51rfa73kna3gxdw0wxq2sa7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/caseformat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/caseformat";
           sha256 = "1qwyr74jbx4jpfcw8sccg47q1vdg094rr06m111gsz2yaj9m0gfk";
           name = "caseformat";
         };
         packageRequires = [ cl-lib dash emacs s ];
         meta = {
-          homepage = "http://melpa.org/#/caseformat";
+          homepage = "https://melpa.org/#/caseformat";
           license = lib.licenses.free;
         };
       }) {};
@@ -2714,13 +2861,34 @@
           sha256 = "1hvm6r6a8rgjwnn2mcamwqrmhz424vlr4mbvbri3wmn0ikbk510l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cask";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cask";
           sha256 = "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5";
           name = "cask";
         };
         packageRequires = [ cl-lib dash epl f package-build s shut-up ];
         meta = {
-          homepage = "http://melpa.org/#/cask";
+          homepage = "https://melpa.org/#/cask";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cask-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cask-mode";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "cask-mode";
+          rev = "5203b1beac4dd2ee07a6e993bc86719f5f35dbbf";
+          sha256 = "09y4cr32i2cw06lnq698lajxmqyzq2ah426f4dm176xfbrim89d5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cask-mode";
+          sha256 = "0fs9zyihipr3klnh3w22h43qz0wnxplm62x4kx7pm1chq9bc9kz6";
+          name = "cask-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/cask-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -2735,13 +2903,13 @@
           sha256 = "0padb1zfjkmx9kbqnqh744qvpd3ln0khwxifxld9cpcpdp5k04vc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cask-package-toolset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cask-package-toolset";
           sha256 = "13ix093c0a58rjqj7zfp3914xj3hvj276gb2d8zhvrx9vvs1345g";
           name = "cask-package-toolset";
         };
         packageRequires = [ ansi cl-lib commander dash emacs f s shut-up ];
         meta = {
-          homepage = "http://melpa.org/#/cask-package-toolset";
+          homepage = "https://melpa.org/#/cask-package-toolset";
           license = lib.licenses.free;
         };
       }) {};
@@ -2756,13 +2924,13 @@
           sha256 = "1j1lw5zifp7q1ykm6si0nzxfp7n3z2lzla2njkkxmc2s6m7w4x1a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/caskxy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/caskxy";
           sha256 = "0x4s3c8m75zxsvqpgfc5xwll0489zzdnngmnq048z9gkgcd7pd2s";
           name = "caskxy";
         };
         packageRequires = [ log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/caskxy";
+          homepage = "https://melpa.org/#/caskxy";
           license = lib.licenses.free;
         };
       }) {};
@@ -2777,13 +2945,13 @@
           sha256 = "125d5i7ycdn2hgffc1l3jqcfzvk70m1ciywj4h53qakkl15r9m38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cbm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cbm";
           sha256 = "02ch0gdw610c8dfxxjxs7ijsc9lzbhklj7hqgwfwksnyc36zcjmn";
           name = "cbm";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/cbm";
+          homepage = "https://melpa.org/#/cbm";
           license = lib.licenses.free;
         };
       }) {};
@@ -2798,13 +2966,13 @@
           sha256 = "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cdlatex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cdlatex";
           sha256 = "1jsfmzl13fykbg7l4wv9si7z11ai5lzvkndzbxh9cyqlvznq0m64";
           name = "cdlatex";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cdlatex";
+          homepage = "https://melpa.org/#/cdlatex";
           license = lib.licenses.free;
         };
       }) {};
@@ -2819,13 +2987,13 @@
           sha256 = "07h5g905i1jglsryl0dnqxz8yya5kkyjjggzbk4nl3rcj41lyas7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/celery";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/celery";
           sha256 = "0m3hmvp6xz2m7z1kbb0ii0j3c95zi19652gfixq5a5x23kz8y59h";
           name = "celery";
         };
         packageRequires = [ dash-functional deferred emacs s ];
         meta = {
-          homepage = "http://melpa.org/#/celery";
+          homepage = "https://melpa.org/#/celery";
           license = lib.licenses.free;
         };
       }) {};
@@ -2840,34 +3008,34 @@
           sha256 = "08hqgsjvs62l1cfzshbpj80xd8365qmx2b5r5jq20d5cj68s36wl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cerbere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cerbere";
           sha256 = "1g3svmh5dlh5mvyag3hmiy90dfkk6f7ppd9qpwckxqyll9vl7r06";
           name = "cerbere";
         };
         packageRequires = [ f go-mode pkg-info s ];
         meta = {
-          homepage = "http://melpa.org/#/cerbere";
+          homepage = "https://melpa.org/#/cerbere";
           license = lib.licenses.free;
         };
       }) {};
     cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cfengine-code-style";
-        version = "3.8.1";
+        version = "3.8.2";
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "2df2383cc697250d996630d0a1f88e3a2f0e052b";
-          sha256 = "190gr30bscl80awilcjflwy9n7nvlz0hzmzmpx1wsa3wj3zf89yy";
+          rev = "d53aeb0e7c0ce2a3abb9ecf195a5f9f58fedc468";
+          sha256 = "1i10gbczyp067x1lw9vnn25bzgs1ckkrj9imnyz2a344g2124a3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cfengine-code-style";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cfengine-code-style";
           sha256 = "1ny8xvdnz740qmw9m81xnwd0gh0a516arpvl3nfimglaai5bfc9a";
           name = "cfengine-code-style";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cfengine-code-style";
+          homepage = "https://melpa.org/#/cfengine-code-style";
           license = lib.licenses.free;
         };
       }) {};
@@ -2882,13 +3050,13 @@
           sha256 = "0vb03k10i8vwy5wv65xl15kcsh9zz4y2xhpgndih87ssckdnhhlw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/char-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/char-menu";
           sha256 = "11jkwghrmmvpv7piznkpa0wilwjdsps9rix3950pfabhlllw268l";
           name = "char-menu";
         };
         packageRequires = [ avy-menu emacs ];
         meta = {
-          homepage = "http://melpa.org/#/char-menu";
+          homepage = "https://melpa.org/#/char-menu";
           license = lib.licenses.free;
         };
       }) {};
@@ -2903,13 +3071,13 @@
           sha256 = "0crnd64cnsnaj5mcy55q0sc1rnamxa1xbpwpmirhyhxz780klww6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/charmap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/charmap";
           sha256 = "1j7762d2i17ysn9ys8j7wfv989avmax8iylml2hc26mwbpyfpm84";
           name = "charmap";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/charmap";
+          homepage = "https://melpa.org/#/charmap";
           license = lib.licenses.free;
         };
       }) {};
@@ -2924,13 +3092,13 @@
           sha256 = "09ypxhfad3v1pz0xhw4xgxvfj7ad2kb3ff9zy1mnw7fzsa7gw6nj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/checkbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/checkbox";
           sha256 = "17gw6w1m6bs3sfx8nqa8nzdq26m8w85a0fca5qw3bmd18bcmknqa";
           name = "checkbox";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/checkbox";
+          homepage = "https://melpa.org/#/checkbox";
           license = lib.licenses.free;
         };
       }) {};
@@ -2945,34 +3113,34 @@
           sha256 = "1jsy43avingxxccs0zw2qm5ysx8g76xhhh1mnyypxskl9m60qb4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chinese-word-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/chinese-word-at-point";
           sha256 = "0pjs4ckncv84qrdj0pyibrbiy86f1gmjla9n2cgh10xbc7j9y0c4";
           name = "chinese-word-at-point";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/chinese-word-at-point";
+          homepage = "https://melpa.org/#/chinese-word-at-point";
           license = lib.licenses.free;
         };
       }) {};
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "0.10.2";
+        version = "0.12.0";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "336055e84b9685a7959fd05bc65a16febd8e83cc";
-          sha256 = "1bk7h7h6sqf1qb5lpmmigx7aviyw65dnj3724q55ld6pgpy5q6vz";
+          rev = "1c45146520a326376d35b8614c26187ed11a02cd";
+          sha256 = "0pbgfm9hkryanb4fly74w417h6bw9mnad5k5raj9ypiwgcz2r0n8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cider";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cider";
           sha256 = "1a6hb728a3ir18c2dn9zfd3jn79fi5xjn5gqr7ljy6qb063xd4qx";
           name = "cider";
         };
         packageRequires = [ clojure-mode emacs pkg-info queue seq spinner ];
         meta = {
-          homepage = "http://melpa.org/#/cider";
+          homepage = "https://melpa.org/#/cider";
           license = lib.licenses.free;
         };
       }) {};
@@ -2987,13 +3155,13 @@
           sha256 = "1rkd76561h93si4lpisz3qnaj48dx8x01nd59a3lgpqsbbibnccf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cider-eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cider-eval-sexp-fu";
           sha256 = "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq";
           name = "cider-eval-sexp-fu";
         };
         packageRequires = [ emacs eval-sexp-fu highlight ];
         meta = {
-          homepage = "http://melpa.org/#/cider-eval-sexp-fu";
+          homepage = "https://melpa.org/#/cider-eval-sexp-fu";
           license = lib.licenses.free;
         };
       }) {};
@@ -3008,34 +3176,55 @@
           sha256 = "1w0ya0446rqsg1j59fd1mp4wavv2f3h1k3mw9svm5glymdirw4d1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cil-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cil-mode";
           sha256 = "1h18r086bqspyn5n252yzw8x2zgyaqzdd8pbcf5gqlh1w8kapq4y";
           name = "cil-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cil-mode";
+          homepage = "https://melpa.org/#/cil-mode";
           license = lib.licenses.free;
         };
       }) {};
     circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "circe";
-        version = "2.1";
+        version = "2.2";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "ac1cddf946e0af90ab453dd816f7173e0d4000e5";
-          sha256 = "0q3rv6lk37yybkbswmn4pgzca0nfhvf4h3ac395fr16k5ixybc5q";
+          rev = "13a33ea7b3cc579cbf67db2109802df3366e84d1";
+          sha256 = "0lg7f71kdq3zzc85xp9p81vdarz6d6l5zy9175c67ps9smdx528i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/circe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/circe";
           sha256 = "1f54d8490gfx0r0cdvgmcjdxqpni43msy0k2mgqd1qz88a4b5l07";
           name = "circe";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/circe";
+          homepage = "https://melpa.org/#/circe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cl-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cl-format";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "alvinfrancis";
+          repo = "cl-format";
+          rev = "4380cb8009c47cc6d9098b383082b93b1aefa460";
+          sha256 = "108s96viral3s62a77jfgvjam08hdk97frfmxjg3xpp2ifccjs7h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cl-format";
+          sha256 = "1259ykj6z6m6gaqhkmj5f3q9vyk7idpvlvlma5likpknxj5f444v";
+          name = "cl-format";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/cl-format";
           license = lib.licenses.free;
         };
       }) {};
@@ -3050,34 +3239,34 @@
           sha256 = "12vgi5dicx3lxzngjcg9g3nflrhfy9wdw6ldm72zarp1h96jy5cw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cl-lib-highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cl-lib-highlight";
           sha256 = "13qdrvpxq928p27b1xdcbsscyhqk042rwfa17037gp9h02fd42j8";
           name = "cl-lib-highlight";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/cl-lib-highlight";
+          homepage = "https://melpa.org/#/cl-lib-highlight";
           license = lib.licenses.free;
         };
       }) {};
     click-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "click-mode";
-        version = "0.0.3";
+        version = "0.0.4";
         src = fetchFromGitHub {
           owner = "bmalehorn";
           repo = "click-mode";
-          rev = "4e39ef28e65124671f53fb5eaef8c7b87c4deab8";
-          sha256 = "1n8114h0azjyavq4bzny2nasl4wsz8k7li002gqjvi0snw16yypn";
+          rev = "c074e7b5b0a88434d0d3411f18884d1f6e288b33";
+          sha256 = "0w34ixzk8vs2nv5xr7l1b3k0crl1lqvbq6gs5r4b8rhsx9b6c1mb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/click-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/click-mode";
           sha256 = "1p5dz4a74w5zxdlw17h5z9dglapia4p29880liw3bif2c7dzkg0r";
           name = "click-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/click-mode";
+          homepage = "https://melpa.org/#/click-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -3092,13 +3281,13 @@
           sha256 = "07q8naxhag2q0m5cb9c2n5js6j5qdrjyyiqbcpxmq598b8mw8kzd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cliphist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cliphist";
           sha256 = "0mg6pznijba3kvp3r57pi54v6mgih2vfwj2kg6qmcy1abrc0xq29";
           name = "cliphist";
         };
         packageRequires = [ popup ];
         meta = {
-          homepage = "http://melpa.org/#/cliphist";
+          homepage = "https://melpa.org/#/cliphist";
           license = lib.licenses.free;
         };
       }) {};
@@ -3113,28 +3302,28 @@
           sha256 = "0i6sj5rs4b9v8aqq9l6wr15080qb101hdxspx6innhijhajgmssd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clips-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clips-mode";
           sha256 = "083wrhjn04rg8vr6j0ziffdbdhbfn63wzl4q7yzpkf8qckh6mxhf";
           name = "clips-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/clips-mode";
+          homepage = "https://melpa.org/#/clips-mode";
           license = lib.licenses.free;
         };
       }) {};
     clj-refactor = callPackage ({ cider, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }:
     melpaBuild {
         pname = "clj-refactor";
-        version = "2.0.0";
+        version = "2.2.0";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clj-refactor.el";
-          rev = "9c628f2ca9ba6dfdfb1e24d804accc71d873fae0";
-          sha256 = "1prqdyr36sqf3dzxriv9lb3p6021nlacf2xgn5xxj7k7hp3z8d85";
+          rev = "531a09fda51c9043efe18fd1f288be21ced3f3d1";
+          sha256 = "0qjj40h8ryrs02rj73hkyhcjxdz926qxgvnjidav3sw2ggn8vdl3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clj-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clj-refactor";
           sha256 = "1qvds6dylazvrzz1ji2z2ldw72pa2nxqacb9d04gasmkqc32ipvz";
           name = "clj-refactor";
         };
@@ -3151,7 +3340,7 @@
           yasnippet
         ];
         meta = {
-          homepage = "http://melpa.org/#/clj-refactor";
+          homepage = "https://melpa.org/#/clj-refactor";
           license = lib.licenses.free;
         };
       }) {};
@@ -3166,13 +3355,13 @@
           sha256 = "18gv8vmmpiyq16cq4nr9nk2bmc5y2rsv21wjl4ji29rc7566shha";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cljr-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cljr-helm";
           sha256 = "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc";
           name = "cljr-helm";
         };
         packageRequires = [ clj-refactor helm ];
         meta = {
-          homepage = "http://melpa.org/#/cljr-helm";
+          homepage = "https://melpa.org/#/cljr-helm";
           license = lib.licenses.free;
         };
       }) {};
@@ -3187,13 +3376,13 @@
           sha256 = "0hz6a7gj0zfsdaifkhwf965c96rkjc3kivvqlf50zllsw0ysbnn0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clocker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clocker";
           sha256 = "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k";
           name = "clocker";
         };
         packageRequires = [ dash projectile ];
         meta = {
-          homepage = "http://melpa.org/#/clocker";
+          homepage = "https://melpa.org/#/clocker";
           license = lib.licenses.free;
         };
       }) {};
@@ -3208,55 +3397,55 @@
           sha256 = "1x1kfycf3023z0r3v7xqci59k8jv5wn2vqc9y0nx7k5qgifmswrx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clojure-cheatsheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clojure-cheatsheet";
           sha256 = "05sw3bkdcadslpsk64ds0ciavmdgqk7fr5q3z505vvafmszfnaqv";
           name = "clojure-cheatsheet";
         };
         packageRequires = [ cider helm ];
         meta = {
-          homepage = "http://melpa.org/#/clojure-cheatsheet";
+          homepage = "https://melpa.org/#/clojure-cheatsheet";
           license = lib.licenses.free;
         };
       }) {};
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "5.2.0";
+        version = "5.3.0";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "412bb7ae57c59eb7c99b8273e5c94b38105b18af";
-          sha256 = "1bhgvj4w8k4ycndnxgfnifc065jbxq8vsxfz3s6w64qx54biqxj3";
+          rev = "8ef7127da214cb7fd4b47fc943462f2a8bfb8f85";
+          sha256 = "1x7nl5wzcah9hnlj5jfd3y5604w60zcqcw1nn6vw335c2vzzissj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clojure-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clojure-mode";
           sha256 = "11n0rjhs1mmlzdqy711g432an5ybdka5xj0ipsk8dx6xcyab70np";
           name = "clojure-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/clojure-mode";
+          homepage = "https://melpa.org/#/clojure-mode";
           license = lib.licenses.free;
         };
       }) {};
     clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode-extra-font-locking";
-        version = "5.2.0";
+        version = "5.3.0";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "412bb7ae57c59eb7c99b8273e5c94b38105b18af";
-          sha256 = "1bhgvj4w8k4ycndnxgfnifc065jbxq8vsxfz3s6w64qx54biqxj3";
+          rev = "8ef7127da214cb7fd4b47fc943462f2a8bfb8f85";
+          sha256 = "1x7nl5wzcah9hnlj5jfd3y5604w60zcqcw1nn6vw335c2vzzissj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clojure-mode-extra-font-locking";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clojure-mode-extra-font-locking";
           sha256 = "00nff9mkj61i76dj21x87vhz0bbkzgvkx1ypkxcv6yf3pfhq7r8n";
           name = "clojure-mode-extra-font-locking";
         };
         packageRequires = [ clojure-mode ];
         meta = {
-          homepage = "http://melpa.org/#/clojure-mode-extra-font-locking";
+          homepage = "https://melpa.org/#/clojure-mode-extra-font-locking";
           license = lib.licenses.free;
         };
       }) {};
@@ -3271,13 +3460,13 @@
           sha256 = "0sw34yjp8934xd2n76lbwyvxkbyz5pxszj6gkflas8lfjvms9z7d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clojure-quick-repls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clojure-quick-repls";
           sha256 = "10glzyd4y3918pwp048pc1y7y7fa34fkqckn1nbys841dbssmay0";
           name = "clojure-quick-repls";
         };
         packageRequires = [ cider dash ];
         meta = {
-          homepage = "http://melpa.org/#/clojure-quick-repls";
+          homepage = "https://melpa.org/#/clojure-quick-repls";
           license = lib.licenses.free;
         };
       }) {};
@@ -3292,34 +3481,55 @@
           sha256 = "1p0w83m9j4a6va4g68a4gcfbdkp8nic0q8cm28l8nr7czd5s0yl6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clojure-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/clojure-snippets";
           sha256 = "15622mdd6b3fpwp22d32p78yap08pyscs2vc83sv1xz4338i0lij";
           name = "clojure-snippets";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/clojure-snippets";
+          homepage = "https://melpa.org/#/clojure-snippets";
           license = lib.licenses.free;
         };
       }) {};
-    cm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "closql";
+        version = "0.1.0";
+        src = fetchFromGitLab {
+          owner = "tarsius";
+          repo = "closql";
+          rev = "a8b6b2beaa10528b2fd5ed9759136e3959529266";
+          sha256 = "1p251vyh8fc6xzaf0v7yvf4wkrvcfjdb3qr88ll4xcb61gj3vi3a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/closql";
+          sha256 = "0a8fqw8n03x9mygvzb95m8mmfqp3j8hynwafvryjsl0np0695b6l";
+          name = "closql";
+        };
+        packageRequires = [ emacs emacsql-sqlite ];
+        meta = {
+          homepage = "https://melpa.org/#/closql";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cm-mode";
-        version = "1.1";
+        version = "1.2";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "criticmarkup-emacs";
-          rev = "abc5adc7e00e10c388c2a57c9f1d59f164773082";
-          sha256 = "1bhnlcsvl1qsi36a5kz8i857spzybprsbsywpqrmjpndn74n8690";
+          rev = "1ac0d64842eb303323f2ebea61b4b6ba9f72969c";
+          sha256 = "1rwln3ms71fys3rdv3sx8w706aqn874im3kqcfrkxz86wiazm2d5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cm-mode";
           sha256 = "1rgfpxbnp8wiq9j8aywm2n07rxzkhqljigwynrkyvrnsgxlq2a9x";
           name = "cm-mode";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/cm-mode";
+          homepage = "https://melpa.org/#/cm-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -3334,34 +3544,34 @@
           sha256 = "14z5izpgby7lak6hzjwsph31awg5126hcjzld21ihknhlg09sw7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cmake-ide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cmake-ide";
           sha256 = "0xvy7l80zw67jgvk1rkhwzjvsqjqckmd8zj6s67rgbm56z6ypmcg";
           name = "cmake-ide";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/cmake-ide";
+          homepage = "https://melpa.org/#/cmake-ide";
           license = lib.licenses.free;
         };
       }) {};
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "3.5.0pre3";
+        version = "3.5.2";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "d203761520f5dd21a9cc4de5c4ca0d0e4e188e34";
-          sha256 = "0caxmqbx6lq9xarra1zxm2yvcf699fgk9fawp3mrg587yb3w0961";
+          rev = "80bcbe2d85232d748e31fb4de1016af60788505d";
+          sha256 = "10adf81lig0mbm6hdi031p2d7x3yj4fq8vb4pavy6v2xgpj1j5jx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cmake-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cmake-mode";
           sha256 = "0zbn8syb5lw5xp1qcy3qcl75zfiyik30xvqyl38gdqddm9h7qmz7";
           name = "cmake-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cmake-mode";
+          homepage = "https://melpa.org/#/cmake-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -3376,13 +3586,13 @@
           sha256 = "10xlny2agxjknvnjdnw41cyb3d361yy0wvpc8l1d0xwnmmfh3bxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cmake-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cmake-project";
           sha256 = "13n6j9ljvzjzkknbm9zkhxljcn12avl39gxqq95hah44dr11rns3";
           name = "cmake-project";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cmake-project";
+          homepage = "https://melpa.org/#/cmake-project";
           license = lib.licenses.free;
         };
       }) {};
@@ -3397,55 +3607,55 @@
           sha256 = "14jcxrs3b02pbppvdsabr7c74i3c6d1lmd6l1p9dj8gv413pghsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/codic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/codic";
           sha256 = "0fq2qfqhkd6injgl66vcpd61j67shl9xj260aj6cgb2nriq0jxgn";
           name = "codic";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/codic";
+          homepage = "https://melpa.org/#/codic";
           license = lib.licenses.free;
         };
       }) {};
     coffee-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "coffee-mode";
-        version = "0.6.2";
+        version = "0.6.3";
         src = fetchFromGitHub {
           owner = "defunkt";
           repo = "coffee-mode";
-          rev = "d19075264dc1f662e2282ca42ce70be0eae61b2a";
-          sha256 = "1axp9hixp4vgaqjd3ii9xwb32jhb964zclmpg3zpsl4rp8b9bdz5";
+          rev = "adfb7ae73d6ee2ef790c780dd3c967e62930e94a";
+          sha256 = "0yhmg5j051mviqp5laz7y1zjs1w9ykbbxqm7vrgf2py0hpd1kcrg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/coffee-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/coffee-mode";
           sha256 = "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1";
           name = "coffee-mode";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/coffee-mode";
+          homepage = "https://melpa.org/#/coffee-mode";
           license = lib.licenses.free;
         };
       }) {};
     color-theme-modern = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-modern";
-        version = "0.0.1";
+        version = "0.0.2";
         src = fetchFromGitHub {
           owner = "emacs-jp";
           repo = "replace-colorthemes";
-          rev = "0a804c611da57b2d7c02c95f26eb8a7fc305f159";
-          sha256 = "0q9ss11i31iiv0vn8238922fkic7j6d02f9ykbip04sm46p5k6kj";
+          rev = "7107540d22e8ff045e0707de84c8b179fd829302";
+          sha256 = "0apvqrva3f7valjrxpslln8460kpr82z4zazj3lg3j82k102zla9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-theme-modern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/color-theme-modern";
           sha256 = "0f662ham430fgxpqw96zcl1whcm28cv710g6wvg4fma60sblaxcm";
           name = "color-theme-modern";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/color-theme-modern";
+          homepage = "https://melpa.org/#/color-theme-modern";
           license = lib.licenses.free;
         };
       }) {};
@@ -3460,13 +3670,13 @@
           sha256 = "13jmg05skv409z8pg5m9rzkajj9knyln0ff8a3i1pbpyrnpngmmc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-theme-sanityinc-solarized";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/color-theme-sanityinc-solarized";
           sha256 = "0xg79hgb893f1nqx6q4q6hp4w6rvgp1aah1v2r3scg2jk057qxkf";
           name = "color-theme-sanityinc-solarized";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/color-theme-sanityinc-solarized";
+          homepage = "https://melpa.org/#/color-theme-sanityinc-solarized";
           license = lib.licenses.free;
         };
       }) {};
@@ -3481,13 +3691,13 @@
           sha256 = "0w99ypq048xldl1mrgc7qr4n2770dm48aknhp7q0176l43nvxnqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-theme-sanityinc-tomorrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/color-theme-sanityinc-tomorrow";
           sha256 = "1k8iwjc7iidq5sxybs47rnswa6c5dwqfdzfw7w0by2h1id2z6nqd";
           name = "color-theme-sanityinc-tomorrow";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/color-theme-sanityinc-tomorrow";
+          homepage = "https://melpa.org/#/color-theme-sanityinc-tomorrow";
           license = lib.licenses.free;
         };
       }) {};
@@ -3502,13 +3712,13 @@
           sha256 = "18hzm7yzwlfjlbkx46rgdl31p9xyfqnxlvg8337h2bicpks7kjia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/colorsarenice-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/colorsarenice-theme";
           sha256 = "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi";
           name = "colorsarenice-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/colorsarenice-theme";
+          homepage = "https://melpa.org/#/colorsarenice-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -3523,13 +3733,13 @@
           sha256 = "1j6hhyzww7wfwk6bllbb5mk4hw4qs8hsgfbfdifsam9c6i4spm45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/commander";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/commander";
           sha256 = "17y0hg6a90hflgwn24ww23qmvc1alzivpipca8zvpf0nih4fl393";
           name = "commander";
         };
         packageRequires = [ cl-lib dash f s ];
         meta = {
-          homepage = "http://melpa.org/#/commander";
+          homepage = "https://melpa.org/#/commander";
           license = lib.licenses.free;
         };
       }) {};
@@ -3544,13 +3754,13 @@
           sha256 = "0kzlv2my0cc7d3nki2rlm32nmb2nyjb38inmvlf13z0m2kybg2ps";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/comment-dwim-2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/comment-dwim-2";
           sha256 = "1w9w2a72ygsj5w47vjqcljajmmbz0mi8dhz5gjnpwxjwsr6fn6lj";
           name = "comment-dwim-2";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/comment-dwim-2";
+          homepage = "https://melpa.org/#/comment-dwim-2";
           license = lib.licenses.free;
         };
       }) {};
@@ -3565,13 +3775,13 @@
           sha256 = "1jwd3whag39qhzhbsfivzdlcr6vj37dv5ychkhmilw8v6dfdnpdb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/commenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/commenter";
           sha256 = "01bm8jbj6xw23nls4fps6zwjkgvcsjhmn3l3ncqd764kwhxdx8q3";
           name = "commenter";
         };
         packageRequires = [ emacs let-alist ];
         meta = {
-          homepage = "http://melpa.org/#/commenter";
+          homepage = "https://melpa.org/#/commenter";
           license = lib.licenses.free;
         };
       }) {};
@@ -3586,13 +3796,13 @@
           sha256 = "1cc9ak9193m92g6l4mrfxbkkmvljl3c51d0xzdidwww978q3x6ad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/common-lisp-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/common-lisp-snippets";
           sha256 = "0ig8cz00cbfx0jckqk1xhsvm18ivl2mjvcn65s941nblsywfvxjl";
           name = "common-lisp-snippets";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/common-lisp-snippets";
+          homepage = "https://melpa.org/#/common-lisp-snippets";
           license = lib.licenses.free;
         };
       }) {};
@@ -3607,13 +3817,13 @@
           sha256 = "08rrjfp2amgya1hswjz3vd5ja6lg2nfmm7454p0h1naz00hlmmw0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company";
           sha256 = "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4";
           name = "company";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/company";
+          homepage = "https://melpa.org/#/company";
           license = lib.licenses.free;
         };
       }) {};
@@ -3628,13 +3838,13 @@
           sha256 = "1i6788qfinh47c5crgr57ykgbp6bvk1afcl00c8gywxsf8srvnvy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-anaconda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-anaconda";
           sha256 = "1s7y47ghy7q35qpfqavh4p9wr91i6r579mdbpvv6h5by856yn4gl";
           name = "company-anaconda";
         };
         packageRequires = [ anaconda-mode cl-lib company dash s ];
         meta = {
-          homepage = "http://melpa.org/#/company-anaconda";
+          homepage = "https://melpa.org/#/company-anaconda";
           license = lib.licenses.free;
         };
       }) {};
@@ -3649,13 +3859,13 @@
           sha256 = "1dds3fynbd6yb0874aw6g4qk5zmq3pgl3jmcp38md027qalgqmym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-ansible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-ansible";
           sha256 = "084l9dr2hvm00952y4m3jhchzxjhcd61sfn5ywj9b9a1d4sr110d";
           name = "company-ansible";
         };
         packageRequires = [ company emacs ];
         meta = {
-          homepage = "http://melpa.org/#/company-ansible";
+          homepage = "https://melpa.org/#/company-ansible";
           license = lib.licenses.free;
         };
       }) {};
@@ -3670,13 +3880,34 @@
           sha256 = "1pja44g15d11kl47abzykrp28j782nkbmb0db0ilpc96xf1fjlsw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-cabal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-cabal";
           sha256 = "0pbjidj88c9qri6xw8023yqwnczad5ig224cbsz6vsmdla2nlxra";
           name = "company-cabal";
         };
         packageRequires = [ cl-lib company emacs ];
         meta = {
-          homepage = "http://melpa.org/#/company-cabal";
+          homepage = "https://melpa.org/#/company-cabal";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "company-coq";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "cpitclaudel";
+          repo = "company-coq";
+          rev = "bb507a11b088a8c9bb6500b384ed588bc690fcea";
+          sha256 = "0s6gzdmxlsl1l0vh52xspxys1wmsq063p6nva6qisg1r622gjzjl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-coq";
+          sha256 = "1iagm07ckf60kg4i8m4n0gfmv0brqc4dcn7lkcz229r3f4kyqksa";
+          name = "company-coq";
+        };
+        packageRequires = [ cl-lib company company-math dash yasnippet ];
+        meta = {
+          homepage = "https://melpa.org/#/company-coq";
           license = lib.licenses.free;
         };
       }) {};
@@ -3691,13 +3922,13 @@
           sha256 = "1f8sjjms9kxni153pia6b45p2ih2mhm2r07d0j3fmxmz3q2jdldd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-emoji";
           sha256 = "1mflqqw9gnfcqjb6g8ivdfl7s4mdyjg7j0457hamgyvgvpxsh8x3";
           name = "company-emoji";
         };
         packageRequires = [ cl-lib company ];
         meta = {
-          homepage = "http://melpa.org/#/company-emoji";
+          homepage = "https://melpa.org/#/company-emoji";
           license = lib.licenses.free;
         };
       }) {};
@@ -3712,13 +3943,13 @@
           sha256 = "0y9i0q37xjbnlnlxq7xjvnpn6ykzbd55g6nbw10z1wg0m2v7f96r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-ghc";
           sha256 = "07adykza4dqs64bk8vjmgryr54khxmcy28hms5z8i1qpsk9vmvnn";
           name = "company-ghc";
         };
         packageRequires = [ cl-lib company emacs ghc ];
         meta = {
-          homepage = "http://melpa.org/#/company-ghc";
+          homepage = "https://melpa.org/#/company-ghc";
           license = lib.licenses.free;
         };
       }) {};
@@ -3733,34 +3964,34 @@
           sha256 = "03snnra31b5j6iy94gql240vhkynbjql9b4b5j8bsqp9inmbsia3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-go";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-go";
           sha256 = "1ncy5wlg3ywr17zrxb1d1bap4gdvwr35w9a8b0crz5h3l3y4cp29";
           name = "company-go";
         };
         packageRequires = [ company ];
         meta = {
-          homepage = "http://melpa.org/#/company-go";
+          homepage = "https://melpa.org/#/company-go";
           license = lib.licenses.free;
         };
       }) {};
     company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }:
     melpaBuild {
         pname = "company-irony";
-        version = "0.1.0";
+        version = "0.1.1";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "company-irony";
-          rev = "29becb8824cacb1ea6f8c823d06ba65512c62e3d";
-          sha256 = "1gdsaa8zcs3layivn3ndbd5z1zflblmbxl251ld67bq763ga49cz";
+          rev = "c09f66c26bdd0dda007559a5c9bccfca0bd49ccd";
+          sha256 = "17zi0xx8p2diwy1wgrhl6j8p57alwz24rjpz4apyyrqjk09ippq4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-irony";
           sha256 = "15adamk1b9y1i6k06i5ahf1wn70cgwlhgk0x6fk8pl5izg05z1km";
           name = "company-irony";
         };
         packageRequires = [ cl-lib company emacs irony ];
         meta = {
-          homepage = "http://melpa.org/#/company-irony";
+          homepage = "https://melpa.org/#/company-irony";
           license = lib.licenses.free;
         };
       }) {};
@@ -3775,34 +4006,55 @@
           sha256 = "1ihqapp4dv92794rsgyq0rmhwika60cmradqd4bn9b72ss6plxs1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-jedi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-jedi";
           sha256 = "1krrgrjq967c3j02y0i345yx6w4crisnj1k3bhih6j849fvy3fvj";
           name = "company-jedi";
         };
         packageRequires = [ cl-lib company emacs jedi-core ];
         meta = {
-          homepage = "http://melpa.org/#/company-jedi";
+          homepage = "https://melpa.org/#/company-jedi";
           license = lib.licenses.free;
         };
       }) {};
     company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
     melpaBuild {
         pname = "company-math";
-        version = "1.0.1";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "company-math";
-          rev = "e82c91d960f9418774959f299d0e064fcb6ba0ad";
-          sha256 = "009f0p0sggfn0yz7sivkcv8zygvv4ssbwqykbxgdxh9n6zk4hjky";
+          rev = "2e24a088d660d0bf37585a664eddbbb6c4a8e20d";
+          sha256 = "0k6bx4i3d2x6kmkzififc8r7vid74bxsvgxp19z7bv1fh6m1f3aa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-math";
           sha256 = "0chig8k8l65bnd0a6734fiy0ikl20k9v2wlndh3ckz5a8h963g87";
           name = "company-math";
         };
         packageRequires = [ company math-symbol-lists ];
         meta = {
-          homepage = "http://melpa.org/#/company-math";
+          homepage = "https://melpa.org/#/company-math";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-ngram";
+        version = "0.6.5";
+        src = fetchFromGitHub {
+          owner = "kshramt";
+          repo = "company-ngram";
+          rev = "6c9315933984e7741b9d044f06a8cecc5ddaf788";
+          sha256 = "0yxnylpbjrwmqx6px0q3pff4dh00fmfzb09gp4xvn9w9hrxdsx7g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-ngram";
+          sha256 = "1y9k9s8c248m91xld4f5l75j4swml333rpwq590bsx7mrsq131xx";
+          name = "company-ngram";
+        };
+        packageRequires = [ cl-lib company ];
+        meta = {
+          homepage = "https://melpa.org/#/company-ngram";
           license = lib.licenses.free;
         };
       }) {};
@@ -3817,13 +4069,13 @@
           sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-nixos-options";
           sha256 = "1yrqqdadmf7qfxpqp8wwb325zjnwwjmn2hhnl7i3j0ckg6hqyqf0";
           name = "company-nixos-options";
         };
         packageRequires = [ cl-lib company nixos-options ];
         meta = {
-          homepage = "http://melpa.org/#/company-nixos-options";
+          homepage = "https://melpa.org/#/company-nixos-options";
           license = lib.licenses.free;
         };
       }) {};
@@ -3838,13 +4090,13 @@
           sha256 = "1b2v84ss5k43nnbsnvabgvb19ardsacbs1prn2h9i1k2d5mb8icw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-quickhelp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-quickhelp";
           sha256 = "042bwv0wd4hksbm528zb7pbllzk83p8qjq5f8z46p84c8mmxfp9g";
           name = "company-quickhelp";
         };
         packageRequires = [ company emacs pos-tip ];
         meta = {
-          homepage = "http://melpa.org/#/company-quickhelp";
+          homepage = "https://melpa.org/#/company-quickhelp";
           license = lib.licenses.free;
         };
       }) {};
@@ -3859,7 +4111,7 @@
           sha256 = "0i1fh5lvqwlgn3g3fzh0xacxyljx6gkryipn133vfkv4jbns51n4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-restclient";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-restclient";
           sha256 = "1md0n4k4wmbh9rmbwqh3kg2fj0c34rzqfd56jsq8lcdg14k0kdcb";
           name = "company-restclient";
         };
@@ -3871,28 +4123,28 @@
           restclient
         ];
         meta = {
-          homepage = "http://melpa.org/#/company-restclient";
+          homepage = "https://melpa.org/#/company-restclient";
           license = lib.licenses.free;
         };
       }) {};
     company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }:
     melpaBuild {
         pname = "company-sourcekit";
-        version = "0.1.4";
+        version = "0.1.5";
         src = fetchFromGitHub {
           owner = "nathankot";
           repo = "company-sourcekit";
-          rev = "ea26c1284ccf72d6e3a850c6725433f0f8e2b3f9";
-          sha256 = "1l9xrw88wq32wm3qx922ihdb9mlv9rrdalwvz9i2790fmw7y84vz";
+          rev = "c9694cd8e84f4c7deffa6111297cb80eb7cb02a6";
+          sha256 = "04nm015408gzybfka0sc3czkf5y61x76h3sx3vlijf67i54bz7pi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-sourcekit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-sourcekit";
           sha256 = "0hr5j1ginf43h4qf3fvsh3z53z0c7w5a9lhrvdwmlzj396qhqmzs";
           name = "company-sourcekit";
         };
         packageRequires = [ company dash dash-functional emacs sourcekit ];
         meta = {
-          homepage = "http://melpa.org/#/company-sourcekit";
+          homepage = "https://melpa.org/#/company-sourcekit";
           license = lib.licenses.free;
         };
       }) {};
@@ -3907,13 +4159,13 @@
           sha256 = "11cinjsyf24d4a682ikniprxd1vkwn6mynsp5dzab6yzq09np78i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-tern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-tern";
           sha256 = "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh";
           name = "company-tern";
         };
         packageRequires = [ cl-lib company dash dash-functional s tern ];
         meta = {
-          homepage = "http://melpa.org/#/company-tern";
+          homepage = "https://melpa.org/#/company-tern";
           license = lib.licenses.free;
         };
       }) {};
@@ -3928,13 +4180,13 @@
           sha256 = "0b0k75rg43h48dbcqiid947nspqiqxkiqcmvph9aqpxlfr67bz5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-web";
           sha256 = "0dj0m6wcc8cyvblp9b5b3am95gc18j9y4va44hvljxv1h7l5hhvy";
           name = "company-web";
         };
         packageRequires = [ cl-lib company dash web-completion-data ];
         meta = {
-          homepage = "http://melpa.org/#/company-web";
+          homepage = "https://melpa.org/#/company-web";
           license = lib.licenses.free;
         };
       }) {};
@@ -3949,13 +4201,34 @@
           sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/company-ycmd";
           sha256 = "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk";
           name = "company-ycmd";
         };
         packageRequires = [ company deferred s ycmd ];
         meta = {
-          homepage = "http://melpa.org/#/company-ycmd";
+          homepage = "https://melpa.org/#/company-ycmd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    composable = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "composable";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "paldepind";
+          repo = "composable.el";
+          rev = "4739b6a730498e7526d06222810c3ccf3723d509";
+          sha256 = "1mii790r6gaz0nidlaib50wj4vryfvw7ls6b4mg1nw5km7hplpgq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/composable";
+          sha256 = "1fs4pczjn9sv12sladf6zbkz0cmzxr0jaqkiwryydal1l5nqqxcy";
+          name = "composable";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/composable";
           license = lib.licenses.free;
         };
       }) {};
@@ -3970,13 +4243,13 @@
           sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/concurrent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/concurrent";
           sha256 = "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf";
           name = "concurrent";
         };
         packageRequires = [ deferred ];
         meta = {
-          homepage = "http://melpa.org/#/concurrent";
+          homepage = "https://melpa.org/#/concurrent";
           license = lib.licenses.free;
         };
       }) {};
@@ -3991,13 +4264,13 @@
           sha256 = "0sz3qx1bn0lwjhka2l6wfl4b5486ji9dklgjs7fdlkg3dgpp1ahx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/conkeror-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/conkeror-minor-mode";
           sha256 = "1ch108f20k7xbf79azsp31hh4wmw7iycsxddcszgxkbm7pj11933";
           name = "conkeror-minor-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/conkeror-minor-mode";
+          homepage = "https://melpa.org/#/conkeror-minor-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -4012,13 +4285,13 @@
           sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/connection";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/connection";
           sha256 = "1y68d2kay8p5vapailxhrc5dl7b8k8nkvp7pa54md3fsivwp1d0q";
           name = "connection";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/connection";
+          homepage = "https://melpa.org/#/connection";
           license = lib.licenses.free;
         };
       }) {};
@@ -4033,13 +4306,13 @@
           sha256 = "0s4b7dkndhnh8q3plvg2whjx8zd7ffz4hnbn3xh86xd3k7sch7av";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/contextual";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/contextual";
           sha256 = "0vribs0fa1xf5kwkmvzjwhiawni0p3v56c5l4dkz8d7wn2g6wfdx";
           name = "contextual";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/contextual";
+          homepage = "https://melpa.org/#/contextual";
           license = lib.licenses.free;
         };
       }) {};
@@ -4054,34 +4327,34 @@
           sha256 = "0gpckp12b0hllgn821q3rqfxh5h7ny5gfhhvfdbvszb7kwl1f6cx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/corral";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/corral";
           sha256 = "1drccqk4qzkgvkgkzlrrfd1dcgj8ziqriijrjihrzjgjsbpzv6da";
           name = "corral";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/corral";
+          homepage = "https://melpa.org/#/corral";
           license = lib.licenses.free;
         };
       }) {};
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "0.7.0";
+        version = "0.8.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "706349fcfae297ee285552af9246bc0cf00d9b7f";
-          sha256 = "1kahl3h18vsjkbqvd84fb2w45s4srsiydn6jiv49vvg1yaxzxcbm";
+          rev = "c24a3728538dd7d11de9f141b3ad1d8e0996c330";
+          sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/counsel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/counsel";
           sha256 = "0y8cb2q4mqvzan5n8ws5pjpm7bkjcghg5q19mzc3gqrq9vrvyzi6";
           name = "counsel";
         };
         packageRequires = [ emacs swiper ];
         meta = {
-          homepage = "http://melpa.org/#/counsel";
+          homepage = "https://melpa.org/#/counsel";
           license = lib.licenses.free;
         };
       }) {};
@@ -4096,13 +4369,13 @@
           sha256 = "01545iy2gaxyd4i8gawgxqi9gbkrjk20djhvc59finnjrblzccn3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/coverage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/coverage";
           sha256 = "0ja7wsx2sj0h01sk1l3c0aidbs1ld4gj3kiwq6brs7r018sz45pm";
           name = "coverage";
         };
         packageRequires = [ cl-lib ov ];
         meta = {
-          homepage = "http://melpa.org/#/coverage";
+          homepage = "https://melpa.org/#/coverage";
           license = lib.licenses.free;
         };
       }) {};
@@ -4117,13 +4390,13 @@
           sha256 = "0ky59gz5pvi4m5b9rh13ywfmclrmiwalynpqw652rmc6yfzv0fnz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cpputils-cmake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cpputils-cmake";
           sha256 = "0fswmmmrjv897n51nidmn8gs8yp00595g35vwjafsq6rzfg58j60";
           name = "cpputils-cmake";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cpputils-cmake";
+          homepage = "https://melpa.org/#/cpputils-cmake";
           license = lib.licenses.free;
         };
       }) {};
@@ -4138,13 +4411,13 @@
           sha256 = "169ai0xkh3988racnhaapxw0v1pbxvcaq470x1qacdzdpka4a7bs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/creds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/creds";
           sha256 = "0n11xxaf93bbc9ih25wj09zzw4sj32wb99qig4zcy8bpkl5y3llk";
           name = "creds";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/creds";
+          homepage = "https://melpa.org/#/creds";
           license = lib.licenses.free;
         };
       }) {};
@@ -4159,13 +4432,13 @@
           sha256 = "1kl6blr4dlz40gfc845071nhfms4fm59284ja2177bhghy3wmw6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/crm-custom";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/crm-custom";
           sha256 = "14w15skxr44p9ilhpswlgdbqfw8jghxi69l37yk4m449m7g9694c";
           name = "crm-custom";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/crm-custom";
+          homepage = "https://melpa.org/#/crm-custom";
           license = lib.licenses.free;
         };
       }) {};
@@ -4180,13 +4453,13 @@
           sha256 = "13kkpilijr0q455srgn8yhzqikxask11z8d3rji7cc1yw7kf6y0i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/crux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/crux";
           sha256 = "10lim1sngqbdqqwyq6ksqjjqpkm97aj1jk550sgwj28338lnw73c";
           name = "crux";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/crux";
+          homepage = "https://melpa.org/#/crux";
           license = lib.licenses.free;
         };
       }) {};
@@ -4201,13 +4474,13 @@
           sha256 = "00wgbcw09xn9xi52swi4wyi9dj9p9hyin7i431xi6zkhxysw4q7w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cryptol-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cryptol-mode";
           sha256 = "08iq69gqmps8cckybhj9065b8a2a49p0rpzgx883qxnypsmjfmf2";
           name = "cryptol-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cryptol-mode";
+          homepage = "https://melpa.org/#/cryptol-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -4222,13 +4495,13 @@
           sha256 = "0dqih7cy57sciqn5vz5fiwynpld96qldyl7jcgn9qpwnzb401ayx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/csharp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/csharp-mode";
           sha256 = "17j84qrprq492dsn103dji8mvh29mbdlqlpsszbgfdgnpvfr1rv0";
           name = "csharp-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/csharp-mode";
+          homepage = "https://melpa.org/#/csharp-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -4243,13 +4516,13 @@
           sha256 = "13zq8kym1y6bzrpxbcdz32323a6azy5px4ridff6xh8bfprwlay3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ctable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ctable";
           sha256 = "040qmlgfvjc1f908n52m5ll2fizbrhjzbd0kgrsw37bvm3029rx1";
           name = "ctable";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ctable";
+          homepage = "https://melpa.org/#/ctable";
           license = lib.licenses.free;
         };
       }) {};
@@ -4262,13 +4535,13 @@
           sha256 = "1xgrb4ivgz7gmingfafmclqqflxdvkarmfkqqv1zjk6yrjhlcvwf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ctags";
           sha256 = "11fp8l99rj4fmi0vd3hkffgpfhk1l82ggglzb74jr3qfzv3dcn6y";
           name = "ctags";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ctags";
+          homepage = "https://melpa.org/#/ctags";
           license = lib.licenses.free;
         };
       }) {};
@@ -4283,13 +4556,13 @@
           sha256 = "05vhryqcydvcfm18fwby344931kzzh47x4l5ixy95xkcjkzrj8c7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ctags-update";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ctags-update";
           sha256 = "1k43l667mvr2y33nblachdlvdqvn256gysc1iwv5zgv7gj9i65qf";
           name = "ctags-update";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ctags-update";
+          homepage = "https://melpa.org/#/ctags-update";
           license = lib.licenses.free;
         };
       }) {};
@@ -4304,13 +4577,13 @@
           sha256 = "1jlr2miwqsg06hk2clvsrw9fa98m2n76qfq8qv5svrb8dpil04wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ctxmenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ctxmenu";
           sha256 = "03g9px858mg19wapqszwav3599slljdyam8bvn1ri85fpa5ydvdp";
           name = "ctxmenu";
         };
         packageRequires = [ log4e popup yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/ctxmenu";
+          homepage = "https://melpa.org/#/ctxmenu";
           license = lib.licenses.free;
         };
       }) {};
@@ -4325,13 +4598,13 @@
           sha256 = "1y685qfdkjyl7dwyvivlgc2lwp102vy6hvcb9zynw84c49f726sn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cuda-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cuda-mode";
           sha256 = "0ip4vax93x72bjrh6prik6ddmrvszpsmgm0fxfz772rp24smc300";
           name = "cuda-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cuda-mode";
+          homepage = "https://melpa.org/#/cuda-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -4346,13 +4619,13 @@
           sha256 = "1yhizh8j745hv5ancpvijds9dasvsr2scwjscksp2x3krnd26ssp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cyberpunk-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cyberpunk-theme";
           sha256 = "0l2bwb5afkkhrbh99v2gns1vil9s5911hbnlq5w35nmg1wvbmbc9";
           name = "cyberpunk-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cyberpunk-theme";
+          homepage = "https://melpa.org/#/cyberpunk-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -4367,34 +4640,34 @@
           sha256 = "1vkwm1n0amf0y0jdyvqskp00b6aijqhd7wclzkzrq7glrvj2z1xw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cyphejor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cyphejor";
           sha256 = "18l5km4xm5j3vv19k3fxs8i3rg4qnhrvx7b62vmyfcqmpiasrh6g";
           name = "cyphejor";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/cyphejor";
+          homepage = "https://melpa.org/#/cyphejor";
           license = lib.licenses.free;
         };
       }) {};
     cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cython-mode";
-        version = "0.23.4";
+        version = "0.24.1.0";
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "dc00a176d896f0df892aad8b305d946d3ed632a0";
-          sha256 = "0kbk2gp2avp0da32mr003ziigmi98zi0fvwia4knylllmrkl3pvq";
+          rev = "3de7bd5559631321c287c8fdd8958b6c494dba5c";
+          sha256 = "11ddx5c535a76pnxqdfahchi839v59iwvpiyswigskyfhzxn5ic1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cython-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/cython-mode";
           sha256 = "0asai1f1pncrfxx296fn6ky09hj1qam5j0dpxxkzhy0a34xz0k2i";
           name = "cython-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/cython-mode";
+          homepage = "https://melpa.org/#/cython-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -4409,13 +4682,13 @@
           sha256 = "0apg6cpwjhp8spqq8yyfp56y3pn991sfc85kfnifyhz6v3y6vwv6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/d-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/d-mode";
           sha256 = "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2";
           name = "d-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/d-mode";
+          homepage = "https://melpa.org/#/d-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -4430,13 +4703,13 @@
           sha256 = "1gdh4izwhyly6dyrmh7lfpd12gnb8hpnafj8br51ksijsssrf21f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/darcula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/darcula-theme";
           sha256 = "13d21gwzv66ibn0gs56ff3sn76sa2mkjvjmpd2ncxq3mcgxajnjg";
           name = "darcula-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/darcula-theme";
+          homepage = "https://melpa.org/#/darcula-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -4451,13 +4724,13 @@
           sha256 = "1p7ih9fmcxnnxkj2mz56xa403m828wyyqvliabf5amklzjlhb3z9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/darktooth-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/darktooth-theme";
           sha256 = "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs";
           name = "darktooth-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/darktooth-theme";
+          homepage = "https://melpa.org/#/darktooth-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -4472,13 +4745,13 @@
           sha256 = "1vkn95dyc0pppnflyqlrlx32g9zc7wdcgc9fgf1hgvqp313ydfcs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dart-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dart-mode";
           sha256 = "0wxfh8v716dhrmx1klhpnsrlsj66llk8brmwryjg2h7c391sb5ff";
           name = "dart-mode";
         };
         packageRequires = [ cl-lib dash flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/dart-mode";
+          homepage = "https://melpa.org/#/dart-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -4493,13 +4766,13 @@
           sha256 = "1njv5adcm96kdch0jb941l8pm51yfdx7mlz83y0pq6jlzjs9mwaa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dash";
           sha256 = "0azm47900bk2frpjsgy108fr3p1jk4h9kmp4b5j5pibgsm26azgz";
           name = "dash";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dash";
+          homepage = "https://melpa.org/#/dash";
           license = lib.licenses.free;
         };
       }) {};
@@ -4514,13 +4787,13 @@
           sha256 = "1njv5adcm96kdch0jb941l8pm51yfdx7mlz83y0pq6jlzjs9mwaa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dash-functional";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dash-functional";
           sha256 = "0hx36hs12mf4nmskaaqrqpcgwrfjdqj6qcxn6bwb0s5m2jf9hs8p";
           name = "dash-functional";
         };
         packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/dash-functional";
+          homepage = "https://melpa.org/#/dash-functional";
           license = lib.licenses.free;
         };
       }) {};
@@ -4535,13 +4808,13 @@
           sha256 = "06aprbhhxb6bbzmf0r5yq2ry6x7708vp4d94ja3ir6zcwc96wn0k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/date-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/date-at-point";
           sha256 = "0r26df6px6q5jlxj29nhl3qbp6kzy9hs5vd72kpiirgn4wlmagp0";
           name = "date-at-point";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/date-at-point";
+          homepage = "https://melpa.org/#/date-at-point";
           license = lib.licenses.free;
         };
       }) {};
@@ -4556,13 +4829,34 @@
           sha256 = "1lmwnj2fnvijj9qp4rjggl7c4x91vnpb47rqaam6m2wmr5wbrx3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/date-field";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/date-field";
           sha256 = "0fmw13sa4ajs1xkrkdpcjpbp0jl9d81cgvwh93myg8yjjn7wbmvk";
           name = "date-field";
         };
         packageRequires = [ dash log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/date-field";
+          homepage = "https://melpa.org/#/date-field";
+          license = lib.licenses.free;
+        };
+      }) {};
+    decide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "decide";
+        version = "0.5";
+        src = fetchFromGitHub {
+          owner = "lifelike";
+          repo = "decide-mode";
+          rev = "ce0cd15e8e42d458d86cbf4c1effd03cefec33bd";
+          sha256 = "0wm24ndiyhrayg1gz456s0s1ddlpcvg4vp555g4zzl3zcpsy94bg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/decide";
+          sha256 = "1gjkays48lhrifi9jwja5n2dpxjbl7f9rmka1nsqg9vf7s59vhhc";
+          name = "decide";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/decide";
           license = lib.licenses.free;
         };
       }) {};
@@ -4577,13 +4871,13 @@
           sha256 = "0pba9s0h37sxyqh733vi6k5raa4cs7aradipf3826inw36jcw414";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dedicated";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dedicated";
           sha256 = "1ka8n02r3nd2ksbid23g2qd6707c7xsjx7lbbdi6pcmwam5mglw9";
           name = "dedicated";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dedicated";
+          homepage = "https://melpa.org/#/dedicated";
           license = lib.licenses.free;
         };
       }) {};
@@ -4598,13 +4892,13 @@
           sha256 = "031f8ls1q80j717cg6b4pjd37wk7vrl5hcycsn8ca7yssmqa8q81";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/default-text-scale";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/default-text-scale";
           sha256 = "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi";
           name = "default-text-scale";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/default-text-scale";
+          homepage = "https://melpa.org/#/default-text-scale";
           license = lib.licenses.free;
         };
       }) {};
@@ -4619,13 +4913,13 @@
           sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/deferred";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/deferred";
           sha256 = "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr";
           name = "deferred";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/deferred";
+          homepage = "https://melpa.org/#/deferred";
           license = lib.licenses.free;
         };
       }) {};
@@ -4640,13 +4934,13 @@
           sha256 = "1lyqd9cgj7cb2lasf6ycw5j8wnsx2nrfm8ra4sg3dgcspm01a89g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/define-word";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/define-word";
           sha256 = "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a";
           name = "define-word";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/define-word";
+          homepage = "https://melpa.org/#/define-word";
           license = lib.licenses.free;
         };
       }) {};
@@ -4656,16 +4950,16 @@
         src = fetchgit {
           url = "git://jblevins.org/git/deft.git";
           rev = "4001a55cf5f79cdbfa00f1405e8a4645af4acd40";
-          sha256 = "eb5c178337c0bd6a001114aac685bb0d23167050970274203d93c1c0caece1e8";
+          sha256 = "1s71xk5c1hck7lh780lpa1q1c8qdpf2wdahl2406mgf06y1ifp7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/deft";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/deft";
           sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p";
           name = "deft";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/deft";
+          homepage = "https://melpa.org/#/deft";
           license = lib.licenses.free;
         };
       }) {};
@@ -4680,13 +4974,13 @@
           sha256 = "13jfhc9gavvb9dxmgi3k7ivp5iwh4yw4m11r2s8wpwn6p056bmfl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/demangle-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/demangle-mode";
           sha256 = "0ky0bb6rc99vrdli4lhs656qjndnla9b7inc2ji9l4n1zki5qxzk";
           name = "demangle-mode";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/demangle-mode";
+          homepage = "https://melpa.org/#/demangle-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -4701,13 +4995,13 @@
           sha256 = "13fasbhdjwc4jh3cy25gm5sbbg56hq8la271098qpx6dhqm2wycq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/describe-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/describe-number";
           sha256 = "0gvriailni2ppz69g0bwnb1ik1ghjkj341k45vllz30j0frp9iji";
           name = "describe-number";
         };
         packageRequires = [ yabin ];
         meta = {
-          homepage = "http://melpa.org/#/describe-number";
+          homepage = "https://melpa.org/#/describe-number";
           license = lib.licenses.free;
         };
       }) {};
@@ -4722,33 +5016,34 @@
           sha256 = "184zi5fv7ranghfx1hpx7j2wnk6kim8ysliyw2c5c1294sxxq3f3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/desktop+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/desktop+";
           sha256 = "0w7i6k4814hwb19l7ly9yq59674xiw57ylrwxq7yprwx52sgs2r8";
           name = "desktop-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/desktop+";
+          homepage = "https://melpa.org/#/desktop+";
           license = lib.licenses.free;
         };
       }) {};
-    desktop-registry = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    desktop-registry = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "desktop-registry";
         version = "1.2.0";
-        src = fetchgit {
-          url = "git://ryuslash.org/desktop-registry.git";
+        src = fetchFromGitHub {
+          owner = "ryuslash";
+          repo = "desktop-registry";
           rev = "244c2e7f9f0a1050aa8a47ad0b38f4e4584682dd";
-          sha256 = "7c7727dd1d63be98e428700bfe340f2c4e7ff713fcc9b2b743a3366d786ae02d";
+          sha256 = "11qvhbz7149vqh61fgqqn4inw0ic6ib9lz2xgr9m54pdw9a901mp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/desktop-registry";
-          sha256 = "02mj0nlawx6vpksqsvp1q7l8rd6b1bs8f9c8c2rmda46jaf5npyr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/desktop-registry";
+          sha256 = "1sfj0w6hlrx37js63fn1v5xc9ngmahv07g42z68717md6w3c8g0v";
           name = "desktop-registry";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/desktop-registry";
+          homepage = "https://melpa.org/#/desktop-registry";
           license = lib.licenses.free;
         };
       }) {};
@@ -4763,13 +5058,13 @@
           sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dictionary";
           sha256 = "0zr9sm5rmr0frxdr0za72wiffip9391fn9dm5y5x0aj1z4c1n28w";
           name = "dictionary";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dictionary";
+          homepage = "https://melpa.org/#/dictionary";
           license = lib.licenses.free;
         };
       }) {};
@@ -4784,13 +5079,13 @@
           sha256 = "0sjwpvzd4x9c1b9iv66b33llvp96ryyzyp8pn1rnhvxfvjv43cnz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/diff-hl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/diff-hl";
           sha256 = "0kw0v9xcqidhf26qzrqwdlav2zhq32xx91k7akd2536jpji5pbn6";
           name = "diff-hl";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/diff-hl";
+          homepage = "https://melpa.org/#/diff-hl";
           license = lib.licenses.free;
         };
       }) {};
@@ -4805,13 +5100,13 @@
           sha256 = "1ci2gmyl0i736b2sxh77fyg4hs2pkn6rn9z7v2hzv6xlgqd6j3z6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/diffview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/diffview";
           sha256 = "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k";
           name = "diffview";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/diffview";
+          homepage = "https://melpa.org/#/diffview";
           license = lib.licenses.free;
         };
       }) {};
@@ -4826,13 +5121,13 @@
           sha256 = "0jzwaivsqh66py9hd3dg1ys5rc3p6pn8ndpwpvgyivk4pg6zhhj6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/digistar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/digistar-mode";
           sha256 = "0khzxlrm09h31i1nqz6rnzhrdssb3kppc4klpxza612l306fih0s";
           name = "digistar-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/digistar-mode";
+          homepage = "https://melpa.org/#/digistar-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -4847,13 +5142,13 @@
           sha256 = "1vrd74vmm60gb69a4in412mjncnhkjbfpakpaa6w9rj7w4kyfiz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dim";
           sha256 = "0gsyily47g3g55qmhp1wzfz319l1pkgjz4lbigafjzlzqxyclz52";
           name = "dim";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/dim";
+          homepage = "https://melpa.org/#/dim";
           license = lib.licenses.free;
         };
       }) {};
@@ -4868,13 +5163,13 @@
           sha256 = "0bw1gkaycbbv2glnaa36gwzkl1l6lsq7i2i7jinka92b27zvrans";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dim-autoload";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dim-autoload";
           sha256 = "0lhzzjrgfvbqnzwhjywrk3skdb7x10xdq7d21q6kdk3h5r0np9f9";
           name = "dim-autoload";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dim-autoload";
+          homepage = "https://melpa.org/#/dim-autoload";
           license = lib.licenses.free;
         };
       }) {};
@@ -4889,13 +5184,13 @@
           sha256 = "0qpgfgp8hrzz4vdifxq8h25n0a0jlzgf7aa1fpy6r0080v5rqbb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/diminish";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/diminish";
           sha256 = "1h6a31jllypk47akjflz89xk6h47na96pim17d6g4rpqcafc2k43";
           name = "diminish";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/diminish";
+          homepage = "https://melpa.org/#/diminish";
           license = lib.licenses.free;
         };
       }) {};
@@ -4910,13 +5205,13 @@
           sha256 = "1xg9cschjd2m0zal296q54ifk5i4s1s3azwfdkbgshxxgvxaky0w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dionysos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dionysos";
           sha256 = "1wjgj74dnlwd79gc3l7ymbx75jka8rw9smzbb10dsfppw3rrzfmz";
           name = "dionysos";
         };
         packageRequires = [ dash libmpdee pkg-info s ];
         meta = {
-          homepage = "http://melpa.org/#/dionysos";
+          homepage = "https://melpa.org/#/dionysos";
           license = lib.licenses.free;
         };
       }) {};
@@ -4931,13 +5226,13 @@
           sha256 = "1d813b4wiamif48v0za5invnss52mn7yw3hzrlxd4918gy5y2r74";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-atool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-atool";
           sha256 = "0qljx6fmz1hal9r2smjyc957wcvcpg16vp5mv65ip6d26k5qsj0w";
           name = "dired-atool";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/dired-atool";
+          homepage = "https://melpa.org/#/dired-atool";
           license = lib.licenses.free;
         };
       }) {};
@@ -4952,13 +5247,13 @@
           sha256 = "1m0nx8wd6q56qbp5mbp9n466kyglrz34nflwvgd1qnmi08jwswgv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-efap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-efap";
           sha256 = "01j5v6584qi8ia7zmk03kx3i3kmm6hn6ycfgqlh5va6lp2h9sr00";
           name = "dired-efap";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dired-efap";
+          homepage = "https://melpa.org/#/dired-efap";
           license = lib.licenses.free;
         };
       }) {};
@@ -4973,13 +5268,13 @@
           sha256 = "0lrc4082ghg77x5jl26hj8c7cp48yjvqhv4g3j0pznpzb4qyfnq0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-fdclone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-fdclone";
           sha256 = "11aikq2q3m9h4zpgl24f8npvpwd98jgh8ygjwy2x5q8as8i89vf9";
           name = "dired-fdclone";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dired-fdclone";
+          homepage = "https://melpa.org/#/dired-fdclone";
           license = lib.licenses.free;
         };
       }) {};
@@ -4994,13 +5289,13 @@
           sha256 = "088h9yn6wndq4pq6f7q4iz17f9f4ci29z9nh595idljp3vwr7qid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-imenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-imenu";
           sha256 = "09yix4fkr03jq6j2rmvyg6gkmcnraw49a8m9649r3m525qdnhxs1";
           name = "dired-imenu";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dired-imenu";
+          homepage = "https://melpa.org/#/dired-imenu";
           license = lib.licenses.free;
         };
       }) {};
@@ -5015,13 +5310,13 @@
           sha256 = "0rpln6m3j4xbhrmmz18hby6xpzpzbf1c5hr7bxvna265cb0i5rn7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-k";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-k";
           sha256 = "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8";
           name = "dired-k";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/dired-k";
+          homepage = "https://melpa.org/#/dired-k";
           license = lib.licenses.free;
         };
       }) {};
@@ -5036,13 +5331,13 @@
           sha256 = "0mfvyjbx7l7a1sfq47m6rb507xxw92nykkkpzmi2mpwv30f1c22j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-single";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dired-single";
           sha256 = "13h8dsn7bkz8ji2rrb7vyrqb2znxarpiynqi65mfli7dn5k086vf";
           name = "dired-single";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dired-single";
+          homepage = "https://melpa.org/#/dired-single";
           license = lib.licenses.free;
         };
       }) {};
@@ -5057,13 +5352,13 @@
           sha256 = "0p8c2hjgr81idm1psv3i3v5hr5rv0875ig8app2yqjwzvl0nn73f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/direx";
           sha256 = "1x3rnrhhyrrvgry9n7kc0734la1zp4gc4bpy50f2qpfd452jwqdm";
           name = "direx";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/direx";
+          homepage = "https://melpa.org/#/direx";
           license = lib.licenses.free;
         };
       }) {};
@@ -5078,13 +5373,13 @@
           sha256 = "0swdh0qynpijsv6a2d308i42hfa0jwqsnmf4sm8vrhaf3vv25f5h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/direx-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/direx-grep";
           sha256 = "0y2wrzq06prm55akwgaqjg56znknyvbayav13asirqzg258skvm2";
           name = "direx-grep";
         };
         packageRequires = [ direx ];
         meta = {
-          homepage = "http://melpa.org/#/direx-grep";
+          homepage = "https://melpa.org/#/direx-grep";
           license = lib.licenses.free;
         };
       }) {};
@@ -5099,13 +5394,13 @@
           sha256 = "0qxw30zrlcxhxb0alrgyiclrk44dysal8xsbz2mvgrb6jli8wg18";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/discover";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/discover";
           sha256 = "1hf57p90jn1zzhjl63zv9ascbgkcbr0p0zmd3fvzpjsw84235dga";
           name = "discover";
         };
         packageRequires = [ makey ];
         meta = {
-          homepage = "http://melpa.org/#/discover";
+          homepage = "https://melpa.org/#/discover";
           license = lib.licenses.free;
         };
       }) {};
@@ -5120,13 +5415,13 @@
           sha256 = "1wlqyl03hhnflbyay3qlvdzqzvv5rbybcjpfddggda7ias9h0pr4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/discover-my-major";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/discover-my-major";
           sha256 = "0ch2y4grdjp7pvw2kxqnqdl7jd3q609n3pm3r0gn6k0xmcw85fgg";
           name = "discover-my-major";
         };
         packageRequires = [ makey ];
         meta = {
-          homepage = "http://melpa.org/#/discover-my-major";
+          homepage = "https://melpa.org/#/discover-my-major";
           license = lib.licenses.free;
         };
       }) {};
@@ -5141,34 +5436,55 @@
           sha256 = "1b1a1bwc6nv6wkd8jg1cqmjb9m9pxi5i2wbrz97fgii23dwfmlnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dispass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dispass";
           sha256 = "08c1s4zgl4rha10mva48cfkxzrqnpdhy03pxq51ihw94v6vxzg3z";
           name = "dispass";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dispass";
+          homepage = "https://melpa.org/#/dispass";
           license = lib.licenses.free;
         };
       }) {};
-    docker = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, s }:
+    dix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dix";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "unhammer";
+          repo = "dix";
+          rev = "6acd1f5f221f4ec8e5e98158332f1b816073e80d";
+          sha256 = "069ymd1hinc6g1h0iy8pf6sckvasssi2p6lgaway6yj1gvks22vz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dix";
+          sha256 = "0c5fmknpy6kwlz7nx0csbbia1maz0szj7yha1p7wq28s3a5426xq";
+          name = "dix";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/dix";
+          license = lib.licenses.free;
+        };
+      }) {};
+    docker = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, s, tle }:
     melpaBuild {
         pname = "docker";
-        version = "0.2.0";
+        version = "0.3.1";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "docker.el";
-          rev = "77f646cc10909403a945d188cf9d81abd3bfc2a0";
-          sha256 = "06vb6r1k9ml799h44fm9jhf3amldzhawxnm0lnr501hrmj4bz36x";
+          rev = "8c06af5b3fc24e7466910d1ea13c387ca8b98c95";
+          sha256 = "0kd35y5d36n3dxz55srrzvgka9877n5dlbhwilq0h5g7p7llnq3h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/docker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/docker";
           sha256 = "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk";
           name = "docker";
         };
-        packageRequires = [ dash emacs magit-popup s ];
+        packageRequires = [ dash emacs magit-popup s tle ];
         meta = {
-          homepage = "http://melpa.org/#/docker";
+          homepage = "https://melpa.org/#/docker";
           license = lib.licenses.free;
         };
       }) {};
@@ -5183,13 +5499,13 @@
           sha256 = "1cmh8pwwa6dhl4w66wy8s5yqxs326mnaalg1ig2yhl4bjk8gi4m2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dockerfile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dockerfile-mode";
           sha256 = "1dxvzn35a9qd3x8pjvrvb2g71yf84404g6vz81y0p353rf2zknpa";
           name = "dockerfile-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dockerfile-mode";
+          homepage = "https://melpa.org/#/dockerfile-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -5204,13 +5520,13 @@
           sha256 = "04h1hlsc83w4dppw9m44jq7mkcpy0bblvnzrhvsh06pibjywdd73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/doom";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/doom";
           sha256 = "098q77lix7kwpmarv26yndyk1yy1h4k3l9kaf3g7sg6ji6k7d3wl";
           name = "doom";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/doom";
+          homepage = "https://melpa.org/#/doom";
           license = lib.licenses.free;
         };
       }) {};
@@ -5225,34 +5541,34 @@
           sha256 = "13czcxmmvy4g9ysfjr6lb91c0fqv1xv8ppd27wbfsrgxm3aaqimb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/downplay-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/downplay-mode";
           sha256 = "1v6nga101ljzza8qj3lkmkzzl0vvzj4lsh1m69698s8prnczxr9b";
           name = "downplay-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/downplay-mode";
+          homepage = "https://melpa.org/#/downplay-mode";
           license = lib.licenses.free;
         };
       }) {};
     dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dracula-theme";
-        version = "1.2.0";
+        version = "1.2.1";
         src = fetchFromGitHub {
           owner = "zenorocha";
           repo = "dracula-theme";
-          rev = "ee065fed126eecdfe33a1a578d9f1e20687d2f3a";
-          sha256 = "1x7hyj5qi9f222zwhwjqr98zzcvqjqfwxlglph8nsbadkv4s8c3v";
+          rev = "adc51d039aacd8c4c54c19eeb75f663a093dc3d7";
+          sha256 = "0d8axj2dvzavxcrn3i5pmswhxk57kg6fcs244sr8zviwr15lipdz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dracula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dracula-theme";
           sha256 = "0ayv00wvajia8kbfrqkrkpb3qp3k70qcnqkav7am16p5kbvzp10r";
           name = "dracula-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/dracula-theme";
+          homepage = "https://melpa.org/#/dracula-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -5267,13 +5583,13 @@
           sha256 = "0z3w58zplm5ks195zfsaq8kwbc944p3kbzs702jgz02wcrm4c28y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/draft-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/draft-mode";
           sha256 = "1wg9cx39f4dhrykb4zx4fh0x5cfrh5aicwwfh1h3yzpc4zlr7xfh";
           name = "draft-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/draft-mode";
+          homepage = "https://melpa.org/#/draft-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -5283,39 +5599,39 @@
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "rejeep";
-          repo = "drag-stuff";
+          repo = "drag-stuff.el";
           rev = "3265e4fe93323bc9089d12db3d466d49bc44a99d";
           sha256 = "0wncdlc45flggn6sq5a95y7k6q11hy7zxp0ddhsjqccl30mdwax5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/drag-stuff";
-          sha256 = "0hzbh58ijv1akamav8r0zs76pwda2zd9mjaj31ffalzhhsm5jnyc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/drag-stuff";
+          sha256 = "1q67q20gfhixzkmddhzp6fd8z2qfpsmyyvymmaffjcscnjaz21w4";
           name = "drag-stuff";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/drag-stuff";
+          homepage = "https://melpa.org/#/drag-stuff";
           license = lib.licenses.free;
         };
       }) {};
     drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }:
     melpaBuild {
         pname = "drupal-mode";
-        version = "0.6.1";
+        version = "0.7.0";
         src = fetchFromGitHub {
           owner = "arnested";
           repo = "drupal-mode";
-          rev = "cf0364cbaf727bcd21ab7c2a14cc987c49fd97d0";
-          sha256 = "12lxqrcfv5salmcslw3kggymcwwc0lzq1b6iqd7x4zizp0sjf09s";
+          rev = "d920370dc632bd0b4abf736a7315aa20748d2676";
+          sha256 = "1hbm3zdmd28fjl8fky0kq4gs2bxsrn2zxk9rd1wa2wky43ycnd35";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/drupal-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/drupal-mode";
           sha256 = "14jvk4phq3wcff3yvhygix0c9cpbphh0dvm961i93jpsx7g9awgn";
           name = "drupal-mode";
         };
         packageRequires = [ php-mode ];
         meta = {
-          homepage = "http://melpa.org/#/drupal-mode";
+          homepage = "https://melpa.org/#/drupal-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -5330,13 +5646,13 @@
           sha256 = "156cscpavrp695lp8pgjg5jnq3b8n9c2h8qg8w89dd4vfkc3iikd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/drupal-spell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/drupal-spell";
           sha256 = "117rr2bfnc99g3qsr127grxwaqp54cxjaj3nl2nr6z78nja0fij3";
           name = "drupal-spell";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/drupal-spell";
+          homepage = "https://melpa.org/#/drupal-spell";
           license = lib.licenses.free;
         };
       }) {};
@@ -5351,34 +5667,55 @@
           sha256 = "17yldk76mxakhb90bma7r4z9jgx02wankgk17r2di196mc04bj7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ducpel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ducpel";
           sha256 = "1cqrkgg7n9bhjswnpl7yc6w6yjs4gfbliaqsimmf9z43wk2ml4pc";
           name = "ducpel";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/ducpel";
+          homepage = "https://melpa.org/#/ducpel";
           license = lib.licenses.free;
         };
       }) {};
-    dumb-jump = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    dumb-jump = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "0.2.5";
+        version = "0.3.9";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "e1135a2bf8685726c9c083f444a9aa49d3ca56f5";
-          sha256 = "1hrlsyrqd0kpapw119mic5ilksb7y5ddmmc62hzbaqs7xmhzp52j";
+          rev = "5313ef651b58dd9b8b9fcb388856b8dcbf1b791b";
+          sha256 = "1czw5z6w8pcc7ra5d82v06padyiy7c3ds00chw5xgyvq6s73gzn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dumb-jump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dumb-jump";
           sha256 = "1pgbs2k1g8w7gr65w50fazrmcky6w37c9rvyxqfmh06yx90nj4kc";
           name = "dumb-jump";
         };
-        packageRequires = [ dash f s ];
+        packageRequires = [ dash f popup s ];
         meta = {
-          homepage = "http://melpa.org/#/dumb-jump";
+          homepage = "https://melpa.org/#/dumb-jump";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dummy-h-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dummy-h-mode";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "yascentur";
+          repo = "dummy-h-mode-el";
+          rev = "27ad0991abb53e65d0402ef6c378075e4be0ed2d";
+          sha256 = "033yqc19xxirbva65lz8hnwxj7pn7fx7dlnf70kq71iqclqa4v25";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dummy-h-mode";
+          sha256 = "10lzfzq7md6s28w2zzlhswn3d6765g4vqzyjn2q5ms8pd2i4b4in";
+          name = "dummy-h-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/dummy-h-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -5388,17 +5725,17 @@
         version = "0.3";
         src = fetchhg {
           url = "https://bitbucket.com/harsman/dyalog-mode";
-          rev = "ce795beb8747";
-          sha256 = "0ghxnzi2iy1g633fshl9wdpg2asrcl0v5rkk61gqd6axm7fjaxcj";
+          rev = "4dac440334f0";
+          sha256 = "19aid1rqpqj0fvln98db5imfk1griqld55xsr9plm6kwrr174syq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dyalog-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dyalog-mode";
           sha256 = "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq";
           name = "dyalog-mode";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/dyalog-mode";
+          homepage = "https://melpa.org/#/dyalog-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -5413,13 +5750,13 @@
           sha256 = "1ppwlill1z4vqd566h9zi6zx5jb7hggmnmqrga84j5n7fwqvgz7f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dynamic-fonts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dynamic-fonts";
           sha256 = "0a210ca41maa755lv1n7hhpxp0f7lfxrxbi0x34icbkfkmijhl6q";
           name = "dynamic-fonts";
         };
         packageRequires = [ font-utils pcache persistent-soft ];
         meta = {
-          homepage = "http://melpa.org/#/dynamic-fonts";
+          homepage = "https://melpa.org/#/dynamic-fonts";
           license = lib.licenses.free;
         };
       }) {};
@@ -5434,13 +5771,13 @@
           sha256 = "05z7gshrn7wp0qkb9ns6rgmcp375yllmkwhdsm4amg0dk3j2slbr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dynamic-ruler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/dynamic-ruler";
           sha256 = "13jc3xbsyc3apkdfy0iafmsfvgqs0zfa5w8jxp7zj4dhb7pxpnmc";
           name = "dynamic-ruler";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/dynamic-ruler";
+          homepage = "https://melpa.org/#/dynamic-ruler";
           license = lib.licenses.free;
         };
       }) {};
@@ -5455,13 +5792,13 @@
           sha256 = "0g0cz5a0vf31w27ljq5sn52mq15ynadl6cfbb97ja5zj1zxsxgjl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/e2wm";
           sha256 = "0dp360jr3fgxqywkp7g88cp02g37kw2hdsc0f70hjak9n3sy03la";
           name = "e2wm";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/e2wm";
+          homepage = "https://melpa.org/#/e2wm";
           license = lib.licenses.free;
         };
       }) {};
@@ -5476,13 +5813,13 @@
           sha256 = "1yf081rac0chvkjha9z9xi1p983gmhjph0hai6ppsz5hzf2vikpp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-R";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/e2wm-R";
           sha256 = "09v4fz178lch4d6m801ipclfxm2qrap5601aysnzyvc2apvyr3sh";
           name = "e2wm-R";
         };
         packageRequires = [ e2wm ];
         meta = {
-          homepage = "http://melpa.org/#/e2wm-R";
+          homepage = "https://melpa.org/#/e2wm-R";
           license = lib.licenses.free;
         };
       }) {};
@@ -5497,13 +5834,13 @@
           sha256 = "09i7d2rc9zd4s3nqrhd3ggs1ykdpxf0pyhxixxw2xy0q6nbswjia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/e2wm-direx";
           sha256 = "0nv8aciq0swxi9ahwc2pvk9c7i3rmlp7vrzqcan58ml0i3nm17wg";
           name = "e2wm-direx";
         };
         packageRequires = [ direx e2wm ];
         meta = {
-          homepage = "http://melpa.org/#/e2wm-direx";
+          homepage = "https://melpa.org/#/e2wm-direx";
           license = lib.licenses.free;
         };
       }) {};
@@ -5518,13 +5855,13 @@
           sha256 = "1vrlfzy1wynm7x4m7pl8vim7ykqd6qkcilwz7sjc1lbckz11ig0d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-pkgex4pl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/e2wm-pkgex4pl";
           sha256 = "0hgdbqfw3015fr929m36kfiqqzsid6afs3222iqq0apg7gfj7jil";
           name = "e2wm-pkgex4pl";
         };
         packageRequires = [ e2wm plsense-direx ];
         meta = {
-          homepage = "http://melpa.org/#/e2wm-pkgex4pl";
+          homepage = "https://melpa.org/#/e2wm-pkgex4pl";
           license = lib.licenses.free;
         };
       }) {};
@@ -5539,13 +5876,13 @@
           sha256 = "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-sww";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/e2wm-sww";
           sha256 = "0x45j62cjivf9v7jp1b41yya3f9akp92md6cbv0v7bwz98g2vsk8";
           name = "e2wm-sww";
         };
         packageRequires = [ e2wm ];
         meta = {
-          homepage = "http://melpa.org/#/e2wm-sww";
+          homepage = "https://melpa.org/#/e2wm-sww";
           license = lib.licenses.free;
         };
       }) {};
@@ -5560,13 +5897,13 @@
           sha256 = "0qv3kh6q3q7vgfsd8x25x8agi3fp96dkpjnxdidkwk6k8h9n0jzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/e2wm-term";
           sha256 = "0wrq06yap80a96l9l0hs7x7rng7sx6vi1hz778kknb6il4f2f45g";
           name = "e2wm-term";
         };
         packageRequires = [ e2wm log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/e2wm-term";
+          homepage = "https://melpa.org/#/e2wm-term";
           license = lib.licenses.free;
         };
       }) {};
@@ -5581,13 +5918,13 @@
           sha256 = "0r56nqrj6iaz57ys6hqdq5qkyliv7dj6dv274l228r7x0axrwd9m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/easy-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/easy-kill";
           sha256 = "10jcv7a4vcnaj3wkabip2xwzcwlmvdlqkl409a9lnzfasxcpf32i";
           name = "easy-kill";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/easy-kill";
+          homepage = "https://melpa.org/#/easy-kill";
           license = lib.licenses.free;
         };
       }) {};
@@ -5602,13 +5939,13 @@
           sha256 = "18fdlxz9k961k8wafdw0gq0y514bvrfvx6qc1lmm4pk3gdcfbbi0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/easy-kill-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/easy-kill-extras";
           sha256 = "0xzlzv57nvrc142saydwfib51fyqcdzjccc1hj6xvgcdbwadlnjy";
           name = "easy-kill-extras";
         };
         packageRequires = [ easy-kill ];
         meta = {
-          homepage = "http://melpa.org/#/easy-kill-extras";
+          homepage = "https://melpa.org/#/easy-kill-extras";
           license = lib.licenses.free;
         };
       }) {};
@@ -5623,13 +5960,13 @@
           sha256 = "18bm5ns1qrxq0rrz9sylshr62wkymh1m6b7ch2y74f8rcwdwjgnq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/easy-repeat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/easy-repeat";
           sha256 = "1vx57gpw0nbxh976s18va4ali1nqxqffhaxv1c5rhf4pwlk2fa06";
           name = "easy-repeat";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/easy-repeat";
+          homepage = "https://melpa.org/#/easy-repeat";
           license = lib.licenses.free;
         };
       }) {};
@@ -5644,13 +5981,13 @@
           sha256 = "0ysym38xaqyx1wc7xd3fvjm62dmiq4727dnjvyxv7hs4czff1gcb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ebal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ebal";
           sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg";
           name = "ebal";
         };
         packageRequires = [ emacs f ido-completing-read-plus ];
         meta = {
-          homepage = "http://melpa.org/#/ebal";
+          homepage = "https://melpa.org/#/ebal";
           license = lib.licenses.free;
         };
       }) {};
@@ -5665,34 +6002,34 @@
           sha256 = "16hiwz8a1hyyiflzn53v97704v783pg18yxapn7pqk90fbcf7czw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ebf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ebf";
           sha256 = "072w1hczzb4z0dadvqy8px9zfnfd2z0w8nwa7q2qm5njg30rrqpb";
           name = "ebf";
         };
         packageRequires = [ cl-lib dash dash-functional ];
         meta = {
-          homepage = "http://melpa.org/#/ebf";
+          homepage = "https://melpa.org/#/ebf";
           license = lib.licenses.free;
         };
       }) {};
     ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }:
     melpaBuild {
         pname = "ebib";
-        version = "2.5.2";
+        version = "2.5.4";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "e9f92df575d747992e9ada768b18dee475cfee55";
-          sha256 = "159w19hx3gmhv8n2amkm6i999vdrz5132bjwk28qpiq37v1v7dd5";
+          rev = "069ecbe32a4d5f1273e2d749204750652fbb5d91";
+          sha256 = "1kcmbr4a2jxd62s4nc8xshrksb36xwb17j6c0hjzvb75r544xy6s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ebib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ebib";
           sha256 = "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid";
           name = "ebib";
         };
         packageRequires = [ dash emacs parsebib ];
         meta = {
-          homepage = "http://melpa.org/#/ebib";
+          homepage = "https://melpa.org/#/ebib";
           license = lib.licenses.free;
         };
       }) {};
@@ -5707,13 +6044,13 @@
           sha256 = "1s9r1qj7cjsjvvphdpyjff6y598xpbrm9qjv5ncq15w6ac7yxzvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ecb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ecb";
           sha256 = "097hdskhfh255znrqamcssx4ns1sgkxchlbc7pjqwzpflsi0fx89";
           name = "ecb";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ecb";
+          homepage = "https://melpa.org/#/ecb";
           license = lib.licenses.free;
         };
       }) {};
@@ -5728,13 +6065,13 @@
           sha256 = "1r5hlcspznvfm111l1z0r4isd582qj64sa8cqk6hyi3y1hyp1xxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ecukes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ecukes";
           sha256 = "0ava8hrc7r1mzv6xgbrb84qak5xrf6fj8g9qr4i4g0cr7843nrw0";
           name = "ecukes";
         };
         packageRequires = [ ansi commander dash espuds f s ];
         meta = {
-          homepage = "http://melpa.org/#/ecukes";
+          homepage = "https://melpa.org/#/ecukes";
           license = lib.licenses.free;
         };
       }) {};
@@ -5749,13 +6086,13 @@
           sha256 = "0xy3q68i47a3s81jwr0rdvc1722bp78ng56xm53pri05g1z0db9s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edbi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/edbi";
           sha256 = "0qq0j16n8lyvkqqlcsrq1m7r7f0in6b92d74mpx5c6siv6z2vxlr";
           name = "edbi";
         };
         packageRequires = [ concurrent ctable epc ];
         meta = {
-          homepage = "http://melpa.org/#/edbi";
+          homepage = "https://melpa.org/#/edbi";
           license = lib.licenses.free;
         };
       }) {};
@@ -5770,13 +6107,13 @@
           sha256 = "10c84aad1lnr7z9f75k5ylgchykr3srcdmn88hlcx2n2c4jfbkds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edit-indirect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/edit-indirect";
           sha256 = "0q5jjmrvx5kaajllmhaxihsab2kr1vmcsfqrhxdhw3x3nf41s439";
           name = "edit-indirect";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/edit-indirect";
+          homepage = "https://melpa.org/#/edit-indirect";
           license = lib.licenses.free;
         };
       }) {};
@@ -5791,13 +6128,13 @@
           sha256 = "0981hy1n50yizc3k06vbxqrpfml817a67kab1hkgkw5v6ymm1hc9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edit-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/edit-list";
           sha256 = "0mi12jfgx06i0yr8k5nk80xryqszjv0xykdnri505862rb90xakv";
           name = "edit-list";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/edit-list";
+          homepage = "https://melpa.org/#/edit-list";
           license = lib.licenses.free;
         };
       }) {};
@@ -5812,76 +6149,34 @@
           sha256 = "12dp1xj09jrp0kxp9xb6cak9dn6zkyis1wfn4fnhzmxxnrd8c5rn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edit-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/edit-server";
           sha256 = "0ffxcgmnz0f2c1i3vfwm8vlm6jyd7ibf4kq5z8c6n50zkwfdmns0";
           name = "edit-server";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/edit-server";
+          homepage = "https://melpa.org/#/edit-server";
           license = lib.licenses.free;
         };
       }) {};
-    editorconfig = callPackage ({ editorconfig-core, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig";
-        version = "0.7.3";
+        version = "0.7.5";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "a327a42f3fdc2ab6d0e8226b3a22f4bab7e536bb";
-          sha256 = "0x6kb6zwkacw344zp8lprfmhm1mz2x7arn9ddgm53x410sbs71kx";
+          rev = "268478773c11bf5fb47b47b8c322bcd589e4c990";
+          sha256 = "1119yk2ilhd5apmsmg56w6bhi3qrlb8sgykpv15hr2hj0x3p2k61";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/editorconfig";
-          sha256 = "0na5lfi9bs4k1q73pph3ff0v8k8vzrfpzh47chyzk8nxsmvklw35";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/editorconfig";
+          sha256 = "0zv96m07ml8i3k7zm7sdci4hn611n3ypna7zppfkwbdyr7d5k2gc";
           name = "editorconfig";
         };
-        packageRequires = [ editorconfig-core ];
-        meta = {
-          homepage = "http://melpa.org/#/editorconfig";
-          license = lib.licenses.free;
-        };
-      }) {};
-    editorconfig-core = callPackage ({ cl-lib ? null, editorconfig-fnmatch, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "editorconfig-core";
-        version = "0.7.3";
-        src = fetchFromGitHub {
-          owner = "editorconfig";
-          repo = "editorconfig-emacs";
-          rev = "a327a42f3fdc2ab6d0e8226b3a22f4bab7e536bb";
-          sha256 = "0x6kb6zwkacw344zp8lprfmhm1mz2x7arn9ddgm53x410sbs71kx";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/editorconfig-core";
-          sha256 = "18d7byqkxn6lyw3nqsvqs5vyj9alh9wjd2mim44a3zcc9r2j061r";
-          name = "editorconfig-core";
-        };
-        packageRequires = [ cl-lib editorconfig-fnmatch ];
-        meta = {
-          homepage = "http://melpa.org/#/editorconfig-core";
-          license = lib.licenses.free;
-        };
-      }) {};
-    editorconfig-fnmatch = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "editorconfig-fnmatch";
-        version = "0.7.3";
-        src = fetchFromGitHub {
-          owner = "editorconfig";
-          repo = "editorconfig-emacs";
-          rev = "a327a42f3fdc2ab6d0e8226b3a22f4bab7e536bb";
-          sha256 = "0x6kb6zwkacw344zp8lprfmhm1mz2x7arn9ddgm53x410sbs71kx";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/editorconfig-fnmatch";
-          sha256 = "0ji243vrw527jc3alsgmqi9rdnslxyq48zzx33rbpkqcjssm11iv";
-          name = "editorconfig-fnmatch";
-        };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/editorconfig-fnmatch";
+          homepage = "https://melpa.org/#/editorconfig";
           license = lib.licenses.free;
         };
       }) {};
@@ -5896,13 +6191,13 @@
           sha256 = "06v34l9dkykrrdfpnm3zi5wjm0fdvy76pbkfnk92wqkjp8fqimhd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/edn";
           sha256 = "00cy8axhy2p3zalzl8k2083l5a7s3aswb9qfk9wsmf678m8pqwqg";
           name = "edn";
         };
         packageRequires = [ cl-lib dash emacs peg s ];
         meta = {
-          homepage = "http://melpa.org/#/edn";
+          homepage = "https://melpa.org/#/edn";
           license = lib.licenses.free;
         };
       }) {};
@@ -5917,13 +6212,13 @@
           sha256 = "1a1apa48n24yisd2zw5k4lfkngx3016x6y11qi80hg75vrnmg7f1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/edts";
           sha256 = "0f0rbd0mqqwn743qmr1g5mmi1sbmlcglclww8jxvbvb61jq8vspr";
           name = "edts";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/edts";
+          homepage = "https://melpa.org/#/edts";
           license = lib.licenses.free;
         };
       }) {};
@@ -5938,34 +6233,34 @@
           sha256 = "1ryb7smvf66hk307yazkjn9bqzbwzbyyb5db200fq6j2zdjwsmaj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/egg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/egg";
           sha256 = "144g1fvs2cmn3px0a98nvxl5cz70kx30v936k5ppyi8gvbj0md5i";
           name = "egg";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/egg";
+          homepage = "https://melpa.org/#/egg";
           license = lib.licenses.free;
         };
       }) {};
     egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "egison-mode";
-        version = "3.5.10";
+        version = "3.6.0";
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "6debb5f36074811a1b2f9c9741dc8c1f3bd869de";
-          sha256 = "16m7h477z10bmaymmgpj2id6l98iyrsp5wf69wd56534kh6qcajg";
+          rev = "a3241316207b6b623c5ae61e8fe8fb17783b981b";
+          sha256 = "07vdvjy4x21gyw2r4rxrj929hj1jp4a8igwgb2m5a5x50capwzhy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/egison-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/egison-mode";
           sha256 = "0x11fhv8kkx34h831k2q70y5qfz7wnfia4ka5mbmps7mpr68zcwi";
           name = "egison-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/egison-mode";
+          homepage = "https://melpa.org/#/egison-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -5975,37 +6270,58 @@
         src = fetchgit {
           url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git";
           rev = "524494fd2b23217c6807b30b43bb95b5724f809e";
-          sha256 = "3f41ade3332a3f1dc5cfb0b33077396feb7b683b2cf2c235b7a5f07f0b2e3271";
+          sha256 = "0w9j5q5pzw55nwsw5wic7dl7psvg75vk1cxhrz2isgra6gissh9z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eide";
           sha256 = "16cf32n2l4wy1px7fm6x4vxx7pbqdp7zh2jn3bymg0b40i2321sz";
           name = "eide";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/eide";
+          homepage = "https://melpa.org/#/eide";
           license = lib.licenses.free;
         };
       }) {};
-    ein = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
+    ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "0.7.1";
+        version = "0.8.1";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "2c08c68125ab7323e5068401a3097b90879571f8";
-          sha256 = "1si9zk4iwgkfn5p9x48hy1laz8r5m5vbyahy1andxrfxnb9fi0kj";
+          rev = "9fc8dd3be4a556d7abf6977c889887a38232929f";
+          sha256 = "0w2j0bbqnba1wr12f0zk87zwnxf6xhchx224fwgwqd3kg0x5z0r3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ein";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ein";
           sha256 = "1nksj1cpf4d9brr3rb80bgp2x05qdq9xmlp8mwbic1s27mw80bpp";
           name = "ein";
         };
-        packageRequires = [ request websocket ];
+        packageRequires = [ cl-generic request websocket ];
         meta = {
-          homepage = "http://melpa.org/#/ein";
+          homepage = "https://melpa.org/#/ein";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eink-theme";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "maio";
+          repo = "eink-emacs";
+          rev = "93d25c097b105594472c4f99d693f439b4b709f0";
+          sha256 = "0m7qsk378c30fva2n2ag99rsdklx5nsqc395msg1ab11sbpxvis0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eink-theme";
+          sha256 = "0z437cpf1b8bqyi7bv0w0dnc52q4f5g17530lwdcxjkr38s9b1zn";
+          name = "eink-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/eink-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -6020,13 +6336,13 @@
           sha256 = "0dbp2zz993cm7mrd58c4iflbzqwg50wzgn2cpwfivk14w1mznh4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-autoyas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/el-autoyas";
           sha256 = "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c";
           name = "el-autoyas";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/el-autoyas";
+          homepage = "https://melpa.org/#/el-autoyas";
           license = lib.licenses.free;
         };
       }) {};
@@ -6041,13 +6357,13 @@
           sha256 = "1awyh9ffd6a4cia239s89asb88ddqlnrv757d76vcb701pq412bz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-get";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/el-get";
           sha256 = "1438v2sw5n67q404c93y2py226v469nagqwp4w9l6yyy40h4myhz";
           name = "el-get";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/el-get";
+          homepage = "https://melpa.org/#/el-get";
           license = lib.licenses.free;
         };
       }) {};
@@ -6062,13 +6378,13 @@
           sha256 = "1mzla7ijmq1mgzr6bf16mjdycbf8ylsf4zdk4j6fh5kw5n4k6c5n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-init";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/el-init";
           sha256 = "121n6z8p9kzi7axp4i2kyi621gw20635w4j81i1bryblaqrv5kl5";
           name = "el-init";
         };
         packageRequires = [ anaphora cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/el-init";
+          homepage = "https://melpa.org/#/el-init";
           license = lib.licenses.free;
         };
       }) {};
@@ -6083,13 +6399,13 @@
           sha256 = "1488wv0f9ihzzf9fl8cki044k61b0kva604hdwpb2qk9gnjr4g1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-init-viewer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/el-init-viewer";
           sha256 = "0kkmsml9xf2n8nlrcicfg2l78s3dlhd6ssx0s62v77v4wdpl297m";
           name = "el-init-viewer";
         };
         packageRequires = [ anaphora cl-lib ctable dash el-init emacs ];
         meta = {
-          homepage = "http://melpa.org/#/el-init-viewer";
+          homepage = "https://melpa.org/#/el-init-viewer";
           license = lib.licenses.free;
         };
       }) {};
@@ -6104,13 +6420,13 @@
           sha256 = "13mv1rhgkwiww2wh5w926jz7idppp492wir1vdl245c5x50dh4f7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-mock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/el-mock";
           sha256 = "07m7w7n202nijnxidy0j0r4nbcvlnbkm9b0n8qb2bwi3d4cfp77l";
           name = "el-mock";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/el-mock";
+          homepage = "https://melpa.org/#/el-mock";
           license = lib.licenses.free;
         };
       }) {};
@@ -6125,13 +6441,13 @@
           sha256 = "0390pfgfgj7hwfmkwikwhip0hmwkgx784l529cqvalc31jchi94i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-spice";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/el-spice";
           sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg";
           name = "el-spice";
         };
         packageRequires = [ thingatpt-plus ];
         meta = {
-          homepage = "http://melpa.org/#/el-spice";
+          homepage = "https://melpa.org/#/el-spice";
           license = lib.licenses.free;
         };
       }) {};
@@ -6146,13 +6462,13 @@
           sha256 = "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/el-x";
           sha256 = "1721d9mljlcbdwb5b9934q7a48y30x6706pp4bjvgys0r64dml5g";
           name = "el-x";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/el-x";
+          homepage = "https://melpa.org/#/el-x";
           license = lib.licenses.free;
         };
       }) {};
@@ -6167,13 +6483,13 @@
           sha256 = "0hlj6jn9gmi00sqghxswkxpgk65c4gy2k7010vpkr2257rd4f3gq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elang";
           sha256 = "0frhn3hm8351qzljicpzars28af1fghgv45717ml79rwb4vi6yiy";
           name = "elang";
         };
         packageRequires = [ names ];
         meta = {
-          homepage = "http://melpa.org/#/elang";
+          homepage = "https://melpa.org/#/elang";
           license = lib.licenses.free;
         };
       }) {};
@@ -6188,34 +6504,34 @@
           sha256 = "1fh9dx669czkwy4msylcg64azz3az27akx55ipnazb5ghmsi7ivk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eldoc-eval";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eldoc-eval";
           sha256 = "0z4scgi2xgrgd47aqqmyv1ww8alh43s0qny5qmh3f1nnppz3nd7c";
           name = "eldoc-eval";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/eldoc-eval";
+          homepage = "https://melpa.org/#/eldoc-eval";
           license = lib.licenses.free;
         };
       }) {};
     electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
     melpaBuild {
         pname = "electric-operator";
-        version = "0.1";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "electric-operator";
-          rev = "3d34101e065396389cfbb8fec333c78641a71dc6";
-          sha256 = "1bqdg5sr4hkiqndr4hcdjscfdyj56jb4wr1kqgwy1hy4ccr9mkrr";
+          rev = "96a3696851abc47d369f8985bf6f790e68a4a9aa";
+          sha256 = "1ji6rdbqwk8j0nl6yk3rdqrpgxir99lj9pf6i9rx55l63qyrdfc4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/electric-operator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/electric-operator";
           sha256 = "043bkpvvk42lmkll5jnz4q8i0m44y4wdxvkz6hiqhqcp1rv03nw2";
           name = "electric-operator";
         };
         packageRequires = [ dash emacs names ];
         meta = {
-          homepage = "http://melpa.org/#/electric-operator";
+          homepage = "https://melpa.org/#/electric-operator";
           license = lib.licenses.free;
         };
       }) {};
@@ -6230,13 +6546,13 @@
           sha256 = "1ln0wprk8m2d33z804ld73jwv9x51xkwl9xfsywbh09w3x2zb51j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elfeed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elfeed";
           sha256 = "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9";
           name = "elfeed";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/elfeed";
+          homepage = "https://melpa.org/#/elfeed";
           license = lib.licenses.free;
         };
       }) {};
@@ -6251,13 +6567,13 @@
           sha256 = "1ln0wprk8m2d33z804ld73jwv9x51xkwl9xfsywbh09w3x2zb51j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elfeed-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elfeed-web";
           sha256 = "14ydwvjjc6wbhkj4g4xdh0c3nh4asqsz8ln7my5vjib881vmaq1n";
           name = "elfeed-web";
         };
         packageRequires = [ elfeed emacs simple-httpd ];
         meta = {
-          homepage = "http://melpa.org/#/elfeed-web";
+          homepage = "https://melpa.org/#/elfeed-web";
           license = lib.licenses.free;
         };
       }) {};
@@ -6272,34 +6588,34 @@
           sha256 = "1k7kprdknqm18dc0nwl7gachm0rivcpa8ng7p7ximalja3nsg2j1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elisp-slime-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elisp-slime-nav";
           sha256 = "009zgp68i4naprpjr8lcp06lh3i5ickn0nh0lgvrqs0niprnzh8c";
           name = "elisp-slime-nav";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/elisp-slime-nav";
+          homepage = "https://melpa.org/#/elisp-slime-nav";
           license = lib.licenses.free;
         };
       }) {};
     elixir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "elixir-mode";
-        version = "2.2.8";
+        version = "2.3.1";
         src = fetchFromGitHub {
           owner = "elixir-lang";
           repo = "emacs-elixir";
-          rev = "bfc95d9d444bf4002d340d37ad30954dd86c0e94";
-          sha256 = "07kgzdla31nc146xya21rn4hyr76h5lyabla8yh4qjsvnknb7cbj";
+          rev = "a1f4d60ec555574c945201359d2e32b183c69f4b";
+          sha256 = "06bi68x49v6f7flpz279mm4jpg31ll3s274givm3pvr8slcxs6xg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elixir-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elixir-mode";
           sha256 = "1dba3jfg210i2rw8qy866396xn2xjgmbcyl006d6fibpr3j4lxaf";
           name = "elixir-mode";
         };
         packageRequires = [ emacs pkg-info ];
         meta = {
-          homepage = "http://melpa.org/#/elixir-mode";
+          homepage = "https://melpa.org/#/elixir-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -6314,34 +6630,34 @@
           sha256 = "0dx5h3sfccc2bp1jxnqqki95x5hp1skw8n5n4lnh703yjga5gkrz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elixir-yasnippets";
-          sha256 = "0927znqd9j91wc51hdwcl2rxb66i1h549nyr1h39r13353gbwk3a";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elixir-yasnippets";
+          sha256 = "0vmkcd88wfafv31lyw0983p4qjj387qf258q7py1ij47fcmfp579";
           name = "elixir-yasnippets";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/elixir-yasnippets";
+          homepage = "https://melpa.org/#/elixir-yasnippets";
           license = lib.licenses.free;
         };
       }) {};
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "0.9.5";
+        version = "0.11.1";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "47ea2e8d06e9f39be4e1d5a79b6cc634f9d46e58";
-          sha256 = "0qiwzcpwiwlkjy89pxvss3gvjvbp4d6qpaxnbm50va1gbn21n72v";
+          rev = "4fb26ae8e10d7b88e05a9e3a5c1b2cf3c8c2d6c3";
+          sha256 = "0ly8i5x9ii781681xf9iisj5g83sfj2wf786072clll36ym4a7c1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elm-mode";
           sha256 = "1gw9szkyr1spcx7qijddhxlm36h0hmfd53b4yzp1336yx44mlnd1";
           name = "elm-mode";
         };
         packageRequires = [ emacs f let-alist s ];
         meta = {
-          homepage = "http://melpa.org/#/elm-mode";
+          homepage = "https://melpa.org/#/elm-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -6356,13 +6672,13 @@
           sha256 = "0l2iincskpks9yvj3y9zh1b48xli1q39wybr5n96rys5gv0drc9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elmacro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elmacro";
           sha256 = "0644rgwawivrq1shsjx1x2p53z7jgr6bxqgn2smzql8pp6azy7xz";
           name = "elmacro";
         };
         packageRequires = [ cl-lib dash s ];
         meta = {
-          homepage = "http://melpa.org/#/elmacro";
+          homepage = "https://melpa.org/#/elmacro";
           license = lib.licenses.free;
         };
       }) {};
@@ -6377,13 +6693,13 @@
           sha256 = "080nnw6ddsczbm7gk50x4dkahi77fsybfiki5iyp39fjpa7lfzq3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elmine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elmine";
           sha256 = "1gi94dyz9x50swkvryd4vj36rqgz4s58nrb4h4vwwviiiqmc8fvz";
           name = "elmine";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/elmine";
+          homepage = "https://melpa.org/#/elmine";
           license = lib.licenses.free;
         };
       }) {};
@@ -6398,13 +6714,13 @@
           sha256 = "1q4krfrc2dy0vr7q148msfpkcwj55mlsrn4n5xjnya4xj0134ib7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elpa-audit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elpa-audit";
           sha256 = "0l8har14zrlh9kdkh9vlmkmzg49vb0r8j1wnznryaidalvk84a52";
           name = "elpa-audit";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/elpa-audit";
+          homepage = "https://melpa.org/#/elpa-audit";
           license = lib.licenses.free;
         };
       }) {};
@@ -6419,13 +6735,13 @@
           sha256 = "1hjmvn3kls63alh0ihb5c8gf90lrfvq1hxrlf4162qiaa0s15f8a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elpa-mirror";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elpa-mirror";
           sha256 = "1jnviav2ybr13cgllg26kfjrwrl25adggnqiiwyjwgbbzxfycah8";
           name = "elpa-mirror";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/elpa-mirror";
+          homepage = "https://melpa.org/#/elpa-mirror";
           license = lib.licenses.free;
         };
       }) {};
@@ -6440,7 +6756,7 @@
           sha256 = "1xjm9b32a9nfzvphj6vm0dqcr4i072zcx29kcgiyyni8zbgbwmwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elpy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elpy";
           sha256 = "051irp7k0cp1hqp3hzrmapllf2iim7cq0iz38489g4fkh2ybk709";
           name = "elpy";
         };
@@ -6452,7 +6768,7 @@
           yasnippet
         ];
         meta = {
-          homepage = "http://melpa.org/#/elpy";
+          homepage = "https://melpa.org/#/elpy";
           license = lib.licenses.free;
         };
       }) {};
@@ -6467,13 +6783,13 @@
           sha256 = "091dxsb73bhqmrddwnmvblmfpwa7v7fa0ha18daxc8j0lrhzdhlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elscreen-mew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elscreen-mew";
           sha256 = "06g4wcfjs036nn64ac0zsvr08cfmak2hyj83y7a0r35yxr1853w4";
           name = "elscreen-mew";
         };
         packageRequires = [ elscreen ];
         meta = {
-          homepage = "http://melpa.org/#/elscreen-mew";
+          homepage = "https://melpa.org/#/elscreen-mew";
           license = lib.licenses.free;
         };
       }) {};
@@ -6488,13 +6804,13 @@
           sha256 = "06g7fl2c7cvwsrgi462wf6j13ny56y6zvgkizz9f256xjjq77ymf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elscreen-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elscreen-persist";
           sha256 = "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k";
           name = "elscreen-persist";
         };
         packageRequires = [ elscreen revive ];
         meta = {
-          homepage = "http://melpa.org/#/elscreen-persist";
+          homepage = "https://melpa.org/#/elscreen-persist";
           license = lib.licenses.free;
         };
       }) {};
@@ -6509,34 +6825,34 @@
           sha256 = "1k7npf93xbmrsq607x8zlgrpzqvplgia3ixz5w1lr1jlv1m2m8x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elwm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elwm";
           sha256 = "0rf663ih3lfg4n4pj4dpp133967zha5m1wr46riaxpha7xr59al9";
           name = "elwm";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/elwm";
+          homepage = "https://melpa.org/#/elwm";
           license = lib.licenses.free;
         };
       }) {};
     elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elx";
-        version = "0.10.0";
+        version = "0.10.1";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "elx";
-          rev = "8f339d0c266713ca8398b01d51ccfdbe1dbb9aeb";
-          sha256 = "12svv24qclkcdb5sniq0xbbsj34hq835s2v636xkb07dpmy644lg";
+          rev = "24bb321b275d441ca532c4ca7417143a79a88dcf";
+          sha256 = "0n5y3xq5dmqpsd9hhg9ac1jkj5qi9y7lgvg5nir3ghd8ldmrg09s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/elx";
           sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x";
           name = "elx";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/elx";
+          homepage = "https://melpa.org/#/elx";
           license = lib.licenses.free;
         };
       }) {};
@@ -6551,13 +6867,13 @@
           sha256 = "0b9hr3xg53nap6sik9d2cwqi8vfwzv8yqjcin4hab6rg2fkr5mra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacs-eclim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emacs-eclim";
           sha256 = "1l55jhz5mb3bqw90cbf4jhcqgwj962br706qhm2wn5i2a1mg8xlv";
           name = "emacs-eclim";
         };
         packageRequires = [ dash json popup s ];
         meta = {
-          homepage = "http://melpa.org/#/emacs-eclim";
+          homepage = "https://melpa.org/#/emacs-eclim";
           license = lib.licenses.free;
         };
       }) {};
@@ -6572,13 +6888,13 @@
           sha256 = "15l3ab11vcmzqibkd6h5zqw5a83k8dmgcp4n26px29c0gv6bkpy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacs-setup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emacs-setup";
           sha256 = "1x4rh8vx6fsb2d6dz2g9j6jamin1vmpppwy3yzbl1dnf7w4hx4kh";
           name = "emacs-setup";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/emacs-setup";
+          homepage = "https://melpa.org/#/emacs-setup";
           license = lib.licenses.free;
         };
       }) {};
@@ -6593,13 +6909,13 @@
           sha256 = "0ciqxyahlzaxq854jm25zbrbmrhcaj5csdhxa0az9crwha8wkmw2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsagist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emacsagist";
           sha256 = "1cyz7nf0zxa21979jf5kdmkgwiyd17vsmpcmrw1af37ly27l8l64";
           name = "emacsagist";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/emacsagist";
+          homepage = "https://melpa.org/#/emacsagist";
           license = lib.licenses.free;
         };
       }) {};
@@ -6614,97 +6930,97 @@
           sha256 = "1r6cpb7fck5znb7q7zrxcsjn7d3xiqhq8dp1ar1rsd6k4h05by4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emacsc";
           sha256 = "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk";
           name = "emacsc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/emacsc";
+          homepage = "https://melpa.org/#/emacsc";
           license = lib.licenses.free;
         };
       }) {};
     emacsql = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }:
     melpaBuild {
         pname = "emacsql";
-        version = "2.0.0";
+        version = "2.0.1";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "03d478870834a683f433e7f0e288476748eec624";
-          sha256 = "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i";
+          rev = "176cf10063a158a114f2308f0ec0aea299ad5d24";
+          sha256 = "1wc5hkirza6b4c0v557ihzbffvxy97pfcn5samcggbmrir5kpshw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emacsql";
           sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax";
           name = "emacsql";
         };
         packageRequires = [ cl-lib emacs finalize ];
         meta = {
-          homepage = "http://melpa.org/#/emacsql";
+          homepage = "https://melpa.org/#/emacsql";
           license = lib.licenses.free;
         };
       }) {};
     emacsql-mysql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emacsql-mysql";
-        version = "2.0.0";
+        version = "2.0.1";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "03d478870834a683f433e7f0e288476748eec624";
-          sha256 = "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i";
+          rev = "176cf10063a158a114f2308f0ec0aea299ad5d24";
+          sha256 = "1wc5hkirza6b4c0v557ihzbffvxy97pfcn5samcggbmrir5kpshw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsql-mysql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emacsql-mysql";
           sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy";
           name = "emacsql-mysql";
         };
         packageRequires = [ cl-lib emacs emacsql ];
         meta = {
-          homepage = "http://melpa.org/#/emacsql-mysql";
+          homepage = "https://melpa.org/#/emacsql-mysql";
           license = lib.licenses.free;
         };
       }) {};
     emacsql-psql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }:
     melpaBuild {
         pname = "emacsql-psql";
-        version = "2.0.0";
+        version = "2.0.1";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "03d478870834a683f433e7f0e288476748eec624";
-          sha256 = "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i";
+          rev = "176cf10063a158a114f2308f0ec0aea299ad5d24";
+          sha256 = "1wc5hkirza6b4c0v557ihzbffvxy97pfcn5samcggbmrir5kpshw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsql-psql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emacsql-psql";
           sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3";
           name = "emacsql-psql";
         };
         packageRequires = [ cl-lib emacs emacsql pg ];
         meta = {
-          homepage = "http://melpa.org/#/emacsql-psql";
+          homepage = "https://melpa.org/#/emacsql-psql";
           license = lib.licenses.free;
         };
       }) {};
-    emacsql-sqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    emacsql-sqlite = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emacsql-sqlite";
-        version = "2.0.0";
+        version = "2.0.1";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "emacsql";
-          rev = "03d478870834a683f433e7f0e288476748eec624";
-          sha256 = "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i";
+          rev = "176cf10063a158a114f2308f0ec0aea299ad5d24";
+          sha256 = "1wc5hkirza6b4c0v557ihzbffvxy97pfcn5samcggbmrir5kpshw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsql-sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emacsql-sqlite";
           sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i";
           name = "emacsql-sqlite";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib emacs emacsql ];
         meta = {
-          homepage = "http://melpa.org/#/emacsql-sqlite";
+          homepage = "https://melpa.org/#/emacsql-sqlite";
           license = lib.licenses.free;
         };
       }) {};
@@ -6719,13 +7035,13 @@
           sha256 = "1a9925n0jcgxcgiz2kmh9zbb1rg9039rlrbr9fr80by9znfwmy67";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emamux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emamux";
           sha256 = "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz";
           name = "emamux";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/emamux";
+          homepage = "https://melpa.org/#/emamux";
           license = lib.licenses.free;
         };
       }) {};
@@ -6735,18 +7051,18 @@
         version = "1.0.8";
         src = fetchFromGitHub {
           owner = "smihica";
-          repo = "emmet";
+          repo = "emmet-mode";
           rev = "bf76d717c60f33d223cdac35513105e9f9244885";
           sha256 = "1dsa85bk33j90h1ypaz1ylqh9yp2xvlga237h3kwa5y3sb0d5ydi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emmet-mode";
-          sha256 = "0w5nnhha70mndpk2a58raaxqanv868z05mfy1a8prgapm56mm819";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emmet-mode";
+          sha256 = "0wjv4hqddjvbdrmsxzav5rpwnm2n6lr86jzkrnav8f2kyzypdsnr";
           name = "emmet-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/emmet-mode";
+          homepage = "https://melpa.org/#/emmet-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -6761,34 +7077,34 @@
           sha256 = "0q80f0plch6k4lhs8c9qm3mfycfbp3kn5sjrk9zxgxwnn901y9mp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emms-mode-line-cycle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emms-mode-line-cycle";
           sha256 = "1jdmfh1i9v84iy7bj2dbc3s2wfzkrby3pabd99gnqzd9gn1cn8ca";
           name = "emms-mode-line-cycle";
         };
         packageRequires = [ emacs emms ];
         meta = {
-          homepage = "http://melpa.org/#/emms-mode-line-cycle";
+          homepage = "https://melpa.org/#/emms-mode-line-cycle";
           license = lib.licenses.free;
         };
       }) {};
     emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emms-player-mpv";
-        version = "0.0.7";
+        version = "0.0.8";
         src = fetchFromGitHub {
           owner = "dochang";
           repo = "emms-player-mpv";
-          rev = "a1be1d266530ede3780dd69a7243d898f1016127";
-          sha256 = "1yy4dmjp53l2df5qix31g4vizhv80wm88vjqq6qqa9p822732n0m";
+          rev = "69ebe6d9539769d4c4daa484693ec0d6f67a3cca";
+          sha256 = "104iw4bl6y33diqs5ayrvdljkhb6f9g2m5p5kh8klgy7z1yjhp4p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emms-player-mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emms-player-mpv";
           sha256 = "175rmqx3bgys4chw8ylyf9rk07sg0llwbs9ivrv2d3ayhcz1lg9y";
           name = "emms-player-mpv";
         };
         packageRequires = [ emms ];
         meta = {
-          homepage = "http://melpa.org/#/emms-player-mpv";
+          homepage = "https://melpa.org/#/emms-player-mpv";
           license = lib.licenses.free;
         };
       }) {};
@@ -6803,13 +7119,34 @@
           sha256 = "15bb8fp2lwr5brfrsjwa47yvja5g2wyaac5a4sh5rn734s64x2sq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emms-player-simple-mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emms-player-simple-mpv";
           sha256 = "15aljprjd74ha7wpzsmv3d873i6fy3x1jwhzm03hvw0sw18m25i1";
           name = "emms-player-simple-mpv";
         };
         packageRequires = [ cl-lib emacs emms ];
         meta = {
-          homepage = "http://melpa.org/#/emms-player-simple-mpv";
+          homepage = "https://melpa.org/#/emms-player-simple-mpv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emms-status = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emms-status";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "emms-status.el";
+          rev = "4ec65baf5786442246f0e47ab910c949a41c6495";
+          sha256 = "0dfgb0jdadz8vgiald67cy3p256mwa66z1cdv1i8lhli3710j74d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emms-status";
+          sha256 = "1nfyhp8l22ylh60hpk8fvr4hgmww8k2xi3q7dzpn5m2ph06fkdqa";
+          name = "emms-status";
+        };
+        packageRequires = [ emms ];
+        meta = {
+          homepage = "https://melpa.org/#/emms-status";
           license = lib.licenses.free;
         };
       }) {};
@@ -6824,13 +7161,13 @@
           sha256 = "1rk7am0xvpnv98yi7a62wlyh576md4n2ddj7nm201bjd4wdl2yxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emoji-cheat-sheet-plus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emoji-cheat-sheet-plus";
           sha256 = "1ciwlbw0ihm0p5gnnl3safcj7dxwiy53bkj8cmw3i334al0gjnnv";
           name = "emoji-cheat-sheet-plus";
         };
         packageRequires = [ emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/emoji-cheat-sheet-plus";
+          homepage = "https://melpa.org/#/emoji-cheat-sheet-plus";
           license = lib.licenses.free;
         };
       }) {};
@@ -6845,13 +7182,13 @@
           sha256 = "0qi7p1grann3mhaq8kc0yc27cp9fm983g2gaqddljchn7lmgagrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emoji-fontset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emoji-fontset";
           sha256 = "19affsvlm1rzrzdh1k6xsv79icdkzx4izxivrd2ia6y2wcg9wc5d";
           name = "emoji-fontset";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/emoji-fontset";
+          homepage = "https://melpa.org/#/emoji-fontset";
           license = lib.licenses.free;
         };
       }) {};
@@ -6866,13 +7203,13 @@
           sha256 = "0nrf6p4h66i17nz850kpdrnk5h5ra4l3icjjrq34sxvmsssp6zhp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emojify";
-          sha256 = "15v2h5jfksfc208qphiczplg56yka07qv4w4482c10yzwq76zp17";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emojify";
+          sha256 = "1sgd32qm43hwby75a9q2pz1yfzj988i35d8p9f18zvbxypy7b2yp";
           name = "emojify";
         };
         packageRequires = [ emacs ht seq ];
         meta = {
-          homepage = "http://melpa.org/#/emojify";
+          homepage = "https://melpa.org/#/emojify";
           license = lib.licenses.free;
         };
       }) {};
@@ -6887,7 +7224,7 @@
           sha256 = "0pl7i2a0mf2s33qpsc14dcvqbl6jm5xrvcnrhfr7visvnih29cy4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/emr";
           sha256 = "05vpfxg6lviclnms2zyrza8dc87m60mimlwd11ihvsbngi9gcw8x";
           name = "emr";
         };
@@ -6903,7 +7240,7 @@
           s
         ];
         meta = {
-          homepage = "http://melpa.org/#/emr";
+          homepage = "https://melpa.org/#/emr";
           license = lib.licenses.free;
         };
       }) {};
@@ -6918,13 +7255,13 @@
           sha256 = "1dsa3r39ip20ddbw0m9vq8z3r4ahrxvb37adyqi4mbdgyr6fq6sw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/engine-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/engine-mode";
           sha256 = "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c";
           name = "engine-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/engine-mode";
+          homepage = "https://melpa.org/#/engine-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -6939,13 +7276,13 @@
           sha256 = "08j6b79vy8ry4ad1abk3hvxjbb4ylrhkvrbrnq1gcikl4h1p2v63";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/enlive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/enlive";
           sha256 = "1dyayk37zik12qfh8zbjmhsch64yqsx3acrlm7hcnavx465hmhnz";
           name = "enlive";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/enlive";
+          homepage = "https://melpa.org/#/enlive";
           license = lib.licenses.free;
         };
       }) {};
@@ -6960,13 +7297,13 @@
           sha256 = "1in4wbwkxn8qfcsfjbczzk73z74w4ixlml61wk666dw0kpscgbs5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/enotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/enotify";
           sha256 = "0mii6m6zw9y8njgzi79rcf1n251iw7qz3yqjjij3c19rk3zpm5qi";
           name = "enotify";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/enotify";
+          homepage = "https://melpa.org/#/enotify";
           license = lib.licenses.free;
         };
       }) {};
@@ -6981,13 +7318,13 @@
           sha256 = "1yn9jn6jl6rmknj50g18z5yvpa1d8mzzx3j1pfdwfn36ak4nc9ba";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eopengrok";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eopengrok";
           sha256 = "0756x78113286hwk1i1m5s8xq04gh7zxb4fkmw58lg2ssff8q6av";
           name = "eopengrok";
         };
         packageRequires = [ cl-lib dash magit s ];
         meta = {
-          homepage = "http://melpa.org/#/eopengrok";
+          homepage = "https://melpa.org/#/eopengrok";
           license = lib.licenses.free;
         };
       }) {};
@@ -7002,13 +7339,34 @@
           sha256 = "05r2m7zghbdrgscg0x78jnhk1g6fq8iylar4cx699zm6pzvlq98z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/epc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/epc";
           sha256 = "1l9rcx07pa4b9z5654gyw6b64c95lcigzg15amphwr56v2g3rbzx";
           name = "epc";
         };
         packageRequires = [ concurrent ctable ];
         meta = {
-          homepage = "http://melpa.org/#/epc";
+          homepage = "https://melpa.org/#/epc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    epkg = callPackage ({ closql, dash, emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "epkg";
+        version = "1.0.0";
+        src = fetchFromGitLab {
+          owner = "tarsius";
+          repo = "epkg";
+          rev = "99df36a50fb39976c6b6086db2f5f640f5d917b7";
+          sha256 = "0z60g9ln651cjfrjhwdm28x53kcpmap8zw26v0vjng288hlj8f9c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/epkg";
+          sha256 = "0vc1g29rfmgd2ks4lbz4599rbgcax7rgdva53ahhvp6say8fy22q";
+          name = "epkg";
+        };
+        packageRequires = [ closql dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/epkg";
           license = lib.licenses.free;
         };
       }) {};
@@ -7023,13 +7381,13 @@
           sha256 = "0sjxd5y5hxhrbgfkpwx6m724r3841b53hgc61a0g5zwispw5pmrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/epl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/epl";
           sha256 = "0zr3r2hn9jaxscrl83hyixznb8l5dzfr6fsac76aa8x12xgsc5hn";
           name = "epl";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/epl";
+          homepage = "https://melpa.org/#/epl";
           license = lib.licenses.free;
         };
       }) {};
@@ -7044,13 +7402,13 @@
           sha256 = "1xw56sir6gkr0p9g4s6p4qc0rajnl6ifbzrky07j28y9vsa59nsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-crypt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/erc-crypt";
           sha256 = "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3";
           name = "erc-crypt";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/erc-crypt";
+          homepage = "https://melpa.org/#/erc-crypt";
           license = lib.licenses.free;
         };
       }) {};
@@ -7064,13 +7422,13 @@
           sha256 = "0bk4vr26abhbiwkmpns4hdlg23pxa25lca78fhz1900jkv4imk0f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-hipchatify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/erc-hipchatify";
           sha256 = "1a4gl05i757vvap0rzrfwms7mhw80sa84gvbwafrvj3x11rja24x";
           name = "erc-hipchatify";
         };
         packageRequires = [ alert emacs request s ];
         meta = {
-          homepage = "http://melpa.org/#/erc-hipchatify";
+          homepage = "https://melpa.org/#/erc-hipchatify";
           license = lib.licenses.free;
         };
       }) {};
@@ -7085,13 +7443,34 @@
           sha256 = "1k0g3bwp3w0dd6zwdv6k2wpqs2krjayilrzsr1hli649ljcx55d7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-hl-nicks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/erc-hl-nicks";
           sha256 = "1lhw77n2nrjnb5yhnpm6yhbcp022xxjcmdgqf21z9rd0igss9mja";
           name = "erc-hl-nicks";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/erc-hl-nicks";
+          homepage = "https://melpa.org/#/erc-hl-nicks";
+          license = lib.licenses.free;
+        };
+      }) {};
+    erc-twitch = callPackage ({ erc ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "erc-twitch";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "vibhavp";
+          repo = "erc-twitch";
+          rev = "6938191c787d66fef4c13674e0a98a9d64eff364";
+          sha256 = "1xsxykmhz34gmyj4jb26qfai7j95kzlc7vfydrajc6is7xlrwhfk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/erc-twitch";
+          sha256 = "08vlwcxrzc2ndm52112z1r0qnz6jlmjhiwq2j3j59fbw82ys61ia";
+          name = "erc-twitch";
+        };
+        packageRequires = [ erc json ];
+        meta = {
+          homepage = "https://melpa.org/#/erc-twitch";
           license = lib.licenses.free;
         };
       }) {};
@@ -7106,13 +7485,13 @@
           sha256 = "0p1j08rrdsqmkb8zz8h8ba24hr59nx3xh2m044ry468hfd2bp6vd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-youtube";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/erc-youtube";
           sha256 = "12ylxkskkgfv5x7vlkib963ichb3rlmdzkf4zh8a39cgl8wsmacx";
           name = "erc-youtube";
         };
         packageRequires = [ erc ];
         meta = {
-          homepage = "http://melpa.org/#/erc-youtube";
+          homepage = "https://melpa.org/#/erc-youtube";
           license = lib.licenses.free;
         };
       }) {};
@@ -7127,13 +7506,13 @@
           sha256 = "19jninbf0dhdw3kn4d38bxmklg0v7sh3m9dwj6z69w99r5pcw480";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ercn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ercn";
           sha256 = "0yvis02bypw6v1zv7i326y8s6j0id558n0bdri52hr5pw85imnlp";
           name = "ercn";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ercn";
+          homepage = "https://melpa.org/#/ercn";
           license = lib.licenses.free;
         };
       }) {};
@@ -7148,13 +7527,13 @@
           sha256 = "17i567nfm0rykimh6bpcc5f2l7wsf8zcdy2jzd7sgrl54dvb0g9i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erefactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/erefactor";
           sha256 = "0ma9sbrq4n8y5w7vvbhhgmw25aiykbq5yhxzm0knj32bgpviprw7";
           name = "erefactor";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/erefactor";
+          homepage = "https://melpa.org/#/erefactor";
           license = lib.licenses.free;
         };
       }) {};
@@ -7169,34 +7548,34 @@
           sha256 = "19m6chwc2awbsk5z03q1yhq84m481pff2609a8bxymcvm6yaamvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ergoemacs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ergoemacs-mode";
           sha256 = "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62";
           name = "ergoemacs-mode";
         };
         packageRequires = [ emacs undo-tree ];
         meta = {
-          homepage = "http://melpa.org/#/ergoemacs-mode";
+          homepage = "https://melpa.org/#/ergoemacs-mode";
           license = lib.licenses.free;
         };
       }) {};
     erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "18.2.3";
+        version = "18.3.1";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "d96471b3f404f7341279d8598dd74d92fb1a923c";
-          sha256 = "1g7grv3zs5lydkxhwzdc3caqym11m20mx43m3hd5jgc96smg0433";
+          rev = "afe72bfc1448ff426c38eceb7412f69e973aef62";
+          sha256 = "0p16jjrqkacjwi3ih4hamp1rcak7mmj76m2kzswm3x54fmicw1kx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erlang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/erlang";
           sha256 = "1gmrdkfanivb9l5lmkl0853snlhl62w34537r82w11z2fbk9lxhc";
           name = "erlang";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/erlang";
+          homepage = "https://melpa.org/#/erlang";
           license = lib.licenses.free;
         };
       }) {};
@@ -7211,13 +7590,13 @@
           sha256 = "0hn9i405nfhjd1h9vnwj43nxbbz00khrwkjq0acfyxjaz1shfac9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ert-async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ert-async";
           sha256 = "004798ckri5j72j0xvzkyciss1iz4lw9gya2749hkjxlamg14cn5";
           name = "ert-async";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ert-async";
+          homepage = "https://melpa.org/#/ert-async";
           license = lib.licenses.free;
         };
       }) {};
@@ -7228,16 +7607,16 @@
         src = fetchgit {
           url = "https://bitbucket.org/olanilsson/ert-junit";
           rev = "341c755e7b60f8d2081303951377968b1d1a6c23";
-          sha256 = "63a8fb532260f56569ce20f911788054624a7a29f149ed6036d9f997ae0457c3";
+          sha256 = "1hsp0jp9gyfr6rhfsjgi55x4lqjlh1w13y90rrlnbxb0499zpa33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ert-junit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ert-junit";
           sha256 = "0bv22mhh1ahbjwi6s1csxkh11dmy0srabkddjd33l4havykxlg6g";
           name = "ert-junit";
         };
         packageRequires = [ ert ];
         meta = {
-          homepage = "http://melpa.org/#/ert-junit";
+          homepage = "https://melpa.org/#/ert-junit";
           license = lib.licenses.free;
         };
       }) {};
@@ -7252,13 +7631,13 @@
           sha256 = "0rdgdslspzb4s0n4a68hnwfm8vm8baasa8nzrdinf0nryn7rrhbf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ert-runner";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ert-runner";
           sha256 = "0fnb8rmjr5lvc3dq0fnyxhws8ync1lj5xp8ycs63z4ax6gmdqr48";
           name = "ert-runner";
         };
         packageRequires = [ ansi commander dash f s shut-up ];
         meta = {
-          homepage = "http://melpa.org/#/ert-runner";
+          homepage = "https://melpa.org/#/ert-runner";
           license = lib.licenses.free;
         };
       }) {};
@@ -7273,13 +7652,13 @@
           sha256 = "0jq4yp80wiphlpsc0429rg8n50g8l4lf78q0l3nywz2p93smjy9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/es-lib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/es-lib";
           sha256 = "0mwvgf5385qsp91zsdw75ipif1h90xy277xdmrpwixsxd7abbn0n";
           name = "es-lib";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/es-lib";
+          homepage = "https://melpa.org/#/es-lib";
           license = lib.licenses.free;
         };
       }) {};
@@ -7294,13 +7673,13 @@
           sha256 = "0avvkfmqsa1ld5f6cx98sliidzi42iax1c78059r4k5z5kz24x37";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/es-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/es-mode";
           sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp";
           name = "es-mode";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
-          homepage = "http://melpa.org/#/es-mode";
+          homepage = "https://melpa.org/#/es-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -7315,13 +7694,34 @@
           sha256 = "0cjchwrhk7bw87bg10zgcwkga50rvs0jn5v2jf6bbsxbcqx2nfc9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/es-windows";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/es-windows";
           sha256 = "112ngkan0hv3y7m71479f46x5gwdmf0vhbqrzs5kcjwlacqlrahx";
           name = "es-windows";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/es-windows";
+          homepage = "https://melpa.org/#/es-windows";
+          license = lib.licenses.free;
+        };
+      }) {};
+    esa = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "esa";
+        version = "0.8.13";
+        src = fetchFromGitHub {
+          owner = "nabinno";
+          repo = "esa.el";
+          rev = "0f69f9f45ac15018c48853509ac38e68286f9c0e";
+          sha256 = "0cairmqsaghl2ddb2v8zhcwy5ik756m7gkair8xrbigz4jklpcv9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/esa";
+          sha256 = "1kbsv4xsp7p9v0g22had0dr7w5zsr24bgi2xzryy76699pxq4h6c";
+          name = "esa";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/esa";
           license = lib.licenses.free;
         };
       }) {};
@@ -7336,13 +7736,13 @@
           sha256 = "0nkmwwx224r50y2xnrz3v26l3ngqshvy5hs861gy4zagwllqfmvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eshell-autojump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eshell-autojump";
           sha256 = "09l2680hknmdbwr4cncv1v4b0adik0c3sm5i9m3qbwyyxm8m41i5";
           name = "eshell-autojump";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/eshell-autojump";
+          homepage = "https://melpa.org/#/eshell-autojump";
           license = lib.licenses.free;
         };
       }) {};
@@ -7357,13 +7757,13 @@
           sha256 = "179xqh0rs8w3d03gygg9sy4qp5xqgfgl4c0ycrknip9zrnbmph4i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eshell-z";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eshell-z";
           sha256 = "14ixazj0nscyqsdv7brqnfr0q8llir1pwb91yhl9jdqypmadpm6d";
           name = "eshell-z";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/eshell-z";
+          homepage = "https://melpa.org/#/eshell-z";
           license = lib.licenses.free;
         };
       }) {};
@@ -7378,13 +7778,13 @@
           sha256 = "16r4j27j9yfdiy841w9q5ykkc6n3wrm7hvfacagb32mydk821ijg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/espuds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/espuds";
           sha256 = "16yzw9l64ahf5v92jzb7vyb4zqxxplq6qh0y9rkfmvm59s4nhk6c";
           name = "espuds";
         };
         packageRequires = [ dash f s ];
         meta = {
-          homepage = "http://melpa.org/#/espuds";
+          homepage = "https://melpa.org/#/espuds";
           license = lib.licenses.free;
         };
       }) {};
@@ -7399,13 +7799,13 @@
           sha256 = "0lvr14xlxsdad4ihywkpbwwj9lyal0w4p616ska5rk7gg5i8v74p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ess";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ess";
           sha256 = "02kz4fjxr0vrj5mg13cq758nzykizq4dmsijraxv46snvh337v5i";
           name = "ess";
         };
         packageRequires = [ julia-mode ];
         meta = {
-          homepage = "http://melpa.org/#/ess";
+          homepage = "https://melpa.org/#/ess";
           license = lib.licenses.free;
         };
       }) {};
@@ -7420,13 +7820,13 @@
           sha256 = "1ya2ay52gkrd31pmw45ban8kkxgnzhhwkzkypwdhjfccq3ys835x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ess-R-data-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ess-R-data-view";
           sha256 = "0r2fzwayf3yb7fqk6f31x4xfqiiczwik8qw4rrvkqx2h3s1kz7i0";
           name = "ess-R-data-view";
         };
         packageRequires = [ ctable ess popup ];
         meta = {
-          homepage = "http://melpa.org/#/ess-R-data-view";
+          homepage = "https://melpa.org/#/ess-R-data-view";
           license = lib.licenses.free;
         };
       }) {};
@@ -7441,13 +7841,13 @@
           sha256 = "0q8pbaa6wahli6fh0kng5zmnypsxi1fr2bzs2mfk3h8vf4nikpv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ess-R-object-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ess-R-object-popup";
           sha256 = "1dxwgahfki6d6ywh85ifk3kq6f2a1114kkd8xcv4lcpzqykp93zj";
           name = "ess-R-object-popup";
         };
         packageRequires = [ ess popup ];
         meta = {
-          homepage = "http://melpa.org/#/ess-R-object-popup";
+          homepage = "https://melpa.org/#/ess-R-object-popup";
           license = lib.licenses.free;
         };
       }) {};
@@ -7462,13 +7862,13 @@
           sha256 = "1avb6dng4xgw3bp7bw0j60wl6s4y26alfys9vwwj29rlzvjrlh74";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ess-smart-underscore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ess-smart-underscore";
           sha256 = "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2";
           name = "ess-smart-underscore";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ess-smart-underscore";
+          homepage = "https://melpa.org/#/ess-smart-underscore";
           license = lib.licenses.free;
         };
       }) {};
@@ -7483,13 +7883,13 @@
           sha256 = "1pzbd2ka6h5ipiivfwfgq1hq80ww59xvyldmx406mdd5vn7yqk5z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/esup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/esup";
           sha256 = "0cv3zc2zzm38ki3kxq58g9sp4gsk3dffa398wky6z83a3zc02zs0";
           name = "esup";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/esup";
+          homepage = "https://melpa.org/#/esup";
           license = lib.licenses.free;
         };
       }) {};
@@ -7504,34 +7904,34 @@
           sha256 = "0k4vqlbk3h2snfiriraxhnjpdxgs49vcaazl191p9s2f799msd8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/esxml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/esxml";
           sha256 = "0nn074abkxz7p4w59l1za586p5ya392xhl3sx92yys8a3194n6hz";
           name = "esxml";
         };
         packageRequires = [ kv ];
         meta = {
-          homepage = "http://melpa.org/#/esxml";
+          homepage = "https://melpa.org/#/esxml";
           license = lib.licenses.free;
         };
       }) {};
     eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
     melpaBuild {
         pname = "eval-in-repl";
-        version = "0.9.0";
+        version = "0.9.2";
         src = fetchFromGitHub {
           owner = "kaz-yos";
           repo = "eval-in-repl";
-          rev = "ce5c304993d316750a4ff998ed199121d55dca8b";
-          sha256 = "1a33yy455yx2188vxnhylgzg4zc0hhrw52dmpc4svxs7h1229pwg";
+          rev = "2b5d1bee767de4f21b14cefd7ce310f862226bd7";
+          sha256 = "077rj7yj6laxyhcsmrmlpg438962jv0fm2yiqx6i365fbgyx0hck";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eval-in-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eval-in-repl";
           sha256 = "10h5vy9wdiqf9dgk1d1bsvp93y8sfcxghzg8zbhhn7m5cqg2wh63";
           name = "eval-in-repl";
         };
         packageRequires = [ ace-window dash paredit ];
         meta = {
-          homepage = "http://melpa.org/#/eval-in-repl";
+          homepage = "https://melpa.org/#/eval-in-repl";
           license = lib.licenses.free;
         };
       }) {};
@@ -7546,13 +7946,13 @@
           sha256 = "0lwpl9akdxml9f51pgsv0g7k7mr8dvqm94l01i7vq8jl6vd6v6i5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eval-sexp-fu";
           sha256 = "17cazf81z4cszflnfp66zyq2cclw5sp9539pxskdf267cf7r0ycs";
           name = "eval-sexp-fu";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/eval-sexp-fu";
+          homepage = "https://melpa.org/#/eval-sexp-fu";
           license = lib.licenses.free;
         };
       }) {};
@@ -7567,33 +7967,33 @@
           sha256 = "1a3y69s7lb24zdivxcpsjh9l6adxyjqxbpgradnj0q1n6kdyq679";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evalator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evalator";
           sha256 = "0k6alxwg89gc4v5m2bxmzmj7l6kywhbh4036xgz19q28xnlbr9xk";
           name = "evalator";
         };
         packageRequires = [ helm-core ];
         meta = {
-          homepage = "http://melpa.org/#/evalator";
+          homepage = "https://melpa.org/#/evalator";
           license = lib.licenses.free;
         };
       }) {};
     evil = callPackage ({ fetchhg, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "1.2.10";
+        version = "1.2.12";
         src = fetchhg {
           url = "https://bitbucket.com/lyro/evil";
-          rev = "70005dd4c11e";
-          sha256 = "0hdysszfc3796d19nyw1f4cqzisspih1if0hh9hp2xjgxh3vj0mw";
+          rev = "5bbbfd0c8832";
+          sha256 = "037d5skihr3z1v3pvd1qg10pgygb4adznf6z0bysdvisjny298nv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil";
           sha256 = "09qrhy7l229w0qk3ba1i2xg4vqz8525v8scrbm031lqp30jp54hc";
           name = "evil";
         };
         packageRequires = [ goto-chg undo-tree ];
         meta = {
-          homepage = "http://melpa.org/#/evil";
+          homepage = "https://melpa.org/#/evil";
           license = lib.licenses.free;
         };
       }) {};
@@ -7608,13 +8008,13 @@
           sha256 = "0lw7fg4gqwj30r0l6k2ni36sxqkf65zf0d0z3rxnpwbxlf8dlkrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-anzu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-anzu";
           sha256 = "19cmc61l370mm4h2m6jw5pdcsvj4wcv9zpa8z7k1fjg57mwmmn70";
           name = "evil-anzu";
         };
         packageRequires = [ anzu evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-anzu";
+          homepage = "https://melpa.org/#/evil-anzu";
           license = lib.licenses.free;
         };
       }) {};
@@ -7629,13 +8029,13 @@
           sha256 = "1nh7wa4ynr7ln42x32znzqsmh7ijzy5ymd7rszf49l8677alvazq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-args";
           sha256 = "1bwdvf1i3jc77bw2as1wr1djm8z3a7wms60694xkyqh0m909hs2w";
           name = "evil-args";
         };
         packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-args";
+          homepage = "https://melpa.org/#/evil-args";
           license = lib.licenses.free;
         };
       }) {};
@@ -7650,13 +8050,13 @@
           sha256 = "183fdg7rmnnbps0knnj2kmhf1hxk0q91wbqx1flhciq6wq4rilni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-commentary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-commentary";
           sha256 = "151iiimmkpn58pl9zn40qssfahbrqy83axyl9dcd6kx2ywv5gcxz";
           name = "evil-commentary";
         };
         packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-commentary";
+          homepage = "https://melpa.org/#/evil-commentary";
           license = lib.licenses.free;
         };
       }) {};
@@ -7671,55 +8071,34 @@
           sha256 = "0cj17gk7cxia2p9xzqnlnmqqbw2afd3x61gfw9fpf65j9wik5hbz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-escape";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-escape";
           sha256 = "0rlwnnshcvsb5kn7db5qy39s89qmqlllvg2z8cnxyri8bsssks4k";
           name = "evil-escape";
         };
         packageRequires = [ cl-lib emacs evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-escape";
+          homepage = "https://melpa.org/#/evil-escape";
           license = lib.licenses.free;
         };
       }) {};
     evil-iedit-state = callPackage ({ evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-iedit-state";
-        version = "1.0";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "syl20bnr";
           repo = "evil-iedit-state";
-          rev = "0bf8d5d1777f1e8a3c46b6a1c7dceb082fcc6779";
-          sha256 = "0r2367lbzcdhglvjjcamrzn5fmqy0jalcws8r0yc2al1vbsrn0fr";
+          rev = "eab7d5e3e7d25c4a852fedb6c0c7f50dd9e9bd7c";
+          sha256 = "0r9gif2sgf84z8qniz6chr32av9g2i38rlyms81m8ssghf0j86ss";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-iedit-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-iedit-state";
           sha256 = "1dihyh7vqcp7kvfic613k7v33czr93hz04d635awrsyzgy8savhl";
           name = "evil-iedit-state";
         };
         packageRequires = [ evil iedit ];
         meta = {
-          homepage = "http://melpa.org/#/evil-iedit-state";
-          license = lib.licenses.free;
-        };
-      }) {};
-    evil-jumper = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "evil-jumper";
-        version = "0.3.0";
-        src = fetchFromGitHub {
-          owner = "bling";
-          repo = "evil-jumper";
-          rev = "16ff9e7b90519a139acc88bb80d4629c6e3b592c";
-          sha256 = "1yrd9zvp23xwmxvw9hrhfwhwfczh4lxxk65mcvy69q6wwd03z5vn";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-jumper";
-          sha256 = "0zwsk7slzvcgvgh8fjrwangylishrwc1w0glxcr71sybxph2g46x";
-          name = "evil-jumper";
-        };
-        packageRequires = [ cl-lib evil ];
-        meta = {
-          homepage = "http://melpa.org/#/evil-jumper";
+          homepage = "https://melpa.org/#/evil-iedit-state";
           license = lib.licenses.free;
         };
       }) {};
@@ -7734,34 +8113,55 @@
           sha256 = "1k2zinchs0jjllp8zkpggckyy63dkyi5yig3p46vh4w45jdzysk5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-leader";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-leader";
           sha256 = "154s2nb170hzksmc87wnzlwg3ic3w3ravgsfvwkyfi2q285vmra6";
           name = "evil-leader";
         };
         packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-leader";
+          homepage = "https://melpa.org/#/evil-leader";
           license = lib.licenses.free;
         };
       }) {};
-    evil-lisp-state = callPackage ({ evil, evil-leader, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
+    evil-lisp-state = callPackage ({ bind-map, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
     melpaBuild {
         pname = "evil-lisp-state";
-        version = "7.1";
+        version = "8.2";
         src = fetchFromGitHub {
           owner = "syl20bnr";
           repo = "evil-lisp-state";
-          rev = "e5792ec68a5615bd07bf2c6e9eb3f49d1bc7810d";
-          sha256 = "12l3gnhirq8jz0dqyj9m02l1fg5rh78fdyskslprxp5vfa4ngzkh";
+          rev = "3c65fecd9917a41eaf6460f22187e2323821f3ce";
+          sha256 = "1n6r8xs670r5qp4b5f72nr9g8nlqcrx1v7yqqlbkgv8gns8n5xgh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-lisp-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-lisp-state";
           sha256 = "117irac05fs73n7sgja3zd7yh4nz9h0gw5b1b57lfkav6y3ndgcy";
           name = "evil-lisp-state";
         };
-        packageRequires = [ evil evil-leader smartparens ];
+        packageRequires = [ bind-map evil smartparens ];
         meta = {
-          homepage = "http://melpa.org/#/evil-lisp-state";
+          homepage = "https://melpa.org/#/evil-lisp-state";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "evil-magit";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "justbur";
+          repo = "evil-magit";
+          rev = "d01f776475480b712facd764eeb3d76a50a400f6";
+          sha256 = "040iam8ayb4q5f2w2cn40y9rgljv2gsa5yf0vky1ayjf1zl57g3n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-magit";
+          sha256 = "10mhq6mzpklk5sj28lvd478dv9k84s81ax5jkwwxj26mqdw1ybg6";
+          name = "evil-magit";
+        };
+        packageRequires = [ evil magit ];
+        meta = {
+          homepage = "https://melpa.org/#/evil-magit";
           license = lib.licenses.free;
         };
       }) {};
@@ -7776,34 +8176,55 @@
           sha256 = "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-mark-replace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-mark-replace";
           sha256 = "03cq43vlv1b53w4kw7mjvk026i8rzhhryfb27ddn6ipgc6xh68a0";
           name = "evil-mark-replace";
         };
         packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-mark-replace";
+          homepage = "https://melpa.org/#/evil-mark-replace";
           license = lib.licenses.free;
         };
       }) {};
     evil-matchit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-matchit";
-        version = "2.1.2";
+        version = "2.1.3";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-matchit";
-          rev = "8b80b3df9472217d55962981025539f2da603296";
-          sha256 = "0kf4m1ghpxfalqx2zwm1d8xav4d6l6bpk79g5cvssk5jz5913fbi";
+          rev = "6346825fd89ee115fab974746fdba338adee856c";
+          sha256 = "0x6rc98g7hvvmlgq31n7qanylrld6dzvg6n8qgzp4s544l0dwfw6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-matchit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-matchit";
           sha256 = "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq";
           name = "evil-matchit";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/evil-matchit";
+          homepage = "https://melpa.org/#/evil-matchit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-multiedit";
+        version = "1.2.4";
+        src = fetchFromGitHub {
+          owner = "hlissner";
+          repo = "evil-multiedit";
+          rev = "02c78e55d1ab8f4fb64590b975eaea559917f048";
+          sha256 = "0xizqg6azhd9iwkp91sgqkxgg1qhs05cafncbjxw7qvnv68y6qy6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-multiedit";
+          sha256 = "0p02q9skqw2zhx7sfadqgs7vn518s72856962dam0xw4sqasplfp";
+          name = "evil-multiedit";
+        };
+        packageRequires = [ cl-lib emacs evil iedit ];
+        meta = {
+          homepage = "https://melpa.org/#/evil-multiedit";
           license = lib.licenses.free;
         };
       }) {};
@@ -7818,13 +8239,13 @@
           sha256 = "16wn74690572n3xpxvnvka524fzswxxni3dy98bwpvsqj6yx2ds5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-nerd-commenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-nerd-commenter";
           sha256 = "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d";
           name = "evil-nerd-commenter";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/evil-nerd-commenter";
+          homepage = "https://melpa.org/#/evil-nerd-commenter";
           license = lib.licenses.free;
         };
       }) {};
@@ -7839,13 +8260,13 @@
           sha256 = "13jg2xbh4p02x1nj77b6csb93hh56c1nv8kslcq2hjj3caipk4m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-numbers";
           sha256 = "1lpmkklwjdf7ayhv99g9zh3l9hzrwm0hr0ijvbc7yz3n398zn1b2";
           name = "evil-numbers";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/evil-numbers";
+          homepage = "https://melpa.org/#/evil-numbers";
           license = lib.licenses.free;
         };
       }) {};
@@ -7860,13 +8281,13 @@
           sha256 = "09l0ph9rc941kr718zq0dw27fq6l7rb0h2003ihw7q0a5yr8fpk7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-org";
           sha256 = "18w07fbafry3wb87f55kd8y0yra3s18a52f3m5kkdlcz5zwagi1c";
           name = "evil-org";
         };
         packageRequires = [ evil org ];
         meta = {
-          homepage = "http://melpa.org/#/evil-org";
+          homepage = "https://melpa.org/#/evil-org";
           license = lib.licenses.free;
         };
       }) {};
@@ -7881,13 +8302,13 @@
           sha256 = "1ja9ggj70wf0nmma4xnc1zdzg2crq9h1cv3cj7cgwjmllflgkfq7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-quickscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-quickscope";
           sha256 = "0xym1mh4p68i00l1lshywf5fdg1vw3szxp3fk9fwfcg04z6vd489";
           name = "evil-quickscope";
         };
         packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-quickscope";
+          homepage = "https://melpa.org/#/evil-quickscope";
           license = lib.licenses.free;
         };
       }) {};
@@ -7902,13 +8323,13 @@
           sha256 = "1xz629qv1ss1fap397k48piawcwl8lrybraq5449bw1vvn1a4d9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-rsi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-rsi";
           sha256 = "0mc39n72420n36kwyf9zpw1pgyih0aigfnmkbywb0yxgj7myc345";
           name = "evil-rsi";
         };
         packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-rsi";
+          homepage = "https://melpa.org/#/evil-rsi";
           license = lib.licenses.free;
         };
       }) {};
@@ -7923,13 +8344,13 @@
           sha256 = "1jfi2k9dm0cc9bx8klppm965ydhdw17a2n664199vhxrap6g27yk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-search-highlight-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-search-highlight-persist";
           sha256 = "0iia136js364iygi1mydyzwvizhic6w5z9pbwmhva4654pq8dzqy";
           name = "evil-search-highlight-persist";
         };
         packageRequires = [ highlight ];
         meta = {
-          homepage = "http://melpa.org/#/evil-search-highlight-persist";
+          homepage = "https://melpa.org/#/evil-search-highlight-persist";
           license = lib.licenses.free;
         };
       }) {};
@@ -7944,34 +8365,34 @@
           sha256 = "0j2m3rsszivyjhv8bjid5fdqaf1vwp8rf55b27y4vc2489wrw415";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-smartparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-smartparens";
           sha256 = "1viwrd6gfqmwhlil80pk68dikn3cjf9ddsy0z781z3qfx0j35qza";
           name = "evil-smartparens";
         };
         packageRequires = [ cl-lib emacs evil smartparens ];
         meta = {
-          homepage = "http://melpa.org/#/evil-smartparens";
+          homepage = "https://melpa.org/#/evil-smartparens";
           license = lib.licenses.free;
         };
       }) {};
-    evil-snipe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    evil-snipe = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-snipe";
-        version = "1.0";
+        version = "2.0.1";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-snipe";
-          rev = "9df049eb83789ea5711632672e077cebf4c54e14";
-          sha256 = "143lgpvbjrddbgnyh9dfdhjj0gp69slv4fkiq53czz85ffwli5ig";
+          rev = "b51bdb7a8efbc5c8de5b23984d072271d71974c6";
+          sha256 = "1ip2ibgsir6rhj7ci2f128z18n1yrwd6pg0i42j1flc3m4shs6ap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-snipe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-snipe";
           sha256 = "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn";
           name = "evil-snipe";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-snipe";
+          homepage = "https://melpa.org/#/evil-snipe";
           license = lib.licenses.free;
         };
       }) {};
@@ -7986,13 +8407,13 @@
           sha256 = "1rchanv0vq9rx6x69608dlpdybvkn8a9ymx8wzm7gqpz9qh6xqrk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-space";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-space";
           sha256 = "1asvh873r1xgffvz3nr653yn8h5ifaphnafp6wf1b1mja6as7f23";
           name = "evil-space";
         };
         packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-space";
+          homepage = "https://melpa.org/#/evil-space";
           license = lib.licenses.free;
         };
       }) {};
@@ -8007,13 +8428,13 @@
           sha256 = "0vsf7yzlb2j7c5c7cnk81y1979psy6a9v7klg6c2j9lkcn3cqpvj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-textobj-anyblock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-textobj-anyblock";
           sha256 = "03vk30s2wkcszcjxmh5ww39rihnag9cp678wdzq4bnqy0c6rnjwa";
           name = "evil-textobj-anyblock";
         };
         packageRequires = [ cl-lib evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-textobj-anyblock";
+          homepage = "https://melpa.org/#/evil-textobj-anyblock";
           license = lib.licenses.free;
         };
       }) {};
@@ -8028,13 +8449,13 @@
           sha256 = "1rskvkmz30xyy8xfjf2i35f3dxh663gb3plfy3f0j6z17i086jl2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-tutor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-tutor";
           sha256 = "1hvc2w5ykrgh62n4sxqqqcdk5sd7nmh6xzv4mir5vf9y2dgqcvsn";
           name = "evil-tutor";
         };
         packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-tutor";
+          homepage = "https://melpa.org/#/evil-tutor";
           license = lib.licenses.free;
         };
       }) {};
@@ -8049,13 +8470,13 @@
           sha256 = "07cmql8zsqz1qchq2mp3qybbay499dk1yglisig6jfddcmrbbggz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-visual-mark-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-visual-mark-mode";
           sha256 = "1qgr2dfhfz6imnlznicl7lplajd1s8wny7mlxs1bkms3xjcjfi48";
           name = "evil-visual-mark-mode";
         };
         packageRequires = [ dash evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-visual-mark-mode";
+          homepage = "https://melpa.org/#/evil-visual-mark-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -8070,13 +8491,13 @@
           sha256 = "11y2jrwbsw4fcx77zkhj1cn2hl1zcdqy00bv3mpbcrs03jywssrk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-visualstar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evil-visualstar";
           sha256 = "135l9hjfbpn0a6p53picnpydi9qs5vrk2rfn64gxa5ag2apcyycy";
           name = "evil-visualstar";
         };
         packageRequires = [ evil ];
         meta = {
-          homepage = "http://melpa.org/#/evil-visualstar";
+          homepage = "https://melpa.org/#/evil-visualstar";
           license = lib.licenses.free;
         };
       }) {};
@@ -8091,13 +8512,13 @@
           sha256 = "0739v0m9vj70a55z0canslyqgafzys815i7a0r6bxj2f9iwq6rhb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/evm";
           sha256 = "19l6cs5schbnph0pwhhj66gkxsswd4bmjpy79l9kxzpjf107wc03";
           name = "evm";
         };
         packageRequires = [ dash f ];
         meta = {
-          homepage = "http://melpa.org/#/evm";
+          homepage = "https://melpa.org/#/evm";
           license = lib.licenses.free;
         };
       }) {};
@@ -8112,13 +8533,13 @@
           sha256 = "0gs6bi3s2sszc6v2b26929azmn5513kvyin99n4d0ark1jdbjmv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eww-lnum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eww-lnum";
           sha256 = "1y745z4wa90snizq2g0amdwwgjafd6hkrayn93ca50f1wghdbk79";
           name = "eww-lnum";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/eww-lnum";
+          homepage = "https://melpa.org/#/eww-lnum";
           license = lib.licenses.free;
         };
       }) {};
@@ -8133,13 +8554,13 @@
           sha256 = "0nhc3m88i6rl2y426ksmjbbaqwfrjnwbzqq1bvd6r0bkcwgfwfml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/exec-path-from-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/exec-path-from-shell";
           sha256 = "1j6f52qs1m43878ikl6nplgb72pdbxfznkfn66wyzcfiz2hrvvm9";
           name = "exec-path-from-shell";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/exec-path-from-shell";
+          homepage = "https://melpa.org/#/exec-path-from-shell";
           license = lib.licenses.free;
         };
       }) {};
@@ -8154,13 +8575,13 @@
           sha256 = "0rvkhjfkhamr3ys9iarblfwvwq7n4wishdjgnwj1lx7m80h1hzbg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/expand-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/expand-region";
           sha256 = "1c7f1nqsqdc75h22fxxnyg0m4yxj6l23sirk3c71fqj14paxqnwg";
           name = "expand-region";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/expand-region";
+          homepage = "https://melpa.org/#/expand-region";
           license = lib.licenses.free;
         };
       }) {};
@@ -8175,13 +8596,13 @@
           sha256 = "106yh793scbyharsk1dvrirkj3c6666w8jqilpkaz78vwyw3zs5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/express";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/express";
           sha256 = "0lhisy4ds96bwpc7k8w9ws1zi1qh0d36nhxsp36bqzfi09ig0nb9";
           name = "express";
         };
         packageRequires = [ string-utils ];
         meta = {
-          homepage = "http://melpa.org/#/express";
+          homepage = "https://melpa.org/#/express";
           license = lib.licenses.free;
         };
       }) {};
@@ -8196,13 +8617,13 @@
           sha256 = "1k2j8szavyq2wy5c0skvs03a88cr9njy7y63b7knh2m92nw4830d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/extend-dnd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/extend-dnd";
           sha256 = "0rknpvp8yw051pg3blvmjpp3c9a82jw7f10mq67ggbz98w227417";
           name = "extend-dnd";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/extend-dnd";
+          homepage = "https://melpa.org/#/extend-dnd";
           license = lib.licenses.free;
         };
       }) {};
@@ -8217,34 +8638,34 @@
           sha256 = "0jc5wv2hkc89yh5ypa324xlfqdna20msr63g30njxq4g2vd0iqa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eyebrowse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/eyebrowse";
           sha256 = "09fkzm8z8nkr4s9fbmfcjc80h50051f48v6n14l76xicglr5p861";
           name = "eyebrowse";
         };
         packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/eyebrowse";
+          homepage = "https://melpa.org/#/eyebrowse";
           license = lib.licenses.free;
         };
       }) {};
     f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "f";
-        version = "0.17.3";
+        version = "0.18.2";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "f.el";
-          rev = "e0259ee060ff9a3f12204adcc8630869080acd68";
-          sha256 = "0lzqfr5xgc3qvpbs6vf63yiw7pc2mybfvsrhczf9ghlmlawqa6k1";
+          rev = "6f80f25ef87fb9df58cbc86faa2a2f037dcc2e7e";
+          sha256 = "095ka87144jms5gi9spjcmkq346a56kzzy3in6naaha0djd4d607";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/f";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/f";
           sha256 = "0s7fqav0dc9g4y5kqjjyqjs90gi34cahaxyx2s0kf9fwcgn23ja2";
           name = "f";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/f";
+          homepage = "https://melpa.org/#/f";
           license = lib.licenses.free;
         };
       }) {};
@@ -8259,13 +8680,13 @@
           sha256 = "0crhkdbxz1ldbrvppi95g005ni5zg99z1271rkrnk5i6cvc4hlq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fabric";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fabric";
           sha256 = "1mkblsakdhvi10b67bv3j0jsf7hr8lf9sibmprvx8smqsih7l88m";
           name = "fabric";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fabric";
+          homepage = "https://melpa.org/#/fabric";
           license = lib.licenses.free;
         };
       }) {};
@@ -8280,13 +8701,13 @@
           sha256 = "01l8dlfpyy97b17djbza46rq11xlbkhd5kn2r26r2xac8klj4pka";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/factlog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/factlog";
           sha256 = "163482vfpa52b5ya5xps4qnclbaql1x0q54gqdwwmm04as8qbfz7";
           name = "factlog";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/factlog";
+          homepage = "https://melpa.org/#/factlog";
           license = lib.licenses.free;
         };
       }) {};
@@ -8301,13 +8722,13 @@
           sha256 = "05lwcwf412m717yhwpjrswqkm8c3i7391rmiwv2k8xc1vk6dpp4g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fancy-battery";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fancy-battery";
           sha256 = "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii";
           name = "fancy-battery";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/fancy-battery";
+          homepage = "https://melpa.org/#/fancy-battery";
           license = lib.licenses.free;
         };
       }) {};
@@ -8322,13 +8743,13 @@
           sha256 = "10ds6nlzm1s5xsp53a52qlzrnph7in6gib67qhgnwpj33wp8gs91";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fancy-narrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fancy-narrow";
           sha256 = "15i86jz6rdpva1az7gqp1wbm8kispcfc8h6v9fqsbag9sbzvgcyv";
           name = "fancy-narrow";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fancy-narrow";
+          homepage = "https://melpa.org/#/fancy-narrow";
           license = lib.licenses.free;
         };
       }) {};
@@ -8343,13 +8764,13 @@
           sha256 = "0h32w63vv451797zi6206j529fd4j8l3fp7rqip3s8xn8d4728x1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fastnav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fastnav";
           sha256 = "08hg256w8k9f5nzgpyl1jykbf28vmvv09kkhzs0s2zhwbl2158a5";
           name = "fastnav";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fastnav";
+          homepage = "https://melpa.org/#/fastnav";
           license = lib.licenses.free;
         };
       }) {};
@@ -8364,13 +8785,13 @@
           sha256 = "03w68zbgprly45i6ps7iviwvjf3acbc7f7acvjpzj2plf0g5i19z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fcitx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fcitx";
           sha256 = "0a8wd588c26p3czfp5hn2n46f2vwyg5v301sv0y07b55b1i3ynmx";
           name = "fcitx";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fcitx";
+          homepage = "https://melpa.org/#/fcitx";
           license = lib.licenses.free;
         };
       }) {};
@@ -8385,13 +8806,13 @@
           sha256 = "1cxjygg05v8s96c8z6plk3hl34jaiwg7s7dl7dsk20rj5f54kgw7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/feature-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/feature-mode";
           sha256 = "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg";
           name = "feature-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/feature-mode";
+          homepage = "https://melpa.org/#/feature-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -8406,13 +8827,13 @@
           sha256 = "0fghhy5xqsdwal4fwlr6hxr5kpnfw71q79mxpp9db59ldnj9f5y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fill-column-indicator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fill-column-indicator";
           sha256 = "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma";
           name = "fill-column-indicator";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fill-column-indicator";
+          homepage = "https://melpa.org/#/fill-column-indicator";
           license = lib.licenses.free;
         };
       }) {};
@@ -8427,13 +8848,13 @@
           sha256 = "1r9y9zschavi28c5ysrlh56vxszjfyhh5r36fhn74i0b5iiy15rx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/finalize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/finalize";
           sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq";
           name = "finalize";
         };
         packageRequires = [ cl-lib eieio emacs ];
         meta = {
-          homepage = "http://melpa.org/#/finalize";
+          homepage = "https://melpa.org/#/finalize";
           license = lib.licenses.free;
         };
       }) {};
@@ -8448,34 +8869,34 @@
           sha256 = "1xjb66pydm3yf0jxnm2mri98pxq3b26xvwjkaj1488qgj27i05jr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/find-by-pinyin-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/find-by-pinyin-dired";
           sha256 = "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq";
           name = "find-by-pinyin-dired";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/find-by-pinyin-dired";
+          homepage = "https://melpa.org/#/find-by-pinyin-dired";
           license = lib.licenses.free;
         };
       }) {};
     find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "find-file-in-project";
-        version = "4.5";
+        version = "4.8";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "908cc56c0fd715001da4d97b30cba5eb7af3a609";
-          sha256 = "0bf32nhpmjvvgnr6g9xqh8pqnhr3dl24y3g40lsv4pc8ffs70ydm";
+          rev = "78c4053db2e98a75b9fc76454038e29974a9d6b7";
+          sha256 = "1mi25nb3h6a7i2lg3dbqkqr8lhh8zsq1bibbib0mhfd0qs07ya5d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/find-file-in-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/find-file-in-project";
           sha256 = "0aznnv82xhnilc9j4cdmcgh6ksv7bhjjm3pa76hynnyrfn7kq7wy";
           name = "find-file-in-project";
         };
         packageRequires = [ emacs swiper ];
         meta = {
-          homepage = "http://melpa.org/#/find-file-in-project";
+          homepage = "https://melpa.org/#/find-file-in-project";
           license = lib.licenses.free;
         };
       }) {};
@@ -8490,13 +8911,13 @@
           sha256 = "0wbmmrd7brf4498pdyilz17rzv7221cj8sd4h11gac2r72f1q2md";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/find-file-in-repository";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/find-file-in-repository";
           sha256 = "0q1ym06w2yn3nzpj018dj6h68f7rmkxczyl061mirjp8z9c6a9q6";
           name = "find-file-in-repository";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/find-file-in-repository";
+          homepage = "https://melpa.org/#/find-file-in-repository";
           license = lib.licenses.free;
         };
       }) {};
@@ -8505,19 +8926,19 @@
         pname = "fiplr";
         version = "0.2.4";
         src = fetchFromGitHub {
-          owner = "d11wtq";
+          owner = "grizzl";
           repo = "fiplr";
           rev = "100dfc33f43da8c49e50e8a2222b9d95532f6e24";
           sha256 = "0lwgbd9zwdv7qs39c3fp4hrc17d9wrwwjgba7a14zwrhb27m7j07";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fiplr";
-          sha256 = "0l68rl5cy2maynny6iq6c4qr6c99y44i0i1z613k9rk08z7h0k5i";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fiplr";
+          sha256 = "1a4w0yqdkz477lfyin4lb9k9qkfpx4350kfxmrqx6dj3aadkikca";
           name = "fiplr";
         };
         packageRequires = [ grizzl ];
         meta = {
-          homepage = "http://melpa.org/#/fiplr";
+          homepage = "https://melpa.org/#/fiplr";
           license = lib.licenses.free;
         };
       }) {};
@@ -8532,13 +8953,13 @@
           sha256 = "1rz56n2gmw11w2yxlhn0i8xmig9m8lxihgaikg65xmy9nqa5j7bj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/firefox-controller";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/firefox-controller";
           sha256 = "03y96b3l75w9al8ylijnlb8pcfkwddyfnh8xwig1b6k08zxfgal6";
           name = "firefox-controller";
         };
         packageRequires = [ cl-lib moz popwin ];
         meta = {
-          homepage = "http://melpa.org/#/firefox-controller";
+          homepage = "https://melpa.org/#/firefox-controller";
           license = lib.licenses.free;
         };
       }) {};
@@ -8553,13 +8974,13 @@
           sha256 = "174x0qyrwswppc9p1q1nn4424r3zg7g49zk329k5aq18vyjz52d7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fireplace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fireplace";
           sha256 = "1apcypznq23fc7xgy4xy1c5hvfvjx1xhyq3aaq1lf59v99zchciw";
           name = "fireplace";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fireplace";
+          homepage = "https://melpa.org/#/fireplace";
           license = lib.licenses.free;
         };
       }) {};
@@ -8574,13 +8995,13 @@
           sha256 = "0s8rml5xbskvnjpi8qp7vqflxhh5yis6zr6ay2bxmd2chjlhli55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/firestarter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/firestarter";
           sha256 = "1cpx664hyrdnpb1jps1x6lm7idwlfjblkfygj48cjz9pzd6ld5mp";
           name = "firestarter";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/firestarter";
+          homepage = "https://melpa.org/#/firestarter";
           license = lib.licenses.free;
         };
       }) {};
@@ -8595,13 +9016,13 @@
           sha256 = "17djaz79spms9il71m4xdfjhm58dzswb6fpncngkgx8kxvcy9y24";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fish-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fish-mode";
           sha256 = "0l6k06bs0qdhj3h8vf5fv8c3rbhiqfwszrpb0v2cgnb6xhwzmq14";
           name = "fish-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/fish-mode";
+          homepage = "https://melpa.org/#/fish-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -8616,13 +9037,13 @@
           sha256 = "16rd23ygh76fs4i7rni94k8gwa9n360h40qmhm65snp31kqnpr1p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fix-input";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fix-input";
           sha256 = "03xpr7rlv0xq1d9126j1fk0c2j7ssf366n0yc8yzm9vq32n9pp4p";
           name = "fix-input";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/fix-input";
+          homepage = "https://melpa.org/#/fix-input";
           license = lib.licenses.free;
         };
       }) {};
@@ -8637,13 +9058,13 @@
           sha256 = "1hj5jp4vbkcmnc8l2hqsvjc76f7c9zcsq8znwcwv2nv9xj9hlbkr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fix-word";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fix-word";
           sha256 = "0a8w09cx8p5pkkd4533nd199axkhdhs2a7blp7syfn40bkscx6xc";
           name = "fix-word";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/fix-word";
+          homepage = "https://melpa.org/#/fix-word";
           license = lib.licenses.free;
         };
       }) {};
@@ -8658,7 +9079,7 @@
           sha256 = "1hnxdmzqmnp3dr7mpr58pjmigykb3cxwphxzia013kfi37ipf5a0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fixmee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fixmee";
           sha256 = "0wnp6h8f547fsi1lkk4ajny7g21dnr76qfhxl82n0l5h1ps4w8mp";
           name = "fixmee";
         };
@@ -8671,28 +9092,28 @@
           tabulated-list
         ];
         meta = {
-          homepage = "http://melpa.org/#/fixmee";
+          homepage = "https://melpa.org/#/fixmee";
           license = lib.licenses.free;
         };
       }) {};
     floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "floobits";
-        version = "1.6.3";
+        version = "1.7.0";
         src = fetchFromGitHub {
           owner = "Floobits";
           repo = "floobits-emacs";
-          rev = "9c052942524169c1ba98e644ccbeaea583275530";
-          sha256 = "12b1b7avjdbfm184mcg3bh3s6k0ygfz1sraz8q7qnrsyw4170893";
+          rev = "87ae6b1257f7c2ae91b100920b03363dd26d7dd9";
+          sha256 = "10irvd9bi25fbx66dlc3v6zcqznng0aqcdb8656cz0qx7hrz56pw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/floobits";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/floobits";
           sha256 = "1jpk0q4mkf9ag1rqyai993nz5ngzfvxq9n9avmaaq59gkk9cjraf";
           name = "floobits";
         };
         packageRequires = [ highlight json ];
         meta = {
-          homepage = "http://melpa.org/#/floobits";
+          homepage = "https://melpa.org/#/floobits";
           license = lib.licenses.free;
         };
       }) {};
@@ -8707,13 +9128,13 @@
           sha256 = "0sjybrcnb2sl33swy3q664vqrparajcl0m455gciiih2j87hwadc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flx";
           sha256 = "04plfhrnw7jx2jaxhbhw4ypydfcb8v0x2m5hyacvrli1mca2iyf9";
           name = "flx";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/flx";
+          homepage = "https://melpa.org/#/flx";
           license = lib.licenses.free;
         };
       }) {};
@@ -8728,13 +9149,13 @@
           sha256 = "0sjybrcnb2sl33swy3q664vqrparajcl0m455gciiih2j87hwadc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flx-ido";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flx-ido";
           sha256 = "00wcwbvfjbcx8kyap7rl1b6nsgqdwjzlpv6al2cdpdd19rm1vgdc";
           name = "flx-ido";
         };
         packageRequires = [ cl-lib flx ];
         meta = {
-          homepage = "http://melpa.org/#/flx-ido";
+          homepage = "https://melpa.org/#/flx-ido";
           license = lib.licenses.free;
         };
       }) {};
@@ -8749,13 +9170,34 @@
           sha256 = "19mnx2zm71qrf7qf3mk5kriv5vgq0nl67lj029n63wqd8jcjb5fi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck";
           sha256 = "045k214dq8bmrai13da6gwdz97a2i998gggxqswqs4g52l1h6hvr";
           name = "flycheck";
         };
         packageRequires = [ cl-lib dash emacs let-alist pkg-info seq ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck";
+          homepage = "https://melpa.org/#/flycheck";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-apertium = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-apertium";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "unhammer";
+          repo = "flycheck-apertium";
+          rev = "71cf49d5aaee962b995583384bfa045a1d4c3db7";
+          sha256 = "14idjjz6fhmq806mmncmqnr9bvcjks6spin8z6jb0gqcg1dbhm06";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-apertium";
+          sha256 = "1cc15sljqs6gvb3wiw7n1wkd714qkvfpw6l1kg4lfx9r4jalcvw7";
+          name = "flycheck-apertium";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-apertium";
           license = lib.licenses.free;
         };
       }) {};
@@ -8770,34 +9212,34 @@
           sha256 = "1c3igqfd42dm42kfjm2q2xgr673vws10n9jn2jjlsk4g33brc7h4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-cask";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-cask";
           sha256 = "1lq559nyhkpnagncj68h84i3cq85vhdikr534kj018n2zcilsyw7";
           name = "flycheck-cask";
         };
         packageRequires = [ dash emacs flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-cask";
+          homepage = "https://melpa.org/#/flycheck-cask";
           license = lib.licenses.free;
         };
       }) {};
     flycheck-checkbashisms = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-checkbashisms";
-        version = "1.4";
+        version = "1.5";
         src = fetchFromGitHub {
           owner = "Gnouc";
           repo = "flycheck-checkbashisms";
-          rev = "6acb957a33a21e61764792b80ba4e33e88f2271f";
-          sha256 = "18nhfj0vx8rg2236nb9475s27rhyb34m81i7l6zkhifqba6rb0bb";
+          rev = "39362240b8e38e6ddc1da2e2c2229e3fecdf6057";
+          sha256 = "1s2zq97d7ryif6rlbvriz36dh23wmwi67v4q6krl77dfzcs705b3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-checkbashisms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-checkbashisms";
           sha256 = "1rq0ymlr1dl39v0sfyjmdv4pq3q9116cz9wvgpvfgalq8759q5sz";
           name = "flycheck-checkbashisms";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-checkbashisms";
+          homepage = "https://melpa.org/#/flycheck-checkbashisms";
           license = lib.licenses.free;
         };
       }) {};
@@ -8812,13 +9254,13 @@
           sha256 = "1i824iyjsg4d786kx5chsb64wlqd8vn2vsrhq6rmdx2x3gzdfcsx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-clojure";
           sha256 = "1b20gcs6fvq9pm4nl2qwsf34sg6wxngdql921q2pyh5n1xsxhm28";
           name = "flycheck-clojure";
         };
         packageRequires = [ cider emacs flycheck let-alist ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-clojure";
+          homepage = "https://melpa.org/#/flycheck-clojure";
           license = lib.licenses.free;
         };
       }) {};
@@ -8833,13 +9275,13 @@
           sha256 = "11xc08xld758xx9myqjsiqz8vk3gh4d9c4yswswvky6mrx34c0y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-color-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-color-mode-line";
           sha256 = "0hw19nsh5h2l8qbp7brqmml2fhs8a0x850vlvq3qfd7z248gvhrq";
           name = "flycheck-color-mode-line";
         };
         packageRequires = [ dash emacs flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-color-mode-line";
+          homepage = "https://melpa.org/#/flycheck-color-mode-line";
           license = lib.licenses.free;
         };
       }) {};
@@ -8854,34 +9296,34 @@
           sha256 = "1ap5hgvaccmf2xkfvyp7rqcfjwmiy6mhr6ccgahxm2z0vm51kpyh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-dmd-dub";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-dmd-dub";
           sha256 = "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm";
           name = "flycheck-dmd-dub";
         };
         packageRequires = [ flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-dmd-dub";
+          homepage = "https://melpa.org/#/flycheck-dmd-dub";
           license = lib.licenses.free;
         };
       }) {};
     flycheck-gometalinter = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-gometalinter";
-        version = "0.1.1";
+        version = "0.1.3";
         src = fetchFromGitHub {
           owner = "favadi";
           repo = "flycheck-gometalinter";
-          rev = "4b6f26aa5062f9d4164b24ce021bc18d00f9308e";
-          sha256 = "0j2mvf3zjznwkm8dykcgs1v5sz0i882mrivghxqr3h6n3ni4wag4";
+          rev = "6da19fbf8f750f56891c5b57bfb37997af09de77";
+          sha256 = "0frgyj57mrggq5ib6xi71696m97ch0bw6cc208d2qbnb55sf4fgb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-gometalinter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-gometalinter";
           sha256 = "1bnvj5kwgbh0dv989rsjcvmcij1ahwcz0vpr6a8f2p6wwvksw1h2";
           name = "flycheck-gometalinter";
         };
         packageRequires = [ emacs flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-gometalinter";
+          homepage = "https://melpa.org/#/flycheck-gometalinter";
           license = lib.licenses.free;
         };
       }) {};
@@ -8896,13 +9338,13 @@
           sha256 = "0143lcn6g46g7skm4r6lqq09s8mr3268rikbzlh65qg80rpg9frj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-haskell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-haskell";
           sha256 = "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7";
           name = "flycheck-haskell";
         };
         packageRequires = [ dash emacs flycheck haskell-mode let-alist ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-haskell";
+          homepage = "https://melpa.org/#/flycheck-haskell";
           license = lib.licenses.free;
         };
       }) {};
@@ -8917,13 +9359,34 @@
           sha256 = "136mdg21a8sqxhijsjsvpli7r7sb40nmf80p6gmgb1ghwmhlm8k3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-hdevtools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-hdevtools";
           sha256 = "0ahvai1q4x59ryiyccvqvjisgqbaiahx4gk8ssaxhblhj0sqga93";
           name = "flycheck-hdevtools";
         };
         packageRequires = [ flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-hdevtools";
+          homepage = "https://melpa.org/#/flycheck-hdevtools";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-irony = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, irony, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-irony";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "Sarcasm";
+          repo = "flycheck-irony";
+          rev = "34940ae5ab8f4c721d9c1118ebfc3496d7e67a84";
+          sha256 = "0qa5a8wzvzxwqql92ibc9s43k8sj3vwn7skz9hfr8av0skkhx996";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-irony";
+          sha256 = "0qk814m5s7mjba659llml0gy1g3045w8l1g73w2pnm1pbpqdfn3z";
+          name = "flycheck-irony";
+        };
+        packageRequires = [ emacs flycheck irony ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-irony";
           license = lib.licenses.free;
         };
       }) {};
@@ -8938,13 +9401,13 @@
           sha256 = "1pdssw5k88ym5fczllfjv26sp4brlyrywnlzq5baha5pq91h9cb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-ledger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-ledger";
           sha256 = "0807pd2km4r60wgd6jakscbx63ab22d9kvf1cml0ad8wynsap7jl";
           name = "flycheck-ledger";
         };
         packageRequires = [ flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-ledger";
+          homepage = "https://melpa.org/#/flycheck-ledger";
           license = lib.licenses.free;
         };
       }) {};
@@ -8959,13 +9422,13 @@
           sha256 = "1phfarws2aajkgcl96hqa4ydmb1yncg10q2ldzf8ff6yd6mvk51l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-ocaml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-ocaml";
           sha256 = "1cv2bb66aql2kj1y1gsl4xji8yrzrq6rd8hxxs5vpfsk47052lf7";
           name = "flycheck-ocaml";
         };
         packageRequires = [ emacs flycheck let-alist merlin ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-ocaml";
+          homepage = "https://melpa.org/#/flycheck-ocaml";
           license = lib.licenses.free;
         };
       }) {};
@@ -8980,13 +9443,13 @@
           sha256 = "0aa8cnh9f0f2zr2kkba2kf9djzjnsd51fzj8l578pbj016zdarwd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-package";
           sha256 = "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d";
           name = "flycheck-package";
         };
         packageRequires = [ cl-lib emacs flycheck ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-package";
+          homepage = "https://melpa.org/#/flycheck-package";
           license = lib.licenses.free;
         };
       }) {};
@@ -9001,13 +9464,13 @@
           sha256 = "0v23yc8znzjp44lrpfzqb4hc3psad14hsnvqcp8f1yyhgvdx35n8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-pos-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-pos-tip";
           sha256 = "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9";
           name = "flycheck-pos-tip";
         };
         packageRequires = [ dash flycheck pos-tip ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-pos-tip";
+          homepage = "https://melpa.org/#/flycheck-pos-tip";
           license = lib.licenses.free;
         };
       }) {};
@@ -9022,13 +9485,13 @@
           sha256 = "1xxvri9ax5cjrkxhjqhs7zqbch9cx8kvrn7sg611frl68qawkjsm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-status-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-status-emoji";
           sha256 = "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p";
           name = "flycheck-status-emoji";
         };
         packageRequires = [ emacs flycheck let-alist ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-status-emoji";
+          homepage = "https://melpa.org/#/flycheck-status-emoji";
           license = lib.licenses.free;
         };
       }) {};
@@ -9043,13 +9506,13 @@
           sha256 = "0azjr5mfb3hnb66m1b2319i035mn5i9qz24y7fj5crhnc9vp8w3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-tip";
           sha256 = "0zab1zknrnsw5xh5pwzzcpz7p40bbywkf9zx99sgsd6b5j1jz656";
           name = "flycheck-tip";
         };
         packageRequires = [ emacs flycheck popup ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-tip";
+          homepage = "https://melpa.org/#/flycheck-tip";
           license = lib.licenses.free;
         };
       }) {};
@@ -9064,13 +9527,13 @@
           sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flycheck-ycmd";
           sha256 = "0m99ssynrqxgzf32d35n17iqyh1lyc6948inxpnwgcb98rfamchv";
           name = "flycheck-ycmd";
         };
         packageRequires = [ dash emacs flycheck ycmd ];
         meta = {
-          homepage = "http://melpa.org/#/flycheck-ycmd";
+          homepage = "https://melpa.org/#/flycheck-ycmd";
           license = lib.licenses.free;
         };
       }) {};
@@ -9085,13 +9548,13 @@
           sha256 = "1svj5n7mmzhq03azlv4n33rz0nyqb00qr8ihdbc8hh2xnp63j5rc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-coffee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-coffee";
           sha256 = "1aig1d4fgjdg31vrg8k43z5hbqiydgfvxi45p1695s3kbdm8pr2d";
           name = "flymake-coffee";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-coffee";
+          homepage = "https://melpa.org/#/flymake-coffee";
           license = lib.licenses.free;
         };
       }) {};
@@ -9106,13 +9569,13 @@
           sha256 = "054ws88fcfz3hf3cha7dvndm52v5n4jc4vzif1lif44xq0iggwqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-css";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-css";
           sha256 = "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5";
           name = "flymake-css";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-css";
+          homepage = "https://melpa.org/#/flymake-css";
           license = lib.licenses.free;
         };
       }) {};
@@ -9127,13 +9590,13 @@
           sha256 = "1j35k52na02b59yglfb48w6m5qzydvzqfsylb8ax5ks0f287yf0c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-easy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-easy";
           sha256 = "19p6s9fllgvs35v167xf624k5dn16l9fnvaqcj9ks162gl9vymn7";
           name = "flymake-easy";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/flymake-easy";
+          homepage = "https://melpa.org/#/flymake-easy";
           license = lib.licenses.free;
         };
       }) {};
@@ -9148,13 +9611,13 @@
           sha256 = "002s01cymgx4z4l3j2pqirg7899pljdx2hmbz8k6cksdxlymzmkd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-gjshint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-gjshint";
           sha256 = "19jcd5z4883z3fzlrdn4fzmsvn16f4hfnhgw4vbs5b0ma6a8ka44";
           name = "flymake-gjshint";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/flymake-gjshint";
+          homepage = "https://melpa.org/#/flymake-gjshint";
           license = lib.licenses.free;
         };
       }) {};
@@ -9169,13 +9632,13 @@
           sha256 = "1b3lf5jwan03k7rb97g4bb982dacdwsfdddnwc0inx9gs3qq1zni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-haml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-haml";
           sha256 = "0dmdhh12h4xrx6mc0qrwavngk2sx0l4pfqkjjyavabsgcs9wlgp1";
           name = "flymake-haml";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-haml";
+          homepage = "https://melpa.org/#/flymake-haml";
           license = lib.licenses.free;
         };
       }) {};
@@ -9190,13 +9653,13 @@
           sha256 = "0k1qc0r0gr7f9l5if2a67cv4k73z5yxd6vxd6l1bqw500y0aajxz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-haskell-multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-haskell-multi";
           sha256 = "0cyzmmghwkkv6020s6n436lwymi6dr49i7gkci5n0hw5pdywcaij";
           name = "flymake-haskell-multi";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-haskell-multi";
+          homepage = "https://melpa.org/#/flymake-haskell-multi";
           license = lib.licenses.free;
         };
       }) {};
@@ -9211,13 +9674,13 @@
           sha256 = "1ygg51r4ym4x7h4svizwllsvr72x9np6jvjqpk8ayv3w2fpb9l31";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-hlint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-hlint";
           sha256 = "0wq1ijhn3ypy31yk8jywl5hnz0r0vlhcxjyznzccwqbdc5vf7b2x";
           name = "flymake-hlint";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-hlint";
+          homepage = "https://melpa.org/#/flymake-hlint";
           license = lib.licenses.free;
         };
       }) {};
@@ -9232,13 +9695,13 @@
           sha256 = "00zkm3wqlss386qd6jiq0siga7c48n5ykh0vf9q5v83rmpd79yri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-jslint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-jslint";
           sha256 = "1cq8fni4p0qhigx0qh34ypmcsbnilra1ixgnrn9mgg8x3cvcm4cm";
           name = "flymake-jslint";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/flymake-jslint";
+          homepage = "https://melpa.org/#/flymake-jslint";
           license = lib.licenses.free;
         };
       }) {};
@@ -9253,13 +9716,13 @@
           sha256 = "0rzlw80mi39147yqnpzcvw9wvr5svksd3kn6s3w8191f2kc6xzzv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-json";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-json";
           sha256 = "1p5kajiycpqy2id664bs0fb1mbf73a43qqfdi4c57n6j9x7fxp4d";
           name = "flymake-json";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-json";
+          homepage = "https://melpa.org/#/flymake-json";
           license = lib.licenses.free;
         };
       }) {};
@@ -9274,13 +9737,13 @@
           sha256 = "0ggvmsjj6p6a7cwr2bzhlcf8ab4v6a2bz5djsscd2ryy570p367z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-less";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-less";
           sha256 = "05k5daphxy94164c73ia7f4l1gv2cmlw8xzs8xnddg7ly22gjhi0";
           name = "flymake-less";
         };
         packageRequires = [ less-css-mode ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-less";
+          homepage = "https://melpa.org/#/flymake-less";
           license = lib.licenses.free;
         };
       }) {};
@@ -9295,13 +9758,13 @@
           sha256 = "11r982h5fhjkmm9ld8wfdip0ghinw523nm1w4fmy830g0bbkgkrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-perlcritic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-perlcritic";
           sha256 = "0hibnh463wzhvpix7gygpgs04gi6salwjrsjc6d43lxlsn3y1im8";
           name = "flymake-perlcritic";
         };
         packageRequires = [ flymake ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-perlcritic";
+          homepage = "https://melpa.org/#/flymake-perlcritic";
           license = lib.licenses.free;
         };
       }) {};
@@ -9316,13 +9779,13 @@
           sha256 = "0dzyid0av9icp77wv0zcsygpw46z24qibq1ra0iwnkzl3kqvkyzh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-php";
           sha256 = "12ds2l5kvs7fz38syp4amasbjkpqd36rlpajnb3xxll0hbk6vffk";
           name = "flymake-php";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-php";
+          homepage = "https://melpa.org/#/flymake-php";
           license = lib.licenses.free;
         };
       }) {};
@@ -9337,13 +9800,13 @@
           sha256 = "0l8qpcbzfi32h3vy7iwydx3hg2w60x9l3v3rabzjx412m5d00gsh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-python-pyflakes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-python-pyflakes";
           sha256 = "0asbjxv03zkbcjayanv13qzbv4z7b6fi0z1j6yv7fl6q9mgvm497";
           name = "flymake-python-pyflakes";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-python-pyflakes";
+          homepage = "https://melpa.org/#/flymake-python-pyflakes";
           license = lib.licenses.free;
         };
       }) {};
@@ -9358,13 +9821,13 @@
           sha256 = "0d2vmpgr5c2cbpxcqm5x1ckfysbpwcbaa9frcnp2yfp8scvkvqj0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-ruby";
           sha256 = "1shr6d03vx85nmyxnysglzlc1pz0zy3n28nrcmxqgdm02g197bzr";
           name = "flymake-ruby";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-ruby";
+          homepage = "https://melpa.org/#/flymake-ruby";
           license = lib.licenses.free;
         };
       }) {};
@@ -9379,13 +9842,13 @@
           sha256 = "0c74qdgy9c4hv3nyjnbqdzypbg9399vq3p5ngp5lasc7iz6vi0h8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-sass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-sass";
           sha256 = "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d";
           name = "flymake-sass";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-sass";
+          homepage = "https://melpa.org/#/flymake-sass";
           license = lib.licenses.free;
         };
       }) {};
@@ -9400,13 +9863,13 @@
           sha256 = "0c2lz1p91yhprmlbmp0756d96yiy0w92zf0c9vlp0i9abvd0cvkc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flymake-shell";
           sha256 = "13ff4r0k29yqgx8ybxz7hh50cjsadcjb7pd0075s9xcrzia5x63i";
           name = "flymake-shell";
         };
         packageRequires = [ flymake-easy ];
         meta = {
-          homepage = "http://melpa.org/#/flymake-shell";
+          homepage = "https://melpa.org/#/flymake-shell";
           license = lib.licenses.free;
         };
       }) {};
@@ -9421,13 +9884,13 @@
           sha256 = "1g09s57b773nm9xqslzbin5i2h18k55nx00s5nnkvx1qg0n0mzkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flyspell-lazy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flyspell-lazy";
           sha256 = "0lzazrhsfh5m7n57dzx0v46d5mg87wpwwkjzf5j9gpv1mc1xfg1y";
           name = "flyspell-lazy";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/flyspell-lazy";
+          homepage = "https://melpa.org/#/flyspell-lazy";
           license = lib.licenses.free;
         };
       }) {};
@@ -9442,13 +9905,13 @@
           sha256 = "1rk7fsill0salrhb4anbf698nd21nxj8pni35brbmv64nj9fhfic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flyspell-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/flyspell-popup";
           sha256 = "0wp15ra1ry6xpwal6mb53ixh3f0s4nps0rdyfli7hhaiwbr9bhql";
           name = "flyspell-popup";
         };
         packageRequires = [ popup ];
         meta = {
-          homepage = "http://melpa.org/#/flyspell-popup";
+          homepage = "https://melpa.org/#/flyspell-popup";
           license = lib.licenses.free;
         };
       }) {};
@@ -9463,13 +9926,13 @@
           sha256 = "0r2j238iyxnww60xpbxggjmz6y2waayw4m51f0l39hszbhags2cv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fm";
           sha256 = "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f";
           name = "fm";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fm";
+          homepage = "https://melpa.org/#/fm";
           license = lib.licenses.free;
         };
       }) {};
@@ -9484,13 +9947,13 @@
           sha256 = "0aj5qxzlfxxp7z27fiw9bvir5yi2zj0xzj5kbh17ix4wnhi03bhc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/focus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/focus";
           sha256 = "0jw26j8npyl3dgsrs7ap2djxmkafn2hl6gfqvi7v76bccs4jkyv8";
           name = "focus";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/focus";
+          homepage = "https://melpa.org/#/focus";
           license = lib.licenses.free;
         };
       }) {};
@@ -9505,13 +9968,13 @@
           sha256 = "1k8z30imlxvqm7lv12kgqdfgc5znxyvl9jxi8j2ymmwlgy11f726";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fold-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fold-dwim";
           sha256 = "0c9yxx45zlhb1h4ldgkjv7bndwlagpyingaaqn9dcsxidrvp3p5x";
           name = "fold-dwim";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fold-dwim";
+          homepage = "https://melpa.org/#/fold-dwim";
           license = lib.licenses.free;
         };
       }) {};
@@ -9526,13 +9989,13 @@
           sha256 = "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fold-dwim-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fold-dwim-org";
           sha256 = "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn";
           name = "fold-dwim-org";
         };
         packageRequires = [ fold-dwim ];
         meta = {
-          homepage = "http://melpa.org/#/fold-dwim-org";
+          homepage = "https://melpa.org/#/fold-dwim-org";
           license = lib.licenses.free;
         };
       }) {};
@@ -9547,13 +10010,13 @@
           sha256 = "1cbabpyp66nl5j8yhyj2jih4mhaljxvjh9ij05clai71z4598ahn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fold-this";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fold-this";
           sha256 = "1iri4a6ixw3q7qr803cj2ik7rvmww1b6ybj5q2pvkf1v25r8655d";
           name = "fold-this";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fold-this";
+          homepage = "https://melpa.org/#/fold-this";
           license = lib.licenses.free;
         };
       }) {};
@@ -9568,13 +10031,13 @@
           sha256 = "1k90w8v5rpswqb8fn1cc8sq5w12gf4sn6say5dhvqd63512b0055";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/font-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/font-utils";
           sha256 = "0k33jdchjkj7j211a23kfp5axg74cfsrrq4axsb1pfp124swh2n5";
           name = "font-utils";
         };
         packageRequires = [ pcache persistent-soft ];
         meta = {
-          homepage = "http://melpa.org/#/font-utils";
+          homepage = "https://melpa.org/#/font-utils";
           license = lib.licenses.free;
         };
       }) {};
@@ -9589,34 +10052,34 @@
           sha256 = "0qq13jhn9i2ls6n3fbay4i2r0hfs426pkmmif43b87gjxb510irc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fontawesome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fontawesome";
           sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3";
           name = "fontawesome";
         };
         packageRequires = [ cl-lib helm-core ];
         meta = {
-          homepage = "http://melpa.org/#/fontawesome";
+          homepage = "https://melpa.org/#/fontawesome";
           license = lib.licenses.free;
         };
       }) {};
     forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "forecast";
-        version = "0.2.0";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "cadadr";
           repo = "forecast.el";
-          rev = "e96252759d23fda2ffb254685309b0c5b8a17a95";
-          sha256 = "12135l9crjkans3w40by3qflj07awdqs5qm855jkngb3ri9xsfvv";
+          rev = "95bb9c92aad42ed0195fb93551b442a4fc45f452";
+          sha256 = "05m1ryn9fi4m49d7p68q25svrzfxpl1h9sisa8jlvbiapwmghvgj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/forecast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/forecast";
           sha256 = "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc";
           name = "forecast";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/forecast";
+          homepage = "https://melpa.org/#/forecast";
           license = lib.licenses.free;
         };
       }) {};
@@ -9631,13 +10094,13 @@
           sha256 = "199kybf2bvywqfnwr5w893km82829k1j7sp079y6s2601hq8ylw9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/foreman-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/foreman-mode";
           sha256 = "0p3kwbld05wf3dwcv0k6ynz727fiy0ik2srx4js9wvagy57x98kv";
           name = "foreman-mode";
         };
         packageRequires = [ dash dash-functional emacs f s ];
         meta = {
-          homepage = "http://melpa.org/#/foreman-mode";
+          homepage = "https://melpa.org/#/foreman-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -9652,13 +10115,13 @@
           sha256 = "171jna631b2iqcimfsik9c66gii8nc0zdb58m077w00rn7rcxbh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/form-feed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/form-feed";
           sha256 = "1abwjkzi3irw0jwpv3f584zc72my9n8iq8zp5s0354xk6iwrl1rh";
           name = "form-feed";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/form-feed";
+          homepage = "https://melpa.org/#/form-feed";
           license = lib.licenses.free;
         };
       }) {};
@@ -9673,13 +10136,13 @@
           sha256 = "0mikksamljps1czacgqavlnzzhgs8s3f8q4jza6v3csf8kgp5zd0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/format-sql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/format-sql";
           sha256 = "0684xqzs933vj9d3n3lv7afk4gii41kaqykbb05cribaswapsanj";
           name = "format-sql";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/format-sql";
+          homepage = "https://melpa.org/#/format-sql";
           license = lib.licenses.free;
         };
       }) {};
@@ -9694,13 +10157,13 @@
           sha256 = "1zy45s1m1injwr4d1qvpnvfvv4nkkv9mricshxjannsjfbz09ra7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fountain-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fountain-mode";
           sha256 = "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840";
           name = "fountain-mode";
         };
         packageRequires = [ emacs s ];
         meta = {
-          homepage = "http://melpa.org/#/fountain-mode";
+          homepage = "https://melpa.org/#/fountain-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -9715,13 +10178,13 @@
           sha256 = "1vznkbly0lyh5kri9lcgy309ws96q3d5m1lghck9l8ain8hphhqz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/frame-restore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/frame-restore";
           sha256 = "0b321iyf57nkrm6xv8d1aydivrdapdgng35zcnrg298ws2naysvm";
           name = "frame-restore";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/frame-restore";
+          homepage = "https://melpa.org/#/frame-restore";
           license = lib.licenses.free;
         };
       }) {};
@@ -9736,34 +10199,34 @@
           sha256 = "1c3yx9j3q8fkfiay4nzcabsq9i4ydqf6vxk8vv80h78gg9afrzrj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fringe-helper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fringe-helper";
           sha256 = "1vki5jd8jfrlrjcfd12gisgk12y20q3943i2qjgg4qvcj9k28cbv";
           name = "fringe-helper";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fringe-helper";
+          homepage = "https://melpa.org/#/fringe-helper";
           license = lib.licenses.free;
         };
       }) {};
-    fsharp-mode = callPackage ({ auto-complete, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, s }:
+    fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, s }:
     melpaBuild {
         pname = "fsharp-mode";
-        version = "1.7.3";
+        version = "1.8.1";
         src = fetchFromGitHub {
           owner = "rneatherway";
           repo = "emacs-fsharp-mode-bin";
-          rev = "b2a70da8ba3c573e02c6a9951ef5f0089cec6c78";
-          sha256 = "115xl18nsg2j9sbp3qqzrjfpnzczk1zmrwrfrpqjq3jmv21ilsv3";
+          rev = "51bad86059528f1ce87ef12e1657531aa11a386d";
+          sha256 = "00api7q86mrfv8z2g7skh34mhlkxwymf4gfpxa6zcvirhlpglyxr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fsharp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fsharp-mode";
           sha256 = "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z";
           name = "fsharp-mode";
         };
-        packageRequires = [ auto-complete dash popup pos-tip s ];
+        packageRequires = [ company company-quickhelp dash popup pos-tip s ];
         meta = {
-          homepage = "http://melpa.org/#/fsharp-mode";
+          homepage = "https://melpa.org/#/fsharp-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -9773,16 +10236,16 @@
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
           rev = "905ec06d864537fb6be9c46ad98f1b6d101dfbf0";
-          sha256 = "b348e285923e480fe696f888783c95becb392a6e05abc553d8be649987c7d190";
+          sha256 = "146iqy3rjr5yv19wbaq5dqm3kjxyjly7i27qjvk0yj1yja2y4j5k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fuel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fuel";
           sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
           name = "fuel";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fuel";
+          homepage = "https://melpa.org/#/fuel";
           license = lib.licenses.free;
         };
       }) {};
@@ -9797,13 +10260,13 @@
           sha256 = "0c3w3xs2jbdqgsqw0qmdbwii6p395qfznird4gg0hfr7lby2kmjq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/full-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/full-ack";
           sha256 = "09ikhyhpvkcl6yl6pa4abnw6i7yfsx5jkmzypib94w7khikvb309";
           name = "full-ack";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/full-ack";
+          homepage = "https://melpa.org/#/full-ack";
           license = lib.licenses.free;
         };
       }) {};
@@ -9818,13 +10281,13 @@
           sha256 = "1narmlcd8ycwkmsrgk64l7q0ljsbq2fsikl8hjbrsc20nma032m4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fullframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fullframe";
           sha256 = "08sh8lmb6g8asv28fcb36ilcn0ka4fc6ka0pnslid0h4c32fxp2a";
           name = "fullframe";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/fullframe";
+          homepage = "https://melpa.org/#/fullframe";
           license = lib.licenses.free;
         };
       }) {};
@@ -9839,13 +10302,13 @@
           sha256 = "0m7fcw0cswypiwi5abg6vhw7a3agx9vhp10flbbbji6lblb0fya8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/function-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/function-args";
           sha256 = "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak";
           name = "function-args";
         };
         packageRequires = [ swiper ];
         meta = {
-          homepage = "http://melpa.org/#/function-args";
+          homepage = "https://melpa.org/#/function-args";
           license = lib.licenses.free;
         };
       }) {};
@@ -9860,13 +10323,13 @@
           sha256 = "1g7my9ha5cnwg3pjwa86wncg5gphv18xpnpmj3xc3vg7z5m45rss";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fuzzy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fuzzy";
           sha256 = "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h";
           name = "fuzzy";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fuzzy";
+          homepage = "https://melpa.org/#/fuzzy";
           license = lib.licenses.free;
         };
       }) {};
@@ -9881,13 +10344,13 @@
           sha256 = "0c3g0yfclczdh6nxmg9lljjf288zibqy51bhh1b1cgdmxcbpg8bv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fvwm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fvwm-mode";
           sha256 = "07y32cnp4qfhncp7s24gmlxljdrj5miicinfaf4gc7hihb4bkrkb";
           name = "fvwm-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fvwm-mode";
+          homepage = "https://melpa.org/#/fvwm-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -9902,13 +10365,13 @@
           sha256 = "08qnyr945938hwjg1ypkf2x4mfxbh3bbf1xrgz1rk2ddrfv7hmkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fwb-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fwb-cmds";
           sha256 = "0wnjvi0v0l2h1mhwlsk2d8ggwh3nk7pks48l55gp18nmj00jxycx";
           name = "fwb-cmds";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/fwb-cmds";
+          homepage = "https://melpa.org/#/fwb-cmds";
           license = lib.licenses.free;
         };
       }) {};
@@ -9923,13 +10386,13 @@
           sha256 = "1sk2z71xfi4wqb7ap8jvad8cbzdbilwzqx9vy45zmgx1jh7g4ba9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fxrd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fxrd-mode";
           sha256 = "17zimg64lqc1yh9gnp5izshkvviz996aym7q6n9p61a4kqq37z4r";
           name = "fxrd-mode";
         };
         packageRequires = [ s ];
         meta = {
-          homepage = "http://melpa.org/#/fxrd-mode";
+          homepage = "https://melpa.org/#/fxrd-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -9944,13 +10407,34 @@
           sha256 = "0rjn4z7ssl1jy0brvsci44mhpig3zkdbcj8gcylzznhz0qfk1ljj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fzf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/fzf";
           sha256 = "0jjzm1gq85fx1gmj6nqaijnjws9bm8hmk40ws3x7fmsp41qq5py0";
           name = "fzf";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/fzf";
+          homepage = "https://melpa.org/#/fzf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gams-mode";
+        version = "6.1";
+        src = fetchFromGitHub {
+          owner = "ShiroTakeda";
+          repo = "gams-mode";
+          rev = "268ee8b4554446104d200de3ffbd2f067b20cb3f";
+          sha256 = "16x3fz2ljrmqhjy7w96fhp3j9ja2gib042c363yfrzwa7q5rxzd2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gams-mode";
+          sha256 = "0hx9mv4sqskz4nn7aks64hqd4vn3m7b34abzhy9bnmyw6d5zzfci";
+          name = "gams-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/gams-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -9965,13 +10449,13 @@
           sha256 = "1q9bz294bc6bplwfrfzsczh444v9152wv7zm2l1pcpwv8n8581p6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gather";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gather";
           sha256 = "1f0cqqp1a7w8g1pfvzxxb0hjrxq4m79a4n85dncqj2xhjxrkm0xk";
           name = "gather";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gather";
+          homepage = "https://melpa.org/#/gather";
           license = lib.licenses.free;
         };
       }) {};
@@ -9986,13 +10470,13 @@
           sha256 = "1667zln7bav0bdhrc4b5z36n8rn36xvwh4y9ffgns67zfgwi64kk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/geiser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/geiser";
           sha256 = "067rrjvyn5sz60w9h7qn542d9iycm2q4ryvx3n6xlard0dky5596";
           name = "geiser";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/geiser";
+          homepage = "https://melpa.org/#/geiser";
           license = lib.licenses.free;
         };
       }) {};
@@ -10007,13 +10491,13 @@
           sha256 = "08cw1fa25kbhbq2sp1cpn90bz38i9hjfdj93xf6wvki55b52s0nn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/genrnc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/genrnc";
           sha256 = "1nwbdscl0yh9j1n421can93m6s8j9dkyb3xmpampr6x528g6z0lm";
           name = "genrnc";
         };
         packageRequires = [ concurrent deferred log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/genrnc";
+          homepage = "https://melpa.org/#/genrnc";
           license = lib.licenses.free;
         };
       }) {};
@@ -10028,13 +10512,13 @@
           sha256 = "0344w4sbd6wlgl13j163v0hzjw9nwhvpr5s7658xsdd90wp4i701";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/german-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/german-holidays";
           sha256 = "0fgrxdgyl6va6axjc5l4sp90pyqaz5zha1g73xyhbxblshm5dwxn";
           name = "german-holidays";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/german-holidays";
+          homepage = "https://melpa.org/#/german-holidays";
           license = lib.licenses.free;
         };
       }) {};
@@ -10049,13 +10533,13 @@
           sha256 = "1m9ra9qp7bgf6anfqyn56n3xa9a25ran10k9wd355qknd5skq1zz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ggo-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ggo-mode";
           sha256 = "1403x530n90jlfz3lq2vfiqx84cxsrhgs6hhmniq960cjj31q35p";
           name = "ggo-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ggo-mode";
+          homepage = "https://melpa.org/#/ggo-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -10070,13 +10554,13 @@
           sha256 = "1qjh7av046ax4240iw40hv5fc0k23c36my9hili7fp4y2ak99l8n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ggtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ggtags";
           sha256 = "1cmry4knxbx9257ivhfxsd09z07z3g3wjihi99nrwmhb9h4mpqyw";
           name = "ggtags";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ggtags";
+          homepage = "https://melpa.org/#/ggtags";
           license = lib.licenses.free;
         };
       }) {};
@@ -10091,13 +10575,13 @@
           sha256 = "0a5v91k9gm9vv15d3m8czicv8n39f0hvqhcr6lfw0w82n26xwsms";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gh";
           sha256 = "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0";
           name = "gh";
         };
         packageRequires = [ eieio logito pcache ];
         meta = {
-          homepage = "http://melpa.org/#/gh";
+          homepage = "https://melpa.org/#/gh";
           license = lib.licenses.free;
         };
       }) {};
@@ -10106,19 +10590,19 @@
         pname = "ghc";
         version = "5.5.0.0";
         src = fetchFromGitHub {
-          owner = "kazu-yamamoto";
+          owner = "DanielG";
           repo = "ghc-mod";
           rev = "bd021e42b36e6cf3bc2ca3ef908299ba97ceeee5";
           sha256 = "1m5q2s9nxm0m18njaxzryjly8rl3m598r94nn53xpazd4i5ln8cg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ghc";
-          sha256 = "0xqriwggd1ahla5aff7k0j4admx6q18rmqsx3ipn4nfk86wrhb8g";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ghc";
+          sha256 = "02nc7a9khqpd4ca2snam8dq72m53q8x7v5awx56bjq31z6vcmav5";
           name = "ghc";
         };
         packageRequires = [ haskell-mode ];
         meta = {
-          homepage = "http://melpa.org/#/ghc";
+          homepage = "https://melpa.org/#/ghc";
           license = lib.licenses.free;
         };
       }) {};
@@ -10133,13 +10617,13 @@
           sha256 = "1ywwyc2kz1c1s26c412nmzh55cinh84cfiazyyi3jsy5zzwhrbhi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ghc-imported-from";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ghc-imported-from";
           sha256 = "10cxz4c341lknyz4ns63bri00mya39278xav12c73if03llsyzy5";
           name = "ghc-imported-from";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ghc-imported-from";
+          homepage = "https://melpa.org/#/ghc-imported-from";
           license = lib.licenses.free;
         };
       }) {};
@@ -10154,13 +10638,13 @@
           sha256 = "0q3ps5f6mr9hyf6nq1wshcm1z6a5yhskqd7dbbwq5dm78552z6z8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gist";
           sha256 = "053fl8aw0ram9wsabzvmlm5w2klwd2pgcn2w9r1yqfs4xqja5sd3";
           name = "gist";
         };
         packageRequires = [ emacs gh ];
         meta = {
-          homepage = "http://melpa.org/#/gist";
+          homepage = "https://melpa.org/#/gist";
           license = lib.licenses.free;
         };
       }) {};
@@ -10175,13 +10659,13 @@
           sha256 = "06ws3x5qa92drmn6rcp502jk2yil6q9gkzdmb2gww9gb2g695wl5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git";
           sha256 = "1nd2yvfgin13m368gjn7xah99glspnam4g4fh348x4makxcaw8w5";
           name = "git";
         };
         packageRequires = [ dash f s ];
         meta = {
-          homepage = "http://melpa.org/#/git";
+          homepage = "https://melpa.org/#/git";
           license = lib.licenses.free;
         };
       }) {};
@@ -10196,13 +10680,13 @@
           sha256 = "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-auto-commit-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-auto-commit-mode";
           sha256 = "0nf4n63xnzcsizjk1yl8qvqj9wjdqy57kvn6r736xvsxwzd44xgl";
           name = "git-auto-commit-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/git-auto-commit-mode";
+          homepage = "https://melpa.org/#/git-auto-commit-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -10217,34 +10701,34 @@
           sha256 = "0a3ws852ypi34ash39srkwzkfish4n3c5lma10d9xzddjrwapgj9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-command";
           sha256 = "1hsxak63y6648n0jkzl5ajxg45w84qq8vljvjh0bmwfrbb67kwbg";
           name = "git-command";
         };
         packageRequires = [ git-ps1-mode term-run with-editor ];
         meta = {
-          homepage = "http://melpa.org/#/git-command";
+          homepage = "https://melpa.org/#/git-command";
           license = lib.licenses.free;
         };
       }) {};
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "2.5.0";
+        version = "2.6.2";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "a3747edc8a4cddc408f7718a3371b46a4b610744";
-          sha256 = "0dydm0gj6jbybi5nkqrpi5bic5yxhz0p5k5gayqzqzmnb1fhl247";
+          rev = "2e6dcf8fe8672dca67e59a72975c2d850ce9bc16";
+          sha256 = "0qdahg3vqha391nnspbqa5bjvi2g3jb277c5wzbfs132m4n076j2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-commit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-commit";
           sha256 = "1i7122fydqga68cilgzir80xfq77hnrw75zrvn52mjymfli6aza2";
           name = "git-commit";
         };
         packageRequires = [ dash emacs with-editor ];
         meta = {
-          homepage = "http://melpa.org/#/git-commit";
+          homepage = "https://melpa.org/#/git-commit";
           license = lib.licenses.free;
         };
       }) {};
@@ -10259,13 +10743,13 @@
           sha256 = "0n02nss7gp0m898g7zw4rkj2kzrdiwp6mli0753p1fqph28j0gvm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-gutter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-gutter";
           sha256 = "19s344i95piixlzq4mjgmgjw7cy8af02z6hg89jjjdbxrfl4i2fg";
           name = "git-gutter";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/git-gutter";
+          homepage = "https://melpa.org/#/git-gutter";
           license = lib.licenses.free;
         };
       }) {};
@@ -10280,13 +10764,13 @@
           sha256 = "1cw5x1w14lxy8mqpxdrd9brgps0nig2prjjjda4a19wfsvy3clmv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-gutter-fringe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-gutter-fringe";
           sha256 = "10k07dzmkxsxzwc70vpv05rxjyps9494y6k7yhlv8d46x7xjyp0z";
           name = "git-gutter-fringe";
         };
         packageRequires = [ cl-lib emacs fringe-helper git-gutter ];
         meta = {
-          homepage = "http://melpa.org/#/git-gutter-fringe";
+          homepage = "https://melpa.org/#/git-gutter-fringe";
           license = lib.licenses.free;
         };
       }) {};
@@ -10301,13 +10785,13 @@
           sha256 = "1c7ijbpa7xw831k55cdm2gl8r597rxnp22jcmqnfpwqkqmk48ln9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-gutter-fringe+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-gutter-fringe+";
           sha256 = "1zkjb8p08cq2nqskn79rjszlhp9mrblplgamgi66yskz8qb1bgcc";
           name = "git-gutter-fringe-plus";
         };
         packageRequires = [ fringe-helper git-gutter-plus ];
         meta = {
-          homepage = "http://melpa.org/#/git-gutter-fringe+";
+          homepage = "https://melpa.org/#/git-gutter-fringe+";
           license = lib.licenses.free;
         };
       }) {};
@@ -10322,13 +10806,13 @@
           sha256 = "101hracd77mici778x3ixwrcicd6fqkcr9z76kapkr0dq5z42yjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-gutter+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-gutter+";
           sha256 = "1w78p5cz6kyl9kmndgvwnfrs80ha707s8952hycrihgfb6lixmp0";
           name = "git-gutter-plus";
         };
         packageRequires = [ git-commit ];
         meta = {
-          homepage = "http://melpa.org/#/git-gutter+";
+          homepage = "https://melpa.org/#/git-gutter+";
           license = lib.licenses.free;
         };
       }) {};
@@ -10343,34 +10827,34 @@
           sha256 = "02p73q0kl9z44b9a2bhqg03mkqx6gf61n88qlwwg4420dxrf7sbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-lens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-lens";
           sha256 = "1vv3s89vk5ncinqh2f724z0qbbzp8g4y5y670ryy56w1l6v2acfb";
           name = "git-lens";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/git-lens";
+          homepage = "https://melpa.org/#/git-lens";
           license = lib.licenses.free;
         };
       }) {};
     git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-link";
-        version = "0.3.0";
+        version = "0.4.1";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "git-link";
-          rev = "8ed8f209fe40b3852613691bd968484d6da79e5b";
-          sha256 = "171w8vx1r2v9yclnlk3mwbfaxhg0kbvk575jvi6vr9shpjqnrb0z";
+          rev = "3cb4ced58c48d372230efd10ee4a7f55f54945ea";
+          sha256 = "0a1kxdz05ly9wbzyxcb79xlmy11q38xplf5s8w8klmyajdn43g1j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-link";
           sha256 = "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7";
           name = "git-link";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/git-link";
+          homepage = "https://melpa.org/#/git-link";
           license = lib.licenses.free;
         };
       }) {};
@@ -10385,13 +10869,13 @@
           sha256 = "139yivbxdpmv8j6qz406769b040nbmj3j8r28n9gqy54zlwblgv8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-messenger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-messenger";
           sha256 = "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn";
           name = "git-messenger";
         };
         packageRequires = [ cl-lib popup ];
         meta = {
-          homepage = "http://melpa.org/#/git-messenger";
+          homepage = "https://melpa.org/#/git-messenger";
           license = lib.licenses.free;
         };
       }) {};
@@ -10406,13 +10890,13 @@
           sha256 = "1hyq3il03cm6apfawps60r4km8r6pw0vphzba30smsqfk50z3ya3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-ps1-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-ps1-mode";
           sha256 = "15gswi9s0m3hrsl1qqyjnjgbglsai95klbdp51h3pcq7zj22wkn6";
           name = "git-ps1-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/git-ps1-mode";
+          homepage = "https://melpa.org/#/git-ps1-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -10427,13 +10911,13 @@
           sha256 = "1brz9dc7ngywndlxbqbi3pbjbjydgqc9bjzf05lgx0pzr1ppc3w3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-timemachine";
           sha256 = "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq";
           name = "git-timemachine";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/git-timemachine";
+          homepage = "https://melpa.org/#/git-timemachine";
           license = lib.licenses.free;
         };
       }) {};
@@ -10448,34 +10932,34 @@
           sha256 = "0igawn43i81icshimj5agv33ab120hd6182knlrn3i46p7lcs3lx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-wip-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/git-wip-timemachine";
           sha256 = "02fi51k6l23cgnwjp507ylkiwb8azmnhc0fips68nwn9dghzp6dw";
           name = "git-wip-timemachine";
         };
         packageRequires = [ s ];
         meta = {
-          homepage = "http://melpa.org/#/git-wip-timemachine";
+          homepage = "https://melpa.org/#/git-wip-timemachine";
           license = lib.licenses.free;
         };
       }) {};
     gitattributes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gitattributes-mode";
-        version = "1.2.0";
+        version = "1.2.2";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "git-modes";
-          rev = "9d8f6eda6ee97963e4085da8988cad2c0547b8df";
-          sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
+          rev = "7ccc5de55fc370c328d7ec08de559e351b1ac94c";
+          sha256 = "0ksqfr0l415ynhxpqpcb84bk2bapvczwnpikp45kmfqq91p61xfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitattributes-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gitattributes-mode";
           sha256 = "1gjs0pjh6ap0h54savamzx94lq6vqrg58jxqaq5n5qplrbg15a6x";
           name = "gitattributes-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gitattributes-mode";
+          homepage = "https://melpa.org/#/gitattributes-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -10490,34 +10974,34 @@
           sha256 = "0j0w6ywhiapmx7dk20yw3zgf8803kmccnjsr664am3g85kbb644v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitconfig";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gitconfig";
           sha256 = "126znl1c4vwgskj7ka9id8v2bdrdn5nkyx3mmc6cz9ylc27ainm7";
           name = "gitconfig";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gitconfig";
+          homepage = "https://melpa.org/#/gitconfig";
           license = lib.licenses.free;
         };
       }) {};
     gitconfig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gitconfig-mode";
-        version = "1.2.0";
+        version = "1.2.2";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "git-modes";
-          rev = "9d8f6eda6ee97963e4085da8988cad2c0547b8df";
-          sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
+          rev = "7ccc5de55fc370c328d7ec08de559e351b1ac94c";
+          sha256 = "0ksqfr0l415ynhxpqpcb84bk2bapvczwnpikp45kmfqq91p61xfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitconfig-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gitconfig-mode";
           sha256 = "0hqky40kcgxdnghnf56gpi0xp7ik45ssia1x84v0mvfwqc50dgn1";
           name = "gitconfig-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gitconfig-mode";
+          homepage = "https://melpa.org/#/gitconfig-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -10532,13 +11016,13 @@
           sha256 = "07vgnmfn0kbg3h3vhf3xk443yi1b55761x881xlmw9sr9nraa578";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/github-browse-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/github-browse-file";
           sha256 = "03xvgxlw7wmfby898din7dfcg87ihahkhlav1n7qklw6qi7skjcr";
           name = "github-browse-file";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/github-browse-file";
+          homepage = "https://melpa.org/#/github-browse-file";
           license = lib.licenses.free;
         };
       }) {};
@@ -10553,34 +11037,34 @@
           sha256 = "18c169nxvdl7iv18pyqx690ldg6pkc8njaxdg1cww6ykqzqnfxh7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/github-clone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/github-clone";
           sha256 = "0ffrm4lmcj3d9kx3g2d5xbiih7hn4frs0prjrvcjq8acvsbc50q9";
           name = "github-clone";
         };
         packageRequires = [ emacs gh magit ];
         meta = {
-          homepage = "http://melpa.org/#/github-clone";
+          homepage = "https://melpa.org/#/github-clone";
           license = lib.licenses.free;
         };
       }) {};
     gitignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gitignore-mode";
-        version = "1.2.0";
+        version = "1.2.2";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "git-modes";
-          rev = "9d8f6eda6ee97963e4085da8988cad2c0547b8df";
-          sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
+          rev = "7ccc5de55fc370c328d7ec08de559e351b1ac94c";
+          sha256 = "0ksqfr0l415ynhxpqpcb84bk2bapvczwnpikp45kmfqq91p61xfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitignore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gitignore-mode";
           sha256 = "1i98ribmnxr4hwphd95f9hcfm5wfwgdbcxw3g0w17ws7z0ir61mn";
           name = "gitignore-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gitignore-mode";
+          homepage = "https://melpa.org/#/gitignore-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -10595,13 +11079,13 @@
           sha256 = "1hc7j3gwljb1wk2727f66m3f7ga4icbklp54vlm0vf2bmii1ynil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitlab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gitlab";
           sha256 = "0vxsqfnipgapnd2ijvdnkspk68dlnki3pkpkzg2h6hyazmzrsqnq";
           name = "gitlab";
         };
         packageRequires = [ dash pkg-info request s ];
         meta = {
-          homepage = "http://melpa.org/#/gitlab";
+          homepage = "https://melpa.org/#/gitlab";
           license = lib.licenses.free;
         };
       }) {};
@@ -10616,13 +11100,13 @@
           sha256 = "0j3pay3gd1wdnpc853gy5j68hbavrwy6cc2bgmd12ag29xki3hcg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gmail-message-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gmail-message-mode";
           sha256 = "0py0i7b893ihb8l1hmk3jfl0xil450znadcd18q7svr3zl2m0gkk";
           name = "gmail-message-mode";
         };
         packageRequires = [ ham-mode ];
         meta = {
-          homepage = "http://melpa.org/#/gmail-message-mode";
+          homepage = "https://melpa.org/#/gmail-message-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -10637,13 +11121,13 @@
           sha256 = "0p6n52m3y56nx7chwvmnslrnwc0xmh4fmmlkbkfz9n58hlmw8x1x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gmail2bbdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gmail2bbdb";
           sha256 = "03jhrk4vpjim3ybzjxy7s9r1cgjysj9vlc4criz5k0w7vqz3r28j";
           name = "gmail2bbdb";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gmail2bbdb";
+          homepage = "https://melpa.org/#/gmail2bbdb";
           license = lib.licenses.free;
         };
       }) {};
@@ -10658,13 +11142,13 @@
           sha256 = "0x0a94bfkk72kqyr5m6arx450qsg1axmp5r0c4r9m84z8j08r4v1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gmpl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gmpl-mode";
           sha256 = "1f60xim8h85jmqpvgfg402ff8mjd66gla8fa0cwi7l18ijnjblpz";
           name = "gmpl-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gmpl-mode";
+          homepage = "https://melpa.org/#/gmpl-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -10679,13 +11163,13 @@
           sha256 = "160qm8xf0yghygb52p8cykhb5vpg9ww3gjprcdkcxplr4b230nnc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnome-calendar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gnome-calendar";
           sha256 = "00clamlm5b42zqggxywdqrf6s2dnsxir5rpd8mjpyc502kqmsfn6";
           name = "gnome-calendar";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gnome-calendar";
+          homepage = "https://melpa.org/#/gnome-calendar";
           license = lib.licenses.free;
         };
       }) {};
@@ -10700,13 +11184,13 @@
           sha256 = "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gntp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gntp";
           sha256 = "1ywj3p082g54dcpy8q4jnkqfr12npikx8yz14r0njxdlr0janh4f";
           name = "gntp";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gntp";
+          homepage = "https://melpa.org/#/gntp";
           license = lib.licenses.free;
         };
       }) {};
@@ -10721,13 +11205,13 @@
           sha256 = "0bwri3cvm2vr27kyqkrddm28fs08axnd4nm9amfgp54xp20bn4yn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnuplot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gnuplot";
           sha256 = "06c5gqf02fkra8c52xck1lqvf4yg45zfibyf9zqmnbwk7p2jxrds";
           name = "gnuplot";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gnuplot";
+          homepage = "https://melpa.org/#/gnuplot";
           license = lib.licenses.free;
         };
       }) {};
@@ -10737,18 +11221,18 @@
         version = "1.4";
         src = fetchFromGitHub {
           owner = "wavexx";
-          repo = "gnus-desktop-notify";
+          repo = "gnus-desktop-notify.el";
           rev = "210c70f0021ee78e724f1d8e00ca96e1e99928ca";
           sha256 = "08j8x0iaz5s9q0b68d8h3153w0z6vak5l8qgw3dd1drz5p9xnvyw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnus-desktop-notify";
-          sha256 = "0hf2dszk5d7vn80bm0msaqv7iji384n85dxgw8ng64c0f9f6752b";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gnus-desktop-notify";
+          sha256 = "08k32vhdp6i8c03rp1k6b5jmvj5ijplj26mdblrgasklcqbdnlfs";
           name = "gnus-desktop-notify";
         };
         packageRequires = [ gnus ];
         meta = {
-          homepage = "http://melpa.org/#/gnus-desktop-notify";
+          homepage = "https://melpa.org/#/gnus-desktop-notify";
           license = lib.licenses.free;
         };
       }) {};
@@ -10763,13 +11247,13 @@
           sha256 = "1i3f67x2l9l5c5agspbkxr2mmh3rpq3009d8yzh6r1lih0b4hril";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnus-x-gm-raw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gnus-x-gm-raw";
           sha256 = "1a5iccghzqmcndql2bppvr48535sf6jbvc83iypr1031z1b5k4wg";
           name = "gnus-x-gm-raw";
         };
         packageRequires = [ log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/gnus-x-gm-raw";
+          homepage = "https://melpa.org/#/gnus-x-gm-raw";
           license = lib.licenses.free;
         };
       }) {};
@@ -10784,13 +11268,13 @@
           sha256 = "03snnra31b5j6iy94gql240vhkynbjql9b4b5j8bsqp9inmbsia3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-autocomplete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-autocomplete";
           sha256 = "1ldsq81a167dk2r2mvzyp3v3j2mxc4l9p6b12i7pv8zrjlkhma5a";
           name = "go-autocomplete";
         };
         packageRequires = [ auto-complete ];
         meta = {
-          homepage = "http://melpa.org/#/go-autocomplete";
+          homepage = "https://melpa.org/#/go-autocomplete";
           license = lib.licenses.free;
         };
       }) {};
@@ -10805,34 +11289,34 @@
           sha256 = "05yc0nylg3457an5j7yp3x23157j0hbi21qhcpgsa01144mwnwln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-direx";
           sha256 = "0dq5d7fsld4hww8fl68c18qp6fl3781dqqwd98cg68bihw2wwni7";
           name = "go-direx";
         };
         packageRequires = [ cl-lib direx ];
         meta = {
-          homepage = "http://melpa.org/#/go-direx";
+          homepage = "https://melpa.org/#/go-direx";
           license = lib.licenses.free;
         };
       }) {};
     go-eldoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "go-eldoc";
-        version = "0.26";
+        version = "0.27";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-go-eldoc";
-          rev = "af6bfdcbcf12c240da46412efb381a5ee6c3aec5";
-          sha256 = "0ha07nhd2g43l84r1r5dz6c8m3fmmn4bx5mhvi6as33achhip7bn";
+          rev = "ebf17e486bb64af494278f851f674303c954432c";
+          sha256 = "1n5fnlfq9cy9rbn2hizqqsy0iryw5g2blaa7nd75ya03gxm10p8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-eldoc";
           sha256 = "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk";
           name = "go-eldoc";
         };
         packageRequires = [ cl-lib go-mode ];
         meta = {
-          homepage = "http://melpa.org/#/go-eldoc";
+          homepage = "https://melpa.org/#/go-eldoc";
           license = lib.licenses.free;
         };
       }) {};
@@ -10847,13 +11331,34 @@
           sha256 = "1fm6xd3vsi8mqh0idddjpfxlsmz1ljmjppw3qkxl1vr0qz3598k3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-errcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-errcheck";
           sha256 = "11a75h32cd5h5xjv30x83k60s49k9fhgis31358q46y2gbvqp5bs";
           name = "go-errcheck";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/go-errcheck";
+          homepage = "https://melpa.org/#/go-errcheck";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-impl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-impl";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "dominikh";
+          repo = "go-impl.el";
+          rev = "d4b7f4575360d560609e735bfaa65b691fa9df40";
+          sha256 = "199aa2crddx2a5lvl0wrzylzdc23rcm3wcbbwas17ary3gl4z8jg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-impl";
+          sha256 = "0yhcl6y26s4wxaa3jj8d13i4zr879kp1lwnhlnqskpq8l8n3nmpz";
+          name = "go-impl";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/go-impl";
           license = lib.licenses.free;
         };
       }) {};
@@ -10868,13 +11373,13 @@
           sha256 = "1qqsck11v3ki18qld7hrb7dis60c2ylmq15s7srsppzwil8wm3fx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-mode";
           sha256 = "1852zjxandmq0cpbf7m56ar3rbdi7bx613gdgsf1bg8hsdvkgzfx";
           name = "go-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/go-mode";
+          homepage = "https://melpa.org/#/go-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -10889,13 +11394,13 @@
           sha256 = "1a6vg2vwgnafb61pwrd837fwlq5gs80wawbzjsnykawnmcaag8pm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/go-scratch";
           sha256 = "11ahvmxbh67wa39cymymxmcpkq0kcn5jz0rrvazjy2p1hx3x1ma5";
           name = "go-scratch";
         };
         packageRequires = [ emacs go-mode ];
         meta = {
-          homepage = "http://melpa.org/#/go-scratch";
+          homepage = "https://melpa.org/#/go-scratch";
           license = lib.licenses.free;
         };
       }) {};
@@ -10910,13 +11415,13 @@
           sha256 = "00igv83hiyx7x3pf2grmjpd379brn33fm85f05k104mkkrhg99nm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/golden-ratio";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/golden-ratio";
           sha256 = "15fkrv0sgpzmnw2h4fp2gb83d8s42khkfq1h76l241njjayk1f81";
           name = "golden-ratio";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/golden-ratio";
+          homepage = "https://melpa.org/#/golden-ratio";
           license = lib.licenses.free;
         };
       }) {};
@@ -10931,13 +11436,13 @@
           sha256 = "0j31062zfqmcd0zsbp19f3h7gq7dn78sg4xf2x838sr9421x6w8x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/google-this";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/google-this";
           sha256 = "0hg9y1b03aiamyn3mam3hyxmxy21wygxrnrww91zcbwlzgp4dd2c";
           name = "google-this";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/google-this";
+          homepage = "https://melpa.org/#/google-this";
           license = lib.licenses.free;
         };
       }) {};
@@ -10952,55 +11457,76 @@
           sha256 = "0hvxyqkxv5hfsa9sv71m7d98g25a1xc962r961nw6vmbvsf64z6b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/google-translate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/google-translate";
           sha256 = "1crgzdd32mk6hrawdypg496dwh51wzwfb5wqw4a2j5l8y958xf47";
           name = "google-translate";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/google-translate";
+          homepage = "https://melpa.org/#/google-translate";
+          license = lib.licenses.free;
+        };
+      }) {};
+    goose-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "goose-theme";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "thwg";
+          repo = "goose-theme";
+          rev = "52244bd5ee3e7b42599d9697007a5df3b026aafc";
+          sha256 = "1d1x5ffpn9gq9byd0qavxr081sl3qf0lihdxfdqvhwd815kravxk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/goose-theme";
+          sha256 = "18kfz61mhf8pvp3z5cdvjklla9p840p1dazylrgjb1g5hdwqw0n9";
+          name = "goose-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/goose-theme";
           license = lib.licenses.free;
         };
       }) {};
     gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "gotest";
-        version = "0.10.0";
+        version = "0.12.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "gotest.el";
-          rev = "57f894e68b47352aeacaf0d9c61039b24ba42918";
-          sha256 = "0vf42j9jpa75879pxb1h7qgflcrrg78dgq5lg8v0sbpy7z86zaxr";
+          rev = "c7ead398b69ab25db695f5dab73ceaa0aba572fa";
+          sha256 = "1idhnsl8vkq3v3nbvhkmxmvgqp97aycxvmkj7894mj9hvhib68l9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gotest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gotest";
           sha256 = "1kan3gykhci33jgg67jjiiz7rqlz5mpxp8sh6mb0n6kpfmgb4ly9";
           name = "gotest";
         };
         packageRequires = [ emacs f go-mode s ];
         meta = {
-          homepage = "http://melpa.org/#/gotest";
+          homepage = "https://melpa.org/#/gotest";
           license = lib.licenses.free;
         };
       }) {};
     gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gotham-theme";
-        version = "1.1.5";
+        version = "1.1.6";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "gotham-theme";
-          rev = "d41b0ea37ad5a4d0060ea05e25d80581f113b662";
-          sha256 = "0pxzi56lw9ry91f70hjnvrsbyhcaqknlwicjjbhf6rhv57fplw8h";
+          rev = "ba781db5c0e6e8e5d20bdc0f623f6b187daf0d9f";
+          sha256 = "1lgljlfxs3gwxr072bvpl55r0b4z78wiww2g093sy7dgxgzgzmq6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gotham-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gotham-theme";
           sha256 = "0jars6rvf7hkyf71vq06mqki1r840i1dvv43dissqjg5i4lr79cl";
           name = "gotham-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gotham-theme";
+          homepage = "https://melpa.org/#/gotham-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -11015,13 +11541,13 @@
           sha256 = "188q7jr1y872as3w32m8lf6vwl2by1ibgdk6zk7dhpcjwd0ik7x7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/goto-gem";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/goto-gem";
           sha256 = "06vy9m01qccvahxr5xn0plzw9knl5ig7gi5q5r1smfx92bmzkg3a";
           name = "goto-gem";
         };
         packageRequires = [ s ];
         meta = {
-          homepage = "http://melpa.org/#/goto-gem";
+          homepage = "https://melpa.org/#/goto-gem";
           license = lib.licenses.free;
         };
       }) {};
@@ -11036,13 +11562,34 @@
           sha256 = "1f0zlvva7d7iza1v79yjp0bm7vd011q4cy14g1saryll32z115z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/goto-last-change";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/goto-last-change";
           sha256 = "1yl9p95ls04bkmf4d6az72pycp27bv7q7wxxzvj8sj97bgwvwajx";
           name = "goto-last-change";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/goto-last-change";
+          homepage = "https://melpa.org/#/goto-last-change";
+          license = lib.licenses.free;
+        };
+      }) {};
+    govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
+    melpaBuild {
+        pname = "govc";
+        version = "0.5.0";
+        src = fetchFromGitHub {
+          owner = "vmware";
+          repo = "govmomi";
+          rev = "c1b29993f383c32fc3fadb90892909668699810a";
+          sha256 = "1wxk6r4729g6qirrc45kkjhb8lq24wb1a5k35c0fg8ddj15kvnah";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/govc";
+          sha256 = "1ivgaziv25wlzg6y4zh8x7mv97pnyhi7p8jpvgh5fg5lnqpzhl4v";
+          name = "govc";
+        };
+        packageRequires = [ dash emacs json-mode magit-popup s ];
+        meta = {
+          homepage = "https://melpa.org/#/govc";
           license = lib.licenses.free;
         };
       }) {};
@@ -11057,34 +11604,55 @@
           sha256 = "0k86lrb55d701nj6pvlw3kjp1dcd3lzfya0hv6q56c529y69d782";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gradle-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gradle-mode";
           sha256 = "0lx9qi93wmiy9pxjxqp68scbcb4bx88b6jiqk3y8jg5cajizh24g";
           name = "gradle-mode";
         };
         packageRequires = [ s ];
         meta = {
-          homepage = "http://melpa.org/#/gradle-mode";
+          homepage = "https://melpa.org/#/gradle-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    grails = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "grails";
+        version = "0.4.1";
+        src = fetchFromGitHub {
+          owner = "lifeisfoo";
+          repo = "emacs-grails";
+          rev = "fa638abe5c37f3f8af4fcd32f212453185ce50b1";
+          sha256 = "1npsjniazaq20vz3kvwr8p30ivc6x24r9a16rfcwhr5wjx3nn91b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/grails";
+          sha256 = "177y6xv35d2dhc3pdx5qhpywlmlqgfnjpzfm9yxc8l6q2rgs8irw";
+          name = "grails";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/grails";
           license = lib.licenses.free;
         };
       }) {};
     grails-projectile-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "grails-projectile-mode";
-        version = "1.1.1";
+        version = "1.1.2";
         src = fetchFromGitHub {
           owner = "yveszoundi";
           repo = "grails-projectile-mode";
-          rev = "e6667dc737cdb224bbadc70a5fcfb82d0fce6f8f";
-          sha256 = "1rv6klh59y70shc7kwdzlksdzmy0881ss49c0h5m93cn5pd6aj1l";
+          rev = "8efca50ce92b556fe9d467b157d7aec635bcc017";
+          sha256 = "0xnj0wp0na53l0y8fiaah50ij4r80j8a29hbjbcicska21p5w1s1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grails-projectile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/grails-projectile-mode";
           sha256 = "0dy8v2mila7ccvb7j5jlfkhfjsjfk3bm3rcy84m0rgbqjai67amn";
           name = "grails-projectile-mode";
         };
         packageRequires = [ cl-lib emacs projectile ];
         meta = {
-          homepage = "http://melpa.org/#/grails-projectile-mode";
+          homepage = "https://melpa.org/#/grails-projectile-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -11099,13 +11667,13 @@
           sha256 = "1202fwwwdr74q6s5jv1n0mvmq4n9mra85l14hdhwh2kks513s6vs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grandshell-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/grandshell-theme";
           sha256 = "1mnnjsw1kx40b6ws8wmk25fz9rq8rd70xia9cjpwdfkg7kh8xvsa";
           name = "grandshell-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/grandshell-theme";
+          homepage = "https://melpa.org/#/grandshell-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -11120,7 +11688,7 @@
           sha256 = "1f34bhjxmbf2jjrkpdvqg2gwp83ka6d5vrxmsxdl3r57yc6rbrwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/graphene";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/graphene";
           sha256 = "1wz3rvd8b7gx5d0k7yi4dd69ax5bybcm10vdc7xp4yn296lmyl9k";
           name = "graphene";
         };
@@ -11138,7 +11706,7 @@
           web-mode
         ];
         meta = {
-          homepage = "http://melpa.org/#/graphene";
+          homepage = "https://melpa.org/#/graphene";
           license = lib.licenses.free;
         };
       }) {};
@@ -11153,13 +11721,13 @@
           sha256 = "1bidfn4x5lb6dylhadyf05g4l2k7jg83mi058cmv76av1glawk17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/graphene-meta-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/graphene-meta-theme";
           sha256 = "1cqdr93lccdpxkzgap3r3qc92dh8vqgdlnxvqkw7lrcbs31fvf3q";
           name = "graphene-meta-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/graphene-meta-theme";
+          homepage = "https://melpa.org/#/graphene-meta-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -11174,13 +11742,13 @@
           sha256 = "1zk664ilyz14p11csmqgzs73gx08hy32h3pnyymzqkavmgb6h3s0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/graphviz-dot-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/graphviz-dot-mode";
           sha256 = "04rkynsrsk6w4sxn1pc0b9b6pij1p7yraywbrk7qvv05fv69kri2";
           name = "graphviz-dot-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/graphviz-dot-mode";
+          homepage = "https://melpa.org/#/graphviz-dot-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -11195,13 +11763,13 @@
           sha256 = "0xcj1kqzgxifhrhpl9j2nfpnkd6213ix5z7f97269v3inpzaiyf5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grapnel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/grapnel";
           sha256 = "019cdx1wdx8sc2ibqwgp1akgckzxxvrayyp2sv806gha0kn6yf6r";
           name = "grapnel";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/grapnel";
+          homepage = "https://melpa.org/#/grapnel";
           license = lib.licenses.free;
         };
       }) {};
@@ -11211,17 +11779,17 @@
         version = "0.1";
         src = fetchhg {
           url = "https://bitbucket.com/tws/grass-mode.el";
-          rev = "aa8cc5eff764";
-          sha256 = "0djv2ps2ahw9b1b5i45hgy7l7cch7cgh7rzq601c0r6vi7gm2ac5";
+          rev = "25414dff1fc5";
+          sha256 = "0mnwmsn078hz317xfz6c05r7narx3k8956v1ajz5myxx8xrcr24z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grass-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/grass-mode";
           sha256 = "1lq6bk4bwgcy4ra3d9rlca3fk87ydg7xnnqcqjg0pw4m9xnr3f7v";
           name = "grass-mode";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
-          homepage = "http://melpa.org/#/grass-mode";
+          homepage = "https://melpa.org/#/grass-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -11234,13 +11802,13 @@
           sha256 = "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/grin";
           sha256 = "0mvzwmws5pi6hpzgkc43fjxs98ngkr0jvqbclza2jbbqawifzzbk";
           name = "grin";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/grin";
+          homepage = "https://melpa.org/#/grin";
           license = lib.licenses.free;
         };
       }) {};
@@ -11249,19 +11817,19 @@
         pname = "grizzl";
         version = "0.1.1";
         src = fetchFromGitHub {
-          owner = "d11wtq";
+          owner = "grizzl";
           repo = "grizzl";
           rev = "c775de1c34d1e5a374e2f40c1ae2396b4b003fe7";
           sha256 = "1bq73kcx744xnlm2yvccrzlbyx91c492sg7blx2a9z643v3gg1zs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grizzl";
-          sha256 = "1klds0w9qrsgfppq105qr69c26zi91y575db2hxr6h9vypf2rq24";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/grizzl";
+          sha256 = "0354xskqzxc38l14zxqs31hadwh27v9lyx67y3hnd94d8abr0qcb";
           name = "grizzl";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/grizzl";
+          homepage = "https://melpa.org/#/grizzl";
           license = lib.licenses.free;
         };
       }) {};
@@ -11276,13 +11844,13 @@
           sha256 = "14h0rcd3nkw3pmx8jwip20p6rzl9qdkip5g52gfjjbqfvaffsrkd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gruber-darker-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gruber-darker-theme";
           sha256 = "0vn4msixb77xj6p5mlfchjyyjhzah0lcmp0z82s8849zd194fxqi";
           name = "gruber-darker-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gruber-darker-theme";
+          homepage = "https://melpa.org/#/gruber-darker-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -11297,13 +11865,13 @@
           sha256 = "0zpmhjwj64s72iv3dgsy07pfh20f25ngsy3pszmlrfkxk0926d8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grunt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/grunt";
           sha256 = "1qdzqcrff9x97kyy0d4j636d5i751qja10liw8i0lf4lk6n0lywz";
           name = "grunt";
         };
         packageRequires = [ ansi-color dash ];
         meta = {
-          homepage = "http://melpa.org/#/grunt";
+          homepage = "https://melpa.org/#/grunt";
           license = lib.licenses.free;
         };
       }) {};
@@ -11318,13 +11886,13 @@
           sha256 = "1dfd22629gz0c8r4wplvbn0n7bm20549mg5chq289s826ca0kxqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gscholar-bibtex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/gscholar-bibtex";
           sha256 = "0d41gr9amf9vdn9pl9lamhp2swqllxslv9r3wsgzqvjl7zayd1az";
           name = "gscholar-bibtex";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/gscholar-bibtex";
+          homepage = "https://melpa.org/#/gscholar-bibtex";
           license = lib.licenses.free;
         };
       }) {};
@@ -11339,13 +11907,13 @@
           sha256 = "1bmcvn8a7g9ahpv2fww673hx9pa7nnrj9kpljq65azf61vq2an2g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/guide-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/guide-key";
           sha256 = "0zjrdvppcg8b2k6hfdj45rswc1ks9xgimcr2yvgpc8prrwk1yjsf";
           name = "guide-key";
         };
         packageRequires = [ popwin ];
         meta = {
-          homepage = "http://melpa.org/#/guide-key";
+          homepage = "https://melpa.org/#/guide-key";
           license = lib.licenses.free;
         };
       }) {};
@@ -11360,13 +11928,13 @@
           sha256 = "040mcfhj2gggp8w1pgip7rxb1bnb23rxlm02wl6x1qv5i0q7g5x3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/guide-key-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/guide-key-tip";
           sha256 = "0h2vkkbxq361dkn6irm1v19qj7bkhxcjljiksd5wwlq5zsq6bd06";
           name = "guide-key-tip";
         };
         packageRequires = [ guide-key pos-tip ];
         meta = {
-          homepage = "http://melpa.org/#/guide-key-tip";
+          homepage = "https://melpa.org/#/guide-key-tip";
           license = lib.licenses.free;
         };
       }) {};
@@ -11381,34 +11949,34 @@
           sha256 = "1y46qd9cgkfb0wp2cvksjncyp77hd2jnr4bm4zafqirc3qhbysx0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/guru-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/guru-mode";
           sha256 = "0j25nxs3ndybq1ik36qyqdprmhav4ba8ny7v2z61s23id8hz3xjs";
           name = "guru-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/guru-mode";
+          homepage = "https://melpa.org/#/guru-mode";
           license = lib.licenses.free;
         };
       }) {};
     hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "hackernews";
-        version = "0.2";
+        version = "0.3.1";
         src = fetchFromGitHub {
           owner = "clarete";
           repo = "hackernews.el";
-          rev = "97b178acfa26b929fc23177b25fb0c62d2958e32";
-          sha256 = "1ffk39lnmg9gfffkaj595p768d1p99q6sqym5g5ch6fmi6cx3a84";
+          rev = "452e939211ebc0af7256a2f0e8cdad5c426694e6";
+          sha256 = "1c49lfm5saafxks591qyy2nilymxz3aqlxpsmnad5d0kfhvjr47z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hackernews";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hackernews";
           sha256 = "1x1jf5gkhmpiby5rmy0sziywh6c1f1n0p4f6dlz6ifbwns7har6a";
           name = "hackernews";
         };
         packageRequires = [ json ];
         meta = {
-          homepage = "http://melpa.org/#/hackernews";
+          homepage = "https://melpa.org/#/hackernews";
           license = lib.licenses.free;
         };
       }) {};
@@ -11423,13 +11991,13 @@
           sha256 = "0d3xmagl18pas19zbpg27j0lmdiry23df48z4vkjsrcllqg25v5g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ham-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ham-mode";
           sha256 = "000qrdby7d6zmp5066vs4gjlc9ik0ybrgcwzcbfgxb16w1g9xpmz";
           name = "ham-mode";
         };
         packageRequires = [ html-to-markdown markdown-mode ];
         meta = {
-          homepage = "http://melpa.org/#/ham-mode";
+          homepage = "https://melpa.org/#/ham-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -11444,13 +12012,13 @@
           sha256 = "0fmr7ji8x5ki9fzybpbg3xbhzws6n7ffk7d0zf9jl1x3jd8d6988";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/haml-mode";
           sha256 = "0ih0m7zr6kgn6zd45zbp1jgs1ydc5i5gmq6l080wma83v5w1436f";
           name = "haml-mode";
         };
         packageRequires = [ ruby-mode ];
         meta = {
-          homepage = "http://melpa.org/#/haml-mode";
+          homepage = "https://melpa.org/#/haml-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -11465,34 +12033,55 @@
           sha256 = "08l6p9n2ggg4filad1k663qc2gjgfbia4knnnif4sw7h92yb31jl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hardcore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hardcore-mode";
           sha256 = "1bgi1acpw4z7i03d0i8mrd2hpjn6hyvkdsk0ks9q380yp9mqmiwd";
           name = "hardcore-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hardcore-mode";
+          homepage = "https://melpa.org/#/hardcore-mode";
           license = lib.licenses.free;
         };
       }) {};
     hardhat = callPackage ({ fetchFromGitHub, fetchurl, ignoramus, lib, melpaBuild }:
     melpaBuild {
         pname = "hardhat";
-        version = "0.4.4";
+        version = "0.4.6";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "hardhat";
-          rev = "fa42fa4a07dc59f253950c5a8aa5257263a41cdf";
-          sha256 = "0mbdnsm903s380ajjgjjqa0m4mxsddzqfjdafrngy0pxgs16iv1f";
+          rev = "9038a49ab55cd4c502cf7f07ed0d1b9b6bc3626e";
+          sha256 = "0j9z46j777y3ljpai5czdlwl07f0irp4fsk4677n11ndyqm1amb5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hardhat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hardhat";
           sha256 = "16pdbpm647ag9cadmdm75nwwyzrqsd9y1b4zgkl3pg669mi5vl5z";
           name = "hardhat";
         };
         packageRequires = [ ignoramus ];
         meta = {
-          homepage = "http://melpa.org/#/hardhat";
+          homepage = "https://melpa.org/#/hardhat";
+          license = lib.licenses.free;
+        };
+      }) {};
+    harvest = callPackage ({ fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, s, swiper }:
+    melpaBuild {
+        pname = "harvest";
+        version = "0.3.8";
+        src = fetchFromGitHub {
+          owner = "kostajh";
+          repo = "harvest.el";
+          rev = "69041907bdca68d3ab6802e08ec698c3448f28a1";
+          sha256 = "0rqxi668wra1mfzq4fqscjghis5gqnwpazgidgix13brybaxydx4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/harvest";
+          sha256 = "1qfhfzjwlnqpbq4kfxvs97fa3xks8zi02fnwv0ik8wb1ppbb77qd";
+          name = "harvest";
+        };
+        packageRequires = [ hydra s swiper ];
+        meta = {
+          homepage = "https://melpa.org/#/harvest";
           license = lib.licenses.free;
         };
       }) {};
@@ -11507,13 +12096,13 @@
           sha256 = "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-emacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/haskell-emacs";
           sha256 = "1wkh7qws35c32hha0p9rpjz5pls2844920nh919lvp2wmq9l6jd6";
           name = "haskell-emacs";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/haskell-emacs";
+          homepage = "https://melpa.org/#/haskell-emacs";
           license = lib.licenses.free;
         };
       }) {};
@@ -11528,13 +12117,13 @@
           sha256 = "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-emacs-base";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/haskell-emacs-base";
           sha256 = "1fwkds6qyhbxxdgxfzmgd7dlcxr08ynrrg5jdp9r7f924pd536vb";
           name = "haskell-emacs-base";
         };
         packageRequires = [ haskell-emacs ];
         meta = {
-          homepage = "http://melpa.org/#/haskell-emacs-base";
+          homepage = "https://melpa.org/#/haskell-emacs-base";
           license = lib.licenses.free;
         };
       }) {};
@@ -11549,34 +12138,34 @@
           sha256 = "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-emacs-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/haskell-emacs-text";
           sha256 = "1j18fhhra6lv32xrq8jc6l8i56fgn68da81wymcimpmpbp0hl5fy";
           name = "haskell-emacs-text";
         };
         packageRequires = [ haskell-emacs ];
         meta = {
-          homepage = "http://melpa.org/#/haskell-emacs-text";
+          homepage = "https://melpa.org/#/haskell-emacs-text";
           license = lib.licenses.free;
         };
       }) {};
-    haskell-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    haskell-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "13.18";
+        version = "13.20";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "e37c4e53775067ecc0dad67976bb10971b2b118f";
-          sha256 = "0433ay8azn1q9fk7rc5aw4klc9r2p7s44xzd87i0pgpdp154h52g";
+          rev = "163f264124cd12d40b16c023c7e5394f42c410af";
+          sha256 = "1hxjqr448z7sfk3wb48s1y4q51870gb2zv5bfam30lvwxbl3znkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/haskell-mode";
           sha256 = "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp";
           name = "haskell-mode";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/haskell-mode";
+          homepage = "https://melpa.org/#/haskell-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -11591,13 +12180,13 @@
           sha256 = "0b3d7rvqvvcsp51aqfhl0zg9zg8j0p6vlfvga6jp9xc7626vh6f6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/haskell-snippets";
           sha256 = "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2";
           name = "haskell-snippets";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/haskell-snippets";
+          homepage = "https://melpa.org/#/haskell-snippets";
           license = lib.licenses.free;
         };
       }) {};
@@ -11608,16 +12197,16 @@
         src = fetchgit {
           url = "https://git.spwhitton.name/haskell-tab-indent";
           rev = "38d50e9bb8f64ba13ffbd9bcff32db820403a0fc";
-          sha256 = "02786f437bbbbb221c9c810a8d110bb4af172b986733ac35c932b18b38af7201";
+          sha256 = "00bjmww8pc9jr4ssqcv7k0migbxl1c8qs2l1khf25fxvgd1nyy02";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-tab-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/haskell-tab-indent";
           sha256 = "0vdfmy56w5yi202nbd28v1bzj97v1wxnfnb5z3dh9687p2abgnr7";
           name = "haskell-tab-indent";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/haskell-tab-indent";
+          homepage = "https://melpa.org/#/haskell-tab-indent";
           license = lib.licenses.free;
         };
       }) {};
@@ -11632,13 +12221,13 @@
           sha256 = "14m8z13nvfqqgx40vzzbn0z9crwi3hhacmk1zfbv9cmhs95dwy6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haxor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/haxor-mode";
           sha256 = "1y4m058whdqnkkf9s6hzi0h6w0fc8ajfawhpjj0wqjam4adnfkq5";
           name = "haxor-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/haxor-mode";
+          homepage = "https://melpa.org/#/haxor-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -11653,34 +12242,34 @@
           sha256 = "15h1wkl1d9f2xfhm0nffqicg31rw7z2q0sizjphys9ljgxm43is4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hcl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hcl-mode";
           sha256 = "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin";
           name = "hcl-mode";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/hcl-mode";
+          homepage = "https://melpa.org/#/hcl-mode";
           license = lib.licenses.free;
         };
       }) {};
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "1.9.2";
+        version = "1.9.4";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "a80e0b48e2ee22a022a76a5f483d1b68efe8a9e3";
-          sha256 = "0cylf0mnfj0m1wm9mxpxrkiinrlvpax99mdnsc6zfj3zrn1qghnp";
+          rev = "92786bba2e533eca50b6504413bc22edd957e5ee";
+          sha256 = "19ahlm144yfs5jjc513m4f3n4p0zpk1v2xaw3rkrvnb8xay6f1gn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm";
           sha256 = "0xsf4rg7kn0m5wjlbwhd1mc38lg2822037dyd0h66h6x2gbs3fd9";
           name = "helm";
         };
         packageRequires = [ async emacs helm-core popup ];
         meta = {
-          homepage = "http://melpa.org/#/helm";
+          homepage = "https://melpa.org/#/helm";
           license = lib.licenses.free;
         };
       }) {};
@@ -11695,34 +12284,34 @@
           sha256 = "0ps86zpyywibjwcm9drmamla979ad61fyqr8d6bv71fr56k9ak21";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-ack";
           sha256 = "1a8sc5gd2g57dl9g18wyydfmihy74yniwhjr27h7vxylnf2g3pni";
           name = "helm-ack";
         };
         packageRequires = [ cl-lib helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-ack";
+          homepage = "https://melpa.org/#/helm-ack";
           license = lib.licenses.free;
         };
       }) {};
     helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ag";
-        version = "0.51";
+        version = "0.53";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-ag";
-          rev = "8f45c7e3294bea1bc583b2b46a02870cc7073311";
-          sha256 = "0ksx48n3g5n7ny2ny65bp3xx3p5g464dwxq30aji2b40yivaj0sz";
+          rev = "8028bd28cdfc92b08dff082e97f7df525e545f58";
+          sha256 = "1aay6fs6gz08rw7j3996dv75mpw1inaa33kfih5384q660rbf0zp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-ag";
           sha256 = "050qh5xqh8lwkgmz3jxm8gql5nd7bq8sp9q6mzm2z7367qy4qqyf";
           name = "helm-ag";
         };
         packageRequires = [ emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-ag";
+          homepage = "https://melpa.org/#/helm-ag";
           license = lib.licenses.free;
         };
       }) {};
@@ -11737,13 +12326,13 @@
           sha256 = "015p5sszd54x81qm96gx6xwjkvbi4f3j9i2nhcvlkk75s95w1ijv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-aws";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-aws";
           sha256 = "0sjgdjpznjxsf6nlv2ah45fw17j8j5apdphd1fp43rjv1lskkgc5";
           name = "helm-aws";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-aws";
+          homepage = "https://melpa.org/#/helm-aws";
           license = lib.licenses.free;
         };
       }) {};
@@ -11758,13 +12347,34 @@
           sha256 = "0d6h4gbb69abxxgm85pdi5rsaf9h72yryg72ykd5633i1g4s8a76";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-backup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-backup";
           sha256 = "182jbm36yzayxi9y3vhpyn25ivrgay37sncqvah35vbw52lnjcn3";
           name = "helm-backup";
         };
         packageRequires = [ cl-lib helm s ];
         meta = {
-          homepage = "http://melpa.org/#/helm-backup";
+          homepage = "https://melpa.org/#/helm-backup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-bm = callPackage ({ bm, cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "helm-bm";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "helm-bm";
+          rev = "d66341f5646c23178d4d8bffb6cfebe3fb73f1d7";
+          sha256 = "011k37p4vnzm1x8vyairllanvjfknskl20bdfv0glf64xgbdpfil";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-bm";
+          sha256 = "1dnlcvn0zv4qv4ii4j0h9r8w6vhi3l0c5aa768kblh5r2rf4bjjh";
+          name = "helm-bm";
+        };
+        packageRequires = [ bm cl-lib helm s ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-bm";
           license = lib.licenses.free;
         };
       }) {};
@@ -11779,13 +12389,13 @@
           sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-bundle-show";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-bundle-show";
           sha256 = "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7";
           name = "helm-bundle-show";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-bundle-show";
+          homepage = "https://melpa.org/#/helm-bundle-show";
           license = lib.licenses.free;
         };
       }) {};
@@ -11800,13 +12410,13 @@
           sha256 = "108584bmadgidqkdfvf333zkyb5v9f84pasz5h01fkh57ks8by9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-c-yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-c-yasnippet";
           sha256 = "0jwj4giv6lxb3h7vqqb2alkwq5kp0shy2nraik33956p4l8dfs90";
           name = "helm-c-yasnippet";
         };
         packageRequires = [ cl-lib helm-core yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/helm-c-yasnippet";
+          homepage = "https://melpa.org/#/helm-c-yasnippet";
           license = lib.licenses.free;
         };
       }) {};
@@ -11821,13 +12431,13 @@
           sha256 = "1gwg299s8ps0q97iw6p515gwn73rjk1icgl3j7cj1s143njjg122";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-circe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-circe";
           sha256 = "12jfzg03573lih2aapvv5h2mi3pwqc9nrmv538ivjywix5117k3v";
           name = "helm-circe";
         };
         packageRequires = [ circe cl-lib emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-circe";
+          homepage = "https://melpa.org/#/helm-circe";
           license = lib.licenses.free;
         };
       }) {};
@@ -11842,34 +12452,34 @@
           sha256 = "1l61csd1gqz7kg5zjx60cfy824g42p682z7pk0rqzlrz8498wvkh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-commandlinefu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-commandlinefu";
           sha256 = "150nqib0sr4n35vdj1xrxcja8gkv3chzhdbgkjxqgkz2yq10xxnd";
           name = "helm-commandlinefu";
         };
         packageRequires = [ emacs helm json let-alist ];
         meta = {
-          homepage = "http://melpa.org/#/helm-commandlinefu";
+          homepage = "https://melpa.org/#/helm-commandlinefu";
           license = lib.licenses.free;
         };
       }) {};
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "1.9.2";
+        version = "1.9.4";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "a80e0b48e2ee22a022a76a5f483d1b68efe8a9e3";
-          sha256 = "0cylf0mnfj0m1wm9mxpxrkiinrlvpax99mdnsc6zfj3zrn1qghnp";
+          rev = "92786bba2e533eca50b6504413bc22edd957e5ee";
+          sha256 = "19ahlm144yfs5jjc513m4f3n4p0zpk1v2xaw3rkrvnb8xay6f1gn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-core";
           sha256 = "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda";
           name = "helm-core";
         };
         packageRequires = [ async emacs ];
         meta = {
-          homepage = "http://melpa.org/#/helm-core";
+          homepage = "https://melpa.org/#/helm-core";
           license = lib.licenses.free;
         };
       }) {};
@@ -11884,13 +12494,13 @@
           sha256 = "0xnqkc4z22m41v5lgf87dd8xc4gmf932zbnbdhf9xic1gal1779c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-cscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-cscope";
           sha256 = "13a76wc1ia4c0v701dxqc9ycbb43d5k09m5pfsvs8mccisfzk9y4";
           name = "helm-cscope";
         };
         packageRequires = [ cl-lib emacs helm xcscope ];
         meta = {
-          homepage = "http://melpa.org/#/helm-cscope";
+          homepage = "https://melpa.org/#/helm-cscope";
           license = lib.licenses.free;
         };
       }) {};
@@ -11905,13 +12515,13 @@
           sha256 = "0s503q56acv70i5qahrdgk3nhvdpb3wa22a8jh1kvb7lykaw74ai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-dash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-dash";
           sha256 = "1cnxssj2ilszq94v5cc4ixblar1nlilv9askqjp9gfnkj2z1n9cy";
           name = "helm-dash";
         };
         packageRequires = [ cl-lib helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-dash";
+          homepage = "https://melpa.org/#/helm-dash";
           license = lib.licenses.free;
         };
       }) {};
@@ -11926,13 +12536,13 @@
           sha256 = "1cm2vaw0j1x2w2m45k6iqbzm7nydfdx1x89673vsvb90whdgvjbp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-descbinds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-descbinds";
           sha256 = "1890ss4pimjxskzzllf57fg07xbs8zqcrp6r8r6x989llrfvd1h7";
           name = "helm-descbinds";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-descbinds";
+          homepage = "https://melpa.org/#/helm-descbinds";
           license = lib.licenses.free;
         };
       }) {};
@@ -11947,13 +12557,34 @@
           sha256 = "0vmlpj6zfif5f3wzgq8lkfqprl3z5gjsqj86347krblgfzhqlz30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-firefox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-firefox";
           sha256 = "0677nj0zsk11vvp3q3xl9nk8dhz3ki9yl3kfb57wgnmprp109wgs";
           name = "helm-firefox";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-firefox";
+          homepage = "https://melpa.org/#/helm-firefox";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-flycheck = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-flycheck";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "helm-flycheck";
+          rev = "29f3d050056760e1fb5c1c4b83207c02beb7fd56";
+          sha256 = "1fg786m4m6x7brbbchpdf4pwvwma7sn4597p5lzmhvh187z6g525";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-flycheck";
+          sha256 = "038f9294qc0jnkzrrjxm97hyhwa4sca3wdsjbaya50cf0g4cmk7b";
+          name = "helm-flycheck";
+        };
+        packageRequires = [ dash flycheck helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-flycheck";
           license = lib.licenses.free;
         };
       }) {};
@@ -11968,13 +12599,13 @@
           sha256 = "00ls9v3jdpz3wka90crd193z3ipwnf1b0slmldn4vb9ivrndh6wn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-ghc";
           sha256 = "1q5ia8sgpflv2hhvw7hjpkfb25vmrjwlrqz1f9qj2qgmki5mix2d";
           name = "helm-ghc";
         };
         packageRequires = [ cl-lib emacs ghc helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-ghc";
+          homepage = "https://melpa.org/#/helm-ghc";
           license = lib.licenses.free;
         };
       }) {};
@@ -11989,13 +12620,34 @@
           sha256 = "0y379qap3mssz9nslb08vfzq5ihqcm156fbx0dszgz9d6xgkpdhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ghq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-ghq";
           sha256 = "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6";
           name = "helm-ghq";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-ghq";
+          homepage = "https://melpa.org/#/helm-ghq";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-git-grep";
+        version = "0.7.1";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "helm-git-grep";
+          rev = "1fde3b3e3da02cdbec27c48bca6a94b0219217e4";
+          sha256 = "1hx9m18dfpl97xaskadhqdrd8syk271shxjasn3jnqa8a07m2983";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-git-grep";
+          sha256 = "1ww6a4q78w5hnwikq7y93ic2b7x070c27r946lh6p8cz1k4b8vqi";
+          name = "helm-git-grep";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-git-grep";
           license = lib.licenses.free;
         };
       }) {};
@@ -12010,13 +12662,13 @@
           sha256 = "1sbhh3dmb47sy3r2iw6vmvbq5bpjac4xdg8i5a0m0c392a38nfqn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-github-stars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-github-stars";
           sha256 = "1r4mc4v71171sq9rbbhm346s92fb7jnvvl91y2q52jqmrnzzl9zy";
           name = "helm-github-stars";
         };
         packageRequires = [ emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-github-stars";
+          homepage = "https://melpa.org/#/helm-github-stars";
           license = lib.licenses.free;
         };
       }) {};
@@ -12031,34 +12683,55 @@
           sha256 = "1hc7j3gwljb1wk2727f66m3f7ga4icbklp54vlm0vf2bmii1ynil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-gitlab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-gitlab";
           sha256 = "010ihx3yddhb8j3jqcssc49qnf3i7xlz0s380mpgrdxgz6yahsmd";
           name = "helm-gitlab";
         };
         packageRequires = [ dash gitlab helm s ];
         meta = {
-          homepage = "http://melpa.org/#/helm-gitlab";
+          homepage = "https://melpa.org/#/helm-gitlab";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-go-package = callPackage ({ deferred, fetchFromGitHub, fetchurl, go-mode, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-go-package";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "helm-go-package";
+          rev = "2204710b8a8e68c8cd4c8528eb6de4ad900941da";
+          sha256 = "0h3iql8dxq80vpr1cv7fdaw0aniykp2rfzh07j5941jkiy4q63h0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-go-package";
+          sha256 = "102yhn1xg83l67yaq3brn35a03fkvqqhad10rq0h39n4i1slq3z6";
+          name = "helm-go-package";
+        };
+        packageRequires = [ deferred go-mode helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-go-package";
           license = lib.licenses.free;
         };
       }) {};
     helm-gtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-gtags";
-        version = "1.5.4";
+        version = "1.5.6";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-gtags";
-          rev = "f14ff7140d0f070b089df7567f2cc6b437ab9924";
-          sha256 = "1hqmwbdcjssvvl7prdykhlgbfrf4qylkvqp0nnnxp8r1wy6h6aws";
+          rev = "dbe0d2d9d08058d469ad2d729bd782515b5b3b62";
+          sha256 = "0zyspn9rqfs3hkq8qx0q1w5qiv30ignbmycyv0vn3a6q7a5fsnhx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-gtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-gtags";
           sha256 = "1kbpfqhhbxmp3f70h91x2fws9mhx87zx4nzjjl29lpl93vf8xckl";
           name = "helm-gtags";
         };
         packageRequires = [ emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-gtags";
+          homepage = "https://melpa.org/#/helm-gtags";
           license = lib.licenses.free;
         };
       }) {};
@@ -12073,13 +12746,13 @@
           sha256 = "189dv3qqqmfyhsqa1n52cgcn1xv7k49f92ndn43y2v20234nhl9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-hatena-bookmark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-hatena-bookmark";
           sha256 = "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id";
           name = "helm-hatena-bookmark";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-hatena-bookmark";
+          homepage = "https://melpa.org/#/helm-hatena-bookmark";
           license = lib.licenses.free;
         };
       }) {};
@@ -12094,13 +12767,13 @@
           sha256 = "1imfzz6cfdq7fgrcgrafy2nln929mgh31vybk9frm7a9jpamqdxp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-hayoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-hayoo";
           sha256 = "0xdvl6q2rpfsma4hx8m4snbd05s4z0bi8psdalixywlp5s4vzr32";
           name = "helm-hayoo";
         };
         packageRequires = [ haskell-mode helm json ];
         meta = {
-          homepage = "http://melpa.org/#/helm-hayoo";
+          homepage = "https://melpa.org/#/helm-hayoo";
           license = lib.licenses.free;
         };
       }) {};
@@ -12115,13 +12788,13 @@
           sha256 = "0bz2ngw816jvpw1a10j31y5hf1knz0mzz60l073h33qci11jbwid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ispell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-ispell";
           sha256 = "0qyj6whgb2p0v231wn6pvx4awvl1wxppppqqbx5255j8r1f3l1b0";
           name = "helm-ispell";
         };
         packageRequires = [ helm-core ];
         meta = {
-          homepage = "http://melpa.org/#/helm-ispell";
+          homepage = "https://melpa.org/#/helm-ispell";
           license = lib.licenses.free;
         };
       }) {};
@@ -12136,13 +12809,13 @@
           sha256 = "1nd562lffc41r3y5x7y46f37ra97avllk2m95w23f9g42h47f1ar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-lobsters";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-lobsters";
           sha256 = "0dkb78n373kywxj8zba2s5a2g85vx19rdswv9i78xjwv1lqh8cpp";
           name = "helm-lobsters";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/helm-lobsters";
+          homepage = "https://melpa.org/#/helm-lobsters";
           license = lib.licenses.free;
         };
       }) {};
@@ -12157,13 +12830,13 @@
           sha256 = "0azs971d7pqd4ddxzy7bfs52cmrjbafwrcnf57afw39d772rzpdf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ls-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-ls-git";
           sha256 = "08rsy9479nk03kinjfkxddrq6wi4sx2a0wrz37cl2q517qi7sibj";
           name = "helm-ls-git";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-ls-git";
+          homepage = "https://melpa.org/#/helm-ls-git";
           license = lib.licenses.free;
         };
       }) {};
@@ -12178,13 +12851,13 @@
           sha256 = "1hma79i69l8ilkr3l4b8zqk3ny62vqr1ym2blymia4ibwk4zqbda";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ls-hg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-ls-hg";
           sha256 = "0ca0xn7n8bagxb504xgkcv04rpm1vxhx2m77biqrx5886pwl25bh";
           name = "helm-ls-hg";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-ls-hg";
+          homepage = "https://melpa.org/#/helm-ls-hg";
           license = lib.licenses.free;
         };
       }) {};
@@ -12199,13 +12872,13 @@
           sha256 = "17ls0bplnja2qvg3129x2irgsgs7l4bjj0qi7b9z16i6knjkwfya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-make";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-make";
           sha256 = "1r6jjy1rlsii6p6pinbz7h6gcw4vmcycd3vj338bfbnqp5rrf2mc";
           name = "helm-make";
         };
         packageRequires = [ helm projectile ];
         meta = {
-          homepage = "http://melpa.org/#/helm-make";
+          homepage = "https://melpa.org/#/helm-make";
           license = lib.licenses.free;
         };
       }) {};
@@ -12220,13 +12893,13 @@
           sha256 = "03588hanfa20pjp9w1bqy8wsf5x6az0vfq0bmcnr4xvlf6fhkyxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-migemo";
           sha256 = "1cjvb1lm1fsg5ky63fvrphwl5a7r7xf6qzb4mvl06ikj8hv2h33x";
           name = "helm-migemo";
         };
         packageRequires = [ cl-lib helm-core migemo ];
         meta = {
-          homepage = "http://melpa.org/#/helm-migemo";
+          homepage = "https://melpa.org/#/helm-migemo";
           license = lib.licenses.free;
         };
       }) {};
@@ -12241,13 +12914,13 @@
           sha256 = "1srx5f0s9x7zan7ayqd6scxfhcvr3nkd4yzs96hphd87rb18apzk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-mode-manager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-mode-manager";
           sha256 = "1w9svq1kyyj8mmljardhbdvykb334nq1y18s956g4rvqyas2ciyd";
           name = "helm-mode-manager";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-mode-manager";
+          homepage = "https://melpa.org/#/helm-mode-manager";
           license = lib.licenses.free;
         };
       }) {};
@@ -12262,13 +12935,13 @@
           sha256 = "0gknncyhr2392xkvghgy5mh6gdv6qzvswidx2wy04ypb4s0vxgq2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-mt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-mt";
           sha256 = "04hx8cg8wmm2w8g942nc9mvm12ammmjnx4k61ljrq76smd8s3x2a";
           name = "helm-mt";
         };
         packageRequires = [ cl-lib emacs helm multi-term ];
         meta = {
-          homepage = "http://melpa.org/#/helm-mt";
+          homepage = "https://melpa.org/#/helm-mt";
           license = lib.licenses.free;
         };
       }) {};
@@ -12283,13 +12956,13 @@
           sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-nixos-options";
           sha256 = "1nsi4hfw53iwn29fp33dkri1c6w8kdyn4sa0yn2fi6144ilmq933";
           name = "helm-nixos-options";
         };
         packageRequires = [ helm nixos-options ];
         meta = {
-          homepage = "http://melpa.org/#/helm-nixos-options";
+          homepage = "https://melpa.org/#/helm-nixos-options";
           license = lib.licenses.free;
         };
       }) {};
@@ -12304,13 +12977,34 @@
           sha256 = "1hq1nnmgkx0a8sv6g8k4v9f0102qg7jga0hcjnr8lcji51nqrcya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-open-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-open-github";
           sha256 = "1wqlwg21s9pjgcrwr8kdrppinmjn235nadkp4003g0md1d64zxpx";
           name = "helm-open-github";
         };
         packageRequires = [ cl-lib gh helm-core ];
         meta = {
-          homepage = "http://melpa.org/#/helm-open-github";
+          homepage = "https://melpa.org/#/helm-open-github";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "helm-org-rifle";
+        version = "1.2.0";
+        src = fetchFromGitHub {
+          owner = "alphapapa";
+          repo = "helm-org-rifle";
+          rev = "c3913b6e1d19e957c0b5a2d0243388e224a42a8a";
+          sha256 = "02yjnag9wr9dk93z41f0i5mqij9bz57fxkv4nddabyc18k7zfrhj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-org-rifle";
+          sha256 = "0hx764vql2qgw9i8qrr3kkn23lw6jx3x604dm1y33ig6a15gy3a3";
+          name = "helm-org-rifle";
+        };
+        packageRequires = [ dash emacs f helm s ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-org-rifle";
           license = lib.licenses.free;
         };
       }) {};
@@ -12325,13 +13019,13 @@
           sha256 = "1zyjxrrda7nxxjqczv2p3sfimxy2pq734kf51j6v2y0biclc4bk3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-orgcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-orgcard";
           sha256 = "1a56y8fny7qxxidc357n7l3yi7h66hidhvwhkam8y5wk6k61460p";
           name = "helm-orgcard";
         };
         packageRequires = [ helm-core ];
         meta = {
-          homepage = "http://melpa.org/#/helm-orgcard";
+          homepage = "https://melpa.org/#/helm-orgcard";
           license = lib.licenses.free;
         };
       }) {};
@@ -12346,13 +13040,13 @@
           sha256 = "14ad0b9d07chabjclffjyvnmrasar1di9wmpzf78bw5yg99cbisw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-package";
           sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y";
           name = "helm-package";
         };
         packageRequires = [ cl-lib helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-package";
+          homepage = "https://melpa.org/#/helm-package";
           license = lib.licenses.free;
         };
       }) {};
@@ -12367,13 +13061,13 @@
           sha256 = "1r2ndmrw5ivawb940j8jnmqzxv46qrzd3cqh9fvxx5yicf020fjf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-pages";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-pages";
           sha256 = "1v3w8100invb5wsmm3dyl41pjs7s889s3b1rlr6vlcspa1ncv3wj";
           name = "helm-pages";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-pages";
+          homepage = "https://melpa.org/#/helm-pages";
           license = lib.licenses.free;
         };
       }) {};
@@ -12388,13 +13082,13 @@
           sha256 = "01cj2897hqz02mfz32nxlyyp59iwm0gz1zj11s8ll7pwy9q3r90g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-perldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-perldoc";
           sha256 = "1qx0g81qcqanjiz5fxysagjhsxaj31g6nsi2hhdgq4x4nqrlmrhb";
           name = "helm-perldoc";
         };
         packageRequires = [ cl-lib deferred helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-perldoc";
+          homepage = "https://melpa.org/#/helm-perldoc";
           license = lib.licenses.free;
         };
       }) {};
@@ -12409,13 +13103,13 @@
           sha256 = "0y0a18bj2k459fk51z7svnnasqkl78bx61y5ha1yv3sqnppgdw2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-proc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-proc";
           sha256 = "1bq60giy2bs9m3hlbc5nwvy51702a98s0vqass3b290hdgki4bnx";
           name = "helm-proc";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-proc";
+          homepage = "https://melpa.org/#/helm-proc";
           license = lib.licenses.free;
         };
       }) {};
@@ -12430,13 +13124,13 @@
           sha256 = "1q7hfj8ldwivhjp9ns5pvsn0ds6pyvl2zhl366c22s6q8jmbr8ik";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-project-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-project-persist";
           sha256 = "1n87kn1n3453mpdj6amyrgivslskmnzdafpspvkz7b0smf9mv2ld";
           name = "helm-project-persist";
         };
         packageRequires = [ helm project-persist ];
         meta = {
-          homepage = "http://melpa.org/#/helm-project-persist";
+          homepage = "https://melpa.org/#/helm-project-persist";
           license = lib.licenses.free;
         };
       }) {};
@@ -12451,13 +13145,13 @@
           sha256 = "0jm6nnnjyd4kmm1knh0mq3xhnw2hvs3linwlynj8yaliqvlv6brv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-pt";
           sha256 = "1imhy0bsm9aldv0pvf88280qdya01lznxpx5gi5wffhrz17yh4pi";
           name = "helm-pt";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-pt";
+          homepage = "https://melpa.org/#/helm-pt";
           license = lib.licenses.free;
         };
       }) {};
@@ -12472,13 +13166,13 @@
           sha256 = "1jy9l4an2aqynj86pw2qxpzw446xm376n2ykiz17qlimqbxhwkgz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-purpose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-purpose";
           sha256 = "0am8fy7ihk4hv07a6bnk9mwy986h6i6qxwpdmfhajzga71ixchg6";
           name = "helm-purpose";
         };
         packageRequires = [ emacs helm window-purpose ];
         meta = {
-          homepage = "http://melpa.org/#/helm-purpose";
+          homepage = "https://melpa.org/#/helm-purpose";
           license = lib.licenses.free;
         };
       }) {};
@@ -12493,13 +13187,13 @@
           sha256 = "1ik0vllakh73kc2zbgii4sm33n9pj388gaz69j4drz2mik307zvs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-pydoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-pydoc";
           sha256 = "1sh7gqqiwk85kx89l1sihlkb8ff1g9n460nwj1y1bsrpfl6if4j7";
           name = "helm-pydoc";
         };
         packageRequires = [ cl-lib helm-core ];
         meta = {
-          homepage = "http://melpa.org/#/helm-pydoc";
+          homepage = "https://melpa.org/#/helm-pydoc";
           license = lib.licenses.free;
         };
       }) {};
@@ -12514,13 +13208,13 @@
           sha256 = "1f1ijna97dn190if3nwk5s5rldlpryfb7wvgg0imwqyp25h4all7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-recoll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-recoll";
           sha256 = "0pr2pllplml55k1xx9inr3dm90ichg2wb62dvgvmbq2sqdf4606b";
           name = "helm-recoll";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-recoll";
+          homepage = "https://melpa.org/#/helm-recoll";
           license = lib.licenses.free;
         };
       }) {};
@@ -12535,13 +13229,13 @@
           sha256 = "163ljqar3vvbavzc8sk6rnf8awyc2rhh2g117fglswich3c8lnqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-robe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-robe";
           sha256 = "1gi4nkm9xvnxv0frmhiiw8dkmnmhfpr9n0b6jpidlvr8xr4s5kyw";
           name = "helm-robe";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-robe";
+          homepage = "https://melpa.org/#/helm-robe";
           license = lib.licenses.free;
         };
       }) {};
@@ -12556,13 +13250,13 @@
           sha256 = "1sff8kagyhmwcxf9062il1077d4slvr2kq76abj496610gpb75i0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-rubygems-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-rubygems-org";
           sha256 = "04ni03ak53z3rggdgf68qh7ksgcf3s0f2cv6skwjqw7v8qhph6qs";
           name = "helm-rubygems-org";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-rubygems-org";
+          homepage = "https://melpa.org/#/helm-rubygems-org";
           license = lib.licenses.free;
         };
       }) {};
@@ -12577,34 +13271,34 @@
           sha256 = "1s6aw1viyzhhrfiazzi82n7bkvshp7clwi6539660m72lfwc5zdl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-sage";
           sha256 = "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj";
           name = "helm-sage";
         };
         packageRequires = [ cl-lib helm sage-shell-mode ];
         meta = {
-          homepage = "http://melpa.org/#/helm-sage";
+          homepage = "https://melpa.org/#/helm-sage";
           license = lib.licenses.free;
         };
       }) {};
     helm-spaces = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, spaces }:
     melpaBuild {
         pname = "helm-spaces";
-        version = "0.2";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "yasuyk";
           repo = "helm-spaces";
-          rev = "8b4f5a1e3cb823ceee1e341ce45f9b18a1b8057c";
-          sha256 = "0kz0vfp43n7f9l53rji2pb8v6ylg63i37q0bmidmjjvsinimwj44";
+          rev = "141266a958feaf7a2e474ff4a5d4cd686919e942";
+          sha256 = "13j3rgg5zfpxds6vsyq0aqws1f3p5y5dsq8558nqsymqvycpn047";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-spaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-spaces";
           sha256 = "0hdvkk173k98iycvii5xpbiblx044125pl7jyz4kb8r1vvwcv791";
           name = "helm-spaces";
         };
         packageRequires = [ helm spaces ];
         meta = {
-          homepage = "http://melpa.org/#/helm-spaces";
+          homepage = "https://melpa.org/#/helm-spaces";
           license = lib.licenses.free;
         };
       }) {};
@@ -12619,13 +13313,13 @@
           sha256 = "1lkjrz9ma2bxr8vskdm3sgrmsyiic798q3271dw38d453bhv4bl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-swoop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-swoop";
           sha256 = "1fqbhj75hcmy7c2vdd0m7fk3m34njmv5s6k1i9y94djpbd13i3d8";
           name = "helm-swoop";
         };
         packageRequires = [ emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-swoop";
+          homepage = "https://melpa.org/#/helm-swoop";
           license = lib.licenses.free;
         };
       }) {};
@@ -12640,13 +13334,13 @@
           sha256 = "0rzbdrs5d5a0icpxrqik2iaz8i5bacw6nm2caf75s9w9j0j6s9li";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-themes";
           sha256 = "0r7kyd0i0spwi7xkjrpm2kyphrsl3hqm5pw96nd3ia0jiwp8550j";
           name = "helm-themes";
         };
         packageRequires = [ helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-themes";
+          homepage = "https://melpa.org/#/helm-themes";
           license = lib.licenses.free;
         };
       }) {};
@@ -12661,13 +13355,13 @@
           sha256 = "14lbdvs9xdnipsn3lywbvgsqwqnbm8fxm6d1ilq0cj5z6zkxkya0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-unicode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-unicode";
           sha256 = "052xqzvcfzpsbl75ylqb1khqndvc2dqdymqlwivs0darlds0w8y4";
           name = "helm-unicode";
         };
         packageRequires = [ emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-unicode";
+          homepage = "https://melpa.org/#/helm-unicode";
           license = lib.licenses.free;
         };
       }) {};
@@ -12682,13 +13376,13 @@
           sha256 = "0s8zp3kx2kxlfyd26yr3lphwcybhbm8qa9vzmxr3kaylwy6jpz5q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-w32-launcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-w32-launcher";
           sha256 = "0bzn2vhspn6lla815qxwsl9gwfyiwgwmnysr6rjpyacmi17d73ri";
           name = "helm-w32-launcher";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-w32-launcher";
+          homepage = "https://melpa.org/#/helm-w32-launcher";
           license = lib.licenses.free;
         };
       }) {};
@@ -12703,13 +13397,34 @@
           sha256 = "1j6ssbjbm5ym3pg0icpfp735y4dfhlky9qhl9hwp2n3wmba5g9h1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-zhihu-daily";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/helm-zhihu-daily";
           sha256 = "0hkgail60s9qhxl0pskqxjvfz93iq1qh1kcmcq0x5kq7d08b911r";
           name = "helm-zhihu-daily";
         };
         packageRequires = [ cl-lib emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/helm-zhihu-daily";
+          homepage = "https://melpa.org/#/helm-zhihu-daily";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hfst-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hfst-mode";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "unhammer";
+          repo = "hfst-mode";
+          rev = "d145a21e3e175b0fe2b0592981533c9492bd289c";
+          sha256 = "1zr59kcnkd9bm5676shmz63n0wpnfr7yl9g4l01ng0xcili1n13i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hfst-mode";
+          sha256 = "1w342n5k9ak1m5znysvrplpr9dhmi7hxbkr4d1dx51dn0azbpjh7";
+          name = "hfst-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/hfst-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -12724,13 +13439,13 @@
           sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hi2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hi2";
           sha256 = "1wxkjg1jnw05lqzggi20jy2jl20d8brvv76vmrf6lnz62g6jv9h2";
           name = "hi2";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hi2";
+          homepage = "https://melpa.org/#/hi2";
           license = lib.licenses.free;
         };
       }) {};
@@ -12745,13 +13460,13 @@
           sha256 = "0c65jk00j88qxfki2g88hy9g6n92rzskwcn1fbmwcw3qgaz4b6w5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-blocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-blocks";
           sha256 = "1a32iv5kgf6g6ygbs559w156dh578k45m860czazfx0d6ap3k5m1";
           name = "highlight-blocks";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/highlight-blocks";
+          homepage = "https://melpa.org/#/highlight-blocks";
           license = lib.licenses.free;
         };
       }) {};
@@ -12766,13 +13481,13 @@
           sha256 = "08czwa165rnd5z0dwwdddn7zi5w63sdk31l47bj0598kbly01n7r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-defined";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-defined";
           sha256 = "1vjxm35wf4c2qphpkjh57hf03a5qdssdlmfj0n0gwxsdw1q5rpms";
           name = "highlight-defined";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/highlight-defined";
+          homepage = "https://melpa.org/#/highlight-defined";
           license = lib.licenses.free;
         };
       }) {};
@@ -12787,13 +13502,13 @@
           sha256 = "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-indentation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-indentation";
           sha256 = "0iblrrbssjwfn71n8xxjcl98pjv1qw1igf3hlz6mh8740fsca3d6";
           name = "highlight-indentation";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/highlight-indentation";
+          homepage = "https://melpa.org/#/highlight-indentation";
           license = lib.licenses.free;
         };
       }) {};
@@ -12808,13 +13523,13 @@
           sha256 = "0ffhc5s0h34064bix4qyiiyx30m4hpv0phmxwcrwiyvanj9ggfai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-numbers";
           sha256 = "1bywrjv9ybr65mwkrxggb52jdqn16z8acgs5vqm0faq43an8i5yv";
           name = "highlight-numbers";
         };
         packageRequires = [ emacs parent-mode ];
         meta = {
-          homepage = "http://melpa.org/#/highlight-numbers";
+          homepage = "https://melpa.org/#/highlight-numbers";
           license = lib.licenses.free;
         };
       }) {};
@@ -12823,19 +13538,19 @@
         pname = "highlight-parentheses";
         version = "1.1.0";
         src = fetchFromGitHub {
-          owner = "nschum";
+          owner = "tsdh";
           repo = "highlight-parentheses.el";
           rev = "5aa800a68e3795716de1e7f2722e836781190f31";
           sha256 = "08ld4wjrkd77cghmrf1n2hn2yzid7bdqwz6b1rzzqaiwxl138iy9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-parentheses";
-          sha256 = "1b0n9mz4a6baljvvgb881w53391smm35c9pwd45g861hk1qvrk5k";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-parentheses";
+          sha256 = "1d38wxk5bwblddr74crzwjwpgyr8zgcl5h5ilywg35jpv7n66lp5";
           name = "highlight-parentheses";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/highlight-parentheses";
+          homepage = "https://melpa.org/#/highlight-parentheses";
           license = lib.licenses.free;
         };
       }) {};
@@ -12850,13 +13565,13 @@
           sha256 = "1ahg9qzss67jpw0wp2izys6lyss4nqjy9320fpa4vdx39msdmjjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-quoted";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-quoted";
           sha256 = "0x6gxi0jfxvpx7r1fm43ikxlxilnbk2xbhdy9xivhgmmdyqiqqkl";
           name = "highlight-quoted";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/highlight-quoted";
+          homepage = "https://melpa.org/#/highlight-quoted";
           license = lib.licenses.free;
         };
       }) {};
@@ -12871,13 +13586,13 @@
           sha256 = "09z13kv2g21kjjkkm3iyaz93sdjmdy2d563r8n7r7ng94acrn7f6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/highlight-symbol";
           sha256 = "0gw8ffr64s58qdbvm034s1b9xz1hynzvbk8ld67j06fxpc98qaj4";
           name = "highlight-symbol";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/highlight-symbol";
+          homepage = "https://melpa.org/#/highlight-symbol";
           license = lib.licenses.free;
         };
       }) {};
@@ -12892,13 +13607,13 @@
           sha256 = "0hb74j5137yj3rm2si16xzwmcvkiwx8ywh1qrlnrzv5gl4viyjzb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hindent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hindent";
           sha256 = "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz";
           name = "hindent";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/hindent";
+          homepage = "https://melpa.org/#/hindent";
           license = lib.licenses.free;
         };
       }) {};
@@ -12913,13 +13628,13 @@
           sha256 = "0mzk4agkcaaw7gryi0wrxv0blqndqsjf1ivdvr2nrnqi798sdhbr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hippie-expand-slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hippie-expand-slime";
           sha256 = "0kxyv1lpkg33qgfv1jfqx03640py7525bcnc9dk98w6y6y92zf4m";
           name = "hippie-expand-slime";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hippie-expand-slime";
+          homepage = "https://melpa.org/#/hippie-expand-slime";
           license = lib.licenses.free;
         };
       }) {};
@@ -12934,13 +13649,13 @@
           sha256 = "0nfr8ad0klqwi97fjchvwx9mfc672lhv3ll166sr8vn6jlh7rkv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hippie-namespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hippie-namespace";
           sha256 = "1bzjhq116ci9c9f0aw121fn3drmg2pw5ny1w6wcasa4p30syxxf0";
           name = "hippie-namespace";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hippie-namespace";
+          homepage = "https://melpa.org/#/hippie-namespace";
           license = lib.licenses.free;
         };
       }) {};
@@ -12955,13 +13670,13 @@
           sha256 = "0dy98sg92xvnr4algm2v2bnjcdwzv0b0vqk0312b0ziinkzisas1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/history";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/history";
           sha256 = "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g";
           name = "history";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/history";
+          homepage = "https://melpa.org/#/history";
           license = lib.licenses.free;
         };
       }) {};
@@ -12976,13 +13691,13 @@
           sha256 = "1mxicha6m61qxz1mv9z76x4g9fpqk4ch9i6jf7nnpxd6x4xz3f7z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/historyf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/historyf";
           sha256 = "15pcaqfjpkfwcy46yqqw10q8kpw7aamcg0gr4frbdgzbv0yld08s";
           name = "historyf";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/historyf";
+          homepage = "https://melpa.org/#/historyf";
           license = lib.licenses.free;
         };
       }) {};
@@ -12991,19 +13706,19 @@
         pname = "hl-anything";
         version = "0.0.9";
         src = fetchFromGitHub {
-          owner = "boyw165";
-          repo = "hl-anything";
-          rev = "990fe4b323b6222d6c6a35898d8128cddda34848";
-          sha256 = "12ab825dldiqymy4md8ssfnbbhrgczkwdiwd3llsdq6sayar16as";
+          owner = "hl-anything";
+          repo = "hl-anything-emacs";
+          rev = "de631c87d3a6602cdbf84c1623558334fda354fa";
+          sha256 = "0889dzrwizpkyh3wms13k8zx27ipsrsxfa4j4yzk4cwk3aicckcr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-anything";
-          sha256 = "15n998nhirvg3f719b7x9s7jpqv6gzkr22kp4zbbq99lbx2wfc1k";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hl-anything";
+          sha256 = "0czpc82j5hbzprc66aall72lqnk38dxgpzx4rs8sbx95cag12dxa";
           name = "hl-anything";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/hl-anything";
+          homepage = "https://melpa.org/#/hl-anything";
           license = lib.licenses.free;
         };
       }) {};
@@ -13018,13 +13733,13 @@
           sha256 = "1hgigbgppdhmr7rc901r95kyydjk05dck8mwbryh7kpglns365fa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-sentence";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hl-sentence";
           sha256 = "16sjfs0nnpwzj1cqfna9vhmxgznwwhb2qdmjci25hlgrdxwwyahs";
           name = "hl-sentence";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hl-sentence";
+          homepage = "https://melpa.org/#/hl-sentence";
           license = lib.licenses.free;
         };
       }) {};
@@ -13039,34 +13754,34 @@
           sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-sexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hl-sexp";
           sha256 = "0kg0m20i9ylphf4w0qcvii8yp65abdl2q5flyphilk0jahwbj9jy";
           name = "hl-sexp";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hl-sexp";
+          homepage = "https://melpa.org/#/hl-sexp";
           license = lib.licenses.free;
         };
       }) {};
     hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hl-todo";
-        version = "1.4.5";
+        version = "1.5.0";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "hl-todo";
-          rev = "878220c111add155b9ee1aeb3d3475cc5e488525";
-          sha256 = "07irwpg794fdzsixmcbi1lnafj5gynhrdam7frcpmvb26a0l8fxq";
+          rev = "6507868d63f3569a6f196716c38e09cf2b57d4e9";
+          sha256 = "1ljakm15bsl9hv1rbg6lj0mnbc4qna5fr9rwkalnlwknjpka1bx3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hl-todo";
           sha256 = "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4";
           name = "hl-todo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hl-todo";
+          homepage = "https://melpa.org/#/hl-todo";
           license = lib.licenses.free;
         };
       }) {};
@@ -13081,34 +13796,34 @@
           sha256 = "1wg6vc9swwspi6s6jpig3my83i2pq8vkq2cy1q3an87rczacmfzp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hoa-pp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hoa-pp-mode";
           sha256 = "01ijfn0hd645j6j88rids5dsanmzwmky37slf50yqffnv69jwvla";
           name = "hoa-pp-mode";
         };
         packageRequires = [ emacs names ];
         meta = {
-          homepage = "http://melpa.org/#/hoa-pp-mode";
+          homepage = "https://melpa.org/#/hoa-pp-mode";
           license = lib.licenses.free;
         };
       }) {};
     homebrew-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
     melpaBuild {
         pname = "homebrew-mode";
-        version = "1.3.2";
+        version = "1.3.5";
         src = fetchFromGitHub {
           owner = "dunn";
           repo = "homebrew-mode";
-          rev = "359b5a0e42c6dab618bb9bcf03ad3dfe3b2a3d12";
-          sha256 = "1n8r4jrk71dg25ca6bsw11ky0dszdj4pvqwsmy3msqlji1ckvqyn";
+          rev = "11e952b9fd9c7aa9c18933f7605cd10bac31e227";
+          sha256 = "0yh9v5zng1j2kfjjadfkdds67jws79q52kvl2mx9s8mq28263idm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/homebrew-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/homebrew-mode";
           sha256 = "088wc5fq4r5yj1nbh7mriyqf0xwqmbxvblj9d2wwrkkdm5flc8mj";
           name = "homebrew-mode";
         };
         packageRequires = [ dash emacs inf-ruby ];
         meta = {
-          homepage = "http://melpa.org/#/homebrew-mode";
+          homepage = "https://melpa.org/#/homebrew-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -13123,13 +13838,13 @@
           sha256 = "1yvz9d5h7npxhsdf6s9fgxpmqk5ixx91iwivbhzcz935gs2886hc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hookify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hookify";
           sha256 = "0prls539ifk2fsqklcxmbrwmgbm9hya50z486d7sw426lh648qmy";
           name = "hookify";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/hookify";
+          homepage = "https://melpa.org/#/hookify";
           license = lib.licenses.free;
         };
       }) {};
@@ -13144,13 +13859,13 @@
           sha256 = "0k09n66jar0prq9aal2h3izp1y67jibdx0gjr0g4jx1p1yxig1dg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ht";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ht";
           sha256 = "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd";
           name = "ht";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ht";
+          homepage = "https://melpa.org/#/ht";
           license = lib.licenses.free;
         };
       }) {};
@@ -13165,13 +13880,13 @@
           sha256 = "0c648dl5zwjrqx9n6zr6nyzx2zcnv05d5i4hvhjpl9q3y011ncns";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/html-to-markdown";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/html-to-markdown";
           sha256 = "1gjh9ndqsb3nfb7w5h7carjckkgy6qh63b4mg141j19dsyx9rrjv";
           name = "html-to-markdown";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/html-to-markdown";
+          homepage = "https://melpa.org/#/html-to-markdown";
           license = lib.licenses.free;
         };
       }) {};
@@ -13186,13 +13901,13 @@
           sha256 = "1h9n388fi17nbyfciqywgrq3n165kpiildbimx59qyk2ac3v7rqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/httpcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/httpcode";
           sha256 = "05k1al1j119x6zf03p7jn2r9qql33859583nbf85k41bhicknpgh";
           name = "httpcode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/httpcode";
+          homepage = "https://melpa.org/#/httpcode";
           license = lib.licenses.free;
         };
       }) {};
@@ -13207,13 +13922,13 @@
           sha256 = "0dd257988bdar9hl2711ch5qshx9jc11fqxcvbrd7rc1va5cshs9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/httprepl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/httprepl";
           sha256 = "0899qb1yfnsyf04hhvnk47qnq4d1f4vd5ghj43x4743wd2b9qawh";
           name = "httprepl";
         };
         packageRequires = [ dash emacs s ];
         meta = {
-          homepage = "http://melpa.org/#/httprepl";
+          homepage = "https://melpa.org/#/httprepl";
           license = lib.licenses.free;
         };
       }) {};
@@ -13228,13 +13943,13 @@
           sha256 = "1b8992vzq5bh01pjlj181nzqjrqs4fbjpwvv8h7gjq42sf8w59sm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hyai";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hyai";
           sha256 = "00ns7q5b11c5amwkq11fs4p5vrmdfmjljfrcxbwb39gc12yrhn7s";
           name = "hyai";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/hyai";
+          homepage = "https://melpa.org/#/hyai";
           license = lib.licenses.free;
         };
       }) {};
@@ -13249,13 +13964,13 @@
           sha256 = "0nwsmc4c3v0wbfy917ik9k7yz8yclfac695p7p9sh9y354k3maw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hyde";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hyde";
           sha256 = "18kjcxm7qmv9bfh4crw37zgax8khjqs9zkp4lrb490zlad2asbs3";
           name = "hyde";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/hyde";
+          homepage = "https://melpa.org/#/hyde";
           license = lib.licenses.free;
         };
       }) {};
@@ -13270,13 +13985,13 @@
           sha256 = "08iw95lyizcyf6cjl37fm8wvay0vsk9758pk9gq9f2xiafcchl7f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hydra";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/hydra";
           sha256 = "1c59l43p39ins3dn9690gm6llwm4b9p0pk78lip0dwlx736drdbw";
           name = "hydra";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/hydra";
+          homepage = "https://melpa.org/#/hydra";
           license = lib.licenses.free;
         };
       }) {};
@@ -13291,13 +14006,13 @@
           sha256 = "1zcnp61c9cp2kvns3v499hifk072rxm4rhw4pvdv2mm966vcxzvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ibuffer-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ibuffer-projectile";
           sha256 = "1qh4krggmsc6lx5mg60n8aakmi3f6ppl1gw094vfcsni96jl34fk";
           name = "ibuffer-projectile";
         };
         packageRequires = [ projectile ];
         meta = {
-          homepage = "http://melpa.org/#/ibuffer-projectile";
+          homepage = "https://melpa.org/#/ibuffer-projectile";
           license = lib.licenses.free;
         };
       }) {};
@@ -13312,13 +14027,13 @@
           sha256 = "0bqdi5w120256g74k0j4jj81x804x1gcg4dxa74w3mb6fl5xlvs8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ibuffer-vc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ibuffer-vc";
           sha256 = "0bn5qyiq07cgzci10xl57ss5wsk7bfhi3hjq2v6yvpy9v704dvla";
           name = "ibuffer-vc";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/ibuffer-vc";
+          homepage = "https://melpa.org/#/ibuffer-vc";
           license = lib.licenses.free;
         };
       }) {};
@@ -13333,13 +14048,13 @@
           sha256 = "047gzycr49cs8wlmm9j4ry7b7jxmfhmbayx6rbbxs49lba8dgwlk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/identica-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/identica-mode";
           sha256 = "1r69ylykjap305g23cry4wajiqhpgw08nw3b5d9i1y3mwx0j253q";
           name = "identica-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/identica-mode";
+          homepage = "https://melpa.org/#/identica-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -13354,13 +14069,13 @@
           sha256 = "0x4w1ksrw7dicl84zpf4d4scg672dyan9g95jkn6zvri0lr8xciv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/idle-highlight-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/idle-highlight-mode";
           sha256 = "1i5ky61bq0dpk71yasfpjhsrv29mmp9nly9f5xxin7gz3x0f36fc";
           name = "idle-highlight-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/idle-highlight-mode";
+          homepage = "https://melpa.org/#/idle-highlight-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -13375,13 +14090,13 @@
           sha256 = "1ffmsmi31jc0gqnbdxrd8ipsy790bn6hgq3rmayylavmdpg3qfd5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-complete-space-or-hyphen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-complete-space-or-hyphen";
           sha256 = "1wk0cq5gjnprmpyvhh80ksz3fash42hckvmx8m95crbzjg9j0gbc";
           name = "ido-complete-space-or-hyphen";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ido-complete-space-or-hyphen";
+          homepage = "https://melpa.org/#/ido-complete-space-or-hyphen";
           license = lib.licenses.free;
         };
       }) {};
@@ -13396,13 +14111,13 @@
           sha256 = "1ddy590xgv982zsgs1civqy0ch0a88z98qhq0bqqjivf9gq3v0pf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-completing-read+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-completing-read+";
           sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh";
           name = "ido-completing-read-plus";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ido-completing-read+";
+          homepage = "https://melpa.org/#/ido-completing-read+";
           license = lib.licenses.free;
         };
       }) {};
@@ -13417,13 +14132,13 @@
           sha256 = "0055dda1la7yah33xsi19j4hcdmqp17ily2dvkipm4y6d3ww8yqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-describe-bindings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-describe-bindings";
           sha256 = "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2";
           name = "ido-describe-bindings";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/ido-describe-bindings";
+          homepage = "https://melpa.org/#/ido-describe-bindings";
           license = lib.licenses.free;
         };
       }) {};
@@ -13438,13 +14153,13 @@
           sha256 = "0f1p6cnl0arcc2y1h99nqcflp7byvyf6hj6fmv5xqggs66qc72lb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-grid-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-grid-mode";
           sha256 = "1wl1yclcxmkbfnvp0il23csdf6gprzf7fkcknpivk784fhl19acr";
           name = "ido-grid-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ido-grid-mode";
+          homepage = "https://melpa.org/#/ido-grid-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -13459,13 +14174,13 @@
           sha256 = "1z7az7h90v72llxvdclcywvf1qd0nhkfa45bp99xi7cy7sqsqssf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-load-library";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-load-library";
           sha256 = "13f83gqh39p3yjy7r7qc7kzgdcmqh4b5c07zl7rwzb8y9rz59lhj";
           name = "ido-load-library";
         };
         packageRequires = [ pcache persistent-soft ];
         meta = {
-          homepage = "http://melpa.org/#/ido-load-library";
+          homepage = "https://melpa.org/#/ido-load-library";
           license = lib.licenses.free;
         };
       }) {};
@@ -13480,13 +14195,13 @@
           sha256 = "0j12li001yq08vzwh1b25qyq09llizrkgaay9k07g9pvfxlx6zb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-occur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-occur";
           sha256 = "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji";
           name = "ido-occur";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/ido-occur";
+          homepage = "https://melpa.org/#/ido-occur";
           license = lib.licenses.free;
         };
       }) {};
@@ -13501,13 +14216,13 @@
           sha256 = "1ddy590xgv982zsgs1civqy0ch0a88z98qhq0bqqjivf9gq3v0pf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-ubiquitous";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-ubiquitous";
           sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp";
           name = "ido-ubiquitous";
         };
         packageRequires = [ cl-lib emacs ido-completing-read-plus ];
         meta = {
-          homepage = "http://melpa.org/#/ido-ubiquitous";
+          homepage = "https://melpa.org/#/ido-ubiquitous";
           license = lib.licenses.free;
         };
       }) {};
@@ -13522,13 +14237,13 @@
           sha256 = "1lv82q639xjnmvby56nwqn23ijh6f163bk675s33dkingm8csj8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-vertical-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-vertical-mode";
           sha256 = "1vg5s6nd6v2g8ychz1q9cdqvsdw6vag7d9w68sn7blpmlr0nqhfm";
           name = "ido-vertical-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ido-vertical-mode";
+          homepage = "https://melpa.org/#/ido-vertical-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -13543,13 +14258,13 @@
           sha256 = "046ns1nqisz830f6xwlly1qgmi4v2ikw6vmj0f93jprv4vkjylpq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-yes-or-no";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ido-yes-or-no";
           sha256 = "0glag4yb9xyf1lxxbdhph2nq6s1vg44i6f2z1ii8bkxpambz2ana";
           name = "ido-yes-or-no";
         };
         packageRequires = [ ido-completing-read-plus ];
         meta = {
-          homepage = "http://melpa.org/#/ido-yes-or-no";
+          homepage = "https://melpa.org/#/ido-yes-or-no";
           license = lib.licenses.free;
         };
       }) {};
@@ -13564,13 +14279,13 @@
           sha256 = "0bq0kx0889rdy8aasxbpmb0a4awpk2b24zv6x1dmhacmc5rj11i0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/idomenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/idomenu";
           sha256 = "0mg601ak9mhp2fg5n13npcfzphgyms4vkqd18ldmv098z2z1412h";
           name = "idomenu";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/idomenu";
+          homepage = "https://melpa.org/#/idomenu";
           license = lib.licenses.free;
         };
       }) {};
@@ -13585,13 +14300,13 @@
           sha256 = "0iwgbaq2797k1f7ql86i2pjfa67cha4s2v0mgmrd0qcgqkxsdq92";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/idris-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/idris-mode";
           sha256 = "0hiiizz976hz3z3ciwg1gs9y10qhxbs8givhz89kvyn4s4861a1s";
           name = "idris-mode";
         };
         packageRequires = [ cl-lib emacs prop-menu ];
         meta = {
-          homepage = "http://melpa.org/#/idris-mode";
+          homepage = "https://melpa.org/#/idris-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -13606,13 +14321,13 @@
           sha256 = "06qv95bgcb6n3zcjs2i1q80v9040z7m9pb9xbhxmqzcx68vpbpdm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/iedit";
           sha256 = "02gjshvkcvyr58yf6vlg3s2pzls5sd54xpxggdmqajfg8xmpkq04";
           name = "iedit";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/iedit";
+          homepage = "https://melpa.org/#/iedit";
           license = lib.licenses.free;
         };
       }) {};
@@ -13627,34 +14342,34 @@
           sha256 = "18rlyjsn9w0zbs0c002s84qzark3rrcmjn9vq4nap7i6zpaq8hki";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iflipb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/iflipb";
           sha256 = "1nfrrxgi9nlhn477z8ay7jxycpcghhhmmg9dagdhrlrr20fx697d";
           name = "iflipb";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/iflipb";
+          homepage = "https://melpa.org/#/iflipb";
           license = lib.licenses.free;
         };
       }) {};
     ignoramus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ignoramus";
-        version = "0.7.0";
+        version = "0.7.4";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "ignoramus";
-          rev = "37536286eb1da6d7bb9590e039485c456fdfd245";
-          sha256 = "1j40ldvgd7nr7pabi8mhzdvi0ml9n62m8mfjlh9nrbnkcsifs9rk";
+          rev = "00385fcd0d42de3a470f61c1fdbe7e19fbef9c5b";
+          sha256 = "1ca2n6vv2z7c3550w0jzwmp6xp0rmrrbljr1ik2ijign62r35a3q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ignoramus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ignoramus";
           sha256 = "1czqdmlrds1l5afi8ldg7nrxcwav86538z2w1npad3dz8xk67da9";
           name = "ignoramus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ignoramus";
+          homepage = "https://melpa.org/#/ignoramus";
           license = lib.licenses.free;
         };
       }) {};
@@ -13669,13 +14384,13 @@
           sha256 = "0imvxzcja91cd19zm2frqfpxm8j0bc89w9s7q0pkpvyjz44kjbq8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/image-archive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/image-archive";
           sha256 = "0x0lv5dr1gc9bnr3dn26bc9s1ccq2rp8c4a1licbi929f0jyxxfp";
           name = "image-archive";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/image-archive";
+          homepage = "https://melpa.org/#/image-archive";
           license = lib.licenses.free;
         };
       }) {};
@@ -13690,13 +14405,13 @@
           sha256 = "1n2ya9s0ld257a8iryjd0dz0z2zs1xhzfiwsdkq4l4azwxl54m29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/image-dired+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/image-dired+";
           sha256 = "0hhwqfn490n7p12n7ij4xbjh15gfvicmn21fvwbnrmfqc343pcdy";
           name = "image-dired-plus";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/image-dired+";
+          homepage = "https://melpa.org/#/image-dired+";
           license = lib.licenses.free;
         };
       }) {};
@@ -13711,13 +14426,34 @@
           sha256 = "0k69xbih0273xvmj035vcmm67l6hgjb99pb1jbva5x0pnszb1vdv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/image+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/image+";
           sha256 = "1a9dxswnqn6cvx28180kclpjc0vc6fimzp7n91gpdwnmy123x6hg";
           name = "image-plus";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/image+";
+          homepage = "https://melpa.org/#/image+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "imapfilter";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "imapfilter";
+          rev = "f3aca4c07178c56080e4c85875f78321e94a9649";
+          sha256 = "15lflvpapm5749qq7jzdwbd0isb89i6df3np4wn9y9gjl7y92wk7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/imapfilter";
+          sha256 = "0i893kqj6yzadhza800r6ri7fihl01r57z8yrzzh3d09qaias5vz";
+          name = "imapfilter";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/imapfilter";
           license = lib.licenses.free;
         };
       }) {};
@@ -13726,19 +14462,19 @@
         pname = "imenu-anywhere";
         version = "0.9.0";
         src = fetchFromGitHub {
-          owner = "vitoshka";
+          owner = "vspinu";
           repo = "imenu-anywhere";
           rev = "a090132492a3a98b6547240babe0bc0fa6154bb2";
           sha256 = "0qc96p5f7paxaxzv73w072cba8jb6ibdbhml7n7cm85b0rz1wf16";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/imenu-anywhere";
-          sha256 = "0p93g7ay9n4nhf1qk24mbax0w9sr06xd2kjmrz00gbg75sr9r2s8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/imenu-anywhere";
+          sha256 = "1ylqzdnd3nzcpyyd6rh6i5q9mvf8c99rvpk51fzfm3yq2kyw4dbq";
           name = "imenu-anywhere";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/imenu-anywhere";
+          homepage = "https://melpa.org/#/imenu-anywhere";
           license = lib.licenses.free;
         };
       }) {};
@@ -13753,34 +14489,34 @@
           sha256 = "1j0p0zkk89lg5xk5qzdnj9nxxiaxhff2y9iv9lw456kvb3lsyvjk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/imenu-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/imenu-list";
           sha256 = "092fsn7hnbfabcyakbqyk20pk62sr8xrs45aimkv1l91681np98s";
           name = "imenu-list";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/imenu-list";
+          homepage = "https://melpa.org/#/imenu-list";
           license = lib.licenses.free;
         };
       }) {};
     imenus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "imenus";
-        version = "0.1";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "imenus.el";
-          rev = "7409021864a4e74a237a00d1e1d2597dc80ef7f0";
-          sha256 = "18nx5z2vn0ikv4gxjprsqr63pcgf9s02gc3f769h8dji560kqxd4";
+          rev = "ee1bbd2228dbb86df2865dc9004d375421b171ba";
+          sha256 = "1y57xp0w0c6hg3gn4f1l3612a18li4gwhfa4dy18fy94gr54ycpx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/imenus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/imenus";
           sha256 = "1q0j6r2n5vjlbgchkz9zdglmmbpd8agawzcg61knqrgzpc4lk82r";
           name = "imenus";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/imenus";
+          homepage = "https://melpa.org/#/imenus";
           license = lib.licenses.free;
         };
       }) {};
@@ -13795,13 +14531,13 @@
           sha256 = "19jqcbiwqknlpij9q63m1p69k4zb3v1qdx0858drprc2rl1p55cd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/imgix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/imgix";
           sha256 = "0dh7qsz5c9mflldcw60vc8mrxrw76n2ydd7blv6jfmsnr19ila4q";
           name = "imgix";
         };
         packageRequires = [ cl-lib dash ht json s ];
         meta = {
-          homepage = "http://melpa.org/#/imgix";
+          homepage = "https://melpa.org/#/imgix";
           license = lib.licenses.free;
         };
       }) {};
@@ -13816,34 +14552,34 @@
           sha256 = "1pf7pqh8yzyvh4gzvp5npfq8kcfjcbzra0kkw7zmz769xxc8v84x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/immutant-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/immutant-server";
           sha256 = "15vcxag1ni41ja4b3q0444sq5ysrisis59la7li6h3617wy8r02i";
           name = "immutant-server";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/immutant-server";
+          homepage = "https://melpa.org/#/immutant-server";
           license = lib.licenses.free;
         };
       }) {};
     import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "import-js";
-        version = "0.4.1";
+        version = "0.6.0";
         src = fetchFromGitHub {
           owner = "trotzig";
           repo = "import-js";
-          rev = "732cd36da156398c1ee3b5f08e5c3c3d020f24f8";
-          sha256 = "00gpyz63lqb2ydvjxjagf2cpja8gw6xbyw82cdj64k53mn86cyvl";
+          rev = "560519eb2a2a3c295c2b839c753ec410769d04ab";
+          sha256 = "14sq387cq76p3dhbglg87qxaagfmavw98221d30siyz31w6fsbd2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/import-js";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/import-js";
           sha256 = "1grvzy378qj14wlbmhb3j7fx2zkl9wp65b5g0brjimav08nz7bls";
           name = "import-js";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/import-js";
+          homepage = "https://melpa.org/#/import-js";
           license = lib.licenses.free;
         };
       }) {};
@@ -13858,13 +14594,13 @@
           sha256 = "0ycsdwwfb27g85aby4jix1aj41a4vq6bf541iwla0xh3wsyxb01w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/import-popwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/import-popwin";
           sha256 = "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy";
           name = "import-popwin";
         };
         packageRequires = [ cl-lib popwin ];
         meta = {
-          homepage = "http://melpa.org/#/import-popwin";
+          homepage = "https://melpa.org/#/import-popwin";
           license = lib.licenses.free;
         };
       }) {};
@@ -13879,13 +14615,13 @@
           sha256 = "1dmr1arqy2vs9jdjha513mvw3yfwgkn4zs728q83asjy91sfcz7k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inf-clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/inf-clojure";
           sha256 = "0n8w0vx1dnbfz88j45a57z9bsmkxr2zyh6ld72ady8asanf17zhl";
           name = "inf-clojure";
         };
         packageRequires = [ clojure-mode emacs ];
         meta = {
-          homepage = "http://melpa.org/#/inf-clojure";
+          homepage = "https://melpa.org/#/inf-clojure";
           license = lib.licenses.free;
         };
       }) {};
@@ -13900,13 +14636,13 @@
           sha256 = "11zsprv5ycnfqi358dd4cx70dbn6a8hccd4prf28lln7vhldbmjz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/inf-ruby";
           sha256 = "02f01vwzr6j9iqcdns4l579bhia99sw8hwdqfwqjs9gk3xampfpp";
           name = "inf-ruby";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/inf-ruby";
+          homepage = "https://melpa.org/#/inf-ruby";
           license = lib.licenses.free;
         };
       }) {};
@@ -13921,13 +14657,13 @@
           sha256 = "1fm69g4mrmdchvxr062bk7n1jvs2rrscddb02cldb5bgdrcw8g6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inflections";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/inflections";
           sha256 = "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70";
           name = "inflections";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/inflections";
+          homepage = "https://melpa.org/#/inflections";
           license = lib.licenses.free;
         };
       }) {};
@@ -13942,13 +14678,13 @@
           sha256 = "031vb7ndz68x0119v4pyizz0ykd341ywcp5s7i4z35zx1vcqj8az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/init-loader";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/init-loader";
           sha256 = "0rq7759abp0ml0l8dycvdl0j5wsxw9z5y9pyx68973a4ssbx2i0r";
           name = "init-loader";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/init-loader";
+          homepage = "https://melpa.org/#/init-loader";
           license = lib.licenses.free;
         };
       }) {};
@@ -13963,13 +14699,13 @@
           sha256 = "06w1vnfhjy8g62z6xajin5akgh30pa0kk56am61kv6mi5ia8fc96";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/init-open-recentf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/init-open-recentf";
           sha256 = "0xlmfxhxb2car8vfx7krxmxb3d56x0r3zzkj8ds7yqvr65z85x2r";
           name = "init-open-recentf";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/init-open-recentf";
+          homepage = "https://melpa.org/#/init-open-recentf";
           license = lib.licenses.free;
         };
       }) {};
@@ -13984,13 +14720,13 @@
           sha256 = "1rfw38a63bvzglqx7mb8wlnzjvlmkhkn35hn66snqqgvnmnvi54g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/initsplit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/initsplit";
           sha256 = "0n9dk3x62vgxfn39jkmdg8wxsik0xqkprifgvqzyvn8xcx1blyyq";
           name = "initsplit";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/initsplit";
+          homepage = "https://melpa.org/#/initsplit";
           license = lib.licenses.free;
         };
       }) {};
@@ -14005,13 +14741,13 @@
           sha256 = "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inline-crypt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/inline-crypt";
           sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n";
           name = "inline-crypt";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/inline-crypt";
+          homepage = "https://melpa.org/#/inline-crypt";
           license = lib.licenses.free;
         };
       }) {};
@@ -14026,13 +14762,13 @@
           sha256 = "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inlineR";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/inlineR";
           sha256 = "1fflq2gkpfn3jkv4a6yywzmxsq6qszfid1ri85ass1ppw6scdvzw";
           name = "inlineR";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/inlineR";
+          homepage = "https://melpa.org/#/inlineR";
           license = lib.licenses.free;
         };
       }) {};
@@ -14047,13 +14783,13 @@
           sha256 = "1mqnz40zirnyn3wa71wzzjph3a0sbgvzcywcr7xnzqpl6sp7g93f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/insert-shebang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/insert-shebang";
           sha256 = "0z88l1q925v9lwzr6nas9qjy0f57qxilg6smgpx9wj6lll3f7p5v";
           name = "insert-shebang";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/insert-shebang";
+          homepage = "https://melpa.org/#/insert-shebang";
           license = lib.licenses.free;
         };
       }) {};
@@ -14067,13 +14803,13 @@
           sha256 = "0krscid3yz2b7kv75gd9fs92zgfl7pnl77dbp5gycv5rmw5mivp8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/instapaper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/instapaper";
           sha256 = "1yibdpj3lx6vr33s75s1y415lxqljrk7pqc901f8nfa01kca7axn";
           name = "instapaper";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/instapaper";
+          homepage = "https://melpa.org/#/instapaper";
           license = lib.licenses.free;
         };
       }) {};
@@ -14088,13 +14824,13 @@
           sha256 = "1qs6j9cz152wfy54c5d1a558l0df6wxv3djlvfl2mx58wf0sk73h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/interleave";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/interleave";
           sha256 = "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy";
           name = "interleave";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/interleave";
+          homepage = "https://melpa.org/#/interleave";
           license = lib.licenses.free;
         };
       }) {};
@@ -14109,13 +14845,13 @@
           sha256 = "043dnij48zdyg081sa7y64lm35z7zvrv8gcymv3l3a98r1yhy3v6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iplayer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/iplayer";
           sha256 = "0wnxvdlnvlmspqsaqx0ldw8j03qjckkqzvx3cbpc2yfs55pm3p7r";
           name = "iplayer";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/iplayer";
+          homepage = "https://melpa.org/#/iplayer";
           license = lib.licenses.free;
         };
       }) {};
@@ -14130,34 +14866,34 @@
           sha256 = "036q933yw7pimnnq43ydaqqfccgf4iwvjhjmsavp7l6y1w16rvmy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ir-black-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ir-black-theme";
           sha256 = "1qpq9zbv63ywzk5mlr8x53g3rn37k0mdv6x1l1hcd90gka7vga9v";
           name = "ir-black-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ir-black-theme";
+          homepage = "https://melpa.org/#/ir-black-theme";
           license = lib.licenses.free;
         };
       }) {};
-    irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "irony";
-        version = "0.1.2";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "9f0b33a5369806ba9c2f62238f64d6455a67af9e";
-          sha256 = "1wsh72dzm54srxdnlhnmbi8llc30syhbckycj5wmsamw8b89p7c2";
+          rev = "3d64dec24b01bc582801db537ed12a5812f4f0ee";
+          sha256 = "1y72xhs978ah53fmp10pa8riscx94y9bjvr26wk2f3zc94c6cq3d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/irony";
           sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a";
           name = "irony";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib json ];
         meta = {
-          homepage = "http://melpa.org/#/irony";
+          homepage = "https://melpa.org/#/irony";
           license = lib.licenses.free;
         };
       }) {};
@@ -14172,13 +14908,34 @@
           sha256 = "09hx28lmldm7z3x22a0qx34id09fdp3z61pdr61flgny213q1ach";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/isgd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/isgd";
           sha256 = "0yc9mkjzj3w64f48flnjvd193mk9gndrrqbxz3cvmvq3vgahhzyi";
           name = "isgd";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/isgd";
+          homepage = "https://melpa.org/#/isgd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ivy";
+        version = "0.8.0";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "swiper";
+          rev = "c24a3728538dd7d11de9f141b3ad1d8e0996c330";
+          sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ivy";
+          sha256 = "1w6dh05k1m1b1m3qy1mhfrl9rck0h1x6kh2b2llidwbv346wp17g";
+          name = "ivy";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy";
           license = lib.licenses.free;
         };
       }) {};
@@ -14193,13 +14950,34 @@
           sha256 = "0rpxh1jv98dl9b5ldjkljk70z4hkl61kcmvy1lhpj3lxn8ysv87a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ix";
           sha256 = "1fl76dk8vgw3mrh5iz99lrsllwya6ij9d1lj3szcrs4qnj0b5ql3";
           name = "ix";
         };
         packageRequires = [ grapnel ];
         meta = {
-          homepage = "http://melpa.org/#/ix";
+          homepage = "https://melpa.org/#/ix";
+          license = lib.licenses.free;
+        };
+      }) {};
+    iy-go-to-char = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "iy-go-to-char";
+        version = "3.2.1";
+        src = fetchFromGitHub {
+          owner = "doitian";
+          repo = "iy-go-to-char";
+          rev = "77b40d64eef9dad11eca59f4e3fbc6e849de7434";
+          sha256 = "1mb0k4lmbkbpn6qzzg8n14pybhd5zla77ppqac6a9kw89fj2qj4i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/iy-go-to-char";
+          sha256 = "10szn9y7gl8947p3f9w6p6vzjf1a9cjif9mbj3qdqx4vbsl9mqpz";
+          name = "iy-go-to-char";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/iy-go-to-char";
           license = lib.licenses.free;
         };
       }) {};
@@ -14214,13 +14992,13 @@
           sha256 = "07kbicf760nw4qlb2lkf1ns8yzqy0r5jqqwqjbsnqxx4sm52hml9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/j-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/j-mode";
           sha256 = "0f9lsr9hjhdvmzx565ivlncfzb4iq4rjjn6a41053cjy50bl066i";
           name = "j-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/j-mode";
+          homepage = "https://melpa.org/#/j-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -14230,16 +15008,16 @@
         src = fetchgit {
           url = "git://git.code.sf.net/p/emacs-jabber/git";
           rev = "2999f58619dd9c20cc6cac8060c4c850a504cbbd";
-          sha256 = "af89d7052e555c7b5efb0c21387a50699056659fb83698691b70e75c88e4cd34";
+          sha256 = "0d6dwj45rrvh3dlrhdmqkxjmd439a1x3h88czdg7np2m5q2xg2dg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jabber";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jabber";
           sha256 = "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8";
           name = "jabber";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jabber";
+          homepage = "https://melpa.org/#/jabber";
           license = lib.licenses.free;
         };
       }) {};
@@ -14254,13 +15032,13 @@
           sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jade-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jade-mode";
           sha256 = "156j0d9wx6hrhph0nsjsi1jha4h65rcbrbff1j2yr8vdsszjrs94";
           name = "jade-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jade-mode";
+          homepage = "https://melpa.org/#/jade-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -14275,13 +15053,13 @@
           sha256 = "0x0vz7m9kn7b2aiqvrdqx8qh84ynbpzy2asz2b18l47bcwa7r5bh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jammer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jammer";
           sha256 = "01c4bii7gswhp6z9dgx4bhvsywiwbbdv7mg1zj6vp1530l74zx6z";
           name = "jammer";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jammer";
+          homepage = "https://melpa.org/#/jammer";
           license = lib.licenses.free;
         };
       }) {};
@@ -14296,13 +15074,13 @@
           sha256 = "08gkxxaw789g1r0dql11skz6i8bdrrz4wp87fzs9f5rgx99xxr6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/japanlaw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/japanlaw";
           sha256 = "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa";
           name = "japanlaw";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/japanlaw";
+          homepage = "https://melpa.org/#/japanlaw";
           license = lib.licenses.free;
         };
       }) {};
@@ -14317,13 +15095,13 @@
           sha256 = "1bngn6v6w60qb3zz7s3px7v3wk99a3hfvzrg9l06dz1q7xgyvsi1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/java-imports";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/java-imports";
           sha256 = "1waz6skyrm1n8wpc0pwa652l11wz8qz1m89mqxk27k3lwyd84n98";
           name = "java-imports";
         };
         packageRequires = [ emacs pcache s ];
         meta = {
-          homepage = "http://melpa.org/#/java-imports";
+          homepage = "https://melpa.org/#/java-imports";
           license = lib.licenses.free;
         };
       }) {};
@@ -14338,13 +15116,13 @@
           sha256 = "16gywcma1s8kslwznlxwlx0xj0gs5g31637kb74vfdplk48f04zj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/javadoc-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/javadoc-lookup";
           sha256 = "1fffs0iqkk9rg5vbxifvn09j4i2751p81bzcvy5fslr3r1r2nv79";
           name = "javadoc-lookup";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/javadoc-lookup";
+          homepage = "https://melpa.org/#/javadoc-lookup";
           license = lib.licenses.free;
         };
       }) {};
@@ -14359,13 +15137,13 @@
           sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jedi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jedi";
           sha256 = "1777060q25k9n2g6h1lm5lkki900pmjqkxq72mrk3j19jr4pk9m4";
           name = "jedi";
         };
         packageRequires = [ auto-complete emacs jedi-core ];
         meta = {
-          homepage = "http://melpa.org/#/jedi";
+          homepage = "https://melpa.org/#/jedi";
           license = lib.licenses.free;
         };
       }) {};
@@ -14380,13 +15158,13 @@
           sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jedi-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jedi-core";
           sha256 = "0pzi32zdb4g9n4kvpmkdflmqypa7nckmnjq60a3ngym4wlzbb32f";
           name = "jedi-core";
         };
         packageRequires = [ cl-lib emacs epc python-environment ];
         meta = {
-          homepage = "http://melpa.org/#/jedi-core";
+          homepage = "https://melpa.org/#/jedi-core";
           license = lib.licenses.free;
         };
       }) {};
@@ -14401,13 +15179,13 @@
           sha256 = "0ws0297v6sairvsk665wrfzymfi599g5ljshfnpmi81qnnnbwjgf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jq-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jq-mode";
           sha256 = "1xvh641pdkvbppb2nzwn1ljdk7sv6laq29kdv09kxaqd89vm0vin";
           name = "jq-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/jq-mode";
+          homepage = "https://melpa.org/#/jq-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -14422,13 +15200,13 @@
           sha256 = "1f1zad423q5adycbbh62094m622gl8ncwbr8vxad1a6zcga70cgi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js-comint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/js-comint";
           sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1";
           name = "js-comint";
         };
         packageRequires = [ nvm ];
         meta = {
-          homepage = "http://melpa.org/#/js-comint";
+          homepage = "https://melpa.org/#/js-comint";
           license = lib.licenses.free;
         };
       }) {};
@@ -14443,13 +15221,13 @@
           sha256 = "0d2hqlgm09rw0azha5dxmq63b56sa8b9qj7gd7invibl6nnyjh4a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js2-closure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/js2-closure";
           sha256 = "19732bf98lk2ah2ssgkr1ngxx7rz3nhsiw84lsfmydb0vvm4fpk7";
           name = "js2-closure";
         };
         packageRequires = [ js2-mode ];
         meta = {
-          homepage = "http://melpa.org/#/js2-closure";
+          homepage = "https://melpa.org/#/js2-closure";
           license = lib.licenses.free;
         };
       }) {};
@@ -14464,13 +15242,13 @@
           sha256 = "0r2szaxr3q0gvxqd9asn03q8jf3nclxv4mqdsjn96s98n45x388l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js2-highlight-vars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/js2-highlight-vars";
           sha256 = "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475";
           name = "js2-highlight-vars";
         };
         packageRequires = [ js2-mode ];
         meta = {
-          homepage = "http://melpa.org/#/js2-highlight-vars";
+          homepage = "https://melpa.org/#/js2-highlight-vars";
           license = lib.licenses.free;
         };
       }) {};
@@ -14485,13 +15263,13 @@
           sha256 = "0xj87grvg7pbhh4d239gaqai5gl72klhpp9yksaqn77qnm98q4fn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js2-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/js2-mode";
           sha256 = "0f9cj3n55qnlifxwk1yp8n1kfd319jf7qysnkk28xpvglzw24yjv";
           name = "js2-mode";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/js2-mode";
+          homepage = "https://melpa.org/#/js2-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -14506,13 +15284,13 @@
           sha256 = "08wxsz90x5zhma3q8kqfd01avhzxjmcrjc95s757l5xaynsc2bly";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js2-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/js2-refactor";
           sha256 = "09dcfwpxxyw0ffgjjjaaxbsj0x2nwfrmxy1a05h8ba3r3jl4kl1r";
           name = "js2-refactor";
         };
         packageRequires = [ dash js2-mode multiple-cursors s yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/js2-refactor";
+          homepage = "https://melpa.org/#/js2-refactor";
           license = lib.licenses.free;
         };
       }) {};
@@ -14527,13 +15305,13 @@
           sha256 = "17d0nf1kz7mgv5qz57q6khy4w5vrmsliqirggahk9s6nnsx1j56n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js3-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/js3-mode";
           sha256 = "12s5qf6zfcv4m5kqxvh9b4zgwf433x39a210d957gjjp5mywbb1r";
           name = "js3-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/js3-mode";
+          homepage = "https://melpa.org/#/js3-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -14548,13 +15326,13 @@
           sha256 = "0pjmslxwmlb9cb3j5qfsyxq1lg1ywzw1p9dvj330c2m7nla1j70x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jsfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jsfmt";
           sha256 = "1syy32sv2d57b3gja0ly65h36mfnyq6hzf5lnnl3r58yvbdzngqd";
           name = "jsfmt";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jsfmt";
+          homepage = "https://melpa.org/#/jsfmt";
           license = lib.licenses.free;
         };
       }) {};
@@ -14569,13 +15347,13 @@
           sha256 = "0sxkp9m68rvff8dbr8jlsx85w5ngifn19lwhcydysm7grbwzrdi3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/json-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/json-mode";
           sha256 = "014j10wgxsqy6d6aksnkz2dr5cmpsi8c7v4a825si1vgb4622a70";
           name = "json-mode";
         };
         packageRequires = [ json-reformat json-snatcher ];
         meta = {
-          homepage = "http://melpa.org/#/json-mode";
+          homepage = "https://melpa.org/#/json-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -14590,13 +15368,13 @@
           sha256 = "0qp4n2k6s69jj4gwwimkpadjv245y54wk3bxb1x96f034gkp81vs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/json-reformat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/json-reformat";
           sha256 = "1m5p895w9qdgb8f67xykhzriribgmp20a1lvj64iap4aam6wp8na";
           name = "json-reformat";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/json-reformat";
+          homepage = "https://melpa.org/#/json-reformat";
           license = lib.licenses.free;
         };
       }) {};
@@ -14611,13 +15389,13 @@
           sha256 = "05zsgnk7grgw9jzwl80h5sxfpifxlr37b4mkbvx7mjq4z14xc2jw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/json-snatcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/json-snatcher";
           sha256 = "0f6j9g3c5fz3wlqa88706cbzinrs3dnfpgsr2d3h3117gic4iwp4";
           name = "json-snatcher";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/json-snatcher";
+          homepage = "https://melpa.org/#/json-snatcher";
           license = lib.licenses.free;
         };
       }) {};
@@ -14632,34 +15410,13 @@
           sha256 = "1wx28rr5dk238yz07xn95v88qmv10c1gz9pcxard2kszpnmrn6dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jsx-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jsx-mode";
           sha256 = "1lnjnyn8qf3biqr92z443z6b58dly7glksp1g986vgqzdprq3n1b";
           name = "jsx-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jsx-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
-    julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "julia-mode";
-        version = "0.4.3";
-        src = fetchFromGitHub {
-          owner = "JuliaLang";
-          repo = "julia";
-          rev = "a2f713dea5ac6320d8dcf2835ac4a37ea751af05";
-          sha256 = "0kvk1qiy2cj0iw2c0mx0dyr3jjvhyj1gwym6l43n7clp5kqcij1z";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/julia-mode";
-          sha256 = "0c5bdgh98hw7484s2is84af7hznd8c4z5vlzfd98s8qxi7bldqjm";
-          name = "julia-mode";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "http://melpa.org/#/julia-mode";
+          homepage = "https://melpa.org/#/jsx-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -14674,13 +15431,13 @@
           sha256 = "1fm69g4mrmdchvxr062bk7n1jvs2rrscddb02cldb5bgdrcw8g6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jump";
           sha256 = "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364";
           name = "jump";
         };
         packageRequires = [ findr inflections ];
         meta = {
-          homepage = "http://melpa.org/#/jump";
+          homepage = "https://melpa.org/#/jump";
           license = lib.licenses.free;
         };
       }) {};
@@ -14695,13 +15452,13 @@
           sha256 = "1s9plmg323m1p625xqnks0yqz0zlsjacdj7pv8f783r0d9jmfq3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jump-to-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jump-to-line";
           sha256 = "09ifhsggl5mrb6l8nqnl38yph0v26v30y98ic8hl23i455hqkkdr";
           name = "jump-to-line";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/jump-to-line";
+          homepage = "https://melpa.org/#/jump-to-line";
           license = lib.licenses.free;
         };
       }) {};
@@ -14716,13 +15473,13 @@
           sha256 = "1785nsv61m51lpykai2wxrv6zmwbm5654v937fgw177p37054s83";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jvm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/jvm-mode";
           sha256 = "1r283b4s0pzq4hgwcz5cnhlvdvq4gy0x51g3vp0762s8qx969a5w";
           name = "jvm-mode";
         };
         packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/jvm-mode";
+          homepage = "https://melpa.org/#/jvm-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -14737,13 +15494,13 @@
           sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kaesar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kaesar";
           sha256 = "0zhi1dv1ay1azh7afq4x6bdg91clwpsr13nrzy7539yrn9sglj5l";
           name = "kaesar";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/kaesar";
+          homepage = "https://melpa.org/#/kaesar";
           license = lib.licenses.free;
         };
       }) {};
@@ -14758,13 +15515,13 @@
           sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kaesar-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kaesar-file";
           sha256 = "0dcizg82maad98mbqqw5lamwz7n2lpai09jsrc66x3wy8k784alc";
           name = "kaesar-file";
         };
         packageRequires = [ kaesar ];
         meta = {
-          homepage = "http://melpa.org/#/kaesar-file";
+          homepage = "https://melpa.org/#/kaesar-file";
           license = lib.licenses.free;
         };
       }) {};
@@ -14779,13 +15536,13 @@
           sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kaesar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kaesar-mode";
           sha256 = "0yqnlchbpmhsqc8j531n08vybwa32cy0v9sy4f9fgxa90rfqczry";
           name = "kaesar-mode";
         };
         packageRequires = [ cl-lib kaesar ];
         meta = {
-          homepage = "http://melpa.org/#/kaesar-mode";
+          homepage = "https://melpa.org/#/kaesar-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -14800,13 +15557,13 @@
           sha256 = "0b6af8hnrn0v4z1xpahjfpw5iga2bmgd3qwfn3is2rygsn5rkm40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kakapo-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kakapo-mode";
           sha256 = "0a99cqflpzasl4wcmmf99aj8xgywkym37j7mvnsajrsk5wawdlss";
           name = "kakapo-mode";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/kakapo-mode";
+          homepage = "https://melpa.org/#/kakapo-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -14821,13 +15578,13 @@
           sha256 = "0avcg307r4navvgj3hjkggk4gr7mzs4mljhxh223r8g69l9bm6m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/karma";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/karma";
           sha256 = "19wl7js7wmw7jv2q3l4r5zl718lhy2a0jhl79k57ihwhxdc58fwc";
           name = "karma";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/karma";
+          homepage = "https://melpa.org/#/karma";
           license = lib.licenses.free;
         };
       }) {};
@@ -14842,13 +15599,13 @@
           sha256 = "14ijniyvcfmj4y77yhiplsclincng2r3jbdnmmdnwzliv65f7l6q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/key-combo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/key-combo";
           sha256 = "1v8saw92jphvjkyy7j9jx7cxzgisl4zpf4wjzdjfw3la5lz11waf";
           name = "key-combo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/key-combo";
+          homepage = "https://melpa.org/#/key-combo";
           license = lib.licenses.free;
         };
       }) {};
@@ -14863,34 +15620,34 @@
           sha256 = "05vpydcgiaya35b62cdjxna9y02vnwzzg6p8jh0dkr9k44h4iy3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/key-seq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/key-seq";
           sha256 = "166k6hl9vvsnnksvhrv5cbhv9bdiclnbfv7qf67q4c1an9xzqi74";
           name = "key-seq";
         };
         packageRequires = [ key-chord ];
         meta = {
-          homepage = "http://melpa.org/#/key-seq";
+          homepage = "https://melpa.org/#/key-seq";
           license = lib.licenses.free;
         };
       }) {};
     keychain-environment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "keychain-environment";
-        version = "2.2.0";
+        version = "2.3.0";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "keychain-environment";
-          rev = "40eba65a3d5581473d6a30f3a7abf73e5832b8c8";
-          sha256 = "07h6s1wdc83cqf08vqm4gh2r7bihbar4a31wr0140fn4rbhicwdw";
+          rev = "1ca091f72ad1d1a7620552289ae43484d853e968";
+          sha256 = "0xgm80dbg45bs3k8psd3pv49z1xbvzm156xs55gmxdzbgxbzpazr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/keychain-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/keychain-environment";
           sha256 = "1w77cg00bwx68h0d6k6r1fzwdwz97q12ch2hmpzjnblqs0i4sv8v";
           name = "keychain-environment";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/keychain-environment";
+          homepage = "https://melpa.org/#/keychain-environment";
           license = lib.licenses.free;
         };
       }) {};
@@ -14905,13 +15662,13 @@
           sha256 = "0dkc51bmix4b8czs2wg6vz8vk32qlll1b9fjmx6xshrxm85cyhvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/keydef";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/keydef";
           sha256 = "0yb2vgj7abyg8j7qmv74nsanv50lf350q1m58rjv8wm31yykg992";
           name = "keydef";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/keydef";
+          homepage = "https://melpa.org/#/keydef";
           license = lib.licenses.free;
         };
       }) {};
@@ -14926,34 +15683,34 @@
           sha256 = "0ways4ksb9pk2kkpgclsxgc0ycfwcr8vghlbv5ic4y0c4ycmlb2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/keyfreq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/keyfreq";
           sha256 = "1rw6hzmw7h5ngvndy7aa41pq911y2hr9kqc9w4gdd5v2p4ln1qh7";
           name = "keyfreq";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/keyfreq";
+          homepage = "https://melpa.org/#/keyfreq";
           license = lib.licenses.free;
         };
       }) {};
     keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "keymap-utils";
-        version = "0.5.2";
+        version = "0.6.0";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "keymap-utils";
-          rev = "dd396093899a3792ef88742657e799339fd8aed5";
-          sha256 = "06ajkqxv71hcrwc707ybzwfw4yzbsp6basnbs493ryr41gnvmnzs";
+          rev = "dbb5ec9fa28ff3c0fbb9efcc9f75329a5aca3798";
+          sha256 = "1c4qqfq7c1d31v9ap7fgq019l5vds7jzqq9c2dp4gj7j00d9vvlx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/keymap-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/keymap-utils";
           sha256 = "0nbcwz4nls0pva79lbx91bpzkl38g98yavwkvg2rxbhn9vjbhzs9";
           name = "keymap-utils";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/keymap-utils";
+          homepage = "https://melpa.org/#/keymap-utils";
           license = lib.licenses.free;
         };
       }) {};
@@ -14968,13 +15725,13 @@
           sha256 = "0z6sgz8nywsd00zaayafwy5hfi7kzxfifjkfr5cn1l7wlypyksfv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/keyset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/keyset";
           sha256 = "1kfw0pfb6qm2ji1v0kb8xgz8q2yd2k9kxmaz5vxcdixdlax3xiqg";
           name = "keyset";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
-          homepage = "http://melpa.org/#/keyset";
+          homepage = "https://melpa.org/#/keyset";
           license = lib.licenses.free;
         };
       }) {};
@@ -14989,13 +15746,13 @@
           sha256 = "0ky167xh1hrmqsldybzjhyqjizgjzs1grn5mf8sm2j9qwcvjw2zv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kibit-helper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kibit-helper";
           sha256 = "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s";
           name = "kibit-helper";
         };
         packageRequires = [ emacs s ];
         meta = {
-          homepage = "http://melpa.org/#/kibit-helper";
+          homepage = "https://melpa.org/#/kibit-helper";
           license = lib.licenses.free;
         };
       }) {};
@@ -15010,13 +15767,13 @@
           sha256 = "1c5al7cyfnb0p5ya2aa5afadzbrrc079jx3r6zpkr64psskrhdv5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kill-or-bury-alive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kill-or-bury-alive";
           sha256 = "0mm0m8hpy5v98cap4f0s38dcviirm7s6ra4l94mknyvnx0f73lz8";
           name = "kill-or-bury-alive";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/kill-or-bury-alive";
+          homepage = "https://melpa.org/#/kill-or-bury-alive";
           license = lib.licenses.free;
         };
       }) {};
@@ -15031,13 +15788,13 @@
           sha256 = "0axvhikhg4fikiz4ifg0p4a5ygphbpjs0wd0gcbx29n0y54d1i93";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kill-ring-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kill-ring-search";
           sha256 = "1pg4j1rrji64rrdv2xpwz33vlyk8r0hz4j4fikzwpbcbmni3skan";
           name = "kill-ring-search";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/kill-ring-search";
+          homepage = "https://melpa.org/#/kill-ring-search";
           license = lib.licenses.free;
         };
       }) {};
@@ -15052,13 +15809,13 @@
           sha256 = "0imylcaiwpzvvb3g8kpsna1vk7v7bwdjfcsa98i41m1rv9yla86l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/killer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/killer";
           sha256 = "10z4vqwrpss7mk0gq8xdsbsl0qibpp7s1g0l8wlmrsgn6kjkr2ma";
           name = "killer";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/killer";
+          homepage = "https://melpa.org/#/killer";
           license = lib.licenses.free;
         };
       }) {};
@@ -15073,13 +15830,13 @@
           sha256 = "0rzzjzkzgpiadm9awkj7wrh2hg97lhgwxg74gvdis3fc1xg2hyri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kivy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kivy-mode";
           sha256 = "02l230rwivr7rbiqm4vg70458z35f9v9w3mdapcrqd5d07y5mvi1";
           name = "kivy-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/kivy-mode";
+          homepage = "https://melpa.org/#/kivy-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -15094,13 +15851,13 @@
           sha256 = "1lppggnii2r9fvlhh33gbdrwb50za8lnalavlq9s86ngndn4n94k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/know-your-http-well";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/know-your-http-well";
           sha256 = "0k2x0ajxkivim8nfpli716y7f4ssrmvwi56r94y34x4j3ib3px3q";
           name = "know-your-http-well";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/know-your-http-well";
+          homepage = "https://melpa.org/#/know-your-http-well";
           license = lib.licenses.free;
         };
       }) {};
@@ -15115,13 +15872,13 @@
           sha256 = "0da4y9pf6vq0i6w7bmvrszg9bji3ylhr44hmyrmxvah28pigb2fz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kurecolor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/kurecolor";
           sha256 = "0q0q0dfv376h7j3sgwxqwfpxy1qjbvb6i5clsxz9xp4ly89w4d4f";
           name = "kurecolor";
         };
         packageRequires = [ emacs s ];
         meta = {
-          homepage = "http://melpa.org/#/kurecolor";
+          homepage = "https://melpa.org/#/kurecolor";
           license = lib.licenses.free;
         };
       }) {};
@@ -15136,34 +15893,34 @@
           sha256 = "1i8wbhc6i88plpq48ccka0avdj2x5rcxm81j93dmwp70ld0zws8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/langtool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/langtool";
           sha256 = "1xq70jyhzg0qmvialy015crbdk9rdibhwpl36khab9hi2999wxyw";
           name = "langtool";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/langtool";
+          homepage = "https://melpa.org/#/langtool";
           license = lib.licenses.free;
         };
       }) {};
     latex-extra = callPackage ({ auctex, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "latex-extra";
-        version = "1.11";
+        version = "1.13";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "latex-extra";
-          rev = "455b7873de095cbce6aa256f33cf64dba3dbaa29";
-          sha256 = "1rr6cgx70avqf1b19la7g8cav926676a76cflkkw18c1bsw83ss3";
+          rev = "d5b759fa61da968c3ca998ba0d2ef4a73647e5fd";
+          sha256 = "07aavdr1dlw8hca27l8a0i8cs5ga1wqqdf1v1iyvjz61vygld77a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/latex-extra";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/latex-extra";
           sha256 = "1w98ngxymafigjpfalybhs12jcf4916wk4nlxflfjcx8ryd9wjcj";
           name = "latex-extra";
         };
         packageRequires = [ auctex cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/latex-extra";
+          homepage = "https://melpa.org/#/latex-extra";
           license = lib.licenses.free;
         };
       }) {};
@@ -15178,34 +15935,34 @@
           sha256 = "118xrgrnwsmsysmframf6bmb0gkrdrm3jbkgivzxs41cw92fhbzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/latex-math-preview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/latex-math-preview";
           sha256 = "14bn0q5czrrkb1vjdkwx6f2x4zwjkxgrc0bcncv23l13qls1gkmr";
           name = "latex-math-preview";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/latex-math-preview";
+          homepage = "https://melpa.org/#/latex-math-preview";
           license = lib.licenses.free;
         };
       }) {};
     latex-unicode-math-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "latex-unicode-math-mode";
-        version = "0.2.3";
+        version = "0.2.5";
         src = fetchFromGitHub {
           owner = "Christoph-D";
           repo = "latex-unicode-math-mode";
-          rev = "71da85b55870aa870be722ced9d1f7df54b17f97";
-          sha256 = "165qhh6cfrr24yg0qvpq4vk64a70z30nchkbbhhwg4f6ib7v5f5h";
+          rev = "79edf60793eb6928a5b4831268bf09694fd092ec";
+          sha256 = "10i4r81pm95990d4yrabzdm49gp47mqpv15h4r4sih10p1kbn83h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/latex-unicode-math-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/latex-unicode-math-mode";
           sha256 = "1p9gpp28vylibv1s95bzfgscznw146ybgk6f3qdbbnafrcrmifcr";
           name = "latex-unicode-math-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/latex-unicode-math-mode";
+          homepage = "https://melpa.org/#/latex-unicode-math-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -15216,17 +15973,17 @@
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger";
-          rev = "b7f84d69001f75a18807772dee514f5918e3a926";
-          sha256 = "0vm32jv36s6kprmqbij5rpjg9djj3qsla4gpbpm8nycfg73bgylw";
+          rev = "b08c03f05e2cfe7c4071a51075e83221edb24c33";
+          sha256 = "0g0lz66lclr8fjlv6rr86l3sx3ib6s78ryvzffc3yy7pwz4xl0gx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ledger-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ledger-mode";
           sha256 = "0hi9waxmw1bbg88brlr3816vhdi0jj05wcwvrvfc1agvrvzyqq8s";
           name = "ledger-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ledger-mode";
+          homepage = "https://melpa.org/#/ledger-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -15241,13 +15998,13 @@
           sha256 = "04h6vk7w25yp4kzkwqnsmc59bm0182qqkyk5nxm3a1lv1v1590lf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lentic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lentic";
           sha256 = "0y94y1qwj23kqp491b1fzqsrjak96k1dmmzmakbl7q8vc9bncl5m";
           name = "lentic";
         };
         packageRequires = [ dash emacs f m-buffer s ];
         meta = {
-          homepage = "http://melpa.org/#/lentic";
+          homepage = "https://melpa.org/#/lentic";
           license = lib.licenses.free;
         };
       }) {};
@@ -15262,13 +16019,13 @@
           sha256 = "1w6mbk4gc63sh2p9rsy851x2kid0dp2ja4ai5badkr5prxkcpfdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/less-css-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/less-css-mode";
           sha256 = "188iplnwwhawq3dby3388kimy0jh1k9r8v9nxz52hy9rhh9hykf8";
           name = "less-css-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/less-css-mode";
+          homepage = "https://melpa.org/#/less-css-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -15283,34 +16040,34 @@
           sha256 = "1l9qjmyb4a3f6i2iimpmjczbx890cd1p24n941s13sg67xfbm7hn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/letcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/letcheck";
           sha256 = "1sjwi1ldg6b1qvj9cvfwxq3qlkfas6pm8zasf43baljmnz38mxh2";
           name = "letcheck";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/letcheck";
+          homepage = "https://melpa.org/#/letcheck";
           license = lib.licenses.free;
         };
       }) {};
     lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lfe-mode";
-        version = "0.10.1";
+        version = "1.0.2";
         src = fetchFromGitHub {
           owner = "rvirding";
           repo = "lfe";
-          rev = "d7bc80da04aedd0a607f17d8d149eba363872b4b";
-          sha256 = "1w9n5v4g4w34gii6nk2aan4w230dmm0dhml4s9q1fzmvk1ngld6k";
+          rev = "cd96efc3d2a73ecff7f3e2ef3563b73b098e4844";
+          sha256 = "1n84vqxv4jqy5mnb1hbrqrhavq0y8c4mjsp0smg48bzi18350irl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lfe-mode";
-          sha256 = "06b382ncgk4zz3q8akyzfy55j86a53r97gf0l92qvlca7fbs8jjx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lfe-mode";
+          sha256 = "0smncyby53ipm8yqslz88sqjafk0x6r8d0qwk4wzk0pbgfyklhgs";
           name = "lfe-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lfe-mode";
+          homepage = "https://melpa.org/#/lfe-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -15325,13 +16082,13 @@
           sha256 = "0hi8s20vw4a5i5n5jlm5dzgsl1qpfyqbpskqszjls1xrrf3dd4zl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lice";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lice";
           sha256 = "1hv2hz3153x0gk7f2js18dbx5pyprfdf2pfxb658fj16vxpp7y6x";
           name = "lice";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lice";
+          homepage = "https://melpa.org/#/lice";
           license = lib.licenses.free;
         };
       }) {};
@@ -15346,13 +16103,13 @@
           sha256 = "11sw43z5b0vypmhi0yysf2bxjy8fqpzl61y503jb7nhcfywmfkys";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lingr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lingr";
           sha256 = "1445bxiirsxl9kgm0j86xc9d0pbaa5f07c1i66pw2vl40bvhrjff";
           name = "lingr";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lingr";
+          homepage = "https://melpa.org/#/lingr";
           license = lib.licenses.free;
         };
       }) {};
@@ -15367,13 +16124,13 @@
           sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/link";
           sha256 = "17jpsg3f2954b740vyj37ikygrg5gmp0bjhbid8bh8vbz7xx9zy8";
           name = "link";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/link";
+          homepage = "https://melpa.org/#/link";
           license = lib.licenses.free;
         };
       }) {};
@@ -15388,13 +16145,13 @@
           sha256 = "1v4fadxv7ym6lc09nd2xpz2k5vrikjv7annw99ii5cqrwhqa5838";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/link-hint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/link-hint";
           sha256 = "12fb2zm9jnh92fc2nzmzmwjlhi64rhakwbh9lsydx9svsvkgcs89";
           name = "link-hint";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/link-hint";
+          homepage = "https://melpa.org/#/link-hint";
           license = lib.licenses.free;
         };
       }) {};
@@ -15409,13 +16166,13 @@
           sha256 = "1m4g4b96cxs05pfln7kdi6gvrdbv76f8dk806py5lq0gq7da2csc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/linum-relative";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/linum-relative";
           sha256 = "0s1lc3lppazv0481dxknm6qrxhvkv0r9hw8xmdrpjc282l91whkj";
           name = "linum-relative";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/linum-relative";
+          homepage = "https://melpa.org/#/linum-relative";
           license = lib.licenses.free;
         };
       }) {};
@@ -15430,7 +16187,7 @@
           sha256 = "05iqhnhj61f30yk4ih63rimmyp134gyq18frc8qgrnwym64dsm6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lispy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lispy";
           sha256 = "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g";
           name = "lispy";
         };
@@ -15443,7 +16200,7 @@
           swiper
         ];
         meta = {
-          homepage = "http://melpa.org/#/lispy";
+          homepage = "https://melpa.org/#/lispy";
           license = lib.licenses.free;
         };
       }) {};
@@ -15458,13 +16215,13 @@
           sha256 = "0qyj04p63fdh3iasp5cna1z5fhibmfyl9lvwyh22ajzsfbr3nhnk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lispyscript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lispyscript-mode";
           sha256 = "02biai45l5xl2m9l1drphrlj6r01msmadhyg774ijdk1x4gm5nhr";
           name = "lispyscript-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lispyscript-mode";
+          homepage = "https://melpa.org/#/lispyscript-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -15479,13 +16236,13 @@
           sha256 = "197cqkiwxgamhfwbc8h492cmjll3fypkwzcphj26dfnr22v63kwq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/list-packages-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/list-packages-ext";
           sha256 = "15m4888fm5xv697y7jspghg1ra49fyrny4y2x7h8ivcbslvpglvk";
           name = "list-packages-ext";
         };
         packageRequires = [ ht persistent-soft s ];
         meta = {
-          homepage = "http://melpa.org/#/list-packages-ext";
+          homepage = "https://melpa.org/#/list-packages-ext";
           license = lib.licenses.free;
         };
       }) {};
@@ -15500,34 +16257,34 @@
           sha256 = "05nn4db8s8h4mn3fxhwsa111ayvlq1raf6bifh7jciyw7a2c3aww";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/list-unicode-display";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/list-unicode-display";
           sha256 = "01x9i5k5vhjscmkx0l6r27w1cdp9n6xk1pdjf98z3y88dnsmyfha";
           name = "list-unicode-display";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/list-unicode-display";
+          homepage = "https://melpa.org/#/list-unicode-display";
           license = lib.licenses.free;
         };
       }) {};
     list-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "list-utils";
-        version = "0.4.2";
+        version = "0.4.4";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "list-utils";
-          rev = "ecd6c91c71e37734af9ff4df003cb96b9d236a97";
-          sha256 = "0dmcmvf3dxmp1f71nq5xwsdrnyb04qr14ay4ckpaca2bmi7q0x5x";
+          rev = "acf18aca1131a90f8d673974673e3c5d8fdc6a86";
+          sha256 = "0ql159v7sxs33yh2l080kchrj52vk34knz50cvqi3ykpb7djg3sz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/list-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/list-utils";
           sha256 = "0bknprr4jb1d20i9lj2aa17vpg1kqwdyzzwmy1kfydnkpf5scnr3";
           name = "list-utils";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/list-utils";
+          homepage = "https://melpa.org/#/list-utils";
           license = lib.licenses.free;
         };
       }) {};
@@ -15542,13 +16299,13 @@
           sha256 = "0mr0king5dj20vdycpszxnfs9ch808fhcz3q7svxfngj3d3671wd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lit-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lit-mode";
           sha256 = "05rf7ki060nqnvircn0dkpdrg7xbh7phb8bqgsab89ycc7l9vv59";
           name = "lit-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lit-mode";
+          homepage = "https://melpa.org/#/lit-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -15563,13 +16320,13 @@
           sha256 = "1fh9wrw5irn0g3dy8gkk63csdcxgi3w2038mxx3sk6ki3r2bmhw8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/literate-coffee-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/literate-coffee-mode";
           sha256 = "1bll1y9q3kcg3v250asjvx2k9kb314qadaq1iwanwgdlp3qvvs40";
           name = "literate-coffee-mode";
         };
         packageRequires = [ coffee-mode ];
         meta = {
-          homepage = "http://melpa.org/#/literate-coffee-mode";
+          homepage = "https://melpa.org/#/literate-coffee-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -15584,34 +16341,55 @@
           sha256 = "1cwydbhhbs5v9y2s872zxc5lflqmfrdvnc8xz0qars52d7lg4br5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/live-code-talks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/live-code-talks";
           sha256 = "173mjmxanva13vk2f3a06s4dy62x271kynsa7pbhdg4fd72hdjma";
           name = "live-code-talks";
         };
         packageRequires = [ cl-lib emacs narrowed-page-navigation ];
         meta = {
-          homepage = "http://melpa.org/#/live-code-talks";
+          homepage = "https://melpa.org/#/live-code-talks";
           license = lib.licenses.free;
         };
       }) {};
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "2.9.0";
+        version = "2.10.1";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "d7e8f86e615186afb514c1fdeb6eb9e62babd10a";
-          sha256 = "0bkrs12b6zprkia9p41r5sd2n6y66bgxa6fmbz16v1gjpzzqdayq";
+          rev = "f040dab8f3f09c3cc68f5ffaa06df92b50422c8f";
+          sha256 = "03ickn42s7a4rxx6p596l13nsh1vgq2s3194bgd6gbm3i0f3mlhy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/live-py-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/live-py-mode";
           sha256 = "0yn1a0gf9yn068xifpv8p77d917mnalc56pll800zlpsdk8ljicq";
           name = "live-py-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/live-py-mode";
+          homepage = "https://melpa.org/#/live-py-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    load-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "load-relative";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "rocky";
+          repo = "emacs-load-relative";
+          rev = "15ffaa9ebf1b7bbfcc307d1716eec135253b3b8d";
+          sha256 = "1fq4bnngbh9a18hq8mvnqkzs74k3g4c0lmwsncbhy6n21njv3kdy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/load-relative";
+          sha256 = "0j8ybbjzhzgjx47pqqdbsqi8n6pzqcf6zqc38x7cf1kkklgc87ay";
+          name = "load-relative";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/load-relative";
           license = lib.licenses.free;
         };
       }) {};
@@ -15626,13 +16404,13 @@
           sha256 = "1089sbx20r30sis39vwy29fxhb2n3hh35rdv09lpzdxdq01s8wwp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/loc-changes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/loc-changes";
           sha256 = "1akgij61b2ixpkchrriabwvx68cg4v5r5w9ncjrjh91hskjprfxh";
           name = "loc-changes";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/loc-changes";
+          homepage = "https://melpa.org/#/loc-changes";
           license = lib.licenses.free;
         };
       }) {};
@@ -15647,34 +16425,13 @@
           sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/log4e";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/log4e";
           sha256 = "1klj59dv8k4r0hily489dp12ra5hq1jnsdc0wcakh6zirmakhs34";
           name = "log4e";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/log4e";
-          license = lib.licenses.free;
-        };
-      }) {};
-    log4j-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "log4j-mode";
-        version = "1.3";
-        src = fetchFromGitHub {
-          owner = "emacsorphanage";
-          repo = "log4j-mode";
-          rev = "ec3de92cfe60dd3d0de613e9062476196dea0faf";
-          sha256 = "14dmmjdmcc0zag8i947n59ihjc2df2l44f7issf66767ym3839kk";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/log4j-mode";
-          sha256 = "0axr0x8mdxif0xbvs83mxc3gqgs84jb4b9la9n62i3lldckghwmg";
-          name = "log4j-mode";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "http://melpa.org/#/log4j-mode";
+          homepage = "https://melpa.org/#/log4e";
           license = lib.licenses.free;
         };
       }) {};
@@ -15689,13 +16446,13 @@
           sha256 = "0g5vq9xy9lwczs77lr91c1srhhfmasnnnmjvgc55hbl6iwmbizbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/logalimacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/logalimacs";
           sha256 = "0ai7a01bdi3a0amgi63pwgdp8wgcgx10an4nhc627wgb1cqxb7p6";
           name = "logalimacs";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/logalimacs";
+          homepage = "https://melpa.org/#/logalimacs";
           license = lib.licenses.free;
         };
       }) {};
@@ -15710,13 +16467,13 @@
           sha256 = "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/logito";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/logito";
           sha256 = "0bk4qnz66kvhzsk88lw45209778y53kg17iih70ix4ma1x6a3v5l";
           name = "logito";
         };
         packageRequires = [ eieio ];
         meta = {
-          homepage = "http://melpa.org/#/logito";
+          homepage = "https://melpa.org/#/logito";
           license = lib.licenses.free;
         };
       }) {};
@@ -15731,13 +16488,13 @@
           sha256 = "1yacic778ranlqblrcdhyf5igbrcin8aj30vjdm4klpmqb73hf1s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/logview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/logview";
           sha256 = "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh";
           name = "logview";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/logview";
+          homepage = "https://melpa.org/#/logview";
           license = lib.licenses.free;
         };
       }) {};
@@ -15752,13 +16509,13 @@
           sha256 = "1rpvw0dvym559vb4nrfy74jq06nbsz2b0n60lcykagcir8mpcidk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/loop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/loop";
           sha256 = "0pav16kinzljmzx84vfz63fvi39af4628vk1jw79jk0pyg9rjbar";
           name = "loop";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/loop";
+          homepage = "https://melpa.org/#/loop";
           license = lib.licenses.free;
         };
       }) {};
@@ -15773,13 +16530,13 @@
           sha256 = "11y5jyq4xg9zlm1qi2y97nh05vhva9pai9yyr4x2pr41xz3s8fpk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/love-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/love-minor-mode";
           sha256 = "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m";
           name = "love-minor-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/love-minor-mode";
+          homepage = "https://melpa.org/#/love-minor-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -15794,13 +16551,13 @@
           sha256 = "1psk4202rmkkfy1ir1ax4x4djfngd5pfry7x30ybq2ifqzymb9qb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lua-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/lua-mode";
           sha256 = "0gyi7w2h192h3pmrhq39lxwlwd9qyqs303lnp2655pikdzk9js94";
           name = "lua-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/lua-mode";
+          homepage = "https://melpa.org/#/lua-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -15815,13 +16572,13 @@
           sha256 = "01847f8xmjfxvvi7hf73l7ypkdazwg8ciinm117zp4jkgnv0apz0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/m-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/m-buffer";
           sha256 = "0l2rayglv48pcwnr1ggmn8c0az0mffgv02ivnzr9jcfs55ki07fc";
           name = "m-buffer";
         };
         packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/m-buffer";
+          homepage = "https://melpa.org/#/m-buffer";
           license = lib.licenses.free;
         };
       }) {};
@@ -15836,34 +16593,34 @@
           sha256 = "0dgsl1x6r8m9vvff1ia0kmz21h0dji2jl5cqlpx1m947zh45dahj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/macro-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/macro-math";
           sha256 = "1r7splwq5kdrdhbmw5zn81vxymsrllgil48g8dl0r60293384h00";
           name = "macro-math";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/macro-math";
+          homepage = "https://melpa.org/#/macro-math";
           license = lib.licenses.free;
         };
       }) {};
-    macrostep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    macrostep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "macrostep";
-        version = "0.8";
+        version = "0.9";
         src = fetchFromGitHub {
           owner = "joddie";
           repo = "macrostep";
-          rev = "8950313a4e6e3e4bc1d9b0ce4ad4e3bf2f3eb73a";
-          sha256 = "0dkigxa39f3cmndxw79mgadwsj7w3bphns6l2hzhv6w0wdllpifp";
+          rev = "1e2593279f3722e31d8a8f07e297a5c546586cba";
+          sha256 = "0g9bnq4p3ffvva30hpll80dn3i41m51mcvw3qf787zg1nmc5a0j6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/macrostep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/macrostep";
           sha256 = "1wjibxbdsp5qfhq8xy0mcf3ms0q74qhdrhqndprn6jh3kcn5q63c";
           name = "macrostep";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/macrostep";
+          homepage = "https://melpa.org/#/macrostep";
           license = lib.licenses.free;
         };
       }) {};
@@ -15878,28 +16635,28 @@
           sha256 = "0i38942lr4b7d624313hgydyy0ynmd6psjkz8xcvbb7gw0kcc436";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magic-filetype";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magic-filetype";
           sha256 = "0gcys45cqn5ghppkn0rmyvfybprlfz1x6hqr21yv93mf79h75zhg";
           name = "magic-filetype";
         };
         packageRequires = [ emacs s ];
         meta = {
-          homepage = "http://melpa.org/#/magic-filetype";
+          homepage = "https://melpa.org/#/magic-filetype";
           license = lib.licenses.free;
         };
       }) {};
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "2.5.0";
+        version = "2.6.2";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "a3747edc8a4cddc408f7718a3371b46a4b610744";
-          sha256 = "0dydm0gj6jbybi5nkqrpi5bic5yxhz0p5k5gayqzqzmnb1fhl247";
+          rev = "2e6dcf8fe8672dca67e59a72975c2d850ce9bc16";
+          sha256 = "0qdahg3vqha391nnspbqa5bjvi2g3jb277c5wzbfs132m4n076j2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit";
           sha256 = "0518ax2y7y2ji4jp7yghy84yxm0zgb059aqfa4v17grm4kr8p16q";
           name = "magit";
         };
@@ -15912,7 +16669,7 @@
           with-editor
         ];
         meta = {
-          homepage = "http://melpa.org/#/magit";
+          homepage = "https://melpa.org/#/magit";
           license = lib.licenses.free;
         };
       }) {};
@@ -15927,13 +16684,13 @@
           sha256 = "0d7dick96g1vj6c9wh10rgwhwv5j3ixgw1m3z45szszswlrp1bih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-annex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-annex";
           sha256 = "1ri58s1ly416ksmb7mql6vnmx7hq59lmhi7qijknjarw7qs3bqys";
           name = "magit-annex";
         };
         packageRequires = [ cl-lib magit ];
         meta = {
-          homepage = "http://melpa.org/#/magit-annex";
+          homepage = "https://melpa.org/#/magit-annex";
           license = lib.licenses.free;
         };
       }) {};
@@ -15948,13 +16705,13 @@
           sha256 = "1vn6x53kpwv3zf2b5xjswyz6v853r8b9dg88qhwd2h480hrx6kal";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-filenotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-filenotify";
           sha256 = "00a77czdi24n3zkx6jwaj2asablzpxq16iqd8s84kkqxcfiiahn7";
           name = "magit-filenotify";
         };
         packageRequires = [ emacs magit ];
         meta = {
-          homepage = "http://melpa.org/#/magit-filenotify";
+          homepage = "https://melpa.org/#/magit-filenotify";
           license = lib.licenses.free;
         };
       }) {};
@@ -15963,19 +16720,19 @@
         pname = "magit-find-file";
         version = "2.1.0";
         src = fetchFromGitHub {
-          owner = "bradleywright";
+          owner = "bradwright";
           repo = "magit-find-file.el";
           rev = "035da838b1a19e7a5ee135b4ca8475f4e235b61e";
           sha256 = "1jlww053s580d7rlvmr1dl79wxasa0hhh2jnwb1ra353d6h3a73w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-find-file";
-          sha256 = "1d5flydyhwhvhlhi541zcnz2b03bi07zrp21bfz5sm069bf2c96b";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-find-file";
+          sha256 = "1y66nsq1hbv1sb4n71gdxv7p1rz37vd9lkf7zl7avy0dchs499ik";
           name = "magit-find-file";
         };
         packageRequires = [ dash magit ];
         meta = {
-          homepage = "http://melpa.org/#/magit-find-file";
+          homepage = "https://melpa.org/#/magit-find-file";
           license = lib.licenses.free;
         };
       }) {};
@@ -15990,13 +16747,13 @@
           sha256 = "0ym24gjd6c04zry08abcb09zvjbgj8nc1j12q0r51fhzzadxcxbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-gerrit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-gerrit";
           sha256 = "1iwvg10ly6dlf8llz9f8d4qfdbvd3s28wf48qgn1wjlxpka6zrd4";
           name = "magit-gerrit";
         };
         packageRequires = [ magit ];
         meta = {
-          homepage = "http://melpa.org/#/magit-gerrit";
+          homepage = "https://melpa.org/#/magit-gerrit";
           license = lib.licenses.free;
         };
       }) {};
@@ -16011,76 +16768,76 @@
           sha256 = "19iqa2kzarpa75xy34hqvpy1y7dzx84pj540wwkj04dnpb4fwj2z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-gh-pulls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-gh-pulls";
           sha256 = "0qn9vjxi33pya9s8v3g95scmhwrn2yf5pjm7d24frq766wigjv8d";
           name = "magit-gh-pulls";
         };
         packageRequires = [ emacs gh magit pcache s ];
         meta = {
-          homepage = "http://melpa.org/#/magit-gh-pulls";
+          homepage = "https://melpa.org/#/magit-gh-pulls";
           license = lib.licenses.free;
         };
       }) {};
     magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "magit-gitflow";
-        version = "2.0.1";
+        version = "2.0.2";
         src = fetchFromGitHub {
           owner = "jtatarik";
           repo = "magit-gitflow";
-          rev = "46dc3f20b6f6d5e91e9765da372c909e9cc7b355";
-          sha256 = "1ar9gdp4svymibr9arrlxil1xm1x41gxinlifdb8lgpmawb62d9w";
+          rev = "e65ac501b603f245737b0fb73e71520356924f3f";
+          sha256 = "0g9wqd4dbd0spal7ss9k679nak02hr1z0mgq6k4g5nkgngwn6l2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-gitflow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-gitflow";
           sha256 = "0wsqq3xpqqfak4aqwsh5sxjb1m62z3z0ysgdmnrch3qsh480r8vf";
           name = "magit-gitflow";
         };
         packageRequires = [ magit magit-popup ];
         meta = {
-          homepage = "http://melpa.org/#/magit-gitflow";
+          homepage = "https://melpa.org/#/magit-gitflow";
           license = lib.licenses.free;
         };
       }) {};
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "2.5.0";
+        version = "2.6.2";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "a3747edc8a4cddc408f7718a3371b46a4b610744";
-          sha256 = "0dydm0gj6jbybi5nkqrpi5bic5yxhz0p5k5gayqzqzmnb1fhl247";
+          rev = "2e6dcf8fe8672dca67e59a72975c2d850ce9bc16";
+          sha256 = "0qdahg3vqha391nnspbqa5bjvi2g3jb277c5wzbfs132m4n076j2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-popup";
           sha256 = "0w6m384bbmp3bd4qbss5h1jvcfp4qnpqvzlfykhdgjwpv2b2a2fj";
           name = "magit-popup";
         };
         packageRequires = [ async dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/magit-popup";
+          homepage = "https://melpa.org/#/magit-popup";
           license = lib.licenses.free;
         };
       }) {};
     magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-rockstar";
-        version = "1.0.0";
+        version = "1.0.2";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "magit-rockstar";
-          rev = "6d572b9371c366814b3b071aa6301e503a47fbdd";
-          sha256 = "1pqbrrp4366kwfk1d32h2lb70id32ynfc03i7m2832w97f1xp16c";
+          rev = "16b576c45d5ce1ffda80f0db5d779b9c548a5adb";
+          sha256 = "1wxk7h1v123h4m20fk5h70an17zzkfr437xyqjpcy085qqz679jr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-rockstar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-rockstar";
           sha256 = "1i4fmraiypyd3q6vvibkg9xqfxiq83kcz64b1dr3wmwn30j7986n";
           name = "magit-rockstar";
         };
         packageRequires = [ dash magit ];
         meta = {
-          homepage = "http://melpa.org/#/magit-rockstar";
+          homepage = "https://melpa.org/#/magit-rockstar";
           license = lib.licenses.free;
         };
       }) {};
@@ -16095,13 +16852,13 @@
           sha256 = "1mk8g8rr9vf8jm0mmsj33p8gc71nhlv3847hvqywy6z40nhcjnyb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-stgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-stgit";
           sha256 = "12wg1ig2jzy2np76brpwxdix9pwv75chviq3c24qyv4y80pd11sv";
           name = "magit-stgit";
         };
         packageRequires = [ emacs magit ];
         meta = {
-          homepage = "http://melpa.org/#/magit-stgit";
+          homepage = "https://melpa.org/#/magit-stgit";
           license = lib.licenses.free;
         };
       }) {};
@@ -16116,13 +16873,13 @@
           sha256 = "1g8zq0s38di96wlhljp370kyj4a0ir1z3vb94k66v2m5nj83ap68";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-svn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-svn";
           sha256 = "02n732z06f0bhxqkxzlvm36bpqr40pas09zbzpfdk4pb6f9f80s0";
           name = "magit-svn";
         };
         packageRequires = [ emacs magit ];
         meta = {
-          homepage = "http://melpa.org/#/magit-svn";
+          homepage = "https://melpa.org/#/magit-svn";
           license = lib.licenses.free;
         };
       }) {};
@@ -16137,13 +16894,13 @@
           sha256 = "0dj183vphnvz9k2amga0ydcb4gkjxr28qz67055mxrf89q1qjq33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-topgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/magit-topgit";
           sha256 = "1ngrgf40n1g6ncd5nqgr0zgxwlkmv9k4fik96dgzysgwincx683i";
           name = "magit-topgit";
         };
         packageRequires = [ emacs magit ];
         meta = {
-          homepage = "http://melpa.org/#/magit-topgit";
+          homepage = "https://melpa.org/#/magit-topgit";
           license = lib.licenses.free;
         };
       }) {};
@@ -16158,13 +16915,13 @@
           sha256 = "0fp5gbin1sgsdz39spk74vadkzig3ydwhpzx9vg7f231kk5f6wzx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/make-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/make-color";
           sha256 = "0mrv8b67lpid5m8rfbhcik76bvnjlw4xmcrd2c2iinyl02y07r5k";
           name = "make-color";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/make-color";
+          homepage = "https://melpa.org/#/make-color";
           license = lib.licenses.free;
         };
       }) {};
@@ -16179,13 +16936,13 @@
           sha256 = "1rr7vpm3xxzcaam3m8xni3ajy8ycyljix07n2jzczayri9sd8csy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/makey";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/makey";
           sha256 = "06xgrlkqvg288yd4lyhx4vi80jlfarhblxk5m5zzs5as7n08cvk4";
           name = "makey";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/makey";
+          homepage = "https://melpa.org/#/makey";
           license = lib.licenses.free;
         };
       }) {};
@@ -16200,13 +16957,13 @@
           sha256 = "0z0ml7l1a45ych61qfc5fvkybl9hh37pgl6lzkaz6mcif1sl8gn1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/malabar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/malabar-mode";
           sha256 = "026ing7v22rz1pfzs2j9z09pm6dajpys992n45gzhwirz5f0q1rk";
           name = "malabar-mode";
         };
         packageRequires = [ fringe-helper ];
         meta = {
-          homepage = "http://melpa.org/#/malabar-mode";
+          homepage = "https://melpa.org/#/malabar-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -16221,13 +16978,13 @@
           sha256 = "0hwxwwjzjxv2mmkxmalr2hp3x8apwcyvn2bz4d4yd4wrzcscay97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/malinka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/malinka";
           sha256 = "1245mpxsxwnnpdsf0pd28mddgdfhh7x32a2l3sxfq0dyg2xlgvrp";
           name = "malinka";
         };
         packageRequires = [ cl-lib dash f projectile rtags s ];
         meta = {
-          homepage = "http://melpa.org/#/malinka";
+          homepage = "https://melpa.org/#/malinka";
           license = lib.licenses.free;
         };
       }) {};
@@ -16242,13 +16999,13 @@
           sha256 = "1272fsjzsza9dxm8s64b7x2jzr3ks8wjpwvgcxha2dnsjzklcdcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mallard-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mallard-mode";
           sha256 = "0y2ikjgy107kb85pz50vv7ywslqgbrrkcfsrd8gsk1jky4qn8izd";
           name = "mallard-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mallard-mode";
+          homepage = "https://melpa.org/#/mallard-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -16263,13 +17020,13 @@
           sha256 = "1fkijm0gikbwmxa9hf7s1rcwb0ipzjygd1mlicsm78rxvdd8k877";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/map-progress";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/map-progress";
           sha256 = "0zc5vii72gbfwbb35w8m30c8r9zck971hwgcn1a4wjczgn4vkln7";
           name = "map-progress";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/map-progress";
+          homepage = "https://melpa.org/#/map-progress";
           license = lib.licenses.free;
         };
       }) {};
@@ -16284,13 +17041,13 @@
           sha256 = "0kk1sk3cr4dbmgq4wzml8kdf14dn9jbyq4bwmvk0i7dic9vwn21c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/map-regexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/map-regexp";
           sha256 = "0yiif0033lhaqggywzfizfia3siggwcz7yv4z7przhnr04akdmbj";
           name = "map-regexp";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/map-regexp";
+          homepage = "https://melpa.org/#/map-regexp";
           license = lib.licenses.free;
         };
       }) {};
@@ -16305,13 +17062,13 @@
           sha256 = "0y4b69r2l6kvh7g8f1y9v1pdall3n668ci24lp04lcms6rxcrsnh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/marcopolo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/marcopolo";
           sha256 = "1nbck1m7lhync7n474578d2g1zc72c841hi236xjbdd2lnxz3zz0";
           name = "marcopolo";
         };
         packageRequires = [ dash pkg-info request s ];
         meta = {
-          homepage = "http://melpa.org/#/marcopolo";
+          homepage = "https://melpa.org/#/marcopolo";
           license = lib.licenses.free;
         };
       }) {};
@@ -16326,13 +17083,13 @@
           sha256 = "0fcyspz7n97n84d9203mxgn8ar4rn52qa49s3vayfrbkn038j5qw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mark-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mark-tools";
           sha256 = "1688y7lnzhwdva2ildjabzi10i87klfsgvs947i7gfgxl7jwhisq";
           name = "mark-tools";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mark-tools";
+          homepage = "https://melpa.org/#/mark-tools";
           license = lib.licenses.free;
         };
       }) {};
@@ -16347,13 +17104,13 @@
           sha256 = "098lf4n4rpx00sm07sy8dwp683a4sb7x0p15mrfp268apir3kkxb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markdown-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/markdown-mode";
           sha256 = "0gfb3hp87kpcrvxax3m5hsaclwwk1qmxc73cg26smzd1kjfwgz14";
           name = "markdown-mode";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/markdown-mode";
+          homepage = "https://melpa.org/#/markdown-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -16368,13 +17125,13 @@
           sha256 = "1adl36fj506kgfw40gpagzsd7aypfdvy60141raggd5844i6y96r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markdown-mode+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/markdown-mode+";
           sha256 = "1535kcj9nmcgmk2448jxc0jmnqy7f50cw2ngffjq5w8bfhgf7q00";
           name = "markdown-mode-plus";
         };
         packageRequires = [ markdown-mode ];
         meta = {
-          homepage = "http://melpa.org/#/markdown-mode+";
+          homepage = "https://melpa.org/#/markdown-mode+";
           license = lib.licenses.free;
         };
       }) {};
@@ -16389,34 +17146,34 @@
           sha256 = "1yi5hsgf8hr7v1wyn3bw650g3ysbglwn5qfrmb6yl3s08lvi1vlf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markdown-preview-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/markdown-preview-mode";
           sha256 = "0i0mld45d8y96nkqn2r77nvbyw6wgsf8r54d3c2jrv04mnaxs7pg";
           name = "markdown-preview-mode";
         };
         packageRequires = [ cl-lib markdown-mode websocket ];
         meta = {
-          homepage = "http://melpa.org/#/markdown-preview-mode";
+          homepage = "https://melpa.org/#/markdown-preview-mode";
           license = lib.licenses.free;
         };
       }) {};
     markdown-toc = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, s }:
     melpaBuild {
         pname = "markdown-toc";
-        version = "0.0.9";
+        version = "0.1.0";
         src = fetchFromGitHub {
           owner = "ardumont";
           repo = "markdown-toc";
-          rev = "c2ac578113015ba7d3377c0756a4d00c61ba2e17";
-          sha256 = "0jgr327qlh7acwi6sld27xdsvr89parspk6wmfklwszvy1v13633";
+          rev = "c5d44470f8fb0f61bc96e58dec998010edcc0e95";
+          sha256 = "0l687bna8rrc49y1fyn1ldjcwh290qgvi3p86c63yj4xy24fmdm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markdown-toc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/markdown-toc";
           sha256 = "0slky735yzmbfi4ld264vw64b4a4nllhywp19ya0sljbsfycbihv";
           name = "markdown-toc";
         };
         packageRequires = [ dash markdown-mode s ];
         meta = {
-          homepage = "http://melpa.org/#/markdown-toc";
+          homepage = "https://melpa.org/#/markdown-toc";
           license = lib.licenses.free;
         };
       }) {};
@@ -16431,13 +17188,13 @@
           sha256 = "0nk2rm14ccwrh1aaxzm80rllsz8g38h9w52m0pf3nnwh6sa757nk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markup-faces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/markup-faces";
           sha256 = "12z92j9f0mpn7w2qkiwg54wh743q3inx56q3f8qcpfzyks546grq";
           name = "markup-faces";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/markup-faces";
+          homepage = "https://melpa.org/#/markup-faces";
           license = lib.licenses.free;
         };
       }) {};
@@ -16452,13 +17209,13 @@
           sha256 = "0pbli67wia8pximvgd68x6i9acdgsk51g9hjpqfm49rqg5nqalh9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/marmalade";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/marmalade";
           sha256 = "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s";
           name = "marmalade";
         };
         packageRequires = [ furl ];
         meta = {
-          homepage = "http://melpa.org/#/marmalade";
+          homepage = "https://melpa.org/#/marmalade";
           license = lib.licenses.free;
         };
       }) {};
@@ -16473,33 +17230,54 @@
           sha256 = "0sriyjjhgis7fgq276j5mw6n84jdwxf8lq0iqqiaqwmc66l985mv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/marshal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/marshal";
           sha256 = "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl";
           name = "marshal";
         };
         packageRequires = [ eieio json ];
         meta = {
-          homepage = "http://melpa.org/#/marshal";
+          homepage = "https://melpa.org/#/marshal";
+          license = lib.licenses.free;
+        };
+      }) {};
+    math-symbol-lists = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "math-symbol-lists";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "vspinu";
+          repo = "math-symbol-lists";
+          rev = "d11f74fef06d93637e28f32e16edfb5b0ccd064d";
+          sha256 = "127q9xp015j28gjcna988dnrkadznn0xw8sdfvi943nhhqy4yvri";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/math-symbol-lists";
+          sha256 = "01j11k29acj0b1pcapmgi2d2s3p50bkms21i2qcj0cbqgz8h6s27";
+          name = "math-symbol-lists";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/math-symbol-lists";
           license = lib.licenses.free;
         };
       }) {};
     matrix-client = callPackage ({ fetchgit, fetchurl, json ? null, lib, melpaBuild, request }:
     melpaBuild {
         pname = "matrix-client";
-        version = "0.3.0";
+        version = "1.0.0";
         src = fetchgit {
           url = "git://fort.kickass.systems/personal/rrix/pub/matrix.el";
-          rev = "421ad8ebf3858acc99634a4cca442c57ca2b3707";
-          sha256 = "34e1f7bd0c4ab21b2b0ca6d2a6ba83c9a1a5591e9de9ceb1c5f8fe06a4738acb";
+          rev = "087e5520a3a1f9a8fcaa1ce61b4c06bc55a63605";
+          sha256 = "0z79l8md683vvc51fz0nmbazb6i7hklkm0asglflr96pldil50l8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/matrix-client";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/matrix-client";
           sha256 = "09mgxk0xngw8j46vz6f5nwkb01iq96bf9m51w2q61wxivypnsyr6";
           name = "matrix-client";
         };
         packageRequires = [ json request ];
         meta = {
-          homepage = "http://melpa.org/#/matrix-client";
+          homepage = "https://melpa.org/#/matrix-client";
           license = lib.licenses.free;
         };
       }) {};
@@ -16514,13 +17292,13 @@
           sha256 = "0x92b1qrhyrdh0z0xriyjc12h0wpk16x4yawj5i828ca6mz0qh5g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/maven-test-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/maven-test-mode";
           sha256 = "1k9w51rh003p67yalzq1w8am40nnr2khyyb5y4bwxgpms8z391fm";
           name = "maven-test-mode";
         };
         packageRequires = [ emacs s ];
         meta = {
-          homepage = "http://melpa.org/#/maven-test-mode";
+          homepage = "https://melpa.org/#/maven-test-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -16535,34 +17313,34 @@
           sha256 = "08gbkd8wln89j9yxp0zzd539hbwy1db31gca3vxxrpszixx8280y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/maxframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/maxframe";
           sha256 = "10cwy3gi3xb3pfdh6xiafxp3vvssawci3y26jda6550d0w5vardj";
           name = "maxframe";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/maxframe";
+          homepage = "https://melpa.org/#/maxframe";
           license = lib.licenses.free;
         };
       }) {};
     mb-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mb-url";
-        version = "0.0.3";
+        version = "0.0.5";
         src = fetchFromGitHub {
           owner = "dochang";
           repo = "mb-url";
-          rev = "34234214d1e62b9980cc64dac582e6771c92638d";
-          sha256 = "1si2givpzihjb1szbcdm3iy9kkm7bj0hq10s0h2dfm8axdnlirm5";
+          rev = "0ffd1a67161ebbe10fa6ad8064343eead2f79eae";
+          sha256 = "1g90f8ysj35bw9686gb3sczxqg3ilj3a7xnfskrkbp2llpvd5y43";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mb-url";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mb-url";
           sha256 = "1nf8ssan00qsn3d4dc6h6qzdwqzh977qb5d2m33kiwi6qb98988h";
           name = "mb-url";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/mb-url";
+          homepage = "https://melpa.org/#/mb-url";
           license = lib.licenses.free;
         };
       }) {};
@@ -16577,13 +17355,13 @@
           sha256 = "00gwd2jf5ncgyay5w2jc2mhv18jf4ydnzpfkxaxw9zjbdxg4ym2i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mbe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mbe";
           sha256 = "0h18mbcjy8nh4gl12kg2v8x6ps320yk7sbgq5alqnx2shp80kri3";
           name = "mbe";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/mbe";
+          homepage = "https://melpa.org/#/mbe";
           license = lib.licenses.free;
         };
       }) {};
@@ -16598,13 +17376,13 @@
           sha256 = "0252wdq4sd6jhzfy0pn3gdm6aq2h13nnp8hvrn1mpml9x473a5n1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mc-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mc-extras";
           sha256 = "0b110x6ygc95v5pb9lk1i731x5s6dagl5afzv37l1qchys36xrym";
           name = "mc-extras";
         };
         packageRequires = [ multiple-cursors ];
         meta = {
-          homepage = "http://melpa.org/#/mc-extras";
+          homepage = "https://melpa.org/#/mc-extras";
           license = lib.licenses.free;
         };
       }) {};
@@ -16619,13 +17397,13 @@
           sha256 = "1vsla0a5x4kfyj3ca4r1v8cspp12dadi0frpailclaxfmpmpl5d3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mediawiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mediawiki";
           sha256 = "17cbrzfdp6jbbf74mn2fi1cwv7d1hvdbw9j84p43jzscnaa5ikx6";
           name = "mediawiki";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mediawiki";
+          homepage = "https://melpa.org/#/mediawiki";
           license = lib.licenses.free;
         };
       }) {};
@@ -16640,13 +17418,13 @@
           sha256 = "12cp56ppmwpdgf5afx7hd2qb8d1qq8z27191fbbf5zqw8cq5zkpd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/melpa-upstream-visit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/melpa-upstream-visit";
           sha256 = "0j4afy9ipzr7pwkij8ab207mabd7srganlyyif9h1hvclj9svdmf";
           name = "melpa-upstream-visit";
         };
         packageRequires = [ s ];
         meta = {
-          homepage = "http://melpa.org/#/melpa-upstream-visit";
+          homepage = "https://melpa.org/#/melpa-upstream-visit";
           license = lib.licenses.free;
         };
       }) {};
@@ -16661,13 +17439,13 @@
           sha256 = "1y4ra5z3ayw3w7dszzlkk3qz3nv2jg1vvx8cf0y5j1pqpx8vy3jf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mentor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mentor";
           sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s";
           name = "mentor";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mentor";
+          homepage = "https://melpa.org/#/mentor";
           license = lib.licenses.free;
         };
       }) {};
@@ -16678,38 +17456,38 @@
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
-          rev = "a532512e15b10d04ffd8281ac5406160f2764005";
-          sha256 = "1amb375dpy5al1ddh2ln9l1lw6xqfjigld6y5k7vvh730zild824";
+          rev = "708b083ac8081c5b07e8bfb6e179a0c6e7d171ac";
+          sha256 = "09yjgf3li4hgljcrwlg195wa6a8l7zm8ia1slbpsrjgwnc15wqrs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/merlin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/merlin";
           sha256 = "177cy9xcrjckxv8gvi1zhg2ndfr8cmsr37inyvpi5dxqy6d6alhp";
           name = "merlin";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/merlin";
+          homepage = "https://melpa.org/#/merlin";
           license = lib.licenses.free;
         };
       }) {};
     metafmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "metafmt";
-        version = "0.0.1";
+        version = "0.0.3";
         src = fetchFromGitHub {
           owner = "lvillani";
           repo = "metafmt";
-          rev = "19dc36b3d085bba6f8e59ddbb1cbb7e2c085c461";
-          sha256 = "0zxal6alf99a2zfzizckibp5iwdk9kklfhml2r0r3wfvswb0rb3z";
+          rev = "bd20fc67d0affd48c1199315b7da06a7182e7d76";
+          sha256 = "0n4nv1s25z70xfy3bl1wy467abz3agj4qmpx4rwdwzbarnqp9ps3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/metafmt";
-          sha256 = "0vx1xrjr10nd90cr6ppgd3kc3c8bhkg3m4clnb50zagkpfqsy9ma";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/metafmt";
+          sha256 = "1ca102al7r3k2g92b4jkqv53crnmxy3z7cz31w1rprf41s69mn75";
           name = "metafmt";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/metafmt";
+          homepage = "https://melpa.org/#/metafmt";
           license = lib.licenses.free;
         };
       }) {};
@@ -16719,18 +17497,18 @@
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "punchagan";
-          repo = "metaweblog.el";
+          repo = "metaweblog";
           rev = "c8b50a6edf0fd2f396570c9a1c2ef8cd207606fb";
           sha256 = "06mbdb4zb07skq1jpv05hr45k5x96d9hgkb358jiq0kfsqlrbbb4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/metaweblog";
-          sha256 = "11y5x3a8iv0hjj7ppi2sa7vawn7r475qfsh1jg415j4y4fzwpk6y";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/metaweblog";
+          sha256 = "10kwqnfafby4ap0572mfkkdssr13y9p2gl9z3nmxqjjy04fkfi8b";
           name = "metaweblog";
         };
         packageRequires = [ xml-rpc ];
         meta = {
-          homepage = "http://melpa.org/#/metaweblog";
+          homepage = "https://melpa.org/#/metaweblog";
           license = lib.licenses.free;
         };
       }) {};
@@ -16745,13 +17523,13 @@
           sha256 = "1dhws4a298zrm88cdn66sikdk06n0p60d32cxsgybakkhg5c5wgr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mew";
           sha256 = "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk";
           name = "mew";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mew";
+          homepage = "https://melpa.org/#/mew";
           license = lib.licenses.free;
         };
       }) {};
@@ -16766,13 +17544,34 @@
           sha256 = "1bp4xqklf422n0zwwyj0ag3a4nndg8klazrga6rlvpy01hgg3drl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mhc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mhc";
           sha256 = "02ikn9hx0kcfc2xrx4f38zpkfi6vgz7chcxk6q5d0vcsp93b4lql";
           name = "mhc";
         };
         packageRequires = [ calfw ];
         meta = {
-          homepage = "http://melpa.org/#/mhc";
+          homepage = "https://melpa.org/#/mhc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mic-paren = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mic-paren";
+        version = "3.10";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "mic-paren";
+          rev = "e4cf6e1a0ee91e849a9d42ecdcd6ed0287f8a521";
+          sha256 = "1cdjpqrsv2vhpdmv67krsds7wz19z9ajkabawr3yhxqii4myl4ik";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mic-paren";
+          sha256 = "042dzp0nal18nxq94qlwwksh0nnypsyc0yykmc6l3kayp9pv4hw7";
+          name = "mic-paren";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/mic-paren";
           license = lib.licenses.free;
         };
       }) {};
@@ -16787,13 +17586,13 @@
           sha256 = "1ckb5hymwj4wmsxakalsky4mkzn9vxhxr6416b2cr6r5jxj4xgsl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/migemo";
           sha256 = "0y49imdwygv5zd7cyh9ngda4gyb2mld2a4s7zh4yzlh7z5ha9qkr";
           name = "migemo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/migemo";
+          homepage = "https://melpa.org/#/migemo";
           license = lib.licenses.free;
         };
       }) {};
@@ -16808,13 +17607,13 @@
           sha256 = "1qg64mxsm2cswk52mlj7sx7k6gfnrsdwnf68i7cachri0i8aq4ap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/milkode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/milkode";
           sha256 = "07v6xgalx7vcw5sghckwvz584746cba05ql8flv8n556glm7hibh";
           name = "milkode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/milkode";
+          homepage = "https://melpa.org/#/milkode";
           license = lib.licenses.free;
         };
       }) {};
@@ -16829,13 +17628,13 @@
           sha256 = "1zyb6c3xwdzk7dpn7xi0mvbcjdfxvzz1a0zlbs053pfar8iim5fk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minibuffer-complete-cycle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/minibuffer-complete-cycle";
           sha256 = "0y1mxs6q9a8lzprrlb22qff6x5mvkw4gp2l6p2js2r0j9jzyffq2";
           name = "minibuffer-complete-cycle";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/minibuffer-complete-cycle";
+          homepage = "https://melpa.org/#/minibuffer-complete-cycle";
           license = lib.licenses.free;
         };
       }) {};
@@ -16850,13 +17649,13 @@
           sha256 = "07nbn2pwlp33kr136xsm6lzddhjs538xkz0fbays89psblmy4kwj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minibuffer-cua";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/minibuffer-cua";
           sha256 = "1ragvr73ykbvpgynnq3z0z4yzrlfhfqlwc1vbxclb8x2xmxq7pzw";
           name = "minibuffer-cua";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/minibuffer-cua";
+          homepage = "https://melpa.org/#/minibuffer-cua";
           license = lib.licenses.free;
         };
       }) {};
@@ -16871,13 +17670,13 @@
           sha256 = "1850z96gly0jnr50472idqz1drzqarr0n23bbasslrc501xkg0bq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/miniedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/miniedit";
           sha256 = "10s407q7igdi2hsaaahbw8vckalrl7z3s6l9cflf51q16xh2ih87";
           name = "miniedit";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/miniedit";
+          homepage = "https://melpa.org/#/miniedit";
           license = lib.licenses.free;
         };
       }) {};
@@ -16892,13 +17691,13 @@
           sha256 = "0kjhn48sf2ps3k5pv06gqmqc4hlk6di9ld3ssw6vwfh8313x1fc5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minimal-session-saver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/minimal-session-saver";
           sha256 = "1ay7wvriga28bdmarpfwagqzmmk93ri9f3idhr6z6iivwggwyy2i";
           name = "minimal-session-saver";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/minimal-session-saver";
+          homepage = "https://melpa.org/#/minimal-session-saver";
           license = lib.licenses.free;
         };
       }) {};
@@ -16913,13 +17712,13 @@
           sha256 = "0nd0jl5r5drnh98wdpqj2i7pgs7zvcizsh4qbvh8n0iw0c3f0pwh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minitest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/minitest";
           sha256 = "0x6nd4kkhiw8hh79r69861pf41j8p1y39kzf2rl61zlmyjz9zpmw";
           name = "minitest";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/minitest";
+          homepage = "https://melpa.org/#/minitest";
           license = lib.licenses.free;
         };
       }) {};
@@ -16933,13 +17732,13 @@
           sha256 = "0rpp748ym79sxccp9pyrwri14m7624zzb80srfgjfdpysrrs0jrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mmm-mako";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mmm-mako";
           sha256 = "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn";
           name = "mmm-mako";
         };
         packageRequires = [ mmm-mode ];
         meta = {
-          homepage = "http://melpa.org/#/mmm-mako";
+          homepage = "https://melpa.org/#/mmm-mako";
           license = lib.licenses.free;
         };
       }) {};
@@ -16954,13 +17753,13 @@
           sha256 = "097s4xnwfy8d1wzmz65g2f8bnjjjlj67w1yzwn4d3yasb171nbv8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mmm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mmm-mode";
           sha256 = "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw";
           name = "mmm-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mmm-mode";
+          homepage = "https://melpa.org/#/mmm-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -16975,34 +17774,34 @@
           sha256 = "05nmcx3f63ds31cj3qwwp03ksflkfwlcn3z2xyxbny83r0dxbgvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mmt";
           sha256 = "0hal3qcw6x9658xpdaw6q9l2rr2z107pvg5bdzshf67p1b3lf9dq";
           name = "mmt";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/mmt";
+          homepage = "https://melpa.org/#/mmt";
           license = lib.licenses.free;
         };
       }) {};
     mocha = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "mocha";
-        version = "1.0";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "scottaj";
           repo = "mocha.el";
-          rev = "ea042751717b920a61770b6a945999431badbc39";
-          sha256 = "1v915yy920yrwrrnw9bxggm1zvlm9ndjwv9ydln3r07b0a1mkka2";
+          rev = "4ca9495d4b00b753f055152bd4256c07d7b208f4";
+          sha256 = "0yj9kc59c227727kh1zjxwrhijzd7rdhix7qqm4na1z6s4ycpxbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mocha";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mocha";
           sha256 = "0kjgrl5iy7cd3b9csgpjg3y0wp0q6c7c8cvf0mx8gdbsj7296kyx";
           name = "mocha";
         };
         packageRequires = [ js2-mode ];
         meta = {
-          homepage = "http://melpa.org/#/mocha";
+          homepage = "https://melpa.org/#/mocha";
           license = lib.licenses.free;
         };
       }) {};
@@ -17017,13 +17816,13 @@
           sha256 = "1lav7am41v63xgavq8pr88y828jmd1cxd4prjq7jlbxm6nvrwxh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mocker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mocker";
           sha256 = "1g90jp1czrrzrmn7n4linby3q4fb4gcflzv2amjv0sdimw1ln1w3";
           name = "mocker";
         };
         packageRequires = [ eieio el-x ];
         meta = {
-          homepage = "http://melpa.org/#/mocker";
+          homepage = "https://melpa.org/#/mocker";
           license = lib.licenses.free;
         };
       }) {};
@@ -17038,33 +17837,34 @@
           sha256 = "0r24186d1q9436h3qhqz1z8q978d01an0dvpvzirf4x9ickrib3k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/modalka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/modalka";
           sha256 = "0bkjykvl6sw797h7j76dzn1viy598asly98gcl5wrq13n4w1md4c";
           name = "modalka";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/modalka";
+          homepage = "https://melpa.org/#/modalka";
           license = lib.licenses.free;
         };
       }) {};
-    mode-icons = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }:
+    mode-icons = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mode-icons";
-        version = "0.3.0";
-        src = fetchgit {
-          url = "git://ryuslash.org/mode-icons.git";
-          rev = "d2c9926a8e79e13ef9942fe96b8109add24a9978";
-          sha256 = "cb98bc1e199688337efd03bbd18a340514740257f9ede19089f01f5ad6e69b74";
+        version = "0.4.0";
+        src = fetchFromGitHub {
+          owner = "ryuslash";
+          repo = "mode-icons";
+          rev = "37581ed911e4469f773ddfb7b40a85592d323b76";
+          sha256 = "1ykj68d4h92i4qv90zgwrf9jhy1n22l2h9k5f1zsn8hvz9mhj1av";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mode-icons";
-          sha256 = "18w221zjrrsfcymprv5x75i3qv04zy4bxl9mqjv0ys7qcc8xf1dp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mode-icons";
+          sha256 = "1dqcry27rz7afyvjg7345wysp6wmh8fpj32ysk5iw5i7v5scf6kf";
           name = "mode-icons";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/mode-icons";
+          homepage = "https://melpa.org/#/mode-icons";
           license = lib.licenses.free;
         };
       }) {};
@@ -17079,13 +17879,13 @@
           sha256 = "1lkw9nnlns6v7r6nx915f85whq1ri4w8lccwyxrvam40hfvq60s1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mode-line-debug";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mode-line-debug";
           sha256 = "0ppj14bm3rx3xgg4mfxa5zcm2r129jgmsx817wq3h7akjngcbfkd";
           name = "mode-line-debug";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mode-line-debug";
+          homepage = "https://melpa.org/#/mode-line-debug";
           license = lib.licenses.free;
         };
       }) {};
@@ -17100,13 +17900,13 @@
           sha256 = "02w7k4s4698p4adjy4a36na28sb1s2zw4xsjs7p2hv9iiw9kmyvz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/monokai-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/monokai-theme";
           sha256 = "13mv4vgsmdbf3v748lqi7b42hvr3yp86n97rb6792bcgd3kbdx7a";
           name = "monokai-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/monokai-theme";
+          homepage = "https://melpa.org/#/monokai-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -17121,13 +17921,13 @@
           sha256 = "1a0pv8fkv1cjdb0k5bmjd67a273bzcmxjwzgy4jpb3ng1qbb2xnm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/monroe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/monroe";
           sha256 = "04rhninxppvilk7s90g0wwa0g9vfcg7mk8mrb2m2c7cb9vj6wyig";
           name = "monroe";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/monroe";
+          homepage = "https://melpa.org/#/monroe";
           license = lib.licenses.free;
         };
       }) {};
@@ -17142,13 +17942,13 @@
           sha256 = "1ndgw4799d816pkn2bwja5kmigydpmj9znn8cax4dxsd9fg2hzjy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/morlock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/morlock";
           sha256 = "0693jr1k8mzd7hwp52azkl62c1g1p5yinarjcmdksfyqblqq5jna";
           name = "morlock";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/morlock";
+          homepage = "https://melpa.org/#/morlock";
           license = lib.licenses.free;
         };
       }) {};
@@ -17163,13 +17963,13 @@
           sha256 = "01mdy7sps0xryz5gfpl083rv7ixkxs2rkz5yaqjlam2rypdcsyy2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/move-dup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/move-dup";
           sha256 = "0b0lmiisl9yckblwf7619if88qsmbka3bl4qiaqam7fka7psxs7f";
           name = "move-dup";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/move-dup";
+          homepage = "https://melpa.org/#/move-dup";
           license = lib.licenses.free;
         };
       }) {};
@@ -17184,13 +17984,13 @@
           sha256 = "1mg7arw4wbbm84frq3sws5937fh901qn0xnjk9jcp3pvc4d0sxwd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mowedline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mowedline";
           sha256 = "0c2hvvwa7s5iyz517jaskshdcq9zs15zr6xsvrcb3biahrh4bmfb";
           name = "mowedline";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mowedline";
+          homepage = "https://melpa.org/#/mowedline";
           license = lib.licenses.free;
         };
       }) {};
@@ -17205,13 +18005,13 @@
           sha256 = "13bf5jn1kgqg59j5czlzvajq2fw1rz4h5jqfc7x8w1a067nymf2c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/moz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/moz";
           sha256 = "0ar2xgsi7csjj6fgiamrjwjc58j942dm32j3f3lz21yn2c4pnyxi";
           name = "moz";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/moz";
+          homepage = "https://melpa.org/#/moz";
           license = lib.licenses.free;
         };
       }) {};
@@ -17226,13 +18026,34 @@
           sha256 = "1w1i1clkjg9mj1g4i2y3xw3hyj8s7h9gr04qgyb9c1q8vh11z8d0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/moz-controller";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/moz-controller";
           sha256 = "18gca1csl9dfi9995mky8cbgi3xzf1if8pzdjiz5404gzcqk0rfd";
           name = "moz-controller";
         };
         packageRequires = [ moz ];
         meta = {
-          homepage = "http://melpa.org/#/moz-controller";
+          homepage = "https://melpa.org/#/moz-controller";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mozc-temp = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mozc }:
+    melpaBuild {
+        pname = "mozc-temp";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "HKey";
+          repo = "mozc-temp";
+          rev = "7f5dd5fc8ceeca9b1822f7e056a4be67e2e74959";
+          sha256 = "1gdi2pz8450h11aknz3hbgjlx09w6c4l8d8sz0zv3pb1z8cqkgqv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mozc-temp";
+          sha256 = "0x1bsa1py0kn73hzbsb4ijl0bqng8nib191vgn6xq8f5cx55044d";
+          name = "mozc-temp";
+        };
+        packageRequires = [ dash emacs mozc ];
+        meta = {
+          homepage = "https://melpa.org/#/mozc-temp";
           license = lib.licenses.free;
         };
       }) {};
@@ -17247,13 +18068,13 @@
           sha256 = "1pjhch8vah0kf73fl2fk6khhrx1kflggd3zlxrf7w4fxr0qn8la3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mpv";
           sha256 = "1vq308ac6jj1h8qa2b2sypisb38hbvwjimqndhpfir06fghkw94l";
           name = "mpv";
         };
         packageRequires = [ cl-lib emacs json names org ];
         meta = {
-          homepage = "http://melpa.org/#/mpv";
+          homepage = "https://melpa.org/#/mpv";
           license = lib.licenses.free;
         };
       }) {};
@@ -17268,13 +18089,13 @@
           sha256 = "1draiwbwb8zfi6rdr5irv8091xv2pmnifq7pzi3rrvjb8swb28z3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/msvc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/msvc";
           sha256 = "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3";
           name = "msvc";
         };
         packageRequires = [ ac-clang cedet cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/msvc";
+          homepage = "https://melpa.org/#/msvc";
           license = lib.licenses.free;
         };
       }) {};
@@ -17289,13 +18110,13 @@
           sha256 = "0wrg6f7czn61f9wmrk27dzcdskznm5i1pwwjck5h768j0y9dfv6a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mu4e-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mu4e-alert";
           sha256 = "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm";
           name = "mu4e-alert";
         };
         packageRequires = [ alert emacs s ];
         meta = {
-          homepage = "http://melpa.org/#/mu4e-alert";
+          homepage = "https://melpa.org/#/mu4e-alert";
           license = lib.licenses.free;
         };
       }) {};
@@ -17310,13 +18131,13 @@
           sha256 = "1lyd8pcawn106zwlbq6gdq05i2zhry1qh9cdyjiw61nvgbbfi0yx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mu4e-maildirs-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mu4e-maildirs-extension";
           sha256 = "1xz19dxrj1grnl7wy9qglh08xb3dr509232l3xizpkxgqqk8pwbi";
           name = "mu4e-maildirs-extension";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mu4e-maildirs-extension";
+          homepage = "https://melpa.org/#/mu4e-maildirs-extension";
           license = lib.licenses.free;
         };
       }) {};
@@ -17331,13 +18152,13 @@
           sha256 = "11zabs7qpdhri6n90ck7pgwcbz46d813nyl73h5m1i8jvz1wzx7v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/multi";
           sha256 = "1c240d1c1g8wb2ld944344zklnv86d9rycmya4z53b2ai10642ig";
           name = "multi";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/multi";
+          homepage = "https://melpa.org/#/multi";
           license = lib.licenses.free;
         };
       }) {};
@@ -17352,13 +18173,13 @@
           sha256 = "1d9y3dw27pgzgv6wk575d5ign55xdqgbl3ycyq1z7sji1477lz6b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multi-web-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/multi-web-mode";
           sha256 = "0vi4yvahr10aqpcz4127c8pcqpr5srwc1yhgipnbnm86qnh34ql5";
           name = "multi-web-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/multi-web-mode";
+          homepage = "https://melpa.org/#/multi-web-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -17373,13 +18194,13 @@
           sha256 = "10k4c9vl0bfidrry0msyqamijizjghg54g26yaqbr2vi0mbbz22k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multiple-cursors";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/multiple-cursors";
           sha256 = "0mky5p9wpd3270wr5vfna8rkk2ff81wk7vicyxli39195m0qgg0x";
           name = "multiple-cursors";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/multiple-cursors";
+          homepage = "https://melpa.org/#/multiple-cursors";
           license = lib.licenses.free;
         };
       }) {};
@@ -17394,13 +18215,13 @@
           sha256 = "15gw4d0hp15rglsj8hzd290li4p0kadj2dsz0dgfcxld7hnimihk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mustache-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mustache-mode";
           sha256 = "076ar57qhwcpl4n634ma827r2rh61670778wqr5za2444a6ax1gs";
           name = "mustache-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mustache-mode";
+          homepage = "https://melpa.org/#/mustache-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -17415,13 +18236,13 @@
           sha256 = "0hvq6z754niqjyv79jzb833wrwbspc7npfg85scwdv8vzwassjx4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mwim";
           sha256 = "0bsibwplvyv96y5i5svm2b0jwzs5a7jr2aara7v7xnpj0nqaxm8k";
           name = "mwim";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/mwim";
+          homepage = "https://melpa.org/#/mwim";
           license = lib.licenses.free;
         };
       }) {};
@@ -17436,13 +18257,13 @@
           sha256 = "0550k0rfm0zai306642v689mcpsw9pbd5vs0il82cihwvrxjifc5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mykie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/mykie";
           sha256 = "12ram39fp3m9ar6q184rsnpkxb14y0ajibng7ia2ck54ck7n36cj";
           name = "mykie";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/mykie";
+          homepage = "https://melpa.org/#/mykie";
           license = lib.licenses.free;
         };
       }) {};
@@ -17457,13 +18278,13 @@
           sha256 = "0amhw630hgc0j8wr8m6aav399ixi3vbwrck79hhlr3pmyh91vv7n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/name-this-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/name-this-color";
           sha256 = "12nrk1ww766jb4gb4iz6w485nimh2iv8wni2jq4l38v8ndh490zb";
           name = "name-this-color";
         };
         packageRequires = [ cl-lib dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/name-this-color";
+          homepage = "https://melpa.org/#/name-this-color";
           license = lib.licenses.free;
         };
       }) {};
@@ -17478,13 +18299,13 @@
           sha256 = "0m82g27gwf9mvicivmcilqghz5b24ijmnw0jf0wl2skfbbg0sydh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/names";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/names";
           sha256 = "1q784606jlakw1z6sx2g2x8hz8c8arywrm2r626wj0v105v510vg";
           name = "names";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/names";
+          homepage = "https://melpa.org/#/names";
           license = lib.licenses.free;
         };
       }) {};
@@ -17499,13 +18320,13 @@
           sha256 = "10yn215xb4s6kshk108y75im1xbdp0vwc9kah5bbaflp9234i0zh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/narrow-reindent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/narrow-reindent";
           sha256 = "0fybal70kk62zlra63x4jb72694m0mzv4cx746prx9anvq1ss2i0";
           name = "narrow-reindent";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/narrow-reindent";
+          homepage = "https://melpa.org/#/narrow-reindent";
           license = lib.licenses.free;
         };
       }) {};
@@ -17520,13 +18341,13 @@
           sha256 = "0ydxj6dc10knambma2hpimqrhfz216nbj96w1dcwgjixs4cd4nax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/narrowed-page-navigation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/narrowed-page-navigation";
           sha256 = "1yrmih60dd69qnin505jlmfidm2svzpdrz46286r7nm6pk7s4pb7";
           name = "narrowed-page-navigation";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/narrowed-page-navigation";
+          homepage = "https://melpa.org/#/narrowed-page-navigation";
           license = lib.licenses.free;
         };
       }) {};
@@ -17541,13 +18362,13 @@
           sha256 = "1l7asqwi5gcvb2mn8608025lwypf2vqzrkc3a9phdfjp0qn2apdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nasm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nasm-mode";
           sha256 = "1626yf9mmqlsw8w01vzqsyb5ipa56259d4kl6w871k7rvhxwff17";
           name = "nasm-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/nasm-mode";
+          homepage = "https://melpa.org/#/nasm-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -17562,13 +18383,13 @@
           sha256 = "119hy8rs83f17d6zizdaxn2ck3sylxbyz7adszbznjc8zrbaw0ic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nav-flash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nav-flash";
           sha256 = "0936kr0s6zxxmjwaqm7ywdw2im4dxai1xb7j6xa2gp7c70qvvsx3";
           name = "nav-flash";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nav-flash";
+          homepage = "https://melpa.org/#/nav-flash";
           license = lib.licenses.free;
         };
       }) {};
@@ -17583,13 +18404,13 @@
           sha256 = "15jh1lsgqfnpbmrikm8kdh5bj60yb96f2as2anppjjsgl6w96glh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/navi-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/navi-mode";
           sha256 = "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi";
           name = "navi-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/navi-mode";
+          homepage = "https://melpa.org/#/navi-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -17604,13 +18425,13 @@
           sha256 = "09cb07f98aclgq8jf5419305zydkk1hz4nvzrwqz7syrlpvx8xi5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/navorski";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/navorski";
           sha256 = "0dnzpsm0ya8rbcik5wp378hc9k7gjb3gwmkqqj889c38q5cdwsx7";
           name = "navorski";
         };
         packageRequires = [ dash multi-term s ];
         meta = {
-          homepage = "http://melpa.org/#/navorski";
+          homepage = "https://melpa.org/#/navorski";
           license = lib.licenses.free;
         };
       }) {};
@@ -17625,13 +18446,13 @@
           sha256 = "16i1k1zr6ng1dlxb1b73mxjf25f4kvf3x5vfffsi3qnfm960bg3q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ncl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ncl-mode";
           sha256 = "0hmd606xgapzbc79px9l1q6pphrhdzip495yprvg20xsdpmjlfw9";
           name = "ncl-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ncl-mode";
+          homepage = "https://melpa.org/#/ncl-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -17646,13 +18467,13 @@
           sha256 = "19xxg4ya6vndk2ljdnl284zs8qf9dkq4ghr7pmsclp9n7zh46v48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nemerle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nemerle";
           sha256 = "0698hbgk80w7wp0ssx9pl13aapm7rc6l3y2zydfkyqdfwy5y71v6";
           name = "nemerle";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nemerle";
+          homepage = "https://melpa.org/#/nemerle";
           license = lib.licenses.free;
         };
       }) {};
@@ -17667,13 +18488,13 @@
           sha256 = "1gmi0xxwkh33w5gxc8488m1vv6ycizqhlw1kpn81zhqdzzq3s06n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/neotree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/neotree";
           sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06";
           name = "neotree";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/neotree";
+          homepage = "https://melpa.org/#/neotree";
           license = lib.licenses.free;
         };
       }) {};
@@ -17688,13 +18509,34 @@
           sha256 = "08bpyk0brx0x2l0y8hn8zpkaxb2ndmxz22kzxxypj6hdz303wf38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nginx-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nginx-mode";
           sha256 = "07k17m64zhv6gik8v4n73d8l1k6fsp4qp8cl94r384ny0187y65c";
           name = "nginx-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nginx-mode";
+          homepage = "https://melpa.org/#/nginx-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    niceify-info = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "niceify-info";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "aaron-em";
+          repo = "niceify-info.el";
+          rev = "66b45916f1994e16ee023d29fa7cf8fec48078f1";
+          sha256 = "0dzcaa88l7yjc7fhyhkvbzs7bmhi6bb6rx41wsnnidlnpzbgdrk7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/niceify-info";
+          sha256 = "1s9c8yxbab9zl5jx38alwa2hpp4zj5cb9a5gfm3x09jf3iw768bl";
+          name = "niceify-info";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/niceify-info";
           license = lib.licenses.free;
         };
       }) {};
@@ -17709,13 +18551,13 @@
           sha256 = "1wc0cvmfhpvfzdy127d1n812q93dd9sp3mmqnc8jzy8i3frqqqq6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ninja-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ninja-mode";
           sha256 = "1m7f25sbkz8k343giczrnw2ah5i3mk4c7csi8kk9x5y16030asik";
           name = "ninja-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ninja-mode";
+          homepage = "https://melpa.org/#/ninja-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -17730,13 +18572,13 @@
           sha256 = "1rvi30xyj2vj3gmzagy51smrhb1xwlsfgnyg30hblj88yn0wh5sz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nix-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nix-mode";
           sha256 = "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s";
           name = "nix-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nix-mode";
+          homepage = "https://melpa.org/#/nix-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -17751,13 +18593,13 @@
           sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nixos-options";
           sha256 = "1m3jipidk10zj68rzjbacgjlal31jf80gqjxlgj4qs8lm671gxmm";
           name = "nixos-options";
         };
         packageRequires = [ emacs json ];
         meta = {
-          homepage = "http://melpa.org/#/nixos-options";
+          homepage = "https://melpa.org/#/nixos-options";
           license = lib.licenses.free;
         };
       }) {};
@@ -17772,13 +18614,13 @@
           sha256 = "0wk86gm0by9c8mfbvydz5va07qd30n6wx067inqfa7wjffaq0xr7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/noccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/noccur";
           sha256 = "0a8l50v09bgap7rsls808k9wyjpjbcxaffsvz7hh9rw9s7m5fz5g";
           name = "noccur";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/noccur";
+          homepage = "https://melpa.org/#/noccur";
           license = lib.licenses.free;
         };
       }) {};
@@ -17793,13 +18635,13 @@
           sha256 = "03vcs458rcn1hgfvmgmijadjvri7zlh2z4lxgaplzfnga13mapym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nodejs-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nodejs-repl";
           sha256 = "0rvhhrsw87kfrwdhm8glq6b3nr0v90ivm7fcc0da4yc2jmcyk907";
           name = "nodejs-repl";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nodejs-repl";
+          homepage = "https://melpa.org/#/nodejs-repl";
           license = lib.licenses.free;
         };
       }) {};
@@ -17812,32 +18654,32 @@
           sha256 = "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nose";
           sha256 = "0l77hsmn3qk934ppdav1gy9sq48g0v1dzc5qy0rp9vv4yz2jx2jk";
           name = "nose";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nose";
+          homepage = "https://melpa.org/#/nose";
           license = lib.licenses.free;
         };
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "0.21";
+        version = "0.22pre1";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "bf511cb6979ede33d17d9da6f46f71ea287461d8";
-          sha256 = "fd2669401c276af12b6c9b739e835ee76b7910bba34bf850e4909c00e79adbd4";
+          rev = "2434ecfba3617f4affaf0bd5a8cde4b918155302";
+          sha256 = "0s979vb13pr5ycrsr2p25gha5dn5bb44mghbrbn2sky8nvyf7dxa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/notmuch";
-          sha256 = "1sy9k6xbfl035qhnp8sdq9cb3xvgw3lkmdczyd6fw6yrzm5n0g1r";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/notmuch";
+          sha256 = "173d1gf5rd4nbjwg91486ibg54n3qlpwgyvkcy4d30jm4vqwqrqv";
           name = "notmuch";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/notmuch";
+          homepage = "https://melpa.org/#/notmuch";
           license = lib.licenses.free;
         };
       }) {};
@@ -17852,13 +18694,13 @@
           sha256 = "1ss87vlp7625lnn2iah3rc1xfxcbpx4kmiww9n16jx073fs2rj18";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/notmuch-labeler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/notmuch-labeler";
           sha256 = "1c0cbkk5k8ps01xl63a0xa2adkqaj0znw8qs8ca4ai8v1420bpl0";
           name = "notmuch-labeler";
         };
         packageRequires = [ notmuch ];
         meta = {
-          homepage = "http://melpa.org/#/notmuch-labeler";
+          homepage = "https://melpa.org/#/notmuch-labeler";
           license = lib.licenses.free;
         };
       }) {};
@@ -17873,13 +18715,13 @@
           sha256 = "1l07nrlfd5qj8jnqacjba7mb6prapg8d8h3881l3kb66sn02ahgy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nrepl-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nrepl-sync";
           sha256 = "01b504b4d8rrhlf3sfq3kk9i222fch6jd5jbm02kqw20fgv6q3jd";
           name = "nrepl-sync";
         };
         packageRequires = [ cider ];
         meta = {
-          homepage = "http://melpa.org/#/nrepl-sync";
+          homepage = "https://melpa.org/#/nrepl-sync";
           license = lib.licenses.free;
         };
       }) {};
@@ -17894,13 +18736,13 @@
           sha256 = "0c4qfbb345yna5c30czq8nhcx283z1fnpp6h16p7vjqs6y37czsl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nsis-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nsis-mode";
           sha256 = "0pc047ryw906sz5mv0awvl67kh20prsgx6fbh0j1qm0cali2792l";
           name = "nsis-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nsis-mode";
+          homepage = "https://melpa.org/#/nsis-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -17915,34 +18757,34 @@
           sha256 = "1624jj922l0bbav1v8szdr0lpyx0ng959fg3sspg1j15kgkir8kf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nvm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nvm";
           sha256 = "03gy7wavc2q02lnr9pmp3l1pn0lzbdq0kwnmg9fvklmq6r6n3x34";
           name = "nvm";
         };
         packageRequires = [ dash dash-functional f s ];
         meta = {
-          homepage = "http://melpa.org/#/nvm";
+          homepage = "https://melpa.org/#/nvm";
           license = lib.licenses.free;
         };
       }) {};
     nyan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nyan-mode";
-        version = "1.0.0";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "TeMPOraL";
           repo = "nyan-mode";
-          rev = "251d8f9c3686183294d76abcd816c8d69b6a71a3";
-          sha256 = "14vd0f4y5l470hx7kg54sx3352459mhjnrh7jl822gkl8c904lmw";
+          rev = "95034cefb34df3b11a547e75a4b85c423502341d";
+          sha256 = "1gxwss5rr4j6pv74fadmvnhdzlhk839am15cr9bj4qm47vrr98jl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nyan-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nyan-mode";
           sha256 = "1z2wnsbjllqa533g1ab5cgbv3d9hjix7fsd7z9c45nqh5cmadmyv";
           name = "nyan-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nyan-mode";
+          homepage = "https://melpa.org/#/nyan-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -17957,13 +18799,13 @@
           sha256 = "0bgspjy8h3d7v12sfjnd2ghj4183pdf0z48g5xs129jwd3nycykp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nyan-prompt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/nyan-prompt";
           sha256 = "1s0qyhpfpncsv9qfxy07rbp4gv8pp5xzb48rbd3r14nkjlnylnfb";
           name = "nyan-prompt";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/nyan-prompt";
+          homepage = "https://melpa.org/#/nyan-prompt";
           license = lib.licenses.free;
         };
       }) {};
@@ -17978,34 +18820,55 @@
           sha256 = "0r12023yy8j96bp8z2ml6ffyr2c9rcd5abkh6vqnkwsdxkzx6wrs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/o-blog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/o-blog";
           sha256 = "08grkyvg27wd5232q3y8p0v7higfq7bmsdzmvhja96v6qy2xsbja";
           name = "o-blog";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/o-blog";
+          homepage = "https://melpa.org/#/o-blog";
           license = lib.licenses.free;
         };
       }) {};
     ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ob-http";
-        version = "0.0.3";
+        version = "0.0.4";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-http";
-          rev = "89ba18b22cf6b8533358a9c76a82326343391f0b";
-          sha256 = "1zbqiqilms8vxqlvzb3gjh8gh2cl7cpmh3yiqsj94jx69w8dy4xl";
+          rev = "e10b35accd4c758d781ab9f6e00b7b792dccf380";
+          sha256 = "0bqr6yl1hpykpykjpfb247xnpnz510zrg9yv7nkxlrig4pjgdcx1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-http";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-http";
           sha256 = "0b7ghz9pqbyn3b52cpmnwa2wnd4svj23p6gc48ybwzwiid42wiss";
           name = "ob-http";
         };
         packageRequires = [ cl-lib s ];
         meta = {
-          homepage = "http://melpa.org/#/ob-http";
+          homepage = "https://melpa.org/#/ob-http";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }:
+    melpaBuild {
+        pname = "ob-sagemath";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "stakemori";
+          repo = "ob-sagemath";
+          rev = "fec3fbabaef5f5d679ef1ccbbc39958a4d01b839";
+          sha256 = "0hapjgzbd4s5jif8jdm9svl58h6a504gxc8jq57sibfcbwkjbfk4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-sagemath";
+          sha256 = "02ispac1y4g7p7iyscf5p8lvp92ncrn6281jm9igyiny1w6hivy7";
+          name = "ob-sagemath";
+        };
+        packageRequires = [ emacs s sage-shell-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/ob-sagemath";
           license = lib.licenses.free;
         };
       }) {};
@@ -18020,13 +18883,13 @@
           sha256 = "1xx6hyq3gk4bavcx6i9bhipbn4mn5rv2ga9lryq09qgq2l9znclk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-sml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-sml";
           sha256 = "04qvzhwjr8ipvq3znnhn0wbl4pbb1rwxi90iidavzk3phbkpaskn";
           name = "ob-sml";
         };
         packageRequires = [ sml-mode ];
         meta = {
-          homepage = "http://melpa.org/#/ob-sml";
+          homepage = "https://melpa.org/#/ob-sml";
           license = lib.licenses.free;
         };
       }) {};
@@ -18041,13 +18904,13 @@
           sha256 = "10hm20dzhkxk61ass3bd5gdn1bs2l60y3zjnpkxinzn7m6aaniia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-translate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ob-translate";
           sha256 = "1hi0rxbyxvk9sbk2fy3kqw7l4lgri921vya1mn4i1q2i1979r2gz";
           name = "ob-translate";
         };
         packageRequires = [ google-translate org ];
         meta = {
-          homepage = "http://melpa.org/#/ob-translate";
+          homepage = "https://melpa.org/#/ob-translate";
           license = lib.licenses.free;
         };
       }) {};
@@ -18062,13 +18925,13 @@
           sha256 = "05ay599nc6jdw2fjss4izz1ynv2wc4svff932n8j9hvrhygipb2w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ocodo-svg-modelines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ocodo-svg-modelines";
           sha256 = "0fa88ns70wsr9i9gf4zx3fvmn1a32mrjsda105n0cx6c965kfmay";
           name = "ocodo-svg-modelines";
         };
         packageRequires = [ svg-mode-line-themes ];
         meta = {
-          homepage = "http://melpa.org/#/ocodo-svg-modelines";
+          homepage = "https://melpa.org/#/ocodo-svg-modelines";
           license = lib.licenses.free;
         };
       }) {};
@@ -18083,13 +18946,13 @@
           sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ocp-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ocp-indent";
           sha256 = "0wc4z9dsnnyr24n3vg1npvc3rm53av8bpbvrl8kldxxdiwgnbkjw";
           name = "ocp-indent";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ocp-indent";
+          homepage = "https://melpa.org/#/ocp-indent";
           license = lib.licenses.free;
         };
       }) {};
@@ -18104,13 +18967,13 @@
           sha256 = "19fg6r7aiirfsbp2h1a824476sn1ln4nz8kvpdzkzvyf1hzx68gw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/octicons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/octicons";
           sha256 = "02f37bvnc5qvkvfbyx5wp54nz71bqm747mq1p5361sx091lllkxk";
           name = "octicons";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/octicons";
+          homepage = "https://melpa.org/#/octicons";
           license = lib.licenses.free;
         };
       }) {};
@@ -18125,13 +18988,13 @@
           sha256 = "0az4llfgva4wvpljyc5s2m7ggfnj06ssp32x8bncr5fzksha3r7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/offlineimap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/offlineimap";
           sha256 = "0nza7lrz7cn06njcblwh9hy3050j8ja4awbxx7jzv6nazjg7201b";
           name = "offlineimap";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/offlineimap";
+          homepage = "https://melpa.org/#/offlineimap";
           license = lib.licenses.free;
         };
       }) {};
@@ -18146,13 +19009,13 @@
           sha256 = "1rj97yg2n9fi80qlb4z6iahqid3yinlhx9mrbh6gi1niz58ws69h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/olivetti";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/olivetti";
           sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd";
           name = "olivetti";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/olivetti";
+          homepage = "https://melpa.org/#/olivetti";
           license = lib.licenses.free;
         };
       }) {};
@@ -18167,13 +19030,13 @@
           sha256 = "07grj81alrr6qgs3jmqkjzphkvi26w6jm5hf1f5wyx7h6q293ady";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omni-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/omni-kill";
           sha256 = "03kydl16rd9mnc1rnan2byqa6f70891fhcj16wkavl2r68rfj75k";
           name = "omni-kill";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/omni-kill";
+          homepage = "https://melpa.org/#/omni-kill";
           license = lib.licenses.free;
         };
       }) {};
@@ -18188,13 +19051,13 @@
           sha256 = "030f983n19n64f8irif102nncvam04xpx020vfgja9886wlj40pk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omni-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/omni-log";
           sha256 = "0c29243zq8r89ax4rxlmb8imag12icnldcb0q0xsnhjccw8lyw1r";
           name = "omni-log";
         };
         packageRequires = [ dash emacs ht s ];
         meta = {
-          homepage = "http://melpa.org/#/omni-log";
+          homepage = "https://melpa.org/#/omni-log";
           license = lib.licenses.free;
         };
       }) {};
@@ -18209,13 +19072,13 @@
           sha256 = "1rfs6z56pnacy6m7yvm2hrb0ykfvaiyichivcmb9ssdgqp92cbxx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omni-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/omni-scratch";
           sha256 = "190dkqcw8xywzrq8a99w4rqi0y1h2aj23s84g2ln1sf7jaf6d6n9";
           name = "omni-scratch";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/omni-scratch";
+          homepage = "https://melpa.org/#/omni-scratch";
           license = lib.licenses.free;
         };
       }) {};
@@ -18230,13 +19093,13 @@
           sha256 = "0c34rci5793hd674x2srhqvnj46llrbkrw1xpzf73s4ib5zhh7xi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omni-tags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/omni-tags";
           sha256 = "133ww1jf14jbw02ssbx2a46mp52j18a2wwzb6x77azb0akmf1lzl";
           name = "omni-tags";
         };
         packageRequires = [ cl-lib pcre2el ];
         meta = {
-          homepage = "http://melpa.org/#/omni-tags";
+          homepage = "https://melpa.org/#/omni-tags";
           license = lib.licenses.free;
         };
       }) {};
@@ -18251,7 +19114,7 @@
           sha256 = "1iq8yzjv7wb0jfi3lqqyx4n7whvb7xf8ls0q0w7pgsrsslrxbwcm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omnisharp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/omnisharp";
           sha256 = "0dwya22y92k7x2s223az1g8hmrpfmk1sgwbr9z47raaa8kd52iad";
           name = "omnisharp";
         };
@@ -18266,7 +19129,7 @@
           s
         ];
         meta = {
-          homepage = "http://melpa.org/#/omnisharp";
+          homepage = "https://melpa.org/#/omnisharp";
           license = lib.licenses.free;
         };
       }) {};
@@ -18281,13 +19144,13 @@
           sha256 = "119pk7gg4fw5bdvir8077ra603b5nbqvd7ph9cqrwxa056jzvry8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/opam";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/opam";
           sha256 = "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa";
           name = "opam";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/opam";
+          homepage = "https://melpa.org/#/opam";
           license = lib.licenses.free;
         };
       }) {};
@@ -18302,13 +19165,13 @@
           sha256 = "0n64l1jrrk60g192nn0240qcv2p9r138mi9gb38qq5k65wffbc21";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/opencl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/opencl-mode";
           sha256 = "1g351wiaycwmg1bnf4s2mdnc3lb2ml5l54g19184xqssfqlx7y79";
           name = "opencl-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/opencl-mode";
+          homepage = "https://melpa.org/#/opencl-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -18323,13 +19186,13 @@
           sha256 = "12q09kdcgv6hl1hmgarl73j4g9gi4h7sj865655mdja0ns9n1pdb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/operate-on-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/operate-on-number";
           sha256 = "1rw3fqbzfizgcbz3yaf99rr2546msna4z7dyfa8dbi8h7yzl4fhk";
           name = "operate-on-number";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/operate-on-number";
+          homepage = "https://melpa.org/#/operate-on-number";
           license = lib.licenses.free;
         };
       }) {};
@@ -18344,13 +19207,13 @@
           sha256 = "1xckin2d6s40kgr2293g72ipc57f8gp6y63303kmqcv3qm8q13ca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-ac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-ac";
           sha256 = "059jr3v3558cgw626zbqfwmwwv5f4637ai26h7b6psqh0x9sf3mr";
           name = "org-ac";
         };
         packageRequires = [ auto-complete-pcmp log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/org-ac";
+          homepage = "https://melpa.org/#/org-ac";
           license = lib.licenses.free;
         };
       }) {};
@@ -18365,13 +19228,13 @@
           sha256 = "0gkxxzdk8bd1yi5x9217pkq9d01ccq8znxc7h8qcw0p1336rigfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-agenda-property";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-agenda-property";
           sha256 = "0zsjzjw52asl609q7a2s4jcsm478p4cxzhnd3azyr9ypxydjf6qk";
           name = "org-agenda-property";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/org-agenda-property";
+          homepage = "https://melpa.org/#/org-agenda-property";
           license = lib.licenses.free;
         };
       }) {};
@@ -18386,13 +19249,34 @@
           sha256 = "0j6fqgzvbmvvdh0dgwsxq004wxys2zwnq9wa3idm087ynp2a2ani";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-autolist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-autolist";
           sha256 = "1jvspxhxlvd7h1srk9dbk1v5dykmf8jsjaqicpll7ial6i0qgikj";
           name = "org-autolist";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-autolist";
+          homepage = "https://melpa.org/#/org-autolist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-bookmark-heading = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-bookmark-heading";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "alphapapa";
+          repo = "org-bookmark-heading";
+          rev = "70b014e09977371a8c9bad03085c116693062b19";
+          sha256 = "0j765rb2yfwnc0ri53jb8d6lxj6knpmy495bk3sd63492kdrxf93";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-bookmark-heading";
+          sha256 = "1q92rg9d945ypcpb7kig2r0cr7nb7avsylaa7nxjib25advx80n9";
+          name = "org-bookmark-heading";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/org-bookmark-heading";
           license = lib.licenses.free;
         };
       }) {};
@@ -18407,13 +19291,13 @@
           sha256 = "10nr4sjffnqbllv6gmak6pviyynrb7pi5nvrq331h5alm3xcpq0w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-bullets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-bullets";
           sha256 = "1kxhlabaqi1g6pz215afp65d9cp324s8mvabjh7q1h7ari32an75";
           name = "org-bullets";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-bullets";
+          homepage = "https://melpa.org/#/org-bullets";
           license = lib.licenses.free;
         };
       }) {};
@@ -18428,13 +19312,13 @@
           sha256 = "0cxccxz17pj67wgmyxr74n381mknqgqkyav3jkxs4ghg59g5nygl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-dp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-dp";
           sha256 = "0fnrzpgw8l0g862j20yy4mw1wfcm2i04r6dxi4yd7yay8bw2i4yq";
           name = "org-dp";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/org-dp";
+          homepage = "https://melpa.org/#/org-dp";
           license = lib.licenses.free;
         };
       }) {};
@@ -18449,13 +19333,13 @@
           sha256 = "18x8c6jcqkfam79z4hskr8h1lvzvd5rlfgymmj1ps6p6hd3j4ihl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-elisp-help";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-elisp-help";
           sha256 = "0a4wvz52hkcw5nrml3h1yp8w97vg5jw22wnpfbb827zh7iwb259h";
           name = "org-elisp-help";
         };
         packageRequires = [ cl-lib org ];
         meta = {
-          homepage = "http://melpa.org/#/org-elisp-help";
+          homepage = "https://melpa.org/#/org-elisp-help";
           license = lib.licenses.free;
         };
       }) {};
@@ -18470,13 +19354,13 @@
           sha256 = "1pxfcyf447h18220izi8qlnwdr8rlwn5kds8gr5i1v90s6hpa498";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-gcal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-gcal";
           sha256 = "1mp6cm0rhd4r9pfvsjjp86sdqxjbbg7gk41zx0zf0s772smddy3q";
           name = "org-gcal";
         };
         packageRequires = [ alert cl-lib emacs org request-deferred ];
         meta = {
-          homepage = "http://melpa.org/#/org-gcal";
+          homepage = "https://melpa.org/#/org-gcal";
           license = lib.licenses.free;
         };
       }) {};
@@ -18491,13 +19375,13 @@
           sha256 = "0b57ik05iax2h3nrj96kysbk4hxmxlaabd0n6lv1xsayrlli3sj1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-gnome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-gnome";
           sha256 = "0c37gfs6xs0jbvg6ypd4z5ip1khm26wr5lxgmv1dzcc383ynzg0v";
           name = "org-gnome";
         };
         packageRequires = [ alert gnome-calendar telepathy ];
         meta = {
-          homepage = "http://melpa.org/#/org-gnome";
+          homepage = "https://melpa.org/#/org-gnome";
           license = lib.licenses.free;
         };
       }) {};
@@ -18512,13 +19396,13 @@
           sha256 = "1iyqv34b7q2k73srshcnpvfzcadq47w4rzkqp6m1d3ajk8x2vypq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-if";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-if";
           sha256 = "0h0jdyawz2j4mp33w85z8q77l37qid8palvw5n4z379qa0wr5h96";
           name = "org-if";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-if";
+          homepage = "https://melpa.org/#/org-if";
           license = lib.licenses.free;
         };
       }) {};
@@ -18528,18 +19412,18 @@
         version = "1.10.2";
         src = fetchFromGitHub {
           owner = "bastibe";
-          repo = "emacs-journal";
+          repo = "org-journal";
           rev = "68974d86f1ef518defb3085e415d882ba4575714";
           sha256 = "0980scx1dzslbdzmhv720branc4jd4bdkyji34gahinx4w9brj79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-journal";
-          sha256 = "078z9b9hxbvmmxib6098f49rn7n3d0v4x37p7xxb0v8cv4izlb4s";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-journal";
+          sha256 = "1npzqxn1ssigq7k1nrxz3xymxaazby0ddgxq6lgw2a1zjmjm4h2b";
           name = "org-journal";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-journal";
+          homepage = "https://melpa.org/#/org-journal";
           license = lib.licenses.free;
         };
       }) {};
@@ -18554,13 +19438,13 @@
           sha256 = "1797pd264zn19zk93nifyw6pwk2a7wrpfir373qclk601yv2g5h8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-link-travis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-link-travis";
           sha256 = "0hj4x7cw7a3ry8xislkz9bnavy77z4cpmnvns02yi3gnib53mlfs";
           name = "org-link-travis";
         };
         packageRequires = [ org ];
         meta = {
-          homepage = "http://melpa.org/#/org-link-travis";
+          homepage = "https://melpa.org/#/org-link-travis";
           license = lib.licenses.free;
         };
       }) {};
@@ -18575,13 +19459,13 @@
           sha256 = "1bggz782ci0z6aw76v51ykbmfzh5g6cxh43w798as1152sn7im3p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-linkany";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-linkany";
           sha256 = "0arjj3c23yqm1ljvbnl7v9cqvd9lbz4381g8f3jyqbafs25bdc3c";
           name = "org-linkany";
         };
         packageRequires = [ log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/org-linkany";
+          homepage = "https://melpa.org/#/org-linkany";
           license = lib.licenses.free;
         };
       }) {};
@@ -18592,16 +19476,16 @@
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
           rev = "592dc2ee7e4c80b9b61efb77117c8dc22d6cefd1";
-          sha256 = "5cb84c3c4bf3f7c3e0c9ab869dababb785d44198b1e1072dc9c0937fc483aa14";
+          sha256 = "055ahg27z4y0r4nhgqdik10x91dpmfmrv1mbr7hc7xzk9cy4rf2w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-mac-iCal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-mac-iCal";
           sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw";
           name = "org-mac-iCal";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-mac-iCal";
+          homepage = "https://melpa.org/#/org-mac-iCal";
           license = lib.licenses.free;
         };
       }) {};
@@ -18616,13 +19500,13 @@
           sha256 = "0yxfhzygiki8sha1dddac4g72r51yi4jnga2scmk51f9jgwqbihp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-multiple-keymap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-multiple-keymap";
           sha256 = "16iv5575634asvn1b2k535ml8g4lqgy8z5w6ykma5f9phq5idb9f";
           name = "org-multiple-keymap";
         };
         packageRequires = [ cl-lib emacs org ];
         meta = {
-          homepage = "http://melpa.org/#/org-multiple-keymap";
+          homepage = "https://melpa.org/#/org-multiple-keymap";
           license = lib.licenses.free;
         };
       }) {};
@@ -18637,13 +19521,13 @@
           sha256 = "15fy6xpz6mk4j3nkrhiqal2dp77rhxmk8a7xiw037xr1jgq9sd9a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-outlook";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-outlook";
           sha256 = "0cn8h6yy67jr5h1yxsfqmr8q7ii4f99pgghfp821m01pj55qyjx9";
           name = "org-outlook";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-outlook";
+          homepage = "https://melpa.org/#/org-outlook";
           license = lib.licenses.free;
         };
       }) {};
@@ -18658,13 +19542,13 @@
           sha256 = "0zc20m63a1iz9aziid5jsvcbl86k9dg9js4k3almchh55az4a0i3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-page";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-page";
           sha256 = "1326m3w7vz22zk7rx40z28fddsccy5fl1qhbb7clci8l69blcc2v";
           name = "org-page";
         };
         packageRequires = [ ht htmlize mustache org ];
         meta = {
-          homepage = "http://melpa.org/#/org-page";
+          homepage = "https://melpa.org/#/org-page";
           license = lib.licenses.free;
         };
       }) {};
@@ -18679,13 +19563,13 @@
           sha256 = "14lshgyrlzjcrqdfsn17llm70ijbs86cv9mccy87vlr01rbsz6lj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-pdfview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-pdfview";
           sha256 = "1z4gb5lw7ngphixw06b5484kwlxbc098w2xshzml5sywr16a4iab";
           name = "org-pdfview";
         };
         packageRequires = [ org pdf-tools ];
         meta = {
-          homepage = "http://melpa.org/#/org-pdfview";
+          homepage = "https://melpa.org/#/org-pdfview";
           license = lib.licenses.free;
         };
       }) {};
@@ -18700,13 +19584,13 @@
           sha256 = "1fjdza723615bhdm5x6gbd03vi7ywzpbjn8p59saimczqngfdpmw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-pomodoro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-pomodoro";
           sha256 = "1vdi07hrhniyhhvg0hcr5mlixy6bjynvwm89z2lvfyvnnxpx0r27";
           name = "org-pomodoro";
         };
         packageRequires = [ alert cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/org-pomodoro";
+          homepage = "https://melpa.org/#/org-pomodoro";
           license = lib.licenses.free;
         };
       }) {};
@@ -18721,13 +19605,13 @@
           sha256 = "16aq5p65q5a0an14q9xzsnkaa5bzkrwhm9cv5ljajjfcjsjcvmb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-projectile";
           sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm";
           name = "org-projectile";
         };
         packageRequires = [ dash projectile ];
         meta = {
-          homepage = "http://melpa.org/#/org-projectile";
+          homepage = "https://melpa.org/#/org-projectile";
           license = lib.licenses.free;
         };
       }) {};
@@ -18742,13 +19626,13 @@
           sha256 = "1cxjzj955rvp0ijbp7ifpmkxdhimz8hqjw5c9gv6zwjqb5iih9ry";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-protocol-jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-protocol-jekyll";
           sha256 = "18wg489n2d1sx9jk00ki6p2rxkqz67kqwnmy2kb1ga1rmb6x9wfs";
           name = "org-protocol-jekyll";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-protocol-jekyll";
+          homepage = "https://melpa.org/#/org-protocol-jekyll";
           license = lib.licenses.free;
         };
       }) {};
@@ -18763,13 +19647,13 @@
           sha256 = "1bi09hd5m994rkqcx0a045h20419b6n4vvwiiggzsi0723dd9fb9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-random-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-random-todo";
           sha256 = "0yflppdbkfn2phd21zkjdlidzasfm846mzniay83v3akz0qx31lr";
           name = "org-random-todo";
         };
         packageRequires = [ alert emacs ];
         meta = {
-          homepage = "http://melpa.org/#/org-random-todo";
+          homepage = "https://melpa.org/#/org-random-todo";
           license = lib.licenses.free;
         };
       }) {};
@@ -18784,13 +19668,34 @@
           sha256 = "0hhgfw0sqvl9jmmslwxn6v3dii99v09yz2h0ia5np9lzyxsc207a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-readme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-readme";
           sha256 = "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh";
           name = "org-readme";
         };
         packageRequires = [ header2 http-post-simple lib-requires yaoddmuse ];
         meta = {
-          homepage = "http://melpa.org/#/org-readme";
+          homepage = "https://melpa.org/#/org-readme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, key-chord, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "org-ref";
+        version = "0.7.1";
+        src = fetchFromGitHub {
+          owner = "jkitchin";
+          repo = "org-ref";
+          rev = "a188bb8af194a50ad2f023ad1773d4e33d8cf21a";
+          sha256 = "07w41v1sczn98v70xw2rlfq8v1wrhs38gkyziibi96w4y3g6i7k0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-ref";
+          sha256 = "087isxf3z8cgmmniaxr3lpq9jg3sriw88dwp4f0ky286hlvgzw08";
+          name = "org-ref";
+        };
+        packageRequires = [ dash emacs f helm helm-bibtex hydra key-chord s ];
+        meta = {
+          homepage = "https://melpa.org/#/org-ref";
           license = lib.licenses.free;
         };
       }) {};
@@ -18805,13 +19710,13 @@
           sha256 = "03c88jzwvl95dl39703mknkvnk3cmw4gss5c1y2k9py2rgh6bpr9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-repo-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-repo-todo";
           sha256 = "0l5ns1hs3i4dhrpmvzl34zc9zysgjkfa7j8apbda59n9jdvml5v1";
           name = "org-repo-todo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-repo-todo";
+          homepage = "https://melpa.org/#/org-repo-todo";
           license = lib.licenses.free;
         };
       }) {};
@@ -18826,13 +19731,13 @@
           sha256 = "0zx9gpvm5gy9k45lbhaks9s935id727lszsh40gmpdp5zxf3rjk1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-sync";
           sha256 = "0n8fz2d1vg9r8dszgasbnb6pgaxr2i8mqrp953prf1nhmfpjpxad";
           name = "org-sync";
         };
         packageRequires = [ cl-lib emacs org ];
         meta = {
-          homepage = "http://melpa.org/#/org-sync";
+          homepage = "https://melpa.org/#/org-sync";
           license = lib.licenses.free;
         };
       }) {};
@@ -18847,34 +19752,34 @@
           sha256 = "1qx3kd02sxs9k7adlvdlbmyhkc5kr7ni5lw4gxjw3nphnc536bkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-table-comment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-table-comment";
           sha256 = "1d40vl8aa1x27z4gwnkzxgrqp7vd3ln2pc445ijjxp1wr8bjxvdz";
           name = "org-table-comment";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-table-comment";
+          homepage = "https://melpa.org/#/org-table-comment";
           license = lib.licenses.free;
         };
       }) {};
     org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-tfl";
-        version = "0.3.1";
+        version = "0.3.3";
         src = fetchFromGitHub {
           owner = "storax";
           repo = "org-tfl";
-          rev = "c9e024ac55d9e0c61a273e75bd68981a623c9ab2";
-          sha256 = "1x241jaw726zjsplwf6svbvr8af09k6kqj7icpvcbyayivkbhxy2";
+          rev = "308251618e215eb78d5436e7412a0c14216fa890";
+          sha256 = "1qz1qhd7v6ynmvz7j1xscz85z6zwy9dcarwhbz020l4bk4g9zf94";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-tfl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-tfl";
           sha256 = "1rqmmw0222vbxfn5wxq9ni2j813x92lpv99jjszqjvgnf2rkhjhf";
           name = "org-tfl";
         };
         packageRequires = [ cl-lib emacs org ];
         meta = {
-          homepage = "http://melpa.org/#/org-tfl";
+          homepage = "https://melpa.org/#/org-tfl";
           license = lib.licenses.free;
         };
       }) {};
@@ -18889,13 +19794,13 @@
           sha256 = "12fksqi9flf84h1lbmbcjnqxa7dairp50wvlwfhbp1hbb8l9z63a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-themis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-themis";
           sha256 = "08rajz5y7h88fh94s2ad0f66va4vi31k9hwdv8p212bs276rp7ln";
           name = "org-themis";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/org-themis";
+          homepage = "https://melpa.org/#/org-themis";
           license = lib.licenses.free;
         };
       }) {};
@@ -18910,13 +19815,13 @@
           sha256 = "09iw2jffb2qrx5r07zd1j8sk5wafamjkc2khqyfwc5kx6xyp1f46";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-time-budgets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-time-budgets";
           sha256 = "0r8km586n6xdnjha7xnzlh03nw1dp066hydaz8kxfmhvygl9cpah";
           name = "org-time-budgets";
         };
         packageRequires = [ alert cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/org-time-budgets";
+          homepage = "https://melpa.org/#/org-time-budgets";
           license = lib.licenses.free;
         };
       }) {};
@@ -18931,34 +19836,34 @@
           sha256 = "0qqa62fsmra6v4061kpki8wbhfcwkgnb2gzxwvnaqlcmhivksg6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-toodledo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-toodledo";
           sha256 = "0c7qr0jsc4iyrwkc22xp9nmk6984v7q1k0rvpd62m07lb5gvbiq3";
           name = "org-toodledo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-toodledo";
+          homepage = "https://melpa.org/#/org-toodledo";
           license = lib.licenses.free;
         };
       }) {};
     org-tracktable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-tracktable";
-        version = "0.2";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "tty-tourist";
           repo = "org-tracktable";
-          rev = "28ef6772cdcf436cf38095f15c6bb681473180ce";
-          sha256 = "053wf36lq9piyzq7rv2lid34zanj6l9fvawp3r3nsniy5nlfckqx";
+          rev = "c38a0019fdc5aac0f9b65e04c86c997fe5a32fb0";
+          sha256 = "1yh4p3i0ajfnsvh057h8dpf4rqvvblmfgzj6vyn9dmcl5is1ir2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-tracktable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-tracktable";
           sha256 = "0mngf9q2ffxq32cgng0xl30661mj15wmr9y4hr3xddj626kxrp00";
           name = "org-tracktable";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/org-tracktable";
+          homepage = "https://melpa.org/#/org-tracktable";
           license = lib.licenses.free;
         };
       }) {};
@@ -18973,13 +19878,13 @@
           sha256 = "1h15fr16kgbyrxambmk4hsmha6hx4c4yqkccb82g3wlvzmnqj5x3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-transform-tree-table";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-transform-tree-table";
           sha256 = "0n68cw769nk90ms6w1w6cc1nxjwn1navkz56mf11bsiqvsk3km7r";
           name = "org-transform-tree-table";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/org-transform-tree-table";
+          homepage = "https://melpa.org/#/org-transform-tree-table";
           license = lib.licenses.free;
         };
       }) {};
@@ -18994,28 +19899,28 @@
           sha256 = "0aacxxwhwjzby0f9r4q0lra5lqcrw5snnm1yc63jrs6c0ifakk45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-tree-slide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-tree-slide";
           sha256 = "0v857zplv0wdbg4li667v2p5pn5zcf9fgbqcwa75x8babilkl6jn";
           name = "org-tree-slide";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-tree-slide";
+          homepage = "https://melpa.org/#/org-tree-slide";
           license = lib.licenses.free;
         };
       }) {};
     org-trello = callPackage ({ dash, dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }:
     melpaBuild {
         pname = "org-trello";
-        version = "0.7.6";
+        version = "0.7.8";
         src = fetchFromGitHub {
           owner = "org-trello";
           repo = "org-trello";
-          rev = "1ecb8f4f1dd41c8f41073c13a9557c0c583d7c88";
-          sha256 = "0pinp7485mwi99f8qx8xhcdymn5yyd7irxh514j3f23n4b90hk4l";
+          rev = "321a74585bceafdd82f96433e014f13b4f3fa674";
+          sha256 = "061nf6gwrzi36q3m3b1hn4bj33a6q4yic3fxdxxwvwrzi42bl74a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-trello";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-trello";
           sha256 = "14lq8nn1x6qb3jx518zaaz5582m4npd593w056igqhahkfm0qp8i";
           name = "org-trello";
         };
@@ -19028,7 +19933,7 @@
           s
         ];
         meta = {
-          homepage = "http://melpa.org/#/org-trello";
+          homepage = "https://melpa.org/#/org-trello";
           license = lib.licenses.free;
         };
       }) {};
@@ -19043,13 +19948,13 @@
           sha256 = "1qf4pqsg12y1qx7di0y5dp0f4slyp69h2q6y21hldzknhwxx4yy4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-vcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org-vcard";
           sha256 = "0l6azshvzl1wws582njqr3qx4h73gwrdqwa3jcic1qbs9hg2l4yl";
           name = "org-vcard";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/org-vcard";
+          homepage = "https://melpa.org/#/org-vcard";
           license = lib.licenses.free;
         };
       }) {};
@@ -19064,34 +19969,34 @@
           sha256 = "0av1477jn3s4s5kymd7sbb0av437vb5mnfc6rpfgzwji7b8mfr7l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org2blog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org2blog";
           sha256 = "0ancvn4ji4552k4nfd2ijclsd027am93ngg241ll8f6h6k0wpmzq";
           name = "org2blog";
         };
         packageRequires = [ metaweblog org xml-rpc ];
         meta = {
-          homepage = "http://melpa.org/#/org2blog";
+          homepage = "https://melpa.org/#/org2blog";
           license = lib.licenses.free;
         };
       }) {};
     org2jekyll = callPackage ({ dash-functional, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org2jekyll";
-        version = "0.1.8";
+        version = "0.1.9";
         src = fetchFromGitHub {
           owner = "ardumont";
           repo = "org2jekyll";
-          rev = "a12173b9507b3ef54dfebb5751503ba1ee93c6aa";
-          sha256 = "064kw64w9snm0lbshxn8d6yd9xvyislhg37fmhq1w7vy8lm61xvf";
+          rev = "35e11ffa24b140d2e247df195489fca344bd0c08";
+          sha256 = "089nqbda5mg1ippqnsl5wcx9n1gpnaqhl6kz54n47kivb400bidh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org2jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/org2jekyll";
           sha256 = "1j9d6xf5nsakifxwd4zmjc29lbj46ffn3z109k2y2yhz7q3r9hzv";
           name = "org2jekyll";
         };
         packageRequires = [ dash-functional deferred s ];
         meta = {
-          homepage = "http://melpa.org/#/org2jekyll";
+          homepage = "https://melpa.org/#/org2jekyll";
           license = lib.licenses.free;
         };
       }) {};
@@ -19106,13 +20011,13 @@
           sha256 = "02mxp17p7bj4xamg0m6zk832hmpqcgzc7bjbjcnvbvrawhc255hy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/orgbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/orgbox";
           sha256 = "12wfqlpjh9nr7zgqs4h8kmfsk825n68qcbn8z2fw2mpshg3nj7l8";
           name = "orgbox";
         };
         packageRequires = [ cl-lib org ];
         meta = {
-          homepage = "http://melpa.org/#/orgbox";
+          homepage = "https://melpa.org/#/orgbox";
           license = lib.licenses.free;
         };
       }) {};
@@ -19127,34 +20032,34 @@
           sha256 = "1wxxdx3c5qacsii4kysk438cjr1hnmpir78kp6xgk9xw5g9snlnj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/orgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/orgit";
           sha256 = "0askccb3h98v8gmylwxaph3gbyv5b1sp4slws76aqz1kq9x0jy7w";
           name = "orgit";
         };
         packageRequires = [ dash emacs magit org ];
         meta = {
-          homepage = "http://melpa.org/#/orgit";
+          homepage = "https://melpa.org/#/orgit";
           license = lib.licenses.free;
         };
       }) {};
-    orglink = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "orglink";
-        version = "0.2.3";
+        version = "0.2.4";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "orglink";
-          rev = "4f3750227b9279f248bc8ee5724d3c27ea97e2e1";
-          sha256 = "00vhzblzscp3mkl6x1nz116i4isjwcc5gkpdksym3mr5nqvqhd97";
+          rev = "09c564022acda5973256e71a467849637473d7e6";
+          sha256 = "076q8j70vqabirri6ckl1f0y60pq4bnilds6s34mxsxz1k3z3m1s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/orglink";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/orglink";
           sha256 = "0ldrvvqs3hlazj0dch162gsbnbxcg6fgrxid8p7w9gj19vbcl52b";
           name = "orglink";
         };
-        packageRequires = [ dash org ];
+        packageRequires = [ dash emacs org ];
         meta = {
-          homepage = "http://melpa.org/#/orglink";
+          homepage = "https://melpa.org/#/orglink";
           license = lib.licenses.free;
         };
       }) {};
@@ -19169,13 +20074,34 @@
           sha256 = "0g1xhh88a65vcq6rlh7ii16pra4pv519ajcws0h93ldbbjiy7p0m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-browse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/osx-browse";
           sha256 = "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm";
           name = "osx-browse";
         };
         packageRequires = [ browse-url-dwim string-utils ];
         meta = {
-          homepage = "http://melpa.org/#/osx-browse";
+          homepage = "https://melpa.org/#/osx-browse";
+          license = lib.licenses.free;
+        };
+      }) {};
+    osx-clipboard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "osx-clipboard";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "joddie";
+          repo = "osx-clipboard-mode";
+          rev = "e46dd31327a3f92f77b013b4c9b1e5fdd0e5c73d";
+          sha256 = "1ykn48src7qhx9cmpjkaqsz7h36p75kkq1h9wlcpv5fhaky2d4n4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/osx-clipboard";
+          sha256 = "0gjgr451v6rlyarz96v6h8kfbvkk7npvhgvkgwdi0bjighrhlv4f";
+          name = "osx-clipboard";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/osx-clipboard";
           license = lib.licenses.free;
         };
       }) {};
@@ -19190,13 +20116,13 @@
           sha256 = "1vywqzw8hydi944q4ghgxbbvvmwfpa9wj5nmrnixfcw8h4mfcxvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/osx-dictionary";
           sha256 = "13033fxc5vjd1f7mm6znmprcp3mwxbvblb2d25shr8d4imqqhv82";
           name = "osx-dictionary";
         };
         packageRequires = [ chinese-word-at-point cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/osx-dictionary";
+          homepage = "https://melpa.org/#/osx-dictionary";
           license = lib.licenses.free;
         };
       }) {};
@@ -19211,13 +20137,13 @@
           sha256 = "1csnxpsfnv9lv07kgvc60qx5c33sshmnz60p3qjz7ym7rnjy9b5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-location";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/osx-location";
           sha256 = "1p12mmrw70p3b04zlprkdxdfnb7m3vkm6gci3fwhr5zyfvwxvn0c";
           name = "osx-location";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/osx-location";
+          homepage = "https://melpa.org/#/osx-location";
           license = lib.licenses.free;
         };
       }) {};
@@ -19232,13 +20158,13 @@
           sha256 = "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-plist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/osx-plist";
           sha256 = "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8";
           name = "osx-plist";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/osx-plist";
+          homepage = "https://melpa.org/#/osx-plist";
           license = lib.licenses.free;
         };
       }) {};
@@ -19253,13 +20179,13 @@
           sha256 = "1pn6xvq41di1jb5d3i8wgs54w0m2414cq3f1vk0xpibshkq7sr4a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-trash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/osx-trash";
           sha256 = "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj";
           name = "osx-trash";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/osx-trash";
+          homepage = "https://melpa.org/#/osx-trash";
           license = lib.licenses.free;
         };
       }) {};
@@ -19274,13 +20200,13 @@
           sha256 = "1v9kx5xr7xcr6i664h2g6j8824yjsjdn5pvgmawvxrrplbjmiqnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/outorg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/outorg";
           sha256 = "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx";
           name = "outorg";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/outorg";
+          homepage = "https://melpa.org/#/outorg";
           license = lib.licenses.free;
         };
       }) {};
@@ -19295,13 +20221,13 @@
           sha256 = "1v04iyx57w8scw3iqrivii7q0sh8sa7xacswdhd18mw9kvjrbj98";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/outshine";
-          sha256 = "1i8c3q6n9hpfbpg2f8n8brwgaq36af1jn3g5js88yiyyb5dknxq4";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/outshine";
+          sha256 = "1ajddzcrnvfgx3xa5wm0bcll9dax52syg1p521mv0ffkld63jyfl";
           name = "outshine";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/outshine";
+          homepage = "https://melpa.org/#/outshine";
           license = lib.licenses.free;
         };
       }) {};
@@ -19316,13 +20242,13 @@
           sha256 = "0qxk2rf84j86syxi8xknsq252irwg7sz396v3bb4wqz4prpj0kzc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ov";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ov";
           sha256 = "0d71mpv74cfxcnwixbrl90nr22cw4kv5sdgpny5wycvh6cgmd6qb";
           name = "ov";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ov";
+          homepage = "https://melpa.org/#/ov";
           license = lib.licenses.free;
         };
       }) {};
@@ -19337,13 +20263,13 @@
           sha256 = "0jz8p6bwpfncxwi6ssmi6ngx8sjjica565i6ln0gsr5i11zfb7nx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/overseer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/overseer";
           sha256 = "04wfwcal051jrnmm5dga6vl4c9j10pm416586yxb8smi6fxws2jg";
           name = "overseer";
         };
         packageRequires = [ dash emacs pkg-info ];
         meta = {
-          homepage = "http://melpa.org/#/overseer";
+          homepage = "https://melpa.org/#/overseer";
           license = lib.licenses.free;
         };
       }) {};
@@ -19358,13 +20284,13 @@
           sha256 = "0f2psx4lq98l3q3fnibsfqxp2hvvwk7b30zjvjlry3bffg3l7pfk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/owdriver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/owdriver";
           sha256 = "0j8z7ynan0zj581x50gsi9lljkbi6bwmzpfyha3i6q8ch5qkdxfd";
           name = "owdriver";
         };
         packageRequires = [ log4e smartrep yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/owdriver";
+          homepage = "https://melpa.org/#/owdriver";
           license = lib.licenses.free;
         };
       }) {};
@@ -19379,13 +20305,13 @@
           sha256 = "047fcvpvwzaqisw4q3p6hxgjyqsi2n9nms1qx9w4znvxrnjq8jz3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-ioslide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ox-ioslide";
           sha256 = "0z0qnvpw64wxbgz8203rphswlh9hd2i11pz2mlay8l3bzz4gx4vc";
           name = "ox-ioslide";
         };
         packageRequires = [ cl-lib emacs f org ];
         meta = {
-          homepage = "http://melpa.org/#/ox-ioslide";
+          homepage = "https://melpa.org/#/ox-ioslide";
           license = lib.licenses.free;
         };
       }) {};
@@ -19400,34 +20326,34 @@
           sha256 = "0h49pfl97vl796sm7r62rpv3slj0z5krm4zrqkgz0q6zlyrjay29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-pandoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ox-pandoc";
           sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc";
           name = "ox-pandoc";
         };
         packageRequires = [ dash emacs ht org ];
         meta = {
-          homepage = "http://melpa.org/#/ox-pandoc";
+          homepage = "https://melpa.org/#/ox-pandoc";
           license = lib.licenses.free;
         };
       }) {};
     ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ox-twbs";
-        version = "1.0.5";
+        version = "1.0.7";
         src = fetchFromGitHub {
           owner = "marsmining";
           repo = "ox-twbs";
-          rev = "cfe67353d148e65a7676f1609d8cc22a4c8fbc78";
-          sha256 = "026g48sgqwnqs5zmrabhiv3l8052l4c1vsbsf6bdxv4a6yp0l654";
+          rev = "d2def6a33d179c8c9778d1bf8a72ab347cbc42e3";
+          sha256 = "08dw3h1417cr6ddd8gl8zcd11pxqpmkd67bknzhjpj7bbqznfqwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-twbs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ox-twbs";
           sha256 = "15csgnph5wh2dvcc2dnvrlm7whh428rq8smqji1509ib7aw9y5mx";
           name = "ox-twbs";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ox-twbs";
+          homepage = "https://melpa.org/#/ox-twbs";
           license = lib.licenses.free;
         };
       }) {};
@@ -19442,13 +20368,13 @@
           sha256 = "073qpa223ja673p63mhvy4l6yyv3k7z05ifwvn7bmq4b5fq42hw6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pabbrev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pabbrev";
           sha256 = "1mbfa40pbzbi00sp155zm43sj6nw221mcayc2rk3ppin9ps95hx3";
           name = "pabbrev";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pabbrev";
+          homepage = "https://melpa.org/#/pabbrev";
           license = lib.licenses.free;
         };
       }) {};
@@ -19463,13 +20389,13 @@
           sha256 = "1xv0ra130qg0ksgqi4npspnv0ckq77k7f5kcibavj030h578kj97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/package+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/package+";
           sha256 = "1mbsxr4llz8ny7n7w3lykld9yvbaywlfqnvr9l0aiv9rvmdv03bn";
           name = "package-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/package+";
+          homepage = "https://melpa.org/#/package+";
           license = lib.licenses.free;
         };
       }) {};
@@ -19484,34 +20410,34 @@
           sha256 = "1pdv6d6bm5jmpgjqf9ycvzasxz1205zdi0zjrmkr33c03azwz7rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/package-safe-delete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/package-safe-delete";
           sha256 = "12ss5yjhnyxsif4vlbgxamn5jfa0wxkkphffxnv6drhvmpq226jw";
           name = "package-safe-delete";
         };
         packageRequires = [ emacs epl ];
         meta = {
-          homepage = "http://melpa.org/#/package-safe-delete";
+          homepage = "https://melpa.org/#/package-safe-delete";
           license = lib.licenses.free;
         };
       }) {};
-    package-utils = callPackage ({ epl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    package-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-utils";
-        version = "0.3.0";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "package-utils";
-          rev = "4a56f411f98fd455556a3f1d6c16a577a22057a2";
-          sha256 = "138l07qmxj4fkvf43f1hdn4skadxb50c023bc5101l3njzmf74wa";
+          rev = "8aad83652944e7414a52c82e3c34f8ef78142118";
+          sha256 = "0fs0a274c7sxldjj0m8wfx9vx7fkq41wngsvk8drzc38qa965vs0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/package-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/package-utils";
           sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r";
           name = "package-utils";
         };
-        packageRequires = [ epl ];
+        packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/package-utils";
+          homepage = "https://melpa.org/#/package-utils";
           license = lib.licenses.free;
         };
       }) {};
@@ -19522,17 +20448,17 @@
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "packed";
-          rev = "8ab8332a6078a1279d80830e397faf52e12eb283";
-          sha256 = "1czjja6npjxm8vmv74796zxhd5gaqjk477cl0fnmm45dny1h7sr7";
+          rev = "4b278931c3694c467e5aaa0246956227806065a0";
+          sha256 = "1zzm43x0y90j4cr4zpwn3fs8apl7n0jhl6qlfkcbar7bb62pi66q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/packed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/packed";
           sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z";
           name = "packed";
         };
         packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/packed";
+          homepage = "https://melpa.org/#/packed";
           license = lib.licenses.free;
         };
       }) {};
@@ -19547,13 +20473,13 @@
           sha256 = "1acz3w2zdcds0h6p2k9h3lmjsk519asqrxjw7f3pyrcq7x2qbhc4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/page-break-lines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/page-break-lines";
           sha256 = "0q1166z190dxznzgf2f29klj2jkaqlic483p4h3bylihkqp93ij7";
           name = "page-break-lines";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/page-break-lines";
+          homepage = "https://melpa.org/#/page-break-lines";
           license = lib.licenses.free;
         };
       }) {};
@@ -19568,34 +20494,34 @@
           sha256 = "03mlg6dmpjw8fq2s3c4gpqj20kjhzldz3m51bf6s0mxq9bclx2xw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pallet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pallet";
           sha256 = "0q50cdwnn2w1n5h4bappncjjyi5yaixxannwgy23fngdrz1mxwd7";
           name = "pallet";
         };
         packageRequires = [ cask dash f s ];
         meta = {
-          homepage = "http://melpa.org/#/pallet";
+          homepage = "https://melpa.org/#/pallet";
           license = lib.licenses.free;
         };
       }) {};
     pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "pandoc-mode";
-        version = "2.15";
+        version = "2.17.2";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "pandoc-mode";
-          rev = "60d3abea189467e04b5ce7dbe38d8b76ce5686cf";
-          sha256 = "0g2iab5fmz85z532102lqn2wp1wgqy07bxkca95azi2gkbg0kbmj";
+          rev = "7f184c178d759e573eaed486d9d70c9b5c8c1eb0";
+          sha256 = "17ibs2szjvy4ar4gidlyg6w20926fr1z59m851akghiwf4aqly7z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pandoc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pandoc-mode";
           sha256 = "0qvc6cf87h1jqf590kd68jfg25snxaxayfds634wj4z6gp70l781";
           name = "pandoc-mode";
         };
         packageRequires = [ dash hydra ];
         meta = {
-          homepage = "http://melpa.org/#/pandoc-mode";
+          homepage = "https://melpa.org/#/pandoc-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -19610,13 +20536,13 @@
           sha256 = "0gmdzagyg0p7q1gyj2a3aqp2g4asljpib3n67nikr0v99c2mki5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pangu-spacing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pangu-spacing";
           sha256 = "082qh26vlk7kifz1800lyai17yvngwjygrfrsh1dsd8dxhk6l9j8";
           name = "pangu-spacing";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pangu-spacing";
+          homepage = "https://melpa.org/#/pangu-spacing";
           license = lib.licenses.free;
         };
       }) {};
@@ -19631,34 +20557,34 @@
           sha256 = "1xh614czldjvfl66vhkyaai5k4qsg1l3mz6wd5b1w6kd45qrc54i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paper-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/paper-theme";
           sha256 = "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50";
           name = "paper-theme";
         };
         packageRequires = [ emacs hexrgb ];
         meta = {
-          homepage = "http://melpa.org/#/paper-theme";
+          homepage = "https://melpa.org/#/paper-theme";
           license = lib.licenses.free;
         };
       }) {};
     paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }:
     melpaBuild {
         pname = "paradox";
-        version = "2.3.7";
+        version = "2.4";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "paradox";
-          rev = "8eca9880ed52d0d53d7d5e28858ec95987fa22e1";
-          sha256 = "1vc59n9jmsn5d15v2m9xl64564h3q0c78pv4a4n3dhd1iz797l3x";
+          rev = "67f7d546c841e2d8f245e2b84e18619115188651";
+          sha256 = "0mg9glbrvhk7xl2grr8fs08wksqvwcgsdgwx0s8fhf8ygcvqcqix";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paradox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/paradox";
           sha256 = "1xq14nfvprsq18464qr4mhphq7cl1f570lji5n8z6j9vpfm9a4p2";
           name = "paradox";
         };
         packageRequires = [ emacs hydra let-alist seq spinner ];
         meta = {
-          homepage = "http://melpa.org/#/paradox";
+          homepage = "https://melpa.org/#/paradox";
           license = lib.licenses.free;
         };
       }) {};
@@ -19668,16 +20594,16 @@
         src = fetchgit {
           url = "http://mumble.net/~campbell/git/paredit.git";
           rev = "82bb75ceb2ddc272d6618d94874b7fc13181a409";
-          sha256 = "7587cd2cf6e5b245678bbca8cbad07db8576ff976a504cd8d6e52fa85cf99f8f";
+          sha256 = "13wzz5fahbz5svc4ql3ajzzpd1fv0ynwpa5widklbcp5yqncv1vm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paredit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/paredit";
           sha256 = "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr";
           name = "paredit";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/paredit";
+          homepage = "https://melpa.org/#/paredit";
           license = lib.licenses.free;
         };
       }) {};
@@ -19692,34 +20618,34 @@
           sha256 = "0jbjwjl92pf0kih3p2x20ms2kpyzzam8fir661nimpmk802ahgkj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paredit-everywhere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/paredit-everywhere";
           sha256 = "0gbkwk8mrbjr2l8pz3q4y6j8q4m12zmzl31c88ngs1k5d86wav36";
           name = "paredit-everywhere";
         };
         packageRequires = [ paredit ];
         meta = {
-          homepage = "http://melpa.org/#/paredit-everywhere";
+          homepage = "https://melpa.org/#/paredit-everywhere";
           license = lib.licenses.free;
         };
       }) {};
     paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "paren-face";
-        version = "0.2.0";
+        version = "0.2.1";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "paren-face";
-          rev = "835d817295d81e2a6def9beb37f05aaf97870e86";
-          sha256 = "033gdya7f6p4kkapnmnbxlm88g4rbsmym4cc4jkcmp91idh63syq";
+          rev = "932cd9681be30096b766717869ad0d3180d3b637";
+          sha256 = "1l0rq3k78k68ky58bv1mhya3mnl7n5wgr88n95na2lcil1dk8ghh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paren-face";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/paren-face";
           sha256 = "0dmzk66m3rd8x0rb925pyrfpc2qsvayks4kmhpb2ccdrx68pg8gf";
           name = "paren-face";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/paren-face";
+          homepage = "https://melpa.org/#/paren-face";
           license = lib.licenses.free;
         };
       }) {};
@@ -19734,13 +20660,13 @@
           sha256 = "0i5bc7lyyrx6swqlrp9l5x72yzwi53qn6ldrfs99gh08b3yvsnni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/parent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/parent-mode";
           sha256 = "1ndn6m6aasmk9yrml9xqj8141100nw7qi1bhnlsss3v8b6njwwig";
           name = "parent-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/parent-mode";
+          homepage = "https://melpa.org/#/parent-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -19755,13 +20681,13 @@
           sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/parsebib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/parsebib";
           sha256 = "07br2x68scsxykdk2ajc4mfqhdb7vjkcfgz3vnpy91sirxzgfjdd";
           name = "parsebib";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/parsebib";
+          homepage = "https://melpa.org/#/parsebib";
           license = lib.licenses.free;
         };
       }) {};
@@ -19776,13 +20702,13 @@
           sha256 = "18m0973l670cjbzpa1vfv06gymhsa2f1pjcp329s0npb735x5whj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pass";
           sha256 = "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr";
           name = "pass";
         };
         packageRequires = [ emacs f password-store ];
         meta = {
-          homepage = "http://melpa.org/#/pass";
+          homepage = "https://melpa.org/#/pass";
           license = lib.licenses.free;
         };
       }) {};
@@ -19797,13 +20723,13 @@
           sha256 = "1g0mvg9i8f2qccb4b0m4d74zkjx9gjfv47x57by6cdaf9yywqryi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/passthword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/passthword";
           sha256 = "076jayziipjx260yk3p37pf5k0qsagalidah3y6hiflrlq4sfgjn";
           name = "passthword";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/passthword";
+          homepage = "https://melpa.org/#/passthword";
           license = lib.licenses.free;
         };
       }) {};
@@ -19814,16 +20740,16 @@
         src = fetchgit {
           url = "http://git.zx2c4.com/password-store";
           rev = "1aac79d9617431bbaf218f9a9d270929762d2816";
-          sha256 = "f71d0b36570983c35e08b6672c186b5c308b57536a96a747f09665bab794be30";
+          sha256 = "0c5yjjvvlrcny13sg5kaadbqnc2wdcc2qrxn11gc70q9awv0n7gp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/password-store";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/password-store";
           sha256 = "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss";
           name = "password-store";
         };
         packageRequires = [ dash f s ];
         meta = {
-          homepage = "http://melpa.org/#/password-store";
+          homepage = "https://melpa.org/#/password-store";
           license = lib.licenses.free;
         };
       }) {};
@@ -19838,13 +20764,13 @@
           sha256 = "0m6qjsq6qfwwszm95lj8c58l75vbmx9r5hm9bfywyympfgy0fa1n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pastehub";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pastehub";
           sha256 = "1slvqn5ay6gkbi0ai1gy1wmc02h4g3n6srrh4fqn72y7b9nv5i0v";
           name = "pastehub";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pastehub";
+          homepage = "https://melpa.org/#/pastehub";
           license = lib.licenses.free;
         };
       }) {};
@@ -19859,13 +20785,34 @@
           sha256 = "1v5mpjb8kavbqhvg4rizwg8cypgmi6ngdiy8qp9pimmkb56y42ly";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pastelmac-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pastelmac-theme";
           sha256 = "168zzqhp2dbfcnknwfqxk68rgmibfw71ksghvi6h2j2c1m08l23f";
           name = "pastelmac-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/pastelmac-theme";
+          homepage = "https://melpa.org/#/pastelmac-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pathify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pathify";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "pathify.el";
+          rev = "335332a900717ae01bde5ccb8f3dc97a5350f123";
+          sha256 = "1brdyrp2sz1pszdfr6f4w94qxk5lrd6kphc1xa5pywfns14c9386";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pathify";
+          sha256 = "1z970xnzbhmfikj1rkfx24jvwc7f1xxw6hk7kmahxvphjxrvgc2f";
+          name = "pathify";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/pathify";
           license = lib.licenses.free;
         };
       }) {};
@@ -19880,13 +20827,13 @@
           sha256 = "0kkgqaxyrv65rfg2ng1vmmmrc9bm98yqpsv2pcb760287dn0l27m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paxedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/paxedit";
           sha256 = "06ymilr0zrwfpyzql7dcpg48lhkx73f2jlaw3caxgsjaz7x3n4ic";
           name = "paxedit";
         };
         packageRequires = [ cl-lib paredit ];
         meta = {
-          homepage = "http://melpa.org/#/paxedit";
+          homepage = "https://melpa.org/#/paxedit";
           license = lib.licenses.free;
         };
       }) {};
@@ -19901,13 +20848,13 @@
           sha256 = "0xbbq8ddlirhvv921nrf7bwazh0i98bk0a9xzyx8iqpyg66vbfa8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pcache";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pcache";
           sha256 = "1q2wlbc58lyf3dxfs9ppdxvdsp81jmkq874zbd7f39wvc5ckbz0l";
           name = "pcache";
         };
         packageRequires = [ eieio ];
         meta = {
-          homepage = "http://melpa.org/#/pcache";
+          homepage = "https://melpa.org/#/pcache";
           license = lib.licenses.free;
         };
       }) {};
@@ -19922,13 +20869,34 @@
           sha256 = "0h0p4c08z0dqxmg55fzch1d2f38rywfk1j0an2f4sc94lj7ckbm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pcomplete-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pcomplete-extension";
           sha256 = "0m0c9ir44p21rj93fkisvpvi08936717ljmzsr4qdf69b3i54cwc";
           name = "pcomplete-extension";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/pcomplete-extension";
+          homepage = "https://melpa.org/#/pcomplete-extension";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pcre2el = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pcre2el";
+        version = "1.8";
+        src = fetchFromGitHub {
+          owner = "joddie";
+          repo = "pcre2el";
+          rev = "166a10472002010692dbc35f323ffb8110a294c5";
+          sha256 = "1dpfhrxbaqpgjzac3m9hclbzlnrxq9b8bx6za53aqvml72yzxc6i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pcre2el";
+          sha256 = "1l72hv9843qk5p8gi9ibr15wczm804j3ws2v1x7nx4dr7pc5c7l3";
+          name = "pcre2el";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/pcre2el";
           license = lib.licenses.free;
         };
       }) {};
@@ -19943,13 +20911,13 @@
           sha256 = "03k3xhrim4s3yvbnl8g8ci5g7chlffycdw7d6a1pz3077mxf1f1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pcsv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pcsv";
           sha256 = "1zphndkbva59g1fd319a240yvq8fjk315b1fyrb8zvmqpgk9n0dl";
           name = "pcsv";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pcsv";
+          homepage = "https://melpa.org/#/pcsv";
           license = lib.licenses.free;
         };
       }) {};
@@ -19964,13 +20932,13 @@
           sha256 = "19sy49r3ijh36m7hl4vspw5c4i8pnfqdn4ldm2sqchxigkw56ayl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pdf-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pdf-tools";
           sha256 = "1hnc8cci00mw78h7d7gs8smzrgihqz871sdc9hfvamb7iglmdlxw";
           name = "pdf-tools";
         };
         packageRequires = [ emacs let-alist tablist ];
         meta = {
-          homepage = "http://melpa.org/#/pdf-tools";
+          homepage = "https://melpa.org/#/pdf-tools";
           license = lib.licenses.free;
         };
       }) {};
@@ -19985,54 +20953,54 @@
           sha256 = "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/peg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/peg";
           sha256 = "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm";
           name = "peg";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/peg";
+          homepage = "https://melpa.org/#/peg";
           license = lib.licenses.free;
         };
       }) {};
     per-buffer-theme = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "per-buffer-theme";
-        version = "1.3";
+        version = "1.5";
         src = fetchhg {
           url = "https://bitbucket.com/inigoserna/per-buffer-theme.el";
-          rev = "2b82a04b28d0";
-          sha256 = "1rh87jf0a15q35a8h00bx6k5wa931rb6gh600zbs7j4r3y8qsylf";
+          rev = "9e6200da91b3";
+          sha256 = "0w02l91x624cgzdg33a9spgcwy12m607dsfnr1xbc1fi08np4sd1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/per-buffer-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/per-buffer-theme";
           sha256 = "1czcaybpfmx4mwff7hs07iayyvgvlhifkickccap6kpd0cp4n6hn";
           name = "per-buffer-theme";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/per-buffer-theme";
+          homepage = "https://melpa.org/#/per-buffer-theme";
           license = lib.licenses.free;
         };
       }) {};
     persistent-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persistent-scratch";
-        version = "0.2.3";
+        version = "0.2.5";
         src = fetchFromGitHub {
           owner = "Fanael";
           repo = "persistent-scratch";
-          rev = "f0554b9edb4b05150f297b5c14a2da003209d3bf";
-          sha256 = "0h05j55y3csq91a5m2fg99y4rzsh7zca7hnifb6kic5zb3nahi00";
+          rev = "107cf4022bed13692e6ac6a544c06227f30e3535";
+          sha256 = "0j72rqd96dz9pp9zwc88q3358m4b891dg0szmbyvs4myp3yandz2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/persistent-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/persistent-scratch";
           sha256 = "0iai65lsg3zxj07hdb9201w3rwrvdb3wffr6k2jdl8hzg5idghn1";
           name = "persistent-scratch";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/persistent-scratch";
+          homepage = "https://melpa.org/#/persistent-scratch";
           license = lib.licenses.free;
         };
       }) {};
@@ -20047,13 +21015,13 @@
           sha256 = "14p20br8vzxs39d4hswzrrkgwql5nnmn5j17cpbabzjvck42rixc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/persistent-soft";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/persistent-soft";
           sha256 = "0a4xiwpgyyynjf69s8p183mqd3z53absv544ggvhb2gkpm6jravc";
           name = "persistent-soft";
         };
         packageRequires = [ list-utils pcache ];
         meta = {
-          homepage = "http://melpa.org/#/persistent-soft";
+          homepage = "https://melpa.org/#/persistent-soft";
           license = lib.licenses.free;
         };
       }) {};
@@ -20068,13 +21036,13 @@
           sha256 = "090b73969namf3h7pbf8xc969dygj3frzlkf0h2x29wl1fmag5kr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/persp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/persp-mode";
           sha256 = "1bgni7y5xsn4a21494npr90w3320snfzw1hvql30xrr57pw3765w";
           name = "persp-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/persp-mode";
+          homepage = "https://melpa.org/#/persp-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -20089,13 +21057,13 @@
           sha256 = "12c2rrhysrcl2arc6hpzv6lxbb1r3bzlvdp23hnp9sci6yc10k3q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/perspective";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/perspective";
           sha256 = "150dxcsd0ylvfi9mmfpcki1wd3nl8q9mbszd3dgqfnm40yncklml";
           name = "perspective";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/perspective";
+          homepage = "https://melpa.org/#/perspective";
           license = lib.licenses.free;
         };
       }) {};
@@ -20110,13 +21078,13 @@
           sha256 = "1qxsc5wyk8l9gkgmqy3mzwxdhji1ljqw9s1jfxkax7fyv4d1v31p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ph";
           sha256 = "0azx4cpfdn01yrqyn0q1gg9z7w0h0rn7zl39v3dx6yidd76ysh0l";
           name = "ph";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ph";
+          homepage = "https://melpa.org/#/ph";
           license = lib.licenses.free;
         };
       }) {};
@@ -20131,13 +21099,13 @@
           sha256 = "0r6cl1ng41s6wsy5syjlkaip0mp8h491diipdc1psbhnpk4vabsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phi-search-mc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/phi-search-mc";
           sha256 = "07hd80rbyzr5n3yd7hv1j51nl6pvcxmln20g6xvw8gh5yfl9k0m8";
           name = "phi-search-mc";
         };
         packageRequires = [ multiple-cursors phi-search ];
         meta = {
-          homepage = "http://melpa.org/#/phi-search-mc";
+          homepage = "https://melpa.org/#/phi-search-mc";
           license = lib.licenses.free;
         };
       }) {};
@@ -20152,13 +21120,13 @@
           sha256 = "0zs11811kx6x1zgc1icd8gw420saa7z6zshpzmrddnbznya4qql6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/php-auto-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/php-auto-yasnippets";
           sha256 = "1hhddvpc80b6wvjpbpibsf24rp5a5p45m0bg7m0c8mx181h9mqgn";
           name = "php-auto-yasnippets";
         };
         packageRequires = [ php-mode yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/php-auto-yasnippets";
+          homepage = "https://melpa.org/#/php-auto-yasnippets";
           license = lib.licenses.free;
         };
       }) {};
@@ -20173,13 +21141,13 @@
           sha256 = "0pwhw59ki19f9rkgvvnjzhby67s0y9hpsrg6cwqxakjlm66w96q3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/php-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/php-mode";
           sha256 = "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y";
           name = "php-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/php-mode";
+          homepage = "https://melpa.org/#/php-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -20194,13 +21162,13 @@
           sha256 = "09rinyx0621d7613xmbyvrrlav6d4ia332wkgg0m9dn265g3h56z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phpcbf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/phpcbf";
           sha256 = "1hf88ys4grffpqgavrbc72dn3m7crafgid2ygzx9c5j55syh8mfv";
           name = "phpcbf";
         };
         packageRequires = [ s ];
         meta = {
-          homepage = "http://melpa.org/#/phpcbf";
+          homepage = "https://melpa.org/#/phpcbf";
           license = lib.licenses.free;
         };
       }) {};
@@ -20215,13 +21183,13 @@
           sha256 = "1s4a0ygm79shv6f0rghrkq9jb7jc7sh9cjxzlzj0c8zpvsxl0hlz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phpunit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/phpunit";
           sha256 = "0nj8ss1yjkcqnbnn4jgbp0403ljjk2xhipzikdrl3dbxlf14i4f8";
           name = "phpunit";
         };
         packageRequires = [ f pkg-info s ];
         meta = {
-          homepage = "http://melpa.org/#/phpunit";
+          homepage = "https://melpa.org/#/phpunit";
           license = lib.licenses.free;
         };
       }) {};
@@ -20236,13 +21204,13 @@
           sha256 = "12jhdkgfck2a6d5jj65l9d98dm34gsyi0ya4h21dbbvz35zivz70";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pinyin-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pinyin-search";
           sha256 = "1si693nmmxgg0kp5mxvj5nq946kfc5cv3wfsl4znbqzps8qb2b7z";
           name = "pinyin-search";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pinyin-search";
+          homepage = "https://melpa.org/#/pinyin-search";
           license = lib.licenses.free;
         };
       }) {};
@@ -20257,13 +21225,13 @@
           sha256 = "1dsg49156mfhkd8ip4ny03sc06zchxr1qpbcx48f5sn4m9j5d3vs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pip-requirements";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pip-requirements";
           sha256 = "1wsjfyqga7pzp8gsm5x53qrkn40srairbjpifyrqbi2fpzmwhrnz";
           name = "pip-requirements";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/pip-requirements";
+          homepage = "https://melpa.org/#/pip-requirements";
           license = lib.licenses.free;
         };
       }) {};
@@ -20278,13 +21246,13 @@
           sha256 = "1wg8pcwd70ixn2bxh01934zl12ry4pgx3l9dccpbjdi40gira00d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pixiv-novel-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pixiv-novel-mode";
           sha256 = "0f1rxvf9nrw984122i6dzsgik9axfjv6yscmg203s065n9lz17px";
           name = "pixiv-novel-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pixiv-novel-mode";
+          homepage = "https://melpa.org/#/pixiv-novel-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -20299,13 +21267,13 @@
           sha256 = "0nk12dcppdyhav6m6yf7abpywyd7amxd4237zsfd32w4zxsx39k1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pkg-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pkg-info";
           sha256 = "0whcvralk76mfmvbvwn57va5dkb1irj7iwffgddi7r0ima49iszx";
           name = "pkg-info";
         };
         packageRequires = [ epl ];
         meta = {
-          homepage = "http://melpa.org/#/pkg-info";
+          homepage = "https://melpa.org/#/pkg-info";
           license = lib.licenses.free;
         };
       }) {};
@@ -20320,34 +21288,55 @@
           sha256 = "0a8qb1ldk6bjs7fpxgxrf90md7q46fhl71gmay8yafdkh6hn0kqr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pkgbuild-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pkgbuild-mode";
           sha256 = "1lp7frjahcpr4xnzxz77qj5hbpxbxm2g28apkixrnc1xjha66v3x";
           name = "pkgbuild-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pkgbuild-mode";
+          homepage = "https://melpa.org/#/pkgbuild-mode";
           license = lib.licenses.free;
         };
       }) {};
     platformio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "platformio-mode";
-        version = "0.2.1";
+        version = "0.2.2";
         src = fetchFromGitHub {
-          owner = "zachmassia";
-          repo = "platformio-mode";
-          rev = "6d12f34548f93dec3c6fe40843d87a8a67ec25c7";
-          sha256 = "1k3bqv5y2xp1jl2hpf8qhs11yzhcl8k40fxqjzv7mvc0ysq9y6wb";
+          owner = "ZachMassia";
+          repo = "PlatformIO-Mode";
+          rev = "470a80c1d764a6e1680a2b41ca5a847869a07a27";
+          sha256 = "1nznbkl06cdq4pyqmvkp9jynsjibn0fd6ai4mggz6ggcwzcixbf0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/platformio-mode";
-          sha256 = "022l20sfyfkvp6kmmqxr7gcmcdx6b1dgsakjjnx8fknrpxr5kyps";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/platformio-mode";
+          sha256 = "1v1pp3365wj19a5wmsxyyy5n548z3lmcbm2pwl914wip3ca7546f";
           name = "platformio-mode";
         };
         packageRequires = [ projectile ];
         meta = {
-          homepage = "http://melpa.org/#/platformio-mode";
+          homepage = "https://melpa.org/#/platformio-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    play-routes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "play-routes-mode";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "brocode";
+          repo = "play-routes-mode";
+          rev = "d7eb682cd474d90b3a3d005290cd6d4fe9f94cae";
+          sha256 = "0slfaclbhjm5paw8l7rr3y9xxjyhkizp9lwyvlgpkd38n4pgj2bx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/play-routes-mode";
+          sha256 = "17phqil2zf5rfvhs5v743dh4lix4v2azbf33z9n97ahs7j66y2gz";
+          name = "play-routes-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/play-routes-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -20362,13 +21351,13 @@
           sha256 = "11cbpgjsnw8fiqf1s12hbm9qxgjcw6y2zxx7wz4wg7idmi7m0b7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/plenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/plenv";
           sha256 = "0dw9fy5wd9wm76ag6yyw3f9jnlj7rcdcxgdjm30h514qfi9hxbw4";
           name = "plenv";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/plenv";
+          homepage = "https://melpa.org/#/plenv";
           license = lib.licenses.free;
         };
       }) {};
@@ -20383,13 +21372,13 @@
           sha256 = "0f00dv5jwbhs99j4jc6lvr5n0mv1y80yg7zpp6yrmhww6829l5rg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/plsense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/plsense";
           sha256 = "1ka06r4ashhjkfyzql9mfvs3gj7n684h4gaycj29w4nfqrhcw9va";
           name = "plsense";
         };
         packageRequires = [ auto-complete log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/plsense";
+          homepage = "https://melpa.org/#/plsense";
           license = lib.licenses.free;
         };
       }) {};
@@ -20404,13 +21393,13 @@
           sha256 = "0s34nbqqy6aqi113xj452pbmqp43046wfbfbbfv1xwhybgq0c1j1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/plsense-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/plsense-direx";
           sha256 = "0qd4b7gkmn5ydadhp70995rap3643s1aa8gfi5izgllzhg0i864j";
           name = "plsense-direx";
         };
         packageRequires = [ direx log4e plsense yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/plsense-direx";
+          homepage = "https://melpa.org/#/plsense-direx";
           license = lib.licenses.free;
         };
       }) {};
@@ -20419,40 +21408,40 @@
         pname = "pony-snippets";
         version = "0.0.1";
         src = fetchFromGitHub {
-          owner = "seantallen";
+          owner = "SeanTAllen";
           repo = "pony-snippets";
           rev = "56018b23a11563c6766ed706024b22aa5a4556b4";
           sha256 = "0xjvxfkrl6wl31s7rvbv9zczn6d6i9vf20waqlr3c2ff3zy55ygy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pony-snippets";
-          sha256 = "06rrzfg20kzpscnqr2lin9jvrcydq4wnrv7nj1d0lm6988qz88jx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pony-snippets";
+          sha256 = "12ygvpfkzldq6s4mwbrxs4x9927i7pa7ywn7lf1r3gg4h29ar9gn";
           name = "pony-snippets";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/pony-snippets";
+          homepage = "https://melpa.org/#/pony-snippets";
           license = lib.licenses.free;
         };
       }) {};
     ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ponylang-mode";
-        version = "0.0.1";
+        version = "0.0.5";
         src = fetchFromGitHub {
           owner = "SeanTAllen";
           repo = "ponylang-mode";
-          rev = "d05425eca7c924109263bdac72083137a7967454";
-          sha256 = "0jlycv0ck5kbszwc0v2gbka6k5h39nz8763ws0v8jada7zzmyvxm";
+          rev = "e6c713a1e43f4e5a3ee78e102050fff4efe334fb";
+          sha256 = "0ay44hp82ly4kdsgwhhk16gvw26kyvpl8h3fziyicfl5swy954nb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ponylang-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ponylang-mode";
           sha256 = "02fq0qp7f4bzmynzszrwskfs78nzsmf413qjxqndrh3hamixzpi1";
           name = "ponylang-mode";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/ponylang-mode";
+          homepage = "https://melpa.org/#/ponylang-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -20467,13 +21456,13 @@
           sha256 = "18i0kivn6prh5pwdr7b4pxfxqsc8l4mks1h6cfs7iwnfn15g5k19";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pophint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pophint";
           sha256 = "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72";
           name = "pophint";
         };
         packageRequires = [ log4e popup yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/pophint";
+          homepage = "https://melpa.org/#/pophint";
           license = lib.licenses.free;
         };
       }) {};
@@ -20488,13 +21477,13 @@
           sha256 = "1y538siabcf1n00wr4iz5gbxfndw661kx2mn9w1g4lg7yi4n0h0h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/popup";
           sha256 = "151g00h9rkid76qf6c53n8bncsfaikmhj8fqcb3r3a6mbngcd5k2";
           name = "popup";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/popup";
+          homepage = "https://melpa.org/#/popup";
           license = lib.licenses.free;
         };
       }) {};
@@ -20509,34 +21498,34 @@
           sha256 = "084hb3zn1aiabbyxgaalszb2qjf9z64z960ks5fvz8nh7n6y7ny4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/popup-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/popup-complete";
           sha256 = "04bpm31zx87j390r2xi1yl4kyqgalmyqc48xarsm67zfww9fw9c1";
           name = "popup-complete";
         };
         packageRequires = [ popup ];
         meta = {
-          homepage = "http://melpa.org/#/popup-complete";
+          homepage = "https://melpa.org/#/popup-complete";
           license = lib.licenses.free;
         };
       }) {};
     popup-imenu = callPackage ({ dash, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "popup-imenu";
-        version = "0.3";
+        version = "0.5";
         src = fetchFromGitHub {
           owner = "ancane";
           repo = "popup-imenu";
-          rev = "bc363f34d1764300708f9cd3a71a57a2ff4a0d53";
-          sha256 = "083q5q53j1dcv4m2jdamh28bdk6ajzcypmyb3xr52dnqdm3bw6im";
+          rev = "540e8c0473fd50ff0a85c870057e397a0d3c5eb5";
+          sha256 = "19mqzfpki2zlnibp2vzymhdld1m20jinxwgdhmbl6zdfx74zbz7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/popup-imenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/popup-imenu";
           sha256 = "0lxwfaa9vhdn55dj3idp8c3fg1g26qsqq46y5bimfd0s89bjbaxn";
           name = "popup-imenu";
         };
         packageRequires = [ dash flx-ido popup ];
         meta = {
-          homepage = "http://melpa.org/#/popup-imenu";
+          homepage = "https://melpa.org/#/popup-imenu";
           license = lib.licenses.free;
         };
       }) {};
@@ -20551,13 +21540,13 @@
           sha256 = "0nips9npm4zmz3f37vvb4s0g1ci0p9cl6w0z4sc6agg4rybjhpdp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/popwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/popwin";
           sha256 = "1zp54nv8rh0b3g8y5aj4793miiw2r1ijwbzq31lkwmbdr09mixmf";
           name = "popwin";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/popwin";
+          homepage = "https://melpa.org/#/popwin";
           license = lib.licenses.free;
         };
       }) {};
@@ -20572,13 +21561,13 @@
           sha256 = "0w8bnspnk871qndp18hs0wk4x9x31xr9rwbvf5dc8mcbnj29ch33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pos-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pos-tip";
           sha256 = "13qjz112qlrnq34lr70087gshzq8m44knfl6694hfprzjgix84vh";
           name = "pos-tip";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pos-tip";
+          homepage = "https://melpa.org/#/pos-tip";
           license = lib.licenses.free;
         };
       }) {};
@@ -20593,13 +21582,13 @@
           sha256 = "1nx3b24i26kgm52xw21x4m15qjkxw3sg5r6qyvck0fyhj0gw69gr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/powerline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/powerline";
           sha256 = "0gsffr6ilmckrzifsmhwd42vr85vs42pc26f1205pbxb7ma34dhx";
           name = "powerline";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/powerline";
+          homepage = "https://melpa.org/#/powerline";
           license = lib.licenses.free;
         };
       }) {};
@@ -20614,13 +21603,13 @@
           sha256 = "010b151wblgxlfpy590yanbl2r8qhpbqgi02v0pyir340frm9ngn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/powershell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/powershell";
           sha256 = "162k8y9k2n48whaq93sqk86zy3p9qvsfxgyfv9n1nvk4l5wn70wk";
           name = "powershell";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/powershell";
+          homepage = "https://melpa.org/#/powershell";
           license = lib.licenses.free;
         };
       }) {};
@@ -20635,13 +21624,13 @@
           sha256 = "0pv671j8g09pn61kkfb3pa9axfa9zd2jdrkgr81rm2gqb2vh1hsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ppd-sr-speedbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ppd-sr-speedbar";
           sha256 = "1m2918hqvb9c6rgb5szs95ds99gdjdxggcbdfqzmbb5sz2936av8";
           name = "ppd-sr-speedbar";
         };
         packageRequires = [ project-persist-drawer sr-speedbar ];
         meta = {
-          homepage = "http://melpa.org/#/ppd-sr-speedbar";
+          homepage = "https://melpa.org/#/ppd-sr-speedbar";
           license = lib.licenses.free;
         };
       }) {};
@@ -20656,13 +21645,13 @@
           sha256 = "013fig9i4fyx16krp2vfv953p3rwdzr38zs6i50af4pqz4vrcfvh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pretty-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pretty-mode";
           sha256 = "1zxi4nj7vnchiiz1ndx17b719a1wipiqniykzn4pa1w7dsnqg21f";
           name = "pretty-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pretty-mode";
+          homepage = "https://melpa.org/#/pretty-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -20677,13 +21666,13 @@
           sha256 = "08ljf39jfmfpdk36nws2dnwpm7y8252zsdprsc85hr1h1ig5xy15";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/processing-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/processing-mode";
           sha256 = "184yg9z14ighz9djg53ji5dgnb98dnxkkwx55m8f0f879x31i89m";
           name = "processing-mode";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/processing-mode";
+          homepage = "https://melpa.org/#/processing-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -20698,13 +21687,13 @@
           sha256 = "08ljf39jfmfpdk36nws2dnwpm7y8252zsdprsc85hr1h1ig5xy15";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/processing-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/processing-snippets";
           sha256 = "09vkm9asmjz1in0f63s7bf4amifspsqf5w9pxiy5y0qvmn28fr2r";
           name = "processing-snippets";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/processing-snippets";
+          homepage = "https://melpa.org/#/processing-snippets";
           license = lib.licenses.free;
         };
       }) {};
@@ -20719,13 +21708,13 @@
           sha256 = "0r32rjfsbna0g2376gdv0c0im1lzw1cwbp9690rgqjj95ls4saa3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/prodigy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/prodigy";
           sha256 = "032868bgy2wmb2ws48lfibs4118inpna7mmml8m7i4m4y9ll6g85";
           name = "prodigy";
         };
         packageRequires = [ dash emacs f s ];
         meta = {
-          homepage = "http://melpa.org/#/prodigy";
+          homepage = "https://melpa.org/#/prodigy";
           license = lib.licenses.free;
         };
       }) {};
@@ -20740,13 +21729,13 @@
           sha256 = "1hv8ifrpwn434sm41vkgbwni21ma5kfybkwasi6zp0f2b5i9ziw7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/project-explorer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/project-explorer";
           sha256 = "076lzmyi1n7yrgdgyh9qinq271qk6k64x0msbzarihr3p4psrn8m";
           name = "project-explorer";
         };
         packageRequires = [ cl-lib emacs es-lib es-windows ];
         meta = {
-          homepage = "http://melpa.org/#/project-explorer";
+          homepage = "https://melpa.org/#/project-explorer";
           license = lib.licenses.free;
         };
       }) {};
@@ -20761,13 +21750,13 @@
           sha256 = "1x7hwda1w59b8hvzxyk996wdz6phs6rchh3f1ydf0ab6x7m7xvjr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/project-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/project-persist";
           sha256 = "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24";
           name = "project-persist";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/project-persist";
+          homepage = "https://melpa.org/#/project-persist";
           license = lib.licenses.free;
         };
       }) {};
@@ -20782,13 +21771,13 @@
           sha256 = "1nq320ph8fs9a197ji4mnw2xa24dld0r1nka476yvkg4azmcc9x8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/project-persist-drawer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/project-persist-drawer";
           sha256 = "1jv2y2hcqakyvfibclzm7g4diw0bvsv3a8fa43yf19wb64jm8hdb";
           name = "project-persist-drawer";
         };
         packageRequires = [ project-persist ];
         meta = {
-          homepage = "http://melpa.org/#/project-persist-drawer";
+          homepage = "https://melpa.org/#/project-persist-drawer";
           license = lib.licenses.free;
         };
       }) {};
@@ -20802,13 +21791,13 @@
           sha256 = "08dd2y6hdsj1rxcqa2hnjypnn9c2z43y7z2hz0fi4vny547qybz8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/project-root";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/project-root";
           sha256 = "0xjir204zk254y2x70k9vqwirx2ljmrikpsgn5kn170d1bxvhwmb";
           name = "project-root";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/project-root";
+          homepage = "https://melpa.org/#/project-root";
           license = lib.licenses.free;
         };
       }) {};
@@ -20823,34 +21812,34 @@
           sha256 = "1rl6n6v9f4m7m969frx8b51a4lzfix2bxx6rfcfbh6kzhc00qnxf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/projectile";
           sha256 = "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn";
           name = "projectile";
         };
         packageRequires = [ dash pkg-info ];
         meta = {
-          homepage = "http://melpa.org/#/projectile";
+          homepage = "https://melpa.org/#/projectile";
           license = lib.licenses.free;
         };
       }) {};
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "0.7.0";
+        version = "0.8.3";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "21ce05e412b0efebfeab9f84d38c679758ddbf76";
-          sha256 = "0f0siz230xsv20h8wmwa1i8wdsp964y6qmb2i3l485yh03bz1x95";
+          rev = "6d44cd771fc70adbf639f2f2a320fdcc88a5fb27";
+          sha256 = "0k4ai896yfbjym01ay5gzgyw41lnqs45c9ndl3i5c8006ggikc0f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projectile-rails";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/projectile-rails";
           sha256 = "0fgvignqdqh0ma91z9385782l89mvwfn77rp1gmy8cbkwi3b7fkq";
           name = "projectile-rails";
         };
         packageRequires = [ emacs f inf-ruby inflections projectile rake ];
         meta = {
-          homepage = "http://melpa.org/#/projectile-rails";
+          homepage = "https://melpa.org/#/projectile-rails";
           license = lib.licenses.free;
         };
       }) {};
@@ -20865,13 +21854,13 @@
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projectile-sift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/projectile-sift";
           sha256 = "1wbgpwq9yy3v7hqidaczrvvsw5ajj7m3n4gsy3b169xv5h673a0i";
           name = "projectile-sift";
         };
         packageRequires = [ projectile sift ];
         meta = {
-          homepage = "http://melpa.org/#/projectile-sift";
+          homepage = "https://melpa.org/#/projectile-sift";
           license = lib.licenses.free;
         };
       }) {};
@@ -20886,13 +21875,13 @@
           sha256 = "1rw55w2fpb3rw7j136kclkhppz21f7d7di4cvlv7zj5zpdl5zz88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/projekt";
           sha256 = "1bhb24701flihl54w8xrj6yxhynpq4dk0fp5ciac7k28n4930lw8";
           name = "projekt";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/projekt";
+          homepage = "https://melpa.org/#/projekt";
           license = lib.licenses.free;
         };
       }) {};
@@ -20907,13 +21896,13 @@
           sha256 = "1hq8426i8rpb3qzkd5akv3i08pa4jsp9lwsskn38bfgp71pwild2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/prompt-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/prompt-text";
           sha256 = "1b9sj9kzx5ydq2zsfmkwsx78pzg0vsvrn92397js6b2cm24vrwwc";
           name = "prompt-text";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/prompt-text";
+          homepage = "https://melpa.org/#/prompt-text";
           license = lib.licenses.free;
         };
       }) {};
@@ -20928,13 +21917,13 @@
           sha256 = "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/prop-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/prop-menu";
           sha256 = "0dhy52fxxpa058mhhx0slw3sly3dlxm9vkax6fd1sap6f6v00p5i";
           name = "prop-menu";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/prop-menu";
+          homepage = "https://melpa.org/#/prop-menu";
           license = lib.licenses.free;
         };
       }) {};
@@ -20949,13 +21938,13 @@
           sha256 = "03df8zvx2sry3jz2x4pi3l32qyfqa7w8kj8jdbz30nzy0h7aa070";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/protobuf-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/protobuf-mode";
           sha256 = "1hh0w93fg6mfwsbb9wvp335ry8kflj50k8hybchpjcn6f4x39xsj";
           name = "protobuf-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/protobuf-mode";
+          homepage = "https://melpa.org/#/protobuf-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -20970,13 +21959,13 @@
           sha256 = "0wgxrwl7dpy084sc76wiwpixycb171g7xwc66m5gnlrv79qyac73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/psci";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/psci";
           sha256 = "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g";
           name = "psci";
         };
         packageRequires = [ dash deferred f purescript-mode s ];
         meta = {
-          homepage = "http://melpa.org/#/psci";
+          homepage = "https://melpa.org/#/psci";
           license = lib.licenses.free;
         };
       }) {};
@@ -20991,13 +21980,13 @@
           sha256 = "0msa8c29djhy5h3zpdvx25f4y1c50rgsk8iz6r127psrxdlfrvg8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/psession";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/psession";
           sha256 = "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a";
           name = "psession";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/psession";
+          homepage = "https://melpa.org/#/psession";
           license = lib.licenses.free;
         };
       }) {};
@@ -21012,34 +22001,34 @@
           sha256 = "1p0k770h96iw8bxm8ssi0a91m050s615q036870lrlsz35mzc5kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pt";
           sha256 = "0zmz1hcr4ajc2ydvpdxhy1dlhp7hvlkv6y6w1b79ffvq6acdd5mj";
           name = "pt";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pt";
+          homepage = "https://melpa.org/#/pt";
           license = lib.licenses.free;
         };
       }) {};
     puml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "puml-mode";
-        version = "0.6.4";
+        version = "0.6.5";
         src = fetchFromGitHub {
           owner = "skuro";
           repo = "puml-mode";
-          rev = "9d3b5e326d1e68f87711c2ccb0920e2f5db5550b";
-          sha256 = "15c2p5ffvkp80v6fvxa3bgrk8mj18famngqkz2dammxnbppvnvvz";
+          rev = "56cd3f393d4b5bb268a098c3fda3cf73e7d761ba";
+          sha256 = "19bcf3wbmp186yxvrdsm2ax4npvi2x0id94zi13pdnw4cz7zch3v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/puml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/puml-mode";
           sha256 = "131ghjq6lsbhbx5hdg36swnkqijdb9bx6zg73hg0nw8qk0z742vn";
           name = "puml-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/puml-mode";
+          homepage = "https://melpa.org/#/puml-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -21054,13 +22043,13 @@
           sha256 = "1v48i37iqrrwbyy3bscicfq66vbbml4sg0f0n950bnk0qagjx8py";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/punctuality-logger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/punctuality-logger";
           sha256 = "0q9s74hkfqvcx67xpq9rlvh38nyjnz230bll6ks7y5yzxvl4qhcm";
           name = "punctuality-logger";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/punctuality-logger";
+          homepage = "https://melpa.org/#/punctuality-logger";
           license = lib.licenses.free;
         };
       }) {};
@@ -21075,13 +22064,13 @@
           sha256 = "012lv7hrwlhvins81vw3yjkhdwbpi6g1dx55i101qyrpzv5ifngm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pungi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pungi";
           sha256 = "1v9fsd764z5wdcips63z53rcipdz7bha4q6s4pnn114jn3a93ls1";
           name = "pungi";
         };
         packageRequires = [ jedi pyvenv ];
         meta = {
-          homepage = "http://melpa.org/#/pungi";
+          homepage = "https://melpa.org/#/pungi";
           license = lib.licenses.free;
         };
       }) {};
@@ -21096,13 +22085,13 @@
           sha256 = "0xr3s56p6fbm6wgw17galsl3kqvv8c7l1l1qvbhbay39yzs4ff14";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/puppet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/puppet-mode";
           sha256 = "1s2hap6fs6rg5q80dmzhaf4qqaf5sglhs8p896i3i5hq51w0ciyc";
           name = "puppet-mode";
         };
         packageRequires = [ cl-lib emacs pkg-info ];
         meta = {
-          homepage = "http://melpa.org/#/puppet-mode";
+          homepage = "https://melpa.org/#/puppet-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -21117,13 +22106,13 @@
           sha256 = "1wk319akv0scvyyjsd48pisi2i1gkahhsan9hfszrs6xx3anvfd9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/purescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/purescript-mode";
           sha256 = "00gz752mh7144nsaka5q3q4681jp845kc5vcy2nbfnqp9b24l55m";
           name = "purescript-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/purescript-mode";
+          homepage = "https://melpa.org/#/purescript-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -21138,13 +22127,13 @@
           sha256 = "03ivg3ddhy5zh410wgwxa17m98wywqhk62jgijhjd00b6l8i4aym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pushbullet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pushbullet";
           sha256 = "1swzl25rcw7anl7q099qh14yhnwlbn3m20ib9kis0l1rv59kkarl";
           name = "pushbullet";
         };
         packageRequires = [ grapnel json ];
         meta = {
-          homepage = "http://melpa.org/#/pushbullet";
+          homepage = "https://melpa.org/#/pushbullet";
           license = lib.licenses.free;
         };
       }) {};
@@ -21159,13 +22148,13 @@
           sha256 = "06xdq2slwhkcqlbv7x86zmv55drzif9cwjlj543cwhncphl2x9rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/py-autopep8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/py-autopep8";
           sha256 = "1argjdmh0x9c90zkb6cr4z3zkpgjp2mkpsw0dr4v6gg83jcggfpp";
           name = "py-autopep8";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/py-autopep8";
+          homepage = "https://melpa.org/#/py-autopep8";
           license = lib.licenses.free;
         };
       }) {};
@@ -21180,13 +22169,13 @@
           sha256 = "0150q6xcnzzrkn9fa9njm973l1d49c48ad8qia71k4jwrxjjj6zr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/py-isort";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/py-isort";
           sha256 = "0k5gn3bjn5pv6dn6p0m9xghn0sx3m29bj3pfrmyh6gd5ic0l00yb";
           name = "py-isort";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/py-isort";
+          homepage = "https://melpa.org/#/py-isort";
           license = lib.licenses.free;
         };
       }) {};
@@ -21201,13 +22190,13 @@
           sha256 = "09z739w4fjg9xnv3mbh7v8j59mnbsfq4ygq616pj4xcw3nsh0rbg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/py-yapf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/py-yapf";
           sha256 = "1381x0ffpllxwgkr2d8xxbv1nd4k475m1aff8l5qijw7d1fqga2f";
           name = "py-yapf";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/py-yapf";
+          homepage = "https://melpa.org/#/py-yapf";
           license = lib.licenses.free;
         };
       }) {};
@@ -21222,13 +22211,13 @@
           sha256 = "0qg1kjzsv2mcvlsivqy8ys3djbs5yala37r9h2zcxdicl88q0l11";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pycarddavel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pycarddavel";
           sha256 = "12k2mnzkd8yv17csfhclsnd479vcabawmac23yw6dsw7ic53jf1a";
           name = "pycarddavel";
         };
         packageRequires = [ emacs helm ];
         meta = {
-          homepage = "http://melpa.org/#/pycarddavel";
+          homepage = "https://melpa.org/#/pycarddavel";
           license = lib.licenses.free;
         };
       }) {};
@@ -21243,13 +22232,13 @@
           sha256 = "1y3q1k195wp2kgp00a1y34i20zm80wdv2kxigh6gbn2r6qzkqrar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pyenv-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pyenv-mode";
           sha256 = "00yqrk92knv9gq1m9xcg78gavv70jsjlwzkllzxl63iva9qrch59";
           name = "pyenv-mode";
         };
         packageRequires = [ pythonic ];
         meta = {
-          homepage = "http://melpa.org/#/pyenv-mode";
+          homepage = "https://melpa.org/#/pyenv-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -21264,13 +22253,13 @@
           sha256 = "0q6bib9nr6xiq6npzbngyfcjk87yyvwzq1zirr3z1h5wadm34lsk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/python-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/python-environment";
           sha256 = "1pq16rddw76ic5d02j5bswl9qcydi47hqmhs7r06jk46vsfzxpl7";
           name = "python-environment";
         };
         packageRequires = [ deferred ];
         meta = {
-          homepage = "http://melpa.org/#/python-environment";
+          homepage = "https://melpa.org/#/python-environment";
           license = lib.licenses.free;
         };
       }) {};
@@ -21285,13 +22274,13 @@
           sha256 = "00i7cc4r7275l22k3708xi4hqw2j44yivdb1madzrpf314v3kabr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/python-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/python-x";
           sha256 = "115mvhqfa0fa8kdk64biba7ri4xjk74qqi6vm1a5z3psam9mjcmn";
           name = "python-x";
         };
         packageRequires = [ folding python ];
         meta = {
-          homepage = "http://melpa.org/#/python-x";
+          homepage = "https://melpa.org/#/python-x";
           license = lib.licenses.free;
         };
       }) {};
@@ -21306,13 +22295,13 @@
           sha256 = "1af9cd8l5ac58mj92xc7a3diy995cv29abnbb3fl6x4208l4xs3c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pythonic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pythonic";
           sha256 = "1hq0r3vg8vmgw89wfjdqknwm76pimlk0dy56wmh9vffh06gqsb51";
           name = "pythonic";
         };
         packageRequires = [ cl-lib dash emacs f s ];
         meta = {
-          homepage = "http://melpa.org/#/pythonic";
+          homepage = "https://melpa.org/#/pythonic";
           license = lib.licenses.free;
         };
       }) {};
@@ -21327,13 +22316,13 @@
           sha256 = "0jidmc608amd0chs4598zkj0nvyll0al093121hkczsbpgbllq9z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pyvenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/pyvenv";
           sha256 = "0gai9idss1wvryxyqk3pv854mc2xg9hd0r55r2blql8n5rd2yv8v";
           name = "pyvenv";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/pyvenv";
+          homepage = "https://melpa.org/#/pyvenv";
           license = lib.licenses.free;
         };
       }) {};
@@ -21348,13 +22337,13 @@
           sha256 = "110z27n3h7p2yalicfhnv832ikfcf7p0hrf5qkryz1sdmz79wb3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/qiita";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/qiita";
           sha256 = "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl";
           name = "qiita";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/qiita";
+          homepage = "https://melpa.org/#/qiita";
           license = lib.licenses.free;
         };
       }) {};
@@ -21369,13 +22358,13 @@
           sha256 = "1mlka59gyylj4cabi1b552h11qx54kjqwx3bkmsdngjrd4da222a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/qml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/qml-mode";
           sha256 = "123mlibviplzra558x87da4zx0kpbhsgfigjjgjgp3mdg897084n";
           name = "qml-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/qml-mode";
+          homepage = "https://melpa.org/#/qml-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -21390,13 +22379,13 @@
           sha256 = "0lfmdlb626b3gbmlvacwn84vpqam6gk9lp29wk0hcraw69vaw1v8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/quasi-monochrome-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/quasi-monochrome-theme";
           sha256 = "0h5pqrklyga40jg8qc47lwmf8khn0vcs5jx2sdycl2ipy0ikmfs0";
           name = "quasi-monochrome-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/quasi-monochrome-theme";
+          homepage = "https://melpa.org/#/quasi-monochrome-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -21411,13 +22400,13 @@
           sha256 = "1iypwvdgdh30c9br7jnibgwbdca2mqjy95x2ppsc51sik2mz2db1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/quickrun";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/quickrun";
           sha256 = "0f989d6niw6ghf9mq454kqyp0gy7gj34vx5l6krwc52agckyfacy";
           name = "quickrun";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/quickrun";
+          homepage = "https://melpa.org/#/quickrun";
           license = lib.licenses.free;
         };
       }) {};
@@ -21432,34 +22421,34 @@
           sha256 = "02bddznlqys37fnhdpp2g9xa9m7kfgrj1vl0hc5kr42hggk9wwmg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/r-autoyas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/r-autoyas";
           sha256 = "18zifadsgbwnga205jvpx61wa2dvjxmxs5v7cjqhny45a524nbv4";
           name = "r-autoyas";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/r-autoyas";
+          homepage = "https://melpa.org/#/r-autoyas";
           license = lib.licenses.free;
         };
       }) {};
     racer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }:
     melpaBuild {
         pname = "racer";
-        version = "1.0.1";
+        version = "1.0.2";
         src = fetchFromGitHub {
           owner = "racer-rust";
           repo = "emacs-racer";
-          rev = "9b7b4b1e8b04f630d29f771ad268025ff9380236";
-          sha256 = "0pbswxzgfqcp6vjlwhvnablj91kxq588j2fmcjzhf0aigkj7dxfb";
+          rev = "9025fab5af8c6a487341e397a62bca08f14e9bf5";
+          sha256 = "1r1gq6b33iv5a3kf96s73xp5y7yw2lq36cczmwbb9ix5bh5jhcyk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/racer";
           sha256 = "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi";
           name = "racer";
         };
         packageRequires = [ dash emacs rust-mode s ];
         meta = {
-          homepage = "http://melpa.org/#/racer";
+          homepage = "https://melpa.org/#/racer";
           license = lib.licenses.free;
         };
       }) {};
@@ -21474,13 +22463,13 @@
           sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rainbow-blocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rainbow-blocks";
           sha256 = "08p41wvrw1j3h7j7lyl8nxk1gcc2id9ikljmiklg0kc6s8ijhng8";
           name = "rainbow-blocks";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rainbow-blocks";
+          homepage = "https://melpa.org/#/rainbow-blocks";
           license = lib.licenses.free;
         };
       }) {};
@@ -21495,13 +22484,13 @@
           sha256 = "0gxc8j5a14bc9mp43cbcz41ipc0z1yvmypg52dnl8hadirry20gd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rainbow-delimiters";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rainbow-delimiters";
           sha256 = "132nslbnszvbgkl0819z811yar3lms1hp5na4ybi9gkmnb7bg4rg";
           name = "rainbow-delimiters";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rainbow-delimiters";
+          homepage = "https://melpa.org/#/rainbow-delimiters";
           license = lib.licenses.free;
         };
       }) {};
@@ -21516,13 +22505,13 @@
           sha256 = "05i0jpmxzsj2lsj48cafn3v93z37l7k5kaza2ik3yirdpjdibyrh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rainbow-identifiers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rainbow-identifiers";
           sha256 = "0lw790ymrgpyh0sxwmzinl2ik5vl5vggbg14cd0cx5yagkw5y3mp";
           name = "rainbow-identifiers";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/rainbow-identifiers";
+          homepage = "https://melpa.org/#/rainbow-identifiers";
           license = lib.licenses.free;
         };
       }) {};
@@ -21537,34 +22526,34 @@
           sha256 = "1q65jj6bghvzhlqmpg61a7vn8izc01wp2fjiqx013zxpg9awvzmq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rake";
           sha256 = "0cw47g6cjnkh3z4hbwwq1f8f5vrvs84spn06k53bx898brqdh8ns";
           name = "rake";
         };
         packageRequires = [ cl-lib dash f ];
         meta = {
-          homepage = "http://melpa.org/#/rake";
+          homepage = "https://melpa.org/#/rake";
           license = lib.licenses.free;
         };
       }) {};
     ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ranger";
-        version = "0.9.7";
+        version = "0.9.8.1";
         src = fetchFromGitHub {
           owner = "ralesi";
           repo = "ranger.el";
-          rev = "4b778da7aafe1dc4077a3c891ae918eae929fae6";
-          sha256 = "0fkj89p0rb0r472p1rk8xpx8c74pg968pc2mmw3838y4fpc8i198";
+          rev = "9367c681c96aad394069d8145ecfe683708d27fd";
+          sha256 = "1r2k9s46njys2acacwk57mkr9szbpxz93xd4rnjf5gx551khlhjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ranger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ranger";
           sha256 = "14g4r4iaz0nzfsklslrswsik670pvfd0605xfjghvpngn2a8ych4";
           name = "ranger";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ranger";
+          homepage = "https://melpa.org/#/ranger";
           license = lib.licenses.free;
         };
       }) {};
@@ -21579,13 +22568,34 @@
           sha256 = "1i16361klpdsxphcjdpxqswab3ing69j1wb9nygws7ghil85h0bx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rase";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rase";
           sha256 = "1g7v2z7l4csl5by64hc3zg4kgrkvv81iq30mfqq4nvy1jc0xa6j0";
           name = "rase";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rase";
+          homepage = "https://melpa.org/#/rase";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rats = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "rats";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "ane";
+          repo = "rats.el";
+          rev = "8ad4023a4b9b00c1224b10b0060f6dc60b4814a4";
+          sha256 = "0rwgwz1x9w447y8mxy9hrx1rzi3ac9dwk2y5yg1p08z5b7dy6vcz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rats";
+          sha256 = "0jhwiq9yzwpyqhk3c32vqx8nryingzh58psxbzjl3812b7xdqphr";
+          name = "rats";
+        };
+        packageRequires = [ cl-lib go-mode s ];
+        meta = {
+          homepage = "https://melpa.org/#/rats";
           license = lib.licenses.free;
         };
       }) {};
@@ -21600,13 +22610,13 @@
           sha256 = "09c6v4lnv6vm2cckbdpx2fdi9xkz9l68qvhx35vaawxhrkgvypzp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rbenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rbenv";
           sha256 = "09nw7sz6rdgs7hdw517qwgzgyrdmxb16sgldfkifk41rhiyqhr65";
           name = "rbenv";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rbenv";
+          homepage = "https://melpa.org/#/rbenv";
           license = lib.licenses.free;
         };
       }) {};
@@ -21621,34 +22631,34 @@
           sha256 = "1kwn33rxaqik5jls66c2indvswhwmxdmd60n7a1h9siqm5qhy9d6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rcirc-styles";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rcirc-styles";
           sha256 = "01dxhnzsnljig769dk9axdi970b3lw2s6p1z3ljf29qlb5j4548r";
           name = "rcirc-styles";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/rcirc-styles";
+          homepage = "https://melpa.org/#/rcirc-styles";
           license = lib.licenses.free;
         };
       }) {};
     rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rdf-prefix";
-        version = "1.3";
+        version = "1.4";
         src = fetchFromGitHub {
           owner = "simenheg";
           repo = "rdf-prefix";
-          rev = "1ab1464172c7563a7dbf1224572e4ffbfc6608e6";
-          sha256 = "0r95fzi0x8r18x7r574mp503qaiqyicrq78zlggyz6qihi95pmqj";
+          rev = "5e4b0ab384a55974ffa3e5efdd1e437cce8e1562";
+          sha256 = "0h54mpi8jd21vjifc0yy0hvpygiam1rlmypijpi4kv42x5mxkn3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rdf-prefix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rdf-prefix";
           sha256 = "1vxgn5f2kws17ndfdv1vj5p9ks3rp6sikzpc258j07bhsfpjz5qm";
           name = "rdf-prefix";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rdf-prefix";
+          homepage = "https://melpa.org/#/rdf-prefix";
           license = lib.licenses.free;
         };
       }) {};
@@ -21663,13 +22673,13 @@
           sha256 = "1ka5q2q18hgh7wl5yn04489121bq4nx369rz8nb7dr5l14cas0xm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/real-auto-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/real-auto-save";
           sha256 = "03dbbizpyg62v6zbq8hd16ikrifz8m2bdlbb3g67f2834xqmxha8";
           name = "real-auto-save";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/real-auto-save";
+          homepage = "https://melpa.org/#/real-auto-save";
           license = lib.licenses.free;
         };
       }) {};
@@ -21684,13 +22694,13 @@
           sha256 = "07j1grdbqv3iv5ghmgsjw678bxjajcxi27clz4krcz3ys5b1h70v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/realgud";
-          sha256 = "15vlln4w4wlgrk5i5nhgvjcbardpahgs9kwwayb1vmj10c8a837s";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/realgud";
+          sha256 = "0qmvd35ng1aqclwj3pskn58c0fi98kvx9666wp3smgj3n88vgy15";
           name = "realgud";
         };
         packageRequires = [ list-utils load-relative loc-changes test-simple ];
         meta = {
-          homepage = "http://melpa.org/#/realgud";
+          homepage = "https://melpa.org/#/realgud";
           license = lib.licenses.free;
         };
       }) {};
@@ -21705,13 +22715,13 @@
           sha256 = "114ssmby614xjs7mrpbbsdd4gj5ra6klfh8h6z8iij8xn3kii83q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/recover-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/recover-buffers";
           sha256 = "0g40d7440hzlc9b45v63ng0anvmgip4dhbd9wcm2sn8qjfr4w11b";
           name = "recover-buffers";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/recover-buffers";
+          homepage = "https://melpa.org/#/recover-buffers";
           license = lib.licenses.free;
         };
       }) {};
@@ -21726,13 +22736,13 @@
           sha256 = "1vpsihrl03hkd6n6b7mrjccm0a023qf3154a8rw4chihikxw27pj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rect+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rect+";
           sha256 = "0vk0jwpl6yp2md9nh0ghp2qn883a8lr3cq8c9mgq0g552dwdiv5m";
           name = "rect-plus";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rect+";
+          homepage = "https://melpa.org/#/rect+";
           license = lib.licenses.free;
         };
       }) {};
@@ -21747,13 +22757,13 @@
           sha256 = "048pjrd04w6w4v6r56yblbqgkjh01xib7k1i6rjc6288jh5vr1vm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rectangle-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rectangle-utils";
           sha256 = "1w5z2gykydsfp30ahqjihpvq04c5v0cfslbrrg429hycys8apws7";
           name = "rectangle-utils";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/rectangle-utils";
+          homepage = "https://melpa.org/#/rectangle-utils";
           license = lib.licenses.free;
         };
       }) {};
@@ -21768,13 +22778,34 @@
           sha256 = "19c5rkb4nn6fs85lixrgrv8gagr69h430inig31dvm4fip9xdjp9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/redpen-paragraph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/redpen-paragraph";
           sha256 = "0jr707ik6fhznq0q421l986w85ah0n9b4is91zrgbk1v6miqrhca";
           name = "redpen-paragraph";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/redpen-paragraph";
+          homepage = "https://melpa.org/#/redpen-paragraph";
+          license = lib.licenses.free;
+        };
+      }) {};
+    redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "redtick";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "ferfebles";
+          repo = "redtick";
+          rev = "14e3a07c229d1f660ca5129d6e8a52a8c68db94d";
+          sha256 = "0q4a4iznk6xk680xnvly69j8w1dac79qxlycwrfki6msnkagyn9p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/redtick";
+          sha256 = "0qnx9s2rch4xn98vbgiq8ll2hxrwi4fi4vg4bccyvwh21nj51iq0";
+          name = "redtick";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/redtick";
           license = lib.licenses.free;
         };
       }) {};
@@ -21789,13 +22820,13 @@
           sha256 = "1r8fhs7d2vkrbv15ic2bm79i9a8swbc38vk566vnxkhl3rfd5a0a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/relative-line-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/relative-line-numbers";
           sha256 = "0mj1w5a4ax8hwz41vn02bacxlnifd14hvf3p288ljvwchvlf0hn3";
           name = "relative-line-numbers";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/relative-line-numbers";
+          homepage = "https://melpa.org/#/relative-line-numbers";
           license = lib.licenses.free;
         };
       }) {};
@@ -21810,13 +22841,13 @@
           sha256 = "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/relax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/relax";
           sha256 = "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk";
           name = "relax";
         };
         packageRequires = [ json ];
         meta = {
-          homepage = "http://melpa.org/#/relax";
+          homepage = "https://melpa.org/#/relax";
           license = lib.licenses.free;
         };
       }) {};
@@ -21831,13 +22862,13 @@
           sha256 = "007lqahjbig6yygqik6fgbq114784z6l40a3vrc4qs9361zqizck";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/repeatable-motion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/repeatable-motion";
           sha256 = "12z4z8apd8ksf6dfvqm54l71mx68j0yg4hrjypa9p77fpcd6p0zw";
           name = "repeatable-motion";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/repeatable-motion";
+          homepage = "https://melpa.org/#/repeatable-motion";
           license = lib.licenses.free;
         };
       }) {};
@@ -21852,13 +22883,13 @@
           sha256 = "12wylmyz54n1f3kaw9clhvs66dg43xvcvll4pl5ii0ibfv6pls1b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/repl-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/repl-toggle";
           sha256 = "1jyaksxgyygfv1wn9c6y8sykb4hicwgs9n5vrdikd2i0iix29zpb";
           name = "repl-toggle";
         };
         packageRequires = [ fullframe ];
         meta = {
-          homepage = "http://melpa.org/#/repl-toggle";
+          homepage = "https://melpa.org/#/repl-toggle";
           license = lib.licenses.free;
         };
       }) {};
@@ -21873,13 +22904,13 @@
           sha256 = "1pxvwiqhv2nmsxkdwn9jx7na1vgk9dg9yxidglxpmvpid6fy4qdk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/replace-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/replace-symbol";
           sha256 = "07ljmw6aw9hsqffhwmiq2pvhry27acg6f4vgxgi91vjr8jj3r4ng";
           name = "replace-symbol";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/replace-symbol";
+          homepage = "https://melpa.org/#/replace-symbol";
           license = lib.licenses.free;
         };
       }) {};
@@ -21894,13 +22925,13 @@
           sha256 = "0hs80g3npgb6qfcaivdfkpsc9mss1kdmyp5j7s922qcy2k4yxmgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/repo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/repo";
           sha256 = "0z4lcswh0c6xnsxlv33bsxh0nh26ydzfl8sv8xabdp5a2gk6bhpb";
           name = "repo";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/repo";
+          homepage = "https://melpa.org/#/repo";
           license = lib.licenses.free;
         };
       }) {};
@@ -21915,55 +22946,55 @@
           sha256 = "1xzp2hnkr9lsjx50cxlpki9mvyhjsv0vyc77480jrlnpspakj7qs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/req-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/req-package";
           sha256 = "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf";
           name = "req-package";
         };
         packageRequires = [ dash log4e use-package ];
         meta = {
-          homepage = "http://melpa.org/#/req-package";
+          homepage = "https://melpa.org/#/req-package";
           license = lib.licenses.free;
         };
       }) {};
-    request = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    request = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "request";
-        version = "0.2.0";
+        version = "0.1.0";
         src = fetchFromGitHub {
-          owner = "abingham";
+          owner = "tkf";
           repo = "emacs-request";
-          rev = "48a35969f7c41810d550e6cdf784cb86c5a05a20";
-          sha256 = "1fiyxbd87cdlsdhpm3b3z8ypkrkvya6lamn0qx9hsxl1yv27vx4m";
+          rev = "b548f8bd9c4372232cb3d3633b9fcfffb2f535ff";
+          sha256 = "0j7nakxj750rhdnm0nk075s7rx38rc9npbb55kg7r9vb2qilnvmr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/request";
-          sha256 = "09gxfy34a13wr0agmhn0nldxaiyc72rx9xi56jirsvji4dg5j6mm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/request";
+          sha256 = "0h4jqg98px9dqqvjp08vi2z1lhmk0ca59lnrcl96bi7gkkj3jiji";
           name = "request";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/request";
+          homepage = "https://melpa.org/#/request";
           license = lib.licenses.free;
         };
       }) {};
-    request-deferred = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    request-deferred = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "request-deferred";
-        version = "0.2.0";
+        version = "0.1.0";
         src = fetchFromGitHub {
-          owner = "abingham";
+          owner = "tkf";
           repo = "emacs-request";
-          rev = "48a35969f7c41810d550e6cdf784cb86c5a05a20";
-          sha256 = "1fiyxbd87cdlsdhpm3b3z8ypkrkvya6lamn0qx9hsxl1yv27vx4m";
+          rev = "b548f8bd9c4372232cb3d3633b9fcfffb2f535ff";
+          sha256 = "0j7nakxj750rhdnm0nk075s7rx38rc9npbb55kg7r9vb2qilnvmr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/request-deferred";
-          sha256 = "19s8q9a01v0g897s9ass1mr5wbzy82rrfcnqpvcvp05q4y787dn9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/request-deferred";
+          sha256 = "1dcxqnzmvddk61dzmfx8vjbzd8m44lscr3pjdp3r7211zhwfk40n";
           name = "request-deferred";
         };
-        packageRequires = [ deferred request ];
+        packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/request-deferred";
+          homepage = "https://melpa.org/#/request-deferred";
           license = lib.licenses.free;
         };
       }) {};
@@ -21978,13 +23009,13 @@
           sha256 = "1b832r7779rmr6rhzj7klc0l5xzwc4rids87g2hczpb5dhqnchca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/requirejs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/requirejs";
           sha256 = "09z6r9wcag3gj075wq215zcslyknl1izap595rn48xvizxi06c6k";
           name = "requirejs";
         };
         packageRequires = [ cl-lib js2-mode popup s ];
         meta = {
-          homepage = "http://melpa.org/#/requirejs";
+          homepage = "https://melpa.org/#/requirejs";
           license = lib.licenses.free;
         };
       }) {};
@@ -21999,13 +23030,13 @@
           sha256 = "1ywcnrrr4wp6c951mqfscvdgcmwyvxy80p40vi27nzbl977lb1xv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/resize-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/resize-window";
           sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l";
           name = "resize-window";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/resize-window";
+          homepage = "https://melpa.org/#/resize-window";
           license = lib.licenses.free;
         };
       }) {};
@@ -22020,13 +23051,13 @@
           sha256 = "0y4ga1lj2x2f0r535ivs09m2l0q76iz72w42wknhsw9lmdsyl5nz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/restart-emacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/restart-emacs";
           sha256 = "03aabz7fmy99nwimvjn7qz6pvc94i470hfgiwmjz3348cw02k0n6";
           name = "restart-emacs";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/restart-emacs";
+          homepage = "https://melpa.org/#/restart-emacs";
           license = lib.licenses.free;
         };
       }) {};
@@ -22041,13 +23072,13 @@
           sha256 = "1q13cgpz4wzhnqv84ablawy3y2wgdwy46sp7454mmfx9m77jzb2v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/reveal-in-osx-finder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/reveal-in-osx-finder";
           sha256 = "00jgrmh5s3vlpj1jjf8l3c3h4hjk5x781m95sidw6chimizvfmfc";
           name = "reveal-in-osx-finder";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/reveal-in-osx-finder";
+          homepage = "https://melpa.org/#/reveal-in-osx-finder";
           license = lib.licenses.free;
         };
       }) {};
@@ -22062,13 +23093,13 @@
           sha256 = "15xnz4fi22wsximimwmirlz11v4ksfj8nilyjfw6acd92yrhzg6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/reverse-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/reverse-theme";
           sha256 = "163kk5qnz9bk3l2fam79n264s764jfxbwqbiwgid8kw9cmk0v776";
           name = "reverse-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/reverse-theme";
+          homepage = "https://melpa.org/#/reverse-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -22083,13 +23114,13 @@
           sha256 = "11hwf9y5ax207w6rwrsmi3pmn7pn7ap6iys0z8hni2f5zzxjrmx3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rich-minority";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rich-minority";
           sha256 = "11xd76w5k3b3q5bxqjb55vi6dsal9drvyc1nh7z83awm59hvgczc";
           name = "rich-minority";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/rich-minority";
+          homepage = "https://melpa.org/#/rich-minority";
           license = lib.licenses.free;
         };
       }) {};
@@ -22104,13 +23135,13 @@
           sha256 = "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rigid-tabs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rigid-tabs";
           sha256 = "06n0bcvc3nnp84pcq3lywwga7l92jz8hnkilhbq59kydf5zbjldp";
           name = "rigid-tabs";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/rigid-tabs";
+          homepage = "https://melpa.org/#/rigid-tabs";
           license = lib.licenses.free;
         };
       }) {};
@@ -22125,13 +23156,13 @@
           sha256 = "1wqhqv2fc5h10igv1php51bayx0s7qw4m9gzx9by80dab8lwa0vk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rinari";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rinari";
           sha256 = "0qknicg3vzl7zbkwsdvp10hrvlng6mbi8hgslx4ir522dflrf9p0";
           name = "rinari";
         };
         packageRequires = [ inf-ruby jump ruby-compilation ruby-mode ];
         meta = {
-          homepage = "http://melpa.org/#/rinari";
+          homepage = "https://melpa.org/#/rinari";
           license = lib.licenses.free;
         };
       }) {};
@@ -22146,13 +23177,13 @@
           sha256 = "1drvyf5asjp3lgpss7llff35q8r89vmh73n1axaj2qp9jx5a5jih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rnc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rnc-mode";
           sha256 = "09ly7ln6qrcmmim9bl7kd50h4axrhy6ig406r352xm4a9zc8n22q";
           name = "rnc-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rnc-mode";
+          homepage = "https://melpa.org/#/rnc-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -22167,13 +23198,34 @@
           sha256 = "01xd3nc7bmf4r4d37x08rw2dlsg6gns8mraahi4rwkg6a9lwl44n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/robe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/robe";
           sha256 = "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk";
           name = "robe";
         };
         packageRequires = [ inf-ruby ];
         meta = {
-          homepage = "http://melpa.org/#/robe";
+          homepage = "https://melpa.org/#/robe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    robots-txt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "robots-txt-mode";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "robots-txt-mode";
+          rev = "7b524685036d339a8aff1481697fbcd529dfa8f7";
+          sha256 = "0dimmdz4aqcif4lp23nqxfg7kngzym2yivn6h3p7bn1821vgzq9s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/robots-txt-mode";
+          sha256 = "1q3fqaf9nysy9bhx4h9idgshxr65hfwnx05vlwazx7jd6bq6kxfh";
+          name = "robots-txt-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/robots-txt-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -22188,13 +23240,13 @@
           sha256 = "0rgv4y9aa5cc2ddz3y5z8d22xmr8kf5c60h0r3g8h91jmcw3rb4z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/roguel-ike";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/roguel-ike";
           sha256 = "1a7sa6nhgi0s4gjh55bhk5cg6q6s7564fk008ibmrm05gfq9wlg8";
           name = "roguel-ike";
         };
         packageRequires = [ popup ];
         meta = {
-          homepage = "http://melpa.org/#/roguel-ike";
+          homepage = "https://melpa.org/#/roguel-ike";
           license = lib.licenses.free;
         };
       }) {};
@@ -22209,13 +23261,13 @@
           sha256 = "133ficdghshlmwq5dn42cg3h51jdg4lcwqr4cd2s2s52rz8plw9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rope-read-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rope-read-mode";
           sha256 = "0grnn5k6rbck0hz4c6cadgj3a4dv62habyingznisg2kx9i3m0dw";
           name = "rope-read-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rope-read-mode";
+          homepage = "https://melpa.org/#/rope-read-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -22230,13 +23282,13 @@
           sha256 = "0mfkq8n28lal4lqwp6v0ilz8wrwgg61sbm0jggznwisjqqy3lzrh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rsense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rsense";
           sha256 = "1901xqlpc8fg4sl9j58jn40i2djs8s0cdcqcrzrq02lvk8ssfdf5";
           name = "rsense";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rsense";
+          homepage = "https://melpa.org/#/rsense";
           license = lib.licenses.free;
         };
       }) {};
@@ -22251,34 +23303,34 @@
           sha256 = "0hrn5n7aaymwimk511kjij44vqaxbmhly1gwmlmsrnbvvma7f2mp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rspec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rspec-mode";
           sha256 = "0nyib9rx9w9cbsgkcjx9n8fp77xkzxg923z0rdm3f9kc7njcn0zx";
           name = "rspec-mode";
         };
         packageRequires = [ cl-lib ruby-mode ];
         meta = {
-          homepage = "http://melpa.org/#/rspec-mode";
+          homepage = "https://melpa.org/#/rspec-mode";
           license = lib.licenses.free;
         };
       }) {};
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "2.1";
+        version = "2.2";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "ad85fda48b8c1038bc90c9fb0e8e79f2c5e30bca";
-          sha256 = "0shzxxx7qajmfrxqipmlak899hgmxkqf9zkbmr0g04wamxmyfs65";
+          rev = "925a188e4038fa6e4a7c8ea4d30d682609c46578";
+          sha256 = "0k36rcmw6dw02605nvjp3fq6gfvwf4nyv7b309jc97sx7vj2mb9s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rtags";
           sha256 = "08clwydx2b9cl4wv61b0p564jpvq7gzkrlcdkchpi4yz6djbp0lw";
           name = "rtags";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rtags";
+          homepage = "https://melpa.org/#/rtags";
           license = lib.licenses.free;
         };
       }) {};
@@ -22293,13 +23345,13 @@
           sha256 = "10djjp1520xc05qkciaiaiiciscaln6c74h7ymba40mvzlf67y9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rubocop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rubocop";
           sha256 = "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q";
           name = "rubocop";
         };
         packageRequires = [ dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/rubocop";
+          homepage = "https://melpa.org/#/rubocop";
           license = lib.licenses.free;
         };
       }) {};
@@ -22314,13 +23366,13 @@
           sha256 = "1wqhqv2fc5h10igv1php51bayx0s7qw4m9gzx9by80dab8lwa0vk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-compilation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ruby-compilation";
           sha256 = "1x1vpkjpx95sfcjhkx4cafypj0nkbd1i0mzxx3lmcrsmg8iv0rjc";
           name = "ruby-compilation";
         };
         packageRequires = [ inf-ruby ];
         meta = {
-          homepage = "http://melpa.org/#/ruby-compilation";
+          homepage = "https://melpa.org/#/ruby-compilation";
           license = lib.licenses.free;
         };
       }) {};
@@ -22330,18 +23382,18 @@
         version = "0.4.1";
         src = fetchFromGitHub {
           owner = "rejeep";
-          repo = "ruby-end";
+          repo = "ruby-end.el";
           rev = "648b81af136a581bcef387744d93c011d9cdf54b";
           sha256 = "1cpz9vkp57nk682c5xm20g7bfj5g2aq5ahpk4nhgx7pvd3xvr1ds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-end";
-          sha256 = "0cx121hji8ws6s3p2xfdgidm363y05g2n880fqrmzyz27cqkljis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ruby-end";
+          sha256 = "1cnmdlkhm8xsifbjs6ymvi92gdnxiaghb04h10qg41phj6v7m9mg";
           name = "ruby-end";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ruby-end";
+          homepage = "https://melpa.org/#/ruby-end";
           license = lib.licenses.free;
         };
       }) {};
@@ -22356,13 +23408,13 @@
           sha256 = "01n9j7sag49m4bdl6065jklnxnc5kck51izg884s1is459qgy86k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-hash-syntax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ruby-hash-syntax";
           sha256 = "0bvwyagfh7mn457iibrpv1ay75089gp8pg608gbm24m0ix82xvb5";
           name = "ruby-hash-syntax";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ruby-hash-syntax";
+          homepage = "https://melpa.org/#/ruby-hash-syntax";
           license = lib.licenses.free;
         };
       }) {};
@@ -22377,13 +23429,13 @@
           sha256 = "008zj9rg2cmh0xd7g6kgx6snm5sspxs4jmfa8hd43wx5y9pmlb8f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-test-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ruby-test-mode";
           sha256 = "113ysf08bfh2ipk55f8h741j05999yrgx57mzh53rim5n63a312w";
           name = "ruby-test-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ruby-test-mode";
+          homepage = "https://melpa.org/#/ruby-test-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -22393,18 +23445,18 @@
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "rejeep";
-          repo = "ruby-tools";
+          repo = "ruby-tools.el";
           rev = "6e7fb376085bfa7010ecd3dfad63adacc6e2b4ac";
           sha256 = "1zvhq9l717rjgkm7bxz5gqkmh5i49cshwzlimb3h78kpjw3hxl2k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-tools";
-          sha256 = "1zs2vzcrw11xyj2a7lgqzw4slcha20206jvjbxkm68d57rffpk8y";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ruby-tools";
+          sha256 = "0zpk55rkrqyangyyljxzf0n1icgqnpdzycwack5rji556h5grvjy";
           name = "ruby-tools";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ruby-tools";
+          homepage = "https://melpa.org/#/ruby-tools";
           license = lib.licenses.free;
         };
       }) {};
@@ -22419,13 +23471,13 @@
           sha256 = "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rvm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/rvm";
           sha256 = "08i7cmav2cz73jp88ww0ay2yjhk9dj8146836q4sij1bl1slbaf8";
           name = "rvm";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/rvm";
+          homepage = "https://melpa.org/#/rvm";
           license = lib.licenses.free;
         };
       }) {};
@@ -22440,13 +23492,13 @@
           sha256 = "08vf62fcrnbmf2ppb759kzznjdz8x72fqdwbc4n8nbswrwgm2ikl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/s";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/s";
           sha256 = "0b2lj6nj08pk5fnxvjkc1d9hvi29rnjjy4n5ns4pq6wxpfnlcw64";
           name = "s";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/s";
+          homepage = "https://melpa.org/#/s";
           license = lib.licenses.free;
         };
       }) {};
@@ -22461,34 +23513,34 @@
           sha256 = "06gqqbkn85l2p05whmr4wkg9axqyzb7r7sgm3r8wfshm99kgpxvl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sackspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sackspace";
           sha256 = "1m10iw83k6m7v7sg2dxzdy83zxq6svk8h9fh4ankyn3baqrdxg5z";
           name = "sackspace";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sackspace";
+          homepage = "https://melpa.org/#/sackspace";
           license = lib.licenses.free;
         };
       }) {};
     sage-shell-mode = callPackage ({ cl-lib ? null, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sage-shell-mode";
-        version = "0.0.8.9";
+        version = "0.0.9";
         src = fetchFromGitHub {
           owner = "stakemori";
           repo = "sage-shell-mode";
-          rev = "8e659438ff419f7f1fddd1b56fb706dbecf9e469";
-          sha256 = "0aw95qkql6apyn79la0jbpr0nlixhl9zvi9miry2h5y5pawb3yvf";
+          rev = "e915a8bbc6cf8dee4a55769e23d22e348b0d7901";
+          sha256 = "184471s05fcfpsva56yzaq93hm3yqfl8y7rm4wj51azr5p2lk888";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sage-shell-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sage-shell-mode";
           sha256 = "18k7yh8rczng0kn2wsawjml70cb5bnc5jr2gj0hini5f7jq449wx";
           name = "sage-shell-mode";
         };
         packageRequires = [ cl-lib deferred ];
         meta = {
-          homepage = "http://melpa.org/#/sage-shell-mode";
+          homepage = "https://melpa.org/#/sage-shell-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -22503,13 +23555,13 @@
           sha256 = "0lxrq3mzabkwj5bv0mgd7fnx3dsx8vxd5kjgb79rjfra0m7pfgln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sass-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sass-mode";
           sha256 = "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800";
           name = "sass-mode";
         };
         packageRequires = [ haml-mode ];
         meta = {
-          homepage = "http://melpa.org/#/sass-mode";
+          homepage = "https://melpa.org/#/sass-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -22524,13 +23576,13 @@
           sha256 = "1mcag7qad1npjn096byakb8pmmi2g64nlf2vcc12irzmwia85fml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sauron";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sauron";
           sha256 = "01fk1xfh7r16fb1xg5ibbs7gci9dja49msdlf7964hiq7pnnhxgb";
           name = "sauron";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sauron";
+          homepage = "https://melpa.org/#/sauron";
           license = lib.licenses.free;
         };
       }) {};
@@ -22545,13 +23597,13 @@
           sha256 = "0y846zmcz5x2jn5bndm0mfi18jc5cd1fkidgc4wvqmm0w30gyx4q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sbt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sbt-mode";
           sha256 = "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8";
           name = "sbt-mode";
         };
         packageRequires = [ scala-mode2 ];
         meta = {
-          homepage = "http://melpa.org/#/sbt-mode";
+          homepage = "https://melpa.org/#/sbt-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -22566,13 +23618,13 @@
           sha256 = "1gfhk595vnf6565nv6m1v8dc4a3a9z34jj1qdh02lk8azg5ylk89";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scala-mode2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/scala-mode2";
           sha256 = "0rnkln6jwwqc968w3qpc6zjjv8ylw0w6c2hsjpq2slja3jn5khch";
           name = "scala-mode2";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/scala-mode2";
+          homepage = "https://melpa.org/#/scala-mode2";
           license = lib.licenses.free;
         };
       }) {};
@@ -22587,13 +23639,13 @@
           sha256 = "0hhsgyil8aqdkkip5325yrdq89gnijglcbf1dsvl4wvnmq7a1rik";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scala-outline-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/scala-outline-popup";
           sha256 = "1fq0k6l57wkya1ycm4cc190kg90j2k9clnl0sc70achp4i47qbk7";
           name = "scala-outline-popup";
         };
         packageRequires = [ dash flx-ido popup scala-mode2 ];
         meta = {
-          homepage = "http://melpa.org/#/scala-outline-popup";
+          homepage = "https://melpa.org/#/scala-outline-popup";
           license = lib.licenses.free;
         };
       }) {};
@@ -22608,13 +23660,13 @@
           sha256 = "13s8hp16wxd9fb8gf05dn0xr692kkgiqg7v49fgr00gas4xgpfpm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scpaste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/scpaste";
           sha256 = "02dqmx6v3jxdn5yz1z74624sc6sz2bm4qjyi78w9akhp2jplwlk1";
           name = "scpaste";
         };
         packageRequires = [ htmlize ];
         meta = {
-          homepage = "http://melpa.org/#/scpaste";
+          homepage = "https://melpa.org/#/scpaste";
           license = lib.licenses.free;
         };
       }) {};
@@ -22629,13 +23681,13 @@
           sha256 = "0zpjf9cp8g4rgnwgmhlpwnanf9lzqm3rm1mkihf0gk5qzxvwsdh9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scss-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/scss-mode";
           sha256 = "1g27xnp6bjaicxjlb9m0njc6fg962j3hlvvzmxvmyk7gsdgcgpkv";
           name = "scss-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/scss-mode";
+          homepage = "https://melpa.org/#/scss-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -22650,13 +23702,13 @@
           sha256 = "08yc67a4ji7z8s0zh500wiscziqsxi92i1d33fjla2mcr8sxxn0i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/search-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/search-web";
           sha256 = "0qqx9l8dn1as4gqpq80jfacn6lz0132m91pjzxv0fx6al2iz0m36";
           name = "search-web";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/search-web";
+          homepage = "https://melpa.org/#/search-web";
           license = lib.licenses.free;
         };
       }) {};
@@ -22671,13 +23723,13 @@
           sha256 = "0nsm7z056rh32sq7abgdwyaz4dbz8v9pgbha5jvpk7y0zmnabrgs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sekka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sekka";
           sha256 = "1jj4ly9p7m3xvb31nfn171lbpm9y70y8cbf8p24w0fhv665dx0cp";
           name = "sekka";
         };
         packageRequires = [ cl-lib concurrent popup ];
         meta = {
-          homepage = "http://melpa.org/#/sekka";
+          homepage = "https://melpa.org/#/sekka";
           license = lib.licenses.free;
         };
       }) {};
@@ -22692,13 +23744,13 @@
           sha256 = "1c9yv1kjcd0jrzgw99q9p4kzj980f261mjcsggbcw806wb0iw1xn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/select-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/select-themes";
           sha256 = "18ydv7240vcqppg1i7n8sy18hy0lhpxz17947kxs7mvj4rl4wd84";
           name = "select-themes";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/select-themes";
+          homepage = "https://melpa.org/#/select-themes";
           license = lib.licenses.free;
         };
       }) {};
@@ -22713,13 +23765,13 @@
           sha256 = "18xdkisxvdizsk51pnyimp9mwc6k9cpcxqr5hgndkz9q97p5dp79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/selectric-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/selectric-mode";
           sha256 = "1k4l0lr68rqyi37wvqp1cnfci6jfkz0gvrd1hwbgx04cjgmz56n4";
           name = "selectric-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/selectric-mode";
+          homepage = "https://melpa.org/#/selectric-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -22728,19 +23780,19 @@
         pname = "servant";
         version = "0.3.0";
         src = fetchFromGitHub {
-          owner = "rejeep";
-          repo = "servant.el";
+          owner = "cask";
+          repo = "servant";
           rev = "4d2aa8250b54b28e6e7ee4cd5ebd98a33db2c134";
           sha256 = "15lx6qvmq3vp84ys8dzbx1nzxcnzlq41whawc2yhrnd1dbq4mv2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/servant";
-          sha256 = "048xg0gcwnf4l2p56iw4iawi3ywjz7f6icnjfi8qzk1z912iyl9h";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/servant";
+          sha256 = "0h8xsg37cvc5r8vkclf7d3gbf6gh4k5pmbiyhwpkbrxwjyl1sl21";
           name = "servant";
         };
         packageRequires = [ ansi commander dash epl f s shut-up web-server ];
         meta = {
-          homepage = "http://melpa.org/#/servant";
+          homepage = "https://melpa.org/#/servant";
           license = lib.licenses.free;
         };
       }) {};
@@ -22755,13 +23807,13 @@
           sha256 = "1h58q41wixjlapia1ggf83jxcllq7492k55mc0fq7hbx3hw1q1y2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/serverspec";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/serverspec";
           sha256 = "001d57yd0wmz4d7qmhnanac8g29wls0sqw194003hrgirakg82id";
           name = "serverspec";
         };
         packageRequires = [ dash f helm s ];
         meta = {
-          homepage = "http://melpa.org/#/serverspec";
+          homepage = "https://melpa.org/#/serverspec";
           license = lib.licenses.free;
         };
       }) {};
@@ -22776,13 +23828,13 @@
           sha256 = "0sp952abz7dkq8b8kkzzmnwnkq5w15zsx5dr3h8lzxb92lnank9v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/session";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/session";
           sha256 = "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx";
           name = "session";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/session";
+          homepage = "https://melpa.org/#/session";
           license = lib.licenses.free;
         };
       }) {};
@@ -22797,13 +23849,13 @@
           sha256 = "11h5z2gmwq07c4gqzj2c9apksvqk3k8kpbb9kg78bbif2xfajr3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sexp-move";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sexp-move";
           sha256 = "0lcxmr2xqh8z7xinxbv1wyrh786zlahhhj5nnbv83i8m23i3ymmd";
           name = "sexp-move";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sexp-move";
+          homepage = "https://melpa.org/#/sexp-move";
           license = lib.licenses.free;
         };
       }) {};
@@ -22818,13 +23870,34 @@
           sha256 = "0yy162sz7vwj0i9w687a5x1c2fq31vc3i6gqhbywspviczdp4q1y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shackle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shackle";
           sha256 = "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6";
           name = "shackle";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/shackle";
+          homepage = "https://melpa.org/#/shackle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shakespeare-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shakespeare-mode";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "CodyReichert";
+          repo = "shakespeare-mode";
+          rev = "4bff63eeac2b7ec1220f17e8bbcddbea4c11cb02";
+          sha256 = "0vkxl3w4y4yacs1s4v0gwggvzrss8g74d3dgk8h3gphl4dlgx496";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shakespeare-mode";
+          sha256 = "1i9fr9l3x7pwph654hqd8s74swy5gmn3wzs85a2ibmpcjq8mz9rd";
+          name = "shakespeare-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/shakespeare-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -22839,13 +23912,13 @@
           sha256 = "11g9lsgakq8nf689k49p9l536ffi62g3bh11mh9ix1l058xamqw2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shampoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shampoo";
           sha256 = "01ssgw4cnnx8d86g3r1d5hqcib4qyhmpqvcvx47xs7zh0jscps61";
           name = "shampoo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/shampoo";
+          homepage = "https://melpa.org/#/shampoo";
           license = lib.licenses.free;
         };
       }) {};
@@ -22860,13 +23933,13 @@
           sha256 = "0fzywfdaisvvdbcl813n1shz0r8v1k9kcgxgynv5l0i4nkrgkww5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-pop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shell-pop";
           sha256 = "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8";
           name = "shell-pop";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/shell-pop";
+          homepage = "https://melpa.org/#/shell-pop";
           license = lib.licenses.free;
         };
       }) {};
@@ -22881,13 +23954,13 @@
           sha256 = "0mcxp74sk9bn36gbhhimgns07iqa4dgbq2pvpqy41igqwb84w306";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-split-string";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shell-split-string";
           sha256 = "1yj1h7za4ylxh2nikj7s1qqlilpsk05x9571a2fymfyznm3iq77m";
           name = "shell-split-string";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/shell-split-string";
+          homepage = "https://melpa.org/#/shell-split-string";
           license = lib.licenses.free;
         };
       }) {};
@@ -22902,13 +23975,13 @@
           sha256 = "0ia7sdip4hl27avckv3qpqgm3k4ynvp3xxq1cy53bqfzzx0gcria";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-switcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shell-switcher";
           sha256 = "07g9naiv2jk9jxwjywrbb05dy0pbfdx6g8pkra38rn3vqrjzvhyx";
           name = "shell-switcher";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/shell-switcher";
+          homepage = "https://melpa.org/#/shell-switcher";
           license = lib.licenses.free;
         };
       }) {};
@@ -22923,13 +23996,13 @@
           sha256 = "0wvaa5nrbblayjvzjyj6cd942ywg7xz5d8fqaffxcvwlcdihvm7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shell-toggle";
           sha256 = "1ai0ks7smr8b221j9hmsikswpxqraa9b13fpwv4wwagavnlah446";
           name = "shell-toggle";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/shell-toggle";
+          homepage = "https://melpa.org/#/shell-toggle";
           license = lib.licenses.free;
         };
       }) {};
@@ -22944,13 +24017,13 @@
           sha256 = "1nli26llyfkj1cz2dwn18c5pz1pnpz3866hapfibvdmwrg4z6cax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shelldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shelldoc";
           sha256 = "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx";
           name = "shelldoc";
         };
         packageRequires = [ cl-lib s ];
         meta = {
-          homepage = "http://melpa.org/#/shelldoc";
+          homepage = "https://melpa.org/#/shelldoc";
           license = lib.licenses.free;
         };
       }) {};
@@ -22965,13 +24038,34 @@
           sha256 = "0mn7bwvj1yv75a2531jp929j6ypckdfqdg6b5ig0kkbcrrwb7kxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shelltest-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shelltest-mode";
           sha256 = "1inb0vq34fbwkr0jg4dv2lljag8djggi8kyssrzhfawri50m81nh";
           name = "shelltest-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/shelltest-mode";
+          homepage = "https://melpa.org/#/shelltest-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shift-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shift-number";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "shift-number.el";
+          rev = "ba3c1f2e6b01bf14aa1433c2a49098af1c025f7c";
+          sha256 = "0zlwmzsxkv4mkggylxfx2fkrwgz7dz3zbg2gkn2rxcpy2k2gla64";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shift-number";
+          sha256 = "1sbzkmd336d0dcdpk29pzk2b5bhlahrn083x62l6m150n2xzxn4p";
+          name = "shift-number";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/shift-number";
           license = lib.licenses.free;
         };
       }) {};
@@ -22986,13 +24080,13 @@
           sha256 = "1vf766ja8f4xp1f5pmwgz6a85km0nxvc5dn571lwidfrrdbr9rkk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shm";
           sha256 = "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c";
           name = "shm";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/shm";
+          homepage = "https://melpa.org/#/shm";
           license = lib.licenses.free;
         };
       }) {};
@@ -23007,13 +24101,13 @@
           sha256 = "09454mcjd8n1090pjc5mk1dc6bn3bgh60ddpnv9hkajkzpcjxx4h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shpec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shpec-mode";
           sha256 = "155hc1nym3fsvflps8d3ixaqw1cafqp97zcaywdppp47n7vj8zjl";
           name = "shpec-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/shpec-mode";
+          homepage = "https://melpa.org/#/shpec-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -23028,13 +24122,13 @@
           sha256 = "050gmxdk88zlfjwi07jsj2mvsfcv5imhzcpa6ip3cqkzpmw3pl32";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shrink-whitespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shrink-whitespace";
           sha256 = "12if0000i3rrxcm732layrv2h464wbb4xflbbfc844c83dbx1jmq";
           name = "shrink-whitespace";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/shrink-whitespace";
+          homepage = "https://melpa.org/#/shrink-whitespace";
           license = lib.licenses.free;
         };
       }) {};
@@ -23049,13 +24143,13 @@
           sha256 = "103yvfgkj78i4bnv1fwk76izsa8h4wyj3vwj1vq7xggj607hkxzq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shut-up";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/shut-up";
           sha256 = "1bcqrnnafnimfcg1s7vrgq4cb4rxi5sgpd92jj7xywvkalr3kh26";
           name = "shut-up";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/shut-up";
+          homepage = "https://melpa.org/#/shut-up";
           license = lib.licenses.free;
         };
       }) {};
@@ -23070,13 +24164,13 @@
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sift";
           sha256 = "0mv5zk140kjilwvzccj75ym7wlkkqryb532mbsy7i9bs3q7m916d";
           name = "sift";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sift";
+          homepage = "https://melpa.org/#/sift";
           license = lib.licenses.free;
         };
       }) {};
@@ -23086,18 +24180,18 @@
         version = "1.4.6";
         src = fetchFromGitHub {
           owner = "skeeto";
-          repo = "emacs-http-server";
+          repo = "emacs-web-server";
           rev = "b191b07c942e44c946a22a826c4d9c9a0475fd7e";
           sha256 = "1qmkc0w28l53zzf5yd2grrk1sq222g5qnsm35ph25s1cfvc1qb2g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simple-httpd";
-          sha256 = "18dharsdiwfkmhd9ibz9f47yfq9c2d78i886pi6gsjh8iwcpzx59";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/simple-httpd";
+          sha256 = "1g9m8dx62pql6dqz490pifcli96i5pv6sar18w4lwrfgpfisfz8c";
           name = "simple-httpd";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/simple-httpd";
+          homepage = "https://melpa.org/#/simple-httpd";
           license = lib.licenses.free;
         };
       }) {};
@@ -23112,13 +24206,13 @@
           sha256 = "0v0vmkix9f0hb2183irr6xra8mwi47g6rn843sas7jy2ycaqd91v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simpleclip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/simpleclip";
           sha256 = "07qkfwlg8vw5kb097qbsv082hxir047q2bcvc8scbak2dr6pl12s";
           name = "simpleclip";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/simpleclip";
+          homepage = "https://melpa.org/#/simpleclip";
           license = lib.licenses.free;
         };
       }) {};
@@ -23133,13 +24227,13 @@
           sha256 = "04giklbd1fsw2zysr7aqg17h6cpyn4i9jbknm4d4v6581f2pcl93";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simplenote2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/simplenote2";
           sha256 = "1qdzbwhzmsga65wmrd0mb3rbs71nlyqqb6f4v7kvfxzyis50cswm";
           name = "simplenote2";
         };
         packageRequires = [ request-deferred ];
         meta = {
-          homepage = "http://melpa.org/#/simplenote2";
+          homepage = "https://melpa.org/#/simplenote2";
           license = lib.licenses.free;
         };
       }) {};
@@ -23154,34 +24248,13 @@
           sha256 = "1p1771qm3jndnf4rdhb1bri5cjiksvxizagi7vfb7mjmsmx18w61";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simplezen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/simplezen";
           sha256 = "13f2anhfsxmx1vdd209gxkhpywsi3nn6pazhc6bkswmn27yiig7j";
           name = "simplezen";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/simplezen";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sisyphus = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
-    melpaBuild {
-        pname = "sisyphus";
-        version = "0.1";
-        src = fetchFromGitHub {
-          owner = "phillord";
-          repo = "sisyphus";
-          rev = "880d519d6b1e7202a72b1632733690310efb197f";
-          sha256 = "0jy08kj7cy744lbdyil0j50b08vm76bzxwmzd99v4sz12s3qcd2s";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sisyphus";
-          sha256 = "08400jazj7w63l8g9ypy6w9dj8r0xh4d2yg3nfwqqf5lhfnj9bnj";
-          name = "sisyphus";
-        };
-        packageRequires = [ dash emacs m-buffer ];
-        meta = {
-          homepage = "http://melpa.org/#/sisyphus";
+          homepage = "https://melpa.org/#/simplezen";
           license = lib.licenses.free;
         };
       }) {};
@@ -23196,13 +24269,13 @@
           sha256 = "101xn4glqi7b5vhdqqahj2ib4pm30pzq8sad7zagxw9csihcri3q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/skeletor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/skeletor";
           sha256 = "1vfvg5l12dzksr24dxwc6ngawsqzpxjs97drw48qav9dy1vyl10v";
           name = "skeletor";
         };
         packageRequires = [ cl-lib dash emacs f let-alist s ];
         meta = {
-          homepage = "http://melpa.org/#/skeletor";
+          homepage = "https://melpa.org/#/skeletor";
           license = lib.licenses.free;
         };
       }) {};
@@ -23217,13 +24290,13 @@
           sha256 = "0g5sapd76pjnfhxlw149zj0fpn6l3pz3l8qlcn2c237vm8vn6qv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/skewer-less";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/skewer-less";
           sha256 = "0fhv5cnp5bgw3krfmb0jl18kw2hzx2p81falj57lg3p8rn23dryl";
           name = "skewer-less";
         };
         packageRequires = [ skewer-mode ];
         meta = {
-          homepage = "http://melpa.org/#/skewer-less";
+          homepage = "https://melpa.org/#/skewer-less";
           license = lib.licenses.free;
         };
       }) {};
@@ -23238,13 +24311,13 @@
           sha256 = "05jndz0c26q60s416vqgvr66axdmxb7qsr2g70fvl5iqavnayhpv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/skewer-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/skewer-mode";
           sha256 = "1zp4myi9f7pw6zkgc0xg12585iihn7khcsf20pvqyc0vn4ajdwqm";
           name = "skewer-mode";
         };
         packageRequires = [ emacs js2-mode simple-httpd ];
         meta = {
-          homepage = "http://melpa.org/#/skewer-mode";
+          homepage = "https://melpa.org/#/skewer-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -23259,13 +24332,13 @@
           sha256 = "09ccdgg2wgw3xmlkpjsaqmnmf7f8rhjy4g6ypsn1sk5rgbgk8aj8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slamhound";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/slamhound";
           sha256 = "14zlcw0zw86awd6g98l4h2whav9amz4m8ik877d1wsdjf69g7k9x";
           name = "slamhound";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/slamhound";
+          homepage = "https://melpa.org/#/slamhound";
           license = lib.licenses.free;
         };
       }) {};
@@ -23280,13 +24353,13 @@
           sha256 = "0rk12am1dq52khwkwrmg70zarhni2avj4sy44jqckb4x7sv7djfk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slideview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/slideview";
           sha256 = "0zr08yrnrz49zds1651ysmgjqgbnhfdcqbg90sbsb086iw89rxl1";
           name = "slideview";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/slideview";
+          homepage = "https://melpa.org/#/slideview";
           license = lib.licenses.free;
         };
       }) {};
@@ -23301,13 +24374,13 @@
           sha256 = "1cl8amk1kc7a953l1khjms04j40mfkpnbsjz3qa123msgachrsg7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slim-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/slim-mode";
           sha256 = "1hip0r22irr9sah3b65ky71ic508bhqvj9hj95a81qvy1zi9rcac";
           name = "slim-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/slim-mode";
+          homepage = "https://melpa.org/#/slim-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -23322,13 +24395,13 @@
           sha256 = "07gfd8k0gbzylr9y8asp35p9139w79c36pbnixp4y2fimgbfri2c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/slime";
           sha256 = "04zcvjg0bbx5mdbsk9yn7rlprakl89dq6jmnq5v2g0n6q0mh6ign";
           name = "slime";
         };
         packageRequires = [ cl-lib macrostep ];
         meta = {
-          homepage = "http://melpa.org/#/slime";
+          homepage = "https://melpa.org/#/slime";
           license = lib.licenses.free;
         };
       }) {};
@@ -23343,13 +24416,13 @@
           sha256 = "0rdhd6kymbzhkc96dxy3nr21ajrkc7iy6zvq1va22r90f96jj9x4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/slime-company";
           sha256 = "195s5fi2dl3h2jyy4d45q22jac35sciz81n13b4lgw94mkxx4rq2";
           name = "slime-company";
         };
         packageRequires = [ company slime ];
         meta = {
-          homepage = "http://melpa.org/#/slime-company";
+          homepage = "https://melpa.org/#/slime-company";
           license = lib.licenses.free;
         };
       }) {};
@@ -23364,13 +24437,13 @@
           sha256 = "0jrsilyvzdi3xdmkm6gsniw4zdg9zsxb4i6k3fm5byxvhpbwd3k4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime-docker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/slime-docker";
           sha256 = "18v62y4f613d7mpqpb8sc8hzvyhcgzrbqrc0k7w9pqf00jnl192h";
           name = "slime-docker";
         };
         packageRequires = [ cl-lib docker-tramp emacs slime ];
         meta = {
-          homepage = "http://melpa.org/#/slime-docker";
+          homepage = "https://melpa.org/#/slime-docker";
           license = lib.licenses.free;
         };
       }) {};
@@ -23385,13 +24458,13 @@
           sha256 = "0lp584k35asqlvbhglv124jazdgp3h7pzl0akfwbdmby9zayqk96";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime-ritz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/slime-ritz";
           sha256 = "1y1439y07l1a0sp9wn110hw4yyxj8n1cnd6h17rmsr549m2qbg1a";
           name = "slime-ritz";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/slime-ritz";
+          homepage = "https://melpa.org/#/slime-ritz";
           license = lib.licenses.free;
         };
       }) {};
@@ -23406,13 +24479,13 @@
           sha256 = "00v4mh04affd8kkw4rn51djpyga2rb8f63mgy86napglqnkz40r3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime-volleyball";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/slime-volleyball";
           sha256 = "1dzvj8z3l5l9ixjl3nc3c7zzi23zc2300r7jzw2l3bvg64cfbdg7";
           name = "slime-volleyball";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/slime-volleyball";
+          homepage = "https://melpa.org/#/slime-volleyball";
           license = lib.licenses.free;
         };
       }) {};
@@ -23427,13 +24500,13 @@
           sha256 = "1aihr5pbdqjb5j6xsghi7qbrmp46kddv76xmyx5z98m93n70wzqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sly";
           sha256 = "1pmyqjk8fdlzwvrlx8h6fq0savksfny78fhmr8r7b07pi20y6n9l";
           name = "sly";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sly";
+          homepage = "https://melpa.org/#/sly";
           license = lib.licenses.free;
         };
       }) {};
@@ -23448,13 +24521,13 @@
           sha256 = "11p89pz6zmnjng5177w31ilcmifvnhv9mfjy79ic7amg01h09hsr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sly-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sly-company";
           sha256 = "1n8bx0qis2bs49c589cbh59xcv06r8sx6y4lxprc9pfpycx7h6v2";
           name = "sly-company";
         };
         packageRequires = [ company emacs sly ];
         meta = {
-          homepage = "http://melpa.org/#/sly-company";
+          homepage = "https://melpa.org/#/sly-company";
           license = lib.licenses.free;
         };
       }) {};
@@ -23469,13 +24542,13 @@
           sha256 = "0yvlmwnhdph5qj1998jz0idcl7901j6fxa9hivr7kic57j8kbq71";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smart-mode-line";
           sha256 = "0qmhzlkc6mfqyaw4jaw6195b8sw0wg9pfjcijb4p0mlywf5mh5q6";
           name = "smart-mode-line";
         };
         packageRequires = [ emacs rich-minority ];
         meta = {
-          homepage = "http://melpa.org/#/smart-mode-line";
+          homepage = "https://melpa.org/#/smart-mode-line";
           license = lib.licenses.free;
         };
       }) {};
@@ -23490,13 +24563,13 @@
           sha256 = "0yvlmwnhdph5qj1998jz0idcl7901j6fxa9hivr7kic57j8kbq71";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-mode-line-powerline-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smart-mode-line-powerline-theme";
           sha256 = "0hv3mx39m3l35xhz351zp98321ilr6qq9wzwn1f0ziiv814khcn4";
           name = "smart-mode-line-powerline-theme";
         };
         packageRequires = [ emacs powerline smart-mode-line ];
         meta = {
-          homepage = "http://melpa.org/#/smart-mode-line-powerline-theme";
+          homepage = "https://melpa.org/#/smart-mode-line-powerline-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -23511,13 +24584,13 @@
           sha256 = "1kfihh4s8578cwqyzn5kp3iib7f9vvg6rfc3klqzgads187ryd4z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-tabs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smart-tabs-mode";
           sha256 = "1fmbi0ypzhsizzb1vm92hfaq23swiyiqvg0pmibavzqyc9lczhhl";
           name = "smart-tabs-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smart-tabs-mode";
+          homepage = "https://melpa.org/#/smart-tabs-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -23532,13 +24605,13 @@
           sha256 = "1mx4hdbrk6v52y5r47fbd6kgqyk3lvqgq8lw3hkww0pqfwwp4x6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smartparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smartparens";
           sha256 = "025nfrfw0992024i219jzm4phwf29smc5hib45s6h1s67942mqh6";
           name = "smartparens";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
-          homepage = "http://melpa.org/#/smartparens";
+          homepage = "https://melpa.org/#/smartparens";
           license = lib.licenses.free;
         };
       }) {};
@@ -23553,13 +24626,13 @@
           sha256 = "0j5lg9gryl8vbzw8d3r2fl0c9wxa0c193mcvdfidd25b98wccc3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smartrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smartrep";
           sha256 = "1ypls52d51lcqhz737rqg73c6jwl6q8b3bwb29z51swyamf37rbn";
           name = "smartrep";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smartrep";
+          homepage = "https://melpa.org/#/smartrep";
           license = lib.licenses.free;
         };
       }) {};
@@ -23574,13 +24647,13 @@
           sha256 = "1sd7dh9114mvr4xnp43xx4b7qmwkaj1a1fv7pwc28fhiy89d2md4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smartscan";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smartscan";
           sha256 = "0vghgmx8vnjbvsw7q5zs0qz2wm6dcng9m69b8dq81g2cq9dflbwb";
           name = "smartscan";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smartscan";
+          homepage = "https://melpa.org/#/smartscan";
           license = lib.licenses.free;
         };
       }) {};
@@ -23595,13 +24668,13 @@
           sha256 = "1pcpg3lalbrc24z3vwcaysps8dbdzmncdgqdd5ig6yk2a9wyj9ng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smeargle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smeargle";
           sha256 = "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd";
           name = "smeargle";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/smeargle";
+          homepage = "https://melpa.org/#/smeargle";
           license = lib.licenses.free;
         };
       }) {};
@@ -23616,13 +24689,13 @@
           sha256 = "1hcjh577xz3inx28r8wb4g2b1424ccw8pffvgdmpf80xp1llldj5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smex";
           sha256 = "1rwyi7gdzswafkwpfqd6zkxka1mrf4xz17kld95d2ram6cxl6zda";
           name = "smex";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smex";
+          homepage = "https://melpa.org/#/smex";
           license = lib.licenses.free;
         };
       }) {};
@@ -23637,55 +24710,55 @@
           sha256 = "1kkg7qhb2lmwr4siiazqny9w2z9nk799lzl5i159lfivlxcgixmk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smooth-scroll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smooth-scroll";
           sha256 = "1b0mjpd4dqgk7ij37145ry2jqbn1msf8rrvymn7zyckbccg83zsf";
           name = "smooth-scroll";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smooth-scroll";
+          homepage = "https://melpa.org/#/smooth-scroll";
           license = lib.licenses.free;
         };
       }) {};
     smooth-scrolling = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smooth-scrolling";
-        version = "1.0.4";
+        version = "2.0.0";
         src = fetchFromGitHub {
           owner = "aspiers";
           repo = "smooth-scrolling";
-          rev = "0d9b228f952c53ad456f98e2c761dda70ed72174";
-          sha256 = "05kf3hb3nb32jzw50a2z9vlf3f0pj40klzxvqj4fxlci777imsvk";
+          rev = "6a1420be510decde0a5eabc56cff229ae554417e";
+          sha256 = "1dkqix0iyjyiqf34h3p8faqcpffc0pwkxqqn80ys9jvj4f27kkrg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smooth-scrolling";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/smooth-scrolling";
           sha256 = "0zy2xsmr05l2narslfgril36d7qfb55f52qm2ki6fy1r18lfiyc6";
           name = "smooth-scrolling";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/smooth-scrolling";
+          homepage = "https://melpa.org/#/smooth-scrolling";
           license = lib.licenses.free;
         };
       }) {};
-    snakemake-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "snakemake-mode";
-        version = "0.3.0";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "kyleam";
           repo = "snakemake-mode";
-          rev = "0f1857cacfcc36c3641d63c72a38224661d3b9a6";
-          sha256 = "0pl7vxaha79v9199j4s1fjxxca3fq9fdhbdaz5wppg3b851a7mx3";
+          rev = "27c19be6fec7b198f5e41c20c914f34183917ffb";
+          sha256 = "174gbq9ydgq6vjxplnwqn4kil9yzxh9spdp6dhgr81b32ifvd5hi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/snakemake-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/snakemake-mode";
           sha256 = "1xxd3dms5vgvpn18a70wjprka5xvri2pj9cw8qz09s640f5jf3r4";
           name = "snakemake-mode";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ cl-lib emacs magit-popup ];
         meta = {
-          homepage = "http://melpa.org/#/snakemake-mode";
+          homepage = "https://melpa.org/#/snakemake-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -23700,13 +24773,13 @@
           sha256 = "0zcj9jf8nlsj9vms888z2vs76q54n8g8r9sh381xad3x8d6lrlb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/solarized-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/solarized-theme";
           sha256 = "15d8k32sj8i11806byvf7r57rivz391ljr0zb4dx8n8vjjkyja12";
           name = "solarized-theme";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/solarized-theme";
+          homepage = "https://melpa.org/#/solarized-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -23721,34 +24794,55 @@
           sha256 = "0b5w3vdr8llg3hqd22gnc6b6y089lq6vfk0ajkws6gfldz2gg2v1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sos";
           sha256 = "1gkd0plx7152s3dj8a9lwlwh8bgs1m006s80l10agclx6aay8rvb";
           name = "sos";
         };
         packageRequires = [ org ];
         meta = {
-          homepage = "http://melpa.org/#/sos";
+          homepage = "https://melpa.org/#/sos";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sotclojure = callPackage ({ cider, clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sotlisp }:
+    melpaBuild {
+        pname = "sotclojure";
+        version = "1.2";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "speed-of-thought-clojure";
+          rev = "8d879ef41c004726cca3c27a81b7543cc273c19b";
+          sha256 = "13yn2yadkpmykaly3l3xsq1bhm4sxyk8k1px555y11qi0mfdcjhh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sotclojure";
+          sha256 = "12byqjzg0pffqyq958265qq8yxxmf3iyy4m7zib492qcj8ccy090";
+          name = "sotclojure";
+        };
+        packageRequires = [ cider clojure-mode emacs sotlisp ];
+        meta = {
+          homepage = "https://melpa.org/#/sotclojure";
           license = lib.licenses.free;
         };
       }) {};
     sotlisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sotlisp";
-        version = "1.4.1";
+        version = "1.5.2";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "speed-of-thought-lisp";
-          rev = "6e0ebc97000dc505f72ad9cc793ac857b0585f5a";
-          sha256 = "1wbd7v5bnd4qgqk8rrgllal0i949n8xzvb3yhf0vnxr06wdzy0a4";
+          rev = "b67364d4825a9bf0a22261809ee9e9060b268198";
+          sha256 = "0xykm4yayb8gw83arv5p205cx18j14q9407rqw3sbcj9cj5nbk34";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sotlisp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sotlisp";
           sha256 = "0zjnn6hhwy6cjvc5rhvhxcq5pmrhcyil14a48fcgwvg4lv7fbljk";
           name = "sotlisp";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/sotlisp";
+          homepage = "https://melpa.org/#/sotlisp";
           license = lib.licenses.free;
         };
       }) {};
@@ -23763,34 +24857,34 @@
           sha256 = "0q2ragq4hw89d3w48ykwljb19n2nhz8z6bsmb10shimaf203652g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sound-wav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sound-wav";
           sha256 = "1vrwzk6zqma7r0w5ivbx16shys6hsifj52fwlf5rxs6jg1gqdb4f";
           name = "sound-wav";
         };
         packageRequires = [ cl-lib deferred ];
         meta = {
-          homepage = "http://melpa.org/#/sound-wav";
+          homepage = "https://melpa.org/#/sound-wav";
           license = lib.licenses.free;
         };
       }) {};
     sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sourcekit";
-        version = "0.1.4";
+        version = "0.1.5";
         src = fetchFromGitHub {
           owner = "nathankot";
           repo = "company-sourcekit";
-          rev = "ea26c1284ccf72d6e3a850c6725433f0f8e2b3f9";
-          sha256 = "1l9xrw88wq32wm3qx922ihdb9mlv9rrdalwvz9i2790fmw7y84vz";
+          rev = "c9694cd8e84f4c7deffa6111297cb80eb7cb02a6";
+          sha256 = "04nm015408gzybfka0sc3czkf5y61x76h3sx3vlijf67i54bz7pi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sourcekit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sourcekit";
           sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks";
           name = "sourcekit";
         };
         packageRequires = [ dash dash-functional emacs ];
         meta = {
-          homepage = "http://melpa.org/#/sourcekit";
+          homepage = "https://melpa.org/#/sourcekit";
           license = lib.licenses.free;
         };
       }) {};
@@ -23805,13 +24899,13 @@
           sha256 = "1k2gfw4dydzqxbfdmcghajbb2lyg1j4wgdhp8chlql3dax1f503d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sourcemap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sourcemap";
           sha256 = "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5";
           name = "sourcemap";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/sourcemap";
+          homepage = "https://melpa.org/#/sourcemap";
           license = lib.licenses.free;
         };
       }) {};
@@ -23826,13 +24920,13 @@
           sha256 = "0j4qm1y7rhb95k1zbl3c60a46l9rchzslzq36mayyw61s6yysjnv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sourcetalk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sourcetalk";
           sha256 = "0qaf2q784xgl1s3m88jpwdzghpi4f3nybga3lnr1w7sb7b3yvj3z";
           name = "sourcetalk";
         };
         packageRequires = [ request ];
         meta = {
-          homepage = "http://melpa.org/#/sourcetalk";
+          homepage = "https://melpa.org/#/sourcetalk";
           license = lib.licenses.free;
         };
       }) {};
@@ -23847,13 +24941,13 @@
           sha256 = "1ncwv6sqm1ch396qi1c8276dc910rnm0f3m8xjkskplv3cjaq0ai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/spaceline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/spaceline";
           sha256 = "0jpcj0i8ckdylrisx9b4l9kam6kkjzhhv1s7mwwi4b744rx942iw";
           name = "spaceline";
         };
         packageRequires = [ cl-lib dash emacs powerline s ];
         meta = {
-          homepage = "http://melpa.org/#/spaceline";
+          homepage = "https://melpa.org/#/spaceline";
           license = lib.licenses.free;
         };
       }) {};
@@ -23868,13 +24962,13 @@
           sha256 = "1gmmmkzxxlpz2ml6qk24vndlrbyl55r5cba76jn342zrxvb357ny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sparkline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sparkline";
           sha256 = "081jzaxjb32nydvr1kmyafxqxi610n0yf8lwz9vldm84famf3g7y";
           name = "sparkline";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/sparkline";
+          homepage = "https://melpa.org/#/sparkline";
           license = lib.licenses.free;
         };
       }) {};
@@ -23889,13 +24983,13 @@
           sha256 = "1gk2ps7fn9z8n6r923qzn518gz9mrj7mb6j726cz8qb585ndjbij";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sparql-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sparql-mode";
           sha256 = "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d";
           name = "sparql-mode";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/sparql-mode";
+          homepage = "https://melpa.org/#/sparql-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -23910,13 +25004,13 @@
           sha256 = "1k6c7450v0ln6l9b8z1hib2s2b4rmjbskynvwwyilgdnvginfhi3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/speech-tagger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/speech-tagger";
           sha256 = "0sqil949ny9qjxq7kpb4zmjd7770r0qvq4sz80agw6a27mqnaajc";
           name = "speech-tagger";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/speech-tagger";
+          homepage = "https://melpa.org/#/speech-tagger";
           license = lib.licenses.free;
         };
       }) {};
@@ -23931,13 +25025,13 @@
           sha256 = "1q6v0xfdxm57lyj4zxyqv6n5ik5w9drk7yf9w8spb5r22jg0dg8c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sphinx-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sphinx-doc";
           sha256 = "00h3wx2p5hzbw6sggggdrzv4jrn1wc051iqql5y2m1hsh772ic5z";
           name = "sphinx-doc";
         };
         packageRequires = [ cl-lib s ];
         meta = {
-          homepage = "http://melpa.org/#/sphinx-doc";
+          homepage = "https://melpa.org/#/sphinx-doc";
           license = lib.licenses.free;
         };
       }) {};
@@ -23952,13 +25046,13 @@
           sha256 = "17qsmjsbk8aq3azjxid6h9fzz77bils74scp21sqn8vdnijx8991";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/splitjoin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/splitjoin";
           sha256 = "0l1x98fvvia8qx8g125h4d76slv0xnb3h1zxiq9xb5qh7a1h069l";
           name = "splitjoin";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/splitjoin";
+          homepage = "https://melpa.org/#/splitjoin";
           license = lib.licenses.free;
         };
       }) {};
@@ -23973,13 +25067,13 @@
           sha256 = "05y8xv6zapspwr5bii41lgirslas22wsbm0kgb4dm79qbk9j1kzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/spotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/spotify";
           sha256 = "0pmsvxi1dsi580wkhhx8iw329agkh5yzk61bqvxzign3cd6fbq6k";
           name = "spotify";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/spotify";
+          homepage = "https://melpa.org/#/spotify";
           license = lib.licenses.free;
         };
       }) {};
@@ -23994,13 +25088,34 @@
           sha256 = "06rk07h92s5sljprs41y3q31q64cprx9kgs56c2j6v4c8cmsq5h6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sprintly-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sprintly-mode";
           sha256 = "15i3rrv27ccpn12wwj9raaxpj7nlnrrj3lsp8vdfwph6ydvnfza4";
           name = "sprintly-mode";
         };
         packageRequires = [ furl ];
         meta = {
-          homepage = "http://melpa.org/#/sprintly-mode";
+          homepage = "https://melpa.org/#/sprintly-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sprunge = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "sprunge";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "tomjakubowski";
+          repo = "sprunge.el";
+          rev = "0fd386b8b29c4175022a04ad70ea5643185b6726";
+          sha256 = "03wjzk1ljclfjgqzkg6m7v8saaajgavyd0xskd8fg8rdkx13ki0l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sprunge";
+          sha256 = "199vfl6i881aks8fi9d9w4w7mnc7n443h79p3s4srcpmbyfg6g3w";
+          name = "sprunge";
+        };
+        packageRequires = [ cl-lib request ];
+        meta = {
+          homepage = "https://melpa.org/#/sprunge";
           license = lib.licenses.free;
         };
       }) {};
@@ -24009,19 +25124,19 @@
         pname = "sqlup-mode";
         version = "0.5.3";
         src = fetchFromGitHub {
-          owner = "trevoke";
+          owner = "Trevoke";
           repo = "sqlup-mode.el";
           rev = "7a51e34685c65952cd0635c3d35a36337fde361b";
           sha256 = "1dcb18fq84vlfgb038i2x6vy7mhin2q6jn4jl9fh256n12cx4nrn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sqlup-mode";
-          sha256 = "06a0v2qagpd9p2bh19bfw14a6if8kjjc4yyhm5nwp8a8d2vnl5l7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sqlup-mode";
+          sha256 = "0ngs58iri3fwv5ny707kvb6xjq98x19pzak8c9nq4qnpw3nkr83b";
           name = "sqlup-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sqlup-mode";
+          homepage = "https://melpa.org/#/sqlup-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -24036,13 +25151,34 @@
           sha256 = "0wx8l8gkh8rbf2g149f35gpnmkk45s9x4r844aqw5by4zkvix4rc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/srefactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/srefactor";
           sha256 = "01cd40jm4h00c5q2ix7cskp7klbkcd3n5763y5lqfv59bjxwdqd2";
           name = "srefactor";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/srefactor";
+          homepage = "https://melpa.org/#/srefactor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ssh-config-mode";
+        version = "20160326.20.550";
+        src = fetchFromGitHub {
+          owner = "jhgorrell";
+          repo = "ssh-config-mode-el";
+          rev = "3656cebd647918bd71f66e70810b9148e44f19a7";
+          sha256 = "08nx1iwvxqs1anng32w3c2clhnjf45527j0gxz5fy6h9svmb921q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ssh-config-mode";
+          sha256 = "0aihyig6q3pmk9ld519f4n3kychrg3l7r29ijd2dpvs0530md4wb";
+          name = "ssh-config-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/ssh-config-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -24057,13 +25193,13 @@
           sha256 = "0igqifws73cayvjnhhrsqpy14sr27avymfhaqzrpj76m2fsh6fj4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/stash";
           sha256 = "116k40ispv7sq3jskwc1lvmhmk3jjz4j967r732s07f5h11vk1z9";
           name = "stash";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/stash";
+          homepage = "https://melpa.org/#/stash";
           license = lib.licenses.free;
         };
       }) {};
@@ -24078,13 +25214,13 @@
           sha256 = "0jpxmzfvg4k5q3h3gn6lrg891wjzlcps2kkij1jbdjk4jkgq386i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/status";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/status";
           sha256 = "0a9lqa7a5nki5711bjrmx214kah5ndqpwh3i240gdd08mcm07ps3";
           name = "status";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/status";
+          homepage = "https://melpa.org/#/status";
           license = lib.licenses.free;
         };
       }) {};
@@ -24099,13 +25235,13 @@
           sha256 = "0pik6mq8syhxk9l9ns8wgvg5312qkckm3cilb3irwdm1dvnl5hpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stekene-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/stekene-theme";
           sha256 = "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1";
           name = "stekene-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/stekene-theme";
+          homepage = "https://melpa.org/#/stekene-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -24115,16 +25251,16 @@
         src = fetchgit {
           url = "git://repo.or.cz/stgit.git";
           rev = "48e5cef14cea5c810833d119900cd484c2a6ca85";
-          sha256 = "12c5df549d653c8ec3476ed271a4e9a4065a61a467229c070bb2e6295e285e16";
+          sha256 = "05jy51g2krmj1c3rq8k7lihml1m4x6j73lkf8z1qwg35kmadzi8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/stgit";
           sha256 = "102s9lllrcxsqs0lgbrcljwq1l3s8ri4276wck6rcypck5zgzj89";
           name = "stgit";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/stgit";
+          homepage = "https://melpa.org/#/stgit";
           license = lib.licenses.free;
         };
       }) {};
@@ -24139,13 +25275,13 @@
           sha256 = "15gdcpbba3h84s7xnpk69nav6bixdixnirdh5n1rly010q0m5s5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/string-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/string-edit";
           sha256 = "1l1hqsfyi6pp4x4g1rk4s7x9zjc03wfmhy16izia8nkjhzz88fi8";
           name = "string-edit";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/string-edit";
+          homepage = "https://melpa.org/#/string-edit";
           license = lib.licenses.free;
         };
       }) {};
@@ -24160,13 +25296,13 @@
           sha256 = "03azfs6z0jg66ppalijcxl973vdbhj4c3g84sm5dm8xv6rnxrv2s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/string-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/string-utils";
           sha256 = "1vsvxc06fd3wardldb83i5hjfibvmiqnxvcgdns7i5i8qlsrsx4v";
           name = "string-utils";
         };
         packageRequires = [ list-utils ];
         meta = {
-          homepage = "http://melpa.org/#/string-utils";
+          homepage = "https://melpa.org/#/string-utils";
           license = lib.licenses.free;
         };
       }) {};
@@ -24181,13 +25317,13 @@
           sha256 = "035ym1c1vzg6hjsnd258z4dkrfc11lj4c0y4gpgybhk54dq3w9dk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stripe-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/stripe-buffer";
           sha256 = "02wkb9y6vykrn6a5nfnimaplj7ig8i8h6m2rvwv08f5ilbccj16a";
           name = "stripe-buffer";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/stripe-buffer";
+          homepage = "https://melpa.org/#/stripe-buffer";
           license = lib.licenses.free;
         };
       }) {};
@@ -24198,16 +25334,16 @@
         src = fetchgit {
           url = "git://git.savannah.nongnu.org/stumpwm.git";
           rev = "4d0603e52b5bab993b3be63e3654c74f641e677d";
-          sha256 = "f5e3b0fdbdb1c747c40f7b6746de195e37bd4caccdcc05c6aa14124f29e71428";
+          sha256 = "0a0lwwlly4hlmb30bk6dmi6bsdsy37g4crvv1z24gixippyv1qzm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stumpwm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/stumpwm-mode";
           sha256 = "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86";
           name = "stumpwm-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/stumpwm-mode";
+          homepage = "https://melpa.org/#/stumpwm-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -24222,13 +25358,13 @@
           sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stylus-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/stylus-mode";
           sha256 = "152k74q6qn2xa38v2zyd5y7ya5n26nvai5v7z5fmq7jrcndp27r5";
           name = "stylus-mode";
         };
         packageRequires = [ sws-mode ];
         meta = {
-          homepage = "http://melpa.org/#/stylus-mode";
+          homepage = "https://melpa.org/#/stylus-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -24243,13 +25379,13 @@
           sha256 = "1j63rzxnrzzqizh7fpd99dcgsy5hd7w4d2lpwl5armmixlycl5m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/subatomic-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/subatomic-theme";
           sha256 = "0mqas67qms492n3hn74c5nrkjpsgf9b42lp02s2dh366c075dpqc";
           name = "subatomic-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/subatomic-theme";
+          homepage = "https://melpa.org/#/subatomic-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -24264,13 +25400,13 @@
           sha256 = "189547d0g9ax0nr221bkdchlfcj60dsy8lgbbrvq3n3xrmlvl362";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/subemacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/subemacs";
           sha256 = "0sqh80jhh3v37l5af7w6k9lqvj39bd91pn6a9rwdlfk389hp90zm";
           name = "subemacs";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/subemacs";
+          homepage = "https://melpa.org/#/subemacs";
           license = lib.licenses.free;
         };
       }) {};
@@ -24285,13 +25421,13 @@
           sha256 = "0mx892vn4a32df30iqmf2vsz1gdl3i557fw0194g6a66n9w2q7xf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/subshell-proc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/subshell-proc";
           sha256 = "1fnp49yhnhsj7paj0b25vr6r03hr5kpgcrci439ffpbd2c85fkw2";
           name = "subshell-proc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/subshell-proc";
+          homepage = "https://melpa.org/#/subshell-proc";
           license = lib.licenses.free;
         };
       }) {};
@@ -24306,13 +25442,13 @@
           sha256 = "1kmyivsyxr6gb2k36ssyr779rpk8qsrb27q5rjsir9fgc95qhvjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sudden-death";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sudden-death";
           sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh";
           name = "sudden-death";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sudden-death";
+          homepage = "https://melpa.org/#/sudden-death";
           license = lib.licenses.free;
         };
       }) {};
@@ -24327,13 +25463,13 @@
           sha256 = "1b637p2cyc8a83qv9vba4yamzhk08f62zykqh5p35jwvym8wkann";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/suomalainen-kalenteri";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/suomalainen-kalenteri";
           sha256 = "1wzijbgcr3jc47ccr7nrdkqha16s6gw0xiccnmdczi48cvnvvlkh";
           name = "suomalainen-kalenteri";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/suomalainen-kalenteri";
+          homepage = "https://melpa.org/#/suomalainen-kalenteri";
           license = lib.licenses.free;
         };
       }) {};
@@ -24348,13 +25484,13 @@
           sha256 = "0cw3yf2npy2ah00q2whpn52kaybbccw1qvfzsww0x4zshlrwvvvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/super-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/super-save";
           sha256 = "0ikfw7n2rvm3xcgnj1si92ly8w75x26071ki551ims7a8sawh52p";
           name = "super-save";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/super-save";
+          homepage = "https://melpa.org/#/super-save";
           license = lib.licenses.free;
         };
       }) {};
@@ -24369,13 +25505,13 @@
           sha256 = "14h40s0arc2i898r9yysn256z6l8jkrnmqvrdg7p7658c0klz5ic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/svg-mode-line-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/svg-mode-line-themes";
           sha256 = "12lnszcb9bl32n9wir7vf8xiyyv7njw4xg21aj9x4dasmidyx506";
           name = "svg-mode-line-themes";
         };
         packageRequires = [ xmlgen ];
         meta = {
-          homepage = "http://melpa.org/#/svg-mode-line-themes";
+          homepage = "https://melpa.org/#/svg-mode-line-themes";
           license = lib.licenses.free;
         };
       }) {};
@@ -24390,13 +25526,13 @@
           sha256 = "1h56qkbx5abz1l94wrdpbzspiz24mfgkppzfalvbvx5qwl079cvs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sweetgreen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sweetgreen";
           sha256 = "1v75wk0gq5fkz8i1r8pl4gqnxbv1d80isyn48w2hxj2fmdn2xhpy";
           name = "sweetgreen";
         };
         packageRequires = [ cl-lib dash helm request ];
         meta = {
-          homepage = "http://melpa.org/#/sweetgreen";
+          homepage = "https://melpa.org/#/sweetgreen";
           license = lib.licenses.free;
         };
       }) {};
@@ -24411,34 +25547,34 @@
           sha256 = "07xrcg33vsw19kz692hm7blzvnf7b6isllsz79fvs8q3l5c9mfjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/swift-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swift-mode";
           sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d";
           name = "swift-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/swift-mode";
+          homepage = "https://melpa.org/#/swift-mode";
           license = lib.licenses.free;
         };
       }) {};
-    swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "swiper";
-        version = "0.7.0";
+        version = "0.8.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "706349fcfae297ee285552af9246bc0cf00d9b7f";
-          sha256 = "1kahl3h18vsjkbqvd84fb2w45s4srsiydn6jiv49vvg1yaxzxcbm";
+          rev = "c24a3728538dd7d11de9f141b3ad1d8e0996c330";
+          sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/swiper";
-          sha256 = "1hsj6vh0vldnvwg2qmszdi0p2ig7l63vgq2kn5nv883239bxpziz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
+          sha256 = "0qaia5pgsjsmrfmcdj72jmj39zq82wg4i5l2mb2z6jlf1jpbk6y9";
           name = "swiper";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ emacs ivy ];
         meta = {
-          homepage = "http://melpa.org/#/swiper";
+          homepage = "https://melpa.org/#/swiper";
           license = lib.licenses.free;
         };
       }) {};
@@ -24453,13 +25589,13 @@
           sha256 = "1y2dbd3ikdpjvi8xz10jkrx2773h7cgr6jxm5b2bldm81lvi8x64";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/swiper-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper-helm";
           sha256 = "011ln6vny7z5vw67cpzldxf5n6sk2hjdkllyf7v6sf4m62ws93ph";
           name = "swiper-helm";
         };
         packageRequires = [ emacs helm swiper ];
         meta = {
-          homepage = "http://melpa.org/#/swiper-helm";
+          homepage = "https://melpa.org/#/swiper-helm";
           license = lib.licenses.free;
         };
       }) {};
@@ -24474,13 +25610,13 @@
           sha256 = "1zpfilcaycj0l2q3zyvpjbwp5j3d9rrkacd5swzlr1n1klvbji48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/switch-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/switch-window";
           sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2";
           name = "switch-window";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/switch-window";
+          homepage = "https://melpa.org/#/switch-window";
           license = lib.licenses.free;
         };
       }) {};
@@ -24495,13 +25631,13 @@
           sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sws-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sws-mode";
           sha256 = "0b12dsad0piih1qygjj0n7rni0pl8cizbzwqm9h1dr8imy53ak4i";
           name = "sws-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/sws-mode";
+          homepage = "https://melpa.org/#/sws-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -24516,13 +25652,13 @@
           sha256 = "02f63k8rzb3bcch6vj6w5c5ncccqg83siqnc8hyi0lhy1bfx240p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/sx";
           sha256 = "1ml1rkhhk3hkd16ij2zwng591rxs2yppsfq9gwd4ppk02if4v517";
           name = "sx";
         };
         packageRequires = [ cl-lib emacs json let-alist markdown-mode ];
         meta = {
-          homepage = "http://melpa.org/#/sx";
+          homepage = "https://melpa.org/#/sx";
           license = lib.licenses.free;
         };
       }) {};
@@ -24531,19 +25667,19 @@
         pname = "synosaurus";
         version = "0.1.0";
         src = fetchFromGitHub {
-          owner = "rootzlevel";
+          owner = "hpdeifel";
           repo = "synosaurus";
           rev = "56efdc38952b9bd56a445591fcdeb626aede8678";
           sha256 = "0hi2jflrlpp7xkbj852vp9hcl8bfmf04jqw1hawxrw4bxdp95jh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/synosaurus";
-          sha256 = "16i2ag4l824h1kq4cy01zf01zrms4v6ldwlsixwfyb1mh97lqljg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/synosaurus";
+          sha256 = "06a48ajpickf4qr1bc14skfr8khnjjph7c35b7ajfy8jw2zwavpn";
           name = "synosaurus";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/synosaurus";
+          homepage = "https://melpa.org/#/synosaurus";
           license = lib.licenses.free;
         };
       }) {};
@@ -24558,13 +25694,13 @@
           sha256 = "1pn69f4w48jdj3wd1myj6qq2mhvygmlzbq2dws2qkjlp3kbwa6da";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/syntactic-sugar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/syntactic-sugar";
           sha256 = "12b2vpvz5h4wzxrk8jrbgc8v0w6bzzvxcyfs083fi1791qq1rw7r";
           name = "syntactic-sugar";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/syntactic-sugar";
+          homepage = "https://melpa.org/#/syntactic-sugar";
           license = lib.licenses.free;
         };
       }) {};
@@ -24578,13 +25714,13 @@
           sha256 = "15zvh6dk02rm16zs6c9zvw1w76ycn61g3cpx6jb3456ff9zn6m9m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/syntax-subword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/syntax-subword";
           sha256 = "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm";
           name = "syntax-subword";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/syntax-subword";
+          homepage = "https://melpa.org/#/syntax-subword";
           license = lib.licenses.free;
         };
       }) {};
@@ -24599,13 +25735,13 @@
           sha256 = "1hixilnnybv2v3p1wpn7a0ybwah17grawszs3jycsjgzahpgckv7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/system-specific-settings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/system-specific-settings";
           sha256 = "1ydmxi8aw2lf78wv4m39yswbqkmcadqg0wmzg9s8b5h9bxxwvppp";
           name = "system-specific-settings";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/system-specific-settings";
+          homepage = "https://melpa.org/#/system-specific-settings";
           license = lib.licenses.free;
         };
       }) {};
@@ -24620,13 +25756,13 @@
           sha256 = "0axskr4q0kw8pmnl1pv2z3n6x3pn6v28qcgz3qf745lqgmsgbng9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/systemd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/systemd";
           sha256 = "1biais0cmidy3d0hf2ifdlr6qv1z8k8c8bczi07bsfk4md3idbir";
           name = "systemd";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/systemd";
+          homepage = "https://melpa.org/#/systemd";
           license = lib.licenses.free;
         };
       }) {};
@@ -24641,13 +25777,13 @@
           sha256 = "09nndx83ws5v2i9x0dzk6l1a0lq29ffzh3y05n0n64nf5j0a7zvk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ta";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ta";
           sha256 = "0kn2k4n0xfwsrniaqb36v3rxj2pf2sai3bmjksbn1g2kf5g156ll";
           name = "ta";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ta";
+          homepage = "https://melpa.org/#/ta";
           license = lib.licenses.free;
         };
       }) {};
@@ -24662,13 +25798,13 @@
           sha256 = "1xd67s92gyr49v73j7r7cbhsc40bkw8aqh21whgbypdgzpyc7azc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tabbar-ruler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tabbar-ruler";
           sha256 = "10dwjj6r74g9rzdd650wa1wxhqc0q6dmff4j0qbbhmjsxvsr3y0d";
           name = "tabbar-ruler";
         };
         packageRequires = [ tabbar ];
         meta = {
-          homepage = "http://melpa.org/#/tabbar-ruler";
+          homepage = "https://melpa.org/#/tabbar-ruler";
           license = lib.licenses.free;
         };
       }) {};
@@ -24683,13 +25819,13 @@
           sha256 = "0gy9hxm7bca0l1hfy2pzn86avpifrz3bs8xzpicj4kxw5wi4ygns";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tablist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tablist";
           sha256 = "0c10g86xjhzpmc2sqjmzcmi393qskyw6d9bydqzjk3ffjzklm45p";
           name = "tablist";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/tablist";
+          homepage = "https://melpa.org/#/tablist";
           license = lib.licenses.free;
         };
       }) {};
@@ -24704,13 +25840,13 @@
           sha256 = "0kq40g46s8kgiafrhdq99h79rz9h5fvgz59k7ralmf86bl4sdmdb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tagedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tagedit";
           sha256 = "0vfkbrxmrw4fwdz324s734zxdxm2nj3df6i8m6lgb9pizqyp2g6z";
           name = "tagedit";
         };
         packageRequires = [ dash s ];
         meta = {
-          homepage = "http://melpa.org/#/tagedit";
+          homepage = "https://melpa.org/#/tagedit";
           license = lib.licenses.free;
         };
       }) {};
@@ -24725,13 +25861,13 @@
           sha256 = "16kr1p4lzi1ysd5r2dh0mxk60zsm5fvwa9345nfyrgdic340yscc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/telepathy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/telepathy";
           sha256 = "0c3d6vk7d6vqzjndlym2kk7d2zm0b15ac4142ir03p6f19rqq9pr";
           name = "telepathy";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/telepathy";
+          homepage = "https://melpa.org/#/telepathy";
           license = lib.licenses.free;
         };
       }) {};
@@ -24746,13 +25882,34 @@
           sha256 = "0smdlzrcbmip6c6c3rd0871wv5xyagavwsxhhgvki6ybyzdj9a19";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/telephone-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/telephone-line";
           sha256 = "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3";
           name = "telephone-line";
         };
         packageRequires = [ cl-lib eieio emacs s seq ];
         meta = {
-          homepage = "http://melpa.org/#/telephone-line";
+          homepage = "https://melpa.org/#/telephone-line";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ten-hundred-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ten-hundred-mode";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "aaron-em";
+          repo = "ten-hundred-mode.el";
+          rev = "fc1d7cdb72c21dc1953ed2e2ecf28233b8b3e305";
+          sha256 = "17633jachcgnibmvx433ygcfmz3j6hzli5mqbqg83r27chiq5mjx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ten-hundred-mode";
+          sha256 = "17v38h33ka70ynq72mvma2chvlnm1k2amyvk62c65iv67rwilky3";
+          name = "ten-hundred-mode";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/ten-hundred-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -24767,13 +25924,13 @@
           sha256 = "1d1hrnxhi7h5d5i4198hx5lj7fbc280lpkxmk2nb8z6j7z0aki7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/term-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/term-alert";
           sha256 = "0x4rc1y311ivaj6mlks1j8sgzrrwqn8vx171vw7s1kgf1qzk826n";
           name = "term-alert";
         };
         packageRequires = [ alert term-cmd ];
         meta = {
-          homepage = "http://melpa.org/#/term-alert";
+          homepage = "https://melpa.org/#/term-alert";
           license = lib.licenses.free;
         };
       }) {};
@@ -24788,13 +25945,13 @@
           sha256 = "1idz9c38q47lll55w1znya00hlkwa42029ys70sb14inc51cml51";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/term-cmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/term-cmd";
           sha256 = "0fn4f32zpl0p2lid159q59lzjv4xqmc23a64kcclqp9db8b1m5fy";
           name = "term-cmd";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/term-cmd";
+          homepage = "https://melpa.org/#/term-cmd";
           license = lib.licenses.free;
         };
       }) {};
@@ -24809,13 +25966,13 @@
           sha256 = "149pl3zxg5kriydk5h6j95jyly6i23w4w4g4a99s4zi6ljiny6c6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/term-run";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/term-run";
           sha256 = "1bx3s68rgr9slsw9k01gfg7sxd4z7sarg4pi2ivril7108mhg2cs";
           name = "term-run";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/term-run";
+          homepage = "https://melpa.org/#/term-run";
           license = lib.licenses.free;
         };
       }) {};
@@ -24830,55 +25987,55 @@
           sha256 = "0gfsqpza8phvma5y3ck0n6p197x1i33w39m3c7jmja4ml121n73d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/termbright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/termbright-theme";
           sha256 = "14q88qdbnyzxr8sr8i5glj674sb4150b9y6nag0dqrxs629is6xj";
           name = "termbright-theme";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/termbright-theme";
+          homepage = "https://melpa.org/#/termbright-theme";
           license = lib.licenses.free;
         };
       }) {};
     tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "tern";
-        version = "0.17.0";
+        version = "0.18.0";
         src = fetchFromGitHub {
-          owner = "marijnh";
+          owner = "ternjs";
           repo = "tern";
-          rev = "41ac9287252b6d305a690fa415956cdfbd8c7d7a";
-          sha256 = "1n4z5hgpv1f0360zgdxz1q4gmhjjrxm7ygxh1g4zjy6kbhgylmxb";
+          rev = "2e8df51181ceda7bc1118cf168da4197b25b8701";
+          sha256 = "1kaymyihskmdav56xj85j04iq7a8948b1jgjfrv9s7pc965j9795";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tern";
-          sha256 = "06bgwizn9dcd8hsvimjvb28j0mpxg7rrv9knhv5kkdapa6gggxif";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tern";
+          sha256 = "1am97ssslkyijpvgk4nldi67ws48g1kpj6gisqzajrrlw5q93wvd";
           name = "tern";
         };
         packageRequires = [ cl-lib emacs json ];
         meta = {
-          homepage = "http://melpa.org/#/tern";
+          homepage = "https://melpa.org/#/tern";
           license = lib.licenses.free;
         };
       }) {};
     tern-auto-complete = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }:
     melpaBuild {
         pname = "tern-auto-complete";
-        version = "0.17.0";
+        version = "0.18.0";
         src = fetchFromGitHub {
-          owner = "marijnh";
+          owner = "ternjs";
           repo = "tern";
-          rev = "41ac9287252b6d305a690fa415956cdfbd8c7d7a";
-          sha256 = "1n4z5hgpv1f0360zgdxz1q4gmhjjrxm7ygxh1g4zjy6kbhgylmxb";
+          rev = "2e8df51181ceda7bc1118cf168da4197b25b8701";
+          sha256 = "1kaymyihskmdav56xj85j04iq7a8948b1jgjfrv9s7pc965j9795";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tern-auto-complete";
-          sha256 = "0lq924c5f6bhlgyqqzc346n381qf0fp66h50a0zqz2ch66kanni1";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tern-auto-complete";
+          sha256 = "1i99b4awph50ygcqsnppm1h48hbf8cpq1ppd4swakrwgmcy2mn26";
           name = "tern-auto-complete";
         };
         packageRequires = [ auto-complete cl-lib emacs tern ];
         meta = {
-          homepage = "http://melpa.org/#/tern-auto-complete";
+          homepage = "https://melpa.org/#/tern-auto-complete";
           license = lib.licenses.free;
         };
       }) {};
@@ -24893,13 +26050,13 @@
           sha256 = "0l63lzm96gg3ihgc4l671i342qxigwdbn4xfkbxnarb0206gnb5p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tern-django";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tern-django";
           sha256 = "1pjaaffadaw8h2n7yv01ks19gw59dmh8bp8vw51hx1082r3yfvv0";
           name = "tern-django";
         };
         packageRequires = [ emacs f tern ];
         meta = {
-          homepage = "http://melpa.org/#/tern-django";
+          homepage = "https://melpa.org/#/tern-django";
           license = lib.licenses.free;
         };
       }) {};
@@ -24914,13 +26071,13 @@
           sha256 = "0mz2yl9jaw7chzv9d9hhv7gcvdwwvi676y9wpn7vp85hxpda7xg7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/terraform-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/terraform-mode";
           sha256 = "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn";
           name = "terraform-mode";
         };
         packageRequires = [ cl-lib hcl-mode ];
         meta = {
-          homepage = "http://melpa.org/#/terraform-mode";
+          homepage = "https://melpa.org/#/terraform-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -24935,13 +26092,13 @@
           sha256 = "108csr1d7w0105rb6brzgbksb9wmq1p573vxbq0miv5k894j447f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/test-case-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/test-case-mode";
           sha256 = "1iba97yvbi5vr7gvc58gq2ah6jg2s7apc9ssq7mdzki823n8z2qi";
           name = "test-case-mode";
         };
         packageRequires = [ fringe-helper ];
         meta = {
-          homepage = "http://melpa.org/#/test-case-mode";
+          homepage = "https://melpa.org/#/test-case-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -24956,13 +26113,13 @@
           sha256 = "02vp4m3aw7rs4gxn91v6j3y8pr04hpydrg05ck3ivv46snkfagdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/test-kitchen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/test-kitchen";
           sha256 = "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0";
           name = "test-kitchen";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/test-kitchen";
+          homepage = "https://melpa.org/#/test-kitchen";
           license = lib.licenses.free;
         };
       }) {};
@@ -24977,13 +26134,13 @@
           sha256 = "08g7fan1y3wi4w7cdij14awadqss6prqg3k7qzf0wrnbm13dzhmk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/test-simple";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/test-simple";
           sha256 = "1l6y77fqd0l0mh2my23psi66v5ya6pbr2hgvcbsaqjnpmfm90w3g";
           name = "test-simple";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/test-simple";
+          homepage = "https://melpa.org/#/test-simple";
           license = lib.licenses.free;
         };
       }) {};
@@ -24998,13 +26155,13 @@
           sha256 = "1a0fzn66gv421by0x6wj3z6bvzv274a9p8c2aaax0dskncl5lgk1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/textmate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/textmate";
           sha256 = "119w944pwarpqzcr9vys17svy1rkfs9hiln8903q9ff4lnjkpf1v";
           name = "textmate";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/textmate";
+          homepage = "https://melpa.org/#/textmate";
           license = lib.licenses.free;
         };
       }) {};
@@ -25019,13 +26176,13 @@
           sha256 = "0fjapb7naysf34g4ac5gsa90b2s2ss7qgpyd9mfv3mdqrsp2dyw7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/textmate-to-yas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/textmate-to-yas";
           sha256 = "04agz4a41h0givfdw88qjd3c7pd418qyigsij4la5f37j5rh338l";
           name = "textmate-to-yas";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/textmate-to-yas";
+          homepage = "https://melpa.org/#/textmate-to-yas";
           license = lib.licenses.free;
         };
       }) {};
@@ -25040,13 +26197,13 @@
           sha256 = "09vf3qs949n4iqzd14iq2kgvypwdwdv8ii8l5jcqfppgspd8m8yd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/theme-changer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/theme-changer";
           sha256 = "1qbmsghkl5gs728q0gaalc7p8q7nzv3l045jc0jdxxnb7na3gc5w";
           name = "theme-changer";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/theme-changer";
+          homepage = "https://melpa.org/#/theme-changer";
           license = lib.licenses.free;
         };
       }) {};
@@ -25061,13 +26218,13 @@
           sha256 = "1srylw9wwkyq92f9v6ds9zp9z8sl800wbxjbir80g1lwv4hghaii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/thrift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/thrift";
           sha256 = "0p1hxmm7gvhyigz8aylncgqbhk6cyf75rbcqis7x552g605mhiy9";
           name = "thrift";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/thrift";
+          homepage = "https://melpa.org/#/thrift";
           license = lib.licenses.free;
         };
       }) {};
@@ -25082,13 +26239,13 @@
           sha256 = "1vq5yp6pyjam2csz22mcp353a4d5r7f9m6bsjizfmgr2ld7bwhx7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/timer-revert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/timer-revert";
           sha256 = "0lvm2irfx9rb5psm1lf53fv2jjx745n1c172xmyqip5xwgmf6msy";
           name = "timer-revert";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/timer-revert";
+          homepage = "https://melpa.org/#/timer-revert";
           license = lib.licenses.free;
         };
       }) {};
@@ -25103,13 +26260,13 @@
           sha256 = "0p7piqbhwxp2idslqnzl5x4y9aqgba9ryxrjy3d0avky5z9kappl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/timesheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/timesheet";
           sha256 = "1gy6bf4wqvp8cw2wjnrr9ijnzwav3p7j46m7qrn6l0517shwl506";
           name = "timesheet";
         };
         packageRequires = [ auctex org s ];
         meta = {
-          homepage = "http://melpa.org/#/timesheet";
+          homepage = "https://melpa.org/#/timesheet";
           license = lib.licenses.free;
         };
       }) {};
@@ -25124,55 +26281,75 @@
           sha256 = "16217i8rjhgaa5kv8iq0s14b42v5rs8m2qlr60a0x6qzy65chq39";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tox";
           sha256 = "1z81x8fs5q6r19hpqphsilk8wdwwnfr8w78x5x298x74s9mcsywl";
           name = "tox";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tox";
+          homepage = "https://melpa.org/#/tox";
+          license = lib.licenses.free;
+        };
+      }) {};
+    toxi-theme = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "toxi-theme";
+        version = "0.1.2";
+        src = fetchhg {
+          url = "https://bitbucket.com/postspectacular/toxi-theme";
+          rev = "b322fc7497a5";
+          sha256 = "1pnsky541m8kzcv81w98jkv0hgajh04hxqlmgddc1y0wbvi849j0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/toxi-theme";
+          sha256 = "032m3qbxfd0qp81qwayd5g9k7vz55g4yhw0d35qkxzf4qf58x9sd";
+          name = "toxi-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/toxi-theme";
           license = lib.licenses.free;
         };
       }) {};
     tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tracking";
-        version = "2.1";
+        version = "2.2";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "ac1cddf946e0af90ab453dd816f7173e0d4000e5";
-          sha256 = "0q3rv6lk37yybkbswmn4pgzca0nfhvf4h3ac395fr16k5ixybc5q";
+          rev = "13a33ea7b3cc579cbf67db2109802df3366e84d1";
+          sha256 = "0lg7f71kdq3zzc85xp9p81vdarz6d6l5zy9175c67ps9smdx528i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tracking";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tracking";
           sha256 = "096h5bl7jcwz5hpbm2139bf8a784hijfy40vzf42y1c9794al46z";
           name = "tracking";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tracking";
+          homepage = "https://melpa.org/#/tracking";
           license = lib.licenses.free;
         };
       }) {};
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "0.8";
+        version = "0.9";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "dbdc6e1b7de7cca57a5a1cf990bbc33553a823aa";
-          sha256 = "14vcd5ixqbyx2zr0w79pbk5sdncxzk6mz6rw7yxq81m3hgspz050";
+          rev = "5e20a6fbbed0a74a16c834a8e3e7950bdd5a9149";
+          sha256 = "0nsh2rz9w33m79rrr8nrz3g1wcgfrv7dc8q9g3s82ckj5g8gxfpr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/transmission";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/transmission";
           sha256 = "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9";
           name = "transmission";
         };
         packageRequires = [ emacs let-alist ];
         meta = {
-          homepage = "http://melpa.org/#/transmission";
+          homepage = "https://melpa.org/#/transmission";
           license = lib.licenses.free;
         };
       }) {};
@@ -25187,13 +26364,13 @@
           sha256 = "1jd7xsvs4m55fscp62a9lk59ip4sgifv4kazl55b7543nz1i31bz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/travis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/travis";
           sha256 = "1km496cq1vni9gy2d3z4c9524q62750ywz745rjz4r7178ip9mix";
           name = "travis";
         };
         packageRequires = [ dash pkg-info request s ];
         meta = {
-          homepage = "http://melpa.org/#/travis";
+          homepage = "https://melpa.org/#/travis";
           license = lib.licenses.free;
         };
       }) {};
@@ -25208,13 +26385,13 @@
           sha256 = "18na22fhwqz80qinmnpsvp6ghc9irva1scixi6s4q6plmgr4m397";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/truthy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/truthy";
           sha256 = "1a56zmqars9fd03bkqzwpvgblq5fvq19n4jw04c4hpga92sq8wqg";
           name = "truthy";
         };
         packageRequires = [ list-utils ];
         meta = {
-          homepage = "http://melpa.org/#/truthy";
+          homepage = "https://melpa.org/#/truthy";
           license = lib.licenses.free;
         };
       }) {};
@@ -25229,13 +26406,13 @@
           sha256 = "1ma3k9bbw427cj1n2gjajbqii482jhs2lgjggz9clpc21bn5wqfb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tss";
           sha256 = "0d16x5r2xfy6mrwy0mqzpr9b3inqmyyxgawrxlfh83j1xb903dhm";
           name = "tss";
         };
         packageRequires = [ auto-complete json-mode log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/tss";
+          homepage = "https://melpa.org/#/tss";
           license = lib.licenses.free;
         };
       }) {};
@@ -25250,13 +26427,13 @@
           sha256 = "060jksd9aamqx1n4l0bb9v4icsf7cr8jkyw0mbhgyz32nmxh3v6g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ttrss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ttrss";
           sha256 = "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z";
           name = "ttrss";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/ttrss";
+          homepage = "https://melpa.org/#/ttrss";
           license = lib.licenses.free;
         };
       }) {};
@@ -25271,13 +26448,13 @@
           sha256 = "0jpcjy2a77mywba2vm61knj26pgylsmv5a21cdp80q40bac4i6bb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tuareg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tuareg";
           sha256 = "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q";
           name = "tuareg";
         };
         packageRequires = [ caml ];
         meta = {
-          homepage = "http://melpa.org/#/tuareg";
+          homepage = "https://melpa.org/#/tuareg";
           license = lib.licenses.free;
         };
       }) {};
@@ -25292,13 +26469,13 @@
           sha256 = "0ihjjw5wxz5ybl3600k937pszw3442cijs4gbqqip9vhd5y9m8gy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tumble";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tumble";
           sha256 = "1c9ybq0mb2a0pw15fmm13vfwcnr2h9fb1xsm5nrff1cg7913pgv9";
           name = "tumble";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tumble";
+          homepage = "https://melpa.org/#/tumble";
           license = lib.licenses.free;
         };
       }) {};
@@ -25313,13 +26490,13 @@
           sha256 = "0asd024n5v23wdsg1959sszq568wg3a1bp4jrk0cllfji1z0n78y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/tup-mode";
           sha256 = "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l";
           name = "tup-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/tup-mode";
+          homepage = "https://melpa.org/#/tup-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -25334,13 +26511,13 @@
           sha256 = "0glw5lns7hwp8jznnfm6dyjw454sv2n84gy07ma7s1q3yczhq5bc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/twilight-anti-bright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/twilight-anti-bright-theme";
           sha256 = "1qfybk5akaxdahmjffqaw712v8d7kk4jqkj3hzp96kys2zv1r6f9";
           name = "twilight-anti-bright-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/twilight-anti-bright-theme";
+          homepage = "https://melpa.org/#/twilight-anti-bright-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -25355,13 +26532,13 @@
           sha256 = "193v98i84xybm3n0f30jin5q10i87vbcnbdhl4zqi7jij9p5v98z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/twittering-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/twittering-mode";
           sha256 = "0v9ijxw5jazh2hc0qab48y71za2l9ryff0mpkxhr3f79irlqy0a1";
           name = "twittering-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/twittering-mode";
+          homepage = "https://melpa.org/#/twittering-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -25376,13 +26553,34 @@
           sha256 = "1risfbsaafh760vnl4ryys91g4k78g0fxj2zlcndpxxv34gwkhy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/typed-clojure-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/typed-clojure-mode";
           sha256 = "1579zkhk2lwl5ij7dm9n2drggs5fmhpljrshc4ghhvig7nlyqjy3";
           name = "typed-clojure-mode";
         };
         packageRequires = [ cider clojure-mode ];
         meta = {
-          homepage = "http://melpa.org/#/typed-clojure-mode";
+          homepage = "https://melpa.org/#/typed-clojure-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }:
+    melpaBuild {
+        pname = "typit";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "typit";
+          rev = "bbb0e8d07dc4316d1d2bf028c32301aa72f25a17";
+          sha256 = "0iqxii1i67hscsz2fdasj3ripc9xmyl49jzwxm92r3lg13am135a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/typit";
+          sha256 = "05m7ymcq6fgbhh93ninrf3qi7csdnf2ahhf01mkm8gxxyaqq6m4n";
+          name = "typit";
+        };
+        packageRequires = [ emacs f mmt ];
+        meta = {
+          homepage = "https://melpa.org/#/typit";
           license = lib.licenses.free;
         };
       }) {};
@@ -25397,13 +26595,13 @@
           sha256 = "1jhd4grch5iz12gyxwfbsgh4dmz5hj4bg4gnvphccg8dsnni05k2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/typo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/typo";
           sha256 = "07hmqrnbxbrhcbxdls8i4786lkqmfr3hv6va41xih1lxj0mk60bx";
           name = "typo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/typo";
+          homepage = "https://melpa.org/#/typo";
           license = lib.licenses.free;
         };
       }) {};
@@ -25418,13 +26616,13 @@
           sha256 = "0k41hwb6jgv3hngfrphlyhmfhvy4k05mvn0brm64xk7lj56y8q2c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ubuntu-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ubuntu-theme";
           sha256 = "160z59aaxb2v6c24nki6bn7pjm9r4jl1mgxs4h4sivzxkaw811s2";
           name = "ubuntu-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ubuntu-theme";
+          homepage = "https://melpa.org/#/ubuntu-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -25439,13 +26637,13 @@
           sha256 = "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ucs-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ucs-utils";
           sha256 = "111fwg2cqqzpa79rcqxidppb12c8g12zszppph2ydfvkgkryb6z2";
           name = "ucs-utils";
         };
         packageRequires = [ list-utils pcache persistent-soft ];
         meta = {
-          homepage = "http://melpa.org/#/ucs-utils";
+          homepage = "https://melpa.org/#/ucs-utils";
           license = lib.licenses.free;
         };
       }) {};
@@ -25460,13 +26658,13 @@
           sha256 = "06qcvbp5rd0kh3ibrxj5p6r578lwsrgd7yj5c6slwmkdmna2fj33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/undercover";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/undercover";
           sha256 = "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf";
           name = "undercover";
         };
         packageRequires = [ dash emacs shut-up ];
         meta = {
-          homepage = "http://melpa.org/#/undercover";
+          homepage = "https://melpa.org/#/undercover";
           license = lib.licenses.free;
         };
       }) {};
@@ -25481,13 +26679,13 @@
           sha256 = "1g1ldyz42q3i2xlgvhd4s93cvkh0fm8m3l344zjcw8rvqaisyphj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/underwater-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/underwater-theme";
           sha256 = "0ab2bcqfdi9ml3z9d511pbfwcbp8hkkd36xxp61k36gkyi3acvlr";
           name = "underwater-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/underwater-theme";
+          homepage = "https://melpa.org/#/underwater-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -25502,13 +26700,13 @@
           sha256 = "1qy0q1fp7cmvmxynqrb086dkb727lmk5h1k98y14j75b94ilpy0w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unfill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/unfill";
           sha256 = "0b21dk45vbz4vqdbdx0n6wx30rm38w1jjqbsxfj7b96p3i5shwqv";
           name = "unfill";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/unfill";
+          homepage = "https://melpa.org/#/unfill";
           license = lib.licenses.free;
         };
       }) {};
@@ -25523,13 +26721,13 @@
           sha256 = "0n06dvf6r7qblz8vz38qc37xrn29wa1c0jyzis1qw9zzf6hmmzj7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unicode-enbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/unicode-enbox";
           sha256 = "1phb2qq3pg6z6bl96kl9yfq4jxhgardjpaa4lhgqbxymmqdm7gzv";
           name = "unicode-enbox";
         };
         packageRequires = [ pcache persistent-soft string-utils ucs-utils ];
         meta = {
-          homepage = "http://melpa.org/#/unicode-enbox";
+          homepage = "https://melpa.org/#/unicode-enbox";
           license = lib.licenses.free;
         };
       }) {};
@@ -25544,7 +26742,7 @@
           sha256 = "0fbwncna6gxlynq9196djpkjhayzk8kxlsxg0gasdgqx1nyxl0mk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unicode-fonts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/unicode-fonts";
           sha256 = "0plipwb30qqay8691qzqdyg6smpbs9dsxxi49psb8sq0xnxl84q3";
           name = "unicode-fonts";
         };
@@ -25556,7 +26754,7 @@
           ucs-utils
         ];
         meta = {
-          homepage = "http://melpa.org/#/unicode-fonts";
+          homepage = "https://melpa.org/#/unicode-fonts";
           license = lib.licenses.free;
         };
       }) {};
@@ -25571,13 +26769,13 @@
           sha256 = "0qy1hla7vf674ynqdzsaw2cnk92nhpcimww5q94rc0a95pzw64wd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unicode-progress-reporter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/unicode-progress-reporter";
           sha256 = "03z7p27470fqy3gd356l9cpp44a35sfrxz94dxmx388rzlygk7y7";
           name = "unicode-progress-reporter";
         };
         packageRequires = [ emacs pcache persistent-soft ucs-utils ];
         meta = {
-          homepage = "http://melpa.org/#/unicode-progress-reporter";
+          homepage = "https://melpa.org/#/unicode-progress-reporter";
           license = lib.licenses.free;
         };
       }) {};
@@ -25592,13 +26790,13 @@
           sha256 = "0q7cbl89yg3fjxaxsqsksxhw7ibdslbb004z5y1m579n7zgcrljy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unicode-whitespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/unicode-whitespace";
           sha256 = "1b3jgha8va42b89pdp41sab2w9wllp7dicqg4lxl67bg6wn147wy";
           name = "unicode-whitespace";
         };
         packageRequires = [ pcache persistent-soft ucs-utils ];
         meta = {
-          homepage = "http://melpa.org/#/unicode-whitespace";
+          homepage = "https://melpa.org/#/unicode-whitespace";
           license = lib.licenses.free;
         };
       }) {};
@@ -25613,13 +26811,13 @@
           sha256 = "1vbx10s2zmhpxjg26ik947bcg9f7w3g2w45wmm0shjp743fsdq8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unify-opening";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/unify-opening";
           sha256 = "1gpmklbdbmv8va8d3yr94r1ydkcyvdzcgxv56rp0bxwbcgmk0as8";
           name = "unify-opening";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/unify-opening";
+          homepage = "https://melpa.org/#/unify-opening";
           license = lib.licenses.free;
         };
       }) {};
@@ -25634,13 +26832,13 @@
           sha256 = "1w2w0gmyr0nbq8kv3ldj30h9xma76gi1khbdia1y30kss677rr8m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unkillable-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/unkillable-scratch";
           sha256 = "0ghbpa9pf7k6vd2mjxkpqg2qfl4sd40ir6mrk1rxr1rv8s0afkf7";
           name = "unkillable-scratch";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/unkillable-scratch";
+          homepage = "https://melpa.org/#/unkillable-scratch";
           license = lib.licenses.free;
         };
       }) {};
@@ -25655,34 +26853,34 @@
           sha256 = "07vwg0bg719gb8ln1n5a33103903vvrphnkbvvfn43904pkrf14w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/use-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/use-package";
           sha256 = "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8";
           name = "use-package";
         };
         packageRequires = [ bind-key diminish ];
         meta = {
-          homepage = "http://melpa.org/#/use-package";
+          homepage = "https://melpa.org/#/use-package";
           license = lib.licenses.free;
         };
       }) {};
     utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "utop";
-        version = "1.18.1";
+        version = "1.19.2";
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "59f5b9c3fcc3fa8102e8a892e21ff8a477f80872";
-          sha256 = "1azv6grd5h2r1spy996nv6q1c5l6qawv6k0dc2i5k96szl0r668r";
+          rev = "3db52cc2d0ad990398bd726d00eece171200c03a";
+          sha256 = "17p3cwjxdvp0v3n8fiib7hgl07z2iqi1qwlff0g3zwf4rr6kxgqy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/utop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/utop";
           sha256 = "0lv16kl29gc9hdcpn04l85pf7x93vkl41s4mgqp678cllzyr0cq7";
           name = "utop";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/utop";
+          homepage = "https://melpa.org/#/utop";
           license = lib.licenses.free;
         };
       }) {};
@@ -25697,34 +26895,34 @@
           sha256 = "0z53n9qsglp87f6q1pa3sixrjni9k46j31zg15gcwrmflmfrw8ds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/uzumaki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/uzumaki";
           sha256 = "1fvhzz2qpyc819rjvzyf42jmb70hlg7a9ybqwi81w7rydpabg61q";
           name = "uzumaki";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/uzumaki";
+          homepage = "https://melpa.org/#/uzumaki";
           license = lib.licenses.free;
         };
       }) {};
     vagrant = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vagrant";
-        version = "0.5.2";
+        version = "0.6.0";
         src = fetchFromGitHub {
           owner = "ottbot";
           repo = "vagrant.el";
-          rev = "dabf69b7146f8a035bba15285b1fafc1e9ef4b3c";
-          sha256 = "04r73s3fhvdcryv0l57awkpg1hi3kg6zcqxbxb03jc89h0f9vdlh";
+          rev = "6d043d8f2c9e0c7039639504a88b2f8cbf519f67";
+          sha256 = "0w4a4mxy81vbr5r4kaaddi5zbisvr9ry5x4skmmlib2k0j84niiv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vagrant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vagrant";
           sha256 = "0g6sqzsx3lixcn09fkxhhcfp45qnqgf1ms0l7nkzyljavb7151cf";
           name = "vagrant";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/vagrant";
+          homepage = "https://melpa.org/#/vagrant";
           license = lib.licenses.free;
         };
       }) {};
@@ -25739,13 +26937,13 @@
           sha256 = "19j5q2f6pybvjq3ryjcyihzlw348hqyjhfcy3qflry6w786dqcgn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vbasense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vbasense";
           sha256 = "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n";
           name = "vbasense";
         };
         packageRequires = [ auto-complete log4e yaxception ];
         meta = {
-          homepage = "http://melpa.org/#/vbasense";
+          homepage = "https://melpa.org/#/vbasense";
           license = lib.licenses.free;
         };
       }) {};
@@ -25760,13 +26958,13 @@
           sha256 = "07dx3dyvkwcin0gb6j4jx0ldfxs4rqhygl56a8i81yy05adkaq2x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vcomp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vcomp";
           sha256 = "02cj2nlyxvgvl2rjfgacljvcsnfm9crmmkhcm2pznj9xw10y8pq0";
           name = "vcomp";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/vcomp";
+          homepage = "https://melpa.org/#/vcomp";
           license = lib.licenses.free;
         };
       }) {};
@@ -25781,13 +26979,13 @@
           sha256 = "034475m2d2vlrlc2l88gdx0ga3krsdh08wkjxwnbb2dfyz3p8r9v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vdirel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vdirel";
           sha256 = "11cc7bw7x5h3bwnlsjyhw6k5fh2fk7wffarrcny562v4cmr013cj";
           name = "vdirel";
         };
         packageRequires = [ emacs helm org-vcard seq ];
         meta = {
-          homepage = "http://melpa.org/#/vdirel";
+          homepage = "https://melpa.org/#/vdirel";
           license = lib.licenses.free;
         };
       }) {};
@@ -25802,34 +27000,55 @@
           sha256 = "0lzq31zqnk32vfp3kicnvgfr3nkv8amjzxmk9nrz1kwgmq7gvkjk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vector-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vector-utils";
           sha256 = "07armr23pq5pd47lqhir6a59r86c84zikbc51d8vfcaw8y71yr5n";
           name = "vector-utils";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/vector-utils";
+          homepage = "https://melpa.org/#/vector-utils";
           license = lib.licenses.free;
         };
       }) {};
-    vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, lib, melpaBuild, outshine }:
+    vertigo = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vertigo";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "noctuid";
+          repo = "vertigo.el";
+          rev = "ebfa068d9e2fc39ba6d1744618c4e31dad6f629b";
+          sha256 = "1yk7qqg8i3970kpfk34wvi0gh16qf0b0sfnf18g3s21dd4gk5a6g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vertigo";
+          sha256 = "0x0wy1z601sk1x96bl2xx18qm4avd77iybq1a3ss8x8ykwqlgf83";
+          name = "vertigo";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "https://melpa.org/#/vertigo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine, projectile }:
     melpaBuild {
         pname = "vhdl-tools";
-        version = "4.1";
+        version = "4.3";
         src = fetchFromGitHub {
           owner = "csantosb";
           repo = "vhdl-tools";
-          rev = "bf948bddc4db144ca1b650a50e687f0a58e4d07a";
-          sha256 = "0k8wbylvws4yxh2jzxkz0fw5kwgblxvmagz54igbjj5mfm45pgsp";
+          rev = "17b49fad72269fb987f88fe783248a9252f21faf";
+          sha256 = "0ggblkaz214vl1j4i5gv5qj2q6ahnr0k3c3l9sd0w5vdkbw8n5jb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vhdl-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vhdl-tools";
           sha256 = "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw";
           name = "vhdl-tools";
         };
-        packageRequires = [ emacs ggtags outshine ];
+        packageRequires = [ emacs ggtags helm outshine projectile ];
         meta = {
-          homepage = "http://melpa.org/#/vhdl-tools";
+          homepage = "https://melpa.org/#/vhdl-tools";
           license = lib.licenses.free;
         };
       }) {};
@@ -25844,13 +27063,13 @@
           sha256 = "1750gx65ymibam8ahx5blfv5jc26f3mzbklk1jrmfwpsalyghdd9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vim-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vim-region";
           sha256 = "1dcnx799lpjsdnnjxqzgskkfj2nx7f4kwf0xjhbg35ny4nyn81dx";
           name = "vim-region";
         };
         packageRequires = [ expand-region ];
         meta = {
-          homepage = "http://melpa.org/#/vim-region";
+          homepage = "https://melpa.org/#/vim-region";
           license = lib.licenses.free;
         };
       }) {};
@@ -25865,13 +27084,13 @@
           sha256 = "1f94qx8rbnn21cl0grxqa9gzkbrz68vmqsihv8vvi8qf1c1dmd0i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vimgolf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vimgolf";
           sha256 = "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn";
           name = "vimgolf";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/vimgolf";
+          homepage = "https://melpa.org/#/vimgolf";
           license = lib.licenses.free;
         };
       }) {};
@@ -25886,34 +27105,34 @@
           sha256 = "082qrbljlahkq1fz2dfl434f1xv47jc1v9k0srh7lrm14616dzq3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vimish-fold";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vimish-fold";
           sha256 = "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3";
           name = "vimish-fold";
         };
         packageRequires = [ cl-lib emacs f ];
         meta = {
-          homepage = "http://melpa.org/#/vimish-fold";
+          homepage = "https://melpa.org/#/vimish-fold";
           license = lib.licenses.free;
         };
       }) {};
     visual-fill-column = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "visual-fill-column";
-        version = "1.5";
+        version = "1.7";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "visual-fill-column";
-          rev = "261e27c062fbfd59ab20c9a084c35b99bcec598d";
-          sha256 = "100w8rxdqln4xiwi0df15pvyaiyhjlwcjdh8nb0j95qpwji41vmf";
+          rev = "d24354e79b4103ed75ff3a70e7279c75e0bf21a7";
+          sha256 = "02msgb2dh3b5ki6v2bg39l2x93amvmaxg6v57kmyl80x27h00vx9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/visual-fill-column";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/visual-fill-column";
           sha256 = "19y0pwaybjal2rc7migdbnafpi4dfbxvrzgfqr8dlvd9q68v08y5";
           name = "visual-fill-column";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/visual-fill-column";
+          homepage = "https://melpa.org/#/visual-fill-column";
           license = lib.licenses.free;
         };
       }) {};
@@ -25928,13 +27147,13 @@
           sha256 = "0vl0hwxzzvgna8sysf517qq08fi1zsff3dmcgwvsgzhc47sq8mng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vlf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/vlf";
           sha256 = "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8";
           name = "vlf";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/vlf";
+          homepage = "https://melpa.org/#/vlf";
           license = lib.licenses.free;
         };
       }) {};
@@ -25949,13 +27168,13 @@
           sha256 = "0q1rwqjwqcnsr57s531pwlm464q8wx5vvdm5rj2xy9b3yi6phis1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/voca-builder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/voca-builder";
           sha256 = "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y";
           name = "voca-builder";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/voca-builder";
+          homepage = "https://melpa.org/#/voca-builder";
           license = lib.licenses.free;
         };
       }) {};
@@ -25970,13 +27189,13 @@
           sha256 = "1v0chqj5jir4685jd8ahw86g9zdmi6xd05wmzhyw20rbk924fcqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/volatile-highlights";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/volatile-highlights";
           sha256 = "1r6in919aqdziv6bgzp4k7jqa87bd287pacq615sd5m1nzva1a4d";
           name = "volatile-highlights";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/volatile-highlights";
+          homepage = "https://melpa.org/#/volatile-highlights";
           license = lib.licenses.free;
         };
       }) {};
@@ -25991,13 +27210,34 @@
           sha256 = "0jl3n79wmbxnrbf83qjq0v5pzhvv67i9r5sp2zj8nc86hh7dvjsd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wacspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wacspace";
           sha256 = "1xy0mprvyi37zmgj1yrlh5ni08j47lpag1jm3a76cgghgmlfjxrl";
           name = "wacspace";
         };
         packageRequires = [ cl-lib dash ];
         meta = {
-          homepage = "http://melpa.org/#/wacspace";
+          homepage = "https://melpa.org/#/wacspace";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
+    melpaBuild {
+        pname = "wandbox";
+        version = "0.6.0";
+        src = fetchFromGitHub {
+          owner = "kosh04";
+          repo = "emacs-wandbox";
+          rev = "70728ba1bfa425dee7a66fd86c7bbf2747b2514c";
+          sha256 = "1nx7cr7d4qmzwbvp59kc8139nzc965ibc9vf7afrz8z2h5qg4d4l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wandbox";
+          sha256 = "0myyln82nx462bj79acvqxwvmblxild4vbygcrzw5chcwy6crvlz";
+          name = "wandbox";
+        };
+        packageRequires = [ emacs request s ];
+        meta = {
+          homepage = "https://melpa.org/#/wandbox";
           license = lib.licenses.free;
         };
       }) {};
@@ -26012,13 +27252,34 @@
           sha256 = "0mnfk2ys8axjh696cq5msr5cdr91icl1i3mi0dd2y00lvh6sbm7w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wc-goal-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wc-goal-mode";
           sha256 = "0l3gh96njjldp7n13jn1zjrp17h7ivjak102j6wwspgg6v2h5419";
           name = "wc-goal-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/wc-goal-mode";
+          homepage = "https://melpa.org/#/wc-goal-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wc-mode";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "bnbeckwith";
+          repo = "wc-mode";
+          rev = "eb0b23e0de8bcf21c61c1edacd9fe89b2e6888d0";
+          sha256 = "0kzs256ymhdrqzva32j215q9fl66n9571prb7mi6syx1vpk7m3lw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wc-mode";
+          sha256 = "191dmxfpqnj7d43cr0fhdmj5ldfs7w9zg5pb2lv9wvlfl7asdid6";
+          name = "wc-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/wc-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -26033,13 +27294,13 @@
           sha256 = "113prlamr2j6y6n0w43asffawwa4qiq63mgwm85v04h6pr8bd90l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wcheck-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wcheck-mode";
           sha256 = "0cmdvhgax6r5svn3wkwll4j271qj70g8182c58riwnkhiajxmn3k";
           name = "wcheck-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/wcheck-mode";
+          homepage = "https://melpa.org/#/wcheck-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -26054,34 +27315,55 @@
           sha256 = "0qx92jqzsimjk92pql2h8pzhq66mqijwqgjqwp7rmq5b6k0nvx1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/weather-metno";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/weather-metno";
           sha256 = "0h7p4l8y75h27pgk45f0mk3gjd43jk8q97gjf85a9b0afd63d3f6";
           name = "weather-metno";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/weather-metno";
+          homepage = "https://melpa.org/#/weather-metno";
+          license = lib.licenses.free;
+        };
+      }) {};
+    web-beautify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "web-beautify";
+        version = "0.3.1";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "web-beautify";
+          rev = "0fac5fa09cee9d45237d6d74e2760fb24c929f8a";
+          sha256 = "0zpvs9yc2gxfmm0x0majhzxc0b0vmm6p6pxh92h8iq3pmr0di8yj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/web-beautify";
+          sha256 = "06ky2svhca8hjgmvxrg3h6ya7prl72q1r88x967yc6b0qq3r7g0f";
+          name = "web-beautify";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/web-beautify";
           license = lib.licenses.free;
         };
       }) {};
     web-completion-data = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-completion-data";
-        version = "0.1";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "osv";
           repo = "web-completion-data";
-          rev = "3685b8c7eff06a2064b4f4304e7faf00a22a920a";
-          sha256 = "1w7jnsc6lzlrlkj0nrlfnyca78lw53144hrf9k43b0g0zl8n9zqj";
+          rev = "c272c94e8a71b779c29653a532f619acad433a4f";
+          sha256 = "19nzjgvd2i5745283ck3k2vylrr6lnk9h3ggzwrwdhyd3m9433vm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/web-completion-data";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/web-completion-data";
           sha256 = "1zzdmhyn6bjaidk808s4pdk25a5rn4287949ps5vbpyniaf6gny9";
           name = "web-completion-data";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/web-completion-data";
+          homepage = "https://melpa.org/#/web-completion-data";
           license = lib.licenses.free;
         };
       }) {};
@@ -26096,13 +27378,13 @@
           sha256 = "00fzzjqa1v2dzlpgjxb2qj3nn6iizg177mk7vjvcv4814g4dhcal";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/web-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/web-mode";
           sha256 = "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i";
           name = "web-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/web-mode";
+          homepage = "https://melpa.org/#/web-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -26116,34 +27398,34 @@
           sha256 = "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/weblogger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/weblogger";
           sha256 = "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk";
           name = "weblogger";
         };
         packageRequires = [ xml-rpc ];
         meta = {
-          homepage = "http://melpa.org/#/weblogger";
+          homepage = "https://melpa.org/#/weblogger";
           license = lib.licenses.free;
         };
       }) {};
     weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }:
     melpaBuild {
         pname = "weechat";
-        version = "0.2.2";
+        version = "0.3.1";
         src = fetchFromGitHub {
           owner = "the-kenny";
           repo = "weechat.el";
-          rev = "f01cdd4d874cf09fee5a78d7b29eb96bc21be2be";
-          sha256 = "0f90m2s40jish4wjwfpmbgw024r7n2l5b9q9wr6rd3vdcwks3mcl";
+          rev = "41f06299b2a691473b6b26c15dc46367542c79f0";
+          sha256 = "0vg3w18xj6i320jsivsml3mi1fdxr8dgxmn7qy2780ajy5ndxnw1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/weechat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/weechat";
           sha256 = "0sxrms5024bi4irv8x8s8j1zcyd62cpqm0zv4dgpm65wnpc7xc46";
           name = "weechat";
         };
         packageRequires = [ cl-lib emacs s tracking ];
         meta = {
-          homepage = "http://melpa.org/#/weechat";
+          homepage = "https://melpa.org/#/weechat";
           license = lib.licenses.free;
         };
       }) {};
@@ -26158,34 +27440,34 @@
           sha256 = "14vmgfz45wmpjfhfx3pfjn3bak8qvj1zk1w4xc5w1cfl6vnij6hv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/weibo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/weibo";
           sha256 = "1ndgfqqb0gvy8p2fisi57s9bsa2nrnv80smg78m89i4cwagbz6yd";
           name = "weibo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/weibo";
+          homepage = "https://melpa.org/#/weibo";
           license = lib.licenses.free;
         };
       }) {};
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "0.8";
+        version = "1.1.7";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "ad60a6c7206752d9b9cf4ba17c2293dba365e9fb";
-          sha256 = "11mi23djk690n4984hk3pv61rrkdnxpkmywsqibi3xki27v2al36";
+          rev = "d572f37f21838eb336c1eaf79672a7acb9ff06c0";
+          sha256 = "1cbzssi7kmirppa7i8n4g1ggk999gmwhjv4sd04m2zihlsi7y3di";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/which-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/which-key";
           sha256 = "0vqbhfzcv9m58w41zdhpiymhgl38n15c6d7ffd99narxlkckcj59";
           name = "which-key";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/which-key";
+          homepage = "https://melpa.org/#/which-key";
           license = lib.licenses.free;
         };
       }) {};
@@ -26200,13 +27482,13 @@
           sha256 = "01fwhrfi92pcrwc4yn03pflc9wj07mhzj0a0i5amar4f9bj6m5b4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/whitaker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/whitaker";
           sha256 = "17fnvb3jh6fi4wddn5qnp6i6ndidg8jf9ac69q9j032c2msr07nj";
           name = "whitaker";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/whitaker";
+          homepage = "https://melpa.org/#/whitaker";
           license = lib.licenses.free;
         };
       }) {};
@@ -26221,13 +27503,13 @@
           sha256 = "0xmwhybb8x6wwfr55ym5xg4dhy1aqx1abxy9qskn7h3zf1z4pgg2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/whitespace-cleanup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/whitespace-cleanup-mode";
           sha256 = "1fhdjrxxyfx4xsgfjqq9p7vhj98wmqf2r00mv8k27vdaxwsnm5p3";
           name = "whitespace-cleanup-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/whitespace-cleanup-mode";
+          homepage = "https://melpa.org/#/whitespace-cleanup-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -26242,13 +27524,13 @@
           sha256 = "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/whole-line-or-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/whole-line-or-region";
           sha256 = "1vs2i4cy1zc6nj660i9h36jbfgc3kvqivjnzlq5zwlxk5hcibqa1";
           name = "whole-line-or-region";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/whole-line-or-region";
+          homepage = "https://melpa.org/#/whole-line-or-region";
           license = lib.licenses.free;
         };
       }) {};
@@ -26263,13 +27545,13 @@
           sha256 = "0fqv63m8z5m5ghh4j8ccdnmgcdkvi4jqpg9z7lp17g4p9pq3xfjf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/widget-mvc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/widget-mvc";
           sha256 = "0njzvdlxb7z480r6dvmksgivhz7rvnil517aj86qx0jbc5mr3l2f";
           name = "widget-mvc";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/widget-mvc";
+          homepage = "https://melpa.org/#/widget-mvc";
           license = lib.licenses.free;
         };
       }) {};
@@ -26284,13 +27566,13 @@
           sha256 = "1kqcc1d56jz107bswlzvdng6ny6qwp93yck2i2j921msn62qvbb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wiki-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wiki-nav";
           sha256 = "19mabz0y3fcqsm68ijwwbbqylxgp71anc0a31zgc1blha9jivvwy";
           name = "wiki-nav";
         };
         packageRequires = [ button-lock nav-flash ];
         meta = {
-          homepage = "http://melpa.org/#/wiki-nav";
+          homepage = "https://melpa.org/#/wiki-nav";
           license = lib.licenses.free;
         };
       }) {};
@@ -26305,13 +27587,13 @@
           sha256 = "0ib20zl8l1fs69ca9rry27qz69sgf6ws1ca5nhm5llvpkjcgv53i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/win-switch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/win-switch";
           sha256 = "1s6inp5kf763rngn58r02fd7n7z3dd55j6hb7s9dgvc856d5z3my";
           name = "win-switch";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/win-switch";
+          homepage = "https://melpa.org/#/win-switch";
           license = lib.licenses.free;
         };
       }) {};
@@ -26326,13 +27608,13 @@
           sha256 = "049bwa5g0z1b9nrsc1vc4511aqcq9fvl16xg493wj651g6q9qigb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/window-end-visible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/window-end-visible";
           sha256 = "1p78n7yysj18404cdc6vahfrzwn5pixyfnja8ch48rj4fm4jbxwq";
           name = "window-end-visible";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/window-end-visible";
+          homepage = "https://melpa.org/#/window-end-visible";
           license = lib.licenses.free;
         };
       }) {};
@@ -26347,13 +27629,13 @@
           sha256 = "0jyymmbz03zj2ydca1rv6ra0b2brjl7pyl4897zd00j5kvqjdyif";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/window-layout";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/window-layout";
           sha256 = "1n4a6z00lxsffirjrmbaaw432w798b9vv34qawgn1k17y9l7gb85";
           name = "window-layout";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/window-layout";
+          homepage = "https://melpa.org/#/window-layout";
           license = lib.licenses.free;
         };
       }) {};
@@ -26368,13 +27650,13 @@
           sha256 = "1rz2a1l3apavsknlfy0faaivqgpj4x9jz3hbysbg9pydpcwqgf64";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/window-numbering";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/window-numbering";
           sha256 = "0x3n0ni16q69lfpyjz61spqghmhvc3cwa4aj80ihii3pk80f769x";
           name = "window-numbering";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/window-numbering";
+          homepage = "https://melpa.org/#/window-numbering";
           license = lib.licenses.free;
         };
       }) {};
@@ -26389,13 +27671,13 @@
           sha256 = "1xjs51wm5ydcqdwvg3c42c5z4j92q75lmk895qkka7ayy5spxxf7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/window-purpose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/window-purpose";
           sha256 = "1ib5ia7armghvmcw8qywcil4nxzwwakmfsp7ybawb0xr53h1w96d";
           name = "window-purpose";
         };
         packageRequires = [ cl-lib emacs imenu-list let-alist ];
         meta = {
-          homepage = "http://melpa.org/#/window-purpose";
+          homepage = "https://melpa.org/#/window-purpose";
           license = lib.licenses.free;
         };
       }) {};
@@ -26410,13 +27692,13 @@
           sha256 = "1f4v0xd341qs4kfnjqhgf8j26valvg6pz4rwcz0zj0s23niy2yil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/windsize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/windsize";
           sha256 = "1xhfw77168942rcn246qndii0hv0q6vkgzj67jg4mxh8n46m50m9";
           name = "windsize";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/windsize";
+          homepage = "https://melpa.org/#/windsize";
           license = lib.licenses.free;
         };
       }) {};
@@ -26426,17 +27708,17 @@
         version = "0.9.0";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "f41388ee99f1";
-          sha256 = "16711d1ds508nmjw81jm2cfdpqzc55gc175fkhayk0f5swlvd11m";
+          rev = "4d512e8e0e0f";
+          sha256 = "059m9w0m0rqjwdzdn4l1ib25ys0vym54lvb9bkd40rd0yqd36xfw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wisp-mode";
           sha256 = "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc";
           name = "wisp-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/wisp-mode";
+          homepage = "https://melpa.org/#/wisp-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -26451,34 +27733,34 @@
           sha256 = "188h1sy4mxzrkwi3zgiw108c5f71rkj5agdkf9yy9v8c1bkawm4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wispjs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wispjs-mode";
           sha256 = "0qzm0dcvjndasnbqpkdc56f1qv66gxv8dfgfcwq5l1bp5wyx813p";
           name = "wispjs-mode";
         };
         packageRequires = [ clojure-mode ];
         meta = {
-          homepage = "http://melpa.org/#/wispjs-mode";
+          homepage = "https://melpa.org/#/wispjs-mode";
           license = lib.licenses.free;
         };
       }) {};
     with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "with-editor";
-        version = "2.5.0";
+        version = "2.5.1";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "with-editor";
-          rev = "580f225a6c4476feb36b707c6c705b027339717b";
-          sha256 = "0dymhkbkzicjw0379bdzbb594x5xcjbgbn428a30i2i0jwv66pfz";
+          rev = "d28d07497f67fea4c62fe7a2d3201fd86fb64fe2";
+          sha256 = "0rzq2fbz523fyy2p6ddx9iws89sfgw3pwillw8yz965f3hxx3dj3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/with-editor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/with-editor";
           sha256 = "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb";
           name = "with-editor";
         };
         packageRequires = [ async dash emacs ];
         meta = {
-          homepage = "http://melpa.org/#/with-editor";
+          homepage = "https://melpa.org/#/with-editor";
           license = lib.licenses.free;
         };
       }) {};
@@ -26493,13 +27775,13 @@
           sha256 = "0nmzh6dynbm8vglp4pqz81s2z68jbnasvamvi1x1iawf8g9zfyix";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wn-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wn-mode";
           sha256 = "1qy1pkfdnm4pska4cnff9cx2c812ilymajhpmsfc9jdbvhzwrwg3";
           name = "wn-mode";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://melpa.org/#/wn-mode";
+          homepage = "https://melpa.org/#/wn-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -26514,13 +27796,13 @@
           sha256 = "018r35dz8z03wcrx9s28pjisayy21549i232mp6wy9mxkrkxbzpc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wonderland";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wonderland";
           sha256 = "1b4p49mbzqffm2b2y8sbbi56vnkxap2jscsmla9l6l8brybqjppi";
           name = "wonderland";
         };
         packageRequires = [ dash dash-functional emacs multi ];
         meta = {
-          homepage = "http://melpa.org/#/wonderland";
+          homepage = "https://melpa.org/#/wonderland";
           license = lib.licenses.free;
         };
       }) {};
@@ -26535,13 +27817,34 @@
           sha256 = "0s3mjmfjiidn3spklndw0dvcwbb9x034xyphp60aad8vjaflbchs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wordsmith-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wordsmith-mode";
           sha256 = "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n";
           name = "wordsmith-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/wordsmith-mode";
+          homepage = "https://melpa.org/#/wordsmith-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper }:
+    melpaBuild {
+        pname = "worf";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "worf";
+          rev = "f36755447b588b739b2bf6ab0fb5eb5f4d8db3df";
+          sha256 = "0l2n3vwk251ba06xdrs9z0bp4ligfdjd259a84ap2z3sqdfa98x4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/worf";
+          sha256 = "1fkb2ddl684dijsb0cqgmfbg1nz4xv43rb7g5rah05rchy5sgkpi";
+          name = "worf";
+        };
+        packageRequires = [ ace-link hydra swiper ];
+        meta = {
+          homepage = "https://melpa.org/#/worf";
           license = lib.licenses.free;
         };
       }) {};
@@ -26551,18 +27854,18 @@
         version = "0.7.3";
         src = fetchFromGitHub {
           owner = "rejeep";
-          repo = "wrap-region";
+          repo = "wrap-region.el";
           rev = "5a910ad23ebb0649e644bf62ad042587341da5da";
           sha256 = "03hjwm51sngkh7jjiwnqhflllqq6i99ib47rm2ja9ii0qyhj1qa0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wrap-region";
-          sha256 = "0mby3m49vm2pw127divspgivqam27zd4r70wx5ra05xwfxywaibq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wrap-region";
+          sha256 = "058518smxj3j3mr6ljzh7c9x5g23d24104p58sl9nhpw0cq9k28i";
           name = "wrap-region";
         };
         packageRequires = [ dash ];
         meta = {
-          homepage = "http://melpa.org/#/wrap-region";
+          homepage = "https://melpa.org/#/wrap-region";
           license = lib.licenses.free;
         };
       }) {};
@@ -26577,34 +27880,34 @@
           sha256 = "1nnjn1r669hvvzfycllwap4w04m8rfsk4nzcg8057m1f263kj31b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/writegood-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/writegood-mode";
           sha256 = "1lxammisaj04g5vr5lwms64ywf39w8knrq72x4i94wwzwx5ywi1d";
           name = "writegood-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/writegood-mode";
+          homepage = "https://melpa.org/#/writegood-mode";
           license = lib.licenses.free;
         };
       }) {};
     writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }:
     melpaBuild {
         pname = "writeroom-mode";
-        version = "3.1";
+        version = "3.2";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "writeroom-mode";
-          rev = "48b179879c6614afcae3fc4386fd88b52b2bcc17";
-          sha256 = "0f554h834p12255mhwjnxbh1ls65476k60cwddqyl844ph75w8jv";
+          rev = "aed9803e8eb7178361fbac75df98c19a45eff4ee";
+          sha256 = "11a3h5v7knj8y360cxin59c1ipd9y4qsqlanrw69yb5k4816ayyr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/writeroom-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/writeroom-mode";
           sha256 = "1kpsrp3agw8bg3qbf5rf5k1a7ww30q5xsa8z5ywxajsaywjzx1bk";
           name = "writeroom-mode";
         };
         packageRequires = [ emacs visual-fill-column ];
         meta = {
-          homepage = "http://melpa.org/#/writeroom-mode";
+          homepage = "https://melpa.org/#/writeroom-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -26619,13 +27922,13 @@
           sha256 = "1lv0l27lrp6xyl0c5yhlnyjwx872izq02z8x34da9jv3walxpk8f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ws-butler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ws-butler";
           sha256 = "072k67z2lx0ampwzdiszi64xs0w6frp4nbmrd2r0wpx0pd211vbn";
           name = "ws-butler";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/ws-butler";
+          homepage = "https://melpa.org/#/ws-butler";
           license = lib.licenses.free;
         };
       }) {};
@@ -26640,13 +27943,34 @@
           sha256 = "1ibvcc54y2w72d3yvcczvzywribiwmkhlb1b08g4pyb1arclw393";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wsd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wsd-mode";
           sha256 = "07vclmnj18wx9wlrcnsl99f9jlk3sb9g6pcdv8x1smk84gccpakc";
           name = "wsd-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/wsd-mode";
+          homepage = "https://melpa.org/#/wsd-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wttrin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }:
+    melpaBuild {
+        pname = "wttrin";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "bcbcarl";
+          repo = "emacs-wttrin";
+          rev = "d595240d92788791da2218d12efd6a77eee06217";
+          sha256 = "0mbc3ndggv2rbmfcfhw8bsx3qw6jy684hxz5dqa88lfb6vs5knzc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/wttrin";
+          sha256 = "0msp8lja9nz6khz3dkasv8hnhkaayqxd7m58kma03hpkcjxnaxil";
+          name = "wttrin";
+        };
+        packageRequires = [ emacs xterm-color ];
+        meta = {
+          homepage = "https://melpa.org/#/wttrin";
           license = lib.licenses.free;
         };
       }) {};
@@ -26661,13 +27985,13 @@
           sha256 = "13id1vf590gc0kwkhh6mgq2gj2bra2kycxjlvql7v0s7cdvamjhq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/x86-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/x86-lookup";
           sha256 = "1clv1npvdkzsy0a08xrb880yflwzl4d5cc2c5xrs7b837mqpj8hd";
           name = "x86-lookup";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/x86-lookup";
+          homepage = "https://melpa.org/#/x86-lookup";
           license = lib.licenses.free;
         };
       }) {};
@@ -26682,13 +28006,13 @@
           sha256 = "154xnfcmil9xjjmq4cyrfpir4ga4mgcmmbd7dja1m7rpk1734xk6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xbm-life";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xbm-life";
           sha256 = "1pglxjd4cs630sayx17ai1xflpbyj3hry3156682bgwhqs1vw68q";
           name = "xbm-life";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xbm-life";
+          homepage = "https://melpa.org/#/xbm-life";
           license = lib.licenses.free;
         };
       }) {};
@@ -26703,13 +28027,34 @@
           sha256 = "1n1msmqap4a2qnjwrchf9cjkzcl20hbrx0vsc4lkbvq3p5riv5p7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xcscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xcscope";
           sha256 = "06xh29cm5v3b5xwj32y0i0h0kvvy995840db4hvab2wn9jw68m8w";
           name = "xcscope";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xcscope";
+          homepage = "https://melpa.org/#/xcscope";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xkcd = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xkcd";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "vibhavp";
+          repo = "emacs-xkcd";
+          rev = "2c538d41a9728939cc5e8292faa78ed50997877d";
+          sha256 = "0p9p3w8i5w1pzh3y3yxz0rg5gywfq4m5anbiyrdn84vdd42jij4x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xkcd";
+          sha256 = "1r88yhs8vnkak8xl16vw3xdpm7ncz4ydkml8932bqk8xix8l8f0w";
+          name = "xkcd";
+        };
+        packageRequires = [ json ];
+        meta = {
+          homepage = "https://melpa.org/#/xkcd";
           license = lib.licenses.free;
         };
       }) {};
@@ -26724,13 +28069,34 @@
           sha256 = "1yy759qc4njc8bqh8hmgc0mq5vk5spz5syxgflqhjijk8nrvyfgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xquery-tool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xquery-tool";
           sha256 = "069injmvv9zzcbqbms94qx5wjj740jnik6sf3b4xjhln7z1yskp0";
           name = "xquery-tool";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xquery-tool";
+          homepage = "https://melpa.org/#/xquery-tool";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xref-js2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xref-js2";
+        version = "1.3";
+        src = fetchFromGitHub {
+          owner = "NicolasPetton";
+          repo = "xref-js2";
+          rev = "b4bd3b992220a9f8c38b313e4fbf4eeddc07176a";
+          sha256 = "1kmlya0bwgm2krwc6j4gp80579sf5azz08l8d7pydw69rckv6ji0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xref-js2";
+          sha256 = "1mfyszdi1wx2lqd9fyqm0ra227dcsjs8asc1dw2li0alwh7n4xs3";
+          name = "xref-js2";
+        };
+        packageRequires = [ emacs js2-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/xref-js2";
           license = lib.licenses.free;
         };
       }) {};
@@ -26745,13 +28111,13 @@
           sha256 = "1zdj4664gvwc4kyx7fx5232l3c5anm0xyrrnrw596q604q6xxj2x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xterm-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xterm-color";
           sha256 = "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj";
           name = "xterm-color";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/xterm-color";
+          homepage = "https://melpa.org/#/xterm-color";
           license = lib.licenses.free;
         };
       }) {};
@@ -26766,13 +28132,13 @@
           sha256 = "1wqx6hlqcmqiljydih5fx89dw06g8w728pyn4iqsap8jwgjngb09";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xtest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/xtest";
           sha256 = "1vbs4sb4frzg8d3l96ip9cc6lc86nbj50vpdfqazvxmdfd1sg4i7";
           name = "xtest";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/xtest";
+          homepage = "https://melpa.org/#/xtest";
           license = lib.licenses.free;
         };
       }) {};
@@ -26787,13 +28153,13 @@
           sha256 = "1rplafm6mldsirj7xg66vsx03n263yii3il3fkws69xmv7sx1a6i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yafolding";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yafolding";
           sha256 = "1z70ismfwmh9a83a7h5lbhw7iywfib5fis7y8gx8020wfjq9g2yq";
           name = "yafolding";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/yafolding";
+          homepage = "https://melpa.org/#/yafolding";
           license = lib.licenses.free;
         };
       }) {};
@@ -26808,13 +28174,13 @@
           sha256 = "0l9b888wv72j4hhkcfzsh09iqjxp2qjbjcjcfmvfhxf7il11pv8h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yagist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yagist";
           sha256 = "1mz86fq0pb4w54c66vd19m2492mkrzq2qi6ssnn2xwmn8vv02wdd";
           name = "yagist";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/yagist";
+          homepage = "https://melpa.org/#/yagist";
           license = lib.licenses.free;
         };
       }) {};
@@ -26829,13 +28195,13 @@
           sha256 = "1mj1gwrflpdlmc7wl1axygn1jqlrjys1dh3cpdh27zrgsjvhd6c1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yaml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yaml-mode";
           sha256 = "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc";
           name = "yaml-mode";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/yaml-mode";
+          homepage = "https://melpa.org/#/yaml-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -26850,34 +28216,34 @@
           sha256 = "007837w6gd7k253h7g2in6l3ihcbwv733yiffs26pnymgk21xdqz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yascroll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yascroll";
           sha256 = "11g7wn4hgdwnx3n7ra0sh8gk6rykwvrg9g2cihvcv7mjbqgcv53f";
           name = "yascroll";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/yascroll";
+          homepage = "https://melpa.org/#/yascroll";
           license = lib.licenses.free;
         };
       }) {};
     yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "0.9.1snapshot";
+        version = "0.9.1";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "yasnippet";
-          rev = "80941c077f8248ee1e8dcc64b3b57e741b9e5755";
-          sha256 = "0m6y2m2nsg6camwh0hjv9jcw6p5a0b4dwig1d58s2g15n3hca3dy";
+          rev = "6aeccce2f17aca6a59a2790ec08680d52c03f6c0";
+          sha256 = "0yiglsb1s9ni4xig05ysw75l0ndjgdyhzip7c0sdxb265p3yrfby";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yasnippet";
           sha256 = "1j6hcpzxljz1axh0xfbwr4ysbixkwgxawsvsgicls8r8kl2xvjvf";
           name = "yasnippet";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/yasnippet";
+          homepage = "https://melpa.org/#/yasnippet";
           license = lib.licenses.free;
         };
       }) {};
@@ -26892,13 +28258,13 @@
           sha256 = "1yplaj7pry43qps8hvqxj9983ah4jvaiq94l171a7f8qi28386s8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yatemplate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yatemplate";
           sha256 = "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q";
           name = "yatemplate";
         };
         packageRequires = [ yasnippet ];
         meta = {
-          homepage = "http://melpa.org/#/yatemplate";
+          homepage = "https://melpa.org/#/yatemplate";
           license = lib.licenses.free;
         };
       }) {};
@@ -26911,13 +28277,13 @@
           sha256 = "08iwfpsjs36pqr2l85avxhsjx8z0sdfw8cqwwf3brn7i4x67f7z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yatex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yatex";
           sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
           name = "yatex";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/yatex";
+          homepage = "https://melpa.org/#/yatex";
           license = lib.licenses.free;
         };
       }) {};
@@ -26932,13 +28298,13 @@
           sha256 = "0nqyn1b01v1qxv7rcf46qypca61lmpm8d7kqv63jazw3n05qdnj8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yaxception";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yaxception";
           sha256 = "18n2kjbgfhkhcwigxmv8dk72jp57vsqqd20lc26v5amx6mrhgh58";
           name = "yaxception";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/yaxception";
+          homepage = "https://melpa.org/#/yaxception";
           license = lib.licenses.free;
         };
       }) {};
@@ -26953,13 +28319,13 @@
           sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ycmd";
-          sha256 = "06psmcr5132vn72l0amzj14dy43aradnbmlvvms55srvici6r60q";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/ycmd";
+          sha256 = "1mg2b0wgfimrc0hp84q7lc654z2hysrhbzswpq1x812hgq895v8p";
           name = "ycmd";
         };
         packageRequires = [ dash deferred emacs f popup ];
         meta = {
-          homepage = "http://melpa.org/#/ycmd";
+          homepage = "https://melpa.org/#/ycmd";
           license = lib.licenses.free;
         };
       }) {};
@@ -26974,13 +28340,34 @@
           sha256 = "0yvz7lmid4jcikb9jmc7h2lcry3fdyy809k25nyasj2bk41xqqsd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yesql-ghosts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yesql-ghosts";
           sha256 = "1hxzbnfd15f0ifdqjbw9nhxd0z46x705v2bc0xl71nav78fgpswf";
           name = "yesql-ghosts";
         };
         packageRequires = [ cider dash s ];
         meta = {
-          homepage = "http://melpa.org/#/yesql-ghosts";
+          homepage = "https://melpa.org/#/yesql-ghosts";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yoshi-theme";
+        version = "6.1.0";
+        src = fetchFromGitHub {
+          owner = "ryuslash";
+          repo = "yoshi-theme";
+          rev = "b140d3adce4e8e7ff7b0daaa6684bd7065e4819b";
+          sha256 = "19a47780h0x1rdicr8i7356kvamkbkcwp31skdpp5cxgysvi3d9s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/yoshi-theme";
+          sha256 = "1kzdjs3rzg9rxrjgsk0wk75rwvbip6ixg1apcxv2c1a6biqqf2hv";
+          name = "yoshi-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/yoshi-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -26995,55 +28382,55 @@
           sha256 = "0016qff7hdnd0xkyhxakfzzscwlwkpzppvc4wxfw0iacpjkz1fnr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/youdao-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/youdao-dictionary";
           sha256 = "1qfk7s18br9jask1bpida0cjxks098qpz0ssmw8misi3bjax0fym";
           name = "youdao-dictionary";
         };
         packageRequires = [ chinese-word-at-point emacs names popup ];
         meta = {
-          homepage = "http://melpa.org/#/youdao-dictionary";
+          homepage = "https://melpa.org/#/youdao-dictionary";
           license = lib.licenses.free;
         };
       }) {};
     zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zenburn-theme";
-        version = "2.3";
+        version = "2.4";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "zenburn-emacs";
-          rev = "ad938d2322b417783889ee3885adff012ab49f7b";
-          sha256 = "0bgq34k7p9qkxhrg7dvmkfpi1r47czyw12l0cm93z3m817z5hjrk";
+          rev = "e5dc3962fd30005914b79b14e9821d298f2c305a";
+          sha256 = "1n7ka608lk0xp7vg4zcw282zna0cwvcwvmhic6ym1ag7lq5cjrhc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zenburn-theme";
           sha256 = "1kb371j9aissj0vy07jw4ydfn554blc8b2rbi0x1dvfksr2rhsn9";
           name = "zenburn-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/zenburn-theme";
+          homepage = "https://melpa.org/#/zenburn-theme";
           license = lib.licenses.free;
         };
       }) {};
     zerodark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zerodark-theme";
-        version = "1.1";
+        version = "1.2";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "c948c6e1467a61b0592b0c0ca08a4895fb353a4c";
-          sha256 = "1w1g81wy2l67b5dknphrigpxx5slfgrl2qyba4b93gcx68zaj4bq";
+          rev = "8138727db1e832c3a494713d616bb7c826604e5c";
+          sha256 = "0j940clm3w05f93rq46pzrjzj5kw2ia5mzkspk1c6x0z5vi888gm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zerodark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zerodark-theme";
           sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9";
           name = "zerodark-theme";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/zerodark-theme";
+          homepage = "https://melpa.org/#/zerodark-theme";
           license = lib.licenses.free;
         };
       }) {};
@@ -27058,13 +28445,13 @@
           sha256 = "1ksjd3askc3k1l0b3nia5mzkxa74bidh2x0xlrj4qs4im5445vnz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zombie-trellys-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zombie-trellys-mode";
           sha256 = "19xzvppw7f35s82hm0y7sga8dyjjyy0dxy6vji4hxdpjziz7lggv";
           name = "zombie-trellys-mode";
         };
         packageRequires = [ cl-lib emacs haskell-mode ];
         meta = {
-          homepage = "http://melpa.org/#/zombie-trellys-mode";
+          homepage = "https://melpa.org/#/zombie-trellys-mode";
           license = lib.licenses.free;
         };
       }) {};
@@ -27079,13 +28466,13 @@
           sha256 = "1lrgirfvcvbir7csshkhhwj99jj1x5aprhw7xfiicv7nan9m6gjy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zone-nyan";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zone-nyan";
           sha256 = "165sgjaahz038isii971m02hr2g5iqhbhiwf5kdn8c739cjaa17b";
           name = "zone-nyan";
         };
         packageRequires = [ esxml ];
         meta = {
-          homepage = "http://melpa.org/#/zone-nyan";
+          homepage = "https://melpa.org/#/zone-nyan";
           license = lib.licenses.free;
         };
       }) {};
@@ -27100,13 +28487,13 @@
           sha256 = "1dwf3980rnwc85s73j8accwgpcdhsa6fqdrppbrqb8f7c05q8303";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zoom-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zoom-window";
           sha256 = "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3";
           name = "zoom-window";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/zoom-window";
+          homepage = "https://melpa.org/#/zoom-window";
           license = lib.licenses.free;
         };
       }) {};
@@ -27121,13 +28508,13 @@
           sha256 = "0j6x3az8vpq2ggafjxdl8x3ln7lhh58c27z72mwywp4a2ca1g496";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zop-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zop-to-char";
           sha256 = "0jnspvqqvnaplld083j7cqqxw122qazh88ab7hymci36m3ka9hga";
           name = "zop-to-char";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://melpa.org/#/zop-to-char";
+          homepage = "https://melpa.org/#/zop-to-char";
           license = lib.licenses.free;
         };
       }) {};
@@ -27136,19 +28523,19 @@
         pname = "zotelo";
         version = "1.3";
         src = fetchFromGitHub {
-          owner = "vitoshka";
+          owner = "vspinu";
           repo = "zotelo";
           rev = "56eaaa76f80bd15710e68af4a1e585394af987d3";
           sha256 = "0qwdbzfi8mddmchdd9ab9ms1ynlc8dx08i6g2mf3za1sbcivdqsr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zotelo";
-          sha256 = "0ai516lqj9yw7ymvfm4n5inv53sp6mg90wy56lr1laflizwxzg8z";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zotelo";
+          sha256 = "0y6s5ma7633h5pf9zj7vkazidlf211va7nk47ppb1q0iyfkyln36";
           name = "zotelo";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/zotelo";
+          homepage = "https://melpa.org/#/zotelo";
           license = lib.licenses.free;
         };
       }) {};
@@ -27157,19 +28544,19 @@
         pname = "zygospore";
         version = "0.0.3";
         src = fetchFromGitHub {
-          owner = "louiskottmann";
+          owner = "LouisKottmann";
           repo = "zygospore.el";
           rev = "1af5ee663f5a7aa08d96a77cacff834dcdf55ea8";
           sha256 = "0v73fgb0gf81vlihiicy32v6x86rr2hv0bxlpw7d3pk4ng1a0l3z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zygospore";
-          sha256 = "03mmxqbliwd1g73cxd9kqkngdy4jdavcs6j12b4wp27xmhgaj40z";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zygospore";
+          sha256 = "0n9qs6fymdjly0i4rmx87y8gapfn5sqivsivcffi42vcb5f17kxj";
           name = "zygospore";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://melpa.org/#/zygospore";
+          homepage = "https://melpa.org/#/zygospore";
           license = lib.licenses.free;
         };
       }) {};
@@ -27184,13 +28571,13 @@
           sha256 = "0y0hhar3krkvbpb5y9k197mb0wfpz8cl6fmxazq8msjml7hkk339";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zzz-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/zzz-to-char";
           sha256 = "16vwp0krshmn5x3ry1j512g4kydx39znjqzri4j7wgg49bz1n7vh";
           name = "zzz-to-char";
         };
         packageRequires = [ avy cl-lib emacs ];
         meta = {
-          homepage = "http://melpa.org/#/zzz-to-char";
+          homepage = "https://melpa.org/#/zzz-to-char";
           license = lib.licenses.free;
         };
       }) {};

From de33f4b48b06373c3d960f9939d02522ce55dbc3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 26 Apr 2016 14:06:42 -0500
Subject: [PATCH 293/712] elpa-packages: update package generation instructions

---
 .../editors/emacs-modes/elpa-packages.nix             | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index 29cb586484a..f0a10c3ee42 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -2,12 +2,13 @@
 
 # Updating
 
-To update the list of packages from ELPA,
+To update the list of packages from MELPA,
 
-1. Clone https://github.com/ttuegel/emacs2nix
-2. Run `./elpa-packages.sh` from emacs2nix
-3. Copy the new elpa-packages.json file into Nixpkgs
-4. `git commit -m "elpa-packages $(date -Idate)"`
+1. Clone https://github.com/ttuegel/emacs2nix.
+2. Run `./elpa-packages.sh` from emacs2nix.
+3. Copy the new `elpa-generated.nix` file into Nixpkgs.
+4. Check for evaluation errors: `nix-instantiate ./. -A emacsPackagesNg.elpaPackages`.
+5. `git add pkgs/applications/editors/emacs-modes/elpa-generated.nix && git commit -m "elpa-packages $(date -Idate)"`
 
 */
 

From d47fe2bd4a5633de58711c152ccfdd94fcf21b3a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 26 Apr 2016 14:07:32 -0500
Subject: [PATCH 294/712] elpa-packages 2016-04-26

---
 .../editors/emacs-modes/elpa-generated.nix    | 689 +++++++++---------
 1 file changed, 346 insertions(+), 343 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index f10b1fbe61f..a54f364b8d4 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -3,12 +3,12 @@
         pname = "ace-window";
         version = "0.9.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/ace-window-0.9.0.el";
+          url = "https://elpa.gnu.org/packages/ace-window-0.9.0.el";
           sha256 = "1m7fc4arcxn7fp0hnzyp20czjp4zx3rjaspfzpxzgc8sbghi81a3";
         };
         packageRequires = [ avy ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/ace-window.html";
+          homepage = "https://elpa.gnu.org/packages/ace-window.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -16,12 +16,12 @@
         pname = "ack";
         version = "1.5";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/ack-1.5.tar";
+          url = "https://elpa.gnu.org/packages/ack-1.5.tar";
           sha256 = "0sljshiy44z27idy0rxjs2fx4smlm4v607wic7md1vihp6qp4l9r";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/ack.html";
+          homepage = "https://elpa.gnu.org/packages/ack.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -30,12 +30,12 @@
         pname = "ada-mode";
         version = "5.1.9";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/ada-mode-5.1.9.tar";
+          url = "https://elpa.gnu.org/packages/ada-mode-5.1.9.tar";
           sha256 = "04hwy9py22c4vpbk24idbyavjdjpm1akvnfigdzx35zljdrvk3l7";
         };
         packageRequires = [ cl-lib emacs wisi ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/ada-mode.html";
+          homepage = "https://elpa.gnu.org/packages/ada-mode.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -43,12 +43,12 @@
         pname = "ada-ref-man";
         version = "2012.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/ada-ref-man-2012.0.tar";
+          url = "https://elpa.gnu.org/packages/ada-ref-man-2012.0.tar";
           sha256 = "1g97892h8d1xa7cfxgg4i232i15hhci7gijj0dzc31yd9vbqayx8";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/ada-ref-man.html";
+          homepage = "https://elpa.gnu.org/packages/ada-ref-man.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -56,12 +56,12 @@
         pname = "adaptive-wrap";
         version = "0.5";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/adaptive-wrap-0.5.el";
+          url = "https://elpa.gnu.org/packages/adaptive-wrap-0.5.el";
           sha256 = "0frgmp8vrrml4iykm60j4d6cl9rbcivy9yh24q6kd10bcyx59ypy";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/adaptive-wrap.html";
+          homepage = "https://elpa.gnu.org/packages/adaptive-wrap.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -69,26 +69,26 @@
         pname = "adjust-parens";
         version = "3.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/adjust-parens-3.0.tar";
+          url = "https://elpa.gnu.org/packages/adjust-parens-3.0.tar";
           sha256 = "16gmrgdfyqs7i617669f7xy5mds1svbyfv12xhdjk96rbssfngzg";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/adjust-parens.html";
+          homepage = "https://elpa.gnu.org/packages/adjust-parens.html";
           license = lib.licenses.free;
         };
       }) {};
     aggressive-indent = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "aggressive-indent";
-        version = "1.5";
+        version = "1.6";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/aggressive-indent-1.5.el";
-          sha256 = "00ddfni659rl19ybzrywj3b444akvil6n06k8lf5jyaqb53mkc5d";
+          url = "https://elpa.gnu.org/packages/aggressive-indent-1.6.el";
+          sha256 = "1xnxc2x1hbhkbqhp9p3c9azrdm6mr6czqc9pl63phjp9dbslny7i";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/aggressive-indent.html";
+          homepage = "https://elpa.gnu.org/packages/aggressive-indent.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -97,12 +97,12 @@
         pname = "ahungry-theme";
         version = "1.1.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/ahungry-theme-1.1.0.tar";
+          url = "https://elpa.gnu.org/packages/ahungry-theme-1.1.0.tar";
           sha256 = "1jy2h4r72fr26yavs0s8dy1xnkxvaf2hsrlm63f6sng81njj9dgx";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/ahungry-theme.html";
+          homepage = "https://elpa.gnu.org/packages/ahungry-theme.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -110,12 +110,12 @@
         pname = "all";
         version = "1.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/all-1.0.el";
+          url = "https://elpa.gnu.org/packages/all-1.0.el";
           sha256 = "17h4cp0xnh08szh3snbmn1mqq2smgqkn45bq7v0cpsxq1i301hi3";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/all.html";
+          homepage = "https://elpa.gnu.org/packages/all.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -123,25 +123,26 @@
         pname = "ampc";
         version = "0.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/ampc-0.2.el";
+          url = "https://elpa.gnu.org/packages/ampc-0.2.el";
           sha256 = "1pdy5mvi6h8m7qjnxiy217fgcp9w91375hq29bacfgh7bix56jlr";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/ampc.html";
+          homepage = "https://elpa.gnu.org/packages/ampc.html";
           license = lib.licenses.free;
         };
       }) {};
-    arbitools = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    arbitools = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
         pname = "arbitools";
-        version = "0.51";
+        version = "0.70";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/arbitools-0.51.el";
-          sha256 = "1pwps73s885i1777wlmqhkmfgj564bkb6rkpc964v0vcqia6fpag";
+          url = "https://elpa.gnu.org/packages/arbitools-0.70.el";
+          sha256 = "129ykqhx26adw0x26wzb4biyr5pnjgqmycsabsag2hzxjd7c92gl";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/arbitools.html";
+          homepage = "https://elpa.gnu.org/packages/arbitools.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -150,12 +151,12 @@
         pname = "ascii-art-to-unicode";
         version = "1.9";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/ascii-art-to-unicode-1.9.el";
+          url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.9.el";
           sha256 = "0lfgfkx81s4dd318xcxsl7hdgpi0dc1fv3d00m3xg8smyxcf3adv";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/ascii-art-to-unicode.html";
+          homepage = "https://elpa.gnu.org/packages/ascii-art-to-unicode.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -163,25 +164,25 @@
         pname = "async";
         version = "1.6";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/async-1.6.tar";
+          url = "https://elpa.gnu.org/packages/async-1.6.tar";
           sha256 = "17psvz75n42x33my967wkgi7r0blx46n3jdv510j0z5jswv66039";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/async.html";
+          homepage = "https://elpa.gnu.org/packages/async.html";
           license = lib.licenses.free;
         };
       }) {};
     auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "auctex";
-        version = "11.89.1";
+        version = "11.89.3";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/auctex-11.89.1.tar";
-          sha256 = "0nqp12l5x2h0hxl8p3l6aiz4mvdf79zz84z1wl3q2prliac3xz17";
+          url = "https://elpa.gnu.org/packages/auctex-11.89.3.tar";
+          sha256 = "16yjalh8qf1m3zgwxf1h3dkjq7hkb9895g2lb6ajwjfn02yiav80";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/auctex.html";
+          homepage = "https://elpa.gnu.org/packages/auctex.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -189,12 +190,12 @@
         pname = "aumix-mode";
         version = "7";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/aumix-mode-7.el";
+          url = "https://elpa.gnu.org/packages/aumix-mode-7.el";
           sha256 = "0qyjw2g3pzcxqdg1cpp889nmb524jxqq32dz7b7cg2m903lv5gmv";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/aumix-mode.html";
+          homepage = "https://elpa.gnu.org/packages/aumix-mode.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -202,12 +203,12 @@
         pname = "auto-overlays";
         version = "0.10.9";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/auto-overlays-0.10.9.tar";
+          url = "https://elpa.gnu.org/packages/auto-overlays-0.10.9.tar";
           sha256 = "0aqjp3bkd7mi191nm971z857s09py390ikcd93hyhmknblk0v14p";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/auto-overlays.html";
+          homepage = "https://elpa.gnu.org/packages/auto-overlays.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -216,39 +217,39 @@
         pname = "avy";
         version = "0.4.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/avy-0.4.0.tar";
+          url = "https://elpa.gnu.org/packages/avy-0.4.0.tar";
           sha256 = "1vbp37ndv5930x120n0isxxxfs8d5wqlrbnxvp6h3ahbbv0zdcsn";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/avy.html";
+          homepage = "https://elpa.gnu.org/packages/avy.html";
           license = lib.licenses.free;
         };
       }) {};
     beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }: elpaBuild {
         pname = "beacon";
-        version = "1.0";
+        version = "1.2.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/beacon-1.0.el";
-          sha256 = "1rdvdn50kb7kplvi8x199cm15mn4pxidn17p84l8q5wk3arj9c09";
+          url = "https://elpa.gnu.org/packages/beacon-1.2.1.el";
+          sha256 = "00i0p7azkkk4jpz6dnbkc4rhcvm1q7dg953874ph50fjihwqi1m6";
         };
         packageRequires = [ seq ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/beacon.html";
+          homepage = "https://elpa.gnu.org/packages/beacon.html";
           license = lib.licenses.free;
         };
       }) {};
     bug-hunter = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }:
     elpaBuild {
         pname = "bug-hunter";
-        version = "1.1";
+        version = "1.3";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/bug-hunter-1.1.el";
-          sha256 = "07j455hizqiicpigy8ybpqk0v87iqa57jvpirg5yb2g8j5ipwygs";
+          url = "https://elpa.gnu.org/packages/bug-hunter-1.3.el";
+          sha256 = "1j1d9nml2wl3yj7llykq5k1a81kzb3r4rbn695c0853fk036gk5x";
         };
         packageRequires = [ cl-lib seq ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/bug-hunter.html";
+          homepage = "https://elpa.gnu.org/packages/bug-hunter.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -256,12 +257,12 @@
         pname = "caps-lock";
         version = "1.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/caps-lock-1.0.el";
+          url = "https://elpa.gnu.org/packages/caps-lock-1.0.el";
           sha256 = "1i4hwam81p4dr0bk8257fkiz4xmv6knkjxj7a00fa35kgx5blpva";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/caps-lock.html";
+          homepage = "https://elpa.gnu.org/packages/caps-lock.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -270,12 +271,12 @@
         pname = "chess";
         version = "2.0.4";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/chess-2.0.4.tar";
+          url = "https://elpa.gnu.org/packages/chess-2.0.4.tar";
           sha256 = "1sq1bjmp513vldfh7hc2bbfc54665abqiz0kqgqq3gijckaxn5js";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/chess.html";
+          homepage = "https://elpa.gnu.org/packages/chess.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -283,12 +284,12 @@
         pname = "cl-generic";
         version = "0.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/cl-generic-0.2.el";
+          url = "https://elpa.gnu.org/packages/cl-generic-0.2.el";
           sha256 = "0b2y114f14fdlk5hkb0fvdbv6pqm9ifw0vwzri1vqp1xq1l1f9p3";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/cl-generic.html";
+          homepage = "https://elpa.gnu.org/packages/cl-generic.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -296,12 +297,12 @@
         pname = "cl-lib";
         version = "0.5";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/cl-lib-0.5.el";
+          url = "https://elpa.gnu.org/packages/cl-lib-0.5.el";
           sha256 = "1z4ffcx7b95bxz52586lhvdrdm5vp473g3afky9h5my3jp5cd994";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/cl-lib.html";
+          homepage = "https://elpa.gnu.org/packages/cl-lib.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -309,12 +310,12 @@
         pname = "coffee-mode";
         version = "0.4.1.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/coffee-mode-0.4.1.1.el";
+          url = "https://elpa.gnu.org/packages/coffee-mode-0.4.1.1.el";
           sha256 = "1jffd8rqmc3l597db26rggis6apf91glyzm1qvpf5g3iz55g6slz";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/coffee-mode.html";
+          homepage = "https://elpa.gnu.org/packages/coffee-mode.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -323,12 +324,12 @@
         pname = "company";
         version = "0.8.12";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/company-0.8.12.tar";
+          url = "https://elpa.gnu.org/packages/company-0.8.12.tar";
           sha256 = "1r7q813rjs4dgknsfqi354ahsvk8k4ld4xh1fkp8lbxb13da6gqx";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/company.html";
+          homepage = "https://elpa.gnu.org/packages/company.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -337,12 +338,12 @@
         pname = "company-math";
         version = "1.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/company-math-1.1.tar";
+          url = "https://elpa.gnu.org/packages/company-math-1.1.tar";
           sha256 = "10yi5jmv7njcaansgy2aw7wm1j3acch1j9x6lfg9mxk0j21zvgwp";
         };
         packageRequires = [ company math-symbol-lists ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/company-math.html";
+          homepage = "https://elpa.gnu.org/packages/company-math.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -351,12 +352,12 @@
         pname = "company-statistics";
         version = "0.2.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/company-statistics-0.2.2.tar";
+          url = "https://elpa.gnu.org/packages/company-statistics-0.2.2.tar";
           sha256 = "0h1k0dbb7ngk6pghli2csfpzpx37si0wg840jmay0jlb80q6vw73";
         };
         packageRequires = [ company emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/company-statistics.html";
+          homepage = "https://elpa.gnu.org/packages/company-statistics.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -365,12 +366,12 @@
         pname = "context-coloring";
         version = "7.2.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/context-coloring-7.2.1.el";
+          url = "https://elpa.gnu.org/packages/context-coloring-7.2.1.el";
           sha256 = "1lh2p3fsym73h0dcj1gqg1xsw3lcikmcskbx8y3j0ds30l4xs13d";
         };
         packageRequires = [ emacs js2-mode ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/context-coloring.html";
+          homepage = "https://elpa.gnu.org/packages/context-coloring.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -378,25 +379,25 @@
         pname = "crisp";
         version = "1.3.4";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/crisp-1.3.4.el";
+          url = "https://elpa.gnu.org/packages/crisp-1.3.4.el";
           sha256 = "1xbnf7xlw499zsnr5ky2bghb2fzg3g7cf2ldmbb7c3b84raryn0i";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/crisp.html";
+          homepage = "https://elpa.gnu.org/packages/crisp.html";
           license = lib.licenses.free;
         };
       }) {};
     csv-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "csv-mode";
-        version = "1.5";
+        version = "1.6";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/csv-mode-1.5.el";
-          sha256 = "1dmc6brb6m9s29wsr6giwpf77yindfq47344l9jr31hqgg82x1xc";
+          url = "https://elpa.gnu.org/packages/csv-mode-1.6.el";
+          sha256 = "1v86qna1ypnr55spf6kjiqybplfbb8ak5gnnifh9vghsgb5jkb6a";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/csv-mode.html";
+          homepage = "https://elpa.gnu.org/packages/csv-mode.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -405,12 +406,12 @@
         pname = "darkroom";
         version = "0.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/darkroom-0.1.el";
+          url = "https://elpa.gnu.org/packages/darkroom-0.1.el";
           sha256 = "0fif8fm1h7x7g16949shfnaik5f5488clsvkf8bi5izpqp3vi6ak";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/darkroom.html";
+          homepage = "https://elpa.gnu.org/packages/darkroom.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -418,12 +419,12 @@
         pname = "dash";
         version = "2.12.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/dash-2.12.0.tar";
+          url = "https://elpa.gnu.org/packages/dash-2.12.0.tar";
           sha256 = "02r547vian59zr55z6ri4p2b7q5y5k256wi9j8a317vjzyh54m05";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/dash.html";
+          homepage = "https://elpa.gnu.org/packages/dash.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -432,25 +433,26 @@
         pname = "dbus-codegen";
         version = "0.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/dbus-codegen-0.1.el";
+          url = "https://elpa.gnu.org/packages/dbus-codegen-0.1.el";
           sha256 = "1gi7jc6rn6hlgh01zfwb7cczb5hi3c05wlnzw6akj1h9kai1lmzw";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/dbus-codegen.html";
+          homepage = "https://elpa.gnu.org/packages/dbus-codegen.html";
           license = lib.licenses.free;
         };
       }) {};
-    debbugs = callPackage ({ async, elpaBuild, fetchurl, lib }: elpaBuild {
+    debbugs = callPackage ({ elpaBuild, fetchurl, lib, soap-client }:
+    elpaBuild {
         pname = "debbugs";
-        version = "0.9";
+        version = "0.9.3";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/debbugs-0.9.tar";
-          sha256 = "1wc6kw7hihqqdx8qyl01akygycnan44x400hwrcf54m3hb4isa0k";
+          url = "https://elpa.gnu.org/packages/debbugs-0.9.3.tar";
+          sha256 = "0qj1b5ax80bi5kz6jfi4f5kpirkkc2li8zf18fj86q5ayh3rsgnz";
         };
-        packageRequires = [ async ];
+        packageRequires = [ soap-client ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/debbugs.html";
+          homepage = "https://elpa.gnu.org/packages/debbugs.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -459,12 +461,12 @@
         pname = "dict-tree";
         version = "0.12.8";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/dict-tree-0.12.8.el";
+          url = "https://elpa.gnu.org/packages/dict-tree-0.12.8.el";
           sha256 = "08jaifqaq9cfz1z4fr4ib9l6lbx4x60q7d6gajx1cdhh18x6nys5";
         };
         packageRequires = [ heap tNFA trie ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/dict-tree.html";
+          homepage = "https://elpa.gnu.org/packages/dict-tree.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -473,12 +475,12 @@
         pname = "diff-hl";
         version = "1.8.3";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/diff-hl-1.8.3.tar";
+          url = "https://elpa.gnu.org/packages/diff-hl-1.8.3.tar";
           sha256 = "1i3ngx5gmjl1a15y6d0xmcgdimn7ghrqkbzqisz4ra3dgwbbb3f9";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/diff-hl.html";
+          homepage = "https://elpa.gnu.org/packages/diff-hl.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -487,12 +489,12 @@
         pname = "dismal";
         version = "1.5";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/dismal-1.5.tar";
+          url = "https://elpa.gnu.org/packages/dismal-1.5.tar";
           sha256 = "1vhs6w6c2klsrfjpw8vr5c4gwiw83ppdjhsn2la0fvkm60jmc476";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/dismal.html";
+          homepage = "https://elpa.gnu.org/packages/dismal.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -500,12 +502,12 @@
         pname = "djvu";
         version = "0.5";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/djvu-0.5.el";
+          url = "https://elpa.gnu.org/packages/djvu-0.5.el";
           sha256 = "1wpyv4ismfsz5hfaj75j3h3nni1mnk33czhw3rd45cf32a2zkqsj";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/djvu.html";
+          homepage = "https://elpa.gnu.org/packages/djvu.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -513,12 +515,12 @@
         pname = "docbook";
         version = "0.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/docbook-0.1.el";
+          url = "https://elpa.gnu.org/packages/docbook-0.1.el";
           sha256 = "01x0g8dhw65mzp9mk6qhx9p2bsvkw96hz1awrrf2ji17sp8hd1v6";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/docbook.html";
+          homepage = "https://elpa.gnu.org/packages/docbook.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -526,12 +528,12 @@
         pname = "dts-mode";
         version = "0.1.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/dts-mode-0.1.0.el";
+          url = "https://elpa.gnu.org/packages/dts-mode-0.1.0.el";
           sha256 = "08xwqbdg0gwipc3gfacs3gpc6zz6lhkw7pyj7n9qhg020c4qv7hq";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/dts-mode.html";
+          homepage = "https://elpa.gnu.org/packages/dts-mode.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -540,12 +542,12 @@
         pname = "easy-kill";
         version = "0.9.3";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/easy-kill-0.9.3.tar";
+          url = "https://elpa.gnu.org/packages/easy-kill-0.9.3.tar";
           sha256 = "17nw0mglmg877axwg1d0gs03yc0p04lzmd3pl0nsnqbh3303fnqb";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/easy-kill.html";
+          homepage = "https://elpa.gnu.org/packages/easy-kill.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -553,12 +555,12 @@
         pname = "ediprolog";
         version = "1.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/ediprolog-1.1.el";
+          url = "https://elpa.gnu.org/packages/ediprolog-1.1.el";
           sha256 = "19qaciwhzr7k624z455fi8i0v5kl10587ha2mfx1bdsym7y376yd";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/ediprolog.html";
+          homepage = "https://elpa.gnu.org/packages/ediprolog.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -566,12 +568,12 @@
         pname = "el-search";
         version = "0.1.3";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/el-search-0.1.3.el";
+          url = "https://elpa.gnu.org/packages/el-search-0.1.3.el";
           sha256 = "1iwglpzs78zy07k3ijbwgv9781bs5cpf088giyz6bn5amfpp1jks";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/el-search.html";
+          homepage = "https://elpa.gnu.org/packages/el-search.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -579,12 +581,12 @@
         pname = "eldoc-eval";
         version = "0.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/eldoc-eval-0.1.el";
+          url = "https://elpa.gnu.org/packages/eldoc-eval-0.1.el";
           sha256 = "1mnhxdsn9h43iq941yqmg92v3hbzwyg7acqfnz14q5g52bnagg19";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/eldoc-eval.html";
+          homepage = "https://elpa.gnu.org/packages/eldoc-eval.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -592,12 +594,12 @@
         pname = "electric-spacing";
         version = "5.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/electric-spacing-5.0.el";
+          url = "https://elpa.gnu.org/packages/electric-spacing-5.0.el";
           sha256 = "1jk6v84z0n8jljzsz4wk7rgzh7drpfvxf4bp6xis8gapnd3ycfyv";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/electric-spacing.html";
+          homepage = "https://elpa.gnu.org/packages/electric-spacing.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -605,12 +607,12 @@
         pname = "enwc";
         version = "1.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/enwc-1.0.tar";
+          url = "https://elpa.gnu.org/packages/enwc-1.0.tar";
           sha256 = "19mjkcgnacygzwm5dsayrwpbzfxadp9kdmmghrk1vir2hwixgv8y";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/enwc.html";
+          homepage = "https://elpa.gnu.org/packages/enwc.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -618,12 +620,12 @@
         pname = "epoch-view";
         version = "0.0.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/epoch-view-0.0.1.el";
+          url = "https://elpa.gnu.org/packages/epoch-view-0.0.1.el";
           sha256 = "1wy25ryyg9f4v83qjym2pwip6g9mszhqkf5a080z0yl47p71avfx";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/epoch-view.html";
+          homepage = "https://elpa.gnu.org/packages/epoch-view.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -632,26 +634,26 @@
         pname = "ergoemacs-mode";
         version = "5.14.7.3";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/ergoemacs-mode-5.14.7.3.tar";
+          url = "https://elpa.gnu.org/packages/ergoemacs-mode-5.14.7.3.tar";
           sha256 = "0lqqrnw6z9w7js8r40khckjc1cyxdiwx8kapf5pvyfs09gs89i90";
         };
         packageRequires = [ emacs undo-tree ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/ergoemacs-mode.html";
+          homepage = "https://elpa.gnu.org/packages/ergoemacs-mode.html";
           license = lib.licenses.free;
         };
       }) {};
     excorporate = callPackage ({ elpaBuild, emacs, fetchurl, fsm, lib, soap-client, url-http-ntlm }:
     elpaBuild {
         pname = "excorporate";
-        version = "0.7.1";
+        version = "0.7.3";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/excorporate-0.7.1.tar";
-          sha256 = "1flvhk39yymskzazpwh95j2nj8kg4b02hsg7b8msnqi3q5lpqs54";
+          url = "https://elpa.gnu.org/packages/excorporate-0.7.3.tar";
+          sha256 = "053pcqv5gcwnl57kcxsm3v60nmi5sm4myjca2xqraldp27k6qd1q";
         };
         packageRequires = [ emacs fsm soap-client url-http-ntlm ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/excorporate.html";
+          homepage = "https://elpa.gnu.org/packages/excorporate.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -659,12 +661,12 @@
         pname = "exwm";
         version = "0.4";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/exwm-0.4.tar";
+          url = "https://elpa.gnu.org/packages/exwm-0.4.tar";
           sha256 = "1qlplx88mk8c5sahlymxxh46bzf6bxnsqk92wliv5ji4ai5373fb";
         };
         packageRequires = [ xelb ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/exwm.html";
+          homepage = "https://elpa.gnu.org/packages/exwm.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -673,12 +675,12 @@
         pname = "f90-interface-browser";
         version = "1.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/f90-interface-browser-1.1.el";
+          url = "https://elpa.gnu.org/packages/f90-interface-browser-1.1.el";
           sha256 = "0mf32w2bgc6b43k0r4a11bywprj7y3rvl21i0ry74v425r6hc3is";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/f90-interface-browser.html";
+          homepage = "https://elpa.gnu.org/packages/f90-interface-browser.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -687,12 +689,12 @@
         pname = "flylisp";
         version = "0.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/flylisp-0.2.el";
+          url = "https://elpa.gnu.org/packages/flylisp-0.2.el";
           sha256 = "0hh09qy1xwlv52lsh49nr11h4lk8qlmk06b669q494d79hxyv4v6";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/flylisp.html";
+          homepage = "https://elpa.gnu.org/packages/flylisp.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -701,12 +703,12 @@
         pname = "fsm";
         version = "0.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/fsm-0.2.el";
+          url = "https://elpa.gnu.org/packages/fsm-0.2.el";
           sha256 = "1kh1r5by1q2x8bbg0z2jzmb5i6blvlf105mavrnbcxa6ghbiz6iy";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/fsm.html";
+          homepage = "https://elpa.gnu.org/packages/fsm.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -715,12 +717,12 @@
         pname = "ggtags";
         version = "0.8.11";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/ggtags-0.8.11.el";
+          url = "https://elpa.gnu.org/packages/ggtags-0.8.11.el";
           sha256 = "1q2bp2b7lylf7n6c1psfn5swyjg0y78ykm0ak2kd84pbyhqak2mq";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/ggtags.html";
+          homepage = "https://elpa.gnu.org/packages/ggtags.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -728,12 +730,12 @@
         pname = "gnome-c-style";
         version = "0.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/gnome-c-style-0.1.tar";
+          url = "https://elpa.gnu.org/packages/gnome-c-style-0.1.tar";
           sha256 = "09w68jbpzyyhcaqw335qpr840j7xx0j81zxxkxq4ahqv6ck27v4x";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/gnome-c-style.html";
+          homepage = "https://elpa.gnu.org/packages/gnome-c-style.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -742,12 +744,12 @@
         pname = "gnorb";
         version = "1.1.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/gnorb-1.1.2.tar";
+          url = "https://elpa.gnu.org/packages/gnorb-1.1.2.tar";
           sha256 = "18d5wdv33lcg96m3ljnv9zn98in27apm7bjycgq0asd2f31dvcvx";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/gnorb.html";
+          homepage = "https://elpa.gnu.org/packages/gnorb.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -756,12 +758,12 @@
         pname = "gnugo";
         version = "3.0.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/gnugo-3.0.0.tar";
+          url = "https://elpa.gnu.org/packages/gnugo-3.0.0.tar";
           sha256 = "0b94kbqxir023wkmqn9kpjjj2v0gcz856mqipz30gxjbjj42w27x";
         };
         packageRequires = [ ascii-art-to-unicode cl-lib xpm ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/gnugo.html";
+          homepage = "https://elpa.gnu.org/packages/gnugo.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -769,12 +771,12 @@
         pname = "heap";
         version = "0.3";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/heap-0.3.el";
+          url = "https://elpa.gnu.org/packages/heap-0.3.el";
           sha256 = "1347s06nv88zyhmbimvn13f13d1r147kn6kric1ki6n382zbw6k6";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/heap.html";
+          homepage = "https://elpa.gnu.org/packages/heap.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -782,12 +784,12 @@
         pname = "html5-schema";
         version = "0.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/html5-schema-0.1.tar";
+          url = "https://elpa.gnu.org/packages/html5-schema-0.1.tar";
           sha256 = "19k1jal6j64zq78w8h0lw7cljivmp2jzs5sa1ppc0mqkpn2hyq1i";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/html5-schema.html";
+          homepage = "https://elpa.gnu.org/packages/html5-schema.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -796,12 +798,12 @@
         pname = "hydra";
         version = "0.13.5";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/hydra-0.13.5.tar";
+          url = "https://elpa.gnu.org/packages/hydra-0.13.5.tar";
           sha256 = "0vq1pjyq6ddbikbh0vzdigbs0zlldgwad0192s7v9npg8qlwi668";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/hydra.html";
+          homepage = "https://elpa.gnu.org/packages/hydra.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -809,12 +811,12 @@
         pname = "ioccur";
         version = "2.4";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/ioccur-2.4.el";
+          url = "https://elpa.gnu.org/packages/ioccur-2.4.el";
           sha256 = "1isid3kgsi5qkz27ipvmp9v5knx0qigmv7lz12mqdkwv8alns1p9";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/ioccur.html";
+          homepage = "https://elpa.gnu.org/packages/ioccur.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -822,12 +824,25 @@
         pname = "iterators";
         version = "0.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/iterators-0.1.el";
+          url = "https://elpa.gnu.org/packages/iterators-0.1.el";
           sha256 = "0rljqdaj88cbhngj4ddd2z3bfd35r84aivq4h10mk4n4h8whjpj4";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/iterators.html";
+          homepage = "https://elpa.gnu.org/packages/iterators.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+        pname = "ivy";
+        version = "0.8.0";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/ivy-0.8.0.tar";
+          sha256 = "1c1impdk1p082v6nb9lms4n258z6ngz8ra90cshprs0ingrk705p";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/ivy.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -835,12 +850,12 @@
         pname = "javaimp";
         version = "0.6";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/javaimp-0.6.el";
+          url = "https://elpa.gnu.org/packages/javaimp-0.6.el";
           sha256 = "00a37jv9wbzy521a15vk7a66rsf463zzr57adc8ii2m4kcyldpqh";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/javaimp.html";
+          homepage = "https://elpa.gnu.org/packages/javaimp.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -849,12 +864,12 @@
         pname = "jgraph-mode";
         version = "1.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/jgraph-mode-1.1.el";
+          url = "https://elpa.gnu.org/packages/jgraph-mode-1.1.el";
           sha256 = "0479irjz5r79x6ngl3lfkl1gqsmvcw8kn6285sm6nkn66m1dfs8l";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/jgraph-mode.html";
+          homepage = "https://elpa.gnu.org/packages/jgraph-mode.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -863,12 +878,12 @@
         pname = "js2-mode";
         version = "20150909";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/js2-mode-20150909.tar";
+          url = "https://elpa.gnu.org/packages/js2-mode-20150909.tar";
           sha256 = "1ha696jl9k1325r3xlr11rx6lmd545p42f8biw4hb0q1zsr2306h";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/js2-mode.html";
+          homepage = "https://elpa.gnu.org/packages/js2-mode.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -876,12 +891,12 @@
         pname = "jumpc";
         version = "3.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/jumpc-3.0.el";
+          url = "https://elpa.gnu.org/packages/jumpc-3.0.el";
           sha256 = "1vhggw3mzaq33al8f16jbg5qq5f95s8365is9qqyb8yq77gqym6a";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/jumpc.html";
+          homepage = "https://elpa.gnu.org/packages/jumpc.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -889,25 +904,25 @@
         pname = "landmark";
         version = "1.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/landmark-1.0.el";
+          url = "https://elpa.gnu.org/packages/landmark-1.0.el";
           sha256 = "0mz1l9zc1nvggjhg4jcly8ncw38xkprlrha8l8vfl9k9rg7s1dv4";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/landmark.html";
+          homepage = "https://elpa.gnu.org/packages/landmark.html";
           license = lib.licenses.free;
         };
       }) {};
-    let-alist = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    let-alist = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "let-alist";
         version = "1.0.4";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/let-alist-1.0.4.el";
+          url = "https://elpa.gnu.org/packages/let-alist-1.0.4.el";
           sha256 = "07312bvvyz86lf64vdkxg2l1wgfjl25ljdjwlf1bdzj01c4hm88x";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/let-alist.html";
+          homepage = "https://elpa.gnu.org/packages/let-alist.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -915,12 +930,12 @@
         pname = "lex";
         version = "1.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/lex-1.1.tar";
+          url = "https://elpa.gnu.org/packages/lex-1.1.tar";
           sha256 = "1i6ri3k2b2nginhnmwy67mdpv5p75jkxjfwbf42wymza8fxzwbb7";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/lex.html";
+          homepage = "https://elpa.gnu.org/packages/lex.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -928,12 +943,12 @@
         pname = "lmc";
         version = "1.3";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/lmc-1.3.el";
+          url = "https://elpa.gnu.org/packages/lmc-1.3.el";
           sha256 = "0s5dkksgfbfbhc770z1n7d4jrkpcb8z1935abgrw80icxgsrc01p";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/lmc.html";
+          homepage = "https://elpa.gnu.org/packages/lmc.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -941,12 +956,12 @@
         pname = "load-dir";
         version = "0.0.3";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/load-dir-0.0.3.el";
+          url = "https://elpa.gnu.org/packages/load-dir-0.0.3.el";
           sha256 = "0w5rdc6gr7nm7r0d258mp5sc06n09mmz7kjg8bd3sqnki8iz7s32";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/load-dir.html";
+          homepage = "https://elpa.gnu.org/packages/load-dir.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -954,12 +969,12 @@
         pname = "load-relative";
         version = "1.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/load-relative-1.2.el";
+          url = "https://elpa.gnu.org/packages/load-relative-1.2.el";
           sha256 = "0vmfal05hznb10k2y3j9mychi9ra4hxcm6qf7j1r8aw9j7af6riw";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/load-relative.html";
+          homepage = "https://elpa.gnu.org/packages/load-relative.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -967,12 +982,12 @@
         pname = "loc-changes";
         version = "1.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/loc-changes-1.2.el";
+          url = "https://elpa.gnu.org/packages/loc-changes-1.2.el";
           sha256 = "1x8fn8vqasayf1rb8a6nma9n6nbvkx60krmiahyb05vl5rrsw6r3";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/loc-changes.html";
+          homepage = "https://elpa.gnu.org/packages/loc-changes.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -981,12 +996,12 @@
         pname = "loccur";
         version = "1.2.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/loccur-1.2.2.el";
+          url = "https://elpa.gnu.org/packages/loccur-1.2.2.el";
           sha256 = "0ij5wzxysaikiccw7mjbw1sfylvih0n6b6yyp55vn8w1z2dba0xk";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/loccur.html";
+          homepage = "https://elpa.gnu.org/packages/loccur.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -994,12 +1009,12 @@
         pname = "markchars";
         version = "0.2.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/markchars-0.2.0.el";
+          url = "https://elpa.gnu.org/packages/markchars-0.2.0.el";
           sha256 = "1wn9v9jzcyq5wxhw5839jsggfy97955ngspn2gn6jmvz6zdgy4hv";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/markchars.html";
+          homepage = "https://elpa.gnu.org/packages/markchars.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1007,12 +1022,12 @@
         pname = "math-symbol-lists";
         version = "1.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/math-symbol-lists-1.1.tar";
+          url = "https://elpa.gnu.org/packages/math-symbol-lists-1.1.tar";
           sha256 = "06klvnqipz0n9slw72fxmhrydrw6bi9fs9vnn8hrja8gsqf8inlz";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/math-symbol-lists.html";
+          homepage = "https://elpa.gnu.org/packages/math-symbol-lists.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1020,12 +1035,12 @@
         pname = "memory-usage";
         version = "0.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/memory-usage-0.2.el";
+          url = "https://elpa.gnu.org/packages/memory-usage-0.2.el";
           sha256 = "03qwb7sprdh1avxv3g7hhnhl41pwvnpxcpnqrikl7picy78h1gwj";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/memory-usage.html";
+          homepage = "https://elpa.gnu.org/packages/memory-usage.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1034,12 +1049,12 @@
         pname = "metar";
         version = "0.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/metar-0.2.el";
+          url = "https://elpa.gnu.org/packages/metar-0.2.el";
           sha256 = "0rfzq79llh6ixw02kjpn8s2shxrabvfvsq48pagwak1jl2s0askf";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/metar.html";
+          homepage = "https://elpa.gnu.org/packages/metar.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1047,12 +1062,12 @@
         pname = "midi-kbd";
         version = "0.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/midi-kbd-0.2.el";
+          url = "https://elpa.gnu.org/packages/midi-kbd-0.2.el";
           sha256 = "1783k07gyiaq784wqv8qqc89cw5d6q1bdqz68b7n1lx4vmvfrhmh";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/midi-kbd.html";
+          homepage = "https://elpa.gnu.org/packages/midi-kbd.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1060,12 +1075,12 @@
         pname = "minibuffer-line";
         version = "0.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/minibuffer-line-0.1.el";
+          url = "https://elpa.gnu.org/packages/minibuffer-line-0.1.el";
           sha256 = "1ny4iirp26na5118wfgxlv6fxlrdclzdbd9m0lkrv51w0qw7spil";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/minibuffer-line.html";
+          homepage = "https://elpa.gnu.org/packages/minibuffer-line.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1073,12 +1088,12 @@
         pname = "minimap";
         version = "1.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/minimap-1.2.el";
+          url = "https://elpa.gnu.org/packages/minimap-1.2.el";
           sha256 = "1vcxdxy7mv8mi4lrri3kmyf9kly3rb02z4kpfx5d1xv493havvb8";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/minimap.html";
+          homepage = "https://elpa.gnu.org/packages/minimap.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1086,12 +1101,12 @@
         pname = "multishell";
         version = "1.1.5";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/multishell-1.1.5.tar";
+          url = "https://elpa.gnu.org/packages/multishell-1.1.5.tar";
           sha256 = "0g38p5biyxqkjdkmxlikvhkhkmafyy3ibd012q83skaf8fi4cv1y";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/multishell.html";
+          homepage = "https://elpa.gnu.org/packages/multishell.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1099,25 +1114,25 @@
         pname = "muse";
         version = "3.20";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/muse-3.20.tar";
+          url = "https://elpa.gnu.org/packages/muse-3.20.tar";
           sha256 = "0i5gfhgxdm1ripw7j3ixqlfkinx3fxjj2gk5md99h70iigrhcnm9";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/muse.html";
+          homepage = "https://elpa.gnu.org/packages/muse.html";
           license = lib.licenses.free;
         };
       }) {};
     nameless = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "nameless";
-        version = "0.5.1";
+        version = "1.0.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/nameless-0.5.1.el";
-          sha256 = "0vv4zpqb56w9xy9wljchwilcwpw7zdmqrwfwffxp0pgbhf4w41y9";
+          url = "https://elpa.gnu.org/packages/nameless-1.0.1.el";
+          sha256 = "0gb97pjmis4fx48lsm7clp9fw0h2w4p3kdfq3z9vq4fwy5hjsn74";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/nameless.html";
+          homepage = "https://elpa.gnu.org/packages/nameless.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1126,12 +1141,12 @@
         pname = "names";
         version = "20151201.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/names-20151201.0.tar";
+          url = "https://elpa.gnu.org/packages/names-20151201.0.tar";
           sha256 = "13smsf039x4yd7pzvllgn1vz8lhkwghnhip9y2bka38vk37w912d";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/names.html";
+          homepage = "https://elpa.gnu.org/packages/names.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1139,12 +1154,12 @@
         pname = "nhexl-mode";
         version = "0.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/nhexl-mode-0.1.el";
+          url = "https://elpa.gnu.org/packages/nhexl-mode-0.1.el";
           sha256 = "0h4kl5d8rj9aw4xxrmv4a9fdcqvkk74ia7bq8jgmjp11pwpzww9j";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/nhexl-mode.html";
+          homepage = "https://elpa.gnu.org/packages/nhexl-mode.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1152,12 +1167,12 @@
         pname = "nlinum";
         version = "1.6";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/nlinum-1.6.el";
+          url = "https://elpa.gnu.org/packages/nlinum-1.6.el";
           sha256 = "1hr5waxbq0fcys8x2nfdl84mp2v8v9qi08f1kqdray2hzmnmipcw";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/nlinum.html";
+          homepage = "https://elpa.gnu.org/packages/nlinum.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1165,12 +1180,12 @@
         pname = "notes-mode";
         version = "1.30";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/notes-mode-1.30.tar";
+          url = "https://elpa.gnu.org/packages/notes-mode-1.30.tar";
           sha256 = "1aqivlfa0nk0y27gdv68k5rg3m5wschh8cw196a13qb7kaghk9r6";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/notes-mode.html";
+          homepage = "https://elpa.gnu.org/packages/notes-mode.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1178,12 +1193,12 @@
         pname = "ntlm";
         version = "2.0.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/ntlm-2.0.0.el";
+          url = "https://elpa.gnu.org/packages/ntlm-2.0.0.el";
           sha256 = "1n602yi60rwsacqw20kqbm97x6bhzjxblxbdprm36f31qmym8si4";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/ntlm.html";
+          homepage = "https://elpa.gnu.org/packages/ntlm.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1191,12 +1206,12 @@
         pname = "num3-mode";
         version = "1.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/num3-mode-1.2.el";
+          url = "https://elpa.gnu.org/packages/num3-mode-1.2.el";
           sha256 = "1nm3yjp5qs6rq4ak47gb6325vjfw0dnkryfgybgly0m6h4hhpbd8";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/num3-mode.html";
+          homepage = "https://elpa.gnu.org/packages/num3-mode.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1204,12 +1219,12 @@
         pname = "oauth2";
         version = "0.10";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/oauth2-0.10.el";
+          url = "https://elpa.gnu.org/packages/oauth2-0.10.el";
           sha256 = "0rlxmbb88dp0yqw9d5mdx0nxv5l5618scmg5872scbnc735f2yna";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/oauth2.html";
+          homepage = "https://elpa.gnu.org/packages/oauth2.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1217,12 +1232,12 @@
         pname = "omn-mode";
         version = "1.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/omn-mode-1.2.el";
+          url = "https://elpa.gnu.org/packages/omn-mode-1.2.el";
           sha256 = "0p7lmqabdcn625q9z7libn7q1b6mjc74bkic2kjhhckzvlfjk742";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/omn-mode.html";
+          homepage = "https://elpa.gnu.org/packages/omn-mode.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1231,25 +1246,25 @@
         pname = "on-screen";
         version = "1.3.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/on-screen-1.3.2.el";
+          url = "https://elpa.gnu.org/packages/on-screen-1.3.2.el";
           sha256 = "15d18mjgv1pnwl6kf3pr5w64q1322p1l1qlfvnckglwmzy5sl2qv";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/on-screen.html";
+          homepage = "https://elpa.gnu.org/packages/on-screen.html";
           license = lib.licenses.free;
         };
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20160229";
+        version = "20160425";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/org-20160229.tar";
-          sha256 = "15zrkw33ma8q079sb518rmcj97n35rnjv16p6zfw52m9xfdwxgi9";
+          url = "https://elpa.gnu.org/packages/org-20160425.tar";
+          sha256 = "1slrmy8kpapp36lwk9md7rakl1fw8gi377rfff0ma8n7k5xy7b2a";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/org.html";
+          homepage = "https://elpa.gnu.org/packages/org.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1257,12 +1272,12 @@
         pname = "osc";
         version = "0.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/osc-0.1.el";
+          url = "https://elpa.gnu.org/packages/osc-0.1.el";
           sha256 = "09nzbbzvxfrjm91wawbv6bg6fqlcx1qi0711qc73yfrbc8ndsnsb";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/osc.html";
+          homepage = "https://elpa.gnu.org/packages/osc.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1271,12 +1286,12 @@
         pname = "other-frame-window";
         version = "1.0.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/other-frame-window-1.0.2.el";
+          url = "https://elpa.gnu.org/packages/other-frame-window-1.0.2.el";
           sha256 = "0gr4vn7ld4fx372091wxnzm1rhq6rc4ycim4fwz5bxnpykz83l7d";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/other-frame-window.html";
+          homepage = "https://elpa.gnu.org/packages/other-frame-window.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1284,12 +1299,12 @@
         pname = "pabbrev";
         version = "4.2.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/pabbrev-4.2.1.el";
+          url = "https://elpa.gnu.org/packages/pabbrev-4.2.1.el";
           sha256 = "19v5adk61y8fpigw7k6wz6dj79jwr450hnbi7fj0jvb21cvjmfxh";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/pabbrev.html";
+          homepage = "https://elpa.gnu.org/packages/pabbrev.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1297,12 +1312,12 @@
         pname = "pinentry";
         version = "0.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/pinentry-0.1.el";
+          url = "https://elpa.gnu.org/packages/pinentry-0.1.el";
           sha256 = "0iiw11prk4w32czk69mvc3x6ja9xbhbvpg9b0nidrsg5njjjh76d";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/pinentry.html";
+          homepage = "https://elpa.gnu.org/packages/pinentry.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1310,12 +1325,12 @@
         pname = "poker";
         version = "0.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/poker-0.1.el";
+          url = "https://elpa.gnu.org/packages/poker-0.1.el";
           sha256 = "0gbm59m6bs0766r7v8dy9gdif1pb89xj1h8h76bh78hr65yh7gg0";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/poker.html";
+          homepage = "https://elpa.gnu.org/packages/poker.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1324,12 +1339,12 @@
         pname = "python";
         version = "0.25.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/python-0.25.1.el";
+          url = "https://elpa.gnu.org/packages/python-0.25.1.el";
           sha256 = "16r1sjq5fagrvlnrnbxmf6h2yxrcbhqlaa3ppqsa14vqrj09gisd";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/python.html";
+          homepage = "https://elpa.gnu.org/packages/python.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1337,12 +1352,12 @@
         pname = "quarter-plane";
         version = "0.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/quarter-plane-0.1.el";
+          url = "https://elpa.gnu.org/packages/quarter-plane-0.1.el";
           sha256 = "0hj3asdzf05h8j1fsxx9y71arnprg2xwk2dcb81zj04hzggzpwmm";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/quarter-plane.html";
+          homepage = "https://elpa.gnu.org/packages/quarter-plane.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1350,12 +1365,12 @@
         pname = "queue";
         version = "0.1.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/queue-0.1.1.el";
+          url = "https://elpa.gnu.org/packages/queue-0.1.1.el";
           sha256 = "0jw24fxqnf9qcaf2nh09cnds1kqfk7hal35dw83x1ari95say391";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/queue.html";
+          homepage = "https://elpa.gnu.org/packages/queue.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1363,12 +1378,12 @@
         pname = "rainbow-mode";
         version = "0.12";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/rainbow-mode-0.12.el";
+          url = "https://elpa.gnu.org/packages/rainbow-mode-0.12.el";
           sha256 = "10a7qs7fvw4qi4vxj9n56j26gjk61bl79dgz4md1d26slb2j1c04";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/rainbow-mode.html";
+          homepage = "https://elpa.gnu.org/packages/rainbow-mode.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1376,12 +1391,12 @@
         pname = "register-list";
         version = "0.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/register-list-0.1.el";
+          url = "https://elpa.gnu.org/packages/register-list-0.1.el";
           sha256 = "1azgfm4yvhp2bqqplmfbz1fij8gda527lks82bslnpnabd8m6sjh";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/register-list.html";
+          homepage = "https://elpa.gnu.org/packages/register-list.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1390,12 +1405,12 @@
         pname = "rich-minority";
         version = "1.0.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/rich-minority-1.0.1.el";
+          url = "https://elpa.gnu.org/packages/rich-minority-1.0.1.el";
           sha256 = "1pr89k3jz044vf582klphl1zf0r7hj2g7ga8j1dwbrpr9ngiicgc";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/rich-minority.html";
+          homepage = "https://elpa.gnu.org/packages/rich-minority.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1403,12 +1418,12 @@
         pname = "rnc-mode";
         version = "0.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/rnc-mode-0.1.el";
+          url = "https://elpa.gnu.org/packages/rnc-mode-0.1.el";
           sha256 = "18hm9g05ld8i1apr28dmd9ccq6dc0w6rdqhi0k7ka95jxxdr9m6d";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/rnc-mode.html";
+          homepage = "https://elpa.gnu.org/packages/rnc-mode.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1416,12 +1431,12 @@
         pname = "rudel";
         version = "0.3";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/rudel-0.3.tar";
+          url = "https://elpa.gnu.org/packages/rudel-0.3.tar";
           sha256 = "041yac9a7hbz1fpmjlmc31ggcgg90fmw08z6bkzly2141yky8yh1";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/rudel.html";
+          homepage = "https://elpa.gnu.org/packages/rudel.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1429,12 +1444,12 @@
         pname = "scroll-restore";
         version = "1.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/scroll-restore-1.0.el";
+          url = "https://elpa.gnu.org/packages/scroll-restore-1.0.el";
           sha256 = "0h55szlmkmzmcvd6gvv8l74n7y64i0l78nwwmq7xsbzprlmj6khn";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/scroll-restore.html";
+          homepage = "https://elpa.gnu.org/packages/scroll-restore.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1442,25 +1457,25 @@
         pname = "sed-mode";
         version = "1.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/sed-mode-1.0.el";
+          url = "https://elpa.gnu.org/packages/sed-mode-1.0.el";
           sha256 = "1zpdai5k9zhy5hw0a5zx7qv3rcf8cn29hncfjnhk9k6sjq0302lg";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/sed-mode.html";
+          homepage = "https://elpa.gnu.org/packages/sed-mode.html";
           license = lib.licenses.free;
         };
       }) {};
     seq = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "seq";
-        version = "1.11";
+        version = "2.15";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/seq-1.11.el";
-          sha256 = "1qpam4cxpy6x6gibln21v29mif71kifyvdfymjsidlnjqqnvdk1h";
+          url = "https://elpa.gnu.org/packages/seq-2.15.tar";
+          sha256 = "09wi1765bmn7i8fg6ajjfaxgs4ipc42d58zx2fdqpidrdg9c7q73";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/seq.html";
+          homepage = "https://elpa.gnu.org/packages/seq.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1468,12 +1483,12 @@
         pname = "shen-mode";
         version = "0.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/shen-mode-0.1.tar";
+          url = "https://elpa.gnu.org/packages/shen-mode-0.1.tar";
           sha256 = "1dr24kkah4hr6vrfxwhl9vzjnwn4n773bw23c3j9bkmlgnbvn0kz";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/shen-mode.html";
+          homepage = "https://elpa.gnu.org/packages/shen-mode.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1481,12 +1496,12 @@
         pname = "sisu-mode";
         version = "7.1.8";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/sisu-mode-7.1.8.el";
+          url = "https://elpa.gnu.org/packages/sisu-mode-7.1.8.el";
           sha256 = "12zs6y4rzng1d7djl9wh3wc0f9fj0bqb7h754rvixvndlr5c10nj";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/sisu-mode.html";
+          homepage = "https://elpa.gnu.org/packages/sisu-mode.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1494,26 +1509,26 @@
         pname = "sml-mode";
         version = "6.7";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/sml-mode-6.7.el";
+          url = "https://elpa.gnu.org/packages/sml-mode-6.7.el";
           sha256 = "041dmxx7imiy99si9pscwjh5y4h02y3lirzhv1cfxqr3ghxngf9x";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/sml-mode.html";
+          homepage = "https://elpa.gnu.org/packages/sml-mode.html";
           license = lib.licenses.free;
         };
       }) {};
     soap-client = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "soap-client";
-        version = "3.0.2";
+        version = "3.1.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/soap-client-3.0.2.tar";
-          sha256 = "0yx7lnag6fqrnm3a4j77w1lq63izn43sms0n3d4504yr3p826sci";
+          url = "https://elpa.gnu.org/packages/soap-client-3.1.1.tar";
+          sha256 = "0is2923g882farf73dix6ncq3m26yn5j5qr8wz6s0xad04zdbdhk";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/soap-client.html";
+          homepage = "https://elpa.gnu.org/packages/soap-client.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1521,38 +1536,38 @@
         pname = "sokoban";
         version = "1.4";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/sokoban-1.4.tar";
+          url = "https://elpa.gnu.org/packages/sokoban-1.4.tar";
           sha256 = "1yfkaw8rjris03qpj32vqhg5lfml4hz9v3adka6sw6dv4n67j9w1";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/sokoban.html";
+          homepage = "https://elpa.gnu.org/packages/sokoban.html";
           license = lib.licenses.free;
         };
       }) {};
     sotlisp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "sotlisp";
-        version = "1.5.1";
+        version = "1.5.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/sotlisp-1.5.1.el";
-          sha256 = "1dm2pl4i091gi5lljl68s6v3l3904jj38v56qjblm160wjiahgkm";
+          url = "https://elpa.gnu.org/packages/sotlisp-1.5.2.el";
+          sha256 = "1kv161rmg71wjizd359s8l6d1z2ybyc8sbbvbwcbr778dj7x6wld";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/sotlisp.html";
+          homepage = "https://elpa.gnu.org/packages/sotlisp.html";
           license = lib.licenses.free;
         };
       }) {};
     spinner = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "spinner";
-        version = "1.7";
+        version = "1.7.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/spinner-1.7.el";
-          sha256 = "1y78kr26mi74xf0qh32dvhk7w3bkj6d9i2iw1mypsr0h5phg8ahf";
+          url = "https://elpa.gnu.org/packages/spinner-1.7.1.el";
+          sha256 = "1fmwzdih0kbyvs8bn38mpm4sbs2mikqy2vdykfy9g20wpa8vb681";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/spinner.html";
+          homepage = "https://elpa.gnu.org/packages/spinner.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1560,12 +1575,12 @@
         pname = "stream";
         version = "2.2.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/stream-2.2.0.el";
+          url = "https://elpa.gnu.org/packages/stream-2.2.0.el";
           sha256 = "0i6vwih61a0z0q05v9wyp9nj5h68snlb9n52nmrv1k0hhzsjmlrs";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/stream.html";
+          homepage = "https://elpa.gnu.org/packages/stream.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1573,12 +1588,12 @@
         pname = "svg";
         version = "0.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/svg-0.1.el";
+          url = "https://elpa.gnu.org/packages/svg-0.1.el";
           sha256 = "0v27casnjvjjaalmrbw494sk0zciws037cn6cmcc6rnhj30lzbv5";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/svg.html";
+          homepage = "https://elpa.gnu.org/packages/svg.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1587,25 +1602,12 @@
         pname = "svg-clock";
         version = "1.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/svg-clock-1.0.el";
+          url = "https://elpa.gnu.org/packages/svg-clock-1.0.el";
           sha256 = "0j6zk7fsv72af12phqdw8axbn2y8y4rfgxiab1p3pxq3y7k47jid";
         };
         packageRequires = [ emacs svg ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/svg-clock.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    swiper = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
-        pname = "swiper";
-        version = "0.7.0";
-        src = fetchurl {
-          url = "http://elpa.gnu.org/packages/swiper-0.7.0.tar";
-          sha256 = "1bzzx41zcf3yk6r6csqzlffwwrw9gyk8ab026r55l6416b6rcynx";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "http://elpa.gnu.org/packages/swiper.html";
+          homepage = "https://elpa.gnu.org/packages/svg-clock.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1613,12 +1615,12 @@
         pname = "tNFA";
         version = "0.1.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/tNFA-0.1.1.el";
+          url = "https://elpa.gnu.org/packages/tNFA-0.1.1.el";
           sha256 = "01n4p8lg8f2k55l2z77razb2sl202qisjqm5lff96a2kxnxinsds";
         };
         packageRequires = [ queue ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/tNFA.html";
+          homepage = "https://elpa.gnu.org/packages/tNFA.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1626,12 +1628,12 @@
         pname = "temp-buffer-browse";
         version = "1.4";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/temp-buffer-browse-1.4.el";
+          url = "https://elpa.gnu.org/packages/temp-buffer-browse-1.4.el";
           sha256 = "055z7hm8b2s8z1kd6hahjz0crz9qx8k9qb5pwdwdxcsh2j70pmcw";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/temp-buffer-browse.html";
+          homepage = "https://elpa.gnu.org/packages/temp-buffer-browse.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1640,12 +1642,12 @@
         pname = "test-simple";
         version = "1.2.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/test-simple-1.2.0.el";
+          url = "https://elpa.gnu.org/packages/test-simple-1.2.0.el";
           sha256 = "1j97qrwi3i2kihszsxf3y2cby2bzp8g0zf6jlpdix3dinav8xa3b";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/test-simple.html";
+          homepage = "https://elpa.gnu.org/packages/test-simple.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1654,12 +1656,12 @@
         pname = "timerfunctions";
         version = "1.4.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/timerfunctions-1.4.2.el";
+          url = "https://elpa.gnu.org/packages/timerfunctions-1.4.2.el";
           sha256 = "122q8nv08pz1mkgilvi9qfrs7rsnc5picr7jyz2jpnvpd9qw6jw5";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/timerfunctions.html";
+          homepage = "https://elpa.gnu.org/packages/timerfunctions.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1667,12 +1669,12 @@
         pname = "tiny";
         version = "0.1.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/tiny-0.1.1.tar";
+          url = "https://elpa.gnu.org/packages/tiny-0.1.1.tar";
           sha256 = "1nhg8375qdn457wj0xmfaj72s87xbabk2w1nl6q7rjvwxv08yyn7";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/tiny.html";
+          homepage = "https://elpa.gnu.org/packages/tiny.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1680,25 +1682,25 @@
         pname = "tramp-theme";
         version = "0.1.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/tramp-theme-0.1.1.el";
+          url = "https://elpa.gnu.org/packages/tramp-theme-0.1.1.el";
           sha256 = "0l8i625h9sc6h59qfj847blmfwfhf9bvfsbmwfb56qzs535fby3y";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/tramp-theme.html";
+          homepage = "https://elpa.gnu.org/packages/tramp-theme.html";
           license = lib.licenses.free;
         };
       }) {};
     transcribe = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "transcribe";
-        version = "1.0.2";
+        version = "1.5.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/transcribe-1.0.2.el";
-          sha256 = "0b0qaq0b3l37h6wfs4j80csmfcbidcd8a8wk6mwn6p4cdi7msr15";
+          url = "https://elpa.gnu.org/packages/transcribe-1.5.0.el";
+          sha256 = "0capyagpzmrf26jgqng5kvsxz30pf2iq55drnws73w9jywkq45mf";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/transcribe.html";
+          homepage = "https://elpa.gnu.org/packages/transcribe.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1706,12 +1708,12 @@
         pname = "trie";
         version = "0.2.6";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/trie-0.2.6.el";
+          url = "https://elpa.gnu.org/packages/trie-0.2.6.el";
           sha256 = "1q3i1dhq55c3b1hqpvmh924vzvhrgyp76hr1ci7bhjqvjmjx24ii";
         };
         packageRequires = [ heap tNFA ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/trie.html";
+          homepage = "https://elpa.gnu.org/packages/trie.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1719,12 +1721,12 @@
         pname = "undo-tree";
         version = "0.6.5";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/undo-tree-0.6.5.el";
+          url = "https://elpa.gnu.org/packages/undo-tree-0.6.5.el";
           sha256 = "0bs97xyxwfkjvzax9llg0zsng0vyndnrxj5d2n5mmynaqcn89d37";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/undo-tree.html";
+          homepage = "https://elpa.gnu.org/packages/undo-tree.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1732,12 +1734,12 @@
         pname = "uni-confusables";
         version = "0.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/uni-confusables-0.1.tar";
+          url = "https://elpa.gnu.org/packages/uni-confusables-0.1.tar";
           sha256 = "0s3scvzhd4bggk0qafcspf97cmcvdw3w8bbf5ark4p22knvg80zp";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/uni-confusables.html";
+          homepage = "https://elpa.gnu.org/packages/uni-confusables.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1746,12 +1748,12 @@
         pname = "url-http-ntlm";
         version = "2.0.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/url-http-ntlm-2.0.2.el";
+          url = "https://elpa.gnu.org/packages/url-http-ntlm-2.0.2.el";
           sha256 = "0jci5cl31hw4dj0j9ljq0iplg530wnwbw7b63crrwn3mza5cb2wf";
         };
         packageRequires = [ cl-lib ntlm ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/url-http-ntlm.html";
+          homepage = "https://elpa.gnu.org/packages/url-http-ntlm.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1759,12 +1761,12 @@
         pname = "vlf";
         version = "1.7";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/vlf-1.7.tar";
+          url = "https://elpa.gnu.org/packages/vlf-1.7.tar";
           sha256 = "007zdr5szimr6nwwrqz9s338s0qq82r006pdwgcm8nc41jsmsx7r";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/vlf.html";
+          homepage = "https://elpa.gnu.org/packages/vlf.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1772,12 +1774,12 @@
         pname = "w3";
         version = "4.0.49";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/w3-4.0.49.tar";
+          url = "https://elpa.gnu.org/packages/w3-4.0.49.tar";
           sha256 = "01n334b3gwx288xysa1vxsvb14avsz3syfigw85i7m5nizhikqbb";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/w3.html";
+          homepage = "https://elpa.gnu.org/packages/w3.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1785,12 +1787,12 @@
         pname = "wcheck-mode";
         version = "2016.1.30";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/wcheck-mode-2016.1.30.el";
+          url = "https://elpa.gnu.org/packages/wcheck-mode-2016.1.30.el";
           sha256 = "0hzrxnslfl04h083njy7wp4hhgrqpyz0cnm73v348kr1i4wx9xjq";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/wcheck-mode.html";
+          homepage = "https://elpa.gnu.org/packages/wcheck-mode.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1798,12 +1800,12 @@
         pname = "wconf";
         version = "0.2.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/wconf-0.2.0.el";
+          url = "https://elpa.gnu.org/packages/wconf-0.2.0.el";
           sha256 = "07adnx2ni7kprxw9mx1nywzs1a2h43rszfa8r8i0s9j16grvgphk";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/wconf.html";
+          homepage = "https://elpa.gnu.org/packages/wconf.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1811,12 +1813,12 @@
         pname = "web-server";
         version = "0.1.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/web-server-0.1.1.tar";
+          url = "https://elpa.gnu.org/packages/web-server-0.1.1.tar";
           sha256 = "1q51fhqw5al4iycdlighwv7jqgdpjb1a66glwd5jnc9b651yk42n";
         };
         packageRequires = [ emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/web-server.html";
+          homepage = "https://elpa.gnu.org/packages/web-server.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1824,12 +1826,12 @@
         pname = "websocket";
         version = "1.5";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/websocket-1.5.tar";
+          url = "https://elpa.gnu.org/packages/websocket-1.5.tar";
           sha256 = "0plgc8an229cqbghrxd6wh73b081dc17fx1r940dqhgi284pcjsy";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/websocket.html";
+          homepage = "https://elpa.gnu.org/packages/websocket.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1837,12 +1839,12 @@
         pname = "windresize";
         version = "0.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/windresize-0.1.el";
+          url = "https://elpa.gnu.org/packages/windresize-0.1.el";
           sha256 = "0b5bfs686nkp7s05zgfqvr1mpagmkd74j1grq8kp2w9arj0qfi3x";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/windresize.html";
+          homepage = "https://elpa.gnu.org/packages/windresize.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1851,12 +1853,12 @@
         pname = "wisi";
         version = "1.1.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/wisi-1.1.2.tar";
+          url = "https://elpa.gnu.org/packages/wisi-1.1.2.tar";
           sha256 = "04gryfpgbviviwbnvv3sh280pzasr59cp5xz1s0yf0n4d3rv2df3";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/wisi.html";
+          homepage = "https://elpa.gnu.org/packages/wisi.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1864,12 +1866,12 @@
         pname = "wpuzzle";
         version = "1.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/wpuzzle-1.1.el";
+          url = "https://elpa.gnu.org/packages/wpuzzle-1.1.el";
           sha256 = "1wjg411dc0fvj2n8ak73igfrzc31nizzvvr2qa87fhq99bgh62kj";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/wpuzzle.html";
+          homepage = "https://elpa.gnu.org/packages/wpuzzle.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1877,12 +1879,12 @@
         pname = "xclip";
         version = "1.3";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/xclip-1.3.el";
+          url = "https://elpa.gnu.org/packages/xclip-1.3.el";
           sha256 = "1zlqr4sp8588sjga5c9b4prnsbpv3lr2wv8sih2p0s5qmjghc947";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/xclip.html";
+          homepage = "https://elpa.gnu.org/packages/xclip.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1891,12 +1893,12 @@
         pname = "xelb";
         version = "0.6";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/xelb-0.6.tar";
+          url = "https://elpa.gnu.org/packages/xelb-0.6.tar";
           sha256 = "1m91af5srxq8zs9w4gb44kl4bgka8fq7k33h7f2yn213h23kvvvh";
         };
         packageRequires = [ cl-generic emacs ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/xelb.html";
+          homepage = "https://elpa.gnu.org/packages/xelb.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1904,25 +1906,26 @@
         pname = "xpm";
         version = "1.0.3";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/xpm-1.0.3.tar";
+          url = "https://elpa.gnu.org/packages/xpm-1.0.3.tar";
           sha256 = "0qckb93xwzcg8iwiv4bd08r60jn0n853czmilz0hyyb1lfi82lp4";
         };
         packageRequires = [];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/xpm.html";
+          homepage = "https://elpa.gnu.org/packages/xpm.html";
           license = lib.licenses.free;
         };
       }) {};
-    yasnippet = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
         pname = "yasnippet";
-        version = "0.8.0";
+        version = "0.9.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/yasnippet-0.8.0.tar";
-          sha256 = "1syb9sc6xbw4vjhaix8b41lbm5zq6myrljl4r72yi6ndj5z9bmpr";
+          url = "https://elpa.gnu.org/packages/yasnippet-0.9.1.tar";
+          sha256 = "0b88q10dxa13afjzpkwgjlrzzvwiiqsi9jr73pxnsy4q1n1n2vml";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/yasnippet.html";
+          homepage = "https://elpa.gnu.org/packages/yasnippet.html";
           license = lib.licenses.free;
         };
       }) {};
@@ -1931,12 +1934,12 @@
         pname = "ztree";
         version = "1.0.3";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/ztree-1.0.3.tar";
+          url = "https://elpa.gnu.org/packages/ztree-1.0.3.tar";
           sha256 = "1mwzk48sah4w5jmlmzqxnwhnlnc2mf25ayhgymv24sv8c6hdllsw";
         };
         packageRequires = [ cl-lib ];
         meta = {
-          homepage = "http://elpa.gnu.org/packages/ztree.html";
+          homepage = "https://elpa.gnu.org/packages/ztree.html";
           license = lib.licenses.free;
         };
       }) {};

From a286d876adab722391896d4a0c69e38bad1dacbd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 26 Apr 2016 14:09:33 -0500
Subject: [PATCH 295/712] melpaStablePackages.docker: don't call builtin
 dependency

---
 pkgs/applications/editors/emacs-modes/elpa-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index f0a10c3ee42..0212451bef0 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -41,6 +41,7 @@ self:
       midi-kbd = markBroken super.midi-kbd; # requires emacs-25
       stream = markBroken super.stream; # requires emacs-25
       cl-lib = null; # builtin
+      tle = null; # builtin
     };
 
     elpaPackages = super // overrides;

From f027aa20594ef4b5d3ab8e88ad4ad8f0edddc468 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 26 Apr 2016 22:23:02 +0200
Subject: [PATCH 296/712] jonprl: corrected sha change

---
 pkgs/applications/science/logic/jonprl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/jonprl/default.nix b/pkgs/applications/science/logic/jonprl/default.nix
index 7620aa3e3e0..57cbc0e5241 100644
--- a/pkgs/applications/science/logic/jonprl/default.nix
+++ b/pkgs/applications/science/logic/jonprl/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     url = "https://github.com/jonsterling/JonPRL.git";
     deepClone = true;
     rev = "refs/tags/v${version}";
-    sha256 = "1z0d8dq1nb4dycic58nnk617hbfgafz0vmwr8gkl0i6405gfg1zy";
+    sha256 = "09m1vb41vxvqnk78gm9inip1abknkywij30rghvym93q460cl2hm";
   };
 
   buildInputs = [ smlnj which ];

From 3ae8810ffae23d083f58b645c696d2dcfd1be4ab Mon Sep 17 00:00:00 2001
From: Arnold Krille <arnold@arnoldarts.de>
Date: Tue, 26 Apr 2016 22:38:47 +0200
Subject: [PATCH 297/712] containers: test imperative and ipv4 in small-release
 (#15015)

Test imperative containers and declarative containers with ipv4. These two
tests are basically the extraction of the containers test from before.
---
 nixos/release-small.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/release-small.nix b/nixos/release-small.nix
index 08ca4cfb3e4..fb5a97f98ab 100644
--- a/nixos/release-small.nix
+++ b/nixos/release-small.nix
@@ -31,7 +31,8 @@ in rec {
     inherit (nixos') channel manual iso_minimal dummy;
     tests = {
       inherit (nixos'.tests)
-        containers
+        containers-imperative
+        containers-ipv4
         firewall
         ipv6
         login

From ca0e724266c7adc61f27607dfda16a08a423eb06 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 27 Apr 2016 03:24:04 +0300
Subject: [PATCH 298/712] otter: Mark broken

Build hangs an hits the hydra time limit:
http://hydra.nixos.org/build/34897110
---
 pkgs/applications/science/logic/otter/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/logic/otter/default.nix b/pkgs/applications/science/logic/otter/default.nix
index 398f6c9a3e2..08d19c143ee 100644
--- a/pkgs/applications/science/logic/otter/default.nix
+++ b/pkgs/applications/science/logic/otter/default.nix
@@ -43,5 +43,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.publicDomain ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
+    broken = true;
   };
 }

From 264cb737f60f291c80f96ad67d3a476c85e45417 Mon Sep 17 00:00:00 2001
From: Corbin <cds@corbinsimpson.com>
Date: Tue, 26 Apr 2016 18:45:12 -0700
Subject: [PATCH 299/712] afl: 1.94b -> 2.10b

Includes afl-analyze. QEMU support not tested.
---
 pkgs/tools/security/afl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index 24a3abd4096..a252dad5ea1 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -9,11 +9,11 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "afl-${version}";
-  version = "1.94b";
+  version = "2.10b";
 
   src = fetchurl {
     url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
-    sha256 = "1c36yz3ajd66m3c5aiai3wf59pzxivn80cvlib3dw45d4zqiymqp";
+    sha256 = "1qxz3szsdr3ciz496mjb5v2k8p90nilgnlbwwv9csk828qb2jhc1";
   };
 
   # Note: libcgroup isn't needed for building, just for the afl-cgroup

From 6e24c9974fbacbeb1c3d1327807ca4b0bfe861f2 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 27 Apr 2016 05:06:35 +0300
Subject: [PATCH 300/712] typespeed: Add platforms

---
 pkgs/games/typespeed/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix
index 4e99eff0065..55ebcc699a3 100644
--- a/pkgs/games/typespeed/default.nix
+++ b/pkgs/games/typespeed/default.nix
@@ -12,10 +12,11 @@ stdenv.mkDerivation {
 
   configureFlags = "--datadir=\${out}/share/";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A curses based typing game";
     homepage = http://typespeed.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.auntie ];
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.auntie ];
   };
 }

From b6a900803a53d5f2423a4e04593294780631ab3d Mon Sep 17 00:00:00 2001
From: Sheena Artrip <sheena.artrip@gmail.com>
Date: Wed, 27 Apr 2016 03:07:38 -0400
Subject: [PATCH 301/712] freeradius: fix checkrad paths by providing perl,
 finger substitution

---
 pkgs/servers/freeradius/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix
index 15bda5d3090..810f274579c 100644
--- a/pkgs/servers/freeradius/default.nix
+++ b/pkgs/servers/freeradius/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, talloc
+{ stdenv, fetchurl, autoreconfHook, talloc, finger_bsd, perl
 , openssl
 , linkOpenssl? true
 , openldap
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   name = "freeradius-${version}";
   version = "3.0.11";
 
-  buildInputs = [ autoreconfHook openssl talloc ]
+  buildInputs = [ autoreconfHook openssl talloc finger_bsd perl ]
     ++ optional withLdap [ openldap ]
     ++ optional withSqlite [ sqlite ]
     ++ optional withPcap [ libpcap ]
@@ -60,6 +60,10 @@ stdenv.mkDerivation rec {
      "--localstatedir=/var"
   ] ++ optional (!linkOpenssl) "--with-openssl=no";
 
+  postPatch = ''
+    substituteInPlace src/main/checkrad.in --replace "/usr/bin/finger" "${finger_bsd}/bin/finger"
+  '';
+
   installFlags = [
     "sysconfdir=\${out}/etc"
     "localstatedir=\${TMPDIR}"

From 12554997a79a0289866f821d55b78d437df3aa91 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 27 Apr 2016 10:04:41 +0200
Subject: [PATCH 302/712] rustc+cargo: Mark -unstable as lowPrio.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36239d29431..4008384dde4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5097,13 +5097,13 @@ in
 
   rtags = callPackage ../development/tools/rtags/default.nix {};
 
-  rustcMaster = callPackage ../development/compilers/rustc/head.nix {};
+  rustcMaster = lowPrio (callPackage ../development/compilers/rustc/head.nix {});
   rustc = callPackage ../development/compilers/rustc {};
 
   rustPlatform = rustStable;
 
   rustStable = recurseIntoAttrs (makeRustPlatform cargo rustStable);
-  rustUnstable = recurseIntoAttrs (makeRustPlatform cargoUnstable rustUnstable);
+  rustUnstable = lowPrio (recurseIntoAttrs (makeRustPlatform cargoUnstable rustUnstable));
 
   # rust platform to build cargo itself (with cargoSnapshot)
   rustCargoPlatform = makeRustPlatform (cargoSnapshot rustc) rustCargoPlatform;
@@ -5783,9 +5783,9 @@ in
     rustPlatform = rustCargoPlatform;
   };
 
-  cargoUnstable = callPackage ../development/tools/build-managers/cargo/head.nix {
+  cargoUnstable = lowPrio (callPackage ../development/tools/build-managers/cargo/head.nix {
     rustPlatform = rustUnstableCargoPlatform;
-  };
+  });
 
   cargoSnapshot = rustc:
     callPackage ../development/tools/build-managers/cargo/snapshot.nix {

From f223e114dac2e2afbda1ba64bfefe91f2d86dbd5 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Tue, 26 Apr 2016 18:53:33 +0300
Subject: [PATCH 303/712] xalanc: init at 1.11

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

diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix
new file mode 100644
index 00000000000..8284fd7707f
--- /dev/null
+++ b/pkgs/development/libraries/xalanc/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, xercesc }:
+
+stdenv.mkDerivation rec {
+  name = "xalan-c-${version}";
+  version = "1.11";
+
+  src = fetchurl {
+    url = "http://www.eu.apache.org/dist/xalan/xalan-c/sources/xalan_c-${version}-src.tar.gz";
+    sha256 = "0a3a2b15vpacnqgpp6fiy1pwyc8q6ywzvyb5445f6wixfdspypjg";
+  };
+
+  configurePhase = ''
+    export XALANCROOT=`pwd`/c
+    cd `pwd`/c
+    mkdir -p $out/usr
+    ./runConfigure -p linux -c gcc -x g++ -P$out/usr
+  '';
+
+  buildInputs = [ xercesc ];
+
+  meta = {
+    homepage = http://xalan.apache.org/;
+    description = "A XSLT processor for transforming XML documents";
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.jagajaga ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 304cdce4cd7..415c7c360a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9142,6 +9142,8 @@ in
 
   xercesc = callPackage ../development/libraries/xercesc {};
 
+  xalanc = callPackage ../development/libraries/xalanc {};
+
   # Avoid using this. It isn't really a wrapper anymore, but we keep the name.
   xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper {
     packages = [

From 6f90f447347a1a7f01461534c8407677e8bae5ee Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Tue, 26 Apr 2016 18:56:49 +0300
Subject: [PATCH 304/712] libdigidoc: init at 3.10.1.1212

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

diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix
new file mode 100644
index 00000000000..e060f8c1d76
--- /dev/null
+++ b/pkgs/development/libraries/libdigidoc/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, cmake, openssl, pcsclite, opensc, libxml2 }:
+
+stdenv.mkDerivation rec {
+
+  version = "3.10.1.1212";
+  name = "libdigidoc-${version}";
+  
+  src = fetchurl {
+    url = "https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidoc/libdigidoc_3.10.1.1212.orig.tar.xz";
+    sha256 = "ad5e0603aea2e02977f17318cc93a53c3a19a815e57b2347d97136d11c110807";
+  };
+
+  unpackPhase = ''
+    mkdir src
+    tar xf $src -C src
+    cd src
+  '';
+
+  buildInputs = [ cmake openssl pcsclite opensc libxml2 ];
+  
+  meta = with stdenv.lib; {
+    description = "Library for creating DigiDoc signature files";
+    homepage = "http://www.id.ee/";
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.jagajaga ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 415c7c360a8..793028a00bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7448,6 +7448,8 @@ in
     mesa = null;
   };
 
+  libdigidoc = callPackage ../development/libraries/libdigidoc { };
+
   libdiscid = callPackage ../development/libraries/libdiscid { };
 
   libdivsufsort = callPackage ../development/libraries/libdivsufsort { };

From 12944261c23c468b13ed4f60b1ec71b011680f6f Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Tue, 26 Apr 2016 19:13:09 +0300
Subject: [PATCH 305/712] xml-security-c: init at 1.7.3

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

diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix
new file mode 100644
index 00000000000..1932acbd7ed
--- /dev/null
+++ b/pkgs/development/libraries/xml-security-c/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, xalanc, xercesc, openssl, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "xml-security-c-${version}";
+  version = "1.7.3";
+
+  src = fetchurl {
+    url = "http://www.apache.org/dist/santuario/c-library/${name}.tar.gz";
+    sha256 = "e5226e7319d44f6fd9147a13fb853f5c711b9e75bf60ec273a0ef8a190592583";
+  };
+
+  patchPhase = ''
+    mkdir -p xsec/yes/lib
+    sed -i -e 's/-O2 -DNDEBUG/-DNDEBUG/g' configure
+  '';
+
+  configurePhase = ''
+    ./configure --prefix=$out \
+                --with-openssl \
+                --with-xerces \
+                --with-xalan \
+                --disable-static
+  '';
+
+  buildInputs = [ xalanc xercesc openssl pkgconfig ];
+
+  meta = {
+    homepage = http://santuario.apache.org/;
+    description = "C++ Implementation of W3C security standards for XML";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.jagajaga ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 793028a00bc..3ce04832bca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9159,6 +9159,8 @@ in
 
   xmlsec = callPackage ../development/libraries/xmlsec { };
 
+  xml-security-c = callPackage ../development/libraries/xml-security-c { };
+
   xlslib = callPackage ../development/libraries/xlslib { };
 
   xvidcore = callPackage ../development/libraries/xvidcore { };

From 5b7ed1f00ca418bedd8f506087b6093495620535 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Tue, 26 Apr 2016 23:11:51 +0300
Subject: [PATCH 306/712] xsd: init at 4.0.0

---
 pkgs/development/libraries/xsd/default.nix  |  38 ++++++
 pkgs/development/libraries/xsd/xsdcxx.patch | 126 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |   2 +
 3 files changed, 166 insertions(+)
 create mode 100644 pkgs/development/libraries/xsd/default.nix
 create mode 100644 pkgs/development/libraries/xsd/xsdcxx.patch

diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix
new file mode 100644
index 00000000000..bef2e46e073
--- /dev/null
+++ b/pkgs/development/libraries/xsd/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, xercesc }:
+
+let
+  fixed_paths = ''LDFLAGS="-L${xercesc}/lib" CPPFLAGS="-I${xercesc}/include"'';
+in
+stdenv.mkDerivation rec {
+  name = "xsd-${version}";
+  version = "4.0.0";
+
+  src = fetchurl {
+    url = "http://codesynthesis.com/download/xsd/4.0/xsd-4.0.0+dep.tar.bz2";
+    sha256 = "05wqhmd5cd4pdky8i8qysnh96d2h16ly8r73whmbxkajiyf2m9gc";
+  };
+
+  patches = [ ./xsdcxx.patch ];
+
+  configurePhase = ''
+    patchShebangs .
+  '';
+
+  buildPhase = ''
+    make ${fixed_paths}
+  '';
+
+  buildInputs = [ xercesc ];
+
+  installPhase = ''
+    make ${fixed_paths} install_prefix="$out" install
+  '';
+
+  meta = {
+    homepage = http://www.codesynthesis.com/products/xsd;
+    description = "An open-source, cross-platform W3C XML Schema to C++ data binding compiler";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.jagajaga ];
+  };
+}
diff --git a/pkgs/development/libraries/xsd/xsdcxx.patch b/pkgs/development/libraries/xsd/xsdcxx.patch
new file mode 100644
index 00000000000..88a893c6e60
--- /dev/null
+++ b/pkgs/development/libraries/xsd/xsdcxx.patch
@@ -0,0 +1,126 @@
+--- xsd-4.0.0+dep/xsd/doc/xsd.1~	2014-09-14 12:25:36.862267587 +0000
++++ xsd-4.0.0+dep/xsd/doc/xsd.1	2014-09-14 12:28:25.728229892 +0000
+@@ -1,16 +1,16 @@
+ .\" Process this file with
+-.\" groff -man -Tascii xsd.1
++.\" groff -man -Tascii xsdcxx.1
+ .\"
+ .TH XSD 1 "July 2014" "XSD 4.0.0"
+ .SH NAME
+-xsd \- W3C XML Schema to C++ Compiler
++xsdcxx \- W3C XML Schema to C++ Compiler
+ .\"
+ .\"
+ .\"
+ .\"--------------------------------------------------------------------
+ .SH SYNOPSIS
+ .\"--------------------------------------------------------------------
+-.B xsd
++.B xsdcxx
+ .I command
+ .B [
+ .I options
+@@ -20,19 +20,19 @@
+ .I file
+ .B ...]
+ .in
+-.B xsd help
++.B xsdcxx help
+ .B [
+ .I command
+ .B ]
+ .in
+-.B xsd version
++.B xsdcxx version
+ .\"
+ .\"
+ .\"
+ .\"--------------------------------------------------------------------
+ .SH DESCRIPTION
+ .\"--------------------------------------------------------------------
+-.B xsd
++.B xsdcxx
+ generates vocabulary-specific, statically-typed C++ mapping from W3C XML
+ Schema definitions. Particular mapping to produce is selected by a
+ .IR command .
+@@ -96,7 +96,7 @@
+ .PP
+ .RS
+ .RS 3
+-.B xsd help
++.B xsdcxx help
+ .I command
+ .RE
+ .PP
+@@ -206,7 +206,7 @@
+ \fIfilename\fP \fInamespace\fP
+ 
+ For example, if you have file \fBhello\.xsd\fP with namespace
+-\fBhttp://example\.com/hello\fP and you run \fBxsd\fP on this file, then the
++\fBhttp://example\.com/hello\fP and you run \fBxsdcxx\fP on this file, then the
+ string in question will be:
+ 
+ \fBhello\.xsd\. http://example\.com/hello\fP
+@@ -1632,7 +1632,7 @@
+ .\"
+ .SH DIAGNOSTICS
+ If the input file is not a valid W3C XML Schema definition,
+-.B xsd
++.B xsdcxx
+ will issue diagnostic messages to
+ .B STDERR
+ and exit with non-zero exit code.
+--- xsd-4.0.0+dep/xsd/doc/xsd.xhtml~	2014-09-14 12:28:37.731513138 +0000
++++ xsd-4.0.0+dep/xsd/doc/xsd.xhtml	2014-09-14 12:30:11.277789610 +0000
+@@ -50,19 +50,19 @@
+ 
+   <h1>NAME</h1>
+ 
+-  <p>xsd - W3C XML Schema to C++ Compiler</p>
++  <p>xsdcxx - W3C XML Schema to C++ Compiler</p>
+ 
+   <h1>SYNOPSIS</h1>
+ 
+   <dl id="synopsis">
+-    <dt><code><b>xsd</b> <i>command</i> [<i>options</i>] <i>file</i> [<i>file</i> ...]</code></dt>
+-    <dt><code><b>xsd help</b> [<i>command</i>]</code></dt>
+-    <dt><code><b>xsd version</b></code></dt>
++    <dt><code><b>xsdcxx</b> <i>command</i> [<i>options</i>] <i>file</i> [<i>file</i> ...]</code></dt>
++    <dt><code><b>xsdcxx help</b> [<i>command</i>]</code></dt>
++    <dt><code><b>xsdcxx version</b></code></dt>
+   </dl>
+ 
+   <h1>DESCRIPTION</h1>
+ 
+-  <p><code><b>xsd</b></code> generates vocabulary-specific, statically-typed
++  <p><code><b>xsdcxx</b></code> generates vocabulary-specific, statically-typed
+   C++ mapping from W3C XML Schema definitions. Particular mapping to
+   produce is selected by a <code><i>command</i></code>. Each mapping has
+   a number of mapping-specific <code><i>options</i></code> that should
+@@ -104,7 +104,7 @@
+ 
+     <dt><code><b>help</b></code></dt>
+     <dd>Print usage information and exit. Use
+-      <p><code><b>xsd help</b> <i>command</i></code></p>
++      <p><code><b>xsdcxx help</b> <i>command</i></code></p>
+       for command-specific help.
+     </dd>
+ 
+@@ -219,7 +219,7 @@
+ 
+   <p>For example, if you have file <code><b>hello.xsd</b></code> with
+   namespace <code><b>http://example.com/hello</b></code> and you run
+-  <code><b>xsd</b></code> on this file, then the string in question will
++  <code><b>xsdcxx</b></code> on this file, then the string in question will
+   be:</p>
+ 
+   <p><code><b>hello.xsd. http://example.com/hello</b></code></p>
+@@ -1530,7 +1530,7 @@
+   <h1>DIAGNOSTICS</h1>
+ 
+   <p>If the input file is not a valid W3C XML Schema definition,
+-    <code><b>xsd</b></code> will issue diagnostic messages to STDERR
++    <code><b>xsdcxx</b></code> will issue diagnostic messages to STDERR
+     and exit with non-zero exit code.</p>
+ 
+   <h1>BUGS</h1>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ce04832bca..0a8df842681 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14548,6 +14548,8 @@ in
 
   xrestop = callPackage ../tools/X11/xrestop { };
 
+  xsd = callPackage ../development/libraries/xsd { };
+
   xscreensaver = callPackage ../misc/screensavers/xscreensaver {
     inherit (gnome) libglade;
   };

From 9765e5835f8e4daf5a8c50515688814e64501124 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Tue, 26 Apr 2016 23:12:55 +0300
Subject: [PATCH 307/712] libdigidocpp: init at 3.12.0.1317

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

diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix
new file mode 100644
index 00000000000..5ddc6303126
--- /dev/null
+++ b/pkgs/development/libraries/libdigidocpp/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, cmake, libdigidoc, minizip, pcsclite, opensc, openssl
+, xercesc, xml-security-c, pkgconfig, xsd, zlib, vim }:
+
+stdenv.mkDerivation rec {
+
+  version = "3.12.0.1317";
+  name = "libdigidocpp-${version}";
+
+  src = fetchurl {
+    url = "https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidocpp/libdigidocpp_3.12.0.1317.orig.tar.xz";
+    sha256 = "8059e1dbab99f062d070b9da0b1334b7226f1ab9badcd7fddea3100519d1f9a9";
+  };
+
+  unpackPhase = ''
+    mkdir src
+    tar xf $src -C src
+    cd src
+  '';
+
+  buildInputs = [ cmake libdigidoc minizip pcsclite opensc openssl xercesc
+                  xml-security-c pkgconfig xsd zlib vim
+                ];
+  
+  meta = with stdenv.lib; {
+    description = "Library for creating DigiDoc signature files";
+    homepage = "http://www.id.ee/";
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.jagajaga ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a8df842681..2368123afff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7450,6 +7450,8 @@ in
 
   libdigidoc = callPackage ../development/libraries/libdigidoc { };
 
+  libdigidocpp = callPackage ../development/libraries/libdigidocpp { };
+
   libdiscid = callPackage ../development/libraries/libdiscid { };
 
   libdivsufsort = callPackage ../development/libraries/libdivsufsort { };

From f6d7cefa7ba6429ec2a324ac3ae1fcefb45bdf0b Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Wed, 27 Apr 2016 00:04:14 +0300
Subject: [PATCH 308/712] esteidfirefoxplugin: init at 3.12.1.1142

---
 .../networking/browsers/firefox/wrapper.nix   |  2 +
 .../esteidfirefoxplugin/default.nix           | 45 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 49 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 5fb887bda22..1904d720dbd 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -6,6 +6,7 @@
 , supportsJDK, jrePlugin, icedtea_web
 , trezor-bridge, bluejeans, djview4, adobe-reader
 , google_talk_plugin, fribid, gnome3/*.gnome_shell*/
+, esteidfirefoxplugin
 }:
 
 ## configurability of the wrapper itself
@@ -42,6 +43,7 @@ let
       ++ lib.optional (cfg.enableTrezor or false) trezor-bridge
       ++ lib.optional (cfg.enableBluejeans or false) bluejeans
       ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader
+      ++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin
      );
   libs = [ gst_all.gstreamer gst_all.gst-plugins-base ]
          ++ lib.optionals (cfg.enableQuakeLive or false)
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix
new file mode 100644
index 00000000000..039d8bbe406
--- /dev/null
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, gtk2, openssl, pcsclite, pkgconfig, opensc }:
+
+stdenv.mkDerivation rec {
+  version = "3.12.1.1142";
+  name = "esteidfirefoxplugin-${version}";
+
+  src = fetchurl {
+    url = "https://installer.id.ee/media/ubuntu/pool/main/e/esteidfirefoxplugin/esteidfirefoxplugin_3.12.1.1142.orig.tar.xz";
+    sha256 = "0y7759x1xr00p5r3c5wpllcqqnnxh2zi74cmy4m9m690z3ywn0fx";
+  };
+
+  unpackPhase = ''
+    mkdir src
+    tar xf $src -C src
+    cd src
+  '';
+
+  buildInputs = [ gtk2 openssl pcsclite pkgconfig opensc ];
+
+  buildPhase = ''
+    sed -i "s|opensc-pkcs11.so|${opensc}/lib/pkcs11/opensc-pkcs11.so|" Makefile 
+    make plugin
+  '';
+
+  installPhase = ''
+    plugins=$out/lib/mozilla/plugins
+    mkdir -p $plugins
+    cp -a npesteid-firefox-plugin.so $plugins/
+    rp=$(patchelf --print-rpath $plugins/npesteid-firefox-plugin.so)
+    patchelf --set-rpath "$rp:${opensc}/lib:${opensc}/lib/pkcs11" $plugins/npesteid-firefox-plugin.so
+  '';
+
+  passthru.mozillaPlugin = "/lib/mozilla/plugins";
+
+  dontStrip = true;
+  dontPatchELF = true;
+
+  meta = with stdenv.lib; {
+    description = "Firefox ID card signing plugin";
+    homepage = "http://www.id.ee/";
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.jagajaga ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2368123afff..cdb894998f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2979,6 +2979,8 @@ in
   };
 
   qesteidutil = qt5.callPackage ../tools/security/qesteidutil { } ;
+  qdigidoc = qt5.callPackage ../tools/security/qdigidoc { } ;
+  esteidfirefoxplugin = callPackage ../applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin { };
 
   qgifer = callPackage ../applications/video/qgifer {
     giflib = giflib_4_1;

From 05f2f8fc29353ff41c6c58e67a573997435551d9 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Wed, 27 Apr 2016 00:48:13 +0300
Subject: [PATCH 309/712] qdigidoc: init at 3.12.0.1442

---
 pkgs/tools/security/qdigidoc/certs.patch | 3309 ++++++++++++++++++++++
 pkgs/tools/security/qdigidoc/default.nix |   40 +
 pkgs/top-level/all-packages.nix          |    1 +
 3 files changed, 3350 insertions(+)
 create mode 100644 pkgs/tools/security/qdigidoc/certs.patch
 create mode 100644 pkgs/tools/security/qdigidoc/default.nix

diff --git a/pkgs/tools/security/qdigidoc/certs.patch b/pkgs/tools/security/qdigidoc/certs.patch
new file mode 100644
index 00000000000..5e28943f333
--- /dev/null
+++ b/pkgs/tools/security/qdigidoc/certs.patch
@@ -0,0 +1,3309 @@
+diff -ruN a/client/CMakeLists.txt b/client/CMakeLists.txt
+--- a/client/CMakeLists.txt	2016-01-29 13:06:27.000000000 +0300
++++ b/client/CMakeLists.txt	2016-04-27 10:17:06.596682326 +0300
+@@ -1,14 +1,5 @@
+ set_app_name( PROGNAME qdigidocclient )
+ 
+-add_executable( TSLDownload TSLDownload.cpp )
+-target_link_libraries( TSLDownload Qt5::Network )
+-add_custom_command(
+-	OUTPUT TSL.qrc tl-mp.xml EE.xml
+-	DEPENDS TSLDownload
+-	COMMAND $<TARGET_FILE:TSLDownload> "${CMAKE_CURRENT_BINARY_DIR}" EE
+-	WORKING_DIRECTORY ${_qt5Core_install_prefix}/bin
+-)
+-
+ add_definitions( -DPKCS11_MODULE="${PKCS11_MODULE}" )
+ include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/common ${OPENSSL_INCLUDE_DIR} )
+ 
+@@ -20,7 +11,7 @@
+ )
+ 
+ configure_file( translations/tr.qrc tr.qrc COPYONLY )
+-set( RC_FILES images/images.qrc ${CMAKE_CURRENT_BINARY_DIR}/tr.qrc ${CMAKE_CURRENT_BINARY_DIR}/TSL.qrc )
++set( RC_FILES images/images.qrc ${CMAKE_CURRENT_BINARY_DIR}/tr.qrc TSL.qrc )
+ set( TS_FILES translations/en.ts translations/et.ts translations/ru.ts )
+ 
+ if( NOT Qt5Widgets_FOUND )
+diff -ruN a/client/EE.xml b/client/EE.xml
+--- a/client/EE.xml	1970-01-01 03:00:00.000000000 +0300
++++ b/client/EE.xml	2016-04-27 10:17:37.325923576 +0300
+@@ -0,0 +1,1268 @@
++<?xml version="1.0" encoding="UTF-8"?><TrustServiceStatusList xmlns="http://uri.etsi.org/02231/v2#" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" xmlns:ns3="http://uri.etsi.org/02231/v2/additionaltypes#" xmlns:ns4="http://uri.etsi.org/01903/v1.3.2#" xmlns:ns5="http://uri.etsi.org/TrstSvc/SvcInfoExt/eSigDir-1999-93-EC-TrustedList/#" Id="EE0001" TSLTag="http://uri.etsi.org/19612/TSLTag">
++   <SchemeInformation>
++      <TSLVersionIdentifier>4</TSLVersionIdentifier>
++      <TSLSequenceNumber>28</TSLSequenceNumber>
++      <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++      <SchemeOperatorName>
++         <Name xml:lang="en">Estonian Technical Surveillance Authority</Name>
++         <Name xml:lang="et">Tehnilise Järelevalve Amet</Name>
++      </SchemeOperatorName>
++      <SchemeOperatorAddress>
++         <PostalAddresses>
++            <PostalAddress xml:lang="en">
++               <StreetAddress>23A Sõle St</StreetAddress>
++               <Locality>Tallinn</Locality>
++               <PostalCode>10614</PostalCode>
++               <CountryName>EE</CountryName>
++            </PostalAddress>
++         </PostalAddresses>
++         <ElectronicAddress>
++            <URI xml:lang="en">mailto:info@tja.ee</URI>
++            <URI xml:lang="en">http://sr.riik.ee/en.html</URI>
++         </ElectronicAddress>
++      </SchemeOperatorAddress>
++      <SchemeName>
++         <Name xml:lang="en">EE:Supervision/Accreditation Status List of certification services from Certification Service Providers, which are supervised/accredited by the referenced Scheme Operator’s Member State for compliance with the relevant provisions laid down in Directive 1999/93/EC of the European Parliament and of the Council of 13 December 1999 on a Community framework for electronic signatures.</Name>
++      </SchemeName>
++      <SchemeInformationURI>
++         <URI xml:lang="en">http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=OJ:L:2013:306:0021:0039:EN:PDF</URI>
++         <URI xml:lang="en">http://sr.riik.ee/en/tsl/estonia.html</URI>
++         <URI xml:lang="et">http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=OJ:L:2013:306:0021:0039:ET:PDF</URI>
++         <URI xml:lang="et">http://sr.riik.ee/et/tsl/eesti.html</URI>
++      </SchemeInformationURI>
++      <StatusDeterminationApproach>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/StatusDetn/EUappropriate</StatusDeterminationApproach>
++      <SchemeTypeCommunityRules>
++         <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++         <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EE</URI>
++      </SchemeTypeCommunityRules>
++      <SchemeTerritory>EE</SchemeTerritory>
++      <PolicyOrLegalNotice>
++         <TSLLegalNotice xml:lang="en">The applicable legal framework for the present TSL implementation of the Trusted List of supervised/accredited Certification Service Providers for Estonia is Directive 1999/93/EC of the European Parliament and of the Council of 13 December 1999 on a Community framework for electronic signatures and its implementation in Estonia laws.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="et">Käesolevale Eesti järelvalvealuste/akrediteeritud sertifitseerimisteenuse osutajate usaldusnimekirjale kohaldatava õigusliku raamistiku moodustavad Euroopa Parlamendi ja Nõukogu direktiiv 199/93/EÜ, 13. detsember 1999, digitaalallkirju käsitleva ühenduse raamistiku kohta ning sellele direktiivile vastavad  Eesti õigusaktid.</TSLLegalNotice>
++      </PolicyOrLegalNotice>
++      <HistoricalInformationPeriod>65535</HistoricalInformationPeriod>
++      <PointersToOtherTSL>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIFKzCCBBOgAwIBAgISESFCgSJf+NfOVIYHRWWewAm0MA0GCSqGSIb3DQEBCwUAMGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYDVQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzIwHhcNMTUwMzAzMDg1MTAyWhcNMTgwNDIwMTAwNTA1WjBnMQswCQYDVQQGEwJCRTEQMA4GA1UECBMHQmVsZ2l1bTERMA8GA1UEBxMIQnJ1c3NlbHMxHDAaBgNVBAoTE0V1cm9wZWFuIENvbW1pc3Npb24xFTATBgNVBAMTDGVjLmV1cm9wYS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMFBF1FjO2VA4nIvT3MtXToyfWMNFYRvJc2SIJF3pcZNZcUK9wwNL3j/lOB5+eABCTDShJf8fQgmyEcAU7gXhFw9DFgfnXsmmA1a79zzbs5KWzkmAwEE4lfSYcbJoCuUavD79oaR4v3yv7GZMVab8nXuqWvecwzQWT6sl+rx0ogh1bbeKO9wQ5lbEgRw1MLlyFH2kUieMhjCwO2nQJ9UMTaLu7px4LpZ7tlaVetY7UpMPiGAD34kct1YIoJWJllYbbz7jmALmRAdLvvu5y6Ice4H4j0kDJ/l3zLiVeCiORqrx8ngiiS1LfNSckvz2sbzjVJvXbqxYAEytZQvwxEXdPMCAwEAAaOCAdAwggHMMA4GA1UdDwEB/wQEAwIFoDBJBgNVHSAEQjBAMD4GBmeBDAECAjA0MDIGCCsGAQUFBwIBFiZodHRwczovL3d3dy5nbG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzAXBgNVHREEEDAOggxlYy5ldXJvcGEuZXUwCQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwSQYDVR0fBEIwQDA+oDygOoY4aHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9ncy9nc29yZ2FuaXphdGlvbnZhbHNoYTJnMi5jcmwwgaAGCCsGAQUFBwEBBIGTMIGQME0GCCsGAQUFBzAChkFodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc29yZ2FuaXphdGlvbnZhbHNoYTJnMnIxLmNydDA/BggrBgEFBQcwAYYzaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL2dzb3JnYW5pemF0aW9udmFsc2hhMmcyMB0GA1UdDgQWBBQ9lw0pOEotT5cKTF8vxu3W6ZCUhzAfBgNVHSMEGDAWgBSW3mHxvRwWKVMcwMx9O4MAQOYafDANBgkqhkiG9w0BAQsFAAOCAQEArSonov8KbE8+5VwewgBHhILHANLIiRmLVJ1siaRXVXL6abmMo8CjW2+VtzAQdnDkzUY6CNATs0y0qkbEcS7fvtvp8QqAiv71+jij6iDT9r9IJ1suNDeQWz6Mng98ecMVsDUzLYieeZXH049tA3hrAnscVRTu7kpT06CGbcJnoNdG7yvxx2Bs9ciVBExrqKMppVHwup23hw/IphHmifPRmXPQ3Fa5FKrqnWJw1BRBLGLOqC1mkj7JuVX108KHlwa5cGiohctnOH9dfyuQPWQecbrobwDgHl4O0Ra+bU/Z4J85YPOB/+F7rOQxRFCpv43zPdg65pNoPppjFDE4TD2bhg==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-hr.pdf</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUlistofthelists</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">European Commission</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUlistofthelists</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>EU</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/pdf</ns3:MimeType>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIHSDCCBTCgAwIBAgIQHaaUHzn5vENUk+T/aHIefTANBgkqhkiG9w0BAQsFADAxMQswCQYDVQQGEwJFUzERMA8GA1UECgwIRk5NVC1SQ00xDzANBgNVBAMMBklTQSBDQTAeFw0xNDEyMTkwODQyMzlaFw0xODEyMTkwODQyMzlaMEwxCzAJBgNVBAYTAkJFMRwwGgYDVQQKDBNFVVJPUEVBTiBDT01NSVNTSU9OMR8wHQYDVQQDDBYoU0lHTikgQUdOSUVTWktBIEJBSk5PMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAog6nQQcoPlHOrwXYDD+wj38lwn1zbalTTJL7yW3N7OgO9/eSCIY5nGgfnslapC36vSO9RbSxW3cV4CJCf2nGZdsZHxNJpf4IG4CEsByui30UGFANtBPlFj/r5avf0OrDGKTI2H/6sN2swgs43grcRFQ5yt/ZPhOIgjXjzK4s36IFMBG1GGRQUSDJo+uv3cbuBcNjdFro3Zmm9TypDv194f1NwXRbFOon1WtaIsJNKzw4+MKCAyD9BBVATQxGLYeCT2tZt3DFbSSXZbBfSnfwGe7eMc99S12Hr/MwAPJhUwZZpienadVNlMNWxwutxcDO5HrmOdtxv8Vh9MKlAwvN4QIDAQABo4IDPzCCAzswWwYDVR0RBFQwUoEcQUdOSUVTWktBLkJBSk5PQEVDLkVVUk9QQS5FVaQyMDAxFDASBgkrBgEEAaxmAQIMBUJBSk5PMRgwFgYJKwYBBAGsZgEBDAlBR05JRVNaS0EwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBkAwHQYDVR0OBBYEFIe8EqP5sxbiNrSKwgNC00FsSfkjMB8GA1UdIwQYMBaAFEft+GPwma9e/n4OXFjL/uI1N6a9MIHgBgNVHSAEgdgwgdUwgcgGCisGAQQBrGYDBAEwgbkwKQYIKwYBBQUHAgEWHWh0dHA6Ly93d3cuY2VydC5mbm10LmVzL2RwY3MvMIGLBggrBgEFBQcCAjB/DH1RdWFsaWZpZWQgY2VydGlmaWNhdGUuIFVuZGVyIHRoZSB1c2FnZSBjb25kaXRpb25zIGFzc2VydGVkIGluIHRoZSBGTk1ULVJDTSBDUFMgKDEwNiwgSm9yZ2UgSnVhbiBzdHJlZXQsMjgwMDksIE1hZHJpZCwgU3BhaW4pLjAIBgYEAIswAQEwgYYGCCsGAQUFBwEBBHoweDBBBggrBgEFBQcwAYY1aHR0cDovL29jc3BJU0FjYS5jZXJ0LmZubXQuZXMvb2NzcElTQWNhL09jc3BSZXNwb25kZXIwMwYIKwYBBQUHMAKGJ2h0dHA6Ly93d3cuY2VydC5mbm10LmVzL2NlcnRzL0lTQUNBLmNydDBGBggrBgEFBQcBAwQ6MDgwCAYGBACORgEBMAsGBgQAjkYBAwIBDzAVBgYEAI5GAQIwCxMDRVVSAgECAgECMAgGBgQAjkYBBDCBzAYDVR0fBIHEMIHBMIG+oIG7oIG4hoGIbGRhcDovL2xkYXBJU0FjYS5jZXJ0LmZubXQuZXMvQ049Q1JMMSxjbj1JU0ElMjBDQSxvPUZOTVQtUkNNLEM9RVM/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDtiaW5hcnk/YmFzZT9vYmplY3RjbGFzcz1jUkxEaXN0cmlidXRpb25Qb2ludIYraHR0cDovL3d3dy5jZXJ0LmZubXQuZXMvY3Jsc19JU0FjYS9DUkwxLmNybDANBgkqhkiG9w0BAQsFAAOCAgEAd2CyyRljkbR+hxMwnjwzNE9q6nw29uLWx4c/kWfWGNxyjO/mbE2KhgXfUm7e441Ih87PX1p8jpTeOhtfvL8CxmsqyDg56GBNq5NprbagpmKHiNCP77baZiLMFfEvc915ktLlYQEH+wIe5i0gMPmRWjA2urB/M+fXwLgqQdOEe4e0NSLr7YJqHeL1sWQsS4r1zK8ZGv1uJ0v+vAmYXwFtaYYht/c9X+QtVxYaflDcBVnPBxj3xUG7vQHe7g5/RPX4vvzAZNV9d5IBk+sCX05dRfRqsym4qw1sw4j0W2nxAfQwk3bfW6NP5SgOHfC9sh2LrC3F/wlvePY8piTXFUkRzlsEb8zWM2vfz3QRNgGbxCz3DY3kFavdEL/gnNHOg5Q4tn2TVV7YfXLEgu7zN+IqBOdlAtbJXEu60FiF9Cs35IGqwWlbeOK8QvogFYDxlgIPrs3ijEA1WHyY+GH1mofSA7u30wEvooCzohFf4DBv06I4q9aCNBnTo4yki1yFhBm71r60hlAas6aK6TZ+NUoFWwPypMP617SlHdy8QlFx1s3V+rIt2hxUUGddid/FXDKtuUCRqKqx6x8J8bI7DecZsCS7ijPCApjJ84HB8UASRzdGtEwc97hvnAqXjpCS/tHAVcVvmP3isNDu4WtV2LQfL/TIY8zMxUebv/E5JyB3KAw=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIGgDCCBGigAwIBAgIUWH+El24rfQt9YeTtrAZC9UzssuQwDQYJKoZIhvcNAQEFBQAwgZIxCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEoMCYGA1UECxMfSXNzdWluZyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTE3MDUGA1UEAxMuUXVvVmFkaXMgRVUgSXNzdWluZyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBHMjAeFw0xNTEyMDQxMjA5MzVaFw0xODEyMDQxMjA5MjRaMHkxCzAJBgNVBAYTAkJFMRAwDgYDVQQIEwdCcnVzc2VsMRIwEAYDVQQHEwlFdHRlcmJlZWsxHDAaBgNVBAoTE0V1cm9wZWFuIENvbW1pc3Npb24xEzARBgNVBAsTCkRHIENPTk5FQ1QxETAPBgNVBAMMCEVDX0NORUNUMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtXQoPmP4DPSZDKuHcecqX6durKKczAuiEimbZAuuOgMQ9P7g2EIWrACuwNLXKxFXikxOSJWg+nYytJ/ty+1njYa8Nmhp4MYc4UoF3WzQCiz63atK9AuNOMrODBaAGrQNYqXyuEet+i5NaibRYPEtptXzoY0Pif6Zv3qauBlCJnf7kbGkHq9sh8sEXnMaWGjm0EHna8NTh1LjnzCb6N2capQDt+RRrUiBee3YMST3Fo3kKQTKaBvvcYAJ4Mgs/9+Dvwm52dIaMc1vaP1MN2dUW45EWDKtaRfV9flkAy0iT8P8qvUkyGn1XBXnM/gyohOq9cSaP09vPMX6ArmFPlQSiwIDAQABo4IB5DCCAeAwWAYDVR0gBFEwTzAIBgYEAIswAQIwQwYKKwYBBAG+WAGDEDA1MDMGCCsGAQUFBwIBFidodHRwOi8vd3d3LnF1b3ZhZGlzZ2xvYmFsLm5sL2RvY3VtZW50ZW4wJAYIKwYBBQUHAQMEGDAWMAoGCCsGAQUFBwsCMAgGBgQAjkYBATB0BggrBgEFBQcBAQRoMGYwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnF1b3ZhZGlzZ2xvYmFsLmNvbTA4BggrBgEFBQcwAoYsaHR0cDovL3RydXN0LnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdmV1Y2FnMi5jcnQwRgYKKoZIhvcvAQEJAQQ4MDYCAQGGMWh0dHA6Ly90c2EwMS5xdW92YWRpc2dsb2JhbC5jb20vVFNTL0h0dHBUc3BTZXJ2ZXIwEwYKKoZIhvcvAQEJAgQFMAMCAQEwDgYDVR0PAQH/BAQDAgZAMB8GA1UdIwQYMBaAFOD4DvnUtfJ/SSO2w3nHozUfhnqIMDsGA1UdHwQ0MDIwMKAuoCyGKmh0dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2ZXVjYWcyLmNybDAdBgNVHQ4EFgQUQX94XsDFzQFNiSGpboQqB53MiyAwDQYJKoZIhvcNAQEFBQADggIBAJfRbSpp2RTfVtyu4G1TDVXE6RgoIQ5XrUASAmhDWktT5PJReSg5INMFxi3jSPAO7p29bEU32wllZGPVN+A9b2SZmhHyYx9ZoBTMekKlx0qHkU4FfcicIznXo9EVplMtgjplqRltiLqxwXU5uIxKJ2R6BJwjokUWcpei1ifs14SgAve8firXwiG1kFcoClfLjyj4SuDFxT+0e/dhfGfQMfvVBp4xa5tOGYDS7kzf7xvftYlPHW1AbEzjuPmViGgen8ZD/WkuqzdygizOocFQNshGH/mFnQxT4ILAubWJX5gcvmjaZ9N/Lxh041Ra2s8YK5l1DHBcZzz6y2j9OhxPgCvzz3/71DsiGVaK/TO5HxJNcjKlkBblXE4dgy3wqjpUzqkVltC+Xli23Ljny4tenz0QNOx3SQBA1R/hZE5QKD0L0wOc4Np1VxGZbCWGFqta8KKhEA19KlW03Yix9aqe86iNKoJm3n/4BBgdYGu5c+DnqKWj3D7NnxCVZwuLOKzWSCEisl2kHdgnZ3Qix5Vc5QYWexSHeQfCuJAARCDvhdnOidUyiZRnQ6R4VHt0GgNQcYKrmz+UdEroSeQCuSvXIh+LIEJpayWSo9vxi3OgO2IRSi+7Kh5h7LAfWcIwpVY8u0BpRoNJg5xMjvF49GDJc1QeKdlqCBm05N4c2d5t5/aa</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIGgTCCBGmgAwIBAgIUeaHFHm5f58zYv20JfspVJ3hossYwDQYJKoZIhvcNAQEFBQAwgZIxCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEoMCYGA1UECxMfSXNzdWluZyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTE3MDUGA1UEAxMuUXVvVmFkaXMgRVUgSXNzdWluZyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBHMjAeFw0xMzEwMzAxMjI3MTFaFw0xNjEwMzAxMjI3MTFaMHoxCzAJBgNVBAYTAkJFMRAwDgYDVQQIEwdCcnVzc2VsMRIwEAYDVQQHEwlFdHRlcmJlZWsxHDAaBgNVBAoTE0V1cm9wZWFuIENvbW1pc3Npb24xFDASBgNVBAsTC0luZm9ybWF0aWNzMREwDwYDVQQDDAhFQ19ESUdJVDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJgkkqvJmZaknQC7c6H6LEr3dGtQ5IfOB3HAZZxOZbb8tdM1KMTO3sAifJC5HNFeIWd0727uZj+V5kBrUv36zEs+VxiN1yJBmcJznX4J2TCyPfLk2NRELGu65VwrK2Whp8cLLANc+6pQn/5wKh23ehZm21mLXcicZ8whksUGb/h8p6NDe1cElD6veNc9CwwK2QT0G0mQiEYchqjJkqyY8HEak8t+CbIC4Rrhyxh3HI1fCK0WKS9JjbPQFbvGmfpBZuLPYZYzP4UXIqfBVYctyodcSAnSfmy6tySMqpVSRhjRn4KP0EfHlq7Ec+H3nwuqxd0M4vTJlZm+XwYJBzEFzFsCAwEAAaOCAeQwggHgMFgGA1UdIARRME8wCAYGBACLMAECMEMGCisGAQQBvlgBgxAwNTAzBggrBgEFBQcCARYnaHR0cDovL3d3dy5xdW92YWRpc2dsb2JhbC5ubC9kb2N1bWVudGVuMCQGCCsGAQUFBwEDBBgwFjAKBggrBgEFBQcLAjAIBgYEAI5GAQEwdAYIKwYBBQUHAQEEaDBmMCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly90cnVzdC5xdW92YWRpc2dsb2JhbC5jb20vcXZldWNhZzIuY3J0MEYGCiqGSIb3LwEBCQEEODA2AgEBhjFodHRwOi8vdHNhMDEucXVvdmFkaXNnbG9iYWwuY29tL1RTUy9IdHRwVHNwU2VydmVyMBMGCiqGSIb3LwEBCQIEBTADAgEBMA4GA1UdDwEB/wQEAwIGQDAfBgNVHSMEGDAWgBTg+A751LXyf0kjtsN5x6M1H4Z6iDA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdmV1Y2FnMi5jcmwwHQYDVR0OBBYEFDc3hgIFJTDamDEeQczI7Lot4uaVMA0GCSqGSIb3DQEBBQUAA4ICAQAZ8EZ48RgPimWY6s4LjZf0M2MfVJmNh06Jzmf6fzwYtDtQLKzIDk8ZtosqYpNNBoZIFICMZguGRAP3kuxWvwANmrb5HqyCzXThZVPJTmKEzZNhsDtKu1almYBszqX1UV7IgZp+jBZ7FyXzXrXyF1tzXQxHGobDV3AEE8vdzEZtwDGpZJPnEPCBzifdY+lrrL2rDBjbv0VeildgOP1SIlL7dh1O9f0T6T4ioS6uSdMt6b/OWjqHadsSpKry0A6pqfOqJWAhDiueqgVB7vus6o6sSmfG4SW9EWW+BEZ510HjlQU/JL3PPmf+Xs8s00sm77LJ/T/1hMUuGp6TtDsJe+pPBpCYvpm6xu9GL20CsArFWUeQ2MSnE1jsrb00UniCKslcM63pU7I0VcnWMJQSNY28OmnFESPK6s6zqoN0ZMLhwCVnahi6pouBwTb10M9/Anla9xOT42qxiLr14S2lHy18aLiBSQ4zJKNLqKvIrkjewSfW+00VLBYbPTmtrHpZUWiCGiRS2SviuEmPVbdWvsBUaq7OMLIfBD4nin1FlmYnaG9TVmWkwVYDsFmQepwPDqjPs4efAxzkgUFHWn0gQFbqxRocKrCsOvCDHOHORA97UWcThmgvr0Jl7ipvP4Px//tRp08blfy4GMzYls5WF8f6JaMrNGmpfPasd9NbpBNp7A==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIGIjCCBQqgAwIBAgIDEuw1MA0GCSqGSIb3DQEBCwUAME4xCzAJBgNVBAYTAkxVMRYwFAYDVQQKEw1MdXhUcnVzdCBTLkEuMScwJQYDVQQDEx5MdXhUcnVzdCBHbG9iYWwgUXVhbGlmaWVkIENBIDIwHhcNMTUwNjI2MDgzOTAwWhcNMTgwNjI2MDgzOTAwWjCCASExCzAJBgNVBAYTAkZSMQswCQYDVQQHEwJMVTEnMCUGA1UEChMeRXVyb3BlYW4gQ29tbWlzc2lvbiBMdXhlbWJvdXJnMRMwEQYDVQQLEwowOTQ5MzgzMzQyMScwJQYDVQQDEx5QaGlsaXBwZSBKZWFuIFJlbmF1ZCBTY2huZWlkZXIxEjAQBgNVBAQTCVNjaG5laWRlcjEdMBsGA1UEKhMUUGhpbGlwcGUgSmVhbiBSZW5hdWQxHTAbBgNVBAUTFDEwMzAzOTY0MjEwMDUxNzM1NTA5MS4wLAYJKoZIhvcNAQkBFh9QaGlsaXBwZS5zY2huZWlkZXJAZWMuZXVyb3BhLmV1MRwwGgYDVQQMExNQcm9mZXNzaW9uYWwgUGVyc29uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqPe/8PxHct9t5mYusk70ZSqhLUDooOZOx+PvGzWtCtnjoRgKDVfT/5E0QJXo6mYPNOyPPW08g9/fA5Q7CHxvtB1SapHdcEX7UDl1e1KlIQF8U+VnYKcnnh90LM01qx1nKvdOoGouI4wmZ88tZveavQeJ5ynHwYARRay5Osm2sUdqnheEZMKLjIuwdd8ivD6pB0+l/vJU26wsN4rgSo9tEjF7GMt/kutHXLMuqCxoCNflOkuWtMuTbxAuAwSQcperWgy4WuE39jQqLMp2x0JnQit3fKh/e36T9BJby1zxeqkZnCTrxgkKhUrnROm5nbjhjEUPVhPl76L79pyCoY6wSwIDAQABo4ICMjCCAi4wDAYDVR0TAQH/BAIwADBiBggrBgEFBQcBAQRWMFQwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmx1eHRydXN0Lmx1MC0GCCsGAQUFBzAChiFodHRwOi8vY2EubHV4dHJ1c3QubHUvTFRHUUNBMi5jcnQwggEeBgNVHSAEggEVMIIBETCCAQMGCCuBKwEBCgMBMIH2MIHHBggrBgEFBQcCAjCBuhqBt0x1eFRydXN0IFF1YWxpZmllZCBDZXJ0aWZpY2F0ZSBvbiBTU0NEIENvbXBsaWFudCB3aXRoIEVUU0kgVFMgMTAxIDQ1NiBRQ1ArIGNlcnRpZmljYXRlIHBvbGljeS4gS2V5IEdlbmVyYXRpb24gYnkgQ1NQLiBTb2xlIEF1dGhvcmlzZWQgVXNhZ2U6IFN1cHBvcnQgb2YgUXVhbGlmaWVkIEVsZWN0cm9uaWMgU2lnbmF0dXJlLjAqBggrBgEFBQcCARYeaHR0cHM6Ly9yZXBvc2l0b3J5Lmx1eHRydXN0Lmx1MAgGBgQAizABATAiBggrBgEFBQcBAwQWMBQwCAYGBACORgEBMAgGBgQAjkYBBDALBgNVHQ8EBAMCBkAwHwYDVR0jBBgwFoAU75a/fWU6VbTScPgM7Eri8ycGmlIwMwYDVR0fBCwwKjAooCagJIYiaHR0cDovL2NybC5sdXh0cnVzdC5sdS9MVEdRQ0EyLmNybDARBgNVHQ4ECgQIRwFCfpjvc7YwDQYJKoZIhvcNAQELBQADggEBAGs5hvi6PQMFQIt3xQI9ScwctWsEV6Dq3ife/bZ6UiTg5DPnm5fWTcfsbYff54PB9BcdjoTGrLCG6dD6Uyn6Qq2oD2Y9L6EuZnCtwzKWbzrVc7+aJ/n4bF/puxpMvjNnuYUlxQH6yfsAoNpS1Xk2euqF+cQeaZt+AqdfYnLdiRBlyxUXtQYg8ROhHTIcmJNZu+qTzDSOLhBv3vyrgPwPY/KKMMQPbYBDdh4C2ltqCo9Qe0LDJvlomkqOXDbV/y5FgI2OjlF1eX9jxFnAEjI5xkpIYnLHT2QAdmy7RPlBku4LwM8qEWpRQK6EoRomaeD48fwhS8Y7vk+KvCXzfsRs4SA=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-mp.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUlistofthelists</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">European Commission</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUlistofthelists</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>EU</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++      </PointersToOtherTSL>
++      <ListIssueDateTime>2016-01-13T11:00:00Z</ListIssueDateTime>
++      <NextUpdate>
++         <dateTime>2016-06-10T10:00:00Z</dateTime>
++      </NextUpdate>
++      <DistributionPoints>
++         <URI>http://sr.riik.ee/tsl/estonian-tsl.xml</URI>
++      </DistributionPoints>
++   </SchemeInformation>
++   <TrustServiceProviderList>
++      <TrustServiceProvider>
++         <TSPInformation>
++            <TSPName>
++               <Name xml:lang="en">AS Sertifitseerimiskeskus</Name>
++            </TSPName>
++            <TSPTradeName>
++               <Name xml:lang="en">VATEE-100687640</Name>
++               <Name xml:lang="en">AS Sertifitseerimiskeskus</Name>
++               <Name xml:lang="en">ESTEID</Name>
++               <Name xml:lang="en">SK</Name>
++            </TSPTradeName>
++            <TSPAddress>
++               <PostalAddresses>
++                  <PostalAddress xml:lang="en">
++                     <StreetAddress>Pärnu mnt 141</StreetAddress>
++                     <Locality>Tallinn</Locality>
++                     <PostalCode>11314</PostalCode>
++                     <CountryName>EE</CountryName>
++                  </PostalAddress>
++               </PostalAddresses>
++               <ElectronicAddress>
++                  <URI xml:lang="en">mailto:info@sk.ee</URI>
++                  <URI xml:lang="en">http://www.sk.ee/en</URI>
++               </ElectronicAddress>
++            </TSPAddress>
++            <TSPInformationURI>
++               <URI xml:lang="en">http://www.sk.ee/en/repository/CPS</URI>
++               <URI xml:lang="en">http://sr.riik.ee/en/registry/legal-framework.html</URI>
++               <URI xml:lang="et">http://www.sk.ee/repositoorium/CPS</URI>
++               <URI xml:lang="et">http://sr.riik.ee/et/register/oigusaktid.html</URI>
++            </TSPInformationURI>
++         </TSPInformation>
++         <TSPServices>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">ESTEID-SK: Qualified certificates for Estonian ID-card</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIIFAjCCA+qgAwIBAgIEPERcgjANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTAyMDExNTE2NDQ1MFoXDTEyMDExMzE2NDQ1MFowfDEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEPMA0GA1UECxMGRVNURUlEMQowCAYDVQQEEwExMRIwEAYDVQQDEwlFU1RFSUQtU0swggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCLeZO5NVo3zbwA8eFVCrrbeZQKvPDB7LUDPvzCqw7U2sC+IwEOdjjpJRF4lxFs+f8yC1bP+rqtWzrKhhJ2owfSAlIZMbly/OFjfLqOcyyi7qdfA/66u+69u/DY9tW5fqW93D73v5WNcNoIemCTydh9IFkQvMihWKH7LblBzCHa4W6qUcBZ7QsBgYpQS9n9fGJt5D2wCDeq0pF1Zy72G3CQFrpuR/aPG28tv9r+C7oqncapbiJ7xIOa77Fm3o07M/9aarq/m1oHEp9CxYiH9nmD3kyMe8yxw5v02MTMmAcxOm83z5O4oXSDTALG5gDfZNPjJaNPno7J8FuGrI3vV8z3AgMBAAGjggGpMIIBpTAMBgNVHRMEBTADAQH/MA4GA1UdDwEB/wQEAwIB5jCCARYGA1UdIASCAQ0wggEJMIIBBQYKKwYBBAHOHwEBATCB9jCB0AYIKwYBBQUHAgIwgcMegcAAUwBlAGUAIABzAGUAcgB0AGkAZgBpAGsAYQBhAHQAIABvAG4AIAB2AOQAbABqAGEAcwB0AGEAdAB1AGQAIABBAFMALQBpAHMAIABTAGUAcgB0AGkAZgBpAHQAcwBlAGUAcgBpAG0AaQBzAGsAZQBzAGsAdQBzACAAYQBsAGEAbQAtAFMASwAgAHMAZQByAHQAaQBmAGkAawBhAGEAdABpAGQAZQAgAGsAaQBuAG4AaQB0AGEAbQBpAHMAZQBrAHMwIQYIKwYBBQUHAgEWFWh0dHA6Ly93d3cuc2suZWUvY3BzLzArBgNVHR8EJDAiMCCgHqAchhpodHRwOi8vd3d3LnNrLmVlL2p1dXIvY3JsLzAfBgNVHSMEGDAWgBQEqnpHo+SJrxrPCkCnGD9v7+l9vjAdBgNVHQ4EFgQUeBe1BfmzWM1ZjN5nXkQGTHWGaV0wDQYJKoZIhvcNAQEFBQADggEBAFIsMHaq4Ffkrxmzw38rHYh5Ia5JGxjtWfPpag9pBtQNZHzY8j97xfPI15haE9Ah3u1WC+bsU2SndVSUGaZ0gKafMxDOy2DUw3B84ymbNRiAFSWty+aKrMCjtdlPktbSQmxNSJAX9vVtM4Y2ory+dtAQ7g11GKHJ+l8BDUpOJA+l8hvS2l4K5whWDHCSqlplMiHPIKgBVArFRNzAq6dquMY+kS3e2PL+PM4GdDW5lRHR/6KUy0BHP2gX/BO4mYQ3BH2BHImUclNras0HISnV/pt6hIkgd1PsFt3rtEolAWP4DWBmc4zAYQJ5t0cEwFM329zCXSGIQIm3a1cMugF5Q/k=</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>CN=ESTEID-SK, SURNAME=1, OU=ESTEID, O=AS Sertifitseerimiskeskus, C=EE, EMAILADDRESS=pki@sk.ee</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2002-01-15T17:44:50Z</StatusStartingTime>
++                  <TSPServiceDefinitionURI>
++                     <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI>
++                     <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI>
++                  </TSPServiceDefinitionURI>
++                  <ServiceInformationExtensions>
++                     <Extension Critical="true">
++                        <ns5:Qualifications>
++                           <ns5:QualificationElement>
++                              <ns5:Qualifiers>
++                                 <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/>
++                              </ns5:Qualifiers>
++                              <ns5:CriteriaList assert="atLeastOne">
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="digitalSignature">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:Description> This service issues qualified certificates for e-signing and e-authentication within the same process. The Relying Party shall make distinction by inspection of keyUsage field contents - e-signature certificates have nonRepudation bit set exclusively. Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) and that has either its nR or its dS bit set is to be considered as supported by an SSCD</ns5:Description>
++                              </ns5:CriteriaList>
++                           </ns5:QualificationElement>
++                           <ns5:QualificationElement>
++                              <ns5:Qualifiers>
++                                 <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/>
++                              </ns5:Qualifiers>
++                              <ns5:CriteriaList assert="all">
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description>
++                              </ns5:CriteriaList>
++                           </ns5:QualificationElement>
++                        </ns5:Qualifications>
++                     </Extension>
++                  </ServiceInformationExtensions>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">ESTEID-SK 2007: Qualified certificates for Estonian ID-card, the residence permit card, the digital identity card, the digital identity card in form of the Mobile-ID</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIID0zCCArugAwIBAgIERZugDTANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTA3MDEwMzEyMjIzN1oXDTE2MDgyNjE0MjMwMVowWzELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxDzANBgNVBAsTBkVTVEVJRDEXMBUGA1UEAxMORVNURUlELVNLIDIwMDcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDtWp2jLCsA7K9AxoPDOL0geM1GoR0Q6wSUICCJYyFkUMboEMxpSzFB6tlb0ySlHEU6Fs+tjA4QrSqwaw0uNk4BXv1lkoOr6DUc+20+AQd5jB6A0atrltZ1XG5IvDEep3DJPykkk2MPxUz7dZx7XUEr/kdUWI9cDIkFWic7y9oTBY9JaV6lxm08kweZ/qTw5PU8/bTvZCE0ygvBXU4TDS2FpUJ/+jTzM2ocWa3QjFQv2Sir6LBvgNY3du/m+WLABq0dgN18R4nhFtmaVepqAeUuEi8eRBl6yLTSmMwYCY46LsK5CdjTCZSZv934FtNuyY6Ph9nCXJAgNAY+GfNJfdMXAgMBAAGjgZwwgZkwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAf4wMwYDVR0fBCwwKjAooCagJIYiaHR0cDovL3d3dy5zay5lZS9jcmxzL2p1dXIvY3JsLmNybDAfBgNVHSMEGDAWgBQEqnpHo+SJrxrPCkCnGD9v7+l9vjAdBgNVHQ4EFgQUSAbevoyHV5WAeGP6nCMrK6A6GHUwDQYJKoZIhvcNAQEFBQADggEBACO6SJrjN5WZuiLSMy/tSmT/w3dd/KPErSAdUIJYkC7hOIauW7jZ3VNgNUMHSIkUoP8AviEMjGA4lkT61YScpJAdmgl8Y80HFdZV5CsThhddoIdZ3cZjSI4NZmTVkSduTjoySALxKL3ZEIPrepQDvNEeV1WSpI5+u/vMekUWJSPc8BK9O2av1e9ResKyPJidqrIksHFjNS+Yt8Ouw7F10MHaPPzMiwoa0DYTVsIKJncPTQmvdJG8M0DDToiiNPQuUy5d1CA75Wtjs+yILGZXpOfbdoQhE7G4pbZaF1s69jKp+zc0ZT4g2OoKfI2TiIX9qeGJMxkOENcd1DDqYVfePmo=</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>CN=ESTEID-SK 2007, OU=ESTEID, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2007-01-03T13:22:37Z</StatusStartingTime>
++                  <TSPServiceDefinitionURI>
++                     <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI>
++                     <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI>
++                  </TSPServiceDefinitionURI>
++                  <ServiceInformationExtensions>
++                     <Extension Critical="true">
++                        <ns5:Qualifications>
++                           <ns5:QualificationElement>
++                              <ns5:Qualifiers>
++                                 <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/>
++                              </ns5:Qualifiers>
++                              <ns5:CriteriaList assert="atLeastOne">
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="digitalSignature">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:Description> This service issues qualified certificates for e-signing and e-authentication within the same process. The Relying Party shall make distinction by inspection of keyUsage field contents - e-signature certificates have nonRepudation bit set exclusively. Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) and that has either its nR or its dS bit set is to be considered as supported by an SSCD</ns5:Description>
++                              </ns5:CriteriaList>
++                           </ns5:QualificationElement>
++                           <ns5:QualificationElement>
++                              <ns5:Qualifiers>
++                                 <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/>
++                              </ns5:Qualifiers>
++                              <ns5:CriteriaList assert="all">
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description>
++                              </ns5:CriteriaList>
++                           </ns5:QualificationElement>
++                        </ns5:Qualifications>
++                     </Extension>
++                  </ServiceInformationExtensions>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">ESTEID-SK 2011: Qualified certificates for Estonian ID-card, the residence permit card, the digital identity card, the digital identity card in form of the Mobile-ID</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=ESTEID-SK 2011, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509Certificate>MIIFBTCCA+2gAwIBAgIQKVKTqv2MxtRNgzCjwmRRDTANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMB4XDTExMDMxODEwMTQ1OVoXDTI0MDMxODEwMTQ1OVowZDELMAkGA1UEBhMCRUUxIjAgBgNVBAoMGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxFzAVBgNVBAMMDkVTVEVJRC1TSyAyMDExMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCz6XxsZh6r/aXcNe3kSpNMOqmQoAXUpzzcr4ZSaGZh/7JHIiplvNi6tbW/lK7sAiRsb65KzMWROEauld66ggbDPga6kU97C+AXGu7+DROXstjUOv6VlrHZVAnLmIOkycpWaxjM+EfQPZuDxEbkw96B3/fG69Zbp3s9y6WEhwU5Y9IiQl8YTkGnNUxidQbON1BGQm+HVEsgTf22J6r6G3FsE07rnMNskNC3DjuLSCUKF4kH0rVGVK9BdiCdFaZjHEykjwjIGzqnyxyRKe4YbJ6B9ABm95eSFgMBHtZEYU+q0VUIQGhAGAurOTXjWi1TssA42mnLGQZEI5GXMXtabp51AgMBAAGjggGgMIIBnDASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjCB9gYDVR0gBIHuMIHrMIHoBgsrBgEEAc4fZAEBATCB2DCBsgYIKwYBBQUHAgIwgaUegaIASwBhAHMAdQB0AGEAdABhAGsAcwBlACAAaQBzAGkAawB1AHQAdAD1AGUAbgBkAGEAdgBhAGwAZQAgAGQAbwBrAHUAbQBlAG4AZABpAGwAZQAgAGsAYQBuAHQAYQB2AGEAdABlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0AGkAZABlACAAdgDkAGwAagBhAHMAdABhAG0AaQBzAGUAawBzAC4wIQYIKwYBBQUHAgEWFWh0dHBzOi8vd3d3LnNrLmVlL0NQUzAdBgNVHQ4EFgQUe2ryVVBcuNl6CIdBrvqiKz1bV3YwHwYDVR0jBBgwFoAUEvJaPupWHL/NBqzx8SXJqUvUFJkwPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL3d3dy5zay5lZS9yZXBvc2l0b3J5L2NybHMvZWVjY3JjYS5jcmwwDQYJKoZIhvcNAQEFBQADggEBAKC4IN3FC2gVDIH05TNMgFrQOCGSnXhzoJclRLoQ81BCOXTZI4qn7N74FHEnrAy6uNG7SS5qANqSaPIL8dp63jg/L4qn4iWaB5q5GGJOV07SnTHS7gUrqChGClnUeHxiZbL13PkP37Lnc+TKl1SKfgtn5FbH5cqrhvbA/VF3Yzlimu+L7EVohW9HKxZ//z8kDn6ieiPFfZdTOov/0eXVLlxqklybUuS6LYRRDiqQupgBKQBTwNbC8x0UHX00HokW+dCVcQvsUbv4xLhRq/MvyTthE+RdbkrV0JuzbfZvADfj75nA3+ZAzFYS5ZpMOjZ9p4rQVKpzQTklrF0m6mkdcEo=</X509Certificate>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2011-03-18T11:14:59Z</StatusStartingTime>
++                  <TSPServiceDefinitionURI>
++                     <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI>
++                     <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI>
++                  </TSPServiceDefinitionURI>
++                  <ServiceInformationExtensions>
++                     <Extension Critical="true">
++                        <ns5:Qualifications>
++                           <ns5:QualificationElement>
++                              <ns5:Qualifiers>
++                                 <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/>
++                              </ns5:Qualifiers>
++                              <ns5:CriteriaList assert="atLeastOne">
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="digitalSignature">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:Description> This service issues qualified certificates for e-signing and e-authentication within the same process. The Relying Party shall make distinction by inspection of keyUsage field contents - e-signature certificates have nonRepudation bit set exclusively. Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) and that has either its nR or its dS bit set is to be considered as supported by an SSCD</ns5:Description>
++                              </ns5:CriteriaList>
++                           </ns5:QualificationElement>
++                           <ns5:QualificationElement>
++                              <ns5:Qualifiers>
++                                 <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/>
++                              </ns5:Qualifiers>
++                              <ns5:CriteriaList assert="all">
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description>
++                              </ns5:CriteriaList>
++                           </ns5:QualificationElement>
++                        </ns5:Qualifications>
++                     </Extension>
++                  </ServiceInformationExtensions>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">ESTEID-SK 2015: Qualified certificates for Estonian ID-card, the residence permit card, the digital identity card, the digital identity card in form of the Mobile-ID</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509SubjectName>CN=ESTEID-SK 2015,2.5.4.97=#130e4e545245452d3130373437303133,O=AS Sertifitseerimiskeskus,C=EE</X509SubjectName>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509Certificate>MIIGcDCCBVigAwIBAgIQRUgJC4ec7yFWcqzT3mwbWzANBgkqhkiG9w0BAQwFADB1MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMCAXDTE1MTIxNzEyMzg0M1oYDzIwMzAxMjE3MjM1OTU5WjBjMQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEXMBUGA1UEYQwOTlRSRUUtMTA3NDcwMTMxFzAVBgNVBAMMDkVTVEVJRC1TSyAyMDE1MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0oH61NDxbdW9k8nLA1qGaL4B7vydod2Ewp/STBZB3wEtIJCLdkpEsS8pXfFiRqwDVsgGGbu+Q99trlb5LI7yi7rIkRov5NftBdSNPSU5rAhYPQhvZZQgOwRaHa5Ey+BaLJHmLqYQS9hQvQsCYyws+xVvNFUpK0pGD64iycqdMuBl/nWq3fLuZppwBh0VFltm4nhr/1S0R9TRJpqFUGbGr4OK/DwebQ5PjhdS40gCUNwmC7fPQ4vIH+x+TCk2aG+u3MoAz0IrpVWqiwzG/vxreuPPAkgXeFCeYf6fXLsGz4WivsZFbph2pMjELu6sltlBXfAG3fGv43t91VXicyzR/eT5dsB+zFsW1sHV+1ONPr+qzgDxCH2cmuqoZNfIIq+buob3eA8ee+XpJKJQr+1qGrmhggjvAhc7m6cU4x/QfxwRYhIVNhJf+sKVThkQhbJ9XxuKk3c18wymwL1mpDD0PIGJqlssMeiuJ4IzagFbgESGNDUd4icm0hQT8CmQeUm1GbWeBYseqPhMQX97QFBLXJLVy2SCyoAz7Bq1qA43++EcibN+yBc1nQs2Zoq8ck9MK0bCxDMeUkQUz6VeQGp69ImOQrsw46qTz0mtdQrMSbnkXCuLan5dPm284J9HmaqiYi6j6KLcZ2NkUnDQFesBVlMEm+fHa2iR6lnAFYZ06UECAwEAAaOCAgowggIGMB8GA1UdIwQYMBaAFBLyWj7qVhy/zQas8fElyalL1BSZMB0GA1UdDgQWBBSzq4i8mdVipIUqCM20HXI7g3JHUTAOBgNVHQ8BAf8EBAMCAQYwdwYDVR0gBHAwbjAIBgYEAI96AQIwCQYHBACL7EABAjAwBgkrBgEEAc4fAQEwIzAhBggrBgEFBQcCARYVaHR0cHM6Ly93d3cuc2suZWUvQ1BTMAsGCSsGAQQBzh8BAjALBgkrBgEEAc4fAQMwCwYJKwYBBAHOHwEEMBIGA1UdEwEB/wQIMAYBAf8CAQAwQQYDVR0eBDowOKE2MASCAiIiMAqHCAAAAAAAAAAAMCKHIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMCcGA1UdJQQgMB4GCCsGAQUFBwMJBggrBgEFBQcDAgYIKwYBBQUHAwQwfAYIKwYBBQUHAQEEcDBuMCAGCCsGAQUFBzABhhRodHRwOi8vb2NzcC5zay5lZS9DQTBKBggrBgEFBQcwAoY+aHR0cDovL3d3dy5zay5lZS9jZXJ0cy9FRV9DZXJ0aWZpY2F0aW9uX0NlbnRyZV9Sb290X0NBLmRlci5jcnQwPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL3d3dy5zay5lZS9yZXBvc2l0b3J5L2NybHMvZWVjY3JjYS5jcmwwDQYJKoZIhvcNAQEMBQADggEBAHRWDGI3P00r2sOnlvLHKk9eE7X93eT+4e5TeaQsOpE5zQRUTtshxN8Bnx2ToQ9rgi18q+MwXm2f0mrGakYYG0bix7ZgDQvCMD/kuRYmwLGdfsTXwh8KuL6uSHF+U/ZTss6qG7mxCHG9YvebkN5Yj/rYRvZ9/uJ9rieByxw4wo7b19p22PXkAkXP5y3+qK/Oet98lqwI97kJhiS2zxFYRk+dXbazmoVHnozYKmsZaSUvoYNNH19tpS7BLdsgi9KpbvQLb5ywIMq9ut3+b2Xvzq8yzmHMFtLIJ6Afu1jJpqD82BUAFcvi5vhnP8M7b974R18WCOpgNQvXDI+2/8ZINeU=</X509Certificate>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2015-12-17T12:38:00Z</StatusStartingTime>
++                  <TSPServiceDefinitionURI>
++                     <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI>
++                     <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI>
++                  </TSPServiceDefinitionURI>
++                  <ServiceInformationExtensions>
++                     <Extension Critical="true">
++                        <ns5:Qualifications>
++                           <ns5:QualificationElement>
++                              <ns5:Qualifiers>
++                                 <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/>
++                              </ns5:Qualifiers>
++                              <ns5:CriteriaList assert="atLeastOne">
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="digitalSignature">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:Description> This service issues qualified certificates for e-signing and e-authentication within the same process. The Relying Party shall make distinction by inspection of keyUsage field contents - e-signature certificates have nonRepudation bit set exclusively. Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) and that has either its nR or its dS bit set is to be considered as supported by an SSCD</ns5:Description>
++                              </ns5:CriteriaList>
++                           </ns5:QualificationElement>
++                           <ns5:QualificationElement>
++                              <ns5:Qualifiers>
++                                 <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/>
++                              </ns5:Qualifiers>
++                              <ns5:CriteriaList assert="all">
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description>
++                              </ns5:CriteriaList>
++                           </ns5:QualificationElement>
++                        </ns5:Qualifications>
++                     </Extension>
++                  </ServiceInformationExtensions>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">EID-SK 2007: Qualified certificates for Mobile-ID</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIID4jCCAsqgAwIBAgIERZ4nqjANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTA3MDEwNTEwMjU0NloXDTE2MDgyNjE0MjMwMVowajELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxITAfBgNVBAsTGFNlcnRpZml0c2VlcmltaXN0ZWVudXNlZDEUMBIGA1UEAxMLRUlELVNLIDIwMDcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDifhEdyvuhk/3TJEGMJ1tEZOskE81yMqPGGXaPHXACJ7fncn1D1uQFt+RG8/ckh7zDquHV1m4HQk7dchaP00rvgsvRlYC9GPcFt6TW8w3t+BkxY1RNbmONgH3qzikljk7m6Nb8UGtL9hOmZdw5k5t9Ht8fgHTnoBkFrxYgsv9d4CCkBTSprNUK+vy/NTak4iAYinWtK6tRHHb1fxRsLUXiDLSO42Kz+rehhslANX+9Y5/h0wlh3pcmxLB1JWAP0O9fV6N1LUQ3Ym7wMp/lBXuPvl52yJuSZDWUF7GkIp+vUifOSefF6CeGh8K9BXDvuOqg+5c/6gkfEQxpRgdu+q5FAgMBAAGjgZwwgZkwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAf4wMwYDVR0fBCwwKjAooCagJIYiaHR0cDovL3d3dy5zay5lZS9jcmxzL2p1dXIvY3JsLmNybDAfBgNVHSMEGDAWgBQEqnpHo+SJrxrPCkCnGD9v7+l9vjAdBgNVHQ4EFgQUHAf0nL+kJWyztJ4iHx+USBtYeo0wDQYJKoZIhvcNAQEFBQADggEBABaiEXv415Oh7AgHODwKRyNFqPcSSOgpLCy1XJB3hl3fi21fslccWuBhfzqHQCiQi0fewh109IJiHq8n1PeKoHBCUVq6NFpxkVsUlUPBr0Qsya1O3SQjuOsBLzUWBvY25dtBuAkBMCo0V1Erf7iTeOzuL4LLbCoeOfeQT3HPmEfSqP5f8V10ST8erbiTVPJwzr66vXaT9YKxy8NyAQc2iaOHuYmGKxs8dgDQRkG6b2a/f5q21YEQKDhvz7VvM6tH+F+rohA2wAvVz4tcPtyw5WEYcavr1KHgz4eZVWsqh2OsHUK9qMas5m/44O1/hXrjpMy5IQsiB4ASXDuXvdOTVbU=</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>CN=EID-SK 2007, OU=Sertifitseerimisteenused, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2007-01-05T11:25:46Z</StatusStartingTime>
++                  <TSPServiceDefinitionURI>
++                     <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI>
++                     <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI>
++                  </TSPServiceDefinitionURI>
++                  <ServiceInformationExtensions>
++                     <Extension Critical="true">
++                        <ns5:Qualifications>
++                           <ns5:QualificationElement>
++                              <ns5:Qualifiers>
++                                 <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/>
++                              </ns5:Qualifiers>
++                              <ns5:CriteriaList assert="atLeastOne">
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="digitalSignature">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:Description> This service issues qualified certificates for e-signing and e-authentication within the same process. The Relying Party shall make distinction by inspection of keyUsage field contents - e-signature certificates have nonRepudation bit set exclusively. Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) and that has either its nR or its dS bit set is to be considered as supported by an SSCD</ns5:Description>
++                              </ns5:CriteriaList>
++                           </ns5:QualificationElement>
++                           <ns5:QualificationElement>
++                              <ns5:Qualifiers>
++                                 <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/>
++                              </ns5:Qualifiers>
++                              <ns5:CriteriaList assert="all">
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description>
++                              </ns5:CriteriaList>
++                           </ns5:QualificationElement>
++                        </ns5:Qualifications>
++                     </Extension>
++                  </ServiceInformationExtensions>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">EID-SK 2011: Qualified certificates for Mobile-ID, organisation cards for natural persons</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIIFADCCA+igAwIBAgIQQyvUTmJDa0ZNgy+/fS0vWjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMB4XDTExMDMxODEwMTExMVoXDTI0MDMxODEwMTExMVowYTELMAkGA1UEBhMCRUUxIjAgBgNVBAoMGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxFDASBgNVBAMMC0VJRC1TSyAyMDExMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2Q1zKMt7DytbntSLoYAAVkEwV+5djSr0vSIG/Zm9seKyx+2PY8sVzXRoUD1CMIYnstDhBSKMjn2/+HpA7pOipAIAMrk6uKnpSTTdFbQ+0fzJVPokBgsdsQ6R5TZFPB1nu5zgRRlQmWIFxOpDiNHTt0LObUhWLXzUb31vc1Wmao2IYcDx1TCs/1E9+camiCl2B5lXrPEU3wBq4waD54izS20DK05+6+hHRg+TqoIg5YSmwbjStEyd/8AQeokwVloyyH49bnpeluADcZJgxxE9ZUvVWHoxYfmg1IeRU72jHTcIjNf1cQN2+9/FtHQMnGzDBgmAPpghwWr3JtW0JWvMXAgMBAAGjggGeMIIBmjASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjCB9AYDVR0gBIHsMIHpMIHmBgsrBgEEAc4fZAEBATCB1jCBsAYIKwYBBQUHAgIwgaMegaAASwBhAHMAdQB0AGEAdABhAGsAcwBlACAAZgD8APwAcwBpAGwAaQBzAHQAZQBsAGUAIABpAHMAaQBrAHUAdABlAGwAZQAgAHMAZQByAHQAaQBmAGkAawBhAGEAdABpAGQAZQAgAHYA5ABsAGoAYQBzAHQAYQBtAGkAcwBlAGsAcwAgAGsAbwBtAG0AZQByAHQAcwBhAGwAdQBzAGUAbAAuMCEGCCsGAQUFBwIBFhVodHRwczovL3d3dy5zay5lZS9DUFMwHQYDVR0OBBYEFLEQlwL63YbGeEGkwzKI+/4f58AFMB8GA1UdIwQYMBaAFBLyWj7qVhy/zQas8fElyalL1BSZMD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly93d3cuc2suZWUvcmVwb3NpdG9yeS9jcmxzL2VlY2NyY2EuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQAxau3ohdFkpvaiVUR7arNovQUZRCG9Ge3udqHYemovyU7N60Hgomc/ZG+uunScATTUhBcv9a5zkQxb1dQ1LYDRfNr9CqI0QvSEE4t9Sfu3fOhyLrlmb3s8xhhYLJBJ325uDvtO/qFeXLlcRXMF5nU8FE2IyaZP1CHYKVh5QNPPQiGZGSox5oOkCvmt4lUl4lZUwVie75us/WtrD6DJeREBTEDHORIfg8E9RA1y/7t2gT9vrU8tabeSZlD03qwXe0nJ9RscI/P0HT8vuo1PGzCfbH9xFqfoZ2jdJ0HzxrFM8VsL/AtCw0dmrxRHLlZzqSw0G7b0W40mwOQauO2gbMfn</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=EID-SK 2011, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2011-03-18T11:11:11Z</StatusStartingTime>
++                  <TSPServiceDefinitionURI>
++                     <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI>
++                     <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI>
++                  </TSPServiceDefinitionURI>
++                  <ServiceInformationExtensions>
++                     <Extension Critical="true">
++                        <ns5:Qualifications>
++                           <ns5:QualificationElement>
++                              <ns5:Qualifiers>
++                                 <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/>
++                              </ns5:Qualifiers>
++                              <ns5:CriteriaList assert="atLeastOne">
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="digitalSignature">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:Description> This service issues qualified certificates for e-signing and e-authentication within the same process. The Relying Party shall make distinction by inspection of keyUsage field contents - e-signature certificates have nonRepudation bit set exclusively. Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) and that has either its nR or its dS bit set is to be considered as supported by an SSCD</ns5:Description>
++                              </ns5:CriteriaList>
++                           </ns5:QualificationElement>
++                           <ns5:QualificationElement>
++                              <ns5:Qualifiers>
++                                 <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/>
++                              </ns5:Qualifiers>
++                              <ns5:CriteriaList assert="all">
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description>
++                              </ns5:CriteriaList>
++                           </ns5:QualificationElement>
++                        </ns5:Qualifications>
++                     </Extension>
++                  </ServiceInformationExtensions>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">KLASS3-SK: Qualified electronic seals</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIIEBDCCAuygAwIBAgIEPNkU9TANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTAyMDUwODEyMDcxN1oXDTEyMDUwNTExMDcxN1owgY4xGDAWBgkqhkiG9w0BCQEWCXBraUBzay5lZTELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxITAfBgNVBAsTGFNlcnRpZml0c2VlcmltaXN0ZWVudXNlZDEKMAgGA1UEBRMBMTESMBAGA1UEAxMJS0xBU1MzLVNLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvIIeK3GJxoPCXVwan+HjJwYGaH3nb/rTPEqg5v9e1c7dnTDBdD2Yteg+lUdHBZDHLj1Tz+J/W9Foc0dzEr96S8+6nMXoonK2x0854JNH2UVbS/+YOGUM6iWSxkHw525tvn5tFaIQoaeh46aQFp9Dngcnv4Gatd0/7NCkLggjFrKmnNTPINpLAG9VoCpVyIMvcVCyTNvSQ+n33ToPO5vtULNYOtCF9MDVND+uNRE2o0tWIG0l84owYPA47tJOLgCpAxLNFR5Ys0nB/ofBYcO+YiCri0yc6t7ZPs/vcfbR6czIwW0GMjyHmVPLB+/WHS3P1sk29DdgIC42RTMthJS6ZQIDAQABo4GZMIGWMA8GA1UdEwQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgHmMDMGA1UdHwQsMCowKKAmoCSGImh0dHA6Ly93d3cuc2suZWUvY3Jscy9qdXVyL2NybC5jcmwwHwYDVR0jBBgwFoAUBKp6R6Pkia8azwpApxg/b+/pfb4wHQYDVR0OBBYEFOU/DJ1xPW+8Gb+a9G6/Cf5A652WMA0GCSqGSIb3DQEBBQUAA4IBAQASvWB+YrgN23EMLW7C5/XUwQLNN1RMDhr6UzOo5XHZ3pxUXq2Erk5ggiS+UJIxkQaSg4OHRru8KTchoJDvS2neeYHOz05zJcAIwoy2GGkHq1iVN+QZaprDaDNYR5GGKgJb3FZrMtyX4dNwnrZzMFzd6t5YibCW+BDPAmqGJvNHzJ5YYdA7I3WT9Baan1ncKd4FtUVb54fppd19NkbCKKSUd7qRYDduNYqVs1C/C0qqLq4TrxoxoxSo+WNLiD01896sIRiPIy8qDOAXJU67382J5XXETe9wZO6o7+NaG0CrpzVY1OaaD2O6Wv/vSpxE2ugqaf0WsP35+coFCWdM2uHZ</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>CN=KLASS3-SK, SERIALNUMBER=1, OU=Sertifitseerimisteenused, O=AS Sertifitseerimiskeskus, C=EE, EMAILADDRESS=pki@sk.ee</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2002-05-08T12:07:17Z</StatusStartingTime>
++                  <TSPServiceDefinitionURI>
++                     <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI>
++                     <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI>
++                  </TSPServiceDefinitionURI>
++                  <ServiceInformationExtensions>
++                     <Extension Critical="true">
++                        <ns5:Qualifications>
++                           <ns5:QualificationElement>
++                              <ns5:Qualifiers>
++                                 <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCForLegalPerson"/>
++                              </ns5:Qualifiers>
++                              <ns5:CriteriaList assert="atLeastOne">
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="nonRepudiation">false</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:Description>Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) is to be considered as issued to a Legal Person</ns5:Description>
++                              </ns5:CriteriaList>
++                           </ns5:QualificationElement>
++                           <ns5:QualificationElement>
++                              <ns5:Qualifiers>
++                                 <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/>
++                              </ns5:Qualifiers>
++                              <ns5:CriteriaList assert="all">
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:Description>Any certificate that is issued under the CA/QC Sdi certificate and that is issued as a QC (i.e. containing a QcCompliance statement) and having its non-repudation bit set exclusively, is to be considered as  supported by an SSCD. They are issued for digital stamping according to Estonian Digital Signature Act</ns5:Description>
++                              </ns5:CriteriaList>
++                           </ns5:QualificationElement>
++                           <ns5:QualificationElement>
++                              <ns5:Qualifiers>
++                                 <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/>
++                              </ns5:Qualifiers>
++                              <ns5:CriteriaList assert="all">
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description>
++                              </ns5:CriteriaList>
++                           </ns5:QualificationElement>
++                        </ns5:Qualifications>
++                     </Extension>
++                  </ServiceInformationExtensions>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/CA/QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">KLASS3-SK 2010: Qualified electronic seals</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509SubjectName>CN=KLASS3-SK 2010, OU=Sertifitseerimisteenused, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509Certificate>MIID5TCCAs2gAwIBAgIES7MTKDANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTEwMDMzMTA5MTcyOFoXDTE2MDgyNjE0MjMwMVowbTELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxITAfBgNVBAsTGFNlcnRpZml0c2VlcmltaXN0ZWVudXNlZDEXMBUGA1UEAxMOS0xBU1MzLVNLIDIwMTAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrlaYRX2v89k8Hd0ADaOfnUcIn7iM6aOXkAR+jp5827ZhDqDyNddF9ZUoBgPghGNIrkHbH7qwex39YnI0ka24lCjcwEMvQMPbyPnX/a4RyJ+wEZttmjBl++FfrZK54L+vD7Dyy4YYB0Og9ktB4qptsDBj+giiv/MGPeGeNs3TacJdNb7+3splTPtPKlDfrufvq4H6jNOv9S9bC+j2VVY9uCFXUro8AA3hoOEKJdSjlpYCa51N8KGLVJYRuc/K81xqi054Jz+Cy/HY/AcXkk2JkxlpJoEXmcuTkxjO/QE/Xbd+mRJHnq6+HurOiKcxKwZCPAa+d+dvRPkbyq9ohMXH9AgMBAAGjgZwwgZkwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAcYwMwYDVR0fBCwwKjAooCagJIYiaHR0cDovL3d3dy5zay5lZS9jcmxzL2p1dXIvY3JsLmNybDAfBgNVHSMEGDAWgBQEqnpHo+SJrxrPCkCnGD9v7+l9vjAdBgNVHQ4EFgQUXXUUEYz0pY5Cj3uyQESj7tZ6O3IwDQYJKoZIhvcNAQEFBQADggEBADFuAGtSoO8PsWRw/QxFzc5EZtbq2KXC9yZ8YQPWBLY4Mh3OVLFJqWyKC+8JHy9D5tJTG49F5UHyDJPufD/XvC2rjRlkqvS/W7sy3MqGh7e+6bg+aD4mo+98Oalnqi12UD+ki+N8JKPXjHNJ31AvH6E/xDsCsvtzubylxI+FU8R0XODIUFbBqRtatRI1/zVaKRhD6LNGPt3rz/3IJKmuEv6b29mzL+p4oNULqpPr6aTmheZme8ZHuEIh3Zp5kdoX3i2D4hsmgClpevZifo196zeKRLk0Qs6nmRjoMxyk6jYIric3/VnV81oyhXSBY1GZnbM4qP1w2S5kSA2bb1pkwFo=</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509Certificate>MIIErDCCA5SgAwIBAgIQAznVp1LayatNgy6bN8f9QjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMB4XDTExMDMxODEwMDYxOFoXDTI0MDMxODEwMDYxOFowbTELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxITAfBgNVBAsTGFNlcnRpZml0c2VlcmltaXN0ZWVudXNlZDEXMBUGA1UEAxMOS0xBU1MzLVNLIDIwMTAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrlaYRX2v89k8Hd0ADaOfnUcIn7iM6aOXkAR+jp5827ZhDqDyNddF9ZUoBgPghGNIrkHbH7qwex39YnI0ka24lCjcwEMvQMPbyPnX/a4RyJ+wEZttmjBl++FfrZK54L+vD7Dyy4YYB0Og9ktB4qptsDBj+giiv/MGPeGeNs3TacJdNb7+3splTPtPKlDfrufvq4H6jNOv9S9bC+j2VVY9uCFXUro8AA3hoOEKJdSjlpYCa51N8KGLVJYRuc/K81xqi054Jz+Cy/HY/AcXkk2JkxlpJoEXmcuTkxjO/QE/Xbd+mRJHnq6+HurOiKcxKwZCPAa+d+dvRPkbyq9ohMXH9AgMBAAGjggE+MIIBOjASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBxjCBlAYDVR0gBIGMMIGJMIGGBgsrBgEEAc4fZAEBATB3MCEGCCsGAQUFBwIBFhVodHRwczovL3d3dy5zay5lZS9jcHMwUgYIKwYBBQUHAgIwRh5EAEEAcwB1AHQAdQBzAGUAIABzAGUAcgB0AGkAZgBpAGsAYQBhAHQALgAgAEMAbwByAHAAbwByAGEAdABlACAASQBEAC4wHQYDVR0OBBYEFF11FBGM9KWOQo97skBEo+7WejtyMB8GA1UdIwQYMBaAFBLyWj7qVhy/zQas8fElyalL1BSZMD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly93d3cuc2suZWUvcmVwb3NpdG9yeS9jcmxzL2VlY2NyY2EuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQC3qNBgY2I9Wqm4LZYKAjCYkc2Nltm1RS9frMvQJ4aEE4Y4TtW2LPcQp2lenOf9aYdEB8G/E9CytZSPlFuvDdsdknj6fg1XCeu6ITR2wIkxJeAeLQvrFEfb1mcAa5tU9RNalZhYc7MFMFQTjQP+GBNxz+KIjNDVASFdv7TCe7GBjsW8Dfes9lQGHaWsBRkHCyuPGIHfH+cmMuhLtWqa4Qlg4f54kcsGO7s4buKtk6XqEj8Cj2ITdfk/aUs9QoxxkYWGwSUlCueTamzufXEJo9yz5Jp6IFdGjotmjb/EBUCf2sFfI83a4Cm1D3L3/KYb5g3cYlDEpPWNqbNuA1XosIqK</X509Certificate>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2010-03-31T09:17:28Z</StatusStartingTime>
++                  <TSPServiceDefinitionURI>
++                     <URI xml:lang="en">https://sk.ee/en/repository/CP/</URI>
++                     <URI xml:lang="et">https://sk.ee/repositoorium/CP/</URI>
++                  </TSPServiceDefinitionURI>
++                  <ServiceInformationExtensions>
++                     <Extension Critical="true">
++                        <ns5:Qualifications>
++                           <ns5:QualificationElement>
++                              <ns5:Qualifiers>
++                                 <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCForLegalPerson"/>
++                              </ns5:Qualifiers>
++                              <ns5:CriteriaList assert="atLeastOne">
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="nonRepudiation">false</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:Description>Any certificate issued under the CA/QC Sdi certificate and is issued as a QC (i.e. containing a QcCompliance statement) is to be considered as issued to a Legal Person</ns5:Description>
++                              </ns5:CriteriaList>
++                           </ns5:QualificationElement>
++                           <ns5:QualificationElement>
++                              <ns5:Qualifiers>
++                                 <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCWithSSCD"/>
++                              </ns5:Qualifiers>
++                              <ns5:CriteriaList assert="all">
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:Description>Any certificate that is issued under the CA/QC Sdi certificate and that is issued as a QC (i.e. containing a QcCompliance statement) and having its non-repudation bit set exclusively, is to be considered as  supported by an SSCD. They are issued for digital stamping according to Estonian Digital Signature Act</ns5:Description>
++                              </ns5:CriteriaList>
++                           </ns5:QualificationElement>
++                           <ns5:QualificationElement>
++                              <ns5:Qualifiers>
++                                 <ns5:Qualifier uri="http://uri.etsi.org/TrstSvc/TrustedList/SvcInfoExt/QCStatement"/>
++                              </ns5:Qualifiers>
++                              <ns5:CriteriaList assert="all">
++                                 <ns5:KeyUsage>
++                                    <ns5:KeyUsageBit name="nonRepudiation">true</ns5:KeyUsageBit>
++                                 </ns5:KeyUsage>
++                                 <ns5:Description>All certificates issued under this CA/QC service that have nonRepudiation bit set exclusively are issued as qualified certificates</ns5:Description>
++                              </ns5:CriteriaList>
++                           </ns5:QualificationElement>
++                        </ns5:Qualifications>
++                     </Extension>
++                  </ServiceInformationExtensions>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">OCSP, ESTEID-SK OCSP RESPONDER 2005</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIIDPDCCAiSgAwIBAgIEQi2iwTANBgkqhkiG9w0BAQUFADB8MRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMQ8wDQYDVQQLEwZFU1RFSUQxCjAIBgNVBAQTATExEjAQBgNVBAMTCUVTVEVJRC1TSzAeFw0wNTAzMDgxMzA0MDFaFw0xMjAxMTIxMzA0MDFaMG8xCzAJBgNVBAYTAkVFMQ8wDQYDVQQKEwZFU1RFSUQxDTALBgNVBAsTBE9DU1AxJjAkBgNVBAMTHUVTVEVJRC1TSyBPQ1NQIFJFU1BPTkRFUiAyMDA1MRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAI8mLeLkRHLxMNCB5Pz8R5DnvPdVxBS91PoHboLnbhjlp1ecByVosjwGpXCGu8tUPuv81Azgqq97AsSugM1J7Pu0gj4bg0Mf6O/9XyoT7RI7H0BuEn4KJQlFcw7tXizI5KUWFFZ4Qg8kfg0xwrDrLIjusBtRbeRARG3DhH8dgZBpAgMBAAGjVzBVMBMGA1UdJQQMMAoGCCsGAQUFBwMJMB8GA1UdIwQYMBaAFHgXtQX5s1jNWYzeZ15EBkx1hmldMB0GA1UdDgQWBBRM+GJhloJeOPpJDgvA0clxQXdnVTANBgkqhkiG9w0BAQUFAAOCAQEAfD8dP+swtSeigLxL3uUXV/tmQkjre7Ww39Uey71LdtxQ6zC7MDjcsLW13JaU0pRuu/p/eGe6h4/w46tSMsBx/U+D1WnHeCj1ED9SFWwfNQFVz9FkM5JEkPDm7lw5hHoxIghRHAC3NMbR3sCrVQA2YELf2WypslROoz8XlRT1LN4pwVehpBeWO7xbQPUtoaxKrSCGumtxtxA3KRJ7POHPTAH4cvipxaZhS1ZcXbKtxsesGW+7KLZirpTBT17ICXEA1CFXDWmJ8MHRhbeNWK3G1PERgTiGtBQV7Z00CzmJPHmb1yfcT27+WZ1W9tRQsjhGEWyMVkNnZooWHIjLpNucQA==</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=ESTEID-SK OCSP RESPONDER 2005, OU=OCSP, O=ESTEID, C=EE</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2005-03-08T14:04:01Z</StatusStartingTime>
++                  <ServiceSupplyPoints>
++                     <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint>
++                  </ServiceSupplyPoints>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">OCSP, ESTEID-SK 2007 OCSP RESPONDER</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIIDnDCCAoSgAwIBAgIERZ0acjANBgkqhkiG9w0BAQUFADBbMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEPMA0GA1UECxMGRVNURUlEMRcwFQYDVQQDEw5FU1RFSUQtU0sgMjAwNzAeFw0wNzAxMDQxNTE3MDZaFw0xMDAxMDgxNTE3MDZaMG8xCzAJBgNVBAYTAkVFMQ8wDQYDVQQKEwZFU1RFSUQxDTALBgNVBAsTBE9DU1AxJjAkBgNVBAMTHUVTVEVJRC1TSyAyMDA3IE9DU1AgUkVTUE9OREVSMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJmoB3SJCpPzcoHNqK1J0tRNQjgr5iuB27uE1VacIbITjD/Nc1AefKz5ydNPIaBNehm4yKxBYGxEeWOSJHVXyhJMg53EAUOw/45c46gvznXupHuJ6TEiGjh1pxaXTeLSnTqzNDZDAGQsOTgIbwGLa5U5ad8rXYu2YkJKsAfo6jT5AgMBAAGjgdcwgdQwEwYDVR0lBAwwCgYIKwYBBQUHAwkwEgYJKwYEBQUHMAEFBAUwAwQBMDCBiQYDVR0jBIGBMH+AFEgG3r6Mh1eVgHhj+pwjKyugOhh1oWGkXzBdMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLggRFm6ANMB0GA1UdDgQWBBRJ/snw1GDL3fUH9n9Cpn8yhXiC7DANBgkqhkiG9w0BAQUFAAOCAQEAYzGkZD/uaXlWPeye1z5IiI83nmAjiJyvoj/r3BB9ZFWMX+ZY4Fz6/V/fzD0xXoeDpWbBKxcuctPXzXYxEH17n0/3yGOz8jhdJNBUCwRmd+96oHsU9aWSf+D2tiq1jPw6HVCiUYOhC/OWjg/+JpFlWsBV4gTW8/2PSGig85XlEsWLK7i7tIe60nnw/rWnfbCckMRcbrAF1L/JIlnUYUdkGOGQ9KPVqwR/MyWrwFIcSy2QIbcIaWMuiUc1nt8bmIXKoFZxbLzXYC00zba9cY7lSC4WPuhBtrQJ9JWb4OeoXd5j6O45UaH6XbarfrhER1GHL06cTyksT18p2L2GrMuEJg==</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=ESTEID-SK 2007 OCSP RESPONDER, OU=OCSP, O=ESTEID, C=EE</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2007-01-04T16:17:06Z</StatusStartingTime>
++                  <ServiceSupplyPoints>
++                     <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint>
++                  </ServiceSupplyPoints>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">OCSP, ESTEID-SK 2007 OCSP RESPONDER 2010</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIIEkjCCA3qgAwIBAgIESxUPmTANBgkqhkiG9w0BAQUFADBbMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEPMA0GA1UECxMGRVNURUlEMRcwFQYDVQQDEw5FU1RFSUQtU0sgMjAwNzAeFw0wOTEyMDExMjQ1MDBaFw0xNjA4MjYxMzIzMDBaMIGHMQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czENMAsGA1UECwwET0NTUDErMCkGA1UEAwwiRVNURUlELVNLIDIwMDcgT0NTUCBSRVNQT05ERVIgMjAxMDEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA48pyM/QfeiU1Kbu4AdcAUKXBiwbYbBl4gCltZHC5fZ77fKj2mqfPX2/XW1EqzbVvG0PYIkapkQzBr3R1S6Uaxh1DLC2Cc8BRnqmhXoE03o8En7N9xpN9dGGDBHp2aElBcVVZnAvF4jgbPDCNFAeo3cvpjIx18n0URiVOZFEdxDvF8PFo/exKXtjRM+jk3K6+9doHYvSXn9klFbT8Wge87Qdll3gQzZE3L8QMXF0z4xbBH1lyTmVLt5yZ0fxoE0jNlZFvn2w2EDnU4CKfId8w6Zjd5kdxomcwDzGuuLzdiJllPt05USJcY4FHn9YAVKWmofYY/o6xOUzU8fAz6yA1tQIDAQABo4IBLzCCASswEwYDVR0lBAwwCgYIKwYBBQUHAwkwaQYDVR0gBGIwYDBeBgorBgEEAc4fBAECMFAwJQYIKwYBBQUHAgIwGRoXU0sgdGltZSBzdGFtcGluZyBwb2xpY3kwJwYIKwYBBQUHAgEWG2h0dHA6Ly93d3cuc2suZWUvYWphdGVtcGVsLzCBiQYDVR0jBIGBMH+AFEgG3r6Mh1eVgHhj+pwjKyugOhh1oWGkXzBdMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLggRFm6ANMB0GA1UdDgQWBBQ4AhAwumZ6EXROIl5wZQXedXpOFDANBgkqhkiG9w0BAQUFAAOCAQEAJ/LvPUevNRcBp+J78fZRofhk/ifKNLxCUoh8T3MjtU9u5R0KojRlye+1NU8MqH/zrKhr6TPxuXD0cRrFQ9Hy60II7IzzaegrQVNgq7UgQINvCuNxWZcGtEa3ba9M7tBpQeFxqp3CpBytGeVuXn65hqOBKdp/zYEiMUUkYNAT5A6SSPYLAOgARCI/ydBx+cw0l0fwYvw72FKZa2Mlt5DmXBccCtrQ4l/sb95xfANCNe5n5sBvBhY4F+sIWZUVJ8fTVh7iGaVPSayQfeAAei0m/4/ksiXBwfx6qhzyB3yqcnSk489oBrrCegua/t+3LizfHpNZvDphKMPuAZ4uheLfQA==</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=ESTEID-SK 2007 OCSP RESPONDER 2010, OU=OCSP, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2009-12-01T13:45:00Z</StatusStartingTime>
++                  <ServiceSupplyPoints>
++                     <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint>
++                  </ServiceSupplyPoints>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">OCSP, EID-SK 2007 OCSP RESPONDER</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIIDOjCCAiKgAwIBAgIERh9YjTANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECxMYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMRQwEgYDVQQDEwtFSUQtU0sgMjAwNzAeFw0wNzA0MTMxMDE2NDVaFw0xMDA0MTcwOTE2NDVaMH8xCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMQ0wCwYDVQQLEwRPQ1NQMSMwIQYDVQQDExpFSUQtU0sgMjAwNyBPQ1NQIFJFU1BPTkRFUjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD+Z0LZ6TjBzx4x+UshExea1nIMsS86xAN6u/amLV8XQE+vodEld8iqtRsrvFiQ74isYOys1JKqiq+1ryic6j2FnMDZueLiXZl51QWyuhWu+aT4BwEaA8rUxMgKJ94zWksrqSf9cjoaap+9DlDhEsrDa+/89CPl2rlZIB5lqeHLQQIDAQABo1cwVTATBgNVHSUEDDAKBggrBgEFBQcDCTAfBgNVHSMEGDAWgBQcB/Scv6QlbLO0niIfH5RIG1h6jTAdBgNVHQ4EFgQUMsMzikmZqG6CcdgnD5VAXfQeCrgwDQYJKoZIhvcNAQEFBQADggEBAH0eUFQ7LznD4R8XWj/6rsNhe0fme3Os7cyZGNkx1EWenkgdMHCV/gN3SyIfrjW7sEJM62sS1X+8Ke2J+6b5YH0TcSmSDqYICn6zVbsq5MLtHW5wmwKucBJ5xFgoC3NNCEp8wVrzuQmm6xCvFWQVQ6uNhjuxCQxcDKgLwpL7iEcBEMmTTKkvqEtqrvu/LZ/a2OHytkEoXGheN8KlEcIv7AJBPVL8OCv4UpgyUOrVnmIeX2F/KG3wmo4U3kVupuF9kaPrOeOGYG3ZzK2HNwfRNkZ/Ej7AuPazkumAHdsJBbpTdBYq8d8er8XZKai24Ra/e5eEmcMye+O8IpxAA4ExY+I=</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=EID-SK 2007 OCSP RESPONDER, OU=OCSP, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2007-04-13T10:16:45Z</StatusStartingTime>
++                  <ServiceSupplyPoints>
++                     <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint>
++                  </ServiceSupplyPoints>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">OCSP, EID-SK 2007 OCSP RESPONDER 2010</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIIEMTCCAxmgAwIBAgIESxUA8TANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECxMYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMRQwEgYDVQQDEwtFSUQtU0sgMjAwNzAeFw0wOTEyMDExMTQxMzBaFw0xNjA4MjYxMzIzMDBaMIGEMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czENMAsGA1UECxMET0NTUDEoMCYGA1UEAxMfRUlELVNLIDIwMDcgT0NTUCBSRVNQT05ERVIgMjAxMDEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAso91KG7EHsjAxMairaCKUHSOyXp5rzxRq5Y9LfDyplVbHfh34fbB7M5G+wnu5CZgJsfJ7DF3MjpA7nlAHd5alAynIUl/CNXejf+XnJ/vyF1eQvAoWvnjBPVIS0mbaABgF54ybAGE2E7UKeZVOAj7RoQVAMHQcYVjxZW5OWz3yJX9KdaDZPOzqlGtRYKUASHiwAFwExKcqfaHOj0qO8+KdSvEBaVlpe5kunEVEvn+kgNKBtzdH2XFMjVFa4im31KW+iq7mNQwUiZDSe9ho6T6UrWu7g8yTQowx3SYLTqVxR0YVgcYNCx7nn1AVGNxK3oeonrHHqcBp6qSAIYXeQNfiQIDAQABo4HDMIHAMBMGA1UdJQQMMAoGCCsGAQUFBwMJMGkGA1UdIARiMGAwXgYKKwYBBAHOHwQBAjBQMCUGCCsGAQUFBwICMBkaF1NLIHRpbWUgc3RhbXBpbmcgcG9saWN5MCcGCCsGAQUFBwIBFhtodHRwOi8vd3d3LnNrLmVlL2FqYXRlbXBlbC8wHwYDVR0jBBgwFoAUHAf0nL+kJWyztJ4iHx+USBtYeo0wHQYDVR0OBBYEFPBOCDPMR+kfp7Ozk5U68E68/AseMA0GCSqGSIb3DQEBBQUAA4IBAQCRaqmxZgJiJ+MLamb/P4vyS6azr6/tj8dZCK++V/3GnecRm7CiZpR47EnW0NyDzCecGyTWSkVlnZPnNvXRx700Nn0M4Inia5pNhSuVmWS3p5eV70vCbsfRD26+6CZhkHWnL/J2xpqeacULtgPPz9gBTyC2ybQr17dv7W5Qc+3UFywmE5N8ozQuEJroGz7P+yCbBEssWcmIUNDNdO0xs6aQZ1f+DV4FUB0lajuILYFz4xM+81akYFVqaGPCVwbQgFSWRKmamj8FxfWjA4DCrgkHVR1rA3tZyirfCBK9cfWpTCLr8zq9Ur0jTAeGrHRzHlUrB9mYZwyr0kNOyl9293xh</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=EID-SK 2007 OCSP RESPONDER 2010, OU=OCSP, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2009-12-01T12:41:30Z</StatusStartingTime>
++                  <ServiceSupplyPoints>
++                     <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint>
++                  </ServiceSupplyPoints>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">OCSP, KLASS3-SK OCSP RESPONDER 2009</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIIDzzCCAregAwIBAgIEScskSjANBgkqhkiG9w0BAQUFADCBjjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECxMYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMQowCAYDVQQFEwExMRIwEAYDVQQDEwlLTEFTUzMtU0swHhcNMDkwMzI2MDY0NDI2WhcNMTIwNTA0MDU0NDI2WjCBgjELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxDTALBgNVBAsTBE9DU1AxJjAkBgNVBAMTHUtMQVNTMy1TSyBPQ1NQIFJFU1BPTkRFUiAyMDA5MRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKi6weNl7Wj7sL6JD4YUNt/JXQ79KL53x5m4QGRsijGJaV5YggE5rJyVZGlsX4FSd9JFIV597ypAUGDbLPf0nDdlSIGteP7zamyETI3GI6bKfkeUuIE707r7uC+8FFe9iHOOL20+pi7WFzwnyXT9yuWs0eCoKdjQvLpMiq0MBIm9AgMBAAGjgcIwgb8wEwYDVR0lBAwwCgYIKwYBBQUHAwkwaAYDVR0gBGEwXzBdBgorBgEEAc4fBAECME8wJQYIKwYBBQUHAgIwGRoXU0sgdGltZSBzdGFtcGluZyBwb2xpY3kwJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuc2suZWUvYWphdGVtcGVsMB8GA1UdIwQYMBaAFOU/DJ1xPW+8Gb+a9G6/Cf5A652WMB0GA1UdDgQWBBT59PTkSIzYXNBxQQnAhqH3BtED0TANBgkqhkiG9w0BAQUFAAOCAQEAhyl3H6fo1bz3mD0JcD4eY1slcwec92Qgkn6i9TsO5TlDQCJxiC/80zlh+H5dgIMcNQ6gNbr1cWsUw7xAanv2hGlg20IWq7uCyy5LDghFpO2BWDzTJjmiVTXzyVEvqST0W6efDiwi1tA8H7b+aAzc9ItWm7pYlucGvneKJq07t/UvU9ONSDUfVLPNMr8slwCMOexVDZ+eiBlvrLL3N7NouPs7UpFh/+m5JsERmeLbbrNYimHUUn2PJ/trJ3kBEVFToO+nFdBElfzC3bjSlbPXFxSOL+AqSgvRIaB4CEWUxa33wzoZNaVpCh5AupxQOGdr4u7ajw5hkV8Y9VZ7OFej6A==</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=KLASS3-SK OCSP RESPONDER 2009, OU=OCSP, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2009-03-26T07:44:26Z</StatusStartingTime>
++                  <ServiceSupplyPoints>
++                     <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint>
++                  </ServiceSupplyPoints>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">OCSP, KLASS3-SK 2010 OCSP RESPONDER</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIIELzCCAxegAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwbTELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxITAfBgNVBAsTGFNlcnRpZml0c2VlcmltaXN0ZWVudXNlZDEXMBUGA1UEAxMOS0xBU1MzLVNLIDIwMTAwHhcNMTAwNDA4MDgwMTMxWhcNMTYwODI1MjIwMDAwWjCBgjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czENMAsGA1UECxMET0NTUDEmMCQGA1UEAxMdS0xBU1MzLVNLIDIwMTAgT0NTUCBSRVNQT05ERVIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDhWwGpngF0sdGCgOgiyT12A/Vdm9sMPr/cUwZhU7DA5C8rU1yJhbrh28fMpv0eas6/+IC1oDxI24zjfWIKfHwpBmhUTFsmvmKRIu4a1F6VwNwYEdoAZrQDpzZSve6H6R/+0Uy0BAolebdhPUK22pKd8V1CBY3de886Ray8uUJu09MAU8j+xsoUNOzyxiWdAVp1YTXRhhUt+EQVYJ22RBZ6+b9fPQvgb9aWgE/WwqUh7OrgTnrGZVzgO46prfE7zkALG0FYZCzQTCMH8aIqqte0E3HwSVlKh9qwbRPB9WTDCtCqajh4qgGRTXvWT4vATlHvx8GpJ3roZkp5AlQno3hTAgMBAAGjgcIwgb8waAYDVR0gBGEwXzBdBgorBgEEAc4fBAECME8wJQYIKwYBBQUHAgIwGRoXU0sgdGltZSBzdGFtcGluZyBwb2xpY3kwJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuc2suZWUvYWphdGVtcGVsMBMGA1UdJQQMMAoGCCsGAQUFBwMJMB8GA1UdIwQYMBaAFF11FBGM9KWOQo97skBEo+7WejtyMB0GA1UdDgQWBBQ3MJkXG2Go/6j4bem465aue3P5qjANBgkqhkiG9w0BAQUFAAOCAQEAKhoVTII1ECecFkyt9Ogr0XW3WEFprrqTDE4IycMlx+LNjWk30aknMldEtzIC5nCDX27NCWkpbN1o/3ddBv0cKMa05ZK8sHQxU6A5Oev8DCp72/LFEChq5IDqgqW2BiHhyfPfr93JIuV03b/Wgq3fpRyBd21VE9254W4A90xeNxDvdpqxlrD2Lonzm/V/oomzEHsp4kKxXkPmRU4vGtTnxxAnxYp9OuLkvpUCLNoAWMbYqb4cbYzaZ9tQIkBy3nJ352Rs5obYDb3R/ZVWuYLLSocWL7b2QwlDP7LA8VNDqmQvioHt8GcyKXQ5/eWMvj2ePt58waVhwfSdd4nANKtq1g==</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>CN=KLASS3-SK 2010 OCSP RESPONDER, OU=OCSP, O=AS Sertifitseerimiskeskus, C=EE, EMAILADDRESS=pki@sk.ee</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2010-04-08T08:01:31Z</StatusStartingTime>
++                  <ServiceSupplyPoints>
++                     <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint>
++                  </ServiceSupplyPoints>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">OCSP, SK OCSP RESPONDER 2011</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIIEvDCCA6SgAwIBAgIQcpyVmdruRVxNgzI3N/NZQTANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMB4XDTExMDMxODEwMjE0M1oXDTI0MDMxODEwMjE0M1owgZ0xCzAJBgNVBAYTAkVFMQ4wDAYDVQQIEwVIYXJqdTEQMA4GA1UEBxMHVGFsbGlubjEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czENMAsGA1UECxMET0NTUDEfMB0GA1UEAxMWU0sgT0NTUCBSRVNQT05ERVIgMjAxMTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAihvGyhMVrgReHluKln1za6gvCE/mlSREmWjJFpL9llvuEUZoPFIypYA8g5u1VfgkeW5gDq25jAOq4FyXeDGIa+pJn2h0o2Wc2aeppVG/emfGm/jA8jjeyMrwH8fAJrqVQ7c9X2xSwJEch/P2d8CfMZt5YF6gqLtPvG1b+n6otBZA5wjIFfJ/inJBMUvqHSz3+PLfxO2/T3Wyk/c8M9HIMqTelqyiMGRgWehiU1OsL9armv3dQrHs1wm6vHaxfpfWB9YAFpeo9aYqhPCxVt/zo2NQB6vxyZS0hsOrXL7SxRToOJaqsnvlbf0erPPFtRHUvbojYYgl+fzlz0Jt6QJoNwIDAQABo4IBHTCCARkwEwYDVR0lBAwwCgYIKwYBBQUHAwkwHQYDVR0OBBYEFKWhSGFt537NmJ50nCm7vYrecgxZMIGCBgNVHSAEezB5MHcGCisGAQQBzh8EAQIwaTA+BggrBgEFBQcCAjAyHjAAUwBLACAAdABpAG0AZQAgAHMAdABhAG0AcABpAG4AZwAgAHAAbwBsAGkAYwB5AC4wJwYIKwYBBQUHAgEWG2h0dHBzOi8vd3d3LnNrLmVlL2FqYXRlbXBlbDAfBgNVHSMEGDAWgBQS8lo+6lYcv80GrPHxJcmpS9QUmTA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vd3d3LnNrLmVlL3JlcG9zaXRvcnkvY3Jscy9lZWNjcmNhLmNybDANBgkqhkiG9w0BAQUFAAOCAQEAw2sKwvTHtYGtD8Jw9mNUuj/mWiBSBEBeY2LhW8V6tjBPAPp3s6iWOh0FbVR2LUyrqRwgT3fyWiGsiDm/6cIqM+IblLp/8ztfRQjquhW6XCD9SK02OQ9ZSdBwcmoAApZLGXQC34wdgmV/hLTTNxONnDACBKz9U+Dy9a4ZT4tpNkbH8jq/BMne8FzbvRt1bjpXBP7gjLX+zdx8/hp0Wq4tD+f9NVX0+vm9ahEKuzx4QzPnSB7hhWM9OnLZT7noRQa+KWk5c+e5VoR5R2t7MjVl8Cd+2llxiSxqMSbU5/23BzAKgN+NQdrBZAzpZ7lfaAuLFaICP+bAm6uW2JUrM6abOw==</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=SK OCSP RESPONDER 2011, OU=OCSP, O=AS Sertifitseerimiskeskus, L=Tallinn, ST=Harju, C=EE</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2011-03-18T11:21:43Z</StatusStartingTime>
++                  <ServiceSupplyPoints>
++                     <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint>
++                  </ServiceSupplyPoints>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">OCSP, SK Proxy OCSP Responder 2009</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIIEUjCCAzqgAwIBAgIESg1N9TANBgkqhkiG9w0BAQUFADCBjjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECxMYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMQowCAYDVQQFEwExMRIwEAYDVQQDEwlLTEFTUzMtU0swHhcNMDkwNTE1MTExMTQ5WhcNMTIwNTA1MTEwNzE3WjCBgTELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxDTALBgNVBAsTBE9DU1AxJTAjBgNVBAMTHFNLIFByb3h5IE9DU1AgUmVzcG9uZGVyIDIwMDkxGDAWBgkqhkiG9w0BCQEWCXBraUBzay5lZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ6rr1AZFPunWKMJAse70wx9Utc57qgbrJdk8iiOrcUN2FApNal2wFnRIw9rsF8u9KPu3g47ZSuKKYkpdVVupTwt6gK+brQczfQShO3xOCj7cubcl5+6jDPXSh47zma10hh4tJ5VECOiCDBhIRfA/UJfMYj6BYgEhFuRQxEBgAF5yyEJX1X8Sco/GQcha4Er5SyEhHvXu/vvg0OVfLRqH/7gGBBRLPMOsDImmXf+C0UYKs7ywFBf+M0VnWH9u0p7E8XzA8s3m2ivTdU/JYIU5Zy7NFeV9NJgZw3iaLCO1dbV2gBIWpgGvqlwQ3coKHMs3tMBT25+WWmKVMsHFi254ysCAwEAAaOBwjCBvzATBgNVHSUEDDAKBggrBgEFBQcDCTBoBgNVHSAEYTBfMF0GCisGAQQBzh8EAQIwTzAlBggrBgEFBQcCAjAZGhdTSyB0aW1lIHN0YW1waW5nIHBvbGljeTAmBggrBgEFBQcCARYaaHR0cDovL3d3dy5zay5lZS9hamF0ZW1wZWwwHwYDVR0jBBgwFoAU5T8MnXE9b7wZv5r0br8J/kDrnZYwHQYDVR0OBBYEFCRXW4FmpJ/GGw3/AXu5czpgogbJMA0GCSqGSIb3DQEBBQUAA4IBAQB9U7sG/M/w7eXBQh5tDOZ7XLCRmhrmGk9+1RdAP54SmMzc1nnglmfgl13ncaizPleu0p8541a51XCYqQMJbry47YkEnq48ImiAjEpkbaCZsZhX06uUpA9DlstEW/wBZzSCUoGsklbBolwTWAP97B7trizPe102hNvD5IMaXrMqaH9hQcoYmKyJHBQnxW2bXxYjeXvIDcAQvevLP8IIOLqdib029GFcM7U889FaBcO4cPxx4kITXC2hAvdiZwGuDVAz15Byl8RAfNWrlmv+IBRSQpAecnLYozJYyRNcFPrYLd9aXbej6p6sRCHgC452czoM0VbMmisrK8pm6yZ0J1r+</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>EMAILADDRESS=pki@sk.ee, CN=SK Proxy OCSP Responder 2009, OU=OCSP, O=AS Sertifitseerimiskeskus, C=EE</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2009-05-15T11:11:49Z</StatusStartingTime>
++                  <ServiceSupplyPoints>
++                     <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint>
++                  </ServiceSupplyPoints>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">OCSP, ESTEID-SK OCSP RESPONDER</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIIDuDCCAqCgAwIBAgIEPJilyDANBgkqhkiG9w0BAQUFADB8MRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMQ8wDQYDVQQLEwZFU1RFSUQxCjAIBgNVBAQTATExEjAQBgNVBAMTCUVTVEVJRC1TSzAeFw0wMjAzMjAxNTA3NTJaFw0wNTAzMjQxNTA3NTJaMGoxCzAJBgNVBAYTAkVFMQ8wDQYDVQQKEwZFU1RFSUQxDTALBgNVBAsTBE9DU1AxITAfBgNVBAMTGEVTVEVJRC1TSyBPQ1NQIFJFU1BPTkRFUjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC10BeCObXZZWcDX298Wqfd16hpi9tuSbT4L+kowTj+aWz7PDsFpKQWqhxCdlicu67xCT0zAAjaK6x9cwasiIdre++IkscRi00w20G5nTPocxpwGTHqwHx4ED7cceK4t4pbj/zB8FluVNVii8ouG9ZEhH76j/Icx0X27Sq5AS0CwwIDAQABo4HXMIHUMBMGA1UdJQQMMAoGCCsGAQUFBwMJMBIGCSsGBAUFBzABBQQFMAMEATAwgYkGA1UdIwSBgTB/gBR4F7UF+bNYzVmM3mdeRAZMdYZpXaFhpF8wXTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEQMA4GA1UEAxMHSnV1ci1TS4IEPERcgjAdBgNVHQ4EFgQUzpYj2gwlDYK9ahyGyKa0AkK5ys0wDQYJKoZIhvcNAQEFBQADggEBADrq0tGkwsrddEqUbsOpXi75Xs4GVkOyseysNqZZCvLqCF7qTSMiC+fzRxQbXQDhuOT7QQvi3JAoA5zTIm2RvIO1fmrVnJ6CsObjxxvXtcSLI+bICG4uQYgEA+duDRgICpmtCCjtmxb+2/cSJLGioaKiwn0YwgeEowOgjDMh2o4otm6FjtyT1GZsZm56U7WkFa7tSwkHKw427iZUWVrED6W9AfATY14rNnAk8Jqz06w4rPnGE4kYjO+UqMLmFU2KImdrTp1O7h4YLCVlxH/e/He8r7FSgzXSG4EqlD/TMEdCLu7DSWR3SEgJPvKWCpNWzv2DRldHp+kQO3k+R/f2c80=</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>EMAILADDRESS=pki@sk.ee, C=EE, O=ESTEID, OU=OCSP, CN=ESTEID-SK OCSP RESPONDER</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2002-03-20T16:07:52Z</StatusStartingTime>
++                  <ServiceSupplyPoints>
++                     <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint>
++                  </ServiceSupplyPoints>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">OCSP, KLASS3-SK OCSP RESPONDER (from 2003)</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIIDXTCCAkWgAwIBAgIEPolzuzANBgkqhkiG9w0BAQUFADCBjjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECxMYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMQowCAYDVQQFEwExMRIwEAYDVQQDEwlLTEFTUzMtU0swHhcNMDMwNDAxMTExMDUxWhcNMDYwNDA1MTAxMDUxWjB9MQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czENMAsGA1UECxMET0NTUDEhMB8GA1UEAxMYS0xBU1MzLVNLIE9DU1AgUkVTUE9OREVSMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALXQF4I5tdllZwNfb3xap93XqGmL225JtPgv6SjBOP5pbPs8OwWkpBaqHEJ2WJy7rvEJPTMACNorrH1zBqyIh2t774iSxxGLTTDbQbmdM+hzGnAZMerAfHgQPtxx4ri3iluP/MHwWW5U1WKLyi4b1kSEfvqP8hzHRfbtKrkBLQLDAgMBAAGjVzBVMBMGA1UdJQQMMAoGCCsGAQUFBwMJMB8GA1UdIwQYMBaAFOU/DJ1xPW+8Gb+a9G6/Cf5A652WMB0GA1UdDgQWBBTOliPaDCUNgr1qHIbIprQCQrnKzTANBgkqhkiG9w0BAQUFAAOCAQEAd/8FCyPC9zXxcAZN67KCNU4+XNJ8e+LmG602lBe+lS7Pw4pOgMKebgULKh1fEBHQ2K7FSUWMZdPWkDHaKVRh646yVbFZbfEmKNq4LhRf13/hoUdrG5uRVmCsV03WSfgfUVfb1cZf8tDMIwCmsNXu22k9wykeHallpUmGUfbVZygqfKE2NVQpm2FULiKWBFKXqbMtW5R3xmDS3bjrAIAdUdYhxhfdCHCphsQf/FJlxb8UFOUa8SeRNr5eL7s8znLnrC5pKPpWGbUNSlrhLJZHIeXfwbOamae6UVvjto6bMqRe2sxCsMA0dGz+tMiglfmTVInxpEKBkyvF/on/2qwtVw==</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>EMAILADDRESS=pki@sk.ee, C=EE, O=AS Sertifitseerimiskeskus, OU=OCSP, CN=KLASS3-SK OCSP RESPONDER</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2003-04-01T11:10:51Z</StatusStartingTime>
++                  <ServiceSupplyPoints>
++                     <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint>
++                  </ServiceSupplyPoints>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP/QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">OCSP, KLASS3-SK OCSP RESPONDER (from 2006)</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIIDXTCCAkWgAwIBAgIERCKLGDANBgkqhkiG9w0BAQUFADCBjjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECxMYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMQowCAYDVQQFEwExMRIwEAYDVQQDEwlLTEFTUzMtU0swHhcNMDYwMzIzMTE0ODQwWhcNMDkwMzI3MTE0ODQwWjB9MQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czENMAsGA1UECxMET0NTUDEhMB8GA1UEAxMYS0xBU1MzLVNLIE9DU1AgUkVTUE9OREVSMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKKTI8Aex0Gva9eeeBkM3fGTiNOEvjj2McN3tOJBMAEvG/G7Npu0/2fAEKFFUv4NnPyH3MiC7s6R8PtPMhV5GBG6kWVztL/gQnlIjAbo1l654+jApIQjT3vdVZDIYyS6lKlYoAdG40CgLlVtRihargQ77azlfORkyRfhKZcSQe8tAgMBAAGjVzBVMBMGA1UdJQQMMAoGCCsGAQUFBwMJMB8GA1UdIwQYMBaAFOU/DJ1xPW+8Gb+a9G6/Cf5A652WMB0GA1UdDgQWBBQUQsudE6pYaIJSuWurylGItfy52DANBgkqhkiG9w0BAQUFAAOCAQEAV+Vu+qzrHe7HDjMHq9DdOQTz833QcMRY0huSgphMOgqNjqjPqTNpHPgNvE6HKGdQ0+VWr8IyRWcxnPMZNihmaCGMpFMpYuH0fx9nsjXDbjat8MfGuX2m1EADGOwjtjMuoYTEGEUe3MBeFkmPFDIYpeuS+I4Qv34tOsGvFOpsDkobSATq4EFw/5hI9WfWaEMYkmBXdeokoVjbNpt+gtdGKNBU42AlxLrcc+YzAE1hj5qH99/hl0X6r63pTjUb1ZMRjGQg7ELwmddms7wB5LKKi5kbfmag5hBtDKGs2s0xW1be4ylNOrT9lqUYuPn9lwcHNg1IS42mYVChV97Tlt/5vw==</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>EMAILADDRESS=pki@sk.ee, C=EE, O=AS Sertifitseerimiskeskus, OU=OCSP,CN=KLASS3-SK OCSP RESPONDER</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2006-03-23T12:48:40Z</StatusStartingTime>
++                  <ServiceSupplyPoints>
++                     <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint>
++                  </ServiceSupplyPoints>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/Certstatus/OCSP</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">OCSP, SK Proxy OCSP Responder 2008</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIIEgTCCA2mgAwIBAgIESQbcTzANBgkqhkiG9w0BAQUFADCBjjEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECxMYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMQowCAYDVQQFEwExMRIwEAYDVQQDEwlLTEFTUzMtU0swHhcNMDgxMDI4MDkzMzAzWhcNMTExMTAyMDgzMzAzWjCBlTELMAkGA1UEBhMCRUUxIjAgBgNVBAoTGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxITAfBgNVBAsTGFNlcnRpZml0c2VlcmltaXN0ZWVudXNlZDElMCMGA1UEAxMcU0sgUHJveHkgT0NTUCBSZXNwb25kZXIgMjAwODEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnquvUBkU+6dYowkCx7vTDH1S1znuqBusl2TyKI6txQ3YUCk1qXbAWdEjD2uwXy70o+7eDjtlK4opiSl1VW6lPC3qAr5utBzN9BKE7fE4KPty5tyXn7qMM9dKHjvOZrXSGHi0nlUQI6IIMGEhF8D9Ql8xiPoFiASEW5FDEQGAAXnLIQlfVfxJyj8ZByFrgSvlLISEe9e7+++DQ5V8tGof/uAYEFEs8w6wMiaZd/4LRRgqzvLAUF/4zRWdYf27SnsTxfMDyzebaK9N1T8lghTlnLs0V5X00mBnDeJosI7V1tXaAEhamAa+qXBDdygocyze0wFPbn5ZaYpUywcWLbnjKwIDAQABo4HdMIHaMA4GA1UdDwEB/wQEAwIHgDATBgNVHSUEDDAKBggrBgEFBQcDCTBoBgNVHSAEYTBfMF0GCisGAQQBzh8EAQIwTzAlBggrBgEFBQcCAjAZGhdTSyB0aW1lIHN0YW1waW5nIHBvbGljeTAmBggrBgEFBQcCARYaaHR0cDovL3d3dy5zay5lZS9hamF0ZW1wZWwwHwYDVR0jBBgwFoAU5T8MnXE9b7wZv5r0br8J/kDrnZYwHQYDVR0OBBYEFCRXW4FmpJ/GGw3/AXu5czpgogbJMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQEFBQADggEBALnuqrbcM13+ISq6lzIbwaHr6Om2zAialZcAAU0i++lqs1lLTSA/cXoRuUIcjJ54Csh9pVPt3tJ76193H57ICkeKE+YhpHKFTdD3tPtgAU0prOlwiVq7Gh5MR+sMNX2TKaWTj0qd8Vgeui4MB5uWSUWYCNlKnmgoZbV+Zt0AyBHQVG9oRbqcEfK1iPUJw/sjkDUdghUHNUTcXpXfIPWCEvhQz+BX3TRNkR4NREvAwT/tHVtweJi+mr7RPrbtvdYBjdTppFwZVZDpGC34AM6KtL+mpVeGkK73h5V/pDvQ1rmLQn2L2GJe6n9ztghE/BB5zYJ1hWACaoJh5lEm+6xNPyU=</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>EMAILADDRESS=pki@sk.ee, C=EE, O=AS Sertifitseerimiskeskus, OU=Sertifitseerimisteenused, CN=SK Proxy OCSP Responder 2008</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2008-10-28T10:33:03Z</StatusStartingTime>
++                  <ServiceSupplyPoints>
++                     <ServiceSupplyPoint>http://ocsp.sk.ee</ServiceSupplyPoint>
++                  </ServiceSupplyPoints>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">SK TIMESTAMPING AUTHORITY</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIIEDTCCAvWgAwIBAgIQJK/s6xJo0AJUF/eG7W8BWTANBgkqhkiG9w0BAQsFADB1MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMB4XDTE0MDkxNjA4NDAzOFoXDTE5MDkxNjA4NDAzOFowYzELMAkGA1UEBhMCRUUxIjAgBgNVBAoMGUFTIFNlcnRpZml0c2VlcmltaXNrZXNrdXMxDDAKBgNVBAsMA1RTQTEiMCAGA1UEAwwZU0sgVElNRVNUQU1QSU5HIEFVVEhPUklUWTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJPa/dQKemSKCNSwlMUp9YKQY6zQOfs9vgUnbzTRHCRBRdsabZYknxTI4DqQ5+JPqw8MTkDvb6nfDZGd15t4oY4tHXXoCfRrbMjJ9+DV+M7bd+vrBI8vi7DBCM59/VAjxBAuZ9P7Tsg8o8BrVqqB9c0ezlSCtFg8X0x2ET3ZBtZ49UARh/XP07I7eRk/DtSLYauxJDPzXVEZmSJCIybclox93u8F5/o8GySbD5GYMhffOJgXmul/Vz7eR0d5SxCMvJIRrP7WfiJYaUjLYqL2wjFQe/nUltcGCn2KtqGCyH7vl+Xzefea6Xjc8ebTgan2FJ0UH0mHv98lWADKuTI2fXcCAwEAAaOBqjCBpzAOBgNVHQ8BAf8EBAMCBsAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwHQYDVR0OBBYEFLGwvffmoGkWbCDlUftc9DBic1cnMB8GA1UdIwQYMBaAFBLyWj7qVhy/zQas8fElyalL1BSZMD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly93d3cuc2suZWUvcmVwb3NpdG9yeS9jcmxzL2VlY2NyY2EuY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQCopcU932wVPD6eed+sDBht4zt+kMPPFXv1pIX0RgbizaKvHWU4oHpRH8zcgo/gpotRLlLhZbHtu94pLFN6enpiyHNwevkmUyvrBWylONR1Yhwb4dLS8pBGGFR6eRdhGzoKAUF4B4dIoXOj4p26q1yYULF5ZkZHxhQFNi5uxak9tgCFlGtzXumjL5jBmtWeDTGE4YSa34pzDXjz8VAjPJ9sVuOmK2E0gyWxUTLXF9YevrWzRLzVFqw+qewBV2I4of/6miZOOT2wlA/meL7zr3hnfo7KSJQmMNUjZ6lh6RBIVvYI0t+A/fpTKiZfviz/Xn2e4PC6i57wmH5EgOOav0UK</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>C=EE, O=AS Sertifitseerimiskeskus, OU=TSA, CN=SK TIMESTAMPING AUTHORITY</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2014-09-16T08:40:38Z</StatusStartingTime>
++                  <ServiceSupplyPoints>
++                     <ServiceSupplyPoint>http://tsa.sk.ee</ServiceSupplyPoint>
++                  </ServiceSupplyPoints>
++               </ServiceInformation>
++            </TSPService>
++         </TSPServices>
++      </TrustServiceProvider>
++      <TrustServiceProvider>
++         <TSPInformation>
++            <TSPName>
++               <Name xml:lang="en">GuardTime AS</Name>
++            </TSPName>
++            <TSPTradeName>
++               <Name xml:lang="en">VATEE-101114112</Name>
++               <Name xml:lang="en">GuardTime AS</Name>
++               <Name xml:lang="en">Guardtime</Name>
++            </TSPTradeName>
++            <TSPAddress>
++               <PostalAddresses>
++                  <PostalAddress xml:lang="en">
++                     <StreetAddress>Tammsaare tee 60</StreetAddress>
++                     <Locality>Tallinn</Locality>
++                     <PostalCode>11316</PostalCode>
++                     <CountryName>EE</CountryName>
++                  </PostalAddress>
++               </PostalAddresses>
++               <ElectronicAddress>
++                  <URI xml:lang="en">mailto:info@guardtime.com </URI>
++                  <URI xml:lang="en">http://www.guardtime.com</URI>
++               </ElectronicAddress>
++            </TSPAddress>
++            <TSPInformationURI>
++               <URI xml:lang="en">http://www.guardtime.com/policies/</URI>
++               <URI xml:lang="en">http://sr.riik.ee/en/registry/legal-framework.html</URI>
++               <URI xml:lang="et">http://sr.riik.ee/et/register/oigusaktid.html</URI>
++            </TSPInformationURI>
++         </TSPInformation>
++         <TSPServices>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">TSA0</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQELBQAwJjENMAsGA1UEAxMEVFNBMDEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTExMDQyOTA5MTUxNVoXDTEyMDUyOTA5MTUxNVowJjENMAsGA1UEAxMEVFNBMDEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2WKqpwAceqQ1DNnsIvmj7AsSFgFR4g0U3ot8aLmIVT3cJ0rVN8PaQ4zuCIGf0xTM6mp1nQRqvtEScYkijZ9lSW44KDs4P71rC/8MYuX0NL/AwDlevmjCEkvHvqCQw7SAJ5gFkObc6FGjMcOzzVDTLc/0g9txSaFy6A2kTQYWY2a7DhqRDVBJphGhW8ir28DmH+AGRxj5I3vs6V8W/x1xy90yWunh8b/DNbS+29YKQ04phwPl0Ks59qvsgm1wPppix0xf/mp9HGC574q0zq2Ee7v4PAhu2FwY2t6Hj887KTWeVDUaRsVtwKqqDWJdmJBG/Pa96H/k9v1t5Lln8NlxHQIDAMm9MA0GCSqGSIb3DQEBCwUAA4IBAQBit30I5IzoldRcKYbWRLPrii5nNcmdLFfOVbjjfh/BcQV4G9cIaNtimuaw75Kq0eVuMaD1GBzn3gNSA7UFpCURt5xtEt/TNdO4ht+SLkVuFeW7AgRSlsJ/M1LiNrQei7qkPRTYrJwT4TGFbycy6oQVkHsFx0WSntG1TECDxNfutS4oKJQVp9pCwt99CVpt2M1sniIRFIsCgeYgwP6EqB0fwHpAZGZeX42VMmvLUFdkuijBgW8phGP5yxDWGWHkY/l+XDTZB2SlBbYcgDpQuS1k0lhGRZScIDSUr4g2ig1LBrbPlMakNXg/EWh74KkDeDDE8NSZFnh/cr2azvcXqt1G</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>O=GuardTime AS, CN=TSA0</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2011-04-29T12:15:15Z</StatusStartingTime>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">TSA1</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQELBQAwJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTExMDQyOTExMDMzOFoXDTEyMDUyOTExMDMzOFowJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3IeYUjkf9LPKTkMUrjeOofT57NjJd+5WUmrsTRDGJsW6CWN/rM405B4EbXdrxeKR5TXqvTc8uKB8vb7QdQTBYAEiy8y49jL0wApQ40B2wnAj7kpyeWHwvMLwqeVyAxFxcR+gytsUxdRXl601g7GvwlXpCqi8Alj4vKykx99SBgsrya0CnR63v+Rgwv+0tc3A24b5SiE395Dzh1R9N1pgXWYNOPqn98A1cYWGA0bwayHzpcqw+e4YcR6qQ1gykULsPNlnIGCkakiOshblezzB1WrSziT6lNAjNSev+M7Uo4j6bCB3sFRrv1NXJWM7AqLxn+zC1xVqihB+N9m0YmNkjQIDAPHnMA0GCSqGSIb3DQEBCwUAA4IBAQDUXshmA1Kx+fPyMrbQkOim5FrSoTuLw4Jaxhhcw5wQLTnI0H25IwciqGisi7ou4fYffaQISbLfbXEpGG2aaZ9DPGGeG//5NPvtLoxLYw3igmaCYi4QEQ+O8Q5bH/YgxJWIZha8qtDXYjBVq7giX+1Kkb4O87BcBm9yGWXnDbu/Cbjvv+lnbhLff3N9AGlhEVZW4y/WNgd4RjRANYuKHLsNdBBT2jnxTirGzHRbcQ3QwxJUcTO+z8f/WUJfq6b/VayReUnWrrmYG6btzU2iwUUusb+eZ2uvNNAjuIJS+ngc8g9FLlty5ZcTR+SadzU1H36mdCE1uGHVDl3L07SlHNja</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>O=GuardTime AS, CN=TSA1</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2011-04-29T14:03:38Z</StatusStartingTime>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">TSA1</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQELBQAwJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTEwMDQwOTA5MzMzNFoXDTExMDUwOTA5MzMzNFowJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx77CtLsrKHF3SswUv5uBEilPF3hJS6J+W54dKIFj4fE0xkxl7J7yMlDMf3Gk2tunTpZolsOKDPCbsl/9SsV8dY7y+yCT7bRT467yfi2zqTrFybHjXduYGSlvagNpYVw260he6gVH27D/IdpQv2eWOOScGAWcBOZTr6pZxEuX7b24luq7sSci8hv4ARpJamWBTLQX6sdxfiPhjnyMIacEGOQuEQgUjPKxAxo45ApwSHWESD7lAm2PQNacSZJg8+pkxrOq0s/7FrsgfJzQxlDhyF9BA7u28ilsCL60WdVbxqshmQBp91yyuX3ZHAkJ8Wp0kT8EwVfVnLutFWxzXp/4gwIDAOHjMA0GCSqGSIb3DQEBCwUAA4IBAQAAYwPUlEPIzB88xdz9WTaC8/QNF/DbfYOYKOD5439rGPhWjJ0YBe6SliohQf3lK0tfBrnaCj+Nw8EwzJ7fUD6+9xJ4FLSSQPSsH3pxZliAdiLXKWXUNou6jiPTh9gSDBkkjHvWCMhHj7GNDdIEABbwfqsSlejzNsQZGUVu9Z7vP0+flTGvqC3qIJqschhpQWZqaD4YR73K06H+JEFn6vnGQ6UVsWM/KDaktvLStQui/OwIqK8kyEm2cpCQOdkVPJZ7vTcGDgonWvbwaxf78xPJUqHSNkuWIHveV6dFlS949v1eJYEwvcsv6DyVD6UI8A2efjnQmjA4KbXucmWzm0KY</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>O=GuardTime AS, CN=TSA1</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2010-04-09T12:33:34Z</StatusStartingTime>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">TSA2</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQELBQAwJjENMAsGA1UEAxMEVFNBMjEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTEwMDQxMjA3NTIyOVoXDTExMDUxMjA3NTIyOVowJjENMAsGA1UEAxMEVFNBMjEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp430lCKJvdyzzdK95iX4IlSE3MyVDkiPcQWKdvM/O0K/skXMKxK9308G01VVPz4Q0Fe/zm9Hd/b0tF6lNehGpi+CUfS13eq32JZvfyI7UsGNZCiU0nnkuGUUfLCXqlEMVsqfxXu9RAhwaJE3Zw0GZLc4jSF9xJy1HRSSryUkgp09pOl/PP5l0IgBeUESM0U3ALPvS5xjgMpYJAOshZCIS+rsyO1Cp83ymVNyGAw2jUCgjHGHu/l+wbTw8b6C2pUnqcUacaemjctKhtf6hNs+5+uTPBW2q9oA8k2c0SQii7+V04H8L8rvSdLaeVuNDgjEjzqPIJV7oS62APrWlWOf3wIDAKlzMA0GCSqGSIb3DQEBCwUAA4IBAQCCHTCmS6YOLlnhSEMpOq6F6ZUPq7B4BIEVJPlZOkrPuGRnwXY3CP1CM01mM2FcNc7OMYwEVyJNt11Aj12kB2yoCGCqABdYij78P2n4MzQykakymH/IQhTiP6rZ1glB1stye5yboAvezm5Cor9IbdGSf9QEv7DPGYqqyEwDAqCIhIgyKWBDTixcKkRFlP7hvDWCzYaDaCzaxcxN0Cjv0KTMoTDzK97IZJ2+qrBcgP/9AEsZIfPOlvzObbrRpnmwowwgNvYT3p3il7irrIwHryQh8H1kU4AwxmHtuMDcVKvQQrxpCQuEITPlBlelY2MdXKRoCcu4q//X5lq9YYP1XIjH</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>O=GuardTime AS, CN=TSA2</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2010-04-12T10:52:29Z</StatusStartingTime>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">TSA1</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQELBQAwJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTEyMDUwMzA4NDEwM1oXDTEzMDYwMzA4NDEwM1owJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0AjnC81sjs87Vv9e8XDGWcKaj7kJTxuaeWpC+WULglfyU2YSawqwb1PZbM9AT0Oi4Dz44tCG1o0Kcaeik+vWFe7AU3GSSC9K4Y3+jrhKZEOhySn1yI1DMdnl+Iv844R/IqS+XEKvP0c2LLnT0Bnmz6l8GIUh2c9MJWXIXfNyfgymldyT3ssw/RabL/IksTdqMsa9B7ar81vtmEG2rzsUjCl6I8U6N7Etv3hseALX/mcdWplpWn8uxAGUl8KqskF1itQ04BOU3P6Qk0WsLFBNCeQ2Rj+HcHPEdxtkT1eM0IbmOT71FuS7YZjC5fqza+CoiSPKBMJioU+28KG1qOFC1QIDAOwjMA0GCSqGSIb3DQEBCwUAA4IBAQBftgbUf5jzWS5EwcLmi7OgQ4ejPme6ZO5M+SX4OJh8cTViXOpqrF6JmIaFl7auqTKa4KNtgWmeGzjaqD3U9WamJ2aU3xmtf+t9rHWns9dBE+JRVdwNIjvOyEt+foSCENaFxtPRDqpaphx/fYC+jdCdNh+JHuKxqf1tW9ktBFNxG7qxmSeBa4eC+RosAXtt0gbmHBVMOQJOApGKIlQzruJ3c5YrCRzza/+D9jSkyp196VO+aYmt2epLMTK5CvJlgIjvF/vyuJuEXAnqd1Si6qUbfLxchWHgJ/dxUf7DxeqpPzJ8s+V0CD0fXYTIHa3p9Kz7/gLqpZMcuY8OH0nVnYOn</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>O=GuardTime AS, CN=TSA1</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2012-05-28T07:45:00Z</StatusStartingTime>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">TSA2</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQELBQAwJjENMAsGA1UEAxMEVFNBMjEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTEyMDUwMjEyMTM1M1oXDTEzMDYwMjEyMTM1M1owJjENMAsGA1UEAxMEVFNBMjEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuWgbOYOThEhCRi61lnP3GSdD+V4sjuQCehCt9MJ+yyFvrEcJewvGhMaCBq7mUJul0yV5pCNoSH7gLDaO8XByJ4acmV8DxKAH1KlLSH/tashAjxQLMbReolA9c/qKiwO1oK12z5OCN7rA9C7PBO8gk/sCLFacOwgYtDCz7faY5l94AEaniIA62hT3PZ7Sd0IkcL5Gp9goJ2tZdQ+G58GBZawF+pfS2dzWSkKxWiV/lMzZahRdaXUF7vCGsXDsVHqS3AhL7ZblGCRVX0Thg+RCyRBqE12iPea8HWcVMxSJFHLhvSvKHTpj3iA6WVIOCJGUlhcz7h373WCKtgwGx7U+tQIDAMRFMA0GCSqGSIb3DQEBCwUAA4IBAQC4F/SnPubK6gaCyw5/7+sMTMILecuEGZ3W3ScAWLY4KP04pS7ViqlJxCvH3brl52dc9gUG0h602hRlEhdcXpk96tcd108er0mv666mGp97CT92vIL2E46mnz6QUG8uWyNfs+7K5SCgfkAflU7+lypM0NjOLXfDgCDRK2x3S7EAJh1mlqYSRHL9mst1sBLxjUMzi2xzOEGh5SaijIb0xelm2bp2J3JZrCvyjvGGA+95xRwHrGL9sMFdksrY6u66gG9zea8qurkSzRYBv0OGNUHwQWpw95QPZ47IITq9ipqC+J67FIEZheHTUtgPfvx1ch19IS8GiSM72M6rAeS8Kq19</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>O=GuardTime AS, CN=TSA2</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2012-05-28T07:45:00Z</StatusStartingTime>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">TSA1</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQELBQAwJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTEyMTAxOTE3MzE0M1oXDTEzMTAxOTE3MzE0M1owJjENMAsGA1UEAxMEVFNBMTEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+OA6jsb8QE/mLd3RPZFW40+l9RiGhpVWtaPSNgJAu1emrld4SFmLpOWM5BPsK6tVj2waLNucmEuRtG3r6H91E7EEgjsiBDxJaaREHytXMgpatMkt26X6Cg73Eb0pvD+5eBIh6VpksIWHtRrtq6ahde2wpb9CUmF8nb9IjfJqEsd3L9+EfsF4/EppRzOs4GDzKG+NGmBz95IEMGiIf0yh9Ot05b0Wj4xdOT7sJONbF0lC5qpQiPoXMKeLzsWWj6RfctjjhJZ9s2xEyLfwM89Yb4/vdwVVaa9Rk36ZkCvuoJeP1e+FKDXAJmNRGp2knEC1lQBZvXLG027bKmDdU0+WGwIDAKKPMA0GCSqGSIb3DQEBCwUAA4IBAQCR63M7Z45TV0MW2eA1bYO1vmRSryLbBK7fC4+2T8BqCXC8PYVxRtdMrQMdLUvXolibDY8bUDIC3GI4LLMDu1ivVcAcRJOCO4ii5KHxmK+mlmInif8v7YTZIlXAqPxbxJlYmpRNaEHFcDS7fciYzvohPzpbxRCKb4Nu9rfA0YqJv2s0vZmkZPTQ7W1vwHQw/+7KeRL3v/oY6/ANP0eKcNURwdhV3es2kya3RyEXH6sJuv3iUGOIPTAp5h8T7RV0xjlDxnz6BcRMSxxpFhyaUJHaA8ELKQXqHx1jjz0Ycri/AdIM21F3wc5Uq6855rm1STGythhxYFkrgx/dgLU7JeXc</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>O=GuardTime AS, CN=TSA1</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2012-10-19T16:31:00Z</StatusStartingTime>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">TSA2</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIICwDCCAagCAQEwDQYJKoZIhvcNAQEFBQAwJjENMAsGA1UEAxMEVFNBMjEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMB4XDTEzMDUxNTEyNDA1MVoXDTE0MDUxNTEyNDA1MVowJjENMAsGA1UEAxMEVFNBMjEVMBMGA1UEChMMR3VhcmRUaW1lIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmbkBqCyj5DTDvCRFqy9AubKiWtz1NczYGFG4Uu1YrtNpY7hOrutp2SxjBZGMwcXDXdzIceE28FCvuPjhTF1MsSmWA3wRqEFfdoKtwJ3hYM4N8NKB8GHgDKRYKw5nY++1anjt+KoxhpZsRbaAvPZSkbONr6trgSe9DUXE1WJ632LAvC0PGdd4LnUERxnernnhs5N/mQwv4BJmMPHcZ2lpiMfBCgJ2/v7r9UbodVRkGr/EHMzp9RdehneT3IQpMDV+7oL1niOyXi6KVdlbqaLzmL8QTpQuopfhaA6uKaAegWkkEaYOo50BK3xYKZjCUHwL+yH6Sw7ddgGNtBId7vtdpwIDALyRMA0GCSqGSIb3DQEBBQUAA4IBAQAjlFih75+4WvKgcTr7CHVgftiGLaSCa93uq57kmebap1raFqigOkCYpqg3Jx5DDhdGcx93VjdqTt6qC8IAvx2VJAywQXOisTtIrfiXK5hXUJMWlXzqT6q6Kv1q3Ac8603QySfStmVg5vehW504bg2UnjjL2oY0+X9e/D8nQRpeI8zVNAYYk2elAr3nNDrcR/kRtEfughvlK2F4fS5R4UrNO2P7xTaiNdQwRuq3CJZEkA2HjPRXE3kiJoL80p7aWU6DKOOHZr6VQjcOHJiK5T/ZUHeOT10tM3BCPHzmmHAs1ziMkFFfItOmAXooOXBsw8L3cOX5BiopaTnMzMw7Pwfo</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>O=GuardTime AS, CN=TSA2</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2013-05-15T11:40:51Z</StatusStartingTime>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">H1</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDExEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xMjExMjYxMjI1MDhaFw0xNDEyMjYxMjI1MDhaMCExCzAJBgNVBAMTAkgxMRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6jdPpv5oA0BNHcFTVZpB8CEjGZvWix4KWgbAVbJiQaiLx2TgmRrimtAi7ogQ2qWPpJJbxgnKQUvpL/913tMH1blL2PXYk2fR6xU/jF3DoBvQBA7TrX39OlcTn+GO/noh9/hz3/a5ebyp452AyFow/g7IzvECf/kT8G+OcIj4aWK/M7qbmrj98eB/j6t5kuBF26llyLzExJr4iJOTSuCaR7BT3yWuLC3rAUtXJaG0XiQxkmTd6Ibt5GK8pSBtsQfKeJv9iTUS6I093rqZ8dSiP9/k2satrk9/hy464niGyXiKWfiEwWBeEe6okg7FwtZZ7ZHL42IATqLBRmbI9qvbXAgMBc7MwDQYJKoZIhvcNAQELBQADggEBAEbHvn6BZArTuTDE+opwN0NZ6FdtQ102tR1qWMcNGgKKICc1dvQpTCsUD5X4RL26pE0aNy9lB6HFa2vNlS4ZOz7LAbxKWn9DwSTHZVCBmDz7cThAop6YaVd+f2cYk6aP4FnIWr0dfSTTqxIWyFURip5TLC4vgu2FvJRuQU3LTBcpdbi5WwVSxxgS5VCzpEc5qUC7kZFGBV/aze6CAxUoE2nWrK3udj/8RUOSpUyaeF+f4oEAkR/xMKvd1xuWjl09rRyOD71h7WhfmNAJDHYZVRVthl6XBJbv+DMOkjpltfeFUHyvZm9eXEZnUh+KS8VpJ4O62VA+rNwV6e2QgaaVu7M=</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>O=Guardtime, CN=H1</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2012-11-26T12:25:08Z</StatusStartingTime>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">H2</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDIxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xMjExMjYxMjQwNDZaFw0xNDEyMjYxMjQwNDZaMCExCzAJBgNVBAMTAkgyMRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGUFzXDI8KWQj8/UcZLf1BecHHG3+YYoA3FwfZfdNjlbRepRdwypQx8p0RNbvcZC5eP7TnOLz8tCA95jBclLXOOMEKLeIdbcEuERrVNNZ6MplCsLBfxf0rSZzPcgjUA8vnREZj+rLqYkUwt6P2qt3uwCT/Ymm6D25UG373TX/058+7+8YlftspEowUPZt1E23ZzpTrObervZSiqvy4V1+efOPQZq0B/h71hkmw0+/zuWJ9vjTUhS3sde86AqDf8s3q6G1FbVEH9ilnJ8XZipam95fZx+kRCeBQ/Yitw+lYeLcGFQKOJ0uZuqMo3HnFcJfNkd27uA1Ymi938SVOCypfAgMBbiswDQYJKoZIhvcNAQELBQADggEBAHR1TVGVIuBLeTtrflzXP4bnsczEudLu36D0dTKcwTvBeGB4YEnaBp69vKT2/boNbdeZ0Pm6ft7PQYRzQg5v8NVlqmYwq8pAxNhrywGOICOynoW7mnRbooDKVQ25Ct4vdJwdf/pcrJ0l9F1WX3MZ5rNgKTPW6sXrMReXojfFf/2YwAvdwPhATjtRvnXYhkkN0aeXvkgPiPMctEP0lEiZelwWm+DjVFHOy8l1d4+38rvh25tuChxxcl/p45/H7xpAndHO1qpKEu9DJy6q5eWBcNgvHVf7UTXSDtIuRCOcS6g0Q2yz72sdW1Z/m1W/67ToYjofQwvhc14CrhQkD05pRAA=</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>O=Guardtime, CN=H2</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2012-11-26T12:40:46Z</StatusStartingTime>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">H3</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDMxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xMjExMjYxMzAwMTZaFw0xNDEyMjYxMzAwMTZaMCExCzAJBgNVBAMTAkgzMRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVkmSzH2Au23FOAGkCMTdCZUoHCcOHV7EPqVxFmwea01gS0nDfAjzFUcudvgYRtaw6r6r4ZPLC+pqBI0W7FjeVpRQAuKypYGhie2IEd2FAQLDB4gnJl68Z7K9B+Njc8rvwKbrqix+N3ReqFz9IENbwtGrXj90SMFBoCofkmUCe+fy5H/YYjhud7wnZUhYPw7DsYU+5eqAh9dNXNSD4gxOLDoZgID49G953fS2pkgdZKIWpZl+/hftiTDLD92NB0HYwoqEJZZGSM+RUKMxPeRiHz6goGcqoXp/WjeXyd5uiP4TQX8KsvAQQDTBrBs8DFbFlL7MOEzM+vvV2PdFdU0bRAgMBDskwDQYJKoZIhvcNAQELBQADggEBAL/Invma9hUUj7tcZAKKNlZm2bktd6jguW+eFUbf7m1zfSLw3sq85mwFkl8hSDlV/d4pasJJCd8KmGLki5T9BM/TAjvzf1g2orBGMArhZkYNnYkuJTHcxetLFqtyBxdMKGiObmhfTI1YNAckomnvsausJ8ejsKKFxFTcWQ1TOeL3v3N/sZ/c/pwVd80ZbTIo/k/dFwbRVkhuj3Q+DDi/8tlcGXSAppBVX+uFqDGudu3TZ8XQY7VX7ZSH/2rIO5SZm0CbgAOFYQitDLKLIXEBS6R4W4n559L+dXIaStAR3U8Jmx8WXWMSsa1FJVynyiVLUMMw07mVgQGUs2IK81ghXsY=</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>O=Guardtime, CN=H3</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2012-11-26T13:00:16Z</StatusStartingTime>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">H4</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDQxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xMjExMjYxMzA3NDdaFw0xNDEyMjYxMzA3NDdaMCExCzAJBgNVBAMTAkg0MRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNVtvh71sZgFYcsv6a/zRU3/iby6KWNztiEjzuLl2oaqsUEVHq4kpAAj6/Hl+UPpIEwPEckB6rpGRgeN/+K+4bWJTrxh/7S/k3sQiHozTAYIOf6TIC4xAK5rjkfRyJNWZMbKU5ShXGC+DMh5sn5ZLtxOLshP4bVjCDrKUb+bNJCxYE/UT4N3bSPj3j45CgYnwqANWu2MFYcuuwSI6M+BiLWRA9HNLwHF3nVibCCJtyo17gN4oa236h61/+hehqICa9xePBBRh9gao35dtFNOEUgEN+qjqXGkUBrcFst6SG0nGh67AGJcQeku3QKU8Z81qocY9NhUKeXordC1C/XPsfAgMBWGEwDQYJKoZIhvcNAQELBQADggEBAGAdaaN8Zy/BWVBH+hLT+LXFJLKmFxaqRKRiyPtuerCRHmKjlHw8JqlVjB1UDUy4BN1LL04k6iwcpZX/ahuvlG0cwrdfi2/ld++ngyMQ8ecFEvjvli5u9kqiWSFxwDtA7fU5rsTm+Qni5hklPA60VMQHkuylx5oHejoyvPoBEft/tQnQ3QL+re7Cs06in8hkBtWndYK9jyot7G99wWfR5TEYzYQkze1L0oTjmySW/+EkrsT66XmRWHQuYLgo5tL5D+oO6H2tfeiKQ5PO0+zDLwQJJYjvvITCVKudR7/sH1v6/B4nXuvch82gaAzlfHK3EP6TQ7CBC3cw+uZ7qkggdIY=</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>O=Guardtime, CN=H4</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2012-11-26T13:07:47Z</StatusStartingTime>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">H5</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDUxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xMjExMjYxMjUzMjJaFw0xNDEyMjYxMjUzMjJaMCExCzAJBgNVBAMTAkg1MRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzNmmpHjZG/rb8xYUBH5TgSkSE9tkVl+JgtkeokY0BLZvrJhM9TZ/XX3AbN5aagJWnMgxPDBCyTYcA7XzsW6lRlQK7gym+zbLi9bmLEcpQzEYdeQs4Bi39Hb4vtlHYOFQjdck5H0CCaiLoJVJxX4b5y1dczJjXN5n7pkBl/YXXuIt4h/41bdZKw25j/KxEGWU/CmlZdrrDPzYW85aYk++dbO+uKspRkkIQZV+impSUpbwjOoN0VjfrmbJ7s+iyvB94j6qvvSTl537uFY6TOK//W3O4OrtEd8ze3aiePC517yTM8IQaUOrNy/pojan7FkhvLcVi1duQILuAcDu7gaQjAgMBMMcwDQYJKoZIhvcNAQELBQADggEBADndrk/PCTqGVmbrtjFWmYIjLyFgbUihSoHHf2+kw66Mzi77LFkDc+CYSz5M1pIjsXQe+a+Kkrvpc9YKkvxnT81ttiSduRujCNw2ISrYfFVP91Hzxh6hl2mnRSF6LOLsNbZCaSJjkH4JPuFdnY7wUiozKFmt/6T/5qu4B7osH5o+sLuCJKcgk0fXgssx41JM+ZUWf5JhS/QUUaPiW18s4SOZmNmO5w1IYVVG70bUOXsoGsVmrBNuuQeikPPdE30OAf+4ODB82rudUZok/ZrSW69p+eiAbkLKqlVfd1Lx05xeLf/EBgIvlSXRUECHV2LDmTbwJq1wDjHh5NHN7Z8I22I=</X509Certificate>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509SubjectName>O=Guardtime, CN=H5</X509SubjectName>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2012-11-26T12:53:22Z</StatusStartingTime>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">H1</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509SubjectName>O=Guardtime,CN=H1</X509SubjectName>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDExEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xNDEyMDkwODQ1NDNaFw0xNzAxMDkwODQ1NDNaMCExCzAJBgNVBAMTAkgxMRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLKt3SYJHx+Y0zQypj433j9k23BtR7VxLy+FDL54GkqmAiCmaknWz/nRy19FM+kDfciM92OySnneN+nOyykfoblJ0uL2CIhN5vYITV9QvHxNNsij0urOiWu5eXui6N6T+lZPOl938EmNeorJbgzG7FeDJid5W4kRBE9apiRBPp3YFehl0crycBgLY6kHlvvoH33AgwsW9Zbp2B7jWU92GdH1D3aBw5JwhEhSI01sqjcI7Odbh7PZaygsXpoVRyW1T5PzDDR1+qoWHoak/oN9J0NXMEAVyswpytQ0rckOIbnXhfA7va2WLQ8+GuIm7wKwquS2wtqgBPbyvO7rP4L/AfAgMB4EEwDQYJKoZIhvcNAQELBQADggEBAI52GHcEe75qB8Sps07G3TVA+XXh+PGFZYSMrH5bsn1uJvaDNDb1fl1dQCK+YibtoxzVM0pdyBVlHFWsex1wTpdmstsmZYP8Xaj9ezabN6nPSCz6pdzhFUKM2XG0kuny6JLAFuNjqsh13SxsATARL6yZv7L2PI5VclXHbcpRhNaqiTeTKxLfXqfTgSX1f1RGNJI/r4SoiTBT+PFJ2TcJfc5GTuRunaTeGVIe+QGIrv0fWXAlZylGTFszgq2e2hh/1i9KFlxD7gS1IPvSRrxHVWdTEjM9BHSjMd/y6L6jQ9Ti9qW+UYz2CRo8sOYgfB7axA1mVmv/W60TQr2pkCl7GDM=</X509Certificate>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2014-12-09T09:45:43Z</StatusStartingTime>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">H2</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509SubjectName>O=Guardtime,CN=H2</X509SubjectName>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDIxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xNDEyMDMxMjIwMDZaFw0xNzAxMDMxMjIwMDZaMCExCzAJBgNVBAMTAkgyMRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8ojFnaqso7obLfS6sDn8Mj22s/ZcmY2NbwfGy12xX+1FpEjgwrwea8Uq6YS55Mvux/oRcBh2UsgFxnn0IlzSLgrmRx0t42PVuufygcXVGy+voYjxsOJUkP8uFqdv+QhLPUHTyVzMKHIYvVEa434dHKiSK2nwWkpFVqEQ2hITU/uSv3ZAX64F+7iJuIlraefdZ0QC6ucdOsxAFwC3FEH+HfPpV2rb6nhsBu8hxIGWOqDHoCcd3y0H2+7n/BE1pmOCkuT0j1tKU2NwUrEvWfRna2xyx+zNff9PmcNRrlT0yytr4ghCuQJbcGpA7+EGf5jGKfGjL1xL6GXwnb3W23SPDAgMBHWMwDQYJKoZIhvcNAQELBQADggEBALxmxs0QzRhDIlCmedBngmOGYIBd9sJ3TtWXak+4cJemPttrKPetWlDnSHyW2leuO6neIUtvKSXVETrIqbX0Y2bn37qPseBu3284qWLi2fAYhhOKfz2PEuUmck0+p3wKH6iDgsXgjmQuu6wO9m1+Y8qB/K+mSwi8gpxjBU38aPCgQrPZnIAbBPpju2NBb241ep+aOlonKQRO+KcsPMwYzLt0xEmkjopq4dRl0i+Nl/m3EVc1JCIslvSD37tUBQIbEpvv7OrXbv37xvY9Cr4JRWrrjrRO6n1d2NSxdagHjwobdBgPCQXGqroMxUNL0EprVmlbRNvWkxmj4wd6PYKfnaQ=</X509Certificate>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2014-12-03T13:20:06Z</StatusStartingTime>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">H3</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509SubjectName>O=Guardtime,CN=H3</X509SubjectName>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDMxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xNDEyMDQwOTI4MTFaFw0xNzAxMDQwOTI4MTFaMCExCzAJBgNVBAMTAkgzMRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC15sVKLBcJ6NRMFmMZxyBy/kKCcBr8zwozbZ+3cyuKeRk8s2+9IEH0xklpE9MxCmDaW65rpk24aX01A9LvYaM/Jn8bzE9H955wuRTWZbUpW22iljLxjq3x6bM2mwMB/BRkWPK/0BZ8mO1XOXFGh6eRD5OqLXDen3AXno3LgxpibK7jHekfX1aT2G35c2zDcZmif86bQiFSxPxI/xJXiJcswX3Xl1CoEdoyiOhyYIl1756QKzNL/yzXy4W7Fczk5gjax+ke9snndPg/ZnPzKLHJowNyPzobhG0R7W7eG/S7BpxMTEG3alA3BZvV2gmVDw8Bp8t6mNNtxgbWL6fqKQdrAgMBb5cwDQYJKoZIhvcNAQELBQADggEBACyCZSs4DiVR9FvRRUCeXAU4zpvlO2+nlAqL/SnK657aHNbnnQKqtBdoW4N/Gf6Pxz27B7PB1c1p1qgmKzvVewKfwh+37XoCIxqenoLzwALGN0wPne3dVB1Jf8DMEMtECB5ktZMd/BI8fgc6VlYBDnDXa+qu13hbTHYuWV0dIokseNOoNU9twcABn14E0AsEwfalZpXps9LQgjVx609pZwDFRQo3igzY4qKxpivUD0xyrjjsh5UebldLj2K7gtFubrenuQuRerVFIJ82VmNsAdFFzyVsCXdUdULO+wxcnIjCUlAY2l8CEM70z/UXmuCCqnoqPmmXk/oEIdqPLZQqR3c=</X509Certificate>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2014-12-04T10:28:11Z</StatusStartingTime>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">H4</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509SubjectName>O=Guardtime,CN=H4</X509SubjectName>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDQxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xNDEyMDUwOTQwMzVaFw0xNzAxMDUwOTQwMzVaMCExCzAJBgNVBAMTAkg0MRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgdoH5rbrx9r/CkW7gdHjEGtJlVYP9/sF26W0yMVvyEApwXJk9ccM5FNeJlnHO94DQ4jQIYGU8MnFu0Xs8FlrRI47vPikjsdI/HfGW8zQFvPq/CGR2JWtoTW/OS3TLlhuKsgZ4ynsIZs7VrU9H1bk/OyAgtvK3sbdyELF6JYIy0t2mN5kXHPgFYs3PCifQteLEDsYLdxKKtwnEpR8Vyptw/9iNHPsvnqwpa/U5UL0Q/0dF4fxpYNwVdgTKL5bpjaI6I2NmYBdhI8L9aTdEXsP+kSA/+pB5iqNGZ9vlrfweRLsqb8fIILjgIheJwgOKMMTdfIsxfN8nJPr6ICAjd37DAgMBmHswDQYJKoZIhvcNAQELBQADggEBAHh80N8rHNR29mMguKbYl5b6Enhls0VWx/F3oDe+gfZ3p+ASXHPqZG8+e0BwDZh0QykZ3g8etSBL4yOEUi5PEhilECuny++NqFItHheyUXFFJih5qCqP8w+qiseVignIlRH/oumNXMt0HZUeWvh0G43Nc/6OdW2g2OtjUKjQ3WtbNP9Znx+okruUAzOrWpYN0V5PqE5FXrrsslykYb6ou3xThvmkowHddyl3x/koUd1nfra5YUAY9hzfFfUC8SdRg805OSy+EwI+dE006j91dR1EyNKZhqEg1Q5Wb2BGGRXbAYDOGeuX6NE9X+V2gKqD+kauxfz+t2f6lzWEueaexo8=</X509Certificate>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2014-12-05T10:40:35Z</StatusStartingTime>
++               </ServiceInformation>
++            </TSPService>
++            <TSPService>
++               <ServiceInformation>
++                  <ServiceTypeIdentifier>http://uri.etsi.org/TrstSvc/Svctype/TSA/TSS-QC</ServiceTypeIdentifier>
++                  <ServiceName>
++                     <Name xml:lang="en">H5</Name>
++                  </ServiceName>
++                  <ServiceDigitalIdentity>
++                     <DigitalId>
++                        <X509SubjectName>O=Guardtime,CN=H5</X509SubjectName>
++                     </DigitalId>
++                     <DigitalId>
++                        <X509Certificate>MIICtjCCAZ4CAQEwDQYJKoZIhvcNAQELBQAwITELMAkGA1UEAxMCSDUxEjAQBgNVBAoTCUd1YXJkdGltZTAeFw0xNDEyMDgwOTAzNDdaFw0xNzAxMDgwOTAzNDdaMCExCzAJBgNVBAMTAkg1MRIwEAYDVQQKEwlHdWFyZHRpbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC60wohNDbrmyAL/7WupGYRFg8sBizryJup1HDV/YJvhVAo7jt63nrzuxqnADeqlzeek2GuYugh5LbYRR8EeBtxE3ssIablc5TLKPZj1hzJ+Tsw39BrbYebQUwusxU+BUclQ9TpxgSAM6eXa5w2pi9o8eiHVMxzXQ5c5BE0XGSSH4IRRoej/xnealXgxNIFvEm14sFvkAg04WQQwD9ZTmWMY80WHeYDFr+v7N520r19GMyTc8YoR8DfWI0lLBYrcG1yDXu6gZlaLD+Xrb633Qn7WRgWD0ejCh9taWbEDBwoc6aM8yZDLfBsExYQSn8RMCcVXZjDZv5k7+IQaozgj0q7AgMBarkwDQYJKoZIhvcNAQELBQADggEBALnzytGvxyDEf8fDaErxIVaZpUcZrWSifiBc3jK3h3PvFTuaY98DT9keY2X1vM9mSeMBusRdMbIkFROA6+uUUNEXlp7lQEoZ9/N1H4vCGscvZWBOua668qw2PrUCQoD5pP1SDH/0JpK4wX+Xk8bdi+Q6cHu2p606r4PBtJVv2oR5y+LaghTC10pT+4+EQ8rDPmseiatvSa9dJdz3RM/bIR+Ki9OO5nBYpPBQJuvDTJ1rfWSfr7JD0ejDOVeG9OfN0j26L/sChV5uZxRMs/mvIlRibHqXU0+oeOGCCsZGb6YN27nLFh5TUdqtGRbJuu3f/8tYNLa7Gb/iI6afpO8nRXc=</X509Certificate>
++                     </DigitalId>
++                  </ServiceDigitalIdentity>
++                  <ServiceStatus>http://uri.etsi.org/TrstSvc/TrustedList/Svcstatus/undersupervision</ServiceStatus>
++                  <StatusStartingTime>2014-12-08T10:03:47Z</StatusStartingTime>
++               </ServiceInformation>
++            </TSPService>
++         </TSPServices>
++      </TrustServiceProvider>
++   </TrustServiceProviderList>
++<ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#" Id="id-f7685ea087cbe6b4462ba71954a2a9a3"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><ds:Reference Id="xml_ref_id" Type="" URI=""><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><ds:DigestValue>j+9gYt6p5wepZ2D+v4UMpi2ngnyACS2Xw7Mdl/UldVg=</ds:DigestValue></ds:Reference><ds:Reference Type="http://uri.etsi.org/01903#SignedProperties" URI="#xades-id-f7685ea087cbe6b4462ba71954a2a9a3"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><ds:DigestValue>h/24vkRG/BCBuEIS+6inHtgAurioFNbkO2EkycN9uEQ=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue Id="value-id-f7685ea087cbe6b4462ba71954a2a9a3">XYUUi+Ch9gcfrz0DfsifdcB6IDBCFicSO3ww2e8ssGy91XzQLuKfwC77ROHl6oApuPxYYeUkXUXZ15Im/kq6GjYcqrQJ0ZLoHpaxTgx2ztLwPAA4McdXNt1QoNSr5EBUxlk8sYkKh142PZWZ4kAxDyAfDlE0jnhUvGRekbUEoX/00BLCmX+KhTPcTIoj/OEhLMTwJPNPbryXpOrlxFF8NyAXX7o5tOu1mV6/ntyTpHte+AbXdL7DT2Aaj9htGS99fL0jPBAVRUkTdSB02u0xRP3t38nY6qDMV8FESfkJcWXmWjrc/qBCxaJEx1QvfoKESlp/2Un2FppsoEqs/FB4Tg==</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIDtDCCApygAwIBAgIJAOGr7PilHGMwMA0GCSqGSIb3DQEBBQUAMHExLjAsBgNVBAMTJUVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxCzAJBgNVBAYTAkVFMTIwMAYDVQQKEylFc3RvbmlhbiBUZWNobmljYWwgU3VydmVpbGxhbmNlIEF1dGhvcml0eTAeFw0xMDEwMjkxMzIyNTBaFw0yMDExMDUxMzIyNTBaMHExLjAsBgNVBAMTJUVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxCzAJBgNVBAYTAkVFMTIwMAYDVQQKEylFc3RvbmlhbiBUZWNobmljYWwgU3VydmVpbGxhbmNlIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALhdQ9c33Y98JC0pl34+rg+qXLgdjEQaBM9gpxOpIpeqwrcXi5xbLmh4mk6imennbRaZXgJRqrOkx77B+UsBwn6uPgeZenJ1kFGvAOR9aePbgxJ5AggMr4wJXSa03OSGDhptsmMFc86qtnht94mDf1UCn1CNYA7qQHzu4MQwqJ2Ist7IIki89VZD5I4Y5AItMKlEjnHAOw/dlMfI8SxE2vvxCIyQu+rhfGPfwotHi0POyKtkX9Y+JSqEVqRXNw7B2x+d9mRYUJ8EqDvj5ag9dtgyXLsfJ4HdUJMqvoT6QnfwlBbaFusTm3R8SNVXl/8LHDoM5naOSKAOGRSe2OnxAJ8CAwEAAaNPME0wDAYDVR0TBAUwAwIBADALBgNVHQ8EBAMCB4AwHQYDVR0OBBYEFAon+QooAKxPsgZlsTxvK/8synsxMBEGA1UdJQQKMAgGBgQAkTcDADANBgkqhkiG9w0BAQUFAAOCAQEACansBzvd2iwBlZg50oueEtUlFyE+do+FmI4apydq2bM3kdeikWGERSbV1EzD86j7jpNKEOvlPTkV7fZl+7uCJ3OuCrzHEzuaZnvFPkN7Rmj4P1AGh5UK4UVWJwTceuhzIf4D6+/5CNY6U8iEHIqvAmTVOPSKEvxdBv7GKHy6x897icQa8ttHq+xCLmc0+6zpbzSZ5dOmFG3kzJuZPqtqa89Lqf7x6IRRKgUd+C+JsKDMjEde/eYnM8yxdVlzEWe6Z0qKVvPTuiCnhTNhaaQM3aiw61RMTes2Ik4wSGY75XZjQV5gVszHJBEntktcduGWCuJ24qS2lb1M2/8bE43Fkg==</ds:X509Certificate></ds:X509Data></ds:KeyInfo><ds:Object><xades:QualifyingProperties xmlns:xades="http://uri.etsi.org/01903/v1.3.2#" Target="#id-f7685ea087cbe6b4462ba71954a2a9a3"><xades:SignedProperties Id="xades-id-f7685ea087cbe6b4462ba71954a2a9a3"><xades:SignedSignatureProperties><xades:SigningTime>2016-01-13T11:30:12Z</xades:SigningTime><xades:SigningCertificate><xades:Cert><xades:CertDigest><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>FLND/PjEXrla9sSFb5Npn5rUqkw=</ds:DigestValue></xades:CertDigest><xades:IssuerSerial><ds:X509IssuerName>O=Estonian Technical Surveillance Authority,C=EE,CN=Estonian Trusted List Scheme Operator</ds:X509IssuerName><ds:X509SerialNumber>16261351432217453360</ds:X509SerialNumber></xades:IssuerSerial></xades:Cert></xades:SigningCertificate></xades:SignedSignatureProperties><xades:SignedDataObjectProperties><xades:DataObjectFormat ObjectReference="#xml_ref_id"><xades:MimeType>text/xml</xades:MimeType></xades:DataObjectFormat></xades:SignedDataObjectProperties></xades:SignedProperties></xades:QualifyingProperties></ds:Object></ds:Signature></TrustServiceStatusList>
+\ No newline at end of file
+diff -ruN a/client/tl-mp.xml b/client/tl-mp.xml
+--- a/client/tl-mp.xml	1970-01-01 03:00:00.000000000 +0300
++++ b/client/tl-mp.xml	2016-04-27 10:17:23.977818782 +0300
+@@ -0,0 +1,2000 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<TrustServiceStatusList Id="ID0001" TSLTag="http://uri.etsi.org/19612/TSLTag" xmlns="http://uri.etsi.org/02231/v2#" xmlns:ns3="http://uri.etsi.org/02231/v2/additionaltypes#">
++   <SchemeInformation>
++      <TSLVersionIdentifier>4</TSLVersionIdentifier>
++      <TSLSequenceNumber>134</TSLSequenceNumber>
++      <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUlistofthelists</TSLType>
++      <SchemeOperatorName>
++         <Name xml:lang="en">European Commission</Name>
++         <Name xml:lang="bg">Европейска комисия</Name>
++         <Name xml:lang="es">Comisión Europea</Name>
++         <Name xml:lang="cs">Evropská komise</Name>
++         <Name xml:lang="da">Europa-Kommissionen</Name>
++         <Name xml:lang="de">Europäische Kommission</Name>
++         <Name xml:lang="et">Euroopa Komisjon</Name>
++         <Name xml:lang="el">Ευρωπαϊκή Επιτροπή</Name>
++         <Name xml:lang="fr">Commission européenne</Name>
++         <Name xml:lang="it">Commissione europea</Name>
++         <Name xml:lang="lv">Eiropas Komisija</Name>
++         <Name xml:lang="lt">Europos Komisija</Name>
++         <Name xml:lang="hu">Európai Bizottság</Name>
++         <Name xml:lang="mt">Il-Kummissjoni Ewropea</Name>
++         <Name xml:lang="nl">Europese Commissie</Name>
++         <Name xml:lang="pl">Komisja Europejska</Name>
++         <Name xml:lang="pt">Comissão Europeia</Name>
++         <Name xml:lang="ro">Comisia Europeană</Name>
++         <Name xml:lang="sk">Európska komisia</Name>
++         <Name xml:lang="sl">Evropska komisija</Name>
++         <Name xml:lang="fi">Euroopan komissio</Name>
++         <Name xml:lang="sv">Europeiska kommissionen</Name>
++      </SchemeOperatorName>
++      <SchemeOperatorAddress>
++         <PostalAddresses>
++            <PostalAddress xml:lang="fr">
++               <StreetAddress>Rue de la Loi 200</StreetAddress>
++               <Locality>Bruxelles</Locality>
++               <PostalCode>1049</PostalCode>
++               <CountryName>BE</CountryName>
++            </PostalAddress>
++            <PostalAddress xml:lang="nl">
++               <StreetAddress>Wetstraat 200</StreetAddress>
++               <Locality>Brussel</Locality>
++               <PostalCode>1049</PostalCode>
++               <CountryName>BE</CountryName>
++            </PostalAddress>
++            <PostalAddress xml:lang="en">
++               <StreetAddress>Rue de la Loi/Wetstraat 200</StreetAddress>
++               <Locality>Brussels</Locality>
++               <PostalCode>1049</PostalCode>
++               <CountryName>BE</CountryName>
++            </PostalAddress>
++         </PostalAddresses>
++         <ElectronicAddress>
++            <URI xml:lang="en">mailto:EC-TL-Service@ec.europa.eu</URI>
++            <URI xml:lang="en">https://ec.europa.eu/digital-agenda/en/eu-trusted-lists-certification-service-providers</URI>
++         </ElectronicAddress>
++      </SchemeOperatorAddress>
++      <SchemeName>
++         <Name xml:lang="en">EU:Supervision/Accreditation Status List of certification services from Certification Service Providers, which are supervised/accredited by the referenced Scheme Operator’s Member State for compliance with the relevant provisions laid down in Directive 1999/93/EC of the European Parliament and of the Council of 13 December 1999 on a Community framework for electronic signatures.</Name>
++         <Name xml:lang="bg">EU:Списък, съдържащ в съответствие с член 2, параграф 4 от Решение 2009/767/ЕО на Комисията от 16 октомври 2009 г. за определяне на мерки, улесняващи прилагането на процедури с помощта на електронни средства чрез единични звена за контакт в съответствие с Директива 2006/123/ЕО на Европейския парламент и на Съвета относно услугите на вътрешния пазар, изменено с Решение 2010/425/ЕС на Комисията и Решение 2013/662/ЕС за изпълнение на Комисията, информацията, съобщена от държавите членки съгласно член 2, параграф 3 от Решение 2009/767/ЕО на Комисията.</Name>
++         <Name xml:lang="es">EU:De conformidad con el artículo 2, apartado 4, de la Decisión 2009/767/CE de la Comisión, de 16 de octubre de 2009, por la que se adoptan medidas que facilitan el uso de procedimientos por vía electrónica a través de las «ventanillas únicas» con arreglo a la Directiva 2006/123/CE del Parlamento Europeo y del Consejo relativa a los servicios en el mercado interior, modificada por la Decisión 2010/425/UE de la Comisión y por la Decisión de Ejecución 2013/662/UE de la Comisión, la presente lista contiene la información proporcionada por los Estados miembros según lo previsto en el artículo 2, apartado 3, de la Decisión 2009/767/CE de la Comisión.</Name>
++         <Name xml:lang="cs">EU:Seznam zveřejněný podle čl. 2 odst. 4 rozhodnutí Komise 2009/767/ES ze dne 16. října 2009, kterým se stanovují opatření pro usnadnění užití postupů s využitím elektronických prostředků prostřednictvím „jednotných kontaktních míst“ podle směrnice Evropského parlamentu a Rady 2006/123/ES o službách na vnitřním trhu, ve znění rozhodnutí Komise 2010/425/EU a prováděcího rozhodnutí Komise 2013/662/EU, který obsahuje informace oznámené členskými státy v souladu s čl. 2 odst. 3 rozhodnutí Komise 2009/767/ES.</Name>
++         <Name xml:lang="da">EU:Listen indeholder, jf. artikel 2, stk. 4, i Kommissionens beslutning 2009/767/EF af 16. oktober 2009 om fastlæggelse af foranstaltninger, der skal lette anvendelsen af elektroniske procedurer ved hjælp af "kvikskranker" i henhold til Europa-Parlamentets og Rådets direktiv 2006/123/EF om tjenesteydelser i det indre marked, som ændret ved Kommissionens afgørelse 2010/425/EU og Kommissionens gennemførelsesafgørelse 2013/662/EU, de oplysninger, der indgives af medlemsstaterne i henhold til artikel 2, stk. 3, i Kommissionens beslutning 2009/767/EF.</Name>
++         <Name xml:lang="de">EU:Liste, die in Übereinstimmung mit Artikel 2 Absatz 4 der Entscheidung 2009/767/EG der Kommission vom 16. Oktober 2009 über Maßnahmen zur Erleichterung der Nutzung elektronischer Verfahren über „einheitliche Ansprechpartner“ gemäß der Richtlinie 2006/123/EG des Europäischen Parlaments und des Rates über Dienstleistungen im Binnenmarkt – geändert durch den Beschluss 2010/425/EU der Kommission und den Durchführungsbeschluss 2013/662/EU der Kommission – die von den Mitgliedstaaten gemäß Artikel 2 Absatz 3 der Entscheidung 2009/767/EG der Kommission übermittelten Informationen enthält:</Name>
++         <Name xml:lang="et">EU:Nimekiri kooskõlas komisjoni 16. oktoobri 2009. aasta otsuse 2009/767/EÜ (millega kehtestatakse meetmed elektrooniliste haldustoimingute kasutamise lihtsustamiseks ühtsete kontaktpunktide kaudu, mis on sätestatud Euroopa Parlamendi ja nõukogu direktiivis 2006/123/EÜ teenuste kohta siseturul; muudetud komisjoni otsusega 2010/425/EL ja komisjoni rakendusotsusega 2013/662/EL) artikli 2 lõikega 4; nimekirjas esitatakse teave, mille liikmesriigid on edastanud komisjoni otsuse 2009/767/EÜ artikli 2 lõike 3 kohaselt.</Name>
++         <Name xml:lang="el">EU:Ο παρών κατάλογος περιέχει - σύμφωνα με το άρθρο 2 παράγραφος 4 της απόφασης 2009/767/ΕΚ της Επιτροπής, της 16ης Οκτωβρίου 2009, σχετικά με τη θέσπιση μέτρων που διευκολύνουν τη χρήση διαδικασιών με ηλεκτρονικά μέσα μέσω των ενιαίων κέντρων εξυπηρέτησης βάσει της οδηγίας 2006/123/ΕΚ του Ευρωπαϊκού Κοινοβουλίου και του Συμβουλίου σχετικά με τις υπηρεσίες στην εσωτερική αγορά, όπως τροποποιήθηκε με την απόφαση 2010/425/ΕΕ της Επιτροπής και την εκτελεστική απόφαση 2013/662/ΕΕ της Επιτροπής - τις πληροφορίες που κοινοποιούνται από τα κράτη μέλη σύμφωνα με το άρθρο 2 παράγραφος 3 της απόφασης 2009/767/ΕΚ της Επιτροπής.</Name>
++         <Name xml:lang="fr">EU:Liste contenant, par application de l’article 2, paragraphe 4, de la décision 2009/767/CE de la Commission du 16 octobre 2009 établissant des mesures destinées à faciliter l’exécution de procédures par voie électronique par l’intermédiaire des «guichets uniques» conformément à la directive 2006/123/CE du Parlement européen et du Conseil relative aux services dans le marché intérieur, telle que modifiée par la décision 2010/425/UE de la Commission et la décision d'exécution 2013/662/UE de la Commission, les informations communiquées par les États membres en application de l'article 2, paragraphe 3, de la décision 2009/767/CE de la Commission.</Name>
++         <Name xml:lang="it">EU:Conformemente all'articolo 2, paragrafo 4, della decisione 2009/767/CE della Commissione, del 16 ottobre 2009, che stabilisce misure per facilitare l'uso di procedure per via elettronica mediante gli "sportelli unici" di cui alla direttiva 2006/123/CE del Parlamento europeo e del Consiglio relativa ai servizi nel mercato interno, modificata dalla decisione 2010/425/UE della Commissione e dalla decisione di esecuzione 2013/662/UE della Commissione, il presente elenco UE contiene le informazioni comunicate dagli Stati membri a norma dell'articolo 2, paragrafo 3, della decisione 2009/767/CE.</Name>
++         <Name xml:lang="lv">EU:Saraksts, kas saskaņā ar 2. panta 4. punktu Komisijas 2009. gada 16. oktobra Lēmumā 2009/767/EK par pasākumiem, lai veicinātu procedūru veikšanu elektroniski, izmantojot vienotos kontaktpunktus atbilstoši Eiropas Parlamenta un Direktīva 2006/123/EK par pakalpojumiem iekšējā tirgū, kurā grozījumi izdarīti ar Komisijas Lēmumu 2010/425/ES un Komisijas Īstenošanas Lēmumu 2013/662/ES, ietver informāciju, ko dalībvalstis paziņojušas saskaņā ar Komisijas Lēmuma 2009/767/EK 2. panta 3. punktu.</Name>
++         <Name xml:lang="lt">EU:Sąrašas, kuriame pagal  2009 m. spalio 16 d. Komisijos sprendimo 2009/767/EB, kuriuo pagal Europos Parlamento ir Tarybos direktyvą 2006/123/EB dėl paslaugų vidaus rinkoje nustatomos priemonės procedūroms, atliekamoms naudojantis elektroninėmis priemonėmis ir kontaktinių centrų paslaugomis, palengvinti, su pakeitimais, padarytais Komisijos sprendimu 2010/425/ES ir Komisijos įgyvendinimo sprendimu 2013/662/ES, 2 straipsnio 4 dalį pateikiama informacija, kurią valstybės narės pateikė pagal Komisijos sprendimo 2009/767/EB 2 straipsnio 3 dalį.</Name>
++         <Name xml:lang="hu">EU:Jegyzék, amely az eljárásoknak a belső piaci szolgáltatásokról szóló 2006/123/EK európai parlamenti és tanácsi irányelv szerinti egyablakos ügyintézési pontokon keresztül elektronikus eszközökkel történő teljesítését lehetővé tevő rendelkezések meghatározásáról szóló, a 2010/425/EU bizottsági határozattal és a 2013/662/EU bizottsági végrehajtási határozattal módosított, 2009. október 16-i 2009/767/EK bizottsági határozat 2. cikkének (4) bekezdésével összhangban tartalmazza a tagállamok által a 2009/767/EK bizottsági határozat 2. cikke (3) bekezdésének megfelelően bejelentett információkat.</Name>
++         <Name xml:lang="mt">EU:Lista li fiha, skont l-Artikolu 2(4) tad-Deċiżjoni tal-Kummissjoni 2009/767/KE tas-16 ta’ Ottubru 2009 li tistipula miżuri li jiffaċilitaw l-użu ta’ proċeduri b’mezzi elettroniċi permezz tal-punti ta’ kuntatt waħdieni skont id-Direttiva 2006/123/KE tal-Parlament Ewropew u tal-Kunsill dwar is-servizzi fis-suq intern, kif emendata mid-Deċiżjoni tal-Kummissjoni 2010/425/UE u mid-Deċiżjoni ta' Implimentazzjoni tal-Kummissjoni 2013/662/UE, l-informazzjoni notifikata mill-Istati Membri skont l-Artikolu 2(3) tad-Deċiżjoni tal-Kummissjoni 2009/767/KE.</Name>
++         <Name xml:lang="nl">EU:Lijst waarin overeenkomstig artikel 2, lid 4, van Beschikking 2009/767/EG van de Commissie van 16 oktober 2009 inzake maatregelen voor een gemakkelijker gebruik van elektronische procedures via het „één- loket” in het kader van Richtlijn 2006/123/EG van het Europees Parlement en de Raad betreffende diensten op de interne markt, zoals gewijzigd bij Besluit 2010/425/EU van de Commissie en Uitvoeringsbesluit 2013/662/EU van de Commissie, de informatie is opgenomen die door de lidstaten overeenkomstig artikel 2, lid 3, van Beschikking 2009/767/EG van de Commissie is medegedeeld.</Name>
++         <Name xml:lang="pl">EU:Wykaz zawierający, zgodnie z art. 2 ust. 4 decyzji Komisji 2009/767/WE z dnia 16 października 2009 r. ustanawiającej środki ułatwiające korzystanie z procedur realizowanych drogą elektroniczną poprzez „pojedyncze punkty kontaktowe” zgodnie z dyrektywą 2006/123/WE Parlamentu Europejskiego i Rady dotyczącą usług na rynku wewnętrznym, zmienioną decyzją Komisji 2010/425/UE i decyzją wykonawczą Komisji 2013/662/UE, informacje przekazane przez państwa członkowskie zgodnie z art. 2 ust. 3 decyzji Komisji 2009/767/WE.</Name>
++         <Name xml:lang="pt">EU:Lista contendo, em conformidade com o artigo 2.º, n.º 4, da Decisão 2009/767/CE da Comissão, de 16 de outubro de 2009, que determina medidas destinadas a facilitar a utilização de procedimentos informatizados através de «balcões únicos», nos termos da Diretiva 2006/123/CE do Parlamento Europeu e do Conselho relativa aos serviços no mercado interno, com a redação que lhe foi dada pela Decisão 2010/425/UE da Comissão e pela Decisão de Execução 2013/662/UE da Comissão, as informações notificadas pelos Estados-Membros nos termos do artigo 2.º, n.º 3, da Decisão 2009/767/CE da Comissão.</Name>
++         <Name xml:lang="ro">EU:Listă care conține, în conformitate cu articolul 2 alineatul (4) din Decizia 2009/767/CE a Comisiei din 16 octombrie 2009 de stabilire a unor măsuri de facilitare a utilizării procedurilor prin mijloace electronice prin intermediul „ghișeelor unice” în temeiul Directivei 2006/123/CE a Parlamentului European și a Consiliului privind serviciile în cadrul pieței interne, astfel cum a fost modificată prin Decizia 2010/425/UE a Comisiei și Decizia de punere în aplicare 2013/662/UE a Comisiei, informațiile notificate de statele membre în temeiul articolului 2 alineatul (3) din Decizia 2009/767/CE a Comisiei.</Name>
++         <Name xml:lang="sk">EU:Zoznam, ktorý obsahuje v súlade s článkom 2 ods. 4 rozhodnutia Komisie 2009/767/ES zo 16. októbra 2009, ktorým sa ustanovujú opatrenia na uľahčenie postupov elektronickými spôsobmi prostredníctvom „miest jednotného kontaktu“ podľa smernice Európskeho parlamentu a Rady 2006/123/ES o službách na vnútornom trhu, zmeneného rozhodnutím Komisie 2010/425/EÚ a vykonávacím rozhodnutím Komisie 2013/662/EÚ, informácie oznámené členskými štátmi podľa článku 2 ods. 3 rozhodnutia Komisie 2009/767/ES.</Name>
++         <Name xml:lang="sl">EU:Seznam, ki v skladu s členom 2(4) Odločbe Komisije 2009/767/ES z dne 16. oktobra 2009 o vzpostavitvi ukrepov za pospeševanje uporabe postopkov po elektronski poti s pomočjo enotnih kontaktnih točk po Direktivi 2006/123/ES Evropskega parlamenta in Sveta o storitvah na notranjem trgu, kakor je bila spremenjena s Sklepom Komisije 2010/425/EU in Izvedbenim sklepom Komisije 2013/662/EU, vsebuje informacije, ki jih države članice sporočijo v skladu s členom 2(3) Odločbe Komisije 2009/767/ES.</Name>
++         <Name xml:lang="fi">EU:Luettelo, joka sisältää toimenpiteistä sähköisten menettelyjen käytön edistämiseksi keskitettyjä asiointipisteitä käyttäen palveluista sisämarkkinoilla annetun Euroopan parlamentin ja neuvoston direktiivin 2006/123/EY mukaisesti 16 päivänä lokakuuta 2009 tehdyn komission päätöksen 2009/767/EY, sellaisena kuin se on muutettuna komission päätöksellä 2010/425/EU ja komission täytäntöönpanopäätöksellä 2013/662/EU, 2 artiklan 4 kohdan mukaisesti tiedot, jotka jäsenvaltiot ovat ilmoittaneet komission päätöksen 2009/767/EY 2 artiklan 3 kohdan mukaisesti:</Name>
++         <Name xml:lang="sv">EU:Förteckning som, i enlighet med artikel 2.4 i kommissionens beslut av den 16 oktober 2009 om åtgärder som underlättar användningen av förfaranden på elektronisk väg genom gemensamma kontaktpunkter i enlighet med Europaparlamentets och rådets direktiv 2006/123/EG om tjänster på den inre marknaden, ändrat genom kommissionens beslut 2010/425/EU och kommissionens genomförandebeslut 2013/662/EU, innehåller den information som medlemsstaterna lämnat i enlighet med artikel 2.3 i kommissionens beslut 2009/767/EG.</Name>
++         <Name xml:lang="hr">EU:Popis koji, u skladu s člankom 2. stavkom 4. Odluke Komisije 2009/767/EZ od 16. listopada 2009. o utvrđivanju mjera kojima se olakšava uporaba postupaka elektroničkim putem preko „jedinstvenih kontaktnih točaka” u skladu s Direktivom 2006/123/EZ Europskog parlamenta i Vijeća o uslugama na unutarnjem tržištu, kako je izmijenjena Odlukom Komisije 2010/425/EU i Provedbenom odlukom Komisije 2013/662/EU, sadržava informacije o kojima su države članice izvijestile u skladu s člankom 2. stavkom 3. Odluke Komisije 2009/767/EZ:</Name>
++      </SchemeName>
++      <SchemeInformationURI>
++         <URI xml:lang="en">http://eur-lex.europa.eu/legal-content/EN/TXT/?uri=uriserv:OJ.C_.2015.435.01.0001.01.ENG</URI>
++         <URI xml:lang="en">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#en</URI>
++         <URI xml:lang="bg">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#bg</URI>
++         <URI xml:lang="es">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#es</URI>
++         <URI xml:lang="cs">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#cs</URI>
++         <URI xml:lang="da">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#da</URI>
++         <URI xml:lang="de">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#de</URI>
++         <URI xml:lang="et">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#et</URI>
++         <URI xml:lang="el">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#el</URI>
++         <URI xml:lang="fr">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#fr</URI>
++         <URI xml:lang="it">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#it</URI>
++         <URI xml:lang="lv">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#lv</URI>
++         <URI xml:lang="lt">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#lt</URI>
++         <URI xml:lang="hu">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#hu</URI>
++         <URI xml:lang="mt">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#mt</URI>
++         <URI xml:lang="nl">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#nl</URI>
++         <URI xml:lang="pl">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#pl</URI>
++         <URI xml:lang="pt">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#pt</URI>
++         <URI xml:lang="ro">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#ro</URI>
++         <URI xml:lang="sk">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#sk</URI>
++         <URI xml:lang="sl">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#sl</URI>
++         <URI xml:lang="fi">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#fi</URI>
++         <URI xml:lang="sv">https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl.html#sv</URI>
++      </SchemeInformationURI>
++      <StatusDeterminationApproach>http://uri.etsi.org/TrstSvc/TrustedList/StatusDetn/EUlistofthelists</StatusDeterminationApproach>
++      <SchemeTypeCommunityRules>
++         <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUlistofthelists</URI>
++      </SchemeTypeCommunityRules>
++      <SchemeTerritory>EU</SchemeTerritory>
++      <PolicyOrLegalNotice>
++         <TSLLegalNotice xml:lang="en">In accordance with Art. 2 (4) of Commission Decision 2009/767/EC of 16 October 2009 setting out measures facilitating the use of procedures by electronic means through the ‘points of single contact’ under Directive 2006/123/EC of the European Parliament and of the Council on services in the internal market, as amended by Commission Decision 2010/425/EU and Commission Implementing Decision 2013/662/EU, the present list contains the information notified by Member States pursuant to Art. 2 (3) of Commission Decision 2009/767/EC. The European Commission maintains this website as an interoperability tool designed to facilitate the practical use of national Trusted Lists. Our goal is to keep this information timely and accurate. If errors are brought to our attention, we will try to correct them. However, the Commission accepts no responsibility or liability whatsoever with regard to the content of national Trusted Lists which lies exclusively with the Member States. It is our goal to minimize disruption caused by technical errors. However, some data or information on our site may have been created or structured in files or formats that are not error-free and we cannot guarantee that our service will not be interrupted or otherwise affected by such problems. The European Commission accepts no responsibility with regard to such problems incurred as a result of using this site or any linked external sites. This disclaimer is not intended to limit the liability of the European Commission in contravention of any requirements laid down in applicable national law nor to exclude its liability for matters which may not be excluded under that law.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="bg">Списък съгласно член 2, параграф 4 от Решение 2009/767/ЕО на Комисията от 16 октомври 2009 г. за определяне на мерки, улесняващи прилагането на процедури с помощта на електронни средства чрез „единични звена за контакт“ в съответствие с Директива 2006/123/ЕО на Европейския парламент и на Съвета относно услугите на вътрешния пазар, изменено с Решение 2010/425/ЕС на Комисията и с Решение за изпълнение 2013/662/EС на Комисията, съдържащ информацията, съобщена от държавите членки съгласно член 2, параграф 3 от Решение 2009/767/ЕО на Комисията. Европейската комисия поддържа този уебсайт като инструмент за оперативна съвместимост, чиято цел е да улесни използването на национални доверителни списъци. Наша цел е да поддържаме актуалността и точността на тази информация. Ако ни съобщите за допуснати грешки, ще се постараем да ги коригираме. Въпреки това Комисията не поема никаква отговорност по отношение на съдържанието на националните доверителни списъци, за което отговорност носят изцяло държавите-членки. Наша цел е да сведем до минимум проблемите, причинени от технически грешки. Въпреки това някои данни или информация на нашия сайт може да са създадени или структурирани във файлове или формати, податливи на грешки, и не можем да гарантираме, че нашите услуги няма да бъдат прекъснати или засегнати по друг начин от подобни проблеми. Европейската комисия не поема отговорност по отношение на такива проблеми, появили се в резултат от използването на този сайт или на други външни сайтове, свързани с него. Настоящият отказ от отговорност няма за цел да ограничава отговорността на Европейската комисия в разрез с изискванията, заложени в приложимото национално законодателство, нито да я освобождава от отговорност в области, в които това не е възможно съгласно това законодателство.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="es">De conformidad con el artículo 2, apartado 4, de la Decisión 2009/767/CE de la Comisión, de 16 de octubre de 2009, por la que se adoptan medidas que facilitan el uso de procedimientos por vía electrónica a través de las ventanillas únicas con arreglo a la Directiva 2006/123/CE del Parlamento Europeo y del Consejo relativa a los servicios en el mercado interior, modificada por la Decisión 2010/425/UE de la Comisión y la Decisión de ejecución de la Comisión 2013/662/EU de 14 de octubre de 2013, la presente lista contiene la información notificada por los Estados miembros en virtud del artículo 2, apartado 3, de la Decisión 2009/767/CE de la Comisión. Con el presente sitio Internet la Comisión Europea quiere ofrecer una herramienta de interoperabilidad que facilite el uso práctico de las listas de confianza nacionales. Nuestro objetivo es mantener esta información actualizada y precisa. Trataremos de corregir los errores que se nos señalen. No obstante, la Comisión no asume responsabilidad alguna en relación con el contenido de las listas de confianza nacionales, que son de la exclusiva incumbencia de los Estados miembros. Queremos reducir al mínimo los problemas ocasionados por errores de carácter técnico. No obstante, algunos datos o informaciones de nuestro sitio pueden haber sido creados u organizados en archivos o formatos no exentos de errores, y no podemos garantizar que nuestro servicio no se vea interrumpido o afectado de alguna otra manera. La Comisión no asume responsabilidad alguna por los problemas que puedan surgir al utilizar este sitio o sitios externos con enlaces al mismo. La presente cláusula de exención de responsabilidad no tiene por objeto limitar la responsabilidad de la Comisión de forma contraria a lo dispuesto por las normativas nacionales aplicables ni excluir su responsabilidad en los casos en los que, en virtud de dichas normativas, no pueda excluirse.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="cs">V souladu s čl. 2 odst. 4 rozhodnutí Komise 2009/767/ES ze dne 16. října 2009, kterým se stanovují opatření pro usnadnění užití postupů s využitím elektronických prostředků prostřednictvím „jednotných kontaktních míst“ podle směrnice Evropského parlamentu a Rady 2006/123/ES o službách na vnitřním trhu, ve znění rozhodnutí Komise 2010/425/EU a prováděcího rozhodnutí Komise 2013/662/EU, tento seznam obsahuje informace oznámené členskými státy podle čl. 2 odst. 3 rozhodnutí Komise 2009/767/ES. Tyto internetové stránky spravuje Evropská komise s cílem usnadnit praktické využívání důvěryhodných seznamů z jednotlivých členských států. Snažíme se poskytovat aktualizované a přesné informace. Snažíme se rovněž opravovat všechny chyby, na něž nás upozorníte. Komise však vylučuje jakoukoli odpovědnost za obsah důvěryhodných seznamů, neboť tuto odpovědnost nesou výhradně členské státy. Snažíme se vyvarovat poruch způsobených technickými chybami. Některé údaje či informace na našich internetových stránkách však mohly být vytvořeny či strukturovány do souborů či formátů, které nejsou bezchybné, a proto nemůžeme zaručit, že naše služby nebudou v důsledku takových problémů přerušeny či jinak ovlivněny. Evropská komise odmítá jakoukoli odpovědnost za problémy, které nastanou v důsledku používání těchto stránek nebo externích stránek, na něž tyto stránky odkazují. Záměrem tohoto prohlášení není omezit odpovědnost Evropské komise v případě porušení platných vnitrostátních právních předpisů ani vyloučit její odpovědnost v záležitostech, ve kterých ji podle těchto předpisů vyloučit nelze.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="da">I overensstemmelse med artikel 2, stk. 4, i Kommissionens beslutning 2009/767/EF om fastlæggelse af foranstaltninger, der skal lette anvendelsen af elektroniske procedurer ved hjælp af kvikskranker i henhold til Europa-Parlamentets og Rådets direktiv 2006/123/EF om tjenesteydelser i det indre marked, som ændret ved Kommissionens afgørelse 2010/425/EU og Kommissionens gennemførelsesforordning 2013/662/EU, indeholder denne liste de oplysninger, som medlemslandene har afgivet i henhold til artikel 2, stk. 3, i Kommissionens beslutning 2009/767/EF. Kommissionen har her på webstedet samlet information om de nationale positivlister, så det er lettere at anvende dem i praksis. Vi tilstræber, at oplysningerne er korrekte og ajourførte. Hvis vi bliver opmærksomme på fejl, søger vi at rette dem. Kommissionen påtager sig imidlertid intet ansvar for indholdet i de nationale positivlister. Ansvaret påhviler udelukkende medlemslandene. Vi tilstræber så vidt muligt at mindske forstyrrelser forårsaget af tekniske problemer. Dog kan visse data eller andre oplysninger på webstedet være blevet struktureret i filer eller formater, som ikke er fejlfrie, og vi kan ikke garantere, at vores service ikke afbrydes eller i øvrigt ikke påvirkes af den slags problemer. Kommissionen påtager sig intet ansvar for sådanne ulemper, der måtte opstå som følge af brugen af dette websted eller andre tilknyttede eksterne websteder. Hensigten med denne erklæring om ansvarsfraskrivelse er hverken at begrænse Kommissionens ansvar på en måde, der strider med eventuelle krav ifølge gældende national ret, eller at udelukke Europa-Kommissionens ansvar i tilfælde, hvor ansvar ikke kan udelukkes ifølge national ret.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="de">Diese Liste enthält die von den Mitgliedstaaten übermittelten Angaben und steht damit im Einklang mit Artikel 2 Absatz 4 der Entscheidung 2009/767/EG der Kommission vom 16. Oktober 2009 über Maßnahmen zur Erleichterung der Nutzung elektronischer Verfahren über „einheitliche Ansprechpartner“ gemäß der Richtlinie 2006/123/EG des Europäischen Parlaments und des Rates über Dienstleistungen im Binnenmarkt – geändert durch die Entscheidung der Kommission Nr. 2010/425/EU und dem Durchführungsbeschluss der Kommission Nr. 2013/662/EU – in Übereinstimmung mit Artikel 2 Absatz 3 der Entscheidung der Kommission Nr. 2009/767/EG. Diese Website der Europäischen Kommission ist als Schnittstelle gedacht, die die Verwendung nationaler vertrauenswürdiger Listen in der Praxis vereinfachen soll. Wir sind bestrebt, die einschlägigen Informationen inhaltlich richtig und rechtzeitig bereitzustellen. Wir bemühen uns, Irrtümer zu berichtigen, die uns zur Kenntnis gebracht werden. Die Kommission übernimmt jedoch keine Verantwortung oder Haftung für den Inhalt der nationalen vertrauenswürdigen Listen, für die ausschließlich die Mitgliedstaaten zuständig sind. Wir arbeiten darauf hin, technisch bedingte Störungen auf ein Mindestmaß zu reduzieren. Dennoch kann es vorkommen, dass Daten oder Informationen auf unserer Website in fehlerhaften Dateien oder Formaten vorliegen. Wir können also nicht garantieren, dass der Arbeitsablauf durch derartige Probleme nicht gestört oder anderweitig beeinträchtigt wird. Die Europäische Kommission übernimmt für derartige Störungen beim Besuch dieser Website oder damit verbundener externer Sites keine Verantwortung. Mit der vorliegenden Haftungsausschlussklausel soll die Haftung der Europäischen Kommission bei Nichteinhaltung der einschlägigen nationalen Rechtsvorschriften weder eingeschränkt noch in Fällen ausgeschlossen werden, in denen ein Ausschluss nach diesen Rechtsvorschriften nicht möglich ist.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="et">Vastavalt komisjoni 16. oktoobri 2009. aasta otsuse 2009/767/EÜ (millega kehtestatakse meetmed elektrooniliste haldustoimingute kasutamise lihtsustamiseks ühtsete kontaktpunktide kaudu, mis on sätestatud Euroopa Parlamendi ja nõukogu direktiivis 2006/123/EÜ teenuste kohta siseturul ning mida on muudetud komisjoni otsusega 2010/425/EL ja komisjoni rakendusotsusega 2013/662/EL) artikli 2 lõikele 4 sisaldab käesolev loetelu liikmesriikide vastavalt komisjoni otsuse 2009/767/EÜ artikli 2 lõikele 3 esitatud teavet. Euroopa Komisjon haldab asjaomast veebisaiti koostalitlusvõime vahendina, mis hõlbustab liikmesriikide usaldusnimekirjade praktilist kasutamist. Eesmärk on pakkuda õigeaegset ja täpset teavet. Märgatud vigu püüame parandada. Samas ei võta komisjon endale vastutust ega mingeid kohustusi liikmesriikide usaldusnimekirjade sisu suhtes, mille eest vastutavad üksnes liikmesriigid ise. Meie eesmärk on vähendada tehniliste vigade tõttu tekkinud häireid. Osa veebisaidil olevatest andmetest või teabest võib aga olla loodud või paigutatud vigastesse failidesse või vormingutesse ning seega ei saa me tagada, et sellised probleemid meie teenust ei häiri või muul moel ei mõjuta. Euroopa Komisjon ei võta endale vastutust seoses kõnealuste probleemidega, mis tulenevad käesoleva veebisaidi või seonduvate välissaitide kasutamisest. Käesoleva vastutamatusesätte eesmärk ei ole Euroopa Komisjoni vastutuse piiramine, mis oleks vastuolus kohaldatavas liikmesriigi õigusaktis sätestatud nõuetega ega komisjoni vastutuse kõrvaldamine küsimustes, mida ei tohi asjaomase õigusakti alusel kõrvale jätta.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="el">Σύμφωνα με το άρθρο 2 παράγραφος 4 της απόφασης 2009/767/EΚ της Επιτροπής, της 16ης Οκτωβρίου 2009, σχετικά με τη θέσπιση μέτρων που διευκολύνουν τη χρήση διαδικασιών με ηλεκτρονικά μέσα μέσω των «ενιαίων κέντρων εξυπηρέτησης» βάσει της οδηγίας 2006/123/EΚ του Ευρωπαϊκού Κοινοβουλίου και του Συμβουλίου σχετικά με τις υπηρεσίες στην εσωτερική αγορά, όπως τροποποιήθηκε με τη απόφαση 2010/425/EΕ της Επιτροπής και την εκτελεστική απόφαση 2013/662/ΕΕ της Επιτροπής, ο παρών κατάλογος περιέχει τις πληροφορίες που γνωστοποιούν τα κράτη μέλη σύμφωνα με το άρθρο 2 παράγραφος 3 της απόφασης 2009/767/EΚ της Επιτροπής. Ο δικτυακός αυτός τόπος της Ευρωπαϊκής Επιτροπής είναι ένα διαλειτουργικό εργαλείο σχεδιασμένο για να διευκολύνει τη χρήση των εθνικών καταλόγων εμπίστευσης.. Στόχος μας είναι να παρέχουμε ακριβή και επικαιροποιημένα στοιχεία. Αν επισημανθούν σφάλματα θα καταβληθεί κάθε προσπάθεια για τη διόρθωσή τους.Ωστόσο, η Επιτροπή δεν φέρει καμία ευθύνη όσον αφορά το περιεχόμενο των εθνικών καταλόγων εμπίστευσης, για τους οποίους την αποκλειστική ευθύνη φέρουν τα κράτη μέλη. Καταβάλλουμε κάθε προσπάθεια ώστε να ελαχιστοποιήσουμε τις διακοπές που προκαλούνται από τεχνικά προβλήματα. Ωστόσο, ορισμένα δεδομένα ή πληροφορίες που περιέχει ο δικτυακός τόπος μπορεί να έχουν δημιουργηθεί ή οργανωθεί σε αρχεία ή μορφότυπους που περιέχουν σφάλματα και γι΄αυτό δεν μπορούμε να εγγυηθούμε ότι η υπηρεσία μας δεν θα διακοπεί, ή δεν θα επηρεαστεί με άλλο τρόπο, από τέτοια προβλήματα. Η Επιτροπή δεν φέρει καμιά ευθύνη όσον αφορά τέτοια προβλήματα που ανακύπτουν κατά τη χρήση αυτού του δικτυακού τόπου, ή οποιουδήποτε άλλου συνδεδεμένου δικτυακού τόπου. Η παρούσα δήλωση αποποίησης ευθύνης δεν έχει σκοπό να περιορίσει την ευθύνη της Ευρωπαϊκής Επιτροπής κατά τρόπο που αντίκειται στις απαιτήσεις της ισχύουσας εθνικής νομοθεσίας ούτε να αποκλείσει την ευθύνη της για ζητήματα για τα οποία δεν μπορεί να αποκλειστεί δυνάμει της εν λόγω νομοθεσίας.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="fr">Conformément à l'article 2, paragraphe 4, de la décision 2009/767/CE de la Commission du 16 octobre 2009 établissant des mesures destinées à faciliter l’exécution de procédures par voie électronique par l’intermédiaire des «guichets uniques» conformément à la directive 2006/123/CE du Parlement européen et du Conseil relative aux services dans le marché intérieur, modifiée par la décision 2010/425/UE de la Commission et par la décision d’exécution 2013/662/UE de la Commission, la présente liste contient les informations notifiées par les États membres conformément à l'article 2, paragraphe 3, de la décision 2009/767/CE de la Commission. Le présent site de la Commission européenne constitue un outil d'interopérabilité destiné à faciliter l'utilisation des listes de confiance nationales. Notre objectif est de diffuser des informations exactes et à jour. Nous nous efforcerons de corriger les erreurs qui nous seront signalées. Toutefois, la Commission n'assume pas la responsabilité du contenu des listes de confiance nationales, qui incombe exclusivement aux États membres. Nous souhaitons limiter autant que possible les inconvénients occasionnés par des erreurs techniques. Cependant, certaines données ou informations présentes sur notre site peuvent avoir été créées ou structurées dans des fichiers ou des formats qui ne sont pas exempts d'erreurs. Il nous est donc impossible de garantir que notre service ne sera pas interrompu ou autrement affecté par de tels problèmes. La Commission décline toute responsabilité quant aux éventuels problèmes de ce type, résultant d'une utilisation du présent site ou de tout autre site extérieur auquel il renvoie. La présente clause de non-responsabilité n'a pas pour but de limiter la responsabilité de la Commission de manière contraire aux dispositions prévues dans les législations nationales applicables ou de dégager sa responsabilité dans des cas où elle ne peut l'être en vertu desdites législations.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="it">Conformemente all'articolo 2, paragrafo 4, della decisione della Commissione 2009/767/CE, del 16 ottobre 2009, che stabilisce misure per facilitare l’uso di procedure per via elettronica mediante gli sportelli unici di cui alla direttiva 2006/123/CE del Parlamento europeo e del Consiglio relativa ai servizi nel mercato interno, decisione modificata dalla decisione della Commissione 2010/425/UE e dalla decisione di esecuzione della Commissione 2013/662/UE , la presente lista contiene le informazioni notificate dagli Stati membri a norma dell'articolo 2, paragrafo 3, della decisione 2009/767/CE. Il presente sito della Commissione europea assicura l'interoperabilità necessaria per facilitare l'uso pratico degli elenchi di fiducia nazionali. L'obiettivo perseguito è quello di fornire un'informazione aggiornata e precisa. Qualora dovessero essere segnalati degli errori, si provvederà a correggerli. La Commissione non si assume alcuna responsabilità per quanto riguarda il contenuto degli elenchi di fiducia nazionali, che è di competenza esclusiva degli Stati membri. È nostra cura ridurre al minimo le disfunzioni imputabili a problemi tecnici. Parte dei dati o delle informazioni presenti nel sito potrebbero tuttavia essere stati inseriti o strutturati in archivi o formati non esenti da errori. Non possiamo pertanto garantire che il servizio non subisca interruzioni o che non sia in altro modo influenzato da tali problemi. La Commissione non si assume alcuna responsabilità per gli eventuali problemi derivanti dall'utilizzazione del presente sito o di eventuali siti esterni ad esso collegati. La presente clausola di esclusione della responsabilità non ha lo scopo di limitare la responsabilità della Commissione in violazione di disposizioni della legge nazionale applicabile, né di escluderla nei casi in cui non può essere esclusa in forza di detta legge.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="lv">Šajā sarakstā ir iekļauta informācija, kuru dalībvalstis Komisijai ir paziņojušas saskaņā ar 2. panta 4. punktu Komisijas 2009. gada 16. oktobra Lēmumā 2009/767/EK par pasākumiem, lai veicinātu procedūru veikšanu elektroniski, izmantojot vienotos kontaktpunktus atbilstoši Eiropas Parlamenta un Padomes Direktīvai 2006/123/EK par pakalpojumiem iekšējā tirgū (minētais Lēmums grozīts ar Komisijas Lēmumu 2010/425/ES un Komisijas Īstenošanas lēmumu 2013/662/ES). Šis saraksts publicēts atbilstīgi Komisijas Lēmuma 2009/767/EK 2. panta 4. punktam. Eiropas Komisija uztur šo tīmekļa vietni, lai sekmētu dalībvalstu uzticamo sarakstu praktisku un savstarpēju izmantošanu. Mēs darām visu, lai nodrošinātu, ka šī informācija ir sniegta laicīgi un ir pareiza. Centīsimies labot norādītās kļūdas. Tomēr Komisija neuzņemas nekādu atbildību vai saistības attiecībā uz dalībvalstu uzticamajos sarakstos sniegto informāciju, jo par tiem atbild vienīgi dalībvalstis. Mēs darām visu, lai līdz minimumam samazinātu traucējumus, ko rada tehniskas kļūmes. Tomēr atsevišķos gadījumos dati vai informācija, kas iekļauta mūsu vietnē, ir sagatavota vai organizēta datnēs vai formātos, kas nefunkcionē nevainojami, un mēs nevaram garantēt, ka šādas problēmas nepārtrauks vai citādi neietekmēs mūsu pakalpojumus. Eiropas Komisija neuzņemas nekādu atbildību par problēmām, kas rodas, izmantojot šo vietni vai kādu citu ārēju vietni, uz kuru esam snieguši hipersaiti. Šī atruna neierobežo Eiropas Komisijas atbildību tad, ja nav ievērotas spēkā esošo valsts tiesību aktu prasības, un neierobežo tās atbildību gadījumos, kad saskaņā ar tiesību aktiem tai atbildība ir jāuzņemas.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="lt">Remiantis 2009 m. spalio 16 d. Komisijos sprendimo 2009/767/EB, kuriuo pagal Europos Parlamento ir Tarybos direktyvą 2006/123/EB dėl paslaugų vidaus rinkoje nustatomos priemonės procedūroms, atliekamoms naudojantis elektroninėmis priemonėmis ir kontaktinių centrų paslaugomis, palengvinti, iš dalies pakeisto Komisijos sprendimu 2010/425/ES ir Komisijos įgyvendinimo sprendimu 2013/662/ES, 2 straipsnio 4 dalimi, šiame sąraše pateikiama informacija, kurią valstybės narės perdavė pagal Komisijos sprendimo 2009/767/EB 2 straipsnio 3 dalį. Ši Europos Komisijos administruojama interneto svetainė – sąveiki priemonė, skirta praktiniam naudojimuisi valstybių narių patikimais sąrašais palengvinti. Siekiame laiku teikti tikslią informaciją ir ištaisyti visas pastebėtas klaidas. Tačiau Komisija neprisiima atsakomybės ar teisinių įsipareigojimų dėl valstybių narių patikimų sąrašų turinio. Už jį atsakingos tik valstybės narės. Siekiame, kad būtų kuo mažiau nesklandumų dėl techninių klaidų. Tačiau tam tikri mūsų interneto svetainėje skelbiami duomenys gali būti sukurti ar susisteminti tokiose rinkmenose arba tokiais formatais, kuriuose pasitaiko klaidų, todėl negalime užtikrinti, kad tokios problemos nesutrikdys mūsų darbo ar jo kaip nors kitaip nepaveiks. Europos Komisija neprisiima atsakomybės už tokio pobūdžio problemas, kylančias naudojantis šia interneto svetaine arba kitomis su ja susietomis išorės svetainėmis. Šiuo atsakomybės apribojimu nesiekiama sumažinti Europos Komisijos teisinių įsipareigojimų nepažeisti jokių taikytinų nacionalinės teisės reikalavimų ar neprisiimti teisinių įsipareigojimų už tai, už ką pagal tą teisę nuo atsakomybės neatleidžiama.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="hu">A 2010/425/EU bizottsági határozattal és a 2013/662/EU bizottsági végrehajtási határozattal módosított, az eljárásoknak a belső piaci szolgáltatásokról szóló 2006/123/EK európai parlamenti és tanácsi irányelv szerinti egyablakos ügyintézési pontokon keresztül elektronikus eszközökkel történő teljesítését lehetővé tevő rendelkezések meghatározásáról szóló 2009. október 16-i 2009/767/EK bizottsági határozat 2. cikkének (4) bekezdése értelmében a jelen lista azokat az információkat tartalmazza, amelyeket a tagállamok a 2009/767/EK bizottsági határozat 2. cikkének (3) bekezdése értelmében jelentettek be. Az Európai Bizottság e weblapot a kölcsönös átjárhatóság elősegítésére tartja fönn, abból a célból, hogy megkönnyítse a megbízható szolgáltatók listájának használatát.  Célunk az, hogy ezek az információk naprakészek és pontosak legyenek. Amennyiben arról értesülünk, hogy a webhelyen hibás információk szerepelnek, azokat igyekszünk kijavítani. A Bizottság semmilyen felelősséget sem vállal a nemzeti megbízható szolgáltatók listájának tartalmáért, mert azért kizárólag a tagállamok felelősek. Arra törekszünk, hogy az esetleges technikai hibák a lehető legkisebb mértékben okozzanak fennakadásokat a portál működésében. Előfordulhat ugyanakkor, hogy a portál oldalain található adatok vagy információk olyan fájlokban vagy formátumokban állnak rendelkezésre, amelyek nem mentesek a hibáktól; ilyen esetekben nem tudjuk garantálni, hogy ezek a problémák nem okoznak fennakadásokat a webhely használata során.  Az Európai Bizottság nem vállal felelősséget a honlap (vagy a belinkelt külső honlapok) használatából fakadó problémákért. E jogi nyilatkozat nem korlátozza az Európai Bizottságnak az alkalmazandó közösségi jogban lefektetett követelményekből fakadó felelősségét, és nem zárja ki a Bizottság felelősségét olyan ügyekben, amelyekért az említett jog értelmében felelősségre vonható.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="mt">F'konformità mal-Art. 2(4) tad-Deċiżjoni tal-Kummissjoni 2009/767/KE tas-16 ta' Ottubru 2009 li tistipula miżuri li jiffaċilitaw l-użu ta’ proċeduri b’mezzi elettroniċi permezz tal-"punti ta’ kuntatt waħdieni" skont id-Direttiva 2006/123/KE tal-Parlament Ewropew u tal-Kunsill dwar is-servizzi fis-suq intern, kif emendata bid-Deċiżjoni tal-Kummissjoni 2010/425/UE, u d-Deċiżjoni ta' Implimentazzjoni tal-Kummissjoni 2013/662/UE, dan l-elenku fih l-informazzjoni notifikata mill-Istati Membri skont l-Art. 2 (3) tad-Deċiżjoni tal-Kummissjoni 2009/767/KE. Il-Kummissjoni Ewropea żżomm dan is-sit bħala strument ta' interoperabilità ddisinnjat biex jiffaċilita l-użu prattiku tal-Listi ta' Fiduċja nazzjonali. L-għan tagħna hu li nżommu din l-informazzjoni aġġornata u eżatta. Jekk tiġbdulna l-attenzjoni li hemm żbalji, aħna nippruvaw nikkoreġuhom. Madanakollu l-Kummissjoni ma taċċetta l-ebda responsabbiltà fir-rigward tal-kontenut tal-Listi ta' Fiduċja nazzjonali li taqa' esklussivament fuq l-Istati Membri. Huwa l-għan tagħna li nnaqqsu t-tfixkil ikkawżat mill-iżbalji tekniċi. Madanakollu, xi dejta jew informazzjoni fuq is-sit tagħna setgħet inħolqot jew ġiet strutturata f’fajls jew formati li mhumiex ħielsa mill-iżbalji u ma nistgħux niggarantixxu li s-servizz tagħna ma jiġix interrott jew b’xi mod effettwat minn problemi bħal dawn. Il-Kummissjoni ma tieħu l-ebda responsabbiltà għal dawn il-problemi mġarrba bħala riżultat tal-użu ta' dan is-sit jew kwalunkwe siti esterni relatati. Din ir-rinunzja mhijiex maħsuba biex tillimita r-responsabbiltà tal-Kummissjoni fil-kontravenzjoni ta' kwalunkwe rekwiżit stipulat fil-liġi applikabbli tal-Komunità, l-anqas biex tneħħi r-responsabbiltà għal kwistjonijiet li jistgħu ma jkunux esklużi taħt dik il-liġi.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="nl">Overeenkomstig artikel 2, lid 4, van Beschikking 2009/767/EG van de Commissie van 16 oktober 2009 inzake maatregelen voor een gemakkelijker gebruik van elektronische procedures via het één-loket in het kader van Richtlijn 2006/123/EG van het Europees Parlement en de Raad betreffende diensten op de interne markt, als gewijzigd bij Besluit 2010/425/EU van de Commissie en Uitvoeringsbesluit 2013/662/EU van de Commissie, bevat deze lijst de door de lidstaten meegedeelde gegevens op grond van artikel 2, lid 3, van Beschikking 2009/767/EG. De Europese Commissie wil met deze website het gebruik van de vertrouwenslijsten vergemakkelijken. Ons doel is up-to-date en nauwkeurige informatie aan te bieden. Gesignaleerde fouten worden zo snel mogelijk gecorrigeerd. De Commissie aanvaardt echter geen enkele verantwoordelijkheid of aansprakelijkheid met betrekking tot de informatie op de vertrouwenslijsten. De verantwoordelijkheid hiervoor ligt uitsluitend bij de EU-landen. Wij proberen onderbrekingen door technische storingen zoveel mogelijk te beperken. Sommige gegevens of informatie op onze site kan zijn aangemaakt of omgezet in bestanden of formaten die niet foutloos zijn. Wij kunnen niet uitsluiten dat onze dienstverlening door dergelijke problemen wordt verstoord. De Commissie aanvaardt geen aansprakelijkheid voor die problemen die zich als gevolg van het gebruik van deze site of van andere daarmee verbonden externe sites mochten voordoen. Met deze disclaimer wordt niet beoogd de aansprakelijkheid van de Commissie te beperken in strijd met de in de toepasselijke EU-wetgeving vervatte vereisten, noch haar aansprakelijkheid uit te sluiten voor aangelegenheden die uit hoofde van die wetgeving niet mogen worden uitgesloten.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="pl">Zgodnie z art. 2 ust. 4 decyzji Komisji 2009/767/WE z dnia 16 października 2009 r. ustanawiającej środki ułatwiające korzystanie z procedur realizowanych drogą elektroniczną poprzez „pojedyncze punkty kontaktowe” zgodnie z dyrektywą 2006/123/WE Parlamentu Europejskiego i Rady dotyczącą usług na rynku wewnętrznym, zmienionej decyzją Komisji 2010/425/UE i decyzją wykonawczą Komisji 2013/662/UE, wykaz ten zawiera informacje przekazane przez państwa członkowskie. Ta strona internetowa Komisji Europejskiej ma ułatwić korzystanie z krajowych zaufanych list. Naszym celem jest dostarczanie aktualnych i ścisłych informacji. Jeśli zostaniemy powiadomieni o błędach, dołożymy wszelkich starań, aby je skorygować. Komisja nie ponosi jednak żadnej odpowiedzialności za treść krajowych zaufanych list, za którą odpowiadają wyłącznie państwa członkowskie. Naszym celem jest ograniczenie do minimum zakłóceń wynikających z błędów technicznych. Jednak niektóre z zamieszczonych w tym serwisie danych lub informacji mogły być utworzone lub zamieszczone w plikach lub formatach, które nie są wolne od błędów, w związku z czym nie możemy zagwarantować, że problemy takie nie spowodują przerw w dostępie do serwisu lub innych zakłóceń w jego funkcjonowaniu. Komisja Europejska nie bierze odpowiedzialności w związku z tego rodzaju problemami będącymi następstwem korzystania z tego serwisu lub jakichkolwiek serwisów zewnętrznych, do których odsyła niniejszy serwis. Niniejsze zastrzeżenie nie ma na celu ograniczenia odpowiedzialności Komisji Europejskiej w przypadku naruszenia jakichkolwiek wymagań określonych w stosownych przepisach prawa krajowego ani wyłączenia jej odpowiedzialności za kwestie, które na gruncie tego prawa nie podlegają wyłączeniu.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="pt">Em conformidade com o n.º 4 do artigo 2.° da Decisão 2009/767/CE da Comissão, de 16 de Outubro de 2009, que determina medidas destinadas a facilitar a utilização de procedimentos informatizados através de balcões únicos, nos termos da Directiva 2006/123/CE do Parlamento Europeu e do Conselho relativa aos serviços no mercado interno, com a redacção que lhe foi dada pela Decisão 2010/425/EU e pela Decisão de Execução 2013/662/UE da Comissão, a presente lista contém as informações notificadas pelos Estados-Membros ao abrigo do n.º 3 do artigo 2.° da Decisão 2009/767/CE da Comissão. Este sítio Web da Comissão Europeia assegura a interoperabilidade necessária para facilitar uma utilização eficaz das listas aprovadas e tem por objectivo fornecer informações exactas e actualizadas. Procuraremos corrigir todos os erros que nos forem comunicados. Contudo, a Comissão declina toda e qualquer responsabilidade quanto ao conteúdo das listas aprovadas nacionais, que incumbe exclusivamente aos Estados-Membros. É nosso objectivo reduzir ao mínimo os inconvenientes causados por erros técnicos. Contudo, determinados dados constantes do nosso sítio podem ter sido criados ou estruturados em ficheiros ou formatos não isentos de erros, pelo que não podemos garantir um serviço sem interrupções ou perturbações. A Comissão declina qualquer responsabilidade por eventuais problemas que surjam na sequência da consulta deste sítio ou de quaisquer sítios externos a que as ligações dêem acesso. A presente declaração de exoneração de responsabilidade não pretende limitar a responsabilidade da Comissão Europeia de uma forma que contrarie o disposto na legislação nacional aplicável, nem excluir a sua responsabilidade nos casos em que tal não é permitido por essa legislação.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="ro">În conformitate cu articolul 2 alineatul (4) din Decizia Comisiei 2009/767/CE din 16 octombrie 2009 de stabilire a unor măsuri de facilitare a utilizării procedurilor prin mijloace electronice prin intermediul „ghișeelor unice” în temeiul Directivei 2006/123/CE a Parlamentului European și a Consiliului privind serviciile în cadrul pieței interne, așa cum a fost modificată prin Decizia Comisiei 2010/425/UE și prin Decizia de punere în aplicare 2013/662/UE a Comisiei, prezenta listă conține informațiile notificate de statele membre în conformitate cu articolul 2 alineatul (3) din Decizia Comisiei 2009/767/CE. Comisia Europeană utilizează acest site ca instrument de facilitare a utilizării Listelor naționale sigure, prin sporirea interoperabilității. Scopul nostru este ca aceste informații să fie actualizate și exacte. În cazul în care ni se vor semnala erori, vom încerca să le corectăm. Totuși, Comisia nu își asumă niciun fel de responsabilitate cu privire la conținutul Listelor naționale sigure, care intră, integral, în sarcina statelor membre. De asemenea, ne propunem să reducem consecințele negative cauzate de erori tehnice. Cu toate acestea, este posibil ca unele date sau informații de pe site-ul nostru să fi fost create sau structurate în fișiere sau formate care pot prezenta erori. Prin urmare, nu putem garanta că serviciile noastre nu vor fi întrerupte sau afectate de asemenea probleme. Comisia Europeană nu își asumă nicio responsabilitate cu privire la eventuale probleme survenite ca urmare a utilizării acestui site sau a oricăror alte site-uri externe la care face trimitere. Această denegare de responsabilitate nu este destinată să limiteze răspunderea Comisiei Europene într-un mod care contravine reglementărilor prevăzute de legislația internă aplicabilă și nu exclude răspunderea sa în cazuri care, în conformitate cu legislația respectivă, aceasta nu poate fi exclusă.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="sk">V súlade s článkom 2 ods. 4 rozhodnutia Komisie 2009/767/ES zo 16. októbra 2009, ktorým sa ustanovujú opatrenia na uľahčenie postupov elektronickými spôsobmi prostredníctvom miest jednotného kontaktu podľa smernice Európskeho parlamentu a Rady 2006/123/ES o službách na vnútornom trhu, zmeneného rozhodnutím Komisie 2010/425/EÚ a vykonávacím rozhodnutím Komisie 2013/662/EÚ, tento zoznam obsahuje informácie oznámené členskými štátmi podľa článku 2 ods. 3 rozhodnutia Komisie 2009/767/ES.  Európska komisia spravuje tieto internetové stránky ako interoperabilný nástroj, ktorý slúži na uľahčenie praktického využitia zoznamov dôveryhodných informácií. Naším cieľom je poskytovať tieto informácie včas a správne. Ak budeme upozornení na chyby, pokúsime sa ich napraviť. Komisia však nepreberá žiadnu zodpovednosť, ani inak neručí za obsah zoznamov dôveryhodných informácií, ktoré poskytli členské štáty. Je naším cieľom minimalizovať technické chyby. Niektoré informácie alebo údaje na tejto webovej lokalite však mohli byť vytvorené v chybných súboroch alebo formátoch, a preto nemožno zaručiť, že tieto problémy nespôsobia výpadok alebo inú poruchu našej webovej lokality. Komisia nenesie žiadnu zodpovednosť za podobné chyby, ktoré sa zistia pri používaní tejto lokality alebo pridružených externých lokalít. Zámerom tohto vyhlásenia o odmietnutí zodpovednosti nie je obmedzenie zodpovednosti Európskej komisie v rozpore s požiadavkami ustanovenými v príslušných vnútroštátnych predpisoch ani vylúčenie jej zodpovednosti vo veciach, v ktorých ju podľa týchto predpisov nie je možné vylúčiť.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="sl">Seznam v skladu s členom 2(4) Odločbe Komisije 2009/767/ES z dne 16. oktobra 2009 o vzpostavitvi ukrepov za pospeševanje uporabe postopkov po elektronski poti s pomočjo „enotnih kontaktnih točk“ po Direktivi 2006/123/ES Evropskega parlamenta in Sveta o storitvah na notranjem trgu, kakor je bila spremenjena z Odločbo Komisije 2010/425/EU in Izvedbenim sklepom Komisije 2013/662/EU, vsebuje informacije, ki so jih v skladu s členom 2 (3) Odločbe Komisije 2009/767/ES sporočile države članice. Evropska komisija si prizadeva izboljšati praktično uporabo zanesljivih seznamov držav članic. Temu je namenjeno tudi to spletišče. Želimo zagotavljati pravočasne in točne informacije. Če nas boste opozorili na morebitne napake, jih bomo poskušali čimprej odpraviti. Komisija ne prevzema nikakršne zakonske ali druge odgovornosti glede vsebine nacionalnih zanesljivih seznamov, za katero so odgovorne izključno države članice. Uporabnikom želimo omogočiti nemoteno uporabo s čim manj tehničnimi napakami. Vendar so lahko nekateri podatki in informacije na našem spletišču v datotekah ali obliki, ki niso popolnoma brez napak, zato ne moremo zagotoviti, da takšne težave ne bodo vplivale na zagotavljanje naših storitev. Komisija ne prevzema nobene odgovornosti v zvezi s težavami, ki so posledica uporabe tega spletišča ali povezanega zunanjega spletišča. Izjava ne omejuje odgovornosti Evropske komisije pri kakršnem koli delovanju v nasprotju z veljavno nacionalno zakonodajo, niti ne izključuje odgovornosti za dejanja, ki jih v skladu s to zakonodajo ni mogoče izključiti.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="fi">Tämä luettelo sisältää komission päätöksen 2009/767/EY 2 artiklan 4 kohdan mukaisesti tiedot, jotka EU-maat ovat toimittaneet komissiolle päätöksen 2009/767/EY 2 artiklan 3 kohdan mukaisesti (komission päätös 2009/767/EY, tehty 16 päivänä lokakuuta 2009, toimenpiteistä sähköisten menettelyjen käytön edistämiseksi keskitettyjä asiointipisteitä käyttäen palveluista sisämarkkinoilla annetun Euroopan parlamentin ja neuvoston direktiivin 2006/123/EY mukaisesti, sellaisena kuin se on muutettuna komission päätöksellä 2010/425/EU ja komissio täytäntöönpanopäätöksellä 2013/662/EU). Euroopan komissio ylläpitää tätä verkkosivustoa helpottaakseen kansallisten luotettavien luetteloiden käyttöä. Pyrimme pitämään tiedot ajantasaisina ja virheettöminä. Pyrimme korjaamaan tietoomme tulleet virheet. Komissio ei kuitenkaan voi olla vastuussa kansallisten luotettavien luetteloiden sisällöstä, joka on yksinomaan jäsenvaltioiden vastuulla. Tavoitteenamme on minimoida teknisten häiriöiden aiheuttamat haitat. Jotkin tiedot sivustollamme on voitu luoda tai muotoilla sellaiseen muotoon tai sellaisiin tiedostoihin, jotka eivät ole virheettömiä, emmekä voi taata, ettei palvelumme keskeydy tai etteivät kyseiset ongelmat muutoin vaikuta siihen. Euroopan komissio ei vastaa ongelmista, jotka johtuvat tämän sivuston tai siihen linkitettyjen ulkopuolisten sivustojen käytöstä. Tämän vastuuvapauslausekkeen tarkoituksena ei ole rajoittaa Euroopan komission vastuuta vastoin sovellettavan kansallisen lain vaatimuksia tai poistaa komission vastuuta seikoista, joiden osalta vastuuta ei sovellettavan kansallisen lain mukaan voida poistaa.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="sv">Av listan framgår var du kan hitta den information som EU-länderna har anmält, och som kommissionen måste tillhandahålla, enligt artikel 2.3 och 2.4 i kommissionens beslut 2009/767/EG av den 16 oktober 2009 om åtgärder som underlättar användningen av förfaranden på elektronisk väg genom gemensamma kontaktpunkter i enlighet med Europaparlamentets och rådets direktiv 2006/123/EG om tjänster på den inre marknaden, ändrad genom kommissionens beslut 2010/425/EU och kommissionens genomförandebeslut 2013/662/EU. Vi har samlat informationen på den här webbplatsen, så att du lättare ska kunna använda den i praktiken. Vi strävar efter att hålla informationen aktuell och korrekt. Om felaktigheter kommer till vår kännedom, försöker vi att rätta till dem. Vi frånsäger oss dock allt ansvar för de nationella förteckningarna. Medlemsländerna ansvarar helt och hållet själva för innehållet. Vi strävar efter att så långt som möjligt undvika tekniska störningar. En del uppgifter eller information på vår sida kan dock ha skapats eller strukturerats i filer eller format som inte är felfria. Vi kan inte garantera att den service vi tillhandahåller kommer att vara fri från avbrott eller andra störningar som har att göra med sådana problem. Kommissionen frånsäger sig allt ansvar för problem som kan uppstå till följd av att denna webbplats eller någon av dess länkar har använts. Denna ansvarsfriskrivning är inte avsedd att inskränka kommissionens ansvar i strid med tillämplig nationell lagstiftning eller att utesluta ansvar för kommissionen i de fall där friskrivning inte får ske enligt sådan lagstiftning.</TSLLegalNotice>
++         <TSLLegalNotice xml:lang="hr">U skladu s člankom 2. stavkom 4. Odluke Komisije 2009/767/EZ od 16. listopada 2009. o utvrđivanju mjera kojima se olakšava uporaba postupaka elektroničkim putem preko „jedinstvenih kontaktnih točaka” u skladu s Direktivom 2006/123/EZ Europskog parlamenta i Vijeća o uslugama na unutarnjem tržištu, kako je izmijenjena Odlukom Komisije 2010/425/EU i Provedbenom odlukom Komisije 2013/662/EU, trenutačni popis sadržava informacije o kojima su države članice izvijestile u skladu s člankom 2. stavkom 3. Odluke Komisije 2009/767/EZ. Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperabilnosti koje je napravljeno kako bi olakšalo praktičnu primjenu nacionalnih pouzdanih popisa. Naš je cilj ove informacije održavati pravodobnim i točnim. Ukaže li nam se na pogreške, pokušat ćemo ih otkloniti. No, Komisija ne preuzima nikakvu odgovornost za sadržaj nacionalnih pouzdanih popisa, jer su za njega odgovorne isključivo države članice. Cilj nam je smetnje uzrokovane tehničkim pogreškama svesti na minimum. Međutim, postoji mogućnost da su neki podaci i informacije na našim stranicama izrađeni ili strukturirani u datotekama ili formatima koji nisu bez pogrešaka te stoga ne možemo jamčiti da će se naše usluge odvijati bez prekida ili da takvi problemi neće na neki drugi način utjecati na njih. Europska Komisija ne preuzima nikakvu odgovornost u vezi s problemima koji nastanu zbog uporabe ovih stranica ili bilo kojih povezanih vanjskih stranica. Ovom se izjavom o ograničenju odgovornosti ne ograničava odgovornost Europske Komisije u slučaju kršenja uvjeta propisanih primjenjivim nacionalnim pravom niti se isključuje njezina odgovornost u slučajevima u kojima u skladu s tim pravom to nije moguće.</TSLLegalNotice>
++      </PolicyOrLegalNotice>
++      <HistoricalInformationPeriod>65535</HistoricalInformationPeriod>
++      <PointersToOtherTSL>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIEOzCCAyOgAwIBAgIJAKP8xLe3bmRsMA0GCSqGSIb3DQEBCwUAMFoxCzAJBgNVBAYTAkFUMS8wLQYDVQQKEyZSdW5kZnVuayB1bmQgVGVsZWtvbSBSZWd1bGllcnVuZ3MtR21iSDEaMBgGA1UEAxMRVHJ1c3RlZCBMaXN0IENBIDEwHhcNMTQwMTI4MTgxNTE4WhcNMTcwMTI4MTgxNTE4WjBXMQswCQYDVQQGEwJBVDEvMC0GA1UEChMmUnVuZGZ1bmsgdW5kIFRlbGVrb20gUmVndWxpZXJ1bmdzLUdtYkgxFzAVBgNVBAMTDlRydXN0ZWQgTGlzdCA0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuh3Ht0BXqmhmMcFDPgSV10WyLlwe3PFoIrgeg3cYQEF+YOtiV5nm6dJnlxoXcO5TJIfbXoSdSOYJTtCuQvZDySHTlSvM5Mr29GRjA489ZKE7pEaI9semFeMyvPaJ/EvaG3ShvrQlLebsS4ALk8JXTRTalZmBlbWi9jK2IFMQaLjQN88K2aUrDZqIqRR4WhBP7T4I3dSVYVmi0TR41JWyaVXKWp7b9WJULewVTf0g+72qwtd7VZo0zQuQgAUsT9bOv8K6PyNIMShh3fLXefaIlmXnPsua6bKc1VAjjR91f83koKUOmDIUciFCsyksa/HUV1tAcZdUZsYe/1JGEJ1CEwIDAQABo4IBBTCCAQEwHwYDVR0jBBgwFoAUsJT0MPOFfU37Ha8aHJ6ELK/YXBkwHQYDVR0OBBYEFNlVL81aLTXfTM3az8PKyBbeWvvFMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSAEDzANMAsGCSooAA8AAQEBADAJBgNVHRMEAjAAMBEGA1UdJQQKMAgGBgQAkTcDADA2BgNVHR8ELzAtMCugKaAnhiVodHRwczovL3d3dy5zaWduYXR1ci5ydHIuYXQvdGxjYTEuY3JsMEEGCCsGAQUFBwEBBDUwMzAxBggrBgEFBQcwAoYlaHR0cHM6Ly93d3cuc2lnbmF0dXIucnRyLmF0L3RsY2ExLmNlcjANBgkqhkiG9w0BAQsFAAOCAQEAHrMrSL2PDCplhLKXmrspfEyjDcCxm6LtoHF58gtZ/kuPQEXzib/6ncxp8wu+HzkHLkZd38rVWgXObngHoKY2F6WtO48xtXgJ7zv2f3Km4yvEuXm/Ro7hzizDatuLZdzCiu97rnvRxCbaQV2XV73dmki+a87ybEGFQGVKBfSM0rEy0p0FD+fRtRvwYafvKjzbC93OJOD7FepEKsHO8CHFWG8X4VxPjkKy/R1yPn2tT/yio626AnKRDqy9/bUQFWITzKMHkVNZY1OMTL7WXjmWFc7L+b0Wt15xBO0YuNg3delXE8aNXdizYDlTzbJUpmq8EcuxHQlMMDQUBtyDcj0RcA==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIEOzCCAyOgAwIBAgIJAKP8xLe3bmRtMA0GCSqGSIb3DQEBCwUAMFoxCzAJBgNVBAYTAkFUMS8wLQYDVQQKEyZSdW5kZnVuayB1bmQgVGVsZWtvbSBSZWd1bGllcnVuZ3MtR21iSDEaMBgGA1UEAxMRVHJ1c3RlZCBMaXN0IENBIDEwHhcNMTQwMTI4MTgzMzI5WhcNMTgwMTI4MTgzMzI5WjBXMQswCQYDVQQGEwJBVDEvMC0GA1UEChMmUnVuZGZ1bmsgdW5kIFRlbGVrb20gUmVndWxpZXJ1bmdzLUdtYkgxFzAVBgNVBAMTDlRydXN0ZWQgTGlzdCA1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxsSAzrdy4zFiN1bypCT2LZ5O07y9nTJxNlFXERfTzf0zSEtOKXTjxuRQvXvDSfvvar2au9QDuUEdA+jO9NlBFfHfl95ON/gGhQG/NLplVfVB80y4/iX08O43ZuDXcZbBaNdg6M/2qCwflXBakkwaiF7l2kJQyPl+w9hkSi3LBLRfssJOsk5K8VxaILW680gwVX+9BeShXKn5Fr5vde1G1rAKjs6kNtIlrGLWEXyVeAcdDZNKO16MynSMAUeoyz1k74vdWV1/ixrz2DtgeD/rJOnIiDrBqReJzFyZ74iCIsC4EtiIAg5nEah0krWPH6Yhsurqo8zKYDaZAhmJ2hK39wIDAQABo4IBBTCCAQEwHwYDVR0jBBgwFoAUsJT0MPOFfU37Ha8aHJ6ELK/YXBkwHQYDVR0OBBYEFC9vHwsF0o04l9zC+UONiidHmxfJMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSAEDzANMAsGCSooAA8AAQEBADAJBgNVHRMEAjAAMBEGA1UdJQQKMAgGBgQAkTcDADA2BgNVHR8ELzAtMCugKaAnhiVodHRwczovL3d3dy5zaWduYXR1ci5ydHIuYXQvdGxjYTEuY3JsMEEGCCsGAQUFBwEBBDUwMzAxBggrBgEFBQcwAoYlaHR0cHM6Ly93d3cuc2lnbmF0dXIucnRyLmF0L3RsY2ExLmNlcjANBgkqhkiG9w0BAQsFAAOCAQEAfOCwly06iznOF0juUqqXkC0YoQDwVD8OqlevpJkrvAEl+uYTEa0XzBdTCZ+zXdJW6Icgt+pces+RjeFh4tIQgBkwqPWqmnTqw37ysxgqPO0EHXGu/zLdoA2+8TLLsu9csQ+NY4qNfxFXTWoFqlaUC6Af86Tds7QyjVyqOTMjxS8QKqNfI3bLvc9dSH+oi1v2xsFAl/igoKTqWRhad79lroBRKG6SqNR6Y5WqVFMHToZMD+cdulJE6jrKp3hZQrU/8qkKlqTiem6x2NkKAsGZ13+j25P9Pb3x6hh1gV0A1urI1kG+4cj8UDqLhpPXJN/ZtF95WBaioUhiEae3gojXlA==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>https://www.signatur.rtr.at/currenttl.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>AT</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Rundfunk und Telekom Regulierungs-GmbH</Name>
++                     <Name xml:lang="de">Rundfunk und Telekom Regulierungs-GmbH</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/AT</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIID3zCCAsegAwIBAgIJAOOTbJMmowFCMA0GCSqGSIb3DQEBBQUAMIGHMS0wKwYDVQQDEyRCZWxnaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxSTBHBgNVBAoTQEZQUyBFY29ub215LCBTTUVzLCBTZWxmLWVtcGxveWVkIGFuZCBFbmVyZ3kgLSBRdWFsaXR5IGFuZCBTYWZldHkxCzAJBgNVBAYTAkJFMB4XDTE0MDIxOTEzMzcxNVoXDTI0MDIxNzEzMzcxNVowgYcxLTArBgNVBAMTJEJlbGdpYW4gVHJ1c3RlZCBMaXN0IFNjaGVtZSBPcGVyYXRvcjFJMEcGA1UEChNARlBTIEVjb25vbXksIFNNRXMsIFNlbGYtZW1wbG95ZWQgYW5kIEVuZXJneSAtIFF1YWxpdHkgYW5kIFNhZmV0eTELMAkGA1UEBhMCQkUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAgEFkoDPTYDvGk+/IPnGSPm58NRE7mpzLHk8lxpYnTAtbMhn7FWru9GlNi+blYYNOEmzN2E5KO9+7AAAMmx2x8zmEMwc3oUQ7E0WN5Gl+Y+7n6NtX50D/4Sbw4IjVvwwRRru8Coj5vq5Hz3JKTgft8teEpwb5vSFZh6+o9irdX342RJU4AtG78sxZvzIqpa3WsddMf5XDyjnGK3dRgkDuOaBxWEexuUiN4LvO+MacwoaxEqLhEZ6TALGWS2WmNEW3OlUdf7nc0Tz/lnyQsuFn01c4pg56hjyxLtpjyHwNwbTDx+cjBpBveOT9Nb6UfKFHknC5AfrIOWnFLXUmyKD/AgMBAAGjTDBKMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgbAMB0GA1UdDgQWBBRf745pXfv0l1rxBwgOUhlQqteQUTARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBAG8j1gOIKEKTd904EepYs1MioBErjXxkAN2zvaZevh3awkB6cGeQUnmDz3ve4ZCJSB4MZ138EkUi2eobXaPyaLv01vl6sM6eUj6QhwNvfGXHP99AOHG8ZyH4IkJgB+8jImhg2danj4VcAosGtvTknYtZ2K+GhRevgAnoryhJ7A7jszwWzaahFwTnunymlBXlrwG9KyBSkg4IhWgc+IgYUgA7rpOZ6zXFPTJQJphiRg7pQECnV1Fvw9ediMGhBnNL3tE/5IKIug2XoJ3Mlh9lho6c8YAhyp2Q16inCLDJksZc1qUqRHo9lmwWnGANWfZvQWRJS0LJvrF7LSL5H/Y4yZo=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIID3zCCAsegAwIBAgIJAIg4aOU7at17MA0GCSqGSIb3DQEBBQUAMIGHMS0wKwYDVQQDEyRCZWxnaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxSTBHBgNVBAoTQEZQUyBFY29ub215LCBTTUVzLCBTZWxmLWVtcGxveWVkIGFuZCBFbmVyZ3kgLSBRdWFsaXR5IGFuZCBTYWZldHkxCzAJBgNVBAYTAkJFMB4XDTE0MDIxOTEzMzcyN1oXDTI0MDYxNjEzMzcyN1owgYcxLTArBgNVBAMTJEJlbGdpYW4gVHJ1c3RlZCBMaXN0IFNjaGVtZSBPcGVyYXRvcjFJMEcGA1UEChNARlBTIEVjb25vbXksIFNNRXMsIFNlbGYtZW1wbG95ZWQgYW5kIEVuZXJneSAtIFF1YWxpdHkgYW5kIFNhZmV0eTELMAkGA1UEBhMCQkUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAgEFkoDPTYDvGk+/IPnGSPm58NRE7mpzLHk8lxpYnTAtbMhn7FWru9GlNi+blYYNOEmzN2E5KO9+7AAAMmx2x8zmEMwc3oUQ7E0WN5Gl+Y+7n6NtX50D/4Sbw4IjVvwwRRru8Coj5vq5Hz3JKTgft8teEpwb5vSFZh6+o9irdX342RJU4AtG78sxZvzIqpa3WsddMf5XDyjnGK3dRgkDuOaBxWEexuUiN4LvO+MacwoaxEqLhEZ6TALGWS2WmNEW3OlUdf7nc0Tz/lnyQsuFn01c4pg56hjyxLtpjyHwNwbTDx+cjBpBveOT9Nb6UfKFHknC5AfrIOWnFLXUmyKD/AgMBAAGjTDBKMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgbAMB0GA1UdDgQWBBRf745pXfv0l1rxBwgOUhlQqteQUTARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBAARQuvNV68TF35U7OsMlmYQKaST7Ep2VytJXinRPFAmMJWM9f59ZkSH86BNi7bLo3llYyfUgEZYLwLQXFImMBvme0FmqNbtYsbz6pNi0kW7yYrNa0Gq27Mh5sMB7+6mWUWNU82zRoFGGAz5lE1ID/w2hLRb5vk+rpY3MatT9BRpGfQP8sxyD2PsWr6sTmR11FY/+iOGVkPnZ9ZzyIPKegEFVfyuuMZWS0Dovyqsk9V392e+Y2IyPZfLRAwlPPoXWNtZ70cu0w3ZSn7/0lHCJtijbSJtZ1fDGggwqDv3imx5dzEDkqKluFQ5YjVL7tSYu/tzplS6Qn2kubGpItEe7R8k=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIID3zCCAsegAwIBAgIJAJH6V+OXuB7aMA0GCSqGSIb3DQEBBQUAMIGHMS0wKwYDVQQDEyRCZWxnaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxSTBHBgNVBAoTQEZQUyBFY29ub215LCBTTUVzLCBTZWxmLWVtcGxveWVkIGFuZCBFbmVyZ3kgLSBRdWFsaXR5IGFuZCBTYWZldHkxCzAJBgNVBAYTAkJFMB4XDTE0MDIxOTEzMzc0MFoXDTI0MTAxNDEzMzc0MFowgYcxLTArBgNVBAMTJEJlbGdpYW4gVHJ1c3RlZCBMaXN0IFNjaGVtZSBPcGVyYXRvcjFJMEcGA1UEChNARlBTIEVjb25vbXksIFNNRXMsIFNlbGYtZW1wbG95ZWQgYW5kIEVuZXJneSAtIFF1YWxpdHkgYW5kIFNhZmV0eTELMAkGA1UEBhMCQkUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAgEFkoDPTYDvGk+/IPnGSPm58NRE7mpzLHk8lxpYnTAtbMhn7FWru9GlNi+blYYNOEmzN2E5KO9+7AAAMmx2x8zmEMwc3oUQ7E0WN5Gl+Y+7n6NtX50D/4Sbw4IjVvwwRRru8Coj5vq5Hz3JKTgft8teEpwb5vSFZh6+o9irdX342RJU4AtG78sxZvzIqpa3WsddMf5XDyjnGK3dRgkDuOaBxWEexuUiN4LvO+MacwoaxEqLhEZ6TALGWS2WmNEW3OlUdf7nc0Tz/lnyQsuFn01c4pg56hjyxLtpjyHwNwbTDx+cjBpBveOT9Nb6UfKFHknC5AfrIOWnFLXUmyKD/AgMBAAGjTDBKMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgbAMB0GA1UdDgQWBBRf745pXfv0l1rxBwgOUhlQqteQUTARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBABSri/BFtWHsvDgFri/fPFXJaQ9a5U1HgfOrg0pcVacnC2ezhZ3Ita1d+nWlaHfUBx2L7pp41G23TZE9Efcb/8RPuYDDcIv2TSKV/hIxthk+IP6avZ6cEuWL3iXhqusRM313QgH8G67EPDmTy9hX0t/3KnBQZ6gmb9SpTnG44pQ8LOfLvpzaT2Z1etBsXp0JED7P0OPJq459S3huIYoM3NTNaU8dLGAYJUR7D2fcvDySvt8xIjO7HtzHer79Uq4bNn8uRRHgKJ2LMBK0LvoVBX0PekQFSXi06xpPA9SjmozZ76dW0fK7uPUOFoXB9LtsZCFsMRjTL9+KhPyhSam2iy8=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIID3zCCAsegAwIBAgIJAK7RpgGHETKPMA0GCSqGSIb3DQEBBQUAMIGHMS0wKwYDVQQDEyRCZWxnaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxSTBHBgNVBAoTQEZQUyBFY29ub215LCBTTUVzLCBTZWxmLWVtcGxveWVkIGFuZCBFbmVyZ3kgLSBRdWFsaXR5IGFuZCBTYWZldHkxCzAJBgNVBAYTAkJFMB4XDTE0MDIxOTEzMzc1MloXDTI1MDIxMTEzMzc1MlowgYcxLTArBgNVBAMTJEJlbGdpYW4gVHJ1c3RlZCBMaXN0IFNjaGVtZSBPcGVyYXRvcjFJMEcGA1UEChNARlBTIEVjb25vbXksIFNNRXMsIFNlbGYtZW1wbG95ZWQgYW5kIEVuZXJneSAtIFF1YWxpdHkgYW5kIFNhZmV0eTELMAkGA1UEBhMCQkUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAgEFkoDPTYDvGk+/IPnGSPm58NRE7mpzLHk8lxpYnTAtbMhn7FWru9GlNi+blYYNOEmzN2E5KO9+7AAAMmx2x8zmEMwc3oUQ7E0WN5Gl+Y+7n6NtX50D/4Sbw4IjVvwwRRru8Coj5vq5Hz3JKTgft8teEpwb5vSFZh6+o9irdX342RJU4AtG78sxZvzIqpa3WsddMf5XDyjnGK3dRgkDuOaBxWEexuUiN4LvO+MacwoaxEqLhEZ6TALGWS2WmNEW3OlUdf7nc0Tz/lnyQsuFn01c4pg56hjyxLtpjyHwNwbTDx+cjBpBveOT9Nb6UfKFHknC5AfrIOWnFLXUmyKD/AgMBAAGjTDBKMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgbAMB0GA1UdDgQWBBRf745pXfv0l1rxBwgOUhlQqteQUTARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBABabI8rU/pW4uiTHk47X838qntx6FJ5iDCs+iaED142+yju/wQVU4J8rjS4UqsdO8wOM4sfyLjMLRRsK60saZ5o2u+tLIj0QrFRytTD1WIuPZxpBjQU8Zj/+aLkr4bQmyqgJ4XzJZ9BMvi3Yv18jQxJSjvGpXaWpUNLNnhENTuzKv8f/0vBn2Inmpg7cwgj2q8qhZ/3r1ZmHETSDmEdjV4ovYruAKX58jwwnRdgacTtgQpB88+zZDtAp3FVJxR9nefCdvjV2nuN++UgA2v8d2u9c8c7ObGd7dL6O9rQCfvBWbw6/h9nkXSJSAjKXS1uvnABtq3fQabHwxNc8rIQPkLk=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIID3zCCAsegAwIBAgIJAOv7FV6q0Or/MA0GCSqGSIb3DQEBBQUAMIGHMS0wKwYDVQQDEyRCZWxnaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxSTBHBgNVBAoTQEZQUyBFY29ub215LCBTTUVzLCBTZWxmLWVtcGxveWVkIGFuZCBFbmVyZ3kgLSBRdWFsaXR5IGFuZCBTYWZldHkxCzAJBgNVBAYTAkJFMB4XDTE0MDIxOTEzMzgwNFoXDTI1MDYxMTEzMzgwNFowgYcxLTArBgNVBAMTJEJlbGdpYW4gVHJ1c3RlZCBMaXN0IFNjaGVtZSBPcGVyYXRvcjFJMEcGA1UEChNARlBTIEVjb25vbXksIFNNRXMsIFNlbGYtZW1wbG95ZWQgYW5kIEVuZXJneSAtIFF1YWxpdHkgYW5kIFNhZmV0eTELMAkGA1UEBhMCQkUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAgEFkoDPTYDvGk+/IPnGSPm58NRE7mpzLHk8lxpYnTAtbMhn7FWru9GlNi+blYYNOEmzN2E5KO9+7AAAMmx2x8zmEMwc3oUQ7E0WN5Gl+Y+7n6NtX50D/4Sbw4IjVvwwRRru8Coj5vq5Hz3JKTgft8teEpwb5vSFZh6+o9irdX342RJU4AtG78sxZvzIqpa3WsddMf5XDyjnGK3dRgkDuOaBxWEexuUiN4LvO+MacwoaxEqLhEZ6TALGWS2WmNEW3OlUdf7nc0Tz/lnyQsuFn01c4pg56hjyxLtpjyHwNwbTDx+cjBpBveOT9Nb6UfKFHknC5AfrIOWnFLXUmyKD/AgMBAAGjTDBKMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgbAMB0GA1UdDgQWBBRf745pXfv0l1rxBwgOUhlQqteQUTARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBAJQt17IzKeqnxakdgysT1FlymocZUUHGhfbQAfr4OEm48LMoN4M5ZeeRMVIwk4jODURuhawtKJ3hRdGB+zTzIMLheOmAGGRDUNrDwctpn8G+RqEFjlgc5yi1ICHBZJrvyud7cPwz8AwMtV+K1iFmbEWqsGASZ96J9uilJJ+RkPcV3Olwtgi3+IxOxHfhmq0PCdRk1k8+c7frdT935Z8SfFgnaPy4RFg2eKdvC2qsvsF3J19eP/BKlGdVVe44yTB3UCE3KSLiySvgM/JXIQN5VE+lGPeURKnoXsW5E71IdUEi30Ptd0YBxTjEairZKyzhgGbZEnBUWSkn6n9uZ5Ai2lo=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://tsl.belgium.be/tsl-be.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>BE</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">FPS Economy, SMEs, Self-employed and Energy - Quality and Safety</Name>
++                     <Name xml:lang="fr">SPF Economie, PME, Classes moyennes et Energie - Qualité et Sécurité</Name>
++                     <Name xml:lang="nl">FOD Economie, KMO, Middenstand en Energie - Kwaliteit en Veiligheid</Name>
++                     <Name xml:lang="de">FÖD Wirtschaft, KMU, Mittelstand und Energie - Qualität und Sicherheit</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/BE</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIFUTCCBDmgAwIBAgIIM7DFMDyB1XwwDQYJKoZIhvcNAQEFBQAwgYcxgYQwCQYDVQQGDAJCRzAVBgNVBAMMDkNSQyBNZW1iZXJzIENBMBUGA1UECwwOQ1JDIE1lbWJlcnMgQ0EwHAYKCZImiZPyLGQBGRYOY3JjLW1lbWJlcnMtY2EwKwYDVQQKDCRDb21tdW5pY2F0aW9ucyBSZWd1bGF0aW9uIENvbW1pc3Npb24wHhcNMTIxMTE1MTEyODA1WhcNMTcxMTE1MTEyODA1WjCB6DGB5TAJBgNVBAYMAkJHMAsGA1UEEQwEMTAwMDAMBgNVBAcMBVNvZmlhMA8GA1UECwwIQ2hhaXJtYW4wEgYDVQQJDAs2IEd1cmtvIHN0cjAcBgkqhkiG9w0BCQEWD3Zib3poa292QGNyYy5iZzAcBgoJkiaJk/IsZAEZFg5jcmMtbWVtYmVycy1jYTArBgNVBAoMJENvbW11bmljYXRpb25zIFJlZ3VsYXRpb24gQ29tbWlzc2lvbjAvBgNVBAMMKNCS0LXRgdC10LvQuNC9INCR0L7QttC60L7QsiDQkdC+0LbQutC+0LIwggEjMA0GCSqGSIb3DQEBAQUAA4IBEAAwggELAoIBAQCKnw+xckNqW++OppSxnAqaSHILSgT8cR1t7vN4/4lS/kyOzsmyilRHP3MqdduPnx6bAl/oW4lxxU0scHK4qyPJM8RPqvcMNsM5Vlyp8+q5ytZQvbuWBsbHENZ68Nyj0dtaSsZWxaho1JYvE7feTUMQaAIxJ5HCSfij9nHP0PP9XA53MOpKZ+H7NNsBe2t4PFa2MaK5LuS54HYROofSrx6j0LRre0p3T3D/4ZfRH62k2IGikAvS9iK93e9u7GcS8ozNtObDys5AXMyJylgg7gvPccUAAC3tbHERyGp+7tDhRr7qsNgD8jKLVEIIQHgWzm3oA51p1Xppro0MPz4hkhI3AgQAqnrBo4IBWzCCAVcwDgYDVR0PAQH/BAQDAgbAMBEGA1UdJQQKMAgGBgQAkTcDADAkBggrBgEFBQcBAwQYMBYwFAYIKwYBBQUHCwEwCAYGBACORgEBMH8GA1UdIAR4MHYwdAYJKwYBBAH/FAECMGcwNwYIKwYBBQUHAgEWK2h0dHA6Ly93d3cuY3JjLmJnL2ZpbGVzL19iZy9tZW1iZXJzLWNhLmh0bWwwLAYIKwYBBQUHAgIwIBoeQ1JDIFRTTCBTaWduaW5nIENlcnRpZmljYXRlIENQMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly93d3cuZWdvdi5iZy9jcmwvY3JjLW1lbWJlcnMtY2EuY3JsMA8GA1UdEwEB/wQFMAMBAQAwHQYDVR0OBBYEFGKuRxwBsTCtBlelS0n99RamUm2/MB8GA1UdIwQYMBaAFAkINvmsvi5j6+G+YL3jm5fJ4lE4MA0GCSqGSIb3DQEBBQUAA4IBAQBnBn/q6hgNLO2RcQZ5BnYPYhG81/lcua8T6Um7lmO4JLP+BXhmFexheR24Hs6RpgDpTwNq4aWb3Juh5GMqtWALIGOMbbegQHQ4Sa0nrVcWsUVStI9oOv8LpRfrECKYHNLjNnVliOa9dYfHcWX5aFuDc78DlBp7HwPX7L1UbK0zMRIlm4dqNfAHGvUrv7pDa1j2etRMCxO9c6Fzzh7fMYJ+/1MP6nu7bz554jCFuz5Q+VVq3m7EyGT2TbGi/m2zCF2gWke6OJamhRf8Fy3dYIS3EDampRsaiNG32Qz3ZKyyRwb6QI9IZouy9zCMKwgDeXiXZP+r1WowMO9QRkmepCGd</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIFWDCCBECgAwIBAgIJAIW0w8KGYDu+MA0GCSqGSIb3DQEBBQUAMIGHMYGEMAkGA1UEBgwCQkcwFQYDVQQDDA5DUkMgTWVtYmVycyBDQTAVBgNVBAsMDkNSQyBNZW1iZXJzIENBMBwGCgmSJomT8ixkARkWDmNyYy1tZW1iZXJzLWNhMCsGA1UECgwkQ29tbXVuaWNhdGlvbnMgUmVndWxhdGlvbiBDb21taXNzaW9uMB4XDTE0MDkwNDEwMDExNFoXDTE5MDkwNDEwMDExNFowge8xgewwCQYDVQQGDAJCRzALBgNVBBEMBDEwMDAwDAYDVQQHDAVTb2ZpYTARBgNVBAsMCkNSQyBNZW1iZXIwEgYDVQQJDAs2IEd1cmtvIHN0cjAcBgoJkiaJk/IsZAEZFg5jcmMtbWVtYmVycy1jYTAdBgkqhkiG9w0BCQEWEGlyb21hbnNrYUBjcmMuYmcwKwYDVQQKDCRDb21tdW5pY2F0aW9ucyBSZWd1bGF0aW9uIENvbW1pc3Npb24wMwYDVQQDDCzQmNGA0LjQvdCwINCh0YLQsNC90YfQtdCy0LAg0KDQvtC80LDQvdGB0LrQsDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALeau49s8E/Amx+zQnH76Vkep/eOntMOpFVKYp2KxhMX8p9pJ0N6iJgJs7DiPSbkqVQ1LnG8+Dj9Z0BQiPgh8Sg7EIxmCf6YVcmWc14naYxYzMqCwbBz3Uu5xOzfE8/0WIyGHQHpHa5DZk8bZBuyKICfGOoKrL1SlCHZ3pkXawPLyyupBjvInRBY3dCfPRDOq6XZVCJKwaQoWhiPYtjB3pgiWlU5Hd7RbiSh2EaV2vVdLvoQ5rb71FdnWUgiW4zjc+2KtoWnWQ0RBTfWCQL6XJgBdXyBA5d9ONUQRfbWKeyq1+9vMXR2H9arW5QD/Sra59NaN6ZaS4WWc6n7NrLhdU8CAwEAAaOCAVswggFXMA4GA1UdDwEB/wQEAwIGwDARBgNVHSUECjAIBgYEAJE3AwAwJAYIKwYBBQUHAQMEGDAWMBQGCCsGAQUFBwsBMAgGBgQAjkYBATB/BgNVHSAEeDB2MHQGCSsGAQQB/xQBAjBnMDcGCCsGAQUFBwIBFitodHRwOi8vd3d3LmNyYy5iZy9maWxlcy9fYmcvbWVtYmVycy1jYS5odG1sMCwGCCsGAQUFBwICMCAaHkNSQyBUU0wgU2lnbmluZyBDZXJ0aWZpY2F0ZSBDUDA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vd3d3LmVnb3YuYmcvY3JsL2NyYy1tZW1iZXJzLWNhLmNybDAPBgNVHRMBAf8EBTADAQEAMB0GA1UdDgQWBBRTRU7qRNyUTqcHzCscgHucWf61qjAfBgNVHSMEGDAWgBQJCDb5rL4uY+vhvmC945uXyeJRODANBgkqhkiG9w0BAQUFAAOCAQEAB3/B1OoF3Pm9fqgEmD1ug7+f8IeGYaRDQWKa3ieFm1Dl6VypydHilogYgFtUjvcOTJYi+INb0HglfOxoqx64RzzEleCSSz2tp5IlL0aKylMqv8Zoe/zPE5Qow7ZEx0M6vHRi8nM0v3RmzeMORdiFQWyvoNuJmPLtTO/UFC3DbabWozmNjGN8/OV8VOyLr637YEP6UpILbvPt9VVn3aC7Ll0SoxRH7kcfiCQ+RJYhB2DJVhvXnOXw1Jzeuyu9a8AVUrb2Aaw9sK3tSWQbCZeg1rxsMuEYpFUqM982ClVCAWG/X04S4DYthY1U9RDE1fGNzKKs/XtzdhiZTXtlW5jyFA==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://crc.bg/files/_bg/TSL-CRC-BG-signed.pdf</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>BG</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/pdf</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Communications Regulation Commission</Name>
++                     <Name xml:lang="bg">Комисия за регулиране на съобщенията</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/BG</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIFUTCCBDmgAwIBAgIIM7DFMDyB1XwwDQYJKoZIhvcNAQEFBQAwgYcxgYQwCQYDVQQGDAJCRzAVBgNVBAMMDkNSQyBNZW1iZXJzIENBMBUGA1UECwwOQ1JDIE1lbWJlcnMgQ0EwHAYKCZImiZPyLGQBGRYOY3JjLW1lbWJlcnMtY2EwKwYDVQQKDCRDb21tdW5pY2F0aW9ucyBSZWd1bGF0aW9uIENvbW1pc3Npb24wHhcNMTIxMTE1MTEyODA1WhcNMTcxMTE1MTEyODA1WjCB6DGB5TAJBgNVBAYMAkJHMAsGA1UEEQwEMTAwMDAMBgNVBAcMBVNvZmlhMA8GA1UECwwIQ2hhaXJtYW4wEgYDVQQJDAs2IEd1cmtvIHN0cjAcBgkqhkiG9w0BCQEWD3Zib3poa292QGNyYy5iZzAcBgoJkiaJk/IsZAEZFg5jcmMtbWVtYmVycy1jYTArBgNVBAoMJENvbW11bmljYXRpb25zIFJlZ3VsYXRpb24gQ29tbWlzc2lvbjAvBgNVBAMMKNCS0LXRgdC10LvQuNC9INCR0L7QttC60L7QsiDQkdC+0LbQutC+0LIwggEjMA0GCSqGSIb3DQEBAQUAA4IBEAAwggELAoIBAQCKnw+xckNqW++OppSxnAqaSHILSgT8cR1t7vN4/4lS/kyOzsmyilRHP3MqdduPnx6bAl/oW4lxxU0scHK4qyPJM8RPqvcMNsM5Vlyp8+q5ytZQvbuWBsbHENZ68Nyj0dtaSsZWxaho1JYvE7feTUMQaAIxJ5HCSfij9nHP0PP9XA53MOpKZ+H7NNsBe2t4PFa2MaK5LuS54HYROofSrx6j0LRre0p3T3D/4ZfRH62k2IGikAvS9iK93e9u7GcS8ozNtObDys5AXMyJylgg7gvPccUAAC3tbHERyGp+7tDhRr7qsNgD8jKLVEIIQHgWzm3oA51p1Xppro0MPz4hkhI3AgQAqnrBo4IBWzCCAVcwDgYDVR0PAQH/BAQDAgbAMBEGA1UdJQQKMAgGBgQAkTcDADAkBggrBgEFBQcBAwQYMBYwFAYIKwYBBQUHCwEwCAYGBACORgEBMH8GA1UdIAR4MHYwdAYJKwYBBAH/FAECMGcwNwYIKwYBBQUHAgEWK2h0dHA6Ly93d3cuY3JjLmJnL2ZpbGVzL19iZy9tZW1iZXJzLWNhLmh0bWwwLAYIKwYBBQUHAgIwIBoeQ1JDIFRTTCBTaWduaW5nIENlcnRpZmljYXRlIENQMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly93d3cuZWdvdi5iZy9jcmwvY3JjLW1lbWJlcnMtY2EuY3JsMA8GA1UdEwEB/wQFMAMBAQAwHQYDVR0OBBYEFGKuRxwBsTCtBlelS0n99RamUm2/MB8GA1UdIwQYMBaAFAkINvmsvi5j6+G+YL3jm5fJ4lE4MA0GCSqGSIb3DQEBBQUAA4IBAQBnBn/q6hgNLO2RcQZ5BnYPYhG81/lcua8T6Um7lmO4JLP+BXhmFexheR24Hs6RpgDpTwNq4aWb3Juh5GMqtWALIGOMbbegQHQ4Sa0nrVcWsUVStI9oOv8LpRfrECKYHNLjNnVliOa9dYfHcWX5aFuDc78DlBp7HwPX7L1UbK0zMRIlm4dqNfAHGvUrv7pDa1j2etRMCxO9c6Fzzh7fMYJ+/1MP6nu7bz554jCFuz5Q+VVq3m7EyGT2TbGi/m2zCF2gWke6OJamhRf8Fy3dYIS3EDampRsaiNG32Qz3ZKyyRwb6QI9IZouy9zCMKwgDeXiXZP+r1WowMO9QRkmepCGd</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIFWDCCBECgAwIBAgIJAIW0w8KGYDu+MA0GCSqGSIb3DQEBBQUAMIGHMYGEMAkGA1UEBgwCQkcwFQYDVQQDDA5DUkMgTWVtYmVycyBDQTAVBgNVBAsMDkNSQyBNZW1iZXJzIENBMBwGCgmSJomT8ixkARkWDmNyYy1tZW1iZXJzLWNhMCsGA1UECgwkQ29tbXVuaWNhdGlvbnMgUmVndWxhdGlvbiBDb21taXNzaW9uMB4XDTE0MDkwNDEwMDExNFoXDTE5MDkwNDEwMDExNFowge8xgewwCQYDVQQGDAJCRzALBgNVBBEMBDEwMDAwDAYDVQQHDAVTb2ZpYTARBgNVBAsMCkNSQyBNZW1iZXIwEgYDVQQJDAs2IEd1cmtvIHN0cjAcBgoJkiaJk/IsZAEZFg5jcmMtbWVtYmVycy1jYTAdBgkqhkiG9w0BCQEWEGlyb21hbnNrYUBjcmMuYmcwKwYDVQQKDCRDb21tdW5pY2F0aW9ucyBSZWd1bGF0aW9uIENvbW1pc3Npb24wMwYDVQQDDCzQmNGA0LjQvdCwINCh0YLQsNC90YfQtdCy0LAg0KDQvtC80LDQvdGB0LrQsDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALeau49s8E/Amx+zQnH76Vkep/eOntMOpFVKYp2KxhMX8p9pJ0N6iJgJs7DiPSbkqVQ1LnG8+Dj9Z0BQiPgh8Sg7EIxmCf6YVcmWc14naYxYzMqCwbBz3Uu5xOzfE8/0WIyGHQHpHa5DZk8bZBuyKICfGOoKrL1SlCHZ3pkXawPLyyupBjvInRBY3dCfPRDOq6XZVCJKwaQoWhiPYtjB3pgiWlU5Hd7RbiSh2EaV2vVdLvoQ5rb71FdnWUgiW4zjc+2KtoWnWQ0RBTfWCQL6XJgBdXyBA5d9ONUQRfbWKeyq1+9vMXR2H9arW5QD/Sra59NaN6ZaS4WWc6n7NrLhdU8CAwEAAaOCAVswggFXMA4GA1UdDwEB/wQEAwIGwDARBgNVHSUECjAIBgYEAJE3AwAwJAYIKwYBBQUHAQMEGDAWMBQGCCsGAQUFBwsBMAgGBgQAjkYBATB/BgNVHSAEeDB2MHQGCSsGAQQB/xQBAjBnMDcGCCsGAQUFBwIBFitodHRwOi8vd3d3LmNyYy5iZy9maWxlcy9fYmcvbWVtYmVycy1jYS5odG1sMCwGCCsGAQUFBwICMCAaHkNSQyBUU0wgU2lnbmluZyBDZXJ0aWZpY2F0ZSBDUDA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vd3d3LmVnb3YuYmcvY3JsL2NyYy1tZW1iZXJzLWNhLmNybDAPBgNVHRMBAf8EBTADAQEAMB0GA1UdDgQWBBRTRU7qRNyUTqcHzCscgHucWf61qjAfBgNVHSMEGDAWgBQJCDb5rL4uY+vhvmC945uXyeJRODANBgkqhkiG9w0BAQUFAAOCAQEAB3/B1OoF3Pm9fqgEmD1ug7+f8IeGYaRDQWKa3ieFm1Dl6VypydHilogYgFtUjvcOTJYi+INb0HglfOxoqx64RzzEleCSSz2tp5IlL0aKylMqv8Zoe/zPE5Qow7ZEx0M6vHRi8nM0v3RmzeMORdiFQWyvoNuJmPLtTO/UFC3DbabWozmNjGN8/OV8VOyLr637YEP6UpILbvPt9VVn3aC7Ll0SoxRH7kcfiCQ+RJYhB2DJVhvXnOXw1Jzeuyu9a8AVUrb2Aaw9sK3tSWQbCZeg1rxsMuEYpFUqM982ClVCAWG/X04S4DYthY1U9RDE1fGNzKKs/XtzdhiZTXtlW5jyFA==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://crc.bg/files/_bg/TSL-CRC-BG-signed.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>BG</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Communications Regulation Commission</Name>
++                     <Name xml:lang="bg">Комисия за регулиране на съобщенията</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/BG</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIDeDCCAmCgAwIBAgIFEgFbGzYwDQYJKoZIhvcNAQELBQAwVTELMAkGA1UEBhMCQ1kxMDAuBgNVBAoMJ0RlcGFydG1lbnQgb2YgRWxlY3Ryb25pYyBDb21tdW5pY2F0aW9uczEUMBIGA1UEAwwLVFNMIFNpZ25lcjIwHhcNMTQwNzAxMDAwMDAwWhcNMTgwNzAxMDAwMDAwWjBVMQswCQYDVQQGEwJDWTEwMC4GA1UECgwnRGVwYXJ0bWVudCBvZiBFbGVjdHJvbmljIENvbW11bmljYXRpb25zMRQwEgYDVQQDDAtUU0wgU2lnbmVyMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2l0vZRrFtdWArytp3quq29byXDB/GbUbm6xKlB63bhyh/SxGDvxDx3PGt1T4b8a89bC0RnmeRpgGRGWwNON2xKnMcDzMYmCi4cmNS7IrTF6GhVbpgLXCsx5JOU+oz0BXE2ASlF3h/r6AuT3oUzGapacNX4LhKtjU8MCuES0xU/V3x0H/FCOu1ziwfnt7wv29wGm39y8h5CTkiAmKxoZThJT49EBnwnBTA09v+5q+qROABNQGYbVkrwyym5hbYEIxHfA5pRMd/QBJhUGL6HhYZQpgzIXjYCaH5+c4U1LqOJoPehW8uocesSnAvpE1lx3JyXkYclBCKO9jVE5UA1c4kCAwEAAaNPME0wHQYDVR0OBBYEFAfjuk4G4S9SC/QxPyHuCFHrN5KaMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgbAMBEGA1UdIAQKMAgwBgYEVR0gADANBgkqhkiG9w0BAQsFAAOCAQEAjj+4NRRsV840YvUwC2BwiqdvySnaJaDgjSx0+TQjEcpQhffDIsDTV2kZpz8rERzcQnf/W0IYXZ4XvHjjCgPocZp8lcKC8V2bK506C9vdMP7s0aiTQT2Xx8g2V89Z71mM7KFh2aNIHGfjbOZbzlG3aW/qPlQ0LtL7gKLc4LdBbhBbig1b7fCmuk29yAnxRNZ59ql+oCx9bT2axZf0E0BVsp503pVG5g872e+UUAZvc4vAYSFSY4d/wTr4fd1+Oiaq7GuIMdkaM5rdue9Eo5wib9TVG4OWtzTcx8Dgz3UT+lXmkW787EmZpVfnhD1L/SSo8V21uNXpq+qNC9bPkqWyYQ==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIDizCCAnOgAwIBAgIFEuB6lFUwDQYJKoZIhvcNAQELBQAwVTELMAkGA1UEBhMCQ1kxMDAuBgNVBAoMJ0RlcGFydG1lbnQgb2YgRWxlY3Ryb25pYyBDb21tdW5pY2F0aW9uczEUMBIGA1UEAwwLVFNMIFNpZ25lcjEwHhcNMTQwMTAxMDAwMDAwWhcNMTgwMTAxMDAwMDAwWjBVMQswCQYDVQQGEwJDWTEwMC4GA1UECgwnRGVwYXJ0bWVudCBvZiBFbGVjdHJvbmljIENvbW11bmljYXRpb25zMRQwEgYDVQQDDAtUU0wgU2lnbmVyMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALgqtGqEzoVJC/xkzkYImpQE659JKIhlBfqHd0k59JGppdretL//imQPAccnauds6+VKVnDJnbGFZfyfsSXHR8BWUVdko8ih8gHUQSarPkQC1XxSegybrClx19+TNJKlQulaUFPFifU4RQWl34uzmCHdDqlswGiT4rxTMvvsiWELJ0xEEaZ6LiKPnFZYjJ8rwqkTiaVL6r+cfmmoQexzVhbeU2nVeQME6vlsmrIOD42X/9P5/380eTCaASLNxrO1iRiF0LhD5NwucexryYPs+TAPh2Lz+URSCKNygu4lJsG3TFvNkiSYoJHojcGg43Qf3v0aLk54d83xHFyMwnRsUY8CAwEAAaNiMGAwHQYDVR0OBBYEFPTmzt/K3ZC/RRr3CNowzdpCOqJlMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgbAMBEGA1UdIAQKMAgwBgYEVR0gADARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggEBABkEtoDdOZaE7l+mjihOhmUAfpCv/zxj7wdlno0IvNhCvAfUSP5b5oBJ30LdyerUPBH/ZQdPJoRKthUG7QDePxcRb9rNK84cCRFtM3RpLgfgOAAjUUvvo0MZFf0D3Fj3PP/Jq+/SdHrm1X9j2adG3JCSuVEl7Wp9TZ8rm1isE3+DlQyP1rHzT0gEwpg4YF0pI0vB8nUzHN6JqFu0FAQphA2zuuceIblNDkmljx4vtRUfEQEv9EIbh72j9QN1fObDi/rd8LutAsxxGLRDMJv9WC1uSmEo6pwJ4Vme0mx3uaxNL/Dbpb/SjXJdLrKtHMLKntGvOP6NvrmTr55mIPkaoWk=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.mcw.gov.cy/mcw/dec/dec.nsf/all/B28C11BBFDBAC045C2257E0D002937E9/$file/TSL-CY-sign.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>CY</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Department of Electronic Communications</Name>
++                     <Name xml:lang="el">Τμήμα Ηλεκτρονικών Επικοινωνιών</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/CY</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIFqDCCBJCgAwIBAgIEAKhcEzANBgkqhkiG9w0BAQsFADCBtzELMAkGA1UEBhMCQ1oxOjA4BgNVBAMMMUkuQ0EgLSBRdWFsaWZpZWQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHksIDA5LzIwMDkxLTArBgNVBAoMJFBydm7DrSBjZXJ0aWZpa2HEjW7DrSBhdXRvcml0YSwgYS5zLjE9MDsGA1UECww0SS5DQSAtIEFjY3JlZGl0ZWQgUHJvdmlkZXIgb2YgQ2VydGlmaWNhdGlvbiBTZXJ2aWNlczAeFw0xNTA2MDMxMTI4NTZaFw0xNjA2MDIxMTI4NTZaMH4xCzAJBgNVBAYTAkNaMR0wGwYDVQQDDBRJbmcuIFJhZG9tw61yIMWgaW1lazE3MDUGA1UECgwuTWluaXN0cnkgb2YgdGhlIEludGVyaW9yIG9mIHRoZSBDemVjaCBSZXB1YmxpYzEXMBUGA1UEBRMOSUNBIC0gMTAzNDQ4MjEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCawspfUgMcHE6NKJmbpUU0o3e1+qJPJnw7MMd/c+aSummSNw8DnoYrsjQmC7Iii1U4JIytzlYwJ/uOkvT7XG3z7dkkl9395RC8gVMnarGOIrkDbRo5PbzKUfKa92faFvbnn2uvHPZDIreEdHvX35hR4BOdaeH29gSmSzBhDvZ4xnH6uFyh/SX5cIv/5QJRHz399ZlfA4K9cZG2aAMJzh968ctQqxL7jjAmMI3Re2GZFLHO9J5dYkFmcHgty1Qp/PYUV473m2V8Y3nZi1imi9gSVxuERMjM+0BOUHWd1pyGCcqSSMN86jqNESJFW31fzR7fstd08UG5MPRj0/m8NpfRAgMBAAGjggHyMIIB7jARBgNVHSUECjAIBgYEAJE3AwAwgd8GA1UdIASB1zCB1DCB0QYNKwYBBAGBuEgBAR4DATCBvzCBvAYIKwYBBQUHAgIwga8agaxUZW50byBrdmFsaWZpa292YW55IGNlcnRpZmlrYXQgamUgdnlkYW4gcG9kbGUgemFrb25hIENlc2tlIHJlcHVibGlreSBjLiAyMjcvMjAwMCBTYi4gdiBwbGF0bmVtIHpuZW5pL1RoaXMgaXMgcXVhbGlmaWVkIGNlcnRpZmljYXRlIGFjY29yZGluZyB0byBDemVjaCBBY3QgTm8uIDIyNy8yMDAwIENvbGwuMIGBBgNVHR8EejB4MCagJKAihiBodHRwOi8vcWNybGRwMS5pY2EuY3ovcWljYTA5LmNybDAmoCSgIoYgaHR0cDovL3FjcmxkcDIuaWNhLmN6L3FpY2EwOS5jcmwwJqAkoCKGIGh0dHA6Ly9xY3JsZHAzLmljYS5jei9xaWNhMDkuY3JsMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgZAMBgGCCsGAQUFBwEDBAwwCjAIBgYEAI5GAQEwHwYDVR0jBBgwFoAUecvQI+k6Z3CRdE/TUeLgIP3hKPswHQYDVR0OBBYEFC6CFzYHEofr962LdU1w+xy0PFJXMA0GCSqGSIb3DQEBCwUAA4IBAQCB2lBGEdViXN7Q3r5voDGlZGE4kzeK3+eXLlyDIFEPrRV/MeIN5+Rtk7MCWZmHUbbzFoJzsqvBG5yBY5uNlhJZZ4Ee7xrHykrxpCx4CrD+hkqLNeaI+IocTxMG/4y0adaEx7ooVZH7+elE+0WVIBzPPuWH298zVrdS6LKNAjodqFWK8R84lLZPjh+lFHciznwgaKOz+JKvBuBQYznP1DAvQ21Cspe6lB9XpVQA9O0mwoCiXD6buW1COz2MGwMLwn6k/eJKfEqWzOa8cdYm2GpdxAAnU9XE1aLnbjHBBlAf6uZ+/YOV8JgiDEOCCVmnt9aPZZmX8HIqh8FxC5ykQ46T</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIFDzCCA/egAwIBAgIBATANBgkqhkiG9w0BAQsFADCBtjELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTE3MDUGA1UEChMuTWluaXN0cnkgb2YgdGhlIEludGVyaW9yIG9mIHRoZSBDemVjaCBSZXB1YmxpYzE3MDUGA1UEAxMuTWluaXN0cnkgb2YgdGhlIEludGVyaW9yIG9mIHRoZSBDemVjaCBSZXB1YmxpYzEkMCIGCSqGSIb3DQEJARYVcmFkb21pci5zaW1la0BtdmNyLmN6MB4XDTE0MDMwMTA1MjAwMFoXDTE5MDMwMTA1MjAwMFowgbYxCzAJBgNVBAYTAkNaMQ8wDQYDVQQHEwZQcmFndWUxNzA1BgNVBAoTLk1pbmlzdHJ5IG9mIHRoZSBJbnRlcmlvciBvZiB0aGUgQ3plY2ggUmVwdWJsaWMxNzA1BgNVBAMTLk1pbmlzdHJ5IG9mIHRoZSBJbnRlcmlvciBvZiB0aGUgQ3plY2ggUmVwdWJsaWMxJDAiBgkqhkiG9w0BCQEWFXJhZG9taXIuc2ltZWtAbXZjci5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO3PmohbCGpwe/1BnjkOsTnULvFONX0/hUAFi7wJ4xSK9cShj2OLxJEa56tIdD7UBz5PMqsEhaGTH20/7qkT92uk/F+sZdveVbEha5VlVyAVGvO2ReVCC0e7NxJqyNVGzyFxIFfcIAO2aTQpu1+kAGRmPoqES+7zO9J2L1s5C0H8fzvCNEEA9k0aBigstyxrlWE3odzLXDlAYTT5fcMIZkuAOe7dbK4yOFDZpe/5yCG4PdiD021NIVjA/vm2t092uEcBzqIcaeziusWMn2EAACD7d9wkP538j5htpldsSFUPgatc2rkv96vk9gwPdR0IxUsUaEhxjGuN+p6h3puoFxECAwEAAaOCASQwggEgMAkGA1UdEwQCMAAwHQYDVR0OBBYEFFGuBukXCJgG9hD9xpOCmxGMW4BoMIHjBgNVHSMEgdswgdiAFFGuBukXCJgG9hD9xpOCmxGMW4BooYG8pIG5MIG2MQswCQYDVQQGEwJDWjEPMA0GA1UEBxMGUHJhZ3VlMTcwNQYDVQQKEy5NaW5pc3RyeSBvZiB0aGUgSW50ZXJpb3Igb2YgdGhlIEN6ZWNoIFJlcHVibGljMTcwNQYDVQQDEy5NaW5pc3RyeSBvZiB0aGUgSW50ZXJpb3Igb2YgdGhlIEN6ZWNoIFJlcHVibGljMSQwIgYJKoZIhvcNAQkBFhVyYWRvbWlyLnNpbWVrQG12Y3IuY3qCAQEwDgYDVR0PAQH/BAQDAgZAMA0GCSqGSIb3DQEBCwUAA4IBAQDS9g+4r+i0yu3dHp1L3K8nrdexpw9qTOgiNpydf2uDHltlnRVgXuyn38KBhyI89uDYILN32owBbMuygu04sehRB/sfcWMpeWbH7KAneShUaZijpD4UiUdoLHROEoxhC9hCH2Ygu4phZN4Wk+xIQ9LtiAIQsjdncIrUPd0+NGsAdedClDw9rjwAatohAHUTQEHzFolL7KVzj2ZtmeguR5t+QBeRchgoL4u5zE7B4uaH/zA00AKI1p5oVPekF29PGA0PVmj1BuLb5q845tNDVrprxjL8lcvVTobt6MVDAogwsnxPwY8V9cnWg1qxqeU72FIRbwy4EgkbpAHayyk9xAU1</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://tsl.gov.cz/publ/TSL_CZ.pdf</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>CZ</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/pdf</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Ministry of the Interior of the Czech Republic</Name>
++                     <Name xml:lang="cs">Ministerstvo vnitra České republiky</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/CZ</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIFqDCCBJCgAwIBAgIEAKhcEzANBgkqhkiG9w0BAQsFADCBtzELMAkGA1UEBhMCQ1oxOjA4BgNVBAMMMUkuQ0EgLSBRdWFsaWZpZWQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHksIDA5LzIwMDkxLTArBgNVBAoMJFBydm7DrSBjZXJ0aWZpa2HEjW7DrSBhdXRvcml0YSwgYS5zLjE9MDsGA1UECww0SS5DQSAtIEFjY3JlZGl0ZWQgUHJvdmlkZXIgb2YgQ2VydGlmaWNhdGlvbiBTZXJ2aWNlczAeFw0xNTA2MDMxMTI4NTZaFw0xNjA2MDIxMTI4NTZaMH4xCzAJBgNVBAYTAkNaMR0wGwYDVQQDDBRJbmcuIFJhZG9tw61yIMWgaW1lazE3MDUGA1UECgwuTWluaXN0cnkgb2YgdGhlIEludGVyaW9yIG9mIHRoZSBDemVjaCBSZXB1YmxpYzEXMBUGA1UEBRMOSUNBIC0gMTAzNDQ4MjEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCawspfUgMcHE6NKJmbpUU0o3e1+qJPJnw7MMd/c+aSummSNw8DnoYrsjQmC7Iii1U4JIytzlYwJ/uOkvT7XG3z7dkkl9395RC8gVMnarGOIrkDbRo5PbzKUfKa92faFvbnn2uvHPZDIreEdHvX35hR4BOdaeH29gSmSzBhDvZ4xnH6uFyh/SX5cIv/5QJRHz399ZlfA4K9cZG2aAMJzh968ctQqxL7jjAmMI3Re2GZFLHO9J5dYkFmcHgty1Qp/PYUV473m2V8Y3nZi1imi9gSVxuERMjM+0BOUHWd1pyGCcqSSMN86jqNESJFW31fzR7fstd08UG5MPRj0/m8NpfRAgMBAAGjggHyMIIB7jARBgNVHSUECjAIBgYEAJE3AwAwgd8GA1UdIASB1zCB1DCB0QYNKwYBBAGBuEgBAR4DATCBvzCBvAYIKwYBBQUHAgIwga8agaxUZW50byBrdmFsaWZpa292YW55IGNlcnRpZmlrYXQgamUgdnlkYW4gcG9kbGUgemFrb25hIENlc2tlIHJlcHVibGlreSBjLiAyMjcvMjAwMCBTYi4gdiBwbGF0bmVtIHpuZW5pL1RoaXMgaXMgcXVhbGlmaWVkIGNlcnRpZmljYXRlIGFjY29yZGluZyB0byBDemVjaCBBY3QgTm8uIDIyNy8yMDAwIENvbGwuMIGBBgNVHR8EejB4MCagJKAihiBodHRwOi8vcWNybGRwMS5pY2EuY3ovcWljYTA5LmNybDAmoCSgIoYgaHR0cDovL3FjcmxkcDIuaWNhLmN6L3FpY2EwOS5jcmwwJqAkoCKGIGh0dHA6Ly9xY3JsZHAzLmljYS5jei9xaWNhMDkuY3JsMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgZAMBgGCCsGAQUFBwEDBAwwCjAIBgYEAI5GAQEwHwYDVR0jBBgwFoAUecvQI+k6Z3CRdE/TUeLgIP3hKPswHQYDVR0OBBYEFC6CFzYHEofr962LdU1w+xy0PFJXMA0GCSqGSIb3DQEBCwUAA4IBAQCB2lBGEdViXN7Q3r5voDGlZGE4kzeK3+eXLlyDIFEPrRV/MeIN5+Rtk7MCWZmHUbbzFoJzsqvBG5yBY5uNlhJZZ4Ee7xrHykrxpCx4CrD+hkqLNeaI+IocTxMG/4y0adaEx7ooVZH7+elE+0WVIBzPPuWH298zVrdS6LKNAjodqFWK8R84lLZPjh+lFHciznwgaKOz+JKvBuBQYznP1DAvQ21Cspe6lB9XpVQA9O0mwoCiXD6buW1COz2MGwMLwn6k/eJKfEqWzOa8cdYm2GpdxAAnU9XE1aLnbjHBBlAf6uZ+/YOV8JgiDEOCCVmnt9aPZZmX8HIqh8FxC5ykQ46T</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIFDzCCA/egAwIBAgIBATANBgkqhkiG9w0BAQsFADCBtjELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTE3MDUGA1UEChMuTWluaXN0cnkgb2YgdGhlIEludGVyaW9yIG9mIHRoZSBDemVjaCBSZXB1YmxpYzE3MDUGA1UEAxMuTWluaXN0cnkgb2YgdGhlIEludGVyaW9yIG9mIHRoZSBDemVjaCBSZXB1YmxpYzEkMCIGCSqGSIb3DQEJARYVcmFkb21pci5zaW1la0BtdmNyLmN6MB4XDTE0MDMwMTA1MjAwMFoXDTE5MDMwMTA1MjAwMFowgbYxCzAJBgNVBAYTAkNaMQ8wDQYDVQQHEwZQcmFndWUxNzA1BgNVBAoTLk1pbmlzdHJ5IG9mIHRoZSBJbnRlcmlvciBvZiB0aGUgQ3plY2ggUmVwdWJsaWMxNzA1BgNVBAMTLk1pbmlzdHJ5IG9mIHRoZSBJbnRlcmlvciBvZiB0aGUgQ3plY2ggUmVwdWJsaWMxJDAiBgkqhkiG9w0BCQEWFXJhZG9taXIuc2ltZWtAbXZjci5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO3PmohbCGpwe/1BnjkOsTnULvFONX0/hUAFi7wJ4xSK9cShj2OLxJEa56tIdD7UBz5PMqsEhaGTH20/7qkT92uk/F+sZdveVbEha5VlVyAVGvO2ReVCC0e7NxJqyNVGzyFxIFfcIAO2aTQpu1+kAGRmPoqES+7zO9J2L1s5C0H8fzvCNEEA9k0aBigstyxrlWE3odzLXDlAYTT5fcMIZkuAOe7dbK4yOFDZpe/5yCG4PdiD021NIVjA/vm2t092uEcBzqIcaeziusWMn2EAACD7d9wkP538j5htpldsSFUPgatc2rkv96vk9gwPdR0IxUsUaEhxjGuN+p6h3puoFxECAwEAAaOCASQwggEgMAkGA1UdEwQCMAAwHQYDVR0OBBYEFFGuBukXCJgG9hD9xpOCmxGMW4BoMIHjBgNVHSMEgdswgdiAFFGuBukXCJgG9hD9xpOCmxGMW4BooYG8pIG5MIG2MQswCQYDVQQGEwJDWjEPMA0GA1UEBxMGUHJhZ3VlMTcwNQYDVQQKEy5NaW5pc3RyeSBvZiB0aGUgSW50ZXJpb3Igb2YgdGhlIEN6ZWNoIFJlcHVibGljMTcwNQYDVQQDEy5NaW5pc3RyeSBvZiB0aGUgSW50ZXJpb3Igb2YgdGhlIEN6ZWNoIFJlcHVibGljMSQwIgYJKoZIhvcNAQkBFhVyYWRvbWlyLnNpbWVrQG12Y3IuY3qCAQEwDgYDVR0PAQH/BAQDAgZAMA0GCSqGSIb3DQEBCwUAA4IBAQDS9g+4r+i0yu3dHp1L3K8nrdexpw9qTOgiNpydf2uDHltlnRVgXuyn38KBhyI89uDYILN32owBbMuygu04sehRB/sfcWMpeWbH7KAneShUaZijpD4UiUdoLHROEoxhC9hCH2Ygu4phZN4Wk+xIQ9LtiAIQsjdncIrUPd0+NGsAdedClDw9rjwAatohAHUTQEHzFolL7KVzj2ZtmeguR5t+QBeRchgoL4u5zE7B4uaH/zA00AKI1p5oVPekF29PGA0PVmj1BuLb5q845tNDVrprxjL8lcvVTobt6MVDAogwsnxPwY8V9cnWg1qxqeU72FIRbwy4EgkbpAHayyk9xAU1</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://tsl.gov.cz/publ/TSL_CZ.xtsl</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>CZ</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Ministry of the Interior of the Czech Republic</Name>
++                     <Name xml:lang="cs">Ministerstvo vnitra České republiky</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/CZ</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIECjCCAvKgAwIBAgICBH8wDQYJKoZIhvcNAQENBQAwPzELMAkGA1UEBhMCREUxGjAYBgNVBAoMEUJ1bmRlc25ldHphZ2VudHVyMRQwEgYDVQQDDAsxNFItQ0EgMTpQTjAeFw0xNDA0MTEwODQ0NTJaFw0xOTA0MTEwNjM1MDBaMEAxCzAJBgNVBAYTAkRFMRowGAYDVQQKDBFCdW5kZXNuZXR6YWdlbnR1cjEVMBMGA1UEAwwMMTRSLVRTTCAxOlBOMIIBIzANBgkqhkiG9w0BAQEFAAOCARAAMIIBCwKCAQEAkyyMPdtWEDtPcT+eq+KKYaQ5G+6Hbpl9i6b3nBN6+3DROzqaVqtehrCpuE5CmUdqR2lixvHTbEjYIlk3jsmPTxtImfZ66mwKUoenulI6jE5/lvRNtqKWQbLTd7nrEJAecy/ouHWZ6xiDB/ytftxJhAREUqGPfJiWnCFoyRrDSW6GQ8QQbJnlHMLuxs30KNUIRbVOOX/jb8oeqFI0zXUeSH/AMrshRM3G8W941tee8nn5jK2CZvjOuYEI1hNpcXAzBTuaFRJhLdsvg0SfgW0T6tFhuUbG5eW9wraGOMCNdzfcNnjmFitVrBRtl9yIfyVn2Tgd2DfJ9cHLJGmbTBnUIwIEQAAAgaOCAQwwggEIMA4GA1UdDwEB/wQEAwIGQDAdBgNVHQ4EFgQUYqVd8yHV7CHE+JCq3zLhvyLM43wwEQYDVR0lBAowCAYGBACRNwMAMBgGCCsGAQUFBwEDBAwwCjAIBgYEAI5GAQEwHwYDVR0jBBgwFoAU/fNQhDCO7COa9TOy44EH3eTvgK4wSgYIKwYBBQUHAQEEPjA8MDoGCCsGAQUFBzABhi5odHRwOi8vb2NzcC5ucmNhLWRzLmRlOjgwODAvb2NzcC1vY3NwcmVzcG9uZGVyMBIGA1UdIAQLMAkwBwYFKyQIAQEwGwYJKwYBBAHAbQMFBA4wDAYKKwYBBAHAbQMFATAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBDQUAA4IBAQAMm2Fj5hoZBOeOOT4LPrky39cTYMPN1+Patx6BB+kuF/pXAI/GmDyOuFIZ+/Sf8bz336sbbIfnbDeV6Y6ZJvCnqzrUT8kBlf3+QTQ+JxOEYfw1bdRffjmYDCbM0S7Rw02eAaSykiHSkSp8kWA6rYWkhVakX/v/PdBUtkPHdq1P5ghLPx7Gk/ax/U3fDLlKGms5iJjz55AIMqlK4HWEc7xZk3QoD8w+lpRqT5QNYwex5ueXO/Mpd9ZtY5qm7bJKhRnKejQaaMO1frAWT+QM2Uve3TaZlgupa0K+FL9i532dMd/D4RjxtDTNfa5o8gcNFS6eDyuo0z8BJDp9LCLtNZYT</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIECjCCAvKgAwIBAgICBM4wDQYJKoZIhvcNAQENBQAwPzELMAkGA1UEBhMCREUxGjAYBgNVBAoMEUJ1bmRlc25ldHphZ2VudHVyMRQwEgYDVQQDDAsxNFItQ0EgMTpQTjAeFw0xNDEyMDUwOTM5MDZaFw0xOTEyMDQyMzU5NTlaMEAxCzAJBgNVBAYTAkRFMRowGAYDVQQKDBFCdW5kZXNuZXR6YWdlbnR1cjEVMBMGA1UEAwwMMTRSLVRTTCAyOlBOMIIBIzANBgkqhkiG9w0BAQEFAAOCARAAMIIBCwKCAQEAsGI5qje99nNG7TKA7ebNH5LLJHns8wJN+2fiqXajL8Vn6ss/PRjnmZMZmZCEIjPiqZ44ClfFZfMG4i5FuQtQgy1QNoLvbGWXe4E7E8/QJrVgZDn3fWzXQijvSH1SDXF/yhNU/9/WirHuf0VuvXPQBOQNlboOII4jxdUq3hqIknzZ1RGSDw1OQkd/kiiN01DRqnIFOXGr9C8aYC/LFsT8bMyY1YwhkrsFjt5bEcTSTnp+W2ee3nizifEAivH5RINPqdMcGIZ0jt60n2eSNUwP5WiBODBxgGJz4v+/lRrKqGznS/vnTO/WfUGYsjphjY0zb+7aUfhEKLI8jOI0zZmmTwIEQAAAgaOCAQwwggEIMA4GA1UdDwEB/wQEAwIGQDAdBgNVHQ4EFgQUSKX4OarEbho7M1SjSBICi99U1EowEQYDVR0lBAowCAYGBACRNwMAMBgGCCsGAQUFBwEDBAwwCjAIBgYEAI5GAQEwHwYDVR0jBBgwFoAU/fNQhDCO7COa9TOy44EH3eTvgK4wSgYIKwYBBQUHAQEEPjA8MDoGCCsGAQUFBzABhi5odHRwOi8vb2NzcC5ucmNhLWRzLmRlOjgwODAvb2NzcC1vY3NwcmVzcG9uZGVyMBIGA1UdIAQLMAkwBwYFKyQIAQEwGwYJKwYBBAHAbQMFBA4wDAYKKwYBBAHAbQMFATAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBDQUAA4IBAQBcDV3Z88953Qg7BXrbGqcGLhD8Bb5TBhN9VAzypzLU65Qev9gyKWLwSR9yxWM/93hiANzRV500dHhEXOmblAuP9nHfmEEgs+wPoPHZlvwpvs5WaIMcsVu2SZHv3cESXZYbDOK1wPA3adqU6TnmHmT43w5F79tFbUoLbHjfxnq9ouQS21rQX3zrwgIfkNwYm0dHrUBlX4Yn1tpVpISYOxyy8XoOMaLIRQqDmTlp28BeGnt7gFicL4oZoy0ZECH1UseMSAWRNB8AGeS+gLssrDySMWwqsnS9XQpNN7co8iqBum3p1fDJ6CYV4qZ5P3iHdOL3ncVf2WP/FDqon3VoQpd1</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>https://www.nrca-ds.de/st/TSL-XML.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>DE</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Federal Network Agency</Name>
++                     <Name xml:lang="de">Bundesnetzagentur</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/DE</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIGITCCBQmgAwIBAgIEU3nnPTANBgkqhkiG9w0BAQsFADBAMQswCQYDVQQGEwJESzESMBAGA1UECgwJVFJVU1QyNDA4MR0wGwYDVQQDDBRUUlVTVDI0MDggT0NFUyBDQSBJSTAeFw0xNDA4MjcxMjQzMTVaFw0xNzA4MjcxMjQyMzNaMHsxCzAJBgNVBAYTAkRLMTEwLwYDVQQKDChEaWdpdGFsaXNlcmluZ3NzdHlyZWxzZW4gLy8gQ1ZSOjM0MDUxMTc4MTkwFQYDVQQDDA5UaG9tYXMgVmFuZ3NhYTAgBgNVBAUTGUNWUjozNDA1MTE3OC1SSUQ6NDY1OTM2MTkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgjJ5A00v9n8o0LoW2nuaHiVgTQDEpGr+I4JeE3uV6Vq1XSzvCnI1Gl6yFlPZtgMEjEOh5Par85TH3fSAX38R+253h8cvbtg7NBdNGkirPZXlA4RCEjQx4b45s23JV1fhRtkR74PVvnjwApIFSrAK7m47SssssaFz/18MOrtx2BfsQ2mvcAHJcJqSc1HDV4c5KkDXGfIufd7qRLN+ytRPXDzdrX4ptAk9oNrsO7Bo9oSNC0kHWLucBBmidFFFBtoErJ51xJ3LvV4sDwapNsEJ13lcshQZg79+ETovAr/plJLCXzDhNRTx9EZklTUTQhmXyv2keYo0BfR4H0RZg+MDZAgMBAAGjggLmMIIC4jAOBgNVHQ8BAf8EBAMCBPAwgYkGCCsGAQUFBwEBBH0wezA1BggrBgEFBQcwAYYpaHR0cDovL29jc3AuaWNhMDIudHJ1c3QyNDA4LmNvbS9yZXNwb25kZXIwQgYIKwYBBQUHMAKGNmh0dHA6Ly9tLmFpYS5pY2EwMi50cnVzdDI0MDguY29tL29jZXMtaXNzdWluZzAyLWNhLmNlcjCCAUMGA1UdIASCATowggE2MIIBMgYKKoFQgSkBAQECBTCCASIwLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cudHJ1c3QyNDA4LmNvbS9yZXBvc2l0b3J5MIHuBggrBgEFBQcCAjCB4TAQFglUUlVTVDI0MDgwAwIBARqBzEZvciBhbnZlbmRlbHNlIGFmIGNlcnRpZmlrYXRldCBn5mxkZXIgT0NFUyB2aWxr5XIsIENQUyBvZyBPQ0VTIENQLCBkZXIga2FuIGhlbnRlcyBmcmEgd3d3LnRydXN0MjQwOC5jb20vcmVwb3NpdG9yeS4gQmVt5nJrLCBhdCBUUlVTVDI0MDggZWZ0ZXIgdmlsa+VyZW5lIGhhciBldCBiZWdy5m5zZXQgYW5zdmFyIGlmdC4gcHJvZmVzc2lvbmVsbGUgcGFydGVyLjAZBgNVHREEEjAQgQ50aG92YUBkaWdzdC5kazCBlgYDVR0fBIGOMIGLMC6gLKAqhihodHRwOi8vY3JsLmljYTAyLnRydXN0MjQwOC5jb20vaWNhMDIuY3JsMFmgV6BVpFMwUTELMAkGA1UEBhMCREsxEjAQBgNVBAoMCVRSVVNUMjQwODEdMBsGA1UEAwwUVFJVU1QyNDA4IE9DRVMgQ0EgSUkxDzANBgNVBAMMBkNSTDI4OTAfBgNVHSMEGDAWgBSZj7oNia4hGkJ6Cq4aTE4i/xDrjDAdBgNVHQ4EFgQUrQcZJBN9UFBcFU0ejOZzl2AQ20swCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAnJGujDKn1cpIl6LlCMUjIDmcegkcG+VMCasfjm1svOqr/fxHArSUpDKURcZWoNq0dUiWk0JhBUJGEi0UrVZ783jR5Pn9m7VkDhkeqR7iigMgtPvZjwfcWsnjYr+DwLxrRDZADWroOceD6GF0AOkETcDhOunFcroiTd9n4LgzHCELyVhUv8L2nbaWtlCIVxCua861x8jHketSPd8EdcqYsX6TtVdnA5S+A8h88rwrYvrpy5f9e29V6pQzFkq9BTGQ+ZtrbLI6UWV3ja0IBo0tHt/fc+lNuHV56ipz3QGS94AwxkENPSgYKLtwDOoV5c/vI9heE3/FvP1W/409h0ETgw==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIGQjCCBSqgAwIBAgIETJqsxTANBgkqhkiG9w0BAQsFADA/MQswCQYDVQQGEwJESzESMBAGA1UECgwJVFJVU1QyNDA4MRwwGgYDVQQDDBNUUlVTVDI0MDggT0NFUyBDQSBJMB4XDTEzMDgxNDExMDcyOVoXDTE2MDgxNDExMDcxMlowfzELMAkGA1UEBhMCREsxMTAvBgNVBAoMKERpZ2l0YWxpc2VyaW5nc3N0eXJlbHNlbiAvLyBDVlI6MzQwNTExNzgxPTAZBgNVBAMMEkJlbmphbWluIEt5dnNnYWFyZDAgBgNVBAUTGUNWUjozNDA1MTE3OC1SSUQ6MjgxNjAxMTUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCPqu9WOsATGpHZF4Sm8+6VObPBgYpok7foFDQgkhLpqnEAOCLwWN6+eMugKJIS8IaQi9ZhibY8XDfo5NMdhI6hMbiUDVajZ+9qKAAAUPfL9nQrnNCCjff5/M206ih01d4ANh/k6rDczlRvfM6bFMW/CW+o5Bt/WxbIj/DpQTXjHx4Sxf68IGCi9sTc2YHQUVYrCYZkU6CJ3qUFoYTrRO59hDLqpLefp4CeqVmicv0DhgnRL3N0NXPje/Edj0goH+5xVeouvfwdwU3mOx/gAXCAbPQp6GC8vi+26RqQ3S+H75X+nrabyp5F2CH4sGJuif9IrTtXRPGmKuKL4PPQR91ZAgMBAAGjggMEMIIDADAOBgNVHQ8BAf8EBAMCA/gwgZ0GCCsGAQUFBwEBBIGQMIGNMD4GCCsGAQUFBzABhjJodHRwOi8vb2NzcC5vY2VzLWlzc3VpbmcwMS50cnVzdDI0MDguY29tL3Jlc3BvbmRlcjBLBggrBgEFBQcwAoY/aHR0cDovL20uYWlhLm9jZXMtaXNzdWluZzAxLnRydXN0MjQwOC5jb20vb2Nlcy1pc3N1aW5nMDEtY2EuY2VyMIIBQwYDVR0gBIIBOjCCATYwggEyBgoqgVCBKQEBAQIFMIIBIjAvBggrBgEFBQcCARYjaHR0cDovL3d3dy50cnVzdDI0MDguY29tL3JlcG9zaXRvcnkwge4GCCsGAQUFBwICMIHhMBAWCVRSVVNUMjQwODADAgEBGoHMRm9yIGFudmVuZGVsc2UgYWYgY2VydGlmaWthdGV0IGfmbGRlciBPQ0VTIHZpbGvlciwgQ1BTIG9nIE9DRVMgQ1AsIGRlciBrYW4gaGVudGVzIGZyYSB3d3cudHJ1c3QyNDA4LmNvbS9yZXBvc2l0b3J5LiBCZW3mcmssIGF0IFRSVVNUMjQwOCBlZnRlciB2aWxr5XJlbmUgaGFyIGV0IGJlZ3LmbnNldCBhbnN2YXIgaWZ0LiBwcm9mZXNzaW9uZWxsZSBwYXJ0ZXIuMBkGA1UdEQQSMBCBDkJFTktZQGRpZ3N0LmRrMIGgBgNVHR8EgZgwgZUwOKA2oDSGMmh0dHA6Ly9jcmwub2Nlcy1pc3N1aW5nMDEudHJ1c3QyNDA4LmNvbS9pY2EwMTEuY3JsMFmgV6BVpFMwUTELMAkGA1UEBhMCREsxEjAQBgNVBAoMCVRSVVNUMjQwODEcMBoGA1UEAwwTVFJVU1QyNDA4IE9DRVMgQ0EgSTEQMA4GA1UEAwwHQ1JMNjY3NDAfBgNVHSMEGDAWgBTcPiA5BFF1Chj9v4nVrqWlKktydzAdBgNVHQ4EFgQU2x/FpFgBGDFBJYMNttYcFRdvF18wCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAbkhl3LHDnudbKAXwCc99tlAGVWMghkt7zJW1ouaNylxuRrppINCcoXye/hhMqIlSkDPXRNbItmonv5wN11uNe+iPZflo29xeE5XCQ3VVuuwXVWSeOeH4dpAErxfH2FWriLUDSYUtwSa30re4xYktpTA3a9bgHjfKUUuQK31gBiWH9cQ0y+XxcqOMUN+C53iLgxIKHmkPI67ThNMuBA2cOfF6rEDKGjEMh3A6Ntue7wHHgTOidbC/LqYer/2gssDHNqxSiIjlR4IWsJFM5LrQ4FOW8C7gbp47ek6lFK685ccYDEbnwLejlfHe4DQjVHl4a7qlBL4Vle2ogKNHvoEL5A==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.digst.dk/~/media/Files/Loesninger-og-infrastruktur/NemID/HumanReadabletldkxml.pdf</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>DK</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/pdf</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Danish Agency for Digitisation // CVR:34051178</Name>
++                     <Name xml:lang="da">Digitaliseringsstyrelsen // CVR:34051178</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/DK</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIGQjCCBSqgAwIBAgIETJqsxTANBgkqhkiG9w0BAQsFADA/MQswCQYDVQQGEwJESzESMBAGA1UECgwJVFJVU1QyNDA4MRwwGgYDVQQDDBNUUlVTVDI0MDggT0NFUyBDQSBJMB4XDTEzMDgxNDExMDcyOVoXDTE2MDgxNDExMDcxMlowfzELMAkGA1UEBhMCREsxMTAvBgNVBAoMKERpZ2l0YWxpc2VyaW5nc3N0eXJlbHNlbiAvLyBDVlI6MzQwNTExNzgxPTAZBgNVBAMMEkJlbmphbWluIEt5dnNnYWFyZDAgBgNVBAUTGUNWUjozNDA1MTE3OC1SSUQ6MjgxNjAxMTUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCPqu9WOsATGpHZF4Sm8+6VObPBgYpok7foFDQgkhLpqnEAOCLwWN6+eMugKJIS8IaQi9ZhibY8XDfo5NMdhI6hMbiUDVajZ+9qKAAAUPfL9nQrnNCCjff5/M206ih01d4ANh/k6rDczlRvfM6bFMW/CW+o5Bt/WxbIj/DpQTXjHx4Sxf68IGCi9sTc2YHQUVYrCYZkU6CJ3qUFoYTrRO59hDLqpLefp4CeqVmicv0DhgnRL3N0NXPje/Edj0goH+5xVeouvfwdwU3mOx/gAXCAbPQp6GC8vi+26RqQ3S+H75X+nrabyp5F2CH4sGJuif9IrTtXRPGmKuKL4PPQR91ZAgMBAAGjggMEMIIDADAOBgNVHQ8BAf8EBAMCA/gwgZ0GCCsGAQUFBwEBBIGQMIGNMD4GCCsGAQUFBzABhjJodHRwOi8vb2NzcC5vY2VzLWlzc3VpbmcwMS50cnVzdDI0MDguY29tL3Jlc3BvbmRlcjBLBggrBgEFBQcwAoY/aHR0cDovL20uYWlhLm9jZXMtaXNzdWluZzAxLnRydXN0MjQwOC5jb20vb2Nlcy1pc3N1aW5nMDEtY2EuY2VyMIIBQwYDVR0gBIIBOjCCATYwggEyBgoqgVCBKQEBAQIFMIIBIjAvBggrBgEFBQcCARYjaHR0cDovL3d3dy50cnVzdDI0MDguY29tL3JlcG9zaXRvcnkwge4GCCsGAQUFBwICMIHhMBAWCVRSVVNUMjQwODADAgEBGoHMRm9yIGFudmVuZGVsc2UgYWYgY2VydGlmaWthdGV0IGfmbGRlciBPQ0VTIHZpbGvlciwgQ1BTIG9nIE9DRVMgQ1AsIGRlciBrYW4gaGVudGVzIGZyYSB3d3cudHJ1c3QyNDA4LmNvbS9yZXBvc2l0b3J5LiBCZW3mcmssIGF0IFRSVVNUMjQwOCBlZnRlciB2aWxr5XJlbmUgaGFyIGV0IGJlZ3LmbnNldCBhbnN2YXIgaWZ0LiBwcm9mZXNzaW9uZWxsZSBwYXJ0ZXIuMBkGA1UdEQQSMBCBDkJFTktZQGRpZ3N0LmRrMIGgBgNVHR8EgZgwgZUwOKA2oDSGMmh0dHA6Ly9jcmwub2Nlcy1pc3N1aW5nMDEudHJ1c3QyNDA4LmNvbS9pY2EwMTEuY3JsMFmgV6BVpFMwUTELMAkGA1UEBhMCREsxEjAQBgNVBAoMCVRSVVNUMjQwODEcMBoGA1UEAwwTVFJVU1QyNDA4IE9DRVMgQ0EgSTEQMA4GA1UEAwwHQ1JMNjY3NDAfBgNVHSMEGDAWgBTcPiA5BFF1Chj9v4nVrqWlKktydzAdBgNVHQ4EFgQU2x/FpFgBGDFBJYMNttYcFRdvF18wCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAbkhl3LHDnudbKAXwCc99tlAGVWMghkt7zJW1ouaNylxuRrppINCcoXye/hhMqIlSkDPXRNbItmonv5wN11uNe+iPZflo29xeE5XCQ3VVuuwXVWSeOeH4dpAErxfH2FWriLUDSYUtwSa30re4xYktpTA3a9bgHjfKUUuQK31gBiWH9cQ0y+XxcqOMUN+C53iLgxIKHmkPI67ThNMuBA2cOfF6rEDKGjEMh3A6Ntue7wHHgTOidbC/LqYer/2gssDHNqxSiIjlR4IWsJFM5LrQ4FOW8C7gbp47ek6lFK685ccYDEbnwLejlfHe4DQjVHl4a7qlBL4Vle2ogKNHvoEL5A==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIGITCCBQmgAwIBAgIEU3nnPTANBgkqhkiG9w0BAQsFADBAMQswCQYDVQQGEwJESzESMBAGA1UECgwJVFJVU1QyNDA4MR0wGwYDVQQDDBRUUlVTVDI0MDggT0NFUyBDQSBJSTAeFw0xNDA4MjcxMjQzMTVaFw0xNzA4MjcxMjQyMzNaMHsxCzAJBgNVBAYTAkRLMTEwLwYDVQQKDChEaWdpdGFsaXNlcmluZ3NzdHlyZWxzZW4gLy8gQ1ZSOjM0MDUxMTc4MTkwFQYDVQQDDA5UaG9tYXMgVmFuZ3NhYTAgBgNVBAUTGUNWUjozNDA1MTE3OC1SSUQ6NDY1OTM2MTkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgjJ5A00v9n8o0LoW2nuaHiVgTQDEpGr+I4JeE3uV6Vq1XSzvCnI1Gl6yFlPZtgMEjEOh5Par85TH3fSAX38R+253h8cvbtg7NBdNGkirPZXlA4RCEjQx4b45s23JV1fhRtkR74PVvnjwApIFSrAK7m47SssssaFz/18MOrtx2BfsQ2mvcAHJcJqSc1HDV4c5KkDXGfIufd7qRLN+ytRPXDzdrX4ptAk9oNrsO7Bo9oSNC0kHWLucBBmidFFFBtoErJ51xJ3LvV4sDwapNsEJ13lcshQZg79+ETovAr/plJLCXzDhNRTx9EZklTUTQhmXyv2keYo0BfR4H0RZg+MDZAgMBAAGjggLmMIIC4jAOBgNVHQ8BAf8EBAMCBPAwgYkGCCsGAQUFBwEBBH0wezA1BggrBgEFBQcwAYYpaHR0cDovL29jc3AuaWNhMDIudHJ1c3QyNDA4LmNvbS9yZXNwb25kZXIwQgYIKwYBBQUHMAKGNmh0dHA6Ly9tLmFpYS5pY2EwMi50cnVzdDI0MDguY29tL29jZXMtaXNzdWluZzAyLWNhLmNlcjCCAUMGA1UdIASCATowggE2MIIBMgYKKoFQgSkBAQECBTCCASIwLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cudHJ1c3QyNDA4LmNvbS9yZXBvc2l0b3J5MIHuBggrBgEFBQcCAjCB4TAQFglUUlVTVDI0MDgwAwIBARqBzEZvciBhbnZlbmRlbHNlIGFmIGNlcnRpZmlrYXRldCBn5mxkZXIgT0NFUyB2aWxr5XIsIENQUyBvZyBPQ0VTIENQLCBkZXIga2FuIGhlbnRlcyBmcmEgd3d3LnRydXN0MjQwOC5jb20vcmVwb3NpdG9yeS4gQmVt5nJrLCBhdCBUUlVTVDI0MDggZWZ0ZXIgdmlsa+VyZW5lIGhhciBldCBiZWdy5m5zZXQgYW5zdmFyIGlmdC4gcHJvZmVzc2lvbmVsbGUgcGFydGVyLjAZBgNVHREEEjAQgQ50aG92YUBkaWdzdC5kazCBlgYDVR0fBIGOMIGLMC6gLKAqhihodHRwOi8vY3JsLmljYTAyLnRydXN0MjQwOC5jb20vaWNhMDIuY3JsMFmgV6BVpFMwUTELMAkGA1UEBhMCREsxEjAQBgNVBAoMCVRSVVNUMjQwODEdMBsGA1UEAwwUVFJVU1QyNDA4IE9DRVMgQ0EgSUkxDzANBgNVBAMMBkNSTDI4OTAfBgNVHSMEGDAWgBSZj7oNia4hGkJ6Cq4aTE4i/xDrjDAdBgNVHQ4EFgQUrQcZJBN9UFBcFU0ejOZzl2AQ20swCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAnJGujDKn1cpIl6LlCMUjIDmcegkcG+VMCasfjm1svOqr/fxHArSUpDKURcZWoNq0dUiWk0JhBUJGEi0UrVZ783jR5Pn9m7VkDhkeqR7iigMgtPvZjwfcWsnjYr+DwLxrRDZADWroOceD6GF0AOkETcDhOunFcroiTd9n4LgzHCELyVhUv8L2nbaWtlCIVxCua861x8jHketSPd8EdcqYsX6TtVdnA5S+A8h88rwrYvrpy5f9e29V6pQzFkq9BTGQ+ZtrbLI6UWV3ja0IBo0tHt/fc+lNuHV56ipz3QGS94AwxkENPSgYKLtwDOoV5c/vI9heE3/FvP1W/409h0ETgw==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.digst.dk/~/media/Files/Loesninger-og-infrastruktur/NemID/TLDK.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>DK</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="da">Digitaliseringsstyrelsen // CVR:34051178</Name>
++                     <Name xml:lang="en">Danish Agency for Digitisation // CVR:34051178</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/DK</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIDtDCCApygAwIBAgIJAOGr7PilHGMwMA0GCSqGSIb3DQEBBQUAMHExLjAsBgNVBAMTJUVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxCzAJBgNVBAYTAkVFMTIwMAYDVQQKEylFc3RvbmlhbiBUZWNobmljYWwgU3VydmVpbGxhbmNlIEF1dGhvcml0eTAeFw0xMDEwMjkxMzIyNTBaFw0yMDExMDUxMzIyNTBaMHExLjAsBgNVBAMTJUVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxCzAJBgNVBAYTAkVFMTIwMAYDVQQKEylFc3RvbmlhbiBUZWNobmljYWwgU3VydmVpbGxhbmNlIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALhdQ9c33Y98JC0pl34+rg+qXLgdjEQaBM9gpxOpIpeqwrcXi5xbLmh4mk6imennbRaZXgJRqrOkx77B+UsBwn6uPgeZenJ1kFGvAOR9aePbgxJ5AggMr4wJXSa03OSGDhptsmMFc86qtnht94mDf1UCn1CNYA7qQHzu4MQwqJ2Ist7IIki89VZD5I4Y5AItMKlEjnHAOw/dlMfI8SxE2vvxCIyQu+rhfGPfwotHi0POyKtkX9Y+JSqEVqRXNw7B2x+d9mRYUJ8EqDvj5ag9dtgyXLsfJ4HdUJMqvoT6QnfwlBbaFusTm3R8SNVXl/8LHDoM5naOSKAOGRSe2OnxAJ8CAwEAAaNPME0wDAYDVR0TBAUwAwIBADALBgNVHQ8EBAMCB4AwHQYDVR0OBBYEFAon+QooAKxPsgZlsTxvK/8synsxMBEGA1UdJQQKMAgGBgQAkTcDADANBgkqhkiG9w0BAQUFAAOCAQEACansBzvd2iwBlZg50oueEtUlFyE+do+FmI4apydq2bM3kdeikWGERSbV1EzD86j7jpNKEOvlPTkV7fZl+7uCJ3OuCrzHEzuaZnvFPkN7Rmj4P1AGh5UK4UVWJwTceuhzIf4D6+/5CNY6U8iEHIqvAmTVOPSKEvxdBv7GKHy6x897icQa8ttHq+xCLmc0+6zpbzSZ5dOmFG3kzJuZPqtqa89Lqf7x6IRRKgUd+C+JsKDMjEde/eYnM8yxdVlzEWe6Z0qKVvPTuiCnhTNhaaQM3aiw61RMTes2Ik4wSGY75XZjQV5gVszHJBEntktcduGWCuJ24qS2lb1M2/8bE43Fkg==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIDvjCCAqagAwIBAgIJAMx8n7ZaTrHwMA0GCSqGSIb3DQEBBQUAMHYxMzAxBgNVBAMTKkVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IgMjAxNDELMAkGA1UEBhMCRUUxMjAwBgNVBAoTKUVzdG9uaWFuIFRlY2huaWNhbCBTdXJ2ZWlsbGFuY2UgQXV0aG9yaXR5MB4XDTE0MDQxNzA4MTUzOFoXDTI0MDQyNDA4MTUzOFowdjEzMDEGA1UEAxMqRXN0b25pYW4gVHJ1c3RlZCBMaXN0IFNjaGVtZSBPcGVyYXRvciAyMDE0MQswCQYDVQQGEwJFRTEyMDAGA1UEChMpRXN0b25pYW4gVGVjaG5pY2FsIFN1cnZlaWxsYW5jZSBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8iDN5MzWga97Mz6eQFjCsk2en4g8ujRUQemyIc/nJ3LDSTu0ZWXLksZAoHtHwPAgHafU70nUeAUZ25Wl/jk6SyX2wY29Wka97/mWgFCb5H066T1KI+euQf6R0jhsSqGNaZrhUrs0G4jRzjcQ303YT1JiJVMh9hdGVj5KrVsGymXZh0zYrp237AWlcvxNBeiYlskASaEKbRuEpEdw4jeK0nVvfPfDj3XkLfRvX9QXRikRlPyzMKzFf7bXJRQ90hWI9IqMUP0RkvDSqqrteYV0wB8GKEaDMnqjvEXuhhoGtqusm5K3F5no+cUiY7JsalTzs3MACJSTwjZrCSxAeKr5DAgMBAAGjTzBNMAwGA1UdEwQFMAMCAQAwCwYDVR0PBAQDAgeAMB0GA1UdDgQWBBRXB3a0i0xYnYUj4nzNK/pwBrmORTARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBAGoHM4yIlIXt8CxNLe1sNxymcJyB8oJbvJwlwCUvapaJieVCSQMmtIrn+3uAAdhMijZSQWPB+5DsLWk7ewyridr2bs+UOc0uJ+ay7zrHIj/g+YDIA0DQ7L6JYabiXNJlQhPNm1LxJ9UZSt+h5anl+nSUSV/C2HQgjtgw1Sm6vYf4/EGGaYGAwOvPPOcaYKbcvcpiKkNhhl+nnfAw/RSz4X5Ow5UWNqDsNSv/xIbuw8vORLn6FcYxVScCFAQQGLl4CYQ9IFyQhsvk7xbOCpD09hd4dqvoPHCRkNjuJt9MBO169WlAL6J+coJ2Xo9JxCgfAU2HI7iGbsAnBj4jdHaa+sI=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://sr.riik.ee/tsl/estonian-tsl.pdf</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>EE</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/pdf</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Estonian Technical Surveillance Authority</Name>
++                     <Name xml:lang="et">Tehnilise Järelevalve Amet</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EE</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIDtDCCApygAwIBAgIJAOGr7PilHGMwMA0GCSqGSIb3DQEBBQUAMHExLjAsBgNVBAMTJUVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxCzAJBgNVBAYTAkVFMTIwMAYDVQQKEylFc3RvbmlhbiBUZWNobmljYWwgU3VydmVpbGxhbmNlIEF1dGhvcml0eTAeFw0xMDEwMjkxMzIyNTBaFw0yMDExMDUxMzIyNTBaMHExLjAsBgNVBAMTJUVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IxCzAJBgNVBAYTAkVFMTIwMAYDVQQKEylFc3RvbmlhbiBUZWNobmljYWwgU3VydmVpbGxhbmNlIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALhdQ9c33Y98JC0pl34+rg+qXLgdjEQaBM9gpxOpIpeqwrcXi5xbLmh4mk6imennbRaZXgJRqrOkx77B+UsBwn6uPgeZenJ1kFGvAOR9aePbgxJ5AggMr4wJXSa03OSGDhptsmMFc86qtnht94mDf1UCn1CNYA7qQHzu4MQwqJ2Ist7IIki89VZD5I4Y5AItMKlEjnHAOw/dlMfI8SxE2vvxCIyQu+rhfGPfwotHi0POyKtkX9Y+JSqEVqRXNw7B2x+d9mRYUJ8EqDvj5ag9dtgyXLsfJ4HdUJMqvoT6QnfwlBbaFusTm3R8SNVXl/8LHDoM5naOSKAOGRSe2OnxAJ8CAwEAAaNPME0wDAYDVR0TBAUwAwIBADALBgNVHQ8EBAMCB4AwHQYDVR0OBBYEFAon+QooAKxPsgZlsTxvK/8synsxMBEGA1UdJQQKMAgGBgQAkTcDADANBgkqhkiG9w0BAQUFAAOCAQEACansBzvd2iwBlZg50oueEtUlFyE+do+FmI4apydq2bM3kdeikWGERSbV1EzD86j7jpNKEOvlPTkV7fZl+7uCJ3OuCrzHEzuaZnvFPkN7Rmj4P1AGh5UK4UVWJwTceuhzIf4D6+/5CNY6U8iEHIqvAmTVOPSKEvxdBv7GKHy6x897icQa8ttHq+xCLmc0+6zpbzSZ5dOmFG3kzJuZPqtqa89Lqf7x6IRRKgUd+C+JsKDMjEde/eYnM8yxdVlzEWe6Z0qKVvPTuiCnhTNhaaQM3aiw61RMTes2Ik4wSGY75XZjQV5gVszHJBEntktcduGWCuJ24qS2lb1M2/8bE43Fkg==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIDvjCCAqagAwIBAgIJAMx8n7ZaTrHwMA0GCSqGSIb3DQEBBQUAMHYxMzAxBgNVBAMTKkVzdG9uaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IgMjAxNDELMAkGA1UEBhMCRUUxMjAwBgNVBAoTKUVzdG9uaWFuIFRlY2huaWNhbCBTdXJ2ZWlsbGFuY2UgQXV0aG9yaXR5MB4XDTE0MDQxNzA4MTUzOFoXDTI0MDQyNDA4MTUzOFowdjEzMDEGA1UEAxMqRXN0b25pYW4gVHJ1c3RlZCBMaXN0IFNjaGVtZSBPcGVyYXRvciAyMDE0MQswCQYDVQQGEwJFRTEyMDAGA1UEChMpRXN0b25pYW4gVGVjaG5pY2FsIFN1cnZlaWxsYW5jZSBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8iDN5MzWga97Mz6eQFjCsk2en4g8ujRUQemyIc/nJ3LDSTu0ZWXLksZAoHtHwPAgHafU70nUeAUZ25Wl/jk6SyX2wY29Wka97/mWgFCb5H066T1KI+euQf6R0jhsSqGNaZrhUrs0G4jRzjcQ303YT1JiJVMh9hdGVj5KrVsGymXZh0zYrp237AWlcvxNBeiYlskASaEKbRuEpEdw4jeK0nVvfPfDj3XkLfRvX9QXRikRlPyzMKzFf7bXJRQ90hWI9IqMUP0RkvDSqqrteYV0wB8GKEaDMnqjvEXuhhoGtqusm5K3F5no+cUiY7JsalTzs3MACJSTwjZrCSxAeKr5DAgMBAAGjTzBNMAwGA1UdEwQFMAMCAQAwCwYDVR0PBAQDAgeAMB0GA1UdDgQWBBRXB3a0i0xYnYUj4nzNK/pwBrmORTARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBAGoHM4yIlIXt8CxNLe1sNxymcJyB8oJbvJwlwCUvapaJieVCSQMmtIrn+3uAAdhMijZSQWPB+5DsLWk7ewyridr2bs+UOc0uJ+ay7zrHIj/g+YDIA0DQ7L6JYabiXNJlQhPNm1LxJ9UZSt+h5anl+nSUSV/C2HQgjtgw1Sm6vYf4/EGGaYGAwOvPPOcaYKbcvcpiKkNhhl+nnfAw/RSz4X5Ow5UWNqDsNSv/xIbuw8vORLn6FcYxVScCFAQQGLl4CYQ9IFyQhsvk7xbOCpD09hd4dqvoPHCRkNjuJt9MBO169WlAL6J+coJ2Xo9JxCgfAU2HI7iGbsAnBj4jdHaa+sI=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://sr.riik.ee/tsl/estonian-tsl.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>EE</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Estonian Technical Surveillance Authority</Name>
++                     <Name xml:lang="et">Tehnilise Järelevalve Amet</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EE</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIE4DCCA8igAwIBAgIQKdcXmZiVNv8AQDkUhiQ4ZzANBgkqhkiG9w0BAQUFADCBpTELMAkGA1UEBhMCR1IxPjA8BgNVBAoTNUhlbGxlbmljIFB1YmxpYyBBZG1pbmlzdHJhdGlvbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzMQ8wDQYDVQQLEwZIUEFSQ0ExRTBDBgNVBAMTPEhlbGxlbmljIFB1YmxpYyBBZG1pbmlzdHJhdGlvbiBmb3IgTGVnYWwgRW50aXRpZXMgSXNzdWluZyBDQTAeFw0xNDAxMzEwMDAwMDBaFw0xODAxMzAyMzU5NTlaMH0xCzAJBgNVBAYTAkdSMQ8wDQYDVQQHFAZBVEhFTlMxDTALBgNVBAoUBEVFVFQxDTALBgNVBAsUBEVFVFQxPzA9BgNVBAMTNkhlbGxlbmljIFRlbGVjb21tdW5pY2F0aW9ucyBhbmQgUG9zdCBDb21taXNzaW9uIC0gRUVUVDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKTC8BJGIWKJwAyeRt5v3WFyRJr6VKeo4hRH1S1dbS/kNHOCkEaCQVRJuds61oaiAJmXdCtkNZrMJZ/YSzg7LZ7/M+EW5z1rOirTr7CPUxOVYzCnQrD1gaylWMPI6+CErA867UqnOTkuRckN5P0YoFvxUvrnqMWU0SgI2Fu5F1Hn93rwaOpcteYUx4gLDTgr8g6ply1alVTeWXEtNgSaqW/dGrWTduyDSXHiKurkjnDBA+Dabw51FAWY2R/MaFHtCN3nSaxoeaoCxsy5vQxQrrZOlwvV9wnEkLXaTxzZdRKgETt+3om4ZjAR5fC4CgtXHSV7tXM+u5bN2YtxXneWT6kCAwEAAaOCATEwggEtMAkGA1UdEwQCMAAwUQYDVR0gBEowSDBGBgwqgiwAhtsxAQcBAQcwNjA0BggrBgEFBQcCARYoaHR0cHM6Ly9wa2kuZXJtaXMuZ292LmdyL3JlcG9zaXRvcnkuaHRtbDBKBgNVHR8EQzBBMD+gPaA7hjlodHRwOi8vY3JsLmVybWlzLmdvdi5nci9IUEFSQ0FMZWdhbEVudGl0aWVzL0xhdGVzdENSTC5jcmwwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBRScfRlSOyeduHtAYfzQN1Zstj2OTAfBgNVHSMEGDAWgBSEy+4igJ4tSDdTGxIHcx5vM3I7zTA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmVybWlzLmdvdi5ncjANBgkqhkiG9w0BAQUFAAOCAQEAKlHY+QHXmBMib/6iBOBQR7D/mWWvhMQCJaM69aLaXi9FHFEu2KrWFCaGh+ade92xzvhSYlMtTMDydActvyygV5etWLLBTi2YFuUFsU9niFdRSZ9ZF0LME+DcGnD8G5M9ThiLkQNMBfLX1zfrIEgGMMP8ADEGmngzdZThz984p2kTIJNDUkPhgnTNoUZs5DROxQP+NUkTw+9y5VcgSZnTWu65NXPh3Hqtq4CX/xwgomcQN31fySct63gU7HGNkXRjPvSekGOSpKuAYabTUWtGFP2YhuAJ6p2cmGzTqQuDJeilsMS7NxB/3fCOEGK8Huk9LpcGB7LVmczDrp/Q76ub8A==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIFJDCCBAygAwIBAgIQBPWIMN+uUlymArA205cJETANBgkqhkiG9w0BAQUFADCBpTELMAkGA1UEBhMCR1IxPjA8BgNVBAoTNUhlbGxlbmljIFB1YmxpYyBBZG1pbmlzdHJhdGlvbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzMQ8wDQYDVQQLEwZIUEFSQ0ExRTBDBgNVBAMTPEhlbGxlbmljIFB1YmxpYyBBZG1pbmlzdHJhdGlvbiBmb3IgTGVnYWwgRW50aXRpZXMgSXNzdWluZyBDQTAeFw0xNDAzMTAwMDAwMDBaFw0xODAzMDkyMzU5NTlaMIGtMQswCQYDVQQGEwJHUjEPMA0GA1UEBxQGQVRIRU5TMT4wPAYDVQQKFDVIZWxsZW5pYyBUZWxlY29tbXVuaWNhdGlvbnMgYW5kIFBvc3QgQ29tbWlzc2lvbiwgRUVUVDENMAsGA1UECxQERUVUVDE+MDwGA1UEAxM1SGVsbGVuaWMgVGVsZWNvbW11bmljYXRpb25zIGFuZCBQb3N0IENvbW1pc3Npb24sIEVFVFQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEcOAZE/t7SLkBwZCkhNiniAwJJyWADBCaceNMp5FV01jHhT5bFq0wECrQgIcNrCQq+z1KHBF/Zej7jhNWBO0ByKt2Y/3dB/YP9KNaJL9oAMg2/DacOehunHmeit1jXKteyV8dsf2obojUvvUGzd2/wpx0z0muSZPSMpgBsaHZOuctbjYFEhsIth1g+gIW+2hQ91QW+h+/Xo4olfLDwbEsyZh1u9cvROweXUITD7PfoJkpWyEoJYBQkODWqXJz7oTZYb+P7wIWNDoY4JCFGd+U14fKUb6qEkZQ+6nvm0/bUn0ezarQFEwKsXHcyu9q75/KKDZboFpo88r023920i0JAgMBAAGjggFEMIIBQDAJBgNVHRMEAjAAMFEGA1UdIARKMEgwRgYMKoIsAIbbMQEHAQEHMDYwNAYIKwYBBQUHAgEWKGh0dHBzOi8vcGtpLmVybWlzLmdvdi5nci9yZXBvc2l0b3J5Lmh0bWwwSgYDVR0fBEMwQTA/oD2gO4Y5aHR0cDovL2NybC5lcm1pcy5nb3YuZ3IvSFBBUkNBTGVnYWxFbnRpdGllcy9MYXRlc3RDUkwuY3JsMAsGA1UdDwQEAwIHgDAdBgNVHQ4EFgQUReYYDjHx2MVXPQrpZJXx5dsPDBowHwYDVR0jBBgwFoAUhMvuIoCeLUg3UxsSB3MebzNyO80wEQYDVR0lBAowCAYGBACRNwMAMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZXJtaXMuZ292LmdyMA0GCSqGSIb3DQEBBQUAA4IBAQBDaJ4ZYEdYU8keyGvMQYUUjfhx7k/zXwXqLgqWoORZN2aGvaDUtf/k/JhJ/xm+WnEIyKtEwtqKYf1dVS8nMY0fLpu/1cGx1qMzp8tEG3EJBls5Z2OPMoWBLE5mra1m2R8442ekWp6tSy7zoaa3xXtnUxB0Dvt1iVLHODtJcxUNKrl9nmu0ujficaSeEhprpAye917j6xVDtzLXFbGSAeNmGzVjUf+uo8ZQ6Q1F2aLjRyavy+Ph5bBwcKQ7DUocwn6gRJAqfmUJwy4H1vIqrrtaHbqVOpmgrjwZNcu3pimAOw4cd6uJThAx1acKCr2He4hii1Nxt1+SYmdIDD6WYfDt</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>https://www.eett.gr/tsl/EL-TSL.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>EL</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Hellenic Telecommunications and Post Commission, EETT</Name>
++                     <Name xml:lang="el">Εθνική Επιτροπή Τηλεπικοινωνιών και Ταχυδρομείων - EETT</Name>
++                     <Name xml:lang="el">EETT</Name>
++                     <Name xml:lang="en">EETT</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EL</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIDyzCCArOgAwIBAgIJAL6B32RxtXxMMA0GCSqGSIb3DQEBCwUAMH4xKzApBgNVBAMTIlNQQU5JU0ggVFJVU1QgTElTVCBTQ0hFTUUgT1BFUkFUT1IxCzAJBgNVBAYTAkVTMTIwMAYDVQQKEylNSU5JU1RFUklPIERFIElORFVTVFJJQSBFTkVSR0lBIFkgVFVSSVNNTzEOMAwGA1UECxMFU0VUU0kwHhcNMTQwMzExMTIzMjUyWhcNMTkwMzExMTIzMjUyWjB+MSswKQYDVQQDEyJTUEFOSVNIIFRSVVNUIExJU1QgU0NIRU1FIE9QRVJBVE9SMQswCQYDVQQGEwJFUzEyMDAGA1UEChMpTUlOSVNURVJJTyBERSBJTkRVU1RSSUEgRU5FUkdJQSBZIFRVUklTTU8xDjAMBgNVBAsTBVNFVFNJMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAocIbYfDYGdw239aAMo08eEfZvn4ACaaYkHLd80Flq6ecAk/aDuwEnmldiBv8yTNdw9/ZqsIy+x0wB09a+9lZDDyq7dCqP8CYZzJW+hYPN4IhqRLDypVxYIKUHu4TYOmAIKhEnUOnY/OrpAtErhFMaA3IwmgMSaJ8vaxop/KcSnKlx+KazoEaPV+yIX6xeCtCzghq0hjjqU0Hlg9+hyna0TRo6K4ars7MceWl1ameMaBiRbAhxINnoEvLEuOx79/kafGNLDAP0ThGhbK9q7hEBylydzY+wVLgM5yCYZdcLllHkt5Fr2zxNU8FH2Jnl+83qbdZDPFYb+HMWZfhHNkz8QIDAQABo0wwSjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGQDAdBgNVHQ4EFgQUNab+5BisBkvbZfGGr5bY9s0pxT4wEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQCQNx9/TYPACsgOJzBx06EcOHnvslBilvlMghtaQLygoatFTpaeX0JqFuYAZhfGF28k8eC3ENxUYPa30Zh4ZWRm0QlmLjBKBB/z3jJQIq7b0kqf6H8Vb/vvvSNsoWBwnWzv9X8t9D+S9TK5844dCtSvhlkTBlJYXZ+N9cbz0rk6GELzwY33VOSygcj0hyib4+Xb8dxX15omjVS+qk3FyWCq3DPibwKzD5irJL7EfRFkDoWwRVzaaeDCOJqFWeIpfY7/NocB1fbkvx7wMFzZ9xAFgPLirxi6ZVu0YKoDQq95HnvEzDMdoBUdAK+WtS1a3zJIjNAqb6YE9w4cbPpUXWUs</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIDyzCCArOgAwIBAgIJAKWF81P5BqylMA0GCSqGSIb3DQEBCwUAMH4xKzApBgNVBAMTIlNQQU5JU0ggVFJVU1QgTElTVCBTQ0hFTUUgT1BFUkFUT1IxCzAJBgNVBAYTAkVTMTIwMAYDVQQKEylNSU5JU1RFUklPIERFIElORFVTVFJJQSBFTkVSR0lBIFkgVFVSSVNNTzEOMAwGA1UECxMFU0VUU0kwHhcNMTQwOTExMTEzODEyWhcNMTkwOTExMTEzODEyWjB+MSswKQYDVQQDEyJTUEFOSVNIIFRSVVNUIExJU1QgU0NIRU1FIE9QRVJBVE9SMQswCQYDVQQGEwJFUzEyMDAGA1UEChMpTUlOSVNURVJJTyBERSBJTkRVU1RSSUEgRU5FUkdJQSBZIFRVUklTTU8xDjAMBgNVBAsTBVNFVFNJMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3Tk6ThJZ/uBAqg8c0PWtC+xl8XQ4RyELaZSwcbaBJlyr/dj288QWjIBtOz+kZgEM7mINlTNW4/FVHNeJfY8dzUBdkhTccx7W3yK720U83DZp+OhBS47+T4/6krQPZ2uMhPI+U7sf7qcOVJ0AjxF2vrrFqTzm1pJ8TE1ys482b8s0o3A9ugLR28UcQhhUUPA2hMkEwzIY9TL1Umrip2XtlJT3N1IOKTMQpiqTJL5laF6WWVRtcTv461uePiohd9ZhBjOXstcaEczCOFeE7Zh6l9uSCwW78ool8b2VezEh5ZDaGv/iSxxPIoiOkd5/9yElqy3JLagJKs8LpTp33WvGhQIDAQABo0wwSjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGQDAdBgNVHQ4EFgQUkh8fb5AKQbc7caUcVmmK7FH1vUwwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQDJjFeyy4YBakY61DvbuuCb6FlrIhSbNPH2/o7fX4Ve+G+2WRJOEkE1dIezvnVyOvNnym66rngcZXQDoFMPK5SOQm4nNXrUDd5rWM3c84sHba7UuEdVgC9ZW0YR44/9bVxIHOBSXUDcWbUu6nVStZpNy/Gn11iEIRSU4TsE8YJK5cjZ/xaigYDt01BlLu34v60JoClwlbHeuPgHhUwPyGD8sD4g9+QQhsouv8pG9gbT5+KttS63jB/SmrWLAJOmg97WI/2jkSObJ8zwn0jVJdZtBGbiN2I3+wv1F+FvRZH4jdpE2P7aimucx5iMng+o/dKzFGThn5DwVa5pvplf8IEs</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>https://sede.minetur.gob.es/Prestadores/TSL/TSL.pdf</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>ES</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/pdf</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">MINISTRY OF INDUSTRY ENERGY AND TOURISM</Name>
++                     <Name xml:lang="es">MINISTERIO DE INDUSTRIA ENERGIA Y TURISMO</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/ES</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIDyzCCArOgAwIBAgIJAL6B32RxtXxMMA0GCSqGSIb3DQEBCwUAMH4xKzApBgNVBAMTIlNQQU5JU0ggVFJVU1QgTElTVCBTQ0hFTUUgT1BFUkFUT1IxCzAJBgNVBAYTAkVTMTIwMAYDVQQKEylNSU5JU1RFUklPIERFIElORFVTVFJJQSBFTkVSR0lBIFkgVFVSSVNNTzEOMAwGA1UECxMFU0VUU0kwHhcNMTQwMzExMTIzMjUyWhcNMTkwMzExMTIzMjUyWjB+MSswKQYDVQQDEyJTUEFOSVNIIFRSVVNUIExJU1QgU0NIRU1FIE9QRVJBVE9SMQswCQYDVQQGEwJFUzEyMDAGA1UEChMpTUlOSVNURVJJTyBERSBJTkRVU1RSSUEgRU5FUkdJQSBZIFRVUklTTU8xDjAMBgNVBAsTBVNFVFNJMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAocIbYfDYGdw239aAMo08eEfZvn4ACaaYkHLd80Flq6ecAk/aDuwEnmldiBv8yTNdw9/ZqsIy+x0wB09a+9lZDDyq7dCqP8CYZzJW+hYPN4IhqRLDypVxYIKUHu4TYOmAIKhEnUOnY/OrpAtErhFMaA3IwmgMSaJ8vaxop/KcSnKlx+KazoEaPV+yIX6xeCtCzghq0hjjqU0Hlg9+hyna0TRo6K4ars7MceWl1ameMaBiRbAhxINnoEvLEuOx79/kafGNLDAP0ThGhbK9q7hEBylydzY+wVLgM5yCYZdcLllHkt5Fr2zxNU8FH2Jnl+83qbdZDPFYb+HMWZfhHNkz8QIDAQABo0wwSjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGQDAdBgNVHQ4EFgQUNab+5BisBkvbZfGGr5bY9s0pxT4wEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQCQNx9/TYPACsgOJzBx06EcOHnvslBilvlMghtaQLygoatFTpaeX0JqFuYAZhfGF28k8eC3ENxUYPa30Zh4ZWRm0QlmLjBKBB/z3jJQIq7b0kqf6H8Vb/vvvSNsoWBwnWzv9X8t9D+S9TK5844dCtSvhlkTBlJYXZ+N9cbz0rk6GELzwY33VOSygcj0hyib4+Xb8dxX15omjVS+qk3FyWCq3DPibwKzD5irJL7EfRFkDoWwRVzaaeDCOJqFWeIpfY7/NocB1fbkvx7wMFzZ9xAFgPLirxi6ZVu0YKoDQq95HnvEzDMdoBUdAK+WtS1a3zJIjNAqb6YE9w4cbPpUXWUs</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIDyzCCArOgAwIBAgIJAKWF81P5BqylMA0GCSqGSIb3DQEBCwUAMH4xKzApBgNVBAMTIlNQQU5JU0ggVFJVU1QgTElTVCBTQ0hFTUUgT1BFUkFUT1IxCzAJBgNVBAYTAkVTMTIwMAYDVQQKEylNSU5JU1RFUklPIERFIElORFVTVFJJQSBFTkVSR0lBIFkgVFVSSVNNTzEOMAwGA1UECxMFU0VUU0kwHhcNMTQwOTExMTEzODEyWhcNMTkwOTExMTEzODEyWjB+MSswKQYDVQQDEyJTUEFOSVNIIFRSVVNUIExJU1QgU0NIRU1FIE9QRVJBVE9SMQswCQYDVQQGEwJFUzEyMDAGA1UEChMpTUlOSVNURVJJTyBERSBJTkRVU1RSSUEgRU5FUkdJQSBZIFRVUklTTU8xDjAMBgNVBAsTBVNFVFNJMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3Tk6ThJZ/uBAqg8c0PWtC+xl8XQ4RyELaZSwcbaBJlyr/dj288QWjIBtOz+kZgEM7mINlTNW4/FVHNeJfY8dzUBdkhTccx7W3yK720U83DZp+OhBS47+T4/6krQPZ2uMhPI+U7sf7qcOVJ0AjxF2vrrFqTzm1pJ8TE1ys482b8s0o3A9ugLR28UcQhhUUPA2hMkEwzIY9TL1Umrip2XtlJT3N1IOKTMQpiqTJL5laF6WWVRtcTv461uePiohd9ZhBjOXstcaEczCOFeE7Zh6l9uSCwW78ool8b2VezEh5ZDaGv/iSxxPIoiOkd5/9yElqy3JLagJKs8LpTp33WvGhQIDAQABo0wwSjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGQDAdBgNVHQ4EFgQUkh8fb5AKQbc7caUcVmmK7FH1vUwwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQDJjFeyy4YBakY61DvbuuCb6FlrIhSbNPH2/o7fX4Ve+G+2WRJOEkE1dIezvnVyOvNnym66rngcZXQDoFMPK5SOQm4nNXrUDd5rWM3c84sHba7UuEdVgC9ZW0YR44/9bVxIHOBSXUDcWbUu6nVStZpNy/Gn11iEIRSU4TsE8YJK5cjZ/xaigYDt01BlLu34v60JoClwlbHeuPgHhUwPyGD8sD4g9+QQhsouv8pG9gbT5+KttS63jB/SmrWLAJOmg97WI/2jkSObJ8zwn0jVJdZtBGbiN2I3+wv1F+FvRZH4jdpE2P7aimucx5iMng+o/dKzFGThn5DwVa5pvplf8IEs</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>https://sede.minetur.gob.es/Prestadores/TSL/TSL.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>ES</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">MINISTRY OF INDUSTRY ENERGY AND TOURISM</Name>
++                     <Name xml:lang="es">MINISTERIO DE INDUSTRIA ENERGIA Y TURISMO</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/ES</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIGLjCCBBagAwIBAgIFFNaV71owDQYJKoZIhvcNAQENBQAwgYwxCzAJBgNVBAYTAkZJMREwDwYDVQQHDAhIZWxzaW5raTE0MDIGA1UECgwrRmlubmlzaCBDb21tdW5pY2F0aW9ucyBSZWd1bGF0b3J5IEF1dGhvcml0eTE0MDIGA1UEAwwrRmlubmlzaCBDb21tdW5pY2F0aW9ucyBSZWd1bGF0b3J5IEF1dGhvcml0eTAeFw0xNDAxMjkwMDAwMDBaFw0xNzAxMjkwMDAwMDBaMIGMMQswCQYDVQQGEwJGSTERMA8GA1UEBwwISGVsc2lua2kxNDAyBgNVBAoMK0Zpbm5pc2ggQ29tbXVuaWNhdGlvbnMgUmVndWxhdG9yeSBBdXRob3JpdHkxNDAyBgNVBAMMK0Zpbm5pc2ggQ29tbXVuaWNhdGlvbnMgUmVndWxhdG9yeSBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDlBRvA314qdToNxTWlXnEL8BwrU7AE0FkYQdWwl9Pe8+3+pzZ1y1vTGgDNVX5qm6taGtMyKwLCuZ4HXUs1tV1LmKE4GHm49R5IjcxCocGyUmIQOzAlYEG087ol/nVuG3bVyOOv/OID8/drj13QvSmhkOXtfHKo0meF/HiGHO9oTBshQpdhCDCxcP+ERh92peCcn1XdO/fCIWdEfIxfyPvf0ktdjAQyeRE7PUusRAdVfPppW6x2+2dMjFwN6pL+eiTw8QX79mm47DVR9nxpvzhvO8JqniG7Oog9GdQF/kGK7AU7gmJq+mp+pl8S9dpooxg/JbmxpGyceHeIWtmqEv4rcI/futBjJ6W8xsMKu8Bhb/m8Fx9oiXCqYf/3nsDBtCnhF8zNxW65X5sqcxzC8j1WrTNMIZdIUsozZ4uWVsdVHnC913HmPg9iZj62t0d6BrEMe+OPyj9+2Klx2wBE2JoHK+7X3I3HWubTNqxRV2YpcTTzy/NoDlVszJh0gQywaYivciEDeTMufpRtAX21NdwzDx120x80WeZg7yiNLP9cdnxcFaUD/6JViqxjTfU68JvHto5f/Q4wgB1wtCfU2/LQyjoLXrZGgEoMhvOAwQzr0tRjL9Rob0kcghR9rJXZ3mlKJcjYFAFTiKusxQMWyZ00Sqw0VWlTnYrMtC42r/kaUwIDAQABo4GUMIGRMB0GA1UdDgQWBBStsWQJG5o1vkTC1ZRN7YIu/oMLMjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSAECjAIMAYGBFUdIAAwLwYDVR0RBCgwJoENdHNsQGZpY29yYS5maYYVaHR0cDovL3d3dy5maWNvcmEuZmkvMBEGA1UdJQQKMAgGBgQAkTcDADANBgkqhkiG9w0BAQ0FAAOCAgEALIdGuCE+3QSRFO1G3Bckk5lzk5fLo3tuhQnG3sQUkLjN7RKU4kHLqxSBw5Xveg08gPbEQJUWllr+ggwEZGT4Pb5U+0A32uO9l+FzHTU08VuFNGJanGnl7yqpNDOfoJ+vEjobTJXrHztPHxIenM6Zi3vXq8lHK3kBMjwDDS7tONP8Buj5QZbTLcrqQaw2GnA1qD1jEG+HL5+DAqtz/b7lM3F2yaaKsKRA0QEELQhschxyXF5H0pwTU7wHHN5vyNsFtq4KvzR+nq8kdDpbH1UnS0sS6MsttPdDePwXWGwrldxW4qHH0ev0RdC5oUnF+Z+D8oAhRP7ZsRlBlJTVNyeMSZuw3N9tB2Rwde0CSkWpconGDmmt8u8rxYRrgfqWU1tlrPr3KA3GUA11knawTL09R8v0ts3xAQvWKZl8C3GwUkHdHr4Whno8gucptP5zq/6Tu6KWe8jTAbjLguj8ouEnzjutXEncCIXel0+YIUKjV0OeH3mKbg4mx8WAL0Ui1uNsPQGa7od0DgsMV6aOKZgHj4ne+UImn9sVJU2lM5ZqPNe5uhOj/dSrxpCAp++VRJhEr2x+LQe1r+AWE/xFsX1jK7S/YYgnFYF6oDt+k4pRZ71yKS0LtxvkJyo69xLNHF6ef2iCZ0VQLMmZy2O5je0BVeBX0MlhX5rjqr8gPBWHHaI=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIGLjCCBBagAwIBAgIFFF1sOa8wDQYJKoZIhvcNAQENBQAwgYwxCzAJBgNVBAYTAkZJMREwDwYDVQQHDAhIZWxzaW5raTE0MDIGA1UECgwrRmlubmlzaCBDb21tdW5pY2F0aW9ucyBSZWd1bGF0b3J5IEF1dGhvcml0eTE0MDIGA1UEAwwrRmlubmlzaCBDb21tdW5pY2F0aW9ucyBSZWd1bGF0b3J5IEF1dGhvcml0eTAeFw0xNDAxMjkwMDAwMDBaFw0xNzA1MjkwMDAwMDBaMIGMMQswCQYDVQQGEwJGSTERMA8GA1UEBwwISGVsc2lua2kxNDAyBgNVBAoMK0Zpbm5pc2ggQ29tbXVuaWNhdGlvbnMgUmVndWxhdG9yeSBBdXRob3JpdHkxNDAyBgNVBAMMK0Zpbm5pc2ggQ29tbXVuaWNhdGlvbnMgUmVndWxhdG9yeSBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCj/Np9sC+sShirNn7st+aMFctbBTuWZJiit/jHekczvWKpMWt7JjWieZESkdcSEfDN8Ziu8a0rLsBgcKGKdNxW1EapJg5GolE+0P01kglCxQptOqUkc8t943p1TOsDx/u1vSHjnaV5SyCuqhbBaJOTZrOGePPyaOMKvQ/C/EqBuolfYfEC1TrrC7T0NA9t0F3MtKFvcrFPfEgOPmqcqHJfnOhb9ip4HSzOn09qUltJKsmZ/h9v2qcUdmjN6H7okMec1Pjnf8M5oEZk0Mr++ZAEOHQDfcN9rzVKdlUH2uckwHfOF0BYcdpyn7jry7BA9lDM8k/BnNmE+/hDYUGWODF8nw9qqcWgTMBngAvXeGAoZEq7L4Y/n/jASaHBaMrPB5+FFfM3bQp1yu94aPaVemuipG3tVOLwnJR7ITQXbVjwhK+oVc3OV7lMBcnumdrwPlQTDv2kYNDE9+agZsIldb86nAzF7KvT3E9BYW+Ki8OJrhpiCkZEOD6VjMOBWYXpB1t9QoQP8HNX8++3F0n637w9DfyD8EbbhPD9MmyYe97//jzl8dVJVbKp04EM+dYibS7t3Tv9vTXP/ZrBtXlV++FN3c7X4MFmeS1BqmGGcWENLgTy5+wal35c/Tl8i4w/9DsiOweUTtApE4lbd0YjYDlRtpIZHv5rWxzYKZf5QyvJAwIDAQABo4GUMIGRMB0GA1UdDgQWBBTyJSvYrLIitCRLQ7chsEd0fIW2GjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSAECjAIMAYGBFUdIAAwLwYDVR0RBCgwJoENdHNsQGZpY29yYS5maYYVaHR0cDovL3d3dy5maWNvcmEuZmkvMBEGA1UdJQQKMAgGBgQAkTcDADANBgkqhkiG9w0BAQ0FAAOCAgEARutGlCEPO6KVboOz76YpIRzAtFsAdztsNpNqnalAorAeN3Wnvm2fGiNR+zpkEE91Iqv79WNGNY9clADQTmksmUubHH9jSky9nQbM7wmEqcLAF8jGYQz0Pvya4p/3rZ2Q6b46wyb4E+GWyYAqp35nEizIf+iNnPuCrFjWjsVnhZWYMbNO/4PGBsQTSv6t6q7zAp21bw5slYbAfiYvLxR017btGq29sMRsei1olbleLHMM+L+eepU0fmXrwQEOJgqU2H8xw1NPLJu8ZVq8oM/nGPEzweKoCE0/PWjoVH1GryNmN+tz55Z7VejkdxHEwjnRJABC+HLjqF5awLUxXbwC6qZ7UzCEnf0AygStNi1PFf4Xn6iN8qP1tSHxSdOj25yQ3Ovqq/GERLlW/Im7oNBqXJDuoI0x7VeQRKbRflS8fyUbwSbg7TQo0yoSefHevk+bXF74NLB3kh2Leu/i6wPY3A5X4sucESYJmVUqRt6E32EIvdy/dPZtLDGqlqHMxJmXGdehSJ1UOUXgYmAVT+yRVOYTROBkqk3VzdkuDrzHiYGO7x7t+XyI9I/jQJTXvPNqWq3JtZDsyxI8nHAr1MKcm8FnZr3DL/RUOhxRTPCRX9BtXehy+izYdaWb/PcS6LtSFWrXvQLXGLFzgVfjBDWsLS9XfLylZTaox/BBp2JjCyY=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>https://www.viestintavirasto.fi/attachments/HumanReadable_TSL-Ficora.xml.pdf</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>FI</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/pdf</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Finnish Communications Regulatory Authority</Name>
++                     <Name xml:lang="fi">Viestintavirasto</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/FI</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIGLjCCBBagAwIBAgIFFNaV71owDQYJKoZIhvcNAQENBQAwgYwxCzAJBgNVBAYTAkZJMREwDwYDVQQHDAhIZWxzaW5raTE0MDIGA1UECgwrRmlubmlzaCBDb21tdW5pY2F0aW9ucyBSZWd1bGF0b3J5IEF1dGhvcml0eTE0MDIGA1UEAwwrRmlubmlzaCBDb21tdW5pY2F0aW9ucyBSZWd1bGF0b3J5IEF1dGhvcml0eTAeFw0xNDAxMjkwMDAwMDBaFw0xNzAxMjkwMDAwMDBaMIGMMQswCQYDVQQGEwJGSTERMA8GA1UEBwwISGVsc2lua2kxNDAyBgNVBAoMK0Zpbm5pc2ggQ29tbXVuaWNhdGlvbnMgUmVndWxhdG9yeSBBdXRob3JpdHkxNDAyBgNVBAMMK0Zpbm5pc2ggQ29tbXVuaWNhdGlvbnMgUmVndWxhdG9yeSBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDlBRvA314qdToNxTWlXnEL8BwrU7AE0FkYQdWwl9Pe8+3+pzZ1y1vTGgDNVX5qm6taGtMyKwLCuZ4HXUs1tV1LmKE4GHm49R5IjcxCocGyUmIQOzAlYEG087ol/nVuG3bVyOOv/OID8/drj13QvSmhkOXtfHKo0meF/HiGHO9oTBshQpdhCDCxcP+ERh92peCcn1XdO/fCIWdEfIxfyPvf0ktdjAQyeRE7PUusRAdVfPppW6x2+2dMjFwN6pL+eiTw8QX79mm47DVR9nxpvzhvO8JqniG7Oog9GdQF/kGK7AU7gmJq+mp+pl8S9dpooxg/JbmxpGyceHeIWtmqEv4rcI/futBjJ6W8xsMKu8Bhb/m8Fx9oiXCqYf/3nsDBtCnhF8zNxW65X5sqcxzC8j1WrTNMIZdIUsozZ4uWVsdVHnC913HmPg9iZj62t0d6BrEMe+OPyj9+2Klx2wBE2JoHK+7X3I3HWubTNqxRV2YpcTTzy/NoDlVszJh0gQywaYivciEDeTMufpRtAX21NdwzDx120x80WeZg7yiNLP9cdnxcFaUD/6JViqxjTfU68JvHto5f/Q4wgB1wtCfU2/LQyjoLXrZGgEoMhvOAwQzr0tRjL9Rob0kcghR9rJXZ3mlKJcjYFAFTiKusxQMWyZ00Sqw0VWlTnYrMtC42r/kaUwIDAQABo4GUMIGRMB0GA1UdDgQWBBStsWQJG5o1vkTC1ZRN7YIu/oMLMjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSAECjAIMAYGBFUdIAAwLwYDVR0RBCgwJoENdHNsQGZpY29yYS5maYYVaHR0cDovL3d3dy5maWNvcmEuZmkvMBEGA1UdJQQKMAgGBgQAkTcDADANBgkqhkiG9w0BAQ0FAAOCAgEALIdGuCE+3QSRFO1G3Bckk5lzk5fLo3tuhQnG3sQUkLjN7RKU4kHLqxSBw5Xveg08gPbEQJUWllr+ggwEZGT4Pb5U+0A32uO9l+FzHTU08VuFNGJanGnl7yqpNDOfoJ+vEjobTJXrHztPHxIenM6Zi3vXq8lHK3kBMjwDDS7tONP8Buj5QZbTLcrqQaw2GnA1qD1jEG+HL5+DAqtz/b7lM3F2yaaKsKRA0QEELQhschxyXF5H0pwTU7wHHN5vyNsFtq4KvzR+nq8kdDpbH1UnS0sS6MsttPdDePwXWGwrldxW4qHH0ev0RdC5oUnF+Z+D8oAhRP7ZsRlBlJTVNyeMSZuw3N9tB2Rwde0CSkWpconGDmmt8u8rxYRrgfqWU1tlrPr3KA3GUA11knawTL09R8v0ts3xAQvWKZl8C3GwUkHdHr4Whno8gucptP5zq/6Tu6KWe8jTAbjLguj8ouEnzjutXEncCIXel0+YIUKjV0OeH3mKbg4mx8WAL0Ui1uNsPQGa7od0DgsMV6aOKZgHj4ne+UImn9sVJU2lM5ZqPNe5uhOj/dSrxpCAp++VRJhEr2x+LQe1r+AWE/xFsX1jK7S/YYgnFYF6oDt+k4pRZ71yKS0LtxvkJyo69xLNHF6ef2iCZ0VQLMmZy2O5je0BVeBX0MlhX5rjqr8gPBWHHaI=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIGLjCCBBagAwIBAgIFFF1sOa8wDQYJKoZIhvcNAQENBQAwgYwxCzAJBgNVBAYTAkZJMREwDwYDVQQHDAhIZWxzaW5raTE0MDIGA1UECgwrRmlubmlzaCBDb21tdW5pY2F0aW9ucyBSZWd1bGF0b3J5IEF1dGhvcml0eTE0MDIGA1UEAwwrRmlubmlzaCBDb21tdW5pY2F0aW9ucyBSZWd1bGF0b3J5IEF1dGhvcml0eTAeFw0xNDAxMjkwMDAwMDBaFw0xNzA1MjkwMDAwMDBaMIGMMQswCQYDVQQGEwJGSTERMA8GA1UEBwwISGVsc2lua2kxNDAyBgNVBAoMK0Zpbm5pc2ggQ29tbXVuaWNhdGlvbnMgUmVndWxhdG9yeSBBdXRob3JpdHkxNDAyBgNVBAMMK0Zpbm5pc2ggQ29tbXVuaWNhdGlvbnMgUmVndWxhdG9yeSBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCj/Np9sC+sShirNn7st+aMFctbBTuWZJiit/jHekczvWKpMWt7JjWieZESkdcSEfDN8Ziu8a0rLsBgcKGKdNxW1EapJg5GolE+0P01kglCxQptOqUkc8t943p1TOsDx/u1vSHjnaV5SyCuqhbBaJOTZrOGePPyaOMKvQ/C/EqBuolfYfEC1TrrC7T0NA9t0F3MtKFvcrFPfEgOPmqcqHJfnOhb9ip4HSzOn09qUltJKsmZ/h9v2qcUdmjN6H7okMec1Pjnf8M5oEZk0Mr++ZAEOHQDfcN9rzVKdlUH2uckwHfOF0BYcdpyn7jry7BA9lDM8k/BnNmE+/hDYUGWODF8nw9qqcWgTMBngAvXeGAoZEq7L4Y/n/jASaHBaMrPB5+FFfM3bQp1yu94aPaVemuipG3tVOLwnJR7ITQXbVjwhK+oVc3OV7lMBcnumdrwPlQTDv2kYNDE9+agZsIldb86nAzF7KvT3E9BYW+Ki8OJrhpiCkZEOD6VjMOBWYXpB1t9QoQP8HNX8++3F0n637w9DfyD8EbbhPD9MmyYe97//jzl8dVJVbKp04EM+dYibS7t3Tv9vTXP/ZrBtXlV++FN3c7X4MFmeS1BqmGGcWENLgTy5+wal35c/Tl8i4w/9DsiOweUTtApE4lbd0YjYDlRtpIZHv5rWxzYKZf5QyvJAwIDAQABo4GUMIGRMB0GA1UdDgQWBBTyJSvYrLIitCRLQ7chsEd0fIW2GjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSAECjAIMAYGBFUdIAAwLwYDVR0RBCgwJoENdHNsQGZpY29yYS5maYYVaHR0cDovL3d3dy5maWNvcmEuZmkvMBEGA1UdJQQKMAgGBgQAkTcDADANBgkqhkiG9w0BAQ0FAAOCAgEARutGlCEPO6KVboOz76YpIRzAtFsAdztsNpNqnalAorAeN3Wnvm2fGiNR+zpkEE91Iqv79WNGNY9clADQTmksmUubHH9jSky9nQbM7wmEqcLAF8jGYQz0Pvya4p/3rZ2Q6b46wyb4E+GWyYAqp35nEizIf+iNnPuCrFjWjsVnhZWYMbNO/4PGBsQTSv6t6q7zAp21bw5slYbAfiYvLxR017btGq29sMRsei1olbleLHMM+L+eepU0fmXrwQEOJgqU2H8xw1NPLJu8ZVq8oM/nGPEzweKoCE0/PWjoVH1GryNmN+tz55Z7VejkdxHEwjnRJABC+HLjqF5awLUxXbwC6qZ7UzCEnf0AygStNi1PFf4Xn6iN8qP1tSHxSdOj25yQ3Ovqq/GERLlW/Im7oNBqXJDuoI0x7VeQRKbRflS8fyUbwSbg7TQo0yoSefHevk+bXF74NLB3kh2Leu/i6wPY3A5X4sucESYJmVUqRt6E32EIvdy/dPZtLDGqlqHMxJmXGdehSJ1UOUXgYmAVT+yRVOYTROBkqk3VzdkuDrzHiYGO7x7t+XyI9I/jQJTXvPNqWq3JtZDsyxI8nHAr1MKcm8FnZr3DL/RUOhxRTPCRX9BtXehy+izYdaWb/PcS6LtSFWrXvQLXGLFzgVfjBDWsLS9XfLylZTaox/BBp2JjCyY=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>https://www.viestintavirasto.fi/attachments/TSL-Ficora.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>FI</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Finnish Communications Regulatory Authority</Name>
++                     <Name xml:lang="fi">Viestintavirasto</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/FI</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIEfjCCA2agAwIBAgISESFFIhi7LsGOut4p3YeL6MH7MA0GCSqGSIb3DQEBCwUAMIGUMQswCQYDVQQGEwJGUjEwMC4GA1UECgwnQWdlbmNlIE5hdGlvbmFsZSBkZXMgVGl0cmVzIFPDqWN1cmlzw6lzMRcwFQYDVQQLEw4wMDAyIDEzMDAwMzI2MjE6MDgGA1UEAwwxQXV0b3JpdMOpIGRlIGNlcnRpZmljYXRpb24gcG9ydGV1ciBBQUUgMyDDqXRvaWxlczAeFw0xNDAzMjYxNTEwMTJaFw0xNzAzMjYxNDEwMTJaMH0xCzAJBgNVBAYTAkZSMS4wLAYDVQQKEyVBZ2VuY2UgTmF0aW9uYWxlIGRlcyBUaXRyZXMgU2VjdXJpc2VzMRcwFQYDVQQLEw4wMDAyIDEzMDAwMzI2MjElMCMGA1UEAxMcTGF1cmVudCBWb2lsbG90IDIzMTAwMDExNTN2bDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjtrKgkGxUMgxtItb0taMxoKdUFZIo7mUnhuWa5ozlnHvF1QZ+GlrgUCcRZtvMkzRkjzzsduwe3d0pXTXbddjs2CPD5nnyXpVCw0RG9tgBSwSkNMB2BFPDeNoShLNh6GgJ5pYpfPj+Xj4AG9s4wZAPtNBXNoZj25lK85XPbNCwroOXStJVqWryr6A8Wa/IIBui3uxyQcgEhQTK0TmXRsnWOI6YCOhVeQm7Nj8yelWu6j4zqqf9IoFbn8U7YQ+kgRAhZjpUlQBiXRzyCAPYZn/GE7v8xAodEppwpQ3MEwUMul++ENVixJnPhCTK+1DXuk33FC5eh8l3pJsWMfJFWVAECAwEAAaOB3zCB3DAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDAXBgNVHSAEEDAOMAwGCiqBegGBSAIDAQEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC5hbnRzLmdvdXYuZnIvYW50c3YyL2FjX3BvcnRldXJfYWFlLmNybDAiBggrBgEFBQcBAwQWMBQwCAYGBACORgEBMAgGBgQAjkYBBDAdBgNVHQ4EFgQUO8vG9yPdo2CH7zThOxpkoirLy/IwHwYDVR0jBBgwFoAUrS1vABmDqTgbf4cj78PA932oJUkwDQYJKoZIhvcNAQELBQADggEBAKqCs2JJe0jjmqQUARdsLDAB27S9glO6UHWprnkUG3OoJRRnDewACyo4MTdst2WgB6kAuQ80lMsTGCpRTN4TppbZDvHtcv6QsAV+878m0zdzBfCLp8F9pMxQaQZNFjBD3o0TsGz4plY1KCgHBviSRqwdAT7SqY68XAjMj+e3WhJ0693nEMmurXMpqe2OE1s5Y5BExlxhffImyrhDzry4/V0ZEnAb99DW0zr+WTNZFlkpz9CwZgPWTpuGHagU8/aFCJ2hbrmYZYsPhHMBLbBKfphJ9rrojQmY7SWpvd7ygGIfi9migV7EFMq/v8XyXuwFq1jt7QgturXnb39dgU7MT9A=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://references.modernisation.gouv.fr/sites/default/files/TSL-FR_xml.pdf</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>FR</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/pdf</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Directorate General for State Modernisation</Name>
++                     <Name xml:lang="fr">Direction Générale de la Modernisation de l'Etat (DGME )</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/FR</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIEfjCCA2agAwIBAgISESFFIhi7LsGOut4p3YeL6MH7MA0GCSqGSIb3DQEBCwUAMIGUMQswCQYDVQQGEwJGUjEwMC4GA1UECgwnQWdlbmNlIE5hdGlvbmFsZSBkZXMgVGl0cmVzIFPDqWN1cmlzw6lzMRcwFQYDVQQLEw4wMDAyIDEzMDAwMzI2MjE6MDgGA1UEAwwxQXV0b3JpdMOpIGRlIGNlcnRpZmljYXRpb24gcG9ydGV1ciBBQUUgMyDDqXRvaWxlczAeFw0xNDAzMjYxNTEwMTJaFw0xNzAzMjYxNDEwMTJaMH0xCzAJBgNVBAYTAkZSMS4wLAYDVQQKEyVBZ2VuY2UgTmF0aW9uYWxlIGRlcyBUaXRyZXMgU2VjdXJpc2VzMRcwFQYDVQQLEw4wMDAyIDEzMDAwMzI2MjElMCMGA1UEAxMcTGF1cmVudCBWb2lsbG90IDIzMTAwMDExNTN2bDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjtrKgkGxUMgxtItb0taMxoKdUFZIo7mUnhuWa5ozlnHvF1QZ+GlrgUCcRZtvMkzRkjzzsduwe3d0pXTXbddjs2CPD5nnyXpVCw0RG9tgBSwSkNMB2BFPDeNoShLNh6GgJ5pYpfPj+Xj4AG9s4wZAPtNBXNoZj25lK85XPbNCwroOXStJVqWryr6A8Wa/IIBui3uxyQcgEhQTK0TmXRsnWOI6YCOhVeQm7Nj8yelWu6j4zqqf9IoFbn8U7YQ+kgRAhZjpUlQBiXRzyCAPYZn/GE7v8xAodEppwpQ3MEwUMul++ENVixJnPhCTK+1DXuk33FC5eh8l3pJsWMfJFWVAECAwEAAaOB3zCB3DAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDAXBgNVHSAEEDAOMAwGCiqBegGBSAIDAQEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC5hbnRzLmdvdXYuZnIvYW50c3YyL2FjX3BvcnRldXJfYWFlLmNybDAiBggrBgEFBQcBAwQWMBQwCAYGBACORgEBMAgGBgQAjkYBBDAdBgNVHQ4EFgQUO8vG9yPdo2CH7zThOxpkoirLy/IwHwYDVR0jBBgwFoAUrS1vABmDqTgbf4cj78PA932oJUkwDQYJKoZIhvcNAQELBQADggEBAKqCs2JJe0jjmqQUARdsLDAB27S9glO6UHWprnkUG3OoJRRnDewACyo4MTdst2WgB6kAuQ80lMsTGCpRTN4TppbZDvHtcv6QsAV+878m0zdzBfCLp8F9pMxQaQZNFjBD3o0TsGz4plY1KCgHBviSRqwdAT7SqY68XAjMj+e3WhJ0693nEMmurXMpqe2OE1s5Y5BExlxhffImyrhDzry4/V0ZEnAb99DW0zr+WTNZFlkpz9CwZgPWTpuGHagU8/aFCJ2hbrmYZYsPhHMBLbBKfphJ9rrojQmY7SWpvd7ygGIfi9migV7EFMq/v8XyXuwFq1jt7QgturXnb39dgU7MT9A=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://references.modernisation.gouv.fr/sites/default/files/TSL-FR.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>FR</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Directorate General for State Modernisation</Name>
++                     <Name xml:lang="fr">Direction Générale de la Modernisation de l'Etat (DGME )</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/FR</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIEzDCCA7SgAwIBAgIEPy+YtjANBgkqhkiG9w0BAQUFADAqMQswCQYDVQQGEwJIUjENMAsGA1UEChMERklOQTEMMAoGA1UECxMDUkRDMB4XDTE1MDcwNjA4NDkwNloXDTE2MTIyMDIxMjQzMFowgYQxCzAJBgNVBAYTAkhSMSIwIAYDVQQKExlNaW5pc3RhcnN0dm8gZ29zcG9kYXJzdHZhMQ8wDQYDVQQHEwZaYWdyZWIxQDAZBgNVBAUTEkhSMjI0MTM0NzI5MDAuMy4xMTAjBgNVBAMTHENyb2F0aWFuIFRydXN0ZWQgTGlzdCBTaWduZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvcLGSL/PPQAG28dGf6M+nyAFfxmYzVgFVkyoRLpR/v0MtGZRon75CxU+hrhC6sWRyT7v1yMafFmWGe7gPx2pDrgyID32GIiCrCVHxFmg5GGaWsYBKFYm4WnAo++rANA7MS8BeZP43c1uJQBRDAWI2ocgqKl9AM4c0UPpFUq59wxzy8VqQTRv1GCSZUk3OjH+JVykiWzdGjYPO3VXYaHz4B2itKwfsMLQu2khqjGUBoIJyP5yekcPwbo0qBYmlAVOl1ImecN9z7UDHlaYcSdSgyPoHr/qhAAtlxSdv/wooJcdfvTWQ6ncCi/y3nTNqOt3LA+ydgNS4P9LGdleIbPzJAgMBAAGjggGdMIIBmTAOBgNVHQ8BAf8EBAMCB4AwEQYDVR0lBAowCAYGBACRNwMAMEsGA1UdIAREMEIwQAYJK3yIUAULCAQCMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly9yZGMuZmluYS5oci9jcC9hbWR0MV9jcDQtMC5wZGYwgcYGA1UdHwSBvjCBuzBDoEGgP6Q9MDsxCzAJBgNVBAYTAkhSMQ0wCwYDVQQKEwRGSU5BMQwwCgYDVQQLEwNSREMxDzANBgNVBAMTBkNSTDc2NDB0oHKgcIZNbGRhcDovL3JkYy1sZGFwLmZpbmEuaHIvb3U9UkRDLG89RklOQSxjPUhSP2NlcnRpZmljYXRlUmV2b2NhdGlvbkxpc3QlM0JiaW5hcnmGH2h0dHA6Ly9yZGMuZmluYS5oci9jcmxzL3JkYy5jcmwwKwYDVR0QBCQwIoAPMjAxNTA3MDYwODQ5MDZagQ8yMDE2MTIyMDIxMjQzMFowEwYDVR0jBAwwCoAIR0UAbvBXpsAwEQYDVR0OBAoECE+N/2c+OEmXMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQEFBQADggEBAFifLeogwhrxMNKmKhU59mEAH5JRLY9cz0rPA9YjY7Orh/2RmkJF4QyOCw0tNntK+sGqOVG2aac73kPFOM+OFfcACRYcvMpSIf5AZQh+YtF7Gn2yKj8hltGH8SNAFLn8q8YbWd1Lh9xuPXwgVDbbOSqkUO+CkKu3gfdB3cntJYQ6ggf9eEbwNqDrtSE6pdhY9YJQnCmwZlP7VnZGvys55u/awTvbXv/gAfKjVfjHhdo5o7dkOZStkCuUWYk2WNzuUu5R26OI1YI7c/6m9aXcFHsc178CsITO+WSmq/FpKzqG8k1xCfmd38tpiuKL8T/hoSyOhoXjdoGUJ4XIsxqp6DI=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIG3TCCBMWgAwIBAgIEVlc9fDANBgkqhkiG9w0BAQsFADBEMQswCQYDVQQGEwJIUjEdMBsGA1UEChMURmluYW5jaWpza2EgYWdlbmNpamExFjAUBgNVBAMTDUZpbmEgUkRDIDIwMTUwHhcNMTYwMzI0MTIzODA1WhcNMTgwMzI0MDEwMjQ4WjCBhDELMAkGA1UEBhMCSFIxIjAgBgNVBAoTGU1pbmlzdGFyc3R2byBnb3Nwb2RhcnN0dmExDzANBgNVBAcTBlphZ3JlYjFAMBkGA1UEBRMSSFIyMjQxMzQ3MjkwMC4xLjExMCMGA1UEAxMcQ3JvYXRpYW4gVHJ1c3RlZCBMaXN0IFNpZ25lcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL5zRisNyaJBtqRiLZrHDP1Gx1uyiropw40XVof+HLLdR1hVecZ/EPN+u2o58RLTyn1sf/jrvJB7449KQMXdVXWM2vDiUo5FazClWqw80d1fvPStU9jtGVShWEygmDxwJ9lHrPWyzwRgYWgEbpnsMiH/7FF/l3ufEqlyNUyE30yH4r2ghlOgFsoDm0cBY2jDt5uuj9+19iKeaLNQFCLBV2ySai7hBeGrsDjhurdvMBdMDF5vAclGhY9XWSSWeMl0S6j4sO0QlU/P1jqpbJmNCiw3xSA8WMNmfz5V78g6ERUuaSiKBKyY4Jvu14ZrUNfsFfl1w9colaHHVCuAhBUW2iECAwEAAaOCApQwggKQMA4GA1UdDwEB/wQEAwIHgDARBgNVHSUECjAIBgYEAJE3AwAwgZ4GA1UdIASBljCBkzCBkAYJK3yIUAUMCAQCMIGCMD8GCCsGAQUFBwIBFjNodHRwOi8vcmRjLmZpbmEuaHIvUkRDMjAxNS9GaW5hUkRDMjAxNS1DUDUtMC1oci5wZGYwPwYIKwYBBQUHAgEWM2h0dHA6Ly9yZGMuZmluYS5oci9SREMyMDE1L0ZpbmFSREMyMDE1LUNQNS0wLWVuLnBkZjBpBggrBgEFBQcBAQRdMFswHwYIKwYBBQUHMAGGE2h0dHA6Ly9vY3NwLmZpbmEuaHIwOAYIKwYBBQUHMAKGLGh0dHA6Ly9yZGMuZmluYS5oci9SREMyMDE1L0ZpbmFSRENDQTIwMTUuY2VyMIIBEgYDVR0fBIIBCTCCAQUwgaSggaGggZ6GLGh0dHA6Ly9yZGMuZmluYS5oci9SREMyMDE1L0ZpbmFSRENDQTIwMTUuY3Jshm5sZGFwOi8vcmRjLWxkYXAyLmZpbmEuaHIvY249RmluYSUyMFJEQyUyMDIwMTUsbz1GaW5hbmNpanNrYSUyMGFnZW5jaWphLGM9SFI/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdCUzQmJpbmFyeTBcoFqgWKRWMFQxCzAJBgNVBAYTAkhSMR0wGwYDVQQKExRGaW5hbmNpanNrYSBhZ2VuY2lqYTEWMBQGA1UEAxMNRmluYSBSREMgMjAxNTEOMAwGA1UEAxMFQ1JMNzIwHwYDVR0jBBgwFoAUFGMRu3szA2h0HBXt5izBPEgbmCEwHQYDVR0OBBYEFHpXJs/yaae5uhYTkj4IpJTT7C4BMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQADggIBAHgCRzYtPPy2CQLP9S8kOSWckY/iPYPEDgRuCvzLrByc233wSalVLn397WI28rR9m9AgNOVby/81kiUo/dHihuXfmPNlE767fzajvEjGd8i+OuIQS8oaC+M1UXzbVnBm3ONnbrZuhsmbfPX3qlRo339Xbw/+CeUzZY0olSQy+cf1jjP9GnKIRk44mpX1G79vI0yzdxspshqN7ePyOPOjP0t6zDq58UjSpOovUwNBNJln6VZxgSPgFEOqu23iUh92NYdg6EbaNBGPvNOPGJSNS/Bkf9PsFycHixF/+4w2IEdTYBQk0f3D3OBfC6oTbbdVGsIAf2nYpf0g0nfltd2EIGRMm2U0rSB5+cNANwlQjPHmSUHbsERNJfdA+TbiHEnxIJ0wEwHdI6tsAkmJEYCdmexQg7qQR0PTUED0UDLhXhs4MJpQYC4XQw7eHoowq8qgwoV0CFJBLZLeiQFDtN1EaXA92D9lfkTmeQ+T4WPCJwhLeO1nviM/M4+yBqvobglo5Ua3E7Na+SNS0J4V9IwlYdbVgEJo0JPH+n5CMacc3WXk3/5jDR9TchpuBVC3l4ImidiCrV5DO3a6ibLEWSgX8YtaIIl1kuwJ79qWH19Njrry3nDA5oLoFKivSNZR9XRpIgOReYYafJ1N1A+MdevHF2IYSt3KS8oBJlDQ58vSi1++</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.mingo.hr/public/trgovina/TSL-HR.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>HR</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Ministry of the economy</Name>
++                     <Name xml:lang="hr">Ministarstvo gospodarstva</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/HR</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIEPDCCAySgAwIBAgIEARgHXjANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwHhcNMTUwODI0MDkzNzQ3WhcNMTcwMjI0MTAzNzQ3WjCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAo4FwCpPc/XcgwXgK+lVlehlXqdOZRPCYgloaoPbVk8UFMszNrSZlnMSORTKBIsHbJLlEE//hrt92XFzbIwMNnm1ZtbMNtBOvin05ziJqXm4DypQ2tHpX9afTp0Q+Xngfi5P8QvMQJ+4641uhBEvUcUY7rDrmCphU4JGk1FboGEL0ONNiGHB17bT03uW9mUQAnrUMZ8D17pg6WYOPPl3FAcQj712RtOl1QwgIql5li2QC73Nwaoz19sna/Crd8JHycYK4zeMcD3DyuG3jbyxeI2NhLauuIj4lBZCFxXmzD7UXPYDsyunWu7hJv99yAf638M0HxWXRIbnBSG5DDaIjAgMBAAGjgZMwgZAwHwYDVR0jBBgwFoAUmiiNX5RgD9JlIjwXD3ht+tCyOM4wHQYDVR0OBBYEFJoojV+UYA/SZSI8Fw94bfrQsjjOMA4GA1UdDwEB/wQEAwIGQDAdBgNVHREEFjAUgRJUTG9wZXJhdG9yQG5taGguaHUwDAYDVR0TAQH/BAIwADARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggEBAAUQb9qC0NOLg9dadgS+8gVps1YFZrJjDVSAIJesQww+Vc7m2lvE4YoMAEBZMgkepKHgfVyR0DqgRJfFHW4D0jYbb82m+ETgWebmce3ZdFsKdj9m7yvVTvDqfjZ+moyR7Pw8JdTCwNgrYaKNVQu7AzzZpdlZs5gjSbGngUmsL/HUl9iEF+aFCsHT6Qn9J7pwIDNptvOp2sF1YBMtM+O/sR9hWhnTzfmTQK2bzpWNbWO/PAf7UDrHLEGPB5oF2uRR/pcEMR6879lVHUdbEAvRrAEIT9598ohAT4C+YD/Ig1rFl9lzmxJh8fE4wvlEXBjMc2PPDppKWBEusSFhpPLnNqM=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIEPDCCAySgAwIBAgIEBYPk+TANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwHhcNMTUwODI0MDkzOTAyWhcNMTcwODI0MDkzOTAyWjCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWMX7RdV8krU56N5reRPnr6ld9qVOxuKI7o2qsbk3dvlEe98kgslGmL6aCXUJP7vtGUtegmjs1JQwzLdeW9CITjIAwDsQdpw6MKDl0Txz9sWFDx0kqu0w+Dn2l2yahYDYYQ/oa5fxRpqd05CH574HJbq5ulTCujKDsEKROhxbtnter37CtQicsYF3vtiaQRxRcXYmwalSRuWnr7SyquKB2nfKXSJTOf3jwbNgc/fUzEHDGaT+gexK8Dbt4VFrXSFBhdTW4rTovdNereMb/t1f+HI6oXcYUABFIVcKoIZJCuAayeuC+xz2QyjvAUKPgfikcSy8Murz4PK6lGNOVQPdLAgMBAAGjgZMwgZAwHwYDVR0jBBgwFoAUW7v+j7zE+s3WH7Y4uB0RhwG9IvUwHQYDVR0OBBYEFFu7/o+8xPrN1h+2OLgdEYcBvSL1MA4GA1UdDwEB/wQEAwIGQDAdBgNVHREEFjAUgRJUTG9wZXJhdG9yQG5taGguaHUwDAYDVR0TAQH/BAIwADARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggEBAG4YdNbWPF58uKSGQofgjf43IK9bbJazgHz2CQavCWB4o4x/iKNMUYuTI9DY3aHm9DxbT/yxk5jd+dQZfOUFop2Teec72uECicLXvLL4PIMrGZcpzIJXav/JSIngWqnHsdbyMNF/yftTBrJ1cN0HtFQDgPTCRTrnnCrZLfia1J0ItgXCw+q67j1UI+CWv7OXorSUKWZlRarx8EOm9R9nWRrQN2NCV+4JHP5JHrAEXf5QHVXbLiEv/z8ZT/KnBXmz7d6G8LF7emaQq1VIPLL5EpYGAYfha6+ydLR835dHjEuAFqHKYFMhZC2TkmVjFBxrENflRPQr3rhCb22I2YVmKbI=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.nmhh.hu/tl/pub/HU_TL.pdf</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>HU</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/pdf</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">National Media and Infocommunications Authority, Hungary</Name>
++                     <Name xml:lang="hu">Nemzeti Média- és Hírközlési Hatóság</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/HU</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIEPDCCAySgAwIBAgIEARgHXjANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwHhcNMTUwODI0MDkzNzQ3WhcNMTcwMjI0MTAzNzQ3WjCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAo4FwCpPc/XcgwXgK+lVlehlXqdOZRPCYgloaoPbVk8UFMszNrSZlnMSORTKBIsHbJLlEE//hrt92XFzbIwMNnm1ZtbMNtBOvin05ziJqXm4DypQ2tHpX9afTp0Q+Xngfi5P8QvMQJ+4641uhBEvUcUY7rDrmCphU4JGk1FboGEL0ONNiGHB17bT03uW9mUQAnrUMZ8D17pg6WYOPPl3FAcQj712RtOl1QwgIql5li2QC73Nwaoz19sna/Crd8JHycYK4zeMcD3DyuG3jbyxeI2NhLauuIj4lBZCFxXmzD7UXPYDsyunWu7hJv99yAf638M0HxWXRIbnBSG5DDaIjAgMBAAGjgZMwgZAwHwYDVR0jBBgwFoAUmiiNX5RgD9JlIjwXD3ht+tCyOM4wHQYDVR0OBBYEFJoojV+UYA/SZSI8Fw94bfrQsjjOMA4GA1UdDwEB/wQEAwIGQDAdBgNVHREEFjAUgRJUTG9wZXJhdG9yQG5taGguaHUwDAYDVR0TAQH/BAIwADARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggEBAAUQb9qC0NOLg9dadgS+8gVps1YFZrJjDVSAIJesQww+Vc7m2lvE4YoMAEBZMgkepKHgfVyR0DqgRJfFHW4D0jYbb82m+ETgWebmce3ZdFsKdj9m7yvVTvDqfjZ+moyR7Pw8JdTCwNgrYaKNVQu7AzzZpdlZs5gjSbGngUmsL/HUl9iEF+aFCsHT6Qn9J7pwIDNptvOp2sF1YBMtM+O/sR9hWhnTzfmTQK2bzpWNbWO/PAf7UDrHLEGPB5oF2uRR/pcEMR6879lVHUdbEAvRrAEIT9598ohAT4C+YD/Ig1rFl9lzmxJh8fE4wvlEXBjMc2PPDppKWBEusSFhpPLnNqM=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIEPDCCAySgAwIBAgIEBYPk+TANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwHhcNMTUwODI0MDkzOTAyWhcNMTcwODI0MDkzOTAyWjCBlDELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MUEwPwYDVQQKDDhOYXRpb25hbCBNZWRpYSBhbmQgSW5mb2NvbW11bmljYXRpb25zIEF1dGhvcml0eSwgSHVuZ2FyeTEvMC0GA1UEAwwmSHVuZ2FyaWFuIFRydXN0ZWQgTGlzdCBTY2hlbWUgT3BlcmF0b3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWMX7RdV8krU56N5reRPnr6ld9qVOxuKI7o2qsbk3dvlEe98kgslGmL6aCXUJP7vtGUtegmjs1JQwzLdeW9CITjIAwDsQdpw6MKDl0Txz9sWFDx0kqu0w+Dn2l2yahYDYYQ/oa5fxRpqd05CH574HJbq5ulTCujKDsEKROhxbtnter37CtQicsYF3vtiaQRxRcXYmwalSRuWnr7SyquKB2nfKXSJTOf3jwbNgc/fUzEHDGaT+gexK8Dbt4VFrXSFBhdTW4rTovdNereMb/t1f+HI6oXcYUABFIVcKoIZJCuAayeuC+xz2QyjvAUKPgfikcSy8Murz4PK6lGNOVQPdLAgMBAAGjgZMwgZAwHwYDVR0jBBgwFoAUW7v+j7zE+s3WH7Y4uB0RhwG9IvUwHQYDVR0OBBYEFFu7/o+8xPrN1h+2OLgdEYcBvSL1MA4GA1UdDwEB/wQEAwIGQDAdBgNVHREEFjAUgRJUTG9wZXJhdG9yQG5taGguaHUwDAYDVR0TAQH/BAIwADARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggEBAG4YdNbWPF58uKSGQofgjf43IK9bbJazgHz2CQavCWB4o4x/iKNMUYuTI9DY3aHm9DxbT/yxk5jd+dQZfOUFop2Teec72uECicLXvLL4PIMrGZcpzIJXav/JSIngWqnHsdbyMNF/yftTBrJ1cN0HtFQDgPTCRTrnnCrZLfia1J0ItgXCw+q67j1UI+CWv7OXorSUKWZlRarx8EOm9R9nWRrQN2NCV+4JHP5JHrAEXf5QHVXbLiEv/z8ZT/KnBXmz7d6G8LF7emaQq1VIPLL5EpYGAYfha6+ydLR835dHjEuAFqHKYFMhZC2TkmVjFBxrENflRPQr3rhCb22I2YVmKbI=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.nmhh.hu/tl/pub/HU_TL.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>HU</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">National Media and Infocommunications Authority, Hungary</Name>
++                     <Name xml:lang="hu">Nemzeti Média- és Hírközlési Hatóság</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/HU</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIICwTCCAiqgAwIBAgIJAJXDVBeDkXK3MA0GCSqGSIb3DQEBBQUAMHQxCzAJBgNVBAYTAklFMQ8wDQYDVQQHEwZEdWJsaW4xHjAcBgNVBAoTFURlcGFydG1lbnQgb2YgRmluYW5jZTENMAsGA1UECxMEQ01PRDElMCMGA1UEAxMcRXZlbnQgUHVibGlzaGluZyBJbnRlcm5hbCBDQTAeFw0xMDA3MDUxNDI3MjVaFw0yMDA3MDIxNDI3MjVaMFQxCzAJBgNVBAYTAklFMR4wHAYDVQQKExVEZXBhcnRtZW50IG9mIEZpbmFuY2UxDTALBgNVBAsTBENNT0QxFjAUBgNVBAMTDVRhZGdoIE8nTGVhcnkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL2eMyRkdde3Brd1N6gh1inG5j8gRbYQ6T/2BwiUlStHEeP/DmKcWKghQKEs6SBMSY/HGZw3ffrqe8tbzDBDeM0Z/F4xgSgYpcVL2QKTtQx4Wv61TESxNH7w5Jc9K2ZpeZz2bAcT2jrFdvBNcwtZ8hNyRsny2xNI8YuvpaZiLw1LAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBTxbALrhi0E0ebV6LpbNTNCvGXorzAfBgNVHSMEGDAWgBRfcPgfLU4sDzxy8r51M+iEDQIcjTANBgkqhkiG9w0BAQUFAAOBgQB4UDYDlveQZFbeN/za2UxQs+RqVZ9u+vT+lG4c+ecxmuFb6vpREjM28WciOAzzJ6hXcXxSZHgYbtVcL6F0JcPBT1HCFGTuHOWlBXzKL4zsuUmMYMPKD+2OojFDmAAvqlsqJT7bWA22EpxRHSf29twbbUuOw04rDAWh6RPDhg7zRg==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIC5DCCAk2gAwIBAgIJAJXDVBeDkXNiMA0GCSqGSIb3DQEBBQUAMHQxCzAJBgNVBAYTAklFMQ8wDQYDVQQHEwZEdWJsaW4xHjAcBgNVBAoTFURlcGFydG1lbnQgb2YgRmluYW5jZTENMAsGA1UECxMEQ01PRDElMCMGA1UEAxMcRXZlbnQgUHVibGlzaGluZyBJbnRlcm5hbCBDQTAeFw0xNDA2MTYwOTU2MTJaFw0yNDA2MTMwOTU2MTJaMHcxCzAJBgNVBAYTAklFMTQwMgYDVQQKEytEZXBhcnRtZW50IG9mIFB1YmxpYyBFeHBlbmRpdHVyZSBhbmQgUmVmb3JtMRowGAYDVQQLExFHb3Zlcm5tZW50IFJlZm9ybTEWMBQGA1UEAxMNVGFkZ2ggTyBMZWFyeTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0+AtJZLHW+Nkc/Rho8qflL2lEr8OoChQ3nzhiGHSIW/QmpHzzm54mPL6dybLmnpE5/I2lum0c0DohkQKH07Ouz46Lk/AGs7qpRNE14y1WOtbL7JkW5Y7Ktv/gqv8neg77feAUiZNJaQZ2nhIaQi3OyXqwqzEGafzpWsj2BxId2cCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFMVbM3lCFwp+r61i88s1hisafmA+MB8GA1UdIwQYMBaAFF9w+B8tTiwPPHLyvnUz6IQNAhyNMA0GCSqGSIb3DQEBBQUAA4GBAAxyDOqFkdqel1AxOGm04dl87WdBvoew1wxaEp4AhUtk4nAmu7EgmB3scop6Q43hq+dWScvSxWPZAyKUGEmc/qsUnq9NRQGqpB8g9CJKYEC9HHkbNn7b/LbNRdvd49YEfC5qAPgj0SDmQffcahrIGyU2lzZfTW4I00cXn7ogUqu5</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIHZjCCBk6gAwIBAgIEQnrNujANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJJRTEQMA4GA1UEChMHQW4gUG9zdDEYMBYGA1UECxMPUG9zdC5UcnVzdCBMdGQuMSIwIAYDVQQDExlQb3N0LlRydXN0IE9wZXJhdGlvbmFsIENBMB4XDTE0MDYxODEzMjI0NloXDTE3MDYxODEzMjI0NlowgfQxCzAJBgNVBAYTAklFMQ8wDQYDVQQIDAZEdWJsaW4xQjBABgNVBAoMOURlcGFydG1lbnQgb2YgQ29tbXVuaWNhdGlvbnMgRW5lcmd5IGFuZCBOYXR1cmFsIFJlc291cmNlczEeMBwGA1UECwwVUXVhbGlmaWVkIENlcnRpZmljYXRlMTowOAYDVQQLDDFDb21tdW5pY2F0aW9ucyAoQnVzaW5lc3MgYW5kIFRlY2hub2xvZ3kpIERpdmlzaW9uMR4wHAYDVQQFExU5MDQxMTA3Mi9QVDIxMTA1MjEwNDMxFDASBgNVBAMMC1JvcnkgSGluY2h5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyr4qcfKk4GhcoHYRQaLWtDSMBXUttCPLAJiHE52CIgb3wdDcqrSSDOAMdr/ui8v5+HB6/GwabQ0H8OdoQnLoBTFv56NW4u9dlzmR7A5ubvpQ1vKCLJyn+OxlAPmEsal3vrwVgb+r1MaB5STTI0/2Dj90TgPhVZKURj0i+lvLHvwkq2NfYWXaIi+aP1qfAe1PHvFN78vltviL45gomiq6RudbB9+O49uXfIKp/S4SsPt0VCLUrNhkDA6Oux5eUR8+ccKwH7hV+IrGK2t7Y7yfANL3qzObVKpFYVu8jMSmbmiuouU5bGZcU2OJkV1MEHb7/xD2czluzzWW/uj/Uf+v7wIDAQABo4IDlDCCA5AwggHHBgNVHSAEggG+MIIBujCBmAYGBACLMAEBMIGNMIGKBggrBgEFBQcCAjB+DHxJc3N1ZWQgYXMgYSBRdWFsaWZpZWQgQ2VydGlmaWNhdGUgYWNjb3JkaW5nIHRvIEFubmV4IEkgYW5kIElJIG9mIERpcmVjdGl2ZSAxOTk5LzkzL0VDLCBhcyBpbXBsZW1lbnRlZCBpbiB0aGUgbGF3IG9mIElyZWxhbmQuMIIBGwYJKoZIhvcvAQIBMIIBDDCBxQYIKwYBBQUHAgIwgbgMgbVJc3N1ZWQgc3ViamVjdCB0byBQb3N0LlRydXN0IENQUyB0ZXJtcyBhbmQgY29uZGl0aW9ucyB3aGljaCBsaW1pdCB3YXJyYW50aWVzIGFuZCBsaWFiaWxpdHkgb2YgUG9zdC5UcnVzdC4gQnkgYWNjZXB0aW5nLCB0aGUgcmVseWluZyBwYXJ0eSBhY2tub3dsZWRnZXMgaXQgaGFzIHJlYWQgYW5kIGFjY2VwdGVkIGJvdGguMEIGCCsGAQUFBwIBFjZodHRwOi8vd3d3LnBvc3QudHJ1c3QuaWUvZG93bmxvYWRzL3Bvc3R0cnVzdGNkc2Nwcy5wZGYwPQYIKwYBBQUHAQMEMTAvMAgGBgQAjkYBATAWBgYEAI5GAQIwDBMDRVVSAgICewIBAjALBgYEAI5GAQMCAQowSwYKKoZIhvcvAQEJAQQ9MDsCAQGGNmh0dHA6Ly90aW1lc3RhbXAudHJ1c3QuaWUvdHNzLXdlYmNsaWVudC9SZXF1ZXN0SGFuZGxlcjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSUECjAIBgYEAJE3AwAwdQYDVR0jBG4wbIAITLE1xb0jxdWhWqRYMFYxCzAJBgNVBAYTAklFMRAwDgYDVQQKEwdBbiBQb3N0MRgwFgYDVQQLEw9Qb3N0LlRydXN0IEx0ZC4xGzAZBgNVBAMTElBvc3QuVHJ1c3QgUm9vdCBDQYIEOaaXHzBwBgNVHR8EaTBnMGWgY6BhpF8wXTELMAkGA1UEBhMCSUUxEDAOBgNVBAoMB0FuIFBvc3QxGDAWBgNVBAsMD1Bvc3QuVHJ1c3QgTHRkLjEiMCAGA1UEAwwZUG9zdC5UcnVzdCBPcGVyYXRpb25hbCBDQTAdBgNVHQ4EFgQUMjerH60XfHjiGICDZKxyJj/NsmYwDQYJKoZIhvcNAQELBQADggEBAK0PGS1oiSA3p+HuVCBO+H/qQjHvVmwIY3fz7njma/GU6WztcdzA8DAF9f/lI467rhiptozW6NU74KWf3UOarnki39sMBgAO4AhYYpdQgSqa5y+2zqKtSQKtxPYwck+NTptqH5iHTv1C78f9wNd83+6cBntwLu8aDYF+siR8h4DKltutXik6Sv5rfSr0SfclBWqmmMCMlunpYBido50mudWLwgRk+F3ZzqottRBgm4DcxznghV4+cRR1cNwo0XiqaBvSqZKJ7eNI4PQapeHI7PmXRqTxFIFGVzGYVYmXNqzS1hclag7rbZ+2nR+hRcafVAQs7JfJK6+ofEz7GrpkMyw=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.dcenr.gov.ie/NR/rdonlyres/A2D966E8-48E1-4709-BFAA-83FA07F3C7F7/0/HumanReadable_signed_tresignedxml.pdf</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>IE</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/pdf</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Department of Communications, Energy and Natural Resources</Name>
++                     <Name xml:lang="ga">An Roinn Cumarsáide, Fuinnimh agus Acmhainní Nádúrtha</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/IE</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIICwTCCAiqgAwIBAgIJAJXDVBeDkXK3MA0GCSqGSIb3DQEBBQUAMHQxCzAJBgNVBAYTAklFMQ8wDQYDVQQHEwZEdWJsaW4xHjAcBgNVBAoTFURlcGFydG1lbnQgb2YgRmluYW5jZTENMAsGA1UECxMEQ01PRDElMCMGA1UEAxMcRXZlbnQgUHVibGlzaGluZyBJbnRlcm5hbCBDQTAeFw0xMDA3MDUxNDI3MjVaFw0yMDA3MDIxNDI3MjVaMFQxCzAJBgNVBAYTAklFMR4wHAYDVQQKExVEZXBhcnRtZW50IG9mIEZpbmFuY2UxDTALBgNVBAsTBENNT0QxFjAUBgNVBAMTDVRhZGdoIE8nTGVhcnkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL2eMyRkdde3Brd1N6gh1inG5j8gRbYQ6T/2BwiUlStHEeP/DmKcWKghQKEs6SBMSY/HGZw3ffrqe8tbzDBDeM0Z/F4xgSgYpcVL2QKTtQx4Wv61TESxNH7w5Jc9K2ZpeZz2bAcT2jrFdvBNcwtZ8hNyRsny2xNI8YuvpaZiLw1LAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBTxbALrhi0E0ebV6LpbNTNCvGXorzAfBgNVHSMEGDAWgBRfcPgfLU4sDzxy8r51M+iEDQIcjTANBgkqhkiG9w0BAQUFAAOBgQB4UDYDlveQZFbeN/za2UxQs+RqVZ9u+vT+lG4c+ecxmuFb6vpREjM28WciOAzzJ6hXcXxSZHgYbtVcL6F0JcPBT1HCFGTuHOWlBXzKL4zsuUmMYMPKD+2OojFDmAAvqlsqJT7bWA22EpxRHSf29twbbUuOw04rDAWh6RPDhg7zRg==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIC5DCCAk2gAwIBAgIJAJXDVBeDkXNiMA0GCSqGSIb3DQEBBQUAMHQxCzAJBgNVBAYTAklFMQ8wDQYDVQQHEwZEdWJsaW4xHjAcBgNVBAoTFURlcGFydG1lbnQgb2YgRmluYW5jZTENMAsGA1UECxMEQ01PRDElMCMGA1UEAxMcRXZlbnQgUHVibGlzaGluZyBJbnRlcm5hbCBDQTAeFw0xNDA2MTYwOTU2MTJaFw0yNDA2MTMwOTU2MTJaMHcxCzAJBgNVBAYTAklFMTQwMgYDVQQKEytEZXBhcnRtZW50IG9mIFB1YmxpYyBFeHBlbmRpdHVyZSBhbmQgUmVmb3JtMRowGAYDVQQLExFHb3Zlcm5tZW50IFJlZm9ybTEWMBQGA1UEAxMNVGFkZ2ggTyBMZWFyeTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0+AtJZLHW+Nkc/Rho8qflL2lEr8OoChQ3nzhiGHSIW/QmpHzzm54mPL6dybLmnpE5/I2lum0c0DohkQKH07Ouz46Lk/AGs7qpRNE14y1WOtbL7JkW5Y7Ktv/gqv8neg77feAUiZNJaQZ2nhIaQi3OyXqwqzEGafzpWsj2BxId2cCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFMVbM3lCFwp+r61i88s1hisafmA+MB8GA1UdIwQYMBaAFF9w+B8tTiwPPHLyvnUz6IQNAhyNMA0GCSqGSIb3DQEBBQUAA4GBAAxyDOqFkdqel1AxOGm04dl87WdBvoew1wxaEp4AhUtk4nAmu7EgmB3scop6Q43hq+dWScvSxWPZAyKUGEmc/qsUnq9NRQGqpB8g9CJKYEC9HHkbNn7b/LbNRdvd49YEfC5qAPgj0SDmQffcahrIGyU2lzZfTW4I00cXn7ogUqu5</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIHZjCCBk6gAwIBAgIEQnrNujANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJJRTEQMA4GA1UEChMHQW4gUG9zdDEYMBYGA1UECxMPUG9zdC5UcnVzdCBMdGQuMSIwIAYDVQQDExlQb3N0LlRydXN0IE9wZXJhdGlvbmFsIENBMB4XDTE0MDYxODEzMjI0NloXDTE3MDYxODEzMjI0NlowgfQxCzAJBgNVBAYTAklFMQ8wDQYDVQQIDAZEdWJsaW4xQjBABgNVBAoMOURlcGFydG1lbnQgb2YgQ29tbXVuaWNhdGlvbnMgRW5lcmd5IGFuZCBOYXR1cmFsIFJlc291cmNlczEeMBwGA1UECwwVUXVhbGlmaWVkIENlcnRpZmljYXRlMTowOAYDVQQLDDFDb21tdW5pY2F0aW9ucyAoQnVzaW5lc3MgYW5kIFRlY2hub2xvZ3kpIERpdmlzaW9uMR4wHAYDVQQFExU5MDQxMTA3Mi9QVDIxMTA1MjEwNDMxFDASBgNVBAMMC1JvcnkgSGluY2h5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyr4qcfKk4GhcoHYRQaLWtDSMBXUttCPLAJiHE52CIgb3wdDcqrSSDOAMdr/ui8v5+HB6/GwabQ0H8OdoQnLoBTFv56NW4u9dlzmR7A5ubvpQ1vKCLJyn+OxlAPmEsal3vrwVgb+r1MaB5STTI0/2Dj90TgPhVZKURj0i+lvLHvwkq2NfYWXaIi+aP1qfAe1PHvFN78vltviL45gomiq6RudbB9+O49uXfIKp/S4SsPt0VCLUrNhkDA6Oux5eUR8+ccKwH7hV+IrGK2t7Y7yfANL3qzObVKpFYVu8jMSmbmiuouU5bGZcU2OJkV1MEHb7/xD2czluzzWW/uj/Uf+v7wIDAQABo4IDlDCCA5AwggHHBgNVHSAEggG+MIIBujCBmAYGBACLMAEBMIGNMIGKBggrBgEFBQcCAjB+DHxJc3N1ZWQgYXMgYSBRdWFsaWZpZWQgQ2VydGlmaWNhdGUgYWNjb3JkaW5nIHRvIEFubmV4IEkgYW5kIElJIG9mIERpcmVjdGl2ZSAxOTk5LzkzL0VDLCBhcyBpbXBsZW1lbnRlZCBpbiB0aGUgbGF3IG9mIElyZWxhbmQuMIIBGwYJKoZIhvcvAQIBMIIBDDCBxQYIKwYBBQUHAgIwgbgMgbVJc3N1ZWQgc3ViamVjdCB0byBQb3N0LlRydXN0IENQUyB0ZXJtcyBhbmQgY29uZGl0aW9ucyB3aGljaCBsaW1pdCB3YXJyYW50aWVzIGFuZCBsaWFiaWxpdHkgb2YgUG9zdC5UcnVzdC4gQnkgYWNjZXB0aW5nLCB0aGUgcmVseWluZyBwYXJ0eSBhY2tub3dsZWRnZXMgaXQgaGFzIHJlYWQgYW5kIGFjY2VwdGVkIGJvdGguMEIGCCsGAQUFBwIBFjZodHRwOi8vd3d3LnBvc3QudHJ1c3QuaWUvZG93bmxvYWRzL3Bvc3R0cnVzdGNkc2Nwcy5wZGYwPQYIKwYBBQUHAQMEMTAvMAgGBgQAjkYBATAWBgYEAI5GAQIwDBMDRVVSAgICewIBAjALBgYEAI5GAQMCAQowSwYKKoZIhvcvAQEJAQQ9MDsCAQGGNmh0dHA6Ly90aW1lc3RhbXAudHJ1c3QuaWUvdHNzLXdlYmNsaWVudC9SZXF1ZXN0SGFuZGxlcjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSUECjAIBgYEAJE3AwAwdQYDVR0jBG4wbIAITLE1xb0jxdWhWqRYMFYxCzAJBgNVBAYTAklFMRAwDgYDVQQKEwdBbiBQb3N0MRgwFgYDVQQLEw9Qb3N0LlRydXN0IEx0ZC4xGzAZBgNVBAMTElBvc3QuVHJ1c3QgUm9vdCBDQYIEOaaXHzBwBgNVHR8EaTBnMGWgY6BhpF8wXTELMAkGA1UEBhMCSUUxEDAOBgNVBAoMB0FuIFBvc3QxGDAWBgNVBAsMD1Bvc3QuVHJ1c3QgTHRkLjEiMCAGA1UEAwwZUG9zdC5UcnVzdCBPcGVyYXRpb25hbCBDQTAdBgNVHQ4EFgQUMjerH60XfHjiGICDZKxyJj/NsmYwDQYJKoZIhvcNAQELBQADggEBAK0PGS1oiSA3p+HuVCBO+H/qQjHvVmwIY3fz7njma/GU6WztcdzA8DAF9f/lI467rhiptozW6NU74KWf3UOarnki39sMBgAO4AhYYpdQgSqa5y+2zqKtSQKtxPYwck+NTptqH5iHTv1C78f9wNd83+6cBntwLu8aDYF+siR8h4DKltutXik6Sv5rfSr0SfclBWqmmMCMlunpYBido50mudWLwgRk+F3ZzqottRBgm4DcxznghV4+cRR1cNwo0XiqaBvSqZKJ7eNI4PQapeHI7PmXRqTxFIFGVzGYVYmXNqzS1hclag7rbZ+2nR+hRcafVAQs7JfJK6+ofEz7GrpkMyw=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://files.dcenr.gov.ie/rh/Irelandtslsigned.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>IE</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Department of Communications, Energy and Natural Resources</Name>
++                     <Name xml:lang="ga">An Roinn Cumarsáide, Fuinnimh agus Acmhainní Nádúrtha</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/IE</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIF4DCCBMigAwIBAgIDDm0kMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAklTMRMwEQYDVQQFEwo1MjEwMDAyNzkwMRUwEwYDVQQKEwxBdWRrZW5uaSBoZi4xJzAlBgNVBAsTHlV0Z2VmYW5kaSBmdWxsZ2lsZHJhIHNraWxyaWtqYTEaMBgGA1UEAxMRRnVsbGdpbHQgYXVka2VubmkwHhcNMTQwODE5MDkwNjEwWhcNMTYwODE5MjM1OTAwWjCBnzELMAkGA1UEBhMCSVMxFjAUBgNVBAoTDU5leXRlbmRhc3RvZmExFzAVBgNVBAsTDnN0YXJmc3NraWxyaWtpMRMwEQYDVQQLEwpVbmRpcnJpdHVuMQowCAYDVQQLEwE2MR4wHAYDVQQFExUyMTA3ODcyMjQ5OjY5MDYwNTM0MTAxHjAcBgNVBAMMFUhlbGdhIFNpZ211bmRzZMOzdHRpcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANH6JKmfzU9dqh+QQfYp15Ntp36Z5uvmCokUaJpHeLznM+WS6TN3+7lXBQSa4MfAiExHBS0zaSUH98pahZ6op4b+MfKIX88JStguJ1jpO8g+ZgKnjE6A4AbFNrwr3+ZS4ma7ncXzDQZepDJ+6VfRtAbVHkto9GxsZDpnL50lkU1DvwfyvD2MdLeVV1WRfS+qh7rRYzcFMQibDKNjfrH/1nT4ytHXSaZJEDa/bx7te9pfPNbfgdOBvksVM9i1UbunkNXWFgzTIIsCOJjxKiG0Inw8v366+bC/+m4Jc8X01tHKjnCY01hLaMgePQhTbd93eTv9JHJP0zpdxn4FfQZ82fkCAwEAAaOCAkMwggI/MAwGA1UdEwEB/wQCMAAwdwYIKwYBBQUHAQEEazBpMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5hdWRrZW5uaS5pczBCBggrBgEFBQcwAoY2aHR0cDovL2NkcC5pc2xhbmRzcm90LmlzL3NraWxyaWtpL2Z1bGxnaWx0YXVka2VubmkucDdiMIH8BgNVHSAEgfQwgfEwge4GCWCCYAECAQEBATCB4DCBpgYIKwYBBQUHAgIwgZkagZZUaGlzIGNlcnRpZmljYXRlIGlzIGludGVuZGVkIGZvciBzaWduaW5nLiBUaGlzIGNlcnRpZmljYXRlIGlzIGlzc3VlZCBhcyBhIHF1YWxpZmllZCBjZXJ0aWZpY2F0ZSBpbiBhY2NvcmRhbmNlIHdpdGggYWN0IDI4LzIwMDEgYW5kIERpcmVjdGl2ZSA5OS85My9FQy4wNQYIKwYBBQUHAgEWKWh0dHA6Ly9jcC5hdWRrZW5uaS5pcy9mdWxsZ2lsdGF1ZGtlbm5pL2NwMCIGCCsGAQUFBwEDBBYwFDAIBgYEAI5GAQEwCAYGBACORgEEMA4GA1UdDwEB/wQEAwIGQDAfBgNVHSMEGDAWgBTCKT6G/4bE2jUfaaak/wGDPEozqTBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vY3JsLmF1ZGtlbm5pLmlzL2Z1bGxnaWx0YXVka2VubmkvbGF0ZXN0LmNybDAdBgNVHQ4EFgQU6QuMrhZ86v0UE5vpL7HnbQg1ZiUwDQYJKoZIhvcNAQEFBQADggEBABva0ImZ6fmYhWclBD2XKy5mlyoMyq4ofUZN+SYDYvdrzxbIWZDFNLK+aOrA/74Q+40x2C0tKhETuY5XakN8JwR/ZNj16KbNPzomlLNKt2hJVI5sJICfjbncgihPVIFaZRW4gsbjGl+o2IqXQHK/uf+sbR7fUJ9JVzeTbK+30JCPbE6Ftm4m+GsKtm90rWJ/oFkjS5U5o3/ocGtv5l6DU0oZBXyecgpl9tnsuUV1AViFk9vv8aTOEY8az+jpUqnm96nlNy3EWFcG3GdkdxdFHVVrn406y7QG/eXHMVnTAN6tDEbFX8iSB34d+Ey7xeQaDsNQxjAIKJRUOHOcaTmJpJk=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIF3DCCBMSgAwIBAgIDDjttMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAklTMRMwEQYDVQQFEwo1MjEwMDAyNzkwMRUwEwYDVQQKEwxBdWRrZW5uaSBoZi4xJzAlBgNVBAsTHlV0Z2VmYW5kaSBmdWxsZ2lsZHJhIHNraWxyaWtqYTEaMBgGA1UEAxMRRnVsbGdpbHQgYXVka2VubmkwHhcNMTQwNzI0MDkwMzMxWhcNMTgwNzI0MjM1OTAwWjCBmzELMAkGA1UEBhMCSVMxFjAUBgNVBAoTDU5leXRlbmRhc3RvZmExFzAVBgNVBAsTDnN0YXJmc3NraWxyaWtpMRMwEQYDVQQLEwpVbmRpcnJpdHVuMQswCQYDVQQLEwIxNzEeMBwGA1UEBRMVMDUxMDU3NTg5OTo2OTA2MDUzNDEwMRkwFwYDVQQDExBUcnlnZ3ZpIEF4ZWxzc29uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsRt3U/2RSZrGL0hZ1V3iXppW7ocqUEmYKfq8iyWUDOTH2FOgo8uD+ke4uB0SOudqOYKZXOTt0L4UKg8+VJI92SMhpFc6T1rxTyZJcZDOr0dp6+ATMqC25/mSBBxGqBYCTmF2V0tGXPYYipEFYq9kpQSzFa+oz2iEigwu/h3l+iF0+by3B3kUES4fOkoC13soPnnpOW3gu/u1TR1vBixK5z/SDZkAltcSO/hHu3HuSREgy1skd6IQ3n47QnW1XBbafF3vIaKiLG2l2tg73Kz6ldlrBPMBNxSldlYykUQfWJPrzj9l3YiJJCmus7MkIhJfxye2i+b02LWeleY/rOffVQIDAQABo4ICQzCCAj8wDAYDVR0TAQH/BAIwADB3BggrBgEFBQcBAQRrMGkwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmF1ZGtlbm5pLmlzMEIGCCsGAQUFBzAChjZodHRwOi8vY2RwLmlzbGFuZHNyb3QuaXMvc2tpbHJpa2kvZnVsbGdpbHRhdWRrZW5uaS5wN2IwgfwGA1UdIASB9DCB8TCB7gYJYIJgAQIBAQEBMIHgMIGmBggrBgEFBQcCAjCBmRqBllRoaXMgY2VydGlmaWNhdGUgaXMgaW50ZW5kZWQgZm9yIHNpZ25pbmcuIFRoaXMgY2VydGlmaWNhdGUgaXMgaXNzdWVkIGFzIGEgcXVhbGlmaWVkIGNlcnRpZmljYXRlIGluIGFjY29yZGFuY2Ugd2l0aCBhY3QgMjgvMjAwMSBhbmQgRGlyZWN0aXZlIDk5LzkzL0VDLjA1BggrBgEFBQcCARYpaHR0cDovL2NwLmF1ZGtlbm5pLmlzL2Z1bGxnaWx0YXVka2VubmkvY3AwIgYIKwYBBQUHAQMEFjAUMAgGBgQAjkYBATAIBgYEAI5GAQQwDgYDVR0PAQH/BAQDAgZAMB8GA1UdIwQYMBaAFMIpPob/hsTaNR9ppqT/AYM8SjOpMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuYXVka2VubmkuaXMvZnVsbGdpbHRhdWRrZW5uaS9sYXRlc3QuY3JsMB0GA1UdDgQWBBRsO3AsM3ELY5Otus03djbptmIKqzANBgkqhkiG9w0BAQUFAAOCAQEAnS8dJH5krGtUoGwrNmWBU6EKVP5vF/vdJ4TXrB0azeoiSIwQbNdtRimkV6SzNGL5OhKNAbYKrft9FXaIB5mlhFGBqO2NDEHmLmYBGvbJpYJt2KCGscGgAl6DaHSpM/7X985xmCBaEiqzL1qz116Sys7QtBgaSSxU//FsywjDgI0gBtEz2Qk1+Ae2yK3ibwcQVPAViTobNzv099jH0kqYB02day4LatlMt+uRfRMZKM9fxAHrqrRXyuKSJScJWeC+B3ySzyCF95IXxMI9gqDI1Go0bEnfs5R7GiYEJd79X7n76db5/bj7NgwakW2IUty+hfwT2X1O5419BgKJWvjF8g==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.neytendastofa.is/library/Files/TSl/tsl.pdf</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>IS</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/pdf</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">The Consumer Agency</Name>
++                     <Name xml:lang="is">Neytendastofa</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/IS</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIF4DCCBMigAwIBAgIDDm0kMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAklTMRMwEQYDVQQFEwo1MjEwMDAyNzkwMRUwEwYDVQQKEwxBdWRrZW5uaSBoZi4xJzAlBgNVBAsTHlV0Z2VmYW5kaSBmdWxsZ2lsZHJhIHNraWxyaWtqYTEaMBgGA1UEAxMRRnVsbGdpbHQgYXVka2VubmkwHhcNMTQwODE5MDkwNjEwWhcNMTYwODE5MjM1OTAwWjCBnzELMAkGA1UEBhMCSVMxFjAUBgNVBAoTDU5leXRlbmRhc3RvZmExFzAVBgNVBAsTDnN0YXJmc3NraWxyaWtpMRMwEQYDVQQLEwpVbmRpcnJpdHVuMQowCAYDVQQLEwE2MR4wHAYDVQQFExUyMTA3ODcyMjQ5OjY5MDYwNTM0MTAxHjAcBgNVBAMMFUhlbGdhIFNpZ211bmRzZMOzdHRpcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANH6JKmfzU9dqh+QQfYp15Ntp36Z5uvmCokUaJpHeLznM+WS6TN3+7lXBQSa4MfAiExHBS0zaSUH98pahZ6op4b+MfKIX88JStguJ1jpO8g+ZgKnjE6A4AbFNrwr3+ZS4ma7ncXzDQZepDJ+6VfRtAbVHkto9GxsZDpnL50lkU1DvwfyvD2MdLeVV1WRfS+qh7rRYzcFMQibDKNjfrH/1nT4ytHXSaZJEDa/bx7te9pfPNbfgdOBvksVM9i1UbunkNXWFgzTIIsCOJjxKiG0Inw8v366+bC/+m4Jc8X01tHKjnCY01hLaMgePQhTbd93eTv9JHJP0zpdxn4FfQZ82fkCAwEAAaOCAkMwggI/MAwGA1UdEwEB/wQCMAAwdwYIKwYBBQUHAQEEazBpMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5hdWRrZW5uaS5pczBCBggrBgEFBQcwAoY2aHR0cDovL2NkcC5pc2xhbmRzcm90LmlzL3NraWxyaWtpL2Z1bGxnaWx0YXVka2VubmkucDdiMIH8BgNVHSAEgfQwgfEwge4GCWCCYAECAQEBATCB4DCBpgYIKwYBBQUHAgIwgZkagZZUaGlzIGNlcnRpZmljYXRlIGlzIGludGVuZGVkIGZvciBzaWduaW5nLiBUaGlzIGNlcnRpZmljYXRlIGlzIGlzc3VlZCBhcyBhIHF1YWxpZmllZCBjZXJ0aWZpY2F0ZSBpbiBhY2NvcmRhbmNlIHdpdGggYWN0IDI4LzIwMDEgYW5kIERpcmVjdGl2ZSA5OS85My9FQy4wNQYIKwYBBQUHAgEWKWh0dHA6Ly9jcC5hdWRrZW5uaS5pcy9mdWxsZ2lsdGF1ZGtlbm5pL2NwMCIGCCsGAQUFBwEDBBYwFDAIBgYEAI5GAQEwCAYGBACORgEEMA4GA1UdDwEB/wQEAwIGQDAfBgNVHSMEGDAWgBTCKT6G/4bE2jUfaaak/wGDPEozqTBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vY3JsLmF1ZGtlbm5pLmlzL2Z1bGxnaWx0YXVka2VubmkvbGF0ZXN0LmNybDAdBgNVHQ4EFgQU6QuMrhZ86v0UE5vpL7HnbQg1ZiUwDQYJKoZIhvcNAQEFBQADggEBABva0ImZ6fmYhWclBD2XKy5mlyoMyq4ofUZN+SYDYvdrzxbIWZDFNLK+aOrA/74Q+40x2C0tKhETuY5XakN8JwR/ZNj16KbNPzomlLNKt2hJVI5sJICfjbncgihPVIFaZRW4gsbjGl+o2IqXQHK/uf+sbR7fUJ9JVzeTbK+30JCPbE6Ftm4m+GsKtm90rWJ/oFkjS5U5o3/ocGtv5l6DU0oZBXyecgpl9tnsuUV1AViFk9vv8aTOEY8az+jpUqnm96nlNy3EWFcG3GdkdxdFHVVrn406y7QG/eXHMVnTAN6tDEbFX8iSB34d+Ey7xeQaDsNQxjAIKJRUOHOcaTmJpJk=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIF3DCCBMSgAwIBAgIDDjttMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAklTMRMwEQYDVQQFEwo1MjEwMDAyNzkwMRUwEwYDVQQKEwxBdWRrZW5uaSBoZi4xJzAlBgNVBAsTHlV0Z2VmYW5kaSBmdWxsZ2lsZHJhIHNraWxyaWtqYTEaMBgGA1UEAxMRRnVsbGdpbHQgYXVka2VubmkwHhcNMTQwNzI0MDkwMzMxWhcNMTgwNzI0MjM1OTAwWjCBmzELMAkGA1UEBhMCSVMxFjAUBgNVBAoTDU5leXRlbmRhc3RvZmExFzAVBgNVBAsTDnN0YXJmc3NraWxyaWtpMRMwEQYDVQQLEwpVbmRpcnJpdHVuMQswCQYDVQQLEwIxNzEeMBwGA1UEBRMVMDUxMDU3NTg5OTo2OTA2MDUzNDEwMRkwFwYDVQQDExBUcnlnZ3ZpIEF4ZWxzc29uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsRt3U/2RSZrGL0hZ1V3iXppW7ocqUEmYKfq8iyWUDOTH2FOgo8uD+ke4uB0SOudqOYKZXOTt0L4UKg8+VJI92SMhpFc6T1rxTyZJcZDOr0dp6+ATMqC25/mSBBxGqBYCTmF2V0tGXPYYipEFYq9kpQSzFa+oz2iEigwu/h3l+iF0+by3B3kUES4fOkoC13soPnnpOW3gu/u1TR1vBixK5z/SDZkAltcSO/hHu3HuSREgy1skd6IQ3n47QnW1XBbafF3vIaKiLG2l2tg73Kz6ldlrBPMBNxSldlYykUQfWJPrzj9l3YiJJCmus7MkIhJfxye2i+b02LWeleY/rOffVQIDAQABo4ICQzCCAj8wDAYDVR0TAQH/BAIwADB3BggrBgEFBQcBAQRrMGkwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmF1ZGtlbm5pLmlzMEIGCCsGAQUFBzAChjZodHRwOi8vY2RwLmlzbGFuZHNyb3QuaXMvc2tpbHJpa2kvZnVsbGdpbHRhdWRrZW5uaS5wN2IwgfwGA1UdIASB9DCB8TCB7gYJYIJgAQIBAQEBMIHgMIGmBggrBgEFBQcCAjCBmRqBllRoaXMgY2VydGlmaWNhdGUgaXMgaW50ZW5kZWQgZm9yIHNpZ25pbmcuIFRoaXMgY2VydGlmaWNhdGUgaXMgaXNzdWVkIGFzIGEgcXVhbGlmaWVkIGNlcnRpZmljYXRlIGluIGFjY29yZGFuY2Ugd2l0aCBhY3QgMjgvMjAwMSBhbmQgRGlyZWN0aXZlIDk5LzkzL0VDLjA1BggrBgEFBQcCARYpaHR0cDovL2NwLmF1ZGtlbm5pLmlzL2Z1bGxnaWx0YXVka2VubmkvY3AwIgYIKwYBBQUHAQMEFjAUMAgGBgQAjkYBATAIBgYEAI5GAQQwDgYDVR0PAQH/BAQDAgZAMB8GA1UdIwQYMBaAFMIpPob/hsTaNR9ppqT/AYM8SjOpMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuYXVka2VubmkuaXMvZnVsbGdpbHRhdWRrZW5uaS9sYXRlc3QuY3JsMB0GA1UdDgQWBBRsO3AsM3ELY5Otus03djbptmIKqzANBgkqhkiG9w0BAQUFAAOCAQEAnS8dJH5krGtUoGwrNmWBU6EKVP5vF/vdJ4TXrB0azeoiSIwQbNdtRimkV6SzNGL5OhKNAbYKrft9FXaIB5mlhFGBqO2NDEHmLmYBGvbJpYJt2KCGscGgAl6DaHSpM/7X985xmCBaEiqzL1qz116Sys7QtBgaSSxU//FsywjDgI0gBtEz2Qk1+Ae2yK3ibwcQVPAViTobNzv099jH0kqYB02day4LatlMt+uRfRMZKM9fxAHrqrRXyuKSJScJWeC+B3ySzyCF95IXxMI9gqDI1Go0bEnfs5R7GiYEJd79X7n76db5/bj7NgwakW2IUty+hfwT2X1O5419BgKJWvjF8g==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.neytendastofa.is/library/Files/TSl/tsl.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>IS</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">The Consumer Agency</Name>
++                     <Name xml:lang="is">Neytendastofa</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/IS</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIExjCCA66gAwIBAgIQNdl1lNG2dU22NkLLterPzzANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTEaMBgGA1UEAxMRVWZmaWNpbyBTaWN1cmV6emEwHhcNMTAwNTIwMDgzOTQ2WhcNMjAwNTE3MDgzOTQ2WjBbMQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTEQMA4GA1UEKhMHVWZmaWNpbzESMBAGA1UEBBMJU2ljdXJlenphMRQwEgYDVQQFEws5NzEwMzQyMDU4MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI6sLMeL0AXS/zG30Nvh+mmtimUFvIVLeFZLaqg47bi5d7E1/IpkQnAwTyTT4yJGfrYrIrPnAK13wLcB4Za0WhYlBueW69uNHXhpkueIiGO9Wfeasx9T5tYcnrOUsoQTigTx3zcwY36DETwNqECu0uVH7K0al51s53SE5eVbQKMgJKa/uvP6hLxcvDdilsv9kyR4oNWOxlFeCSxl2aMVzs4zpSyNnmHwt2mQAgbzREnVvcjwOKAgRH9Kg6z5WiWsM2rNGRIeEkUIzHIxoc5WxkdNrBHppa79cmUCEIuBIE2ZtaNjOIVXvzYwkLq5TpgD5rSauUQZO3nduZxiPHVWmrMCAwEAAaOCAaQwggGgMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgZAMCgGA1UdCQQhMB8wHQYIKwYBBQUHCQExERgPMjAxMDA1MTMyMjAwMDBaMEEGA1UdHwQ6MDgwNqA0oDKGMGh0dHBzOi8vYXBwbGljYXppb25pLmNuaXBhLmdvdi5pdC9UU0wvSVRfVFNMLmNybDCBsAYDVR0gBIGoMIGlMIGiBgMrTBAwgZowJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuZGlnaXRwYS5nb3YuaXQvMHAGCCsGAQUFBwICMGQwDhYHRGlnaXRQQTADAgEBGlJLZXlzIHVzZWQgdG8gZ2VuZXJhdGUgY2VydGlmaWNhdGVzIHRvIHN1YnNjcmliZSBuYXRpb25hbCBUcnVzdCBTZXJ2aWNlIHN0YXR1cyBMaXN0MB0GA1UdDgQWBBRIk1ErMuBTlDGOEariH5O7InkS7TAfBgNVHSMEGDAWgBS5A9dz6beQZDceQKN59MYviqnwqjAgBgNVHREEGTAXgRVJVF9UU0xAZGlnaXRwYS5nb3YuaXQwDQYJKoZIhvcNAQELBQADggEBACsvm2YLT0bB2Rgk5W1iG9mMYZCWE7rA+1h6Y9DmxS5zwdzFlwCr7EQ7DbWElQD0glq0hYO5COP6Z0YRhQsn2LypxLrzpWN/qhDBvA8Tol4/MPUqYznU1yBttt3aopqn0GR5iGlTCCYhDF3G8qj4sgOUsG6kJ/TGVbFiV9YRyUBUv7+3FN9ed95mtV2Cy0NVuG1JDSGot60qZfekHn1ZCg1KdaGnoYzk7Dzh2yio0/fEBPP9+r8sVCJCuujQYx+M5qQB/NHyAGXMUS//F3/4qhZAElz5/D/kN6Q3eYTtw04XIShGt89pbGsP7lXmvSLHSKPz98xBFQLqEwJn1QcWDLE=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIEdzCCA1+gAwIBAgIQBSTQoxxf8UaYEMZNtexORDANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTEaMBgGA1UEAxMRVWZmaWNpbyBTaWN1cmV6emEwHhcNMTQwMjEwMTE0MjM5WhcNMjAxMjMxMTE0MjM5WjBbMQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTESMBAGA1UEBBMJU2ljdXJlenphMRAwDgYDVQQqEwdVZmZpY2lvMRQwEgYDVQQFEws5NzEwMzQyMDU4MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIPOYhltsTauooCfL6ggktmvRogcxVMRHPh7R9PifTJQBSR67L23u7bp4lY+Vd9w9h60z0rzp+vNvNgc12zXcgHcoue2VdFEJTlptElj3t3OICulC4QA4vFEUuFp2fKxEIr0KdzvLlHfcHYBhC4flx9k0hdpbfkjn+hwC/WOusj7JBMXgl3P1PSjKWpXNhVOnvrr+m6AbmERazIk7aBCSy6joz+QrRgCLiXRuqJxV3FirlQnmLB8np4Mebd+JwwwTgcT6hhx+f8s31cv7HFQDeIUd1i2aTCg04OrpuawZVmZjgGNHj+79YGouuQfCys7jW6t0Lety6LsonaSxHpAQgECAwEAAaOCAVUwggFRMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgZAMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHBzOi8vYXBwbGljYXppb25pLmNuaXBhLmdvdi5pdC9UU0wvdGVzdC5jcmwwga4GA1UdIASBpjCBozCBoAYDK0wQMIGYMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmRpZ2l0cGEuZ292Lml0LzBuBggrBgEFBQcCAjBiMA4WB0RpZ2l0UEEwAwIBARpQQ0EgdXNlZCB0byBnZW5lcmF0ZSBjZXJ0aWZpY2F0ZXMgdG8gc3Vic2NyaWJlIG5hdGlvbmFsIFRydXN0IFNlcnZpY2Ugc3RhdHVzIExpc3QwHQYDVR0OBBYEFIZ211SuCQDJ//4sjSI7DacHi7EaMCAGA1UdEQQZMBeBFUlUX1RTTEBkaWdpdHBhLmdvdi5pdDANBgkqhkiG9w0BAQsFAAOCAQEBNSU/P4X7Dllqg4tXIrxsAjlQrSS0Znt6et8+zW21GI8QmYSq0R8qHjFQs+dfl5B/qmftebhVpVe6vSzyJndKWycMtdMX0gkC2o66Wpl6fMZ55voYCF8ZTqBDcqMMvCt8o9TzlIPdcaWUZmlj3QfH+nGiC2/3cY4ZK9IWtWrYlZYk7tQGA1RCvQFLz3Uy9kbK5XcpF5prPCwQ/f5VjZBfWut2TuqO3NUbQ0RUK5JPDHiInV7VwN9sMj5nbRfhOiMH5AENLU8/x9Mk7V9YsXXEXq/Qms8I/yk7HejSn0Rd/DurIUUP8UbBM3GCv5cAYoea1R3sG52tMZUxke88uOCLkg==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>https://applicazioni.cnipa.gov.it/TSL/IT_TSL_HR.pdf</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>IT</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/pdf</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Agenzia per l'Italia Digitale</Name>
++                     <Name xml:lang="it">Agenzia per l'Italia Digitale</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/IT</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIExjCCA66gAwIBAgIQNdl1lNG2dU22NkLLterPzzANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTEaMBgGA1UEAxMRVWZmaWNpbyBTaWN1cmV6emEwHhcNMTAwNTIwMDgzOTQ2WhcNMjAwNTE3MDgzOTQ2WjBbMQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTEQMA4GA1UEKhMHVWZmaWNpbzESMBAGA1UEBBMJU2ljdXJlenphMRQwEgYDVQQFEws5NzEwMzQyMDU4MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI6sLMeL0AXS/zG30Nvh+mmtimUFvIVLeFZLaqg47bi5d7E1/IpkQnAwTyTT4yJGfrYrIrPnAK13wLcB4Za0WhYlBueW69uNHXhpkueIiGO9Wfeasx9T5tYcnrOUsoQTigTx3zcwY36DETwNqECu0uVH7K0al51s53SE5eVbQKMgJKa/uvP6hLxcvDdilsv9kyR4oNWOxlFeCSxl2aMVzs4zpSyNnmHwt2mQAgbzREnVvcjwOKAgRH9Kg6z5WiWsM2rNGRIeEkUIzHIxoc5WxkdNrBHppa79cmUCEIuBIE2ZtaNjOIVXvzYwkLq5TpgD5rSauUQZO3nduZxiPHVWmrMCAwEAAaOCAaQwggGgMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgZAMCgGA1UdCQQhMB8wHQYIKwYBBQUHCQExERgPMjAxMDA1MTMyMjAwMDBaMEEGA1UdHwQ6MDgwNqA0oDKGMGh0dHBzOi8vYXBwbGljYXppb25pLmNuaXBhLmdvdi5pdC9UU0wvSVRfVFNMLmNybDCBsAYDVR0gBIGoMIGlMIGiBgMrTBAwgZowJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuZGlnaXRwYS5nb3YuaXQvMHAGCCsGAQUFBwICMGQwDhYHRGlnaXRQQTADAgEBGlJLZXlzIHVzZWQgdG8gZ2VuZXJhdGUgY2VydGlmaWNhdGVzIHRvIHN1YnNjcmliZSBuYXRpb25hbCBUcnVzdCBTZXJ2aWNlIHN0YXR1cyBMaXN0MB0GA1UdDgQWBBRIk1ErMuBTlDGOEariH5O7InkS7TAfBgNVHSMEGDAWgBS5A9dz6beQZDceQKN59MYviqnwqjAgBgNVHREEGTAXgRVJVF9UU0xAZGlnaXRwYS5nb3YuaXQwDQYJKoZIhvcNAQELBQADggEBACsvm2YLT0bB2Rgk5W1iG9mMYZCWE7rA+1h6Y9DmxS5zwdzFlwCr7EQ7DbWElQD0glq0hYO5COP6Z0YRhQsn2LypxLrzpWN/qhDBvA8Tol4/MPUqYznU1yBttt3aopqn0GR5iGlTCCYhDF3G8qj4sgOUsG6kJ/TGVbFiV9YRyUBUv7+3FN9ed95mtV2Cy0NVuG1JDSGot60qZfekHn1ZCg1KdaGnoYzk7Dzh2yio0/fEBPP9+r8sVCJCuujQYx+M5qQB/NHyAGXMUS//F3/4qhZAElz5/D/kN6Q3eYTtw04XIShGt89pbGsP7lXmvSLHSKPz98xBFQLqEwJn1QcWDLE=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIEdzCCA1+gAwIBAgIQBSTQoxxf8UaYEMZNtexORDANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTEaMBgGA1UEAxMRVWZmaWNpbyBTaWN1cmV6emEwHhcNMTQwMjEwMTE0MjM5WhcNMjAxMjMxMTE0MjM5WjBbMQswCQYDVQQGEwJJVDEQMA4GA1UEChMHRGlnaXRQQTESMBAGA1UEBBMJU2ljdXJlenphMRAwDgYDVQQqEwdVZmZpY2lvMRQwEgYDVQQFEws5NzEwMzQyMDU4MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIPOYhltsTauooCfL6ggktmvRogcxVMRHPh7R9PifTJQBSR67L23u7bp4lY+Vd9w9h60z0rzp+vNvNgc12zXcgHcoue2VdFEJTlptElj3t3OICulC4QA4vFEUuFp2fKxEIr0KdzvLlHfcHYBhC4flx9k0hdpbfkjn+hwC/WOusj7JBMXgl3P1PSjKWpXNhVOnvrr+m6AbmERazIk7aBCSy6joz+QrRgCLiXRuqJxV3FirlQnmLB8np4Mebd+JwwwTgcT6hhx+f8s31cv7HFQDeIUd1i2aTCg04OrpuawZVmZjgGNHj+79YGouuQfCys7jW6t0Lety6LsonaSxHpAQgECAwEAAaOCAVUwggFRMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgZAMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHBzOi8vYXBwbGljYXppb25pLmNuaXBhLmdvdi5pdC9UU0wvdGVzdC5jcmwwga4GA1UdIASBpjCBozCBoAYDK0wQMIGYMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmRpZ2l0cGEuZ292Lml0LzBuBggrBgEFBQcCAjBiMA4WB0RpZ2l0UEEwAwIBARpQQ0EgdXNlZCB0byBnZW5lcmF0ZSBjZXJ0aWZpY2F0ZXMgdG8gc3Vic2NyaWJlIG5hdGlvbmFsIFRydXN0IFNlcnZpY2Ugc3RhdHVzIExpc3QwHQYDVR0OBBYEFIZ211SuCQDJ//4sjSI7DacHi7EaMCAGA1UdEQQZMBeBFUlUX1RTTEBkaWdpdHBhLmdvdi5pdDANBgkqhkiG9w0BAQsFAAOCAQEBNSU/P4X7Dllqg4tXIrxsAjlQrSS0Znt6et8+zW21GI8QmYSq0R8qHjFQs+dfl5B/qmftebhVpVe6vSzyJndKWycMtdMX0gkC2o66Wpl6fMZ55voYCF8ZTqBDcqMMvCt8o9TzlIPdcaWUZmlj3QfH+nGiC2/3cY4ZK9IWtWrYlZYk7tQGA1RCvQFLz3Uy9kbK5XcpF5prPCwQ/f5VjZBfWut2TuqO3NUbQ0RUK5JPDHiInV7VwN9sMj5nbRfhOiMH5AENLU8/x9Mk7V9YsXXEXq/Qms8I/yk7HejSn0Rd/DurIUUP8UbBM3GCv5cAYoea1R3sG52tMZUxke88uOCLkg==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>https://applicazioni.cnipa.gov.it/TSL/IT_TSL_signed.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>IT</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Agenzia per l'Italia Digitale</Name>
++                     <Name xml:lang="it">Agenzia per l'Italia Digitale</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/IT</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIEIDCCAwigAwIBAgIJAOi9vb6/aYZ/MA0GCSqGSIb3DQEBCwUAMEoxCzAJBgNVBAYTAkxJMR8wHQYDVQQKDBZBbXQgZsO8ciBLb21tdW5pa2F0aW9uMRowGAYDVQQDExFUcnVzdGVkIExpc3QgQ0EgMTAeFw0xNDAyMTAwOTUyMzBaFw0xNzAyMTAwOTUyMzBaMEcxCzAJBgNVBAYTAkxJMR8wHQYDVQQKDBZBbXQgZsO8ciBLb21tdW5pa2F0aW9uMRcwFQYDVQQDEw5UcnVzdGVkIExpc3QgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALRpptzN5mxrcRZ2MbyvTgF4huOe30lbI6sWrCq0gKTy6hk+Ussk7TYnE2tyN7IMFIEfQocdxNfMG2L30/jKGFRJ/NNrl2WWwV664I3P0qoIwJQ2RY8u7myyy8uF1WKjDRDbYqyf7jQSS1Onrmz9fPWltpDqyrgIvspb0owH+G2n70v3KUx1Itbr7Hc/4nbBIDTqr30xCCQsaUdti1beWgO9D7Ito3t0kozNbghClLBzr8fduSgaC2ucChIQA68UqXvqrzi81XCPBYymnOwGn2WaAwhtlBiHCg28NtPOYSFFrjZO7TBqFD5Ww+R1HkOcqRQbduMpLL1oKDq7bWyUZXcCAwEAAaOCAQowggEGMB8GA1UdIwQYMBaAFP1jbZk6PKL8QB/DFq6sVyuQJFSqMB0GA1UdDgQWBBTth+rnNQPRdw83reDey1xqpqcjWTAOBgNVHQ8BAf8EBAMCB4AwFwYDVR0gBBAwDjAMBgpggzYKCgAAAQEAMAkGA1UdEwQCMAAwEQYDVR0lBAowCAYGBACRNwMAMDgGA1UdHwQxMC8wLaAroCmGJ2h0dHBzOi8vd3d3Lmxsdi5saS9jcmwtbGx2LWFrLXRsY2ExLmNybDBDBggrBgEFBQcBAQQ3MDUwMwYIKwYBBQUHMAKGJ2h0dHBzOi8vd3d3Lmxsdi5saS9jZXItbGx2LWFrLXRsY2ExLmNlcjANBgkqhkiG9w0BAQsFAAOCAQEAXSlH+SmUacYJ8YoE+GBU3a3dfanh2jp4CIOId0MpPm1BGv9TkbNSFrT8n77vi5eIggr6NivPLM+hN+TAPymjE0+VIPme6AwL3zZadHx/oNmi7NRaCDuMfZ1jyAF/2dTtoY2kPi+XNlP/7m8bystWNV+zFBCr4NZcK+kwrkIB5y5iGoEos9e3zwHWSr7C2uyaYLlCLIBGhWLX6Ajgc2c8smLLc+GwzHwNgb+/HAN/yXRpO1Q7xLmkIPcsIdO0BvPRztwsjXD5799TILnnw2JPot37PXmgvzzx+HCKgzq2gr7rVcBLKDq2gJIT7OJQ5/b3z+Nst3LtngC904FRj9woeg==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIEIDCCAwigAwIBAgIJAOi9vb6/aYaAMA0GCSqGSIb3DQEBCwUAMEoxCzAJBgNVBAYTAkxJMR8wHQYDVQQKDBZBbXQgZsO8ciBLb21tdW5pa2F0aW9uMRowGAYDVQQDExFUcnVzdGVkIExpc3QgQ0EgMTAeFw0xNDAyMTAwOTUzMTNaFw0xODAyMTAwOTUzMTNaMEcxCzAJBgNVBAYTAkxJMR8wHQYDVQQKDBZBbXQgZsO8ciBLb21tdW5pa2F0aW9uMRcwFQYDVQQDEw5UcnVzdGVkIExpc3QgMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANnBAphC80GVlYVCFS9M/MlodzN4TIrp+dh22HkIFlvOZYoBPVOqy3MCCC5CF4hRuE8VLud4qdU8WY2a4HstI3OFPwpFHdijADH5M0LT5bEieP0JbGhjGc7ONB7x0haDiFRxdSpAc6IObc/63IjuFwKF+/wBAfer0v8YuSsmanoJhOQ9C7DdUECp0CmouIoM0omY8MBt28AYeVSA1MdIxGc6w1M5dmc2Op2eMHmVoypEWJKLL3HZZlESSBTKKv/nhA9XflYpPSCTZ40pfS1xuXhHha3222XzZM36Lt+WgizCZy24Hp+NlqdFbHmvH0oTcgn3xYKFhPh2Ji5Zs+5L53MCAwEAAaOCAQowggEGMB8GA1UdIwQYMBaAFP1jbZk6PKL8QB/DFq6sVyuQJFSqMB0GA1UdDgQWBBQf4Ft9JUhBqcpokFM69a0H5Pjl2DAOBgNVHQ8BAf8EBAMCB4AwFwYDVR0gBBAwDjAMBgpggzYKCgAAAQEAMAkGA1UdEwQCMAAwEQYDVR0lBAowCAYGBACRNwMAMDgGA1UdHwQxMC8wLaAroCmGJ2h0dHBzOi8vd3d3Lmxsdi5saS9jcmwtbGx2LWFrLXRsY2ExLmNybDBDBggrBgEFBQcBAQQ3MDUwMwYIKwYBBQUHMAKGJ2h0dHBzOi8vd3d3Lmxsdi5saS9jZXItbGx2LWFrLXRsY2ExLmNlcjANBgkqhkiG9w0BAQsFAAOCAQEAFLeKftx23euwqrtAHlVW2uGK9ckzCcIsQVAKLgWj2+2Kux71G1+qiOc4CRcNUKWtKa4AGUKDmAcOJye/v3y8I3mX00UlLXPQqnNXNHK6K0YlYHQ5iyoHlkT/ep/nyMjRhMEg4q3oz6wqagGk2b2IDvqcMx6Nm4QLIV6Ckfl8/a+6XDLw6EypugkbcrITLFS/Xv6asEq73FMX5MjZIx5+r5GOWkauhebFRnP8usuUKVHCh7KJQD0OgABI1TbL9wR/DbIMIEf5hQA9Uo1DB4w11xsgyf+QQuqYl3A+etSPPTVZGDqQAAlhQ+KXsLTDFrkkzJWmO6GC2k1NHg1bzgm5IA==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.llv.li/files/ak/xml-llv-ak-tsl.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>LI</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Office for Communications</Name>
++                     <Name xml:lang="de">Amt für Kommunikation</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/LI</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIDwzCCAqugAwIBAgIFEuK7zLkwDQYJKoZIhvcNAQELBQAwcTELMAkGA1UEBhMCTFQxSTBHBgNVBAoMQENvbW11bmljYXRpb25zIFJlZ3VsYXRvcnkgQXV0aG9yaXR5IG9mIHRoZSBSZXB1YmxpYyBvZiBMaXRodWFuaWExFzAVBgNVBAMMDk5lcmlqdXMgQmxhenlzMB4XDTE0MDEwMTAwMDAwMFoXDTE3MDEwMTAwMDAwMFowcTELMAkGA1UEBhMCTFQxSTBHBgNVBAoMQENvbW11bmljYXRpb25zIFJlZ3VsYXRvcnkgQXV0aG9yaXR5IG9mIHRoZSBSZXB1YmxpYyBvZiBMaXRodWFuaWExFzAVBgNVBAMMDk5lcmlqdXMgQmxhenlzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwKBYP2yM8004HUNQGbKU/6HJqXV5SaI1p/d56imQaweezz80T4yUwU5Ghfp+1X+2AC6H3HZrPxhuHEqEvUtlgzpPJDbMI7keJsQvwbv0kUG/tbSS1diP7VaRx1/unO92kkwdJgKv9EaCO4yU5Z+eVfLoQx72ZWp/nab0TllywmNVWhZj4nOl+Rm8p6hvWu/Kwt2ky0lTkSrHTvmpQkM+ZiMS3NS6IPHCovHtjLqs04u97BfOemAzy8ZcsGmcF4dIF4Zn3rgdZsV0dq1AVrfa8tRrCU6eD31TAGS6DQAwD/qn4PMdEiqYNGeY2CAQ9YjpboV5g/U4GHRwc+UjLaF3YQIDAQABo2IwYDAdBgNVHQ4EFgQU1PbRhXoxr0fYWtavjCnXbQKb+5QwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBsAwEQYDVR0gBAowCDAGBgRVHSAAMBEGA1UdJQQKMAgGBgQAkTcDADANBgkqhkiG9w0BAQsFAAOCAQEAe5vJOlbUuz75xFt8JnkjjAJWct9cczvhFwZGNLsdvkiUdV6qiIefPyw6e2Hsc+mON9yYM+Km5X0ugsdy7V8vI2ycp/794mHscfPyoX3rgbPY7zPBMYJxtqfDHPcBRRGfuXxMHFou13jiM6fSYNchhlcpHkxYt5xyMOgnernV6FsGhPNgJomXnsJBQn1ClHYTXTudgHRzgAw9I+IKbONgnVZqDjqyaEar/DfduPFPh0hWXfCnIaTcDSbdWjy3llqWpxMofsTwXFpoYgDO3iG+IIZl3eipAMe2PJPqbIn5Y9FKEtssmmG1KcLPJpAT76NPWIK4nj/mYtZUhnLFsEhwQg==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIDxzCCAq+gAwIBAgIFFD1WPq8wDQYJKoZIhvcNAQELBQAwczELMAkGA1UEBhMCTFQxSTBHBgNVBAoMQENvbW11bmljYXRpb25zIFJlZ3VsYXRvcnkgQXV0aG9yaXR5IG9mIHRoZSBSZXB1YmxpYyBvZiBMaXRodWFuaWExGTAXBgNVBAMMEFZhaWRvdGFzIFJhbW9uYXMwHhcNMTYwMTAxMDAwMDAwWhcNMTkwMTAxMDAwMDAwWjBzMQswCQYDVQQGEwJMVDFJMEcGA1UECgxAQ29tbXVuaWNhdGlvbnMgUmVndWxhdG9yeSBBdXRob3JpdHkgb2YgdGhlIFJlcHVibGljIG9mIExpdGh1YW5pYTEZMBcGA1UEAwwQVmFpZG90YXMgUmFtb25hczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKaAn16pu+wmSKcOF+XAwinNPt+cOEcVTp0kfJvMbu1+g5a6Sbjp60iofbxtjj8CI6uJQ0BPhwxV3WuTSNO3V4+MaMK4D7hsYV4hbx5AFUc8l88qLxAFMtoBmrfHM8LEDGP62pbgLAkk7Wye2Jb2V9FHzIooCBpws+l7TxtWg4m7pmmRyU0wXiwztkLbYypyX98cQZyT0vJAaYGZIFt7PWaQtgdmJQsPXsyLU5k740EupGzgGOnsc187ll0cByHRuUQeZi5zBMJtCEECt/eClYVajV6yr0frYw59676Afe5W/ecF0uLPiJl05PLjjFF19BjCHAt7z7hKn7k+CHeTJT0CAwEAAaNiMGAwHQYDVR0OBBYEFFnVjew3yC3Q+lU+Z3pwRZk7QkglMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgbAMBEGA1UdIAQKMAgwBgYEVR0gADARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggEBAIns4XuCL9eqwZUkjZfcfsDJNfotALSvdYN0VALyBZtDSIFi7uLQITM7GVczL7PYY+/VvQ3jAVQcXeF1tofsqcuk5/Ae/qb7gM/+qKjUA3fdoqxZ/dCmaloL8WEF0y1taS8Ii44XnQb9Hy3STLKqdsfawJ7bZ3MLXvBWPyAil1mfVWivttuYh0lJ0ejMd/JrYxM5ewJSzMRF9q42U+lramRik3BiuW0JvHosKbWjbvgggx4MB7f658Ul4cvB9hwewFupYlKmXUnWFLUS4/Y249N6DzxY1nYtL5cf1laA34i9SpImjlwMJSV8cBqPnbH/54hvnbUT9B8nGYMyLKs1XVg=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.rrt.lt/failai/LT-TSL.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>LT</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Communications Regulatory Authority of the Republic of Lithuania</Name>
++                     <Name xml:lang="lt">Lietuvos Respublikos ryšių reguliavimo tarnyba</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/LT</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIGEzCCBPugAwIBAgIDC0wwMA0GCSqGSIb3DQEBCwUAMEwxCzAJBgNVBAYTAkxVMRYwFAYDVQQKEw1MdXhUcnVzdCBTLkEuMSUwIwYDVQQDExxMdXhUcnVzdCBHbG9iYWwgUXVhbGlmaWVkIENBMB4XDTE0MDYwMzA2MDUxMVoXDTE3MDYwMzA2MDUxMVowggEWMQswCQYDVQQGEwJGUjELMAkGA1UEBxMCTFUxDjAMBgNVBAoTBUlMTkFTMRMwEQYDVQQLEwpMVTIyOTU5NDYzMSwwKgYDVQQDEyNKRUFOLVBISUxJUFBFIFBJRVJSRSBKVUxJRU4gSFVNQkVSVDEQMA4GA1UEBBMHSFVNQkVSVDEkMCIGA1UEKhMbSkVBTi1QSElMSVBQRSBQSUVSUkUgSlVMSUVOMR0wGwYDVQQFExQxMTEwNTg3NTA2MDAzMjIzMjM5MDEyMDAGCSqGSIb3DQEJARYjamVhbi1waGlsaXBwZS5odW1iZXJ0QGlsbmFzLmV0YXQubHUxHDAaBgNVBAwTE1Byb2Zlc3Npb25hbCBQZXJzb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkJS3Cl5PSHpwyJ2vdiaYFt20+OC+YAToHK9POubXp0o5vt2Cp7scmOaqUb4Qo6wRPgcBQIhvyDN5Loar/JXpfcq533jKbPnFDwRwT4cwfH3aG8bhkjBOWNjKi5PL5K1YRG18EcggoiXsrXTHHUdXtUBII9fPDxMHG2iPGVWMWRPwF0EWE/lmlrXo0V1PFoQiHmv8tRyXnFr45FzwRn1iTbrZP9SQrq76UTZi6HjfgJYQK+Tbu5GrMgLKYMtBE/7BqsgrMnqHtgLTgj00/bLSeoZ0fMEvpEAF0QioKOSd3wn+4WfHPfXzjHVZ0zm1jB+E4LhOyZNvcvleaLeL7sUzfAgMBAAGjggIwMIICLDAMBgNVHRMBAf8EAjAAMGEGCCsGAQUFBwEBBFUwUzAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AubHV4dHJ1c3QubHUwLAYIKwYBBQUHMAKGIGh0dHA6Ly9jYS5sdXh0cnVzdC5sdS9MVEdRQ0EuY3J0MIIBHgYDVR0gBIIBFTCCAREwggEDBggrgSsBAQoDATCB9jCBxwYIKwYBBQUHAgIwgboagbdMdXhUcnVzdCBRdWFsaWZpZWQgQ2VydGlmaWNhdGUgb24gU1NDRCBDb21wbGlhbnQgd2l0aCBFVFNJIFRTIDEwMSA0NTYgUUNQKyBjZXJ0aWZpY2F0ZSBwb2xpY3kuIEtleSBHZW5lcmF0aW9uIGJ5IENTUC4gU29sZSBBdXRob3Jpc2VkIFVzYWdlOiBTdXBwb3J0IG9mIFF1YWxpZmllZCBFbGVjdHJvbmljIFNpZ25hdHVyZS4wKgYIKwYBBQUHAgEWHmh0dHBzOi8vcmVwb3NpdG9yeS5sdXh0cnVzdC5sdTAIBgYEAIswAQEwIgYIKwYBBQUHAQMEFjAUMAgGBgQAjkYBATAIBgYEAI5GAQQwCwYDVR0PBAQDAgZAMB8GA1UdIwQYMBaAFDQWG/HTZGdiTKM0vA2zU6R8ofEXMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwubHV4dHJ1c3QubHUvTFRHUUNBLmNybDARBgNVHQ4ECgQIT+0vf3rcAoMwDQYJKoZIhvcNAQELBQADggEBAC1FnczzNUtm3n8rhkvhCPI2kZl110v/g3bPYV2cb2ifqczKN9suYU/cTpSzd/HKO285Skkc/SxDxN1ayctLt04DAdXnSgUCmWLNAgYUp2igrVyp8ZO5DTU5QlQuYUBZfbyVczi9r8E91XvO8DVKXbmP+b0tkRMpCWDLFnquE3e26dsKFmxxL89V7OvAjKyC4faoKK1XCZ9uZKAl0pH/hMqagk09glewuPO4WcRPdOgVqvOzllLh2o13uJhJ70OUdc4bg0WgLtDZqVqQ7gFjR/kG9c1J20vhAwGA9gksE2apeS3fTRH6FCuWInHlxMx4m7fc7hMjzX7/MihVYL5cZGs=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIF+DCCBOCgAwIBAgIDCrXJMA0GCSqGSIb3DQEBCwUAMEwxCzAJBgNVBAYTAkxVMRYwFAYDVQQKEw1MdXhUcnVzdCBTLkEuMSUwIwYDVQQDExxMdXhUcnVzdCBHbG9iYWwgUXVhbGlmaWVkIENBMB4XDTE0MDIxOTA4NTk0OVoXDTE3MDIxOTA4NTk0OVowgfwxCzAJBgNVBAYTAkxVMQswCQYDVQQHEwJMVTEOMAwGA1UEChMFSUxOQVMxEzARBgNVBAsTCkxVMjI5NTk0NjMxITAfBgNVBAsTGERpZ2l0YWwgdHJ1c3QgZGVwYXJ0bWVudDETMBEGA1UEAxMKQWxhaW4gV2FobDENMAsGA1UEBBMEV2FobDEOMAwGA1UEKhMFQWxhaW4xHTAbBgNVBAUTFDExMTA1ODg3NzUwMDMxNTcwMTI3MScwJQYJKoZIhvcNAQkBFhhhbGFpbi53YWhsQGlsbmFzLmV0YXQubHUxHDAaBgNVBAwTE1Byb2Zlc3Npb25hbCBQZXJzb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4gbOHXYhqHTbSC9C/YMYeY82K6PP8CsVgbK8RH7i8T+870jmrbfgQyK5/voNJrp76lZpBny3fO5LwfzdMmmcsO8WPcpnQ/DTQhPoYkgkKSWwKpmrtSGeOyGkM2zcVgwBsyER8Nmm3ySqsBUDrVi5fsT587QQvj+gihslTD1dhkvPSQtCsmUjhCOHzX9G5AxSr/0RNtJIGysQDs9/8RuZL8A/+FjYIUAbkLLvFzmTK6NVqroWfU0o1QZ3i8j3Am144q/hZHcyNkB/jG/gsuxnskOMlUa2GbyffCPJlxnb7Ca1FgMl52kGIASFx6Li1T3ubP5y/6qSslP/kVnwJefRJAgMBAAGjggIwMIICLDAMBgNVHRMBAf8EAjAAMGEGCCsGAQUFBwEBBFUwUzAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AubHV4dHJ1c3QubHUwLAYIKwYBBQUHMAKGIGh0dHA6Ly9jYS5sdXh0cnVzdC5sdS9MVEdRQ0EuY3J0MIIBHgYDVR0gBIIBFTCCAREwggEDBggrgSsBAQoDATCB9jCBxwYIKwYBBQUHAgIwgboagbdMdXhUcnVzdCBRdWFsaWZpZWQgQ2VydGlmaWNhdGUgb24gU1NDRCBDb21wbGlhbnQgd2l0aCBFVFNJIFRTIDEwMSA0NTYgUUNQKyBjZXJ0aWZpY2F0ZSBwb2xpY3kuIEtleSBHZW5lcmF0aW9uIGJ5IENTUC4gU29sZSBBdXRob3Jpc2VkIFVzYWdlOiBTdXBwb3J0IG9mIFF1YWxpZmllZCBFbGVjdHJvbmljIFNpZ25hdHVyZS4wKgYIKwYBBQUHAgEWHmh0dHBzOi8vcmVwb3NpdG9yeS5sdXh0cnVzdC5sdTAIBgYEAIswAQEwIgYIKwYBBQUHAQMEFjAUMAgGBgQAjkYBATAIBgYEAI5GAQQwCwYDVR0PBAQDAgZAMB8GA1UdIwQYMBaAFDQWG/HTZGdiTKM0vA2zU6R8ofEXMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwubHV4dHJ1c3QubHUvTFRHUUNBLmNybDARBgNVHQ4ECgQIR2vHCdq/rJAwDQYJKoZIhvcNAQELBQADggEBAAUwL95Qob7946jCFDjS1lA8tYTduCpWwHgfj/hCkJZBRv3bPD5Q+UxbEca+R6lXyAaym5olPw+8wRZbsVYxmC7UuESltk3+BqmsLLCCdHDuY6A9pXrB8rtfHbKM6l7cutaqCF2UXIysXaNqFxl0rRbV+GvGZBrUbcaZWKXaVyYpLkSxOwcux9penyG7xPuV94hxVZeXFmVBwzQwxJZpOJVMcTGV/h83TU5eRj5Sm38RFAXik60I1CJfw/oNOmqnJdVdLh72gMad2zNECzqxPwAWWcxlm8sccjBq5UEZNsFOZsTUrC2S7ERMb8OoiMCF/FeGawkBZk644/DATAXfTj4=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.portail-qualite.public.lu/fr/publications/confiance-numerique/liste-confiance-nationale/tsl-pdf/TSL-PDF.pdf</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>LU</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/pdf</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">ILNAS</Name>
++                     <Name xml:lang="fr">ILNAS</Name>
++                     <Name xml:lang="de">ILNAS</Name>
++                     <Name xml:lang="fr">Institut Luxembourgeois de la Normalisation, de l'Accréditation, de la Sécurité et qualité des produits et services</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/LU</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIGEzCCBPugAwIBAgIDC0wwMA0GCSqGSIb3DQEBCwUAMEwxCzAJBgNVBAYTAkxVMRYwFAYDVQQKEw1MdXhUcnVzdCBTLkEuMSUwIwYDVQQDExxMdXhUcnVzdCBHbG9iYWwgUXVhbGlmaWVkIENBMB4XDTE0MDYwMzA2MDUxMVoXDTE3MDYwMzA2MDUxMVowggEWMQswCQYDVQQGEwJGUjELMAkGA1UEBxMCTFUxDjAMBgNVBAoTBUlMTkFTMRMwEQYDVQQLEwpMVTIyOTU5NDYzMSwwKgYDVQQDEyNKRUFOLVBISUxJUFBFIFBJRVJSRSBKVUxJRU4gSFVNQkVSVDEQMA4GA1UEBBMHSFVNQkVSVDEkMCIGA1UEKhMbSkVBTi1QSElMSVBQRSBQSUVSUkUgSlVMSUVOMR0wGwYDVQQFExQxMTEwNTg3NTA2MDAzMjIzMjM5MDEyMDAGCSqGSIb3DQEJARYjamVhbi1waGlsaXBwZS5odW1iZXJ0QGlsbmFzLmV0YXQubHUxHDAaBgNVBAwTE1Byb2Zlc3Npb25hbCBQZXJzb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkJS3Cl5PSHpwyJ2vdiaYFt20+OC+YAToHK9POubXp0o5vt2Cp7scmOaqUb4Qo6wRPgcBQIhvyDN5Loar/JXpfcq533jKbPnFDwRwT4cwfH3aG8bhkjBOWNjKi5PL5K1YRG18EcggoiXsrXTHHUdXtUBII9fPDxMHG2iPGVWMWRPwF0EWE/lmlrXo0V1PFoQiHmv8tRyXnFr45FzwRn1iTbrZP9SQrq76UTZi6HjfgJYQK+Tbu5GrMgLKYMtBE/7BqsgrMnqHtgLTgj00/bLSeoZ0fMEvpEAF0QioKOSd3wn+4WfHPfXzjHVZ0zm1jB+E4LhOyZNvcvleaLeL7sUzfAgMBAAGjggIwMIICLDAMBgNVHRMBAf8EAjAAMGEGCCsGAQUFBwEBBFUwUzAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AubHV4dHJ1c3QubHUwLAYIKwYBBQUHMAKGIGh0dHA6Ly9jYS5sdXh0cnVzdC5sdS9MVEdRQ0EuY3J0MIIBHgYDVR0gBIIBFTCCAREwggEDBggrgSsBAQoDATCB9jCBxwYIKwYBBQUHAgIwgboagbdMdXhUcnVzdCBRdWFsaWZpZWQgQ2VydGlmaWNhdGUgb24gU1NDRCBDb21wbGlhbnQgd2l0aCBFVFNJIFRTIDEwMSA0NTYgUUNQKyBjZXJ0aWZpY2F0ZSBwb2xpY3kuIEtleSBHZW5lcmF0aW9uIGJ5IENTUC4gU29sZSBBdXRob3Jpc2VkIFVzYWdlOiBTdXBwb3J0IG9mIFF1YWxpZmllZCBFbGVjdHJvbmljIFNpZ25hdHVyZS4wKgYIKwYBBQUHAgEWHmh0dHBzOi8vcmVwb3NpdG9yeS5sdXh0cnVzdC5sdTAIBgYEAIswAQEwIgYIKwYBBQUHAQMEFjAUMAgGBgQAjkYBATAIBgYEAI5GAQQwCwYDVR0PBAQDAgZAMB8GA1UdIwQYMBaAFDQWG/HTZGdiTKM0vA2zU6R8ofEXMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwubHV4dHJ1c3QubHUvTFRHUUNBLmNybDARBgNVHQ4ECgQIT+0vf3rcAoMwDQYJKoZIhvcNAQELBQADggEBAC1FnczzNUtm3n8rhkvhCPI2kZl110v/g3bPYV2cb2ifqczKN9suYU/cTpSzd/HKO285Skkc/SxDxN1ayctLt04DAdXnSgUCmWLNAgYUp2igrVyp8ZO5DTU5QlQuYUBZfbyVczi9r8E91XvO8DVKXbmP+b0tkRMpCWDLFnquE3e26dsKFmxxL89V7OvAjKyC4faoKK1XCZ9uZKAl0pH/hMqagk09glewuPO4WcRPdOgVqvOzllLh2o13uJhJ70OUdc4bg0WgLtDZqVqQ7gFjR/kG9c1J20vhAwGA9gksE2apeS3fTRH6FCuWInHlxMx4m7fc7hMjzX7/MihVYL5cZGs=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIF+DCCBOCgAwIBAgIDCrXJMA0GCSqGSIb3DQEBCwUAMEwxCzAJBgNVBAYTAkxVMRYwFAYDVQQKEw1MdXhUcnVzdCBTLkEuMSUwIwYDVQQDExxMdXhUcnVzdCBHbG9iYWwgUXVhbGlmaWVkIENBMB4XDTE0MDIxOTA4NTk0OVoXDTE3MDIxOTA4NTk0OVowgfwxCzAJBgNVBAYTAkxVMQswCQYDVQQHEwJMVTEOMAwGA1UEChMFSUxOQVMxEzARBgNVBAsTCkxVMjI5NTk0NjMxITAfBgNVBAsTGERpZ2l0YWwgdHJ1c3QgZGVwYXJ0bWVudDETMBEGA1UEAxMKQWxhaW4gV2FobDENMAsGA1UEBBMEV2FobDEOMAwGA1UEKhMFQWxhaW4xHTAbBgNVBAUTFDExMTA1ODg3NzUwMDMxNTcwMTI3MScwJQYJKoZIhvcNAQkBFhhhbGFpbi53YWhsQGlsbmFzLmV0YXQubHUxHDAaBgNVBAwTE1Byb2Zlc3Npb25hbCBQZXJzb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4gbOHXYhqHTbSC9C/YMYeY82K6PP8CsVgbK8RH7i8T+870jmrbfgQyK5/voNJrp76lZpBny3fO5LwfzdMmmcsO8WPcpnQ/DTQhPoYkgkKSWwKpmrtSGeOyGkM2zcVgwBsyER8Nmm3ySqsBUDrVi5fsT587QQvj+gihslTD1dhkvPSQtCsmUjhCOHzX9G5AxSr/0RNtJIGysQDs9/8RuZL8A/+FjYIUAbkLLvFzmTK6NVqroWfU0o1QZ3i8j3Am144q/hZHcyNkB/jG/gsuxnskOMlUa2GbyffCPJlxnb7Ca1FgMl52kGIASFx6Li1T3ubP5y/6qSslP/kVnwJefRJAgMBAAGjggIwMIICLDAMBgNVHRMBAf8EAjAAMGEGCCsGAQUFBwEBBFUwUzAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AubHV4dHJ1c3QubHUwLAYIKwYBBQUHMAKGIGh0dHA6Ly9jYS5sdXh0cnVzdC5sdS9MVEdRQ0EuY3J0MIIBHgYDVR0gBIIBFTCCAREwggEDBggrgSsBAQoDATCB9jCBxwYIKwYBBQUHAgIwgboagbdMdXhUcnVzdCBRdWFsaWZpZWQgQ2VydGlmaWNhdGUgb24gU1NDRCBDb21wbGlhbnQgd2l0aCBFVFNJIFRTIDEwMSA0NTYgUUNQKyBjZXJ0aWZpY2F0ZSBwb2xpY3kuIEtleSBHZW5lcmF0aW9uIGJ5IENTUC4gU29sZSBBdXRob3Jpc2VkIFVzYWdlOiBTdXBwb3J0IG9mIFF1YWxpZmllZCBFbGVjdHJvbmljIFNpZ25hdHVyZS4wKgYIKwYBBQUHAgEWHmh0dHBzOi8vcmVwb3NpdG9yeS5sdXh0cnVzdC5sdTAIBgYEAIswAQEwIgYIKwYBBQUHAQMEFjAUMAgGBgQAjkYBATAIBgYEAI5GAQQwCwYDVR0PBAQDAgZAMB8GA1UdIwQYMBaAFDQWG/HTZGdiTKM0vA2zU6R8ofEXMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwubHV4dHJ1c3QubHUvTFRHUUNBLmNybDARBgNVHQ4ECgQIR2vHCdq/rJAwDQYJKoZIhvcNAQELBQADggEBAAUwL95Qob7946jCFDjS1lA8tYTduCpWwHgfj/hCkJZBRv3bPD5Q+UxbEca+R6lXyAaym5olPw+8wRZbsVYxmC7UuESltk3+BqmsLLCCdHDuY6A9pXrB8rtfHbKM6l7cutaqCF2UXIysXaNqFxl0rRbV+GvGZBrUbcaZWKXaVyYpLkSxOwcux9penyG7xPuV94hxVZeXFmVBwzQwxJZpOJVMcTGV/h83TU5eRj5Sm38RFAXik60I1CJfw/oNOmqnJdVdLh72gMad2zNECzqxPwAWWcxlm8sccjBq5UEZNsFOZsTUrC2S7ERMb8OoiMCF/FeGawkBZk644/DATAXfTj4=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.portail-qualite.public.lu/fr/publications/confiance-numerique/liste-confiance-nationale/tsl-xml/TSL-XML.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>LU</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">ILNAS</Name>
++                     <Name xml:lang="fr">ILNAS</Name>
++                     <Name xml:lang="fr">Institut Luxembourgeois de la Normalisation, de l'Accréditation, de la Sécurité et qualité des produits et services</Name>
++                     <Name xml:lang="de">ILNAS</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/LU</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIGHzCCBQegAwIBAgIOVdHN3GH/hnsABAAU4ygwDQYJKoZIhvcNAQEFBQAwTzELMAkGA1UEBhMCTFYxKDAmBgNVBAsTH1NlcnRpZmlrYWNpamFzIHBha2FscG9qdW11IGRhbGExFjAUBgNVBAMTDUUtTUUgU0kgKENBMSkwHhcNMTQwODI2MTI1NTM0WhcNMTgwODI1MTI1NTM0WjB4MQswCQYDVQQGEwJMVjEfMB0GA1UEChMWRGF0dSB2YWxzdHMgaW5zcGVrY2lqYTEbMBkGA1UECxMSTFYgVFNMIHNpZ25hdHVyZSAxMSswKQYDVQQDEyJMYXR2aWFuIFRydXN0IExpc3QgU2NoZW1lIE9wZXJhdG9yMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtHMwFE2pSlMGpRdK/TbJvuAYllFKCKPPKA/ZNKsf6oDSziOgzVocZaJKeYLBGVuwhDtDG0EDp2ZJ8B+O1aKlN4l4IKGQ4jhwmjax4we2No5681zNj3ofnL8ARIEV5cz+Fq47K3WBhD46Khk9xGN6tJnpUFH/O8Aptp/ue1AuZujFGUuTgyjjaaWJY6/gsCQZesEho5yqJ2Bw4YLwN6aSq69/xFNzMTcFcI2vC7VVKpOwGzXvQ8hBjtcNO8OcLX7e4JWrFeWKutTnelYhRWIUymrZ7cFF9aOJPiJm/ocEFoFGDkCEUOZ3c9DnEKj1k9nz74Z+ETOmmVA5eoZxxzjEKQIDAQABo4ICzjCCAsowHQYDVR0OBBYEFKfHsxCpx5cohHTvaDoSAipI4S2oMB8GA1UdIwQYMBaAFH/spibD8LJv/ruFlJkuVozQtdq1MIHhBgNVHR8EgdkwgdYwgdOggdCggc2GLmh0dHA6Ly93d3cuZW1lLmx2L2NkcC9FLU1FJTIwU0klMjAoQ0ExKSg0KS5jcmyGgZpsZGFwOi8vZW1lLmx2L2NuPUUtTUUlMjBTSSUyMChDQTEpKDQpLG91PVNlcnRpZmlrYWNpamFzJTIwcGFrYWxwb2p1bXUlMjBkYWxhLG89RS1NRSxjPWx2P2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3Q/YmFzZT9vYmplY3RjbGFzcz1jZXJ0aWZpY2F0aW9uYXV0aG9yaXR5MIIBGwYIKwYBBQUHAQEEggENMIIBCTA6BggrBgEFBQcwAoYuaHR0cDovL3d3dy5lbWUubHYvYWlhL0UtTUUlMjBTSSUyMChDQTEpKDQpLmNydDAtBggrBgEFBQcwAYYhaHR0cHM6Ly9vY3NwLmVtZS5sdi9yZXNwb25kZXIuZW1lMIGbBggrBgEFBQcwAoaBjmxkYXA6Ly9lbWUubHYvY249RS1NRSUyMFNJJTIwKENBMSkoNCksb3U9U2VydGlmaWthY2lqYXMlMjBwYWthbHBvanVtdSUyMGRhbGEsbz1FLU1FLGM9bHY/Y2FjZXJ0aWZpY2F0ZT9iYXNlP29iamVjdGNsYXNzPWNlcnRpZmljYXRpb25hdXRob3JpdHkwDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBkAwPAYJKwYBBAGCNxUHBC8wLQYlKwYBBAGCNxUIgrySbtKyZ4L5jwXNummCwJdhgSSC0dMwhdawFwIBZAIBCTARBgNVHSUECjAIBgYEAJE3AwAwGQYJKwYBBAGCNxUKBAwwCjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBACbE+/J+cQ6YPJI+0TzsIt8SR0h9Z8As/YWH1Awuqz4+XWS6Vja8lt38xxjRUnEY45ENjiJssgpIErT85tSKOUemZqed2oVw4vfsEb3/miZrFSZRfEVFHDq+qXcpmEZTW8qoScFLoe2snA0LFEnOKANm3F39W97eIKGCSbkzp6SHtXSuHOlTAF1jCc1BQY56utCOyStSn3V2lbD1MKK4vPwMmZYw45+bZuTzEwr00b1D77i3QZF6FemvdQl8JEJdbzzOKKV8CVFcUykJCkrJTKeJTrQpXtB5ffDE0r0j1rX5Xaqq2qQwTeYOafrgPVdiWEIJzM/7XGfAjqL3jvbiDAw=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIGHzCCBQegAwIBAgIOVdHN3GH/hnsABAAV2LYwDQYJKoZIhvcNAQEFBQAwTzELMAkGA1UEBhMCTFYxKDAmBgNVBAsTH1NlcnRpZmlrYWNpamFzIHBha2FscG9qdW11IGRhbGExFjAUBgNVBAMTDUUtTUUgU0kgKENBMSkwHhcNMTQxMDA3MDgwMjQ5WhcNMTcxMDA2MDgwMjQ5WjB4MQswCQYDVQQGEwJMVjEfMB0GA1UEChMWRGF0dSB2YWxzdHMgaW5zcGVrY2lqYTEbMBkGA1UECxMSTFYgVFNMIHNpZ25hdHVyZSAyMSswKQYDVQQDEyJMYXR2aWFuIFRydXN0IExpc3QgU2NoZW1lIE9wZXJhdG9yMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+ds9FjOl2ByQ7MvUWZUFBxHkMT+94TvmjmmUDfFFmQ4mV/GJkdjLKw3CAVmE9QpfVu4+CwtPr0qVTV14KJUgwm89CbI7CcWL+dUBZvFctEAcvTUAD69gZu8iaKrS1jK4NDaVXbJSjAMyqMc1ezG5pFnUoYiaFjphmHaa9uHJaFogBrMnF+z+dZAtcVf/eqCO1gaLayMRJGpm/TuX5ploouIYQF+djQ+BYmtzx/p2/knt3ij+C0kIkYu94KegROx7w45DK6N9vGH5S3VPq4dAY5JrZfRFqw+nQgF4AiRJbYWgKU8A5aQEL4Aqo2rtmqaUBZBUpnzKCcfUssEod3u/QIDAQABo4ICzjCCAsowHQYDVR0OBBYEFISl6Smqc1SZkdtfbUC4NReg4nIOMB8GA1UdIwQYMBaAFH/spibD8LJv/ruFlJkuVozQtdq1MIHhBgNVHR8EgdkwgdYwgdOggdCggc2GLmh0dHA6Ly93d3cuZW1lLmx2L2NkcC9FLU1FJTIwU0klMjAoQ0ExKSg0KS5jcmyGgZpsZGFwOi8vZW1lLmx2L2NuPUUtTUUlMjBTSSUyMChDQTEpKDQpLG91PVNlcnRpZmlrYWNpamFzJTIwcGFrYWxwb2p1bXUlMjBkYWxhLG89RS1NRSxjPWx2P2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3Q/YmFzZT9vYmplY3RjbGFzcz1jZXJ0aWZpY2F0aW9uYXV0aG9yaXR5MIIBGwYIKwYBBQUHAQEEggENMIIBCTA6BggrBgEFBQcwAoYuaHR0cDovL3d3dy5lbWUubHYvYWlhL0UtTUUlMjBTSSUyMChDQTEpKDQpLmNydDAtBggrBgEFBQcwAYYhaHR0cHM6Ly9vY3NwLmVtZS5sdi9yZXNwb25kZXIuZW1lMIGbBggrBgEFBQcwAoaBjmxkYXA6Ly9lbWUubHYvY249RS1NRSUyMFNJJTIwKENBMSkoNCksb3U9U2VydGlmaWthY2lqYXMlMjBwYWthbHBvanVtdSUyMGRhbGEsbz1FLU1FLGM9bHY/Y2FjZXJ0aWZpY2F0ZT9iYXNlP29iamVjdGNsYXNzPWNlcnRpZmljYXRpb25hdXRob3JpdHkwDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBkAwPAYJKwYBBAGCNxUHBC8wLQYlKwYBBAGCNxUIgrySbtKyZ4L5jwXNummCwJdhgSSC0dMwhdawFwIBZAIBCjARBgNVHSUECjAIBgYEAJE3AwAwGQYJKwYBBAGCNxUKBAwwCjAIBgYEAJE3AwAwDQYJKoZIhvcNAQEFBQADggEBADKXV4IbJktD4j2y0bGHkIgQAb906PYcKx8KSRM78niv0r8mRyCaaCPLCms58ueb9/eDTOCMJllL3sre8BPZVJQcQ3KjxrPrBv2JGP/5igoGObLaCe+ZZVyXkHXqi4uJAu2PdiWVosO/dHyDsdUGtdlWDqjOjrr98ouGpkv+i5Rp8hfK2/SmDTg7mHy+pPoYAHQ4/2pmVWCSppjLFNCTsz0R4K0AnCRkdkX+/RqsKP0sxpfiomusIPR6PDAXQO3ATGJH+v5nNsTEtwUskCCwYT9dc18zqSoQ/aiKrU8MZ6gR0XuituYmQMCoyiURcy/6EfIlTYJiLcF7Ccsy3vLBm84=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.dvi.gov.lv/en/wp-content/uploads/TSL/tsl-lv.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>LV</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Data State Inspectorate</Name>
++                     <Name xml:lang="lv">Datu valsts inspekcija</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/LV</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIDtTCCAp2gAwIBAgIJAPXsVjGOrIQXMA0GCSqGSIb3DQEBCwUAMEkxCzAJBgNVBAYTAk1UMREwDwYDVQQHEwhGbG9yaWFuYTEnMCUGA1UEChMeTWFsdGEgQ29tbXVuaWNhdGlvbnMgQXV0aG9yaXR5MB4XDTE0MDUyMDA5NTE1NloXDTE4MDUxOTA5NTE1NlowSTELMAkGA1UEBhMCTVQxETAPBgNVBAcTCEZsb3JpYW5hMScwJQYDVQQKEx5NYWx0YSBDb21tdW5pY2F0aW9ucyBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKPl3MKhU9x9uDAU01z90WiEL1r9L7v5BQ3vd3F9FQ3fXaxgKlGxEbaMoGYlFgIfuq5ryG+JDq2r4Rk7PW0POoFKHWZofzVSU0GLKn5z3aqnuuL5CN2yQb8j4hKECeWiVzVd5R67UrS/yjIlRvFSjbGU+q2x4AGUP+M24seGmPjbFjTQmPdxal9crrrI0dUJ62fAI6XDqsfJf/OJ2GZziJoBEDwmlDJfGlE0FhKXqwGN9wnfE35BcCyyJ9f1zdOtOE7LheLzslMXC0i6qyZ1FNHpXKyCjVPIrEjdagZcY3K+V+TUh/SFTgRck3TqN2F+kCrN+xVEcOf9oQgb8vAv7nAgMBAAGjgZ8wgZwwYwYDVR0jBFwwWqFNpEswSTELMAkGA1UEBhMCTVQxETAPBgNVBAcTCEZsb3JpYW5hMScwJQYDVQQKEx5NYWx0YSBDb21tdW5pY2F0aW9ucyBBdXRob3JpdHmCCQD17FYxjqyEFzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGwDAdBgNVHQ4EFgQU/dPIsI60+QT7YKYnhx45VDdb9YkwDQYJKoZIhvcNAQELBQADggEBAGWWjEBsICFiNXowAHFd2kzhWKBPvcPOYJ3hW0BjQvCxcRK+zM1jUU6SMTOv8k56mm3gfakEmlCWGYj1tyXmGwYtthBkJtkthOygX00RrwAVXXZY6yf1H2SB1vvM0+NL41apSBPDI6tQhD2uw7wHLZBnaIoC4iqUAQBdH3+DQ4KZ9fYg7ULu3W1s5SKa96yj6zKyO+NQnZd9e/WCJrlAtrf0f8BHmMSkbJB3u6bvEc4tWnj1h5oV+esIFi0nbfZMpREExCF2V4eq1gBOe6zz/pfXhO8evjb4Kn7Loyw8Sr2GXMIbypbn67e50BqQdtUVeukD+l50/UCA/7xI2VXSp+Y=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIDtTCCAp2gAwIBAgIJANGZrDHpPeweMA0GCSqGSIb3DQEBCwUAMEkxCzAJBgNVBAYTAk1UMREwDwYDVQQHEwhGbG9yaWFuYTEnMCUGA1UEChMeTWFsdGEgQ29tbXVuaWNhdGlvbnMgQXV0aG9yaXR5MB4XDTE0MDUyMDA5NTcyNVoXDTIwMDUwODA5NTcyNVowSTELMAkGA1UEBhMCTVQxETAPBgNVBAcTCEZsb3JpYW5hMScwJQYDVQQKEx5NYWx0YSBDb21tdW5pY2F0aW9ucyBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzlByjEn5W2DyrJG4r6SA6HiC0+7xzJH4Fl/EqIomyoeSBkci32aW17Bhx1MyYq+uLb6IURMUoqSIs1ZNh4lj4yycgCq/UHh0GttERM643wAOQtrxb3/Ds3txIkJSJ+DCRVMOyDJO2uWqcXFa1V6e62xH2ZWSp/TbrmlRGzWlpVyu80xE/pIn6Gs7pEAyz8TUOiPsPOw5h3kJttrRURmq3WafcRW4eDiVUIehL1rGv8635qyB+JKG7pWw8OsfVylIAcj75UUTOqM4I6oHKyOJPLXM3DcPjzwfDwWlbXABgtNEDJYIfpQd9vdjEgXsXkmsSNzgd5vPh7MbOE58ShsgfAgMBAAGjgZ8wgZwwYwYDVR0jBFwwWqFNpEswSTELMAkGA1UEBhMCTVQxETAPBgNVBAcTCEZsb3JpYW5hMScwJQYDVQQKEx5NYWx0YSBDb21tdW5pY2F0aW9ucyBBdXRob3JpdHmCCQDRmawx6T3sHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGwDAdBgNVHQ4EFgQUTU4Fh/R+vnm6W3aZdKQNAtGpfT8wDQYJKoZIhvcNAQELBQADggEBAAgU3PUUWGxToG5cDdZAVBimax+O6LbdSrxi2V2Sy4RmKcMZzT/9G9Gw+nHgFrb/4nkZD550RWArzhBpv4+2+G3WFroZ6ThYxsPpLdayU7Rj7JtRoCkE7qOPzerTE7k4jMIb7ejdrNvMRZz3BjEu5PE80hpUByXGHVTqBq8lw/CehgdfYD/CtLZ2hJK9o1KPqi8DPKMAvFQyYcSZ5G5GqMnhbwyZKo1YB/cEl73KsZ3OF4asKSSh5vQwbRpxd/AQTVLr9Y6VyQ+xl4NXBUhIgKoNyLm3B43tel3l4E314L5ihFJK6Kz/P6IfTeU8orCpTFfC4ylogdhMwlLgXlaoNwM=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.mca.org.mt/tsl/MT_TSL.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>MT</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Malta Communications Authority</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/MT</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIF/jCCA+agAwIBAgIFEuuke34wDQYJKoZIhvcNAQELBQAwdDELMAkGA1UEBhMCTkwxKjAoBgNVBAoMIUF1dGhvcml0eSBmb3IgQ29uc3VtZXJzICYgTWFya2V0czEWMBQGA1UEAwwNTkwgVFNMIFNJR05FUjEVMBMGA1UEFBMMKzMxNzA3MjIyMDAwMQowCAYDVQQFEwEyMB4XDTEzMDQwMTAwMDAwMFoXDTIwMDMyNTAwMDAwMFowdDELMAkGA1UEBhMCTkwxKjAoBgNVBAoMIUF1dGhvcml0eSBmb3IgQ29uc3VtZXJzICYgTWFya2V0czEWMBQGA1UEAwwNTkwgVFNMIFNJR05FUjEVMBMGA1UEFBMMKzMxNzA3MjIyMDAwMQowCAYDVQQFEwEyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAriEnqugEYAIKecxPDpGzACCuO+qGAdHHlrIjE2RxqIwGGY0poppNoxAETuKUiU7VmdRk366UFtGWvl6xb1lAL5d4SL8695oZcKX47u04uCusceEEyujfzrRAm62UWL/1+CChpPeZLqgnVc60152qjUwR2ogOCV13HZXegWrVUxXMwlag5mSF0Di1E93wVMHH3+4jAj/BRDtpmaFBRQ5X1xOZN73jVU6y8S8i96CHFem2jiDh/FPV+jvZALObhwNZ3bFWNZDt1thHufUMrLz1wYb65ilOXeSBYUXRDLGALZUvNPnKwkv1O4xU2tCpJ+29mPkRiBuzc8qZ40mo85UG0TQfqXbOEW4bRIkk57ewqHyLtXjCHXznXDt4mp19MYwIQ+0sDWnsw14G1U/XvlcFgAnz054X1f4B38WVYvuVemHr64s3T/cQsvhL/bAoBi3NDzq9xBl6e2TlHL5LLavp+Yw37+CYv2mZveVi3NcMer8Vgzy3M9PT00/ZG9cjtv7sheRbxMqZjpfLyEtULSw/ecK9APhOPrUn5CYFfBZeh6XRSkI5mZ8NUmJDQ4mN62EUP2ayetSpaugAkUUbNc/RYwZrxgH+2ey/6LOvOFmv6OOg34saFLdKdUddZpFcQe+ID8N0TKTG3nhN+JqV8QAzbsPCRF6DP2dIKC6TwgezxBUCAwEAAaOBljCBkzAdBgNVHQ4EFgQUtusU1UVT6Rll2H8hMx/m+2RWJfcwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBsAwEQYDVR0gBAowCDAGBgRVHSAAMDEGA1UdEQQqMCiBCnR0cEBhY20ubmyGGmh0dHBzOi8vd3d3LmFjbS5ubC9lbi90c2wvMBEGA1UdJQQKMAgGBgQAkTcDADANBgkqhkiG9w0BAQsFAAOCAgEAXMD8Y/0+FNwWfhcBcN5aMp8eRQHURDQe5LvkjF5YRj+Ws4KIse1O/bjD+BTvRUbhmTOH3cxfvHzGiO6EML4+a2ovToZvPXEWw9v3qN5bl0ShYLUbZA9IHTljuZUTab2ILtwX98YDqiiBl7mR0X5SeqeULBBzv29EBctgxpkGNvxRRsT6HFUsjEy3y018euYGgL/uKXnLoNz4MXWOmPfk705br16kM9/cg0p14k5kg4UZCFzGwMEzqpHUK/Ps/KH/xkgN0IlVxu/h+rLugJEVqJ1cumEteqHsbuyxLOrqIPU8utDtm71zkc06nery3xXU8L5+bjtYRlGzgioK0nNwXhuXaJT/hA3cYlXHnw6R9CqWJ4loSueg5dM/JO1YpMhLQrCSAPteW7D9+2zXeQ8YXE69ZQZ5oiB0MiGnU03r6cH2sls9loX3e3vQZ3XNkct1m20AzZ2GZucPI56S765nRHZzHfTz4AalEG2zyk/5dUz1bUR5jwYc9ccErJj20ynIKFKqIQwrAG2ZXRvi4YZNosckVYn/8dsOPW1XNVTwj7B6qcMlovqFZmZkVSZbFJxRWeM8qMOgaYK6UeknIMwUZdiQg96W6LdgiW25XE8VOWfJppG0dDw6xbwTr1xPMwuZdGu1HPF04iBFMZmjZa+CY2W3Ub1fJMRWw9Pewk0csKQ=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIFzzCCA7egAwIBAgIFEpzEZsgwDQYJKoZIhvcNAQELBQAwXTELMAkGA1UEBhMCTkwxKjAoBgNVBAoMIUF1dGhvcml0eSBmb3IgQ29uc3VtZXJzICYgTWFya2V0czEWMBQGA1UEAwwNTkwgVFNMIFNJR05FUjEKMAgGA1UEBRMBMzAeFw0xNDAxMDkwMDAwMDBaFw0yMDAzMjUwMDAwMDBaMF0xCzAJBgNVBAYTAk5MMSowKAYDVQQKDCFBdXRob3JpdHkgZm9yIENvbnN1bWVycyAmIE1hcmtldHMxFjAUBgNVBAMMDU5MIFRTTCBTSUdORVIxCjAIBgNVBAUTATMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDqOstItu84JkhN6hgxcV1YiGYUuhM9DduuaSuqiYwI0LtdTCbzRo9hbvU5KrvcmgcNBUVnOECAKOmP7h4U2+BZhM4ldf6rT4bv/arwuwwOQR7Po5erjMUhaxA6zcYsO1jPYYfI0+MZOCIZir3c4u5NdfPHhfzvv/lwob5OZ8/mhCaCVxwLvxto309L8yjzuYHc3H22veUoNxEN6pwhJWMPNVe1ERSPpG/7lCfaGVl3igvgQAA5oAQ21Ze23fSUJ/Tj6Xgj8Mai1HkD7+Lsq6q+faSZ62fel4xY8jquzm2AxLXNZl8nopzPYvzoUj7vCS52L1G4l475rS1hmm+Wr0NxlupJ61BF2S6tr9CCzBoeBT1vdNI8nbYkIwQuUI//etCjptvjXcGu4fD4u5zrAGceu92hxz4xHbztUjpsLEaioFPoCnWsyqFGtkvYDCyXxJ0fKmkB3KUpAoGh8Dhsi6JWr0nnMYrZUcRBAF1cie5qKBRMmD+/2wBTO4fEVmTFMiRexAz6kW45zQROpQ1405M7zyc77MgcgXvPwwJ4HJgEKzHDjYpCxWI2qlOPtkoNs8WAtn8Mbqxj/cuU9KlmGlCK+WQGDUOS4ziuwP12iIlxg0CROJmJu3wmVl8KvlwZjexub18n4K8VpznIXQWjt2MEBYNUSXFTM9Ms4Bamb57QYwIDAQABo4GVMIGSMB0GA1UdDgQWBBTuca7VbkGi4o0pPmNhW4X1+l+3iTAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSAECjAIMAYGBFUdIAAwMAYDVR0RBCkwJ4EKdHRwQGFjbS5ubIYZaHR0cDovL3d3dy5hY20ubmwvZW4vdHNsLzARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggIBALT6Uj/x8zfdpMY+78PM6yuWUvvKjA/Tqf1TAEPsWQY38PHA48td9tW8uy9gxoSaGvaAAQmrGI7D9e5u669I0exo0zN+7/eMIZp5eWxTmvRUrGhxuErbTmpxhWB2B8pm8vIfUGsAzC2YLsILp2Rv5rXApQwF/4gPPs4iWMb081SJ4cDL0iMvvLYYYfJY7Ob/3MrmsO4Uasj8YKQtuarFkEKOTP6DBRaUCnBpFfttdhF8MGOZPIMwO1YalKyjMzEQDz/L4nB1ZYtqyevqgj5+SxokugzY3/Ais05wjM0y3K4/Bj0ddWZCPfAiBpCqHNCW0j3FrJc2HodO9eKa/dl+b5g0hNu3xoHyLMe+KCe9MQpwu/dUBFLkg69UxX3RvgTLEfYpa1A1QMRt987xFqk65IL0pH68DWTL3RY4e6NvXg81nXeDzhKMRRk+PmHHS75s7WYZlXSPE1lLRBsN0CVoQSaGPWB2oLo54C/fuw6uq7KbXWVdisiHH7sZckSjkRl5yTNOjp6FT6niYH2S5a/qoR8zclL+AFmX1fLJ/IS4dYFDIaR2KAW4t7Bk+sIjGVZ2/k3+TsTKOH+iHPOxaYOyUn6olG4Bg4GJwpPB74EmRw8P2xnsXX4qevHA1KuNj/6YkvU4/uOiWjjphKSEFZoDkcHdwXdr2EuhJX89od0H8tAz</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>https://www.acm.nl/download/bestand/current-tsl.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>NL</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Authority for Consumers &amp; Markets</Name>
++                     <Name xml:lang="nl">Autoriteit Consument en Markt</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/NL</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIE8zCCA9ugAwIBAgILB2ZLeEvsahPcLG8wDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMzAeFw0xNTAxMTMwOTE3NTRaFw0xODAxMTMyMjU5MDBaMIGJMQswCQYDVQQGEwJOTzEpMCcGA1UECgwgTkFTSk9OQUwgS09NTVVOSUtBU0pPTlNNWU5ESUdIRVQxEDAOBgNVBAsMB05ldHQvTkUxKTAnBgNVBAMMIE5BU0pPTkFMIEtPTU1VTklLQVNKT05TTVlORElHSEVUMRIwEAYDVQQFEwk5NzQ0NDY4NzEwggEfMA0GCSqGSIb3DQEBAQUAA4IBDAAwggEHAoH/ANeweXbKKHrkQW35hOpV9H1GwIRIqwJQf+aBtoMd4SHKRXcBKGEiNpnqhS6kdur52VuDwzGvogv0ax+uWok12yMoLKwjN2UhYX5HtkzkcXys0k4BY3DpggZ5jrzWWvDNoOsgraom68OOBaXOVwswiexPDZ6aDxz0mDJBfNEodEzcR84zW+om31wvoe+RHEARvsM/6lWmIW6A9moze/350L/cXMCDynRn3RKAWi9XbIqo7Qrve9O+ezobdj7a6ynNYdS3/BWUrx13dC6RObnAsxW5YJN7lmrvHYTCno5PFPUb0P4yNXkuODoYUitIV0GHROrB1qivhGBsWNbKhY17AgMBAAGjggGaMIIBljAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFMzD+Ae3nG16TvWnKx0F+bNHHJHRMB0GA1UdDgQWBBRmTbuN0c7EqTSY57PDZomR8/hWKTAOBgNVHQ8BAf8EBAMCBkAwFQYDVR0gBA4wDDAKBghghEIBGgEDBTCBpQYDVR0fBIGdMIGaMC+gLaArhilodHRwOi8vY3JsLmJ1eXBhc3Mubm8vY3JsL0JQQ2xhc3MzQ0EzLmNybDBnoGWgY4ZhbGRhcDovL2xkYXAuYnV5cGFzcy5uby9kYz1CdXlwYXNzLGRjPU5PLENOPUJ1eXBhc3MlMjBDbGFzcyUyMDMlMjBDQSUyMDM/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDB6BggrBgEFBQcBAQRuMGwwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLmJ1eXBhc3Mubm8vb2NzcC9CUENsYXNzM0NBMzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC5idXlwYXNzLm5vL2NydC9CUENsYXNzM0NBMy5jZXIwDQYJKoZIhvcNAQELBQADggEBALS/sVxRLfnPGbwofV3Lhi8aIK0q6zJiexeNya18eOhhb/uIlFBY1OqsStfYHbG6HeB7kW8uEg2eekUOMZnq7hzVGhH6zl2gwfQijQ4Z2EGzwnMGAxo1ECzCom/U8A2Vedfna6dTJ/Be+wuwH9fAeIkLJ4XIGRTDiB6+5vVyNVx+ABkrUMxLvcFGDu7Tig0tCdhfkTNV604InVAcjVFNb1meyo/TjMmqx6TIYfjqCwi7EaThi3IKEB1Y+yxcU9TCweznyWobBfNOanq55vfemlTZm6+xooo3bAgsCp6AxF6ozVNpkSCRnGNjBICM2IqXiqNnsFwstfhB1zqwsmtaOGs=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIE8zCCA9ugAwIBAgILB60XOtlOKDyeNGYwDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMzAeFw0xNTA1MTExMDIxMzVaFw0xODA1MTEyMTU5MDBaMIGJMQswCQYDVQQGEwJOTzEpMCcGA1UECgwgTkFTSk9OQUwgS09NTVVOSUtBU0pPTlNNWU5ESUdIRVQxEDAOBgNVBAsMB05ldHQvTkUxKTAnBgNVBAMMIE5BU0pPTkFMIEtPTU1VTklLQVNKT05TTVlORElHSEVUMRIwEAYDVQQFEwk5NzQ0NDY4NzEwggEfMA0GCSqGSIb3DQEBAQUAA4IBDAAwggEHAoH/AOLRUA+xKHVDzi9jvgJsoLnprCicC3znjuVw/r4Rh4NtMmJjfd+e1x17Um009EyPX8+gZpu3ra2Ie87uFQ2llKVByH9gflvapnb4wXevwkC6f6sdQHzDV2j3D67xQ8HulLSEcQN5FFH/AmN3r7S1WBUY8LuF5//ej0QJPEMiufojilJiQQPlixbCBFlCLmqlJ3kACZ87/xRI9TDYEsNDV0WJQJFP2Ex1V+yNP1RnaEiH2UCeXoY91nOpzltQFdAdRXsp8J4SRjP2Y7lIyGo6IWz5JVNjboXHrO/LfAx57x3eP70reYorBfZJufm3oYJ3uuBtFnD4eX0XiVey3e4LAgMBAAGjggGaMIIBljAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFMzD+Ae3nG16TvWnKx0F+bNHHJHRMB0GA1UdDgQWBBQQQqOR56u9hXZEtg3lIC/zsc0tCDAOBgNVHQ8BAf8EBAMCBkAwFQYDVR0gBA4wDDAKBghghEIBGgEDBTCBpQYDVR0fBIGdMIGaMC+gLaArhilodHRwOi8vY3JsLmJ1eXBhc3Mubm8vY3JsL0JQQ2xhc3MzQ0EzLmNybDBnoGWgY4ZhbGRhcDovL2xkYXAuYnV5cGFzcy5uby9kYz1CdXlwYXNzLGRjPU5PLENOPUJ1eXBhc3MlMjBDbGFzcyUyMDMlMjBDQSUyMDM/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDB6BggrBgEFBQcBAQRuMGwwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLmJ1eXBhc3Mubm8vb2NzcC9CUENsYXNzM0NBMzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC5idXlwYXNzLm5vL2NydC9CUENsYXNzM0NBMy5jZXIwDQYJKoZIhvcNAQELBQADggEBACheabFtAi3vC5m8cLjy1LEoigFQzzuVKiadkEpSS0tbIf61Jlr3avUxfUAMVA1yPMqWu+dxf0UvMBknMVHz92VKGZwqS1eR8KbsFj6HqAQb+xCQcVXrroQ+QGxM9/p6A1MS6nKIEO7SipUNbl1ww0YtFDyTa9FL/SHAZvGTEoRECVAl+uiu/HuvCoQFTzo2cYvwlDVbfb63SYwzukn992w8wbAh0MYeoGVO0stJ0oS+Utqk60g3jWjPy0cPLIV/x/wUxmgKRwaMuuUeN9EQcgj2Lnk7kPSmc+pT+mr+ZVHGvKEgS89HGDivgjYDeG8ocTV8n/nzKcVIUPXLVY4cBlg=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.nkom.no/TSL/NO_TSL.PDF</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>NO</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/pdf</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">NASJONAL KOMMUNIKASJONSMYNDIGHET</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/NO</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIE8zCCA9ugAwIBAgILB2ZLeEvsahPcLG8wDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMzAeFw0xNTAxMTMwOTE3NTRaFw0xODAxMTMyMjU5MDBaMIGJMQswCQYDVQQGEwJOTzEpMCcGA1UECgwgTkFTSk9OQUwgS09NTVVOSUtBU0pPTlNNWU5ESUdIRVQxEDAOBgNVBAsMB05ldHQvTkUxKTAnBgNVBAMMIE5BU0pPTkFMIEtPTU1VTklLQVNKT05TTVlORElHSEVUMRIwEAYDVQQFEwk5NzQ0NDY4NzEwggEfMA0GCSqGSIb3DQEBAQUAA4IBDAAwggEHAoH/ANeweXbKKHrkQW35hOpV9H1GwIRIqwJQf+aBtoMd4SHKRXcBKGEiNpnqhS6kdur52VuDwzGvogv0ax+uWok12yMoLKwjN2UhYX5HtkzkcXys0k4BY3DpggZ5jrzWWvDNoOsgraom68OOBaXOVwswiexPDZ6aDxz0mDJBfNEodEzcR84zW+om31wvoe+RHEARvsM/6lWmIW6A9moze/350L/cXMCDynRn3RKAWi9XbIqo7Qrve9O+ezobdj7a6ynNYdS3/BWUrx13dC6RObnAsxW5YJN7lmrvHYTCno5PFPUb0P4yNXkuODoYUitIV0GHROrB1qivhGBsWNbKhY17AgMBAAGjggGaMIIBljAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFMzD+Ae3nG16TvWnKx0F+bNHHJHRMB0GA1UdDgQWBBRmTbuN0c7EqTSY57PDZomR8/hWKTAOBgNVHQ8BAf8EBAMCBkAwFQYDVR0gBA4wDDAKBghghEIBGgEDBTCBpQYDVR0fBIGdMIGaMC+gLaArhilodHRwOi8vY3JsLmJ1eXBhc3Mubm8vY3JsL0JQQ2xhc3MzQ0EzLmNybDBnoGWgY4ZhbGRhcDovL2xkYXAuYnV5cGFzcy5uby9kYz1CdXlwYXNzLGRjPU5PLENOPUJ1eXBhc3MlMjBDbGFzcyUyMDMlMjBDQSUyMDM/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDB6BggrBgEFBQcBAQRuMGwwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLmJ1eXBhc3Mubm8vb2NzcC9CUENsYXNzM0NBMzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC5idXlwYXNzLm5vL2NydC9CUENsYXNzM0NBMy5jZXIwDQYJKoZIhvcNAQELBQADggEBALS/sVxRLfnPGbwofV3Lhi8aIK0q6zJiexeNya18eOhhb/uIlFBY1OqsStfYHbG6HeB7kW8uEg2eekUOMZnq7hzVGhH6zl2gwfQijQ4Z2EGzwnMGAxo1ECzCom/U8A2Vedfna6dTJ/Be+wuwH9fAeIkLJ4XIGRTDiB6+5vVyNVx+ABkrUMxLvcFGDu7Tig0tCdhfkTNV604InVAcjVFNb1meyo/TjMmqx6TIYfjqCwi7EaThi3IKEB1Y+yxcU9TCweznyWobBfNOanq55vfemlTZm6+xooo3bAgsCp6AxF6ozVNpkSCRnGNjBICM2IqXiqNnsFwstfhB1zqwsmtaOGs=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIE8zCCA9ugAwIBAgILB60XOtlOKDyeNGYwDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMzAeFw0xNTA1MTExMDIxMzVaFw0xODA1MTEyMTU5MDBaMIGJMQswCQYDVQQGEwJOTzEpMCcGA1UECgwgTkFTSk9OQUwgS09NTVVOSUtBU0pPTlNNWU5ESUdIRVQxEDAOBgNVBAsMB05ldHQvTkUxKTAnBgNVBAMMIE5BU0pPTkFMIEtPTU1VTklLQVNKT05TTVlORElHSEVUMRIwEAYDVQQFEwk5NzQ0NDY4NzEwggEfMA0GCSqGSIb3DQEBAQUAA4IBDAAwggEHAoH/AOLRUA+xKHVDzi9jvgJsoLnprCicC3znjuVw/r4Rh4NtMmJjfd+e1x17Um009EyPX8+gZpu3ra2Ie87uFQ2llKVByH9gflvapnb4wXevwkC6f6sdQHzDV2j3D67xQ8HulLSEcQN5FFH/AmN3r7S1WBUY8LuF5//ej0QJPEMiufojilJiQQPlixbCBFlCLmqlJ3kACZ87/xRI9TDYEsNDV0WJQJFP2Ex1V+yNP1RnaEiH2UCeXoY91nOpzltQFdAdRXsp8J4SRjP2Y7lIyGo6IWz5JVNjboXHrO/LfAx57x3eP70reYorBfZJufm3oYJ3uuBtFnD4eX0XiVey3e4LAgMBAAGjggGaMIIBljAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFMzD+Ae3nG16TvWnKx0F+bNHHJHRMB0GA1UdDgQWBBQQQqOR56u9hXZEtg3lIC/zsc0tCDAOBgNVHQ8BAf8EBAMCBkAwFQYDVR0gBA4wDDAKBghghEIBGgEDBTCBpQYDVR0fBIGdMIGaMC+gLaArhilodHRwOi8vY3JsLmJ1eXBhc3Mubm8vY3JsL0JQQ2xhc3MzQ0EzLmNybDBnoGWgY4ZhbGRhcDovL2xkYXAuYnV5cGFzcy5uby9kYz1CdXlwYXNzLGRjPU5PLENOPUJ1eXBhc3MlMjBDbGFzcyUyMDMlMjBDQSUyMDM/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDB6BggrBgEFBQcBAQRuMGwwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLmJ1eXBhc3Mubm8vb2NzcC9CUENsYXNzM0NBMzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC5idXlwYXNzLm5vL2NydC9CUENsYXNzM0NBMy5jZXIwDQYJKoZIhvcNAQELBQADggEBACheabFtAi3vC5m8cLjy1LEoigFQzzuVKiadkEpSS0tbIf61Jlr3avUxfUAMVA1yPMqWu+dxf0UvMBknMVHz92VKGZwqS1eR8KbsFj6HqAQb+xCQcVXrroQ+QGxM9/p6A1MS6nKIEO7SipUNbl1ww0YtFDyTa9FL/SHAZvGTEoRECVAl+uiu/HuvCoQFTzo2cYvwlDVbfb63SYwzukn992w8wbAh0MYeoGVO0stJ0oS+Utqk60g3jWjPy0cPLIV/x/wUxmgKRwaMuuUeN9EQcgj2Lnk7kPSmc+pT+mr+ZVHGvKEgS89HGDivgjYDeG8ocTV8n/nzKcVIUPXLVY4cBlg=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.nkom.no/TSL/NO_TSL.XML</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>NO</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">NASJONAL KOMMUNIKASJONSMYNDIGHET</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/NO</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIDaTCCAlGgAwIBAgIJAOXz92Z7yWyiMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAlBMMSAwHgYDVQQKExdOYXRpb25hbCBCYW5rIG9mIFBvbGFuZDEcMBoGA1UEAxMTUG9saXNoIFRTTCBPcGVyYXRvcjAeFw0xNTA5MTQxMTMzNDBaFw0xNzA5MTMxMTMzNDBaME0xCzAJBgNVBAYTAlBMMSAwHgYDVQQKExdOYXRpb25hbCBCYW5rIG9mIFBvbGFuZDEcMBoGA1UEAxMTUG9saXNoIFRTTCBPcGVyYXRvcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOQzS6rDZWLH4OudgpJxkLQfh/3ZbrDRbFI69ElV1EwD7M8Sza2k7uMRsUQMaK5Ox58y5v7rBMWyVdaTLsnkemo7Coh1S85ai8bU5MUDrRqUUSvMk7IKwbBPA1WcTYkr0i17yEbiUbncz54XEmuYzuHiXjzWA0yCtkn7xL3vDnVLEYEBjmncuXG1AndibC9ZT9qYOT1D7QrxydK4S+3jmuL9saBFThDsrogqVcc4NoUdZiwxhbbKfGsIDXokfUTHURC1SzhG+IXkg/lAvpnx/p0jVNjiEbAWGB1T4u6Pl24xSw6b9cbX/QhaYFewcdJt2qSf+wBfIWxUBabtq1R9nNcCAwEAAaNMMEowCwYDVR0PBAQDAgeAMBEGA1UdJQQKMAgGBgQAkTcDADAJBgNVHRMEAjAAMB0GA1UdDgQWBBT6ZZUcqcsVEsQLnStCkPszCUqoxDANBgkqhkiG9w0BAQsFAAOCAQEAB1CDhQ/cTKp5Wy2Wf/VTI8qM9CsWG4P5XldKF8UxgRnbK9WvXfNShgGOaI/zd0HV22I7kxXNUJkWdNzUHgaBlpSvyuYSWQaYrLcqLzBFnnsl+NuZY/qVhXsHeQX2R7mygvnfueJq4B/37M4wCOC79F/iKuubooX9hJKhq78ii7EAsT7WxVZMo36xUMHGCxc9DSdwQPE5aAQBj7yIgksr5t7FJTy6DyN6GHmWvvbQ3TfgZG06COBrRPbXvhdtQAji5TxRlvvNzLNVBCtzzyQWR8iZIKvp4ILue+ARZnhQ+t0pkPFkG+x+3GYgzClzWwcilufcBpwx1Si20iIGKbnl4A==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpNSUlEYVRDQ0FsR2dBd0lCQWdJSkFPNEZ5RmJjSFJLK01BMEdDU3FHU0liM0RRRUJDd1VBTUUweEN6QUpCZ05WDQpCQVlUQWxCTU1TQXdIZ1lEVlFRS0V4ZE9ZWFJwYjI1aGJDQkNZVzVySUc5bUlGQnZiR0Z1WkRFY01Cb0dBMVVFDQpBeE1UVUc5c2FYTm9JRlJUVENCUGNHVnlZWFJ2Y2pBZUZ3MHhOakF4TWpBd09UQTJNRE5hRncweU1UQXhNVGd3DQpPVEEyTUROYU1FMHhDekFKQmdOVkJBWVRBbEJNTVNBd0hnWURWUVFLRXhkT1lYUnBiMjVoYkNCQ1lXNXJJRzltDQpJRkJ2YkdGdVpERWNNQm9HQTFVRUF4TVRVRzlzYVhOb0lGUlRUQ0JQY0dWeVlYUnZjakNDQVNJd0RRWUpLb1pJDQpodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ0VCQUtZcFlpSUZoT3J0ZHhNbms4UUpGTFowbkpjZmFGcFFrYnBGDQpkaVJiaXBXbzhLTjcyZGVIS0RQTDVRUk9GZXBqVjI2V25xWmc1SkRSZG9YN0R2QmppaTR0bGxwR1NZUkJBdk82DQpFRXJWMzJTYVRvVm5ydytiZ2xTZWlTaEtPUHNacEVOOEJYQTU5RXhDVXdEZFRTc3NPa2ZXZ2g0NmRUaXdLamo2DQphMVFKVG9OR256TllScVJtOUwzSlBxL05tR2ZQSHZaZ1hWajIyZnRtdkpMYVg1ZktQL0R5dUlQbzYzanZ0Um42DQp1VUtNVjFEMTZZdHBPSFNyTjNwZHUzVzF4QUhndStyL3FSNU95aEx4VWMwMTkyQmZxY1N5dm9GNklhN215OHpUDQp3V1RKT1p6RjhvMnpIL0M4WDlNK2VlRmQ4NE10bVdEM2hqSktXL2VFb2FiUVhhUFFvNDhDQXdFQUFhTk1NRW93DQpDd1lEVlIwUEJBUURBZ2VBTUJFR0ExVWRKUVFLTUFnR0JnUUFrVGNEQURBSkJnTlZIUk1FQWpBQU1CMEdBMVVkDQpEZ1FXQkJUNVRXZjZxODVUYzBldDJSSUQvZGY1eU9nTEV6QU5CZ2txaGtpRzl3MEJBUXNGQUFPQ0FRRUFOeTBrDQpVbm5rbjZqRVdXNHlzZUJSMWxTam1KZjRITW9NRUJLL3lxbWZKZTlEamxnQnBoek1Sa09NcXpsWWMwMmZ2UUorDQpTNmgvZERrdTFoaE9YN2Rvckd0bVoxTWwyMVZMYkE4K2I0eUlLSC9EbFFtVWoxNHdiUndyWGRxQVlJZ3ZFR3F1DQpwS3hkSW8zZVJqMlFPTGZML056dzlsVGV2MitGaFJxN2dBZ0MzWnNrL1YvZTVuTnViTS9LSnR3Q3pvSkdBd2tqDQpqTzJxemlhbFJ3N3ZUYW45TmpQY0ZyYVBnbXUvQ0N2Z25odU1jbHArSVQ3SnVyVTRKVk9ybTROQXBzejE2S3ltDQpnNmtjcVlpeXErSXFQalZZRjJ4ckhpblA4Z0I1RHY1eVlEZ2trZVc5WTdWTW9XVGxKRXIyZytURlI1dlB6bHgyDQpnL0RiVjA4SDJZZngvT29MZmc9PQ0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQ0KDQo=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>https://www.nccert.pl/tsl/PL_TSL.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>PL</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">National Bank of Poland</Name>
++                     <Name xml:lang="pl">Narodowy Bank Polski</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/PL</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIEhzCCA2+gAwIBAgIQPW8jjMRIcatWAnnZ/MBrMzANBgkqhkiG9w0BAQsFADBCMQswCQYDVQQGEwJQVDENMAsGA1UECgwEU0NFRTERMA8GA1UECwwIRUNFc3RhZG8xETAPBgNVBAMMCEVDQ0UgMDAxMB4XDTE1MDkyMzEwMDcyMVoXDTIwMDkyMzEwMDcyMVowZzEuMCwGA1UEAwwlUE9SVFVHVUVTRSBUUlVTVCBMSVNUIFNDSEVNRSBPUEVSQVRPUjEoMCYGA1UECgwfR2FiaW5ldGUgTmFjaW9uYWwgZGUgU2VndXJhbsOnYTELMAkGA1UEBhMCUFQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD40F9lHY68oq8UMkQHYNgS6HIYkelokkHlRpu74cybuValpoGRskLMg1QMGjPuxmr1EFF+jdd+zeOpk9rHGrWAsfDYFyxIcPVOSlcCmoenYfHxJaqSdyHVNB2oS5xkzZ/bIPUCupolRpiLauptJ4x4OK4Ep5pwzOsocGjkur19FCCVCQ3luDqyOiEgwz5Qie+JGQnzS/b03tQRnVq2gEjSilyCw+2PP27gmv6T+dIL9BIsr5uThNmgq6O1YdhItihTCAchmfXXCaBTIXattPvYQAIpEzNlLOs+keAeBkj8aeI8pC9/E4bTiWlQVT1lKQD8is6ExywWwe/YxFaUpAofAgMBAAGjggFSMIIBTjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHQYDVR0OBBYEFJUfhchtKhfRNLlQLhVA9wMYCxMgMB8GA1UdIwQYMBaAFOMa2JoMNlrUDiOsDphvgVKeLl0FMDsGA1UdIAQ0MDIwMAYEVR0gADAoMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmVjY2UuZ292LnB0L2RwYzBmBggrBgEFBQcBAQRaMFgwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVjY2UuZ292LnB0MDEGCCsGAQUFBzAChiVodHRwOi8vdHJ1c3QuZWNjZS5nb3YucHQvZWNjZS0wMDEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmxzLmVjY2UuZ292LnB0L2NybHMvY3JsLTAwMS5jcmwwDQYJKoZIhvcNAQELBQADggEBAIBQ0C4eP4ZozMkty6o6KWK71T+NrUwL+vdffIJFqL0zhYeeTfTk5MKP3wRSnstYgeOzgYs1GW0/elRtBs82fmLdzcAi397viJNSUVz9HGBqPVNR4yeXA7dO08VfQimuXKYb/ETlF1dxmkPtXTJPKp++nnbUDQ9WKio2OIPys9Vvj28KLR2nx1wVIrMlza3T6LC5qqjbgwyP0ghHSOSdpGvfGQBlBBTXXfliGcDOGHEqnlDxG7cHiPSe49k12vO2H99G4s8Di4CvDNI0bdhZMvRVmg7GunXXURn0/yTswQuMydft73f6a/gaZRjS1/+94R7EZXfIb8u855a/rMYoH5k=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIEhzCCA2+gAwIBAgIQDJcks6HEEGlWBAfuOznaDDANBgkqhkiG9w0BAQsFADBCMQswCQYDVQQGEwJQVDENMAsGA1UECgwEU0NFRTERMA8GA1UECwwIRUNFc3RhZG8xETAPBgNVBAMMCEVDQ0UgMDAxMB4XDTE1MDkyNDE0MjU0OVoXDTE4MDkyNDE0MjU0OVowZzEuMCwGA1UEAwwlUE9SVFVHVUVTRSBUUlVTVCBMSVNUIFNDSEVNRSBPUEVSQVRPUjEoMCYGA1UECgwfR2FiaW5ldGUgTmFjaW9uYWwgZGUgU2VndXJhbsOnYTELMAkGA1UEBhMCUFQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0nAx4AAv12e97tcqc4/VAKTmcb541DSq/E64gEyqWVkdQbHlA+IQctcjLNOfH9lJoIqYQRJujJKieKTCK7UDMsvG8i+8xoXq5WiFXxFAr8F1RLaXH92IoXPx3sfYjXKmQhFNn5/v05Va5rILOStA5nX0PEmoWbncMYVN2Bg5SVTLsZbypT02qRu12FaCH0IAguOvx+Ch71OvutqojklJFWpjd83TxExkxZztWh5uhdUURwH/0paku0tFaNjBQbjDTYb6dKxPfmoCMjeQFKFwK6bKwxH+21FZ3Ucls7TyeFEpho8g1Ssb9ESGzwkOPjIj6SRm5bnAQVcCEM6nB0UiBAgMBAAGjggFSMIIBTjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHQYDVR0OBBYEFBw+elLRULpJu8Z4E+QodKVSuv3LMB8GA1UdIwQYMBaAFOMa2JoMNlrUDiOsDphvgVKeLl0FMDsGA1UdIAQ0MDIwMAYEVR0gADAoMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmVjY2UuZ292LnB0L2RwYzBmBggrBgEFBQcBAQRaMFgwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVjY2UuZ292LnB0MDEGCCsGAQUFBzAChiVodHRwOi8vdHJ1c3QuZWNjZS5nb3YucHQvZWNjZS0wMDEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmxzLmVjY2UuZ292LnB0L2NybHMvY3JsLTAwMS5jcmwwDQYJKoZIhvcNAQELBQADggEBALITw5agdwrEwIE1d6cU3q6ikbFCxWeIzMu192Vy2JpQyuaCgQxHZxhO/Kgv2njq2ouwvoQX+aC/k0SYbRmAKkGhGzXwySw9K/Fmw6amdna8W07xq3odv+5o9eLDpXXShyx1gIZrw6p1QCUFgOMgriOSFUI6UPguXMGRddre8IXpUD13lOa7jrjLKWXkV+fEYNvYlyqQvfe9rQulo92pVQ+TiqpAjX0G7AcEr3HKgAPIaB7E5a83QAQePH50UqChrYtOiwSFfrEkxEtJokIwYIH3MC0hIWEVkVtJNY1U9cizrW7BOxeM4qpSvIPHpTdltpD5TTD+/G4TOufEYFap8ug=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIEhzCCA2+gAwIBAgIQDJcks6HEEGlWBAfuOznaDDANBgkqhkiG9w0BAQsFADBCMQswCQYDVQQGEwJQVDENMAsGA1UECgwEU0NFRTERMA8GA1UECwwIRUNFc3RhZG8xETAPBgNVBAMMCEVDQ0UgMDAxMB4XDTE1MDkyNDE0MjU0OVoXDTE4MDkyNDE0MjU0OVowZzEuMCwGA1UEAwwlUE9SVFVHVUVTRSBUUlVTVCBMSVNUIFNDSEVNRSBPUEVSQVRPUjEoMCYGA1UECgwfR2FiaW5ldGUgTmFjaW9uYWwgZGUgU2VndXJhbsOnYTELMAkGA1UEBhMCUFQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0nAx4AAv12e97tcqc4/VAKTmcb541DSq/E64gEyqWVkdQbHlA+IQctcjLNOfH9lJoIqYQRJujJKieKTCK7UDMsvG8i+8xoXq5WiFXxFAr8F1RLaXH92IoXPx3sfYjXKmQhFNn5/v05Va5rILOStA5nX0PEmoWbncMYVN2Bg5SVTLsZbypT02qRu12FaCH0IAguOvx+Ch71OvutqojklJFWpjd83TxExkxZztWh5uhdUURwH/0paku0tFaNjBQbjDTYb6dKxPfmoCMjeQFKFwK6bKwxH+21FZ3Ucls7TyeFEpho8g1Ssb9ESGzwkOPjIj6SRm5bnAQVcCEM6nB0UiBAgMBAAGjggFSMIIBTjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHQYDVR0OBBYEFBw+elLRULpJu8Z4E+QodKVSuv3LMB8GA1UdIwQYMBaAFOMa2JoMNlrUDiOsDphvgVKeLl0FMDsGA1UdIAQ0MDIwMAYEVR0gADAoMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmVjY2UuZ292LnB0L2RwYzBmBggrBgEFBQcBAQRaMFgwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVjY2UuZ292LnB0MDEGCCsGAQUFBzAChiVodHRwOi8vdHJ1c3QuZWNjZS5nb3YucHQvZWNjZS0wMDEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmxzLmVjY2UuZ292LnB0L2NybHMvY3JsLTAwMS5jcmwwDQYJKoZIhvcNAQELBQADggEBALITw5agdwrEwIE1d6cU3q6ikbFCxWeIzMu192Vy2JpQyuaCgQxHZxhO/Kgv2njq2ouwvoQX+aC/k0SYbRmAKkGhGzXwySw9K/Fmw6amdna8W07xq3odv+5o9eLDpXXShyx1gIZrw6p1QCUFgOMgriOSFUI6UPguXMGRddre8IXpUD13lOa7jrjLKWXkV+fEYNvYlyqQvfe9rQulo92pVQ+TiqpAjX0G7AcEr3HKgAPIaB7E5a83QAQePH50UqChrYtOiwSFfrEkxEtJokIwYIH3MC0hIWEVkVtJNY1U9cizrW7BOxeM4qpSvIPHpTdltpD5TTD+/G4TOufEYFap8ug=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>https://www.gns.gov.pt/media/1891/TSLPTHR.pdf</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>PT</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/pdf</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">National Security Cabinet of Portugal</Name>
++                     <Name xml:lang="pt">Gabinete Nacional de Segurança</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/PT</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIEhzCCA2+gAwIBAgIQPW8jjMRIcatWAnnZ/MBrMzANBgkqhkiG9w0BAQsFADBCMQswCQYDVQQGEwJQVDENMAsGA1UECgwEU0NFRTERMA8GA1UECwwIRUNFc3RhZG8xETAPBgNVBAMMCEVDQ0UgMDAxMB4XDTE1MDkyMzEwMDcyMVoXDTIwMDkyMzEwMDcyMVowZzEuMCwGA1UEAwwlUE9SVFVHVUVTRSBUUlVTVCBMSVNUIFNDSEVNRSBPUEVSQVRPUjEoMCYGA1UECgwfR2FiaW5ldGUgTmFjaW9uYWwgZGUgU2VndXJhbsOnYTELMAkGA1UEBhMCUFQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD40F9lHY68oq8UMkQHYNgS6HIYkelokkHlRpu74cybuValpoGRskLMg1QMGjPuxmr1EFF+jdd+zeOpk9rHGrWAsfDYFyxIcPVOSlcCmoenYfHxJaqSdyHVNB2oS5xkzZ/bIPUCupolRpiLauptJ4x4OK4Ep5pwzOsocGjkur19FCCVCQ3luDqyOiEgwz5Qie+JGQnzS/b03tQRnVq2gEjSilyCw+2PP27gmv6T+dIL9BIsr5uThNmgq6O1YdhItihTCAchmfXXCaBTIXattPvYQAIpEzNlLOs+keAeBkj8aeI8pC9/E4bTiWlQVT1lKQD8is6ExywWwe/YxFaUpAofAgMBAAGjggFSMIIBTjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHQYDVR0OBBYEFJUfhchtKhfRNLlQLhVA9wMYCxMgMB8GA1UdIwQYMBaAFOMa2JoMNlrUDiOsDphvgVKeLl0FMDsGA1UdIAQ0MDIwMAYEVR0gADAoMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmVjY2UuZ292LnB0L2RwYzBmBggrBgEFBQcBAQRaMFgwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVjY2UuZ292LnB0MDEGCCsGAQUFBzAChiVodHRwOi8vdHJ1c3QuZWNjZS5nb3YucHQvZWNjZS0wMDEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmxzLmVjY2UuZ292LnB0L2NybHMvY3JsLTAwMS5jcmwwDQYJKoZIhvcNAQELBQADggEBAIBQ0C4eP4ZozMkty6o6KWK71T+NrUwL+vdffIJFqL0zhYeeTfTk5MKP3wRSnstYgeOzgYs1GW0/elRtBs82fmLdzcAi397viJNSUVz9HGBqPVNR4yeXA7dO08VfQimuXKYb/ETlF1dxmkPtXTJPKp++nnbUDQ9WKio2OIPys9Vvj28KLR2nx1wVIrMlza3T6LC5qqjbgwyP0ghHSOSdpGvfGQBlBBTXXfliGcDOGHEqnlDxG7cHiPSe49k12vO2H99G4s8Di4CvDNI0bdhZMvRVmg7GunXXURn0/yTswQuMydft73f6a/gaZRjS1/+94R7EZXfIb8u855a/rMYoH5k=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIEhzCCA2+gAwIBAgIQDJcks6HEEGlWBAfuOznaDDANBgkqhkiG9w0BAQsFADBCMQswCQYDVQQGEwJQVDENMAsGA1UECgwEU0NFRTERMA8GA1UECwwIRUNFc3RhZG8xETAPBgNVBAMMCEVDQ0UgMDAxMB4XDTE1MDkyNDE0MjU0OVoXDTE4MDkyNDE0MjU0OVowZzEuMCwGA1UEAwwlUE9SVFVHVUVTRSBUUlVTVCBMSVNUIFNDSEVNRSBPUEVSQVRPUjEoMCYGA1UECgwfR2FiaW5ldGUgTmFjaW9uYWwgZGUgU2VndXJhbsOnYTELMAkGA1UEBhMCUFQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0nAx4AAv12e97tcqc4/VAKTmcb541DSq/E64gEyqWVkdQbHlA+IQctcjLNOfH9lJoIqYQRJujJKieKTCK7UDMsvG8i+8xoXq5WiFXxFAr8F1RLaXH92IoXPx3sfYjXKmQhFNn5/v05Va5rILOStA5nX0PEmoWbncMYVN2Bg5SVTLsZbypT02qRu12FaCH0IAguOvx+Ch71OvutqojklJFWpjd83TxExkxZztWh5uhdUURwH/0paku0tFaNjBQbjDTYb6dKxPfmoCMjeQFKFwK6bKwxH+21FZ3Ucls7TyeFEpho8g1Ssb9ESGzwkOPjIj6SRm5bnAQVcCEM6nB0UiBAgMBAAGjggFSMIIBTjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHQYDVR0OBBYEFBw+elLRULpJu8Z4E+QodKVSuv3LMB8GA1UdIwQYMBaAFOMa2JoMNlrUDiOsDphvgVKeLl0FMDsGA1UdIAQ0MDIwMAYEVR0gADAoMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmVjY2UuZ292LnB0L2RwYzBmBggrBgEFBQcBAQRaMFgwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVjY2UuZ292LnB0MDEGCCsGAQUFBzAChiVodHRwOi8vdHJ1c3QuZWNjZS5nb3YucHQvZWNjZS0wMDEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmxzLmVjY2UuZ292LnB0L2NybHMvY3JsLTAwMS5jcmwwDQYJKoZIhvcNAQELBQADggEBALITw5agdwrEwIE1d6cU3q6ikbFCxWeIzMu192Vy2JpQyuaCgQxHZxhO/Kgv2njq2ouwvoQX+aC/k0SYbRmAKkGhGzXwySw9K/Fmw6amdna8W07xq3odv+5o9eLDpXXShyx1gIZrw6p1QCUFgOMgriOSFUI6UPguXMGRddre8IXpUD13lOa7jrjLKWXkV+fEYNvYlyqQvfe9rQulo92pVQ+TiqpAjX0G7AcEr3HKgAPIaB7E5a83QAQePH50UqChrYtOiwSFfrEkxEtJokIwYIH3MC0hIWEVkVtJNY1U9cizrW7BOxeM4qpSvIPHpTdltpD5TTD+/G4TOufEYFap8ug=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIEhzCCA2+gAwIBAgIQDJcks6HEEGlWBAfuOznaDDANBgkqhkiG9w0BAQsFADBCMQswCQYDVQQGEwJQVDENMAsGA1UECgwEU0NFRTERMA8GA1UECwwIRUNFc3RhZG8xETAPBgNVBAMMCEVDQ0UgMDAxMB4XDTE1MDkyNDE0MjU0OVoXDTE4MDkyNDE0MjU0OVowZzEuMCwGA1UEAwwlUE9SVFVHVUVTRSBUUlVTVCBMSVNUIFNDSEVNRSBPUEVSQVRPUjEoMCYGA1UECgwfR2FiaW5ldGUgTmFjaW9uYWwgZGUgU2VndXJhbsOnYTELMAkGA1UEBhMCUFQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0nAx4AAv12e97tcqc4/VAKTmcb541DSq/E64gEyqWVkdQbHlA+IQctcjLNOfH9lJoIqYQRJujJKieKTCK7UDMsvG8i+8xoXq5WiFXxFAr8F1RLaXH92IoXPx3sfYjXKmQhFNn5/v05Va5rILOStA5nX0PEmoWbncMYVN2Bg5SVTLsZbypT02qRu12FaCH0IAguOvx+Ch71OvutqojklJFWpjd83TxExkxZztWh5uhdUURwH/0paku0tFaNjBQbjDTYb6dKxPfmoCMjeQFKFwK6bKwxH+21FZ3Ucls7TyeFEpho8g1Ssb9ESGzwkOPjIj6SRm5bnAQVcCEM6nB0UiBAgMBAAGjggFSMIIBTjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHQYDVR0OBBYEFBw+elLRULpJu8Z4E+QodKVSuv3LMB8GA1UdIwQYMBaAFOMa2JoMNlrUDiOsDphvgVKeLl0FMDsGA1UdIAQ0MDIwMAYEVR0gADAoMCYGCCsGAQUFBwIBFhpodHRwOi8vd3d3LmVjY2UuZ292LnB0L2RwYzBmBggrBgEFBQcBAQRaMFgwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVjY2UuZ292LnB0MDEGCCsGAQUFBzAChiVodHRwOi8vdHJ1c3QuZWNjZS5nb3YucHQvZWNjZS0wMDEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmxzLmVjY2UuZ292LnB0L2NybHMvY3JsLTAwMS5jcmwwDQYJKoZIhvcNAQELBQADggEBALITw5agdwrEwIE1d6cU3q6ikbFCxWeIzMu192Vy2JpQyuaCgQxHZxhO/Kgv2njq2ouwvoQX+aC/k0SYbRmAKkGhGzXwySw9K/Fmw6amdna8W07xq3odv+5o9eLDpXXShyx1gIZrw6p1QCUFgOMgriOSFUI6UPguXMGRddre8IXpUD13lOa7jrjLKWXkV+fEYNvYlyqQvfe9rQulo92pVQ+TiqpAjX0G7AcEr3HKgAPIaB7E5a83QAQePH50UqChrYtOiwSFfrEkxEtJokIwYIH3MC0hIWEVkVtJNY1U9cizrW7BOxeM4qpSvIPHpTdltpD5TTD+/G4TOufEYFap8ug=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>https://www.gns.gov.pt/media/1894/TSLPT.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>PT</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">National Security Cabinet of Portugal</Name>
++                     <Name xml:lang="pt">Gabinete Nacional de Segurança</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/PT</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIFkjCCBHqgAwIBAgIQIAYFFnBjM4C9F3GV/MybHDANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJSTzERMA8GA1UEChMIY2VydFNJR04xKTAnBgNVBAsTIGNlcnRTSUdOIFF1YWxpZmllZCBDQSBDbGFzcyAzIEcyMSkwJwYDVQQDEyBjZXJ0U0lHTiBRdWFsaWZpZWQgQ0EgQ2xhc3MgMyBHMjAeFw0xNTA4MjQxNDExMzFaFw0xNjA4MjQxNDExMzFaMIHEMQswCQYDVQQGEwJSTzEXMBUGA1UEBwwOTXVuLiBCdWN1cmVzdGkxNDAyBgNVBAoMK01JTklTVEVSVUwgUEVOVFJVIFNPQ0lFVEFURUEgSU5GT1JNQVRJT05BTEExFTATBgNVBAMMDENhcm1lbiBFbGlhbjEXMBUGA1UEBRMOMjAwNjA1MTY3MEVDMTQxFTATBgNVBCkMDENhcm1lbiBFbGlhbjEPMA0GA1UEKgwGQ2FybWVuMQ4wDAYDVQQEDAVFbGlhbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIr/xI7Gho+cwFAbeN+ZhE3d9YttjyiOWxpo0KlI1MknFHZIGBgSPD1bHytwp/R+vg5AJOyCQkCp31+KP+epppNwjrdNhHvGELGbXJnX7T3xHvqHZgyDdwKrOSXmTRt8MT/GXz/mk6+6WDgzyNP6k3AGbOGi7yQaufU3RNmTml1mt/QsCaYUxI19b+Uo6YFOB4Ou6FdLNk+pcI4whc5LGQRK2RpGt2veqdIRaHFWw/2rDQDpHSX+b/3fSnpzwRYDLQqF5FI1h57WD4VBlMdQ7+sXnQRkWmzlE52YziTSwrJpAiXRKwcs/hlzim8cOTNuIWF1sy1KtXeYAwMlyizJcOcCAwEAAaOCAcswggHHMG8GCCsGAQUFBwEBBGMwYTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuY2VydHNpZ24ucm8wOgYIKwYBBQUHMAKGLmh0dHA6Ly93d3cuY2VydHNpZ24ucm8vY2VydGNybC9xdWFsaWZpZWRnMi5jcnQwDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCBLAwHwYDVR0jBBgwFoAUUDSeU3a5bdK3DB6Qg3Va7st0GIowHQYDVR0OBBYEFCUbQG7l1VMoByq2j3b21Vpw5FcMMEkGA1UdIARCMEAwPgYLKwYBBAGBwzkBAQMwLzAtBggrBgEFBQcCARYhaHR0cDovL3d3dy5jZXJ0c2lnbi5yby9yZXBvc2l0b3J5MDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly9jcmwuY2VydHNpZ24ucm8vcXVhbGlmaWVkZzIuY3JsMEcGA1UdEQRAMD6gJQYKKwYBBAGCNxQCA6AXDBVjYXJtZW4uZWxpYW5AbXNpbmYucm+BFWNhcm1lbi5lbGlhbkBtc2luZi5ybzApBgNVHSUEIjAgBggrBgEFBQcDAgYKKwYBBAGCNxQCAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQELBQADggEBAJpigM2rDWZ3lI/nZSkdxiUTpuDIw1jgwZqOiIvddGkQZT3ElU/06svJUBpqsJmjbG+yRvftmWIYqaqtdIEjMASF8K2kt8jbtr46uZksK+60x11DCvwxsKW55XSfAuY9u2B0TTvxzQ6BXR+wykryQdCIEwaN44Ka7l/XkZLtnxyWqBykkYAH8O0nj7BNuhBhZD579exh6pu5UIliTNNoQn2077qL172dTJxxNTnrvs4AQJJpWuOQTaAN/9QRZ5/C/c61Ta+O5Y8kPbv9Q69kkCCDDEntflkXaWrfzEjOOCXdLL8J4LHXYU2u1mB/J1fjyH8i5w7WYig/adHnB9dq4q4=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIF1DCCBLygAwIBAgIQIAYFFnBjM4f/kUNg/UnC1jANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJSTzERMA8GA1UEChMIY2VydFNJR04xKTAnBgNVBAsTIGNlcnRTSUdOIFF1YWxpZmllZCBDQSBDbGFzcyAzIEcyMSkwJwYDVQQDEyBjZXJ0U0lHTiBRdWFsaWZpZWQgQ0EgQ2xhc3MgMyBHMjAeFw0xNTA4MjQxNDExMzFaFw0xNjA4MjQxNDExMzFaMIH+MQswCQYDVQQGEwJSTzEXMBUGA1UEBwwOTXVuLiBCdWN1cmVzdGkxNDAyBgNVBAoMK01JTklTVEVSVUwgUEVOVFJVIFNPQ0lFVEFURUEgSU5GT1JNQVRJT05BTEExJzAlBgNVBAMMHlJvbXVsdXMtUmFkdS1Db3JuZWxpdSBEdW1pdHJpdTEZMBcGA1UEBRMQMjAwNjA1MTY3MERDUlJDMTEpMCcGA1UEKQwgUm9tdWx1cy1SYWR1LUNvcm5lbGl1IEMgRHVtaXRyaXUxHjAcBgNVBCoMFVJvbXVsdXMtUmFkdS1Db3JuZWxpdTERMA8GA1UEBAwIRHVtaXRyaXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCP5uzh6yT71IooMhyVL2QcZE5lhIMUpqMNXqjNqHDe8SOAMRBkopPws9sS+jUQ2IKhQzPBTRYMAbBhQqdmnPzqGC4fpdZY3/5qrxRwHOzBHlrBawCOcpwaSy/J76ZgdWDJLWeXLtNmREFNELb9BuYH8DPWyHeE2lLSJO0OJbs1SMakX+BVt3/RmXbOCG3gYOjkGfq9sVhA9DC4PqR7KMfpb8nX7QQeJvtZdHQYaXaPajALX5qSuL1JT/KKUsqsMkqKh/nRxb1jH+qpRy6oa6gnij7XlukKUNy20aqENqniAT81L8ywDh1N/0l1IWY1tgSR10ClBfCD+UMQztoX5Vw3AgMBAAGjggHTMIIBzzBvBggrBgEFBQcBAQRjMGEwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmNlcnRzaWduLnJvMDoGCCsGAQUFBzAChi5odHRwOi8vd3d3LmNlcnRzaWduLnJvL2NlcnRjcmwvcXVhbGlmaWVkZzIuY3J0MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgSwMB8GA1UdIwQYMBaAFFA0nlN2uW3StwwekIN1Wu7LdBiKMB0GA1UdDgQWBBRZeYa2QYn3F5yuE1TERs0TsXz69DBJBgNVHSAEQjBAMD4GCysGAQQBgcM5AQEDMC8wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cuY2VydHNpZ24ucm8vcmVwb3NpdG9yeTA3BgNVHR8EMDAuMCygKqAohiZodHRwOi8vY3JsLmNlcnRzaWduLnJvL3F1YWxpZmllZGcyLmNybDBPBgNVHREESDBGoCkGCisGAQQBgjcUAgOgGwwZcm9tdWx1cy5kdW1pdHJpdUBtc2luZi5yb4EZcm9tdWx1cy5kdW1pdHJpdUBtc2luZi5ybzApBgNVHSUEIjAgBggrBgEFBQcDAgYKKwYBBAGCNxQCAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQELBQADggEBABKUmpbk8t1QyD37isj8ITmzuGQHFNOwAM2ZXJYk78c2YmkCY2luVPFvrfJ9ff3IqfqWS6RuMLQmNSPT84B3Bc+Y1j9QZgqNlVbkGrCBOe4GlojE9yXed7J4HCMYPT5iDaCdnD8XZQXYmUZmaSeJQoWkOTVG7zHoKO77VyK8kFltQAj+fQkI9sDdNVXfYlN+pgN2tQvPHbnNZo8hI00AJE9JWH0gHbIne7c7/1TU5ll4HWOZYVPRJV5DHe5mGBpflLxK8fpwXwEvxK1Yx1qKecpou5oBuqPVWy+iDv6Suv7VZLLEtFm+36wk3YoMWj3fxMFuckjxVFiiQYRZd10lRww=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.mcsi.ro/Minister/Domenii-de-activitate-ale-MCSI/Tehnologia-Informatiei/Servicii-electronice/Semnatura-electronica/TrustedList-versiunea-pdf</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>RO</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/pdf</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">MINISTRY FOR INFORMATION SOCIETY</Name>
++                     <Name xml:lang="ro">MINISTERUL PENTRU SOCIETATEA INFORMATIONALA</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/RO</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIFkjCCBHqgAwIBAgIQIAYFFnBjM4C9F3GV/MybHDANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJSTzERMA8GA1UEChMIY2VydFNJR04xKTAnBgNVBAsTIGNlcnRTSUdOIFF1YWxpZmllZCBDQSBDbGFzcyAzIEcyMSkwJwYDVQQDEyBjZXJ0U0lHTiBRdWFsaWZpZWQgQ0EgQ2xhc3MgMyBHMjAeFw0xNTA4MjQxNDExMzFaFw0xNjA4MjQxNDExMzFaMIHEMQswCQYDVQQGEwJSTzEXMBUGA1UEBwwOTXVuLiBCdWN1cmVzdGkxNDAyBgNVBAoMK01JTklTVEVSVUwgUEVOVFJVIFNPQ0lFVEFURUEgSU5GT1JNQVRJT05BTEExFTATBgNVBAMMDENhcm1lbiBFbGlhbjEXMBUGA1UEBRMOMjAwNjA1MTY3MEVDMTQxFTATBgNVBCkMDENhcm1lbiBFbGlhbjEPMA0GA1UEKgwGQ2FybWVuMQ4wDAYDVQQEDAVFbGlhbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIr/xI7Gho+cwFAbeN+ZhE3d9YttjyiOWxpo0KlI1MknFHZIGBgSPD1bHytwp/R+vg5AJOyCQkCp31+KP+epppNwjrdNhHvGELGbXJnX7T3xHvqHZgyDdwKrOSXmTRt8MT/GXz/mk6+6WDgzyNP6k3AGbOGi7yQaufU3RNmTml1mt/QsCaYUxI19b+Uo6YFOB4Ou6FdLNk+pcI4whc5LGQRK2RpGt2veqdIRaHFWw/2rDQDpHSX+b/3fSnpzwRYDLQqF5FI1h57WD4VBlMdQ7+sXnQRkWmzlE52YziTSwrJpAiXRKwcs/hlzim8cOTNuIWF1sy1KtXeYAwMlyizJcOcCAwEAAaOCAcswggHHMG8GCCsGAQUFBwEBBGMwYTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuY2VydHNpZ24ucm8wOgYIKwYBBQUHMAKGLmh0dHA6Ly93d3cuY2VydHNpZ24ucm8vY2VydGNybC9xdWFsaWZpZWRnMi5jcnQwDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCBLAwHwYDVR0jBBgwFoAUUDSeU3a5bdK3DB6Qg3Va7st0GIowHQYDVR0OBBYEFCUbQG7l1VMoByq2j3b21Vpw5FcMMEkGA1UdIARCMEAwPgYLKwYBBAGBwzkBAQMwLzAtBggrBgEFBQcCARYhaHR0cDovL3d3dy5jZXJ0c2lnbi5yby9yZXBvc2l0b3J5MDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly9jcmwuY2VydHNpZ24ucm8vcXVhbGlmaWVkZzIuY3JsMEcGA1UdEQRAMD6gJQYKKwYBBAGCNxQCA6AXDBVjYXJtZW4uZWxpYW5AbXNpbmYucm+BFWNhcm1lbi5lbGlhbkBtc2luZi5ybzApBgNVHSUEIjAgBggrBgEFBQcDAgYKKwYBBAGCNxQCAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQELBQADggEBAJpigM2rDWZ3lI/nZSkdxiUTpuDIw1jgwZqOiIvddGkQZT3ElU/06svJUBpqsJmjbG+yRvftmWIYqaqtdIEjMASF8K2kt8jbtr46uZksK+60x11DCvwxsKW55XSfAuY9u2B0TTvxzQ6BXR+wykryQdCIEwaN44Ka7l/XkZLtnxyWqBykkYAH8O0nj7BNuhBhZD579exh6pu5UIliTNNoQn2077qL172dTJxxNTnrvs4AQJJpWuOQTaAN/9QRZ5/C/c61Ta+O5Y8kPbv9Q69kkCCDDEntflkXaWrfzEjOOCXdLL8J4LHXYU2u1mB/J1fjyH8i5w7WYig/adHnB9dq4q4=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIF1DCCBLygAwIBAgIQIAYFFnBjM4f/kUNg/UnC1jANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJSTzERMA8GA1UEChMIY2VydFNJR04xKTAnBgNVBAsTIGNlcnRTSUdOIFF1YWxpZmllZCBDQSBDbGFzcyAzIEcyMSkwJwYDVQQDEyBjZXJ0U0lHTiBRdWFsaWZpZWQgQ0EgQ2xhc3MgMyBHMjAeFw0xNTA4MjQxNDExMzFaFw0xNjA4MjQxNDExMzFaMIH+MQswCQYDVQQGEwJSTzEXMBUGA1UEBwwOTXVuLiBCdWN1cmVzdGkxNDAyBgNVBAoMK01JTklTVEVSVUwgUEVOVFJVIFNPQ0lFVEFURUEgSU5GT1JNQVRJT05BTEExJzAlBgNVBAMMHlJvbXVsdXMtUmFkdS1Db3JuZWxpdSBEdW1pdHJpdTEZMBcGA1UEBRMQMjAwNjA1MTY3MERDUlJDMTEpMCcGA1UEKQwgUm9tdWx1cy1SYWR1LUNvcm5lbGl1IEMgRHVtaXRyaXUxHjAcBgNVBCoMFVJvbXVsdXMtUmFkdS1Db3JuZWxpdTERMA8GA1UEBAwIRHVtaXRyaXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCP5uzh6yT71IooMhyVL2QcZE5lhIMUpqMNXqjNqHDe8SOAMRBkopPws9sS+jUQ2IKhQzPBTRYMAbBhQqdmnPzqGC4fpdZY3/5qrxRwHOzBHlrBawCOcpwaSy/J76ZgdWDJLWeXLtNmREFNELb9BuYH8DPWyHeE2lLSJO0OJbs1SMakX+BVt3/RmXbOCG3gYOjkGfq9sVhA9DC4PqR7KMfpb8nX7QQeJvtZdHQYaXaPajALX5qSuL1JT/KKUsqsMkqKh/nRxb1jH+qpRy6oa6gnij7XlukKUNy20aqENqniAT81L8ywDh1N/0l1IWY1tgSR10ClBfCD+UMQztoX5Vw3AgMBAAGjggHTMIIBzzBvBggrBgEFBQcBAQRjMGEwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmNlcnRzaWduLnJvMDoGCCsGAQUFBzAChi5odHRwOi8vd3d3LmNlcnRzaWduLnJvL2NlcnRjcmwvcXVhbGlmaWVkZzIuY3J0MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgSwMB8GA1UdIwQYMBaAFFA0nlN2uW3StwwekIN1Wu7LdBiKMB0GA1UdDgQWBBRZeYa2QYn3F5yuE1TERs0TsXz69DBJBgNVHSAEQjBAMD4GCysGAQQBgcM5AQEDMC8wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cuY2VydHNpZ24ucm8vcmVwb3NpdG9yeTA3BgNVHR8EMDAuMCygKqAohiZodHRwOi8vY3JsLmNlcnRzaWduLnJvL3F1YWxpZmllZGcyLmNybDBPBgNVHREESDBGoCkGCisGAQQBgjcUAgOgGwwZcm9tdWx1cy5kdW1pdHJpdUBtc2luZi5yb4EZcm9tdWx1cy5kdW1pdHJpdUBtc2luZi5ybzApBgNVHSUEIjAgBggrBgEFBQcDAgYKKwYBBAGCNxQCAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQELBQADggEBABKUmpbk8t1QyD37isj8ITmzuGQHFNOwAM2ZXJYk78c2YmkCY2luVPFvrfJ9ff3IqfqWS6RuMLQmNSPT84B3Bc+Y1j9QZgqNlVbkGrCBOe4GlojE9yXed7J4HCMYPT5iDaCdnD8XZQXYmUZmaSeJQoWkOTVG7zHoKO77VyK8kFltQAj+fQkI9sDdNVXfYlN+pgN2tQvPHbnNZo8hI00AJE9JWH0gHbIne7c7/1TU5ll4HWOZYVPRJV5DHe5mGBpflLxK8fpwXwEvxK1Yx1qKecpou5oBuqPVWy+iDv6Suv7VZLLEtFm+36wk3YoMWj3fxMFuckjxVFiiQYRZd10lRww=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.mcsi.ro/Minister/Domenii-de-activitate-ale-MCSI/Tehnologia-Informatiei/Servicii-electronice/Semnatura-electronica/TrustedList-versiunea-xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>RO</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">MINISTRY FOR INFORMATION SOCIETY</Name>
++                     <Name xml:lang="ro">MINISTERUL PENTRU SOCIETATEA INFORMATIONALA</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/RO</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIDyTCCArGgAwIBAgIJAKRRAbnpt+1mMA0GCSqGSIb3DQEBCwUAMIGVMS4wLAYDVQQKEyVTd2VkaXNoIFBvc3QgYW5kIFRlbGVjb20gQWdlbmN5IChQVFMpMRIwEAYDVQQHEwlTdG9ja2hvbG0xEjAQBgNVBAgTCVN0b2NraG9sbTELMAkGA1UEBhMCU0UxLjAsBgNVBAMTJVN3ZWRpc2ggUG9zdCBhbmQgVGVsZWNvbSBBZ2VuY3kgKFBUUykwHhcNMTQxMjE5MDk1NDM2WhcNMTcxMjE4MDk1NDM2WjCBlTEuMCwGA1UEChMlU3dlZGlzaCBQb3N0IGFuZCBUZWxlY29tIEFnZW5jeSAoUFRTKTESMBAGA1UEBxMJU3RvY2tob2xtMRIwEAYDVQQIEwlTdG9ja2hvbG0xCzAJBgNVBAYTAlNFMS4wLAYDVQQDEyVTd2VkaXNoIFBvc3QgYW5kIFRlbGVjb20gQWdlbmN5IChQVFMpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtn8ADLkkBdFUWnKOYg1dDoJ7evZxP/jsqmFPVuZsOlAifQ6/NGWqyHMyj8r1/BmyEB/2WPLf+jrbtOKwSGtEHHkJ3nZnv1U9CBgIHDotzHrrEUI2b0r3ETaz80KsIlTZ5HaN0jPt+gfBETXCyT6H2cJ7uM5S/zhFeV7YMS2kzg9StgAMOQdZVAD4/2X1je97pBfH3AB4ZwLWsAA1OvQJ1NaE1gftqBuxiQkm5FOh8PnECmcT9dMveRLUKAbup5I1i1m3Ql9QvtyPv8E0/zSZUIN5XsRw9KXtgWema1oKSXBKyytg+XESSKm6BNYR2jTYQI8Vr0Z3MRl1zz9jcSh53QIDAQABoxowGDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGQDANBgkqhkiG9w0BAQsFAAOCAQEAiQ1Uns2aYVrlKthS8uf7gSkCI9hxmUOw1oryvNKu6q8OakYrbM2Z04+brJlzaX5gH1xFKC+6V6AaFHoAXP3G5is/BuGNhsRNwUluEsiqbxX6sKIQnyHyxhWDM3gfqHZwN4WDPb6W8UNfdMn5QabFi/MaecQgFCY505BJkBIKJA+apyj6zHYPSALjN4NewdheiCJ4jLoUpiJFKObbGNeZMcXqRRZaynOda9N8iKvACR4vScOYHG3HFn4NF0HnMbVh+0cyzzkzzjcd+oVsBQYLU9Oer+Axluj4E+AxvGmRfE/9S4VBctu1h/65iC5fcV8wdGdnE/UW1IDfk5UGXuWhmQ==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIDyTCCArGgAwIBAgIJALk/nqk36SvuMA0GCSqGSIb3DQEBCwUAMIGVMS4wLAYDVQQKEyVTd2VkaXNoIFBvc3QgYW5kIFRlbGVjb20gQWdlbmN5IChQVFMpMRIwEAYDVQQHEwlTdG9ja2hvbG0xEjAQBgNVBAgTCVN0b2NraG9sbTELMAkGA1UEBhMCU0UxLjAsBgNVBAMTJVN3ZWRpc2ggUG9zdCBhbmQgVGVsZWNvbSBBZ2VuY3kgKFBUUykwHhcNMTQwMjA0MTE1OTEyWhcNMTcwMjAzMTE1OTEyWjCBlTEuMCwGA1UEChMlU3dlZGlzaCBQb3N0IGFuZCBUZWxlY29tIEFnZW5jeSAoUFRTKTESMBAGA1UEBxMJU3RvY2tob2xtMRIwEAYDVQQIEwlTdG9ja2hvbG0xCzAJBgNVBAYTAlNFMS4wLAYDVQQDEyVTd2VkaXNoIFBvc3QgYW5kIFRlbGVjb20gQWdlbmN5IChQVFMpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArvBzVAFdzuT6LPDTqpo3dI8+zcH8UMA7uKubCsFmdiaeH643j1nfuUzbjQvQG+K6qrB3IRYec0zvWb6SnP58hTBHxvOf0eeRD7vxXomfeCO0FfhQnpBlCOAo8WDcFfYxCpUE1enyT02AhOkI0XRMibAP6EKWIjUvehKHBPi+OpfrDhxrMshrvV0+Cv/d07RevBNvXXmTUugaoo2q0/whl26rcawdEr3GbdxpNYonlzkwhKn5kNP/6Wo0xujxDX/6ZD6evFE2XS/ogPNqg6jOJifzglpIQx0fWyGYMKBiuz44K3SS1oCwiW6cIZlShvvwtQqOewE3zKp76LFDJlNZUQIDAQABoxowGDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIGQDANBgkqhkiG9w0BAQsFAAOCAQEAdwopbzGOmPRe7d966zesuzckXA6eo1EgePlmaUTKkudZAKEODRwp0Cei+i2PKnTyZF1xY+BxEVcrVmU0syCDegv94qsnthJtx4QZmIlWVPBVq2AGDe+htnjD6QHzisuN5WNEH9g7JeUQmlXAsObPNxeldL++jp7/J9pWsD5WHlol0EbF5k4uYx8SlLfPQptXJFRckzA2P+JsJ/eg1GKF9RvP5N2PAC2mQDkyvl3D561Q3Vga1gU5Jl0idnzQhggcyyRTYOXxb9ZwDKpHvSUdIaAIDRe6626IGf4azK9Rflqppfo3YoiUpq5bkEx44377ho6RjnqMIYvOo348ZbcAJQ==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.pts.se/upload/Ovrigt/Internet/Branschinformation/Trusted-List-SE-MR.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>SE</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Swedish Post and Telecom Agency (PTS)</Name>
++                     <Name xml:lang="sv">Post- och telestyrelsen (PTS)</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/SE</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIFdDCCBFygAwIBAgIEOl6PRjANBgkqhkiG9w0BAQUFADA9MQswCQYDVQQGEwJzaTEbMBkGA1UEChMSc3RhdGUtaW5zdGl0dXRpb25zMREwDwYDVQQLEwhzaWdvdi1jYTAeFw0xMzAzMDUxMDU2MDZaFw0xODAzMDUxMzI4MzVaMIGJMQswCQYDVQQGEwJzaTEbMBkGA1UEChMSc3RhdGUtaW5zdGl0dXRpb25zMRkwFwYDVQQLExB3ZWItY2VydGlmaWNhdGVzMRMwEQYDVQQLEwpHb3Zlcm5tZW50MS0wFAYDVQQFEw0xMjM1MTc0MjE0MDI3MBUGA1UEAxMORGltaXRyaWogU2themEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCJxPypF9ZVssjvPT/he9cZ/DdBn3htrapLJqHISc1ylop1CpkL0fbPTL9xK3JnaMzzmucbeTkwj2fyEaluP2bl1+ElpMWDYUq59mDOGvpB5KaJvTCXGUdf3rZTFSVOf7WarhI9uR25sjZg1wwVKGJ9VTqVtAlD5WBsIyT2CN1xWj3DXy+faqGtYbd/4mpzMW+qvTJQ9act6rlmTXJXwOVBTYwVEciTqX+IMX1nIn93FEOl6Q9BQeAYFe8pVXbTjoveY7KIE2SyWETogYplMDesK3hWB6cGfnWD05+Vbj78hKFyxSjoKTJegxzk6+8nGy0dzkjup1nlpTrjDBr1Zgt9AgMBAAGjggItMIICKTAOBgNVHQ8BAf8EBAMCBaAwSgYDVR0gBEMwQTA1BgorBgEEAa9ZAQcBMCcwJQYIKwYBBQUHAgEWGWh0dHA6Ly93d3cuY2EuZ292LnNpL2Nwcy8wCAYGBACLMAEBMCIGCCsGAQUFBwEDBBYwFDAIBgYEAI5GAQEwCAYGBACORgEEMCAGA1UdEQQZMBeBFWRpbWl0cmlqLnNrYXphQGdvdi5zaTCB8QYDVR0fBIHpMIHmMFWgU6BRpE8wTTELMAkGA1UEBhMCc2kxGzAZBgNVBAoTEnN0YXRlLWluc3RpdHV0aW9uczERMA8GA1UECxMIc2lnb3YtY2ExDjAMBgNVBAMTBUNSTDQxMIGMoIGJoIGGhldsZGFwOi8veDUwMC5nb3Yuc2kvb3U9c2lnb3YtY2Esbz1zdGF0ZS1pbnN0aXR1dGlvbnMsYz1zaT9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0P2Jhc2WGK2h0dHA6Ly93d3cuc2lnb3YtY2EuZ292LnNpL2NybC9zaWdvdi1jYS5jcmwwKwYDVR0QBCQwIoAPMjAxMzAzMDUxMDU2MDZagQ8yMDE4MDMwNTEzMjgzNVowHwYDVR0jBBgwFoAUHvjUU2uzgwbpBAZXAvmlv8ZYPHIwHQYDVR0OBBYEFPkW6/pilxObPEzBAucEf/wHqwgdMAkGA1UdEwQCMAAwGQYJKoZIhvZ9B0EABAwwChsEVjcuMQMCA6gwDQYJKoZIhvcNAQEFBQADggEBAI+3jSydwmTfTuFJxIys5PFZGzWNX8pCcyyuYFnbPbsnWwVMA1wE/FazkN51U0E2nTsYlooal4uiZ0u5jgbXW7wBvAIept/mJNyXXLd/il5JiB0Bz76GsGNmw1DoX2lvV06x39NI9X3+ea2rp7L56co3kVJPmFbJImyYc5OK5H9dXjGpIcxzVyWXNoUSbhVZpljIw5Tka+c5/G0gE49o3PiexXH2fziGBAmbICn+eX6+zeSo80OB0DiPRMD0s31IitQfEv1N3H+lz21Pa8gKEKpKw7Ns7b4nMGfw8WQyiVHNNSo95RlCaHPFfeFR5vkDuUayHqGwErB1Zdx8AIjzR+w=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIFdDCCBFygAwIBAgIEOl5EOjANBgkqhkiG9w0BAQUFADA9MQswCQYDVQQGEwJzaTEbMBkGA1UEChMSc3RhdGUtaW5zdGl0dXRpb25zMREwDwYDVQQLEwhzaWdvdi1jYTAeFw0xMTEyMDgwOTU4MzhaFw0xNjEyMDgyMTQxNDFaMIGJMQswCQYDVQQGEwJzaTEbMBkGA1UEChMSc3RhdGUtaW5zdGl0dXRpb25zMRkwFwYDVQQLExB3ZWItY2VydGlmaWNhdGVzMRMwEQYDVQQLEwpHb3Zlcm5tZW50MS0wFAYDVQQFEw0xMjM0NjYyNjE0MDQ2MBUGA1UEAxMOTWFydXNrYSBEYW1qYW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMrQtDhrYKxtQeHBVfhfkB9q6axI0SmPwcIRqEFGWfhnPhQwvPa8vSrE3SBrJnKx3bxLHdw/hzM8hDfhsQM5rwDYN8qfVv1qnttITRlBZqd7qSzQeD/QegjC2yZMIun/e/Gjz450+oXoGlgiB9Ir9DRuqCDq/lmMuftjYUc8uWQj/YwpmQrJNqDymbTInuclDM8zB5eUc6x/7jWs2QxdleY0rOR3H9GAUFCUMQjSYbvZfy+ptCGB1adST4/5o6DBOBpKakbz4tmrroUYqf7YBXzImiPCcyQxYFADGUboWWQ8QYiVPgED37/wkO+XGeYehuQ0jY61DDjc9YubxMUTbtAgMBAAGjggItMIICKTAOBgNVHQ8BAf8EBAMCBaAwSgYDVR0gBEMwQTA1BgorBgEEAa9ZAQcBMCcwJQYIKwYBBQUHAgEWGWh0dHA6Ly93d3cuY2EuZ292LnNpL2Nwcy8wCAYGBACLMAEBMCIGCCsGAQUFBwEDBBYwFDAIBgYEAI5GAQEwCAYGBACORgEEMCAGA1UdEQQZMBeBFW1hcnVza2EuZGFtamFuQGdvdi5zaTCB8QYDVR0fBIHpMIHmMFWgU6BRpE8wTTELMAkGA1UEBhMCc2kxGzAZBgNVBAoTEnN0YXRlLWluc3RpdHV0aW9uczERMA8GA1UECxMIc2lnb3YtY2ExDjAMBgNVBAMTBUNSTDM0MIGMoIGJoIGGhldsZGFwOi8veDUwMC5nb3Yuc2kvb3U9c2lnb3YtY2Esbz1zdGF0ZS1pbnN0aXR1dGlvbnMsYz1zaT9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0P2Jhc2WGK2h0dHA6Ly93d3cuc2lnb3YtY2EuZ292LnNpL2NybC9zaWdvdi1jYS5jcmwwKwYDVR0QBCQwIoAPMjAxMTEyMDgwOTU4MzhagQ8yMDE2MTIwODIxNDE0MVowHwYDVR0jBBgwFoAUHvjUU2uzgwbpBAZXAvmlv8ZYPHIwHQYDVR0OBBYEFO2tqCIZmlWRrpJXC+r5nVGPwNaAMAkGA1UdEwQCMAAwGQYJKoZIhvZ9B0EABAwwChsEVjcuMQMCA6gwDQYJKoZIhvcNAQEFBQADggEBAJZvcjQy6OXcg/aHJRCwiKxyUZSXrazeyvBmkrrLK+2vMNyaFsJWQIIEKb9tWCrrQOXsBhzgGXLh5kr+Bt89pMANUYXanP5dlZo3A1h0xvfvGaKOhcZclZz+h4IGc/SBy9Xd/BJa9ttIqdSwH+8k29N4YhM9AIVb3vBszDDgLTU2xuFMIqDX+rbZnF9PmFbtKzGQjevOqG/4y61sZSa7pgPjhxTj4mqpK/AN40giiaRNJv+z3E9Xh71S4CriSeBW2GJsPS+v7dEw775fWPuQJEvDYZ1X754lmFp3RTOtlIqQTxCgajRF4O8mWEYb2BH3N64e8yEoaxvVHdbV9aUQ0Mg=</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.mizks.gov.si/fileadmin/mizks.gov.si/pageuploads/Storitve/Info_druzba/Overitelji/SI_TL.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>SI</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">Republic of Slovenia, Ministry of Education, Science and Sport </Name>
++                     <Name xml:lang="sl">Republika Slovenija, Ministrstvo za izobraževanje, znanost in šport </Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/SI</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIIczCCBlugAwIBAgICBmwwDQYJKoZIhvcNAQELBQAwbTELMAkGA1UEBhMCU0sxEzARBgNVBAcMCkJyYXRpc2xhdmExIjAgBgNVBAoMGU5hcm9kbnkgYmV6cGVjbm9zdG55IHVyYWQxDjAMBgNVBAsMBVNJQkVQMRUwEwYDVQQDDAxLQ0EgTkJVIFNSIDMwHhcNMTMwNjA2MDczMTMxWhcNMTYwNjA2MDcyODU3WjCBujELMAkGA1UEBhMCU0sxEzARBgNVBAcMCkJyYXRpc2xhdmExIjAgBgNVBAoMGU5hcm9kbnkgYmV6cGVjbm9zdG55IHVyYWQxDjAMBgNVBAsMBVNJQkVQMTYwNAYDVQQDDC1QU0VVRE9OWU0gLSBUU0wgYW5kIFNpZ25hdHVyZSBQb2xpY3kgU2lnbmVyIDExKjAoBgNVBEEMIVRTTCBhbmQgU2lnbmF0dXJlIFBvbGljeSBTaWduZXIgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKHmDywjm6aP89518zXEXya8W2OyiBCm3Dfvi5YNdI871Udr+zTpMN+44LlB6GxaBmbIBU5H8nZYguT4HMmZAOD7nbqjSkBhEwSxZFsjhK1zaZ+pzUDyEbGGbcAdbNPwnJk/sD+EA1cK9JrGIeeE0kA9ZbVtJoJr0++EYHBMJipmnV0PLw8yoHB0ABTtEPmSXx3XBKUexCVKVn3GrfVAuyNTeSlDkfkE/CDU0D6dihPlCyX+Mm0uvH6lYP3GPgOkdf3EPdQ3mUVO1P5yVZpzLJvgHDcTaX/V4jax4ZCbK2m5xdPmRm4ZXkbUDpqxauBsseiEFS2Ron0U8tOSZAi8OQECAwEAAaOCA80wggPJMAkGA1UdEwQCMAAwYgYDVR0gBFswWTBFBg0rgR6RmYQFAAAAAQICMDQwMgYIKwYBBQUHAgEWJmh0dHA6Ly9lcC5uYnVzci5zay9rY2EvZG9jL2tjYV9jcHMucGRmMBAGDiuBHpGZhAUAAAEKBQABMIIBQAYIKwYBBQUHAQEEggEyMIIBLjA/BggrBgEFBQcwAoYzaHR0cDovL2VwLm5idXNyLnNrL2tjYS9jZXJ0cy9rY2EzL2tjYW5idXNyM19wN2MucDdjMHoGCCsGAQUFBzAChm5sZGFwOi8vZXAubmJ1c3Iuc2svY249S0NBIE5CVSBTUiAzLG91PVNJQkVQLG89TmFyb2RueSBiZXpwZWNub3N0bnkgdXJhZCxsPUJyYXRpc2xhdmEsYz1TSz9jYUNlcnRpZmljYXRlO2JpbmFyeTBvBggrBgEFBQcwAoZjbGRhcDovLy9jbj1LQ0EgTkJVIFNSIDMsb3U9U0lCRVAsbz1OYXJvZG55IGJlenBlY25vc3RueSB1cmFkLGw9QnJhdGlzbGF2YSxjPVNLP2NhQ2VydGlmaWNhdGU7YmluYXJ5MFUGA1UdEQROMEyBEnBvZGF0ZWxuYUBuYnVzci5za4Y2aHR0cDovL3d3dy5uYnVzci5zay9lbi9lbGVjdHJvbmljLXNpZ25hdHVyZS9pbmRleC5odG1sMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHwYDVR0jBBgwFoAUf/E9IcKXWi6XBw6xaYMl/SGGPgcwggFYBgNVHR8EggFPMIIBSzAwoC6gLIYqaHR0cDovL2VwLm5idXNyLnNrL2tjYS9jcmxzMy9rY2FuYnVzcjMuY3JsMIGQoIGNoIGKhoGHbGRhcDovL2VwLm5idXNyLnNrL2NuJTNkS0NBJTIwTkJVJTIwU1IlMjAzLG91JTNkU0lCRVAsbyUzZE5hcm9kbnklMjBiZXpwZWNub3N0bnklMjB1cmFkLGwlM2RCcmF0aXNsYXZhLGMlM2RTSz9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0MIGDoIGAoH6GfGxkYXA6Ly8vY24lM2RLQ0ElMjBOQlUlMjBTUiUyMDMsb3UlM2RTSUJFUCxvJTNkTmFyb2RueSUyMGJlenBlY25vc3RueSUyMHVyYWQsbCUzZEJyYXRpc2xhdmEsYyUzZFNLP2NlcnRpZmljYXRlUmV2b2NhdGlvbkxpc3QwHQYDVR0OBBYEFAgnu/W6CgmsRiV2WoW5VfvvuHYqMA0GCSqGSIb3DQEBCwUAA4ICAQDLqnqpQ9NnzgtUA7nlRQxdQg12hG9jUZnE9Q2evihsa+nkajrx/ujK/DlG43RHV+xhbZayytbzkxnBKz3ujKk9UG2psdWbN+nN79TMucU1saJsdvj0qcvRGvBsA9wkNPYFP+0/uLN9K4aOgyNyVVNKbVDLuCgn9kOf2D89ldw0qdVkNZhTOnycE8iIgibSvT5HQwxKg0qb0cKz9XPgZKc5dSv5thoqWQgLUI0B2+Ize7ITZN6WmYg9LwKJo5A032ijpVYQ2U60Xj+wfN69nLF1UAZSUmLpt4HL2Ed5afIjkuQfd5jvzogyQgNkwJ4lKZTmNLrJoxFunibuBdv/jXBoMqXqxNdGxGuFr1ms8xyUNOCE7+e4DuI3tezBuv+yDwijUajwOu00hIW6bjCBXaedPXEznoeNxWiKAk0TpIHwmVQR9uggdCQKdrKvk0wPfNt1Hv69nodWipIcCvxiX/HZc3IHiv7KFpYwCGUKdGa7CDqFbGz351INLsfuYev9ylu0gltNujSEpulFYKAEwyGv3hTVN2vM17eoWl5dYNkiHJvmFTbx+5aF0LvXmUXlMOLMkLjB0KqUY4/GhikwIDVE/knrmyquecsrOAdlbOBJKJXYn2vB7Tf6QAG3V1hJOHkWpOvBWMtD0kPpuri7nptjsPMRR7E5k2DnbyJPxX4uQg==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIIczCCBlugAwIBAgICBm0wDQYJKoZIhvcNAQELBQAwbTELMAkGA1UEBhMCU0sxEzARBgNVBAcMCkJyYXRpc2xhdmExIjAgBgNVBAoMGU5hcm9kbnkgYmV6cGVjbm9zdG55IHVyYWQxDjAMBgNVBAsMBVNJQkVQMRUwEwYDVQQDDAxLQ0EgTkJVIFNSIDMwHhcNMTMwNjA2MDc0MDE0WhcNMTYwOTA2MDczOTEzWjCBujELMAkGA1UEBhMCU0sxEzARBgNVBAcMCkJyYXRpc2xhdmExIjAgBgNVBAoMGU5hcm9kbnkgYmV6cGVjbm9zdG55IHVyYWQxDjAMBgNVBAsMBVNJQkVQMTYwNAYDVQQDDC1QU0VVRE9OWU0gLSBUU0wgYW5kIFNpZ25hdHVyZSBQb2xpY3kgU2lnbmVyIDIxKjAoBgNVBEEMIVRTTCBhbmQgU2lnbmF0dXJlIFBvbGljeSBTaWduZXIgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOoNixEp0esybJLfVKXdo/aBuXA4GthgVl7luflgPASj8N5897b3qbapcPxRtWfjotv28ewCSqPAEh0PrNrBD+jyNKOjpXoGYOyvwkBIx6YygG2duhWVg54IIuvmoXsjOyBzzOHvtbJO2P27Hu8QU3dQf3px3hB86CyqRydhVsVaOGwfBAAZ0WbN0NVQMWYo7X3xx95Wh34eAOvLEjT5qgjGsihTH4MQ3vWEpEJbev5JE3QkGi6DzZc+FCNlJToPYInFJsrb+rkjf/7BhdDperTvbOvNhmhLcDqUzvjXtKEHQtfz2teBsFkzatOcAhZqAZeYNOiaHPMu4BMF1XZKqkECAwEAAaOCA80wggPJMAkGA1UdEwQCMAAwYgYDVR0gBFswWTBFBg0rgR6RmYQFAAAAAQICMDQwMgYIKwYBBQUHAgEWJmh0dHA6Ly9lcC5uYnVzci5zay9rY2EvZG9jL2tjYV9jcHMucGRmMBAGDiuBHpGZhAUAAAEKBQABMIIBQAYIKwYBBQUHAQEEggEyMIIBLjA/BggrBgEFBQcwAoYzaHR0cDovL2VwLm5idXNyLnNrL2tjYS9jZXJ0cy9rY2EzL2tjYW5idXNyM19wN2MucDdjMHoGCCsGAQUFBzAChm5sZGFwOi8vZXAubmJ1c3Iuc2svY249S0NBIE5CVSBTUiAzLG91PVNJQkVQLG89TmFyb2RueSBiZXpwZWNub3N0bnkgdXJhZCxsPUJyYXRpc2xhdmEsYz1TSz9jYUNlcnRpZmljYXRlO2JpbmFyeTBvBggrBgEFBQcwAoZjbGRhcDovLy9jbj1LQ0EgTkJVIFNSIDMsb3U9U0lCRVAsbz1OYXJvZG55IGJlenBlY25vc3RueSB1cmFkLGw9QnJhdGlzbGF2YSxjPVNLP2NhQ2VydGlmaWNhdGU7YmluYXJ5MFUGA1UdEQROMEyBEnBvZGF0ZWxuYUBuYnVzci5za4Y2aHR0cDovL3d3dy5uYnVzci5zay9lbi9lbGVjdHJvbmljLXNpZ25hdHVyZS9pbmRleC5odG1sMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHwYDVR0jBBgwFoAUf/E9IcKXWi6XBw6xaYMl/SGGPgcwggFYBgNVHR8EggFPMIIBSzAwoC6gLIYqaHR0cDovL2VwLm5idXNyLnNrL2tjYS9jcmxzMy9rY2FuYnVzcjMuY3JsMIGQoIGNoIGKhoGHbGRhcDovL2VwLm5idXNyLnNrL2NuJTNkS0NBJTIwTkJVJTIwU1IlMjAzLG91JTNkU0lCRVAsbyUzZE5hcm9kbnklMjBiZXpwZWNub3N0bnklMjB1cmFkLGwlM2RCcmF0aXNsYXZhLGMlM2RTSz9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0MIGDoIGAoH6GfGxkYXA6Ly8vY24lM2RLQ0ElMjBOQlUlMjBTUiUyMDMsb3UlM2RTSUJFUCxvJTNkTmFyb2RueSUyMGJlenBlY25vc3RueSUyMHVyYWQsbCUzZEJyYXRpc2xhdmEsYyUzZFNLP2NlcnRpZmljYXRlUmV2b2NhdGlvbkxpc3QwHQYDVR0OBBYEFE2lEI6SH/G8y1Qze4eFD6iP1924MA0GCSqGSIb3DQEBCwUAA4ICAQAbSmmukMl9d/8FJnpQEMpqUfnhHV+0USPQc31C+eqAH7cZkBgKQXJc7xW1Q5stTnpvqrp5OcbCGtnFNHRm1PUf64S/hoAnDfmk3teQbGjgkrg5VFBMsf/dzBhZTRetbGx1tzt2M/gxh45vsJhA958O0S5haT1/VytnOXMSh2SrxIDqzMzZCAl5UBUuuifC0nElfwrgvYkYwqd2jz4pbixEqUNzHJMEf92MayJwW/FUAeP9VW03K3ox4pHkL5IO8NtSCOQPE66tUgXW/kC1zI3iqtt5z4mdwGVPNWLFeRWVlTXLuZNAfVu/nzOJAinLkRWZO94c340nJ39A1McB2TgPsN/82EOC0dtSZo7WEvWZRZdxiLHbNSyuLdwFX9kV8E0PcrQD21MPeFWxHH5iIxUPM3Banuvoqan7u9zAR8E5/8AKuJEHQriwm/7FXMuiffjqsbAeQM0fTGdTkHTRi8wiqN/2HFgBvT3gSmy3MsYFqMlamchHtmjpNlB7FVE3i+yXNFikDcoon56gUOQFvcau+WpdS3xjO1wZjY4GP0eIeUpeclG7NV49ky65d3LJE1sWBpztFLanMU7bI08TIBt5oeNwnnz0gSc76FHJHzuFsA67MjuQAhy19dpAsy6z4Mztel31HwQ83OULzegqiVvIUVxS1mOPhWzGBsOIH0B8Bg==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://ep.nbusr.sk/kca/tsl/tsl_hrf.zip</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>SK</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/pdf</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">NATIONAL SECURITY AUTHORITY</Name>
++                     <Name xml:lang="sk">NÁRODNÝ BEZPEČNOSTNÝ ÚRAD</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/SK</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIIczCCBlugAwIBAgICBmwwDQYJKoZIhvcNAQELBQAwbTELMAkGA1UEBhMCU0sxEzARBgNVBAcMCkJyYXRpc2xhdmExIjAgBgNVBAoMGU5hcm9kbnkgYmV6cGVjbm9zdG55IHVyYWQxDjAMBgNVBAsMBVNJQkVQMRUwEwYDVQQDDAxLQ0EgTkJVIFNSIDMwHhcNMTMwNjA2MDczMTMxWhcNMTYwNjA2MDcyODU3WjCBujELMAkGA1UEBhMCU0sxEzARBgNVBAcMCkJyYXRpc2xhdmExIjAgBgNVBAoMGU5hcm9kbnkgYmV6cGVjbm9zdG55IHVyYWQxDjAMBgNVBAsMBVNJQkVQMTYwNAYDVQQDDC1QU0VVRE9OWU0gLSBUU0wgYW5kIFNpZ25hdHVyZSBQb2xpY3kgU2lnbmVyIDExKjAoBgNVBEEMIVRTTCBhbmQgU2lnbmF0dXJlIFBvbGljeSBTaWduZXIgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKHmDywjm6aP89518zXEXya8W2OyiBCm3Dfvi5YNdI871Udr+zTpMN+44LlB6GxaBmbIBU5H8nZYguT4HMmZAOD7nbqjSkBhEwSxZFsjhK1zaZ+pzUDyEbGGbcAdbNPwnJk/sD+EA1cK9JrGIeeE0kA9ZbVtJoJr0++EYHBMJipmnV0PLw8yoHB0ABTtEPmSXx3XBKUexCVKVn3GrfVAuyNTeSlDkfkE/CDU0D6dihPlCyX+Mm0uvH6lYP3GPgOkdf3EPdQ3mUVO1P5yVZpzLJvgHDcTaX/V4jax4ZCbK2m5xdPmRm4ZXkbUDpqxauBsseiEFS2Ron0U8tOSZAi8OQECAwEAAaOCA80wggPJMAkGA1UdEwQCMAAwYgYDVR0gBFswWTBFBg0rgR6RmYQFAAAAAQICMDQwMgYIKwYBBQUHAgEWJmh0dHA6Ly9lcC5uYnVzci5zay9rY2EvZG9jL2tjYV9jcHMucGRmMBAGDiuBHpGZhAUAAAEKBQABMIIBQAYIKwYBBQUHAQEEggEyMIIBLjA/BggrBgEFBQcwAoYzaHR0cDovL2VwLm5idXNyLnNrL2tjYS9jZXJ0cy9rY2EzL2tjYW5idXNyM19wN2MucDdjMHoGCCsGAQUFBzAChm5sZGFwOi8vZXAubmJ1c3Iuc2svY249S0NBIE5CVSBTUiAzLG91PVNJQkVQLG89TmFyb2RueSBiZXpwZWNub3N0bnkgdXJhZCxsPUJyYXRpc2xhdmEsYz1TSz9jYUNlcnRpZmljYXRlO2JpbmFyeTBvBggrBgEFBQcwAoZjbGRhcDovLy9jbj1LQ0EgTkJVIFNSIDMsb3U9U0lCRVAsbz1OYXJvZG55IGJlenBlY25vc3RueSB1cmFkLGw9QnJhdGlzbGF2YSxjPVNLP2NhQ2VydGlmaWNhdGU7YmluYXJ5MFUGA1UdEQROMEyBEnBvZGF0ZWxuYUBuYnVzci5za4Y2aHR0cDovL3d3dy5uYnVzci5zay9lbi9lbGVjdHJvbmljLXNpZ25hdHVyZS9pbmRleC5odG1sMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHwYDVR0jBBgwFoAUf/E9IcKXWi6XBw6xaYMl/SGGPgcwggFYBgNVHR8EggFPMIIBSzAwoC6gLIYqaHR0cDovL2VwLm5idXNyLnNrL2tjYS9jcmxzMy9rY2FuYnVzcjMuY3JsMIGQoIGNoIGKhoGHbGRhcDovL2VwLm5idXNyLnNrL2NuJTNkS0NBJTIwTkJVJTIwU1IlMjAzLG91JTNkU0lCRVAsbyUzZE5hcm9kbnklMjBiZXpwZWNub3N0bnklMjB1cmFkLGwlM2RCcmF0aXNsYXZhLGMlM2RTSz9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0MIGDoIGAoH6GfGxkYXA6Ly8vY24lM2RLQ0ElMjBOQlUlMjBTUiUyMDMsb3UlM2RTSUJFUCxvJTNkTmFyb2RueSUyMGJlenBlY25vc3RueSUyMHVyYWQsbCUzZEJyYXRpc2xhdmEsYyUzZFNLP2NlcnRpZmljYXRlUmV2b2NhdGlvbkxpc3QwHQYDVR0OBBYEFAgnu/W6CgmsRiV2WoW5VfvvuHYqMA0GCSqGSIb3DQEBCwUAA4ICAQDLqnqpQ9NnzgtUA7nlRQxdQg12hG9jUZnE9Q2evihsa+nkajrx/ujK/DlG43RHV+xhbZayytbzkxnBKz3ujKk9UG2psdWbN+nN79TMucU1saJsdvj0qcvRGvBsA9wkNPYFP+0/uLN9K4aOgyNyVVNKbVDLuCgn9kOf2D89ldw0qdVkNZhTOnycE8iIgibSvT5HQwxKg0qb0cKz9XPgZKc5dSv5thoqWQgLUI0B2+Ize7ITZN6WmYg9LwKJo5A032ijpVYQ2U60Xj+wfN69nLF1UAZSUmLpt4HL2Ed5afIjkuQfd5jvzogyQgNkwJ4lKZTmNLrJoxFunibuBdv/jXBoMqXqxNdGxGuFr1ms8xyUNOCE7+e4DuI3tezBuv+yDwijUajwOu00hIW6bjCBXaedPXEznoeNxWiKAk0TpIHwmVQR9uggdCQKdrKvk0wPfNt1Hv69nodWipIcCvxiX/HZc3IHiv7KFpYwCGUKdGa7CDqFbGz351INLsfuYev9ylu0gltNujSEpulFYKAEwyGv3hTVN2vM17eoWl5dYNkiHJvmFTbx+5aF0LvXmUXlMOLMkLjB0KqUY4/GhikwIDVE/knrmyquecsrOAdlbOBJKJXYn2vB7Tf6QAG3V1hJOHkWpOvBWMtD0kPpuri7nptjsPMRR7E5k2DnbyJPxX4uQg==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIIczCCBlugAwIBAgICBm0wDQYJKoZIhvcNAQELBQAwbTELMAkGA1UEBhMCU0sxEzARBgNVBAcMCkJyYXRpc2xhdmExIjAgBgNVBAoMGU5hcm9kbnkgYmV6cGVjbm9zdG55IHVyYWQxDjAMBgNVBAsMBVNJQkVQMRUwEwYDVQQDDAxLQ0EgTkJVIFNSIDMwHhcNMTMwNjA2MDc0MDE0WhcNMTYwOTA2MDczOTEzWjCBujELMAkGA1UEBhMCU0sxEzARBgNVBAcMCkJyYXRpc2xhdmExIjAgBgNVBAoMGU5hcm9kbnkgYmV6cGVjbm9zdG55IHVyYWQxDjAMBgNVBAsMBVNJQkVQMTYwNAYDVQQDDC1QU0VVRE9OWU0gLSBUU0wgYW5kIFNpZ25hdHVyZSBQb2xpY3kgU2lnbmVyIDIxKjAoBgNVBEEMIVRTTCBhbmQgU2lnbmF0dXJlIFBvbGljeSBTaWduZXIgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOoNixEp0esybJLfVKXdo/aBuXA4GthgVl7luflgPASj8N5897b3qbapcPxRtWfjotv28ewCSqPAEh0PrNrBD+jyNKOjpXoGYOyvwkBIx6YygG2duhWVg54IIuvmoXsjOyBzzOHvtbJO2P27Hu8QU3dQf3px3hB86CyqRydhVsVaOGwfBAAZ0WbN0NVQMWYo7X3xx95Wh34eAOvLEjT5qgjGsihTH4MQ3vWEpEJbev5JE3QkGi6DzZc+FCNlJToPYInFJsrb+rkjf/7BhdDperTvbOvNhmhLcDqUzvjXtKEHQtfz2teBsFkzatOcAhZqAZeYNOiaHPMu4BMF1XZKqkECAwEAAaOCA80wggPJMAkGA1UdEwQCMAAwYgYDVR0gBFswWTBFBg0rgR6RmYQFAAAAAQICMDQwMgYIKwYBBQUHAgEWJmh0dHA6Ly9lcC5uYnVzci5zay9rY2EvZG9jL2tjYV9jcHMucGRmMBAGDiuBHpGZhAUAAAEKBQABMIIBQAYIKwYBBQUHAQEEggEyMIIBLjA/BggrBgEFBQcwAoYzaHR0cDovL2VwLm5idXNyLnNrL2tjYS9jZXJ0cy9rY2EzL2tjYW5idXNyM19wN2MucDdjMHoGCCsGAQUFBzAChm5sZGFwOi8vZXAubmJ1c3Iuc2svY249S0NBIE5CVSBTUiAzLG91PVNJQkVQLG89TmFyb2RueSBiZXpwZWNub3N0bnkgdXJhZCxsPUJyYXRpc2xhdmEsYz1TSz9jYUNlcnRpZmljYXRlO2JpbmFyeTBvBggrBgEFBQcwAoZjbGRhcDovLy9jbj1LQ0EgTkJVIFNSIDMsb3U9U0lCRVAsbz1OYXJvZG55IGJlenBlY25vc3RueSB1cmFkLGw9QnJhdGlzbGF2YSxjPVNLP2NhQ2VydGlmaWNhdGU7YmluYXJ5MFUGA1UdEQROMEyBEnBvZGF0ZWxuYUBuYnVzci5za4Y2aHR0cDovL3d3dy5uYnVzci5zay9lbi9lbGVjdHJvbmljLXNpZ25hdHVyZS9pbmRleC5odG1sMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwHwYDVR0jBBgwFoAUf/E9IcKXWi6XBw6xaYMl/SGGPgcwggFYBgNVHR8EggFPMIIBSzAwoC6gLIYqaHR0cDovL2VwLm5idXNyLnNrL2tjYS9jcmxzMy9rY2FuYnVzcjMuY3JsMIGQoIGNoIGKhoGHbGRhcDovL2VwLm5idXNyLnNrL2NuJTNkS0NBJTIwTkJVJTIwU1IlMjAzLG91JTNkU0lCRVAsbyUzZE5hcm9kbnklMjBiZXpwZWNub3N0bnklMjB1cmFkLGwlM2RCcmF0aXNsYXZhLGMlM2RTSz9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0MIGDoIGAoH6GfGxkYXA6Ly8vY24lM2RLQ0ElMjBOQlUlMjBTUiUyMDMsb3UlM2RTSUJFUCxvJTNkTmFyb2RueSUyMGJlenBlY25vc3RueSUyMHVyYWQsbCUzZEJyYXRpc2xhdmEsYyUzZFNLP2NlcnRpZmljYXRlUmV2b2NhdGlvbkxpc3QwHQYDVR0OBBYEFE2lEI6SH/G8y1Qze4eFD6iP1924MA0GCSqGSIb3DQEBCwUAA4ICAQAbSmmukMl9d/8FJnpQEMpqUfnhHV+0USPQc31C+eqAH7cZkBgKQXJc7xW1Q5stTnpvqrp5OcbCGtnFNHRm1PUf64S/hoAnDfmk3teQbGjgkrg5VFBMsf/dzBhZTRetbGx1tzt2M/gxh45vsJhA958O0S5haT1/VytnOXMSh2SrxIDqzMzZCAl5UBUuuifC0nElfwrgvYkYwqd2jz4pbixEqUNzHJMEf92MayJwW/FUAeP9VW03K3ox4pHkL5IO8NtSCOQPE66tUgXW/kC1zI3iqtt5z4mdwGVPNWLFeRWVlTXLuZNAfVu/nzOJAinLkRWZO94c340nJ39A1McB2TgPsN/82EOC0dtSZo7WEvWZRZdxiLHbNSyuLdwFX9kV8E0PcrQD21MPeFWxHH5iIxUPM3Banuvoqan7u9zAR8E5/8AKuJEHQriwm/7FXMuiffjqsbAeQM0fTGdTkHTRi8wiqN/2HFgBvT3gSmy3MsYFqMlamchHtmjpNlB7FVE3i+yXNFikDcoon56gUOQFvcau+WpdS3xjO1wZjY4GP0eIeUpeclG7NV49ky65d3LJE1sWBpztFLanMU7bI08TIBt5oeNwnnz0gSc76FHJHzuFsA67MjuQAhy19dpAsy6z4Mztel31HwQ83OULzegqiVvIUVxS1mOPhWzGBsOIH0B8Bg==</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://ep.nbusr.sk/kca/tsl/tsl.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>SK</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">NATIONAL SECURITY AUTHORITY</Name>
++                     <Name xml:lang="sk">NÁRODNÝ BEZPEČNOSTNÝ ÚRAD</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/SK</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIDdzCCAl+gAwIBAgIFFATw0YMwDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCVUsxGDAWBgNVBAoMD3RTY2hlbWUgTGltaXRlZDEMMAoGA1UECwwDUEtJMRQwEgYDVQQDDAtUU0wgU2lnbmluZzAeFw0xNDAyMjAwMDAwMDBaFw0xNzAyMjAwMDAwMDBaMEsxCzAJBgNVBAYTAlVLMRgwFgYDVQQKDA90U2NoZW1lIExpbWl0ZWQxDDAKBgNVBAsMA1BLSTEUMBIGA1UEAwwLVFNMIFNpZ25pbmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKDMc2PgyQPNCRsjk2F/Lt7THy0lDmfFvYDiu8U1+5NN4Cdh/JKq87GlcqUWOK4/CS/evFqWXZQrHMeyFqG17zbTSheCqER0PwuYELgKLRTC9V9vX8GbVQ3Qh/JySDB+yiIR4dXNBku8Gb7zjD0OxykAyHyWlf/4i3T1dpJZpXqMKweT5N7+d2XT+Lzn7iNJA/VN23uYyQf7o4YGdVvvZx5ApxOQx5sSXEtprELYTy7C06QGAiE0Q9x5MjnsNMyWsrZn7T6kWEM0Ks4R/CFOlj5iG3a1kNSSWgVSBfmyW4U5MV2RzOHUFRuZT8q6UfKzP+0QAaQ42X6hbupFwNWMCPAgMBAAGjYjBgMB0GA1UdDgQWBBQUF9oFLo/KTZ+wgaTuLp8QixYGUjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSAECjAIMAYGBFUdIAAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQCfA8F1bhDJotAv1AqNVh8ApFQZibSBiIDpctqR63DfDQjWupeoAr7TCDEZqOLgDdBTMiOBKgXVGc/p+hmSbxR+EukBix96Q+RfVgGoMwHCb8L3h/g2Gp0QFXDMGltPcXQDAJ4WofFmze7CfO/Bv9vLeGn0Xy1Xou7QjcCMnfGekf3XPX/U8m/tuxm80wlNIn9ZWfPHKoobsj3OerZtI2HgWU1ihDLD+aybZ5Imfk79zFj4ZshAJXDDhDEsCV/XgUTZzg9DJguztve+cnAGdx1x/BomvFEUgkAbSbsmwu9SFKj0nOb6ksvj3yYU0hTZrpIwQlGdxj4wJ5g6OCJFUob5</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIDdzCCAl+gAwIBAgIFFJV9MCIwDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCVUsxGDAWBgNVBAoMD3RTY2hlbWUgTGltaXRlZDEMMAoGA1UECwwDUEtJMRQwEgYDVQQDDAtUU0wgU2lnbmluZzAeFw0xNDA4MDgwMDAwMDBaFw0xNzA4MDgwMDAwMDBaMEsxCzAJBgNVBAYTAlVLMRgwFgYDVQQKDA90U2NoZW1lIExpbWl0ZWQxDDAKBgNVBAsMA1BLSTEUMBIGA1UEAwwLVFNMIFNpZ25pbmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCy58lOvYY2WC2k1sHf6KFkeHUmEMGR/dmU4hGPHmibbnOcqCW5kQQ1uewp+6tkUt1OqtVCrVI4NtzSNKWKqS79SoIKe7r6hJ2yIskY3VlGQrk2wI4nW2QyOBX3Pum+RIQdqrYz/OrSWe3NCiHwZBmW0a7WMVWOuiNBZN3rtC+kUXDdgBXVaqcsKnU3HUMKfeJ0xYnAOnqJwX5/9EoHdeAr3xnCRT/bJO3jkm4FuTAFHWLWfdJQvMZ+Z0+TDAPZj9t9+5RKwdMc0f4Nou9SYywLRnv82MIH69EfUswAHMdM+3kcg16VL3d0gUxy3qOnsh+TxdW3uBfB62eJPJv1gwXBAgMBAAGjYjBgMB0GA1UdDgQWBBQ38XfUZwvT/+xQFcoUt8NuodH4tTAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSAECjAIMAYGBFUdIAAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQAFK6WJ8yL8aa+c6JV3F/N6JWwKNcjzHYaI+WgWsltQOUtrrPMf9zBMpTq3AeNHYfNB1+uTRaFmtLA0XIBYcfu7J0CsDXhl5nUS4Ev5qcSzHyupuZQ2j+zLD9uCFbiDaa6Y64CQ8jbhD7ZemgA1KdmmR3+uadjFu13eZ+ZyfwyeYH4zMiqOkXCZ1eNwUrzAhhhPAvR6CFYv6Ea1/2Y6TXCJBEB0QBrXPs6q2oYzDOcwE0kfMMcWbA86dHpMkCJ22wUypqiiXCmPDkiCdbUE+QG2+fOnkiSQOtp7uncr1EVyb0hxmDD6LOlGQIl73SoeA1C5FQv5CTwyWaHSAt2UK2Ac</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.tscheme.org/UK_TSL/HR_TSL-UKsigned.pdf</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>UK</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/pdf</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">tScheme Limited</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/UK</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++         <OtherTSLPointer>
++            <ServiceDigitalIdentities>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIDdzCCAl+gAwIBAgIFFATw0YMwDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCVUsxGDAWBgNVBAoMD3RTY2hlbWUgTGltaXRlZDEMMAoGA1UECwwDUEtJMRQwEgYDVQQDDAtUU0wgU2lnbmluZzAeFw0xNDAyMjAwMDAwMDBaFw0xNzAyMjAwMDAwMDBaMEsxCzAJBgNVBAYTAlVLMRgwFgYDVQQKDA90U2NoZW1lIExpbWl0ZWQxDDAKBgNVBAsMA1BLSTEUMBIGA1UEAwwLVFNMIFNpZ25pbmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKDMc2PgyQPNCRsjk2F/Lt7THy0lDmfFvYDiu8U1+5NN4Cdh/JKq87GlcqUWOK4/CS/evFqWXZQrHMeyFqG17zbTSheCqER0PwuYELgKLRTC9V9vX8GbVQ3Qh/JySDB+yiIR4dXNBku8Gb7zjD0OxykAyHyWlf/4i3T1dpJZpXqMKweT5N7+d2XT+Lzn7iNJA/VN23uYyQf7o4YGdVvvZx5ApxOQx5sSXEtprELYTy7C06QGAiE0Q9x5MjnsNMyWsrZn7T6kWEM0Ks4R/CFOlj5iG3a1kNSSWgVSBfmyW4U5MV2RzOHUFRuZT8q6UfKzP+0QAaQ42X6hbupFwNWMCPAgMBAAGjYjBgMB0GA1UdDgQWBBQUF9oFLo/KTZ+wgaTuLp8QixYGUjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSAECjAIMAYGBFUdIAAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQCfA8F1bhDJotAv1AqNVh8ApFQZibSBiIDpctqR63DfDQjWupeoAr7TCDEZqOLgDdBTMiOBKgXVGc/p+hmSbxR+EukBix96Q+RfVgGoMwHCb8L3h/g2Gp0QFXDMGltPcXQDAJ4WofFmze7CfO/Bv9vLeGn0Xy1Xou7QjcCMnfGekf3XPX/U8m/tuxm80wlNIn9ZWfPHKoobsj3OerZtI2HgWU1ihDLD+aybZ5Imfk79zFj4ZshAJXDDhDEsCV/XgUTZzg9DJguztve+cnAGdx1x/BomvFEUgkAbSbsmwu9SFKj0nOb6ksvj3yYU0hTZrpIwQlGdxj4wJ5g6OCJFUob5</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++               <ServiceDigitalIdentity>
++                  <DigitalId>
++                     <X509Certificate>MIIDdzCCAl+gAwIBAgIFFJV9MCIwDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCVUsxGDAWBgNVBAoMD3RTY2hlbWUgTGltaXRlZDEMMAoGA1UECwwDUEtJMRQwEgYDVQQDDAtUU0wgU2lnbmluZzAeFw0xNDA4MDgwMDAwMDBaFw0xNzA4MDgwMDAwMDBaMEsxCzAJBgNVBAYTAlVLMRgwFgYDVQQKDA90U2NoZW1lIExpbWl0ZWQxDDAKBgNVBAsMA1BLSTEUMBIGA1UEAwwLVFNMIFNpZ25pbmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCy58lOvYY2WC2k1sHf6KFkeHUmEMGR/dmU4hGPHmibbnOcqCW5kQQ1uewp+6tkUt1OqtVCrVI4NtzSNKWKqS79SoIKe7r6hJ2yIskY3VlGQrk2wI4nW2QyOBX3Pum+RIQdqrYz/OrSWe3NCiHwZBmW0a7WMVWOuiNBZN3rtC+kUXDdgBXVaqcsKnU3HUMKfeJ0xYnAOnqJwX5/9EoHdeAr3xnCRT/bJO3jkm4FuTAFHWLWfdJQvMZ+Z0+TDAPZj9t9+5RKwdMc0f4Nou9SYywLRnv82MIH69EfUswAHMdM+3kcg16VL3d0gUxy3qOnsh+TxdW3uBfB62eJPJv1gwXBAgMBAAGjYjBgMB0GA1UdDgQWBBQ38XfUZwvT/+xQFcoUt8NuodH4tTAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSAECjAIMAYGBFUdIAAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQAFK6WJ8yL8aa+c6JV3F/N6JWwKNcjzHYaI+WgWsltQOUtrrPMf9zBMpTq3AeNHYfNB1+uTRaFmtLA0XIBYcfu7J0CsDXhl5nUS4Ev5qcSzHyupuZQ2j+zLD9uCFbiDaa6Y64CQ8jbhD7ZemgA1KdmmR3+uadjFu13eZ+ZyfwyeYH4zMiqOkXCZ1eNwUrzAhhhPAvR6CFYv6Ea1/2Y6TXCJBEB0QBrXPs6q2oYzDOcwE0kfMMcWbA86dHpMkCJ22wUypqiiXCmPDkiCdbUE+QG2+fOnkiSQOtp7uncr1EVyb0hxmDD6LOlGQIl73SoeA1C5FQv5CTwyWaHSAt2UK2Ac</X509Certificate>
++                  </DigitalId>
++               </ServiceDigitalIdentity>
++            </ServiceDigitalIdentities>
++            <TSLLocation>http://www.tscheme.org/UK_TSL/TSL-UKsigned.xml</TSLLocation>
++            <AdditionalInformation>
++               <OtherInformation>
++                  <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTerritory>UK</SchemeTerritory>
++               </OtherInformation>
++               <OtherInformation>
++                  <ns3:MimeType>application/vnd.etsi.tsl+xml</ns3:MimeType>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeOperatorName>
++                     <Name xml:lang="en">tScheme Limited</Name>
++                  </SchemeOperatorName>
++               </OtherInformation>
++               <OtherInformation>
++                  <SchemeTypeCommunityRules>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/UK</URI>
++                     <URI xml:lang="en">http://uri.etsi.org/TrstSvc/TrustedList/schemerules/EUcommon</URI>
++                  </SchemeTypeCommunityRules>
++               </OtherInformation>
++            </AdditionalInformation>
++         </OtherTSLPointer>
++      </PointersToOtherTSL>
++      <ListIssueDateTime>2016-04-08T11:15:22Z</ListIssueDateTime>
++      <NextUpdate>
++         <dateTime>2016-09-08T11:15:22Z</dateTime>
++      </NextUpdate>
++      <DistributionPoints>
++         <URI>https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-mp.xml</URI>
++      </DistributionPoints>
++   </SchemeInformation>
++<ds:Signature Id="Signature_1460109636374" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo Id="Signature_1460109636374-SignedInfo"><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><ds:Reference URI="" Id="Signature_1460109636374-Reference-0"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><ds:DigestValue>37nyW1VCJ9iJU1HQ1gha3oqrWWH0ROCx5SXv5W4VKKo=</ds:DigestValue></ds:Reference><ds:Reference URI="#Signature_1460109636374_SignedProperties" Type="http://uri.etsi.org/01903#SignedProperties"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><ds:DigestValue>ypmo0YajX2NiF1H2NUkLxNLB8VeDlcIbuGRcZK3Az78=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue Id="Signature_1460109636374_Value">SW5cMZ+lDTJg+s4PdiUdy1LN/S312cFgSAemeFn5bT+retkMQFdypn8G4wZ/YtkXHmfmx4MBKbjob5o7WS3/7LfsyAbs1QDLKB5CcuPZ6zh6X7uM3+NKRcfSasQ0Mt9/YdO8Cn6qweDI5T6mzU1EgknTOx/gu9S9l0I9BDagEEjL8/pG3qPLsevmz4KoK/mfyj/yJ2U2/muV/66HlMNIIVJjyos8CHpCIE5qFef6PjLxLZ4TYG+v/8F2vyhDx86um+nFPGf3SuZMNg6akXDqoKAftbK9w0xjDwKVJUcckG9XrKRJC3JhIjEwiZL5PJYhulk+wmExexKb2REkbuOmUg==</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIGgTCCBGmgAwIBAgIUeaHFHm5f58zYv20JfspVJ3hossYwDQYJKoZIhvcNAQEFBQAwgZIxCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEoMCYGA1UECxMfSXNzdWluZyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTE3MDUGA1UEAxMuUXVvVmFkaXMgRVUgSXNzdWluZyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBHMjAeFw0xMzEwMzAxMjI3MTFaFw0xNjEwMzAxMjI3MTFaMHoxCzAJBgNVBAYTAkJFMRAwDgYDVQQIEwdCcnVzc2VsMRIwEAYDVQQHEwlFdHRlcmJlZWsxHDAaBgNVBAoTE0V1cm9wZWFuIENvbW1pc3Npb24xFDASBgNVBAsTC0luZm9ybWF0aWNzMREwDwYDVQQDDAhFQ19ESUdJVDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJgkkqvJmZaknQC7c6H6LEr3dGtQ5IfOB3HAZZxOZbb8tdM1KMTO3sAifJC5HNFeIWd0727uZj+V5kBrUv36zEs+VxiN1yJBmcJznX4J2TCyPfLk2NRELGu65VwrK2Whp8cLLANc+6pQn/5wKh23ehZm21mLXcicZ8whksUGb/h8p6NDe1cElD6veNc9CwwK2QT0G0mQiEYchqjJkqyY8HEak8t+CbIC4Rrhyxh3HI1fCK0WKS9JjbPQFbvGmfpBZuLPYZYzP4UXIqfBVYctyodcSAnSfmy6tySMqpVSRhjRn4KP0EfHlq7Ec+H3nwuqxd0M4vTJlZm+XwYJBzEFzFsCAwEAAaOCAeQwggHgMFgGA1UdIARRME8wCAYGBACLMAECMEMGCisGAQQBvlgBgxAwNTAzBggrBgEFBQcCARYnaHR0cDovL3d3dy5xdW92YWRpc2dsb2JhbC5ubC9kb2N1bWVudGVuMCQGCCsGAQUFBwEDBBgwFjAKBggrBgEFBQcLAjAIBgYEAI5GAQEwdAYIKwYBBQUHAQEEaDBmMCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly90cnVzdC5xdW92YWRpc2dsb2JhbC5jb20vcXZldWNhZzIuY3J0MEYGCiqGSIb3LwEBCQEEODA2AgEBhjFodHRwOi8vdHNhMDEucXVvdmFkaXNnbG9iYWwuY29tL1RTUy9IdHRwVHNwU2VydmVyMBMGCiqGSIb3LwEBCQIEBTADAgEBMA4GA1UdDwEB/wQEAwIGQDAfBgNVHSMEGDAWgBTg+A751LXyf0kjtsN5x6M1H4Z6iDA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdmV1Y2FnMi5jcmwwHQYDVR0OBBYEFDc3hgIFJTDamDEeQczI7Lot4uaVMA0GCSqGSIb3DQEBBQUAA4ICAQAZ8EZ48RgPimWY6s4LjZf0M2MfVJmNh06Jzmf6fzwYtDtQLKzIDk8ZtosqYpNNBoZIFICMZguGRAP3kuxWvwANmrb5HqyCzXThZVPJTmKEzZNhsDtKu1almYBszqX1UV7IgZp+jBZ7FyXzXrXyF1tzXQxHGobDV3AEE8vdzEZtwDGpZJPnEPCBzifdY+lrrL2rDBjbv0VeildgOP1SIlL7dh1O9f0T6T4ioS6uSdMt6b/OWjqHadsSpKry0A6pqfOqJWAhDiueqgVB7vus6o6sSmfG4SW9EWW+BEZ510HjlQU/JL3PPmf+Xs8s00sm77LJ/T/1hMUuGp6TtDsJe+pPBpCYvpm6xu9GL20CsArFWUeQ2MSnE1jsrb00UniCKslcM63pU7I0VcnWMJQSNY28OmnFESPK6s6zqoN0ZMLhwCVnahi6pouBwTb10M9/Anla9xOT42qxiLr14S2lHy18aLiBSQ4zJKNLqKvIrkjewSfW+00VLBYbPTmtrHpZUWiCGiRS2SviuEmPVbdWvsBUaq7OMLIfBD4nin1FlmYnaG9TVmWkwVYDsFmQepwPDqjPs4efAxzkgUFHWn0gQFbqxRocKrCsOvCDHOHORA97UWcThmgvr0Jl7ipvP4Px//tRp08blfy4GMzYls5WF8f6JaMrNGmpfPasd9NbpBNp7A==</ds:X509Certificate></ds:X509Data></ds:KeyInfo><ds:Object><xades:QualifyingProperties Target="#Signature_1460109636374" xmlns:xades="http://uri.etsi.org/01903/v1.3.2#"><xades:SignedProperties Id="Signature_1460109636374_SignedProperties"><xades:SignedSignatureProperties><xades:SigningTime>2016-04-08T10:00:36.390Z</xades:SigningTime><xades:SigningCertificate><xades:Cert><xades:CertDigest><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>1URWKQVwWCb9HhMyozwlaYg1ejw=</ds:DigestValue></xades:CertDigest><xades:IssuerSerial><ds:X509IssuerName>CN=QuoVadis EU Issuing Certification Authority G2,OU=Issuing Certification Authority,O=QuoVadis Trustlink B.V.,C=NL</ds:X509IssuerName><ds:X509SerialNumber>694395474722160626358886281620874695673047986886</ds:X509SerialNumber></xades:IssuerSerial></xades:Cert></xades:SigningCertificate></xades:SignedSignatureProperties><xades:SignedDataObjectProperties><xades:DataObjectFormat ObjectReference="#Signature_1460109636374-Reference-0"><xades:MimeType>text/xml</xades:MimeType></xades:DataObjectFormat></xades:SignedDataObjectProperties></xades:SignedProperties></xades:QualifyingProperties></ds:Object></ds:Signature></TrustServiceStatusList>
+diff -ruN a/client/TSL.qrc b/client/TSL.qrc
+--- a/client/TSL.qrc	1970-01-01 03:00:00.000000000 +0300
++++ b/client/TSL.qrc	2016-04-27 10:17:48.915014559 +0300
+@@ -0,0 +1 @@
++<RCC><qresource prefix="TSL"><file>tl-mp.xml</file><file>EE.xml</file></qresource></RCC>
diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix
new file mode 100644
index 00000000000..9894b203800
--- /dev/null
+++ b/pkgs/tools/security/qdigidoc/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, cmake, ccid, qttools, qttranslations, pkgconfig, pcsclite
+, hicolor_icon_theme, libdigidocpp, opensc, shared_mime_info, openldap
+, gettext, desktop_file_utils, makeWrapper }:
+
+stdenv.mkDerivation rec {
+
+  version = "3.12.0.1442";
+  name = "qdigidoc-${version}";
+
+  src = fetchurl {
+    url = "https://installer.id.ee/media/ubuntu/pool/main/q/qdigidoc/qdigidoc_3.12.0.1442.orig.tar.xz";
+    sha256 = "1a7nsi28q57ic99hrb6x83qlvpqvzvk6acbfl6ncny2j4yaxa4jl";
+  };
+
+  patches = [ ./certs.patch ];
+
+  unpackPhase = ''
+    mkdir src
+    tar xf $src -C src
+    cd src
+  '';
+
+  postInstall = ''
+    wrapProgram $out/bin/qdigidocclient \
+      --prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/
+  '';
+
+  buildInputs = [ cmake ccid qttools pkgconfig pcsclite qttranslations
+                  hicolor_icon_theme libdigidocpp opensc shared_mime_info
+                  openldap gettext desktop_file_utils makeWrapper
+                ];
+  
+  meta = with stdenv.lib; {
+    description = "Qt based UI application for verifying and signing digital signatures";
+    homepage = "http://www.id.ee/";
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.jagajaga ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cdb894998f7..47577f6271e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2982,6 +2982,7 @@ in
   qdigidoc = qt5.callPackage ../tools/security/qdigidoc { } ;
   esteidfirefoxplugin = callPackage ../applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin { };
 
+
   qgifer = callPackage ../applications/video/qgifer {
     giflib = giflib_4_1;
     qt = qt4;

From 7dcf75bdd4eb85bce2506eb95d338a5da5e9a5e9 Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@holidaycheck.com>
Date: Mon, 25 Apr 2016 16:04:22 +0200
Subject: [PATCH 310/712] libuv: 1.7.5 -> 1.9.0

---
 pkgs/development/libraries/libuv/default.nix | 91 ++++----------------
 pkgs/top-level/all-packages.nix              |  7 +-
 pkgs/top-level/python-packages.nix           |  2 +-
 3 files changed, 21 insertions(+), 79 deletions(-)

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 48d12321248..e039711e457 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -2,9 +2,23 @@
 
 , ApplicationServices, CoreServices }:
 
-let
-  stable = "stable";
-  unstable = "unstable";
+stdenv.mkDerivation rec {
+  version = "1.9.0";
+  name = "libuv-${version}";
+
+  src = fetchFromGitHub {
+    owner = "libuv";
+    repo = "libuv";
+    rev = "v${version}";
+    sha256 = "0sq8c8n7xixn2xxp35crprvh35ry18i5mcxgwh12lydwv9ks0d4k";
+  };
+
+  buildInputs = [ automake autoconf libtool pkgconfig ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
+
+  preConfigure = ''
+    LIBTOOLIZE=libtoolize ./autogen.sh
+  '';
 
   meta = with lib; {
     description = "A multi-platform support library with a focus on asynchronous I/O";
@@ -13,73 +27,4 @@ let
     platforms   = with platforms; linux ++ darwin;
   };
 
-  mkName = stability: version:
-    if stability == stable
-    then "libuv-${version}"
-    else "libuv-${stability}-${version}";
-
-  mkSrc = version: sha256: fetchFromGitHub {
-    owner = "libuv";
-    repo = "libuv";
-    rev = "v${version}";
-    inherit sha256;
-  };
-
-  # for versions < 0.11.6
-  mkWithoutAutotools = stability: version: sha256: stdenv.mkDerivation {
-    name = mkName stability version;
-    src = mkSrc version sha256;
-    buildPhase = lib.optionalString stdenv.isDarwin ''
-      mkdir extrapath
-      ln -s /usr/sbin/dtrace extrapath/dtrace
-      export PATH=$PATH:`pwd`/extrapath
-    '' + ''
-      mkdir build
-      make builddir_name=build
-
-      rm -r build/src
-      rm build/libuv.a
-      cp -r include build
-
-      mkdir build/lib
-      mv build/libuv.* build/lib
-
-      pushd build/lib
-      lib=$(basename libuv.*)
-      ext="''${lib##*.}"
-      mv $lib libuv.10.$ext
-      ln -s libuv.10.$ext libuv.$ext
-      popd
-    '';
-    installPhase = ''
-      cp -r build $out
-    '';
-    inherit meta;
-  };
-
-  # for versions > 0.11.6
-  mkWithAutotools = stability: version: sha256: stdenv.mkDerivation {
-    name = mkName stability version;
-    src = mkSrc version sha256;
-    buildInputs = [ automake autoconf libtool pkgconfig ]
-      ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
-    preConfigure = ''
-      LIBTOOLIZE=libtoolize ./autogen.sh
-    '';
-    inherit meta;
-  };
-
-  toVersion = with lib; name:
-    replaceChars ["_"] ["."] (removePrefix "v" name);
-
-in
-
-  with lib;
-
-  mapAttrs (v: h: mkWithAutotools unstable (toVersion v) h) {
-    v0_11_29 = "1z07phfwryfy2155p3lxcm2a33h20sfl96lds5dghn157x6csz7m";
-  }
-  //
-  mapAttrs (v: h: mkWithAutotools stable (toVersion v) h) {
-    v1_7_5 = "18x6cy2xn31am97vn6jli7kmb2fbp4c8kmv7jm97vggh0x55flsc";
-  }
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0851c5fb941..cee180b89d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8037,12 +8037,9 @@ in
     then darwin.libunwind
     else callPackage ../development/libraries/libunwind { };
 
-  libuvVersions = recurseIntoAttrs (callPackage ../development/libraries/libuv {
-    automake = automake113x; # fails with 14
+  libuv = callPackage ../development/libraries/libuv {
     inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices;
-  });
-
-  libuv = self.libuvVersions.v1_7_5;
+  };
 
   libv4l = lowPrio (self.v4l_utils.override {
     alsaLib = null;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 304c4932d8e..8c04c6feb78 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22288,7 +22288,7 @@ in modules // {
 
     patches = [ ../development/python-modules/pyuv-external-libuv.patch ];
 
-    buildInputs = with self; [ pkgs.libuvVersions.v0_11_29 ];
+    buildInputs = with self; [ pkgs.libuv ];
 
     meta = {
       description = "Python interface for libuv";

From ae59f6426a93dce9161eb9edba563548e0ad77bf Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Wed, 27 Apr 2016 11:47:22 +0200
Subject: [PATCH 311/712] autoconf: peg version 2.64

---
 pkgs/development/tools/misc/autoconf/2.64.nix | 49 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/tools/misc/autoconf/2.64.nix

diff --git a/pkgs/development/tools/misc/autoconf/2.64.nix b/pkgs/development/tools/misc/autoconf/2.64.nix
new file mode 100644
index 00000000000..9e70833e008
--- /dev/null
+++ b/pkgs/development/tools/misc/autoconf/2.64.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, m4, perl }:
+
+stdenv.mkDerivation rec {
+  name = "autoconf-2.64";
+
+  src = fetchurl {
+    url = "mirror://gnu/autoconf/${name}.tar.xz";
+    sha256 = "0j3jdjpf5ly39dlp0bg70h72nzqr059k0x8iqxvaxf106chpgn9j";
+  };
+
+  buildInputs = [ m4 perl ];
+
+  # Work around a known issue in Cygwin.  See
+  # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for
+  # details.
+  # There are many test failures on `i386-pc-solaris2.11'.
+  #doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS));
+  doCheck = false;
+
+  # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the
+  # "fixed" path in generated files!
+  dontPatchShebangs = true;
+
+  enableParallelBuilding = true;
+
+  preCheck =
+    # Make the Autotest test suite run in parallel.
+    '' export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
+    '';
+
+  meta = {
+    homepage = http://www.gnu.org/software/autoconf/;
+    description = "Part of the GNU Build System";
+
+    longDescription = ''
+      GNU Autoconf is an extensible package of M4 macros that produce
+      shell scripts to automatically configure software source code
+      packages.  These scripts can adapt the packages to many kinds of
+      UNIX-like systems without manual user intervention.  Autoconf
+      creates a configuration script for a package from a template
+      file that lists the operating system features that the package
+      can use, in the form of M4 macro calls.
+    '';
+
+    license = stdenv.lib.licenses.gpl2Plus;
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4008384dde4..a10973312f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5710,6 +5710,7 @@ in
   autoconf-archive = callPackage ../development/tools/misc/autoconf-archive { };
 
   autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { };
+  autoconf264 = callPackage ../development/tools/misc/autoconf/2.64.nix { };
 
   autocutsel = callPackage ../tools/X11/autocutsel{ };
 

From c893105f1f4497225a70961513726f5243a242f7 Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@holidaycheck.com>
Date: Wed, 27 Apr 2016 12:25:22 +0200
Subject: [PATCH 312/712] pyuv: 0.11.5 -> 1.2.0

---
 .../python-modules/pyuv-external-libuv.patch  | 22 +++++++++----------
 pkgs/top-level/python-packages.nix            |  4 ++--
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/pyuv-external-libuv.patch b/pkgs/development/python-modules/pyuv-external-libuv.patch
index 33539d9b4b2..41e169acd5f 100644
--- a/pkgs/development/python-modules/pyuv-external-libuv.patch
+++ b/pkgs/development/python-modules/pyuv-external-libuv.patch
@@ -1,27 +1,25 @@
 diff --git a/setup.py b/setup.py
-index ec0caac..2c1fdb6 100644
+index 5071c3b..4b4a176 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -6,7 +6,6 @@ try:
+@@ -7,7 +7,6 @@ try:
      from setuptools import setup, Extension
  except ImportError:
      from distutils.core import setup, Extension
 -from setup_libuv import libuv_build_ext, libuv_sdist
- 
- 
- __version__ = "0.11.5"
-@@ -32,12 +31,11 @@ setup(name             = "pyuv",
+
+
+ def get_version():
+@@ -35,11 +34,10 @@ setup(name             = "pyuv",
            "Programming Language :: Python :: 3.3",
            "Programming Language :: Python :: 3.4"
        ],
 -      cmdclass     = {'build_ext': libuv_build_ext,
 -                      'sdist'    : libuv_sdist},
-       ext_modules  = [Extension('pyuv',
+       packages     = ['pyuv'],
+       ext_modules  = [Extension('pyuv._cpyuv',
                                  sources = ['src/pyuv.c'],
-+                                libraries = ['uv'],
-                                 define_macros=[('MODULE_VERSION', __version__),
--                                               ('LIBUV_REVISION', libuv_build_ext.libuv_revision)]
-+                                               ('LIBUV_REVISION', 'unknown')]
++                                libraries = ['uv']
                       )]
       )
- 
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8c04c6feb78..e755ff208b1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22278,12 +22278,12 @@ in modules // {
   };
 
   pyuv = buildPythonPackage rec {
-    name = "pyuv-0.11.5";
+    name = "pyuv-1.2.0";
     disabled = isPyPy;  # see https://github.com/saghul/pyuv/issues/49
 
     src = pkgs.fetchurl {
       url = "https://github.com/saghul/pyuv/archive/${name}.tar.gz";
-      sha256 = "c251952cb4e54c92ab0e871decd13cf73d11ca5dba9f92962de51d12e3a310a9";
+      sha256 = "19yl1l5l6dq1xr8xcv6dhx1avm350nr4v2358iggcx4ma631rycx";
     };
 
     patches = [ ../development/python-modules/pyuv-external-libuv.patch ];

From 40838ad20f79ffcba430d97bd80fbb76e07f2474 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 27 Apr 2016 13:28:04 +0300
Subject: [PATCH 313/712] meo: Use pcre-cpp (fixes build)

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

diff --git a/pkgs/tools/security/meo/default.nix b/pkgs/tools/security/meo/default.nix
index be678b18dda..308b94231e7 100644
--- a/pkgs/tools/security/meo/default.nix
+++ b/pkgs/tools/security/meo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchhg, openssl, pcre, qt4, boost, pkcs11helper }:
+{ stdenv, fetchhg, openssl, pcre-cpp, qt4, boost, pkcs11helper }:
 
 stdenv.mkDerivation {
   name = "meo-20121113";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   buildFlags = "QMAKE=qmake";
 
-  buildInputs = [ openssl pcre qt4 boost pkcs11helper ];
+  buildInputs = [ openssl pcre-cpp qt4 boost pkcs11helper ];
 
   preConfigure = ''
     sed -i s,-mt$,, meo-gui/meo-gui.pro

From 99b91020d6fcbffa23c3322bbf060ab05bb5e190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 27 Apr 2016 12:28:53 +0200
Subject: [PATCH 314/712] xvfb-run: fix missing tools

- it was failing to find awk and mktemp
- use `makeBinPath` for better robustness wrt. multiple outputs
---
 pkgs/tools/misc/xvfb-run/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix
index f1cf0442434..b7f8e4b2106 100644
--- a/pkgs/tools/misc/xvfb-run/default.nix
+++ b/pkgs/tools/misc/xvfb-run/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt, xkeyboard_config, xauth, utillinux, which, fontsConf}:
+{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt, xkeyboard_config
+, xauth, utillinux, which, fontsConf, gawk, coreutils }:
 let
   xvfb_run = fetchurl {
     url = https://projects.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server;
@@ -17,6 +18,6 @@ stdenv.mkDerivation {
     wrapProgram $out/bin/xvfb-run \
       --set XKB_BINDIR "${xkbcomp}/bin" \
       --set FONTCONFIG_FILE "${fontsConf}" \
-      --prefix PATH : ${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin
+      --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux gawk coreutils ]}
   '';
 }

From 2f6c2ecd47e3a01880d9535c918d5eb6a798822b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 27 Apr 2016 13:36:34 +0300
Subject: [PATCH 315/712] eiskaltdcpp: Use pcre-cpp (fixes build)

http://hydra.nixos.org/build/34967606/nixlog/1/raw
---
 pkgs/applications/networking/p2p/eiskaltdcpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
index e4ca6d423cd..8d46cf62104 100644
--- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, qt4, boost, bzip2, libX11, pcre, libidn, lua5, miniupnpc, aspell, gettext }:
+{ stdenv, fetchurl, cmake, pkgconfig, qt4, boost, bzip2, libX11, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }:
 
 stdenv.mkDerivation rec {
   name = "eiskaltdcpp-2.2.9";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "3d9170645450f9cb0a605278b8646fec2110b9637910d86fd27cf245cbe24eaf";
   };
 
-  buildInputs = [ cmake pkgconfig qt4 boost bzip2 libX11 pcre libidn lua5 miniupnpc aspell gettext ];
+  buildInputs = [ cmake pkgconfig qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ];
 
   cmakeFlags = ''
     -DUSE_ASPELL=ON

From c5fcab987b819aa2dcb1c5cec788cb5fb7106c6d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 27 Apr 2016 15:46:37 +0300
Subject: [PATCH 316/712] pulseaudio service: fix service path

---
 nixos/modules/config/pulseaudio.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index 1654d31cfeb..f2db428a444 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -134,7 +134,7 @@ in {
     }
 
     (mkIf cfg.enable {
-      environment.systemPackages = [ cfg.package.out ];
+      environment.systemPackages = [ cfg.package ];
 
       environment.etc = singleton {
         target = "asound.conf";
@@ -158,7 +158,7 @@ in {
           wantedBy = [ "default.target" ];
           serviceConfig = {
             Type = "notify";
-            ExecStart = "${cfg.package}/bin/pulseaudio --daemonize=no";
+            ExecStart = "${cfg.package.out}/bin/pulseaudio --daemonize=no";
             Restart = "on-failure";
           };
         };

From e3e502e37a41f6ce4679124d926036230f5e8cfc Mon Sep 17 00:00:00 2001
From: Hannu Hartikainen <hannu.hartikainen@gmail.com>
Date: Wed, 27 Apr 2016 15:52:21 +0300
Subject: [PATCH 317/712] silver-searcher: add alias "ag"

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a10973312f3..5633ccb7b82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3208,6 +3208,7 @@ in
   silc_server = callPackage ../servers/silc-server { };
 
   silver-searcher = callPackage ../tools/text/silver-searcher { };
+  ag = self.silver-searcher;
 
   simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { };
 

From e6e7c1e914b816397836d1508c2bee345e0518e0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 19 Aug 2015 12:09:47 +0300
Subject: [PATCH 318/712] logmein-hamachi: init at 2.1.0.139, add nixos service

---
 nixos/modules/module-list.nix                 |  1 +
 .../services/networking/logmein-hamachi.nix   | 50 +++++++++++++++++++
 .../networking/logmein-hamachi/default.nix    | 45 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 98 insertions(+)
 create mode 100644 nixos/modules/services/networking/logmein-hamachi.nix
 create mode 100644 pkgs/tools/networking/logmein-hamachi/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index b238003dd0c..ec14fd2e363 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -338,6 +338,7 @@
   ./services/networking/kippo.nix
   ./services/networking/lambdabot.nix
   ./services/networking/libreswan.nix
+  ./services/networking/logmein-hamachi.nix
   ./services/networking/mailpile.nix
   ./services/networking/mfi.nix
   ./services/networking/mjpg-streamer.nix
diff --git a/nixos/modules/services/networking/logmein-hamachi.nix b/nixos/modules/services/networking/logmein-hamachi.nix
new file mode 100644
index 00000000000..406626a8a34
--- /dev/null
+++ b/nixos/modules/services/networking/logmein-hamachi.nix
@@ -0,0 +1,50 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.logmein-hamachi;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.logmein-hamachi.enable = mkOption {
+      type = types.bool;
+      default = false;
+      description =
+        ''
+          Whether to enable LogMeIn Hamachi, a proprietary
+          (closed source) commercial VPN software.
+        '';
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    systemd.services.logmein-hamachi = {
+      description = "LogMeIn Hamachi Daemon";
+
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" "local-fs.target" ];
+
+      serviceConfig = {
+        Type = "forking";
+        ExecStart = "${pkgs.logmein-hamachi}/bin/hamachid";
+      };
+    };
+
+    environment.systemPackages = [ pkgs.logmein-hamachi ];
+
+  };
+
+}
diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix
new file mode 100644
index 00000000000..28fb39db571
--- /dev/null
+++ b/pkgs/tools/networking/logmein-hamachi/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl }:
+
+with stdenv.lib;
+
+assert stdenv.isLinux;
+
+let
+  arch =
+    if stdenv.system == "x86_64-linux" then "x64"
+    else if stdenv.system == "i686-linux" then "x86"
+    else abort "Unsupported architecture";
+  sha256 =
+    if stdenv.system == "x86_64-linux" then "1j9sba5prpihlmxr98ss3vls2qjfc6hypzlakr1k97z0a8433nif"
+    else if stdenv.system == "i686-linux" then "100x6gib2np72wrvcn1yhdyn4fplf5x8xm4x0g77izyfdb3yjg8h"
+    else abort "Unsupported architecture";
+  libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];
+
+in stdenv.mkDerivation rec {
+  name = "logmein-hamachi-2.1.0.139";
+
+  src = fetchurl {
+    url = "https://secure.logmein.com/labs/${name}-${arch}.tgz";
+    inherit sha256;
+  };
+
+  installPhase = ''
+    patchelf \
+      --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \
+      --set-rpath ${libraries} \
+      hamachid
+    install -D -m755 hamachid $out/bin/hamachid
+    ln -s $out/bin/hamachid $out/bin/hamachi
+  '';
+
+  dontStrip = true;
+  dontPatchELF = true;
+
+  meta = with stdenv.lib; {
+    description = "A hosted VPN service that lets you securely extend LAN-like networks to distributed teams";
+    homepage = https://secure.logmein.com/products/hamachi/;
+    license = licenses.unfreeRedistributable;
+    maintainers = with maintainers; [ abbradar ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a10973312f3..76a657cf1d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2263,6 +2263,8 @@ in
     inherit (perlPackages) mimeConstruct;
   };
 
+  logmein-hamachi = callPackage ../tools/networking/logmein-hamachi { };
+
   logkeys = callPackage ../tools/security/logkeys { };
 
   logrotate = callPackage ../tools/system/logrotate { };

From 6c0404730f6470932493d59530f396a53c3a0e75 Mon Sep 17 00:00:00 2001
From: knedlsepp <josef.kemetmueller@aon.at>
Date: Wed, 27 Apr 2016 13:37:15 +0000
Subject: [PATCH 319/712] catch: 1.2.1 -> 1.5.0

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

diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix
index 625ec2995e3..3ab520fd4a6 100644
--- a/pkgs/development/libraries/catch/default.nix
+++ b/pkgs/development/libraries/catch/default.nix
@@ -3,20 +3,20 @@
 stdenv.mkDerivation rec {
 
   name = "catch-${version}";
-  version = "1.2.1";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "philsquared";
     repo = "Catch";
     rev = "v" + version;
-    sha256 = "0rz2nmvvh66x6w2nb7l08vc5x9aqg1qfz2qfiykaz1ybc19fwck2";
+    sha256 = "1ag8siafg7fmb50qdqznryrg3lvv56f09nvqwqqn2rlk83zjnaw0";
   };
 
   buildInputs = [ cmake ];
   dontUseCmakeConfigure = true;
 
   buildPhase = ''
-    cmake -Hprojects/CMake -BBuild -DCMAKE_BUILD_TYPE=Release
+    cmake -Hprojects/CMake -BBuild -DCMAKE_BUILD_TYPE=Release -DUSE_CPP11=ON
     cd Build
     make
     cd ..

From d200e30e57342002312ea17270bdcdeaae49c65d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 27 Apr 2016 13:06:18 +0200
Subject: [PATCH 320/712] simple-scan: 3.20.0 -> 3.21.1

---
 pkgs/applications/graphics/simple-scan/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index 417d117d688..e324420b048 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "simple-scan-${version}";
-  version = "3.20.0";
+  version = "3.21.1";
 
   src = fetchurl {
-    sha256 = "0b5ndrjwi7yipkr9bhyifpbdil65izdm677if23yj832n2jsbxcd";
-    url = "https://launchpad.net/simple-scan/3.20/${version}/+download/${name}.tar.xz";
+    sha256 = "00w206isni8m8qd9m8x0644s1gqg11pvgnw6zav33b0bs2h2kk79";
+    url = "https://launchpad.net/simple-scan/3.21/${version}/+download/${name}.tar.xz";
   };
 
   buildInputs = [ cairo colord glib gusb gtk3 libusb1 libxml2 sane-backends

From d71aabe00d13a39f0e4b6649b2b9334e8d535934 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 27 Apr 2016 13:11:05 +0200
Subject: [PATCH 321/712] hack-font: 2.019 -> 2.020

Changes: https://github.com/chrissimpkins/Hack/blob/master/CHANGELOG.md
---
 pkgs/data/fonts/hack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix
index 44b931f3b1d..689e1e054dc 100644
--- a/pkgs/data/fonts/hack/default.nix
+++ b/pkgs/data/fonts/hack/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "hack-font-${version}";
-  version = "2.019";
+  version = "2.020";
 
   src = let
     version_ = with stdenv.lib;
       concatStringsSep "_" (splitString "." version);
   in fetchurl {
-    sha256 = "0fhrl7y5z3d5fkiycbsi621f8nzfnpz8khxpd6hkc1hrg7nzmrk4";
+    sha256 = "16kkmc3psckw1b7k07ccn1gi5ymhlg9djh43nqjzg065g6p6d184";
     url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version_}-ttf.zip";
   };
 

From ed9e0b960e25fff36fdab05a51ec1dd6c6e30e0b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 27 Apr 2016 16:42:44 +0200
Subject: [PATCH 322/712] gparted: 0.25.0 -> 0.26.0

Key changes include:
- Implement read-only LUKS support
- Add progress bars to NTFS, XFS, and EXT2/3/4 file system copy methods
- Fix operations sometimes fail with: No such file or directory

More: https://sourceforge.net/projects/gparted/files/gparted/gparted-0.26.0/gparted-0.26.0-README.md/view
---
 pkgs/tools/misc/gparted/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index 808fb2c841c..f9459c72828 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -4,10 +4,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gparted-0.25.0";
+  name = "gparted-0.26.0";
 
   src = fetchurl {
-    sha256 = "1bllvj66rka8f9h9rfwvxaqrj4mbp2n2860ahnp9xm1195gnv69d";
+    sha256 = "1d3zw99yd1v0gqhcxff35wqz34xi6ps7q9j1bn11sghqihr3kwxw";
     url = "mirror://sourceforge/gparted/${name}.tar.gz";
   };
 

From 922383bb791a9ceb126daeed3a31726f17ef82e5 Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Fri, 22 Apr 2016 00:20:44 +0200
Subject: [PATCH 323/712] terraform: fixup provider, provisioner binaries
 names.

The build for some reason produces binaries with the wrong name.
Terraform expects all its plugins to have a name of the form
`terraform-TYPE-NAME`. So we add the `terraform-` prefix manually.
---
 pkgs/top-level/go-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 941f77d9a61..f9c4b2878ce 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3741,7 +3741,9 @@ let
     disabled = isGo14 || isGo15;
     sha256 = "1f1xm5pyz1hxqm2k74psanirpydf71pmxixplyc2x2w68hgjzi2l";
 
-    buildInputs = [ ];
+    postInstall = ''
+      for i in $bin/bin/{provider,provisioner}-*; do mv $i $bin/bin/terraform-$(basename $i); done
+    '';
   };
 
   testify = buildGoPackage rec {

From 56f8206b859698cd3d8fe6f53c93e59a5aaf86bc Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 27 Apr 2016 10:27:52 -0500
Subject: [PATCH 324/712] Update `etc` example to not use a real config file

A user noticed the example for `hosts`, took the `mode` permissions literally, and ended up with surprising behavior on their system. Updating the documentation to not reference a real config file which might have real permissions requirements.
---
 nixos/modules/system/etc/etc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix
index 9d5b3db472c..163f4f4106e 100644
--- a/nixos/modules/system/etc/etc.nix
+++ b/nixos/modules/system/etc/etc.nix
@@ -36,7 +36,7 @@ in
       type = types.loaOf types.optionSet;
       default = {};
       example = literalExample ''
-        { hosts =
+        { example-configuration-file =
             { source = "/nix/store/.../etc/dir/file.conf.example";
               mode = "0440";
             };

From 2b384d401d5cd2a33be4261fc05d1684ebe02be6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 27 Apr 2016 17:59:08 +0200
Subject: [PATCH 325/712] tsocks: switch back to regular stdenv libc, remove
 saveme compilation

---
 pkgs/development/libraries/tsocks/default.nix | 13 +++++++++++--
 pkgs/top-level/all-packages.nix               |  6 +-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix
index 778762f1bf8..149b2260792 100644
--- a/pkgs/development/libraries/tsocks/default.nix
+++ b/pkgs/development/libraries/tsocks/default.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchurl }:
+
 stdenv.mkDerivation rec {
   name = "tsocks-${version}";
   version = "1.8beta5";
@@ -16,11 +17,19 @@ stdenv.mkDerivation rec {
     export configureFlags="$configureFlags --libdir=$out/lib"
   '';
 
+  preBuild = ''
+    # We don't need the saveme binary, it is in fact never stored and we're
+    # never injecting stuff into ld.so.preload anyway
+    sed -i \
+      -e "s,TARGETS=\(.*\)..SAVE.\(.*\),TARGETS=\1\2," \
+      -e "/SAVE/d" Makefile
+  '';
+
   meta = with stdenv.lib; {
     description = "Transparent SOCKS v4 proxying library";
     homepage = http://tsocks.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with maintainers; [ edwtjo phreedom ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd576d1bea0..9c6c9540da6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8979,11 +8979,7 @@ in
 
   unicap = callPackage ../development/libraries/unicap {};
 
-  tsocks = callPackage ../development/libraries/tsocks {
-    stdenv = overrideCC stdenv (
-      wrapCCWith (callPackage ../build-support/cc-wrapper)
-      musl "" gcc.cc);
-  };
+  tsocks = callPackage ../development/libraries/tsocks { };
 
   unixODBC = callPackage ../development/libraries/unixODBC { };
 

From 3329b75a14c6bd8a5c363bbd9e4eaadcedc77632 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 27 Apr 2016 18:20:13 +0200
Subject: [PATCH 326/712] bobcat: 4.01.04 -> 4.02.00

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

diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index 7a8209d5046..fbc7df68d44 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "bobcat-${version}";
-  version = "4.01.04";
+  version = "4.02.00";
 
   src = fetchFromGitHub {
-    sha256 = "1qnyssvjvwc7ann5rw8spcfrfkxyh1lv3k12bq19d8db67znk4ms";
+    sha256 = "1hl5b2g4cmxcafkcpr4vs0c705cy254g0h410zi5wxnygjam8adn";
     rev = version;
     repo = "bobcat";
     owner = "fbb-git";

From 57ef6899aa382e0f601610fa37d5cad2a5abdbf5 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 27 Apr 2016 17:22:37 +0100
Subject: [PATCH 327/712] terraform: 0.6.13 -> 0.6.15

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 17edad071fe..9910cef2972 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3735,11 +3735,11 @@ let
   };
 
   terraform = buildFromGitHub {
-    rev = "v0.6.13";
+    rev = "v0.6.15";
     owner = "hashicorp";
     repo = "terraform";
     disabled = isGo14 || isGo15;
-    sha256 = "1f1xm5pyz1hxqm2k74psanirpydf71pmxixplyc2x2w68hgjzi2l";
+    sha256 = "1mf98hagb0yp40g2mbar7aw7hmpq01clnil6y9khvykrb33vy0nb";
 
     buildInputs = [ ];
   };

From 8bfb350f4f18d40eb30cfb30ca3e0bd74dfb73ab Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Wed, 27 Apr 2016 18:52:06 +0200
Subject: [PATCH 328/712] xdot: 0.6 -> 0.7, python27 -> python3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 447481db7b3..966d3f67d74 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23180,14 +23180,19 @@ in modules // {
   };
 
   xdot = buildPythonPackage rec {
-    name = "xdot-0.6";
+    name = "xdot-0.7";
 
     src = pkgs.fetchurl {
-      url = "mirror://pypi/x/xdot/xdot-0.6.tar.gz";
-      sha256 = "c71d82bad0fec696af36af788c2a1dbb5d9975bd70bfbdc14bda15b5c7319e6c";
+      url = "mirror://pypi/x/xdot/xdot-0.7.tar.gz";
+      sha256 = "1q0f3pskb09saw1qkd2s6vmk80rq5zjhq8l93dfr2x6r04r0q46j";
     };
 
-    propagatedBuildInputs = with self; [ pygtk pygobject pkgs.graphviz ];
+    propagatedBuildInputs = with self; [ pkgs.gobjectIntrospection pygobject3 pkgs.graphviz pkgs.gnome3.gtk ];
+
+    preFixup = ''
+        wrapProgram "$out/bin/"* \
+          --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
+    '';
 
     meta = {
       description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot";

From 1bf1ba1f8866a7910c9df8dde791a0dffda6fed2 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 27 Apr 2016 19:22:47 +0200
Subject: [PATCH 329/712] siege: fix build after multiple-outputs

---
 pkgs/tools/networking/siege/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix
index 48e2fc5ef78..976d8b3bc06 100644
--- a/pkgs/tools/networking/siege/default.nix
+++ b/pkgs/tools/networking/siege/default.nix
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
-  configureFlags = [ "--with-ssl=${openssl}" ];
+  buildInputs = [ openssl ];
+
+  configureFlags = [ "--with-ssl=${openssl.dev}" ];
 
   meta = with stdenv.lib; {
     description = "HTTP load tester";

From f66e9fd10d7599651117ac32c8212afcf34b7bfa Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Mon, 25 Apr 2016 16:16:22 -0500
Subject: [PATCH 330/712] sqlalchemy: define sqlalchemy_1_0 attribute

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 447481db7b3..6bb1013bd72 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20940,7 +20940,9 @@ in modules // {
     };
   };
 
-  sqlalchemy = buildPythonPackage rec {
+  sqlalchemy = self.sqlalchemy_1_0;
+
+  sqlalchemy_1_0 = buildPythonPackage rec {
     name = "SQLAlchemy-${version}";
     version = "1.0.12";
 

From 9894da95d6abeb4327419a40a4f706e9a79d171c Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Wed, 27 Apr 2016 20:47:14 +0200
Subject: [PATCH 331/712] emby: 3.0.5930 -> 3.0.5932

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

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 26ac26f67c1..d10d5490fe1 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "emby-${version}";
-  version = "3.0.5930";
+  version = "3.0.5932";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "0498v7wng13c9n8sjfaq0b8p933vn7hk5icsranm39bkh3jqgdwf";
+    sha256 = "1m6p52q2y0rd8m1488h1cgfq7m6y5njlln73n4lmi0knrmlq3w7r";
   };
 
   buildInputs = [ unzip ];

From de0847c7310c88a68ee6a19012a296db9f66b986 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 28 Apr 2016 01:14:17 +0300
Subject: [PATCH 332/712] taskserver service: Really check that it is enabled

---
 nixos/modules/services/misc/taskserver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix
index 8459aafeee7..b7d14e90a2b 100644
--- a/nixos/modules/services/misc/taskserver/default.nix
+++ b/nixos/modules/services/misc/taskserver/default.nix
@@ -449,7 +449,7 @@ in {
         };
       };
     })
-    (mkIf needToCreateCA {
+    (mkIf (cfg.enable && needToCreateCA) {
       systemd.services.taskserver-ca = {
         wantedBy = [ "taskserver.service" ];
         after = [ "taskserver-init.service" ];
@@ -533,7 +533,7 @@ in {
         '';
       };
     })
-    (mkIf (cfg.listenHost != "localhost") {
+    (mkIf (cfg.enable && cfg.listenHost != "localhost") {
       networking.firewall.allowedTCPPorts = [ cfg.listenPort ];
     })
     { meta.doc = ./taskserver.xml; }

From 87b9c4a6b6e0c382f744438c5fa52fbff97b3e54 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Wed, 27 Apr 2016 20:17:01 -0400
Subject: [PATCH 333/712] zookeeper: replace tabs with spaces

---
 pkgs/servers/zookeeper/default.nix | 52 +++++++++++++++---------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix
index 307993a958a..4512bfcfc94 100644
--- a/pkgs/servers/zookeeper/default.nix
+++ b/pkgs/servers/zookeeper/default.nix
@@ -1,36 +1,36 @@
 { stdenv, fetchurl, jre, makeWrapper, bash }:
 
 stdenv.mkDerivation rec {
-	name = "zookeeper-3.4.6";
+  name = "zookeeper-3.4.6";
 
-	src = fetchurl {
-		url = "mirror://apache/zookeeper/${name}/${name}.tar.gz";
-		sha256 = "01b3938547cd620dc4c93efe07c0360411f4a66962a70500b163b59014046994";
-	};
+  src = fetchurl {
+    url = "mirror://apache/zookeeper/${name}/${name}.tar.gz";
+    sha256 = "01b3938547cd620dc4c93efe07c0360411f4a66962a70500b163b59014046994";
+  };
 
-	buildInputs = [ makeWrapper jre ];
+  buildInputs = [ makeWrapper jre ];
 
-	phases = ["unpackPhase" "installPhase"];
+  phases = ["unpackPhase" "installPhase"];
 
-	installPhase = ''
-		mkdir -p $out
-		cp -R conf docs lib ${name}.jar $out
-		mkdir -p $out/bin
-		cp -R bin/{zkCli,zkCleanup,zkEnv}.sh $out/bin
-		for i in $out/bin/{zkCli,zkCleanup}.sh; do
-			wrapProgram $i \
-				--set JAVA_HOME "${jre}" \
-				--prefix PATH : "${bash}/bin"
-		done
-                chmod -x $out/bin/zkEnv.sh
-	'';
+  installPhase = ''
+    mkdir -p $out
+    cp -R conf docs lib ${name}.jar $out
+    mkdir -p $out/bin
+    cp -R bin/{zkCli,zkCleanup,zkEnv}.sh $out/bin
+    for i in $out/bin/{zkCli,zkCleanup}.sh; do
+      wrapProgram $i \
+        --set JAVA_HOME "${jre}" \
+        --prefix PATH : "${bash}/bin"
+    done
+    chmod -x $out/bin/zkEnv.sh
+  '';
 
-	meta = with stdenv.lib; {
-		homepage = "http://zookeeper.apache.org";
-		description = "Apache Zookeeper";
-		license = licenses.asl20;
-		maintainers = [ maintainers.nathan-gs ];	
-		platforms = platforms.unix;	
-	};		
+  meta = with stdenv.lib; {
+    homepage = "http://zookeeper.apache.org";
+    description = "Apache Zookeeper";
+    license = licenses.asl20;
+    maintainers = [ maintainers.nathan-gs ];
+    platforms = platforms.unix;
+  };
 
 }

From d5a7032042884439c4e00eaeb2a0e7b2a9180401 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 28 Apr 2016 03:03:14 +0300
Subject: [PATCH 334/712] fsmark: Init at 3.3

---
 pkgs/tools/misc/fsmark/default.nix | 28 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/misc/fsmark/default.nix

diff --git a/pkgs/tools/misc/fsmark/default.nix b/pkgs/tools/misc/fsmark/default.nix
new file mode 100644
index 00000000000..0e821ce7f1f
--- /dev/null
+++ b/pkgs/tools/misc/fsmark/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "fsmark-${version}";
+  version = "3.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/fsmark/${version}/fs_mark-${version}.tar.gz";
+    sha256 = "15f8clcz49qsfijdmcz165ysp8v4ybsm57d3dxhhlnq1bp1i9w33";
+  };
+
+  patchPhase = ''
+    sed -i Makefile -e 's/-static //'
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp fs_mark $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Synchronous write workload file system benchmark";
+    homepage = https://sourceforge.net/projects/fsmark/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.dezgeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6956841b0ca..348d5319c1d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -772,6 +772,8 @@ in
 
   fop = callPackage ../tools/typesetting/fop { };
 
+  fsmark = callPackage ../tools/misc/fsmark { };
+
   fzf = goPackages.fzf.bin // { outputs = [ "bin" ]; };
 
   gencfsm = callPackage ../tools/security/gencfsm { };

From d27caa486b03781768cacd7f17881f31adfe4ff8 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 28 Apr 2016 03:31:21 +0300
Subject: [PATCH 335/712] filebench: Init at 1.4.9.1

---
 pkgs/tools/misc/filebench/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/tools/misc/filebench/default.nix

diff --git a/pkgs/tools/misc/filebench/default.nix b/pkgs/tools/misc/filebench/default.nix
new file mode 100644
index 00000000000..1e8b5a493f5
--- /dev/null
+++ b/pkgs/tools/misc/filebench/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "filebench-${version}";
+  version = "1.4.9.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/filebench/${name}.tar.gz";
+    sha256 = "0y06f9mp4xry6j1jamqprzn963l0krqayv14yv66pm51hdh53ld1";
+  };
+
+  meta = with stdenv.lib; {
+    description = "File system and storage benchmark that can generate both micro and macro workloads";
+    homepage = https://sourceforge.net/projects/filebench/;
+    license = licenses.cddl;
+    maintainers = [ maintainers.dezgeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 348d5319c1d..f23ef2672a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -770,6 +770,8 @@ in
 
   fastJson = callPackage ../development/libraries/fastjson { };
 
+  filebench = callPackage ../tools/misc/filebench { };
+
   fop = callPackage ../tools/typesetting/fop { };
 
   fsmark = callPackage ../tools/misc/fsmark { };

From e28e3d576362335b5ac7822478b2d4dc6efc4253 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Wed, 27 Apr 2016 20:19:12 -0400
Subject: [PATCH 336/712] zookeeper: include zooInspector.sh

ZooInspector is a Swing based GUI for interacting with Zookeeper.
---
 pkgs/servers/zookeeper/default.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix
index 4512bfcfc94..7cf95ca7e9e 100644
--- a/pkgs/servers/zookeeper/default.nix
+++ b/pkgs/servers/zookeeper/default.nix
@@ -23,14 +23,28 @@ stdenv.mkDerivation rec {
         --prefix PATH : "${bash}/bin"
     done
     chmod -x $out/bin/zkEnv.sh
+
+    mkdir -p $out/share/zooinspector
+    cp -r contrib/ZooInspector/{${name}-ZooInspector.jar,icons,lib,config} $out/share/zooinspector
+
+    classpath="$out/${name}.jar:$out/share/zooinspector/${name}-ZooInspector.jar"
+    for jar in $out/lib/*.jar $out/share/zooinspector/lib/*.jar; do
+      classpath="$classpath:$jar"
+    done
+
+    cat << EOF > $out/bin/zooInspector.sh
+    #!${stdenv.shell}
+    cd $out/share/zooinspector
+    exec ${jre}/bin/java -cp $classpath org.apache.zookeeper.inspector.ZooInspector
+    EOF
+    chmod +x $out/bin/zooInspector.sh
   '';
 
   meta = with stdenv.lib; {
     homepage = "http://zookeeper.apache.org";
     description = "Apache Zookeeper";
     license = licenses.asl20;
-    maintainers = [ maintainers.nathan-gs ];
+    maintainers = with maintainers; [ nathan-gs cstrahan ];
     platforms = platforms.unix;
   };
-
 }

From 66a224c99dc1ffcb784d208a1d30f4660e3dd405 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 27 Apr 2016 09:22:45 +0000
Subject: [PATCH 337/712] Fix nlopt build.

(cherry picked from commit 6c8fbed541188b04998ffc92ef960b6970f1f04e)
---
 pkgs/development/libraries/nlopt/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix
index 080f09dfdf4..ddf47cf31d8 100644
--- a/pkgs/development/libraries/nlopt/default.nix
+++ b/pkgs/development/libraries/nlopt/default.nix
@@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
         "M_INSTALL_DIR=$(out)/${octave.sitePath}/m " +
         "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct ");
 
+  preConfigure = ''
+    find octave -name '*.cc' | xargs sed -i 's|Octave_map|octave_map|g'
+  '';
+
   meta = {
     homepage = "http://ab-initio.mit.edu/nlopt/";
     description = "Free open-source library for nonlinear optimization";

From a2e1692730537ee5b8cbcabdd47dbc10ad2a7383 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Apr 2016 11:59:13 +0200
Subject: [PATCH 338/712] haskell-split: disable test suite to avoid transient
 build failures

We have frequent build failures of "split" because the QuickCheck testsuite
cannot generate enough conclusive test cases, i.e. in

  https://hydra.nixos.org/build/34857780/nixlog/1/raw

Cc: @byorgey
---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ecae4cb8eb6..363ddcbea88 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1010,4 +1010,8 @@ self: super: {
   # tinc is a new build driver a la Stack that's not yet available from Hackage.
   tinc = self.callPackage ../tools/haskell/tinc {};
 
+  # Avoid transient build failures because the QuickCheck testsuite cannot
+  # generate enough conclusive test cases.
+  split = dontCheck super.split;
+
 }

From c84c174eb2440355ab4ad7e0de8889c58f7ef903 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Fri, 12 Feb 2016 18:11:40 +0200
Subject: [PATCH 339/712] rmilter: socket activation in nixos

---
 nixos/modules/services/mail/rmilter.nix | 65 +++++++++++++++++++------
 1 file changed, 51 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix
index a6e2a9fc780..f748e7a172e 100644
--- a/nixos/modules/services/mail/rmilter.nix
+++ b/nixos/modules/services/mail/rmilter.nix
@@ -7,9 +7,14 @@ let
   rspamdCfg = config.services.rspamd;
   cfg = config.services.rmilter;
 
+  inetSockets = map (sock: let s = stringSplit ":" sock; in "inet:${last s}:${head s}") cfg.bindInetSockets;
+  unixSockets = map (sock: "unix:${sock}") cfg.bindUnixSockets;
+
+  allSockets = unixSockets ++ inetSockets;
+
   rmilterConf = ''
 pidfile = /run/rmilter/rmilter.pid;
-bind_socket = ${cfg.bindSocket};
+bind_socket = ${if cfg.socketActivation then "fd:3" else concatStringsSep ", " allSockets};
 tempdir = /tmp;
 
   '' + (with cfg.rspamd; if enable then ''
@@ -68,14 +73,37 @@ in
         '';
        };
 
-      bindSocket =  mkOption {
-        type = types.string;
-        default = "unix:/run/rmilter/rmilter.sock";
-        description = "Socket to listed for MTA requests";
+      bindUnixSockets =  mkOption {
+        type = types.listOf types.str;
+        default = ["/run/rmilter/rmilter.sock"];
+        description = ''
+          Unix domain sockets to listen for MTA requests.
+        '';
         example = ''
-            "unix:/run/rmilter/rmilter.sock" or
-            "inet:11990@127.0.0.1"
-          '';
+            [ "/run/rmilter/rmilter.sock"] 
+        '';
+      };
+
+      bindInetSockets = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          Inet addresses to listen (in format accepted by systemd.socket)
+        '';
+        example = ''
+            ["127.0.0.1:11990"]
+        '';
+      };
+
+      socketActivation = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Enable systemd socket activation for rmilter.
+          (disabling socket activation not recommended
+          when unix socket used, and follow to wrong
+          permissions on unix domain socket.)
+        '';
       };
 
       rspamd = {
@@ -86,7 +114,7 @@ in
 
         servers = mkOption {
           type = types.listOf types.str;
-          default = ["r:0.0.0.0:11333"];
+          default = ["r:/run/rspamd/rspamd.sock"];
           description = ''
             Spamd socket definitions.
             Is server name is prefixed with r: it is rspamd server.
@@ -129,7 +157,7 @@ in
           type = types.str;
           description = "Addon to postfix configuration";
           default = ''
-smtpd_milters = ${cfg.bindSocket}
+smtpd_milters = ${head allSockets}
 # or for TCP socket
 # # smtpd_milters = inet:localhost:9900
 milter_protocol = 6
@@ -169,17 +197,26 @@ milter_default_action = accept
 
       serviceConfig = {
         ExecStart = "${pkgs.rmilter}/bin/rmilter ${optionalString cfg.debug "-d"} -n -c ${rmilterConfigFile}";
+        ExecReload = "/bin/kill -USR1 $MAINPID";
         User = cfg.user;
         Group = cfg.group;
         PermissionsStartOnly = true;
         Restart = "always";
+        RuntimeDirectory = "rmilter";
+        RuntimeDirectoryPermissions="0755";
       };
 
-      preStart = ''
-        ${pkgs.coreutils}/bin/mkdir -p /run/rmilter
-        ${pkgs.coreutils}/bin/chown ${cfg.user}:${cfg.group} /run/rmilter
-      '';
+    };
 
+    systemd.sockets.rmilter = mkIf cfg.socketActivation {
+      description = "Rmilter service socket";
+      wantedBy = [ "sockets.target" ];
+      socketConfig = {
+          ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets;
+          SocketUser = cfg.user;
+          SocketGroup = config.ids.gids.adm;
+          SocketMode = "0660";
+      };
     };
 
     services.postfix.extraConfig = optionalString cfg.postfix.enable cfg.postfix.configFragment;

From 5d26e806451d3f51833e13d3cbbc173370cdcbfa Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Fri, 12 Feb 2016 18:11:56 +0200
Subject: [PATCH 340/712] rspamd: typo

---
 pkgs/servers/mail/rspamd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index f3156afd97a..f40a28ab351 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, perl
 , file, glib, gmime, libevent, luajit, openssl, pcre, pkgconfig, sqlite }:
 
-let libmagic = file;  # libmagic provided buy file package ATM
+let libmagic = file;  # libmagic provided by file package ATM
 in
 
 stdenv.mkDerivation rec {

From 5c260399e136631e026c17b9c08315660f9eaefc Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Fri, 25 Mar 2016 16:12:16 +0200
Subject: [PATCH 341/712] rmilter: correct paths to sockets

---
 nixos/modules/services/mail/rmilter.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix
index f748e7a172e..d1f7cd2e173 100644
--- a/nixos/modules/services/mail/rmilter.nix
+++ b/nixos/modules/services/mail/rmilter.nix
@@ -75,12 +75,12 @@ in
 
       bindUnixSockets =  mkOption {
         type = types.listOf types.str;
-        default = ["/run/rmilter/rmilter.sock"];
+        default = ["/run/rmilter.sock"];
         description = ''
           Unix domain sockets to listen for MTA requests.
         '';
         example = ''
-            [ "/run/rmilter/rmilter.sock"] 
+            [ "/run/rmilter.sock"]
         '';
       };
 
@@ -114,7 +114,7 @@ in
 
         servers = mkOption {
           type = types.listOf types.str;
-          default = ["r:/run/rspamd/rspamd.sock"];
+          default = ["r:/run/rspamd.sock"];
           description = ''
             Spamd socket definitions.
             Is server name is prefixed with r: it is rspamd server.
@@ -214,13 +214,13 @@ milter_default_action = accept
       socketConfig = {
           ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets;
           SocketUser = cfg.user;
-          SocketGroup = config.ids.gids.adm;
+          SocketGroup = cfg.group;
           SocketMode = "0660";
       };
     };
 
     services.postfix.extraConfig = optionalString cfg.postfix.enable cfg.postfix.configFragment;
-
+    users.users.postfix.extraGroups = [ cfg.group ];
   };
 
 }

From 36954ee405ce515895c90fd6543bac2a9bd0bddb Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Fri, 25 Mar 2016 16:12:59 +0200
Subject: [PATCH 342/712] rspamd: configurable bindSocket and bindUISocket

---
 nixos/modules/services/mail/rspamd.nix | 59 +++++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
index a083f829324..412b99ccc57 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -6,6 +6,35 @@ let
 
   cfg = config.services.rspamd;
 
+  mkBindSockets = socks: concatStringsSep "\n" (map (each: "  bind_socket = \"${each}\"") socks);
+
+  rspamdConf =
+    ''
+      .include "$CONFDIR/common.conf"
+
+      options {
+        pidfile = "$RUNDIR/rspamd.pid";
+        .include "$CONFDIR/options.inc"
+      }
+
+      logging {
+        type = "file";
+        filename = "$LOGDIR/rspamd.log";
+        .include "$CONFDIR/logging.inc"
+      }
+
+      worker {
+      ${mkBindSockets cfg.bindSocket}
+        .include "$CONFDIR/worker-normal.inc"
+      }
+
+      worker {
+      ${mkBindSockets cfg.bindUISocket}
+        .include "$CONFDIR/worker-controller.inc"
+      }
+   '';
+   rspamdConfFile = pkgs.writeText "rspamd.conf" rspamdConf;
+
 in
 
 {
@@ -26,6 +55,32 @@ in
         description = "Whether to run the rspamd daemon in debug mode.";
       };
 
+      bindSocket = mkOption {
+        type = types.listOf types.str;
+        default = [
+          "/run/rspamd.sock mode=0666 owner=${cfg.user}"
+        ];
+        description = ''
+          List of sockets to listen, in format acceptable by rspamd
+        '';
+        example = ''
+          bindSocket = [
+            "/run/rspamd.sock mode=0666 owner=rspamd"
+            "*:11333"
+          ];
+        '';
+      };
+
+      bindUISocket = mkOption {
+        type = types.listOf types.str;
+        default = [
+          "localhost:11334"
+        ];
+        description = ''
+          List of sockets for web interface, in format acceptable by rspamd
+        '';
+      };
+
       user = mkOption {
         type = types.string;
         default = "rspamd";
@@ -62,7 +117,7 @@ in
 
     users.extraGroups = singleton {
       name = cfg.group;
-      gid = config.ids.gids.spamd;
+      gid = config.ids.gids.rspamd;
     };
 
     systemd.services.rspamd = {
@@ -72,7 +127,7 @@ in
       after = [ "network.target" ];
 
       serviceConfig = {
-        ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -f";
+        ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -c ${rspamdConfFile} -f";
         RuntimeDirectory = "/var/lib/rspamd";
         PermissionsStartOnly = true;
         Restart = "always";

From a817d5b543c11ca7fcf836636afdf70b92740f86 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Mon, 25 Apr 2016 16:21:38 +0300
Subject: [PATCH 343/712] libmemcached: move cyrus_sasl to
 propagatedBuildInputs

Reason: struct/sasl.h from libmemcached include stuff from there
/nix/store/d3f91zvai71dyhs83ybzsnjfhxnv7mmh-libmemcached-1.0.18/include/libmemcached-1.0/struct/sasl.h:39:23:
fatal error: sasl/sasl.h: No such file or directory
---
 pkgs/development/libraries/libmemcached/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix
index 619aa014497..2570c645f26 100644
--- a/pkgs/development/libraries/libmemcached/default.nix
+++ b/pkgs/development/libraries/libmemcached/default.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
       sha256 = "1nvxwdkxj2a2g39z0g8byxjwnw4pa5xlvsmdk081q63vmfywh7zb";
     });
 
-  buildInputs = [ cyrus_sasl libevent ];
+  buildInputs = [ libevent ];
+  propagatedBuildInputs = [ cyrus_sasl ];
 
   meta = with stdenv.lib; {
     homepage = http://libmemcached.org;

From ebdfc9dac14173ff3f5c49edc636edd84eeaa57d Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Mon, 25 Apr 2016 16:29:36 +0300
Subject: [PATCH 344/712] rmilter: 1.7.3 -> 1.8.2

---
 pkgs/servers/mail/rmilter/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix
index 455e543b2da..d5ba98bfbb3 100644
--- a/pkgs/servers/mail/rmilter/default.nix
+++ b/pkgs/servers/mail/rmilter/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, bison, flex, openssl, pcre, libmilter, opendkim }:
+{ stdenv, fetchFromGitHub, cmake, bison, flex, openssl, pcre, libmilter, opendkim,
+ libmemcached }:
 
 let patchedLibmilter = stdenv.lib.overrideDerivation  libmilter (_ : {
     patches = libmilter.patches ++ [ ./fd-passing-libmilter.patch ];
@@ -7,21 +8,21 @@ in
 
 stdenv.mkDerivation rec {
   name = "rmilter-${version}";
-  version = "1.7.3";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "vstakhov";
     repo = "rmilter";
     rev = version;
-    sha256 = "04xalaxq5xgg5ls0f4ayp8yhzdfq5gqjb8qwfyha3mrx4dqrgh7s";
+    sha256 = "0cplkc1acgysxn8id9wakd1fx0f76cazscpfqhrxyjbk5fb11ll4";
   };
 
   nativeBuildInputs = [ bison cmake flex ];
-  buildInputs = [ patchedLibmilter openssl pcre opendkim];
+  buildInputs = [ libmemcached patchedLibmilter openssl pcre opendkim];
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/vstakhov/rmilter";
-    license = licenses.bsd2;
+    license = licenses.asl20;
     description = ''
       Daemon to integrate rspamd and milter compatible MTA, for example
       postfix or sendmail

From 05036343dcc42cfcd05563302ef286740f7e6ffc Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Mon, 25 Apr 2016 16:34:10 +0300
Subject: [PATCH 345/712] rspamd: 1.2.0 -> 1.2.5

License changed to apache-2.0 by upstream
---
 pkgs/servers/mail/rspamd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index f40a28ab351..a9da7953978 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -6,13 +6,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "rspamd-${version}";
-  version = "1.2.0";
+  version = "1.2.5";
 
   src = fetchFromGitHub {
     owner = "vstakhov";
     repo = "rspamd";
     rev = version;
-    sha256 = "00d9c9b8w6j0ls1w08bfghn4635as779b45vhhlv1f5wfzhxz6a1";
+    sha256 = "0slpixcfd74qkm7445lmcry4s1yamayphzzyr7cxjlr9xfxlblqn";
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/vstakhov/rspamd";
-    license = licenses.bsd2;
+    license = licenses.asl20;
     description = "advanced spam filtering system";
     maintainers = with maintainers; [ avnik fpletz ];
   };

From 930d243ea490c1cbb5d70b514a70f2d9c989b25f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 Apr 2016 10:33:54 +0200
Subject: [PATCH 346/712] firefox: 45.0.2 -> 46.0

Still using GTK+ 2 for now, since apparently building with GTK+ 3
still requires GTK+ 2, increasing the closure size. (#15008)
---
 .../applications/networking/browsers/firefox/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 7493350b28f..94017ba3327 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -35,7 +35,7 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec {
       alsaLib nspr nss libnotify xorg.pixman yasm mesa
       xorg.libXScrnSaver xorg.scrnsaverproto pysqlite
       xorg.libXext xorg.xextproto sqlite unzip makeWrapper
-      hunspell libevent libstartup_notification libvpx /* cairo */
+      hunspell libevent libstartup_notification /* libvpx */ /* cairo */
       gstreamer gst_plugins_base icu libpng jemalloc
       libpulseaudio # only headers are needed
     ]
@@ -50,7 +50,7 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec {
       "--with-system-nspr"
       "--with-system-nss"
       "--with-system-libevent"
-      "--with-system-libvpx"
+      #"--with-system-libvpx" # needs 1.5.0
       "--with-system-png" # needs APNG support
       "--with-system-icu"
       "--enable-system-ffi"
@@ -69,6 +69,7 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec {
       "--disable-updater"
       "--enable-jemalloc"
       "--disable-gconf"
+      "--enable-default-toolkit=cairo-gtk2"
     ]
     ++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3"
     ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ]
@@ -130,8 +131,8 @@ in {
 
   firefox-unwrapped = common {
     pname = "firefox";
-    version = "45.0.2";
-    sha512 = "8c0b7afb41a1a405fe499299d1a8b1138dac52b9ad67bfc8761b70a26f330581c2aa1d76d67075896ec3a0c3f5367b8b58365ebc8b3a01f801fa37071b3de526";
+    version = "46.0";
+    sha512 = "f5a652e25fa74e3cb271af04d50cc7b63ca73fde9d2ff350e84b3dda55352bac2b28b567aed12164285d992414ad475da9d2555ab972e5c5d7b8f5226591036b";
   };
 
   firefox-esr-unwrapped = common {

From 8cc9e6da8ab611037323f111a79e6677f0653621 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 Apr 2016 13:45:44 +0200
Subject: [PATCH 347/712] sqlite: 3.11.1 -> 3.12.2

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

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index feb5e5d3040..b34e2f648ec 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -3,11 +3,11 @@
 assert interactive -> readline != null && ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.11.1";
+  name = "sqlite-3.12.2";
 
   src = fetchurl {
-    url = "http://sqlite.org/2016/sqlite-autoconf-3110100.tar.gz";
-    sha1 = "c4b4dcd735a4daf5a2e2bb90f374484c8d4dad29";
+    url = "http://sqlite.org/2016/sqlite-autoconf-3120200.tar.gz";
+    sha1 = "b43c2e7238e54c50b95fbbd85c48792f4f39af8c";
   };
 
   outputs = [ "dev" "out" "bin" ];

From 298d47ba0187d98eb7910ee406d4849e0a6c84fd Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 28 Apr 2016 13:05:48 +0200
Subject: [PATCH 348/712] cassandra: 2.1.13 -> 2.1.14

---
 pkgs/servers/nosql/cassandra/2.1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix
index d0f70a554f7..6c09c977d29 100644
--- a/pkgs/servers/nosql/cassandra/2.1.nix
+++ b/pkgs/servers/nosql/cassandra/2.1.nix
@@ -11,8 +11,8 @@
 
 let
 
-  version = "2.1.13";
-  sha256 = "09b3vf5jsv70xlfimj30v8l1zw7c5xdgpw5fpmn6jh8n3gigybqh";
+  version = "2.1.14";
+  sha256 = "168rg8gg1dhcjfjsr1jbfx4zj3zyqn0xi2z1j2c8jn6054486ybg";
 
 in
 

From ae8dce8d164743e234f50170b85fb858b9465022 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 28 Apr 2016 13:26:39 +0200
Subject: [PATCH 349/712] zpaq: 7.11 -> 7.12

Faster extract. Removes -encrypt (combined with -repack).

Also, we now correctly follow upstream's versioning and no longer
multiply the version number by 100. You may need to update manually.
---
 pkgs/tools/archivers/zpaq/default.nix | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index ba0a174ed0a..3b647dc5283 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -1,20 +1,13 @@
 { stdenv, fetchurl, perl, unzip }:
-let
-  s = # Generated upstream information
-  rec {
-    baseName="zpaq";
-    version="711";
-    name="${baseName}-${version}";
-    hash="0kva9xn3rhm2xpbbq3yrx3c9y150fw434ayd82fzhr24nsjjaxsf";
-    url="http://mattmahoney.net/dc/zpaq711.zip";
-    sha256="0kva9xn3rhm2xpbbq3yrx3c9y150fw434ayd82fzhr24nsjjaxsf";
-  };
-in
-stdenv.mkDerivation {
-  inherit (s) name version;
+stdenv.mkDerivation rec {
+  name = "zpaq-${version}";
+  version = "7.12";
 
-  src = fetchurl {
-    inherit (s) url sha256;
+  src = let
+    mungedVersion = with stdenv.lib; concatStrings (splitString "." version);
+  in fetchurl {
+    sha256 = "1lgkxiinam80pqqyvs3x845k6kf0wgw121vz0gr8za4blb756n30";
+    url = "http://mattmahoney.net/dc/zpaq${mungedVersion}.zip";
   };
 
   sourceRoot = ".";
@@ -39,11 +32,10 @@ stdenv.mkDerivation {
   installFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
-    inherit (s) version;
     description = "Incremental journaling backup utility and archiver";
+    homepage = http://mattmahoney.net/dc/zpaq.html;
     license = licenses.gpl3Plus ;
     maintainers = with maintainers; [ raskin nckx ];
     platforms = platforms.linux;
-    homepage = "http://mattmahoney.net/dc/zpaq.html";
   };
 }

From ad3a4cf7d4fbc6c732b3e47a45845ec9ee7ece14 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 28 Apr 2016 13:29:01 +0200
Subject: [PATCH 350/712] zpaq: remove unused .upstream file

---
 pkgs/tools/archivers/zpaq/default.upstream | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 pkgs/tools/archivers/zpaq/default.upstream

diff --git a/pkgs/tools/archivers/zpaq/default.upstream b/pkgs/tools/archivers/zpaq/default.upstream
deleted file mode 100644
index 2d62f834647..00000000000
--- a/pkgs/tools/archivers/zpaq/default.upstream
+++ /dev/null
@@ -1,3 +0,0 @@
-url http://mattmahoney.net/dc/zpaq.html
-version_link "/zpaq[0-9]+[.]zip"
-version "[^0-9]*([0-9]+)[^0-9]*" '\1'

From dcde0265a8c369361ff7be9a28f158b2d4bdadb8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 28 Apr 2016 13:59:13 +0200
Subject: [PATCH 351/712] fatrace: 0.11 -> 0.12

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

diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix
index 5a34eee85e4..09da891a175 100644
--- a/pkgs/os-specific/linux/fatrace/default.nix
+++ b/pkgs/os-specific/linux/fatrace/default.nix
@@ -2,22 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "fatrace-${version}";
-  version = "0.11";
+  version = "0.12";
 
   src = fetchurl {
     url = "http://launchpad.net/fatrace/trunk/${version}/+download/${name}.tar.bz2";
-    sha256 = "1f77v222nlfbf8fv7d28cnpm7x8xz0mhxavgz19c2jc51pjlv84s";
+    sha256 = "0szn86rbbvmjcw192vjhhgc3v99s5lm2kg93gk1yzm6ay831grsh";
   };
 
-  patchFlags = "-p0";
-  patches = [
-    (fetchpatch {
-      sha256 = "0gym1zg42vb4czpbkz4shnc7z3lskn1ny6dpx10ykwf145xyf9m2";
-      name = "fatrace-fix-crash-when-using-p-option.patch";
-      url = "http://bazaar.launchpad.net/~pitti/fatrace/trunk/diff/67?context=3";
-    })
-  ];
-
   buildInputs = [ python3 which ];
 
   postPatch = ''

From 5e2bb0b31c892fed5024eaf7e93faf470a6ceb38 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 28 Apr 2016 16:42:16 +0300
Subject: [PATCH 352/712] pulseaudio: select correct outputs

Original fixes by ttuegel and peterhoeg.
---
 nixos/modules/config/pulseaudio.nix                  | 12 ++++++------
 nixos/modules/services/x11/desktop-managers/kde4.nix |  2 +-
 nixos/modules/services/x11/desktop-managers/kde5.nix |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index f2db428a444..a964e04531c 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -98,9 +98,9 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pulseaudioLight.out;
-        defaultText = "pkgs.pulseaudioLight.out";
-        example = literalExample "pkgs.pulseaudioFull.out";
+        default = pulseaudioLight;
+        defaultText = "pkgs.pulseaudioLight";
+        example = literalExample "pkgs.pulseaudioFull";
         description = ''
           The PulseAudio derivation to use.  This can be used to enable
           features (such as JACK support, Bluetooth) via the
@@ -130,7 +130,7 @@ in {
         source = clientConf;
       };
 
-      hardware.pulseaudio.configFile = mkDefault "${cfg.package.out}/etc/pulse/default.pa";
+      hardware.pulseaudio.configFile = mkDefault "${getBin cfg.package}/etc/pulse/default.pa";
     }
 
     (mkIf cfg.enable {
@@ -158,7 +158,7 @@ in {
           wantedBy = [ "default.target" ];
           serviceConfig = {
             Type = "notify";
-            ExecStart = "${cfg.package.out}/bin/pulseaudio --daemonize=no";
+            ExecStart = "${getBin cfg.package}/bin/pulseaudio --daemonize=no";
             Restart = "on-failure";
           };
         };
@@ -195,7 +195,7 @@ in {
         environment.PULSE_RUNTIME_PATH = stateDir;
         serviceConfig = {
           Type = "notify";
-          ExecStart = "${cfg.package.out}/bin/pulseaudio --daemonize=no --log-level=${cfg.daemon.logLevel} --system -n --file=${cfg.configFile}";
+          ExecStart = "${getBin cfg.package}/bin/pulseaudio --daemonize=no --log-level=${cfg.daemon.logLevel} --system -n --file=${cfg.configFile}";
           Restart = "on-failure";
         };
       };
diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index 80e408be492..79b4413a6e7 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -111,7 +111,7 @@ in
             # Load PulseAudio module for routing support.
             # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/
             ${optionalString config.hardware.pulseaudio.enable ''
-              ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
+              ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
             ''}
 
             # Start KDE.
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 70dc1ac2a26..584a0d4012d 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -59,7 +59,7 @@ in
         # Load PulseAudio module for routing support.
         # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/
         ${optionalString config.hardware.pulseaudio.enable ''
-          ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
+          ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
         ''}
 
         exec "${kde5.startkde}"

From 98a7f819d9ad0f8799b14232c4b979fb604aa53e Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Fri, 15 Apr 2016 23:22:41 +0100
Subject: [PATCH 353/712] qt4: add a toplevel entry for the version skype uses

Otherwise, it won't get built by hydra

abbradar: use `self` as needed for overrides.
---
 pkgs/top-level/all-packages.nix | 6 +++---
 pkgs/top-level/release.nix      | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index adfd300d3fa..1254917f08e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8567,6 +8567,8 @@ in
 
   qt4 = self.kde4.qt4;
 
+  qt4_clang = lowPrio (self.qt4.override { stdenv = clangStdenv; });
+
   qt48 = callPackage ../development/libraries/qt-4.x/4.8 {
     # GNOME dependencies are not used unless gtkStyle == true
     mesa = mesa_noglu;
@@ -13811,9 +13813,7 @@ in
   siproxd = callPackage ../applications/networking/siproxd { };
 
   skype = callPackage_i686 ../applications/networking/instant-messengers/skype {
-    qt4 = pkgsi686Linux.qt4.override {
-      stdenv = pkgsi686Linux.clangStdenv;
-    };
+    qt4 = pkgsi686Linux.qt4_clang;
   };
 
   skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index dcdd27bfe50..763e891173c 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -182,6 +182,7 @@ let
       pythonFull = linux;
       sbcl = linux;
       qt3 = linux;
+      qt4_clang = ["i686-linux"];
       quake3demo = linux;
       reiserfsprogs = linux;
       rubber = allBut cygwin;

From c4440c9c744744198f423dfa69cf4d19399ced4c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 28 Apr 2016 17:06:09 +0300
Subject: [PATCH 354/712] Revert "pulseaudio: select correct outputs"

This reverts commit 5e2bb0b31c892fed5024eaf7e93faf470a6ceb38.
---
 nixos/modules/config/pulseaudio.nix                  | 12 ++++++------
 nixos/modules/services/x11/desktop-managers/kde4.nix |  2 +-
 nixos/modules/services/x11/desktop-managers/kde5.nix |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index a964e04531c..f2db428a444 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -98,9 +98,9 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pulseaudioLight;
-        defaultText = "pkgs.pulseaudioLight";
-        example = literalExample "pkgs.pulseaudioFull";
+        default = pulseaudioLight.out;
+        defaultText = "pkgs.pulseaudioLight.out";
+        example = literalExample "pkgs.pulseaudioFull.out";
         description = ''
           The PulseAudio derivation to use.  This can be used to enable
           features (such as JACK support, Bluetooth) via the
@@ -130,7 +130,7 @@ in {
         source = clientConf;
       };
 
-      hardware.pulseaudio.configFile = mkDefault "${getBin cfg.package}/etc/pulse/default.pa";
+      hardware.pulseaudio.configFile = mkDefault "${cfg.package.out}/etc/pulse/default.pa";
     }
 
     (mkIf cfg.enable {
@@ -158,7 +158,7 @@ in {
           wantedBy = [ "default.target" ];
           serviceConfig = {
             Type = "notify";
-            ExecStart = "${getBin cfg.package}/bin/pulseaudio --daemonize=no";
+            ExecStart = "${cfg.package.out}/bin/pulseaudio --daemonize=no";
             Restart = "on-failure";
           };
         };
@@ -195,7 +195,7 @@ in {
         environment.PULSE_RUNTIME_PATH = stateDir;
         serviceConfig = {
           Type = "notify";
-          ExecStart = "${getBin cfg.package}/bin/pulseaudio --daemonize=no --log-level=${cfg.daemon.logLevel} --system -n --file=${cfg.configFile}";
+          ExecStart = "${cfg.package.out}/bin/pulseaudio --daemonize=no --log-level=${cfg.daemon.logLevel} --system -n --file=${cfg.configFile}";
           Restart = "on-failure";
         };
       };
diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index 79b4413a6e7..80e408be492 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -111,7 +111,7 @@ in
             # Load PulseAudio module for routing support.
             # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/
             ${optionalString config.hardware.pulseaudio.enable ''
-              ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
+              ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
             ''}
 
             # Start KDE.
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 584a0d4012d..70dc1ac2a26 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -59,7 +59,7 @@ in
         # Load PulseAudio module for routing support.
         # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/
         ${optionalString config.hardware.pulseaudio.enable ''
-          ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
+          ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
         ''}
 
         exec "${kde5.startkde}"

From 2e320a58b3f8749396148e9c663e74f0c5569dde Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Thu, 28 Apr 2016 15:21:40 +0200
Subject: [PATCH 355/712] diffoscope: 49 -> 52

---
 pkgs/tools/misc/diffoscope/default.nix        | 11 +++-----
 pkgs/tools/misc/diffoscope/ignore_links.patch | 25 +++++++++++++++++++
 2 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/tools/misc/diffoscope/ignore_links.patch

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index e54e83ef492..b916b91d5d2 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -6,22 +6,19 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "diffoscope-${version}";
-  version = "49";
+  version = "52";
 
   namePrefix = "";
 
   src = fetchgit {
     url = "git://anonscm.debian.org/reproducible/diffoscope.git";
     rev = "refs/tags/${version}";
-    sha256 = "0kh96h95rp7bk8rgc1z18jwv89dyp1n36bawqyqxhwwklmrgxr66";
+    sha256 = "1a22abvjs8f8c4anrcfhn02xw7m2gl701b9csxy06c5ymib0npxd";
   };
 
   patches =
-    [ # Ignore different link counts and inode change times.
-      (fetchpatch {
-        url = https://github.com/edolstra/diffoscope/commit/367f77bba8df0dbc89e63c9f66f05736adf5ec59.patch;
-        sha256 = "0mnp7icdrjn02dr6f5dwqvvr848jzgkv3cg69a24234y9gxd30ww";
-      })
+    [ # Ignore different link counts.
+      ./ignore_links.patch
     ];
 
   postPatch = ''
diff --git a/pkgs/tools/misc/diffoscope/ignore_links.patch b/pkgs/tools/misc/diffoscope/ignore_links.patch
new file mode 100644
index 00000000000..4e5046390fa
--- /dev/null
+++ b/pkgs/tools/misc/diffoscope/ignore_links.patch
@@ -0,0 +1,25 @@
+From: Eelco Dolstra <eelco.dolstra@logicblox.com>
+
+Nix deduplicates by hard-linking identical files, so it's normal for
+the the number of links to a file to differ.
+---
+diff --git a/diffoscope/comparators/directory.py b/diffoscope/comparators/directory.py
+index 7d1cd75..bd91eb0 100644
+--- a/diffoscope/comparators/directory.py
++++ b/diffoscope/comparators/directory.py
+@@ -47,6 +47,7 @@ class Stat(Command):
+     FILE_RE = re.compile(r'^\s*File:.*$')
+     DEVICE_RE = re.compile(r'Device: [0-9a-f]+h/[0-9]+d')
+     INODE_RE = re.compile(r'Inode: [0-9]+')
++    LINKS_RE = re.compile(r'Links: [0-9]+')
+     ACCESS_TIME_RE = re.compile(r'^Access: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$')
+     CHANGE_TIME_RE = re.compile(r'^Change: [0-9]{4}-[0-9]{2}-[0-9]{2}.*$')
+
+@@ -55,6 +56,7 @@ class Stat(Command):
+         line = Stat.FILE_RE.sub('', line)
+         line = Stat.DEVICE_RE.sub('', line)
+         line = Stat.INODE_RE.sub('', line)
++        line = Stat.LINKS_RE.sub('', line)
+         line = Stat.ACCESS_TIME_RE.sub('', line)
+         line = Stat.CHANGE_TIME_RE.sub('', line)
+         return line.encode('utf-8')

From 4f4037df6735a3dc7fc6afa325945bf04028f8a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 28 Apr 2016 11:59:21 -0300
Subject: [PATCH 356/712] albert: 0.8.7.2 -> 0.8.8

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

diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix
index 5e6931ce78e..9a1bedd8927 100644
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/applications/misc/albert/default.nix
@@ -2,16 +2,20 @@
 
 stdenv.mkDerivation rec {
   name    = "albert-${version}";
-  version = "0.8.7.2";
+  version = "0.8.8";
 
   src = fetchFromGitHub {
     owner  = "manuelschneid3r";
     repo   = "albert";
     rev    = "v${version}";
-    sha256 = "04k6cawil6kqkmsilq5mpjy8lwgk0g08s0v23d5a83calpq3ljpc";
+    sha256 = "1mqxy5xbvgzykg2vvr2d1p9kr2viga1pqxslkg9y1x05kdhr2zal";
   };
 
-  buildInputs = [ cmake qtbase qtsvg qtx11extras muparser makeQtWrapper ];
+  nativeBuildInputs = [ cmake makeQtWrapper ];
+
+  buildInputs = [ qtbase qtsvg qtx11extras muparser ];
+
+  enableParallelBuilding = true;
 
   fixupPhase = ''
     wrapQtProgram $out/bin/albert

From f690ccb26feef6ce17b14247ed83db88d86319d6 Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Thu, 28 Apr 2016 14:43:30 +0000
Subject: [PATCH 357/712] siege: 3.0.8 -> 4.0.1

---
 pkgs/tools/networking/siege/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix
index 976d8b3bc06..c4d68ee399a 100644
--- a/pkgs/tools/networking/siege/default.nix
+++ b/pkgs/tools/networking/siege/default.nix
@@ -1,18 +1,21 @@
-{ stdenv, fetchurl, openssl }:
+{ stdenv, fetchurl, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "siege-3.0.8";
+  name = "siege-4.0.1";
 
   src = fetchurl {
     url = "http://download.joedog.org/siege/${name}.tar.gz";
-    sha256 = "15xj0cl64mzf89i0jknqg37rkrcaqmgs4755l74b4nmp4bky7ddq";
+    sha256 = "0dr8k64s7zlhy3w8n1br0h6xd06p09p9809l9rp13isf10jp5pgx";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
-  buildInputs = [ openssl ];
+  buildInputs = [ openssl zlib ];
 
-  configureFlags = [ "--with-ssl=${openssl.dev}" ];
+  configureFlags = [
+    "--with-ssl=${openssl.dev}"
+    "--with-zlib=${zlib.dev}"
+  ];
 
   meta = with stdenv.lib; {
     description = "HTTP load tester";

From 63d016b3359355b8a75da1d9f27ea3a6d134c2e0 Mon Sep 17 00:00:00 2001
From: Simon Vandel Sillesen <simon.vandel@gmail.com>
Date: Thu, 28 Apr 2016 18:09:55 +0200
Subject: [PATCH 358/712] qbittorrent: 3.3.3 -> 3.3.4

---
 pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 31931aa75d9..d0e938c1b30 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -10,11 +10,11 @@ assert guiSupport -> (dbus_libs != null);
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "qbittorrent-${version}";
-  version = "3.3.3";
+  version = "3.3.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
-    sha256 = "0lyv230vqwb77isjqm6fwwgv8hdap88zir9yrccj0qxj7zf8p3cw";
+    sha256 = "1f4impsjck8anl39pwypsck7j6xw0dl18qd0b4xi23r45jvx9l60";
   };
 
   nativeBuildInputs = [ pkgconfig which ];

From f5038319560320abbdd0e802b3aa131f20ec4ba8 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 28 Apr 2016 18:09:41 +0200
Subject: [PATCH 359/712] herbstluftwm: 0.6.2 -> 0.7.0.

---
 pkgs/applications/window-managers/herbstluftwm/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix
index 8b6422df828..024c9e5c796 100644
--- a/pkgs/applications/window-managers/herbstluftwm/default.nix
+++ b/pkgs/applications/window-managers/herbstluftwm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, libX11, libXext, libXinerama }:
 
 stdenv.mkDerivation rec {
-  name = "herbstluftwm-0.6.2";
+  name = "herbstluftwm-0.7.0";
 
   src = fetchurl {
     url = "http://herbstluftwm.org/tarballs/${name}.tar.gz";
-    sha256 = "1b7h2zi0i9j17k1z62qw5zq7j9i8gv33pmcxnfiilzzfg8wmr7x8";
+    sha256 = "09xfs213vg1dpird61wik5bqb9yf8kh63ssy18ihf54inwqgqbvy";
   };
 
   patchPhase = ''
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
     homepage = "http://herbstluftwm.org/";
     license = stdenv.lib.licenses.bsd2;
     platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
   };
 }

From 0452b58f0fac57b50291de9b541e47388ccea7e1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 28 Apr 2016 18:36:09 +0200
Subject: [PATCH 360/712] gobject-introspection: fix on darwin

---
 .../gobject-introspection/darwin-fixups.patch | 26 -------------------
 .../gobject-introspection/default.nix         |  3 ---
 2 files changed, 29 deletions(-)
 delete mode 100644 pkgs/development/libraries/gobject-introspection/darwin-fixups.patch

diff --git a/pkgs/development/libraries/gobject-introspection/darwin-fixups.patch b/pkgs/development/libraries/gobject-introspection/darwin-fixups.patch
deleted file mode 100644
index 02443d56afa..00000000000
--- a/pkgs/development/libraries/gobject-introspection/darwin-fixups.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur gobject-introspection-1.46.0-orig/giscanner/ccompiler.py gobject-introspection-1.46.0/giscanner/ccompiler.py
---- gobject-introspection-1.46.0-orig/giscanner/ccompiler.py	2016-02-01 12:25:41.000000000 -0500
-+++ gobject-introspection-1.46.0/giscanner/ccompiler.py	2016-02-01 15:50:36.000000000 -0500
-@@ -128,11 +128,7 @@
-                     self.compiler.add_runtime_library_dir('.')
- 
-                 # https://bugzilla.gnome.org/show_bug.cgi?id=625195
--                args.append('-Wl,-rpath=.')
--
--                # Ensure libraries are always linked as we are going to use ldd to work
--                # out their names later
--                args.append('-Wl,--no-as-needed')
-+                args.append('-Wl,-rpath,.')
- 
-             for library in libraries:
-                 self.compiler.add_library(library)
-@@ -140,7 +136,7 @@
-                 for library_path in libpaths:
-                     args.append('-L' + library_path)
-                     if os.path.isabs(library_path):
--                        args.append('-Wl,-rpath=' + library_path)
-+                        args.append('-Wl,-rpath,' + library_path)
- 
-         else:
-             # libtool case: assemble linker command arguments, like we did before
-Only in gobject-introspection-1.46.0/giscanner: ccompiler.py~
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 55abb21845b..0b48ef076b1 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -40,9 +40,6 @@ stdenv.mkDerivation rec {
   patches = stdenv.lib.singleton (substituteAll {
     src = ./absolute_shlib_path.patch;
     inherit nixStoreDir;
-  }) ++ optional stdenv.isDarwin (substituteAll {
-    src = ./darwin-fixups.patch;
-    inherit nixStoreDir;
   });
 
   meta = with stdenv.lib; {

From bdaf6503366190b33651b36466934d7639d978b2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Apr 2016 11:27:06 +0200
Subject: [PATCH 361/712] ghc: update 8.0.x version to rc4

---
 pkgs/development/compilers/ghc/8.0.1.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix
index 404e7e5cc28..656dedc922d 100644
--- a/pkgs/development/compilers/ghc/8.0.1.nix
+++ b/pkgs/development/compilers/ghc/8.0.1.nix
@@ -7,12 +7,12 @@ let
 
 in 
 stdenv.mkDerivation rec {
-  version = "8.0.0.20160411";
+  version = "8.0.0.20160421";
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/8.0.1-rc3/${name}-src.tar.xz";
-    sha256 = "0cgk0li3pwag65xcrjci8l840aphklymjfmsrq0qpdi8bpsmi97d";
+    url = "https://downloads.haskell.org/~ghc/8.0.1-rc4/${name}-src.tar.xz";
+    sha256 = "183p1ilk8rlndi1vmg2vmlx00s18q3j31kin85qpbvicsxb8j1j1";
   };
 
   patches = [

From 4a0cbae0702eed8ea8d9d3141f022ff4db71db58 Mon Sep 17 00:00:00 2001
From: Yochai Meir <yochai@titat.info>
Date: Thu, 28 Apr 2016 20:31:14 +0300
Subject: [PATCH 362/712] eclipse: fix build error

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

diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix
index 074a622667f..e6828e6adad 100644
--- a/pkgs/applications/editors/eclipse/build-eclipse.nix
+++ b/pkgs/applications/editors/eclipse/build-eclipse.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     tar xfvz $src -C $out
 
     # Patch binaries.
-    interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
+    interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
     libCairo=$out/eclipse/libcairo-swt.so
     patchelf --set-interpreter $interpreter $out/eclipse/eclipse
     [ -f $libCairo ] && patchelf --set-rpath ${freetype}/lib:${fontconfig}/lib:${libX11}/lib:${libXrender}/lib:${zlib}/lib $libCairo
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
     makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
       --prefix PATH : ${jdk}/bin \
-      --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib${stdenv.lib.optionalString (webkitgtk2 != null) ":${webkitgtk2}/lib"} \
+      --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk.out}/lib:${libXtst}/lib${stdenv.lib.optionalString (webkitgtk2 != null) ":${webkitgtk2}/lib"} \
       --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"
 
     # Create desktop item.

From 72764178704119d451f3aee5f9d9b861d8e2ebb1 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 28 Apr 2016 20:46:34 +0300
Subject: [PATCH 363/712] kernel config: Enable BINFMT_MISC

This is enabled in x86 builds but lacking on ARM.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 6ba1234673b..485cdd76f6a 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -496,6 +496,9 @@ with stdenv.lib;
     BINFMT_SCRIPT y
   ''}
 
+  # For systemd-binfmt
+  BINFMT_MISC? y
+
   # Enable the 9P cache to speed up NixOS VM tests.
   9P_FSCACHE? y
   9P_FS_POSIX_ACL? y

From 89ce5d4b96264176ec542e090fc33d90d445d0e3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 28 Apr 2016 20:48:33 +0300
Subject: [PATCH 364/712] ddclient: Fix build after multiple outputs merge

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

diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix
index 53a0f4c3e6d..333292d9fab 100644
--- a/pkgs/tools/networking/ddclient/default.nix
+++ b/pkgs/tools/networking/ddclient/default.nix
@@ -9,6 +9,8 @@ buildPerlPackage rec {
     sha256 = "1j8zdn7fy7i0bjk3jf0hxnbnshc2yf054vxq64imxdpfd7n5zgfy";
   };
 
+  outputs = [ "out" ];
+
   buildInputs = [ perlPackages.IOSocketSSL perlPackages.DigestSHA1 ];
 
   patches = [ ./ddclient-line-buffer-stdout.patch ];

From 650e9b25bdef9074cb01036c401b8713462fc2d3 Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Fri, 29 Apr 2016 02:47:48 +0800
Subject: [PATCH 365/712] ltwheelconf: init at 0.2.7

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

diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/applications/misc/ltwheelconf/default.nix
new file mode 100644
index 00000000000..5450f5f2fc8
--- /dev/null
+++ b/pkgs/applications/misc/ltwheelconf/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, libusb1, pkgconfig, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "ltwheelconf";
+  version = "0.2.7";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "thk";
+    repo = "ltwheelconf";
+    rev = "df55451f059d593b0259431662612ab5c2bef859";
+    sha256 = "1fsz7k73yln987gcx1jvb5irxfbp1x2c457a60a8yap27nkp5y2w";
+  };
+
+  buildInputs = [ libusb1 pkgconfig ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ltwheelconf $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/thk/LTWheelConf;
+    description = "Logitech wheels configuration tool";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.ebzzry ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76a657cf1d5..342f0ce9a5e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2132,6 +2132,8 @@ in
     lua = lua5_2_compat;
   };
 
+  ltwheelconf = callPackage ../applications/misc/ltwheelconf { };
+
   kippo = callPackage ../servers/kippo { };
 
   kzipmix = callPackage_i686 ../tools/compression/kzipmix { };

From 49b947635fead9f7da703e2ee75667c1273eb34c Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Wed, 30 Mar 2016 20:46:31 +0200
Subject: [PATCH 366/712] graylog: init at 2.0.0

---
 pkgs/tools/misc/graylog/default.nix | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/misc/graylog/default.nix

diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
new file mode 100644
index 00000000000..a3952f7903b
--- /dev/null
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "2.0.0";
+  name = "graylog-${version}";
+
+  src = fetchurl {
+    url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
+    sha256 = "0qn2rf2aarfr34387fiv34rmav20c66b4zs9bkm8gpvj0laxrqh2";
+  };
+
+  dontBuild = true;
+  dontStrip = true;
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r {graylog.jar,lib,bin,plugin,data} $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Open source log management solution";
+    homepage    = https://www.graylog.org/;
+    license     = licenses.gpl3;
+    platforms   = platforms.unix;
+    maintainers = [ maintainers.fadenb ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1254917f08e..f7a7211de3a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1751,6 +1751,8 @@ in
 
   grails = callPackage ../development/web/grails { jdk = null; };
 
+  graylog = callPackage ../tools/misc/graylog { };
+
   gprof2dot = callPackage ../development/tools/profiling/gprof2dot {
     # Using pypy provides significant performance improvements (~2x)
     pythonPackages = pypyPackages;

From e48580c0831420bd0446c1db3d174bb618cc998f Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Wed, 30 Mar 2016 20:49:16 +0200
Subject: [PATCH 367/712] graylog service: Initial graylog service

---
 nixos/modules/misc/ids.nix                 |   1 +
 nixos/modules/module-list.nix              |   1 +
 nixos/modules/services/logging/graylog.nix | 161 +++++++++++++++++++++
 3 files changed, 163 insertions(+)
 create mode 100644 nixos/modules/services/logging/graylog.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 684ca132bc7..7e40c136667 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -264,6 +264,7 @@
       taskd = 240;
       factorio = 241;
       emby = 242;
+      graylog = 243;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index ec14fd2e363..b92361f628b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -183,6 +183,7 @@
   ./services/hardware/thermald.nix
   ./services/logging/awstats.nix
   ./services/logging/fluentd.nix
+  ./services/logging/graylog.nix
   ./services/logging/klogd.nix
   ./services/logging/logcheck.nix
   ./services/logging/logrotate.nix
diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix
new file mode 100644
index 00000000000..a7785decd19
--- /dev/null
+++ b/nixos/modules/services/logging/graylog.nix
@@ -0,0 +1,161 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.graylog;
+  configBool = b: if b then "true" else "false";
+
+  confFile = pkgs.writeText "graylog.conf" ''
+    is_master = ${configBool cfg.isMaster}
+    node_id_file = ${cfg.nodeIdFile}
+    password_secret = ${cfg.passwordSecret}
+    root_username = ${cfg.rootUsername}
+    root_password_sha2 = ${cfg.rootPasswordSha2}
+    elasticsearch_cluster_name = ${cfg.elasticsearchClusterName}
+    elasticsearch_discovery_zen_ping_multicast_enabled = ${configBool cfg.elasticsearchDiscoveryZenPingMulticastEnabled}
+    elasticsearch_discovery_zen_ping_unicast_hosts = ${cfg.elasticsearchDiscoveryZenPingUnicastHosts}
+    message_journal_dir = ${cfg.messageJournalDir}
+    mongodb_uri = ${cfg.mongodbUri}
+
+    ${cfg.extraConfig}
+  '';
+in
+
+{
+  ###### interface
+
+  options = {
+
+    services.graylog = {
+
+      enable = mkEnableOption "Graylog";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.graylog;
+        defaultText = "pkgs.graylog";
+        example = literalExample "pkgs.graylog";
+        description = "Graylog package to use.";
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "graylog";
+        example = literalExample "graylog";
+        description = "User account under which graylog runs";
+      };
+
+      isMaster = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Whether this is the master instance of your Graylog cluster";
+      };
+
+      nodeIdFile = mkOption {
+        type = types.str;
+        default = "/var/lib/graylog/server/node-id";
+        description = "Path of the file containing the graylog node-id";
+      };
+
+      passwordSecret = mkOption {
+        type = types.str;
+        description = ''
+          You MUST set a secret to secure/pepper the stored user passwords here. Use at least 64 characters.
+          Generate one by using for example: pwgen -N 1 -s 96
+        '';
+      };
+
+      rootUsername = mkOption {
+        type = types.str;
+        default = "admin";
+        description = "Name of the default administrator user";
+      };
+
+      rootPasswordSha2 = mkOption {
+        type = types.str;
+        example = "e3c652f0ba0b4801205814f8b6bc49672c4c74e25b497770bb89b22cdeb4e952";
+        description = ''
+          You MUST specify a hash password for the root user (which you only need to initially set up the
+          system and in case you lose connectivity to your authentication backend)
+          This password cannot be changed using the API or via the web interface. If you need to change it,
+          modify it here.
+          Create one by using for example: echo -n yourpassword | shasum -a 256
+          and use the resulting hash value as string for the option
+        '';
+      };
+
+      elasticsearchClusterName = mkOption {
+        type = types.str;
+        example = "graylog";
+        description = "This must be the same as for your Elasticsearch cluster";
+      };
+
+      elasticsearchDiscoveryZenPingMulticastEnabled = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to use elasticsearch multicast discovery";
+      };
+
+      elasticsearchDiscoveryZenPingUnicastHosts = mkOption {
+        type = types.str;
+        default = "127.0.0.1:9300";
+        description = "Tells Graylogs Elasticsearch client how to find other cluster members. See Elasticsearch documentation for details";
+      };
+
+      messageJournalDir = mkOption {
+        type = types.str;
+        default = "/var/lib/graylog/data/journal";
+        description = "The directory which will be used to store the message journal. The directory must be exclusively used by Graylog and must not contain any other files than the ones created by Graylog itself";
+      };
+
+      mongodbUri = mkOption {
+        type = types.str;
+        default = "mongodb://localhost/graylog";
+        description = "MongoDB connection string. See http://docs.mongodb.org/manual/reference/connection-string/ for details";
+      };
+
+      extraConfig = mkOption {
+        type = types.str;
+        default = "";
+        description = "Any other configuration options you might want to add";
+      };
+
+    };
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers = mkIf (cfg.user == "graylog") {
+      graylog = {
+        uid = config.ids.uids.graylog;
+        description = "Graylog server daemon user";
+      };
+    };
+
+    systemd.services.graylog = with pkgs; {
+      description = "Graylog Server";
+      wantedBy = [ "multi-user.target" ];
+      environment = {
+        JAVA_HOME = jre;
+        GRAYLOG_CONF = "${confFile}";
+      };
+      path = [ pkgs.openjdk8 pkgs.which pkgs.procps ];
+      preStart = ''
+        mkdir -p /var/lib/graylog -m 755
+        chown -R ${cfg.user} /var/lib/graylog
+
+        mkdir -p ${cfg.messageJournalDir} -m 755
+        chown -R ${cfg.user} ${cfg.messageJournalDir}
+      '';
+      serviceConfig = {
+        User="${cfg.user}";
+        PermissionsStartOnly=true;
+        ExecStart = "${cfg.package}/bin/graylogctl run";
+      };
+    };
+  };
+}

From 38ea8c6c30ac7be2a89e38395e2dc2c80563e9ec Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 28 Apr 2016 18:15:36 +0200
Subject: [PATCH 368/712] torbrowser: 5.5.4 -> 5.5.5

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

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index c320e7e58b6..849c6f8b85a 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -17,13 +17,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "tor-browser-${version}";
-  version = "5.5.4";
+  version = "5.5.5";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz";
     sha256 = if stdenv.is64bit then
-      "0sjx2r7z7s3x1ygs9xak1phng13jcf4d5pcfyfrfsrd8kb1yn8xa" else
-      "0w9wk9hk57hyhhx7l4sr2x64ki9882fr6py2can1slr7kbb4mhpb";
+      "0k6v41j880fb4zdxk1v13kmizdaz5rwvi5lskdbdi68iml4p53gj" else
+      "04mqjmnxwa75yi8gmdwadkzrzikgxn08bkvr50zdm7id9fj4nkza";
   };
 
   desktopItem = makeDesktopItem {

From 4741627bcf60e9b16cd767a8d3ded6bcbf3691b2 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 28 Apr 2016 19:04:23 +0200
Subject: [PATCH 369/712] torbrowser: fix argument handling in wrapper

With $@ unquoted, the wrapper would always just pass "" to firefox
---
 pkgs/tools/security/tor/torbrowser.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index 849c6f8b85a..910e6d1603a 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
         ~/Data/Browser/profile.default/preferences/extension-overrides.js
     fi
     export LD_LIBRARY_PATH=${ldLibraryPath}:$out/share/tor-browser/Browser/TorBrowser/Tor
-    $out/share/tor-browser/Browser/firefox -no-remote -profile ~/Data/Browser/profile.default "$@"
+    $out/share/tor-browser/Browser/firefox -no-remote -profile ~/Data/Browser/profile.default "\$@"
     EOF
     chmod +x $out/bin/tor-browser
 

From cdd636967913b5a2bb5ef64640f4e61e1d8dbce8 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 28 Apr 2016 19:21:42 +0200
Subject: [PATCH 370/712] torbrowser: add myself to maintainers

---
 pkgs/tools/security/tor/torbrowser.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index 910e6d1603a..26def44672d 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -82,6 +82,6 @@ in stdenv.mkDerivation rec {
     description = "Tor Browser Bundle";
     homepage    = https://www.torproject.org/;
     platforms   = platforms.linux;
-    maintainers = with maintainers; [ offline matejc doublec thoughtpolice ];
+    maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm ];
   };
 }

From 0798ebbfc59dc1c438f9e9e7f639f02b0f9014c3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 28 Apr 2016 23:48:36 +0200
Subject: [PATCH 371/712] geolite-legacy: 2016-04-25 -> 2016-04-28

---
 pkgs/data/misc/geolite-legacy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 051c7de107d..022ee995cb5 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,7 +8,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "geolite-legacy-${version}";
-  version = "2016-04-25";
+  version = "2016-04-28";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     "12k4nmfblm9c7kj4v7cyl6sgfgdfv2jdx4fl7nxfzpk1km7yc5na";
   srcGeoLiteCity = fetchDB
     "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
-    "1l6pnlapc9ky3k6wznlhi013i7r3i68x3b5bmkgbvnxadjjdwszw";
+    "190c5bq63rzkvvfrgiwgd5j0rk9qdq6vx16w28kraq8pwz0dcb2f";
   srcGeoLiteCityv6 = fetchDB
     "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
     "11igx6r0fypih5i3f0mrcv044pivnl45mq6pkq81i81cv28hfcn8";

From 6dac18a8be264b52577f2ac4fc9c1e04ccb7e39f Mon Sep 17 00:00:00 2001
From: Nathan Moos <moosingin3space@gmail.com>
Date: Thu, 28 Apr 2016 16:53:00 -0400
Subject: [PATCH 372/712] imatix_gsl: init at 4.1

---
 lib/maintainers.nix                           |  1 +
 pkgs/development/tools/imatix_gsl/default.nix | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/tools/imatix_gsl/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index ae38b7acf6a..2bf60c585fc 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -236,6 +236,7 @@
   mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>";
   modulistic = "Pablo Costa <modulistic@gmail.com>";
   mog = "Matthew O'Gorman <mog-lists@rldn.net>";
+  moosingin3space = "Nathan Moos <moosingin3space@gmail.com>";
   moretea = "Maarten Hoogendoorn <maarten@moretea.nl>";
   mornfall = "Petr Ročkai <me@mornfall.net>";
   MostAwesomeDude = "Corbin Simpson <cds@corbinsimpson.com>";
diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix
new file mode 100644
index 00000000000..0def514dec5
--- /dev/null
+++ b/pkgs/development/tools/imatix_gsl/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, pcre } :
+
+stdenv.mkDerivation rec {
+    name = "imatix_gsl";
+    version = "4.1";
+    src = fetchFromGitHub {
+    	owner = "imatix";
+	repo = "gsl";
+	rev = "72192d0d9de17de08d9379602d6482b4e5d402d0";
+	sha256 = "1apy11avgqc27xlczyjh15y10qjdyqsqab1wrl2067qgpdiy58w7";
+    };
+
+    buildInputs = [ pcre ];
+
+    preBuild = ''
+    	cd src
+    '';
+
+    installFlags = "DESTDIR=$(out)";
+
+    meta = with stdenv.lib; {
+    	 license = licenses.gpl3Plus;
+	 homepage = "https://github.com/imatix/gsl";
+	 description = ''
+	     A universal code generator
+	 '';
+	 platforms = platforms.unix;
+	 maintainer = [ maintainers.moosingin3space ];
+    };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1254917f08e..278da1c0638 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16677,4 +16677,6 @@ in
   golden-cheetah = qt5.callPackage ../applications/misc/golden-cheetah {};
 
   tomb = callPackage ../os-specific/linux/tomb {};
+
+  imatix_gsl = callPackage ../development/tools/imatix_gsl {};
 }

From 0da43bdc1d52de7d5febf3761736c41b1e47edf2 Mon Sep 17 00:00:00 2001
From: Brad Ediger <brad.ediger@madriska.com>
Date: Thu, 28 Apr 2016 17:30:08 -0500
Subject: [PATCH 373/712] spotify: 1.0.27 -> 1.0.28

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

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 0875ca939ee..d6db4403d77 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -5,7 +5,7 @@
 assert stdenv.system == "x86_64-linux";
 
 let
-  version = "1.0.27.71.g0a26e3b2-9";
+  version = "1.0.28.89.gf959d4ce-37";
 
   deps = [
     alsaLib
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
   src =
     fetchurl {
       url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-      sha256 = "1rs08cvn0y1lzazlmzj4sn2iyacadwi6j70n5c7rvfvvs4p61p42";
+      sha256 = "06v6fmjn0zi1riqhbmwkrq4m1q1vs95p348i8c12hqvsrp0g2qy5";
     };
 
   buildInputs = [ dpkg makeWrapper ];

From 25290a9f15b081a24a5f515792373bbc41bd982a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 28 Apr 2016 23:54:05 +0000
Subject: [PATCH 374/712] vivaldi: 1.0 -> 1.1

---
 .../networking/browsers/vivaldi/default.nix          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 7c3c167cf32..6028bb1fe07 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -10,23 +10,23 @@
 }:
 
 let
-  archUrl = name: arch: "https://vivaldi.com/download/stable/${name}_${arch}.deb";
+  archUrl = name: arch: "https://downloads.vivaldi.com/stable/${name}_${arch}.deb";
 in
 stdenv.mkDerivation rec {
-  version    = "1.0";
-  debversion = "stable_1.0.435.40-1";
+  version    = "1.1";
+  debversion = "stable_1.1.453.47-1";
   product    = "vivaldi";
   name       = "${product}-${version}";
 
   src = if stdenv.system == "x86_64-linux"
     then fetchurl {
       url    = archUrl "vivaldi-${debversion}" "amd64";
-      sha256 = "12c051a40258a95f9594eed2f73fa5f591482ac2a41d5cf643811b1ea2a1efbf";
+      sha256 = "09kadsi4ydjciq092i6linapqzjdzx915zqmz7vfq6w1yp9mqbwq";
     }
     else if stdenv.system == "i686-linux"
     then fetchurl {
       url    = archUrl "vivaldi-${debversion}" "i386";
-      sha256 = "6e0b84fba38211bab9a71bc10e97398fca77c0acd82791923c1d432b20846f0f";
+      sha256 = "0b5410phnkpg6sz0j345vdn0r6n89rm865bchqw8p4kx7pmy78z3";
     }
     else throw "Vivaldi is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
 
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
       atk alsaLib dbus_libs cups gtk gdk_pixbuf libexif ffmpeg libudev
       freetype fontconfig libXrender libuuid expat glib nss nspr
-      gstreamer libxml2 gst_plugins_base pango cairo gnome3.gconf 
+      gstreamer libxml2 gst_plugins_base pango cairo gnome3.gconf
       patchelf
     ];
 

From c4949476761215e5e736e77e054535ab49a0f983 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 28 Apr 2016 23:59:52 +0000
Subject: [PATCH 375/712] linux_testing: 4.6-rc4 -> 4.6-rc5

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index fb1bf73ad0e..df30119b38d 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.6-rc4";
-  modDirVersion = "4.6.0-rc4";
+  version = "4.6-rc5";
+  modDirVersion = "4.6.0-rc5";
   extraMeta.branch = "4.6";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "1c6y6ry8nll8mab0xwwkmpwzp2k4rbp7jl3f4ihi7g2kv2678cbp";
+    sha256 = "1795yq1bliyvfzb2a8rkldxfcjxq5frspr74cp5v0g37bamdrwvd";
   };
 
   features.iwlwifi = true;

From 5bd88a3e41b14df4f1e80359d47dc0be080d509a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 28 Apr 2016 21:22:46 -0300
Subject: [PATCH 376/712] grepmail: set outputs to out only

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 89706545031..7a608ccd8ed 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5551,6 +5551,7 @@ let self = _self // overrides; _self = with self; {
     };
     buildInputs = [ FileSlurp URI ];
     propagatedBuildInputs = [ DateManip DigestMD5 MailMboxMessageParser TimeDate ];
+    outputs = [ "out" ];
     meta = {
       homepage = https://github.com/coppit/grepmail;
       description = "Search mailboxes for mail matching a regular expression";

From cf8261135121cc4080d0fcc5024baba4df5e7235 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Tue, 26 Apr 2016 23:28:39 +0200
Subject: [PATCH 377/712] pycairo: enable for python35

The patch was taken from FreeBSD, it is also used on debian. see:
https://svnweb.freebsd.org/ports/head/graphics/py3-cairo/files/pycairo-1.10.0-waf-py3_5.patch?revision=401900&view=markup
---
 pkgs/development/python-modules/pycairo/default.nix    |  5 ++++-
 .../development/python-modules/pycairo/waf-py3_5.patch | 10 ++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/pycairo/waf-py3_5.patch

diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index 84dfdd32a10..433eb9d6b2a 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchpatch, python, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35 }:
 
-if (isPyPy || isPy35) then throw "pycairo not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec {
+if (isPyPy) then throw "pycairo not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec {
   version = "1.10.0";
   name = "${python.libPrefix}-pycairo-${version}";
   src = if python.is_py3k or false
@@ -23,6 +23,8 @@ if (isPyPy || isPy35) then throw "pycairo not supported for interpreter ${python
     sha256 = "0xfl1i9dips2nykyg91f5h5r3xpk2hp1js1gq5z0hwjr0in55id4";
   };
 
+  patch_waf-py3_5 = ./waf-py3_5.patch;
+
   buildInputs = [ python pkgconfig cairo xlibsWrapper ];
 
   configurePhase = ''
@@ -30,6 +32,7 @@ if (isPyPy || isPy35) then throw "pycairo not supported for interpreter ${python
       cd $(${python.executable} waf unpack)
       pwd
       patch -p1 < ${patch_waf}
+      ${stdenv.lib.optionalString isPy35 "patch -p1 < ${patch_waf-py3_5}"}
     )
 
     ${python.executable} waf configure --prefix=$out
diff --git a/pkgs/development/python-modules/pycairo/waf-py3_5.patch b/pkgs/development/python-modules/pycairo/waf-py3_5.patch
new file mode 100644
index 00000000000..dcfdbea2fbd
--- /dev/null
+++ b/pkgs/development/python-modules/pycairo/waf-py3_5.patch
@@ -0,0 +1,10 @@
+--- a/waflib/Build.py
++++ b/waflib/Build.py
+@@ -151,6 +151,7 @@ class BuildContext(Context.Context):
+ 				f.close()
+ 		self.init_dirs()
+ 	def store(self):
++		return
+ 		data={}
+ 		for x in SAVED_ATTRS:
+ 			data[x]=getattr(self,x)

From 1142b402a84b9eab3309d60c00739ae73d42673e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 29 Apr 2016 01:05:41 +0000
Subject: [PATCH 378/712] vivaldi: Clean up

---
 .../networking/browsers/vivaldi/default.nix   | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 6028bb1fe07..2c6ba3f8929 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -10,25 +10,25 @@
 }:
 
 let
-  archUrl = name: arch: "https://downloads.vivaldi.com/stable/${name}_${arch}.deb";
-in
-stdenv.mkDerivation rec {
-  version    = "1.1";
-  debversion = "stable_1.1.453.47-1";
+  version = "1.1";
+  build = "453.47-1";
+  fullVersion = "stable_${version}.${build}";
+
+  info = if stdenv.is64bit then {
+      arch = "amd64";
+      sha256 = "09kadsi4ydjciq092i6linapqzjdzx915zqmz7vfq6w1yp9mqbwq";
+    } else {
+      arch = "i386";
+      sha256 = "0b5410phnkpg6sz0j345vdn0r6n89rm865bchqw8p4kx7pmy78z3";
+    };
+in stdenv.mkDerivation rec {
   product    = "vivaldi";
   name       = "${product}-${version}";
 
-  src = if stdenv.system == "x86_64-linux"
-    then fetchurl {
-      url    = archUrl "vivaldi-${debversion}" "amd64";
-      sha256 = "09kadsi4ydjciq092i6linapqzjdzx915zqmz7vfq6w1yp9mqbwq";
-    }
-    else if stdenv.system == "i686-linux"
-    then fetchurl {
-      url    = archUrl "vivaldi-${debversion}" "i386";
-      sha256 = "0b5410phnkpg6sz0j345vdn0r6n89rm865bchqw8p4kx7pmy78z3";
-    }
-    else throw "Vivaldi is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
+  src = fetchurl {
+    inherit (info) sha256;
+    url = "https://downloads.vivaldi.com/stable/${product}-${fullVersion}_${info.arch}.deb";
+  };
 
   unpackPhase = ''
     ar vx ${src}
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     ];
 
   libPath = stdenv.lib.makeLibraryPath buildInputs
-    + stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
+    + stdenv.lib.optionalString (stdenv.is64bit)
       (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);
 
   buildPhase = ''
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     description = "A Browser for our Friends, powerful and personal";
     homepage    = "https://vivaldi.com";
     license     = licenses.unfree;
-    maintainers = with maintainers; [ otwieracz ];
+    maintainers = with maintainers; [ otwieracz nequissimus ];
     platforms   = platforms.linux;
   };
 }

From 934a460fd2fdd7667fa2928275aa7e0cbcab5feb Mon Sep 17 00:00:00 2001
From: Rhys <rimmington@gmail.com>
Date: Fri, 29 Apr 2016 09:00:38 +1000
Subject: [PATCH 379/712] v8: Build 3.16.14 on ARM

---
 pkgs/development/libraries/v8/3.16.14.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix
index c79357cd907..d9addab3030 100644
--- a/pkgs/development/libraries/v8/3.16.14.nix
+++ b/pkgs/development/libraries/v8/3.16.14.nix
@@ -3,7 +3,10 @@
 assert readline != null;
 
 let
-  arch = if stdenv.is64bit then "x64" else "ia32";
+  arch = if stdenv.isArm
+    then (if stdenv.is64bit then "arm64" else "arm")
+    else (if stdenv.is64bit then "x64" else "ia32");
+  armHardFloat = stdenv.isArm && (stdenv.platform.gcc.float or null) == "hard";
 in
 
 stdenv.mkDerivation rec {
@@ -34,6 +37,7 @@ stdenv.mkDerivation rec {
         -Dconsole=readline \
         -Dcomponent=shared_library \
         -Dv8_target_arch=${arch} \
+        ${lib.optionalString armHardFloat "-Dv8_use_arm_eabi_hardfloat=true"} \
         --depth=. -Ibuild/standalone.gypi \
         build/all.gyp
   '';

From fbbf910e230d016aa9eb5acdfd6efe1200d4bd69 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 29 Apr 2016 02:29:02 +0000
Subject: [PATCH 380/712] rpm: add lua support and a few propagatedBuildInputs

It turns out that a surprising number of common packages use lua
scripts in RPM files, and not having lua can lead to obscure failures.

The propagatedBuildInputs stuff makes the librpm stuff more useful,
since some of its headers didn't work without extra buildInputs before.
---
 pkgs/tools/package-management/rpm/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 24346fb0eb7..ab5574b07f1 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python }:
+{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python, lua, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "rpm-4.12.0";
@@ -8,7 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "18hk47hc755nslvb7xkq4jb095z7va0nlcyxdpxayc4lmb8mq3bp";
   };
 
-  buildInputs = [ cpio zlib bzip2 file libarchive nspr nss popt db xz python ];
+  buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua pkgconfig ];
+
+  # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements
+  propagatedBuildInputs = [ popt nss db bzip2 libarchive ];
 
   # Note: we don't add elfutils to buildInputs, since it provides a
   # bad `ld' and other stuff.
@@ -21,7 +24,7 @@ stdenv.mkDerivation rec {
     substituteInPlace configure --replace 'python''${PYTHON_VERSION}' ${python.executable}
   '';
 
-  configureFlags = "--with-external-db --without-lua --enable-python";
+  configureFlags = "--with-external-db --with-lua --enable-python";
 
   meta = with stdenv.lib; {
     homepage = http://www.rpm.org/;

From 7dd3a92c19f4c4170580bdac44b8b1eea376e17e Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 29 Apr 2016 02:33:14 +0000
Subject: [PATCH 381/712] libsolv: init at 0.6.20

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

diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix
new file mode 100644
index 00000000000..a69403ded07
--- /dev/null
+++ b/pkgs/development/libraries/libsolv/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchFromGitHub, cmake, zlib, expat, rpm, db }:
+
+stdenv.mkDerivation rec {
+  rev  = "0.6.20";
+  name = "libsolv-${rev}";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner  = "openSUSE";
+    repo   = "libsolv";
+    sha256 = "1gammarbnjbbkw2vlgcj9ynp1kgi5nns6xcl6ab8b5i4zgq91v2p";
+  };
+
+  cmakeFlags = "-DENABLE_RPMMD=true -DENABLE_RPMDB=true -DENABLE_PUBKEY=true -DENABLE_RPMDB_BYRPMHEADER=true";
+
+  buildInputs = [ cmake zlib expat rpm db ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 659b02935f4..35769de5873 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7734,6 +7734,8 @@ in
 
   libsieve = callPackage ../development/libraries/libsieve { };
 
+  libsolv = callPackage ../development/libraries/libsolv { };
+
   libspectre = callPackage ../development/libraries/libspectre { };
 
   libgsf = callPackage ../development/libraries/libgsf { };

From 730d488a124e7011ccb63f7847fe373a8eefac51 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 29 Apr 2016 02:25:28 +0200
Subject: [PATCH 382/712] claws-mail: rename from (and alias to) clawsMail

---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 40083d8bf4f..f49b2d88436 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -30,6 +30,7 @@ doNotDisplayTwice rec {
   bundler_HEAD = bundler; # added 2015-11-15
   cheetahTemplate = pythonPackages.cheetah; # 2015-06-15
   clangAnalyzer = clang-analyzer;  # added 2015-02-20
+  clawsMail = claws-mail; # added 2016-04-29
   conkerorWrapper = conkeror; # added 2015-01
   cool-old-term = cool-retro-term; # added 2015-01-31
   cupsBjnp = cups-bjnp; # added 2016-01-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35769de5873..72e1f0200fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11892,7 +11892,7 @@ in
 
   cinelerra = callPackage ../applications/video/cinelerra { };
 
-  clawsMail = callPackage ../applications/networking/mailreaders/claws-mail {
+  claws-mail = callPackage ../applications/networking/mailreaders/claws-mail {
     inherit (gnome3) gsettings_desktop_schemas;
     enableNetworkManager = config.networking.networkmanager.enable or false;
   };

From 75b01594c81508380881fb7bdfe2d349effdd7c0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 29 Apr 2016 04:36:42 +0200
Subject: [PATCH 383/712] sylpheed: 3.4.1 -> 3.5.0

---
 .../networking/mailreaders/sylpheed/default.nix          | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index ac7846836ff..65c1001ae78 100644
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
@@ -11,14 +11,13 @@ with stdenv.lib;
 assert sslSupport -> openssl != null;
 assert gpgSupport -> gpgme != null;
 
-let version = "3.4.1"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "sylpheed-${version}";
+  version = "3.5.0";
 
   src = fetchurl {
-    url = "http://sylpheed.sraoss.jp/sylpheed/v3.4/sylpheed-${version}.tar.bz2";
-    sha256 = "11wpifvn8a0p4dqmvi7r61imqkgm6rjjp3h057c344vny37livbx";
+    url = "http://sylpheed.sraoss.jp/sylpheed/v3.5/${name}.tar.bz2";
+    sha256 = "0p50cr9h8b7cv1ayxhqxpj3kv0b7k9dga7lmmfb1lvyagg8n42sa";
   };
 
   buildInputs =

From bd8a1258bf11a60cf29e7d269b01649d87c0d0c0 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 29 Apr 2016 02:40:08 +0000
Subject: [PATCH 384/712] createrepo_c: init at 0.10.0

---
 .../createrepo_c/default.nix                  | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/package-management/createrepo_c/default.nix

diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix
new file mode 100644
index 00000000000..b884540f8d4
--- /dev/null
+++ b/pkgs/tools/package-management/createrepo_c/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python, rpm, openssl, sqlite, file, xz, pcre, bashCompletion }:
+
+stdenv.mkDerivation rec {
+  rev  = "0.10.0";
+  name = "createrepo_c-${rev}";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner  = "rpm-software-management";
+    repo   = "createrepo_c";
+    sha256 = "1sqzdkj9vigkvxsjlih1i0gylv53na2yic5if9w1s2sgxhqqz5zv";
+  };
+
+  # FIXME: ugh, there has to be a better way to do this...
+  prePatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace 'execute_process(COMMAND ''${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)' \
+                "set (BASHCOMP_DIR "$out/share/bash-completion/completions")"
+
+    substituteInPlace src/python/CMakeLists.txt \
+      --replace 'EXECUTE_PROCESS(COMMAND ''${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)' \
+                "set (PYTHON_INSTALL_DIR "$out/${python.sitePackages}")"
+  '';
+
+  buildInputs = [ cmake pkgconfig bzip2 expat glib curl libxml2 python rpm openssl sqlite file xz pcre bashCompletion ];
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 72e1f0200fa..d904496b81c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1159,6 +1159,8 @@ in
 
   crackxls = callPackage ../tools/security/crackxls { };
 
+  createrepo_c = callPackage ../tools/package-management/createrepo_c { };
+
   cromfs = callPackage ../tools/archivers/cromfs { };
 
   cron = callPackage ../tools/system/cron { };

From fcf37351bdcc33c297eac352262666d5b347bdc6 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 29 Apr 2016 02:46:16 +0000
Subject: [PATCH 385/712] librepo: init at 1.7.18

---
 .../package-management/librepo/default.nix    | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/package-management/librepo/default.nix

diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix
new file mode 100644
index 00000000000..21fc9fe97f5
--- /dev/null
+++ b/pkgs/tools/package-management/librepo/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, cmake, python, pkgconfig, expat, glib, pcre, openssl, curl, check, attr, gpgme }:
+
+stdenv.mkDerivation rec {
+  version = "1.7.18";
+  name = "librepo-${version}";
+
+  src = fetchFromGitHub {
+    owner  = "rpm-software-management";
+    repo   = "librepo";
+    rev    = name;
+    sha256 = "05iqx2kvfqsskb2r3n5p8f91i4gd4pbw6nh30pn532mgab64cvxk";
+  };
+
+  patchPhase = ''
+    substituteInPlace librepo/python/python2/CMakeLists.txt \
+      --replace ' ''${PYTHON_INSTALL_DIR}' " $out/lib/python2.7/site-packages"
+  '';
+
+  buildInputs = [ cmake python pkgconfig expat glib pcre openssl curl check attr gpgme ];
+
+  # librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here
+  propagatedBuildInputs = [ curl gpgme expat ];
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d904496b81c..674d5839251 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7726,6 +7726,8 @@ in
 
   librelp = callPackage ../development/libraries/librelp { };
 
+  librepo = callPackage ../tools/package-management/librepo { };
+
   libresample = callPackage ../development/libraries/libresample {};
 
   librevenge = callPackage ../development/libraries/librevenge {};

From d70752cce9b0df5f2a9d4a1afb376e89869b1e7f Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 29 Apr 2016 03:06:02 +0000
Subject: [PATCH 386/712] libhif: init at 87e4cb24

The latest released version is too old for my needs, so I'm picking
a git commit that works. I'll update it when they release a new one.
---
 .../package-management/libhif/default.nix     | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/package-management/libhif/default.nix

diff --git a/pkgs/tools/package-management/libhif/default.nix b/pkgs/tools/package-management/libhif/default.nix
new file mode 100644
index 00000000000..895165a1c1f
--- /dev/null
+++ b/pkgs/tools/package-management/libhif/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, autoconf, automake, libtool, expat, python, sphinx, gobjectIntrospection, librepo, check, rpm, libsolv, pcre, curl, gtk_doc, zlib, xz, elfutils }:
+
+stdenv.mkDerivation rec {
+  rev  = "87e4cb247f5982fd48636691a955cc566d3110a3";
+  name = "libhif-${stdenv.lib.strings.substring 0 7 rev}";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner  = "rpm-software-management";
+    repo   = "libhif";
+    sha256 = "1g8hrqjawzwcx1gjcnv9sxg5i8l13dab3rr3i641k5vi76vv8miq";
+  };
+
+  postPatch = ''
+    for file in python/hawkey/CMakeLists.txt python/hawkey/tests/module/CMakeLists.txt; do
+      substituteInPlace $file --replace ' ''${PYTHON_INSTALL_DIR}' " $out/${python.sitePackages}"
+    done
+
+    # Until https://github.com/rpm-software-management/libhif/issues/43 is implemented, let's not force users to have this path
+    substituteInPlace libhif/hif-keyring.c \
+      --replace '"/etc/pki/rpm-gpg"' 'getenv("LIBHIF_RPM_GPG_PATH_OVERRIDE") ? getenv("LIBHIF_RPM_GPG_PATH_OVERRIDE") : "/etc/pki/rpm-gpg"'
+ '';
+
+  buildInputs = [ cmake pkgconfig pcre expat python sphinx gobjectIntrospection gtk_doc librepo check rpm curl ];
+
+  # ibhif/hif-packagedelta.h includes solv/pool.h
+  propagatedBuildInputs = [ libsolv ];
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 674d5839251..768da42ca7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7650,6 +7650,8 @@ in
 
   libharu = callPackage ../development/libraries/libharu { };
 
+  libhif = callPackage ../tools/package-management/libhif { sphinx = python27Packages.sphinx; };
+
   libHX = callPackage ../development/libraries/libHX { };
 
   libibmad = callPackage ../development/libraries/libibmad { };

From a6ce78130b12f6aa05be00fc01dccf82c536e886 Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Fri, 29 Apr 2016 11:12:34 +0800
Subject: [PATCH 387/712] consoletools: copy utils to bin

---
 pkgs/os-specific/linux/consoletools/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix
index 0a799775551..b9f1ee90fe9 100644
--- a/pkgs/os-specific/linux/consoletools/default.nix
+++ b/pkgs/os-specific/linux/consoletools/default.nix
@@ -10,14 +10,17 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ SDL ];
+
   makeFlags = [ "DESTDIR=$(out)"];
 
+  installFlags = ''PREFIX=""'';
+
   meta = with stdenv.lib; {
     homepage = https://sourceforge.net/projects/linuxconsole/;
     description = "A set of tools for joysticks and serial peripherals";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ pSub ];
+    maintainers = with maintainers; [ pSub ebzzry ];
 
     longDescription = ''
       The included tools are:

From 203fee061858133a46daee2812806d1b6c8d7db5 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 29 Apr 2016 03:20:04 +0000
Subject: [PATCH 388/712] rpm-ostree: init at 2016.1

---
 pkgs/tools/misc/rpm-ostree/default.nix | 41 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/tools/misc/rpm-ostree/default.nix

diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix
new file mode 100644
index 00000000000..372b0a7f270
--- /dev/null
+++ b/pkgs/tools/misc/rpm-ostree/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, ostree, rpm, which, autoconf, automake, libtool, pkgconfig,
+  libcap, glib, libgsystem, json_glib, libarchive, libhif, librepo, gtk_doc, elfutils,
+  libxslt, docbook_xsl, docbook_xml_dtd_42, acl }:
+
+let
+  libglnx-src = fetchFromGitHub {
+    owner  = "GNOME";
+    repo   = "libglnx";
+    rev    = "08ae6639e522e9b11765245fbecdbbe474ccde98";
+    sha256 = "1k7fbivi2mwb2x5bqqbqc3nbnfjjw1l911hs914197hyqpy21dab";
+  };
+in stdenv.mkDerivation rec {
+  rev  = "v2016.1";
+  name = "rpm-ostree";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner  = "projectatomic";
+    repo   = "rpm-ostree";
+    sha256 = "19jvnmy9zinx0j5nvy3h5abfv9d988kvyza09gljx16gll8qkbbf";
+  };
+
+  NIX_CFLAGS_LINK = "-L${elfutils}/lib";
+
+  buildInputs = [
+    which autoconf automake pkgconfig libtool libcap ostree rpm glib libgsystem
+    json_glib libarchive libhif librepo gtk_doc libxslt docbook_xsl docbook_xml_dtd_42
+    # FIXME: get rid of this once libarchive properly propagates this
+    acl
+  ];
+
+  prePatch = ''
+    rmdir libglnx
+    cp --no-preserve=mode -r ${libglnx-src} libglnx
+  '';
+
+  preConfigure = ''
+    env NOCONFIGURE=1 ./autogen.sh
+  '';
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 768da42ca7e..0c2b6cd9570 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3121,6 +3121,8 @@ in
 
   rpm = callPackage ../tools/package-management/rpm { };
 
+  rpm-ostree = callPackage ../tools/misc/rpm-ostree { };
+
   rpmextract = callPackage ../tools/archivers/rpmextract { };
 
   rrdtool = callPackage ../tools/misc/rrdtool { };

From 5de3cfe21039153757236d9569543e674cfaa6b6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 28 Apr 2016 21:37:16 +0000
Subject: [PATCH 389/712] smplayer: fix build after qmakeHook

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

diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 0aa92c9af71..15b178fc8e6 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtscript }:
+{ stdenv, fetchurl, qmakeHook, qtscript }:
 
 stdenv.mkDerivation rec {
   name = "smplayer-16.1.0";
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
 
   patches = [ ./basegui.cpp.patch ];
 
-  buildInputs = [ qtscript ];
+  buildInputs = [ qmakeHook qtscript ];
+
+  dontUseQmakeConfigure = true;
 
   preConfigure = ''
     makeFlags="PREFIX=$out"

From ce7181f9a8fcfaca0fd8ac45e98f5ff377a9a3d9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 28 Apr 2016 21:38:16 +0000
Subject: [PATCH 390/712] smtube: fix build after qmakeHook

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

diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index 68c0d7f5812..729c90d052c 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtscript, qtwebkit }:
+{ stdenv, fetchurl, qmakeHook, qtscript, qtwebkit }:
 
 stdenv.mkDerivation rec {
   version = "16.1.0";
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
     "PREFIX=$(out)"
   ];
 
-  buildInputs = [ qtscript qtwebkit ];
+  dontUseQmakeConfigure = true;
+
+  buildInputs = [ qmakeHook qtscript qtwebkit ];
 
   meta = with stdenv.lib; {
     description = "Play and download Youtube videos";

From ecfc523d32b6969fbb0c5641fb2d155812e2b9f8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Apr 2016 10:28:35 +0200
Subject: [PATCH 391/712] Update EC2 AMIs to 16.03.659.011ea84

This includes the binutils mass rebuild.
---
 nixos/modules/virtualisation/ec2-amis.nix | 72 +++++++++++------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix
index e0aad5e42f2..5257aaf6202 100644
--- a/nixos/modules/virtualisation/ec2-amis.nix
+++ b/nixos/modules/virtualisation/ec2-amis.nix
@@ -90,40 +90,40 @@
   "15.09".us-west-2.pv-ebs = "ami-005fb160";
   "15.09".us-west-2.pv-s3 = "ami-cd55bbad";
 
-  "16.03".ap-northeast-1.hvm-ebs = "ami-885040e6";
-  "16.03".ap-northeast-1.hvm-s3 = "ami-d15a4abf";
-  "16.03".ap-northeast-1.pv-ebs = "ami-7f455511";
-  "16.03".ap-northeast-1.pv-s3 = "ami-6d7d6d03";
-  "16.03".ap-southeast-1.hvm-ebs = "ami-478a5f24";
-  "16.03".ap-southeast-1.hvm-s3 = "ami-b2885dd1";
-  "16.03".ap-southeast-1.pv-ebs = "ami-55b46136";
-  "16.03".ap-southeast-1.pv-s3 = "ami-92b762f1";
-  "16.03".ap-southeast-2.hvm-ebs = "ami-26b09345";
-  "16.03".ap-southeast-2.hvm-s3 = "ami-52ac8f31";
-  "16.03".ap-southeast-2.pv-ebs = "ami-1fb3907c";
-  "16.03".ap-southeast-2.pv-s3 = "ami-49b1922a";
-  "16.03".eu-central-1.hvm-ebs = "ami-2bd63744";
-  "16.03".eu-central-1.hvm-s3 = "ami-82d435ed";
-  "16.03".eu-central-1.pv-ebs = "ami-b729c8d8";
-  "16.03".eu-central-1.pv-s3 = "ami-a12dccce";
-  "16.03".eu-west-1.hvm-ebs = "ami-87c242f4";
-  "16.03".eu-west-1.hvm-s3 = "ami-b6c343c5";
-  "16.03".eu-west-1.pv-ebs = "ami-6bc94918";
-  "16.03".eu-west-1.pv-s3 = "ami-00cb4b73";
-  "16.03".sa-east-1.hvm-ebs = "ami-845cd3e8";
-  "16.03".sa-east-1.hvm-s3 = "ami-8142cded";
-  "16.03".sa-east-1.pv-ebs = "ami-1643cc7a";
-  "16.03".sa-east-1.pv-s3 = "ami-1646c97a";
-  "16.03".us-east-1.hvm-ebs = "ami-2cc4d046";
-  "16.03".us-east-1.hvm-s3 = "ami-9bc9ddf1";
-  "16.03".us-east-1.pv-ebs = "ami-7df4e017";
-  "16.03".us-east-1.pv-s3 = "ami-90f2e6fa";
-  "16.03".us-west-1.hvm-ebs = "ami-d8116db8";
-  "16.03".us-west-1.hvm-s3 = "ami-a7166ac7";
-  "16.03".us-west-1.pv-ebs = "ami-e90c7089";
-  "16.03".us-west-1.pv-s3 = "ami-5b0c703b";
-  "16.03".us-west-2.hvm-ebs = "ami-b339ccd3";
-  "16.03".us-west-2.hvm-s3 = "ami-2c3bce4c";
-  "16.03".us-west-2.pv-ebs = "ami-0625d066";
-  "16.03".us-west-2.pv-s3 = "ami-7414e114";
+  "16.03".ap-northeast-1.hvm-ebs = "ami-b6edf5d8";
+  "16.03".ap-northeast-1.hvm-s3 = "ami-b1e3fbdf";
+  "16.03".ap-northeast-1.pv-ebs = "ami-6190880f";
+  "16.03".ap-northeast-1.pv-s3 = "ami-908d95fe";
+  "16.03".ap-southeast-1.hvm-ebs = "ami-35b16656";
+  "16.03".ap-southeast-1.hvm-s3 = "ami-41be6922";
+  "16.03".ap-southeast-1.pv-ebs = "ami-4cb96e2f";
+  "16.03".ap-southeast-1.pv-s3 = "ami-3bb96e58";
+  "16.03".ap-southeast-2.hvm-ebs = "ami-debc91bd";
+  "16.03".ap-southeast-2.hvm-s3 = "ami-55bc9136";
+  "16.03".ap-southeast-2.pv-ebs = "ami-b38ba6d0";
+  "16.03".ap-southeast-2.pv-s3 = "ami-9e8ba6fd";
+  "16.03".eu-central-1.hvm-ebs = "ami-7c967413";
+  "16.03".eu-central-1.hvm-s3 = "ami-b29072dd";
+  "16.03".eu-central-1.pv-ebs = "ami-7a947615";
+  "16.03".eu-central-1.pv-s3 = "ami-729b791d";
+  "16.03".eu-west-1.hvm-ebs = "ami-ff27a98c";
+  "16.03".eu-west-1.hvm-s3 = "ami-6c21af1f";
+  "16.03".eu-west-1.pv-ebs = "ami-a33cb2d0";
+  "16.03".eu-west-1.pv-s3 = "ami-ec38b69f";
+  "16.03".sa-east-1.hvm-ebs = "ami-5bef6637";
+  "16.03".sa-east-1.hvm-s3 = "ami-55f87139";
+  "16.03".sa-east-1.pv-ebs = "ami-76e56c1a";
+  "16.03".sa-east-1.pv-s3 = "ami-e1f8718d";
+  "16.03".us-east-1.hvm-ebs = "ami-4bfd1926";
+  "16.03".us-east-1.hvm-s3 = "ami-60c5210d";
+  "16.03".us-east-1.pv-ebs = "ami-c0c92dad";
+  "16.03".us-east-1.pv-s3 = "ami-f9d63294";
+  "16.03".us-west-1.hvm-ebs = "ami-13aad473";
+  "16.03".us-west-1.hvm-s3 = "ami-e1a8d681";
+  "16.03".us-west-1.pv-ebs = "ami-c0a6d8a0";
+  "16.03".us-west-1.pv-s3 = "ami-6aa9d70a";
+  "16.03".us-west-2.hvm-ebs = "ami-265dad46";
+  "16.03".us-west-2.hvm-s3 = "ami-cd40b0ad";
+  "16.03".us-west-2.pv-ebs = "ami-7b4aba1b";
+  "16.03".us-west-2.pv-s3 = "ami-0849b968";
 }

From 83c0aca062369aa43d5e692f22ff22e8d2e787a1 Mon Sep 17 00:00:00 2001
From: Nahum Shalman <nshalman@omniti.com>
Date: Fri, 8 Apr 2016 13:53:27 +0000
Subject: [PATCH 392/712] installer: simple PXE bootable NixOS installer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Nix store squashfs is stored inside the initrd instead of separately

(cherry picked from commit 976fd407796877b538c470d3a5253ad3e1f7bc68)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 .../installer/netboot/netboot-base.nix        | 20 ++++
 .../installer/netboot/netboot-minimal.nix     | 10 ++
 nixos/modules/installer/netboot/netboot.nix   | 91 +++++++++++++++++++
 nixos/release.nix                             | 14 +++
 nixos/tests/boot.nix                          | 40 +++++++-
 5 files changed, 173 insertions(+), 2 deletions(-)
 create mode 100644 nixos/modules/installer/netboot/netboot-base.nix
 create mode 100644 nixos/modules/installer/netboot/netboot-minimal.nix
 create mode 100644 nixos/modules/installer/netboot/netboot.nix

diff --git a/nixos/modules/installer/netboot/netboot-base.nix b/nixos/modules/installer/netboot/netboot-base.nix
new file mode 100644
index 00000000000..b12eaccf870
--- /dev/null
+++ b/nixos/modules/installer/netboot/netboot-base.nix
@@ -0,0 +1,20 @@
+# This module contains the basic configuration for building netboot
+# images
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  imports =
+    [ ./netboot.nix
+
+      # Profiles of this basic netboot media
+      ../../profiles/all-hardware.nix
+      ../../profiles/base.nix
+      ../../profiles/installation-device.nix
+    ];
+
+  # Allow the user to log in as root without a password.
+  users.extraUsers.root.initialHashedPassword = "";
+}
diff --git a/nixos/modules/installer/netboot/netboot-minimal.nix b/nixos/modules/installer/netboot/netboot-minimal.nix
new file mode 100644
index 00000000000..8ad6234edc7
--- /dev/null
+++ b/nixos/modules/installer/netboot/netboot-minimal.nix
@@ -0,0 +1,10 @@
+# This module defines a small netboot environment.
+
+{ config, lib, ... }:
+
+{
+  imports =
+    [ ./netboot-base.nix
+      ../../profiles/minimal.nix
+    ];
+}
diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix
new file mode 100644
index 00000000000..366591a8114
--- /dev/null
+++ b/nixos/modules/installer/netboot/netboot.nix
@@ -0,0 +1,91 @@
+# This module creates netboot media containing the given NixOS
+# configuration.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  options = {
+
+    netboot.storeContents = mkOption {
+      example = literalExample "[ pkgs.stdenv ]";
+      description = ''
+        This option lists additional derivations to be included in the
+        Nix store in the generated netboot image.
+      '';
+    };
+
+  };
+
+  config = {
+
+    boot.loader.grub.version = 2;
+
+    # Don't build the GRUB menu builder script, since we don't need it
+    # here and it causes a cyclic dependency.
+    boot.loader.grub.enable = false;
+
+    boot.initrd.postMountCommands = ''
+      mkdir -p /mnt-root/nix/store
+      mount -t squashfs /nix-store.squashfs /mnt-root/nix/store
+    '';
+
+    # !!! Hack - attributes expected by other modules.
+    system.boot.loader.kernelFile = "bzImage";
+    environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ];
+
+    boot.consoleLogLevel = mkDefault 7;
+
+    fileSystems."/" =
+      { fsType = "tmpfs";
+        options = [ "mode=0755" ];
+      };
+
+    boot.initrd.availableKernelModules = [ "squashfs" ];
+
+    boot.initrd.kernelModules = [ "loop" ];
+
+    # Closures to be copied to the Nix store, namely the init
+    # script and the top-level system configuration directory.
+   netboot.storeContents =
+      [ config.system.build.toplevel ];
+
+    # Create the squashfs image that contains the Nix store.
+    system.build.squashfsStore = import ../../../lib/make-squashfs.nix {
+      inherit (pkgs) stdenv squashfsTools perl pathsFromGraph;
+      storeContents = config.netboot.storeContents;
+    };
+
+
+    # Create the initrd
+    system.build.netbootRamdisk = pkgs.makeInitrd {
+      inherit (config.boot.initrd) compressor;
+      prepend = [ "${config.system.build.initialRamdisk}/initrd" ];
+
+      contents =
+        [ { object = config.system.build.squashfsStore;
+            symlink = "/nix-store.squashfs";
+          }
+        ];
+    };
+
+    system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" "#!ipxe\nkernel bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}\ninitrd initrd\nboot";
+
+    boot.loader.timeout = 10;
+
+    boot.postBootCommands =
+      ''
+        # After booting, register the contents of the Nix store
+        # in the Nix database in the tmpfs.
+        ${config.nix.package}/bin/nix-store --load-db < /nix/store/nix-path-registration
+
+        # nixos-rebuild also requires a "system" profile and an
+        # /etc/NIXOS tag.
+        touch /etc/NIXOS
+        ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
+      '';
+
+  };
+
+}
diff --git a/nixos/release.nix b/nixos/release.nix
index d78c1bb1c15..fa4a9860150 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -104,6 +104,20 @@ in rec {
   initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk);
 
 
+  netboot = let build = (import lib/eval-config.nix {
+      system = "x86_64-linux";
+      modules = [
+        ./modules/installer/netboot/netboot-minimal.nix
+        versionModule
+      ];
+    }).config.system.build;
+  in
+    pkgs.symlinkJoin "netboot" [
+      build.netbootRamdisk
+      build.kernel
+      build.netbootIpxeScript
+    ];
+
   iso_minimal = forAllSystems (system: makeIso {
     module = ./modules/installer/cd-dvd/installation-cd-minimal.nix;
     type = "minimal";
diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix
index 905d1645882..a138ba4bcf0 100644
--- a/nixos/tests/boot.nix
+++ b/nixos/tests/boot.nix
@@ -44,5 +44,41 @@ in {
         usb => glob("${iso}/iso/*.iso"),
         bios => '${pkgs.OVMF}/FV/OVMF.fd'
       '';
-  }
-
+    netboot = let
+      config = (import ../lib/eval-config.nix {
+          inherit system;
+          modules =
+            [ ../modules/installer/netboot/netboot.nix
+              ../modules/testing/test-instrumentation.nix
+              { key = "serial"; }
+            ];
+        }).config;
+      ipxeScriptDir = pkgs.writeTextFile {
+        name = "ipxeScriptDir";
+        text = ''
+          #!ipxe
+          dhcp
+          kernel bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} console=ttyS0
+          initrd initrd
+          boot
+        '';
+        destination = "/boot.ipxe";
+      };
+      ipxeBootDir = pkgs.symlinkJoin "ipxeBootDir" [
+        config.system.build.netbootRamdisk
+        config.system.build.kernel
+        ipxeScriptDir
+      ];
+    in
+      makeTest {
+        name = "boot-netboot";
+        nodes = { };
+        testScript =
+          ''
+            my $machine = createMachine({ qemuFlags => '-boot order=n -net nic,model=e1000 -net user,tftp=${ipxeBootDir}/,bootfile=boot.ipxe -m 2000M' });
+            $machine->start;
+            $machine->waitForUnit("multi-user.target");
+            $machine->shutdown;
+          '';
+      };
+}
\ No newline at end of file

From 90d7041ce4d270bbcf0efefd1d1e42c097c1335d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 29 Apr 2016 10:41:13 +0100
Subject: [PATCH 393/712] PXE boot: add manual section and note in changelog

---
 .../manual/installation/installing-pxe.xml    | 48 +++++++++++++++++++
 nixos/doc/manual/installation/installing.xml  |  1 +
 .../manual/release-notes/release-notes.xml    |  1 +
 nixos/doc/manual/release-notes/rl-1609.xml    | 48 +++++++++++++++++++
 4 files changed, 98 insertions(+)
 create mode 100644 nixos/doc/manual/installation/installing-pxe.xml
 create mode 100644 nixos/doc/manual/release-notes/rl-1609.xml

diff --git a/nixos/doc/manual/installation/installing-pxe.xml b/nixos/doc/manual/installation/installing-pxe.xml
new file mode 100644
index 00000000000..7b7597c9162
--- /dev/null
+++ b/nixos/doc/manual/installation/installing-pxe.xml
@@ -0,0 +1,48 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-booting-from-pxe">
+
+<title>Booting from the <quote>netboot</quote> media (PXE)</title>
+<para>
+  Advanced users may wish to install NixOS using an existing PXE or
+  iPXE setup.
+</para>
+<para>
+  These instructions assume that you have an existing PXE or iPXE
+  infrastructure and simply want to add the NixOS installer as another
+  option. To build the necessary files from a recent version of
+  nixpkgs, you can run:
+</para>
+<programlisting>
+nix-build -A netboot nixos/release.nix
+</programlisting>
+<para>
+  This will create a <literal>result</literal> directory containing: *
+  <literal>bzImage</literal> – the Linux kernel *
+  <literal>initrd</literal> – the initrd file *
+  <literal>netboot.ipxe</literal> – an example ipxe script
+  demonstrating the appropriate kernel command line arguments for this
+  image
+</para>
+<para>
+  If you’re using plain PXE, configure your boot loader to use the
+  <literal>bzImage</literal> and <literal>initrd</literal> files and
+  have it provide the same kernel command line arguments found in
+  <literal>netboot.ipxe</literal>.
+</para>
+<para>
+  If you’re using iPXE, depending on how your HTTP/FTP/etc. server is
+  configured you may be able to use <literal>netboot.ipxe</literal>
+  unmodified, or you may need to update the paths to the files to
+  match your server’s directory layout
+</para>
+<para>
+  In the future we may begin making these files available as build
+  products from hydra at which point we will update this documentation
+  with instructions on how to obtain them either for placing on a
+  dedicated TFTP server or to boot them directly over the internet.
+</para>
+
+</section>
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 4a0b3fee7c1..3e53062c3e8 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -270,5 +270,6 @@ $ reboot</screen>
 
 <xi:include href="installing-uefi.xml" />
 <xi:include href="installing-usb.xml" />
+<xi:include href="installing-pxe.xml" />
 
 </chapter>
diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml
index 2beaab00800..31a7ae04a4f 100644
--- a/nixos/doc/manual/release-notes/release-notes.xml
+++ b/nixos/doc/manual/release-notes/release-notes.xml
@@ -9,6 +9,7 @@
 <para>This section lists the release notes for each stable version of NixOS
 and current unstable revision.</para>
 
+<xi:include href="rl-1609.xml" />
 <xi:include href="rl-1603.xml" />
 <xi:include href="rl-1509.xml" />
 <xi:include href="rl-1412.xml" />
diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml
new file mode 100644
index 00000000000..22dea802924
--- /dev/null
+++ b/nixos/doc/manual/release-notes/rl-1609.xml
@@ -0,0 +1,48 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-16.09">
+
+<title>Release 16.09 (“Flounder”, 2016/09/??)</title>
+
+<para>In addition to numerous new and upgraded packages, this release
+has the following highlights: </para>
+
+<itemizedlist>
+
+  <listitem>
+    <para>PXE "netboot" media has landed in <link xlink:href="https://github.com/NixOS/nixpkgs/pull/14740" />.
+    See <xref linkend="sec-booting-from-pxe" /> for documentation.</para>
+  </listitem>
+
+</itemizedlist>
+
+<para>The following new services were added since the last release:</para>
+
+  <itemizedlist>
+    <listitem><para><literal>(this will get automatically generated at release time)</literal></para></listitem>
+  </itemizedlist>
+
+
+<para>When upgrading from a previous release, please be aware of the
+following incompatible changes:</para>
+
+<itemizedlist>
+  <listitem>
+    <para>todo</para>
+  </listitem>
+</itemizedlist>
+
+
+<para>Other notable improvements:</para>
+
+<itemizedlist>
+  <listitem>
+    <para>todo</para>
+  </listitem>
+
+</itemizedlist>
+
+
+</section>

From 03912a2761d614c5941578745568f8853e0b2d31 Mon Sep 17 00:00:00 2001
From: artuuge <artuuge@gmail.com>
Date: Fri, 29 Apr 2016 12:16:30 +0200
Subject: [PATCH 394/712] epson-escpr: 1.6.4 -> 1.6.5

---
 pkgs/misc/drivers/epson-escpr/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix
index faf13d4bcc3..2f126a9cfe4 100644
--- a/pkgs/misc/drivers/epson-escpr/default.nix
+++ b/pkgs/misc/drivers/epson-escpr/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, cups }:
 
 let
-  version = "1.6.4";
+  version = "1.6.5";
 in
   stdenv.mkDerivation {
 
     name = "epson-escpr-${version}";
   
     src = fetchurl {
-      url = "https://download3.ebz.epson.net/dsc/f/03/00/04/37/97/88177bc0dc7025905eae4a0da1e841408f82e33c/epson-inkjet-printer-escpr-1.6.4-1lsb3.2.tar.gz"; 
-      sha256 = "76c66461a30be82b9cc37d663147a72f488fe060ef54578120602bb87a3f7754"; 
+      url = "https://download3.ebz.epson.net/dsc/f/03/00/04/54/27/b73564748bfde7b7ce625e20d4a3257d447bec79/epson-inkjet-printer-escpr-1.6.5-1lsb3.2.tar.gz"; 
+      sha256 = "1cd9e0506bf181e1476bd8305f1c6b8dbc4354eab9415d0d5529850856129e4c"; 
     }; 
 
     patches = [ ./cups-filter-ppd-dirs.patch ]; 
@@ -17,7 +17,7 @@ in
     buildInputs = [ cups ];
 
     meta = with stdenv.lib; {
-      homepage = https://github.com/artuuge/NixOS-files/;
+      homepage = "http://download.ebz.epson.net/dsc/search/01/search/";
       description = "ESC/P-R Driver (generic driver)";
       longDescription = ''
         Epson Inkjet Printer Driver (ESC/P-R) for Linux and the

From 47c068c7a3cfeb4e91c3dd881d80fb914b99eca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 29 Apr 2016 06:31:15 -0300
Subject: [PATCH 395/712] eclipse-plugins-cup: 1.0.0.201412081321 ->
 1.0.0.201604221613

---
 pkgs/applications/editors/eclipse/plugins.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 87603f20b89..fe8580f09d0 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -214,21 +214,22 @@ rec {
 
   cup = buildEclipsePluginBase rec {
     name = "cup-${version}";
-    version = "1.0.0.201412081321";
+    version = "1.1.0.201604221613";
+    version_ = "1.0.0.201604221613";
 
     srcFeature = fetchurl {
       url = "http://www2.in.tum.de/projects/cup/eclipse/features/CupEclipsePluginFeature_${version}.jar";
-      sha256 = "353513445f77ed144687bafc20ab85dc31f2f95ffdc47f102ab773ab0b7afb8b";
+      sha256 = "13nnsf0cqg02z3af6xg45rhcgiffsibxbx6h1zahjv7igvqgkyna";
     };
 
     srcPlugin1 = fetchurl {
-      url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/CupReferencedLibraries_${version}.jar";
-      sha256 = "082b5ed8730ad065efaac6ea2812dae15669ae74a49778911125b171bea41187";
+      url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/CupReferencedLibraries_${version_}.jar";
+      sha256 = "0kif8kivrysprva1pxzajm88gi967qf7idhb6ga2xpvsdcris91j";
     };
 
     srcPlugin2 = fetchurl {
       url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/de.tum.in.www2.CupPlugin_${version}.jar";
-      sha256 = "6b67937fa11944b0330173a9d8564a19eccd705e76b96291d80077a1d7344939";
+      sha256 = "022phbrsny3gb8npb6sxyqqxacx138q5bd7dq3gqxh3kprx5chbl";
     };
 
     srcs = [ srcFeature srcPlugin1 srcPlugin2 ];

From 8a3b70791c4b643822eb5feb3f9e23ec5e56b863 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 29 Apr 2016 11:50:27 +0100
Subject: [PATCH 396/712] vmTools.diskImages: add ubuntu 16.04

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

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 2d33a197346..50c18360b8a 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1688,6 +1688,40 @@ rec {
       packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
     };
 
+    ubuntu1604i386 = {
+      name = "ubuntu-16.04-xenial-i386";
+      fullName = "Ubuntu 16.04 Xenial (i386)";
+      packagesLists =
+        [ (fetchurl {
+            url = mirror://ubuntu/dists/xenial/main/binary-i386/Packages.xz;
+            sha256 = "13r75sp4slqy8w32y5dnr7pp7p3cfvavyr1g7gwnlkyrq4zx4ahy";
+          })
+          (fetchurl {
+            url = mirror://ubuntu/dists/xenial/universe/binary-i386/Packages.xz;
+            sha256 = "14fid1rqm3sc0wlygcvn0yx5aljf51c2jpd4x0zxij4019316hsh";
+          })
+        ];
+      urlPrefix = mirror://ubuntu;
+      packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
+    };
+
+    ubuntu1604x86_64 = {
+      name = "ubuntu-16.04-xenial-amd64";
+      fullName = "Ubuntu 16.04 Xenial (amd64)";
+      packagesList =
+        [ (fetchurl {
+            url = mirror://ubuntu/dists/xenial/main/binary-amd64/Packages.xz;
+            sha256 = "110qnkhjkkwm316fbig3aivm2595ydz6zskc4ld5cr8ngcrqm1bn";
+          })
+          (fetchurl {
+            url = mirror://ubuntu/dists/xenial/universe/binary-amd64/Packages.xz;
+            sha256 = "0mm7gj491yi6q4v0n4qkbsm94s59bvqir6fk60j73w7y4la8rg68";
+          })
+        ];
+      urlPrefix = mirror://ubuntu;
+      packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
+    };
+
     debian40i386 = {
       name = "debian-4.0r9-etch-i386";
       fullName = "Debian 4.0r9 Etch (i386)";

From 7d7380b0110d21ff208a06fe7c930783f90c6944 Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Fri, 29 Apr 2016 12:01:13 +0200
Subject: [PATCH 397/712] elasticsearch: Install elastic search modules
 properly, fixes groovy script support.

---
 nixos/modules/services/search/elasticsearch.nix | 1 +
 pkgs/servers/search/elasticsearch/2.x.nix       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index c51a42b8e9c..17ac8fe7e24 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -145,6 +145,7 @@ in {
         # Install plugins
         ln -sfT ${esPlugins}/plugins ${cfg.dataDir}/plugins
         ln -sfT ${cfg.package}/lib ${cfg.dataDir}/lib
+        ln -sfT ${cfg.package}/modules ${cfg.dataDir}/modules
         if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi
       '';
       postStart = mkBefore ''
diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix
index 33a05267395..9495106ea00 100644
--- a/pkgs/servers/search/elasticsearch/2.x.nix
+++ b/pkgs/servers/search/elasticsearch/2.x.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out
-    cp -R bin config lib $out
+    cp -R bin config lib modules $out
 
     # don't want to have binary with name plugin
     mv $out/bin/plugin $out/bin/elasticsearch-plugin

From 82dd20a14d19659ee5ae678c6a6def41aa00d2e6 Mon Sep 17 00:00:00 2001
From: Clemens Fruhwirth <clemens@endorphin.org>
Date: Sun, 24 Apr 2016 14:29:33 +0200
Subject: [PATCH 398/712] open-isns: init at 0.95

---
 pkgs/os-specific/linux/open-isns/default.nix | 25 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/os-specific/linux/open-isns/default.nix

diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix
new file mode 100644
index 00000000000..2ef08cd13ce
--- /dev/null
+++ b/pkgs/os-specific/linux/open-isns/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, openssl, fetchFromGitHub }:
+stdenv.mkDerivation rec {
+  name = "open-isns-${version}";
+  version = "0.95";
+
+  src = fetchFromGitHub {
+    owner = "gonzoleeman";
+    repo = "open-isns";
+    rev = "v${version}";
+    sha256 = "1c2x3yf9806gbjsw4xi805rfhyxk353a3whqvpccz8dwas6jajwh";
+  };
+
+  propagatedBuildInputs = [ openssl ];
+  outputs = ["out" "lib" ];
+  outputInclude = "lib";
+
+  installFlags = "etcdir=$(out)/etc vardir=$(out)/var/lib/isns";
+  installTargets = "install install_hdrs install_lib";
+
+  meta = {
+    description = "iSNS server and client for Linux";
+    license = stdenv.lib.licenses.lgpl21;
+    homepage = https://github.com/gonzoleeman/open-isns;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f4de0702e2b..662db7a2065 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10420,6 +10420,8 @@ in
 
   openiscsi = callPackage ../os-specific/linux/open-iscsi { };
 
+  openisns = callPackage ../os-specific/linux/open-isns { };
+
   tgt = callPackage ../tools/networking/tgt { };
 
   # -- Linux kernel expressions ------------------------------------------------

From e091d27944406668c6c366d429daa7bfd67f6a23 Mon Sep 17 00:00:00 2001
From: Clemens Fruhwirth <clemens@endorphin.org>
Date: Sun, 24 Apr 2016 14:37:38 +0200
Subject: [PATCH 399/712] open-iscsi: from 2.0.873 to a git snapshot

The last release was in May 2012 with many fixes hitting git since then.
Also open-iscsi has broken out the open-isns part as extra library, so
we have that as new dependency.
---
 pkgs/os-specific/linux/open-iscsi/default.nix | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix
index d004328a10b..6d1b11fe888 100644
--- a/pkgs/os-specific/linux/open-iscsi/default.nix
+++ b/pkgs/os-specific/linux/open-iscsi/default.nix
@@ -1,18 +1,16 @@
-{ stdenv, fetchurl, nukeReferences }:
-let
-  pname = "open-iscsi-2.0-873";
-in stdenv.mkDerivation {
-  name = pname;
+{ stdenv, fetchFromGitHub, nukeReferences, automake, autoconf, libtool, gettext, utillinux, openisns, openssl }:
+stdenv.mkDerivation rec {
+  name = "open-iscsi-${version}";
+  version = "2.0-873-${stdenv.lib.substring 0 7 src.rev}";
   outputs = [ "out" "iscsistart" ];
 
-  buildInputs = [ nukeReferences ];
+  buildInputs = [ nukeReferences automake autoconf libtool gettext utillinux openisns.lib openssl ];
   
-  src = fetchurl {
-    urls = [
-      "http://www.open-iscsi.org/bits/${pname}.tar.gz"
-      "http://pkgs.fedoraproject.org/repo/pkgs/iscsi-initiator-utils/${pname}.tar.gz/8b8316d7c9469149a6cc6234478347f7/${pname}.tar.gz"
-    ];
-    sha256 = "1nbwmj48xzy45h52917jbvyqpsfg9zm49nm8941mc5x4gpwz5nbx";
+  src = fetchFromGitHub {
+    owner = "open-iscsi";
+    repo = "open-iscsi";
+    rev = "4c1f2d90ef1c73e33d9f1e4ae9c206ffe015a8f9";
+    sha256 = "0h030zk4zih3l8z5662b3kcifdxlakbwwkz1afb7yf0cicds7va8";
   };
   
   DESTDIR = "$(out)";
@@ -30,7 +28,7 @@ in stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "A high performance, transport independent, multi-platform implementation of RFC3720";
     license = licenses.gpl2Plus;
-    homepage = http://www.open-iscsi.org;
+    homepage = http://www.open-iscsi.com;
     platforms = platforms.linux;
   };
 }

From 32d6f7c114b3c0eb63620ff3c459107777f40bf1 Mon Sep 17 00:00:00 2001
From: Clemens Fruhwirth <clemens@endorphin.org>
Date: Sun, 24 Apr 2016 14:52:13 +0200
Subject: [PATCH 400/712] open-iscsi: Use kmod so that iscsiadm loads the tcp
 transport modules.

---
 pkgs/os-specific/linux/open-iscsi/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix
index 6d1b11fe888..96ff1e52cdd 100644
--- a/pkgs/os-specific/linux/open-iscsi/default.nix
+++ b/pkgs/os-specific/linux/open-iscsi/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, nukeReferences, automake, autoconf, libtool, gettext, utillinux, openisns, openssl }:
+{ stdenv, fetchFromGitHub, nukeReferences, automake, autoconf, libtool, gettext, utillinux, openisns, openssl, kmod }:
 stdenv.mkDerivation rec {
   name = "open-iscsi-${version}";
   version = "2.0-873-${stdenv.lib.substring 0 7 src.rev}";
   outputs = [ "out" "iscsistart" ];
 
-  buildInputs = [ nukeReferences automake autoconf libtool gettext utillinux openisns.lib openssl ];
+  buildInputs = [ nukeReferences automake autoconf libtool gettext utillinux openisns.lib openssl kmod ];
   
   src = fetchFromGitHub {
     owner = "open-iscsi";
@@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
   
   DESTDIR = "$(out)";
   
+  NIX_LDFLAGS = "-lkmod";
+  NIX_CFLAGS_COMPILE = "-DUSE_KMOD";
+
   preConfigure = ''
     sed -i 's|/usr/|/|' Makefile
   '';

From 0e3cd9851c79288a3efa6c577a535eb59efcd4ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 29 Apr 2016 09:43:01 -0300
Subject: [PATCH 401/712] menu-cache: 0.7.0 -> 1.0.1

---
 pkgs/development/libraries/menu-cache/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix
index 3131b6b2918..b6d187e7a0e 100644
--- a/pkgs/development/libraries/menu-cache/default.nix
+++ b/pkgs/development/libraries/menu-cache/default.nix
@@ -1,15 +1,17 @@
 { stdenv, fetchurl, glib, pkgconfig, libfm-extra }:
 
-let name = "menu-cache-0.7.0";
+let name = "menu-cache-1.0.1";
 in
 stdenv.mkDerivation {
   inherit name;
   src = fetchurl {
     url = "mirror://sourceforge/lxde/${name}.tar.xz";
-    sha256 = "0wwkk4jrcl2sp11bspabplchh4ipi1zyn39j3skyzgbm8k40gkhk";
+    sha256 = "0ngxvwfj9drabqi3lyzgpi0d0za6431sy2ijb010filrj54jdiqa";
   };
 
-  buildInputs = [ glib pkgconfig libfm-extra ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ glib libfm-extra ];
 
   meta = with stdenv.lib; {
     homepage = "http://blog.lxde.org/?tag=menu-cache";

From 9ea3a37767a3ae471eb331031c03377c0313e7e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 29 Apr 2016 10:14:36 -0300
Subject: [PATCH 402/712] compton-git: 2015-04-20 -> 2015-09-21

---
 pkgs/applications/window-managers/compton/git.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix
index b715b3a4cf3..f4907f881af 100644
--- a/pkgs/applications/window-managers/compton/git.nix
+++ b/pkgs/applications/window-managers/compton/git.nix
@@ -4,20 +4,24 @@
   libXrandr, libXrender }:
 
 stdenv.mkDerivation {
-  name = "compton-git-2015-04-20";
+  name = "compton-git-2015-09-21";
 
   src = fetchFromGitHub {
     owner  = "chjj";
     repo   = "compton";
-    rev    = "b1889c1245e6f47eedfae6063100d5a16f584e2b";
-    sha256 = "0brnbidxi7wg08yiwgnijzcyqv5lnkd74xzfymvb0i7pgy465vaf";
+    rev    = "2343e4bbd298b35ea5c190c52abd2b0cb9f79a18";
+    sha256 = "1pb0ic47sfd796crwk47cya2ahbxsm6ygi6sh4fwd734kwz37h4z";
   };
 
-  buildInputs = [
+  nativeBuildInputs = [
     asciidoc
-    dbus
     docbook_xml_dtd_45
     docbook_xml_xslt
+    pkgconfig
+  ];
+
+  buildInputs = [
+    dbus
     libXcomposite
     libXdamage
     libXext
@@ -31,7 +35,6 @@ stdenv.mkDerivation {
     libxslt
     mesa
     pcre
-    pkgconfig
   ];
 
   installFlags = "PREFIX=$(out)";

From f95ba43e8b108993b709bb4ef396890c0fba35e3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 29 Apr 2016 15:37:04 +0200
Subject: [PATCH 403/712] geolite-legacy: 2016-04-28 -> 2016-04-29

---
 pkgs/data/misc/geolite-legacy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 022ee995cb5..17ede3f2be9 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,7 +8,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "geolite-legacy-${version}";
-  version = "2016-04-28";
+  version = "2016-04-29";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     "190c5bq63rzkvvfrgiwgd5j0rk9qdq6vx16w28kraq8pwz0dcb2f";
   srcGeoLiteCityv6 = fetchDB
     "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
-    "11igx6r0fypih5i3f0mrcv044pivnl45mq6pkq81i81cv28hfcn8";
+    "1sr2yapsfmdpl4zpf8i5rl3k65dgbq7bb1615g6wf60yw9ngh76x";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
     "1b7w8sdazxq5sv3nz1s28420374vf4wn6h2zasbg68kc2cxwdh2w";

From 61c8af996f7c9f1d604de8f4b7a013d2ad608d00 Mon Sep 17 00:00:00 2001
From: Roman Naumann <namor@hemio.de>
Date: Thu, 17 Mar 2016 19:05:11 +0100
Subject: [PATCH 404/712] rake: init at 11.1.1

---
 .../tools/build-managers/rake/Gemfile           |  2 ++
 .../tools/build-managers/rake/Gemfile.lock      | 13 +++++++++++++
 .../tools/build-managers/rake/default.nix       | 17 +++++++++++++++++
 .../tools/build-managers/rake/gemset.nix        |  9 +++++++++
 pkgs/top-level/all-packages.nix                 |  2 ++
 5 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/rake/Gemfile
 create mode 100644 pkgs/development/tools/build-managers/rake/Gemfile.lock
 create mode 100644 pkgs/development/tools/build-managers/rake/default.nix
 create mode 100644 pkgs/development/tools/build-managers/rake/gemset.nix

diff --git a/pkgs/development/tools/build-managers/rake/Gemfile b/pkgs/development/tools/build-managers/rake/Gemfile
new file mode 100644
index 00000000000..bd1ff6faa65
--- /dev/null
+++ b/pkgs/development/tools/build-managers/rake/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'rake'
diff --git a/pkgs/development/tools/build-managers/rake/Gemfile.lock b/pkgs/development/tools/build-managers/rake/Gemfile.lock
new file mode 100644
index 00000000000..cbea90ab1a9
--- /dev/null
+++ b/pkgs/development/tools/build-managers/rake/Gemfile.lock
@@ -0,0 +1,13 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rake (11.1.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake
+
+BUNDLED WITH
+   1.10.5
diff --git a/pkgs/development/tools/build-managers/rake/default.nix b/pkgs/development/tools/build-managers/rake/default.nix
new file mode 100644
index 00000000000..3cf85b5fcb5
--- /dev/null
+++ b/pkgs/development/tools/build-managers/rake/default.nix
@@ -0,0 +1,17 @@
+{ lib, bundlerEnv, ruby }:
+
+bundlerEnv {
+  name = "rake-11.1.1";
+
+  inherit ruby;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+  
+  meta = with lib; {
+    description = "A software task management and build automation tool";
+    homepage = https://github.com/ruby/rake;
+    license  = with licenses; mit;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/tools/build-managers/rake/gemset.nix b/pkgs/development/tools/build-managers/rake/gemset.nix
new file mode 100644
index 00000000000..efea7a79dbb
--- /dev/null
+++ b/pkgs/development/tools/build-managers/rake/gemset.nix
@@ -0,0 +1,9 @@
+{
+  "rake" = {
+    version = "11.1.1";
+    source = {
+      type = "gem";
+      sha256 = "0h8wcic2xh3lv7yvs05pqnfqb80jyl488f7136lgxmajb0s1rqhg";
+    };
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48219c0929f..272272381b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9994,6 +9994,8 @@ in
     inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
   };
 
+  rake = callPackage ../development/tools/build-managers/rake { };
+  
   redis = callPackage ../servers/nosql/redis { };
 
   redstore = callPackage ../servers/http/redstore { };

From fd94ec4984d737b995eda88dbc87cb26b24c73ce Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 29 Apr 2016 16:29:54 +0200
Subject: [PATCH 405/712] geolite-legacy: fix

---
 pkgs/data/misc/geolite-legacy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 17ede3f2be9..9a07429d4e1 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     "12k4nmfblm9c7kj4v7cyl6sgfgdfv2jdx4fl7nxfzpk1km7yc5na";
   srcGeoLiteCity = fetchDB
     "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
-    "190c5bq63rzkvvfrgiwgd5j0rk9qdq6vx16w28kraq8pwz0dcb2f";
+    "04bi7zmmm7v9gl9vhxh0fvqfhmg9ja1lan4ff0njx7qs7lz3ak88";
   srcGeoLiteCityv6 = fetchDB
     "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
     "1sr2yapsfmdpl4zpf8i5rl3k65dgbq7bb1615g6wf60yw9ngh76x";

From 85aece2f8e0a2b9a410d7ae57b61c763c03c764b Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 28 Apr 2016 23:29:29 +0200
Subject: [PATCH 406/712] torbrowser: use makeLibraryPath instead of buildEnv

Also remove redundant buildInputs
---
 pkgs/tools/security/tor/torbrowser.nix | 37 ++++++++++----------------
 pkgs/top-level/all-packages.nix        |  4 ++-
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index 26def44672d..126c7940849 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -1,21 +1,16 @@
-{ stdenv, fetchurl, buildEnv, makeDesktopItem
-, xorg, alsaLib, dbus, dbus_glib, glib, gtk, atk, pango, freetype, fontconfig
-, gdk_pixbuf, cairo, zlib}:
+{ stdenv, fetchurl, makeDesktopItem
+, libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk
+, atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib
+}:
+
 let
-  # isolated tor environment
-  torEnv = buildEnv {
-    name = "tor-env";
-    paths = [
-      stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype
-      fontconfig gdk_pixbuf cairo xorg.libXrender xorg.libX11 xorg.libXext
-      xorg.libXt
-    ];
-    extraOutputsToInstall = [ "lib" "out" ];
-  };
+  libPath = stdenv.lib.makeLibraryPath [
+    stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype
+    fontconfig gdk_pixbuf cairo libXrender libX11 libXext libXt
+  ];
+in
 
-  ldLibraryPath = ''${torEnv}/lib${stdenv.lib.optionalString stdenv.is64bit ":${torEnv}/lib64"}'';
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "tor-browser-${version}";
   version = "5.5.5";
 
@@ -43,12 +38,10 @@ in stdenv.mkDerivation rec {
 
   doCheck = true;
   checkPhase = ''
-    # Just do a simple test if all libraries get loaded by running help on
-    # firefox and tor
     echo "Checking firefox..."
-    LD_LIBRARY_PATH=${ldLibraryPath} Browser/firefox --help 1> /dev/null
+    LD_LIBRARY_PATH=${libPath} Browser/firefox --help 1> /dev/null
     echo "Checking tor..."
-    LD_LIBRARY_PATH=${torEnv}/lib:Browser/TorBrowser/Tor Browser/TorBrowser/Tor/tor --help 1> /dev/null
+    LD_LIBRARY_PATH=${libPath}:Browser/TorBrowser/Tor Browser/TorBrowser/Tor/tor --help 1> /dev/null
   '';
 
   installPhase = ''
@@ -64,7 +57,7 @@ in stdenv.mkDerivation rec {
       echo "pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/Data/Tor/\");" >> \
         ~/Data/Browser/profile.default/preferences/extension-overrides.js
     fi
-    export LD_LIBRARY_PATH=${ldLibraryPath}:$out/share/tor-browser/Browser/TorBrowser/Tor
+    export LD_LIBRARY_PATH=${libPath}:$out/share/tor-browser/Browser/TorBrowser/Tor
     $out/share/tor-browser/Browser/firefox -no-remote -profile ~/Data/Browser/profile.default "\$@"
     EOF
     chmod +x $out/bin/tor-browser
@@ -76,8 +69,6 @@ in stdenv.mkDerivation rec {
     cp Browser/browser/icons/mozicon128.png $out/share/pixmaps/torbrowser.png
   '';
 
-  buildInputs = [ stdenv ];
-
   meta = with stdenv.lib; {
     description = "Tor Browser Bundle";
     homepage    = https://www.torproject.org/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b737c2aed2..e168d517103 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3462,7 +3462,9 @@ in
 
   torbutton = callPackage ../tools/security/torbutton { };
 
-  torbrowser = callPackage ../tools/security/tor/torbrowser.nix { };
+  torbrowser = callPackage ../tools/security/tor/torbrowser.nix {
+    inherit (xorg) libXrender libX11 libXext libXt;
+  };
 
   touchegg = callPackage ../tools/inputmethods/touchegg { };
 

From 540104dd5ec4cf95dd86f0692aa6b66616000ba2 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Fri, 29 Apr 2016 13:23:36 -0300
Subject: [PATCH 407/712] dotnetPackages.MaxMindDb: init at 1.1.0.0

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index ea1840aefed..4eb34546094 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -102,6 +102,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "lib/*" ];
   };
 
+  MaxMindDb = fetchNuGet {
+    baseName = "MaxMind.Db";
+    version = "1.1.0.0";
+    sha256 = "0lixl76f7k3ldiqzg94zh13gn82w5mm5dx72y97fcqvp8g6nj3ds";
+    outputFiles = [ "lib/*" ];
+  };
+
   NUnitRunners = fetchNuGet {
     baseName = "NUnit.Runners";
     version = "2.6.4";

From a1fd742491341ae3090c88ae4130b89001c6f9ae Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Fri, 29 Apr 2016 13:24:26 -0300
Subject: [PATCH 408/712] dotnetPackages.MaxMindGeoIP2: init at 2.3.1

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 4eb34546094..2c49b49fbd7 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -109,6 +109,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "lib/*" ];
   };
 
+  MaxMindGeoIP2 = fetchNuGet {
+    baseName = "MaxMind.GeoIP2";
+    version = "2.3.1";
+    sha256 = "1s44dvjnmj1aimbrgkmpj6h5dn1w6acgqjch1axc76yz6hwknqgf";
+    outputFiles = [ "lib/*" ];
+  };
+
   NUnitRunners = fetchNuGet {
     baseName = "NUnit.Runners";
     version = "2.6.4";

From b61a6dd70a8824ffabbacd36dd8fccb84f64f2b8 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Fri, 29 Apr 2016 13:24:51 -0300
Subject: [PATCH 409/712] dotnetPackages.SharpZipLib: init at 0.86.0

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 2c49b49fbd7..dafd2a722c9 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -116,6 +116,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "lib/*" ];
   };
 
+  SharpZipLib = fetchNuGet {
+    baseName = "SharpZipLib";
+    version = "0.86.0";
+    sha256 = "01w2038gckfnq31pncrlgm7d0c939pwr1x4jj5450vcqpd4c41jr";
+    outputFiles = [ "lib/*" ];
+  };
+
   NUnitRunners = fetchNuGet {
     baseName = "NUnit.Runners";
     version = "2.6.4";

From 65ce3f91c3b4cc7bce9e5cc11a1036ed61a323e0 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Fri, 29 Apr 2016 13:25:12 -0300
Subject: [PATCH 410/712] dotnetPackages.SmartIrc4net: init at 0.4.5.1

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index dafd2a722c9..828073c8120 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -123,6 +123,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "lib/*" ];
   };
 
+  SmartIrc4net = fetchNuGet {
+    baseName = "SmartIrc4net";
+    version = "0.4.5.1";
+    sha256 = "1k6zc6xsqfzj7nc9479d32akj6d37jq6i1qirmz1i66p52zb5hm1";
+    outputFiles = [ "lib/*" ];
+  };
+
   NUnitRunners = fetchNuGet {
     baseName = "NUnit.Runners";
     version = "2.6.4";

From 87993420caeb24a35c012e227663650eb1a33d9b Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Fri, 29 Apr 2016 13:25:39 -0300
Subject: [PATCH 411/712] dotnetPackages.FuzzyLogicLibrary: init at 1.2.0

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 828073c8120..e1b3bc74f23 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -130,6 +130,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "lib/*" ];
   };
 
+  FuzzyLogicLibrary = fetchNuGet {
+    baseName = "FuzzyLogicLibrary";
+    version = "1.2.0";
+    sha256 = "0x518i8d3rw9n51xwawa4sywvqd722adj7kpcgcm63r66s950r5l";
+    outputFiles = [ "bin/*" ];
+  };
+
   NUnitRunners = fetchNuGet {
     baseName = "NUnit.Runners";
     version = "2.6.4";

From 5c58471ff46d0784651b1e47c3f9e0e935df139c Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Fri, 29 Apr 2016 13:26:00 -0300
Subject: [PATCH 412/712] dotnetPackages.MonoNat: init at 1.2.21

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index e1b3bc74f23..1003065699a 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -137,6 +137,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "bin/*" ];
   };
 
+  MonoNat = fetchNuGet {
+    baseName = "Mono.Nat";
+    version = "1.2.21";
+    sha256 = "011xhmjrx6w5h110fcp40l95k3qj1gkzz3axgbfy0s8haf5hsf7s";
+    outputFiles = [ "lib/*" ];
+  };
+
   NUnitRunners = fetchNuGet {
     baseName = "NUnit.Runners";
     version = "2.6.4";

From c3f54960c6983f7c590a00a1acedea4b80b9673a Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 29 Apr 2016 18:42:09 +0200
Subject: [PATCH 413/712] torbrowser: wrapper improvements

This brings the wrapper closer to the upstream wrapper.

Briefly,
- exec to prevent the shell from hanging around
- do not connect to session manager
- set WM_CLASS to "Tor Browser"
- use fonts.conf from the torbrowser bundle
---
 pkgs/tools/security/tor/torbrowser.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index 126c7940849..11988d9435f 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -50,15 +50,17 @@ stdenv.mkDerivation rec {
     cp -R * $out/share/tor-browser
 
     cat > "$out/bin/tor-browser" << EOF
-    #!${stdenv.shell}
+    #! ${stdenv.shell}
+    unset SESSION_MANAGER
     export HOME="\$HOME/.torbrowser4"
     if [ ! -d \$HOME ]; then
       mkdir -p \$HOME && cp -R $out/share/tor-browser/Browser/TorBrowser/Data \$HOME/ && chmod -R +w \$HOME
       echo "pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/Data/Tor/\");" >> \
         ~/Data/Browser/profile.default/preferences/extension-overrides.js
     fi
+    export FONTCONFIG_PATH=\$HOME/Data/fontconfig
     export LD_LIBRARY_PATH=${libPath}:$out/share/tor-browser/Browser/TorBrowser/Tor
-    $out/share/tor-browser/Browser/firefox -no-remote -profile ~/Data/Browser/profile.default "\$@"
+    exec $out/share/tor-browser/Browser/firefox --class "Tor Browser" -no-remote -profile ~/Data/Browser/profile.default "\$@"
     EOF
     chmod +x $out/bin/tor-browser
 

From f5b3827e0e5ca91dea1f62eb748acfb454c429f1 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 29 Apr 2016 18:47:31 +0200
Subject: [PATCH 414/712] eclipse-plugin-testng: 6.9.11.201603260617 ->
 6.9.11.201604020423

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

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index fe8580f09d0..13c2795ea55 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -378,16 +378,16 @@ rec {
 
   testng = buildEclipsePlugin rec {
     name = "testng-${version}";
-    version = "6.9.11.201603260617";
+    version = "6.9.11.201604020423";
 
     srcFeature = fetchurl {
       url = "http://beust.com/eclipse-old/eclipse_${version}/features/org.testng.eclipse_${version}.jar";
-      sha256 = "0cd7d3bdp6f081vrampsv53z55g1mjn04w9ngz3h8dr0h6jnxz3y";
+      sha256 = "1cp7f6f0525wqwjj4pyrp0q0ii7zcd5gwd5acaq9jjb13xgw8vav";
     };
 
     srcPlugin = fetchurl {
       url = "http://beust.com/eclipse-old/eclipse_${version}/plugins/org.testng.eclipse_${version}.jar";
-      sha256 = "10kdwnydmsvngn8ahijxrv50aps6wa4ckbf7p24mxbwlnmpqfj03";
+      sha256 = "04m07cdfw0isp27ykx6dbrlcdw33rxww7vnavanygxxnlpyvyas3";
     };
 
     meta = with stdenv.lib; {

From 0fcf7076739309b3ec6efe50f514627162a2ad5a Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 29 Apr 2016 19:26:43 +0200
Subject: [PATCH 415/712] YouComplteMe: FIX: ycm_core.so: undefined symbol:
 clang_parseTranslationUnit2FullArgv
 https://github.com/Valloric/YouCompleteMe/issues/2125

---
 pkgs/misc/vim-plugins/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 5b32a1b49ea..0d754294cec 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,6 +1,6 @@
 # TODO check that no license information gets lost
 { fetchurl, bash, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip
-, which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages, zip
+, which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages_38, zip
 , vim_configurable, vimPlugins, xkb_switch, git
 , Cocoa ? null
 }:
@@ -938,17 +938,17 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2016-04-10";
+    name = "youcompleteme-2016-04-28";
     src = fetchgit {
       url = "git://github.com/valloric/youcompleteme";
-      rev = "f67033c990ff5d37ef91ba02da94f6d7409e1c5a";
-      sha256 = "0hwpbj5hr9d26xdcjfxbssyrsl4926c8g999jzpah0sls1r3y2f0";
+      rev = "cb5756943fdd3ba062f101a5aba34acdd34d1356";
+      sha256 = "1fg85mf4x48g6jpn9idjp0k2nz1i34lrx1bxbvp0189ph1xfq7jj";
     };
     dependencies = [];
     buildInputs = [
       python go cmake
-      (if stdenv.isDarwin then llvmPackages.clang else llvmPackages.clang-unwrapped)
-      llvmPackages.llvm
+      (if stdenv.isDarwin then llvmPackages_38.clang else llvmPackages_38.clang-unwrapped)
+      llvmPackages_38.llvm
     ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
 
     buildPhase = ''

From 928cf63a9214e4ceb802d9126c8b824d374dea8f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Apr 2016 20:46:36 +0200
Subject: [PATCH 416/712] netboot -> netboot.x86_64-linux

For consistency, and in case we ever want to support another
architecture.
---
 nixos/release.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index fa4a9860150..ab4e1aaf7d4 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -103,8 +103,7 @@ in rec {
   # Build the initial ramdisk so Hydra can keep track of its size over time.
   initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk);
 
-
-  netboot = let build = (import lib/eval-config.nix {
+  netboot.x86_64-linux = let build = (import lib/eval-config.nix {
       system = "x86_64-linux";
       modules = [
         ./modules/installer/netboot/netboot-minimal.nix

From 07ecef52b71be937fe70fd6b63bba699c40808f5 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Fri, 29 Apr 2016 14:19:53 -0300
Subject: [PATCH 417/712] dotnetPackages.SharpFont: init at 3.0.1

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 1003065699a..d882721f10d 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -123,6 +123,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "lib/*" ];
   };
 
+  SharpFont = fetchNuGet {
+    baseName = "SharpFont";
+    version = "3.0.1";
+    sha256 = "1g639i8mbxc6qm0xqsf4mc0shv8nwdaidllka2xxwyksbq54skhs";
+    outputFiles = [ "lib/*" "config/*" ];
+  };
+
   SmartIrc4net = fetchNuGet {
     baseName = "SmartIrc4net";
     version = "0.4.5.1";

From 6e68a6cf8116e714ea8db09f36c93d85585e20e3 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Fri, 29 Apr 2016 14:38:32 -0300
Subject: [PATCH 418/712] dotnetPackages.StyleCopMSBuild: init at 4.7.49.0

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index d882721f10d..6005c29cdf8 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -123,6 +123,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "lib/*" ];
   };
 
+  StyleCopMSBuild = fetchNuGet {
+    baseName = "StyleCop.MSBuild";
+    version = "4.7.49.0";
+    sha256 = "0rpfyvcggm881ynvgr17kbx5hvj7ivlms0bmskmb2zyjlpddx036";
+    outputFiles = [ "tools/*" ];
+  };
+
   SharpFont = fetchNuGet {
     baseName = "SharpFont";
     version = "3.0.1";

From ffe7da184e5910a86f430c1582fea9feb1afd88c Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Fri, 29 Apr 2016 15:34:35 -0300
Subject: [PATCH 419/712] dotnetPackages.StyleCopPlusMSBuild: init at 4.7.49.5

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 6005c29cdf8..8d30fc19024 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -130,6 +130,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "tools/*" ];
   };
 
+  StyleCopPlusMSBuild = fetchNuGet {
+    baseName = "StyleCopPlus.MSBuild";
+    version = "4.7.49.5";
+    sha256 = "1hv4lfxw72aql8siyqc4n954vzdz8p6jx9f2wrgzz0jy1k98x2mr";
+    outputFiles = [ "tools/*" ];
+  };
+
   SharpFont = fetchNuGet {
     baseName = "SharpFont";
     version = "3.0.1";

From 50970f4ccfd62c2086b026eb493d97edf6e957e0 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Fri, 29 Apr 2016 15:34:54 -0300
Subject: [PATCH 420/712] dotnetPackages.RestSharp: init at 105.2.3

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 8d30fc19024..38dc513ff83 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -137,6 +137,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "tools/*" ];
   };
 
+  RestSharp = fetchNuGet {
+    baseName = "RestSharp";
+    version = "105.2.3";
+    sha256 = "1br48124ppz80x92m84sfyil1gn23hxg2ml9i9hsd0lp86vlaa1m";
+    outputFiles = [ "lib/*" ];
+  };
+
   SharpFont = fetchNuGet {
     baseName = "SharpFont";
     version = "3.0.1";

From 1541e1ca6bf765f882a17e52a82513d2ed4fb5db Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 29 Apr 2016 19:38:48 +0200
Subject: [PATCH 421/712] sdparm: 1.09 -> 1.10

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

diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix
index fab13a125c4..fb6cc4d9eac 100644
--- a/pkgs/os-specific/linux/sdparm/default.nix
+++ b/pkgs/os-specific/linux/sdparm/default.nix
@@ -1,11 +1,12 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "sdparm-1.09";
+stdenv.mkDerivation rec {
+  name = "sdparm-${version}";
+  version = "1.10";
 
   src = fetchurl {
-    url = http://sg.danny.cz/sg/p/sdparm-1.09.tar.xz;
-    sha256 = "0jakqyjwi72zqjzss04bally0xl0lc4710mx8da08vpmir1hfphg";
+    url = "http://sg.danny.cz/sg/p/${name}.tar.xz";
+    sha256 = "1jjq3lzgfy4r76rc26q02lv4wm5cb4dx5nh913h489zjrr4f3jbx";
   };
 
   meta = with stdenv.lib; {

From 2415254a52dc9edf798ce2a7d08bffd3305ec55b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 29 Apr 2016 19:41:41 +0200
Subject: [PATCH 422/712] git-hub: 0.9.0 -> 0.10

---
 .../version-management/git-and-tools/git-hub/default.nix    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
index b1626f687d4..579cb363702 100644
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "git-hub-${version}";
-  version = "0.9.0";
+  version = "0.10";
 
   src = fetchFromGitHub {
-    sha256 = "0c4kq4a906lr8nzway7qh0560n2ydvidh9rlffh44902rd48kp0h";
+    sha256 = "0zy1g6zzv6cw8ffj8ffm28qa922fys2826n5813p8icqypi04y0k";
     rev = "v${version}";
     repo = "git-hub";
-    owner = "sociomantic";
+    owner = "sociomantic-tsunami";
   };
 
   buildInputs = [ python ];

From d51a55366efc925d4fbd0bbd3e829cae516766e4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 29 Apr 2016 19:56:00 +0200
Subject: [PATCH 423/712] stress-ng: 0.05.00 -> 0.05.25

---
 pkgs/tools/system/stress-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index a973d143fa9..17384da9881 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
-  version = "0.05.00";
+  version = "0.05.25";
 
   src = fetchurl {
-    sha256 = "0ppri86z6fj48nm5l0x1r8mh7mwaf7bvhmi10jz6a8w7apnc181w";
+    sha256 = "13c94g06aswlhbv0cpsdrzym9jmbabkdm949j3h935gfdl1625v5";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 

From 88f9f8b9ce085a72bdb71bed2da61156c2963bf8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 29 Apr 2016 20:51:41 +0200
Subject: [PATCH 424/712] packagekit: 1.0.8 -> 1.1.0

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

diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index ae8e1b252c4..bc57dd7c80f 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "packagekit-${version}";
-  version = "1.0.8";
+  version = "1.1.0";
 
   src = fetchurl {
-    sha256 = "1vaxn4kwdwx6p03n88k4pnbd2l6lb0cbxpcs88kjack1jml17c3l";
+    sha256 = "0sn38b80c6jx9d9r329ji9bg4m4gj6gnl04rv8fkmincj61qf7ag";
     url = "http://www.freedesktop.org/software/PackageKit/releases/PackageKit-${version}.tar.xz";
   };
 
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
     "--disable-connman"
     "--disable-systemd"
     "--disable-bash-completion"
-    "--disable-browser-plugin"
     "--disable-gstreamer-plugin"
     "--disable-gtk-module"
     "--disable-command-not-found"

From fe9c463622f45745cfb1532e17e203cf8dffb4b0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 29 Apr 2016 21:31:45 +0200
Subject: [PATCH 425/712] lemon: 1.0 -> 1.69

---
 pkgs/development/tools/parsing/lemon/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/parsing/lemon/default.nix b/pkgs/development/tools/parsing/lemon/default.nix
index 46aaa830512..480ee5b88f6 100644
--- a/pkgs/development/tools/parsing/lemon/default.nix
+++ b/pkgs/development/tools/parsing/lemon/default.nix
@@ -4,20 +4,20 @@ let
 
   srcs = {
     lemon = fetchurl {
-      sha256 = "1grm95m2cnc61zim332g7z8nchmcy91ljf50k13lm421v0ygyyv6";
-      url = "http://www.sqlite.org/src/raw/tool/lemon.c?name=039f813b520b9395740c52f9cbf36c90b5d8df03";
+      sha256 = "1c5pk2hz7j9hix5mpc38rwnm8dnlr2jqswf4lan6v78ccbyqzkjx";
+      url = "http://www.sqlite.org/src/raw/tool/lemon.c?name=680980c7935bfa1edec20c804c9e5ba4b1dd96f5";
       name = "lemon.c";
     };
     lempar = fetchurl {
-      sha256 = "09nki0cwc5zrm365g6plhjxz3byhl9w117ab3yvrpds43ks1j85z";
-      url = "http://www.sqlite.org/src/raw/tool/lempar.c?name=3617143ddb9b176c3605defe6a9c798793280120";
+      sha256 = "1ba13a6yh9j2cs1aw2fh4dxqvgf399gxq1gpp4sh8q0f2w6qiw3i";
+      url = "http://www.sqlite.org/src/raw/tool/lempar.c?name=01ca97f87610d1dac6d8cd96ab109ab1130e76dc";
       name = "lempar.c";
     };
   };
 
 in stdenv.mkDerivation rec {
   name = "lemon-${version}";
-  version = "1.0";
+  version = "1.69";
 
   phases = [ "buildPhase" "installPhase" ];
 

From aa8bc97dd666209c2f2d8f793d33806e28394fc6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 29 Apr 2016 21:40:41 +0200
Subject: [PATCH 426/712] git-hub -> gitAndTools.git-hub (with alias)

---
 pkgs/applications/version-management/git-and-tools/default.nix | 2 ++
 pkgs/top-level/aliases.nix                                     | 1 +
 pkgs/top-level/all-packages.nix                                | 2 --
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index e193701ff95..8aae86b5536 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -51,6 +51,8 @@ rec {
 
   git-extras = callPackage ./git-extras { };
 
+  git-hub = callPackage ./git-hub { };
+
   git-imerge = callPackage ./git-imerge { };
 
   git-radar = callPackage ./git-radar { };
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f49b2d88436..266313c81e1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -45,6 +45,7 @@ doNotDisplayTwice rec {
   firefoxWrapper = firefox;           # 2015-09
   fuse_exfat = exfat;                   # 2015-09-11
   gettextWithExpat = gettext; # 2016-02-19
+  git-hub = gitAndTools.git-hub; # added 2016-04-29
   grantlee5 = qt5.grantlee;  # added 2015-12-19
   gupnptools = gupnp-tools;  # added 2015-12-19
   htmlTidy = html-tidy;  # added 2014-12-06
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b737c2aed2..8ab7940fe72 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1653,8 +1653,6 @@ in
 
   gifsicle = callPackage ../tools/graphics/gifsicle { };
 
-  git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { };
-
   git-lfs = goPackages.git-lfs.bin // { outputs = [ "bin" ]; };
 
   gitfs = callPackage ../tools/filesystems/gitfs { };

From 4f7ac84263a15bb8655a0fcc8482fd8390d1c49b Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Fri, 29 Apr 2016 17:42:26 -0400
Subject: [PATCH 427/712] redis-desktop-manager: init at 0.8.3

---
 .../misc/redis-desktop-manager/default.nix    | 81 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 83 insertions(+)
 create mode 100644 pkgs/applications/misc/redis-desktop-manager/default.nix

diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix
new file mode 100644
index 00000000000..7a1ed08ebf6
--- /dev/null
+++ b/pkgs/applications/misc/redis-desktop-manager/default.nix
@@ -0,0 +1,81 @@
+{ stdenv, lib, fetchgit, pkgconfig , libssh2
+, qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols
+, qtsvg, qttools, qtquick1
+, makeQtWrapper, qmakeHook
+}:
+
+let
+  breakpad_lss = fetchgit {
+    url = "https://chromium.googlesource.com/linux-syscall-support";
+    rev = "08056836f2b4a5747daff75435d10d649bed22f6";
+    sha256 = "1ryshs2nyxwa0kn3rlbnd5b3fhna9vqm560yviddcfgdm2jyg0hz";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "redis-desktop-manager-${version}";
+  version = "0.8.3";
+
+  src = fetchgit {
+    url = "https://github.com/uglide/RedisDesktopManager.git";
+    fetchSubmodules = true;
+    rev = "refs/tags/${version}";
+    sha256 = "08969xwqpjgvfa195dxskpr54p4mnapgfykcffpqpczp990ak1l6";
+  };
+
+  nativeBuildInputs = [ makeQtWrapper qmakeHook ];
+
+  buildInputs = [
+    pkgconfig libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats
+    qtquick1 qtquickcontrols qtsvg qttools
+  ];
+
+  configurePhase = "true";
+
+  buildPhase = ''
+    srcdir=$PWD
+
+    substituteInPlace src/resources/qml/ValueTabs.qml \
+      --replace "import QtQuick.Controls 1.4" \
+                "import QtQuick.Controls 1.2"
+
+    cat <<EOF > src/version.h
+#ifndef RDM_VERSION
+    #define RDM_VERSION "${version}-120"
+#endif // !RDM_VERSION
+EOF
+
+    cd $srcdir/3rdparty/gbreakpad
+    cp -r ${breakpad_lss} src/third_party/lss
+    chmod +w -R src/third_party/lss
+    touch README
+
+    cd $srcdir/3rdparty/crashreporter
+    qmake CONFIG+=release DESTDIR="$srcdir/rdm/bin/linux/release" QMAKE_LFLAGS_RPATH=""
+    make
+
+    cd $srcdir/3rdparty/gbreakpad
+    ./configure
+    make
+
+    cd $srcdir/src
+    qmake
+    make
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    instdir="$srcdir/bin/linux/release"
+    cp $instdir/rdm $out/bin
+    wrapQtProgram $out/bin/rdm
+  '';
+
+  meta = with lib; {
+    description = "Cross-platform open source Redis DB management tool";
+    homepage = "http://redisdesktop.com/";
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b737c2aed2..8ddc4969612 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16358,6 +16358,8 @@ in
     inherit (pythonPackages) pexpect paramiko;
   };
 
+  redis-desktop-manager = qt5.callPackage ../applications/misc/redis-desktop-manager { };
+
   robomongo = qt5.callPackage ../applications/misc/robomongo { };
 
   rucksack = callPackage ../development/tools/rucksack { };

From d3c29a4140baa67af0d54af479ae3d28c660141d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 29 Apr 2016 20:11:15 -0300
Subject: [PATCH 428/712] pnmixer: 2014-07-24 -> 2016-04-23

---
 pkgs/tools/audio/pnmixer/default.nix | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix
index f65a151905c..b9c602dd767 100644
--- a/pkgs/tools/audio/pnmixer/default.nix
+++ b/pkgs/tools/audio/pnmixer/default.nix
@@ -1,16 +1,22 @@
-{ stdenv, fetchgit, alsaLib, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, gettext }:
+{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, intltool }:
 
 stdenv.mkDerivation rec {
-  name = "pnmixer-2014-07-24";
+  name = "pnmixer-${version}";
+  version = "2016-04-23";
 
-  src = fetchgit {
-    url = "git://github.com/nicklan/pnmixer.git";
-    rev = "1e09a075c0c63d8b161b13ea92528a798bdb464a";
-    sha256 = "15k689xycpc6pvq9vgg9ak92b9sg09dh4yrh83kjcaws63alrzl5";
+  src = fetchFromGitHub {
+    owner = "nicklan";
+    repo = "pnmixer";
+    rev = "cb20096716dbb5440b6560d81108d9c8f7188c48";
+    sha256 = "17gl5fb3hpdgxyys8h5k3nraw7qdyqv9k9kz8ykr5h7gg29nxy66";
   };
 
+  nativeBuildInputs = [
+    pkgconfig autoconf automake intltool
+  ];
+
   buildInputs = [
-    alsaLib pkgconfig gtk3 glibc autoconf automake libnotify libX11 gettext
+    alsaLib gtk3 glibc libnotify libX11
   ];
 
   preConfigure = ''
@@ -21,6 +27,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
 
   meta = with stdenv.lib; {
+    homepage = https://github.com/nicklan/pnmixer;
     description = "ALSA mixer for the system tray";
     license = licenses.gpl3;
     maintainers = with maintainers; [ campadrenalin ];

From 190eaea73972aee1ce3fd27ef449845fb6ba1bc7 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 29 Apr 2016 20:56:02 +0300
Subject: [PATCH 429/712] ejabberd: 16.02 -> 16.04

---
 pkgs/servers/xmpp/ejabberd/default.nix | 254 ++++---------------------
 1 file changed, 41 insertions(+), 213 deletions(-)

diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index 10658ce4dd2..dd882de723a 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeScriptBin, lib, fetchurl, fetchFromGitHub
+{ stdenv, writeScriptBin, lib, fetchurl, fetchFromGitHub, git, cacert
 , erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, utillinux, procps
 , withMysql ? false
 , withPgsql ? false
@@ -13,8 +13,6 @@
 }:
 
 let
-  ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];
-
   fakegit = writeScriptBin "git" ''
     #! ${stdenv.shell} -e
     if [ "$1" = "describe" ]; then
@@ -22,192 +20,15 @@ let
     fi
   '';
 
-  # These can be extracted from `rebar.config`
-  # Some dependencies are from another packages. Try commenting them out; then during build
-  # you'll get necessary revision information.
-  ejdeps = {
-    lager = fetchFromGitHub {
-      owner = "basho";
-      repo = "lager";
-      rev = "3.0.2";
-      sha256 = "04l40dlqpl2y6ddpbpknmnjf537bjvrmg8r0jnmw1h60dgyb2ydk";
-    };
-    # dependency of lager
-    goldrush = fetchFromGitHub {
-      owner = "DeadZen";
-      repo = "goldrush";
-      rev = "0.1.7";
-      sha256 = "1104j8v86hdavxf08yjyjkpi5vf95rfvsywdx29c69x3z33i4z3m";
-    };
-    p1_utils = fetchFromGitHub {
-      owner = "processone";
-      repo = "p1_utils";
-      rev = "1.0.3";
-      sha256 = "0bw163wx0ji2sz7yb3nzvm1mnnljsdji606xzk33za8c4sgrb4nj";
-    };
-    cache_tab = fetchFromGitHub {
-      owner = "processone";
-      repo = "cache_tab";
-      rev = "1.0.2";
-      sha256 = "1krgn6y95jgc8pc0vkj36p0wcazsb8b6h1x4f0r1936jff2vqk33";
-    };
-    fast_tls = fetchFromGitHub {
-      owner = "processone";
-      repo = "fast_tls";
-      rev = "1.0.1";
-      sha256 = "08lh6935k590hix3z69kjjd75w68vmmjcx7gi4zh8j7li4v9k9l2";
-    };
-    stringprep = fetchFromGitHub {
-      owner = "processone";
-      repo = "stringprep";
-      rev = "1.0.2";
-      sha256 = "1wrisajyll45wf6cz1rb2q70sz83i6nfnfiijsbzhy0xk51436sa";
-    };
-    fast_xml = fetchFromGitHub {
-      owner = "processone";
-      repo = "fast_xml";
-      rev = "1.1.3";
-      sha256 = "1a2k21fqz8rp4laz7wn0hsxy58i1gdwc3qhw3k2kar8lgw4m3wqp";
-    };
-    stun = fetchFromGitHub {
-      owner = "processone";
-      repo = "stun";
-      rev = "1.0.1";
-      sha256 = "0bq0qkc7h3nhqxa6ff2nf6bi4kiax4208716hxfz6l1vxrh7f3p2";
-    };
-    esip = fetchFromGitHub {
-      owner = "processone";
-      repo = "esip";
-      rev = "1.0.2";
-      sha256 = "0ibvb85wkqw81y154bagp0kgf1jmdscmfq8yk73j1k986dmiqfn2";
-    };
-    fast_yaml = fetchFromGitHub {
-      owner = "processone";
-      repo = "fast_yaml";
-      rev = "1.0.2";
-      sha256 = "019imn255bkkvilg4nrcidl8w6dn2jrb2nyrs2nixsgcbmvkdl5k";
-    };
-    jiffy = fetchFromGitHub {
-      owner = "davisp";
-      repo = "jiffy";
-      rev = "0.14.7";
-      sha256 = "1w55vwz4a94v0aajm3lg6nlhpw2w0zdddiw36f2n4sfhbqn0v0jr";
-    };
-    p1_oauth2 = fetchFromGitHub {
-      owner = "processone";
-      repo = "p1_oauth2";
-      rev = "0.6.1";
-      sha256 = "1wvmi3fj05hlbi3sbqpakznq70n76a7nbvbrjhr8k79bmvsh6lyl";
-    };
-    p1_xmlrpc = fetchFromGitHub {
-      owner = "processone";
-      repo = "p1_xmlrpc";
-      rev = "1.15.1";
-      sha256 = "12pfvb3k9alzg7qbph3bc1sw7wk86psm3jrdrfclq90zlpwqa0w3";
-    };
-    luerl = fetchFromGitHub {
-      owner = "rvirding";
-      repo = "luerl";
-      rev = "9524d0309a88b7c62ae93da0b632b185de3ba9db";
-      sha256 = "15yplmv2xybnz3nby940752jw672vj99l1j61rrfy686hgrfnc42";
-    };
-
-    p1_mysql = fetchFromGitHub {
-      owner = "processone";
-      repo = "p1_mysql";
-      rev = "1.0.1";
-      sha256 = "17122xhc420kqfsv4c4g0jcllpdbhg84wdlwd3227w4q729jg6bk";
-    };
-    p1_pgsql = fetchFromGitHub {
-      owner = "processone";
-      repo = "p1_pgsql";
-      rev = "1.0.1";
-      sha256 = "1ca0hhxyfmwjp49zjga1fdhrbaqnxdpmcvs2i6nz6jmapik788nr";
-    };
-    sqlite3 = fetchFromGitHub {
-      owner = "processone";
-      repo = "erlang-sqlite3";
-      rev = "1.1.5";
-      sha256 = "17n4clysg540nx9g8k8mi9l7vkz8wigycgxmzzn0wmgxdf6mhxlb";
-    };
-    p1_pam = fetchFromGitHub {
-      owner = "processone";
-      repo = "epam";
-      rev = "1.0.0";
-      sha256 = "0dlbmfwndhyg855vnhwyccxcjqzf2wcgc7522mjb9q38cva50rpr";
-    };
-    ezlib = fetchFromGitHub {
-      owner = "processone";
-      repo = "ezlib";
-      rev = "1.0.1";
-      sha256 = "1asp7s2q72iql870igc827dvi9iqyd6lhs0q3jbjj2w7xfz4x4kk";
-    };
-    hamcrest = fetchFromGitHub {
-      owner = "hyperthunk";
-      repo = "hamcrest-erlang";
-      rev = "908a24fda4a46776a5135db60ca071e3d783f9f6";
-      sha256 = "0irxidwrb37m0xwls6q9nn2zfs3pyxrgbnjgrhnh7gm35ib51hkj";
-    };
-    riakc = fetchFromGitHub {
-      owner = "basho";
-      repo = "riak-erlang-client";
-      rev = "527722d12d0433b837cdb92a60900c2cb5df8942";
-      sha256 = "13rkwibsjsl2gdysvf11r1hqfrf89hjgpa0x0hz2910f2ryqll3y";
-    };
-    # dependency of riakc
-    riak_pb = fetchFromGitHub {
-      owner = "basho";
-      repo = "riak_pb";
-      rev = "2.1.0.7";
-      sha256 = "1p0qmjq069f7j1m29dv36ayvz8m0pcm94ccsnv5blykfg2c5ja0c";
-    };
-    # dependency of riak_pb
-    protobuffs = fetchFromGitHub {
-      owner = "basho";
-      repo = "erlang_protobuffs";
-      rev = "0.8.2";
-      sha256 = "0w4jmsnc9x2ykqh1q6b12pl8a9973dxdhqk3y0ph17n83q5xz3h7";
-    };
-    elixir = fetchFromGitHub {
-      owner = "elixir-lang";
-      repo = "elixir";
-      rev = "v1.1.0";
-      sha256 = "0r5673x2qdvfbwmvyvj8ddvzgxnkl3cv9jsf1yzsxgdifjbrzwx7";
-    };
-    rebar_elixir_plugin = fetchFromGitHub {
-      owner = "processone";
-      repo = "rebar_elixir_plugin";
-      rev = "0.1.0";
-      sha256 = "0x04ff53mxwd9va8nl4m70dbamp6p4dpxs646c168iqpnpadk3sk";
-    };
-    iconv = fetchFromGitHub {
-      owner = "processone";
-      repo = "iconv";
-      rev = "1.0.0";
-      sha256 = "0dfc23m2lqilj8ixn23wpj5xp1mgajb9b5ch95riigxzxmx97ri9";
-    };
-    meck = fetchFromGitHub {
-      owner = "eproxus";
-      repo = "meck";
-      rev = "0.8.2";
-      sha256 = "0s4qbvryap46cz63awpbv5zzmlcay5pn2lixgmgvcjarqv70cbs7";
-    };
-    eredis = fetchFromGitHub {
-      owner = "wooga";
-      repo = "eredis";
-      rev = "v1.0.8";
-      sha256 = "10fr3kbc2nd2liggsq4y77nfirndzapcxzkjgyp06bpr9cjlvhlm";
-    };
-
-  };
+  ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];
 
 in stdenv.mkDerivation rec {
-  version = "16.02";
+  version = "16.04";
   name = "ejabberd-${version}";
 
   src = fetchurl {
     url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
-    sha256 = "0yiai7zyjdcp0ppc5l5p56bxhg273hwfbv41qlbkg32dhr880f4q";
+    sha256 = "1hrcswk03x5x6f6xy8sac4ihhi6jcmsfp6449k3570j39vklz5ix";
   };
 
   nativeBuildInputs = [ fakegit ];
@@ -222,21 +43,40 @@ in stdenv.mkDerivation rec {
   # Apparently needed for Elixir
   LANG = "en_US.UTF-8";
 
-  depsNames =
-    [ "lager" "goldrush" "p1_utils" "cache_tab" "fast_tls" "stringprep" "fast_xml" "stun" "esip" "fast_yaml"
-      "jiffy" "p1_oauth2" "p1_xmlrpc" "luerl"
-    ]
-    ++ lib.optional withMysql "p1_mysql"
-    ++ lib.optional withPgsql "p1_pgsql"
-    ++ lib.optional withSqlite "sqlite3"
-    ++ lib.optional withPam "p1_pam"
-    ++ lib.optional withZlib "ezlib"
-    ++ lib.optionals withRiak [ "hamcrest" "riakc" "riak_pb" "protobuffs" ]
-    ++ lib.optionals withElixir [ "elixir" "rebar_elixir_plugin" ]
-    ++ lib.optional withIconv "iconv"
-    ++ lib.optional withTools "meck"
-    ++ lib.optional withRedis "eredis"
-  ;
+  deps = stdenv.mkDerivation {
+    name = "ejabberd-deps-${version}";
+
+    inherit src;
+
+    configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite}" ];
+
+    buildInputs = [ git erlang openssl expat libyaml sqlite pam zlib elixir ];
+
+    GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+
+    preBuild = ''
+      patchShebangs .
+    '';
+
+    makeFlags = [ "deps" ];
+
+    installPhase = ''
+      for i in deps/*; do
+        ( cd $i
+          git reset --hard
+          git clean -fdx
+          git describe --always --tags > .rev
+          rm -rf .git
+        )
+      done
+
+      cp -r deps $out
+    '';
+
+    outputHashMode = "recursive";
+    outputHashAlgo = "sha256";
+    outputHash = "0kmk22z1r9c23j9hh91975pqh3jkh7z6i1gnmw4qxr8alcnpr75f";
+  };
 
   configureFlags =
     [ (lib.enableFeature withMysql "mysql")
@@ -251,24 +91,11 @@ in stdenv.mkDerivation rec {
       (lib.enableFeature withRedis "redis")
     ] ++ lib.optional withSqlite "--with-sqlite3=${sqlite}";
 
-  depsPaths = map (x: builtins.getAttr x ejdeps) depsNames;
-  depsRevs = map (x: x.rev) depsPaths;
-
   enableParallelBuilding = true;
 
   preBuild = ''
-    mkdir deps
-    depsPathsA=( $depsPaths )
-    depsNamesA=( $depsNames )
-    depsRevsA=( $depsRevs )
-    for i in {0..${toString (builtins.length depsNames - 1)}}; do
-      path="deps/''${depsNamesA[$i]}"
-      cp -R ''${depsPathsA[$i]} "$path"
-      chmod -R +w "$path"
-      echo "''${depsRevsA[$i]}" > "$path/.rev"
-    done
-    touch deps/.got
-    patchShebangs .
+    cp -r $deps deps
+    chmod -R +w deps
 
     for i in deps/*; do
       [ -x "$i/configure" ] && ( cd "$i"; ./configure ) || true
@@ -290,5 +117,6 @@ in stdenv.mkDerivation rec {
     homepage = http://www.ejabberd.im;
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.sander lib.maintainers.abbradar ];
+    broken = withElixir;
   };
 }

From 938d64f1f386c8d9f82c06c55e78de697de2e781 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 02:58:00 +0300
Subject: [PATCH 430/712] quote URLs in my packages to ease opening them from
 urxvt

---
 pkgs/applications/audio/deadbeef/default.nix                  | 4 ++--
 pkgs/applications/audio/paprefs/default.nix                   | 2 +-
 pkgs/applications/audio/pavucontrol/default.nix               | 2 +-
 pkgs/applications/audio/svox/default.nix                      | 2 +-
 pkgs/applications/misc/octoprint/default.nix                  | 2 +-
 pkgs/applications/misc/octoprint/plugins.nix                  | 4 ++--
 pkgs/applications/misc/openbrf/default.nix                    | 2 +-
 .../instant-messengers/pidgin-plugins/otr/default.nix         | 2 +-
 pkgs/development/libraries/ijs/default.nix                    | 2 +-
 pkgs/games/dwarf-fortress/dfhack/default.nix                  | 2 +-
 pkgs/tools/misc/grub4dos/default.nix                          | 2 +-
 pkgs/tools/misc/sdl-jstest/default.nix                        | 2 +-
 pkgs/tools/misc/xiccd/default.nix                             | 2 +-
 pkgs/tools/networking/dropbear/default.nix                    | 2 +-
 pkgs/tools/networking/xl2tpd/default.nix                      | 2 +-
 pkgs/tools/system/thermald/default.nix                        | 2 +-
 16 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index b8942033976..3ed4e587ac5 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -96,10 +96,10 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Ultimate Music Player for GNU/Linux";
-    homepage = http://deadbeef.sourceforge.net/;
+    homepage = "http://deadbeef.sourceforge.net/";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.abbradar ];
-    repositories.git = https://github.com/Alexey-Yakovenko/deadbeef;
+    repositories.git = "https://github.com/Alexey-Yakovenko/deadbeef";
   };
 }
diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix
index 3ce52806a4e..0f8c7a95010 100644
--- a/pkgs/applications/audio/paprefs/default.nix
+++ b/pkgs/applications/audio/paprefs/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
       dialog for the PulseAudio sound server.
     '';
 
-    homepage = http://freedesktop.org/software/pulseaudio/paprefs/;
+    homepage = "http://freedesktop.org/software/pulseaudio/paprefs/";
 
     license = licenses.gpl2Plus;
 
diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix
index 2c6f70195b1..f218767c55e 100644
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/pkgs/applications/audio/pavucontrol/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
       easily control the volume of all clients, sinks, etc.
     '';
 
-    homepage = http://freedesktop.org/software/pulseaudio/pavucontrol/ ;
+    homepage = "http://freedesktop.org/software/pulseaudio/pavucontrol/";
 
     license = stdenv.lib.licenses.gpl2Plus;
 
diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix
index f8258dd10ab..90e7d41a97b 100644
--- a/pkgs/applications/audio/svox/default.nix
+++ b/pkgs/applications/audio/svox/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Text-to-speech engine";
-    homepage = https://android.googlesource.com/platform/external/svox;
+    homepage = "https://android.googlesource.com/platform/external/svox";
     platforms = platforms.linux;
     license = licenses.asl20;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index b9b6c10a13f..3178ea5684d 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -34,7 +34,7 @@ pythonPackages.buildPythonApplication rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://octoprint.org/;
+    homepage = "http://octoprint.org/";
     description = "The snappy web interface for your 3D printer";
     platforms = platforms.all;
     license = licenses.agpl3;
diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 7ff6686a937..7f36f79cc9c 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -31,8 +31,8 @@ in {
     '';
 
     meta = with stdenv.lib; {
-      homepage = https://github.com/donovan6000/M3D-Fio;
-      description = " OctoPrint plugin for the Micro 3D printer";
+      homepage = "https://github.com/donovan6000/M3D-Fio";
+      description = "OctoPrint plugin for the Micro 3D printer";
       platforms = platforms.all;
       license = licenses.gpl3;
       maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix
index 70be67a4d28..36218b6d507 100644
--- a/pkgs/applications/misc/openbrf/default.nix
+++ b/pkgs/applications/misc/openbrf/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A tool to edit resource files (BRF)";
-    homepage = https://github.com/cfcohen/openbrf;
+    homepage = "https://github.com/cfcohen/openbrf";
     maintainers = with stdenv.lib.maintainers; [ abbradar ];
     license = licenses.free;
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
index 9f5c246ede6..bdc16d101f5 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libotr pidgin intltool ];
 
   meta = with stdenv.lib; {
-    homepage = https://otr.cypherpunks.ca/;
+    homepage = "https://otr.cypherpunks.ca/";
     description = "Plugin for Pidgin 2.x which implements OTR Messaging";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix
index 0c7d412fee6..da0ae463e85 100644
--- a/pkgs/development/libraries/ijs/default.nix
+++ b/pkgs/development/libraries/ijs/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   configureFlags = [ "--disable-static" "--enable-shared" ];
 
   meta = with stdenv.lib; {
-    homepage = https://www.openprinting.org/download/ijs/;
+    homepage = "https://www.openprinting.org/download/ijs/";
     description = "Raster printer driver architecture";
 
     license = licenses.gpl3Plus;
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index aaed6b8fd2d..0ffcf01ade4 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Memory hacking library for Dwarf Fortress and a set of tools that use it";
-    homepage = https://github.com/DFHack/dfhack/;
+    homepage = "https://github.com/DFHack/dfhack/";
     license = licenses.zlib;
     platforms = [ "i686-linux" ];
     maintainers = with maintainers; [ robbinch a1russell abbradar ];
diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix
index c59869c0dc7..e5c613f7a89 100644
--- a/pkgs/tools/misc/grub4dos/default.nix
+++ b/pkgs/tools/misc/grub4dos/default.nix
@@ -26,7 +26,7 @@ in stdenv.mkDerivation {
   dontPatchELF = true;
 
   meta = with stdenv.lib; {
-    homepage = http://grub4dos.chenall.net/;
+    homepage = "http://grub4dos.chenall.net/";
     description = "GRUB for DOS is the dos extension of GRUB";
     maintainers = with maintainers; [ abbradar ];
     platforms = platforms.all;
diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix
index 677f52c2c32..fec1039a1f2 100644
--- a/pkgs/tools/misc/sdl-jstest/default.nix
+++ b/pkgs/tools/misc/sdl-jstest/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig docbook_xsl ];
   
   meta = with stdenv.lib; {
-    homepage = https://github.com/Grumbel/sdl-jstest;
+    homepage = "https://github.com/Grumbel/sdl-jstest";
     description = "Simple SDL joystick test application for the console";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/pkgs/tools/misc/xiccd/default.nix b/pkgs/tools/misc/xiccd/default.nix
index cdc2af19501..03c8949bb45 100644
--- a/pkgs/tools/misc/xiccd/default.nix
+++ b/pkgs/tools/misc/xiccd/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "X color profile daemon";
-    homepage = https://github.com/agalakhov/xiccd;
+    homepage = "https://github.com/agalakhov/xiccd";
     license = licenses.gpl3;
     maintainers = with maintainers; [ abbradar ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index 586ae6b544e..d102ef5d7c3 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ zlib ];
 
   meta = with stdenv.lib; {
-    homepage = http://matt.ucc.asn.au/dropbear/dropbear.html;
+    homepage = "http://matt.ucc.asn.au/dropbear/dropbear.html";
     description = "A small footprint implementation of the SSH 2 protocol";
     license = licenses.mit;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/tools/networking/xl2tpd/default.nix
index 4b8f91461d8..ac8be4eb5de 100644
--- a/pkgs/tools/networking/xl2tpd/default.nix
+++ b/pkgs/tools/networking/xl2tpd/default.nix
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
   makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.xelerance.com/software/xl2tpd/;
+    homepage = "http://www.xelerance.com/software/xl2tpd/";
     description = "Layer 2 Tunnelling Protocol Daemon (RFC 2661)";
     platforms = platforms.linux;
     license = licenses.gpl2;
diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix
index dd28d5b2b1d..e4b2055b591 100644
--- a/pkgs/tools/system/thermald/default.nix
+++ b/pkgs/tools/system/thermald/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Thermal Daemon";
-    homepage = https://01.org/linux-thermal-daemon;
+    homepage = "https://01.org/linux-thermal-daemon";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];

From ce6f4e25b279e2933aacf9318a264ee997daa799 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 02:58:11 +0300
Subject: [PATCH 431/712] deadbeef: 0.7.0 -> 0.7.2

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

diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index 3ed4e587ac5..43aba89213f 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -53,11 +53,11 @@ assert remoteSupport -> curl != null;
 
 stdenv.mkDerivation rec {
   name = "deadbeef-${version}";
-  version = "0.7.0";
+  version = "0.7.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/deadbeef/${name}.tar.bz2";
-    sha256 = "0s6qip1zs83pig75pnd30ayiv1dbbj7s72px9mr31f4m0v86kaqx";
+    sha256 = "0rwdxxn7h94vlgblbkswyvj6pm82488v8x5nrmlrcsbzjjf2pccw";
   };
 
   buildInputs = with stdenv.lib; [ jansson ]

From 8551602e9c57cc2f947086d61ff99a8e8b10662c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 02:58:28 +0300
Subject: [PATCH 432/712] octoprint-plugins.m3d-fio: 0.30.2 -> 0.32

---
 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 7f36f79cc9c..852ec5b444d 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -8,13 +8,13 @@ in {
 
   m3d-fio = buildPlugin rec {
     name = "M3D-Fio-${version}";
-    version = "0.30.2";
+    version = "0.32";
 
     src = fetchFromGitHub {
       owner = "donovan6000";
       repo = "M3D-Fio";
       rev = "V${version}";
-      sha256 = "1knm41hwjf6v4yjx8khr2zd9ryndmw8bkp3y80hgjc5p4nqxrmg3";
+      sha256 = "1s15nx6v56yjwd88b19fx0gk1l0abp76nz10yicspdn91fpr1sf4";
     };
 
     patches = [

From c4ab28e38e2917e1da82eea3736bc9a8049a16f0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 02:59:00 +0300
Subject: [PATCH 433/712] tdesktop: 0.9.33 -> 0.9.44

---
 .../telegram/tdesktop/default.nix             | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 41a3c690f7b..37c0fd6a175 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -12,20 +12,20 @@ let
   system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
 in stdenv.mkDerivation rec {
   name = "telegram-desktop-${version}";
-  version = "0.9.33";
+  version = "0.9.44";
   qtVersion = lib.replaceStrings ["."] ["_"] qtbase.version;
 
   src = fetchFromGitHub {
     owner = "telegramdesktop";
     repo = "tdesktop";
     rev = "v${version}";
-    sha256 = "020vwm7h22951v9zh457d82qy5ifp746vwishkvb16h1vwr1qx4s";
+    sha256 = "0ydd5yhy2nq4n6x59ajb6c4d0blyj6gm7hkx4hfrx2a88iksc5rm";
   };
 
   tgaur = fetchgit {
     url = "https://aur.archlinux.org/telegram-desktop.git";
-    rev = "df47a864282959b103a08b65844e9088e012fdb3";
-    sha256 = "1v1dbi8yiaf2hgghniykm5qbnda456xj3zfjnbqysn41f5cn40h4";
+    rev = "f8907d1ccaf8345c06232238342921213270e3d8";
+    sha256 = "1fsp098ykpf5gynn3lq3qcj3a47bkjfr0l96pymmmfd4a2s1690v";
   };
 
   buildInputs = [
@@ -88,6 +88,17 @@ in stdenv.mkDerivation rec {
       -e 's,-flto ,,g'
     echo "Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)" >> Telegram/SourceFiles/stdafx.cpp
 
+    ( mkdir -p Linux/DebugIntermediateStyle
+      cd Linux/DebugIntermediateStyle
+      qmake CONFIG+=debug ../../Telegram/MetaStyle.pro
+      buildPhase
+    )
+    ( mkdir -p Linux/DebugIntermediateLang
+      cd Linux/DebugIntermediateLang
+      qmake CONFIG+=debug ../../Telegram/MetaLang.pro
+      buildPhase
+    )
+
     ( mkdir -p ../Libraries
       cd ../Libraries
       for i in $qtSrcs; do
@@ -121,17 +132,6 @@ in stdenv.mkDerivation rec {
       installPhase
     )
 
-    ( mkdir -p Linux/DebugIntermediateStyle
-      cd Linux/DebugIntermediateStyle
-      qmake CONFIG+=debug ../../Telegram/MetaStyle.pro
-      buildPhase
-    )
-    ( mkdir -p Linux/DebugIntermediateLang
-      cd Linux/DebugIntermediateLang
-      qmake CONFIG+=debug ../../Telegram/MetaLang.pro
-      buildPhase
-    )
-
     ( mkdir -p Linux/ReleaseIntermediate
       cd Linux/ReleaseIntermediate
       qmake $qmakeFlags ../../Telegram/Telegram.pro
@@ -147,7 +147,7 @@ in stdenv.mkDerivation rec {
     sed "s,/usr/bin,$out/bin,g" $tgaur/telegramdesktop.desktop > $out/share/applications/telegramdesktop.desktop
     sed "s,/usr/bin,$out/bin,g" $tgaur/tg.protocol > $out/share/kde4/services/tg.protocol
     for icon_size in 16 32 48 64 128 256 512; do
-      install -Dm644 "Telegram/SourceFiles/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png"
+      install -Dm644 "Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png"
     done
 
     fixupPhase

From 6fef00260aa38b9faaf37d8fb3270fe952a60cf4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 02:59:11 +0300
Subject: [PATCH 434/712] folly: 0.57.0 -> 2016-04-29

---
 pkgs/development/libraries/folly/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 046b7f97ba4..72867e012a9 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -2,24 +2,16 @@
 , google-gflags, python, libiberty, openssl }:
 
 stdenv.mkDerivation rec {
-  version = "0.57.0";
   name = "folly-${version}";
+  version = "2016-04-29";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
-    rev = "v${version}";
-    sha256 = "12b9bkwmndfwmsknc209kpplxn9wqmwr3p2h0l2szrppq4qqyfq9";
+    rev = "b31eb722e444ab0293a73fe9de3f94e657ca6de9";
+    sha256 = "0s95y0wnz4xbrkzbiksnb0n0d0qrkcsbssznng57kwlq8jlfka24";
   };
 
-  patches = [
-    # Fix compatibility with Boost 1.59
-    (fetchpatch {
-      url = "https://github.com/facebook/folly/commit/29193aca605bb93d82a3c92acd95bb342115f3a4.patch";
-      sha256 = "1ixpgq1wjr3i7madx4faw72n17ilc9cr435k5w1x95jr954m9j7b";
-    })
-  ];
-
   nativeBuildInputs = [ autoreconfHook python ];
   buildInputs = [ libiberty boost libevent double_conversion glog google-gflags openssl ];
 

From a589b7bd5fc7f056e5595456b354a51668adbc07 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 03:00:09 +0300
Subject: [PATCH 435/712] ijs: derive from ghostscript

---
 pkgs/development/libraries/ijs/default.nix | 11 +++--------
 pkgs/misc/ghostscript/default.nix          |  2 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix
index da0ae463e85..a08a653dc71 100644
--- a/pkgs/development/libraries/ijs/default.nix
+++ b/pkgs/development/libraries/ijs/default.nix
@@ -1,14 +1,9 @@
-{ stdenv, fetchurl, fetchpatch, autoreconfHook }:
+{ stdenv, fetchurl, fetchpatch, autoreconfHook, ghostscript }:
 
-let version = "9.18";
-in
 stdenv.mkDerivation {
-  name = "ijs-${version}";
+  name = "ijs-${ghostscript.version}";
 
-  src = fetchurl {
-    url = "http://downloads.ghostscript.com/public/ghostscript-${version}.tar.bz2";
-    sha256 = "18ad90za28dxybajqwf3y3dld87cgkx1ljllmcnc7ysspfxzbnl3";
-  };
+  inherit (ghostscript) src;
 
   patches = [
     # http://bugs.ghostscript.com/show_bug.cgi?id=696246
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 06ffc45cecf..93e83a375a4 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -126,6 +126,8 @@ stdenv.mkDerivation rec {
     install_name_tool -change libgs.dylib.${version} $out/lib/libgs.dylib.${version} $out/bin/gs
   '';
 
+  passthru = { inherit version; };
+
   meta = {
     homepage = "http://www.ghostscript.com/";
     description = "PostScript interpreter (mainline version)";

From d0630da09e3e5da7647fe14d4ef7d2536f916150 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 03:01:32 +0300
Subject: [PATCH 436/712] libiberty: derive from gcc

---
 .../libraries/libiberty/default.nix           | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix
index c3dc3a4e852..1f5ab2cf096 100644
--- a/pkgs/development/libraries/libiberty/default.nix
+++ b/pkgs/development/libraries/libiberty/default.nix
@@ -1,26 +1,16 @@
-{ stdenv, fetchurl, staticBuild ? false }:
+{ stdenv, lib, fetchurl, gcc, staticBuild ? false }:
 
 stdenv.mkDerivation rec {
-  version = "4.9.3";
-  name = "libiberty-${version}";
+  name = "libiberty-${gcc.cc.version}";
 
-  src = fetchurl {
-    url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
-    sha256 = "0zmnm00d2a1hsd41g34bhvxzvxisa2l584q3p447bd91lfjv4ci3";
-  };
+  inherit (gcc.cc) src;
 
   postUnpack = "sourceRoot=\${sourceRoot}/libiberty";
 
-  enable_shared = !staticBuild;
+  configureFlags = [ "--enable-install-libiberty" ] ++ lib.optional (!staticBuild) "--enable-shared";
 
-  installPhase = ''
-    mkdir -p $out/lib $out/include
-    cp ../include/libiberty.h $out/include/
-    if [ -z "$enabled_shared" ]; then
-      cp libiberty.a $out/lib/libiberty.a
-    else
-      cp pic/libiberty.a $out/lib/libiberty_pic.a
-    fi
+  postInstall = lib.optionalString (!staticBuild) ''
+    cp pic/libiberty.a $out/lib*/libiberty.a
   '';
 
   meta = with stdenv.lib; {

From 3c627be4be8d746a83fd014286bbe819a5f4560c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 03:02:26 +0300
Subject: [PATCH 437/712] dwarf-fortress-packages.dfhack: 2016-03-03 ->
 0.42.06-r1

---
 pkgs/games/dwarf-fortress/dfhack/default.nix  |  9 ++--
 .../dfhack/use-system-libraries.patch         | 50 ++++---------------
 2 files changed, 14 insertions(+), 45 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index 0ffcf01ade4..12072739684 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -5,9 +5,11 @@
 }:
 
 let
-  rev = "5e2fc5662115499c10bfcd8a6105a1efe4de081c";
-  xmlRev = "f371e293002f8f6d1e4704cc5869ca07ccf6c4d5";
   dfVersion = "0.42.06";
+  version = "${dfVersion}-r1";
+  rev = "refs/tags/${version}";
+  # revision of library/xml submodule
+  xmlRev = "98cc1e01886aaea161d651cf97229ad08e9782b0";
 
   fakegit = writeScriptBin "git" ''
     #! ${stdenv.shell}
@@ -28,13 +30,12 @@ let
 
 in stdenv.mkDerivation rec {
   name = "dfhack-${version}";
-  version = "2016-03-03";
 
   # Beware of submodules
   src = fetchgit {
     url = "https://github.com/DFHack/dfhack";
     inherit rev;
-    sha256 = "143zkx6hqpqxjhjd1bllg2kfia215x63zifkhgzycg49kw4wkxi5";
+    sha256 = "0h9y9z4d9lirgpcvj5r2znmfi2avdrgrffi9p63gxp1a3mv9fdm1";
   };
 
   patches = [ ./use-system-libraries.patch ];
diff --git a/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch b/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch
index 2ae3620fff6..b6ff92398a5 100644
--- a/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch
+++ b/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch
@@ -1,22 +1,8 @@
-From 1196fcb987b6aadb49075d817b3615bf8a6d7d51 Mon Sep 17 00:00:00 2001
-From: Nikolay Amiantov <ab@fmap.me>
-Date: Wed, 6 Jan 2016 03:07:20 +0300
-Subject: [PATCH 2/2] Use as much system libraries as possible
-
----
- CMakeLists.txt                    |  5 -----
- depends/CMakeLists.txt            |  3 ---
- library/CMakeLists.txt            | 10 +++++-----
- plugins/CMakeLists.txt            |  4 ++--
- plugins/mapexport/CMakeLists.txt  |  4 ++--
- plugins/stockpiles/CMakeLists.txt |  4 ++--
- 6 files changed, 11 insertions(+), 19 deletions(-)
-
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1933390..d871df4 100644
+index 46fd565..254c3c0 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -152,8 +152,6 @@ ELSEIF(MSVC)
+@@ -160,8 +160,6 @@ ELSEIF(MSVC)
    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od")
  ENDIF()
  
@@ -25,9 +11,9 @@ index 1933390..d871df4 100644
  ADD_DEFINITIONS(-DLUA_BUILD_AS_DLL)
  
  if(APPLE)
-@@ -173,11 +171,8 @@ if(NOT UNIX)
+@@ -182,11 +180,8 @@ else()
+     set(ZLIB_ROOT /usr/lib/i386-linux-gnu)
  endif()
- set(ZLIB_ROOT /usr/lib/i386-linux-gnu)
  find_package(ZLIB REQUIRED)
 -include_directories(depends/protobuf)
  include_directories(depends/lua/include)
@@ -53,10 +39,10 @@ index bf0345b..2a1a852 100644
  OPTION(CLSOCKET_SHARED "Build clsocket lib as shared." OFF)
  OPTION(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependency." ON)
 diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
-index 5071d9e..d346d1e 100644
+index 54300ec..128bfd1 100644
 --- a/library/CMakeLists.txt
 +++ b/library/CMakeLists.txt
-@@ -203,10 +203,10 @@ LIST(APPEND PROJECT_SOURCES ${PROJECT_PROTO_SRCS})
+@@ -223,10 +223,10 @@ LIST(APPEND PROJECT_SOURCES ${PROJECT_PROTO_SRCS})
  
  ADD_CUSTOM_COMMAND(
      OUTPUT ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS}
@@ -69,7 +55,7 @@ index 5071d9e..d346d1e 100644
  )
  
  # Merge headers into sources
-@@ -249,12 +249,12 @@ IF(UNIX)
+@@ -269,12 +269,12 @@ IF(UNIX)
  ENDIF()
  
  IF(APPLE)
@@ -86,10 +72,10 @@ index 5071d9e..d346d1e 100644
  
  ADD_LIBRARY(dfhack-version STATIC DFHackVersion.cpp)
 diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
-index 9781401..ece508c 100644
+index dd1c634..7bd8c17 100644
 --- a/plugins/CMakeLists.txt
 +++ b/plugins/CMakeLists.txt
-@@ -69,11 +69,11 @@ STRING(REPLACE ".proto" ".pb.h" PROJECT_PROTO_HDRS "${PROJECT_PROTOS}")
+@@ -47,11 +47,11 @@ STRING(REPLACE ".proto" ".pb.h" PROJECT_PROTO_HDRS "${PROJECT_PROTOS}")
  
  ADD_CUSTOM_COMMAND(
      OUTPUT ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS}
@@ -103,21 +89,6 @@ index 9781401..ece508c 100644
  )
  add_custom_target(generate_proto DEPENDS ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS})
  
-diff --git a/plugins/mapexport/CMakeLists.txt b/plugins/mapexport/CMakeLists.txt
-index 429507a..7e2390a 100644
---- a/plugins/mapexport/CMakeLists.txt
-+++ b/plugins/mapexport/CMakeLists.txt
-@@ -32,8 +32,8 @@ LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS})
- #Generate sources from our proto files and store them in the source tree
- ADD_CUSTOM_COMMAND(
- OUTPUT ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS}
--COMMAND protoc-bin -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto/ ${PROJECT_PROTOS}
--DEPENDS protoc-bin ${PROJECT_PROTOS}
-+COMMAND protoc -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto/ ${PROJECT_PROTOS}
-+DEPENDS ${PROJECT_PROTOS}
- )
- 
- IF(WIN32)
 diff --git a/plugins/stockpiles/CMakeLists.txt b/plugins/stockpiles/CMakeLists.txt
 index 713c3d6..dd2d4cb 100644
 --- a/plugins/stockpiles/CMakeLists.txt
@@ -133,6 +104,3 @@ index 713c3d6..dd2d4cb 100644
  )
  
  IF(WIN32)
--- 
-2.6.3
-

From 91563e23e34c11607c15093b8eb888b42690353d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 03:02:55 +0300
Subject: [PATCH 438/712] dwarf-fortress-packages.cla-theme: 20160128 ->
 42.06-v22

---
 pkgs/games/dwarf-fortress/themes/cla.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/themes/cla.nix b/pkgs/games/dwarf-fortress/themes/cla.nix
index 39b7e5d2a4c..b1a27c7e47b 100644
--- a/pkgs/games/dwarf-fortress/themes/cla.nix
+++ b/pkgs/games/dwarf-fortress/themes/cla.nix
@@ -3,14 +3,15 @@
 # On upgrade check https://github.com/DFgraphics/CLA/blob/master/manifest.json
 # for compatibility information.
 
-stdenv.mkDerivation {
-  name = "cla-theme-20160128";
+stdenv.mkDerivation rec {
+  name = "cla-theme-${version}";
+  version = "42.06-v22";
 
   src = fetchFromGitHub {
     owner = "DFgraphics";
     repo = "CLA";
-    rev = "94088b778ed6f91cbddcd3e33aa1e5efa67f3101";
-    sha256 = "0rx1375x9s791k9wzvj7sxcrv4xaggibxymzirayznvavr7zcsv1";
+    rev = version;
+    sha256 = "1rr52j1wns17axc27fab0wn0338axzwkqp7cpa690kb3bl1y0pf5";
   };
 
   installPhase = ''

From 52f6c0cfb8d18524a72c0d1bc036aba5d5cd63fc Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 03:03:09 +0300
Subject: [PATCH 439/712] dwarf-fortress-packages.phoebus-theme: 20160128 ->
 42.06a

---
 pkgs/games/dwarf-fortress/themes/phoebus.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix
index 8fd9a7dbf04..0022f9dc1c7 100644
--- a/pkgs/games/dwarf-fortress/themes/phoebus.nix
+++ b/pkgs/games/dwarf-fortress/themes/phoebus.nix
@@ -3,14 +3,15 @@
 # On upgrade check https://github.com/DFgraphics/Phoebus/blob/master/manifest.json
 # for compatibility information.
 
-stdenv.mkDerivation {
-  name = "phoebus-theme-20160128";
+stdenv.mkDerivation rec {
+  name = "phoebus-theme-${version}";
+  version = "42.06a";
 
   src = fetchFromGitHub {
     owner = "DFgraphics";
     repo = "Phoebus";
-    rev = "52b19b69c7323f9002ad195ecd68ac02ff0099a2";
-    sha256 = "1pw5l5v7l1bvxzjf4fivmagpmghffvz0wlws2ksc7d5vy48ybcmg";
+    rev = version;
+    sha256 = "1mkj882mf1lvjs2b7jxfazym9fl1y20slbfi1lgqzbp1872aaxi0";
   };
 
   installPhase = ''

From a8aa91dc5c7c5732b05a6812251f8dfbf98cdaf8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 03:03:35 +0300
Subject: [PATCH 440/712] ioquake3: 2016-03-15 -> 2016-04-05

---
 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 3067b5cefea..2fff7e7a026 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 = "2016-03-15";
+  version = "2016-04-05";
 
   src = fetchFromGitHub {
     owner = "ioquake";
     repo = "ioq3";
-    rev = "f911e32bb059f714dfc49dc2296bc6f27c442e4c";
-    sha256 = "0l60snxlgvwxbpv31nwshy0rddyyxmcvqg6xqj9ifzr1gj4np5r8";
+    rev = "1f6703821f11be9c711c6ee42371ab290dd12776";
+    sha256 = "0jbn4lv85khfcmn1dc3mrx7zxldj3p4cggx85hdfpiwmnsjl4w67";
   };
 
   nativeBuildInputs = [ which pkgconfig ];

From a80e94a774cc9c97afebbea27db42356eb24bde2 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 03:03:52 +0300
Subject: [PATCH 441/712] android-udev-rules: 2016-03-03 -> 2016-04-26

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

diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index 5e3fb1c2ba0..be2b8026817 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "android-udev-rules-${version}";
-  version = "2016-03-03";
+  version = "2016-04-26";
 
   src = fetchFromGitHub {
     owner = "M0Rf30";
     repo = "android-udev-rules";
-    rev = "a6ec1239173bfbe2082211261528e834af9fbb64";
-    sha256 = "11g7m8jjxxzyrbsd9g7cbk6bwy3c4f76pdy4lvdx68xrbsl2rvmj";
+    rev = "9af6e552016392db35191142b599a5199cf8a9fa";
+    sha256 = "1lvh7md6qz91q8jy9phnfxlb19s104lvsk75a5r07d8bjc4w9pxb";
   };
 
   installPhase = ''

From 3e641feb9dc8e4375d5a7e1bab3edb1e587e3aaa Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 03:04:09 +0300
Subject: [PATCH 442/712] blueman: 2.0.3 -> 2.0.4

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

diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 428c751571c..def096a571d 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -7,11 +7,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "blueman-${version}";
-  version = "2.0.3";
+  version = "2.0.4";
    
   src = fetchurl {
     url = "https://github.com/blueman-project/blueman/releases/download/${version}/${name}.tar.xz";
-    sha256 = "09aqlk4c2qzqpmyf7b40sic7d45c1l8fyrb9f3s22b8w83j0adi4";
+    sha256 = "03s305mbc57nl3sq5ywh9casz926k4aqnylgaidli8bmgz1djbg9";
   };
 
   nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython ];

From b63edea44c45df1ca0cb35c8f7a2d5ff929c2bb1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 03:04:20 +0300
Subject: [PATCH 443/712] imgurbash2: 1.0 -> 2.1

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

diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/tools/graphics/imgurbash2/default.nix
index 99ef87ca5df..5a655b9ff16 100644
--- a/pkgs/tools/graphics/imgurbash2/default.nix
+++ b/pkgs/tools/graphics/imgurbash2/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "imgurbash2-${version}";
-  version = "1.0";
+  version = "2.1";
 
   src = fetchFromGitHub {
     owner = "ram-on";
     repo = "imgurbash2";
     rev = version;
-    sha256 = "0w8xfdvv6h0cqln9a2b1rskpyv4v5qsywqzg10smg05xlrh9f5nx";
+    sha256 = "1vdkyy0gvjqwc2g7a1lqx6cbynfxbd4f66m8sg1xjvd0kdpgi9wk";
   };
 
   installPhase = ''

From 626b1c41017093f13d77688f80fb16fa51ca163a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 03:04:36 +0300
Subject: [PATCH 444/712] grub4dos: 0.4.6a-2015-12-31 -> 0.4.6a-2016-04-26

---
 pkgs/tools/misc/grub4dos/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix
index e5c613f7a89..0195022f703 100644
--- a/pkgs/tools/misc/grub4dos/default.nix
+++ b/pkgs/tools/misc/grub4dos/default.nix
@@ -1,18 +1,21 @@
-{ stdenv, fetchurl, unzip, nasm }:
+{ stdenv, fetchFromGitHub, nasm }:
 
 let arch =
   if stdenv.isi686 then "i386"
   else if stdenv.isx86_64 then "x86_64"
   else abort "Unknown architecture";
-in stdenv.mkDerivation {
-  name = "grub4dos-0.4.6a-2015-12-31";
+in stdenv.mkDerivation rec {
+  name = "grub4dos-${version}";
+  version = "0.4.6a-2016-04-26";
 
-  src = fetchurl {
-    url = https://github.com/chenall/grub4dos/archive/a8024743c61cc4909514b27df07b7cc4bc89d1fb.zip;
-    sha256 = "1m5d7klb12qz5sa09919z7jchfafgh84cmpwilp52qnbpi3zh2fd";
+  src = fetchFromGitHub {
+    owner = "chenall";
+    repo = "grub4dos";
+    rev = "61d8229375c679436d56376518456723b2025e1a";
+    sha256 = "1r4jmvykk5cvpf1kysykvksa9vfy7p29q20x72inw2pbhipj0f10";
   };
 
-  nativeBuildInputs = [ unzip nasm ];
+  nativeBuildInputs = [ nasm ];
 
   configureFlags = [ "--host=${arch}-pc-linux-gnu" ];
 

From 05ea80af1f2d8d178b7e2e4b7bc28737641128c4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 03:04:51 +0300
Subject: [PATCH 445/712] sdl-jstest: 20150806 -> 2016-03-29

---
 pkgs/tools/misc/sdl-jstest/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix
index fec1039a1f2..31cedd282a4 100644
--- a/pkgs/tools/misc/sdl-jstest/default.nix
+++ b/pkgs/tools/misc/sdl-jstest/default.nix
@@ -1,11 +1,14 @@
-{ fetchgit, stdenv, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl }:
+{ fetchFromGitHub, stdenv, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl }:
 
 stdenv.mkDerivation rec {
-  name = "sdl-jstest-20150806";
-  src = fetchgit {
-    url = "https://github.com/Grumbel/sdl-jstest";
-    rev = "7b792376178c9656c851ddf106c7d57b2495e8b9";
-    sha256 = "3aa9a002de9c9999bd7c6248b94148f15dba6106489e418b2a1a410324f75eb8";
+  name = "sdl-jstest-${version}";
+  version = "2016-03-29";
+
+  src = fetchFromGitHub {
+    owner = "Grumbel";
+    repo = "sdl-jstest";
+    rev = "301a0e8cf3f96de4c5e58d9fe4413e5cd2b4e6d4";
+    sha256 = "1qrz09by5snc3n1wppf2y0pj7rx29dlh1g84glga8vvb03n3yb14";
   };
 
   buildInputs = [ SDL SDL2 ncurses ];

From a77cb861fd4671932400d3de28ece0eed61ccac8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 03:05:07 +0300
Subject: [PATCH 446/712] xl2tpd: 1.3.6 -> 1.3.7

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

diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/tools/networking/xl2tpd/default.nix
index ac8be4eb5de..c9804caad4a 100644
--- a/pkgs/tools/networking/xl2tpd/default.nix
+++ b/pkgs/tools/networking/xl2tpd/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, libpcap, ppp }:
 
-let version = "1.3.6";
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "xl2tpd-${version}";
+  version = "1.3.7";
 
   src = fetchFromGitHub {
     owner = "xelerance";
     repo = "xl2tpd";
     rev = "v${version}";
-    sha256 = "17lnsk9fsyfp2g5hha7psim6047wj9qs8x4y4w06gl6bbf36jm9z";
+    sha256 = "0wjkj2b5rkxhx522wmkml5s0zdp68hkvrh7npx839dvsr79fji7k";
   };
 
   buildInputs = [ libpcap ];

From bf0a3b4ba877cd7884bd777f296a508565b1941a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 03:05:14 +0300
Subject: [PATCH 447/712] thermald: 1.4.3 -> 1.5.3

---
 pkgs/tools/system/thermald/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix
index e4b2055b591..baa18aacdfb 100644
--- a/pkgs/tools/system/thermald/default.nix
+++ b/pkgs/tools/system/thermald/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus_glib, libxml2 }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.3";
   name = "thermald-${version}";
+  version = "1.5.3";
+
   src = fetchFromGitHub {
     owner = "01org";
     repo = "thermal_daemon";
     rev = "v${version}";
-    sha256 = "1wrbydmw1jc5dcjawhhsa52hilzajl9n849i09d2nfilv3qcqqi9";
+    sha256 = "0k10sl262d9slrln1vkgsxlr1pnfxzd3ycs552bl7ynf0zxpl48h";
   };
 
   buildInputs = [ autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ];

From aa2ba7ffe576b3222947153008c7ca2ec684290c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 03:48:47 +0300
Subject: [PATCH 448/712] ejabberd: cleanup build

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

diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index dd882de723a..974a636e559 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeScriptBin, lib, fetchurl, fetchFromGitHub, git, cacert
+{ stdenv, writeScriptBin, lib, fetchurl, git, cacert
 , erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, utillinux, procps
 , withMysql ? false
 , withPgsql ? false
@@ -69,13 +69,14 @@ in stdenv.mkDerivation rec {
           rm -rf .git
         )
       done
+      rm deps/.got
 
       cp -r deps $out
     '';
 
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "0kmk22z1r9c23j9hh91975pqh3jkh7z6i1gnmw4qxr8alcnpr75f";
+    outputHash = "0zmb7g00y5q4alf70i1chv3yim63i03sy4p8i83bzvxri59vw0zv";
   };
 
   configureFlags =
@@ -96,10 +97,6 @@ in stdenv.mkDerivation rec {
   preBuild = ''
     cp -r $deps deps
     chmod -R +w deps
-
-    for i in deps/*; do
-      [ -x "$i/configure" ] && ( cd "$i"; ./configure ) || true
-    done
   '';
 
   postInstall = ''

From ec6b547b17d102c44f8817bae875418bd2797786 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 04:26:26 +0300
Subject: [PATCH 449/712] truecrypt: fix containers' mount

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ab7940fe72..586248d04ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3678,6 +3678,7 @@ in
   };
 
   truecrypt = callPackage ../applications/misc/truecrypt {
+    stdenv = overrideInStdenv stdenv [ useOldCXXAbi ];
     wxGUI = config.truecrypt.wxGUI or true;
   };
 

From e05ef5f94b059cec3da2290413e51ebd774e853c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 30 Apr 2016 01:43:31 +0000
Subject: [PATCH 450/712] oh-my-zsh: 2016-04-06 -> 2016-04-20

---
 pkgs/shells/oh-my-zsh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix
index 796521b5233..78b112210ac 100644
--- a/pkgs/shells/oh-my-zsh/default.nix
+++ b/pkgs/shells/oh-my-zsh/default.nix
@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation rec {
   name = "oh-my-zsh-git-${version}";
-  version = "2016-04-06";
+  version = "2016-04-20";
 
   src = fetchgit {
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    rev = "d310fac7f65d31f7494532201e02ebf67c9d9555";
-    sha256 = "0kx552b0jf5j8qkk1kixdr1z49ly79cvzhdh27848rj3kwb0z8vq";
+    rev = "1b1315a777328095cd8b5f364fd4345eeae7c4bf";
+    sha256 = "0q3w96a9rjxmqknycxjqjs5mi0q2mark8yrfim7snxrf9ajv0ypk";
   };
 
   phases = "installPhase";

From f0189a8b40acb81fa4a0898f7df582fef049c4f5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 04:51:50 +0300
Subject: [PATCH 451/712] dspam: fix build with PostgreSQL support

---
 pkgs/servers/mail/dspam/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix
index 3cd3ca7492d..4c615e6f6b3 100644
--- a/pkgs/servers/mail/dspam/default.nix
+++ b/pkgs/servers/mail/dspam/default.nix
@@ -49,7 +49,8 @@ in stdenv.mkDerivation rec {
     "--enable-preferences-extension"
     "--enable-long-usernames"
     "--enable-external-lookup"
-  ] ++ lib.optional withMySQL "--with-mysql-includes=${libmysql}/include/mysql";
+  ] ++ lib.optional withMySQL "--with-mysql-includes=${libmysql}/include/mysql"
+    ++ lib.optional withPgSQL "--with-pgsql-libraries=${postgresql.lib}/lib";
 
   # Lots of things are hardwired to paths like sysconfdir. That's why we install with both "prefix" and "DESTDIR"
   # and fix directory structure manually after that.

From c048f7db7b48620840f5dc4ed1b0c1530bdd2c79 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 30 Apr 2016 02:07:50 +0000
Subject: [PATCH 452/712] rpm: fix state directory in build

Prior to this change, it was was defaulting to storing its state in
its store path, which didn't make any sense.

Also added myself as a maintainer
---
 pkgs/tools/package-management/rpm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index ab5574b07f1..6c2c9a350ad 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -24,13 +24,13 @@ stdenv.mkDerivation rec {
     substituteInPlace configure --replace 'python''${PYTHON_VERSION}' ${python.executable}
   '';
 
-  configureFlags = "--with-external-db --with-lua --enable-python";
+  configureFlags = "--with-external-db --with-lua --enable-python --localstatedir=/var --sharedstatedir=/com";
 
   meta = with stdenv.lib; {
     homepage = http://www.rpm.org/;
     license = licenses.gpl2;
     description = "The RPM Package Manager";
-    maintainers = [ maintainers.mornfall ];
+    maintainers = with maintainers; [ mornfall copumpkin ];
     platforms = platforms.linux;
   };
 }

From ce946f24513559975270652bee7ff9ce47f9e43a Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 30 Apr 2016 02:12:54 +0000
Subject: [PATCH 453/712] libsolv: add meta attrset and add myself as a
 maintainer

---
 pkgs/development/libraries/libsolv/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix
index a69403ded07..cece520e3c5 100644
--- a/pkgs/development/libraries/libsolv/default.nix
+++ b/pkgs/development/libraries/libsolv/default.nix
@@ -14,4 +14,12 @@ stdenv.mkDerivation rec {
   cmakeFlags = "-DENABLE_RPMMD=true -DENABLE_RPMDB=true -DENABLE_PUBKEY=true -DENABLE_RPMDB_BYRPMHEADER=true";
 
   buildInputs = [ cmake zlib expat rpm db ];
+
+  meta = with stdenv.lib; {
+    description = "A free package dependency solver";
+    license     = licenses.bsd3;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ copumpkin ];
+  };
 }
+

From 48fb16ffbf47f79b6d85ef3be623b8814385763f Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 30 Apr 2016 02:15:04 +0000
Subject: [PATCH 454/712] createrepo_c: add meta and myself as a maintainer

---
 pkgs/tools/package-management/createrepo_c/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix
index b884540f8d4..eed1ed1e526 100644
--- a/pkgs/tools/package-management/createrepo_c/default.nix
+++ b/pkgs/tools/package-management/createrepo_c/default.nix
@@ -23,5 +23,13 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ cmake pkgconfig bzip2 expat glib curl libxml2 python rpm openssl sqlite file xz pcre bashCompletion ];
+
+  meta = with stdenv.lib; {
+    description = "C implementation of createrepo";
+    homepage    = "http://rpm-software-management.github.io/createrepo_c/";
+    license     = licenses.gpl2;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ copumpkin ];
+  };
 }
 

From 7a37ac15b3fdca4dfa5c16fcc2a4de1294f5dc87 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 05:32:06 +0300
Subject: [PATCH 455/712] runit: fix build

---
 pkgs/tools/system/runit/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix
index 28c68f52aaf..70c49335eaf 100644
--- a/pkgs/tools/system/runit/default.nix
+++ b/pkgs/tools/system/runit/default.nix
@@ -13,8 +13,12 @@ stdenv.mkDerivation rec {
 
   patches = [ ./Makefile.patch ];
 
-  buildPhase = ''
+  postPatch = ''
     cd ${name}
+    sed -i 's,-static,,g' src/Makefile
+  '';
+
+  buildPhase = ''
     make -C 'src'
   '';
 

From c03d7f2819da303db1047a2baab0fe14112f2315 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 30 Apr 2016 09:57:14 +0200
Subject: [PATCH 456/712] filezilla: 3.16.1 -> 3.17.0

---
 pkgs/applications/networking/ftp/filezilla/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index 698f379c09c..c9745a084c6 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
-, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla }:
+, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:
 
-let version = "3.16.1"; in
+let version = "3.17.0"; in
 stdenv.mkDerivation {
   name = "filezilla-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
-    sha256 = "1a6xvpnsjpgdrxla0i2zag30hy825rfsl4ka9p0zj5za9j2ny11v";
+    sha256 = "0vb5zqpvh0fi0a7nkz79cdmbzjk1cpmbyqx77nfkvd1kz1fcsqrp";
   };
 
   configureFlags = [
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     dbus gnutls wxGTK30 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite
-    pugixml libfilezilla ];
+    pugixml libfilezilla nettle ];
 
   meta = with stdenv.lib; {
     homepage = http://filezilla-project.org/;

From 4cd0770d57e397fbcfa0dd7bda6f089a6685092e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 30 Apr 2016 10:09:25 +0200
Subject: [PATCH 457/712] imapsync: 1.644 -> 1.684

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

diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix
index 877f71bc37b..d6ac630b122 100644
--- a/pkgs/tools/networking/imapsync/default.nix
+++ b/pkgs/tools/networking/imapsync/default.nix
@@ -1,10 +1,10 @@
 {stdenv, makeWrapper, fetchurl, perl, openssl, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "imapsync-1.644";
+  name = "imapsync-1.684";
   src = fetchurl {
     url = "https://fedorahosted.org/released/imapsync/${name}.tgz";
-    sha256 = "1lni950qyp841277dnzb43pxpzqyfcl6sachd8j6a0j08826gfky";
+    sha256 = "1ilqdaabh6xiwpjfdg2mrhygvjlxj6jdkmqjqadq5z29172hji5b";
   };
 
   patchPhase = ''

From 586d1f67ce4262ccae845e2848a68994dada3d91 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 30 Apr 2016 10:42:35 +0200
Subject: [PATCH 458/712] yodl: 3.06.00 -> 3.07.01

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

diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix
index aa76d991966..1efad2d1789 100644
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/pkgs/development/tools/misc/yodl/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "yodl-${version}";
-  version = "3.06.00";
+  version = "3.07.01";
 
   buildInputs = [ perl icmake ];
 
   src = fetchFromGitHub {
-    sha256 = "03n03bxc5lh3v9yzdikqrzzdvrna8zf98mlg2dhnn5z5sb5jhyzc";
+    sha256 = "1l8igql4dw6jiv8gs4bpfxrdgr2za9a1l2k3paxsajhy6w3a9b3m";
     rev = version;
     repo = "yodl";
     owner = "fbb-git";

From 6ac488f2a0305c0f548f83fdcbf3378ce9d76331 Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Sat, 30 Apr 2016 18:25:03 +0800
Subject: [PATCH 459/712] all-packages.nix: some space cleanup

---
 pkgs/top-level/all-packages.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ab7940fe72..603e537a5e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6465,13 +6465,13 @@ in
   beecrypt = callPackage ../development/libraries/beecrypt { };
 
   beignet = callPackage ../development/libraries/beignet {
-    inherit (llvmPackages) clang-unwrapped; 
-    inherit (xlibs) libX11; 
-    inherit (xorg) libXfixes libpthreadstubs libXdmcp libXdamage libXxf86vm; 
-    inherit (python3Packages) python; 
-    inherit (purePackages) gl; 
-  }; 
-  
+    inherit (llvmPackages) clang-unwrapped;
+    inherit (xlibs) libX11;
+    inherit (xorg) libXfixes libpthreadstubs libXdmcp libXdamage libXxf86vm;
+    inherit (python3Packages) python;
+    inherit (purePackages) gl;
+  };
+
   belle-sip = callPackage ../development/libraries/belle-sip { };
 
   bobcat = callPackage ../development/libraries/bobcat { };

From 60e8d9dfabc6721dfc7a1af4a24bf001390f351d Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Sat, 30 Apr 2016 17:11:00 +0800
Subject: [PATCH 460/712] casperjs: refactor a bit

---
 pkgs/development/tools/casperjs/default.nix | 48 +++++++++++----------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix
index bd63a0e68ee..5b4b8cc752d 100644
--- a/pkgs/development/tools/casperjs/default.nix
+++ b/pkgs/development/tools/casperjs/default.nix
@@ -1,40 +1,42 @@
-{ stdenv, fetchgit, python, phantomjs }:
+{ stdenv, fetchFromGitHub, phantomjs, python, nodePackages }:
 
-stdenv.mkDerivation rec {
-  name = "casperjs-1.0.0-RC5";
+let version = "1.0.0-RC5";
 
-  src = fetchgit {
-    url = "git://github.com/n1k0/casperjs.git";
-    rev = "refs/tags/1.0.0-RC5";
-    sha256 = "e7fd6b94b4b304416159196208dea7f6e8841a667df102eb378a698a92f0f2c7";
+in stdenv.mkDerivation rec {
+
+  name = "casperjs-${version}";
+
+  src = fetchFromGitHub {
+    owner = "casperjs";
+    repo = "casperjs";
+    rev = version;
+    sha256 = "10b25jmh9zmlp77h0p3n9d6bnl3wn4iv3h3qnsrgijfszxyh0wgw";
   };
 
+  buildInputs = [ phantomjs python nodePackages.eslint ];
+
   patchPhase = ''
     substituteInPlace bin/casperjs --replace "/usr/bin/env python" "${python}/bin/python" \
                                    --replace "'phantomjs'" "'${phantomjs}/bin/phantomjs'"
   '';
 
+  dontBuild = true;
+
   installPhase = ''
-    mkdir -p $out/share/casperjs $out/bin
-    cp -a . $out/share/casperjs/.
-    ln -s $out/share/casperjs/bin/casperjs $out/bin
+    mv $PWD $out
   '';
 
   meta = {
-    description = "Navigation scripting & testing utility for PhantomJS";
+
+    description = ''
+      Navigation scripting & testing utility for PhantomJS and SlimerJS
+    '';
+
     longDescription = ''
-      CasperJS is a navigation scripting & testing utility for PhantomJS.
-      It eases the process of defining a full navigation scenario and provides useful high-level
-      functions, methods & syntaxic sugar for doing common tasks such as:
-      - defining & ordering navigation steps
-      - filling forms
-      - clicking links
-      - capturing screenshots of a page (or an area)
-      - making assertions on remote DOM
-      - logging & events
-      - downloading base64 encoded resources, even binary ones
-      - catching errors and react accordingly
-      - writing functional test suites, exporting results as JUnit XML (xUnit)
+      CasperJS is a navigation scripting & testing utility for PhantomJS and
+      SlimerJS (still experimental). It eases the process of defining a full
+      navigation scenario and provides useful high-level functions, methods &
+      syntactic sugar for doing common tasks.
     '';
 
     homepage = http://casperjs.org;

From 52ec8e2ce4bb4c7cff40571258b148650039b1f9 Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Sat, 30 Apr 2016 17:11:23 +0800
Subject: [PATCH 461/712] casperjs: update to 1.1.1

---
 pkgs/development/tools/casperjs/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix
index 5b4b8cc752d..021bbac8b7c 100644
--- a/pkgs/development/tools/casperjs/default.nix
+++ b/pkgs/development/tools/casperjs/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, phantomjs, python, nodePackages }:
 
-let version = "1.0.0-RC5";
+let version = "1.1.1";
 
 in stdenv.mkDerivation rec {
 
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
     owner = "casperjs";
     repo = "casperjs";
     rev = version;
-    sha256 = "10b25jmh9zmlp77h0p3n9d6bnl3wn4iv3h3qnsrgijfszxyh0wgw";
+    sha256 = "187prrm728xpn0nx9kxfxa4fwd7w25z78nsxfk6a6kl7c5656jpz";
   };
 
   buildInputs = [ phantomjs python nodePackages.eslint ];
@@ -22,6 +22,9 @@ in stdenv.mkDerivation rec {
 
   dontBuild = true;
 
+  doCheck = true;
+  checkTarget = "test";
+
   installPhase = ''
     mv $PWD $out
   '';

From bb7e3c67537668e1b83006f8236545231ed0c6f0 Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Sat, 30 Apr 2016 17:13:00 +0800
Subject: [PATCH 462/712] casperjs: update to phantomjs2

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

diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix
index 021bbac8b7c..387a367b327 100644
--- a/pkgs/development/tools/casperjs/default.nix
+++ b/pkgs/development/tools/casperjs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, phantomjs, python, nodePackages }:
+{ stdenv, fetchFromGitHub, phantomjs2, python, nodePackages }:
 
 let version = "1.1.1";
 
@@ -13,11 +13,11 @@ in stdenv.mkDerivation rec {
     sha256 = "187prrm728xpn0nx9kxfxa4fwd7w25z78nsxfk6a6kl7c5656jpz";
   };
 
-  buildInputs = [ phantomjs python nodePackages.eslint ];
+  buildInputs = [ phantomjs2 python nodePackages.eslint ];
 
   patchPhase = ''
     substituteInPlace bin/casperjs --replace "/usr/bin/env python" "${python}/bin/python" \
-                                   --replace "'phantomjs'" "'${phantomjs}/bin/phantomjs'"
+                                   --replace "'phantomjs'" "'${phantomjs2}/bin/phantomjs'"
   '';
 
   dontBuild = true;

From d950d6b786b90d84d460aedbdb76fbb664419057 Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Sat, 30 Apr 2016 18:25:52 +0800
Subject: [PATCH 463/712] casperjs: test needs fontconfig

---
 pkgs/development/tools/casperjs/default.nix | 8 ++++++--
 pkgs/top-level/all-packages.nix             | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix
index 387a367b327..a4b9f23c5eb 100644
--- a/pkgs/development/tools/casperjs/default.nix
+++ b/pkgs/development/tools/casperjs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, phantomjs2, python, nodePackages }:
+{ stdenv, fetchFromGitHub, fontsConf, phantomjs2, python, nodePackages }:
 
 let version = "1.1.1";
 
@@ -23,7 +23,11 @@ in stdenv.mkDerivation rec {
   dontBuild = true;
 
   doCheck = true;
-  checkTarget = "test";
+  checkPhase = ''
+    export FONTCONFIG_FILE=${fontsConf}
+    make test
+  '';
+
 
   installPhase = ''
     mv $PWD $out
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 603e537a5e2..7fea61dbf7d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5811,7 +5811,9 @@ in
       inherit rustc;
     };
 
-  casperjs = callPackage ../development/tools/casperjs { };
+  casperjs = callPackage ../development/tools/casperjs {
+    inherit (texFunctions) fontsConf;
+  };
 
   cbrowser = callPackage ../development/tools/misc/cbrowser { };
 

From e704c90b50ff7638d2bdfec5ea50903e6c43e5a7 Mon Sep 17 00:00:00 2001
From: NotaseCretagen <Notase.Cretagen@gmail.com>
Date: Sat, 30 Apr 2016 14:14:06 +0300
Subject: [PATCH 464/712] Manual: rephrase definition for indented strings
 (#15086)

Closes #15076
---
 nixos/doc/manual/configuration/config-file.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml
index 9b240979273..645257687fd 100644
--- a/nixos/doc/manual/configuration/config-file.xml
+++ b/nixos/doc/manual/configuration/config-file.xml
@@ -106,11 +106,15 @@ networking.extraHosts =
   '';
 </programlisting>
 
-      The main difference is that preceding whitespace is
-      automatically stripped from each line, and that characters like
+      The main difference is that it strips from each line
+      a number of spaces equal to the minimal indentation of
+      the string as a whole (disregarding the indentation of
+      empty lines), and that characters like
       <literal>"</literal> and <literal>\</literal> are not special
       (making it more convenient for including things like shell
       code).</para>
+      See more info about this in the Nix manual <link
+xlink:href="https://nixos.org/nix/manual/#ssec-values">here</link>.
     </listitem>
   </varlistentry>
 

From b8f60085fb6bf16ccf2f00abae886154fbdeb126 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 30 Apr 2016 12:32:18 +0200
Subject: [PATCH 465/712] acpid: 2.0.25 -> 2.0.27; maintain

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

diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix
index 1746c938444..aa8b25560e6 100644
--- a/pkgs/os-specific/linux/acpid/default.nix
+++ b/pkgs/os-specific/linux/acpid/default.nix
@@ -1,21 +1,18 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "acpid-2.0.25";
+  name = "acpid-2.0.27";
 
   src = fetchurl {
     url = "mirror://sourceforge/acpid2/${name}.tar.xz";
-    sha256 = "0s2wg84x6pnrkf7i7lpzw2rilq4mj50vwb7p2b2n5hdyfa00lw0b";
+    sha256 = "05m6scbdzi2fb8zzi01c11a10pr0qb1gzccz4bbxj4fcacz24342";
   };
 
-  preBuild = ''
-    makeFlagsArray=(BINDIR=$out/bin SBINDIR=$out/sbin MAN8DIR=$out/share/man/man8)
-  '';
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://tedfelix.com/linux/acpid-netlink.html;
     description = "A daemon for delivering ACPI events to userspace programs";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
   };
 }

From db00d1803ffe9341831d1a05445b26a209cf76c1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 30 Apr 2016 12:47:17 +0200
Subject: [PATCH 466/712] abcde: 2.7 -> 2.7.2

---
 pkgs/applications/audio/abcde/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index cfce61c8752..b5ccde86619 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -3,13 +3,13 @@
 , perl, DigestSHA, MusicBrainz, MusicBrainzDiscID
 , makeWrapper }:
 
-let version = "2.7";
+let version = "2.7.2";
 in
   stdenv.mkDerivation {
     name = "abcde-${version}";
     src = fetchurl {
       url = "http://abcde.einval.com/download/abcde-${version}.tar.gz";
-      sha256 = "0ikpffzvacadh6vj9qlary8126j1zrd2knp9gvivmp7y1656jj01";
+      sha256 = "1pakpi41k8yd780mfp0snhia6mmwjwxk9lcrq6gynimch8b8hfda";
     };
 
     # FIXME: This package does not support `distmp3', `eject', etc.
@@ -39,6 +39,8 @@ in
 
     buildInputs = [ makeWrapper ];
 
+    installFlags = [ "sysconfdir=$(out)/etc" ];
+
     postInstall = ''
     #   substituteInPlace "$out/bin/cddb-tool" \
     #      --replace '#!/bin/sh' '#!${bash}/bin/sh'

From f72d3b2bbff2a8843adb1a777edc87058cc33000 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 30 Apr 2016 13:19:13 +0200
Subject: [PATCH 467/712] hplip{,WithPlugin}: 3.15.11 -> 3.16.3

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

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 7aed8dad599..3b39a685a2d 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -10,16 +10,16 @@
 let
 
   name = "hplip-${version}";
-  version = "3.15.11";
+  version = "3.16.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
-    sha256 = "0vbw815a3wffp6l5m7j6f78xwp9pl1vn43ppyf0lp8q4vqdp3i1k";
+    sha256 = "1501qdnkjp1ybgagy5188fmf6cgmj5555ygjl3543nlbwcp31lj2";
   };
 
   plugin = fetchurl {
     url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
-    sha256 = "00ii36y3914jd8zz4h6rn3xrf1w8szh1z8fngbl2qvs3qr9cm1m9";
+    sha256 = "03q730w0kbh8i55i95vfb59yc0kjxz01hjpb3l05w2jw3hmfzvdp";
   };
 
   hplipState =

From b19d7e32a0c3e7b85749085bd07909d9fea26766 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 30 Apr 2016 12:34:36 +0000
Subject: [PATCH 468/712] squid: 3.5.15 -> 3.5.17 (resolving CVE-2016-3947,
 CVE-2016-3948, CVE-2016-4051, CVE-2016-4052, CVE-2016-4053, CVE-2016-4054)

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

diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix
index 2831423d123..4865b839ae4 100644
--- a/pkgs/servers/squid/default.nix
+++ b/pkgs/servers/squid/default.nix
@@ -1,10 +1,10 @@
 { fetchurl, stdenv, perl, lib, openldap, pam, db, cyrus_sasl, libcap,
 expat, libxml2, libtool, openssl}:
 stdenv.mkDerivation rec {
-  name = "squid-3.5.15";
+  name = "squid-3.5.17";
   src = fetchurl {
     url = "http://www.squid-cache.org/Versions/v3/3.5/${name}.tar.bz2";
-    sha256 = "1cgy6ffyarqd35plqmqi3mrsp0941c6n55pr3zavp07ksj46wgzm";
+    sha256 = "1kdq778cm18ak4624gchmbi8avnzyvwgyzjplkd0fkcrgfs44bsf";
   };
   buildInputs = [perl openldap pam db cyrus_sasl libcap expat libxml2
     libtool openssl];

From 1573bde0495bd1aec3137dc655278f97770be2de Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 28 Apr 2016 15:55:21 +0300
Subject: [PATCH 469/712] sqlite_analyzer: fix typo

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

diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
index 4e5d360aea0..d3e1a6dc17e 100644
--- a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
+++ b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, unzip, tcl }:
 
 stdenv.mkDerivation {
-  name = "sqlite3_analzer-3.8.10.1";
+  name = "sqlite3_analyzer-3.8.10.1";
 
   src = fetchurl {
     url = "https://www.sqlite.org/2015/sqlite-src-3081001.zip";

From cf34a7be4a513eb3f99c9474df9d7b16b43b486a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 15:53:12 +0300
Subject: [PATCH 470/712] quazip_qt4: add as a separate derivation

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 586248d04ee..a0cf2dab0d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3174,9 +3174,11 @@ in
   screen-message = callPackage ../tools/X11/screen-message { };
 
   screencloud = callPackage ../applications/graphics/screencloud {
-    quazip = qt5.quazip.override { qt = qt4; qmakeHook = qmake4Hook; };
+    quazip = quazip_qt4;
   };
 
+  quazip_qt4 = self.qt5.quazip.override { qt = qt4; qmakeHook = qmake4Hook; };
+
   scrot = callPackage ../tools/graphics/scrot { };
 
   scrypt = callPackage ../tools/security/scrypt { };
@@ -14129,7 +14131,7 @@ in
     enableXMPP      = config.tomahawk.enableXMPP      or true;
     enableKDE       = config.tomahawk.enableKDE       or false;
     enableTelepathy = config.tomahawk.enableTelepathy or false;
-    quazip = qt5.quazip.override { qt = qt4; };
+    quazip = quazip_qt4;
   };
 
   torchPackages = recurseIntoAttrs ( callPackage ../applications/science/machine-learning/torch {

From d2dcbd3c00cc55e71a7b816db51cb76dbd9ca16f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 30 Apr 2016 14:29:09 +0100
Subject: [PATCH 471/712] Revert "Manual: rephrase definition for indented
 strings" (#15103)

---
 nixos/doc/manual/configuration/config-file.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml
index 645257687fd..9b240979273 100644
--- a/nixos/doc/manual/configuration/config-file.xml
+++ b/nixos/doc/manual/configuration/config-file.xml
@@ -106,15 +106,11 @@ networking.extraHosts =
   '';
 </programlisting>
 
-      The main difference is that it strips from each line
-      a number of spaces equal to the minimal indentation of
-      the string as a whole (disregarding the indentation of
-      empty lines), and that characters like
+      The main difference is that preceding whitespace is
+      automatically stripped from each line, and that characters like
       <literal>"</literal> and <literal>\</literal> are not special
       (making it more convenient for including things like shell
       code).</para>
-      See more info about this in the Nix manual <link
-xlink:href="https://nixos.org/nix/manual/#ssec-values">here</link>.
     </listitem>
   </varlistentry>
 

From 7e32b83d779fec08fa055ece6bd936f9efa929a4 Mon Sep 17 00:00:00 2001
From: iarizc Leuname <Notase.Cretagen@gmail.com>
Date: Fri, 29 Apr 2016 20:49:56 +0300
Subject: [PATCH 472/712] Manual: rephrase definition for indented strings

Closes #15076
---
 nixos/doc/manual/configuration/config-file.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml
index 9b240979273..3d1cdaf4c4a 100644
--- a/nixos/doc/manual/configuration/config-file.xml
+++ b/nixos/doc/manual/configuration/config-file.xml
@@ -106,11 +106,15 @@ networking.extraHosts =
   '';
 </programlisting>
 
-      The main difference is that preceding whitespace is
-      automatically stripped from each line, and that characters like
+      The main difference is that it strips from each line
+      a number of spaces equal to the minimal indentation of
+      the string as a whole (disregarding the indentation of
+      empty lines), and that characters like
       <literal>"</literal> and <literal>\</literal> are not special
       (making it more convenient for including things like shell
-      code).</para>
+      code).
+      See more info about this in the Nix manual <link
+      xlink:href="https://nixos.org/nix/manual/#ssec-values">here</link>.</para>
     </listitem>
   </varlistentry>
 

From 025ccbccd7a47cc2ce6eac142d8acf619c4cdb9c Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Sat, 30 Apr 2016 12:13:26 -0300
Subject: [PATCH 473/712] subversion: fix apr-1 linking

---
 .../version-management/subversion/apr-1.patch         | 11 +++++++++++
 .../version-management/subversion/default.nix         |  2 ++
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/applications/version-management/subversion/apr-1.patch

diff --git a/pkgs/applications/version-management/subversion/apr-1.patch b/pkgs/applications/version-management/subversion/apr-1.patch
new file mode 100644
index 00000000000..240d94f3f97
--- /dev/null
+++ b/pkgs/applications/version-management/subversion/apr-1.patch
@@ -0,0 +1,11 @@
+--- a/subversion/bindings/swig/perl/native/Makefile.PL.in
++++ b/subversion/bindings/swig/perl/native/Makefile.PL.in
+@@ -72,7 +72,7 @@
+ # According to the log of r7937, the flags guarded by the conditional break
+ # the build on FreeBSD if not conditionalized.
+ my $apr_ldflags = '@SVN_APR_LIBS@'
+-   if $^O eq 'darwin' or $^O eq 'cygwin';
++   if $^O eq 'darwin' or $^O eq 'cygwin' or $^O eq 'linux';
+ 
+ chomp $apr_shlib_path_var;
+ 
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index da21c29e6f9..fc87aea08a4 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -35,6 +35,8 @@ let
       ++ stdenv.lib.optional perlBindings perl
       ++ stdenv.lib.optional saslSupport sasl;
 
+    patches = [ ./apr-1.patch ];
+
     configureFlags = ''
       ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
       ${if httpServer then "--with-apxs=${apacheHttpd}/bin/apxs" else "--without-apxs"}

From e6fbe412ec7d92f6aaddbb2c1356fe844fd3d767 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 30 Apr 2016 17:44:49 +0200
Subject: [PATCH 474/712] torbutton: remove expression

Not updated for years.  Also, using torbutton without the tor browser
bundle is not recommended.
---
 pkgs/tools/security/torbutton/default.nix | 34 -----------------------
 pkgs/top-level/all-packages.nix           |  2 --
 2 files changed, 36 deletions(-)
 delete mode 100644 pkgs/tools/security/torbutton/default.nix

diff --git a/pkgs/tools/security/torbutton/default.nix b/pkgs/tools/security/torbutton/default.nix
deleted file mode 100644
index 05bab06d382..00000000000
--- a/pkgs/tools/security/torbutton/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchgit, zip }:
-stdenv.mkDerivation rec {
-
-  name = "torbutton-${version}.xpi";
-  version = "1.6.1";
-
-  src = fetchgit {
-    url = https://git.torproject.org/torbutton.git;
-    rev = "refs/tags/${version}";
-    sha256 = "0ypzrl8nhckrgh45rcwsjds1jnzz3w5nr09b926a4h3a5njammlv";
-  };
-
-  buildInputs = [ zip ];
-
-  buildPhase = ''
-    mkdir pkg
-    ./makexpi.sh
-  '';
-
-  installPhase = "cat pkg/*.xpi > $out";
-
-  meta = with stdenv.lib; {
-    homepage = https://www.torproject.org/torbutton/;
-    description = "Part of the Tor Browser Bundle";
-    longDescription = ''
-      The component in Tor Browser Bundle that takes care of application-level
-      security and privacy concerns in Firefox. To keep you safe, Torbutton
-      disables many types of active content.
-    '';
-    license = licenses.mit;
-    maintainers = [ maintainers.phreedom ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a050c2f86e5..4d26cf8d62f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3460,8 +3460,6 @@ in
 
   tor-arm = callPackage ../tools/security/tor/tor-arm.nix { };
 
-  torbutton = callPackage ../tools/security/torbutton { };
-
   torbrowser = callPackage ../tools/security/tor/torbrowser.nix {
     inherit (xorg) libXrender libX11 libXext libXt;
   };

From df8971ba40acaad193cddc9f7cae3c867a994060 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 30 Apr 2016 16:01:26 +0000
Subject: [PATCH 475/712] librepo: add meta and add myself as a maintainer

---
 pkgs/tools/package-management/librepo/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix
index 21fc9fe97f5..ceef483c8cc 100644
--- a/pkgs/tools/package-management/librepo/default.nix
+++ b/pkgs/tools/package-management/librepo/default.nix
@@ -20,5 +20,12 @@ stdenv.mkDerivation rec {
 
   # librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here
   propagatedBuildInputs = [ curl gpgme expat ];
+
+  meta = with stdenv.lib; {
+    description = "Library providing C and Python (libcURL like) API for downloading linux repository metadata and packages";
+    license     = licenses.lgpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ copumpkin ];
+  };
 }
 

From c9be29c5fb5892775ad060967aaa848512fdcfa0 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 30 Apr 2016 16:03:47 +0000
Subject: [PATCH 476/712] libhif: add meta and add myself as a maintainer

---
 pkgs/tools/package-management/libhif/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/tools/package-management/libhif/default.nix b/pkgs/tools/package-management/libhif/default.nix
index 895165a1c1f..2667274e2fd 100644
--- a/pkgs/tools/package-management/libhif/default.nix
+++ b/pkgs/tools/package-management/libhif/default.nix
@@ -25,5 +25,12 @@ stdenv.mkDerivation rec {
 
   # ibhif/hif-packagedelta.h includes solv/pool.h
   propagatedBuildInputs = [ libsolv ];
+
+  meta = {
+    description = "A library that provides a high level package-manager. It uses librepo and hawkey under the hood.";
+    license     = licenses.lgpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ copumpkin ];
+  };
 }
 

From befc8667147e90e0e63638ae8b5a4bbd8cf56082 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 30 Apr 2016 16:06:17 +0000
Subject: [PATCH 477/712] rpm-ostree: add meta and add myself as a maintainer

---
 pkgs/tools/misc/rpm-ostree/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix
index 372b0a7f270..903aeec3f48 100644
--- a/pkgs/tools/misc/rpm-ostree/default.nix
+++ b/pkgs/tools/misc/rpm-ostree/default.nix
@@ -37,5 +37,13 @@ in stdenv.mkDerivation rec {
   preConfigure = ''
     env NOCONFIGURE=1 ./autogen.sh
   '';
+
+  meta = {
+    description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model";
+    homepage    = "https://rpm-ostree.readthedocs.io/en/latest/";
+    license     = licenses.lgpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ copumpkin ];
+  };
 }
 

From e5a9d647876b69b4cacec385e454ae9ff52290c8 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Sat, 30 Apr 2016 13:19:14 -0300
Subject: [PATCH 478/712] git: fix subversion bindings for multiple outputs

---
 .../version-management/git-and-tools/git/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 4f41ffb916e..bdbabe9704f 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -111,12 +111,12 @@ stdenv.mkDerivation {
 
       ''# wrap git-svn
         gitperllib=$out/lib/perl5/site_perl
-        for i in ${builtins.toString perlLibs} ${svn}; do
+        for i in ${builtins.toString perlLibs} ${svn.out}; do
           gitperllib=$gitperllib:$i/lib/perl5/site_perl
         done
         wrapProgram $out/libexec/git-core/git-svn     \
                      --set GITPERLLIB "$gitperllib"   \
-                     --prefix PATH : "${svn}/bin" ''
+                     --prefix PATH : "${svn.out}/bin" ''
        else '' # replace git-svn by notification script
         notSupported $out/libexec/git-core/git-svn
        '')

From 6af34124a449fd1c9fb894466636a2c73c7b7940 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 30 Apr 2016 16:23:16 +0000
Subject: [PATCH 479/712] libhif, rpm-ostree: fix broken meta

Forgot to add stdenv.lib to scope!
---
 pkgs/tools/misc/rpm-ostree/default.nix           | 2 +-
 pkgs/tools/package-management/libhif/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix
index 903aeec3f48..8df9666c10b 100644
--- a/pkgs/tools/misc/rpm-ostree/default.nix
+++ b/pkgs/tools/misc/rpm-ostree/default.nix
@@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
     env NOCONFIGURE=1 ./autogen.sh
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model";
     homepage    = "https://rpm-ostree.readthedocs.io/en/latest/";
     license     = licenses.lgpl2Plus;
diff --git a/pkgs/tools/package-management/libhif/default.nix b/pkgs/tools/package-management/libhif/default.nix
index 2667274e2fd..7736c67007a 100644
--- a/pkgs/tools/package-management/libhif/default.nix
+++ b/pkgs/tools/package-management/libhif/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   # ibhif/hif-packagedelta.h includes solv/pool.h
   propagatedBuildInputs = [ libsolv ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A library that provides a high level package-manager. It uses librepo and hawkey under the hood.";
     license     = licenses.lgpl2Plus;
     platforms   = platforms.linux;

From 61f110e8908b7e4e44531e963ead88dd72f2219b Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 30 Apr 2016 18:11:06 +0200
Subject: [PATCH 480/712] tor: meta improvements

---
 pkgs/tools/security/tor/default.nix | 30 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 7ff1cd9cca5..8ac7472a2bc 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -25,25 +25,25 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = {
-    homepage = http://www.torproject.org/;
+  meta = with stdenv.lib; {
+    homepage = https://www.torproject.org/;
     repositories.git = https://git.torproject.org/git/tor;
-    description = "Anonymous network router to improve privacy on the Internet";
+    description = "Anonymizing overlay network";
 
-    longDescription=''
-      Tor protects you by bouncing your communications around a distributed
-      network of relays run by volunteers all around the world: it prevents
-      somebody watching your Internet connection from learning what sites you
-      visit, and it prevents the sites you visit from learning your physical
-      location. Tor works with many of your existing applications, including
-      web browsers, instant messaging clients, remote login, and other
-      applications based on the TCP protocol.
+    longDescription = ''
+      Tor helps improve your privacy by bouncing your communications around a
+      network of relays run by volunteers all around the world: it makes it
+      harder for somebody watching your Internet connection to learn what sites
+      you visit, and makes it harder for the sites you visit to track you. Tor
+      works with many of your existing applications, including web browsers,
+      instant messaging clients, remote login, and other applications based on
+      the TCP protocol.
     '';
 
-    license="mBSD";
+    license = licenses.bsd3;
 
-    maintainers = with stdenv.lib.maintainers;
-      [ phreedom doublec thoughtpolice ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = with maintainers;
+      [ phreedom doublec thoughtpolice joachifm ];
+    platforms = platforms.unix;
   };
 }

From c32618cd851a2ec8838c683a4ae4c7d9a2e81220 Mon Sep 17 00:00:00 2001
From: michael bishop <cleverca22@gmail.com>
Date: Sat, 30 Apr 2016 15:28:11 -0300
Subject: [PATCH 481/712] openiscsi: fix a file that was broken by upstream
 changing things to dynamic linking

---
 pkgs/os-specific/linux/open-iscsi/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix
index 96ff1e52cdd..48055431304 100644
--- a/pkgs/os-specific/linux/open-iscsi/default.nix
+++ b/pkgs/os-specific/linux/open-iscsi/default.nix
@@ -1,10 +1,9 @@
-{ stdenv, fetchFromGitHub, nukeReferences, automake, autoconf, libtool, gettext, utillinux, openisns, openssl, kmod }:
+{ stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext, utillinux, openisns, openssl, kmod }:
 stdenv.mkDerivation rec {
   name = "open-iscsi-${version}";
   version = "2.0-873-${stdenv.lib.substring 0 7 src.rev}";
-  outputs = [ "out" "iscsistart" ];
 
-  buildInputs = [ nukeReferences automake autoconf libtool gettext utillinux openisns.lib openssl kmod ];
+  buildInputs = [ automake autoconf libtool gettext utillinux openisns.lib openssl kmod ];
   
   src = fetchFromGitHub {
     owner = "open-iscsi";
@@ -19,13 +18,12 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-DUSE_KMOD";
 
   preConfigure = ''
-    sed -i 's|/usr/|/|' Makefile
+    sed -i 's|/usr|/|' Makefile
   '';
   
   postInstall = ''
-    mkdir -pv $iscsistart/bin/
-    cp -v usr/iscsistart $iscsistart/bin/
-    nuke-refs $iscsistart/bin/iscsistart
+    cp usr/iscsistart $out/sbin/
+    $out/sbin/iscsistart -v
   '';
 
   meta = with stdenv.lib; {
@@ -33,5 +31,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     homepage = http://www.open-iscsi.com;
     platforms = platforms.linux;
+    maintainers = with maintainers; [ cleverca22 ];
   };
 }

From aaae243b2bbb6d1bf2d0b8f4de0df57f1055ded5 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 30 Apr 2016 20:30:29 +0200
Subject: [PATCH 482/712] imatix_gsl: fix build

See https://hydra.nixos.org/build/35004296/log/raw

Also fix some formatting issues.
---
 pkgs/development/tools/imatix_gsl/default.nix | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix
index 0def514dec5..629ddf69c4e 100644
--- a/pkgs/development/tools/imatix_gsl/default.nix
+++ b/pkgs/development/tools/imatix_gsl/default.nix
@@ -1,30 +1,27 @@
 { stdenv, fetchFromGitHub, pcre } :
 
 stdenv.mkDerivation rec {
-    name = "imatix_gsl";
-    version = "4.1";
-    src = fetchFromGitHub {
-    	owner = "imatix";
-	repo = "gsl";
-	rev = "72192d0d9de17de08d9379602d6482b4e5d402d0";
-	sha256 = "1apy11avgqc27xlczyjh15y10qjdyqsqab1wrl2067qgpdiy58w7";
-    };
+  name = "imatix_gsl";
+  version = "4.1";
 
-    buildInputs = [ pcre ];
+  src = fetchFromGitHub {
+    owner = "imatix";
+    repo = "gsl";
+    rev = "72192d0d9de17de08d9379602d6482b4e5d402d0";
+    sha256 = "1apy11avgqc27xlczyjh15y10qjdyqsqab1wrl2067qgpdiy58w7";
+  };
 
-    preBuild = ''
-    	cd src
-    '';
+  buildInputs = [ pcre ];
 
-    installFlags = "DESTDIR=$(out)";
+  postPatch = "sed -e 's,/usr/bin/install,install,g' -i src/Makefile";
+  preBuild = "cd src";
+  installFlags = "DESTDIR=$(out)";
 
-    meta = with stdenv.lib; {
-    	 license = licenses.gpl3Plus;
-	 homepage = "https://github.com/imatix/gsl";
-	 description = ''
-	     A universal code generator
-	 '';
-	 platforms = platforms.unix;
-	 maintainer = [ maintainers.moosingin3space ];
-    };
-}
\ No newline at end of file
+  meta = with stdenv.lib; {
+    license = licenses.gpl3Plus;
+    homepage = https://github.com/imatix/gsl/;
+    description = "A universal code generator";
+    platforms = platforms.unix;
+    maintainer = [ maintainers.moosingin3space ];
+  };
+}

From 3994a236bb004b8244ead60f0085a657121ed956 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 30 Apr 2016 21:09:18 +0200
Subject: [PATCH 483/712] tor-arm: build recipe improvements

- Fix install of man page
- Remove redundant for loop
- Access python interpreter via pythonPackages
- Remove redundant build inputs (captured via replacement anyway)
- Fix install location of sample rc file.  For whatever reason, the
  install script ends up thinking it needs to use tor-arm, so override
  it
- Clarify meta.description
---
 pkgs/tools/security/tor/tor-arm.nix | 35 ++++++++++++++++-------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/pkgs/tools/security/tor/tor-arm.nix b/pkgs/tools/security/tor/tor-arm.nix
index 365379c8f6a..1857cfcbe22 100644
--- a/pkgs/tools/security/tor/tor-arm.nix
+++ b/pkgs/tools/security/tor/tor-arm.nix
@@ -1,19 +1,21 @@
-{ stdenv, fetchurl, python, setuptools, lsof, nettools, makeWrapper
-, pythonPackages, ncurses }:
+{ stdenv, fetchurl, makeWrapper
+, pythonPackages, ncurses, lsof, nettools
+}:
 
 stdenv.mkDerivation rec {
-  name    = "tor-arm-${version}";
+  name = "tor-arm-${version}";
   version = "1.4.5.0";
 
   src = fetchurl {
-    url    = "https://www.atagar.com/arm/resources/static/arm-${version}.tar.bz2";
+    url = "https://www.atagar.com/arm/resources/static/arm-${version}.tar.bz2";
     sha256 = "1yi87gdglkvi1a23hv5c3k7mc18g0rw7b05lfcw81qyxhlapf3pw";
   };
 
-  buildInputs =
-    [ python pythonPackages.curses setuptools lsof nettools makeWrapper ];
+  nativeBuildInputs = [ makeWrapper pythonPackages.python ];
 
-  patchPhase = ''
+  outputs = [ "out" "man" ];
+
+  postPatch = ''
     substituteInPlace ./setup.py --replace "/usr/bin" "$out/bin"
     substituteInPlace ./src/util/connections.py \
       --replace "lsof -wnPi"   "${lsof}/bin/lsof"
@@ -22,28 +24,29 @@ stdenv.mkDerivation rec {
       --replace "lsof -wnPi"   "${lsof}/bin/lsof"
 
     substituteInPlace ./arm --replace '"$0" = /usr/bin/arm' 'true'
-    substituteInPlace ./arm --replace "python" "${python}/bin/python"
+    substituteInPlace ./arm --replace "python" "${pythonPackages.python}/bin/python"
 
     for i in ./install ./arm ./src/gui/controller.py ./src/cli/wizard.py ./src/resources/torrcOverride/override.h ./src/resources/torrcOverride/override.py ./src/resources/arm.1 ./setup.py; do
       substituteInPlace $i --replace "/usr/share" "$out/share"
     done
+
+    # fixes man page installation
+    substituteInPlace ./setup.py --replace "src/resoureces" "src/resources"
   '';
 
   installPhase = ''
     mkdir -p $out/share/arm $out/bin $out/libexec
-    python setup.py install --prefix=$out
+    python setup.py install --prefix=$out --docPath $out/share/doc/arm
     cp -R src/TorCtl $out/libexec
 
-    for i in $(cd $out/bin && ls); do
-      wrapProgram $out/bin/$i \
-        --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pythonPackages.curses}):$out/libexec:$PYTHONPATH" \
-        --set TERMINFO "${ncurses.out}/share/terminfo" \
-        --set TERM     "xterm"
-    done
+    wrapProgram $out/bin/arm \
+      --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pythonPackages.curses}):$out/libexec:$PYTHONPATH" \
+      --set TERMINFO "${ncurses.out}/share/terminfo" \
+      --set TERM "xterm"
   '';
 
   meta = {
-    description = "Anonymizing relay monitor for Tor";
+    description = "A terminal status monitor for Tor relays";
     homepage    = "https://www.atagar.com/arm/";
     license     = stdenv.lib.licenses.gpl3;
     platforms   = stdenv.lib.platforms.unix;

From e9c16b7902097c8dbc9874f95b8dd80aaeea1495 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 30 Apr 2016 20:48:12 +0000
Subject: [PATCH 484/712] php: 5.6.20 -> 5.6.21

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

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index a618fd85d71..a108462512e 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -299,8 +299,8 @@ in {
   };
 
   php56 = generic {
-    version = "5.6.20";
-    sha256 = "07xz48dz1ijwq45vh90jfzdd56k0s5ppi3j5rwc9p9y7mrybziss";
+    version = "5.6.21";
+    sha256 = "144m8xzpqv3pimxh2pjhbk4fy1kch9afkzclcinzv2dnfjspmvdl";
   };
 
   php70 = generic {

From dea920bfdcea9c80b1e34d1a134f65a5157269f8 Mon Sep 17 00:00:00 2001
From: Maxim Ivanov <ivanov.maxim@gmail.com>
Date: Sat, 30 Apr 2016 22:05:28 +0100
Subject: [PATCH 485/712] Remove obsolete scatter output hook

There are no users of it in main tree and recent merge
of multiple outputs branch makes it obsolete for private trees
too.

At the time hook was created, recently merged multiple output
branch was relying on passing flags to autotools to split
outputs, which obviously wasn't working for other build systems

Scatter output was taking different approach where files were
moved out from a build tree based on known  paths, which is more
or less what current multiple-outputs.sh hook is able to do too.
---
 .../setup-hooks/scatter_output.sh             | 56 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 58 deletions(-)
 delete mode 100644 pkgs/build-support/setup-hooks/scatter_output.sh

diff --git a/pkgs/build-support/setup-hooks/scatter_output.sh b/pkgs/build-support/setup-hooks/scatter_output.sh
deleted file mode 100644
index f2a501c55e4..00000000000
--- a/pkgs/build-support/setup-hooks/scatter_output.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-preFixupPhases+=" scatter_files"
-preDistPhases+=" propagate_bin_input"
-
-SCATTER_BIN_DEFAULT=${SCATTER_BIN_DEFAULT:-"/lib/*.so* /bin/*"}
-SCATTER_DOC_DEFAULT=${SCATTER_DOC_DEFAULT:-"/share/man/* /share/doc/*"}
-
-
-scatter_files() {
-    save_nullglob=$(shopt -p nullglob)
-    for o in $outputs; do
-	[[ "$o" == "out" ]] && continue
-	v=files_${o}
-	
-	#if files_'output' isn't set in derivative, use defualts for some
-	[[ ${!v} ]] || {
-            case $o in
-		bin)
-		    v=SCATTER_BIN_DEFAULT
-		    ;;
-		doc)
-		    v=SCATTER_DOC_DEFAULT
-		    ;;
-		*)
-		    continue
-		    ;;
-	    esac
-        }
-
-	# prepend each path with $out
-	paths=$out${!v// \// $out/}
-        shopt -s nullglob
-	for f in $paths; do
-	    shopt -u nullglob
-	    dist=${!o}${f#$out}
-	    mkdir -p $(dirname $dist)
-	    cp -pr $f $dist
-	    # remove source, not forgetting to clean empty dirs
-	    rm -r $f
-	    rmdir --ignore-fail-on-non-empty $(dirname $f)
-	done
-	find ${!o} -type f -exec $SHELL -c 'patchelf --set-rpath $(patchelf --print-rpath {} 2>/dev/null):'${!o}'/lib {} 2>/dev/null && patchelf --shrink-rpath {}' \;
-    done
-    eval $save_nullglob
-}
-
-propagate_bin_input() {
-    if [[ -n ${bin:-} ]]; then
-	mkdir -p $out/nix-support
-	echo $bin >> $out/nix-support/propagated-native-build-inputs 
-    fi
-
-    if [[ -n ${bin:-} && -n ${doc:-} ]]; then
-	mkdir -p $bin/nix-support
-	echo $doc >> $bin/nix-support/propagated-user-env-packages
-    fi
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d26cf8d62f..932d8d895d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -156,8 +156,6 @@ in
 
   dispad = callPackage ../tools/X11/dispad { };
 
-  scatterOutputHook = makeSetupHook {} ../build-support/setup-hooks/scatter_output.sh;
-
   vsenv = callPackage ../build-support/vsenv {
     vs = vs90wrapper;
   };

From 87ebab128a466b6b3ac60711621ba6264cb7075a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 23:56:43 +0300
Subject: [PATCH 486/712] replace ${stdenv.cc.cc}/lib occurences

---
 pkgs/applications/audio/renoise/default.nix   |  2 +-
 pkgs/applications/editors/sublime/default.nix |  2 +-
 .../applications/editors/sublime3/default.nix |  4 ++--
 .../google-talk-plugin/default.nix            |  6 +++---
 .../instant-messengers/hipchat/default.nix    |  2 +-
 .../instant-messengers/slack/default.nix      |  2 +-
 .../science/electronics/eagle/default.nix     |  2 +-
 .../science/logic/saw-tools/default.nix       |  2 +-
 .../science/logic/verifast/default.nix        |  2 +-
 .../compilers/cudatoolkit/default.nix         |  2 +-
 pkgs/development/compilers/fpc/lazarus.nix    |  2 +-
 pkgs/development/compilers/ponyc/default.nix  |  2 +-
 .../guile-modules/guile-lib/default.nix       |  2 +-
 pkgs/development/libraries/fmod/4.24.16.nix   |  2 +-
 pkgs/development/libraries/fmod/default.nix   |  2 +-
 pkgs/development/libraries/v8/4.5.nix         |  4 ++--
 pkgs/development/libraries/v8/generic.nix     |  4 ++--
 pkgs/development/misc/amdapp-sdk/default.nix  |  2 +-
 .../mobile/androidenv/androidsdk.nix          |  2 +-
 .../tools/build-managers/cargo/snapshot.nix   |  2 +-
 .../tools/misc/saleae-logic/default.nix       |  2 +-
 pkgs/games/andyetitmoves/default.nix          |  2 +-
 pkgs/games/oilrush/default.nix                | 20 +++++++++----------
 pkgs/games/spring/default.nix                 |  2 +-
 pkgs/games/tibia/default.nix                  |  2 +-
 pkgs/servers/meteor/default.nix               |  8 ++++----
 .../tools/filesystems/yandex-disk/default.nix |  4 ++--
 pkgs/tools/misc/megacli/default.nix           |  2 +-
 pkgs/tools/misc/staruml/default.nix           |  2 +-
 pkgs/tools/networking/atftp/default.nix       |  2 +-
 30 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix
index 39c0d579e81..7b4c1143fb4 100644
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/pkgs/applications/audio/renoise/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
       ln -s $path/lib/*.so* $out/lib/
     done
 
-    ln -s ${stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/
+    ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/
 
     mkdir $out/bin
     ln -s $out/renoise $out/bin/renoise
diff --git a/pkgs/applications/editors/sublime/default.nix b/pkgs/applications/editors/sublime/default.nix
index c7b0f9864c9..a002d14c98c 100644
--- a/pkgs/applications/editors/sublime/default.nix
+++ b/pkgs/applications/editors/sublime/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     echo ${libPath}
     patchelf \
       --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath ${libPath}:${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
+      --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
       $out/sublime/sublime_text
   '';
 
diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix
index 507dc611fd4..153c6920b47 100644
--- a/pkgs/applications/editors/sublime3/default.nix
+++ b/pkgs/applications/editors/sublime3/default.nix
@@ -37,7 +37,7 @@ in let
       for i in sublime_text plugin_host crash_reporter; do
         patchelf \
           --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath ${libPath}:${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
+          --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
           $i
       done
 
@@ -57,7 +57,7 @@ in let
         --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects}
 
       # Without this, plugin_host crashes, even though it has the rpath
-      wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so
+      wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so
     '';
   };
 in stdenv.mkDerivation {
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index f35e88ae89e..aed05f42503 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -76,11 +76,11 @@ stdenv.mkDerivation rec {
       cp opt/google/talkplugin/*.so $plugins
 
       for i in libnpgoogletalk.so libppgoogletalk.so libppo1d.so; do
-        patchelf --set-rpath "${makeLibraryPath [ stdenv.cc.cc xorg.libX11 ]}:${stdenv.cc.cc}/lib64" $plugins/$i
+        patchelf --set-rpath "${makeLibraryPath [ stdenv.cc.cc xorg.libX11 ]}:${stdenv.cc.cc.lib}/lib64" $plugins/$i
       done
 
       for i in libgoogletalkremoting.so libnpo1d.so; do
-        patchelf --set-rpath "$out/libexec/google/talkplugin/lib:${rpathPlugin}:${stdenv.cc.cc}/lib64" $plugins/$i
+        patchelf --set-rpath "$out/libexec/google/talkplugin/lib:${rpathPlugin}:${stdenv.cc.cc.lib}/lib64" $plugins/$i
       done
 
       mkdir -p $out/libexec/google/talkplugin
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
 
       patchelf \
         --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath "${rpathProgram}:${stdenv.cc.cc}/lib64" \
+        --set-rpath "${rpathProgram}:${stdenv.cc.cc.lib}/lib64" \
         $out/libexec/google/talkplugin/GoogleTalkPlugin
 
       # Generate an LD_PRELOAD wrapper to redirect execvp() calls to
diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index b57b3394eea..e35674052c0 100644
--- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -36,7 +36,7 @@ let
     xcbutilkeysyms
     systemd
     mesa_noglu
-  ] + ":${stdenv.cc.cc}/lib64";
+  ] + ":${stdenv.cc.cc.lib}/lib64";
 
   src =
     if stdenv.system == "x86_64-linux" then
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index d0f0dd3149c..1f2b5ebe7fa 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -36,7 +36,7 @@ let
     xorg.libXrandr
     xorg.libXrender
     xorg.libXtst
-  ] + ":${stdenv.cc.cc}/lib64";
+  ] + ":${stdenv.cc.cc.lib}/lib64";
 
   src =
     if stdenv.system == "x86_64-linux" then
diff --git a/pkgs/applications/science/electronics/eagle/default.nix b/pkgs/applications/science/electronics/eagle/default.nix
index 71bc58af7c0..edc5845e988 100644
--- a/pkgs/applications/science/electronics/eagle/default.nix
+++ b/pkgs/applications/science/electronics/eagle/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     mkdir -p "$out"/bin
     cat > "$out"/bin/eagle << EOF
     #!${stdenv.shell}
-    export LD_LIBRARY_PATH="${stdenv.cc.cc}/lib:${libPath}"
+    export LD_LIBRARY_PATH="${stdenv.cc.cc.lib}/lib:${libPath}"
     export LD_PRELOAD="$out/lib/eagle_fixer.so"
     export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"
     exec "$dynlinker" "$out/eagle-${version}/bin/eagle" "\$@"
diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix
index 1153c0b3cf5..949b34420b7 100644
--- a/pkgs/applications/science/logic/saw-tools/default.nix
+++ b/pkgs/applications/science/logic/saw-tools/default.nix
@@ -7,7 +7,7 @@ let
       gmp4
       ncurses
       zlib
-    ] + ":${stdenv.cc.cc}/lib64";
+    ] + ":${stdenv.cc.cc.lib}/lib64";
 
   url = "https://github.com/GaloisInc/saw-script/releases/download";
 
diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix
index c0619ab5f49..d7c593b736e 100644
--- a/pkgs/applications/science/logic/verifast/default.nix
+++ b/pkgs/applications/science/logic/verifast/default.nix
@@ -7,7 +7,7 @@ let
   libPath = stdenv.lib.makeLibraryPath
     [ stdenv.cc.libc stdenv.cc.cc gtk gdk_pixbuf atk pango glib cairo
       freetype fontconfig libxml2 gnome2.gtksourceview
-    ] + ":${stdenv.cc.cc}/lib64";
+    ] + ":${stdenv.cc.cc.lib}/lib64";
 
   patchExe = x: ''
     patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index f13826ddb8c..c13118977a1 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -32,7 +32,7 @@ let
         gtk2 glib fontconfig freetype unixODBC alsaLib
       ];
 
-      rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc}/lib64";
+      rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64";
 
       unpackPhase = ''
         sh $src --keep --noexec
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index 0db5f03a1ab..1f2be91b13a 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   ];
   preBuild = ''
     export makeFlags="$makeFlags LAZARUS_INSTALL_DIR=$out/share/lazarus/ INSTALL_PREFIX=$out/"
-    export NIX_LDFLAGS="$NIX_LDFLAGS -L${stdenv.cc.cc}/lib -lXi -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lc -lXext -lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0 -lcairo -lgcc_s"
+    export NIX_LDFLAGS="$NIX_LDFLAGS -L${stdenv.cc.cc.lib}/lib -lXi -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lc -lXext -lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0 -lcairo -lgcc_s"
     export LCL_PLATFORM=gtk2
     mkdir -p $out/share "$out/lazarus"
     tar xf ${fpc.src} --strip-components=1 -C $out/share -m
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 07614609519..ef355e64e1e 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   patchPhase = ''
     sed 's|/usr/lib/x86_64-linux-gnu/|${glibc.out}/lib/|g' -i src/libponyc/codegen/genexe.c
-    sed 's|/lib/x86_64-linux-gnu/|${stdenv.cc.cc}/lib/|g' -i src/libponyc/codegen/genexe.c
+    sed 's|/lib/x86_64-linux-gnu/|${stdenv.cc.cc.lib}/lib/|g' -i src/libponyc/codegen/genexe.c
   '';
 
   preBuild = ''
diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix
index 7cce27c387e..de456b4983a 100644
--- a/pkgs/development/guile-modules/guile-lib/default.nix
+++ b/pkgs/development/guile-modules/guile-lib/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   preCheck =
     # Make `libgcc_s.so' visible for `pthread_cancel'.
-    '' export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.cc.cc}/lib*/libgcc_s.so)):$LD_LIBRARY_PATH"
+    '' export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.cc.cc.lib}/lib*/libgcc_s.so)):$LD_LIBRARY_PATH"
     '';
 
   meta = {
diff --git a/pkgs/development/libraries/fmod/4.24.16.nix b/pkgs/development/libraries/fmod/4.24.16.nix
index b78b1a46e25..191db2f6f6d 100644
--- a/pkgs/development/libraries/fmod/4.24.16.nix
+++ b/pkgs/development/libraries/fmod/4.24.16.nix
@@ -5,7 +5,7 @@ let
   bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64";
 
   libPath = stdenv.lib.makeLibraryPath
-    [ stdenv.cc.libc stdenv.cc.cc ] + ":${stdenv.cc.cc}/lib64";
+    [ stdenv.cc.libc stdenv.cc.cc ] + ":${stdenv.cc.cc.lib}/lib64";
   patchLib = x: "patchelf --set-rpath ${libPath} ${x}";
 
   src =
diff --git a/pkgs/development/libraries/fmod/default.nix b/pkgs/development/libraries/fmod/default.nix
index f014c4cecb6..621d6dc405f 100644
--- a/pkgs/development/libraries/fmod/default.nix
+++ b/pkgs/development/libraries/fmod/default.nix
@@ -5,7 +5,7 @@ let
   bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64";
 
   libPath = stdenv.lib.makeLibraryPath
-    [ stdenv.cc.libc stdenv.cc.cc ] + ":${stdenv.cc.cc}/lib64";
+    [ stdenv.cc.libc stdenv.cc.cc ] + ":${stdenv.cc.cc.lib}/lib64";
   patchLib = x: "patchelf --set-rpath ${libPath} ${x}";
 in
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/v8/4.5.nix b/pkgs/development/libraries/v8/4.5.nix
index 50fc2b7b0d9..065b656147d 100644
--- a/pkgs/development/libraries/v8/4.5.nix
+++ b/pkgs/development/libraries/v8/4.5.nix
@@ -122,8 +122,8 @@ stdenv.mkDerivation rec {
     install -vD out/Release/mksnapshot "$out/bin/mksnapshot"
     ${if stdenv.isDarwin then ''
     install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib"
-    install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/bin/d8
-    install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
+    install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8
+    install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
     '' else ''
     install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so"
     ''}
diff --git a/pkgs/development/libraries/v8/generic.nix b/pkgs/development/libraries/v8/generic.nix
index 349b35549b6..d603fda3225 100644
--- a/pkgs/development/libraries/v8/generic.nix
+++ b/pkgs/development/libraries/v8/generic.nix
@@ -67,8 +67,8 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = if stdenv.isDarwin then ''
-    install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/bin/d8
-    install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
+    install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8
+    install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
   '' else null;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix
index 81b40bc78ac..acd71d65c0e 100644
--- a/pkgs/development/misc/amdapp-sdk/default.nix
+++ b/pkgs/development/misc/amdapp-sdk/default.nix
@@ -87,7 +87,7 @@ in stdenv.mkDerivation rec {
 
     # Create wrappers
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/clinfo
-    patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib $out/bin/clinfo
+    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib $out/bin/clinfo
 
     # Fix modes
     find "$out/" -type f -exec chmod 644 {} \;
diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index aa009cb301a..08b15181be4 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
         for i in emulator64-arm emulator64-mips emulator64-x86
         do
             patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i
-            patchelf --set-rpath ${stdenv.cc.cc}/lib64 $i
+            patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64 $i
         done
       ''}
       
diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix
index c01ba2b5386..62539c2c732 100644
--- a/pkgs/development/tools/build-managers/cargo/snapshot.nix
+++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
     ./install.sh "--prefix=$out"
   '' + (if stdenv.isLinux then ''
     patchelf --interpreter "${stdenv.glibc.out}/lib/${stdenv.cc.dynamicLinker}" \
-             --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib.out}/lib" \
+             --set-rpath "${stdenv.cc.cc.lib}/lib/:${stdenv.cc.cc.lib}/lib64/:${zlib.out}/lib" \
              "$out/bin/cargo"
   '' else "") + postInstall;
 }
diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix
index 8e8909ee7d0..53020671d17 100644
--- a/pkgs/development/tools/misc/saleae-logic/default.nix
+++ b/pkgs/development/tools/misc/saleae-logic/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
 
     # Patch it
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/Logic"
-    patchelf --set-rpath "${stdenv.cc.cc}/lib:${stdenv.cc.cc}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$out/Logic"
+    patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$out/Logic"
 
     # Build the LD_PRELOAD library that makes Logic work from a read-only directory
     mkdir -p "$out/lib"
diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix
index 897e4202b80..092f0773708 100644
--- a/pkgs/games/andyetitmoves/default.nix
+++ b/pkgs/games/andyetitmoves/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/{opt/andyetitmoves,bin}
     cp -r * $out/opt/andyetitmoves/
 
-    fullPath=${stdenv.cc.cc}/lib64
+    fullPath=${stdenv.cc.cc.lib}/lib64
     for i in $nativeBuildInputs; do
       fullPath=$fullPath''${fullPath:+:}$i/lib
     done
diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix
index ec9c928b798..7a23c4dc966 100644
--- a/pkgs/games/oilrush/default.nix
+++ b/pkgs/games/oilrush/default.nix
@@ -27,25 +27,25 @@ stdenv.mkDerivation {
     do
       patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f
     done
-    patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\
+    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\
              launcher_$arch
-    patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\
+    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\
              libNetwork_$arch.so
-    patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\
+    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\
              libQtCoreUnigine_$arch.so.4
-    patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\
+    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\
              libQtGuiUnigine_$arch.so.4
-    patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\
+    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\
              libQtNetworkUnigine_$arch.so.4
-    patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\
+    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\
              libQtWebKitUnigine_$arch.so.4
-    patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\
+    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\
              libQtXmlUnigine_$arch.so.4
-    patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\
+    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\
              libRakNet_$arch.so
-    patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\
+    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\
              libUnigine_$arch.so
-    patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\
+    patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\
              OilRush_$arch
   '';
   installPhase = ''
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index fe764c90b4b..525adbc0a12 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram "$out/bin/spring" \
-      --prefix LD_LIBRARY_PATH : "${stdenv.cc.cc}/lib::${systemd}/lib"
+      --prefix LD_LIBRARY_PATH : "${stdenv.cc.cc.lib}/lib::${systemd}/lib"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index 1af750f462a..26b1f9c9da2 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     cp -r * $out/res
 
     patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \
-             --set-rpath ${stdenv.cc.cc}/lib:${libX11}/lib:${mesa}/lib \
+             --set-rpath ${stdenv.cc.cc.lib}/lib:${libX11}/lib:${mesa}/lib \
              "$out/res/Tibia"
 
     # We've patchelf'd the files. The main ‘Tibia’ binary is a bit
diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix
index 7412378f3de..370a430ec1a 100644
--- a/pkgs/servers/meteor/default.nix
+++ b/pkgs/servers/meteor/default.nix
@@ -40,28 +40,28 @@ stdenv.mkDerivation rec {
     popd
     substituteInPlace $out/tools/cli/main.js \
       --replace "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --replace "@RPATH@" "${stdenv.cc.cc}/lib:${zlib.out}/lib" \
+      --replace "@RPATH@" "${stdenv.cc.cc.lib}/lib:${zlib.out}/lib" \
       --replace "@PATCHELF@" "${patchelf}/bin/patchelf"
 
     # Patch node.
     node=$devBundle/bin/node
     patchelf \
       --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-      --set-rpath "$(patchelf --print-rpath $node):${stdenv.cc.cc}/lib" \
+      --set-rpath "$(patchelf --print-rpath $node):${stdenv.cc.cc.lib}/lib" \
       $node
 
     # Patch mongo.
     for p in $devBundle/mongodb/bin/mongo{,d}; do
       patchelf \
         --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-        --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc}/lib:${zlib.out}/lib" \
+        --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc.lib}/lib:${zlib.out}/lib" \
         $p
     done
 
     # Patch node dlls.
     for p in $(find $out/packages -name '*.node'); do
       patchelf \
-        --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc}/lib" \
+        --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc.lib}/lib" \
         $p
     done
 
diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix
index 966b3df8b17..1658a428920 100644
--- a/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -5,12 +5,12 @@ assert stdenv.isLinux;
 let
   p = if stdenv.is64bit then {
       arch = "x86_64";
-      gcclib = "${stdenv.cc.cc}/lib64";
+      gcclib = "${stdenv.cc.cc.lib}/lib64";
       sha256 = "0k05ybvnv0zx4vfx55jyhia38qqysaj68mapq0gwgf74k3a943g2";
     }
     else {
       arch = "i386";
-      gcclib = "${stdenv.cc.cc}/lib";
+      gcclib = "${stdenv.cc.cc.lib}/lib";
       sha256 = "09z9idmp7idcq0alwkla9kal9h82dx11jqh678lc4rviqggxzxhp";
     };
 in 
diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix
index 1f57b290cdd..cbebd557d77 100644
--- a/pkgs/tools/misc/megacli/default.nix
+++ b/pkgs/tools/misc/megacli/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     cd $out
     unzip ${src}
     rpmextract linux/MegaCli-8.07.07-1.noarch.rpm
-    ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/opt/lsi/3rdpartylibs/x86_64:$out/opt/lsi/3rdpartylibs:${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib opt/MegaRAID/MegaCli/MegaCli64
+    ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/opt/lsi/3rdpartylibs/x86_64:$out/opt/lsi/3rdpartylibs:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib opt/MegaRAID/MegaCli/MegaCli64
     wrapProgram $out/opt/MegaRAID/MegaCli/MegaCli64 --set LD_LIBRARY_PATH $out/opt/lsi/3rdpartylibs/x86_64
     ln -s $out/opt/MegaRAID/MegaCli/MegaCli64 $out/bin/MegaCli64
     eval fixupPhase
diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix
index 0d2982c022f..90771b0527c 100644
--- a/pkgs/tools/misc/staruml/default.nix
+++ b/pkgs/tools/misc/staruml/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
     mkdir -p $out/lib
 
-    ln -s ${stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/
+    ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/
     ln -s ${libudev.out}/lib/libudev.so.1 $out/lib/libudev.so.0
 
     wrapProgram $out/bin/StarUML \
diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix
index 5fff72a3b07..bd4fb7e9e6a 100644
--- a/pkgs/tools/networking/atftp/default.nix
+++ b/pkgs/tools/networking/atftp/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   buildInputs = [ readline tcp_wrappers pcre makeWrapper gcc ];
   patches = [ debianPatch ];
   postInstall = ''
-    wrapProgram $out/sbin/atftpd --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc}/lib${if stdenv.system == "x86_64-linux" then "64" else ""}
+    wrapProgram $out/sbin/atftpd --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc.lib}/lib${if stdenv.system == "x86_64-linux" then "64" else ""}
   '';
   meta = {
     description = "Advanced tftp tools";

From 11a716491b93658552750645f627a3b833757b99 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 30 Apr 2016 22:32:34 +0000
Subject: [PATCH 487/712] php: 5.5.34 -> 5.4.35

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

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index a108462512e..c9fbf5c5de6 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -294,8 +294,8 @@ let
 in {
 
   php55 = generic {
-    version = "5.5.34";
-    sha256 = "0745wn0qg9rqibwr948bzc719s7pywizvl1ahkg1j9m92r28i25g";
+    version = "5.5.35";
+    sha256 = "1msqh8ii0qwzzcwlwn8f493x2r3hy2djzrrwd5jgs87893b8sr1d";
   };
 
   php56 = generic {

From 784a5ed2ef4847d8b9a283c9a39bd2273bd709a8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 1 May 2016 01:50:29 +0300
Subject: [PATCH 488/712] wine: fix pulseaudio in staging

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

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 804eb0bb304..60fb8e11391 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   NIX_LDFLAGS = map (path: "-rpath " + path) (
       map (x: "${x}/lib") ([ stdenv.cc.cc ] ++ (map (x: x.lib or x.out) buildInputs))
       # libpulsecommon.so is linked but not found otherwise
-      ++ lib.optionals pulseaudioSupport (map (x: "${x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ])))
+      ++ lib.optionals pulseaudioSupport (map (x: "${x.lib or x.out}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ])))
     );
 
   # Don't shrink the ELF RPATHs in order to keep the extra RPATH

From 8d5962a69064798883e1654ad585d21d3f06dd99 Mon Sep 17 00:00:00 2001
From: Phil Scott <mail@mtop.com>
Date: Sat, 30 Apr 2016 12:50:50 +0100
Subject: [PATCH 489/712] angband: init at version 4.0.5

---
 pkgs/games/angband/default.nix  | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/games/angband/default.nix

diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix
new file mode 100644
index 00000000000..5a026099076
--- /dev/null
+++ b/pkgs/games/angband/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchFromGitHub, autoconf, automake, ncurses }:
+
+stdenv.mkDerivation rec {
+  version = "4.0.5";
+  name = "angband-${version}";
+  src = fetchFromGitHub {
+    owner = "angband";
+    repo = "angband";
+    rev = version;
+    sha256 = "1l7ybqmsxpsijm7iqiqjpa7lhjafxml743q4crxn8wnwrbjzbi86";
+      };
+  buildInputs = [ autoconf automake ncurses ];
+  configurePhase = ''
+    ./autogen.sh
+    ./configure --prefix=$out --bindir=$out/bin --disable-x11
+  '';
+  meta = {
+    homepage = "http://rephial.org/";
+    description = "Angband (classic rogue-like game)";
+    maintainers = [ stdenv.lib.maintainers.chattered  ];
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d26cf8d62f..adddcaf80af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14728,6 +14728,8 @@ in
 
   andyetitmoves = if stdenv.isLinux then callPackage ../games/andyetitmoves {} else null;
 
+  angband = callPackage ../games/angband { };
+
   anki = callPackage ../games/anki {
     inherit (pythonPackages) wrapPython pysqlite sqlalchemy pyaudio beautifulsoup httplib2 matplotlib;
   };

From fb93bfc0bc14ca540072c39b91268c9555133cbb Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 1 May 2016 01:18:15 +0200
Subject: [PATCH 490/712] angband: cleanups

---
 pkgs/games/angband/default.nix | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix
index 5a026099076..c0445811f39 100644
--- a/pkgs/games/angband/default.nix
+++ b/pkgs/games/angband/default.nix
@@ -1,23 +1,24 @@
-{stdenv, fetchFromGitHub, autoconf, automake, ncurses }:
+{ stdenv, fetchFromGitHub, autoreconfHook, ncurses }:
 
 stdenv.mkDerivation rec {
   version = "4.0.5";
   name = "angband-${version}";
+
   src = fetchFromGitHub {
     owner = "angband";
     repo = "angband";
     rev = version;
     sha256 = "1l7ybqmsxpsijm7iqiqjpa7lhjafxml743q4crxn8wnwrbjzbi86";
-      };
-  buildInputs = [ autoconf automake ncurses ];
-  configurePhase = ''
-    ./autogen.sh
-    ./configure --prefix=$out --bindir=$out/bin --disable-x11
-  '';
-  meta = {
-    homepage = "http://rephial.org/";
-    description = "Angband (classic rogue-like game)";
-    maintainers = [ stdenv.lib.maintainers.chattered  ];
-    license = stdenv.lib.licenses.gpl2;
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ ncurses ];
+  installFlags = "bindir=$(out)/bin";
+
+  meta = with stdenv.lib; {
+    homepage = http://rephial.org/;
+    description = "A single-player roguelike dungeon exploration game";
+    maintainers = [ maintainers.chattered  ];
+    license = licenses.gpl2;
   };
 }

From 950a698488518447f3b085df153408ed5605574c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 30 Apr 2016 14:46:45 +0200
Subject: [PATCH 491/712] 0ad game & data: 0.0.19 -> 0.0.20

---
 pkgs/games/0ad/data.nix    | 2 +-
 pkgs/games/0ad/default.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix
index f2f5a9e9b21..aea36d211aa 100644
--- a/pkgs/games/0ad/data.nix
+++ b/pkgs/games/0ad/data.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-data.tar.xz";
-    sha256 = "0f406ynz2fbg3hwavh52xh4f7kqm4mzhz59kkvb6dpsax5agalwk";
+    sha256 = "1lzl8chfqbgs1n9vpn0xaqd70kpwiibfk196iblyq6qkms3v6pnv";
   };
 
   patchPhase = ''
diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix
index e854af58865..485feb53a89 100644
--- a/pkgs/games/0ad/default.nix
+++ b/pkgs/games/0ad/default.nix
@@ -9,7 +9,7 @@
 assert withEditor -> wxGTK != null;
 
 let
-  version = "0.0.19";
+  version = "0.0.20";
 
   releaseType = "alpha";
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-build.tar.xz";
-    sha256 = "1cwvhg30i6axm7y5b62qyjwf1j8gwa5fgc13xsga3gzdphmjchrd";
+    sha256 = "13n61xhjsawda3kl7112la41bqkbqmq4yhr3slydsz856z5xb5m3";
   };
 
   buildInputs = [

From 2b48d3dae6a73ca5a92ab3955344e020dbf0d372 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 30 Apr 2016 20:45:47 +0200
Subject: [PATCH 492/712] workrave: minor edits for consistency

Mainly dropping the partial use of xorg.<lib> and separating
nativeBuildInputs.
---
 pkgs/applications/misc/workrave/default.nix | 24 +++++++++------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix
index f8ec86dd2b3..d082cc30bd7 100644
--- a/pkgs/applications/misc/workrave/default.nix
+++ b/pkgs/applications/misc/workrave/default.nix
@@ -1,13 +1,8 @@
-{ stdenv, fetchurl, autoconf, automake, gettext, intltool, libtool, pkgconfig,
-  libXtst, cheetah, libXScrnSaver, xorg,
-  glib, glibmm,
-  gtk, gtkmm,
-  atk,
-  pango, pangomm,
-  cairo, cairomm,
-  dbus, dbus_glib,
-  GConf, gconfmm,
-  gdome2, gstreamer, libsigcxx }:
+{ stdenv, fetchurl
+, autoconf, automake, gettext, intltool, libtool, pkgconfig
+, libICE, libSM, libXScrnSaver, libXtst, cheetah
+, glib, glibmm, gtk, gtkmm, atk, pango, pangomm, cairo, cairomm
+, dbus, dbus_glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }:
 
 stdenv.mkDerivation rec {
   version = "1.10.6";
@@ -22,12 +17,13 @@ stdenv.mkDerivation rec {
     sha256 = "0q2p83n33chbqzdcdm7ykfsy73frfi6drxzm4qidxwzpzsxrysgq";
   };
 
+  nativeBuildInputs = [
+    autoconf automake gettext intltool libtool pkgconfig
+  ];
   buildInputs = [
-    autoconf automake gettext intltool libtool pkgconfig libXtst cheetah
-    libXScrnSaver
-
+    libICE libSM libXScrnSaver libXtst cheetah
     glib glibmm gtk gtkmm atk pango pangomm cairo cairomm
-    dbus dbus_glib GConf gconfmm gdome2 gstreamer libsigcxx xorg.libICE xorg.libSM
+    dbus dbus_glib GConf gconfmm gdome2 gstreamer libsigcxx
   ];
 
   preConfigure = "./autogen.sh";

From 5fcf22f57cd024e2d8e96d5286f5afe91b067398 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 1 May 2016 00:29:48 +0200
Subject: [PATCH 493/712] workrave: 1.10.6 -> 1.10.7; fetchFromGitHub; maintain

---
 pkgs/applications/misc/workrave/default.nix | 30 ++++++++++++++-------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix
index d082cc30bd7..e9e34518932 100644
--- a/pkgs/applications/misc/workrave/default.nix
+++ b/pkgs/applications/misc/workrave/default.nix
@@ -1,22 +1,32 @@
-{ stdenv, fetchurl
+{ stdenv, fetchFromGitHub, fetchpatch
 , autoconf, automake, gettext, intltool, libtool, pkgconfig
 , libICE, libSM, libXScrnSaver, libXtst, cheetah
 , glib, glibmm, gtk, gtkmm, atk, pango, pangomm, cairo, cairomm
 , dbus, dbus_glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }:
 
 stdenv.mkDerivation rec {
-  version = "1.10.6";
   name = "workrave-${version}";
+  version = "1.10.7";
 
   src = let
-    version_ = with stdenv.lib;
-      concatStringsSep "_" (splitString "." version);
-  in fetchurl {
-    name = "${name}.tar.gz";
-    url = "http://github.com/rcaelers/workrave/archive/v${version_}.tar.gz";
-    sha256 = "0q2p83n33chbqzdcdm7ykfsy73frfi6drxzm4qidxwzpzsxrysgq";
+  in fetchFromGitHub {
+    sha256 = "1mxg882rfih7xzadrpj51m9r33f6s3rzwv61nfwi94vzd68qjnxb";
+    rev = with stdenv.lib;
+      "v" + concatStringsSep "_" (splitString "." version);
+    repo = "workrave";
+    owner = "rcaelers";
   };
 
+  patches = [
+    # Building with gtk{,mm}3 works just fine, but let's be conservative for once:
+    (fetchpatch {
+      name = "workrave-fix-compilation-with-gtk2.patch";
+      url = "https://github.com/rcaelers/workrave/commit/"
+        + "271efdcd795b3592bfede8b1af2162af4b1f0f26.patch";
+      sha256 = "1a3d4jj8516m3m24bl6y8alanl1qnyzv5dv1hz5v3hjgk89fj6rk";
+    })
+  ];
+
   nativeBuildInputs = [
     autoconf automake gettext intltool libtool pkgconfig
   ];
@@ -28,6 +38,8 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./autogen.sh";
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "A program to help prevent Repetitive Strain Injury";
     longDescription = ''
@@ -38,7 +50,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.workrave.org/;
     downloadPage = https://github.com/rcaelers/workrave/releases;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ prikhi ];
+    maintainers = with maintainers; [ nckx prikhi ];
     platforms = platforms.linux;
   };
 }

From ac3ce1c26a5b06a51b023eb99faa0dbc05f9327f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 1 May 2016 02:10:24 +0300
Subject: [PATCH 494/712] bumblebee: fix outputs

---
 pkgs/tools/X11/bumblebee/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix
index 803fd0dd850..e58aa7042d0 100644
--- a/pkgs/tools/X11/bumblebee/default.nix
+++ b/pkgs/tools/X11/bumblebee/default.nix
@@ -46,7 +46,7 @@ let
   bbdPath = lib.makeBinPath [ kmod xorgserver ];
   bbdLibs = lib.makeLibraryPath [ libX11 libXext ];
 
-  xmodules = lib.concatStringsSep "," (map (x: "${x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau));
+  xmodules = lib.concatStringsSep "," (map (x: "${x.out or x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau));
 
 in stdenv.mkDerivation rec {
   name = "bumblebee-${version}";

From b3b02fe65691ac133515d80be109d1e26ddd6e12 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 1 May 2016 03:05:16 +0000
Subject: [PATCH 495/712] nixpkgs: chez scheme 9.4

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/chez/default.nix | 48 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/compilers/chez/default.nix

diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix
new file mode 100644
index 00000000000..f9e0627f8aa
--- /dev/null
+++ b/pkgs/development/compilers/chez/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchgit, ncurses, libX11 }:
+
+stdenv.mkDerivation rec {
+  name    = "chez-scheme-${version}";
+  version = "9.4-${dver}";
+  dver    = "20160430";
+
+  src = fetchgit {
+    url    = "https://github.com/cisco/ChezScheme.git";
+    rev    = "63a97939896c2a89fcffdf16c8b783efaeb816b5";
+    sha256 = "1c58xjslgn7xnfy9j5p9b6sn0wzv2mk7zlmhflydzil7iimchjsi";
+    fetchSubmodules = true;
+  };
+
+  enableParallelBuilding = true;
+  buildInputs = [ ncurses libX11 ];
+
+  /* Chez uses a strange default search path, which completely
+  ** ignores the installation prefix for some reason, and instead
+  ** defaults to {/usr,/usr/local,$HOME}/lib for finding the .boot
+  ** file.
+  **
+  ** Also, we patch out a very annoying 'feature' in ./configure, too.
+  */
+  patchPhase = ''
+    substituteInPlace c/scheme.c \
+      --replace "/usr/lib/csv" "$out/lib/csv"
+
+    substituteInPlace ./configure \
+      --replace "git submodule init && git submodule update || exit 1" ""
+  '';
+
+  /* Don't use configureFlags, since that just implicitly appends
+  ** everything onto a --prefix flag, which ./configure gets very angry
+  ** about.
+  */
+  configurePhase = ''
+    ./configure --threads --installprefix=$out --installman=$out/share/man
+  '';
+
+  meta = {
+    description = "A powerful and incredibly fast R6RS Scheme compiler";
+    homepage    = "http://www.scheme.com";
+    license     = stdenv.lib.licenses.asl20;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index adddcaf80af..5b391263b1f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4028,6 +4028,8 @@ in
 
   ccl = callPackage ../development/compilers/ccl { };
 
+  chez = callPackage ../development/compilers/chez { };
+
   clang = llvmPackages.clang;
 
   clang_38 = llvmPackages_38.clang;

From 0cef15181b3a5b7926a23cf2e58aed82dfb7af44 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Sat, 30 Apr 2016 13:46:35 -0700
Subject: [PATCH 496/712] rtags: 9fed420 -> git-2016-04-29

---
 pkgs/development/tools/rtags/default.nix | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index 208445c3ec5..2e2332f20f2 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -1,30 +1,22 @@
-{ stdenv, fetchgit, cmake, llvm, openssl, clang, writeScript, bash }:
+{ stdenv, fetchgit, cmake, llvmPackages, openssl, writeScript, bash, emacs }:
 
-let llvm-config-wrapper = writeScript "llvm-config" ''
-      #! ${bash}/bin/bash
-      if [[ "$1" = "--cxxflags" ]]; then
-        echo $(${llvm}/bin/llvm-config "$@") -isystem ${clang.cc}/include
-      else
-        ${llvm}/bin/llvm-config "$@"
-      fi
-    '';
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "rtags-${version}";
-  rev = "9fed420d20935faf55770765591fc2de02eeee28";
-  version = "${stdenv.lib.strings.substring 0 7 rev}";
+  version = "git-2016-04-29";
+  rev = "233543d343bf86fa31c35ee21242fa2da3a965ab";
 
-  buildInputs = [ cmake llvm openssl clang ];
+  buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ];
 
   preConfigure = ''
-    export LIBCLANG_LLVM_CONFIG_EXECUTABLE=${llvm-config-wrapper}
+    export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags)" \
+           LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib"
   '';
 
   src = fetchgit {
     inherit rev;
     fetchSubmodules = true;
     url = "https://github.com/andersbakken/rtags.git";
-    sha256 = "1sb6wfknhvrgirqp65paz7kihv4zgg8g5f7a7i14i10sysalxbif";
+    sha256 = "1jzmpbkx1z8dnpr0ndclb6c3dxnf90ifr8j1nzz4j8cvzdpc3lzc";
   };
 
   meta = {

From 640ec5f6491ad9b6c37d12db0450745d9c7c59c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 1 May 2016 10:00:31 +0100
Subject: [PATCH 497/712] netboot: fix eval

---
 nixos/release.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index ab4e1aaf7d4..8409191200c 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -111,11 +111,11 @@ in rec {
       ];
     }).config.system.build;
   in
-    pkgs.symlinkJoin "netboot" [
+    pkgs.symlinkJoin {name="netboot"; paths=[
       build.netbootRamdisk
       build.kernel
       build.netbootIpxeScript
-    ];
+    ];};
 
   iso_minimal = forAllSystems (system: makeIso {
     module = ./modules/installer/cd-dvd/installation-cd-minimal.nix;

From 3a52c5fa7d059ff75b3f56a817832e84f2c96e04 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 1 May 2016 12:25:37 +0300
Subject: [PATCH 498/712] firefox: fix library path

Fixes #15126
---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 1904d720dbd..d859d9a74ec 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -88,7 +88,7 @@ stdenv.mkDerivation {
     makeWrapper "${browser}/bin/${browserName}" \
         "$out/bin/${browserName}${nameSuffix}" \
         --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
-        --suffix-each LD_LIBRARY_PATH ':' "$libs" \
+        --suffix LD_LIBRARY_PATH ':' "$libs" \
         --suffix-each GTK_PATH ':' "$gtk_modules" \
         --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \
         --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
@@ -129,7 +129,7 @@ stdenv.mkDerivation {
   # Let each plugin tell us (through its `mozillaPlugin') attribute
   # where to find the plugin in its tree.
   plugins = map (x: x + x.mozillaPlugin) plugins;
-  libs = map (x: x + "/lib") libs ++ map (x: x + "/lib64") libs;
+  libs = lib.makeLibraryPath libs + ":" + lib.makeSearchPathOutputs "lib64" ["lib"] libs;
   gtk_modules = map (x: x + x.gtkModule) gtk_modules;
 
   passthru = { unwrapped = browser; };

From 28bd8ba1fa7f63098c126c671217146c6ab881a6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 1 May 2016 12:37:47 +0300
Subject: [PATCH 499/712] enet: add platforms

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

diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix
index 0d5bd834787..4c3d67b8f31 100644
--- a/pkgs/development/libraries/enet/default.nix
+++ b/pkgs/development/libraries/enet/default.nix
@@ -13,5 +13,6 @@ stdenv.mkDerivation rec {
     description = "Simple and robust network communication layer on top of UDP";
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 37563c2d964ee0666b7525828d152b3f5e0e212e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 1 May 2016 12:37:48 +0300
Subject: [PATCH 500/712] spidermonkey: add meta

---
 pkgs/development/interpreters/spidermonkey/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/interpreters/spidermonkey/default.nix b/pkgs/development/interpreters/spidermonkey/default.nix
index b7744ea53c3..1ef0cf3b539 100644
--- a/pkgs/development/interpreters/spidermonkey/default.nix
+++ b/pkgs/development/interpreters/spidermonkey/default.nix
@@ -24,4 +24,11 @@ stdenv.mkDerivation rec {
   CFLAGS = "-DPIC -fPIC -DJS_C_STRINGS_ARE_UTF8";
 
   makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1";
+
+  meta = with stdenv.lib; {
+    description = "Mozilla's JavaScript engine written in C/C++";
+    homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey";
+    license = licenses.mpl20;
+    platforms = platforms.all;
+  };
 }

From 5508687ec21ad43baac96443728ccce527954ee7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 1 May 2016 14:38:08 +0200
Subject: [PATCH 501/712] Remove now useless proprietary Copy.com client and
 service

<https://techlib.barracuda.com/Copy/FAQ>

SaaS.
---
 .../modules/services/networking/copy-com.nix  | 54 ----------------
 .../networking/copy-com/default.nix           | 62 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 118 deletions(-)
 delete mode 100644 nixos/modules/services/networking/copy-com.nix
 delete mode 100644 pkgs/applications/networking/copy-com/default.nix

diff --git a/nixos/modules/services/networking/copy-com.nix b/nixos/modules/services/networking/copy-com.nix
deleted file mode 100644
index ee0d043d471..00000000000
--- a/nixos/modules/services/networking/copy-com.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = config.services.copy-com;
-
-in
-
-{
-  options = {
-
-    services.copy-com = {
-
-	  enable = mkOption {
-          default = false;
-          description = "
-            Enable the Copy.com client.
-            NOTE: before enabling the client for the first time, it must be
-            configured by first running CopyConsole (command line) or CopyAgent
-            (graphical) as the appropriate user.
-          ";
-      };
-
-      user = mkOption {
-        description = "The user for which the Copy.com client should be run.";
-      };
-
-      debug = mkOption {
-        default = false;
-        description = "Output more (debugging) messages to the console.";
-      };
-	  };
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.postfix ];
-
-    systemd.services."copy-com-${cfg.user}" = {
-      description = "Copy.com client";
-      wants = [ "network-online.target" ];
-      after = [ "network-online.target" "local-fs.target" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        ExecStart = "${pkgs.copy-com}/bin/CopyConsole ${if cfg.debug then "-consoleOutput -debugToConsole=dirwatch,path-watch,csm_path,csm -debug -console" else ""}";
-        User = "${cfg.user}";
-      };
-
-    };
-  };
-
-}
-
diff --git a/pkgs/applications/networking/copy-com/default.nix b/pkgs/applications/networking/copy-com/default.nix
deleted file mode 100644
index 21dc2373977..00000000000
--- a/pkgs/applications/networking/copy-com/default.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ stdenv, fetchurl, patchelf, fontconfig, freetype
-, gcc, glib, libICE, libSM, libX11, libXext, libXrender }:
-
-let
-  arch = if stdenv.system == "x86_64-linux" then "x86_64"
-    else if stdenv.system == "i686-linux" then "x86"
-    else if stdenv.system == "armv6-linux" then "armv6h"
-    else throw "Copy.com client for: ${stdenv.system} not supported!";
-
-  interpreter = if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2"
-    else if stdenv.system == "i686-linux" then "ld-linux.so.2"
-    else if stdenv.system == "armv6-linux" then "ld-linux.so.2"
-    else throw "Copy.com client for: ${stdenv.system} not supported!";
-
-  appdir = "opt/copy";
-  
-  libPackages = [ fontconfig freetype gcc.cc glib libICE libSM libX11 libXext
-    libXrender ];
-  libPaths = stdenv.lib.concatStringsSep ":"
-    (map (path: "${path}/lib") libPackages);
-
-in stdenv.mkDerivation {
-  
-  name = "copy-com-3.2.01.0481";
-
-  src = fetchurl {
-    # Note: copy.com doesn't version this file. Annoying.
-    url = "https://copy.com/install/linux/Copy.tgz";
-    sha256 = "0bpphm71mqpaiygs57kwa23nli0qm64fvgl1qh7fkxyqqabh4g7k";
-  };
-
-  nativeBuildInputs = [ patchelf ];
-
-  phases = "unpackPhase installPhase";
-
-  installPhase = ''
-    mkdir -p $out/opt
-    cp -r ${arch} "$out/${appdir}"
-
-    mkdir -p "$out/bin"
-    for binary in Copy{Agent,Console,Cmd}; do
-      binary="$out/${appdir}/$binary"
-      ln -sv "$binary" "$out/bin"
-      patchelf --set-interpreter ${stdenv.glibc.out}/lib/${interpreter} "$binary"
-    done
-
-    RPATH=${libPaths}:$out/${appdir}
-    echo "Updating rpaths to $RPATH in:"
-    find "$out/${appdir}" -type f -a -perm -0100 \
-      -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://copy.com;
-    description = "Copy.com graphical & command-line clients";
-    # Closed Source unfortunately.
-    license = licenses.unfree;
-    maintainers = with maintainers; [ nathan-gs nckx ];
-    # NOTE: Copy.com itself only works on linux, so this is ok.
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5b391263b1f..0ebaa28cdfe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13899,8 +13899,6 @@ in
   bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { };
   bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { };
 
-  copy-com = callPackage ../applications/networking/copy-com { };
-
   dropbox = qt55.callPackage ../applications/networking/dropbox { };
 
   dropbox-cli = callPackage ../applications/networking/dropbox-cli { };

From 05f2ebe16d6fdbd159d6b25a8d0dfb30135638e1 Mon Sep 17 00:00:00 2001
From: Simon Vandel Sillesen <simon.vandel@gmail.com>
Date: Thu, 28 Apr 2016 18:10:37 +0200
Subject: [PATCH 502/712] qBittorrent: fix qmake not found in qbittorrent build

Thanks to @romildo for finding the configure fix.
---
 .../networking/p2p/qbittorrent/default.nix             | 10 ++++++++--
 pkgs/top-level/all-packages.nix                        |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index d0e938c1b30..ee03bfeedb0 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, which
-, boost, libtorrentRasterbar, qt5
+, boost, libtorrentRasterbar, qmakeHook, qt5
 , debugSupport ? false # Debugging
 , guiSupport ? true, dbus_libs ? null # GUI (disable to run headless)
 , webuiSupport ? true # WebUI
@@ -17,11 +17,17 @@ stdenv.mkDerivation rec {
     sha256 = "1f4impsjck8anl39pwypsck7j6xw0dl18qd0b4xi23r45jvx9l60";
   };
 
-  nativeBuildInputs = [ pkgconfig which ];
+  nativeBuildInputs = [ pkgconfig which qmakeHook ];
 
   buildInputs = [ boost libtorrentRasterbar qt5.qtbase qt5.qttools ]
     ++ optional guiSupport dbus_libs;
 
+  dontUseQmakeConfigure = true;
+
+  preConfigure = ''
+    export QT_QMAKE="$qtOut/bin"
+  '';
+
   configureFlags = [
     "--with-boost-libdir=${boost.lib}/lib"
     "--with-boost=${boost.dev}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1254917f08e..8ef5e4112ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13634,7 +13634,7 @@ in
 
   pythonmagick = callPackage ../applications/graphics/PythonMagick { };
 
-  qbittorrent = callPackage ../applications/networking/p2p/qbittorrent {
+  qbittorrent = qt5.callPackage ../applications/networking/p2p/qbittorrent {
     boost = boost;
     libtorrentRasterbar = libtorrentRasterbar;
   };

From a5a98ce5a31f97e7831de10955b31c86b6ded851 Mon Sep 17 00:00:00 2001
From: Yacine Hmito <yacine.hmito@gmail.com>
Date: Sun, 1 May 2016 15:55:39 +0200
Subject: [PATCH 503/712] Added gpyh to the list of maintainers

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 2bf60c585fc..8550c4fdbb3 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -146,6 +146,7 @@
   giogadi = "Luis G. Torres <lgtorres42@gmail.com>";
   gleber = "Gleb Peregud <gleber.p@gmail.com>";
   globin = "Robin Gloster <mail@glob.in>";
+  gpyh = "Yacine Hmito <yacine.hmito@gmail.com>";
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
   Gonzih = "Max Gonzih <gonzih@gmail.com>";
   gridaphobe = "Eric Seidel <eric@seidel.io>";

From 60a7c607d155f7c4722ca6baefc267a007fe9b64 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 1 May 2016 16:08:59 +0200
Subject: [PATCH 504/712] hol-light: fix build with camlp5-6.16

---
 pkgs/applications/science/logic/hol_light/Makefile.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/hol_light/Makefile.patch b/pkgs/applications/science/logic/hol_light/Makefile.patch
index 2cb05f27a4f..b572001a75d 100644
--- a/pkgs/applications/science/logic/hol_light/Makefile.patch
+++ b/pkgs/applications/science/logic/hol_light/Makefile.patch
@@ -7,7 +7,7 @@ Index: Makefile
               else if test ${CAMLP5_VERSION} = "6.02.2" -o ${CAMLP5_VERSION} = "6.02.3" -o ${CAMLP5_VERSION} = "6.03" -o ${CAMLP5_VERSION} = "6.04" -o ${CAMLP5_VERSION} = "6.05" -o ${CAMLP5_VERSION} = "6.06" ; \
                    then cp pa_j_3.1x_6.02.2.ml pa_j.ml; \
 -                  else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" ; \
-+                  else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" ; \
++                  else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" -o ${CAMLP5_VERSION} = "6.16" ; \
                         then cp pa_j_3.1x_6.11.ml pa_j.ml; \
                         else cp pa_j_3.1x_${CAMLP5_BINARY_VERSION}.xx.ml pa_j.ml; \
                         fi \

From 3a6c85da65977c9f2a20fb40b18aaac8077e53b8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 30 Apr 2016 16:18:19 +0200
Subject: [PATCH 505/712] camlp5: 6.14 -> 6.16

---
 pkgs/development/tools/ocaml/camlp5/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index 83dd74d321e..bb44bbc8d6e 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -7,11 +7,11 @@ in
 
 stdenv.mkDerivation {
 
-  name = "camlp5${if transitional then "_transitional" else ""}-6.14";
+  name = "camlp5${if transitional then "_transitional" else ""}-6.16";
 
   src = fetchurl {
-    url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.14.tgz;
-    sha256 = "1ql04iyvclpyy9805kpddc4ndjb5d0qg4shhi2fc6bixi49fvy89";
+    url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.16.tgz;
+    sha256 = "1caqa2rl7rav7pfwv1l1j0j18yr1qzyyqz0wa9519x91ckznqi7x";
   };
 
   buildInputs = [ ocaml ];

From 3ba689ee2ea33afe71f0cd78070b3da506e5d50f Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Sun, 1 May 2016 14:43:36 +0200
Subject: [PATCH 506/712] nwjs: use correct nwEnv and rpath

This is related to changes in fontconfig, pango, dbus and stdc++.
---
 pkgs/development/tools/node-webkit/nw12.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix
index 4cacc75d777..f0ede1e5237 100644
--- a/pkgs/development/tools/node-webkit/nw12.nix
+++ b/pkgs/development/tools/node-webkit/nw12.nix
@@ -11,10 +11,12 @@ let
     paths = [
       xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf
       freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage
-      xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc
+      xorg.libXext xorg.libXfixes nss nspr gconf expat dbus
       xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap
       libnotify
     ];
+
+    extraOutputsToInstall = [ "lib" "out" ];
   };
 
 in stdenv.mkDerivation rec {
@@ -39,7 +41,7 @@ in stdenv.mkDerivation rec {
 
     ln -s ${libudev.out}/lib/libudev.so $out/share/nwjs/libudev.so.0
 
-    patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nw
+    patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/share/nwjs" $out/share/nwjs/nw
     patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nwjc
 
     mkdir -p $out/bin

From 5dff3c4b68e163ae73a279b24fae77bb0c31ffad Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 1 May 2016 18:08:58 +0000
Subject: [PATCH 507/712] rpm: stop build from trying to create /var/tmp, which
 breaks in sandboxed builds

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

diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 6c2c9a350ad..d9cf24f6e51 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python, lua, pkgconfig }:
+{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python, lua, pkgconfig, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "rpm-4.12.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "18hk47hc755nslvb7xkq4jb095z7va0nlcyxdpxayc4lmb8mq3bp";
   };
 
-  buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua pkgconfig ];
+  buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua pkgconfig autoreconfHook ];
 
   # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements
   propagatedBuildInputs = [ popt nss db bzip2 libarchive ];
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
   postPatch = ''
     # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here
     substituteInPlace configure --replace 'python''${PYTHON_VERSION}' ${python.executable}
+
+    substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' ""
   '';
 
   configureFlags = "--with-external-db --with-lua --enable-python --localstatedir=/var --sharedstatedir=/com";

From 758e8bd1a1ae9a77a33f4168a778158446179e93 Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Fri, 29 Apr 2016 21:45:21 -0400
Subject: [PATCH 508/712] brscan4: init at 0.4.3-3

A sane backend for recent brother scanners.

Depends on the presence of etc files generated by the
nixos module of the same name.

Supports network scanner specification through the
nixos module.
---
 .../hardware/sane_extra_backends/brscan4.nix  | 116 ++++++++++++
 .../sane_extra_backends/brscan4_etc_files.nix |  71 ++++++++
 .../sane/backends/brscan4/default.nix         |  97 ++++++++++
 .../graphics/sane/backends/brscan4/preload.c  | 170 ++++++++++++++++++
 .../backends/brscan4/udev_rules_type1.nix     |  60 +++++++
 pkgs/top-level/all-packages.nix               |   2 +
 6 files changed, 516 insertions(+)
 create mode 100644 nixos/modules/services/hardware/sane_extra_backends/brscan4.nix
 create mode 100644 nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix
 create mode 100644 pkgs/applications/graphics/sane/backends/brscan4/default.nix
 create mode 100644 pkgs/applications/graphics/sane/backends/brscan4/preload.c
 create mode 100644 pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix

diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix
new file mode 100644
index 00000000000..3ec74458cd2
--- /dev/null
+++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix
@@ -0,0 +1,116 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.hardware.sane.brscan4;
+
+  netDeviceList = attrValues cfg.netDevices;
+
+  etcFiles = pkgs.callPackage ./brscan4_etc_files.nix { netDevices = netDeviceList; };
+
+  netDeviceOpts = { name, config, ... }: {
+
+    options = {
+
+      name = mkOption {
+        type = types.str;
+        description = ''
+          The friendly name you give to the network device. If undefined,
+          the name of attribute will be used.
+        '';
+
+        example = literalExample "office1";
+      };
+
+      model = mkOption {
+        type = types.str;
+        description = ''
+          The model of the network device.
+        '';
+
+        example = literalExample "MFC-7860DW";
+      };
+
+      ip = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = ''
+          The ip address of the device. If undefined, you will have to
+          provide a nodename.
+        '';
+
+        example = literalExample "192.168.1.2";
+      };
+
+      nodename = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = ''
+          The node name of the device. If undefined, you will have to
+          provide an ip.
+        '';
+
+        example = literalExample "BRW0080927AFBCE";
+      };
+
+    };
+
+
+    config =
+      { name = mkDefault name;
+      };
+  };
+
+in
+
+{
+  options = {
+
+    hardware.sane.brscan4.enable = 
+      mkEnableOption "Brother's brscan4 scan backend" // {
+      description = ''
+        When enabled, will automatically register the "brscan4" sane
+        backend and bring configuration files to their expected location. 
+      '';
+    };
+
+    hardware.sane.brscan4.netDevices = mkOption {
+      default = {};
+      example =
+        { office1 = { model = "MFC-7860DW"; ip = "192.168.1.2"; };
+          office2 = { model = "MFC-7860DW"; nodename = "BRW0080927AFBCE"; };
+        };
+      type = types.loaOf types.optionSet;
+      description = ''
+        The list of network devices that will be registered against the brscan4
+        sane backend.
+      '';
+      options = [ netDeviceOpts ];
+    };
+  };
+
+  config = mkIf (config.hardware.sane.enable && cfg.enable) {
+
+    hardware.sane.extraBackends = [
+      pkgs.brscan4
+    ];
+
+    environment.etc = singleton {
+      target = "opt/brother/scanner/brscan4";
+      source = "${etcFiles}/etc/opt/brother/scanner/brscan4";
+    };
+
+    assertions = [
+      { assertion = all (x: !(null != x.ip && null != x.nodename)) netDeviceList;
+          
+        message = ''
+          When describing a network device as part of the attribute list
+          `hardware.sane.brscan4.netDevices`, only one of its `ip` or `nodename`
+          attribute should be specified, not both!
+        '';
+      }
+    ];
+
+  };
+}
\ No newline at end of file
diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix
new file mode 100644
index 00000000000..bd114f0d2cc
--- /dev/null
+++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix
@@ -0,0 +1,71 @@
+{ stdenv, lib, brscan4, netDevices ? [] }:
+
+/*
+
+Testing
+-------
+
+No net devices:
+
+~~~
+nix-shell -E 'with import <nixpkgs> { }; brscan4-etc-files'
+~~~
+
+Two net devices:
+
+~~~
+nix-shell -E 'with import <nixpkgs> { }; brscan4-etc-files.override{netDevices=[{name="a"; model="MFC-7860DW"; nodename="BRW0080927AFBCE";} {name="b"; model="MFC-7860DW"; ip="192.168.1.2";}];}'
+~~~
+
+*/
+
+with lib; 
+
+let
+
+  addNetDev = nd: ''
+    brsaneconfig4 -a \
+    name="${nd.name}" \
+    model="${nd.model}" \
+    ${if (hasAttr "nodename" nd && nd.nodename != null) then
+      ''nodename="${nd.nodename}"'' else
+      ''ip="${nd.ip}"''}'';
+  addAllNetDev = xs: concatStringsSep "\n" (map addNetDev xs);
+in
+
+stdenv.mkDerivation rec {
+
+  name = "brscan4-etc-files-0.4.3-3";
+  src = "${brscan4}/opt/brother/scanner/brscan4";
+
+  nativeBuildInputs = [ brscan4 ];
+
+  configurePhase = ":";
+
+  buildPhase = ''
+    TARGET_DIR="$out/etc/opt/brother/scanner/brscan4"
+    mkdir -p "$TARGET_DIR"
+    cp -rp "./models4" "$TARGET_DIR"
+    cp -rp "./Brsane4.ini" "$TARGET_DIR"
+    cp -rp "./brsanenetdevice4.cfg" "$TARGET_DIR"
+
+    export BRSANENETDEVICE4_CFG_FILENAME="$TARGET_DIR/brsanenetdevice4.cfg"
+
+    printf '${addAllNetDev netDevices}\n'
+
+    ${addAllNetDev netDevices}
+  '';
+
+  installPhase = ":";
+
+  dontStrip = true;
+  dontPatchELF = true;
+
+  meta = {
+    description = "Brother brscan4 sane backend driver etc files";
+    homepage = http://www.brother.com;
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.unfree;
+    maintainers = with stdenv.lib.maintainers; [ jraygauthier ];
+  };
+}
diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix
new file mode 100644
index 00000000000..7b22e88bb84
--- /dev/null
+++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix
@@ -0,0 +1,97 @@
+{ stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb }:
+
+/*
+
+
+*/
+
+let
+
+  myPatchElf = file: with stdenv.lib; ''
+    patchelf --set-interpreter \
+      ${stdenv.glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \
+      ${file}
+  '';
+
+  udevRules = callPackage ./udev_rules_type1.nix {};
+
+in
+
+stdenv.mkDerivation rec {
+
+  name = "brscan4-0.4.3-3";
+  src = fetchurl {
+    url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb";
+    sha256 = "1nccyjl0b195pn6ya4q0zijb075q8r31v9z9a0hfzipfyvcj57n2";
+  };
+
+  unpackPhase = ''
+    ar x $src
+    tar xfvz data.tar.gz
+  '';
+
+  nativeBuildInputs = [ makeWrapper patchelf coreutils udevRules ];
+  buildInputs = [ libusb ];
+  buildPhase = ":";
+
+
+  patchPhase = ''
+    ${myPatchElf "opt/brother/scanner/brscan4/brsaneconfig4"}
+
+    RPATH=${libusb}/lib
+    for a in usr/lib64/sane/*.so*; do
+      if ! test -L $a; then
+        patchelf --set-rpath $RPATH $a
+      fi
+    done
+  '';
+
+  installPhase = ''
+
+    PATH_TO_BRSCAN4="opt/brother/scanner/brscan4"
+    mkdir -p $out/$PATH_TO_BRSCAN4
+    cp -rp $PATH_TO_BRSCAN4/* $out/$PATH_TO_BRSCAN4
+    mkdir -p $out/lib/sane
+    cp -rp usr/lib64/sane/* $out/lib/sane
+
+    # Symbolic links were absolute. Fix them so that they point to $out.
+    pushd "$out/lib/sane" > /dev/null
+    for a in *.so*; do
+      if test -L $a; then
+        fixedTargetFileName="$(basename $(readlink $a))"
+        unlink "$a"
+        ln -s -T "$fixedTargetFileName" "$a"
+      fi
+    done
+    popd > /dev/null
+
+    # Generate an LD_PRELOAD wrapper to redirect execvp(), open() and open64()
+    # calls to `/opt/brother/scanner/brscan4`.
+    preload=$out/libexec/brother/scanner/brscan4/libpreload.so
+    mkdir -p $(dirname $preload)
+    gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC
+
+    makeWrapper \
+      "$out/$PATH_TO_BRSCAN4/brsaneconfig4" \
+      "$out/bin/brsaneconfig4" \
+      --set LD_PRELOAD $preload
+
+    mkdir -p $out/etc/sane.d
+    echo "brother4" > $out/etc/sane.d/dll.conf
+
+    mkdir -p $out/etc/udev/rules.d
+    cp -p ${udevRules}/etc/udev/rules.d/*.rules \
+      $out/etc/udev/rules.d
+  '';
+
+  dontStrip = true;
+  dontPatchELF = true;
+
+  meta = {
+    description = "Brother brscan4 sane backend driver";
+    homepage = http://www.brother.com;
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.unfree;
+    maintainers = with stdenv.lib.maintainers; [ jraygauthier ];
+  };
+}
diff --git a/pkgs/applications/graphics/sane/backends/brscan4/preload.c b/pkgs/applications/graphics/sane/backends/brscan4/preload.c
new file mode 100644
index 00000000000..01616277093
--- /dev/null
+++ b/pkgs/applications/graphics/sane/backends/brscan4/preload.c
@@ -0,0 +1,170 @@
+/* Brgen4 search for configuration under `/etc/opt/brother/scanner/brscan4`. This
+   LD_PRELOAD library intercepts execvp(), open and open64 calls to redirect them to
+   the corresponding location in $out. Also support specifying an alternate
+   file name for `brsanenetdevice4.cfg` which otherwise is invariable
+   created at `/etc/opt/brother/scanner/brscan4`*/
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <dlfcn.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <string.h>
+#include <dirent.h>
+
+char origDir [] = "/etc/opt/brother/scanner/brscan4";
+char realDir [] = OUT "/opt/brother/scanner/brscan4";
+
+char devCfgFileNameEnvVar [] = "BRSANENETDEVICE4_CFG_FILENAME";
+char devCfgFileName [] = "/etc/opt/brother/scanner/brscan4//brsanenetdevice4.cfg";
+
+const char * rewrite(const char * path, char * buf)
+{
+    if (strncmp(path, devCfgFileName, sizeof(devCfgFileName)) == 0) {
+
+      const char* newCfgFileName = getenv(devCfgFileNameEnvVar);
+      if (!newCfgFileName) return path;
+
+      if (snprintf(buf, PATH_MAX, "%s", newCfgFileName) >= PATH_MAX)
+          abort();
+      return buf;
+    }
+
+    if (strncmp(path, origDir, sizeof(origDir) - 1) != 0) return path;
+    if (snprintf(buf, PATH_MAX, "%s%s", realDir, path + sizeof(origDir) - 1) >= PATH_MAX)
+        abort();
+    return buf;
+}
+
+const char* findAndReplaceFirstOccurence(const char* inStr, const char* subStr, 
+                                         const char* replaceStr, 
+                                         char* buf, unsigned maxBuf)
+{
+    const char* foundStr = strstr(inStr, subStr);
+    if (!foundStr)
+      return inStr;
+
+    const unsigned inStrLen = strlen(inStr);
+    const unsigned subStrLen = strlen(subStr);
+    const unsigned replaceStrLen = strlen(replaceStr);
+
+    const unsigned precedingStrLen = foundStr - inStr;
+    if (precedingStrLen + 1 > maxBuf)
+      return NULL;
+
+    const unsigned followingStrPos = precedingStrLen + subStrLen;
+    const unsigned followingStrLen = inStrLen - followingStrPos;
+
+    strncpy(buf, inStr, precedingStrLen);
+    unsigned outLength = precedingStrLen;
+
+    if (outLength + replaceStrLen + 1 > maxBuf)
+      return NULL;
+
+    strncpy(buf + outLength, replaceStr, replaceStrLen);
+    outLength += replaceStrLen;
+    
+    if (outLength + followingStrLen + 1 > maxBuf)
+      return NULL;
+
+    strncpy(buf + outLength, inStr + followingStrPos, followingStrLen);
+    outLength += followingStrLen;
+    
+    buf[outLength] = '\0';
+
+    return buf;
+}
+
+const char* rewriteSystemCall(const char* command, char* buf, unsigned maxBuf)
+{
+
+    const char* foundStr = strstr(command, devCfgFileName);
+    if (!foundStr)
+      return command;
+
+    const char* replaceStr = getenv(devCfgFileNameEnvVar);
+    if (!replaceStr) return command;
+
+    const char* result = 
+      findAndReplaceFirstOccurence(command, devCfgFileName, replaceStr, buf, maxBuf);
+
+    if (!result)
+      abort();
+
+    return result;
+}
+
+int execvp(const char * path, char * const argv[])
+{
+    int (*_execvp) (const char *, char * const argv[]) = dlsym(RTLD_NEXT, "execvp");
+    char buf[PATH_MAX];
+    return _execvp(rewrite(path, buf), argv);
+}
+
+
+int open(const char *path, int flags, ...)
+{
+    char buf[PATH_MAX];
+    int (*_open) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open");
+    mode_t mode = 0;
+    if (flags & O_CREAT) {
+        va_list ap;
+        va_start(ap, flags);
+        mode = va_arg(ap, mode_t);
+        va_end(ap);
+    }
+    return _open(rewrite(path, buf), flags, mode);
+}
+
+int open64(const char *path, int flags, ...)
+{
+    char buf[PATH_MAX];
+    int (*_open64) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open64");
+    mode_t mode = 0;
+    if (flags & O_CREAT) {
+        va_list ap;
+        va_start(ap, flags);
+        mode = va_arg(ap, mode_t);
+        va_end(ap);
+    }
+    return _open64(rewrite(path, buf), flags, mode);
+}
+
+FILE* fopen(const char* path, const char* mode)
+{
+  char buf[PATH_MAX];
+	FILE* (*_fopen) (const char*, const char*) = dlsym(RTLD_NEXT, "fopen");
+
+	return _fopen(rewrite(path, buf), mode);
+}
+
+FILE *fopen64(const char *path, const char *mode)
+{
+  char buf[PATH_MAX];
+	FILE* (*_fopen64) (const char*, const char*) = dlsym(RTLD_NEXT, "fopen64");
+
+	return _fopen64(rewrite(path, buf), mode);
+}
+
+DIR* opendir(const char* path)
+{
+  char buf[PATH_MAX];
+	DIR* (*_opendir) (const char*) = dlsym(RTLD_NEXT, "opendir");
+
+	return _opendir(rewrite(path, buf));
+}
+
+#define SYSTEM_CMD_MAX 512
+
+int system(const char *command)
+{
+    char buf[SYSTEM_CMD_MAX];
+    int (*_system) (const char*) = dlsym(RTLD_NEXT, "system");
+
+    const char* newCommand = rewriteSystemCall(command, buf, SYSTEM_CMD_MAX);
+    return _system(newCommand);
+}
diff --git a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix
new file mode 100644
index 00000000000..873240e81fc
--- /dev/null
+++ b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix
@@ -0,0 +1,60 @@
+{ stdenv, fetchurl, libsaneUDevRuleNumber ? "49"}:
+
+
+stdenv.mkDerivation rec {
+
+  name = "brother-udev-rule-type1-1.0.0-1";
+
+  src = fetchurl {
+    url = "http://download.brother.com/welcome/dlf006654/${name}.all.deb";
+    sha256 = "0i0x5jw135pli4jl9mgnr5n2rrdvml57nw84yq2999r4frza53xi";
+  };
+
+  buildInputs = [ ];
+
+  unpackPhase = ''
+    ar x $src
+    tar xfvz data.tar.gz
+  '';
+
+  /*
+    Fix the following error:
+
+    ~~~
+    invalid rule 49-brother-libsane-type1.rules
+    unknown key 'SYSFS{idVendor}'
+    ~~~
+
+    Apparently the udev rules syntax has change and the SYSFS key has to
+    be changed to ATTR.
+
+    See:
+
+     -  <http://ubuntuforums.org/showthread.php?t=1496878>
+     -  <http://www.planet-libre.org/index.php?post_id=10937>
+  */
+  patchPhase = ''
+    sed -i -e s/SYSFS/ATTR/g opt/brother/scanner/udev-rules/type1/*.rules
+  '';
+
+
+  buildPhase = ":";
+
+  installPhase = ''
+    mkdir -p $out/etc/udev/rules.d
+    cp opt/brother/scanner/udev-rules/type1/NN-brother-mfp-type1.rules \
+      $out/etc/udev/rules.d/${libsaneUDevRuleNumber}-brother-libsane-type1.rules
+    chmod 644 $out/etc/udev/rules.d/${libsaneUDevRuleNumber}-brother-libsane-type1.rules
+  '';
+
+  dontStrip = true;
+  dontPatchELF = true;
+
+  meta = {
+    description = "Brother type1 scanners udev rules";
+    homepage = http://www.brother.com;
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.unfree;
+    maintainers = with stdenv.lib.maintainers; [ jraygauthier ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 586248d04ee..2b922f330bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16436,6 +16436,8 @@ in
     snapscanFirmware = config.sane.snapscanFirmware or null;
   };
 
+  brscan4 = callPackage ../applications/graphics/sane/backends/brscan4 { };
+
   mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { };
 
   sane-frontends = callPackage ../applications/graphics/sane/frontends.nix { };

From a7c5b1d1107be639febb809957a30cc843832262 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 1 May 2016 20:46:09 +0200
Subject: [PATCH 509/712] buku: 1.8 -> 1.9

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

diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index ccebb8bfc11..79b4e787eaa 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -3,14 +3,14 @@
 }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "1.8";
+  version = "1.9";
   name = "buku-${version}";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "buku";
-    rev = "53d48ee56a3abfb53b94ed25fb620ee759141c96";
-    sha256 = "185d3gndw20c3l6f3mf0iq4qapm8g30bl0hn0wsqpp36vl0bpq28";
+    rev = "e99844876d0d871df80770b1bd76c161276116eb";
+    sha256 = "1qwkff61gdjd6w337a5ipfiybzqdwkxdyfa1l4zzm9dj7lsklgq2";
   };
 
   buildInputs = stdenv.lib.optional encryptionSupport pythonPackages.pycrypto;

From 1249a4d7507334130dbcba40db5195145bcb1829 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 1 May 2016 20:58:14 +0200
Subject: [PATCH 510/712] securefs: init at 0.3.1

Caveat, as always with such things, emptor.
---
 pkgs/tools/filesystems/securefs/default.nix | 42 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/tools/filesystems/securefs/default.nix

diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix
new file mode 100644
index 00000000000..8e483853672
--- /dev/null
+++ b/pkgs/tools/filesystems/securefs/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub
+, fuse }:
+
+stdenv.mkDerivation rec {
+  name = "securefs-${version}";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    sha256 = "1n9kgrvc600lfclrk8cj2zy8md1brqhs8kvzdwfxgxavdh0wakkc";
+    rev = version;
+    repo = "securefs";
+    owner = "netheril96";
+  };
+
+  buildInputs = [ fuse ];
+
+  enableParallelBuilding = true;
+
+  doCheck = false; # tests require the fuse module to be loaded
+
+  installPhase = ''
+    install -D -m0755 {.,$out/bin}/securefs
+  '';
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Transparent encryption filesystem";
+    longDescription = ''
+      Securefs is a filesystem in userspace (FUSE) that transparently encrypts
+      and authenticates data stored. It is particularly designed to secure
+      data stored in the cloud.
+      Securefs mounts a regular directory onto a mount point. The mount point
+      appears as a regular filesystem, where one can read/write/create files,
+      directories and symbolic links. The underlying directory will be
+      automatically updated to contain the encrypted and authenticated
+      contents.
+    '';
+    license = with licenses; [ bsd2 mit ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7ac11c62561..dda7e5ce9af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3191,6 +3191,8 @@ in
 
   seccure = callPackage ../tools/security/seccure { };
 
+  securefs = callPackage ../tools/filesystems/securefs { };
+
   setroot = callPackage  ../tools/X11/setroot { };
 
   setserial = callPackage ../tools/system/setserial { };

From 0a04f7a870e4a7e538387b4f8d0a79f9ebe76cb8 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 1 May 2016 21:23:03 +0200
Subject: [PATCH 511/712] torbrowser: fix paths to pluggable transports

With this patch I'm at least able to connect using the obfs4 transport
---
 pkgs/tools/security/tor/torbrowser.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index 11988d9435f..c8f9c3dae97 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
   patchPhase = ''
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Browser/firefox
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Browser/TorBrowser/Tor/tor
+
+    sed -e "s,./TorBrowser,$out/share/tor-browser/Browser/TorBrowser,g" -i Browser/TorBrowser/Data/Tor/torrc-defaults
   '';
 
   doCheck = true;

From 966a790764e46274806c3e24b91f18cf0226d035 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 1 May 2016 20:12:49 +0000
Subject: [PATCH 512/712] nixpkgs: chez scheme update

Remove the parallel build[1], and update to the latest commit which
updates the .boot files and fixes a few bugs, too.

[1] I figured many builds on my dual-socket 12core would expose
problems, but I have a suspicion of that being an issue.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/chez/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix
index f9e0627f8aa..da60ffbb67a 100644
--- a/pkgs/development/compilers/chez/default.nix
+++ b/pkgs/development/compilers/chez/default.nix
@@ -3,16 +3,15 @@
 stdenv.mkDerivation rec {
   name    = "chez-scheme-${version}";
   version = "9.4-${dver}";
-  dver    = "20160430";
+  dver    = "20160501";
 
   src = fetchgit {
-    url    = "https://github.com/cisco/ChezScheme.git";
-    rev    = "63a97939896c2a89fcffdf16c8b783efaeb816b5";
-    sha256 = "1c58xjslgn7xnfy9j5p9b6sn0wzv2mk7zlmhflydzil7iimchjsi";
+    url    = "https://github.com/cisco/chezscheme.git";
+    rev    = "8343b7172532a00d2d19914206fcf83c93798c80";
+    sha256 = "1jq55sdk468lckccfnqh0iv868bhw6yb9ba9bakqg2pfydb8r4qf";
     fetchSubmodules = true;
   };
 
-  enableParallelBuilding = true;
   buildInputs = [ ncurses libX11 ];
 
   /* Chez uses a strange default search path, which completely

From d9ad7d529d43c6b6c9f45e913b0408e992d7dfa3 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 1 May 2016 20:17:56 +0000
Subject: [PATCH 513/712] nixpkgs: remove unused hiphopvm/hhvm alias

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/top-level/all-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dda7e5ce9af..8a1a4fe82f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4373,7 +4373,6 @@ in
   hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { };
 
   hhvm = callPackage ../development/compilers/hhvm { };
-  hiphopvm = self.hhvm; /* Compatibility alias */
 
   hop = callPackage ../development/compilers/hop { };
 

From 452867d149655af77a2bd3c1f5cb63f8425e7155 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 1 May 2016 23:33:13 +0200
Subject: [PATCH 514/712] perl-CryptX: 0.030 -> 0.031

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7a608ccd8ed..05f2425df57 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2661,10 +2661,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CryptX = buildPerlPackage rec {
-    name = "CryptX-0.030";
+    name = "CryptX-0.031";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz";
-      sha256 = "b0e26b4c4de66134f1f1ae4227fdd18cf10f95cecc64a651a8af2710ef7519e5";
+      sha256 = "7221a7a824ae07377f7e97c6daafff47524c46204c9b8ff58420a13fc2c104f1";
     };
     propagatedBuildInputs = [ JSONMaybeXS ];
     meta = {

From 1612bb412346af7a83935ee0600e62b017c70645 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 1 May 2016 23:33:48 +0200
Subject: [PATCH 515/712] perl-File-Util: 4.132140 -> 4.161200

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 05f2425df57..d39dcbbf21f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5242,12 +5242,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   FileUtil = buildPerlPackage rec {
-    name = "File-Util-4.132140";
+    name = "File-Util-4.161200";
     src = fetchurl {
       url = "mirror://cpan/authors/id/T/TO/TOMMY/${name}.tar.gz";
-      sha256 = "4233c493468da8b34f2df19b191aaa400f328d877c8c023605e43385976a99d1";
+      sha256 = "c63be030c15303796d387b290f1f6b59451fb64827e39afeb0e1d0adad72ab8e";
     };
-    buildInputs = [ TestFatal TestNoWarnings ];
+    buildInputs = [ ModuleBuild TestNoWarnings ];
     meta = {
       homepage = https://github.com/tommybutler/file-util/wiki;
       description = "Easy, versatile, portable file handling";

From 216b04b2470d18d1f9371ff243c967409f76d1ed Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 1 May 2016 23:34:10 +0200
Subject: [PATCH 516/712] perl-Log-Dispatchouli: 2.009 -> 2.012

---
 pkgs/top-level/perl-packages.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d39dcbbf21f..9317cc727cf 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7144,16 +7144,16 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  LogDispatchouli = buildPerlPackage {
-    name = "Log-Dispatchouli-2.009";
+  LogDispatchouli = buildPerlPackage rec {
+    name = "Log-Dispatchouli-2.012";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatchouli-2.009.tar.gz;
-      sha256 = "09iw27r36gmljlm6gjfczn2sf4s1js697q8na8xw4wlnz7x4bv59";
+      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
+      sha256 = "214eca0fe77f2dc74675f9aa542778d5d4618c5bf12283540ca1062fcb967fa0";
     };
     buildInputs = [ TestDeep TestFatal ];
     propagatedBuildInputs = [ LogDispatch LogDispatchArray ParamsUtil StringFlogger SubExporter SubExporterGlobExporter TryTiny ];
     meta = {
-      homepage = https://github.com/rjbs/log-dispatchouli;
+      homepage = https://github.com/rjbs/Log-Dispatchouli;
       description = "A simple wrapper around Log::Dispatch";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };

From 97e5e01463ebd8eff3154e7837fbed269849ff63 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 1 May 2016 23:34:46 +0200
Subject: [PATCH 517/712] perl-Math-BigInt: 1.999718 -> 1.999722

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9317cc727cf..c01d2b7e268 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7355,10 +7355,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MathBigInt = buildPerlPackage rec {
-    name = "Math-BigInt-1.999718";
+    name = "Math-BigInt-1.999722";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz";
-      sha256 = "3edb44123d6c03a4031057f449b41a0d05ebc48d25ad64b08a5fe2f4ae2ac240";
+      sha256 = "c76a2d5e6a996186a42a7e516b8d82217fb0cd18c7e1e55241322c4a859ccf40";
     };
     meta = {
       description = "Arbitrary size integer/float math package";

From 196c4221868a94df30d09605d6bff4faeb47536a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 1 May 2016 23:34:59 +0200
Subject: [PATCH 518/712] perl-Math-BigRat: 0.260803 -> 0.260804

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c01d2b7e268..3a70e6cd05d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7380,10 +7380,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   MathBigRat = buildPerlPackage rec {
-    name = "Math-BigRat-0.260803";
+    name = "Math-BigRat-0.260804";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz";
-      sha256 = "0558fab8ffe0de8751ccfa3bd129d6f34b82cf75454de82b051d4ddffd4ec99b";
+      sha256 = "f9bf5c007c0f141df7c7887d3482d47033cf7deab094a01e2863f31bacd7ef8a";
     };
     propagatedBuildInputs = [ MathBigInt ];
     meta = {

From 50a8d9a6f4861fc2e1ef5745f1e92b8868982d36 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 1 May 2016 23:35:20 +0200
Subject: [PATCH 519/712] perl-Pod-Elemental-PerlMunger: 0.200005 -> 0.200006

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3a70e6cd05d..cabf9a88018 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10055,10 +10055,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PodElementalPerlMunger = buildPerlPackage rec {
-    name = "Pod-Elemental-PerlMunger-0.200005";
+    name = "Pod-Elemental-PerlMunger-0.200006";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
-      sha256 = "35146bdcf0d3ac271f9ba2a4d4611b98373215c43de43dd4f012f46c44004d57";
+      sha256 = "09fd3b5d53119437a01dced66b42eafdcd53895b3c32a2b0f781f36fda0f665b";
     };
     buildInputs = [ Moose PodElemental ];
     propagatedBuildInputs = [ Moose PPI PodElemental namespaceautoclean ];

From ef44e78849a6ae39b1f18f0e7034470e5debff5f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 1 May 2016 23:35:35 +0200
Subject: [PATCH 520/712] perl-Pod-Weaver: 4.012 -> 4.013

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index cabf9a88018..05ed6d87e4b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10242,15 +10242,15 @@ let self = _self // overrides; _self = with self; {
   };
 
   PodWeaver = buildPerlPackage rec {
-    name = "Pod-Weaver-4.012";
+    name = "Pod-Weaver-4.013";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
-      sha256 = "d801cbfaff22d418943d0c5dcb8c145b8cc4d56741f9c33923ef891241116ad6";
+      sha256 = "5f12c5f11d313294520b0a1ab5c0775ef56e222d9181c8dac520cdc77af309e0";
     };
     buildInputs = [ PPI SoftwareLicense TestDifferences ];
-    propagatedBuildInputs = [ ConfigMVP ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli MixinLinewise ModuleRuntime Moose ParamsUtil PodElemental StringFlogger StringFormatter StringRewritePrefix namespaceautoclean ];
+    propagatedBuildInputs = [ ConfigMVP ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli MixinLinewise Moose PodElemental StringFlogger StringFormatter StringRewritePrefix namespaceautoclean ];
     meta = {
-      homepage = https://github.com/rjbs/pod-weaver;
+      homepage = https://github.com/rjbs/Pod-Weaver;
       description = "Weave together a Pod document from an outline";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = [ maintainers.rycee ];

From 36c4c73575837e1fc87cdee5a793000fb1af7d24 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 2 May 2016 00:55:08 +0300
Subject: [PATCH 521/712] clang: Add compat `lib` attribute to have
 `stdenv.cc.cc.lib` always work

Fixes tarball evaluation:

http://hydra.nixos.org/build/35042997/nixlog/1/raw
---
 .../compilers/llvm/3.6/clang/default.nix      | 86 ++++++++++---------
 .../compilers/llvm/3.7/clang/default.nix      | 86 ++++++++++---------
 .../compilers/llvm/3.8/clang/default.nix      | 86 ++++++++++---------
 3 files changed, 132 insertions(+), 126 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.6/clang/default.nix b/pkgs/development/compilers/llvm/3.6/clang/default.nix
index 2827e073903..ff0f34391af 100644
--- a/pkgs/development/compilers/llvm/3.6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.6/clang/default.nix
@@ -2,54 +2,56 @@
 
 let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
-in stdenv.mkDerivation {
-  name = "clang-${version}";
+  self = stdenv.mkDerivation {
+    name = "clang-${version}";
 
-  unpackPhase = ''
-    unpackFile ${fetch "cfe" "1wwr8s6lzr324hv4s1k6na4j5zv6n9kdhi14s4kb9b13d93814df"}
-    mv cfe-${version}.src clang
-    sourceRoot=$PWD/clang
-    unpackFile ${clang-tools-extra_src}
-    mv clang-tools-extra-* $sourceRoot/tools/extra
-  '';
+    unpackPhase = ''
+      unpackFile ${fetch "cfe" "1wwr8s6lzr324hv4s1k6na4j5zv6n9kdhi14s4kb9b13d93814df"}
+      mv cfe-${version}.src clang
+      sourceRoot=$PWD/clang
+      unpackFile ${clang-tools-extra_src}
+      mv clang-tools-extra-* $sourceRoot/tools/extra
+    '';
 
-  buildInputs = [ cmake libedit libxml2 llvm ];
+    buildInputs = [ cmake libedit libxml2 llvm ];
 
-  cmakeFlags = [
-    "-DCMAKE_BUILD_TYPE=Release"
-    "-DCMAKE_CXX_FLAGS=-std=c++11"
-  ] ++
-  # Maybe with compiler-rt this won't be needed?
-  (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++
-  (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include");
+    cmakeFlags = [
+      "-DCMAKE_BUILD_TYPE=Release"
+      "-DCMAKE_CXX_FLAGS=-std=c++11"
+    ] ++
+    # Maybe with compiler-rt this won't be needed?
+    (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++
+    (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include");
 
-  patches = [ ./purity.patch ./cmake-exports.patch ];
+    patches = [ ./purity.patch ./cmake-exports.patch ];
 
-  postPatch = ''
-    sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp
-    sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp
-  '';
+    postPatch = ''
+      sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp
+      sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp
+    '';
 
-  # Clang expects to find LLVMgold in its own prefix
-  # Clang expects to find sanitizer libraries in its own prefix
-  postInstall = ''
-    ln -sv ${llvm}/lib/LLVMgold.so $out/lib
-    ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
-    ln -sv $out/bin/clang $out/bin/cpp
-  '';
+    # Clang expects to find LLVMgold in its own prefix
+    # Clang expects to find sanitizer libraries in its own prefix
+    postInstall = ''
+      ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
+      ln -sv $out/bin/clang $out/bin/cpp
+    '';
 
-  enableParallelBuilding = true;
+    enableParallelBuilding = true;
 
-  passthru = {
-    isClang = true;
-  } // stdenv.lib.optionalAttrs stdenv.isLinux {
-    inherit gcc;
+    passthru = {
+      lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both
+      isClang = true;
+    } // stdenv.lib.optionalAttrs stdenv.isLinux {
+      inherit gcc;
+    };
+
+    meta = {
+      description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
+      homepage    = http://llvm.org/;
+      license     = stdenv.lib.licenses.bsd3;
+      platforms   = stdenv.lib.platforms.all;
+    };
   };
-
-  meta = {
-    description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
-    homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
-    platforms   = stdenv.lib.platforms.all;
-  };
-}
+in self
diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix
index e6369b1167e..aa71bb68553 100644
--- a/pkgs/development/compilers/llvm/3.7/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix
@@ -2,54 +2,56 @@
 
 let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
-in stdenv.mkDerivation {
-  name = "clang-${version}";
+  self = stdenv.mkDerivation {
+    name = "clang-${version}";
 
-  unpackPhase = ''
-    unpackFile ${fetch "cfe" "0x065d0w9b51xvdjxwfzjxng0gzpbx45fgiaxpap45ragi61dqjn"}
-    mv cfe-${version}.src clang
-    sourceRoot=$PWD/clang
-    unpackFile ${clang-tools-extra_src}
-    mv clang-tools-extra-* $sourceRoot/tools/extra
-  '';
+    unpackPhase = ''
+      unpackFile ${fetch "cfe" "0x065d0w9b51xvdjxwfzjxng0gzpbx45fgiaxpap45ragi61dqjn"}
+      mv cfe-${version}.src clang
+      sourceRoot=$PWD/clang
+      unpackFile ${clang-tools-extra_src}
+      mv clang-tools-extra-* $sourceRoot/tools/extra
+    '';
 
-  buildInputs = [ cmake libedit libxml2 llvm ];
+    buildInputs = [ cmake libedit libxml2 llvm ];
 
-  cmakeFlags = [
-    "-DCMAKE_BUILD_TYPE=Release"
-    "-DCMAKE_CXX_FLAGS=-std=c++11"
-  ] ++
-  # Maybe with compiler-rt this won't be needed?
-  (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++
-  (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include");
+    cmakeFlags = [
+      "-DCMAKE_BUILD_TYPE=Release"
+      "-DCMAKE_CXX_FLAGS=-std=c++11"
+    ] ++
+    # Maybe with compiler-rt this won't be needed?
+    (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++
+    (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include");
 
-  patches = [ ./purity.patch ];
+    patches = [ ./purity.patch ];
 
-  postPatch = ''
-    sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp
-    sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp
-  '';
+    postPatch = ''
+      sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp
+      sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp
+    '';
 
-  # Clang expects to find LLVMgold in its own prefix
-  # Clang expects to find sanitizer libraries in its own prefix
-  postInstall = ''
-    ln -sv ${llvm}/lib/LLVMgold.so $out/lib
-    ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
-    ln -sv $out/bin/clang $out/bin/cpp
-  '';
+    # Clang expects to find LLVMgold in its own prefix
+    # Clang expects to find sanitizer libraries in its own prefix
+    postInstall = ''
+      ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
+      ln -sv $out/bin/clang $out/bin/cpp
+    '';
 
-  enableParallelBuilding = true;
+    enableParallelBuilding = true;
 
-  passthru = {
-    isClang = true;
-  } // stdenv.lib.optionalAttrs stdenv.isLinux {
-    inherit gcc;
+    passthru = {
+      lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both
+      isClang = true;
+    } // stdenv.lib.optionalAttrs stdenv.isLinux {
+      inherit gcc;
+    };
+
+    meta = {
+      description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
+      homepage    = http://llvm.org/;
+      license     = stdenv.lib.licenses.bsd3;
+      platforms   = stdenv.lib.platforms.all;
+    };
   };
-
-  meta = {
-    description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
-    homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
-    platforms   = stdenv.lib.platforms.all;
-  };
-}
+in self
diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix
index 047f87c92a9..71420d4cdcc 100644
--- a/pkgs/development/compilers/llvm/3.8/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix
@@ -2,54 +2,56 @@
 
 let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
-in stdenv.mkDerivation {
-  name = "clang-${version}";
+  self = stdenv.mkDerivation {
+    name = "clang-${version}";
 
-  unpackPhase = ''
-    unpackFile ${fetch "cfe" "1ybcac8hlr9vl3wg8s4v6cp0c0qgqnwprsv85lihbkq3vqv94504"}
-    mv cfe-${version}.src clang
-    sourceRoot=$PWD/clang
-    unpackFile ${clang-tools-extra_src}
-    mv clang-tools-extra-* $sourceRoot/tools/extra
-  '';
+    unpackPhase = ''
+      unpackFile ${fetch "cfe" "1ybcac8hlr9vl3wg8s4v6cp0c0qgqnwprsv85lihbkq3vqv94504"}
+      mv cfe-${version}.src clang
+      sourceRoot=$PWD/clang
+      unpackFile ${clang-tools-extra_src}
+      mv clang-tools-extra-* $sourceRoot/tools/extra
+    '';
 
-  buildInputs = [ cmake libedit libxml2 llvm python ];
+    buildInputs = [ cmake libedit libxml2 llvm python ];
 
-  cmakeFlags = [
-    "-DCMAKE_BUILD_TYPE=Release"
-    "-DCMAKE_CXX_FLAGS=-std=c++11"
-  ] ++
-  # Maybe with compiler-rt this won't be needed?
-  (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++
-  (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include");
+    cmakeFlags = [
+      "-DCMAKE_BUILD_TYPE=Release"
+      "-DCMAKE_CXX_FLAGS=-std=c++11"
+    ] ++
+    # Maybe with compiler-rt this won't be needed?
+    (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++
+    (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include");
 
-  patches = [ ./purity.patch ];
+    patches = [ ./purity.patch ];
 
-  postPatch = ''
-    sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp
-    sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp
-  '';
+    postPatch = ''
+      sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp
+      sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp
+    '';
 
-  # Clang expects to find LLVMgold in its own prefix
-  # Clang expects to find sanitizer libraries in its own prefix
-  postInstall = ''
-    ln -sv ${llvm}/lib/LLVMgold.so $out/lib
-    ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
-    ln -sv $out/bin/clang $out/bin/cpp
-  '';
+    # Clang expects to find LLVMgold in its own prefix
+    # Clang expects to find sanitizer libraries in its own prefix
+    postInstall = ''
+      ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
+      ln -sv $out/bin/clang $out/bin/cpp
+    '';
 
-  enableParallelBuilding = true;
+    enableParallelBuilding = true;
 
-  passthru = {
-    isClang = true;
-  } // stdenv.lib.optionalAttrs stdenv.isLinux {
-    inherit gcc;
+    passthru = {
+      lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both
+      isClang = true;
+    } // stdenv.lib.optionalAttrs stdenv.isLinux {
+      inherit gcc;
+    };
+
+    meta = {
+      description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
+      homepage    = http://llvm.org/;
+      license     = stdenv.lib.licenses.bsd3;
+      platforms   = stdenv.lib.platforms.all;
+    };
   };
-
-  meta = {
-    description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
-    homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
-    platforms   = stdenv.lib.platforms.all;
-  };
-}
+in self

From d19841c46fbd4ffd796510a5e28362937c3a9457 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Sun, 10 Apr 2016 23:46:40 -0300
Subject: [PATCH 522/712] openra: 20141029 -> 20151224

---
 pkgs/games/openra/default.nix | 63 +++++++++++++++++++++++++++++++----
 1 file changed, 56 insertions(+), 7 deletions(-)

diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix
index c79c0680410..071b200a72e 100644
--- a/pkgs/games/openra/default.nix
+++ b/pkgs/games/openra/default.nix
@@ -1,9 +1,10 @@
 { stdenv, fetchurl, mono, makeWrapper, lua
-, SDL2, freetype, openal, systemd, pkgconfig
+, SDL2, freetype, openal, systemd, pkgconfig,
+  dotnetPackages, gnome3
 }:
 
 let
-  version = "20141029";
+  version = "20151224";
 in stdenv.mkDerivation rec {
   name = "openra-${version}";
 
@@ -17,17 +18,20 @@ in stdenv.mkDerivation rec {
   src = fetchurl {
     name = "${name}.tar.gz";
     url = "https://github.com/OpenRA/OpenRA/archive/release-${version}.tar.gz";
-    sha256 = "082rwcy866k636s4qhbry3ja2p81mdz58bh1dw2mic5mv2q6p67r";
+    sha256 = "0dgaxy1my5r3sr3l3gw79v89dsc7179pasj2bibswlv03wsjgqbi";
   };
 
   dontStrip = true;
 
-  buildInputs = [ lua ];
+  buildInputs = with dotnetPackages;
+     [ NUnit NewtonsoftJson MonoNat FuzzyLogicLibrary SmartIrc4net SharpZipLib MaxMindGeoIP2 MaxMindDb SharpFont StyleCopMSBuild StyleCopPlusMSBuild RestSharp ]
+     ++ [ lua gnome3.zenity ];
   nativeBuildInputs = [ mono makeWrapper lua pkgconfig ];
 
   patchPhase = ''
     sed -i 's/^VERSION.*/VERSION = release-${version}/g' Makefile
-    substituteInPlace configure --replace /bin/bash "$shell" --replace /usr/local/lib "${lua}/lib"
+    substituteInPlace thirdparty/configure-native-deps.sh --replace "locations=\"" "locations=\"${lua}/lib "
+    substituteInPlace Makefile --replace "@./thirdparty/fetch-geoip-db.sh" ""
   '';
 
   preConfigure = ''
@@ -35,6 +39,51 @@ in stdenv.mkDerivation rec {
     make version
   '';
 
+  preBuild = let dotnetPackagesDlls = with dotnetPackages; [
+    "${MonoNat}/lib/dotnet/Mono.Nat/net40/Mono.Nat.dll"
+    "${FuzzyLogicLibrary}/lib/dotnet/FuzzyLogicLibrary/Release/FuzzyLogicLibrary.dll"
+    "${SmartIrc4net}/lib/dotnet/SmartIrc4net/net40/SmarIrc4net*"
+    "${SharpZipLib}/lib/dotnet/SharpZipLib/20/ICSharpCode.SharpZipLib.dll"
+    "${MaxMindGeoIP2}/lib/dotnet/MaxMind.GeoIP2/net40/MaxMind.GeoIP2*"
+    "${MaxMindDb}/lib/dotnet/MaxMind.Db/net40/MaxMind.Db.*"
+    "${SharpFont}/lib/dotnet/SharpFont/net20/SharpFont.dll"
+    "${SharpFont}/lib/dotnet/SharpFont/SharpFont.dll.config"
+    "${StyleCopMSBuild}/lib/dotnet/StyleCop.MSBuild/StyleCop*.dll"
+    "${StyleCopPlusMSBuild}/lib/dotnet/StyleCopPlus.MSBuild/StyleCopPlus.dll"
+    "${RestSharp}/lib/dotnet/RestSharp/net4-client/RestSharp.dll"
+    "${NUnit}/lib/dotnet/NUnit/nunit.framework.*"
+    "${NewtonsoftJson}/lib/dotnet/Newtonsoft.Json/Newtonsoft.Json.dll"
+    ];
+    movePackages = [
+      ( let filename = "Eluant.dll"; in { origin = fetchurl {
+          url = "https://github.com/OpenRA/Eluant/releases/download/20140425/${filename}";
+          sha256 = "1c20whz7dzfhg3szd62rvb79745x5iwrd5pp62j3bbj1q9wpddmb";
+        }; target = filename; })
+
+      ( let filename = "SDL2-CS.dll"; in { origin = fetchurl {
+          url = "https://github.com/OpenRA/SDL2-CS/releases/download/20150709/${filename}";
+          sha256 = "0ms75w9w0x3dzpg5g1ym5nb1id7pmagbzqx0am7h8fq4m0cqddmc";
+        }; target = filename; })
+
+      ( let filename = "GeoLite2-Country.mmdb.gz"; in { origin = fetchurl {
+          url = "http://geolite.maxmind.com/download/geoip/database/${filename}";
+          sha256 = "0lr978pipk5q2z3x011ps4fx5nfc3hsal7jb77fc60aa6iscr05m";
+        }; target = filename; })
+    ];
+  in ''
+    mkdir thirdparty/download/
+
+    ${stdenv.lib.concatMapStringsSep "\n" (from: "cp ${from} thirdparty/download") dotnetPackagesDlls}
+    ${stdenv.lib.concatMapStringsSep "\n" ({origin, target}: "cp ${origin} thirdparty/download/${target}") movePackages}
+
+    make dependencies
+  '';
+
+  #todo: man-page
+  buildFlags = [ "DEBUG=false" "default" ];
+
+  installTargets = [ "install" "install-linux-icons" "install-linux-desktop" "install-linux-appdata" "install-linux-mime" ];
+
   postInstall = with stdenv.lib; let
     runtime = makeLibraryPath [ SDL2 freetype openal systemd lua ];
   in ''
@@ -42,9 +91,9 @@ in stdenv.mkDerivation rec {
       --prefix PATH : "${mono}/bin" \
       --set PWD $out/lib/openra/ \
       --prefix LD_LIBRARY_PATH : "${runtime}"
-      
+
     mkdir -p $out/bin
-    echo "cd $out/lib/openra && $out/lib/openra/launch-game.sh" > $out/bin/openra
+    echo -e "#!${stdenv.shell}\ncd $out/lib/openra && $out/lib/openra/launch-game.sh" > $out/bin/openra
     chmod +x $out/bin/openra
   '';
 }

From 42cce6ab1104612eecf6c93f702f6f6fc088927b Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Sat, 30 Apr 2016 22:35:39 -0300
Subject: [PATCH 523/712] openra: my maintainership

---
 lib/maintainers.nix           | 1 +
 pkgs/games/openra/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 63b79ccab0b..b71e0becae1 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -291,6 +291,7 @@
   pxc = "Patrick Callahan <patrick.callahan@latitudeengineering.com>";
   qknight = "Joachim Schiele <js@lastlog.de>";
   ragge = "Ragnar Dahlen <r.dahlen@gmail.com>";
+  rardiol = "Ricardo Ardissone <ricardo.ardissone@gmail.com>";
   rasendubi = "Alexey Shmalko <rasen.dubi@gmail.com>";
   raskin = "Michael Raskin <7c6f434c@mail.ru>";
   redbaron = "Maxim Ivanov <ivanov.maxim@gmail.com>";
diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix
index 071b200a72e..de4858e70c7 100644
--- a/pkgs/games/openra/default.nix
+++ b/pkgs/games/openra/default.nix
@@ -11,6 +11,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Real Time Strategy game engine recreates the C&C titles";
     homepage    = "http://www.open-ra.org/";
+    maintainers = [ maintainers.rardiol ];
     license     = licenses.gpl3;
     platforms   = platforms.linux;
   };

From 30240ccb9d62ade30e119448332e62112c00795c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 2 May 2016 01:06:45 +0300
Subject: [PATCH 524/712] tarball: No need to depend on nix development headers

---
 pkgs/top-level/make-tarball.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index ea7e7e89d37..da3579a6595 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -18,7 +18,7 @@ releaseTools.sourceTarball rec {
   version = builtins.readFile ../../.version;
   versionSuffix = "pre${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
 
-  buildInputs = [ nix jq ];
+  buildInputs = [ nix.out jq ];
 
   configurePhase = ''
     eval "$preConfigure"

From a1d61e736750159f6e860c7649d5f46dcade4d42 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 1 May 2016 22:10:18 +0000
Subject: [PATCH 525/712] nixpkgs: fix chez build failures

The Chez build was failing, as usual, due to impurities. The build
system refers to absolute paths for tools like `ln` or `true`, which
was the real culprit here. Furthermore the build also 'helpfully'
suppresses errors in these cases by piping to /dev/null, so you never
see any errors at build time until it's too late (otherwise, you'd
see failures to call /bin/ln or at ./configure time).

This also re-enables parallel builds, as they should be safe from
all my testing, I believe.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/chez/default.nix | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix
index da60ffbb67a..d9e7cc50730 100644
--- a/pkgs/development/compilers/chez/default.nix
+++ b/pkgs/development/compilers/chez/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, ncurses, libX11 }:
+{ stdenv, fetchgit, coreutils, ncurses, libX11 }:
 
 stdenv.mkDerivation rec {
   name    = "chez-scheme-${version}";
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  enableParallelBuilding = true;
   buildInputs = [ ncurses libX11 ];
 
   /* Chez uses a strange default search path, which completely
@@ -19,14 +20,25 @@ stdenv.mkDerivation rec {
   ** defaults to {/usr,/usr/local,$HOME}/lib for finding the .boot
   ** file.
   **
-  ** Also, we patch out a very annoying 'feature' in ./configure, too.
+  ** Also, we patch out a very annoying 'feature' in ./configure, too,
+  ** which tries to use 'git' to update submodules.
+  **
+  ** Finally, we have to also fix a few occurrences to tools with
+  ** absolute paths in some helper scripts, otherwise the build will
+  ** fail on NixOS or in any chroot build.
   */
   patchPhase = ''
-    substituteInPlace c/scheme.c \
+    substituteInPlace ./c/scheme.c \
       --replace "/usr/lib/csv" "$out/lib/csv"
 
     substituteInPlace ./configure \
       --replace "git submodule init && git submodule update || exit 1" ""
+
+    substituteInPlace ./workarea \
+      --replace "/bin/ln" "${coreutils}/bin/ln"
+
+    substituteInPlace ./makefiles/installsh \
+      --replace "/usr/bin/true" "${coreutils}/bin/true"
   '';
 
   /* Don't use configureFlags, since that just implicitly appends

From ddb4ea19bc185368db241f3eb33d4bb0b23be155 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Sat, 30 Apr 2016 18:26:54 -0400
Subject: [PATCH 526/712] minecraft: use makeLibraryPath, so we don't use the
 dev outputs

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

diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index 6f3093585b4..f3a8a34fa3b 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -2,6 +2,7 @@
 , jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
 , mesa, openal
 , useAlsa ? false, alsaOss ? null }:
+with stdenv.lib;
 
 assert useAlsa -> alsaOss != null;
 
@@ -39,8 +40,7 @@ in stdenv.mkDerivation {
     cat > $out/bin/minecraft << EOF
     #!${stdenv.shell}
 
-    # wrapper for minecraft
-    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/
+    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm mesa openal ]}
     ${if useAlsa then "${alsaOss}/bin/aoss" else "" } \
       ${jre}/bin/java -jar $out/minecraft.jar
     EOF

From 1b7e3ee14921c0d74da734ceed384292dda69d4a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 1 May 2016 23:11:59 +0200
Subject: [PATCH 527/712] pythonPackages.wcwidth: 0.1.4 -> 0.1.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 654bb8d3220..5d713aa3fa9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22616,11 +22616,11 @@ in modules // {
 
   wcwidth = buildPythonPackage rec {
     name = "wcwidth-${version}";
-    version = "0.1.4";
+    version = "0.1.6";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/w/wcwidth/${name}.tar.gz";
-      sha256 = "0awx28xi938nv55qlmai3b5ddqd1w5c294gy95xh4xsx0hik2vch";
+      sha256 = "02wjrpf001gjdjsaxxbzcwfg19crlk2dbddayrfc2v06f53yrcyw";
     };
 
     # Checks fail due to missing tox.ini file:

From b68f09a520371dd53fd1ab370935a2d8001700b3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 2 May 2016 00:21:23 +0200
Subject: [PATCH 528/712] pythonPackages.boto3: 1.2.2 -> 1.3.1

---
 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 5d713aa3fa9..7e4b9268305 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2479,13 +2479,13 @@ in modules // {
 
   boto3 = buildPythonPackage rec {
     name = "boto3-${version}";
-    version = "1.2.2";
+    version = "1.3.1";
 
     src = pkgs.fetchFromGitHub {
       owner = "boto";
       repo  = "boto3";
       rev   = version;
-      sha256 = "1w53lhhdzi29d31qzhflb5mcwb24mfrj4frv70w6qyn8vmqznnjy";
+      sha256 = "1rbwcslk9dgayrg3vy3m0bqj767hdy1aphy5wjgz925bsydgxdg6";
     };
 
     propagatedBuildInputs = [ self.botocore

From 5689ab480ae5df33ea21398ef75f211e670ec305 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 2 May 2016 01:59:03 +0200
Subject: [PATCH 529/712] pythonPackages.prompt_toolkit: 0.46 -> 0.60

---
 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 7e4b9268305..435d5d40a92 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16095,10 +16095,10 @@ in modules // {
 
   prompt_toolkit = buildPythonPackage rec {
     name = "prompt_toolkit-${version}";
-    version = "0.46";
+    version = "0.60";
 
     src = pkgs.fetchurl {
-      sha256 = "1yq9nis1b2rgpndi2rqh4divf6j22jjva83r5z8jf7iffywmr8hs";
+      sha256 = "0gf3vv8dmj77xv7lrpccw9k3m1bgq3m71q9s6hqp77zvyd6cqjml";
       url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz";
     };
 

From b9e42f1b9aca6080f9f591f34d6612cb43ee0edc Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 2 May 2016 02:00:15 +0200
Subject: [PATCH 530/712] pythonPackages.pgspecial: init at 1.3.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 435d5d40a92..7e8a2bc2993 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15642,6 +15642,26 @@ in modules // {
     };
   };
 
+  pgspecial = buildPythonPackage rec {
+    name = "pgspecial-${version}";
+    version = "1.3.0";
+
+    src = pkgs.fetchurl {
+      sha256 = "1nxqqkchigrznywmm73n1ksp5hhhwswz8anrlwpi9i75wq792mg1";
+      url = "mirror://pypi/p/pgspecial/${name}.tar.gz";
+    };
+
+    propagatedBuildInputs = with self; [ click ];
+
+    meta = {
+      description = "Meta-commands handler for Postgres Database";
+      homepage = https://pypi.python.org/pypi/pgspecial;
+      licence = licenses.bsd3;
+      maintainers = with maintainers; [ nckx ];
+    };
+  };
+
+
   mycli = buildPythonPackage rec {
     name = "mycli-${version}";
     version = "1.4.0";

From 230a0d4cc60f122f2c45c7870159477e03dd5cf8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 2 May 2016 02:00:51 +0200
Subject: [PATCH 531/712] pythonPackages.pgcli: 0.19.2 -> 0.20.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7e8a2bc2993..aac1a12d033 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15616,21 +15616,25 @@ in modules // {
 
   pgcli = buildPythonPackage rec {
     name = "pgcli-${version}";
-    version = "0.19.2";
+    version = "0.20.1";
 
     src = pkgs.fetchFromGitHub {
-      sha256 = "1xl3yqwksnszd2vcgzb576m56613qcl82jfqmb9fbvcqlcpks6ln";
+      sha256 = "0f1ff1a1x1qrcv4ygfh29yyknx8hgwck7rp020zz0jrq9dibhjp7";
       rev = "v${version}";
       repo = "pgcli";
       owner = "dbcli";
     };
 
     propagatedBuildInputs = with self; [
-      click configobj prompt_toolkit psycopg2 pygments sqlparse
+      click configobj prompt_toolkit psycopg2
+      pygments sqlparse pgspecial setproctitle
     ];
 
+    postPatch = ''
+      substituteInPlace setup.py --replace "==" ">="
+    '';
+
     meta = {
-      inherit version;
       description = "Command-line interface for PostgreSQL";
       longDescription = ''
         Rich command-line interface for PostgreSQL with auto-completion and

From 232d2f29ac7f2ec156664514aca0ac57204705e0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 2 May 2016 02:01:28 +0200
Subject: [PATCH 532/712] pythonPackages.mycli: 1.4.0 -> 1.6.0

---
 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 aac1a12d033..ab45285f1b3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15668,17 +15668,17 @@ in modules // {
 
   mycli = buildPythonPackage rec {
     name = "mycli-${version}";
-    version = "1.4.0";
+    version = "1.6.0";
 
     src = pkgs.fetchFromGitHub {
-      sha256 = "175jcfixjkq17fbda9kifbljfd5iwjpjisvhs5xhxsyf6n5ykv2l";
+      sha256 = "0vvl36gxawa0h36v119j47fdylj8k73ak6hv04s5cjqn5adcjjbh";
       rev = "v${version}";
       repo = "mycli";
       owner = "dbcli";
     };
 
     propagatedBuildInputs = with self; [
-      pymysql configobj sqlparse prompt_toolkit pygments click
+      pymysql configobj sqlparse prompt_toolkit pygments click pycrypto
     ];
 
     meta = {

From 80f923f26fff93a505db228bf8cde0b4bf77424e Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Mon, 2 May 2016 02:29:42 +0100
Subject: [PATCH 533/712] linux-testing: 4.6-rc5 -> 4.6-rc6

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index df30119b38d..9a948a68c4c 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.6-rc5";
-  modDirVersion = "4.6.0-rc5";
+  version = "4.6-rc6";
+  modDirVersion = "4.6.0-rc6";
   extraMeta.branch = "4.6";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "1795yq1bliyvfzb2a8rkldxfcjxq5frspr74cp5v0g37bamdrwvd";
+    sha256 = "040sk87zdgqsbma5sk1hk4graga8yafh4rn89vkznkwzdlwa3gyx";
   };
 
   features.iwlwifi = true;

From 1e84b0c070eabcacc5ab5a25c4606af0837a9f6a Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Mon, 2 May 2016 03:51:56 +0000
Subject: [PATCH 534/712] you-get: init at 0.4.390

---
 lib/maintainers.nix                |  1 +
 pkgs/top-level/all-packages.nix    |  2 ++
 pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 2bf60c585fc..2f2f1154177 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -316,6 +316,7 @@
   ryanartecona = "Ryan Artecona <ryanartecona@gmail.com>";
   ryantm = "Ryan Mulligan <ryan@ryantm.com>";
   rycee = "Robert Helgesson <robert@rycee.net>";
+  ryneeverett = "Ryne Everett <ryneeverett@gmail.com>";
   samuelrivas = "Samuel Rivas <samuelrivas@gmail.com>";
   sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
   schmitthenner = "Fabian Schmitthenner <development@schmitthenner.eu>";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a52289d7e2..ba9876f1fda 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14656,6 +14656,8 @@ in
 
   inherit (gnome3) yelp;
 
+  inherit (python3Packages) you-get;
+
   inherit (pythonPackages) youtube-dl;
 
   qgis = callPackage ../applications/gis/qgis {};
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 654bb8d3220..e52e86da6a3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23203,6 +23203,29 @@ in modules // {
     };
   };
 
+  you-get = buildPythonApplication rec {
+    version = "0.4.390";
+    name = "you-get-${version}";
+    disabled = !isPy3k;
+
+    # Tests aren't packaged, but they all hit the real network so
+    # probably aren't suitable for a build environment anyway.
+    doCheck = false;
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/y/you-get/${name}.tar.gz";
+      sha256 = "17hs0g9yvgvkmr7p1cz39mbbvb40q65qkc31j3ixc2f873gahagw";
+    };
+
+    meta = {
+      description = "A tiny command line utility to download media contents from the web";
+      homepage = https://you-get.org;
+      license = licenses.mit;
+      maintainers = with maintainers; [ ryneeverett ];
+      platforms = platforms.all;
+    };
+  };
+
   zope_broken = buildPythonPackage rec {
     name = "zope.broken-3.6.0";
 

From 822abc49adc7b130e3bdc99bdfaf2503a6cf699d Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@holidaycheck.com>
Date: Mon, 25 Apr 2016 16:10:10 +0200
Subject: [PATCH 535/712] nodejs-6_x : init at 6.0.0

---
 lib/maintainers.nix                    |  1 +
 pkgs/development/web/nodejs/nodejs.nix | 59 ++++++++++++++++++++++++
 pkgs/development/web/nodejs/v4.nix     | 63 ++------------------------
 pkgs/development/web/nodejs/v5.nix     | 57 ++---------------------
 pkgs/development/web/nodejs/v6.nix     | 12 +++++
 pkgs/top-level/all-packages.nix        | 10 ++--
 6 files changed, 87 insertions(+), 115 deletions(-)
 create mode 100644 pkgs/development/web/nodejs/nodejs.nix
 create mode 100644 pkgs/development/web/nodejs/v6.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index ae38b7acf6a..69d067b20e1 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -143,6 +143,7 @@
   garrison = "Jim Garrison <jim@garrison.cc>";
   gavin = "Gavin Rogers <gavin@praxeology.co.uk>";
   gebner = "Gabriel Ebner <gebner@gebner.org>";
+  gilligan = "Tobias Pflug <tobias.pflug@gmail.com>";
   giogadi = "Luis G. Torres <lgtorres42@gmail.com>";
   gleber = "Gleb Peregud <gleber.p@gmail.com>";
   globin = "Robin Gloster <mail@glob.in>";
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
new file mode 100644
index 00000000000..a04a0ed971b
--- /dev/null
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
+, pkgconfig, runCommand, which, libtool
+, version
+, src
+, ...
+}:
+
+assert stdenv.system != "armv5tel-linux";
+
+let
+
+  deps = { 
+    inherit openssl zlib libuv; 
+  } // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
+    inherit http-parser;
+  });
+
+  sharedConfigureFlags = name: [
+    "--shared-${name}"
+    "--shared-${name}-includes=${builtins.getAttr name deps}/include"
+    "--shared-${name}-libpath=${builtins.getAttr name deps}/lib"
+  ];
+
+  inherit (stdenv.lib) concatMap optional optionals maintainers licenses platforms;
+
+in stdenv.mkDerivation {
+
+  inherit version;
+
+  inherit src;
+
+  name = "nodejs-${version}";
+
+  configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];
+  dontDisableStatic = true;
+  prePatch = ''
+    patchShebangs .
+    sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
+  '';
+
+  patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
+
+  buildInputs = [ python which zlib libuv openssl python ]
+    ++ optionals stdenv.isLinux [ utillinux http-parser ]
+    ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ];
+  setupHook = ./setup-hook.sh;
+
+  enableParallelBuilding = true;
+
+  passthru.interpreterName = "nodejs";
+
+  meta = {
+    description = "Event-driven I/O framework for the V8 JavaScript engine";
+    homepage = http://nodejs.org;
+    license = licenses.mit;
+    maintainers = [ maintainers.goibhniu maintainers.havvy maintainers.gilligan ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix
index ccb52817367..4332dca2dae 100644
--- a/pkgs/development/web/nodejs/v4.nix
+++ b/pkgs/development/web/nodejs/v4.nix
@@ -1,67 +1,12 @@
 { stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
 , pkgconfig, runCommand, which, libtool
-}:
+, callPackage
+}@args:
 
-# nodejs 0.12 can't be built on armv5tel. Armv6 with FPU, minimum I think.
-# Related post: http://zo0ok.com/techfindings/archives/1820
-assert stdenv.system != "armv5tel-linux";
-
-let
+import ./nodejs.nix (args // rec {
   version = "4.3.1";
-
-  deps = {
-    inherit openssl zlib libuv;
-
-    # disabled system v8 because v8 3.14 no longer receives security fixes
-    # we fall back to nodejs' internal v8 copy which receives backports for now
-    # inherit v8
-  } // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
-    inherit http-parser;
-  });
-
-  sharedConfigureFlags = name: [
-    "--shared-${name}"
-    "--shared-${name}-includes=${builtins.getAttr name deps}/include"
-    "--shared-${name}-libpath=${builtins.getAttr name deps}/lib"
-  ];
-
-  inherit (stdenv.lib) concatMap optional optionals maintainers licenses platforms;
-in stdenv.mkDerivation {
-  name = "nodejs-${version}";
-
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
     sha256 = "0wzf5sirbph5kaik3pm9i2dxbjwqh5qlnqn71azrsv0vhs7dbqk1";
   };
-
-  configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];
-  dontDisableStatic = true;
-  prePatch = ''
-    patchShebangs .
-    sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
-  '';
-
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
-
-  buildInputs = [ python zlib libuv openssl python ]
-    ++ optionals stdenv.isLinux [ utillinux http-parser ];
-  nativeBuildInputs = [ pkgconfig ]
-    ++ optional stdenv.isDarwin libtool;
-
-  postFixup = ''
-    sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' $out/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
-  '';
-  setupHook = ./setup-hook.sh;
-
-  enableParallelBuilding = true;
-
-  passthru.interpreterName = "nodejs";
-
-  meta = {
-    description = "Event-driven I/O framework for the V8 JavaScript engine";
-    homepage = http://nodejs.org;
-    license = licenses.mit;
-    maintainers = [ maintainers.havvy ];
-    platforms = platforms.linux ++ platforms.darwin;
-  };
-}
+})
diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix
index d051b4850c1..02a7ba3ef4b 100644
--- a/pkgs/development/web/nodejs/v5.nix
+++ b/pkgs/development/web/nodejs/v5.nix
@@ -1,61 +1,12 @@
 { stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
 , pkgconfig, runCommand, which, libtool
-}:
+, callPackage
+}@args:
 
-# nodejs 5.0.0 can't be built on armv5tel. Armv6 with FPU, minimum I think.
-assert stdenv.system != "armv5tel-linux";
-
-let
+import ./nodejs.nix (args // rec {
   version = "5.11.0";
-
-  deps = {
-    inherit openssl zlib libuv;
-
-    # disabled system v8 because v8 3.14 no longer receives security fixes
-    # we fall back to nodejs' internal v8 copy which receives backports for now
-    # inherit v8
-  } // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
-    inherit http-parser;
-  });
-
-  sharedConfigureFlags = name: [
-    "--shared-${name}"
-    "--shared-${name}-includes=${builtins.getAttr name deps}/include"
-    "--shared-${name}-libpath=${builtins.getAttr name deps}/lib"
-  ];
-
-  inherit (stdenv.lib) concatMap optional optionals maintainers licenses platforms;
-in stdenv.mkDerivation {
-  name = "nodejs-${version}";
-
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
     sha256 = "14ayv5rgagc6lj7fil0bdbzwj2qxj5picw802rfmmpj9kqdb0hgg";
   };
-
-  configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];
-  dontDisableStatic = true;
-  prePatch = ''
-    patchShebangs .
-    sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
-  '';
-
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
-
-  buildInputs = [ python which zlib libuv openssl python ]
-    ++ optionals stdenv.isLinux [ utillinux http-parser ]
-    ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ];
-  setupHook = ./setup-hook.sh;
-
-  enableParallelBuilding = true;
-
-  passthru.interpreterName = "nodejs";
-
-  meta = {
-    description = "Event-driven I/O framework for the V8 JavaScript engine";
-    homepage = http://nodejs.org;
-    license = licenses.mit;
-    maintainers = [ maintainers.goibhniu maintainers.havvy ];
-    platforms = platforms.linux ++ platforms.darwin;
-  };
-}
+})
diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix
new file mode 100644
index 00000000000..ffb25f0ed59
--- /dev/null
+++ b/pkgs/development/web/nodejs/v6.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
+, pkgconfig, runCommand, which, libtool
+, callPackage
+}@args:
+
+import ./nodejs.nix (args // rec {
+  version = "6.0.0";
+  src = fetchurl {
+    url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.gz";
+    sha256 = "0cpw7ng193jgfbw2g1fd0kcglmjjkbj4xb89g00z8zz0lj0nvdbd";
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index adfd300d3fa..c531a0cf453 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2170,17 +2170,21 @@ in
 
   ninka = callPackage ../development/tools/misc/ninka { };
 
-  nodejs-5_x = callPackage ../development/web/nodejs/v5.nix {
+  nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix {
     libtool = darwin.cctools;
+    inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices Carbon Foundation;
   };
 
   nodejs-4_x = callPackage ../development/web/nodejs/v4.nix {
     libtool = darwin.cctools;
   };
 
-  nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix {
+  nodejs-5_x = callPackage ../development/web/nodejs/v5.nix {
+    libtool = darwin.cctools;
+  };
+
+  nodejs-6_x = callPackage ../development/web/nodejs/v6.nix {
     libtool = darwin.cctools;
-    inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices Carbon Foundation;
   };
 
   nodejs = if stdenv.system == "armv5tel-linux" then

From 69d5f27a138ce571df3088ce00dd4a2abee2b3da Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Mon, 2 May 2016 10:46:37 +0200
Subject: [PATCH 536/712] popcorntime: 0.3.8 -> 0.4.0-2 (#15154)

---
 pkgs/applications/video/popcorntime/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/video/popcorntime/default.nix b/pkgs/applications/video/popcorntime/default.nix
index f2bc3e70161..63c5f0460f2 100644
--- a/pkgs/applications/video/popcorntime/default.nix
+++ b/pkgs/applications/video/popcorntime/default.nix
@@ -1,24 +1,25 @@
 { lib, stdenv, fetchurl, makeWrapper, nwjs, zip }:
 
 let
-  arch = if stdenv.system == "x86_64-linux" then "64"
-    else if stdenv.system == "i686-linux"   then "32" 
+  arch = if stdenv.system == "x86_64-linux" then "l64"
+    else if stdenv.system == "i686-linux"   then "l32" 
     else throw "Unsupported system ${stdenv.system}";
 
 in stdenv.mkDerivation rec {
   name = "popcorntime-${version}";
-  version = "0.3.9";
+  version = "0.4.0";
+  build = "2";
 
   src = fetchurl {
-    url = "http://get.popcorntime.sh/build/Popcorn-Time-${version}-Linux-${arch}.tar.xz";
+    url = "http://popcorntime.ag/download.php?file=popcorn-time-community-v${version}-${build}-${arch}.tar.xz";
     sha256 =
-      if arch == "64"
-      then "0qaqdz45frgiy440jyz6hikhklx2yp08qp94z82r03dkbf4a2hvx"
-      else "0y08a42pm681s97lkczdq5dblxl2jbr850hnl85hknl3ynag9kq4";
+      if arch == "l64"
+      then "0a68d0a81d8e97c94afa0c75209056ee4b8486f400854c952bd3ad7251bd80c9"
+      else "b311c312a29d408a7c661a271d1f3a8fc83865d8a204cf026ee87e9ac173874d";
   };
 
   dontPatchELF = true;
-  sourceRoot   = "linux${arch}";
+  sourceRoot = ".";
   buildInputs  = [ zip makeWrapper ];
 
   buildPhase = ''

From 3829bcf8663b540d5e5ae69e04b196d291dc091b Mon Sep 17 00:00:00 2001
From: Stefan Junker <steveeJ@users.noreply.github.com>
Date: Mon, 2 May 2016 11:09:04 +0200
Subject: [PATCH 537/712] vim-go: 2016-04-15 -> 2016-05-01 (#15157)

---
 pkgs/misc/vim-plugins/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 0d754294cec..e30073339fd 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -453,12 +453,12 @@ rec {
 
   };
 
-  vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2016-04-15";
+  vim-go = buildVimPluginFrom2Nix {
+    name = "vim-go-2016-05-01";
     src = fetchgit {
       url = "git://github.com/fatih/vim-go";
-      rev = "b3fddb60fdab980d1fc339fbcbc879abd6cbf524";
-      sha256 = "1ggjisbc187kyzdizqffkicjdkz67mhgpxmqjcvzaq2wc2w44aja";
+      rev = "91ffc410832d0b027f2258c7a91dbbfa378bf71a";
+      sha256 = "00793ick6vralihvmmx8np7japxrd3jkbn5ggqzq0ymgr508gxj4";
     };
     dependencies = [];
 

From fecb56fc3febd6e2bab58f6701f044296cf4835e Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 2 May 2016 07:06:36 +0200
Subject: [PATCH 538/712] linuxPackages_grsec_4_5: init at
 3.1-4.5.2-201604290633

---
 .../linux/kernel/grsecurity-path-4.5.patch    | 14 ++++++++++++++
 .../linux/kernel/linux-grsecurity-4.5.nix     | 19 +++++++++++++++++++
 pkgs/os-specific/linux/kernel/patches.nix     | 15 ++++++++++++++-
 pkgs/top-level/all-packages.nix               | 17 +++++++++++++++++
 4 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/kernel/grsecurity-path-4.5.patch
 create mode 100644 pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix

diff --git a/pkgs/os-specific/linux/kernel/grsecurity-path-4.5.patch b/pkgs/os-specific/linux/kernel/grsecurity-path-4.5.patch
new file mode 100644
index 00000000000..e0430a69c95
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/grsecurity-path-4.5.patch
@@ -0,0 +1,14 @@
+diff -ru a/kernel/kmod.c b/kernel/kmod.c
+--- a/kernel/kmod.c	2016-04-21 17:06:09.882281660 +0200
++++ b/kernel/kmod.c	2016-04-21 17:08:17.458949309 +0200
+@@ -294,7 +294,9 @@
+ 	     strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
+ 	     strncmp(sub_info->path, "/usr/libexec/", 13) && strncmp(sub_info->path, "/usr/bin/", 9) &&
+ 	     strncmp(sub_info->path, "/usr/sbin/", 10) && strcmp(sub_info->path, "/bin/false") && 
+-	     strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
++	     strcmp(sub_info->path, "/usr/share/apport/apport") &&
++       strncmp(sub_info->path, "/nix/store/", 11) &&
++       strncmp(sub_info->path, "/run/current-system/systemd/lib/", 32)) || strstr(sub_info->path, "..")) {
+ 		printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of permitted system paths\n", sub_info->path);
+ 		retval = -EPERM;
+ 		goto out;
diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix
new file mode 100644
index 00000000000..267d0d58de4
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity-4.5.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "4.5.2";
+  extraMeta.branch = "4.5";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
+    sha256 = "17r063zx880ka3ayv9cf1yjfilvxlifhja1rhw5z3w35hgdkj8z3";
+  };
+
+  kernelPatches = args.kernelPatches;
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.canDisableNetfilterConntrackHelpers = true;
+  features.netfilterRPFilter = true;
+} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 707ebb544bf..e84941091cd 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -112,7 +112,15 @@ rec {
       sha256    = "04k4nhshl6r5n41ha5620s7cd70dmmmvyf9mnn5359jr1720kxpf";
     };
 
-  grsecurity_latest = grsecurity_4_4;
+  grsecurity_4_5 = grsecPatch
+    { kernel    = pkgs.grsecurity_base_linux_4_5;
+      patches   = [ grsecurity_fix_path_4_5 ];
+      kversion  = "4.5.2";
+      revision  = "201604290633";
+      sha256    = "0qrs4fk6lyqngq3fnsmrv0y3yp1lrbiwadfc6v7hy4lyv77wz107";
+    };
+
+  grsecurity_latest = grsecurity_4_5;
 
   grsecurity_fix_path_3_14 =
     { name = "grsecurity-fix-path-3.14";
@@ -124,6 +132,11 @@ rec {
       patch = ./grsecurity-path-4.4.patch;
     };
 
+  grsecurity_fix_path_4_5 =
+    { name = "grsecurity-fix-path-4.5";
+      patch = ./grsecurity-path-4.5.patch;
+    };
+
   crc_regression =
     { name = "crc-backport-regression";
       patch = ./crc-regression.patch;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cea479e2adf..5d93c4fa2a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10655,6 +10655,15 @@ in
       ];
   };
 
+  grsecurity_base_linux_4_5 = callPackage ../os-specific/linux/kernel/linux-grsecurity-4.5.nix {
+    kernelPatches = [ kernelPatches.bridge_stp_helper ]
+      ++ lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
   grFlavors = import ../build-support/grsecurity/flavors.nix;
 
   mkGrsecurity = patch: opts:
@@ -10679,6 +10688,10 @@ in
   linux_grsec_server_4_4     = self.grKernel kernelPatches.grsecurity_4_4 self.grFlavors.server;
   linux_grsec_server_xen_4_4 = self.grKernel kernelPatches.grsecurity_4_4 self.grFlavors.server_xen;
 
+  linux_grsec_desktop_4_5    = self.grKernel kernelPatches.grsecurity_4_5 self.grFlavors.desktop;
+  linux_grsec_server_4_5     = self.grKernel kernelPatches.grsecurity_4_5 self.grFlavors.server;
+  linux_grsec_server_xen_4_5 = self.grKernel kernelPatches.grsecurity_4_5 self.grFlavors.server_xen;
+
   linux_grsec_desktop_latest    = self.grKernel kernelPatches.grsecurity_latest self.grFlavors.desktop;
   linux_grsec_server_latest     = self.grKernel kernelPatches.grsecurity_latest self.grFlavors.server;
   linux_grsec_server_xen_latest = self.grKernel kernelPatches.grsecurity_latest self.grFlavors.server_xen;
@@ -10850,6 +10863,10 @@ in
   linuxPackages_grsec_server_4_4     = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.server;
   linuxPackages_grsec_server_xen_4_4 = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.server_xen;
 
+  linuxPackages_grsec_desktop_4_5    = self.grPackage kernelPatches.grsecurity_4_5 self.grFlavors.desktop;
+  linuxPackages_grsec_server_4_5     = self.grPackage kernelPatches.grsecurity_4_5 self.grFlavors.server;
+  linuxPackages_grsec_server_xen_4_5 = self.grPackage kernelPatches.grsecurity_4_5 self.grFlavors.server_xen;
+
   linuxPackages_grsec_desktop_latest    = self.grPackage kernelPatches.grsecurity_latest self.grFlavors.desktop;
   linuxPackages_grsec_server_latest     = self.grPackage kernelPatches.grsecurity_latest self.grFlavors.server;
   linuxPackages_grsec_server_xen_latest = self.grPackage kernelPatches.grsecurity_latest self.grFlavors.server_xen;

From 7893cb1aeaa1f561d32b2bb16f0ee025a50ad484 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 2 May 2016 07:13:50 +0200
Subject: [PATCH 539/712] linuxPackages_grsec_4_1: delete

Upstream supports 3.14, 4.4, and 4.5
---
 .../linux/kernel/linux-grsecurity-4.1.nix     | 19 -------------------
 pkgs/os-specific/linux/kernel/patches.nix     |  8 --------
 pkgs/top-level/all-packages.nix               | 17 -----------------
 3 files changed, 44 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-grsecurity-4.1.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity-4.1.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity-4.1.nix
deleted file mode 100644
index 4359f4586c5..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity-4.1.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
-
-import ./generic.nix (args // rec {
-  version = "4.1.7";
-  extraMeta.branch = "4.1";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0g1dnvak0pd03d4miy1025bw64wq71w29a058dzspdr6jcf9qwbn";
-  };
-
-  kernelPatches = args.kernelPatches;
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.canDisableNetfilterConntrackHelpers = true;
-  features.netfilterRPFilter = true;
-} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index e84941091cd..14b0692dbad 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -96,14 +96,6 @@ rec {
       sha256    = "1sp1gwa7ahzflq7ayb51bg52abrn5zx1hb3pff3axpjqq7vfai6f";
     };
 
-  grsecurity_4_1 = grsecPatch
-    { kernel    = pkgs.grsecurity_base_linux_4_1;
-      patches   = [ grsecurity_fix_path_3_14 ];
-      kversion  = "4.1.7";
-      revision  = "201509201149";
-      sha256    = "1agv8c3c4vmh5algbzmrq2f6vwk72rikrlcbm4h7jbrb9js6fxk4";
-    };
-
   grsecurity_4_4 = grsecPatch
     { kernel    = pkgs.grsecurity_base_linux_4_4;
       patches   = [ grsecurity_fix_path_4_4 ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d93c4fa2a4..51ff7bcc935 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10637,15 +10637,6 @@ in
       ];
   };
 
-  grsecurity_base_linux_4_1 = callPackage ../os-specific/linux/kernel/linux-grsecurity-4.1.nix {
-    kernelPatches = [ kernelPatches.bridge_stp_helper ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
-  };
-
   grsecurity_base_linux_4_4 = callPackage ../os-specific/linux/kernel/linux-grsecurity-4.4.nix {
     kernelPatches = [ kernelPatches.bridge_stp_helper ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
@@ -10680,10 +10671,6 @@ in
   linux_grsec_server_3_14     = self.grKernel kernelPatches.grsecurity_3_14 self.grFlavors.server;
   linux_grsec_server_xen_3_14 = self.grKernel kernelPatches.grsecurity_3_14 self.grFlavors.server_xen;
 
-  linux_grsec_desktop_4_1    = self.grKernel kernelPatches.grsecurity_4_1 self.grFlavors.desktop;
-  linux_grsec_server_4_1     = self.grKernel kernelPatches.grsecurity_4_1 self.grFlavors.server;
-  linux_grsec_server_xen_4_1 = self.grKernel kernelPatches.grsecurity_4_1 self.grFlavors.server_xen;
-
   linux_grsec_desktop_4_4    = self.grKernel kernelPatches.grsecurity_4_4 self.grFlavors.desktop;
   linux_grsec_server_4_4     = self.grKernel kernelPatches.grsecurity_4_4 self.grFlavors.server;
   linux_grsec_server_xen_4_4 = self.grKernel kernelPatches.grsecurity_4_4 self.grFlavors.server_xen;
@@ -10855,10 +10842,6 @@ in
   linuxPackages_grsec_server_3_14     = self.grPackage kernelPatches.grsecurity_3_14 self.grFlavors.server;
   linuxPackages_grsec_server_xen_3_14 = self.grPackage kernelPatches.grsecurity_3_14 self.grFlavors.server_xen;
 
-  linuxPackages_grsec_desktop_4_1    = self.grPackage kernelPatches.grsecurity_4_1 self.grFlavors.desktop;
-  linuxPackages_grsec_server_4_1     = self.grPackage kernelPatches.grsecurity_4_1 self.grFlavors.server;
-  linuxPackages_grsec_server_xen_4_1 = self.grPackage kernelPatches.grsecurity_4_1 self.grFlavors.server_xen;
-
   linuxPackages_grsec_desktop_4_4    = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.desktop;
   linuxPackages_grsec_server_4_4     = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.server;
   linuxPackages_grsec_server_xen_4_4 = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.server_xen;

From a69501a936a6434fbe88fb6a0423dd425563c163 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 2 May 2016 07:27:29 +0200
Subject: [PATCH 540/712] grsecurity: ensure that PaX ELF markings are enabled

The upstream default is to enable only xattr markings, breaking the
paxmarks facility.
---
 pkgs/build-support/grsecurity/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix
index 6c2e98b9cc1..0addb1d3d45 100644
--- a/pkgs/build-support/grsecurity/default.nix
+++ b/pkgs/build-support/grsecurity/default.nix
@@ -90,6 +90,10 @@ let
         GRKERNSEC y
         ${grsecMainConfig}
 
+        # The paxmarks mechanism relies on ELF header markings, but the default
+        # grsecurity configuration only enables xattr markings
+        PAX_PT_PAX_FLAGS y
+
         ${if cfg.config.restrictProc then
             "GRKERNSEC_PROC_USER y"
           else

From 39db90eaf60999db2ffd13668b4619a2d57f76ad Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 2 May 2016 07:35:19 +0200
Subject: [PATCH 541/712] grsecurity: simplify preConfigure

---
 pkgs/build-support/grsecurity/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix
index 0addb1d3d45..0ba27036667 100644
--- a/pkgs/build-support/grsecurity/default.nix
+++ b/pkgs/build-support/grsecurity/default.nix
@@ -121,8 +121,7 @@ let
       # additional build inputs for gcc plugins, required by some PaX/grsec features
       nativeBuildInputs = args.nativeBuildInputs ++ (with pkgs; [ gmp libmpc mpfr ]);
 
-      preConfigure = args.preConfigure or "" + ''
-        rm localversion-grsec
+      preConfigure = (args.preConfigure or "") + ''
         echo ${localver grkern} > localversion-grsec
       '';
     };

From 60a27781d6d358e0c5cd144c7c90642761c1a31f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 2 May 2016 07:30:44 +0200
Subject: [PATCH 542/712] grsecurity module: fix grsec-lock unit ordering

Requirement without ordering implies parallel execution; it is crucial
that sysctl tunables are finalized before the lock is engaged, however.
---
 nixos/modules/security/grsecurity.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index 236206026c3..11668162808 100644
--- a/nixos/modules/security/grsecurity.nix
+++ b/nixos/modules/security/grsecurity.nix
@@ -234,7 +234,8 @@ in
 
     systemd.services.grsec-lock = mkIf cfg.config.sysctl {
       description     = "grsecurity sysctl-lock Service";
-      requires        = [ "systemd-sysctl.service" ];
+      wants           = [ "systemd-sysctl.service" ];
+      after           = [ "systemd-sysctl.service" ];
       wantedBy        = [ "multi-user.target" ];
       serviceConfig.Type = "oneshot";
       serviceConfig.RemainAfterExit = "yes";

From a7886c9189ec81ae37f753760e429649ef8ff741 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@users.noreply.github.com>
Date: Mon, 2 May 2016 11:57:17 +0200
Subject: [PATCH 543/712] bittorrentSync20: 2.3.3 -> 2.3.6 (#15147)

Note that this changes the domain from getsyncapp.com (no longer valid)
to getsync.com.
---
 .../networking/bittorrentsync/2.0.x.nix             | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/bittorrentsync/2.0.x.nix b/pkgs/applications/networking/bittorrentsync/2.0.x.nix
index 4f9c7ebf333..ee4d3a436a5 100644
--- a/pkgs/applications/networking/bittorrentsync/2.0.x.nix
+++ b/pkgs/applications/networking/bittorrentsync/2.0.x.nix
@@ -1,28 +1,27 @@
-{ stdenv, fetchurl, patchelf }:
+{ stdenv, fetchurl }:
 
 let
   arch = if stdenv.system == "x86_64-linux" then "x64"
     else if stdenv.system == "i686-linux" then "i386"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
-  sha256 = if stdenv.system == "x86_64-linux" then "0l6z2fyd7i3i3cr95gkihbf6fwa7mk1b2m1jpf2nq5ispg0qf74n"
-    else if stdenv.system == "i686-linux" then "06x8f75dh58saqrz2k2xgcilh27v0jmql4k4rs7g361aad9v3pnr"
+  sha256 = if stdenv.system == "x86_64-linux" then "01yrligi61gxcixh7z6gi427ga0sx97wnmkv08p9ykd4b90hvj7s"
+    else if stdenv.system == "i686-linux" then     "119dll7f4w7h8nrrafmrj1d0lddjzwg5l8hnf74xdjg6g7rhrmd7"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
   libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
 in
 stdenv.mkDerivation rec {
   name = "btsync-${version}";
-  version = "2.3.3";
+  version = "2.3.6";
 
   src  = fetchurl {
-    url  = "https://download-cdn.getsyncapp.com/${version}/linux-${arch}/BitTorrent-Sync_${arch}.tar.gz";
+    url  = "https://download-cdn.getsync.com/${version}/linux-${arch}/BitTorrent-Sync_${arch}.tar.gz";
     inherit sha256;
   };
 
   dontStrip   = true; # Don't strip, otherwise patching the rpaths breaks
   sourceRoot  = ".";
-  buildInputs = [ patchelf ];
 
   installPhase = ''
     mkdir -p "$out/bin/"
@@ -34,7 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Automatically sync files via secure, distributed technology";
-    homepage    = "http://www.bittorrent.com/sync";
+    homepage    = https://www.getsync.com/;
     license     = stdenv.lib.licenses.unfreeRedistributable;
     platforms   = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ iElectric thoughtpolice cwoac ];

From cf224573d6c10d8b0dd854c06ee34e3f494898af Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Mon, 2 May 2016 11:59:13 +0200
Subject: [PATCH 544/712] idea.pycharm: 5.0.3 -> 2016.1.2

---
 pkgs/applications/editors/idea/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index e93e5840b69..482cbc56bcf 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -233,25 +233,25 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "5.0.3";
-    build = "143.1559.1";
+    version = "2016.1.2";
+    build = "145.844";
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1xb3qxhl8ln488v0hmjqkzpyypm7wh941c7syi4cs7plbdp6w4c2";
+      sha256 = "1kxwjg5l2fzpn6hr0iir0dv1n5l02jl02aff9wrj95186wxivg3a";
     };
   };
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "5.0.3";
-    build = "143.1559.1";
+    version = "2016.1.2";
+    build = "145.844";
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1v2g9867nn3id1zfbg4zwj0c0z9d72rl9c1dz6vs2c4j0y4gy9xl";
+      sha256 = "1kwi9d80r2yp5ivbvslrj70iam966rv4a8diajbwpcc26m7rj3kk";
     };
   };
 

From 43e617b487a3b24fb8ba6d77af10bd304837f13a Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Mon, 2 May 2016 12:26:32 +0200
Subject: [PATCH 545/712] matchbox: update source urls + libmatchbox: 1.9 ->
 1.11 (#15160)

---
 pkgs/applications/window-managers/matchbox/default.nix | 5 +++--
 pkgs/development/libraries/libmatchbox/default.nix     | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix
index 08c1be9f963..0e88944bb69 100644
--- a/pkgs/applications/window-managers/matchbox/default.nix
+++ b/pkgs/applications/window-managers/matchbox/default.nix
@@ -1,12 +1,13 @@
 { stdenv, fetchurl, libmatchbox, pkgconfig}:
 
 stdenv.mkDerivation rec {
-  name = "matchbox-1.2";
+  name = "matchbox-${version}";
+  version = "1.2";
 
   buildInputs = [ libmatchbox pkgconfig ];
 
   src = fetchurl {
-    url = http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-1.2.tar.bz2;
+    url = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${version}/matchbox-window-manager-${version}.tar.bz2";
     sha256 = "1zyfq438b466ygcz78nvsmnsc5bhg4wcfnpxb43kbkwpyx53m8l1";
   };
 
diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix
index 38702817734..6cb7defb097 100644
--- a/pkgs/development/libraries/libmatchbox/default.nix
+++ b/pkgs/development/libraries/libmatchbox/default.nix
@@ -1,14 +1,15 @@
 { stdenv, fetchurl, libX11, libXext, libpng, libXft, libICE, pango, libjpeg}:
 
 stdenv.mkDerivation rec {
-  name = "libmatchbox-1.9";
+  name = "libmatchbox-${version}";
+  version = "1.11";
 
   buildInputs = [ libXft libICE pango libjpeg ];
   propagatedBuildInputs = [ libX11 libXext libpng ];
 
   src = fetchurl {
-    url = http://matchbox-project.org/sources/libmatchbox/1.9/libmatchbox-1.9.tar.bz2;
-    sha256 = "006zdrgs7rgh7dvakjmqsp1q9karq6c5cz4gki2l15fhx0cf40fv";
+    url = "http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/${version}/libmatchbox-${version}.tar.bz2";
+    sha256 = "0lvv44s3bf96zvkysa4ansxj2ffgj3b5kgpliln538q4wd9ank15";
   };
 
   meta = {

From 6cff7111d0a1ceaff664b35e7ca97ae6179b67fb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 2 May 2016 13:53:32 +0200
Subject: [PATCH 546/712] geolite-legacy: 2016-04-29 -> 2016-05-02

---
 pkgs/data/misc/geolite-legacy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 9a07429d4e1..3792047aea1 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,7 +8,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "geolite-legacy-${version}";
-  version = "2016-04-29";
+  version = "2016-05-02";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
     "1sr2yapsfmdpl4zpf8i5rl3k65dgbq7bb1615g6wf60yw9ngh76x";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "1b7w8sdazxq5sv3nz1s28420374vf4wn6h2zasbg68kc2cxwdh2w";
+    "04gyrb5qyy3i1p9lgnls90irq3s64y5qfcqj91nx4x68r7dixnai";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "1iy6myanmx8h4ha493bz80q6wjwgjlbk7cmliyw1806dd7fhqvwi";
+    "1l9j97bk3mbv5b6lxva6ig590gl7097xr0vayz5mpsfx5d37r4zw";
 
   meta = with stdenv.lib; {
     description = "GeoLite Legacy IP geolocation databases";

From 8a1ccb5f7093702afd6ed135539222683bc4d09d Mon Sep 17 00:00:00 2001
From: Kovacsics Robert <KoviRobi@users.noreply.github.com>
Date: Mon, 2 May 2016 15:09:06 +0100
Subject: [PATCH 547/712] plover: 2.5.8 -> 3.0.0 (#15140)

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9228ca8feca..c85b1ca2508 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12579,22 +12579,21 @@ in modules // {
 
   plover = buildPythonPackage rec {
     name = "plover-${version}";
-    version = "2.5.8";
+    version = "3.0.0";
     disabled = !isPy27;
 
     meta = {
       description = "OpenSteno Plover stenography software";
-      maintainers = [ maintainers.twey ];
+      maintainers = with maintainers; [ twey kovirobi ];
       license = licenses.gpl2;
     };
 
     src = pkgs.fetchurl {
       url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz";
-      sha256 = "23f7824a715f93eb2c41d5bafd0c6f3adda92998e9321e1ee029abe7a6ab41e5";
+      sha256 = "1jja37nhiypdx1z6cazp8ffsf0z3yqmpdbprpdzf668lcb422rl0";
     };
 
-    propagatedBuildInputs = with self; [ wxPython pyserial xlib appdirs pkgs.wmctrl ];
-    preConfigure = "substituteInPlace setup.py --replace /usr/share usr/share";
+    propagatedBuildInputs = with self; [ wxPython30 pyserial hidapi xlib appdirs pkgs.wmctrl mock ];
   };
 
   pygal = buildPythonPackage rec {

From e8c6b47ee36202e069252807ff14232e3316df60 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 2 May 2016 15:18:22 +0200
Subject: [PATCH 548/712] yodl: 3.07.01 -> 3.08.00

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

diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix
index 1efad2d1789..69270f8a518 100644
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/pkgs/development/tools/misc/yodl/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "yodl-${version}";
-  version = "3.07.01";
+  version = "3.08.00";
 
   buildInputs = [ perl icmake ];
 
   src = fetchFromGitHub {
-    sha256 = "1l8igql4dw6jiv8gs4bpfxrdgr2za9a1l2k3paxsajhy6w3a9b3m";
+    sha256 = "107jhywx0xdyp7yll1c5zwngzjl3yvg1b4yan8wl2acnbrv6hwa4";
     rev = version;
     repo = "yodl";
     owner = "fbb-git";

From 199c998bcc7d5e64a9b8e30a964c2fac31e12848 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Sat, 16 Apr 2016 16:13:51 +0200
Subject: [PATCH 549/712] nsd: 4.1.7 -> 4.1.9

Features
========

* Fix #732: tcp-mss, outgoing-tcp-mss options for nsd.conf, patch from Daisuke Higashi.
* Fix #739: zonefile changes when mtime is small are detected on reload, if filesystem supports precision mtime values.
* RR type CSYNC (RFC7477) syntax is supported.

Bugfixes
========

* Change the nsd.db file version because of nanosecond precision fix.
* take advantage of arc4random_uniform if available, patch from Loganaden Velvindron.
* Fix flto check for OSX clang.
* Define _DEFAULT_SOURCE with _BSD_SOURCE for glibc 2.20 on Linux.
* Fix #736: segfault during zone transfer.
* Fix #744: Fix that NSD replies for configured but unloaded zone with SERVFAIL, not REFUSED.
---
 pkgs/servers/dns/nsd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index 646e50c78f9..48dd535382d 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -13,11 +13,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nsd-4.1.7";
+  name = "nsd-4.1.9";
 
   src = fetchurl {
     url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
-    sha256 = "12hskfgfbkvcgpa1xxkqd8lnc6xvln1amn97x6avfnj9kfrbxa3v";
+    sha256 = "1wn8jm5kpp81m88c77j97850mnmd87yaw8qp3xsdwcakcd6j44dq";
   };
 
   buildInputs = [ libevent openssl ];

From 2adcd6db807ab6ba5adca5acc86ea61a20b6bc13 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 2 May 2016 17:07:30 +0200
Subject: [PATCH 550/712] perlPackages.Pango: 1.226 -> 1.227

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 05ed6d87e4b..923ca77ea8a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9398,10 +9398,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Pango = buildPerlPackage rec {
-    name = "Pango-1.226";
+    name = "Pango-1.227";
     src = fetchurl {
       url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz";
-      sha256 = "0r4jx7d6gj6ixk2r5yr70biy1lpjxir08aywkw02g85wg6zkjw4z";
+      sha256 = "0wdcidnfnb6nm79fzfs39ivawj3x8m98a147fmcxgv1zvwia9c1l";
     };
     buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig pkgs.pango ];
     propagatedBuildInputs = [ Cairo Glib ];

From 3a0481d3c48c8b24307aff0ae671c9cce0f43543 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 2 May 2016 14:54:41 +0200
Subject: [PATCH 551/712] perlPackages.Glib: 1.320 -> 1.321

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 923ca77ea8a..c8ea7710d5a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5460,10 +5460,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Glib = buildPerlPackage rec {
-    name = "Glib-1.320";
+    name = "Glib-1.321";
     src = fetchurl {
       url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz";
-      sha256 = "15mrwscqjgwpkw9n4x6rakr9rjz2ss8d90k574fs5wx9cmgg3np3";
+      sha256 = "0h4cfxrxcf1mrdab5n5kk0smsi8vcrfnmcw1k6xw87r4vbifnxdr";
     };
     buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig pkgs.glib ];
     meta = {

From f03fdb0f56be4e9bcd203be0315fd54ad50de330 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 2 May 2016 15:12:38 +0200
Subject: [PATCH 552/712] perlPackages.Gtk2: 1.2497 -> 1.2498

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c8ea7710d5a..08b6ccd49d7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5570,10 +5570,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Gtk2 = buildPerlPackage rec {
-    name = "Gtk2-1.2497";
+    name = "Gtk2-1.2498";
     src = fetchurl {
       url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz";
-      sha256 = "0j5wm290ihpkx91gbk55qrrb0jhbh5fanbj5fjvs0d2xv6yyh921";
+      sha256 = "0gs6lr4clz86838s3klrl37lf48j24zv0p37jlsvsnr927whpq3j";
     };
     buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Pango pkgs.gtk2 ];
     meta = {

From 1a350e6b583786c5d45b9d2a2987b82e3c5e08e2 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 2 May 2016 17:18:07 +0200
Subject: [PATCH 553/712] beets: patch ffmpeg invocation in convert plugin

The default convert configuration invokes ffmpeg, so this patches in the
right storepath. Since it patches the shlex split, even user config will
use the correct path. kudos @aszlig.
---
 pkgs/tools/audio/beets/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 0079270e29f..806cb07c610 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -4,6 +4,7 @@
 , enableAcousticbrainz ? true
 , enableAcoustid       ? true
 , enableBadfiles       ? true, flac ? null, mp3val ? null
+, enableConvert        ? true, ffmpeg ? null
 , enableDiscogs        ? true
 , enableEchonest       ? true
 , enableEmbyupdate     ? true
@@ -22,6 +23,7 @@
 
 assert enableAcoustid    -> pythonPackages.pyacoustid     != null;
 assert enableBadfiles    -> flac != null && mp3val != null;
+assert enableConvert     -> ffmpeg != null;
 assert enableDiscogs     -> pythonPackages.discogs_client != null;
 assert enableEchonest    -> pythonPackages.pyechonest     != null;
 assert enableFetchart    -> pythonPackages.responses      != null;
@@ -38,6 +40,7 @@ let
     acousticbrainz = enableAcousticbrainz;
     badfiles = enableBadfiles;
     chroma = enableAcoustid;
+    convert = enableConvert;
     discogs = enableDiscogs;
     echonest = enableEchonest;
     embyupdate = enableEmbyupdate;
@@ -52,7 +55,7 @@ let
   };
 
   pluginsWithoutDeps = [
-    "bench" "bpd" "bpm" "bucket" "convert" "cue" "duplicates" "edit" "embedart"
+    "bench" "bpd" "bpm" "bucket" "cue" "duplicates" "edit" "embedart"
     "filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "ihate"
     "importadded" "importfeeds" "info" "inline" "ipfs" "keyfinder" "lyrics"
     "mbcollection" "mbsubmit" "mbsync" "metasync" "missing" "permissions" "play"
@@ -96,6 +99,7 @@ in buildPythonApplication rec {
               || enableEmbyupdate
               || enableAcousticbrainz)
                                    pythonPackages.requests2
+    ++ optional enableConvert      ffmpeg
     ++ optional enableDiscogs      pythonPackages.discogs_client
     ++ optional enableEchonest     pythonPackages.pyechonest
     ++ optional enableLastfm       pythonPackages.pylast
@@ -131,6 +135,8 @@ in buildPythonApplication rec {
       s,"flac","${flac.bin}/bin/flac",
       s,"mp3val","${mp3val}/bin/mp3val",
     }' beetsplug/badfiles.py
+  '' + optionalString enableConvert ''
+    sed -i -e 's,\(util\.command_output(\)\([^)]\+\)),\1[b"${ffmpeg.bin}/bin/ffmpeg" if args[0] == b"ffmpeg" else args[0]] + \2[1:]),' beetsplug/convert.py 
   '' + optionalString enableReplaygain ''
     sed -i -re '
       s!^( *cmd *= *b?['\'''"])(bs1770gain['\'''"])!\1${bs1770gain}/bin/\2!

From edb0b7e36f3ac40a17b7421db81206a51af03347 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 2 May 2016 14:19:37 -0400
Subject: [PATCH 554/712] krb5: 1.14 -> 1.14.2 (security updates)

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

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 5b2b0954203..332ca526b6b 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -11,11 +11,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "${type}krb5-${version}";
-  version = "1.14";
+  version = "1.14.2";
 
   src = fetchurl {
     url = "${meta.homepage}dist/krb5/1.14/krb5-${version}.tar.gz";
-    sha256 = "1sgr61cnkgc5xazijaww6wpn5fnxl9vyj9ixk3r3y7ikv3x0gnyf";
+    sha256 = "09wbv969ak4fqlqr1ip5bi62fny1zlp1vwjarvj6a6cdfzkdgjkb";
   };
 
   configureFlags = optional stdenv.isFreeBSD ''WARN_CFLAGS=""'';

From 014d853f8cfe34a51ec5641691fcb97bf7c6d9a9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 2 May 2016 13:54:47 -0500
Subject: [PATCH 555/712] julia: remove ttuegel from maintainers

ttuegel has not used julia in some time.
---
 pkgs/development/compilers/julia/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 9886dc4d52a..9e90ecfbe21 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -159,7 +159,7 @@ stdenv.mkDerivation rec {
     description = "High-level performance-oriented dynamical language for technical computing";
     homepage = "http://julialang.org/";
     license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ raskin ttuegel ];
+    maintainers = with stdenv.lib.maintainers; [ raskin ];
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
   };
 }

From bdf7f03c4b007f0810961fda371e5df059de64d8 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 2 May 2016 21:04:07 +0200
Subject: [PATCH 556/712] MMA: init at 15.12

---
 pkgs/applications/audio/MMA/default.nix | 68 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  4 +-
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/audio/MMA/default.nix

diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix
new file mode 100644
index 00000000000..224ae9f6f6f
--- /dev/null
+++ b/pkgs/applications/audio/MMA/default.nix
@@ -0,0 +1,68 @@
+{ stdenv, fetchurl, makeWrapper, python, alsaUtils, timidity }:
+
+  stdenv.mkDerivation rec {
+  version = "15.12";
+  name = "mma-${version}";
+
+  src = fetchurl {
+    url = "http://www.mellowood.ca/mma/mma-bin-${version}.tar.gz";
+    sha256 = "0k37kcrfaxmwjb8xb1cbqinrkx3g50dbvwqbvwl3l762j4vr8jgx";
+  };
+
+  buildInputs = [ makeWrapper python alsaUtils timidity ];
+
+  patchPhase = ''
+    sed -i 's@/usr/bin/aplaymidi@/${alsaUtils}/bin/aplaymidi@g' mma-splitrec
+    sed -i 's@/usr/bin/aplaymidi@/${alsaUtils}/bin/aplaymidi@g' util/mma-splitrec.py
+    sed -i 's@/usr/bin/arecord@/${alsaUtils}/bin/arecord@g' mma-splitrec
+    sed -i 's@/usr/bin/arecord@/${alsaUtils}/bin/arecord@g' util/mma-splitrec.py
+    sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' mma-splitrec
+    sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' util/mma-splitrec.py
+    find . -type f | xargs sed -i 's@/usr/bin/env python@${python}/bin/python@g'
+  '';
+
+  installPhase = ''
+    mkdir -p $out/{bin,share/mma,share/man/man1,share/man/man8}
+    mkdir -p $out/etc
+
+    cp mma.py $out/bin/mma
+    cp mma-gb $out/bin/mma-gb
+    cp mma-libdoc $out/bin/mma-libdoc
+    cp mma-renum $out/bin/mma-renum
+    cp mma-splitrec $out/bin/mma-splitrec
+    cp util/mma-mnx.py $out/bin/mma-mnx
+    cp util/mma-rm2std.py $out/bin/mma-rm2std
+    cp util/mmatabs.py $out/bin/mmatabs
+    cp util/mup2mma.py $out/bin/mup2mma
+    cp util/pg2mma.py $out/bin/pg2mma
+    cp util/synthsplit.py $out/bin/mma-synthsplit
+    cp -r {docs,egs,includes,lib,MMA,text} $out/share/mma
+    rmdir $out/share/mma/includes/aria
+
+    cp util/README.* $out/share/mma/docs
+    mv $out/share/mma/docs/man/mma-libdoc.8 $out/share/man/man8
+    mv $out/share/mma/docs/man/mma-renum.1 $out/share/man/man1
+    mv $out/share/mma/docs/man/mma.1 $out/share/man/man1
+    mv $out/share/mma/docs/man/mma-gb.1 $out/share/man/man1
+    rm -rf $out/share/mma/docs/man
+    find $out -type f | xargs sed -i "s@/usr/share/mma@$out/share/mma@g"
+  '';
+
+  preFixup = ''
+    PYTHONPATH=$out/share/mma/:$PYTHONPATH
+    for f in $out/bin/*; do
+          wrapProgram $f \
+           --prefix PYTHONPATH : $PYTHONPATH
+    done
+    cd $out/share/mma/
+    $out/bin/mma -G
+  '';
+
+  meta = {
+    description = "Creates MIDI tracks for a soloist to perform over from a user supplied file containing chords";
+    homepage =  http://www.mellowood.ca/mma/index.html;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4126d518076..35902c65042 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10003,7 +10003,7 @@ in
   };
 
   rake = callPackage ../development/tools/build-managers/rake { };
-  
+
   redis = callPackage ../servers/nosql/redis { };
 
   redstore = callPackage ../servers/http/redstore { };
@@ -13213,6 +13213,8 @@ in
 
   mldonkey = callPackage ../applications/networking/p2p/mldonkey { };
 
+  MMA = callPackage ../applications/audio/MMA { };
+
   mmex = callPackage ../applications/office/mmex { };
 
   moc = callPackage ../applications/audio/moc { };

From 6e353bb17f3ccd032d72c32a7b2e51fb86c80ccf Mon Sep 17 00:00:00 2001
From: Brad Ediger <brad.ediger@madriska.com>
Date: Mon, 2 May 2016 15:42:09 -0500
Subject: [PATCH 557/712] ruby: update 2.3 series to 2.3.1

---
 pkgs/development/interpreters/ruby/default.nix   | 9 ++++-----
 pkgs/development/interpreters/ruby/patchsets.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                  | 4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 2ff960f6fcc..8db9dd4eaf9 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -206,15 +206,14 @@ in {
     };
   };
 
-  ruby_2_3_0 = generic {
+  ruby_2_3_1 = generic {
     majorVersion = "2";
     minorVersion = "3";
-    teenyVersion = "0";
+    teenyVersion = "1";
     patchLevel = "0";
     sha256 = {
-      # src = "1ssq3c23ay57ypfis47y2n817hfmb71w0xrdzp57j6bv12jqmgrx";
-      src = "01z5cya4a7y751d4pb3aak5qcwmmvnwkbgz9z171p8hsbw7acnxs";
-      git = "0nl0pp96m0jxi422mqx09jqn9bff90pzz0xxa0ikrx7by0g00npg";
+      src = "1kbxg72las93w0y553cxv3lymy2wvij3i3pg1y9g8aq3na676z5q";
+      git = "0dv1rf5f9lj3icqs51bq7ljdcf17sdclmxm9hilwxps5l69v5q9r";
     };
   };
 }
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index ded72b8695e..0e81db4e047 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -54,9 +54,9 @@ rec {
     "${patchSet}/patches/ruby/2.2.3/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.2.3/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
-  "2.3.0" = ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.3.0/railsexpress/01-skip-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.3.0/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.3.0/railsexpress/03-display-more-detailed-stack-trace.patch"
+  "2.3.1" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4126d518076..1194651e0b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5593,7 +5593,7 @@ in
     ruby_2_0_0
     ruby_2_1_7
     ruby_2_2_3
-    ruby_2_3_0;
+    ruby_2_3_1;
 
   # Ruby aliases
   ruby = ruby_2_3;
@@ -5601,7 +5601,7 @@ in
   ruby_2_0 = ruby_2_0_0;
   ruby_2_1 = ruby_2_1_7;
   ruby_2_2 = ruby_2_2_3;
-  ruby_2_3 = ruby_2_3_0;
+  ruby_2_3 = ruby_2_3_1;
 
   scsh = callPackage ../development/interpreters/scsh { };
 

From 7ec30231410ae88b5bd1b3a7db9b4cf8c5733115 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@users.noreply.github.com>
Date: Mon, 2 May 2016 23:00:10 +0200
Subject: [PATCH 558/712] emby: 3.0.5932 -> 3.0.5934 (#15173)

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

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index d10d5490fe1..2f416fabe49 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "emby-${version}";
-  version = "3.0.5932";
+  version = "3.0.5934";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "1m6p52q2y0rd8m1488h1cgfq7m6y5njlln73n4lmi0knrmlq3w7r";
+    sha256 = "1yjplz7i0lwxjnmrra33xxsvza6gj4dblsl4rqjq1qv6i0jarfv1";
   };
 
   buildInputs = [ unzip ];

From 57d9fd8f651c6ea408e5d982bb6a2a7a59a991ce Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 2 May 2016 23:28:32 +0200
Subject: [PATCH 559/712] linuxband: init at 12.02.1

---
 pkgs/applications/audio/linuxband/default.nix | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/audio/linuxband/default.nix

diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix
new file mode 100644
index 00000000000..a3aa133960f
--- /dev/null
+++ b/pkgs/applications/audio/linuxband/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, makeWrapper, pkgconfig, MMA, libjack2, libsmf, python, pyGtkGlade, pygtksourceview }:
+
+stdenv.mkDerivation rec {
+  version = "12.02.1";
+  name = "linuxband-${version}";
+
+  src = fetchurl {
+    url = "http://linuxband.org/assets/sources/${name}.tar.gz";
+    sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n";
+  };
+
+  buildInputs = [ makeWrapper pkgconfig MMA libjack2 libsmf python pyGtkGlade pygtksourceview ];
+
+  patchPhase = ''
+    sed -i 's@/usr/@${MMA}/@g' src/main/config/linuxband.rc.in
+    cat src/main/config/linuxband.rc.in
+  '';
+
+  postFixup = ''
+    PYTHONPATH=$pyGtkGlade/share/:pygtksourceview/share/:$PYTHONPATH
+    for f in $out/bin/*; do
+      wrapProgram $f \
+      --prefix PYTHONPATH : $PYTHONPATH
+    done
+  '';
+
+  meta = {
+    description = "A GUI front-end for MMA: Type in the chords, choose the groove and it will play an accompaniment";
+    homepage = http://linuxband.org/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4126d518076..d137f6e67ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10003,7 +10003,7 @@ in
   };
 
   rake = callPackage ../development/tools/build-managers/rake { };
-  
+
   redis = callPackage ../servers/nosql/redis { };
 
   redstore = callPackage ../servers/http/redstore { };
@@ -13087,6 +13087,8 @@ in
     inherit (gnome) libglade;
   };
 
+  linuxband = callPackage ../applications/audio/linuxband { };
+
   ledger2 = callPackage ../applications/office/ledger/2.6.3.nix { };
   ledger3 = callPackage ../applications/office/ledger {
     boost = boost155;

From 5e0e2e669234e9f14b12c55387848faf9e8fe5a0 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Mon, 2 May 2016 23:09:06 +0100
Subject: [PATCH 560/712] mono: Update libX11 location

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

diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index 709f0f55788..54e76c731a1 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   # In fact I think this line does not help at all to what I
   # wanted to achieve: have mono to find libgdiplus automatically
-  configureFlags = "--x-includes=${libX11}/include --x-libraries=${libX11}/lib --with-libgdiplus=${libgdiplus}/lib/libgdiplus.so ${llvmOpts}";
+  configureFlags = "--x-includes=${libX11.dev}/include --x-libraries=${libX11.out}/lib --with-libgdiplus=${libgdiplus}/lib/libgdiplus.so ${llvmOpts}";
 
   # Attempt to fix this error when running "mcs --version":
   # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   # http://www.mono-project.com/Config_DllMap
   postBuild = ''
     find . -name 'config' -type f | while read i; do
-        sed -i "s@libX11.so.6@${libX11}/lib/libX11.so.6@g" $i
+        sed -i "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g" $i
         sed -i "s@/.*libgdiplus.so@${libgdiplus}/lib/libgdiplus.so@g" $i
     done
   '';

From 94520a25adc6b6bee799ec9dab344cfdad3f7180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 3 May 2016 00:26:01 +0200
Subject: [PATCH 561/712] Adding blktrace

Tool to get traces of operations in block devices on linux.
---
 pkgs/os-specific/linux/blktrace/default.nix | 23 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/os-specific/linux/blktrace/default.nix

diff --git a/pkgs/os-specific/linux/blktrace/default.nix b/pkgs/os-specific/linux/blktrace/default.nix
new file mode 100644
index 00000000000..3871630758c
--- /dev/null
+++ b/pkgs/os-specific/linux/blktrace/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, libaio }:
+
+stdenv.mkDerivation {
+  name = "blktrace-1.1.0";
+
+  # Official source
+  # "git://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git"
+  src = fetchurl {
+    url = "http://brick.kernel.dk/snaps/blktrace-1.1.0.tar.bz2";
+    sha256 = "15cj9aki7z5i5y6bnchqry6yp40r4lmgmam6ar5gslnx0smgm8jl";
+  };
+
+  buildInputs = [ libaio ];
+
+  preConfigure = ''
+    sed s,/usr/local,$out, -i Makefile
+  '';
+
+  meta = {
+    description = "Block layer IO tracing mechanism";
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35902c65042..3137b95b07a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10212,6 +10212,8 @@ in
 
   batctl = callPackage ../os-specific/linux/batman-adv/batctl.nix { };
 
+  blktrace = callPackage ../os-specific/linux/blktrace { };
+
   bluez4 = lowPrio (callPackage ../os-specific/linux/bluez {
     pygobject = pygobject3;
   });

From bc4465e23f1c63e8b1165fb1c3c59699bc62bc34 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 2 May 2016 14:06:08 +0200
Subject: [PATCH 562/712] pythonPackages.sqlparse: 0.1.16 -> 0.1.18

---
 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 c85b1ca2508..e664ab56703 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21100,14 +21100,14 @@ in modules // {
 
   sqlparse = buildPythonPackage rec {
     name = "sqlparse-${version}";
-    version = "0.1.16";
+    version = "0.1.18";
 
     # the source wasn't transformed with 2to3 yet
     doCheck = !isPy3k;
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/s/sqlparse/${name}.tar.gz";
-      sha256 = "108gy82x7davjrn3jqn7yv4r5v4jrzp892ysfx8l00abr8v6r337";
+      sha256 = "1kypl9l2nkzy3pmr89mvpfl65xk1m5y4aaghhandcxkgl329dc9r";
     };
 
     meta = {

From 6b6463dbd26397b932b473c076471fcb244d148e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 2 May 2016 17:31:07 +0200
Subject: [PATCH 563/712] dpkg: 1.18.4 -> 1.18.5

---
 pkgs/tools/package-management/dpkg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index ad351914cb3..bc07f3e536f 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "dpkg-${version}";
-  version = "1.18.4";
+  version = "1.18.5";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
-    sha256 = "1nh6y6xvnq6f4qd6y3dx9m77sxjg4qk1z1j5pwayg348d0w292gy";
+    sha256 = "01wb8qa4vv2dpd1gv5bm0qzgzb35wn5ij7daqd7b3977l5k6lkh7";
   };
 
   postPatch = ''

From d6c3407f7b4b9780418e60519a4a511aa562f46d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 2 May 2016 18:07:32 +0200
Subject: [PATCH 564/712] btrfs-progs: 4.5.1 -> 4.5.2

---
 pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index d0fda2da414..e88c0088ef3 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -2,14 +2,14 @@
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
 }:
 
-let version = "4.5.1"; in
+let version = "4.5.2"; in
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "1znf2zhb56zbmdjk3lq107678xwsqwc5gczspypmc5i31qnppy7f";
+    sha256 = "09qjz3idz8y3rlrb0sxshc1bnpmrr4v9lqg5aimp09i9ywa8kyxf";
   };
 
   buildInputs = [

From 69ef7566a8b4a63cdc4380da37ed9088a1298b60 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 3 May 2016 02:00:39 +0200
Subject: [PATCH 565/712] wireless-regdb: 2016-02-08 -> 2016-05-02

---
 pkgs/data/misc/wireless-regdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix
index 3c74123d605..37488c550d0 100644
--- a/pkgs/data/misc/wireless-regdb/default.nix
+++ b/pkgs/data/misc/wireless-regdb/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "wireless-regdb-${version}";
-  version = "2016-02-08";
+  version = "2016-05-02";
 
   src = fetchgit {
-    sha256 = "0cqnkkcni27ya6apy2ba4im7xj4nrhbcgrahlarvrzbbjkp740m9";
+    sha256 = "04vqhhqm307bx63ihmli751r15b5vrp3011rj1addlkya56wflby";
     url = https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git;
     rev = "refs/tags/master-${version}";
   };

From 84bf43a702026ec02355379490ef881a4ee75af5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 3 May 2016 00:17:45 +0000
Subject: [PATCH 566/712] openjdk: 8u76 -> 8u92

---
 pkgs/development/compilers/openjdk/8.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 7ba6b56a8f3..0eb427754b3 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -18,42 +18,42 @@ let
     else
       throw "openjdk requires i686-linux or x86_64 linux";
 
-  update = "76";
-  build = "00";
+  update = "92";
+  build = "14";
   baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
   repover = "jdk8u${update}-b${build}";
   paxflags = if stdenv.isi686 then "msp" else "m";
   jdk8 = fetchurl {
              url = "${baseurl}/archive/${repover}.tar.gz";
-             sha256 = "1bzwrm18vdd531xxin7pzsc5dx2ybkdgdxz6jp2ki19ka6pmk1l7";
+             sha256 = "05ly2v3b6vr3sxa27m7ahlp8w4w1q68rki2dfczrklcdq4l61g0r";
           };
   langtools = fetchurl {
              url = "${baseurl}/langtools/archive/${repover}.tar.gz";
-             sha256 = "044gyb7hgrahlr78vah9r3wfv6w569ihqzwqplwzr6m0l1s52994";
+             sha256 = "1zb7gvj1b1q3pvq5x7ac98k5dk83m7849ngcy1swfwj18g8i4k9p";
           };
   hotspot = fetchurl {
              url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
-             sha256 = "1if70s9wjsvmrdj92ky88ngpmigi9c5gfpkilpydzdibs38f05f8";
+             sha256 = "057qrhm9gbz672qgb85al9p3qvgvbviadppf5a9b8hp5sg322f35";
           };
   corba = fetchurl {
              url = "${baseurl}/corba/archive/${repover}.tar.gz";
-             sha256 = "0fl852x25cjzz3lrhjnhj59qbb4m3ywwc2f9vbj6mqdnpzl7cg83";
+             sha256 = "0s9h61jw42nbvrw24qaizp7pp063ala37sjgl547zfglhk1dlzi8";
           };
   jdk = fetchurl {
              url = "${baseurl}/jdk/archive/${repover}.tar.gz";
-             sha256 = "11ql3p5fsizrn1fiylfkgrw0lgf6snwyich18hggsmd00bhvv3ah";
+             sha256 = "0sgyjdmxsrdj8b8y2ri3c70x9l9m777v559cq8rmaz1jpc9lld4s";
           };
   jaxws = fetchurl {
              url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
-             sha256 = "1d2q4bbvlz557caqciwpd5ms9f14bjk8jl5zlfflqnww9b097qy4";
+             sha256 = "12aajlswn5nkm4nbrdh3jff2sz81wdczrgliwd5lnqfnh73sbbkp";
           };
   jaxp = fetchurl {
              url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
-             sha256 = "0nrd4c77ggxkyv2271k30afbjjcp0kybc8gcypmhy8by54w4ap0j";
+             sha256 = "133r5wicgva6mklrlnvb09p9izyw0fj281s51kndf3ba3zzggvv3";
           };
   nashorn = fetchurl {
              url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
-             sha256 = "11idvkzk4nqhhw4xq5pl03g4gwnaiq021xxj2yx54rixr59zl0q6";
+             sha256 = "1rmk868qg7kgv7f5lhj1b7wdnql0bj2bfqd2lg9ci64418j8x8bn";
           };
   openjdk8 = stdenv.mkDerivation {
     name = "openjdk-8u${update}b${build}";

From 8536d8b4ed935e48ec5d6b4b1f22b0ff2b79f6b8 Mon Sep 17 00:00:00 2001
From: obadz <github@obadz.com>
Date: Tue, 3 May 2016 01:39:46 +0100
Subject: [PATCH 567/712] tcpflow: 1.4.5 -> 1.4.6 (#15151)

Switch to fetchFromGitHub as website does not have latest version.
Default to not building against cairo to avoid dependencies on lots
of graphic libraries for a predominently command-line application.
---
 pkgs/tools/networking/tcpflow/default.nix | 80 ++++++++++++++++-------
 1 file changed, 56 insertions(+), 24 deletions(-)

diff --git a/pkgs/tools/networking/tcpflow/default.nix b/pkgs/tools/networking/tcpflow/default.nix
index 935251ba057..52727f1c49e 100644
--- a/pkgs/tools/networking/tcpflow/default.nix
+++ b/pkgs/tools/networking/tcpflow/default.nix
@@ -1,29 +1,61 @@
-{stdenv, fetchurl, openssl, zlib, libpcap, boost, cairo}:
-let
-  s = # Generated upstream information
-  rec {
-    baseName="tcpflow";
-    version="1.4.5";
-    name="${baseName}-${version}";
-    hash="0whcyykq710s84jyiaqp6rsr19prd0pr1g1pg74mif0ig51yv7zk";
-    url="http://www.digitalcorpora.org/downloads/tcpflow/tcpflow-1.4.5.tar.gz";
-    sha256="0whcyykq710s84jyiaqp6rsr19prd0pr1g1pg74mif0ig51yv7zk";
+{ stdenv, lib, fetchFromGitHub, openssl, zlib, libpcap, boost, cairo, automake, autoconf, useCairo ? false }:
+
+stdenv.mkDerivation rec {
+  baseName = "tcpflow";
+  version  = "1.4.6";
+  name     = "${baseName}-${version}";
+
+  src = fetchFromGitHub {
+    owner  = "simsong";
+    repo   = "tcpflow";
+    rev    = "017687365b8233d16260f4afd7572c8ad8873cf6";
+    sha256 = "002cqmn786sjysf59xnbb7lgr23nqqslb2gvy29q2xpnq6my9w38";
   };
-  buildInputs = [
-    openssl zlib libpcap boost cairo
-  ];
-in
-stdenv.mkDerivation {
-  inherit (s) name version;
-  inherit buildInputs;
-  src = fetchurl {
-    inherit (s) url sha256;
+
+  be13_api = fetchFromGitHub {
+    owner  = "simsong";
+    repo   = "be13_api";
+    rev    = "8f4f4b3fe0b4815babb3a6fb595eb9a6d07e8a2e";
+    sha256 = "1dlys702x3m8cr9kf4b9j8n28yh6knhwgqkm6a5yhh1grd8r3ksm";
   };
-  meta = {
-    inherit (s) version;
+
+  dfxml = fetchFromGitHub {
+    owner  = "simsong";
+    repo   = "dfxml";
+    rev    = "13a8cc22189a8336d16777f2897ada6ae2ee59de";
+    sha256 = "0wzhbkp4c8sp6wrk4ilz3skxp14scdnm3mw2xmxxrsifymzs2f5n";
+  };
+
+  httpparser = fetchFromGitHub {
+    owner  = "nodejs";
+    repo   = "http-parser";
+    rev    = "8d9e5db981b623fffc93657abacdc80270cbee58";
+    sha256 = "0x17wwhrc7b2ngiqy0clnzn1zz2gbcz5n9m29pcyrcplly782k52";
+  };
+
+  buildInputs = [ openssl zlib libpcap boost automake autoconf ] ++ lib.optional useCairo cairo;
+
+  postUnpack = ''
+    pushd tcpflow-*-src/src
+    cp -rv ${be13_api}/* be13_api/
+    cp -rv ${dfxml}/* dfxml/
+    cp -rv ${httpparser}/* http-parser/
+    chmod -R u+w dfxml
+    popd
+  '';
+
+  prePatch = ''
+    substituteInPlace ./bootstrap.sh \
+      --replace \ git 'echo git' \
+      --replace /bin/rm rm
+  '';
+
+  preConfigure = "bash ./bootstrap.sh";
+
+  meta = with stdenv.lib; {
     description = ''TCP stream extractor'';
-    license = stdenv.lib.licenses.gpl3 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license     = licenses.gpl3 ;
+    maintainers = with maintainers; [ raskin obadz ];
+    platforms   = platforms.linux;
   };
 }

From 21b667e066400ed91b40ffa00ce5b451a967f866 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 3 May 2016 02:42:41 +0200
Subject: [PATCH 568/712] rescuetime: 2.8.9.1170 -> 2.9.10.1255

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

diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index a5b90890df2..b74d2716f98 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -5,18 +5,18 @@ let
     if stdenv.system == "i686-linux" then fetchurl {
       name = "rescuetime-installer.deb";
       url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb";
-      sha256 = "15x3nvhxk4f0rga0i99c6lhaa1rwdi446kxnx1l4jprhbl788sx6";
+      sha256 = "1wi9ikwmc9jfilj8adad3rcb7rmmxkpkfcp2gkfxvdyw6n0mzcnf";
     } else fetchurl {
       name = "rescuetime-installer.deb";
       url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb";
-      sha256 = "0ibdlx8fdlmh81908d1syb7c5lf88pqp49fl7r43cj6bybpdx411";
+      sha256 = "074yivz7rz1ac1962dix0aahpyqvsrkizh32kk5hyw5az0vqpcjs";
     };
 
 in
 
 stdenv.mkDerivation {
   # https://www.rescuetime.com/updates/linux_release_notes.html
-  name = "rescuetime-2.8.9.1170";
+  name = "rescuetime-2.9.10.1255";
   inherit src;
   buildInputs = [ dpkg makeWrapper ];
   unpackPhase = ''

From 5d25d7d9876d34f843e5ab6b727e04551ae04ca7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 3 May 2016 03:01:45 +0200
Subject: [PATCH 569/712] rescuetime: use makeLibraryPath for LD_PRELOAD hack

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

diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index b74d2716f98..974c593d37c 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -24,7 +24,11 @@ stdenv.mkDerivation {
     dpkg-deb -x $src pkg
     sourceRoot=pkg
   '';
-  installPhase = ''
+  installPhase = let
+
+    lib = p: stdenv.lib.makeLibraryPath [ p ];
+
+  in ''
     mkdir -p $out/bin
     cp usr/bin/rescuetime $out/bin
 
@@ -33,7 +37,7 @@ stdenv.mkDerivation {
       $out/bin/rescuetime
 
     wrapProgram $out/bin/rescuetime \
-      --prefix LD_PRELOAD : ${qt4}/lib/libQtGui.so.4:${qt4}/lib/libQtCore.so.4:${libXtst}/lib/libXtst.so.6:${libXext}/lib/libXext.so.6:${libX11}/lib/libX11.so.6:${libXScrnSaver}/lib/libXss.so.1
+      --prefix LD_PRELOAD : ${lib qt4}/libQtGui.so.4:${lib qt4}/libQtCore.so.4:${lib libXtst}/libXtst.so.6:${lib libXext}/libXext.so.6:${lib libX11}/libX11.so.6:${lib libXScrnSaver}/libXss.so.1
   '';
   meta = with lib; {
     description = "Helps you understand your daily habits so you can focus and be more productive";

From 78c500a8d1f3dc8220c199d3357e0c0cac48db71 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 3 May 2016 03:29:34 +0200
Subject: [PATCH 570/712] perlPackages.PerlIO-eol: 0.14 -> 0.16

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 08b6ccd49d7..5f29264b29d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9637,11 +9637,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  PerlIOeol = buildPerlPackage {
-    name = "PerlIO-eol-0.14";
+  PerlIOeol = buildPerlPackage rec {
+    name = "PerlIO-eol-0.16";
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AU/AUDREYT/PerlIO-eol-0.14.tar.gz;
-      sha256 = "1rwj0r075jfvvd0fnzgdqldc7qdb94wwsi21rs2l6yhcv0380fs2";
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+      sha256 = "159zrrf44469sjklsi0pb4c005q74d9242q7mqawvbwnxjqbh0a5";
     };
   };
 

From b2ea81bd0f7e3a8c70f846502e54f3a01f628bbf Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 3 May 2016 03:30:27 +0200
Subject: [PATCH 571/712] perlPackages.threads: 2.02 -> 2.07

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5f29264b29d..3b58f0fcdc1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13047,10 +13047,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   threads = buildPerlPackage rec {
-    name = "threads-2.02";
+    name = "threads-2.07";
     src = fetchurl {
       url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/${name}.tar.gz";
-      sha256 = "0vij8lagq4x6gv88x9gg23jd7i0s5fyyzs2wrxacih2ppj6kkiff";
+      sha256 = "0fgprp2ghrh1ryxmr0y9bpsjl1ifbf4lqml8k017cbl4zbn21lim";
     };
     meta = {
       description = "Perl interpreter-based threads";

From 15af160ec021bae8603d57416836bbf09186ad9e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 3 May 2016 03:30:56 +0200
Subject: [PATCH 572/712] perlPackages.threads-shared: 1.48 -> 1.51

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3b58f0fcdc1..45a4eb5a1f3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13058,11 +13058,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  threadsshared = buildPerlPackage {
-    name = "threads-shared-1.48";
+  threadsshared = buildPerlPackage rec {
+    name = "threads-shared-1.51";
     src = fetchurl {
-      url = mirror://cpan/authors/id/J/JD/JDHEDDEN/threads-shared-1.48.tar.gz;
-      sha256 = "7378a72bae424705e354476da69995fb8f62432bca8e98eab0fb9842da5120f8";
+      url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/${name}.tar.gz";
+      sha256 = "0qsbl8rx8p09cb5vj1yhwf1h2awvimfyckw1qwrqbk7dxjldrimn";
     };
     meta = {
       description = "Perl extension for sharing data structures between threads";

From 41de2cacb895e1a8c40a0d0162b1e8bd276d673d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 3 May 2016 03:31:25 +0200
Subject: [PATCH 573/712] perlPackages.Thread-Queue: 3.05 -> 3.09

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 45a4eb5a1f3..ef9207f14af 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13070,11 +13070,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  ThreadQueue = buildPerlPackage {
-    name = "Thread-Queue-3.05";
+  ThreadQueue = buildPerlPackage rec {
+    name = "Thread-Queue-3.09";
     src = fetchurl {
-      url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Thread-Queue-3.05.tar.gz;
-      sha256 = "36bc1e50b5de47ff827fbaa1d7f028016e3ef115972cac84ed8cd73a0ef95300";
+      url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/${name}.tar.gz";
+      sha256 = "0f03v10rsasi2j4lh8xw44jac8nfbw66274qgsz5lsmfd6wqvj12";
     };
     meta = {
       description = "Thread-safe queues";

From 95aab50e81012f58901682bb7d40183baada4176 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 3 May 2016 03:50:13 +0200
Subject: [PATCH 574/712] efivar: 0.21 -> 0.23

---
 pkgs/tools/system/efivar/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix
index a9c3ebd0252..b4da2044f69 100644
--- a/pkgs/tools/system/efivar/default.nix
+++ b/pkgs/tools/system/efivar/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, fetchFromGitHub, popt }:
+{ stdenv, fetchFromGitHub, pkgconfig, popt }:
 
 stdenv.mkDerivation rec {
   name = "efivar-${version}";
-  version = "0.21";
+  version = "0.23";
 
   src = fetchFromGitHub {
     owner = "rhinstaller";
     repo = "efivar";
     rev = version;
-    sha256 = "0iakv8prvl61mb2wnll02sxlg3kfzh3d4qb41d0bklmnljjkqr8p";
+    sha256 = "1fdqi053v335pjwj1i3yi9f1kasdzg3agfcp36bxsbhqjp4imlid";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ popt ];
 
-  # 0.21 Has build warnings so disable -Werror
   postPatch = ''
-    sed -i 's,-Werror,,g' Make.defaults
+     substituteInPlace src/Makefile --replace "-static" ""
   '';
 
   installFlags = [
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/vathpela/efivar;
+    inherit (src.meta) homepage;
     description = "Tools and library to manipulate EFI variables";
     platforms = platforms.linux;
     license = licenses.lgpl21;

From 9c7f71cd618b8ca7b97e130bf01d526730faa5b2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 3 May 2016 04:00:25 +0200
Subject: [PATCH 575/712] unarj: 2.63a -> 2.65

---
 pkgs/tools/archivers/unarj/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix
index 546f398bec3..c8e4e92a404 100644
--- a/pkgs/tools/archivers/unarj/default.nix
+++ b/pkgs/tools/archivers/unarj/default.nix
@@ -1,11 +1,12 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "unarj-2.63a";
+  name = "unarj-${version}";
+  version = "2.65";
 
   src = fetchurl {
-    url = http://www.ibiblio.org/pub/Linux/utils/compress/unarj-2.63a.tar.gz;
-    sha256 = "0j4sn57fq2p23pcq4ck06pm618q4vq09wgm89ilfn4c9l9x2ky1k";
+    sha256 = "0r027z7a0azrd5k885xvwhrxicpd0ah57jzmaqlypxha2qjw7p6p";
+    url = "http://pkgs.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz";
   };
 
   preInstall = ''

From 7a595cdfc308b85bbc49e5f318a0809fe734c5f6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 3 May 2016 04:11:44 +0200
Subject: [PATCH 576/712] libpwquality: 1.2.3 -> 1.3.0

---
 pkgs/development/libraries/libpwquality/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix
index aaa39783fa7..fa272f2ec6f 100644
--- a/pkgs/development/libraries/libpwquality/default.nix
+++ b/pkgs/development/libraries/libpwquality/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, cracklib, fetchurl, python }:
+{ stdenv, fetchurl, cracklib, python }:
 
 stdenv.mkDerivation rec {
-  name = "libpwquality-1.2.3";
+  name = "libpwquality-${version}";
+  version = "1.3.0";
 
   src = fetchurl {
     url = "https://fedorahosted.org/releases/l/i/libpwquality/${name}.tar.bz2";
-    sha256 = "0sjiabvl5277nfxyy96jdz65a0a3pmkkwrfbziwgik83gg77j75i";
+    sha256 = "0aidriag6h0syfm33nzdfdsqgrnsgihwjv3a5lgkqch3w68fmlkl";
   };
 
   buildInputs = [ cracklib python ];

From 49fd7d9d086483bf83911fbf292bd2f229c2ff21 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 3 May 2016 04:21:44 +0200
Subject: [PATCH 577/712] autoconf-archive: 2015.09.25 -> 2016.03.20

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

diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix
index 31bd4fb1c43..70dccdcd626 100644
--- a/pkgs/development/tools/misc/autoconf-archive/default.nix
+++ b/pkgs/development/tools/misc/autoconf-archive/default.nix
@@ -1,12 +1,14 @@
 { stdenv, fetchurl, xz }:
+
 stdenv.mkDerivation rec {
   name = "autoconf-archive-${version}";
-  version = "2015.09.25";
+  version = "2016.03.20";
 
   src = fetchurl {
     url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz";
-    sha256 = "02im1jn0igzn2qpxkgiwxvcm3jgvjaypg955pi9h2d6jvfjnf13w";
+    sha256 = "0dz4fnc723jqn3by22ds5fys7g31apzm1r9allldvva0yvzjxyw8";
   };
+
   buildInputs = [ xz ];
 
   meta = with stdenv.lib; {

From 078f14e058df0abd27957d86548e8602c1df94e3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 3 May 2016 04:31:20 +0200
Subject: [PATCH 578/712] hicolor_icon_theme: 0.14 -> 0.15

---
 pkgs/data/icons/hicolor-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix
index a0c9920177d..5d089315448 100644
--- a/pkgs/data/icons/hicolor-icon-theme/default.nix
+++ b/pkgs/data/icons/hicolor-icon-theme/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "hicolor-icon-theme-0.14";
+  name = "hicolor-icon-theme-0.15";
 
   src = fetchurl {
     url = "http://icon-theme.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "1k9fj0lb9b44inb5q5m04910x5nfkzrxl3ys9ckihqrixzk0dvbv";
+    sha256 = "1k1kf2c5zbqh31nglc3nxs9j6wr083k9kjyql8p22ccc671mmi4w";
   };
 
   setupHook = ./setup-hook.sh;

From be3d012da424d4efb2e3d23a0f7a4559377397a6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 3 May 2016 04:33:49 +0200
Subject: [PATCH 579/712] highlight: 3.18 -> 3.28

---
 pkgs/tools/text/highlight/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index debf862672c..81995705b52 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, getopt, lua, boost, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "highlight-3.18";
+  name = "highlight-${version}";
+  version = "3.28";
 
   src = fetchurl {
     url = "http://www.andre-simon.de/zip/${name}.tar.bz2";
-    sha256 = "0jsq78qb75sawwggbpx5pdqxk00wgjr1a0la0w8wihmamsjzgijm";
+    sha256 = "1kg73isgz3czb1k6ccajqzifahr3zs9ci8168k0dlj31j1nlndin";
   };
 
   buildInputs = [ getopt lua boost pkgconfig ];

From 19ce448380af5dfc5f8254ca0470807c543fdca7 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Mon, 2 May 2016 22:57:45 +0200
Subject: [PATCH 580/712] bind: 9.10.3-P4 -> 9.10.4

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

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 61ca93184dd..ac96b3c353a 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, openssl, libtool, perl, libxml2 }:
 
-let version = "9.10.3-P4"; in
+let version = "9.10.4"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "0giys46ifypysf799w9v58kbaz1v3fbdzw3s212znifzzfsl9h1a";
+    sha256 = "0mmhzi4483mkak47wj255a36g3v0yilxwfwlbckr1hssinri5m7q";
   };
 
   patches = [ ./libressl.patch ./remove-mkdir-var.patch ];

From 5be72c23eadfcd8c459a43a828389c8bf0d893b2 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Mon, 2 May 2016 23:09:27 +0200
Subject: [PATCH 581/712] bind: LibreSSL compatibility added upstream

---
 pkgs/servers/dns/bind/default.nix    |   2 +-
 pkgs/servers/dns/bind/libressl.patch | 102 ---------------------------
 2 files changed, 1 insertion(+), 103 deletions(-)
 delete mode 100644 pkgs/servers/dns/bind/libressl.patch

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index ac96b3c353a..a92da7f35ed 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0mmhzi4483mkak47wj255a36g3v0yilxwfwlbckr1hssinri5m7q";
   };
 
-  patches = [ ./libressl.patch ./remove-mkdir-var.patch ];
+  patches = [ ./remove-mkdir-var.patch ];
 
   buildInputs = [ openssl libtool perl libxml2 ];
 
diff --git a/pkgs/servers/dns/bind/libressl.patch b/pkgs/servers/dns/bind/libressl.patch
deleted file mode 100644
index b77f24ee429..00000000000
--- a/pkgs/servers/dns/bind/libressl.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-$OpenBSD: patch-lib_dns_openssl_link_c,v 1.1 2015/09/16 15:28:16 sthen Exp $
---- a/lib/dns/openssl_link.c	Wed Sep 16 14:01:23 2015
-+++ b/lib/dns/openssl_link.c	Wed Sep 16 14:01:46 2015
-@@ -88,7 +88,7 @@ entropy_getpseudo(unsigned char *buf, int num) {
- 	return (result == ISC_R_SUCCESS ? 1 : -1);
- }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- static void
- entropy_add(const void *buf, int num, double entropy) {
- 	/*
-@@ -121,7 +121,7 @@ lock_callback(int mode, int type, const char *file, in
- 		UNLOCK(&locks[type]);
- }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- static unsigned long
- id_callback(void) {
- 	return ((unsigned long)isc_thread_self());
-@@ -187,7 +187,7 @@ dst__openssl_init(const char *engine) {
- 	if (result != ISC_R_SUCCESS)
- 		goto cleanup_mutexalloc;
- 	CRYPTO_set_locking_callback(lock_callback);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	CRYPTO_set_id_callback(id_callback);
- #endif
- 
-@@ -287,7 +287,7 @@ dst__openssl_destroy(void) {
- 	CRYPTO_cleanup_all_ex_data();
- #endif
- 	ERR_clear_error();
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	ERR_remove_state(0);
- #endif
- 	ERR_free_strings();
---- a/lib/dns/dst_openssl.h	Wed Sep 16 14:00:47 2015
-+++ b/lib/dns/dst_openssl.h	Wed Sep 16 14:02:42 2015
-@@ -36,7 +36,7 @@
- #define USE_ENGINE 1
- #endif
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- /*
-  * These are new in OpenSSL 1.1.0.  BN_GENCB _cb needs to be declared in
-  * the function like this before the BN_GENCB_new call:
---- a/lib/dns/openssldh_link.c	Wed Sep 16 14:01:23 2015
-+++ b/lib/dns/openssldh_link.c	Wed Sep 16 14:02:06 2015
-@@ -173,7 +173,7 @@ openssldh_generate(dst_key_t *key, int generator, void
- 	DH *dh = NULL;
- #if OPENSSL_VERSION_NUMBER > 0x00908000L
- 	BN_GENCB *cb;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	BN_GENCB _cb;
- #endif
- 	union {
-@@ -210,7 +210,7 @@ openssldh_generate(dst_key_t *key, int generator, void
- 		if (dh == NULL)
- 			return (dst__openssl_toresult(ISC_R_NOMEMORY));
- 		cb = BN_GENCB_new();
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- 		if (cb == NULL) {
- 			DH_free(dh);
- 			return (dst__openssl_toresult(ISC_R_NOMEMORY));
---- a/lib/dns/openssldsa_link.c	Wed Sep 16 14:01:23 2015
-+++ b/lib/dns/openssldsa_link.c	Wed Sep 16 14:02:22 2015
-@@ -359,7 +359,7 @@ openssldsa_generate(dst_key_t *key, int unused, void (
- 	isc_result_t result;
- #if OPENSSL_VERSION_NUMBER > 0x00908000L
- 	BN_GENCB *cb;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	BN_GENCB _cb;
- #endif
- 	union {
-@@ -383,7 +383,7 @@ openssldsa_generate(dst_key_t *key, int unused, void (
- 	if (dsa == NULL)
- 		return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));
- 	cb = BN_GENCB_new();
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- 	if (cb == NULL) {
- 		DSA_free(dsa);
- 		return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));
-$OpenBSD: patch-lib_dns_opensslrsa_link_c,v 1.1 2015/09/16 15:28:16 sthen Exp $
---- a/lib/dns/opensslrsa_link.c	Wed Sep 16 14:01:23 2015
-+++ b/lib/dns/opensslrsa_link.c	Wed Sep 16 14:02:31 2015
-@@ -771,7 +771,7 @@ opensslrsa_generate(dst_key_t *key, int exp, void (*ca
- 	} u;
- 	RSA *rsa = RSA_new();
- 	BIGNUM *e = BN_new();
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	BN_GENCB _cb;
- #endif
- 	BN_GENCB *cb = BN_GENCB_new();

From 6ca5c3667b68ed6a7f11a68201ef59730179c3e9 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Tue, 3 May 2016 08:59:18 +0200
Subject: [PATCH 582/712] kde: cleanup from closure-size merge (#15179)

part of 98d8e1a160d3138e9ef3a51f727b04315ab9e285 and
7049bde4d5ffc9475eab99c490e6c35d71eb1534 got lost
---
 .../kde-5/frameworks-5.19/kdelibs4support.nix |  32 -
 .../libraries/kde-frameworks-5.19/attica.nix  |  11 -
 .../libraries/kde-frameworks-5.19/baloo.nix   |  25 -
 .../kde-frameworks-5.19/bluez-qt.nix          |  17 -
 .../kde-frameworks-5.19/breeze-icons.nix      |  10 -
 .../libraries/kde-frameworks-5.19/default.nix | 114 ----
 .../extra-cmake-modules/default.nix           |  20 -
 .../extra-cmake-modules/nix-lib-path.patch    |  37 --
 .../extra-cmake-modules/series                |   1 -
 .../extra-cmake-modules/setup-hook.sh         |  81 ---
 .../kde-frameworks-5.19/fetchsrcs.sh          |  57 --
 .../frameworkintegration.nix                  |  17 -
 .../kde-frameworks-5.19/kactivities.nix       |  22 -
 .../libraries/kde-frameworks-5.19/kapidox.nix |  12 -
 .../kde-frameworks-5.19/karchive.nix          |  11 -
 .../kauth/cmake-install-paths.patch           |  17 -
 .../kde-frameworks-5.19/kauth/default.nix     |  16 -
 .../kde-frameworks-5.19/kauth/series          |   1 -
 .../kde-frameworks-5.19/kbookmarks.nix        |  25 -
 .../0001-qdiriterator-follow-symlinks.patch   |  25 -
 .../kde-frameworks-5.19/kcmutils/default.nix  |  17 -
 .../libraries/kde-frameworks-5.19/kcodecs.nix |  11 -
 .../kde-frameworks-5.19/kcompletion.nix       |  14 -
 .../libraries/kde-frameworks-5.19/kconfig.nix |  16 -
 .../0001-qdiriterator-follow-symlinks.patch   |  25 -
 .../kconfigwidgets/default.nix                |  17 -
 .../kde-frameworks-5.19/kcoreaddons.nix       |  16 -
 .../libraries/kde-frameworks-5.19/kcrash.nix  |  16 -
 .../kde-frameworks-5.19/kdbusaddons.nix       |  17 -
 .../kde-frameworks-5.19/kdeclarative.nix      |  22 -
 .../libraries/kde-frameworks-5.19/kded.nix    |  19 -
 .../kdelibs4support/default.nix               |  36 --
 .../kdelibs4support/nix-kde-include-dir.patch |  13 -
 .../kdelibs4support/series                    |   1 -
 .../kdelibs4support/setup-hook.sh             |   1 -
 .../kde-frameworks-5.19/kdesignerplugin.nix   |  34 --
 .../libraries/kde-frameworks-5.19/kdesu.nix   |  13 -
 .../kde-frameworks-5.19/kdewebkit.nix         |  13 -
 .../libraries/kde-frameworks-5.19/kdnssd.nix  |  13 -
 .../kde-frameworks-5.19/kdoctools/default.nix |  19 -
 .../kdoctools-no-find-docbook-xml.patch       |  12 -
 .../kde-frameworks-5.19/kemoticons.nix        |  17 -
 .../kfilemetadata/cmake-install-paths.patch   |  13 -
 .../kfilemetadata/default.nix                 |  14 -
 .../kde-frameworks-5.19/kfilemetadata/series  |   1 -
 .../kde-frameworks-5.19/kglobalaccel.nix      |  23 -
 .../kde-frameworks-5.19/kguiaddons.nix        |  13 -
 .../libraries/kde-frameworks-5.19/khtml.nix   |  21 -
 .../libraries/kde-frameworks-5.19/ki18n.nix   |  17 -
 .../kiconthemes/default-theme-breeze.patch    |  13 -
 .../kiconthemes/default.nix                   |  18 -
 .../kde-frameworks-5.19/kiconthemes/series    |   1 -
 .../kde-frameworks-5.19/kidletime.nix         |  15 -
 .../kde-frameworks-5.19/kimageformats.nix     |  13 -
 .../kinit/0001-kinit-libpath.patch            |  42 --
 .../kde-frameworks-5.19/kinit/default.nix     |  17 -
 .../kde-frameworks-5.19/kio/default.nix       |  33 -
 .../kio/samba-search-path.patch               |  28 -
 .../libraries/kde-frameworks-5.19/kio/series  |   1 -
 .../kde-frameworks-5.19/kitemmodels.nix       |  11 -
 .../kde-frameworks-5.19/kitemviews.nix        |  11 -
 .../kde-frameworks-5.19/kjobwidgets.nix       |  16 -
 .../libraries/kde-frameworks-5.19/kjs.nix     |  16 -
 .../kde-frameworks-5.19/kjsembed.nix          |  17 -
 .../kde-frameworks-5.19/kmediaplayer.nix      |  15 -
 .../kde-frameworks-5.19/knewstuff.nix         |  17 -
 .../kde-frameworks-5.19/knotifications.nix    |  21 -
 .../kde-frameworks-5.19/knotifyconfig.nix     |  13 -
 .../kpackage/allow-external-paths.patch       |  13 -
 .../kde-frameworks-5.19/kpackage/default.nix  |  23 -
 .../qdiriterator-follow-symlinks.patch        |  26 -
 .../kde-frameworks-5.19/kpackage/series       |   2 -
 .../libraries/kde-frameworks-5.19/kparts.nix  |  17 -
 .../libraries/kde-frameworks-5.19/kpeople.nix |  15 -
 .../kde-frameworks-5.19/kplotting.nix         |  11 -
 .../libraries/kde-frameworks-5.19/kpty.nix    |  10 -
 .../libraries/kde-frameworks-5.19/kross.nix   |  14 -
 .../libraries/kde-frameworks-5.19/krunner.nix |  16 -
 .../0001-qdiriterator-follow-symlinks.patch   |  25 -
 .../kservice/0002-no-canonicalize-path.patch  |  25 -
 .../kde-frameworks-5.19/kservice/default.nix  |  18 -
 .../ktexteditor/default.nix                   |  22 -
 .../ktexteditor/no-qcoreapplication.patch     |  36 --
 .../kde-frameworks-5.19/ktexteditor/series    |   1 -
 .../kde-frameworks-5.19/ktextwidgets.nix      |  16 -
 .../kde-frameworks-5.19/kunitconversion.nix   |  10 -
 .../libraries/kde-frameworks-5.19/kwallet.nix |  21 -
 .../kde-frameworks-5.19/kwidgetsaddons.nix    |  11 -
 .../kde-frameworks-5.19/kwindowsystem.nix     |  13 -
 .../libraries/kde-frameworks-5.19/kxmlgui.nix |  18 -
 .../kde-frameworks-5.19/kxmlrpcclient.nix     |  10 -
 .../kde-frameworks-5.19/modemmanager-qt.nix   |  13 -
 .../kde-frameworks-5.19/networkmanager-qt.nix |  13 -
 .../kde-frameworks-5.19/oxygen-icons5.nix     |  13 -
 .../plasma-framework/default.nix              |  25 -
 .../libraries/kde-frameworks-5.19/solid.nix   |  17 -
 .../libraries/kde-frameworks-5.19/sonnet.nix  |  13 -
 .../libraries/kde-frameworks-5.19/srcs.nix    | 565 ------------------
 .../kde-frameworks-5.19/threadweaver.nix      |  11 -
 99 files changed, 2376 deletions(-)
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/attica.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/baloo.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh
 delete mode 100755 pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/karchive.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kauth/series
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kded.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/khtml.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kio/series
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kjs.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kpackage/series
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kparts.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kpty.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kross.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/krunner.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/solid.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/srcs.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix

diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support.nix
deleted file mode 100644
index e61c4bb86e7..00000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth
-, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
-, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons
-, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
-, kinit, knotifications, kparts, kservice, ktextwidgets
-, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui
-, networkmanager, qtsvg, qtx11extras, xlibs
-}:
-
-# TODO: debug docbook detection
-
-kdeFramework {
-  name = "kdelibs4support";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [
-    kcompletion kconfig kded kservice kwidgetsaddons
-    kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
-  ];
-  propagatedBuildInputs = [
-    kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
-    kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio
-    kiconthemes kitemmodels kinit knotifications kparts ktextwidgets
-    kunitconversion kwindowsystem
-  ];
-  cmakeFlags = [
-    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-    "-DDocBookXML4_DTD_VERSION=4.5"
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/attica.nix b/pkgs/development/libraries/kde-frameworks-5.19/attica.nix
deleted file mode 100644
index 98721876c12..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/attica.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "attica";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix
deleted file mode 100644
index 38c41d9271d..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig
-, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
-, kio, lmdb, makeQtWrapper, qtbase, qtquick1, solid
-}:
-
-kdeFramework {
-  name = "baloo";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [
-    kconfig kcrash kdbusaddons lmdb qtquick1 solid
-  ];
-  propagatedBuildInputs = [
-    kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/baloo_file"
-    wrapQtProgram "$out/bin/baloo_file_extractor"
-    wrapQtProgram "$out/bin/balooctl"
-    wrapQtProgram "$out/bin/baloosearch"
-    wrapQtProgram "$out/bin/balooshow"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix
deleted file mode 100644
index f981b0516f7..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtdeclarative
-}:
-
-kdeFramework {
-  name = "bluez-qt";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtdeclarative ];
-  preConfigure = ''
-    substituteInPlace CMakeLists.txt \
-      --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix
deleted file mode 100644
index 44cc99daf26..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kdeFramework
-, extra-cmake-modules
-, qtsvg
-}:
-
-kdeFramework {
-  name = "breeze-icons";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtsvg ];
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/default.nix
deleted file mode 100644
index bb96048d6ff..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/default.nix
+++ /dev/null
@@ -1,114 +0,0 @@
-# Maintainer's Notes:
-#
-# How To Update
-#  1. Edit the URL in ./manifest.sh
-#  2. Run ./manifest.sh
-#  3. Fix build errors.
-
-{ pkgs, debug ? false }:
-
-let
-
-  inherit (pkgs) lib makeSetupHook stdenv;
-
-  mirror = "mirror://kde";
-  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
-
-  packages = self: with self; {
-    kdeFramework = args:
-      let
-        inherit (args) name;
-        inherit (srcs."${name}") src version;
-      in stdenv.mkDerivation (args // {
-        name = "${name}-${version}";
-        inherit src;
-
-        outputs = args.outputs or [ "dev" "out" ];
-
-        cmakeFlags =
-          (args.cmakeFlags or [])
-          ++ [ "-DBUILD_TESTING=OFF" ]
-          ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
-        meta = {
-          license = with lib.licenses; [
-            lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-          ];
-          platforms = lib.platforms.linux;
-          homepage = "http://www.kde.org";
-        } // (args.meta or {});
-      });
-
-    attica = callPackage ./attica.nix {};
-    baloo = callPackage ./baloo.nix {};
-    bluez-qt = callPackage ./bluez-qt.nix {};
-    breeze-icons = callPackage ./breeze-icons.nix {};
-    extra-cmake-modules = callPackage ./extra-cmake-modules {};
-    frameworkintegration = callPackage ./frameworkintegration.nix {};
-    kactivities = callPackage ./kactivities.nix {};
-    kapidox = callPackage ./kapidox.nix {};
-    karchive = callPackage ./karchive.nix {};
-    kauth = callPackage ./kauth {};
-    kbookmarks = callPackage ./kbookmarks.nix {};
-    kcmutils = callPackage ./kcmutils {};
-    kcodecs = callPackage ./kcodecs.nix {};
-    kcompletion = callPackage ./kcompletion.nix {};
-    kconfig = callPackage ./kconfig.nix {};
-    kconfigwidgets = callPackage ./kconfigwidgets {};
-    kcoreaddons = callPackage ./kcoreaddons.nix {};
-    kcrash = callPackage ./kcrash.nix {};
-    kdbusaddons = callPackage ./kdbusaddons.nix {};
-    kdeclarative = callPackage ./kdeclarative.nix {};
-    kded = callPackage ./kded.nix {};
-    kdelibs4support = callPackage ./kdelibs4support {};
-    kdesignerplugin = callPackage ./kdesignerplugin.nix {};
-    kdewebkit = callPackage ./kdewebkit.nix {};
-    kdesu = callPackage ./kdesu.nix {};
-    kdnssd = callPackage ./kdnssd.nix {};
-    kdoctools = callPackage ./kdoctools {};
-    kemoticons = callPackage ./kemoticons.nix {};
-    kfilemetadata = callPackage ./kfilemetadata {};
-    kglobalaccel = callPackage ./kglobalaccel.nix {};
-    kguiaddons = callPackage ./kguiaddons.nix {};
-    khtml = callPackage ./khtml.nix {};
-    ki18n = callPackage ./ki18n.nix {};
-    kiconthemes = callPackage ./kiconthemes {};
-    kidletime = callPackage ./kidletime.nix {};
-    kimageformats = callPackage ./kimageformats.nix {};
-    kinit = callPackage ./kinit {};
-    kio = callPackage ./kio {};
-    kitemmodels = callPackage ./kitemmodels.nix {};
-    kitemviews = callPackage ./kitemviews.nix {};
-    kjobwidgets = callPackage ./kjobwidgets.nix {};
-    kjs = callPackage ./kjs.nix {};
-    kjsembed = callPackage ./kjsembed.nix {};
-    kmediaplayer = callPackage ./kmediaplayer.nix {};
-    knewstuff = callPackage ./knewstuff.nix {};
-    knotifications = callPackage ./knotifications.nix {};
-    knotifyconfig = callPackage ./knotifyconfig.nix {};
-    kpackage = callPackage ./kpackage {};
-    kparts = callPackage ./kparts.nix {};
-    kpeople = callPackage ./kpeople.nix {};
-    kplotting = callPackage ./kplotting.nix {};
-    kpty = callPackage ./kpty.nix {};
-    kross = callPackage ./kross.nix {};
-    krunner = callPackage ./krunner.nix {};
-    kservice = callPackage ./kservice {};
-    ktexteditor = callPackage ./ktexteditor {};
-    ktextwidgets = callPackage ./ktextwidgets.nix {};
-    kunitconversion = callPackage ./kunitconversion.nix {};
-    kwallet = callPackage ./kwallet.nix {};
-    kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
-    kwindowsystem = callPackage ./kwindowsystem.nix {};
-    kxmlgui = callPackage ./kxmlgui.nix {};
-    kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
-    modemmanager-qt = callPackage ./modemmanager-qt.nix {};
-    networkmanager-qt = callPackage ./networkmanager-qt.nix {};
-    oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
-    plasma-framework = callPackage ./plasma-framework {};
-    solid = callPackage ./solid.nix {};
-    sonnet = callPackage ./sonnet.nix {};
-    threadweaver = callPackage ./threadweaver.nix {};
-  };
-
-in packages
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix
deleted file mode 100644
index 1c2ea70442d..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore, cmake, pkgconfig, qttools }:
-
-kdeFramework {
-  name = "extra-cmake-modules";
-
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-
-  outputs = [ "out" ];  # this package has no runtime components
-  setupHook = ./setup-hook.sh;
-
-  # It is OK to propagate these inputs as long as
-  # extra-cmake-modules is never a propagated input
-  # of some other derivation.
-  propagatedNativeBuildInputs = [ cmake pkgconfig qttools ];
-
-  meta = with lib; {
-    license = licenses.bsd2;
-    maintainers = [ maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
deleted file mode 100644
index a74340a6dc9..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake
-===================================================================
---- extra-cmake-modules-5.18.0.orig/kde-modules/KDEInstallDirs.cmake
-+++ extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake
-@@ -200,32 +200,6 @@
- # GNUInstallDirs code deals with re-configuring, but that is dealt with
- # by the _define_* macros in this module).
- set(_LIBDIR_DEFAULT "lib")
--# Override this default 'lib' with 'lib64' iff:
--#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
--#  - we are NOT on debian
--#  - we are on a 64 bits system
--# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
--# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
--# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
--# See http://wiki.debian.org/Multiarch
--if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
--   AND NOT CMAKE_CROSSCOMPILING)
--  if (EXISTS "/etc/debian_version") # is this a debian system ?
--    if(CMAKE_LIBRARY_ARCHITECTURE)
--      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
--    endif()
--  else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
--    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
--      message(AUTHOR_WARNING
--        "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
--        "Please enable at least one language before including KDEInstallDirs.")
--    else()
--      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
--        set(_LIBDIR_DEFAULT "lib64")
--      endif()
--    endif()
--  endif()
--endif()
- 
- set(_gnu_install_dirs_vars
-     BINDIR
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series
deleted file mode 100644
index b4569e50a5f..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series
+++ /dev/null
@@ -1 +0,0 @@
-nix-lib-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh
deleted file mode 100644
index 56ed09f4ea5..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-_ecmSetXdgDirs() {
-    addToSearchPathOnce XDG_DATA_DIRS "$1/share"
-    addToSearchPathOnce XDG_CONFIG_DIRS "$1/etc/xdg"
-    addToSearchPathOnce NIX_WRAP_XDG_CONFIG_DIRS "$1/etc/xdg"
-}
-
-_ecmPropagateSharedData() {
-    local sharedPaths=( \
-        "config.cfg" \
-        "doc" \
-        "kconf_update" \
-        "kservices5" \
-        "kservicetypes5" \
-        "kxmlgui5" \
-        "knotifications5" \
-        "icons" \
-        "sounds" \
-        "templates" \
-        "wallpapers" \
-        "applications" \
-        "desktop-directories" \
-        "mime" \
-        "info" \
-        "dbus-1" \
-        "interfaces" \
-        "services" \
-        "system-services" )
-    for dir in ${sharedPaths[@]}; do
-        if [ -d "$1/share/$dir" ]; then
-            addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share"
-            propagateOnce propagatedUserEnvPkgs "$1"
-            break
-        fi
-    done
-}
-
-_ecmConfig() {
-    # Because we need to use absolute paths here, we must set *all* the paths.
-    cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}"
-    cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin"
-    cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin"
-    cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib"
-    cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/lib/libexec"
-    cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake"
-    cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputLib}/lib/qt5/plugins"
-    cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputLib}/lib/qt5/plugins"
-    cmakeFlags+=" -DKDE_INSTALL_QTQUICKIMPORTSDIR=${!outputLib}/lib/qt5/imports"
-    cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputLib}/lib/qt5/qml"
-    cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include"
-    cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var"
-    cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputLib}/share"
-    cmakeFlags+=" -DKDE_INSTALL_DATADIR=${!outputLib}/share"
-    cmakeFlags+=" -DKDE_INSTALL_DOCBUNDLEDIR=${!outputLib}/share/doc/HTML"
-    cmakeFlags+=" -DKDE_INSTALL_KCFGDIR=${!outputLib}/share/config.kcfg"
-    cmakeFlags+=" -DKDE_INSTALL_KCONFUPDATEDIR=${!outputLib}/share/kconf_update"
-    cmakeFlags+=" -DKDE_INSTALL_KSERVICES5DIR=${!outputLib}/share/kservices5"
-    cmakeFlags+=" -DKDE_INSTALL_KSERVICETYPES5DIR=${!outputLib}/share/kservicetypes5"
-    cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputLib}/share/kxmlgui5"
-    cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputLib}/share/knotifications5"
-    cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputLib}/share/icons"
-    cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale"
-    cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputLib}/share/sounds"
-    cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputLib}/share/templates"
-    cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputLib}/share/wallpapers"
-    cmakeFlags+=" -DKDE_INSTALL_APPDIR=${!outputLib}/share/applications"
-    cmakeFlags+=" -DKDE_INSTALL_DESKTOPDIR=${!outputLib}/share/desktop-directories"
-    cmakeFlags+=" -DKDE_INSTALL_MIMEDIR=${!outputLib}/share/mime/packages"
-    cmakeFlags+=" -DKDE_INSTALL_METAINFODIR=${!outputLib}/share/appdata"
-    cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputLib}/share/man"
-    cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputLib}/share/info"
-    cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputLib}/share/dbus-1"
-    cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputLib}/share/dbus-1/interfaces"
-    cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputLib}/share/dbus-1/services"
-    cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputLib}/share/dbus-1/system-services"
-    cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputLib}/etc"
-    cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputLib}/etc/xdg"
-    cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputLib}/etc/xdg/autostart"
-}
-
-envHooks+=(_ecmSetXdgDirs _ecmPropagateSharedData)
-preConfigureHooks+=(_ecmConfig)
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh
deleted file mode 100755
index 7937e6f8bed..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils findutils gnused nix wget
-
-set -x
-
-# The trailing slash at the end is necessary!
-RELEASE_URL="http://download.kde.org/stable/frameworks/5.19/"
-EXTRA_WGET_ARGS='-A *.tar.xz'
-
-mkdir tmp; cd tmp
-
-rm -f ../srcs.csv
-
-wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
-
-find . | while read src; do
-    if [[ -f "${src}" ]]; then
-        # Sanitize file name
-        filename=$(basename "$src" | tr '@' '_')
-        nameVersion="${filename%.tar.*}"
-        name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
-        version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
-        echo "$name,$version,$src,$filename" >>../srcs.csv
-    fi
-done
-
-cat >../srcs.nix <<EOF
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-EOF
-
-gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do
-    versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv)
-    latestVersion=$(echo "$versions" | sort -rV | head -n 1)
-    src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv)
-    filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv)
-    url="${src:2}"
-    sha256=$(nix-hash --type sha256 --base32 --flat "$src")
-    cat >>../srcs.nix <<EOF
-  $name = {
-    version = "$latestVersion";
-    src = fetchurl {
-      url = "\${mirror}/$url";
-      sha256 = "$sha256";
-      name = "$filename";
-    };
-  };
-EOF
-done
-
-echo "}" >>../srcs.nix
-
-rm -f ../srcs.csv
-
-cd ..
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix
deleted file mode 100644
index 26987c385ad..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kbookmarks, kcompletion
-, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications
-, kwidgetsaddons, libXcursor, qtx11extras
-}:
-
-kdeFramework {
-  name = "frameworkintegration";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kbookmarks kcompletion kconfig knotifications kwidgetsaddons
-    libXcursor
-  ];
-  propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix
deleted file mode 100644
index 3225098f439..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig
-, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
-, kio, kservice, kwindowsystem, kxmlgui, makeQtWrapper, qtdeclarative
-}:
-
-kdeFramework {
-  name = "kactivities";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [
-    boost kcmutils kconfig kcoreaddons kdbusaddons kservice
-    kxmlgui
-  ];
-  propagatedBuildInputs = [
-    kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kactivitymanagerd"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix
deleted file mode 100644
index 647be8f052c..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, python
-}:
-
-kdeFramework {
-  name = "kapidox";
-  nativeBuildInputs = [ extra-cmake-modules python ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix
deleted file mode 100644
index a8d9a0003c3..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "karchive";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch
deleted file mode 100644
index c66f5ecd008..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: kauth-5.18.0/KF5AuthConfig.cmake.in
-===================================================================
---- kauth-5.18.0.orig/KF5AuthConfig.cmake.in
-+++ kauth-5.18.0/KF5AuthConfig.cmake.in
-@@ -4,9 +4,9 @@ set(KAUTH_STUB_FILES_DIR "@PACKAGE_KDE_I
- 
- set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
- set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
--set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
--set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
--set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@")
-+set(KAUTH_POLICY_FILES_INSTALL_DIR "${KDE_INSTALL_DATADIR}/polkit-1/actions")
-+set(KAUTH_HELPER_INSTALL_DIR "${KDE_INSTALL_LIBEXECDIR}")
-+set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "${KDE_INSTALL_LIBEXECDIR}")
- 
- find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
- 
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix
deleted file mode 100644
index 1352d8c5821..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules
-, kcoreaddons
-, polkit-qt
-}:
-
-kdeFramework {
-  name = "kauth";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ polkit-qt ];
-  propagatedBuildInputs = [ kcoreaddons ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/series b/pkgs/development/libraries/kde-frameworks-5.19/kauth/series
deleted file mode 100644
index d2689425c38..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kauth/series
+++ /dev/null
@@ -1 +0,0 @@
-cmake-install-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix
deleted file mode 100644
index 1a469ab4db6..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcodecs
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kiconthemes
-, kxmlgui
-}:
-
-kdeFramework {
-  name = "kbookmarks";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcodecs
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kiconthemes
-    kxmlgui
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index 0d861fa9501..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:43:53 -0500
-Subject: [PATCH] qdiriterator follow symlinks
-
----
- src/kpluginselector.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
-index 9c3431d..d6b1ee2 100644
---- a/src/kpluginselector.cpp
-+++ b/src/kpluginselector.cpp
-@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
-     QStringList desktopFileNames;
-     const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
-     Q_FOREACH (const QString &dir, dirs) {
--        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
-+      QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             desktopFileNames.append(it.next());
-         }
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix
deleted file mode 100644
index dbbb783ac61..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets
-, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews
-, kpackage, kservice, kxmlgui
-}:
-
-kdeFramework {
-  name = "kcmutils";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcoreaddons kiconthemes kitemviews kpackage kxmlgui
-  ];
-  propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ];
-  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix
deleted file mode 100644
index 53a69a69b69..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kcodecs";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix
deleted file mode 100644
index e393774f16a..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kconfig
-, kwidgetsaddons
-}:
-
-kdeFramework {
-  name = "kcompletion";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kconfig kwidgetsaddons ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix
deleted file mode 100644
index e132afe5988..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, makeQtWrapper
-}:
-
-kdeFramework {
-  name = "kconfig";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kreadconfig5"
-    wrapQtProgram "$out/bin/kwriteconfig5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index 7a6c0ee9053..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:47:01 -0500
-Subject: [PATCH] qdiriterator follow symlinks
-
----
- src/khelpclient.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
-index 53a331e..80fbb01 100644
---- a/src/khelpclient.cpp
-+++ b/src/khelpclient.cpp
-@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
-     QString docPath;
-     const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
-     Q_FOREACH (const QString &dir, desktopDirs) {
--        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
-+        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             const QString desktopPath(it.next());
-             KDesktopFile desktopFile(desktopPath);
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix
deleted file mode 100644
index 0e14d06edd3..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig
-, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeQtWrapper
-}:
-
-kdeFramework {
-  name = "kconfigwidgets";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ kguiaddons ];
-  propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ];
-  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/preparetips5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix
deleted file mode 100644
index f3a1db7bd48..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib, makeQtWrapper
-, extra-cmake-modules
-, shared_mime_info
-}:
-
-kdeFramework {
-  name = "kcoreaddons";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ shared_mime_info ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/desktoptojson"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix
deleted file mode 100644
index bbab78ccb40..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcoreaddons
-, kwindowsystem
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kcrash";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix
deleted file mode 100644
index d2ceab31d14..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, makeQtWrapper
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kdbusaddons";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  propagatedBuildInputs = [ qtx11extras ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kquitapp5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix
deleted file mode 100644
index 74d107466cf..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig
-, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage
-, kwidgetsaddons, kwindowsystem, makeQtWrapper, pkgconfig
-, qtdeclarative
-}:
-
-kdeFramework {
-  name = "kdeclarative";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [
-    epoxy kguiaddons kiconthemes kwidgetsaddons
-  ];
-  propagatedBuildInputs = [
-    kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kpackagelauncherqml"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kded.nix b/pkgs/development/libraries/kde-frameworks-5.19/kded.nix
deleted file mode 100644
index 47ae2d68c68..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kded.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kconfig
-, kcoreaddons
-, kcrash
-, kdbusaddons
-, kdoctools
-, kinit
-, kservice
-}:
-
-kdeFramework {
-  name = "kded";
-  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ];
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix
deleted file mode 100644
index 843db83a99b..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules, docbook_xml_dtd_45, kauth
-, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
-, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons
-, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
-, kinit, knotifications, kparts, kservice, ktextwidgets
-, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui
-, networkmanager, qtsvg, qtx11extras, xlibs
-}:
-
-# TODO: debug docbook detection
-
-kdeFramework {
-  name = "kdelibs4support";
-  outputs = [ "dev" "out" ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  setupHook = ./setup-hook.sh;
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [
-    kcompletion kconfig kded kservice kwidgetsaddons
-    kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
-  ];
-  propagatedBuildInputs = [
-    kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
-    kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio
-    kiconthemes kitemmodels kinit knotifications kparts ktextwidgets
-    kunitconversion kwindowsystem
-  ];
-  cmakeFlags = [
-    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-    "-DDocBookXML4_DTD_VERSION=4.5"
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
deleted file mode 100644
index eabb7025448..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp
-===================================================================
---- kdelibs4support-5.18.0.orig/src/kdecore/kstandarddirs.cpp
-+++ kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp
-@@ -292,7 +292,7 @@ static QString relativeInstallPath(const
-             return QFile::decodeName(ICON_INSTALL_DIR "/");
-         }
-         if (strcmp("include", type) == 0) {
--            return QFile::decodeName(INCLUDE_INSTALL_DIR "/");
-+            return QFile::decodeName(qgetenv("NIX_KDE_INCLUDE_DIR"));
-         }
-         break;
-     case 'l':
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series
deleted file mode 100644
index 9b08ab20877..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series
+++ /dev/null
@@ -1 +0,0 @@
-nix-kde-include-dir.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh
deleted file mode 100644
index 21ac2e83b5d..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh
+++ /dev/null
@@ -1 +0,0 @@
-export NIX_KDE_INCLUDE_DIR="@dev@/include/"  # trailing slash is required!
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix
deleted file mode 100644
index cbc114ccca0..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ kdeFramework, lib, makeQtWrapper
-, extra-cmake-modules
-, kcompletion
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kdewebkit
-, kdoctools
-, kiconthemes
-, kio
-, kitemviews
-, kplotting
-, ktextwidgets
-, kwidgetsaddons
-, kxmlgui
-, sonnet
-}:
-
-kdeFramework {
-  name = "kdesignerplugin";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit
-    kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons
-    kxmlgui
-  ];
-  propagatedBuildInputs = [ kio sonnet ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kgendesignerplugin"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix
deleted file mode 100644
index 364fbd6a720..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty
-, kservice
-}:
-
-kdeFramework {
-  name = "kdesu";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kservice ];
-  propagatedBuildInputs = [ ki18n kpty ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix
deleted file mode 100644
index d361313d1d4..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, ki18n, kio, kjobwidgets, kparts, kservice, kwallet, qtwebkit
-}:
-
-kdeFramework {
-  name = "kdewebkit";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kconfig kcoreaddons kjobwidgets kparts kservice kwallet ];
-  propagatedBuildInputs = [ ki18n kio qtwebkit ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix
deleted file mode 100644
index f00432b0c9c..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, avahi
-}:
-
-kdeFramework {
-  name = "kdnssd";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ avahi ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix
deleted file mode 100644
index f67c19f4239..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45
-, docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages
-}:
-
-kdeFramework {
-  name = "kdoctools";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ karchive ];
-  propagatedBuildInputs = [ ki18n ];
-  propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ];
-  cmakeFlags = [
-    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-    "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
-  ];
-  patches = [ ./kdoctools-no-find-docbook-xml.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
deleted file mode 100644
index 4e3a33efab3..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5c4863c..f731775 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES
-                       )
- 
- 
--find_package(DocBookXML4 "4.5")
- 
- set_package_properties(DocBookXML4 PROPERTIES
-                        TYPE REQUIRED
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix
deleted file mode 100644
index d165f84e3a2..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, karchive
-, kconfig
-, kcoreaddons
-, kservice
-}:
-
-kdeFramework {
-  name = "kemoticons";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ karchive kconfig kcoreaddons ];
-  propagatedBuildInputs = [ kservice ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch
deleted file mode 100644
index 732f7b69c82..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kfilemetadata-5.18.0/src/CMakeLists.txt
-===================================================================
---- kfilemetadata-5.18.0.orig/src/CMakeLists.txt
-+++ kfilemetadata-5.18.0/src/CMakeLists.txt
-@@ -49,7 +49,7 @@ install(TARGETS KF5FileMetaData EXPORT K
- 
- install(EXPORT KF5FileMetaDataTargets
-         NAMESPACE KF5::
--        DESTINATION ${LIB_INSTALL_DIR}/cmake/KF5FileMetaData
-+        DESTINATION ${KDE_INSTALL_FULL_CMAKEPACKAGEDIR}/KF5FileMetaData
-         FILE KF5FileMetaDataTargets.cmake)
- 
- install(FILES
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix
deleted file mode 100644
index 9bb4831cf8d..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules
-, attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
-}:
-
-kdeFramework {
-  name = "kfilemetadata";
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ];
-  propagatedBuildInputs = [ qtbase ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series
deleted file mode 100644
index d2689425c38..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series
+++ /dev/null
@@ -1 +0,0 @@
-cmake-install-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix
deleted file mode 100644
index c535b3590a3..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kconfig
-, kcoreaddons
-, kcrash
-, kdbusaddons
-, kwindowsystem
-, makeQtWrapper
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kglobalaccel";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kglobalaccel5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix
deleted file mode 100644
index bc4e9ab1184..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kguiaddons";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix
deleted file mode 100644
index d40df466ebb..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, giflib, karchive
-, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs
-, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons
-, kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet
-}:
-
-kdeFramework {
-  name = "khtml";
-  nativeBuildInputs = [ extra-cmake-modules perl ];
-  buildInputs = [
-    giflib karchive kiconthemes knotifications kwallet kwidgetsaddons
-    kxmlgui phonon
-  ];
-  propagatedBuildInputs = [
-    kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets
-    kwindowsystem qtx11extras sonnet
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix
deleted file mode 100644
index 268006512e7..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, gettext
-, python
-, qtdeclarative
-, qtscript
-}:
-
-kdeFramework {
-  name = "ki18n";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtdeclarative qtscript ];
-  propagatedNativeBuildInputs = [ gettext python ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch
deleted file mode 100644
index 5b3b15d5d5b..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kiconthemes-5.17.0/src/kicontheme.cpp
-===================================================================
---- kiconthemes-5.17.0.orig/src/kicontheme.cpp
-+++ kiconthemes-5.17.0/src/kicontheme.cpp
-@@ -557,7 +557,7 @@ void KIconTheme::reconfigure()
- // static
- QString KIconTheme::defaultThemeName()
- {
--    return QStringLiteral("oxygen");
-+    return QStringLiteral("breeze");
- }
- 
- void KIconTheme::assignIconsToContextMenu(ContextMenus type,
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix
deleted file mode 100644
index b78b25582be..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules, makeQtWrapper
-, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg
-}:
-
-kdeFramework {
-  name = "kiconthemes";
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ kconfigwidgets kitemviews qtsvg ];
-  propagatedBuildInputs = [ breeze-icons ki18n ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kiconfinder5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series
deleted file mode 100644
index ab5cc8a3edb..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series
+++ /dev/null
@@ -1 +0,0 @@
-default-theme-breeze.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix
deleted file mode 100644
index fc086560023..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtbase
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kidletime";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  propagatedBuildInputs = [ qtbase ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix
deleted file mode 100644
index 49d66bbcc2c..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, ilmbase
-}:
-
-kdeFramework {
-  name = "kimageformats";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch
deleted file mode 100644
index 9c76079a382..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sat, 13 Jun 2015 08:57:55 -0500
-Subject: [PATCH] kinit libpath
-
----
- src/kdeinit/kinit.cpp | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
-index 9e775b6..0ac5646 100644
---- a/src/kdeinit/kinit.cpp
-+++ b/src/kdeinit/kinit.cpp
-@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
-         if (!libpath.isEmpty()) {
-             if (!l.load()) {
-                 if (libpath_relative) {
--                    // NB: Because Qt makes the actual dlopen() call, the
--                    //     RUNPATH of kdeinit is *not* respected - see
--                    //     https://sourceware.org/bugzilla/show_bug.cgi?id=13945
--                    //     - so we try hacking it in ourselves
--                    QString install_lib_dir = QFile::decodeName(
--                            CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
--                    libpath = install_lib_dir + libpath;
--                    l.setFileName(libpath);
-+                  // Use QT_PLUGIN_PATH to find shared library directories
-+                  // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5
-+                  // shared libraries should be in /lib/qt5/plugins/../../
-+                  const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]"));
-+                  const QString up = QString::fromLocal8Bit("/../../");
-+                  const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts);
-+                  Q_FOREACH (const QString &path, paths) {
-+                    l.setFileName(path + up + libpath);
-                     l.load();
-+                    if (l.isLoaded()) break;
-+                  }
-                 }
-             }
-             if (!l.isLoaded()) {
--- 
-2.4.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix
deleted file mode 100644
index 5f644d7c424..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcrash
-, kdoctools, ki18n, kio, kservice, kwindowsystem, libcap
-, libcap_progs
-}:
-
-# TODO: setuid wrapper
-
-kdeFramework {
-  name = "kinit";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ];
-  buildInputs = [ kconfig kcrash kservice libcap ];
-  propagatedBuildInputs = [ ki18n kio kwindowsystem ];
-  patches = [ ./0001-kinit-libpath.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix
deleted file mode 100644
index a2131ff3385..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules, acl, karchive
-, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons
-, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews
-, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet
-, kwidgetsaddons, kwindowsystem, kxmlgui, makeQtWrapper
-, qtscript, qtx11extras, solid
-}:
-
-kdeFramework {
-  name = "kio";
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    acl karchive kconfig kcoreaddons kdbusaddons kiconthemes
-    knotifications ktextwidgets kwallet kwidgetsaddons
-    qtscript
-  ];
-  propagatedBuildInputs = [
-    kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets
-    kservice kwindowsystem kxmlgui solid qtx11extras
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kcookiejar5"
-    wrapQtProgram "$out/bin/ktelnetservice5"
-    wrapQtProgram "$out/bin/ktrash5"
-    wrapQtProgram "$out/bin/kmailservice5"
-    wrapQtProgram "$out/bin/protocoltojson"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch b/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch
deleted file mode 100644
index c9ad46b41bb..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: kio-5.17.0/src/core/ksambashare.cpp
-===================================================================
---- kio-5.17.0.orig/src/core/ksambashare.cpp
-+++ kio-5.17.0/src/core/ksambashare.cpp
-@@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate(
- 
- bool KSambaSharePrivate::isSambaInstalled()
- {
--    if (QFile::exists(QStringLiteral("/usr/sbin/smbd"))
--            || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) {
--        return true;
-+    const QByteArray pathEnv = qgetenv("PATH");
-+    if (!pathEnv.isEmpty()) {
-+        QLatin1Char pathSep(':');
-+        QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts);
-+        for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) {
-+            it->append("/smbd");
-+            if (QFile::exists(*it)) {
-+                return true;
-+            }
-+        }
-     }
- 
--    //qDebug() << "Samba is not installed!";
--
-     return false;
- }
- 
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/series b/pkgs/development/libraries/kde-frameworks-5.19/kio/series
deleted file mode 100644
index 77ca1545004..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kio/series
+++ /dev/null
@@ -1 +0,0 @@
-samba-search-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix
deleted file mode 100644
index a9024d771cc..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kitemmodels";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix
deleted file mode 100644
index 931019ce495..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kitemviews";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix
deleted file mode 100644
index 746edf12eea..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcoreaddons
-, kwidgetsaddons
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kjobwidgets";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kwidgetsaddons ];
-  propagatedBuildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix
deleted file mode 100644
index 768720f178c..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kdoctools
-, makeQtWrapper
-}:
-
-kdeFramework {
-  name = "kjs";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kjs5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix
deleted file mode 100644
index 22eef2d47bd..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs
-, makeQtWrapper, qtsvg
-}:
-
-kdeFramework {
-  name = "kjsembed";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ qtsvg ];
-  propagatedBuildInputs = [ ki18n kjs ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kjscmd5"
-    wrapQtProgram "$out/bin/kjsconsole"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix
deleted file mode 100644
index 460458b2232..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kparts
-, kxmlgui
-}:
-
-kdeFramework {
-  name = "kmediaplayer";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kxmlgui ];
-  propagatedBuildInputs = [ kparts ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix
deleted file mode 100644
index 5bcd6f30146..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, attica, karchive
-, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio
-, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui
-}:
-
-kdeFramework {
-  name = "knewstuff";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    karchive kcompletion kconfig kcoreaddons kiconthemes
-    kitemviews ktextwidgets kwidgetsaddons
-  ];
-  propagatedBuildInputs = [ attica ki18n kio kservice kxmlgui ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix
deleted file mode 100644
index 7e301dd0f26..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcodecs
-, kconfig
-, kcoreaddons
-, kwindowsystem
-, phonon
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "knotifications";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcodecs kconfig kcoreaddons phonon
-  ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix
deleted file mode 100644
index dd99d2d4f1e..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
-, ki18n, kio, phonon
-}:
-
-kdeFramework {
-  name = "knotifyconfig";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcompletion kconfig phonon ];
-  propagatedBuildInputs = [ ki18n kio ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch
deleted file mode 100644
index e9d74444814..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kpackage-5.18.0/src/kpackage/package.cpp
-===================================================================
---- kpackage-5.18.0.orig/src/kpackage/package.cpp
-+++ kpackage-5.18.0/src/kpackage/package.cpp
-@@ -808,7 +808,7 @@ PackagePrivate::PackagePrivate()
-     : QSharedData(),
-       fallbackPackage(0),
-       metadata(0),
--      externalPaths(false),
-+      externalPaths(true),
-       valid(false),
-       checkedValid(false)
- {
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix
deleted file mode 100644
index aea1b0d31a0..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules
-, karchive
-, kconfig
-, kcoreaddons
-, kdoctools
-, ki18n
-, makeQtWrapper
-}:
-
-kdeFramework {
-  name = "kpackage";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ karchive kconfig ];
-  propagatedBuildInputs = [ kcoreaddons ki18n ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  postInstall = ''
-    wrapQtProgram "$out/bin/kpackagetool5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
deleted file mode 100644
index ddbf17d0006..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: kpackage-5.18.0/src/kpackage/packageloader.cpp
-===================================================================
---- kpackage-5.18.0.orig/src/kpackage/packageloader.cpp
-+++ kpackage-5.18.0/src/kpackage/packageloader.cpp
-@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::li
-         } else {
-             //qDebug() << "Not cached";
-             // If there's no cache file, fall back to listing the directory
--            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
-+            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
-             const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")) << QStringLiteral("metadata.json");
- 
-             QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
-Index: kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
-===================================================================
---- kpackage-5.18.0.orig/src/kpackage/private/packagejobthread.cpp
-+++ kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
-@@ -146,7 +146,7 @@ bool indexDirectory(const QString& dir,
- 
-     QJsonArray plugins;
- 
--    QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories);
-+    QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-     while (it.hasNext()) {
-         it.next();
-         const QString path = it.fileInfo().absoluteFilePath();
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series
deleted file mode 100644
index 9b7f076efc7..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series
+++ /dev/null
@@ -1,2 +0,0 @@
-allow-external-paths.patch
-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix
deleted file mode 100644
index 1c3e0b2cbc5..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice
-, ktextwidgets, kwidgetsaddons, kxmlgui
-}:
-
-kdeFramework {
-  name = "kparts";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kconfig kcoreaddons kiconthemes kjobwidgets knotifications
-    kservice kwidgetsaddons
-  ];
-  propagatedBuildInputs = [ ki18n kio ktextwidgets kxmlgui ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix
deleted file mode 100644
index 4c3877e7efd..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n
-, kitemviews, kservice, kwidgetsaddons, qtdeclarative
-}:
-
-kdeFramework {
-  name = "kpeople";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcoreaddons kitemviews kservice kwidgetsaddons
-  ];
-  propagatedBuildInputs = [ ki18n qtdeclarative ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix b/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix
deleted file mode 100644
index c16f51b5ac3..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kplotting";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix
deleted file mode 100644
index 2e34e6f674c..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }:
-
-kdeFramework {
-  name = "kpty";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kcoreaddons ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kross.nix b/pkgs/development/libraries/kde-frameworks-5.19/kross.nix
deleted file mode 100644
index 7c6f079feaa..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kross.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons
-, kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons
-, kxmlgui, qtscript
-}:
-
-kdeFramework {
-  name = "kross";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ kcompletion kcoreaddons kxmlgui ];
-  propagatedBuildInputs = [ ki18n kiconthemes kio kparts kwidgetsaddons qtscript ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix
deleted file mode 100644
index 12d2b54d0eb..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, ki18n, kio, kservice, plasma-framework, qtquick1, solid
-, threadweaver
-}:
-
-kdeFramework {
-  name = "krunner";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kconfig kcoreaddons kservice qtquick1 solid threadweaver
-  ];
-  propagatedBuildInputs = [ ki18n kio plasma-framework ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index 3d8397d8ee2..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ae8919eb81abad369e4a26ffcd845b140983398d Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:28:57 -0500
-Subject: [PATCH 1/2] qdiriterator follow symlinks
-
----
- src/sycoca/kbuildsycoca.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp
-index 1deae14..250baa8 100644
---- a/src/sycoca/kbuildsycoca.cpp
-+++ b/src/sycoca/kbuildsycoca.cpp
-@@ -208,7 +208,7 @@ bool KBuildSycoca::build()
-         QStringList relFiles;
-         const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory);
-         Q_FOREACH (const QString &dir, dirs) {
--            QDirIterator it(dir, QDirIterator::Subdirectories);
-+            QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-             while (it.hasNext()) {
-                 const QString filePath = it.next();
-                 Q_ASSERT(filePath.startsWith(dir)); // due to the line below...
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch
deleted file mode 100644
index 685c6852611..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:31:29 -0500
-Subject: [PATCH 2/2] no canonicalize path
-
----
- src/sycoca/vfolder_menu.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sycoca/vfolder_menu.cpp b/src/sycoca/vfolder_menu.cpp
-index d3e31c3..d15d743 100644
---- a/src/sycoca/vfolder_menu.cpp
-+++ b/src/sycoca/vfolder_menu.cpp
-@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
-     }
- 
-     if (!relative) {
--        QString resolved = QDir(dir).canonicalPath();
-+      QString resolved = QDir::cleanPath(dir);
-         if (!resolved.isEmpty()) {
-             dir = resolved;
-         }
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix
deleted file mode 100644
index 3a27d85b916..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
-}:
-
-kdeFramework {
-  name = "kservice";
-  propagatedNativeBuildInputs = [ extra-cmake-modules ];
-  nativeBuildInputs = [ kdoctools ];
-  buildInputs = [ kcrash kdbusaddons ];
-  propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ];
-  patches = [
-    ./0001-qdiriterator-follow-symlinks.patch
-    ./0002-no-canonicalize-path.patch
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix
deleted file mode 100644
index b8df6a5f4c0..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules, makeQtWrapper, perl
-, karchive, kconfig, kguiaddons, kiconthemes, kparts
-, libgit2
-, qtscript, qtxmlpatterns
-, ki18n, kio, sonnet
-}:
-
-kdeFramework {
-  name = "ktexteditor";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper perl ];
-  buildInputs = [
-    karchive kconfig kguiaddons kiconthemes kparts
-    libgit2
-    qtscript qtxmlpatterns
-  ];
-  propagatedBuildInputs = [ ki18n kio sonnet ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch
deleted file mode 100644
index 19ab1e1e551..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp
-===================================================================
---- ktexteditor-5.18.0.orig/src/syntax/data/katehighlightingindexer.cpp
-+++ ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp
-@@ -55,19 +55,16 @@ QStringList readListing(const QString &f
- 
- int main(int argc, char *argv[])
- {
--    // get app instance
--    QCoreApplication app(argc, argv);
--
-     // ensure enough arguments are passed
--    if (app.arguments().size() < 3)
-+    if (argc < 3)
-         return 1;
- 
-     // open schema
-     QXmlSchema schema;
--    if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2))))
-+    if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2]))))
-         return 2;
- 
--    const QString hlFilenamesListing = app.arguments().value(3);
-+    const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]);
-     if (hlFilenamesListing.isEmpty()) {
-         return 1;
-     }
-@@ -152,7 +149,7 @@ int main(int argc, char *argv[])
-         return anyError;
- 
-     // create outfile, after all has worked!
--    QFile outFile(app.arguments().at(1));
-+    QFile outFile(QString::fromLocal8Bit(argv[1]));
-     if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
-         return 7;
- 
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series
deleted file mode 100644
index 46cd23829a2..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series
+++ /dev/null
@@ -1 +0,0 @@
-no-qcoreapplication.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix
deleted file mode 100644
index e332d4ff9a8..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
-, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem
-, sonnet
-}:
-
-kdeFramework {
-  name = "ktextwidgets";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcompletion kconfig kconfigwidgets kiconthemes kservice
-  ];
-  propagatedBuildInputs = [ ki18n kwindowsystem sonnet ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix
deleted file mode 100644
index 3cf0f847d83..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, ki18n }:
-
-kdeFramework {
-  name = "kunitconversion";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix
deleted file mode 100644
index 5ade5f63a8d..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets
-, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes
-, knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt
-, makeQtWrapper }:
-
-kdeFramework {
-  name = "kwallet";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
-    knotifications kservice kwidgetsaddons libgcrypt
-  ];
-  propagatedBuildInputs = [ ki18n kwindowsystem ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kwalletd5"
-    wrapQtProgram "$out/bin/kwallet-query"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix
deleted file mode 100644
index d95f44d3fec..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kwidgetsaddons";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix
deleted file mode 100644
index 09ab1f2200d..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kwindowsystem";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix
deleted file mode 100644
index f081d5f9170..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, attica, kconfig
-, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews
-, ktextwidgets, kwindowsystem, sonnet
-}:
-
-kdeFramework {
-  name = "kxmlgui";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    attica kconfig kiconthemes kitemviews ktextwidgets
-  ];
-  propagatedBuildInputs = [
-    kconfigwidgets kglobalaccel ki18n kwindowsystem sonnet
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix
deleted file mode 100644
index 20a300b68bc..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }:
-
-kdeFramework {
-  name = "kxmlrpcclient";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ ki18n kio ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix
deleted file mode 100644
index 7d7f769d6a9..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, modemmanager
-}:
-
-kdeFramework {
-  name = "modemmanager-qt";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ modemmanager ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix
deleted file mode 100644
index 333378bd143..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, networkmanager
-}:
-
-kdeFramework {
-  name = "networkmanager-qt";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ networkmanager ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix
deleted file mode 100644
index ee350f8e153..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework
-, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "oxygen-icons5";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    license = lib.licenses.lgpl3Plus;
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix
deleted file mode 100644
index d8846f77723..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kactivities, karchive
-, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
-, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio
-, knotifications, kpackage, kservice, kwindowsystem, kxmlgui
-, makeQtWrapper, qtscript, qtx11extras
-}:
-
-kdeFramework {
-  name = "plasma-framework";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons
-    kiconthemes knotifications kxmlgui qtscript
-  ];
-  propagatedBuildInputs = [
-    kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice kwindowsystem
-    qtx11extras
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/plasmapkg2"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/solid.nix b/pkgs/development/libraries/kde-frameworks-5.19/solid.nix
deleted file mode 100644
index afd125e3c59..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/solid.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, makeQtWrapper
-, qtdeclarative
-}:
-
-kdeFramework {
-  name = "solid";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ qtdeclarative ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/solid-hardware5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix
deleted file mode 100644
index 943fe04a1c9..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, hunspell
-}:
-
-kdeFramework {
-  name = "sonnet";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ hunspell ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix
deleted file mode 100644
index b86c0b71224..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix
+++ /dev/null
@@ -1,565 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-  attica = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/attica-5.19.0.tar.xz";
-      sha256 = "0cbvjnv2fcqsxspiy5pzmnnzrpfamlsc9j927kd6gpzai1ckf1lv";
-      name = "attica-5.19.0.tar.xz";
-    };
-  };
-  baloo = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/baloo-5.19.0.tar.xz";
-      sha256 = "02yy0w13h5wxm74a87zi439f6yd9miid6rb54nia0pgvcka98svg";
-      name = "baloo-5.19.0.tar.xz";
-    };
-  };
-  bluez-qt = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/bluez-qt-5.19.0.tar.xz";
-      sha256 = "0609i7rzhnnnp4fqnwscwp6y646ji8kl2hw5sy7azc87yllisnyv";
-      name = "bluez-qt-5.19.0.tar.xz";
-    };
-  };
-  breeze-icons = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/breeze-icons-5.19.0.tar.xz";
-      sha256 = "0bwix0jl1dscqfb7ygn9drpd9ivfx4g15vz6h01mswvxa9lz1vj0";
-      name = "breeze-icons-5.19.0.tar.xz";
-    };
-  };
-  extra-cmake-modules = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/extra-cmake-modules-5.19.0.tar.xz";
-      sha256 = "1dl3hhbara7iswb5wsc5dp17ar3ljw5f0nrncl8vry9smaz2zl63";
-      name = "extra-cmake-modules-5.19.0.tar.xz";
-    };
-  };
-  frameworkintegration = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/frameworkintegration-5.19.0.tar.xz";
-      sha256 = "00la7p7wcyqpxyi73h4fjrmm9d2gqzdaljn4468xya4bfns5ijy3";
-      name = "frameworkintegration-5.19.0.tar.xz";
-    };
-  };
-  kactivities = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kactivities-5.19.0.tar.xz";
-      sha256 = "0yml1sbn3z4jd4vsfs25kqrl03pmlcgamzbgpw3248sabhyg7ks3";
-      name = "kactivities-5.19.0.tar.xz";
-    };
-  };
-  kapidox = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kapidox-5.19.0.tar.xz";
-      sha256 = "0a9731xrkd6mnqh72592rx6gfnxxdfd7xl8pdpgdn7qs3394k1yz";
-      name = "kapidox-5.19.0.tar.xz";
-    };
-  };
-  karchive = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/karchive-5.19.0.tar.xz";
-      sha256 = "043spmi7s2d1bj8d3wbgzbhisip6h92kqjhlvg8gyv0a7vy54ymv";
-      name = "karchive-5.19.0.tar.xz";
-    };
-  };
-  kauth = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kauth-5.19.0.tar.xz";
-      sha256 = "0fm9ih2hkh2rpmlf98yw8z1r5bn2qmpva2k7mrv6ijd5h767fxss";
-      name = "kauth-5.19.0.tar.xz";
-    };
-  };
-  kbookmarks = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kbookmarks-5.19.0.tar.xz";
-      sha256 = "0q418jpdc348nqgdavsmxxka4g8sldpdi9n89i1pllfmq10kw9sd";
-      name = "kbookmarks-5.19.0.tar.xz";
-    };
-  };
-  kcmutils = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kcmutils-5.19.0.tar.xz";
-      sha256 = "0qhdjb3zvqq9ycfgb52lz4flgipyplj5ksz8h8y71bbs4w6lazd8";
-      name = "kcmutils-5.19.0.tar.xz";
-    };
-  };
-  kcodecs = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kcodecs-5.19.0.tar.xz";
-      sha256 = "1rzp314fv9n5168j7nhv1c8fjaszpmgdx6javrx4w0hyrjdfkg66";
-      name = "kcodecs-5.19.0.tar.xz";
-    };
-  };
-  kcompletion = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kcompletion-5.19.0.tar.xz";
-      sha256 = "05n0y5kf3bcc4wgn6k0js5cravv1k93xxzrgapm21323qgvfagwd";
-      name = "kcompletion-5.19.0.tar.xz";
-    };
-  };
-  kconfig = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kconfig-5.19.0.tar.xz";
-      sha256 = "0nk5hfl8yh0kgaa7xi0cc05dl6nf7prvbvxv0i99207xh9dafdmm";
-      name = "kconfig-5.19.0.tar.xz";
-    };
-  };
-  kconfigwidgets = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kconfigwidgets-5.19.0.tar.xz";
-      sha256 = "1nld27chcjwjgwv76s2j77ifmca235yp10bm08rjmvnfn6778ypv";
-      name = "kconfigwidgets-5.19.0.tar.xz";
-    };
-  };
-  kcoreaddons = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kcoreaddons-5.19.0.tar.xz";
-      sha256 = "07sm0givfdx28p302fkynzsd3xkpn1hbs43d4rscyx18yxfsldcw";
-      name = "kcoreaddons-5.19.0.tar.xz";
-    };
-  };
-  kcrash = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kcrash-5.19.0.tar.xz";
-      sha256 = "1dy03gp1sj96wn0zfa0dpbvz8pz0ia1j7p1wcif3iqk55pjxdgyl";
-      name = "kcrash-5.19.0.tar.xz";
-    };
-  };
-  kdbusaddons = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kdbusaddons-5.19.0.tar.xz";
-      sha256 = "1bb5aik0kl3kab5399drfjxrm8iysgkf813xgr0y4k64c9kwfp28";
-      name = "kdbusaddons-5.19.0.tar.xz";
-    };
-  };
-  kdeclarative = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kdeclarative-5.19.0.tar.xz";
-      sha256 = "03g02zy7wjzmpvqzxx32z8ap7jyj9sf432g1d3csb0dcbx2ny52g";
-      name = "kdeclarative-5.19.0.tar.xz";
-    };
-  };
-  kded = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kded-5.19.0.tar.xz";
-      sha256 = "0nyvg0h2aqy7qr57bad6wyc2rmcv9nhdq0py4fxc3irb6516p9hz";
-      name = "kded-5.19.0.tar.xz";
-    };
-  };
-  kdelibs4support = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/portingAids/kdelibs4support-5.19.0.tar.xz";
-      sha256 = "0iqnb2j6gfy8006arwv65vljfhxdnk6aia0zppngb481jnd9n2pn";
-      name = "kdelibs4support-5.19.0.tar.xz";
-    };
-  };
-  kdesignerplugin = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kdesignerplugin-5.19.0.tar.xz";
-      sha256 = "11inmvyair796rx4842naf1dnxqvc6bqqzrv700ycvisad646ws5";
-      name = "kdesignerplugin-5.19.0.tar.xz";
-    };
-  };
-  kdesu = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kdesu-5.19.0.tar.xz";
-      sha256 = "19w8m7ji61bpd368lzkwlizcwa1l968l568lksgm2mm9pnyjjhgz";
-      name = "kdesu-5.19.0.tar.xz";
-    };
-  };
-  kdewebkit = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kdewebkit-5.19.0.tar.xz";
-      sha256 = "04b5qanhxggffnvmi28lspyi8kj4kq7mxhxndar9fmkzzgvy70hj";
-      name = "kdewebkit-5.19.0.tar.xz";
-    };
-  };
-  kdnssd = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kdnssd-5.19.0.tar.xz";
-      sha256 = "15a8w2i29mrbhadw6y123mr0cc45ijabnwdfp3lbkd40lk8nq314";
-      name = "kdnssd-5.19.0.tar.xz";
-    };
-  };
-  kdoctools = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kdoctools-5.19.0.tar.xz";
-      sha256 = "06g77n9wxpiv4skc1kz794ppfb2mkmd3fgn6an5kr301xc76cnpn";
-      name = "kdoctools-5.19.0.tar.xz";
-    };
-  };
-  kemoticons = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kemoticons-5.19.0.tar.xz";
-      sha256 = "0fiix2sf2wrvmrpx8whdr1bzm7gbv7pvg02y47w5bl6s9gh176g5";
-      name = "kemoticons-5.19.0.tar.xz";
-    };
-  };
-  kfilemetadata = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kfilemetadata-5.19.0.tar.xz";
-      sha256 = "11j8if3xhp3xxwibwm6nxb4lh8wx40ni3zf5hki327pxv4vpq3qr";
-      name = "kfilemetadata-5.19.0.tar.xz";
-    };
-  };
-  kglobalaccel = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kglobalaccel-5.19.0.tar.xz";
-      sha256 = "021j98f7217m83aqxpamg0lzlaiskdaqsd9iabc8wrp1g0nkm05d";
-      name = "kglobalaccel-5.19.0.tar.xz";
-    };
-  };
-  kguiaddons = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kguiaddons-5.19.0.tar.xz";
-      sha256 = "019xaf7vpgifcw8wibli9d2b50brhgdaypsqknh6mqq8q9g06jhy";
-      name = "kguiaddons-5.19.0.tar.xz";
-    };
-  };
-  khtml = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/portingAids/khtml-5.19.0.tar.xz";
-      sha256 = "0hqa54a9nxy954vy8gf52y89xd3ibz9b4jgh6w347b1alp1zn145";
-      name = "khtml-5.19.0.tar.xz";
-    };
-  };
-  ki18n = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/ki18n-5.19.0.tar.xz";
-      sha256 = "0v3arc20y5d8afm9zfrz1skd2xg3ng62cq1xvxiq645w6mxf7y05";
-      name = "ki18n-5.19.0.tar.xz";
-    };
-  };
-  kiconthemes = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kiconthemes-5.19.0.tar.xz";
-      sha256 = "0riicirgda3w2b30dzsa2lq9xrr4y04qwhxyzq1p8gn2x4pp3g3n";
-      name = "kiconthemes-5.19.0.tar.xz";
-    };
-  };
-  kidletime = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kidletime-5.19.0.tar.xz";
-      sha256 = "0jlbzqv36ddhfhk8xkkgw0xhq8s371z9ama1cyv2xq8kk4vjywc6";
-      name = "kidletime-5.19.0.tar.xz";
-    };
-  };
-  kimageformats = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kimageformats-5.19.0.tar.xz";
-      sha256 = "1ydizc6b0ncndazk62h8y249yfcx381pwzyivfpka1f69zfgyvv5";
-      name = "kimageformats-5.19.0.tar.xz";
-    };
-  };
-  kinit = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kinit-5.19.0.tar.xz";
-      sha256 = "03l7pijqdnnsfg6yz9p73p7xa86sldayggl6rc5hpkzmgyczcfzm";
-      name = "kinit-5.19.0.tar.xz";
-    };
-  };
-  kio = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kio-5.19.0.tar.xz";
-      sha256 = "0c7smp7cajivx53shy65mp9zcc51pha9iyvh37dggfflxy3xf9nv";
-      name = "kio-5.19.0.tar.xz";
-    };
-  };
-  kitemmodels = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kitemmodels-5.19.0.tar.xz";
-      sha256 = "0skmim986qnncbzd84vm1wp1fr41jn04af2dgckirsk23d35bln7";
-      name = "kitemmodels-5.19.0.tar.xz";
-    };
-  };
-  kitemviews = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kitemviews-5.19.0.tar.xz";
-      sha256 = "118zv46mvrfwbvl06bb1m8axv92wnp4pfs36hsxvnjl7gfjk5xjn";
-      name = "kitemviews-5.19.0.tar.xz";
-    };
-  };
-  kjobwidgets = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kjobwidgets-5.19.0.tar.xz";
-      sha256 = "1qzf8nzy8rxkdai9aj2lyrww90245v0p2q115xiz73bsg9rahmji";
-      name = "kjobwidgets-5.19.0.tar.xz";
-    };
-  };
-  kjs = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/portingAids/kjs-5.19.0.tar.xz";
-      sha256 = "08m01762hb25vm020g3v37bh40cgvcfrj45ql135klx96x9imfaf";
-      name = "kjs-5.19.0.tar.xz";
-    };
-  };
-  kjsembed = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/portingAids/kjsembed-5.19.0.tar.xz";
-      sha256 = "1wmkgy8jgm21y2cvcbv1fdv29dxxla8n6ws78kzzbbw4cgqwwl48";
-      name = "kjsembed-5.19.0.tar.xz";
-    };
-  };
-  kmediaplayer = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/portingAids/kmediaplayer-5.19.0.tar.xz";
-      sha256 = "1vhqr2c7q8vwzdj29vpmfjfhyal8wp9ffirrnqc98vb6sffs85ay";
-      name = "kmediaplayer-5.19.0.tar.xz";
-    };
-  };
-  knewstuff = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/knewstuff-5.19.0.tar.xz";
-      sha256 = "12acd12vxk9z83zg3yz8lvmmb8737z9lzd4hs9a3jcs1z5k2nhb4";
-      name = "knewstuff-5.19.0.tar.xz";
-    };
-  };
-  knotifications = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/knotifications-5.19.0.tar.xz";
-      sha256 = "0grgm0ws16gp2j77nslqpl1jpxbi0m6g59zr7v1xnmzdk2j6n4av";
-      name = "knotifications-5.19.0.tar.xz";
-    };
-  };
-  knotifyconfig = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/knotifyconfig-5.19.0.tar.xz";
-      sha256 = "161brvryxzdkny7sf6icn1jpyi6rnw6jc808gdf5g41v50xpnxfj";
-      name = "knotifyconfig-5.19.0.tar.xz";
-    };
-  };
-  kpackage = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kpackage-5.19.0.tar.xz";
-      sha256 = "1km4sjgxfljp2pnjnzj48q3c574zvj7341a57n4ifhjwj37yzxdv";
-      name = "kpackage-5.19.0.tar.xz";
-    };
-  };
-  kparts = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kparts-5.19.0.tar.xz";
-      sha256 = "05g59x2mrqygawzcwgw3igl5n96l649h0kpzh37sfq4i8kg15g7l";
-      name = "kparts-5.19.0.tar.xz";
-    };
-  };
-  kpeople = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kpeople-5.19.0.tar.xz";
-      sha256 = "1ksf6g71li1xk4q98cvwkam8m8g32x2815kj1gfwbg4g6iw74w98";
-      name = "kpeople-5.19.0.tar.xz";
-    };
-  };
-  kplotting = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kplotting-5.19.0.tar.xz";
-      sha256 = "169x4m9ms8yhfha8zclnl8wrnfhfqshpwwg4b5bd046pcrkqmnqq";
-      name = "kplotting-5.19.0.tar.xz";
-    };
-  };
-  kpty = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kpty-5.19.0.tar.xz";
-      sha256 = "0289vzfjwppwqj9h03flzhwm18dnxz11hqhdhr9990x7rw6a4n03";
-      name = "kpty-5.19.0.tar.xz";
-    };
-  };
-  kross = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/portingAids/kross-5.19.0.tar.xz";
-      sha256 = "1nv7mrhn7wa4bs2a164x42d3b37akyvhkxqs8cg5fqp4vr2wkw0p";
-      name = "kross-5.19.0.tar.xz";
-    };
-  };
-  krunner = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/portingAids/krunner-5.19.0.tar.xz";
-      sha256 = "054s8309lxi27gpbg7iygbcxsp0pwrzbzww3h8zp2a9yiic4s5mx";
-      name = "krunner-5.19.0.tar.xz";
-    };
-  };
-  kservice = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kservice-5.19.0.tar.xz";
-      sha256 = "02lbia26r2462nwksizaxjfkhxfqqs732dp495yx8bjc7wcv3srm";
-      name = "kservice-5.19.0.tar.xz";
-    };
-  };
-  ktexteditor = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/ktexteditor-5.19.0.tar.xz";
-      sha256 = "0v3l44w4k43ajs81i8386hszk3x7rajjlb6z3jb7q98vhp91b5dp";
-      name = "ktexteditor-5.19.0.tar.xz";
-    };
-  };
-  ktextwidgets = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/ktextwidgets-5.19.0.tar.xz";
-      sha256 = "1xydb76r6x1p10bkr2nlqg3md78jw8zvqad0h42dgvl4f5xvjknp";
-      name = "ktextwidgets-5.19.0.tar.xz";
-    };
-  };
-  kunitconversion = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kunitconversion-5.19.0.tar.xz";
-      sha256 = "11g1vhqkrb1k748drj7klkbb7jca3dybakcmcgqf53g8vxfih8kb";
-      name = "kunitconversion-5.19.0.tar.xz";
-    };
-  };
-  kwallet = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kwallet-5.19.0.tar.xz";
-      sha256 = "0z0c62fdfx9syrq6z7bk0ihac4yqyxpycll7h3mijj29km4jnpjm";
-      name = "kwallet-5.19.0.tar.xz";
-    };
-  };
-  kwidgetsaddons = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kwidgetsaddons-5.19.0.tar.xz";
-      sha256 = "0b85ng0dj5gpzifqmhyzgx61nb37vq7d0gvfpfazlcp5n27ywivm";
-      name = "kwidgetsaddons-5.19.0.tar.xz";
-    };
-  };
-  kwindowsystem = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kwindowsystem-5.19.0.tar.xz";
-      sha256 = "115xs34r74j9zcsw69glnh8w59iyh764n3gniawwrk23c6yb8fch";
-      name = "kwindowsystem-5.19.0.tar.xz";
-    };
-  };
-  kxmlgui = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kxmlgui-5.19.0.tar.xz";
-      sha256 = "1al2xifiyvl3zpva9nqap8gb6vqfgmf2fnhkmymm02rwg4yn4gah";
-      name = "kxmlgui-5.19.0.tar.xz";
-    };
-  };
-  kxmlrpcclient = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kxmlrpcclient-5.19.0.tar.xz";
-      sha256 = "0lji7cxvh2lmjz42lx6ymz962gr4cyqfzksz0n5vgzfk5z0vq98g";
-      name = "kxmlrpcclient-5.19.0.tar.xz";
-    };
-  };
-  modemmanager-qt = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/modemmanager-qt-5.19.0.tar.xz";
-      sha256 = "05x9jicryjw9fj02arpya8xsh79rsnljnqjfpwbb7pi38f9i8v4w";
-      name = "modemmanager-qt-5.19.0.tar.xz";
-    };
-  };
-  networkmanager-qt = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/networkmanager-qt-5.19.0.tar.xz";
-      sha256 = "0wi0mkygzbvvyil1nyzc3ihgilvpx6j7caqaa9k38p85g93vsq13";
-      name = "networkmanager-qt-5.19.0.tar.xz";
-    };
-  };
-  oxygen-icons5 = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/oxygen-icons5-5.19.0.tar.xz";
-      sha256 = "09vfwcyidj3bl0qr4sq78bkc69zp9x8dwp8bsay5y05q8591dkg0";
-      name = "oxygen-icons5-5.19.0.tar.xz";
-    };
-  };
-  plasma-framework = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/plasma-framework-5.19.0.tar.xz";
-      sha256 = "1588r1jag0s9hhw4qq7mr2mcdd3d9az5ngb3z1l58xdhvfcc4497";
-      name = "plasma-framework-5.19.0.tar.xz";
-    };
-  };
-  solid = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/solid-5.19.0.tar.xz";
-      sha256 = "02bnvhscb55r6q5hkyh7rqi6zsc3r974y3x9shi8l0xbs78snkgz";
-      name = "solid-5.19.0.tar.xz";
-    };
-  };
-  sonnet = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/sonnet-5.19.0.tar.xz";
-      sha256 = "02ringh0wyiq1n19c200bcyf5x2w5jhw0pcxvfjzjai1sjig03x7";
-      name = "sonnet-5.19.0.tar.xz";
-    };
-  };
-  threadweaver = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/threadweaver-5.19.0.tar.xz";
-      sha256 = "1jm1sw7xq76s2ggghm6qqdn7452myy9n7p5zzdb01qbaw2y1x4pw";
-      name = "threadweaver-5.19.0.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix
deleted file mode 100644
index 52817921cc7..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "threadweaver";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}

From a42f8459253d8f226d7d4611f057fc4d578a658c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 2 May 2016 09:53:29 +0200
Subject: [PATCH 583/712] coq-dpdgraph: init at 0.5

---
 .../coq-modules/dpdgraph/default.nix          | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/coq-modules/dpdgraph/default.nix

diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix
new file mode 100644
index 00000000000..0dec05ebd3f
--- /dev/null
+++ b/pkgs/development/coq-modules/dpdgraph/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, coq, ocamlPackages }:
+
+stdenv.mkDerivation {
+  name = "coq${coq.coq-version}-dpdgraph-0.5";
+  src = fetchFromGitHub {
+    owner = "Karmaki";
+    repo = "coq-dpdgraph";
+    rev = "227a6a28bf11cf1ea56f359160558965154dd176";
+    sha256 = "1vxf7qq37mnmlclkr394147xvrky3p98ar08c4wndwrp41gfbxhq";
+  };
+
+  buildInputs = [ coq ]
+  ++ (with ocamlPackages; [ ocaml findlib ocamlgraph ]);
+
+  preInstall = ''
+    mkdir -p $out/bin
+  '';
+
+  installFlags = ''
+    COQLIB=$(out)/lib/coq/${coq.coq-version}/
+    BINDIR=$(out)/bin
+  '';
+
+  meta = {
+    description = "Build dependency graphs between Coq objects";
+    license = stdenv.lib.licenses.lgpl21;
+    homepage = https://github.com/Karmaki/coq-dpdgraph/;
+    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    platforms = coq.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3137b95b07a..85c2afd4a54 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15882,6 +15882,8 @@ in
 
     coquelicot = callPackage ../development/coq-modules/coquelicot {};
 
+    dpdgraph = callPackage ../development/coq-modules/dpdgraph {};
+
     flocq = callPackage ../development/coq-modules/flocq {};
 
     interval = callPackage ../development/coq-modules/interval {};

From 372782d1f02138ffd5b1518a38545e88014c63c8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Apr 2016 23:44:10 +0200
Subject: [PATCH 584/712] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20160406-5-gcb85ef4 using the following inputs:

  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/24af5f79f4ffadbce08f69dbf99adc9e779763ea
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/4d628b7b7ec70abdaf5868f8a818e2ebdc05c2bd
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/2b431f312c0ceebe82f72afb748a4a052e4ff6f6
---
 .../haskell-modules/configuration-lts-0.0.nix |   36 +
 .../haskell-modules/configuration-lts-0.1.nix |   36 +
 .../haskell-modules/configuration-lts-0.2.nix |   36 +
 .../haskell-modules/configuration-lts-0.3.nix |   36 +
 .../haskell-modules/configuration-lts-0.4.nix |   36 +
 .../haskell-modules/configuration-lts-0.5.nix |   36 +
 .../haskell-modules/configuration-lts-0.6.nix |   36 +
 .../haskell-modules/configuration-lts-0.7.nix |   36 +
 .../haskell-modules/configuration-lts-1.0.nix |   36 +
 .../haskell-modules/configuration-lts-1.1.nix |   36 +
 .../configuration-lts-1.10.nix                |   36 +
 .../configuration-lts-1.11.nix                |   36 +
 .../configuration-lts-1.12.nix                |   36 +
 .../configuration-lts-1.13.nix                |   36 +
 .../configuration-lts-1.14.nix                |   37 +
 .../configuration-lts-1.15.nix                |   37 +
 .../haskell-modules/configuration-lts-1.2.nix |   36 +
 .../haskell-modules/configuration-lts-1.4.nix |   36 +
 .../haskell-modules/configuration-lts-1.5.nix |   36 +
 .../haskell-modules/configuration-lts-1.7.nix |   36 +
 .../haskell-modules/configuration-lts-1.8.nix |   36 +
 .../haskell-modules/configuration-lts-1.9.nix |   36 +
 .../haskell-modules/configuration-lts-2.0.nix |   37 +
 .../haskell-modules/configuration-lts-2.1.nix |   37 +
 .../configuration-lts-2.10.nix                |   37 +
 .../configuration-lts-2.11.nix                |   37 +
 .../configuration-lts-2.12.nix                |   37 +
 .../configuration-lts-2.13.nix                |   37 +
 .../configuration-lts-2.14.nix                |   37 +
 .../configuration-lts-2.15.nix                |   37 +
 .../configuration-lts-2.16.nix                |   38 +
 .../configuration-lts-2.17.nix                |   38 +
 .../configuration-lts-2.18.nix                |   38 +
 .../configuration-lts-2.19.nix                |   38 +
 .../haskell-modules/configuration-lts-2.2.nix |   37 +
 .../configuration-lts-2.20.nix                |   38 +
 .../configuration-lts-2.21.nix                |   39 +
 .../configuration-lts-2.22.nix                |   39 +
 .../haskell-modules/configuration-lts-2.3.nix |   37 +
 .../haskell-modules/configuration-lts-2.4.nix |   37 +
 .../haskell-modules/configuration-lts-2.5.nix |   37 +
 .../haskell-modules/configuration-lts-2.6.nix |   37 +
 .../haskell-modules/configuration-lts-2.7.nix |   37 +
 .../haskell-modules/configuration-lts-2.8.nix |   37 +
 .../haskell-modules/configuration-lts-2.9.nix |   37 +
 .../haskell-modules/configuration-lts-3.0.nix |   44 +
 .../haskell-modules/configuration-lts-3.1.nix |   45 +
 .../configuration-lts-3.10.nix                |   52 +
 .../configuration-lts-3.11.nix                |   52 +
 .../configuration-lts-3.12.nix                |   52 +
 .../configuration-lts-3.13.nix                |   52 +
 .../configuration-lts-3.14.nix                |   55 +
 .../configuration-lts-3.15.nix                |   55 +
 .../configuration-lts-3.16.nix                |   55 +
 .../configuration-lts-3.17.nix                |   55 +
 .../configuration-lts-3.18.nix                |   56 +
 .../configuration-lts-3.19.nix                |   57 +
 .../haskell-modules/configuration-lts-3.2.nix |   46 +
 .../configuration-lts-3.20.nix                |   57 +
 .../configuration-lts-3.21.nix                |   58 +
 .../configuration-lts-3.22.nix                |   59 +
 .../haskell-modules/configuration-lts-3.3.nix |   46 +
 .../haskell-modules/configuration-lts-3.4.nix |   46 +
 .../haskell-modules/configuration-lts-3.5.nix |   47 +
 .../haskell-modules/configuration-lts-3.6.nix |   48 +
 .../haskell-modules/configuration-lts-3.7.nix |   48 +
 .../haskell-modules/configuration-lts-3.8.nix |   51 +
 .../haskell-modules/configuration-lts-3.9.nix |   51 +
 .../haskell-modules/configuration-lts-4.0.nix |   76 +
 .../haskell-modules/configuration-lts-4.1.nix |   78 +
 .../haskell-modules/configuration-lts-4.2.nix |   81 +
 .../haskell-modules/configuration-lts-5.0.nix |   88 +
 .../haskell-modules/configuration-lts-5.1.nix |   90 +
 .../configuration-lts-5.10.nix                |  114 +
 .../configuration-lts-5.11.nix                |  120 +
 .../configuration-lts-5.12.nix                |  123 +
 .../configuration-lts-5.13.nix                |  128 +
 .../configuration-lts-5.14.nix                | 8149 +++++++++++++++++
 .../configuration-lts-5.15.nix                | 8129 ++++++++++++++++
 .../haskell-modules/configuration-lts-5.2.nix |   91 +
 .../haskell-modules/configuration-lts-5.3.nix |   93 +
 .../haskell-modules/configuration-lts-5.4.nix |   97 +
 .../haskell-modules/configuration-lts-5.5.nix |   98 +
 .../haskell-modules/configuration-lts-5.6.nix |   99 +
 .../haskell-modules/configuration-lts-5.7.nix |  100 +
 .../haskell-modules/configuration-lts-5.8.nix |  102 +
 .../haskell-modules/configuration-lts-5.9.nix |  108 +
 .../haskell-modules/hackage-packages.nix      | 3968 +++++---
 88 files changed, 23748 insertions(+), 1025 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/configuration-lts-5.14.nix
 create mode 100644 pkgs/development/haskell-modules/configuration-lts-5.15.nix

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 5d5e07c3a48..20e87e83c29 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -485,6 +485,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -822,6 +823,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1346,6 +1348,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2035,6 +2038,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2116,6 +2120,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_3";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2191,6 +2196,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2502,6 +2508,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2645,6 +2652,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3376,6 +3384,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_9";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4423,6 +4432,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_1";
@@ -4790,6 +4800,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = dontDistribute super."hstatistics";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4849,6 +4860,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_4";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4903,6 +4915,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5071,6 +5084,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5107,6 +5121,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5440,6 +5455,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5538,6 +5554,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5808,6 +5825,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5971,6 +5989,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_5_0_1";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_11";
   "monad-logger-json" = dontDistribute super."monad-logger-json";
   "monad-logger-syslog" = dontDistribute super."monad-logger-syslog";
@@ -6000,6 +6019,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib" = dontDistribute super."monadLib";
@@ -6414,6 +6434,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6513,6 +6534,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6609,6 +6631,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6617,6 +6640,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_1";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6655,6 +6679,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6830,6 +6855,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6846,6 +6872,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = dontDistribute super."prednote";
@@ -6876,6 +6903,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6976,6 +7004,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7129,6 +7158,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7880,6 +7910,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8187,6 +8218,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8213,6 +8245,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8221,6 +8254,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8311,6 +8345,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8839,6 +8874,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index 994ca185089..8142d61db1f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -485,6 +485,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -822,6 +823,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1346,6 +1348,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2035,6 +2038,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2116,6 +2120,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_3";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2191,6 +2196,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2502,6 +2508,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2645,6 +2652,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3376,6 +3384,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_9";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4423,6 +4432,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_1";
@@ -4790,6 +4800,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = dontDistribute super."hstatistics";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4849,6 +4860,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_4";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4903,6 +4915,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5071,6 +5084,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5107,6 +5121,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5440,6 +5455,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5538,6 +5554,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5808,6 +5825,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5971,6 +5989,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_5_0_1";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_11";
   "monad-logger-json" = dontDistribute super."monad-logger-json";
   "monad-logger-syslog" = dontDistribute super."monad-logger-syslog";
@@ -6000,6 +6019,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib" = dontDistribute super."monadLib";
@@ -6414,6 +6434,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6513,6 +6534,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6609,6 +6631,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6617,6 +6640,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_1";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6655,6 +6679,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6830,6 +6855,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6846,6 +6872,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = dontDistribute super."prednote";
@@ -6876,6 +6903,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6976,6 +7004,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7129,6 +7158,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7880,6 +7910,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8187,6 +8218,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8213,6 +8245,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8221,6 +8254,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8311,6 +8345,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8839,6 +8874,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 13288cf6eef..93da6c8ea26 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -485,6 +485,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -822,6 +823,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1346,6 +1348,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2035,6 +2038,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2116,6 +2120,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_3";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2191,6 +2196,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2502,6 +2508,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2645,6 +2652,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3376,6 +3384,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_9";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4423,6 +4432,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_1";
@@ -4790,6 +4800,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = dontDistribute super."hstatistics";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4849,6 +4860,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_4";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4903,6 +4915,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5071,6 +5084,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5107,6 +5121,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5440,6 +5455,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5538,6 +5554,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5808,6 +5825,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5971,6 +5989,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_5_0_1";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_11";
   "monad-logger-json" = dontDistribute super."monad-logger-json";
   "monad-logger-syslog" = dontDistribute super."monad-logger-syslog";
@@ -6000,6 +6019,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib" = dontDistribute super."monadLib";
@@ -6414,6 +6434,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6513,6 +6534,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6609,6 +6631,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6617,6 +6640,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_1";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6655,6 +6679,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6830,6 +6855,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6846,6 +6872,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = dontDistribute super."prednote";
@@ -6876,6 +6903,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6976,6 +7004,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7129,6 +7158,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7880,6 +7910,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8187,6 +8218,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8213,6 +8245,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8221,6 +8254,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8311,6 +8345,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8839,6 +8874,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index a2a328b65c0..139587df0ca 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -485,6 +485,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -822,6 +823,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1346,6 +1348,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2035,6 +2038,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2116,6 +2120,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_3";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2191,6 +2196,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2502,6 +2508,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2645,6 +2652,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3376,6 +3384,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_9";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4423,6 +4432,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_1";
@@ -4790,6 +4800,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = dontDistribute super."hstatistics";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4849,6 +4860,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_4";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4903,6 +4915,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5071,6 +5084,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5107,6 +5121,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5440,6 +5455,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5538,6 +5554,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5808,6 +5825,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5971,6 +5989,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_5_0_1";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_11";
   "monad-logger-json" = dontDistribute super."monad-logger-json";
   "monad-logger-syslog" = dontDistribute super."monad-logger-syslog";
@@ -6000,6 +6019,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib" = dontDistribute super."monadLib";
@@ -6414,6 +6434,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6513,6 +6534,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6609,6 +6631,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6617,6 +6640,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_1";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6655,6 +6679,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6830,6 +6855,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6846,6 +6872,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = dontDistribute super."prednote";
@@ -6876,6 +6903,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6976,6 +7004,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7129,6 +7158,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7880,6 +7910,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8187,6 +8218,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8213,6 +8245,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8221,6 +8254,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8311,6 +8345,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8839,6 +8874,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index 8947dce5d90..ebf71b233b2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -485,6 +485,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -822,6 +823,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1346,6 +1348,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2035,6 +2038,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2116,6 +2120,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_3";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2191,6 +2196,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2502,6 +2508,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2645,6 +2652,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3375,6 +3383,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_9";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4420,6 +4429,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_1";
@@ -4787,6 +4797,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = dontDistribute super."hstatistics";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4846,6 +4857,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_4";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4900,6 +4912,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5068,6 +5081,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5104,6 +5118,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5437,6 +5452,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5535,6 +5551,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5805,6 +5822,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5968,6 +5986,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_5_0_1";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_11_1";
   "monad-logger-json" = dontDistribute super."monad-logger-json";
   "monad-logger-syslog" = dontDistribute super."monad-logger-syslog";
@@ -5997,6 +6016,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib" = dontDistribute super."monadLib";
@@ -6411,6 +6431,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6510,6 +6531,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6606,6 +6628,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6614,6 +6637,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_1_2";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6652,6 +6676,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6827,6 +6852,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6843,6 +6869,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = dontDistribute super."prednote";
@@ -6873,6 +6900,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6973,6 +7001,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7126,6 +7155,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7876,6 +7906,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8183,6 +8214,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8209,6 +8241,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8217,6 +8250,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8307,6 +8341,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8835,6 +8870,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 74c95cb7400..98602756736 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -485,6 +485,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -822,6 +823,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1346,6 +1348,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2035,6 +2038,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2116,6 +2120,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_3";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2191,6 +2196,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2502,6 +2508,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2645,6 +2652,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3375,6 +3383,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_9";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4420,6 +4429,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_1";
@@ -4787,6 +4797,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = dontDistribute super."hstatistics";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4846,6 +4857,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_4";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4900,6 +4912,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5068,6 +5081,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5104,6 +5118,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5437,6 +5452,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5535,6 +5551,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5805,6 +5822,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5968,6 +5986,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_5_0_1";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_11_1";
   "monad-logger-json" = dontDistribute super."monad-logger-json";
   "monad-logger-syslog" = dontDistribute super."monad-logger-syslog";
@@ -5997,6 +6016,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib" = dontDistribute super."monadLib";
@@ -6411,6 +6431,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6510,6 +6531,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6606,6 +6628,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6614,6 +6637,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_1_2";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6652,6 +6676,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6827,6 +6852,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6843,6 +6869,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = dontDistribute super."prednote";
@@ -6873,6 +6900,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6973,6 +7001,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7126,6 +7155,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7876,6 +7906,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8183,6 +8214,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8209,6 +8241,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8217,6 +8250,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8307,6 +8341,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8835,6 +8870,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index 1e44d58aefd..36e7461a8cf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -485,6 +485,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -821,6 +822,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1345,6 +1347,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2034,6 +2037,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2115,6 +2119,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_3";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2190,6 +2195,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2501,6 +2507,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2644,6 +2651,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3374,6 +3382,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_9";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4418,6 +4427,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_1";
@@ -4785,6 +4795,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = dontDistribute super."hstatistics";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4844,6 +4855,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_4";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4898,6 +4910,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5066,6 +5079,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5102,6 +5116,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5435,6 +5450,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5533,6 +5549,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5803,6 +5820,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5966,6 +5984,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_5_0_1";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_11_1";
   "monad-logger-json" = dontDistribute super."monad-logger-json";
   "monad-logger-syslog" = dontDistribute super."monad-logger-syslog";
@@ -5995,6 +6014,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib" = dontDistribute super."monadLib";
@@ -6409,6 +6429,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6508,6 +6529,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6604,6 +6626,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6612,6 +6635,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_1_3";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6650,6 +6674,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6825,6 +6850,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6841,6 +6867,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = dontDistribute super."prednote";
@@ -6871,6 +6898,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6971,6 +6999,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7124,6 +7153,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7873,6 +7903,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8180,6 +8211,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8206,6 +8238,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8214,6 +8247,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8304,6 +8338,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8832,6 +8867,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index f5075c4afc2..5b1578fd4c3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -485,6 +485,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -821,6 +822,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1345,6 +1347,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2034,6 +2037,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2115,6 +2119,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_3";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2190,6 +2195,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2501,6 +2507,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2644,6 +2651,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3374,6 +3382,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_9";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4418,6 +4427,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_1";
@@ -4785,6 +4795,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = dontDistribute super."hstatistics";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4844,6 +4855,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_4";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4898,6 +4910,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5066,6 +5079,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5102,6 +5116,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5435,6 +5450,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5533,6 +5549,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5803,6 +5820,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5966,6 +5984,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_5_0_1";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_11_1";
   "monad-logger-json" = dontDistribute super."monad-logger-json";
   "monad-logger-syslog" = dontDistribute super."monad-logger-syslog";
@@ -5995,6 +6014,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib" = dontDistribute super."monadLib";
@@ -6409,6 +6429,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6508,6 +6529,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6604,6 +6626,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6612,6 +6635,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_1_3";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6650,6 +6674,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6825,6 +6850,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6841,6 +6867,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = dontDistribute super."prednote";
@@ -6871,6 +6898,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6971,6 +6999,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7124,6 +7153,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7873,6 +7903,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8180,6 +8211,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8206,6 +8238,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8214,6 +8247,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8304,6 +8338,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8832,6 +8867,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index b1e9391c5f8..ee69deb9f1b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -483,6 +483,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -817,6 +818,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1342,6 +1344,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2028,6 +2031,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2109,6 +2113,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2184,6 +2189,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2494,6 +2500,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2637,6 +2644,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3366,6 +3374,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_10_0_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4410,6 +4419,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_1";
@@ -4776,6 +4786,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = dontDistribute super."hstatistics";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4835,6 +4846,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_4";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4889,6 +4901,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5057,6 +5070,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5093,6 +5107,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5426,6 +5441,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5524,6 +5540,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5794,6 +5811,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5957,6 +5975,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_11_1";
   "monad-logger-json" = dontDistribute super."monad-logger-json";
   "monad-logger-syslog" = dontDistribute super."monad-logger-syslog";
@@ -5986,6 +6005,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib" = dontDistribute super."monadLib";
@@ -6400,6 +6420,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6499,6 +6520,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6595,6 +6617,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6603,6 +6626,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_1_3";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6641,6 +6665,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6816,6 +6841,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6832,6 +6858,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = dontDistribute super."prednote";
@@ -6862,6 +6889,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6962,6 +6990,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7115,6 +7144,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7862,6 +7892,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8169,6 +8200,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8195,6 +8227,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8203,6 +8236,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8293,6 +8327,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8820,6 +8855,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index 4f833f432c8..00e5a44a804 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -483,6 +483,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -817,6 +818,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1342,6 +1344,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2027,6 +2030,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2108,6 +2112,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2183,6 +2188,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2492,6 +2498,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2635,6 +2642,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3363,6 +3371,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_10_0_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4406,6 +4415,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_1";
@@ -4770,6 +4780,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = dontDistribute super."hstatistics";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4829,6 +4840,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_4";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4883,6 +4895,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5051,6 +5064,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5087,6 +5101,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5420,6 +5435,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5518,6 +5534,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5788,6 +5805,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5950,6 +5968,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_11_1";
   "monad-logger-json" = dontDistribute super."monad-logger-json";
   "monad-logger-syslog" = dontDistribute super."monad-logger-syslog";
@@ -5979,6 +5998,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib" = dontDistribute super."monadLib";
@@ -6393,6 +6413,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6492,6 +6513,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6588,6 +6610,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6596,6 +6619,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_1_4";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6634,6 +6658,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6809,6 +6834,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6825,6 +6851,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = dontDistribute super."prednote";
@@ -6855,6 +6882,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6955,6 +6983,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7108,6 +7137,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7854,6 +7884,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8160,6 +8191,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8186,6 +8218,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8194,6 +8227,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8283,6 +8317,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8807,6 +8842,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index 988c7e3714a..9a04c8e8c94 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -483,6 +483,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -816,6 +817,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1341,6 +1343,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2025,6 +2028,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2105,6 +2109,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2180,6 +2185,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2488,6 +2494,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2631,6 +2638,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3355,6 +3363,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_10_0_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4395,6 +4404,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_2";
@@ -4759,6 +4769,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = dontDistribute super."hstatistics";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4818,6 +4829,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_5";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4872,6 +4884,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5035,6 +5048,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5071,6 +5085,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5404,6 +5419,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5502,6 +5518,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5771,6 +5788,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5933,6 +5951,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-logger-json" = dontDistribute super."monad-logger-json";
   "monad-logger-syslog" = dontDistribute super."monad-logger-syslog";
@@ -5962,6 +5981,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib" = dontDistribute super."monadLib";
@@ -6374,6 +6394,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6472,6 +6493,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6568,6 +6590,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6576,6 +6599,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_1_7";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6614,6 +6638,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6789,6 +6814,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6805,6 +6831,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = dontDistribute super."prednote";
@@ -6835,6 +6862,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6935,6 +6963,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7087,6 +7116,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7831,6 +7861,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8137,6 +8168,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8162,6 +8194,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8170,6 +8203,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8258,6 +8292,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8779,6 +8814,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 0fe6da3b536..33d0a5b299b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -483,6 +483,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -816,6 +817,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1341,6 +1343,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2025,6 +2028,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2105,6 +2109,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2180,6 +2185,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2488,6 +2494,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2631,6 +2638,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3354,6 +3362,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_10_0_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4394,6 +4403,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_2";
@@ -4758,6 +4768,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = dontDistribute super."hstatistics";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4817,6 +4828,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_5";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4871,6 +4883,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5033,6 +5046,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5068,6 +5082,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5401,6 +5416,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5498,6 +5514,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5767,6 +5784,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5929,6 +5947,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-logger-json" = dontDistribute super."monad-logger-json";
   "monad-logger-syslog" = dontDistribute super."monad-logger-syslog";
@@ -5958,6 +5977,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib" = dontDistribute super."monadLib";
@@ -6370,6 +6390,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6468,6 +6489,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6564,6 +6586,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6572,6 +6595,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_1_7";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6610,6 +6634,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6785,6 +6810,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6801,6 +6827,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = dontDistribute super."prednote";
@@ -6831,6 +6858,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6931,6 +6959,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7083,6 +7112,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7827,6 +7857,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8133,6 +8164,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8158,6 +8190,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8166,6 +8199,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8254,6 +8288,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8775,6 +8810,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 6523554f052..3fcd44271df 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -483,6 +483,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -816,6 +817,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1341,6 +1343,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2025,6 +2028,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2105,6 +2109,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2180,6 +2185,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2488,6 +2494,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2631,6 +2638,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3354,6 +3362,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_10_0_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4393,6 +4402,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_2";
@@ -4757,6 +4767,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = dontDistribute super."hstatistics";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4816,6 +4827,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_5";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4870,6 +4882,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5032,6 +5045,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5067,6 +5081,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5400,6 +5415,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5497,6 +5513,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5766,6 +5783,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5928,6 +5946,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-logger-json" = dontDistribute super."monad-logger-json";
   "monad-logger-syslog" = dontDistribute super."monad-logger-syslog";
@@ -5957,6 +5976,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib" = dontDistribute super."monadLib";
@@ -6369,6 +6389,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6467,6 +6488,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6563,6 +6585,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6571,6 +6594,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_1_7";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6609,6 +6633,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6784,6 +6809,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6800,6 +6826,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = dontDistribute super."prednote";
@@ -6830,6 +6857,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6930,6 +6958,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7082,6 +7111,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7826,6 +7856,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8132,6 +8163,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8157,6 +8189,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8165,6 +8198,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8253,6 +8287,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8774,6 +8809,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 9b192de0166..1cedbc8be95 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -483,6 +483,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -816,6 +817,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1341,6 +1343,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2025,6 +2028,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2105,6 +2109,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2180,6 +2185,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2488,6 +2494,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2631,6 +2638,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3354,6 +3362,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_10_0_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4392,6 +4401,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_2";
@@ -4756,6 +4766,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = dontDistribute super."hstatistics";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4815,6 +4826,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_5";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4869,6 +4881,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5031,6 +5044,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5066,6 +5080,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5399,6 +5414,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5496,6 +5512,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5765,6 +5782,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5927,6 +5945,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-logger-json" = dontDistribute super."monad-logger-json";
   "monad-logger-syslog" = dontDistribute super."monad-logger-syslog";
@@ -5956,6 +5975,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib" = dontDistribute super."monadLib";
@@ -6368,6 +6388,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6466,6 +6487,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6562,6 +6584,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6570,6 +6593,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_2";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6608,6 +6632,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6783,6 +6808,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6799,6 +6825,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = dontDistribute super."prednote";
@@ -6829,6 +6856,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6929,6 +6957,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7081,6 +7110,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7825,6 +7855,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8131,6 +8162,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8156,6 +8188,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8164,6 +8197,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8251,6 +8285,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8772,6 +8807,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index a2021991e50..3483e76ea31 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -482,6 +482,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -815,6 +816,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1340,6 +1342,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2023,6 +2026,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2103,6 +2107,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2178,6 +2183,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2485,6 +2491,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2628,6 +2635,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3351,6 +3359,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_10_0_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4389,6 +4398,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_2";
@@ -4753,6 +4763,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = dontDistribute super."hstatistics";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4812,6 +4823,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_6";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4866,6 +4878,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5028,6 +5041,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5063,6 +5077,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5396,6 +5411,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5493,6 +5509,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5762,6 +5779,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5860,6 +5878,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_8_1";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5923,6 +5942,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-logger-json" = dontDistribute super."monad-logger-json";
   "monad-logger-syslog" = dontDistribute super."monad-logger-syslog";
@@ -5952,6 +5972,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib" = dontDistribute super."monadLib";
@@ -6364,6 +6385,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6462,6 +6484,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6558,6 +6581,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6566,6 +6590,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_2";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6604,6 +6629,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6779,6 +6805,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6795,6 +6822,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = dontDistribute super."prednote";
@@ -6825,6 +6853,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6925,6 +6954,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7076,6 +7106,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7820,6 +7851,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8126,6 +8158,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8151,6 +8184,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8159,6 +8193,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8246,6 +8281,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8767,6 +8803,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index b5fdfd2a4aa..5cc0f9fffde 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -482,6 +482,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -815,6 +816,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1339,6 +1341,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2022,6 +2025,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2101,6 +2105,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2176,6 +2181,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2482,6 +2488,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2625,6 +2632,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3347,6 +3355,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_10_0_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4385,6 +4394,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_2";
@@ -4749,6 +4759,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = dontDistribute super."hstatistics";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4808,6 +4819,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_6";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4862,6 +4874,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5024,6 +5037,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5059,6 +5073,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5392,6 +5407,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5489,6 +5505,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5758,6 +5775,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5856,6 +5874,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_8_2";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5919,6 +5938,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-logger-json" = dontDistribute super."monad-logger-json";
   "monad-logger-syslog" = dontDistribute super."monad-logger-syslog";
@@ -5948,6 +5968,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib" = dontDistribute super."monadLib";
@@ -6358,6 +6379,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6456,6 +6478,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6552,6 +6575,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6560,6 +6584,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_2";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6598,6 +6623,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6773,6 +6799,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6789,6 +6816,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = dontDistribute super."prednote";
@@ -6819,6 +6847,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6919,6 +6948,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7069,6 +7099,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7813,6 +7844,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8117,6 +8149,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8142,6 +8175,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8150,6 +8184,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8237,6 +8272,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8758,6 +8794,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index 2ce53895ab7..7ac7464aa45 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -483,6 +483,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -817,6 +818,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1342,6 +1344,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2027,6 +2030,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2107,6 +2111,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2182,6 +2187,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2490,6 +2496,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2633,6 +2640,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3361,6 +3369,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_10_0_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4403,6 +4412,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_1";
@@ -4767,6 +4777,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = dontDistribute super."hstatistics";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4826,6 +4837,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_4";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4880,6 +4892,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5048,6 +5061,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5084,6 +5098,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5417,6 +5432,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5515,6 +5531,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5785,6 +5802,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5947,6 +5965,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_11_1";
   "monad-logger-json" = dontDistribute super."monad-logger-json";
   "monad-logger-syslog" = dontDistribute super."monad-logger-syslog";
@@ -5976,6 +5995,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib" = dontDistribute super."monadLib";
@@ -6390,6 +6410,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6488,6 +6509,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6584,6 +6606,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6592,6 +6615,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_1_4";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6630,6 +6654,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6805,6 +6830,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6821,6 +6847,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = dontDistribute super."prednote";
@@ -6851,6 +6878,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6951,6 +6979,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7103,6 +7132,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7848,6 +7878,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8154,6 +8185,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8180,6 +8212,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8188,6 +8221,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8277,6 +8311,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8801,6 +8836,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 5092c1f02a7..b5e1d26ff19 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -483,6 +483,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -816,6 +817,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1341,6 +1343,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2026,6 +2029,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2106,6 +2110,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2181,6 +2186,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2489,6 +2495,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2632,6 +2639,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3359,6 +3367,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_10_0_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4400,6 +4409,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_1";
@@ -4764,6 +4774,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = dontDistribute super."hstatistics";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4823,6 +4834,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_4";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4877,6 +4889,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5045,6 +5058,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5081,6 +5095,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5414,6 +5429,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5512,6 +5528,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5782,6 +5799,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5944,6 +5962,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_11_1";
   "monad-logger-json" = dontDistribute super."monad-logger-json";
   "monad-logger-syslog" = dontDistribute super."monad-logger-syslog";
@@ -5973,6 +5992,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib" = dontDistribute super."monadLib";
@@ -6386,6 +6406,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6484,6 +6505,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6580,6 +6602,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6588,6 +6611,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_1_4";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6626,6 +6650,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6801,6 +6826,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6817,6 +6843,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = dontDistribute super."prednote";
@@ -6847,6 +6874,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6947,6 +6975,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7099,6 +7128,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7844,6 +7874,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8150,6 +8181,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8176,6 +8208,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8184,6 +8217,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8272,6 +8306,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8796,6 +8831,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index de2508852e7..5e5d5ff2a2f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -483,6 +483,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -816,6 +817,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1341,6 +1343,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2025,6 +2028,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2105,6 +2109,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2180,6 +2185,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2488,6 +2494,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2631,6 +2638,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3358,6 +3366,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_10_0_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4399,6 +4408,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_1";
@@ -4763,6 +4773,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = dontDistribute super."hstatistics";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4822,6 +4833,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_4";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4876,6 +4888,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5044,6 +5057,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5080,6 +5094,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5413,6 +5428,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5511,6 +5527,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5781,6 +5798,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5943,6 +5961,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_11_1";
   "monad-logger-json" = dontDistribute super."monad-logger-json";
   "monad-logger-syslog" = dontDistribute super."monad-logger-syslog";
@@ -5972,6 +5991,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib" = dontDistribute super."monadLib";
@@ -6385,6 +6405,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6483,6 +6504,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6579,6 +6601,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6587,6 +6610,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_1_4";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6625,6 +6649,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6800,6 +6825,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6816,6 +6842,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = dontDistribute super."prednote";
@@ -6846,6 +6873,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6946,6 +6974,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7098,6 +7127,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7843,6 +7873,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8149,6 +8180,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8175,6 +8207,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8183,6 +8216,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8271,6 +8305,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8793,6 +8828,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index 72af4fc6c77..345a0efa8f4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -483,6 +483,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -816,6 +817,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1341,6 +1343,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2025,6 +2028,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2105,6 +2109,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2180,6 +2185,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2488,6 +2494,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2631,6 +2638,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3358,6 +3366,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_10_0_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4399,6 +4408,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_2";
@@ -4763,6 +4773,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = dontDistribute super."hstatistics";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4822,6 +4833,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_4";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4876,6 +4888,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5039,6 +5052,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5075,6 +5089,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5408,6 +5423,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5506,6 +5522,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5776,6 +5793,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5938,6 +5956,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_11_1";
   "monad-logger-json" = dontDistribute super."monad-logger-json";
   "monad-logger-syslog" = dontDistribute super."monad-logger-syslog";
@@ -5967,6 +5986,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib" = dontDistribute super."monadLib";
@@ -6380,6 +6400,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6478,6 +6499,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6574,6 +6596,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6582,6 +6605,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_1_4";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6620,6 +6644,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6795,6 +6820,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6811,6 +6837,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = dontDistribute super."prednote";
@@ -6841,6 +6868,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6941,6 +6969,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7093,6 +7122,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7838,6 +7868,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8144,6 +8175,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8170,6 +8202,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8178,6 +8211,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8266,6 +8300,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8788,6 +8823,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index b7b754a984f..4b1d4e7c9a2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -483,6 +483,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -816,6 +817,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1341,6 +1343,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2025,6 +2028,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2105,6 +2109,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2180,6 +2185,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2488,6 +2494,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2631,6 +2638,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3356,6 +3364,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_10_0_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4396,6 +4405,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_2";
@@ -4760,6 +4770,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = dontDistribute super."hstatistics";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4819,6 +4830,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_4";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4873,6 +4885,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5036,6 +5049,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5072,6 +5086,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5405,6 +5420,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5503,6 +5519,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5772,6 +5789,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5934,6 +5952,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_12";
   "monad-logger-json" = dontDistribute super."monad-logger-json";
   "monad-logger-syslog" = dontDistribute super."monad-logger-syslog";
@@ -5963,6 +5982,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib" = dontDistribute super."monadLib";
@@ -6376,6 +6396,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6474,6 +6495,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6570,6 +6592,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6578,6 +6601,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_1_4";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6616,6 +6640,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6791,6 +6816,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6807,6 +6833,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = dontDistribute super."prednote";
@@ -6837,6 +6864,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6937,6 +6965,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7089,6 +7118,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7834,6 +7864,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8140,6 +8171,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8166,6 +8198,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8174,6 +8207,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8262,6 +8296,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8783,6 +8818,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index 6cb77fd1f9b..54c9bc0f5bf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -483,6 +483,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -816,6 +817,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1341,6 +1343,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2025,6 +2028,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2105,6 +2109,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2180,6 +2185,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2488,6 +2494,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2631,6 +2638,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3355,6 +3363,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_10_0_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4395,6 +4404,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_2";
@@ -4759,6 +4769,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = dontDistribute super."hstatistics";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4818,6 +4829,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_5";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4872,6 +4884,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5035,6 +5048,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5071,6 +5085,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5404,6 +5419,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5502,6 +5518,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5771,6 +5788,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5933,6 +5951,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_6_0_2";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_12";
   "monad-logger-json" = dontDistribute super."monad-logger-json";
   "monad-logger-syslog" = dontDistribute super."monad-logger-syslog";
@@ -5962,6 +5981,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib" = dontDistribute super."monadLib";
@@ -6375,6 +6395,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6473,6 +6494,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6569,6 +6591,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6577,6 +6600,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_1_4";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6615,6 +6639,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6790,6 +6815,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6806,6 +6832,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = dontDistribute super."prednote";
@@ -6836,6 +6863,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6936,6 +6964,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7088,6 +7117,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7833,6 +7863,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8139,6 +8170,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8165,6 +8197,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8173,6 +8206,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8261,6 +8295,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8782,6 +8817,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index fa5928d6b72..1e4b541f524 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -480,6 +480,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -810,6 +811,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1333,6 +1335,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2013,6 +2016,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2092,6 +2096,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2166,6 +2171,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2470,6 +2476,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2613,6 +2620,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3333,6 +3341,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4368,6 +4377,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_2";
@@ -4731,6 +4741,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4790,6 +4801,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_6";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4844,6 +4856,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5001,6 +5014,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5036,6 +5050,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5365,6 +5380,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5459,6 +5475,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5727,6 +5744,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5824,6 +5842,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_8_2";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5887,6 +5906,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_7";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-loops" = doDistribute super."monad-loops_0_4_2_1";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
@@ -5914,6 +5934,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6318,6 +6339,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6416,6 +6438,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6511,6 +6534,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6519,6 +6543,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_2";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6557,6 +6582,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6731,6 +6757,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6747,6 +6774,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6776,6 +6804,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6877,6 +6906,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7027,6 +7057,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7766,6 +7797,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8068,6 +8100,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8093,6 +8126,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8101,6 +8135,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8188,6 +8223,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8708,6 +8744,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 8ff45e0c7df..490801bae1b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -480,6 +480,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -810,6 +811,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1333,6 +1335,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2012,6 +2015,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2091,6 +2095,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2165,6 +2170,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2469,6 +2475,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2612,6 +2619,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3332,6 +3340,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4367,6 +4376,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_2";
@@ -4730,6 +4740,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4789,6 +4800,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_6";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4843,6 +4855,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -5000,6 +5013,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5035,6 +5049,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5364,6 +5379,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5458,6 +5474,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5726,6 +5743,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5823,6 +5841,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_8_2";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5886,6 +5905,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_7";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-loops" = doDistribute super."monad-loops_0_4_2_1";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
@@ -5913,6 +5933,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6317,6 +6338,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6415,6 +6437,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6510,6 +6533,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6518,6 +6542,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_2";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6556,6 +6581,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6730,6 +6756,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6746,6 +6773,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6775,6 +6803,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6876,6 +6905,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7026,6 +7056,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7765,6 +7796,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8067,6 +8099,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8092,6 +8125,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8100,6 +8134,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8187,6 +8222,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8707,6 +8743,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index 3b13848d98a..a9e84b65523 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -808,6 +809,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1328,6 +1330,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2001,6 +2004,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2080,6 +2084,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2154,6 +2159,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2457,6 +2463,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2599,6 +2606,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3315,6 +3323,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4348,6 +4357,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4710,6 +4720,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4768,6 +4779,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_5";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4822,6 +4834,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4978,6 +4991,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5013,6 +5027,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5340,6 +5355,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5433,6 +5449,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5701,6 +5718,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5798,6 +5816,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_8_2";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5861,6 +5880,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_7";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-loops" = doDistribute super."monad-loops_0_4_2_1";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
@@ -5888,6 +5908,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6292,6 +6313,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6390,6 +6412,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6484,6 +6507,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6492,6 +6516,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_5";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6530,6 +6555,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6703,6 +6729,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6719,6 +6746,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6748,6 +6776,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6849,6 +6878,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6998,6 +7028,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7734,6 +7765,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8029,6 +8061,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8054,6 +8087,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8062,6 +8096,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8149,6 +8184,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8667,6 +8703,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 14570e607c8..17f0dc57766 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -808,6 +809,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1327,6 +1329,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2000,6 +2003,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2079,6 +2083,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2153,6 +2158,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2456,6 +2462,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2598,6 +2605,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3314,6 +3322,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4345,6 +4354,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4707,6 +4717,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4765,6 +4776,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_5";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4819,6 +4831,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4975,6 +4988,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5010,6 +5024,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5336,6 +5351,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5429,6 +5445,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5697,6 +5714,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5794,6 +5812,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_8_2";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5856,6 +5875,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-loops" = doDistribute super."monad-loops_0_4_2_1";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
@@ -5883,6 +5903,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6287,6 +6308,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6384,6 +6406,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6478,6 +6501,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6486,6 +6510,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_6";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6524,6 +6549,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6697,6 +6723,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6713,6 +6740,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6742,6 +6770,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6843,6 +6872,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6992,6 +7022,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7727,6 +7758,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8020,6 +8052,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8045,6 +8078,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8053,6 +8087,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8140,6 +8175,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8658,6 +8694,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 706e342f6b2..248c9d5bdb3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -808,6 +809,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1327,6 +1329,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2000,6 +2003,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2079,6 +2083,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2153,6 +2158,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2456,6 +2462,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2598,6 +2605,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3314,6 +3322,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4345,6 +4354,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4707,6 +4717,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4765,6 +4776,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_5";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4819,6 +4831,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4975,6 +4988,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5010,6 +5024,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5336,6 +5351,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5429,6 +5445,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5697,6 +5714,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5794,6 +5812,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_8_2";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5856,6 +5875,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-loops" = doDistribute super."monad-loops_0_4_2_1";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
@@ -5883,6 +5903,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6287,6 +6308,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6384,6 +6406,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6478,6 +6501,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6486,6 +6510,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_6";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6524,6 +6549,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6697,6 +6723,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6713,6 +6740,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6742,6 +6770,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6843,6 +6872,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6992,6 +7022,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7726,6 +7757,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8019,6 +8051,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8044,6 +8077,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8052,6 +8086,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8139,6 +8174,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8657,6 +8693,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index 7cad852e803..f2b2e400ab7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -808,6 +809,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1327,6 +1329,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2000,6 +2003,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2079,6 +2083,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2153,6 +2158,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2456,6 +2462,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2598,6 +2605,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3314,6 +3322,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4344,6 +4353,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4706,6 +4716,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4764,6 +4775,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_5";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4818,6 +4830,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4973,6 +4986,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5008,6 +5022,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5334,6 +5349,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5427,6 +5443,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5695,6 +5712,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5792,6 +5810,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_9";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5854,6 +5873,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-loops" = doDistribute super."monad-loops_0_4_2_1";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
@@ -5881,6 +5901,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6285,6 +6306,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6382,6 +6404,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6476,6 +6499,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6484,6 +6508,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_6";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6522,6 +6547,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6695,6 +6721,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6711,6 +6738,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6740,6 +6768,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6841,6 +6870,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6990,6 +7020,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7724,6 +7755,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8017,6 +8049,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8042,6 +8075,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8050,6 +8084,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8137,6 +8172,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8655,6 +8691,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 951fd6c2f8d..aabae0822bf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -808,6 +809,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1327,6 +1329,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2000,6 +2003,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2079,6 +2083,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2153,6 +2158,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2456,6 +2462,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2598,6 +2605,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3313,6 +3321,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4343,6 +4352,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4704,6 +4714,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4762,6 +4773,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_5";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4816,6 +4828,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4971,6 +4984,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5006,6 +5020,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5332,6 +5347,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5425,6 +5441,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5693,6 +5710,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5790,6 +5808,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_9";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5852,6 +5871,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-loops" = doDistribute super."monad-loops_0_4_2_1";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
@@ -5879,6 +5899,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6283,6 +6304,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6380,6 +6402,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6474,6 +6497,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6482,6 +6506,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_6";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6520,6 +6545,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6693,6 +6719,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6709,6 +6736,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6738,6 +6766,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6839,6 +6868,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6988,6 +7018,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7721,6 +7752,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8014,6 +8046,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8039,6 +8072,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8047,6 +8081,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8134,6 +8169,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8652,6 +8688,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index 8adbc6fec84..b1f729fc28f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -808,6 +809,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1327,6 +1329,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2000,6 +2003,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2079,6 +2083,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2153,6 +2158,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2456,6 +2462,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2598,6 +2605,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3312,6 +3320,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4342,6 +4351,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4703,6 +4713,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4761,6 +4772,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_5";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4815,6 +4827,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4970,6 +4983,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5005,6 +5019,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5331,6 +5346,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5424,6 +5440,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5692,6 +5709,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5789,6 +5807,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_9";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5851,6 +5870,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5877,6 +5897,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6281,6 +6302,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6378,6 +6400,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6472,6 +6495,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6480,6 +6504,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_6";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6518,6 +6543,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6691,6 +6717,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6707,6 +6734,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6736,6 +6764,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6837,6 +6866,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6986,6 +7016,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7719,6 +7750,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8011,6 +8043,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8036,6 +8069,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8044,6 +8078,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8131,6 +8166,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8649,6 +8685,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index 3e319aa5ed4..723d0c93c37 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -808,6 +809,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1327,6 +1329,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2000,6 +2003,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2078,6 +2082,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2152,6 +2157,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2324,6 +2330,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2454,6 +2461,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2596,6 +2604,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3308,6 +3317,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4338,6 +4348,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4699,6 +4710,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4757,6 +4769,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_5";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4811,6 +4824,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4966,6 +4980,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5001,6 +5016,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5327,6 +5343,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5419,6 +5436,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5687,6 +5705,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5784,6 +5803,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_9";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5846,6 +5866,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5872,6 +5893,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6276,6 +6298,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6373,6 +6396,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6467,6 +6491,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6475,6 +6500,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_6";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6513,6 +6539,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6686,6 +6713,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6702,6 +6730,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6731,6 +6760,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6832,6 +6862,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6981,6 +7012,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7714,6 +7746,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8006,6 +8039,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8031,6 +8065,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8039,6 +8074,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8126,6 +8162,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8644,6 +8681,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 0a58df94535..eaf1fea3dae 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -808,6 +809,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1327,6 +1329,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -1998,6 +2001,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2076,6 +2080,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2150,6 +2155,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2322,6 +2328,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2452,6 +2459,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2594,6 +2602,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3304,6 +3313,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4334,6 +4344,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4695,6 +4706,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4753,6 +4765,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_5_1";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4807,6 +4820,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4962,6 +4976,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4997,6 +5012,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5323,6 +5339,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5415,6 +5432,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5683,6 +5701,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5780,6 +5799,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_9";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5842,6 +5862,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5868,6 +5889,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6271,6 +6293,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6368,6 +6391,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6462,6 +6486,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6470,6 +6495,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_6";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6508,6 +6534,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6681,6 +6708,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6697,6 +6725,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6726,6 +6755,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6827,6 +6857,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6976,6 +7007,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7709,6 +7741,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8001,6 +8034,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8026,6 +8060,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8034,6 +8069,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8121,6 +8157,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8639,6 +8676,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index e7a9357da6a..073161b05b0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -808,6 +809,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1327,6 +1329,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -1997,6 +2000,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2075,6 +2079,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2149,6 +2154,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2321,6 +2327,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2451,6 +2458,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2593,6 +2601,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3302,6 +3311,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4332,6 +4342,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4693,6 +4704,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4751,6 +4763,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_5_1";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4805,6 +4818,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4960,6 +4974,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4995,6 +5010,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5321,6 +5337,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5413,6 +5430,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5681,6 +5699,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5778,6 +5797,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_9";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5840,6 +5860,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5866,6 +5887,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6268,6 +6290,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6365,6 +6388,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6459,6 +6483,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6467,6 +6492,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_6";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6505,6 +6531,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6678,6 +6705,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6694,6 +6722,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6723,6 +6752,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6824,6 +6854,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6973,6 +7004,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7706,6 +7738,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7997,6 +8030,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8022,6 +8056,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8030,6 +8065,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8117,6 +8153,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8635,6 +8672,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index de4b6c8fbb8..de94de5ae3c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -808,6 +809,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1327,6 +1329,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -1997,6 +2000,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2075,6 +2079,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2149,6 +2154,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2321,6 +2327,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2451,6 +2458,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2593,6 +2601,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3301,6 +3310,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4331,6 +4341,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4692,6 +4703,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4750,6 +4762,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_5_1";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4804,6 +4817,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4959,6 +4973,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4994,6 +5009,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5320,6 +5336,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5412,6 +5429,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5680,6 +5698,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5776,6 +5795,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_9";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5838,6 +5858,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5864,6 +5885,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6266,6 +6288,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6363,6 +6386,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6457,6 +6481,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6465,6 +6490,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_6";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6503,6 +6529,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6676,6 +6703,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6692,6 +6720,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6721,6 +6750,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6822,6 +6852,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6971,6 +7002,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7703,6 +7735,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7994,6 +8027,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8019,6 +8053,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8027,6 +8062,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8114,6 +8150,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8632,6 +8669,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index b1785347434..ce113fd1467 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -480,6 +480,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -810,6 +811,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1332,6 +1334,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2009,6 +2012,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2088,6 +2092,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2162,6 +2167,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2466,6 +2472,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2609,6 +2616,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3329,6 +3337,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4364,6 +4373,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_2";
@@ -4727,6 +4737,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4786,6 +4797,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_6";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4840,6 +4852,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4997,6 +5010,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5032,6 +5046,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5361,6 +5376,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5455,6 +5471,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5723,6 +5740,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5820,6 +5838,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_8_2";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5883,6 +5902,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_7";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-loops" = doDistribute super."monad-loops_0_4_2_1";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
@@ -5910,6 +5930,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6314,6 +6335,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6412,6 +6434,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6507,6 +6530,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6515,6 +6539,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_2";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6553,6 +6578,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6727,6 +6753,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6743,6 +6770,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6772,6 +6800,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6873,6 +6902,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7023,6 +7053,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7762,6 +7793,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8064,6 +8096,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8089,6 +8122,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8097,6 +8131,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8184,6 +8219,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8704,6 +8740,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index 13fd59373ee..dae40ae5b4e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -808,6 +809,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1327,6 +1329,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -1997,6 +2000,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2075,6 +2079,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2149,6 +2154,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2320,6 +2326,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2450,6 +2457,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2592,6 +2600,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3300,6 +3309,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4330,6 +4340,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4691,6 +4702,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4749,6 +4761,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_7_1";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4803,6 +4816,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4958,6 +4972,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4993,6 +5008,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5319,6 +5335,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5411,6 +5428,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5679,6 +5697,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5775,6 +5794,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_9";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5837,6 +5857,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5863,6 +5884,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6265,6 +6287,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6362,6 +6385,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6456,6 +6480,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6464,6 +6489,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_6";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6502,6 +6528,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6674,6 +6701,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6690,6 +6718,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6719,6 +6748,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6820,6 +6850,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6969,6 +7000,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7700,6 +7732,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7991,6 +8024,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8016,6 +8050,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8024,6 +8059,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8111,6 +8147,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8629,6 +8666,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 9718fd66f08..36373c0e79a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -808,6 +809,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1327,6 +1329,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -1997,6 +2000,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2075,6 +2079,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2149,6 +2154,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2320,6 +2326,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2450,6 +2457,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2592,6 +2600,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3300,6 +3309,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4330,6 +4340,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4691,6 +4702,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4749,6 +4761,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_7_2";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4803,6 +4816,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4958,6 +4972,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4993,6 +5008,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5319,6 +5335,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5411,6 +5428,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5679,6 +5697,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5775,6 +5794,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_9";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5837,6 +5857,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5863,6 +5884,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6265,6 +6287,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6362,6 +6385,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6456,6 +6480,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6464,6 +6489,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_6";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6502,6 +6528,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6673,6 +6700,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6689,6 +6717,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6718,6 +6747,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6819,6 +6849,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6968,6 +6999,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7699,6 +7731,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7990,6 +8023,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8015,6 +8049,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8023,6 +8058,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8110,6 +8146,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8628,6 +8665,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8979,6 +9017,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index c9c1be69df4..638c1833dc3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -808,6 +809,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1327,6 +1329,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -1997,6 +2000,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2075,6 +2079,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2149,6 +2154,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2320,6 +2326,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2450,6 +2457,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2592,6 +2600,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3300,6 +3309,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4329,6 +4339,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4690,6 +4701,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4748,6 +4760,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_7_2";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4802,6 +4815,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4957,6 +4971,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4992,6 +5007,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5318,6 +5334,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5410,6 +5427,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5678,6 +5696,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5774,6 +5793,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_9";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5836,6 +5856,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5862,6 +5883,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6264,6 +6286,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6361,6 +6384,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6455,6 +6479,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6463,6 +6488,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_6";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6501,6 +6527,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6672,6 +6699,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6688,6 +6716,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6717,6 +6746,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6818,6 +6848,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6967,6 +6998,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7698,6 +7730,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7989,6 +8022,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8014,6 +8048,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8022,6 +8057,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8109,6 +8145,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8627,6 +8664,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8978,6 +9016,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index 5548314dff3..7bc9200c110 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -480,6 +480,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -810,6 +811,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1332,6 +1334,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2009,6 +2012,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2088,6 +2092,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2162,6 +2167,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2466,6 +2472,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2609,6 +2616,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3328,6 +3336,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4363,6 +4372,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_2";
@@ -4726,6 +4736,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4785,6 +4796,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_6";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4839,6 +4851,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4995,6 +5008,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5030,6 +5044,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5359,6 +5374,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5453,6 +5469,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5721,6 +5738,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5818,6 +5836,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_8_2";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5881,6 +5900,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_7";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-loops" = doDistribute super."monad-loops_0_4_2_1";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
@@ -5908,6 +5928,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6312,6 +6333,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6410,6 +6432,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6505,6 +6528,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6513,6 +6537,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_2";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6551,6 +6576,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6725,6 +6751,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6741,6 +6768,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6770,6 +6798,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6871,6 +6900,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7021,6 +7051,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7760,6 +7791,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8062,6 +8094,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8087,6 +8120,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8095,6 +8129,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8182,6 +8217,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8702,6 +8738,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 9becf92e39a..17cfdfa1bcc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -480,6 +480,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -810,6 +811,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1332,6 +1334,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2008,6 +2011,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2087,6 +2091,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2161,6 +2166,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2465,6 +2471,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2608,6 +2615,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3327,6 +3335,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4362,6 +4371,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_2";
@@ -4725,6 +4735,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4784,6 +4795,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_6";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4838,6 +4850,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4994,6 +5007,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5029,6 +5043,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5358,6 +5373,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5452,6 +5468,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5720,6 +5737,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5817,6 +5835,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_8_2";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5880,6 +5899,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_7";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-loops" = doDistribute super."monad-loops_0_4_2_1";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
@@ -5907,6 +5927,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6311,6 +6332,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6409,6 +6431,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6503,6 +6526,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6511,6 +6535,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_2";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6549,6 +6574,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6723,6 +6749,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6739,6 +6766,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6768,6 +6796,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6869,6 +6898,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7019,6 +7049,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7757,6 +7788,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8059,6 +8091,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8084,6 +8117,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8092,6 +8126,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8179,6 +8214,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8699,6 +8735,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index c770cc19433..54bdf226282 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -480,6 +480,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -810,6 +811,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1332,6 +1334,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2008,6 +2011,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2087,6 +2091,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2161,6 +2166,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2464,6 +2470,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2607,6 +2614,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3326,6 +3334,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4361,6 +4370,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_2";
@@ -4724,6 +4734,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4783,6 +4794,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_6";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4837,6 +4849,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4993,6 +5006,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5028,6 +5042,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5357,6 +5372,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5451,6 +5467,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5719,6 +5736,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5816,6 +5834,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_8_2";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5879,6 +5898,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_7";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-loops" = doDistribute super."monad-loops_0_4_2_1";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
@@ -5906,6 +5926,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6310,6 +6331,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6408,6 +6430,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6502,6 +6525,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6510,6 +6534,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_3";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6548,6 +6573,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6722,6 +6748,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6738,6 +6765,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6767,6 +6795,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6868,6 +6897,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7018,6 +7048,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7756,6 +7787,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8058,6 +8090,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8083,6 +8116,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8091,6 +8125,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8178,6 +8213,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8698,6 +8734,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index b18878eda98..53a6ba088d3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -480,6 +480,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -810,6 +811,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1330,6 +1332,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2005,6 +2008,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2084,6 +2088,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2158,6 +2163,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2461,6 +2467,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2604,6 +2611,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3323,6 +3331,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4356,6 +4365,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_2";
@@ -4719,6 +4729,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4778,6 +4789,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_6";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4832,6 +4844,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4988,6 +5001,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5023,6 +5037,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5352,6 +5367,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5446,6 +5462,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5714,6 +5731,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5811,6 +5829,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_8_2";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5874,6 +5893,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_7";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-loops" = doDistribute super."monad-loops_0_4_2_1";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
@@ -5901,6 +5921,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6304,6 +6325,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6402,6 +6424,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6496,6 +6519,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6504,6 +6528,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_3";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6542,6 +6567,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6716,6 +6742,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6732,6 +6759,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6761,6 +6789,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6862,6 +6891,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7012,6 +7042,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7750,6 +7781,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8052,6 +8084,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8077,6 +8110,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8085,6 +8119,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8172,6 +8207,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8690,6 +8726,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index a310f5c2279..4bc47cb0bd8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -809,6 +810,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1329,6 +1331,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2004,6 +2007,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2083,6 +2087,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2157,6 +2162,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2460,6 +2466,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2603,6 +2610,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3322,6 +3330,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4355,6 +4364,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_2";
@@ -4718,6 +4728,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4777,6 +4788,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_6";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4831,6 +4843,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4987,6 +5000,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5022,6 +5036,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5351,6 +5366,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5445,6 +5461,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5713,6 +5730,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5810,6 +5828,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_8_2";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5873,6 +5892,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_7";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-loops" = doDistribute super."monad-loops_0_4_2_1";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
@@ -5900,6 +5920,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6304,6 +6325,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6402,6 +6424,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6496,6 +6519,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6504,6 +6528,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_3";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6542,6 +6567,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6716,6 +6742,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6732,6 +6759,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6761,6 +6789,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6862,6 +6891,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7012,6 +7042,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7750,6 +7781,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8052,6 +8084,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8077,6 +8110,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8085,6 +8119,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8172,6 +8207,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8690,6 +8726,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index 6f38b78b48a..d9fbbb3de72 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -808,6 +809,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1328,6 +1330,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2003,6 +2006,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2082,6 +2086,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2156,6 +2161,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2459,6 +2465,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2602,6 +2609,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3320,6 +3328,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4353,6 +4362,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_2";
@@ -4716,6 +4726,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4775,6 +4786,7 @@ self: super: {
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "http-date" = doDistribute super."http-date_0_0_6";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4829,6 +4841,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4985,6 +4998,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5020,6 +5034,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5349,6 +5364,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5443,6 +5459,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5711,6 +5728,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5808,6 +5826,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_8_2";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5871,6 +5890,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_7";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-loops" = doDistribute super."monad-loops_0_4_2_1";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
@@ -5898,6 +5918,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6302,6 +6323,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6400,6 +6422,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6494,6 +6517,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6502,6 +6526,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_3";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6540,6 +6565,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6714,6 +6740,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6730,6 +6757,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6759,6 +6787,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6860,6 +6889,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7010,6 +7040,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7746,6 +7777,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8046,6 +8078,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8071,6 +8104,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8079,6 +8113,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8166,6 +8201,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8684,6 +8720,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index e082c07865a..6a5856b036b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -808,6 +809,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1328,6 +1330,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
@@ -2001,6 +2004,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
@@ -2080,6 +2084,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2154,6 +2159,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2457,6 +2463,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2600,6 +2607,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3316,6 +3324,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_11";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4349,6 +4358,7 @@ self: super: {
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
   "hinotify" = doDistribute super."hinotify_0_3_7";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_2";
@@ -4711,6 +4721,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstatsd" = dontDistribute super."hstatsd";
@@ -4769,6 +4780,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_5";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4823,6 +4835,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4979,6 +4992,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -5014,6 +5028,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5343,6 +5358,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = dontDistribute super."largeword";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5436,6 +5452,7 @@ self: super: {
   "librandomorg" = dontDistribute super."librandomorg";
   "librato" = dontDistribute super."librato";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5704,6 +5721,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5801,6 +5819,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_8_2";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5864,6 +5883,7 @@ self: super: {
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-journal" = doDistribute super."monad-journal_0_7";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_1";
   "monad-loops" = doDistribute super."monad-loops_0_4_2_1";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
@@ -5891,6 +5911,7 @@ self: super: {
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
   "monad-unlift" = dontDistribute super."monad-unlift";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -6295,6 +6316,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "openssl-streams" = dontDistribute super."openssl-streams";
@@ -6393,6 +6415,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6487,6 +6510,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6495,6 +6519,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_1_5";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6533,6 +6558,7 @@ self: super: {
   "phash" = dontDistribute super."phash";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6707,6 +6733,7 @@ self: super: {
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
   "postgresql-simple-url" = dontDistribute super."postgresql-simple-url";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6723,6 +6750,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_32_0_6";
@@ -6752,6 +6780,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6853,6 +6882,7 @@ self: super: {
   "purescript" = dontDistribute super."purescript";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -7003,6 +7033,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7739,6 +7770,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -8035,6 +8067,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -8060,6 +8093,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -8068,6 +8102,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_1_0";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -8155,6 +8190,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpattern" = dontDistribute super."testpattern";
@@ -8673,6 +8709,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index dc44bbbcf45..e69cfb6680b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -797,6 +798,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1304,6 +1306,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1947,6 +1950,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_3_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2022,6 +2026,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2070,6 +2075,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2094,6 +2100,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2262,6 +2269,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2392,6 +2400,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2531,6 +2540,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3219,6 +3229,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4236,6 +4247,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4594,6 +4606,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4650,6 +4663,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4703,6 +4717,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4850,6 +4865,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4884,6 +4900,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5194,6 +5211,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5282,6 +5300,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5544,6 +5563,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5637,6 +5657,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_9";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5697,6 +5718,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5720,6 +5742,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5819,6 +5843,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6112,6 +6137,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6206,6 +6232,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6298,6 +6325,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6306,6 +6334,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6342,6 +6371,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6507,6 +6537,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6523,6 +6554,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_36_0_2";
@@ -6552,6 +6584,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6652,6 +6685,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_2_0";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6800,6 +6834,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7527,6 +7562,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7808,6 +7844,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7832,6 +7869,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7840,6 +7878,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7927,6 +7966,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -8114,6 +8154,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8431,6 +8472,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8776,6 +8818,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8818,6 +8861,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_6";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index 564fca0b8df..28c84d54ed9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -797,6 +798,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1303,6 +1305,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1946,6 +1949,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_3_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2021,6 +2025,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2069,6 +2074,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2093,6 +2099,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2261,6 +2268,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2391,6 +2399,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2530,6 +2539,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3217,6 +3227,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4234,6 +4245,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4592,6 +4604,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4648,6 +4661,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4701,6 +4715,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4848,6 +4863,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4882,6 +4898,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5192,6 +5209,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5280,6 +5298,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5541,6 +5560,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5634,6 +5654,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_9";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5694,6 +5715,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5717,6 +5739,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5816,6 +5840,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5837,6 +5862,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -6108,6 +6134,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6202,6 +6229,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6294,6 +6322,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6302,6 +6331,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6338,6 +6368,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6502,6 +6533,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6518,6 +6550,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_36_0_2";
@@ -6547,6 +6580,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6647,6 +6681,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_3_0";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6795,6 +6830,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7521,6 +7557,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7802,6 +7839,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7826,6 +7864,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7834,6 +7873,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7921,6 +7961,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -8108,6 +8149,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8425,6 +8467,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8769,6 +8812,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8811,6 +8855,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_6";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 80084167d43..9263d961f70 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -794,6 +795,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1300,6 +1302,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1936,6 +1939,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2011,6 +2015,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2059,6 +2064,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2083,6 +2089,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2251,6 +2258,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2380,6 +2388,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2519,6 +2528,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2602,6 +2612,7 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3";
@@ -2609,12 +2620,14 @@ self: super: {
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
   "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
@@ -3165,6 +3178,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "forecast-io" = dontDistribute super."forecast-io";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
@@ -3197,6 +3211,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4209,6 +4224,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4565,6 +4581,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4621,6 +4638,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4674,6 +4692,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4819,6 +4838,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4853,6 +4873,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5054,6 +5075,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -5160,6 +5182,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5246,6 +5269,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5507,6 +5531,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5599,6 +5624,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5659,6 +5685,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_14";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5682,6 +5709,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5780,6 +5809,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5801,6 +5831,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -6069,6 +6100,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6163,6 +6195,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6254,6 +6287,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6262,6 +6296,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_1";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6298,6 +6333,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6461,6 +6497,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6476,6 +6513,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
@@ -6503,6 +6541,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6602,6 +6641,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_4_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6749,6 +6789,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7472,6 +7513,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7751,6 +7793,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7775,6 +7818,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7783,6 +7827,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7866,6 +7911,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -8053,6 +8099,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8367,6 +8414,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8539,6 +8587,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_6_3_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8704,6 +8753,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8746,6 +8796,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_8";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
@@ -8802,6 +8853,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_1_0_6";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_4_4";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index a7a66f37824..4a0c8ae04f2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -794,6 +795,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1300,6 +1302,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1935,6 +1938,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2010,6 +2014,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2058,6 +2063,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2082,6 +2088,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2250,6 +2257,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2379,6 +2387,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2518,6 +2527,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2601,6 +2611,7 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3";
@@ -2608,12 +2619,14 @@ self: super: {
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
   "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
@@ -3163,6 +3176,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "forecast-io" = dontDistribute super."forecast-io";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
@@ -3195,6 +3209,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4207,6 +4222,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4563,6 +4579,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4619,6 +4636,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4672,6 +4690,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4817,6 +4836,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4851,6 +4871,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5052,6 +5073,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -5158,6 +5180,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5244,6 +5267,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5505,6 +5529,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5597,6 +5622,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5657,6 +5683,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_14";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5680,6 +5707,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5778,6 +5807,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5799,6 +5829,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -6067,6 +6098,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6161,6 +6193,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6252,6 +6285,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6260,6 +6294,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_2";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6295,6 +6330,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6458,6 +6494,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6473,6 +6510,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
@@ -6500,6 +6538,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6599,6 +6638,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_4_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6746,6 +6786,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7469,6 +7510,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7748,6 +7790,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7772,6 +7815,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7780,6 +7824,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_2";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7863,6 +7908,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -8050,6 +8096,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8364,6 +8411,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8536,6 +8584,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_6_3_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8701,6 +8750,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8743,6 +8793,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_8";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
@@ -8799,6 +8850,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_1_0_6";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_4_4";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index 928bc177e6a..f87cc10c8a9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -794,6 +795,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1300,6 +1302,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1935,6 +1938,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2009,6 +2013,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2057,6 +2062,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2081,6 +2087,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2249,6 +2256,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2378,6 +2386,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2517,6 +2526,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2600,6 +2610,7 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3";
@@ -2607,12 +2618,14 @@ self: super: {
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
   "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
@@ -3162,6 +3175,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "forecast-io" = dontDistribute super."forecast-io";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
@@ -3194,6 +3208,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4205,6 +4220,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4561,6 +4577,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4617,6 +4634,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4670,6 +4688,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4815,6 +4834,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4849,6 +4869,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5050,6 +5071,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -5156,6 +5178,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5242,6 +5265,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5503,6 +5527,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5595,6 +5620,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5655,6 +5681,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_15";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5678,6 +5705,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5776,6 +5805,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5797,6 +5827,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -6065,6 +6096,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6159,6 +6191,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6249,6 +6282,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6257,6 +6291,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_2";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6292,6 +6327,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6455,6 +6491,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6470,6 +6507,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
@@ -6497,6 +6535,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6596,6 +6635,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_5_3";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6743,6 +6783,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7466,6 +7507,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7745,6 +7787,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7769,6 +7812,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_5";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7777,6 +7821,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_2";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7859,6 +7904,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -8045,6 +8091,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8359,6 +8406,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8531,6 +8579,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_6_3_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8696,6 +8745,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8738,6 +8788,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_8";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
@@ -8794,6 +8845,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_1_0_6";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_4_4";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index 45442c782c0..4d0b4b51f4b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -794,6 +795,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1300,6 +1302,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1935,6 +1938,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2009,6 +2013,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2057,6 +2062,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2081,6 +2087,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2249,6 +2256,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2378,6 +2386,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2517,6 +2526,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2600,6 +2610,7 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3";
@@ -2607,12 +2618,14 @@ self: super: {
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
   "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
@@ -3162,6 +3175,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "forecast-io" = dontDistribute super."forecast-io";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
@@ -3194,6 +3208,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4204,6 +4219,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4560,6 +4576,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4616,6 +4633,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4669,6 +4687,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4814,6 +4833,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4848,6 +4868,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5049,6 +5070,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -5155,6 +5177,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5240,6 +5263,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5501,6 +5525,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5593,6 +5618,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5653,6 +5679,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_15";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5676,6 +5703,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5774,6 +5803,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5795,6 +5825,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -6063,6 +6094,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6157,6 +6189,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6246,6 +6279,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6254,6 +6288,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_2";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6289,6 +6324,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6452,6 +6488,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6467,6 +6504,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
@@ -6494,6 +6532,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6593,6 +6632,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_5_4";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6740,6 +6780,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7463,6 +7504,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7742,6 +7784,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7766,6 +7809,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_5";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7774,6 +7818,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_2";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7856,6 +7901,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -8042,6 +8088,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8356,6 +8403,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8527,6 +8575,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_6_3_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8692,6 +8741,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8734,6 +8784,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_8";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
@@ -8790,6 +8841,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_1_0_6";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_4_4";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index 3a2e3d30d4e..79c0bd0d594 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -794,6 +795,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1115,6 +1117,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1298,6 +1301,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1932,6 +1936,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2006,6 +2011,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2054,6 +2060,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2078,6 +2085,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2246,6 +2254,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2374,6 +2383,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2513,6 +2523,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2596,17 +2607,22 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
   "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
@@ -3156,6 +3172,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "forecast-io" = dontDistribute super."forecast-io";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
@@ -3188,6 +3205,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4198,6 +4216,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4554,6 +4573,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4609,6 +4629,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4662,6 +4683,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4807,6 +4829,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4841,6 +4864,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5042,6 +5066,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -5148,6 +5173,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5233,6 +5259,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5494,6 +5521,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5586,6 +5614,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5646,6 +5675,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_15";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5669,6 +5699,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5767,6 +5799,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5788,6 +5821,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -6056,6 +6090,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6150,6 +6185,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6239,6 +6275,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6247,6 +6284,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_2_1";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6282,6 +6320,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6445,6 +6484,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6460,6 +6500,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
@@ -6487,6 +6528,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6586,6 +6628,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_5_4";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6733,6 +6776,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7456,6 +7500,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7735,6 +7780,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7759,6 +7805,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_5";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7767,6 +7814,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_2";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7849,6 +7897,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -8035,6 +8084,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8349,6 +8399,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8520,6 +8571,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_6_3_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8684,6 +8736,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8726,6 +8779,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_8";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
@@ -8782,6 +8836,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_1_0_6";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_4_4";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 49d22021c49..25a1f7d6102 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -794,6 +795,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1115,6 +1117,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1298,6 +1301,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1932,6 +1936,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2006,6 +2011,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2054,6 +2060,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2078,6 +2085,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2246,6 +2254,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2374,6 +2383,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2513,6 +2523,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2596,17 +2607,22 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
   "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
@@ -3156,6 +3172,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "forecast-io" = dontDistribute super."forecast-io";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
@@ -3188,6 +3205,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4197,6 +4215,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4552,6 +4571,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4607,6 +4627,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4659,6 +4680,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4804,6 +4826,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4838,6 +4861,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5039,6 +5063,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -5145,6 +5170,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5230,6 +5256,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5491,6 +5518,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5583,6 +5611,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5643,6 +5672,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_15";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5666,6 +5696,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5764,6 +5796,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5785,6 +5818,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -6053,6 +6087,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6147,6 +6182,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6236,6 +6272,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6244,6 +6281,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_2_1";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6279,6 +6317,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6442,6 +6481,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6457,6 +6497,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
@@ -6484,6 +6525,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6583,6 +6625,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6730,6 +6773,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7452,6 +7496,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7731,6 +7776,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7755,6 +7801,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_5";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7763,6 +7810,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_2";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7845,6 +7893,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -8031,6 +8080,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8345,6 +8395,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8516,6 +8567,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_6_3_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8680,6 +8732,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8722,6 +8775,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_8";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
@@ -8778,6 +8832,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_1_0_6";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_4_4";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index c296a9132a1..b060ad42b00 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -793,6 +794,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1114,6 +1116,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1297,6 +1300,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1931,6 +1935,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2005,6 +2010,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2053,6 +2059,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2077,6 +2084,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2245,6 +2253,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2373,6 +2382,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2512,6 +2522,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2595,17 +2606,22 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
   "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
@@ -3154,6 +3170,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "forecast-io" = dontDistribute super."forecast-io";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
@@ -3186,6 +3203,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4194,6 +4212,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4549,6 +4568,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4604,6 +4624,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4656,6 +4677,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4801,6 +4823,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4835,6 +4858,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5036,6 +5060,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -5141,6 +5166,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5226,6 +5252,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5487,6 +5514,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5578,6 +5606,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5638,6 +5667,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_15";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5661,6 +5691,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5759,6 +5791,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5780,6 +5813,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -6048,6 +6082,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6142,6 +6177,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6231,6 +6267,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6239,6 +6276,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_2_1";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6274,6 +6312,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6436,6 +6475,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6451,6 +6491,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
@@ -6478,6 +6519,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6577,6 +6619,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6724,6 +6767,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7445,6 +7489,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7724,6 +7769,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7748,6 +7794,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_5";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7756,6 +7803,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_2";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7836,6 +7884,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -8021,6 +8070,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8335,6 +8385,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8506,6 +8557,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_6_3_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8670,6 +8722,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8712,6 +8765,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_8";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
@@ -8768,6 +8822,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_1_0_6";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_4_4";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index 501a11cc54c..9d30a0fc183 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -793,6 +794,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1114,6 +1116,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1297,6 +1300,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1930,6 +1934,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2004,6 +2009,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2052,6 +2058,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2076,6 +2083,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2244,6 +2252,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2372,6 +2381,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2511,6 +2521,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2594,17 +2605,22 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
   "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
@@ -3153,6 +3169,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "forecast-io" = dontDistribute super."forecast-io";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
@@ -3185,6 +3202,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4192,6 +4210,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4547,6 +4566,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4602,6 +4622,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4654,6 +4675,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4798,6 +4820,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4832,6 +4855,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5033,6 +5057,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -5138,6 +5163,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5223,6 +5249,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5483,6 +5510,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5574,6 +5602,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5634,6 +5663,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_15";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5656,6 +5686,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5754,6 +5786,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5775,6 +5808,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -6043,6 +6077,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6137,6 +6172,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6226,6 +6262,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6234,6 +6271,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_3";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6269,6 +6307,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6431,6 +6470,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6446,6 +6486,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
@@ -6473,6 +6514,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6572,6 +6614,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6719,6 +6762,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7440,6 +7484,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7719,6 +7764,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7743,6 +7789,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_5";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7751,6 +7798,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_2";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7831,6 +7879,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -8016,6 +8065,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8330,6 +8380,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8501,6 +8552,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_6_3_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8665,6 +8717,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8707,6 +8760,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
@@ -8763,6 +8817,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_1_0_6";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_4_4";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index 8eed33d20a2..ef8133df5c8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -793,6 +794,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1114,6 +1116,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1297,6 +1300,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1929,6 +1933,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2003,6 +2008,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2051,6 +2057,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2075,6 +2082,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2243,6 +2251,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2371,6 +2380,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2510,6 +2520,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2593,17 +2604,22 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
   "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
@@ -3152,6 +3168,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "forecast-io" = dontDistribute super."forecast-io";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
@@ -3184,6 +3201,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4187,6 +4205,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4542,6 +4561,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4596,6 +4616,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4648,6 +4669,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4792,6 +4814,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4826,6 +4849,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5027,6 +5051,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -5132,6 +5157,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5217,6 +5243,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5477,6 +5504,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5568,6 +5596,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5628,6 +5657,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_16";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5650,6 +5680,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5748,6 +5780,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5769,6 +5802,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -6037,6 +6071,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6130,6 +6165,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6219,6 +6255,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6227,6 +6264,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_3";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6262,6 +6300,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6424,6 +6463,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6439,6 +6479,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
@@ -6466,6 +6507,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6565,6 +6607,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6712,6 +6755,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7212,6 +7256,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -7432,6 +7477,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7711,6 +7757,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7735,6 +7782,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_5";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7743,6 +7791,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_2";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7823,6 +7872,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -8008,6 +8058,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8322,6 +8373,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8493,6 +8545,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_6_3_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8657,6 +8710,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8699,6 +8753,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
@@ -8755,6 +8810,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_1_0_6";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_4_4";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index a41538e4805..16e30cfc425 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -793,6 +794,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1114,6 +1116,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1297,6 +1300,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1439,6 +1443,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "auto-update" = doDistribute super."auto-update_0_1_3";
   "autoexporter" = dontDistribute super."autoexporter";
   "automitive-cse" = dontDistribute super."automitive-cse";
   "automotive-cse" = dontDistribute super."automotive-cse";
@@ -1925,6 +1930,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -1999,6 +2005,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2047,6 +2054,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2071,6 +2079,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2238,6 +2247,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2366,6 +2376,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2505,6 +2516,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2588,17 +2600,22 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
   "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
@@ -3147,6 +3164,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "forecast-io" = dontDistribute super."forecast-io";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
@@ -3179,6 +3197,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4182,6 +4201,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4535,6 +4555,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4589,6 +4610,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4641,6 +4663,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4785,6 +4808,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4819,6 +4843,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5019,6 +5044,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -5124,6 +5150,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5209,6 +5236,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5468,6 +5496,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5559,6 +5588,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5619,6 +5649,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_16";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5641,6 +5672,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5739,6 +5772,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5760,6 +5794,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -6027,6 +6062,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6120,6 +6156,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6209,6 +6246,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6217,6 +6255,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_4";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6252,6 +6291,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6414,6 +6454,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6429,6 +6470,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
@@ -6456,6 +6498,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6555,6 +6598,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6702,6 +6746,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7202,6 +7247,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -7421,6 +7467,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7700,6 +7747,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7724,6 +7772,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_5";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7732,6 +7781,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_2";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7812,6 +7862,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -7997,6 +8048,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8311,6 +8363,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8482,6 +8535,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_6_3_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8645,6 +8699,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8687,6 +8742,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
@@ -8743,6 +8799,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_1_0_6";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_4_4";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index 53be954857c..39f1eaddce5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -796,6 +797,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1302,6 +1304,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1944,6 +1947,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_3_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2019,6 +2023,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2067,6 +2072,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2091,6 +2097,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2259,6 +2266,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2389,6 +2397,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2528,6 +2537,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3214,6 +3224,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4230,6 +4241,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4588,6 +4600,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4644,6 +4657,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4697,6 +4711,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4844,6 +4859,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4878,6 +4894,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5080,6 +5097,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -5187,6 +5205,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5274,6 +5293,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5535,6 +5555,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5628,6 +5649,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_9";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5688,6 +5710,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5711,6 +5734,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5810,6 +5835,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5831,6 +5857,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -6102,6 +6129,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6196,6 +6224,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6288,6 +6317,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6296,6 +6326,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6332,6 +6363,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6496,6 +6528,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6512,6 +6545,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_36_0_2";
@@ -6541,6 +6575,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6641,6 +6676,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_3_0";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6788,6 +6824,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7513,6 +7550,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7794,6 +7832,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7818,6 +7857,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7826,6 +7866,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7913,6 +7954,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -8100,6 +8142,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8417,6 +8460,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8761,6 +8805,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8803,6 +8848,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_6";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index 58bef4e1657..7fcfebf2230 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -469,6 +469,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -792,6 +793,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1113,6 +1115,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1296,6 +1299,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1438,6 +1442,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "auto-update" = doDistribute super."auto-update_0_1_3";
   "autoexporter" = dontDistribute super."autoexporter";
   "automitive-cse" = dontDistribute super."automitive-cse";
   "automotive-cse" = dontDistribute super."automotive-cse";
@@ -1924,6 +1929,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -1998,6 +2004,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2046,6 +2053,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2070,6 +2078,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2237,6 +2246,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2365,6 +2375,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2504,6 +2515,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2587,17 +2599,22 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
   "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
@@ -3146,6 +3163,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "forecast-io" = dontDistribute super."forecast-io";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
@@ -3178,6 +3196,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4181,6 +4200,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4534,6 +4554,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4588,6 +4609,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4640,6 +4662,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4784,6 +4807,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4818,6 +4842,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5018,6 +5043,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -5123,6 +5149,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5208,6 +5235,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5467,6 +5495,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5558,6 +5587,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5618,6 +5648,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_16";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5640,6 +5671,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5738,6 +5771,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5759,6 +5793,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -6026,6 +6061,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6119,6 +6155,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6208,6 +6245,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6216,6 +6254,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_4";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6251,6 +6290,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6413,6 +6453,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6428,6 +6469,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
@@ -6455,6 +6497,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6554,6 +6597,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6701,6 +6745,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7200,6 +7245,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -7419,6 +7465,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7697,6 +7744,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7721,6 +7769,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_6";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7729,6 +7778,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_2";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7809,6 +7859,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -7994,6 +8045,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8308,6 +8360,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8479,6 +8532,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_6_3_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8641,6 +8695,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8683,6 +8738,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
@@ -8739,6 +8795,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_1_0_6";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_4_4";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index ac0f58b31bd..e8f29e893e5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -469,6 +469,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -792,6 +793,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1113,6 +1115,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1296,6 +1299,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1438,6 +1442,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "auto-update" = doDistribute super."auto-update_0_1_3";
   "autoexporter" = dontDistribute super."autoexporter";
   "automitive-cse" = dontDistribute super."automitive-cse";
   "automotive-cse" = dontDistribute super."automotive-cse";
@@ -1924,6 +1929,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -1998,6 +2004,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2046,6 +2053,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2070,6 +2078,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2236,6 +2245,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2364,6 +2374,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2503,6 +2514,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2586,17 +2598,22 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
   "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
@@ -3143,6 +3160,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "forecast-io" = dontDistribute super."forecast-io";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
@@ -3175,6 +3193,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4178,6 +4197,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4531,6 +4551,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4585,6 +4606,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4637,6 +4659,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4779,6 +4802,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4813,6 +4837,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5013,6 +5038,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -5118,6 +5144,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5203,6 +5230,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5462,6 +5490,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5553,6 +5582,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5613,6 +5643,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_16";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5635,6 +5666,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5732,6 +5765,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5753,6 +5787,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -6020,6 +6055,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6112,6 +6148,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6201,6 +6238,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6209,6 +6247,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_4";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6244,6 +6283,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6405,6 +6445,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6420,6 +6461,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
@@ -6447,6 +6489,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6546,6 +6589,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6693,6 +6737,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7187,6 +7232,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -7405,6 +7451,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7683,6 +7730,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7707,6 +7755,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_6";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7715,6 +7764,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_2";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7795,6 +7845,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -7980,6 +8031,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8294,6 +8346,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8376,6 +8429,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_5";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8461,6 +8515,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_6_3_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8623,6 +8678,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8665,6 +8721,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
@@ -8721,6 +8778,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_1_0_6";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_4_4";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index 438cbbc5a19..25e927b694c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -469,6 +469,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -792,6 +793,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1113,6 +1115,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1296,6 +1299,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1438,6 +1442,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "auto-update" = doDistribute super."auto-update_0_1_3";
   "autoexporter" = dontDistribute super."autoexporter";
   "automitive-cse" = dontDistribute super."automitive-cse";
   "automotive-cse" = dontDistribute super."automotive-cse";
@@ -1924,6 +1929,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -1998,6 +2004,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2046,6 +2053,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2070,6 +2078,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2236,6 +2245,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2364,6 +2374,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2503,6 +2514,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2586,17 +2598,22 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
   "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
@@ -2975,6 +2992,7 @@ self: super: {
   "extensible-data" = dontDistribute super."extensible-data";
   "extensible-effects" = dontDistribute super."extensible-effects";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_3";
   "extract-dependencies" = dontDistribute super."extract-dependencies";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
@@ -3141,6 +3159,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "forecast-io" = dontDistribute super."forecast-io";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
@@ -3173,6 +3192,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4175,6 +4195,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4528,6 +4549,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4582,6 +4604,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4634,6 +4657,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4774,6 +4798,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4808,6 +4833,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5007,6 +5033,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -5112,6 +5139,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5197,6 +5225,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5456,6 +5485,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5547,6 +5577,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5607,6 +5638,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_16";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5629,6 +5661,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5726,6 +5760,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5747,6 +5782,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -6014,6 +6050,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6106,6 +6143,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6195,6 +6233,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6203,6 +6242,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_4";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6238,6 +6278,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6399,6 +6440,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6414,6 +6456,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
@@ -6441,6 +6484,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6540,6 +6584,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6687,6 +6732,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7181,6 +7227,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -7399,6 +7446,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7677,6 +7725,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7701,6 +7750,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_7";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7709,6 +7759,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_2";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7789,6 +7840,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -7974,6 +8026,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8288,6 +8341,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8370,6 +8424,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_5";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8455,6 +8510,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_6_3_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8617,6 +8673,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8659,6 +8716,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
@@ -8715,6 +8773,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_1_0_6";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_4_4";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index 0b13ec7c6b0..85f58d4dc75 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -796,6 +797,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1302,6 +1304,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1944,6 +1947,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_3_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2019,6 +2023,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2067,6 +2072,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2091,6 +2097,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2259,6 +2266,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2389,6 +2397,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2528,6 +2537,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3213,6 +3223,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4229,6 +4240,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4586,6 +4598,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4642,6 +4655,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4695,6 +4709,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4842,6 +4857,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4876,6 +4892,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5078,6 +5095,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -5185,6 +5203,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5272,6 +5291,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5533,6 +5553,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5626,6 +5647,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_10";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5686,6 +5708,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5709,6 +5732,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5808,6 +5833,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5829,6 +5855,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -6100,6 +6127,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6194,6 +6222,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6286,6 +6315,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6294,6 +6324,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6330,6 +6361,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6494,6 +6526,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6510,6 +6543,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_36_0_2";
@@ -6539,6 +6573,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6639,6 +6674,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_4_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6786,6 +6822,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7509,6 +7546,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7790,6 +7828,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7814,6 +7853,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7822,6 +7862,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7909,6 +7950,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -8096,6 +8138,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8412,6 +8455,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8756,6 +8800,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8798,6 +8843,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_6";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 70650c9956a..7ac520afb60 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -796,6 +797,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1302,6 +1304,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1944,6 +1947,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_3_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2019,6 +2023,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2067,6 +2072,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2091,6 +2097,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2259,6 +2266,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2389,6 +2397,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2528,6 +2537,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3213,6 +3223,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4229,6 +4240,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4586,6 +4598,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4642,6 +4655,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4695,6 +4709,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4842,6 +4857,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4876,6 +4892,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5078,6 +5095,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -5185,6 +5203,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5272,6 +5291,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5533,6 +5553,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5626,6 +5647,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_10";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5686,6 +5708,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5709,6 +5732,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5808,6 +5833,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5829,6 +5855,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -6100,6 +6127,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6194,6 +6222,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6286,6 +6315,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6294,6 +6324,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6330,6 +6361,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6494,6 +6526,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6510,6 +6543,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote" = doDistribute super."prednote_0_36_0_2";
@@ -6539,6 +6573,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6639,6 +6674,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_4_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6786,6 +6822,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7509,6 +7546,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7789,6 +7827,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7813,6 +7852,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7821,6 +7861,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7908,6 +7949,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -8095,6 +8137,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8411,6 +8454,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8754,6 +8798,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8796,6 +8841,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_6";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index 4f178b4b1cf..fc4a7679ff4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -796,6 +797,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1302,6 +1304,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1943,6 +1946,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_3_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2018,6 +2022,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2066,6 +2071,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2090,6 +2096,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2258,6 +2265,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2388,6 +2396,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2527,6 +2536,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3211,6 +3221,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4226,6 +4237,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4582,6 +4594,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4638,6 +4651,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4691,6 +4705,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4836,6 +4851,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4870,6 +4886,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5072,6 +5089,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -5179,6 +5197,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5266,6 +5285,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5527,6 +5547,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5620,6 +5641,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_10";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5680,6 +5702,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5703,6 +5726,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5801,6 +5826,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5822,6 +5848,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -6093,6 +6120,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6187,6 +6215,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6278,6 +6307,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6286,6 +6316,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6322,6 +6353,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6486,6 +6518,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6502,6 +6535,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
@@ -6530,6 +6564,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6630,6 +6665,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_4_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6777,6 +6813,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7500,6 +7537,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7780,6 +7818,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7804,6 +7843,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7812,6 +7852,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7896,6 +7937,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -8083,6 +8125,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8399,6 +8442,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8741,6 +8785,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8783,6 +8828,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_6_1";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
@@ -8839,6 +8885,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_1_0_6";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_4_4";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index cf8d12a6493..791a8a909c5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -796,6 +797,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1302,6 +1304,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1943,6 +1946,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2018,6 +2022,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2066,6 +2071,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2090,6 +2096,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2258,6 +2265,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2388,6 +2396,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2527,6 +2536,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3178,6 +3188,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "forecast-io" = dontDistribute super."forecast-io";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
@@ -3210,6 +3221,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4223,6 +4235,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4579,6 +4592,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4635,6 +4649,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4688,6 +4703,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4833,6 +4849,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4867,6 +4884,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5068,6 +5086,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -5174,6 +5193,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5260,6 +5280,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5521,6 +5542,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5614,6 +5636,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_10";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5674,6 +5697,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5697,6 +5721,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5795,6 +5821,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5816,6 +5843,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -6087,6 +6115,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6181,6 +6210,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6272,6 +6302,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6280,6 +6311,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6316,6 +6348,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6480,6 +6513,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6496,6 +6530,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
@@ -6524,6 +6559,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
   "primitive-simd" = dontDistribute super."primitive-simd";
@@ -6624,6 +6660,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_4_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6771,6 +6808,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7494,6 +7532,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7774,6 +7813,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7798,6 +7838,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7806,6 +7847,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7890,6 +7932,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -8077,6 +8120,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8392,6 +8436,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8733,6 +8778,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8775,6 +8821,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_6_1";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
@@ -8831,6 +8878,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_1_0_6";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_4_4";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 3cf88fb2e61..63a27278bc0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -796,6 +797,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1302,6 +1304,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1941,6 +1944,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2016,6 +2020,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2064,6 +2069,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2088,6 +2094,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2256,6 +2263,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2385,6 +2393,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2524,6 +2533,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -3175,6 +3185,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "forecast-io" = dontDistribute super."forecast-io";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
@@ -3207,6 +3218,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4219,6 +4231,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4575,6 +4588,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4631,6 +4645,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4684,6 +4699,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4829,6 +4845,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4863,6 +4880,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5064,6 +5082,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -5170,6 +5189,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5256,6 +5276,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5517,6 +5538,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5610,6 +5632,7 @@ self: super: {
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-mail" = doDistribute super."mime-mail_0_4_10";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5670,6 +5693,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_13_2";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5693,6 +5717,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5791,6 +5817,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5812,6 +5839,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -6083,6 +6111,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6177,6 +6206,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6268,6 +6298,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6276,6 +6307,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6312,6 +6344,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6475,6 +6508,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6491,6 +6525,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
@@ -6519,6 +6554,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6618,6 +6654,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_4_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6765,6 +6802,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7488,6 +7526,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7767,6 +7806,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7791,6 +7831,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7799,6 +7840,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7883,6 +7925,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -8070,6 +8113,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8385,6 +8429,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8724,6 +8769,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8766,6 +8812,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_6_1";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
@@ -8822,6 +8869,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_1_0_6";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_4_4";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 104697b1a4b..b04324a3e14 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -796,6 +797,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1302,6 +1304,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1939,6 +1942,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2014,6 +2018,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2062,6 +2067,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2086,6 +2092,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2254,6 +2261,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2383,6 +2391,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2522,6 +2531,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2605,6 +2615,7 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3";
@@ -2612,12 +2623,14 @@ self: super: {
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
   "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
@@ -3169,6 +3182,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "forecast-io" = dontDistribute super."forecast-io";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
@@ -3201,6 +3215,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4213,6 +4228,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4569,6 +4585,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4625,6 +4642,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4678,6 +4696,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4823,6 +4842,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4857,6 +4877,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5058,6 +5079,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -5164,6 +5186,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5250,6 +5273,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5511,6 +5535,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5603,6 +5628,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5663,6 +5689,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_14";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5686,6 +5713,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5784,6 +5813,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5805,6 +5835,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -6076,6 +6107,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6170,6 +6202,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6261,6 +6294,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6269,6 +6303,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_1";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6305,6 +6340,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6468,6 +6504,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6483,6 +6520,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
@@ -6511,6 +6549,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6610,6 +6649,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_4_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6757,6 +6797,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7480,6 +7521,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7759,6 +7801,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7783,6 +7826,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7791,6 +7835,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7874,6 +7919,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -8061,6 +8107,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8376,6 +8423,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8715,6 +8763,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8757,6 +8806,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_6_1";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
@@ -8813,6 +8863,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_1_0_6";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_4_4";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index be7b35aabf7..3a41fc07bba 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -794,6 +795,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1300,6 +1302,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -1936,6 +1939,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2011,6 +2015,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2059,6 +2064,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2083,6 +2089,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2251,6 +2258,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2380,6 +2388,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2519,6 +2528,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2602,6 +2612,7 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3";
@@ -2609,12 +2620,14 @@ self: super: {
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
   "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
@@ -3165,6 +3178,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "forecast-io" = dontDistribute super."forecast-io";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
@@ -3197,6 +3211,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -4209,6 +4224,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4565,6 +4581,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
@@ -4621,6 +4638,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4674,6 +4692,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4819,6 +4838,7 @@ self: super: {
   "inline-c" = dontDistribute super."inline-c";
   "inline-c-cpp" = dontDistribute super."inline-c-cpp";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4853,6 +4873,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -5054,6 +5075,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -5160,6 +5182,7 @@ self: super: {
   "language-thrift" = dontDistribute super."language-thrift";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "largeword" = doDistribute super."largeword_1_2_3";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
@@ -5246,6 +5269,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5507,6 +5531,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5599,6 +5624,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5659,6 +5685,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_14";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5682,6 +5709,8 @@ self: super: {
   "monad-time" = dontDistribute super."monad-time";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5780,6 +5809,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5801,6 +5831,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -6071,6 +6102,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -6165,6 +6197,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6256,6 +6289,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6264,6 +6298,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_1";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6300,6 +6335,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6463,6 +6499,7 @@ self: super: {
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6478,6 +6515,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = doDistribute super."pred-trie_0_2_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
@@ -6506,6 +6544,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6605,6 +6644,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_4_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6752,6 +6792,7 @@ self: super: {
   "readline" = dontDistribute super."readline";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -7475,6 +7516,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7754,6 +7796,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7778,6 +7821,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_3";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7786,6 +7830,7 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
@@ -7869,6 +7914,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -8056,6 +8102,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -8371,6 +8418,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8710,6 +8758,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8752,6 +8801,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_7";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
@@ -8808,6 +8858,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_1_0_6";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_4_4";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index 5613b9d9119..f242179e73a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -460,6 +460,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -497,6 +498,7 @@ self: super: {
   "HaskellForMaths" = dontDistribute super."HaskellForMaths";
   "HaskellLM" = dontDistribute super."HaskellLM";
   "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellNet-SSL" = doDistribute super."HaskellNet-SSL_0_3_2_1";
   "HaskellTorrent" = dontDistribute super."HaskellTorrent";
   "HaskellTutorials" = dontDistribute super."HaskellTutorials";
   "Haskelloids" = dontDistribute super."Haskelloids";
@@ -776,6 +778,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1090,6 +1093,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1272,6 +1276,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -1366,6 +1371,7 @@ self: super: {
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
   "async" = doDistribute super."async_2_0_2";
+  "async-dejafu" = doDistribute super."async-dejafu_0_1_0_0";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
   "async-pool" = dontDistribute super."async-pool";
@@ -1392,6 +1398,7 @@ self: super: {
   "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec" = doDistribute super."attoparsec_0_13_0_1";
   "attoparsec-arff" = dontDistribute super."attoparsec-arff";
   "attoparsec-binary" = dontDistribute super."attoparsec-binary";
   "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
@@ -1412,6 +1419,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "auto-update" = doDistribute super."auto-update_0_1_3";
   "autoexporter" = dontDistribute super."autoexporter";
   "automitive-cse" = dontDistribute super."automitive-cse";
   "automotive-cse" = dontDistribute super."automotive-cse";
@@ -1882,6 +1890,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -1927,6 +1936,7 @@ self: super: {
   "chatty" = dontDistribute super."chatty";
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate" = doDistribute super."cheapskate_0_1_0_4";
   "cheapskate-highlight" = dontDistribute super."cheapskate-highlight";
   "cheapskate-lucid" = dontDistribute super."cheapskate-lucid";
   "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
@@ -1954,6 +1964,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2024,6 +2035,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2124,6 +2136,7 @@ self: super: {
   "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
@@ -2185,6 +2198,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2287,6 +2301,7 @@ self: super: {
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
   "ctpl" = dontDistribute super."ctpl";
+  "ctrie" = doDistribute super."ctrie_0_1_0_3";
   "cube" = dontDistribute super."cube";
   "cubical" = dontDistribute super."cubical";
   "cubicbezier" = dontDistribute super."cubicbezier";
@@ -2309,6 +2324,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2449,6 +2465,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2485,6 +2502,7 @@ self: super: {
   "definitive-reactive" = dontDistribute super."definitive-reactive";
   "definitive-sound" = dontDistribute super."definitive-sound";
   "deiko-config" = dontDistribute super."deiko-config";
+  "dejafu" = doDistribute super."dejafu_0_2_0_0";
   "deka" = dontDistribute super."deka";
   "deka-tests" = dontDistribute super."deka-tests";
   "delaunay" = dontDistribute super."delaunay";
@@ -2527,16 +2545,21 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
   "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_8";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
@@ -3071,6 +3094,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
   "foreign-var" = dontDistribute super."foreign-var";
@@ -3102,6 +3126,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -3909,6 +3934,7 @@ self: super: {
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
+  "hasty-hamiltonian" = doDistribute super."hasty-hamiltonian_1_1_2";
   "hat" = dontDistribute super."hat";
   "hatex-guide" = dontDistribute super."hatex-guide";
   "hath" = dontDistribute super."hath";
@@ -4078,6 +4104,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4415,6 +4442,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
   "hstidy" = dontDistribute super."hstidy";
@@ -4465,6 +4493,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4496,6 +4525,7 @@ self: super: {
   "human-readable-duration" = doDistribute super."human-readable-duration_0_1_0_0";
   "hums" = dontDistribute super."hums";
   "hunch" = dontDistribute super."hunch";
+  "hunit-dejafu" = doDistribute super."hunit-dejafu_0_2_0_0";
   "hunit-gui" = dontDistribute super."hunit-gui";
   "hunit-parsec" = dontDistribute super."hunit-parsec";
   "hunit-rematch" = dontDistribute super."hunit-rematch";
@@ -4513,6 +4543,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4650,6 +4681,7 @@ self: super: {
   "inject-function" = dontDistribute super."inject-function";
   "inline-c" = doDistribute super."inline-c_0_5_5_1";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4684,6 +4716,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -4873,6 +4906,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -4984,6 +5018,7 @@ self: super: {
   "language-thrift" = doDistribute super."language-thrift_0_6_2_0";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
   "latex" = dontDistribute super."latex";
@@ -5064,6 +5099,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5316,6 +5352,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5404,6 +5441,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5462,6 +5500,7 @@ self: super: {
   "monad-hash" = dontDistribute super."monad-hash";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_16";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5481,8 +5520,11 @@ self: super: {
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-supply" = dontDistribute super."monad-supply";
   "monad-task" = dontDistribute super."monad-task";
+  "monad-time" = doDistribute super."monad-time_0_1";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5578,6 +5620,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5599,6 +5642,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -5853,6 +5897,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -5944,6 +5989,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6027,6 +6073,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6035,6 +6082,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_4";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6068,6 +6116,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6218,9 +6267,11 @@ self: super: {
   "postgresql-orm" = dontDistribute super."postgresql-orm";
   "postgresql-query" = dontDistribute super."postgresql-query";
   "postgresql-schema" = doDistribute super."postgresql-schema_0_1_9";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_5_1_2";
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6236,6 +6287,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
@@ -6262,6 +6314,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6359,6 +6412,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6501,6 +6555,7 @@ self: super: {
   "readable" = dontDistribute super."readable";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -6644,6 +6699,9 @@ self: super: {
   "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
   "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "rest-happstack" = doDistribute super."rest-happstack_0_3_1";
+  "rest-snap" = doDistribute super."rest-snap_0_2";
+  "rest-wai" = doDistribute super."rest-wai_0_2";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -6975,6 +7033,7 @@ self: super: {
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
+  "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -7185,6 +7244,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7266,6 +7326,7 @@ self: super: {
   "state" = dontDistribute super."state";
   "state-plus" = dontDistribute super."state-plus";
   "state-record" = dontDistribute super."state-record";
+  "stateWriter" = doDistribute super."stateWriter_0_2_6";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
   "statestack" = doDistribute super."statestack_0_2_0_4";
@@ -7455,6 +7516,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7479,6 +7541,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_6";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7487,10 +7550,13 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_2";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
+  "tasty" = doDistribute super."tasty_0_11_0_2";
+  "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -7560,6 +7626,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -7739,6 +7806,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -7871,6 +7939,8 @@ self: super: {
   "typescript-docs" = dontDistribute super."typescript-docs";
   "typical" = dontDistribute super."typical";
   "typography-geometry" = dontDistribute super."typography-geometry";
+  "tz" = doDistribute super."tz_0_1_0_1";
+  "tzdata" = doDistribute super."tzdata_0_1_20150810_0";
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
@@ -8035,6 +8105,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8115,6 +8186,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_5";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8186,6 +8258,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_8_0_4";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8342,6 +8415,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8382,6 +8456,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
@@ -8436,6 +8511,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_2_0_1";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index dad52f109ee..c9e4182196f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -460,6 +460,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -497,6 +498,7 @@ self: super: {
   "HaskellForMaths" = dontDistribute super."HaskellForMaths";
   "HaskellLM" = dontDistribute super."HaskellLM";
   "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellNet-SSL" = doDistribute super."HaskellNet-SSL_0_3_2_1";
   "HaskellTorrent" = dontDistribute super."HaskellTorrent";
   "HaskellTutorials" = dontDistribute super."HaskellTutorials";
   "Haskelloids" = dontDistribute super."Haskelloids";
@@ -776,6 +778,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1090,6 +1093,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1270,6 +1274,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -1364,6 +1369,7 @@ self: super: {
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
   "async" = doDistribute super."async_2_0_2";
+  "async-dejafu" = doDistribute super."async-dejafu_0_1_0_0";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
   "async-pool" = dontDistribute super."async-pool";
@@ -1390,6 +1396,7 @@ self: super: {
   "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec" = doDistribute super."attoparsec_0_13_0_1";
   "attoparsec-arff" = dontDistribute super."attoparsec-arff";
   "attoparsec-binary" = dontDistribute super."attoparsec-binary";
   "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
@@ -1410,6 +1417,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "auto-update" = doDistribute super."auto-update_0_1_3";
   "autoexporter" = dontDistribute super."autoexporter";
   "automitive-cse" = dontDistribute super."automitive-cse";
   "automotive-cse" = dontDistribute super."automotive-cse";
@@ -1880,6 +1888,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -1925,6 +1934,7 @@ self: super: {
   "chatty" = dontDistribute super."chatty";
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate" = doDistribute super."cheapskate_0_1_0_4";
   "cheapskate-highlight" = dontDistribute super."cheapskate-highlight";
   "cheapskate-lucid" = dontDistribute super."cheapskate-lucid";
   "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
@@ -1952,6 +1962,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2022,6 +2033,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2122,6 +2134,7 @@ self: super: {
   "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
@@ -2183,6 +2196,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2285,6 +2299,7 @@ self: super: {
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
   "ctpl" = dontDistribute super."ctpl";
+  "ctrie" = doDistribute super."ctrie_0_1_0_3";
   "cube" = dontDistribute super."cube";
   "cubical" = dontDistribute super."cubical";
   "cubicbezier" = dontDistribute super."cubicbezier";
@@ -2307,6 +2322,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2447,6 +2463,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2483,6 +2500,7 @@ self: super: {
   "definitive-reactive" = dontDistribute super."definitive-reactive";
   "definitive-sound" = dontDistribute super."definitive-sound";
   "deiko-config" = dontDistribute super."deiko-config";
+  "dejafu" = doDistribute super."dejafu_0_2_0_0";
   "deka" = dontDistribute super."deka";
   "deka-tests" = dontDistribute super."deka-tests";
   "delaunay" = dontDistribute super."delaunay";
@@ -2525,16 +2543,21 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
   "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_8";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
@@ -2903,6 +2926,7 @@ self: super: {
   "extensible-data" = dontDistribute super."extensible-data";
   "extensible-effects" = dontDistribute super."extensible-effects";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_3";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
   "faceted" = dontDistribute super."faceted";
@@ -3065,6 +3089,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
   "foreign-var" = dontDistribute super."foreign-var";
@@ -3096,6 +3121,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
@@ -3903,6 +3929,7 @@ self: super: {
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
+  "hasty-hamiltonian" = doDistribute super."hasty-hamiltonian_1_1_2";
   "hat" = dontDistribute super."hat";
   "hatex-guide" = dontDistribute super."hatex-guide";
   "hath" = dontDistribute super."hath";
@@ -4071,6 +4098,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4408,6 +4436,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
   "hstidy" = dontDistribute super."hstidy";
@@ -4458,6 +4487,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4489,6 +4519,7 @@ self: super: {
   "human-readable-duration" = doDistribute super."human-readable-duration_0_1_0_0";
   "hums" = dontDistribute super."hums";
   "hunch" = dontDistribute super."hunch";
+  "hunit-dejafu" = doDistribute super."hunit-dejafu_0_2_0_0";
   "hunit-gui" = dontDistribute super."hunit-gui";
   "hunit-parsec" = dontDistribute super."hunit-parsec";
   "hunit-rematch" = dontDistribute super."hunit-rematch";
@@ -4506,6 +4537,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4639,6 +4671,7 @@ self: super: {
   "inject-function" = dontDistribute super."inject-function";
   "inline-c" = doDistribute super."inline-c_0_5_5_1";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4673,6 +4706,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -4861,6 +4895,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -4972,9 +5007,11 @@ self: super: {
   "language-thrift" = doDistribute super."language-thrift_0_6_2_0";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
   "latex" = dontDistribute super."latex";
+  "latex-formulae-hakyll" = doDistribute super."latex-formulae-hakyll_0_2_0_1";
   "launchpad-control" = dontDistribute super."launchpad-control";
   "lax" = dontDistribute super."lax";
   "layers" = dontDistribute super."layers";
@@ -5049,6 +5086,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5301,6 +5339,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5389,6 +5428,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5447,6 +5487,7 @@ self: super: {
   "monad-hash" = dontDistribute super."monad-hash";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_16";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5466,8 +5507,11 @@ self: super: {
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-supply" = dontDistribute super."monad-supply";
   "monad-task" = dontDistribute super."monad-task";
+  "monad-time" = doDistribute super."monad-time_0_1";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5563,6 +5607,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5584,6 +5629,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -5838,6 +5884,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -5929,6 +5976,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -6012,6 +6060,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -6020,6 +6069,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_4";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6053,6 +6103,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6202,9 +6253,11 @@ self: super: {
   "postgresql-orm" = dontDistribute super."postgresql-orm";
   "postgresql-query" = dontDistribute super."postgresql-query";
   "postgresql-schema" = doDistribute super."postgresql-schema_0_1_9";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_5_1_2";
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6220,6 +6273,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
@@ -6246,6 +6300,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6343,6 +6398,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6485,6 +6541,7 @@ self: super: {
   "readable" = dontDistribute super."readable";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -6628,6 +6685,9 @@ self: super: {
   "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
   "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "rest-happstack" = doDistribute super."rest-happstack_0_3_1";
+  "rest-snap" = doDistribute super."rest-snap_0_2";
+  "rest-wai" = doDistribute super."rest-wai_0_2";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -6959,6 +7019,7 @@ self: super: {
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
+  "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -7169,6 +7230,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7250,6 +7312,7 @@ self: super: {
   "state" = dontDistribute super."state";
   "state-plus" = dontDistribute super."state-plus";
   "state-record" = dontDistribute super."state-record";
+  "stateWriter" = doDistribute super."stateWriter_0_2_6";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
   "statestack" = doDistribute super."statestack_0_2_0_4";
@@ -7439,6 +7502,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7463,6 +7527,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_7";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7471,10 +7536,13 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_2";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
+  "tasty" = doDistribute super."tasty_0_11_0_2";
+  "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -7544,6 +7612,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -7723,6 +7792,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -7855,6 +7925,8 @@ self: super: {
   "typescript-docs" = dontDistribute super."typescript-docs";
   "typical" = dontDistribute super."typical";
   "typography-geometry" = dontDistribute super."typography-geometry";
+  "tz" = doDistribute super."tz_0_1_0_1";
+  "tzdata" = doDistribute super."tzdata_0_1_20150810_0";
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
@@ -8019,6 +8091,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8099,6 +8172,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_5";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8170,6 +8244,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_8_0_4";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8326,6 +8401,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8366,6 +8442,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
@@ -8420,6 +8497,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_2_0_1";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
index 53c71284163..a1ebe60a9ec 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
@@ -459,6 +459,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -496,6 +497,7 @@ self: super: {
   "HaskellForMaths" = dontDistribute super."HaskellForMaths";
   "HaskellLM" = dontDistribute super."HaskellLM";
   "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellNet-SSL" = doDistribute super."HaskellNet-SSL_0_3_2_1";
   "HaskellTorrent" = dontDistribute super."HaskellTorrent";
   "HaskellTutorials" = dontDistribute super."HaskellTutorials";
   "Haskelloids" = dontDistribute super."Haskelloids";
@@ -775,6 +777,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1089,6 +1092,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1269,6 +1273,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -1363,6 +1368,7 @@ self: super: {
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
   "async" = doDistribute super."async_2_0_2";
+  "async-dejafu" = doDistribute super."async-dejafu_0_1_0_0";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
   "async-pool" = dontDistribute super."async-pool";
@@ -1389,6 +1395,7 @@ self: super: {
   "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec" = doDistribute super."attoparsec_0_13_0_1";
   "attoparsec-arff" = dontDistribute super."attoparsec-arff";
   "attoparsec-binary" = dontDistribute super."attoparsec-binary";
   "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
@@ -1409,6 +1416,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "auto-update" = doDistribute super."auto-update_0_1_3";
   "autoexporter" = dontDistribute super."autoexporter";
   "automitive-cse" = dontDistribute super."automitive-cse";
   "automotive-cse" = dontDistribute super."automotive-cse";
@@ -1876,6 +1884,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -1920,6 +1929,7 @@ self: super: {
   "chatty" = dontDistribute super."chatty";
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate" = doDistribute super."cheapskate_0_1_0_4";
   "cheapskate-highlight" = dontDistribute super."cheapskate-highlight";
   "cheapskate-lucid" = dontDistribute super."cheapskate-lucid";
   "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
@@ -1947,6 +1957,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2017,6 +2028,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2116,6 +2128,7 @@ self: super: {
   "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
@@ -2177,6 +2190,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2279,6 +2293,7 @@ self: super: {
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
   "ctpl" = dontDistribute super."ctpl";
+  "ctrie" = doDistribute super."ctrie_0_1_0_3";
   "cube" = dontDistribute super."cube";
   "cubical" = dontDistribute super."cubical";
   "cubicbezier" = dontDistribute super."cubicbezier";
@@ -2301,6 +2316,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2440,6 +2456,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2476,6 +2493,7 @@ self: super: {
   "definitive-reactive" = dontDistribute super."definitive-reactive";
   "definitive-sound" = dontDistribute super."definitive-sound";
   "deiko-config" = dontDistribute super."deiko-config";
+  "dejafu" = doDistribute super."dejafu_0_2_0_0";
   "deka" = dontDistribute super."deka";
   "deka-tests" = dontDistribute super."deka-tests";
   "delaunay" = dontDistribute super."delaunay";
@@ -2518,16 +2536,21 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_2";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_5";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
   "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_9";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
@@ -2725,6 +2748,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editpipe" = dontDistribute super."editpipe";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_7";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2893,6 +2917,7 @@ self: super: {
   "extensible-data" = dontDistribute super."extensible-data";
   "extensible-effects" = dontDistribute super."extensible-effects";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_3";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
   "faceted" = dontDistribute super."faceted";
@@ -3054,6 +3079,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
   "foreign-var" = dontDistribute super."foreign-var";
@@ -3085,6 +3111,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3213,6 +3240,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_2";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3885,6 +3913,7 @@ self: super: {
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
+  "hasty-hamiltonian" = doDistribute super."hasty-hamiltonian_1_1_2";
   "hat" = dontDistribute super."hat";
   "hatex-guide" = dontDistribute super."hatex-guide";
   "hath" = dontDistribute super."hath";
@@ -4052,6 +4081,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4387,6 +4417,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
   "hstidy" = dontDistribute super."hstidy";
@@ -4437,6 +4468,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4468,6 +4500,7 @@ self: super: {
   "human-readable-duration" = doDistribute super."human-readable-duration_0_1_1_0";
   "hums" = dontDistribute super."hums";
   "hunch" = dontDistribute super."hunch";
+  "hunit-dejafu" = doDistribute super."hunit-dejafu_0_2_0_0";
   "hunit-gui" = dontDistribute super."hunit-gui";
   "hunit-parsec" = dontDistribute super."hunit-parsec";
   "hunit-rematch" = dontDistribute super."hunit-rematch";
@@ -4485,6 +4518,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4616,6 +4650,7 @@ self: super: {
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
@@ -4649,6 +4684,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2_2";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -4836,6 +4872,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keys" = doDistribute super."keys_3_10_2";
@@ -4947,9 +4984,11 @@ self: super: {
   "language-thrift" = doDistribute super."language-thrift_0_6_2_0";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
   "latex" = dontDistribute super."latex";
+  "latex-formulae-hakyll" = doDistribute super."latex-formulae-hakyll_0_2_0_1";
   "launchpad-control" = dontDistribute super."launchpad-control";
   "lax" = dontDistribute super."lax";
   "layers" = dontDistribute super."layers";
@@ -5024,6 +5063,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5276,6 +5316,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5364,6 +5405,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5422,6 +5464,7 @@ self: super: {
   "monad-hash" = dontDistribute super."monad-hash";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_17";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5440,8 +5483,11 @@ self: super: {
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-supply" = dontDistribute super."monad-supply";
   "monad-task" = dontDistribute super."monad-task";
+  "monad-time" = doDistribute super."monad-time_0_1";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5535,6 +5581,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5556,6 +5603,7 @@ self: super: {
   "mustache" = dontDistribute super."mustache";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -5810,6 +5858,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -5901,6 +5950,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -5984,6 +6034,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -5992,6 +6043,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_4";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -6025,6 +6077,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6172,9 +6225,11 @@ self: super: {
   "postgresql-cube" = dontDistribute super."postgresql-cube";
   "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
   "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_5_1_2";
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6190,6 +6245,7 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
   "pred-trie" = dontDistribute super."pred-trie";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
@@ -6215,6 +6271,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6312,6 +6369,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6453,6 +6511,7 @@ self: super: {
   "readable" = dontDistribute super."readable";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -6595,6 +6654,9 @@ self: super: {
   "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
   "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "rest-happstack" = doDistribute super."rest-happstack_0_3_1";
+  "rest-snap" = doDistribute super."rest-snap_0_2";
+  "rest-wai" = doDistribute super."rest-wai_0_2";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -6923,6 +6985,7 @@ self: super: {
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
   "shelltestrunner" = dontDistribute super."shelltestrunner";
+  "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -7129,6 +7192,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7208,6 +7272,7 @@ self: super: {
   "state" = dontDistribute super."state";
   "state-plus" = dontDistribute super."state-plus";
   "state-record" = dontDistribute super."state-record";
+  "stateWriter" = doDistribute super."stateWriter_0_2_6";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
   "statestack" = doDistribute super."statestack_0_2_0_4";
@@ -7397,6 +7462,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7421,6 +7487,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_8";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7429,10 +7496,13 @@ self: super: {
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
   "tar" = doDistribute super."tar_0_4_2_2";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
+  "tasty" = doDistribute super."tasty_0_11_0_2";
+  "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -7502,6 +7572,7 @@ self: super: {
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "test-simple" = dontDistribute super."test-simple";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -7681,6 +7752,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -7813,6 +7885,8 @@ self: super: {
   "typescript-docs" = dontDistribute super."typescript-docs";
   "typical" = dontDistribute super."typical";
   "typography-geometry" = dontDistribute super."typography-geometry";
+  "tz" = doDistribute super."tz_0_1_0_1";
+  "tzdata" = doDistribute super."tzdata_0_1_20150810_0";
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
@@ -7977,6 +8051,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -8057,6 +8132,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_5";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8064,6 +8140,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_5";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
@@ -8126,6 +8203,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_8_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8282,6 +8360,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8322,6 +8401,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
@@ -8376,6 +8456,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_2_0_1";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
index 17e11586d38..7c814e27ccf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
@@ -455,6 +455,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -490,6 +491,7 @@ self: super: {
   "HaskellForMaths" = dontDistribute super."HaskellForMaths";
   "HaskellLM" = dontDistribute super."HaskellLM";
   "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellNet-SSL" = doDistribute super."HaskellNet-SSL_0_3_2_1";
   "HaskellTorrent" = dontDistribute super."HaskellTorrent";
   "HaskellTutorials" = dontDistribute super."HaskellTutorials";
   "Haskelloids" = dontDistribute super."Haskelloids";
@@ -642,6 +644,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_2_2";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -765,6 +768,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1078,6 +1082,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1257,6 +1262,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -1350,6 +1356,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async-dejafu" = doDistribute super."async-dejafu_0_1_0_0";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
   "async-pool" = dontDistribute super."async-pool";
@@ -1376,6 +1383,7 @@ self: super: {
   "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec" = doDistribute super."attoparsec_0_13_0_1";
   "attoparsec-arff" = dontDistribute super."attoparsec-arff";
   "attoparsec-binary" = dontDistribute super."attoparsec-binary";
   "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
@@ -1396,6 +1404,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "auto-update" = doDistribute super."auto-update_0_1_3";
   "autoexporter" = dontDistribute super."autoexporter";
   "automitive-cse" = dontDistribute super."automitive-cse";
   "automotive-cse" = dontDistribute super."automotive-cse";
@@ -1747,6 +1756,7 @@ self: super: {
   "cabal-cargs" = dontDistribute super."cabal-cargs";
   "cabal-constraints" = dontDistribute super."cabal-constraints";
   "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-debian" = doDistribute super."cabal-debian_4_32_2";
   "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
   "cabal-dev" = dontDistribute super."cabal-dev";
   "cabal-dir" = dontDistribute super."cabal-dir";
@@ -1852,6 +1862,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -1895,6 +1906,7 @@ self: super: {
   "chatty" = dontDistribute super."chatty";
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate" = doDistribute super."cheapskate_0_1_0_4";
   "cheapskate-highlight" = dontDistribute super."cheapskate-highlight";
   "cheapskate-lucid" = dontDistribute super."cheapskate-lucid";
   "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
@@ -1922,6 +1934,7 @@ self: super: {
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
   "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -1992,6 +2005,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2091,6 +2105,7 @@ self: super: {
   "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
@@ -2149,6 +2164,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2249,6 +2265,7 @@ self: super: {
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
   "ctpl" = dontDistribute super."ctpl";
+  "ctrie" = doDistribute super."ctrie_0_1_0_3";
   "cube" = dontDistribute super."cube";
   "cubical" = dontDistribute super."cubical";
   "cubicbezier" = dontDistribute super."cubicbezier";
@@ -2271,6 +2288,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2407,6 +2425,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2443,6 +2462,7 @@ self: super: {
   "definitive-reactive" = dontDistribute super."definitive-reactive";
   "definitive-sound" = dontDistribute super."definitive-sound";
   "deiko-config" = dontDistribute super."deiko-config";
+  "dejafu" = doDistribute super."dejafu_0_2_0_0";
   "deka" = dontDistribute super."deka";
   "deka-tests" = dontDistribute super."deka-tests";
   "delaunay" = dontDistribute super."delaunay";
@@ -2485,14 +2505,20 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_2";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
+  "diagrams-canvas" = doDistribute super."diagrams-canvas_1_3_0_3";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_5";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
   "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_9";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
@@ -2686,6 +2712,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editpipe" = dontDistribute super."editpipe";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_7";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2851,6 +2878,7 @@ self: super: {
   "extensible" = dontDistribute super."extensible";
   "extensible-data" = dontDistribute super."extensible-data";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_3";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
   "faceted" = dontDistribute super."faceted";
@@ -2922,6 +2950,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9_1";
   "filediff" = dontDistribute super."filediff";
   "filepath-io-access" = dontDistribute super."filepath-io-access";
   "filepather" = dontDistribute super."filepather";
@@ -3010,6 +3039,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
   "foreign-var" = dontDistribute super."foreign-var";
@@ -3041,6 +3071,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3167,6 +3198,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_2";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3831,6 +3863,7 @@ self: super: {
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
+  "hasty-hamiltonian" = doDistribute super."hasty-hamiltonian_1_1_2";
   "hat" = dontDistribute super."hat";
   "hatex-guide" = dontDistribute super."hatex-guide";
   "hath" = dontDistribute super."hath";
@@ -3998,6 +4031,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4333,6 +4367,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
   "hstidy" = dontDistribute super."hstidy";
@@ -4383,6 +4418,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4412,6 +4448,7 @@ self: super: {
   "hulk" = dontDistribute super."hulk";
   "hums" = dontDistribute super."hums";
   "hunch" = dontDistribute super."hunch";
+  "hunit-dejafu" = doDistribute super."hunit-dejafu_0_2_0_0";
   "hunit-gui" = dontDistribute super."hunit-gui";
   "hunit-parsec" = dontDistribute super."hunit-parsec";
   "hunit-rematch" = dontDistribute super."hunit-rematch";
@@ -4429,6 +4466,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4560,6 +4598,7 @@ self: super: {
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
   "inserts" = dontDistribute super."inserts";
@@ -4592,6 +4631,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_3";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -4778,6 +4818,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keystore" = dontDistribute super."keystore";
@@ -4888,9 +4929,11 @@ self: super: {
   "language-thrift" = doDistribute super."language-thrift_0_7_0_0";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
   "latex" = dontDistribute super."latex";
+  "latex-formulae-hakyll" = doDistribute super."latex-formulae-hakyll_0_2_0_1";
   "launchpad-control" = dontDistribute super."launchpad-control";
   "lax" = dontDistribute super."lax";
   "layers" = dontDistribute super."layers";
@@ -4965,6 +5008,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5215,6 +5259,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5301,6 +5346,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5359,6 +5405,7 @@ self: super: {
   "monad-hash" = dontDistribute super."monad-hash";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_17";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5377,8 +5424,11 @@ self: super: {
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-supply" = dontDistribute super."monad-supply";
   "monad-task" = dontDistribute super."monad-task";
+  "monad-time" = doDistribute super."monad-time_0_1";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5472,6 +5522,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5492,6 +5543,7 @@ self: super: {
   "musicxml2" = dontDistribute super."musicxml2";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -5744,6 +5796,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -5834,6 +5887,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -5916,6 +5970,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -5924,6 +5979,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_4";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -5956,6 +6012,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6100,9 +6157,11 @@ self: super: {
   "postgresql-cube" = dontDistribute super."postgresql-cube";
   "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
   "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_5_1_2";
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6118,6 +6177,8 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
+  "pred-trie" = doDistribute super."pred-trie_0_5_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
   "prefork" = dontDistribute super."prefork";
@@ -6142,6 +6203,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6236,6 +6298,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6375,6 +6438,7 @@ self: super: {
   "read-env-var" = dontDistribute super."read-env-var";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -6516,6 +6580,9 @@ self: super: {
   "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
   "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "rest-happstack" = doDistribute super."rest-happstack_0_3_1";
+  "rest-snap" = doDistribute super."rest-snap_0_2";
+  "rest-wai" = doDistribute super."rest-wai_0_2";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -6839,6 +6906,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -7044,6 +7112,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7121,6 +7190,7 @@ self: super: {
   "stash" = dontDistribute super."stash";
   "state" = dontDistribute super."state";
   "state-record" = dontDistribute super."state-record";
+  "stateWriter" = doDistribute super."stateWriter_0_2_6";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
   "statethread" = dontDistribute super."statethread";
@@ -7309,6 +7379,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7333,6 +7404,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_8";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7340,10 +7412,14 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_5_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
+  "tasty" = doDistribute super."tasty_0_11_0_2";
+  "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -7409,6 +7485,7 @@ self: super: {
   "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -7462,6 +7539,7 @@ self: super: {
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7585,6 +7663,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -7715,6 +7794,8 @@ self: super: {
   "typescript-docs" = dontDistribute super."typescript-docs";
   "typical" = dontDistribute super."typical";
   "typography-geometry" = dontDistribute super."typography-geometry";
+  "tz" = doDistribute super."tz_0_1_0_1";
+  "tzdata" = doDistribute super."tzdata_0_1_20150810_0";
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
@@ -7877,6 +7958,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -7958,6 +8040,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_5";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -7965,6 +8048,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_5";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
@@ -8027,6 +8111,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_8_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8182,6 +8267,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8222,6 +8308,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_12";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
@@ -8276,6 +8363,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_2_0_1";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
index bfb3b731998..ea20f7e7d14 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
@@ -454,6 +454,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -489,6 +490,7 @@ self: super: {
   "HaskellForMaths" = dontDistribute super."HaskellForMaths";
   "HaskellLM" = dontDistribute super."HaskellLM";
   "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellNet-SSL" = doDistribute super."HaskellNet-SSL_0_3_2_1";
   "HaskellTorrent" = dontDistribute super."HaskellTorrent";
   "HaskellTutorials" = dontDistribute super."HaskellTutorials";
   "Haskelloids" = dontDistribute super."Haskelloids";
@@ -641,6 +643,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_2_2";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -764,6 +767,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1077,6 +1081,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1255,6 +1260,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -1348,6 +1354,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async-dejafu" = doDistribute super."async-dejafu_0_1_0_0";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
   "async-pool" = dontDistribute super."async-pool";
@@ -1374,6 +1381,7 @@ self: super: {
   "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec" = doDistribute super."attoparsec_0_13_0_1";
   "attoparsec-arff" = dontDistribute super."attoparsec-arff";
   "attoparsec-binary" = dontDistribute super."attoparsec-binary";
   "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
@@ -1394,6 +1402,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "auto-update" = doDistribute super."auto-update_0_1_3";
   "autoexporter" = dontDistribute super."autoexporter";
   "automitive-cse" = dontDistribute super."automitive-cse";
   "automotive-cse" = dontDistribute super."automotive-cse";
@@ -1743,6 +1752,7 @@ self: super: {
   "cabal-cargs" = dontDistribute super."cabal-cargs";
   "cabal-constraints" = dontDistribute super."cabal-constraints";
   "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-debian" = doDistribute super."cabal-debian_4_32_2";
   "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
   "cabal-dev" = dontDistribute super."cabal-dev";
   "cabal-dir" = dontDistribute super."cabal-dir";
@@ -1848,6 +1858,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -1891,6 +1902,7 @@ self: super: {
   "chatty" = dontDistribute super."chatty";
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate" = doDistribute super."cheapskate_0_1_0_4";
   "cheapskate-highlight" = dontDistribute super."cheapskate-highlight";
   "cheapskate-lucid" = dontDistribute super."cheapskate-lucid";
   "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
@@ -1917,6 +1929,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -1987,6 +2000,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2086,6 +2100,7 @@ self: super: {
   "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
@@ -2144,6 +2159,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2244,6 +2260,7 @@ self: super: {
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
   "ctpl" = dontDistribute super."ctpl";
+  "ctrie" = doDistribute super."ctrie_0_1_0_3";
   "cube" = dontDistribute super."cube";
   "cubical" = dontDistribute super."cubical";
   "cubicbezier" = dontDistribute super."cubicbezier";
@@ -2266,6 +2283,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2274,6 +2292,7 @@ self: super: {
   "danibot" = dontDistribute super."danibot";
   "dao" = dontDistribute super."dao";
   "dapi" = dontDistribute super."dapi";
+  "darcs" = doDistribute super."darcs_2_10_3";
   "darcs-benchmark" = dontDistribute super."darcs-benchmark";
   "darcs-beta" = dontDistribute super."darcs-beta";
   "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
@@ -2401,6 +2420,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2437,6 +2457,7 @@ self: super: {
   "definitive-reactive" = dontDistribute super."definitive-reactive";
   "definitive-sound" = dontDistribute super."definitive-sound";
   "deiko-config" = dontDistribute super."deiko-config";
+  "dejafu" = doDistribute super."dejafu_0_2_0_0";
   "deka" = dontDistribute super."deka";
   "deka-tests" = dontDistribute super."deka-tests";
   "delaunay" = dontDistribute super."delaunay";
@@ -2479,14 +2500,20 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_2";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
+  "diagrams-canvas" = doDistribute super."diagrams-canvas_1_3_0_3";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_5";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
   "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_9";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
@@ -2680,6 +2707,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editpipe" = dontDistribute super."editpipe";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_7";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2845,6 +2873,7 @@ self: super: {
   "extensible" = dontDistribute super."extensible";
   "extensible-data" = dontDistribute super."extensible-data";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_3";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
   "faceted" = dontDistribute super."faceted";
@@ -2916,6 +2945,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9_1";
   "filediff" = dontDistribute super."filediff";
   "filepath-io-access" = dontDistribute super."filepath-io-access";
   "filepather" = dontDistribute super."filepather";
@@ -3004,6 +3034,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
   "foreign-var" = dontDistribute super."foreign-var";
@@ -3035,6 +3066,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3161,6 +3193,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_2";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3825,6 +3858,7 @@ self: super: {
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
+  "hasty-hamiltonian" = doDistribute super."hasty-hamiltonian_1_1_2";
   "hat" = dontDistribute super."hat";
   "hatex-guide" = dontDistribute super."hatex-guide";
   "hath" = dontDistribute super."hath";
@@ -3992,6 +4026,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4327,6 +4362,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
   "hstidy" = dontDistribute super."hstidy";
@@ -4377,6 +4413,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4406,6 +4443,7 @@ self: super: {
   "hulk" = dontDistribute super."hulk";
   "hums" = dontDistribute super."hums";
   "hunch" = dontDistribute super."hunch";
+  "hunit-dejafu" = doDistribute super."hunit-dejafu_0_2_0_0";
   "hunit-gui" = dontDistribute super."hunit-gui";
   "hunit-parsec" = dontDistribute super."hunit-parsec";
   "hunit-rematch" = dontDistribute super."hunit-rematch";
@@ -4423,6 +4461,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4553,6 +4592,7 @@ self: super: {
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
   "inserts" = dontDistribute super."inserts";
@@ -4585,6 +4625,7 @@ self: super: {
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_3";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -4771,6 +4812,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keystore" = dontDistribute super."keystore";
@@ -4881,9 +4923,11 @@ self: super: {
   "language-thrift" = doDistribute super."language-thrift_0_7_0_1";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
   "latex" = dontDistribute super."latex";
+  "latex-formulae-hakyll" = doDistribute super."latex-formulae-hakyll_0_2_0_1";
   "launchpad-control" = dontDistribute super."launchpad-control";
   "lax" = dontDistribute super."lax";
   "layers" = dontDistribute super."layers";
@@ -4958,6 +5002,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5208,6 +5253,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5294,6 +5340,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5351,6 +5398,7 @@ self: super: {
   "monad-hash" = dontDistribute super."monad-hash";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-logger" = doDistribute super."monad-logger_0_3_17";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
@@ -5369,8 +5417,11 @@ self: super: {
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-supply" = dontDistribute super."monad-supply";
   "monad-task" = dontDistribute super."monad-task";
+  "monad-time" = doDistribute super."monad-time_0_1";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5464,6 +5515,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5484,6 +5536,7 @@ self: super: {
   "musicxml2" = dontDistribute super."musicxml2";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -5736,6 +5789,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -5826,6 +5880,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -5908,6 +5963,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -5916,6 +5972,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_4";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -5948,6 +6005,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6092,9 +6150,11 @@ self: super: {
   "postgresql-cube" = dontDistribute super."postgresql-cube";
   "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
   "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_5_1_2";
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6110,6 +6170,8 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
+  "pred-trie" = doDistribute super."pred-trie_0_5_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
   "prefork" = dontDistribute super."prefork";
@@ -6134,6 +6196,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6228,6 +6291,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6367,6 +6431,7 @@ self: super: {
   "read-env-var" = dontDistribute super."read-env-var";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -6507,6 +6572,9 @@ self: super: {
   "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
   "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "rest-happstack" = doDistribute super."rest-happstack_0_3_1";
+  "rest-snap" = doDistribute super."rest-snap_0_2";
+  "rest-wai" = doDistribute super."rest-wai_0_2";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -6829,6 +6897,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -7034,6 +7103,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7111,6 +7181,7 @@ self: super: {
   "stash" = dontDistribute super."stash";
   "state" = dontDistribute super."state";
   "state-record" = dontDistribute super."state-record";
+  "stateWriter" = doDistribute super."stateWriter_0_2_6";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
   "statethread" = dontDistribute super."statethread";
@@ -7299,6 +7370,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7308,6 +7380,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_3";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7322,6 +7395,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_8";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7329,10 +7403,14 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_5_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
+  "tasty" = doDistribute super."tasty_0_11_0_2";
+  "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -7398,6 +7476,7 @@ self: super: {
   "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -7451,6 +7530,7 @@ self: super: {
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7574,6 +7654,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -7704,6 +7785,8 @@ self: super: {
   "typescript-docs" = dontDistribute super."typescript-docs";
   "typical" = dontDistribute super."typical";
   "typography-geometry" = dontDistribute super."typography-geometry";
+  "tz" = doDistribute super."tz_0_1_0_1";
+  "tzdata" = doDistribute super."tzdata_0_1_20150810_0";
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
@@ -7866,6 +7949,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -7946,6 +8030,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_5";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -7953,6 +8038,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_5";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
@@ -8015,6 +8101,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_8_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8170,6 +8257,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8210,6 +8298,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_12";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
@@ -8264,6 +8353,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_2_0_2";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.10.nix b/pkgs/development/haskell-modules/configuration-lts-5.10.nix
index 4044a1f41a0..38acdb238cf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.10.nix
@@ -125,6 +125,7 @@ self: super: {
   "BitSyntax" = dontDistribute super."BitSyntax";
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
+  "BlogLiterately" = doDistribute super."BlogLiterately_0_8_2";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -449,6 +450,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -482,6 +484,7 @@ self: super: {
   "HaskellForMaths" = dontDistribute super."HaskellForMaths";
   "HaskellLM" = dontDistribute super."HaskellLM";
   "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellNet-SSL" = doDistribute super."HaskellNet-SSL_0_3_2_1";
   "HaskellTorrent" = dontDistribute super."HaskellTorrent";
   "HaskellTutorials" = dontDistribute super."HaskellTutorials";
   "Haskelloids" = dontDistribute super."Haskelloids";
@@ -633,6 +636,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_2_2";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -756,6 +760,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1068,6 +1073,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1086,6 +1092,7 @@ self: super: {
   "aeson" = doDistribute super."aeson_0_9_0_1";
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-compat" = doDistribute super."aeson-compat_0_3_2_0";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-flatten" = dontDistribute super."aeson-flatten";
@@ -1243,6 +1250,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -1335,6 +1343,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async-dejafu" = doDistribute super."async-dejafu_0_1_0_0";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
   "async-pool" = dontDistribute super."async-pool";
@@ -1360,6 +1369,7 @@ self: super: {
   "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec" = doDistribute super."attoparsec_0_13_0_1";
   "attoparsec-arff" = dontDistribute super."attoparsec-arff";
   "attoparsec-binary" = dontDistribute super."attoparsec-binary";
   "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
@@ -1380,6 +1390,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "auto-update" = doDistribute super."auto-update_0_1_3";
   "autoexporter" = dontDistribute super."autoexporter";
   "automitive-cse" = dontDistribute super."automitive-cse";
   "automotive-cse" = dontDistribute super."automotive-cse";
@@ -1421,6 +1432,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_18";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1724,6 +1736,7 @@ self: super: {
   "cabal-cargs" = dontDistribute super."cabal-cargs";
   "cabal-constraints" = dontDistribute super."cabal-constraints";
   "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-debian" = doDistribute super."cabal-debian_4_32_2";
   "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
   "cabal-dev" = dontDistribute super."cabal-dev";
   "cabal-dir" = dontDistribute super."cabal-dir";
@@ -1825,6 +1838,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -1867,6 +1881,7 @@ self: super: {
   "chatty" = dontDistribute super."chatty";
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate" = doDistribute super."cheapskate_0_1_0_4";
   "cheapskate-highlight" = dontDistribute super."cheapskate-highlight";
   "cheapskate-lucid" = dontDistribute super."cheapskate-lucid";
   "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
@@ -1893,6 +1908,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -1957,6 +1973,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2034,6 +2051,7 @@ self: super: {
   "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
   "concurrent-extra" = dontDistribute super."concurrent-extra";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "concurrent-output" = doDistribute super."concurrent-output_1_7_4";
   "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
@@ -2053,6 +2071,7 @@ self: super: {
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_11";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
@@ -2087,6 +2106,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant-extras" = doDistribute super."contravariant-extras_0_3_1";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
   "control-monad-exception" = dontDistribute super."control-monad-exception";
@@ -2110,6 +2130,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2208,6 +2229,7 @@ self: super: {
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
   "ctpl" = dontDistribute super."ctpl";
+  "ctrie" = doDistribute super."ctrie_0_1_0_3";
   "cube" = dontDistribute super."cube";
   "cubical" = dontDistribute super."cubical";
   "cubicbezier" = dontDistribute super."cubicbezier";
@@ -2230,6 +2252,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2238,6 +2261,7 @@ self: super: {
   "danibot" = dontDistribute super."danibot";
   "dao" = dontDistribute super."dao";
   "dapi" = dontDistribute super."dapi";
+  "darcs" = doDistribute super."darcs_2_10_3";
   "darcs-benchmark" = dontDistribute super."darcs-benchmark";
   "darcs-beta" = dontDistribute super."darcs-beta";
   "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
@@ -2364,6 +2388,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2400,6 +2425,7 @@ self: super: {
   "definitive-reactive" = dontDistribute super."definitive-reactive";
   "definitive-sound" = dontDistribute super."definitive-sound";
   "deiko-config" = dontDistribute super."deiko-config";
+  "dejafu" = doDistribute super."dejafu_0_2_0_0";
   "deka" = dontDistribute super."deka";
   "deka-tests" = dontDistribute super."deka-tests";
   "delaunay" = dontDistribute super."delaunay";
@@ -2439,12 +2465,20 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
+  "diagrams-canvas" = doDistribute super."diagrams-canvas_1_3_0_3";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_6";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
+  "diagrams-lib" = doDistribute super."diagrams-lib_1_3_1_1";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
@@ -2633,6 +2667,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editpipe" = dontDistribute super."editpipe";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_7";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2660,6 +2695,7 @@ self: super: {
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
   "elision" = dontDistribute super."elision";
+  "elm-bridge" = doDistribute super."elm-bridge_0_2_1_1";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-get" = dontDistribute super."elm-get";
@@ -2791,6 +2827,7 @@ self: super: {
   "extensible" = dontDistribute super."extensible";
   "extensible-data" = dontDistribute super."extensible-data";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_3";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
   "faceted" = dontDistribute super."faceted";
@@ -2858,6 +2895,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9_1";
   "filediff" = dontDistribute super."filediff";
   "filepath-io-access" = dontDistribute super."filepath-io-access";
   "filepather" = dontDistribute super."filepather";
@@ -2946,6 +2984,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
   "foreign-var" = dontDistribute super."foreign-var";
@@ -2977,6 +3016,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3100,6 +3140,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_2";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3547,6 +3588,7 @@ self: super: {
   "hake" = dontDistribute super."hake";
   "hakismet" = dontDistribute super."hakismet";
   "hako" = dontDistribute super."hako";
+  "hakyll" = doDistribute super."hakyll_4_7_5_2";
   "hakyll-R" = dontDistribute super."hakyll-R";
   "hakyll-agda" = dontDistribute super."hakyll-agda";
   "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates";
@@ -3754,6 +3796,7 @@ self: super: {
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
+  "hasty-hamiltonian" = doDistribute super."hasty-hamiltonian_1_1_2";
   "hat" = dontDistribute super."hat";
   "hatex-guide" = dontDistribute super."hatex-guide";
   "hath" = dontDistribute super."hath";
@@ -3916,6 +3959,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_3";
@@ -3944,6 +3988,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_3";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4243,6 +4288,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
   "hstidy" = dontDistribute super."hstidy";
@@ -4293,6 +4339,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4321,6 +4368,7 @@ self: super: {
   "hulk" = dontDistribute super."hulk";
   "hums" = dontDistribute super."hums";
   "hunch" = dontDistribute super."hunch";
+  "hunit-dejafu" = doDistribute super."hunit-dejafu_0_2_0_0";
   "hunit-gui" = dontDistribute super."hunit-gui";
   "hunit-parsec" = dontDistribute super."hunit-parsec";
   "hunit-rematch" = dontDistribute super."hunit-rematch";
@@ -4338,6 +4386,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4465,6 +4514,7 @@ self: super: {
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
   "inserts" = dontDistribute super."inserts";
@@ -4496,6 +4546,7 @@ self: super: {
   "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -4604,6 +4655,7 @@ self: super: {
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
   "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
+  "json-autotype" = doDistribute super."json-autotype_1_0_13";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -4679,6 +4731,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keystore" = dontDistribute super."keystore";
@@ -4768,6 +4821,7 @@ self: super: {
   "language-go" = dontDistribute super."language-go";
   "language-guess" = dontDistribute super."language-guess";
   "language-java-classfile" = dontDistribute super."language-java-classfile";
+  "language-javascript" = doDistribute super."language-javascript_0_5_14_7";
   "language-kort" = dontDistribute super."language-kort";
   "language-lua" = dontDistribute super."language-lua";
   "language-lua-qq" = dontDistribute super."language-lua-qq";
@@ -4787,9 +4841,11 @@ self: super: {
   "language-thrift" = doDistribute super."language-thrift_0_7_0_1";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
   "latex" = dontDistribute super."latex";
+  "latex-formulae-hakyll" = doDistribute super."latex-formulae-hakyll_0_2_0_1";
   "launchpad-control" = dontDistribute super."launchpad-control";
   "lax" = dontDistribute super."lax";
   "layers" = dontDistribute super."layers";
@@ -4829,6 +4885,7 @@ self: super: {
   "lens-utils" = dontDistribute super."lens-utils";
   "lenses" = dontDistribute super."lenses";
   "lensref" = dontDistribute super."lensref";
+  "lentil" = doDistribute super."lentil_0_1_11_0";
   "lenz" = dontDistribute super."lenz";
   "lenz-template" = dontDistribute super."lenz-template";
   "level-monad" = dontDistribute super."level-monad";
@@ -4863,6 +4920,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5086,6 +5144,7 @@ self: super: {
   "manatee-terminal" = dontDistribute super."manatee-terminal";
   "manatee-welcome" = dontDistribute super."manatee-welcome";
   "mancala" = dontDistribute super."mancala";
+  "mandrill" = doDistribute super."mandrill_0_5_1_0";
   "mandulia" = dontDistribute super."mandulia";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
@@ -5108,6 +5167,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5190,6 +5250,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5243,6 +5304,7 @@ self: super: {
   "monad-hash" = dontDistribute super."monad-hash";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -5259,8 +5321,11 @@ self: super: {
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-supply" = dontDistribute super."monad-supply";
   "monad-task" = dontDistribute super."monad-task";
+  "monad-time" = doDistribute super."monad-time_0_1";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5352,6 +5417,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5372,6 +5438,7 @@ self: super: {
   "musicxml2" = dontDistribute super."musicxml2";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -5618,6 +5685,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -5704,6 +5772,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -5781,6 +5850,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -5788,6 +5858,7 @@ self: super: {
   "persist2er" = dontDistribute super."persist2er";
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -5799,6 +5870,7 @@ self: super: {
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-template" = doDistribute super."persistent-template_2_1_6";
   "persistent-vector" = dontDistribute super."persistent-vector";
   "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
   "persona" = dontDistribute super."persona";
@@ -5818,6 +5890,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -5959,9 +6032,11 @@ self: super: {
   "postgresql-cube" = dontDistribute super."postgresql-cube";
   "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
   "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_5_1_2";
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -5977,6 +6052,8 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
+  "pred-trie" = doDistribute super."pred-trie_0_5_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
   "prefork" = dontDistribute super."prefork";
@@ -6001,6 +6078,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6071,6 +6149,7 @@ self: super: {
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
   "psql-helpers" = dontDistribute super."psql-helpers";
+  "psqueues" = doDistribute super."psqueues_0_2_2_0";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6094,6 +6173,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6230,6 +6310,7 @@ self: super: {
   "read-env-var" = dontDistribute super."read-env-var";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -6367,6 +6448,9 @@ self: super: {
   "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
   "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "rest-happstack" = doDistribute super."rest-happstack_0_3_1";
+  "rest-snap" = doDistribute super."rest-snap_0_2";
+  "rest-wai" = doDistribute super."rest-wai_0_2";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -6609,9 +6693,13 @@ self: super: {
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
   "serv-wai" = dontDistribute super."serv-wai";
+  "servant" = doDistribute super."servant_0_4_4_7";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_3_0_1";
+  "servant-blaze" = doDistribute super."servant-blaze_0_4_4_7";
   "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-client" = doDistribute super."servant-client_0_4_4_7";
   "servant-csharp" = dontDistribute super."servant-csharp";
+  "servant-docs" = doDistribute super."servant-docs_0_4_4_7";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
   "servant-examples" = dontDistribute super."servant-examples";
@@ -6626,6 +6714,7 @@ self: super: {
   "servant-postgresql" = dontDistribute super."servant-postgresql";
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-server" = doDistribute super."servant-server_0_4_4_7";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
@@ -6681,6 +6770,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -6881,6 +6971,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -6958,6 +7049,7 @@ self: super: {
   "stash" = dontDistribute super."stash";
   "state" = dontDistribute super."state";
   "state-record" = dontDistribute super."state-record";
+  "stateWriter" = doDistribute super."stateWriter_0_2_6";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
   "statethread" = dontDistribute super."statethread";
@@ -7019,6 +7111,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming" = doDistribute super."streaming_0_1_4_0";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_2";
+  "streaming-commons" = doDistribute super."streaming-commons_0_1_15_2";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7141,6 +7234,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7150,6 +7244,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_3";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7163,6 +7258,7 @@ self: super: {
   "tagset-positional" = dontDistribute super."tagset-positional";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7170,10 +7266,14 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_5_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
+  "tasty" = doDistribute super."tasty_0_11_0_2";
+  "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -7238,6 +7338,7 @@ self: super: {
   "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -7290,6 +7391,7 @@ self: super: {
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7412,6 +7514,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -7539,6 +7642,8 @@ self: super: {
   "typescript-docs" = dontDistribute super."typescript-docs";
   "typical" = dontDistribute super."typical";
   "typography-geometry" = dontDistribute super."typography-geometry";
+  "tz" = doDistribute super."tz_0_1_0_1";
+  "tzdata" = doDistribute super."tzdata_0_1_20150810_0";
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
@@ -7699,6 +7804,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -7709,6 +7815,7 @@ self: super: {
   "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_3_1";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
@@ -7772,10 +7879,12 @@ self: super: {
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-extra" = doDistribute super."wai-extra_3_0_15";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_5";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -7783,6 +7892,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_5";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
@@ -7838,6 +7948,7 @@ self: super: {
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -7992,6 +8103,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8032,6 +8144,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_12";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
@@ -8085,6 +8198,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_2_0_2";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.11.nix b/pkgs/development/haskell-modules/configuration-lts-5.11.nix
index 5d5a3767d6f..ae02a8e85a5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.11.nix
@@ -125,6 +125,7 @@ self: super: {
   "BitSyntax" = dontDistribute super."BitSyntax";
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
+  "BlogLiterately" = doDistribute super."BlogLiterately_0_8_2";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -448,6 +449,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -481,6 +483,7 @@ self: super: {
   "HaskellForMaths" = dontDistribute super."HaskellForMaths";
   "HaskellLM" = dontDistribute super."HaskellLM";
   "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellNet-SSL" = doDistribute super."HaskellNet-SSL_0_3_2_1";
   "HaskellTorrent" = dontDistribute super."HaskellTorrent";
   "HaskellTutorials" = dontDistribute super."HaskellTutorials";
   "Haskelloids" = dontDistribute super."Haskelloids";
@@ -632,6 +635,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_2_2";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -755,6 +759,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1067,6 +1072,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1085,6 +1091,7 @@ self: super: {
   "aeson" = doDistribute super."aeson_0_9_0_1";
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-compat" = doDistribute super."aeson-compat_0_3_2_0";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-flatten" = dontDistribute super."aeson-flatten";
@@ -1241,6 +1248,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -1333,6 +1341,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async-dejafu" = doDistribute super."async-dejafu_0_1_0_0";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
   "async-pool" = dontDistribute super."async-pool";
@@ -1358,6 +1367,7 @@ self: super: {
   "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec" = doDistribute super."attoparsec_0_13_0_1";
   "attoparsec-arff" = dontDistribute super."attoparsec-arff";
   "attoparsec-binary" = dontDistribute super."attoparsec-binary";
   "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
@@ -1378,6 +1388,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "auto-update" = doDistribute super."auto-update_0_1_3";
   "autoexporter" = dontDistribute super."autoexporter";
   "automitive-cse" = dontDistribute super."automitive-cse";
   "automotive-cse" = dontDistribute super."automotive-cse";
@@ -1416,6 +1427,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_18";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1718,6 +1730,7 @@ self: super: {
   "cabal-cargs" = dontDistribute super."cabal-cargs";
   "cabal-constraints" = dontDistribute super."cabal-constraints";
   "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-debian" = doDistribute super."cabal-debian_4_32_2";
   "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
   "cabal-dev" = dontDistribute super."cabal-dev";
   "cabal-dir" = dontDistribute super."cabal-dir";
@@ -1819,6 +1832,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -1861,6 +1875,7 @@ self: super: {
   "chatty" = dontDistribute super."chatty";
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate" = doDistribute super."cheapskate_0_1_0_4";
   "cheapskate-highlight" = dontDistribute super."cheapskate-highlight";
   "cheapskate-lucid" = dontDistribute super."cheapskate-lucid";
   "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
@@ -1887,6 +1902,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -1951,6 +1967,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2027,6 +2044,7 @@ self: super: {
   "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
   "concurrent-extra" = dontDistribute super."concurrent-extra";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "concurrent-output" = doDistribute super."concurrent-output_1_7_4";
   "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
@@ -2045,6 +2063,7 @@ self: super: {
   "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
@@ -2079,6 +2098,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant-extras" = doDistribute super."contravariant-extras_0_3_1";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
   "control-monad-exception" = dontDistribute super."control-monad-exception";
@@ -2102,6 +2122,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2200,6 +2221,7 @@ self: super: {
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
   "ctpl" = dontDistribute super."ctpl";
+  "ctrie" = doDistribute super."ctrie_0_1_0_3";
   "cube" = dontDistribute super."cube";
   "cubical" = dontDistribute super."cubical";
   "cubicbezier" = dontDistribute super."cubicbezier";
@@ -2222,6 +2244,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2230,6 +2253,7 @@ self: super: {
   "danibot" = dontDistribute super."danibot";
   "dao" = dontDistribute super."dao";
   "dapi" = dontDistribute super."dapi";
+  "darcs" = doDistribute super."darcs_2_10_3";
   "darcs-benchmark" = dontDistribute super."darcs-benchmark";
   "darcs-beta" = dontDistribute super."darcs-beta";
   "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
@@ -2356,6 +2380,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2392,6 +2417,7 @@ self: super: {
   "definitive-reactive" = dontDistribute super."definitive-reactive";
   "definitive-sound" = dontDistribute super."definitive-sound";
   "deiko-config" = dontDistribute super."deiko-config";
+  "dejafu" = doDistribute super."dejafu_0_2_0_0";
   "deka" = dontDistribute super."deka";
   "deka-tests" = dontDistribute super."deka-tests";
   "delaunay" = dontDistribute super."delaunay";
@@ -2431,12 +2457,20 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
+  "diagrams-canvas" = doDistribute super."diagrams-canvas_1_3_0_3";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_6";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
+  "diagrams-lib" = doDistribute super."diagrams-lib_1_3_1_1";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
@@ -2625,6 +2659,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editpipe" = dontDistribute super."editpipe";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_7";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2652,6 +2687,7 @@ self: super: {
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
   "elision" = dontDistribute super."elision";
+  "elm-bridge" = doDistribute super."elm-bridge_0_2_1_1";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-get" = dontDistribute super."elm-get";
@@ -2782,6 +2818,7 @@ self: super: {
   "extensible" = dontDistribute super."extensible";
   "extensible-data" = dontDistribute super."extensible-data";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_3";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
   "faceted" = dontDistribute super."faceted";
@@ -2849,6 +2886,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9_1";
   "filediff" = dontDistribute super."filediff";
   "filepath-io-access" = dontDistribute super."filepath-io-access";
   "filepather" = dontDistribute super."filepather";
@@ -2936,6 +2974,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
   "foreign-var" = dontDistribute super."foreign-var";
@@ -2967,6 +3006,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3090,6 +3130,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_2";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3537,6 +3578,7 @@ self: super: {
   "hake" = dontDistribute super."hake";
   "hakismet" = dontDistribute super."hakismet";
   "hako" = dontDistribute super."hako";
+  "hakyll" = doDistribute super."hakyll_4_7_5_2";
   "hakyll-R" = dontDistribute super."hakyll-R";
   "hakyll-agda" = dontDistribute super."hakyll-agda";
   "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates";
@@ -3744,6 +3786,7 @@ self: super: {
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
+  "hasty-hamiltonian" = doDistribute super."hasty-hamiltonian_1_1_2";
   "hat" = dontDistribute super."hat";
   "hatex-guide" = dontDistribute super."hatex-guide";
   "hath" = dontDistribute super."hath";
@@ -3906,6 +3949,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_3";
@@ -3934,6 +3978,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_3";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4229,6 +4274,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
   "hstidy" = dontDistribute super."hstidy";
@@ -4279,6 +4325,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4307,6 +4354,7 @@ self: super: {
   "hulk" = dontDistribute super."hulk";
   "hums" = dontDistribute super."hums";
   "hunch" = dontDistribute super."hunch";
+  "hunit-dejafu" = doDistribute super."hunit-dejafu_0_2_0_0";
   "hunit-gui" = dontDistribute super."hunit-gui";
   "hunit-parsec" = dontDistribute super."hunit-parsec";
   "hunit-rematch" = dontDistribute super."hunit-rematch";
@@ -4324,6 +4372,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4450,6 +4499,7 @@ self: super: {
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
   "inserts" = dontDistribute super."inserts";
@@ -4481,6 +4531,7 @@ self: super: {
   "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -4589,6 +4640,7 @@ self: super: {
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
   "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
+  "json-autotype" = doDistribute super."json-autotype_1_0_13";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -4664,6 +4716,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keystore" = dontDistribute super."keystore";
@@ -4753,6 +4806,7 @@ self: super: {
   "language-go" = dontDistribute super."language-go";
   "language-guess" = dontDistribute super."language-guess";
   "language-java-classfile" = dontDistribute super."language-java-classfile";
+  "language-javascript" = doDistribute super."language-javascript_0_5_14_7";
   "language-kort" = dontDistribute super."language-kort";
   "language-lua" = dontDistribute super."language-lua";
   "language-lua-qq" = dontDistribute super."language-lua-qq";
@@ -4772,9 +4826,11 @@ self: super: {
   "language-thrift" = doDistribute super."language-thrift_0_7_0_1";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
   "latex" = dontDistribute super."latex";
+  "latex-formulae-hakyll" = doDistribute super."latex-formulae-hakyll_0_2_0_1";
   "launchpad-control" = dontDistribute super."launchpad-control";
   "lax" = dontDistribute super."lax";
   "layers" = dontDistribute super."layers";
@@ -4814,6 +4870,7 @@ self: super: {
   "lens-utils" = dontDistribute super."lens-utils";
   "lenses" = dontDistribute super."lenses";
   "lensref" = dontDistribute super."lensref";
+  "lentil" = doDistribute super."lentil_0_1_11_0";
   "lenz" = dontDistribute super."lenz";
   "lenz-template" = dontDistribute super."lenz-template";
   "level-monad" = dontDistribute super."level-monad";
@@ -4848,6 +4905,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5070,6 +5128,7 @@ self: super: {
   "manatee-terminal" = dontDistribute super."manatee-terminal";
   "manatee-welcome" = dontDistribute super."manatee-welcome";
   "mancala" = dontDistribute super."mancala";
+  "mandrill" = doDistribute super."mandrill_0_5_1_0";
   "mandulia" = dontDistribute super."mandulia";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
@@ -5092,6 +5151,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5174,6 +5234,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5227,6 +5288,7 @@ self: super: {
   "monad-hash" = dontDistribute super."monad-hash";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -5243,8 +5305,11 @@ self: super: {
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-supply" = dontDistribute super."monad-supply";
   "monad-task" = dontDistribute super."monad-task";
+  "monad-time" = doDistribute super."monad-time_0_1";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5336,6 +5401,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5356,6 +5422,7 @@ self: super: {
   "musicxml2" = dontDistribute super."musicxml2";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -5602,6 +5669,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -5688,6 +5756,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -5765,6 +5834,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -5772,6 +5842,7 @@ self: super: {
   "persist2er" = dontDistribute super."persist2er";
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -5783,6 +5854,7 @@ self: super: {
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-template" = doDistribute super."persistent-template_2_1_6";
   "persistent-vector" = dontDistribute super."persistent-vector";
   "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
   "persona" = dontDistribute super."persona";
@@ -5802,6 +5874,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -5942,9 +6015,11 @@ self: super: {
   "postgresql-cube" = dontDistribute super."postgresql-cube";
   "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
   "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_5_1_2";
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -5960,6 +6035,8 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
+  "pred-trie" = doDistribute super."pred-trie_0_5_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
   "prefork" = dontDistribute super."prefork";
@@ -5984,6 +6061,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6054,6 +6132,7 @@ self: super: {
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
   "psql-helpers" = dontDistribute super."psql-helpers";
+  "psqueues" = doDistribute super."psqueues_0_2_2_0";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6077,6 +6156,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6213,6 +6293,7 @@ self: super: {
   "read-env-var" = dontDistribute super."read-env-var";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -6350,6 +6431,9 @@ self: super: {
   "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
   "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "rest-happstack" = doDistribute super."rest-happstack_0_3_1";
+  "rest-snap" = doDistribute super."rest-snap_0_2";
+  "rest-wai" = doDistribute super."rest-wai_0_2";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -6592,9 +6676,13 @@ self: super: {
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
   "serv-wai" = dontDistribute super."serv-wai";
+  "servant" = doDistribute super."servant_0_4_4_7";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_3_0_1";
+  "servant-blaze" = doDistribute super."servant-blaze_0_4_4_7";
   "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-client" = doDistribute super."servant-client_0_4_4_7";
   "servant-csharp" = dontDistribute super."servant-csharp";
+  "servant-docs" = doDistribute super."servant-docs_0_4_4_7";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
   "servant-examples" = dontDistribute super."servant-examples";
@@ -6609,6 +6697,7 @@ self: super: {
   "servant-postgresql" = dontDistribute super."servant-postgresql";
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-server" = doDistribute super."servant-server_0_4_4_7";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
@@ -6664,6 +6753,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -6864,6 +6954,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -6941,6 +7032,7 @@ self: super: {
   "stash" = dontDistribute super."stash";
   "state" = dontDistribute super."state";
   "state-record" = dontDistribute super."state-record";
+  "stateWriter" = doDistribute super."stateWriter_0_2_6";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
   "statethread" = dontDistribute super."statethread";
@@ -7002,6 +7094,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming" = doDistribute super."streaming_0_1_4_0";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_2";
+  "streaming-commons" = doDistribute super."streaming-commons_0_1_15_2";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7123,6 +7216,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7132,6 +7226,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_3";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7145,6 +7240,7 @@ self: super: {
   "tagset-positional" = dontDistribute super."tagset-positional";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7152,10 +7248,14 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_5_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
+  "tasty" = doDistribute super."tasty_0_11_0_2";
+  "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7219,6 +7319,7 @@ self: super: {
   "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -7226,6 +7327,7 @@ self: super: {
   "testrunner" = dontDistribute super."testrunner";
   "tetris" = dontDistribute super."tetris";
   "tex2txt" = dontDistribute super."tex2txt";
+  "texmath" = doDistribute super."texmath_0_8_6_1";
   "texrunner" = dontDistribute super."texrunner";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
@@ -7270,6 +7372,7 @@ self: super: {
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7392,6 +7495,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -7518,6 +7622,8 @@ self: super: {
   "typescript-docs" = dontDistribute super."typescript-docs";
   "typical" = dontDistribute super."typical";
   "typography-geometry" = dontDistribute super."typography-geometry";
+  "tz" = doDistribute super."tz_0_1_0_1";
+  "tzdata" = doDistribute super."tzdata_0_1_20150810_0";
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
@@ -7676,6 +7782,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -7686,6 +7793,7 @@ self: super: {
   "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_3_1";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
@@ -7702,6 +7810,7 @@ self: super: {
   "vector-space-points" = dontDistribute super."vector-space-points";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_5";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -7747,10 +7856,12 @@ self: super: {
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-extra" = doDistribute super."wai-extra_3_0_15";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_5";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -7758,6 +7869,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_5";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
@@ -7813,6 +7925,7 @@ self: super: {
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -7967,6 +8080,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8007,6 +8121,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_13";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
@@ -8017,6 +8132,7 @@ self: super: {
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_18";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
@@ -8028,6 +8144,7 @@ self: super: {
   "yesod-datatables" = dontDistribute super."yesod-datatables";
   "yesod-dsl" = dontDistribute super."yesod-dsl";
   "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_7";
   "yesod-form-json" = dontDistribute super."yesod-form-json";
   "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
   "yesod-goodies" = dontDistribute super."yesod-goodies";
@@ -8041,6 +8158,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_4";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
@@ -8057,7 +8175,9 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test" = doDistribute super."yesod-test_1_5_1_0";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
   "yesod-transloadit" = dontDistribute super."yesod-transloadit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.12.nix b/pkgs/development/haskell-modules/configuration-lts-5.12.nix
index b8353d4f9b3..6b0728a07d7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.12.nix
@@ -125,6 +125,7 @@ self: super: {
   "BitSyntax" = dontDistribute super."BitSyntax";
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
+  "BlogLiterately" = doDistribute super."BlogLiterately_0_8_2";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -448,6 +449,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -481,6 +483,7 @@ self: super: {
   "HaskellForMaths" = dontDistribute super."HaskellForMaths";
   "HaskellLM" = dontDistribute super."HaskellLM";
   "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellNet-SSL" = doDistribute super."HaskellNet-SSL_0_3_2_1";
   "HaskellTorrent" = dontDistribute super."HaskellTorrent";
   "HaskellTutorials" = dontDistribute super."HaskellTutorials";
   "Haskelloids" = dontDistribute super."Haskelloids";
@@ -631,6 +634,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_2_2";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -754,6 +758,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1066,6 +1071,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1084,6 +1090,7 @@ self: super: {
   "aeson" = doDistribute super."aeson_0_9_0_1";
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-compat" = doDistribute super."aeson-compat_0_3_2_0";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-flatten" = dontDistribute super."aeson-flatten";
@@ -1240,6 +1247,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -1332,6 +1340,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async-dejafu" = doDistribute super."async-dejafu_0_1_0_0";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
   "async-pool" = dontDistribute super."async-pool";
@@ -1357,6 +1366,7 @@ self: super: {
   "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec" = doDistribute super."attoparsec_0_13_0_1";
   "attoparsec-arff" = dontDistribute super."attoparsec-arff";
   "attoparsec-binary" = dontDistribute super."attoparsec-binary";
   "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
@@ -1377,6 +1387,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "auto-update" = doDistribute super."auto-update_0_1_3";
   "autoexporter" = dontDistribute super."autoexporter";
   "automitive-cse" = dontDistribute super."automitive-cse";
   "automotive-cse" = dontDistribute super."automotive-cse";
@@ -1415,6 +1426,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_18";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1717,6 +1729,7 @@ self: super: {
   "cabal-cargs" = dontDistribute super."cabal-cargs";
   "cabal-constraints" = dontDistribute super."cabal-constraints";
   "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-debian" = doDistribute super."cabal-debian_4_32_2";
   "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
   "cabal-dev" = dontDistribute super."cabal-dev";
   "cabal-dir" = dontDistribute super."cabal-dir";
@@ -1818,6 +1831,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -1860,6 +1874,7 @@ self: super: {
   "chatty" = dontDistribute super."chatty";
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate" = doDistribute super."cheapskate_0_1_0_4";
   "cheapskate-highlight" = dontDistribute super."cheapskate-highlight";
   "cheapskate-lucid" = dontDistribute super."cheapskate-lucid";
   "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
@@ -1886,6 +1901,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -1946,6 +1962,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2022,6 +2039,7 @@ self: super: {
   "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
   "concurrent-extra" = dontDistribute super."concurrent-extra";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "concurrent-output" = doDistribute super."concurrent-output_1_7_4";
   "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
@@ -2040,6 +2058,7 @@ self: super: {
   "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
@@ -2074,6 +2093,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant-extras" = doDistribute super."contravariant-extras_0_3_1";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
   "control-monad-exception" = dontDistribute super."control-monad-exception";
@@ -2097,6 +2117,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2195,6 +2216,7 @@ self: super: {
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
   "ctpl" = dontDistribute super."ctpl";
+  "ctrie" = doDistribute super."ctrie_0_1_0_3";
   "cube" = dontDistribute super."cube";
   "cubical" = dontDistribute super."cubical";
   "cubicbezier" = dontDistribute super."cubicbezier";
@@ -2217,6 +2239,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2225,6 +2248,7 @@ self: super: {
   "danibot" = dontDistribute super."danibot";
   "dao" = dontDistribute super."dao";
   "dapi" = dontDistribute super."dapi";
+  "darcs" = doDistribute super."darcs_2_10_3";
   "darcs-benchmark" = dontDistribute super."darcs-benchmark";
   "darcs-beta" = dontDistribute super."darcs-beta";
   "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
@@ -2351,6 +2375,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2387,6 +2412,7 @@ self: super: {
   "definitive-reactive" = dontDistribute super."definitive-reactive";
   "definitive-sound" = dontDistribute super."definitive-sound";
   "deiko-config" = dontDistribute super."deiko-config";
+  "dejafu" = doDistribute super."dejafu_0_2_0_0";
   "deka" = dontDistribute super."deka";
   "deka-tests" = dontDistribute super."deka-tests";
   "delaunay" = dontDistribute super."delaunay";
@@ -2426,12 +2452,20 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
+  "diagrams-canvas" = doDistribute super."diagrams-canvas_1_3_0_3";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_6";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
+  "diagrams-lib" = doDistribute super."diagrams-lib_1_3_1_1";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
@@ -2619,6 +2653,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editpipe" = dontDistribute super."editpipe";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_7";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2646,6 +2681,7 @@ self: super: {
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
   "elision" = dontDistribute super."elision";
+  "elm-bridge" = doDistribute super."elm-bridge_0_2_1_1";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-get" = dontDistribute super."elm-get";
@@ -2775,6 +2811,7 @@ self: super: {
   "extensible" = dontDistribute super."extensible";
   "extensible-data" = dontDistribute super."extensible-data";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_3";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
   "faceted" = dontDistribute super."faceted";
@@ -2790,6 +2827,7 @@ self: super: {
   "falling-turnip" = dontDistribute super."falling-turnip";
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_3";
   "fast-digits" = dontDistribute super."fast-digits";
   "fast-logger" = doDistribute super."fast-logger_2_4_2";
   "fast-math" = dontDistribute super."fast-math";
@@ -2841,6 +2879,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9_1";
   "filediff" = dontDistribute super."filediff";
   "filepath-io-access" = dontDistribute super."filepath-io-access";
   "filepather" = dontDistribute super."filepather";
@@ -2928,6 +2967,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
   "foreign-var" = dontDistribute super."foreign-var";
@@ -2959,6 +2999,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3082,6 +3123,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_2";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3529,6 +3571,7 @@ self: super: {
   "hake" = dontDistribute super."hake";
   "hakismet" = dontDistribute super."hakismet";
   "hako" = dontDistribute super."hako";
+  "hakyll" = doDistribute super."hakyll_4_7_5_2";
   "hakyll-R" = dontDistribute super."hakyll-R";
   "hakyll-agda" = dontDistribute super."hakyll-agda";
   "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates";
@@ -3736,6 +3779,7 @@ self: super: {
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
+  "hasty-hamiltonian" = doDistribute super."hasty-hamiltonian_1_1_2";
   "hat" = dontDistribute super."hat";
   "hatex-guide" = dontDistribute super."hatex-guide";
   "hath" = dontDistribute super."hath";
@@ -3797,6 +3841,7 @@ self: super: {
   "hedis-tags" = dontDistribute super."hedis-tags";
   "hedn" = dontDistribute super."hedn";
   "hein" = dontDistribute super."hein";
+  "heist" = doDistribute super."heist_0_14_1_3";
   "heist-aeson" = dontDistribute super."heist-aeson";
   "heist-async" = dontDistribute super."heist-async";
   "helics" = dontDistribute super."helics";
@@ -3896,6 +3941,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_3";
@@ -3924,6 +3970,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_3";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4219,6 +4266,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
   "hstidy" = dontDistribute super."hstidy";
@@ -4268,6 +4316,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4296,6 +4345,7 @@ self: super: {
   "hulk" = dontDistribute super."hulk";
   "hums" = dontDistribute super."hums";
   "hunch" = dontDistribute super."hunch";
+  "hunit-dejafu" = doDistribute super."hunit-dejafu_0_2_0_0";
   "hunit-gui" = dontDistribute super."hunit-gui";
   "hunit-parsec" = dontDistribute super."hunit-parsec";
   "hunit-rematch" = dontDistribute super."hunit-rematch";
@@ -4313,6 +4363,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4439,6 +4490,7 @@ self: super: {
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
   "inserts" = dontDistribute super."inserts";
@@ -4470,6 +4522,7 @@ self: super: {
   "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -4577,6 +4630,7 @@ self: super: {
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
   "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
+  "json-autotype" = doDistribute super."json-autotype_1_0_13";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -4652,6 +4706,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keystore" = dontDistribute super."keystore";
@@ -4741,6 +4796,7 @@ self: super: {
   "language-go" = dontDistribute super."language-go";
   "language-guess" = dontDistribute super."language-guess";
   "language-java-classfile" = dontDistribute super."language-java-classfile";
+  "language-javascript" = doDistribute super."language-javascript_0_5_14_7";
   "language-kort" = dontDistribute super."language-kort";
   "language-lua" = dontDistribute super."language-lua";
   "language-lua-qq" = dontDistribute super."language-lua-qq";
@@ -4760,9 +4816,11 @@ self: super: {
   "language-thrift" = doDistribute super."language-thrift_0_7_0_1";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
   "latex" = dontDistribute super."latex";
+  "latex-formulae-hakyll" = doDistribute super."latex-formulae-hakyll_0_2_0_1";
   "launchpad-control" = dontDistribute super."launchpad-control";
   "lax" = dontDistribute super."lax";
   "layers" = dontDistribute super."layers";
@@ -4802,6 +4860,7 @@ self: super: {
   "lens-utils" = dontDistribute super."lens-utils";
   "lenses" = dontDistribute super."lenses";
   "lensref" = dontDistribute super."lensref";
+  "lentil" = doDistribute super."lentil_0_1_11_0";
   "lenz" = dontDistribute super."lenz";
   "lenz-template" = dontDistribute super."lenz-template";
   "level-monad" = dontDistribute super."level-monad";
@@ -4836,6 +4895,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5056,6 +5116,7 @@ self: super: {
   "manatee-terminal" = dontDistribute super."manatee-terminal";
   "manatee-welcome" = dontDistribute super."manatee-welcome";
   "mancala" = dontDistribute super."mancala";
+  "mandrill" = doDistribute super."mandrill_0_5_1_0";
   "mandulia" = dontDistribute super."mandulia";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
@@ -5077,6 +5138,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5157,6 +5219,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5209,6 +5272,7 @@ self: super: {
   "monad-hash" = dontDistribute super."monad-hash";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -5225,8 +5289,11 @@ self: super: {
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-supply" = dontDistribute super."monad-supply";
   "monad-task" = dontDistribute super."monad-task";
+  "monad-time" = doDistribute super."monad-time_0_1";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5318,6 +5385,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5338,6 +5406,7 @@ self: super: {
   "musicxml2" = dontDistribute super."musicxml2";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -5584,6 +5653,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -5670,6 +5740,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -5747,6 +5818,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -5754,6 +5826,7 @@ self: super: {
   "persist2er" = dontDistribute super."persist2er";
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -5765,6 +5838,7 @@ self: super: {
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-template" = doDistribute super."persistent-template_2_1_6";
   "persistent-vector" = dontDistribute super."persistent-vector";
   "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
   "persona" = dontDistribute super."persona";
@@ -5784,6 +5858,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -5922,9 +5997,11 @@ self: super: {
   "postgresql-cube" = dontDistribute super."postgresql-cube";
   "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
   "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_5_1_2";
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -5940,6 +6017,8 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
+  "pred-trie" = doDistribute super."pred-trie_0_5_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
   "prefork" = dontDistribute super."prefork";
@@ -5964,6 +6043,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6034,6 +6114,7 @@ self: super: {
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
   "psql-helpers" = dontDistribute super."psql-helpers";
+  "psqueues" = doDistribute super."psqueues_0_2_2_0";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6057,6 +6138,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6193,6 +6275,7 @@ self: super: {
   "read-env-var" = dontDistribute super."read-env-var";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -6330,6 +6413,9 @@ self: super: {
   "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
   "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "rest-happstack" = doDistribute super."rest-happstack_0_3_1";
+  "rest-snap" = doDistribute super."rest-snap_0_2";
+  "rest-wai" = doDistribute super."rest-wai_0_2";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -6572,8 +6658,12 @@ self: super: {
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
   "serv-wai" = dontDistribute super."serv-wai";
+  "servant" = doDistribute super."servant_0_4_4_7";
+  "servant-blaze" = doDistribute super."servant-blaze_0_4_4_7";
   "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-client" = doDistribute super."servant-client_0_4_4_7";
   "servant-csharp" = dontDistribute super."servant-csharp";
+  "servant-docs" = doDistribute super."servant-docs_0_4_4_7";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
   "servant-examples" = dontDistribute super."servant-examples";
@@ -6588,6 +6678,7 @@ self: super: {
   "servant-postgresql" = dontDistribute super."servant-postgresql";
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-server" = doDistribute super."servant-server_0_4_4_7";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
@@ -6643,6 +6734,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -6842,6 +6934,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -6919,6 +7012,7 @@ self: super: {
   "stash" = dontDistribute super."stash";
   "state" = dontDistribute super."state";
   "state-record" = dontDistribute super."state-record";
+  "stateWriter" = doDistribute super."stateWriter_0_2_6";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
   "statethread" = dontDistribute super."statethread";
@@ -6978,6 +7072,7 @@ self: super: {
   "stream-fusion" = dontDistribute super."stream-fusion";
   "stream-monad" = dontDistribute super."stream-monad";
   "streamed" = dontDistribute super."streamed";
+  "streaming-commons" = doDistribute super."streaming-commons_0_1_15_2";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7099,6 +7194,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7108,6 +7204,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_3";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7121,6 +7218,7 @@ self: super: {
   "tagset-positional" = dontDistribute super."tagset-positional";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7128,10 +7226,14 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_5_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
+  "tasty" = doDistribute super."tasty_0_11_0_2";
+  "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7194,6 +7296,7 @@ self: super: {
   "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -7201,6 +7304,7 @@ self: super: {
   "testrunner" = dontDistribute super."testrunner";
   "tetris" = dontDistribute super."tetris";
   "tex2txt" = dontDistribute super."tex2txt";
+  "texmath" = doDistribute super."texmath_0_8_6_1";
   "texrunner" = dontDistribute super."texrunner";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
@@ -7245,6 +7349,7 @@ self: super: {
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7367,6 +7472,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -7418,6 +7524,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle" = doDistribute super."turtle_1_2_6";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twee" = dontDistribute super."twee";
@@ -7492,6 +7599,8 @@ self: super: {
   "typescript-docs" = dontDistribute super."typescript-docs";
   "typical" = dontDistribute super."typical";
   "typography-geometry" = dontDistribute super."typography-geometry";
+  "tz" = doDistribute super."tz_0_1_0_1";
+  "tzdata" = doDistribute super."tzdata_0_1_20150810_0";
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
@@ -7650,6 +7759,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -7660,6 +7770,7 @@ self: super: {
   "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_3_1";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
@@ -7676,6 +7787,7 @@ self: super: {
   "vector-space-points" = dontDistribute super."vector-space-points";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_5";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -7721,10 +7833,12 @@ self: super: {
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-extra" = doDistribute super."wai-extra_3_0_15";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_5";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -7732,6 +7846,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_5";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
@@ -7787,6 +7902,7 @@ self: super: {
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -7941,6 +8057,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -7981,6 +8098,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_13";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
@@ -7991,6 +8109,7 @@ self: super: {
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_18";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
@@ -8002,6 +8121,7 @@ self: super: {
   "yesod-datatables" = dontDistribute super."yesod-datatables";
   "yesod-dsl" = dontDistribute super."yesod-dsl";
   "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_7";
   "yesod-form-json" = dontDistribute super."yesod-form-json";
   "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
   "yesod-goodies" = dontDistribute super."yesod-goodies";
@@ -8015,6 +8135,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_4";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
@@ -8031,7 +8152,9 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test" = doDistribute super."yesod-test_1_5_1_0";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
   "yesod-transloadit" = dontDistribute super."yesod-transloadit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.13.nix b/pkgs/development/haskell-modules/configuration-lts-5.13.nix
index 75d72e126f1..c7c616b0c09 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.13.nix
@@ -125,6 +125,7 @@ self: super: {
   "BitSyntax" = dontDistribute super."BitSyntax";
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
+  "BlogLiterately" = doDistribute super."BlogLiterately_0_8_2";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -447,6 +448,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -480,6 +482,7 @@ self: super: {
   "HaskellForMaths" = dontDistribute super."HaskellForMaths";
   "HaskellLM" = dontDistribute super."HaskellLM";
   "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellNet-SSL" = doDistribute super."HaskellNet-SSL_0_3_2_1";
   "HaskellTorrent" = dontDistribute super."HaskellTorrent";
   "HaskellTutorials" = dontDistribute super."HaskellTutorials";
   "Haskelloids" = dontDistribute super."Haskelloids";
@@ -630,6 +633,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_2_2";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -752,6 +756,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1063,6 +1068,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1081,6 +1087,7 @@ self: super: {
   "aeson" = doDistribute super."aeson_0_9_0_1";
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-compat" = doDistribute super."aeson-compat_0_3_2_0";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-flatten" = dontDistribute super."aeson-flatten";
@@ -1237,6 +1244,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -1329,6 +1337,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async-dejafu" = doDistribute super."async-dejafu_0_1_0_0";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
   "async-pool" = dontDistribute super."async-pool";
@@ -1354,6 +1363,7 @@ self: super: {
   "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec" = doDistribute super."attoparsec_0_13_0_1";
   "attoparsec-arff" = dontDistribute super."attoparsec-arff";
   "attoparsec-binary" = dontDistribute super."attoparsec-binary";
   "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
@@ -1373,6 +1383,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "auto-update" = doDistribute super."auto-update_0_1_3";
   "autoexporter" = dontDistribute super."autoexporter";
   "automitive-cse" = dontDistribute super."automitive-cse";
   "automotive-cse" = dontDistribute super."automotive-cse";
@@ -1411,6 +1422,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_18";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1710,6 +1722,7 @@ self: super: {
   "cabal-cargs" = dontDistribute super."cabal-cargs";
   "cabal-constraints" = dontDistribute super."cabal-constraints";
   "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-debian" = doDistribute super."cabal-debian_4_32_2";
   "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
   "cabal-dev" = dontDistribute super."cabal-dev";
   "cabal-dir" = dontDistribute super."cabal-dir";
@@ -1811,6 +1824,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -1853,6 +1867,7 @@ self: super: {
   "chatty" = dontDistribute super."chatty";
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate" = doDistribute super."cheapskate_0_1_0_4";
   "cheapskate-highlight" = dontDistribute super."cheapskate-highlight";
   "cheapskate-lucid" = dontDistribute super."cheapskate-lucid";
   "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
@@ -1879,6 +1894,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -1936,6 +1952,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2012,6 +2029,7 @@ self: super: {
   "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
   "concurrent-extra" = dontDistribute super."concurrent-extra";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "concurrent-output" = doDistribute super."concurrent-output_1_7_4";
   "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
@@ -2030,6 +2048,7 @@ self: super: {
   "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
@@ -2064,6 +2083,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant-extras" = doDistribute super."contravariant-extras_0_3_1";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
   "control-monad-exception" = dontDistribute super."control-monad-exception";
@@ -2087,6 +2107,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2185,6 +2206,7 @@ self: super: {
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
   "ctpl" = dontDistribute super."ctpl";
+  "ctrie" = doDistribute super."ctrie_0_1_0_3";
   "cube" = dontDistribute super."cube";
   "cubical" = dontDistribute super."cubical";
   "cubicbezier" = dontDistribute super."cubicbezier";
@@ -2207,6 +2229,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2215,6 +2238,7 @@ self: super: {
   "danibot" = dontDistribute super."danibot";
   "dao" = dontDistribute super."dao";
   "dapi" = dontDistribute super."dapi";
+  "darcs" = doDistribute super."darcs_2_10_3";
   "darcs-benchmark" = dontDistribute super."darcs-benchmark";
   "darcs-beta" = dontDistribute super."darcs-beta";
   "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
@@ -2341,6 +2365,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2377,6 +2402,7 @@ self: super: {
   "definitive-reactive" = dontDistribute super."definitive-reactive";
   "definitive-sound" = dontDistribute super."definitive-sound";
   "deiko-config" = dontDistribute super."deiko-config";
+  "dejafu" = doDistribute super."dejafu_0_2_0_0";
   "deka" = dontDistribute super."deka";
   "deka-tests" = dontDistribute super."deka-tests";
   "delaunay" = dontDistribute super."delaunay";
@@ -2416,12 +2442,20 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
+  "diagrams-canvas" = doDistribute super."diagrams-canvas_1_3_0_3";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_6";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
+  "diagrams-lib" = doDistribute super."diagrams-lib_1_3_1_1";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
@@ -2608,6 +2642,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editpipe" = dontDistribute super."editpipe";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_7";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2635,6 +2670,7 @@ self: super: {
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
   "elision" = dontDistribute super."elision";
+  "elm-bridge" = doDistribute super."elm-bridge_0_2_1_1";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-get" = dontDistribute super."elm-get";
@@ -2764,6 +2800,7 @@ self: super: {
   "extensible" = dontDistribute super."extensible";
   "extensible-data" = dontDistribute super."extensible-data";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_3";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
   "faceted" = dontDistribute super."faceted";
@@ -2779,7 +2816,9 @@ self: super: {
   "falling-turnip" = dontDistribute super."falling-turnip";
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_3";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_3";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -2829,6 +2868,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9_1";
   "filediff" = dontDistribute super."filediff";
   "filepath-io-access" = dontDistribute super."filepath-io-access";
   "filepather" = dontDistribute super."filepather";
@@ -2916,6 +2956,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
   "foreign-var" = dontDistribute super."foreign-var";
@@ -2947,6 +2988,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3070,6 +3112,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_2";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3517,6 +3560,7 @@ self: super: {
   "hake" = dontDistribute super."hake";
   "hakismet" = dontDistribute super."hakismet";
   "hako" = dontDistribute super."hako";
+  "hakyll" = doDistribute super."hakyll_4_7_5_2";
   "hakyll-R" = dontDistribute super."hakyll-R";
   "hakyll-agda" = dontDistribute super."hakyll-agda";
   "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates";
@@ -3724,6 +3768,7 @@ self: super: {
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
+  "hasty-hamiltonian" = doDistribute super."hasty-hamiltonian_1_1_2";
   "hat" = dontDistribute super."hat";
   "hatex-guide" = dontDistribute super."hatex-guide";
   "hath" = dontDistribute super."hath";
@@ -3785,6 +3830,7 @@ self: super: {
   "hedis-tags" = dontDistribute super."hedis-tags";
   "hedn" = dontDistribute super."hedn";
   "hein" = dontDistribute super."hein";
+  "heist" = doDistribute super."heist_0_14_1_3";
   "heist-aeson" = dontDistribute super."heist-aeson";
   "heist-async" = dontDistribute super."heist-async";
   "helics" = dontDistribute super."helics";
@@ -3884,6 +3930,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_3";
@@ -3912,6 +3959,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_3";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4207,6 +4255,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
   "hstidy" = dontDistribute super."hstidy";
@@ -4252,6 +4301,7 @@ self: super: {
   "http-client-streams" = dontDistribute super."http-client-streams";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4280,6 +4330,7 @@ self: super: {
   "hulk" = dontDistribute super."hulk";
   "hums" = dontDistribute super."hums";
   "hunch" = dontDistribute super."hunch";
+  "hunit-dejafu" = doDistribute super."hunit-dejafu_0_2_0_0";
   "hunit-gui" = dontDistribute super."hunit-gui";
   "hunit-parsec" = dontDistribute super."hunit-parsec";
   "hunit-rematch" = dontDistribute super."hunit-rematch";
@@ -4297,6 +4348,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4423,6 +4475,7 @@ self: super: {
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
   "inserts" = dontDistribute super."inserts";
@@ -4454,6 +4507,7 @@ self: super: {
   "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-machine" = dontDistribute super."io-machine";
@@ -4559,6 +4613,7 @@ self: super: {
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
   "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
+  "json-autotype" = doDistribute super."json-autotype_1_0_13";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -4634,6 +4689,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keystore" = dontDistribute super."keystore";
@@ -4723,6 +4779,7 @@ self: super: {
   "language-go" = dontDistribute super."language-go";
   "language-guess" = dontDistribute super."language-guess";
   "language-java-classfile" = dontDistribute super."language-java-classfile";
+  "language-javascript" = doDistribute super."language-javascript_0_5_14_7";
   "language-kort" = dontDistribute super."language-kort";
   "language-lua" = dontDistribute super."language-lua";
   "language-lua-qq" = dontDistribute super."language-lua-qq";
@@ -4742,9 +4799,11 @@ self: super: {
   "language-thrift" = doDistribute super."language-thrift_0_7_0_1";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
   "latex" = dontDistribute super."latex";
+  "latex-formulae-hakyll" = doDistribute super."latex-formulae-hakyll_0_2_0_1";
   "launchpad-control" = dontDistribute super."launchpad-control";
   "lax" = dontDistribute super."lax";
   "layers" = dontDistribute super."layers";
@@ -4784,6 +4843,7 @@ self: super: {
   "lens-utils" = dontDistribute super."lens-utils";
   "lenses" = dontDistribute super."lenses";
   "lensref" = dontDistribute super."lensref";
+  "lentil" = doDistribute super."lentil_0_1_11_0";
   "lenz" = dontDistribute super."lenz";
   "lenz-template" = dontDistribute super."lenz-template";
   "level-monad" = dontDistribute super."level-monad";
@@ -4818,6 +4878,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5037,6 +5098,7 @@ self: super: {
   "manatee-terminal" = dontDistribute super."manatee-terminal";
   "manatee-welcome" = dontDistribute super."manatee-welcome";
   "mancala" = dontDistribute super."mancala";
+  "mandrill" = doDistribute super."mandrill_0_5_1_0";
   "mandulia" = dontDistribute super."mandulia";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
@@ -5058,6 +5120,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5138,6 +5201,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5190,6 +5254,7 @@ self: super: {
   "monad-hash" = dontDistribute super."monad-hash";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -5206,8 +5271,11 @@ self: super: {
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-supply" = dontDistribute super."monad-supply";
   "monad-task" = dontDistribute super."monad-task";
+  "monad-time" = doDistribute super."monad-time_0_1";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5233,6 +5301,7 @@ self: super: {
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
+  "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_4";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
   "monomorphic" = dontDistribute super."monomorphic";
@@ -5297,6 +5366,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5317,6 +5387,7 @@ self: super: {
   "musicxml2" = dontDistribute super."musicxml2";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -5563,6 +5634,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -5648,6 +5720,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -5725,6 +5798,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -5732,6 +5806,7 @@ self: super: {
   "persist2er" = dontDistribute super."persist2er";
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -5743,6 +5818,7 @@ self: super: {
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-template" = doDistribute super."persistent-template_2_1_6";
   "persistent-vector" = dontDistribute super."persistent-vector";
   "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
   "persona" = dontDistribute super."persona";
@@ -5762,6 +5838,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -5897,9 +5974,11 @@ self: super: {
   "postgresql-cube" = dontDistribute super."postgresql-cube";
   "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
   "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_5_1_2";
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -5915,6 +5994,8 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
+  "pred-trie" = doDistribute super."pred-trie_0_5_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
   "prefork" = dontDistribute super."prefork";
@@ -5939,6 +6020,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6009,6 +6091,7 @@ self: super: {
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
   "psql-helpers" = dontDistribute super."psql-helpers";
+  "psqueues" = doDistribute super."psqueues_0_2_2_0";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6032,6 +6115,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6168,6 +6252,7 @@ self: super: {
   "read-env-var" = dontDistribute super."read-env-var";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -6305,6 +6390,9 @@ self: super: {
   "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
   "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "rest-happstack" = doDistribute super."rest-happstack_0_3_1";
+  "rest-snap" = doDistribute super."rest-snap_0_2";
+  "rest-wai" = doDistribute super."rest-wai_0_2";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -6547,8 +6635,12 @@ self: super: {
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
   "serv-wai" = dontDistribute super."serv-wai";
+  "servant" = doDistribute super."servant_0_4_4_7";
+  "servant-blaze" = doDistribute super."servant-blaze_0_4_4_7";
   "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-client" = doDistribute super."servant-client_0_4_4_7";
   "servant-csharp" = dontDistribute super."servant-csharp";
+  "servant-docs" = doDistribute super."servant-docs_0_4_4_7";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
   "servant-examples" = dontDistribute super."servant-examples";
@@ -6563,6 +6655,7 @@ self: super: {
   "servant-postgresql" = dontDistribute super."servant-postgresql";
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-server" = doDistribute super."servant-server_0_4_4_7";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
@@ -6597,6 +6690,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_8_1";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -6617,6 +6711,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -6816,6 +6911,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -6892,6 +6988,7 @@ self: super: {
   "stash" = dontDistribute super."stash";
   "state" = dontDistribute super."state";
   "state-record" = dontDistribute super."state-record";
+  "stateWriter" = doDistribute super."stateWriter_0_2_6";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
   "statethread" = dontDistribute super."statethread";
@@ -6951,6 +7048,7 @@ self: super: {
   "stream-fusion" = dontDistribute super."stream-fusion";
   "stream-monad" = dontDistribute super."stream-monad";
   "streamed" = dontDistribute super."streamed";
+  "streaming-commons" = doDistribute super."streaming-commons_0_1_15_2";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7072,6 +7170,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7081,6 +7180,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_3";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7094,6 +7194,7 @@ self: super: {
   "tagset-positional" = dontDistribute super."tagset-positional";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7101,10 +7202,14 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_5_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
+  "tasty" = doDistribute super."tasty_0_11_0_2";
+  "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7167,6 +7272,7 @@ self: super: {
   "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -7174,6 +7280,7 @@ self: super: {
   "testrunner" = dontDistribute super."testrunner";
   "tetris" = dontDistribute super."tetris";
   "tex2txt" = dontDistribute super."tex2txt";
+  "texmath" = doDistribute super."texmath_0_8_6_1";
   "texrunner" = dontDistribute super."texrunner";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
@@ -7218,6 +7325,7 @@ self: super: {
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7340,6 +7448,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -7391,6 +7500,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle" = doDistribute super."turtle_1_2_6";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twee" = dontDistribute super."twee";
@@ -7465,6 +7575,8 @@ self: super: {
   "typescript-docs" = dontDistribute super."typescript-docs";
   "typical" = dontDistribute super."typical";
   "typography-geometry" = dontDistribute super."typography-geometry";
+  "tz" = doDistribute super."tz_0_1_0_1";
+  "tzdata" = doDistribute super."tzdata_0_1_20150810_0";
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
@@ -7622,6 +7734,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -7632,6 +7745,7 @@ self: super: {
   "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_3_1";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
@@ -7647,6 +7761,7 @@ self: super: {
   "vector-space-points" = dontDistribute super."vector-space-points";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_5";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -7691,10 +7806,12 @@ self: super: {
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-extra" = doDistribute super."wai-extra_3_0_15";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_5";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -7702,6 +7819,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_5";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
@@ -7757,6 +7875,7 @@ self: super: {
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -7911,6 +8030,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -7948,6 +8068,8 @@ self: super: {
   "yeshql" = dontDistribute super."yeshql";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth" = doDistribute super."yesod-auth_1_4_13_1";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
@@ -7958,16 +8080,19 @@ self: super: {
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_18";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
   "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-core" = doDistribute super."yesod-core_1_4_20_1";
   "yesod-crud" = dontDistribute super."yesod-crud";
   "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
   "yesod-csp" = dontDistribute super."yesod-csp";
   "yesod-datatables" = dontDistribute super."yesod-datatables";
   "yesod-dsl" = dontDistribute super."yesod-dsl";
   "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_7";
   "yesod-form-json" = dontDistribute super."yesod-form-json";
   "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
   "yesod-goodies" = dontDistribute super."yesod-goodies";
@@ -7981,6 +8106,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_4";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
@@ -7997,7 +8123,9 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test" = doDistribute super."yesod-test_1_5_1_0";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
   "yesod-transloadit" = dontDistribute super."yesod-transloadit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.14.nix b/pkgs/development/haskell-modules/configuration-lts-5.14.nix
new file mode 100644
index 00000000000..e05ecd581b3
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-lts-5.14.nix
@@ -0,0 +1,8149 @@
+{ pkgs }:
+
+with import ./lib.nix { inherit pkgs; };
+
+self: super: {
+
+  # core libraries provided by the compiler
+  Cabal = null;
+  array = null;
+  base = null;
+  bin-package-db = null;
+  binary = null;
+  bytestring = null;
+  containers = null;
+  deepseq = null;
+  directory = null;
+  filepath = null;
+  ghc-prim = null;
+  hoopl = null;
+  hpc = null;
+  integer-gmp = null;
+  pretty = null;
+  process = null;
+  rts = null;
+  template-haskell = null;
+  time = null;
+  transformers = null;
+  unix = null;
+
+  # lts-5.14 packages
+  "3d-graphics-examples" = dontDistribute super."3d-graphics-examples";
+  "3dmodels" = dontDistribute super."3dmodels";
+  "4Blocks" = dontDistribute super."4Blocks";
+  "AAI" = dontDistribute super."AAI";
+  "ABList" = dontDistribute super."ABList";
+  "AC-Angle" = dontDistribute super."AC-Angle";
+  "AC-Boolean" = dontDistribute super."AC-Boolean";
+  "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform";
+  "AC-Colour" = dontDistribute super."AC-Colour";
+  "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK";
+  "AC-HalfInteger" = dontDistribute super."AC-HalfInteger";
+  "AC-MiniTest" = dontDistribute super."AC-MiniTest";
+  "AC-PPM" = dontDistribute super."AC-PPM";
+  "AC-Random" = dontDistribute super."AC-Random";
+  "AC-Terminal" = dontDistribute super."AC-Terminal";
+  "AC-VanillaArray" = dontDistribute super."AC-VanillaArray";
+  "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy";
+  "ACME" = dontDistribute super."ACME";
+  "ADPfusion" = dontDistribute super."ADPfusion";
+  "AERN-Basics" = dontDistribute super."AERN-Basics";
+  "AERN-Net" = dontDistribute super."AERN-Net";
+  "AERN-Real" = dontDistribute super."AERN-Real";
+  "AERN-Real-Double" = dontDistribute super."AERN-Real-Double";
+  "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval";
+  "AERN-RnToRm" = dontDistribute super."AERN-RnToRm";
+  "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot";
+  "AES" = dontDistribute super."AES";
+  "AFSM" = dontDistribute super."AFSM";
+  "AGI" = dontDistribute super."AGI";
+  "ALUT" = dontDistribute super."ALUT";
+  "AMI" = dontDistribute super."AMI";
+  "ANum" = dontDistribute super."ANum";
+  "ASN1" = dontDistribute super."ASN1";
+  "AVar" = dontDistribute super."AVar";
+  "AWin32Console" = dontDistribute super."AWin32Console";
+  "AbortT-monadstf" = dontDistribute super."AbortT-monadstf";
+  "AbortT-mtl" = dontDistribute super."AbortT-mtl";
+  "AbortT-transformers" = dontDistribute super."AbortT-transformers";
+  "ActionKid" = dontDistribute super."ActionKid";
+  "Adaptive" = dontDistribute super."Adaptive";
+  "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade";
+  "Advgame" = dontDistribute super."Advgame";
+  "AesonBson" = dontDistribute super."AesonBson";
+  "Agata" = dontDistribute super."Agata";
+  "Agda" = doDistribute super."Agda_2_4_2_5";
+  "Agda-executable" = dontDistribute super."Agda-executable";
+  "AhoCorasick" = dontDistribute super."AhoCorasick";
+  "AlgorithmW" = dontDistribute super."AlgorithmW";
+  "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms";
+  "Allure" = dontDistribute super."Allure";
+  "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter";
+  "Animas" = dontDistribute super."Animas";
+  "Annotations" = dontDistribute super."Annotations";
+  "Ansi2Html" = dontDistribute super."Ansi2Html";
+  "ApplePush" = dontDistribute super."ApplePush";
+  "AppleScript" = dontDistribute super."AppleScript";
+  "ApproxFun-hs" = dontDistribute super."ApproxFun-hs";
+  "ArrayRef" = dontDistribute super."ArrayRef";
+  "ArrowVHDL" = dontDistribute super."ArrowVHDL";
+  "AspectAG" = dontDistribute super."AspectAG";
+  "AttoBencode" = dontDistribute super."AttoBencode";
+  "AttoJson" = dontDistribute super."AttoJson";
+  "Attrac" = dontDistribute super."Attrac";
+  "Aurochs" = dontDistribute super."Aurochs";
+  "AutoForms" = dontDistribute super."AutoForms";
+  "AvlTree" = dontDistribute super."AvlTree";
+  "BASIC" = dontDistribute super."BASIC";
+  "BCMtools" = dontDistribute super."BCMtools";
+  "BNFC" = dontDistribute super."BNFC";
+  "BNFC-meta" = dontDistribute super."BNFC-meta";
+  "Baggins" = dontDistribute super."Baggins";
+  "Bang" = dontDistribute super."Bang";
+  "Barracuda" = dontDistribute super."Barracuda";
+  "Befunge93" = dontDistribute super."Befunge93";
+  "BenchmarkHistory" = dontDistribute super."BenchmarkHistory";
+  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
+  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
+  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BigPixel" = dontDistribute super."BigPixel";
+  "Binpack" = dontDistribute super."Binpack";
+  "Biobase" = dontDistribute super."Biobase";
+  "BiobaseBlast" = dontDistribute super."BiobaseBlast";
+  "BiobaseDotP" = dontDistribute super."BiobaseDotP";
+  "BiobaseFR3D" = dontDistribute super."BiobaseFR3D";
+  "BiobaseFasta" = dontDistribute super."BiobaseFasta";
+  "BiobaseInfernal" = dontDistribute super."BiobaseInfernal";
+  "BiobaseMAF" = dontDistribute super."BiobaseMAF";
+  "BiobaseNewick" = dontDistribute super."BiobaseNewick";
+  "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData";
+  "BiobaseTurner" = dontDistribute super."BiobaseTurner";
+  "BiobaseTypes" = dontDistribute super."BiobaseTypes";
+  "BiobaseVienna" = dontDistribute super."BiobaseVienna";
+  "BiobaseXNA" = dontDistribute super."BiobaseXNA";
+  "BirdPP" = dontDistribute super."BirdPP";
+  "BitSyntax" = dontDistribute super."BitSyntax";
+  "Bitly" = dontDistribute super."Bitly";
+  "Blobs" = dontDistribute super."Blobs";
+  "BluePrintCSS" = dontDistribute super."BluePrintCSS";
+  "Blueprint" = dontDistribute super."Blueprint";
+  "Bookshelf" = dontDistribute super."Bookshelf";
+  "Bravo" = dontDistribute super."Bravo";
+  "BufferedSocket" = dontDistribute super."BufferedSocket";
+  "Buster" = dontDistribute super."Buster";
+  "CBOR" = dontDistribute super."CBOR";
+  "CC-delcont" = dontDistribute super."CC-delcont";
+  "CC-delcont-alt" = dontDistribute super."CC-delcont-alt";
+  "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe";
+  "CC-delcont-exc" = dontDistribute super."CC-delcont-exc";
+  "CC-delcont-ref" = dontDistribute super."CC-delcont-ref";
+  "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf";
+  "CCA" = dontDistribute super."CCA";
+  "CHXHtml" = dontDistribute super."CHXHtml";
+  "CLASE" = dontDistribute super."CLASE";
+  "CLI" = dontDistribute super."CLI";
+  "CMCompare" = dontDistribute super."CMCompare";
+  "CMQ" = dontDistribute super."CMQ";
+  "COrdering" = dontDistribute super."COrdering";
+  "CPBrainfuck" = dontDistribute super."CPBrainfuck";
+  "CPL" = dontDistribute super."CPL";
+  "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage";
+  "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules";
+  "CSPM-Frontend" = dontDistribute super."CSPM-Frontend";
+  "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter";
+  "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog";
+  "CSPM-cspm" = dontDistribute super."CSPM-cspm";
+  "CTRex" = dontDistribute super."CTRex";
+  "CV" = dontDistribute super."CV";
+  "CabalSearch" = dontDistribute super."CabalSearch";
+  "Capabilities" = dontDistribute super."Capabilities";
+  "Cardinality" = dontDistribute super."Cardinality";
+  "CarneadesDSL" = dontDistribute super."CarneadesDSL";
+  "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung";
+  "Cartesian" = dontDistribute super."Cartesian";
+  "Cascade" = dontDistribute super."Cascade";
+  "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
+  "Chart" = doDistribute super."Chart_1_5_4";
+  "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4";
+  "Chart-diagrams" = dontDistribute super."Chart-diagrams";
+  "Chart-gtk" = dontDistribute super."Chart-gtk";
+  "Chart-simple" = dontDistribute super."Chart-simple";
+  "CheatSheet" = dontDistribute super."CheatSheet";
+  "Checked" = dontDistribute super."Checked";
+  "Chitra" = dontDistribute super."Chitra";
+  "ChristmasTree" = dontDistribute super."ChristmasTree";
+  "CirruParser" = dontDistribute super."CirruParser";
+  "ClassLaws" = dontDistribute super."ClassLaws";
+  "ClassyPrelude" = dontDistribute super."ClassyPrelude";
+  "Clean" = dontDistribute super."Clean";
+  "Clipboard" = dontDistribute super."Clipboard";
+  "Coadjute" = dontDistribute super."Coadjute";
+  "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF";
+  "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL";
+  "Combinatorrent" = dontDistribute super."Combinatorrent";
+  "Command" = dontDistribute super."Command";
+  "Commando" = dontDistribute super."Commando";
+  "ComonadSheet" = dontDistribute super."ComonadSheet";
+  "ConcurrentUtils" = dontDistribute super."ConcurrentUtils";
+  "Concurrential" = dontDistribute super."Concurrential";
+  "Condor" = dontDistribute super."Condor";
+  "ConfigFileTH" = dontDistribute super."ConfigFileTH";
+  "Configger" = dontDistribute super."Configger";
+  "Configurable" = dontDistribute super."Configurable";
+  "ConsStream" = dontDistribute super."ConsStream";
+  "Conscript" = dontDistribute super."Conscript";
+  "ConstraintKinds" = dontDistribute super."ConstraintKinds";
+  "Consumer" = dontDistribute super."Consumer";
+  "ContArrow" = dontDistribute super."ContArrow";
+  "ContextAlgebra" = dontDistribute super."ContextAlgebra";
+  "Contract" = dontDistribute super."Contract";
+  "Control-Engine" = dontDistribute super."Control-Engine";
+  "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass";
+  "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2";
+  "CoreDump" = dontDistribute super."CoreDump";
+  "CoreErlang" = dontDistribute super."CoreErlang";
+  "CoreFoundation" = dontDistribute super."CoreFoundation";
+  "Coroutine" = dontDistribute super."Coroutine";
+  "CouchDB" = dontDistribute super."CouchDB";
+  "Craft3e" = dontDistribute super."Craft3e";
+  "Crypto" = dontDistribute super."Crypto";
+  "CurryDB" = dontDistribute super."CurryDB";
+  "DAG-Tournament" = dontDistribute super."DAG-Tournament";
+  "DBlimited" = dontDistribute super."DBlimited";
+  "DBus" = dontDistribute super."DBus";
+  "DCFL" = dontDistribute super."DCFL";
+  "DMuCheck" = dontDistribute super."DMuCheck";
+  "DOM" = dontDistribute super."DOM";
+  "DP" = dontDistribute super."DP";
+  "DPM" = dontDistribute super."DPM";
+  "DSA" = dontDistribute super."DSA";
+  "DSH" = dontDistribute super."DSH";
+  "DSTM" = dontDistribute super."DSTM";
+  "DTC" = dontDistribute super."DTC";
+  "Dangerous" = dontDistribute super."Dangerous";
+  "Dao" = dontDistribute super."Dao";
+  "DarcsHelpers" = dontDistribute super."DarcsHelpers";
+  "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent";
+  "Data-Rope" = dontDistribute super."Data-Rope";
+  "DataTreeView" = dontDistribute super."DataTreeView";
+  "Deadpan-DDP" = dontDistribute super."Deadpan-DDP";
+  "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers";
+  "DecisionTree" = dontDistribute super."DecisionTree";
+  "DeepArrow" = dontDistribute super."DeepArrow";
+  "DefendTheKing" = dontDistribute super."DefendTheKing";
+  "DescriptiveKeys" = dontDistribute super."DescriptiveKeys";
+  "Dflow" = dontDistribute super."Dflow";
+  "DifferenceLogic" = dontDistribute super."DifferenceLogic";
+  "DifferentialEvolution" = dontDistribute super."DifferentialEvolution";
+  "Digit" = dontDistribute super."Digit";
+  "DigitalOcean" = dontDistribute super."DigitalOcean";
+  "DimensionalHash" = dontDistribute super."DimensionalHash";
+  "DirectSound" = dontDistribute super."DirectSound";
+  "DisTract" = dontDistribute super."DisTract";
+  "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem";
+  "Dish" = dontDistribute super."Dish";
+  "Dist" = dontDistribute super."Dist";
+  "DistanceTransform" = dontDistribute super."DistanceTransform";
+  "DistanceUnits" = dontDistribute super."DistanceUnits";
+  "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment";
+  "DocTest" = dontDistribute super."DocTest";
+  "Docs" = dontDistribute super."Docs";
+  "DrHylo" = dontDistribute super."DrHylo";
+  "DrIFT" = dontDistribute super."DrIFT";
+  "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized";
+  "Dung" = dontDistribute super."Dung";
+  "Dust" = dontDistribute super."Dust";
+  "Dust-crypto" = dontDistribute super."Dust-crypto";
+  "Dust-tools" = dontDistribute super."Dust-tools";
+  "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap";
+  "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp";
+  "DysFRP" = dontDistribute super."DysFRP";
+  "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
+  "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
+  "EEConfig" = dontDistribute super."EEConfig";
+  "Earley" = doDistribute super."Earley_0_10_1_0";
+  "EdisonAPI" = dontDistribute super."EdisonAPI";
+  "EdisonCore" = dontDistribute super."EdisonCore";
+  "EditTimeReport" = dontDistribute super."EditTimeReport";
+  "EitherT" = dontDistribute super."EitherT";
+  "Elm" = dontDistribute super."Elm";
+  "Emping" = dontDistribute super."Emping";
+  "Encode" = dontDistribute super."Encode";
+  "EnumContainers" = dontDistribute super."EnumContainers";
+  "EnumMap" = dontDistribute super."EnumMap";
+  "Eq" = dontDistribute super."Eq";
+  "EqualitySolver" = dontDistribute super."EqualitySolver";
+  "EsounD" = dontDistribute super."EsounD";
+  "EstProgress" = dontDistribute super."EstProgress";
+  "EtaMOO" = dontDistribute super."EtaMOO";
+  "Etage" = dontDistribute super."Etage";
+  "Etage-Graph" = dontDistribute super."Etage-Graph";
+  "Eternal10Seconds" = dontDistribute super."Eternal10Seconds";
+  "Etherbunny" = dontDistribute super."Etherbunny";
+  "EuroIT" = dontDistribute super."EuroIT";
+  "Euterpea" = dontDistribute super."Euterpea";
+  "EventSocket" = dontDistribute super."EventSocket";
+  "Extra" = dontDistribute super."Extra";
+  "FComp" = dontDistribute super."FComp";
+  "FM-SBLEX" = dontDistribute super."FM-SBLEX";
+  "FModExRaw" = dontDistribute super."FModExRaw";
+  "FPretty" = dontDistribute super."FPretty";
+  "FTGL" = dontDistribute super."FTGL";
+  "FTGL-bytestring" = dontDistribute super."FTGL-bytestring";
+  "FTPLine" = dontDistribute super."FTPLine";
+  "Facts" = dontDistribute super."Facts";
+  "FailureT" = dontDistribute super."FailureT";
+  "FastxPipe" = dontDistribute super."FastxPipe";
+  "FermatsLastMargin" = dontDistribute super."FermatsLastMargin";
+  "FerryCore" = dontDistribute super."FerryCore";
+  "Feval" = dontDistribute super."Feval";
+  "FieldTrip" = dontDistribute super."FieldTrip";
+  "FileManip" = dontDistribute super."FileManip";
+  "FileManipCompat" = dontDistribute super."FileManipCompat";
+  "FilePather" = dontDistribute super."FilePather";
+  "FileSystem" = dontDistribute super."FileSystem";
+  "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo";
+  "Finance-Treasury" = dontDistribute super."Finance-Treasury";
+  "FiniteMap" = dontDistribute super."FiniteMap";
+  "FirstOrderTheory" = dontDistribute super."FirstOrderTheory";
+  "FixedPoint-simple" = dontDistribute super."FixedPoint-simple";
+  "Flippi" = dontDistribute super."Flippi";
+  "Focus" = dontDistribute super."Focus";
+  "Folly" = dontDistribute super."Folly";
+  "ForSyDe" = dontDistribute super."ForSyDe";
+  "ForestStructures" = dontDistribute super."ForestStructures";
+  "ForkableT" = dontDistribute super."ForkableT";
+  "FormalGrammars" = dontDistribute super."FormalGrammars";
+  "Foster" = dontDistribute super."Foster";
+  "FpMLv53" = dontDistribute super."FpMLv53";
+  "FractalArt" = dontDistribute super."FractalArt";
+  "Fractaler" = dontDistribute super."Fractaler";
+  "Frank" = dontDistribute super."Frank";
+  "FreeTypeGL" = dontDistribute super."FreeTypeGL";
+  "FunGEn" = dontDistribute super."FunGEn";
+  "Fungi" = dontDistribute super."Fungi";
+  "GA" = dontDistribute super."GA";
+  "GGg" = dontDistribute super."GGg";
+  "GHood" = dontDistribute super."GHood";
+  "GLFW" = dontDistribute super."GLFW";
+  "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
+  "GLFW-task" = dontDistribute super."GLFW-task";
+  "GLHUI" = dontDistribute super."GLHUI";
+  "GLM" = dontDistribute super."GLM";
+  "GLMatrix" = dontDistribute super."GLMatrix";
+  "GLUtil" = dontDistribute super."GLUtil";
+  "GPX" = dontDistribute super."GPX";
+  "GPipe-Collada" = dontDistribute super."GPipe-Collada";
+  "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
+  "GTALib" = dontDistribute super."GTALib";
+  "Gamgine" = dontDistribute super."Gamgine";
+  "Ganymede" = dontDistribute super."Ganymede";
+  "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration";
+  "GeBoP" = dontDistribute super."GeBoP";
+  "GenI" = dontDistribute super."GenI";
+  "GenSmsPdu" = dontDistribute super."GenSmsPdu";
+  "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe";
+  "GenussFold" = dontDistribute super."GenussFold";
+  "GeoIp" = dontDistribute super."GeoIp";
+  "GeocoderOpenCage" = dontDistribute super."GeocoderOpenCage";
+  "Geodetic" = dontDistribute super."Geodetic";
+  "GeomPredicates" = dontDistribute super."GeomPredicates";
+  "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE";
+  "GiST" = dontDistribute super."GiST";
+  "Gifcurry" = dontDistribute super."Gifcurry";
+  "GiveYouAHead" = dontDistribute super."GiveYouAHead";
+  "GlomeTrace" = dontDistribute super."GlomeTrace";
+  "GlomeVec" = dontDistribute super."GlomeVec";
+  "GlomeView" = dontDistribute super."GlomeView";
+  "GoogleChart" = dontDistribute super."GoogleChart";
+  "GoogleDirections" = dontDistribute super."GoogleDirections";
+  "GoogleSB" = dontDistribute super."GoogleSB";
+  "GoogleSuggest" = dontDistribute super."GoogleSuggest";
+  "GoogleTranslate" = dontDistribute super."GoogleTranslate";
+  "GotoT-transformers" = dontDistribute super."GotoT-transformers";
+  "GrammarProducts" = dontDistribute super."GrammarProducts";
+  "Graph500" = dontDistribute super."Graph500";
+  "GraphHammer" = dontDistribute super."GraphHammer";
+  "GraphHammer-examples" = dontDistribute super."GraphHammer-examples";
+  "Graphalyze" = dontDistribute super."Graphalyze";
+  "Grempa" = dontDistribute super."Grempa";
+  "GroteTrap" = dontDistribute super."GroteTrap";
+  "Grow" = dontDistribute super."Grow";
+  "GrowlNotify" = dontDistribute super."GrowlNotify";
+  "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics";
+  "GtkGLTV" = dontDistribute super."GtkGLTV";
+  "GtkTV" = dontDistribute super."GtkTV";
+  "GuiHaskell" = dontDistribute super."GuiHaskell";
+  "GuiTV" = dontDistribute super."GuiTV";
+  "HARM" = dontDistribute super."HARM";
+  "HAppS-Data" = dontDistribute super."HAppS-Data";
+  "HAppS-IxSet" = dontDistribute super."HAppS-IxSet";
+  "HAppS-Server" = dontDistribute super."HAppS-Server";
+  "HAppS-State" = dontDistribute super."HAppS-State";
+  "HAppS-Util" = dontDistribute super."HAppS-Util";
+  "HAppSHelpers" = dontDistribute super."HAppSHelpers";
+  "HCL" = dontDistribute super."HCL";
+  "HCard" = dontDistribute super."HCard";
+  "HDBC-mysql" = dontDistribute super."HDBC-mysql";
+  "HDBC-odbc" = dontDistribute super."HDBC-odbc";
+  "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore";
+  "HDBC-session" = dontDistribute super."HDBC-session";
+  "HDRUtils" = dontDistribute super."HDRUtils";
+  "HERA" = dontDistribute super."HERA";
+  "HFrequencyQueue" = dontDistribute super."HFrequencyQueue";
+  "HFuse" = dontDistribute super."HFuse";
+  "HGL" = dontDistribute super."HGL";
+  "HGamer3D" = dontDistribute super."HGamer3D";
+  "HGamer3D-API" = dontDistribute super."HGamer3D-API";
+  "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio";
+  "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding";
+  "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding";
+  "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding";
+  "HGamer3D-Common" = dontDistribute super."HGamer3D-Common";
+  "HGamer3D-Data" = dontDistribute super."HGamer3D-Data";
+  "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding";
+  "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI";
+  "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D";
+  "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem";
+  "HGamer3D-Network" = dontDistribute super."HGamer3D-Network";
+  "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding";
+  "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding";
+  "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding";
+  "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding";
+  "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent";
+  "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire";
+  "HGraphStorage" = dontDistribute super."HGraphStorage";
+  "HHDL" = dontDistribute super."HHDL";
+  "HJScript" = dontDistribute super."HJScript";
+  "HJVM" = dontDistribute super."HJVM";
+  "HJavaScript" = dontDistribute super."HJavaScript";
+  "HLearn-algebra" = dontDistribute super."HLearn-algebra";
+  "HLearn-approximation" = dontDistribute super."HLearn-approximation";
+  "HLearn-classification" = dontDistribute super."HLearn-classification";
+  "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
+  "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HListPP" = dontDistribute super."HListPP";
+  "HLogger" = dontDistribute super."HLogger";
+  "HMM" = dontDistribute super."HMM";
+  "HMap" = dontDistribute super."HMap";
+  "HNM" = dontDistribute super."HNM";
+  "HODE" = dontDistribute super."HODE";
+  "HOpenCV" = dontDistribute super."HOpenCV";
+  "HPath" = dontDistribute super."HPath";
+  "HPi" = dontDistribute super."HPi";
+  "HPlot" = dontDistribute super."HPlot";
+  "HPong" = dontDistribute super."HPong";
+  "HROOT" = dontDistribute super."HROOT";
+  "HROOT-core" = dontDistribute super."HROOT-core";
+  "HROOT-graf" = dontDistribute super."HROOT-graf";
+  "HROOT-hist" = dontDistribute super."HROOT-hist";
+  "HROOT-io" = dontDistribute super."HROOT-io";
+  "HROOT-math" = dontDistribute super."HROOT-math";
+  "HRay" = dontDistribute super."HRay";
+  "HSFFIG" = dontDistribute super."HSFFIG";
+  "HSGEP" = dontDistribute super."HSGEP";
+  "HSH" = dontDistribute super."HSH";
+  "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
+  "HSlippyMap" = dontDistribute super."HSlippyMap";
+  "HSmarty" = dontDistribute super."HSmarty";
+  "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
+  "HSvm" = dontDistribute super."HSvm";
+  "HTTP-Simple" = dontDistribute super."HTTP-Simple";
+  "HTab" = dontDistribute super."HTab";
+  "HTicTacToe" = dontDistribute super."HTicTacToe";
+  "HUnit-Diff" = dontDistribute super."HUnit-Diff";
+  "HUnit-Plus" = dontDistribute super."HUnit-Plus";
+  "HUnit-approx" = dontDistribute super."HUnit-approx";
+  "HXMPP" = dontDistribute super."HXMPP";
+  "HXQ" = dontDistribute super."HXQ";
+  "HaLeX" = dontDistribute super."HaLeX";
+  "HaMinitel" = dontDistribute super."HaMinitel";
+  "HaPy" = dontDistribute super."HaPy";
+  "HaTeX-meta" = dontDistribute super."HaTeX-meta";
+  "HaTeX-qq" = dontDistribute super."HaTeX-qq";
+  "HaVSA" = dontDistribute super."HaVSA";
+  "Hach" = dontDistribute super."Hach";
+  "HackMail" = dontDistribute super."HackMail";
+  "Haggressive" = dontDistribute super."Haggressive";
+  "HandlerSocketClient" = dontDistribute super."HandlerSocketClient";
+  "Hangman" = dontDistribute super."Hangman";
+  "HarmTrace" = dontDistribute super."HarmTrace";
+  "HarmTrace-Base" = dontDistribute super."HarmTrace-Base";
+  "HasGP" = dontDistribute super."HasGP";
+  "Haschoo" = dontDistribute super."Haschoo";
+  "Hashell" = dontDistribute super."Hashell";
+  "HaskRel" = dontDistribute super."HaskRel";
+  "HaskellForMaths" = dontDistribute super."HaskellForMaths";
+  "HaskellLM" = dontDistribute super."HaskellLM";
+  "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellTorrent" = dontDistribute super."HaskellTorrent";
+  "HaskellTutorials" = dontDistribute super."HaskellTutorials";
+  "Haskelloids" = dontDistribute super."Haskelloids";
+  "Hate" = dontDistribute super."Hate";
+  "Hawk" = dontDistribute super."Hawk";
+  "Hayoo" = dontDistribute super."Hayoo";
+  "Hclip" = dontDistribute super."Hclip";
+  "Hedi" = dontDistribute super."Hedi";
+  "HerbiePlugin" = dontDistribute super."HerbiePlugin";
+  "Hermes" = dontDistribute super."Hermes";
+  "Hieroglyph" = dontDistribute super."Hieroglyph";
+  "HiggsSet" = dontDistribute super."HiggsSet";
+  "Hipmunk" = dontDistribute super."Hipmunk";
+  "HipmunkPlayground" = dontDistribute super."HipmunkPlayground";
+  "Hish" = dontDistribute super."Hish";
+  "Histogram" = dontDistribute super."Histogram";
+  "Hmpf" = dontDistribute super."Hmpf";
+  "Hoed" = dontDistribute super."Hoed";
+  "HoleyMonoid" = dontDistribute super."HoleyMonoid";
+  "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution";
+  "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce";
+  "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine";
+  "Holumbus-Storage" = dontDistribute super."Holumbus-Storage";
+  "Homology" = dontDistribute super."Homology";
+  "HongoDB" = dontDistribute super."HongoDB";
+  "HostAndPort" = dontDistribute super."HostAndPort";
+  "Hricket" = dontDistribute super."Hricket";
+  "Hs2lib" = dontDistribute super."Hs2lib";
+  "HsASA" = dontDistribute super."HsASA";
+  "HsHaruPDF" = dontDistribute super."HsHaruPDF";
+  "HsHyperEstraier" = dontDistribute super."HsHyperEstraier";
+  "HsJudy" = dontDistribute super."HsJudy";
+  "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system";
+  "HsParrot" = dontDistribute super."HsParrot";
+  "HsPerl5" = dontDistribute super."HsPerl5";
+  "HsSVN" = dontDistribute super."HsSVN";
+  "HsTools" = dontDistribute super."HsTools";
+  "Hsed" = dontDistribute super."Hsed";
+  "Hsmtlib" = dontDistribute super."Hsmtlib";
+  "HueAPI" = dontDistribute super."HueAPI";
+  "HulkImport" = dontDistribute super."HulkImport";
+  "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres";
+  "IDynamic" = dontDistribute super."IDynamic";
+  "IFS" = dontDistribute super."IFS";
+  "INblobs" = dontDistribute super."INblobs";
+  "IOR" = dontDistribute super."IOR";
+  "IORefCAS" = dontDistribute super."IORefCAS";
+  "IOSpec" = dontDistribute super."IOSpec";
+  "IcoGrid" = dontDistribute super."IcoGrid";
+  "Imlib" = dontDistribute super."Imlib";
+  "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
+  "IndentParser" = dontDistribute super."IndentParser";
+  "IndexedList" = dontDistribute super."IndexedList";
+  "InfixApplicative" = dontDistribute super."InfixApplicative";
+  "Interpolation" = dontDistribute super."Interpolation";
+  "Interpolation-maxs" = dontDistribute super."Interpolation-maxs";
+  "Irc" = dontDistribute super."Irc";
+  "IrrHaskell" = dontDistribute super."IrrHaskell";
+  "IsNull" = dontDistribute super."IsNull";
+  "JSON-Combinator" = dontDistribute super."JSON-Combinator";
+  "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples";
+  "JSONb" = dontDistribute super."JSONb";
+  "JYU-Utils" = dontDistribute super."JYU-Utils";
+  "JackMiniMix" = dontDistribute super."JackMiniMix";
+  "Javasf" = dontDistribute super."Javasf";
+  "Javav" = dontDistribute super."Javav";
+  "JsContracts" = dontDistribute super."JsContracts";
+  "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
+  "JunkDB" = dontDistribute super."JunkDB";
+  "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm";
+  "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables";
+  "JustParse" = dontDistribute super."JustParse";
+  "KMP" = dontDistribute super."KMP";
+  "KSP" = dontDistribute super."KSP";
+  "Kalman" = dontDistribute super."Kalman";
+  "KdTree" = dontDistribute super."KdTree";
+  "Ketchup" = dontDistribute super."Ketchup";
+  "KiCS" = dontDistribute super."KiCS";
+  "KiCS-debugger" = dontDistribute super."KiCS-debugger";
+  "KiCS-prophecy" = dontDistribute super."KiCS-prophecy";
+  "Kleislify" = dontDistribute super."Kleislify";
+  "Konf" = dontDistribute super."Konf";
+  "Kriens" = dontDistribute super."Kriens";
+  "KyotoCabinet" = dontDistribute super."KyotoCabinet";
+  "L-seed" = dontDistribute super."L-seed";
+  "LATS" = dontDistribute super."LATS";
+  "LDAP" = dontDistribute super."LDAP";
+  "LRU" = dontDistribute super."LRU";
+  "LTree" = dontDistribute super."LTree";
+  "LambdaCalculator" = dontDistribute super."LambdaCalculator";
+  "LambdaHack" = dontDistribute super."LambdaHack";
+  "LambdaINet" = dontDistribute super."LambdaINet";
+  "LambdaNet" = dontDistribute super."LambdaNet";
+  "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote";
+  "LambdaShell" = dontDistribute super."LambdaShell";
+  "Lambdajudge" = dontDistribute super."Lambdajudge";
+  "Lambdaya" = dontDistribute super."Lambdaya";
+  "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
+  "Lastik" = dontDistribute super."Lastik";
+  "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
+  "LazyVault" = dontDistribute super."LazyVault";
+  "Level0" = dontDistribute super."Level0";
+  "LibClang" = dontDistribute super."LibClang";
+  "Limit" = dontDistribute super."Limit";
+  "LinearSplit" = dontDistribute super."LinearSplit";
+  "LinguisticsTypes" = dontDistribute super."LinguisticsTypes";
+  "LinkChecker" = dontDistribute super."LinkChecker";
+  "ListTree" = dontDistribute super."ListTree";
+  "ListWriter" = dontDistribute super."ListWriter";
+  "ListZipper" = dontDistribute super."ListZipper";
+  "Logic" = dontDistribute super."Logic";
+  "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees";
+  "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI";
+  "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network";
+  "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
+  "LslPlus" = dontDistribute super."LslPlus";
+  "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
+  "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
+  "MHask" = dontDistribute super."MHask";
+  "MSQueue" = dontDistribute super."MSQueue";
+  "MTGBuilder" = dontDistribute super."MTGBuilder";
+  "MagicHaskeller" = dontDistribute super."MagicHaskeller";
+  "MailchimpSimple" = dontDistribute super."MailchimpSimple";
+  "MaybeT" = dontDistribute super."MaybeT";
+  "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf";
+  "MaybeT-transformers" = dontDistribute super."MaybeT-transformers";
+  "MazesOfMonad" = dontDistribute super."MazesOfMonad";
+  "MeanShift" = dontDistribute super."MeanShift";
+  "Measure" = dontDistribute super."Measure";
+  "MetaHDBC" = dontDistribute super."MetaHDBC";
+  "MetaObject" = dontDistribute super."MetaObject";
+  "Metrics" = dontDistribute super."Metrics";
+  "Mhailist" = dontDistribute super."Mhailist";
+  "Michelangelo" = dontDistribute super."Michelangelo";
+  "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator";
+  "MiniAgda" = dontDistribute super."MiniAgda";
+  "MissingK" = dontDistribute super."MissingK";
+  "MissingM" = dontDistribute super."MissingM";
+  "MissingPy" = dontDistribute super."MissingPy";
+  "Modulo" = dontDistribute super."Modulo";
+  "Moe" = dontDistribute super."Moe";
+  "MoeDict" = dontDistribute super."MoeDict";
+  "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl";
+  "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign";
+  "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
+  "MonadCompose" = dontDistribute super."MonadCompose";
+  "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
+  "MonadStack" = dontDistribute super."MonadStack";
+  "Monadius" = dontDistribute super."Monadius";
+  "Monaris" = dontDistribute super."Monaris";
+  "Monatron" = dontDistribute super."Monatron";
+  "Monatron-IO" = dontDistribute super."Monatron-IO";
+  "Monocle" = dontDistribute super."Monocle";
+  "MorseCode" = dontDistribute super."MorseCode";
+  "MuCheck" = dontDistribute super."MuCheck";
+  "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit";
+  "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec";
+  "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck";
+  "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck";
+  "Munkres" = dontDistribute super."Munkres";
+  "Munkres-simple" = dontDistribute super."Munkres-simple";
+  "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid";
+  "MyPrimes" = dontDistribute super."MyPrimes";
+  "NGrams" = dontDistribute super."NGrams";
+  "NTRU" = dontDistribute super."NTRU";
+  "NXT" = dontDistribute super."NXT";
+  "NXTDSL" = dontDistribute super."NXTDSL";
+  "NanoProlog" = dontDistribute super."NanoProlog";
+  "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets";
+  "NaturalSort" = dontDistribute super."NaturalSort";
+  "NearContextAlgebra" = dontDistribute super."NearContextAlgebra";
+  "Neks" = dontDistribute super."Neks";
+  "NestedFunctor" = dontDistribute super."NestedFunctor";
+  "NestedSampling" = dontDistribute super."NestedSampling";
+  "NetSNMP" = dontDistribute super."NetSNMP";
+  "NewBinary" = dontDistribute super."NewBinary";
+  "Ninjas" = dontDistribute super."Ninjas";
+  "NoSlow" = dontDistribute super."NoSlow";
+  "NoTrace" = dontDistribute super."NoTrace";
+  "Noise" = dontDistribute super."Noise";
+  "Nomyx" = dontDistribute super."Nomyx";
+  "Nomyx-Core" = dontDistribute super."Nomyx-Core";
+  "Nomyx-Language" = dontDistribute super."Nomyx-Language";
+  "Nomyx-Rules" = dontDistribute super."Nomyx-Rules";
+  "Nomyx-Web" = dontDistribute super."Nomyx-Web";
+  "NonEmpty" = dontDistribute super."NonEmpty";
+  "NonEmptyList" = dontDistribute super."NonEmptyList";
+  "NumLazyByteString" = dontDistribute super."NumLazyByteString";
+  "NumberSieves" = dontDistribute super."NumberSieves";
+  "NumberTheory" = dontDistribute super."NumberTheory";
+  "Numbers" = dontDistribute super."Numbers";
+  "Nussinov78" = dontDistribute super."Nussinov78";
+  "Nutri" = dontDistribute super."Nutri";
+  "OGL" = dontDistribute super."OGL";
+  "OSM" = dontDistribute super."OSM";
+  "OTP" = dontDistribute super."OTP";
+  "Object" = dontDistribute super."Object";
+  "ObjectIO" = dontDistribute super."ObjectIO";
+  "Obsidian" = dontDistribute super."Obsidian";
+  "OddWord" = dontDistribute super."OddWord";
+  "Omega" = dontDistribute super."Omega";
+  "OneTuple" = dontDistribute super."OneTuple";
+  "OpenAFP" = dontDistribute super."OpenAFP";
+  "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils";
+  "OpenAL" = dontDistribute super."OpenAL";
+  "OpenCL" = dontDistribute super."OpenCL";
+  "OpenCLRaw" = dontDistribute super."OpenCLRaw";
+  "OpenCLWrappers" = dontDistribute super."OpenCLWrappers";
+  "OpenGLCheck" = dontDistribute super."OpenGLCheck";
+  "OpenGLRaw21" = dontDistribute super."OpenGLRaw21";
+  "OpenSCAD" = dontDistribute super."OpenSCAD";
+  "OpenVG" = dontDistribute super."OpenVG";
+  "OpenVGRaw" = dontDistribute super."OpenVGRaw";
+  "Operads" = dontDistribute super."Operads";
+  "OptDir" = dontDistribute super."OptDir";
+  "OrPatterns" = dontDistribute super."OrPatterns";
+  "OrchestrateDB" = dontDistribute super."OrchestrateDB";
+  "OrderedBits" = dontDistribute super."OrderedBits";
+  "Ordinals" = dontDistribute super."Ordinals";
+  "PArrows" = dontDistribute super."PArrows";
+  "PBKDF2" = dontDistribute super."PBKDF2";
+  "PCLT" = dontDistribute super."PCLT";
+  "PCLT-DB" = dontDistribute super."PCLT-DB";
+  "PDBtools" = dontDistribute super."PDBtools";
+  "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
+  "PageIO" = dontDistribute super."PageIO";
+  "Paillier" = dontDistribute super."Paillier";
+  "PandocAgda" = dontDistribute super."PandocAgda";
+  "Paraiso" = dontDistribute super."Paraiso";
+  "Parry" = dontDistribute super."Parry";
+  "ParsecTools" = dontDistribute super."ParsecTools";
+  "ParserFunction" = dontDistribute super."ParserFunction";
+  "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures";
+  "PasswordGenerator" = dontDistribute super."PasswordGenerator";
+  "PastePipe" = dontDistribute super."PastePipe";
+  "Pathfinder" = dontDistribute super."Pathfinder";
+  "Peano" = dontDistribute super."Peano";
+  "PeanoWitnesses" = dontDistribute super."PeanoWitnesses";
+  "PerfectHash" = dontDistribute super."PerfectHash";
+  "PermuteEffects" = dontDistribute super."PermuteEffects";
+  "Phsu" = dontDistribute super."Phsu";
+  "Pipe" = dontDistribute super."Pipe";
+  "Piso" = dontDistribute super."Piso";
+  "PlayHangmanGame" = dontDistribute super."PlayHangmanGame";
+  "PlayingCards" = dontDistribute super."PlayingCards";
+  "Plot-ho-matic" = dontDistribute super."Plot-ho-matic";
+  "PlslTools" = dontDistribute super."PlslTools";
+  "Plural" = dontDistribute super."Plural";
+  "Pollutocracy" = dontDistribute super."Pollutocracy";
+  "PortFusion" = dontDistribute super."PortFusion";
+  "PortMidi" = dontDistribute super."PortMidi";
+  "PostgreSQL" = dontDistribute super."PostgreSQL";
+  "PrimitiveArray" = dontDistribute super."PrimitiveArray";
+  "PrimitiveArray-Pretty" = dontDistribute super."PrimitiveArray-Pretty";
+  "Printf-TH" = dontDistribute super."Printf-TH";
+  "PriorityChansConverger" = dontDistribute super."PriorityChansConverger";
+  "ProbabilityMonads" = dontDistribute super."ProbabilityMonads";
+  "PropLogic" = dontDistribute super."PropLogic";
+  "Proper" = dontDistribute super."Proper";
+  "ProxN" = dontDistribute super."ProxN";
+  "Pugs" = dontDistribute super."Pugs";
+  "Pup-Events" = dontDistribute super."Pup-Events";
+  "Pup-Events-Client" = dontDistribute super."Pup-Events-Client";
+  "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo";
+  "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
+  "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
+  "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
+  "QuadEdge" = dontDistribute super."QuadEdge";
+  "QuadTree" = dontDistribute super."QuadTree";
+  "Quelea" = dontDistribute super."Quelea";
+  "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
+  "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickCheck-safe" = dontDistribute super."QuickCheck-safe";
+  "QuickPlot" = dontDistribute super."QuickPlot";
+  "Quickson" = dontDistribute super."Quickson";
+  "R-pandoc" = dontDistribute super."R-pandoc";
+  "RANSAC" = dontDistribute super."RANSAC";
+  "RBTree" = dontDistribute super."RBTree";
+  "RESTng" = dontDistribute super."RESTng";
+  "RFC1751" = dontDistribute super."RFC1751";
+  "RJson" = dontDistribute super."RJson";
+  "RMP" = dontDistribute super."RMP";
+  "RNAFold" = dontDistribute super."RNAFold";
+  "RNAFoldProgs" = dontDistribute super."RNAFoldProgs";
+  "RNAdesign" = dontDistribute super."RNAdesign";
+  "RNAdraw" = dontDistribute super."RNAdraw";
+  "RNAlien" = doDistribute super."RNAlien_1_0_0";
+  "RNAwolf" = dontDistribute super."RNAwolf";
+  "Raincat" = dontDistribute super."Raincat";
+  "Random123" = dontDistribute super."Random123";
+  "RandomDotOrg" = dontDistribute super."RandomDotOrg";
+  "Randometer" = dontDistribute super."Randometer";
+  "Range" = dontDistribute super."Range";
+  "Ranged-sets" = dontDistribute super."Ranged-sets";
+  "Ranka" = dontDistribute super."Ranka";
+  "Rasenschach" = dontDistribute super."Rasenschach";
+  "Redmine" = dontDistribute super."Redmine";
+  "Ref" = dontDistribute super."Ref";
+  "Referees" = dontDistribute super."Referees";
+  "RepLib" = dontDistribute super."RepLib";
+  "ReplicateEffects" = dontDistribute super."ReplicateEffects";
+  "ReviewBoard" = dontDistribute super."ReviewBoard";
+  "RichConditional" = dontDistribute super."RichConditional";
+  "RollingDirectory" = dontDistribute super."RollingDirectory";
+  "RoyalMonad" = dontDistribute super."RoyalMonad";
+  "RxHaskell" = dontDistribute super."RxHaskell";
+  "SBench" = dontDistribute super."SBench";
+  "SConfig" = dontDistribute super."SConfig";
+  "SDL" = dontDistribute super."SDL";
+  "SDL-gfx" = dontDistribute super."SDL-gfx";
+  "SDL-image" = dontDistribute super."SDL-image";
+  "SDL-mixer" = dontDistribute super."SDL-mixer";
+  "SDL-mpeg" = dontDistribute super."SDL-mpeg";
+  "SDL-ttf" = dontDistribute super."SDL-ttf";
+  "SDL2-ttf" = dontDistribute super."SDL2-ttf";
+  "SFML" = dontDistribute super."SFML";
+  "SFML-control" = dontDistribute super."SFML-control";
+  "SFont" = dontDistribute super."SFont";
+  "SG" = dontDistribute super."SG";
+  "SGdemo" = dontDistribute super."SGdemo";
+  "SHA2" = dontDistribute super."SHA2";
+  "SMTPClient" = dontDistribute super."SMTPClient";
+  "SNet" = dontDistribute super."SNet";
+  "SQLDeps" = dontDistribute super."SQLDeps";
+  "STL" = dontDistribute super."STL";
+  "SVG2Q" = dontDistribute super."SVG2Q";
+  "SVGFonts" = dontDistribute super."SVGFonts";
+  "SVGPath" = dontDistribute super."SVGPath";
+  "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB";
+  "SableCC2Hs" = dontDistribute super."SableCC2Hs";
+  "Safe" = dontDistribute super."Safe";
+  "Salsa" = dontDistribute super."Salsa";
+  "Saturnin" = dontDistribute super."Saturnin";
+  "SciFlow" = dontDistribute super."SciFlow";
+  "ScratchFs" = dontDistribute super."ScratchFs";
+  "Scurry" = dontDistribute super."Scurry";
+  "Semantique" = dontDistribute super."Semantique";
+  "Semigroup" = dontDistribute super."Semigroup";
+  "SeqAlign" = dontDistribute super."SeqAlign";
+  "SessionLogger" = dontDistribute super."SessionLogger";
+  "ShellCheck" = dontDistribute super."ShellCheck";
+  "Shellac" = dontDistribute super."Shellac";
+  "Shellac-compatline" = dontDistribute super."Shellac-compatline";
+  "Shellac-editline" = dontDistribute super."Shellac-editline";
+  "Shellac-haskeline" = dontDistribute super."Shellac-haskeline";
+  "Shellac-readline" = dontDistribute super."Shellac-readline";
+  "ShowF" = dontDistribute super."ShowF";
+  "Shrub" = dontDistribute super."Shrub";
+  "Shu-thing" = dontDistribute super."Shu-thing";
+  "SimpleAES" = dontDistribute super."SimpleAES";
+  "SimpleEA" = dontDistribute super."SimpleEA";
+  "SimpleGL" = dontDistribute super."SimpleGL";
+  "SimpleH" = dontDistribute super."SimpleH";
+  "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
+  "SizeCompare" = dontDistribute super."SizeCompare";
+  "Slides" = dontDistribute super."Slides";
+  "Smooth" = dontDistribute super."Smooth";
+  "SmtLib" = dontDistribute super."SmtLib";
+  "Snusmumrik" = dontDistribute super."Snusmumrik";
+  "SoOSiM" = dontDistribute super."SoOSiM";
+  "SoccerFun" = dontDistribute super."SoccerFun";
+  "SoccerFunGL" = dontDistribute super."SoccerFunGL";
+  "Sonnex" = dontDistribute super."Sonnex";
+  "SourceGraph" = dontDistribute super."SourceGraph";
+  "Southpaw" = dontDistribute super."Southpaw";
+  "SpaceInvaders" = dontDistribute super."SpaceInvaders";
+  "SpacePrivateers" = dontDistribute super."SpacePrivateers";
+  "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spock-auth" = dontDistribute super."Spock-auth";
+  "Spock-lucid" = dontDistribute super."Spock-lucid";
+  "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3";
+  "SpreadsheetML" = dontDistribute super."SpreadsheetML";
+  "Sprig" = dontDistribute super."Sprig";
+  "Stasis" = dontDistribute super."Stasis";
+  "StateVar-transformer" = dontDistribute super."StateVar-transformer";
+  "StatisticalMethods" = dontDistribute super."StatisticalMethods";
+  "Stomp" = dontDistribute super."Stomp";
+  "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib";
+  "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell";
+  "StrappedTemplates" = dontDistribute super."StrappedTemplates";
+  "StrategyLib" = dontDistribute super."StrategyLib";
+  "Stream" = dontDistribute super."Stream";
+  "StrictBench" = dontDistribute super."StrictBench";
+  "SuffixStructures" = dontDistribute super."SuffixStructures";
+  "SybWidget" = dontDistribute super."SybWidget";
+  "SyntaxMacros" = dontDistribute super."SyntaxMacros";
+  "Sysmon" = dontDistribute super."Sysmon";
+  "TBC" = dontDistribute super."TBC";
+  "TBit" = dontDistribute super."TBit";
+  "THEff" = dontDistribute super."THEff";
+  "TTTAS" = dontDistribute super."TTTAS";
+  "TV" = dontDistribute super."TV";
+  "TYB" = dontDistribute super."TYB";
+  "TableAlgebra" = dontDistribute super."TableAlgebra";
+  "Tables" = dontDistribute super."Tables";
+  "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
+  "Tainted" = dontDistribute super."Tainted";
+  "Takusen" = dontDistribute super."Takusen";
+  "Tape" = dontDistribute super."Tape";
+  "TeaHS" = dontDistribute super."TeaHS";
+  "Tensor" = dontDistribute super."Tensor";
+  "TernaryTrees" = dontDistribute super."TernaryTrees";
+  "TestExplode" = dontDistribute super."TestExplode";
+  "Theora" = dontDistribute super."Theora";
+  "Thingie" = dontDistribute super."Thingie";
+  "ThreadObjects" = dontDistribute super."ThreadObjects";
+  "Thrift" = dontDistribute super."Thrift";
+  "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe";
+  "TicTacToe" = dontDistribute super."TicTacToe";
+  "TigerHash" = dontDistribute super."TigerHash";
+  "TimePiece" = dontDistribute super."TimePiece";
+  "TinyLaunchbury" = dontDistribute super."TinyLaunchbury";
+  "TinyURL" = dontDistribute super."TinyURL";
+  "Titim" = dontDistribute super."Titim";
+  "Top" = dontDistribute super."Top";
+  "Tournament" = dontDistribute super."Tournament";
+  "TraceUtils" = dontDistribute super."TraceUtils";
+  "TransformersStepByStep" = dontDistribute super."TransformersStepByStep";
+  "Transhare" = dontDistribute super."Transhare";
+  "TreeCounter" = dontDistribute super."TreeCounter";
+  "TreeStructures" = dontDistribute super."TreeStructures";
+  "TreeT" = dontDistribute super."TreeT";
+  "Treiber" = dontDistribute super."Treiber";
+  "TrendGraph" = dontDistribute super."TrendGraph";
+  "TrieMap" = dontDistribute super."TrieMap";
+  "Twofish" = dontDistribute super."Twofish";
+  "TypeClass" = dontDistribute super."TypeClass";
+  "TypeCompose" = dontDistribute super."TypeCompose";
+  "TypeIlluminator" = dontDistribute super."TypeIlluminator";
+  "TypeNat" = dontDistribute super."TypeNat";
+  "TypingTester" = dontDistribute super."TypingTester";
+  "UISF" = dontDistribute super."UISF";
+  "UMM" = dontDistribute super."UMM";
+  "URLT" = dontDistribute super."URLT";
+  "URLb" = dontDistribute super."URLb";
+  "UTFTConverter" = dontDistribute super."UTFTConverter";
+  "Unique" = dontDistribute super."Unique";
+  "Unixutils-shadow" = dontDistribute super."Unixutils-shadow";
+  "Updater" = dontDistribute super."Updater";
+  "UrlDisp" = dontDistribute super."UrlDisp";
+  "Useful" = dontDistribute super."Useful";
+  "UtilityTM" = dontDistribute super."UtilityTM";
+  "VKHS" = dontDistribute super."VKHS";
+  "Validation" = dontDistribute super."Validation";
+  "Vec" = dontDistribute super."Vec";
+  "Vec-Boolean" = dontDistribute super."Vec-Boolean";
+  "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
+  "Vec-Transform" = dontDistribute super."Vec-Transform";
+  "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
+  "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "Vulkan" = dontDistribute super."Vulkan";
+  "WAVE" = dontDistribute super."WAVE";
+  "WL500gPControl" = dontDistribute super."WL500gPControl";
+  "WL500gPLib" = dontDistribute super."WL500gPLib";
+  "WMSigner" = dontDistribute super."WMSigner";
+  "WURFL" = dontDistribute super."WURFL";
+  "WXDiffCtrl" = dontDistribute super."WXDiffCtrl";
+  "WashNGo" = dontDistribute super."WashNGo";
+  "WaveFront" = dontDistribute super."WaveFront";
+  "Weather" = dontDistribute super."Weather";
+  "WebBits" = dontDistribute super."WebBits";
+  "WebBits-Html" = dontDistribute super."WebBits-Html";
+  "WebBits-multiplate" = dontDistribute super."WebBits-multiplate";
+  "WebCont" = dontDistribute super."WebCont";
+  "WeberLogic" = dontDistribute super."WeberLogic";
+  "Webrexp" = dontDistribute super."Webrexp";
+  "Wheb" = dontDistribute super."Wheb";
+  "WikimediaParser" = dontDistribute super."WikimediaParser";
+  "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server";
+  "Win32-errors" = dontDistribute super."Win32-errors";
+  "Win32-junction-point" = dontDistribute super."Win32-junction-point";
+  "Win32-security" = dontDistribute super."Win32-security";
+  "Win32-services" = dontDistribute super."Win32-services";
+  "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper";
+  "Wired" = dontDistribute super."Wired";
+  "WordAlignment" = dontDistribute super."WordAlignment";
+  "WordNet" = dontDistribute super."WordNet";
+  "WordNet-ghc74" = dontDistribute super."WordNet-ghc74";
+  "Wordlint" = dontDistribute super."Wordlint";
+  "WxGeneric" = dontDistribute super."WxGeneric";
+  "X11-extras" = dontDistribute super."X11-extras";
+  "X11-rm" = dontDistribute super."X11-rm";
+  "X11-xdamage" = dontDistribute super."X11-xdamage";
+  "X11-xfixes" = dontDistribute super."X11-xfixes";
+  "X11-xft" = dontDistribute super."X11-xft";
+  "X11-xshape" = dontDistribute super."X11-xshape";
+  "XAttr" = dontDistribute super."XAttr";
+  "XInput" = dontDistribute super."XInput";
+  "XMMS" = dontDistribute super."XMMS";
+  "XMPP" = dontDistribute super."XMPP";
+  "XSaiga" = dontDistribute super."XSaiga";
+  "Xec" = dontDistribute super."Xec";
+  "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter";
+  "Xorshift128Plus" = dontDistribute super."Xorshift128Plus";
+  "YACPong" = dontDistribute super."YACPong";
+  "YFrob" = dontDistribute super."YFrob";
+  "Yablog" = dontDistribute super."Yablog";
+  "YamlReference" = dontDistribute super."YamlReference";
+  "Yampa-core" = dontDistribute super."Yampa-core";
+  "Yocto" = dontDistribute super."Yocto";
+  "Yogurt" = dontDistribute super."Yogurt";
+  "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone";
+  "ZEBEDDE" = dontDistribute super."ZEBEDDE";
+  "ZFS" = dontDistribute super."ZFS";
+  "ZMachine" = dontDistribute super."ZMachine";
+  "ZipFold" = dontDistribute super."ZipFold";
+  "ZipperAG" = dontDistribute super."ZipperAG";
+  "Zora" = dontDistribute super."Zora";
+  "Zwaluw" = dontDistribute super."Zwaluw";
+  "a50" = dontDistribute super."a50";
+  "abacate" = dontDistribute super."abacate";
+  "abc-puzzle" = dontDistribute super."abc-puzzle";
+  "abcBridge" = dontDistribute super."abcBridge";
+  "abcnotation" = dontDistribute super."abcnotation";
+  "abeson" = dontDistribute super."abeson";
+  "abstract-deque-tests" = dontDistribute super."abstract-deque-tests";
+  "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate";
+  "abt" = dontDistribute super."abt";
+  "ac-machine" = dontDistribute super."ac-machine";
+  "ac-machine-conduit" = dontDistribute super."ac-machine-conduit";
+  "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic";
+  "accelerate-cublas" = dontDistribute super."accelerate-cublas";
+  "accelerate-cuda" = dontDistribute super."accelerate-cuda";
+  "accelerate-cufft" = dontDistribute super."accelerate-cufft";
+  "accelerate-examples" = dontDistribute super."accelerate-examples";
+  "accelerate-fft" = dontDistribute super."accelerate-fft";
+  "accelerate-fftw" = dontDistribute super."accelerate-fftw";
+  "accelerate-fourier" = dontDistribute super."accelerate-fourier";
+  "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark";
+  "accelerate-io" = dontDistribute super."accelerate-io";
+  "accelerate-random" = dontDistribute super."accelerate-random";
+  "accelerate-utility" = dontDistribute super."accelerate-utility";
+  "accentuateus" = dontDistribute super."accentuateus";
+  "access-time" = dontDistribute super."access-time";
+  "acid-state-dist" = dontDistribute super."acid-state-dist";
+  "acid-state-tls" = dontDistribute super."acid-state-tls";
+  "acl2" = dontDistribute super."acl2";
+  "acme-all-monad" = dontDistribute super."acme-all-monad";
+  "acme-box" = dontDistribute super."acme-box";
+  "acme-cadre" = dontDistribute super."acme-cadre";
+  "acme-cofunctor" = dontDistribute super."acme-cofunctor";
+  "acme-colosson" = dontDistribute super."acme-colosson";
+  "acme-comonad" = dontDistribute super."acme-comonad";
+  "acme-cutegirl" = dontDistribute super."acme-cutegirl";
+  "acme-dont" = dontDistribute super."acme-dont";
+  "acme-flipping-tables" = dontDistribute super."acme-flipping-tables";
+  "acme-grawlix" = dontDistribute super."acme-grawlix";
+  "acme-hq9plus" = dontDistribute super."acme-hq9plus";
+  "acme-http" = dontDistribute super."acme-http";
+  "acme-inator" = dontDistribute super."acme-inator";
+  "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
+  "acme-lolcat" = dontDistribute super."acme-lolcat";
+  "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
+  "acme-memorandom" = dontDistribute super."acme-memorandom";
+  "acme-microwave" = dontDistribute super."acme-microwave";
+  "acme-miscorder" = dontDistribute super."acme-miscorder";
+  "acme-missiles" = dontDistribute super."acme-missiles";
+  "acme-now" = dontDistribute super."acme-now";
+  "acme-numbersystem" = dontDistribute super."acme-numbersystem";
+  "acme-omitted" = dontDistribute super."acme-omitted";
+  "acme-one" = dontDistribute super."acme-one";
+  "acme-operators" = dontDistribute super."acme-operators";
+  "acme-php" = dontDistribute super."acme-php";
+  "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers";
+  "acme-realworld" = dontDistribute super."acme-realworld";
+  "acme-safe" = dontDistribute super."acme-safe";
+  "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel";
+  "acme-strfry" = dontDistribute super."acme-strfry";
+  "acme-stringly-typed" = dontDistribute super."acme-stringly-typed";
+  "acme-strtok" = dontDistribute super."acme-strtok";
+  "acme-timemachine" = dontDistribute super."acme-timemachine";
+  "acme-year" = dontDistribute super."acme-year";
+  "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
+  "activehs" = dontDistribute super."activehs";
+  "activehs-base" = dontDistribute super."activehs-base";
+  "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
+  "actor" = dontDistribute super."actor";
+  "adaptive-containers" = dontDistribute super."adaptive-containers";
+  "adaptive-tuple" = dontDistribute super."adaptive-tuple";
+  "adb" = dontDistribute super."adb";
+  "adblock2privoxy" = dontDistribute super."adblock2privoxy";
+  "addLicenseInfo" = dontDistribute super."addLicenseInfo";
+  "adhoc-network" = dontDistribute super."adhoc-network";
+  "adict" = dontDistribute super."adict";
+  "adler32" = dontDistribute super."adler32";
+  "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
+  "adp-multi" = dontDistribute super."adp-multi";
+  "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson" = doDistribute super."aeson_0_9_0_1";
+  "aeson-applicative" = dontDistribute super."aeson-applicative";
+  "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-compat" = doDistribute super."aeson-compat_0_3_2_0";
+  "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-flatten" = dontDistribute super."aeson-flatten";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-lens" = dontDistribute super."aeson-lens";
+  "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
+  "aeson-prefix" = dontDistribute super."aeson-prefix";
+  "aeson-schema" = dontDistribute super."aeson-schema";
+  "aeson-serialize" = dontDistribute super."aeson-serialize";
+  "aeson-smart" = dontDistribute super."aeson-smart";
+  "aeson-streams" = dontDistribute super."aeson-streams";
+  "aeson-t" = dontDistribute super."aeson-t";
+  "aeson-toolkit" = dontDistribute super."aeson-toolkit";
+  "aeson-value-parser" = dontDistribute super."aeson-value-parser";
+  "aeson-yak" = dontDistribute super."aeson-yak";
+  "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
+  "afis" = dontDistribute super."afis";
+  "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
+  "agda-server" = dontDistribute super."agda-server";
+  "agda-snippets" = dontDistribute super."agda-snippets";
+  "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
+  "agum" = dontDistribute super."agum";
+  "aig" = dontDistribute super."aig";
+  "air" = dontDistribute super."air";
+  "air-extra" = dontDistribute super."air-extra";
+  "air-spec" = dontDistribute super."air-spec";
+  "air-th" = dontDistribute super."air-th";
+  "airbrake" = dontDistribute super."airbrake";
+  "airship" = doDistribute super."airship_0_4_3_0";
+  "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
+  "aivika-experiment" = dontDistribute super."aivika-experiment";
+  "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
+  "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
+  "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-transformers" = dontDistribute super."aivika-transformers";
+  "ajhc" = dontDistribute super."ajhc";
+  "al" = dontDistribute super."al";
+  "alea" = dontDistribute super."alea";
+  "alex-meta" = dontDistribute super."alex-meta";
+  "alfred" = dontDistribute super."alfred";
+  "alga" = dontDistribute super."alga";
+  "algebra" = dontDistribute super."algebra";
+  "algebra-dag" = dontDistribute super."algebra-dag";
+  "algebra-sql" = dontDistribute super."algebra-sql";
+  "algebraic" = dontDistribute super."algebraic";
+  "algebraic-classes" = dontDistribute super."algebraic-classes";
+  "align" = dontDistribute super."align";
+  "align-text" = dontDistribute super."align-text";
+  "aligned-foreignptr" = dontDistribute super."aligned-foreignptr";
+  "allocated-processor" = dontDistribute super."allocated-processor";
+  "alloy" = dontDistribute super."alloy";
+  "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd";
+  "almost-fix" = dontDistribute super."almost-fix";
+  "alms" = dontDistribute super."alms";
+  "alpha" = dontDistribute super."alpha";
+  "alpino-tools" = dontDistribute super."alpino-tools";
+  "alsa" = dontDistribute super."alsa";
+  "alsa-core" = dontDistribute super."alsa-core";
+  "alsa-gui" = dontDistribute super."alsa-gui";
+  "alsa-midi" = dontDistribute super."alsa-midi";
+  "alsa-mixer" = dontDistribute super."alsa-mixer";
+  "alsa-pcm" = dontDistribute super."alsa-pcm";
+  "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests";
+  "alsa-seq" = dontDistribute super."alsa-seq";
+  "alsa-seq-tests" = dontDistribute super."alsa-seq-tests";
+  "altcomposition" = dontDistribute super."altcomposition";
+  "alternative-io" = dontDistribute super."alternative-io";
+  "altfloat" = dontDistribute super."altfloat";
+  "alure" = dontDistribute super."alure";
+  "amazon-emailer" = dontDistribute super."amazon-emailer";
+  "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
+  "amazon-products" = dontDistribute super."amazon-products";
+  "amazonka" = doDistribute super."amazonka_1_3_7";
+  "amazonka-apigateway" = doDistribute super."amazonka-apigateway_1_3_7";
+  "amazonka-autoscaling" = doDistribute super."amazonka-autoscaling_1_3_7";
+  "amazonka-certificatemanager" = dontDistribute super."amazonka-certificatemanager";
+  "amazonka-cloudformation" = doDistribute super."amazonka-cloudformation_1_3_7";
+  "amazonka-cloudfront" = doDistribute super."amazonka-cloudfront_1_3_7";
+  "amazonka-cloudhsm" = doDistribute super."amazonka-cloudhsm_1_3_7";
+  "amazonka-cloudsearch" = doDistribute super."amazonka-cloudsearch_1_3_7";
+  "amazonka-cloudsearch-domains" = doDistribute super."amazonka-cloudsearch-domains_1_3_7";
+  "amazonka-cloudtrail" = doDistribute super."amazonka-cloudtrail_1_3_7";
+  "amazonka-cloudwatch" = doDistribute super."amazonka-cloudwatch_1_3_7";
+  "amazonka-cloudwatch-events" = dontDistribute super."amazonka-cloudwatch-events";
+  "amazonka-cloudwatch-logs" = doDistribute super."amazonka-cloudwatch-logs_1_3_7";
+  "amazonka-codecommit" = doDistribute super."amazonka-codecommit_1_3_7";
+  "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_1_3_7";
+  "amazonka-codepipeline" = doDistribute super."amazonka-codepipeline_1_3_7";
+  "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_1_3_7";
+  "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_1_3_7";
+  "amazonka-config" = doDistribute super."amazonka-config_1_3_7";
+  "amazonka-core" = doDistribute super."amazonka-core_1_3_7";
+  "amazonka-datapipeline" = doDistribute super."amazonka-datapipeline_1_3_7";
+  "amazonka-devicefarm" = doDistribute super."amazonka-devicefarm_1_3_7";
+  "amazonka-directconnect" = doDistribute super."amazonka-directconnect_1_3_7";
+  "amazonka-dms" = dontDistribute super."amazonka-dms";
+  "amazonka-ds" = doDistribute super."amazonka-ds_1_3_7";
+  "amazonka-dynamodb" = doDistribute super."amazonka-dynamodb_1_3_7";
+  "amazonka-dynamodb-streams" = doDistribute super."amazonka-dynamodb-streams_1_3_7";
+  "amazonka-ec2" = doDistribute super."amazonka-ec2_1_3_7";
+  "amazonka-ecr" = dontDistribute super."amazonka-ecr";
+  "amazonka-ecs" = doDistribute super."amazonka-ecs_1_3_7";
+  "amazonka-efs" = doDistribute super."amazonka-efs_1_3_7";
+  "amazonka-elasticache" = doDistribute super."amazonka-elasticache_1_3_7";
+  "amazonka-elasticbeanstalk" = doDistribute super."amazonka-elasticbeanstalk_1_3_7";
+  "amazonka-elasticsearch" = doDistribute super."amazonka-elasticsearch_1_3_7";
+  "amazonka-elastictranscoder" = doDistribute super."amazonka-elastictranscoder_1_3_7";
+  "amazonka-elb" = doDistribute super."amazonka-elb_1_3_7";
+  "amazonka-emr" = doDistribute super."amazonka-emr_1_3_7";
+  "amazonka-gamelift" = dontDistribute super."amazonka-gamelift";
+  "amazonka-glacier" = doDistribute super."amazonka-glacier_1_3_7";
+  "amazonka-iam" = doDistribute super."amazonka-iam_1_3_7";
+  "amazonka-importexport" = doDistribute super."amazonka-importexport_1_3_7";
+  "amazonka-inspector" = doDistribute super."amazonka-inspector_1_3_7";
+  "amazonka-iot" = doDistribute super."amazonka-iot_1_3_7";
+  "amazonka-iot-dataplane" = doDistribute super."amazonka-iot-dataplane_1_3_7";
+  "amazonka-kinesis" = doDistribute super."amazonka-kinesis_1_3_7";
+  "amazonka-kinesis-firehose" = doDistribute super."amazonka-kinesis-firehose_1_3_7";
+  "amazonka-kms" = doDistribute super."amazonka-kms_1_3_7";
+  "amazonka-lambda" = doDistribute super."amazonka-lambda_1_3_7";
+  "amazonka-marketplace-analytics" = doDistribute super."amazonka-marketplace-analytics_1_3_7";
+  "amazonka-marketplace-metering" = dontDistribute super."amazonka-marketplace-metering";
+  "amazonka-ml" = doDistribute super."amazonka-ml_1_3_7";
+  "amazonka-opsworks" = doDistribute super."amazonka-opsworks_1_3_7";
+  "amazonka-rds" = doDistribute super."amazonka-rds_1_3_7";
+  "amazonka-redshift" = doDistribute super."amazonka-redshift_1_3_7";
+  "amazonka-route53" = doDistribute super."amazonka-route53_1_3_7";
+  "amazonka-route53-domains" = doDistribute super."amazonka-route53-domains_1_3_7";
+  "amazonka-s3" = doDistribute super."amazonka-s3_1_3_7";
+  "amazonka-sdb" = doDistribute super."amazonka-sdb_1_3_7";
+  "amazonka-ses" = doDistribute super."amazonka-ses_1_3_7";
+  "amazonka-sns" = doDistribute super."amazonka-sns_1_3_7";
+  "amazonka-sqs" = doDistribute super."amazonka-sqs_1_3_7";
+  "amazonka-ssm" = doDistribute super."amazonka-ssm_1_3_7";
+  "amazonka-storagegateway" = doDistribute super."amazonka-storagegateway_1_3_7";
+  "amazonka-sts" = doDistribute super."amazonka-sts_1_3_7";
+  "amazonka-support" = doDistribute super."amazonka-support_1_3_7";
+  "amazonka-swf" = doDistribute super."amazonka-swf_1_3_7";
+  "amazonka-test" = doDistribute super."amazonka-test_1_3_7";
+  "amazonka-waf" = doDistribute super."amazonka-waf_1_3_7";
+  "amazonka-workspaces" = doDistribute super."amazonka-workspaces_1_3_7";
+  "ampersand" = dontDistribute super."ampersand";
+  "amqp-conduit" = dontDistribute super."amqp-conduit";
+  "amrun" = dontDistribute super."amrun";
+  "analyze-client" = dontDistribute super."analyze-client";
+  "anansi" = dontDistribute super."anansi";
+  "anansi-hscolour" = dontDistribute super."anansi-hscolour";
+  "anansi-pandoc" = dontDistribute super."anansi-pandoc";
+  "anatomy" = dontDistribute super."anatomy";
+  "android" = dontDistribute super."android";
+  "android-lint-summary" = dontDistribute super."android-lint-summary";
+  "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
+  "annihilator" = dontDistribute super."annihilator";
+  "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
+  "ansi-pretty" = dontDistribute super."ansi-pretty";
+  "ansigraph" = dontDistribute super."ansigraph";
+  "antagonist" = dontDistribute super."antagonist";
+  "antfarm" = dontDistribute super."antfarm";
+  "anticiv" = dontDistribute super."anticiv";
+  "antigate" = dontDistribute super."antigate";
+  "antimirov" = dontDistribute super."antimirov";
+  "antiquoter" = dontDistribute super."antiquoter";
+  "antisplice" = dontDistribute super."antisplice";
+  "antlrc" = dontDistribute super."antlrc";
+  "anydbm" = dontDistribute super."anydbm";
+  "aosd" = dontDistribute super."aosd";
+  "ap-reflect" = dontDistribute super."ap-reflect";
+  "apache-md5" = dontDistribute super."apache-md5";
+  "apelsin" = dontDistribute super."apelsin";
+  "api-builder" = dontDistribute super."api-builder";
+  "api-field-json-th" = dontDistribute super."api-field-json-th";
+  "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
+  "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
+  "apiary-helics" = dontDistribute super."apiary-helics";
+  "apiary-http-client" = dontDistribute super."apiary-http-client";
+  "apiary-purescript" = dontDistribute super."apiary-purescript";
+  "apis" = dontDistribute super."apis";
+  "apotiki" = dontDistribute super."apotiki";
+  "app-lens" = dontDistribute super."app-lens";
+  "appc" = dontDistribute super."appc";
+  "applicative-extras" = dontDistribute super."applicative-extras";
+  "applicative-fail" = dontDistribute super."applicative-fail";
+  "applicative-numbers" = dontDistribute super."applicative-numbers";
+  "applicative-parsec" = dontDistribute super."applicative-parsec";
+  "applicative-quoters" = dontDistribute super."applicative-quoters";
+  "applicative-splice" = dontDistribute super."applicative-splice";
+  "apply-refact" = doDistribute super."apply-refact_0_1_0_0";
+  "apportionment" = dontDistribute super."apportionment";
+  "approx-rand-test" = dontDistribute super."approx-rand-test";
+  "approximate-equality" = dontDistribute super."approximate-equality";
+  "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
+  "arb-fft" = dontDistribute super."arb-fft";
+  "arbb-vm" = dontDistribute super."arbb-vm";
+  "archive" = dontDistribute super."archive";
+  "archiver" = dontDistribute super."archiver";
+  "archlinux" = dontDistribute super."archlinux";
+  "archlinux-web" = dontDistribute super."archlinux-web";
+  "archnews" = dontDistribute super."archnews";
+  "arena" = dontDistribute super."arena";
+  "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon" = doDistribute super."argon_0_4_0_0";
+  "argon2" = dontDistribute super."argon2";
+  "argparser" = dontDistribute super."argparser";
+  "arguedit" = dontDistribute super."arguedit";
+  "ariadne" = dontDistribute super."ariadne";
+  "arion" = dontDistribute super."arion";
+  "arith-encode" = dontDistribute super."arith-encode";
+  "arithmatic" = dontDistribute super."arithmatic";
+  "arithmetic" = dontDistribute super."arithmetic";
+  "arithmoi" = dontDistribute super."arithmoi";
+  "armada" = dontDistribute super."armada";
+  "arpa" = dontDistribute super."arpa";
+  "array-forth" = dontDistribute super."array-forth";
+  "array-memoize" = dontDistribute super."array-memoize";
+  "array-primops" = dontDistribute super."array-primops";
+  "array-utils" = dontDistribute super."array-utils";
+  "arrow-improve" = dontDistribute super."arrow-improve";
+  "arrowapply-utils" = dontDistribute super."arrowapply-utils";
+  "arrowp" = dontDistribute super."arrowp";
+  "arrows" = dontDistribute super."arrows";
+  "artery" = dontDistribute super."artery";
+  "arx" = dontDistribute super."arx";
+  "arxiv" = dontDistribute super."arxiv";
+  "ascetic" = dontDistribute super."ascetic";
+  "ascii" = dontDistribute super."ascii";
+  "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
+  "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
+  "asic" = dontDistribute super."asic";
+  "asil" = dontDistribute super."asil";
+  "asn1-data" = dontDistribute super."asn1-data";
+  "asn1dump" = dontDistribute super."asn1dump";
+  "assembler" = dontDistribute super."assembler";
+  "assert" = dontDistribute super."assert";
+  "assert-failure" = dontDistribute super."assert-failure";
+  "assertions" = dontDistribute super."assertions";
+  "assimp" = dontDistribute super."assimp";
+  "astar" = dontDistribute super."astar";
+  "astrds" = dontDistribute super."astrds";
+  "astview" = dontDistribute super."astview";
+  "astview-utils" = dontDistribute super."astview-utils";
+  "async-dejafu" = doDistribute super."async-dejafu_0_1_0_0";
+  "async-extras" = dontDistribute super."async-extras";
+  "async-manager" = dontDistribute super."async-manager";
+  "async-pool" = dontDistribute super."async-pool";
+  "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions";
+  "aterm" = dontDistribute super."aterm";
+  "aterm-utils" = dontDistribute super."aterm-utils";
+  "atl" = dontDistribute super."atl";
+  "atlassian-connect-core" = dontDistribute super."atlassian-connect-core";
+  "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor";
+  "atmos" = dontDistribute super."atmos";
+  "atmos-dimensional" = dontDistribute super."atmos-dimensional";
+  "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
+  "atom" = dontDistribute super."atom";
+  "atom-basic" = dontDistribute super."atom-basic";
+  "atom-conduit" = dontDistribute super."atom-conduit";
+  "atom-msp430" = dontDistribute super."atom-msp430";
+  "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign";
+  "atomic-primops-vector" = dontDistribute super."atomic-primops-vector";
+  "atomic-write" = dontDistribute super."atomic-write";
+  "atomo" = dontDistribute super."atomo";
+  "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
+  "attempt" = dontDistribute super."attempt";
+  "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec-arff" = dontDistribute super."attoparsec-arff";
+  "attoparsec-binary" = dontDistribute super."attoparsec-binary";
+  "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
+  "attoparsec-csv" = dontDistribute super."attoparsec-csv";
+  "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee";
+  "attoparsec-parsec" = dontDistribute super."attoparsec-parsec";
+  "attoparsec-text" = dontDistribute super."attoparsec-text";
+  "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator";
+  "attosplit" = dontDistribute super."attosplit";
+  "atuin" = dontDistribute super."atuin";
+  "audacity" = dontDistribute super."audacity";
+  "audiovisual" = dontDistribute super."audiovisual";
+  "augeas" = dontDistribute super."augeas";
+  "augur" = dontDistribute super."augur";
+  "aur" = dontDistribute super."aur";
+  "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
+  "authenticate-ldap" = dontDistribute super."authenticate-ldap";
+  "authinfo-hs" = dontDistribute super."authinfo-hs";
+  "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
+  "automitive-cse" = dontDistribute super."automitive-cse";
+  "automotive-cse" = dontDistribute super."automotive-cse";
+  "autonix-deps" = dontDistribute super."autonix-deps";
+  "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
+  "autoproc" = dontDistribute super."autoproc";
+  "avahi" = dontDistribute super."avahi";
+  "avatar-generator" = dontDistribute super."avatar-generator";
+  "average" = dontDistribute super."average";
+  "avl-static" = dontDistribute super."avl-static";
+  "avr-shake" = dontDistribute super."avr-shake";
+  "awesome-prelude" = dontDistribute super."awesome-prelude";
+  "awesomium" = dontDistribute super."awesomium";
+  "awesomium-glut" = dontDistribute super."awesomium-glut";
+  "awesomium-raw" = dontDistribute super."awesomium-raw";
+  "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer";
+  "aws-configuration-tools" = dontDistribute super."aws-configuration-tools";
+  "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit";
+  "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams";
+  "aws-ec2" = dontDistribute super."aws-ec2";
+  "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder";
+  "aws-general" = dontDistribute super."aws-general";
+  "aws-kinesis" = dontDistribute super."aws-kinesis";
+  "aws-kinesis-client" = dontDistribute super."aws-kinesis-client";
+  "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard";
+  "aws-lambda" = dontDistribute super."aws-lambda";
+  "aws-performance-tests" = dontDistribute super."aws-performance-tests";
+  "aws-route53" = dontDistribute super."aws-route53";
+  "aws-sdk" = dontDistribute super."aws-sdk";
+  "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter";
+  "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered";
+  "aws-sign4" = dontDistribute super."aws-sign4";
+  "aws-sns" = dontDistribute super."aws-sns";
+  "azure-acs" = dontDistribute super."azure-acs";
+  "azure-service-api" = dontDistribute super."azure-service-api";
+  "azure-servicebus" = dontDistribute super."azure-servicebus";
+  "azurify" = dontDistribute super."azurify";
+  "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_18";
+  "babylon" = dontDistribute super."babylon";
+  "backdropper" = dontDistribute super."backdropper";
+  "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
+  "backward-state" = dontDistribute super."backward-state";
+  "bacteria" = dontDistribute super."bacteria";
+  "bag" = dontDistribute super."bag";
+  "bamboo" = dontDistribute super."bamboo";
+  "bamboo-launcher" = dontDistribute super."bamboo-launcher";
+  "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight";
+  "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo";
+  "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint";
+  "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
+  "bamse" = dontDistribute super."bamse";
+  "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
+  "banwords" = dontDistribute super."banwords";
+  "barchart" = dontDistribute super."barchart";
+  "barcodes-code128" = dontDistribute super."barcodes-code128";
+  "barecheck" = dontDistribute super."barecheck";
+  "barley" = dontDistribute super."barley";
+  "barrie" = dontDistribute super."barrie";
+  "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-generics" = dontDistribute super."base-generics";
+  "base-io-access" = dontDistribute super."base-io-access";
+  "base-prelude" = doDistribute super."base-prelude_0_1_21";
+  "base32-bytestring" = dontDistribute super."base32-bytestring";
+  "base58-bytestring" = dontDistribute super."base58-bytestring";
+  "base58address" = dontDistribute super."base58address";
+  "base64-conduit" = dontDistribute super."base64-conduit";
+  "base91" = dontDistribute super."base91";
+  "basex-client" = dontDistribute super."basex-client";
+  "bash" = dontDistribute super."bash";
+  "basic-lens" = dontDistribute super."basic-lens";
+  "basic-sop" = dontDistribute super."basic-sop";
+  "baskell" = dontDistribute super."baskell";
+  "battlenet" = dontDistribute super."battlenet";
+  "battlenet-yesod" = dontDistribute super."battlenet-yesod";
+  "battleships" = dontDistribute super."battleships";
+  "bayes-stack" = dontDistribute super."bayes-stack";
+  "bbdb" = dontDistribute super."bbdb";
+  "bbi" = dontDistribute super."bbi";
+  "bdd" = dontDistribute super."bdd";
+  "bdelta" = dontDistribute super."bdelta";
+  "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
+  "beamable" = dontDistribute super."beamable";
+  "beautifHOL" = dontDistribute super."beautifHOL";
+  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
+  "bein" = dontDistribute super."bein";
+  "bench" = dontDistribute super."bench";
+  "benchmark-function" = dontDistribute super."benchmark-function";
+  "bencoding" = dontDistribute super."bencoding";
+  "bento" = dontDistribute super."bento";
+  "berkeleydb" = dontDistribute super."berkeleydb";
+  "berp" = dontDistribute super."berp";
+  "bert" = dontDistribute super."bert";
+  "besout" = dontDistribute super."besout";
+  "bet" = dontDistribute super."bet";
+  "betacode" = dontDistribute super."betacode";
+  "between" = dontDistribute super."between";
+  "bf-cata" = dontDistribute super."bf-cata";
+  "bff" = dontDistribute super."bff";
+  "bff-mono" = dontDistribute super."bff-mono";
+  "bgmax" = dontDistribute super."bgmax";
+  "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
+  "bibtex" = dontDistribute super."bibtex";
+  "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
+  "bidispec" = dontDistribute super."bidispec";
+  "bidispec-extras" = dontDistribute super."bidispec-extras";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
+  "billboard-parser" = dontDistribute super."billboard-parser";
+  "billeksah-forms" = dontDistribute super."billeksah-forms";
+  "billeksah-main" = dontDistribute super."billeksah-main";
+  "billeksah-main-static" = dontDistribute super."billeksah-main-static";
+  "billeksah-pane" = dontDistribute super."billeksah-pane";
+  "billeksah-services" = dontDistribute super."billeksah-services";
+  "bimaps" = dontDistribute super."bimaps";
+  "binary-bits" = dontDistribute super."binary-bits";
+  "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-derive" = dontDistribute super."binary-derive";
+  "binary-enum" = dontDistribute super."binary-enum";
+  "binary-file" = dontDistribute super."binary-file";
+  "binary-generic" = dontDistribute super."binary-generic";
+  "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
+  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-protocol" = dontDistribute super."binary-protocol";
+  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-shared" = dontDistribute super."binary-shared";
+  "binary-state" = dontDistribute super."binary-state";
+  "binary-store" = dontDistribute super."binary-store";
+  "binary-streams" = dontDistribute super."binary-streams";
+  "binary-strict" = dontDistribute super."binary-strict";
+  "binarydefer" = dontDistribute super."binarydefer";
+  "bind-marshal" = dontDistribute super."bind-marshal";
+  "binding-core" = dontDistribute super."binding-core";
+  "binding-gtk" = dontDistribute super."binding-gtk";
+  "binding-wx" = dontDistribute super."binding-wx";
+  "bindings" = dontDistribute super."bindings";
+  "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-K8055" = dontDistribute super."bindings-K8055";
+  "bindings-apr" = dontDistribute super."bindings-apr";
+  "bindings-apr-util" = dontDistribute super."bindings-apr-util";
+  "bindings-audiofile" = dontDistribute super."bindings-audiofile";
+  "bindings-bfd" = dontDistribute super."bindings-bfd";
+  "bindings-cctools" = dontDistribute super."bindings-cctools";
+  "bindings-codec2" = dontDistribute super."bindings-codec2";
+  "bindings-common" = dontDistribute super."bindings-common";
+  "bindings-dc1394" = dontDistribute super."bindings-dc1394";
+  "bindings-directfb" = dontDistribute super."bindings-directfb";
+  "bindings-eskit" = dontDistribute super."bindings-eskit";
+  "bindings-fann" = dontDistribute super."bindings-fann";
+  "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth";
+  "bindings-friso" = dontDistribute super."bindings-friso";
+  "bindings-glib" = dontDistribute super."bindings-glib";
+  "bindings-gobject" = dontDistribute super."bindings-gobject";
+  "bindings-gpgme" = dontDistribute super."bindings-gpgme";
+  "bindings-gsl" = dontDistribute super."bindings-gsl";
+  "bindings-gts" = dontDistribute super."bindings-gts";
+  "bindings-hamlib" = dontDistribute super."bindings-hamlib";
+  "bindings-hdf5" = dontDistribute super."bindings-hdf5";
+  "bindings-levmar" = dontDistribute super."bindings-levmar";
+  "bindings-libcddb" = dontDistribute super."bindings-libcddb";
+  "bindings-libffi" = dontDistribute super."bindings-libffi";
+  "bindings-libftdi" = dontDistribute super."bindings-libftdi";
+  "bindings-librrd" = dontDistribute super."bindings-librrd";
+  "bindings-libstemmer" = dontDistribute super."bindings-libstemmer";
+  "bindings-libusb" = dontDistribute super."bindings-libusb";
+  "bindings-libv4l2" = dontDistribute super."bindings-libv4l2";
+  "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2";
+  "bindings-lxc" = dontDistribute super."bindings-lxc";
+  "bindings-mmap" = dontDistribute super."bindings-mmap";
+  "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal";
+  "bindings-nettle" = dontDistribute super."bindings-nettle";
+  "bindings-parport" = dontDistribute super."bindings-parport";
+  "bindings-portaudio" = dontDistribute super."bindings-portaudio";
+  "bindings-potrace" = dontDistribute super."bindings-potrace";
+  "bindings-ppdev" = dontDistribute super."bindings-ppdev";
+  "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd";
+  "bindings-sane" = dontDistribute super."bindings-sane";
+  "bindings-sc3" = dontDistribute super."bindings-sc3";
+  "bindings-sipc" = dontDistribute super."bindings-sipc";
+  "bindings-sophia" = dontDistribute super."bindings-sophia";
+  "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
+  "bindings-svm" = dontDistribute super."bindings-svm";
+  "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
+  "bindings-yices" = dontDistribute super."bindings-yices";
+  "bindynamic" = dontDistribute super."bindynamic";
+  "binembed" = dontDistribute super."binembed";
+  "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
+  "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
+  "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
+  "biosff" = dontDistribute super."biosff";
+  "biostockholm" = dontDistribute super."biostockholm";
+  "bird" = dontDistribute super."bird";
+  "bit-array" = dontDistribute super."bit-array";
+  "bit-vector" = dontDistribute super."bit-vector";
+  "bitarray" = dontDistribute super."bitarray";
+  "bitcoin-rpc" = dontDistribute super."bitcoin-rpc";
+  "bitly-cli" = dontDistribute super."bitly-cli";
+  "bitmap" = dontDistribute super."bitmap";
+  "bitmap-opengl" = dontDistribute super."bitmap-opengl";
+  "bitmaps" = dontDistribute super."bitmaps";
+  "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
+  "bits-conduit" = dontDistribute super."bits-conduit";
+  "bits-extras" = dontDistribute super."bits-extras";
+  "bitset" = dontDistribute super."bitset";
+  "bitspeak" = dontDistribute super."bitspeak";
+  "bitstream" = dontDistribute super."bitstream";
+  "bitstring" = dontDistribute super."bitstring";
+  "bittorrent" = dontDistribute super."bittorrent";
+  "bitvec" = dontDistribute super."bitvec";
+  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
+  "bk-tree" = dontDistribute super."bk-tree";
+  "bkr" = dontDistribute super."bkr";
+  "bktrees" = dontDistribute super."bktrees";
+  "bla" = dontDistribute super."bla";
+  "black-jewel" = dontDistribute super."black-jewel";
+  "blacktip" = dontDistribute super."blacktip";
+  "blakesum" = dontDistribute super."blakesum";
+  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blas" = dontDistribute super."blas";
+  "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
+  "blaze" = dontDistribute super."blaze";
+  "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
+  "blaze-from-html" = dontDistribute super."blaze-from-html";
+  "blaze-html-contrib" = dontDistribute super."blaze-html-contrib";
+  "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat";
+  "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
+  "blaze-json" = dontDistribute super."blaze-json";
+  "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-textual-native" = dontDistribute super."blaze-textual-native";
+  "blazeMarker" = dontDistribute super."blazeMarker";
+  "blink1" = dontDistribute super."blink1";
+  "blip" = dontDistribute super."blip";
+  "bliplib" = dontDistribute super."bliplib";
+  "blocking-transactions" = dontDistribute super."blocking-transactions";
+  "blogination" = dontDistribute super."blogination";
+  "bloodhound" = dontDistribute super."bloodhound";
+  "bloodhound-amazonka-auth" = dontDistribute super."bloodhound-amazonka-auth";
+  "bloomfilter-redis" = dontDistribute super."bloomfilter-redis";
+  "bloxorz" = dontDistribute super."bloxorz";
+  "blubber" = dontDistribute super."blubber";
+  "blubber-server" = dontDistribute super."blubber-server";
+  "bluetile" = dontDistribute super."bluetile";
+  "bluetileutils" = dontDistribute super."bluetileutils";
+  "blunt" = dontDistribute super."blunt";
+  "board-games" = dontDistribute super."board-games";
+  "bogre-banana" = dontDistribute super."bogre-banana";
+  "bond" = dontDistribute super."bond";
+  "bond-haskell" = dontDistribute super."bond-haskell";
+  "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler";
+  "boolean-list" = dontDistribute super."boolean-list";
+  "boolean-normal-forms" = dontDistribute super."boolean-normal-forms";
+  "boolexpr" = dontDistribute super."boolexpr";
+  "bools" = dontDistribute super."bools";
+  "boolsimplifier" = dontDistribute super."boolsimplifier";
+  "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
+  "boomslang" = dontDistribute super."boomslang";
+  "borel" = dontDistribute super."borel";
+  "bot" = dontDistribute super."bot";
+  "botpp" = dontDistribute super."botpp";
+  "bound-gen" = dontDistribute super."bound-gen";
+  "bounded-tchan" = dontDistribute super."bounded-tchan";
+  "boundingboxes" = dontDistribute super."boundingboxes";
+  "bower-json" = doDistribute super."bower-json_0_7_0_0";
+  "bowntz" = dontDistribute super."bowntz";
+  "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
+  "brainfuck" = dontDistribute super."brainfuck";
+  "brainfuck-monad" = dontDistribute super."brainfuck-monad";
+  "brainfuck-tut" = dontDistribute super."brainfuck-tut";
+  "break" = dontDistribute super."break";
+  "breakout" = dontDistribute super."breakout";
+  "breve" = dontDistribute super."breve";
+  "brians-brain" = dontDistribute super."brians-brain";
+  "brillig" = dontDistribute super."brillig";
+  "broccoli" = dontDistribute super."broccoli";
+  "broker-haskell" = dontDistribute super."broker-haskell";
+  "bsd-sysctl" = dontDistribute super."bsd-sysctl";
+  "bson-generic" = dontDistribute super."bson-generic";
+  "bson-generics" = dontDistribute super."bson-generics";
+  "bson-mapping" = dontDistribute super."bson-mapping";
+  "bspack" = dontDistribute super."bspack";
+  "bsparse" = dontDistribute super."bsparse";
+  "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
+  "buffon" = dontDistribute super."buffon";
+  "bugzilla" = dontDistribute super."bugzilla";
+  "buildable" = dontDistribute super."buildable";
+  "buildbox" = dontDistribute super."buildbox";
+  "buildbox-tools" = dontDistribute super."buildbox-tools";
+  "buildwrapper" = dontDistribute super."buildwrapper";
+  "bullet" = dontDistribute super."bullet";
+  "burst-detection" = dontDistribute super."burst-detection";
+  "bus-pirate" = dontDistribute super."bus-pirate";
+  "buster" = dontDistribute super."buster";
+  "buster-gtk" = dontDistribute super."buster-gtk";
+  "buster-network" = dontDistribute super."buster-network";
+  "butterflies" = dontDistribute super."butterflies";
+  "bv" = dontDistribute super."bv";
+  "byline" = dontDistribute super."byline";
+  "bytable" = dontDistribute super."bytable";
+  "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary";
+  "bytestring-class" = dontDistribute super."bytestring-class";
+  "bytestring-csv" = dontDistribute super."bytestring-csv";
+  "bytestring-delta" = dontDistribute super."bytestring-delta";
+  "bytestring-from" = dontDistribute super."bytestring-from";
+  "bytestring-nums" = dontDistribute super."bytestring-nums";
+  "bytestring-plain" = dontDistribute super."bytestring-plain";
+  "bytestring-rematch" = dontDistribute super."bytestring-rematch";
+  "bytestring-short" = dontDistribute super."bytestring-short";
+  "bytestring-show" = dontDistribute super."bytestring-show";
+  "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder";
+  "bytestringparser" = dontDistribute super."bytestringparser";
+  "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
+  "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "c-dsl" = dontDistribute super."c-dsl";
+  "c-io" = dontDistribute super."c-io";
+  "c-storable-deriving" = dontDistribute super."c-storable-deriving";
+  "c0check" = dontDistribute super."c0check";
+  "c0parser" = dontDistribute super."c0parser";
+  "c10k" = dontDistribute super."c10k";
+  "c2hs" = doDistribute super."c2hs_0_27_1";
+  "c2hsc" = dontDistribute super."c2hsc";
+  "cab" = dontDistribute super."cab";
+  "cabal-audit" = dontDistribute super."cabal-audit";
+  "cabal-bounds" = dontDistribute super."cabal-bounds";
+  "cabal-cargs" = dontDistribute super."cabal-cargs";
+  "cabal-constraints" = dontDistribute super."cabal-constraints";
+  "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-debian" = doDistribute super."cabal-debian_4_32_2";
+  "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
+  "cabal-dev" = dontDistribute super."cabal-dev";
+  "cabal-dir" = dontDistribute super."cabal-dir";
+  "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags";
+  "cabal-ghci" = dontDistribute super."cabal-ghci";
+  "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
+  "cabal-info" = dontDistribute super."cabal-info";
+  "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
+  "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
+  "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74";
+  "cabal-lenses" = dontDistribute super."cabal-lenses";
+  "cabal-macosx" = dontDistribute super."cabal-macosx";
+  "cabal-meta" = dontDistribute super."cabal-meta";
+  "cabal-mon" = dontDistribute super."cabal-mon";
+  "cabal-nirvana" = dontDistribute super."cabal-nirvana";
+  "cabal-progdeps" = dontDistribute super."cabal-progdeps";
+  "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-scripts" = dontDistribute super."cabal-scripts";
+  "cabal-setup" = dontDistribute super."cabal-setup";
+  "cabal-sign" = dontDistribute super."cabal-sign";
+  "cabal-test" = dontDistribute super."cabal-test";
+  "cabal-test-bin" = dontDistribute super."cabal-test-bin";
+  "cabal-test-compat" = dontDistribute super."cabal-test-compat";
+  "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck";
+  "cabal-uninstall" = dontDistribute super."cabal-uninstall";
+  "cabal-upload" = dontDistribute super."cabal-upload";
+  "cabal2arch" = dontDistribute super."cabal2arch";
+  "cabal2doap" = dontDistribute super."cabal2doap";
+  "cabal2ebuild" = dontDistribute super."cabal2ebuild";
+  "cabal2ghci" = dontDistribute super."cabal2ghci";
+  "cabal2nix" = dontDistribute super."cabal2nix";
+  "cabal2spec" = dontDistribute super."cabal2spec";
+  "cabalQuery" = dontDistribute super."cabalQuery";
+  "cabalg" = dontDistribute super."cabalg";
+  "cabalgraph" = dontDistribute super."cabalgraph";
+  "cabalmdvrpm" = dontDistribute super."cabalmdvrpm";
+  "cabalrpmdeps" = dontDistribute super."cabalrpmdeps";
+  "cabalvchk" = dontDistribute super."cabalvchk";
+  "cabin" = dontDistribute super."cabin";
+  "cabocha" = dontDistribute super."cabocha";
+  "cached-io" = dontDistribute super."cached-io";
+  "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_4_0";
+  "caf" = dontDistribute super."caf";
+  "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
+  "caffegraph" = dontDistribute super."caffegraph";
+  "cairo-appbase" = dontDistribute super."cairo-appbase";
+  "cake" = dontDistribute super."cake";
+  "cake3" = dontDistribute super."cake3";
+  "cakyrespa" = dontDistribute super."cakyrespa";
+  "cal3d" = dontDistribute super."cal3d";
+  "cal3d-examples" = dontDistribute super."cal3d-examples";
+  "cal3d-opengl" = dontDistribute super."cal3d-opengl";
+  "calc" = dontDistribute super."calc";
+  "caldims" = dontDistribute super."caldims";
+  "caledon" = dontDistribute super."caledon";
+  "call" = dontDistribute super."call";
+  "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything";
+  "camfort" = dontDistribute super."camfort";
+  "camh" = dontDistribute super."camh";
+  "campfire" = dontDistribute super."campfire";
+  "canonical-filepath" = dontDistribute super."canonical-filepath";
+  "canteven-config" = dontDistribute super."canteven-config";
+  "canteven-listen-http" = dontDistribute super."canteven-listen-http";
+  "canteven-log" = dontDistribute super."canteven-log";
+  "canteven-template" = dontDistribute super."canteven-template";
+  "cantor" = dontDistribute super."cantor";
+  "cao" = dontDistribute super."cao";
+  "cap" = dontDistribute super."cap";
+  "capped-list" = dontDistribute super."capped-list";
+  "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
+  "caramia" = dontDistribute super."caramia";
+  "carboncopy" = dontDistribute super."carboncopy";
+  "carettah" = dontDistribute super."carettah";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
+  "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms";
+  "casadi-bindings" = dontDistribute super."casadi-bindings";
+  "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
+  "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
+  "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal";
+  "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface";
+  "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface";
+  "cascading" = dontDistribute super."cascading";
+  "case-conversion" = dontDistribute super."case-conversion";
+  "cash" = dontDistribute super."cash";
+  "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
+  "cassandra-cql" = dontDistribute super."cassandra-cql";
+  "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava-conduit" = dontDistribute super."cassava-conduit";
+  "cassava-streams" = dontDistribute super."cassava-streams";
+  "cassette" = dontDistribute super."cassette";
+  "cassy" = dontDistribute super."cassy";
+  "castle" = dontDistribute super."castle";
+  "casui" = dontDistribute super."casui";
+  "catamorphism" = dontDistribute super."catamorphism";
+  "catch-fd" = dontDistribute super."catch-fd";
+  "categorical-algebra" = dontDistribute super."categorical-algebra";
+  "categories" = dontDistribute super."categories";
+  "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
+  "category-traced" = dontDistribute super."category-traced";
+  "cayley-dickson" = dontDistribute super."cayley-dickson";
+  "cblrepo" = dontDistribute super."cblrepo";
+  "cci" = dontDistribute super."cci";
+  "ccnx" = dontDistribute super."ccnx";
+  "cctools-workqueue" = dontDistribute super."cctools-workqueue";
+  "cedict" = dontDistribute super."cedict";
+  "cef" = dontDistribute super."cef";
+  "ceilometer-common" = dontDistribute super."ceilometer-common";
+  "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
+  "cerberus" = dontDistribute super."cerberus";
+  "cereal-derive" = dontDistribute super."cereal-derive";
+  "cereal-enumerator" = dontDistribute super."cereal-enumerator";
+  "cereal-ieee754" = dontDistribute super."cereal-ieee754";
+  "cereal-plus" = dontDistribute super."cereal-plus";
+  "cereal-text" = dontDistribute super."cereal-text";
+  "certificate" = dontDistribute super."certificate";
+  "cf" = dontDistribute super."cf";
+  "cfipu" = dontDistribute super."cfipu";
+  "cflp" = dontDistribute super."cflp";
+  "cfopu" = dontDistribute super."cfopu";
+  "cg" = dontDistribute super."cg";
+  "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_3";
+  "cgi-undecidable" = dontDistribute super."cgi-undecidable";
+  "cgi-utils" = dontDistribute super."cgi-utils";
+  "cgrep" = dontDistribute super."cgrep";
+  "chain-codes" = dontDistribute super."chain-codes";
+  "chalk" = dontDistribute super."chalk";
+  "chalkboard" = dontDistribute super."chalkboard";
+  "chalkboard-viewer" = dontDistribute super."chalkboard-viewer";
+  "chalmers-lava2000" = dontDistribute super."chalmers-lava2000";
+  "chan-split" = dontDistribute super."chan-split";
+  "change-monger" = dontDistribute super."change-monger";
+  "charade" = dontDistribute super."charade";
+  "charsetdetect" = dontDistribute super."charsetdetect";
+  "chart-histogram" = dontDistribute super."chart-histogram";
+  "chaselev-deque" = dontDistribute super."chaselev-deque";
+  "chatter" = dontDistribute super."chatter";
+  "chatty" = dontDistribute super."chatty";
+  "chatty-text" = dontDistribute super."chatty-text";
+  "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate-highlight" = dontDistribute super."cheapskate-highlight";
+  "cheapskate-lucid" = dontDistribute super."cheapskate-lucid";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
+  "check-pvp" = dontDistribute super."check-pvp";
+  "checked" = dontDistribute super."checked";
+  "chell-hunit" = dontDistribute super."chell-hunit";
+  "chesshs" = dontDistribute super."chesshs";
+  "chevalier-common" = dontDistribute super."chevalier-common";
+  "chorale" = dontDistribute super."chorale";
+  "chp" = dontDistribute super."chp";
+  "chp-mtl" = dontDistribute super."chp-mtl";
+  "chp-plus" = dontDistribute super."chp-plus";
+  "chp-spec" = dontDistribute super."chp-spec";
+  "chp-transformers" = dontDistribute super."chp-transformers";
+  "chronograph" = dontDistribute super."chronograph";
+  "chu2" = dontDistribute super."chu2";
+  "chuchu" = dontDistribute super."chuchu";
+  "chunks" = dontDistribute super."chunks";
+  "chunky" = dontDistribute super."chunky";
+  "church-list" = dontDistribute super."church-list";
+  "cil" = dontDistribute super."cil";
+  "cinvoke" = dontDistribute super."cinvoke";
+  "cio" = dontDistribute super."cio";
+  "cipher-rc5" = dontDistribute super."cipher-rc5";
+  "ciphersaber2" = dontDistribute super."ciphersaber2";
+  "circ" = dontDistribute super."circ";
+  "circlehs" = dontDistribute super."circlehs";
+  "cirru-parser" = dontDistribute super."cirru-parser";
+  "citation-resolve" = dontDistribute super."citation-resolve";
+  "citeproc-hs" = dontDistribute super."citeproc-hs";
+  "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter";
+  "cityhash" = dontDistribute super."cityhash";
+  "cjk" = dontDistribute super."cjk";
+  "clac" = dontDistribute super."clac";
+  "clafer" = dontDistribute super."clafer";
+  "claferIG" = dontDistribute super."claferIG";
+  "claferwiki" = dontDistribute super."claferwiki";
+  "clang-pure" = dontDistribute super."clang-pure";
+  "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
+  "clash" = dontDistribute super."clash";
+  "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "classify" = dontDistribute super."classify";
+  "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
+  "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
+  "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
+  "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
+  "cld2" = dontDistribute super."cld2";
+  "clean-home" = dontDistribute super."clean-home";
+  "clean-unions" = dontDistribute super."clean-unions";
+  "cless" = dontDistribute super."cless";
+  "clevercss" = dontDistribute super."clevercss";
+  "cli" = dontDistribute super."cli";
+  "click-clack" = dontDistribute super."click-clack";
+  "clifford" = dontDistribute super."clifford";
+  "clippard" = dontDistribute super."clippard";
+  "clipper" = dontDistribute super."clipper";
+  "clippings" = dontDistribute super."clippings";
+  "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_6_0_1";
+  "clocked" = dontDistribute super."clocked";
+  "clogparse" = dontDistribute super."clogparse";
+  "clone-all" = dontDistribute super."clone-all";
+  "closure" = dontDistribute super."closure";
+  "cloud-haskell" = dontDistribute super."cloud-haskell";
+  "cloudfront-signer" = dontDistribute super."cloudfront-signer";
+  "cloudyfs" = dontDistribute super."cloudyfs";
+  "cltw" = dontDistribute super."cltw";
+  "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
+  "cluss" = dontDistribute super."cluss";
+  "clustertools" = dontDistribute super."clustertools";
+  "clutterhs" = dontDistribute super."clutterhs";
+  "cmaes" = dontDistribute super."cmaes";
+  "cmath" = dontDistribute super."cmath";
+  "cmathml3" = dontDistribute super."cmathml3";
+  "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs-browser" = dontDistribute super."cmdargs-browser";
+  "cmdlib" = dontDistribute super."cmdlib";
+  "cmdtheline" = dontDistribute super."cmdtheline";
+  "cml" = dontDistribute super."cml";
+  "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
+  "cmu" = dontDistribute super."cmu";
+  "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
+  "cndict" = dontDistribute super."cndict";
+  "codec" = dontDistribute super."codec";
+  "codec-libevent" = dontDistribute super."codec-libevent";
+  "codec-mbox" = dontDistribute super."codec-mbox";
+  "codecov-haskell" = dontDistribute super."codecov-haskell";
+  "codemonitor" = dontDistribute super."codemonitor";
+  "codepad" = dontDistribute super."codepad";
+  "codo-notation" = dontDistribute super."codo-notation";
+  "cofunctor" = dontDistribute super."cofunctor";
+  "cognimeta-utils" = dontDistribute super."cognimeta-utils";
+  "coinbase-exchange" = dontDistribute super."coinbase-exchange";
+  "colada" = dontDistribute super."colada";
+  "colchis" = dontDistribute super."colchis";
+  "collada-output" = dontDistribute super."collada-output";
+  "collada-types" = dontDistribute super."collada-types";
+  "collapse-util" = dontDistribute super."collapse-util";
+  "collection-json" = dontDistribute super."collection-json";
+  "collections" = dontDistribute super."collections";
+  "collections-api" = dontDistribute super."collections-api";
+  "collections-base-instances" = dontDistribute super."collections-base-instances";
+  "colock" = dontDistribute super."colock";
+  "color-counter" = dontDistribute super."color-counter";
+  "colorize-haskell" = dontDistribute super."colorize-haskell";
+  "colors" = dontDistribute super."colors";
+  "coltrane" = dontDistribute super."coltrane";
+  "com" = dontDistribute super."com";
+  "combinat" = dontDistribute super."combinat";
+  "combinat-diagrams" = dontDistribute super."combinat-diagrams";
+  "combinator-interactive" = dontDistribute super."combinator-interactive";
+  "combinatorial-problems" = dontDistribute super."combinatorial-problems";
+  "combinatorics" = dontDistribute super."combinatorics";
+  "combobuffer" = dontDistribute super."combobuffer";
+  "comfort-graph" = dontDistribute super."comfort-graph";
+  "command" = dontDistribute super."command";
+  "command-qq" = dontDistribute super."command-qq";
+  "commander" = dontDistribute super."commander";
+  "commodities" = dontDistribute super."commodities";
+  "commsec" = dontDistribute super."commsec";
+  "commsec-keyexchange" = dontDistribute super."commsec-keyexchange";
+  "comonad-extras" = dontDistribute super."comonad-extras";
+  "comonad-random" = dontDistribute super."comonad-random";
+  "compact-map" = dontDistribute super."compact-map";
+  "compact-socket" = dontDistribute super."compact-socket";
+  "compact-string" = dontDistribute super."compact-string";
+  "compact-string-fix" = dontDistribute super."compact-string-fix";
+  "compare-type" = dontDistribute super."compare-type";
+  "compdata-automata" = dontDistribute super."compdata-automata";
+  "compdata-dags" = dontDistribute super."compdata-dags";
+  "compdata-param" = dontDistribute super."compdata-param";
+  "compensated" = dontDistribute super."compensated";
+  "competition" = dontDistribute super."competition";
+  "compilation" = dontDistribute super."compilation";
+  "complex-generic" = dontDistribute super."complex-generic";
+  "complex-integrate" = dontDistribute super."complex-integrate";
+  "complexity" = dontDistribute super."complexity";
+  "compose-ltr" = dontDistribute super."compose-ltr";
+  "compose-trans" = dontDistribute super."compose-trans";
+  "compression" = dontDistribute super."compression";
+  "compstrat" = dontDistribute super."compstrat";
+  "comptrans" = dontDistribute super."comptrans";
+  "computational-algebra" = dontDistribute super."computational-algebra";
+  "computations" = dontDistribute super."computations";
+  "conceit" = dontDistribute super."conceit";
+  "concorde" = dontDistribute super."concorde";
+  "concraft" = dontDistribute super."concraft";
+  "concraft-hr" = dontDistribute super."concraft-hr";
+  "concraft-pl" = dontDistribute super."concraft-pl";
+  "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser";
+  "concrete-typerep" = dontDistribute super."concrete-typerep";
+  "concurrent-barrier" = dontDistribute super."concurrent-barrier";
+  "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
+  "concurrent-extra" = dontDistribute super."concurrent-extra";
+  "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "concurrent-output" = doDistribute super."concurrent-output_1_7_4";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
+  "concurrent-sa" = dontDistribute super."concurrent-sa";
+  "concurrent-split" = dontDistribute super."concurrent-split";
+  "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-utilities" = dontDistribute super."concurrent-utilities";
+  "concurrentoutput" = dontDistribute super."concurrentoutput";
+  "cond" = dontDistribute super."cond";
+  "condor" = dontDistribute super."condor";
+  "condorcet" = dontDistribute super."condorcet";
+  "conductive-base" = dontDistribute super."conductive-base";
+  "conductive-clock" = dontDistribute super."conductive-clock";
+  "conductive-hsc3" = dontDistribute super."conductive-hsc3";
+  "conductive-song" = dontDistribute super."conductive-song";
+  "conduit-audio" = dontDistribute super."conduit-audio";
+  "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
+  "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
+  "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
+  "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0";
+  "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
+  "conf" = dontDistribute super."conf";
+  "config-manager" = dontDistribute super."config-manager";
+  "config-select" = dontDistribute super."config-select";
+  "config-value" = dontDistribute super."config-value";
+  "configifier" = dontDistribute super."configifier";
+  "configuration" = dontDistribute super."configuration";
+  "configuration-tools" = dontDistribute super."configuration-tools";
+  "confsolve" = dontDistribute super."confsolve";
+  "congruence-relation" = dontDistribute super."congruence-relation";
+  "conjugateGradient" = dontDistribute super."conjugateGradient";
+  "conjure" = dontDistribute super."conjure";
+  "conlogger" = dontDistribute super."conlogger";
+  "connection-pool" = dontDistribute super."connection-pool";
+  "consistent" = dontDistribute super."consistent";
+  "console-program" = dontDistribute super."console-program";
+  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
+  "constrained-categories" = dontDistribute super."constrained-categories";
+  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraint-classes" = dontDistribute super."constraint-classes";
+  "constructible" = dontDistribute super."constructible";
+  "constructive-algebra" = dontDistribute super."constructive-algebra";
+  "consumers" = dontDistribute super."consumers";
+  "container" = dontDistribute super."container";
+  "container-classes" = dontDistribute super."container-classes";
+  "containers-benchmark" = dontDistribute super."containers-benchmark";
+  "containers-deepseq" = dontDistribute super."containers-deepseq";
+  "context-free-grammar" = dontDistribute super."context-free-grammar";
+  "context-stack" = dontDistribute super."context-stack";
+  "continue" = dontDistribute super."continue";
+  "continued-fractions" = dontDistribute super."continued-fractions";
+  "continuum" = dontDistribute super."continuum";
+  "continuum-client" = dontDistribute super."continuum-client";
+  "control-event" = dontDistribute super."control-event";
+  "control-monad-attempt" = dontDistribute super."control-monad-attempt";
+  "control-monad-exception" = dontDistribute super."control-monad-exception";
+  "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd";
+  "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf";
+  "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl";
+  "control-monad-failure" = dontDistribute super."control-monad-failure";
+  "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl";
+  "control-monad-omega" = dontDistribute super."control-monad-omega";
+  "control-monad-queue" = dontDistribute super."control-monad-queue";
+  "control-timeout" = dontDistribute super."control-timeout";
+  "contstuff" = dontDistribute super."contstuff";
+  "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf";
+  "contstuff-transformers" = dontDistribute super."contstuff-transformers";
+  "converge" = dontDistribute super."converge";
+  "conversion" = dontDistribute super."conversion";
+  "conversion-bytestring" = dontDistribute super."conversion-bytestring";
+  "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive";
+  "conversion-text" = dontDistribute super."conversion-text";
+  "convert" = dontDistribute super."convert";
+  "convertible-ascii" = dontDistribute super."convertible-ascii";
+  "convertible-text" = dontDistribute super."convertible-text";
+  "cookbook" = dontDistribute super."cookbook";
+  "coordinate" = dontDistribute super."coordinate";
+  "copilot" = dontDistribute super."copilot";
+  "copilot-c99" = dontDistribute super."copilot-c99";
+  "copilot-cbmc" = dontDistribute super."copilot-cbmc";
+  "copilot-core" = dontDistribute super."copilot-core";
+  "copilot-language" = dontDistribute super."copilot-language";
+  "copilot-libraries" = dontDistribute super."copilot-libraries";
+  "copilot-sbv" = dontDistribute super."copilot-sbv";
+  "copilot-theorem" = dontDistribute super."copilot-theorem";
+  "copr" = dontDistribute super."copr";
+  "core" = dontDistribute super."core";
+  "core-haskell" = dontDistribute super."core-haskell";
+  "corebot-bliki" = dontDistribute super."corebot-bliki";
+  "coroutine-enumerator" = dontDistribute super."coroutine-enumerator";
+  "coroutine-iteratee" = dontDistribute super."coroutine-iteratee";
+  "coroutine-object" = dontDistribute super."coroutine-object";
+  "couch-hs" = dontDistribute super."couch-hs";
+  "couch-simple" = dontDistribute super."couch-simple";
+  "couchdb-conduit" = dontDistribute super."couchdb-conduit";
+  "couchdb-enumerator" = dontDistribute super."couchdb-enumerator";
+  "count" = dontDistribute super."count";
+  "countable" = dontDistribute super."countable";
+  "counter" = dontDistribute super."counter";
+  "court" = dontDistribute super."court";
+  "coverage" = dontDistribute super."coverage";
+  "cpio-conduit" = dontDistribute super."cpio-conduit";
+  "cplex-hs" = dontDistribute super."cplex-hs";
+  "cplusplus-th" = dontDistribute super."cplusplus-th";
+  "cpphs" = doDistribute super."cpphs_1_19_3";
+  "cprng-aes-effect" = dontDistribute super."cprng-aes-effect";
+  "cpsa" = dontDistribute super."cpsa";
+  "cpuid" = dontDistribute super."cpuid";
+  "cpuperf" = dontDistribute super."cpuperf";
+  "cpython" = dontDistribute super."cpython";
+  "cqrs" = dontDistribute super."cqrs";
+  "cqrs-core" = dontDistribute super."cqrs-core";
+  "cqrs-example" = dontDistribute super."cqrs-example";
+  "cqrs-memory" = dontDistribute super."cqrs-memory";
+  "cqrs-postgresql" = dontDistribute super."cqrs-postgresql";
+  "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3";
+  "cqrs-test" = dontDistribute super."cqrs-test";
+  "cqrs-testkit" = dontDistribute super."cqrs-testkit";
+  "cqrs-types" = dontDistribute super."cqrs-types";
+  "cr" = dontDistribute super."cr";
+  "crack" = dontDistribute super."crack";
+  "craftwerk" = dontDistribute super."craftwerk";
+  "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
+  "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
+  "crc16" = dontDistribute super."crc16";
+  "crc16-table" = dontDistribute super."crc16-table";
+  "creatur" = dontDistribute super."creatur";
+  "crf-chain1" = dontDistribute super."crf-chain1";
+  "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained";
+  "crf-chain2-generic" = dontDistribute super."crf-chain2-generic";
+  "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers";
+  "critbit" = dontDistribute super."critbit";
+  "criterion-plus" = dontDistribute super."criterion-plus";
+  "criterion-to-html" = dontDistribute super."criterion-to-html";
+  "crockford" = dontDistribute super."crockford";
+  "crocodile" = dontDistribute super."crocodile";
+  "cron" = doDistribute super."cron_0_3_2";
+  "cron-compat" = dontDistribute super."cron-compat";
+  "cruncher-types" = dontDistribute super."cruncher-types";
+  "crunghc" = dontDistribute super."crunghc";
+  "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks";
+  "crypto-classical" = dontDistribute super."crypto-classical";
+  "crypto-conduit" = dontDistribute super."crypto-conduit";
+  "crypto-enigma" = dontDistribute super."crypto-enigma";
+  "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh";
+  "crypto-random-effect" = dontDistribute super."crypto-random-effect";
+  "crypto-totp" = dontDistribute super."crypto-totp";
+  "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
+  "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
+  "cryptonite-openssl" = dontDistribute super."cryptonite-openssl";
+  "cryptsy-api" = dontDistribute super."cryptsy-api";
+  "crystalfontz" = dontDistribute super."crystalfontz";
+  "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin";
+  "csound-catalog" = dontDistribute super."csound-catalog";
+  "csound-expression" = dontDistribute super."csound-expression";
+  "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic";
+  "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes";
+  "csound-expression-typed" = dontDistribute super."csound-expression-typed";
+  "csound-sampler" = dontDistribute super."csound-sampler";
+  "csp" = dontDistribute super."csp";
+  "cspmchecker" = dontDistribute super."cspmchecker";
+  "css" = dontDistribute super."css";
+  "csv-enumerator" = dontDistribute super."csv-enumerator";
+  "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
+  "csv-to-qif" = dontDistribute super."csv-to-qif";
+  "ctemplate" = dontDistribute super."ctemplate";
+  "ctkl" = dontDistribute super."ctkl";
+  "ctpl" = dontDistribute super."ctpl";
+  "ctrie" = doDistribute super."ctrie_0_1_0_3";
+  "cube" = dontDistribute super."cube";
+  "cubical" = dontDistribute super."cubical";
+  "cubicbezier" = dontDistribute super."cubicbezier";
+  "cublas" = dontDistribute super."cublas";
+  "cuboid" = dontDistribute super."cuboid";
+  "cuda" = dontDistribute super."cuda";
+  "cudd" = dontDistribute super."cudd";
+  "cufft" = dontDistribute super."cufft";
+  "curl-aeson" = dontDistribute super."curl-aeson";
+  "curlhs" = dontDistribute super."curlhs";
+  "currency" = dontDistribute super."currency";
+  "current-locale" = dontDistribute super."current-locale";
+  "curry-base" = dontDistribute super."curry-base";
+  "curry-frontend" = dontDistribute super."curry-frontend";
+  "cursedcsv" = dontDistribute super."cursedcsv";
+  "curve25519" = dontDistribute super."curve25519";
+  "curves" = dontDistribute super."curves";
+  "custom-prelude" = dontDistribute super."custom-prelude";
+  "cv-combinators" = dontDistribute super."cv-combinators";
+  "cyclotomic" = dontDistribute super."cyclotomic";
+  "cypher" = dontDistribute super."cypher";
+  "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
+  "d3js" = dontDistribute super."d3js";
+  "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
+  "daemons" = dontDistribute super."daemons";
+  "dag" = dontDistribute super."dag";
+  "damnpacket" = dontDistribute super."damnpacket";
+  "danibot" = dontDistribute super."danibot";
+  "dao" = dontDistribute super."dao";
+  "dapi" = dontDistribute super."dapi";
+  "darcs" = doDistribute super."darcs_2_10_3";
+  "darcs-benchmark" = dontDistribute super."darcs-benchmark";
+  "darcs-beta" = dontDistribute super."darcs-beta";
+  "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
+  "darcs-cabalized" = dontDistribute super."darcs-cabalized";
+  "darcs-fastconvert" = dontDistribute super."darcs-fastconvert";
+  "darcs-graph" = dontDistribute super."darcs-graph";
+  "darcs-monitor" = dontDistribute super."darcs-monitor";
+  "darcs-scripts" = dontDistribute super."darcs-scripts";
+  "darcs2dot" = dontDistribute super."darcs2dot";
+  "darcsden" = dontDistribute super."darcsden";
+  "darcswatch" = dontDistribute super."darcswatch";
+  "darkplaces-demo" = dontDistribute super."darkplaces-demo";
+  "darkplaces-rcon" = dontDistribute super."darkplaces-rcon";
+  "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
+  "darkplaces-text" = dontDistribute super."darkplaces-text";
+  "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib";
+  "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd";
+  "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf";
+  "data-accessor-template" = dontDistribute super."data-accessor-template";
+  "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
+  "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
+  "data-bword" = dontDistribute super."data-bword";
+  "data-carousel" = dontDistribute super."data-carousel";
+  "data-category" = dontDistribute super."data-category";
+  "data-cell" = dontDistribute super."data-cell";
+  "data-checked" = dontDistribute super."data-checked";
+  "data-clist" = dontDistribute super."data-clist";
+  "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
+  "data-construction" = dontDistribute super."data-construction";
+  "data-cycle" = dontDistribute super."data-cycle";
+  "data-default-extra" = dontDistribute super."data-default-extra";
+  "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-base" = doDistribute super."data-default-instances-base_0_0_1";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
+  "data-dispersal" = dontDistribute super."data-dispersal";
+  "data-dword" = dontDistribute super."data-dword";
+  "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
+  "data-endian" = dontDistribute super."data-endian";
+  "data-extend-generic" = dontDistribute super."data-extend-generic";
+  "data-extra" = dontDistribute super."data-extra";
+  "data-filepath" = dontDistribute super."data-filepath";
+  "data-fin" = dontDistribute super."data-fin";
+  "data-fin-simple" = dontDistribute super."data-fin-simple";
+  "data-fix" = dontDistribute super."data-fix";
+  "data-fix-cse" = dontDistribute super."data-fix-cse";
+  "data-flags" = dontDistribute super."data-flags";
+  "data-flagset" = dontDistribute super."data-flagset";
+  "data-fresh" = dontDistribute super."data-fresh";
+  "data-interval" = dontDistribute super."data-interval";
+  "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
+  "data-kiln" = dontDistribute super."data-kiln";
+  "data-layer" = dontDistribute super."data-layer";
+  "data-layout" = dontDistribute super."data-layout";
+  "data-lens" = dontDistribute super."data-lens";
+  "data-lens-fd" = dontDistribute super."data-lens-fd";
+  "data-lens-ixset" = dontDistribute super."data-lens-ixset";
+  "data-lens-template" = dontDistribute super."data-lens-template";
+  "data-list-sequences" = dontDistribute super."data-list-sequences";
+  "data-map-multikey" = dontDistribute super."data-map-multikey";
+  "data-named" = dontDistribute super."data-named";
+  "data-nat" = dontDistribute super."data-nat";
+  "data-object" = dontDistribute super."data-object";
+  "data-object-json" = dontDistribute super."data-object-json";
+  "data-object-yaml" = dontDistribute super."data-object-yaml";
+  "data-or" = dontDistribute super."data-or";
+  "data-partition" = dontDistribute super."data-partition";
+  "data-pprint" = dontDistribute super."data-pprint";
+  "data-quotientref" = dontDistribute super."data-quotientref";
+  "data-r-tree" = dontDistribute super."data-r-tree";
+  "data-ref" = dontDistribute super."data-ref";
+  "data-reify-cse" = dontDistribute super."data-reify-cse";
+  "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
+  "data-rev" = dontDistribute super."data-rev";
+  "data-rope" = dontDistribute super."data-rope";
+  "data-rtuple" = dontDistribute super."data-rtuple";
+  "data-size" = dontDistribute super."data-size";
+  "data-spacepart" = dontDistribute super."data-spacepart";
+  "data-store" = dontDistribute super."data-store";
+  "data-stringmap" = dontDistribute super."data-stringmap";
+  "data-structure-inferrer" = dontDistribute super."data-structure-inferrer";
+  "data-tensor" = dontDistribute super."data-tensor";
+  "data-textual" = dontDistribute super."data-textual";
+  "data-timeout" = dontDistribute super."data-timeout";
+  "data-transform" = dontDistribute super."data-transform";
+  "data-treify" = dontDistribute super."data-treify";
+  "data-type" = dontDistribute super."data-type";
+  "data-util" = dontDistribute super."data-util";
+  "data-variant" = dontDistribute super."data-variant";
+  "database-migrate" = dontDistribute super."database-migrate";
+  "database-study" = dontDistribute super."database-study";
+  "dataenc" = dontDistribute super."dataenc";
+  "dataflow" = dontDistribute super."dataflow";
+  "datalog" = dontDistribute super."datalog";
+  "datapacker" = dontDistribute super."datapacker";
+  "dataurl" = dontDistribute super."dataurl";
+  "date-cache" = dontDistribute super."date-cache";
+  "dates" = dontDistribute super."dates";
+  "datetime" = dontDistribute super."datetime";
+  "datetime-sb" = dontDistribute super."datetime-sb";
+  "dawdle" = dontDistribute super."dawdle";
+  "dawg" = dontDistribute super."dawg";
+  "dbcleaner" = dontDistribute super."dbcleaner";
+  "dbf" = dontDistribute super."dbf";
+  "dbjava" = dontDistribute super."dbjava";
+  "dbmigrations" = doDistribute super."dbmigrations_1_0";
+  "dbus-client" = dontDistribute super."dbus-client";
+  "dbus-core" = dontDistribute super."dbus-core";
+  "dbus-qq" = dontDistribute super."dbus-qq";
+  "dbus-th" = dontDistribute super."dbus-th";
+  "dbus-th-introspection" = dontDistribute super."dbus-th-introspection";
+  "dclabel" = dontDistribute super."dclabel";
+  "dclabel-eci11" = dontDistribute super."dclabel-eci11";
+  "ddc-base" = dontDistribute super."ddc-base";
+  "ddc-build" = dontDistribute super."ddc-build";
+  "ddc-code" = dontDistribute super."ddc-code";
+  "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
+  "ddc-core-eval" = dontDistribute super."ddc-core-eval";
+  "ddc-core-flow" = dontDistribute super."ddc-core-flow";
+  "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
+  "ddc-core-salt" = dontDistribute super."ddc-core-salt";
+  "ddc-core-simpl" = dontDistribute super."ddc-core-simpl";
+  "ddc-core-tetra" = dontDistribute super."ddc-core-tetra";
+  "ddc-driver" = dontDistribute super."ddc-driver";
+  "ddc-interface" = dontDistribute super."ddc-interface";
+  "ddc-source-tetra" = dontDistribute super."ddc-source-tetra";
+  "ddc-tools" = dontDistribute super."ddc-tools";
+  "ddc-war" = dontDistribute super."ddc-war";
+  "ddci-core" = dontDistribute super."ddci-core";
+  "dead-code-detection" = dontDistribute super."dead-code-detection";
+  "dead-simple-json" = dontDistribute super."dead-simple-json";
+  "debian-binary" = dontDistribute super."debian-binary";
+  "debian-build" = dontDistribute super."debian-build";
+  "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
+  "decepticons" = dontDistribute super."decepticons";
+  "decode-utf8" = dontDistribute super."decode-utf8";
+  "decoder-conduit" = dontDistribute super."decoder-conduit";
+  "dedukti" = dontDistribute super."dedukti";
+  "deepcontrol" = dontDistribute super."deepcontrol";
+  "deeplearning-hs" = dontDistribute super."deeplearning-hs";
+  "deepseq-bounded" = dontDistribute super."deepseq-bounded";
+  "deepseq-magic" = dontDistribute super."deepseq-magic";
+  "deepseq-th" = dontDistribute super."deepseq-th";
+  "deepzoom" = dontDistribute super."deepzoom";
+  "defargs" = dontDistribute super."defargs";
+  "definitive-base" = dontDistribute super."definitive-base";
+  "definitive-filesystem" = dontDistribute super."definitive-filesystem";
+  "definitive-graphics" = dontDistribute super."definitive-graphics";
+  "definitive-parser" = dontDistribute super."definitive-parser";
+  "definitive-reactive" = dontDistribute super."definitive-reactive";
+  "definitive-sound" = dontDistribute super."definitive-sound";
+  "deiko-config" = dontDistribute super."deiko-config";
+  "dejafu" = doDistribute super."dejafu_0_2_0_0";
+  "deka" = dontDistribute super."deka";
+  "deka-tests" = dontDistribute super."deka-tests";
+  "delaunay" = dontDistribute super."delaunay";
+  "delay" = dontDistribute super."delay";
+  "delicious" = dontDistribute super."delicious";
+  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
+  "delta" = dontDistribute super."delta";
+  "delta-h" = dontDistribute super."delta-h";
+  "demarcate" = dontDistribute super."demarcate";
+  "denominate" = dontDistribute super."denominate";
+  "dependent-state" = dontDistribute super."dependent-state";
+  "depends" = dontDistribute super."depends";
+  "dephd" = dontDistribute super."dephd";
+  "dequeue" = dontDistribute super."dequeue";
+  "derangement" = dontDistribute super."derangement";
+  "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive-IG" = dontDistribute super."derive-IG";
+  "derive-enumerable" = dontDistribute super."derive-enumerable";
+  "derive-gadt" = dontDistribute super."derive-gadt";
+  "derive-monoid" = dontDistribute super."derive-monoid";
+  "derive-topdown" = dontDistribute super."derive-topdown";
+  "derive-trie" = dontDistribute super."derive-trie";
+  "deriving-compat" = dontDistribute super."deriving-compat";
+  "derp" = dontDistribute super."derp";
+  "derp-lib" = dontDistribute super."derp-lib";
+  "descrilo" = dontDistribute super."descrilo";
+  "despair" = dontDistribute super."despair";
+  "deterministic-game-engine" = dontDistribute super."deterministic-game-engine";
+  "detrospector" = dontDistribute super."detrospector";
+  "deunicode" = dontDistribute super."deunicode";
+  "devil" = dontDistribute super."devil";
+  "dewdrop" = dontDistribute super."dewdrop";
+  "dfrac" = dontDistribute super."dfrac";
+  "dfsbuild" = dontDistribute super."dfsbuild";
+  "dgim" = dontDistribute super."dgim";
+  "dgs" = dontDistribute super."dgs";
+  "dia-base" = dontDistribute super."dia-base";
+  "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
+  "diagrams-canvas" = doDistribute super."diagrams-canvas_1_3_0_3";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_9";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_6";
+  "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
+  "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
+  "diagrams-lib" = doDistribute super."diagrams-lib_1_3_1_1";
+  "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
+  "diagrams-pdf" = dontDistribute super."diagrams-pdf";
+  "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
+  "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
+  "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-tikz" = dontDistribute super."diagrams-tikz";
+  "diagrams-wx" = dontDistribute super."diagrams-wx";
+  "dialog" = dontDistribute super."dialog";
+  "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
+  "dicom" = dontDistribute super."dicom";
+  "dictparser" = dontDistribute super."dictparser";
+  "diet" = dontDistribute super."diet";
+  "diff-gestalt" = dontDistribute super."diff-gestalt";
+  "diff-parse" = dontDistribute super."diff-parse";
+  "diffarray" = dontDistribute super."diffarray";
+  "diffcabal" = dontDistribute super."diffcabal";
+  "diffdump" = dontDistribute super."diffdump";
+  "digamma" = dontDistribute super."digamma";
+  "digest-pure" = dontDistribute super."digest-pure";
+  "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
+  "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
+  "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp";
+  "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty";
+  "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
+  "digit" = dontDistribute super."digit";
+  "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
+  "dimensional-tf" = dontDistribute super."dimensional-tf";
+  "dingo-core" = dontDistribute super."dingo-core";
+  "dingo-example" = dontDistribute super."dingo-example";
+  "dingo-widgets" = dontDistribute super."dingo-widgets";
+  "diophantine" = dontDistribute super."diophantine";
+  "diplomacy" = dontDistribute super."diplomacy";
+  "diplomacy-server" = dontDistribute super."diplomacy-server";
+  "direct-binary-files" = dontDistribute super."direct-binary-files";
+  "direct-daemonize" = dontDistribute super."direct-daemonize";
+  "direct-fastcgi" = dontDistribute super."direct-fastcgi";
+  "direct-http" = dontDistribute super."direct-http";
+  "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
+  "direct-plugins" = dontDistribute super."direct-plugins";
+  "directed-cubical" = dontDistribute super."directed-cubical";
+  "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
+  "dirfiles" = dontDistribute super."dirfiles";
+  "dirstream" = dontDistribute super."dirstream";
+  "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
+  "discordian-calendar" = dontDistribute super."discordian-calendar";
+  "discount" = dontDistribute super."discount";
+  "discrete-space-map" = dontDistribute super."discrete-space-map";
+  "discrimination" = dontDistribute super."discrimination";
+  "disjoint-set" = dontDistribute super."disjoint-set";
+  "disjoint-sets-st" = dontDistribute super."disjoint-sets-st";
+  "dist-upload" = dontDistribute super."dist-upload";
+  "distributed-closure" = dontDistribute super."distributed-closure";
+  "distributed-process" = doDistribute super."distributed-process_0_5_5_1";
+  "distributed-process-async" = dontDistribute super."distributed-process-async";
+  "distributed-process-azure" = dontDistribute super."distributed-process-azure";
+  "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
+  "distributed-process-execution" = dontDistribute super."distributed-process-execution";
+  "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
+  "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
+  "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
+  "distributed-process-platform" = dontDistribute super."distributed-process-platform";
+  "distributed-process-registry" = dontDistribute super."distributed-process-registry";
+  "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet";
+  "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor";
+  "distributed-process-task" = dontDistribute super."distributed-process-task";
+  "distributed-process-tests" = dontDistribute super."distributed-process-tests";
+  "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
+  "distribution" = dontDistribute super."distribution";
+  "distribution-plot" = dontDistribute super."distribution-plot";
+  "dixi" = doDistribute super."dixi_0_6_0_5";
+  "djembe" = dontDistribute super."djembe";
+  "djinn" = dontDistribute super."djinn";
+  "djinn-th" = dontDistribute super."djinn-th";
+  "dnscache" = dontDistribute super."dnscache";
+  "dnsrbl" = dontDistribute super."dnsrbl";
+  "dnssd" = dontDistribute super."dnssd";
+  "doc-review" = dontDistribute super."doc-review";
+  "doccheck" = dontDistribute super."doccheck";
+  "docidx" = dontDistribute super."docidx";
+  "docker" = dontDistribute super."docker";
+  "dockercook" = dontDistribute super."dockercook";
+  "doctest" = doDistribute super."doctest_0_10_1";
+  "doctest-discover" = dontDistribute super."doctest-discover";
+  "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
+  "doctest-prop" = dontDistribute super."doctest-prop";
+  "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
+  "dom-selector" = dontDistribute super."dom-selector";
+  "domain-auth" = dontDistribute super."domain-auth";
+  "dominion" = dontDistribute super."dominion";
+  "domplate" = dontDistribute super."domplate";
+  "dot2graphml" = dontDistribute super."dot2graphml";
+  "dotenv" = doDistribute super."dotenv_0_1_0_9";
+  "dotfs" = dontDistribute super."dotfs";
+  "dotgen" = dontDistribute super."dotgen";
+  "dotnet-timespan" = dontDistribute super."dotnet-timespan";
+  "double-metaphone" = dontDistribute super."double-metaphone";
+  "dove" = dontDistribute super."dove";
+  "dow" = dontDistribute super."dow";
+  "download" = dontDistribute super."download";
+  "download-curl" = dontDistribute super."download-curl";
+  "download-media-content" = dontDistribute super."download-media-content";
+  "dozenal" = dontDistribute super."dozenal";
+  "dozens" = dontDistribute super."dozens";
+  "dph-base" = dontDistribute super."dph-base";
+  "dph-examples" = dontDistribute super."dph-examples";
+  "dph-lifted-base" = dontDistribute super."dph-lifted-base";
+  "dph-lifted-copy" = dontDistribute super."dph-lifted-copy";
+  "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg";
+  "dph-par" = dontDistribute super."dph-par";
+  "dph-prim-interface" = dontDistribute super."dph-prim-interface";
+  "dph-prim-par" = dontDistribute super."dph-prim-par";
+  "dph-prim-seq" = dontDistribute super."dph-prim-seq";
+  "dph-seq" = dontDistribute super."dph-seq";
+  "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
+  "drClickOn" = dontDistribute super."drClickOn";
+  "draw-poker" = dontDistribute super."draw-poker";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "dropbox-sdk" = dontDistribute super."dropbox-sdk";
+  "dropsolve" = dontDistribute super."dropsolve";
+  "ds-kanren" = dontDistribute super."ds-kanren";
+  "dsh-sql" = dontDistribute super."dsh-sql";
+  "dsmc" = dontDistribute super."dsmc";
+  "dsmc-tools" = dontDistribute super."dsmc-tools";
+  "dson" = dontDistribute super."dson";
+  "dson-parsec" = dontDistribute super."dson-parsec";
+  "dsp" = dontDistribute super."dsp";
+  "dstring" = dontDistribute super."dstring";
+  "dtab" = dontDistribute super."dtab";
+  "dtd" = dontDistribute super."dtd";
+  "dtd-text" = dontDistribute super."dtd-text";
+  "dtd-types" = dontDistribute super."dtd-types";
+  "dtrace" = dontDistribute super."dtrace";
+  "dtw" = dontDistribute super."dtw";
+  "dump" = dontDistribute super."dump";
+  "duplo" = dontDistribute super."duplo";
+  "dvda" = dontDistribute super."dvda";
+  "dvdread" = dontDistribute super."dvdread";
+  "dvi-processing" = dontDistribute super."dvi-processing";
+  "dvorak" = dontDistribute super."dvorak";
+  "dwarf" = dontDistribute super."dwarf";
+  "dwarf-el" = dontDistribute super."dwarf-el";
+  "dwarfadt" = dontDistribute super."dwarfadt";
+  "dx9base" = dontDistribute super."dx9base";
+  "dx9d3d" = dontDistribute super."dx9d3d";
+  "dx9d3dx" = dontDistribute super."dx9d3dx";
+  "dynamic-cabal" = dontDistribute super."dynamic-cabal";
+  "dynamic-graph" = dontDistribute super."dynamic-graph";
+  "dynamic-linker-template" = dontDistribute super."dynamic-linker-template";
+  "dynamic-loader" = dontDistribute super."dynamic-loader";
+  "dynamic-mvector" = dontDistribute super."dynamic-mvector";
+  "dynamic-object" = dontDistribute super."dynamic-object";
+  "dynamic-plot" = dontDistribute super."dynamic-plot";
+  "dynamic-pp" = dontDistribute super."dynamic-pp";
+  "dynobud" = dontDistribute super."dynobud";
+  "dywapitchtrack" = dontDistribute super."dywapitchtrack";
+  "dzen-utils" = dontDistribute super."dzen-utils";
+  "eager-sockets" = dontDistribute super."eager-sockets";
+  "easy-api" = dontDistribute super."easy-api";
+  "easy-bitcoin" = dontDistribute super."easy-bitcoin";
+  "easyjson" = dontDistribute super."easyjson";
+  "easyplot" = dontDistribute super."easyplot";
+  "easyrender" = dontDistribute super."easyrender";
+  "ebeats" = dontDistribute super."ebeats";
+  "ebnf-bff" = dontDistribute super."ebnf-bff";
+  "ec2-signature" = dontDistribute super."ec2-signature";
+  "ecdsa" = dontDistribute super."ecdsa";
+  "ecma262" = dontDistribute super."ecma262";
+  "ecu" = dontDistribute super."ecu";
+  "ed25519" = dontDistribute super."ed25519";
+  "ed25519-donna" = dontDistribute super."ed25519-donna";
+  "eddie" = dontDistribute super."eddie";
+  "edenmodules" = dontDistribute super."edenmodules";
+  "edenskel" = dontDistribute super."edenskel";
+  "edentv" = dontDistribute super."edentv";
+  "edge" = dontDistribute super."edge";
+  "edis" = dontDistribute super."edis";
+  "edit-lenses" = dontDistribute super."edit-lenses";
+  "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
+  "editable" = dontDistribute super."editable";
+  "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_7";
+  "effect-monad" = dontDistribute super."effect-monad";
+  "effective-aspects" = dontDistribute super."effective-aspects";
+  "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
+  "effects" = dontDistribute super."effects";
+  "effects-parser" = dontDistribute super."effects-parser";
+  "effin" = dontDistribute super."effin";
+  "egison" = dontDistribute super."egison";
+  "egison-quote" = dontDistribute super."egison-quote";
+  "egison-tutorial" = dontDistribute super."egison-tutorial";
+  "ehaskell" = dontDistribute super."ehaskell";
+  "ehs" = dontDistribute super."ehs";
+  "eibd-client-simple" = dontDistribute super."eibd-client-simple";
+  "eigen" = dontDistribute super."eigen";
+  "eithers" = dontDistribute super."eithers";
+  "ekg-bosun" = dontDistribute super."ekg-bosun";
+  "ekg-carbon" = dontDistribute super."ekg-carbon";
+  "ekg-log" = dontDistribute super."ekg-log";
+  "ekg-push" = dontDistribute super."ekg-push";
+  "ekg-rrd" = dontDistribute super."ekg-rrd";
+  "ekg-statsd" = dontDistribute super."ekg-statsd";
+  "electrum-mnemonic" = dontDistribute super."electrum-mnemonic";
+  "elerea" = dontDistribute super."elerea";
+  "elerea-examples" = dontDistribute super."elerea-examples";
+  "elerea-sdl" = dontDistribute super."elerea-sdl";
+  "elevator" = dontDistribute super."elevator";
+  "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
+  "elm-bridge" = doDistribute super."elm-bridge_0_2_1_1";
+  "elm-build-lib" = dontDistribute super."elm-build-lib";
+  "elm-compiler" = dontDistribute super."elm-compiler";
+  "elm-get" = dontDistribute super."elm-get";
+  "elm-init" = dontDistribute super."elm-init";
+  "elm-make" = dontDistribute super."elm-make";
+  "elm-package" = dontDistribute super."elm-package";
+  "elm-reactor" = dontDistribute super."elm-reactor";
+  "elm-repl" = dontDistribute super."elm-repl";
+  "elm-server" = dontDistribute super."elm-server";
+  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
+  "elocrypt" = dontDistribute super."elocrypt";
+  "emacs-keys" = dontDistribute super."emacs-keys";
+  "email" = dontDistribute super."email";
+  "email-header" = dontDistribute super."email-header";
+  "email-postmark" = dontDistribute super."email-postmark";
+  "email-validator" = dontDistribute super."email-validator";
+  "embeddock" = dontDistribute super."embeddock";
+  "embeddock-example" = dontDistribute super."embeddock-example";
+  "embroidery" = dontDistribute super."embroidery";
+  "emgm" = dontDistribute super."emgm";
+  "empty" = dontDistribute super."empty";
+  "encoding" = dontDistribute super."encoding";
+  "endo" = dontDistribute super."endo";
+  "engine-io-growler" = dontDistribute super."engine-io-growler";
+  "engine-io-snap" = dontDistribute super."engine-io-snap";
+  "engineering-units" = dontDistribute super."engineering-units";
+  "enumerable" = dontDistribute super."enumerable";
+  "enumerate" = dontDistribute super."enumerate";
+  "enumeration" = dontDistribute super."enumeration";
+  "enumerator-fd" = dontDistribute super."enumerator-fd";
+  "enumerator-tf" = dontDistribute super."enumerator-tf";
+  "enumfun" = dontDistribute super."enumfun";
+  "enummapmap" = dontDistribute super."enummapmap";
+  "enummapset" = dontDistribute super."enummapset";
+  "enummapset-th" = dontDistribute super."enummapset-th";
+  "enumset" = dontDistribute super."enumset";
+  "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
+  "envparse" = dontDistribute super."envparse";
+  "epanet-haskell" = dontDistribute super."epanet-haskell";
+  "epass" = dontDistribute super."epass";
+  "epic" = dontDistribute super."epic";
+  "epoll" = dontDistribute super."epoll";
+  "eprocess" = dontDistribute super."eprocess";
+  "epub" = dontDistribute super."epub";
+  "epub-metadata" = dontDistribute super."epub-metadata";
+  "epub-tools" = dontDistribute super."epub-tools";
+  "epubname" = dontDistribute super."epubname";
+  "equal-files" = dontDistribute super."equal-files";
+  "equational-reasoning" = dontDistribute super."equational-reasoning";
+  "erd" = dontDistribute super."erd";
+  "erf-native" = dontDistribute super."erf-native";
+  "erlang" = dontDistribute super."erlang";
+  "eros" = dontDistribute super."eros";
+  "eros-client" = dontDistribute super."eros-client";
+  "eros-http" = dontDistribute super."eros-http";
+  "errno" = dontDistribute super."errno";
+  "error-analyze" = dontDistribute super."error-analyze";
+  "error-continuations" = dontDistribute super."error-continuations";
+  "error-list" = dontDistribute super."error-list";
+  "error-loc" = dontDistribute super."error-loc";
+  "error-location" = dontDistribute super."error-location";
+  "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
+  "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "ersatz" = dontDistribute super."ersatz";
+  "ersatz-toysat" = dontDistribute super."ersatz-toysat";
+  "ert" = dontDistribute super."ert";
+  "esotericbot" = dontDistribute super."esotericbot";
+  "ess" = dontDistribute super."ess";
+  "estimator" = dontDistribute super."estimator";
+  "estimators" = dontDistribute super."estimators";
+  "estreps" = dontDistribute super."estreps";
+  "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
+  "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
+  "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
+  "ethereum-rlp" = dontDistribute super."ethereum-rlp";
+  "ety" = dontDistribute super."ety";
+  "euler" = dontDistribute super."euler";
+  "euphoria" = dontDistribute super."euphoria";
+  "eurofxref" = dontDistribute super."eurofxref";
+  "event-driven" = dontDistribute super."event-driven";
+  "event-handlers" = dontDistribute super."event-handlers";
+  "event-list" = dontDistribute super."event-list";
+  "event-monad" = dontDistribute super."event-monad";
+  "eventloop" = dontDistribute super."eventloop";
+  "eventstore" = doDistribute super."eventstore_0_10_0_2";
+  "every-bit-counts" = dontDistribute super."every-bit-counts";
+  "ewe" = dontDistribute super."ewe";
+  "ex-pool" = dontDistribute super."ex-pool";
+  "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exception-hierarchy" = dontDistribute super."exception-hierarchy";
+  "exception-mailer" = dontDistribute super."exception-mailer";
+  "exception-monads-fd" = dontDistribute super."exception-monads-fd";
+  "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-mtl" = dontDistribute super."exception-mtl";
+  "exherbo-cabal" = dontDistribute super."exherbo-cabal";
+  "exif" = dontDistribute super."exif";
+  "exinst" = dontDistribute super."exinst";
+  "exinst-aeson" = dontDistribute super."exinst-aeson";
+  "exinst-bytes" = dontDistribute super."exinst-bytes";
+  "exinst-deepseq" = dontDistribute super."exinst-deepseq";
+  "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
+  "exists" = dontDistribute super."exists";
+  "exit-codes" = dontDistribute super."exit-codes";
+  "exp-extended" = dontDistribute super."exp-extended";
+  "exp-pairs" = dontDistribute super."exp-pairs";
+  "expand" = dontDistribute super."expand";
+  "expat-enumerator" = dontDistribute super."expat-enumerator";
+  "expiring-mvar" = dontDistribute super."expiring-mvar";
+  "explain" = dontDistribute super."explain";
+  "explicit-determinant" = dontDistribute super."explicit-determinant";
+  "explicit-iomodes" = dontDistribute super."explicit-iomodes";
+  "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring";
+  "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text";
+  "explicit-sharing" = dontDistribute super."explicit-sharing";
+  "explore" = dontDistribute super."explore";
+  "exposed-containers" = dontDistribute super."exposed-containers";
+  "expression-parser" = dontDistribute super."expression-parser";
+  "extcore" = dontDistribute super."extcore";
+  "extemp" = dontDistribute super."extemp";
+  "extended-categories" = dontDistribute super."extended-categories";
+  "extended-reals" = dontDistribute super."extended-reals";
+  "extensible" = dontDistribute super."extensible";
+  "extensible-data" = dontDistribute super."extensible-data";
+  "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_3";
+  "extractelf" = dontDistribute super."extractelf";
+  "ez-couch" = dontDistribute super."ez-couch";
+  "faceted" = dontDistribute super."faceted";
+  "factory" = dontDistribute super."factory";
+  "factual-api" = dontDistribute super."factual-api";
+  "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
+  "failable-list" = dontDistribute super."failable-list";
+  "failure" = dontDistribute super."failure";
+  "fair-predicates" = dontDistribute super."fair-predicates";
+  "fake-type" = dontDistribute super."fake-type";
+  "faker" = dontDistribute super."faker";
+  "falling-turnip" = dontDistribute super."falling-turnip";
+  "fallingblocks" = dontDistribute super."fallingblocks";
+  "family-tree" = dontDistribute super."family-tree";
+  "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_5";
+  "fast-math" = dontDistribute super."fast-math";
+  "fast-tags" = dontDistribute super."fast-tags";
+  "fast-tagsoup" = dontDistribute super."fast-tagsoup";
+  "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only";
+  "fastbayes" = dontDistribute super."fastbayes";
+  "fastcgi" = dontDistribute super."fastcgi";
+  "fastedit" = dontDistribute super."fastedit";
+  "fastirc" = dontDistribute super."fastirc";
+  "fault-tree" = dontDistribute super."fault-tree";
+  "fay-geoposition" = dontDistribute super."fay-geoposition";
+  "fay-hsx" = dontDistribute super."fay-hsx";
+  "fay-ref" = dontDistribute super."fay-ref";
+  "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
+  "fcd" = dontDistribute super."fcd";
+  "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
+  "fdo-trash" = dontDistribute super."fdo-trash";
+  "fec" = dontDistribute super."fec";
+  "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed-cli" = dontDistribute super."feed-cli";
+  "feed-collect" = dontDistribute super."feed-collect";
+  "feed-crawl" = dontDistribute super."feed-crawl";
+  "feed-translator" = dontDistribute super."feed-translator";
+  "feed2lj" = dontDistribute super."feed2lj";
+  "feed2twitter" = dontDistribute super."feed2twitter";
+  "feldspar-compiler" = dontDistribute super."feldspar-compiler";
+  "feldspar-language" = dontDistribute super."feldspar-language";
+  "feldspar-signal" = dontDistribute super."feldspar-signal";
+  "fen2s" = dontDistribute super."fen2s";
+  "fences" = dontDistribute super."fences";
+  "fenfire" = dontDistribute super."fenfire";
+  "fez-conf" = dontDistribute super."fez-conf";
+  "ffeed" = dontDistribute super."ffeed";
+  "fficxx" = dontDistribute super."fficxx";
+  "fficxx-runtime" = dontDistribute super."fficxx-runtime";
+  "ffmpeg-light" = dontDistribute super."ffmpeg-light";
+  "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials";
+  "fftwRaw" = dontDistribute super."fftwRaw";
+  "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions";
+  "fgl-visualize" = dontDistribute super."fgl-visualize";
+  "fibon" = dontDistribute super."fibon";
+  "fibonacci" = dontDistribute super."fibonacci";
+  "fields" = dontDistribute super."fields";
+  "fields-json" = dontDistribute super."fields-json";
+  "fieldwise" = dontDistribute super."fieldwise";
+  "fig" = dontDistribute super."fig";
+  "file-collection" = dontDistribute super."file-collection";
+  "file-command-qq" = dontDistribute super."file-command-qq";
+  "filediff" = dontDistribute super."filediff";
+  "filepath-io-access" = dontDistribute super."filepath-io-access";
+  "filepather" = dontDistribute super."filepather";
+  "filestore" = dontDistribute super."filestore";
+  "filesystem-conduit" = dontDistribute super."filesystem-conduit";
+  "filesystem-enumerator" = dontDistribute super."filesystem-enumerator";
+  "filesystem-trees" = dontDistribute super."filesystem-trees";
+  "filtrable" = dontDistribute super."filtrable";
+  "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
+  "find-conduit" = dontDistribute super."find-conduit";
+  "fingertree-tf" = dontDistribute super."fingertree-tf";
+  "finite-field" = dontDistribute super."finite-field";
+  "finite-typelits" = dontDistribute super."finite-typelits";
+  "first-and-last" = dontDistribute super."first-and-last";
+  "first-class-patterns" = dontDistribute super."first-class-patterns";
+  "firstify" = dontDistribute super."firstify";
+  "fishfood" = dontDistribute super."fishfood";
+  "fit" = dontDistribute super."fit";
+  "fitsio" = dontDistribute super."fitsio";
+  "fix-imports" = dontDistribute super."fix-imports";
+  "fix-parser-simple" = dontDistribute super."fix-parser-simple";
+  "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit";
+  "fixed-length" = dontDistribute super."fixed-length";
+  "fixed-point" = dontDistribute super."fixed-point";
+  "fixed-point-vector" = dontDistribute super."fixed-point-vector";
+  "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space";
+  "fixed-precision" = dontDistribute super."fixed-precision";
+  "fixed-storable-array" = dontDistribute super."fixed-storable-array";
+  "fixed-vector-binary" = dontDistribute super."fixed-vector-binary";
+  "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
+  "fixedprec" = dontDistribute super."fixedprec";
+  "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
+  "fixhs" = dontDistribute super."fixhs";
+  "fixplate" = dontDistribute super."fixplate";
+  "fixpoint" = dontDistribute super."fixpoint";
+  "fixtime" = dontDistribute super."fixtime";
+  "fizz-buzz" = dontDistribute super."fizz-buzz";
+  "flaccuraterip" = dontDistribute super."flaccuraterip";
+  "flamethrower" = dontDistribute super."flamethrower";
+  "flamingra" = dontDistribute super."flamingra";
+  "flat-maybe" = dontDistribute super."flat-maybe";
+  "flat-mcmc" = dontDistribute super."flat-mcmc";
+  "flat-tex" = dontDistribute super."flat-tex";
+  "flexible-time" = dontDistribute super."flexible-time";
+  "flexible-unlit" = dontDistribute super."flexible-unlit";
+  "flexiwrap" = dontDistribute super."flexiwrap";
+  "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck";
+  "flickr" = dontDistribute super."flickr";
+  "flippers" = dontDistribute super."flippers";
+  "flite" = dontDistribute super."flite";
+  "flo" = dontDistribute super."flo";
+  "float-binstring" = dontDistribute super."float-binstring";
+  "floating-bits" = dontDistribute super."floating-bits";
+  "floatshow" = dontDistribute super."floatshow";
+  "flow2dot" = dontDistribute super."flow2dot";
+  "flowdock-api" = dontDistribute super."flowdock-api";
+  "flowdock-rest" = dontDistribute super."flowdock-rest";
+  "flower" = dontDistribute super."flower";
+  "flowlocks-framework" = dontDistribute super."flowlocks-framework";
+  "flowsim" = dontDistribute super."flowsim";
+  "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
+  "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
+  "fluent-logger" = dontDistribute super."fluent-logger";
+  "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
+  "fluidsynth" = dontDistribute super."fluidsynth";
+  "fmark" = dontDistribute super."fmark";
+  "fn" = doDistribute super."fn_0_2_0_2";
+  "fn-extra" = doDistribute super."fn-extra_0_2_0_1";
+  "fold-debounce" = dontDistribute super."fold-debounce";
+  "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_6";
+  "foldl-incremental" = dontDistribute super."foldl-incremental";
+  "foldl-transduce" = dontDistribute super."foldl-transduce";
+  "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
+  "folds" = dontDistribute super."folds";
+  "folds-common" = dontDistribute super."folds-common";
+  "follower" = dontDistribute super."follower";
+  "foma" = dontDistribute super."foma";
+  "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6";
+  "foo" = dontDistribute super."foo";
+  "for-free" = dontDistribute super."for-free";
+  "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
+  "fordo" = dontDistribute super."fordo";
+  "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
+  "foreign-var" = dontDistribute super."foreign-var";
+  "forger" = dontDistribute super."forger";
+  "forkable-monad" = dontDistribute super."forkable-monad";
+  "formal" = dontDistribute super."formal";
+  "format" = dontDistribute super."format";
+  "format-status" = dontDistribute super."format-status";
+  "formattable" = dontDistribute super."formattable";
+  "forml" = dontDistribute super."forml";
+  "formlets" = dontDistribute super."formlets";
+  "formlets-hsp" = dontDistribute super."formlets-hsp";
+  "formura" = dontDistribute super."formura";
+  "forth-hll" = dontDistribute super."forth-hll";
+  "foscam-directory" = dontDistribute super."foscam-directory";
+  "foscam-filename" = dontDistribute super."foscam-filename";
+  "foscam-sort" = dontDistribute super."foscam-sort";
+  "fountain" = dontDistribute super."fountain";
+  "fpco-api" = dontDistribute super."fpco-api";
+  "fpipe" = dontDistribute super."fpipe";
+  "fpnla" = dontDistribute super."fpnla";
+  "fpnla-examples" = dontDistribute super."fpnla-examples";
+  "fptest" = dontDistribute super."fptest";
+  "fquery" = dontDistribute super."fquery";
+  "fractal" = dontDistribute super."fractal";
+  "fractals" = dontDistribute super."fractals";
+  "fraction" = dontDistribute super."fraction";
+  "frag" = dontDistribute super."frag";
+  "frame" = dontDistribute super."frame";
+  "frame-markdown" = dontDistribute super."frame-markdown";
+  "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
+  "free-concurrent" = dontDistribute super."free-concurrent";
+  "free-functors" = dontDistribute super."free-functors";
+  "free-game" = dontDistribute super."free-game";
+  "free-http" = dontDistribute super."free-http";
+  "free-operational" = dontDistribute super."free-operational";
+  "free-theorems" = dontDistribute super."free-theorems";
+  "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples";
+  "free-theorems-seq" = dontDistribute super."free-theorems-seq";
+  "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
+  "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
+  "freekick2" = dontDistribute super."freekick2";
+  "freer" = dontDistribute super."freer";
+  "freesect" = dontDistribute super."freesect";
+  "freesound" = dontDistribute super."freesound";
+  "freetype-simple" = dontDistribute super."freetype-simple";
+  "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
+  "fresh" = dontDistribute super."fresh";
+  "friday" = dontDistribute super."friday";
+  "friday-devil" = dontDistribute super."friday-devil";
+  "friday-juicypixels" = dontDistribute super."friday-juicypixels";
+  "friday-scale-dct" = dontDistribute super."friday-scale-dct";
+  "friendly-time" = dontDistribute super."friendly-time";
+  "frown" = dontDistribute super."frown";
+  "frp-arduino" = dontDistribute super."frp-arduino";
+  "frpnow" = dontDistribute super."frpnow";
+  "frpnow-gloss" = dontDistribute super."frpnow-gloss";
+  "frpnow-gtk" = dontDistribute super."frpnow-gtk";
+  "frquotes" = dontDistribute super."frquotes";
+  "fs-events" = dontDistribute super."fs-events";
+  "fsharp" = dontDistribute super."fsharp";
+  "fsmActions" = dontDistribute super."fsmActions";
+  "fst" = dontDistribute super."fst";
+  "fsutils" = dontDistribute super."fsutils";
+  "fswatcher" = dontDistribute super."fswatcher";
+  "ftdi" = dontDistribute super."ftdi";
+  "ftp-conduit" = dontDistribute super."ftp-conduit";
+  "ftphs" = dontDistribute super."ftphs";
+  "ftree" = dontDistribute super."ftree";
+  "ftshell" = dontDistribute super."ftshell";
+  "fugue" = dontDistribute super."fugue";
+  "full-sessions" = dontDistribute super."full-sessions";
+  "full-text-search" = dontDistribute super."full-text-search";
+  "fullstop" = dontDistribute super."fullstop";
+  "funbot" = dontDistribute super."funbot";
+  "funbot-client" = dontDistribute super."funbot-client";
+  "funbot-ext-events" = dontDistribute super."funbot-ext-events";
+  "funbot-git-hook" = dontDistribute super."funbot-git-hook";
+  "funcons-tools" = dontDistribute super."funcons-tools";
+  "function-combine" = dontDistribute super."function-combine";
+  "function-instances-algebra" = dontDistribute super."function-instances-algebra";
+  "functional-arrow" = dontDistribute super."functional-arrow";
+  "functional-kmp" = dontDistribute super."functional-kmp";
+  "functor-apply" = dontDistribute super."functor-apply";
+  "functor-combo" = dontDistribute super."functor-combo";
+  "functor-infix" = dontDistribute super."functor-infix";
+  "functor-monadic" = dontDistribute super."functor-monadic";
+  "functor-utils" = dontDistribute super."functor-utils";
+  "functorm" = dontDistribute super."functorm";
+  "functors" = dontDistribute super."functors";
+  "funion" = dontDistribute super."funion";
+  "funpat" = dontDistribute super."funpat";
+  "funsat" = dontDistribute super."funsat";
+  "fusion" = dontDistribute super."fusion";
+  "futun" = dontDistribute super."futun";
+  "future" = dontDistribute super."future";
+  "future-resource" = dontDistribute super."future-resource";
+  "fuzzy" = dontDistribute super."fuzzy";
+  "fuzzy-timings" = dontDistribute super."fuzzy-timings";
+  "fuzzytime" = dontDistribute super."fuzzytime";
+  "fwgl" = dontDistribute super."fwgl";
+  "fwgl-glfw" = dontDistribute super."fwgl-glfw";
+  "fwgl-javascript" = dontDistribute super."fwgl-javascript";
+  "g-npm" = dontDistribute super."g-npm";
+  "gact" = dontDistribute super."gact";
+  "game-of-life" = dontDistribute super."game-of-life";
+  "game-probability" = dontDistribute super."game-probability";
+  "game-tree" = dontDistribute super."game-tree";
+  "gameclock" = dontDistribute super."gameclock";
+  "gamma" = dontDistribute super."gamma";
+  "gang-of-threads" = dontDistribute super."gang-of-threads";
+  "garepinoh" = dontDistribute super."garepinoh";
+  "garsia-wachs" = dontDistribute super."garsia-wachs";
+  "gbu" = dontDistribute super."gbu";
+  "gc" = dontDistribute super."gc";
+  "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai";
+  "gconf" = dontDistribute super."gconf";
+  "gdiff" = dontDistribute super."gdiff";
+  "gdiff-ig" = dontDistribute super."gdiff-ig";
+  "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
+  "gearbox" = dontDistribute super."gearbox";
+  "geek" = dontDistribute super."geek";
+  "geek-server" = dontDistribute super."geek-server";
+  "gelatin" = dontDistribute super."gelatin";
+  "gemstone" = dontDistribute super."gemstone";
+  "gencheck" = dontDistribute super."gencheck";
+  "gender" = dontDistribute super."gender";
+  "genders" = dontDistribute super."genders";
+  "general-prelude" = dontDistribute super."general-prelude";
+  "generator" = dontDistribute super."generator";
+  "generators" = dontDistribute super."generators";
+  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-binary" = dontDistribute super."generic-binary";
+  "generic-church" = dontDistribute super."generic-church";
+  "generic-deepseq" = dontDistribute super."generic-deepseq";
+  "generic-deriving" = doDistribute super."generic-deriving_1_9_0";
+  "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
+  "generic-maybe" = dontDistribute super."generic-maybe";
+  "generic-pretty" = dontDistribute super."generic-pretty";
+  "generic-server" = dontDistribute super."generic-server";
+  "generic-storable" = dontDistribute super."generic-storable";
+  "generic-tree" = dontDistribute super."generic-tree";
+  "generic-xml" = dontDistribute super."generic-xml";
+  "generics-sop-lens" = dontDistribute super."generics-sop-lens";
+  "genericserialize" = dontDistribute super."genericserialize";
+  "genetics" = dontDistribute super."genetics";
+  "geni-gui" = dontDistribute super."geni-gui";
+  "geni-util" = dontDistribute super."geni-util";
+  "geniconvert" = dontDistribute super."geniconvert";
+  "genifunctors" = dontDistribute super."genifunctors";
+  "geniplate" = dontDistribute super."geniplate";
+  "geniserver" = dontDistribute super."geniserver";
+  "genprog" = dontDistribute super."genprog";
+  "gentlemark" = dontDistribute super."gentlemark";
+  "geo-resolver" = dontDistribute super."geo-resolver";
+  "geo-uk" = dontDistribute super."geo-uk";
+  "geocalc" = dontDistribute super."geocalc";
+  "geocode-google" = dontDistribute super."geocode-google";
+  "geodetic" = dontDistribute super."geodetic";
+  "geodetics" = dontDistribute super."geodetics";
+  "geohash" = dontDistribute super."geohash";
+  "geoip2" = dontDistribute super."geoip2";
+  "geojson" = dontDistribute super."geojson";
+  "geom2d" = dontDistribute super."geom2d";
+  "getemx" = dontDistribute super."getemx";
+  "getflag" = dontDistribute super."getflag";
+  "getopt-simple" = dontDistribute super."getopt-simple";
+  "gf" = dontDistribute super."gf";
+  "ggtsTC" = dontDistribute super."ggtsTC";
+  "ghc-core" = dontDistribute super."ghc-core";
+  "ghc-core-html" = dontDistribute super."ghc-core-html";
+  "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
+  "ghc-dup" = dontDistribute super."ghc-dup";
+  "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
+  "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
+  "ghc-gc-tune" = dontDistribute super."ghc-gc-tune";
+  "ghc-generic-instances" = dontDistribute super."ghc-generic-instances";
+  "ghc-imported-from" = dontDistribute super."ghc-imported-from";
+  "ghc-make" = dontDistribute super."ghc-make";
+  "ghc-man-completion" = dontDistribute super."ghc-man-completion";
+  "ghc-options" = dontDistribute super."ghc-options";
+  "ghc-parmake" = dontDistribute super."ghc-parmake";
+  "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix";
+  "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib";
+  "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph";
+  "ghc-server" = dontDistribute super."ghc-server";
+  "ghc-simple" = dontDistribute super."ghc-simple";
+  "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
+  "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
+  "ghc-vis" = dontDistribute super."ghc-vis";
+  "ghci-diagrams" = dontDistribute super."ghci-diagrams";
+  "ghci-haskeline" = dontDistribute super."ghci-haskeline";
+  "ghci-lib" = dontDistribute super."ghci-lib";
+  "ghci-ng" = dontDistribute super."ghci-ng";
+  "ghci-pretty" = dontDistribute super."ghci-pretty";
+  "ghcid" = doDistribute super."ghcid_0_5_1";
+  "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
+  "ghcjs-dom" = dontDistribute super."ghcjs-dom";
+  "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
+  "ghcjs-hplay" = dontDistribute super."ghcjs-hplay";
+  "ghcjs-websockets" = dontDistribute super."ghcjs-websockets";
+  "ghclive" = dontDistribute super."ghclive";
+  "ghczdecode" = dontDistribute super."ghczdecode";
+  "ght" = dontDistribute super."ght";
+  "gi-atk" = dontDistribute super."gi-atk";
+  "gi-cairo" = dontDistribute super."gi-cairo";
+  "gi-gdk" = dontDistribute super."gi-gdk";
+  "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
+  "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
+  "gi-glib" = dontDistribute super."gi-glib";
+  "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
+  "gi-gtk" = dontDistribute super."gi-gtk";
+  "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
+  "gi-notify" = dontDistribute super."gi-notify";
+  "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
+  "gi-soup" = dontDistribute super."gi-soup";
+  "gi-vte" = dontDistribute super."gi-vte";
+  "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
+  "gimlh" = dontDistribute super."gimlh";
+  "ginger" = dontDistribute super."ginger";
+  "ginsu" = dontDistribute super."ginsu";
+  "giphy-api" = dontDistribute super."giphy-api";
+  "gist" = dontDistribute super."gist";
+  "git-all" = dontDistribute super."git-all";
+  "git-annex" = doDistribute super."git-annex_6_20160114";
+  "git-checklist" = dontDistribute super."git-checklist";
+  "git-date" = dontDistribute super."git-date";
+  "git-embed" = dontDistribute super."git-embed";
+  "git-freq" = dontDistribute super."git-freq";
+  "git-gpush" = dontDistribute super."git-gpush";
+  "git-jump" = dontDistribute super."git-jump";
+  "git-monitor" = dontDistribute super."git-monitor";
+  "git-object" = dontDistribute super."git-object";
+  "git-repair" = dontDistribute super."git-repair";
+  "git-sanity" = dontDistribute super."git-sanity";
+  "git-vogue" = dontDistribute super."git-vogue";
+  "gitHUD" = dontDistribute super."gitHUD";
+  "gitcache" = dontDistribute super."gitcache";
+  "gitdo" = dontDistribute super."gitdo";
+  "github-backup" = dontDistribute super."github-backup";
+  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-utils" = dontDistribute super."github-utils";
+  "gitignore" = dontDistribute super."gitignore";
+  "gitit" = dontDistribute super."gitit";
+  "gitlib-cmdline" = dontDistribute super."gitlib-cmdline";
+  "gitlib-cross" = dontDistribute super."gitlib-cross";
+  "gitlib-s3" = dontDistribute super."gitlib-s3";
+  "gitlib-sample" = dontDistribute super."gitlib-sample";
+  "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitter" = dontDistribute super."gitter";
+  "givegif" = dontDistribute super."givegif";
+  "gl-capture" = dontDistribute super."gl-capture";
+  "glade" = dontDistribute super."glade";
+  "gladexml-accessor" = dontDistribute super."gladexml-accessor";
+  "glambda" = dontDistribute super."glambda";
+  "glapp" = dontDistribute super."glapp";
+  "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
+  "glider-nlp" = dontDistribute super."glider-nlp";
+  "glintcollider" = dontDistribute super."glintcollider";
+  "gll" = dontDistribute super."gll";
+  "global" = dontDistribute super."global";
+  "global-config" = dontDistribute super."global-config";
+  "global-lock" = dontDistribute super."global-lock";
+  "global-variables" = dontDistribute super."global-variables";
+  "glome-hs" = dontDistribute super."glome-hs";
+  "gloss" = dontDistribute super."gloss";
+  "gloss-accelerate" = dontDistribute super."gloss-accelerate";
+  "gloss-algorithms" = dontDistribute super."gloss-algorithms";
+  "gloss-banana" = dontDistribute super."gloss-banana";
+  "gloss-devil" = dontDistribute super."gloss-devil";
+  "gloss-examples" = dontDistribute super."gloss-examples";
+  "gloss-game" = dontDistribute super."gloss-game";
+  "gloss-juicy" = dontDistribute super."gloss-juicy";
+  "gloss-raster" = dontDistribute super."gloss-raster";
+  "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate";
+  "gloss-rendering" = dontDistribute super."gloss-rendering";
+  "gloss-sodium" = dontDistribute super."gloss-sodium";
+  "glpk-hs" = dontDistribute super."glpk-hs";
+  "glue" = dontDistribute super."glue";
+  "glue-common" = dontDistribute super."glue-common";
+  "glue-core" = dontDistribute super."glue-core";
+  "glue-ekg" = dontDistribute super."glue-ekg";
+  "glue-example" = dontDistribute super."glue-example";
+  "gluturtle" = dontDistribute super."gluturtle";
+  "gmap" = dontDistribute super."gmap";
+  "gmndl" = dontDistribute super."gmndl";
+  "gnome-desktop" = dontDistribute super."gnome-desktop";
+  "gnome-keyring" = dontDistribute super."gnome-keyring";
+  "gnomevfs" = dontDistribute super."gnomevfs";
+  "gnss-converters" = dontDistribute super."gnss-converters";
+  "gnuplot" = dontDistribute super."gnuplot";
+  "goa" = dontDistribute super."goa";
+  "goal-core" = dontDistribute super."goal-core";
+  "goal-geometry" = dontDistribute super."goal-geometry";
+  "goal-probability" = dontDistribute super."goal-probability";
+  "goal-simulation" = dontDistribute super."goal-simulation";
+  "goatee" = dontDistribute super."goatee";
+  "goatee-gtk" = dontDistribute super."goatee-gtk";
+  "gofer-prelude" = dontDistribute super."gofer-prelude";
+  "gogol" = dontDistribute super."gogol";
+  "gogol-adexchange-buyer" = dontDistribute super."gogol-adexchange-buyer";
+  "gogol-adexchange-seller" = dontDistribute super."gogol-adexchange-seller";
+  "gogol-admin-datatransfer" = dontDistribute super."gogol-admin-datatransfer";
+  "gogol-admin-directory" = dontDistribute super."gogol-admin-directory";
+  "gogol-admin-emailmigration" = dontDistribute super."gogol-admin-emailmigration";
+  "gogol-admin-reports" = dontDistribute super."gogol-admin-reports";
+  "gogol-adsense" = dontDistribute super."gogol-adsense";
+  "gogol-adsense-host" = dontDistribute super."gogol-adsense-host";
+  "gogol-affiliates" = dontDistribute super."gogol-affiliates";
+  "gogol-analytics" = dontDistribute super."gogol-analytics";
+  "gogol-android-enterprise" = dontDistribute super."gogol-android-enterprise";
+  "gogol-android-publisher" = dontDistribute super."gogol-android-publisher";
+  "gogol-appengine" = dontDistribute super."gogol-appengine";
+  "gogol-apps-activity" = dontDistribute super."gogol-apps-activity";
+  "gogol-apps-calendar" = dontDistribute super."gogol-apps-calendar";
+  "gogol-apps-licensing" = dontDistribute super."gogol-apps-licensing";
+  "gogol-apps-reseller" = dontDistribute super."gogol-apps-reseller";
+  "gogol-apps-tasks" = dontDistribute super."gogol-apps-tasks";
+  "gogol-appstate" = dontDistribute super."gogol-appstate";
+  "gogol-autoscaler" = dontDistribute super."gogol-autoscaler";
+  "gogol-bigquery" = dontDistribute super."gogol-bigquery";
+  "gogol-billing" = dontDistribute super."gogol-billing";
+  "gogol-blogger" = dontDistribute super."gogol-blogger";
+  "gogol-books" = dontDistribute super."gogol-books";
+  "gogol-civicinfo" = dontDistribute super."gogol-civicinfo";
+  "gogol-classroom" = dontDistribute super."gogol-classroom";
+  "gogol-cloudtrace" = dontDistribute super."gogol-cloudtrace";
+  "gogol-compute" = dontDistribute super."gogol-compute";
+  "gogol-container" = dontDistribute super."gogol-container";
+  "gogol-core" = dontDistribute super."gogol-core";
+  "gogol-customsearch" = dontDistribute super."gogol-customsearch";
+  "gogol-dataflow" = dontDistribute super."gogol-dataflow";
+  "gogol-datastore" = dontDistribute super."gogol-datastore";
+  "gogol-debugger" = dontDistribute super."gogol-debugger";
+  "gogol-deploymentmanager" = dontDistribute super."gogol-deploymentmanager";
+  "gogol-dfareporting" = dontDistribute super."gogol-dfareporting";
+  "gogol-discovery" = dontDistribute super."gogol-discovery";
+  "gogol-dns" = dontDistribute super."gogol-dns";
+  "gogol-doubleclick-bids" = dontDistribute super."gogol-doubleclick-bids";
+  "gogol-doubleclick-search" = dontDistribute super."gogol-doubleclick-search";
+  "gogol-drive" = dontDistribute super."gogol-drive";
+  "gogol-fitness" = dontDistribute super."gogol-fitness";
+  "gogol-fonts" = dontDistribute super."gogol-fonts";
+  "gogol-freebasesearch" = dontDistribute super."gogol-freebasesearch";
+  "gogol-fusiontables" = dontDistribute super."gogol-fusiontables";
+  "gogol-games" = dontDistribute super."gogol-games";
+  "gogol-games-configuration" = dontDistribute super."gogol-games-configuration";
+  "gogol-games-management" = dontDistribute super."gogol-games-management";
+  "gogol-genomics" = dontDistribute super."gogol-genomics";
+  "gogol-gmail" = dontDistribute super."gogol-gmail";
+  "gogol-groups-migration" = dontDistribute super."gogol-groups-migration";
+  "gogol-groups-settings" = dontDistribute super."gogol-groups-settings";
+  "gogol-identity-toolkit" = dontDistribute super."gogol-identity-toolkit";
+  "gogol-latencytest" = dontDistribute super."gogol-latencytest";
+  "gogol-logging" = dontDistribute super."gogol-logging";
+  "gogol-maps-coordinate" = dontDistribute super."gogol-maps-coordinate";
+  "gogol-maps-engine" = dontDistribute super."gogol-maps-engine";
+  "gogol-mirror" = dontDistribute super."gogol-mirror";
+  "gogol-monitoring" = dontDistribute super."gogol-monitoring";
+  "gogol-oauth2" = dontDistribute super."gogol-oauth2";
+  "gogol-pagespeed" = dontDistribute super."gogol-pagespeed";
+  "gogol-partners" = dontDistribute super."gogol-partners";
+  "gogol-play-moviespartner" = dontDistribute super."gogol-play-moviespartner";
+  "gogol-plus" = dontDistribute super."gogol-plus";
+  "gogol-plus-domains" = dontDistribute super."gogol-plus-domains";
+  "gogol-prediction" = dontDistribute super."gogol-prediction";
+  "gogol-proximitybeacon" = dontDistribute super."gogol-proximitybeacon";
+  "gogol-pubsub" = dontDistribute super."gogol-pubsub";
+  "gogol-qpxexpress" = dontDistribute super."gogol-qpxexpress";
+  "gogol-replicapool" = dontDistribute super."gogol-replicapool";
+  "gogol-replicapool-updater" = dontDistribute super."gogol-replicapool-updater";
+  "gogol-resourcemanager" = dontDistribute super."gogol-resourcemanager";
+  "gogol-resourceviews" = dontDistribute super."gogol-resourceviews";
+  "gogol-shopping-content" = dontDistribute super."gogol-shopping-content";
+  "gogol-siteverification" = dontDistribute super."gogol-siteverification";
+  "gogol-spectrum" = dontDistribute super."gogol-spectrum";
+  "gogol-sqladmin" = dontDistribute super."gogol-sqladmin";
+  "gogol-storage" = dontDistribute super."gogol-storage";
+  "gogol-storage-transfer" = dontDistribute super."gogol-storage-transfer";
+  "gogol-tagmanager" = dontDistribute super."gogol-tagmanager";
+  "gogol-taskqueue" = dontDistribute super."gogol-taskqueue";
+  "gogol-translate" = dontDistribute super."gogol-translate";
+  "gogol-urlshortener" = dontDistribute super."gogol-urlshortener";
+  "gogol-useraccounts" = dontDistribute super."gogol-useraccounts";
+  "gogol-webmaster-tools" = dontDistribute super."gogol-webmaster-tools";
+  "gogol-youtube" = dontDistribute super."gogol-youtube";
+  "gogol-youtube-analytics" = dontDistribute super."gogol-youtube-analytics";
+  "gogol-youtube-reporting" = dontDistribute super."gogol-youtube-reporting";
+  "gooey" = dontDistribute super."gooey";
+  "google-dictionary" = dontDistribute super."google-dictionary";
+  "google-drive" = dontDistribute super."google-drive";
+  "google-html5-slide" = dontDistribute super."google-html5-slide";
+  "google-mail-filters" = dontDistribute super."google-mail-filters";
+  "google-oauth2" = dontDistribute super."google-oauth2";
+  "google-search" = dontDistribute super."google-search";
+  "googleplus" = dontDistribute super."googleplus";
+  "googlepolyline" = dontDistribute super."googlepolyline";
+  "gopherbot" = dontDistribute super."gopherbot";
+  "gore-and-ash" = dontDistribute super."gore-and-ash";
+  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
+  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
+  "gore-and-ash-glfw" = dontDistribute super."gore-and-ash-glfw";
+  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
+  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
+  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
+  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
+  "gpah" = dontDistribute super."gpah";
+  "gpcsets" = dontDistribute super."gpcsets";
+  "gpio" = dontDistribute super."gpio";
+  "gpolyline" = dontDistribute super."gpolyline";
+  "gps" = dontDistribute super."gps";
+  "gps2htmlReport" = dontDistribute super."gps2htmlReport";
+  "gpx-conduit" = dontDistribute super."gpx-conduit";
+  "graceful" = dontDistribute super."graceful";
+  "grammar-combinators" = dontDistribute super."grammar-combinators";
+  "grapefruit-examples" = dontDistribute super."grapefruit-examples";
+  "grapefruit-frp" = dontDistribute super."grapefruit-frp";
+  "grapefruit-records" = dontDistribute super."grapefruit-records";
+  "grapefruit-ui" = dontDistribute super."grapefruit-ui";
+  "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
+  "graph-generators" = dontDistribute super."graph-generators";
+  "graph-matchings" = dontDistribute super."graph-matchings";
+  "graph-rewriting" = dontDistribute super."graph-rewriting";
+  "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl";
+  "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl";
+  "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope";
+  "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout";
+  "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski";
+  "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies";
+  "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs";
+  "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww";
+  "graph-serialize" = dontDistribute super."graph-serialize";
+  "graph-utils" = dontDistribute super."graph-utils";
+  "graph-visit" = dontDistribute super."graph-visit";
+  "graphbuilder" = dontDistribute super."graphbuilder";
+  "graphene" = dontDistribute super."graphene";
+  "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators";
+  "graphics-formats-collada" = dontDistribute super."graphics-formats-collada";
+  "graphicsFormats" = dontDistribute super."graphicsFormats";
+  "graphicstools" = dontDistribute super."graphicstools";
+  "graphmod" = dontDistribute super."graphmod";
+  "graphql" = dontDistribute super."graphql";
+  "graphtype" = dontDistribute super."graphtype";
+  "grasp" = dontDistribute super."grasp";
+  "gray-code" = dontDistribute super."gray-code";
+  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
+  "greencard" = dontDistribute super."greencard";
+  "greencard-lib" = dontDistribute super."greencard-lib";
+  "greg-client" = dontDistribute super."greg-client";
+  "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
+  "grid" = dontDistribute super."grid";
+  "gridfs" = dontDistribute super."gridfs";
+  "gridland" = dontDistribute super."gridland";
+  "grm" = dontDistribute super."grm";
+  "groundhog-converters" = dontDistribute super."groundhog-converters";
+  "groundhog-inspector" = dontDistribute super."groundhog-inspector";
+  "group-with" = dontDistribute super."group-with";
+  "groupoid" = dontDistribute super."groupoid";
+  "gruff" = dontDistribute super."gruff";
+  "gruff-examples" = dontDistribute super."gruff-examples";
+  "gsc-weighting" = dontDistribute super."gsc-weighting";
+  "gsl-random" = dontDistribute super."gsl-random";
+  "gsl-random-fu" = dontDistribute super."gsl-random-fu";
+  "gsmenu" = dontDistribute super."gsmenu";
+  "gstreamer" = dontDistribute super."gstreamer";
+  "gt-tools" = dontDistribute super."gt-tools";
+  "gtfs" = dontDistribute super."gtfs";
+  "gtk-helpers" = dontDistribute super."gtk-helpers";
+  "gtk-jsinput" = dontDistribute super."gtk-jsinput";
+  "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore";
+  "gtk-mac-integration" = dontDistribute super."gtk-mac-integration";
+  "gtk-serialized-event" = dontDistribute super."gtk-serialized-event";
+  "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view";
+  "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list";
+  "gtk-toy" = dontDistribute super."gtk-toy";
+  "gtk-traymanager" = dontDistribute super."gtk-traymanager";
+  "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade";
+  "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib";
+  "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs";
+  "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk";
+  "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext";
+  "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2";
+  "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th";
+  "gtk2hs-hello" = dontDistribute super."gtk2hs-hello";
+  "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn";
+  "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration";
+  "gtkglext" = dontDistribute super."gtkglext";
+  "gtkimageview" = dontDistribute super."gtkimageview";
+  "gtkrsync" = dontDistribute super."gtkrsync";
+  "gtksourceview2" = dontDistribute super."gtksourceview2";
+  "gtksourceview3" = dontDistribute super."gtksourceview3";
+  "guarded-rewriting" = dontDistribute super."guarded-rewriting";
+  "guess-combinator" = dontDistribute super."guess-combinator";
+  "guid" = dontDistribute super."guid";
+  "gulcii" = dontDistribute super."gulcii";
+  "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis";
+  "gyah-bin" = dontDistribute super."gyah-bin";
+  "h-booru" = dontDistribute super."h-booru";
+  "h-gpgme" = dontDistribute super."h-gpgme";
+  "h2048" = dontDistribute super."h2048";
+  "hArduino" = dontDistribute super."hArduino";
+  "hBDD" = dontDistribute super."hBDD";
+  "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD";
+  "hBDD-CUDD" = dontDistribute super."hBDD-CUDD";
+  "hCsound" = dontDistribute super."hCsound";
+  "hDFA" = dontDistribute super."hDFA";
+  "hF2" = dontDistribute super."hF2";
+  "hGelf" = dontDistribute super."hGelf";
+  "hLLVM" = dontDistribute super."hLLVM";
+  "hMollom" = dontDistribute super."hMollom";
+  "hPDB-examples" = dontDistribute super."hPDB-examples";
+  "hPushover" = dontDistribute super."hPushover";
+  "hR" = dontDistribute super."hR";
+  "hRESP" = dontDistribute super."hRESP";
+  "hS3" = dontDistribute super."hS3";
+  "hScraper" = dontDistribute super."hScraper";
+  "hSimpleDB" = dontDistribute super."hSimpleDB";
+  "hTalos" = dontDistribute super."hTalos";
+  "hTensor" = dontDistribute super."hTensor";
+  "hVOIDP" = dontDistribute super."hVOIDP";
+  "hXmixer" = dontDistribute super."hXmixer";
+  "haar" = dontDistribute super."haar";
+  "hacanon-light" = dontDistribute super."hacanon-light";
+  "hack" = dontDistribute super."hack";
+  "hack-contrib" = dontDistribute super."hack-contrib";
+  "hack-contrib-press" = dontDistribute super."hack-contrib-press";
+  "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack";
+  "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi";
+  "hack-handler-cgi" = dontDistribute super."hack-handler-cgi";
+  "hack-handler-epoll" = dontDistribute super."hack-handler-epoll";
+  "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp";
+  "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi";
+  "hack-handler-happstack" = dontDistribute super."hack-handler-happstack";
+  "hack-handler-hyena" = dontDistribute super."hack-handler-hyena";
+  "hack-handler-kibro" = dontDistribute super."hack-handler-kibro";
+  "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver";
+  "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath";
+  "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession";
+  "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip";
+  "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp";
+  "hack2" = dontDistribute super."hack2";
+  "hack2-contrib" = dontDistribute super."hack2-contrib";
+  "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra";
+  "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server";
+  "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http";
+  "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server";
+  "hack2-handler-warp" = dontDistribute super."hack2-handler-warp";
+  "hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
+  "hackage-diff" = dontDistribute super."hackage-diff";
+  "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-proxy" = dontDistribute super."hackage-proxy";
+  "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
+  "hackage-security" = dontDistribute super."hackage-security";
+  "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
+  "hackage-server" = dontDistribute super."hackage-server";
+  "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage2hwn" = dontDistribute super."hackage2hwn";
+  "hackage2twitter" = dontDistribute super."hackage2twitter";
+  "hackager" = dontDistribute super."hackager";
+  "hackernews" = dontDistribute super."hackernews";
+  "hackertyper" = dontDistribute super."hackertyper";
+  "hackport" = dontDistribute super."hackport";
+  "hactor" = dontDistribute super."hactor";
+  "hactors" = dontDistribute super."hactors";
+  "haddock" = dontDistribute super."haddock";
+  "haddock-leksah" = dontDistribute super."haddock-leksah";
+  "hadoop-formats" = dontDistribute super."hadoop-formats";
+  "hadoop-rpc" = dontDistribute super."hadoop-rpc";
+  "hadoop-tools" = dontDistribute super."hadoop-tools";
+  "haeredes" = dontDistribute super."haeredes";
+  "haggis" = dontDistribute super."haggis";
+  "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
+  "haiji" = dontDistribute super."haiji";
+  "hailgun" = dontDistribute super."hailgun";
+  "hailgun-send" = dontDistribute super."hailgun-send";
+  "hails" = dontDistribute super."hails";
+  "hails-bin" = dontDistribute super."hails-bin";
+  "hairy" = dontDistribute super."hairy";
+  "hakaru" = dontDistribute super."hakaru";
+  "hake" = dontDistribute super."hake";
+  "hakismet" = dontDistribute super."hakismet";
+  "hako" = dontDistribute super."hako";
+  "hakyll" = doDistribute super."hakyll_4_7_5_2";
+  "hakyll-R" = dontDistribute super."hakyll-R";
+  "hakyll-agda" = dontDistribute super."hakyll-agda";
+  "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates";
+  "hakyll-contrib" = dontDistribute super."hakyll-contrib";
+  "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation";
+  "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links";
+  "hakyll-convert" = dontDistribute super."hakyll-convert";
+  "hakyll-elm" = dontDistribute super."hakyll-elm";
+  "hakyll-filestore" = dontDistribute super."hakyll-filestore";
+  "hakyll-sass" = dontDistribute super."hakyll-sass";
+  "halberd" = dontDistribute super."halberd";
+  "halfs" = dontDistribute super."halfs";
+  "halipeto" = dontDistribute super."halipeto";
+  "halive" = dontDistribute super."halive";
+  "halma" = dontDistribute super."halma";
+  "haltavista" = dontDistribute super."haltavista";
+  "hamid" = dontDistribute super."hamid";
+  "hampp" = dontDistribute super."hampp";
+  "hamtmap" = dontDistribute super."hamtmap";
+  "hamusic" = dontDistribute super."hamusic";
+  "handa-gdata" = dontDistribute super."handa-gdata";
+  "handa-geodata" = dontDistribute super."handa-geodata";
+  "handa-opengl" = dontDistribute super."handa-opengl";
+  "handle-like" = dontDistribute super."handle-like";
+  "handsy" = dontDistribute super."handsy";
+  "handwriting" = dontDistribute super."handwriting";
+  "hangman" = dontDistribute super."hangman";
+  "hannahci" = dontDistribute super."hannahci";
+  "hans" = dontDistribute super."hans";
+  "hans-pcap" = dontDistribute super."hans-pcap";
+  "hans-pfq" = dontDistribute super."hans-pfq";
+  "haphviz" = dontDistribute super."haphviz";
+  "happindicator" = dontDistribute super."happindicator";
+  "happindicator3" = dontDistribute super."happindicator3";
+  "happraise" = dontDistribute super."happraise";
+  "happs-hsp" = dontDistribute super."happs-hsp";
+  "happs-hsp-template" = dontDistribute super."happs-hsp-template";
+  "happs-tutorial" = dontDistribute super."happs-tutorial";
+  "happstack" = dontDistribute super."happstack";
+  "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-contrib" = dontDistribute super."happstack-contrib";
+  "happstack-data" = dontDistribute super."happstack-data";
+  "happstack-dlg" = dontDistribute super."happstack-dlg";
+  "happstack-facebook" = dontDistribute super."happstack-facebook";
+  "happstack-fastcgi" = dontDistribute super."happstack-fastcgi";
+  "happstack-fay" = dontDistribute super."happstack-fay";
+  "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax";
+  "happstack-foundation" = dontDistribute super."happstack-foundation";
+  "happstack-hamlet" = dontDistribute super."happstack-hamlet";
+  "happstack-heist" = dontDistribute super."happstack-heist";
+  "happstack-helpers" = dontDistribute super."happstack-helpers";
+  "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate";
+  "happstack-ixset" = dontDistribute super."happstack-ixset";
+  "happstack-lite" = dontDistribute super."happstack-lite";
+  "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
+  "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
+  "happstack-state" = dontDistribute super."happstack-state";
+  "happstack-static-routing" = dontDistribute super."happstack-static-routing";
+  "happstack-util" = dontDistribute super."happstack-util";
+  "happstack-yui" = dontDistribute super."happstack-yui";
+  "happy-meta" = dontDistribute super."happy-meta";
+  "happybara" = dontDistribute super."happybara";
+  "happybara-webkit" = dontDistribute super."happybara-webkit";
+  "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
+  "har" = dontDistribute super."har";
+  "harchive" = dontDistribute super."harchive";
+  "hardware-edsl" = dontDistribute super."hardware-edsl";
+  "hark" = dontDistribute super."hark";
+  "harmony" = dontDistribute super."harmony";
+  "haroonga" = dontDistribute super."haroonga";
+  "haroonga-httpd" = dontDistribute super."haroonga-httpd";
+  "harpy" = dontDistribute super."harpy";
+  "has" = dontDistribute super."has";
+  "has-th" = dontDistribute super."has-th";
+  "hascal" = dontDistribute super."hascal";
+  "hascat" = dontDistribute super."hascat";
+  "hascat-lib" = dontDistribute super."hascat-lib";
+  "hascat-setup" = dontDistribute super."hascat-setup";
+  "hascat-system" = dontDistribute super."hascat-system";
+  "hash" = dontDistribute super."hash";
+  "hashable-generics" = dontDistribute super."hashable-generics";
+  "hashabler" = dontDistribute super."hashabler";
+  "hashed-storage" = dontDistribute super."hashed-storage";
+  "hashids" = dontDistribute super."hashids";
+  "hashring" = dontDistribute super."hashring";
+  "hashtables-plus" = dontDistribute super."hashtables-plus";
+  "hasim" = dontDistribute super."hasim";
+  "hask" = dontDistribute super."hask";
+  "hask-home" = dontDistribute super."hask-home";
+  "haskades" = dontDistribute super."haskades";
+  "haskakafka" = dontDistribute super."haskakafka";
+  "haskanoid" = dontDistribute super."haskanoid";
+  "haskarrow" = dontDistribute super."haskarrow";
+  "haskbot-core" = dontDistribute super."haskbot-core";
+  "haskdeep" = dontDistribute super."haskdeep";
+  "haskdogs" = dontDistribute super."haskdogs";
+  "haskeem" = dontDistribute super."haskeem";
+  "haskeline" = doDistribute super."haskeline_0_7_2_3";
+  "haskeline-class" = dontDistribute super."haskeline-class";
+  "haskell-aliyun" = dontDistribute super."haskell-aliyun";
+  "haskell-awk" = dontDistribute super."haskell-awk";
+  "haskell-bcrypt" = dontDistribute super."haskell-bcrypt";
+  "haskell-brainfuck" = dontDistribute super."haskell-brainfuck";
+  "haskell-cnc" = dontDistribute super."haskell-cnc";
+  "haskell-coffee" = dontDistribute super."haskell-coffee";
+  "haskell-compression" = dontDistribute super."haskell-compression";
+  "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
+  "haskell-docs" = dontDistribute super."haskell-docs";
+  "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-formatter" = dontDistribute super."haskell-formatter";
+  "haskell-ftp" = dontDistribute super."haskell-ftp";
+  "haskell-generate" = dontDistribute super."haskell-generate";
+  "haskell-gi" = dontDistribute super."haskell-gi";
+  "haskell-gi-base" = dontDistribute super."haskell-gi-base";
+  "haskell-import-graph" = dontDistribute super."haskell-import-graph";
+  "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
+  "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
+  "haskell-mpi" = dontDistribute super."haskell-mpi";
+  "haskell-names" = dontDistribute super."haskell-names";
+  "haskell-openflow" = dontDistribute super."haskell-openflow";
+  "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
+  "haskell-platform-test" = dontDistribute super."haskell-platform-test";
+  "haskell-plot" = dontDistribute super."haskell-plot";
+  "haskell-qrencode" = dontDistribute super."haskell-qrencode";
+  "haskell-read-editor" = dontDistribute super."haskell-read-editor";
+  "haskell-reflect" = dontDistribute super."haskell-reflect";
+  "haskell-rules" = dontDistribute super."haskell-rules";
+  "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
+  "haskell-token-utils" = dontDistribute super."haskell-token-utils";
+  "haskell-tor" = dontDistribute super."haskell-tor";
+  "haskell-type-exts" = dontDistribute super."haskell-type-exts";
+  "haskell-typescript" = dontDistribute super."haskell-typescript";
+  "haskell-tyrant" = dontDistribute super."haskell-tyrant";
+  "haskell-updater" = dontDistribute super."haskell-updater";
+  "haskell-xmpp" = dontDistribute super."haskell-xmpp";
+  "haskell2010" = dontDistribute super."haskell2010";
+  "haskell98" = dontDistribute super."haskell98";
+  "haskell98libraries" = dontDistribute super."haskell98libraries";
+  "haskelldb" = dontDistribute super."haskelldb";
+  "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc";
+  "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl";
+  "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf";
+  "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers";
+  "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted";
+  "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic";
+  "haskelldb-flat" = dontDistribute super."haskelldb-flat";
+  "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc";
+  "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql";
+  "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc";
+  "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql";
+  "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3";
+  "haskelldb-hsql" = dontDistribute super."haskelldb-hsql";
+  "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql";
+  "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc";
+  "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle";
+  "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql";
+  "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite";
+  "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3";
+  "haskelldb-th" = dontDistribute super."haskelldb-th";
+  "haskelldb-wx" = dontDistribute super."haskelldb-wx";
+  "haskellscrabble" = dontDistribute super."haskellscrabble";
+  "haskellscript" = dontDistribute super."haskellscript";
+  "haskelm" = dontDistribute super."haskelm";
+  "haskgame" = dontDistribute super."haskgame";
+  "haskheap" = dontDistribute super."haskheap";
+  "haskhol-core" = dontDistribute super."haskhol-core";
+  "haskmon" = dontDistribute super."haskmon";
+  "haskoin" = dontDistribute super."haskoin";
+  "haskoin-core" = dontDistribute super."haskoin-core";
+  "haskoin-crypto" = dontDistribute super."haskoin-crypto";
+  "haskoin-node" = dontDistribute super."haskoin-node";
+  "haskoin-protocol" = dontDistribute super."haskoin-protocol";
+  "haskoin-script" = dontDistribute super."haskoin-script";
+  "haskoin-util" = dontDistribute super."haskoin-util";
+  "haskoin-wallet" = dontDistribute super."haskoin-wallet";
+  "haskoon" = dontDistribute super."haskoon";
+  "haskoon-httpspec" = dontDistribute super."haskoon-httpspec";
+  "haskoon-salvia" = dontDistribute super."haskoon-salvia";
+  "haskore" = dontDistribute super."haskore";
+  "haskore-realtime" = dontDistribute super."haskore-realtime";
+  "haskore-supercollider" = dontDistribute super."haskore-supercollider";
+  "haskore-synthesizer" = dontDistribute super."haskore-synthesizer";
+  "haskore-vintage" = dontDistribute super."haskore-vintage";
+  "hasktags" = dontDistribute super."hasktags";
+  "haslo" = dontDistribute super."haslo";
+  "hasloGUI" = dontDistribute super."hasloGUI";
+  "hasparql-client" = dontDistribute super."hasparql-client";
+  "haspell" = dontDistribute super."haspell";
+  "hasql" = doDistribute super."hasql_0_19_6";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
+  "hasql-pool" = dontDistribute super."hasql-pool";
+  "hasql-postgres" = dontDistribute super."hasql-postgres";
+  "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
+  "hasql-th" = dontDistribute super."hasql-th";
+  "hasql-transaction" = dontDistribute super."hasql-transaction";
+  "hastache-aeson" = dontDistribute super."hastache-aeson";
+  "haste" = dontDistribute super."haste";
+  "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
+  "haste-markup" = dontDistribute super."haste-markup";
+  "haste-perch" = dontDistribute super."haste-perch";
+  "hastily" = dontDistribute super."hastily";
+  "hasty-hamiltonian" = doDistribute super."hasty-hamiltonian_1_1_2";
+  "hat" = dontDistribute super."hat";
+  "hatex-guide" = dontDistribute super."hatex-guide";
+  "hath" = dontDistribute super."hath";
+  "hatt" = dontDistribute super."hatt";
+  "haverer" = dontDistribute super."haverer";
+  "hawitter" = dontDistribute super."hawitter";
+  "haxl-amazonka" = dontDistribute super."haxl-amazonka";
+  "haxl-facebook" = dontDistribute super."haxl-facebook";
+  "haxparse" = dontDistribute super."haxparse";
+  "haxr-th" = dontDistribute super."haxr-th";
+  "haxy" = dontDistribute super."haxy";
+  "hayland" = dontDistribute super."hayland";
+  "hayoo-cli" = dontDistribute super."hayoo-cli";
+  "hback" = dontDistribute super."hback";
+  "hbayes" = dontDistribute super."hbayes";
+  "hbb" = dontDistribute super."hbb";
+  "hbcd" = dontDistribute super."hbcd";
+  "hbeat" = dontDistribute super."hbeat";
+  "hblas" = dontDistribute super."hblas";
+  "hblock" = dontDistribute super."hblock";
+  "hbro" = dontDistribute super."hbro";
+  "hbro-contrib" = dontDistribute super."hbro-contrib";
+  "hburg" = dontDistribute super."hburg";
+  "hcc" = dontDistribute super."hcc";
+  "hcg-minus" = dontDistribute super."hcg-minus";
+  "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo";
+  "hcheat" = dontDistribute super."hcheat";
+  "hchesslib" = dontDistribute super."hchesslib";
+  "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
+  "hcron" = dontDistribute super."hcron";
+  "hcube" = dontDistribute super."hcube";
+  "hcwiid" = dontDistribute super."hcwiid";
+  "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix";
+  "hdbc-aeson" = dontDistribute super."hdbc-aeson";
+  "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore";
+  "hdbc-tuple" = dontDistribute super."hdbc-tuple";
+  "hdbi" = dontDistribute super."hdbi";
+  "hdbi-conduit" = dontDistribute super."hdbi-conduit";
+  "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
+  "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
+  "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdf" = dontDistribute super."hdf";
+  "hdigest" = dontDistribute super."hdigest";
+  "hdirect" = dontDistribute super."hdirect";
+  "hdis86" = dontDistribute super."hdis86";
+  "hdiscount" = dontDistribute super."hdiscount";
+  "hdm" = dontDistribute super."hdm";
+  "hdph" = dontDistribute super."hdph";
+  "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
+  "headergen" = dontDistribute super."headergen";
+  "heapsort" = dontDistribute super."heapsort";
+  "hecc" = dontDistribute super."hecc";
+  "hedis-config" = dontDistribute super."hedis-config";
+  "hedis-monadic" = dontDistribute super."hedis-monadic";
+  "hedis-pile" = dontDistribute super."hedis-pile";
+  "hedis-simple" = dontDistribute super."hedis-simple";
+  "hedis-tags" = dontDistribute super."hedis-tags";
+  "hedn" = dontDistribute super."hedn";
+  "hein" = dontDistribute super."hein";
+  "heist" = doDistribute super."heist_0_14_1_3";
+  "heist-aeson" = dontDistribute super."heist-aeson";
+  "heist-async" = dontDistribute super."heist-async";
+  "helics" = dontDistribute super."helics";
+  "helics-wai" = dontDistribute super."helics-wai";
+  "helisp" = dontDistribute super."helisp";
+  "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
+  "hell" = dontDistribute super."hell";
+  "hellage" = dontDistribute super."hellage";
+  "hellnet" = dontDistribute super."hellnet";
+  "hello" = dontDistribute super."hello";
+  "helm" = dontDistribute super."helm";
+  "help-esb" = dontDistribute super."help-esb";
+  "hemkay" = dontDistribute super."hemkay";
+  "hemkay-core" = dontDistribute super."hemkay-core";
+  "hemokit" = dontDistribute super."hemokit";
+  "hen" = dontDistribute super."hen";
+  "henet" = dontDistribute super."henet";
+  "hepevt" = dontDistribute super."hepevt";
+  "her-lexer" = dontDistribute super."her-lexer";
+  "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
+  "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
+  "herf-time" = dontDistribute super."herf-time";
+  "hermit" = dontDistribute super."hermit";
+  "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
+  "heroku" = dontDistribute super."heroku";
+  "heroku-persistent" = dontDistribute super."heroku-persistent";
+  "herringbone" = dontDistribute super."herringbone";
+  "herringbone-embed" = dontDistribute super."herringbone-embed";
+  "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
+  "hesql" = dontDistribute super."hesql";
+  "hetero-map" = dontDistribute super."hetero-map";
+  "hetris" = dontDistribute super."hetris";
+  "heukarya" = dontDistribute super."heukarya";
+  "hevolisa" = dontDistribute super."hevolisa";
+  "hevolisa-dph" = dontDistribute super."hevolisa-dph";
+  "hexdump" = dontDistribute super."hexdump";
+  "hexif" = dontDistribute super."hexif";
+  "hexpat-iteratee" = dontDistribute super."hexpat-iteratee";
+  "hexpat-lens" = dontDistribute super."hexpat-lens";
+  "hexpat-pickle" = dontDistribute super."hexpat-pickle";
+  "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic";
+  "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup";
+  "hexpr" = dontDistribute super."hexpr";
+  "hexquote" = dontDistribute super."hexquote";
+  "heyefi" = dontDistribute super."heyefi";
+  "hfann" = dontDistribute super."hfann";
+  "hfd" = dontDistribute super."hfd";
+  "hfiar" = dontDistribute super."hfiar";
+  "hfmt" = dontDistribute super."hfmt";
+  "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
+  "hfov" = dontDistribute super."hfov";
+  "hfractal" = dontDistribute super."hfractal";
+  "hfusion" = dontDistribute super."hfusion";
+  "hg-buildpackage" = dontDistribute super."hg-buildpackage";
+  "hgal" = dontDistribute super."hgal";
+  "hgalib" = dontDistribute super."hgalib";
+  "hgdbmi" = dontDistribute super."hgdbmi";
+  "hgearman" = dontDistribute super."hgearman";
+  "hgen" = dontDistribute super."hgen";
+  "hgeometric" = dontDistribute super."hgeometric";
+  "hgeometry" = dontDistribute super."hgeometry";
+  "hgithub" = dontDistribute super."hgithub";
+  "hgl-example" = dontDistribute super."hgl-example";
+  "hgom" = dontDistribute super."hgom";
+  "hgopher" = dontDistribute super."hgopher";
+  "hgrev" = dontDistribute super."hgrev";
+  "hgrib" = dontDistribute super."hgrib";
+  "hharp" = dontDistribute super."hharp";
+  "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
+  "hiccup" = dontDistribute super."hiccup";
+  "hichi" = dontDistribute super."hichi";
+  "hieraclus" = dontDistribute super."hieraclus";
+  "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams";
+  "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions";
+  "hierarchy" = dontDistribute super."hierarchy";
+  "hiernotify" = dontDistribute super."hiernotify";
+  "highWaterMark" = dontDistribute super."highWaterMark";
+  "higher-leveldb" = dontDistribute super."higher-leveldb";
+  "higherorder" = dontDistribute super."higherorder";
+  "highlight-versions" = dontDistribute super."highlight-versions";
+  "highlighter" = dontDistribute super."highlighter";
+  "highlighter2" = dontDistribute super."highlighter2";
+  "hills" = dontDistribute super."hills";
+  "himerge" = dontDistribute super."himerge";
+  "himg" = dontDistribute super."himg";
+  "himpy" = dontDistribute super."himpy";
+  "hindley-milner" = dontDistribute super."hindley-milner";
+  "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
+  "hinduce-classifier" = dontDistribute super."hinduce-classifier";
+  "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
+  "hinduce-examples" = dontDistribute super."hinduce-examples";
+  "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
+  "hinquire" = dontDistribute super."hinquire";
+  "hinstaller" = dontDistribute super."hinstaller";
+  "hint" = doDistribute super."hint_0_4_3";
+  "hint-server" = dontDistribute super."hint-server";
+  "hinvaders" = dontDistribute super."hinvaders";
+  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
+  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
+  "hipe" = dontDistribute super."hipe";
+  "hips" = dontDistribute super."hips";
+  "hircules" = dontDistribute super."hircules";
+  "hirt" = dontDistribute super."hirt";
+  "hissmetrics" = dontDistribute super."hissmetrics";
+  "hist-pl" = dontDistribute super."hist-pl";
+  "hist-pl-dawg" = dontDistribute super."hist-pl-dawg";
+  "hist-pl-fusion" = dontDistribute super."hist-pl-fusion";
+  "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon";
+  "hist-pl-lmf" = dontDistribute super."hist-pl-lmf";
+  "hist-pl-transliter" = dontDistribute super."hist-pl-transliter";
+  "hist-pl-types" = dontDistribute super."hist-pl-types";
+  "histogram-fill-binary" = dontDistribute super."histogram-fill-binary";
+  "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal";
+  "historian" = dontDistribute super."historian";
+  "hit-graph" = dontDistribute super."hit-graph";
+  "hjcase" = dontDistribute super."hjcase";
+  "hjpath" = dontDistribute super."hjpath";
+  "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_3";
+  "hjson" = dontDistribute super."hjson";
+  "hjson-query" = dontDistribute super."hjson-query";
+  "hjsonpointer" = dontDistribute super."hjsonpointer";
+  "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
+  "hlatex" = dontDistribute super."hlatex";
+  "hlbfgsb" = dontDistribute super."hlbfgsb";
+  "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
+  "hledger-chart" = dontDistribute super."hledger-chart";
+  "hledger-diff" = dontDistribute super."hledger-diff";
+  "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-vty" = dontDistribute super."hledger-vty";
+  "hlibBladeRF" = dontDistribute super."hlibBladeRF";
+  "hlibev" = dontDistribute super."hlibev";
+  "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_31";
+  "hlogger" = dontDistribute super."hlogger";
+  "hlongurl" = dontDistribute super."hlongurl";
+  "hls" = dontDistribute super."hls";
+  "hlwm" = dontDistribute super."hlwm";
+  "hly" = dontDistribute super."hly";
+  "hmark" = dontDistribute super."hmark";
+  "hmarkup" = dontDistribute super."hmarkup";
+  "hmatrix-banded" = dontDistribute super."hmatrix-banded";
+  "hmatrix-csv" = dontDistribute super."hmatrix-csv";
+  "hmatrix-glpk" = dontDistribute super."hmatrix-glpk";
+  "hmatrix-mmap" = dontDistribute super."hmatrix-mmap";
+  "hmatrix-nipals" = dontDistribute super."hmatrix-nipals";
+  "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp";
+  "hmatrix-repa" = dontDistribute super."hmatrix-repa";
+  "hmatrix-special" = dontDistribute super."hmatrix-special";
+  "hmatrix-static" = dontDistribute super."hmatrix-static";
+  "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc";
+  "hmatrix-syntax" = dontDistribute super."hmatrix-syntax";
+  "hmatrix-tests" = dontDistribute super."hmatrix-tests";
+  "hmeap" = dontDistribute super."hmeap";
+  "hmeap-utils" = dontDistribute super."hmeap-utils";
+  "hmemdb" = dontDistribute super."hmemdb";
+  "hmenu" = dontDistribute super."hmenu";
+  "hmidi" = dontDistribute super."hmidi";
+  "hmk" = dontDistribute super."hmk";
+  "hmm" = dontDistribute super."hmm";
+  "hmm-hmatrix" = dontDistribute super."hmm-hmatrix";
+  "hmp3" = dontDistribute super."hmp3";
+  "hmpfr" = dontDistribute super."hmpfr";
+  "hmt" = dontDistribute super."hmt";
+  "hmt-diagrams" = dontDistribute super."hmt-diagrams";
+  "hmumps" = dontDistribute super."hmumps";
+  "hnetcdf" = dontDistribute super."hnetcdf";
+  "hnix" = dontDistribute super."hnix";
+  "hnn" = dontDistribute super."hnn";
+  "hnop" = dontDistribute super."hnop";
+  "ho-rewriting" = dontDistribute super."ho-rewriting";
+  "hoauth" = dontDistribute super."hoauth";
+  "hob" = dontDistribute super."hob";
+  "hobbes" = dontDistribute super."hobbes";
+  "hobbits" = dontDistribute super."hobbits";
+  "hoe" = dontDistribute super."hoe";
+  "hofix-mtl" = dontDistribute super."hofix-mtl";
+  "hog" = dontDistribute super."hog";
+  "hogg" = dontDistribute super."hogg";
+  "hogre" = dontDistribute super."hogre";
+  "hogre-examples" = dontDistribute super."hogre-examples";
+  "hois" = dontDistribute super."hois";
+  "hoist-error" = dontDistribute super."hoist-error";
+  "hold-em" = dontDistribute super."hold-em";
+  "hole" = dontDistribute super."hole";
+  "holey-format" = dontDistribute super."holey-format";
+  "homeomorphic" = dontDistribute super."homeomorphic";
+  "hommage" = dontDistribute super."hommage";
+  "hommage-ds" = dontDistribute super."hommage-ds";
+  "homplexity" = dontDistribute super."homplexity";
+  "honi" = dontDistribute super."honi";
+  "honk" = dontDistribute super."honk";
+  "hoobuddy" = dontDistribute super."hoobuddy";
+  "hood" = dontDistribute super."hood";
+  "hood-off" = dontDistribute super."hood-off";
+  "hood2" = dontDistribute super."hood2";
+  "hoodie" = dontDistribute super."hoodie";
+  "hoodle" = dontDistribute super."hoodle";
+  "hoodle-builder" = dontDistribute super."hoodle-builder";
+  "hoodle-core" = dontDistribute super."hoodle-core";
+  "hoodle-extra" = dontDistribute super."hoodle-extra";
+  "hoodle-parser" = dontDistribute super."hoodle-parser";
+  "hoodle-publish" = dontDistribute super."hoodle-publish";
+  "hoodle-render" = dontDistribute super."hoodle-render";
+  "hoodle-types" = dontDistribute super."hoodle-types";
+  "hoogle-index" = dontDistribute super."hoogle-index";
+  "hooks-dir" = dontDistribute super."hooks-dir";
+  "hoovie" = dontDistribute super."hoovie";
+  "hopencc" = dontDistribute super."hopencc";
+  "hopencl" = dontDistribute super."hopencl";
+  "hopenpgp-tools" = doDistribute super."hopenpgp-tools_0_17_1";
+  "hopfield" = dontDistribute super."hopfield";
+  "hopfield-networks" = dontDistribute super."hopfield-networks";
+  "hopfli" = dontDistribute super."hopfli";
+  "hoppy-generator" = dontDistribute super."hoppy-generator";
+  "hoppy-runtime" = dontDistribute super."hoppy-runtime";
+  "hoppy-std" = dontDistribute super."hoppy-std";
+  "hops" = dontDistribute super."hops";
+  "hoq" = dontDistribute super."hoq";
+  "horizon" = dontDistribute super."horizon";
+  "hosc" = dontDistribute super."hosc";
+  "hosc-json" = dontDistribute super."hosc-json";
+  "hosc-utils" = dontDistribute super."hosc-utils";
+  "hosts-server" = dontDistribute super."hosts-server";
+  "hothasktags" = dontDistribute super."hothasktags";
+  "hotswap" = dontDistribute super."hotswap";
+  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "hp2any-core" = dontDistribute super."hp2any-core";
+  "hp2any-graph" = dontDistribute super."hp2any-graph";
+  "hp2any-manager" = dontDistribute super."hp2any-manager";
+  "hp2html" = dontDistribute super."hp2html";
+  "hp2pretty" = dontDistribute super."hp2pretty";
+  "hpack" = dontDistribute super."hpack";
+  "hpaco" = dontDistribute super."hpaco";
+  "hpaco-lib" = dontDistribute super."hpaco-lib";
+  "hpage" = dontDistribute super."hpage";
+  "hpapi" = dontDistribute super."hpapi";
+  "hpaste" = dontDistribute super."hpaste";
+  "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-strobe" = dontDistribute super."hpc-strobe";
+  "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
+  "hplayground" = dontDistribute super."hplayground";
+  "hplaylist" = dontDistribute super."hplaylist";
+  "hpodder" = dontDistribute super."hpodder";
+  "hpp" = dontDistribute super."hpp";
+  "hpqtypes" = dontDistribute super."hpqtypes";
+  "hprotoc" = doDistribute super."hprotoc_2_1_12";
+  "hprotoc-fork" = dontDistribute super."hprotoc-fork";
+  "hps" = dontDistribute super."hps";
+  "hps-cairo" = dontDistribute super."hps-cairo";
+  "hps-kmeans" = dontDistribute super."hps-kmeans";
+  "hpuz" = dontDistribute super."hpuz";
+  "hpygments" = dontDistribute super."hpygments";
+  "hpylos" = dontDistribute super."hpylos";
+  "hpyrg" = dontDistribute super."hpyrg";
+  "hquantlib" = dontDistribute super."hquantlib";
+  "hquery" = dontDistribute super."hquery";
+  "hranker" = dontDistribute super."hranker";
+  "hreader" = dontDistribute super."hreader";
+  "hricket" = dontDistribute super."hricket";
+  "hruby" = dontDistribute super."hruby";
+  "hs-GeoIP" = dontDistribute super."hs-GeoIP";
+  "hs-blake2" = dontDistribute super."hs-blake2";
+  "hs-captcha" = dontDistribute super."hs-captcha";
+  "hs-carbon" = dontDistribute super."hs-carbon";
+  "hs-carbon-examples" = dontDistribute super."hs-carbon-examples";
+  "hs-cdb" = dontDistribute super."hs-cdb";
+  "hs-dotnet" = dontDistribute super."hs-dotnet";
+  "hs-duktape" = dontDistribute super."hs-duktape";
+  "hs-excelx" = dontDistribute super."hs-excelx";
+  "hs-ffmpeg" = dontDistribute super."hs-ffmpeg";
+  "hs-fltk" = dontDistribute super."hs-fltk";
+  "hs-gchart" = dontDistribute super."hs-gchart";
+  "hs-gen-iface" = dontDistribute super."hs-gen-iface";
+  "hs-gizapp" = dontDistribute super."hs-gizapp";
+  "hs-inspector" = dontDistribute super."hs-inspector";
+  "hs-java" = dontDistribute super."hs-java";
+  "hs-json-rpc" = dontDistribute super."hs-json-rpc";
+  "hs-logo" = dontDistribute super."hs-logo";
+  "hs-mesos" = dontDistribute super."hs-mesos";
+  "hs-nombre-generator" = dontDistribute super."hs-nombre-generator";
+  "hs-pgms" = dontDistribute super."hs-pgms";
+  "hs-php-session" = dontDistribute super."hs-php-session";
+  "hs-pkg-config" = dontDistribute super."hs-pkg-config";
+  "hs-pkpass" = dontDistribute super."hs-pkpass";
+  "hs-re" = dontDistribute super."hs-re";
+  "hs-scrape" = dontDistribute super."hs-scrape";
+  "hs-twitter" = dontDistribute super."hs-twitter";
+  "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver";
+  "hs-vcard" = dontDistribute super."hs-vcard";
+  "hs2048" = dontDistribute super."hs2048";
+  "hs2bf" = dontDistribute super."hs2bf";
+  "hs2dot" = dontDistribute super."hs2dot";
+  "hsConfigure" = dontDistribute super."hsConfigure";
+  "hsSqlite3" = dontDistribute super."hsSqlite3";
+  "hsXenCtrl" = dontDistribute super."hsXenCtrl";
+  "hsay" = dontDistribute super."hsay";
+  "hsb2hs" = dontDistribute super."hsb2hs";
+  "hsbackup" = dontDistribute super."hsbackup";
+  "hsbencher" = dontDistribute super."hsbencher";
+  "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed";
+  "hsbencher-fusion" = dontDistribute super."hsbencher-fusion";
+  "hsc2hs" = dontDistribute super."hsc2hs";
+  "hsc3" = dontDistribute super."hsc3";
+  "hsc3-auditor" = dontDistribute super."hsc3-auditor";
+  "hsc3-cairo" = dontDistribute super."hsc3-cairo";
+  "hsc3-data" = dontDistribute super."hsc3-data";
+  "hsc3-db" = dontDistribute super."hsc3-db";
+  "hsc3-dot" = dontDistribute super."hsc3-dot";
+  "hsc3-forth" = dontDistribute super."hsc3-forth";
+  "hsc3-graphs" = dontDistribute super."hsc3-graphs";
+  "hsc3-lang" = dontDistribute super."hsc3-lang";
+  "hsc3-lisp" = dontDistribute super."hsc3-lisp";
+  "hsc3-plot" = dontDistribute super."hsc3-plot";
+  "hsc3-process" = dontDistribute super."hsc3-process";
+  "hsc3-rec" = dontDistribute super."hsc3-rec";
+  "hsc3-rw" = dontDistribute super."hsc3-rw";
+  "hsc3-server" = dontDistribute super."hsc3-server";
+  "hsc3-sf" = dontDistribute super."hsc3-sf";
+  "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile";
+  "hsc3-unsafe" = dontDistribute super."hsc3-unsafe";
+  "hsc3-utils" = dontDistribute super."hsc3-utils";
+  "hscamwire" = dontDistribute super."hscamwire";
+  "hscassandra" = dontDistribute super."hscassandra";
+  "hscd" = dontDistribute super."hscd";
+  "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
+  "hscope" = dontDistribute super."hscope";
+  "hscrtmpl" = dontDistribute super."hscrtmpl";
+  "hscuid" = dontDistribute super."hscuid";
+  "hscurses" = dontDistribute super."hscurses";
+  "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex";
+  "hsdev" = dontDistribute super."hsdev";
+  "hsdif" = dontDistribute super."hsdif";
+  "hsdip" = dontDistribute super."hsdip";
+  "hsdns" = dontDistribute super."hsdns";
+  "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsemail-ns" = dontDistribute super."hsemail-ns";
+  "hsenv" = dontDistribute super."hsenv";
+  "hserv" = dontDistribute super."hserv";
+  "hset" = dontDistribute super."hset";
+  "hsfacter" = dontDistribute super."hsfacter";
+  "hsfcsh" = dontDistribute super."hsfcsh";
+  "hsfilt" = dontDistribute super."hsfilt";
+  "hsgnutls" = dontDistribute super."hsgnutls";
+  "hsgnutls-yj" = dontDistribute super."hsgnutls-yj";
+  "hsgsom" = dontDistribute super."hsgsom";
+  "hsgtd" = dontDistribute super."hsgtd";
+  "hsharc" = dontDistribute super."hsharc";
+  "hsilop" = dontDistribute super."hsilop";
+  "hsimport" = dontDistribute super."hsimport";
+  "hsini" = dontDistribute super."hsini";
+  "hskeleton" = dontDistribute super."hskeleton";
+  "hslackbuilder" = dontDistribute super."hslackbuilder";
+  "hslibsvm" = dontDistribute super."hslibsvm";
+  "hslinks" = dontDistribute super."hslinks";
+  "hslogger-reader" = dontDistribute super."hslogger-reader";
+  "hslogger-template" = dontDistribute super."hslogger-template";
+  "hslogger4j" = dontDistribute super."hslogger4j";
+  "hslogstash" = dontDistribute super."hslogstash";
+  "hsmagick" = dontDistribute super."hsmagick";
+  "hsmisc" = dontDistribute super."hsmisc";
+  "hsmtpclient" = dontDistribute super."hsmtpclient";
+  "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector";
+  "hsnock" = dontDistribute super."hsnock";
+  "hsnoise" = dontDistribute super."hsnoise";
+  "hsns" = dontDistribute super."hsns";
+  "hsnsq" = dontDistribute super."hsnsq";
+  "hsntp" = dontDistribute super."hsntp";
+  "hsoptions" = dontDistribute super."hsoptions";
+  "hsp-cgi" = dontDistribute super."hsp-cgi";
+  "hsparklines" = dontDistribute super."hsparklines";
+  "hsparql" = dontDistribute super."hsparql";
+  "hspear" = dontDistribute super."hspear";
+  "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
+  "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
+  "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-experimental" = dontDistribute super."hspec-experimental";
+  "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
+  "hspec-server" = dontDistribute super."hspec-server";
+  "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
+  "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
+  "hspec-test-framework" = dontDistribute super."hspec-test-framework";
+  "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
+  "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox";
+  "hspec-wai" = doDistribute super."hspec-wai_0_6_5";
+  "hspec2" = dontDistribute super."hspec2";
+  "hspr-sh" = dontDistribute super."hspr-sh";
+  "hspread" = dontDistribute super."hspread";
+  "hspresent" = dontDistribute super."hspresent";
+  "hsprocess" = dontDistribute super."hsprocess";
+  "hsql" = dontDistribute super."hsql";
+  "hsql-mysql" = dontDistribute super."hsql-mysql";
+  "hsql-odbc" = dontDistribute super."hsql-odbc";
+  "hsql-postgresql" = dontDistribute super."hsql-postgresql";
+  "hsql-sqlite3" = dontDistribute super."hsql-sqlite3";
+  "hsqml" = dontDistribute super."hsqml";
+  "hsqml-datamodel" = dontDistribute super."hsqml-datamodel";
+  "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl";
+  "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris";
+  "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes";
+  "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples";
+  "hsqml-morris" = dontDistribute super."hsqml-morris";
+  "hsreadability" = dontDistribute super."hsreadability";
+  "hsseccomp" = dontDistribute super."hsseccomp";
+  "hsshellscript" = dontDistribute super."hsshellscript";
+  "hssourceinfo" = dontDistribute super."hssourceinfo";
+  "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
+  "hstats" = dontDistribute super."hstats";
+  "hstest" = dontDistribute super."hstest";
+  "hstidy" = dontDistribute super."hstidy";
+  "hstorchat" = dontDistribute super."hstorchat";
+  "hstradeking" = dontDistribute super."hstradeking";
+  "hstyle" = dontDistribute super."hstyle";
+  "hstzaar" = dontDistribute super."hstzaar";
+  "hsubconvert" = dontDistribute super."hsubconvert";
+  "hsverilog" = dontDistribute super."hsverilog";
+  "hswip" = dontDistribute super."hswip";
+  "hsx" = dontDistribute super."hsx";
+  "hsx-xhtml" = dontDistribute super."hsx-xhtml";
+  "hsyscall" = dontDistribute super."hsyscall";
+  "hszephyr" = dontDistribute super."hszephyr";
+  "htags" = dontDistribute super."htags";
+  "htar" = dontDistribute super."htar";
+  "htiled" = dontDistribute super."htiled";
+  "htime" = dontDistribute super."htime";
+  "html-email-validate" = dontDistribute super."html-email-validate";
+  "html-entities" = dontDistribute super."html-entities";
+  "html-kure" = dontDistribute super."html-kure";
+  "html-minimalist" = dontDistribute super."html-minimalist";
+  "html-parse" = dontDistribute super."html-parse";
+  "html-rules" = dontDistribute super."html-rules";
+  "html-tokenizer" = dontDistribute super."html-tokenizer";
+  "html-truncate" = dontDistribute super."html-truncate";
+  "html2hamlet" = dontDistribute super."html2hamlet";
+  "html5-entity" = dontDistribute super."html5-entity";
+  "htodo" = dontDistribute super."htodo";
+  "htoml" = dontDistribute super."htoml";
+  "htrace" = dontDistribute super."htrace";
+  "hts" = dontDistribute super."hts";
+  "htsn" = dontDistribute super."htsn";
+  "htsn-common" = dontDistribute super."htsn-common";
+  "htsn-import" = dontDistribute super."htsn-import";
+  "http-attoparsec" = dontDistribute super."http-attoparsec";
+  "http-client-auth" = dontDistribute super."http-client-auth";
+  "http-client-conduit" = dontDistribute super."http-client-conduit";
+  "http-client-lens" = dontDistribute super."http-client-lens";
+  "http-client-multipart" = dontDistribute super."http-client-multipart";
+  "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers";
+  "http-client-session" = dontDistribute super."http-client-session";
+  "http-client-streams" = dontDistribute super."http-client-streams";
+  "http-conduit-browser" = dontDistribute super."http-conduit-browser";
+  "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
+  "http-encodings" = dontDistribute super."http-encodings";
+  "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
+  "http-kit" = dontDistribute super."http-kit";
+  "http-listen" = dontDistribute super."http-listen";
+  "http-monad" = dontDistribute super."http-monad";
+  "http-proxy" = dontDistribute super."http-proxy";
+  "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
+  "http-server" = dontDistribute super."http-server";
+  "http-shed" = dontDistribute super."http-shed";
+  "http-test" = dontDistribute super."http-test";
+  "http-wget" = dontDistribute super."http-wget";
+  "http2" = doDistribute super."http2_1_4_5";
+  "https-everywhere-rules" = dontDistribute super."https-everywhere-rules";
+  "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw";
+  "httpspec" = dontDistribute super."httpspec";
+  "htune" = dontDistribute super."htune";
+  "htzaar" = dontDistribute super."htzaar";
+  "hub" = dontDistribute super."hub";
+  "hubigraph" = dontDistribute super."hubigraph";
+  "hubris" = dontDistribute super."hubris";
+  "huckleberry" = dontDistribute super."huckleberry";
+  "huffman" = dontDistribute super."huffman";
+  "hugs2yc" = dontDistribute super."hugs2yc";
+  "hulk" = dontDistribute super."hulk";
+  "hums" = dontDistribute super."hums";
+  "hunch" = dontDistribute super."hunch";
+  "hunit-dejafu" = doDistribute super."hunit-dejafu_0_2_0_0";
+  "hunit-gui" = dontDistribute super."hunit-gui";
+  "hunit-parsec" = dontDistribute super."hunit-parsec";
+  "hunit-rematch" = dontDistribute super."hunit-rematch";
+  "hunp" = dontDistribute super."hunp";
+  "hunt-searchengine" = dontDistribute super."hunt-searchengine";
+  "hunt-server" = dontDistribute super."hunt-server";
+  "hunt-server-cli" = dontDistribute super."hunt-server-cli";
+  "hurdle" = dontDistribute super."hurdle";
+  "husk-scheme" = dontDistribute super."husk-scheme";
+  "husk-scheme-libs" = dontDistribute super."husk-scheme-libs";
+  "husky" = dontDistribute super."husky";
+  "hutton" = dontDistribute super."hutton";
+  "huttons-razor" = dontDistribute super."huttons-razor";
+  "huzzy" = dontDistribute super."huzzy";
+  "hw-bits" = dontDistribute super."hw-bits";
+  "hw-conduit" = dontDistribute super."hw-conduit";
+  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
+  "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
+  "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
+  "hws" = dontDistribute super."hws";
+  "hwsl2" = dontDistribute super."hwsl2";
+  "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector";
+  "hwsl2-reducers" = dontDistribute super."hwsl2-reducers";
+  "hx" = dontDistribute super."hx";
+  "hxmppc" = dontDistribute super."hxmppc";
+  "hxournal" = dontDistribute super."hxournal";
+  "hxt-binary" = dontDistribute super."hxt-binary";
+  "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-extras" = dontDistribute super."hxt-extras";
+  "hxt-filter" = dontDistribute super."hxt-filter";
+  "hxt-xpath" = dontDistribute super."hxt-xpath";
+  "hxt-xslt" = dontDistribute super."hxt-xslt";
+  "hxthelper" = dontDistribute super."hxthelper";
+  "hxweb" = dontDistribute super."hxweb";
+  "hyahtzee" = dontDistribute super."hyahtzee";
+  "hyakko" = dontDistribute super."hyakko";
+  "hybrid" = dontDistribute super."hybrid";
+  "hydra-hs" = dontDistribute super."hydra-hs";
+  "hydra-print" = dontDistribute super."hydra-print";
+  "hydrogen" = dontDistribute super."hydrogen";
+  "hydrogen-cli" = dontDistribute super."hydrogen-cli";
+  "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args";
+  "hydrogen-data" = dontDistribute super."hydrogen-data";
+  "hydrogen-multimap" = dontDistribute super."hydrogen-multimap";
+  "hydrogen-parsing" = dontDistribute super."hydrogen-parsing";
+  "hydrogen-prelude" = dontDistribute super."hydrogen-prelude";
+  "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec";
+  "hydrogen-syntax" = dontDistribute super."hydrogen-syntax";
+  "hydrogen-util" = dontDistribute super."hydrogen-util";
+  "hydrogen-version" = dontDistribute super."hydrogen-version";
+  "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
+  "hylolib" = dontDistribute super."hylolib";
+  "hylotab" = dontDistribute super."hylotab";
+  "hyloutils" = dontDistribute super."hyloutils";
+  "hyperdrive" = dontDistribute super."hyperdrive";
+  "hyperfunctions" = dontDistribute super."hyperfunctions";
+  "hyperpublic" = dontDistribute super."hyperpublic";
+  "hyphenate" = dontDistribute super."hyphenate";
+  "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
+  "hzk" = dontDistribute super."hzk";
+  "i18n" = dontDistribute super."i18n";
+  "iCalendar" = dontDistribute super."iCalendar";
+  "iException" = dontDistribute super."iException";
+  "iap-verifier" = dontDistribute super."iap-verifier";
+  "ib-api" = dontDistribute super."ib-api";
+  "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
+  "ideas" = dontDistribute super."ideas";
+  "ideas-math" = dontDistribute super."ideas-math";
+  "idempotent" = dontDistribute super."idempotent";
+  "identifiers" = dontDistribute super."identifiers";
+  "idiii" = dontDistribute super."idiii";
+  "idna" = dontDistribute super."idna";
+  "idna2008" = dontDistribute super."idna2008";
+  "idris" = dontDistribute super."idris";
+  "ieee" = dontDistribute super."ieee";
+  "ieee-utils" = dontDistribute super."ieee-utils";
+  "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754-parser" = dontDistribute super."ieee754-parser";
+  "ifcxt" = dontDistribute super."ifcxt";
+  "iff" = dontDistribute super."iff";
+  "ifscs" = dontDistribute super."ifscs";
+  "ig" = doDistribute super."ig_0_6_1";
+  "ige-mac-integration" = dontDistribute super."ige-mac-integration";
+  "igraph" = dontDistribute super."igraph";
+  "igrf" = dontDistribute super."igrf";
+  "ihaskell-display" = dontDistribute super."ihaskell-display";
+  "ihaskell-inline-r" = dontDistribute super."ihaskell-inline-r";
+  "ihaskell-parsec" = dontDistribute super."ihaskell-parsec";
+  "ihaskell-plot" = dontDistribute super."ihaskell-plot";
+  "ihaskell-widgets" = dontDistribute super."ihaskell-widgets";
+  "ihttp" = dontDistribute super."ihttp";
+  "illuminate" = dontDistribute super."illuminate";
+  "image-type" = dontDistribute super."image-type";
+  "imagefilters" = dontDistribute super."imagefilters";
+  "imagemagick" = dontDistribute super."imagemagick";
+  "imagepaste" = dontDistribute super."imagepaste";
+  "imap" = dontDistribute super."imap";
+  "imapget" = dontDistribute super."imapget";
+  "imbib" = dontDistribute super."imbib";
+  "imgurder" = dontDistribute super."imgurder";
+  "imm" = dontDistribute super."imm";
+  "imparse" = dontDistribute super."imparse";
+  "imperative-edsl" = dontDistribute super."imperative-edsl";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
+  "implicit" = dontDistribute super."implicit";
+  "implicit-logging" = dontDistribute super."implicit-logging";
+  "implicit-params" = dontDistribute super."implicit-params";
+  "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
+  "improve" = dontDistribute super."improve";
+  "inc-ref" = dontDistribute super."inc-ref";
+  "inch" = dontDistribute super."inch";
+  "incremental-computing" = dontDistribute super."incremental-computing";
+  "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
+  "increments" = dontDistribute super."increments";
+  "indentation" = dontDistribute super."indentation";
+  "indentparser" = dontDistribute super."indentparser";
+  "index-core" = dontDistribute super."index-core";
+  "indexed" = dontDistribute super."indexed";
+  "indexed-do-notation" = dontDistribute super."indexed-do-notation";
+  "indexed-extras" = dontDistribute super."indexed-extras";
+  "indexed-free" = dontDistribute super."indexed-free";
+  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
+  "indices" = dontDistribute super."indices";
+  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
+  "infer-upstream" = dontDistribute super."infer-upstream";
+  "infernu" = dontDistribute super."infernu";
+  "infinite-search" = dontDistribute super."infinite-search";
+  "infinity" = dontDistribute super."infinity";
+  "infix" = dontDistribute super."infix";
+  "inflist" = dontDistribute super."inflist";
+  "influxdb" = dontDistribute super."influxdb";
+  "informative" = dontDistribute super."informative";
+  "inilist" = dontDistribute super."inilist";
+  "inject" = dontDistribute super."inject";
+  "inject-function" = dontDistribute super."inject-function";
+  "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
+  "inquire" = dontDistribute super."inquire";
+  "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
+  "inserts" = dontDistribute super."inserts";
+  "inspection-proxy" = dontDistribute super."inspection-proxy";
+  "instant-aeson" = dontDistribute super."instant-aeson";
+  "instant-bytes" = dontDistribute super."instant-bytes";
+  "instant-deepseq" = dontDistribute super."instant-deepseq";
+  "instant-generics" = dontDistribute super."instant-generics";
+  "instant-hashable" = dontDistribute super."instant-hashable";
+  "instant-zipper" = dontDistribute super."instant-zipper";
+  "instinct" = dontDistribute super."instinct";
+  "instrument-chord" = dontDistribute super."instrument-chord";
+  "int-cast" = dontDistribute super."int-cast";
+  "integer-pure" = dontDistribute super."integer-pure";
+  "intel-aes" = dontDistribute super."intel-aes";
+  "interchangeable" = dontDistribute super."interchangeable";
+  "interleavableGen" = dontDistribute super."interleavableGen";
+  "interleavableIO" = dontDistribute super."interleavableIO";
+  "interleave" = dontDistribute super."interleave";
+  "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
+  "intern" = dontDistribute super."intern";
+  "internetmarke" = dontDistribute super."internetmarke";
+  "interpol" = dontDistribute super."interpol";
+  "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
+  "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
+  "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
+  "intricacy" = dontDistribute super."intricacy";
+  "intset" = dontDistribute super."intset";
+  "invertible" = dontDistribute super."invertible";
+  "invertible-syntax" = dontDistribute super."invertible-syntax";
+  "io-capture" = dontDistribute super."io-capture";
+  "io-machine" = dontDistribute super."io-machine";
+  "io-reactive" = dontDistribute super."io-reactive";
+  "io-streams-http" = dontDistribute super."io-streams-http";
+  "io-throttle" = dontDistribute super."io-throttle";
+  "ioctl" = dontDistribute super."ioctl";
+  "ioref-stable" = dontDistribute super."ioref-stable";
+  "iothread" = dontDistribute super."iothread";
+  "iotransaction" = dontDistribute super."iotransaction";
+  "ip-quoter" = dontDistribute super."ip-quoter";
+  "ipatch" = dontDistribute super."ipatch";
+  "ipc" = dontDistribute super."ipc";
+  "ipcvar" = dontDistribute super."ipcvar";
+  "ipopt-hs" = dontDistribute super."ipopt-hs";
+  "ipprint" = dontDistribute super."ipprint";
+  "iptables-helpers" = dontDistribute super."iptables-helpers";
+  "iptadmin" = dontDistribute super."iptadmin";
+  "irc-bytestring" = dontDistribute super."irc-bytestring";
+  "irc-colors" = dontDistribute super."irc-colors";
+  "irc-core" = dontDistribute super."irc-core";
+  "irc-dcc" = dontDistribute super."irc-dcc";
+  "irc-fun-bot" = dontDistribute super."irc-fun-bot";
+  "irc-fun-client" = dontDistribute super."irc-fun-client";
+  "irc-fun-color" = dontDistribute super."irc-fun-color";
+  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
+  "ircbot" = dontDistribute super."ircbot";
+  "ircbouncer" = dontDistribute super."ircbouncer";
+  "ireal" = dontDistribute super."ireal";
+  "iridium" = dontDistribute super."iridium";
+  "iron-mq" = dontDistribute super."iron-mq";
+  "ironforge" = dontDistribute super."ironforge";
+  "is" = dontDistribute super."is";
+  "isdicom" = dontDistribute super."isdicom";
+  "isevaluated" = dontDistribute super."isevaluated";
+  "isiz" = dontDistribute super."isiz";
+  "ismtp" = dontDistribute super."ismtp";
+  "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
+  "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
+  "itanium-abi" = dontDistribute super."itanium-abi";
+  "iter-stats" = dontDistribute super."iter-stats";
+  "iterIO" = dontDistribute super."iterIO";
+  "iteratee" = dontDistribute super."iteratee";
+  "iteratee-compress" = dontDistribute super."iteratee-compress";
+  "iteratee-mtl" = dontDistribute super."iteratee-mtl";
+  "iteratee-parsec" = dontDistribute super."iteratee-parsec";
+  "iteratee-stm" = dontDistribute super."iteratee-stm";
+  "iterio-server" = dontDistribute super."iterio-server";
+  "ivar-simple" = dontDistribute super."ivar-simple";
+  "ivor" = dontDistribute super."ivor";
+  "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
+  "ivory-backend-c" = dontDistribute super."ivory-backend-c";
+  "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
+  "ivory-examples" = dontDistribute super."ivory-examples";
+  "ivory-hw" = dontDistribute super."ivory-hw";
+  "ivory-opts" = dontDistribute super."ivory-opts";
+  "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
+  "ivory-stdlib" = dontDistribute super."ivory-stdlib";
+  "ivy-web" = dontDistribute super."ivy-web";
+  "ixdopp" = dontDistribute super."ixdopp";
+  "ixmonad" = dontDistribute super."ixmonad";
+  "iyql" = dontDistribute super."iyql";
+  "j2hs" = dontDistribute super."j2hs";
+  "ja-base-extra" = dontDistribute super."ja-base-extra";
+  "jack" = dontDistribute super."jack";
+  "jack-bindings" = dontDistribute super."jack-bindings";
+  "jackminimix" = dontDistribute super."jackminimix";
+  "jacobi-roots" = dontDistribute super."jacobi-roots";
+  "jail" = dontDistribute super."jail";
+  "jailbreak-cabal" = dontDistribute super."jailbreak-cabal";
+  "jalaali" = dontDistribute super."jalaali";
+  "jalla" = dontDistribute super."jalla";
+  "jammittools" = dontDistribute super."jammittools";
+  "jarfind" = dontDistribute super."jarfind";
+  "java-bridge" = dontDistribute super."java-bridge";
+  "java-bridge-extras" = dontDistribute super."java-bridge-extras";
+  "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
+  "java-reflect" = dontDistribute super."java-reflect";
+  "javaclass" = dontDistribute super."javaclass";
+  "javasf" = dontDistribute super."javasf";
+  "javav" = dontDistribute super."javav";
+  "jcdecaux-vls" = dontDistribute super."jcdecaux-vls";
+  "jdi" = dontDistribute super."jdi";
+  "jespresso" = dontDistribute super."jespresso";
+  "jobqueue" = dontDistribute super."jobqueue";
+  "join" = dontDistribute super."join";
+  "joinlist" = dontDistribute super."joinlist";
+  "jonathanscard" = dontDistribute super."jonathanscard";
+  "jort" = dontDistribute super."jort";
+  "jose" = dontDistribute super."jose";
+  "jpeg" = dontDistribute super."jpeg";
+  "js-good-parts" = dontDistribute super."js-good-parts";
+  "jsaddle" = dontDistribute super."jsaddle";
+  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
+  "jsc" = dontDistribute super."jsc";
+  "jsmw" = dontDistribute super."jsmw";
+  "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
+  "json-autotype" = doDistribute super."json-autotype_1_0_13";
+  "json-b" = dontDistribute super."json-b";
+  "json-encoder" = dontDistribute super."json-encoder";
+  "json-enumerator" = dontDistribute super."json-enumerator";
+  "json-extra" = dontDistribute super."json-extra";
+  "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
+  "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
+  "json-python" = dontDistribute super."json-python";
+  "json-qq" = dontDistribute super."json-qq";
+  "json-rpc" = dontDistribute super."json-rpc";
+  "json-rpc-client" = dontDistribute super."json-rpc-client";
+  "json-rpc-server" = dontDistribute super."json-rpc-server";
+  "json-sop" = dontDistribute super."json-sop";
+  "json-state" = dontDistribute super."json-state";
+  "json-stream" = dontDistribute super."json-stream";
+  "json-togo" = dontDistribute super."json-togo";
+  "json-tools" = dontDistribute super."json-tools";
+  "json-types" = dontDistribute super."json-types";
+  "json2" = dontDistribute super."json2";
+  "json2-hdbc" = dontDistribute super."json2-hdbc";
+  "json2-types" = dontDistribute super."json2-types";
+  "json2yaml" = dontDistribute super."json2yaml";
+  "jsonresume" = dontDistribute super."jsonresume";
+  "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit";
+  "jsonschema-gen" = dontDistribute super."jsonschema-gen";
+  "jsonsql" = dontDistribute super."jsonsql";
+  "jsontsv" = dontDistribute super."jsontsv";
+  "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
+  "judy" = dontDistribute super."judy";
+  "jukebox" = dontDistribute super."jukebox";
+  "jump" = dontDistribute super."jump";
+  "jumpthefive" = dontDistribute super."jumpthefive";
+  "jvm-parser" = dontDistribute super."jvm-parser";
+  "jwt" = doDistribute super."jwt_0_6_0";
+  "kademlia" = dontDistribute super."kademlia";
+  "kafka-client" = dontDistribute super."kafka-client";
+  "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
+  "kansas-lava" = dontDistribute super."kansas-lava";
+  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
+  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
+  "kansas-lava-shake" = dontDistribute super."kansas-lava-shake";
+  "karakuri" = dontDistribute super."karakuri";
+  "karver" = dontDistribute super."karver";
+  "katip" = dontDistribute super."katip";
+  "katip-elasticsearch" = dontDistribute super."katip-elasticsearch";
+  "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
+  "kbq-gu" = dontDistribute super."kbq-gu";
+  "kd-tree" = dontDistribute super."kd-tree";
+  "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
+  "keera-callbacks" = dontDistribute super."keera-callbacks";
+  "keera-hails-i18n" = dontDistribute super."keera-hails-i18n";
+  "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller";
+  "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk";
+  "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel";
+  "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel";
+  "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config";
+  "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk";
+  "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view";
+  "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk";
+  "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs";
+  "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk";
+  "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network";
+  "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling";
+  "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx";
+  "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa";
+  "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses";
+  "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues";
+  "keera-posture" = dontDistribute super."keera-posture";
+  "keiretsu" = dontDistribute super."keiretsu";
+  "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
+  "keyed" = dontDistribute super."keyed";
+  "keyring" = dontDistribute super."keyring";
+  "keystore" = dontDistribute super."keystore";
+  "keyvaluehash" = dontDistribute super."keyvaluehash";
+  "keyword-args" = dontDistribute super."keyword-args";
+  "kibro" = dontDistribute super."kibro";
+  "kicad-data" = dontDistribute super."kicad-data";
+  "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
+  "kickchan" = dontDistribute super."kickchan";
+  "kif-parser" = dontDistribute super."kif-parser";
+  "kinds" = dontDistribute super."kinds";
+  "kit" = dontDistribute super."kit";
+  "kmeans-par" = dontDistribute super."kmeans-par";
+  "kmeans-vector" = dontDistribute super."kmeans-vector";
+  "knots" = dontDistribute super."knots";
+  "koellner-phonetic" = dontDistribute super."koellner-phonetic";
+  "kontrakcja-templates" = dontDistribute super."kontrakcja-templates";
+  "korfu" = dontDistribute super."korfu";
+  "kqueue" = dontDistribute super."kqueue";
+  "krpc" = dontDistribute super."krpc";
+  "ks-test" = dontDistribute super."ks-test";
+  "ktx" = dontDistribute super."ktx";
+  "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate";
+  "kyotocabinet" = dontDistribute super."kyotocabinet";
+  "l-bfgs-b" = dontDistribute super."l-bfgs-b";
+  "labeled-graph" = dontDistribute super."labeled-graph";
+  "labeled-tree" = dontDistribute super."labeled-tree";
+  "laborantin-hs" = dontDistribute super."laborantin-hs";
+  "labyrinth" = dontDistribute super."labyrinth";
+  "labyrinth-server" = dontDistribute super."labyrinth-server";
+  "lackey" = dontDistribute super."lackey";
+  "lagrangian" = dontDistribute super."lagrangian";
+  "laika" = dontDistribute super."laika";
+  "lambda-ast" = dontDistribute super."lambda-ast";
+  "lambda-bridge" = dontDistribute super."lambda-bridge";
+  "lambda-canvas" = dontDistribute super."lambda-canvas";
+  "lambda-devs" = dontDistribute super."lambda-devs";
+  "lambda-options" = dontDistribute super."lambda-options";
+  "lambda-placeholders" = dontDistribute super."lambda-placeholders";
+  "lambda-toolbox" = dontDistribute super."lambda-toolbox";
+  "lambda2js" = dontDistribute super."lambda2js";
+  "lambdaBase" = dontDistribute super."lambdaBase";
+  "lambdaFeed" = dontDistribute super."lambdaFeed";
+  "lambdaLit" = dontDistribute super."lambdaLit";
+  "lambdabot" = dontDistribute super."lambdabot";
+  "lambdabot-core" = dontDistribute super."lambdabot-core";
+  "lambdabot-haskell-plugins" = dontDistribute super."lambdabot-haskell-plugins";
+  "lambdabot-irc-plugins" = dontDistribute super."lambdabot-irc-plugins";
+  "lambdabot-misc-plugins" = dontDistribute super."lambdabot-misc-plugins";
+  "lambdabot-novelty-plugins" = dontDistribute super."lambdabot-novelty-plugins";
+  "lambdabot-reference-plugins" = dontDistribute super."lambdabot-reference-plugins";
+  "lambdabot-social-plugins" = dontDistribute super."lambdabot-social-plugins";
+  "lambdabot-trusted" = dontDistribute super."lambdabot-trusted";
+  "lambdabot-utils" = dontDistribute super."lambdabot-utils";
+  "lambdacat" = dontDistribute super."lambdacat";
+  "lambdacms-core" = dontDistribute super."lambdacms-core";
+  "lambdacms-media" = dontDistribute super."lambdacms-media";
+  "lambdacube" = dontDistribute super."lambdacube";
+  "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
+  "lambdacube-core" = dontDistribute super."lambdacube-core";
+  "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
+  "lambdacube-engine" = dontDistribute super."lambdacube-engine";
+  "lambdacube-examples" = dontDistribute super."lambdacube-examples";
+  "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
+  "lambdacube-samples" = dontDistribute super."lambdacube-samples";
+  "lambdatex" = dontDistribute super."lambdatex";
+  "lambdatwit" = dontDistribute super."lambdatwit";
+  "lambdaya-bus" = dontDistribute super."lambdaya-bus";
+  "lambdiff" = dontDistribute super."lambdiff";
+  "lame-tester" = dontDistribute super."lame-tester";
+  "language-asn1" = dontDistribute super."language-asn1";
+  "language-bash" = dontDistribute super."language-bash";
+  "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
+  "language-c-comments" = dontDistribute super."language-c-comments";
+  "language-c-inline" = dontDistribute super."language-c-inline";
+  "language-c-quote" = dontDistribute super."language-c-quote";
+  "language-cil" = dontDistribute super."language-cil";
+  "language-css" = dontDistribute super."language-css";
+  "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
+  "language-eiffel" = dontDistribute super."language-eiffel";
+  "language-fortran" = dontDistribute super."language-fortran";
+  "language-gcl" = dontDistribute super."language-gcl";
+  "language-go" = dontDistribute super."language-go";
+  "language-guess" = dontDistribute super."language-guess";
+  "language-java-classfile" = dontDistribute super."language-java-classfile";
+  "language-javascript" = doDistribute super."language-javascript_0_5_14_7";
+  "language-kort" = dontDistribute super."language-kort";
+  "language-lua" = dontDistribute super."language-lua";
+  "language-lua-qq" = dontDistribute super."language-lua-qq";
+  "language-mixal" = dontDistribute super."language-mixal";
+  "language-objc" = dontDistribute super."language-objc";
+  "language-openscad" = dontDistribute super."language-openscad";
+  "language-pig" = dontDistribute super."language-pig";
+  "language-puppet" = dontDistribute super."language-puppet";
+  "language-python" = dontDistribute super."language-python";
+  "language-python-colour" = dontDistribute super."language-python-colour";
+  "language-python-test" = dontDistribute super."language-python-test";
+  "language-qux" = dontDistribute super."language-qux";
+  "language-sh" = dontDistribute super."language-sh";
+  "language-slice" = dontDistribute super."language-slice";
+  "language-spelling" = dontDistribute super."language-spelling";
+  "language-sqlite" = dontDistribute super."language-sqlite";
+  "language-thrift" = doDistribute super."language-thrift_0_7_0_1";
+  "language-typescript" = dontDistribute super."language-typescript";
+  "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
+  "lat" = dontDistribute super."lat";
+  "latest-npm-version" = dontDistribute super."latest-npm-version";
+  "latex" = dontDistribute super."latex";
+  "launchpad-control" = dontDistribute super."launchpad-control";
+  "lax" = dontDistribute super."lax";
+  "layers" = dontDistribute super."layers";
+  "layers-game" = dontDistribute super."layers-game";
+  "layout" = dontDistribute super."layout";
+  "layout-bootstrap" = dontDistribute super."layout-bootstrap";
+  "lazy-io" = dontDistribute super."lazy-io";
+  "lazyarray" = dontDistribute super."lazyarray";
+  "lazyio" = dontDistribute super."lazyio";
+  "lazysmallcheck" = dontDistribute super."lazysmallcheck";
+  "lazysplines" = dontDistribute super."lazysplines";
+  "lbfgs" = dontDistribute super."lbfgs";
+  "lcs" = dontDistribute super."lcs";
+  "lda" = dontDistribute super."lda";
+  "ldap-client" = dontDistribute super."ldap-client";
+  "ldif" = dontDistribute super."ldif";
+  "leaf" = dontDistribute super."leaf";
+  "leaky" = dontDistribute super."leaky";
+  "leancheck" = dontDistribute super."leancheck";
+  "leankit-api" = dontDistribute super."leankit-api";
+  "leapseconds-announced" = dontDistribute super."leapseconds-announced";
+  "learn" = dontDistribute super."learn";
+  "learn-physics" = dontDistribute super."learn-physics";
+  "learn-physics-examples" = dontDistribute super."learn-physics-examples";
+  "learning-hmm" = dontDistribute super."learning-hmm";
+  "leetify" = dontDistribute super."leetify";
+  "leksah" = dontDistribute super."leksah";
+  "leksah-server" = dontDistribute super."leksah-server";
+  "lendingclub" = dontDistribute super."lendingclub";
+  "lens-datetime" = dontDistribute super."lens-datetime";
+  "lens-prelude" = dontDistribute super."lens-prelude";
+  "lens-properties" = dontDistribute super."lens-properties";
+  "lens-sop" = dontDistribute super."lens-sop";
+  "lens-text-encoding" = dontDistribute super."lens-text-encoding";
+  "lens-time" = dontDistribute super."lens-time";
+  "lens-tutorial" = dontDistribute super."lens-tutorial";
+  "lens-utils" = dontDistribute super."lens-utils";
+  "lenses" = dontDistribute super."lenses";
+  "lensref" = dontDistribute super."lensref";
+  "lentil" = doDistribute super."lentil_0_1_11_0";
+  "lenz" = dontDistribute super."lenz";
+  "lenz-template" = dontDistribute super."lenz-template";
+  "level-monad" = dontDistribute super."level-monad";
+  "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
+  "levmar" = dontDistribute super."levmar";
+  "levmar-chart" = dontDistribute super."levmar-chart";
+  "lfst" = dontDistribute super."lfst";
+  "lgtk" = dontDistribute super."lgtk";
+  "lha" = dontDistribute super."lha";
+  "lhae" = dontDistribute super."lhae";
+  "lhc" = dontDistribute super."lhc";
+  "lhe" = dontDistribute super."lhe";
+  "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl";
+  "lhs2html" = dontDistribute super."lhs2html";
+  "lhslatex" = dontDistribute super."lhslatex";
+  "libGenI" = dontDistribute super."libGenI";
+  "libarchive-conduit" = dontDistribute super."libarchive-conduit";
+  "libconfig" = dontDistribute super."libconfig";
+  "libcspm" = dontDistribute super."libcspm";
+  "libexpect" = dontDistribute super."libexpect";
+  "libffi" = dontDistribute super."libffi";
+  "libgraph" = dontDistribute super."libgraph";
+  "libhbb" = dontDistribute super."libhbb";
+  "libjenkins" = dontDistribute super."libjenkins";
+  "liblastfm" = dontDistribute super."liblastfm";
+  "liblinear-enumerator" = dontDistribute super."liblinear-enumerator";
+  "libltdl" = dontDistribute super."libltdl";
+  "libmpd" = dontDistribute super."libmpd";
+  "libnvvm" = dontDistribute super."libnvvm";
+  "liboleg" = dontDistribute super."liboleg";
+  "libpafe" = dontDistribute super."libpafe";
+  "libpq" = dontDistribute super."libpq";
+  "librandomorg" = dontDistribute super."librandomorg";
+  "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
+  "libssh2" = dontDistribute super."libssh2";
+  "libssh2-conduit" = dontDistribute super."libssh2-conduit";
+  "libstackexchange" = dontDistribute super."libstackexchange";
+  "libsystemd-daemon" = dontDistribute super."libsystemd-daemon";
+  "libtagc" = dontDistribute super."libtagc";
+  "libvirt-hs" = dontDistribute super."libvirt-hs";
+  "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
+  "libxml" = dontDistribute super."libxml";
+  "libxml-enumerator" = dontDistribute super."libxml-enumerator";
+  "libxslt" = dontDistribute super."libxslt";
+  "life" = dontDistribute super."life";
+  "lift-generics" = dontDistribute super."lift-generics";
+  "lifted-threads" = dontDistribute super."lifted-threads";
+  "lifter" = dontDistribute super."lifter";
+  "ligature" = dontDistribute super."ligature";
+  "ligd" = dontDistribute super."ligd";
+  "lighttpd-conf" = dontDistribute super."lighttpd-conf";
+  "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq";
+  "lilypond" = dontDistribute super."lilypond";
+  "limp" = dontDistribute super."limp";
+  "limp-cbc" = dontDistribute super."limp-cbc";
+  "lin-alg" = dontDistribute super."lin-alg";
+  "linda" = dontDistribute super."linda";
+  "lindenmayer" = dontDistribute super."lindenmayer";
+  "line-break" = dontDistribute super."line-break";
+  "line2pdf" = dontDistribute super."line2pdf";
+  "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas";
+  "linear-circuit" = dontDistribute super."linear-circuit";
+  "linear-grammar" = dontDistribute super."linear-grammar";
+  "linear-maps" = dontDistribute super."linear-maps";
+  "linear-opengl" = dontDistribute super."linear-opengl";
+  "linear-vect" = dontDistribute super."linear-vect";
+  "linearEqSolver" = dontDistribute super."linearEqSolver";
+  "linearscan" = dontDistribute super."linearscan";
+  "linearscan-hoopl" = dontDistribute super."linearscan-hoopl";
+  "linebreak" = dontDistribute super."linebreak";
+  "linguistic-ordinals" = dontDistribute super."linguistic-ordinals";
+  "link-relations" = dontDistribute super."link-relations";
+  "linkchk" = dontDistribute super."linkchk";
+  "linkcore" = dontDistribute super."linkcore";
+  "linkedhashmap" = dontDistribute super."linkedhashmap";
+  "linklater" = dontDistribute super."linklater";
+  "linode" = dontDistribute super."linode";
+  "linux-blkid" = dontDistribute super."linux-blkid";
+  "linux-cgroup" = dontDistribute super."linux-cgroup";
+  "linux-evdev" = dontDistribute super."linux-evdev";
+  "linux-inotify" = dontDistribute super."linux-inotify";
+  "linux-kmod" = dontDistribute super."linux-kmod";
+  "linux-mount" = dontDistribute super."linux-mount";
+  "linux-perf" = dontDistribute super."linux-perf";
+  "linux-ptrace" = dontDistribute super."linux-ptrace";
+  "linux-xattr" = dontDistribute super."linux-xattr";
+  "linx-gateway" = dontDistribute super."linx-gateway";
+  "lio" = dontDistribute super."lio";
+  "lio-eci11" = dontDistribute super."lio-eci11";
+  "lio-fs" = dontDistribute super."lio-fs";
+  "lio-simple" = dontDistribute super."lio-simple";
+  "lipsum-gen" = dontDistribute super."lipsum-gen";
+  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
+  "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "lispparser" = dontDistribute super."lispparser";
+  "list-extras" = dontDistribute super."list-extras";
+  "list-grouping" = dontDistribute super."list-grouping";
+  "list-mux" = dontDistribute super."list-mux";
+  "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t-attoparsec" = dontDistribute super."list-t-attoparsec";
+  "list-t-html-parser" = dontDistribute super."list-t-html-parser";
+  "list-t-http-client" = dontDistribute super."list-t-http-client";
+  "list-t-libcurl" = dontDistribute super."list-t-libcurl";
+  "list-t-text" = dontDistribute super."list-t-text";
+  "list-tries" = dontDistribute super."list-tries";
+  "list-zip-def" = dontDistribute super."list-zip-def";
+  "listlike-instances" = dontDistribute super."listlike-instances";
+  "lists" = dontDistribute super."lists";
+  "listsafe" = dontDistribute super."listsafe";
+  "lit" = dontDistribute super."lit";
+  "literals" = dontDistribute super."literals";
+  "live-sequencer" = dontDistribute super."live-sequencer";
+  "ll-picosat" = dontDistribute super."ll-picosat";
+  "llrbtree" = dontDistribute super."llrbtree";
+  "llsd" = dontDistribute super."llsd";
+  "llvm" = dontDistribute super."llvm";
+  "llvm-analysis" = dontDistribute super."llvm-analysis";
+  "llvm-base" = dontDistribute super."llvm-base";
+  "llvm-base-types" = dontDistribute super."llvm-base-types";
+  "llvm-base-util" = dontDistribute super."llvm-base-util";
+  "llvm-data-interop" = dontDistribute super."llvm-data-interop";
+  "llvm-extra" = dontDistribute super."llvm-extra";
+  "llvm-ffi" = dontDistribute super."llvm-ffi";
+  "llvm-general" = dontDistribute super."llvm-general";
+  "llvm-general-pure" = dontDistribute super."llvm-general-pure";
+  "llvm-general-quote" = dontDistribute super."llvm-general-quote";
+  "llvm-ht" = dontDistribute super."llvm-ht";
+  "llvm-pkg-config" = dontDistribute super."llvm-pkg-config";
+  "llvm-pretty" = dontDistribute super."llvm-pretty";
+  "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser";
+  "llvm-tf" = dontDistribute super."llvm-tf";
+  "llvm-tools" = dontDistribute super."llvm-tools";
+  "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
+  "loadavg" = dontDistribute super."loadavg";
+  "local-address" = dontDistribute super."local-address";
+  "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
+  "located-base" = dontDistribute super."located-base";
+  "locators" = dontDistribute super."locators";
+  "loch" = dontDistribute super."loch";
+  "lock-file" = dontDistribute super."lock-file";
+  "locked-poll" = dontDistribute super."locked-poll";
+  "lockfree-queue" = dontDistribute super."lockfree-queue";
+  "log" = dontDistribute super."log";
+  "log-effect" = dontDistribute super."log-effect";
+  "log2json" = dontDistribute super."log2json";
+  "logfloat" = dontDistribute super."logfloat";
+  "logger" = dontDistribute super."logger";
+  "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade-journald" = dontDistribute super."logging-facade-journald";
+  "logic-TPTP" = dontDistribute super."logic-TPTP";
+  "logic-classes" = dontDistribute super."logic-classes";
+  "logicst" = dontDistribute super."logicst";
+  "logict-state" = dontDistribute super."logict-state";
+  "logplex-parse" = dontDistribute super."logplex-parse";
+  "logsink" = dontDistribute super."logsink";
+  "lojban" = dontDistribute super."lojban";
+  "lojbanParser" = dontDistribute super."lojbanParser";
+  "lojbanXiragan" = dontDistribute super."lojbanXiragan";
+  "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
+  "lol-apps" = dontDistribute super."lol-apps";
+  "loli" = dontDistribute super."loli";
+  "lookup-tables" = dontDistribute super."lookup-tables";
+  "loop-effin" = dontDistribute super."loop-effin";
+  "loop-while" = dontDistribute super."loop-while";
+  "loops" = dontDistribute super."loops";
+  "loopy" = dontDistribute super."loopy";
+  "lord" = dontDistribute super."lord";
+  "lorem" = dontDistribute super."lorem";
+  "loris" = dontDistribute super."loris";
+  "loshadka" = dontDistribute super."loshadka";
+  "lostcities" = dontDistribute super."lostcities";
+  "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
+  "ls-usb" = dontDistribute super."ls-usb";
+  "lscabal" = dontDistribute super."lscabal";
+  "lss" = dontDistribute super."lss";
+  "lsystem" = dontDistribute super."lsystem";
+  "ltk" = dontDistribute super."ltk";
+  "ltl" = dontDistribute super."ltl";
+  "lua-bytecode" = dontDistribute super."lua-bytecode";
+  "luachunk" = dontDistribute super."luachunk";
+  "luautils" = dontDistribute super."luautils";
+  "lub" = dontDistribute super."lub";
+  "lucid-foundation" = dontDistribute super."lucid-foundation";
+  "lucienne" = dontDistribute super."lucienne";
+  "luhn" = dontDistribute super."luhn";
+  "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
+  "luka" = dontDistribute super."luka";
+  "luminance" = doDistribute super."luminance_0_9_1_2";
+  "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
+  "lushtags" = dontDistribute super."lushtags";
+  "luthor" = dontDistribute super."luthor";
+  "lvish" = dontDistribute super."lvish";
+  "lvmlib" = dontDistribute super."lvmlib";
+  "lvmrun" = dontDistribute super."lvmrun";
+  "lxc" = dontDistribute super."lxc";
+  "lye" = dontDistribute super."lye";
+  "lz4" = dontDistribute super."lz4";
+  "lzma" = dontDistribute super."lzma";
+  "lzma-clib" = dontDistribute super."lzma-clib";
+  "lzma-enumerator" = dontDistribute super."lzma-enumerator";
+  "lzma-streams" = dontDistribute super."lzma-streams";
+  "maam" = dontDistribute super."maam";
+  "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
+  "maccatcher" = dontDistribute super."maccatcher";
+  "machinecell" = dontDistribute super."machinecell";
+  "machines-binary" = dontDistribute super."machines-binary";
+  "machines-zlib" = dontDistribute super."machines-zlib";
+  "macho" = dontDistribute super."macho";
+  "maclight" = dontDistribute super."maclight";
+  "macosx-make-standalone" = dontDistribute super."macosx-make-standalone";
+  "mage" = dontDistribute super."mage";
+  "magico" = dontDistribute super."magico";
+  "magma" = dontDistribute super."magma";
+  "mahoro" = dontDistribute super."mahoro";
+  "maid" = dontDistribute super."maid";
+  "mailbox-count" = dontDistribute super."mailbox-count";
+  "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
+  "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = dontDistribute super."mainland-pretty";
+  "majordomo" = dontDistribute super."majordomo";
+  "majority" = dontDistribute super."majority";
+  "make-hard-links" = dontDistribute super."make-hard-links";
+  "make-package" = dontDistribute super."make-package";
+  "makedo" = dontDistribute super."makedo";
+  "manatee" = dontDistribute super."manatee";
+  "manatee-all" = dontDistribute super."manatee-all";
+  "manatee-anything" = dontDistribute super."manatee-anything";
+  "manatee-browser" = dontDistribute super."manatee-browser";
+  "manatee-core" = dontDistribute super."manatee-core";
+  "manatee-curl" = dontDistribute super."manatee-curl";
+  "manatee-editor" = dontDistribute super."manatee-editor";
+  "manatee-filemanager" = dontDistribute super."manatee-filemanager";
+  "manatee-imageviewer" = dontDistribute super."manatee-imageviewer";
+  "manatee-ircclient" = dontDistribute super."manatee-ircclient";
+  "manatee-mplayer" = dontDistribute super."manatee-mplayer";
+  "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer";
+  "manatee-processmanager" = dontDistribute super."manatee-processmanager";
+  "manatee-reader" = dontDistribute super."manatee-reader";
+  "manatee-template" = dontDistribute super."manatee-template";
+  "manatee-terminal" = dontDistribute super."manatee-terminal";
+  "manatee-welcome" = dontDistribute super."manatee-welcome";
+  "mancala" = dontDistribute super."mancala";
+  "mandrill" = doDistribute super."mandrill_0_5_1_0";
+  "mandulia" = dontDistribute super."mandulia";
+  "manifold-random" = dontDistribute super."manifold-random";
+  "manifolds" = dontDistribute super."manifolds";
+  "map-exts" = dontDistribute super."map-exts";
+  "mappy" = dontDistribute super."mappy";
+  "marionetta" = dontDistribute super."marionetta";
+  "markdown-kate" = dontDistribute super."markdown-kate";
+  "markdown-pap" = dontDistribute super."markdown-pap";
+  "markdown2svg" = dontDistribute super."markdown2svg";
+  "marked-pretty" = dontDistribute super."marked-pretty";
+  "markov" = dontDistribute super."markov";
+  "markov-chain" = dontDistribute super."markov-chain";
+  "markov-processes" = dontDistribute super."markov-processes";
+  "markup-preview" = dontDistribute super."markup-preview";
+  "marmalade-upload" = dontDistribute super."marmalade-upload";
+  "marquise" = dontDistribute super."marquise";
+  "marxup" = dontDistribute super."marxup";
+  "masakazu-bot" = dontDistribute super."masakazu-bot";
+  "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
+  "matchers" = dontDistribute super."matchers";
+  "mathblog" = dontDistribute super."mathblog";
+  "mathgenealogy" = dontDistribute super."mathgenealogy";
+  "mathista" = dontDistribute super."mathista";
+  "mathlink" = dontDistribute super."mathlink";
+  "matlab" = dontDistribute super."matlab";
+  "matrix-market" = dontDistribute super."matrix-market";
+  "matrix-market-pure" = dontDistribute super."matrix-market-pure";
+  "matsuri" = dontDistribute super."matsuri";
+  "maude" = dontDistribute super."maude";
+  "maxent" = dontDistribute super."maxent";
+  "maxsharing" = dontDistribute super."maxsharing";
+  "maybe-justify" = dontDistribute super."maybe-justify";
+  "maybench" = dontDistribute super."maybench";
+  "mbox-tools" = dontDistribute super."mbox-tools";
+  "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples";
+  "mcmc-samplers" = dontDistribute super."mcmc-samplers";
+  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
+  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
+  "mdcat" = dontDistribute super."mdcat";
+  "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
+  "mecab" = dontDistribute super."mecab";
+  "mecha" = dontDistribute super."mecha";
+  "mediawiki" = dontDistribute super."mediawiki";
+  "mediawiki2latex" = dontDistribute super."mediawiki2latex";
+  "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
+  "meep" = dontDistribute super."meep";
+  "mega-sdist" = dontDistribute super."mega-sdist";
+  "megaparsec" = doDistribute super."megaparsec_4_3_0";
+  "meldable-heap" = dontDistribute super."meldable-heap";
+  "melody" = dontDistribute super."melody";
+  "memcache" = dontDistribute super."memcache";
+  "memcache-conduit" = dontDistribute super."memcache-conduit";
+  "memcache-haskell" = dontDistribute super."memcache-haskell";
+  "memcached" = dontDistribute super."memcached";
+  "memexml" = dontDistribute super."memexml";
+  "memo-ptr" = dontDistribute super."memo-ptr";
+  "memo-sqlite" = dontDistribute super."memo-sqlite";
+  "memory" = doDistribute super."memory_0_11";
+  "memscript" = dontDistribute super."memscript";
+  "mersenne-random" = dontDistribute super."mersenne-random";
+  "messente" = dontDistribute super."messente";
+  "meta-misc" = dontDistribute super."meta-misc";
+  "meta-par" = dontDistribute super."meta-par";
+  "meta-par-accelerate" = dontDistribute super."meta-par-accelerate";
+  "metadata" = dontDistribute super."metadata";
+  "metamorphic" = dontDistribute super."metamorphic";
+  "metaplug" = dontDistribute super."metaplug";
+  "metric" = dontDistribute super."metric";
+  "metricsd-client" = dontDistribute super."metricsd-client";
+  "metronome" = dontDistribute super."metronome";
+  "mezzolens" = dontDistribute super."mezzolens";
+  "mfsolve" = dontDistribute super."mfsolve";
+  "mgeneric" = dontDistribute super."mgeneric";
+  "mi" = dontDistribute super."mi";
+  "microbench" = dontDistribute super."microbench";
+  "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens" = doDistribute super."microlens_0_4_2_1";
+  "microlens-each" = dontDistribute super."microlens-each";
+  "microlens-ghc" = doDistribute super."microlens-ghc_0_4_2_1";
+  "microlens-platform" = doDistribute super."microlens-platform_0_2_3_1";
+  "microlens-th" = doDistribute super."microlens-th_0_3_0_2";
+  "microtimer" = dontDistribute super."microtimer";
+  "mida" = dontDistribute super."mida";
+  "midair" = dontDistribute super."midair";
+  "midi" = dontDistribute super."midi";
+  "midi-alsa" = dontDistribute super."midi-alsa";
+  "midi-music-box" = dontDistribute super."midi-music-box";
+  "midi-util" = dontDistribute super."midi-util";
+  "midimory" = dontDistribute super."midimory";
+  "midisurface" = dontDistribute super."midisurface";
+  "mighttpd" = dontDistribute super."mighttpd";
+  "mighttpd2" = dontDistribute super."mighttpd2";
+  "mikmod" = dontDistribute super."mikmod";
+  "miku" = dontDistribute super."miku";
+  "milena" = dontDistribute super."milena";
+  "mime" = dontDistribute super."mime";
+  "mime-directory" = dontDistribute super."mime-directory";
+  "mime-string" = dontDistribute super."mime-string";
+  "mines" = dontDistribute super."mines";
+  "minesweeper" = dontDistribute super."minesweeper";
+  "miniball" = dontDistribute super."miniball";
+  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
+  "minimal-configuration" = dontDistribute super."minimal-configuration";
+  "minimorph" = dontDistribute super."minimorph";
+  "minimung" = dontDistribute super."minimung";
+  "minions" = dontDistribute super."minions";
+  "minioperational" = dontDistribute super."minioperational";
+  "miniplex" = dontDistribute super."miniplex";
+  "minirotate" = dontDistribute super."minirotate";
+  "minisat" = dontDistribute super."minisat";
+  "ministg" = dontDistribute super."ministg";
+  "miniutter" = dontDistribute super."miniutter";
+  "minst-idx" = dontDistribute super."minst-idx";
+  "mirror-tweet" = dontDistribute super."mirror-tweet";
+  "missing-py2" = dontDistribute super."missing-py2";
+  "mix-arrows" = dontDistribute super."mix-arrows";
+  "mixed-strategies" = dontDistribute super."mixed-strategies";
+  "mkbndl" = dontDistribute super."mkbndl";
+  "mkcabal" = dontDistribute super."mkcabal";
+  "ml-w" = dontDistribute super."ml-w";
+  "mlist" = dontDistribute super."mlist";
+  "mmtl" = dontDistribute super."mmtl";
+  "mmtl-base" = dontDistribute super."mmtl-base";
+  "mnist-idx" = dontDistribute super."mnist-idx";
+  "moan" = dontDistribute super."moan";
+  "modbus-tcp" = dontDistribute super."modbus-tcp";
+  "modelicaparser" = dontDistribute super."modelicaparser";
+  "modsplit" = dontDistribute super."modsplit";
+  "modular-arithmetic" = dontDistribute super."modular-arithmetic";
+  "modular-prelude" = dontDistribute super."modular-prelude";
+  "modular-prelude-classy" = dontDistribute super."modular-prelude-classy";
+  "module-management" = dontDistribute super."module-management";
+  "modulespection" = dontDistribute super."modulespection";
+  "modulo" = dontDistribute super."modulo";
+  "moe" = dontDistribute super."moe";
+  "mohws" = dontDistribute super."mohws";
+  "monad-abort-fd" = dontDistribute super."monad-abort-fd";
+  "monad-atom" = dontDistribute super."monad-atom";
+  "monad-atom-simple" = dontDistribute super."monad-atom-simple";
+  "monad-bool" = dontDistribute super."monad-bool";
+  "monad-classes" = dontDistribute super."monad-classes";
+  "monad-codec" = dontDistribute super."monad-codec";
+  "monad-connect" = dontDistribute super."monad-connect";
+  "monad-exception" = dontDistribute super."monad-exception";
+  "monad-fork" = dontDistribute super."monad-fork";
+  "monad-gen" = dontDistribute super."monad-gen";
+  "monad-hash" = dontDistribute super."monad-hash";
+  "monad-interleave" = dontDistribute super."monad-interleave";
+  "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
+  "monad-loops-stm" = dontDistribute super."monad-loops-stm";
+  "monad-lrs" = dontDistribute super."monad-lrs";
+  "monad-memo" = dontDistribute super."monad-memo";
+  "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
+  "monad-open" = dontDistribute super."monad-open";
+  "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
+  "monad-param" = dontDistribute super."monad-param";
+  "monad-ran" = dontDistribute super."monad-ran";
+  "monad-resumption" = dontDistribute super."monad-resumption";
+  "monad-state" = dontDistribute super."monad-state";
+  "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-stlike-io" = dontDistribute super."monad-stlike-io";
+  "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
+  "monad-supply" = dontDistribute super."monad-supply";
+  "monad-task" = dontDistribute super."monad-task";
+  "monad-time" = doDistribute super."monad-time_0_1";
+  "monad-tx" = dontDistribute super."monad-tx";
+  "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
+  "monad-wrap" = dontDistribute super."monad-wrap";
+  "monadIO" = dontDistribute super."monadIO";
+  "monadLib-compose" = dontDistribute super."monadLib-compose";
+  "monadacme" = dontDistribute super."monadacme";
+  "monadbi" = dontDistribute super."monadbi";
+  "monadfibre" = dontDistribute super."monadfibre";
+  "monadiccp" = dontDistribute super."monadiccp";
+  "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
+  "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
+  "monadlist" = dontDistribute super."monadlist";
+  "monadloc-pp" = dontDistribute super."monadloc-pp";
+  "monadplus" = dontDistribute super."monadplus";
+  "monads-fd" = dontDistribute super."monads-fd";
+  "monadtransform" = dontDistribute super."monadtransform";
+  "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
+  "mongodb-queue" = dontDistribute super."mongodb-queue";
+  "mongrel2-handler" = dontDistribute super."mongrel2-handler";
+  "monitor" = dontDistribute super."monitor";
+  "mono-foldable" = dontDistribute super."mono-foldable";
+  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-owns" = dontDistribute super."monoid-owns";
+  "monoid-record" = dontDistribute super."monoid-record";
+  "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-transformer" = dontDistribute super."monoid-transformer";
+  "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_4";
+  "monoidplus" = dontDistribute super."monoidplus";
+  "monoids" = dontDistribute super."monoids";
+  "monomorphic" = dontDistribute super."monomorphic";
+  "montage" = dontDistribute super."montage";
+  "montage-client" = dontDistribute super."montage-client";
+  "monte-carlo" = dontDistribute super."monte-carlo";
+  "moo" = dontDistribute super."moo";
+  "moonshine" = dontDistribute super."moonshine";
+  "morfette" = dontDistribute super."morfette";
+  "morfeusz" = dontDistribute super."morfeusz";
+  "morte" = doDistribute super."morte_1_4_2";
+  "mosaico-lib" = dontDistribute super."mosaico-lib";
+  "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
+  "mp" = dontDistribute super."mp";
+  "mp3decoder" = dontDistribute super."mp3decoder";
+  "mpdmate" = dontDistribute super."mpdmate";
+  "mpppc" = dontDistribute super."mpppc";
+  "mpretty" = dontDistribute super."mpretty";
+  "mpris" = dontDistribute super."mpris";
+  "mprover" = dontDistribute super."mprover";
+  "mps" = dontDistribute super."mps";
+  "mpvguihs" = dontDistribute super."mpvguihs";
+  "mqtt-hs" = dontDistribute super."mqtt-hs";
+  "mrm" = dontDistribute super."mrm";
+  "ms" = dontDistribute super."ms";
+  "msgpack" = dontDistribute super."msgpack";
+  "msgpack-aeson" = dontDistribute super."msgpack-aeson";
+  "msgpack-idl" = dontDistribute super."msgpack-idl";
+  "msgpack-rpc" = dontDistribute super."msgpack-rpc";
+  "msh" = dontDistribute super."msh";
+  "msu" = dontDistribute super."msu";
+  "mtgoxapi" = dontDistribute super."mtgoxapi";
+  "mtl-c" = dontDistribute super."mtl-c";
+  "mtl-evil-instances" = dontDistribute super."mtl-evil-instances";
+  "mtl-tf" = dontDistribute super."mtl-tf";
+  "mtl-unleashed" = dontDistribute super."mtl-unleashed";
+  "mtlparse" = dontDistribute super."mtlparse";
+  "mtlx" = dontDistribute super."mtlx";
+  "mtp" = dontDistribute super."mtp";
+  "mtree" = dontDistribute super."mtree";
+  "mucipher" = dontDistribute super."mucipher";
+  "mudbath" = dontDistribute super."mudbath";
+  "muesli" = dontDistribute super."muesli";
+  "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
+  "multext-east-msd" = dontDistribute super."multext-east-msd";
+  "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
+  "multifocal" = dontDistribute super."multifocal";
+  "multihash" = dontDistribute super."multihash";
+  "multipart-names" = dontDistribute super."multipart-names";
+  "multipass" = dontDistribute super."multipass";
+  "multiplate-simplified" = dontDistribute super."multiplate-simplified";
+  "multiplicity" = dontDistribute super."multiplicity";
+  "multirec" = dontDistribute super."multirec";
+  "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
+  "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset-comb" = dontDistribute super."multiset-comb";
+  "multisetrewrite" = dontDistribute super."multisetrewrite";
+  "multistate" = dontDistribute super."multistate";
+  "muon" = dontDistribute super."muon";
+  "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
+  "murmur3" = dontDistribute super."murmur3";
+  "murmurhash3" = dontDistribute super."murmurhash3";
+  "music-articulation" = dontDistribute super."music-articulation";
+  "music-diatonic" = dontDistribute super."music-diatonic";
+  "music-dynamics" = dontDistribute super."music-dynamics";
+  "music-dynamics-literal" = dontDistribute super."music-dynamics-literal";
+  "music-graphics" = dontDistribute super."music-graphics";
+  "music-parts" = dontDistribute super."music-parts";
+  "music-pitch" = dontDistribute super."music-pitch";
+  "music-pitch-literal" = dontDistribute super."music-pitch-literal";
+  "music-preludes" = dontDistribute super."music-preludes";
+  "music-score" = dontDistribute super."music-score";
+  "music-sibelius" = dontDistribute super."music-sibelius";
+  "music-suite" = dontDistribute super."music-suite";
+  "music-util" = dontDistribute super."music-util";
+  "musicbrainz-email" = dontDistribute super."musicbrainz-email";
+  "musicxml" = dontDistribute super."musicxml";
+  "musicxml2" = dontDistribute super."musicxml2";
+  "mustache-haskell" = dontDistribute super."mustache-haskell";
+  "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-iter" = dontDistribute super."mutable-iter";
+  "mute-unmute" = dontDistribute super."mute-unmute";
+  "mvc" = dontDistribute super."mvc";
+  "mvc-updates" = dontDistribute super."mvc-updates";
+  "mvclient" = dontDistribute super."mvclient";
+  "mwc-probability" = doDistribute super."mwc-probability_1_0_3";
+  "mwc-random-monad" = dontDistribute super."mwc-random-monad";
+  "myTestlll" = dontDistribute super."myTestlll";
+  "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
+  "myo" = dontDistribute super."myo";
+  "mysnapsession" = dontDistribute super."mysnapsession";
+  "mysnapsession-example" = dontDistribute super."mysnapsession-example";
+  "mysql-effect" = dontDistribute super."mysql-effect";
+  "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi";
+  "mysql-simple-typed" = dontDistribute super."mysql-simple-typed";
+  "mzv" = dontDistribute super."mzv";
+  "n-m" = dontDistribute super."n-m";
+  "nagios-perfdata" = dontDistribute super."nagios-perfdata";
+  "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg";
+  "named-formlet" = dontDistribute super."named-formlet";
+  "named-lock" = dontDistribute super."named-lock";
+  "named-records" = dontDistribute super."named-records";
+  "namelist" = dontDistribute super."namelist";
+  "names" = dontDistribute super."names";
+  "names-th" = dontDistribute super."names-th";
+  "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
+  "nano-hmac" = dontDistribute super."nano-hmac";
+  "nano-md5" = dontDistribute super."nano-md5";
+  "nanoAgda" = dontDistribute super."nanoAgda";
+  "nanocurses" = dontDistribute super."nanocurses";
+  "nanomsg" = dontDistribute super."nanomsg";
+  "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
+  "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanovg" = dontDistribute super."nanovg";
+  "nanq" = dontDistribute super."nanq";
+  "narc" = dontDistribute super."narc";
+  "nat" = dontDistribute super."nat";
+  "native" = dontDistribute super."native";
+  "nats-queue" = dontDistribute super."nats-queue";
+  "natural-number" = dontDistribute super."natural-number";
+  "natural-numbers" = dontDistribute super."natural-numbers";
+  "natural-transformation" = dontDistribute super."natural-transformation";
+  "naturalcomp" = dontDistribute super."naturalcomp";
+  "naturals" = dontDistribute super."naturals";
+  "naver-translate" = dontDistribute super."naver-translate";
+  "nbt" = dontDistribute super."nbt";
+  "nc-indicators" = dontDistribute super."nc-indicators";
+  "ncurses" = dontDistribute super."ncurses";
+  "neat" = dontDistribute super."neat";
+  "needle" = dontDistribute super."needle";
+  "neet" = dontDistribute super."neet";
+  "nehe-tuts" = dontDistribute super."nehe-tuts";
+  "neil" = dontDistribute super."neil";
+  "neither" = dontDistribute super."neither";
+  "nemesis" = dontDistribute super."nemesis";
+  "nemesis-titan" = dontDistribute super."nemesis-titan";
+  "nerf" = dontDistribute super."nerf";
+  "nero" = dontDistribute super."nero";
+  "nero-wai" = dontDistribute super."nero-wai";
+  "nero-warp" = dontDistribute super."nero-warp";
+  "nested-routes" = dontDistribute super."nested-routes";
+  "nested-sets" = dontDistribute super."nested-sets";
+  "nestedmap" = dontDistribute super."nestedmap";
+  "net-concurrent" = dontDistribute super."net-concurrent";
+  "netclock" = dontDistribute super."netclock";
+  "netcore" = dontDistribute super."netcore";
+  "netlines" = dontDistribute super."netlines";
+  "netlink" = dontDistribute super."netlink";
+  "netlist" = dontDistribute super."netlist";
+  "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl";
+  "netpbm" = dontDistribute super."netpbm";
+  "netrc" = dontDistribute super."netrc";
+  "netspec" = dontDistribute super."netspec";
+  "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle-frp" = dontDistribute super."nettle-frp";
+  "nettle-netkit" = dontDistribute super."nettle-netkit";
+  "nettle-openflow" = dontDistribute super."nettle-openflow";
+  "netwire" = dontDistribute super."netwire";
+  "netwire-input" = dontDistribute super."netwire-input";
+  "netwire-input-glfw" = dontDistribute super."netwire-input-glfw";
+  "network-address" = dontDistribute super."network-address";
+  "network-api-support" = dontDistribute super."network-api-support";
+  "network-bitcoin" = dontDistribute super."network-bitcoin";
+  "network-builder" = dontDistribute super."network-builder";
+  "network-bytestring" = dontDistribute super."network-bytestring";
+  "network-conduit" = dontDistribute super."network-conduit";
+  "network-connection" = dontDistribute super."network-connection";
+  "network-data" = dontDistribute super."network-data";
+  "network-dbus" = dontDistribute super."network-dbus";
+  "network-dns" = dontDistribute super."network-dns";
+  "network-enumerator" = dontDistribute super."network-enumerator";
+  "network-fancy" = dontDistribute super."network-fancy";
+  "network-interfacerequest" = dontDistribute super."network-interfacerequest";
+  "network-ip" = dontDistribute super."network-ip";
+  "network-metrics" = dontDistribute super."network-metrics";
+  "network-minihttp" = dontDistribute super."network-minihttp";
+  "network-msg" = dontDistribute super."network-msg";
+  "network-netpacket" = dontDistribute super."network-netpacket";
+  "network-pgi" = dontDistribute super."network-pgi";
+  "network-rpca" = dontDistribute super."network-rpca";
+  "network-server" = dontDistribute super."network-server";
+  "network-service" = dontDistribute super."network-service";
+  "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr";
+  "network-simple-tls" = dontDistribute super."network-simple-tls";
+  "network-socket-options" = dontDistribute super."network-socket-options";
+  "network-stream" = dontDistribute super."network-stream";
+  "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport-amqp" = dontDistribute super."network-transport-amqp";
+  "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
+  "network-uri-static" = dontDistribute super."network-uri-static";
+  "network-wai-router" = dontDistribute super."network-wai-router";
+  "network-websocket" = dontDistribute super."network-websocket";
+  "networked-game" = dontDistribute super."networked-game";
+  "newports" = dontDistribute super."newports";
+  "newsynth" = dontDistribute super."newsynth";
+  "newt" = dontDistribute super."newt";
+  "newtype-deriving" = dontDistribute super."newtype-deriving";
+  "newtype-th" = dontDistribute super."newtype-th";
+  "newtyper" = dontDistribute super."newtyper";
+  "nextstep-plist" = dontDistribute super."nextstep-plist";
+  "nf" = dontDistribute super."nf";
+  "ngrams-loader" = dontDistribute super."ngrams-loader";
+  "niagra" = dontDistribute super."niagra";
+  "nibblestring" = dontDistribute super."nibblestring";
+  "nicify" = dontDistribute super."nicify";
+  "nicovideo-translator" = dontDistribute super."nicovideo-translator";
+  "nikepub" = dontDistribute super."nikepub";
+  "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
+  "nitro" = dontDistribute super."nitro";
+  "nix-eval" = dontDistribute super."nix-eval";
+  "nixfromnpm" = dontDistribute super."nixfromnpm";
+  "nixos-types" = dontDistribute super."nixos-types";
+  "nkjp" = dontDistribute super."nkjp";
+  "nlp-scores" = dontDistribute super."nlp-scores";
+  "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts";
+  "nm" = dontDistribute super."nm";
+  "nme" = dontDistribute super."nme";
+  "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
+  "no-role-annots" = dontDistribute super."no-role-annots";
+  "nofib-analyse" = dontDistribute super."nofib-analyse";
+  "nofib-analyze" = dontDistribute super."nofib-analyze";
+  "noise" = dontDistribute super."noise";
+  "non-empty" = dontDistribute super."non-empty";
+  "non-negative" = dontDistribute super."non-negative";
+  "nondeterminism" = dontDistribute super."nondeterminism";
+  "nonempty-alternative" = dontDistribute super."nonempty-alternative";
+  "nonfree" = dontDistribute super."nonfree";
+  "nonlinear-optimization" = dontDistribute super."nonlinear-optimization";
+  "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad";
+  "noodle" = dontDistribute super."noodle";
+  "normaldistribution" = dontDistribute super."normaldistribution";
+  "not-gloss" = dontDistribute super."not-gloss";
+  "not-gloss-examples" = dontDistribute super."not-gloss-examples";
+  "not-in-base" = dontDistribute super."not-in-base";
+  "notcpp" = dontDistribute super."notcpp";
+  "notmuch-haskell" = dontDistribute super."notmuch-haskell";
+  "notmuch-web" = dontDistribute super."notmuch-web";
+  "notzero" = dontDistribute super."notzero";
+  "np-extras" = dontDistribute super."np-extras";
+  "np-linear" = dontDistribute super."np-linear";
+  "nptools" = dontDistribute super."nptools";
+  "nth-prime" = dontDistribute super."nth-prime";
+  "nthable" = dontDistribute super."nthable";
+  "ntp-control" = dontDistribute super."ntp-control";
+  "null-canvas" = dontDistribute super."null-canvas";
+  "nullary" = dontDistribute super."nullary";
+  "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
+  "numbering" = dontDistribute super."numbering";
+  "numerals" = dontDistribute super."numerals";
+  "numerals-base" = dontDistribute super."numerals-base";
+  "numeric-limits" = dontDistribute super."numeric-limits";
+  "numeric-prelude" = dontDistribute super."numeric-prelude";
+  "numeric-qq" = dontDistribute super."numeric-qq";
+  "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
+  "numeric-tools" = dontDistribute super."numeric-tools";
+  "numericpeano" = dontDistribute super."numericpeano";
+  "nums" = dontDistribute super."nums";
+  "numtype" = dontDistribute super."numtype";
+  "numtype-tf" = dontDistribute super."numtype-tf";
+  "nurbs" = dontDistribute super."nurbs";
+  "nvim-hs" = dontDistribute super."nvim-hs";
+  "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib";
+  "nyan" = dontDistribute super."nyan";
+  "nylas" = dontDistribute super."nylas";
+  "nymphaea" = dontDistribute super."nymphaea";
+  "oanda-rest-api" = dontDistribute super."oanda-rest-api";
+  "oauthenticated" = dontDistribute super."oauthenticated";
+  "obdd" = dontDistribute super."obdd";
+  "oberon0" = dontDistribute super."oberon0";
+  "obj" = dontDistribute super."obj";
+  "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
+  "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
+  "octohat" = dontDistribute super."octohat";
+  "octopus" = dontDistribute super."octopus";
+  "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
+  "oeis" = dontDistribute super."oeis";
+  "off-simple" = dontDistribute super."off-simple";
+  "ohloh-hs" = dontDistribute super."ohloh-hs";
+  "oi" = dontDistribute super."oi";
+  "oidc-client" = dontDistribute super."oidc-client";
+  "ois-input-manager" = dontDistribute super."ois-input-manager";
+  "old-version" = dontDistribute super."old-version";
+  "olwrapper" = dontDistribute super."olwrapper";
+  "omaketex" = dontDistribute super."omaketex";
+  "omega" = dontDistribute super."omega";
+  "omnicodec" = dontDistribute super."omnicodec";
+  "on-a-horse" = dontDistribute super."on-a-horse";
+  "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel";
+  "one-liner" = dontDistribute super."one-liner";
+  "one-time-password" = dontDistribute super."one-time-password";
+  "oneOfN" = dontDistribute super."oneOfN";
+  "oneormore" = dontDistribute super."oneormore";
+  "only" = dontDistribute super."only";
+  "onu-course" = dontDistribute super."onu-course";
+  "opaleye-classy" = dontDistribute super."opaleye-classy";
+  "opaleye-sqlite" = dontDistribute super."opaleye-sqlite";
+  "opaleye-trans" = dontDistribute super."opaleye-trans";
+  "open-haddock" = dontDistribute super."open-haddock";
+  "open-pandoc" = dontDistribute super."open-pandoc";
+  "open-signals" = dontDistribute super."open-signals";
+  "open-symbology" = dontDistribute super."open-symbology";
+  "open-typerep" = dontDistribute super."open-typerep";
+  "open-union" = dontDistribute super."open-union";
+  "open-witness" = dontDistribute super."open-witness";
+  "opencog-atomspace" = dontDistribute super."opencog-atomspace";
+  "opencv-raw" = dontDistribute super."opencv-raw";
+  "opendatatable" = dontDistribute super."opendatatable";
+  "openexchangerates" = dontDistribute super."openexchangerates";
+  "openflow" = dontDistribute super."openflow";
+  "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
+  "opengles" = dontDistribute super."opengles";
+  "openid" = dontDistribute super."openid";
+  "openpgp" = dontDistribute super."openpgp";
+  "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
+  "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
+  "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
+  "openssh-github-keys" = dontDistribute super."openssh-github-keys";
+  "openssl-createkey" = dontDistribute super."openssl-createkey";
+  "opentheory" = dontDistribute super."opentheory";
+  "opentheory-bits" = dontDistribute super."opentheory-bits";
+  "opentheory-byte" = dontDistribute super."opentheory-byte";
+  "opentheory-char" = dontDistribute super."opentheory-char";
+  "opentheory-divides" = dontDistribute super."opentheory-divides";
+  "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci";
+  "opentheory-parser" = dontDistribute super."opentheory-parser";
+  "opentheory-prime" = dontDistribute super."opentheory-prime";
+  "opentheory-primitive" = dontDistribute super."opentheory-primitive";
+  "opentheory-probability" = dontDistribute super."opentheory-probability";
+  "opentheory-stream" = dontDistribute super."opentheory-stream";
+  "opentheory-unicode" = dontDistribute super."opentheory-unicode";
+  "operational-alacarte" = dontDistribute super."operational-alacarte";
+  "operational-extra" = dontDistribute super."operational-extra";
+  "opml" = dontDistribute super."opml";
+  "opml-conduit" = doDistribute super."opml-conduit_0_4_0_1";
+  "opn" = dontDistribute super."opn";
+  "optimal-blocks" = dontDistribute super."optimal-blocks";
+  "optimization" = dontDistribute super."optimization";
+  "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
+  "optional" = dontDistribute super."optional";
+  "options-time" = dontDistribute super."options-time";
+  "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
+  "orc" = dontDistribute super."orc";
+  "orchestrate" = dontDistribute super."orchestrate";
+  "orchid" = dontDistribute super."orchid";
+  "orchid-demo" = dontDistribute super."orchid-demo";
+  "ord-adhoc" = dontDistribute super."ord-adhoc";
+  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
+  "order-statistics" = dontDistribute super."order-statistics";
+  "ordered" = dontDistribute super."ordered";
+  "orders" = dontDistribute super."orders";
+  "ordrea" = dontDistribute super."ordrea";
+  "organize-imports" = dontDistribute super."organize-imports";
+  "orgmode" = dontDistribute super."orgmode";
+  "orgmode-parse" = dontDistribute super."orgmode-parse";
+  "origami" = dontDistribute super."origami";
+  "os-release" = dontDistribute super."os-release";
+  "osc" = dontDistribute super."osc";
+  "osm-conduit" = dontDistribute super."osm-conduit";
+  "osm-download" = dontDistribute super."osm-download";
+  "oso2pdf" = dontDistribute super."oso2pdf";
+  "osx-ar" = dontDistribute super."osx-ar";
+  "ot" = dontDistribute super."ot";
+  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
+  "overture" = dontDistribute super."overture";
+  "pack" = dontDistribute super."pack";
+  "package-o-tron" = dontDistribute super."package-o-tron";
+  "package-vt" = dontDistribute super."package-vt";
+  "packdeps" = dontDistribute super."packdeps";
+  "packed-dawg" = dontDistribute super."packed-dawg";
+  "packedstring" = dontDistribute super."packedstring";
+  "packer" = dontDistribute super."packer";
+  "packman" = dontDistribute super."packman";
+  "packunused" = dontDistribute super."packunused";
+  "pacman-memcache" = dontDistribute super."pacman-memcache";
+  "padKONTROL" = dontDistribute super."padKONTROL";
+  "pagarme" = dontDistribute super."pagarme";
+  "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palindromes" = dontDistribute super."palindromes";
+  "pam" = dontDistribute super."pam";
+  "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_16_0_2";
+  "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
+  "pandoc-crossref" = dontDistribute super."pandoc-crossref";
+  "pandoc-csv2table" = dontDistribute super."pandoc-csv2table";
+  "pandoc-include" = dontDistribute super."pandoc-include";
+  "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters";
+  "pandoc-lens" = dontDistribute super."pandoc-lens";
+  "pandoc-placetable" = dontDistribute super."pandoc-placetable";
+  "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-unlit" = dontDistribute super."pandoc-unlit";
+  "papillon" = dontDistribute super."papillon";
+  "pappy" = dontDistribute super."pappy";
+  "para" = dontDistribute super."para";
+  "paragon" = dontDistribute super."paragon";
+  "parallel-tasks" = dontDistribute super."parallel-tasks";
+  "parallel-tree-search" = dontDistribute super."parallel-tree-search";
+  "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
+  "parco" = dontDistribute super."parco";
+  "parco-attoparsec" = dontDistribute super."parco-attoparsec";
+  "parco-parsec" = dontDistribute super."parco-parsec";
+  "parcom-lib" = dontDistribute super."parcom-lib";
+  "parconc-examples" = dontDistribute super."parconc-examples";
+  "parport" = dontDistribute super."parport";
+  "parse-dimacs" = dontDistribute super."parse-dimacs";
+  "parse-help" = dontDistribute super."parse-help";
+  "parsec-extra" = dontDistribute super."parsec-extra";
+  "parsec-numbers" = dontDistribute super."parsec-numbers";
+  "parsec-parsers" = dontDistribute super."parsec-parsers";
+  "parsec-permutation" = dontDistribute super."parsec-permutation";
+  "parsec-tagsoup" = dontDistribute super."parsec-tagsoup";
+  "parsec-trace" = dontDistribute super."parsec-trace";
+  "parsec-utils" = dontDistribute super."parsec-utils";
+  "parsec1" = dontDistribute super."parsec1";
+  "parsec2" = dontDistribute super."parsec2";
+  "parsec3" = dontDistribute super."parsec3";
+  "parsec3-numbers" = dontDistribute super."parsec3-numbers";
+  "parsedate" = dontDistribute super."parsedate";
+  "parsek" = dontDistribute super."parsek";
+  "parsely" = dontDistribute super."parsely";
+  "parser-helper" = dontDistribute super."parser-helper";
+  "parser241" = dontDistribute super."parser241";
+  "parsergen" = dontDistribute super."parsergen";
+  "parsestar" = dontDistribute super."parsestar";
+  "parsimony" = dontDistribute super."parsimony";
+  "partage" = dontDistribute super."partage";
+  "partial" = dontDistribute super."partial";
+  "partial-lens" = dontDistribute super."partial-lens";
+  "partial-uri" = dontDistribute super."partial-uri";
+  "partly" = dontDistribute super."partly";
+  "passage" = dontDistribute super."passage";
+  "passwords" = dontDistribute super."passwords";
+  "pastis" = dontDistribute super."pastis";
+  "pasty" = dontDistribute super."pasty";
+  "patch-combinators" = dontDistribute super."patch-combinators";
+  "patch-image" = dontDistribute super."patch-image";
+  "path-io" = doDistribute super."path-io_0_2_0";
+  "pathfinding" = dontDistribute super."pathfinding";
+  "pathfindingcore" = dontDistribute super."pathfindingcore";
+  "pathtype" = dontDistribute super."pathtype";
+  "patronscraper" = dontDistribute super."patronscraper";
+  "patterns" = dontDistribute super."patterns";
+  "paymill" = dontDistribute super."paymill";
+  "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops";
+  "paypal-api" = dontDistribute super."paypal-api";
+  "pb" = dontDistribute super."pb";
+  "pbc4hs" = dontDistribute super."pbc4hs";
+  "pbkdf" = dontDistribute super."pbkdf";
+  "pcap-conduit" = dontDistribute super."pcap-conduit";
+  "pcap-enumerator" = dontDistribute super."pcap-enumerator";
+  "pcd-loader" = dontDistribute super."pcd-loader";
+  "pcf" = dontDistribute super."pcf";
+  "pcg-random" = dontDistribute super."pcg-random";
+  "pcre-less" = dontDistribute super."pcre-less";
+  "pcre-light-extra" = dontDistribute super."pcre-light-extra";
+  "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer";
+  "pdf2line" = dontDistribute super."pdf2line";
+  "pdfsplit" = dontDistribute super."pdfsplit";
+  "pdynload" = dontDistribute super."pdynload";
+  "peakachu" = dontDistribute super."peakachu";
+  "peano" = dontDistribute super."peano";
+  "peano-inf" = dontDistribute super."peano-inf";
+  "pec" = dontDistribute super."pec";
+  "pecoff" = dontDistribute super."pecoff";
+  "peg" = dontDistribute super."peg";
+  "peggy" = dontDistribute super."peggy";
+  "pell" = dontDistribute super."pell";
+  "penn-treebank" = dontDistribute super."penn-treebank";
+  "penny" = dontDistribute super."penny";
+  "penny-bin" = dontDistribute super."penny-bin";
+  "penny-lib" = dontDistribute super."penny-lib";
+  "peparser" = dontDistribute super."peparser";
+  "perceptron" = dontDistribute super."perceptron";
+  "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
+  "period" = dontDistribute super."period";
+  "perm" = dontDistribute super."perm";
+  "permutation" = dontDistribute super."permutation";
+  "permute" = dontDistribute super."permute";
+  "persist2er" = dontDistribute super."persist2er";
+  "persistable-record" = dontDistribute super."persistable-record";
+  "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-audit" = dontDistribute super."persistent-audit";
+  "persistent-cereal" = dontDistribute super."persistent-cereal";
+  "persistent-database-url" = dontDistribute super."persistent-database-url";
+  "persistent-equivalence" = dontDistribute super."persistent-equivalence";
+  "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
+  "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
+  "persistent-map" = dontDistribute super."persistent-map";
+  "persistent-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-protobuf" = dontDistribute super."persistent-protobuf";
+  "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
+  "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-vector" = dontDistribute super."persistent-vector";
+  "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
+  "persona" = dontDistribute super."persona";
+  "persona-idp" = dontDistribute super."persona-idp";
+  "pesca" = dontDistribute super."pesca";
+  "peyotls" = dontDistribute super."peyotls";
+  "peyotls-codec" = dontDistribute super."peyotls-codec";
+  "pez" = dontDistribute super."pez";
+  "pg-harness" = dontDistribute super."pg-harness";
+  "pg-harness-client" = dontDistribute super."pg-harness-client";
+  "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
+  "pgdl" = dontDistribute super."pgdl";
+  "pgm" = dontDistribute super."pgm";
+  "pgsql-simple" = dontDistribute super."pgsql-simple";
+  "pgstream" = dontDistribute super."pgstream";
+  "phasechange" = dontDistribute super."phasechange";
+  "phizzle" = dontDistribute super."phizzle";
+  "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
+  "phone-numbers" = dontDistribute super."phone-numbers";
+  "phone-push" = dontDistribute super."phone-push";
+  "phonetic-code" = dontDistribute super."phonetic-code";
+  "phooey" = dontDistribute super."phooey";
+  "photoname" = dontDistribute super."photoname";
+  "phraskell" = dontDistribute super."phraskell";
+  "phybin" = dontDistribute super."phybin";
+  "pi-calculus" = dontDistribute super."pi-calculus";
+  "pia-forward" = dontDistribute super."pia-forward";
+  "pianola" = dontDistribute super."pianola";
+  "picologic" = dontDistribute super."picologic";
+  "picosat" = dontDistribute super."picosat";
+  "piet" = dontDistribute super."piet";
+  "piki" = dontDistribute super."piki";
+  "pinboard" = dontDistribute super."pinboard";
+  "pinchot" = doDistribute super."pinchot_0_6_0_0";
+  "pipe-enumerator" = dontDistribute super."pipe-enumerator";
+  "pipeclip" = dontDistribute super."pipeclip";
+  "pipes-async" = dontDistribute super."pipes-async";
+  "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
+  "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
+  "pipes-cellular" = dontDistribute super."pipes-cellular";
+  "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
+  "pipes-cereal" = dontDistribute super."pipes-cereal";
+  "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus";
+  "pipes-conduit" = dontDistribute super."pipes-conduit";
+  "pipes-core" = dontDistribute super."pipes-core";
+  "pipes-courier" = dontDistribute super."pipes-courier";
+  "pipes-errors" = dontDistribute super."pipes-errors";
+  "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
+  "pipes-network-tls" = dontDistribute super."pipes-network-tls";
+  "pipes-p2p" = dontDistribute super."pipes-p2p";
+  "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
+  "pipes-rt" = dontDistribute super."pipes-rt";
+  "pipes-shell" = dontDistribute super."pipes-shell";
+  "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-transduce" = dontDistribute super."pipes-transduce";
+  "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-websockets" = dontDistribute super."pipes-websockets";
+  "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
+  "pipes-zlib" = dontDistribute super."pipes-zlib";
+  "pisigma" = dontDistribute super."pisigma";
+  "pit" = dontDistribute super."pit";
+  "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
+  "pkcs1" = dontDistribute super."pkcs1";
+  "pkcs7" = dontDistribute super."pkcs7";
+  "pkggraph" = dontDistribute super."pkggraph";
+  "pktree" = dontDistribute super."pktree";
+  "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
+  "planar-graph" = dontDistribute super."planar-graph";
+  "plat" = dontDistribute super."plat";
+  "playlists" = dontDistribute super."playlists";
+  "plist" = dontDistribute super."plist";
+  "plist-buddy" = dontDistribute super."plist-buddy";
+  "plivo" = dontDistribute super."plivo";
+  "plot-lab" = dontDistribute super."plot-lab";
+  "plotfont" = dontDistribute super."plotfont";
+  "plotserver-api" = dontDistribute super."plotserver-api";
+  "plugins" = dontDistribute super."plugins";
+  "plugins-auto" = dontDistribute super."plugins-auto";
+  "plugins-multistage" = dontDistribute super."plugins-multistage";
+  "plumbers" = dontDistribute super."plumbers";
+  "ply-loader" = dontDistribute super."ply-loader";
+  "png-file" = dontDistribute super."png-file";
+  "pngload" = dontDistribute super."pngload";
+  "pngload-fixed" = dontDistribute super."pngload-fixed";
+  "pnm" = dontDistribute super."pnm";
+  "pocket-dns" = dontDistribute super."pocket-dns";
+  "pointfree" = dontDistribute super."pointfree";
+  "pointful" = dontDistribute super."pointful";
+  "pointless-fun" = dontDistribute super."pointless-fun";
+  "pointless-haskell" = dontDistribute super."pointless-haskell";
+  "pointless-lenses" = dontDistribute super."pointless-lenses";
+  "pointless-rewrite" = dontDistribute super."pointless-rewrite";
+  "poker-eval" = dontDistribute super."poker-eval";
+  "pokitdok" = dontDistribute super."pokitdok";
+  "polar" = dontDistribute super."polar";
+  "polar-configfile" = dontDistribute super."polar-configfile";
+  "polar-shader" = dontDistribute super."polar-shader";
+  "polh-lexicon" = dontDistribute super."polh-lexicon";
+  "polimorf" = dontDistribute super."polimorf";
+  "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
+  "polyToMonoid" = dontDistribute super."polyToMonoid";
+  "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
+  "polynomial" = dontDistribute super."polynomial";
+  "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
+  "polyseq" = dontDistribute super."polyseq";
+  "polysoup" = dontDistribute super."polysoup";
+  "polytypeable" = dontDistribute super."polytypeable";
+  "polytypeable-utils" = dontDistribute super."polytypeable-utils";
+  "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
+  "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
+  "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
+  "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
+  "pony" = dontDistribute super."pony";
+  "pool" = dontDistribute super."pool";
+  "pool-conduit" = dontDistribute super."pool-conduit";
+  "pooled-io" = dontDistribute super."pooled-io";
+  "pop3-client" = dontDistribute super."pop3-client";
+  "popenhs" = dontDistribute super."popenhs";
+  "poppler" = dontDistribute super."poppler";
+  "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache";
+  "portable-lines" = dontDistribute super."portable-lines";
+  "portaudio" = dontDistribute super."portaudio";
+  "porte" = dontDistribute super."porte";
+  "porter" = dontDistribute super."porter";
+  "ports" = dontDistribute super."ports";
+  "ports-tools" = dontDistribute super."ports-tools";
+  "positive" = dontDistribute super."positive";
+  "posix-acl" = dontDistribute super."posix-acl";
+  "posix-escape" = dontDistribute super."posix-escape";
+  "posix-filelock" = dontDistribute super."posix-filelock";
+  "posix-paths" = dontDistribute super."posix-paths";
+  "posix-pty" = dontDistribute super."posix-pty";
+  "posix-timer" = dontDistribute super."posix-timer";
+  "posix-waitpid" = dontDistribute super."posix-waitpid";
+  "possible" = dontDistribute super."possible";
+  "postcodes" = dontDistribute super."postcodes";
+  "postgresql-binary" = doDistribute super."postgresql-binary_0_7_9";
+  "postgresql-config" = dontDistribute super."postgresql-config";
+  "postgresql-connector" = dontDistribute super."postgresql-connector";
+  "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape";
+  "postgresql-cube" = dontDistribute super."postgresql-cube";
+  "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
+  "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_5_1_2";
+  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
+  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
+  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
+  "postgresql-typed" = dontDistribute super."postgresql-typed";
+  "postgrest" = dontDistribute super."postgrest";
+  "postie" = dontDistribute super."postie";
+  "postmark" = dontDistribute super."postmark";
+  "postmaster" = dontDistribute super."postmaster";
+  "potato-tool" = dontDistribute super."potato-tool";
+  "potrace" = dontDistribute super."potrace";
+  "potrace-diagrams" = dontDistribute super."potrace-diagrams";
+  "powermate" = dontDistribute super."powermate";
+  "powerpc" = dontDistribute super."powerpc";
+  "ppm" = dontDistribute super."ppm";
+  "pqc" = dontDistribute super."pqc";
+  "pqueue-mtl" = dontDistribute super."pqueue-mtl";
+  "practice-room" = dontDistribute super."practice-room";
+  "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
+  "pred-trie" = doDistribute super."pred-trie_0_5_0";
+  "predicates" = dontDistribute super."predicates";
+  "prednote-test" = dontDistribute super."prednote-test";
+  "prefork" = dontDistribute super."prefork";
+  "pregame" = dontDistribute super."pregame";
+  "prelude-compat" = dontDistribute super."prelude-compat";
+  "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-generalize" = dontDistribute super."prelude-generalize";
+  "prelude-plus" = dontDistribute super."prelude-plus";
+  "prelude-prime" = dontDistribute super."prelude-prime";
+  "prelude-safeenum" = dontDistribute super."prelude-safeenum";
+  "prelude2010" = dontDistribute super."prelude2010";
+  "preprocess-haskell" = dontDistribute super."preprocess-haskell";
+  "preprocessor-tools" = dontDistribute super."preprocessor-tools";
+  "present" = dontDistribute super."present";
+  "press" = dontDistribute super."press";
+  "presto-hdbc" = dontDistribute super."presto-hdbc";
+  "prettify" = dontDistribute super."prettify";
+  "pretty-compact" = dontDistribute super."pretty-compact";
+  "pretty-error" = dontDistribute super."pretty-error";
+  "pretty-hex" = dontDistribute super."pretty-hex";
+  "pretty-ncols" = dontDistribute super."pretty-ncols";
+  "pretty-sop" = dontDistribute super."pretty-sop";
+  "pretty-tree" = dontDistribute super."pretty-tree";
+  "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
+  "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
+  "primula-board" = dontDistribute super."primula-board";
+  "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
+  "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
+  "printxosd" = dontDistribute super."printxosd";
+  "priority-queue" = dontDistribute super."priority-queue";
+  "priority-sync" = dontDistribute super."priority-sync";
+  "privileged-concurrency" = dontDistribute super."privileged-concurrency";
+  "prizm" = dontDistribute super."prizm";
+  "probability" = dontDistribute super."probability";
+  "probable" = dontDistribute super."probable";
+  "proc" = dontDistribute super."proc";
+  "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_7";
+  "process-iterio" = dontDistribute super."process-iterio";
+  "process-leksah" = dontDistribute super."process-leksah";
+  "process-listlike" = dontDistribute super."process-listlike";
+  "process-progress" = dontDistribute super."process-progress";
+  "process-qq" = dontDistribute super."process-qq";
+  "process-streaming" = dontDistribute super."process-streaming";
+  "processing" = dontDistribute super."processing";
+  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
+  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
+  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
+  "procstat" = dontDistribute super."procstat";
+  "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
+  "prof2dot" = dontDistribute super."prof2dot";
+  "prof2pretty" = dontDistribute super."prof2pretty";
+  "profiteur" = dontDistribute super."profiteur";
+  "progress" = dontDistribute super."progress";
+  "progressbar" = dontDistribute super."progressbar";
+  "progression" = dontDistribute super."progression";
+  "progressive" = dontDistribute super."progressive";
+  "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings";
+  "projection" = dontDistribute super."projection";
+  "prolog" = dontDistribute super."prolog";
+  "prolog-graph" = dontDistribute super."prolog-graph";
+  "prolog-graph-lib" = dontDistribute super."prolog-graph-lib";
+  "prologue" = dontDistribute super."prologue";
+  "prometheus" = dontDistribute super."prometheus";
+  "promise" = dontDistribute super."promise";
+  "promises" = dontDistribute super."promises";
+  "propane" = dontDistribute super."propane";
+  "propellor" = dontDistribute super."propellor";
+  "properties" = dontDistribute super."properties";
+  "property-list" = dontDistribute super."property-list";
+  "proplang" = dontDistribute super."proplang";
+  "props" = dontDistribute super."props";
+  "prosper" = dontDistribute super."prosper";
+  "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
+  "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12";
+  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
+  "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork";
+  "protolude" = dontDistribute super."protolude";
+  "proton-haskell" = dontDistribute super."proton-haskell";
+  "prototype" = dontDistribute super."prototype";
+  "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
+  "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "psc-ide" = doDistribute super."psc-ide_0_5_0";
+  "pseudo-boolean" = dontDistribute super."pseudo-boolean";
+  "pseudo-trie" = dontDistribute super."pseudo-trie";
+  "pseudomacros" = dontDistribute super."pseudomacros";
+  "psql-helpers" = dontDistribute super."psql-helpers";
+  "pub" = dontDistribute super."pub";
+  "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
+  "publicsuffixlist" = dontDistribute super."publicsuffixlist";
+  "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate";
+  "pubnub" = dontDistribute super."pubnub";
+  "pubsub" = dontDistribute super."pubsub";
+  "puffytools" = dontDistribute super."puffytools";
+  "pugixml" = dontDistribute super."pugixml";
+  "pugs-DrIFT" = dontDistribute super."pugs-DrIFT";
+  "pugs-HsSyck" = dontDistribute super."pugs-HsSyck";
+  "pugs-compat" = dontDistribute super."pugs-compat";
+  "pugs-hsregex" = dontDistribute super."pugs-hsregex";
+  "pulse-simple" = dontDistribute super."pulse-simple";
+  "punkt" = dontDistribute super."punkt";
+  "punycode" = dontDistribute super."punycode";
+  "puppetresources" = dontDistribute super."puppetresources";
+  "pure-fft" = dontDistribute super."pure-fft";
+  "pure-priority-queue" = dontDistribute super."pure-priority-queue";
+  "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
+  "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript" = doDistribute super."purescript_0_7_6_1";
+  "purescript-bridge" = dontDistribute super."purescript-bridge";
+  "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
+  "push-notify" = dontDistribute super."push-notify";
+  "push-notify-ccs" = dontDistribute super."push-notify-ccs";
+  "push-notify-general" = dontDistribute super."push-notify-general";
+  "pusher-haskell" = dontDistribute super."pusher-haskell";
+  "pushme" = dontDistribute super."pushme";
+  "putlenses" = dontDistribute super."putlenses";
+  "puzzle-draw" = dontDistribute super."puzzle-draw";
+  "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline";
+  "pvd" = dontDistribute super."pvd";
+  "pwstore-cli" = dontDistribute super."pwstore-cli";
+  "pxsl-tools" = dontDistribute super."pxsl-tools";
+  "pyffi" = dontDistribute super."pyffi";
+  "pyfi" = dontDistribute super."pyfi";
+  "python-pickle" = dontDistribute super."python-pickle";
+  "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator";
+  "qd" = dontDistribute super."qd";
+  "qd-vec" = dontDistribute super."qd-vec";
+  "qed" = dontDistribute super."qed";
+  "qhull-simple" = dontDistribute super."qhull-simple";
+  "qrcode" = dontDistribute super."qrcode";
+  "qt" = dontDistribute super."qt";
+  "quadratic-irrational" = dontDistribute super."quadratic-irrational";
+  "quantfin" = dontDistribute super."quantfin";
+  "quantities" = dontDistribute super."quantities";
+  "quantum-arrow" = dontDistribute super."quantum-arrow";
+  "qudb" = dontDistribute super."qudb";
+  "quenya-verb" = dontDistribute super."quenya-verb";
+  "querystring-pickle" = dontDistribute super."querystring-pickle";
+  "queue" = dontDistribute super."queue";
+  "queuelike" = dontDistribute super."queuelike";
+  "quick-generator" = dontDistribute super."quick-generator";
+  "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-combinators" = dontDistribute super."quickcheck-combinators";
+  "quickcheck-poly" = dontDistribute super."quickcheck-poly";
+  "quickcheck-properties" = dontDistribute super."quickcheck-properties";
+  "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
+  "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad";
+  "quickcheck-regex" = dontDistribute super."quickcheck-regex";
+  "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng";
+  "quickcheck-rematch" = dontDistribute super."quickcheck-rematch";
+  "quickcheck-script" = dontDistribute super."quickcheck-script";
+  "quickcheck-simple" = dontDistribute super."quickcheck-simple";
+  "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver";
+  "quicklz" = dontDistribute super."quicklz";
+  "quickpull" = dontDistribute super."quickpull";
+  "quickset" = dontDistribute super."quickset";
+  "quickspec" = dontDistribute super."quickspec";
+  "quicktest" = dontDistribute super."quicktest";
+  "quickwebapp" = dontDistribute super."quickwebapp";
+  "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
+  "quiver-bytestring" = dontDistribute super."quiver-bytestring";
+  "quiver-cell" = dontDistribute super."quiver-cell";
+  "quiver-csv" = dontDistribute super."quiver-csv";
+  "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
+  "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-instances" = dontDistribute super."quiver-instances";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
+  "quiver-sort" = dontDistribute super."quiver-sort";
+  "quoridor-hs" = dontDistribute super."quoridor-hs";
+  "qux" = dontDistribute super."qux";
+  "rabocsv2qif" = dontDistribute super."rabocsv2qif";
+  "rad" = dontDistribute super."rad";
+  "radian" = dontDistribute super."radian";
+  "radium" = dontDistribute super."radium";
+  "radium-formula-parser" = dontDistribute super."radium-formula-parser";
+  "radix" = dontDistribute super."radix";
+  "rados-haskell" = dontDistribute super."rados-haskell";
+  "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
+  "rainbow" = doDistribute super."rainbow_0_26_0_6";
+  "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
+  "rake" = dontDistribute super."rake";
+  "rakhana" = dontDistribute super."rakhana";
+  "ralist" = dontDistribute super."ralist";
+  "rallod" = dontDistribute super."rallod";
+  "raml" = dontDistribute super."raml";
+  "rand-vars" = dontDistribute super."rand-vars";
+  "randfile" = dontDistribute super."randfile";
+  "random-access-list" = dontDistribute super."random-access-list";
+  "random-derive" = dontDistribute super."random-derive";
+  "random-eff" = dontDistribute super."random-eff";
+  "random-effin" = dontDistribute super."random-effin";
+  "random-extras" = dontDistribute super."random-extras";
+  "random-hypergeometric" = dontDistribute super."random-hypergeometric";
+  "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
+  "random-variates" = dontDistribute super."random-variates";
+  "randomgen" = dontDistribute super."randomgen";
+  "randproc" = dontDistribute super."randproc";
+  "randsolid" = dontDistribute super."randsolid";
+  "range-space" = dontDistribute super."range-space";
+  "rangemin" = dontDistribute super."rangemin";
+  "ranges" = dontDistribute super."ranges";
+  "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
+  "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
+  "ratio-int" = dontDistribute super."ratio-int";
+  "raven-haskell" = dontDistribute super."raven-haskell";
+  "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
+  "rawstring-qm" = dontDistribute super."rawstring-qm";
+  "razom-text-util" = dontDistribute super."razom-text-util";
+  "rbr" = dontDistribute super."rbr";
+  "rclient" = dontDistribute super."rclient";
+  "rcu" = dontDistribute super."rcu";
+  "rdf4h" = dontDistribute super."rdf4h";
+  "rdioh" = dontDistribute super."rdioh";
+  "rdtsc" = dontDistribute super."rdtsc";
+  "rdtsc-enolan" = dontDistribute super."rdtsc-enolan";
+  "re2" = dontDistribute super."re2";
+  "react-flux" = dontDistribute super."react-flux";
+  "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
+  "reaction-logic" = dontDistribute super."reaction-logic";
+  "reactive" = dontDistribute super."reactive";
+  "reactive-bacon" = dontDistribute super."reactive-bacon";
+  "reactive-balsa" = dontDistribute super."reactive-balsa";
+  "reactive-banana" = dontDistribute super."reactive-banana";
+  "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
+  "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
+  "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
+  "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
+  "reactive-glut" = dontDistribute super."reactive-glut";
+  "reactive-haskell" = dontDistribute super."reactive-haskell";
+  "reactive-io" = dontDistribute super."reactive-io";
+  "reactive-thread" = dontDistribute super."reactive-thread";
+  "reactivity" = dontDistribute super."reactivity";
+  "reactor" = dontDistribute super."reactor";
+  "read-bounded" = dontDistribute super."read-bounded";
+  "read-env-var" = dontDistribute super."read-env-var";
+  "readline-statevar" = dontDistribute super."readline-statevar";
+  "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
+  "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
+  "reasonable-lens" = dontDistribute super."reasonable-lens";
+  "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
+  "recaptcha" = dontDistribute super."recaptcha";
+  "record" = dontDistribute super."record";
+  "record-aeson" = dontDistribute super."record-aeson";
+  "record-gl" = dontDistribute super."record-gl";
+  "record-preprocessor" = dontDistribute super."record-preprocessor";
+  "record-syntax" = dontDistribute super."record-syntax";
+  "records" = dontDistribute super."records";
+  "records-th" = dontDistribute super."records-th";
+  "recursive-line-count" = dontDistribute super."recursive-line-count";
+  "redHandlers" = dontDistribute super."redHandlers";
+  "reddit" = dontDistribute super."reddit";
+  "redis" = dontDistribute super."redis";
+  "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_2";
+  "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
+  "redis-simple" = dontDistribute super."redis-simple";
+  "redo" = dontDistribute super."redo";
+  "reedsolomon" = dontDistribute super."reedsolomon";
+  "reenact" = dontDistribute super."reenact";
+  "reexport-crypto-random" = dontDistribute super."reexport-crypto-random";
+  "ref" = dontDistribute super."ref";
+  "ref-mtl" = dontDistribute super."ref-mtl";
+  "ref-tf" = dontDistribute super."ref-tf";
+  "refcount" = dontDistribute super."refcount";
+  "reference" = dontDistribute super."reference";
+  "references" = dontDistribute super."references";
+  "refh" = dontDistribute super."refh";
+  "refined" = dontDistribute super."refined";
+  "reflection-extras" = dontDistribute super."reflection-extras";
+  "reflection-without-remorse" = dontDistribute super."reflection-without-remorse";
+  "reflex" = dontDistribute super."reflex";
+  "reflex-animation" = dontDistribute super."reflex-animation";
+  "reflex-dom" = dontDistribute super."reflex-dom";
+  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
+  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
+  "reflex-orphans" = dontDistribute super."reflex-orphans";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
+  "regex-deriv" = dontDistribute super."regex-deriv";
+  "regex-dfa" = dontDistribute super."regex-dfa";
+  "regex-easy" = dontDistribute super."regex-easy";
+  "regex-genex" = dontDistribute super."regex-genex";
+  "regex-parsec" = dontDistribute super."regex-parsec";
+  "regex-pderiv" = dontDistribute super."regex-pderiv";
+  "regex-posix-unittest" = dontDistribute super."regex-posix-unittest";
+  "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes";
+  "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter";
+  "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
+  "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
+  "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
+  "regex-xmlschema" = dontDistribute super."regex-xmlschema";
+  "regexchar" = dontDistribute super."regexchar";
+  "regexdot" = dontDistribute super."regexdot";
+  "regexp-tries" = dontDistribute super."regexp-tries";
+  "regexpr" = dontDistribute super."regexpr";
+  "regexpr-symbolic" = dontDistribute super."regexpr-symbolic";
+  "regexqq" = dontDistribute super."regexqq";
+  "regional-pointers" = dontDistribute super."regional-pointers";
+  "regions" = dontDistribute super."regions";
+  "regions-monadsfd" = dontDistribute super."regions-monadsfd";
+  "regions-monadstf" = dontDistribute super."regions-monadstf";
+  "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
+  "regress" = dontDistribute super."regress";
+  "regular" = dontDistribute super."regular";
+  "regular-extras" = dontDistribute super."regular-extras";
+  "regular-web" = dontDistribute super."regular-web";
+  "regular-xmlpickler" = dontDistribute super."regular-xmlpickler";
+  "reheat" = dontDistribute super."reheat";
+  "rehoo" = dontDistribute super."rehoo";
+  "rei" = dontDistribute super."rei";
+  "reified-records" = dontDistribute super."reified-records";
+  "reify" = dontDistribute super."reify";
+  "relacion" = dontDistribute super."relacion";
+  "relation" = dontDistribute super."relation";
+  "relational-postgresql8" = dontDistribute super."relational-postgresql8";
+  "relational-query" = dontDistribute super."relational-query";
+  "relational-query-HDBC" = dontDistribute super."relational-query-HDBC";
+  "relational-record" = dontDistribute super."relational-record";
+  "relational-record-examples" = dontDistribute super."relational-record-examples";
+  "relational-schemas" = dontDistribute super."relational-schemas";
+  "relative-date" = dontDistribute super."relative-date";
+  "relit" = dontDistribute super."relit";
+  "rematch" = dontDistribute super."rematch";
+  "rematch-text" = dontDistribute super."rematch-text";
+  "remote" = dontDistribute super."remote";
+  "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-json" = dontDistribute super."remote-json";
+  "remote-json-client" = dontDistribute super."remote-json-client";
+  "remote-json-server" = dontDistribute super."remote-json-server";
+  "remote-monad" = dontDistribute super."remote-monad";
+  "remotion" = dontDistribute super."remotion";
+  "renderable" = dontDistribute super."renderable";
+  "reord" = dontDistribute super."reord";
+  "reorderable" = dontDistribute super."reorderable";
+  "repa-array" = dontDistribute super."repa-array";
+  "repa-bytestring" = dontDistribute super."repa-bytestring";
+  "repa-convert" = dontDistribute super."repa-convert";
+  "repa-eval" = dontDistribute super."repa-eval";
+  "repa-examples" = dontDistribute super."repa-examples";
+  "repa-fftw" = dontDistribute super."repa-fftw";
+  "repa-flow" = dontDistribute super."repa-flow";
+  "repa-linear-algebra" = dontDistribute super."repa-linear-algebra";
+  "repa-plugin" = dontDistribute super."repa-plugin";
+  "repa-scalar" = dontDistribute super."repa-scalar";
+  "repa-series" = dontDistribute super."repa-series";
+  "repa-sndfile" = dontDistribute super."repa-sndfile";
+  "repa-stream" = dontDistribute super."repa-stream";
+  "repa-v4l2" = dontDistribute super."repa-v4l2";
+  "repl" = dontDistribute super."repl";
+  "repl-toolkit" = dontDistribute super."repl-toolkit";
+  "repline" = dontDistribute super."repline";
+  "repo-based-blog" = dontDistribute super."repo-based-blog";
+  "repr" = dontDistribute super."repr";
+  "repr-tree-syb" = dontDistribute super."repr-tree-syb";
+  "representable-functors" = dontDistribute super."representable-functors";
+  "representable-profunctors" = dontDistribute super."representable-profunctors";
+  "representable-tries" = dontDistribute super."representable-tries";
+  "reqcatcher" = dontDistribute super."reqcatcher";
+  "request-monad" = dontDistribute super."request-monad";
+  "reserve" = dontDistribute super."reserve";
+  "resistor-cube" = dontDistribute super."resistor-cube";
+  "resource-effect" = dontDistribute super."resource-effect";
+  "resource-embed" = dontDistribute super."resource-embed";
+  "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
+  "resource-pool-monad" = dontDistribute super."resource-pool-monad";
+  "resource-simple" = dontDistribute super."resource-simple";
+  "respond" = dontDistribute super."respond";
+  "rest-core" = doDistribute super."rest-core_0_37";
+  "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "rest-happstack" = doDistribute super."rest-happstack_0_3_1";
+  "rest-snap" = doDistribute super."rest-snap_0_2";
+  "rest-wai" = doDistribute super."rest-wai_0_2";
+  "restful-snap" = dontDistribute super."restful-snap";
+  "restricted-workers" = dontDistribute super."restricted-workers";
+  "restyle" = dontDistribute super."restyle";
+  "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "rethinkdb-model" = dontDistribute super."rethinkdb-model";
+  "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+  "retryer" = dontDistribute super."retryer";
+  "revdectime" = dontDistribute super."revdectime";
+  "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
+  "reverse-geocoding" = dontDistribute super."reverse-geocoding";
+  "reversi" = dontDistribute super."reversi";
+  "rewrite" = dontDistribute super."rewrite";
+  "rewriting" = dontDistribute super."rewriting";
+  "rex" = dontDistribute super."rex";
+  "rezoom" = dontDistribute super."rezoom";
+  "rfc3339" = dontDistribute super."rfc3339";
+  "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial";
+  "riak" = doDistribute super."riak_0_9_1_1";
+  "riak-protobuf" = doDistribute super."riak-protobuf_0_20_0_0";
+  "richreports" = dontDistribute super."richreports";
+  "riemann" = dontDistribute super."riemann";
+  "riff" = dontDistribute super."riff";
+  "ring-buffer" = dontDistribute super."ring-buffer";
+  "riot" = dontDistribute super."riot";
+  "ripple" = dontDistribute super."ripple";
+  "ripple-federation" = dontDistribute super."ripple-federation";
+  "risc386" = dontDistribute super."risc386";
+  "rivers" = dontDistribute super."rivers";
+  "rivet" = dontDistribute super."rivet";
+  "rivet-core" = dontDistribute super."rivet-core";
+  "rivet-migration" = dontDistribute super."rivet-migration";
+  "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy";
+  "rlglue" = dontDistribute super."rlglue";
+  "rlist" = dontDistribute super."rlist";
+  "rmonad" = dontDistribute super."rmonad";
+  "rncryptor" = dontDistribute super."rncryptor";
+  "rng-utils" = dontDistribute super."rng-utils";
+  "robin" = dontDistribute super."robin";
+  "robot" = dontDistribute super."robot";
+  "robots-txt" = dontDistribute super."robots-txt";
+  "rocksdb-haskell" = dontDistribute super."rocksdb-haskell";
+  "roguestar" = dontDistribute super."roguestar";
+  "roguestar-engine" = dontDistribute super."roguestar-engine";
+  "roguestar-gl" = dontDistribute super."roguestar-gl";
+  "roguestar-glut" = dontDistribute super."roguestar-glut";
+  "rollbar" = dontDistribute super."rollbar";
+  "roller" = dontDistribute super."roller";
+  "rolling-queue" = dontDistribute super."rolling-queue";
+  "roman-numerals" = dontDistribute super."roman-numerals";
+  "romkan" = dontDistribute super."romkan";
+  "roots" = dontDistribute super."roots";
+  "rope" = dontDistribute super."rope";
+  "rosa" = dontDistribute super."rosa";
+  "rose-trie" = dontDistribute super."rose-trie";
+  "roshask" = dontDistribute super."roshask";
+  "rosso" = dontDistribute super."rosso";
+  "rot13" = dontDistribute super."rot13";
+  "rotating-log" = dontDistribute super."rotating-log";
+  "rounding" = dontDistribute super."rounding";
+  "roundtrip" = dontDistribute super."roundtrip";
+  "roundtrip-aeson" = dontDistribute super."roundtrip-aeson";
+  "roundtrip-string" = dontDistribute super."roundtrip-string";
+  "roundtrip-xml" = dontDistribute super."roundtrip-xml";
+  "route-generator" = dontDistribute super."route-generator";
+  "route-planning" = dontDistribute super."route-planning";
+  "rowrecord" = dontDistribute super."rowrecord";
+  "rpc" = dontDistribute super."rpc";
+  "rpc-framework" = dontDistribute super."rpc-framework";
+  "rpf" = dontDistribute super."rpf";
+  "rpm" = dontDistribute super."rpm";
+  "rsagl" = dontDistribute super."rsagl";
+  "rsagl-frp" = dontDistribute super."rsagl-frp";
+  "rsagl-math" = dontDistribute super."rsagl-math";
+  "rspp" = dontDistribute super."rspp";
+  "rss" = dontDistribute super."rss";
+  "rss-conduit" = dontDistribute super."rss-conduit";
+  "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
+  "rtld" = dontDistribute super."rtld";
+  "rtlsdr" = dontDistribute super."rtlsdr";
+  "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";
+  "rtorrent-state" = dontDistribute super."rtorrent-state";
+  "rubberband" = dontDistribute super."rubberband";
+  "ruby-marshal" = dontDistribute super."ruby-marshal";
+  "ruby-qq" = dontDistribute super."ruby-qq";
+  "ruff" = dontDistribute super."ruff";
+  "ruler" = dontDistribute super."ruler";
+  "ruler-core" = dontDistribute super."ruler-core";
+  "rungekutta" = dontDistribute super."rungekutta";
+  "runghc" = dontDistribute super."runghc";
+  "rwlock" = dontDistribute super."rwlock";
+  "rws" = dontDistribute super."rws";
+  "s-cargot" = dontDistribute super."s-cargot";
+  "safe-access" = dontDistribute super."safe-access";
+  "safe-failure" = dontDistribute super."safe-failure";
+  "safe-failure-cme" = dontDistribute super."safe-failure-cme";
+  "safe-freeze" = dontDistribute super."safe-freeze";
+  "safe-globals" = dontDistribute super."safe-globals";
+  "safe-lazy-io" = dontDistribute super."safe-lazy-io";
+  "safe-length" = dontDistribute super."safe-length";
+  "safe-plugins" = dontDistribute super."safe-plugins";
+  "safe-printf" = dontDistribute super."safe-printf";
+  "safeint" = dontDistribute super."safeint";
+  "safer-file-handles" = dontDistribute super."safer-file-handles";
+  "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
+  "safer-file-handles-text" = dontDistribute super."safer-file-handles-text";
+  "saferoute" = dontDistribute super."saferoute";
+  "sai-shape-syb" = dontDistribute super."sai-shape-syb";
+  "saltine" = dontDistribute super."saltine";
+  "saltine-quickcheck" = dontDistribute super."saltine-quickcheck";
+  "salvia" = dontDistribute super."salvia";
+  "salvia-demo" = dontDistribute super."salvia-demo";
+  "salvia-extras" = dontDistribute super."salvia-extras";
+  "salvia-protocol" = dontDistribute super."salvia-protocol";
+  "salvia-sessions" = dontDistribute super."salvia-sessions";
+  "salvia-websocket" = dontDistribute super."salvia-websocket";
+  "sample-frame" = dontDistribute super."sample-frame";
+  "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
+  "samtools" = dontDistribute super."samtools";
+  "samtools-conduit" = dontDistribute super."samtools-conduit";
+  "samtools-enumerator" = dontDistribute super."samtools-enumerator";
+  "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandlib" = dontDistribute super."sandlib";
+  "sarasvati" = dontDistribute super."sarasvati";
+  "sarsi" = dontDistribute super."sarsi";
+  "sasl" = dontDistribute super."sasl";
+  "sat" = dontDistribute super."sat";
+  "sat-micro-hs" = dontDistribute super."sat-micro-hs";
+  "satchmo" = dontDistribute super."satchmo";
+  "satchmo-backends" = dontDistribute super."satchmo-backends";
+  "satchmo-examples" = dontDistribute super."satchmo-examples";
+  "satchmo-funsat" = dontDistribute super."satchmo-funsat";
+  "satchmo-minisat" = dontDistribute super."satchmo-minisat";
+  "satchmo-toysat" = dontDistribute super."satchmo-toysat";
+  "sbp" = dontDistribute super."sbp";
+  "sbvPlugin" = dontDistribute super."sbvPlugin";
+  "sc3-rdu" = dontDistribute super."sc3-rdu";
+  "scalable-server" = dontDistribute super."scalable-server";
+  "scaleimage" = dontDistribute super."scaleimage";
+  "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
+  "scan" = dontDistribute super."scan";
+  "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
+  "scat" = dontDistribute super."scat";
+  "scc" = dontDistribute super."scc";
+  "scenegraph" = dontDistribute super."scenegraph";
+  "scgi" = dontDistribute super."scgi";
+  "schedevr" = dontDistribute super."schedevr";
+  "schedule-planner" = dontDistribute super."schedule-planner";
+  "schedyield" = dontDistribute super."schedyield";
+  "scholdoc" = dontDistribute super."scholdoc";
+  "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc";
+  "scholdoc-texmath" = dontDistribute super."scholdoc-texmath";
+  "scholdoc-types" = dontDistribute super."scholdoc-types";
+  "schonfinkeling" = dontDistribute super."schonfinkeling";
+  "sci-ratio" = dontDistribute super."sci-ratio";
+  "science-constants" = dontDistribute super."science-constants";
+  "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scion" = dontDistribute super."scion";
+  "scion-browser" = dontDistribute super."scion-browser";
+  "scons2dot" = dontDistribute super."scons2dot";
+  "scope" = dontDistribute super."scope";
+  "scope-cairo" = dontDistribute super."scope-cairo";
+  "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
+  "scotty-binding-play" = dontDistribute super."scotty-binding-play";
+  "scotty-blaze" = dontDistribute super."scotty-blaze";
+  "scotty-cookie" = dontDistribute super."scotty-cookie";
+  "scotty-fay" = dontDistribute super."scotty-fay";
+  "scotty-hastache" = dontDistribute super."scotty-hastache";
+  "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
+  "scotty-rest" = dontDistribute super."scotty-rest";
+  "scotty-session" = dontDistribute super."scotty-session";
+  "scotty-tls" = dontDistribute super."scotty-tls";
+  "scotty-view" = dontDistribute super."scotty-view";
+  "scp-streams" = dontDistribute super."scp-streams";
+  "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
+  "scrobble" = dontDistribute super."scrobble";
+  "scroll" = dontDistribute super."scroll";
+  "scrz" = dontDistribute super."scrz";
+  "scyther-proof" = dontDistribute super."scyther-proof";
+  "sde-solver" = dontDistribute super."sde-solver";
+  "sdf2p1-parser" = dontDistribute super."sdf2p1-parser";
+  "sdl2-cairo" = dontDistribute super."sdl2-cairo";
+  "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image";
+  "sdl2-compositor" = dontDistribute super."sdl2-compositor";
+  "sdl2-image" = dontDistribute super."sdl2-image";
+  "sdl2-ttf" = dontDistribute super."sdl2-ttf";
+  "sdnv" = dontDistribute super."sdnv";
+  "sdr" = dontDistribute super."sdr";
+  "seacat" = dontDistribute super."seacat";
+  "seal-module" = dontDistribute super."seal-module";
+  "search" = dontDistribute super."search";
+  "sec" = dontDistribute super."sec";
+  "secdh" = dontDistribute super."secdh";
+  "seclib" = dontDistribute super."seclib";
+  "second-transfer" = doDistribute super."second-transfer_0_7_1_0";
+  "secp256k1" = dontDistribute super."secp256k1";
+  "secret-santa" = dontDistribute super."secret-santa";
+  "secret-sharing" = dontDistribute super."secret-sharing";
+  "secrm" = dontDistribute super."secrm";
+  "secure-sockets" = dontDistribute super."secure-sockets";
+  "sednaDBXML" = dontDistribute super."sednaDBXML";
+  "select" = dontDistribute super."select";
+  "selectors" = dontDistribute super."selectors";
+  "selenium" = dontDistribute super."selenium";
+  "selenium-server" = dontDistribute super."selenium-server";
+  "selfrestart" = dontDistribute super."selfrestart";
+  "selinux" = dontDistribute super."selinux";
+  "semaphore-plus" = dontDistribute super."semaphore-plus";
+  "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
+  "semigroups-actions" = dontDistribute super."semigroups-actions";
+  "semiring" = dontDistribute super."semiring";
+  "semiring-simple" = dontDistribute super."semiring-simple";
+  "semver-range" = dontDistribute super."semver-range";
+  "sendgrid-haskell" = dontDistribute super."sendgrid-haskell";
+  "sensei" = dontDistribute super."sensei";
+  "sensenet" = dontDistribute super."sensenet";
+  "sentry" = dontDistribute super."sentry";
+  "senza" = dontDistribute super."senza";
+  "separated" = dontDistribute super."separated";
+  "seqaid" = dontDistribute super."seqaid";
+  "seqid" = dontDistribute super."seqid";
+  "seqid-streams" = dontDistribute super."seqid-streams";
+  "seqloc-datafiles" = dontDistribute super."seqloc-datafiles";
+  "sequence" = dontDistribute super."sequence";
+  "sequent-core" = dontDistribute super."sequent-core";
+  "sequential-index" = dontDistribute super."sequential-index";
+  "sequor" = dontDistribute super."sequor";
+  "serial" = dontDistribute super."serial";
+  "serial-test-generators" = dontDistribute super."serial-test-generators";
+  "serialport" = dontDistribute super."serialport";
+  "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
+  "servant" = doDistribute super."servant_0_4_4_7";
+  "servant-blaze" = doDistribute super."servant-blaze_0_4_4_7";
+  "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-client" = doDistribute super."servant-client_0_4_4_7";
+  "servant-csharp" = dontDistribute super."servant-csharp";
+  "servant-docs" = doDistribute super."servant-docs_0_4_4_7";
+  "servant-ede" = dontDistribute super."servant-ede";
+  "servant-elm" = dontDistribute super."servant-elm";
+  "servant-examples" = dontDistribute super."servant-examples";
+  "servant-foreign" = dontDistribute super."servant-foreign";
+  "servant-github" = dontDistribute super."servant-github";
+  "servant-haxl-client" = dontDistribute super."servant-haxl-client";
+  "servant-js" = dontDistribute super."servant-js";
+  "servant-lucid" = dontDistribute super."servant-lucid";
+  "servant-mock" = dontDistribute super."servant-mock";
+  "servant-pandoc" = dontDistribute super."servant-pandoc";
+  "servant-pool" = dontDistribute super."servant-pool";
+  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-response" = dontDistribute super."servant-response";
+  "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-server" = doDistribute super."servant-server_0_4_4_7";
+  "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
+  "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
+  "sessions" = dontDistribute super."sessions";
+  "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
+  "set-with" = dontDistribute super."set-with";
+  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
+  "setops" = dontDistribute super."setops";
+  "setters" = dontDistribute super."setters";
+  "settings" = dontDistribute super."settings";
+  "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
+  "sexp-show" = dontDistribute super."sexp-show";
+  "sexpr" = dontDistribute super."sexpr";
+  "sext" = dontDistribute super."sext";
+  "sfml-audio" = dontDistribute super."sfml-audio";
+  "sfmt" = dontDistribute super."sfmt";
+  "sgd" = dontDistribute super."sgd";
+  "sgf" = dontDistribute super."sgf";
+  "sgrep" = dontDistribute super."sgrep";
+  "sha-streams" = dontDistribute super."sha-streams";
+  "shadower" = dontDistribute super."shadower";
+  "shadowsocks" = dontDistribute super."shadowsocks";
+  "shady-gen" = dontDistribute super."shady-gen";
+  "shady-graphics" = dontDistribute super."shady-graphics";
+  "shake-cabal-build" = dontDistribute super."shake-cabal-build";
+  "shake-extras" = dontDistribute super."shake-extras";
+  "shake-language-c" = doDistribute super."shake-language-c_0_8_6";
+  "shake-minify" = dontDistribute super."shake-minify";
+  "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
+  "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
+  "shakespeare-css" = dontDistribute super."shakespeare-css";
+  "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
+  "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-text" = dontDistribute super."shakespeare-text";
+  "shana" = dontDistribute super."shana";
+  "shapefile" = dontDistribute super."shapefile";
+  "shapely-data" = dontDistribute super."shapely-data";
+  "sharc-timbre" = dontDistribute super."sharc-timbre";
+  "shared-buffer" = dontDistribute super."shared-buffer";
+  "shared-fields" = dontDistribute super."shared-fields";
+  "shared-memory" = dontDistribute super."shared-memory";
+  "sharedio" = dontDistribute super."sharedio";
+  "she" = dontDistribute super."she";
+  "shelduck" = dontDistribute super."shelduck";
+  "shell-escape" = dontDistribute super."shell-escape";
+  "shell-monad" = dontDistribute super."shell-monad";
+  "shell-pipe" = dontDistribute super."shell-pipe";
+  "shellish" = dontDistribute super."shellish";
+  "shellmate" = dontDistribute super."shellmate";
+  "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
+  "shivers-cfg" = dontDistribute super."shivers-cfg";
+  "shoap" = dontDistribute super."shoap";
+  "shortcircuit" = dontDistribute super."shortcircuit";
+  "shorten-strings" = dontDistribute super."shorten-strings";
+  "should-not-typecheck" = doDistribute super."should-not-typecheck_2_0_1";
+  "show" = dontDistribute super."show";
+  "show-type" = dontDistribute super."show-type";
+  "showdown" = dontDistribute super."showdown";
+  "shpider" = dontDistribute super."shpider";
+  "shplit" = dontDistribute super."shplit";
+  "shqq" = dontDistribute super."shqq";
+  "shuffle" = dontDistribute super."shuffle";
+  "sieve" = dontDistribute super."sieve";
+  "sifflet" = dontDistribute super."sifflet";
+  "sifflet-lib" = dontDistribute super."sifflet-lib";
+  "sign" = dontDistribute super."sign";
+  "signals" = dontDistribute super."signals";
+  "signed-multiset" = dontDistribute super."signed-multiset";
+  "simd" = dontDistribute super."simd";
+  "simgi" = dontDistribute super."simgi";
+  "simple-actors" = dontDistribute super."simple-actors";
+  "simple-atom" = dontDistribute super."simple-atom";
+  "simple-bluetooth" = dontDistribute super."simple-bluetooth";
+  "simple-c-value" = dontDistribute super."simple-c-value";
+  "simple-conduit" = dontDistribute super."simple-conduit";
+  "simple-config" = dontDistribute super."simple-config";
+  "simple-css" = dontDistribute super."simple-css";
+  "simple-eval" = dontDistribute super."simple-eval";
+  "simple-firewire" = dontDistribute super."simple-firewire";
+  "simple-form" = dontDistribute super."simple-form";
+  "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm";
+  "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr";
+  "simple-get-opt" = dontDistribute super."simple-get-opt";
+  "simple-index" = dontDistribute super."simple-index";
+  "simple-log" = dontDistribute super."simple-log";
+  "simple-log-syslog" = dontDistribute super."simple-log-syslog";
+  "simple-neural-networks" = dontDistribute super."simple-neural-networks";
+  "simple-nix" = dontDistribute super."simple-nix";
+  "simple-observer" = dontDistribute super."simple-observer";
+  "simple-pascal" = dontDistribute super."simple-pascal";
+  "simple-pipe" = dontDistribute super."simple-pipe";
+  "simple-rope" = dontDistribute super."simple-rope";
+  "simple-server" = dontDistribute super."simple-server";
+  "simple-sessions" = dontDistribute super."simple-sessions";
+  "simple-sql-parser" = dontDistribute super."simple-sql-parser";
+  "simple-stacked-vm" = dontDistribute super."simple-stacked-vm";
+  "simple-tabular" = dontDistribute super."simple-tabular";
+  "simple-vec3" = dontDistribute super."simple-vec3";
+  "simpleargs" = dontDistribute super."simpleargs";
+  "simpleirc" = dontDistribute super."simpleirc";
+  "simpleirc-lens" = dontDistribute super."simpleirc-lens";
+  "simplenote" = dontDistribute super."simplenote";
+  "simpleprelude" = dontDistribute super."simpleprelude";
+  "simplesmtpclient" = dontDistribute super."simplesmtpclient";
+  "simplessh" = dontDistribute super."simplessh";
+  "simplest-sqlite" = dontDistribute super."simplest-sqlite";
+  "simplex" = dontDistribute super."simplex";
+  "simplex-basic" = dontDistribute super."simplex-basic";
+  "simseq" = dontDistribute super."simseq";
+  "simtreelo" = dontDistribute super."simtreelo";
+  "sindre" = dontDistribute super."sindre";
+  "singleton-nats" = dontDistribute super."singleton-nats";
+  "sink" = dontDistribute super."sink";
+  "sirkel" = dontDistribute super."sirkel";
+  "sitemap" = dontDistribute super."sitemap";
+  "sized" = dontDistribute super."sized";
+  "sized-types" = dontDistribute super."sized-types";
+  "sized-vector" = dontDistribute super."sized-vector";
+  "sizes" = dontDistribute super."sizes";
+  "sjsp" = dontDistribute super."sjsp";
+  "skeleton" = dontDistribute super."skeleton";
+  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
+  "skype4hs" = dontDistribute super."skype4hs";
+  "skypelogexport" = dontDistribute super."skypelogexport";
+  "slack" = dontDistribute super."slack";
+  "slack-api" = dontDistribute super."slack-api";
+  "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "sleep" = dontDistribute super."sleep";
+  "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
+  "slidemews" = dontDistribute super."slidemews";
+  "sloane" = dontDistribute super."sloane";
+  "slot-lambda" = dontDistribute super."slot-lambda";
+  "sloth" = dontDistribute super."sloth";
+  "smallarray" = dontDistribute super."smallarray";
+  "smallcheck-laws" = dontDistribute super."smallcheck-laws";
+  "smallcheck-lens" = dontDistribute super."smallcheck-lens";
+  "smallcheck-series" = dontDistribute super."smallcheck-series";
+  "smallpt-hs" = dontDistribute super."smallpt-hs";
+  "smallstring" = dontDistribute super."smallstring";
+  "smaoin" = dontDistribute super."smaoin";
+  "smartGroup" = dontDistribute super."smartGroup";
+  "smartcheck" = dontDistribute super."smartcheck";
+  "smartconstructor" = dontDistribute super."smartconstructor";
+  "smartword" = dontDistribute super."smartword";
+  "sme" = dontDistribute super."sme";
+  "smt-lib" = dontDistribute super."smt-lib";
+  "smtlib2" = dontDistribute super."smtlib2";
+  "smtp-mail-ng" = dontDistribute super."smtp-mail-ng";
+  "smtp2mta" = dontDistribute super."smtp2mta";
+  "smtps-gmail" = dontDistribute super."smtps-gmail";
+  "snake-game" = dontDistribute super."snake-game";
+  "snap-accept" = dontDistribute super."snap-accept";
+  "snap-app" = dontDistribute super."snap-app";
+  "snap-auth-cli" = dontDistribute super."snap-auth-cli";
+  "snap-blaze" = dontDistribute super."snap-blaze";
+  "snap-blaze-clay" = dontDistribute super."snap-blaze-clay";
+  "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities";
+  "snap-cors" = dontDistribute super."snap-cors";
+  "snap-elm" = dontDistribute super."snap-elm";
+  "snap-error-collector" = dontDistribute super."snap-error-collector";
+  "snap-extras" = dontDistribute super."snap-extras";
+  "snap-language" = dontDistribute super."snap-language";
+  "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic";
+  "snap-loader-static" = dontDistribute super."snap-loader-static";
+  "snap-predicates" = dontDistribute super."snap-predicates";
+  "snap-testing" = dontDistribute super."snap-testing";
+  "snap-utils" = dontDistribute super."snap-utils";
+  "snap-web-routes" = dontDistribute super."snap-web-routes";
+  "snaplet-acid-state" = dontDistribute super."snaplet-acid-state";
+  "snaplet-actionlog" = dontDistribute super."snaplet-actionlog";
+  "snaplet-amqp" = dontDistribute super."snaplet-amqp";
+  "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid";
+  "snaplet-coffee" = dontDistribute super."snaplet-coffee";
+  "snaplet-css-min" = dontDistribute super."snaplet-css-min";
+  "snaplet-environments" = dontDistribute super."snaplet-environments";
+  "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs";
+  "snaplet-hasql" = dontDistribute super."snaplet-hasql";
+  "snaplet-haxl" = dontDistribute super."snaplet-haxl";
+  "snaplet-hdbc" = dontDistribute super."snaplet-hdbc";
+  "snaplet-hslogger" = dontDistribute super."snaplet-hslogger";
+  "snaplet-i18n" = dontDistribute super."snaplet-i18n";
+  "snaplet-influxdb" = dontDistribute super."snaplet-influxdb";
+  "snaplet-lss" = dontDistribute super."snaplet-lss";
+  "snaplet-mandrill" = dontDistribute super."snaplet-mandrill";
+  "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB";
+  "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic";
+  "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple";
+  "snaplet-oauth" = dontDistribute super."snaplet-oauth";
+  "snaplet-persistent" = dontDistribute super."snaplet-persistent";
+  "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple";
+  "snaplet-postmark" = dontDistribute super."snaplet-postmark";
+  "snaplet-purescript" = dontDistribute super."snaplet-purescript";
+  "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha";
+  "snaplet-redis" = dontDistribute super."snaplet-redis";
+  "snaplet-redson" = dontDistribute super."snaplet-redson";
+  "snaplet-rest" = dontDistribute super."snaplet-rest";
+  "snaplet-riak" = dontDistribute super."snaplet-riak";
+  "snaplet-sass" = dontDistribute super."snaplet-sass";
+  "snaplet-sedna" = dontDistribute super."snaplet-sedna";
+  "snaplet-ses-html" = dontDistribute super."snaplet-ses-html";
+  "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple";
+  "snaplet-stripe" = dontDistribute super."snaplet-stripe";
+  "snaplet-tasks" = dontDistribute super."snaplet-tasks";
+  "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions";
+  "snaplet-wordpress" = dontDistribute super."snaplet-wordpress";
+  "snappy" = dontDistribute super."snappy";
+  "snappy-conduit" = dontDistribute super."snappy-conduit";
+  "snappy-framing" = dontDistribute super."snappy-framing";
+  "snappy-iteratee" = dontDistribute super."snappy-iteratee";
+  "sndfile-enumerators" = dontDistribute super."sndfile-enumerators";
+  "sneakyterm" = dontDistribute super."sneakyterm";
+  "sneathlane-haste" = dontDistribute super."sneathlane-haste";
+  "snippet-extractor" = dontDistribute super."snippet-extractor";
+  "snm" = dontDistribute super."snm";
+  "snow-white" = dontDistribute super."snow-white";
+  "snowball" = dontDistribute super."snowball";
+  "snowglobe" = dontDistribute super."snowglobe";
+  "sock2stream" = dontDistribute super."sock2stream";
+  "sockaddr" = dontDistribute super."sockaddr";
+  "socket" = doDistribute super."socket_0_5_3_1";
+  "socket-activation" = dontDistribute super."socket-activation";
+  "socket-sctp" = dontDistribute super."socket-sctp";
+  "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
+  "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
+  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
+  "sophia" = dontDistribute super."sophia";
+  "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
+  "sorted" = dontDistribute super."sorted";
+  "sorting" = dontDistribute super."sorting";
+  "sorty" = dontDistribute super."sorty";
+  "sound-collage" = dontDistribute super."sound-collage";
+  "sounddelay" = dontDistribute super."sounddelay";
+  "source-code-server" = dontDistribute super."source-code-server";
+  "sousit" = dontDistribute super."sousit";
+  "sox" = dontDistribute super."sox";
+  "soxlib" = dontDistribute super."soxlib";
+  "soyuz" = dontDistribute super."soyuz";
+  "spacefill" = dontDistribute super."spacefill";
+  "spacepart" = dontDistribute super."spacepart";
+  "spaceprobe" = dontDistribute super."spaceprobe";
+  "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
+  "sparse" = dontDistribute super."sparse";
+  "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
+  "sparsebit" = dontDistribute super."sparsebit";
+  "sparsecheck" = dontDistribute super."sparsecheck";
+  "sparser" = dontDistribute super."sparser";
+  "spata" = dontDistribute super."spata";
+  "spatial-math" = dontDistribute super."spatial-math";
+  "spawn" = dontDistribute super."spawn";
+  "spe" = dontDistribute super."spe";
+  "special-functors" = dontDistribute super."special-functors";
+  "special-keys" = dontDistribute super."special-keys";
+  "specialize-th" = dontDistribute super."specialize-th";
+  "species" = dontDistribute super."species";
+  "speculation-transformers" = dontDistribute super."speculation-transformers";
+  "spelling-suggest" = dontDistribute super."spelling-suggest";
+  "sphero" = dontDistribute super."sphero";
+  "sphinx-cli" = dontDistribute super."sphinx-cli";
+  "spice" = dontDistribute super."spice";
+  "spike" = dontDistribute super."spike";
+  "spine" = dontDistribute super."spine";
+  "spir-v" = dontDistribute super."spir-v";
+  "splay" = dontDistribute super."splay";
+  "splaytree" = dontDistribute super."splaytree";
+  "spline3" = dontDistribute super."spline3";
+  "splines" = dontDistribute super."splines";
+  "split-channel" = dontDistribute super."split-channel";
+  "split-record" = dontDistribute super."split-record";
+  "split-tchan" = dontDistribute super."split-tchan";
+  "splitter" = dontDistribute super."splitter";
+  "splot" = dontDistribute super."splot";
+  "spool" = dontDistribute super."spool";
+  "spoonutil" = dontDistribute super."spoonutil";
+  "spoty" = dontDistribute super."spoty";
+  "spreadsheet" = dontDistribute super."spreadsheet";
+  "spritz" = dontDistribute super."spritz";
+  "sproxy" = dontDistribute super."sproxy";
+  "spsa" = dontDistribute super."spsa";
+  "spy" = dontDistribute super."spy";
+  "sql-simple" = dontDistribute super."sql-simple";
+  "sql-simple-mysql" = dontDistribute super."sql-simple-mysql";
+  "sql-simple-pool" = dontDistribute super."sql-simple-pool";
+  "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql";
+  "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite";
+  "sql-words" = dontDistribute super."sql-words";
+  "sqlite" = dontDistribute super."sqlite";
+  "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed";
+  "sqlvalue-list" = dontDistribute super."sqlvalue-list";
+  "squeeze" = dontDistribute super."squeeze";
+  "sr-extra" = dontDistribute super."sr-extra";
+  "srcinst" = dontDistribute super."srcinst";
+  "srec" = dontDistribute super."srec";
+  "sscgi" = dontDistribute super."sscgi";
+  "ssh" = dontDistribute super."ssh";
+  "sshd-lint" = dontDistribute super."sshd-lint";
+  "sshtun" = dontDistribute super."sshtun";
+  "sssp" = dontDistribute super."sssp";
+  "sstable" = dontDistribute super."sstable";
+  "ssv" = dontDistribute super."ssv";
+  "stable-heap" = dontDistribute super."stable-heap";
+  "stable-maps" = dontDistribute super."stable-maps";
+  "stable-marriage" = dontDistribute super."stable-marriage";
+  "stable-memo" = dontDistribute super."stable-memo";
+  "stable-tree" = dontDistribute super."stable-tree";
+  "stack" = doDistribute super."stack_1_0_2";
+  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
+  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
+  "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
+  "standalone-haddock" = dontDistribute super."standalone-haddock";
+  "star-to-star" = dontDistribute super."star-to-star";
+  "star-to-star-contra" = dontDistribute super."star-to-star-contra";
+  "starling" = dontDistribute super."starling";
+  "starrover2" = dontDistribute super."starrover2";
+  "stash" = dontDistribute super."stash";
+  "state" = dontDistribute super."state";
+  "state-record" = dontDistribute super."state-record";
+  "statechart" = dontDistribute super."statechart";
+  "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statethread" = dontDistribute super."statethread";
+  "statgrab" = dontDistribute super."statgrab";
+  "static-hash" = dontDistribute super."static-hash";
+  "static-resources" = dontDistribute super."static-resources";
+  "staticanalysis" = dontDistribute super."staticanalysis";
+  "statistics-dirichlet" = dontDistribute super."statistics-dirichlet";
+  "statistics-fusion" = dontDistribute super."statistics-fusion";
+  "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar";
+  "stats" = dontDistribute super."stats";
+  "statsd" = dontDistribute super."statsd";
+  "statsd-client" = dontDistribute super."statsd-client";
+  "statsd-datadog" = dontDistribute super."statsd-datadog";
+  "statvfs" = dontDistribute super."statvfs";
+  "stb-image" = dontDistribute super."stb-image";
+  "stb-truetype" = dontDistribute super."stb-truetype";
+  "stdata" = dontDistribute super."stdata";
+  "stdf" = dontDistribute super."stdf";
+  "steambrowser" = dontDistribute super."steambrowser";
+  "steeloverseer" = dontDistribute super."steeloverseer";
+  "stemmer" = dontDistribute super."stemmer";
+  "step-function" = dontDistribute super."step-function";
+  "stepwise" = dontDistribute super."stepwise";
+  "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
+  "stitch" = dontDistribute super."stitch";
+  "stm-channelize" = dontDistribute super."stm-channelize";
+  "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
+  "stm-conduit" = doDistribute super."stm-conduit_2_7_0";
+  "stm-firehose" = dontDistribute super."stm-firehose";
+  "stm-io-hooks" = dontDistribute super."stm-io-hooks";
+  "stm-lifted" = dontDistribute super."stm-lifted";
+  "stm-linkedlist" = dontDistribute super."stm-linkedlist";
+  "stm-orelse-io" = dontDistribute super."stm-orelse-io";
+  "stm-promise" = dontDistribute super."stm-promise";
+  "stm-queue-extras" = dontDistribute super."stm-queue-extras";
+  "stm-sbchan" = dontDistribute super."stm-sbchan";
+  "stm-split" = dontDistribute super."stm-split";
+  "stm-tlist" = dontDistribute super."stm-tlist";
+  "stmcontrol" = dontDistribute super."stmcontrol";
+  "stomp-conduit" = dontDistribute super."stomp-conduit";
+  "stomp-patterns" = dontDistribute super."stomp-patterns";
+  "stomp-queue" = dontDistribute super."stomp-queue";
+  "stompl" = dontDistribute super."stompl";
+  "stopwatch" = dontDistribute super."stopwatch";
+  "storable" = dontDistribute super."storable";
+  "storable-record" = dontDistribute super."storable-record";
+  "storable-static-array" = dontDistribute super."storable-static-array";
+  "storable-tuple" = dontDistribute super."storable-tuple";
+  "storablevector" = dontDistribute super."storablevector";
+  "storablevector-carray" = dontDistribute super."storablevector-carray";
+  "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
+  "str" = dontDistribute super."str";
+  "stratosphere" = dontDistribute super."stratosphere";
+  "stratum-tool" = dontDistribute super."stratum-tool";
+  "stream" = dontDistribute super."stream";
+  "stream-fusion" = dontDistribute super."stream-fusion";
+  "stream-monad" = dontDistribute super."stream-monad";
+  "streamed" = dontDistribute super."streamed";
+  "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
+  "streaming-utils" = dontDistribute super."streaming-utils";
+  "streaming-wai" = dontDistribute super."streaming-wai";
+  "strict-base-types" = doDistribute super."strict-base-types_0_4_0";
+  "strict-concurrency" = dontDistribute super."strict-concurrency";
+  "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin";
+  "strict-identity" = dontDistribute super."strict-identity";
+  "strict-io" = dontDistribute super."strict-io";
+  "strictify" = dontDistribute super."strictify";
+  "strictly" = dontDistribute super."strictly";
+  "string" = dontDistribute super."string";
+  "string-conv" = dontDistribute super."string-conv";
+  "string-convert" = dontDistribute super."string-convert";
+  "string-quote" = dontDistribute super."string-quote";
+  "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
+  "stringlike" = dontDistribute super."stringlike";
+  "stringprep" = dontDistribute super."stringprep";
+  "strings" = dontDistribute super."strings";
+  "stringtable-atom" = dontDistribute super."stringtable-atom";
+  "strio" = dontDistribute super."strio";
+  "stripe" = dontDistribute super."stripe";
+  "stripe-http-streams" = doDistribute super."stripe-http-streams_2_0_2";
+  "strive" = dontDistribute super."strive";
+  "strptime" = dontDistribute super."strptime";
+  "structs" = dontDistribute super."structs";
+  "structural-induction" = dontDistribute super."structural-induction";
+  "structured-haskell-mode" = dontDistribute super."structured-haskell-mode";
+  "structured-mongoDB" = dontDistribute super."structured-mongoDB";
+  "structures" = dontDistribute super."structures";
+  "stunclient" = dontDistribute super."stunclient";
+  "stunts" = dontDistribute super."stunts";
+  "stylized" = dontDistribute super."stylized";
+  "sub-state" = dontDistribute super."sub-state";
+  "subhask" = dontDistribute super."subhask";
+  "subleq-toolchain" = dontDistribute super."subleq-toolchain";
+  "subnet" = dontDistribute super."subnet";
+  "subtitleParser" = dontDistribute super."subtitleParser";
+  "subtitles" = dontDistribute super."subtitles";
+  "suffixarray" = dontDistribute super."suffixarray";
+  "suffixtree" = dontDistribute super."suffixtree";
+  "sugarhaskell" = dontDistribute super."sugarhaskell";
+  "suitable" = dontDistribute super."suitable";
+  "sump" = dontDistribute super."sump";
+  "sundown" = dontDistribute super."sundown";
+  "sunlight" = dontDistribute super."sunlight";
+  "sunroof-compiler" = dontDistribute super."sunroof-compiler";
+  "sunroof-examples" = dontDistribute super."sunroof-examples";
+  "sunroof-server" = dontDistribute super."sunroof-server";
+  "super-user-spark" = dontDistribute super."super-user-spark";
+  "supercollider-ht" = dontDistribute super."supercollider-ht";
+  "supercollider-midi" = dontDistribute super."supercollider-midi";
+  "superdoc" = dontDistribute super."superdoc";
+  "supero" = dontDistribute super."supero";
+  "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
+  "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
+  "svg2q" = dontDistribute super."svg2q";
+  "svgcairo" = dontDistribute super."svgcairo";
+  "svgutils" = dontDistribute super."svgutils";
+  "svm" = dontDistribute super."svm";
+  "svm-light-utils" = dontDistribute super."svm-light-utils";
+  "svm-simple" = dontDistribute super."svm-simple";
+  "svndump" = dontDistribute super."svndump";
+  "swagger2" = doDistribute super."swagger2_1_2_1";
+  "swapper" = dontDistribute super."swapper";
+  "swearjure" = dontDistribute super."swearjure";
+  "swf" = dontDistribute super."swf";
+  "swift-lda" = dontDistribute super."swift-lda";
+  "swish" = dontDistribute super."swish";
+  "sws" = dontDistribute super."sws";
+  "syb-extras" = dontDistribute super."syb-extras";
+  "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text";
+  "sylvia" = dontDistribute super."sylvia";
+  "sym" = dontDistribute super."sym";
+  "sym-plot" = dontDistribute super."sym-plot";
+  "symbol" = dontDistribute super."symbol";
+  "symengine-hs" = dontDistribute super."symengine-hs";
+  "sync" = dontDistribute super."sync";
+  "synchronous-channels" = dontDistribute super."synchronous-channels";
+  "syncthing-hs" = dontDistribute super."syncthing-hs";
+  "synt" = dontDistribute super."synt";
+  "syntactic" = dontDistribute super."syntactic";
+  "syntactical" = dontDistribute super."syntactical";
+  "syntax" = dontDistribute super."syntax";
+  "syntax-attoparsec" = dontDistribute super."syntax-attoparsec";
+  "syntax-example" = dontDistribute super."syntax-example";
+  "syntax-example-json" = dontDistribute super."syntax-example-json";
+  "syntax-pretty" = dontDistribute super."syntax-pretty";
+  "syntax-printer" = dontDistribute super."syntax-printer";
+  "syntax-trees" = dontDistribute super."syntax-trees";
+  "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn";
+  "synthesizer" = dontDistribute super."synthesizer";
+  "synthesizer-alsa" = dontDistribute super."synthesizer-alsa";
+  "synthesizer-core" = dontDistribute super."synthesizer-core";
+  "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional";
+  "synthesizer-filter" = dontDistribute super."synthesizer-filter";
+  "synthesizer-inference" = dontDistribute super."synthesizer-inference";
+  "synthesizer-llvm" = dontDistribute super."synthesizer-llvm";
+  "synthesizer-midi" = dontDistribute super."synthesizer-midi";
+  "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient";
+  "sys-process" = dontDistribute super."sys-process";
+  "system-canonicalpath" = dontDistribute super."system-canonicalpath";
+  "system-command" = dontDistribute super."system-command";
+  "system-gpio" = dontDistribute super."system-gpio";
+  "system-inotify" = dontDistribute super."system-inotify";
+  "system-lifted" = dontDistribute super."system-lifted";
+  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
+  "system-util" = dontDistribute super."system-util";
+  "system-uuid" = dontDistribute super."system-uuid";
+  "systemd" = dontDistribute super."systemd";
+  "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
+  "ta" = dontDistribute super."ta";
+  "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
+  "table-tennis" = dontDistribute super."table-tennis";
+  "tableaux" = dontDistribute super."tableaux";
+  "tables" = dontDistribute super."tables";
+  "tablestorage" = dontDistribute super."tablestorage";
+  "tabloid" = dontDistribute super."tabloid";
+  "taffybar" = dontDistribute super."taffybar";
+  "tag-bits" = dontDistribute super."tag-bits";
+  "tag-stream" = dontDistribute super."tag-stream";
+  "tagchup" = dontDistribute super."tagchup";
+  "tagged-exception-core" = dontDistribute super."tagged-exception-core";
+  "tagged-list" = dontDistribute super."tagged-list";
+  "tagged-th" = dontDistribute super."tagged-th";
+  "tagged-timers" = dontDistribute super."tagged-timers";
+  "tagged-transformer" = dontDistribute super."tagged-transformer";
+  "tagging" = dontDistribute super."tagging";
+  "taggy" = dontDistribute super."taggy";
+  "taggy-lens" = dontDistribute super."taggy-lens";
+  "taglib" = dontDistribute super."taglib";
+  "taglib-api" = dontDistribute super."taglib-api";
+  "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup-ht" = dontDistribute super."tagsoup-ht";
+  "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
+  "takahashi" = dontDistribute super."takahashi";
+  "takusen-oracle" = dontDistribute super."takusen-oracle";
+  "tamarin-prover" = dontDistribute super."tamarin-prover";
+  "tamarin-prover-term" = dontDistribute super."tamarin-prover-term";
+  "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
+  "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
+  "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_5_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
+  "target" = dontDistribute super."target";
+  "task" = dontDistribute super."task";
+  "task-distribution" = dontDistribute super."task-distribution";
+  "taskpool" = dontDistribute super."taskpool";
+  "tasty" = doDistribute super."tasty_0_11_0_2";
+  "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
+  "tasty-integrate" = dontDistribute super."tasty-integrate";
+  "tasty-laws" = dontDistribute super."tasty-laws";
+  "tasty-lens" = dontDistribute super."tasty-lens";
+  "tasty-program" = dontDistribute super."tasty-program";
+  "tateti-tateti" = dontDistribute super."tateti-tateti";
+  "tau" = dontDistribute super."tau";
+  "tbox" = dontDistribute super."tbox";
+  "tcache-AWS" = dontDistribute super."tcache-AWS";
+  "tccli" = dontDistribute super."tccli";
+  "tce-conf" = dontDistribute super."tce-conf";
+  "tconfig" = dontDistribute super."tconfig";
+  "tcp" = dontDistribute super."tcp";
+  "tdd-util" = dontDistribute super."tdd-util";
+  "tdoc" = dontDistribute super."tdoc";
+  "teams" = dontDistribute super."teams";
+  "teeth" = dontDistribute super."teeth";
+  "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
+  "template-default" = dontDistribute super."template-default";
+  "template-haskell-util" = dontDistribute super."template-haskell-util";
+  "template-hsml" = dontDistribute super."template-hsml";
+  "template-yj" = dontDistribute super."template-yj";
+  "templatepg" = dontDistribute super."templatepg";
+  "templater" = dontDistribute super."templater";
+  "tempo" = dontDistribute super."tempo";
+  "tempodb" = dontDistribute super."tempodb";
+  "temporal-csound" = dontDistribute super."temporal-csound";
+  "temporal-media" = dontDistribute super."temporal-media";
+  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
+  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
+  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
+  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
+  "tempus" = dontDistribute super."tempus";
+  "tempus-fugit" = dontDistribute super."tempus-fugit";
+  "tensor" = dontDistribute super."tensor";
+  "term-rewriting" = dontDistribute super."term-rewriting";
+  "termbox-bindings" = dontDistribute super."termbox-bindings";
+  "termination-combinators" = dontDistribute super."termination-combinators";
+  "terminfo" = doDistribute super."terminfo_0_4_0_2";
+  "terminfo-hs" = dontDistribute super."terminfo-hs";
+  "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
+  "terrahs" = dontDistribute super."terrahs";
+  "tersmu" = dontDistribute super."tersmu";
+  "test-framework-doctest" = dontDistribute super."test-framework-doctest";
+  "test-framework-golden" = dontDistribute super."test-framework-golden";
+  "test-framework-program" = dontDistribute super."test-framework-program";
+  "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck";
+  "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
+  "test-framework-skip" = dontDistribute super."test-framework-skip";
+  "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-invariant" = dontDistribute super."test-invariant";
+  "test-pkg" = dontDistribute super."test-pkg";
+  "test-sandbox" = dontDistribute super."test-sandbox";
+  "test-sandbox-compose" = dontDistribute super."test-sandbox-compose";
+  "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit";
+  "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
+  "test-shouldbe" = dontDistribute super."test-shouldbe";
+  "testPkg" = dontDistribute super."testPkg";
+  "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
+  "testloop" = dontDistribute super."testloop";
+  "testpack" = dontDistribute super."testpack";
+  "testpattern" = dontDistribute super."testpattern";
+  "testrunner" = dontDistribute super."testrunner";
+  "tetris" = dontDistribute super."tetris";
+  "tex2txt" = dontDistribute super."tex2txt";
+  "texrunner" = dontDistribute super."texrunner";
+  "text-and-plots" = dontDistribute super."text-and-plots";
+  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-translit" = dontDistribute super."text-icu-translit";
+  "text-json-qq" = dontDistribute super."text-json-qq";
+  "text-latin1" = dontDistribute super."text-latin1";
+  "text-ldap" = dontDistribute super."text-ldap";
+  "text-locale-encoding" = dontDistribute super."text-locale-encoding";
+  "text-normal" = dontDistribute super."text-normal";
+  "text-position" = dontDistribute super."text-position";
+  "text-postgresql" = dontDistribute super."text-postgresql";
+  "text-printer" = dontDistribute super."text-printer";
+  "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
+  "text-register-machine" = dontDistribute super."text-register-machine";
+  "text-render" = dontDistribute super."text-render";
+  "text-show-instances" = dontDistribute super."text-show-instances";
+  "text-stream-decode" = dontDistribute super."text-stream-decode";
+  "text-utf7" = dontDistribute super."text-utf7";
+  "text-xml-generic" = dontDistribute super."text-xml-generic";
+  "text-xml-qq" = dontDistribute super."text-xml-qq";
+  "text1" = dontDistribute super."text1";
+  "textPlot" = dontDistribute super."textPlot";
+  "textmatetags" = dontDistribute super."textmatetags";
+  "textocat-api" = dontDistribute super."textocat-api";
+  "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
+  "tfp" = dontDistribute super."tfp";
+  "tfp-th" = dontDistribute super."tfp-th";
+  "tftp" = dontDistribute super."tftp";
+  "tga" = dontDistribute super."tga";
+  "th-alpha" = dontDistribute super."th-alpha";
+  "th-build" = dontDistribute super."th-build";
+  "th-cas" = dontDistribute super."th-cas";
+  "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
+  "th-fold" = dontDistribute super."th-fold";
+  "th-inline-io-action" = dontDistribute super."th-inline-io-action";
+  "th-instance-reification" = dontDistribute super."th-instance-reification";
+  "th-instances" = dontDistribute super."th-instances";
+  "th-kinds" = dontDistribute super."th-kinds";
+  "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-lift-instances" = dontDistribute super."th-lift-instances";
+  "th-printf" = dontDistribute super."th-printf";
+  "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
+  "th-sccs" = dontDistribute super."th-sccs";
+  "th-traced" = dontDistribute super."th-traced";
+  "th-typegraph" = dontDistribute super."th-typegraph";
+  "themoviedb" = dontDistribute super."themoviedb";
+  "themplate" = dontDistribute super."themplate";
+  "theoremquest" = dontDistribute super."theoremquest";
+  "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "thespian" = dontDistribute super."thespian";
+  "theta-functions" = dontDistribute super."theta-functions";
+  "thih" = dontDistribute super."thih";
+  "thimk" = dontDistribute super."thimk";
+  "thorn" = dontDistribute super."thorn";
+  "thread-local-storage" = dontDistribute super."thread-local-storage";
+  "threadPool" = dontDistribute super."threadPool";
+  "threadmanager" = dontDistribute super."threadmanager";
+  "threads-pool" = dontDistribute super."threads-pool";
+  "threads-supervisor" = dontDistribute super."threads-supervisor";
+  "threadscope" = dontDistribute super."threadscope";
+  "threefish" = dontDistribute super."threefish";
+  "threepenny-gui" = dontDistribute super."threepenny-gui";
+  "thrift" = dontDistribute super."thrift";
+  "thrist" = dontDistribute super."thrist";
+  "throttle" = dontDistribute super."throttle";
+  "thumbnail" = dontDistribute super."thumbnail";
+  "tianbar" = dontDistribute super."tianbar";
+  "tic-tac-toe" = dontDistribute super."tic-tac-toe";
+  "tickle" = dontDistribute super."tickle";
+  "tictactoe3d" = dontDistribute super."tictactoe3d";
+  "tidal" = dontDistribute super."tidal";
+  "tidal-midi" = dontDistribute super."tidal-midi";
+  "tidal-vis" = dontDistribute super."tidal-vis";
+  "tie-knot" = dontDistribute super."tie-knot";
+  "tiempo" = dontDistribute super."tiempo";
+  "tiger" = dontDistribute super."tiger";
+  "tight-apply" = dontDistribute super."tight-apply";
+  "tightrope" = dontDistribute super."tightrope";
+  "tighttp" = dontDistribute super."tighttp";
+  "tilings" = dontDistribute super."tilings";
+  "timberc" = dontDistribute super."timberc";
+  "time-cache" = dontDistribute super."time-cache";
+  "time-extras" = dontDistribute super."time-extras";
+  "time-exts" = dontDistribute super."time-exts";
+  "time-http" = dontDistribute super."time-http";
+  "time-interval" = dontDistribute super."time-interval";
+  "time-io-access" = dontDistribute super."time-io-access";
+  "time-out" = dontDistribute super."time-out";
+  "time-patterns" = dontDistribute super."time-patterns";
+  "time-qq" = dontDistribute super."time-qq";
+  "time-recurrence" = dontDistribute super."time-recurrence";
+  "time-series" = dontDistribute super."time-series";
+  "time-w3c" = dontDistribute super."time-w3c";
+  "timecalc" = dontDistribute super."timecalc";
+  "timeconsole" = dontDistribute super."timeconsole";
+  "timeless" = dontDistribute super."timeless";
+  "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
+  "timelike-time" = dontDistribute super."timelike-time";
+  "timemap" = dontDistribute super."timemap";
+  "timeout" = dontDistribute super."timeout";
+  "timeout-control" = dontDistribute super."timeout-control";
+  "timeout-with-results" = dontDistribute super."timeout-with-results";
+  "timeparsers" = dontDistribute super."timeparsers";
+  "timeplot" = dontDistribute super."timeplot";
+  "timers" = dontDistribute super."timers";
+  "timers-updatable" = dontDistribute super."timers-updatable";
+  "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines";
+  "timestamper" = dontDistribute super."timestamper";
+  "timezone-olson-th" = dontDistribute super."timezone-olson-th";
+  "timing-convenience" = dontDistribute super."timing-convenience";
+  "tinyMesh" = dontDistribute super."tinyMesh";
+  "tinylog" = doDistribute super."tinylog_0_12_1";
+  "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
+  "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
+  "titlecase" = dontDistribute super."titlecase";
+  "tkhs" = dontDistribute super."tkhs";
+  "tkyprof" = dontDistribute super."tkyprof";
+  "tld" = dontDistribute super."tld";
+  "tls-debug" = doDistribute super."tls-debug_0_4_1";
+  "tls-extra" = dontDistribute super."tls-extra";
+  "tmpl" = dontDistribute super."tmpl";
+  "tn" = dontDistribute super."tn";
+  "tnet" = dontDistribute super."tnet";
+  "to-haskell" = dontDistribute super."to-haskell";
+  "to-string-class" = dontDistribute super."to-string-class";
+  "to-string-instances" = dontDistribute super."to-string-instances";
+  "todos" = dontDistribute super."todos";
+  "tofromxml" = dontDistribute super."tofromxml";
+  "toilet" = dontDistribute super."toilet";
+  "tokenify" = dontDistribute super."tokenify";
+  "tokenize" = dontDistribute super."tokenize";
+  "toktok" = dontDistribute super."toktok";
+  "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell";
+  "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell";
+  "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal";
+  "toml" = dontDistribute super."toml";
+  "toolshed" = dontDistribute super."toolshed";
+  "topkata" = dontDistribute super."topkata";
+  "torch" = dontDistribute super."torch";
+  "total" = dontDistribute super."total";
+  "total-alternative" = dontDistribute super."total-alternative";
+  "total-map" = dontDistribute super."total-map";
+  "total-maps" = dontDistribute super."total-maps";
+  "touched" = dontDistribute super."touched";
+  "toysolver" = dontDistribute super."toysolver";
+  "tpdb" = dontDistribute super."tpdb";
+  "trace" = dontDistribute super."trace";
+  "trace-call" = dontDistribute super."trace-call";
+  "trace-function-call" = dontDistribute super."trace-function-call";
+  "traced" = dontDistribute super."traced";
+  "tracer" = dontDistribute super."tracer";
+  "tracker" = dontDistribute super."tracker";
+  "trajectory" = dontDistribute super."trajectory";
+  "transactional-events" = dontDistribute super."transactional-events";
+  "transf" = dontDistribute super."transf";
+  "transformations" = dontDistribute super."transformations";
+  "transformers-abort" = dontDistribute super."transformers-abort";
+  "transformers-compose" = dontDistribute super."transformers-compose";
+  "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
+  "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
+  "transformers-runnable" = dontDistribute super."transformers-runnable";
+  "transformers-supply" = dontDistribute super."transformers-supply";
+  "transient" = dontDistribute super."transient";
+  "transient-universe" = dontDistribute super."transient-universe";
+  "translatable-intset" = dontDistribute super."translatable-intset";
+  "translate" = dontDistribute super."translate";
+  "travis" = dontDistribute super."travis";
+  "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
+  "trawl" = dontDistribute super."trawl";
+  "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
+  "tree-monad" = dontDistribute super."tree-monad";
+  "treemap-html" = dontDistribute super."treemap-html";
+  "treemap-html-tools" = dontDistribute super."treemap-html-tools";
+  "treersec" = dontDistribute super."treersec";
+  "treeviz" = dontDistribute super."treeviz";
+  "tremulous-query" = dontDistribute super."tremulous-query";
+  "trhsx" = dontDistribute super."trhsx";
+  "triangulation" = dontDistribute super."triangulation";
+  "trimpolya" = dontDistribute super."trimpolya";
+  "tripLL" = dontDistribute super."tripLL";
+  "trivia" = dontDistribute super."trivia";
+  "trivial-constraint" = dontDistribute super."trivial-constraint";
+  "tropical" = dontDistribute super."tropical";
+  "truelevel" = dontDistribute super."truelevel";
+  "trurl" = dontDistribute super."trurl";
+  "truthful" = dontDistribute super."truthful";
+  "tsession" = dontDistribute super."tsession";
+  "tsession-happstack" = dontDistribute super."tsession-happstack";
+  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
+  "tslogger" = dontDistribute super."tslogger";
+  "tsp-viz" = dontDistribute super."tsp-viz";
+  "tsparse" = dontDistribute super."tsparse";
+  "tst" = dontDistribute super."tst";
+  "tsvsql" = dontDistribute super."tsvsql";
+  "tttool" = doDistribute super."tttool_1_5_1";
+  "tubes" = dontDistribute super."tubes";
+  "tuntap" = dontDistribute super."tuntap";
+  "tup-functor" = dontDistribute super."tup-functor";
+  "tuple" = dontDistribute super."tuple";
+  "tuple-gen" = dontDistribute super."tuple-gen";
+  "tuple-generic" = dontDistribute super."tuple-generic";
+  "tuple-hlist" = dontDistribute super."tuple-hlist";
+  "tuple-lenses" = dontDistribute super."tuple-lenses";
+  "tuple-morph" = dontDistribute super."tuple-morph";
+  "tupleinstances" = dontDistribute super."tupleinstances";
+  "turing" = dontDistribute super."turing";
+  "turing-music" = dontDistribute super."turing-music";
+  "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
+  "turni" = dontDistribute super."turni";
+  "turtle-options" = dontDistribute super."turtle-options";
+  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
+  "twentefp" = dontDistribute super."twentefp";
+  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
+  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
+  "twentefp-graphs" = dontDistribute super."twentefp-graphs";
+  "twentefp-number" = dontDistribute super."twentefp-number";
+  "twentefp-rosetree" = dontDistribute super."twentefp-rosetree";
+  "twentefp-trees" = dontDistribute super."twentefp-trees";
+  "twentefp-websockets" = dontDistribute super."twentefp-websockets";
+  "twentyseven" = dontDistribute super."twentyseven";
+  "twhs" = dontDistribute super."twhs";
+  "twidge" = dontDistribute super."twidge";
+  "twilight-stm" = dontDistribute super."twilight-stm";
+  "twilio" = dontDistribute super."twilio";
+  "twill" = dontDistribute super."twill";
+  "twiml" = dontDistribute super."twiml";
+  "twine" = dontDistribute super."twine";
+  "twisty" = dontDistribute super."twisty";
+  "twitch" = dontDistribute super."twitch";
+  "twitter" = dontDistribute super."twitter";
+  "twitter-conduit" = doDistribute super."twitter-conduit_0_1_3";
+  "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "tx" = dontDistribute super."tx";
+  "txt-sushi" = dontDistribute super."txt-sushi";
+  "txt2rtf" = dontDistribute super."txt2rtf";
+  "txtblk" = dontDistribute super."txtblk";
+  "ty" = dontDistribute super."ty";
+  "typalyze" = dontDistribute super."typalyze";
+  "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
+  "type-cereal" = dontDistribute super."type-cereal";
+  "type-combinators" = dontDistribute super."type-combinators";
+  "type-combinators-quote" = dontDistribute super."type-combinators-quote";
+  "type-digits" = dontDistribute super."type-digits";
+  "type-equality" = dontDistribute super."type-equality";
+  "type-equality-check" = dontDistribute super."type-equality-check";
+  "type-fun" = dontDistribute super."type-fun";
+  "type-functions" = dontDistribute super."type-functions";
+  "type-hint" = dontDistribute super."type-hint";
+  "type-int" = dontDistribute super."type-int";
+  "type-iso" = dontDistribute super."type-iso";
+  "type-level" = dontDistribute super."type-level";
+  "type-level-bst" = dontDistribute super."type-level-bst";
+  "type-level-natural-number" = dontDistribute super."type-level-natural-number";
+  "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction";
+  "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations";
+  "type-level-sets" = dontDistribute super."type-level-sets";
+  "type-level-tf" = dontDistribute super."type-level-tf";
+  "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
+  "type-ord" = dontDistribute super."type-ord";
+  "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
+  "type-prelude" = dontDistribute super."type-prelude";
+  "type-settheory" = dontDistribute super."type-settheory";
+  "type-spine" = dontDistribute super."type-spine";
+  "type-structure" = dontDistribute super."type-structure";
+  "type-sub-th" = dontDistribute super."type-sub-th";
+  "type-unary" = dontDistribute super."type-unary";
+  "typeable-th" = dontDistribute super."typeable-th";
+  "typed-spreadsheet" = dontDistribute super."typed-spreadsheet";
+  "typed-wire" = dontDistribute super."typed-wire";
+  "typed-wire-utils" = dontDistribute super."typed-wire-utils";
+  "typedquery" = dontDistribute super."typedquery";
+  "typehash" = dontDistribute super."typehash";
+  "typelevel" = dontDistribute super."typelevel";
+  "typelevel-tensor" = dontDistribute super."typelevel-tensor";
+  "typeof" = dontDistribute super."typeof";
+  "typeparams" = dontDistribute super."typeparams";
+  "typesafe-endian" = dontDistribute super."typesafe-endian";
+  "typescript-docs" = dontDistribute super."typescript-docs";
+  "typical" = dontDistribute super."typical";
+  "typography-geometry" = dontDistribute super."typography-geometry";
+  "tz" = doDistribute super."tz_0_1_0_1";
+  "tzdata" = doDistribute super."tzdata_0_1_20150810_0";
+  "uAgda" = dontDistribute super."uAgda";
+  "ua-parser" = dontDistribute super."ua-parser";
+  "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
+  "uberlast" = dontDistribute super."uberlast";
+  "uconv" = dontDistribute super."uconv";
+  "udbus" = dontDistribute super."udbus";
+  "udbus-model" = dontDistribute super."udbus-model";
+  "udcode" = dontDistribute super."udcode";
+  "udev" = dontDistribute super."udev";
+  "uhc-light" = dontDistribute super."uhc-light";
+  "uhc-util" = dontDistribute super."uhc-util";
+  "uhexdump" = dontDistribute super."uhexdump";
+  "uhttpc" = dontDistribute super."uhttpc";
+  "ui-command" = dontDistribute super."ui-command";
+  "uid" = dontDistribute super."uid";
+  "una" = dontDistribute super."una";
+  "unagi-chan" = dontDistribute super."unagi-chan";
+  "unagi-streams" = dontDistribute super."unagi-streams";
+  "unamb" = dontDistribute super."unamb";
+  "unamb-custom" = dontDistribute super."unamb-custom";
+  "unbound" = dontDistribute super."unbound";
+  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
+  "unboxed-containers" = dontDistribute super."unboxed-containers";
+  "unbreak" = dontDistribute super."unbreak";
+  "unfoldable" = dontDistribute super."unfoldable";
+  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
+  "ungadtagger" = dontDistribute super."ungadtagger";
+  "uni-events" = dontDistribute super."uni-events";
+  "uni-graphs" = dontDistribute super."uni-graphs";
+  "uni-htk" = dontDistribute super."uni-htk";
+  "uni-posixutil" = dontDistribute super."uni-posixutil";
+  "uni-reactor" = dontDistribute super."uni-reactor";
+  "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph";
+  "uni-util" = dontDistribute super."uni-util";
+  "unicode" = dontDistribute super."unicode";
+  "unicode-names" = dontDistribute super."unicode-names";
+  "unicode-normalization" = dontDistribute super."unicode-normalization";
+  "unicode-prelude" = dontDistribute super."unicode-prelude";
+  "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
+  "unicode-symbols" = dontDistribute super."unicode-symbols";
+  "unicoder" = dontDistribute super."unicoder";
+  "uniform-io" = dontDistribute super."uniform-io";
+  "uniform-pair" = dontDistribute super."uniform-pair";
+  "union" = dontDistribute super."union";
+  "union-find-array" = dontDistribute super."union-find-array";
+  "union-map" = dontDistribute super."union-map";
+  "unique" = dontDistribute super."unique";
+  "unique-logic" = dontDistribute super."unique-logic";
+  "unique-logic-tf" = dontDistribute super."unique-logic-tf";
+  "uniqueid" = dontDistribute super."uniqueid";
+  "unit" = dontDistribute super."unit";
+  "unit-constraint" = dontDistribute super."unit-constraint";
+  "units" = dontDistribute super."units";
+  "units-attoparsec" = dontDistribute super."units-attoparsec";
+  "units-defs" = dontDistribute super."units-defs";
+  "units-parser" = dontDistribute super."units-parser";
+  "unittyped" = dontDistribute super."unittyped";
+  "universal-binary" = dontDistribute super."universal-binary";
+  "universe-th" = dontDistribute super."universe-th";
+  "unix-fcntl" = dontDistribute super."unix-fcntl";
+  "unix-handle" = dontDistribute super."unix-handle";
+  "unix-io-extra" = dontDistribute super."unix-io-extra";
+  "unix-memory" = dontDistribute super."unix-memory";
+  "unix-process-conduit" = dontDistribute super."unix-process-conduit";
+  "unix-pty-light" = dontDistribute super."unix-pty-light";
+  "unlambda" = dontDistribute super."unlambda";
+  "unlit" = dontDistribute super."unlit";
+  "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
+  "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
+  "unordered-graphs" = dontDistribute super."unordered-graphs";
+  "unpack-funcs" = dontDistribute super."unpack-funcs";
+  "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin";
+  "unsafe" = dontDistribute super."unsafe";
+  "unsafe-promises" = dontDistribute super."unsafe-promises";
+  "unsafely" = dontDistribute super."unsafely";
+  "unsafeperformst" = dontDistribute super."unsafeperformst";
+  "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
+  "unusable-pkg" = dontDistribute super."unusable-pkg";
+  "uom-plugin" = dontDistribute super."uom-plugin";
+  "up" = dontDistribute super."up";
+  "up-grade" = dontDistribute super."up-grade";
+  "uploadcare" = dontDistribute super."uploadcare";
+  "upskirt" = dontDistribute super."upskirt";
+  "ureader" = dontDistribute super."ureader";
+  "urembed" = dontDistribute super."urembed";
+  "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
+  "uri-conduit" = dontDistribute super."uri-conduit";
+  "uri-enumerator" = dontDistribute super."uri-enumerator";
+  "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
+  "uri-template" = dontDistribute super."uri-template";
+  "url-generic" = dontDistribute super."url-generic";
+  "urlcheck" = dontDistribute super."urlcheck";
+  "urldecode" = dontDistribute super."urldecode";
+  "urldisp-happstack" = dontDistribute super."urldisp-happstack";
+  "urlencoded" = dontDistribute super."urlencoded";
+  "urn" = dontDistribute super."urn";
+  "urxml" = dontDistribute super."urxml";
+  "usb" = dontDistribute super."usb";
+  "usb-enumerator" = dontDistribute super."usb-enumerator";
+  "usb-hid" = dontDistribute super."usb-hid";
+  "usb-id-database" = dontDistribute super."usb-id-database";
+  "usb-iteratee" = dontDistribute super."usb-iteratee";
+  "usb-safe" = dontDistribute super."usb-safe";
+  "users" = doDistribute super."users_0_4_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_4_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_4_0_0";
+  "users-test" = doDistribute super."users-test_0_4_0_0";
+  "utc" = dontDistribute super."utc";
+  "utf8-env" = dontDistribute super."utf8-env";
+  "utf8-prelude" = dontDistribute super."utf8-prelude";
+  "uu-cco" = dontDistribute super."uu-cco";
+  "uu-cco-examples" = dontDistribute super."uu-cco-examples";
+  "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing";
+  "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib";
+  "uu-options" = dontDistribute super."uu-options";
+  "uu-tc" = dontDistribute super."uu-tc";
+  "uuagc" = dontDistribute super."uuagc";
+  "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap";
+  "uuagc-cabal" = dontDistribute super."uuagc-cabal";
+  "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
+  "uuagd" = dontDistribute super."uuagd";
+  "uuid-aeson" = dontDistribute super."uuid-aeson";
+  "uuid-le" = dontDistribute super."uuid-le";
+  "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uulib" = dontDistribute super."uulib";
+  "uvector" = dontDistribute super."uvector";
+  "uvector-algorithms" = dontDistribute super."uvector-algorithms";
+  "uxadt" = dontDistribute super."uxadt";
+  "uzbl-with-source" = dontDistribute super."uzbl-with-source";
+  "v4l2" = dontDistribute super."v4l2";
+  "v4l2-examples" = dontDistribute super."v4l2-examples";
+  "vacuum" = dontDistribute super."vacuum";
+  "vacuum-cairo" = dontDistribute super."vacuum-cairo";
+  "vacuum-graphviz" = dontDistribute super."vacuum-graphviz";
+  "vacuum-opengl" = dontDistribute super."vacuum-opengl";
+  "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph";
+  "vado" = dontDistribute super."vado";
+  "valid-names" = dontDistribute super."valid-names";
+  "validate" = dontDistribute super."validate";
+  "validated-literals" = dontDistribute super."validated-literals";
+  "validations" = dontDistribute super."validations";
+  "value-supply" = dontDistribute super."value-supply";
+  "vampire" = dontDistribute super."vampire";
+  "var" = dontDistribute super."var";
+  "varan" = dontDistribute super."varan";
+  "variable-precision" = dontDistribute super."variable-precision";
+  "variables" = dontDistribute super."variables";
+  "varying" = dontDistribute super."varying";
+  "vaultaire-common" = dontDistribute super."vaultaire-common";
+  "vcache" = dontDistribute super."vcache";
+  "vcache-trie" = dontDistribute super."vcache-trie";
+  "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
+  "vcd" = dontDistribute super."vcd";
+  "vcs-revision" = dontDistribute super."vcs-revision";
+  "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
+  "vcsgui" = dontDistribute super."vcsgui";
+  "vcswrapper" = dontDistribute super."vcswrapper";
+  "vect" = dontDistribute super."vect";
+  "vect-floating" = dontDistribute super."vect-floating";
+  "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
+  "vect-opengl" = dontDistribute super."vect-opengl";
+  "vector-binary" = dontDistribute super."vector-binary";
+  "vector-bytestring" = dontDistribute super."vector-bytestring";
+  "vector-clock" = dontDistribute super."vector-clock";
+  "vector-conduit" = dontDistribute super."vector-conduit";
+  "vector-functorlazy" = dontDistribute super."vector-functorlazy";
+  "vector-heterogenous" = dontDistribute super."vector-heterogenous";
+  "vector-instances-collections" = dontDistribute super."vector-instances-collections";
+  "vector-mmap" = dontDistribute super."vector-mmap";
+  "vector-random" = dontDistribute super."vector-random";
+  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
+  "vector-space-map" = dontDistribute super."vector-space-map";
+  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
+  "vector-space-points" = dontDistribute super."vector-space-points";
+  "vector-static" = dontDistribute super."vector-static";
+  "vector-strategies" = dontDistribute super."vector-strategies";
+  "verbalexpressions" = dontDistribute super."verbalexpressions";
+  "verbosity" = dontDistribute super."verbosity";
+  "verdict" = dontDistribute super."verdict";
+  "verdict-json" = dontDistribute super."verdict-json";
+  "verilog" = dontDistribute super."verilog";
+  "versions" = dontDistribute super."versions";
+  "vhdl" = dontDistribute super."vhdl";
+  "views" = dontDistribute super."views";
+  "vigilance" = dontDistribute super."vigilance";
+  "vimeta" = dontDistribute super."vimeta";
+  "vimus" = dontDistribute super."vimus";
+  "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl-gl" = dontDistribute super."vinyl-gl";
+  "vinyl-json" = dontDistribute super."vinyl-json";
+  "vinyl-plus" = dontDistribute super."vinyl-plus";
+  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
+  "virthualenv" = dontDistribute super."virthualenv";
+  "visibility" = dontDistribute super."visibility";
+  "vision" = dontDistribute super."vision";
+  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
+  "visual-prof" = dontDistribute super."visual-prof";
+  "vivid" = dontDistribute super."vivid";
+  "vk-aws-route53" = dontDistribute super."vk-aws-route53";
+  "vk-posix-pty" = dontDistribute super."vk-posix-pty";
+  "vocabulary-kadma" = dontDistribute super."vocabulary-kadma";
+  "vorbiscomment" = dontDistribute super."vorbiscomment";
+  "vowpal-utils" = dontDistribute super."vowpal-utils";
+  "voyeur" = dontDistribute super."voyeur";
+  "vrpn" = dontDistribute super."vrpn";
+  "vte" = dontDistribute super."vte";
+  "vtegtk3" = dontDistribute super."vtegtk3";
+  "vty-examples" = dontDistribute super."vty-examples";
+  "vty-menu" = dontDistribute super."vty-menu";
+  "vty-ui" = dontDistribute super."vty-ui";
+  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
+  "waddle" = dontDistribute super."waddle";
+  "wai-accept-language" = dontDistribute super."wai-accept-language";
+  "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-devel" = dontDistribute super."wai-devel";
+  "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
+  "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
+  "wai-graceful" = dontDistribute super."wai-graceful";
+  "wai-handler-devel" = dontDistribute super."wai-handler-devel";
+  "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
+  "wai-handler-snap" = dontDistribute super."wai-handler-snap";
+  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
+  "wai-hastache" = dontDistribute super."wai-hastache";
+  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-lens" = dontDistribute super."wai-lens";
+  "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
+  "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
+  "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
+  "wai-middleware-catch" = dontDistribute super."wai-middleware-catch";
+  "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type";
+  "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
+  "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
+  "wai-middleware-headers" = dontDistribute super."wai-middleware-headers";
+  "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac";
+  "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client";
+  "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor";
+  "wai-middleware-route" = dontDistribute super."wai-middleware-route";
+  "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
+  "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-request-spec" = dontDistribute super."wai-request-spec";
+  "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-router" = dontDistribute super."wai-router";
+  "wai-session-alt" = dontDistribute super."wai-session-alt";
+  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
+  "wai-static-cache" = dontDistribute super."wai-static-cache";
+  "wai-static-pages" = dontDistribute super."wai-static-pages";
+  "wai-test" = dontDistribute super."wai-test";
+  "wai-thrift" = dontDistribute super."wai-thrift";
+  "wai-throttler" = dontDistribute super."wai-throttler";
+  "wait-handle" = dontDistribute super."wait-handle";
+  "waitfree" = dontDistribute super."waitfree";
+  "warc" = dontDistribute super."warc";
+  "warp" = doDistribute super."warp_3_2_2";
+  "warp-dynamic" = dontDistribute super."warp-dynamic";
+  "warp-static" = dontDistribute super."warp-static";
+  "warp-tls-uid" = dontDistribute super."warp-tls-uid";
+  "watchdog" = dontDistribute super."watchdog";
+  "watcher" = dontDistribute super."watcher";
+  "watchit" = dontDistribute super."watchit";
+  "wavconvert" = dontDistribute super."wavconvert";
+  "wavesurfer" = dontDistribute super."wavesurfer";
+  "wavy" = dontDistribute super."wavy";
+  "wcwidth" = dontDistribute super."wcwidth";
+  "weather-api" = dontDistribute super."weather-api";
+  "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell";
+  "web-css" = dontDistribute super."web-css";
+  "web-encodings" = dontDistribute super."web-encodings";
+  "web-mongrel2" = dontDistribute super."web-mongrel2";
+  "web-page" = dontDistribute super."web-page";
+  "web-routes-mtl" = dontDistribute super."web-routes-mtl";
+  "web-routes-quasi" = dontDistribute super."web-routes-quasi";
+  "web-routes-regular" = dontDistribute super."web-routes-regular";
+  "web-routes-transformers" = dontDistribute super."web-routes-transformers";
+  "webapi" = dontDistribute super."webapi";
+  "webapp" = dontDistribute super."webapp";
+  "webcrank" = dontDistribute super."webcrank";
+  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
+  "webcrank-wai" = dontDistribute super."webcrank-wai";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
+  "webdriver-snoy" = dontDistribute super."webdriver-snoy";
+  "webfinger-client" = dontDistribute super."webfinger-client";
+  "webidl" = dontDistribute super."webidl";
+  "webify" = dontDistribute super."webify";
+  "webkit" = dontDistribute super."webkit";
+  "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
+  "webkitgtk3" = dontDistribute super."webkitgtk3";
+  "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webrtc-vad" = dontDistribute super."webrtc-vad";
+  "webserver" = dontDistribute super."webserver";
+  "websnap" = dontDistribute super."websnap";
+  "webwire" = dontDistribute super."webwire";
+  "wedding-announcement" = dontDistribute super."wedding-announcement";
+  "wedged" = dontDistribute super."wedged";
+  "weighted-regexp" = dontDistribute super."weighted-regexp";
+  "weighted-search" = dontDistribute super."weighted-search";
+  "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
+  "wheb-mongo" = dontDistribute super."wheb-mongo";
+  "wheb-redis" = dontDistribute super."wheb-redis";
+  "wheb-strapped" = dontDistribute super."wheb-strapped";
+  "while-lang-parser" = dontDistribute super."while-lang-parser";
+  "whim" = dontDistribute super."whim";
+  "whiskers" = dontDistribute super."whiskers";
+  "whitespace" = dontDistribute super."whitespace";
+  "whois" = dontDistribute super."whois";
+  "why3" = dontDistribute super."why3";
+  "wigner-symbols" = dontDistribute super."wigner-symbols";
+  "wikipedia4epub" = dontDistribute super."wikipedia4epub";
+  "win-hp-path" = dontDistribute super."win-hp-path";
+  "windowslive" = dontDistribute super."windowslive";
+  "winerror" = dontDistribute super."winerror";
+  "winio" = dontDistribute super."winio";
+  "wiring" = dontDistribute super."wiring";
+  "with-location" = doDistribute super."with-location_0_0_0";
+  "witness" = dontDistribute super."witness";
+  "witty" = dontDistribute super."witty";
+  "wkt" = dontDistribute super."wkt";
+  "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm";
+  "wlc-hs" = dontDistribute super."wlc-hs";
+  "wobsurv" = dontDistribute super."wobsurv";
+  "woffex" = dontDistribute super."woffex";
+  "wol" = dontDistribute super."wol";
+  "wolf" = dontDistribute super."wolf";
+  "woot" = dontDistribute super."woot";
+  "word24" = dontDistribute super."word24";
+  "wordcloud" = dontDistribute super."wordcloud";
+  "wordexp" = dontDistribute super."wordexp";
+  "words" = dontDistribute super."words";
+  "wordsearch" = dontDistribute super."wordsearch";
+  "wordsetdiff" = dontDistribute super."wordsetdiff";
+  "workflow-osx" = dontDistribute super."workflow-osx";
+  "wp-archivebot" = dontDistribute super."wp-archivebot";
+  "wraparound" = dontDistribute super."wraparound";
+  "wraxml" = dontDistribute super."wraxml";
+  "wreq-sb" = dontDistribute super."wreq-sb";
+  "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
+  "wsedit" = dontDistribute super."wsedit";
+  "wtk" = dontDistribute super."wtk";
+  "wtk-gtk" = dontDistribute super."wtk-gtk";
+  "wumpus-basic" = dontDistribute super."wumpus-basic";
+  "wumpus-core" = dontDistribute super."wumpus-core";
+  "wumpus-drawing" = dontDistribute super."wumpus-drawing";
+  "wumpus-microprint" = dontDistribute super."wumpus-microprint";
+  "wumpus-tree" = dontDistribute super."wumpus-tree";
+  "wuss" = dontDistribute super."wuss";
+  "wx" = dontDistribute super."wx";
+  "wxAsteroids" = dontDistribute super."wxAsteroids";
+  "wxFruit" = dontDistribute super."wxFruit";
+  "wxc" = dontDistribute super."wxc";
+  "wxcore" = dontDistribute super."wxcore";
+  "wxdirect" = dontDistribute super."wxdirect";
+  "wxhnotepad" = dontDistribute super."wxhnotepad";
+  "wxturtle" = dontDistribute super."wxturtle";
+  "wybor" = dontDistribute super."wybor";
+  "wyvern" = dontDistribute super."wyvern";
+  "x-dsp" = dontDistribute super."x-dsp";
+  "x11-xim" = dontDistribute super."x11-xim";
+  "x11-xinput" = dontDistribute super."x11-xinput";
+  "x509-util" = dontDistribute super."x509-util";
+  "xattr" = dontDistribute super."xattr";
+  "xbattbar" = dontDistribute super."xbattbar";
+  "xcb-types" = dontDistribute super."xcb-types";
+  "xcffib" = dontDistribute super."xcffib";
+  "xchat-plugin" = dontDistribute super."xchat-plugin";
+  "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
+  "xdg-userdirs" = dontDistribute super."xdg-userdirs";
+  "xdot" = dontDistribute super."xdot";
+  "xfconf" = dontDistribute super."xfconf";
+  "xhaskell-library" = dontDistribute super."xhaskell-library";
+  "xhb" = dontDistribute super."xhb";
+  "xhb-atom-cache" = dontDistribute super."xhb-atom-cache";
+  "xhb-ewmh" = dontDistribute super."xhb-ewmh";
+  "xhtml" = doDistribute super."xhtml_3000_2_1";
+  "xhtml-combinators" = dontDistribute super."xhtml-combinators";
+  "xilinx-lava" = dontDistribute super."xilinx-lava";
+  "xine" = dontDistribute super."xine";
+  "xing-api" = dontDistribute super."xing-api";
+  "xinput-conduit" = dontDistribute super."xinput-conduit";
+  "xkbcommon" = dontDistribute super."xkbcommon";
+  "xkcd" = dontDistribute super."xkcd";
+  "xlsx-tabular" = dontDistribute super."xlsx-tabular";
+  "xlsx-templater" = dontDistribute super."xlsx-templater";
+  "xml-basic" = dontDistribute super."xml-basic";
+  "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-enumerator" = dontDistribute super."xml-enumerator";
+  "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
+  "xml-extractors" = dontDistribute super."xml-extractors";
+  "xml-helpers" = dontDistribute super."xml-helpers";
+  "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens";
+  "xml-monad" = dontDistribute super."xml-monad";
+  "xml-parsec" = dontDistribute super."xml-parsec";
+  "xml-picklers" = dontDistribute super."xml-picklers";
+  "xml-pipe" = dontDistribute super."xml-pipe";
+  "xml-prettify" = dontDistribute super."xml-prettify";
+  "xml-push" = dontDistribute super."xml-push";
+  "xml-query" = dontDistribute super."xml-query";
+  "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit";
+  "xml-query-xml-types" = dontDistribute super."xml-query-xml-types";
+  "xml2html" = dontDistribute super."xml2html";
+  "xml2json" = dontDistribute super."xml2json";
+  "xml2x" = dontDistribute super."xml2x";
+  "xmltv" = dontDistribute super."xmltv";
+  "xmms2-client" = dontDistribute super."xmms2-client";
+  "xmms2-client-glib" = dontDistribute super."xmms2-client-glib";
+  "xmobar" = dontDistribute super."xmobar";
+  "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch";
+  "xmonad-contrib" = dontDistribute super."xmonad-contrib";
+  "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch";
+  "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl";
+  "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper";
+  "xmonad-eval" = dontDistribute super."xmonad-eval";
+  "xmonad-extras" = dontDistribute super."xmonad-extras";
+  "xmonad-screenshot" = dontDistribute super."xmonad-screenshot";
+  "xmonad-utils" = dontDistribute super."xmonad-utils";
+  "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper";
+  "xmonad-windownames" = dontDistribute super."xmonad-windownames";
+  "xmpipe" = dontDistribute super."xmpipe";
+  "xorshift" = dontDistribute super."xorshift";
+  "xosd" = dontDistribute super."xosd";
+  "xournal-builder" = dontDistribute super."xournal-builder";
+  "xournal-convert" = dontDistribute super."xournal-convert";
+  "xournal-parser" = dontDistribute super."xournal-parser";
+  "xournal-render" = dontDistribute super."xournal-render";
+  "xournal-types" = dontDistribute super."xournal-types";
+  "xsact" = dontDistribute super."xsact";
+  "xsd" = dontDistribute super."xsd";
+  "xsha1" = dontDistribute super."xsha1";
+  "xslt" = dontDistribute super."xslt";
+  "xtc" = dontDistribute super."xtc";
+  "xtest" = dontDistribute super."xtest";
+  "xturtle" = dontDistribute super."xturtle";
+  "xxhash" = dontDistribute super."xxhash";
+  "y0l0bot" = dontDistribute super."y0l0bot";
+  "yabi" = dontDistribute super."yabi";
+  "yabi-muno" = dontDistribute super."yabi-muno";
+  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
+  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
+  "yajl" = dontDistribute super."yajl";
+  "yajl-enumerator" = dontDistribute super."yajl-enumerator";
+  "yall" = dontDistribute super."yall";
+  "yamemo" = dontDistribute super."yamemo";
+  "yaml-config" = dontDistribute super."yaml-config";
+  "yaml-light-lens" = dontDistribute super."yaml-light-lens";
+  "yaml-rpc" = dontDistribute super."yaml-rpc";
+  "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
+  "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
+  "yaml2owl" = dontDistribute super."yaml2owl";
+  "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
+  "yampa-canvas" = dontDistribute super."yampa-canvas";
+  "yampa-glfw" = dontDistribute super."yampa-glfw";
+  "yampa-glut" = dontDistribute super."yampa-glut";
+  "yampa2048" = dontDistribute super."yampa2048";
+  "yaop" = dontDistribute super."yaop";
+  "yap" = dontDistribute super."yap";
+  "yarr" = dontDistribute super."yarr";
+  "yarr-image-io" = dontDistribute super."yarr-image-io";
+  "yate" = dontDistribute super."yate";
+  "yavie" = dontDistribute super."yavie";
+  "ycextra" = dontDistribute super."ycextra";
+  "yeganesh" = dontDistribute super."yeganesh";
+  "yeller" = dontDistribute super."yeller";
+  "yeshql" = dontDistribute super."yeshql";
+  "yesod-angular" = dontDistribute super."yesod-angular";
+  "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
+  "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
+  "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_3";
+  "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
+  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
+  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
+  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
+  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
+  "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
+  "yesod-comments" = dontDistribute super."yesod-comments";
+  "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
+  "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-crud" = dontDistribute super."yesod-crud";
+  "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
+  "yesod-csp" = dontDistribute super."yesod-csp";
+  "yesod-datatables" = dontDistribute super."yesod-datatables";
+  "yesod-dsl" = dontDistribute super."yesod-dsl";
+  "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form-json" = dontDistribute super."yesod-form-json";
+  "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
+  "yesod-goodies" = dontDistribute super."yesod-goodies";
+  "yesod-job-queue" = dontDistribute super."yesod-job-queue";
+  "yesod-json" = dontDistribute super."yesod-json";
+  "yesod-links" = dontDistribute super."yesod-links";
+  "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-markdown" = dontDistribute super."yesod-markdown";
+  "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5";
+  "yesod-paginate" = dontDistribute super."yesod-paginate";
+  "yesod-pagination" = dontDistribute super."yesod-pagination";
+  "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-platform" = dontDistribute super."yesod-platform";
+  "yesod-pnotify" = dontDistribute super."yesod-pnotify";
+  "yesod-pure" = dontDistribute super."yesod-pure";
+  "yesod-purescript" = dontDistribute super."yesod-purescript";
+  "yesod-raml" = dontDistribute super."yesod-raml";
+  "yesod-raml-bin" = dontDistribute super."yesod-raml-bin";
+  "yesod-raml-docs" = dontDistribute super."yesod-raml-docs";
+  "yesod-raml-mock" = dontDistribute super."yesod-raml-mock";
+  "yesod-recaptcha" = dontDistribute super."yesod-recaptcha";
+  "yesod-routes" = dontDistribute super."yesod-routes";
+  "yesod-routes-flow" = dontDistribute super."yesod-routes-flow";
+  "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript";
+  "yesod-rst" = dontDistribute super."yesod-rst";
+  "yesod-s3" = dontDistribute super."yesod-s3";
+  "yesod-sass" = dontDistribute super."yesod-sass";
+  "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
+  "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test-json" = dontDistribute super."yesod-test-json";
+  "yesod-tls" = dontDistribute super."yesod-tls";
+  "yesod-transloadit" = dontDistribute super."yesod-transloadit";
+  "yesod-vend" = dontDistribute super."yesod-vend";
+  "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra";
+  "yesod-worker" = dontDistribute super."yesod-worker";
+  "yet-another-logger" = dontDistribute super."yet-another-logger";
+  "yhccore" = dontDistribute super."yhccore";
+  "yi-contrib" = dontDistribute super."yi-contrib";
+  "yi-emacs-colours" = dontDistribute super."yi-emacs-colours";
+  "yi-gtk" = dontDistribute super."yi-gtk";
+  "yi-monokai" = dontDistribute super."yi-monokai";
+  "yi-snippet" = dontDistribute super."yi-snippet";
+  "yi-solarized" = dontDistribute super."yi-solarized";
+  "yi-spolsky" = dontDistribute super."yi-spolsky";
+  "yi-vty" = dontDistribute super."yi-vty";
+  "yices" = dontDistribute super."yices";
+  "yices-easy" = dontDistribute super."yices-easy";
+  "yices-painless" = dontDistribute super."yices-painless";
+  "yjftp" = dontDistribute super."yjftp";
+  "yjftp-libs" = dontDistribute super."yjftp-libs";
+  "yjsvg" = dontDistribute super."yjsvg";
+  "yjtools" = dontDistribute super."yjtools";
+  "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
+  "yoko" = dontDistribute super."yoko";
+  "york-lava" = dontDistribute super."york-lava";
+  "youtube" = dontDistribute super."youtube";
+  "yql" = dontDistribute super."yql";
+  "yst" = dontDistribute super."yst";
+  "yuiGrid" = dontDistribute super."yuiGrid";
+  "yuuko" = dontDistribute super."yuuko";
+  "yxdb-utils" = dontDistribute super."yxdb-utils";
+  "z3" = dontDistribute super."z3";
+  "zalgo" = dontDistribute super."zalgo";
+  "zampolit" = dontDistribute super."zampolit";
+  "zasni-gerna" = dontDistribute super."zasni-gerna";
+  "zcache" = dontDistribute super."zcache";
+  "zenc" = dontDistribute super."zenc";
+  "zendesk-api" = dontDistribute super."zendesk-api";
+  "zeno" = dontDistribute super."zeno";
+  "zerobin" = dontDistribute super."zerobin";
+  "zeromq-haskell" = dontDistribute super."zeromq-haskell";
+  "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
+  "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeroth" = dontDistribute super."zeroth";
+  "zigbee-znet25" = dontDistribute super."zigbee-znet25";
+  "zim-parser" = doDistribute super."zim-parser_0_1_0_0";
+  "zip" = dontDistribute super."zip";
+  "zip-conduit" = dontDistribute super."zip-conduit";
+  "zipedit" = dontDistribute super."zipedit";
+  "zipkin" = dontDistribute super."zipkin";
+  "zipper" = dontDistribute super."zipper";
+  "zippers" = dontDistribute super."zippers";
+  "zippo" = dontDistribute super."zippo";
+  "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zmcat" = dontDistribute super."zmcat";
+  "zmidi-core" = dontDistribute super."zmidi-core";
+  "zmidi-score" = dontDistribute super."zmidi-score";
+  "zmqat" = dontDistribute super."zmqat";
+  "zoneinfo" = dontDistribute super."zoneinfo";
+  "zoom" = dontDistribute super."zoom";
+  "zoom-cache" = dontDistribute super."zoom-cache";
+  "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm";
+  "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile";
+  "zoom-refs" = dontDistribute super."zoom-refs";
+  "zot" = dontDistribute super."zot";
+  "zsh-battery" = dontDistribute super."zsh-battery";
+  "ztail" = dontDistribute super."ztail";
+
+}
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.15.nix b/pkgs/development/haskell-modules/configuration-lts-5.15.nix
new file mode 100644
index 00000000000..c0e68130c4a
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-lts-5.15.nix
@@ -0,0 +1,8129 @@
+{ pkgs }:
+
+with import ./lib.nix { inherit pkgs; };
+
+self: super: {
+
+  # core libraries provided by the compiler
+  Cabal = null;
+  array = null;
+  base = null;
+  bin-package-db = null;
+  binary = null;
+  bytestring = null;
+  containers = null;
+  deepseq = null;
+  directory = null;
+  filepath = null;
+  ghc-prim = null;
+  hoopl = null;
+  hpc = null;
+  integer-gmp = null;
+  pretty = null;
+  process = null;
+  rts = null;
+  template-haskell = null;
+  time = null;
+  transformers = null;
+  unix = null;
+
+  # lts-5.15 packages
+  "3d-graphics-examples" = dontDistribute super."3d-graphics-examples";
+  "3dmodels" = dontDistribute super."3dmodels";
+  "4Blocks" = dontDistribute super."4Blocks";
+  "AAI" = dontDistribute super."AAI";
+  "ABList" = dontDistribute super."ABList";
+  "AC-Angle" = dontDistribute super."AC-Angle";
+  "AC-Boolean" = dontDistribute super."AC-Boolean";
+  "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform";
+  "AC-Colour" = dontDistribute super."AC-Colour";
+  "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK";
+  "AC-HalfInteger" = dontDistribute super."AC-HalfInteger";
+  "AC-MiniTest" = dontDistribute super."AC-MiniTest";
+  "AC-PPM" = dontDistribute super."AC-PPM";
+  "AC-Random" = dontDistribute super."AC-Random";
+  "AC-Terminal" = dontDistribute super."AC-Terminal";
+  "AC-VanillaArray" = dontDistribute super."AC-VanillaArray";
+  "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy";
+  "ACME" = dontDistribute super."ACME";
+  "ADPfusion" = dontDistribute super."ADPfusion";
+  "AERN-Basics" = dontDistribute super."AERN-Basics";
+  "AERN-Net" = dontDistribute super."AERN-Net";
+  "AERN-Real" = dontDistribute super."AERN-Real";
+  "AERN-Real-Double" = dontDistribute super."AERN-Real-Double";
+  "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval";
+  "AERN-RnToRm" = dontDistribute super."AERN-RnToRm";
+  "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot";
+  "AES" = dontDistribute super."AES";
+  "AFSM" = dontDistribute super."AFSM";
+  "AGI" = dontDistribute super."AGI";
+  "ALUT" = dontDistribute super."ALUT";
+  "AMI" = dontDistribute super."AMI";
+  "ANum" = dontDistribute super."ANum";
+  "ASN1" = dontDistribute super."ASN1";
+  "AVar" = dontDistribute super."AVar";
+  "AWin32Console" = dontDistribute super."AWin32Console";
+  "AbortT-monadstf" = dontDistribute super."AbortT-monadstf";
+  "AbortT-mtl" = dontDistribute super."AbortT-mtl";
+  "AbortT-transformers" = dontDistribute super."AbortT-transformers";
+  "ActionKid" = dontDistribute super."ActionKid";
+  "Adaptive" = dontDistribute super."Adaptive";
+  "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade";
+  "Advgame" = dontDistribute super."Advgame";
+  "AesonBson" = dontDistribute super."AesonBson";
+  "Agata" = dontDistribute super."Agata";
+  "Agda" = doDistribute super."Agda_2_4_2_5";
+  "Agda-executable" = dontDistribute super."Agda-executable";
+  "AhoCorasick" = dontDistribute super."AhoCorasick";
+  "AlgorithmW" = dontDistribute super."AlgorithmW";
+  "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms";
+  "Allure" = dontDistribute super."Allure";
+  "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter";
+  "Animas" = dontDistribute super."Animas";
+  "Annotations" = dontDistribute super."Annotations";
+  "Ansi2Html" = dontDistribute super."Ansi2Html";
+  "ApplePush" = dontDistribute super."ApplePush";
+  "AppleScript" = dontDistribute super."AppleScript";
+  "ApproxFun-hs" = dontDistribute super."ApproxFun-hs";
+  "ArrayRef" = dontDistribute super."ArrayRef";
+  "ArrowVHDL" = dontDistribute super."ArrowVHDL";
+  "AspectAG" = dontDistribute super."AspectAG";
+  "AttoBencode" = dontDistribute super."AttoBencode";
+  "AttoJson" = dontDistribute super."AttoJson";
+  "Attrac" = dontDistribute super."Attrac";
+  "Aurochs" = dontDistribute super."Aurochs";
+  "AutoForms" = dontDistribute super."AutoForms";
+  "AvlTree" = dontDistribute super."AvlTree";
+  "BASIC" = dontDistribute super."BASIC";
+  "BCMtools" = dontDistribute super."BCMtools";
+  "BNFC" = dontDistribute super."BNFC";
+  "BNFC-meta" = dontDistribute super."BNFC-meta";
+  "Baggins" = dontDistribute super."Baggins";
+  "Bang" = dontDistribute super."Bang";
+  "Barracuda" = dontDistribute super."Barracuda";
+  "Befunge93" = dontDistribute super."Befunge93";
+  "BenchmarkHistory" = dontDistribute super."BenchmarkHistory";
+  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
+  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
+  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BigPixel" = dontDistribute super."BigPixel";
+  "Binpack" = dontDistribute super."Binpack";
+  "Biobase" = dontDistribute super."Biobase";
+  "BiobaseBlast" = dontDistribute super."BiobaseBlast";
+  "BiobaseDotP" = dontDistribute super."BiobaseDotP";
+  "BiobaseFR3D" = dontDistribute super."BiobaseFR3D";
+  "BiobaseFasta" = dontDistribute super."BiobaseFasta";
+  "BiobaseInfernal" = dontDistribute super."BiobaseInfernal";
+  "BiobaseMAF" = dontDistribute super."BiobaseMAF";
+  "BiobaseNewick" = dontDistribute super."BiobaseNewick";
+  "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData";
+  "BiobaseTurner" = dontDistribute super."BiobaseTurner";
+  "BiobaseTypes" = dontDistribute super."BiobaseTypes";
+  "BiobaseVienna" = dontDistribute super."BiobaseVienna";
+  "BiobaseXNA" = dontDistribute super."BiobaseXNA";
+  "BirdPP" = dontDistribute super."BirdPP";
+  "BitSyntax" = dontDistribute super."BitSyntax";
+  "Bitly" = dontDistribute super."Bitly";
+  "Blobs" = dontDistribute super."Blobs";
+  "BluePrintCSS" = dontDistribute super."BluePrintCSS";
+  "Blueprint" = dontDistribute super."Blueprint";
+  "Bookshelf" = dontDistribute super."Bookshelf";
+  "Bravo" = dontDistribute super."Bravo";
+  "BufferedSocket" = dontDistribute super."BufferedSocket";
+  "Buster" = dontDistribute super."Buster";
+  "CBOR" = dontDistribute super."CBOR";
+  "CC-delcont" = dontDistribute super."CC-delcont";
+  "CC-delcont-alt" = dontDistribute super."CC-delcont-alt";
+  "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe";
+  "CC-delcont-exc" = dontDistribute super."CC-delcont-exc";
+  "CC-delcont-ref" = dontDistribute super."CC-delcont-ref";
+  "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf";
+  "CCA" = dontDistribute super."CCA";
+  "CHXHtml" = dontDistribute super."CHXHtml";
+  "CLASE" = dontDistribute super."CLASE";
+  "CLI" = dontDistribute super."CLI";
+  "CMCompare" = dontDistribute super."CMCompare";
+  "CMQ" = dontDistribute super."CMQ";
+  "COrdering" = dontDistribute super."COrdering";
+  "CPBrainfuck" = dontDistribute super."CPBrainfuck";
+  "CPL" = dontDistribute super."CPL";
+  "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage";
+  "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules";
+  "CSPM-Frontend" = dontDistribute super."CSPM-Frontend";
+  "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter";
+  "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog";
+  "CSPM-cspm" = dontDistribute super."CSPM-cspm";
+  "CTRex" = dontDistribute super."CTRex";
+  "CV" = dontDistribute super."CV";
+  "CabalSearch" = dontDistribute super."CabalSearch";
+  "Capabilities" = dontDistribute super."Capabilities";
+  "Cardinality" = dontDistribute super."Cardinality";
+  "CarneadesDSL" = dontDistribute super."CarneadesDSL";
+  "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung";
+  "Cartesian" = dontDistribute super."Cartesian";
+  "Cascade" = dontDistribute super."Cascade";
+  "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
+  "Chart" = doDistribute super."Chart_1_5_4";
+  "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4";
+  "Chart-diagrams" = dontDistribute super."Chart-diagrams";
+  "Chart-gtk" = dontDistribute super."Chart-gtk";
+  "Chart-simple" = dontDistribute super."Chart-simple";
+  "CheatSheet" = dontDistribute super."CheatSheet";
+  "Checked" = dontDistribute super."Checked";
+  "Chitra" = dontDistribute super."Chitra";
+  "ChristmasTree" = dontDistribute super."ChristmasTree";
+  "CirruParser" = dontDistribute super."CirruParser";
+  "ClassLaws" = dontDistribute super."ClassLaws";
+  "ClassyPrelude" = dontDistribute super."ClassyPrelude";
+  "Clean" = dontDistribute super."Clean";
+  "Clipboard" = dontDistribute super."Clipboard";
+  "Coadjute" = dontDistribute super."Coadjute";
+  "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF";
+  "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL";
+  "Combinatorrent" = dontDistribute super."Combinatorrent";
+  "Command" = dontDistribute super."Command";
+  "Commando" = dontDistribute super."Commando";
+  "ComonadSheet" = dontDistribute super."ComonadSheet";
+  "ConcurrentUtils" = dontDistribute super."ConcurrentUtils";
+  "Concurrential" = dontDistribute super."Concurrential";
+  "Condor" = dontDistribute super."Condor";
+  "ConfigFileTH" = dontDistribute super."ConfigFileTH";
+  "Configger" = dontDistribute super."Configger";
+  "Configurable" = dontDistribute super."Configurable";
+  "ConsStream" = dontDistribute super."ConsStream";
+  "Conscript" = dontDistribute super."Conscript";
+  "ConstraintKinds" = dontDistribute super."ConstraintKinds";
+  "Consumer" = dontDistribute super."Consumer";
+  "ContArrow" = dontDistribute super."ContArrow";
+  "ContextAlgebra" = dontDistribute super."ContextAlgebra";
+  "Contract" = dontDistribute super."Contract";
+  "Control-Engine" = dontDistribute super."Control-Engine";
+  "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass";
+  "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2";
+  "CoreDump" = dontDistribute super."CoreDump";
+  "CoreErlang" = dontDistribute super."CoreErlang";
+  "CoreFoundation" = dontDistribute super."CoreFoundation";
+  "Coroutine" = dontDistribute super."Coroutine";
+  "CouchDB" = dontDistribute super."CouchDB";
+  "Craft3e" = dontDistribute super."Craft3e";
+  "Crypto" = dontDistribute super."Crypto";
+  "CurryDB" = dontDistribute super."CurryDB";
+  "DAG-Tournament" = dontDistribute super."DAG-Tournament";
+  "DBlimited" = dontDistribute super."DBlimited";
+  "DBus" = dontDistribute super."DBus";
+  "DCFL" = dontDistribute super."DCFL";
+  "DMuCheck" = dontDistribute super."DMuCheck";
+  "DOM" = dontDistribute super."DOM";
+  "DP" = dontDistribute super."DP";
+  "DPM" = dontDistribute super."DPM";
+  "DSA" = dontDistribute super."DSA";
+  "DSH" = dontDistribute super."DSH";
+  "DSTM" = dontDistribute super."DSTM";
+  "DTC" = dontDistribute super."DTC";
+  "Dangerous" = dontDistribute super."Dangerous";
+  "Dao" = dontDistribute super."Dao";
+  "DarcsHelpers" = dontDistribute super."DarcsHelpers";
+  "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent";
+  "Data-Rope" = dontDistribute super."Data-Rope";
+  "DataTreeView" = dontDistribute super."DataTreeView";
+  "Deadpan-DDP" = dontDistribute super."Deadpan-DDP";
+  "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers";
+  "DecisionTree" = dontDistribute super."DecisionTree";
+  "DeepArrow" = dontDistribute super."DeepArrow";
+  "DefendTheKing" = dontDistribute super."DefendTheKing";
+  "DescriptiveKeys" = dontDistribute super."DescriptiveKeys";
+  "Dflow" = dontDistribute super."Dflow";
+  "DifferenceLogic" = dontDistribute super."DifferenceLogic";
+  "DifferentialEvolution" = dontDistribute super."DifferentialEvolution";
+  "Digit" = dontDistribute super."Digit";
+  "DigitalOcean" = dontDistribute super."DigitalOcean";
+  "DimensionalHash" = dontDistribute super."DimensionalHash";
+  "DirectSound" = dontDistribute super."DirectSound";
+  "DisTract" = dontDistribute super."DisTract";
+  "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem";
+  "Dish" = dontDistribute super."Dish";
+  "Dist" = dontDistribute super."Dist";
+  "DistanceTransform" = dontDistribute super."DistanceTransform";
+  "DistanceUnits" = dontDistribute super."DistanceUnits";
+  "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment";
+  "DocTest" = dontDistribute super."DocTest";
+  "Docs" = dontDistribute super."Docs";
+  "DrHylo" = dontDistribute super."DrHylo";
+  "DrIFT" = dontDistribute super."DrIFT";
+  "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized";
+  "Dung" = dontDistribute super."Dung";
+  "Dust" = dontDistribute super."Dust";
+  "Dust-crypto" = dontDistribute super."Dust-crypto";
+  "Dust-tools" = dontDistribute super."Dust-tools";
+  "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap";
+  "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp";
+  "DysFRP" = dontDistribute super."DysFRP";
+  "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
+  "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
+  "EEConfig" = dontDistribute super."EEConfig";
+  "Earley" = doDistribute super."Earley_0_10_1_0";
+  "EdisonAPI" = dontDistribute super."EdisonAPI";
+  "EdisonCore" = dontDistribute super."EdisonCore";
+  "EditTimeReport" = dontDistribute super."EditTimeReport";
+  "EitherT" = dontDistribute super."EitherT";
+  "Elm" = dontDistribute super."Elm";
+  "Emping" = dontDistribute super."Emping";
+  "Encode" = dontDistribute super."Encode";
+  "EnumContainers" = dontDistribute super."EnumContainers";
+  "EnumMap" = dontDistribute super."EnumMap";
+  "Eq" = dontDistribute super."Eq";
+  "EqualitySolver" = dontDistribute super."EqualitySolver";
+  "EsounD" = dontDistribute super."EsounD";
+  "EstProgress" = dontDistribute super."EstProgress";
+  "EtaMOO" = dontDistribute super."EtaMOO";
+  "Etage" = dontDistribute super."Etage";
+  "Etage-Graph" = dontDistribute super."Etage-Graph";
+  "Eternal10Seconds" = dontDistribute super."Eternal10Seconds";
+  "Etherbunny" = dontDistribute super."Etherbunny";
+  "EuroIT" = dontDistribute super."EuroIT";
+  "Euterpea" = dontDistribute super."Euterpea";
+  "EventSocket" = dontDistribute super."EventSocket";
+  "Extra" = dontDistribute super."Extra";
+  "FComp" = dontDistribute super."FComp";
+  "FM-SBLEX" = dontDistribute super."FM-SBLEX";
+  "FModExRaw" = dontDistribute super."FModExRaw";
+  "FPretty" = dontDistribute super."FPretty";
+  "FTGL" = dontDistribute super."FTGL";
+  "FTGL-bytestring" = dontDistribute super."FTGL-bytestring";
+  "FTPLine" = dontDistribute super."FTPLine";
+  "Facts" = dontDistribute super."Facts";
+  "FailureT" = dontDistribute super."FailureT";
+  "FastxPipe" = dontDistribute super."FastxPipe";
+  "FermatsLastMargin" = dontDistribute super."FermatsLastMargin";
+  "FerryCore" = dontDistribute super."FerryCore";
+  "Feval" = dontDistribute super."Feval";
+  "FieldTrip" = dontDistribute super."FieldTrip";
+  "FileManip" = dontDistribute super."FileManip";
+  "FileManipCompat" = dontDistribute super."FileManipCompat";
+  "FilePather" = dontDistribute super."FilePather";
+  "FileSystem" = dontDistribute super."FileSystem";
+  "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo";
+  "Finance-Treasury" = dontDistribute super."Finance-Treasury";
+  "FiniteMap" = dontDistribute super."FiniteMap";
+  "FirstOrderTheory" = dontDistribute super."FirstOrderTheory";
+  "FixedPoint-simple" = dontDistribute super."FixedPoint-simple";
+  "Flippi" = dontDistribute super."Flippi";
+  "Focus" = dontDistribute super."Focus";
+  "Folly" = dontDistribute super."Folly";
+  "ForSyDe" = dontDistribute super."ForSyDe";
+  "ForestStructures" = dontDistribute super."ForestStructures";
+  "ForkableT" = dontDistribute super."ForkableT";
+  "FormalGrammars" = dontDistribute super."FormalGrammars";
+  "Foster" = dontDistribute super."Foster";
+  "FpMLv53" = dontDistribute super."FpMLv53";
+  "FractalArt" = dontDistribute super."FractalArt";
+  "Fractaler" = dontDistribute super."Fractaler";
+  "Frank" = dontDistribute super."Frank";
+  "FreeTypeGL" = dontDistribute super."FreeTypeGL";
+  "FunGEn" = dontDistribute super."FunGEn";
+  "Fungi" = dontDistribute super."Fungi";
+  "GA" = dontDistribute super."GA";
+  "GGg" = dontDistribute super."GGg";
+  "GHood" = dontDistribute super."GHood";
+  "GLFW" = dontDistribute super."GLFW";
+  "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
+  "GLFW-task" = dontDistribute super."GLFW-task";
+  "GLHUI" = dontDistribute super."GLHUI";
+  "GLM" = dontDistribute super."GLM";
+  "GLMatrix" = dontDistribute super."GLMatrix";
+  "GLUtil" = dontDistribute super."GLUtil";
+  "GPX" = dontDistribute super."GPX";
+  "GPipe-Collada" = dontDistribute super."GPipe-Collada";
+  "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
+  "GTALib" = dontDistribute super."GTALib";
+  "Gamgine" = dontDistribute super."Gamgine";
+  "Ganymede" = dontDistribute super."Ganymede";
+  "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration";
+  "GeBoP" = dontDistribute super."GeBoP";
+  "GenI" = dontDistribute super."GenI";
+  "GenSmsPdu" = dontDistribute super."GenSmsPdu";
+  "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe";
+  "GenussFold" = dontDistribute super."GenussFold";
+  "GeoIp" = dontDistribute super."GeoIp";
+  "GeocoderOpenCage" = dontDistribute super."GeocoderOpenCage";
+  "Geodetic" = dontDistribute super."Geodetic";
+  "GeomPredicates" = dontDistribute super."GeomPredicates";
+  "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE";
+  "GiST" = dontDistribute super."GiST";
+  "Gifcurry" = dontDistribute super."Gifcurry";
+  "GiveYouAHead" = dontDistribute super."GiveYouAHead";
+  "GlomeTrace" = dontDistribute super."GlomeTrace";
+  "GlomeVec" = dontDistribute super."GlomeVec";
+  "GlomeView" = dontDistribute super."GlomeView";
+  "GoogleChart" = dontDistribute super."GoogleChart";
+  "GoogleDirections" = dontDistribute super."GoogleDirections";
+  "GoogleSB" = dontDistribute super."GoogleSB";
+  "GoogleSuggest" = dontDistribute super."GoogleSuggest";
+  "GoogleTranslate" = dontDistribute super."GoogleTranslate";
+  "GotoT-transformers" = dontDistribute super."GotoT-transformers";
+  "GrammarProducts" = dontDistribute super."GrammarProducts";
+  "Graph500" = dontDistribute super."Graph500";
+  "GraphHammer" = dontDistribute super."GraphHammer";
+  "GraphHammer-examples" = dontDistribute super."GraphHammer-examples";
+  "Graphalyze" = dontDistribute super."Graphalyze";
+  "Grempa" = dontDistribute super."Grempa";
+  "GroteTrap" = dontDistribute super."GroteTrap";
+  "Grow" = dontDistribute super."Grow";
+  "GrowlNotify" = dontDistribute super."GrowlNotify";
+  "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics";
+  "GtkGLTV" = dontDistribute super."GtkGLTV";
+  "GtkTV" = dontDistribute super."GtkTV";
+  "GuiHaskell" = dontDistribute super."GuiHaskell";
+  "GuiTV" = dontDistribute super."GuiTV";
+  "HARM" = dontDistribute super."HARM";
+  "HAppS-Data" = dontDistribute super."HAppS-Data";
+  "HAppS-IxSet" = dontDistribute super."HAppS-IxSet";
+  "HAppS-Server" = dontDistribute super."HAppS-Server";
+  "HAppS-State" = dontDistribute super."HAppS-State";
+  "HAppS-Util" = dontDistribute super."HAppS-Util";
+  "HAppSHelpers" = dontDistribute super."HAppSHelpers";
+  "HCL" = dontDistribute super."HCL";
+  "HCard" = dontDistribute super."HCard";
+  "HDBC-mysql" = dontDistribute super."HDBC-mysql";
+  "HDBC-odbc" = dontDistribute super."HDBC-odbc";
+  "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore";
+  "HDBC-session" = dontDistribute super."HDBC-session";
+  "HDRUtils" = dontDistribute super."HDRUtils";
+  "HERA" = dontDistribute super."HERA";
+  "HFrequencyQueue" = dontDistribute super."HFrequencyQueue";
+  "HFuse" = dontDistribute super."HFuse";
+  "HGL" = dontDistribute super."HGL";
+  "HGamer3D" = dontDistribute super."HGamer3D";
+  "HGamer3D-API" = dontDistribute super."HGamer3D-API";
+  "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio";
+  "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding";
+  "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding";
+  "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding";
+  "HGamer3D-Common" = dontDistribute super."HGamer3D-Common";
+  "HGamer3D-Data" = dontDistribute super."HGamer3D-Data";
+  "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding";
+  "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI";
+  "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D";
+  "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem";
+  "HGamer3D-Network" = dontDistribute super."HGamer3D-Network";
+  "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding";
+  "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding";
+  "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding";
+  "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding";
+  "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent";
+  "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire";
+  "HGraphStorage" = dontDistribute super."HGraphStorage";
+  "HHDL" = dontDistribute super."HHDL";
+  "HJScript" = dontDistribute super."HJScript";
+  "HJVM" = dontDistribute super."HJVM";
+  "HJavaScript" = dontDistribute super."HJavaScript";
+  "HLearn-algebra" = dontDistribute super."HLearn-algebra";
+  "HLearn-approximation" = dontDistribute super."HLearn-approximation";
+  "HLearn-classification" = dontDistribute super."HLearn-classification";
+  "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
+  "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HListPP" = dontDistribute super."HListPP";
+  "HLogger" = dontDistribute super."HLogger";
+  "HMM" = dontDistribute super."HMM";
+  "HMap" = dontDistribute super."HMap";
+  "HNM" = dontDistribute super."HNM";
+  "HODE" = dontDistribute super."HODE";
+  "HOpenCV" = dontDistribute super."HOpenCV";
+  "HPath" = dontDistribute super."HPath";
+  "HPi" = dontDistribute super."HPi";
+  "HPlot" = dontDistribute super."HPlot";
+  "HPong" = dontDistribute super."HPong";
+  "HROOT" = dontDistribute super."HROOT";
+  "HROOT-core" = dontDistribute super."HROOT-core";
+  "HROOT-graf" = dontDistribute super."HROOT-graf";
+  "HROOT-hist" = dontDistribute super."HROOT-hist";
+  "HROOT-io" = dontDistribute super."HROOT-io";
+  "HROOT-math" = dontDistribute super."HROOT-math";
+  "HRay" = dontDistribute super."HRay";
+  "HSFFIG" = dontDistribute super."HSFFIG";
+  "HSGEP" = dontDistribute super."HSGEP";
+  "HSH" = dontDistribute super."HSH";
+  "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSlippyMap" = dontDistribute super."HSlippyMap";
+  "HSmarty" = dontDistribute super."HSmarty";
+  "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
+  "HSvm" = dontDistribute super."HSvm";
+  "HTTP-Simple" = dontDistribute super."HTTP-Simple";
+  "HTab" = dontDistribute super."HTab";
+  "HTicTacToe" = dontDistribute super."HTicTacToe";
+  "HUnit-Diff" = dontDistribute super."HUnit-Diff";
+  "HUnit-Plus" = dontDistribute super."HUnit-Plus";
+  "HUnit-approx" = dontDistribute super."HUnit-approx";
+  "HXMPP" = dontDistribute super."HXMPP";
+  "HXQ" = dontDistribute super."HXQ";
+  "HaLeX" = dontDistribute super."HaLeX";
+  "HaMinitel" = dontDistribute super."HaMinitel";
+  "HaPy" = dontDistribute super."HaPy";
+  "HaTeX-meta" = dontDistribute super."HaTeX-meta";
+  "HaTeX-qq" = dontDistribute super."HaTeX-qq";
+  "HaVSA" = dontDistribute super."HaVSA";
+  "Hach" = dontDistribute super."Hach";
+  "HackMail" = dontDistribute super."HackMail";
+  "Haggressive" = dontDistribute super."Haggressive";
+  "HandlerSocketClient" = dontDistribute super."HandlerSocketClient";
+  "Hangman" = dontDistribute super."Hangman";
+  "HarmTrace" = dontDistribute super."HarmTrace";
+  "HarmTrace-Base" = dontDistribute super."HarmTrace-Base";
+  "HasGP" = dontDistribute super."HasGP";
+  "Haschoo" = dontDistribute super."Haschoo";
+  "Hashell" = dontDistribute super."Hashell";
+  "HaskRel" = dontDistribute super."HaskRel";
+  "HaskellForMaths" = dontDistribute super."HaskellForMaths";
+  "HaskellLM" = dontDistribute super."HaskellLM";
+  "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellTorrent" = dontDistribute super."HaskellTorrent";
+  "HaskellTutorials" = dontDistribute super."HaskellTutorials";
+  "Haskelloids" = dontDistribute super."Haskelloids";
+  "Hate" = dontDistribute super."Hate";
+  "Hawk" = dontDistribute super."Hawk";
+  "Hayoo" = dontDistribute super."Hayoo";
+  "Hclip" = dontDistribute super."Hclip";
+  "Hedi" = dontDistribute super."Hedi";
+  "HerbiePlugin" = dontDistribute super."HerbiePlugin";
+  "Hermes" = dontDistribute super."Hermes";
+  "Hieroglyph" = dontDistribute super."Hieroglyph";
+  "HiggsSet" = dontDistribute super."HiggsSet";
+  "Hipmunk" = dontDistribute super."Hipmunk";
+  "HipmunkPlayground" = dontDistribute super."HipmunkPlayground";
+  "Hish" = dontDistribute super."Hish";
+  "Histogram" = dontDistribute super."Histogram";
+  "Hmpf" = dontDistribute super."Hmpf";
+  "Hoed" = dontDistribute super."Hoed";
+  "HoleyMonoid" = dontDistribute super."HoleyMonoid";
+  "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution";
+  "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce";
+  "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine";
+  "Holumbus-Storage" = dontDistribute super."Holumbus-Storage";
+  "Homology" = dontDistribute super."Homology";
+  "HongoDB" = dontDistribute super."HongoDB";
+  "HostAndPort" = dontDistribute super."HostAndPort";
+  "Hricket" = dontDistribute super."Hricket";
+  "Hs2lib" = dontDistribute super."Hs2lib";
+  "HsASA" = dontDistribute super."HsASA";
+  "HsHaruPDF" = dontDistribute super."HsHaruPDF";
+  "HsHyperEstraier" = dontDistribute super."HsHyperEstraier";
+  "HsJudy" = dontDistribute super."HsJudy";
+  "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system";
+  "HsParrot" = dontDistribute super."HsParrot";
+  "HsPerl5" = dontDistribute super."HsPerl5";
+  "HsSVN" = dontDistribute super."HsSVN";
+  "HsTools" = dontDistribute super."HsTools";
+  "Hsed" = dontDistribute super."Hsed";
+  "Hsmtlib" = dontDistribute super."Hsmtlib";
+  "HueAPI" = dontDistribute super."HueAPI";
+  "HulkImport" = dontDistribute super."HulkImport";
+  "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres";
+  "IDynamic" = dontDistribute super."IDynamic";
+  "IFS" = dontDistribute super."IFS";
+  "INblobs" = dontDistribute super."INblobs";
+  "IOR" = dontDistribute super."IOR";
+  "IORefCAS" = dontDistribute super."IORefCAS";
+  "IOSpec" = dontDistribute super."IOSpec";
+  "IcoGrid" = dontDistribute super."IcoGrid";
+  "Imlib" = dontDistribute super."Imlib";
+  "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
+  "IndentParser" = dontDistribute super."IndentParser";
+  "IndexedList" = dontDistribute super."IndexedList";
+  "InfixApplicative" = dontDistribute super."InfixApplicative";
+  "Interpolation" = dontDistribute super."Interpolation";
+  "Interpolation-maxs" = dontDistribute super."Interpolation-maxs";
+  "Irc" = dontDistribute super."Irc";
+  "IrrHaskell" = dontDistribute super."IrrHaskell";
+  "IsNull" = dontDistribute super."IsNull";
+  "JSON-Combinator" = dontDistribute super."JSON-Combinator";
+  "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples";
+  "JSONb" = dontDistribute super."JSONb";
+  "JYU-Utils" = dontDistribute super."JYU-Utils";
+  "JackMiniMix" = dontDistribute super."JackMiniMix";
+  "Javasf" = dontDistribute super."Javasf";
+  "Javav" = dontDistribute super."Javav";
+  "JsContracts" = dontDistribute super."JsContracts";
+  "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
+  "JunkDB" = dontDistribute super."JunkDB";
+  "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm";
+  "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables";
+  "JustParse" = dontDistribute super."JustParse";
+  "KMP" = dontDistribute super."KMP";
+  "KSP" = dontDistribute super."KSP";
+  "Kalman" = dontDistribute super."Kalman";
+  "KdTree" = dontDistribute super."KdTree";
+  "Ketchup" = dontDistribute super."Ketchup";
+  "KiCS" = dontDistribute super."KiCS";
+  "KiCS-debugger" = dontDistribute super."KiCS-debugger";
+  "KiCS-prophecy" = dontDistribute super."KiCS-prophecy";
+  "Kleislify" = dontDistribute super."Kleislify";
+  "Konf" = dontDistribute super."Konf";
+  "Kriens" = dontDistribute super."Kriens";
+  "KyotoCabinet" = dontDistribute super."KyotoCabinet";
+  "L-seed" = dontDistribute super."L-seed";
+  "LATS" = dontDistribute super."LATS";
+  "LDAP" = dontDistribute super."LDAP";
+  "LRU" = dontDistribute super."LRU";
+  "LTree" = dontDistribute super."LTree";
+  "LambdaCalculator" = dontDistribute super."LambdaCalculator";
+  "LambdaHack" = dontDistribute super."LambdaHack";
+  "LambdaINet" = dontDistribute super."LambdaINet";
+  "LambdaNet" = dontDistribute super."LambdaNet";
+  "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote";
+  "LambdaShell" = dontDistribute super."LambdaShell";
+  "Lambdajudge" = dontDistribute super."Lambdajudge";
+  "Lambdaya" = dontDistribute super."Lambdaya";
+  "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
+  "Lastik" = dontDistribute super."Lastik";
+  "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
+  "LazyVault" = dontDistribute super."LazyVault";
+  "Level0" = dontDistribute super."Level0";
+  "LibClang" = dontDistribute super."LibClang";
+  "Limit" = dontDistribute super."Limit";
+  "LinearSplit" = dontDistribute super."LinearSplit";
+  "LinguisticsTypes" = dontDistribute super."LinguisticsTypes";
+  "LinkChecker" = dontDistribute super."LinkChecker";
+  "ListTree" = dontDistribute super."ListTree";
+  "ListWriter" = dontDistribute super."ListWriter";
+  "ListZipper" = dontDistribute super."ListZipper";
+  "Logic" = dontDistribute super."Logic";
+  "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees";
+  "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI";
+  "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network";
+  "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
+  "LslPlus" = dontDistribute super."LslPlus";
+  "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
+  "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
+  "MHask" = dontDistribute super."MHask";
+  "MSQueue" = dontDistribute super."MSQueue";
+  "MTGBuilder" = dontDistribute super."MTGBuilder";
+  "MagicHaskeller" = dontDistribute super."MagicHaskeller";
+  "MailchimpSimple" = dontDistribute super."MailchimpSimple";
+  "MaybeT" = dontDistribute super."MaybeT";
+  "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf";
+  "MaybeT-transformers" = dontDistribute super."MaybeT-transformers";
+  "MazesOfMonad" = dontDistribute super."MazesOfMonad";
+  "MeanShift" = dontDistribute super."MeanShift";
+  "Measure" = dontDistribute super."Measure";
+  "MetaHDBC" = dontDistribute super."MetaHDBC";
+  "MetaObject" = dontDistribute super."MetaObject";
+  "Metrics" = dontDistribute super."Metrics";
+  "Mhailist" = dontDistribute super."Mhailist";
+  "Michelangelo" = dontDistribute super."Michelangelo";
+  "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator";
+  "MiniAgda" = dontDistribute super."MiniAgda";
+  "MissingK" = dontDistribute super."MissingK";
+  "MissingM" = dontDistribute super."MissingM";
+  "MissingPy" = dontDistribute super."MissingPy";
+  "Modulo" = dontDistribute super."Modulo";
+  "Moe" = dontDistribute super."Moe";
+  "MoeDict" = dontDistribute super."MoeDict";
+  "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl";
+  "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign";
+  "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
+  "MonadCompose" = dontDistribute super."MonadCompose";
+  "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
+  "MonadStack" = dontDistribute super."MonadStack";
+  "Monadius" = dontDistribute super."Monadius";
+  "Monaris" = dontDistribute super."Monaris";
+  "Monatron" = dontDistribute super."Monatron";
+  "Monatron-IO" = dontDistribute super."Monatron-IO";
+  "Monocle" = dontDistribute super."Monocle";
+  "MorseCode" = dontDistribute super."MorseCode";
+  "MuCheck" = dontDistribute super."MuCheck";
+  "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit";
+  "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec";
+  "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck";
+  "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck";
+  "Munkres" = dontDistribute super."Munkres";
+  "Munkres-simple" = dontDistribute super."Munkres-simple";
+  "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid";
+  "MyPrimes" = dontDistribute super."MyPrimes";
+  "NGrams" = dontDistribute super."NGrams";
+  "NTRU" = dontDistribute super."NTRU";
+  "NXT" = dontDistribute super."NXT";
+  "NXTDSL" = dontDistribute super."NXTDSL";
+  "NanoProlog" = dontDistribute super."NanoProlog";
+  "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets";
+  "NaturalSort" = dontDistribute super."NaturalSort";
+  "NearContextAlgebra" = dontDistribute super."NearContextAlgebra";
+  "Neks" = dontDistribute super."Neks";
+  "NestedFunctor" = dontDistribute super."NestedFunctor";
+  "NestedSampling" = dontDistribute super."NestedSampling";
+  "NetSNMP" = dontDistribute super."NetSNMP";
+  "NewBinary" = dontDistribute super."NewBinary";
+  "Ninjas" = dontDistribute super."Ninjas";
+  "NoSlow" = dontDistribute super."NoSlow";
+  "NoTrace" = dontDistribute super."NoTrace";
+  "Noise" = dontDistribute super."Noise";
+  "Nomyx" = dontDistribute super."Nomyx";
+  "Nomyx-Core" = dontDistribute super."Nomyx-Core";
+  "Nomyx-Language" = dontDistribute super."Nomyx-Language";
+  "Nomyx-Rules" = dontDistribute super."Nomyx-Rules";
+  "Nomyx-Web" = dontDistribute super."Nomyx-Web";
+  "NonEmpty" = dontDistribute super."NonEmpty";
+  "NonEmptyList" = dontDistribute super."NonEmptyList";
+  "NumLazyByteString" = dontDistribute super."NumLazyByteString";
+  "NumberSieves" = dontDistribute super."NumberSieves";
+  "NumberTheory" = dontDistribute super."NumberTheory";
+  "Numbers" = dontDistribute super."Numbers";
+  "Nussinov78" = dontDistribute super."Nussinov78";
+  "Nutri" = dontDistribute super."Nutri";
+  "OGL" = dontDistribute super."OGL";
+  "OSM" = dontDistribute super."OSM";
+  "OTP" = dontDistribute super."OTP";
+  "Object" = dontDistribute super."Object";
+  "ObjectIO" = dontDistribute super."ObjectIO";
+  "Obsidian" = dontDistribute super."Obsidian";
+  "OddWord" = dontDistribute super."OddWord";
+  "Omega" = dontDistribute super."Omega";
+  "OneTuple" = dontDistribute super."OneTuple";
+  "OpenAFP" = dontDistribute super."OpenAFP";
+  "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils";
+  "OpenAL" = dontDistribute super."OpenAL";
+  "OpenCL" = dontDistribute super."OpenCL";
+  "OpenCLRaw" = dontDistribute super."OpenCLRaw";
+  "OpenCLWrappers" = dontDistribute super."OpenCLWrappers";
+  "OpenGLCheck" = dontDistribute super."OpenGLCheck";
+  "OpenGLRaw21" = dontDistribute super."OpenGLRaw21";
+  "OpenSCAD" = dontDistribute super."OpenSCAD";
+  "OpenVG" = dontDistribute super."OpenVG";
+  "OpenVGRaw" = dontDistribute super."OpenVGRaw";
+  "Operads" = dontDistribute super."Operads";
+  "OptDir" = dontDistribute super."OptDir";
+  "OrPatterns" = dontDistribute super."OrPatterns";
+  "OrchestrateDB" = dontDistribute super."OrchestrateDB";
+  "OrderedBits" = dontDistribute super."OrderedBits";
+  "Ordinals" = dontDistribute super."Ordinals";
+  "PArrows" = dontDistribute super."PArrows";
+  "PBKDF2" = dontDistribute super."PBKDF2";
+  "PCLT" = dontDistribute super."PCLT";
+  "PCLT-DB" = dontDistribute super."PCLT-DB";
+  "PDBtools" = dontDistribute super."PDBtools";
+  "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
+  "PageIO" = dontDistribute super."PageIO";
+  "Paillier" = dontDistribute super."Paillier";
+  "PandocAgda" = dontDistribute super."PandocAgda";
+  "Paraiso" = dontDistribute super."Paraiso";
+  "Parry" = dontDistribute super."Parry";
+  "ParsecTools" = dontDistribute super."ParsecTools";
+  "ParserFunction" = dontDistribute super."ParserFunction";
+  "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures";
+  "PasswordGenerator" = dontDistribute super."PasswordGenerator";
+  "PastePipe" = dontDistribute super."PastePipe";
+  "Pathfinder" = dontDistribute super."Pathfinder";
+  "Peano" = dontDistribute super."Peano";
+  "PeanoWitnesses" = dontDistribute super."PeanoWitnesses";
+  "PerfectHash" = dontDistribute super."PerfectHash";
+  "PermuteEffects" = dontDistribute super."PermuteEffects";
+  "Phsu" = dontDistribute super."Phsu";
+  "Pipe" = dontDistribute super."Pipe";
+  "Piso" = dontDistribute super."Piso";
+  "PlayHangmanGame" = dontDistribute super."PlayHangmanGame";
+  "PlayingCards" = dontDistribute super."PlayingCards";
+  "Plot-ho-matic" = dontDistribute super."Plot-ho-matic";
+  "PlslTools" = dontDistribute super."PlslTools";
+  "Plural" = dontDistribute super."Plural";
+  "Pollutocracy" = dontDistribute super."Pollutocracy";
+  "PortFusion" = dontDistribute super."PortFusion";
+  "PortMidi" = dontDistribute super."PortMidi";
+  "PostgreSQL" = dontDistribute super."PostgreSQL";
+  "PrimitiveArray" = dontDistribute super."PrimitiveArray";
+  "PrimitiveArray-Pretty" = dontDistribute super."PrimitiveArray-Pretty";
+  "Printf-TH" = dontDistribute super."Printf-TH";
+  "PriorityChansConverger" = dontDistribute super."PriorityChansConverger";
+  "ProbabilityMonads" = dontDistribute super."ProbabilityMonads";
+  "PropLogic" = dontDistribute super."PropLogic";
+  "Proper" = dontDistribute super."Proper";
+  "ProxN" = dontDistribute super."ProxN";
+  "Pugs" = dontDistribute super."Pugs";
+  "Pup-Events" = dontDistribute super."Pup-Events";
+  "Pup-Events-Client" = dontDistribute super."Pup-Events-Client";
+  "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo";
+  "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
+  "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
+  "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
+  "QuadEdge" = dontDistribute super."QuadEdge";
+  "QuadTree" = dontDistribute super."QuadTree";
+  "Quelea" = dontDistribute super."Quelea";
+  "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
+  "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickCheck-safe" = dontDistribute super."QuickCheck-safe";
+  "QuickPlot" = dontDistribute super."QuickPlot";
+  "Quickson" = dontDistribute super."Quickson";
+  "R-pandoc" = dontDistribute super."R-pandoc";
+  "RANSAC" = dontDistribute super."RANSAC";
+  "RBTree" = dontDistribute super."RBTree";
+  "RESTng" = dontDistribute super."RESTng";
+  "RFC1751" = dontDistribute super."RFC1751";
+  "RJson" = dontDistribute super."RJson";
+  "RMP" = dontDistribute super."RMP";
+  "RNAFold" = dontDistribute super."RNAFold";
+  "RNAFoldProgs" = dontDistribute super."RNAFoldProgs";
+  "RNAdesign" = dontDistribute super."RNAdesign";
+  "RNAdraw" = dontDistribute super."RNAdraw";
+  "RNAlien" = doDistribute super."RNAlien_1_0_0";
+  "RNAwolf" = dontDistribute super."RNAwolf";
+  "Raincat" = dontDistribute super."Raincat";
+  "Random123" = dontDistribute super."Random123";
+  "RandomDotOrg" = dontDistribute super."RandomDotOrg";
+  "Randometer" = dontDistribute super."Randometer";
+  "Range" = dontDistribute super."Range";
+  "Ranged-sets" = dontDistribute super."Ranged-sets";
+  "Ranka" = dontDistribute super."Ranka";
+  "Rasenschach" = dontDistribute super."Rasenschach";
+  "Redmine" = dontDistribute super."Redmine";
+  "Ref" = dontDistribute super."Ref";
+  "Referees" = dontDistribute super."Referees";
+  "RepLib" = dontDistribute super."RepLib";
+  "ReplicateEffects" = dontDistribute super."ReplicateEffects";
+  "ReviewBoard" = dontDistribute super."ReviewBoard";
+  "RichConditional" = dontDistribute super."RichConditional";
+  "RollingDirectory" = dontDistribute super."RollingDirectory";
+  "RoyalMonad" = dontDistribute super."RoyalMonad";
+  "RxHaskell" = dontDistribute super."RxHaskell";
+  "SBench" = dontDistribute super."SBench";
+  "SConfig" = dontDistribute super."SConfig";
+  "SDL" = dontDistribute super."SDL";
+  "SDL-gfx" = dontDistribute super."SDL-gfx";
+  "SDL-image" = dontDistribute super."SDL-image";
+  "SDL-mixer" = dontDistribute super."SDL-mixer";
+  "SDL-mpeg" = dontDistribute super."SDL-mpeg";
+  "SDL-ttf" = dontDistribute super."SDL-ttf";
+  "SDL2-ttf" = dontDistribute super."SDL2-ttf";
+  "SFML" = dontDistribute super."SFML";
+  "SFML-control" = dontDistribute super."SFML-control";
+  "SFont" = dontDistribute super."SFont";
+  "SG" = dontDistribute super."SG";
+  "SGdemo" = dontDistribute super."SGdemo";
+  "SHA2" = dontDistribute super."SHA2";
+  "SMTPClient" = dontDistribute super."SMTPClient";
+  "SNet" = dontDistribute super."SNet";
+  "SQLDeps" = dontDistribute super."SQLDeps";
+  "STL" = dontDistribute super."STL";
+  "SVG2Q" = dontDistribute super."SVG2Q";
+  "SVGFonts" = dontDistribute super."SVGFonts";
+  "SVGPath" = dontDistribute super."SVGPath";
+  "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB";
+  "SableCC2Hs" = dontDistribute super."SableCC2Hs";
+  "Safe" = dontDistribute super."Safe";
+  "Salsa" = dontDistribute super."Salsa";
+  "Saturnin" = dontDistribute super."Saturnin";
+  "SciFlow" = dontDistribute super."SciFlow";
+  "ScratchFs" = dontDistribute super."ScratchFs";
+  "Scurry" = dontDistribute super."Scurry";
+  "Semantique" = dontDistribute super."Semantique";
+  "Semigroup" = dontDistribute super."Semigroup";
+  "SeqAlign" = dontDistribute super."SeqAlign";
+  "SessionLogger" = dontDistribute super."SessionLogger";
+  "ShellCheck" = dontDistribute super."ShellCheck";
+  "Shellac" = dontDistribute super."Shellac";
+  "Shellac-compatline" = dontDistribute super."Shellac-compatline";
+  "Shellac-editline" = dontDistribute super."Shellac-editline";
+  "Shellac-haskeline" = dontDistribute super."Shellac-haskeline";
+  "Shellac-readline" = dontDistribute super."Shellac-readline";
+  "ShowF" = dontDistribute super."ShowF";
+  "Shrub" = dontDistribute super."Shrub";
+  "Shu-thing" = dontDistribute super."Shu-thing";
+  "SimpleAES" = dontDistribute super."SimpleAES";
+  "SimpleEA" = dontDistribute super."SimpleEA";
+  "SimpleGL" = dontDistribute super."SimpleGL";
+  "SimpleH" = dontDistribute super."SimpleH";
+  "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
+  "SizeCompare" = dontDistribute super."SizeCompare";
+  "Slides" = dontDistribute super."Slides";
+  "Smooth" = dontDistribute super."Smooth";
+  "SmtLib" = dontDistribute super."SmtLib";
+  "Snusmumrik" = dontDistribute super."Snusmumrik";
+  "SoOSiM" = dontDistribute super."SoOSiM";
+  "SoccerFun" = dontDistribute super."SoccerFun";
+  "SoccerFunGL" = dontDistribute super."SoccerFunGL";
+  "Sonnex" = dontDistribute super."Sonnex";
+  "SourceGraph" = dontDistribute super."SourceGraph";
+  "Southpaw" = dontDistribute super."Southpaw";
+  "SpaceInvaders" = dontDistribute super."SpaceInvaders";
+  "SpacePrivateers" = dontDistribute super."SpacePrivateers";
+  "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spock-auth" = dontDistribute super."Spock-auth";
+  "Spock-lucid" = dontDistribute super."Spock-lucid";
+  "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3";
+  "SpreadsheetML" = dontDistribute super."SpreadsheetML";
+  "Sprig" = dontDistribute super."Sprig";
+  "Stasis" = dontDistribute super."Stasis";
+  "StateVar-transformer" = dontDistribute super."StateVar-transformer";
+  "StatisticalMethods" = dontDistribute super."StatisticalMethods";
+  "Stomp" = dontDistribute super."Stomp";
+  "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib";
+  "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell";
+  "StrappedTemplates" = dontDistribute super."StrappedTemplates";
+  "StrategyLib" = dontDistribute super."StrategyLib";
+  "Stream" = dontDistribute super."Stream";
+  "StrictBench" = dontDistribute super."StrictBench";
+  "SuffixStructures" = dontDistribute super."SuffixStructures";
+  "SybWidget" = dontDistribute super."SybWidget";
+  "SyntaxMacros" = dontDistribute super."SyntaxMacros";
+  "Sysmon" = dontDistribute super."Sysmon";
+  "TBC" = dontDistribute super."TBC";
+  "TBit" = dontDistribute super."TBit";
+  "THEff" = dontDistribute super."THEff";
+  "TTTAS" = dontDistribute super."TTTAS";
+  "TV" = dontDistribute super."TV";
+  "TYB" = dontDistribute super."TYB";
+  "TableAlgebra" = dontDistribute super."TableAlgebra";
+  "Tables" = dontDistribute super."Tables";
+  "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
+  "Tainted" = dontDistribute super."Tainted";
+  "Takusen" = dontDistribute super."Takusen";
+  "Tape" = dontDistribute super."Tape";
+  "TeaHS" = dontDistribute super."TeaHS";
+  "Tensor" = dontDistribute super."Tensor";
+  "TernaryTrees" = dontDistribute super."TernaryTrees";
+  "TestExplode" = dontDistribute super."TestExplode";
+  "Theora" = dontDistribute super."Theora";
+  "Thingie" = dontDistribute super."Thingie";
+  "ThreadObjects" = dontDistribute super."ThreadObjects";
+  "Thrift" = dontDistribute super."Thrift";
+  "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe";
+  "TicTacToe" = dontDistribute super."TicTacToe";
+  "TigerHash" = dontDistribute super."TigerHash";
+  "TimePiece" = dontDistribute super."TimePiece";
+  "TinyLaunchbury" = dontDistribute super."TinyLaunchbury";
+  "TinyURL" = dontDistribute super."TinyURL";
+  "Titim" = dontDistribute super."Titim";
+  "Top" = dontDistribute super."Top";
+  "Tournament" = dontDistribute super."Tournament";
+  "TraceUtils" = dontDistribute super."TraceUtils";
+  "TransformersStepByStep" = dontDistribute super."TransformersStepByStep";
+  "Transhare" = dontDistribute super."Transhare";
+  "TreeCounter" = dontDistribute super."TreeCounter";
+  "TreeStructures" = dontDistribute super."TreeStructures";
+  "TreeT" = dontDistribute super."TreeT";
+  "Treiber" = dontDistribute super."Treiber";
+  "TrendGraph" = dontDistribute super."TrendGraph";
+  "TrieMap" = dontDistribute super."TrieMap";
+  "Twofish" = dontDistribute super."Twofish";
+  "TypeClass" = dontDistribute super."TypeClass";
+  "TypeCompose" = dontDistribute super."TypeCompose";
+  "TypeIlluminator" = dontDistribute super."TypeIlluminator";
+  "TypeNat" = dontDistribute super."TypeNat";
+  "TypingTester" = dontDistribute super."TypingTester";
+  "UISF" = dontDistribute super."UISF";
+  "UMM" = dontDistribute super."UMM";
+  "URLT" = dontDistribute super."URLT";
+  "URLb" = dontDistribute super."URLb";
+  "UTFTConverter" = dontDistribute super."UTFTConverter";
+  "Unique" = dontDistribute super."Unique";
+  "Unixutils-shadow" = dontDistribute super."Unixutils-shadow";
+  "Updater" = dontDistribute super."Updater";
+  "UrlDisp" = dontDistribute super."UrlDisp";
+  "Useful" = dontDistribute super."Useful";
+  "UtilityTM" = dontDistribute super."UtilityTM";
+  "VKHS" = dontDistribute super."VKHS";
+  "Validation" = dontDistribute super."Validation";
+  "Vec" = dontDistribute super."Vec";
+  "Vec-Boolean" = dontDistribute super."Vec-Boolean";
+  "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
+  "Vec-Transform" = dontDistribute super."Vec-Transform";
+  "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
+  "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "Vulkan" = dontDistribute super."Vulkan";
+  "WAVE" = dontDistribute super."WAVE";
+  "WL500gPControl" = dontDistribute super."WL500gPControl";
+  "WL500gPLib" = dontDistribute super."WL500gPLib";
+  "WMSigner" = dontDistribute super."WMSigner";
+  "WURFL" = dontDistribute super."WURFL";
+  "WXDiffCtrl" = dontDistribute super."WXDiffCtrl";
+  "WashNGo" = dontDistribute super."WashNGo";
+  "WaveFront" = dontDistribute super."WaveFront";
+  "Weather" = dontDistribute super."Weather";
+  "WebBits" = dontDistribute super."WebBits";
+  "WebBits-Html" = dontDistribute super."WebBits-Html";
+  "WebBits-multiplate" = dontDistribute super."WebBits-multiplate";
+  "WebCont" = dontDistribute super."WebCont";
+  "WeberLogic" = dontDistribute super."WeberLogic";
+  "Webrexp" = dontDistribute super."Webrexp";
+  "Wheb" = dontDistribute super."Wheb";
+  "WikimediaParser" = dontDistribute super."WikimediaParser";
+  "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server";
+  "Win32-errors" = dontDistribute super."Win32-errors";
+  "Win32-junction-point" = dontDistribute super."Win32-junction-point";
+  "Win32-security" = dontDistribute super."Win32-security";
+  "Win32-services" = dontDistribute super."Win32-services";
+  "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper";
+  "Wired" = dontDistribute super."Wired";
+  "WordAlignment" = dontDistribute super."WordAlignment";
+  "WordNet" = dontDistribute super."WordNet";
+  "WordNet-ghc74" = dontDistribute super."WordNet-ghc74";
+  "Wordlint" = dontDistribute super."Wordlint";
+  "WxGeneric" = dontDistribute super."WxGeneric";
+  "X11-extras" = dontDistribute super."X11-extras";
+  "X11-rm" = dontDistribute super."X11-rm";
+  "X11-xdamage" = dontDistribute super."X11-xdamage";
+  "X11-xfixes" = dontDistribute super."X11-xfixes";
+  "X11-xft" = dontDistribute super."X11-xft";
+  "X11-xshape" = dontDistribute super."X11-xshape";
+  "XAttr" = dontDistribute super."XAttr";
+  "XInput" = dontDistribute super."XInput";
+  "XMMS" = dontDistribute super."XMMS";
+  "XMPP" = dontDistribute super."XMPP";
+  "XSaiga" = dontDistribute super."XSaiga";
+  "Xec" = dontDistribute super."Xec";
+  "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter";
+  "Xorshift128Plus" = dontDistribute super."Xorshift128Plus";
+  "YACPong" = dontDistribute super."YACPong";
+  "YFrob" = dontDistribute super."YFrob";
+  "Yablog" = dontDistribute super."Yablog";
+  "YamlReference" = dontDistribute super."YamlReference";
+  "Yampa-core" = dontDistribute super."Yampa-core";
+  "Yocto" = dontDistribute super."Yocto";
+  "Yogurt" = dontDistribute super."Yogurt";
+  "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone";
+  "ZEBEDDE" = dontDistribute super."ZEBEDDE";
+  "ZFS" = dontDistribute super."ZFS";
+  "ZMachine" = dontDistribute super."ZMachine";
+  "ZipFold" = dontDistribute super."ZipFold";
+  "ZipperAG" = dontDistribute super."ZipperAG";
+  "Zora" = dontDistribute super."Zora";
+  "Zwaluw" = dontDistribute super."Zwaluw";
+  "a50" = dontDistribute super."a50";
+  "abacate" = dontDistribute super."abacate";
+  "abc-puzzle" = dontDistribute super."abc-puzzle";
+  "abcBridge" = dontDistribute super."abcBridge";
+  "abcnotation" = dontDistribute super."abcnotation";
+  "abeson" = dontDistribute super."abeson";
+  "abstract-deque-tests" = dontDistribute super."abstract-deque-tests";
+  "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate";
+  "abt" = dontDistribute super."abt";
+  "ac-machine" = dontDistribute super."ac-machine";
+  "ac-machine-conduit" = dontDistribute super."ac-machine-conduit";
+  "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic";
+  "accelerate-cublas" = dontDistribute super."accelerate-cublas";
+  "accelerate-cuda" = dontDistribute super."accelerate-cuda";
+  "accelerate-cufft" = dontDistribute super."accelerate-cufft";
+  "accelerate-examples" = dontDistribute super."accelerate-examples";
+  "accelerate-fft" = dontDistribute super."accelerate-fft";
+  "accelerate-fftw" = dontDistribute super."accelerate-fftw";
+  "accelerate-fourier" = dontDistribute super."accelerate-fourier";
+  "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark";
+  "accelerate-io" = dontDistribute super."accelerate-io";
+  "accelerate-random" = dontDistribute super."accelerate-random";
+  "accelerate-utility" = dontDistribute super."accelerate-utility";
+  "accentuateus" = dontDistribute super."accentuateus";
+  "access-time" = dontDistribute super."access-time";
+  "acid-state-dist" = dontDistribute super."acid-state-dist";
+  "acid-state-tls" = dontDistribute super."acid-state-tls";
+  "acl2" = dontDistribute super."acl2";
+  "acme-all-monad" = dontDistribute super."acme-all-monad";
+  "acme-box" = dontDistribute super."acme-box";
+  "acme-cadre" = dontDistribute super."acme-cadre";
+  "acme-cofunctor" = dontDistribute super."acme-cofunctor";
+  "acme-colosson" = dontDistribute super."acme-colosson";
+  "acme-comonad" = dontDistribute super."acme-comonad";
+  "acme-cutegirl" = dontDistribute super."acme-cutegirl";
+  "acme-dont" = dontDistribute super."acme-dont";
+  "acme-flipping-tables" = dontDistribute super."acme-flipping-tables";
+  "acme-grawlix" = dontDistribute super."acme-grawlix";
+  "acme-hq9plus" = dontDistribute super."acme-hq9plus";
+  "acme-http" = dontDistribute super."acme-http";
+  "acme-inator" = dontDistribute super."acme-inator";
+  "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
+  "acme-lolcat" = dontDistribute super."acme-lolcat";
+  "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
+  "acme-memorandom" = dontDistribute super."acme-memorandom";
+  "acme-microwave" = dontDistribute super."acme-microwave";
+  "acme-miscorder" = dontDistribute super."acme-miscorder";
+  "acme-missiles" = dontDistribute super."acme-missiles";
+  "acme-now" = dontDistribute super."acme-now";
+  "acme-numbersystem" = dontDistribute super."acme-numbersystem";
+  "acme-omitted" = dontDistribute super."acme-omitted";
+  "acme-one" = dontDistribute super."acme-one";
+  "acme-operators" = dontDistribute super."acme-operators";
+  "acme-php" = dontDistribute super."acme-php";
+  "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers";
+  "acme-realworld" = dontDistribute super."acme-realworld";
+  "acme-safe" = dontDistribute super."acme-safe";
+  "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel";
+  "acme-strfry" = dontDistribute super."acme-strfry";
+  "acme-stringly-typed" = dontDistribute super."acme-stringly-typed";
+  "acme-strtok" = dontDistribute super."acme-strtok";
+  "acme-timemachine" = dontDistribute super."acme-timemachine";
+  "acme-year" = dontDistribute super."acme-year";
+  "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
+  "activehs" = dontDistribute super."activehs";
+  "activehs-base" = dontDistribute super."activehs-base";
+  "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
+  "actor" = dontDistribute super."actor";
+  "adaptive-containers" = dontDistribute super."adaptive-containers";
+  "adaptive-tuple" = dontDistribute super."adaptive-tuple";
+  "adb" = dontDistribute super."adb";
+  "adblock2privoxy" = dontDistribute super."adblock2privoxy";
+  "addLicenseInfo" = dontDistribute super."addLicenseInfo";
+  "adhoc-network" = dontDistribute super."adhoc-network";
+  "adict" = dontDistribute super."adict";
+  "adler32" = dontDistribute super."adler32";
+  "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
+  "adp-multi" = dontDistribute super."adp-multi";
+  "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson" = doDistribute super."aeson_0_9_0_1";
+  "aeson-applicative" = dontDistribute super."aeson-applicative";
+  "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-compat" = doDistribute super."aeson-compat_0_3_2_0";
+  "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-flatten" = dontDistribute super."aeson-flatten";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-lens" = dontDistribute super."aeson-lens";
+  "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
+  "aeson-prefix" = dontDistribute super."aeson-prefix";
+  "aeson-schema" = dontDistribute super."aeson-schema";
+  "aeson-serialize" = dontDistribute super."aeson-serialize";
+  "aeson-smart" = dontDistribute super."aeson-smart";
+  "aeson-streams" = dontDistribute super."aeson-streams";
+  "aeson-t" = dontDistribute super."aeson-t";
+  "aeson-toolkit" = dontDistribute super."aeson-toolkit";
+  "aeson-value-parser" = dontDistribute super."aeson-value-parser";
+  "aeson-yak" = dontDistribute super."aeson-yak";
+  "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
+  "afis" = dontDistribute super."afis";
+  "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
+  "agda-server" = dontDistribute super."agda-server";
+  "agda-snippets" = dontDistribute super."agda-snippets";
+  "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
+  "agum" = dontDistribute super."agum";
+  "aig" = dontDistribute super."aig";
+  "air" = dontDistribute super."air";
+  "air-extra" = dontDistribute super."air-extra";
+  "air-spec" = dontDistribute super."air-spec";
+  "air-th" = dontDistribute super."air-th";
+  "airbrake" = dontDistribute super."airbrake";
+  "airship" = doDistribute super."airship_0_4_3_0";
+  "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-distributed" = dontDistribute super."aivika-distributed";
+  "aivika-experiment" = dontDistribute super."aivika-experiment";
+  "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
+  "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
+  "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-transformers" = dontDistribute super."aivika-transformers";
+  "ajhc" = dontDistribute super."ajhc";
+  "al" = dontDistribute super."al";
+  "alea" = dontDistribute super."alea";
+  "alex-meta" = dontDistribute super."alex-meta";
+  "alfred" = dontDistribute super."alfred";
+  "alga" = dontDistribute super."alga";
+  "algebra" = dontDistribute super."algebra";
+  "algebra-dag" = dontDistribute super."algebra-dag";
+  "algebra-sql" = dontDistribute super."algebra-sql";
+  "algebraic" = dontDistribute super."algebraic";
+  "algebraic-classes" = dontDistribute super."algebraic-classes";
+  "align" = dontDistribute super."align";
+  "align-text" = dontDistribute super."align-text";
+  "aligned-foreignptr" = dontDistribute super."aligned-foreignptr";
+  "allocated-processor" = dontDistribute super."allocated-processor";
+  "alloy" = dontDistribute super."alloy";
+  "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd";
+  "almost-fix" = dontDistribute super."almost-fix";
+  "alms" = dontDistribute super."alms";
+  "alpha" = dontDistribute super."alpha";
+  "alpino-tools" = dontDistribute super."alpino-tools";
+  "alsa" = dontDistribute super."alsa";
+  "alsa-core" = dontDistribute super."alsa-core";
+  "alsa-gui" = dontDistribute super."alsa-gui";
+  "alsa-midi" = dontDistribute super."alsa-midi";
+  "alsa-mixer" = dontDistribute super."alsa-mixer";
+  "alsa-pcm" = dontDistribute super."alsa-pcm";
+  "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests";
+  "alsa-seq" = dontDistribute super."alsa-seq";
+  "alsa-seq-tests" = dontDistribute super."alsa-seq-tests";
+  "altcomposition" = dontDistribute super."altcomposition";
+  "alternative-io" = dontDistribute super."alternative-io";
+  "altfloat" = dontDistribute super."altfloat";
+  "alure" = dontDistribute super."alure";
+  "amazon-emailer" = dontDistribute super."amazon-emailer";
+  "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
+  "amazon-products" = dontDistribute super."amazon-products";
+  "amazonka" = doDistribute super."amazonka_1_3_7";
+  "amazonka-apigateway" = doDistribute super."amazonka-apigateway_1_3_7";
+  "amazonka-autoscaling" = doDistribute super."amazonka-autoscaling_1_3_7";
+  "amazonka-certificatemanager" = dontDistribute super."amazonka-certificatemanager";
+  "amazonka-cloudformation" = doDistribute super."amazonka-cloudformation_1_3_7";
+  "amazonka-cloudfront" = doDistribute super."amazonka-cloudfront_1_3_7";
+  "amazonka-cloudhsm" = doDistribute super."amazonka-cloudhsm_1_3_7";
+  "amazonka-cloudsearch" = doDistribute super."amazonka-cloudsearch_1_3_7";
+  "amazonka-cloudsearch-domains" = doDistribute super."amazonka-cloudsearch-domains_1_3_7";
+  "amazonka-cloudtrail" = doDistribute super."amazonka-cloudtrail_1_3_7";
+  "amazonka-cloudwatch" = doDistribute super."amazonka-cloudwatch_1_3_7";
+  "amazonka-cloudwatch-events" = dontDistribute super."amazonka-cloudwatch-events";
+  "amazonka-cloudwatch-logs" = doDistribute super."amazonka-cloudwatch-logs_1_3_7";
+  "amazonka-codecommit" = doDistribute super."amazonka-codecommit_1_3_7";
+  "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_1_3_7";
+  "amazonka-codepipeline" = doDistribute super."amazonka-codepipeline_1_3_7";
+  "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_1_3_7";
+  "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_1_3_7";
+  "amazonka-config" = doDistribute super."amazonka-config_1_3_7";
+  "amazonka-core" = doDistribute super."amazonka-core_1_3_7";
+  "amazonka-datapipeline" = doDistribute super."amazonka-datapipeline_1_3_7";
+  "amazonka-devicefarm" = doDistribute super."amazonka-devicefarm_1_3_7";
+  "amazonka-directconnect" = doDistribute super."amazonka-directconnect_1_3_7";
+  "amazonka-dms" = dontDistribute super."amazonka-dms";
+  "amazonka-ds" = doDistribute super."amazonka-ds_1_3_7";
+  "amazonka-dynamodb" = doDistribute super."amazonka-dynamodb_1_3_7";
+  "amazonka-dynamodb-streams" = doDistribute super."amazonka-dynamodb-streams_1_3_7";
+  "amazonka-ec2" = doDistribute super."amazonka-ec2_1_3_7";
+  "amazonka-ecr" = dontDistribute super."amazonka-ecr";
+  "amazonka-ecs" = doDistribute super."amazonka-ecs_1_3_7";
+  "amazonka-efs" = doDistribute super."amazonka-efs_1_3_7";
+  "amazonka-elasticache" = doDistribute super."amazonka-elasticache_1_3_7";
+  "amazonka-elasticbeanstalk" = doDistribute super."amazonka-elasticbeanstalk_1_3_7";
+  "amazonka-elasticsearch" = doDistribute super."amazonka-elasticsearch_1_3_7";
+  "amazonka-elastictranscoder" = doDistribute super."amazonka-elastictranscoder_1_3_7";
+  "amazonka-elb" = doDistribute super."amazonka-elb_1_3_7";
+  "amazonka-emr" = doDistribute super."amazonka-emr_1_3_7";
+  "amazonka-gamelift" = dontDistribute super."amazonka-gamelift";
+  "amazonka-glacier" = doDistribute super."amazonka-glacier_1_3_7";
+  "amazonka-iam" = doDistribute super."amazonka-iam_1_3_7";
+  "amazonka-importexport" = doDistribute super."amazonka-importexport_1_3_7";
+  "amazonka-inspector" = doDistribute super."amazonka-inspector_1_3_7";
+  "amazonka-iot" = doDistribute super."amazonka-iot_1_3_7";
+  "amazonka-iot-dataplane" = doDistribute super."amazonka-iot-dataplane_1_3_7";
+  "amazonka-kinesis" = doDistribute super."amazonka-kinesis_1_3_7";
+  "amazonka-kinesis-firehose" = doDistribute super."amazonka-kinesis-firehose_1_3_7";
+  "amazonka-kms" = doDistribute super."amazonka-kms_1_3_7";
+  "amazonka-lambda" = doDistribute super."amazonka-lambda_1_3_7";
+  "amazonka-marketplace-analytics" = doDistribute super."amazonka-marketplace-analytics_1_3_7";
+  "amazonka-marketplace-metering" = dontDistribute super."amazonka-marketplace-metering";
+  "amazonka-ml" = doDistribute super."amazonka-ml_1_3_7";
+  "amazonka-opsworks" = doDistribute super."amazonka-opsworks_1_3_7";
+  "amazonka-rds" = doDistribute super."amazonka-rds_1_3_7";
+  "amazonka-redshift" = doDistribute super."amazonka-redshift_1_3_7";
+  "amazonka-route53" = doDistribute super."amazonka-route53_1_3_7";
+  "amazonka-route53-domains" = doDistribute super."amazonka-route53-domains_1_3_7";
+  "amazonka-s3" = doDistribute super."amazonka-s3_1_3_7";
+  "amazonka-sdb" = doDistribute super."amazonka-sdb_1_3_7";
+  "amazonka-ses" = doDistribute super."amazonka-ses_1_3_7";
+  "amazonka-sns" = doDistribute super."amazonka-sns_1_3_7";
+  "amazonka-sqs" = doDistribute super."amazonka-sqs_1_3_7";
+  "amazonka-ssm" = doDistribute super."amazonka-ssm_1_3_7";
+  "amazonka-storagegateway" = doDistribute super."amazonka-storagegateway_1_3_7";
+  "amazonka-sts" = doDistribute super."amazonka-sts_1_3_7";
+  "amazonka-support" = doDistribute super."amazonka-support_1_3_7";
+  "amazonka-swf" = doDistribute super."amazonka-swf_1_3_7";
+  "amazonka-test" = doDistribute super."amazonka-test_1_3_7";
+  "amazonka-waf" = doDistribute super."amazonka-waf_1_3_7";
+  "amazonka-workspaces" = doDistribute super."amazonka-workspaces_1_3_7";
+  "ampersand" = dontDistribute super."ampersand";
+  "amqp-conduit" = dontDistribute super."amqp-conduit";
+  "amrun" = dontDistribute super."amrun";
+  "analyze-client" = dontDistribute super."analyze-client";
+  "anansi" = dontDistribute super."anansi";
+  "anansi-hscolour" = dontDistribute super."anansi-hscolour";
+  "anansi-pandoc" = dontDistribute super."anansi-pandoc";
+  "anatomy" = dontDistribute super."anatomy";
+  "android" = dontDistribute super."android";
+  "android-lint-summary" = dontDistribute super."android-lint-summary";
+  "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
+  "annihilator" = dontDistribute super."annihilator";
+  "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
+  "ansi-pretty" = dontDistribute super."ansi-pretty";
+  "ansigraph" = dontDistribute super."ansigraph";
+  "antagonist" = dontDistribute super."antagonist";
+  "antfarm" = dontDistribute super."antfarm";
+  "anticiv" = dontDistribute super."anticiv";
+  "antigate" = dontDistribute super."antigate";
+  "antimirov" = dontDistribute super."antimirov";
+  "antiquoter" = dontDistribute super."antiquoter";
+  "antisplice" = dontDistribute super."antisplice";
+  "antlrc" = dontDistribute super."antlrc";
+  "anydbm" = dontDistribute super."anydbm";
+  "aosd" = dontDistribute super."aosd";
+  "ap-reflect" = dontDistribute super."ap-reflect";
+  "apache-md5" = dontDistribute super."apache-md5";
+  "apelsin" = dontDistribute super."apelsin";
+  "api-builder" = dontDistribute super."api-builder";
+  "api-field-json-th" = dontDistribute super."api-field-json-th";
+  "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
+  "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
+  "apiary-helics" = dontDistribute super."apiary-helics";
+  "apiary-http-client" = dontDistribute super."apiary-http-client";
+  "apiary-purescript" = dontDistribute super."apiary-purescript";
+  "apis" = dontDistribute super."apis";
+  "apotiki" = dontDistribute super."apotiki";
+  "app-lens" = dontDistribute super."app-lens";
+  "appc" = dontDistribute super."appc";
+  "applicative-extras" = dontDistribute super."applicative-extras";
+  "applicative-fail" = dontDistribute super."applicative-fail";
+  "applicative-numbers" = dontDistribute super."applicative-numbers";
+  "applicative-parsec" = dontDistribute super."applicative-parsec";
+  "applicative-quoters" = dontDistribute super."applicative-quoters";
+  "applicative-splice" = dontDistribute super."applicative-splice";
+  "apply-refact" = doDistribute super."apply-refact_0_1_0_0";
+  "apportionment" = dontDistribute super."apportionment";
+  "approx-rand-test" = dontDistribute super."approx-rand-test";
+  "approximate-equality" = dontDistribute super."approximate-equality";
+  "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
+  "arb-fft" = dontDistribute super."arb-fft";
+  "arbb-vm" = dontDistribute super."arbb-vm";
+  "archive" = dontDistribute super."archive";
+  "archiver" = dontDistribute super."archiver";
+  "archlinux" = dontDistribute super."archlinux";
+  "archlinux-web" = dontDistribute super."archlinux-web";
+  "archnews" = dontDistribute super."archnews";
+  "arena" = dontDistribute super."arena";
+  "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon" = doDistribute super."argon_0_4_0_0";
+  "argon2" = dontDistribute super."argon2";
+  "argparser" = dontDistribute super."argparser";
+  "arguedit" = dontDistribute super."arguedit";
+  "ariadne" = dontDistribute super."ariadne";
+  "arion" = dontDistribute super."arion";
+  "arith-encode" = dontDistribute super."arith-encode";
+  "arithmatic" = dontDistribute super."arithmatic";
+  "arithmetic" = dontDistribute super."arithmetic";
+  "arithmoi" = dontDistribute super."arithmoi";
+  "armada" = dontDistribute super."armada";
+  "arpa" = dontDistribute super."arpa";
+  "array-forth" = dontDistribute super."array-forth";
+  "array-memoize" = dontDistribute super."array-memoize";
+  "array-primops" = dontDistribute super."array-primops";
+  "array-utils" = dontDistribute super."array-utils";
+  "arrow-improve" = dontDistribute super."arrow-improve";
+  "arrowapply-utils" = dontDistribute super."arrowapply-utils";
+  "arrowp" = dontDistribute super."arrowp";
+  "arrows" = dontDistribute super."arrows";
+  "artery" = dontDistribute super."artery";
+  "arx" = dontDistribute super."arx";
+  "arxiv" = dontDistribute super."arxiv";
+  "ascetic" = dontDistribute super."ascetic";
+  "ascii" = dontDistribute super."ascii";
+  "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
+  "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
+  "asic" = dontDistribute super."asic";
+  "asil" = dontDistribute super."asil";
+  "asn1-data" = dontDistribute super."asn1-data";
+  "asn1dump" = dontDistribute super."asn1dump";
+  "assembler" = dontDistribute super."assembler";
+  "assert" = dontDistribute super."assert";
+  "assert-failure" = dontDistribute super."assert-failure";
+  "assertions" = dontDistribute super."assertions";
+  "assimp" = dontDistribute super."assimp";
+  "astar" = dontDistribute super."astar";
+  "astrds" = dontDistribute super."astrds";
+  "astview" = dontDistribute super."astview";
+  "astview-utils" = dontDistribute super."astview-utils";
+  "async-dejafu" = doDistribute super."async-dejafu_0_1_0_0";
+  "async-extras" = dontDistribute super."async-extras";
+  "async-manager" = dontDistribute super."async-manager";
+  "async-pool" = dontDistribute super."async-pool";
+  "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions";
+  "aterm" = dontDistribute super."aterm";
+  "aterm-utils" = dontDistribute super."aterm-utils";
+  "atl" = dontDistribute super."atl";
+  "atlassian-connect-core" = dontDistribute super."atlassian-connect-core";
+  "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor";
+  "atmos" = dontDistribute super."atmos";
+  "atmos-dimensional" = dontDistribute super."atmos-dimensional";
+  "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
+  "atom" = dontDistribute super."atom";
+  "atom-basic" = dontDistribute super."atom-basic";
+  "atom-conduit" = dontDistribute super."atom-conduit";
+  "atom-msp430" = dontDistribute super."atom-msp430";
+  "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign";
+  "atomic-primops-vector" = dontDistribute super."atomic-primops-vector";
+  "atomic-write" = dontDistribute super."atomic-write";
+  "atomo" = dontDistribute super."atomo";
+  "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
+  "attempt" = dontDistribute super."attempt";
+  "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec-arff" = dontDistribute super."attoparsec-arff";
+  "attoparsec-binary" = dontDistribute super."attoparsec-binary";
+  "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
+  "attoparsec-csv" = dontDistribute super."attoparsec-csv";
+  "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee";
+  "attoparsec-parsec" = dontDistribute super."attoparsec-parsec";
+  "attoparsec-text" = dontDistribute super."attoparsec-text";
+  "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator";
+  "attosplit" = dontDistribute super."attosplit";
+  "atuin" = dontDistribute super."atuin";
+  "audacity" = dontDistribute super."audacity";
+  "audiovisual" = dontDistribute super."audiovisual";
+  "augeas" = dontDistribute super."augeas";
+  "augur" = dontDistribute super."augur";
+  "aur" = dontDistribute super."aur";
+  "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
+  "authenticate-ldap" = dontDistribute super."authenticate-ldap";
+  "authinfo-hs" = dontDistribute super."authinfo-hs";
+  "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
+  "automitive-cse" = dontDistribute super."automitive-cse";
+  "automotive-cse" = dontDistribute super."automotive-cse";
+  "autonix-deps" = dontDistribute super."autonix-deps";
+  "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
+  "autoproc" = dontDistribute super."autoproc";
+  "avahi" = dontDistribute super."avahi";
+  "avatar-generator" = dontDistribute super."avatar-generator";
+  "average" = dontDistribute super."average";
+  "avl-static" = dontDistribute super."avl-static";
+  "avr-shake" = dontDistribute super."avr-shake";
+  "awesome-prelude" = dontDistribute super."awesome-prelude";
+  "awesomium" = dontDistribute super."awesomium";
+  "awesomium-glut" = dontDistribute super."awesomium-glut";
+  "awesomium-raw" = dontDistribute super."awesomium-raw";
+  "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer";
+  "aws-configuration-tools" = dontDistribute super."aws-configuration-tools";
+  "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit";
+  "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams";
+  "aws-ec2" = dontDistribute super."aws-ec2";
+  "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder";
+  "aws-general" = dontDistribute super."aws-general";
+  "aws-kinesis" = dontDistribute super."aws-kinesis";
+  "aws-kinesis-client" = dontDistribute super."aws-kinesis-client";
+  "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard";
+  "aws-lambda" = dontDistribute super."aws-lambda";
+  "aws-performance-tests" = dontDistribute super."aws-performance-tests";
+  "aws-route53" = dontDistribute super."aws-route53";
+  "aws-sdk" = dontDistribute super."aws-sdk";
+  "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter";
+  "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered";
+  "aws-sign4" = dontDistribute super."aws-sign4";
+  "aws-sns" = dontDistribute super."aws-sns";
+  "azure-acs" = dontDistribute super."azure-acs";
+  "azure-service-api" = dontDistribute super."azure-service-api";
+  "azure-servicebus" = dontDistribute super."azure-servicebus";
+  "azurify" = dontDistribute super."azurify";
+  "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_18";
+  "babylon" = dontDistribute super."babylon";
+  "backdropper" = dontDistribute super."backdropper";
+  "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
+  "backward-state" = dontDistribute super."backward-state";
+  "bacteria" = dontDistribute super."bacteria";
+  "bag" = dontDistribute super."bag";
+  "bamboo" = dontDistribute super."bamboo";
+  "bamboo-launcher" = dontDistribute super."bamboo-launcher";
+  "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight";
+  "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo";
+  "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint";
+  "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
+  "bamse" = dontDistribute super."bamse";
+  "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
+  "banwords" = dontDistribute super."banwords";
+  "barchart" = dontDistribute super."barchart";
+  "barcodes-code128" = dontDistribute super."barcodes-code128";
+  "barecheck" = dontDistribute super."barecheck";
+  "barley" = dontDistribute super."barley";
+  "barrie" = dontDistribute super."barrie";
+  "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-generics" = dontDistribute super."base-generics";
+  "base-io-access" = dontDistribute super."base-io-access";
+  "base-prelude" = doDistribute super."base-prelude_0_1_21";
+  "base32-bytestring" = dontDistribute super."base32-bytestring";
+  "base58-bytestring" = dontDistribute super."base58-bytestring";
+  "base58address" = dontDistribute super."base58address";
+  "base64-conduit" = dontDistribute super."base64-conduit";
+  "base91" = dontDistribute super."base91";
+  "basex-client" = dontDistribute super."basex-client";
+  "bash" = dontDistribute super."bash";
+  "basic-lens" = dontDistribute super."basic-lens";
+  "basic-sop" = dontDistribute super."basic-sop";
+  "baskell" = dontDistribute super."baskell";
+  "battlenet" = dontDistribute super."battlenet";
+  "battlenet-yesod" = dontDistribute super."battlenet-yesod";
+  "battleships" = dontDistribute super."battleships";
+  "bayes-stack" = dontDistribute super."bayes-stack";
+  "bbdb" = dontDistribute super."bbdb";
+  "bbi" = dontDistribute super."bbi";
+  "bdd" = dontDistribute super."bdd";
+  "bdelta" = dontDistribute super."bdelta";
+  "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
+  "beamable" = dontDistribute super."beamable";
+  "beautifHOL" = dontDistribute super."beautifHOL";
+  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
+  "bein" = dontDistribute super."bein";
+  "bench" = dontDistribute super."bench";
+  "benchmark-function" = dontDistribute super."benchmark-function";
+  "bencoding" = dontDistribute super."bencoding";
+  "bento" = dontDistribute super."bento";
+  "berkeleydb" = dontDistribute super."berkeleydb";
+  "berp" = dontDistribute super."berp";
+  "bert" = dontDistribute super."bert";
+  "besout" = dontDistribute super."besout";
+  "bet" = dontDistribute super."bet";
+  "betacode" = dontDistribute super."betacode";
+  "between" = dontDistribute super."between";
+  "bf-cata" = dontDistribute super."bf-cata";
+  "bff" = dontDistribute super."bff";
+  "bff-mono" = dontDistribute super."bff-mono";
+  "bgmax" = dontDistribute super."bgmax";
+  "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
+  "bibtex" = dontDistribute super."bibtex";
+  "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
+  "bidispec" = dontDistribute super."bidispec";
+  "bidispec-extras" = dontDistribute super."bidispec-extras";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
+  "billboard-parser" = dontDistribute super."billboard-parser";
+  "billeksah-forms" = dontDistribute super."billeksah-forms";
+  "billeksah-main" = dontDistribute super."billeksah-main";
+  "billeksah-main-static" = dontDistribute super."billeksah-main-static";
+  "billeksah-pane" = dontDistribute super."billeksah-pane";
+  "billeksah-services" = dontDistribute super."billeksah-services";
+  "bimaps" = dontDistribute super."bimaps";
+  "binary-bits" = dontDistribute super."binary-bits";
+  "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-derive" = dontDistribute super."binary-derive";
+  "binary-enum" = dontDistribute super."binary-enum";
+  "binary-file" = dontDistribute super."binary-file";
+  "binary-generic" = dontDistribute super."binary-generic";
+  "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
+  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-protocol" = dontDistribute super."binary-protocol";
+  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-shared" = dontDistribute super."binary-shared";
+  "binary-state" = dontDistribute super."binary-state";
+  "binary-store" = dontDistribute super."binary-store";
+  "binary-streams" = dontDistribute super."binary-streams";
+  "binary-strict" = dontDistribute super."binary-strict";
+  "binarydefer" = dontDistribute super."binarydefer";
+  "bind-marshal" = dontDistribute super."bind-marshal";
+  "binding-core" = dontDistribute super."binding-core";
+  "binding-gtk" = dontDistribute super."binding-gtk";
+  "binding-wx" = dontDistribute super."binding-wx";
+  "bindings" = dontDistribute super."bindings";
+  "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-K8055" = dontDistribute super."bindings-K8055";
+  "bindings-apr" = dontDistribute super."bindings-apr";
+  "bindings-apr-util" = dontDistribute super."bindings-apr-util";
+  "bindings-audiofile" = dontDistribute super."bindings-audiofile";
+  "bindings-bfd" = dontDistribute super."bindings-bfd";
+  "bindings-cctools" = dontDistribute super."bindings-cctools";
+  "bindings-codec2" = dontDistribute super."bindings-codec2";
+  "bindings-common" = dontDistribute super."bindings-common";
+  "bindings-dc1394" = dontDistribute super."bindings-dc1394";
+  "bindings-directfb" = dontDistribute super."bindings-directfb";
+  "bindings-eskit" = dontDistribute super."bindings-eskit";
+  "bindings-fann" = dontDistribute super."bindings-fann";
+  "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth";
+  "bindings-friso" = dontDistribute super."bindings-friso";
+  "bindings-glib" = dontDistribute super."bindings-glib";
+  "bindings-gobject" = dontDistribute super."bindings-gobject";
+  "bindings-gpgme" = dontDistribute super."bindings-gpgme";
+  "bindings-gsl" = dontDistribute super."bindings-gsl";
+  "bindings-gts" = dontDistribute super."bindings-gts";
+  "bindings-hamlib" = dontDistribute super."bindings-hamlib";
+  "bindings-hdf5" = dontDistribute super."bindings-hdf5";
+  "bindings-levmar" = dontDistribute super."bindings-levmar";
+  "bindings-libcddb" = dontDistribute super."bindings-libcddb";
+  "bindings-libffi" = dontDistribute super."bindings-libffi";
+  "bindings-libftdi" = dontDistribute super."bindings-libftdi";
+  "bindings-librrd" = dontDistribute super."bindings-librrd";
+  "bindings-libstemmer" = dontDistribute super."bindings-libstemmer";
+  "bindings-libusb" = dontDistribute super."bindings-libusb";
+  "bindings-libv4l2" = dontDistribute super."bindings-libv4l2";
+  "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2";
+  "bindings-lxc" = dontDistribute super."bindings-lxc";
+  "bindings-mmap" = dontDistribute super."bindings-mmap";
+  "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal";
+  "bindings-nettle" = dontDistribute super."bindings-nettle";
+  "bindings-parport" = dontDistribute super."bindings-parport";
+  "bindings-portaudio" = dontDistribute super."bindings-portaudio";
+  "bindings-potrace" = dontDistribute super."bindings-potrace";
+  "bindings-ppdev" = dontDistribute super."bindings-ppdev";
+  "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd";
+  "bindings-sane" = dontDistribute super."bindings-sane";
+  "bindings-sc3" = dontDistribute super."bindings-sc3";
+  "bindings-sipc" = dontDistribute super."bindings-sipc";
+  "bindings-sophia" = dontDistribute super."bindings-sophia";
+  "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
+  "bindings-svm" = dontDistribute super."bindings-svm";
+  "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
+  "bindings-yices" = dontDistribute super."bindings-yices";
+  "bindynamic" = dontDistribute super."bindynamic";
+  "binembed" = dontDistribute super."binembed";
+  "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
+  "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
+  "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
+  "biosff" = dontDistribute super."biosff";
+  "biostockholm" = dontDistribute super."biostockholm";
+  "bird" = dontDistribute super."bird";
+  "bit-array" = dontDistribute super."bit-array";
+  "bit-vector" = dontDistribute super."bit-vector";
+  "bitarray" = dontDistribute super."bitarray";
+  "bitcoin-rpc" = dontDistribute super."bitcoin-rpc";
+  "bitly-cli" = dontDistribute super."bitly-cli";
+  "bitmap" = dontDistribute super."bitmap";
+  "bitmap-opengl" = dontDistribute super."bitmap-opengl";
+  "bitmaps" = dontDistribute super."bitmaps";
+  "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
+  "bits-conduit" = dontDistribute super."bits-conduit";
+  "bits-extras" = dontDistribute super."bits-extras";
+  "bitset" = dontDistribute super."bitset";
+  "bitspeak" = dontDistribute super."bitspeak";
+  "bitstream" = dontDistribute super."bitstream";
+  "bitstring" = dontDistribute super."bitstring";
+  "bittorrent" = dontDistribute super."bittorrent";
+  "bitvec" = dontDistribute super."bitvec";
+  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
+  "bk-tree" = dontDistribute super."bk-tree";
+  "bkr" = dontDistribute super."bkr";
+  "bktrees" = dontDistribute super."bktrees";
+  "bla" = dontDistribute super."bla";
+  "black-jewel" = dontDistribute super."black-jewel";
+  "blacktip" = dontDistribute super."blacktip";
+  "blakesum" = dontDistribute super."blakesum";
+  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blas" = dontDistribute super."blas";
+  "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
+  "blaze" = dontDistribute super."blaze";
+  "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
+  "blaze-from-html" = dontDistribute super."blaze-from-html";
+  "blaze-html-contrib" = dontDistribute super."blaze-html-contrib";
+  "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat";
+  "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
+  "blaze-json" = dontDistribute super."blaze-json";
+  "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-textual-native" = dontDistribute super."blaze-textual-native";
+  "blazeMarker" = dontDistribute super."blazeMarker";
+  "blink1" = dontDistribute super."blink1";
+  "blip" = dontDistribute super."blip";
+  "bliplib" = dontDistribute super."bliplib";
+  "blocking-transactions" = dontDistribute super."blocking-transactions";
+  "blogination" = dontDistribute super."blogination";
+  "bloodhound" = dontDistribute super."bloodhound";
+  "bloodhound-amazonka-auth" = dontDistribute super."bloodhound-amazonka-auth";
+  "bloomfilter-redis" = dontDistribute super."bloomfilter-redis";
+  "bloxorz" = dontDistribute super."bloxorz";
+  "blubber" = dontDistribute super."blubber";
+  "blubber-server" = dontDistribute super."blubber-server";
+  "bluetile" = dontDistribute super."bluetile";
+  "bluetileutils" = dontDistribute super."bluetileutils";
+  "blunt" = dontDistribute super."blunt";
+  "board-games" = dontDistribute super."board-games";
+  "bogre-banana" = dontDistribute super."bogre-banana";
+  "bond" = dontDistribute super."bond";
+  "bond-haskell" = dontDistribute super."bond-haskell";
+  "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler";
+  "boolean-list" = dontDistribute super."boolean-list";
+  "boolean-normal-forms" = dontDistribute super."boolean-normal-forms";
+  "boolexpr" = dontDistribute super."boolexpr";
+  "bools" = dontDistribute super."bools";
+  "boolsimplifier" = dontDistribute super."boolsimplifier";
+  "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
+  "boomslang" = dontDistribute super."boomslang";
+  "borel" = dontDistribute super."borel";
+  "bot" = dontDistribute super."bot";
+  "botpp" = dontDistribute super."botpp";
+  "bound-gen" = dontDistribute super."bound-gen";
+  "bounded-tchan" = dontDistribute super."bounded-tchan";
+  "boundingboxes" = dontDistribute super."boundingboxes";
+  "bower-json" = doDistribute super."bower-json_0_7_0_0";
+  "bowntz" = dontDistribute super."bowntz";
+  "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
+  "brainfuck" = dontDistribute super."brainfuck";
+  "brainfuck-monad" = dontDistribute super."brainfuck-monad";
+  "brainfuck-tut" = dontDistribute super."brainfuck-tut";
+  "break" = dontDistribute super."break";
+  "breakout" = dontDistribute super."breakout";
+  "breve" = dontDistribute super."breve";
+  "brians-brain" = dontDistribute super."brians-brain";
+  "brillig" = dontDistribute super."brillig";
+  "broccoli" = dontDistribute super."broccoli";
+  "broker-haskell" = dontDistribute super."broker-haskell";
+  "bsd-sysctl" = dontDistribute super."bsd-sysctl";
+  "bson-generic" = dontDistribute super."bson-generic";
+  "bson-generics" = dontDistribute super."bson-generics";
+  "bson-mapping" = dontDistribute super."bson-mapping";
+  "bspack" = dontDistribute super."bspack";
+  "bsparse" = dontDistribute super."bsparse";
+  "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
+  "buffon" = dontDistribute super."buffon";
+  "bugzilla" = dontDistribute super."bugzilla";
+  "buildable" = dontDistribute super."buildable";
+  "buildbox" = dontDistribute super."buildbox";
+  "buildbox-tools" = dontDistribute super."buildbox-tools";
+  "buildwrapper" = dontDistribute super."buildwrapper";
+  "bullet" = dontDistribute super."bullet";
+  "burst-detection" = dontDistribute super."burst-detection";
+  "bus-pirate" = dontDistribute super."bus-pirate";
+  "buster" = dontDistribute super."buster";
+  "buster-gtk" = dontDistribute super."buster-gtk";
+  "buster-network" = dontDistribute super."buster-network";
+  "butterflies" = dontDistribute super."butterflies";
+  "bv" = dontDistribute super."bv";
+  "byline" = dontDistribute super."byline";
+  "bytable" = dontDistribute super."bytable";
+  "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary";
+  "bytestring-class" = dontDistribute super."bytestring-class";
+  "bytestring-csv" = dontDistribute super."bytestring-csv";
+  "bytestring-delta" = dontDistribute super."bytestring-delta";
+  "bytestring-from" = dontDistribute super."bytestring-from";
+  "bytestring-nums" = dontDistribute super."bytestring-nums";
+  "bytestring-plain" = dontDistribute super."bytestring-plain";
+  "bytestring-rematch" = dontDistribute super."bytestring-rematch";
+  "bytestring-short" = dontDistribute super."bytestring-short";
+  "bytestring-show" = dontDistribute super."bytestring-show";
+  "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder";
+  "bytestringparser" = dontDistribute super."bytestringparser";
+  "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
+  "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "c-dsl" = dontDistribute super."c-dsl";
+  "c-io" = dontDistribute super."c-io";
+  "c-storable-deriving" = dontDistribute super."c-storable-deriving";
+  "c0check" = dontDistribute super."c0check";
+  "c0parser" = dontDistribute super."c0parser";
+  "c10k" = dontDistribute super."c10k";
+  "c2hs" = doDistribute super."c2hs_0_27_1";
+  "c2hsc" = dontDistribute super."c2hsc";
+  "cab" = dontDistribute super."cab";
+  "cabal-audit" = dontDistribute super."cabal-audit";
+  "cabal-bounds" = dontDistribute super."cabal-bounds";
+  "cabal-cargs" = dontDistribute super."cabal-cargs";
+  "cabal-constraints" = dontDistribute super."cabal-constraints";
+  "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
+  "cabal-dev" = dontDistribute super."cabal-dev";
+  "cabal-dir" = dontDistribute super."cabal-dir";
+  "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags";
+  "cabal-ghci" = dontDistribute super."cabal-ghci";
+  "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
+  "cabal-info" = dontDistribute super."cabal-info";
+  "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
+  "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
+  "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74";
+  "cabal-lenses" = dontDistribute super."cabal-lenses";
+  "cabal-macosx" = dontDistribute super."cabal-macosx";
+  "cabal-meta" = dontDistribute super."cabal-meta";
+  "cabal-mon" = dontDistribute super."cabal-mon";
+  "cabal-nirvana" = dontDistribute super."cabal-nirvana";
+  "cabal-progdeps" = dontDistribute super."cabal-progdeps";
+  "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-scripts" = dontDistribute super."cabal-scripts";
+  "cabal-setup" = dontDistribute super."cabal-setup";
+  "cabal-sign" = dontDistribute super."cabal-sign";
+  "cabal-test" = dontDistribute super."cabal-test";
+  "cabal-test-bin" = dontDistribute super."cabal-test-bin";
+  "cabal-test-compat" = dontDistribute super."cabal-test-compat";
+  "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck";
+  "cabal-uninstall" = dontDistribute super."cabal-uninstall";
+  "cabal-upload" = dontDistribute super."cabal-upload";
+  "cabal2arch" = dontDistribute super."cabal2arch";
+  "cabal2doap" = dontDistribute super."cabal2doap";
+  "cabal2ebuild" = dontDistribute super."cabal2ebuild";
+  "cabal2ghci" = dontDistribute super."cabal2ghci";
+  "cabal2nix" = dontDistribute super."cabal2nix";
+  "cabal2spec" = dontDistribute super."cabal2spec";
+  "cabalQuery" = dontDistribute super."cabalQuery";
+  "cabalg" = dontDistribute super."cabalg";
+  "cabalgraph" = dontDistribute super."cabalgraph";
+  "cabalmdvrpm" = dontDistribute super."cabalmdvrpm";
+  "cabalrpmdeps" = dontDistribute super."cabalrpmdeps";
+  "cabalvchk" = dontDistribute super."cabalvchk";
+  "cabin" = dontDistribute super."cabin";
+  "cabocha" = dontDistribute super."cabocha";
+  "cached-io" = dontDistribute super."cached-io";
+  "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_4_0";
+  "caf" = dontDistribute super."caf";
+  "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
+  "caffegraph" = dontDistribute super."caffegraph";
+  "cairo-appbase" = dontDistribute super."cairo-appbase";
+  "cake" = dontDistribute super."cake";
+  "cake3" = dontDistribute super."cake3";
+  "cakyrespa" = dontDistribute super."cakyrespa";
+  "cal3d" = dontDistribute super."cal3d";
+  "cal3d-examples" = dontDistribute super."cal3d-examples";
+  "cal3d-opengl" = dontDistribute super."cal3d-opengl";
+  "calc" = dontDistribute super."calc";
+  "caldims" = dontDistribute super."caldims";
+  "caledon" = dontDistribute super."caledon";
+  "call" = dontDistribute super."call";
+  "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything";
+  "camfort" = dontDistribute super."camfort";
+  "camh" = dontDistribute super."camh";
+  "campfire" = dontDistribute super."campfire";
+  "canonical-filepath" = dontDistribute super."canonical-filepath";
+  "canteven-config" = dontDistribute super."canteven-config";
+  "canteven-listen-http" = dontDistribute super."canteven-listen-http";
+  "canteven-log" = dontDistribute super."canteven-log";
+  "canteven-template" = dontDistribute super."canteven-template";
+  "cantor" = dontDistribute super."cantor";
+  "cao" = dontDistribute super."cao";
+  "cap" = dontDistribute super."cap";
+  "capped-list" = dontDistribute super."capped-list";
+  "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
+  "caramia" = dontDistribute super."caramia";
+  "carboncopy" = dontDistribute super."carboncopy";
+  "carettah" = dontDistribute super."carettah";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
+  "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms";
+  "casadi-bindings" = dontDistribute super."casadi-bindings";
+  "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
+  "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
+  "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal";
+  "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface";
+  "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface";
+  "cascading" = dontDistribute super."cascading";
+  "case-conversion" = dontDistribute super."case-conversion";
+  "cash" = dontDistribute super."cash";
+  "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
+  "cassandra-cql" = dontDistribute super."cassandra-cql";
+  "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava-conduit" = dontDistribute super."cassava-conduit";
+  "cassava-streams" = dontDistribute super."cassava-streams";
+  "cassette" = dontDistribute super."cassette";
+  "cassy" = dontDistribute super."cassy";
+  "castle" = dontDistribute super."castle";
+  "casui" = dontDistribute super."casui";
+  "catamorphism" = dontDistribute super."catamorphism";
+  "catch-fd" = dontDistribute super."catch-fd";
+  "categorical-algebra" = dontDistribute super."categorical-algebra";
+  "categories" = dontDistribute super."categories";
+  "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
+  "category-traced" = dontDistribute super."category-traced";
+  "cayley-dickson" = dontDistribute super."cayley-dickson";
+  "cblrepo" = dontDistribute super."cblrepo";
+  "cci" = dontDistribute super."cci";
+  "ccnx" = dontDistribute super."ccnx";
+  "cctools-workqueue" = dontDistribute super."cctools-workqueue";
+  "cedict" = dontDistribute super."cedict";
+  "cef" = dontDistribute super."cef";
+  "ceilometer-common" = dontDistribute super."ceilometer-common";
+  "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
+  "cerberus" = dontDistribute super."cerberus";
+  "cereal-derive" = dontDistribute super."cereal-derive";
+  "cereal-enumerator" = dontDistribute super."cereal-enumerator";
+  "cereal-ieee754" = dontDistribute super."cereal-ieee754";
+  "cereal-plus" = dontDistribute super."cereal-plus";
+  "cereal-text" = dontDistribute super."cereal-text";
+  "certificate" = dontDistribute super."certificate";
+  "cf" = dontDistribute super."cf";
+  "cfipu" = dontDistribute super."cfipu";
+  "cflp" = dontDistribute super."cflp";
+  "cfopu" = dontDistribute super."cfopu";
+  "cg" = dontDistribute super."cg";
+  "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_3";
+  "cgi-undecidable" = dontDistribute super."cgi-undecidable";
+  "cgi-utils" = dontDistribute super."cgi-utils";
+  "cgrep" = dontDistribute super."cgrep";
+  "chain-codes" = dontDistribute super."chain-codes";
+  "chalk" = dontDistribute super."chalk";
+  "chalkboard" = dontDistribute super."chalkboard";
+  "chalkboard-viewer" = dontDistribute super."chalkboard-viewer";
+  "chalmers-lava2000" = dontDistribute super."chalmers-lava2000";
+  "chan-split" = dontDistribute super."chan-split";
+  "change-monger" = dontDistribute super."change-monger";
+  "charade" = dontDistribute super."charade";
+  "charsetdetect" = dontDistribute super."charsetdetect";
+  "chart-histogram" = dontDistribute super."chart-histogram";
+  "chaselev-deque" = dontDistribute super."chaselev-deque";
+  "chatter" = dontDistribute super."chatter";
+  "chatty" = dontDistribute super."chatty";
+  "chatty-text" = dontDistribute super."chatty-text";
+  "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate-highlight" = dontDistribute super."cheapskate-highlight";
+  "cheapskate-lucid" = dontDistribute super."cheapskate-lucid";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
+  "check-pvp" = dontDistribute super."check-pvp";
+  "checked" = dontDistribute super."checked";
+  "chell-hunit" = dontDistribute super."chell-hunit";
+  "chesshs" = dontDistribute super."chesshs";
+  "chevalier-common" = dontDistribute super."chevalier-common";
+  "chorale" = dontDistribute super."chorale";
+  "chp" = dontDistribute super."chp";
+  "chp-mtl" = dontDistribute super."chp-mtl";
+  "chp-plus" = dontDistribute super."chp-plus";
+  "chp-spec" = dontDistribute super."chp-spec";
+  "chp-transformers" = dontDistribute super."chp-transformers";
+  "chronograph" = dontDistribute super."chronograph";
+  "chu2" = dontDistribute super."chu2";
+  "chuchu" = dontDistribute super."chuchu";
+  "chunks" = dontDistribute super."chunks";
+  "chunky" = dontDistribute super."chunky";
+  "church-list" = dontDistribute super."church-list";
+  "cil" = dontDistribute super."cil";
+  "cinvoke" = dontDistribute super."cinvoke";
+  "cio" = dontDistribute super."cio";
+  "cipher-rc5" = dontDistribute super."cipher-rc5";
+  "ciphersaber2" = dontDistribute super."ciphersaber2";
+  "circ" = dontDistribute super."circ";
+  "circlehs" = dontDistribute super."circlehs";
+  "cirru-parser" = dontDistribute super."cirru-parser";
+  "citation-resolve" = dontDistribute super."citation-resolve";
+  "citeproc-hs" = dontDistribute super."citeproc-hs";
+  "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter";
+  "cityhash" = dontDistribute super."cityhash";
+  "cjk" = dontDistribute super."cjk";
+  "clac" = dontDistribute super."clac";
+  "clafer" = dontDistribute super."clafer";
+  "claferIG" = dontDistribute super."claferIG";
+  "claferwiki" = dontDistribute super."claferwiki";
+  "clang-pure" = dontDistribute super."clang-pure";
+  "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
+  "clash" = dontDistribute super."clash";
+  "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "classify" = dontDistribute super."classify";
+  "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
+  "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
+  "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
+  "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
+  "cld2" = dontDistribute super."cld2";
+  "clean-home" = dontDistribute super."clean-home";
+  "clean-unions" = dontDistribute super."clean-unions";
+  "cless" = dontDistribute super."cless";
+  "clevercss" = dontDistribute super."clevercss";
+  "cli" = dontDistribute super."cli";
+  "click-clack" = dontDistribute super."click-clack";
+  "clifford" = dontDistribute super."clifford";
+  "clippard" = dontDistribute super."clippard";
+  "clipper" = dontDistribute super."clipper";
+  "clippings" = dontDistribute super."clippings";
+  "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_6_0_1";
+  "clocked" = dontDistribute super."clocked";
+  "clogparse" = dontDistribute super."clogparse";
+  "clone-all" = dontDistribute super."clone-all";
+  "closure" = dontDistribute super."closure";
+  "cloud-haskell" = dontDistribute super."cloud-haskell";
+  "cloudfront-signer" = dontDistribute super."cloudfront-signer";
+  "cloudyfs" = dontDistribute super."cloudyfs";
+  "cltw" = dontDistribute super."cltw";
+  "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
+  "cluss" = dontDistribute super."cluss";
+  "clustertools" = dontDistribute super."clustertools";
+  "clutterhs" = dontDistribute super."clutterhs";
+  "cmaes" = dontDistribute super."cmaes";
+  "cmath" = dontDistribute super."cmath";
+  "cmathml3" = dontDistribute super."cmathml3";
+  "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs-browser" = dontDistribute super."cmdargs-browser";
+  "cmdlib" = dontDistribute super."cmdlib";
+  "cmdtheline" = dontDistribute super."cmdtheline";
+  "cml" = dontDistribute super."cml";
+  "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
+  "cmu" = dontDistribute super."cmu";
+  "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
+  "cndict" = dontDistribute super."cndict";
+  "codec" = dontDistribute super."codec";
+  "codec-libevent" = dontDistribute super."codec-libevent";
+  "codec-mbox" = dontDistribute super."codec-mbox";
+  "codecov-haskell" = dontDistribute super."codecov-haskell";
+  "codemonitor" = dontDistribute super."codemonitor";
+  "codepad" = dontDistribute super."codepad";
+  "codo-notation" = dontDistribute super."codo-notation";
+  "cofunctor" = dontDistribute super."cofunctor";
+  "cognimeta-utils" = dontDistribute super."cognimeta-utils";
+  "coinbase-exchange" = dontDistribute super."coinbase-exchange";
+  "colada" = dontDistribute super."colada";
+  "colchis" = dontDistribute super."colchis";
+  "collada-output" = dontDistribute super."collada-output";
+  "collada-types" = dontDistribute super."collada-types";
+  "collapse-util" = dontDistribute super."collapse-util";
+  "collection-json" = dontDistribute super."collection-json";
+  "collections" = dontDistribute super."collections";
+  "collections-api" = dontDistribute super."collections-api";
+  "collections-base-instances" = dontDistribute super."collections-base-instances";
+  "colock" = dontDistribute super."colock";
+  "color-counter" = dontDistribute super."color-counter";
+  "colorize-haskell" = dontDistribute super."colorize-haskell";
+  "colors" = dontDistribute super."colors";
+  "coltrane" = dontDistribute super."coltrane";
+  "com" = dontDistribute super."com";
+  "combinat" = dontDistribute super."combinat";
+  "combinat-diagrams" = dontDistribute super."combinat-diagrams";
+  "combinator-interactive" = dontDistribute super."combinator-interactive";
+  "combinatorial-problems" = dontDistribute super."combinatorial-problems";
+  "combinatorics" = dontDistribute super."combinatorics";
+  "combobuffer" = dontDistribute super."combobuffer";
+  "comfort-graph" = dontDistribute super."comfort-graph";
+  "command" = dontDistribute super."command";
+  "command-qq" = dontDistribute super."command-qq";
+  "commander" = dontDistribute super."commander";
+  "commodities" = dontDistribute super."commodities";
+  "commsec" = dontDistribute super."commsec";
+  "commsec-keyexchange" = dontDistribute super."commsec-keyexchange";
+  "comonad-extras" = dontDistribute super."comonad-extras";
+  "comonad-random" = dontDistribute super."comonad-random";
+  "compact-map" = dontDistribute super."compact-map";
+  "compact-socket" = dontDistribute super."compact-socket";
+  "compact-string" = dontDistribute super."compact-string";
+  "compact-string-fix" = dontDistribute super."compact-string-fix";
+  "compare-type" = dontDistribute super."compare-type";
+  "compdata-automata" = dontDistribute super."compdata-automata";
+  "compdata-dags" = dontDistribute super."compdata-dags";
+  "compdata-param" = dontDistribute super."compdata-param";
+  "compensated" = dontDistribute super."compensated";
+  "competition" = dontDistribute super."competition";
+  "compilation" = dontDistribute super."compilation";
+  "complex-generic" = dontDistribute super."complex-generic";
+  "complex-integrate" = dontDistribute super."complex-integrate";
+  "complexity" = dontDistribute super."complexity";
+  "compose-ltr" = dontDistribute super."compose-ltr";
+  "compose-trans" = dontDistribute super."compose-trans";
+  "compression" = dontDistribute super."compression";
+  "compstrat" = dontDistribute super."compstrat";
+  "comptrans" = dontDistribute super."comptrans";
+  "computational-algebra" = dontDistribute super."computational-algebra";
+  "computations" = dontDistribute super."computations";
+  "conceit" = dontDistribute super."conceit";
+  "concorde" = dontDistribute super."concorde";
+  "concraft" = dontDistribute super."concraft";
+  "concraft-hr" = dontDistribute super."concraft-hr";
+  "concraft-pl" = dontDistribute super."concraft-pl";
+  "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser";
+  "concrete-typerep" = dontDistribute super."concrete-typerep";
+  "concurrent-barrier" = dontDistribute super."concurrent-barrier";
+  "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
+  "concurrent-extra" = dontDistribute super."concurrent-extra";
+  "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "concurrent-output" = doDistribute super."concurrent-output_1_7_4";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
+  "concurrent-sa" = dontDistribute super."concurrent-sa";
+  "concurrent-split" = dontDistribute super."concurrent-split";
+  "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-utilities" = dontDistribute super."concurrent-utilities";
+  "concurrentoutput" = dontDistribute super."concurrentoutput";
+  "cond" = dontDistribute super."cond";
+  "condor" = dontDistribute super."condor";
+  "condorcet" = dontDistribute super."condorcet";
+  "conductive-base" = dontDistribute super."conductive-base";
+  "conductive-clock" = dontDistribute super."conductive-clock";
+  "conductive-hsc3" = dontDistribute super."conductive-hsc3";
+  "conductive-song" = dontDistribute super."conductive-song";
+  "conduit-audio" = dontDistribute super."conduit-audio";
+  "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
+  "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
+  "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
+  "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
+  "conf" = dontDistribute super."conf";
+  "config-manager" = dontDistribute super."config-manager";
+  "config-select" = dontDistribute super."config-select";
+  "config-value" = dontDistribute super."config-value";
+  "configifier" = dontDistribute super."configifier";
+  "configuration" = dontDistribute super."configuration";
+  "configuration-tools" = dontDistribute super."configuration-tools";
+  "confsolve" = dontDistribute super."confsolve";
+  "congruence-relation" = dontDistribute super."congruence-relation";
+  "conjugateGradient" = dontDistribute super."conjugateGradient";
+  "conjure" = dontDistribute super."conjure";
+  "conlogger" = dontDistribute super."conlogger";
+  "connection-pool" = dontDistribute super."connection-pool";
+  "consistent" = dontDistribute super."consistent";
+  "console-program" = dontDistribute super."console-program";
+  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
+  "constrained-categories" = dontDistribute super."constrained-categories";
+  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraint-classes" = dontDistribute super."constraint-classes";
+  "constructible" = dontDistribute super."constructible";
+  "constructive-algebra" = dontDistribute super."constructive-algebra";
+  "consumers" = dontDistribute super."consumers";
+  "container" = dontDistribute super."container";
+  "container-classes" = dontDistribute super."container-classes";
+  "containers-benchmark" = dontDistribute super."containers-benchmark";
+  "containers-deepseq" = dontDistribute super."containers-deepseq";
+  "context-free-grammar" = dontDistribute super."context-free-grammar";
+  "context-stack" = dontDistribute super."context-stack";
+  "continue" = dontDistribute super."continue";
+  "continued-fractions" = dontDistribute super."continued-fractions";
+  "continuum" = dontDistribute super."continuum";
+  "continuum-client" = dontDistribute super."continuum-client";
+  "control-event" = dontDistribute super."control-event";
+  "control-monad-attempt" = dontDistribute super."control-monad-attempt";
+  "control-monad-exception" = dontDistribute super."control-monad-exception";
+  "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd";
+  "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf";
+  "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl";
+  "control-monad-failure" = dontDistribute super."control-monad-failure";
+  "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl";
+  "control-monad-omega" = dontDistribute super."control-monad-omega";
+  "control-monad-queue" = dontDistribute super."control-monad-queue";
+  "control-timeout" = dontDistribute super."control-timeout";
+  "contstuff" = dontDistribute super."contstuff";
+  "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf";
+  "contstuff-transformers" = dontDistribute super."contstuff-transformers";
+  "converge" = dontDistribute super."converge";
+  "conversion" = dontDistribute super."conversion";
+  "conversion-bytestring" = dontDistribute super."conversion-bytestring";
+  "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive";
+  "conversion-text" = dontDistribute super."conversion-text";
+  "convert" = dontDistribute super."convert";
+  "convertible-ascii" = dontDistribute super."convertible-ascii";
+  "convertible-text" = dontDistribute super."convertible-text";
+  "cookbook" = dontDistribute super."cookbook";
+  "coordinate" = dontDistribute super."coordinate";
+  "copilot" = dontDistribute super."copilot";
+  "copilot-c99" = dontDistribute super."copilot-c99";
+  "copilot-cbmc" = dontDistribute super."copilot-cbmc";
+  "copilot-core" = dontDistribute super."copilot-core";
+  "copilot-language" = dontDistribute super."copilot-language";
+  "copilot-libraries" = dontDistribute super."copilot-libraries";
+  "copilot-sbv" = dontDistribute super."copilot-sbv";
+  "copilot-theorem" = dontDistribute super."copilot-theorem";
+  "copr" = dontDistribute super."copr";
+  "core" = dontDistribute super."core";
+  "core-haskell" = dontDistribute super."core-haskell";
+  "corebot-bliki" = dontDistribute super."corebot-bliki";
+  "coroutine-enumerator" = dontDistribute super."coroutine-enumerator";
+  "coroutine-iteratee" = dontDistribute super."coroutine-iteratee";
+  "coroutine-object" = dontDistribute super."coroutine-object";
+  "couch-hs" = dontDistribute super."couch-hs";
+  "couch-simple" = dontDistribute super."couch-simple";
+  "couchdb-conduit" = dontDistribute super."couchdb-conduit";
+  "couchdb-enumerator" = dontDistribute super."couchdb-enumerator";
+  "count" = dontDistribute super."count";
+  "countable" = dontDistribute super."countable";
+  "counter" = dontDistribute super."counter";
+  "court" = dontDistribute super."court";
+  "coverage" = dontDistribute super."coverage";
+  "cpio-conduit" = dontDistribute super."cpio-conduit";
+  "cplex-hs" = dontDistribute super."cplex-hs";
+  "cplusplus-th" = dontDistribute super."cplusplus-th";
+  "cpphs" = doDistribute super."cpphs_1_19_3";
+  "cprng-aes-effect" = dontDistribute super."cprng-aes-effect";
+  "cpsa" = dontDistribute super."cpsa";
+  "cpuid" = dontDistribute super."cpuid";
+  "cpuperf" = dontDistribute super."cpuperf";
+  "cpython" = dontDistribute super."cpython";
+  "cqrs" = dontDistribute super."cqrs";
+  "cqrs-core" = dontDistribute super."cqrs-core";
+  "cqrs-example" = dontDistribute super."cqrs-example";
+  "cqrs-memory" = dontDistribute super."cqrs-memory";
+  "cqrs-postgresql" = dontDistribute super."cqrs-postgresql";
+  "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3";
+  "cqrs-test" = dontDistribute super."cqrs-test";
+  "cqrs-testkit" = dontDistribute super."cqrs-testkit";
+  "cqrs-types" = dontDistribute super."cqrs-types";
+  "cr" = dontDistribute super."cr";
+  "crack" = dontDistribute super."crack";
+  "craftwerk" = dontDistribute super."craftwerk";
+  "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
+  "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
+  "crc16" = dontDistribute super."crc16";
+  "crc16-table" = dontDistribute super."crc16-table";
+  "creatur" = dontDistribute super."creatur";
+  "crf-chain1" = dontDistribute super."crf-chain1";
+  "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained";
+  "crf-chain2-generic" = dontDistribute super."crf-chain2-generic";
+  "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers";
+  "critbit" = dontDistribute super."critbit";
+  "criterion-plus" = dontDistribute super."criterion-plus";
+  "criterion-to-html" = dontDistribute super."criterion-to-html";
+  "crockford" = dontDistribute super."crockford";
+  "crocodile" = dontDistribute super."crocodile";
+  "cron" = doDistribute super."cron_0_3_2";
+  "cron-compat" = dontDistribute super."cron-compat";
+  "cruncher-types" = dontDistribute super."cruncher-types";
+  "crunghc" = dontDistribute super."crunghc";
+  "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks";
+  "crypto-classical" = dontDistribute super."crypto-classical";
+  "crypto-conduit" = dontDistribute super."crypto-conduit";
+  "crypto-enigma" = dontDistribute super."crypto-enigma";
+  "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh";
+  "crypto-random-effect" = dontDistribute super."crypto-random-effect";
+  "crypto-totp" = dontDistribute super."crypto-totp";
+  "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptohash-sha256" = dontDistribute super."cryptohash-sha256";
+  "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
+  "cryptonite-openssl" = dontDistribute super."cryptonite-openssl";
+  "cryptsy-api" = dontDistribute super."cryptsy-api";
+  "crystalfontz" = dontDistribute super."crystalfontz";
+  "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin";
+  "csound-catalog" = dontDistribute super."csound-catalog";
+  "csound-expression" = dontDistribute super."csound-expression";
+  "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic";
+  "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes";
+  "csound-expression-typed" = dontDistribute super."csound-expression-typed";
+  "csound-sampler" = dontDistribute super."csound-sampler";
+  "csp" = dontDistribute super."csp";
+  "cspmchecker" = dontDistribute super."cspmchecker";
+  "css" = dontDistribute super."css";
+  "csv-enumerator" = dontDistribute super."csv-enumerator";
+  "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-table" = dontDistribute super."csv-table";
+  "csv-to-qif" = dontDistribute super."csv-to-qif";
+  "ctemplate" = dontDistribute super."ctemplate";
+  "ctkl" = dontDistribute super."ctkl";
+  "ctpl" = dontDistribute super."ctpl";
+  "cube" = dontDistribute super."cube";
+  "cubical" = dontDistribute super."cubical";
+  "cubicbezier" = dontDistribute super."cubicbezier";
+  "cublas" = dontDistribute super."cublas";
+  "cuboid" = dontDistribute super."cuboid";
+  "cuda" = dontDistribute super."cuda";
+  "cudd" = dontDistribute super."cudd";
+  "cufft" = dontDistribute super."cufft";
+  "curl-aeson" = dontDistribute super."curl-aeson";
+  "curlhs" = dontDistribute super."curlhs";
+  "currency" = dontDistribute super."currency";
+  "current-locale" = dontDistribute super."current-locale";
+  "curry-base" = dontDistribute super."curry-base";
+  "curry-frontend" = dontDistribute super."curry-frontend";
+  "cursedcsv" = dontDistribute super."cursedcsv";
+  "curve25519" = dontDistribute super."curve25519";
+  "curves" = dontDistribute super."curves";
+  "custom-prelude" = dontDistribute super."custom-prelude";
+  "cv-combinators" = dontDistribute super."cv-combinators";
+  "cyclotomic" = dontDistribute super."cyclotomic";
+  "cypher" = dontDistribute super."cypher";
+  "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
+  "d3js" = dontDistribute super."d3js";
+  "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
+  "daemons" = dontDistribute super."daemons";
+  "dag" = dontDistribute super."dag";
+  "damnpacket" = dontDistribute super."damnpacket";
+  "danibot" = dontDistribute super."danibot";
+  "dao" = dontDistribute super."dao";
+  "dapi" = dontDistribute super."dapi";
+  "darcs" = doDistribute super."darcs_2_10_3";
+  "darcs-benchmark" = dontDistribute super."darcs-benchmark";
+  "darcs-beta" = dontDistribute super."darcs-beta";
+  "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
+  "darcs-cabalized" = dontDistribute super."darcs-cabalized";
+  "darcs-fastconvert" = dontDistribute super."darcs-fastconvert";
+  "darcs-graph" = dontDistribute super."darcs-graph";
+  "darcs-monitor" = dontDistribute super."darcs-monitor";
+  "darcs-scripts" = dontDistribute super."darcs-scripts";
+  "darcs2dot" = dontDistribute super."darcs2dot";
+  "darcsden" = dontDistribute super."darcsden";
+  "darcswatch" = dontDistribute super."darcswatch";
+  "darkplaces-demo" = dontDistribute super."darkplaces-demo";
+  "darkplaces-rcon" = dontDistribute super."darkplaces-rcon";
+  "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
+  "darkplaces-text" = dontDistribute super."darkplaces-text";
+  "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib";
+  "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd";
+  "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf";
+  "data-accessor-template" = dontDistribute super."data-accessor-template";
+  "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
+  "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
+  "data-bword" = dontDistribute super."data-bword";
+  "data-carousel" = dontDistribute super."data-carousel";
+  "data-category" = dontDistribute super."data-category";
+  "data-cell" = dontDistribute super."data-cell";
+  "data-checked" = dontDistribute super."data-checked";
+  "data-clist" = dontDistribute super."data-clist";
+  "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
+  "data-construction" = dontDistribute super."data-construction";
+  "data-cycle" = dontDistribute super."data-cycle";
+  "data-default-extra" = dontDistribute super."data-default-extra";
+  "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-base" = doDistribute super."data-default-instances-base_0_0_1";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
+  "data-dispersal" = dontDistribute super."data-dispersal";
+  "data-dword" = dontDistribute super."data-dword";
+  "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
+  "data-endian" = dontDistribute super."data-endian";
+  "data-extend-generic" = dontDistribute super."data-extend-generic";
+  "data-extra" = dontDistribute super."data-extra";
+  "data-filepath" = dontDistribute super."data-filepath";
+  "data-fin" = dontDistribute super."data-fin";
+  "data-fin-simple" = dontDistribute super."data-fin-simple";
+  "data-fix" = dontDistribute super."data-fix";
+  "data-fix-cse" = dontDistribute super."data-fix-cse";
+  "data-flags" = dontDistribute super."data-flags";
+  "data-flagset" = dontDistribute super."data-flagset";
+  "data-fresh" = dontDistribute super."data-fresh";
+  "data-interval" = dontDistribute super."data-interval";
+  "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
+  "data-kiln" = dontDistribute super."data-kiln";
+  "data-layer" = dontDistribute super."data-layer";
+  "data-layout" = dontDistribute super."data-layout";
+  "data-lens" = dontDistribute super."data-lens";
+  "data-lens-fd" = dontDistribute super."data-lens-fd";
+  "data-lens-ixset" = dontDistribute super."data-lens-ixset";
+  "data-lens-template" = dontDistribute super."data-lens-template";
+  "data-list-sequences" = dontDistribute super."data-list-sequences";
+  "data-map-multikey" = dontDistribute super."data-map-multikey";
+  "data-named" = dontDistribute super."data-named";
+  "data-nat" = dontDistribute super."data-nat";
+  "data-object" = dontDistribute super."data-object";
+  "data-object-json" = dontDistribute super."data-object-json";
+  "data-object-yaml" = dontDistribute super."data-object-yaml";
+  "data-or" = dontDistribute super."data-or";
+  "data-partition" = dontDistribute super."data-partition";
+  "data-pprint" = dontDistribute super."data-pprint";
+  "data-quotientref" = dontDistribute super."data-quotientref";
+  "data-r-tree" = dontDistribute super."data-r-tree";
+  "data-ref" = dontDistribute super."data-ref";
+  "data-reify-cse" = dontDistribute super."data-reify-cse";
+  "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
+  "data-rev" = dontDistribute super."data-rev";
+  "data-rope" = dontDistribute super."data-rope";
+  "data-rtuple" = dontDistribute super."data-rtuple";
+  "data-size" = dontDistribute super."data-size";
+  "data-spacepart" = dontDistribute super."data-spacepart";
+  "data-store" = dontDistribute super."data-store";
+  "data-stringmap" = dontDistribute super."data-stringmap";
+  "data-structure-inferrer" = dontDistribute super."data-structure-inferrer";
+  "data-tensor" = dontDistribute super."data-tensor";
+  "data-textual" = dontDistribute super."data-textual";
+  "data-timeout" = dontDistribute super."data-timeout";
+  "data-transform" = dontDistribute super."data-transform";
+  "data-treify" = dontDistribute super."data-treify";
+  "data-type" = dontDistribute super."data-type";
+  "data-util" = dontDistribute super."data-util";
+  "data-variant" = dontDistribute super."data-variant";
+  "database-migrate" = dontDistribute super."database-migrate";
+  "database-study" = dontDistribute super."database-study";
+  "dataenc" = dontDistribute super."dataenc";
+  "dataflow" = dontDistribute super."dataflow";
+  "datalog" = dontDistribute super."datalog";
+  "datapacker" = dontDistribute super."datapacker";
+  "dataurl" = dontDistribute super."dataurl";
+  "date-cache" = dontDistribute super."date-cache";
+  "dates" = dontDistribute super."dates";
+  "datetime" = dontDistribute super."datetime";
+  "datetime-sb" = dontDistribute super."datetime-sb";
+  "dawdle" = dontDistribute super."dawdle";
+  "dawg" = dontDistribute super."dawg";
+  "dbcleaner" = dontDistribute super."dbcleaner";
+  "dbf" = dontDistribute super."dbf";
+  "dbjava" = dontDistribute super."dbjava";
+  "dbmigrations" = doDistribute super."dbmigrations_1_0";
+  "dbus-client" = dontDistribute super."dbus-client";
+  "dbus-core" = dontDistribute super."dbus-core";
+  "dbus-qq" = dontDistribute super."dbus-qq";
+  "dbus-th" = dontDistribute super."dbus-th";
+  "dbus-th-introspection" = dontDistribute super."dbus-th-introspection";
+  "dclabel" = dontDistribute super."dclabel";
+  "dclabel-eci11" = dontDistribute super."dclabel-eci11";
+  "ddc-base" = dontDistribute super."ddc-base";
+  "ddc-build" = dontDistribute super."ddc-build";
+  "ddc-code" = dontDistribute super."ddc-code";
+  "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
+  "ddc-core-eval" = dontDistribute super."ddc-core-eval";
+  "ddc-core-flow" = dontDistribute super."ddc-core-flow";
+  "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
+  "ddc-core-salt" = dontDistribute super."ddc-core-salt";
+  "ddc-core-simpl" = dontDistribute super."ddc-core-simpl";
+  "ddc-core-tetra" = dontDistribute super."ddc-core-tetra";
+  "ddc-driver" = dontDistribute super."ddc-driver";
+  "ddc-interface" = dontDistribute super."ddc-interface";
+  "ddc-source-tetra" = dontDistribute super."ddc-source-tetra";
+  "ddc-tools" = dontDistribute super."ddc-tools";
+  "ddc-war" = dontDistribute super."ddc-war";
+  "ddci-core" = dontDistribute super."ddci-core";
+  "dead-code-detection" = dontDistribute super."dead-code-detection";
+  "dead-simple-json" = dontDistribute super."dead-simple-json";
+  "debian-binary" = dontDistribute super."debian-binary";
+  "debian-build" = dontDistribute super."debian-build";
+  "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
+  "decepticons" = dontDistribute super."decepticons";
+  "decode-utf8" = dontDistribute super."decode-utf8";
+  "decoder-conduit" = dontDistribute super."decoder-conduit";
+  "dedukti" = dontDistribute super."dedukti";
+  "deepcontrol" = dontDistribute super."deepcontrol";
+  "deeplearning-hs" = dontDistribute super."deeplearning-hs";
+  "deepseq-bounded" = dontDistribute super."deepseq-bounded";
+  "deepseq-magic" = dontDistribute super."deepseq-magic";
+  "deepseq-th" = dontDistribute super."deepseq-th";
+  "deepzoom" = dontDistribute super."deepzoom";
+  "defargs" = dontDistribute super."defargs";
+  "definitive-base" = dontDistribute super."definitive-base";
+  "definitive-filesystem" = dontDistribute super."definitive-filesystem";
+  "definitive-graphics" = dontDistribute super."definitive-graphics";
+  "definitive-parser" = dontDistribute super."definitive-parser";
+  "definitive-reactive" = dontDistribute super."definitive-reactive";
+  "definitive-sound" = dontDistribute super."definitive-sound";
+  "deiko-config" = dontDistribute super."deiko-config";
+  "dejafu" = doDistribute super."dejafu_0_2_0_0";
+  "deka" = dontDistribute super."deka";
+  "deka-tests" = dontDistribute super."deka-tests";
+  "delaunay" = dontDistribute super."delaunay";
+  "delay" = dontDistribute super."delay";
+  "delicious" = dontDistribute super."delicious";
+  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
+  "delta" = dontDistribute super."delta";
+  "delta-h" = dontDistribute super."delta-h";
+  "demarcate" = dontDistribute super."demarcate";
+  "denominate" = dontDistribute super."denominate";
+  "dependent-state" = dontDistribute super."dependent-state";
+  "depends" = dontDistribute super."depends";
+  "dephd" = dontDistribute super."dephd";
+  "dequeue" = dontDistribute super."dequeue";
+  "derangement" = dontDistribute super."derangement";
+  "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive-IG" = dontDistribute super."derive-IG";
+  "derive-enumerable" = dontDistribute super."derive-enumerable";
+  "derive-gadt" = dontDistribute super."derive-gadt";
+  "derive-monoid" = dontDistribute super."derive-monoid";
+  "derive-topdown" = dontDistribute super."derive-topdown";
+  "derive-trie" = dontDistribute super."derive-trie";
+  "deriving-compat" = dontDistribute super."deriving-compat";
+  "derp" = dontDistribute super."derp";
+  "derp-lib" = dontDistribute super."derp-lib";
+  "descrilo" = dontDistribute super."descrilo";
+  "despair" = dontDistribute super."despair";
+  "deterministic-game-engine" = dontDistribute super."deterministic-game-engine";
+  "detrospector" = dontDistribute super."detrospector";
+  "deunicode" = dontDistribute super."deunicode";
+  "devil" = dontDistribute super."devil";
+  "dewdrop" = dontDistribute super."dewdrop";
+  "dfrac" = dontDistribute super."dfrac";
+  "dfsbuild" = dontDistribute super."dfsbuild";
+  "dgim" = dontDistribute super."dgim";
+  "dgs" = dontDistribute super."dgs";
+  "dia-base" = dontDistribute super."dia-base";
+  "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
+  "diagrams-canvas" = doDistribute super."diagrams-canvas_1_3_0_3";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_9";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_6";
+  "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
+  "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
+  "diagrams-lib" = doDistribute super."diagrams-lib_1_3_1_1";
+  "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
+  "diagrams-pdf" = dontDistribute super."diagrams-pdf";
+  "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
+  "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
+  "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-tikz" = dontDistribute super."diagrams-tikz";
+  "diagrams-wx" = dontDistribute super."diagrams-wx";
+  "dialog" = dontDistribute super."dialog";
+  "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
+  "dicom" = dontDistribute super."dicom";
+  "dictparser" = dontDistribute super."dictparser";
+  "diet" = dontDistribute super."diet";
+  "diff-gestalt" = dontDistribute super."diff-gestalt";
+  "diff-parse" = dontDistribute super."diff-parse";
+  "diffarray" = dontDistribute super."diffarray";
+  "diffcabal" = dontDistribute super."diffcabal";
+  "diffdump" = dontDistribute super."diffdump";
+  "digamma" = dontDistribute super."digamma";
+  "digest-pure" = dontDistribute super."digest-pure";
+  "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
+  "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
+  "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp";
+  "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty";
+  "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
+  "digit" = dontDistribute super."digit";
+  "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
+  "dimensional-tf" = dontDistribute super."dimensional-tf";
+  "dingo-core" = dontDistribute super."dingo-core";
+  "dingo-example" = dontDistribute super."dingo-example";
+  "dingo-widgets" = dontDistribute super."dingo-widgets";
+  "diophantine" = dontDistribute super."diophantine";
+  "diplomacy" = dontDistribute super."diplomacy";
+  "diplomacy-server" = dontDistribute super."diplomacy-server";
+  "direct-binary-files" = dontDistribute super."direct-binary-files";
+  "direct-daemonize" = dontDistribute super."direct-daemonize";
+  "direct-fastcgi" = dontDistribute super."direct-fastcgi";
+  "direct-http" = dontDistribute super."direct-http";
+  "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
+  "direct-plugins" = dontDistribute super."direct-plugins";
+  "directed-cubical" = dontDistribute super."directed-cubical";
+  "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
+  "dirfiles" = dontDistribute super."dirfiles";
+  "dirstream" = dontDistribute super."dirstream";
+  "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
+  "discordian-calendar" = dontDistribute super."discordian-calendar";
+  "discount" = dontDistribute super."discount";
+  "discrete-space-map" = dontDistribute super."discrete-space-map";
+  "discrimination" = dontDistribute super."discrimination";
+  "disjoint-set" = dontDistribute super."disjoint-set";
+  "disjoint-sets-st" = dontDistribute super."disjoint-sets-st";
+  "dist-upload" = dontDistribute super."dist-upload";
+  "distributed-closure" = dontDistribute super."distributed-closure";
+  "distributed-process" = doDistribute super."distributed-process_0_5_5_1";
+  "distributed-process-async" = dontDistribute super."distributed-process-async";
+  "distributed-process-azure" = dontDistribute super."distributed-process-azure";
+  "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
+  "distributed-process-execution" = dontDistribute super."distributed-process-execution";
+  "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
+  "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
+  "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
+  "distributed-process-platform" = dontDistribute super."distributed-process-platform";
+  "distributed-process-registry" = dontDistribute super."distributed-process-registry";
+  "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet";
+  "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor";
+  "distributed-process-task" = dontDistribute super."distributed-process-task";
+  "distributed-process-tests" = dontDistribute super."distributed-process-tests";
+  "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
+  "distribution" = dontDistribute super."distribution";
+  "distribution-plot" = dontDistribute super."distribution-plot";
+  "dixi" = doDistribute super."dixi_0_6_0_5";
+  "djembe" = dontDistribute super."djembe";
+  "djinn" = dontDistribute super."djinn";
+  "djinn-th" = dontDistribute super."djinn-th";
+  "dnscache" = dontDistribute super."dnscache";
+  "dnsrbl" = dontDistribute super."dnsrbl";
+  "dnssd" = dontDistribute super."dnssd";
+  "doc-review" = dontDistribute super."doc-review";
+  "doccheck" = dontDistribute super."doccheck";
+  "docidx" = dontDistribute super."docidx";
+  "docker" = dontDistribute super."docker";
+  "dockercook" = dontDistribute super."dockercook";
+  "doctest" = doDistribute super."doctest_0_10_1";
+  "doctest-discover" = dontDistribute super."doctest-discover";
+  "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
+  "doctest-prop" = dontDistribute super."doctest-prop";
+  "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
+  "dom-selector" = dontDistribute super."dom-selector";
+  "domain-auth" = dontDistribute super."domain-auth";
+  "dominion" = dontDistribute super."dominion";
+  "domplate" = dontDistribute super."domplate";
+  "dot2graphml" = dontDistribute super."dot2graphml";
+  "dotenv" = doDistribute super."dotenv_0_1_0_9";
+  "dotfs" = dontDistribute super."dotfs";
+  "dotgen" = dontDistribute super."dotgen";
+  "dotnet-timespan" = dontDistribute super."dotnet-timespan";
+  "double-metaphone" = dontDistribute super."double-metaphone";
+  "dove" = dontDistribute super."dove";
+  "dow" = dontDistribute super."dow";
+  "download" = dontDistribute super."download";
+  "download-curl" = dontDistribute super."download-curl";
+  "download-media-content" = dontDistribute super."download-media-content";
+  "dozenal" = dontDistribute super."dozenal";
+  "dozens" = dontDistribute super."dozens";
+  "dph-base" = dontDistribute super."dph-base";
+  "dph-examples" = dontDistribute super."dph-examples";
+  "dph-lifted-base" = dontDistribute super."dph-lifted-base";
+  "dph-lifted-copy" = dontDistribute super."dph-lifted-copy";
+  "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg";
+  "dph-par" = dontDistribute super."dph-par";
+  "dph-prim-interface" = dontDistribute super."dph-prim-interface";
+  "dph-prim-par" = dontDistribute super."dph-prim-par";
+  "dph-prim-seq" = dontDistribute super."dph-prim-seq";
+  "dph-seq" = dontDistribute super."dph-seq";
+  "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
+  "drClickOn" = dontDistribute super."drClickOn";
+  "draw-poker" = dontDistribute super."draw-poker";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "dropbox-sdk" = dontDistribute super."dropbox-sdk";
+  "dropsolve" = dontDistribute super."dropsolve";
+  "ds-kanren" = dontDistribute super."ds-kanren";
+  "dsh-sql" = dontDistribute super."dsh-sql";
+  "dsmc" = dontDistribute super."dsmc";
+  "dsmc-tools" = dontDistribute super."dsmc-tools";
+  "dson" = dontDistribute super."dson";
+  "dson-parsec" = dontDistribute super."dson-parsec";
+  "dsp" = dontDistribute super."dsp";
+  "dstring" = dontDistribute super."dstring";
+  "dtab" = dontDistribute super."dtab";
+  "dtd" = dontDistribute super."dtd";
+  "dtd-text" = dontDistribute super."dtd-text";
+  "dtd-types" = dontDistribute super."dtd-types";
+  "dtrace" = dontDistribute super."dtrace";
+  "dtw" = dontDistribute super."dtw";
+  "dump" = dontDistribute super."dump";
+  "duplo" = dontDistribute super."duplo";
+  "dvda" = dontDistribute super."dvda";
+  "dvdread" = dontDistribute super."dvdread";
+  "dvi-processing" = dontDistribute super."dvi-processing";
+  "dvorak" = dontDistribute super."dvorak";
+  "dwarf" = dontDistribute super."dwarf";
+  "dwarf-el" = dontDistribute super."dwarf-el";
+  "dwarfadt" = dontDistribute super."dwarfadt";
+  "dx9base" = dontDistribute super."dx9base";
+  "dx9d3d" = dontDistribute super."dx9d3d";
+  "dx9d3dx" = dontDistribute super."dx9d3dx";
+  "dynamic-cabal" = dontDistribute super."dynamic-cabal";
+  "dynamic-graph" = dontDistribute super."dynamic-graph";
+  "dynamic-linker-template" = dontDistribute super."dynamic-linker-template";
+  "dynamic-loader" = dontDistribute super."dynamic-loader";
+  "dynamic-mvector" = dontDistribute super."dynamic-mvector";
+  "dynamic-object" = dontDistribute super."dynamic-object";
+  "dynamic-plot" = dontDistribute super."dynamic-plot";
+  "dynamic-pp" = dontDistribute super."dynamic-pp";
+  "dynobud" = dontDistribute super."dynobud";
+  "dywapitchtrack" = dontDistribute super."dywapitchtrack";
+  "dzen-utils" = dontDistribute super."dzen-utils";
+  "eager-sockets" = dontDistribute super."eager-sockets";
+  "easy-api" = dontDistribute super."easy-api";
+  "easy-bitcoin" = dontDistribute super."easy-bitcoin";
+  "easyjson" = dontDistribute super."easyjson";
+  "easyplot" = dontDistribute super."easyplot";
+  "easyrender" = dontDistribute super."easyrender";
+  "ebeats" = dontDistribute super."ebeats";
+  "ebnf-bff" = dontDistribute super."ebnf-bff";
+  "ec2-signature" = dontDistribute super."ec2-signature";
+  "ecdsa" = dontDistribute super."ecdsa";
+  "ecma262" = dontDistribute super."ecma262";
+  "ecu" = dontDistribute super."ecu";
+  "ed25519" = dontDistribute super."ed25519";
+  "ed25519-donna" = dontDistribute super."ed25519-donna";
+  "eddie" = dontDistribute super."eddie";
+  "edenmodules" = dontDistribute super."edenmodules";
+  "edenskel" = dontDistribute super."edenskel";
+  "edentv" = dontDistribute super."edentv";
+  "edge" = dontDistribute super."edge";
+  "edis" = dontDistribute super."edis";
+  "edit-lenses" = dontDistribute super."edit-lenses";
+  "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
+  "editable" = dontDistribute super."editable";
+  "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
+  "effect-monad" = dontDistribute super."effect-monad";
+  "effective-aspects" = dontDistribute super."effective-aspects";
+  "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
+  "effects" = dontDistribute super."effects";
+  "effects-parser" = dontDistribute super."effects-parser";
+  "effin" = dontDistribute super."effin";
+  "egison" = dontDistribute super."egison";
+  "egison-quote" = dontDistribute super."egison-quote";
+  "egison-tutorial" = dontDistribute super."egison-tutorial";
+  "ehaskell" = dontDistribute super."ehaskell";
+  "ehs" = dontDistribute super."ehs";
+  "eibd-client-simple" = dontDistribute super."eibd-client-simple";
+  "eigen" = dontDistribute super."eigen";
+  "eithers" = dontDistribute super."eithers";
+  "ekg-bosun" = dontDistribute super."ekg-bosun";
+  "ekg-carbon" = dontDistribute super."ekg-carbon";
+  "ekg-log" = dontDistribute super."ekg-log";
+  "ekg-push" = dontDistribute super."ekg-push";
+  "ekg-rrd" = dontDistribute super."ekg-rrd";
+  "ekg-statsd" = dontDistribute super."ekg-statsd";
+  "electrum-mnemonic" = dontDistribute super."electrum-mnemonic";
+  "elerea" = dontDistribute super."elerea";
+  "elerea-examples" = dontDistribute super."elerea-examples";
+  "elerea-sdl" = dontDistribute super."elerea-sdl";
+  "elevator" = dontDistribute super."elevator";
+  "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
+  "elm-bridge" = doDistribute super."elm-bridge_0_2_1_1";
+  "elm-build-lib" = dontDistribute super."elm-build-lib";
+  "elm-compiler" = dontDistribute super."elm-compiler";
+  "elm-get" = dontDistribute super."elm-get";
+  "elm-init" = dontDistribute super."elm-init";
+  "elm-make" = dontDistribute super."elm-make";
+  "elm-package" = dontDistribute super."elm-package";
+  "elm-reactor" = dontDistribute super."elm-reactor";
+  "elm-repl" = dontDistribute super."elm-repl";
+  "elm-server" = dontDistribute super."elm-server";
+  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
+  "elocrypt" = dontDistribute super."elocrypt";
+  "emacs-keys" = dontDistribute super."emacs-keys";
+  "email" = dontDistribute super."email";
+  "email-header" = dontDistribute super."email-header";
+  "email-postmark" = dontDistribute super."email-postmark";
+  "email-validator" = dontDistribute super."email-validator";
+  "embeddock" = dontDistribute super."embeddock";
+  "embeddock-example" = dontDistribute super."embeddock-example";
+  "embroidery" = dontDistribute super."embroidery";
+  "emgm" = dontDistribute super."emgm";
+  "empty" = dontDistribute super."empty";
+  "encoding" = dontDistribute super."encoding";
+  "endo" = dontDistribute super."endo";
+  "engine-io-growler" = dontDistribute super."engine-io-growler";
+  "engine-io-snap" = dontDistribute super."engine-io-snap";
+  "engineering-units" = dontDistribute super."engineering-units";
+  "enumerable" = dontDistribute super."enumerable";
+  "enumerate" = dontDistribute super."enumerate";
+  "enumeration" = dontDistribute super."enumeration";
+  "enumerator-fd" = dontDistribute super."enumerator-fd";
+  "enumerator-tf" = dontDistribute super."enumerator-tf";
+  "enumfun" = dontDistribute super."enumfun";
+  "enummapmap" = dontDistribute super."enummapmap";
+  "enummapset" = dontDistribute super."enummapset";
+  "enummapset-th" = dontDistribute super."enummapset-th";
+  "enumset" = dontDistribute super."enumset";
+  "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
+  "envparse" = dontDistribute super."envparse";
+  "epanet-haskell" = dontDistribute super."epanet-haskell";
+  "epass" = dontDistribute super."epass";
+  "epic" = dontDistribute super."epic";
+  "epoll" = dontDistribute super."epoll";
+  "eprocess" = dontDistribute super."eprocess";
+  "epub" = dontDistribute super."epub";
+  "epub-metadata" = dontDistribute super."epub-metadata";
+  "epub-tools" = dontDistribute super."epub-tools";
+  "epubname" = dontDistribute super."epubname";
+  "equal-files" = dontDistribute super."equal-files";
+  "equational-reasoning" = dontDistribute super."equational-reasoning";
+  "erd" = dontDistribute super."erd";
+  "erf-native" = dontDistribute super."erf-native";
+  "erlang" = dontDistribute super."erlang";
+  "eros" = dontDistribute super."eros";
+  "eros-client" = dontDistribute super."eros-client";
+  "eros-http" = dontDistribute super."eros-http";
+  "errno" = dontDistribute super."errno";
+  "error-analyze" = dontDistribute super."error-analyze";
+  "error-continuations" = dontDistribute super."error-continuations";
+  "error-list" = dontDistribute super."error-list";
+  "error-loc" = dontDistribute super."error-loc";
+  "error-location" = dontDistribute super."error-location";
+  "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
+  "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "ersatz" = dontDistribute super."ersatz";
+  "ersatz-toysat" = dontDistribute super."ersatz-toysat";
+  "ert" = dontDistribute super."ert";
+  "esotericbot" = dontDistribute super."esotericbot";
+  "ess" = dontDistribute super."ess";
+  "estimator" = dontDistribute super."estimator";
+  "estimators" = dontDistribute super."estimators";
+  "estreps" = dontDistribute super."estreps";
+  "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
+  "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
+  "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
+  "ethereum-rlp" = dontDistribute super."ethereum-rlp";
+  "ety" = dontDistribute super."ety";
+  "euler" = dontDistribute super."euler";
+  "euphoria" = dontDistribute super."euphoria";
+  "eurofxref" = dontDistribute super."eurofxref";
+  "event-driven" = dontDistribute super."event-driven";
+  "event-handlers" = dontDistribute super."event-handlers";
+  "event-list" = dontDistribute super."event-list";
+  "event-monad" = dontDistribute super."event-monad";
+  "eventloop" = dontDistribute super."eventloop";
+  "eventstore" = doDistribute super."eventstore_0_10_0_2";
+  "every-bit-counts" = dontDistribute super."every-bit-counts";
+  "ewe" = dontDistribute super."ewe";
+  "ex-pool" = dontDistribute super."ex-pool";
+  "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exception-hierarchy" = dontDistribute super."exception-hierarchy";
+  "exception-mailer" = dontDistribute super."exception-mailer";
+  "exception-monads-fd" = dontDistribute super."exception-monads-fd";
+  "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-mtl" = dontDistribute super."exception-mtl";
+  "exherbo-cabal" = dontDistribute super."exherbo-cabal";
+  "exif" = dontDistribute super."exif";
+  "exinst" = dontDistribute super."exinst";
+  "exinst-aeson" = dontDistribute super."exinst-aeson";
+  "exinst-bytes" = dontDistribute super."exinst-bytes";
+  "exinst-deepseq" = dontDistribute super."exinst-deepseq";
+  "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
+  "exists" = dontDistribute super."exists";
+  "exit-codes" = dontDistribute super."exit-codes";
+  "exp-extended" = dontDistribute super."exp-extended";
+  "exp-pairs" = dontDistribute super."exp-pairs";
+  "expand" = dontDistribute super."expand";
+  "expat-enumerator" = dontDistribute super."expat-enumerator";
+  "expiring-mvar" = dontDistribute super."expiring-mvar";
+  "explain" = dontDistribute super."explain";
+  "explicit-determinant" = dontDistribute super."explicit-determinant";
+  "explicit-iomodes" = dontDistribute super."explicit-iomodes";
+  "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring";
+  "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text";
+  "explicit-sharing" = dontDistribute super."explicit-sharing";
+  "explore" = dontDistribute super."explore";
+  "exposed-containers" = dontDistribute super."exposed-containers";
+  "expression-parser" = dontDistribute super."expression-parser";
+  "extcore" = dontDistribute super."extcore";
+  "extemp" = dontDistribute super."extemp";
+  "extended-categories" = dontDistribute super."extended-categories";
+  "extended-reals" = dontDistribute super."extended-reals";
+  "extensible" = dontDistribute super."extensible";
+  "extensible-data" = dontDistribute super."extensible-data";
+  "external-sort" = dontDistribute super."external-sort";
+  "extractelf" = dontDistribute super."extractelf";
+  "ez-couch" = dontDistribute super."ez-couch";
+  "faceted" = dontDistribute super."faceted";
+  "factory" = dontDistribute super."factory";
+  "factual-api" = dontDistribute super."factual-api";
+  "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
+  "failable-list" = dontDistribute super."failable-list";
+  "failure" = dontDistribute super."failure";
+  "fair-predicates" = dontDistribute super."fair-predicates";
+  "fake-type" = dontDistribute super."fake-type";
+  "faker" = dontDistribute super."faker";
+  "falling-turnip" = dontDistribute super."falling-turnip";
+  "fallingblocks" = dontDistribute super."fallingblocks";
+  "family-tree" = dontDistribute super."family-tree";
+  "fast-digits" = dontDistribute super."fast-digits";
+  "fast-math" = dontDistribute super."fast-math";
+  "fast-tags" = dontDistribute super."fast-tags";
+  "fast-tagsoup" = dontDistribute super."fast-tagsoup";
+  "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only";
+  "fastbayes" = dontDistribute super."fastbayes";
+  "fastcgi" = dontDistribute super."fastcgi";
+  "fastedit" = dontDistribute super."fastedit";
+  "fastirc" = dontDistribute super."fastirc";
+  "fault-tree" = dontDistribute super."fault-tree";
+  "fay-geoposition" = dontDistribute super."fay-geoposition";
+  "fay-hsx" = dontDistribute super."fay-hsx";
+  "fay-ref" = dontDistribute super."fay-ref";
+  "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
+  "fcd" = dontDistribute super."fcd";
+  "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
+  "fdo-trash" = dontDistribute super."fdo-trash";
+  "fec" = dontDistribute super."fec";
+  "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed-cli" = dontDistribute super."feed-cli";
+  "feed-collect" = dontDistribute super."feed-collect";
+  "feed-crawl" = dontDistribute super."feed-crawl";
+  "feed-translator" = dontDistribute super."feed-translator";
+  "feed2lj" = dontDistribute super."feed2lj";
+  "feed2twitter" = dontDistribute super."feed2twitter";
+  "feldspar-compiler" = dontDistribute super."feldspar-compiler";
+  "feldspar-language" = dontDistribute super."feldspar-language";
+  "feldspar-signal" = dontDistribute super."feldspar-signal";
+  "fen2s" = dontDistribute super."fen2s";
+  "fences" = dontDistribute super."fences";
+  "fenfire" = dontDistribute super."fenfire";
+  "fez-conf" = dontDistribute super."fez-conf";
+  "ffeed" = dontDistribute super."ffeed";
+  "fficxx" = dontDistribute super."fficxx";
+  "fficxx-runtime" = dontDistribute super."fficxx-runtime";
+  "ffmpeg-light" = dontDistribute super."ffmpeg-light";
+  "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials";
+  "fftwRaw" = dontDistribute super."fftwRaw";
+  "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions";
+  "fgl-visualize" = dontDistribute super."fgl-visualize";
+  "fibon" = dontDistribute super."fibon";
+  "fibonacci" = dontDistribute super."fibonacci";
+  "fields" = dontDistribute super."fields";
+  "fields-json" = dontDistribute super."fields-json";
+  "fieldwise" = dontDistribute super."fieldwise";
+  "fig" = dontDistribute super."fig";
+  "file-collection" = dontDistribute super."file-collection";
+  "file-command-qq" = dontDistribute super."file-command-qq";
+  "filediff" = dontDistribute super."filediff";
+  "filepath-io-access" = dontDistribute super."filepath-io-access";
+  "filepather" = dontDistribute super."filepather";
+  "filestore" = dontDistribute super."filestore";
+  "filesystem-conduit" = dontDistribute super."filesystem-conduit";
+  "filesystem-enumerator" = dontDistribute super."filesystem-enumerator";
+  "filesystem-trees" = dontDistribute super."filesystem-trees";
+  "filtrable" = dontDistribute super."filtrable";
+  "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
+  "find-conduit" = dontDistribute super."find-conduit";
+  "fingertree-tf" = dontDistribute super."fingertree-tf";
+  "finite-field" = dontDistribute super."finite-field";
+  "finite-typelits" = dontDistribute super."finite-typelits";
+  "first-and-last" = dontDistribute super."first-and-last";
+  "first-class-patterns" = dontDistribute super."first-class-patterns";
+  "firstify" = dontDistribute super."firstify";
+  "fishfood" = dontDistribute super."fishfood";
+  "fit" = dontDistribute super."fit";
+  "fitsio" = dontDistribute super."fitsio";
+  "fix-imports" = dontDistribute super."fix-imports";
+  "fix-parser-simple" = dontDistribute super."fix-parser-simple";
+  "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit";
+  "fixed-length" = dontDistribute super."fixed-length";
+  "fixed-point" = dontDistribute super."fixed-point";
+  "fixed-point-vector" = dontDistribute super."fixed-point-vector";
+  "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space";
+  "fixed-precision" = dontDistribute super."fixed-precision";
+  "fixed-storable-array" = dontDistribute super."fixed-storable-array";
+  "fixed-vector-binary" = dontDistribute super."fixed-vector-binary";
+  "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
+  "fixedprec" = dontDistribute super."fixedprec";
+  "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
+  "fixhs" = dontDistribute super."fixhs";
+  "fixplate" = dontDistribute super."fixplate";
+  "fixpoint" = dontDistribute super."fixpoint";
+  "fixtime" = dontDistribute super."fixtime";
+  "fizz-buzz" = dontDistribute super."fizz-buzz";
+  "flaccuraterip" = dontDistribute super."flaccuraterip";
+  "flamethrower" = dontDistribute super."flamethrower";
+  "flamingra" = dontDistribute super."flamingra";
+  "flat-maybe" = dontDistribute super."flat-maybe";
+  "flat-mcmc" = dontDistribute super."flat-mcmc";
+  "flat-tex" = dontDistribute super."flat-tex";
+  "flexible-time" = dontDistribute super."flexible-time";
+  "flexible-unlit" = dontDistribute super."flexible-unlit";
+  "flexiwrap" = dontDistribute super."flexiwrap";
+  "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck";
+  "flickr" = dontDistribute super."flickr";
+  "flippers" = dontDistribute super."flippers";
+  "flite" = dontDistribute super."flite";
+  "flo" = dontDistribute super."flo";
+  "float-binstring" = dontDistribute super."float-binstring";
+  "floating-bits" = dontDistribute super."floating-bits";
+  "floatshow" = dontDistribute super."floatshow";
+  "flow2dot" = dontDistribute super."flow2dot";
+  "flowdock-api" = dontDistribute super."flowdock-api";
+  "flowdock-rest" = dontDistribute super."flowdock-rest";
+  "flower" = dontDistribute super."flower";
+  "flowlocks-framework" = dontDistribute super."flowlocks-framework";
+  "flowsim" = dontDistribute super."flowsim";
+  "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
+  "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
+  "fluent-logger" = dontDistribute super."fluent-logger";
+  "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
+  "fluidsynth" = dontDistribute super."fluidsynth";
+  "fmark" = dontDistribute super."fmark";
+  "fn" = doDistribute super."fn_0_2_0_2";
+  "fn-extra" = doDistribute super."fn-extra_0_2_0_1";
+  "fold-debounce" = dontDistribute super."fold-debounce";
+  "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_6";
+  "foldl-incremental" = dontDistribute super."foldl-incremental";
+  "foldl-transduce" = dontDistribute super."foldl-transduce";
+  "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
+  "folds" = dontDistribute super."folds";
+  "folds-common" = dontDistribute super."folds-common";
+  "follower" = dontDistribute super."follower";
+  "foma" = dontDistribute super."foma";
+  "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6";
+  "foo" = dontDistribute super."foo";
+  "for-free" = dontDistribute super."for-free";
+  "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
+  "fordo" = dontDistribute super."fordo";
+  "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
+  "foreign-var" = dontDistribute super."foreign-var";
+  "forger" = dontDistribute super."forger";
+  "forkable-monad" = dontDistribute super."forkable-monad";
+  "formal" = dontDistribute super."formal";
+  "format" = dontDistribute super."format";
+  "format-status" = dontDistribute super."format-status";
+  "formattable" = dontDistribute super."formattable";
+  "forml" = dontDistribute super."forml";
+  "formlets" = dontDistribute super."formlets";
+  "formlets-hsp" = dontDistribute super."formlets-hsp";
+  "formura" = dontDistribute super."formura";
+  "forth-hll" = dontDistribute super."forth-hll";
+  "foscam-directory" = dontDistribute super."foscam-directory";
+  "foscam-filename" = dontDistribute super."foscam-filename";
+  "foscam-sort" = dontDistribute super."foscam-sort";
+  "fountain" = dontDistribute super."fountain";
+  "fpco-api" = dontDistribute super."fpco-api";
+  "fpipe" = dontDistribute super."fpipe";
+  "fpnla" = dontDistribute super."fpnla";
+  "fpnla-examples" = dontDistribute super."fpnla-examples";
+  "fptest" = dontDistribute super."fptest";
+  "fquery" = dontDistribute super."fquery";
+  "fractal" = dontDistribute super."fractal";
+  "fractals" = dontDistribute super."fractals";
+  "fraction" = dontDistribute super."fraction";
+  "frag" = dontDistribute super."frag";
+  "frame" = dontDistribute super."frame";
+  "frame-markdown" = dontDistribute super."frame-markdown";
+  "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
+  "free-concurrent" = dontDistribute super."free-concurrent";
+  "free-functors" = dontDistribute super."free-functors";
+  "free-game" = dontDistribute super."free-game";
+  "free-http" = dontDistribute super."free-http";
+  "free-operational" = dontDistribute super."free-operational";
+  "free-theorems" = dontDistribute super."free-theorems";
+  "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples";
+  "free-theorems-seq" = dontDistribute super."free-theorems-seq";
+  "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
+  "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
+  "freekick2" = dontDistribute super."freekick2";
+  "freer" = dontDistribute super."freer";
+  "freesect" = dontDistribute super."freesect";
+  "freesound" = dontDistribute super."freesound";
+  "freetype-simple" = dontDistribute super."freetype-simple";
+  "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
+  "fresh" = dontDistribute super."fresh";
+  "friday" = dontDistribute super."friday";
+  "friday-devil" = dontDistribute super."friday-devil";
+  "friday-juicypixels" = dontDistribute super."friday-juicypixels";
+  "friday-scale-dct" = dontDistribute super."friday-scale-dct";
+  "friendly-time" = dontDistribute super."friendly-time";
+  "frown" = dontDistribute super."frown";
+  "frp-arduino" = dontDistribute super."frp-arduino";
+  "frpnow" = dontDistribute super."frpnow";
+  "frpnow-gloss" = dontDistribute super."frpnow-gloss";
+  "frpnow-gtk" = dontDistribute super."frpnow-gtk";
+  "frquotes" = dontDistribute super."frquotes";
+  "fs-events" = dontDistribute super."fs-events";
+  "fsharp" = dontDistribute super."fsharp";
+  "fsmActions" = dontDistribute super."fsmActions";
+  "fst" = dontDistribute super."fst";
+  "fsutils" = dontDistribute super."fsutils";
+  "fswatcher" = dontDistribute super."fswatcher";
+  "ftdi" = dontDistribute super."ftdi";
+  "ftp-conduit" = dontDistribute super."ftp-conduit";
+  "ftphs" = dontDistribute super."ftphs";
+  "ftree" = dontDistribute super."ftree";
+  "ftshell" = dontDistribute super."ftshell";
+  "fugue" = dontDistribute super."fugue";
+  "full-sessions" = dontDistribute super."full-sessions";
+  "full-text-search" = dontDistribute super."full-text-search";
+  "fullstop" = dontDistribute super."fullstop";
+  "funbot" = dontDistribute super."funbot";
+  "funbot-client" = dontDistribute super."funbot-client";
+  "funbot-ext-events" = dontDistribute super."funbot-ext-events";
+  "funbot-git-hook" = dontDistribute super."funbot-git-hook";
+  "funcons-tools" = dontDistribute super."funcons-tools";
+  "function-combine" = dontDistribute super."function-combine";
+  "function-instances-algebra" = dontDistribute super."function-instances-algebra";
+  "functional-arrow" = dontDistribute super."functional-arrow";
+  "functional-kmp" = dontDistribute super."functional-kmp";
+  "functor-apply" = dontDistribute super."functor-apply";
+  "functor-combo" = dontDistribute super."functor-combo";
+  "functor-infix" = dontDistribute super."functor-infix";
+  "functor-monadic" = dontDistribute super."functor-monadic";
+  "functor-utils" = dontDistribute super."functor-utils";
+  "functorm" = dontDistribute super."functorm";
+  "functors" = dontDistribute super."functors";
+  "funion" = dontDistribute super."funion";
+  "funpat" = dontDistribute super."funpat";
+  "funsat" = dontDistribute super."funsat";
+  "fusion" = dontDistribute super."fusion";
+  "futun" = dontDistribute super."futun";
+  "future" = dontDistribute super."future";
+  "future-resource" = dontDistribute super."future-resource";
+  "fuzzy" = dontDistribute super."fuzzy";
+  "fuzzy-timings" = dontDistribute super."fuzzy-timings";
+  "fuzzytime" = dontDistribute super."fuzzytime";
+  "fwgl" = dontDistribute super."fwgl";
+  "fwgl-glfw" = dontDistribute super."fwgl-glfw";
+  "fwgl-javascript" = dontDistribute super."fwgl-javascript";
+  "g-npm" = dontDistribute super."g-npm";
+  "gact" = dontDistribute super."gact";
+  "game-of-life" = dontDistribute super."game-of-life";
+  "game-probability" = dontDistribute super."game-probability";
+  "game-tree" = dontDistribute super."game-tree";
+  "gameclock" = dontDistribute super."gameclock";
+  "gamma" = dontDistribute super."gamma";
+  "gang-of-threads" = dontDistribute super."gang-of-threads";
+  "garepinoh" = dontDistribute super."garepinoh";
+  "garsia-wachs" = dontDistribute super."garsia-wachs";
+  "gbu" = dontDistribute super."gbu";
+  "gc" = dontDistribute super."gc";
+  "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai";
+  "gconf" = dontDistribute super."gconf";
+  "gdiff" = dontDistribute super."gdiff";
+  "gdiff-ig" = dontDistribute super."gdiff-ig";
+  "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
+  "gearbox" = dontDistribute super."gearbox";
+  "geek" = dontDistribute super."geek";
+  "geek-server" = dontDistribute super."geek-server";
+  "gelatin" = dontDistribute super."gelatin";
+  "gemstone" = dontDistribute super."gemstone";
+  "gencheck" = dontDistribute super."gencheck";
+  "gender" = dontDistribute super."gender";
+  "genders" = dontDistribute super."genders";
+  "general-prelude" = dontDistribute super."general-prelude";
+  "generator" = dontDistribute super."generator";
+  "generators" = dontDistribute super."generators";
+  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-binary" = dontDistribute super."generic-binary";
+  "generic-church" = dontDistribute super."generic-church";
+  "generic-deepseq" = dontDistribute super."generic-deepseq";
+  "generic-deriving" = doDistribute super."generic-deriving_1_9_0";
+  "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
+  "generic-maybe" = dontDistribute super."generic-maybe";
+  "generic-pretty" = dontDistribute super."generic-pretty";
+  "generic-server" = dontDistribute super."generic-server";
+  "generic-storable" = dontDistribute super."generic-storable";
+  "generic-tree" = dontDistribute super."generic-tree";
+  "generic-xml" = dontDistribute super."generic-xml";
+  "generics-sop-lens" = dontDistribute super."generics-sop-lens";
+  "genericserialize" = dontDistribute super."genericserialize";
+  "genetics" = dontDistribute super."genetics";
+  "geni-gui" = dontDistribute super."geni-gui";
+  "geni-util" = dontDistribute super."geni-util";
+  "geniconvert" = dontDistribute super."geniconvert";
+  "genifunctors" = dontDistribute super."genifunctors";
+  "geniplate" = dontDistribute super."geniplate";
+  "geniserver" = dontDistribute super."geniserver";
+  "genprog" = dontDistribute super."genprog";
+  "gentlemark" = dontDistribute super."gentlemark";
+  "geo-resolver" = dontDistribute super."geo-resolver";
+  "geo-uk" = dontDistribute super."geo-uk";
+  "geocalc" = dontDistribute super."geocalc";
+  "geocode-google" = dontDistribute super."geocode-google";
+  "geodetic" = dontDistribute super."geodetic";
+  "geodetics" = dontDistribute super."geodetics";
+  "geohash" = dontDistribute super."geohash";
+  "geoip2" = dontDistribute super."geoip2";
+  "geojson" = dontDistribute super."geojson";
+  "geom2d" = dontDistribute super."geom2d";
+  "getemx" = dontDistribute super."getemx";
+  "getflag" = dontDistribute super."getflag";
+  "getopt-simple" = dontDistribute super."getopt-simple";
+  "gf" = dontDistribute super."gf";
+  "ggtsTC" = dontDistribute super."ggtsTC";
+  "ghc-core" = dontDistribute super."ghc-core";
+  "ghc-core-html" = dontDistribute super."ghc-core-html";
+  "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
+  "ghc-dup" = dontDistribute super."ghc-dup";
+  "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
+  "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
+  "ghc-gc-tune" = dontDistribute super."ghc-gc-tune";
+  "ghc-generic-instances" = dontDistribute super."ghc-generic-instances";
+  "ghc-imported-from" = dontDistribute super."ghc-imported-from";
+  "ghc-make" = dontDistribute super."ghc-make";
+  "ghc-man-completion" = dontDistribute super."ghc-man-completion";
+  "ghc-options" = dontDistribute super."ghc-options";
+  "ghc-parmake" = dontDistribute super."ghc-parmake";
+  "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix";
+  "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib";
+  "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph";
+  "ghc-server" = dontDistribute super."ghc-server";
+  "ghc-simple" = dontDistribute super."ghc-simple";
+  "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
+  "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
+  "ghc-vis" = dontDistribute super."ghc-vis";
+  "ghci-diagrams" = dontDistribute super."ghci-diagrams";
+  "ghci-haskeline" = dontDistribute super."ghci-haskeline";
+  "ghci-lib" = dontDistribute super."ghci-lib";
+  "ghci-ng" = dontDistribute super."ghci-ng";
+  "ghci-pretty" = dontDistribute super."ghci-pretty";
+  "ghcid" = doDistribute super."ghcid_0_5_1";
+  "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
+  "ghcjs-dom" = dontDistribute super."ghcjs-dom";
+  "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
+  "ghcjs-hplay" = dontDistribute super."ghcjs-hplay";
+  "ghcjs-websockets" = dontDistribute super."ghcjs-websockets";
+  "ghclive" = dontDistribute super."ghclive";
+  "ghczdecode" = dontDistribute super."ghczdecode";
+  "ght" = dontDistribute super."ght";
+  "gi-atk" = dontDistribute super."gi-atk";
+  "gi-cairo" = dontDistribute super."gi-cairo";
+  "gi-gdk" = dontDistribute super."gi-gdk";
+  "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
+  "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
+  "gi-glib" = dontDistribute super."gi-glib";
+  "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
+  "gi-gtk" = dontDistribute super."gi-gtk";
+  "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
+  "gi-notify" = dontDistribute super."gi-notify";
+  "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
+  "gi-soup" = dontDistribute super."gi-soup";
+  "gi-vte" = dontDistribute super."gi-vte";
+  "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
+  "gimlh" = dontDistribute super."gimlh";
+  "ginger" = dontDistribute super."ginger";
+  "ginsu" = dontDistribute super."ginsu";
+  "giphy-api" = dontDistribute super."giphy-api";
+  "gist" = dontDistribute super."gist";
+  "git-all" = dontDistribute super."git-all";
+  "git-annex" = doDistribute super."git-annex_6_20160114";
+  "git-checklist" = dontDistribute super."git-checklist";
+  "git-date" = dontDistribute super."git-date";
+  "git-embed" = dontDistribute super."git-embed";
+  "git-freq" = dontDistribute super."git-freq";
+  "git-gpush" = dontDistribute super."git-gpush";
+  "git-jump" = dontDistribute super."git-jump";
+  "git-monitor" = dontDistribute super."git-monitor";
+  "git-object" = dontDistribute super."git-object";
+  "git-repair" = dontDistribute super."git-repair";
+  "git-sanity" = dontDistribute super."git-sanity";
+  "git-vogue" = dontDistribute super."git-vogue";
+  "gitHUD" = dontDistribute super."gitHUD";
+  "gitcache" = dontDistribute super."gitcache";
+  "gitdo" = dontDistribute super."gitdo";
+  "github-backup" = dontDistribute super."github-backup";
+  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-utils" = dontDistribute super."github-utils";
+  "gitignore" = dontDistribute super."gitignore";
+  "gitit" = dontDistribute super."gitit";
+  "gitlib-cmdline" = dontDistribute super."gitlib-cmdline";
+  "gitlib-cross" = dontDistribute super."gitlib-cross";
+  "gitlib-s3" = dontDistribute super."gitlib-s3";
+  "gitlib-sample" = dontDistribute super."gitlib-sample";
+  "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitter" = dontDistribute super."gitter";
+  "givegif" = dontDistribute super."givegif";
+  "gl-capture" = dontDistribute super."gl-capture";
+  "glade" = dontDistribute super."glade";
+  "gladexml-accessor" = dontDistribute super."gladexml-accessor";
+  "glambda" = dontDistribute super."glambda";
+  "glapp" = dontDistribute super."glapp";
+  "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
+  "glider-nlp" = dontDistribute super."glider-nlp";
+  "glintcollider" = dontDistribute super."glintcollider";
+  "gll" = dontDistribute super."gll";
+  "global" = dontDistribute super."global";
+  "global-config" = dontDistribute super."global-config";
+  "global-lock" = dontDistribute super."global-lock";
+  "global-variables" = dontDistribute super."global-variables";
+  "glome-hs" = dontDistribute super."glome-hs";
+  "gloss" = dontDistribute super."gloss";
+  "gloss-accelerate" = dontDistribute super."gloss-accelerate";
+  "gloss-algorithms" = dontDistribute super."gloss-algorithms";
+  "gloss-banana" = dontDistribute super."gloss-banana";
+  "gloss-devil" = dontDistribute super."gloss-devil";
+  "gloss-examples" = dontDistribute super."gloss-examples";
+  "gloss-game" = dontDistribute super."gloss-game";
+  "gloss-juicy" = dontDistribute super."gloss-juicy";
+  "gloss-raster" = dontDistribute super."gloss-raster";
+  "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate";
+  "gloss-rendering" = dontDistribute super."gloss-rendering";
+  "gloss-sodium" = dontDistribute super."gloss-sodium";
+  "glpk-hs" = dontDistribute super."glpk-hs";
+  "glue" = dontDistribute super."glue";
+  "glue-common" = dontDistribute super."glue-common";
+  "glue-core" = dontDistribute super."glue-core";
+  "glue-ekg" = dontDistribute super."glue-ekg";
+  "glue-example" = dontDistribute super."glue-example";
+  "gluturtle" = dontDistribute super."gluturtle";
+  "gmap" = dontDistribute super."gmap";
+  "gmndl" = dontDistribute super."gmndl";
+  "gnome-desktop" = dontDistribute super."gnome-desktop";
+  "gnome-keyring" = dontDistribute super."gnome-keyring";
+  "gnomevfs" = dontDistribute super."gnomevfs";
+  "gnss-converters" = dontDistribute super."gnss-converters";
+  "gnuplot" = dontDistribute super."gnuplot";
+  "goa" = dontDistribute super."goa";
+  "goal-core" = dontDistribute super."goal-core";
+  "goal-geometry" = dontDistribute super."goal-geometry";
+  "goal-probability" = dontDistribute super."goal-probability";
+  "goal-simulation" = dontDistribute super."goal-simulation";
+  "goatee" = dontDistribute super."goatee";
+  "goatee-gtk" = dontDistribute super."goatee-gtk";
+  "gofer-prelude" = dontDistribute super."gofer-prelude";
+  "gogol" = dontDistribute super."gogol";
+  "gogol-adexchange-buyer" = dontDistribute super."gogol-adexchange-buyer";
+  "gogol-adexchange-seller" = dontDistribute super."gogol-adexchange-seller";
+  "gogol-admin-datatransfer" = dontDistribute super."gogol-admin-datatransfer";
+  "gogol-admin-directory" = dontDistribute super."gogol-admin-directory";
+  "gogol-admin-emailmigration" = dontDistribute super."gogol-admin-emailmigration";
+  "gogol-admin-reports" = dontDistribute super."gogol-admin-reports";
+  "gogol-adsense" = dontDistribute super."gogol-adsense";
+  "gogol-adsense-host" = dontDistribute super."gogol-adsense-host";
+  "gogol-affiliates" = dontDistribute super."gogol-affiliates";
+  "gogol-analytics" = dontDistribute super."gogol-analytics";
+  "gogol-android-enterprise" = dontDistribute super."gogol-android-enterprise";
+  "gogol-android-publisher" = dontDistribute super."gogol-android-publisher";
+  "gogol-appengine" = dontDistribute super."gogol-appengine";
+  "gogol-apps-activity" = dontDistribute super."gogol-apps-activity";
+  "gogol-apps-calendar" = dontDistribute super."gogol-apps-calendar";
+  "gogol-apps-licensing" = dontDistribute super."gogol-apps-licensing";
+  "gogol-apps-reseller" = dontDistribute super."gogol-apps-reseller";
+  "gogol-apps-tasks" = dontDistribute super."gogol-apps-tasks";
+  "gogol-appstate" = dontDistribute super."gogol-appstate";
+  "gogol-autoscaler" = dontDistribute super."gogol-autoscaler";
+  "gogol-bigquery" = dontDistribute super."gogol-bigquery";
+  "gogol-billing" = dontDistribute super."gogol-billing";
+  "gogol-blogger" = dontDistribute super."gogol-blogger";
+  "gogol-books" = dontDistribute super."gogol-books";
+  "gogol-civicinfo" = dontDistribute super."gogol-civicinfo";
+  "gogol-classroom" = dontDistribute super."gogol-classroom";
+  "gogol-cloudtrace" = dontDistribute super."gogol-cloudtrace";
+  "gogol-compute" = dontDistribute super."gogol-compute";
+  "gogol-container" = dontDistribute super."gogol-container";
+  "gogol-core" = dontDistribute super."gogol-core";
+  "gogol-customsearch" = dontDistribute super."gogol-customsearch";
+  "gogol-dataflow" = dontDistribute super."gogol-dataflow";
+  "gogol-datastore" = dontDistribute super."gogol-datastore";
+  "gogol-debugger" = dontDistribute super."gogol-debugger";
+  "gogol-deploymentmanager" = dontDistribute super."gogol-deploymentmanager";
+  "gogol-dfareporting" = dontDistribute super."gogol-dfareporting";
+  "gogol-discovery" = dontDistribute super."gogol-discovery";
+  "gogol-dns" = dontDistribute super."gogol-dns";
+  "gogol-doubleclick-bids" = dontDistribute super."gogol-doubleclick-bids";
+  "gogol-doubleclick-search" = dontDistribute super."gogol-doubleclick-search";
+  "gogol-drive" = dontDistribute super."gogol-drive";
+  "gogol-fitness" = dontDistribute super."gogol-fitness";
+  "gogol-fonts" = dontDistribute super."gogol-fonts";
+  "gogol-freebasesearch" = dontDistribute super."gogol-freebasesearch";
+  "gogol-fusiontables" = dontDistribute super."gogol-fusiontables";
+  "gogol-games" = dontDistribute super."gogol-games";
+  "gogol-games-configuration" = dontDistribute super."gogol-games-configuration";
+  "gogol-games-management" = dontDistribute super."gogol-games-management";
+  "gogol-genomics" = dontDistribute super."gogol-genomics";
+  "gogol-gmail" = dontDistribute super."gogol-gmail";
+  "gogol-groups-migration" = dontDistribute super."gogol-groups-migration";
+  "gogol-groups-settings" = dontDistribute super."gogol-groups-settings";
+  "gogol-identity-toolkit" = dontDistribute super."gogol-identity-toolkit";
+  "gogol-latencytest" = dontDistribute super."gogol-latencytest";
+  "gogol-logging" = dontDistribute super."gogol-logging";
+  "gogol-maps-coordinate" = dontDistribute super."gogol-maps-coordinate";
+  "gogol-maps-engine" = dontDistribute super."gogol-maps-engine";
+  "gogol-mirror" = dontDistribute super."gogol-mirror";
+  "gogol-monitoring" = dontDistribute super."gogol-monitoring";
+  "gogol-oauth2" = dontDistribute super."gogol-oauth2";
+  "gogol-pagespeed" = dontDistribute super."gogol-pagespeed";
+  "gogol-partners" = dontDistribute super."gogol-partners";
+  "gogol-play-moviespartner" = dontDistribute super."gogol-play-moviespartner";
+  "gogol-plus" = dontDistribute super."gogol-plus";
+  "gogol-plus-domains" = dontDistribute super."gogol-plus-domains";
+  "gogol-prediction" = dontDistribute super."gogol-prediction";
+  "gogol-proximitybeacon" = dontDistribute super."gogol-proximitybeacon";
+  "gogol-pubsub" = dontDistribute super."gogol-pubsub";
+  "gogol-qpxexpress" = dontDistribute super."gogol-qpxexpress";
+  "gogol-replicapool" = dontDistribute super."gogol-replicapool";
+  "gogol-replicapool-updater" = dontDistribute super."gogol-replicapool-updater";
+  "gogol-resourcemanager" = dontDistribute super."gogol-resourcemanager";
+  "gogol-resourceviews" = dontDistribute super."gogol-resourceviews";
+  "gogol-shopping-content" = dontDistribute super."gogol-shopping-content";
+  "gogol-siteverification" = dontDistribute super."gogol-siteverification";
+  "gogol-spectrum" = dontDistribute super."gogol-spectrum";
+  "gogol-sqladmin" = dontDistribute super."gogol-sqladmin";
+  "gogol-storage" = dontDistribute super."gogol-storage";
+  "gogol-storage-transfer" = dontDistribute super."gogol-storage-transfer";
+  "gogol-tagmanager" = dontDistribute super."gogol-tagmanager";
+  "gogol-taskqueue" = dontDistribute super."gogol-taskqueue";
+  "gogol-translate" = dontDistribute super."gogol-translate";
+  "gogol-urlshortener" = dontDistribute super."gogol-urlshortener";
+  "gogol-useraccounts" = dontDistribute super."gogol-useraccounts";
+  "gogol-webmaster-tools" = dontDistribute super."gogol-webmaster-tools";
+  "gogol-youtube" = dontDistribute super."gogol-youtube";
+  "gogol-youtube-analytics" = dontDistribute super."gogol-youtube-analytics";
+  "gogol-youtube-reporting" = dontDistribute super."gogol-youtube-reporting";
+  "gooey" = dontDistribute super."gooey";
+  "google-dictionary" = dontDistribute super."google-dictionary";
+  "google-drive" = dontDistribute super."google-drive";
+  "google-html5-slide" = dontDistribute super."google-html5-slide";
+  "google-mail-filters" = dontDistribute super."google-mail-filters";
+  "google-oauth2" = dontDistribute super."google-oauth2";
+  "google-search" = dontDistribute super."google-search";
+  "googleplus" = dontDistribute super."googleplus";
+  "googlepolyline" = dontDistribute super."googlepolyline";
+  "gopherbot" = dontDistribute super."gopherbot";
+  "gore-and-ash" = dontDistribute super."gore-and-ash";
+  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
+  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
+  "gore-and-ash-glfw" = dontDistribute super."gore-and-ash-glfw";
+  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
+  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
+  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
+  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
+  "gpah" = dontDistribute super."gpah";
+  "gpcsets" = dontDistribute super."gpcsets";
+  "gpio" = dontDistribute super."gpio";
+  "gpolyline" = dontDistribute super."gpolyline";
+  "gps" = dontDistribute super."gps";
+  "gps2htmlReport" = dontDistribute super."gps2htmlReport";
+  "gpx-conduit" = dontDistribute super."gpx-conduit";
+  "graceful" = dontDistribute super."graceful";
+  "grammar-combinators" = dontDistribute super."grammar-combinators";
+  "grapefruit-examples" = dontDistribute super."grapefruit-examples";
+  "grapefruit-frp" = dontDistribute super."grapefruit-frp";
+  "grapefruit-records" = dontDistribute super."grapefruit-records";
+  "grapefruit-ui" = dontDistribute super."grapefruit-ui";
+  "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
+  "graph-generators" = dontDistribute super."graph-generators";
+  "graph-matchings" = dontDistribute super."graph-matchings";
+  "graph-rewriting" = dontDistribute super."graph-rewriting";
+  "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl";
+  "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl";
+  "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope";
+  "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout";
+  "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski";
+  "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies";
+  "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs";
+  "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww";
+  "graph-serialize" = dontDistribute super."graph-serialize";
+  "graph-utils" = dontDistribute super."graph-utils";
+  "graph-visit" = dontDistribute super."graph-visit";
+  "graphbuilder" = dontDistribute super."graphbuilder";
+  "graphene" = dontDistribute super."graphene";
+  "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators";
+  "graphics-formats-collada" = dontDistribute super."graphics-formats-collada";
+  "graphicsFormats" = dontDistribute super."graphicsFormats";
+  "graphicstools" = dontDistribute super."graphicstools";
+  "graphmod" = dontDistribute super."graphmod";
+  "graphql" = dontDistribute super."graphql";
+  "graphtype" = dontDistribute super."graphtype";
+  "grasp" = dontDistribute super."grasp";
+  "gray-code" = dontDistribute super."gray-code";
+  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
+  "greencard" = dontDistribute super."greencard";
+  "greencard-lib" = dontDistribute super."greencard-lib";
+  "greg-client" = dontDistribute super."greg-client";
+  "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
+  "grid" = dontDistribute super."grid";
+  "gridfs" = dontDistribute super."gridfs";
+  "gridland" = dontDistribute super."gridland";
+  "grm" = dontDistribute super."grm";
+  "groundhog-converters" = dontDistribute super."groundhog-converters";
+  "groundhog-inspector" = dontDistribute super."groundhog-inspector";
+  "group-with" = dontDistribute super."group-with";
+  "groupoid" = dontDistribute super."groupoid";
+  "gruff" = dontDistribute super."gruff";
+  "gruff-examples" = dontDistribute super."gruff-examples";
+  "gsc-weighting" = dontDistribute super."gsc-weighting";
+  "gsl-random" = dontDistribute super."gsl-random";
+  "gsl-random-fu" = dontDistribute super."gsl-random-fu";
+  "gsmenu" = dontDistribute super."gsmenu";
+  "gstreamer" = dontDistribute super."gstreamer";
+  "gt-tools" = dontDistribute super."gt-tools";
+  "gtfs" = dontDistribute super."gtfs";
+  "gtk-helpers" = dontDistribute super."gtk-helpers";
+  "gtk-jsinput" = dontDistribute super."gtk-jsinput";
+  "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore";
+  "gtk-mac-integration" = dontDistribute super."gtk-mac-integration";
+  "gtk-serialized-event" = dontDistribute super."gtk-serialized-event";
+  "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view";
+  "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list";
+  "gtk-toy" = dontDistribute super."gtk-toy";
+  "gtk-traymanager" = dontDistribute super."gtk-traymanager";
+  "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade";
+  "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib";
+  "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs";
+  "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk";
+  "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext";
+  "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2";
+  "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th";
+  "gtk2hs-hello" = dontDistribute super."gtk2hs-hello";
+  "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn";
+  "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration";
+  "gtkglext" = dontDistribute super."gtkglext";
+  "gtkimageview" = dontDistribute super."gtkimageview";
+  "gtkrsync" = dontDistribute super."gtkrsync";
+  "gtksourceview2" = dontDistribute super."gtksourceview2";
+  "gtksourceview3" = dontDistribute super."gtksourceview3";
+  "guarded-rewriting" = dontDistribute super."guarded-rewriting";
+  "guess-combinator" = dontDistribute super."guess-combinator";
+  "guid" = dontDistribute super."guid";
+  "gulcii" = dontDistribute super."gulcii";
+  "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis";
+  "gyah-bin" = dontDistribute super."gyah-bin";
+  "h-booru" = dontDistribute super."h-booru";
+  "h-gpgme" = dontDistribute super."h-gpgme";
+  "h2048" = dontDistribute super."h2048";
+  "hArduino" = dontDistribute super."hArduino";
+  "hBDD" = dontDistribute super."hBDD";
+  "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD";
+  "hBDD-CUDD" = dontDistribute super."hBDD-CUDD";
+  "hCsound" = dontDistribute super."hCsound";
+  "hDFA" = dontDistribute super."hDFA";
+  "hF2" = dontDistribute super."hF2";
+  "hGelf" = dontDistribute super."hGelf";
+  "hLLVM" = dontDistribute super."hLLVM";
+  "hMollom" = dontDistribute super."hMollom";
+  "hPDB-examples" = dontDistribute super."hPDB-examples";
+  "hPushover" = dontDistribute super."hPushover";
+  "hR" = dontDistribute super."hR";
+  "hRESP" = dontDistribute super."hRESP";
+  "hS3" = dontDistribute super."hS3";
+  "hScraper" = dontDistribute super."hScraper";
+  "hSimpleDB" = dontDistribute super."hSimpleDB";
+  "hTalos" = dontDistribute super."hTalos";
+  "hTensor" = dontDistribute super."hTensor";
+  "hVOIDP" = dontDistribute super."hVOIDP";
+  "hXmixer" = dontDistribute super."hXmixer";
+  "haar" = dontDistribute super."haar";
+  "hacanon-light" = dontDistribute super."hacanon-light";
+  "hack" = dontDistribute super."hack";
+  "hack-contrib" = dontDistribute super."hack-contrib";
+  "hack-contrib-press" = dontDistribute super."hack-contrib-press";
+  "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack";
+  "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi";
+  "hack-handler-cgi" = dontDistribute super."hack-handler-cgi";
+  "hack-handler-epoll" = dontDistribute super."hack-handler-epoll";
+  "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp";
+  "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi";
+  "hack-handler-happstack" = dontDistribute super."hack-handler-happstack";
+  "hack-handler-hyena" = dontDistribute super."hack-handler-hyena";
+  "hack-handler-kibro" = dontDistribute super."hack-handler-kibro";
+  "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver";
+  "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath";
+  "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession";
+  "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip";
+  "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp";
+  "hack2" = dontDistribute super."hack2";
+  "hack2-contrib" = dontDistribute super."hack2-contrib";
+  "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra";
+  "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server";
+  "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http";
+  "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server";
+  "hack2-handler-warp" = dontDistribute super."hack2-handler-warp";
+  "hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
+  "hackage-diff" = dontDistribute super."hackage-diff";
+  "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-proxy" = dontDistribute super."hackage-proxy";
+  "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
+  "hackage-security" = dontDistribute super."hackage-security";
+  "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
+  "hackage-server" = dontDistribute super."hackage-server";
+  "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage2hwn" = dontDistribute super."hackage2hwn";
+  "hackage2twitter" = dontDistribute super."hackage2twitter";
+  "hackager" = dontDistribute super."hackager";
+  "hackernews" = dontDistribute super."hackernews";
+  "hackertyper" = dontDistribute super."hackertyper";
+  "hackport" = dontDistribute super."hackport";
+  "hactor" = dontDistribute super."hactor";
+  "hactors" = dontDistribute super."hactors";
+  "haddock" = dontDistribute super."haddock";
+  "haddock-leksah" = dontDistribute super."haddock-leksah";
+  "hadoop-formats" = dontDistribute super."hadoop-formats";
+  "hadoop-rpc" = dontDistribute super."hadoop-rpc";
+  "hadoop-tools" = dontDistribute super."hadoop-tools";
+  "haeredes" = dontDistribute super."haeredes";
+  "haggis" = dontDistribute super."haggis";
+  "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
+  "haiji" = dontDistribute super."haiji";
+  "hailgun" = dontDistribute super."hailgun";
+  "hailgun-send" = dontDistribute super."hailgun-send";
+  "hails" = dontDistribute super."hails";
+  "hails-bin" = dontDistribute super."hails-bin";
+  "hairy" = dontDistribute super."hairy";
+  "hakaru" = dontDistribute super."hakaru";
+  "hake" = dontDistribute super."hake";
+  "hakismet" = dontDistribute super."hakismet";
+  "hako" = dontDistribute super."hako";
+  "hakyll" = doDistribute super."hakyll_4_7_5_2";
+  "hakyll-R" = dontDistribute super."hakyll-R";
+  "hakyll-agda" = dontDistribute super."hakyll-agda";
+  "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates";
+  "hakyll-contrib" = dontDistribute super."hakyll-contrib";
+  "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation";
+  "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links";
+  "hakyll-convert" = dontDistribute super."hakyll-convert";
+  "hakyll-elm" = dontDistribute super."hakyll-elm";
+  "hakyll-filestore" = dontDistribute super."hakyll-filestore";
+  "hakyll-sass" = dontDistribute super."hakyll-sass";
+  "halberd" = dontDistribute super."halberd";
+  "halfs" = dontDistribute super."halfs";
+  "halipeto" = dontDistribute super."halipeto";
+  "halive" = dontDistribute super."halive";
+  "halma" = dontDistribute super."halma";
+  "haltavista" = dontDistribute super."haltavista";
+  "hamid" = dontDistribute super."hamid";
+  "hampp" = dontDistribute super."hampp";
+  "hamtmap" = dontDistribute super."hamtmap";
+  "hamusic" = dontDistribute super."hamusic";
+  "handa-gdata" = dontDistribute super."handa-gdata";
+  "handa-geodata" = dontDistribute super."handa-geodata";
+  "handa-opengl" = dontDistribute super."handa-opengl";
+  "handle-like" = dontDistribute super."handle-like";
+  "handsy" = dontDistribute super."handsy";
+  "handwriting" = dontDistribute super."handwriting";
+  "hangman" = dontDistribute super."hangman";
+  "hannahci" = dontDistribute super."hannahci";
+  "hans" = dontDistribute super."hans";
+  "hans-pcap" = dontDistribute super."hans-pcap";
+  "hans-pfq" = dontDistribute super."hans-pfq";
+  "haphviz" = dontDistribute super."haphviz";
+  "happindicator" = dontDistribute super."happindicator";
+  "happindicator3" = dontDistribute super."happindicator3";
+  "happraise" = dontDistribute super."happraise";
+  "happs-hsp" = dontDistribute super."happs-hsp";
+  "happs-hsp-template" = dontDistribute super."happs-hsp-template";
+  "happs-tutorial" = dontDistribute super."happs-tutorial";
+  "happstack" = dontDistribute super."happstack";
+  "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-contrib" = dontDistribute super."happstack-contrib";
+  "happstack-data" = dontDistribute super."happstack-data";
+  "happstack-dlg" = dontDistribute super."happstack-dlg";
+  "happstack-facebook" = dontDistribute super."happstack-facebook";
+  "happstack-fastcgi" = dontDistribute super."happstack-fastcgi";
+  "happstack-fay" = dontDistribute super."happstack-fay";
+  "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax";
+  "happstack-foundation" = dontDistribute super."happstack-foundation";
+  "happstack-hamlet" = dontDistribute super."happstack-hamlet";
+  "happstack-heist" = dontDistribute super."happstack-heist";
+  "happstack-helpers" = dontDistribute super."happstack-helpers";
+  "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate";
+  "happstack-ixset" = dontDistribute super."happstack-ixset";
+  "happstack-lite" = dontDistribute super."happstack-lite";
+  "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
+  "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
+  "happstack-state" = dontDistribute super."happstack-state";
+  "happstack-static-routing" = dontDistribute super."happstack-static-routing";
+  "happstack-util" = dontDistribute super."happstack-util";
+  "happstack-yui" = dontDistribute super."happstack-yui";
+  "happy-meta" = dontDistribute super."happy-meta";
+  "happybara" = dontDistribute super."happybara";
+  "happybara-webkit" = dontDistribute super."happybara-webkit";
+  "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
+  "har" = dontDistribute super."har";
+  "harchive" = dontDistribute super."harchive";
+  "hardware-edsl" = dontDistribute super."hardware-edsl";
+  "hark" = dontDistribute super."hark";
+  "harmony" = dontDistribute super."harmony";
+  "haroonga" = dontDistribute super."haroonga";
+  "haroonga-httpd" = dontDistribute super."haroonga-httpd";
+  "harpy" = dontDistribute super."harpy";
+  "has" = dontDistribute super."has";
+  "has-th" = dontDistribute super."has-th";
+  "hascal" = dontDistribute super."hascal";
+  "hascat" = dontDistribute super."hascat";
+  "hascat-lib" = dontDistribute super."hascat-lib";
+  "hascat-setup" = dontDistribute super."hascat-setup";
+  "hascat-system" = dontDistribute super."hascat-system";
+  "hash" = dontDistribute super."hash";
+  "hashable-generics" = dontDistribute super."hashable-generics";
+  "hashabler" = dontDistribute super."hashabler";
+  "hashed-storage" = dontDistribute super."hashed-storage";
+  "hashids" = dontDistribute super."hashids";
+  "hashring" = dontDistribute super."hashring";
+  "hashtables-plus" = dontDistribute super."hashtables-plus";
+  "hasim" = dontDistribute super."hasim";
+  "hask" = dontDistribute super."hask";
+  "hask-home" = dontDistribute super."hask-home";
+  "haskades" = dontDistribute super."haskades";
+  "haskakafka" = dontDistribute super."haskakafka";
+  "haskanoid" = dontDistribute super."haskanoid";
+  "haskarrow" = dontDistribute super."haskarrow";
+  "haskbot-core" = dontDistribute super."haskbot-core";
+  "haskdeep" = dontDistribute super."haskdeep";
+  "haskdogs" = dontDistribute super."haskdogs";
+  "haskeem" = dontDistribute super."haskeem";
+  "haskeline" = doDistribute super."haskeline_0_7_2_3";
+  "haskeline-class" = dontDistribute super."haskeline-class";
+  "haskell-aliyun" = dontDistribute super."haskell-aliyun";
+  "haskell-awk" = dontDistribute super."haskell-awk";
+  "haskell-bcrypt" = dontDistribute super."haskell-bcrypt";
+  "haskell-brainfuck" = dontDistribute super."haskell-brainfuck";
+  "haskell-cnc" = dontDistribute super."haskell-cnc";
+  "haskell-coffee" = dontDistribute super."haskell-coffee";
+  "haskell-compression" = dontDistribute super."haskell-compression";
+  "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
+  "haskell-docs" = dontDistribute super."haskell-docs";
+  "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-formatter" = dontDistribute super."haskell-formatter";
+  "haskell-ftp" = dontDistribute super."haskell-ftp";
+  "haskell-generate" = dontDistribute super."haskell-generate";
+  "haskell-gi" = dontDistribute super."haskell-gi";
+  "haskell-gi-base" = dontDistribute super."haskell-gi-base";
+  "haskell-import-graph" = dontDistribute super."haskell-import-graph";
+  "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
+  "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
+  "haskell-mpi" = dontDistribute super."haskell-mpi";
+  "haskell-names" = dontDistribute super."haskell-names";
+  "haskell-openflow" = dontDistribute super."haskell-openflow";
+  "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
+  "haskell-platform-test" = dontDistribute super."haskell-platform-test";
+  "haskell-plot" = dontDistribute super."haskell-plot";
+  "haskell-qrencode" = dontDistribute super."haskell-qrencode";
+  "haskell-read-editor" = dontDistribute super."haskell-read-editor";
+  "haskell-reflect" = dontDistribute super."haskell-reflect";
+  "haskell-rules" = dontDistribute super."haskell-rules";
+  "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
+  "haskell-token-utils" = dontDistribute super."haskell-token-utils";
+  "haskell-tor" = dontDistribute super."haskell-tor";
+  "haskell-type-exts" = dontDistribute super."haskell-type-exts";
+  "haskell-typescript" = dontDistribute super."haskell-typescript";
+  "haskell-tyrant" = dontDistribute super."haskell-tyrant";
+  "haskell-updater" = dontDistribute super."haskell-updater";
+  "haskell-xmpp" = dontDistribute super."haskell-xmpp";
+  "haskell2010" = dontDistribute super."haskell2010";
+  "haskell98" = dontDistribute super."haskell98";
+  "haskell98libraries" = dontDistribute super."haskell98libraries";
+  "haskelldb" = dontDistribute super."haskelldb";
+  "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc";
+  "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl";
+  "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf";
+  "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers";
+  "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted";
+  "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic";
+  "haskelldb-flat" = dontDistribute super."haskelldb-flat";
+  "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc";
+  "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql";
+  "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc";
+  "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql";
+  "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3";
+  "haskelldb-hsql" = dontDistribute super."haskelldb-hsql";
+  "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql";
+  "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc";
+  "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle";
+  "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql";
+  "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite";
+  "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3";
+  "haskelldb-th" = dontDistribute super."haskelldb-th";
+  "haskelldb-wx" = dontDistribute super."haskelldb-wx";
+  "haskellscrabble" = dontDistribute super."haskellscrabble";
+  "haskellscript" = dontDistribute super."haskellscript";
+  "haskelm" = dontDistribute super."haskelm";
+  "haskgame" = dontDistribute super."haskgame";
+  "haskheap" = dontDistribute super."haskheap";
+  "haskhol-core" = dontDistribute super."haskhol-core";
+  "haskmon" = dontDistribute super."haskmon";
+  "haskoin" = dontDistribute super."haskoin";
+  "haskoin-core" = dontDistribute super."haskoin-core";
+  "haskoin-crypto" = dontDistribute super."haskoin-crypto";
+  "haskoin-node" = dontDistribute super."haskoin-node";
+  "haskoin-protocol" = dontDistribute super."haskoin-protocol";
+  "haskoin-script" = dontDistribute super."haskoin-script";
+  "haskoin-util" = dontDistribute super."haskoin-util";
+  "haskoin-wallet" = dontDistribute super."haskoin-wallet";
+  "haskoon" = dontDistribute super."haskoon";
+  "haskoon-httpspec" = dontDistribute super."haskoon-httpspec";
+  "haskoon-salvia" = dontDistribute super."haskoon-salvia";
+  "haskore" = dontDistribute super."haskore";
+  "haskore-realtime" = dontDistribute super."haskore-realtime";
+  "haskore-supercollider" = dontDistribute super."haskore-supercollider";
+  "haskore-synthesizer" = dontDistribute super."haskore-synthesizer";
+  "haskore-vintage" = dontDistribute super."haskore-vintage";
+  "hasktags" = dontDistribute super."hasktags";
+  "haslo" = dontDistribute super."haslo";
+  "hasloGUI" = dontDistribute super."hasloGUI";
+  "hasparql-client" = dontDistribute super."hasparql-client";
+  "haspell" = dontDistribute super."haspell";
+  "hasql" = doDistribute super."hasql_0_19_6";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
+  "hasql-pool" = dontDistribute super."hasql-pool";
+  "hasql-postgres" = dontDistribute super."hasql-postgres";
+  "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
+  "hasql-th" = dontDistribute super."hasql-th";
+  "hasql-transaction" = dontDistribute super."hasql-transaction";
+  "hastache-aeson" = dontDistribute super."hastache-aeson";
+  "haste" = dontDistribute super."haste";
+  "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
+  "haste-markup" = dontDistribute super."haste-markup";
+  "haste-perch" = dontDistribute super."haste-perch";
+  "hastily" = dontDistribute super."hastily";
+  "hat" = dontDistribute super."hat";
+  "hatex-guide" = dontDistribute super."hatex-guide";
+  "hath" = dontDistribute super."hath";
+  "hatt" = dontDistribute super."hatt";
+  "haverer" = dontDistribute super."haverer";
+  "hawitter" = dontDistribute super."hawitter";
+  "haxl-amazonka" = dontDistribute super."haxl-amazonka";
+  "haxl-facebook" = dontDistribute super."haxl-facebook";
+  "haxparse" = dontDistribute super."haxparse";
+  "haxr-th" = dontDistribute super."haxr-th";
+  "haxy" = dontDistribute super."haxy";
+  "hayland" = dontDistribute super."hayland";
+  "hayoo-cli" = dontDistribute super."hayoo-cli";
+  "hback" = dontDistribute super."hback";
+  "hbayes" = dontDistribute super."hbayes";
+  "hbb" = dontDistribute super."hbb";
+  "hbcd" = dontDistribute super."hbcd";
+  "hbeat" = dontDistribute super."hbeat";
+  "hblas" = dontDistribute super."hblas";
+  "hblock" = dontDistribute super."hblock";
+  "hbro" = dontDistribute super."hbro";
+  "hbro-contrib" = dontDistribute super."hbro-contrib";
+  "hburg" = dontDistribute super."hburg";
+  "hcc" = dontDistribute super."hcc";
+  "hcg-minus" = dontDistribute super."hcg-minus";
+  "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo";
+  "hcheat" = dontDistribute super."hcheat";
+  "hchesslib" = dontDistribute super."hchesslib";
+  "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
+  "hcron" = dontDistribute super."hcron";
+  "hcube" = dontDistribute super."hcube";
+  "hcwiid" = dontDistribute super."hcwiid";
+  "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix";
+  "hdbc-aeson" = dontDistribute super."hdbc-aeson";
+  "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore";
+  "hdbc-tuple" = dontDistribute super."hdbc-tuple";
+  "hdbi" = dontDistribute super."hdbi";
+  "hdbi-conduit" = dontDistribute super."hdbi-conduit";
+  "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
+  "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
+  "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdf" = dontDistribute super."hdf";
+  "hdigest" = dontDistribute super."hdigest";
+  "hdirect" = dontDistribute super."hdirect";
+  "hdis86" = dontDistribute super."hdis86";
+  "hdiscount" = dontDistribute super."hdiscount";
+  "hdm" = dontDistribute super."hdm";
+  "hdph" = dontDistribute super."hdph";
+  "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
+  "headergen" = dontDistribute super."headergen";
+  "heapsort" = dontDistribute super."heapsort";
+  "hecc" = dontDistribute super."hecc";
+  "hedis-config" = dontDistribute super."hedis-config";
+  "hedis-monadic" = dontDistribute super."hedis-monadic";
+  "hedis-pile" = dontDistribute super."hedis-pile";
+  "hedis-simple" = dontDistribute super."hedis-simple";
+  "hedis-tags" = dontDistribute super."hedis-tags";
+  "hedn" = dontDistribute super."hedn";
+  "hein" = dontDistribute super."hein";
+  "heist-aeson" = dontDistribute super."heist-aeson";
+  "heist-async" = dontDistribute super."heist-async";
+  "helics" = dontDistribute super."helics";
+  "helics-wai" = dontDistribute super."helics-wai";
+  "helisp" = dontDistribute super."helisp";
+  "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
+  "hell" = dontDistribute super."hell";
+  "hellage" = dontDistribute super."hellage";
+  "hellnet" = dontDistribute super."hellnet";
+  "hello" = dontDistribute super."hello";
+  "helm" = dontDistribute super."helm";
+  "help-esb" = dontDistribute super."help-esb";
+  "hemkay" = dontDistribute super."hemkay";
+  "hemkay-core" = dontDistribute super."hemkay-core";
+  "hemokit" = dontDistribute super."hemokit";
+  "hen" = dontDistribute super."hen";
+  "henet" = dontDistribute super."henet";
+  "hepevt" = dontDistribute super."hepevt";
+  "her-lexer" = dontDistribute super."her-lexer";
+  "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
+  "herbalizer" = dontDistribute super."herbalizer";
+  "heredocs" = dontDistribute super."heredocs";
+  "herf-time" = dontDistribute super."herf-time";
+  "hermit" = dontDistribute super."hermit";
+  "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
+  "heroku" = dontDistribute super."heroku";
+  "heroku-persistent" = dontDistribute super."heroku-persistent";
+  "herringbone" = dontDistribute super."herringbone";
+  "herringbone-embed" = dontDistribute super."herringbone-embed";
+  "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
+  "hesql" = dontDistribute super."hesql";
+  "hetero-map" = dontDistribute super."hetero-map";
+  "hetris" = dontDistribute super."hetris";
+  "heukarya" = dontDistribute super."heukarya";
+  "hevolisa" = dontDistribute super."hevolisa";
+  "hevolisa-dph" = dontDistribute super."hevolisa-dph";
+  "hexdump" = dontDistribute super."hexdump";
+  "hexif" = dontDistribute super."hexif";
+  "hexpat-iteratee" = dontDistribute super."hexpat-iteratee";
+  "hexpat-lens" = dontDistribute super."hexpat-lens";
+  "hexpat-pickle" = dontDistribute super."hexpat-pickle";
+  "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic";
+  "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup";
+  "hexpr" = dontDistribute super."hexpr";
+  "hexquote" = dontDistribute super."hexquote";
+  "heyefi" = dontDistribute super."heyefi";
+  "hfann" = dontDistribute super."hfann";
+  "hfd" = dontDistribute super."hfd";
+  "hfiar" = dontDistribute super."hfiar";
+  "hfmt" = dontDistribute super."hfmt";
+  "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
+  "hfov" = dontDistribute super."hfov";
+  "hfractal" = dontDistribute super."hfractal";
+  "hfusion" = dontDistribute super."hfusion";
+  "hg-buildpackage" = dontDistribute super."hg-buildpackage";
+  "hgal" = dontDistribute super."hgal";
+  "hgalib" = dontDistribute super."hgalib";
+  "hgdbmi" = dontDistribute super."hgdbmi";
+  "hgearman" = dontDistribute super."hgearman";
+  "hgen" = dontDistribute super."hgen";
+  "hgeometric" = dontDistribute super."hgeometric";
+  "hgeometry" = dontDistribute super."hgeometry";
+  "hgithub" = dontDistribute super."hgithub";
+  "hgl-example" = dontDistribute super."hgl-example";
+  "hgom" = dontDistribute super."hgom";
+  "hgopher" = dontDistribute super."hgopher";
+  "hgrev" = dontDistribute super."hgrev";
+  "hgrib" = dontDistribute super."hgrib";
+  "hharp" = dontDistribute super."hharp";
+  "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
+  "hiccup" = dontDistribute super."hiccup";
+  "hichi" = dontDistribute super."hichi";
+  "hieraclus" = dontDistribute super."hieraclus";
+  "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams";
+  "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions";
+  "hierarchy" = dontDistribute super."hierarchy";
+  "hiernotify" = dontDistribute super."hiernotify";
+  "highWaterMark" = dontDistribute super."highWaterMark";
+  "higher-leveldb" = dontDistribute super."higher-leveldb";
+  "higherorder" = dontDistribute super."higherorder";
+  "highlight-versions" = dontDistribute super."highlight-versions";
+  "highlighter" = dontDistribute super."highlighter";
+  "highlighter2" = dontDistribute super."highlighter2";
+  "hills" = dontDistribute super."hills";
+  "himerge" = dontDistribute super."himerge";
+  "himg" = dontDistribute super."himg";
+  "himpy" = dontDistribute super."himpy";
+  "hindley-milner" = dontDistribute super."hindley-milner";
+  "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
+  "hinduce-classifier" = dontDistribute super."hinduce-classifier";
+  "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
+  "hinduce-examples" = dontDistribute super."hinduce-examples";
+  "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
+  "hinquire" = dontDistribute super."hinquire";
+  "hinstaller" = dontDistribute super."hinstaller";
+  "hint" = doDistribute super."hint_0_4_3";
+  "hint-server" = dontDistribute super."hint-server";
+  "hinvaders" = dontDistribute super."hinvaders";
+  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
+  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
+  "hipe" = dontDistribute super."hipe";
+  "hips" = dontDistribute super."hips";
+  "hircules" = dontDistribute super."hircules";
+  "hirt" = dontDistribute super."hirt";
+  "hissmetrics" = dontDistribute super."hissmetrics";
+  "hist-pl" = dontDistribute super."hist-pl";
+  "hist-pl-dawg" = dontDistribute super."hist-pl-dawg";
+  "hist-pl-fusion" = dontDistribute super."hist-pl-fusion";
+  "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon";
+  "hist-pl-lmf" = dontDistribute super."hist-pl-lmf";
+  "hist-pl-transliter" = dontDistribute super."hist-pl-transliter";
+  "hist-pl-types" = dontDistribute super."hist-pl-types";
+  "histogram-fill-binary" = dontDistribute super."histogram-fill-binary";
+  "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal";
+  "historian" = dontDistribute super."historian";
+  "hit-graph" = dontDistribute super."hit-graph";
+  "hjcase" = dontDistribute super."hjcase";
+  "hjpath" = dontDistribute super."hjpath";
+  "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_3";
+  "hjson" = dontDistribute super."hjson";
+  "hjson-query" = dontDistribute super."hjson-query";
+  "hjsonpointer" = dontDistribute super."hjsonpointer";
+  "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
+  "hlatex" = dontDistribute super."hlatex";
+  "hlbfgsb" = dontDistribute super."hlbfgsb";
+  "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
+  "hledger-chart" = dontDistribute super."hledger-chart";
+  "hledger-diff" = dontDistribute super."hledger-diff";
+  "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-vty" = dontDistribute super."hledger-vty";
+  "hlibBladeRF" = dontDistribute super."hlibBladeRF";
+  "hlibev" = dontDistribute super."hlibev";
+  "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_31";
+  "hlogger" = dontDistribute super."hlogger";
+  "hlongurl" = dontDistribute super."hlongurl";
+  "hls" = dontDistribute super."hls";
+  "hlwm" = dontDistribute super."hlwm";
+  "hly" = dontDistribute super."hly";
+  "hmark" = dontDistribute super."hmark";
+  "hmarkup" = dontDistribute super."hmarkup";
+  "hmatrix-banded" = dontDistribute super."hmatrix-banded";
+  "hmatrix-csv" = dontDistribute super."hmatrix-csv";
+  "hmatrix-glpk" = dontDistribute super."hmatrix-glpk";
+  "hmatrix-mmap" = dontDistribute super."hmatrix-mmap";
+  "hmatrix-nipals" = dontDistribute super."hmatrix-nipals";
+  "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp";
+  "hmatrix-repa" = dontDistribute super."hmatrix-repa";
+  "hmatrix-special" = dontDistribute super."hmatrix-special";
+  "hmatrix-static" = dontDistribute super."hmatrix-static";
+  "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc";
+  "hmatrix-syntax" = dontDistribute super."hmatrix-syntax";
+  "hmatrix-tests" = dontDistribute super."hmatrix-tests";
+  "hmeap" = dontDistribute super."hmeap";
+  "hmeap-utils" = dontDistribute super."hmeap-utils";
+  "hmemdb" = dontDistribute super."hmemdb";
+  "hmenu" = dontDistribute super."hmenu";
+  "hmidi" = dontDistribute super."hmidi";
+  "hmk" = dontDistribute super."hmk";
+  "hmm" = dontDistribute super."hmm";
+  "hmm-hmatrix" = dontDistribute super."hmm-hmatrix";
+  "hmp3" = dontDistribute super."hmp3";
+  "hmpfr" = dontDistribute super."hmpfr";
+  "hmt" = dontDistribute super."hmt";
+  "hmt-diagrams" = dontDistribute super."hmt-diagrams";
+  "hmumps" = dontDistribute super."hmumps";
+  "hnetcdf" = dontDistribute super."hnetcdf";
+  "hnix" = dontDistribute super."hnix";
+  "hnn" = dontDistribute super."hnn";
+  "hnop" = dontDistribute super."hnop";
+  "ho-rewriting" = dontDistribute super."ho-rewriting";
+  "hoauth" = dontDistribute super."hoauth";
+  "hob" = dontDistribute super."hob";
+  "hobbes" = dontDistribute super."hobbes";
+  "hobbits" = dontDistribute super."hobbits";
+  "hoe" = dontDistribute super."hoe";
+  "hofix-mtl" = dontDistribute super."hofix-mtl";
+  "hog" = dontDistribute super."hog";
+  "hogg" = dontDistribute super."hogg";
+  "hogre" = dontDistribute super."hogre";
+  "hogre-examples" = dontDistribute super."hogre-examples";
+  "hois" = dontDistribute super."hois";
+  "hoist-error" = dontDistribute super."hoist-error";
+  "hold-em" = dontDistribute super."hold-em";
+  "hole" = dontDistribute super."hole";
+  "holey-format" = dontDistribute super."holey-format";
+  "homeomorphic" = dontDistribute super."homeomorphic";
+  "hommage" = dontDistribute super."hommage";
+  "hommage-ds" = dontDistribute super."hommage-ds";
+  "homplexity" = dontDistribute super."homplexity";
+  "honi" = dontDistribute super."honi";
+  "honk" = dontDistribute super."honk";
+  "hoobuddy" = dontDistribute super."hoobuddy";
+  "hood" = dontDistribute super."hood";
+  "hood-off" = dontDistribute super."hood-off";
+  "hood2" = dontDistribute super."hood2";
+  "hoodie" = dontDistribute super."hoodie";
+  "hoodle" = dontDistribute super."hoodle";
+  "hoodle-builder" = dontDistribute super."hoodle-builder";
+  "hoodle-core" = dontDistribute super."hoodle-core";
+  "hoodle-extra" = dontDistribute super."hoodle-extra";
+  "hoodle-parser" = dontDistribute super."hoodle-parser";
+  "hoodle-publish" = dontDistribute super."hoodle-publish";
+  "hoodle-render" = dontDistribute super."hoodle-render";
+  "hoodle-types" = dontDistribute super."hoodle-types";
+  "hoogle-index" = dontDistribute super."hoogle-index";
+  "hooks-dir" = dontDistribute super."hooks-dir";
+  "hoovie" = dontDistribute super."hoovie";
+  "hopencc" = dontDistribute super."hopencc";
+  "hopencl" = dontDistribute super."hopencl";
+  "hopenpgp-tools" = doDistribute super."hopenpgp-tools_0_17_1";
+  "hopfield" = dontDistribute super."hopfield";
+  "hopfield-networks" = dontDistribute super."hopfield-networks";
+  "hopfli" = dontDistribute super."hopfli";
+  "hoppy-generator" = dontDistribute super."hoppy-generator";
+  "hoppy-runtime" = dontDistribute super."hoppy-runtime";
+  "hoppy-std" = dontDistribute super."hoppy-std";
+  "hops" = dontDistribute super."hops";
+  "hoq" = dontDistribute super."hoq";
+  "horizon" = dontDistribute super."horizon";
+  "hosc" = dontDistribute super."hosc";
+  "hosc-json" = dontDistribute super."hosc-json";
+  "hosc-utils" = dontDistribute super."hosc-utils";
+  "hosts-server" = dontDistribute super."hosts-server";
+  "hothasktags" = dontDistribute super."hothasktags";
+  "hotswap" = dontDistribute super."hotswap";
+  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "hp2any-core" = dontDistribute super."hp2any-core";
+  "hp2any-graph" = dontDistribute super."hp2any-graph";
+  "hp2any-manager" = dontDistribute super."hp2any-manager";
+  "hp2html" = dontDistribute super."hp2html";
+  "hp2pretty" = dontDistribute super."hp2pretty";
+  "hpack" = dontDistribute super."hpack";
+  "hpaco" = dontDistribute super."hpaco";
+  "hpaco-lib" = dontDistribute super."hpaco-lib";
+  "hpage" = dontDistribute super."hpage";
+  "hpapi" = dontDistribute super."hpapi";
+  "hpaste" = dontDistribute super."hpaste";
+  "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-strobe" = dontDistribute super."hpc-strobe";
+  "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
+  "hplayground" = dontDistribute super."hplayground";
+  "hplaylist" = dontDistribute super."hplaylist";
+  "hpodder" = dontDistribute super."hpodder";
+  "hpp" = dontDistribute super."hpp";
+  "hpqtypes" = dontDistribute super."hpqtypes";
+  "hprotoc" = doDistribute super."hprotoc_2_1_12";
+  "hprotoc-fork" = dontDistribute super."hprotoc-fork";
+  "hps" = dontDistribute super."hps";
+  "hps-cairo" = dontDistribute super."hps-cairo";
+  "hps-kmeans" = dontDistribute super."hps-kmeans";
+  "hpuz" = dontDistribute super."hpuz";
+  "hpygments" = dontDistribute super."hpygments";
+  "hpylos" = dontDistribute super."hpylos";
+  "hpyrg" = dontDistribute super."hpyrg";
+  "hquantlib" = dontDistribute super."hquantlib";
+  "hquery" = dontDistribute super."hquery";
+  "hranker" = dontDistribute super."hranker";
+  "hreader" = dontDistribute super."hreader";
+  "hricket" = dontDistribute super."hricket";
+  "hruby" = dontDistribute super."hruby";
+  "hs-GeoIP" = dontDistribute super."hs-GeoIP";
+  "hs-blake2" = dontDistribute super."hs-blake2";
+  "hs-captcha" = dontDistribute super."hs-captcha";
+  "hs-carbon" = dontDistribute super."hs-carbon";
+  "hs-carbon-examples" = dontDistribute super."hs-carbon-examples";
+  "hs-cdb" = dontDistribute super."hs-cdb";
+  "hs-dotnet" = dontDistribute super."hs-dotnet";
+  "hs-duktape" = dontDistribute super."hs-duktape";
+  "hs-excelx" = dontDistribute super."hs-excelx";
+  "hs-ffmpeg" = dontDistribute super."hs-ffmpeg";
+  "hs-fltk" = dontDistribute super."hs-fltk";
+  "hs-gchart" = dontDistribute super."hs-gchart";
+  "hs-gen-iface" = dontDistribute super."hs-gen-iface";
+  "hs-gizapp" = dontDistribute super."hs-gizapp";
+  "hs-inspector" = dontDistribute super."hs-inspector";
+  "hs-java" = dontDistribute super."hs-java";
+  "hs-json-rpc" = dontDistribute super."hs-json-rpc";
+  "hs-logo" = dontDistribute super."hs-logo";
+  "hs-mesos" = dontDistribute super."hs-mesos";
+  "hs-nombre-generator" = dontDistribute super."hs-nombre-generator";
+  "hs-pgms" = dontDistribute super."hs-pgms";
+  "hs-php-session" = dontDistribute super."hs-php-session";
+  "hs-pkg-config" = dontDistribute super."hs-pkg-config";
+  "hs-pkpass" = dontDistribute super."hs-pkpass";
+  "hs-re" = dontDistribute super."hs-re";
+  "hs-scrape" = dontDistribute super."hs-scrape";
+  "hs-twitter" = dontDistribute super."hs-twitter";
+  "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver";
+  "hs-vcard" = dontDistribute super."hs-vcard";
+  "hs2048" = dontDistribute super."hs2048";
+  "hs2bf" = dontDistribute super."hs2bf";
+  "hs2dot" = dontDistribute super."hs2dot";
+  "hsConfigure" = dontDistribute super."hsConfigure";
+  "hsSqlite3" = dontDistribute super."hsSqlite3";
+  "hsXenCtrl" = dontDistribute super."hsXenCtrl";
+  "hsay" = dontDistribute super."hsay";
+  "hsb2hs" = dontDistribute super."hsb2hs";
+  "hsbackup" = dontDistribute super."hsbackup";
+  "hsbencher" = dontDistribute super."hsbencher";
+  "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed";
+  "hsbencher-fusion" = dontDistribute super."hsbencher-fusion";
+  "hsc2hs" = dontDistribute super."hsc2hs";
+  "hsc3" = dontDistribute super."hsc3";
+  "hsc3-auditor" = dontDistribute super."hsc3-auditor";
+  "hsc3-cairo" = dontDistribute super."hsc3-cairo";
+  "hsc3-data" = dontDistribute super."hsc3-data";
+  "hsc3-db" = dontDistribute super."hsc3-db";
+  "hsc3-dot" = dontDistribute super."hsc3-dot";
+  "hsc3-forth" = dontDistribute super."hsc3-forth";
+  "hsc3-graphs" = dontDistribute super."hsc3-graphs";
+  "hsc3-lang" = dontDistribute super."hsc3-lang";
+  "hsc3-lisp" = dontDistribute super."hsc3-lisp";
+  "hsc3-plot" = dontDistribute super."hsc3-plot";
+  "hsc3-process" = dontDistribute super."hsc3-process";
+  "hsc3-rec" = dontDistribute super."hsc3-rec";
+  "hsc3-rw" = dontDistribute super."hsc3-rw";
+  "hsc3-server" = dontDistribute super."hsc3-server";
+  "hsc3-sf" = dontDistribute super."hsc3-sf";
+  "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile";
+  "hsc3-unsafe" = dontDistribute super."hsc3-unsafe";
+  "hsc3-utils" = dontDistribute super."hsc3-utils";
+  "hscamwire" = dontDistribute super."hscamwire";
+  "hscassandra" = dontDistribute super."hscassandra";
+  "hscd" = dontDistribute super."hscd";
+  "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
+  "hscope" = dontDistribute super."hscope";
+  "hscrtmpl" = dontDistribute super."hscrtmpl";
+  "hscuid" = dontDistribute super."hscuid";
+  "hscurses" = dontDistribute super."hscurses";
+  "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex";
+  "hsdev" = dontDistribute super."hsdev";
+  "hsdif" = dontDistribute super."hsdif";
+  "hsdip" = dontDistribute super."hsdip";
+  "hsdns" = dontDistribute super."hsdns";
+  "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsemail-ns" = dontDistribute super."hsemail-ns";
+  "hsenv" = dontDistribute super."hsenv";
+  "hserv" = dontDistribute super."hserv";
+  "hset" = dontDistribute super."hset";
+  "hsfacter" = dontDistribute super."hsfacter";
+  "hsfcsh" = dontDistribute super."hsfcsh";
+  "hsfilt" = dontDistribute super."hsfilt";
+  "hsgnutls" = dontDistribute super."hsgnutls";
+  "hsgnutls-yj" = dontDistribute super."hsgnutls-yj";
+  "hsgsom" = dontDistribute super."hsgsom";
+  "hsgtd" = dontDistribute super."hsgtd";
+  "hsharc" = dontDistribute super."hsharc";
+  "hsilop" = dontDistribute super."hsilop";
+  "hsimport" = dontDistribute super."hsimport";
+  "hsini" = dontDistribute super."hsini";
+  "hskeleton" = dontDistribute super."hskeleton";
+  "hslackbuilder" = dontDistribute super."hslackbuilder";
+  "hslibsvm" = dontDistribute super."hslibsvm";
+  "hslinks" = dontDistribute super."hslinks";
+  "hslogger-reader" = dontDistribute super."hslogger-reader";
+  "hslogger-template" = dontDistribute super."hslogger-template";
+  "hslogger4j" = dontDistribute super."hslogger4j";
+  "hslogstash" = dontDistribute super."hslogstash";
+  "hsmagick" = dontDistribute super."hsmagick";
+  "hsmisc" = dontDistribute super."hsmisc";
+  "hsmtpclient" = dontDistribute super."hsmtpclient";
+  "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector";
+  "hsnock" = dontDistribute super."hsnock";
+  "hsnoise" = dontDistribute super."hsnoise";
+  "hsns" = dontDistribute super."hsns";
+  "hsnsq" = dontDistribute super."hsnsq";
+  "hsntp" = dontDistribute super."hsntp";
+  "hsoptions" = dontDistribute super."hsoptions";
+  "hsp-cgi" = dontDistribute super."hsp-cgi";
+  "hsparklines" = dontDistribute super."hsparklines";
+  "hsparql" = dontDistribute super."hsparql";
+  "hspear" = dontDistribute super."hspear";
+  "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
+  "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
+  "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-experimental" = dontDistribute super."hspec-experimental";
+  "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
+  "hspec-server" = dontDistribute super."hspec-server";
+  "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-slow" = dontDistribute super."hspec-slow";
+  "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
+  "hspec-test-framework" = dontDistribute super."hspec-test-framework";
+  "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
+  "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox";
+  "hspec-wai" = doDistribute super."hspec-wai_0_6_5";
+  "hspec2" = dontDistribute super."hspec2";
+  "hspr-sh" = dontDistribute super."hspr-sh";
+  "hspread" = dontDistribute super."hspread";
+  "hspresent" = dontDistribute super."hspresent";
+  "hsprocess" = dontDistribute super."hsprocess";
+  "hsql" = dontDistribute super."hsql";
+  "hsql-mysql" = dontDistribute super."hsql-mysql";
+  "hsql-odbc" = dontDistribute super."hsql-odbc";
+  "hsql-postgresql" = dontDistribute super."hsql-postgresql";
+  "hsql-sqlite3" = dontDistribute super."hsql-sqlite3";
+  "hsqml" = dontDistribute super."hsqml";
+  "hsqml-datamodel" = dontDistribute super."hsqml-datamodel";
+  "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl";
+  "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris";
+  "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes";
+  "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples";
+  "hsqml-morris" = dontDistribute super."hsqml-morris";
+  "hsreadability" = dontDistribute super."hsreadability";
+  "hsseccomp" = dontDistribute super."hsseccomp";
+  "hsshellscript" = dontDistribute super."hsshellscript";
+  "hssourceinfo" = dontDistribute super."hssourceinfo";
+  "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
+  "hstats" = dontDistribute super."hstats";
+  "hstest" = dontDistribute super."hstest";
+  "hstidy" = dontDistribute super."hstidy";
+  "hstorchat" = dontDistribute super."hstorchat";
+  "hstradeking" = dontDistribute super."hstradeking";
+  "hstyle" = dontDistribute super."hstyle";
+  "hstzaar" = dontDistribute super."hstzaar";
+  "hsubconvert" = dontDistribute super."hsubconvert";
+  "hsverilog" = dontDistribute super."hsverilog";
+  "hswip" = dontDistribute super."hswip";
+  "hsx" = dontDistribute super."hsx";
+  "hsx-xhtml" = dontDistribute super."hsx-xhtml";
+  "hsyscall" = dontDistribute super."hsyscall";
+  "hszephyr" = dontDistribute super."hszephyr";
+  "htags" = dontDistribute super."htags";
+  "htar" = dontDistribute super."htar";
+  "htiled" = dontDistribute super."htiled";
+  "htime" = dontDistribute super."htime";
+  "html-email-validate" = dontDistribute super."html-email-validate";
+  "html-entities" = dontDistribute super."html-entities";
+  "html-kure" = dontDistribute super."html-kure";
+  "html-minimalist" = dontDistribute super."html-minimalist";
+  "html-parse" = dontDistribute super."html-parse";
+  "html-rules" = dontDistribute super."html-rules";
+  "html-tokenizer" = dontDistribute super."html-tokenizer";
+  "html-truncate" = dontDistribute super."html-truncate";
+  "html2hamlet" = dontDistribute super."html2hamlet";
+  "html5-entity" = dontDistribute super."html5-entity";
+  "htodo" = dontDistribute super."htodo";
+  "htoml" = dontDistribute super."htoml";
+  "htrace" = dontDistribute super."htrace";
+  "hts" = dontDistribute super."hts";
+  "htsn" = dontDistribute super."htsn";
+  "htsn-common" = dontDistribute super."htsn-common";
+  "htsn-import" = dontDistribute super."htsn-import";
+  "http-attoparsec" = dontDistribute super."http-attoparsec";
+  "http-client-auth" = dontDistribute super."http-client-auth";
+  "http-client-conduit" = dontDistribute super."http-client-conduit";
+  "http-client-lens" = dontDistribute super."http-client-lens";
+  "http-client-multipart" = dontDistribute super."http-client-multipart";
+  "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers";
+  "http-client-session" = dontDistribute super."http-client-session";
+  "http-client-streams" = dontDistribute super."http-client-streams";
+  "http-conduit-browser" = dontDistribute super."http-conduit-browser";
+  "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
+  "http-encodings" = dontDistribute super."http-encodings";
+  "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
+  "http-kit" = dontDistribute super."http-kit";
+  "http-listen" = dontDistribute super."http-listen";
+  "http-monad" = dontDistribute super."http-monad";
+  "http-proxy" = dontDistribute super."http-proxy";
+  "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
+  "http-server" = dontDistribute super."http-server";
+  "http-shed" = dontDistribute super."http-shed";
+  "http-test" = dontDistribute super."http-test";
+  "http-wget" = dontDistribute super."http-wget";
+  "http2" = doDistribute super."http2_1_4_5";
+  "https-everywhere-rules" = dontDistribute super."https-everywhere-rules";
+  "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw";
+  "httpspec" = dontDistribute super."httpspec";
+  "htune" = dontDistribute super."htune";
+  "htzaar" = dontDistribute super."htzaar";
+  "hub" = dontDistribute super."hub";
+  "hubigraph" = dontDistribute super."hubigraph";
+  "hubris" = dontDistribute super."hubris";
+  "huckleberry" = dontDistribute super."huckleberry";
+  "huffman" = dontDistribute super."huffman";
+  "hugs2yc" = dontDistribute super."hugs2yc";
+  "hulk" = dontDistribute super."hulk";
+  "hums" = dontDistribute super."hums";
+  "hunch" = dontDistribute super."hunch";
+  "hunit-dejafu" = doDistribute super."hunit-dejafu_0_2_0_0";
+  "hunit-gui" = dontDistribute super."hunit-gui";
+  "hunit-parsec" = dontDistribute super."hunit-parsec";
+  "hunit-rematch" = dontDistribute super."hunit-rematch";
+  "hunp" = dontDistribute super."hunp";
+  "hunt-searchengine" = dontDistribute super."hunt-searchengine";
+  "hunt-server" = dontDistribute super."hunt-server";
+  "hunt-server-cli" = dontDistribute super."hunt-server-cli";
+  "hurdle" = dontDistribute super."hurdle";
+  "husk-scheme" = dontDistribute super."husk-scheme";
+  "husk-scheme-libs" = dontDistribute super."husk-scheme-libs";
+  "husky" = dontDistribute super."husky";
+  "hutton" = dontDistribute super."hutton";
+  "huttons-razor" = dontDistribute super."huttons-razor";
+  "huzzy" = dontDistribute super."huzzy";
+  "hw-bits" = dontDistribute super."hw-bits";
+  "hw-conduit" = dontDistribute super."hw-conduit";
+  "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
+  "hw-prim" = dontDistribute super."hw-prim";
+  "hw-rankselect" = dontDistribute super."hw-rankselect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
+  "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
+  "hws" = dontDistribute super."hws";
+  "hwsl2" = dontDistribute super."hwsl2";
+  "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector";
+  "hwsl2-reducers" = dontDistribute super."hwsl2-reducers";
+  "hx" = dontDistribute super."hx";
+  "hxmppc" = dontDistribute super."hxmppc";
+  "hxournal" = dontDistribute super."hxournal";
+  "hxt-binary" = dontDistribute super."hxt-binary";
+  "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-extras" = dontDistribute super."hxt-extras";
+  "hxt-filter" = dontDistribute super."hxt-filter";
+  "hxt-xpath" = dontDistribute super."hxt-xpath";
+  "hxt-xslt" = dontDistribute super."hxt-xslt";
+  "hxthelper" = dontDistribute super."hxthelper";
+  "hxweb" = dontDistribute super."hxweb";
+  "hyahtzee" = dontDistribute super."hyahtzee";
+  "hyakko" = dontDistribute super."hyakko";
+  "hybrid" = dontDistribute super."hybrid";
+  "hydra-hs" = dontDistribute super."hydra-hs";
+  "hydra-print" = dontDistribute super."hydra-print";
+  "hydrogen" = dontDistribute super."hydrogen";
+  "hydrogen-cli" = dontDistribute super."hydrogen-cli";
+  "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args";
+  "hydrogen-data" = dontDistribute super."hydrogen-data";
+  "hydrogen-multimap" = dontDistribute super."hydrogen-multimap";
+  "hydrogen-parsing" = dontDistribute super."hydrogen-parsing";
+  "hydrogen-prelude" = dontDistribute super."hydrogen-prelude";
+  "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec";
+  "hydrogen-syntax" = dontDistribute super."hydrogen-syntax";
+  "hydrogen-util" = dontDistribute super."hydrogen-util";
+  "hydrogen-version" = dontDistribute super."hydrogen-version";
+  "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
+  "hylolib" = dontDistribute super."hylolib";
+  "hylotab" = dontDistribute super."hylotab";
+  "hyloutils" = dontDistribute super."hyloutils";
+  "hyperdrive" = dontDistribute super."hyperdrive";
+  "hyperfunctions" = dontDistribute super."hyperfunctions";
+  "hyperpublic" = dontDistribute super."hyperpublic";
+  "hyphenate" = dontDistribute super."hyphenate";
+  "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
+  "hzk" = dontDistribute super."hzk";
+  "i18n" = dontDistribute super."i18n";
+  "iCalendar" = dontDistribute super."iCalendar";
+  "iException" = dontDistribute super."iException";
+  "iap-verifier" = dontDistribute super."iap-verifier";
+  "ib-api" = dontDistribute super."ib-api";
+  "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
+  "ideas" = dontDistribute super."ideas";
+  "ideas-math" = dontDistribute super."ideas-math";
+  "idempotent" = dontDistribute super."idempotent";
+  "identifiers" = dontDistribute super."identifiers";
+  "idiii" = dontDistribute super."idiii";
+  "idna" = dontDistribute super."idna";
+  "idna2008" = dontDistribute super."idna2008";
+  "idris" = dontDistribute super."idris";
+  "ieee" = dontDistribute super."ieee";
+  "ieee-utils" = dontDistribute super."ieee-utils";
+  "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754-parser" = dontDistribute super."ieee754-parser";
+  "ifcxt" = dontDistribute super."ifcxt";
+  "iff" = dontDistribute super."iff";
+  "ifscs" = dontDistribute super."ifscs";
+  "ig" = doDistribute super."ig_0_6_1";
+  "ige-mac-integration" = dontDistribute super."ige-mac-integration";
+  "igraph" = dontDistribute super."igraph";
+  "igrf" = dontDistribute super."igrf";
+  "ihaskell-display" = dontDistribute super."ihaskell-display";
+  "ihaskell-inline-r" = dontDistribute super."ihaskell-inline-r";
+  "ihaskell-parsec" = dontDistribute super."ihaskell-parsec";
+  "ihaskell-plot" = dontDistribute super."ihaskell-plot";
+  "ihaskell-widgets" = dontDistribute super."ihaskell-widgets";
+  "ihttp" = dontDistribute super."ihttp";
+  "illuminate" = dontDistribute super."illuminate";
+  "image-type" = dontDistribute super."image-type";
+  "imagefilters" = dontDistribute super."imagefilters";
+  "imagemagick" = dontDistribute super."imagemagick";
+  "imagepaste" = dontDistribute super."imagepaste";
+  "imap" = dontDistribute super."imap";
+  "imapget" = dontDistribute super."imapget";
+  "imbib" = dontDistribute super."imbib";
+  "imgurder" = dontDistribute super."imgurder";
+  "imm" = dontDistribute super."imm";
+  "imparse" = dontDistribute super."imparse";
+  "imperative-edsl" = dontDistribute super."imperative-edsl";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
+  "implicit" = dontDistribute super."implicit";
+  "implicit-logging" = dontDistribute super."implicit-logging";
+  "implicit-params" = dontDistribute super."implicit-params";
+  "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
+  "improve" = dontDistribute super."improve";
+  "inc-ref" = dontDistribute super."inc-ref";
+  "inch" = dontDistribute super."inch";
+  "incremental-computing" = dontDistribute super."incremental-computing";
+  "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
+  "increments" = dontDistribute super."increments";
+  "indentation" = dontDistribute super."indentation";
+  "indentparser" = dontDistribute super."indentparser";
+  "index-core" = dontDistribute super."index-core";
+  "indexed" = dontDistribute super."indexed";
+  "indexed-do-notation" = dontDistribute super."indexed-do-notation";
+  "indexed-extras" = dontDistribute super."indexed-extras";
+  "indexed-free" = dontDistribute super."indexed-free";
+  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
+  "indices" = dontDistribute super."indices";
+  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
+  "infer-upstream" = dontDistribute super."infer-upstream";
+  "infernu" = dontDistribute super."infernu";
+  "infinite-search" = dontDistribute super."infinite-search";
+  "infinity" = dontDistribute super."infinity";
+  "infix" = dontDistribute super."infix";
+  "inflist" = dontDistribute super."inflist";
+  "influxdb" = dontDistribute super."influxdb";
+  "informative" = dontDistribute super."informative";
+  "inilist" = dontDistribute super."inilist";
+  "inject" = dontDistribute super."inject";
+  "inject-function" = dontDistribute super."inject-function";
+  "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
+  "inquire" = dontDistribute super."inquire";
+  "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
+  "inserts" = dontDistribute super."inserts";
+  "inspection-proxy" = dontDistribute super."inspection-proxy";
+  "instant-aeson" = dontDistribute super."instant-aeson";
+  "instant-bytes" = dontDistribute super."instant-bytes";
+  "instant-deepseq" = dontDistribute super."instant-deepseq";
+  "instant-generics" = dontDistribute super."instant-generics";
+  "instant-hashable" = dontDistribute super."instant-hashable";
+  "instant-zipper" = dontDistribute super."instant-zipper";
+  "instinct" = dontDistribute super."instinct";
+  "instrument-chord" = dontDistribute super."instrument-chord";
+  "int-cast" = dontDistribute super."int-cast";
+  "integer-pure" = dontDistribute super."integer-pure";
+  "intel-aes" = dontDistribute super."intel-aes";
+  "interchangeable" = dontDistribute super."interchangeable";
+  "interleavableGen" = dontDistribute super."interleavableGen";
+  "interleavableIO" = dontDistribute super."interleavableIO";
+  "interleave" = dontDistribute super."interleave";
+  "interlude" = dontDistribute super."interlude";
+  "interlude-l" = dontDistribute super."interlude-l";
+  "intern" = dontDistribute super."intern";
+  "internetmarke" = dontDistribute super."internetmarke";
+  "interpol" = dontDistribute super."interpol";
+  "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
+  "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
+  "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
+  "intricacy" = dontDistribute super."intricacy";
+  "intset" = dontDistribute super."intset";
+  "invertible" = dontDistribute super."invertible";
+  "invertible-syntax" = dontDistribute super."invertible-syntax";
+  "io-capture" = dontDistribute super."io-capture";
+  "io-machine" = dontDistribute super."io-machine";
+  "io-reactive" = dontDistribute super."io-reactive";
+  "io-streams-http" = dontDistribute super."io-streams-http";
+  "io-throttle" = dontDistribute super."io-throttle";
+  "ioctl" = dontDistribute super."ioctl";
+  "ioref-stable" = dontDistribute super."ioref-stable";
+  "iothread" = dontDistribute super."iothread";
+  "iotransaction" = dontDistribute super."iotransaction";
+  "ip-quoter" = dontDistribute super."ip-quoter";
+  "ipatch" = dontDistribute super."ipatch";
+  "ipc" = dontDistribute super."ipc";
+  "ipcvar" = dontDistribute super."ipcvar";
+  "ipopt-hs" = dontDistribute super."ipopt-hs";
+  "ipprint" = dontDistribute super."ipprint";
+  "iptables-helpers" = dontDistribute super."iptables-helpers";
+  "iptadmin" = dontDistribute super."iptadmin";
+  "irc-bytestring" = dontDistribute super."irc-bytestring";
+  "irc-colors" = dontDistribute super."irc-colors";
+  "irc-core" = dontDistribute super."irc-core";
+  "irc-dcc" = dontDistribute super."irc-dcc";
+  "irc-fun-bot" = dontDistribute super."irc-fun-bot";
+  "irc-fun-client" = dontDistribute super."irc-fun-client";
+  "irc-fun-color" = dontDistribute super."irc-fun-color";
+  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
+  "ircbot" = dontDistribute super."ircbot";
+  "ircbouncer" = dontDistribute super."ircbouncer";
+  "ireal" = dontDistribute super."ireal";
+  "iridium" = dontDistribute super."iridium";
+  "iron-mq" = dontDistribute super."iron-mq";
+  "ironforge" = dontDistribute super."ironforge";
+  "is" = dontDistribute super."is";
+  "isdicom" = dontDistribute super."isdicom";
+  "isevaluated" = dontDistribute super."isevaluated";
+  "isiz" = dontDistribute super."isiz";
+  "ismtp" = dontDistribute super."ismtp";
+  "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
+  "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
+  "itanium-abi" = dontDistribute super."itanium-abi";
+  "iter-stats" = dontDistribute super."iter-stats";
+  "iterIO" = dontDistribute super."iterIO";
+  "iteratee" = dontDistribute super."iteratee";
+  "iteratee-compress" = dontDistribute super."iteratee-compress";
+  "iteratee-mtl" = dontDistribute super."iteratee-mtl";
+  "iteratee-parsec" = dontDistribute super."iteratee-parsec";
+  "iteratee-stm" = dontDistribute super."iteratee-stm";
+  "iterio-server" = dontDistribute super."iterio-server";
+  "ivar-simple" = dontDistribute super."ivar-simple";
+  "ivor" = dontDistribute super."ivor";
+  "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
+  "ivory-backend-c" = dontDistribute super."ivory-backend-c";
+  "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
+  "ivory-examples" = dontDistribute super."ivory-examples";
+  "ivory-hw" = dontDistribute super."ivory-hw";
+  "ivory-opts" = dontDistribute super."ivory-opts";
+  "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
+  "ivory-stdlib" = dontDistribute super."ivory-stdlib";
+  "ivy-web" = dontDistribute super."ivy-web";
+  "ixdopp" = dontDistribute super."ixdopp";
+  "ixmonad" = dontDistribute super."ixmonad";
+  "iyql" = dontDistribute super."iyql";
+  "j2hs" = dontDistribute super."j2hs";
+  "ja-base-extra" = dontDistribute super."ja-base-extra";
+  "jack" = dontDistribute super."jack";
+  "jack-bindings" = dontDistribute super."jack-bindings";
+  "jackminimix" = dontDistribute super."jackminimix";
+  "jacobi-roots" = dontDistribute super."jacobi-roots";
+  "jail" = dontDistribute super."jail";
+  "jailbreak-cabal" = dontDistribute super."jailbreak-cabal";
+  "jalaali" = dontDistribute super."jalaali";
+  "jalla" = dontDistribute super."jalla";
+  "jammittools" = dontDistribute super."jammittools";
+  "jarfind" = dontDistribute super."jarfind";
+  "java-bridge" = dontDistribute super."java-bridge";
+  "java-bridge-extras" = dontDistribute super."java-bridge-extras";
+  "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
+  "java-reflect" = dontDistribute super."java-reflect";
+  "javaclass" = dontDistribute super."javaclass";
+  "javasf" = dontDistribute super."javasf";
+  "javav" = dontDistribute super."javav";
+  "jcdecaux-vls" = dontDistribute super."jcdecaux-vls";
+  "jdi" = dontDistribute super."jdi";
+  "jespresso" = dontDistribute super."jespresso";
+  "jobqueue" = dontDistribute super."jobqueue";
+  "join" = dontDistribute super."join";
+  "joinlist" = dontDistribute super."joinlist";
+  "jonathanscard" = dontDistribute super."jonathanscard";
+  "jort" = dontDistribute super."jort";
+  "jose" = dontDistribute super."jose";
+  "jpeg" = dontDistribute super."jpeg";
+  "js-good-parts" = dontDistribute super."js-good-parts";
+  "jsaddle" = dontDistribute super."jsaddle";
+  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
+  "jsc" = dontDistribute super."jsc";
+  "jsmw" = dontDistribute super."jsmw";
+  "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
+  "json-autotype" = doDistribute super."json-autotype_1_0_13";
+  "json-b" = dontDistribute super."json-b";
+  "json-encoder" = dontDistribute super."json-encoder";
+  "json-enumerator" = dontDistribute super."json-enumerator";
+  "json-extra" = dontDistribute super."json-extra";
+  "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
+  "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
+  "json-python" = dontDistribute super."json-python";
+  "json-qq" = dontDistribute super."json-qq";
+  "json-rpc" = dontDistribute super."json-rpc";
+  "json-rpc-client" = dontDistribute super."json-rpc-client";
+  "json-rpc-server" = dontDistribute super."json-rpc-server";
+  "json-sop" = dontDistribute super."json-sop";
+  "json-state" = dontDistribute super."json-state";
+  "json-stream" = dontDistribute super."json-stream";
+  "json-togo" = dontDistribute super."json-togo";
+  "json-tools" = dontDistribute super."json-tools";
+  "json-types" = dontDistribute super."json-types";
+  "json2" = dontDistribute super."json2";
+  "json2-hdbc" = dontDistribute super."json2-hdbc";
+  "json2-types" = dontDistribute super."json2-types";
+  "json2yaml" = dontDistribute super."json2yaml";
+  "jsonresume" = dontDistribute super."jsonresume";
+  "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit";
+  "jsonschema-gen" = dontDistribute super."jsonschema-gen";
+  "jsonsql" = dontDistribute super."jsonsql";
+  "jsontsv" = dontDistribute super."jsontsv";
+  "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
+  "judy" = dontDistribute super."judy";
+  "jukebox" = dontDistribute super."jukebox";
+  "jump" = dontDistribute super."jump";
+  "jumpthefive" = dontDistribute super."jumpthefive";
+  "jvm-parser" = dontDistribute super."jvm-parser";
+  "jwt" = doDistribute super."jwt_0_6_0";
+  "kademlia" = dontDistribute super."kademlia";
+  "kafka-client" = dontDistribute super."kafka-client";
+  "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
+  "kansas-lava" = dontDistribute super."kansas-lava";
+  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
+  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
+  "kansas-lava-shake" = dontDistribute super."kansas-lava-shake";
+  "karakuri" = dontDistribute super."karakuri";
+  "karver" = dontDistribute super."karver";
+  "katip" = dontDistribute super."katip";
+  "katip-elasticsearch" = dontDistribute super."katip-elasticsearch";
+  "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
+  "kbq-gu" = dontDistribute super."kbq-gu";
+  "kd-tree" = dontDistribute super."kd-tree";
+  "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
+  "keera-callbacks" = dontDistribute super."keera-callbacks";
+  "keera-hails-i18n" = dontDistribute super."keera-hails-i18n";
+  "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller";
+  "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk";
+  "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel";
+  "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel";
+  "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config";
+  "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk";
+  "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view";
+  "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk";
+  "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs";
+  "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk";
+  "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network";
+  "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling";
+  "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx";
+  "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa";
+  "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses";
+  "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues";
+  "keera-posture" = dontDistribute super."keera-posture";
+  "keiretsu" = dontDistribute super."keiretsu";
+  "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
+  "keyed" = dontDistribute super."keyed";
+  "keyring" = dontDistribute super."keyring";
+  "keystore" = dontDistribute super."keystore";
+  "keyvaluehash" = dontDistribute super."keyvaluehash";
+  "keyword-args" = dontDistribute super."keyword-args";
+  "kibro" = dontDistribute super."kibro";
+  "kicad-data" = dontDistribute super."kicad-data";
+  "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
+  "kickchan" = dontDistribute super."kickchan";
+  "kif-parser" = dontDistribute super."kif-parser";
+  "kinds" = dontDistribute super."kinds";
+  "kit" = dontDistribute super."kit";
+  "kmeans-par" = dontDistribute super."kmeans-par";
+  "kmeans-vector" = dontDistribute super."kmeans-vector";
+  "knots" = dontDistribute super."knots";
+  "koellner-phonetic" = dontDistribute super."koellner-phonetic";
+  "kontrakcja-templates" = dontDistribute super."kontrakcja-templates";
+  "korfu" = dontDistribute super."korfu";
+  "kqueue" = dontDistribute super."kqueue";
+  "krpc" = dontDistribute super."krpc";
+  "ks-test" = dontDistribute super."ks-test";
+  "ktx" = dontDistribute super."ktx";
+  "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate";
+  "kyotocabinet" = dontDistribute super."kyotocabinet";
+  "l-bfgs-b" = dontDistribute super."l-bfgs-b";
+  "labeled-graph" = dontDistribute super."labeled-graph";
+  "labeled-tree" = dontDistribute super."labeled-tree";
+  "laborantin-hs" = dontDistribute super."laborantin-hs";
+  "labyrinth" = dontDistribute super."labyrinth";
+  "labyrinth-server" = dontDistribute super."labyrinth-server";
+  "lackey" = dontDistribute super."lackey";
+  "lagrangian" = dontDistribute super."lagrangian";
+  "laika" = dontDistribute super."laika";
+  "lambda-ast" = dontDistribute super."lambda-ast";
+  "lambda-bridge" = dontDistribute super."lambda-bridge";
+  "lambda-canvas" = dontDistribute super."lambda-canvas";
+  "lambda-devs" = dontDistribute super."lambda-devs";
+  "lambda-options" = dontDistribute super."lambda-options";
+  "lambda-placeholders" = dontDistribute super."lambda-placeholders";
+  "lambda-toolbox" = dontDistribute super."lambda-toolbox";
+  "lambda2js" = dontDistribute super."lambda2js";
+  "lambdaBase" = dontDistribute super."lambdaBase";
+  "lambdaFeed" = dontDistribute super."lambdaFeed";
+  "lambdaLit" = dontDistribute super."lambdaLit";
+  "lambdabot" = dontDistribute super."lambdabot";
+  "lambdabot-core" = dontDistribute super."lambdabot-core";
+  "lambdabot-haskell-plugins" = dontDistribute super."lambdabot-haskell-plugins";
+  "lambdabot-irc-plugins" = dontDistribute super."lambdabot-irc-plugins";
+  "lambdabot-misc-plugins" = dontDistribute super."lambdabot-misc-plugins";
+  "lambdabot-novelty-plugins" = dontDistribute super."lambdabot-novelty-plugins";
+  "lambdabot-reference-plugins" = dontDistribute super."lambdabot-reference-plugins";
+  "lambdabot-social-plugins" = dontDistribute super."lambdabot-social-plugins";
+  "lambdabot-trusted" = dontDistribute super."lambdabot-trusted";
+  "lambdabot-utils" = dontDistribute super."lambdabot-utils";
+  "lambdacat" = dontDistribute super."lambdacat";
+  "lambdacms-core" = dontDistribute super."lambdacms-core";
+  "lambdacms-media" = dontDistribute super."lambdacms-media";
+  "lambdacube" = dontDistribute super."lambdacube";
+  "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
+  "lambdacube-core" = dontDistribute super."lambdacube-core";
+  "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
+  "lambdacube-engine" = dontDistribute super."lambdacube-engine";
+  "lambdacube-examples" = dontDistribute super."lambdacube-examples";
+  "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
+  "lambdacube-samples" = dontDistribute super."lambdacube-samples";
+  "lambdatex" = dontDistribute super."lambdatex";
+  "lambdatwit" = dontDistribute super."lambdatwit";
+  "lambdaya-bus" = dontDistribute super."lambdaya-bus";
+  "lambdiff" = dontDistribute super."lambdiff";
+  "lame-tester" = dontDistribute super."lame-tester";
+  "language-asn1" = dontDistribute super."language-asn1";
+  "language-bash" = dontDistribute super."language-bash";
+  "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
+  "language-c-comments" = dontDistribute super."language-c-comments";
+  "language-c-inline" = dontDistribute super."language-c-inline";
+  "language-c-quote" = dontDistribute super."language-c-quote";
+  "language-cil" = dontDistribute super."language-cil";
+  "language-css" = dontDistribute super."language-css";
+  "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
+  "language-eiffel" = dontDistribute super."language-eiffel";
+  "language-fortran" = dontDistribute super."language-fortran";
+  "language-gcl" = dontDistribute super."language-gcl";
+  "language-go" = dontDistribute super."language-go";
+  "language-guess" = dontDistribute super."language-guess";
+  "language-java-classfile" = dontDistribute super."language-java-classfile";
+  "language-javascript" = doDistribute super."language-javascript_0_5_14_7";
+  "language-kort" = dontDistribute super."language-kort";
+  "language-lua" = dontDistribute super."language-lua";
+  "language-lua-qq" = dontDistribute super."language-lua-qq";
+  "language-mixal" = dontDistribute super."language-mixal";
+  "language-objc" = dontDistribute super."language-objc";
+  "language-openscad" = dontDistribute super."language-openscad";
+  "language-pig" = dontDistribute super."language-pig";
+  "language-puppet" = dontDistribute super."language-puppet";
+  "language-python" = dontDistribute super."language-python";
+  "language-python-colour" = dontDistribute super."language-python-colour";
+  "language-python-test" = dontDistribute super."language-python-test";
+  "language-qux" = dontDistribute super."language-qux";
+  "language-sh" = dontDistribute super."language-sh";
+  "language-slice" = dontDistribute super."language-slice";
+  "language-spelling" = dontDistribute super."language-spelling";
+  "language-sqlite" = dontDistribute super."language-sqlite";
+  "language-thrift" = doDistribute super."language-thrift_0_7_0_1";
+  "language-typescript" = dontDistribute super."language-typescript";
+  "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
+  "lat" = dontDistribute super."lat";
+  "latest-npm-version" = dontDistribute super."latest-npm-version";
+  "latex" = dontDistribute super."latex";
+  "launchpad-control" = dontDistribute super."launchpad-control";
+  "lax" = dontDistribute super."lax";
+  "layers" = dontDistribute super."layers";
+  "layers-game" = dontDistribute super."layers-game";
+  "layout" = dontDistribute super."layout";
+  "layout-bootstrap" = dontDistribute super."layout-bootstrap";
+  "lazy-io" = dontDistribute super."lazy-io";
+  "lazyarray" = dontDistribute super."lazyarray";
+  "lazyio" = dontDistribute super."lazyio";
+  "lazysmallcheck" = dontDistribute super."lazysmallcheck";
+  "lazysplines" = dontDistribute super."lazysplines";
+  "lbfgs" = dontDistribute super."lbfgs";
+  "lcs" = dontDistribute super."lcs";
+  "lda" = dontDistribute super."lda";
+  "ldap-client" = dontDistribute super."ldap-client";
+  "ldif" = dontDistribute super."ldif";
+  "leaf" = dontDistribute super."leaf";
+  "leaky" = dontDistribute super."leaky";
+  "leancheck" = dontDistribute super."leancheck";
+  "leankit-api" = dontDistribute super."leankit-api";
+  "leapseconds-announced" = dontDistribute super."leapseconds-announced";
+  "learn" = dontDistribute super."learn";
+  "learn-physics" = dontDistribute super."learn-physics";
+  "learn-physics-examples" = dontDistribute super."learn-physics-examples";
+  "learning-hmm" = dontDistribute super."learning-hmm";
+  "leetify" = dontDistribute super."leetify";
+  "leksah" = dontDistribute super."leksah";
+  "leksah-server" = dontDistribute super."leksah-server";
+  "lendingclub" = dontDistribute super."lendingclub";
+  "lens-datetime" = dontDistribute super."lens-datetime";
+  "lens-prelude" = dontDistribute super."lens-prelude";
+  "lens-properties" = dontDistribute super."lens-properties";
+  "lens-sop" = dontDistribute super."lens-sop";
+  "lens-text-encoding" = dontDistribute super."lens-text-encoding";
+  "lens-time" = dontDistribute super."lens-time";
+  "lens-tutorial" = dontDistribute super."lens-tutorial";
+  "lens-utils" = dontDistribute super."lens-utils";
+  "lenses" = dontDistribute super."lenses";
+  "lensref" = dontDistribute super."lensref";
+  "lenz" = dontDistribute super."lenz";
+  "lenz-template" = dontDistribute super."lenz-template";
+  "level-monad" = dontDistribute super."level-monad";
+  "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
+  "levmar" = dontDistribute super."levmar";
+  "levmar-chart" = dontDistribute super."levmar-chart";
+  "lfst" = dontDistribute super."lfst";
+  "lgtk" = dontDistribute super."lgtk";
+  "lha" = dontDistribute super."lha";
+  "lhae" = dontDistribute super."lhae";
+  "lhc" = dontDistribute super."lhc";
+  "lhe" = dontDistribute super."lhe";
+  "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl";
+  "lhs2html" = dontDistribute super."lhs2html";
+  "lhslatex" = dontDistribute super."lhslatex";
+  "libGenI" = dontDistribute super."libGenI";
+  "libarchive-conduit" = dontDistribute super."libarchive-conduit";
+  "libconfig" = dontDistribute super."libconfig";
+  "libcspm" = dontDistribute super."libcspm";
+  "libexpect" = dontDistribute super."libexpect";
+  "libffi" = dontDistribute super."libffi";
+  "libgraph" = dontDistribute super."libgraph";
+  "libhbb" = dontDistribute super."libhbb";
+  "libjenkins" = dontDistribute super."libjenkins";
+  "liblastfm" = dontDistribute super."liblastfm";
+  "liblinear-enumerator" = dontDistribute super."liblinear-enumerator";
+  "libltdl" = dontDistribute super."libltdl";
+  "libmpd" = dontDistribute super."libmpd";
+  "libnvvm" = dontDistribute super."libnvvm";
+  "liboleg" = dontDistribute super."liboleg";
+  "libpafe" = dontDistribute super."libpafe";
+  "libpq" = dontDistribute super."libpq";
+  "librandomorg" = dontDistribute super."librandomorg";
+  "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
+  "libssh2" = dontDistribute super."libssh2";
+  "libssh2-conduit" = dontDistribute super."libssh2-conduit";
+  "libstackexchange" = dontDistribute super."libstackexchange";
+  "libsystemd-daemon" = dontDistribute super."libsystemd-daemon";
+  "libtagc" = dontDistribute super."libtagc";
+  "libvirt-hs" = dontDistribute super."libvirt-hs";
+  "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
+  "libxml" = dontDistribute super."libxml";
+  "libxml-enumerator" = dontDistribute super."libxml-enumerator";
+  "libxslt" = dontDistribute super."libxslt";
+  "life" = dontDistribute super."life";
+  "lift-generics" = dontDistribute super."lift-generics";
+  "lifted-threads" = dontDistribute super."lifted-threads";
+  "lifter" = dontDistribute super."lifter";
+  "ligature" = dontDistribute super."ligature";
+  "ligd" = dontDistribute super."ligd";
+  "lighttpd-conf" = dontDistribute super."lighttpd-conf";
+  "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq";
+  "lilypond" = dontDistribute super."lilypond";
+  "limp" = dontDistribute super."limp";
+  "limp-cbc" = dontDistribute super."limp-cbc";
+  "lin-alg" = dontDistribute super."lin-alg";
+  "linda" = dontDistribute super."linda";
+  "lindenmayer" = dontDistribute super."lindenmayer";
+  "line-break" = dontDistribute super."line-break";
+  "line2pdf" = dontDistribute super."line2pdf";
+  "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas";
+  "linear-circuit" = dontDistribute super."linear-circuit";
+  "linear-grammar" = dontDistribute super."linear-grammar";
+  "linear-maps" = dontDistribute super."linear-maps";
+  "linear-opengl" = dontDistribute super."linear-opengl";
+  "linear-vect" = dontDistribute super."linear-vect";
+  "linearEqSolver" = dontDistribute super."linearEqSolver";
+  "linearscan" = dontDistribute super."linearscan";
+  "linearscan-hoopl" = dontDistribute super."linearscan-hoopl";
+  "linebreak" = dontDistribute super."linebreak";
+  "linguistic-ordinals" = dontDistribute super."linguistic-ordinals";
+  "link-relations" = dontDistribute super."link-relations";
+  "linkchk" = dontDistribute super."linkchk";
+  "linkcore" = dontDistribute super."linkcore";
+  "linkedhashmap" = dontDistribute super."linkedhashmap";
+  "linklater" = dontDistribute super."linklater";
+  "linode" = dontDistribute super."linode";
+  "linux-blkid" = dontDistribute super."linux-blkid";
+  "linux-cgroup" = dontDistribute super."linux-cgroup";
+  "linux-evdev" = dontDistribute super."linux-evdev";
+  "linux-inotify" = dontDistribute super."linux-inotify";
+  "linux-kmod" = dontDistribute super."linux-kmod";
+  "linux-mount" = dontDistribute super."linux-mount";
+  "linux-perf" = dontDistribute super."linux-perf";
+  "linux-ptrace" = dontDistribute super."linux-ptrace";
+  "linux-xattr" = dontDistribute super."linux-xattr";
+  "linx-gateway" = dontDistribute super."linx-gateway";
+  "lio" = dontDistribute super."lio";
+  "lio-eci11" = dontDistribute super."lio-eci11";
+  "lio-fs" = dontDistribute super."lio-fs";
+  "lio-simple" = dontDistribute super."lio-simple";
+  "lipsum-gen" = dontDistribute super."lipsum-gen";
+  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
+  "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
+  "lispparser" = dontDistribute super."lispparser";
+  "list-extras" = dontDistribute super."list-extras";
+  "list-grouping" = dontDistribute super."list-grouping";
+  "list-mux" = dontDistribute super."list-mux";
+  "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t-attoparsec" = dontDistribute super."list-t-attoparsec";
+  "list-t-html-parser" = dontDistribute super."list-t-html-parser";
+  "list-t-http-client" = dontDistribute super."list-t-http-client";
+  "list-t-libcurl" = dontDistribute super."list-t-libcurl";
+  "list-t-text" = dontDistribute super."list-t-text";
+  "list-tries" = dontDistribute super."list-tries";
+  "list-zip-def" = dontDistribute super."list-zip-def";
+  "listlike-instances" = dontDistribute super."listlike-instances";
+  "lists" = dontDistribute super."lists";
+  "listsafe" = dontDistribute super."listsafe";
+  "lit" = dontDistribute super."lit";
+  "literals" = dontDistribute super."literals";
+  "live-sequencer" = dontDistribute super."live-sequencer";
+  "ll-picosat" = dontDistribute super."ll-picosat";
+  "llrbtree" = dontDistribute super."llrbtree";
+  "llsd" = dontDistribute super."llsd";
+  "llvm" = dontDistribute super."llvm";
+  "llvm-analysis" = dontDistribute super."llvm-analysis";
+  "llvm-base" = dontDistribute super."llvm-base";
+  "llvm-base-types" = dontDistribute super."llvm-base-types";
+  "llvm-base-util" = dontDistribute super."llvm-base-util";
+  "llvm-data-interop" = dontDistribute super."llvm-data-interop";
+  "llvm-extra" = dontDistribute super."llvm-extra";
+  "llvm-ffi" = dontDistribute super."llvm-ffi";
+  "llvm-general" = dontDistribute super."llvm-general";
+  "llvm-general-pure" = dontDistribute super."llvm-general-pure";
+  "llvm-general-quote" = dontDistribute super."llvm-general-quote";
+  "llvm-ht" = dontDistribute super."llvm-ht";
+  "llvm-pkg-config" = dontDistribute super."llvm-pkg-config";
+  "llvm-pretty" = dontDistribute super."llvm-pretty";
+  "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser";
+  "llvm-tf" = dontDistribute super."llvm-tf";
+  "llvm-tools" = dontDistribute super."llvm-tools";
+  "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
+  "loadavg" = dontDistribute super."loadavg";
+  "local-address" = dontDistribute super."local-address";
+  "local-search" = dontDistribute super."local-search";
+  "located" = dontDistribute super."located";
+  "located-base" = dontDistribute super."located-base";
+  "locators" = dontDistribute super."locators";
+  "loch" = dontDistribute super."loch";
+  "lock-file" = dontDistribute super."lock-file";
+  "locked-poll" = dontDistribute super."locked-poll";
+  "lockfree-queue" = dontDistribute super."lockfree-queue";
+  "log" = dontDistribute super."log";
+  "log-effect" = dontDistribute super."log-effect";
+  "log2json" = dontDistribute super."log2json";
+  "logfloat" = dontDistribute super."logfloat";
+  "logger" = dontDistribute super."logger";
+  "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade-journald" = dontDistribute super."logging-facade-journald";
+  "logic-TPTP" = dontDistribute super."logic-TPTP";
+  "logic-classes" = dontDistribute super."logic-classes";
+  "logicst" = dontDistribute super."logicst";
+  "logict-state" = dontDistribute super."logict-state";
+  "logplex-parse" = dontDistribute super."logplex-parse";
+  "logsink" = dontDistribute super."logsink";
+  "lojban" = dontDistribute super."lojban";
+  "lojbanParser" = dontDistribute super."lojbanParser";
+  "lojbanXiragan" = dontDistribute super."lojbanXiragan";
+  "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
+  "lol-apps" = dontDistribute super."lol-apps";
+  "loli" = dontDistribute super."loli";
+  "lookup-tables" = dontDistribute super."lookup-tables";
+  "loop-effin" = dontDistribute super."loop-effin";
+  "loop-while" = dontDistribute super."loop-while";
+  "loops" = dontDistribute super."loops";
+  "loopy" = dontDistribute super."loopy";
+  "lord" = dontDistribute super."lord";
+  "lorem" = dontDistribute super."lorem";
+  "loris" = dontDistribute super."loris";
+  "loshadka" = dontDistribute super."loshadka";
+  "lostcities" = dontDistribute super."lostcities";
+  "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
+  "ls-usb" = dontDistribute super."ls-usb";
+  "lscabal" = dontDistribute super."lscabal";
+  "lss" = dontDistribute super."lss";
+  "lsystem" = dontDistribute super."lsystem";
+  "ltk" = dontDistribute super."ltk";
+  "ltl" = dontDistribute super."ltl";
+  "lua-bytecode" = dontDistribute super."lua-bytecode";
+  "luachunk" = dontDistribute super."luachunk";
+  "luautils" = dontDistribute super."luautils";
+  "lub" = dontDistribute super."lub";
+  "lucid-foundation" = dontDistribute super."lucid-foundation";
+  "lucienne" = dontDistribute super."lucienne";
+  "luhn" = dontDistribute super."luhn";
+  "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
+  "luka" = dontDistribute super."luka";
+  "luminance" = doDistribute super."luminance_0_9_1_2";
+  "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
+  "lushtags" = dontDistribute super."lushtags";
+  "luthor" = dontDistribute super."luthor";
+  "lvish" = dontDistribute super."lvish";
+  "lvmlib" = dontDistribute super."lvmlib";
+  "lvmrun" = dontDistribute super."lvmrun";
+  "lxc" = dontDistribute super."lxc";
+  "lye" = dontDistribute super."lye";
+  "lz4" = dontDistribute super."lz4";
+  "lzma" = dontDistribute super."lzma";
+  "lzma-clib" = dontDistribute super."lzma-clib";
+  "lzma-enumerator" = dontDistribute super."lzma-enumerator";
+  "lzma-streams" = dontDistribute super."lzma-streams";
+  "maam" = dontDistribute super."maam";
+  "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
+  "maccatcher" = dontDistribute super."maccatcher";
+  "machinecell" = dontDistribute super."machinecell";
+  "machines-binary" = dontDistribute super."machines-binary";
+  "machines-zlib" = dontDistribute super."machines-zlib";
+  "macho" = dontDistribute super."macho";
+  "maclight" = dontDistribute super."maclight";
+  "macosx-make-standalone" = dontDistribute super."macosx-make-standalone";
+  "mage" = dontDistribute super."mage";
+  "magico" = dontDistribute super."magico";
+  "magma" = dontDistribute super."magma";
+  "mahoro" = dontDistribute super."mahoro";
+  "maid" = dontDistribute super."maid";
+  "mailbox-count" = dontDistribute super."mailbox-count";
+  "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
+  "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = dontDistribute super."mainland-pretty";
+  "majordomo" = dontDistribute super."majordomo";
+  "majority" = dontDistribute super."majority";
+  "make-hard-links" = dontDistribute super."make-hard-links";
+  "make-package" = dontDistribute super."make-package";
+  "makedo" = dontDistribute super."makedo";
+  "manatee" = dontDistribute super."manatee";
+  "manatee-all" = dontDistribute super."manatee-all";
+  "manatee-anything" = dontDistribute super."manatee-anything";
+  "manatee-browser" = dontDistribute super."manatee-browser";
+  "manatee-core" = dontDistribute super."manatee-core";
+  "manatee-curl" = dontDistribute super."manatee-curl";
+  "manatee-editor" = dontDistribute super."manatee-editor";
+  "manatee-filemanager" = dontDistribute super."manatee-filemanager";
+  "manatee-imageviewer" = dontDistribute super."manatee-imageviewer";
+  "manatee-ircclient" = dontDistribute super."manatee-ircclient";
+  "manatee-mplayer" = dontDistribute super."manatee-mplayer";
+  "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer";
+  "manatee-processmanager" = dontDistribute super."manatee-processmanager";
+  "manatee-reader" = dontDistribute super."manatee-reader";
+  "manatee-template" = dontDistribute super."manatee-template";
+  "manatee-terminal" = dontDistribute super."manatee-terminal";
+  "manatee-welcome" = dontDistribute super."manatee-welcome";
+  "mancala" = dontDistribute super."mancala";
+  "mandulia" = dontDistribute super."mandulia";
+  "manifold-random" = dontDistribute super."manifold-random";
+  "manifolds" = dontDistribute super."manifolds";
+  "map-exts" = dontDistribute super."map-exts";
+  "mappy" = dontDistribute super."mappy";
+  "marionetta" = dontDistribute super."marionetta";
+  "markdown-kate" = dontDistribute super."markdown-kate";
+  "markdown-pap" = dontDistribute super."markdown-pap";
+  "markdown2svg" = dontDistribute super."markdown2svg";
+  "marked-pretty" = dontDistribute super."marked-pretty";
+  "markov" = dontDistribute super."markov";
+  "markov-chain" = dontDistribute super."markov-chain";
+  "markov-processes" = dontDistribute super."markov-processes";
+  "markup-preview" = dontDistribute super."markup-preview";
+  "marmalade-upload" = dontDistribute super."marmalade-upload";
+  "marquise" = dontDistribute super."marquise";
+  "marxup" = dontDistribute super."marxup";
+  "masakazu-bot" = dontDistribute super."masakazu-bot";
+  "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
+  "matchers" = dontDistribute super."matchers";
+  "mathblog" = dontDistribute super."mathblog";
+  "mathgenealogy" = dontDistribute super."mathgenealogy";
+  "mathista" = dontDistribute super."mathista";
+  "mathlink" = dontDistribute super."mathlink";
+  "matlab" = dontDistribute super."matlab";
+  "matrix-market" = dontDistribute super."matrix-market";
+  "matrix-market-pure" = dontDistribute super."matrix-market-pure";
+  "matsuri" = dontDistribute super."matsuri";
+  "maude" = dontDistribute super."maude";
+  "maxent" = dontDistribute super."maxent";
+  "maxsharing" = dontDistribute super."maxsharing";
+  "maybe-justify" = dontDistribute super."maybe-justify";
+  "maybench" = dontDistribute super."maybench";
+  "mbox-tools" = dontDistribute super."mbox-tools";
+  "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples";
+  "mcmc-samplers" = dontDistribute super."mcmc-samplers";
+  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
+  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
+  "mdcat" = dontDistribute super."mdcat";
+  "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
+  "mecab" = dontDistribute super."mecab";
+  "mecha" = dontDistribute super."mecha";
+  "mediawiki" = dontDistribute super."mediawiki";
+  "mediawiki2latex" = dontDistribute super."mediawiki2latex";
+  "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
+  "meep" = dontDistribute super."meep";
+  "mega-sdist" = dontDistribute super."mega-sdist";
+  "megaparsec" = doDistribute super."megaparsec_4_3_0";
+  "meldable-heap" = dontDistribute super."meldable-heap";
+  "melody" = dontDistribute super."melody";
+  "memcache" = dontDistribute super."memcache";
+  "memcache-conduit" = dontDistribute super."memcache-conduit";
+  "memcache-haskell" = dontDistribute super."memcache-haskell";
+  "memcached" = dontDistribute super."memcached";
+  "memexml" = dontDistribute super."memexml";
+  "memo-ptr" = dontDistribute super."memo-ptr";
+  "memo-sqlite" = dontDistribute super."memo-sqlite";
+  "memory" = doDistribute super."memory_0_11";
+  "memscript" = dontDistribute super."memscript";
+  "mersenne-random" = dontDistribute super."mersenne-random";
+  "messente" = dontDistribute super."messente";
+  "meta-misc" = dontDistribute super."meta-misc";
+  "meta-par" = dontDistribute super."meta-par";
+  "meta-par-accelerate" = dontDistribute super."meta-par-accelerate";
+  "metadata" = dontDistribute super."metadata";
+  "metamorphic" = dontDistribute super."metamorphic";
+  "metaplug" = dontDistribute super."metaplug";
+  "metric" = dontDistribute super."metric";
+  "metricsd-client" = dontDistribute super."metricsd-client";
+  "metronome" = dontDistribute super."metronome";
+  "mezzolens" = dontDistribute super."mezzolens";
+  "mfsolve" = dontDistribute super."mfsolve";
+  "mgeneric" = dontDistribute super."mgeneric";
+  "mi" = dontDistribute super."mi";
+  "microbench" = dontDistribute super."microbench";
+  "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens" = doDistribute super."microlens_0_4_2_1";
+  "microlens-each" = dontDistribute super."microlens-each";
+  "microlens-ghc" = doDistribute super."microlens-ghc_0_4_2_1";
+  "microlens-platform" = doDistribute super."microlens-platform_0_2_3_1";
+  "microlens-th" = doDistribute super."microlens-th_0_3_0_2";
+  "microtimer" = dontDistribute super."microtimer";
+  "mida" = dontDistribute super."mida";
+  "midair" = dontDistribute super."midair";
+  "midi" = dontDistribute super."midi";
+  "midi-alsa" = dontDistribute super."midi-alsa";
+  "midi-music-box" = dontDistribute super."midi-music-box";
+  "midi-util" = dontDistribute super."midi-util";
+  "midimory" = dontDistribute super."midimory";
+  "midisurface" = dontDistribute super."midisurface";
+  "mighttpd" = dontDistribute super."mighttpd";
+  "mighttpd2" = dontDistribute super."mighttpd2";
+  "mikmod" = dontDistribute super."mikmod";
+  "miku" = dontDistribute super."miku";
+  "milena" = dontDistribute super."milena";
+  "mime" = dontDistribute super."mime";
+  "mime-directory" = dontDistribute super."mime-directory";
+  "mime-string" = dontDistribute super."mime-string";
+  "mines" = dontDistribute super."mines";
+  "minesweeper" = dontDistribute super."minesweeper";
+  "miniball" = dontDistribute super."miniball";
+  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
+  "minimal-configuration" = dontDistribute super."minimal-configuration";
+  "minimorph" = dontDistribute super."minimorph";
+  "minimung" = dontDistribute super."minimung";
+  "minions" = dontDistribute super."minions";
+  "minioperational" = dontDistribute super."minioperational";
+  "miniplex" = dontDistribute super."miniplex";
+  "minirotate" = dontDistribute super."minirotate";
+  "minisat" = dontDistribute super."minisat";
+  "ministg" = dontDistribute super."ministg";
+  "miniutter" = dontDistribute super."miniutter";
+  "minst-idx" = dontDistribute super."minst-idx";
+  "mirror-tweet" = dontDistribute super."mirror-tweet";
+  "missing-py2" = dontDistribute super."missing-py2";
+  "mix-arrows" = dontDistribute super."mix-arrows";
+  "mixed-strategies" = dontDistribute super."mixed-strategies";
+  "mkbndl" = dontDistribute super."mkbndl";
+  "mkcabal" = dontDistribute super."mkcabal";
+  "ml-w" = dontDistribute super."ml-w";
+  "mlist" = dontDistribute super."mlist";
+  "mmtl" = dontDistribute super."mmtl";
+  "mmtl-base" = dontDistribute super."mmtl-base";
+  "mnist-idx" = dontDistribute super."mnist-idx";
+  "moan" = dontDistribute super."moan";
+  "modbus-tcp" = dontDistribute super."modbus-tcp";
+  "modelicaparser" = dontDistribute super."modelicaparser";
+  "modsplit" = dontDistribute super."modsplit";
+  "modular-arithmetic" = dontDistribute super."modular-arithmetic";
+  "modular-prelude" = dontDistribute super."modular-prelude";
+  "modular-prelude-classy" = dontDistribute super."modular-prelude-classy";
+  "module-management" = dontDistribute super."module-management";
+  "modulespection" = dontDistribute super."modulespection";
+  "modulo" = dontDistribute super."modulo";
+  "moe" = dontDistribute super."moe";
+  "mohws" = dontDistribute super."mohws";
+  "monad-abort-fd" = dontDistribute super."monad-abort-fd";
+  "monad-atom" = dontDistribute super."monad-atom";
+  "monad-atom-simple" = dontDistribute super."monad-atom-simple";
+  "monad-bool" = dontDistribute super."monad-bool";
+  "monad-classes" = dontDistribute super."monad-classes";
+  "monad-codec" = dontDistribute super."monad-codec";
+  "monad-connect" = dontDistribute super."monad-connect";
+  "monad-exception" = dontDistribute super."monad-exception";
+  "monad-fork" = dontDistribute super."monad-fork";
+  "monad-gen" = dontDistribute super."monad-gen";
+  "monad-hash" = dontDistribute super."monad-hash";
+  "monad-interleave" = dontDistribute super."monad-interleave";
+  "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
+  "monad-loops-stm" = dontDistribute super."monad-loops-stm";
+  "monad-lrs" = dontDistribute super."monad-lrs";
+  "monad-memo" = dontDistribute super."monad-memo";
+  "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
+  "monad-open" = dontDistribute super."monad-open";
+  "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
+  "monad-param" = dontDistribute super."monad-param";
+  "monad-ran" = dontDistribute super."monad-ran";
+  "monad-resumption" = dontDistribute super."monad-resumption";
+  "monad-state" = dontDistribute super."monad-state";
+  "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-stlike-io" = dontDistribute super."monad-stlike-io";
+  "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
+  "monad-supply" = dontDistribute super."monad-supply";
+  "monad-task" = dontDistribute super."monad-task";
+  "monad-time" = doDistribute super."monad-time_0_1";
+  "monad-tx" = dontDistribute super."monad-tx";
+  "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
+  "monad-wrap" = dontDistribute super."monad-wrap";
+  "monadIO" = dontDistribute super."monadIO";
+  "monadLib-compose" = dontDistribute super."monadLib-compose";
+  "monadacme" = dontDistribute super."monadacme";
+  "monadbi" = dontDistribute super."monadbi";
+  "monadfibre" = dontDistribute super."monadfibre";
+  "monadiccp" = dontDistribute super."monadiccp";
+  "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
+  "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
+  "monadlist" = dontDistribute super."monadlist";
+  "monadloc-pp" = dontDistribute super."monadloc-pp";
+  "monadplus" = dontDistribute super."monadplus";
+  "monads-fd" = dontDistribute super."monads-fd";
+  "monadtransform" = dontDistribute super."monadtransform";
+  "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
+  "mongodb-queue" = dontDistribute super."mongodb-queue";
+  "mongrel2-handler" = dontDistribute super."mongrel2-handler";
+  "monitor" = dontDistribute super."monitor";
+  "mono-foldable" = dontDistribute super."mono-foldable";
+  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-owns" = dontDistribute super."monoid-owns";
+  "monoid-record" = dontDistribute super."monoid-record";
+  "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-transformer" = dontDistribute super."monoid-transformer";
+  "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_4";
+  "monoidplus" = dontDistribute super."monoidplus";
+  "monoids" = dontDistribute super."monoids";
+  "monomorphic" = dontDistribute super."monomorphic";
+  "montage" = dontDistribute super."montage";
+  "montage-client" = dontDistribute super."montage-client";
+  "monte-carlo" = dontDistribute super."monte-carlo";
+  "moo" = dontDistribute super."moo";
+  "moonshine" = dontDistribute super."moonshine";
+  "morfette" = dontDistribute super."morfette";
+  "morfeusz" = dontDistribute super."morfeusz";
+  "morte" = doDistribute super."morte_1_4_2";
+  "mosaico-lib" = dontDistribute super."mosaico-lib";
+  "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
+  "mp" = dontDistribute super."mp";
+  "mp3decoder" = dontDistribute super."mp3decoder";
+  "mpdmate" = dontDistribute super."mpdmate";
+  "mpppc" = dontDistribute super."mpppc";
+  "mpretty" = dontDistribute super."mpretty";
+  "mpris" = dontDistribute super."mpris";
+  "mprover" = dontDistribute super."mprover";
+  "mps" = dontDistribute super."mps";
+  "mpvguihs" = dontDistribute super."mpvguihs";
+  "mqtt-hs" = dontDistribute super."mqtt-hs";
+  "mrm" = dontDistribute super."mrm";
+  "ms" = dontDistribute super."ms";
+  "msgpack" = dontDistribute super."msgpack";
+  "msgpack-aeson" = dontDistribute super."msgpack-aeson";
+  "msgpack-idl" = dontDistribute super."msgpack-idl";
+  "msgpack-rpc" = dontDistribute super."msgpack-rpc";
+  "msh" = dontDistribute super."msh";
+  "msu" = dontDistribute super."msu";
+  "mtgoxapi" = dontDistribute super."mtgoxapi";
+  "mtl-c" = dontDistribute super."mtl-c";
+  "mtl-evil-instances" = dontDistribute super."mtl-evil-instances";
+  "mtl-tf" = dontDistribute super."mtl-tf";
+  "mtl-unleashed" = dontDistribute super."mtl-unleashed";
+  "mtlparse" = dontDistribute super."mtlparse";
+  "mtlx" = dontDistribute super."mtlx";
+  "mtp" = dontDistribute super."mtp";
+  "mtree" = dontDistribute super."mtree";
+  "mucipher" = dontDistribute super."mucipher";
+  "mudbath" = dontDistribute super."mudbath";
+  "muesli" = dontDistribute super."muesli";
+  "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
+  "multext-east-msd" = dontDistribute super."multext-east-msd";
+  "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
+  "multifocal" = dontDistribute super."multifocal";
+  "multihash" = dontDistribute super."multihash";
+  "multipart-names" = dontDistribute super."multipart-names";
+  "multipass" = dontDistribute super."multipass";
+  "multiplate-simplified" = dontDistribute super."multiplate-simplified";
+  "multiplicity" = dontDistribute super."multiplicity";
+  "multirec" = dontDistribute super."multirec";
+  "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
+  "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset-comb" = dontDistribute super."multiset-comb";
+  "multisetrewrite" = dontDistribute super."multisetrewrite";
+  "multistate" = dontDistribute super."multistate";
+  "muon" = dontDistribute super."muon";
+  "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
+  "murmur3" = dontDistribute super."murmur3";
+  "murmurhash3" = dontDistribute super."murmurhash3";
+  "music-articulation" = dontDistribute super."music-articulation";
+  "music-diatonic" = dontDistribute super."music-diatonic";
+  "music-dynamics" = dontDistribute super."music-dynamics";
+  "music-dynamics-literal" = dontDistribute super."music-dynamics-literal";
+  "music-graphics" = dontDistribute super."music-graphics";
+  "music-parts" = dontDistribute super."music-parts";
+  "music-pitch" = dontDistribute super."music-pitch";
+  "music-pitch-literal" = dontDistribute super."music-pitch-literal";
+  "music-preludes" = dontDistribute super."music-preludes";
+  "music-score" = dontDistribute super."music-score";
+  "music-sibelius" = dontDistribute super."music-sibelius";
+  "music-suite" = dontDistribute super."music-suite";
+  "music-util" = dontDistribute super."music-util";
+  "musicbrainz-email" = dontDistribute super."musicbrainz-email";
+  "musicxml" = dontDistribute super."musicxml";
+  "musicxml2" = dontDistribute super."musicxml2";
+  "mustache-haskell" = dontDistribute super."mustache-haskell";
+  "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-iter" = dontDistribute super."mutable-iter";
+  "mute-unmute" = dontDistribute super."mute-unmute";
+  "mvc" = dontDistribute super."mvc";
+  "mvc-updates" = dontDistribute super."mvc-updates";
+  "mvclient" = dontDistribute super."mvclient";
+  "mwc-probability" = doDistribute super."mwc-probability_1_0_3";
+  "mwc-random-monad" = dontDistribute super."mwc-random-monad";
+  "myTestlll" = dontDistribute super."myTestlll";
+  "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
+  "myo" = dontDistribute super."myo";
+  "mysnapsession" = dontDistribute super."mysnapsession";
+  "mysnapsession-example" = dontDistribute super."mysnapsession-example";
+  "mysql-effect" = dontDistribute super."mysql-effect";
+  "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi";
+  "mysql-simple-typed" = dontDistribute super."mysql-simple-typed";
+  "mzv" = dontDistribute super."mzv";
+  "n-m" = dontDistribute super."n-m";
+  "nagios-perfdata" = dontDistribute super."nagios-perfdata";
+  "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg";
+  "named-formlet" = dontDistribute super."named-formlet";
+  "named-lock" = dontDistribute super."named-lock";
+  "named-records" = dontDistribute super."named-records";
+  "namelist" = dontDistribute super."namelist";
+  "names" = dontDistribute super."names";
+  "names-th" = dontDistribute super."names-th";
+  "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
+  "nano-hmac" = dontDistribute super."nano-hmac";
+  "nano-md5" = dontDistribute super."nano-md5";
+  "nanoAgda" = dontDistribute super."nanoAgda";
+  "nanocurses" = dontDistribute super."nanocurses";
+  "nanomsg" = dontDistribute super."nanomsg";
+  "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
+  "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanovg" = dontDistribute super."nanovg";
+  "nanq" = dontDistribute super."nanq";
+  "narc" = dontDistribute super."narc";
+  "nat" = dontDistribute super."nat";
+  "native" = dontDistribute super."native";
+  "nats-queue" = dontDistribute super."nats-queue";
+  "natural-number" = dontDistribute super."natural-number";
+  "natural-numbers" = dontDistribute super."natural-numbers";
+  "natural-transformation" = dontDistribute super."natural-transformation";
+  "naturalcomp" = dontDistribute super."naturalcomp";
+  "naturals" = dontDistribute super."naturals";
+  "naver-translate" = dontDistribute super."naver-translate";
+  "nbt" = dontDistribute super."nbt";
+  "nc-indicators" = dontDistribute super."nc-indicators";
+  "ncurses" = dontDistribute super."ncurses";
+  "neat" = dontDistribute super."neat";
+  "needle" = dontDistribute super."needle";
+  "neet" = dontDistribute super."neet";
+  "nehe-tuts" = dontDistribute super."nehe-tuts";
+  "neil" = dontDistribute super."neil";
+  "neither" = dontDistribute super."neither";
+  "nemesis" = dontDistribute super."nemesis";
+  "nemesis-titan" = dontDistribute super."nemesis-titan";
+  "nerf" = dontDistribute super."nerf";
+  "nero" = dontDistribute super."nero";
+  "nero-wai" = dontDistribute super."nero-wai";
+  "nero-warp" = dontDistribute super."nero-warp";
+  "nested-routes" = dontDistribute super."nested-routes";
+  "nested-sets" = dontDistribute super."nested-sets";
+  "nestedmap" = dontDistribute super."nestedmap";
+  "net-concurrent" = dontDistribute super."net-concurrent";
+  "netclock" = dontDistribute super."netclock";
+  "netcore" = dontDistribute super."netcore";
+  "netlines" = dontDistribute super."netlines";
+  "netlink" = dontDistribute super."netlink";
+  "netlist" = dontDistribute super."netlist";
+  "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl";
+  "netpbm" = dontDistribute super."netpbm";
+  "netrc" = dontDistribute super."netrc";
+  "netspec" = dontDistribute super."netspec";
+  "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle-frp" = dontDistribute super."nettle-frp";
+  "nettle-netkit" = dontDistribute super."nettle-netkit";
+  "nettle-openflow" = dontDistribute super."nettle-openflow";
+  "netwire" = dontDistribute super."netwire";
+  "netwire-input" = dontDistribute super."netwire-input";
+  "netwire-input-glfw" = dontDistribute super."netwire-input-glfw";
+  "network-address" = dontDistribute super."network-address";
+  "network-api-support" = dontDistribute super."network-api-support";
+  "network-bitcoin" = dontDistribute super."network-bitcoin";
+  "network-builder" = dontDistribute super."network-builder";
+  "network-bytestring" = dontDistribute super."network-bytestring";
+  "network-conduit" = dontDistribute super."network-conduit";
+  "network-connection" = dontDistribute super."network-connection";
+  "network-data" = dontDistribute super."network-data";
+  "network-dbus" = dontDistribute super."network-dbus";
+  "network-dns" = dontDistribute super."network-dns";
+  "network-enumerator" = dontDistribute super."network-enumerator";
+  "network-fancy" = dontDistribute super."network-fancy";
+  "network-interfacerequest" = dontDistribute super."network-interfacerequest";
+  "network-ip" = dontDistribute super."network-ip";
+  "network-metrics" = dontDistribute super."network-metrics";
+  "network-minihttp" = dontDistribute super."network-minihttp";
+  "network-msg" = dontDistribute super."network-msg";
+  "network-netpacket" = dontDistribute super."network-netpacket";
+  "network-pgi" = dontDistribute super."network-pgi";
+  "network-rpca" = dontDistribute super."network-rpca";
+  "network-server" = dontDistribute super."network-server";
+  "network-service" = dontDistribute super."network-service";
+  "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr";
+  "network-simple-tls" = dontDistribute super."network-simple-tls";
+  "network-socket-options" = dontDistribute super."network-socket-options";
+  "network-stream" = dontDistribute super."network-stream";
+  "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport-amqp" = dontDistribute super."network-transport-amqp";
+  "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
+  "network-uri-static" = dontDistribute super."network-uri-static";
+  "network-wai-router" = dontDistribute super."network-wai-router";
+  "network-websocket" = dontDistribute super."network-websocket";
+  "networked-game" = dontDistribute super."networked-game";
+  "newports" = dontDistribute super."newports";
+  "newsynth" = dontDistribute super."newsynth";
+  "newt" = dontDistribute super."newt";
+  "newtype-deriving" = dontDistribute super."newtype-deriving";
+  "newtype-th" = dontDistribute super."newtype-th";
+  "newtyper" = dontDistribute super."newtyper";
+  "nextstep-plist" = dontDistribute super."nextstep-plist";
+  "nf" = dontDistribute super."nf";
+  "ngrams-loader" = dontDistribute super."ngrams-loader";
+  "niagra" = dontDistribute super."niagra";
+  "nibblestring" = dontDistribute super."nibblestring";
+  "nicify" = dontDistribute super."nicify";
+  "nicovideo-translator" = dontDistribute super."nicovideo-translator";
+  "nikepub" = dontDistribute super."nikepub";
+  "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
+  "nitro" = dontDistribute super."nitro";
+  "nix-eval" = dontDistribute super."nix-eval";
+  "nixfromnpm" = dontDistribute super."nixfromnpm";
+  "nixos-types" = dontDistribute super."nixos-types";
+  "nkjp" = dontDistribute super."nkjp";
+  "nlp-scores" = dontDistribute super."nlp-scores";
+  "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts";
+  "nm" = dontDistribute super."nm";
+  "nme" = dontDistribute super."nme";
+  "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
+  "no-role-annots" = dontDistribute super."no-role-annots";
+  "nofib-analyse" = dontDistribute super."nofib-analyse";
+  "nofib-analyze" = dontDistribute super."nofib-analyze";
+  "noise" = dontDistribute super."noise";
+  "non-empty" = dontDistribute super."non-empty";
+  "non-negative" = dontDistribute super."non-negative";
+  "nondeterminism" = dontDistribute super."nondeterminism";
+  "nonempty-alternative" = dontDistribute super."nonempty-alternative";
+  "nonfree" = dontDistribute super."nonfree";
+  "nonlinear-optimization" = dontDistribute super."nonlinear-optimization";
+  "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad";
+  "noodle" = dontDistribute super."noodle";
+  "normaldistribution" = dontDistribute super."normaldistribution";
+  "not-gloss" = dontDistribute super."not-gloss";
+  "not-gloss-examples" = dontDistribute super."not-gloss-examples";
+  "not-in-base" = dontDistribute super."not-in-base";
+  "notcpp" = dontDistribute super."notcpp";
+  "notmuch-haskell" = dontDistribute super."notmuch-haskell";
+  "notmuch-web" = dontDistribute super."notmuch-web";
+  "notzero" = dontDistribute super."notzero";
+  "np-extras" = dontDistribute super."np-extras";
+  "np-linear" = dontDistribute super."np-linear";
+  "nptools" = dontDistribute super."nptools";
+  "nth-prime" = dontDistribute super."nth-prime";
+  "nthable" = dontDistribute super."nthable";
+  "ntp-control" = dontDistribute super."ntp-control";
+  "null-canvas" = dontDistribute super."null-canvas";
+  "nullary" = dontDistribute super."nullary";
+  "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
+  "numbering" = dontDistribute super."numbering";
+  "numerals" = dontDistribute super."numerals";
+  "numerals-base" = dontDistribute super."numerals-base";
+  "numeric-limits" = dontDistribute super."numeric-limits";
+  "numeric-prelude" = dontDistribute super."numeric-prelude";
+  "numeric-qq" = dontDistribute super."numeric-qq";
+  "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
+  "numeric-tools" = dontDistribute super."numeric-tools";
+  "numericpeano" = dontDistribute super."numericpeano";
+  "nums" = dontDistribute super."nums";
+  "numtype" = dontDistribute super."numtype";
+  "numtype-tf" = dontDistribute super."numtype-tf";
+  "nurbs" = dontDistribute super."nurbs";
+  "nvim-hs" = dontDistribute super."nvim-hs";
+  "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib";
+  "nyan" = dontDistribute super."nyan";
+  "nylas" = dontDistribute super."nylas";
+  "nymphaea" = dontDistribute super."nymphaea";
+  "oanda-rest-api" = dontDistribute super."oanda-rest-api";
+  "oauthenticated" = dontDistribute super."oauthenticated";
+  "obdd" = dontDistribute super."obdd";
+  "oberon0" = dontDistribute super."oberon0";
+  "obj" = dontDistribute super."obj";
+  "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
+  "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
+  "octohat" = dontDistribute super."octohat";
+  "octopus" = dontDistribute super."octopus";
+  "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
+  "oeis" = dontDistribute super."oeis";
+  "off-simple" = dontDistribute super."off-simple";
+  "ohloh-hs" = dontDistribute super."ohloh-hs";
+  "oi" = dontDistribute super."oi";
+  "oidc-client" = dontDistribute super."oidc-client";
+  "ois-input-manager" = dontDistribute super."ois-input-manager";
+  "old-version" = dontDistribute super."old-version";
+  "olwrapper" = dontDistribute super."olwrapper";
+  "omaketex" = dontDistribute super."omaketex";
+  "omega" = dontDistribute super."omega";
+  "omnicodec" = dontDistribute super."omnicodec";
+  "on-a-horse" = dontDistribute super."on-a-horse";
+  "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel";
+  "one-liner" = dontDistribute super."one-liner";
+  "one-time-password" = dontDistribute super."one-time-password";
+  "oneOfN" = dontDistribute super."oneOfN";
+  "oneormore" = dontDistribute super."oneormore";
+  "only" = dontDistribute super."only";
+  "onu-course" = dontDistribute super."onu-course";
+  "opaleye-classy" = dontDistribute super."opaleye-classy";
+  "opaleye-sqlite" = dontDistribute super."opaleye-sqlite";
+  "opaleye-trans" = dontDistribute super."opaleye-trans";
+  "open-haddock" = dontDistribute super."open-haddock";
+  "open-pandoc" = dontDistribute super."open-pandoc";
+  "open-signals" = dontDistribute super."open-signals";
+  "open-symbology" = dontDistribute super."open-symbology";
+  "open-typerep" = dontDistribute super."open-typerep";
+  "open-union" = dontDistribute super."open-union";
+  "open-witness" = dontDistribute super."open-witness";
+  "opencog-atomspace" = dontDistribute super."opencog-atomspace";
+  "opencv-raw" = dontDistribute super."opencv-raw";
+  "opendatatable" = dontDistribute super."opendatatable";
+  "openexchangerates" = dontDistribute super."openexchangerates";
+  "openflow" = dontDistribute super."openflow";
+  "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
+  "opengles" = dontDistribute super."opengles";
+  "openid" = dontDistribute super."openid";
+  "openpgp" = dontDistribute super."openpgp";
+  "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
+  "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
+  "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
+  "openssh-github-keys" = dontDistribute super."openssh-github-keys";
+  "openssl-createkey" = dontDistribute super."openssl-createkey";
+  "opentheory" = dontDistribute super."opentheory";
+  "opentheory-bits" = dontDistribute super."opentheory-bits";
+  "opentheory-byte" = dontDistribute super."opentheory-byte";
+  "opentheory-char" = dontDistribute super."opentheory-char";
+  "opentheory-divides" = dontDistribute super."opentheory-divides";
+  "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci";
+  "opentheory-parser" = dontDistribute super."opentheory-parser";
+  "opentheory-prime" = dontDistribute super."opentheory-prime";
+  "opentheory-primitive" = dontDistribute super."opentheory-primitive";
+  "opentheory-probability" = dontDistribute super."opentheory-probability";
+  "opentheory-stream" = dontDistribute super."opentheory-stream";
+  "opentheory-unicode" = dontDistribute super."opentheory-unicode";
+  "operational-alacarte" = dontDistribute super."operational-alacarte";
+  "operational-extra" = dontDistribute super."operational-extra";
+  "opml" = dontDistribute super."opml";
+  "opml-conduit" = doDistribute super."opml-conduit_0_4_0_1";
+  "opn" = dontDistribute super."opn";
+  "optimal-blocks" = dontDistribute super."optimal-blocks";
+  "optimization" = dontDistribute super."optimization";
+  "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
+  "optional" = dontDistribute super."optional";
+  "options-time" = dontDistribute super."options-time";
+  "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
+  "orc" = dontDistribute super."orc";
+  "orchestrate" = dontDistribute super."orchestrate";
+  "orchid" = dontDistribute super."orchid";
+  "orchid-demo" = dontDistribute super."orchid-demo";
+  "ord-adhoc" = dontDistribute super."ord-adhoc";
+  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
+  "order-statistics" = dontDistribute super."order-statistics";
+  "ordered" = dontDistribute super."ordered";
+  "orders" = dontDistribute super."orders";
+  "ordrea" = dontDistribute super."ordrea";
+  "organize-imports" = dontDistribute super."organize-imports";
+  "orgmode" = dontDistribute super."orgmode";
+  "orgmode-parse" = dontDistribute super."orgmode-parse";
+  "origami" = dontDistribute super."origami";
+  "os-release" = dontDistribute super."os-release";
+  "osc" = dontDistribute super."osc";
+  "osm-conduit" = dontDistribute super."osm-conduit";
+  "osm-download" = dontDistribute super."osm-download";
+  "oso2pdf" = dontDistribute super."oso2pdf";
+  "osx-ar" = dontDistribute super."osx-ar";
+  "ot" = dontDistribute super."ot";
+  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
+  "overture" = dontDistribute super."overture";
+  "pack" = dontDistribute super."pack";
+  "package-o-tron" = dontDistribute super."package-o-tron";
+  "package-vt" = dontDistribute super."package-vt";
+  "packdeps" = dontDistribute super."packdeps";
+  "packed-dawg" = dontDistribute super."packed-dawg";
+  "packedstring" = dontDistribute super."packedstring";
+  "packer" = dontDistribute super."packer";
+  "packman" = dontDistribute super."packman";
+  "packunused" = dontDistribute super."packunused";
+  "pacman-memcache" = dontDistribute super."pacman-memcache";
+  "padKONTROL" = dontDistribute super."padKONTROL";
+  "pagarme" = dontDistribute super."pagarme";
+  "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palindromes" = dontDistribute super."palindromes";
+  "pam" = dontDistribute super."pam";
+  "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_16_0_2";
+  "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
+  "pandoc-crossref" = dontDistribute super."pandoc-crossref";
+  "pandoc-csv2table" = dontDistribute super."pandoc-csv2table";
+  "pandoc-include" = dontDistribute super."pandoc-include";
+  "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters";
+  "pandoc-lens" = dontDistribute super."pandoc-lens";
+  "pandoc-placetable" = dontDistribute super."pandoc-placetable";
+  "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-unlit" = dontDistribute super."pandoc-unlit";
+  "papillon" = dontDistribute super."papillon";
+  "pappy" = dontDistribute super."pappy";
+  "para" = dontDistribute super."para";
+  "paragon" = dontDistribute super."paragon";
+  "parallel-tasks" = dontDistribute super."parallel-tasks";
+  "parallel-tree-search" = dontDistribute super."parallel-tree-search";
+  "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
+  "parco" = dontDistribute super."parco";
+  "parco-attoparsec" = dontDistribute super."parco-attoparsec";
+  "parco-parsec" = dontDistribute super."parco-parsec";
+  "parcom-lib" = dontDistribute super."parcom-lib";
+  "parconc-examples" = dontDistribute super."parconc-examples";
+  "parport" = dontDistribute super."parport";
+  "parse-dimacs" = dontDistribute super."parse-dimacs";
+  "parse-help" = dontDistribute super."parse-help";
+  "parsec-extra" = dontDistribute super."parsec-extra";
+  "parsec-numbers" = dontDistribute super."parsec-numbers";
+  "parsec-parsers" = dontDistribute super."parsec-parsers";
+  "parsec-permutation" = dontDistribute super."parsec-permutation";
+  "parsec-tagsoup" = dontDistribute super."parsec-tagsoup";
+  "parsec-trace" = dontDistribute super."parsec-trace";
+  "parsec-utils" = dontDistribute super."parsec-utils";
+  "parsec1" = dontDistribute super."parsec1";
+  "parsec2" = dontDistribute super."parsec2";
+  "parsec3" = dontDistribute super."parsec3";
+  "parsec3-numbers" = dontDistribute super."parsec3-numbers";
+  "parsedate" = dontDistribute super."parsedate";
+  "parsek" = dontDistribute super."parsek";
+  "parsely" = dontDistribute super."parsely";
+  "parser-helper" = dontDistribute super."parser-helper";
+  "parser241" = dontDistribute super."parser241";
+  "parsergen" = dontDistribute super."parsergen";
+  "parsestar" = dontDistribute super."parsestar";
+  "parsimony" = dontDistribute super."parsimony";
+  "partage" = dontDistribute super."partage";
+  "partial" = dontDistribute super."partial";
+  "partial-lens" = dontDistribute super."partial-lens";
+  "partial-uri" = dontDistribute super."partial-uri";
+  "partly" = dontDistribute super."partly";
+  "passage" = dontDistribute super."passage";
+  "passwords" = dontDistribute super."passwords";
+  "pastis" = dontDistribute super."pastis";
+  "pasty" = dontDistribute super."pasty";
+  "patch-combinators" = dontDistribute super."patch-combinators";
+  "patch-image" = dontDistribute super."patch-image";
+  "path-io" = doDistribute super."path-io_0_2_0";
+  "pathfinding" = dontDistribute super."pathfinding";
+  "pathfindingcore" = dontDistribute super."pathfindingcore";
+  "pathtype" = dontDistribute super."pathtype";
+  "patronscraper" = dontDistribute super."patronscraper";
+  "patterns" = dontDistribute super."patterns";
+  "paymill" = dontDistribute super."paymill";
+  "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops";
+  "paypal-api" = dontDistribute super."paypal-api";
+  "pb" = dontDistribute super."pb";
+  "pbc4hs" = dontDistribute super."pbc4hs";
+  "pbkdf" = dontDistribute super."pbkdf";
+  "pcap-conduit" = dontDistribute super."pcap-conduit";
+  "pcap-enumerator" = dontDistribute super."pcap-enumerator";
+  "pcd-loader" = dontDistribute super."pcd-loader";
+  "pcf" = dontDistribute super."pcf";
+  "pcg-random" = dontDistribute super."pcg-random";
+  "pcre-less" = dontDistribute super."pcre-less";
+  "pcre-light-extra" = dontDistribute super."pcre-light-extra";
+  "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer";
+  "pdf2line" = dontDistribute super."pdf2line";
+  "pdfsplit" = dontDistribute super."pdfsplit";
+  "pdynload" = dontDistribute super."pdynload";
+  "peakachu" = dontDistribute super."peakachu";
+  "peano" = dontDistribute super."peano";
+  "peano-inf" = dontDistribute super."peano-inf";
+  "pec" = dontDistribute super."pec";
+  "pecoff" = dontDistribute super."pecoff";
+  "peg" = dontDistribute super."peg";
+  "peggy" = dontDistribute super."peggy";
+  "pell" = dontDistribute super."pell";
+  "penn-treebank" = dontDistribute super."penn-treebank";
+  "penny" = dontDistribute super."penny";
+  "penny-bin" = dontDistribute super."penny-bin";
+  "penny-lib" = dontDistribute super."penny-lib";
+  "peparser" = dontDistribute super."peparser";
+  "perceptron" = dontDistribute super."perceptron";
+  "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
+  "period" = dontDistribute super."period";
+  "perm" = dontDistribute super."perm";
+  "permutation" = dontDistribute super."permutation";
+  "permute" = dontDistribute super."permute";
+  "persist2er" = dontDistribute super."persist2er";
+  "persistable-record" = dontDistribute super."persistable-record";
+  "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-audit" = dontDistribute super."persistent-audit";
+  "persistent-cereal" = dontDistribute super."persistent-cereal";
+  "persistent-database-url" = dontDistribute super."persistent-database-url";
+  "persistent-equivalence" = dontDistribute super."persistent-equivalence";
+  "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
+  "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
+  "persistent-map" = dontDistribute super."persistent-map";
+  "persistent-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-protobuf" = dontDistribute super."persistent-protobuf";
+  "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
+  "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-vector" = dontDistribute super."persistent-vector";
+  "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
+  "persona" = dontDistribute super."persona";
+  "persona-idp" = dontDistribute super."persona-idp";
+  "pesca" = dontDistribute super."pesca";
+  "peyotls" = dontDistribute super."peyotls";
+  "peyotls-codec" = dontDistribute super."peyotls-codec";
+  "pez" = dontDistribute super."pez";
+  "pg-harness" = dontDistribute super."pg-harness";
+  "pg-harness-client" = dontDistribute super."pg-harness-client";
+  "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pg-store" = dontDistribute super."pg-store";
+  "pgdl" = dontDistribute super."pgdl";
+  "pgm" = dontDistribute super."pgm";
+  "pgsql-simple" = dontDistribute super."pgsql-simple";
+  "pgstream" = dontDistribute super."pgstream";
+  "phasechange" = dontDistribute super."phasechange";
+  "phizzle" = dontDistribute super."phizzle";
+  "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
+  "phone-numbers" = dontDistribute super."phone-numbers";
+  "phone-push" = dontDistribute super."phone-push";
+  "phonetic-code" = dontDistribute super."phonetic-code";
+  "phooey" = dontDistribute super."phooey";
+  "photoname" = dontDistribute super."photoname";
+  "phraskell" = dontDistribute super."phraskell";
+  "phybin" = dontDistribute super."phybin";
+  "pi-calculus" = dontDistribute super."pi-calculus";
+  "pia-forward" = dontDistribute super."pia-forward";
+  "pianola" = dontDistribute super."pianola";
+  "picologic" = dontDistribute super."picologic";
+  "picosat" = dontDistribute super."picosat";
+  "piet" = dontDistribute super."piet";
+  "piki" = dontDistribute super."piki";
+  "pinboard" = dontDistribute super."pinboard";
+  "pinchot" = doDistribute super."pinchot_0_6_0_0";
+  "pipe-enumerator" = dontDistribute super."pipe-enumerator";
+  "pipeclip" = dontDistribute super."pipeclip";
+  "pipes-async" = dontDistribute super."pipes-async";
+  "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
+  "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
+  "pipes-cellular" = dontDistribute super."pipes-cellular";
+  "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
+  "pipes-cereal" = dontDistribute super."pipes-cereal";
+  "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus";
+  "pipes-conduit" = dontDistribute super."pipes-conduit";
+  "pipes-core" = dontDistribute super."pipes-core";
+  "pipes-courier" = dontDistribute super."pipes-courier";
+  "pipes-errors" = dontDistribute super."pipes-errors";
+  "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
+  "pipes-network-tls" = dontDistribute super."pipes-network-tls";
+  "pipes-p2p" = dontDistribute super."pipes-p2p";
+  "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
+  "pipes-rt" = dontDistribute super."pipes-rt";
+  "pipes-shell" = dontDistribute super."pipes-shell";
+  "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-transduce" = dontDistribute super."pipes-transduce";
+  "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-websockets" = dontDistribute super."pipes-websockets";
+  "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
+  "pipes-zlib" = dontDistribute super."pipes-zlib";
+  "pisigma" = dontDistribute super."pisigma";
+  "pit" = dontDistribute super."pit";
+  "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
+  "pkcs1" = dontDistribute super."pkcs1";
+  "pkcs7" = dontDistribute super."pkcs7";
+  "pkggraph" = dontDistribute super."pkggraph";
+  "pktree" = dontDistribute super."pktree";
+  "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
+  "planar-graph" = dontDistribute super."planar-graph";
+  "plat" = dontDistribute super."plat";
+  "playlists" = dontDistribute super."playlists";
+  "plist" = dontDistribute super."plist";
+  "plist-buddy" = dontDistribute super."plist-buddy";
+  "plivo" = dontDistribute super."plivo";
+  "plot-lab" = dontDistribute super."plot-lab";
+  "plotfont" = dontDistribute super."plotfont";
+  "plotserver-api" = dontDistribute super."plotserver-api";
+  "plugins" = dontDistribute super."plugins";
+  "plugins-auto" = dontDistribute super."plugins-auto";
+  "plugins-multistage" = dontDistribute super."plugins-multistage";
+  "plumbers" = dontDistribute super."plumbers";
+  "ply-loader" = dontDistribute super."ply-loader";
+  "png-file" = dontDistribute super."png-file";
+  "pngload" = dontDistribute super."pngload";
+  "pngload-fixed" = dontDistribute super."pngload-fixed";
+  "pnm" = dontDistribute super."pnm";
+  "pocket-dns" = dontDistribute super."pocket-dns";
+  "pointfree" = dontDistribute super."pointfree";
+  "pointful" = dontDistribute super."pointful";
+  "pointless-fun" = dontDistribute super."pointless-fun";
+  "pointless-haskell" = dontDistribute super."pointless-haskell";
+  "pointless-lenses" = dontDistribute super."pointless-lenses";
+  "pointless-rewrite" = dontDistribute super."pointless-rewrite";
+  "poker-eval" = dontDistribute super."poker-eval";
+  "pokitdok" = dontDistribute super."pokitdok";
+  "polar" = dontDistribute super."polar";
+  "polar-configfile" = dontDistribute super."polar-configfile";
+  "polar-shader" = dontDistribute super."polar-shader";
+  "polh-lexicon" = dontDistribute super."polh-lexicon";
+  "polimorf" = dontDistribute super."polimorf";
+  "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
+  "polyToMonoid" = dontDistribute super."polyToMonoid";
+  "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
+  "polynomial" = dontDistribute super."polynomial";
+  "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
+  "polyseq" = dontDistribute super."polyseq";
+  "polysoup" = dontDistribute super."polysoup";
+  "polytypeable" = dontDistribute super."polytypeable";
+  "polytypeable-utils" = dontDistribute super."polytypeable-utils";
+  "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
+  "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
+  "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
+  "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
+  "pony" = dontDistribute super."pony";
+  "pool" = dontDistribute super."pool";
+  "pool-conduit" = dontDistribute super."pool-conduit";
+  "pooled-io" = dontDistribute super."pooled-io";
+  "pop3-client" = dontDistribute super."pop3-client";
+  "popenhs" = dontDistribute super."popenhs";
+  "poppler" = dontDistribute super."poppler";
+  "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache";
+  "portable-lines" = dontDistribute super."portable-lines";
+  "portaudio" = dontDistribute super."portaudio";
+  "porte" = dontDistribute super."porte";
+  "porter" = dontDistribute super."porter";
+  "ports" = dontDistribute super."ports";
+  "ports-tools" = dontDistribute super."ports-tools";
+  "positive" = dontDistribute super."positive";
+  "posix-acl" = dontDistribute super."posix-acl";
+  "posix-escape" = dontDistribute super."posix-escape";
+  "posix-filelock" = dontDistribute super."posix-filelock";
+  "posix-paths" = dontDistribute super."posix-paths";
+  "posix-pty" = dontDistribute super."posix-pty";
+  "posix-timer" = dontDistribute super."posix-timer";
+  "posix-waitpid" = dontDistribute super."posix-waitpid";
+  "possible" = dontDistribute super."possible";
+  "postcodes" = dontDistribute super."postcodes";
+  "postgresql-binary" = doDistribute super."postgresql-binary_0_7_9";
+  "postgresql-config" = dontDistribute super."postgresql-config";
+  "postgresql-connector" = dontDistribute super."postgresql-connector";
+  "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape";
+  "postgresql-cube" = dontDistribute super."postgresql-cube";
+  "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
+  "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
+  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
+  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
+  "postgresql-typed" = dontDistribute super."postgresql-typed";
+  "postgrest" = dontDistribute super."postgrest";
+  "postie" = dontDistribute super."postie";
+  "postmark" = dontDistribute super."postmark";
+  "postmaster" = dontDistribute super."postmaster";
+  "potato-tool" = dontDistribute super."potato-tool";
+  "potrace" = dontDistribute super."potrace";
+  "potrace-diagrams" = dontDistribute super."potrace-diagrams";
+  "powermate" = dontDistribute super."powermate";
+  "powerpc" = dontDistribute super."powerpc";
+  "ppm" = dontDistribute super."ppm";
+  "pqc" = dontDistribute super."pqc";
+  "pqueue-mtl" = dontDistribute super."pqueue-mtl";
+  "practice-room" = dontDistribute super."practice-room";
+  "precis" = dontDistribute super."precis";
+  "predicates" = dontDistribute super."predicates";
+  "prednote-test" = dontDistribute super."prednote-test";
+  "prefork" = dontDistribute super."prefork";
+  "pregame" = dontDistribute super."pregame";
+  "prelude-compat" = dontDistribute super."prelude-compat";
+  "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-generalize" = dontDistribute super."prelude-generalize";
+  "prelude-plus" = dontDistribute super."prelude-plus";
+  "prelude-prime" = dontDistribute super."prelude-prime";
+  "prelude-safeenum" = dontDistribute super."prelude-safeenum";
+  "prelude2010" = dontDistribute super."prelude2010";
+  "preprocess-haskell" = dontDistribute super."preprocess-haskell";
+  "preprocessor-tools" = dontDistribute super."preprocessor-tools";
+  "present" = dontDistribute super."present";
+  "press" = dontDistribute super."press";
+  "presto-hdbc" = dontDistribute super."presto-hdbc";
+  "prettify" = dontDistribute super."prettify";
+  "pretty-compact" = dontDistribute super."pretty-compact";
+  "pretty-error" = dontDistribute super."pretty-error";
+  "pretty-hex" = dontDistribute super."pretty-hex";
+  "pretty-ncols" = dontDistribute super."pretty-ncols";
+  "pretty-sop" = dontDistribute super."pretty-sop";
+  "pretty-tree" = dontDistribute super."pretty-tree";
+  "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
+  "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
+  "primula-board" = dontDistribute super."primula-board";
+  "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
+  "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
+  "printxosd" = dontDistribute super."printxosd";
+  "priority-queue" = dontDistribute super."priority-queue";
+  "priority-sync" = dontDistribute super."priority-sync";
+  "privileged-concurrency" = dontDistribute super."privileged-concurrency";
+  "prizm" = dontDistribute super."prizm";
+  "probability" = dontDistribute super."probability";
+  "probable" = dontDistribute super."probable";
+  "proc" = dontDistribute super."proc";
+  "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_7";
+  "process-iterio" = dontDistribute super."process-iterio";
+  "process-leksah" = dontDistribute super."process-leksah";
+  "process-listlike" = dontDistribute super."process-listlike";
+  "process-progress" = dontDistribute super."process-progress";
+  "process-qq" = dontDistribute super."process-qq";
+  "process-streaming" = dontDistribute super."process-streaming";
+  "processing" = dontDistribute super."processing";
+  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
+  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
+  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
+  "procstat" = dontDistribute super."procstat";
+  "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
+  "prof2dot" = dontDistribute super."prof2dot";
+  "prof2pretty" = dontDistribute super."prof2pretty";
+  "profiteur" = dontDistribute super."profiteur";
+  "progress" = dontDistribute super."progress";
+  "progressbar" = dontDistribute super."progressbar";
+  "progression" = dontDistribute super."progression";
+  "progressive" = dontDistribute super."progressive";
+  "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings";
+  "projection" = dontDistribute super."projection";
+  "prolog" = dontDistribute super."prolog";
+  "prolog-graph" = dontDistribute super."prolog-graph";
+  "prolog-graph-lib" = dontDistribute super."prolog-graph-lib";
+  "prologue" = dontDistribute super."prologue";
+  "prometheus" = dontDistribute super."prometheus";
+  "promise" = dontDistribute super."promise";
+  "promises" = dontDistribute super."promises";
+  "propane" = dontDistribute super."propane";
+  "propellor" = dontDistribute super."propellor";
+  "properties" = dontDistribute super."properties";
+  "property-list" = dontDistribute super."property-list";
+  "proplang" = dontDistribute super."proplang";
+  "props" = dontDistribute super."props";
+  "prosper" = dontDistribute super."prosper";
+  "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
+  "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12";
+  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
+  "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork";
+  "protolude" = dontDistribute super."protolude";
+  "proton-haskell" = dontDistribute super."proton-haskell";
+  "prototype" = dontDistribute super."prototype";
+  "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
+  "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "psc-ide" = doDistribute super."psc-ide_0_5_0";
+  "pseudo-boolean" = dontDistribute super."pseudo-boolean";
+  "pseudo-trie" = dontDistribute super."pseudo-trie";
+  "pseudomacros" = dontDistribute super."pseudomacros";
+  "psql-helpers" = dontDistribute super."psql-helpers";
+  "pub" = dontDistribute super."pub";
+  "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
+  "publicsuffixlist" = dontDistribute super."publicsuffixlist";
+  "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate";
+  "pubnub" = dontDistribute super."pubnub";
+  "pubsub" = dontDistribute super."pubsub";
+  "puffytools" = dontDistribute super."puffytools";
+  "pugixml" = dontDistribute super."pugixml";
+  "pugs-DrIFT" = dontDistribute super."pugs-DrIFT";
+  "pugs-HsSyck" = dontDistribute super."pugs-HsSyck";
+  "pugs-compat" = dontDistribute super."pugs-compat";
+  "pugs-hsregex" = dontDistribute super."pugs-hsregex";
+  "pulse-simple" = dontDistribute super."pulse-simple";
+  "punkt" = dontDistribute super."punkt";
+  "punycode" = dontDistribute super."punycode";
+  "puppetresources" = dontDistribute super."puppetresources";
+  "pure-fft" = dontDistribute super."pure-fft";
+  "pure-priority-queue" = dontDistribute super."pure-priority-queue";
+  "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
+  "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript" = doDistribute super."purescript_0_7_6_1";
+  "purescript-bridge" = dontDistribute super."purescript-bridge";
+  "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
+  "push-notify" = dontDistribute super."push-notify";
+  "push-notify-ccs" = dontDistribute super."push-notify-ccs";
+  "push-notify-general" = dontDistribute super."push-notify-general";
+  "pusher-haskell" = dontDistribute super."pusher-haskell";
+  "pushme" = dontDistribute super."pushme";
+  "putlenses" = dontDistribute super."putlenses";
+  "puzzle-draw" = dontDistribute super."puzzle-draw";
+  "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline";
+  "pvd" = dontDistribute super."pvd";
+  "pwstore-cli" = dontDistribute super."pwstore-cli";
+  "pxsl-tools" = dontDistribute super."pxsl-tools";
+  "pyffi" = dontDistribute super."pyffi";
+  "pyfi" = dontDistribute super."pyfi";
+  "python-pickle" = dontDistribute super."python-pickle";
+  "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator";
+  "qd" = dontDistribute super."qd";
+  "qd-vec" = dontDistribute super."qd-vec";
+  "qed" = dontDistribute super."qed";
+  "qhull-simple" = dontDistribute super."qhull-simple";
+  "qrcode" = dontDistribute super."qrcode";
+  "qt" = dontDistribute super."qt";
+  "quadratic-irrational" = dontDistribute super."quadratic-irrational";
+  "quantfin" = dontDistribute super."quantfin";
+  "quantities" = dontDistribute super."quantities";
+  "quantum-arrow" = dontDistribute super."quantum-arrow";
+  "qudb" = dontDistribute super."qudb";
+  "quenya-verb" = dontDistribute super."quenya-verb";
+  "querystring-pickle" = dontDistribute super."querystring-pickle";
+  "queue" = dontDistribute super."queue";
+  "queuelike" = dontDistribute super."queuelike";
+  "quick-generator" = dontDistribute super."quick-generator";
+  "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-combinators" = dontDistribute super."quickcheck-combinators";
+  "quickcheck-poly" = dontDistribute super."quickcheck-poly";
+  "quickcheck-properties" = dontDistribute super."quickcheck-properties";
+  "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
+  "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad";
+  "quickcheck-regex" = dontDistribute super."quickcheck-regex";
+  "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng";
+  "quickcheck-rematch" = dontDistribute super."quickcheck-rematch";
+  "quickcheck-script" = dontDistribute super."quickcheck-script";
+  "quickcheck-simple" = dontDistribute super."quickcheck-simple";
+  "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver";
+  "quicklz" = dontDistribute super."quicklz";
+  "quickpull" = dontDistribute super."quickpull";
+  "quickset" = dontDistribute super."quickset";
+  "quickspec" = dontDistribute super."quickspec";
+  "quicktest" = dontDistribute super."quicktest";
+  "quickwebapp" = dontDistribute super."quickwebapp";
+  "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
+  "quiver-bytestring" = dontDistribute super."quiver-bytestring";
+  "quiver-cell" = dontDistribute super."quiver-cell";
+  "quiver-csv" = dontDistribute super."quiver-csv";
+  "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
+  "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-instances" = dontDistribute super."quiver-instances";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
+  "quiver-sort" = dontDistribute super."quiver-sort";
+  "quoridor-hs" = dontDistribute super."quoridor-hs";
+  "qux" = dontDistribute super."qux";
+  "rabocsv2qif" = dontDistribute super."rabocsv2qif";
+  "rad" = dontDistribute super."rad";
+  "radian" = dontDistribute super."radian";
+  "radium" = dontDistribute super."radium";
+  "radium-formula-parser" = dontDistribute super."radium-formula-parser";
+  "radix" = dontDistribute super."radix";
+  "rados-haskell" = dontDistribute super."rados-haskell";
+  "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
+  "rainbow" = doDistribute super."rainbow_0_26_0_6";
+  "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
+  "rake" = dontDistribute super."rake";
+  "rakhana" = dontDistribute super."rakhana";
+  "ralist" = dontDistribute super."ralist";
+  "rallod" = dontDistribute super."rallod";
+  "raml" = dontDistribute super."raml";
+  "rand-vars" = dontDistribute super."rand-vars";
+  "randfile" = dontDistribute super."randfile";
+  "random-access-list" = dontDistribute super."random-access-list";
+  "random-derive" = dontDistribute super."random-derive";
+  "random-eff" = dontDistribute super."random-eff";
+  "random-effin" = dontDistribute super."random-effin";
+  "random-extras" = dontDistribute super."random-extras";
+  "random-hypergeometric" = dontDistribute super."random-hypergeometric";
+  "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
+  "random-variates" = dontDistribute super."random-variates";
+  "randomgen" = dontDistribute super."randomgen";
+  "randproc" = dontDistribute super."randproc";
+  "randsolid" = dontDistribute super."randsolid";
+  "range-space" = dontDistribute super."range-space";
+  "rangemin" = dontDistribute super."rangemin";
+  "ranges" = dontDistribute super."ranges";
+  "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
+  "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
+  "ratio-int" = dontDistribute super."ratio-int";
+  "raven-haskell" = dontDistribute super."raven-haskell";
+  "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
+  "rawstring-qm" = dontDistribute super."rawstring-qm";
+  "razom-text-util" = dontDistribute super."razom-text-util";
+  "rbr" = dontDistribute super."rbr";
+  "rclient" = dontDistribute super."rclient";
+  "rcu" = dontDistribute super."rcu";
+  "rdf4h" = dontDistribute super."rdf4h";
+  "rdioh" = dontDistribute super."rdioh";
+  "rdtsc" = dontDistribute super."rdtsc";
+  "rdtsc-enolan" = dontDistribute super."rdtsc-enolan";
+  "re2" = dontDistribute super."re2";
+  "react-flux" = dontDistribute super."react-flux";
+  "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
+  "reaction-logic" = dontDistribute super."reaction-logic";
+  "reactive" = dontDistribute super."reactive";
+  "reactive-bacon" = dontDistribute super."reactive-bacon";
+  "reactive-balsa" = dontDistribute super."reactive-balsa";
+  "reactive-banana" = dontDistribute super."reactive-banana";
+  "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
+  "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
+  "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
+  "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
+  "reactive-glut" = dontDistribute super."reactive-glut";
+  "reactive-haskell" = dontDistribute super."reactive-haskell";
+  "reactive-io" = dontDistribute super."reactive-io";
+  "reactive-thread" = dontDistribute super."reactive-thread";
+  "reactivity" = dontDistribute super."reactivity";
+  "reactor" = dontDistribute super."reactor";
+  "read-bounded" = dontDistribute super."read-bounded";
+  "read-env-var" = dontDistribute super."read-env-var";
+  "readline-statevar" = dontDistribute super."readline-statevar";
+  "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
+  "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
+  "reasonable-lens" = dontDistribute super."reasonable-lens";
+  "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
+  "recaptcha" = dontDistribute super."recaptcha";
+  "record" = dontDistribute super."record";
+  "record-aeson" = dontDistribute super."record-aeson";
+  "record-gl" = dontDistribute super."record-gl";
+  "record-preprocessor" = dontDistribute super."record-preprocessor";
+  "record-syntax" = dontDistribute super."record-syntax";
+  "records" = dontDistribute super."records";
+  "records-th" = dontDistribute super."records-th";
+  "recursive-line-count" = dontDistribute super."recursive-line-count";
+  "redHandlers" = dontDistribute super."redHandlers";
+  "reddit" = dontDistribute super."reddit";
+  "redis" = dontDistribute super."redis";
+  "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_2";
+  "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
+  "redis-simple" = dontDistribute super."redis-simple";
+  "redo" = dontDistribute super."redo";
+  "reedsolomon" = dontDistribute super."reedsolomon";
+  "reenact" = dontDistribute super."reenact";
+  "reexport-crypto-random" = dontDistribute super."reexport-crypto-random";
+  "ref" = dontDistribute super."ref";
+  "ref-mtl" = dontDistribute super."ref-mtl";
+  "ref-tf" = dontDistribute super."ref-tf";
+  "refcount" = dontDistribute super."refcount";
+  "reference" = dontDistribute super."reference";
+  "references" = dontDistribute super."references";
+  "refh" = dontDistribute super."refh";
+  "refined" = dontDistribute super."refined";
+  "reflection-extras" = dontDistribute super."reflection-extras";
+  "reflection-without-remorse" = dontDistribute super."reflection-without-remorse";
+  "reflex" = dontDistribute super."reflex";
+  "reflex-animation" = dontDistribute super."reflex-animation";
+  "reflex-dom" = dontDistribute super."reflex-dom";
+  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
+  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
+  "reflex-orphans" = dontDistribute super."reflex-orphans";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
+  "regex-deriv" = dontDistribute super."regex-deriv";
+  "regex-dfa" = dontDistribute super."regex-dfa";
+  "regex-easy" = dontDistribute super."regex-easy";
+  "regex-genex" = dontDistribute super."regex-genex";
+  "regex-parsec" = dontDistribute super."regex-parsec";
+  "regex-pderiv" = dontDistribute super."regex-pderiv";
+  "regex-posix-unittest" = dontDistribute super."regex-posix-unittest";
+  "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes";
+  "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter";
+  "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
+  "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
+  "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
+  "regex-xmlschema" = dontDistribute super."regex-xmlschema";
+  "regexchar" = dontDistribute super."regexchar";
+  "regexdot" = dontDistribute super."regexdot";
+  "regexp-tries" = dontDistribute super."regexp-tries";
+  "regexpr" = dontDistribute super."regexpr";
+  "regexpr-symbolic" = dontDistribute super."regexpr-symbolic";
+  "regexqq" = dontDistribute super."regexqq";
+  "regional-pointers" = dontDistribute super."regional-pointers";
+  "regions" = dontDistribute super."regions";
+  "regions-monadsfd" = dontDistribute super."regions-monadsfd";
+  "regions-monadstf" = dontDistribute super."regions-monadstf";
+  "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
+  "regress" = dontDistribute super."regress";
+  "regular" = dontDistribute super."regular";
+  "regular-extras" = dontDistribute super."regular-extras";
+  "regular-web" = dontDistribute super."regular-web";
+  "regular-xmlpickler" = dontDistribute super."regular-xmlpickler";
+  "reheat" = dontDistribute super."reheat";
+  "rehoo" = dontDistribute super."rehoo";
+  "rei" = dontDistribute super."rei";
+  "reified-records" = dontDistribute super."reified-records";
+  "reify" = dontDistribute super."reify";
+  "relacion" = dontDistribute super."relacion";
+  "relation" = dontDistribute super."relation";
+  "relational-postgresql8" = dontDistribute super."relational-postgresql8";
+  "relational-query" = dontDistribute super."relational-query";
+  "relational-query-HDBC" = dontDistribute super."relational-query-HDBC";
+  "relational-record" = dontDistribute super."relational-record";
+  "relational-record-examples" = dontDistribute super."relational-record-examples";
+  "relational-schemas" = dontDistribute super."relational-schemas";
+  "relative-date" = dontDistribute super."relative-date";
+  "relit" = dontDistribute super."relit";
+  "rematch" = dontDistribute super."rematch";
+  "rematch-text" = dontDistribute super."rematch-text";
+  "remote" = dontDistribute super."remote";
+  "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-json" = dontDistribute super."remote-json";
+  "remote-json-client" = dontDistribute super."remote-json-client";
+  "remote-json-server" = dontDistribute super."remote-json-server";
+  "remote-monad" = dontDistribute super."remote-monad";
+  "remotion" = dontDistribute super."remotion";
+  "renderable" = dontDistribute super."renderable";
+  "reord" = dontDistribute super."reord";
+  "reorderable" = dontDistribute super."reorderable";
+  "repa-array" = dontDistribute super."repa-array";
+  "repa-bytestring" = dontDistribute super."repa-bytestring";
+  "repa-convert" = dontDistribute super."repa-convert";
+  "repa-eval" = dontDistribute super."repa-eval";
+  "repa-examples" = dontDistribute super."repa-examples";
+  "repa-fftw" = dontDistribute super."repa-fftw";
+  "repa-flow" = dontDistribute super."repa-flow";
+  "repa-linear-algebra" = dontDistribute super."repa-linear-algebra";
+  "repa-plugin" = dontDistribute super."repa-plugin";
+  "repa-scalar" = dontDistribute super."repa-scalar";
+  "repa-series" = dontDistribute super."repa-series";
+  "repa-sndfile" = dontDistribute super."repa-sndfile";
+  "repa-stream" = dontDistribute super."repa-stream";
+  "repa-v4l2" = dontDistribute super."repa-v4l2";
+  "repl" = dontDistribute super."repl";
+  "repl-toolkit" = dontDistribute super."repl-toolkit";
+  "repline" = dontDistribute super."repline";
+  "repo-based-blog" = dontDistribute super."repo-based-blog";
+  "repr" = dontDistribute super."repr";
+  "repr-tree-syb" = dontDistribute super."repr-tree-syb";
+  "representable-functors" = dontDistribute super."representable-functors";
+  "representable-profunctors" = dontDistribute super."representable-profunctors";
+  "representable-tries" = dontDistribute super."representable-tries";
+  "reqcatcher" = dontDistribute super."reqcatcher";
+  "request-monad" = dontDistribute super."request-monad";
+  "reserve" = dontDistribute super."reserve";
+  "resistor-cube" = dontDistribute super."resistor-cube";
+  "resource-effect" = dontDistribute super."resource-effect";
+  "resource-embed" = dontDistribute super."resource-embed";
+  "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
+  "resource-pool-monad" = dontDistribute super."resource-pool-monad";
+  "resource-simple" = dontDistribute super."resource-simple";
+  "respond" = dontDistribute super."respond";
+  "rest-core" = doDistribute super."rest-core_0_37";
+  "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "rest-happstack" = doDistribute super."rest-happstack_0_3_1";
+  "rest-snap" = doDistribute super."rest-snap_0_2";
+  "rest-wai" = doDistribute super."rest-wai_0_2";
+  "restful-snap" = dontDistribute super."restful-snap";
+  "restricted-workers" = dontDistribute super."restricted-workers";
+  "restyle" = dontDistribute super."restyle";
+  "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "rethinkdb-model" = dontDistribute super."rethinkdb-model";
+  "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+  "retryer" = dontDistribute super."retryer";
+  "revdectime" = dontDistribute super."revdectime";
+  "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
+  "reverse-geocoding" = dontDistribute super."reverse-geocoding";
+  "reversi" = dontDistribute super."reversi";
+  "rewrite" = dontDistribute super."rewrite";
+  "rewriting" = dontDistribute super."rewriting";
+  "rex" = dontDistribute super."rex";
+  "rezoom" = dontDistribute super."rezoom";
+  "rfc3339" = dontDistribute super."rfc3339";
+  "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial";
+  "riak" = doDistribute super."riak_0_9_1_1";
+  "riak-protobuf" = doDistribute super."riak-protobuf_0_20_0_0";
+  "richreports" = dontDistribute super."richreports";
+  "riemann" = dontDistribute super."riemann";
+  "riff" = dontDistribute super."riff";
+  "ring-buffer" = dontDistribute super."ring-buffer";
+  "riot" = dontDistribute super."riot";
+  "ripple" = dontDistribute super."ripple";
+  "ripple-federation" = dontDistribute super."ripple-federation";
+  "risc386" = dontDistribute super."risc386";
+  "rivers" = dontDistribute super."rivers";
+  "rivet" = dontDistribute super."rivet";
+  "rivet-core" = dontDistribute super."rivet-core";
+  "rivet-migration" = dontDistribute super."rivet-migration";
+  "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy";
+  "rlglue" = dontDistribute super."rlglue";
+  "rlist" = dontDistribute super."rlist";
+  "rmonad" = dontDistribute super."rmonad";
+  "rncryptor" = dontDistribute super."rncryptor";
+  "rng-utils" = dontDistribute super."rng-utils";
+  "robin" = dontDistribute super."robin";
+  "robot" = dontDistribute super."robot";
+  "robots-txt" = dontDistribute super."robots-txt";
+  "rocksdb-haskell" = dontDistribute super."rocksdb-haskell";
+  "roguestar" = dontDistribute super."roguestar";
+  "roguestar-engine" = dontDistribute super."roguestar-engine";
+  "roguestar-gl" = dontDistribute super."roguestar-gl";
+  "roguestar-glut" = dontDistribute super."roguestar-glut";
+  "rollbar" = dontDistribute super."rollbar";
+  "roller" = dontDistribute super."roller";
+  "rolling-queue" = dontDistribute super."rolling-queue";
+  "roman-numerals" = dontDistribute super."roman-numerals";
+  "romkan" = dontDistribute super."romkan";
+  "roots" = dontDistribute super."roots";
+  "rope" = dontDistribute super."rope";
+  "rosa" = dontDistribute super."rosa";
+  "rose-trie" = dontDistribute super."rose-trie";
+  "roshask" = dontDistribute super."roshask";
+  "rosso" = dontDistribute super."rosso";
+  "rot13" = dontDistribute super."rot13";
+  "rotating-log" = dontDistribute super."rotating-log";
+  "rounding" = dontDistribute super."rounding";
+  "roundtrip" = dontDistribute super."roundtrip";
+  "roundtrip-aeson" = dontDistribute super."roundtrip-aeson";
+  "roundtrip-string" = dontDistribute super."roundtrip-string";
+  "roundtrip-xml" = dontDistribute super."roundtrip-xml";
+  "route-generator" = dontDistribute super."route-generator";
+  "route-planning" = dontDistribute super."route-planning";
+  "rowrecord" = dontDistribute super."rowrecord";
+  "rpc" = dontDistribute super."rpc";
+  "rpc-framework" = dontDistribute super."rpc-framework";
+  "rpf" = dontDistribute super."rpf";
+  "rpm" = dontDistribute super."rpm";
+  "rsagl" = dontDistribute super."rsagl";
+  "rsagl-frp" = dontDistribute super."rsagl-frp";
+  "rsagl-math" = dontDistribute super."rsagl-math";
+  "rspp" = dontDistribute super."rspp";
+  "rss" = dontDistribute super."rss";
+  "rss-conduit" = dontDistribute super."rss-conduit";
+  "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
+  "rtld" = dontDistribute super."rtld";
+  "rtlsdr" = dontDistribute super."rtlsdr";
+  "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";
+  "rtorrent-state" = dontDistribute super."rtorrent-state";
+  "rubberband" = dontDistribute super."rubberband";
+  "ruby-marshal" = dontDistribute super."ruby-marshal";
+  "ruby-qq" = dontDistribute super."ruby-qq";
+  "ruff" = dontDistribute super."ruff";
+  "ruler" = dontDistribute super."ruler";
+  "ruler-core" = dontDistribute super."ruler-core";
+  "rungekutta" = dontDistribute super."rungekutta";
+  "runghc" = dontDistribute super."runghc";
+  "rwlock" = dontDistribute super."rwlock";
+  "rws" = dontDistribute super."rws";
+  "s-cargot" = dontDistribute super."s-cargot";
+  "safe-access" = dontDistribute super."safe-access";
+  "safe-failure" = dontDistribute super."safe-failure";
+  "safe-failure-cme" = dontDistribute super."safe-failure-cme";
+  "safe-freeze" = dontDistribute super."safe-freeze";
+  "safe-globals" = dontDistribute super."safe-globals";
+  "safe-lazy-io" = dontDistribute super."safe-lazy-io";
+  "safe-length" = dontDistribute super."safe-length";
+  "safe-plugins" = dontDistribute super."safe-plugins";
+  "safe-printf" = dontDistribute super."safe-printf";
+  "safeint" = dontDistribute super."safeint";
+  "safer-file-handles" = dontDistribute super."safer-file-handles";
+  "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
+  "safer-file-handles-text" = dontDistribute super."safer-file-handles-text";
+  "saferoute" = dontDistribute super."saferoute";
+  "sai-shape-syb" = dontDistribute super."sai-shape-syb";
+  "saltine" = dontDistribute super."saltine";
+  "saltine-quickcheck" = dontDistribute super."saltine-quickcheck";
+  "salvia" = dontDistribute super."salvia";
+  "salvia-demo" = dontDistribute super."salvia-demo";
+  "salvia-extras" = dontDistribute super."salvia-extras";
+  "salvia-protocol" = dontDistribute super."salvia-protocol";
+  "salvia-sessions" = dontDistribute super."salvia-sessions";
+  "salvia-websocket" = dontDistribute super."salvia-websocket";
+  "sample-frame" = dontDistribute super."sample-frame";
+  "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
+  "samtools" = dontDistribute super."samtools";
+  "samtools-conduit" = dontDistribute super."samtools-conduit";
+  "samtools-enumerator" = dontDistribute super."samtools-enumerator";
+  "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandlib" = dontDistribute super."sandlib";
+  "sarasvati" = dontDistribute super."sarasvati";
+  "sarsi" = dontDistribute super."sarsi";
+  "sasl" = dontDistribute super."sasl";
+  "sat" = dontDistribute super."sat";
+  "sat-micro-hs" = dontDistribute super."sat-micro-hs";
+  "satchmo" = dontDistribute super."satchmo";
+  "satchmo-backends" = dontDistribute super."satchmo-backends";
+  "satchmo-examples" = dontDistribute super."satchmo-examples";
+  "satchmo-funsat" = dontDistribute super."satchmo-funsat";
+  "satchmo-minisat" = dontDistribute super."satchmo-minisat";
+  "satchmo-toysat" = dontDistribute super."satchmo-toysat";
+  "sbp" = dontDistribute super."sbp";
+  "sbvPlugin" = dontDistribute super."sbvPlugin";
+  "sc3-rdu" = dontDistribute super."sc3-rdu";
+  "scalable-server" = dontDistribute super."scalable-server";
+  "scaleimage" = dontDistribute super."scaleimage";
+  "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
+  "scan" = dontDistribute super."scan";
+  "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
+  "scat" = dontDistribute super."scat";
+  "scc" = dontDistribute super."scc";
+  "scenegraph" = dontDistribute super."scenegraph";
+  "scgi" = dontDistribute super."scgi";
+  "schedevr" = dontDistribute super."schedevr";
+  "schedule-planner" = dontDistribute super."schedule-planner";
+  "schedyield" = dontDistribute super."schedyield";
+  "scholdoc" = dontDistribute super."scholdoc";
+  "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc";
+  "scholdoc-texmath" = dontDistribute super."scholdoc-texmath";
+  "scholdoc-types" = dontDistribute super."scholdoc-types";
+  "schonfinkeling" = dontDistribute super."schonfinkeling";
+  "sci-ratio" = dontDistribute super."sci-ratio";
+  "science-constants" = dontDistribute super."science-constants";
+  "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scion" = dontDistribute super."scion";
+  "scion-browser" = dontDistribute super."scion-browser";
+  "scons2dot" = dontDistribute super."scons2dot";
+  "scope" = dontDistribute super."scope";
+  "scope-cairo" = dontDistribute super."scope-cairo";
+  "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
+  "scotty-binding-play" = dontDistribute super."scotty-binding-play";
+  "scotty-blaze" = dontDistribute super."scotty-blaze";
+  "scotty-cookie" = dontDistribute super."scotty-cookie";
+  "scotty-fay" = dontDistribute super."scotty-fay";
+  "scotty-hastache" = dontDistribute super."scotty-hastache";
+  "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
+  "scotty-rest" = dontDistribute super."scotty-rest";
+  "scotty-session" = dontDistribute super."scotty-session";
+  "scotty-tls" = dontDistribute super."scotty-tls";
+  "scotty-view" = dontDistribute super."scotty-view";
+  "scp-streams" = dontDistribute super."scp-streams";
+  "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
+  "scrobble" = dontDistribute super."scrobble";
+  "scroll" = dontDistribute super."scroll";
+  "scrz" = dontDistribute super."scrz";
+  "scyther-proof" = dontDistribute super."scyther-proof";
+  "sde-solver" = dontDistribute super."sde-solver";
+  "sdf2p1-parser" = dontDistribute super."sdf2p1-parser";
+  "sdl2-cairo" = dontDistribute super."sdl2-cairo";
+  "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image";
+  "sdl2-compositor" = dontDistribute super."sdl2-compositor";
+  "sdl2-image" = dontDistribute super."sdl2-image";
+  "sdl2-ttf" = dontDistribute super."sdl2-ttf";
+  "sdnv" = dontDistribute super."sdnv";
+  "sdr" = dontDistribute super."sdr";
+  "seacat" = dontDistribute super."seacat";
+  "seal-module" = dontDistribute super."seal-module";
+  "search" = dontDistribute super."search";
+  "sec" = dontDistribute super."sec";
+  "secdh" = dontDistribute super."secdh";
+  "seclib" = dontDistribute super."seclib";
+  "second-transfer" = doDistribute super."second-transfer_0_7_1_0";
+  "secp256k1" = dontDistribute super."secp256k1";
+  "secret-santa" = dontDistribute super."secret-santa";
+  "secret-sharing" = dontDistribute super."secret-sharing";
+  "secrm" = dontDistribute super."secrm";
+  "secure-sockets" = dontDistribute super."secure-sockets";
+  "sednaDBXML" = dontDistribute super."sednaDBXML";
+  "select" = dontDistribute super."select";
+  "selectors" = dontDistribute super."selectors";
+  "selenium" = dontDistribute super."selenium";
+  "selenium-server" = dontDistribute super."selenium-server";
+  "selfrestart" = dontDistribute super."selfrestart";
+  "selinux" = dontDistribute super."selinux";
+  "semaphore-plus" = dontDistribute super."semaphore-plus";
+  "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
+  "semigroups-actions" = dontDistribute super."semigroups-actions";
+  "semiring" = dontDistribute super."semiring";
+  "semiring-simple" = dontDistribute super."semiring-simple";
+  "semver-range" = dontDistribute super."semver-range";
+  "sendgrid-haskell" = dontDistribute super."sendgrid-haskell";
+  "sensei" = dontDistribute super."sensei";
+  "sensenet" = dontDistribute super."sensenet";
+  "sentry" = dontDistribute super."sentry";
+  "senza" = dontDistribute super."senza";
+  "separated" = dontDistribute super."separated";
+  "seqaid" = dontDistribute super."seqaid";
+  "seqid" = dontDistribute super."seqid";
+  "seqid-streams" = dontDistribute super."seqid-streams";
+  "seqloc-datafiles" = dontDistribute super."seqloc-datafiles";
+  "sequence" = dontDistribute super."sequence";
+  "sequent-core" = dontDistribute super."sequent-core";
+  "sequential-index" = dontDistribute super."sequential-index";
+  "sequor" = dontDistribute super."sequor";
+  "serial" = dontDistribute super."serial";
+  "serial-test-generators" = dontDistribute super."serial-test-generators";
+  "serialport" = dontDistribute super."serialport";
+  "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
+  "servant" = doDistribute super."servant_0_4_4_7";
+  "servant-blaze" = doDistribute super."servant-blaze_0_4_4_7";
+  "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-client" = doDistribute super."servant-client_0_4_4_7";
+  "servant-csharp" = dontDistribute super."servant-csharp";
+  "servant-docs" = doDistribute super."servant-docs_0_4_4_7";
+  "servant-ede" = dontDistribute super."servant-ede";
+  "servant-elm" = dontDistribute super."servant-elm";
+  "servant-examples" = dontDistribute super."servant-examples";
+  "servant-foreign" = dontDistribute super."servant-foreign";
+  "servant-github" = dontDistribute super."servant-github";
+  "servant-haxl-client" = dontDistribute super."servant-haxl-client";
+  "servant-js" = dontDistribute super."servant-js";
+  "servant-lucid" = dontDistribute super."servant-lucid";
+  "servant-mock" = dontDistribute super."servant-mock";
+  "servant-pandoc" = dontDistribute super."servant-pandoc";
+  "servant-pool" = dontDistribute super."servant-pool";
+  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-response" = dontDistribute super."servant-response";
+  "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-server" = doDistribute super."servant-server_0_4_4_7";
+  "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
+  "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
+  "sessions" = dontDistribute super."sessions";
+  "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
+  "set-with" = dontDistribute super."set-with";
+  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
+  "setops" = dontDistribute super."setops";
+  "setters" = dontDistribute super."setters";
+  "settings" = dontDistribute super."settings";
+  "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
+  "sexp-show" = dontDistribute super."sexp-show";
+  "sexpr" = dontDistribute super."sexpr";
+  "sext" = dontDistribute super."sext";
+  "sfml-audio" = dontDistribute super."sfml-audio";
+  "sfmt" = dontDistribute super."sfmt";
+  "sgd" = dontDistribute super."sgd";
+  "sgf" = dontDistribute super."sgf";
+  "sgrep" = dontDistribute super."sgrep";
+  "sha-streams" = dontDistribute super."sha-streams";
+  "shadower" = dontDistribute super."shadower";
+  "shadowsocks" = dontDistribute super."shadowsocks";
+  "shady-gen" = dontDistribute super."shady-gen";
+  "shady-graphics" = dontDistribute super."shady-graphics";
+  "shake-cabal-build" = dontDistribute super."shake-cabal-build";
+  "shake-extras" = dontDistribute super."shake-extras";
+  "shake-language-c" = doDistribute super."shake-language-c_0_8_6";
+  "shake-minify" = dontDistribute super."shake-minify";
+  "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
+  "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
+  "shakespeare-css" = dontDistribute super."shakespeare-css";
+  "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
+  "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-text" = dontDistribute super."shakespeare-text";
+  "shana" = dontDistribute super."shana";
+  "shapefile" = dontDistribute super."shapefile";
+  "shapely-data" = dontDistribute super."shapely-data";
+  "sharc-timbre" = dontDistribute super."sharc-timbre";
+  "shared-buffer" = dontDistribute super."shared-buffer";
+  "shared-fields" = dontDistribute super."shared-fields";
+  "shared-memory" = dontDistribute super."shared-memory";
+  "sharedio" = dontDistribute super."sharedio";
+  "she" = dontDistribute super."she";
+  "shelduck" = dontDistribute super."shelduck";
+  "shell-escape" = dontDistribute super."shell-escape";
+  "shell-monad" = dontDistribute super."shell-monad";
+  "shell-pipe" = dontDistribute super."shell-pipe";
+  "shellish" = dontDistribute super."shellish";
+  "shellmate" = dontDistribute super."shellmate";
+  "shelly-extra" = dontDistribute super."shelly-extra";
+  "shine" = dontDistribute super."shine";
+  "shine-varying" = dontDistribute super."shine-varying";
+  "shivers-cfg" = dontDistribute super."shivers-cfg";
+  "shoap" = dontDistribute super."shoap";
+  "shortcircuit" = dontDistribute super."shortcircuit";
+  "shorten-strings" = dontDistribute super."shorten-strings";
+  "should-not-typecheck" = doDistribute super."should-not-typecheck_2_0_1";
+  "show" = dontDistribute super."show";
+  "show-type" = dontDistribute super."show-type";
+  "showdown" = dontDistribute super."showdown";
+  "shpider" = dontDistribute super."shpider";
+  "shplit" = dontDistribute super."shplit";
+  "shqq" = dontDistribute super."shqq";
+  "shuffle" = dontDistribute super."shuffle";
+  "sieve" = dontDistribute super."sieve";
+  "sifflet" = dontDistribute super."sifflet";
+  "sifflet-lib" = dontDistribute super."sifflet-lib";
+  "sign" = dontDistribute super."sign";
+  "signals" = dontDistribute super."signals";
+  "signed-multiset" = dontDistribute super."signed-multiset";
+  "simd" = dontDistribute super."simd";
+  "simgi" = dontDistribute super."simgi";
+  "simple-actors" = dontDistribute super."simple-actors";
+  "simple-atom" = dontDistribute super."simple-atom";
+  "simple-bluetooth" = dontDistribute super."simple-bluetooth";
+  "simple-c-value" = dontDistribute super."simple-c-value";
+  "simple-conduit" = dontDistribute super."simple-conduit";
+  "simple-config" = dontDistribute super."simple-config";
+  "simple-css" = dontDistribute super."simple-css";
+  "simple-eval" = dontDistribute super."simple-eval";
+  "simple-firewire" = dontDistribute super."simple-firewire";
+  "simple-form" = dontDistribute super."simple-form";
+  "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm";
+  "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr";
+  "simple-get-opt" = dontDistribute super."simple-get-opt";
+  "simple-index" = dontDistribute super."simple-index";
+  "simple-log" = dontDistribute super."simple-log";
+  "simple-log-syslog" = dontDistribute super."simple-log-syslog";
+  "simple-neural-networks" = dontDistribute super."simple-neural-networks";
+  "simple-nix" = dontDistribute super."simple-nix";
+  "simple-observer" = dontDistribute super."simple-observer";
+  "simple-pascal" = dontDistribute super."simple-pascal";
+  "simple-pipe" = dontDistribute super."simple-pipe";
+  "simple-rope" = dontDistribute super."simple-rope";
+  "simple-server" = dontDistribute super."simple-server";
+  "simple-sessions" = dontDistribute super."simple-sessions";
+  "simple-sql-parser" = dontDistribute super."simple-sql-parser";
+  "simple-stacked-vm" = dontDistribute super."simple-stacked-vm";
+  "simple-tabular" = dontDistribute super."simple-tabular";
+  "simple-vec3" = dontDistribute super."simple-vec3";
+  "simpleargs" = dontDistribute super."simpleargs";
+  "simpleirc" = dontDistribute super."simpleirc";
+  "simpleirc-lens" = dontDistribute super."simpleirc-lens";
+  "simplenote" = dontDistribute super."simplenote";
+  "simpleprelude" = dontDistribute super."simpleprelude";
+  "simplesmtpclient" = dontDistribute super."simplesmtpclient";
+  "simplessh" = dontDistribute super."simplessh";
+  "simplest-sqlite" = dontDistribute super."simplest-sqlite";
+  "simplex" = dontDistribute super."simplex";
+  "simplex-basic" = dontDistribute super."simplex-basic";
+  "simseq" = dontDistribute super."simseq";
+  "simtreelo" = dontDistribute super."simtreelo";
+  "sindre" = dontDistribute super."sindre";
+  "singleton-nats" = dontDistribute super."singleton-nats";
+  "sink" = dontDistribute super."sink";
+  "sirkel" = dontDistribute super."sirkel";
+  "sitemap" = dontDistribute super."sitemap";
+  "sized" = dontDistribute super."sized";
+  "sized-types" = dontDistribute super."sized-types";
+  "sized-vector" = dontDistribute super."sized-vector";
+  "sizes" = dontDistribute super."sizes";
+  "sjsp" = dontDistribute super."sjsp";
+  "skeleton" = dontDistribute super."skeleton";
+  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
+  "skype4hs" = dontDistribute super."skype4hs";
+  "skypelogexport" = dontDistribute super."skypelogexport";
+  "slack" = dontDistribute super."slack";
+  "slack-api" = dontDistribute super."slack-api";
+  "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "sleep" = dontDistribute super."sleep";
+  "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
+  "slidemews" = dontDistribute super."slidemews";
+  "sloane" = dontDistribute super."sloane";
+  "slot-lambda" = dontDistribute super."slot-lambda";
+  "sloth" = dontDistribute super."sloth";
+  "smallarray" = dontDistribute super."smallarray";
+  "smallcheck-laws" = dontDistribute super."smallcheck-laws";
+  "smallcheck-lens" = dontDistribute super."smallcheck-lens";
+  "smallcheck-series" = dontDistribute super."smallcheck-series";
+  "smallpt-hs" = dontDistribute super."smallpt-hs";
+  "smallstring" = dontDistribute super."smallstring";
+  "smaoin" = dontDistribute super."smaoin";
+  "smartGroup" = dontDistribute super."smartGroup";
+  "smartcheck" = dontDistribute super."smartcheck";
+  "smartconstructor" = dontDistribute super."smartconstructor";
+  "smartword" = dontDistribute super."smartword";
+  "sme" = dontDistribute super."sme";
+  "smt-lib" = dontDistribute super."smt-lib";
+  "smtlib2" = dontDistribute super."smtlib2";
+  "smtp-mail-ng" = dontDistribute super."smtp-mail-ng";
+  "smtp2mta" = dontDistribute super."smtp2mta";
+  "smtps-gmail" = dontDistribute super."smtps-gmail";
+  "snake-game" = dontDistribute super."snake-game";
+  "snap-accept" = dontDistribute super."snap-accept";
+  "snap-app" = dontDistribute super."snap-app";
+  "snap-auth-cli" = dontDistribute super."snap-auth-cli";
+  "snap-blaze" = dontDistribute super."snap-blaze";
+  "snap-blaze-clay" = dontDistribute super."snap-blaze-clay";
+  "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities";
+  "snap-cors" = dontDistribute super."snap-cors";
+  "snap-elm" = dontDistribute super."snap-elm";
+  "snap-error-collector" = dontDistribute super."snap-error-collector";
+  "snap-extras" = dontDistribute super."snap-extras";
+  "snap-language" = dontDistribute super."snap-language";
+  "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic";
+  "snap-loader-static" = dontDistribute super."snap-loader-static";
+  "snap-predicates" = dontDistribute super."snap-predicates";
+  "snap-testing" = dontDistribute super."snap-testing";
+  "snap-utils" = dontDistribute super."snap-utils";
+  "snap-web-routes" = dontDistribute super."snap-web-routes";
+  "snaplet-acid-state" = dontDistribute super."snaplet-acid-state";
+  "snaplet-actionlog" = dontDistribute super."snaplet-actionlog";
+  "snaplet-amqp" = dontDistribute super."snaplet-amqp";
+  "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid";
+  "snaplet-coffee" = dontDistribute super."snaplet-coffee";
+  "snaplet-css-min" = dontDistribute super."snaplet-css-min";
+  "snaplet-environments" = dontDistribute super."snaplet-environments";
+  "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs";
+  "snaplet-hasql" = dontDistribute super."snaplet-hasql";
+  "snaplet-haxl" = dontDistribute super."snaplet-haxl";
+  "snaplet-hdbc" = dontDistribute super."snaplet-hdbc";
+  "snaplet-hslogger" = dontDistribute super."snaplet-hslogger";
+  "snaplet-i18n" = dontDistribute super."snaplet-i18n";
+  "snaplet-influxdb" = dontDistribute super."snaplet-influxdb";
+  "snaplet-lss" = dontDistribute super."snaplet-lss";
+  "snaplet-mandrill" = dontDistribute super."snaplet-mandrill";
+  "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB";
+  "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic";
+  "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple";
+  "snaplet-oauth" = dontDistribute super."snaplet-oauth";
+  "snaplet-persistent" = dontDistribute super."snaplet-persistent";
+  "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple";
+  "snaplet-postmark" = dontDistribute super."snaplet-postmark";
+  "snaplet-purescript" = dontDistribute super."snaplet-purescript";
+  "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha";
+  "snaplet-redis" = dontDistribute super."snaplet-redis";
+  "snaplet-redson" = dontDistribute super."snaplet-redson";
+  "snaplet-rest" = dontDistribute super."snaplet-rest";
+  "snaplet-riak" = dontDistribute super."snaplet-riak";
+  "snaplet-sass" = dontDistribute super."snaplet-sass";
+  "snaplet-sedna" = dontDistribute super."snaplet-sedna";
+  "snaplet-ses-html" = dontDistribute super."snaplet-ses-html";
+  "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple";
+  "snaplet-stripe" = dontDistribute super."snaplet-stripe";
+  "snaplet-tasks" = dontDistribute super."snaplet-tasks";
+  "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions";
+  "snaplet-wordpress" = dontDistribute super."snaplet-wordpress";
+  "snappy" = dontDistribute super."snappy";
+  "snappy-conduit" = dontDistribute super."snappy-conduit";
+  "snappy-framing" = dontDistribute super."snappy-framing";
+  "snappy-iteratee" = dontDistribute super."snappy-iteratee";
+  "sndfile-enumerators" = dontDistribute super."sndfile-enumerators";
+  "sneakyterm" = dontDistribute super."sneakyterm";
+  "sneathlane-haste" = dontDistribute super."sneathlane-haste";
+  "snippet-extractor" = dontDistribute super."snippet-extractor";
+  "snm" = dontDistribute super."snm";
+  "snow-white" = dontDistribute super."snow-white";
+  "snowball" = dontDistribute super."snowball";
+  "snowglobe" = dontDistribute super."snowglobe";
+  "sock2stream" = dontDistribute super."sock2stream";
+  "sockaddr" = dontDistribute super."sockaddr";
+  "socket" = doDistribute super."socket_0_5_3_1";
+  "socket-activation" = dontDistribute super."socket-activation";
+  "socket-sctp" = dontDistribute super."socket-sctp";
+  "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
+  "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
+  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
+  "sophia" = dontDistribute super."sophia";
+  "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
+  "sorted" = dontDistribute super."sorted";
+  "sorting" = dontDistribute super."sorting";
+  "sorty" = dontDistribute super."sorty";
+  "sound-collage" = dontDistribute super."sound-collage";
+  "sounddelay" = dontDistribute super."sounddelay";
+  "source-code-server" = dontDistribute super."source-code-server";
+  "sousit" = dontDistribute super."sousit";
+  "sox" = dontDistribute super."sox";
+  "soxlib" = dontDistribute super."soxlib";
+  "soyuz" = dontDistribute super."soyuz";
+  "spacefill" = dontDistribute super."spacefill";
+  "spacepart" = dontDistribute super."spacepart";
+  "spaceprobe" = dontDistribute super."spaceprobe";
+  "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
+  "sparse" = dontDistribute super."sparse";
+  "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
+  "sparsebit" = dontDistribute super."sparsebit";
+  "sparsecheck" = dontDistribute super."sparsecheck";
+  "sparser" = dontDistribute super."sparser";
+  "spata" = dontDistribute super."spata";
+  "spatial-math" = dontDistribute super."spatial-math";
+  "spawn" = dontDistribute super."spawn";
+  "spe" = dontDistribute super."spe";
+  "special-functors" = dontDistribute super."special-functors";
+  "special-keys" = dontDistribute super."special-keys";
+  "specialize-th" = dontDistribute super."specialize-th";
+  "species" = dontDistribute super."species";
+  "speculation-transformers" = dontDistribute super."speculation-transformers";
+  "spelling-suggest" = dontDistribute super."spelling-suggest";
+  "sphero" = dontDistribute super."sphero";
+  "sphinx-cli" = dontDistribute super."sphinx-cli";
+  "spice" = dontDistribute super."spice";
+  "spike" = dontDistribute super."spike";
+  "spine" = dontDistribute super."spine";
+  "spir-v" = dontDistribute super."spir-v";
+  "splay" = dontDistribute super."splay";
+  "splaytree" = dontDistribute super."splaytree";
+  "spline3" = dontDistribute super."spline3";
+  "splines" = dontDistribute super."splines";
+  "split-channel" = dontDistribute super."split-channel";
+  "split-record" = dontDistribute super."split-record";
+  "split-tchan" = dontDistribute super."split-tchan";
+  "splitter" = dontDistribute super."splitter";
+  "splot" = dontDistribute super."splot";
+  "spool" = dontDistribute super."spool";
+  "spoonutil" = dontDistribute super."spoonutil";
+  "spoty" = dontDistribute super."spoty";
+  "spreadsheet" = dontDistribute super."spreadsheet";
+  "spritz" = dontDistribute super."spritz";
+  "sproxy" = dontDistribute super."sproxy";
+  "spsa" = dontDistribute super."spsa";
+  "spy" = dontDistribute super."spy";
+  "sql-simple" = dontDistribute super."sql-simple";
+  "sql-simple-mysql" = dontDistribute super."sql-simple-mysql";
+  "sql-simple-pool" = dontDistribute super."sql-simple-pool";
+  "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql";
+  "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite";
+  "sql-words" = dontDistribute super."sql-words";
+  "sqlite" = dontDistribute super."sqlite";
+  "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed";
+  "sqlvalue-list" = dontDistribute super."sqlvalue-list";
+  "squeeze" = dontDistribute super."squeeze";
+  "sr-extra" = dontDistribute super."sr-extra";
+  "srcinst" = dontDistribute super."srcinst";
+  "srec" = dontDistribute super."srec";
+  "sscgi" = dontDistribute super."sscgi";
+  "ssh" = dontDistribute super."ssh";
+  "sshd-lint" = dontDistribute super."sshd-lint";
+  "sshtun" = dontDistribute super."sshtun";
+  "sssp" = dontDistribute super."sssp";
+  "sstable" = dontDistribute super."sstable";
+  "ssv" = dontDistribute super."ssv";
+  "stable-heap" = dontDistribute super."stable-heap";
+  "stable-maps" = dontDistribute super."stable-maps";
+  "stable-marriage" = dontDistribute super."stable-marriage";
+  "stable-memo" = dontDistribute super."stable-memo";
+  "stable-tree" = dontDistribute super."stable-tree";
+  "stack" = doDistribute super."stack_1_0_2";
+  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
+  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
+  "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
+  "standalone-haddock" = dontDistribute super."standalone-haddock";
+  "star-to-star" = dontDistribute super."star-to-star";
+  "star-to-star-contra" = dontDistribute super."star-to-star-contra";
+  "starling" = dontDistribute super."starling";
+  "starrover2" = dontDistribute super."starrover2";
+  "stash" = dontDistribute super."stash";
+  "state" = dontDistribute super."state";
+  "state-record" = dontDistribute super."state-record";
+  "statechart" = dontDistribute super."statechart";
+  "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statethread" = dontDistribute super."statethread";
+  "statgrab" = dontDistribute super."statgrab";
+  "static-hash" = dontDistribute super."static-hash";
+  "static-resources" = dontDistribute super."static-resources";
+  "staticanalysis" = dontDistribute super."staticanalysis";
+  "statistics-dirichlet" = dontDistribute super."statistics-dirichlet";
+  "statistics-fusion" = dontDistribute super."statistics-fusion";
+  "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar";
+  "stats" = dontDistribute super."stats";
+  "statsd" = dontDistribute super."statsd";
+  "statsd-client" = dontDistribute super."statsd-client";
+  "statsd-datadog" = dontDistribute super."statsd-datadog";
+  "statvfs" = dontDistribute super."statvfs";
+  "stb-image" = dontDistribute super."stb-image";
+  "stb-truetype" = dontDistribute super."stb-truetype";
+  "stdata" = dontDistribute super."stdata";
+  "stdf" = dontDistribute super."stdf";
+  "steambrowser" = dontDistribute super."steambrowser";
+  "steeloverseer" = dontDistribute super."steeloverseer";
+  "stemmer" = dontDistribute super."stemmer";
+  "step-function" = dontDistribute super."step-function";
+  "stepwise" = dontDistribute super."stepwise";
+  "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
+  "stitch" = dontDistribute super."stitch";
+  "stm-channelize" = dontDistribute super."stm-channelize";
+  "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
+  "stm-conduit" = doDistribute super."stm-conduit_2_7_0";
+  "stm-firehose" = dontDistribute super."stm-firehose";
+  "stm-io-hooks" = dontDistribute super."stm-io-hooks";
+  "stm-lifted" = dontDistribute super."stm-lifted";
+  "stm-linkedlist" = dontDistribute super."stm-linkedlist";
+  "stm-orelse-io" = dontDistribute super."stm-orelse-io";
+  "stm-promise" = dontDistribute super."stm-promise";
+  "stm-queue-extras" = dontDistribute super."stm-queue-extras";
+  "stm-sbchan" = dontDistribute super."stm-sbchan";
+  "stm-split" = dontDistribute super."stm-split";
+  "stm-tlist" = dontDistribute super."stm-tlist";
+  "stmcontrol" = dontDistribute super."stmcontrol";
+  "stomp-conduit" = dontDistribute super."stomp-conduit";
+  "stomp-patterns" = dontDistribute super."stomp-patterns";
+  "stomp-queue" = dontDistribute super."stomp-queue";
+  "stompl" = dontDistribute super."stompl";
+  "stopwatch" = dontDistribute super."stopwatch";
+  "storable" = dontDistribute super."storable";
+  "storable-record" = dontDistribute super."storable-record";
+  "storable-static-array" = dontDistribute super."storable-static-array";
+  "storable-tuple" = dontDistribute super."storable-tuple";
+  "storablevector" = dontDistribute super."storablevector";
+  "storablevector-carray" = dontDistribute super."storablevector-carray";
+  "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
+  "str" = dontDistribute super."str";
+  "stratosphere" = dontDistribute super."stratosphere";
+  "stratum-tool" = dontDistribute super."stratum-tool";
+  "stream" = dontDistribute super."stream";
+  "stream-fusion" = dontDistribute super."stream-fusion";
+  "stream-monad" = dontDistribute super."stream-monad";
+  "streamed" = dontDistribute super."streamed";
+  "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
+  "streaming-utils" = dontDistribute super."streaming-utils";
+  "streaming-wai" = dontDistribute super."streaming-wai";
+  "strict-base-types" = doDistribute super."strict-base-types_0_4_0";
+  "strict-concurrency" = dontDistribute super."strict-concurrency";
+  "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin";
+  "strict-identity" = dontDistribute super."strict-identity";
+  "strict-io" = dontDistribute super."strict-io";
+  "strictify" = dontDistribute super."strictify";
+  "strictly" = dontDistribute super."strictly";
+  "string" = dontDistribute super."string";
+  "string-conv" = dontDistribute super."string-conv";
+  "string-convert" = dontDistribute super."string-convert";
+  "string-quote" = dontDistribute super."string-quote";
+  "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
+  "stringlike" = dontDistribute super."stringlike";
+  "stringprep" = dontDistribute super."stringprep";
+  "strings" = dontDistribute super."strings";
+  "stringtable-atom" = dontDistribute super."stringtable-atom";
+  "strio" = dontDistribute super."strio";
+  "stripe" = dontDistribute super."stripe";
+  "stripe-http-streams" = doDistribute super."stripe-http-streams_2_0_2";
+  "strive" = dontDistribute super."strive";
+  "strptime" = dontDistribute super."strptime";
+  "structs" = dontDistribute super."structs";
+  "structural-induction" = dontDistribute super."structural-induction";
+  "structured-haskell-mode" = dontDistribute super."structured-haskell-mode";
+  "structured-mongoDB" = dontDistribute super."structured-mongoDB";
+  "structures" = dontDistribute super."structures";
+  "stunclient" = dontDistribute super."stunclient";
+  "stunts" = dontDistribute super."stunts";
+  "stylized" = dontDistribute super."stylized";
+  "sub-state" = dontDistribute super."sub-state";
+  "subhask" = dontDistribute super."subhask";
+  "subleq-toolchain" = dontDistribute super."subleq-toolchain";
+  "subnet" = dontDistribute super."subnet";
+  "subtitleParser" = dontDistribute super."subtitleParser";
+  "subtitles" = dontDistribute super."subtitles";
+  "suffixarray" = dontDistribute super."suffixarray";
+  "suffixtree" = dontDistribute super."suffixtree";
+  "sugarhaskell" = dontDistribute super."sugarhaskell";
+  "suitable" = dontDistribute super."suitable";
+  "sump" = dontDistribute super."sump";
+  "sundown" = dontDistribute super."sundown";
+  "sunlight" = dontDistribute super."sunlight";
+  "sunroof-compiler" = dontDistribute super."sunroof-compiler";
+  "sunroof-examples" = dontDistribute super."sunroof-examples";
+  "sunroof-server" = dontDistribute super."sunroof-server";
+  "super-user-spark" = dontDistribute super."super-user-spark";
+  "supercollider-ht" = dontDistribute super."supercollider-ht";
+  "supercollider-midi" = dontDistribute super."supercollider-midi";
+  "superdoc" = dontDistribute super."superdoc";
+  "supero" = dontDistribute super."supero";
+  "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
+  "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
+  "svg2q" = dontDistribute super."svg2q";
+  "svgcairo" = dontDistribute super."svgcairo";
+  "svgutils" = dontDistribute super."svgutils";
+  "svm" = dontDistribute super."svm";
+  "svm-light-utils" = dontDistribute super."svm-light-utils";
+  "svm-simple" = dontDistribute super."svm-simple";
+  "svndump" = dontDistribute super."svndump";
+  "swagger2" = doDistribute super."swagger2_1_2_1";
+  "swapper" = dontDistribute super."swapper";
+  "swearjure" = dontDistribute super."swearjure";
+  "swf" = dontDistribute super."swf";
+  "swift-lda" = dontDistribute super."swift-lda";
+  "swish" = dontDistribute super."swish";
+  "sws" = dontDistribute super."sws";
+  "syb-extras" = dontDistribute super."syb-extras";
+  "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text";
+  "sylvia" = dontDistribute super."sylvia";
+  "sym" = dontDistribute super."sym";
+  "sym-plot" = dontDistribute super."sym-plot";
+  "symbol" = dontDistribute super."symbol";
+  "symengine-hs" = dontDistribute super."symengine-hs";
+  "sync" = dontDistribute super."sync";
+  "synchronous-channels" = dontDistribute super."synchronous-channels";
+  "syncthing-hs" = dontDistribute super."syncthing-hs";
+  "synt" = dontDistribute super."synt";
+  "syntactic" = dontDistribute super."syntactic";
+  "syntactical" = dontDistribute super."syntactical";
+  "syntax" = dontDistribute super."syntax";
+  "syntax-attoparsec" = dontDistribute super."syntax-attoparsec";
+  "syntax-example" = dontDistribute super."syntax-example";
+  "syntax-example-json" = dontDistribute super."syntax-example-json";
+  "syntax-pretty" = dontDistribute super."syntax-pretty";
+  "syntax-printer" = dontDistribute super."syntax-printer";
+  "syntax-trees" = dontDistribute super."syntax-trees";
+  "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn";
+  "synthesizer" = dontDistribute super."synthesizer";
+  "synthesizer-alsa" = dontDistribute super."synthesizer-alsa";
+  "synthesizer-core" = dontDistribute super."synthesizer-core";
+  "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional";
+  "synthesizer-filter" = dontDistribute super."synthesizer-filter";
+  "synthesizer-inference" = dontDistribute super."synthesizer-inference";
+  "synthesizer-llvm" = dontDistribute super."synthesizer-llvm";
+  "synthesizer-midi" = dontDistribute super."synthesizer-midi";
+  "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient";
+  "sys-process" = dontDistribute super."sys-process";
+  "system-canonicalpath" = dontDistribute super."system-canonicalpath";
+  "system-command" = dontDistribute super."system-command";
+  "system-gpio" = dontDistribute super."system-gpio";
+  "system-inotify" = dontDistribute super."system-inotify";
+  "system-lifted" = dontDistribute super."system-lifted";
+  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
+  "system-util" = dontDistribute super."system-util";
+  "system-uuid" = dontDistribute super."system-uuid";
+  "systemd" = dontDistribute super."systemd";
+  "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
+  "ta" = dontDistribute super."ta";
+  "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
+  "table-tennis" = dontDistribute super."table-tennis";
+  "tableaux" = dontDistribute super."tableaux";
+  "tables" = dontDistribute super."tables";
+  "tablestorage" = dontDistribute super."tablestorage";
+  "tabloid" = dontDistribute super."tabloid";
+  "taffybar" = dontDistribute super."taffybar";
+  "tag-bits" = dontDistribute super."tag-bits";
+  "tag-stream" = dontDistribute super."tag-stream";
+  "tagchup" = dontDistribute super."tagchup";
+  "tagged-exception-core" = dontDistribute super."tagged-exception-core";
+  "tagged-list" = dontDistribute super."tagged-list";
+  "tagged-th" = dontDistribute super."tagged-th";
+  "tagged-timers" = dontDistribute super."tagged-timers";
+  "tagged-transformer" = dontDistribute super."tagged-transformer";
+  "tagging" = dontDistribute super."tagging";
+  "taggy" = dontDistribute super."taggy";
+  "taggy-lens" = dontDistribute super."taggy-lens";
+  "taglib" = dontDistribute super."taglib";
+  "taglib-api" = dontDistribute super."taglib-api";
+  "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup-ht" = dontDistribute super."tagsoup-ht";
+  "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
+  "takahashi" = dontDistribute super."takahashi";
+  "takusen-oracle" = dontDistribute super."takusen-oracle";
+  "tamarin-prover" = dontDistribute super."tamarin-prover";
+  "tamarin-prover-term" = dontDistribute super."tamarin-prover-term";
+  "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
+  "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
+  "tamper" = dontDistribute super."tamper";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
+  "target" = dontDistribute super."target";
+  "task" = dontDistribute super."task";
+  "task-distribution" = dontDistribute super."task-distribution";
+  "taskpool" = dontDistribute super."taskpool";
+  "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
+  "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
+  "tasty-integrate" = dontDistribute super."tasty-integrate";
+  "tasty-laws" = dontDistribute super."tasty-laws";
+  "tasty-lens" = dontDistribute super."tasty-lens";
+  "tasty-program" = dontDistribute super."tasty-program";
+  "tateti-tateti" = dontDistribute super."tateti-tateti";
+  "tau" = dontDistribute super."tau";
+  "tbox" = dontDistribute super."tbox";
+  "tcache-AWS" = dontDistribute super."tcache-AWS";
+  "tccli" = dontDistribute super."tccli";
+  "tce-conf" = dontDistribute super."tce-conf";
+  "tconfig" = dontDistribute super."tconfig";
+  "tcp" = dontDistribute super."tcp";
+  "tdd-util" = dontDistribute super."tdd-util";
+  "tdoc" = dontDistribute super."tdoc";
+  "teams" = dontDistribute super."teams";
+  "teeth" = dontDistribute super."teeth";
+  "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
+  "template-default" = dontDistribute super."template-default";
+  "template-haskell-util" = dontDistribute super."template-haskell-util";
+  "template-hsml" = dontDistribute super."template-hsml";
+  "template-yj" = dontDistribute super."template-yj";
+  "templatepg" = dontDistribute super."templatepg";
+  "templater" = dontDistribute super."templater";
+  "tempo" = dontDistribute super."tempo";
+  "tempodb" = dontDistribute super."tempodb";
+  "temporal-csound" = dontDistribute super."temporal-csound";
+  "temporal-media" = dontDistribute super."temporal-media";
+  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
+  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
+  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
+  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
+  "tempus" = dontDistribute super."tempus";
+  "tempus-fugit" = dontDistribute super."tempus-fugit";
+  "tensor" = dontDistribute super."tensor";
+  "term-rewriting" = dontDistribute super."term-rewriting";
+  "termbox-bindings" = dontDistribute super."termbox-bindings";
+  "termination-combinators" = dontDistribute super."termination-combinators";
+  "terminfo" = doDistribute super."terminfo_0_4_0_2";
+  "terminfo-hs" = dontDistribute super."terminfo-hs";
+  "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
+  "terrahs" = dontDistribute super."terrahs";
+  "tersmu" = dontDistribute super."tersmu";
+  "test-framework-doctest" = dontDistribute super."test-framework-doctest";
+  "test-framework-golden" = dontDistribute super."test-framework-golden";
+  "test-framework-program" = dontDistribute super."test-framework-program";
+  "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck";
+  "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
+  "test-framework-skip" = dontDistribute super."test-framework-skip";
+  "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-invariant" = dontDistribute super."test-invariant";
+  "test-pkg" = dontDistribute super."test-pkg";
+  "test-sandbox" = dontDistribute super."test-sandbox";
+  "test-sandbox-compose" = dontDistribute super."test-sandbox-compose";
+  "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit";
+  "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
+  "test-shouldbe" = dontDistribute super."test-shouldbe";
+  "testPkg" = dontDistribute super."testPkg";
+  "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
+  "testloop" = dontDistribute super."testloop";
+  "testpack" = dontDistribute super."testpack";
+  "testpattern" = dontDistribute super."testpattern";
+  "testrunner" = dontDistribute super."testrunner";
+  "tetris" = dontDistribute super."tetris";
+  "tex2txt" = dontDistribute super."tex2txt";
+  "texrunner" = dontDistribute super."texrunner";
+  "text-and-plots" = dontDistribute super."text-and-plots";
+  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-translit" = dontDistribute super."text-icu-translit";
+  "text-json-qq" = dontDistribute super."text-json-qq";
+  "text-latin1" = dontDistribute super."text-latin1";
+  "text-ldap" = dontDistribute super."text-ldap";
+  "text-locale-encoding" = dontDistribute super."text-locale-encoding";
+  "text-normal" = dontDistribute super."text-normal";
+  "text-position" = dontDistribute super."text-position";
+  "text-postgresql" = dontDistribute super."text-postgresql";
+  "text-printer" = dontDistribute super."text-printer";
+  "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
+  "text-register-machine" = dontDistribute super."text-register-machine";
+  "text-render" = dontDistribute super."text-render";
+  "text-show-instances" = dontDistribute super."text-show-instances";
+  "text-stream-decode" = dontDistribute super."text-stream-decode";
+  "text-utf7" = dontDistribute super."text-utf7";
+  "text-xml-generic" = dontDistribute super."text-xml-generic";
+  "text-xml-qq" = dontDistribute super."text-xml-qq";
+  "text1" = dontDistribute super."text1";
+  "textPlot" = dontDistribute super."textPlot";
+  "textmatetags" = dontDistribute super."textmatetags";
+  "textocat-api" = dontDistribute super."textocat-api";
+  "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
+  "tfp" = dontDistribute super."tfp";
+  "tfp-th" = dontDistribute super."tfp-th";
+  "tftp" = dontDistribute super."tftp";
+  "tga" = dontDistribute super."tga";
+  "th-alpha" = dontDistribute super."th-alpha";
+  "th-build" = dontDistribute super."th-build";
+  "th-cas" = dontDistribute super."th-cas";
+  "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
+  "th-fold" = dontDistribute super."th-fold";
+  "th-inline-io-action" = dontDistribute super."th-inline-io-action";
+  "th-instance-reification" = dontDistribute super."th-instance-reification";
+  "th-instances" = dontDistribute super."th-instances";
+  "th-kinds" = dontDistribute super."th-kinds";
+  "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-lift-instances" = dontDistribute super."th-lift-instances";
+  "th-printf" = dontDistribute super."th-printf";
+  "th-sccs" = dontDistribute super."th-sccs";
+  "th-traced" = dontDistribute super."th-traced";
+  "th-typegraph" = dontDistribute super."th-typegraph";
+  "themoviedb" = dontDistribute super."themoviedb";
+  "themplate" = dontDistribute super."themplate";
+  "theoremquest" = dontDistribute super."theoremquest";
+  "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "thespian" = dontDistribute super."thespian";
+  "theta-functions" = dontDistribute super."theta-functions";
+  "thih" = dontDistribute super."thih";
+  "thimk" = dontDistribute super."thimk";
+  "thorn" = dontDistribute super."thorn";
+  "thread-local-storage" = dontDistribute super."thread-local-storage";
+  "threadPool" = dontDistribute super."threadPool";
+  "threadmanager" = dontDistribute super."threadmanager";
+  "threads-pool" = dontDistribute super."threads-pool";
+  "threads-supervisor" = dontDistribute super."threads-supervisor";
+  "threadscope" = dontDistribute super."threadscope";
+  "threefish" = dontDistribute super."threefish";
+  "threepenny-gui" = dontDistribute super."threepenny-gui";
+  "thrift" = dontDistribute super."thrift";
+  "thrist" = dontDistribute super."thrist";
+  "throttle" = dontDistribute super."throttle";
+  "thumbnail" = dontDistribute super."thumbnail";
+  "tianbar" = dontDistribute super."tianbar";
+  "tic-tac-toe" = dontDistribute super."tic-tac-toe";
+  "tickle" = dontDistribute super."tickle";
+  "tictactoe3d" = dontDistribute super."tictactoe3d";
+  "tidal" = dontDistribute super."tidal";
+  "tidal-midi" = dontDistribute super."tidal-midi";
+  "tidal-vis" = dontDistribute super."tidal-vis";
+  "tie-knot" = dontDistribute super."tie-knot";
+  "tiempo" = dontDistribute super."tiempo";
+  "tiger" = dontDistribute super."tiger";
+  "tight-apply" = dontDistribute super."tight-apply";
+  "tightrope" = dontDistribute super."tightrope";
+  "tighttp" = dontDistribute super."tighttp";
+  "tilings" = dontDistribute super."tilings";
+  "timberc" = dontDistribute super."timberc";
+  "time-cache" = dontDistribute super."time-cache";
+  "time-extras" = dontDistribute super."time-extras";
+  "time-exts" = dontDistribute super."time-exts";
+  "time-http" = dontDistribute super."time-http";
+  "time-interval" = dontDistribute super."time-interval";
+  "time-io-access" = dontDistribute super."time-io-access";
+  "time-out" = dontDistribute super."time-out";
+  "time-patterns" = dontDistribute super."time-patterns";
+  "time-qq" = dontDistribute super."time-qq";
+  "time-recurrence" = dontDistribute super."time-recurrence";
+  "time-series" = dontDistribute super."time-series";
+  "time-w3c" = dontDistribute super."time-w3c";
+  "timecalc" = dontDistribute super."timecalc";
+  "timeconsole" = dontDistribute super."timeconsole";
+  "timeless" = dontDistribute super."timeless";
+  "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
+  "timelike-time" = dontDistribute super."timelike-time";
+  "timemap" = dontDistribute super."timemap";
+  "timeout" = dontDistribute super."timeout";
+  "timeout-control" = dontDistribute super."timeout-control";
+  "timeout-with-results" = dontDistribute super."timeout-with-results";
+  "timeparsers" = dontDistribute super."timeparsers";
+  "timeplot" = dontDistribute super."timeplot";
+  "timers" = dontDistribute super."timers";
+  "timers-updatable" = dontDistribute super."timers-updatable";
+  "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines";
+  "timestamper" = dontDistribute super."timestamper";
+  "timezone-olson-th" = dontDistribute super."timezone-olson-th";
+  "timing-convenience" = dontDistribute super."timing-convenience";
+  "tinyMesh" = dontDistribute super."tinyMesh";
+  "tinylog" = doDistribute super."tinylog_0_12_1";
+  "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
+  "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
+  "titlecase" = dontDistribute super."titlecase";
+  "tkhs" = dontDistribute super."tkhs";
+  "tkyprof" = dontDistribute super."tkyprof";
+  "tld" = dontDistribute super."tld";
+  "tls-debug" = doDistribute super."tls-debug_0_4_1";
+  "tls-extra" = dontDistribute super."tls-extra";
+  "tmpl" = dontDistribute super."tmpl";
+  "tn" = dontDistribute super."tn";
+  "tnet" = dontDistribute super."tnet";
+  "to-haskell" = dontDistribute super."to-haskell";
+  "to-string-class" = dontDistribute super."to-string-class";
+  "to-string-instances" = dontDistribute super."to-string-instances";
+  "todos" = dontDistribute super."todos";
+  "tofromxml" = dontDistribute super."tofromxml";
+  "toilet" = dontDistribute super."toilet";
+  "tokenify" = dontDistribute super."tokenify";
+  "tokenize" = dontDistribute super."tokenize";
+  "toktok" = dontDistribute super."toktok";
+  "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell";
+  "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell";
+  "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal";
+  "toml" = dontDistribute super."toml";
+  "toolshed" = dontDistribute super."toolshed";
+  "topkata" = dontDistribute super."topkata";
+  "torch" = dontDistribute super."torch";
+  "total" = dontDistribute super."total";
+  "total-alternative" = dontDistribute super."total-alternative";
+  "total-map" = dontDistribute super."total-map";
+  "total-maps" = dontDistribute super."total-maps";
+  "touched" = dontDistribute super."touched";
+  "toysolver" = dontDistribute super."toysolver";
+  "tpdb" = dontDistribute super."tpdb";
+  "trace" = dontDistribute super."trace";
+  "trace-call" = dontDistribute super."trace-call";
+  "trace-function-call" = dontDistribute super."trace-function-call";
+  "traced" = dontDistribute super."traced";
+  "tracer" = dontDistribute super."tracer";
+  "tracker" = dontDistribute super."tracker";
+  "trajectory" = dontDistribute super."trajectory";
+  "transactional-events" = dontDistribute super."transactional-events";
+  "transf" = dontDistribute super."transf";
+  "transformations" = dontDistribute super."transformations";
+  "transformers-abort" = dontDistribute super."transformers-abort";
+  "transformers-compose" = dontDistribute super."transformers-compose";
+  "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-eff" = dontDistribute super."transformers-eff";
+  "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-runnable" = dontDistribute super."transformers-runnable";
+  "transformers-supply" = dontDistribute super."transformers-supply";
+  "transient" = dontDistribute super."transient";
+  "transient-universe" = dontDistribute super."transient-universe";
+  "translatable-intset" = dontDistribute super."translatable-intset";
+  "translate" = dontDistribute super."translate";
+  "travis" = dontDistribute super."travis";
+  "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
+  "trawl" = dontDistribute super."trawl";
+  "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
+  "tree-monad" = dontDistribute super."tree-monad";
+  "treemap-html" = dontDistribute super."treemap-html";
+  "treemap-html-tools" = dontDistribute super."treemap-html-tools";
+  "treersec" = dontDistribute super."treersec";
+  "treeviz" = dontDistribute super."treeviz";
+  "tremulous-query" = dontDistribute super."tremulous-query";
+  "trhsx" = dontDistribute super."trhsx";
+  "triangulation" = dontDistribute super."triangulation";
+  "trimpolya" = dontDistribute super."trimpolya";
+  "tripLL" = dontDistribute super."tripLL";
+  "trivia" = dontDistribute super."trivia";
+  "trivial-constraint" = dontDistribute super."trivial-constraint";
+  "tropical" = dontDistribute super."tropical";
+  "truelevel" = dontDistribute super."truelevel";
+  "trurl" = dontDistribute super."trurl";
+  "truthful" = dontDistribute super."truthful";
+  "tsession" = dontDistribute super."tsession";
+  "tsession-happstack" = dontDistribute super."tsession-happstack";
+  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
+  "tslogger" = dontDistribute super."tslogger";
+  "tsp-viz" = dontDistribute super."tsp-viz";
+  "tsparse" = dontDistribute super."tsparse";
+  "tst" = dontDistribute super."tst";
+  "tsvsql" = dontDistribute super."tsvsql";
+  "tttool" = doDistribute super."tttool_1_5_1";
+  "tubes" = dontDistribute super."tubes";
+  "tuntap" = dontDistribute super."tuntap";
+  "tup-functor" = dontDistribute super."tup-functor";
+  "tuple" = dontDistribute super."tuple";
+  "tuple-gen" = dontDistribute super."tuple-gen";
+  "tuple-generic" = dontDistribute super."tuple-generic";
+  "tuple-hlist" = dontDistribute super."tuple-hlist";
+  "tuple-lenses" = dontDistribute super."tuple-lenses";
+  "tuple-morph" = dontDistribute super."tuple-morph";
+  "tupleinstances" = dontDistribute super."tupleinstances";
+  "turing" = dontDistribute super."turing";
+  "turing-music" = dontDistribute super."turing-music";
+  "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
+  "turni" = dontDistribute super."turni";
+  "turtle-options" = dontDistribute super."turtle-options";
+  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
+  "twentefp" = dontDistribute super."twentefp";
+  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
+  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
+  "twentefp-graphs" = dontDistribute super."twentefp-graphs";
+  "twentefp-number" = dontDistribute super."twentefp-number";
+  "twentefp-rosetree" = dontDistribute super."twentefp-rosetree";
+  "twentefp-trees" = dontDistribute super."twentefp-trees";
+  "twentefp-websockets" = dontDistribute super."twentefp-websockets";
+  "twentyseven" = dontDistribute super."twentyseven";
+  "twhs" = dontDistribute super."twhs";
+  "twidge" = dontDistribute super."twidge";
+  "twilight-stm" = dontDistribute super."twilight-stm";
+  "twilio" = dontDistribute super."twilio";
+  "twill" = dontDistribute super."twill";
+  "twiml" = dontDistribute super."twiml";
+  "twine" = dontDistribute super."twine";
+  "twisty" = dontDistribute super."twisty";
+  "twitch" = dontDistribute super."twitch";
+  "twitter" = dontDistribute super."twitter";
+  "twitter-conduit" = doDistribute super."twitter-conduit_0_1_3";
+  "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "tx" = dontDistribute super."tx";
+  "txt-sushi" = dontDistribute super."txt-sushi";
+  "txt2rtf" = dontDistribute super."txt2rtf";
+  "txtblk" = dontDistribute super."txtblk";
+  "ty" = dontDistribute super."ty";
+  "typalyze" = dontDistribute super."typalyze";
+  "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
+  "type-cereal" = dontDistribute super."type-cereal";
+  "type-combinators" = dontDistribute super."type-combinators";
+  "type-combinators-quote" = dontDistribute super."type-combinators-quote";
+  "type-digits" = dontDistribute super."type-digits";
+  "type-equality" = dontDistribute super."type-equality";
+  "type-equality-check" = dontDistribute super."type-equality-check";
+  "type-fun" = dontDistribute super."type-fun";
+  "type-functions" = dontDistribute super."type-functions";
+  "type-hint" = dontDistribute super."type-hint";
+  "type-int" = dontDistribute super."type-int";
+  "type-iso" = dontDistribute super."type-iso";
+  "type-level" = dontDistribute super."type-level";
+  "type-level-bst" = dontDistribute super."type-level-bst";
+  "type-level-natural-number" = dontDistribute super."type-level-natural-number";
+  "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction";
+  "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations";
+  "type-level-sets" = dontDistribute super."type-level-sets";
+  "type-level-tf" = dontDistribute super."type-level-tf";
+  "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
+  "type-ord" = dontDistribute super."type-ord";
+  "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
+  "type-prelude" = dontDistribute super."type-prelude";
+  "type-settheory" = dontDistribute super."type-settheory";
+  "type-spine" = dontDistribute super."type-spine";
+  "type-structure" = dontDistribute super."type-structure";
+  "type-sub-th" = dontDistribute super."type-sub-th";
+  "type-unary" = dontDistribute super."type-unary";
+  "typeable-th" = dontDistribute super."typeable-th";
+  "typed-spreadsheet" = dontDistribute super."typed-spreadsheet";
+  "typed-wire" = dontDistribute super."typed-wire";
+  "typed-wire-utils" = dontDistribute super."typed-wire-utils";
+  "typedquery" = dontDistribute super."typedquery";
+  "typehash" = dontDistribute super."typehash";
+  "typelevel" = dontDistribute super."typelevel";
+  "typelevel-tensor" = dontDistribute super."typelevel-tensor";
+  "typeof" = dontDistribute super."typeof";
+  "typeparams" = dontDistribute super."typeparams";
+  "typesafe-endian" = dontDistribute super."typesafe-endian";
+  "typescript-docs" = dontDistribute super."typescript-docs";
+  "typical" = dontDistribute super."typical";
+  "typography-geometry" = dontDistribute super."typography-geometry";
+  "tz" = doDistribute super."tz_0_1_0_1";
+  "tzdata" = doDistribute super."tzdata_0_1_20150810_0";
+  "uAgda" = dontDistribute super."uAgda";
+  "ua-parser" = dontDistribute super."ua-parser";
+  "uacpid" = dontDistribute super."uacpid";
+  "uber" = dontDistribute super."uber";
+  "uberlast" = dontDistribute super."uberlast";
+  "uconv" = dontDistribute super."uconv";
+  "udbus" = dontDistribute super."udbus";
+  "udbus-model" = dontDistribute super."udbus-model";
+  "udcode" = dontDistribute super."udcode";
+  "udev" = dontDistribute super."udev";
+  "uhc-light" = dontDistribute super."uhc-light";
+  "uhc-util" = dontDistribute super."uhc-util";
+  "uhexdump" = dontDistribute super."uhexdump";
+  "uhttpc" = dontDistribute super."uhttpc";
+  "ui-command" = dontDistribute super."ui-command";
+  "uid" = dontDistribute super."uid";
+  "una" = dontDistribute super."una";
+  "unagi-chan" = dontDistribute super."unagi-chan";
+  "unagi-streams" = dontDistribute super."unagi-streams";
+  "unamb" = dontDistribute super."unamb";
+  "unamb-custom" = dontDistribute super."unamb-custom";
+  "unbound" = dontDistribute super."unbound";
+  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
+  "unboxed-containers" = dontDistribute super."unboxed-containers";
+  "unbreak" = dontDistribute super."unbreak";
+  "unfoldable" = dontDistribute super."unfoldable";
+  "unfoldable-restricted" = dontDistribute super."unfoldable-restricted";
+  "ungadtagger" = dontDistribute super."ungadtagger";
+  "uni-events" = dontDistribute super."uni-events";
+  "uni-graphs" = dontDistribute super."uni-graphs";
+  "uni-htk" = dontDistribute super."uni-htk";
+  "uni-posixutil" = dontDistribute super."uni-posixutil";
+  "uni-reactor" = dontDistribute super."uni-reactor";
+  "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph";
+  "uni-util" = dontDistribute super."uni-util";
+  "unicode" = dontDistribute super."unicode";
+  "unicode-names" = dontDistribute super."unicode-names";
+  "unicode-normalization" = dontDistribute super."unicode-normalization";
+  "unicode-prelude" = dontDistribute super."unicode-prelude";
+  "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
+  "unicode-symbols" = dontDistribute super."unicode-symbols";
+  "unicoder" = dontDistribute super."unicoder";
+  "uniform-io" = dontDistribute super."uniform-io";
+  "uniform-pair" = dontDistribute super."uniform-pair";
+  "union" = dontDistribute super."union";
+  "union-find-array" = dontDistribute super."union-find-array";
+  "union-map" = dontDistribute super."union-map";
+  "unique" = dontDistribute super."unique";
+  "unique-logic" = dontDistribute super."unique-logic";
+  "unique-logic-tf" = dontDistribute super."unique-logic-tf";
+  "uniqueid" = dontDistribute super."uniqueid";
+  "unit" = dontDistribute super."unit";
+  "unit-constraint" = dontDistribute super."unit-constraint";
+  "units" = dontDistribute super."units";
+  "units-attoparsec" = dontDistribute super."units-attoparsec";
+  "units-defs" = dontDistribute super."units-defs";
+  "units-parser" = dontDistribute super."units-parser";
+  "unittyped" = dontDistribute super."unittyped";
+  "universal-binary" = dontDistribute super."universal-binary";
+  "universe-th" = dontDistribute super."universe-th";
+  "unix-fcntl" = dontDistribute super."unix-fcntl";
+  "unix-handle" = dontDistribute super."unix-handle";
+  "unix-io-extra" = dontDistribute super."unix-io-extra";
+  "unix-memory" = dontDistribute super."unix-memory";
+  "unix-process-conduit" = dontDistribute super."unix-process-conduit";
+  "unix-pty-light" = dontDistribute super."unix-pty-light";
+  "unlambda" = dontDistribute super."unlambda";
+  "unlit" = dontDistribute super."unlit";
+  "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
+  "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
+  "unordered-graphs" = dontDistribute super."unordered-graphs";
+  "unpack-funcs" = dontDistribute super."unpack-funcs";
+  "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin";
+  "unsafe" = dontDistribute super."unsafe";
+  "unsafe-promises" = dontDistribute super."unsafe-promises";
+  "unsafely" = dontDistribute super."unsafely";
+  "unsafeperformst" = dontDistribute super."unsafeperformst";
+  "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
+  "unusable-pkg" = dontDistribute super."unusable-pkg";
+  "uom-plugin" = dontDistribute super."uom-plugin";
+  "up" = dontDistribute super."up";
+  "up-grade" = dontDistribute super."up-grade";
+  "uploadcare" = dontDistribute super."uploadcare";
+  "upskirt" = dontDistribute super."upskirt";
+  "ureader" = dontDistribute super."ureader";
+  "urembed" = dontDistribute super."urembed";
+  "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
+  "uri-conduit" = dontDistribute super."uri-conduit";
+  "uri-enumerator" = dontDistribute super."uri-enumerator";
+  "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
+  "uri-template" = dontDistribute super."uri-template";
+  "url-generic" = dontDistribute super."url-generic";
+  "urlcheck" = dontDistribute super."urlcheck";
+  "urldecode" = dontDistribute super."urldecode";
+  "urldisp-happstack" = dontDistribute super."urldisp-happstack";
+  "urlencoded" = dontDistribute super."urlencoded";
+  "urn" = dontDistribute super."urn";
+  "urxml" = dontDistribute super."urxml";
+  "usb" = dontDistribute super."usb";
+  "usb-enumerator" = dontDistribute super."usb-enumerator";
+  "usb-hid" = dontDistribute super."usb-hid";
+  "usb-id-database" = dontDistribute super."usb-id-database";
+  "usb-iteratee" = dontDistribute super."usb-iteratee";
+  "usb-safe" = dontDistribute super."usb-safe";
+  "users" = doDistribute super."users_0_4_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_4_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_4_0_0";
+  "users-test" = doDistribute super."users-test_0_4_0_0";
+  "utc" = dontDistribute super."utc";
+  "utf8-env" = dontDistribute super."utf8-env";
+  "utf8-prelude" = dontDistribute super."utf8-prelude";
+  "uu-cco" = dontDistribute super."uu-cco";
+  "uu-cco-examples" = dontDistribute super."uu-cco-examples";
+  "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing";
+  "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib";
+  "uu-options" = dontDistribute super."uu-options";
+  "uu-tc" = dontDistribute super."uu-tc";
+  "uuagc" = dontDistribute super."uuagc";
+  "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap";
+  "uuagc-cabal" = dontDistribute super."uuagc-cabal";
+  "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
+  "uuagd" = dontDistribute super."uuagd";
+  "uuid-aeson" = dontDistribute super."uuid-aeson";
+  "uuid-le" = dontDistribute super."uuid-le";
+  "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uulib" = dontDistribute super."uulib";
+  "uvector" = dontDistribute super."uvector";
+  "uvector-algorithms" = dontDistribute super."uvector-algorithms";
+  "uxadt" = dontDistribute super."uxadt";
+  "uzbl-with-source" = dontDistribute super."uzbl-with-source";
+  "v4l2" = dontDistribute super."v4l2";
+  "v4l2-examples" = dontDistribute super."v4l2-examples";
+  "vacuum" = dontDistribute super."vacuum";
+  "vacuum-cairo" = dontDistribute super."vacuum-cairo";
+  "vacuum-graphviz" = dontDistribute super."vacuum-graphviz";
+  "vacuum-opengl" = dontDistribute super."vacuum-opengl";
+  "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph";
+  "vado" = dontDistribute super."vado";
+  "valid-names" = dontDistribute super."valid-names";
+  "validate" = dontDistribute super."validate";
+  "validated-literals" = dontDistribute super."validated-literals";
+  "validations" = dontDistribute super."validations";
+  "value-supply" = dontDistribute super."value-supply";
+  "vampire" = dontDistribute super."vampire";
+  "var" = dontDistribute super."var";
+  "varan" = dontDistribute super."varan";
+  "variable-precision" = dontDistribute super."variable-precision";
+  "variables" = dontDistribute super."variables";
+  "varying" = dontDistribute super."varying";
+  "vaultaire-common" = dontDistribute super."vaultaire-common";
+  "vcache" = dontDistribute super."vcache";
+  "vcache-trie" = dontDistribute super."vcache-trie";
+  "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
+  "vcd" = dontDistribute super."vcd";
+  "vcs-revision" = dontDistribute super."vcs-revision";
+  "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
+  "vcsgui" = dontDistribute super."vcsgui";
+  "vcswrapper" = dontDistribute super."vcswrapper";
+  "vect" = dontDistribute super."vect";
+  "vect-floating" = dontDistribute super."vect-floating";
+  "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
+  "vect-opengl" = dontDistribute super."vect-opengl";
+  "vector-binary" = dontDistribute super."vector-binary";
+  "vector-bytestring" = dontDistribute super."vector-bytestring";
+  "vector-clock" = dontDistribute super."vector-clock";
+  "vector-conduit" = dontDistribute super."vector-conduit";
+  "vector-functorlazy" = dontDistribute super."vector-functorlazy";
+  "vector-heterogenous" = dontDistribute super."vector-heterogenous";
+  "vector-instances-collections" = dontDistribute super."vector-instances-collections";
+  "vector-mmap" = dontDistribute super."vector-mmap";
+  "vector-random" = dontDistribute super."vector-random";
+  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
+  "vector-space-map" = dontDistribute super."vector-space-map";
+  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
+  "vector-space-points" = dontDistribute super."vector-space-points";
+  "vector-static" = dontDistribute super."vector-static";
+  "vector-strategies" = dontDistribute super."vector-strategies";
+  "verbalexpressions" = dontDistribute super."verbalexpressions";
+  "verbosity" = dontDistribute super."verbosity";
+  "verdict" = dontDistribute super."verdict";
+  "verdict-json" = dontDistribute super."verdict-json";
+  "verilog" = dontDistribute super."verilog";
+  "versions" = dontDistribute super."versions";
+  "vhdl" = dontDistribute super."vhdl";
+  "views" = dontDistribute super."views";
+  "vigilance" = dontDistribute super."vigilance";
+  "vimeta" = dontDistribute super."vimeta";
+  "vimus" = dontDistribute super."vimus";
+  "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl-gl" = dontDistribute super."vinyl-gl";
+  "vinyl-json" = dontDistribute super."vinyl-json";
+  "vinyl-plus" = dontDistribute super."vinyl-plus";
+  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
+  "virthualenv" = dontDistribute super."virthualenv";
+  "visibility" = dontDistribute super."visibility";
+  "vision" = dontDistribute super."vision";
+  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
+  "visual-prof" = dontDistribute super."visual-prof";
+  "vivid" = dontDistribute super."vivid";
+  "vk-aws-route53" = dontDistribute super."vk-aws-route53";
+  "vk-posix-pty" = dontDistribute super."vk-posix-pty";
+  "vocabulary-kadma" = dontDistribute super."vocabulary-kadma";
+  "vorbiscomment" = dontDistribute super."vorbiscomment";
+  "vowpal-utils" = dontDistribute super."vowpal-utils";
+  "voyeur" = dontDistribute super."voyeur";
+  "vrpn" = dontDistribute super."vrpn";
+  "vte" = dontDistribute super."vte";
+  "vtegtk3" = dontDistribute super."vtegtk3";
+  "vty-examples" = dontDistribute super."vty-examples";
+  "vty-menu" = dontDistribute super."vty-menu";
+  "vty-ui" = dontDistribute super."vty-ui";
+  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
+  "waddle" = dontDistribute super."waddle";
+  "wai-accept-language" = dontDistribute super."wai-accept-language";
+  "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-devel" = dontDistribute super."wai-devel";
+  "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
+  "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
+  "wai-graceful" = dontDistribute super."wai-graceful";
+  "wai-handler-devel" = dontDistribute super."wai-handler-devel";
+  "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
+  "wai-handler-snap" = dontDistribute super."wai-handler-snap";
+  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
+  "wai-hastache" = dontDistribute super."wai-hastache";
+  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-lens" = dontDistribute super."wai-lens";
+  "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
+  "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
+  "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
+  "wai-middleware-catch" = dontDistribute super."wai-middleware-catch";
+  "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type";
+  "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
+  "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
+  "wai-middleware-headers" = dontDistribute super."wai-middleware-headers";
+  "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac";
+  "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client";
+  "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor";
+  "wai-middleware-route" = dontDistribute super."wai-middleware-route";
+  "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
+  "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-request-spec" = dontDistribute super."wai-request-spec";
+  "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-router" = dontDistribute super."wai-router";
+  "wai-session-alt" = dontDistribute super."wai-session-alt";
+  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
+  "wai-static-cache" = dontDistribute super."wai-static-cache";
+  "wai-static-pages" = dontDistribute super."wai-static-pages";
+  "wai-test" = dontDistribute super."wai-test";
+  "wai-thrift" = dontDistribute super."wai-thrift";
+  "wai-throttler" = dontDistribute super."wai-throttler";
+  "wait-handle" = dontDistribute super."wait-handle";
+  "waitfree" = dontDistribute super."waitfree";
+  "warc" = dontDistribute super."warc";
+  "warp" = doDistribute super."warp_3_2_2";
+  "warp-dynamic" = dontDistribute super."warp-dynamic";
+  "warp-static" = dontDistribute super."warp-static";
+  "warp-tls-uid" = dontDistribute super."warp-tls-uid";
+  "watchdog" = dontDistribute super."watchdog";
+  "watcher" = dontDistribute super."watcher";
+  "watchit" = dontDistribute super."watchit";
+  "wavconvert" = dontDistribute super."wavconvert";
+  "wavesurfer" = dontDistribute super."wavesurfer";
+  "wavy" = dontDistribute super."wavy";
+  "wcwidth" = dontDistribute super."wcwidth";
+  "weather-api" = dontDistribute super."weather-api";
+  "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell";
+  "web-css" = dontDistribute super."web-css";
+  "web-encodings" = dontDistribute super."web-encodings";
+  "web-mongrel2" = dontDistribute super."web-mongrel2";
+  "web-page" = dontDistribute super."web-page";
+  "web-routes-mtl" = dontDistribute super."web-routes-mtl";
+  "web-routes-quasi" = dontDistribute super."web-routes-quasi";
+  "web-routes-regular" = dontDistribute super."web-routes-regular";
+  "web-routes-transformers" = dontDistribute super."web-routes-transformers";
+  "webapi" = dontDistribute super."webapi";
+  "webapp" = dontDistribute super."webapp";
+  "webcrank" = dontDistribute super."webcrank";
+  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
+  "webcrank-wai" = dontDistribute super."webcrank-wai";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
+  "webdriver-snoy" = dontDistribute super."webdriver-snoy";
+  "webfinger-client" = dontDistribute super."webfinger-client";
+  "webidl" = dontDistribute super."webidl";
+  "webify" = dontDistribute super."webify";
+  "webkit" = dontDistribute super."webkit";
+  "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
+  "webkitgtk3" = dontDistribute super."webkitgtk3";
+  "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webrtc-vad" = dontDistribute super."webrtc-vad";
+  "webserver" = dontDistribute super."webserver";
+  "websnap" = dontDistribute super."websnap";
+  "webwire" = dontDistribute super."webwire";
+  "wedding-announcement" = dontDistribute super."wedding-announcement";
+  "wedged" = dontDistribute super."wedged";
+  "weighted-regexp" = dontDistribute super."weighted-regexp";
+  "weighted-search" = dontDistribute super."weighted-search";
+  "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
+  "wheb-mongo" = dontDistribute super."wheb-mongo";
+  "wheb-redis" = dontDistribute super."wheb-redis";
+  "wheb-strapped" = dontDistribute super."wheb-strapped";
+  "while-lang-parser" = dontDistribute super."while-lang-parser";
+  "whim" = dontDistribute super."whim";
+  "whiskers" = dontDistribute super."whiskers";
+  "whitespace" = dontDistribute super."whitespace";
+  "whois" = dontDistribute super."whois";
+  "why3" = dontDistribute super."why3";
+  "wigner-symbols" = dontDistribute super."wigner-symbols";
+  "wikipedia4epub" = dontDistribute super."wikipedia4epub";
+  "win-hp-path" = dontDistribute super."win-hp-path";
+  "windowslive" = dontDistribute super."windowslive";
+  "winerror" = dontDistribute super."winerror";
+  "winio" = dontDistribute super."winio";
+  "wiring" = dontDistribute super."wiring";
+  "with-location" = doDistribute super."with-location_0_0_0";
+  "witness" = dontDistribute super."witness";
+  "witty" = dontDistribute super."witty";
+  "wkt" = dontDistribute super."wkt";
+  "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm";
+  "wlc-hs" = dontDistribute super."wlc-hs";
+  "wobsurv" = dontDistribute super."wobsurv";
+  "woffex" = dontDistribute super."woffex";
+  "wol" = dontDistribute super."wol";
+  "wolf" = dontDistribute super."wolf";
+  "woot" = dontDistribute super."woot";
+  "word24" = dontDistribute super."word24";
+  "wordcloud" = dontDistribute super."wordcloud";
+  "wordexp" = dontDistribute super."wordexp";
+  "words" = dontDistribute super."words";
+  "wordsearch" = dontDistribute super."wordsearch";
+  "wordsetdiff" = dontDistribute super."wordsetdiff";
+  "workflow-osx" = dontDistribute super."workflow-osx";
+  "wp-archivebot" = dontDistribute super."wp-archivebot";
+  "wraparound" = dontDistribute super."wraparound";
+  "wraxml" = dontDistribute super."wraxml";
+  "wreq-sb" = dontDistribute super."wreq-sb";
+  "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
+  "wsedit" = dontDistribute super."wsedit";
+  "wtk" = dontDistribute super."wtk";
+  "wtk-gtk" = dontDistribute super."wtk-gtk";
+  "wumpus-basic" = dontDistribute super."wumpus-basic";
+  "wumpus-core" = dontDistribute super."wumpus-core";
+  "wumpus-drawing" = dontDistribute super."wumpus-drawing";
+  "wumpus-microprint" = dontDistribute super."wumpus-microprint";
+  "wumpus-tree" = dontDistribute super."wumpus-tree";
+  "wuss" = dontDistribute super."wuss";
+  "wx" = dontDistribute super."wx";
+  "wxAsteroids" = dontDistribute super."wxAsteroids";
+  "wxFruit" = dontDistribute super."wxFruit";
+  "wxc" = dontDistribute super."wxc";
+  "wxcore" = dontDistribute super."wxcore";
+  "wxdirect" = dontDistribute super."wxdirect";
+  "wxhnotepad" = dontDistribute super."wxhnotepad";
+  "wxturtle" = dontDistribute super."wxturtle";
+  "wybor" = dontDistribute super."wybor";
+  "wyvern" = dontDistribute super."wyvern";
+  "x-dsp" = dontDistribute super."x-dsp";
+  "x11-xim" = dontDistribute super."x11-xim";
+  "x11-xinput" = dontDistribute super."x11-xinput";
+  "x509-util" = dontDistribute super."x509-util";
+  "xattr" = dontDistribute super."xattr";
+  "xbattbar" = dontDistribute super."xbattbar";
+  "xcb-types" = dontDistribute super."xcb-types";
+  "xcffib" = dontDistribute super."xcffib";
+  "xchat-plugin" = dontDistribute super."xchat-plugin";
+  "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
+  "xdg-userdirs" = dontDistribute super."xdg-userdirs";
+  "xdot" = dontDistribute super."xdot";
+  "xfconf" = dontDistribute super."xfconf";
+  "xhaskell-library" = dontDistribute super."xhaskell-library";
+  "xhb" = dontDistribute super."xhb";
+  "xhb-atom-cache" = dontDistribute super."xhb-atom-cache";
+  "xhb-ewmh" = dontDistribute super."xhb-ewmh";
+  "xhtml" = doDistribute super."xhtml_3000_2_1";
+  "xhtml-combinators" = dontDistribute super."xhtml-combinators";
+  "xilinx-lava" = dontDistribute super."xilinx-lava";
+  "xine" = dontDistribute super."xine";
+  "xing-api" = dontDistribute super."xing-api";
+  "xinput-conduit" = dontDistribute super."xinput-conduit";
+  "xkbcommon" = dontDistribute super."xkbcommon";
+  "xkcd" = dontDistribute super."xkcd";
+  "xlsx-tabular" = dontDistribute super."xlsx-tabular";
+  "xlsx-templater" = dontDistribute super."xlsx-templater";
+  "xml-basic" = dontDistribute super."xml-basic";
+  "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-enumerator" = dontDistribute super."xml-enumerator";
+  "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
+  "xml-extractors" = dontDistribute super."xml-extractors";
+  "xml-helpers" = dontDistribute super."xml-helpers";
+  "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens";
+  "xml-monad" = dontDistribute super."xml-monad";
+  "xml-parsec" = dontDistribute super."xml-parsec";
+  "xml-picklers" = dontDistribute super."xml-picklers";
+  "xml-pipe" = dontDistribute super."xml-pipe";
+  "xml-prettify" = dontDistribute super."xml-prettify";
+  "xml-push" = dontDistribute super."xml-push";
+  "xml-query" = dontDistribute super."xml-query";
+  "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit";
+  "xml-query-xml-types" = dontDistribute super."xml-query-xml-types";
+  "xml2html" = dontDistribute super."xml2html";
+  "xml2json" = dontDistribute super."xml2json";
+  "xml2x" = dontDistribute super."xml2x";
+  "xmltv" = dontDistribute super."xmltv";
+  "xmms2-client" = dontDistribute super."xmms2-client";
+  "xmms2-client-glib" = dontDistribute super."xmms2-client-glib";
+  "xmobar" = dontDistribute super."xmobar";
+  "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch";
+  "xmonad-contrib" = dontDistribute super."xmonad-contrib";
+  "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch";
+  "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl";
+  "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper";
+  "xmonad-eval" = dontDistribute super."xmonad-eval";
+  "xmonad-extras" = dontDistribute super."xmonad-extras";
+  "xmonad-screenshot" = dontDistribute super."xmonad-screenshot";
+  "xmonad-utils" = dontDistribute super."xmonad-utils";
+  "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper";
+  "xmonad-windownames" = dontDistribute super."xmonad-windownames";
+  "xmpipe" = dontDistribute super."xmpipe";
+  "xorshift" = dontDistribute super."xorshift";
+  "xosd" = dontDistribute super."xosd";
+  "xournal-builder" = dontDistribute super."xournal-builder";
+  "xournal-convert" = dontDistribute super."xournal-convert";
+  "xournal-parser" = dontDistribute super."xournal-parser";
+  "xournal-render" = dontDistribute super."xournal-render";
+  "xournal-types" = dontDistribute super."xournal-types";
+  "xsact" = dontDistribute super."xsact";
+  "xsd" = dontDistribute super."xsd";
+  "xsha1" = dontDistribute super."xsha1";
+  "xslt" = dontDistribute super."xslt";
+  "xtc" = dontDistribute super."xtc";
+  "xtest" = dontDistribute super."xtest";
+  "xturtle" = dontDistribute super."xturtle";
+  "xxhash" = dontDistribute super."xxhash";
+  "y0l0bot" = dontDistribute super."y0l0bot";
+  "yabi" = dontDistribute super."yabi";
+  "yabi-muno" = dontDistribute super."yabi-muno";
+  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
+  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
+  "yajl" = dontDistribute super."yajl";
+  "yajl-enumerator" = dontDistribute super."yajl-enumerator";
+  "yall" = dontDistribute super."yall";
+  "yamemo" = dontDistribute super."yamemo";
+  "yaml-config" = dontDistribute super."yaml-config";
+  "yaml-light-lens" = dontDistribute super."yaml-light-lens";
+  "yaml-rpc" = dontDistribute super."yaml-rpc";
+  "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
+  "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
+  "yaml2owl" = dontDistribute super."yaml2owl";
+  "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
+  "yampa-canvas" = dontDistribute super."yampa-canvas";
+  "yampa-glfw" = dontDistribute super."yampa-glfw";
+  "yampa-glut" = dontDistribute super."yampa-glut";
+  "yampa2048" = dontDistribute super."yampa2048";
+  "yaop" = dontDistribute super."yaop";
+  "yap" = dontDistribute super."yap";
+  "yarr" = dontDistribute super."yarr";
+  "yarr-image-io" = dontDistribute super."yarr-image-io";
+  "yate" = dontDistribute super."yate";
+  "yavie" = dontDistribute super."yavie";
+  "ycextra" = dontDistribute super."ycextra";
+  "yeganesh" = dontDistribute super."yeganesh";
+  "yeller" = dontDistribute super."yeller";
+  "yeshql" = dontDistribute super."yeshql";
+  "yesod-angular" = dontDistribute super."yesod-angular";
+  "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
+  "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_3";
+  "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
+  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
+  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
+  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
+  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
+  "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
+  "yesod-comments" = dontDistribute super."yesod-comments";
+  "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
+  "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-crud" = dontDistribute super."yesod-crud";
+  "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
+  "yesod-csp" = dontDistribute super."yesod-csp";
+  "yesod-datatables" = dontDistribute super."yesod-datatables";
+  "yesod-dsl" = dontDistribute super."yesod-dsl";
+  "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form-json" = dontDistribute super."yesod-form-json";
+  "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
+  "yesod-goodies" = dontDistribute super."yesod-goodies";
+  "yesod-job-queue" = dontDistribute super."yesod-job-queue";
+  "yesod-json" = dontDistribute super."yesod-json";
+  "yesod-links" = dontDistribute super."yesod-links";
+  "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-markdown" = dontDistribute super."yesod-markdown";
+  "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5";
+  "yesod-paginate" = dontDistribute super."yesod-paginate";
+  "yesod-pagination" = dontDistribute super."yesod-pagination";
+  "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-platform" = dontDistribute super."yesod-platform";
+  "yesod-pnotify" = dontDistribute super."yesod-pnotify";
+  "yesod-pure" = dontDistribute super."yesod-pure";
+  "yesod-purescript" = dontDistribute super."yesod-purescript";
+  "yesod-raml" = dontDistribute super."yesod-raml";
+  "yesod-raml-bin" = dontDistribute super."yesod-raml-bin";
+  "yesod-raml-docs" = dontDistribute super."yesod-raml-docs";
+  "yesod-raml-mock" = dontDistribute super."yesod-raml-mock";
+  "yesod-recaptcha" = dontDistribute super."yesod-recaptcha";
+  "yesod-routes" = dontDistribute super."yesod-routes";
+  "yesod-routes-flow" = dontDistribute super."yesod-routes-flow";
+  "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript";
+  "yesod-rst" = dontDistribute super."yesod-rst";
+  "yesod-s3" = dontDistribute super."yesod-s3";
+  "yesod-sass" = dontDistribute super."yesod-sass";
+  "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
+  "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test-json" = dontDistribute super."yesod-test-json";
+  "yesod-tls" = dontDistribute super."yesod-tls";
+  "yesod-transloadit" = dontDistribute super."yesod-transloadit";
+  "yesod-vend" = dontDistribute super."yesod-vend";
+  "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra";
+  "yesod-worker" = dontDistribute super."yesod-worker";
+  "yet-another-logger" = dontDistribute super."yet-another-logger";
+  "yhccore" = dontDistribute super."yhccore";
+  "yi-contrib" = dontDistribute super."yi-contrib";
+  "yi-emacs-colours" = dontDistribute super."yi-emacs-colours";
+  "yi-gtk" = dontDistribute super."yi-gtk";
+  "yi-monokai" = dontDistribute super."yi-monokai";
+  "yi-snippet" = dontDistribute super."yi-snippet";
+  "yi-solarized" = dontDistribute super."yi-solarized";
+  "yi-spolsky" = dontDistribute super."yi-spolsky";
+  "yi-vty" = dontDistribute super."yi-vty";
+  "yices" = dontDistribute super."yices";
+  "yices-easy" = dontDistribute super."yices-easy";
+  "yices-painless" = dontDistribute super."yices-painless";
+  "yjftp" = dontDistribute super."yjftp";
+  "yjftp-libs" = dontDistribute super."yjftp-libs";
+  "yjsvg" = dontDistribute super."yjsvg";
+  "yjtools" = dontDistribute super."yjtools";
+  "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
+  "yoko" = dontDistribute super."yoko";
+  "york-lava" = dontDistribute super."york-lava";
+  "youtube" = dontDistribute super."youtube";
+  "yql" = dontDistribute super."yql";
+  "yst" = dontDistribute super."yst";
+  "yuiGrid" = dontDistribute super."yuiGrid";
+  "yuuko" = dontDistribute super."yuuko";
+  "yxdb-utils" = dontDistribute super."yxdb-utils";
+  "z3" = dontDistribute super."z3";
+  "zalgo" = dontDistribute super."zalgo";
+  "zampolit" = dontDistribute super."zampolit";
+  "zasni-gerna" = dontDistribute super."zasni-gerna";
+  "zcache" = dontDistribute super."zcache";
+  "zenc" = dontDistribute super."zenc";
+  "zendesk-api" = dontDistribute super."zendesk-api";
+  "zeno" = dontDistribute super."zeno";
+  "zerobin" = dontDistribute super."zerobin";
+  "zeromq-haskell" = dontDistribute super."zeromq-haskell";
+  "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
+  "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeroth" = dontDistribute super."zeroth";
+  "zigbee-znet25" = dontDistribute super."zigbee-znet25";
+  "zim-parser" = doDistribute super."zim-parser_0_1_0_0";
+  "zip" = dontDistribute super."zip";
+  "zip-conduit" = dontDistribute super."zip-conduit";
+  "zipedit" = dontDistribute super."zipedit";
+  "zipkin" = dontDistribute super."zipkin";
+  "zipper" = dontDistribute super."zipper";
+  "zippers" = dontDistribute super."zippers";
+  "zippo" = dontDistribute super."zippo";
+  "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zmcat" = dontDistribute super."zmcat";
+  "zmidi-core" = dontDistribute super."zmidi-core";
+  "zmidi-score" = dontDistribute super."zmidi-score";
+  "zmqat" = dontDistribute super."zmqat";
+  "zoneinfo" = dontDistribute super."zoneinfo";
+  "zoom" = dontDistribute super."zoom";
+  "zoom-cache" = dontDistribute super."zoom-cache";
+  "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm";
+  "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile";
+  "zoom-refs" = dontDistribute super."zoom-refs";
+  "zot" = dontDistribute super."zot";
+  "zsh-battery" = dontDistribute super."zsh-battery";
+  "ztail" = dontDistribute super."ztail";
+
+}
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
index 7dbaa3da18b..a7e35e6c137 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
@@ -454,6 +454,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -489,6 +490,7 @@ self: super: {
   "HaskellForMaths" = dontDistribute super."HaskellForMaths";
   "HaskellLM" = dontDistribute super."HaskellLM";
   "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellNet-SSL" = doDistribute super."HaskellNet-SSL_0_3_2_1";
   "HaskellTorrent" = dontDistribute super."HaskellTorrent";
   "HaskellTutorials" = dontDistribute super."HaskellTutorials";
   "Haskelloids" = dontDistribute super."Haskelloids";
@@ -640,6 +642,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_2_2";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -763,6 +766,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1076,6 +1080,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1254,6 +1259,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -1347,6 +1353,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async-dejafu" = doDistribute super."async-dejafu_0_1_0_0";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
   "async-pool" = dontDistribute super."async-pool";
@@ -1373,6 +1380,7 @@ self: super: {
   "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec" = doDistribute super."attoparsec_0_13_0_1";
   "attoparsec-arff" = dontDistribute super."attoparsec-arff";
   "attoparsec-binary" = dontDistribute super."attoparsec-binary";
   "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
@@ -1393,6 +1401,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "auto-update" = doDistribute super."auto-update_0_1_3";
   "autoexporter" = dontDistribute super."autoexporter";
   "automitive-cse" = dontDistribute super."automitive-cse";
   "automotive-cse" = dontDistribute super."automotive-cse";
@@ -1742,6 +1751,7 @@ self: super: {
   "cabal-cargs" = dontDistribute super."cabal-cargs";
   "cabal-constraints" = dontDistribute super."cabal-constraints";
   "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-debian" = doDistribute super."cabal-debian_4_32_2";
   "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
   "cabal-dev" = dontDistribute super."cabal-dev";
   "cabal-dir" = dontDistribute super."cabal-dir";
@@ -1847,6 +1857,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -1890,6 +1901,7 @@ self: super: {
   "chatty" = dontDistribute super."chatty";
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate" = doDistribute super."cheapskate_0_1_0_4";
   "cheapskate-highlight" = dontDistribute super."cheapskate-highlight";
   "cheapskate-lucid" = dontDistribute super."cheapskate-lucid";
   "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
@@ -1916,6 +1928,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -1986,6 +1999,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2085,6 +2099,7 @@ self: super: {
   "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
@@ -2143,6 +2158,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2243,6 +2259,7 @@ self: super: {
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
   "ctpl" = dontDistribute super."ctpl";
+  "ctrie" = doDistribute super."ctrie_0_1_0_3";
   "cube" = dontDistribute super."cube";
   "cubical" = dontDistribute super."cubical";
   "cubicbezier" = dontDistribute super."cubicbezier";
@@ -2265,6 +2282,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2273,6 +2291,7 @@ self: super: {
   "danibot" = dontDistribute super."danibot";
   "dao" = dontDistribute super."dao";
   "dapi" = dontDistribute super."dapi";
+  "darcs" = doDistribute super."darcs_2_10_3";
   "darcs-benchmark" = dontDistribute super."darcs-benchmark";
   "darcs-beta" = dontDistribute super."darcs-beta";
   "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
@@ -2400,6 +2419,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2436,6 +2456,7 @@ self: super: {
   "definitive-reactive" = dontDistribute super."definitive-reactive";
   "definitive-sound" = dontDistribute super."definitive-sound";
   "deiko-config" = dontDistribute super."deiko-config";
+  "dejafu" = doDistribute super."dejafu_0_2_0_0";
   "deka" = dontDistribute super."deka";
   "deka-tests" = dontDistribute super."deka-tests";
   "delaunay" = dontDistribute super."delaunay";
@@ -2478,14 +2499,20 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_2";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
+  "diagrams-canvas" = doDistribute super."diagrams-canvas_1_3_0_3";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_5";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
   "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_9";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
@@ -2678,6 +2705,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editpipe" = dontDistribute super."editpipe";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_7";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2841,6 +2869,7 @@ self: super: {
   "extensible" = dontDistribute super."extensible";
   "extensible-data" = dontDistribute super."extensible-data";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_3";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
   "faceted" = dontDistribute super."faceted";
@@ -2911,6 +2940,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9_1";
   "filediff" = dontDistribute super."filediff";
   "filepath-io-access" = dontDistribute super."filepath-io-access";
   "filepather" = dontDistribute super."filepather";
@@ -2999,6 +3029,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
   "foreign-var" = dontDistribute super."foreign-var";
@@ -3030,6 +3061,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3156,6 +3188,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_2";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3818,6 +3851,7 @@ self: super: {
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
+  "hasty-hamiltonian" = doDistribute super."hasty-hamiltonian_1_1_2";
   "hat" = dontDistribute super."hat";
   "hatex-guide" = dontDistribute super."hatex-guide";
   "hath" = dontDistribute super."hath";
@@ -3985,6 +4019,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4320,6 +4355,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
   "hstidy" = dontDistribute super."hstidy";
@@ -4370,6 +4406,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4398,6 +4435,7 @@ self: super: {
   "hulk" = dontDistribute super."hulk";
   "hums" = dontDistribute super."hums";
   "hunch" = dontDistribute super."hunch";
+  "hunit-dejafu" = doDistribute super."hunit-dejafu_0_2_0_0";
   "hunit-gui" = dontDistribute super."hunit-gui";
   "hunit-parsec" = dontDistribute super."hunit-parsec";
   "hunit-rematch" = dontDistribute super."hunit-rematch";
@@ -4415,6 +4453,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4545,6 +4584,7 @@ self: super: {
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
   "inserts" = dontDistribute super."inserts";
@@ -4576,6 +4616,7 @@ self: super: {
   "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -4762,6 +4803,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keystore" = dontDistribute super."keystore";
@@ -4872,9 +4914,11 @@ self: super: {
   "language-thrift" = doDistribute super."language-thrift_0_7_0_1";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
   "latex" = dontDistribute super."latex";
+  "latex-formulae-hakyll" = doDistribute super."latex-formulae-hakyll_0_2_0_1";
   "launchpad-control" = dontDistribute super."launchpad-control";
   "lax" = dontDistribute super."lax";
   "layers" = dontDistribute super."layers";
@@ -4949,6 +4993,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5199,6 +5244,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5285,6 +5331,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5339,6 +5386,7 @@ self: super: {
   "monad-hash" = dontDistribute super."monad-hash";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -5355,8 +5403,11 @@ self: super: {
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-supply" = dontDistribute super."monad-supply";
   "monad-task" = dontDistribute super."monad-task";
+  "monad-time" = doDistribute super."monad-time_0_1";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5449,6 +5500,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5469,6 +5521,7 @@ self: super: {
   "musicxml2" = dontDistribute super."musicxml2";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -5721,6 +5774,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -5811,6 +5865,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -5890,6 +5945,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -5898,6 +5954,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_4";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -5930,6 +5987,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6073,9 +6131,11 @@ self: super: {
   "postgresql-cube" = dontDistribute super."postgresql-cube";
   "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
   "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_5_1_2";
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6091,6 +6151,8 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
+  "pred-trie" = doDistribute super."pred-trie_0_5_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
   "prefork" = dontDistribute super."prefork";
@@ -6115,6 +6177,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6185,6 +6248,7 @@ self: super: {
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
   "psql-helpers" = dontDistribute super."psql-helpers";
+  "psqueues" = doDistribute super."psqueues_0_2_2_0";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6208,6 +6272,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6346,6 +6411,7 @@ self: super: {
   "read-env-var" = dontDistribute super."read-env-var";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -6486,6 +6552,9 @@ self: super: {
   "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
   "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "rest-happstack" = doDistribute super."rest-happstack_0_3_1";
+  "rest-snap" = doDistribute super."rest-snap_0_2";
+  "rest-wai" = doDistribute super."rest-wai_0_2";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -6807,6 +6876,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -7012,6 +7082,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7089,6 +7160,7 @@ self: super: {
   "stash" = dontDistribute super."stash";
   "state" = dontDistribute super."state";
   "state-record" = dontDistribute super."state-record";
+  "stateWriter" = doDistribute super."stateWriter_0_2_6";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
   "statethread" = dontDistribute super."statethread";
@@ -7276,6 +7348,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7285,6 +7358,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_3";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7299,6 +7373,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_8";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7306,10 +7381,14 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_5_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
+  "tasty" = doDistribute super."tasty_0_11_0_2";
+  "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -7375,6 +7454,7 @@ self: super: {
   "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -7428,6 +7508,7 @@ self: super: {
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7551,6 +7632,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -7681,6 +7763,8 @@ self: super: {
   "typescript-docs" = dontDistribute super."typescript-docs";
   "typical" = dontDistribute super."typical";
   "typography-geometry" = dontDistribute super."typography-geometry";
+  "tz" = doDistribute super."tz_0_1_0_1";
+  "tzdata" = doDistribute super."tzdata_0_1_20150810_0";
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
@@ -7843,6 +7927,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -7923,6 +8008,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_5";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -7930,6 +8016,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_5";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
@@ -7992,6 +8079,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_8_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8147,6 +8235,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8187,6 +8276,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_12";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
@@ -8241,6 +8331,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_2_0_2";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.3.nix b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
index 4368c640604..ce377cc70cb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
@@ -452,6 +452,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -486,6 +487,7 @@ self: super: {
   "HaskellForMaths" = dontDistribute super."HaskellForMaths";
   "HaskellLM" = dontDistribute super."HaskellLM";
   "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellNet-SSL" = doDistribute super."HaskellNet-SSL_0_3_2_1";
   "HaskellTorrent" = dontDistribute super."HaskellTorrent";
   "HaskellTutorials" = dontDistribute super."HaskellTutorials";
   "Haskelloids" = dontDistribute super."Haskelloids";
@@ -637,6 +639,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_2_2";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -760,6 +763,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1073,6 +1077,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1251,6 +1256,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -1343,6 +1349,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async-dejafu" = doDistribute super."async-dejafu_0_1_0_0";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
   "async-pool" = dontDistribute super."async-pool";
@@ -1369,6 +1376,7 @@ self: super: {
   "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec" = doDistribute super."attoparsec_0_13_0_1";
   "attoparsec-arff" = dontDistribute super."attoparsec-arff";
   "attoparsec-binary" = dontDistribute super."attoparsec-binary";
   "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
@@ -1389,6 +1397,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "auto-update" = doDistribute super."auto-update_0_1_3";
   "autoexporter" = dontDistribute super."autoexporter";
   "automitive-cse" = dontDistribute super."automitive-cse";
   "automotive-cse" = dontDistribute super."automotive-cse";
@@ -1737,6 +1746,7 @@ self: super: {
   "cabal-cargs" = dontDistribute super."cabal-cargs";
   "cabal-constraints" = dontDistribute super."cabal-constraints";
   "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-debian" = doDistribute super."cabal-debian_4_32_2";
   "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
   "cabal-dev" = dontDistribute super."cabal-dev";
   "cabal-dir" = dontDistribute super."cabal-dir";
@@ -1841,6 +1851,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -1884,6 +1895,7 @@ self: super: {
   "chatty" = dontDistribute super."chatty";
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate" = doDistribute super."cheapskate_0_1_0_4";
   "cheapskate-highlight" = dontDistribute super."cheapskate-highlight";
   "cheapskate-lucid" = dontDistribute super."cheapskate-lucid";
   "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
@@ -1910,6 +1922,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -1980,6 +1993,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2078,6 +2092,7 @@ self: super: {
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
@@ -2112,6 +2127,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant-extras" = doDistribute super."contravariant-extras_0_3_1";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
   "control-monad-exception" = dontDistribute super."control-monad-exception";
@@ -2135,6 +2151,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2235,6 +2252,7 @@ self: super: {
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
   "ctpl" = dontDistribute super."ctpl";
+  "ctrie" = doDistribute super."ctrie_0_1_0_3";
   "cube" = dontDistribute super."cube";
   "cubical" = dontDistribute super."cubical";
   "cubicbezier" = dontDistribute super."cubicbezier";
@@ -2257,6 +2275,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2265,6 +2284,7 @@ self: super: {
   "danibot" = dontDistribute super."danibot";
   "dao" = dontDistribute super."dao";
   "dapi" = dontDistribute super."dapi";
+  "darcs" = doDistribute super."darcs_2_10_3";
   "darcs-benchmark" = dontDistribute super."darcs-benchmark";
   "darcs-beta" = dontDistribute super."darcs-beta";
   "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
@@ -2391,6 +2411,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2427,6 +2448,7 @@ self: super: {
   "definitive-reactive" = dontDistribute super."definitive-reactive";
   "definitive-sound" = dontDistribute super."definitive-sound";
   "deiko-config" = dontDistribute super."deiko-config";
+  "dejafu" = doDistribute super."dejafu_0_2_0_0";
   "deka" = dontDistribute super."deka";
   "deka-tests" = dontDistribute super."deka-tests";
   "delaunay" = dontDistribute super."delaunay";
@@ -2469,14 +2491,20 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_2";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
+  "diagrams-canvas" = doDistribute super."diagrams-canvas_1_3_0_3";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_5";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
   "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_9";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
@@ -2668,6 +2696,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editpipe" = dontDistribute super."editpipe";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_7";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2827,6 +2856,7 @@ self: super: {
   "extensible" = dontDistribute super."extensible";
   "extensible-data" = dontDistribute super."extensible-data";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_3";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
   "faceted" = dontDistribute super."faceted";
@@ -2895,6 +2925,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9_1";
   "filediff" = dontDistribute super."filediff";
   "filepath-io-access" = dontDistribute super."filepath-io-access";
   "filepather" = dontDistribute super."filepather";
@@ -2983,6 +3014,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
   "foreign-var" = dontDistribute super."foreign-var";
@@ -3014,6 +3046,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3139,6 +3172,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_2";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3800,6 +3834,7 @@ self: super: {
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
+  "hasty-hamiltonian" = doDistribute super."hasty-hamiltonian_1_1_2";
   "hat" = dontDistribute super."hat";
   "hatex-guide" = dontDistribute super."hatex-guide";
   "hath" = dontDistribute super."hath";
@@ -3967,6 +4002,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -4302,6 +4338,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
   "hstidy" = dontDistribute super."hstidy";
@@ -4352,6 +4389,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4380,6 +4418,7 @@ self: super: {
   "hulk" = dontDistribute super."hulk";
   "hums" = dontDistribute super."hums";
   "hunch" = dontDistribute super."hunch";
+  "hunit-dejafu" = doDistribute super."hunit-dejafu_0_2_0_0";
   "hunit-gui" = dontDistribute super."hunit-gui";
   "hunit-parsec" = dontDistribute super."hunit-parsec";
   "hunit-rematch" = dontDistribute super."hunit-rematch";
@@ -4397,6 +4436,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4526,6 +4566,7 @@ self: super: {
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
   "inserts" = dontDistribute super."inserts";
@@ -4557,6 +4598,7 @@ self: super: {
   "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -4743,6 +4785,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keystore" = dontDistribute super."keystore";
@@ -4853,9 +4896,11 @@ self: super: {
   "language-thrift" = doDistribute super."language-thrift_0_7_0_1";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
   "latex" = dontDistribute super."latex";
+  "latex-formulae-hakyll" = doDistribute super."latex-formulae-hakyll_0_2_0_1";
   "launchpad-control" = dontDistribute super."launchpad-control";
   "lax" = dontDistribute super."lax";
   "layers" = dontDistribute super."layers";
@@ -4930,6 +4975,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5156,6 +5202,7 @@ self: super: {
   "manatee-terminal" = dontDistribute super."manatee-terminal";
   "manatee-welcome" = dontDistribute super."manatee-welcome";
   "mancala" = dontDistribute super."mancala";
+  "mandrill" = doDistribute super."mandrill_0_5_1_0";
   "mandulia" = dontDistribute super."mandulia";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
@@ -5178,6 +5225,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5263,6 +5311,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5317,6 +5366,7 @@ self: super: {
   "monad-hash" = dontDistribute super."monad-hash";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -5333,8 +5383,11 @@ self: super: {
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-supply" = dontDistribute super."monad-supply";
   "monad-task" = dontDistribute super."monad-task";
+  "monad-time" = doDistribute super."monad-time_0_1";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5427,6 +5480,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5447,6 +5501,7 @@ self: super: {
   "musicxml2" = dontDistribute super."musicxml2";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -5699,6 +5754,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -5788,6 +5844,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -5867,6 +5924,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -5875,6 +5933,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_4";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -5907,6 +5966,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6050,9 +6110,11 @@ self: super: {
   "postgresql-cube" = dontDistribute super."postgresql-cube";
   "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
   "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_5_1_2";
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6068,6 +6130,8 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
+  "pred-trie" = doDistribute super."pred-trie_0_5_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
   "prefork" = dontDistribute super."prefork";
@@ -6092,6 +6156,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6162,6 +6227,7 @@ self: super: {
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
   "psql-helpers" = dontDistribute super."psql-helpers";
+  "psqueues" = doDistribute super."psqueues_0_2_2_0";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6185,6 +6251,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6322,6 +6389,7 @@ self: super: {
   "read-env-var" = dontDistribute super."read-env-var";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -6460,6 +6528,9 @@ self: super: {
   "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
   "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "rest-happstack" = doDistribute super."rest-happstack_0_3_1";
+  "rest-snap" = doDistribute super."rest-snap_0_2";
+  "rest-wai" = doDistribute super."rest-wai_0_2";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -6781,6 +6852,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -6983,6 +7055,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7060,6 +7133,7 @@ self: super: {
   "stash" = dontDistribute super."stash";
   "state" = dontDistribute super."state";
   "state-record" = dontDistribute super."state-record";
+  "stateWriter" = doDistribute super."stateWriter_0_2_6";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
   "statethread" = dontDistribute super."statethread";
@@ -7246,6 +7320,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7255,6 +7330,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_3";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7269,6 +7345,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_8";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7276,10 +7353,14 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_5_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
+  "tasty" = doDistribute super."tasty_0_11_0_2";
+  "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -7345,6 +7426,7 @@ self: super: {
   "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -7398,6 +7480,7 @@ self: super: {
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7521,6 +7604,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -7651,6 +7735,8 @@ self: super: {
   "typescript-docs" = dontDistribute super."typescript-docs";
   "typical" = dontDistribute super."typical";
   "typography-geometry" = dontDistribute super."typography-geometry";
+  "tz" = doDistribute super."tz_0_1_0_1";
+  "tzdata" = doDistribute super."tzdata_0_1_20150810_0";
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
@@ -7812,6 +7898,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -7892,6 +7979,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_5";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -7899,6 +7987,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_5";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
@@ -7958,6 +8047,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_8_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8113,6 +8203,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8153,6 +8244,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_12";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
@@ -8207,6 +8299,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_2_0_2";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.4.nix b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
index d54a61d0d9d..f10586dcc5a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
@@ -452,6 +452,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -485,6 +486,7 @@ self: super: {
   "HaskellForMaths" = dontDistribute super."HaskellForMaths";
   "HaskellLM" = dontDistribute super."HaskellLM";
   "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellNet-SSL" = doDistribute super."HaskellNet-SSL_0_3_2_1";
   "HaskellTorrent" = dontDistribute super."HaskellTorrent";
   "HaskellTutorials" = dontDistribute super."HaskellTutorials";
   "Haskelloids" = dontDistribute super."Haskelloids";
@@ -636,6 +638,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_2_2";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -759,6 +762,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1072,6 +1076,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1249,6 +1254,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -1341,6 +1347,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async-dejafu" = doDistribute super."async-dejafu_0_1_0_0";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
   "async-pool" = dontDistribute super."async-pool";
@@ -1367,6 +1374,7 @@ self: super: {
   "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec" = doDistribute super."attoparsec_0_13_0_1";
   "attoparsec-arff" = dontDistribute super."attoparsec-arff";
   "attoparsec-binary" = dontDistribute super."attoparsec-binary";
   "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
@@ -1387,6 +1395,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "auto-update" = doDistribute super."auto-update_0_1_3";
   "autoexporter" = dontDistribute super."autoexporter";
   "automitive-cse" = dontDistribute super."automitive-cse";
   "automotive-cse" = dontDistribute super."automotive-cse";
@@ -1735,6 +1744,7 @@ self: super: {
   "cabal-cargs" = dontDistribute super."cabal-cargs";
   "cabal-constraints" = dontDistribute super."cabal-constraints";
   "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-debian" = doDistribute super."cabal-debian_4_32_2";
   "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
   "cabal-dev" = dontDistribute super."cabal-dev";
   "cabal-dir" = dontDistribute super."cabal-dir";
@@ -1839,6 +1849,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -1882,6 +1893,7 @@ self: super: {
   "chatty" = dontDistribute super."chatty";
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate" = doDistribute super."cheapskate_0_1_0_4";
   "cheapskate-highlight" = dontDistribute super."cheapskate-highlight";
   "cheapskate-lucid" = dontDistribute super."cheapskate-lucid";
   "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
@@ -1908,6 +1920,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -1977,6 +1990,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2075,6 +2089,7 @@ self: super: {
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_10_1";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
@@ -2109,6 +2124,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant-extras" = doDistribute super."contravariant-extras_0_3_1";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
   "control-monad-exception" = dontDistribute super."control-monad-exception";
@@ -2132,6 +2148,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2231,6 +2248,7 @@ self: super: {
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
   "ctpl" = dontDistribute super."ctpl";
+  "ctrie" = doDistribute super."ctrie_0_1_0_3";
   "cube" = dontDistribute super."cube";
   "cubical" = dontDistribute super."cubical";
   "cubicbezier" = dontDistribute super."cubicbezier";
@@ -2253,6 +2271,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2261,6 +2280,7 @@ self: super: {
   "danibot" = dontDistribute super."danibot";
   "dao" = dontDistribute super."dao";
   "dapi" = dontDistribute super."dapi";
+  "darcs" = doDistribute super."darcs_2_10_3";
   "darcs-benchmark" = dontDistribute super."darcs-benchmark";
   "darcs-beta" = dontDistribute super."darcs-beta";
   "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
@@ -2387,6 +2407,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2423,6 +2444,7 @@ self: super: {
   "definitive-reactive" = dontDistribute super."definitive-reactive";
   "definitive-sound" = dontDistribute super."definitive-sound";
   "deiko-config" = dontDistribute super."deiko-config";
+  "dejafu" = doDistribute super."dejafu_0_2_0_0";
   "deka" = dontDistribute super."deka";
   "deka-tests" = dontDistribute super."deka-tests";
   "delaunay" = dontDistribute super."delaunay";
@@ -2464,12 +2486,20 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_2";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
+  "diagrams-canvas" = doDistribute super."diagrams-canvas_1_3_0_3";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_6";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
+  "diagrams-lib" = doDistribute super."diagrams-lib_1_3_1_1";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
@@ -2658,6 +2688,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editpipe" = dontDistribute super."editpipe";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_7";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2685,6 +2716,7 @@ self: super: {
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
   "elision" = dontDistribute super."elision";
+  "elm-bridge" = doDistribute super."elm-bridge_0_2_1_1";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-get" = dontDistribute super."elm-get";
@@ -2816,6 +2848,7 @@ self: super: {
   "extensible" = dontDistribute super."extensible";
   "extensible-data" = dontDistribute super."extensible-data";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_3";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
   "faceted" = dontDistribute super."faceted";
@@ -2883,6 +2916,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9_1";
   "filediff" = dontDistribute super."filediff";
   "filepath-io-access" = dontDistribute super."filepath-io-access";
   "filepather" = dontDistribute super."filepather";
@@ -2971,6 +3005,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
   "foreign-var" = dontDistribute super."foreign-var";
@@ -3002,6 +3037,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3127,6 +3163,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_2";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3786,6 +3823,7 @@ self: super: {
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
+  "hasty-hamiltonian" = doDistribute super."hasty-hamiltonian_1_1_2";
   "hat" = dontDistribute super."hat";
   "hatex-guide" = dontDistribute super."hatex-guide";
   "hath" = dontDistribute super."hath";
@@ -3953,6 +3991,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -3981,6 +4020,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_3";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4285,6 +4325,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
   "hstidy" = dontDistribute super."hstidy";
@@ -4335,6 +4376,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4363,6 +4405,7 @@ self: super: {
   "hulk" = dontDistribute super."hulk";
   "hums" = dontDistribute super."hums";
   "hunch" = dontDistribute super."hunch";
+  "hunit-dejafu" = doDistribute super."hunit-dejafu_0_2_0_0";
   "hunit-gui" = dontDistribute super."hunit-gui";
   "hunit-parsec" = dontDistribute super."hunit-parsec";
   "hunit-rematch" = dontDistribute super."hunit-rematch";
@@ -4380,6 +4423,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4509,6 +4553,7 @@ self: super: {
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
   "inserts" = dontDistribute super."inserts";
@@ -4540,6 +4585,7 @@ self: super: {
   "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -4726,6 +4772,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keystore" = dontDistribute super."keystore";
@@ -4836,9 +4883,11 @@ self: super: {
   "language-thrift" = doDistribute super."language-thrift_0_7_0_1";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
   "latex" = dontDistribute super."latex";
+  "latex-formulae-hakyll" = doDistribute super."latex-formulae-hakyll_0_2_0_1";
   "launchpad-control" = dontDistribute super."launchpad-control";
   "lax" = dontDistribute super."lax";
   "layers" = dontDistribute super."layers";
@@ -4913,6 +4962,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5137,6 +5187,7 @@ self: super: {
   "manatee-terminal" = dontDistribute super."manatee-terminal";
   "manatee-welcome" = dontDistribute super."manatee-welcome";
   "mancala" = dontDistribute super."mancala";
+  "mandrill" = doDistribute super."mandrill_0_5_1_0";
   "mandulia" = dontDistribute super."mandulia";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
@@ -5159,6 +5210,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5244,6 +5296,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5298,6 +5351,7 @@ self: super: {
   "monad-hash" = dontDistribute super."monad-hash";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -5314,8 +5368,11 @@ self: super: {
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-supply" = dontDistribute super."monad-supply";
   "monad-task" = dontDistribute super."monad-task";
+  "monad-time" = doDistribute super."monad-time_0_1";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5407,6 +5464,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5427,6 +5485,7 @@ self: super: {
   "musicxml2" = dontDistribute super."musicxml2";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -5676,6 +5735,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -5764,6 +5824,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -5843,6 +5904,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -5851,6 +5913,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_4";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -5883,6 +5946,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6025,9 +6089,11 @@ self: super: {
   "postgresql-cube" = dontDistribute super."postgresql-cube";
   "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
   "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_5_1_2";
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6043,6 +6109,8 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
+  "pred-trie" = doDistribute super."pred-trie_0_5_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
   "prefork" = dontDistribute super."prefork";
@@ -6067,6 +6135,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6137,6 +6206,7 @@ self: super: {
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
   "psql-helpers" = dontDistribute super."psql-helpers";
+  "psqueues" = doDistribute super."psqueues_0_2_2_0";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6160,6 +6230,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6296,6 +6367,7 @@ self: super: {
   "read-env-var" = dontDistribute super."read-env-var";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -6434,6 +6506,9 @@ self: super: {
   "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
   "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "rest-happstack" = doDistribute super."rest-happstack_0_3_1";
+  "rest-snap" = doDistribute super."rest-snap_0_2";
+  "rest-wai" = doDistribute super."rest-wai_0_2";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -6755,6 +6830,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -6957,6 +7033,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7034,6 +7111,7 @@ self: super: {
   "stash" = dontDistribute super."stash";
   "state" = dontDistribute super."state";
   "state-record" = dontDistribute super."state-record";
+  "stateWriter" = doDistribute super."stateWriter_0_2_6";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
   "statethread" = dontDistribute super."statethread";
@@ -7220,6 +7298,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7229,6 +7308,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_3";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7243,6 +7323,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_8";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7250,10 +7331,14 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_5_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
+  "tasty" = doDistribute super."tasty_0_11_0_2";
+  "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -7318,6 +7403,7 @@ self: super: {
   "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -7371,6 +7457,7 @@ self: super: {
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7494,6 +7581,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -7623,6 +7711,8 @@ self: super: {
   "typescript-docs" = dontDistribute super."typescript-docs";
   "typical" = dontDistribute super."typical";
   "typography-geometry" = dontDistribute super."typography-geometry";
+  "tz" = doDistribute super."tz_0_1_0_1";
+  "tzdata" = doDistribute super."tzdata_0_1_20150810_0";
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
@@ -7784,6 +7874,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -7864,6 +7955,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_5";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -7871,6 +7963,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_5";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
@@ -7930,6 +8023,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_8_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8085,6 +8179,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8125,6 +8220,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_12";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
@@ -8179,6 +8275,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_2_0_2";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.5.nix b/pkgs/development/haskell-modules/configuration-lts-5.5.nix
index 3755d3ed35c..7743af0949e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.5.nix
@@ -452,6 +452,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -485,6 +486,7 @@ self: super: {
   "HaskellForMaths" = dontDistribute super."HaskellForMaths";
   "HaskellLM" = dontDistribute super."HaskellLM";
   "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellNet-SSL" = doDistribute super."HaskellNet-SSL_0_3_2_1";
   "HaskellTorrent" = dontDistribute super."HaskellTorrent";
   "HaskellTutorials" = dontDistribute super."HaskellTutorials";
   "Haskelloids" = dontDistribute super."Haskelloids";
@@ -636,6 +638,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_2_2";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -759,6 +762,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1072,6 +1076,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1249,6 +1254,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -1341,6 +1347,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async-dejafu" = doDistribute super."async-dejafu_0_1_0_0";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
   "async-pool" = dontDistribute super."async-pool";
@@ -1367,6 +1374,7 @@ self: super: {
   "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec" = doDistribute super."attoparsec_0_13_0_1";
   "attoparsec-arff" = dontDistribute super."attoparsec-arff";
   "attoparsec-binary" = dontDistribute super."attoparsec-binary";
   "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
@@ -1387,6 +1395,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "auto-update" = doDistribute super."auto-update_0_1_3";
   "autoexporter" = dontDistribute super."autoexporter";
   "automitive-cse" = dontDistribute super."automitive-cse";
   "automotive-cse" = dontDistribute super."automotive-cse";
@@ -1428,6 +1437,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_18";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1733,6 +1743,7 @@ self: super: {
   "cabal-cargs" = dontDistribute super."cabal-cargs";
   "cabal-constraints" = dontDistribute super."cabal-constraints";
   "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-debian" = doDistribute super."cabal-debian_4_32_2";
   "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
   "cabal-dev" = dontDistribute super."cabal-dev";
   "cabal-dir" = dontDistribute super."cabal-dir";
@@ -1837,6 +1848,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -1880,6 +1892,7 @@ self: super: {
   "chatty" = dontDistribute super."chatty";
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate" = doDistribute super."cheapskate_0_1_0_4";
   "cheapskate-highlight" = dontDistribute super."cheapskate-highlight";
   "cheapskate-lucid" = dontDistribute super."cheapskate-lucid";
   "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
@@ -1906,6 +1919,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -1973,6 +1987,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2071,6 +2086,7 @@ self: super: {
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_10_1";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
@@ -2105,6 +2121,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant-extras" = doDistribute super."contravariant-extras_0_3_1";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
   "control-monad-exception" = dontDistribute super."control-monad-exception";
@@ -2128,6 +2145,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2227,6 +2245,7 @@ self: super: {
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
   "ctpl" = dontDistribute super."ctpl";
+  "ctrie" = doDistribute super."ctrie_0_1_0_3";
   "cube" = dontDistribute super."cube";
   "cubical" = dontDistribute super."cubical";
   "cubicbezier" = dontDistribute super."cubicbezier";
@@ -2249,6 +2268,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2257,6 +2277,7 @@ self: super: {
   "danibot" = dontDistribute super."danibot";
   "dao" = dontDistribute super."dao";
   "dapi" = dontDistribute super."dapi";
+  "darcs" = doDistribute super."darcs_2_10_3";
   "darcs-benchmark" = dontDistribute super."darcs-benchmark";
   "darcs-beta" = dontDistribute super."darcs-beta";
   "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
@@ -2383,6 +2404,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2419,6 +2441,7 @@ self: super: {
   "definitive-reactive" = dontDistribute super."definitive-reactive";
   "definitive-sound" = dontDistribute super."definitive-sound";
   "deiko-config" = dontDistribute super."deiko-config";
+  "dejafu" = doDistribute super."dejafu_0_2_0_0";
   "deka" = dontDistribute super."deka";
   "deka-tests" = dontDistribute super."deka-tests";
   "delaunay" = dontDistribute super."delaunay";
@@ -2460,12 +2483,20 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_2";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
+  "diagrams-canvas" = doDistribute super."diagrams-canvas_1_3_0_3";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_6";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
+  "diagrams-lib" = doDistribute super."diagrams-lib_1_3_1_1";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
@@ -2654,6 +2685,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editpipe" = dontDistribute super."editpipe";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_7";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2681,6 +2713,7 @@ self: super: {
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
   "elision" = dontDistribute super."elision";
+  "elm-bridge" = doDistribute super."elm-bridge_0_2_1_1";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-get" = dontDistribute super."elm-get";
@@ -2812,6 +2845,7 @@ self: super: {
   "extensible" = dontDistribute super."extensible";
   "extensible-data" = dontDistribute super."extensible-data";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_3";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
   "faceted" = dontDistribute super."faceted";
@@ -2879,6 +2913,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9_1";
   "filediff" = dontDistribute super."filediff";
   "filepath-io-access" = dontDistribute super."filepath-io-access";
   "filepather" = dontDistribute super."filepather";
@@ -2967,6 +3002,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
   "foreign-var" = dontDistribute super."foreign-var";
@@ -2998,6 +3034,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3123,6 +3160,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_2";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3781,6 +3819,7 @@ self: super: {
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
+  "hasty-hamiltonian" = doDistribute super."hasty-hamiltonian_1_1_2";
   "hat" = dontDistribute super."hat";
   "hatex-guide" = dontDistribute super."hatex-guide";
   "hath" = dontDistribute super."hath";
@@ -3948,6 +3987,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -3976,6 +4016,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_3";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4279,6 +4320,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
   "hstidy" = dontDistribute super."hstidy";
@@ -4329,6 +4371,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4357,6 +4400,7 @@ self: super: {
   "hulk" = dontDistribute super."hulk";
   "hums" = dontDistribute super."hums";
   "hunch" = dontDistribute super."hunch";
+  "hunit-dejafu" = doDistribute super."hunit-dejafu_0_2_0_0";
   "hunit-gui" = dontDistribute super."hunit-gui";
   "hunit-parsec" = dontDistribute super."hunit-parsec";
   "hunit-rematch" = dontDistribute super."hunit-rematch";
@@ -4374,6 +4418,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4503,6 +4548,7 @@ self: super: {
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
   "inserts" = dontDistribute super."inserts";
@@ -4534,6 +4580,7 @@ self: super: {
   "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -4720,6 +4767,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keystore" = dontDistribute super."keystore";
@@ -4830,9 +4878,11 @@ self: super: {
   "language-thrift" = doDistribute super."language-thrift_0_7_0_1";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
   "latex" = dontDistribute super."latex";
+  "latex-formulae-hakyll" = doDistribute super."latex-formulae-hakyll_0_2_0_1";
   "launchpad-control" = dontDistribute super."launchpad-control";
   "lax" = dontDistribute super."lax";
   "layers" = dontDistribute super."layers";
@@ -4907,6 +4957,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5131,6 +5182,7 @@ self: super: {
   "manatee-terminal" = dontDistribute super."manatee-terminal";
   "manatee-welcome" = dontDistribute super."manatee-welcome";
   "mancala" = dontDistribute super."mancala";
+  "mandrill" = doDistribute super."mandrill_0_5_1_0";
   "mandulia" = dontDistribute super."mandulia";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
@@ -5153,6 +5205,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5238,6 +5291,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5292,6 +5346,7 @@ self: super: {
   "monad-hash" = dontDistribute super."monad-hash";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -5308,8 +5363,11 @@ self: super: {
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-supply" = dontDistribute super."monad-supply";
   "monad-task" = dontDistribute super."monad-task";
+  "monad-time" = doDistribute super."monad-time_0_1";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5401,6 +5459,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5421,6 +5480,7 @@ self: super: {
   "musicxml2" = dontDistribute super."musicxml2";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -5670,6 +5730,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -5758,6 +5819,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -5837,6 +5899,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -5845,6 +5908,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_4";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -5877,6 +5941,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6019,9 +6084,11 @@ self: super: {
   "postgresql-cube" = dontDistribute super."postgresql-cube";
   "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
   "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_5_1_2";
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6037,6 +6104,8 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
+  "pred-trie" = doDistribute super."pred-trie_0_5_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
   "prefork" = dontDistribute super."prefork";
@@ -6061,6 +6130,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6131,6 +6201,7 @@ self: super: {
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
   "psql-helpers" = dontDistribute super."psql-helpers";
+  "psqueues" = doDistribute super."psqueues_0_2_2_0";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6154,6 +6225,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6290,6 +6362,7 @@ self: super: {
   "read-env-var" = dontDistribute super."read-env-var";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -6428,6 +6501,9 @@ self: super: {
   "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
   "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "rest-happstack" = doDistribute super."rest-happstack_0_3_1";
+  "rest-snap" = doDistribute super."rest-snap_0_2";
+  "rest-wai" = doDistribute super."rest-wai_0_2";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -6749,6 +6825,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -6951,6 +7028,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7028,6 +7106,7 @@ self: super: {
   "stash" = dontDistribute super."stash";
   "state" = dontDistribute super."state";
   "state-record" = dontDistribute super."state-record";
+  "stateWriter" = doDistribute super."stateWriter_0_2_6";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
   "statethread" = dontDistribute super."statethread";
@@ -7214,6 +7293,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7223,6 +7303,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_3";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7237,6 +7318,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_8";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7244,10 +7326,14 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_5_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
+  "tasty" = doDistribute super."tasty_0_11_0_2";
+  "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -7312,6 +7398,7 @@ self: super: {
   "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -7365,6 +7452,7 @@ self: super: {
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7488,6 +7576,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -7617,6 +7706,8 @@ self: super: {
   "typescript-docs" = dontDistribute super."typescript-docs";
   "typical" = dontDistribute super."typical";
   "typography-geometry" = dontDistribute super."typography-geometry";
+  "tz" = doDistribute super."tz_0_1_0_1";
+  "tzdata" = doDistribute super."tzdata_0_1_20150810_0";
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
@@ -7777,6 +7868,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -7856,6 +7948,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_5";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -7863,6 +7956,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_5";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
@@ -7921,6 +8015,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_8_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8076,6 +8171,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8116,6 +8212,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_12";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
@@ -8170,6 +8267,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_2_0_2";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.6.nix b/pkgs/development/haskell-modules/configuration-lts-5.6.nix
index 53643599858..1299567a772 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.6.nix
@@ -451,6 +451,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -484,6 +485,7 @@ self: super: {
   "HaskellForMaths" = dontDistribute super."HaskellForMaths";
   "HaskellLM" = dontDistribute super."HaskellLM";
   "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellNet-SSL" = doDistribute super."HaskellNet-SSL_0_3_2_1";
   "HaskellTorrent" = dontDistribute super."HaskellTorrent";
   "HaskellTutorials" = dontDistribute super."HaskellTutorials";
   "Haskelloids" = dontDistribute super."Haskelloids";
@@ -635,6 +637,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_2_2";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -758,6 +761,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1071,6 +1075,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1248,6 +1253,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -1340,6 +1346,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async-dejafu" = doDistribute super."async-dejafu_0_1_0_0";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
   "async-pool" = dontDistribute super."async-pool";
@@ -1365,6 +1372,7 @@ self: super: {
   "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec" = doDistribute super."attoparsec_0_13_0_1";
   "attoparsec-arff" = dontDistribute super."attoparsec-arff";
   "attoparsec-binary" = dontDistribute super."attoparsec-binary";
   "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
@@ -1385,6 +1393,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "auto-update" = doDistribute super."auto-update_0_1_3";
   "autoexporter" = dontDistribute super."autoexporter";
   "automitive-cse" = dontDistribute super."automitive-cse";
   "automotive-cse" = dontDistribute super."automotive-cse";
@@ -1426,6 +1435,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_18";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1729,6 +1739,7 @@ self: super: {
   "cabal-cargs" = dontDistribute super."cabal-cargs";
   "cabal-constraints" = dontDistribute super."cabal-constraints";
   "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-debian" = doDistribute super."cabal-debian_4_32_2";
   "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
   "cabal-dev" = dontDistribute super."cabal-dev";
   "cabal-dir" = dontDistribute super."cabal-dir";
@@ -1832,6 +1843,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -1875,6 +1887,7 @@ self: super: {
   "chatty" = dontDistribute super."chatty";
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate" = doDistribute super."cheapskate_0_1_0_4";
   "cheapskate-highlight" = dontDistribute super."cheapskate-highlight";
   "cheapskate-lucid" = dontDistribute super."cheapskate-lucid";
   "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
@@ -1901,6 +1914,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -1968,6 +1982,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2066,6 +2081,7 @@ self: super: {
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_11";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
@@ -2100,6 +2116,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant-extras" = doDistribute super."contravariant-extras_0_3_1";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
   "control-monad-exception" = dontDistribute super."control-monad-exception";
@@ -2123,6 +2140,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2221,6 +2239,7 @@ self: super: {
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
   "ctpl" = dontDistribute super."ctpl";
+  "ctrie" = doDistribute super."ctrie_0_1_0_3";
   "cube" = dontDistribute super."cube";
   "cubical" = dontDistribute super."cubical";
   "cubicbezier" = dontDistribute super."cubicbezier";
@@ -2243,6 +2262,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2251,6 +2271,7 @@ self: super: {
   "danibot" = dontDistribute super."danibot";
   "dao" = dontDistribute super."dao";
   "dapi" = dontDistribute super."dapi";
+  "darcs" = doDistribute super."darcs_2_10_3";
   "darcs-benchmark" = dontDistribute super."darcs-benchmark";
   "darcs-beta" = dontDistribute super."darcs-beta";
   "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
@@ -2377,6 +2398,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2413,6 +2435,7 @@ self: super: {
   "definitive-reactive" = dontDistribute super."definitive-reactive";
   "definitive-sound" = dontDistribute super."definitive-sound";
   "deiko-config" = dontDistribute super."deiko-config";
+  "dejafu" = doDistribute super."dejafu_0_2_0_0";
   "deka" = dontDistribute super."deka";
   "deka-tests" = dontDistribute super."deka-tests";
   "delaunay" = dontDistribute super."delaunay";
@@ -2454,12 +2477,20 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_2";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
+  "diagrams-canvas" = doDistribute super."diagrams-canvas_1_3_0_3";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_6";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
+  "diagrams-lib" = doDistribute super."diagrams-lib_1_3_1_1";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
@@ -2648,6 +2679,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editpipe" = dontDistribute super."editpipe";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_7";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2675,6 +2707,7 @@ self: super: {
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
   "elision" = dontDistribute super."elision";
+  "elm-bridge" = doDistribute super."elm-bridge_0_2_1_1";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-get" = dontDistribute super."elm-get";
@@ -2806,6 +2839,7 @@ self: super: {
   "extensible" = dontDistribute super."extensible";
   "extensible-data" = dontDistribute super."extensible-data";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_3";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
   "faceted" = dontDistribute super."faceted";
@@ -2873,6 +2907,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9_1";
   "filediff" = dontDistribute super."filediff";
   "filepath-io-access" = dontDistribute super."filepath-io-access";
   "filepather" = dontDistribute super."filepather";
@@ -2961,6 +2996,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
   "foreign-var" = dontDistribute super."foreign-var";
@@ -2992,6 +3028,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3115,6 +3152,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_2";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3772,6 +3810,7 @@ self: super: {
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
+  "hasty-hamiltonian" = doDistribute super."hasty-hamiltonian_1_1_2";
   "hat" = dontDistribute super."hat";
   "hatex-guide" = dontDistribute super."hatex-guide";
   "hath" = dontDistribute super."hath";
@@ -3937,6 +3976,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_2_3";
@@ -3965,6 +4005,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_3";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4268,6 +4309,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
   "hstidy" = dontDistribute super."hstidy";
@@ -4318,6 +4360,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4346,6 +4389,7 @@ self: super: {
   "hulk" = dontDistribute super."hulk";
   "hums" = dontDistribute super."hums";
   "hunch" = dontDistribute super."hunch";
+  "hunit-dejafu" = doDistribute super."hunit-dejafu_0_2_0_0";
   "hunit-gui" = dontDistribute super."hunit-gui";
   "hunit-parsec" = dontDistribute super."hunit-parsec";
   "hunit-rematch" = dontDistribute super."hunit-rematch";
@@ -4363,6 +4407,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4492,6 +4537,7 @@ self: super: {
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
   "inserts" = dontDistribute super."inserts";
@@ -4523,6 +4569,7 @@ self: super: {
   "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -4709,6 +4756,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keystore" = dontDistribute super."keystore";
@@ -4818,9 +4866,11 @@ self: super: {
   "language-thrift" = doDistribute super."language-thrift_0_7_0_1";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
   "latex" = dontDistribute super."latex";
+  "latex-formulae-hakyll" = doDistribute super."latex-formulae-hakyll_0_2_0_1";
   "launchpad-control" = dontDistribute super."launchpad-control";
   "lax" = dontDistribute super."lax";
   "layers" = dontDistribute super."layers";
@@ -4895,6 +4945,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5118,6 +5169,7 @@ self: super: {
   "manatee-terminal" = dontDistribute super."manatee-terminal";
   "manatee-welcome" = dontDistribute super."manatee-welcome";
   "mancala" = dontDistribute super."mancala";
+  "mandrill" = doDistribute super."mandrill_0_5_1_0";
   "mandulia" = dontDistribute super."mandulia";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
@@ -5140,6 +5192,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5225,6 +5278,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5279,6 +5333,7 @@ self: super: {
   "monad-hash" = dontDistribute super."monad-hash";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -5295,8 +5350,11 @@ self: super: {
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-supply" = dontDistribute super."monad-supply";
   "monad-task" = dontDistribute super."monad-task";
+  "monad-time" = doDistribute super."monad-time_0_1";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5388,6 +5446,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5408,6 +5467,7 @@ self: super: {
   "musicxml2" = dontDistribute super."musicxml2";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -5656,6 +5716,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -5744,6 +5805,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -5822,6 +5884,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -5830,6 +5893,7 @@ self: super: {
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
   "persistent" = doDistribute super."persistent_2_2_4";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -5862,6 +5926,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -6003,9 +6068,11 @@ self: super: {
   "postgresql-cube" = dontDistribute super."postgresql-cube";
   "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
   "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_5_1_2";
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6021,6 +6088,8 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
+  "pred-trie" = doDistribute super."pred-trie_0_5_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
   "prefork" = dontDistribute super."prefork";
@@ -6045,6 +6114,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6115,6 +6185,7 @@ self: super: {
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
   "psql-helpers" = dontDistribute super."psql-helpers";
+  "psqueues" = doDistribute super."psqueues_0_2_2_0";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6138,6 +6209,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6274,6 +6346,7 @@ self: super: {
   "read-env-var" = dontDistribute super."read-env-var";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -6411,6 +6484,9 @@ self: super: {
   "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
   "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "rest-happstack" = doDistribute super."rest-happstack_0_3_1";
+  "rest-snap" = doDistribute super."rest-snap_0_2";
+  "rest-wai" = doDistribute super."rest-wai_0_2";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -6732,6 +6808,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -6934,6 +7011,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7011,6 +7089,7 @@ self: super: {
   "stash" = dontDistribute super."stash";
   "state" = dontDistribute super."state";
   "state-record" = dontDistribute super."state-record";
+  "stateWriter" = doDistribute super."stateWriter_0_2_6";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
   "statethread" = dontDistribute super."statethread";
@@ -7072,6 +7151,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming" = doDistribute super."streaming_0_1_4_0";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0";
+  "streaming-commons" = doDistribute super."streaming-commons_0_1_15_2";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7196,6 +7276,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7205,6 +7286,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_3";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7219,6 +7301,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_8";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7226,10 +7309,14 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_5_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
+  "tasty" = doDistribute super."tasty_0_11_0_2";
+  "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -7294,6 +7381,7 @@ self: super: {
   "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -7347,6 +7435,7 @@ self: super: {
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7469,6 +7558,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -7598,6 +7688,8 @@ self: super: {
   "typescript-docs" = dontDistribute super."typescript-docs";
   "typical" = dontDistribute super."typical";
   "typography-geometry" = dontDistribute super."typography-geometry";
+  "tz" = doDistribute super."tz_0_1_0_1";
+  "tzdata" = doDistribute super."tzdata_0_1_20150810_0";
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
@@ -7758,6 +7850,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -7837,6 +7930,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_5";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -7844,6 +7938,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_5";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
@@ -7901,6 +7996,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_8_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8055,6 +8151,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8095,6 +8192,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_12";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
@@ -8149,6 +8247,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_2_0_2";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.7.nix b/pkgs/development/haskell-modules/configuration-lts-5.7.nix
index b8ae4e15211..8b3c63bdb51 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.7.nix
@@ -451,6 +451,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -484,6 +485,7 @@ self: super: {
   "HaskellForMaths" = dontDistribute super."HaskellForMaths";
   "HaskellLM" = dontDistribute super."HaskellLM";
   "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellNet-SSL" = doDistribute super."HaskellNet-SSL_0_3_2_1";
   "HaskellTorrent" = dontDistribute super."HaskellTorrent";
   "HaskellTutorials" = dontDistribute super."HaskellTutorials";
   "Haskelloids" = dontDistribute super."Haskelloids";
@@ -635,6 +637,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_2_2";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -758,6 +761,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1071,6 +1075,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1248,6 +1253,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -1340,6 +1346,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async-dejafu" = doDistribute super."async-dejafu_0_1_0_0";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
   "async-pool" = dontDistribute super."async-pool";
@@ -1365,6 +1372,7 @@ self: super: {
   "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec" = doDistribute super."attoparsec_0_13_0_1";
   "attoparsec-arff" = dontDistribute super."attoparsec-arff";
   "attoparsec-binary" = dontDistribute super."attoparsec-binary";
   "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
@@ -1385,6 +1393,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "auto-update" = doDistribute super."auto-update_0_1_3";
   "autoexporter" = dontDistribute super."autoexporter";
   "automitive-cse" = dontDistribute super."automitive-cse";
   "automotive-cse" = dontDistribute super."automotive-cse";
@@ -1426,6 +1435,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_18";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1729,6 +1739,7 @@ self: super: {
   "cabal-cargs" = dontDistribute super."cabal-cargs";
   "cabal-constraints" = dontDistribute super."cabal-constraints";
   "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-debian" = doDistribute super."cabal-debian_4_32_2";
   "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
   "cabal-dev" = dontDistribute super."cabal-dev";
   "cabal-dir" = dontDistribute super."cabal-dir";
@@ -1832,6 +1843,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -1874,6 +1886,7 @@ self: super: {
   "chatty" = dontDistribute super."chatty";
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate" = doDistribute super."cheapskate_0_1_0_4";
   "cheapskate-highlight" = dontDistribute super."cheapskate-highlight";
   "cheapskate-lucid" = dontDistribute super."cheapskate-lucid";
   "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
@@ -1900,6 +1913,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -1965,6 +1979,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2062,6 +2077,7 @@ self: super: {
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_11";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
@@ -2096,6 +2112,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant-extras" = doDistribute super."contravariant-extras_0_3_1";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
   "control-monad-exception" = dontDistribute super."control-monad-exception";
@@ -2119,6 +2136,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2217,6 +2235,7 @@ self: super: {
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
   "ctpl" = dontDistribute super."ctpl";
+  "ctrie" = doDistribute super."ctrie_0_1_0_3";
   "cube" = dontDistribute super."cube";
   "cubical" = dontDistribute super."cubical";
   "cubicbezier" = dontDistribute super."cubicbezier";
@@ -2239,6 +2258,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2247,6 +2267,7 @@ self: super: {
   "danibot" = dontDistribute super."danibot";
   "dao" = dontDistribute super."dao";
   "dapi" = dontDistribute super."dapi";
+  "darcs" = doDistribute super."darcs_2_10_3";
   "darcs-benchmark" = dontDistribute super."darcs-benchmark";
   "darcs-beta" = dontDistribute super."darcs-beta";
   "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
@@ -2373,6 +2394,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2409,6 +2431,7 @@ self: super: {
   "definitive-reactive" = dontDistribute super."definitive-reactive";
   "definitive-sound" = dontDistribute super."definitive-sound";
   "deiko-config" = dontDistribute super."deiko-config";
+  "dejafu" = doDistribute super."dejafu_0_2_0_0";
   "deka" = dontDistribute super."deka";
   "deka-tests" = dontDistribute super."deka-tests";
   "delaunay" = dontDistribute super."delaunay";
@@ -2450,12 +2473,20 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_2";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
+  "diagrams-canvas" = doDistribute super."diagrams-canvas_1_3_0_3";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_6";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
+  "diagrams-lib" = doDistribute super."diagrams-lib_1_3_1_1";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
@@ -2644,6 +2675,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editpipe" = dontDistribute super."editpipe";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_7";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2671,6 +2703,7 @@ self: super: {
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
   "elision" = dontDistribute super."elision";
+  "elm-bridge" = doDistribute super."elm-bridge_0_2_1_1";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-get" = dontDistribute super."elm-get";
@@ -2802,6 +2835,7 @@ self: super: {
   "extensible" = dontDistribute super."extensible";
   "extensible-data" = dontDistribute super."extensible-data";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_3";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
   "faceted" = dontDistribute super."faceted";
@@ -2869,6 +2903,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9_1";
   "filediff" = dontDistribute super."filediff";
   "filepath-io-access" = dontDistribute super."filepath-io-access";
   "filepather" = dontDistribute super."filepather";
@@ -2957,6 +2992,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
   "foreign-var" = dontDistribute super."foreign-var";
@@ -2988,6 +3024,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3111,6 +3148,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_2";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3768,6 +3806,7 @@ self: super: {
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
+  "hasty-hamiltonian" = doDistribute super."hasty-hamiltonian_1_1_2";
   "hat" = dontDistribute super."hat";
   "hatex-guide" = dontDistribute super."hatex-guide";
   "hath" = dontDistribute super."hath";
@@ -3932,6 +3971,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_3";
@@ -3960,6 +4000,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_3";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4262,6 +4303,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
   "hstidy" = dontDistribute super."hstidy";
@@ -4312,6 +4354,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4340,6 +4383,7 @@ self: super: {
   "hulk" = dontDistribute super."hulk";
   "hums" = dontDistribute super."hums";
   "hunch" = dontDistribute super."hunch";
+  "hunit-dejafu" = doDistribute super."hunit-dejafu_0_2_0_0";
   "hunit-gui" = dontDistribute super."hunit-gui";
   "hunit-parsec" = dontDistribute super."hunit-parsec";
   "hunit-rematch" = dontDistribute super."hunit-rematch";
@@ -4357,6 +4401,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4486,6 +4531,7 @@ self: super: {
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
   "inserts" = dontDistribute super."inserts";
@@ -4517,6 +4563,7 @@ self: super: {
   "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -4703,6 +4750,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keystore" = dontDistribute super."keystore";
@@ -4812,9 +4860,11 @@ self: super: {
   "language-thrift" = doDistribute super."language-thrift_0_7_0_1";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
   "latex" = dontDistribute super."latex";
+  "latex-formulae-hakyll" = doDistribute super."latex-formulae-hakyll_0_2_0_1";
   "launchpad-control" = dontDistribute super."launchpad-control";
   "lax" = dontDistribute super."lax";
   "layers" = dontDistribute super."layers";
@@ -4889,6 +4939,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5112,6 +5163,7 @@ self: super: {
   "manatee-terminal" = dontDistribute super."manatee-terminal";
   "manatee-welcome" = dontDistribute super."manatee-welcome";
   "mancala" = dontDistribute super."mancala";
+  "mandrill" = doDistribute super."mandrill_0_5_1_0";
   "mandulia" = dontDistribute super."mandulia";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
@@ -5134,6 +5186,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5218,6 +5271,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5272,6 +5326,7 @@ self: super: {
   "monad-hash" = dontDistribute super."monad-hash";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -5288,8 +5343,11 @@ self: super: {
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-supply" = dontDistribute super."monad-supply";
   "monad-task" = dontDistribute super."monad-task";
+  "monad-time" = doDistribute super."monad-time_0_1";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5381,6 +5439,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5401,6 +5460,7 @@ self: super: {
   "musicxml2" = dontDistribute super."musicxml2";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -5649,6 +5709,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -5737,6 +5798,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -5815,6 +5877,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -5822,6 +5885,7 @@ self: super: {
   "persist2er" = dontDistribute super."persist2er";
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -5833,6 +5897,7 @@ self: super: {
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-template" = doDistribute super."persistent-template_2_1_6";
   "persistent-vector" = dontDistribute super."persistent-vector";
   "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
   "persona" = dontDistribute super."persona";
@@ -5852,6 +5917,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -5993,9 +6059,11 @@ self: super: {
   "postgresql-cube" = dontDistribute super."postgresql-cube";
   "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
   "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_5_1_2";
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6011,6 +6079,8 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
+  "pred-trie" = doDistribute super."pred-trie_0_5_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
   "prefork" = dontDistribute super."prefork";
@@ -6035,6 +6105,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6105,6 +6176,7 @@ self: super: {
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
   "psql-helpers" = dontDistribute super."psql-helpers";
+  "psqueues" = doDistribute super."psqueues_0_2_2_0";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6128,6 +6200,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6264,6 +6337,7 @@ self: super: {
   "read-env-var" = dontDistribute super."read-env-var";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -6401,6 +6475,9 @@ self: super: {
   "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
   "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "rest-happstack" = doDistribute super."rest-happstack_0_3_1";
+  "rest-snap" = doDistribute super."rest-snap_0_2";
+  "rest-wai" = doDistribute super."rest-wai_0_2";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -6721,6 +6798,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -6923,6 +7001,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -7000,6 +7079,7 @@ self: super: {
   "stash" = dontDistribute super."stash";
   "state" = dontDistribute super."state";
   "state-record" = dontDistribute super."state-record";
+  "stateWriter" = doDistribute super."stateWriter_0_2_6";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
   "statethread" = dontDistribute super."statethread";
@@ -7061,6 +7141,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming" = doDistribute super."streaming_0_1_4_0";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0";
+  "streaming-commons" = doDistribute super."streaming-commons_0_1_15_2";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7183,6 +7264,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7192,6 +7274,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_3";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7206,6 +7289,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_8";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7213,10 +7297,14 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_5_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
+  "tasty" = doDistribute super."tasty_0_11_0_2";
+  "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -7281,6 +7369,7 @@ self: super: {
   "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -7334,6 +7423,7 @@ self: super: {
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7456,6 +7546,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -7584,6 +7675,8 @@ self: super: {
   "typescript-docs" = dontDistribute super."typescript-docs";
   "typical" = dontDistribute super."typical";
   "typography-geometry" = dontDistribute super."typography-geometry";
+  "tz" = doDistribute super."tz_0_1_0_1";
+  "tzdata" = doDistribute super."tzdata_0_1_20150810_0";
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
@@ -7744,6 +7837,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -7823,6 +7917,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_5";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -7830,6 +7925,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_5";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
@@ -7887,6 +7983,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_8_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8041,6 +8138,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8081,6 +8179,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_12";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
@@ -8135,6 +8234,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_2_0_2";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.8.nix b/pkgs/development/haskell-modules/configuration-lts-5.8.nix
index ddb17e5922d..8454d0b5a63 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.8.nix
@@ -451,6 +451,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -484,6 +485,7 @@ self: super: {
   "HaskellForMaths" = dontDistribute super."HaskellForMaths";
   "HaskellLM" = dontDistribute super."HaskellLM";
   "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellNet-SSL" = doDistribute super."HaskellNet-SSL_0_3_2_1";
   "HaskellTorrent" = dontDistribute super."HaskellTorrent";
   "HaskellTutorials" = dontDistribute super."HaskellTutorials";
   "Haskelloids" = dontDistribute super."Haskelloids";
@@ -635,6 +637,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_2_2";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -758,6 +761,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1071,6 +1075,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1248,6 +1253,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -1340,6 +1346,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async-dejafu" = doDistribute super."async-dejafu_0_1_0_0";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
   "async-pool" = dontDistribute super."async-pool";
@@ -1365,6 +1372,7 @@ self: super: {
   "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec" = doDistribute super."attoparsec_0_13_0_1";
   "attoparsec-arff" = dontDistribute super."attoparsec-arff";
   "attoparsec-binary" = dontDistribute super."attoparsec-binary";
   "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
@@ -1385,6 +1393,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "auto-update" = doDistribute super."auto-update_0_1_3";
   "autoexporter" = dontDistribute super."autoexporter";
   "automitive-cse" = dontDistribute super."automitive-cse";
   "automotive-cse" = dontDistribute super."automotive-cse";
@@ -1426,6 +1435,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_18";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1729,6 +1739,7 @@ self: super: {
   "cabal-cargs" = dontDistribute super."cabal-cargs";
   "cabal-constraints" = dontDistribute super."cabal-constraints";
   "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-debian" = doDistribute super."cabal-debian_4_32_2";
   "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
   "cabal-dev" = dontDistribute super."cabal-dev";
   "cabal-dir" = dontDistribute super."cabal-dir";
@@ -1832,6 +1843,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -1874,6 +1886,7 @@ self: super: {
   "chatty" = dontDistribute super."chatty";
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate" = doDistribute super."cheapskate_0_1_0_4";
   "cheapskate-highlight" = dontDistribute super."cheapskate-highlight";
   "cheapskate-lucid" = dontDistribute super."cheapskate-lucid";
   "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
@@ -1900,6 +1913,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -1965,6 +1979,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2042,6 +2057,7 @@ self: super: {
   "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
   "concurrent-extra" = dontDistribute super."concurrent-extra";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "concurrent-output" = doDistribute super."concurrent-output_1_7_4";
   "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
@@ -2061,6 +2077,7 @@ self: super: {
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_11";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
@@ -2095,6 +2112,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant-extras" = doDistribute super."contravariant-extras_0_3_1";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
   "control-monad-exception" = dontDistribute super."control-monad-exception";
@@ -2118,6 +2136,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2216,6 +2235,7 @@ self: super: {
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
   "ctpl" = dontDistribute super."ctpl";
+  "ctrie" = doDistribute super."ctrie_0_1_0_3";
   "cube" = dontDistribute super."cube";
   "cubical" = dontDistribute super."cubical";
   "cubicbezier" = dontDistribute super."cubicbezier";
@@ -2238,6 +2258,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2246,6 +2267,7 @@ self: super: {
   "danibot" = dontDistribute super."danibot";
   "dao" = dontDistribute super."dao";
   "dapi" = dontDistribute super."dapi";
+  "darcs" = doDistribute super."darcs_2_10_3";
   "darcs-benchmark" = dontDistribute super."darcs-benchmark";
   "darcs-beta" = dontDistribute super."darcs-beta";
   "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
@@ -2372,6 +2394,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2408,6 +2431,7 @@ self: super: {
   "definitive-reactive" = dontDistribute super."definitive-reactive";
   "definitive-sound" = dontDistribute super."definitive-sound";
   "deiko-config" = dontDistribute super."deiko-config";
+  "dejafu" = doDistribute super."dejafu_0_2_0_0";
   "deka" = dontDistribute super."deka";
   "deka-tests" = dontDistribute super."deka-tests";
   "delaunay" = dontDistribute super."delaunay";
@@ -2449,12 +2473,20 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_2";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
+  "diagrams-canvas" = doDistribute super."diagrams-canvas_1_3_0_3";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_6";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
+  "diagrams-lib" = doDistribute super."diagrams-lib_1_3_1_1";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
@@ -2643,6 +2675,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editpipe" = dontDistribute super."editpipe";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_7";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2670,6 +2703,7 @@ self: super: {
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
   "elision" = dontDistribute super."elision";
+  "elm-bridge" = doDistribute super."elm-bridge_0_2_1_1";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-get" = dontDistribute super."elm-get";
@@ -2801,6 +2835,7 @@ self: super: {
   "extensible" = dontDistribute super."extensible";
   "extensible-data" = dontDistribute super."extensible-data";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_3";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
   "faceted" = dontDistribute super."faceted";
@@ -2868,6 +2903,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9_1";
   "filediff" = dontDistribute super."filediff";
   "filepath-io-access" = dontDistribute super."filepath-io-access";
   "filepather" = dontDistribute super."filepather";
@@ -2956,6 +2992,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
   "foreign-var" = dontDistribute super."foreign-var";
@@ -2987,6 +3024,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3110,6 +3148,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_2";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3767,6 +3806,7 @@ self: super: {
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
+  "hasty-hamiltonian" = doDistribute super."hasty-hamiltonian_1_1_2";
   "hat" = dontDistribute super."hat";
   "hatex-guide" = dontDistribute super."hatex-guide";
   "hath" = dontDistribute super."hath";
@@ -3931,6 +3971,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_3";
@@ -3959,6 +4000,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_3";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4261,6 +4303,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
   "hstidy" = dontDistribute super."hstidy";
@@ -4311,6 +4354,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4339,6 +4383,7 @@ self: super: {
   "hulk" = dontDistribute super."hulk";
   "hums" = dontDistribute super."hums";
   "hunch" = dontDistribute super."hunch";
+  "hunit-dejafu" = doDistribute super."hunit-dejafu_0_2_0_0";
   "hunit-gui" = dontDistribute super."hunit-gui";
   "hunit-parsec" = dontDistribute super."hunit-parsec";
   "hunit-rematch" = dontDistribute super."hunit-rematch";
@@ -4356,6 +4401,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4485,6 +4531,7 @@ self: super: {
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
   "inserts" = dontDistribute super."inserts";
@@ -4516,6 +4563,7 @@ self: super: {
   "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -4702,6 +4750,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keystore" = dontDistribute super."keystore";
@@ -4811,9 +4860,11 @@ self: super: {
   "language-thrift" = doDistribute super."language-thrift_0_7_0_1";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
   "latex" = dontDistribute super."latex";
+  "latex-formulae-hakyll" = doDistribute super."latex-formulae-hakyll_0_2_0_1";
   "launchpad-control" = dontDistribute super."launchpad-control";
   "lax" = dontDistribute super."lax";
   "layers" = dontDistribute super."layers";
@@ -4888,6 +4939,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5111,6 +5163,7 @@ self: super: {
   "manatee-terminal" = dontDistribute super."manatee-terminal";
   "manatee-welcome" = dontDistribute super."manatee-welcome";
   "mancala" = dontDistribute super."mancala";
+  "mandrill" = doDistribute super."mandrill_0_5_1_0";
   "mandulia" = dontDistribute super."mandulia";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
@@ -5133,6 +5186,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5217,6 +5271,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5271,6 +5326,7 @@ self: super: {
   "monad-hash" = dontDistribute super."monad-hash";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -5287,8 +5343,11 @@ self: super: {
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-supply" = dontDistribute super."monad-supply";
   "monad-task" = dontDistribute super."monad-task";
+  "monad-time" = doDistribute super."monad-time_0_1";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5380,6 +5439,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5400,6 +5460,7 @@ self: super: {
   "musicxml2" = dontDistribute super."musicxml2";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -5648,6 +5709,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -5736,6 +5798,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -5814,6 +5877,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -5821,6 +5885,7 @@ self: super: {
   "persist2er" = dontDistribute super."persist2er";
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -5832,6 +5897,7 @@ self: super: {
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-template" = doDistribute super."persistent-template_2_1_6";
   "persistent-vector" = dontDistribute super."persistent-vector";
   "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
   "persona" = dontDistribute super."persona";
@@ -5851,6 +5917,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -5992,9 +6059,11 @@ self: super: {
   "postgresql-cube" = dontDistribute super."postgresql-cube";
   "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
   "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_5_1_2";
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -6010,6 +6079,8 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
+  "pred-trie" = doDistribute super."pred-trie_0_5_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
   "prefork" = dontDistribute super."prefork";
@@ -6034,6 +6105,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6104,6 +6176,7 @@ self: super: {
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
   "psql-helpers" = dontDistribute super."psql-helpers";
+  "psqueues" = doDistribute super."psqueues_0_2_2_0";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6127,6 +6200,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6263,6 +6337,7 @@ self: super: {
   "read-env-var" = dontDistribute super."read-env-var";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -6400,6 +6475,9 @@ self: super: {
   "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
   "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "rest-happstack" = doDistribute super."rest-happstack_0_3_1";
+  "rest-snap" = doDistribute super."rest-snap_0_2";
+  "rest-wai" = doDistribute super."rest-wai_0_2";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -6720,6 +6798,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -6922,6 +7001,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -6999,6 +7079,7 @@ self: super: {
   "stash" = dontDistribute super."stash";
   "state" = dontDistribute super."state";
   "state-record" = dontDistribute super."state-record";
+  "stateWriter" = doDistribute super."stateWriter_0_2_6";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
   "statethread" = dontDistribute super."statethread";
@@ -7060,6 +7141,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming" = doDistribute super."streaming_0_1_4_0";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_0";
+  "streaming-commons" = doDistribute super."streaming-commons_0_1_15_2";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7182,6 +7264,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7191,6 +7274,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_3";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7205,6 +7289,7 @@ self: super: {
   "tagsoup" = doDistribute super."tagsoup_0_13_8";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7212,10 +7297,14 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_5_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
+  "tasty" = doDistribute super."tasty_0_11_0_2";
+  "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -7280,6 +7369,7 @@ self: super: {
   "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -7333,6 +7423,7 @@ self: super: {
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7455,6 +7546,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -7583,6 +7675,8 @@ self: super: {
   "typescript-docs" = dontDistribute super."typescript-docs";
   "typical" = dontDistribute super."typical";
   "typography-geometry" = dontDistribute super."typography-geometry";
+  "tz" = doDistribute super."tz_0_1_0_1";
+  "tzdata" = doDistribute super."tzdata_0_1_20150810_0";
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
@@ -7743,6 +7837,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -7753,6 +7848,7 @@ self: super: {
   "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_3_1";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
@@ -7821,6 +7917,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_5";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -7828,6 +7925,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_5";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
@@ -7884,6 +7982,7 @@ self: super: {
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
   "webdriver" = doDistribute super."webdriver_0_8_1";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8038,6 +8137,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8078,6 +8178,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_12";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
@@ -8132,6 +8233,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_2_0_2";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.9.nix b/pkgs/development/haskell-modules/configuration-lts-5.9.nix
index 3bb8e3ad802..1ca18de21a3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.9.nix
@@ -451,6 +451,7 @@ self: super: {
   "HSGEP" = dontDistribute super."HSGEP";
   "HSH" = dontDistribute super."HSH";
   "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSet" = dontDistribute super."HSet";
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
@@ -484,6 +485,7 @@ self: super: {
   "HaskellForMaths" = dontDistribute super."HaskellForMaths";
   "HaskellLM" = dontDistribute super."HaskellLM";
   "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellNet-SSL" = doDistribute super."HaskellNet-SSL_0_3_2_1";
   "HaskellTorrent" = dontDistribute super."HaskellTorrent";
   "HaskellTutorials" = dontDistribute super."HaskellTutorials";
   "Haskelloids" = dontDistribute super."Haskelloids";
@@ -635,6 +637,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_2_2";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -758,6 +761,7 @@ self: super: {
   "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
   "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
   "QIO" = dontDistribute super."QIO";
+  "QLearn" = dontDistribute super."QLearn";
   "QuadEdge" = dontDistribute super."QuadEdge";
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
@@ -1071,6 +1075,7 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_8";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
@@ -1247,6 +1252,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annah" = dontDistribute super."annah";
   "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -1339,6 +1345,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async-dejafu" = doDistribute super."async-dejafu_0_1_0_0";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
   "async-pool" = dontDistribute super."async-pool";
@@ -1364,6 +1371,7 @@ self: super: {
   "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec" = doDistribute super."attoparsec_0_13_0_1";
   "attoparsec-arff" = dontDistribute super."attoparsec-arff";
   "attoparsec-binary" = dontDistribute super."attoparsec-binary";
   "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
@@ -1384,6 +1392,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "auto-update" = doDistribute super."auto-update_0_1_3";
   "autoexporter" = dontDistribute super."autoexporter";
   "automitive-cse" = dontDistribute super."automitive-cse";
   "automotive-cse" = dontDistribute super."automotive-cse";
@@ -1425,6 +1434,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_18";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1728,6 +1738,7 @@ self: super: {
   "cabal-cargs" = dontDistribute super."cabal-cargs";
   "cabal-constraints" = dontDistribute super."cabal-constraints";
   "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-debian" = doDistribute super."cabal-debian_4_32_2";
   "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
   "cabal-dev" = dontDistribute super."cabal-dev";
   "cabal-dir" = dontDistribute super."cabal-dir";
@@ -1830,6 +1841,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-printf" = dontDistribute super."category-printf";
   "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -1872,6 +1884,7 @@ self: super: {
   "chatty" = dontDistribute super."chatty";
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate" = doDistribute super."cheapskate_0_1_0_4";
   "cheapskate-highlight" = dontDistribute super."cheapskate-highlight";
   "cheapskate-lucid" = dontDistribute super."cheapskate-lucid";
   "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
@@ -1898,6 +1911,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circlehs" = dontDistribute super."circlehs";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -1963,6 +1977,7 @@ self: super: {
   "cmdtheline" = dontDistribute super."cmdtheline";
   "cml" = dontDistribute super."cml";
   "cmonad" = dontDistribute super."cmonad";
+  "cmph" = dontDistribute super."cmph";
   "cmu" = dontDistribute super."cmu";
   "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
   "cndict" = dontDistribute super."cndict";
@@ -2040,6 +2055,7 @@ self: super: {
   "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
   "concurrent-extra" = dontDistribute super."concurrent-extra";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "concurrent-output" = doDistribute super."concurrent-output_1_7_4";
   "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
@@ -2059,6 +2075,7 @@ self: super: {
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_11";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-parse" = doDistribute super."conduit-parse_0_1_1_0";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
@@ -2093,6 +2110,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant-extras" = doDistribute super."contravariant-extras_0_3_1";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
   "control-monad-exception" = dontDistribute super."control-monad-exception";
@@ -2116,6 +2134,7 @@ self: super: {
   "convertible-ascii" = dontDistribute super."convertible-ascii";
   "convertible-text" = dontDistribute super."convertible-text";
   "cookbook" = dontDistribute super."cookbook";
+  "cookie" = doDistribute super."cookie_0_4_1_6";
   "coordinate" = dontDistribute super."coordinate";
   "copilot" = dontDistribute super."copilot";
   "copilot-c99" = dontDistribute super."copilot-c99";
@@ -2214,6 +2233,7 @@ self: super: {
   "ctemplate" = dontDistribute super."ctemplate";
   "ctkl" = dontDistribute super."ctkl";
   "ctpl" = dontDistribute super."ctpl";
+  "ctrie" = doDistribute super."ctrie_0_1_0_3";
   "cube" = dontDistribute super."cube";
   "cubical" = dontDistribute super."cubical";
   "cubicbezier" = dontDistribute super."cubicbezier";
@@ -2236,6 +2256,7 @@ self: super: {
   "cyclotomic" = dontDistribute super."cyclotomic";
   "cypher" = dontDistribute super."cypher";
   "d-bus" = dontDistribute super."d-bus";
+  "d3d11binding" = dontDistribute super."d3d11binding";
   "d3js" = dontDistribute super."d3js";
   "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
   "daemons" = dontDistribute super."daemons";
@@ -2244,6 +2265,7 @@ self: super: {
   "danibot" = dontDistribute super."danibot";
   "dao" = dontDistribute super."dao";
   "dapi" = dontDistribute super."dapi";
+  "darcs" = doDistribute super."darcs_2_10_3";
   "darcs-benchmark" = dontDistribute super."darcs-benchmark";
   "darcs-beta" = dontDistribute super."darcs-beta";
   "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
@@ -2370,6 +2392,7 @@ self: super: {
   "ddc-build" = dontDistribute super."ddc-build";
   "ddc-code" = dontDistribute super."ddc-code";
   "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-babel" = dontDistribute super."ddc-core-babel";
   "ddc-core-eval" = dontDistribute super."ddc-core-eval";
   "ddc-core-flow" = dontDistribute super."ddc-core-flow";
   "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
@@ -2406,6 +2429,7 @@ self: super: {
   "definitive-reactive" = dontDistribute super."definitive-reactive";
   "definitive-sound" = dontDistribute super."definitive-sound";
   "deiko-config" = dontDistribute super."deiko-config";
+  "dejafu" = doDistribute super."dejafu_0_2_0_0";
   "deka" = dontDistribute super."deka";
   "deka-tests" = dontDistribute super."deka-tests";
   "delaunay" = dontDistribute super."delaunay";
@@ -2446,12 +2470,20 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_5";
+  "diagrams-canvas" = doDistribute super."diagrams-canvas_1_3_0_3";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_8";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_6";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_4";
+  "diagrams-lib" = doDistribute super."diagrams-lib_1_3_1_1";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_5";
   "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
@@ -2640,6 +2672,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editpipe" = dontDistribute super."editpipe";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_7";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2667,6 +2700,7 @@ self: super: {
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
   "elision" = dontDistribute super."elision";
+  "elm-bridge" = doDistribute super."elm-bridge_0_2_1_1";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-get" = dontDistribute super."elm-get";
@@ -2798,6 +2832,7 @@ self: super: {
   "extensible" = dontDistribute super."extensible";
   "extensible-data" = dontDistribute super."extensible-data";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_3";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
   "faceted" = dontDistribute super."faceted";
@@ -2865,6 +2900,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9_1";
   "filediff" = dontDistribute super."filediff";
   "filepath-io-access" = dontDistribute super."filepath-io-access";
   "filepather" = dontDistribute super."filepather";
@@ -2953,6 +2989,7 @@ self: super: {
   "foo" = dontDistribute super."foo";
   "for-free" = dontDistribute super."for-free";
   "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "force-layout" = doDistribute super."force-layout_0_4_0_3";
   "fordo" = dontDistribute super."fordo";
   "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
   "foreign-var" = dontDistribute super."foreign-var";
@@ -2984,6 +3021,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "freddy" = dontDistribute super."freddy";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3107,6 +3145,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_2";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3762,6 +3801,7 @@ self: super: {
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
+  "hasty-hamiltonian" = doDistribute super."hasty-hamiltonian_1_1_2";
   "hat" = dontDistribute super."hat";
   "hatex-guide" = dontDistribute super."hatex-guide";
   "hath" = dontDistribute super."hath";
@@ -3924,6 +3964,7 @@ self: super: {
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
   "hinduce-examples" = dontDistribute super."hinduce-examples";
   "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinotify-bytestring" = dontDistribute super."hinotify-bytestring";
   "hinquire" = dontDistribute super."hinquire";
   "hinstaller" = dontDistribute super."hinstaller";
   "hint" = doDistribute super."hint_0_4_3";
@@ -3952,6 +3993,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_3";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4254,6 +4296,7 @@ self: super: {
   "hsshellscript" = dontDistribute super."hsshellscript";
   "hssourceinfo" = dontDistribute super."hssourceinfo";
   "hssqlppp" = dontDistribute super."hssqlppp";
+  "hssqlppp-th" = dontDistribute super."hssqlppp-th";
   "hstats" = dontDistribute super."hstats";
   "hstest" = dontDistribute super."hstest";
   "hstidy" = dontDistribute super."hstidy";
@@ -4304,6 +4347,7 @@ self: super: {
   "http-conduit" = doDistribute super."http-conduit_2_1_8";
   "http-conduit-browser" = dontDistribute super."http-conduit-browser";
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-dispatch" = dontDistribute super."http-dispatch";
   "http-encodings" = dontDistribute super."http-encodings";
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kinder" = dontDistribute super."http-kinder";
@@ -4332,6 +4376,7 @@ self: super: {
   "hulk" = dontDistribute super."hulk";
   "hums" = dontDistribute super."hums";
   "hunch" = dontDistribute super."hunch";
+  "hunit-dejafu" = doDistribute super."hunit-dejafu_0_2_0_0";
   "hunit-gui" = dontDistribute super."hunit-gui";
   "hunit-parsec" = dontDistribute super."hunit-parsec";
   "hunit-rematch" = dontDistribute super."hunit-rematch";
@@ -4349,6 +4394,7 @@ self: super: {
   "hw-bits" = dontDistribute super."hw-bits";
   "hw-conduit" = dontDistribute super."hw-conduit";
   "hw-diagnostics" = dontDistribute super."hw-diagnostics";
+  "hw-parser" = dontDistribute super."hw-parser";
   "hw-prim" = dontDistribute super."hw-prim";
   "hw-rankselect" = dontDistribute super."hw-rankselect";
   "hw-succinct" = dontDistribute super."hw-succinct";
@@ -4476,6 +4522,7 @@ self: super: {
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-java" = dontDistribute super."inline-java";
   "inquire" = dontDistribute super."inquire";
   "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
   "inserts" = dontDistribute super."inserts";
@@ -4507,6 +4554,7 @@ self: super: {
   "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invertible" = dontDistribute super."invertible";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-choice" = doDistribute super."io-choice_0_0_5";
@@ -4615,6 +4663,7 @@ self: super: {
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
   "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
+  "json-autotype" = doDistribute super."json-autotype_1_0_13";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -4691,6 +4740,7 @@ self: super: {
   "keera-posture" = dontDistribute super."keera-posture";
   "keiretsu" = dontDistribute super."keiretsu";
   "kevin" = dontDistribute super."kevin";
+  "keycode" = doDistribute super."keycode_0_1_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
   "keystore" = dontDistribute super."keystore";
@@ -4800,9 +4850,11 @@ self: super: {
   "language-thrift" = doDistribute super."language-thrift_0_7_0_1";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
+  "language-webidl" = dontDistribute super."language-webidl";
   "lat" = dontDistribute super."lat";
   "latest-npm-version" = dontDistribute super."latest-npm-version";
   "latex" = dontDistribute super."latex";
+  "latex-formulae-hakyll" = doDistribute super."latex-formulae-hakyll_0_2_0_1";
   "launchpad-control" = dontDistribute super."launchpad-control";
   "lax" = dontDistribute super."lax";
   "layers" = dontDistribute super."layers";
@@ -4877,6 +4929,7 @@ self: super: {
   "libpq" = dontDistribute super."libpq";
   "librandomorg" = dontDistribute super."librandomorg";
   "libravatar" = dontDistribute super."libravatar";
+  "libroman" = dontDistribute super."libroman";
   "libssh2" = dontDistribute super."libssh2";
   "libssh2-conduit" = dontDistribute super."libssh2-conduit";
   "libstackexchange" = dontDistribute super."libstackexchange";
@@ -5100,6 +5153,7 @@ self: super: {
   "manatee-terminal" = dontDistribute super."manatee-terminal";
   "manatee-welcome" = dontDistribute super."manatee-welcome";
   "mancala" = dontDistribute super."mancala";
+  "mandrill" = doDistribute super."mandrill_0_5_1_0";
   "mandulia" = dontDistribute super."mandulia";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
@@ -5122,6 +5176,7 @@ self: super: {
   "mastermind" = dontDistribute super."mastermind";
   "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
+  "math-functions" = doDistribute super."math-functions_0_1_5_2";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
   "mathista" = dontDistribute super."mathista";
@@ -5206,6 +5261,7 @@ self: super: {
   "mime" = dontDistribute super."mime";
   "mime-directory" = dontDistribute super."mime-directory";
   "mime-string" = dontDistribute super."mime-string";
+  "mime-types" = doDistribute super."mime-types_0_1_0_6";
   "mines" = dontDistribute super."mines";
   "minesweeper" = dontDistribute super."minesweeper";
   "miniball" = dontDistribute super."miniball";
@@ -5260,6 +5316,7 @@ self: super: {
   "monad-hash" = dontDistribute super."monad-hash";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-log" = dontDistribute super."monad-log";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -5276,8 +5333,11 @@ self: super: {
   "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
   "monad-supply" = dontDistribute super."monad-supply";
   "monad-task" = dontDistribute super."monad-task";
+  "monad-time" = doDistribute super."monad-time_0_1";
   "monad-tx" = dontDistribute super."monad-tx";
   "monad-unify" = dontDistribute super."monad-unify";
+  "monad-unlift" = doDistribute super."monad-unlift_0_1_1_0";
+  "monad-unlift-ref" = dontDistribute super."monad-unlift-ref";
   "monad-wrap" = dontDistribute super."monad-wrap";
   "monadIO" = dontDistribute super."monadIO";
   "monadLib-compose" = dontDistribute super."monadLib-compose";
@@ -5369,6 +5429,7 @@ self: super: {
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
   "murmur" = dontDistribute super."murmur";
+  "murmur-hash" = doDistribute super."murmur-hash_0_1_0_8";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5389,6 +5450,7 @@ self: super: {
   "musicxml2" = dontDistribute super."musicxml2";
   "mustache-haskell" = dontDistribute super."mustache-haskell";
   "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-containers" = doDistribute super."mutable-containers_0_3_2";
   "mutable-iter" = dontDistribute super."mutable-iter";
   "mute-unmute" = dontDistribute super."mute-unmute";
   "mvc" = dontDistribute super."mvc";
@@ -5636,6 +5698,7 @@ self: super: {
   "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
   "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
   "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "opensource" = dontDistribute super."opensource";
   "openssh-github-keys" = dontDistribute super."openssh-github-keys";
   "openssl-createkey" = dontDistribute super."openssl-createkey";
   "opentheory" = dontDistribute super."opentheory";
@@ -5722,6 +5785,7 @@ self: super: {
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
+  "paranoia" = dontDistribute super."paranoia";
   "parco" = dontDistribute super."parco";
   "parco-attoparsec" = dontDistribute super."parco-attoparsec";
   "parco-parsec" = dontDistribute super."parco-parsec";
@@ -5799,6 +5863,7 @@ self: super: {
   "peparser" = dontDistribute super."peparser";
   "perceptron" = dontDistribute super."perceptron";
   "perdure" = dontDistribute super."perdure";
+  "perfecthash" = dontDistribute super."perfecthash";
   "period" = dontDistribute super."period";
   "perm" = dontDistribute super."perm";
   "permutation" = dontDistribute super."permutation";
@@ -5806,6 +5871,7 @@ self: super: {
   "persist2er" = dontDistribute super."persist2er";
   "persistable-record" = dontDistribute super."persistable-record";
   "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-audit" = dontDistribute super."persistent-audit";
   "persistent-cereal" = dontDistribute super."persistent-cereal";
   "persistent-database-url" = dontDistribute super."persistent-database-url";
   "persistent-equivalence" = dontDistribute super."persistent-equivalence";
@@ -5817,6 +5883,7 @@ self: super: {
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-template" = doDistribute super."persistent-template_2_1_6";
   "persistent-vector" = dontDistribute super."persistent-vector";
   "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
   "persona" = dontDistribute super."persona";
@@ -5836,6 +5903,7 @@ self: super: {
   "phasechange" = dontDistribute super."phasechange";
   "phizzle" = dontDistribute super."phizzle";
   "phoityne" = dontDistribute super."phoityne";
+  "phoityne-vscode" = dontDistribute super."phoityne-vscode";
   "phone-numbers" = dontDistribute super."phone-numbers";
   "phone-push" = dontDistribute super."phone-push";
   "phonetic-code" = dontDistribute super."phonetic-code";
@@ -5977,9 +6045,11 @@ self: super: {
   "postgresql-cube" = dontDistribute super."postgresql-cube";
   "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
   "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_5_1_2";
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-transactional" = dontDistribute super."postgresql-transactional";
   "postgresql-typed" = dontDistribute super."postgresql-typed";
   "postgrest" = dontDistribute super."postgrest";
   "postie" = dontDistribute super."postie";
@@ -5995,6 +6065,8 @@ self: super: {
   "pqueue-mtl" = dontDistribute super."pqueue-mtl";
   "practice-room" = dontDistribute super."practice-room";
   "precis" = dontDistribute super."precis";
+  "pred-set" = dontDistribute super."pred-set";
+  "pred-trie" = doDistribute super."pred-trie_0_5_0";
   "predicates" = dontDistribute super."predicates";
   "prednote-test" = dontDistribute super."prednote-test";
   "prefork" = dontDistribute super."prefork";
@@ -6019,6 +6091,7 @@ self: super: {
   "pretty-sop" = dontDistribute super."pretty-sop";
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-spoon" = dontDistribute super."prim-spoon";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
@@ -6089,6 +6162,7 @@ self: super: {
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
   "psql-helpers" = dontDistribute super."psql-helpers";
+  "psqueues" = doDistribute super."psqueues_0_2_2_0";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6112,6 +6186,7 @@ self: super: {
   "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bridge" = dontDistribute super."purescript-bridge";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "pursuit-client" = dontDistribute super."pursuit-client";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
@@ -6248,6 +6323,7 @@ self: super: {
   "read-env-var" = dontDistribute super."read-env-var";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
+  "readshp" = dontDistribute super."readshp";
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
@@ -6385,6 +6461,9 @@ self: super: {
   "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
   "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "rest-happstack" = doDistribute super."rest-happstack_0_3_1";
+  "rest-snap" = doDistribute super."rest-snap_0_2";
+  "rest-wai" = doDistribute super."rest-wai_0_2";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -6627,9 +6706,13 @@ self: super: {
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
   "serv-wai" = dontDistribute super."serv-wai";
+  "servant" = doDistribute super."servant_0_4_4_7";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_3_0_1";
+  "servant-blaze" = doDistribute super."servant-blaze_0_4_4_7";
   "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-client" = doDistribute super."servant-client_0_4_4_7";
   "servant-csharp" = dontDistribute super."servant-csharp";
+  "servant-docs" = doDistribute super."servant-docs_0_4_4_7";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
   "servant-examples" = dontDistribute super."servant-examples";
@@ -6644,6 +6727,7 @@ self: super: {
   "servant-postgresql" = dontDistribute super."servant-postgresql";
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-server" = doDistribute super."servant-server_0_4_4_7";
   "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
@@ -6699,6 +6783,7 @@ self: super: {
   "shell-pipe" = dontDistribute super."shell-pipe";
   "shellish" = dontDistribute super."shellish";
   "shellmate" = dontDistribute super."shellmate";
+  "shelly" = doDistribute super."shelly_1_6_5";
   "shelly-extra" = dontDistribute super."shelly-extra";
   "shine" = dontDistribute super."shine";
   "shine-varying" = dontDistribute super."shine-varying";
@@ -6899,6 +6984,7 @@ self: super: {
   "spacepart" = dontDistribute super."spacepart";
   "spaceprobe" = dontDistribute super."spaceprobe";
   "spanout" = dontDistribute super."spanout";
+  "sparkle" = dontDistribute super."sparkle";
   "sparse" = dontDistribute super."sparse";
   "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
   "sparsebit" = dontDistribute super."sparsebit";
@@ -6976,6 +7062,7 @@ self: super: {
   "stash" = dontDistribute super."stash";
   "state" = dontDistribute super."state";
   "state-record" = dontDistribute super."state-record";
+  "stateWriter" = doDistribute super."stateWriter_0_2_6";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
   "statethread" = dontDistribute super."statethread";
@@ -7037,6 +7124,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming" = doDistribute super."streaming_0_1_4_0";
   "streaming-bytestring" = doDistribute super."streaming-bytestring_0_1_4_2";
+  "streaming-commons" = doDistribute super."streaming-commons_0_1_15_2";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
@@ -7159,6 +7247,7 @@ self: super: {
   "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
+  "table-layout" = dontDistribute super."table-layout";
   "table-tennis" = dontDistribute super."table-tennis";
   "tableaux" = dontDistribute super."tableaux";
   "tables" = dontDistribute super."tables";
@@ -7168,6 +7257,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_3";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7181,6 +7271,7 @@ self: super: {
   "tagset-positional" = dontDistribute super."tagset-positional";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "tai64" = dontDistribute super."tai64";
   "takahashi" = dontDistribute super."takahashi";
   "takusen-oracle" = dontDistribute super."takusen-oracle";
   "tamarin-prover" = dontDistribute super."tamarin-prover";
@@ -7188,10 +7279,14 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_5_0_1";
+  "tardis" = doDistribute super."tardis_0_3_0_0";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
+  "tasty" = doDistribute super."tasty_0_11_0_2";
+  "tasty-dejafu" = doDistribute super."tasty-dejafu_0_2_0_0";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
   "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
@@ -7256,6 +7351,7 @@ self: super: {
   "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
   "test-shouldbe" = dontDistribute super."test-shouldbe";
   "testPkg" = dontDistribute super."testPkg";
+  "testing-feat" = doDistribute super."testing-feat_0_4_0_2";
   "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
   "testloop" = dontDistribute super."testloop";
   "testpack" = dontDistribute super."testpack";
@@ -7308,6 +7404,7 @@ self: super: {
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-many" = doDistribute super."th-reify-many_0_1_4";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7430,6 +7527,7 @@ self: super: {
   "transformers-convert" = dontDistribute super."transformers-convert";
   "transformers-eff" = dontDistribute super."transformers-eff";
   "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-lift" = doDistribute super."transformers-lift_0_1_0_0";
   "transformers-runnable" = dontDistribute super."transformers-runnable";
   "transformers-supply" = dontDistribute super."transformers-supply";
   "transient" = dontDistribute super."transient";
@@ -7558,6 +7656,8 @@ self: super: {
   "typescript-docs" = dontDistribute super."typescript-docs";
   "typical" = dontDistribute super."typical";
   "typography-geometry" = dontDistribute super."typography-geometry";
+  "tz" = doDistribute super."tz_0_1_0_1";
+  "tzdata" = doDistribute super."tzdata_0_1_20150810_0";
   "uAgda" = dontDistribute super."uAgda";
   "ua-parser" = dontDistribute super."ua-parser";
   "uacpid" = dontDistribute super."uacpid";
@@ -7718,6 +7818,7 @@ self: super: {
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
   "vcard" = dontDistribute super."vcard";
+  "vcatt" = dontDistribute super."vcatt";
   "vcd" = dontDistribute super."vcd";
   "vcs-revision" = dontDistribute super."vcs-revision";
   "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
@@ -7728,6 +7829,7 @@ self: super: {
   "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_3_1";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
@@ -7796,6 +7898,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_5";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -7803,6 +7906,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_5";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
@@ -7858,6 +7962,7 @@ self: super: {
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
+  "webdriver-angular" = doDistribute super."webdriver-angular_0_1_9";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
@@ -8012,6 +8117,7 @@ self: super: {
   "xsd" = dontDistribute super."xsd";
   "xsha1" = dontDistribute super."xsha1";
   "xslt" = dontDistribute super."xslt";
+  "xss-sanitize" = doDistribute super."xss-sanitize_0_3_5_6";
   "xtc" = dontDistribute super."xtc";
   "xtest" = dontDistribute super."xtest";
   "xturtle" = dontDistribute super."xturtle";
@@ -8052,6 +8158,7 @@ self: super: {
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_12";
+  "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_1";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_4_2_2";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
@@ -8105,6 +8212,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-static-angular" = doDistribute super."yesod-static-angular_0_1_7";
   "yesod-table" = doDistribute super."yesod-table_2_0_2";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 903f2c3a3a1..8a88cce6753 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1968,7 +1968,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "BlogLiterately" = callPackage
+  "BlogLiterately_0_8_2" = callPackage
     ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs
      , containers, data-default, directory, filepath, HaXml, haxr
      , highlighting-kate, hscolour, HTTP, lens, mtl, pandoc
@@ -1991,9 +1991,10 @@ self: {
        homepage = "http://byorgey.wordpress.com/blogliterately/";
        description = "A tool for posting Haskelly articles to blogs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "BlogLiterately_0_8_2_1" = callPackage
+  "BlogLiterately" = callPackage
     ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs
      , containers, data-default, directory, filepath, HaXml, haxr
      , highlighting-kate, hscolour, HTTP, lens, mtl, pandoc
@@ -2016,7 +2017,6 @@ self: {
        homepage = "http://byorgey.wordpress.com/blogliterately/";
        description = "A tool for posting Haskelly articles to blogs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BlogLiterately-diagrams_0_1_4_3" = callPackage
@@ -2821,6 +2821,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Cabal_1_24_0_0" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , deepseq, directory, exceptions, filepath, old-time, pretty
+     , process, QuickCheck, regex-posix, tagged, tasty, tasty-hunit
+     , tasty-quickcheck, time, transformers, unix
+     }:
+     mkDerivation {
+       pname = "Cabal";
+       version = "1.24.0.0";
+       sha256 = "c00e9d372adb49ce1bd5b62ff049cf49adc4a312a271b238894e50eb707297aa";
+       libraryHaskellDepends = [
+         array base binary bytestring containers deepseq directory filepath
+         pretty process time unix
+       ];
+       testHaskellDepends = [
+         base bytestring containers directory exceptions filepath old-time
+         pretty process QuickCheck regex-posix tagged tasty tasty-hunit
+         tasty-quickcheck transformers unix
+       ];
+       homepage = "http://www.haskell.org/cabal/";
+       description = "A framework for packaging Haskell software";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Cabal-ide-backend" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
      , deepseq, directory, extensible-exceptions, filepath, HUnit
@@ -3082,6 +3107,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Chart_1_7_1" = callPackage
+    ({ mkDerivation, array, base, colour, data-default-class, lens, mtl
+     , old-locale, operational, time, vector
+     }:
+     mkDerivation {
+       pname = "Chart";
+       version = "1.7.1";
+       sha256 = "068e8ec72dbc3bb7ddaca052729cb0a187df6d3828978966b1c15c8ac36be610";
+       libraryHaskellDepends = [
+         array base colour data-default-class lens mtl old-locale
+         operational time vector
+       ];
+       homepage = "https://github.com/timbod7/haskell-chart/wiki";
+       description = "A library for generating 2D Charts and Plots";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Chart-cairo_1_5_1" = callPackage
     ({ mkDerivation, array, base, cairo, Chart, colour
      , data-default-class, lens, mtl, old-locale, operational, time
@@ -3137,6 +3180,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Chart-cairo_1_7_1" = callPackage
+    ({ mkDerivation, array, base, cairo, Chart, colour
+     , data-default-class, lens, mtl, old-locale, operational, time
+     }:
+     mkDerivation {
+       pname = "Chart-cairo";
+       version = "1.7.1";
+       sha256 = "3f3cffb7b971b45b0ace2c45f2916df1fc9b5473b49c4f0fc86937802790fe01";
+       libraryHaskellDepends = [
+         array base cairo Chart colour data-default-class lens mtl
+         old-locale operational time
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/timbod7/haskell-chart/wiki";
+       description = "Cairo backend for Charts";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Chart-diagrams_1_3_2" = callPackage
     ({ mkDerivation, base, blaze-svg, bytestring, Chart, colour
      , containers, data-default-class, diagrams-core, diagrams-lib
@@ -3250,18 +3312,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Chart-diagrams_1_7_1" = callPackage
+    ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour
+     , containers, data-default-class, diagrams-core, diagrams-lib
+     , diagrams-postscript, diagrams-svg, lens, mtl, old-locale
+     , operational, svg-builder, SVGFonts, text, time
+     }:
+     mkDerivation {
+       pname = "Chart-diagrams";
+       version = "1.7.1";
+       sha256 = "d88af0adbe2bd9e208bcd27fda55810031ce09438801fc2bc25da15c414805c5";
+       libraryHaskellDepends = [
+         base blaze-markup bytestring Chart colour containers
+         data-default-class diagrams-core diagrams-lib diagrams-postscript
+         diagrams-svg lens mtl old-locale operational svg-builder SVGFonts
+         text time
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/timbod7/haskell-chart/wiki";
+       description = "Diagrams backend for Charts";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Chart-gtk" = callPackage
     ({ mkDerivation, array, base, cairo, Chart, Chart-cairo, colour
      , data-default-class, gtk, mtl, old-locale, time
      }:
      mkDerivation {
        pname = "Chart-gtk";
-       version = "1.6";
-       sha256 = "f566a4fbdfcca207640a76e2c953617b27954e3f49258c7ab425270379b954c7";
+       version = "1.7";
+       sha256 = "6adba9e92f11cebba5b3487352bd4a750b325b5fe0e17b1dfd02a920618d9991";
        libraryHaskellDepends = [
          array base cairo Chart Chart-cairo colour data-default-class gtk
          mtl old-locale time
        ];
+       jailbreak = true;
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Utility functions for using the chart library with GTK";
        license = stdenv.lib.licenses.bsd3;
@@ -7435,15 +7521,17 @@ self: {
      }) {};
 
   "Gifcurry" = callPackage
-    ({ mkDerivation, base, directory, gtk3, process, temporary }:
+    ({ mkDerivation, base, cmdargs, directory, gtk3, process, temporary
+     }:
      mkDerivation {
        pname = "Gifcurry";
-       version = "0.1.1.0";
-       sha256 = "21f72f6c440eec80cb2e7df3fc8ed65124b64ab45ba55b4adf5dfccdca0e257a";
-       isLibrary = false;
+       version = "2.0.0.0";
+       sha256 = "c6a13b6a4f1fcaf3d24428862222f52d383570eb4d5872e21cb5e2882d936809";
+       isLibrary = true;
        isExecutable = true;
+       libraryHaskellDepends = [ base directory process temporary ];
        executableHaskellDepends = [
-         base directory gtk3 process temporary
+         base cmdargs directory gtk3 process temporary
        ];
        homepage = "https://github.com/lettier/gifcurry";
        description = "Create animated GIFs, overlaid with optional text, from video files";
@@ -9220,6 +9308,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "HSet" = callPackage
+    ({ mkDerivation, base, containers, hashable, hashtables }:
+     mkDerivation {
+       pname = "HSet";
+       version = "0.0.0";
+       sha256 = "8b336a5f5c68d23683b7f69a5fcc02c7a9f869b7570799cf81cd26c37ea70426";
+       libraryHaskellDepends = [ base containers hashable hashtables ];
+       description = "Faux heterogeneous sets";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "HSlippyMap" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -10685,7 +10784,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "HaskellNet-SSL" = callPackage
+  "HaskellNet-SSL_0_3_2_1" = callPackage
     ({ mkDerivation, base, bytestring, connection, data-default
      , HaskellNet, network, tls
      }:
@@ -10699,6 +10798,23 @@ self: {
        homepage = "https://github.com/dpwright/HaskellNet-SSL";
        description = "Helpers to connect to SSL/TLS mail servers with HaskellNet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "HaskellNet-SSL" = callPackage
+    ({ mkDerivation, base, bytestring, connection, data-default
+     , HaskellNet, network, tls
+     }:
+     mkDerivation {
+       pname = "HaskellNet-SSL";
+       version = "0.3.3.0";
+       sha256 = "177d462b939dcb1ebab9cabf5ab5d49d969c80a8de1732bc6e1613780b8fd5f4";
+       libraryHaskellDepends = [
+         base bytestring connection data-default HaskellNet network tls
+       ];
+       homepage = "https://github.com/dpwright/HaskellNet-SSL";
+       description = "Helpers to connect to SSL/TLS mail servers with HaskellNet";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "HaskellTorrent" = callPackage
@@ -14093,7 +14209,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "MonadRandom" = callPackage
+  "MonadRandom_0_4_2_2" = callPackage
     ({ mkDerivation, base, mtl, random, transformers
      , transformers-compat
      }:
@@ -14106,9 +14222,10 @@ self: {
        ];
        description = "Random-number generation monad";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "MonadRandom_0_4_2_3" = callPackage
+  "MonadRandom" = callPackage
     ({ mkDerivation, base, mtl, random, transformers
      , transformers-compat
      }:
@@ -14121,7 +14238,6 @@ self: {
        ];
        description = "Random-number generation monad";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MonadRandomLazy" = callPackage
@@ -15997,13 +16113,12 @@ self: {
      }:
      mkDerivation {
        pname = "PerfectHash";
-       version = "0.1.4";
-       sha256 = "76de68a4acda732bff57a13b6a7855469e9924569206b02eb401498f362d40c2";
+       version = "0.1.5";
+       sha256 = "3c59408ee1d6fef7a6f8d5c778947503a6eb21c861d0a9ad9be39847ae75173a";
        libraryHaskellDepends = [
          array base binary bytestring containers digest time
        ];
        librarySystemDepends = [ cmph ];
-       jailbreak = true;
        description = "A perfect hashing library for mapping bytestrings to values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16459,6 +16574,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "QLearn" = callPackage
+    ({ mkDerivation, base, random, vector }:
+     mkDerivation {
+       pname = "QLearn";
+       version = "0.1.0.0";
+       sha256 = "87d899997011c59e0f1f1a7efa434aa026e5c67f13681cdbe68ac8d300db736d";
+       libraryHaskellDepends = [ base random vector ];
+       homepage = "poincare.github.io/QLearn";
+       description = "A library for fast, easy-to-use Q-learning";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "QuadEdge" = callPackage
     ({ mkDerivation, base, random, vector }:
      mkDerivation {
@@ -16934,8 +17061,8 @@ self: {
      }:
      mkDerivation {
        pname = "RNAlien";
-       version = "1.1.1";
-       sha256 = "975a187bbe34324b62e57fb132e9dd38ada86409bb010b1631c8c5b86346ebee";
+       version = "1.1.3";
+       sha256 = "d7d0c3fdbac52be1df3c122a400c3471c6bdeed5e148b742fb77364751029e5d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -21968,6 +22095,8 @@ self: {
        pname = "accelerate-examples";
        version = "0.15.1.0";
        sha256 = "2191601709da693aedb29f570e44b899b5132d2bc05fe618bc93608a43fec4a2";
+       revision = "1";
+       editedCabalFile = "77df83db322287253ea831448eced5c2adff5fe3edc413392cfb0eb8bdb0833b";
        configureFlags = [ "-f-opencl" ];
        isLibrary = true;
        isExecutable = true;
@@ -21985,6 +22114,7 @@ self: {
          repa-io test-framework test-framework-hunit
          test-framework-quickcheck2 vector vector-algorithms
        ];
+       jailbreak = true;
        homepage = "https://github.com/AccelerateHS/accelerate-examples";
        description = "Examples using the Accelerate library";
        license = stdenv.lib.licenses.bsd3;
@@ -22826,7 +22956,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "active" = callPackage
+  "active_0_2_0_8" = callPackage
     ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids
      , semigroups, vector
      }:
@@ -22842,6 +22972,25 @@ self: {
        ];
        description = "Abstractions for animation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "active" = callPackage
+    ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids
+     , semigroups, vector
+     }:
+     mkDerivation {
+       pname = "active";
+       version = "0.2.0.9";
+       sha256 = "b0d1f0f60abccf913da8a14d83672333ca4b0b55346a43d7de2656bdb8926b75";
+       libraryHaskellDepends = [
+         base lens linear semigroupoids semigroups vector
+       ];
+       testHaskellDepends = [
+         base lens linear QuickCheck semigroupoids semigroups vector
+       ];
+       description = "Abstractions for animation";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "activehs" = callPackage
@@ -23445,8 +23594,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson";
-       version = "0.11.1.4";
-       sha256 = "59ee31bb0fe71ae68bbfa3f3b977443ff200c6dfaaa442485e7295a75fcf7845";
+       version = "0.11.2.0";
+       sha256 = "447a454b51b8d6ca9e3b59bc5918115a880a9320afeb9030000fe6c87fd2285e";
        libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq dlist fail ghc-prim
          hashable mtl scientific semigroups syb tagged template-haskell text
@@ -23596,6 +23745,36 @@ self: {
          tasty-quickcheck text time time-locale-compat unordered-containers
          vector
        ];
+       jailbreak = true;
+       homepage = "https://github.com/phadej/aeson-compat#readme";
+       description = "Compatibility layer for aeson";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "aeson-compat_0_3_2_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-compat, base-orphans
+     , bytestring, containers, exceptions, hashable, nats, QuickCheck
+     , quickcheck-instances, scientific, semigroups, tagged, tasty
+     , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-compat";
+       version = "0.3.2.0";
+       sha256 = "ab594edc5bb15e42975536e689485d0b356d25727b0645d7bfd2f4fa9e27d338";
+       libraryHaskellDepends = [
+         aeson attoparsec base base-compat bytestring containers exceptions
+         hashable nats scientific semigroups tagged text time
+         time-locale-compat unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base-compat base-orphans bytestring
+         containers exceptions hashable nats QuickCheck quickcheck-instances
+         scientific semigroups tagged tasty tasty-hunit tasty-quickcheck
+         text time time-locale-compat unordered-containers vector
+       ];
+       jailbreak = true;
        homepage = "https://github.com/phadej/aeson-compat#readme";
        description = "Compatibility layer for aeson";
        license = stdenv.lib.licenses.bsd3;
@@ -23611,8 +23790,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-compat";
-       version = "0.3.2.0";
-       sha256 = "ab594edc5bb15e42975536e689485d0b356d25727b0645d7bfd2f4fa9e27d338";
+       version = "0.3.3.0";
+       sha256 = "33a6a4c8d41b3ee08432c1ed0f118b595cd582cffb81b8621ad0bbd3164eb7e4";
        libraryHaskellDepends = [
          aeson attoparsec base base-compat bytestring containers exceptions
          hashable nats scientific semigroups tagged text time
@@ -24389,24 +24568,6 @@ self: {
      }) {};
 
   "agda-snippets-hakyll" = callPackage
-    ({ mkDerivation, agda-snippets, base, directory, filepath, hakyll
-     , network-uri, pandoc, pandoc-types
-     }:
-     mkDerivation {
-       pname = "agda-snippets-hakyll";
-       version = "0.1.2.0";
-       sha256 = "83829a3599fe61a81747e7054659902fbf7258cf08fb61dd6fc47fae06e699d9";
-       libraryHaskellDepends = [
-         agda-snippets base directory filepath hakyll network-uri pandoc
-         pandoc-types
-       ];
-       homepage = "https://github.com/liamoc/agda-snippets#readme";
-       description = "Literate Agda support using agda-snippets, for Hakyll pages";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "agda-snippets-hakyll_0_1_2_1" = callPackage
     ({ mkDerivation, agda-snippets, base, directory, filepath, hakyll
      , network-uri, pandoc, pandoc-types
      }:
@@ -30645,6 +30806,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "annah" = callPackage
+    ({ mkDerivation, alex, array, base, Earley, lens-family-core, morte
+     , optparse-applicative, pipes, system-fileio, system-filepath, text
+     , text-format, transformers
+     }:
+     mkDerivation {
+       pname = "annah";
+       version = "1.0.0";
+       sha256 = "a07a92ebc41ac5af31cce2b41c9dd311f92ca52e05c2aaea756aebdcceb00389";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base Earley lens-family-core morte pipes system-filepath text
+         text-format transformers
+       ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [
+         base morte optparse-applicative system-fileio system-filepath text
+       ];
+       description = "Medium-level language that desugars to Morte";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "annihilator" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -32015,8 +32199,8 @@ self: {
      }:
      mkDerivation {
        pname = "arb-fft";
-       version = "0.2.0.2";
-       sha256 = "b719edb18b07ec45ce091d9d0269b846e36844a63a2da2f613bd87b3bf53b0fb";
+       version = "0.3.0.0";
+       sha256 = "4788916d5a3a5a5844ff1cf0b3a28d577aeacd3c214b58ccaee7552bd3c40fcc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -32027,7 +32211,6 @@ self: {
        testHaskellDepends = [
          base containers QuickCheck tasty tasty-quickcheck vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/ian-ross/arb-fft";
        description = "Pure Haskell arbitrary length FFT library";
        license = stdenv.lib.licenses.bsd3;
@@ -33535,7 +33718,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "async-dejafu" = callPackage
+  "async-dejafu_0_1_0_0" = callPackage
     ({ mkDerivation, base, dejafu, exceptions, HUnit, hunit-dejafu }:
      mkDerivation {
        pname = "async-dejafu";
@@ -33546,21 +33729,20 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Run MonadConc operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "async-dejafu_0_1_1_0" = callPackage
+  "async-dejafu" = callPackage
     ({ mkDerivation, base, dejafu, exceptions, HUnit, hunit-dejafu }:
      mkDerivation {
        pname = "async-dejafu";
-       version = "0.1.1.0";
-       sha256 = "13a3b0bd80363d90fee27abcab299082b4947bf1197716e9f7df9dbace306595";
+       version = "0.1.2.1";
+       sha256 = "084e4e8345ed6d4e4d2d9dc840e6c471384ae6ac51d9678ac5e82246a359d39d";
        libraryHaskellDepends = [ base dejafu exceptions ];
        testHaskellDepends = [ base dejafu HUnit hunit-dejafu ];
-       jailbreak = true;
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Run MonadConc operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "async-extras" = callPackage
@@ -34146,7 +34328,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "attoparsec" = callPackage
+  "attoparsec_0_13_0_1" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , QuickCheck, quickcheck-unicode, scientific, test-framework
      , test-framework-quickcheck2, text, transformers, vector
@@ -34167,9 +34349,10 @@ self: {
        homepage = "https://github.com/bos/attoparsec";
        description = "Fast combinator parsing for bytestrings and text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "attoparsec_0_13_0_2" = callPackage
+  "attoparsec" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , QuickCheck, quickcheck-unicode, scientific, tasty
      , tasty-quickcheck, text, transformers, vector
@@ -34189,7 +34372,6 @@ self: {
        homepage = "https://github.com/bos/attoparsec";
        description = "Fast combinator parsing for bytestrings and text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attoparsec-arff" = callPackage
@@ -34716,7 +34898,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "auto-update" = callPackage
+  "auto-update_0_1_3" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "auto-update";
@@ -34726,14 +34908,27 @@ self: {
        homepage = "https://github.com/yesodweb/wai";
        description = "Efficiently run periodic, on-demand actions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "auto-update" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "auto-update";
+       version = "0.1.3.1";
+       sha256 = "01367ac53d1951ffdccfccbf338d00d3605967cf717f2404b9901a206385427c";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/yesodweb/wai";
+       description = "Efficiently run periodic, on-demand actions";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "autoexporter" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
        pname = "autoexporter";
-       version = "0.2.0";
-       sha256 = "e4c0145475197dd5dd61639d88c406090d472daa7bac28e9be70a230994bb8db";
+       version = "0.2.2";
+       sha256 = "2ad4c6d948984c0a5542f5ce87d806b3597088083bc179217d36d08380880d03";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal directory filepath ];
@@ -34743,22 +34938,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "autoexporter_0_2_1" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath }:
-     mkDerivation {
-       pname = "autoexporter";
-       version = "0.2.1";
-       sha256 = "fe46d1f434862dfaa4fd245c66d4a96ea8c4f3f8c3314ca6fc844e97e71097e4";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base Cabal directory filepath ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/tfausak/autoexporter#readme";
-       description = "Automatically re-export modules";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "automitive-cse" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cryptonite, memory
      , quickcheck-simple
@@ -34783,8 +34962,8 @@ self: {
      }:
      mkDerivation {
        pname = "automotive-cse";
-       version = "0.1.2.0";
-       sha256 = "97873ddb30997908e2e82d30a8ffff21d16280efa3be2b9985d69794ccfc515a";
+       version = "0.1.3.0";
+       sha256 = "71b59c50b29748ae5991d53af5a7bed6ee283942e1df69c0b3c9da8107d06b9c";
        libraryHaskellDepends = [
          base bytestring bytestring-short cereal cryptonite memory
        ];
@@ -36173,7 +36352,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "b9" = callPackage
+  "b9_0_5_18" = callPackage
     ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
      , bytestring, conduit, conduit-extra, ConfigFile, directory
      , filepath, free, hashable, hspec, hspec-expectations, mtl
@@ -36204,6 +36383,40 @@ self: {
        homepage = "https://github.com/sheyll/b9-vm-image-builder";
        description = "A tool and library for building virtual machine images";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "b9" = callPackage
+    ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
+     , bytestring, conduit, conduit-extra, ConfigFile, directory
+     , filepath, free, hashable, hspec, hspec-expectations, mtl
+     , optparse-applicative, parallel, parsec, pretty, pretty-show
+     , process, QuickCheck, random, semigroups, syb, template, text
+     , time, transformers, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "b9";
+       version = "0.5.19";
+       sha256 = "ea2706b4b0729a3250b6b5da718fb70845df9594eda7c7fb633cdb7eb53b3b56";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bifunctors binary boxes bytestring conduit
+         conduit-extra ConfigFile directory filepath free hashable mtl
+         parallel parsec pretty pretty-show process QuickCheck random
+         semigroups syb template text time transformers unordered-containers
+         vector yaml
+       ];
+       executableHaskellDepends = [
+         base bytestring directory optparse-applicative
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec hspec-expectations QuickCheck
+         semigroups text unordered-containers vector yaml
+       ];
+       homepage = "https://github.com/sheyll/b9-vm-image-builder";
+       description = "A tool and library for building virtual machine images";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "babylon" = callPackage
@@ -37634,6 +37847,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bcrypt_0_0_9" = callPackage
+    ({ mkDerivation, base, bytestring, data-default, entropy, memory }:
+     mkDerivation {
+       pname = "bcrypt";
+       version = "0.0.9";
+       sha256 = "33b87031fe80d2be666df7e892b11dcb35f630d7fb93dd95e3920d86b5c91553";
+       libraryHaskellDepends = [
+         base bytestring data-default entropy memory
+       ];
+       jailbreak = true;
+       description = "Haskell bindings to the bcrypt password hash";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bdd" = callPackage
     ({ mkDerivation, base, directory, HUnit, mtl, process
      , test-framework, test-framework-hunit, transformers
@@ -38487,15 +38715,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "binary_0_8_2_1" = callPackage
+  "binary_0_8_3_0" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, filepath, HUnit, QuickCheck, random, test-framework
      , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "binary";
-       version = "0.8.2.1";
-       sha256 = "2452e32eccfe74214f689805745a11de1018f22eb19682772df23cce8816b750";
+       version = "0.8.3.0";
+       sha256 = "221385dde77d92f786c665ee6fce0a3beeb80e6a812b8edf9ded1b653f2ea821";
+       revision = "1";
+       editedCabalFile = "21a7449af6a6caa19c3b5c877c2331ccd3842ef1e9ab59c65918fbde0f6ac427";
        libraryHaskellDepends = [ array base bytestring containers ];
        testHaskellDepends = [
          array base bytestring Cabal containers directory filepath HUnit
@@ -38777,8 +39007,8 @@ self: {
        pname = "binary-orphans";
        version = "0.1.4.0";
        sha256 = "0a952a7521747a7aacf4aa1638674130262f2efacb7121727c1932d49017f742";
-       revision = "5";
-       editedCabalFile = "76b1ba2893085236d9989cf697d01fca25c7980563c5b5c452a133aeefec2b0d";
+       revision = "6";
+       editedCabalFile = "6353827d50132789cb11f3d5fb6c9ec22a36f8f7a38559e6138d2212572be253";
        libraryHaskellDepends = [
          aeson base binary hashable scientific semigroups tagged text
          text-binary time unordered-containers vector
@@ -40895,8 +41125,8 @@ self: {
      }:
      mkDerivation {
        pname = "bitx-bitcoin";
-       version = "0.7.0.1";
-       sha256 = "808cce7f13d11c7ea5424fa017aada13e787dca3dafe67100e303e976dc6382e";
+       version = "0.7.0.2";
+       sha256 = "f86b55294f029255a5329137b3f075daf495a1f7f462aed66ac273f368985d02";
        libraryHaskellDepends = [
          aeson base bytestring http-client http-client-tls http-types
          microlens microlens-th network QuickCheck scientific split text
@@ -42227,19 +42457,18 @@ self: {
   "bond" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, cmdargs, derive
      , Diff, directory, filepath, HUnit, monad-loops, mtl, parsec
-     , pretty, process, QuickCheck, shakespeare, tasty, tasty-golden
-     , tasty-hunit, tasty-quickcheck, text
+     , pretty, process, QuickCheck, scientific, shakespeare, tasty
+     , tasty-golden, tasty-hunit, tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "bond";
-       version = "0.4.0.1";
-       sha256 = "40d7f0ddcb4779d16ce3ce94bb0f0d2ea47d6d2c82f296027cd3d068be0622c8";
-       revision = "1";
-       editedCabalFile = "f90dcbaa3a55c1918957942c01f21a574c268730f37aff34c19a6cd04b4ccc6d";
+       version = "0.4.0.2";
+       sha256 = "866c6880600baa54114914e005dd994bacc33377470bd31405bda0c9f47a3825";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring filepath mtl parsec shakespeare text
+         aeson base bytestring filepath mtl parsec scientific shakespeare
+         text
        ];
        executableHaskellDepends = [
          aeson async base bytestring cmdargs directory filepath monad-loops
@@ -43470,8 +43699,8 @@ self: {
        pname = "bumper";
        version = "0.6.0.3";
        sha256 = "7cfce3a38be30744a2eb322ad1e5271cd665fa62b4fe21bdf9aa00fcdbc4daa8";
-       revision = "1";
-       editedCabalFile = "d5083fd8bd41bdd8a9afb459891d3fbfd674b5279b30993928690410808a2af0";
+       revision = "2";
+       editedCabalFile = "bab175b04d4877724879ff0951490a7e0f5b98c3c99f802649e9b3db52c4db78";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -44842,7 +45071,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cabal-debian" = callPackage
+  "cabal-debian_4_32_2" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bifunctors, Cabal
      , containers, data-default, debian, deepseq, Diff, directory
      , exceptions, filepath, hsemail, HUnit, lens, memoize, mtl
@@ -44874,6 +45103,41 @@ self: {
        homepage = "https://github.com/ddssff/cabal-debian";
        description = "Create a Debianization for a Cabal package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "cabal-debian" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, bifunctors, Cabal
+     , containers, data-default, debian, deepseq, Diff, directory
+     , exceptions, filepath, hsemail, HUnit, lens, memoize, mtl
+     , network-uri, newtype-generics, optparse-applicative, parsec
+     , pretty, process, pureMD5, regex-tdfa, set-extra, syb, text, unix
+     , Unixutils, utf8-string
+     }:
+     mkDerivation {
+       pname = "cabal-debian";
+       version = "4.32.3";
+       sha256 = "f75c98fdef25568683f1783e3ea8537bdea7395abf30d402d4a41b59ecb6a6b2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-wl-pprint base bifunctors Cabal containers data-default debian
+         deepseq Diff directory exceptions filepath hsemail HUnit lens
+         memoize mtl network-uri newtype-generics optparse-applicative
+         parsec pretty process pureMD5 regex-tdfa set-extra syb text unix
+         Unixutils utf8-string
+       ];
+       executableHaskellDepends = [
+         base Cabal debian lens mtl pretty Unixutils
+       ];
+       testHaskellDepends = [
+         base Cabal containers debian Diff directory filepath hsemail HUnit
+         lens pretty process text
+       ];
+       doCheck = false;
+       homepage = "https://github.com/ddssff/cabal-debian";
+       description = "Create a Debianization for a Cabal package";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cabal-dependency-licenses" = callPackage
@@ -45425,6 +45689,44 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
+  "cabal-install_1_24_0_0" = callPackage
+    ({ mkDerivation, array, async, base, base16-bytestring, binary
+     , bytestring, Cabal, containers, cryptohash-sha256, directory
+     , filepath, hackage-security, hashable, HTTP, mtl, network
+     , network-uri, pretty, process, QuickCheck, random, regex-posix
+     , stm, tagged, tar, tasty, tasty-hunit, tasty-quickcheck, time
+     , unix, zlib
+     }:
+     mkDerivation {
+       pname = "cabal-install";
+       version = "1.24.0.0";
+       sha256 = "d840ecfd0a95a96e956b57fb2f3e9c81d9fc160e1fd0ea350b0d37d169d9e87e";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array async base base16-bytestring binary bytestring Cabal
+         containers cryptohash-sha256 directory filepath hackage-security
+         hashable HTTP mtl network network-uri pretty process random stm tar
+         time unix zlib
+       ];
+       testHaskellDepends = [
+         array async base binary bytestring Cabal containers directory
+         filepath hackage-security hashable HTTP mtl network network-uri
+         pretty process QuickCheck random regex-posix stm tagged tar tasty
+         tasty-hunit tasty-quickcheck time unix zlib
+       ];
+       jailbreak = true;
+       postInstall = ''
+         mkdir $out/etc
+         mv bash-completion $out/etc/bash_completion.d
+       '';
+       homepage = "http://www.haskell.org/cabal/";
+       description = "The command-line interface for Cabal and Hackage";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
+     }) {};
+
   "cabal-install-bundle" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, filepath, old-time, pretty, process, time, unix, zlib
@@ -47189,19 +47491,24 @@ self: {
 
   "casadi-bindings" = callPackage
     ({ mkDerivation, base, binary, casadi, casadi-bindings-core
-     , casadi-bindings-internal, cereal, containers, doctest, linear
-     , spatial-math, vector, vector-binary-instances
+     , casadi-bindings-internal, cereal, containers, doctest, HUnit
+     , linear, QuickCheck, spatial-math, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, vector
+     , vector-binary-instances
      }:
      mkDerivation {
        pname = "casadi-bindings";
-       version = "2.4.1.9";
-       sha256 = "a5156237cfb2bf64bcee8b1e408ace7b4c69d69733a129ab7d0b15436dab3acd";
+       version = "3.0.0.1";
+       sha256 = "87ad635f973a69820c4238ba634f8c4f9ece450d994b4c31f83a8cbcf2a791cc";
        libraryHaskellDepends = [
          base binary casadi-bindings-core casadi-bindings-internal cereal
          containers linear spatial-math vector vector-binary-instances
        ];
        libraryPkgconfigDepends = [ casadi ];
-       testHaskellDepends = [ base doctest ];
+       testHaskellDepends = [
+         base containers doctest HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2 vector
+       ];
        homepage = "http://github.com/ghorn/casadi-bindings";
        description = "mid-level bindings to CasADi";
        license = stdenv.lib.licenses.gpl3;
@@ -47232,8 +47539,8 @@ self: {
      }:
      mkDerivation {
        pname = "casadi-bindings-core";
-       version = "2.4.1.0";
-       sha256 = "f35fdfc2d8d33c5455d3e7dccce341332c0620db0445f99386f1e7920e053b6c";
+       version = "3.0.0.0";
+       sha256 = "8cd59ae975cc1de7db78ac59f6212f2523bdf723a782a9ce0c0b47922fdf31be";
        libraryHaskellDepends = [
          base casadi-bindings-internal containers vector
        ];
@@ -47247,8 +47554,8 @@ self: {
     ({ mkDerivation, base, casadi, containers, vector }:
      mkDerivation {
        pname = "casadi-bindings-internal";
-       version = "0.1.3.1";
-       sha256 = "7170eebb779a1e0dc18dc26edd55e7136978a1e24624c9953ddc5aee60f1e3a0";
+       version = "0.1.4.0";
+       sha256 = "c5a48653c1f893618287adad1979ee684064daeb9b060294d65a0bea6e378976";
        libraryHaskellDepends = [ base containers vector ];
        libraryPkgconfigDepends = [ casadi ];
        homepage = "http://github.com/ghorn/casadi-bindings";
@@ -48005,6 +48312,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "category-printf" = callPackage
+    ({ mkDerivation, base, bytestring, comonad, text }:
+     mkDerivation {
+       pname = "category-printf";
+       version = "0.1.0.0";
+       sha256 = "e954c7ab4970551a334fae1fc4ef98f56c65290b366f17cfb00df85f93bd90e2";
+       libraryHaskellDepends = [ base bytestring comonad text ];
+       jailbreak = true;
+       description = "Highbrow approach to type-safe printf format specifications";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "category-traced" = callPackage
     ({ mkDerivation, base, categories }:
      mkDerivation {
@@ -49024,7 +49343,7 @@ self: {
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
-  "cheapskate" = callPackage
+  "cheapskate_0_1_0_4" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring, containers
      , data-default, http-types, mtl, syb, text, uniplate, wai
      , wai-extra, xss-sanitize
@@ -49045,9 +49364,10 @@ self: {
        homepage = "http://github.com/jgm/cheapskate";
        description = "Experimental markdown processor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cheapskate_0_1_0_5" = callPackage
+  "cheapskate" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring, containers
      , data-default, http-types, mtl, syb, text, uniplate, wai
      , wai-extra, xss-sanitize
@@ -49068,7 +49388,6 @@ self: {
        homepage = "http://github.com/jgm/cheapskate";
        description = "Experimental markdown processor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cheapskate-highlight" = callPackage
@@ -49859,6 +50178,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "circlehs" = callPackage
+    ({ mkDerivation, aeson, base, http-client, http-client-tls, mtl
+     , servant, servant-client, text, time, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "circlehs";
+       version = "0.0.3";
+       sha256 = "aa5906bc29992227953845a4b39da6e3faf78a4520d5a85b2e0266daa0013ecf";
+       libraryHaskellDepends = [
+         aeson base http-client http-client-tls mtl servant servant-client
+         text time transformers unordered-containers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/denisshevchenko/circlehs";
+       description = "The CircleCI REST API for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "cirru-parser" = callPackage
     ({ mkDerivation, aeson, base, text, vector }:
      mkDerivation {
@@ -52808,7 +53146,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clock" = callPackage
+  "clock_0_5_1" = callPackage
     ({ mkDerivation, base, tasty, tasty-quickcheck }:
      mkDerivation {
        pname = "clock";
@@ -52816,10 +53154,10 @@ self: {
        sha256 = "7c7a1f89bc4fa2f995d31a214bb7e3ad44c3570cb46b8f18e7de6011f78197d9";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
-       doCheck = false;
        homepage = "https://github.com/corsis/clock";
        description = "High-resolution clock functions: monotonic, realtime, cputime";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clock_0_6_0_1" = callPackage
@@ -52837,7 +53175,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clock_0_7_2" = callPackage
+  "clock" = callPackage
     ({ mkDerivation, base, tasty, tasty-quickcheck }:
      mkDerivation {
        pname = "clock";
@@ -52845,10 +53183,10 @@ self: {
        sha256 = "886601978898d3a91412fef895e864576a7125d661e1f8abc49a2a08840e691f";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
+       doCheck = false;
        homepage = "https://github.com/corsis/clock";
        description = "High-resolution clock functions: monotonic, realtime, cputime";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clocked" = callPackage
@@ -53364,6 +53702,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cmph" = callPackage
+    ({ mkDerivation, array, base, bytestring, cmph, containers, hspec
+     , QuickCheck, semigroups, text
+     }:
+     mkDerivation {
+       pname = "cmph";
+       version = "0.0.1";
+       sha256 = "6308ca284f03d6b6a7cd2664bdab2e503079096a8457d95ff45ac305dfac923c";
+       libraryHaskellDepends = [ array base bytestring containers ];
+       librarySystemDepends = [ cmph ];
+       testHaskellDepends = [
+         base bytestring containers hspec QuickCheck semigroups text
+       ];
+       testSystemDepends = [ cmph ];
+       description = "low level interface to CMPH";
+       license = stdenv.lib.licenses.bsd3;
+     }) {cmph = null;};
+
   "cmu" = callPackage
     ({ mkDerivation, array, base, containers }:
      mkDerivation {
@@ -55300,7 +55656,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "concurrent-output" = callPackage
+  "concurrent-output_1_7_4" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
      , process, stm, terminal-size, text, transformers, unix
      }:
@@ -55314,6 +55670,23 @@ self: {
        ];
        description = "Ungarble output from several threads or commands";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "concurrent-output" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
+     , process, stm, terminal-size, text, transformers, unix
+     }:
+     mkDerivation {
+       pname = "concurrent-output";
+       version = "1.7.6";
+       sha256 = "ca3668dad7999dd1366582bff46ef3a50ba8ce9a775a812883094db92adac6a5";
+       libraryHaskellDepends = [
+         ansi-terminal async base directory exceptions process stm
+         terminal-size text transformers unix
+       ];
+       description = "Ungarble output from several threads or commands";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "concurrent-rpc" = callPackage
@@ -56492,7 +56865,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "conduit-parse" = callPackage
+  "conduit-parse_0_1_1_0" = callPackage
     ({ mkDerivation, base, conduit, dlist, exceptions, hlint, mtl
      , parsers, resourcet, tasty, tasty-hunit, text, transformers
      }:
@@ -56510,6 +56883,27 @@ self: {
        homepage = "https://github.com/k0ral/conduit-parse";
        description = "Parsing framework based on conduit";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "conduit-parse" = callPackage
+    ({ mkDerivation, base, conduit, dlist, exceptions, hlint, mtl
+     , parsers, resourcet, tasty, tasty-hunit, text, transformers
+     }:
+     mkDerivation {
+       pname = "conduit-parse";
+       version = "0.1.1.1";
+       sha256 = "4366a66f5980bd328730c5d44b99f67d7081e5ef76b554bc8284942bf9977f4a";
+       libraryHaskellDepends = [
+         base conduit dlist exceptions mtl parsers text transformers
+       ];
+       testHaskellDepends = [
+         base conduit exceptions hlint mtl parsers resourcet tasty
+         tasty-hunit
+       ];
+       homepage = "https://github.com/k0ral/conduit-parse";
+       description = "Parsing framework based on conduit";
+       license = "unknown";
      }) {};
 
   "conduit-resumablesink" = callPackage
@@ -57184,8 +57578,8 @@ self: {
      }:
      mkDerivation {
        pname = "consumers";
-       version = "1.0";
-       sha256 = "2bc2a6c50462d734a82487cad419e48835d016747cb4f3a5fdda252569b2f2b8";
+       version = "1.1";
+       sha256 = "0a0c574fcc036653364d75f7ec597310bf8e0952acd9de97f97febb7d7cc958c";
        libraryHaskellDepends = [
          base containers exceptions hpqtypes lifted-base lifted-threads log
          monad-control mtl stm time transformers-base
@@ -57588,7 +57982,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "contravariant-extras" = callPackage
+  "contravariant-extras_0_3_1" = callPackage
     ({ mkDerivation, base, base-prelude, contravariant
      , template-haskell, tuple-th
      }:
@@ -57602,6 +57996,23 @@ self: {
        homepage = "https://github.com/nikita-volkov/contravariant-extras";
        description = "Extras for the \"contravariant\" package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "contravariant-extras" = callPackage
+    ({ mkDerivation, base-prelude, contravariant, template-haskell
+     , tuple-th
+     }:
+     mkDerivation {
+       pname = "contravariant-extras";
+       version = "0.3.2";
+       sha256 = "9fd92b6d240f9492c0474ce5261751ed9f01b6fd4292f0bbfc482e19d9012505";
+       libraryHaskellDepends = [
+         base-prelude contravariant template-haskell tuple-th
+       ];
+       homepage = "https://github.com/nikita-volkov/contravariant-extras";
+       description = "Extras for the \"contravariant\" package";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "control-bool" = callPackage
@@ -58064,7 +58475,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cookie" = callPackage
+  "cookie_0_4_1_6" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring
      , data-default-class, deepseq, HUnit, old-locale, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck, text, time
@@ -58084,9 +58495,10 @@ self: {
        homepage = "http://github.com/snoyberg/cookie";
        description = "HTTP cookie parsing and rendering";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cookie_0_4_2" = callPackage
+  "cookie" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring
      , data-default-class, deepseq, HUnit, old-locale, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck, text, time
@@ -58106,7 +58518,6 @@ self: {
        homepage = "http://github.com/snoyberg/cookie";
        description = "HTTP cookie parsing and rendering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "coordinate" = callPackage
@@ -61129,7 +61540,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ctrie" = callPackage
+  "ctrie_0_1_0_3" = callPackage
     ({ mkDerivation, atomic-primops, base, containers, hashable
      , primitive, QuickCheck, test-framework, test-framework-quickcheck2
      }:
@@ -61145,6 +61556,25 @@ self: {
        homepage = "https://github.com/mcschroeder/ctrie";
        description = "Non-blocking concurrent map";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ctrie" = callPackage
+    ({ mkDerivation, atomic-primops, base, containers, hashable
+     , primitive, QuickCheck, test-framework, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "ctrie";
+       version = "0.1.1.0";
+       sha256 = "8434b34f6c5980a8885eb0565c0d421c825a2b30574a367db2d121ed42fa5bb8";
+       libraryHaskellDepends = [ atomic-primops base hashable primitive ];
+       testHaskellDepends = [
+         base containers hashable QuickCheck test-framework
+         test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/mcschroeder/ctrie";
+       description = "Non-blocking concurrent map";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "cube" = callPackage
@@ -61569,6 +61999,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "d3d11binding" = callPackage
+    ({ mkDerivation, base, c-storable-deriving, d3d11, D3DCompiler
+     , d3dx11, d3dxof, dxgi, dxguid, Win32
+     }:
+     mkDerivation {
+       pname = "d3d11binding";
+       version = "0.0.0.3";
+       sha256 = "f156ed2e733df23922146d95cc438647a3685382fad7db424ebc459847668282";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base c-storable-deriving Win32 ];
+       librarySystemDepends = [
+         d3d11 D3DCompiler d3dx11 d3dxof dxgi dxguid
+       ];
+       executableHaskellDepends = [ base Win32 ];
+       homepage = "https://github.com/jwvg0425/d3d11binding";
+       description = "A raw binding for the directX 11";
+       license = stdenv.lib.licenses.mit;
+     }) {D3DCompiler = null; d3d11 = null; d3dx11 = null; 
+         d3dxof = null; dxgi = null; dxguid = null;};
+
   "d3js" = callPackage
     ({ mkDerivation, base, mtl, random, text }:
      mkDerivation {
@@ -61778,7 +62229,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) curl;};
 
-  "darcs" = callPackage
+  "darcs_2_10_3" = callPackage
     ({ mkDerivation, array, attoparsec, base, base16-bytestring, binary
      , bytestring, cmdargs, containers, cryptohash, curl, data-ordlist
      , directory, filepath, FindBin, hashable, haskeline, html, HTTP
@@ -61822,6 +62273,51 @@ self: {
        homepage = "http://darcs.net/";
        description = "a distributed, interactive, smart revision control system";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) curl;};
+
+  "darcs" = callPackage
+    ({ mkDerivation, array, async, attoparsec, base, base16-bytestring
+     , binary, bytestring, cmdargs, containers, cryptohash, curl
+     , data-ordlist, directory, fgl, filepath, FindBin, graphviz
+     , hashable, haskeline, html, HTTP, HUnit, mmap, mtl, network
+     , network-uri, old-time, parsec, process, QuickCheck, random
+     , regex-applicative, regex-compat-tdfa, sandi, shelly, split, tar
+     , terminfo, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers
+     , transformers-compat, unix, unix-compat, utf8-string, vector
+     , zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "darcs";
+       version = "2.12.0";
+       sha256 = "17318d1b49ca4b1aa00a4bffc2ab30a448e7440ce1945eed9bf382d77582308d";
+       configureFlags = [ "-fforce-char8-encoding" "-flibrary" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array async attoparsec base base16-bytestring binary bytestring
+         containers cryptohash data-ordlist directory fgl filepath graphviz
+         hashable haskeline html HTTP mmap mtl network network-uri old-time
+         parsec process random regex-applicative regex-compat-tdfa sandi tar
+         terminfo text time transformers transformers-compat unix
+         unix-compat utf8-string vector zip-archive zlib
+       ];
+       librarySystemDepends = [ curl ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         array base bytestring cmdargs containers directory filepath FindBin
+         HUnit mtl QuickCheck shelly split test-framework
+         test-framework-hunit test-framework-quickcheck2 text zip-archive
+       ];
+       doCheck = false;
+       postInstall = ''
+         mkdir -p $out/etc/bash_completion.d
+         mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
+       '';
+       homepage = "http://darcs.net/";
+       description = "a distributed, interactive, smart revision control system";
+       license = "GPL";
      }) {inherit (pkgs) curl;};
 
   "darcs-benchmark" = callPackage
@@ -64193,12 +64689,11 @@ self: {
      }:
      mkDerivation {
        pname = "ddc-base";
-       version = "0.4.1.3";
-       sha256 = "d5e178099df92c82edf41999f01c292b19602e9cb7d599ada4284bc5dc9e78ec";
+       version = "0.4.2.1";
+       sha256 = "0870bebdecf1f86a9280d1ca5addf382ad3af75c502ecebf448a64cf9402b3fc";
        libraryHaskellDepends = [
          base containers deepseq parsec transformers wl-pprint
        ];
-       jailbreak = true;
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler common utilities";
        license = stdenv.lib.licenses.mit;
@@ -64206,20 +64701,19 @@ self: {
 
   "ddc-build" = callPackage
     ({ mkDerivation, base, containers, ddc-base, ddc-core
-     , ddc-core-eval, ddc-core-flow, ddc-core-llvm, ddc-core-salt
+     , ddc-core-babel, ddc-core-flow, ddc-core-llvm, ddc-core-salt
      , ddc-core-simpl, ddc-core-tetra, ddc-source-tetra, deepseq
-     , directory, filepath, mtl, process
+     , directory, filepath, mtl, process, time
      }:
      mkDerivation {
        pname = "ddc-build";
-       version = "0.4.1.3";
-       sha256 = "5a3a6488df40354294bea963e5432909e5bbdc6381e1a41e54e122f2526e7295";
+       version = "0.4.2.1";
+       sha256 = "2704257a4e47a432e0b4873297d833910f86435e7fd1add4530089849313f8ad";
        libraryHaskellDepends = [
-         base containers ddc-base ddc-core ddc-core-eval ddc-core-flow
+         base containers ddc-base ddc-core ddc-core-babel ddc-core-flow
          ddc-core-llvm ddc-core-salt ddc-core-simpl ddc-core-tetra
-         ddc-source-tetra deepseq directory filepath mtl process
+         ddc-source-tetra deepseq directory filepath mtl process time
        ];
-       jailbreak = true;
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler build framework";
        license = stdenv.lib.licenses.mit;
@@ -64230,10 +64724,9 @@ self: {
     ({ mkDerivation, base, filepath }:
      mkDerivation {
        pname = "ddc-code";
-       version = "0.4.1.3";
-       sha256 = "d9bceabc172cc9ab9ca9404971edd8ee657a5ff0017d9ae5545f33a1832520d5";
+       version = "0.4.2.1";
+       sha256 = "2584b9433a6b37233ce3a69dbcbb5f93b6014c39a5163a0bdee3b894477326a9";
        libraryHaskellDepends = [ base filepath ];
-       jailbreak = true;
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler base libraries";
        license = stdenv.lib.licenses.mit;
@@ -64241,22 +64734,38 @@ self: {
 
   "ddc-core" = callPackage
     ({ mkDerivation, array, base, containers, ddc-base, deepseq
-     , directory, mtl, transformers
+     , directory, mtl, text, transformers
      }:
      mkDerivation {
        pname = "ddc-core";
-       version = "0.4.1.3";
-       sha256 = "a5b5f0c484379060149efc82f6f704abf64691cb126c687c5d1adf311f0b4595";
+       version = "0.4.2.1";
+       sha256 = "9d6513e58ea47b5640d579ab655d2f13d5a9070f3ea2f34719cf9b9e1b43b874";
        libraryHaskellDepends = [
-         array base containers ddc-base deepseq directory mtl transformers
+         array base containers ddc-base deepseq directory mtl text
+         transformers
        ];
-       jailbreak = true;
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler core language and type checker";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ddc-core-babel" = callPackage
+    ({ mkDerivation, base, containers, ddc-base, ddc-core
+     , ddc-core-tetra
+     }:
+     mkDerivation {
+       pname = "ddc-core-babel";
+       version = "0.4.2.1";
+       sha256 = "28f6950b26e2164936fa7669c770178d8b4c17094fe2533f6dcf7a4913202f06";
+       libraryHaskellDepends = [
+         base containers ddc-base ddc-core ddc-core-tetra
+       ];
+       homepage = "http://disciple.ouroborus.net";
+       description = "Disciplined Disciple Compiler PHP code generator";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ddc-core-eval" = callPackage
     ({ mkDerivation, array, base, containers, ddc-base, ddc-core
      , deepseq, mtl, transformers
@@ -64277,17 +64786,18 @@ self: {
 
   "ddc-core-flow" = callPackage
     ({ mkDerivation, array, base, containers, ddc-base, ddc-core
-     , ddc-core-salt, ddc-core-simpl, deepseq, mtl, transformers
+     , ddc-core-salt, ddc-core-simpl, ddc-core-tetra, deepseq, limp
+     , limp-cbc, mtl, transformers
      }:
      mkDerivation {
        pname = "ddc-core-flow";
-       version = "0.4.1.3";
-       sha256 = "de0981453dd7b22c81e7a598f8ae3764397ba29152cda5d18a850a764b4ffeeb";
+       version = "0.4.2.1";
+       sha256 = "6257d14ff70d3afd4544402a6d34ddd8b0780bded8de2b03e28d0a2d5433591f";
        libraryHaskellDepends = [
          array base containers ddc-base ddc-core ddc-core-salt
-         ddc-core-simpl deepseq mtl transformers
+         ddc-core-simpl ddc-core-tetra deepseq limp limp-cbc mtl
+         transformers
        ];
-       jailbreak = true;
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler data flow compiler";
        license = stdenv.lib.licenses.mit;
@@ -64295,18 +64805,17 @@ self: {
      }) {};
 
   "ddc-core-llvm" = callPackage
-    ({ mkDerivation, array, base, containers, ddc-base, ddc-core
-     , ddc-core-salt, ddc-core-simpl, mtl, transformers
+    ({ mkDerivation, array, base, bytestring, containers, ddc-base
+     , ddc-core, ddc-core-salt, ddc-core-simpl, mtl, text, transformers
      }:
      mkDerivation {
        pname = "ddc-core-llvm";
-       version = "0.4.1.3";
-       sha256 = "654d4a10027c1afa17189be38d07246be1531e2e029b2a55e11b629a805f0c38";
+       version = "0.4.2.1";
+       sha256 = "83780f3d1ee27ee5d754ceb2e221c262280fcdf96b28691519859deb7bc7ea61";
        libraryHaskellDepends = [
-         array base containers ddc-base ddc-core ddc-core-salt
-         ddc-core-simpl mtl transformers
+         array base bytestring containers ddc-base ddc-core ddc-core-salt
+         ddc-core-simpl mtl text transformers
        ];
-       jailbreak = true;
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler LLVM code generator";
        license = stdenv.lib.licenses.mit;
@@ -64315,16 +64824,16 @@ self: {
 
   "ddc-core-salt" = callPackage
     ({ mkDerivation, array, base, containers, ddc-base, ddc-core
-     , deepseq, mtl, transformers
+     , deepseq, mtl, text, transformers
      }:
      mkDerivation {
        pname = "ddc-core-salt";
-       version = "0.4.1.3";
-       sha256 = "f8f8b3c30b91b3efb542e5b61a06e5dcd3e3f1de216a84af53cadc3f6ee79ea1";
+       version = "0.4.2.1";
+       sha256 = "2559640cfdf05ecf15eeb805826dca2c6603ee0b6b949259c4fb80cf1768689f";
        libraryHaskellDepends = [
-         array base containers ddc-base ddc-core deepseq mtl transformers
+         array base containers ddc-base ddc-core deepseq mtl text
+         transformers
        ];
-       jailbreak = true;
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler C code generator";
        license = stdenv.lib.licenses.mit;
@@ -64337,12 +64846,11 @@ self: {
      }:
      mkDerivation {
        pname = "ddc-core-simpl";
-       version = "0.4.1.3";
-       sha256 = "7f2dde9108f0a1cc90d447ddbc9f5f8cba207288d9fd6386afb8192828eb7978";
+       version = "0.4.2.1";
+       sha256 = "d8b5f4ca8b25dad680f91b0e9e6fe98c9c7594fc830be5e50dc10bb2c6889d39";
        libraryHaskellDepends = [
          array base containers ddc-base ddc-core deepseq mtl transformers
        ];
-       jailbreak = true;
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler code transformations";
        license = stdenv.lib.licenses.mit;
@@ -64351,17 +64859,17 @@ self: {
 
   "ddc-core-tetra" = callPackage
     ({ mkDerivation, array, base, containers, ddc-base, ddc-core
-     , ddc-core-salt, ddc-core-simpl, deepseq, mtl, transformers
+     , ddc-core-salt, ddc-core-simpl, deepseq, mtl, pretty-show, text
+     , transformers
      }:
      mkDerivation {
        pname = "ddc-core-tetra";
-       version = "0.4.1.3";
-       sha256 = "6237cc475d9ef79fc1b2074c54292ed4259d2d0bbc9930069812b99c632b5d05";
+       version = "0.4.2.1";
+       sha256 = "3e6d8c466ac27d951ccf251fb93d6a0c0c0847a79f1b1f4361a3a002442e2761";
        libraryHaskellDepends = [
          array base containers ddc-base ddc-core ddc-core-salt
-         ddc-core-simpl deepseq mtl transformers
+         ddc-core-simpl deepseq mtl pretty-show text transformers
        ];
-       jailbreak = true;
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler intermediate language";
        license = stdenv.lib.licenses.mit;
@@ -64370,21 +64878,20 @@ self: {
 
   "ddc-driver" = callPackage
     ({ mkDerivation, base, containers, ddc-base, ddc-build, ddc-core
-     , ddc-core-eval, ddc-core-flow, ddc-core-llvm, ddc-core-salt
-     , ddc-core-simpl, ddc-core-tetra, ddc-interface, ddc-source-tetra
-     , deepseq, directory, filepath, mtl, process, transformers
+     , ddc-core-flow, ddc-core-llvm, ddc-core-salt, ddc-core-simpl
+     , ddc-core-tetra, ddc-source-tetra, deepseq, directory, filepath
+     , mtl, process, time, transformers
      }:
      mkDerivation {
        pname = "ddc-driver";
-       version = "0.4.1.3";
-       sha256 = "33678ecdd06c06a967fe7519d7b58c10d5b7456dc720a8454ebb00695dacdb47";
+       version = "0.4.2.1";
+       sha256 = "fe3427d7f5967f782ac67742345cad132c1bc9e576e9c369e3bba4fbc4c5d1cd";
        libraryHaskellDepends = [
-         base containers ddc-base ddc-build ddc-core ddc-core-eval
-         ddc-core-flow ddc-core-llvm ddc-core-salt ddc-core-simpl
-         ddc-core-tetra ddc-interface ddc-source-tetra deepseq directory
-         filepath mtl process transformers
+         base containers ddc-base ddc-build ddc-core ddc-core-flow
+         ddc-core-llvm ddc-core-salt ddc-core-simpl ddc-core-tetra
+         ddc-source-tetra deepseq directory filepath mtl process time
+         transformers
        ];
-       jailbreak = true;
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler top-level driver";
        license = stdenv.lib.licenses.mit;
@@ -64406,17 +64913,16 @@ self: {
 
   "ddc-source-tetra" = callPackage
     ({ mkDerivation, array, base, containers, ddc-base, ddc-core
-     , ddc-core-salt, ddc-core-tetra, deepseq, mtl, transformers
+     , ddc-core-salt, ddc-core-tetra, deepseq, mtl, text, transformers
      }:
      mkDerivation {
        pname = "ddc-source-tetra";
-       version = "0.4.1.3";
-       sha256 = "3acbf2b2f3ab0ae269238b6e4728c929488050909bb4febbef1e3ad2b7d21421";
+       version = "0.4.2.1";
+       sha256 = "579506d2d7de791ba46973e358b602093fb71fad531085724fbaf9a5f90b04f4";
        libraryHaskellDepends = [
          array base containers ddc-base ddc-core ddc-core-salt
-         ddc-core-tetra deepseq mtl transformers
+         ddc-core-tetra deepseq mtl text transformers
        ];
-       jailbreak = true;
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler source language";
        license = stdenv.lib.licenses.mit;
@@ -64425,24 +64931,22 @@ self: {
 
   "ddc-tools" = callPackage
     ({ mkDerivation, base, containers, ddc-base, ddc-build, ddc-code
-     , ddc-core, ddc-core-eval, ddc-core-flow, ddc-core-llvm
-     , ddc-core-salt, ddc-core-simpl, ddc-core-tetra, ddc-driver
-     , ddc-interface, ddc-source-tetra, directory, filepath, haskeline
-     , mtl, process, transformers
+     , ddc-core, ddc-core-flow, ddc-core-llvm, ddc-core-salt
+     , ddc-core-simpl, ddc-core-tetra, ddc-driver, ddc-source-tetra
+     , directory, filepath, haskeline, mtl, process, transformers
      }:
      mkDerivation {
        pname = "ddc-tools";
-       version = "0.4.1.3";
-       sha256 = "c2fc1cef2298a75b40d72f8a4a119f9b53d5db52ec88bc1772faac8ca582e6c1";
+       version = "0.4.2.1";
+       sha256 = "cc22d2bfef1d9de385da0e2eb31362c6f61e36b2784436b23d3beb24b9fa7e67";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base containers ddc-base ddc-build ddc-code ddc-core ddc-core-eval
-         ddc-core-flow ddc-core-llvm ddc-core-salt ddc-core-simpl
-         ddc-core-tetra ddc-driver ddc-interface ddc-source-tetra directory
-         filepath haskeline mtl process transformers
+         base containers ddc-base ddc-build ddc-code ddc-core ddc-core-flow
+         ddc-core-llvm ddc-core-salt ddc-core-simpl ddc-core-tetra
+         ddc-driver ddc-source-tetra directory filepath haskeline mtl
+         process transformers
        ];
-       jailbreak = true;
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler command line tools";
        license = stdenv.lib.licenses.mit;
@@ -65089,7 +65593,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dejafu" = callPackage
+  "dejafu_0_2_0_0" = callPackage
     ({ mkDerivation, atomic-primops, base, containers, deepseq
      , exceptions, monad-loops, mtl, random, stm, transformers
      }:
@@ -65104,17 +65608,18 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Overloadable primitives for testable, potentially non-deterministic, concurrency";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dejafu_0_3_0_0" = callPackage
+  "dejafu" = callPackage
     ({ mkDerivation, array, atomic-primops, base, containers, deepseq
      , dpor, exceptions, monad-control, monad-loops, mtl, semigroups
      , stm, template-haskell, transformers, transformers-base
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "0.3.0.0";
-       sha256 = "8df9b8ff0d09c75069c4abd06b879eb3b9ebba4e61d7429c45573cc0a108a7e1";
+       version = "0.3.1.0";
+       sha256 = "8761ad279a2f37200c62326cb16824587e05eb19b6ff8943f2b418a94679c9fe";
        libraryHaskellDepends = [
          array atomic-primops base containers deepseq dpor exceptions
          monad-control monad-loops mtl semigroups stm template-haskell
@@ -65123,7 +65628,6 @@ self: {
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Overloadable primitives for testable, potentially non-deterministic, concurrency";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deka" = callPackage
@@ -65731,25 +66235,6 @@ self: {
      }) {};
 
   "deriving-compat" = callPackage
-    ({ mkDerivation, base, base-compat, containers, ghc-prim, hspec
-     , QuickCheck, template-haskell
-     }:
-     mkDerivation {
-       pname = "deriving-compat";
-       version = "0.1";
-       sha256 = "c33dfa865e409f3c520bda7f8c3d7b678c2497cb8857882d8741b796241da0ec";
-       revision = "1";
-       editedCabalFile = "364c925a70e5c49d3f98c2feb310e462c9db95b4ca3e173273144a1c715112fc";
-       libraryHaskellDepends = [
-         base containers ghc-prim template-haskell
-       ];
-       testHaskellDepends = [ base base-compat hspec QuickCheck ];
-       homepage = "https://github.com/haskell-compat/deriving-compat";
-       description = "Backports of GHC deriving extensions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "deriving-compat_0_2" = callPackage
     ({ mkDerivation, base, base-compat, base-orphans, containers
      , ghc-prim, hspec, QuickCheck, template-haskell, transformers
      , transformers-compat
@@ -65765,11 +66250,9 @@ self: {
          base base-compat base-orphans hspec QuickCheck transformers
          transformers-compat
        ];
-       jailbreak = true;
        homepage = "https://github.com/haskell-compat/deriving-compat";
        description = "Backports of GHC deriving extensions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derp" = callPackage
@@ -66449,7 +66932,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-cairo" = callPackage
+  "diagrams-cairo_1_3_0_5" = callPackage
     ({ mkDerivation, base, bytestring, cairo, colour, containers
      , data-default-class, diagrams-core, diagrams-lib, filepath
      , hashable, JuicyPixels, lens, mtl, optparse-applicative, pango
@@ -66468,6 +66951,28 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Cairo backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "diagrams-cairo" = callPackage
+    ({ mkDerivation, array, base, bytestring, cairo, colour, containers
+     , data-default-class, diagrams-core, diagrams-lib, filepath
+     , hashable, JuicyPixels, lens, mtl, optparse-applicative, pango
+     , split, statestack, transformers, unix, vector
+     }:
+     mkDerivation {
+       pname = "diagrams-cairo";
+       version = "1.3.0.6";
+       sha256 = "463f2072feb1eaa75435bf0345bcee662448b8aa0b376d92150cd1cc247b098b";
+       libraryHaskellDepends = [
+         array base bytestring cairo colour containers data-default-class
+         diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl
+         optparse-applicative pango split statestack transformers unix
+         vector
+       ];
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Cairo backend for diagrams drawing EDSL";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
@@ -66515,7 +67020,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-canvas" = callPackage
+  "diagrams-canvas_1_3_0_3" = callPackage
     ({ mkDerivation, base, blank-canvas, cmdargs, containers
      , data-default-class, diagrams-core, diagrams-lib, lens, mtl
      , NumInstances, optparse-applicative, statestack, text
@@ -66532,6 +67037,26 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "diagrams-canvas" = callPackage
+    ({ mkDerivation, base, blank-canvas, cmdargs, containers
+     , data-default-class, diagrams-core, diagrams-lib, lens, mtl
+     , NumInstances, optparse-applicative, statestack, text
+     }:
+     mkDerivation {
+       pname = "diagrams-canvas";
+       version = "1.3.0.4";
+       sha256 = "a1c5ea249029a8617db0e056bef80e5f4d95e8714882108982520286bef5c43d";
+       libraryHaskellDepends = [
+         base blank-canvas cmdargs containers data-default-class
+         diagrams-core diagrams-lib lens mtl NumInstances
+         optparse-applicative statestack text
+       ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "HTML5 canvas backend for diagrams drawing EDSL";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "diagrams-contrib_1_1_2_4" = callPackage
@@ -66737,7 +67262,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-contrib" = callPackage
+  "diagrams-contrib_1_3_0_8" = callPackage
     ({ mkDerivation, base, circle-packing, colour, containers
      , data-default, data-default-class, diagrams-core, diagrams-lib
      , diagrams-solve, force-layout, HUnit, lens, linear, MonadRandom
@@ -66762,6 +67287,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Collection of user contributions to diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-contrib_1_3_0_9" = callPackage
@@ -66792,6 +67318,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "diagrams-contrib" = callPackage
+    ({ mkDerivation, base, circle-packing, colour, containers
+     , data-default, data-default-class, diagrams-core, diagrams-lib
+     , diagrams-solve, force-layout, HUnit, lens, linear, MonadRandom
+     , mtl, parsec, QuickCheck, random, semigroups, split
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text
+     }:
+     mkDerivation {
+       pname = "diagrams-contrib";
+       version = "1.3.0.10";
+       sha256 = "a1cc25a0aa9fefb4502b361b5193a18e34962aa1d3ccd01e5bb0426bd68779c1";
+       libraryHaskellDepends = [
+         base circle-packing colour containers data-default
+         data-default-class diagrams-core diagrams-lib diagrams-solve
+         force-layout lens linear MonadRandom mtl parsec random semigroups
+         split text
+       ];
+       testHaskellDepends = [
+         base containers diagrams-lib HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "Collection of user contributions to diagrams EDSL";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "diagrams-core_1_2_0_4" = callPackage
     ({ mkDerivation, base, containers, dual-tree, lens, MemoTrie
      , monoid-extras, newtype, semigroups, vector-space
@@ -66932,7 +67485,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-core" = callPackage
+  "diagrams-core_1_3_0_6" = callPackage
     ({ mkDerivation, adjunctions, base, containers, distributive
      , dual-tree, lens, linear, monoid-extras, mtl, semigroups
      , unordered-containers
@@ -66948,6 +67501,25 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Core libraries for diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "diagrams-core" = callPackage
+    ({ mkDerivation, adjunctions, base, containers, distributive
+     , dual-tree, lens, linear, monoid-extras, mtl, semigroups
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "diagrams-core";
+       version = "1.3.0.7";
+       sha256 = "96f29afcbc833abd8ba6ad07e9fbdb13c2beb99813a1e493d491e6e6fa6aaa79";
+       libraryHaskellDepends = [
+         adjunctions base containers distributive dual-tree lens linear
+         monoid-extras mtl semigroups unordered-containers
+       ];
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Core libraries for diagrams EDSL";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "diagrams-graphviz" = callPackage
@@ -67216,7 +67788,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-html5" = callPackage
+  "diagrams-html5_1_3_0_4" = callPackage
     ({ mkDerivation, base, cmdargs, containers, data-default-class
      , diagrams-core, diagrams-lib, lens, mtl, NumInstances
      , optparse-applicative, split, statestack, static-canvas, text
@@ -67233,6 +67805,26 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "diagrams-html5" = callPackage
+    ({ mkDerivation, base, cmdargs, containers, data-default-class
+     , diagrams-core, diagrams-lib, lens, mtl, NumInstances
+     , optparse-applicative, split, statestack, static-canvas, text
+     }:
+     mkDerivation {
+       pname = "diagrams-html5";
+       version = "1.3.0.5";
+       sha256 = "0b75f6280500064c94f18c86d896ad5592b8a64f011d0ff6e170cf77ec84b6e1";
+       libraryHaskellDepends = [
+         base cmdargs containers data-default-class diagrams-core
+         diagrams-lib lens mtl NumInstances optparse-applicative split
+         statestack static-canvas text
+       ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "HTML5 canvas backend for diagrams drawing EDSL";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "diagrams-lib_1_2_0_7" = callPackage
@@ -67385,7 +67977,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-lib" = callPackage
+  "diagrams-lib_1_3_1_1" = callPackage
     ({ mkDerivation, active, adjunctions, array, base, colour
      , containers, data-default-class, diagrams-core, diagrams-solve
      , directory, distributive, dual-tree, exceptions, filepath
@@ -67409,6 +68001,33 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "diagrams-lib" = callPackage
+    ({ mkDerivation, active, adjunctions, array, base, colour
+     , containers, data-default-class, diagrams-core, diagrams-solve
+     , directory, distributive, dual-tree, exceptions, filepath
+     , fingertree, fsnotify, hashable, intervals, JuicyPixels, lens
+     , linear, monoid-extras, mtl, optparse-applicative, process
+     , semigroups, tagged, tasty, tasty-hunit, text, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "diagrams-lib";
+       version = "1.3.1.2";
+       sha256 = "e2bc2914c5715cc93361945d75d15f111d2ac4f231d7c19cc243f515d65d658d";
+       libraryHaskellDepends = [
+         active adjunctions array base colour containers data-default-class
+         diagrams-core diagrams-solve directory distributive dual-tree
+         exceptions filepath fingertree fsnotify hashable intervals
+         JuicyPixels lens linear monoid-extras mtl optparse-applicative
+         process semigroups tagged text transformers unordered-containers
+       ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Embedded domain-specific language for declarative graphics";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "diagrams-pandoc" = callPackage
@@ -67582,7 +68201,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-postscript" = callPackage
+  "diagrams-postscript_1_3_0_4" = callPackage
     ({ mkDerivation, base, containers, data-default-class
      , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens
      , monoid-extras, mtl, semigroups, split, statestack
@@ -67599,6 +68218,26 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Postscript backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "diagrams-postscript" = callPackage
+    ({ mkDerivation, base, containers, data-default-class
+     , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens
+     , monoid-extras, mtl, semigroups, split, statestack
+     }:
+     mkDerivation {
+       pname = "diagrams-postscript";
+       version = "1.3.0.5";
+       sha256 = "acaa68d5b8901767c3c7cb828a15b0e73e0be2b28cbbdb9cfb76682508039b31";
+       libraryHaskellDepends = [
+         base containers data-default-class diagrams-core diagrams-lib dlist
+         filepath hashable lens monoid-extras mtl semigroups split
+         statestack
+       ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "Postscript backend for diagrams drawing EDSL";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "diagrams-qrcode" = callPackage
@@ -67706,7 +68345,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-rasterific" = callPackage
+  "diagrams-rasterific_1_3_1_5" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default-class
      , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable
      , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split
@@ -67724,6 +68363,27 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Rasterific backend for diagrams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "diagrams-rasterific" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default-class
+     , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable
+     , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split
+     , unix
+     }:
+     mkDerivation {
+       pname = "diagrams-rasterific";
+       version = "1.3.1.6";
+       sha256 = "126a6d98a5ea11cccebdf3c2645db420895d4c71a60387a7d0d32e48db103600";
+       libraryHaskellDepends = [
+         base bytestring containers data-default-class diagrams-core
+         diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl
+         optparse-applicative Rasterific split unix
+       ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "Rasterific backend for diagrams";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "diagrams-reflex" = callPackage
@@ -67973,7 +68633,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "diagrams-svg_1_4" = callPackage
+  "diagrams-svg_1_4_0_1" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, colour
      , containers, diagrams-core, diagrams-lib, directory, filepath
      , hashable, JuicyPixels, lens, monoid-extras, mtl, old-time
@@ -67982,8 +68642,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-svg";
-       version = "1.4";
-       sha256 = "9845b2f999f3fb61bf36c064977d36aea9ad8c5532c2ce80e5e3a85f5f9df900";
+       version = "1.4.0.1";
+       sha256 = "76c8d38f44615af289d373c5abf1c6ba3ff42155f90eea73992cc708a35e6079";
        libraryHaskellDepends = [
          base base64-bytestring bytestring colour containers diagrams-core
          diagrams-lib directory filepath hashable JuicyPixels lens
@@ -69034,12 +69694,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "directory_1_2_6_2" = callPackage
+  "directory_1_2_6_3" = callPackage
     ({ mkDerivation, base, filepath, time, unix }:
      mkDerivation {
        pname = "directory";
-       version = "1.2.6.2";
-       sha256 = "4c860441ca249c8395a7e74743957b1064359ba3d3c30b1c18df11b9a0a413e0";
+       version = "1.2.6.3";
+       sha256 = "0f54e0f01f0b2ec739f849d8db6237e3bc52eb1149202b2b4e5c325659228a29";
        libraryHaskellDepends = [ base filepath time unix ];
        testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
@@ -69292,14 +69952,14 @@ self: {
 
   "distributed-closure" = callPackage
     ({ mkDerivation, base, binary, bytestring, constraints, hspec
-     , QuickCheck, template-haskell
+     , QuickCheck, syb, template-haskell
      }:
      mkDerivation {
        pname = "distributed-closure";
-       version = "0.2.1.0";
-       sha256 = "345140293e28e6feaae46e2e3e275e892d72029dbd57617ba8fc1b7251ae902f";
+       version = "0.3.0.0";
+       sha256 = "031ca8c6d30af04c872da9143bffa5536b8ed8326c6069f6a30d94d6c5ce3d91";
        libraryHaskellDepends = [
-         base binary bytestring constraints template-haskell
+         base binary bytestring constraints syb template-haskell
        ];
        testHaskellDepends = [ base binary hspec QuickCheck ];
        homepage = "https://github.com/tweag/distributed-closure";
@@ -70451,7 +71111,6 @@ self: {
          patches-vector servant servant-blaze servant-docs shakespeare text
          time vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/liamoc/dixi";
        description = "A wiki implemented with a firm theoretical foundation";
        license = stdenv.lib.licenses.bsd3;
@@ -73245,7 +73904,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "effect-handlers" = callPackage
+  "effect-handlers_0_1_0_7" = callPackage
     ({ mkDerivation, base, free, hspec, hspec-discover, HUnit
      , kan-extensions, mtl, QuickCheck
      }:
@@ -73260,6 +73919,24 @@ self: {
        homepage = "https://github.com/edofic/effect-handlers";
        description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "effect-handlers" = callPackage
+    ({ mkDerivation, base, free, hspec, hspec-discover, HUnit
+     , kan-extensions, mtl, QuickCheck
+     }:
+     mkDerivation {
+       pname = "effect-handlers";
+       version = "0.1.0.8";
+       sha256 = "2439a77b6ec8db236fc2809cb91219305a7071c72bfd68de795e01b3df9aa80c";
+       libraryHaskellDepends = [ base free kan-extensions mtl ];
+       testHaskellDepends = [
+         base hspec hspec-discover HUnit QuickCheck
+       ];
+       homepage = "https://github.com/edofic/effect-handlers";
+       description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "effect-monad" = callPackage
@@ -73997,7 +74674,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "elm-bridge" = callPackage
+  "elm-bridge_0_2_1_1" = callPackage
     ({ mkDerivation, aeson, base, containers, hspec, QuickCheck
      , template-haskell, text
      }:
@@ -74012,6 +74689,24 @@ self: {
        homepage = "http://github.com/agrafix/elm-bridge";
        description = "Derive Elm types from Haskell types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "elm-bridge" = callPackage
+    ({ mkDerivation, aeson, base, containers, hspec, QuickCheck
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "elm-bridge";
+       version = "0.2.2.1";
+       sha256 = "8920c626419291f8683fee026b9ea9c593996b4384ed53dd7251890ef6c55427";
+       libraryHaskellDepends = [ aeson base template-haskell ];
+       testHaskellDepends = [
+         aeson base containers hspec QuickCheck text
+       ];
+       homepage = "https://github.com/agrafix/elm-bridge";
+       description = "Derive Elm types from Haskell types";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "elm-build-lib" = callPackage
@@ -75180,8 +75875,8 @@ self: {
     ({ mkDerivation, base, containers, hspec }:
      mkDerivation {
        pname = "envparse";
-       version = "0.3.2";
-       sha256 = "a1bed0ca630b07e634dca85a9770ea917866516bd456d8f5012435d512560156";
+       version = "0.3.3";
+       sha256 = "9fc908ed2d9174fbcd32bc05b2c449397720b8f23826304a72035867d83563ec";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec ];
        homepage = "https://supki.github.io/envparse";
@@ -76242,10 +76937,8 @@ self: {
      }:
      mkDerivation {
        pname = "ether";
-       version = "0.4.0.1";
-       sha256 = "2dd65384c5dd884c23cad897bc8ee343015b21bcddc04aeca3fca58c4f12716a";
-       revision = "1";
-       editedCabalFile = "478e2aa8efec5d299370c8f3d982280ba45f9bfb3eda97adabe7e96eb8f61a1f";
+       version = "0.4.0.2";
+       sha256 = "8b9dce4d444613dc46df988fa3a437297503e63ff29fd28113b35b98a8dcd953";
        libraryHaskellDepends = [
          base exceptions mmorph monad-control mtl template-haskell
          transformers transformers-base transformers-lift
@@ -76535,8 +77228,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventloop";
-       version = "0.8.0.0";
-       sha256 = "5fbdbe0201c18a2c9f82799f6367c1cb4c1554554677fc181018bca289077b01";
+       version = "0.8.0.1";
+       sha256 = "7e89dcc7ea6bcc0843ca16d6df613fa0b873117ef1bfd818478bdb301c6311cb";
        libraryHaskellDepends = [
          aeson base bytestring concurrent-utilities deepseq network stm
          suspend text timers websockets
@@ -77767,7 +78460,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "extra" = callPackage
+  "extra_1_4_3" = callPackage
     ({ mkDerivation, base, directory, filepath, process, QuickCheck
      , time, unix
      }:
@@ -77784,6 +78477,26 @@ self: {
        homepage = "https://github.com/ndmitchell/extra#readme";
        description = "Extra functions I use";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "extra" = callPackage
+    ({ mkDerivation, base, directory, filepath, process, QuickCheck
+     , time, unix
+     }:
+     mkDerivation {
+       pname = "extra";
+       version = "1.4.5";
+       sha256 = "0fb35fe9c2c2c27305713c28d283cb4254abc792dd75ce8ef4c00fa4ee77ceb5";
+       libraryHaskellDepends = [
+         base directory filepath process time unix
+       ];
+       testHaskellDepends = [
+         base directory filepath QuickCheck time unix
+       ];
+       homepage = "https://github.com/ndmitchell/extra#readme";
+       description = "Extra functions I use";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "extract-dependencies" = callPackage
@@ -78102,7 +78815,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "fast-builder" = callPackage
+  "fast-builder_0_0_0_3" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim, process, QuickCheck
      , stm
      }:
@@ -78115,9 +78828,10 @@ self: {
        homepage = "http://github.com/takano-akio/fast-builder";
        description = "Fast ByteString Builder";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "fast-builder_0_0_0_4" = callPackage
+  "fast-builder" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim, process, QuickCheck
      , stm
      }:
@@ -78130,7 +78844,6 @@ self: {
        homepage = "http://github.com/takano-akio/fast-builder";
        description = "Fast ByteString Builder";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fast-digits" = callPackage
@@ -78251,7 +78964,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "fast-logger" = callPackage
+  "fast-logger_2_4_3" = callPackage
     ({ mkDerivation, array, auto-update, base, bytestring
      , bytestring-builder, directory, filepath, hspec, text
      }:
@@ -78266,6 +78979,7 @@ self: {
        testHaskellDepends = [ base bytestring directory hspec ];
        description = "A fast logging system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fast-logger_2_4_5" = callPackage
@@ -78287,6 +79001,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fast-logger" = callPackage
+    ({ mkDerivation, array, auto-update, base, bytestring
+     , bytestring-builder, directory, easy-file, filepath, hspec, text
+     , unix, unix-time
+     }:
+     mkDerivation {
+       pname = "fast-logger";
+       version = "2.4.6";
+       sha256 = "d45640acb40bf9b6f81cbe63e3587b6e59d9ec24a15401e52bdc7969b6f2cfd1";
+       libraryHaskellDepends = [
+         array auto-update base bytestring bytestring-builder directory
+         easy-file filepath text unix unix-time
+       ];
+       testHaskellDepends = [ base bytestring directory hspec ];
+       description = "A fast logging system";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fast-math" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -78327,12 +79059,16 @@ self: {
      }) {};
 
   "fast-tagsoup" = callPackage
-    ({ mkDerivation, base, bytestring, tagsoup, text, text-icu }:
+    ({ mkDerivation, base, bytestring, containers, tagsoup, text
+     , text-icu
+     }:
      mkDerivation {
        pname = "fast-tagsoup";
-       version = "1.0.7";
-       sha256 = "a885e4cb187c1b134bc4410bac8016f118090ee8220f941d051f01d95a563321";
-       libraryHaskellDepends = [ base bytestring tagsoup text text-icu ];
+       version = "1.0.9";
+       sha256 = "20c9895e01e522215bf0b36df084dc78b53b1e9a05d4be220c4816a6d1260d9b";
+       libraryHaskellDepends = [
+         base bytestring containers tagsoup text text-icu
+       ];
        homepage = "https://github.com/vshabanov/fast-tagsoup";
        description = "Fast parser for tagsoup package";
        license = stdenv.lib.licenses.bsd3;
@@ -78834,8 +79570,8 @@ self: {
        pname = "fay-builder";
        version = "0.2.0.5";
        sha256 = "116dea6dc304834be81d70faec7e3de1fd867ebbda0d02d3c1c6a0f96d2b31a2";
-       revision = "1";
-       editedCabalFile = "09fb1a4f71c11547dadf8859e302ede4d65aed7437ed1da16376811724a6b1ef";
+       revision = "2";
+       editedCabalFile = "846d778c1b5f3feeb549d013338a08a746acb114d7c07c855b91032c4675d32b";
        libraryHaskellDepends = [
          base Cabal data-default directory fay filepath safe split text
        ];
@@ -80386,7 +81122,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "file-embed" = callPackage
+  "file-embed_0_0_9_1" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath
      , template-haskell
      }:
@@ -80401,9 +81137,10 @@ self: {
        homepage = "https://github.com/snoyberg/file-embed";
        description = "Use Template Haskell to embed file contents directly";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "file-embed_0_0_10" = callPackage
+  "file-embed" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath
      , template-haskell
      }:
@@ -80418,7 +81155,6 @@ self: {
        homepage = "https://github.com/snoyberg/file-embed";
        description = "Use Template Haskell to embed file contents directly";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "file-location_0_4_5_3" = callPackage
@@ -82265,14 +83001,17 @@ self: {
      }) {};
 
   "fold-debounce" = callPackage
-    ({ mkDerivation, base, data-default, hspec, stm, stm-delay, time }:
+    ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
+     , time
+     }:
      mkDerivation {
        pname = "fold-debounce";
-       version = "0.2.0.0";
-       sha256 = "ab4af7e815cfa2345cdf17c0e765da575f66c0b9b978c8234d620fcf933800db";
-       libraryHaskellDepends = [ base data-default stm stm-delay time ];
+       version = "0.2.0.1";
+       sha256 = "0a59cd7d26dad8b5d87d6acd073152131642942736c1fdcb4a96ad0444037e56";
+       libraryHaskellDepends = [
+         base data-default-class stm stm-delay time
+       ];
        testHaskellDepends = [ base hspec stm time ];
-       jailbreak = true;
        homepage = "https://github.com/debug-ito/fold-debounce";
        description = "Fold multiple events that happen in a given period of time";
        license = stdenv.lib.licenses.bsd3;
@@ -82285,8 +83024,8 @@ self: {
      }:
      mkDerivation {
        pname = "fold-debounce-conduit";
-       version = "0.1.0.0";
-       sha256 = "b348a7e2e83e6a98cd95fbc7a967f5a80e3772d6fa0377b8d53acef509e1be34";
+       version = "0.1.0.1";
+       sha256 = "d8e0a80f0172ab80a842253aeb856ec327832e7f7f91d221ecf2ce66d265dc10";
        libraryHaskellDepends = [
          base conduit fold-debounce resourcet stm transformers
          transformers-base
@@ -82294,7 +83033,6 @@ self: {
        testHaskellDepends = [
          base conduit hspec resourcet stm transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/debug-ito/fold-debounce-conduit";
        description = "Regulate input traffic from conduit Source with Control.FoldDebounce";
        license = stdenv.lib.licenses.bsd3;
@@ -82810,7 +83548,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "force-layout" = callPackage
+  "force-layout_0_4_0_3" = callPackage
     ({ mkDerivation, base, containers, data-default-class, lens, linear
      }:
      mkDerivation {
@@ -82822,6 +83560,21 @@ self: {
        ];
        description = "Simple force-directed layout";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "force-layout" = callPackage
+    ({ mkDerivation, base, containers, data-default-class, lens, linear
+     }:
+     mkDerivation {
+       pname = "force-layout";
+       version = "0.4.0.4";
+       sha256 = "dc6183723dc02b0f03346386a6eff97b7c3334c373a14b1f47ebb84a31ead8f4";
+       libraryHaskellDepends = [
+         base containers data-default-class lens linear
+       ];
+       description = "Simple force-directed layout";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "fordo" = callPackage
@@ -83542,6 +84295,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "freddy" = callPackage
+    ({ mkDerivation, amqp, async, base, broadcast-chan, bytestring
+     , data-default, hspec, random, text, uuid
+     }:
+     mkDerivation {
+       pname = "freddy";
+       version = "0.1.0.0";
+       sha256 = "5513ee3231f1b5cb407d13dd8ea153f2737b25f0270eb12b304ffee56cda275a";
+       libraryHaskellDepends = [
+         amqp base broadcast-chan bytestring data-default random text uuid
+       ];
+       testHaskellDepends = [
+         amqp async base broadcast-chan bytestring data-default hspec random
+         text uuid
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/salemove/freddy-hs";
+       description = "RabbitMQ Messaging API supporting request-response";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "free_4_9" = callPackage
     ({ mkDerivation, base, bifunctors, comonad, distributive, mtl
      , prelude-extras, profunctors, semigroupoids, semigroups
@@ -86198,7 +86972,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "geniplate-mirror" = callPackage
+  "geniplate-mirror_0_7_2" = callPackage
     ({ mkDerivation, base, mtl, template-haskell }:
      mkDerivation {
        pname = "geniplate-mirror";
@@ -86208,9 +86982,10 @@ self: {
        homepage = "https://github.com/danr/geniplate";
        description = "Use Template Haskell to generate Uniplate-like functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "geniplate-mirror_0_7_4" = callPackage
+  "geniplate-mirror" = callPackage
     ({ mkDerivation, base, mtl, template-haskell }:
      mkDerivation {
        pname = "geniplate-mirror";
@@ -86220,7 +86995,6 @@ self: {
        homepage = "https://github.com/danr/geniplate";
        description = "Use Template Haskell to generate Uniplate-like functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geniserver" = callPackage
@@ -87698,8 +88472,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghcid";
-       version = "0.6.1";
-       sha256 = "f3a69db6c66670aefa9c38ec8f30cec1e5a5ac3405b661fcc320a613518b4a4c";
+       version = "0.6.2";
+       sha256 = "2977c1f260d3552e321ac120b37e25537f81f127d2aa579310a9f4232d3fd690";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -88541,31 +89315,6 @@ self: {
      }) {};
 
   "giphy-api" = callPackage
-    ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
-     , directory, either, hspec, lens, microlens, microlens-th, mtl
-     , network-uri, servant, servant-client, text
-     }:
-     mkDerivation {
-       pname = "giphy-api";
-       version = "0.2.5.0";
-       sha256 = "63630c590dbdf0d2681e4d15121439f0b5762b284c77411148edf7155df8881b";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base containers either microlens microlens-th mtl network-uri
-         servant servant-client text
-       ];
-       executableHaskellDepends = [ base network-uri text ];
-       testHaskellDepends = [
-         aeson base basic-prelude bytestring containers directory hspec lens
-         network-uri text
-       ];
-       homepage = "http://github.com/passy/giphy-api#readme";
-       description = "Giphy HTTP API wrapper and CLI search tool";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "giphy-api_0_4_0_0" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
      , directory, hspec, http-api-data, http-client, http-client-tls
      , lens, microlens, microlens-th, mtl, network-uri, servant
@@ -88587,11 +89336,9 @@ self: {
          aeson base basic-prelude bytestring containers directory hspec lens
          network-uri text
        ];
-       jailbreak = true;
        homepage = "http://github.com/passy/giphy-api#readme";
        description = "Giphy HTTP API wrapper and CLI search tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gist" = callPackage
@@ -88859,8 +89606,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20160418";
-       sha256 = "9d13586cc38d78bcd94c1f3a245d5283e67f43b0ea88033c40d54e78f6544fa2";
+       version = "6.20160419";
+       sha256 = "1452a55809ba7367847fc4a77f2d8a5365af92e130d5ca460bf0880a26a6fb8e";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -91000,6 +91747,7 @@ self: {
          mwc-random-monad statistics vector
        ];
        executableHaskellDepends = [ base goal-core goal-geometry vector ];
+       jailbreak = true;
        description = "Manifolds of probability distributions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
@@ -92320,6 +93068,7 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring either servant servant-client text
        ];
+       jailbreak = true;
        description = "Google Translate API bindings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -93469,7 +94218,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       jailbreak = true;
        homepage = "https://bitbucket.org/janmasrovira/am3-project/overview";
        description = "GRASP implementation for the AMMM project";
        license = stdenv.lib.licenses.bsd3;
@@ -97141,6 +97889,7 @@ self: {
          attoparsec base bytestring hadoop-rpc tasty tasty-hunit
          tasty-quickcheck vector
        ];
+       jailbreak = true;
        homepage = "http://github.com/jystic/hadoop-tools";
        description = "Fast command line tools for working with Hadoop";
        license = stdenv.lib.licenses.asl20;
@@ -97459,7 +98208,7 @@ self: {
      , pandoc-citeproc, parsec, process, QuickCheck, random, regex-base
      , regex-tdfa, snap-core, snap-server, system-filepath, tagsoup
      , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, time
+     , text, time, utillinux
      }:
      mkDerivation {
        pname = "hakyll";
@@ -97486,12 +98235,13 @@ self: {
          system-filepath tagsoup test-framework test-framework-hunit
          test-framework-quickcheck2 text time
        ];
+       testToolDepends = [ utillinux ];
        jailbreak = true;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) utillinux;};
 
   "hakyll_4_6_8_0" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
@@ -97501,7 +98251,7 @@ self: {
      , pandoc-citeproc, parsec, process, QuickCheck, random, regex-base
      , regex-tdfa, snap-core, snap-server, system-filepath, tagsoup
      , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, time, time-locale-compat
+     , text, time, time-locale-compat, utillinux
      }:
      mkDerivation {
        pname = "hakyll";
@@ -97527,13 +98277,14 @@ self: {
          system-filepath tagsoup test-framework test-framework-hunit
          test-framework-quickcheck2 text time
        ];
+       testToolDepends = [ utillinux ];
        jailbreak = true;
        doCheck = false;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) utillinux;};
 
   "hakyll_4_6_8_1" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
@@ -97543,7 +98294,7 @@ self: {
      , pandoc-citeproc, parsec, process, QuickCheck, random, regex-base
      , regex-tdfa, snap-core, snap-server, system-filepath, tagsoup
      , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, time, time-locale-compat
+     , text, time, time-locale-compat, utillinux
      }:
      mkDerivation {
        pname = "hakyll";
@@ -97569,13 +98320,14 @@ self: {
          system-filepath tagsoup test-framework test-framework-hunit
          test-framework-quickcheck2 text time time-locale-compat
        ];
+       testToolDepends = [ utillinux ];
        jailbreak = true;
        doCheck = false;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) utillinux;};
 
   "hakyll_4_6_9_0" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
@@ -97585,7 +98337,7 @@ self: {
      , pandoc-citeproc, parsec, process, QuickCheck, random, regex-base
      , regex-tdfa, snap-core, snap-server, system-filepath, tagsoup
      , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, time, time-locale-compat
+     , text, time, time-locale-compat, utillinux
      }:
      mkDerivation {
        pname = "hakyll";
@@ -97611,13 +98363,14 @@ self: {
          system-filepath tagsoup test-framework test-framework-hunit
          test-framework-quickcheck2 text time time-locale-compat
        ];
+       testToolDepends = [ utillinux ];
        jailbreak = true;
        doCheck = false;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) utillinux;};
 
   "hakyll_4_7_2_3" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
@@ -97627,7 +98380,7 @@ self: {
      , process, QuickCheck, random, regex-base, regex-tdfa, snap-core
      , snap-server, system-filepath, tagsoup, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text, time
-     , time-locale-compat
+     , time-locale-compat, utillinux
      }:
      mkDerivation {
        pname = "hakyll";
@@ -97653,13 +98406,14 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time time-locale-compat
        ];
+       testToolDepends = [ utillinux ];
        jailbreak = true;
        doCheck = false;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) utillinux;};
 
   "hakyll_4_7_3_0" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
@@ -97669,7 +98423,7 @@ self: {
      , process, QuickCheck, random, regex-base, regex-tdfa, snap-core
      , snap-server, system-filepath, tagsoup, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text, time
-     , time-locale-compat
+     , time-locale-compat, utillinux
      }:
      mkDerivation {
        pname = "hakyll";
@@ -97695,13 +98449,14 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time time-locale-compat
        ];
+       testToolDepends = [ utillinux ];
        jailbreak = true;
        doCheck = false;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) utillinux;};
 
   "hakyll_4_7_3_1" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
@@ -97711,7 +98466,7 @@ self: {
      , process, QuickCheck, random, regex-base, regex-tdfa, snap-core
      , snap-server, system-filepath, tagsoup, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text, time
-     , time-locale-compat
+     , time-locale-compat, utillinux
      }:
      mkDerivation {
        pname = "hakyll";
@@ -97737,13 +98492,14 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time time-locale-compat
        ];
+       testToolDepends = [ utillinux ];
        jailbreak = true;
        doCheck = false;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) utillinux;};
 
   "hakyll_4_7_4_0" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
@@ -97753,7 +98509,7 @@ self: {
      , process, QuickCheck, random, regex-base, regex-tdfa, snap-core
      , snap-server, system-filepath, tagsoup, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text, time
-     , time-locale-compat
+     , time-locale-compat, utillinux
      }:
      mkDerivation {
        pname = "hakyll";
@@ -97779,13 +98535,14 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time time-locale-compat
        ];
+       testToolDepends = [ utillinux ];
        jailbreak = true;
        doCheck = false;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) utillinux;};
 
   "hakyll_4_7_5_0" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
@@ -97795,7 +98552,7 @@ self: {
      , process, QuickCheck, random, regex-base, regex-tdfa, snap-core
      , snap-server, system-filepath, tagsoup, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text, time
-     , time-locale-compat
+     , time-locale-compat, utillinux
      }:
      mkDerivation {
        pname = "hakyll";
@@ -97821,13 +98578,14 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time time-locale-compat
        ];
+       testToolDepends = [ utillinux ];
        jailbreak = true;
        doCheck = false;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) utillinux;};
 
   "hakyll_4_7_5_1" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
@@ -97837,7 +98595,7 @@ self: {
      , process, QuickCheck, random, regex-base, regex-tdfa, snap-core
      , snap-server, system-filepath, tagsoup, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text, time
-     , time-locale-compat
+     , time-locale-compat, utillinux
      }:
      mkDerivation {
        pname = "hakyll";
@@ -97863,15 +98621,16 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time time-locale-compat
        ];
+       testToolDepends = [ utillinux ];
        jailbreak = true;
        doCheck = false;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) utillinux;};
 
-  "hakyll" = callPackage
+  "hakyll_4_7_5_2" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
      , cmdargs, containers, cryptohash, data-default, deepseq, directory
      , filepath, fsnotify, http-conduit, http-types, HUnit, lrucache
@@ -97879,7 +98638,7 @@ self: {
      , process, QuickCheck, random, regex-base, regex-tdfa, snap-core
      , snap-server, system-filepath, tagsoup, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text, time
-     , time-locale-compat
+     , time-locale-compat, utillinux
      }:
      mkDerivation {
        pname = "hakyll";
@@ -97905,12 +98664,14 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time time-locale-compat
        ];
+       testToolDepends = [ utillinux ];
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
-     }) {};
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) utillinux;};
 
-  "hakyll_4_8_0_1" = callPackage
+  "hakyll" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
      , cmdargs, containers, cryptohash, data-default, deepseq, directory
      , filepath, fsnotify, http-conduit, http-types, HUnit, lrucache
@@ -97918,12 +98679,12 @@ self: {
      , process, QuickCheck, random, regex-base, regex-tdfa, resourcet
      , snap-core, snap-server, system-filepath, tagsoup, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text, time
-     , time-locale-compat, unordered-containers, vector, yaml
+     , time-locale-compat, unordered-containers, utillinux, vector, yaml
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.8.0.1";
-       sha256 = "c5e860cd6cf8bc525e032da106fbe44667bc5bdc5d3023ca77cc32b3c6bc41d5";
+       version = "4.8.3.0";
+       sha256 = "d01a2ec0fbc3efffb6e7fcc2971842b6c6bd893327324cada0e345d3a5e504ef";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97944,11 +98705,11 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time time-locale-compat unordered-containers vector yaml
        ];
+       testToolDepends = [ utillinux ];
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) utillinux;};
 
   "hakyll-R" = callPackage
     ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process
@@ -98097,6 +98858,7 @@ self: {
        libraryHaskellDepends = [
          base filestore hakyll time time-locale-compat
        ];
+       jailbreak = true;
        homepage = "https://gitlab.com/aergus/hakyll-filestore";
        description = "FileStore utilities for Hakyll";
        license = stdenv.lib.licenses.publicDomain;
@@ -101047,6 +101809,7 @@ self: {
          base either network-uri QuickCheck servant servant-client
          servant-mock servant-server split transformers warp
        ];
+       jailbreak = true;
        homepage = "https://github.com/soundcloud/haskell-kubernetes";
        description = "Haskell bindings to the Kubernetes API (via swagger-codegen)";
        license = stdenv.lib.licenses.mit;
@@ -103432,8 +104195,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql";
-       version = "0.19.10";
-       sha256 = "e656386350fdba654177ac5efb96db00a7dd5e1675c710bf65bd75b0ed64b5dc";
+       version = "0.19.11";
+       sha256 = "48b12698e6168f176fa583317cb3f058e99f604ceda5036e891bc496bf4158e4";
        libraryHaskellDepends = [
          aeson attoparsec base base-prelude bytestring
          bytestring-tree-builder contravariant contravariant-extras
@@ -104155,7 +104918,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hasty-hamiltonian" = callPackage
+  "hasty-hamiltonian_1_1_2" = callPackage
     ({ mkDerivation, ad, base, lens, mcmc-types, mwc-probability, pipes
      , primitive, transformers
      }:
@@ -104170,6 +104933,24 @@ self: {
        homepage = "http://jtobin.github.com/hasty-hamiltonian";
        description = "Speedy traversal through parameter space";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hasty-hamiltonian" = callPackage
+    ({ mkDerivation, ad, base, lens, mcmc-types, mwc-probability, pipes
+     , primitive, transformers
+     }:
+     mkDerivation {
+       pname = "hasty-hamiltonian";
+       version = "1.1.3";
+       sha256 = "15fe3075dc4cf9a5ea9875cb15da469ee414223696c0e9eb3163a44d23c38463";
+       libraryHaskellDepends = [
+         base lens mcmc-types mwc-probability pipes primitive transformers
+       ];
+       testHaskellDepends = [ ad base mwc-probability ];
+       homepage = "http://github.com/jtobin/hasty-hamiltonian";
+       description = "Speedy traversal through parameter space";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "hat" = callPackage
@@ -105828,15 +106609,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hedis_0_8_0" = callPackage
+  "hedis_0_8_2" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-lexing, deepseq
      , HUnit, mtl, network, resource-pool, scanner, slave-thread
      , test-framework, test-framework-hunit, text, time, vector
      }:
      mkDerivation {
        pname = "hedis";
-       version = "0.8.0";
-       sha256 = "8bde5dcda10b768bdc55a0e0c529f2dacd06f02f88839b986cf75ae426c4811b";
+       version = "0.8.2";
+       sha256 = "4d577fcb4e1457455210ee58d0aef3f02069d2d4d055108a0391899544a254a9";
        libraryHaskellDepends = [
          base bytestring bytestring-lexing deepseq mtl network resource-pool
          scanner text time vector
@@ -106082,7 +106863,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "heist" = callPackage
+  "heist_0_14_1_3" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , bytestring, containers, directory, directory-tree, dlist, either
      , filepath, hashable, map-syntax, MonadCatchIO-transformers, mtl
@@ -106102,6 +106883,29 @@ self: {
        homepage = "http://snapframework.com/";
        description = "An Haskell template system supporting both HTML5 and XML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "heist" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
+     , bytestring, containers, directory, directory-tree, dlist, either
+     , filepath, hashable, map-syntax, MonadCatchIO-transformers, mtl
+     , process, random, text, time, transformers, unordered-containers
+     , vector, xmlhtml
+     }:
+     mkDerivation {
+       pname = "heist";
+       version = "0.14.1.4";
+       sha256 = "debf008e68310d7e494560ebf7226693e5bc6820be39b6dae91f965805cf5fc9";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-builder blaze-html bytestring
+         containers directory directory-tree dlist either filepath hashable
+         map-syntax MonadCatchIO-transformers mtl process random text time
+         transformers unordered-containers vector xmlhtml
+       ];
+       homepage = "http://snapframework.com/";
+       description = "An Haskell template system supporting both HTML5 and XML";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "heist-aeson" = callPackage
@@ -106573,13 +107377,15 @@ self: {
      }) {};
 
   "heredocs" = callPackage
-    ({ mkDerivation, base, doctest, parsec, template-haskell }:
+    ({ mkDerivation, base, doctest, parsec, template-haskell, text }:
      mkDerivation {
        pname = "heredocs";
-       version = "0.1.1.0";
-       sha256 = "fb6779b1eba4fade43b1c25d0289152390d37027e9e79f072331e175dbee7fa6";
-       libraryHaskellDepends = [ base doctest parsec template-haskell ];
-       testHaskellDepends = [ base doctest ];
+       version = "0.1.2.1";
+       sha256 = "9eb58206ced97594e688a8905040e9aff81047a38156f38719b62718cf3a6570";
+       libraryHaskellDepends = [
+         base doctest parsec template-haskell text
+       ];
+       testHaskellDepends = [ base doctest text ];
        homepage = "http://github.com/cutsea110/heredoc.git";
        description = "heredocument";
        license = stdenv.lib.licenses.bsd3;
@@ -107881,8 +108687,8 @@ self: {
      }:
      mkDerivation {
        pname = "highlight-versions";
-       version = "0.1.3.5";
-       sha256 = "475a6c4fd63a684ccd681d613c47567f08688209c6c80a06ad027bfa7f9b675a";
+       version = "0.1.3.6";
+       sha256 = "7b752972d159fd1ef0458b310830ada06db3190716e44053110b3a46584fb3fd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -108471,6 +109277,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hinotify-bytestring" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory
+     , posix-paths, unix, utf8-string
+     }:
+     mkDerivation {
+       pname = "hinotify-bytestring";
+       version = "0.3.8.1";
+       sha256 = "f67eacc194a427d48358fc63c5a896fdadbe996f15e55f423f6a9148204eac7b";
+       libraryHaskellDepends = [
+         base bytestring containers directory unix
+       ];
+       testHaskellDepends = [
+         base bytestring directory posix-paths unix utf8-string
+       ];
+       homepage = "https://github.com/hasufell/hinotify-bytestring.git";
+       description = "Haskell binding to inotify, using ByteString filepaths";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hinquire" = callPackage
     ({ mkDerivation, base, bifunctors, QuickCheck, test-framework
      , test-framework-quickcheck2, test-framework-th
@@ -108725,7 +109550,6 @@ self: {
          network-uri servant servant-client split string-conversions text
          time
        ];
-       jailbreak = true;
        description = "Hipchat API bindings in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109251,6 +110075,7 @@ self: {
          language-javascript QuickCheck test-framework test-framework-hunit
          text
        ];
+       jailbreak = true;
        homepage = "http://github.com/erikd/hjsmin";
        description = "Haskell implementation of a javascript minifier";
        license = stdenv.lib.licenses.bsd3;
@@ -109280,13 +110105,14 @@ self: {
          language-javascript QuickCheck test-framework test-framework-hunit
          text
        ];
+       jailbreak = true;
        homepage = "http://github.com/erikd/hjsmin";
        description = "Haskell implementation of a javascript minifier";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hjsmin" = callPackage
+  "hjsmin_0_1_5_3" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
      , HUnit, language-javascript, optparse-applicative, QuickCheck
      , test-framework, test-framework-hunit, text
@@ -109309,12 +110135,14 @@ self: {
          language-javascript QuickCheck test-framework test-framework-hunit
          text
        ];
+       jailbreak = true;
        homepage = "http://github.com/erikd/hjsmin";
        description = "Haskell implementation of a javascript minifier";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hjsmin_0_2_0_1" = callPackage
+  "hjsmin" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, containers
      , language-javascript, optparse-applicative, text
      }:
@@ -109331,11 +110159,9 @@ self: {
          base blaze-builder bytestring containers language-javascript
          optparse-applicative text
        ];
-       jailbreak = true;
        homepage = "http://github.com/erikd/hjsmin";
        description = "Haskell implementation of a javascript minifier";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hjson" = callPackage
@@ -109432,6 +110258,7 @@ self: {
          QuickCheck tasty tasty-hunit tasty-quickcheck text
          unordered-containers vector wai-app-static warp
        ];
+       jailbreak = true;
        homepage = "https://github.com/seagreen/hjsonschema";
        description = "JSON Schema library";
        license = stdenv.lib.licenses.mit;
@@ -110764,12 +111591,12 @@ self: {
     ({ mkDerivation, base, hmatrix, liblapack, transformers }:
      mkDerivation {
        pname = "hmatrix-banded";
-       version = "0.0";
-       sha256 = "52a90b2094eacfbeb87befaa6a2ae44924dc175c9245b61574967a6ae1a84f16";
+       version = "0.0.0.2";
+       sha256 = "cb3b825d4eef1813bd1bdf43199c200d254f0d7ad78ff1ad6b0ce3752ed33b32";
        libraryHaskellDepends = [ base hmatrix transformers ];
        librarySystemDepends = [ liblapack ];
        jailbreak = true;
-       homepage = "http://code.haskell.org/~thielema/hmatrix-banded/";
+       homepage = "http://hub.darcs.net/thielema/hmatrix-banded/";
        description = "HMatrix interface to LAPACK functions for banded matrices";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111643,15 +112470,14 @@ self: {
   "hobbits" = callPackage
     ({ mkDerivation, base, deepseq, haskell-src-exts, haskell-src-meta
      , mtl, syb, tagged, template-haskell, th-expand-syns, transformers
-     , type-equality
      }:
      mkDerivation {
        pname = "hobbits";
-       version = "1.1.1";
-       sha256 = "1aa60e29544face622e4c049f467833f23a54caa69ba23e8f047e34bb744c660";
+       version = "1.2";
+       sha256 = "f778c6919bb011b565005a540f3aba6c9d4a08be530333939612358225595d50";
        libraryHaskellDepends = [
          base deepseq haskell-src-exts haskell-src-meta mtl syb tagged
-         template-haskell th-expand-syns transformers type-equality
+         template-haskell th-expand-syns transformers
        ];
        jailbreak = true;
        description = "A library for canonically representing terms with binding";
@@ -113381,8 +114207,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.12.0";
-       sha256 = "564bdf6870efa6437d51d2bf05a09eafe61cb3bae33cc9c43a02fa094c868748";
+       version = "0.13.0";
+       sha256 = "1e374c9c6ea4784371e91353bc2204d9724a0f5864916bcba355d882cde44830";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118491,8 +119317,8 @@ self: {
     ({ mkDerivation, base, seccomp, tasty, tasty-hunit, unix }:
      mkDerivation {
        pname = "hsseccomp";
-       version = "0.1.0.2";
-       sha256 = "fce6e18b1a87e1f62f3aad709d8a41fa4b34646cc32ec973ed279914c794dc0b";
+       version = "0.2.0.1";
+       sha256 = "b138481c5b6ca765e06cfdad0d6efbb40c3241f09569fbd9645ca19b0bdd372f";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ seccomp ];
        testHaskellDepends = [ base tasty tasty-hunit unix ];
@@ -118532,28 +119358,46 @@ self: {
      }) {};
 
   "hssqlppp" = callPackage
-    ({ mkDerivation, base, containers, groom, HUnit, mtl, parsec
-     , pretty, syb, template-haskell, test-framework
-     , test-framework-hunit, transformers, uniplate
+    ({ mkDerivation, base, containers, haskell-src-exts, mtl, parsec
+     , pretty, pretty-show, syb, tasty, tasty-hunit, template-haskell
+     , text, transformers, uniplate
      }:
      mkDerivation {
        pname = "hssqlppp";
-       version = "0.4.2";
-       sha256 = "f4735a94367c044eeeab7d4ee07c0c126142046a1576843c1545b1b2f0677520";
+       version = "0.6.0";
+       sha256 = "7052d03cfb1251f806999fee3566dc7ecc838fe1db1025ed1ac2de34774e0cbc";
        libraryHaskellDepends = [
-         base containers mtl parsec pretty syb template-haskell transformers
+         base containers mtl parsec pretty pretty-show syb text transformers
          uniplate
        ];
        testHaskellDepends = [
-         base containers groom HUnit mtl parsec pretty syb template-haskell
-         test-framework test-framework-hunit transformers uniplate
+         base containers haskell-src-exts mtl parsec pretty pretty-show syb
+         tasty tasty-hunit template-haskell text transformers uniplate
        ];
-       jailbreak = true;
        homepage = "http://jakewheat.github.com/hssqlppp/";
        description = "SQL parser and type checker";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hssqlppp-th" = callPackage
+    ({ mkDerivation, base, hssqlppp, syb, tasty, tasty-hunit
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "hssqlppp-th";
+       version = "0.6.0";
+       sha256 = "546e917a7e737a8e7dc78d19c15d85aae8ec98857357706e74f19f4347635785";
+       libraryHaskellDepends = [
+         base hssqlppp syb template-haskell text
+       ];
+       testHaskellDepends = [
+         base hssqlppp syb tasty tasty-hunit template-haskell text
+       ];
+       homepage = "http://jakewheat.github.com/hssqlppp/";
+       description = "hssqlppp extras which need template-haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hstatistics_0_2_5_2" = callPackage
     ({ mkDerivation, array, base, hmatrix, hmatrix-gsl-stats, random
      , vector
@@ -120859,6 +121703,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http-dispatch" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive, hspec
+     , http-client, http-client-tls, http-types
+     }:
+     mkDerivation {
+       pname = "http-dispatch";
+       version = "0.3.0.0";
+       sha256 = "db60bbb10034b944c940004db750de89a6baaa6a765606e20475af7650aa0f8a";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive http-client http-client-tls
+         http-types
+       ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "http://github.com/owainlewis/http-dispatch#readme";
+       description = "High level HTTP client for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "http-encodings" = callPackage
     ({ mkDerivation, base, bytestring, HTTP, iconv, mime, mtl, parsec
      , text, utf8-string, zlib
@@ -121873,13 +122735,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hunit-dejafu" = callPackage
+  "hunit-dejafu_0_2_0_0" = callPackage
     ({ mkDerivation, base, dejafu, HUnit }:
      mkDerivation {
        pname = "hunit-dejafu";
        version = "0.2.0.0";
        sha256 = "c81eb0cd3e6c53509c056b0f37dcdb5f7fac6e7766abf36fb68c44e3dd997db0";
        libraryHaskellDepends = [ base dejafu HUnit ];
+       jailbreak = true;
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Deja Fu support for the HUnit test framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hunit-dejafu" = callPackage
+    ({ mkDerivation, base, dejafu, exceptions, HUnit }:
+     mkDerivation {
+       pname = "hunit-dejafu";
+       version = "0.3.0.0";
+       sha256 = "583e2d26610be4cc53c1a5b8c739e06537b86f94a9f24316274aab331deec2c9";
+       libraryHaskellDepends = [ base dejafu exceptions HUnit ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the HUnit test framework";
        license = stdenv.lib.licenses.mit;
@@ -122186,35 +123062,6 @@ self: {
      }) {};
 
   "hw-bits" = callPackage
-    ({ mkDerivation, array, attoparsec, base, bytestring, conduit
-     , criterion, deepseq, ghc-prim, hspec, hw-prim, lens, mmap
-     , mono-traversable, parsec, QuickCheck, random, resourcet, safe
-     , text, transformers, vector, word8
-     }:
-     mkDerivation {
-       pname = "hw-bits";
-       version = "0.0.0.5";
-       sha256 = "a65a46718827efefcee0126b047eca6cc77561aebda3fb6e94d354b94f1d87a8";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array attoparsec base bytestring conduit deepseq ghc-prim hw-prim
-         lens mmap mono-traversable parsec QuickCheck random resourcet safe
-         text vector word8
-       ];
-       executableHaskellDepends = [
-         base bytestring conduit criterion mmap resourcet vector
-       ];
-       testHaskellDepends = [
-         attoparsec base bytestring conduit hspec mmap parsec QuickCheck
-         resourcet transformers vector
-       ];
-       homepage = "http://github.com/haskell-works/hw-bits#readme";
-       description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-bits_0_0_0_6" = callPackage
     ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim, mmap
      , parsec, QuickCheck, resourcet, vector
      }:
@@ -122232,7 +123079,6 @@ self: {
        homepage = "http://github.com/haskell-works/hw-bits#readme";
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-conduit" = callPackage
@@ -122256,31 +123102,6 @@ self: {
      }) {};
 
   "hw-diagnostics" = callPackage
-    ({ mkDerivation, array, attoparsec, base, bytestring, conduit
-     , criterion, deepseq, ghc-prim, hspec, lens, mmap, mono-traversable
-     , parsec, QuickCheck, random, resourcet, safe, text, vector, word8
-     }:
-     mkDerivation {
-       pname = "hw-diagnostics";
-       version = "0.0.0.1";
-       sha256 = "109d2f419e8d8ebb4580863f84528c2d2b229a210d756f7ced7383136fed18b7";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array attoparsec base bytestring conduit deepseq ghc-prim lens mmap
-         mono-traversable parsec QuickCheck random resourcet safe text
-         vector word8
-       ];
-       executableHaskellDepends = [
-         base bytestring conduit criterion mmap resourcet vector
-       ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "http://github.com/haskell-works/hw-diagnostics#readme";
-       description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-diagnostics_0_0_0_2" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck }:
      mkDerivation {
        pname = "hw-diagnostics";
@@ -122294,7 +123115,22 @@ self: {
        homepage = "http://github.com/haskell-works/hw-diagnostics#readme";
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hw-parser" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, hw-prim
+     , mono-traversable, text
+     }:
+     mkDerivation {
+       pname = "hw-parser";
+       version = "0.0.0.1";
+       sha256 = "9b08d5bc3441cfcaa91ae613655c47dfb4e988210245df7cada3dbc2a5128025";
+       libraryHaskellDepends = [
+         attoparsec base bytestring hw-prim mono-traversable text
+       ];
+       homepage = "http://github.com/haskell-works/hw-parser#readme";
+       description = "Conduits for tokenizing streams";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hw-prim" = callPackage
@@ -122303,8 +123139,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-prim";
-       version = "0.0.0.7";
-       sha256 = "ea9c3334e62e4fdaeca3db78b877621750529fa23323b1a7bee8976c6b5ba4f6";
+       version = "0.0.0.10";
+       sha256 = "641a1da0488664d12438f396f08577e02f9ca43b53a6f00e52085f63a5ab776e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring random vector ];
@@ -122315,25 +123151,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-prim_0_0_0_8" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, QuickCheck, random
-     , vector
-     }:
-     mkDerivation {
-       pname = "hw-prim";
-       version = "0.0.0.8";
-       sha256 = "47c84f878d396475590223529fd9d70b277e8345a1f1b2c0d7956d968a5b14b1";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base bytestring random vector ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "http://github.com/haskell-works/hw-prim#readme";
-       description = "Primitive functions and data types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hw-rankselect" = callPackage
     ({ mkDerivation, base, hspec, hw-bits, hw-prim, QuickCheck, vector
      }:
@@ -122354,50 +123171,20 @@ self: {
      }) {};
 
   "hw-succinct" = callPackage
-    ({ mkDerivation, array, attoparsec, base, bytestring, conduit
-     , criterion, deepseq, ghc-prim, hspec, hw-bits, hw-prim, lens, mmap
-     , mono-traversable, parsec, QuickCheck, random, resourcet, safe
-     , text, transformers, vector, word8
-     }:
-     mkDerivation {
-       pname = "hw-succinct";
-       version = "0.0.0.7";
-       sha256 = "7bca3413676c9ada97feafd12ed174fc4be570a1b8eb00a258f2a240e6adeee1";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array attoparsec base bytestring conduit deepseq ghc-prim hw-bits
-         hw-prim lens mmap mono-traversable parsec QuickCheck random
-         resourcet safe text vector word8
-       ];
-       executableHaskellDepends = [
-         base bytestring conduit criterion hw-bits hw-prim mmap resourcet
-         vector
-       ];
-       testHaskellDepends = [
-         attoparsec base bytestring conduit hspec hw-bits hw-prim mmap
-         parsec QuickCheck resourcet transformers vector
-       ];
-       homepage = "http://github.com/haskell-works/hw-succinct#readme";
-       description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-succinct_0_0_0_8" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, conduit, criterion
-     , hspec, hw-bits, hw-conduit, hw-diagnostics, hw-prim
+     , hspec, hw-bits, hw-conduit, hw-diagnostics, hw-parser, hw-prim
      , hw-rankselect, mmap, mono-traversable, parsec, QuickCheck
      , resourcet, text, transformers, vector
      }:
      mkDerivation {
        pname = "hw-succinct";
-       version = "0.0.0.8";
-       sha256 = "70b1e52059a18d9ce9f6b5735f4497bf341cce4ec9265858584a4eea0d7215a2";
+       version = "0.0.0.12";
+       sha256 = "2005251655ba822fd8eabbb81247126014e5aea55e68dadd1547c8460a448310";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec base bytestring conduit hw-bits hw-conduit hw-prim
-         hw-rankselect mono-traversable text vector
+         attoparsec base bytestring conduit hw-bits hw-conduit hw-parser
+         hw-prim hw-rankselect mono-traversable text vector
        ];
        executableHaskellDepends = [
          base bytestring conduit criterion hw-bits hw-conduit hw-diagnostics
@@ -122410,7 +123197,6 @@ self: {
        homepage = "http://github.com/haskell-works/hw-succinct#readme";
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hwall-auth-iitk" = callPackage
@@ -123448,16 +124234,19 @@ self: {
      }) {};
 
   "hylogen" = callPackage
-    ({ mkDerivation, base, bytestring, filepath, fsnotify, http-types
-     , process, text, vector-space, wai, warp, websockets
+    ({ mkDerivation, base, bytestring, containers, filepath, fsnotify
+     , hashable, http-types, mtl, process, text, vector-space, wai, warp
+     , websockets
      }:
      mkDerivation {
        pname = "hylogen";
-       version = "0.1.0.10";
-       sha256 = "a8e59008ec5d4293ae14b52b900a8182f02640e6e5724d56f856e94cd1e5d40a";
+       version = "0.1.0.12";
+       sha256 = "b8906eb87088336087918208b9735259b7b5116565461ecd0333f09d46f420a9";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base vector-space ];
+       libraryHaskellDepends = [
+         base containers hashable mtl vector-space
+       ];
        executableHaskellDepends = [
          base bytestring filepath fsnotify http-types process text wai warp
          websockets
@@ -124774,16 +125563,17 @@ self: {
     ({ mkDerivation, annotated-wl-pprint, ansi-terminal, ansi-wl-pprint
      , async, base, base64-bytestring, binary, blaze-html, blaze-markup
      , bytestring, cheapskate, containers, deepseq, directory, filepath
-     , fingertree, fsnotify, gmp, haskeline, libffi, mtl, network
-     , optparse-applicative, parsers, pretty, process, safe, split
-     , terminal-size, text, time, transformers, transformers-compat
-     , trifecta, uniplate, unix, unordered-containers, utf8-string
-     , vector, vector-binary-instances, zip-archive
+     , fingertree, fsnotify, gmp, haskeline, ieee754, libffi, mtl
+     , network, optparse-applicative, parsers, pretty, process, safe
+     , split, terminal-size, text, time, transformers
+     , transformers-compat, trifecta, uniplate, unix
+     , unordered-containers, utf8-string, vector
+     , vector-binary-instances, zip-archive
      }:
      mkDerivation {
        pname = "idris";
-       version = "0.11";
-       sha256 = "e0ea4df41f63f9d4292fe2ae9d3031cbc511a96c80e43240df16374335261a2a";
+       version = "0.11.1";
+       sha256 = "51df8882aa778000833127a64b319aba07f712fe6e41033af401fbf99c08b964";
        configureFlags = [ "-fcurses" "-fffi" "-fgmp" ];
        isLibrary = true;
        isExecutable = true;
@@ -124791,10 +125581,11 @@ self: {
          annotated-wl-pprint ansi-terminal ansi-wl-pprint async base
          base64-bytestring binary blaze-html blaze-markup bytestring
          cheapskate containers deepseq directory filepath fingertree
-         fsnotify haskeline libffi mtl network optparse-applicative parsers
-         pretty process safe split terminal-size text time transformers
-         transformers-compat trifecta uniplate unix unordered-containers
-         utf8-string vector vector-binary-instances zip-archive
+         fsnotify haskeline ieee754 libffi mtl network optparse-applicative
+         parsers pretty process safe split terminal-size text time
+         transformers transformers-compat trifecta uniplate unix
+         unordered-containers utf8-string vector vector-binary-instances
+         zip-archive
        ];
        librarySystemDepends = [ gmp ];
        executableHaskellDepends = [
@@ -124804,6 +125595,7 @@ self: {
          base containers directory filepath haskeline process time
          transformers
        ];
+       doCheck = false;
        homepage = "http://www.idris-lang.org/";
        description = "Functional Programming Language with Dependent Types";
        license = stdenv.lib.licenses.bsd3;
@@ -125715,31 +126507,38 @@ self: {
      }) {};
 
   "imm" = callPackage
-    ({ mkDerivation, async, base, bytestring, case-insensitive, cond
-     , data-default, directory, dyre, feed, filepath, hslogger
-     , http-conduit, http-types, lens, mime-mail, monad-control, mtl
-     , network, network-uri, old-locale, opml, random, resourcet, text
-     , text-icu, time, timerep, tls, transformers, transformers-base
-     , utf8-string, xdg-basedir, xml
+    ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base
+     , bytestring, case-insensitive, chunked-data, comonad, compdata
+     , conduit, conduit-combinators, conduit-parse, connection
+     , containers, directory, dyre, exceptions, fast-logger, filepath
+     , free, hashable, HaskellNet, HaskellNet-SSL, http-client
+     , http-client-tls, http-types, mime-mail, mono-traversable
+     , monoid-subclasses, network, opml-conduit, optparse-applicative
+     , rainbow, rainbox, rss-conduit, text, time, timerep, tls
+     , transformers, uri-bytestring, xml, xml-conduit
      }:
      mkDerivation {
        pname = "imm";
-       version = "0.6.0.3";
-       sha256 = "b488b4a0011abf516b4d71eeea0c5cdbd2a4ebb561c2ec200cb90bd9cd58183a";
-       revision = "1";
-       editedCabalFile = "c14d5caa0066c05d15589dfbb663c5397bcb6d12ab4477de1d7572e3a16b132d";
+       version = "1.0.0.0";
+       sha256 = "05bca52253f0f6ea4fc52e07f5920012e75f20cd5e3127c7ffac5647a1512af5";
+       revision = "3";
+       editedCabalFile = "63bff92fa6fd212e3ba6f81b4d2e74fe47e02e86b06e8b1b1cd19588331ce5e4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         async base bytestring case-insensitive cond data-default directory
-         dyre feed filepath hslogger http-conduit http-types lens mime-mail
-         monad-control mtl network network-uri old-locale opml random
-         resourcet text text-icu time timerep tls transformers
-         transformers-base utf8-string xdg-basedir xml
+         aeson ansi-wl-pprint atom-conduit base bytestring case-insensitive
+         chunked-data comonad compdata conduit conduit-combinators
+         conduit-parse connection containers directory dyre exceptions
+         fast-logger filepath free hashable HaskellNet HaskellNet-SSL
+         http-client http-client-tls http-types mime-mail mono-traversable
+         monoid-subclasses network opml-conduit optparse-applicative rainbow
+         rainbox rss-conduit text time timerep tls transformers
+         uri-bytestring xml xml-conduit
        ];
-       executableHaskellDepends = [ base ];
+       executableHaskellDepends = [ base free ];
        jailbreak = true;
-       description = "Retrieve RSS/Atom feeds and write one mail per new item in a maildir";
+       homepage = "https://github.com/k0ral/imm";
+       description = "Execute arbitrary actions for each unread element of RSS/Atom feeds";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -126702,6 +127501,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "inline-java" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers
+     , distributed-closure, inline-c, jvm, singletons, text
+     , thread-local-storage, vector
+     }:
+     mkDerivation {
+       pname = "inline-java";
+       version = "0.1";
+       sha256 = "ec4a751af5749b1b12dd9fd20ae40745f0410375024bd895293d52b8386f5dcb";
+       libraryHaskellDepends = [
+         base binary bytestring containers distributed-closure inline-c
+         singletons text thread-local-storage vector
+       ];
+       librarySystemDepends = [ jvm ];
+       homepage = "http://github.com/tweag/inline-java#readme";
+       description = "Java interop via inline Java code in Haskell modules";
+       license = stdenv.lib.licenses.bsd3;
+     }) {jvm = null;};
+
   "inline-r" = callPackage
     ({ mkDerivation, aeson, base, bytestring, c2hs, containers
      , data-default-class, deepseq, directory, exceptions, filepath
@@ -126758,6 +127576,8 @@ self: {
        pname = "insert-ordered-containers";
        version = "0.1.0.1";
        sha256 = "4905e5d128c19887a79b281150acb16cb3b043ab2c5a7788b0151ba7d46b900a";
+       revision = "1";
+       editedCabalFile = "845948717464c40358d8d635fa3b8240fb4a2464558527a4cfeccdf426403eaa";
        libraryHaskellDepends = [
          aeson base base-compat hashable lens semigroupoids semigroups text
          transformers unordered-containers
@@ -127452,6 +128272,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "invertible" = callPackage
+    ({ mkDerivation, arrows, base, haskell-src-meta, HList, invariant
+     , lens, partial-isomorphisms, Piso, semigroupoids, template-haskell
+     , TypeCompose
+     }:
+     mkDerivation {
+       pname = "invertible";
+       version = "0.1";
+       sha256 = "f51ee09313044a21f4c0a5e9d7b9c9c8bb1bd91de33de9cb23d462991713829e";
+       libraryHaskellDepends = [
+         arrows base haskell-src-meta HList invariant lens
+         partial-isomorphisms Piso semigroupoids template-haskell
+         TypeCompose
+       ];
+       description = "bidirectional arrows, bijective functions, and invariant functors";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "invertible-syntax" = callPackage
     ({ mkDerivation, base, partial-isomorphisms }:
      mkDerivation {
@@ -130238,8 +131076,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-ast";
-       version = "0.2";
-       sha256 = "595ed692fa82dc6e178d368a6a247eb19f96f643ce030b8c178ec7d54b0a4b5c";
+       version = "0.3";
+       sha256 = "877c8fde915cae37aa24a3d1c98dab75a81aa00a86aa7077b766ab5033c516b9";
        libraryHaskellDepends = [
          base scientific text unordered-containers vector
        ];
@@ -130258,6 +131096,7 @@ self: {
        libraryHaskellDepends = [
          base json-ast QuickCheck quickcheck-instances
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/json-ast-quickcheck";
        description = "Compatibility layer for \"json-ast\" and \"QuickCheck\"";
        license = stdenv.lib.licenses.mit;
@@ -130506,7 +131345,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "json-autotype" = callPackage
+  "json-autotype_1_0_13" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, GenericPretty, hashable, hflags, hint, lens, mmap, mtl
      , pretty, process, QuickCheck, scientific, smallcheck, text
@@ -130536,6 +131375,39 @@ self: {
        homepage = "https://github.com/mgajda/json-autotype";
        description = "Automatic type declaration for JSON input data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "json-autotype" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, GenericPretty, hashable, hflags, lens, mmap, mtl
+     , pretty, process, QuickCheck, scientific, smallcheck, text
+     , uniplate, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "json-autotype";
+       version = "1.0.14";
+       sha256 = "37536fd9cd18ae8fa9527359cbfb8c69dc5bed51abdd7c7931ac0d12642fd2f4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers filepath GenericPretty hashable
+         hflags lens mmap mtl pretty process scientific text uniplate
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers filepath GenericPretty hashable
+         hflags lens mtl pretty process scientific text uniplate
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory filepath GenericPretty
+         hashable hflags lens mtl pretty process QuickCheck scientific
+         smallcheck text uniplate unordered-containers vector
+       ];
+       homepage = "https://github.com/mgajda/json-autotype";
+       description = "Automatic type declaration for JSON input data";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "json-b" = callPackage
@@ -130586,8 +131458,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-encoder";
-       version = "0.1.6";
-       sha256 = "c19d6d4530d654f31637db1ab409295a0b33f5a3bbd16724253c0e9c347d17d9";
+       version = "0.1.7";
+       sha256 = "8796142da268ecd869042f8ab7cf5069dad8d75155715f39cee4ec7429b98c9d";
        libraryHaskellDepends = [
          base-prelude bytestring bytestring-tree-builder contravariant
          contravariant-extras scientific semigroups text
@@ -130794,8 +131666,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc-client";
-       version = "0.2.3.0";
-       sha256 = "6c4325ad6d9fc8552d496f6bf680444dd90454c44c3a4265ed7e9a5b473f6a3a";
+       version = "0.2.4.0";
+       sha256 = "9f65be9991b073441332023cdfdf232e8455a530fb2fe922af2932e39436cee7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -130819,8 +131691,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc-server";
-       version = "0.2.3.0";
-       sha256 = "73d633f3bfeea0ad785916c53afb1f4e3d481bef55977dc20d51297180148337";
+       version = "0.2.4.0";
+       sha256 = "2a3a993a2d99f503fed13fad0193d005b2c75d768abdb64a254a687bb65e3ed1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -131877,34 +132749,6 @@ self: {
      }) {};
 
   "katip" = callPackage
-    ({ mkDerivation, aeson, auto-update, base, bytestring, containers
-     , directory, either, exceptions, hostname, lens, lens-aeson
-     , monad-control, mtl, old-locale, quickcheck-instances
-     , regex-tdfa-rc, resourcet, string-conv, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, temporary, text, time
-     , time-locale-compat, transformers, transformers-base
-     , transformers-compat, unix, unordered-containers
-     }:
-     mkDerivation {
-       pname = "katip";
-       version = "0.1.1.0";
-       sha256 = "37b3c7e8975343a0f3e819b402b39b97c838916a42f00a497fcdf4e04512c1e8";
-       libraryHaskellDepends = [
-         aeson auto-update base bytestring containers either exceptions
-         hostname lens lens-aeson monad-control mtl old-locale resourcet
-         string-conv template-haskell text time time-locale-compat
-         transformers transformers-base transformers-compat unix
-         unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base directory quickcheck-instances regex-tdfa-rc tasty
-         tasty-hunit tasty-quickcheck template-haskell temporary text time
-       ];
-       description = "A structured logging framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "katip_0_2_0_0" = callPackage
     ({ mkDerivation, aeson, auto-update, base, bytestring, containers
      , directory, either, exceptions, hostname, microlens, microlens-th
      , monad-control, mtl, old-locale, quickcheck-instances
@@ -131932,37 +132776,9 @@ self: {
        homepage = "https://github.com/Soostone/katip";
        description = "A structured logging framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "katip-elasticsearch" = callPackage
-    ({ mkDerivation, aeson, async, base, bloodhound, containers
-     , enclosed-exceptions, exceptions, http-client, http-types, katip
-     , lens, lens-aeson, quickcheck-instances, random, retry, scientific
-     , stm, stm-chans, tasty, tasty-hunit, tasty-quickcheck, text, time
-     , transformers, unordered-containers, uuid, vector
-     }:
-     mkDerivation {
-       pname = "katip-elasticsearch";
-       version = "0.1.1.0";
-       sha256 = "4985289f907ce8b00041bd5dd5126745eff3b7f55a5a5e8aec349869413b990f";
-       libraryHaskellDepends = [
-         aeson async base bloodhound enclosed-exceptions exceptions
-         http-client http-types katip random retry scientific stm stm-chans
-         text time transformers unordered-containers uuid
-       ];
-       testHaskellDepends = [
-         aeson base bloodhound containers http-client http-types katip lens
-         lens-aeson quickcheck-instances scientific stm tasty tasty-hunit
-         tasty-quickcheck text time transformers unordered-containers vector
-       ];
-       doCheck = false;
-       description = "ElasticSearch scribe for the Katip logging framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "katip-elasticsearch_0_2_0_0" = callPackage
     ({ mkDerivation, aeson, async, base, bloodhound, containers
      , enclosed-exceptions, exceptions, http-client, http-types, katip
      , lens, lens-aeson, quickcheck-instances, random, retry, scientific
@@ -131983,7 +132799,7 @@ self: {
          lens-aeson quickcheck-instances scientific stm tasty tasty-hunit
          tasty-quickcheck text time transformers unordered-containers vector
        ];
-       jailbreak = true;
+       doCheck = false;
        description = "ElasticSearch scribe for the Katip logging framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132834,7 +133650,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "keycode" = callPackage
+  "keycode_0_1_1" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "keycode";
@@ -132846,9 +133662,10 @@ self: {
        homepage = "https://github.com/RyanGlScott/keycode";
        description = "Maps web browser keycodes to their corresponding keyboard keys";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "keycode_0_2" = callPackage
+  "keycode" = callPackage
     ({ mkDerivation, base, containers, ghc-prim }:
      mkDerivation {
        pname = "keycode";
@@ -132858,7 +133675,6 @@ self: {
        homepage = "https://github.com/RyanGlScott/keycode";
        description = "Maps web browser keycodes to their corresponding keyboard keys";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keyed" = callPackage
@@ -133598,33 +134414,18 @@ self: {
      }) {};
 
   "lackey" = callPackage
-    ({ mkDerivation, base, servant, tasty, tasty-hspec }:
-     mkDerivation {
-       pname = "lackey";
-       version = "0.2.0";
-       sha256 = "8c54bd4c8901fe0a16149d57e366c3d11d21b9656f8be9ffe8eb86f25e0d0f19";
-       libraryHaskellDepends = [ base servant ];
-       testHaskellDepends = [ base servant tasty tasty-hspec ];
-       homepage = "https://github.com/tfausak/lackey#readme";
-       description = "Generate Ruby consumers of Servant APIs";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "lackey_0_3_1" = callPackage
     ({ mkDerivation, base, servant, servant-foreign, tasty, tasty-hspec
      , text
      }:
      mkDerivation {
        pname = "lackey";
-       version = "0.3.1";
-       sha256 = "a7b552e3c24fbb6e272cabb897b6788712da789a3934d0ad3bae6fe9857d1d2a";
+       version = "0.3.2";
+       sha256 = "0da7478ee80d29eb96efaf8d3df9acc24f037b062c743a6c987765d00abf84e1";
        libraryHaskellDepends = [ base servant servant-foreign text ];
        testHaskellDepends = [ base servant tasty tasty-hspec text ];
-       jailbreak = true;
        homepage = "https://github.com/tfausak/lackey#readme";
        description = "Generate Ruby clients from Servant APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lagrangian" = callPackage
@@ -135330,7 +136131,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "language-javascript" = callPackage
+  "language-javascript_0_5_14_7" = callPackage
     ({ mkDerivation, alex, array, base, blaze-builder, bytestring
      , Cabal, containers, happy, HUnit, mtl, QuickCheck, test-framework
      , test-framework-hunit, utf8-light, utf8-string
@@ -135351,9 +136152,10 @@ self: {
        homepage = "http://github.com/erikd/language-javascript";
        description = "Parser for JavaScript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "language-javascript_0_6_0_4" = callPackage
+  "language-javascript" = callPackage
     ({ mkDerivation, alex, array, base, blaze-builder, bytestring
      , Cabal, containers, happy, hspec, mtl, QuickCheck, text
      , utf8-light, utf8-string
@@ -135370,11 +136172,9 @@ self: {
          array base blaze-builder bytestring Cabal containers hspec mtl
          QuickCheck utf8-light utf8-string
        ];
-       jailbreak = true;
        homepage = "http://github.com/erikd/language-javascript";
        description = "Parser for JavaScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-kort" = callPackage
@@ -135859,6 +136659,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-webidl" = callPackage
+    ({ mkDerivation, base, parsec, wl-pprint }:
+     mkDerivation {
+       pname = "language-webidl";
+       version = "0.1.1.0";
+       sha256 = "2318258e89b6301ae23fde9e4301f40e354f7cd4a8953c55de3291259f2cde19";
+       libraryHaskellDepends = [ base parsec wl-pprint ];
+       description = "Parser and Pretty Printer for WebIDL";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "largeword_1_2_3" = callPackage
     ({ mkDerivation, base, binary, bytestring, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -135982,7 +136793,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "latex-formulae-hakyll" = callPackage
+  "latex-formulae-hakyll_0_2_0_1" = callPackage
     ({ mkDerivation, base, hakyll, latex-formulae-image
      , latex-formulae-pandoc, lrucache, pandoc-types
      }:
@@ -135994,12 +136805,14 @@ self: {
          base hakyll latex-formulae-image latex-formulae-pandoc lrucache
          pandoc-types
        ];
+       jailbreak = true;
        homepage = "https://github.com/liamoc/latex-formulae#readme";
        description = "Use actual LaTeX to render formulae inside Hakyll pages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "latex-formulae-hakyll_0_2_0_2" = callPackage
+  "latex-formulae-hakyll" = callPackage
     ({ mkDerivation, base, hakyll, latex-formulae-image
      , latex-formulae-pandoc, lrucache, pandoc-types
      }:
@@ -136014,7 +136827,6 @@ self: {
        homepage = "https://github.com/liamoc/latex-formulae#readme";
        description = "Use actual LaTeX to render formulae inside Hakyll pages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "latex-formulae-image_0_1_1_0" = callPackage
@@ -136863,7 +137675,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lens_4_13_2_1" = callPackage
+  "lens_4_14" = callPackage
     ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
      , comonad, containers, contravariant, deepseq, directory
      , distributive, doctest, exceptions, filepath, free
@@ -136876,8 +137688,8 @@ self: {
      }:
      mkDerivation {
        pname = "lens";
-       version = "4.13.2.1";
-       sha256 = "d48509a066f864c3c6a8944117e788bab80587d40b1799600c99da389ee249b6";
+       version = "4.14";
+       sha256 = "70a3cd18ef352950b88d6cac449988b9320704b56dceda80e7de9f2907ee5f4b";
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring comonad containers
          contravariant distributive exceptions filepath free ghc-prim
@@ -137044,10 +137856,10 @@ self: {
     ({ mkDerivation, base, lens, time }:
      mkDerivation {
        pname = "lens-datetime";
-       version = "0.2.1";
-       sha256 = "e2445f051d99a3f76890f7a6c91c7baccb1e587e1ba6d67ea4d20e6efdd113f3";
+       version = "0.3";
+       sha256 = "bb1f8d7bf71c9ef8901bc39e2a2d629b1101307115c0c4d844fcbd8e86b6ccd4";
        libraryHaskellDepends = [ base lens time ];
-       homepage = "http://github.com/nilcons/lens-datetime";
+       homepage = "https://github.com/nilcons/lens-datetime";
        description = "Lenses for Data.Time.* types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137330,7 +138142,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "lentil" = callPackage
+  "lentil_0_1_11_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip
      , filepath, hspec, natural-sort, optparse-applicative, parsec
      , regex-tdfa
@@ -137339,6 +138151,33 @@ self: {
        pname = "lentil";
        version = "0.1.11.0";
        sha256 = "7185c00900bb288df3f335c87e522e12a4ba2052c4937d98d50a053a609bb71f";
+       revision = "1";
+       editedCabalFile = "0636a6b80d201ceb5d301d9057052f30eb83da5fb153ba06aa5091cfc3c2999e";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         ansi-wl-pprint base csv directory filemanip filepath natural-sort
+         optparse-applicative parsec regex-tdfa
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base csv directory filemanip filepath hspec
+         natural-sort optparse-applicative parsec regex-tdfa
+       ];
+       homepage = "http://www.ariis.it/static/articles/lentil/page.html";
+       description = "frugal issue tracker";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "lentil" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip
+     , filepath, hspec, natural-sort, optparse-applicative, parsec
+     , regex-tdfa
+     }:
+     mkDerivation {
+       pname = "lentil";
+       version = "0.1.12.0";
+       sha256 = "a49c806f024ba30197a85f043c84d8ad1ca5aaca3b6d96ebb8727a4e438380fb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -138110,22 +138949,35 @@ self: {
      }) {};
 
   "libravatar" = callPackage
-    ({ mkDerivation, base, bytestring, crypto-api, data-default-class
-     , dns, network-uri, pureMD5, random, SHA, url, utf8-string
+    ({ mkDerivation, base, bytestring, cryptonite, data-default-class
+     , dns, network-uri, random, url, utf8-string
      }:
      mkDerivation {
        pname = "libravatar";
-       version = "0.3.0.0";
-       sha256 = "2371b91f8ff4abdeba4374d20b4fa9c90fe0e9871c874bd61f32380b32ef88bf";
+       version = "0.3.0.1";
+       sha256 = "43c646e85abcf577cb0fa09feffbbd45f4cd4cc6203db33d5a6e5a61da42dace";
        libraryHaskellDepends = [
-         base bytestring crypto-api data-default-class dns network-uri
-         pureMD5 random SHA url utf8-string
+         base bytestring cryptonite data-default-class dns network-uri
+         random url utf8-string
        ];
        homepage = "http://rel4tion.org/projects/libravatar/";
        description = "Use Libravatar, the decentralized avatar delivery service";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "libroman" = callPackage
+    ({ mkDerivation, base, hspec, QuickCheck, word8 }:
+     mkDerivation {
+       pname = "libroman";
+       version = "1.0.1";
+       sha256 = "864dd1ebfe4709ff48c0d4678ca2ee5da62b864228b165e04dbcccc64fb24b84";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec QuickCheck word8 ];
+       homepage = "https://ahakki.xyz";
+       description = "arabic to roman numeral conversions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "libssh2" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, libssh2, network, ssh2
      , syb, time
@@ -140842,8 +141694,8 @@ self: {
      }:
      mkDerivation {
        pname = "log";
-       version = "0.3.1";
-       sha256 = "6239019b513145e0e8117dff2deaca0a85c9f36f0419c892c7c93def98624b0e";
+       version = "0.4";
+       sha256 = "0358e82bd4e261545fefbf197eac335daa5e05987948dc322b7e16439755132f";
        libraryHaskellDepends = [
          aeson aeson-pretty base base64-bytestring bytestring deepseq
          exceptions hpqtypes lifted-base monad-control monad-time mtl
@@ -142259,8 +143111,8 @@ self: {
      }:
      mkDerivation {
        pname = "luminance";
-       version = "0.11";
-       sha256 = "d29c8b29daba5fc5f563cac7c1ac32f876338ff62f3012bc18ed966d35a36378";
+       version = "0.11.0.1";
+       sha256 = "bb61c59d14a0f12866365c5ec97bc791c4f9ae0cbad7b191769d14650f52eb44";
        libraryHaskellDepends = [
          base containers contravariant dlist gl linear mtl resourcet
          semigroups transformers vector void
@@ -143335,8 +144187,8 @@ self: {
     ({ mkDerivation, base, containers, srcloc, text }:
      mkDerivation {
        pname = "mainland-pretty";
-       version = "0.4.1.3";
-       sha256 = "d833485def1f7b9320b76fee7f7cbc1462d6358e87af05aea049ddd6cc7b4640";
+       version = "0.4.1.4";
+       sha256 = "b6526b119dd84e006740c69ab794d0a43b855fea29bb2a3a8ed2568b995faf9c";
        libraryHaskellDepends = [ base containers srcloc text ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "Pretty printing designed for printing source code";
@@ -144017,7 +144869,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mandrill" = callPackage
+  "mandrill_0_5_1_0" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-html
      , bytestring, containers, email-validate, http-client
      , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck
@@ -144039,6 +144891,31 @@ self: {
        ];
        description = "Library for interfacing with the Mandrill JSON API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "mandrill" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, blaze-html
+     , bytestring, containers, email-validate, http-client
+     , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck
+     , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "mandrill";
+       version = "0.5.2.0";
+       sha256 = "323a44776aaf831361f395a50d43032c615936112c147719221008c6a89e62cd";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring blaze-html bytestring containers
+         email-validate http-client http-client-tls http-types lens mtl
+         old-locale QuickCheck text time unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit
+         tasty-quickcheck text
+       ];
+       description = "Library for interfacing with the Mandrill JSON API";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "mandulia" = callPackage
@@ -144758,7 +145635,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) pcre;};
 
-  "math-functions" = callPackage
+  "math-functions_0_1_5_2" = callPackage
     ({ mkDerivation, base, deepseq, erf, HUnit, ieee754, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , vector, vector-th-unbox
@@ -144779,9 +145656,10 @@ self: {
        homepage = "https://github.com/bos/math-functions";
        description = "Special functions and Chebyshev polynomials";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "math-functions_0_1_6_0" = callPackage
+  "math-functions" = callPackage
     ({ mkDerivation, base, deepseq, erf, HUnit, ieee754, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , vector, vector-th-unbox
@@ -144797,10 +145675,10 @@ self: {
          base HUnit ieee754 QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 vector
        ];
+       doCheck = false;
        homepage = "https://github.com/bos/math-functions";
        description = "Special functions and Chebyshev polynomials";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mathblog" = callPackage
@@ -147537,7 +148415,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mime-types" = callPackage
+  "mime-types_0_1_0_6" = callPackage
     ({ mkDerivation, base, bytestring, containers, text }:
      mkDerivation {
        pname = "mime-types";
@@ -147547,9 +148425,10 @@ self: {
        homepage = "https://github.com/yesodweb/wai";
        description = "Basic mime-type handling types and functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mime-types_0_1_0_7" = callPackage
+  "mime-types" = callPackage
     ({ mkDerivation, base, bytestring, containers, text }:
      mkDerivation {
        pname = "mime-types";
@@ -147559,7 +148438,6 @@ self: {
        homepage = "https://github.com/yesodweb/wai";
        description = "Basic mime-type handling types and functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mines" = callPackage
@@ -148322,8 +149200,8 @@ self: {
      }:
      mkDerivation {
        pname = "module-management";
-       version = "0.20.4";
-       sha256 = "f85be205a423d8fb2251a432ec4492a4d11cfa41aaa7005a3e958108809fbba0";
+       version = "0.21";
+       sha256 = "2518ed4e792fe743d14bc787347cda74bd4eb0aa070831e5453f5b1063a3e28e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -148339,7 +149217,6 @@ self: {
        testHaskellDepends = [
          base containers filepath haskell-src-exts HUnit process
        ];
-       jailbreak = true;
        homepage = "https://github.com/seereason/module-management";
        description = "Clean up module imports, split and merge modules";
        license = stdenv.lib.licenses.bsd3;
@@ -148967,6 +149844,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "monad-log" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, exceptions, fast-logger
+     , lifted-base, monad-control, template-haskell, text, text-show
+     , transformers
+     }:
+     mkDerivation {
+       pname = "monad-log";
+       version = "0.1.1.0";
+       sha256 = "34000c62083e4b32c59a8a7a731608a573ce3fec97a4cf34d16cf77c2e7e8bc1";
+       libraryHaskellDepends = [
+         aeson base bytestring exceptions fast-logger lifted-base
+         monad-control template-haskell text text-show transformers
+       ];
+       description = "A simple and fast logging monad";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "monad-logger_0_3_11" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, conduit
      , conduit-extra, exceptions, fast-logger, lifted-base
@@ -149690,7 +150584,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "monad-time" = callPackage
+  "monad-time_0_1" = callPackage
     ({ mkDerivation, base, mtl, time }:
      mkDerivation {
        pname = "monad-time";
@@ -149700,6 +150594,20 @@ self: {
        homepage = "https://github.com/scrive/monad-time";
        description = "Type class for monads which carry the notion of the current time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "monad-time" = callPackage
+    ({ mkDerivation, base, mtl, time }:
+     mkDerivation {
+       pname = "monad-time";
+       version = "0.2";
+       sha256 = "a9b901ca94b4c71d5f374a472506db92d26b13af523ceafe1e3302e8bae8b05d";
+       libraryHaskellDepends = [ base mtl time ];
+       testHaskellDepends = [ base mtl time ];
+       homepage = "https://github.com/scrive/monad-time";
+       description = "Type class for monads which carry the notion of the current time";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "monad-tx" = callPackage
@@ -149729,7 +150637,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monad-unlift" = callPackage
+  "monad-unlift_0_1_1_0" = callPackage
     ({ mkDerivation, base, constraints, exceptions, monad-control, mtl
      , mutable-containers, resourcet, stm, transformers
      , transformers-base
@@ -149745,6 +150653,61 @@ self: {
        homepage = "https://github.com/fpco/monad-unlift";
        description = "Typeclasses for representing monad transformer unlifting";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "monad-unlift" = callPackage
+    ({ mkDerivation, base, constraints, exceptions, monad-control, mtl
+     , mutable-containers, resourcet, stm, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "monad-unlift";
+       version = "0.1.2.0";
+       sha256 = "3cefba607cd9ebc42c93afa17b2d4be0dd9496638b79895a2a5fff0e3e17641d";
+       libraryHaskellDepends = [
+         base constraints exceptions monad-control mtl mutable-containers
+         resourcet stm transformers transformers-base
+       ];
+       homepage = "https://github.com/fpco/monad-unlift";
+       description = "Typeclasses for representing monad transformer unlifting";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "monad-unlift_0_2_0" = callPackage
+    ({ mkDerivation, base, constraints, monad-control, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "monad-unlift";
+       version = "0.2.0";
+       sha256 = "4b5e638619e4821918b4ec67aeffb581ab9df23d168fbb72164137009a15ee0f";
+       libraryHaskellDepends = [
+         base constraints monad-control transformers transformers-base
+       ];
+       homepage = "https://github.com/fpco/monad-unlift";
+       description = "Typeclasses for representing monad transformer unlifting";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "monad-unlift-ref" = callPackage
+    ({ mkDerivation, base, constraints, exceptions, monad-control
+     , monad-unlift, mtl, mutable-containers, resourcet, stm
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "monad-unlift-ref";
+       version = "0.2.0";
+       sha256 = "a97acc3384dcde65109400d77fa0cd58617c77708204d7d825b6591a65444ce1";
+       libraryHaskellDepends = [
+         base constraints exceptions monad-control monad-unlift mtl
+         mutable-containers resourcet stm transformers transformers-base
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/fpco/monad-unlift";
+       description = "Typeclasses for representing monad transformer unlifting";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "monad-wrap" = callPackage
@@ -150081,7 +151044,6 @@ self: {
          base hspec network servant servant-client servant-server time
          timerep transformers wai warp
        ];
-       jailbreak = true;
        description = "Haskell bindings for the Mondo API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150842,7 +151804,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monoidal-containers" = callPackage
+  "monoidal-containers_0_1_2_4" = callPackage
     ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype
      , unordered-containers
      }:
@@ -150856,6 +151818,23 @@ self: {
        homepage = "http://github.com/bgamari/monoidal-containers";
        description = "Containers with monoidal accumulation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "monoidal-containers" = callPackage
+    ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "monoidal-containers";
+       version = "0.1.2.5";
+       sha256 = "c82124b1e867a271bafeffb6fb8fb1febb1887154bf28225b174180babc9d438";
+       libraryHaskellDepends = [
+         base containers deepseq hashable lens newtype unordered-containers
+       ];
+       homepage = "http://github.com/bgamari/monoidal-containers";
+       description = "Containers with monoidal accumulation";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "monoidplus" = callPackage
@@ -151079,34 +152058,6 @@ self: {
      }) {};
 
   "morte" = callPackage
-    ({ mkDerivation, alex, array, base, binary, containers, deepseq
-     , Earley, http-client, http-client-tls, microlens, microlens-mtl
-     , mtl, optparse-applicative, pipes, QuickCheck, system-fileio
-     , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text
-     , text-format, transformers
-     }:
-     mkDerivation {
-       pname = "morte";
-       version = "1.5.1";
-       sha256 = "51868301687ac66d80597267a36c99622a1a357a88690fadf283974d7936f0f8";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base binary containers deepseq Earley http-client
-         http-client-tls microlens microlens-mtl pipes system-fileio
-         system-filepath text text-format transformers
-       ];
-       libraryToolDepends = [ alex ];
-       executableHaskellDepends = [ base optparse-applicative text ];
-       testHaskellDepends = [
-         base mtl QuickCheck system-filepath tasty tasty-hunit
-         tasty-quickcheck text transformers
-       ];
-       description = "A bare-bones calculus of constructions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "morte_1_6_0" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers, deepseq
      , Earley, http-client, http-client-tls, microlens, microlens-mtl
      , mtl, optparse-applicative, pipes, QuickCheck, system-fileio
@@ -151132,7 +152083,6 @@ self: {
        ];
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mosaico-lib" = callPackage
@@ -152329,7 +153279,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "murmur-hash" = callPackage
+  "murmur-hash_0_1_0_8" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "murmur-hash";
@@ -152339,6 +153289,19 @@ self: {
        homepage = "http://github.com/nominolo/murmur-hash";
        description = "MurmurHash2 implementation for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "murmur-hash" = callPackage
+    ({ mkDerivation, base, bytestring }:
+     mkDerivation {
+       pname = "murmur-hash";
+       version = "0.1.0.9";
+       sha256 = "89b9db94ead4cc0784dbcfb47c51b5664c1718860db00cd8ada3ef6fdd4465ad";
+       libraryHaskellDepends = [ base bytestring ];
+       homepage = "http://github.com/nominolo/murmur-hash";
+       description = "MurmurHash2 implementation for Haskell";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "murmur3" = callPackage
@@ -152785,7 +153748,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mutable-containers" = callPackage
+  "mutable-containers_0_3_2" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, hspec
      , mono-traversable, primitive, QuickCheck, vector
      }:
@@ -152802,9 +153765,10 @@ self: {
        homepage = "https://github.com/fpco/mutable-containers";
        description = "Abstactions and concrete implementations of mutable containers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mutable-containers_0_3_2_1" = callPackage
+  "mutable-containers" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, hspec
      , mono-traversable, primitive, QuickCheck, vector
      }:
@@ -152821,7 +153785,6 @@ self: {
        homepage = "https://github.com/fpco/mutable-containers";
        description = "Abstactions and concrete implementations of mutable containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mutable-iter" = callPackage
@@ -154567,13 +155530,12 @@ self: {
        pname = "netrc";
        version = "0.2.0.0";
        sha256 = "9a5e07efa44f4b715b110aa4f9687e2b75458fb7537a2f4f1a3582c9e2e82a86";
-       revision = "1";
-       editedCabalFile = "55e4e8785866fa2145f9b4de21522d4092a7c486845062915704b2917b8c4fbd";
+       revision = "2";
+       editedCabalFile = "81e838434e1cae11b94edbcfb61fee89f847a32e5a745fe59de69e6af9207ac9";
        libraryHaskellDepends = [ base bytestring deepseq parsec ];
        testHaskellDepends = [
          base bytestring tasty tasty-golden tasty-quickcheck
        ];
-       jailbreak = true;
        homepage = "https://github.com/hvr/netrc";
        description = "Parser for .netrc files";
        license = stdenv.lib.licenses.gpl3;
@@ -155031,6 +155993,7 @@ self: {
          attoparsec base bytestring exceptions hspec mtl network
          network-simple transformers
        ];
+       doCheck = false;
        homepage = "http://github.com/solatis/haskell-network-attoparsec";
        description = "Utility functions for running a parser against a socket";
        license = stdenv.lib.licenses.mit;
@@ -156266,13 +157229,12 @@ self: {
      }:
      mkDerivation {
        pname = "newtype-deriving";
-       version = "0.1.3";
-       sha256 = "15090bbb5327da577b9f06d8d703c9762aabf7446cf930096b9c1273d28f83ba";
+       version = "0.1.4";
+       sha256 = "14f62033ad7c59aa3121c336c2fac3fd1374accde3ad996d6c94c525f55697e2";
        libraryHaskellDepends = [
          base base-prelude monad-control template-haskell transformers
          transformers-base
        ];
-       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/newtype-deriving";
        description = "Instance derivers for newtype wrappers";
        license = stdenv.lib.licenses.mit;
@@ -156716,8 +157678,8 @@ self: {
     ({ mkDerivation, array, base, containers, regex-compat }:
      mkDerivation {
        pname = "nofib-analyse";
-       version = "7.12.0.20151208";
-       sha256 = "d0ba0f82bbd0d1324e6331d75f43a0b5c1c207a3ad7df16668b730bb336725ad";
+       version = "8.1.0.20160428";
+       sha256 = "2672847477c5a5cceb0495cea009f1b531ae84901e563d5d851d187729384ea1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base containers regex-compat ];
@@ -157823,8 +158785,8 @@ self: {
      }:
      mkDerivation {
        pname = "octane";
-       version = "0.4.17";
-       sha256 = "0384e4d970bed711c8415bba64e4fae6d8a18a442defc3775bd08fb46bbdd18e";
+       version = "0.4.18";
+       sha256 = "75662d122bf7eb1f552cda017e45d74b2f0364a45ac0a11eb3af1687d8ce8f44";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -157840,15 +158802,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "octane_0_4_18" = callPackage
+  "octane_0_4_19" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, autoexporter, base, binary
      , binary-bits, bytestring, containers, data-binary-ieee754, deepseq
      , newtype-generics, tasty, tasty-hspec, text
      }:
      mkDerivation {
        pname = "octane";
-       version = "0.4.18";
-       sha256 = "75662d122bf7eb1f552cda017e45d74b2f0364a45ac0a11eb3af1687d8ce8f44";
+       version = "0.4.19";
+       sha256 = "e0e71189d3c0848e2c2c59cae80d82979be5d00c25e38a100392022c9ce43ab1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -158702,8 +159664,8 @@ self: {
      }:
      mkDerivation {
        pname = "open-typerep";
-       version = "0.5";
-       sha256 = "8060a300cc6a3f72a0b3aba74574399c112362f74bbc69498203e82dd0986d22";
+       version = "0.6";
+       sha256 = "22f9e8654c243e7f98c110dbf7401c1d0ff3a547e012fa9d10a16ab4853f77b0";
        libraryHaskellDepends = [
          base constraints mtl syntactic tagged template-haskell
        ];
@@ -159016,6 +159978,26 @@ self: {
        license = "GPL";
      }) {};
 
+  "opensource" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-client
+     , http-client-tls, tasty, tasty-hunit, text, transformers
+     }:
+     mkDerivation {
+       pname = "opensource";
+       version = "0.1.0.0";
+       sha256 = "3459b6ce70fb8fc8bdf9d9f6ed0476724cb8a11b673fc60422edac2376620127";
+       libraryHaskellDepends = [
+         aeson base http-client http-client-tls text transformers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring http-client http-client-tls tasty tasty-hunit
+         text transformers
+       ];
+       homepage = "https://api.opensource.org/";
+       description = "Haskell API Wrapper for the Open Source License API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "openssh-github-keys" = callPackage
     ({ mkDerivation, base, directory, dotenv, filepath, hspec
      , keyword-args, octohat, optparse-applicative, parsec, text, unix
@@ -161559,8 +162541,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.2.0.1";
-       sha256 = "44bdbc38d8d7a743951a2333fb70b33a6497b2d50ccdb5696736fdc5133aef21";
+       version = "0.2.1.1";
+       sha256 = "4b90d228a8943e31ad7d2a1861b74bdb98af9422e3e675c209a012ca54e0deaa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -162114,6 +163096,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "paranoia" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, hdaemonize
+     , HsOpenSSL, http-client, http-client-openssl, http-types, network
+     , optparse-applicative, split, streaming-commons, text, time, unix
+     , wai, warp
+     }:
+     mkDerivation {
+       pname = "paranoia";
+       version = "0.1.0.0";
+       sha256 = "57fba4430304c244476c898cf22206077c54f827e698ca7e18cf60a42fe7c2ec";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring directory filepath HsOpenSSL http-client
+         http-client-openssl http-types network split streaming-commons text
+         time unix wai warp
+       ];
+       executableHaskellDepends = [
+         base hdaemonize optparse-applicative
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/troydm/paranoia#readme";
+       description = "http proxy server";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "parco" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -164121,6 +165129,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "perfecthash" = callPackage
+    ({ mkDerivation, array, base, bytestring, cmph, containers, hspec
+     , QuickCheck, time
+     }:
+     mkDerivation {
+       pname = "perfecthash";
+       version = "0.2.0";
+       sha256 = "99274578782539261b153b1f76adce3346157fa41cb6844d6265a70f72e209e3";
+       libraryHaskellDepends = [
+         array base bytestring cmph containers time
+       ];
+       testHaskellDepends = [
+         base bytestring cmph containers hspec QuickCheck
+       ];
+       description = "A perfect hashing library for mapping bytestrings to values";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "period" = callPackage
     ({ mkDerivation, base, hspec, HUnit, old-locale
      , optparse-applicative, parsec, text, text-show, time
@@ -164815,6 +165841,34 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
+  "persistent-audit" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, getopt-generics
+     , hspec, mongoDB, persistent, persistent-mongoDB, persistent-sqlite
+     , persistent-template, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "persistent-audit";
+       version = "0.1.0.1";
+       sha256 = "d610b0614e3005958e5dcaf59fd9e847d36606cbf5dd1af0b43708e39729f956";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base bytestring mongoDB persistent persistent-mongoDB
+         persistent-template text time transformers
+       ];
+       executableHaskellDepends = [
+         attoparsec base bytestring getopt-generics mongoDB persistent
+         persistent-mongoDB persistent-template text time
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring hspec mongoDB persistent
+         persistent-mongoDB persistent-sqlite persistent-template text time
+         transformers
+       ];
+       description = "Parses a Persist Model file and produces Audit Models";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "persistent-cereal" = callPackage
     ({ mkDerivation, base, cereal, persistent, text }:
      mkDerivation {
@@ -166162,7 +167216,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
-  "persistent-template" = callPackage
+  "persistent-template_2_1_6" = callPackage
     ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers
      , ghc-prim, hspec, http-api-data, monad-control, monad-logger
      , path-pieces, persistent, QuickCheck, tagged, template-haskell
@@ -166183,6 +167237,31 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, non-relational, multi-backend persistence";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {};
+
+  "persistent-template" = callPackage
+    ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers
+     , ghc-prim, hspec, http-api-data, monad-control, monad-logger
+     , path-pieces, persistent, QuickCheck, tagged, template-haskell
+     , text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "persistent-template";
+       version = "2.1.8";
+       sha256 = "71fdbbf04cc9f2f9f897eafb71bf6c3243a9cee58942eb381e2ef6b684456a77";
+       libraryHaskellDepends = [
+         aeson aeson-compat base bytestring containers ghc-prim
+         http-api-data monad-control monad-logger path-pieces persistent
+         tagged template-haskell text transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec persistent QuickCheck text transformers
+       ];
+       homepage = "http://www.yesodweb.com/book/persistent";
+       description = "Type-safe, non-relational, multi-backend persistence";
+       license = stdenv.lib.licenses.mit;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -166639,6 +167718,29 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
+  "phoityne-vscode" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, Cabal, cmdargs, conduit
+     , conduit-extra, ConfigFile, containers, directory, filepath
+     , hslogger, hspec, HStringTemplate, MissingH, mtl, parsec, process
+     , resourcet, safe, split, text, transformers
+     }:
+     mkDerivation {
+       pname = "phoityne-vscode";
+       version = "0.0.1.0";
+       sha256 = "17c662ed380004e0268b3b2dc5c467914e74bd479688fd9ce2b66530f49fb07e";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base bytestring Cabal cmdargs conduit conduit-extra
+         ConfigFile containers directory filepath hslogger HStringTemplate
+         MissingH mtl parsec process resourcet safe split text transformers
+       ];
+       testHaskellDepends = [ aeson base hspec ];
+       homepage = "https://sites.google.com/site/phoityne/";
+       description = "ghci debug viewer on Visual Studio Code";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "phone-numbers" = callPackage
     ({ mkDerivation, base, bytestring, phonenumber }:
      mkDerivation {
@@ -167045,16 +168147,17 @@ self: {
 
   "pinchot" = callPackage
     ({ mkDerivation, base, containers, Earley, lens, ListLike
-     , template-haskell, transformers
+     , semigroups, template-haskell, transformers
      }:
      mkDerivation {
        pname = "pinchot";
-       version = "0.16.0.0";
-       sha256 = "b0fef14a482caff2cb1e7985205ec914019996a75960fc1f937d2d8da18b15bd";
+       version = "0.18.0.0";
+       sha256 = "83493be81fe847f04dccd8868f33fedb95f35e4624d99a8e40e41c6eee3a2c9a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers Earley lens ListLike template-haskell transformers
+         base containers Earley lens ListLike semigroups template-haskell
+         transformers
        ];
        homepage = "http://www.github.com/massysett/pinchot";
        description = "Write grammars, not parsers";
@@ -168276,28 +169379,6 @@ self: {
      }) {};
 
   "pipes-transduce" = callPackage
-    ({ mkDerivation, base, bifunctors, bytestring, conceit, doctest
-     , foldl, free, lens-family-core, pipes, pipes-bytestring
-     , pipes-concurrency, pipes-group, pipes-parse, pipes-safe
-     , pipes-text, tasty, tasty-hunit, text, transformers, void
-     }:
-     mkDerivation {
-       pname = "pipes-transduce";
-       version = "0.3.3.0";
-       sha256 = "af40b285eb0e55f8ba17223890b09b4b9cc9b9774d55c7539d878e1d3d68c49b";
-       libraryHaskellDepends = [
-         base bifunctors bytestring conceit foldl free lens-family-core
-         pipes pipes-bytestring pipes-concurrency pipes-group pipes-parse
-         pipes-safe pipes-text text transformers void
-       ];
-       testHaskellDepends = [
-         base doctest foldl free pipes tasty tasty-hunit text
-       ];
-       description = "Interfacing pipes with foldl folds";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-transduce_0_4" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, conceit, doctest
      , foldl, free, microlens, pipes, pipes-bytestring
      , pipes-concurrency, pipes-group, pipes-parse, pipes-safe
@@ -168317,7 +169398,6 @@ self: {
        ];
        description = "Interfacing pipes with foldl folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-vector" = callPackage
@@ -170446,6 +171526,7 @@ self: {
          tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time
          transformers uuid vector
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
@@ -170744,7 +171825,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "postgresql-simple" = callPackage
+  "postgresql-simple_0_5_1_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , bytestring, bytestring-builder, case-insensitive, containers
      , cryptohash, hashable, HUnit, postgresql-libpq, scientific
@@ -170766,6 +171847,31 @@ self: {
        doCheck = false;
        description = "Mid-Level PostgreSQL client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "postgresql-simple" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+     , bytestring, bytestring-builder, case-insensitive, containers
+     , cryptohash, hashable, HUnit, postgresql-libpq, scientific
+     , template-haskell, text, time, transformers, uuid-types, vector
+     }:
+     mkDerivation {
+       pname = "postgresql-simple";
+       version = "0.5.1.3";
+       sha256 = "fadc86b416d0f16b12b8a30a98196ab9b1788d5612cc66e5c871726a861cbc24";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring bytestring-builder
+         case-insensitive containers hashable postgresql-libpq scientific
+         template-haskell text time transformers uuid-types vector
+       ];
+       testHaskellDepends = [
+         aeson base base16-bytestring bytestring containers cryptohash HUnit
+         text time vector
+       ];
+       doCheck = false;
+       description = "Mid-Level PostgreSQL client library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "postgresql-simple-migration" = callPackage
@@ -170843,6 +171949,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "postgresql-transactional" = callPackage
+    ({ mkDerivation, base, monad-control, mtl, postgresql-simple }:
+     mkDerivation {
+       pname = "postgresql-transactional";
+       version = "1.0.0";
+       sha256 = "5d4468f6142628432a6f6ace9485ac441a54f6ce42a99d8efaad6f532a9bfd48";
+       libraryHaskellDepends = [
+         base monad-control mtl postgresql-simple
+       ];
+       description = "a transactional monad on top of postgresql-simple";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "postgresql-typed" = callPackage
     ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring
      , containers, cryptonite, haskell-src-meta, memory, network
@@ -171168,6 +172287,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pred-set" = callPackage
+    ({ mkDerivation, base, hashable, hashtables, HSet }:
+     mkDerivation {
+       pname = "pred-set";
+       version = "0.0.1";
+       sha256 = "cb22ec50f94cf76b6bc55fd66b91badfef657cbe1a6b6a59b691e48004c37726";
+       libraryHaskellDepends = [ base hashable hashtables HSet ];
+       description = "Simple cached predicates";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pred-trie_0_2_0" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck, quickcheck-instances
      , semigroups
@@ -171185,7 +172315,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pred-trie" = callPackage
+  "pred-trie_0_5_0" = callPackage
     ({ mkDerivation, attoparsec, base, composition-extra, deepseq
      , errors, hashable, mtl, poly-arity, QuickCheck
      , quickcheck-instances, semigroups, tasty, tasty-hunit
@@ -171206,6 +172336,31 @@ self: {
        ];
        description = "Predicative tries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "pred-trie" = callPackage
+    ({ mkDerivation, attoparsec, base, composition-extra, containers
+     , deepseq, errors, hashable, hashtables, mtl, poly-arity, pred-set
+     , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, text, tries, unordered-containers
+     }:
+     mkDerivation {
+       pname = "pred-trie";
+       version = "0.5.1";
+       sha256 = "821e1cefa47a3090808af5c39d9997f6471e05aa4f98b46e05eccb9c4a99cdd1";
+       libraryHaskellDepends = [
+         base composition-extra containers hashable hashtables mtl
+         poly-arity pred-set QuickCheck semigroups tries
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         attoparsec base composition-extra deepseq errors hashable mtl
+         poly-arity QuickCheck quickcheck-instances semigroups tasty
+         tasty-hunit tasty-quickcheck text tries unordered-containers
+       ];
+       description = "Predicative tries";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "predicates" = callPackage
@@ -171835,6 +172990,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "prim-spoon" = callPackage
+    ({ mkDerivation, base, ghc-prim, HUnit, QuickCheck, spoon }:
+     mkDerivation {
+       pname = "prim-spoon";
+       version = "0.1.0";
+       sha256 = "3349b21d56c9c635c89b679d805e155cf658a26a675f553cbb261d61b776a27c";
+       libraryHaskellDepends = [ base ghc-prim spoon ];
+       testHaskellDepends = [ base HUnit QuickCheck spoon ];
+       homepage = "https://github.com/michaeljklein/prim-spoon";
+       description = "Catch errors thrown from pure computations using primops";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "prim-uniq" = callPackage
     ({ mkDerivation, base, dependent-sum, primitive }:
      mkDerivation {
@@ -173079,8 +174247,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "3.0.1";
-       sha256 = "6a0e12e90f1c962f477e210f3f99216c1d1a7b1ac2459a7122d04ab1e4fc5263";
+       version = "3.0.3";
+       sha256 = "c0dc9dff49c9062e51fd4e7486fe3d882766633f51110161d56c5011c378ee45";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -173792,7 +174960,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "psqueues" = callPackage
+  "psqueues_0_2_2_0" = callPackage
     ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit
      , QuickCheck, tagged, test-framework, test-framework-hunit
      , test-framework-quickcheck2
@@ -173808,9 +174976,10 @@ self: {
        ];
        description = "Pure priority search queues";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "psqueues_0_2_2_1" = callPackage
+  "psqueues" = callPackage
     ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit
      , QuickCheck, tagged, test-framework, test-framework-hunit
      , test-framework-quickcheck2
@@ -173826,7 +174995,6 @@ self: {
        ];
        description = "Pure priority search queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pub" = callPackage
@@ -174513,50 +175681,6 @@ self: {
      }) {};
 
   "purescript" = callPackage
-    ({ mkDerivation, aeson, aeson-better-errors, ansi-wl-pprint, base
-     , base-compat, bower-json, boxes, bytestring, containers, directory
-     , dlist, edit-distance, filepath, fsnotify, Glob, haskeline, hspec
-     , hspec-discover, http-types, HUnit, language-javascript
-     , lifted-base, monad-control, monad-logger, mtl, network
-     , optparse-applicative, parallel, parsec, pattern-arrows, pipes
-     , pipes-http, process, regex-tdfa, safe, semigroups, sourcemap
-     , split, stm, syb, text, time, transformers, transformers-base
-     , transformers-compat, unordered-containers, utf8-string, vector
-     }:
-     mkDerivation {
-       pname = "purescript";
-       version = "0.8.3.0";
-       sha256 = "3081eb17a8e3a61ef2b41c993b74f29d9e1091a2a7739f3c9c31530b1baebda7";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-better-errors base base-compat bower-json boxes
-         bytestring containers directory dlist edit-distance filepath
-         fsnotify Glob http-types language-javascript lifted-base
-         monad-control monad-logger mtl parallel parsec pattern-arrows pipes
-         pipes-http process regex-tdfa safe semigroups sourcemap split stm
-         syb text time transformers transformers-base transformers-compat
-         unordered-containers utf8-string vector
-       ];
-       executableHaskellDepends = [
-         aeson ansi-wl-pprint base base-compat boxes bytestring containers
-         directory filepath Glob haskeline monad-logger mtl network
-         optparse-applicative parsec process split stm text time
-         transformers transformers-compat utf8-string
-       ];
-       testHaskellDepends = [
-         aeson aeson-better-errors base base-compat boxes bytestring
-         containers directory filepath Glob haskeline hspec hspec-discover
-         HUnit mtl optparse-applicative parsec process stm text time
-         transformers transformers-compat
-       ];
-       doCheck = false;
-       homepage = "http://www.purescript.org/";
-       description = "PureScript Programming Language Compiler";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "purescript_0_8_5_0" = callPackage
     ({ mkDerivation, aeson, aeson-better-errors, ansi-wl-pprint, base
      , base-compat, bower-json, boxes, bytestring, containers, directory
      , dlist, edit-distance, filepath, fsnotify, Glob, haskeline, hspec
@@ -174595,11 +175719,10 @@ self: {
          HUnit mtl optparse-applicative parsec process stm text time
          transformers transformers-compat utf8-string vector
        ];
-       jailbreak = true;
+       doCheck = false;
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "purescript-bridge" = callPackage
@@ -174636,6 +175759,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pursuit-client" = callPackage
+    ({ mkDerivation, base, http-client, lens, taggy-lens, text, wreq }:
+     mkDerivation {
+       pname = "pursuit-client";
+       version = "0.1.0";
+       sha256 = "ac4d1ea126212eaeda65860a27293e7b9301507bd869280d836552e8bb427c35";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base http-client lens taggy-lens text wreq
+       ];
+       executableHaskellDepends = [ base text ];
+       homepage = "https://github.com/soupi/pursuit-client";
+       description = "A cli client for pursuit";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "push-notify" = callPackage
     ({ mkDerivation, aeson, async, attoparsec-conduit, base
      , base16-bytestring, bytestring, cereal, certificate, conduit
@@ -176627,8 +177767,8 @@ self: {
      }:
      mkDerivation {
        pname = "random-variates";
-       version = "0.1.3.0";
-       sha256 = "a2a4a5b450c9d33a60565dfd34645e0af970bcc87e60985c7387eeab75e255c4";
+       version = "0.1.4.0";
+       sha256 = "266a3e0a39914bf15da877e1cf866c263d73be820017d6543445510b16fda554";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -176636,7 +177776,7 @@ self: {
          reinterpret-cast
        ];
        executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base directory HUnit ];
+       testHaskellDepends = [ base directory HUnit random ];
        jailbreak = true;
        homepage = "https://bitbucket.org/kpratt/random-variate";
        description = "\"Uniform RNG => Non-Uniform RNGs\"";
@@ -176995,25 +178135,6 @@ self: {
      }) {};
 
   "ratel" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, http-client, http-client-tls, http-types, tasty
-     , tasty-hspec, text, uuid
-     }:
-     mkDerivation {
-       pname = "ratel";
-       version = "0.1.2";
-       sha256 = "fb84658a310ff52cdff01b2186989929a6deb5e4cd1ed6877357302c3c09fcc1";
-       libraryHaskellDepends = [
-         aeson base bytestring case-insensitive containers http-client
-         http-client-tls http-types text uuid
-       ];
-       testHaskellDepends = [ base tasty tasty-hspec ];
-       homepage = "https://github.com/tfausak/ratel#readme";
-       description = "Notify Honeybadger about exceptions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ratel_0_1_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , containers, http-client, http-client-tls, http-types, tasty
      , tasty-hspec, text, uuid
@@ -177030,26 +178151,9 @@ self: {
        homepage = "https://github.com/tfausak/ratel#readme";
        description = "Notify Honeybadger about exceptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ratel-wai" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , http-client, ratel, wai
-     }:
-     mkDerivation {
-       pname = "ratel-wai";
-       version = "0.1.1";
-       sha256 = "687dde2f720a53d17d60fa3b91bac1bb12b5dd896b5d8603d6f5cfbe1502614c";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers http-client ratel wai
-       ];
-       homepage = "https://github.com/tfausak/ratel-wai#readme";
-       description = "Notify Honeybadger about exceptions via a WAI middleware";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ratel-wai_0_1_2" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , http-client, ratel, wai
      }:
@@ -177063,7 +178167,6 @@ self: {
        homepage = "https://github.com/tfausak/ratel-wai#readme";
        description = "Notify Honeybadger about exceptions via a WAI middleware";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ratio-int" = callPackage
@@ -177610,18 +178713,18 @@ self: {
 
   "reactivity" = callPackage
     ({ mkDerivation, array, base, bmp, bytestring, comctl32, comdlg32
-     , comonad, ConcurrentUtils, containers, gdi32, ghc-prim
-     , list-extras, monad-loops, monads-tf, parallel, random, time
-     , transformers, Win32, winspool
+     , comonad, concurrent-extra, ConcurrentUtils, containers, gdi32
+     , ghc-prim, list-extras, monad-loops, monads-tf, parallel, random
+     , time, transformers, Win32, winspool
      }:
      mkDerivation {
        pname = "reactivity";
-       version = "0.3.0.0";
-       sha256 = "cc86376a74f88b58085252d37622b11917ed9808d07af3aacf86eca8ae31dd12";
+       version = "0.3.1.0";
+       sha256 = "fbf859a63d567967e912a000169edd39b95a271c0f614b334dc78101500f4f06";
        libraryHaskellDepends = [
-         array base bmp bytestring comonad ConcurrentUtils containers
-         ghc-prim list-extras monad-loops monads-tf parallel random time
-         transformers Win32
+         array base bmp bytestring comonad concurrent-extra ConcurrentUtils
+         containers ghc-prim list-extras monad-loops monads-tf parallel
+         random time transformers Win32
        ];
        librarySystemDepends = [ comctl32 comdlg32 gdi32 winspool ];
        homepage = "http://www.alkalisoftware.net/Reactivity.html";
@@ -177755,6 +178858,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "readshp" = callPackage
+    ({ mkDerivation, base, binary, bytestring, data-binary-ieee754
+     , filepath, monad-loops
+     }:
+     mkDerivation {
+       pname = "readshp";
+       version = "0.1.0.0";
+       sha256 = "354f8e8e649110d0da687dcadefe7145f03a7a9b2c0a752023fa9c9a55f6bc36";
+       revision = "1";
+       editedCabalFile = "c8fa843aeed4743a1f664a42097730dd4d5c8f8f7de06f8af26bdf09814efd57";
+       libraryHaskellDepends = [
+         base binary bytestring data-binary-ieee754 filepath monad-loops
+       ];
+       description = "Code for reading ESRI Shapefiles";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "really-simple-xml-parser" = callPackage
     ({ mkDerivation, base, parsec }:
      mkDerivation {
@@ -177805,8 +178925,8 @@ self: {
      }:
      mkDerivation {
        pname = "rebase";
-       version = "0.5.2";
-       sha256 = "a1181002cd0ac9d1cdad0f43095c4432bea5c19169534b99f6d1321f6a9928ab";
+       version = "0.5.3";
+       sha256 = "f5737cb4408b0bf1f19736fa8387d6e92f73d23c49f2455b530232f8f17b64fc";
        libraryHaskellDepends = [
          base base-prelude bifunctors bytestring containers contravariant
          contravariant-extras deepseq dlist either fail hashable mtl
@@ -179241,6 +180361,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "regex-tdfa_1_2_2" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl
+     , parsec, regex-base
+     }:
+     mkDerivation {
+       pname = "regex-tdfa";
+       version = "1.2.2";
+       sha256 = "cb12d675be7b31ed8086d8d022023d03eb553e55dbee6e1b7a4154933d471d39";
+       libraryHaskellDepends = [
+         array base bytestring containers ghc-prim mtl parsec regex-base
+       ];
+       homepage = "https://github.com/ChrisKuklewicz/regex-tdfa";
+       description = "Replaces/Enhances Text.Regex";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "regex-tdfa-pipes" = callPackage
     ({ mkDerivation, array, base, lens, monads-tf, pipes, regex-base
      , regex-tdfa
@@ -179792,8 +180929,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.8.1.0";
-       sha256 = "9b84f39179751df082ad6706f388aa6cb340f000b6a01f8fae11138f9527fa62";
+       version = "0.8.2.0";
+       sha256 = "b7cf3a04b353413c21128dec79569dab465f92d42ad918cc55e44ffe03976735";
        libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text time time-locale-compat
@@ -179832,8 +180969,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-record";
-       version = "0.1.3.0";
-       sha256 = "7f7cf98fce68186028315dade3bf33e8b4bfb57ad1af9c8397e1bd8a1b88e282";
+       version = "0.1.4.0";
+       sha256 = "e38b0ad61798e506ce7ab3bc3b7df3207f2f7cfc80b6d52b39e2281cd534a834";
        libraryHaskellDepends = [
          base persistable-types-HDBC-pg relational-query
          relational-query-HDBC
@@ -181573,10 +182710,8 @@ self: {
      }:
      mkDerivation {
        pname = "rest-core";
-       version = "0.38";
-       sha256 = "b491b734c2d74729f427ca02370f12b839dd92347fea44b5fb66c66a39b11cec";
-       revision = "2";
-       editedCabalFile = "ed51d0cdb0e2562b3d3d03bc87c0da6d8da947ccec0f66307cf9455e82bd39dc";
+       version = "0.39";
+       sha256 = "d760d0547fc1a99cd949dde08b7945fb93af24f4e55d45ecf410c352d5005404";
        libraryHaskellDepends = [
          aeson aeson-utils base base-compat bytestring case-insensitive
          errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat
@@ -181593,24 +182728,23 @@ self: {
      }) {};
 
   "rest-example" = callPackage
-    ({ mkDerivation, aeson, base, containers, generic-aeson
-     , generic-xmlpickler, hxt, json-schema, mtl, rest-core, rest-gen
-     , safe, stm, text, time, transformers, transformers-compat
-     , unordered-containers
+    ({ mkDerivation, aeson, base, base-compat, bytestring, containers
+     , generic-aeson, generic-xmlpickler, hxt, json-schema, mtl
+     , rest-core, rest-gen, safe, stm, text, time, transformers
+     , transformers-compat, unordered-containers
      }:
      mkDerivation {
        pname = "rest-example";
-       version = "0.2.0.3";
-       sha256 = "d71368418eca3128e887198f365b857011017e2515dd30856076b54d185b1a5e";
+       version = "0.2.0.4";
+       sha256 = "22cd99443ad2aa06616d5b47731c83c4650f2601eaedc0d799693752ca1e2832";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base containers generic-aeson generic-xmlpickler hxt
-         json-schema mtl rest-core safe stm text time transformers
-         transformers-compat unordered-containers
+         aeson base base-compat bytestring containers generic-aeson
+         generic-xmlpickler hxt json-schema mtl rest-core safe stm text time
+         transformers transformers-compat unordered-containers
        ];
-       executableHaskellDepends = [ base rest-gen ];
-       jailbreak = true;
+       executableHaskellDepends = [ base base-compat rest-gen ];
        homepage = "http://www.github.com/silkapp/rest";
        description = "Example project for rest";
        license = stdenv.lib.licenses.bsd3;
@@ -181996,10 +183130,8 @@ self: {
      }:
      mkDerivation {
        pname = "rest-gen";
-       version = "0.19.0.2";
-       sha256 = "12caa70e7b29b073cb0e066cf7d5c590b13e0fb5b2f924944cd1ae5217c79330";
-       revision = "2";
-       editedCabalFile = "e4e4528467c593e7cfc6ae2180bfa4a255097f1921a9daa70b46c48c0e84763a";
+       version = "0.19.0.3";
+       sha256 = "9ed4224ed8de81c56000b6814724bfed46f4e7b8890fe5892d308b6edcab2e76";
        libraryHaskellDepends = [
          aeson base base-compat blaze-html Cabal code-builder directory
          fclabels filepath hashable haskell-src-exts HStringTemplate hxt
@@ -182088,7 +183220,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rest-happstack" = callPackage
+  "rest-happstack_0_3_1" = callPackage
     ({ mkDerivation, base, containers, happstack-server, mtl, rest-core
      , rest-gen, utf8-string
      }:
@@ -182101,6 +183233,23 @@ self: {
        libraryHaskellDepends = [
          base containers happstack-server mtl rest-core rest-gen utf8-string
        ];
+       jailbreak = true;
+       description = "Rest driver for Happstack";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rest-happstack" = callPackage
+    ({ mkDerivation, base, containers, happstack-server, mtl, rest-core
+     , rest-gen, utf8-string
+     }:
+     mkDerivation {
+       pname = "rest-happstack";
+       version = "0.3.1.1";
+       sha256 = "794f06eb2c96b995397e21f4578bd7094a20334f43883e97af81dbe60b394ff6";
+       libraryHaskellDepends = [
+         base containers happstack-server mtl rest-core rest-gen utf8-string
+       ];
        description = "Rest driver for Happstack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -182159,7 +183308,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rest-snap" = callPackage
+  "rest-snap_0_2" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, rest-core
      , safe, snap-core, unordered-containers, uri-encode, utf8-string
      }:
@@ -182173,6 +183322,25 @@ self: {
          base bytestring case-insensitive rest-core safe snap-core
          unordered-containers uri-encode utf8-string
        ];
+       jailbreak = true;
+       description = "Rest driver for Snap";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rest-snap" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, case-insensitive
+     , rest-core, safe, snap-core, unordered-containers, uri-encode
+     , utf8-string
+     }:
+     mkDerivation {
+       pname = "rest-snap";
+       version = "0.2.0.1";
+       sha256 = "24ff57b82808aac05a04d8b1e4ac24e5a2a71655991d95415d8a713533c402d5";
+       libraryHaskellDepends = [
+         base base-compat bytestring case-insensitive rest-core safe
+         snap-core unordered-containers uri-encode utf8-string
+       ];
        description = "Rest driver for Snap";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -182366,7 +183534,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rest-wai" = callPackage
+  "rest-wai_0_2" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , http-types, mime-types, mtl, rest-core, text
      , unordered-containers, wai
@@ -182381,6 +183549,25 @@ self: {
          base bytestring case-insensitive containers http-types mime-types
          mtl rest-core text unordered-containers wai
        ];
+       jailbreak = true;
+       description = "Rest driver for WAI applications";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rest-wai" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, case-insensitive
+     , containers, http-types, mime-types, mtl, rest-core, text
+     , unordered-containers, wai
+     }:
+     mkDerivation {
+       pname = "rest-wai";
+       version = "0.2.0.1";
+       sha256 = "38205eb7b85a4e052f11db099dd65e9d952b8533d1a35001f0b1958b443c0d02";
+       libraryHaskellDepends = [
+         base base-compat bytestring case-insensitive containers http-types
+         mime-types mtl rest-core text unordered-containers wai
+       ];
        description = "Rest driver for WAI applications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -183093,6 +184280,37 @@ self: {
        license = "unknown";
      }) {};
 
+  "riak_1_0_1_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, binary, blaze-builder
+     , bytestring, containers, data-default-class, deepseq
+     , enclosed-exceptions, exceptions, hashable, HUnit
+     , mersenne-random-pure64, monad-control, mtl, network
+     , protocol-buffers, pureMD5, QuickCheck, random, random-shuffle
+     , resource-pool, riak-protobuf, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "riak";
+       version = "1.0.1.0";
+       sha256 = "d851130b0e59c4e432c050349c5c288740b6b27cafddc719dccc6c36608f6bde";
+       libraryHaskellDepends = [
+         aeson attoparsec base binary blaze-builder bytestring containers
+         data-default-class deepseq enclosed-exceptions exceptions hashable
+         mersenne-random-pure64 monad-control network protocol-buffers
+         pureMD5 random random-shuffle resource-pool riak-protobuf
+         semigroups text time transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers data-default-class HUnit mtl QuickCheck
+         semigroups tasty tasty-hunit tasty-quickcheck text
+       ];
+       homepage = "http://github.com/markhibberd/riak-haskell-client";
+       description = "A Haskell client for the Riak decentralized data store";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "riak-protobuf_0_20_0_0" = callPackage
     ({ mkDerivation, array, base, parsec, protocol-buffers
      , protocol-buffers-descriptor
@@ -184143,8 +185361,8 @@ self: {
      }:
      mkDerivation {
        pname = "rss-conduit";
-       version = "0.2.0.1";
-       sha256 = "c06317ac567f3a025bd5ba498837a64f0f045a3fa38e4ae36ca9ca76c4aafe3a";
+       version = "0.2.0.2";
+       sha256 = "304a2918743f7b65191ce8c4a57c94b1c3afb2692e5c79d6b0822a05be3294d1";
        libraryHaskellDepends = [
          base conduit conduit-parse containers exceptions foldl lens-simple
          mono-traversable parsers safe text time timerep uri-bytestring
@@ -185339,8 +186557,8 @@ self: {
      }:
      mkDerivation {
        pname = "satchmo";
-       version = "2.9.9.1";
-       sha256 = "3414dcc5184cd34bce55eb041ff84f8985672964c64786d146b9520237ee13e2";
+       version = "2.9.9.3";
+       sha256 = "8a4dc9b233326e6742f7fe1e7d7d8c9fbc705b0341fe68908a26b2378ce2224f";
        libraryHaskellDepends = [
          array async base bytestring containers deepseq directory hashable
          lens memoize minisat mtl process transformers
@@ -187924,6 +189142,8 @@ self: {
        pname = "semigroups";
        version = "0.18.1";
        sha256 = "ae7607fb2b497a53192c378dc84c00b45610fdc5de0ac8c1ac3234ec7acee807";
+       revision = "1";
+       editedCabalFile = "7dd2b3dcc9517705391c1c6a0b51eba1da605b554f9817255c4a1a1df4d4ae3d";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq hashable tagged text
          transformers unordered-containers
@@ -188668,7 +189888,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "servant" = callPackage
+  "servant_0_4_4_7" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring
      , bytestring-conversion, case-insensitive, directory, doctest
      , filemanip, filepath, hspec, http-media, http-types, network-uri
@@ -188692,6 +189912,34 @@ self: {
        homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "servant" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
+     , bytestring-conversion, case-insensitive, directory, doctest
+     , filemanip, filepath, hspec, http-api-data, http-media, http-types
+     , network-uri, QuickCheck, quickcheck-instances, string-conversions
+     , text, url, vault
+     }:
+     mkDerivation {
+       pname = "servant";
+       version = "0.6.1";
+       sha256 = "830154335052270314be49644db3a88665b1910d1678ff35337a9b3caabaab3a";
+       libraryHaskellDepends = [
+         aeson attoparsec base base-compat bytestring bytestring-conversion
+         case-insensitive http-api-data http-media http-types network-uri
+         string-conversions text vault
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bytestring directory doctest filemanip
+         filepath hspec QuickCheck quickcheck-instances string-conversions
+         text url
+       ];
+       doCheck = false;
+       homepage = "http://haskell-servant.github.io/";
+       description = "A family of combinators for defining webservices APIs";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "servant_0_7" = callPackage
@@ -188737,6 +189985,7 @@ self: {
        executableHaskellDepends = [
          base JuicyPixels servant servant-server wai warp
        ];
+       jailbreak = true;
        homepage = "https://github.com/tvh/servant-JuicyPixels";
        description = "servant-JuicyPixels";
        license = stdenv.lib.licenses.gpl3;
@@ -188759,6 +190008,7 @@ self: {
        executableHaskellDepends = [
          base JuicyPixels servant servant-server wai warp
        ];
+       jailbreak = true;
        homepage = "https://github.com/tvh/servant-JuicyPixels";
        description = "Servant support for JuicyPixels";
        license = stdenv.lib.licenses.bsd3;
@@ -188781,6 +190031,7 @@ self: {
        executableHaskellDepends = [
          base JuicyPixels servant servant-server wai warp
        ];
+       jailbreak = true;
        homepage = "https://github.com/tvh/servant-JuicyPixels";
        description = "Servant support for JuicyPixels";
        license = stdenv.lib.licenses.bsd3;
@@ -188795,6 +190046,8 @@ self: {
        pname = "servant-JuicyPixels";
        version = "0.3.0.2";
        sha256 = "34ed22ef256d7ff3af3fff56484261448928f140b1b4287965619fe6b10b3ebd";
+       revision = "1";
+       editedCabalFile = "896414688b7da96443399f111448da3cb7861618eab516590dce96e394c744ea";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -188815,6 +190068,21 @@ self: {
        version = "0.4.4.6";
        sha256 = "ef7ec4007b43679fd50133c097afb3ed33f64696fb44b03a281160384f693f91";
        libraryHaskellDepends = [ base blaze-html http-media servant ];
+       jailbreak = true;
+       homepage = "http://haskell-servant.github.io/";
+       description = "Blaze-html support for servant";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "servant-blaze_0_4_4_7" = callPackage
+    ({ mkDerivation, base, blaze-html, http-media, servant }:
+     mkDerivation {
+       pname = "servant-blaze";
+       version = "0.4.4.7";
+       sha256 = "5f3648d0831de475364c9570b527041d5a5a26ea6257b44f2e140509ba8c0b60";
+       libraryHaskellDepends = [ base blaze-html http-media servant ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "Blaze-html support for servant";
        license = stdenv.lib.licenses.bsd3;
@@ -188825,8 +190093,8 @@ self: {
     ({ mkDerivation, base, blaze-html, http-media, servant }:
      mkDerivation {
        pname = "servant-blaze";
-       version = "0.4.4.7";
-       sha256 = "5f3648d0831de475364c9570b527041d5a5a26ea6257b44f2e140509ba8c0b60";
+       version = "0.6.1";
+       sha256 = "f34b45f7c15f53858034052bc0e662ce884ca2c231bc7f3fecc69bc8763f209f";
        libraryHaskellDepends = [ base blaze-html http-media servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Blaze-html support for servant";
@@ -188907,6 +190175,7 @@ self: {
          http-types HUnit network QuickCheck servant servant-server text wai
          warp
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
@@ -188934,6 +190203,7 @@ self: {
          http-types HUnit network QuickCheck servant servant-server text wai
          warp
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
@@ -188961,6 +190231,7 @@ self: {
          http-types HUnit network QuickCheck servant servant-server text wai
          warp
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
@@ -188988,6 +190259,7 @@ self: {
          http-types HUnit network QuickCheck servant servant-server text wai
          warp
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
@@ -189015,13 +190287,14 @@ self: {
          http-types HUnit network QuickCheck servant servant-server text wai
          warp
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "servant-client" = callPackage
+  "servant-client_0_4_4_7" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq
      , either, exceptions, hspec, http-client, http-client-tls
      , http-media, http-types, HUnit, network, network-uri, QuickCheck
@@ -189042,6 +190315,36 @@ self: {
          http-types HUnit network QuickCheck servant servant-server text wai
          warp
        ];
+       jailbreak = true;
+       homepage = "http://haskell-servant.github.io/";
+       description = "automatical derivation of querying functions for servant webservices";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "servant-client" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , bytestring, deepseq, exceptions, hspec, http-api-data
+     , http-client, http-client-tls, http-media, http-types, HUnit
+     , network, network-uri, QuickCheck, safe, servant, servant-server
+     , string-conversions, text, transformers, transformers-compat, wai
+     , warp
+     }:
+     mkDerivation {
+       pname = "servant-client";
+       version = "0.6.1";
+       sha256 = "3b2724cd01fd60c10132b4c20384e5bc734f2e46b03db9b6a0f6d4b947decee4";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring bytestring exceptions
+         http-api-data http-client http-client-tls http-media http-types
+         network-uri safe servant string-conversions text transformers
+         transformers-compat
+       ];
+       testHaskellDepends = [
+         aeson base bytestring deepseq hspec http-client http-media
+         http-types HUnit network QuickCheck servant servant-server text
+         transformers transformers-compat wai warp
+       ];
        homepage = "http://haskell-servant.github.io/";
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
@@ -189078,17 +190381,19 @@ self: {
      }) {};
 
   "servant-csharp" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath
-     , haskell-src-exts, heredocs, http-types, lens, servant
-     , servant-foreign, text, time, uuid, uuid-types
+    ({ mkDerivation, aeson, base, bytestring, directory, filepath
+     , heredocs, http-types, lens, mtl, servant, servant-foreign
+     , servant-swagger, swagger2, text, time, unordered-containers, uuid
+     , uuid-types
      }:
      mkDerivation {
        pname = "servant-csharp";
-       version = "0.0.7.1";
-       sha256 = "98bb40bf02a4ed672fe50c1c5c90901e61ebe5ade8d639a1dfdee215ce1de4ff";
+       version = "0.0.8.1";
+       sha256 = "a715c53a3684f1e7f33d96f6b3fad006edfce6c029eb810d33647ffc180c097d";
        libraryHaskellDepends = [
-         base bytestring directory filepath haskell-src-exts heredocs
-         http-types lens servant servant-foreign text time uuid uuid-types
+         aeson base bytestring directory filepath heredocs http-types lens
+         mtl servant servant-foreign servant-swagger swagger2 text time
+         unordered-containers uuid uuid-types
        ];
        jailbreak = true;
        homepage = "https://github.com/cutsea110/servant-csharp.git";
@@ -189142,6 +190447,7 @@ self: {
        testHaskellDepends = [
          aeson base hspec lens servant string-conversions
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
@@ -189171,6 +190477,7 @@ self: {
        testHaskellDepends = [
          aeson base hspec lens servant string-conversions
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
@@ -189200,6 +190507,7 @@ self: {
        testHaskellDepends = [
          aeson base hspec lens servant string-conversions
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
@@ -189229,6 +190537,7 @@ self: {
        testHaskellDepends = [
          aeson base hspec lens servant string-conversions
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
@@ -189258,13 +190567,14 @@ self: {
        testHaskellDepends = [
          aeson base hspec lens servant string-conversions
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "servant-docs" = callPackage
+  "servant-docs_0_4_4_7" = callPackage
     ({ mkDerivation, aeson, base, bytestring, bytestring-conversion
      , case-insensitive, hashable, hspec, http-media, http-types, lens
      , servant, string-conversions, text, unordered-containers
@@ -189287,6 +190597,37 @@ self: {
        testHaskellDepends = [
          aeson base hspec lens servant string-conversions
        ];
+       jailbreak = true;
+       homepage = "http://haskell-servant.github.io/";
+       description = "generate API docs for your servant webservice";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "servant-docs" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring
+     , bytestring-conversion, case-insensitive, control-monad-omega
+     , hashable, hspec, http-media, http-types, lens, servant
+     , string-conversions, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "servant-docs";
+       version = "0.6.1";
+       sha256 = "66604bcbeee4f84847d64fb7ed127eb4f32570d16a33aa24adf2684688aae33b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring bytestring-conversion
+         case-insensitive control-monad-omega hashable http-media http-types
+         lens servant string-conversions text unordered-containers
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring-conversion lens servant string-conversions
+         text
+       ];
+       testHaskellDepends = [
+         aeson base hspec lens servant string-conversions
+       ];
        homepage = "http://haskell-servant.github.io/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
@@ -189395,6 +190736,19 @@ self: {
      }) {};
 
   "servant-foreign" = callPackage
+    ({ mkDerivation, base, hspec, http-types, lens, servant, text }:
+     mkDerivation {
+       pname = "servant-foreign";
+       version = "0.6.1";
+       sha256 = "de131f3538d9e01a5c9a8c57ee85a22753fa25e80f98031e0c2947c5aca9b324";
+       libraryHaskellDepends = [ base http-types lens servant text ];
+       testHaskellDepends = [ base hspec ];
+       description = "Helpers for generating clients for servant APIs in any programming language";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "servant-foreign_0_7" = callPackage
     ({ mkDerivation, base, hspec, http-types, lens, servant, text }:
      mkDerivation {
        pname = "servant-foreign";
@@ -189449,6 +190803,7 @@ self: {
          http-client-tls http-media http-types HUnit network QuickCheck
          servant servant-server text wai warp
        ];
+       jailbreak = true;
        homepage = "http://github.com/ElvishJerricco/servant-haxl-client/";
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
@@ -189493,6 +190848,7 @@ self: {
        testHaskellDepends = [
          base hspec hspec-expectations language-ecmascript lens servant
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "Automatically derive (jquery) javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
@@ -189517,6 +190873,7 @@ self: {
        testHaskellDepends = [
          base hspec hspec-expectations language-ecmascript lens servant
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "Automatically derive (jquery) javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
@@ -189541,6 +190898,7 @@ self: {
        testHaskellDepends = [
          base hspec hspec-expectations language-ecmascript lens servant
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "Automatically derive (jquery) javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
@@ -189565,6 +190923,7 @@ self: {
        testHaskellDepends = [
          base hspec hspec-expectations language-ecmascript lens servant
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "Automatically derive (jquery) javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
@@ -189589,6 +190948,7 @@ self: {
        testHaskellDepends = [
          base hspec hspec-expectations language-ecmascript lens servant
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "Automatically derive (jquery) javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
@@ -189613,12 +190973,41 @@ self: {
        testHaskellDepends = [
          base hspec hspec-expectations language-ecmascript lens servant
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "Automatically derive (jquery) javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "servant-js" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, charset, filepath, hspec
+     , hspec-expectations, language-ecmascript, lens, servant
+     , servant-foreign, servant-server, stm, text, transformers, warp
+     }:
+     mkDerivation {
+       pname = "servant-js";
+       version = "0.6.1";
+       sha256 = "8bafcd5632bb49346280a1922e1708e55da639c485347d0566724445e2854611";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat charset lens servant-foreign text
+       ];
+       executableHaskellDepends = [
+         aeson base filepath lens servant servant-server stm transformers
+         warp
+       ];
+       testHaskellDepends = [
+         base base-compat hspec hspec-expectations language-ecmascript lens
+         servant text
+       ];
+       homepage = "http://haskell-servant.github.io/";
+       description = "Automatically derive javascript functions to query servant webservices";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "servant-js_0_7" = callPackage
     ({ mkDerivation, aeson, base, base-compat, charset, filepath, hspec
      , hspec-expectations, language-ecmascript, lens, servant
      , servant-foreign, servant-server, stm, text, transformers, warp
@@ -189661,13 +191050,14 @@ self: {
      }) {};
 
   "servant-mock" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, http-types, QuickCheck
-     , servant, servant-server, transformers, wai, warp
+    ({ mkDerivation, aeson, base, bytestring, bytestring-conversion
+     , hspec, hspec-wai, http-types, QuickCheck, servant, servant-server
+     , transformers, wai, warp
      }:
      mkDerivation {
        pname = "servant-mock";
-       version = "0.4.4.7";
-       sha256 = "d8fdc27bc4bc347d1fc31e125c29f0d786e44abc567a7187b757d0c6563d75c0";
+       version = "0.6.1";
+       sha256 = "c612d546f82f0b633cab8396c71583f0866034abd9c3f2462fce3faec9006621";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -189677,6 +191067,10 @@ self: {
        executableHaskellDepends = [
          aeson base QuickCheck servant-server warp
        ];
+       testHaskellDepends = [
+         aeson base bytestring-conversion hspec hspec-wai QuickCheck servant
+         servant-server wai
+       ];
        homepage = "http://github.com/haskell-servant/servant";
        description = "Derive a mock server for free from your servant API types";
        license = stdenv.lib.licenses.bsd3;
@@ -190047,7 +191441,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "servant-server" = callPackage
+  "servant-server_0_4_4_7" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring
      , bytestring-conversion, directory, doctest, either, exceptions
      , filemanip, filepath, hspec, hspec-wai, http-types, mmorph, mtl
@@ -190073,6 +191467,43 @@ self: {
          network parsec QuickCheck servant string-conversions temporary text
          transformers wai wai-extra warp
        ];
+       jailbreak = true;
+       homepage = "http://haskell-servant.github.io/";
+       description = "A family of combinators for defining webservices APIs and serving them";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "servant-server" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-compat
+     , base64-bytestring, bytestring, bytestring-conversion, containers
+     , directory, doctest, exceptions, filemanip, filepath, hspec
+     , hspec-wai, http-api-data, http-types, mmorph, mtl, network
+     , network-uri, parsec, QuickCheck, safe, servant
+     , should-not-typecheck, split, string-conversions, system-filepath
+     , temporary, text, transformers, transformers-compat, wai
+     , wai-app-static, wai-extra, warp, word8
+     }:
+     mkDerivation {
+       pname = "servant-server";
+       version = "0.6.1";
+       sha256 = "4d1b0871008945009bf4d4756108cc1376edbd08e49ce96d9c1365d9b382ec07";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base base-compat base64-bytestring bytestring
+         containers filepath http-api-data http-types mmorph mtl network
+         network-uri safe servant split string-conversions system-filepath
+         text transformers transformers-compat wai wai-app-static warp word8
+       ];
+       executableHaskellDepends = [ aeson base servant text wai warp ];
+       testHaskellDepends = [
+         aeson base base-compat base64-bytestring bytestring
+         bytestring-conversion directory doctest exceptions filemanip
+         filepath hspec hspec-wai http-types mtl network parsec QuickCheck
+         safe servant should-not-typecheck string-conversions temporary text
+         transformers transformers-compat wai wai-extra warp
+       ];
        homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
@@ -190195,8 +191626,8 @@ self: {
        pname = "servant-yaml";
        version = "0.1.0.0";
        sha256 = "c917d9b046b06a9c4386f743a78142c27cf7f0ec1ad8562770ab9828f2ee3204";
-       revision = "5";
-       editedCabalFile = "49eac863eece8a51ed250931103972dae2bf1551a4d6cb5d55c5d4ae65cb24b3";
+       revision = "6";
+       editedCabalFile = "a9fa85d3e31c0057aa1144044436cc833a1a46165760b03e00e4c23bce578cb0";
        libraryHaskellDepends = [
          base bytestring http-media servant yaml
        ];
@@ -191462,6 +192893,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring css-text hjsmin shake text
        ];
+       jailbreak = true;
        homepage = "https://github.com/LukeHoersten/shake-minify";
        description = "Shake Minify Rules";
        license = stdenv.lib.licenses.bsd3;
@@ -191785,7 +193217,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
-  "shakespeare" = callPackage
+  "shakespeare_2_0_8_1" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
      , process, scientific, template-haskell, text, time, transformers
@@ -191808,10 +193240,11 @@ self: {
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "A toolkit for making compile-time interpolated templates";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
-  "shakespeare_2_0_8_2" = callPackage
+  "shakespeare" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
      , process, scientific, template-haskell, text, time, transformers
@@ -191834,7 +193267,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "A toolkit for making compile-time interpolated templates";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -192440,7 +193872,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "shelly" = callPackage
+  "shelly_1_6_5" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
      , enclosed-exceptions, exceptions, hspec, HUnit, lifted-async
      , lifted-base, monad-control, mtl, process, system-fileio
@@ -192469,9 +193901,10 @@ self: {
        homepage = "https://github.com/yesodweb/Shelly.hs";
        description = "shell-like (systems) programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "shelly_1_6_6" = callPackage
+  "shelly" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
      , enclosed-exceptions, exceptions, hspec, HUnit, lifted-async
      , lifted-base, monad-control, mtl, process, system-fileio
@@ -192499,7 +193932,6 @@ self: {
        homepage = "https://github.com/yesodweb/Shelly.hs";
        description = "shell-like (systems) programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shelly-extra" = callPackage
@@ -193741,6 +195173,8 @@ self: {
        pname = "simplex-basic";
        version = "0.0.0.1";
        sha256 = "f8a30128d4e16714f75fee3b16fd3d4b24832a30f17ff29936a1c5a066b60ba0";
+       revision = "1";
+       editedCabalFile = "5f5008bcffb4338739343d6ab9e7f47e0d1c35ec5d606dbdbb9f02943de2b7a1";
        libraryHaskellDepends = [
          base bifunctors linear-grammar mtl QuickCheck transformers
        ];
@@ -194969,6 +196403,7 @@ self: {
          aeson base either lens servant servant-client servant-docs text
          time
        ];
+       jailbreak = true;
        homepage = "https://github.com/GetShopTV/smsaero";
        description = "SMSAero API and HTTP client based on servant library";
        license = stdenv.lib.licenses.bsd3;
@@ -197379,8 +198814,8 @@ self: {
      }:
      mkDerivation {
        pname = "solr";
-       version = "0.3";
-       sha256 = "7cc47e9998197624cb78adb5bec4dabec4febf11cda876cecac56dd0a4d5ef66";
+       version = "0.3.1";
+       sha256 = "9bee7a32661231a132491cf361140d40d3a810bd72763abebcee97bfbdd06e66";
        libraryHaskellDepends = [
          base-prelude bytestring bytestring-tree-builder case-insensitive
          contravariant http-client http-response-decoder json-encoder
@@ -197746,6 +199181,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sparkle" = callPackage
+    ({ mkDerivation, base, binary, bytestring, distributed-closure
+     , filepath, inline-java, process, regex-tdfa, singletons, text
+     , vector, zip-archive
+     }:
+     mkDerivation {
+       pname = "sparkle";
+       version = "0.1";
+       sha256 = "91e7c8309028201b55d0174b0f6882ada77c41ae4ede94ffc422c48b80c68fb2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring distributed-closure inline-java singletons
+         text vector
+       ];
+       executableHaskellDepends = [
+         base bytestring filepath process regex-tdfa text zip-archive
+       ];
+       description = "Distributed Apache Spark applications in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sparse" = callPackage
     ({ mkDerivation, base, bytestring, containers, contravariant
      , deepseq, directory, doctest, filepath, hlint, hybrid-vectors
@@ -198330,6 +199787,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "split_0_2_3_1" = callPackage
+    ({ mkDerivation, base, QuickCheck }:
+     mkDerivation {
+       pname = "split";
+       version = "0.2.3.1";
+       sha256 = "7615b60adee20c19ddafd9d74456e8fe8e4274e2c676a5e858511b664205c688";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck ];
+       description = "Combinator library for splitting lists";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "split-channel" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -198664,10 +200134,8 @@ self: {
     ({ mkDerivation, base, QuickCheck, quickcheck-simple }:
      mkDerivation {
        pname = "sql-words";
-       version = "0.1.3.1";
-       sha256 = "c9ce5f8402cdfc610e3d58774ad5c3aedaa6f4d0e7724937ecd97a654351b59d";
-       revision = "1";
-       editedCabalFile = "6de32c6b306d3b438564e263deb20c68698a5cdaa198a3d711ee768954608e17";
+       version = "0.1.4.0";
+       sha256 = "4ae839c4e1d47d2cd6a6b06ff8301473bcf12cbc5b3efa5fa59e1300797b1716";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck quickcheck-simple ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
@@ -199817,8 +201285,8 @@ self: {
        pname = "stack";
        version = "1.0.4.3";
        sha256 = "2a445ff671cfd75ccf3185c52832298598dc03dbfbede2b7be21237f63c305b2";
-       revision = "2";
-       editedCabalFile = "a2cedd499125c5380a6f2e7f7a57c6b67e330e07ecd5e95114b83cefe7975e3f";
+       revision = "4";
+       editedCabalFile = "a1315a0d9d005e7e93d6c0893eec2f2d055dda364543edf7b9e172c8d54d7ae2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -200866,7 +202334,7 @@ self: {
        license = "GPL";
      }) {};
 
-  "stateWriter" = callPackage
+  "stateWriter_0_2_6" = callPackage
     ({ mkDerivation, base, free, hspec, mtl, QuickCheck, transformers
      }:
      mkDerivation {
@@ -200877,9 +202345,10 @@ self: {
        testHaskellDepends = [ base free hspec mtl QuickCheck ];
        description = "A faster variant of the RWS monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stateWriter_0_2_7" = callPackage
+  "stateWriter" = callPackage
     ({ mkDerivation, base, free, hspec, mtl, QuickCheck, transformers
      }:
      mkDerivation {
@@ -200890,7 +202359,6 @@ self: {
        testHaskellDepends = [ base free hspec mtl QuickCheck ];
        description = "A faster variant of the RWS monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "statechart" = callPackage
@@ -202063,6 +203531,7 @@ self: {
        sha256 = "17f488ef8e74a9dc4ad7e8a649abc386d010379a9b63f88d52638a078fbc16f6";
        libraryHaskellDepends = [ base clock transformers ];
        testHaskellDepends = [ base clock hspec ];
+       jailbreak = true;
        homepage = "https://github.com/debug-ito/stopwatch";
        description = "A simple stopwatch utility";
        license = stdenv.lib.licenses.bsd3;
@@ -202746,7 +204215,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "streaming-commons" = callPackage
+  "streaming-commons_0_1_15_2" = callPackage
     ({ mkDerivation, array, async, base, blaze-builder, bytestring
      , deepseq, directory, hspec, network, process, QuickCheck, random
      , stm, text, transformers, unix, zlib
@@ -202766,9 +204235,10 @@ self: {
        homepage = "https://github.com/fpco/streaming-commons";
        description = "Common lower-level functions needed by various streaming data libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "streaming-commons_0_1_15_4" = callPackage
+  "streaming-commons" = callPackage
     ({ mkDerivation, array, async, base, blaze-builder, bytestring
      , deepseq, directory, hspec, network, process, QuickCheck, random
      , stm, text, transformers, unix, zlib
@@ -202788,7 +204258,6 @@ self: {
        homepage = "https://github.com/fpco/streaming-commons";
        description = "Common lower-level functions needed by various streaming data libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-histogram" = callPackage
@@ -206227,6 +207696,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "table-layout" = callPackage
+    ({ mkDerivation, base, data-default-class
+     , data-default-instances-base, hspec, HUnit, QuickCheck
+     }:
+     mkDerivation {
+       pname = "table-layout";
+       version = "0.5.1.1";
+       sha256 = "11c47bed5d8c6dd6d003dad96f80ad9e6a5bcc0566aefd8ff97afa3889950b11";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base data-default-class data-default-instances-base
+       ];
+       executableHaskellDepends = [
+         base data-default-class data-default-instances-base
+       ];
+       testHaskellDepends = [
+         base data-default-class data-default-instances-base hspec HUnit
+         QuickCheck
+       ];
+       homepage = "https://github.com/muesli4/table-layout";
+       description = "Layout text as grid or table";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "table-tennis" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -206470,7 +207964,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tagged" = callPackage
+  "tagged_0_8_3" = callPackage
     ({ mkDerivation, base, deepseq, template-haskell }:
      mkDerivation {
        pname = "tagged";
@@ -206480,9 +207974,10 @@ self: {
        homepage = "http://github.com/ekmett/tagged";
        description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tagged_0_8_4" = callPackage
+  "tagged" = callPackage
     ({ mkDerivation, base, deepseq, template-haskell }:
      mkDerivation {
        pname = "tagged";
@@ -206492,7 +207987,6 @@ self: {
        homepage = "http://github.com/ekmett/tagged";
        description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagged-binary" = callPackage
@@ -206853,6 +208347,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tai64" = callPackage
+    ({ mkDerivation, attoparsec, base, base16-bytestring, binary
+     , bytestring, doctest, QuickCheck, text, time, vector
+     }:
+     mkDerivation {
+       pname = "tai64";
+       version = "0.1.0.3";
+       sha256 = "9ac6b2e3130bd5c61b62a30601d4f59e64b659065c23d99d27e8dcb594b8c83b";
+       libraryHaskellDepends = [
+         attoparsec base base16-bytestring binary bytestring QuickCheck text
+         time vector
+       ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "https://github.com/kim/tai64";
+       description = "Tai64 Labels for Haskell";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "takahashi" = callPackage
     ({ mkDerivation, base, lens, monad-skeleton, mtl }:
      mkDerivation {
@@ -207074,7 +208586,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tar" = callPackage
+  "tar_0_5_0_1" = callPackage
     ({ mkDerivation, array, base, bytestring, bytestring-handle
      , containers, deepseq, directory, filepath, QuickCheck, tasty
      , tasty-quickcheck, time
@@ -207092,9 +208604,30 @@ self: {
        ];
        description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tardis" = callPackage
+  "tar" = callPackage
+    ({ mkDerivation, array, base, bytestring, bytestring-handle
+     , containers, deepseq, directory, filepath, QuickCheck, tasty
+     , tasty-quickcheck, time
+     }:
+     mkDerivation {
+       pname = "tar";
+       version = "0.5.0.2";
+       sha256 = "777b2410653632ee4f727df49b1829b3688e5f76bcdd04c6f3962a06566a0e18";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq directory filepath time
+       ];
+       testHaskellDepends = [
+         array base bytestring bytestring-handle containers deepseq
+         directory filepath QuickCheck tasty tasty-quickcheck time
+       ];
+       description = "Reading, writing and manipulating \".tar\" archive files.";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "tardis_0_3_0_0" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
        pname = "tardis";
@@ -207104,6 +208637,19 @@ self: {
        homepage = "https://github.com/DanBurton/tardis";
        description = "Bidirectional state monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "tardis" = callPackage
+    ({ mkDerivation, base, mmorph, mtl }:
+     mkDerivation {
+       pname = "tardis";
+       version = "0.4.1.0";
+       sha256 = "e672abadd75055c2372d722c98058f7f3403fcca18258565d1cdd8e0dc25a5d9";
+       libraryHaskellDepends = [ base mmorph mtl ];
+       homepage = "https://github.com/DanBurton/tardis";
+       description = "Bidirectional state monad transformer";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "target" = callPackage
@@ -207277,7 +208823,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tasty" = callPackage
+  "tasty_0_11_0_2" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, clock, containers
      , deepseq, mtl, optparse-applicative, regex-tdfa-rc, stm, tagged
      , unbounded-delays
@@ -207293,6 +208839,25 @@ self: {
        homepage = "http://documentup.com/feuerbach/tasty";
        description = "Modern and extensible testing framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "tasty" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, clock, containers
+     , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
+     , unbounded-delays
+     }:
+     mkDerivation {
+       pname = "tasty";
+       version = "0.11.0.3";
+       sha256 = "ca51533c3b6fb36a63b7a6062d71024e3a823ae173779c1c81850959e29e7efa";
+       libraryHaskellDepends = [
+         ansi-terminal async base clock containers deepseq mtl
+         optparse-applicative regex-tdfa stm tagged unbounded-delays
+       ];
+       homepage = "http://documentup.com/feuerbach/tasty";
+       description = "Modern and extensible testing framework";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "tasty-ant-xml_1_0_1" = callPackage
@@ -207331,13 +208896,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "tasty-dejafu" = callPackage
+  "tasty-dejafu_0_2_0_0" = callPackage
     ({ mkDerivation, base, dejafu, tasty }:
      mkDerivation {
        pname = "tasty-dejafu";
        version = "0.2.0.0";
        sha256 = "cba0315e6c6b2946ada0e48ea6f443f20bc8421810b0c334d1b095be0d1453ae";
        libraryHaskellDepends = [ base dejafu tasty ];
+       jailbreak = true;
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Deja Fu support for the Tasty test framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "tasty-dejafu" = callPackage
+    ({ mkDerivation, base, dejafu, tagged, tasty }:
+     mkDerivation {
+       pname = "tasty-dejafu";
+       version = "0.3.0.0";
+       sha256 = "ab6c83eadf59c4a1f6f302694dbff61c7c9dc398c66d83c8b8eec161b84c3c62";
+       libraryHaskellDepends = [ base dejafu tagged tasty ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
@@ -209256,7 +210835,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "testing-feat" = callPackage
+  "testing-feat_0_4_0_2" = callPackage
     ({ mkDerivation, base, mtl, QuickCheck, tagshare, template-haskell
      }:
      mkDerivation {
@@ -209270,9 +210849,10 @@ self: {
        ];
        description = "Functional Enumeration of Algebraic Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "testing-feat_0_4_0_3" = callPackage
+  "testing-feat" = callPackage
     ({ mkDerivation, base, mtl, QuickCheck, tagshare, template-haskell
      }:
      mkDerivation {
@@ -209284,7 +210864,6 @@ self: {
        ];
        description = "Functional Enumeration of Algebraic Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "testing-type-modifiers" = callPackage
@@ -209702,7 +211281,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "texmath" = callPackage
+  "texmath_0_8_6_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , mtl, network-uri, pandoc-types, parsec, process, split, syb
      , temporary, text, utf8-string, xml
@@ -209724,9 +211303,10 @@ self: {
        homepage = "http://github.com/jgm/texmath";
        description = "Conversion between formats used to represent mathematics";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "texmath_0_8_6_2" = callPackage
+  "texmath" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , mtl, network-uri, pandoc-types, parsec, process, split, syb
      , temporary, text, utf8-string, xml
@@ -209748,7 +211328,6 @@ self: {
        homepage = "http://github.com/jgm/texmath";
        description = "Conversion between formats used to represent mathematics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "texrunner" = callPackage
@@ -210420,8 +211999,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-show-instances";
-       version = "3.2";
-       sha256 = "8362074b2e81eca771356f43dc01e5647a9518291987da76d75810346d0f1e1e";
+       version = "3.2.1";
+       sha256 = "33433b9d15d43254e1dbca31fdf226579a77c8c12e98e76a29a566703a000c68";
        libraryHaskellDepends = [
          base base-compat bifunctors binary bytestring containers directory
          haskeline hoopl hpc old-locale old-time pretty random semigroups
@@ -211279,7 +212858,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "th-reify-many" = callPackage
+  "th-reify-many_0_1_4" = callPackage
     ({ mkDerivation, base, containers, mtl, safe, template-haskell
      , th-expand-syns
      }:
@@ -211294,6 +212873,24 @@ self: {
        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-reify-many" = callPackage
+    ({ mkDerivation, base, containers, mtl, safe, template-haskell
+     , th-expand-syns
+     }:
+     mkDerivation {
+       pname = "th-reify-many";
+       version = "0.1.4.1";
+       sha256 = "b087a6e532de9350c140e364d43fe07e6f42c14625646c309aef67ef6391ea7f";
+       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;
      }) {};
 
   "th-sccs" = callPackage
@@ -211556,8 +213153,10 @@ self: {
     ({ mkDerivation, atomic-primops, base, containers }:
      mkDerivation {
        pname = "thread-local-storage";
-       version = "0.1.0.3";
-       sha256 = "74ccc31b79a3a0b087b654185ddafc42ac4609846213c670495f70fd7bee464d";
+       version = "0.1.0.4";
+       sha256 = "3e87f35f3cabfedbd39810f33b7b167832aac008f4f458a2b2411349506b8239";
+       revision = "1";
+       editedCabalFile = "3bba7e8933033aa92c2767ccee383d84cc36a791773aff56d51ea95ecf12d90f";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ atomic-primops base containers ];
        description = "Several options for thread-local-storage (TLS) in Haskell";
@@ -212484,7 +214083,6 @@ self: {
        version = "0.1.0";
        sha256 = "dee2b3f214f36c6fb3f6d4d0a73954485404b7535965cb59ab1715fb17b9dcae";
        libraryHaskellDepends = [ base clock timelike transformers ];
-       jailbreak = true;
        homepage = "http://hub.darcs.net/esz/timelike-clock";
        description = "Timelike interface for the clock library";
        license = stdenv.lib.licenses.asl20;
@@ -213747,8 +215345,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "total-map";
-       version = "0.0.4";
-       sha256 = "282de643c4b34e1a5eabc89a0c1c4b1c62637626a1f9b4ea567fd40e71dc5cbe";
+       version = "0.0.5";
+       sha256 = "c7392d06e1c5ed4b1219eda838aaa0e2a7befcb3650765f1e87e86533d2195d3";
        libraryHaskellDepends = [ base containers ];
        homepage = "http://github.com/conal/total-map/";
        description = "Finitely represented /total/ maps";
@@ -214212,7 +215810,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "transformers-lift" = callPackage
+  "transformers-lift_0_1_0_0" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "transformers-lift";
@@ -214221,6 +215819,18 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Ad-hoc type classes for lifting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "transformers-lift" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "transformers-lift";
+       version = "0.1.0.1";
+       sha256 = "c29d11f58fb9b2c1011c162f8f9f98cb0f2d12ca1317f40f4c88d9881840aa74";
+       libraryHaskellDepends = [ base transformers ];
+       description = "Ad-hoc type classes for lifting";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "transformers-runnable" = callPackage
@@ -215445,7 +217055,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "turtle" = callPackage
+  "turtle_1_2_6" = callPackage
     ({ mkDerivation, async, base, clock, directory, doctest, foldl
      , hostname, managed, optional-args, optparse-applicative, process
      , stm, system-fileio, system-filepath, temporary, text, time
@@ -215461,6 +217071,28 @@ self: {
          temporary text time transformers unix
        ];
        testHaskellDepends = [ base doctest ];
+       jailbreak = true;
+       description = "Shell programming, Haskell-style";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "turtle" = callPackage
+    ({ mkDerivation, async, base, clock, directory, doctest, foldl
+     , hostname, managed, optional-args, optparse-applicative, process
+     , stm, system-fileio, system-filepath, temporary, text, time
+     , transformers, unix
+     }:
+     mkDerivation {
+       pname = "turtle";
+       version = "1.2.7";
+       sha256 = "45736cf5106e75808eaed098228309bcfa3eb8b5e7e956c28423002ca5232f98";
+       libraryHaskellDepends = [
+         async base clock directory foldl hostname managed optional-args
+         optparse-applicative process stm system-fileio system-filepath
+         temporary text time transformers unix
+       ];
+       testHaskellDepends = [ base doctest ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -216469,8 +218101,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "type-fun";
-       version = "0.0.1";
-       sha256 = "bc21ad690809ffad66ebaf9df7af07e5609b026fbd257b813228d1b3ea141a1f";
+       version = "0.1.0";
+       sha256 = "8ad17ecf12c7034eefe1e22d0cff29a4c52cf9b326dd1ccb2b87d18a6240c101";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/s9gf4ult/type-fun";
@@ -217120,7 +218752,7 @@ self: {
        license = "GPL";
      }) {};
 
-  "tz" = callPackage
+  "tz_0_1_0_1" = callPackage
     ({ mkDerivation, base, binary, bindings-posix, bytestring
      , containers, deepseq, HUnit, QuickCheck, template-haskell
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -217144,10 +218776,36 @@ self: {
        homepage = "https://github.com/nilcons/haskell-tz";
        description = "Efficient time zone handling";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "tz" = callPackage
+    ({ mkDerivation, base, binary, bindings-posix, bytestring
+     , containers, data-default, deepseq, HUnit, QuickCheck
+     , template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, test-framework-th, time, tzdata, unix
+     , vector
+     }:
+     mkDerivation {
+       pname = "tz";
+       version = "0.1.1.0";
+       sha256 = "a9fbbf3979e8a46cddbbaf4f1c1d58c3d8ceefb664a628b74420c3d4d1cdc177";
+       libraryHaskellDepends = [
+         base binary bytestring containers data-default deepseq
+         template-haskell time tzdata vector
+       ];
+       testHaskellDepends = [
+         base bindings-posix HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2 test-framework-th
+         time tzdata unix vector
+       ];
+       homepage = "https://github.com/nilcons/haskell-tz";
+       description = "Efficient time zone handling";
+       license = stdenv.lib.licenses.asl20;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
-  "tzdata" = callPackage
+  "tzdata_0_1_20150810_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , filemanip, filepath, HUnit, MissingH, test-framework
      , test-framework-hunit, test-framework-th, unix, vector
@@ -217166,6 +218824,28 @@ self: {
        homepage = "https://github.com/nilcons/haskell-tzdata";
        description = "Time zone database (as files and as a module)";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "tzdata" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
+     , test-framework, test-framework-hunit, test-framework-th, unix
+     , vector
+     }:
+     mkDerivation {
+       pname = "tzdata";
+       version = "0.1.20160417.0";
+       sha256 = "97a1ff59343eb1fa0f1ff81f6d3235c898c7a2f64112c169fce0fa1dbf6a3309";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq vector
+       ];
+       testHaskellDepends = [
+         base bytestring HUnit test-framework test-framework-hunit
+         test-framework-th unix
+       ];
+       homepage = "https://github.com/nilcons/haskell-tzdata";
+       description = "Time zone database (as files and as a module)";
+       license = stdenv.lib.licenses.asl20;
      }) {};
 
   "uAgda" = callPackage
@@ -218027,19 +219707,6 @@ self: {
      }) {};
 
   "union" = callPackage
-    ({ mkDerivation, base, lens, vinyl }:
-     mkDerivation {
-       pname = "union";
-       version = "0.1.0.0";
-       sha256 = "a1a3cd3959ce688656c75bf905fb7ba98ade43da2154dfb52879ac89ecda5625";
-       revision = "1";
-       editedCabalFile = "b727e5c9325d1672d30a1da433ddd1314775d7b50d2148713f419e524444ed79";
-       libraryHaskellDepends = [ base lens vinyl ];
-       description = "Extensible type-safe unions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "union_0_1_1_0" = callPackage
     ({ mkDerivation, base, deepseq, profunctors, tagged, vinyl }:
      mkDerivation {
        pname = "union";
@@ -218048,7 +219715,6 @@ self: {
        libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ];
        description = "Extensible type-safe unions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "union-find" = callPackage
@@ -221078,6 +222744,21 @@ self: {
        license = "LGPL";
      }) {};
 
+  "vcatt" = callPackage
+    ({ mkDerivation, base, extra, shelly, system-filepath, text }:
+     mkDerivation {
+       pname = "vcatt";
+       version = "0.1";
+       sha256 = "112d3f025c34de3c56c4da8b8ab12699821171d7c5ef2d38b2b8f4e1af693e98";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base extra shelly system-filepath ];
+       executableHaskellDepends = [ base shelly text ];
+       homepage = "http://github.com/bergey/vcatt";
+       description = "Recursively check that a directory is under version control";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "vcd" = callPackage
     ({ mkDerivation, base, polyparse }:
      mkDerivation {
@@ -221430,7 +223111,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "vector-binary-instances" = callPackage
+  "vector-binary-instances_0_2_3_1" = callPackage
     ({ mkDerivation, base, binary, tasty, tasty-quickcheck, vector }:
      mkDerivation {
        pname = "vector-binary-instances";
@@ -221441,9 +223122,10 @@ self: {
        homepage = "https://github.com/bos/vector-binary-instances";
        description = "Instances of Data.Binary and Data.Serialize for vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "vector-binary-instances_0_2_3_2" = callPackage
+  "vector-binary-instances" = callPackage
     ({ mkDerivation, base, binary, tasty, tasty-quickcheck, vector }:
      mkDerivation {
        pname = "vector-binary-instances";
@@ -221454,7 +223136,6 @@ self: {
        homepage = "https://github.com/bos/vector-binary-instances";
        description = "Instances of Data.Binary and Data.Serialize for vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-buffer" = callPackage
@@ -221906,7 +223587,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "vector-th-unbox" = callPackage
+  "vector-th-unbox_0_2_1_5" = callPackage
     ({ mkDerivation, base, data-default, template-haskell, vector }:
      mkDerivation {
        pname = "vector-th-unbox";
@@ -221918,9 +223599,10 @@ self: {
        testHaskellDepends = [ base data-default vector ];
        description = "Deriver for Data.Vector.Unboxed using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "vector-th-unbox_0_2_1_6" = callPackage
+  "vector-th-unbox" = callPackage
     ({ mkDerivation, base, data-default, template-haskell, vector }:
      mkDerivation {
        pname = "vector-th-unbox";
@@ -221930,7 +223612,6 @@ self: {
        testHaskellDepends = [ base data-default vector ];
        description = "Deriver for Data.Vector.Unboxed using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "verbalexpressions" = callPackage
@@ -222011,16 +223692,16 @@ self: {
      }) {};
 
   "versions" = callPackage
-    ({ mkDerivation, base, either, extra, parsec, semigroups, tasty
-     , tasty-hunit, text, text-show
+    ({ mkDerivation, base, either, megaparsec, microlens, semigroups
+     , tasty, tasty-hunit, text
      }:
      mkDerivation {
        pname = "versions";
-       version = "1.0.2";
-       sha256 = "739275e9d1d286786c2b9f62c1aa96beebb28912005e80f37acb56048ae6dc9e";
-       libraryHaskellDepends = [ base parsec semigroups text ];
+       version = "2.0.0";
+       sha256 = "d8e18c140295e45e6b4f9c103c0c9d953a3baa769a0a364648074ad91623b7d2";
+       libraryHaskellDepends = [ base megaparsec semigroups text ];
        testHaskellDepends = [
-         base either extra semigroups tasty tasty-hunit text text-show
+         base either microlens tasty tasty-hunit text
        ];
        description = "Types and parsers for software version numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -224246,7 +225927,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-extra" = callPackage
+  "wai-extra_3_0_15" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
      , blaze-builder, bytestring, case-insensitive, containers, cookie
      , data-default-class, deepseq, directory, fast-logger, hspec
@@ -224275,6 +225956,36 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-extra" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
+     , blaze-builder, bytestring, case-insensitive, containers, cookie
+     , data-default-class, deepseq, directory, fast-logger, hspec
+     , http-types, HUnit, iproute, lifted-base, network, old-locale
+     , resourcet, streaming-commons, stringsearch, text, time
+     , transformers, unix, unix-compat, vault, void, wai, wai-logger
+     , word8, zlib
+     }:
+     mkDerivation {
+       pname = "wai-extra";
+       version = "3.0.15.1";
+       sha256 = "6474f70915bfd9342ec126a3de76c6247e0788deb553fc46e1ba72c1f0f8e4ad";
+       libraryHaskellDepends = [
+         aeson ansi-terminal base base64-bytestring blaze-builder bytestring
+         case-insensitive containers cookie data-default-class deepseq
+         directory fast-logger http-types iproute lifted-base network
+         old-locale resourcet streaming-commons stringsearch text time
+         transformers unix unix-compat vault void wai wai-logger word8 zlib
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring case-insensitive cookie fast-logger
+         hspec http-types HUnit resourcet text time transformers wai zlib
+       ];
+       homepage = "http://github.com/yesodweb/wai";
+       description = "Provides some basic WAI handlers and middleware";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "wai-frontend-monadcgi" = callPackage
@@ -224379,7 +226090,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-handler-launch" = callPackage
+  "wai-handler-launch_3_0_0_5" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, http-types
      , process, streaming-commons, transformers, wai, warp
      }:
@@ -224393,9 +226104,10 @@ self: {
        ];
        description = "Launch a web app in the default browser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-handler-launch_3_0_1" = callPackage
+  "wai-handler-launch" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, http-types
      , process, streaming-commons, transformers, wai, warp
      }:
@@ -224409,7 +226121,6 @@ self: {
        ];
        description = "Launch a web app in the default browser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-handler-scgi" = callPackage
@@ -224597,7 +226308,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-logger" = callPackage
+  "wai-logger_2_2_5" = callPackage
     ({ mkDerivation, auto-update, base, blaze-builder, byteorder
      , bytestring, case-insensitive, doctest, easy-file, fast-logger
      , http-types, network, unix, unix-time, wai
@@ -224615,9 +226326,10 @@ self: {
        doCheck = false;
        description = "A logging system for WAI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-logger_2_2_7" = callPackage
+  "wai-logger" = callPackage
     ({ mkDerivation, base, blaze-builder, byteorder, bytestring
      , case-insensitive, doctest, fast-logger, http-types, network, unix
      , unix-time, wai
@@ -224631,10 +226343,9 @@ self: {
          fast-logger http-types network unix unix-time wai
        ];
        testHaskellDepends = [ base doctest ];
-       jailbreak = true;
+       doCheck = false;
        description = "A logging system for WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-logger-prefork" = callPackage
@@ -228233,7 +229944,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "webdriver-angular" = callPackage
+  "webdriver-angular_0_1_9" = callPackage
     ({ mkDerivation, aeson, base, hspec, hspec-webdriver
      , language-javascript, template-haskell, text, transformers
      , unordered-containers, wai-app-static, warp, webdriver
@@ -228250,13 +229961,15 @@ self: {
          base hspec hspec-webdriver transformers wai-app-static warp
          webdriver
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://bitbucket.org/wuzzeb/webdriver-utils";
        description = "Webdriver actions to assist with testing a webpage which uses Angular.Js";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "webdriver-angular_0_1_10" = callPackage
+  "webdriver-angular" = callPackage
     ({ mkDerivation, aeson, base, hspec, hspec-webdriver
      , language-javascript, template-haskell, text, transformers
      , unordered-containers, wai-app-static, warp, webdriver
@@ -228273,11 +229986,10 @@ self: {
          base hspec hspec-webdriver transformers wai-app-static warp
          webdriver
        ];
-       jailbreak = true;
+       doCheck = false;
        homepage = "https://bitbucket.org/wuzzeb/webdriver-utils";
        description = "Webdriver actions to assist with testing a webpage which uses Angular.Js";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webdriver-snoy" = callPackage
@@ -228886,35 +230598,6 @@ self: {
      }) {};
 
   "werewolf" = callPackage
-    ({ mkDerivation, aeson, base, containers, directory, extra
-     , filepath, lens, MonadRandom, mtl, optparse-applicative
-     , QuickCheck, random-shuffle, tasty, tasty-quickcheck, text
-     , tostring, transformers
-     }:
-     mkDerivation {
-       pname = "werewolf";
-       version = "1.0.1.0";
-       sha256 = "62394b709d0c7b119cabc0fedb42f279d2b5fba49c69990c61d9051f70260f66";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base containers directory extra filepath lens MonadRandom mtl
-         text tostring transformers
-       ];
-       executableHaskellDepends = [
-         aeson base directory extra filepath lens MonadRandom mtl
-         optparse-applicative random-shuffle text transformers
-       ];
-       testHaskellDepends = [
-         base containers extra lens MonadRandom mtl QuickCheck tasty
-         tasty-quickcheck text
-       ];
-       homepage = "https://github.com/hjwylde/werewolf";
-       description = "A game engine for playing werewolf within an arbitrary chat client";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "werewolf_1_0_2_0" = callPackage
     ({ mkDerivation, aeson, base, containers, directory, extra
      , filepath, lens, MonadRandom, mtl, optparse-applicative
      , QuickCheck, random-shuffle, tasty, tasty-quickcheck, text
@@ -228922,8 +230605,8 @@ self: {
      }:
      mkDerivation {
        pname = "werewolf";
-       version = "1.0.2.0";
-       sha256 = "d0ba1281ff4753b2e4c2c52136e846e3aaf0ca1170bccf30407a42a7c2c42677";
+       version = "1.0.2.2";
+       sha256 = "ef55f17c0d3a49f1135e9691d1cf29dbd0b538c4ef941b20f2f7ca7fd407fa81";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -228941,7 +230624,6 @@ self: {
        homepage = "https://github.com/hjwylde/werewolf";
        description = "A game engine for playing werewolf within an arbitrary chat client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "werewolf-slack" = callPackage
@@ -228951,10 +230633,8 @@ self: {
      }:
      mkDerivation {
        pname = "werewolf-slack";
-       version = "1.0.0.0";
-       sha256 = "882eaeba0d24555265601da806ca89a9e5ee313a850f59dcbc8de6418f80a407";
-       revision = "2";
-       editedCabalFile = "c45c8d29405ce51049a2a72dbca21ae974d7c05c1fa966d469b06bc532b9dbfa";
+       version = "1.0.1.0";
+       sha256 = "fb3e1fdb51117c23b4edb0c0022b36e26cddbc04da280b85481af18a097ab6e1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -229638,7 +231318,7 @@ self: {
 
   "wolf" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
-     , amazonka-swf, base, basic-prelude, bytestring, conduit
+     , amazonka-swf, async, base, basic-prelude, bytestring, conduit
      , conduit-extra, exceptions, fast-logger, formatting, http-conduit
      , http-types, lens, monad-control, monad-logger, mtl, mtl-compat
      , optparse-applicative, resourcet, safe, shelly, system-filepath
@@ -229647,8 +231327,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.2.3";
-       sha256 = "53c53f00ccc4ad27efc9164d90722174d28f7bad1850a1659f177d9c4d070fd3";
+       version = "0.2.6";
+       sha256 = "523b4ba7d885207bdb860a2a9106c7dfd37911084d9780ea21f481ad51281bb6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -229660,7 +231340,7 @@ self: {
          yaml
        ];
        executableHaskellDepends = [
-         aeson amazonka-core base basic-prelude bytestring
+         aeson amazonka-core async base basic-prelude bytestring
          optparse-applicative resourcet shelly system-filepath text
          transformers yaml zlib
        ];
@@ -230971,8 +232651,8 @@ self: {
      }:
      mkDerivation {
        pname = "xcffib";
-       version = "0.4.1";
-       sha256 = "c5449a61a2415f0be39ca4b1be2b186e2eb0f1563391d819b555a348f35f5248";
+       version = "0.4.2";
+       sha256 = "ccaafda9d2e55fb079e5f2bcac74264a0c3c97f6488b49f8a81eae9a66e556b2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -233173,7 +234853,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "xss-sanitize" = callPackage
+  "xss-sanitize_0_3_5_6" = callPackage
     ({ mkDerivation, attoparsec, base, containers, css-text, hspec
      , HUnit, network-uri, tagsoup, text, utf8-string
      }:
@@ -233192,9 +234872,10 @@ self: {
        homepage = "http://github.com/yesodweb/haskell-xss-sanitize";
        description = "sanitize untrusted HTML to prevent XSS attacks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "xss-sanitize_0_3_5_7" = callPackage
+  "xss-sanitize" = callPackage
     ({ mkDerivation, attoparsec, base, containers, css-text, hspec
      , HUnit, network-uri, tagsoup, text, utf8-string
      }:
@@ -233213,7 +234894,6 @@ self: {
        homepage = "http://github.com/yesodweb/haskell-xss-sanitize";
        description = "sanitize untrusted HTML to prevent XSS attacks";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xtc" = callPackage
@@ -235041,7 +236721,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-auth" = callPackage
+  "yesod-auth_1_4_13_1" = callPackage
     ({ mkDerivation, aeson, authenticate, base, base16-bytestring
      , base64-bytestring, binary, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, conduit, conduit-extra
@@ -235068,6 +236748,60 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Authentication for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-auth" = callPackage
+    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
+     , base64-bytestring, binary, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, conduit, conduit-extra
+     , containers, cryptohash, data-default, email-validate, file-embed
+     , http-client, http-conduit, http-types, lifted-base, mime-mail
+     , network-uri, nonce, persistent, persistent-template, random
+     , resourcet, safe, shakespeare, template-haskell, text, time
+     , transformers, unordered-containers, wai, yesod-core, yesod-form
+     , yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-auth";
+       version = "1.4.13.2";
+       sha256 = "65d4cdc979db56e766aef3f64183075f4976ddedb8e62b07efb09be56f2cca20";
+       libraryHaskellDepends = [
+         aeson authenticate base base16-bytestring base64-bytestring binary
+         blaze-builder blaze-html blaze-markup byteable bytestring conduit
+         conduit-extra containers cryptohash data-default email-validate
+         file-embed http-client http-conduit http-types lifted-base
+         mime-mail network-uri nonce persistent persistent-template random
+         resourcet safe shakespeare template-haskell text time transformers
+         unordered-containers wai yesod-core yesod-form yesod-persistent
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Authentication for Yesod";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "yesod-auth-account_1_4_1" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger
+     , mtl, nonce, persistent, persistent-sqlite, pwstore-fast
+     , resourcet, text, xml-conduit, yesod, yesod-auth, yesod-core
+     , yesod-form, yesod-persistent, yesod-test
+     }:
+     mkDerivation {
+       pname = "yesod-auth-account";
+       version = "1.4.1";
+       sha256 = "11a42607a419b36b6c5d2590a5e67538dcc831bbe896b80ffcee25d4673971a1";
+       libraryHaskellDepends = [
+         base blaze-html bytestring mtl nonce persistent pwstore-fast text
+         yesod-auth yesod-core yesod-form yesod-persistent
+       ];
+       testHaskellDepends = [
+         base bytestring hspec monad-logger mtl persistent-sqlite resourcet
+         text xml-conduit yesod yesod-auth yesod-test
+       ];
+       homepage = "https://bitbucket.org/wuzzeb/yesod-auth-account";
+       description = "An account authentication plugin for Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-account" = callPackage
@@ -235078,8 +236812,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-account";
-       version = "1.4.1";
-       sha256 = "11a42607a419b36b6c5d2590a5e67538dcc831bbe896b80ffcee25d4673971a1";
+       version = "1.4.2";
+       sha256 = "38d5c5795a6acb487f408b0bd7ab3fd874f3d99c5df94202dcbb436847e7eef3";
        libraryHaskellDepends = [
          base blaze-html bytestring mtl nonce persistent pwstore-fast text
          yesod-auth yesod-core yesod-form yesod-persistent
@@ -235316,7 +237050,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-auth-hashdb" = callPackage
+  "yesod-auth-hashdb_1_4_3" = callPackage
     ({ mkDerivation, base, bytestring, cryptohash, hspec, persistent
      , pwstore-fast, text, yesod-auth, yesod-core, yesod-form
      , yesod-persistent
@@ -235333,26 +237067,32 @@ self: {
        homepage = "https://github.com/paul-rouse/yesod-auth-hashdb";
        description = "Authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-auth-hashdb_1_5" = callPackage
-    ({ mkDerivation, base, bytestring, cryptohash, hspec, persistent
-     , pwstore-fast, text, yesod-auth, yesod-core, yesod-form
-     , yesod-persistent
+  "yesod-auth-hashdb" = callPackage
+    ({ mkDerivation, base, bytestring, classy-prelude, containers
+     , cryptohash, hspec, http-conduit, http-types, monad-logger
+     , network-uri, persistent, persistent-sqlite, pwstore-fast
+     , resourcet, text, wai-extra, yesod, yesod-auth, yesod-core
+     , yesod-form, yesod-persistent, yesod-test
      }:
      mkDerivation {
        pname = "yesod-auth-hashdb";
-       version = "1.5";
-       sha256 = "396fbe836c291d9d1dce70c18ce39f82671a7e40af3fc743efb14a7faefb7259";
+       version = "1.5.1";
+       sha256 = "fb69116768ae46b0ba582e91151438fd9f89daf0fbcfb5fc534058798552d2fe";
        libraryHaskellDepends = [
          base bytestring cryptohash persistent pwstore-fast text yesod-auth
          yesod-core yesod-form yesod-persistent
        ];
-       testHaskellDepends = [ base hspec text ];
+       testHaskellDepends = [
+         base bytestring classy-prelude containers hspec http-conduit
+         http-types monad-logger network-uri persistent-sqlite resourcet
+         text wai-extra yesod yesod-auth yesod-core yesod-test
+       ];
        homepage = "https://github.com/paul-rouse/yesod-auth-hashdb";
        description = "Authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-kerberos" = callPackage
@@ -235467,8 +237207,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-oauth";
-       version = "1.4.1";
-       sha256 = "6046eceb32cbd852c9737a8f09e25c0609296373bd4974bb256ba9dc2e7b48c8";
+       version = "1.4.1.1";
+       sha256 = "2dd9eda01b3b7625711b0a1dafce82915e82154976cd94c6076c8fa929d80773";
        libraryHaskellDepends = [
          authenticate-oauth base bytestring lifted-base text transformers
          yesod-auth yesod-core yesod-form
@@ -236795,7 +238535,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-bin" = callPackage
+  "yesod-bin_1_4_18" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , blaze-builder, bytestring, Cabal, conduit, conduit-extra
      , containers, data-default-class, deepseq, directory, file-embed
@@ -236826,6 +238566,40 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "The yesod helper executable";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-bin" = callPackage
+    ({ mkDerivation, async, attoparsec, base, base64-bytestring
+     , blaze-builder, bytestring, Cabal, conduit, conduit-extra
+     , containers, data-default-class, deepseq, directory, file-embed
+     , filepath, fsnotify, ghc, ghc-paths, http-client, http-conduit
+     , http-reverse-proxy, http-types, lifted-base, network
+     , optparse-applicative, parsec, process, project-template
+     , resourcet, shakespeare, split, streaming-commons, tar
+     , template-haskell, text, time, transformers, transformers-compat
+     , unix-compat, unordered-containers, wai, wai-extra, warp, warp-tls
+     , yaml, zlib
+     }:
+     mkDerivation {
+       pname = "yesod-bin";
+       version = "1.4.18.1";
+       sha256 = "75f17da2d3a18797391b5699a251a7815f0302ce009326b9e1413b078125c82c";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         async attoparsec base base64-bytestring blaze-builder bytestring
+         Cabal conduit conduit-extra containers data-default-class deepseq
+         directory file-embed filepath fsnotify ghc ghc-paths http-client
+         http-conduit http-reverse-proxy http-types lifted-base network
+         optparse-applicative parsec process project-template resourcet
+         shakespeare split streaming-commons tar template-haskell text time
+         transformers transformers-compat unix-compat unordered-containers
+         wai wai-extra warp warp-tls yaml zlib
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "The yesod helper executable";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-bootstrap" = callPackage
@@ -237804,7 +239578,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-core" = callPackage
+  "yesod-core_1_4_20_1" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
      , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
      , cereal, clientsession, conduit, conduit-extra, containers, cookie
@@ -237841,6 +239615,46 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-core" = callPackage
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
+     , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
+     , cereal, clientsession, conduit, conduit-extra, containers, cookie
+     , data-default, deepseq, directory, exceptions, fast-logger, hspec
+     , hspec-expectations, http-types, HUnit, lifted-base, monad-control
+     , monad-logger, mtl, mwc-random, network, old-locale, parsec
+     , path-pieces, primitive, QuickCheck, random, resourcet, safe
+     , semigroups, shakespeare, streaming-commons, template-haskell
+     , text, time, transformers, transformers-base, unix-compat
+     , unordered-containers, vector, wai, wai-extra, wai-logger, warp
+     , word8
+     }:
+     mkDerivation {
+       pname = "yesod-core";
+       version = "1.4.20.2";
+       sha256 = "cfa62e47de410bff1fd37571a3c7fda92b0a5cd28e1df8d466c7a65b5a2e6f28";
+       libraryHaskellDepends = [
+         aeson auto-update base blaze-builder blaze-html blaze-markup
+         byteable bytestring case-insensitive cereal clientsession conduit
+         conduit-extra containers cookie data-default deepseq directory
+         exceptions fast-logger http-types lifted-base monad-control
+         monad-logger mtl mwc-random old-locale parsec path-pieces primitive
+         random resourcet safe semigroups shakespeare template-haskell text
+         time transformers transformers-base unix-compat
+         unordered-containers vector wai wai-extra wai-logger warp word8
+       ];
+       testHaskellDepends = [
+         async base blaze-builder bytestring clientsession conduit
+         conduit-extra containers cookie hspec hspec-expectations http-types
+         HUnit lifted-base mwc-random network path-pieces QuickCheck random
+         resourcet shakespeare streaming-commons template-haskell text
+         transformers wai wai-extra
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Creation of type-safe, RESTful web applications";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-crud" = callPackage
@@ -238256,7 +240070,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-form" = callPackage
+  "yesod-form_1_4_7" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, containers, data-default
      , email-validate, hspec, network-uri, persistent, resourcet
@@ -238278,6 +240092,31 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Form handling support for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-form" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, containers, data-default
+     , email-validate, hspec, network-uri, persistent, resourcet
+     , semigroups, shakespeare, template-haskell, text, time
+     , transformers, wai, xss-sanitize, yesod-core, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-form";
+       version = "1.4.7.1";
+       sha256 = "66f1672c7aaec0b4c93f5cfc20593a4fb92d779d90d55ee5ebd1f7ae6a6e8dac";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-builder blaze-html blaze-markup
+         byteable bytestring containers data-default email-validate
+         network-uri persistent resourcet semigroups shakespeare
+         template-haskell text time transformers wai xss-sanitize yesod-core
+         yesod-persistent
+       ];
+       testHaskellDepends = [ base hspec text time ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Form handling support for Yesod Web Framework";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-form-json" = callPackage
@@ -238403,11 +240242,39 @@ self: {
          yesod yesod-core
        ];
        testHaskellDepends = [ base ];
+       doHaddock = false;
        homepage = "https://github.com/nakaji-dayo/yesod-job-queue#readme";
        description = "Background jobs library for Yesod";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "yesod-job-queue_0_2_0_1" = callPackage
+    ({ mkDerivation, aeson, api-field-json-th, base, bytestring
+     , classy-prelude-yesod, cron, file-embed, hedis, lens, monad-logger
+     , persistent-sqlite, resourcet, stm, text, time, uuid, yesod
+     , yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-job-queue";
+       version = "0.2.0.1";
+       sha256 = "872f8f53fbe4f350a08493beaa59a4ad9103e3d3419abbdfbf92ac3122962ebf";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson api-field-json-th base bytestring classy-prelude-yesod cron
+         file-embed hedis lens monad-logger stm text time uuid yesod
+       ];
+       executableHaskellDepends = [
+         base classy-prelude-yesod hedis monad-logger persistent-sqlite
+         resourcet yesod yesod-core
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/nakaji-dayo/yesod-job-queue#readme";
+       description = "Background jobs library for Yesod";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-json" = callPackage
     ({ mkDerivation, base, yesod-core }:
      mkDerivation {
@@ -238546,6 +240413,7 @@ self: {
          warp yaml yesod yesod-auth yesod-core yesod-form yesod-persistent
          yesod-static
        ];
+       jailbreak = true;
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Yesod library for MangoPay API access";
        license = stdenv.lib.licenses.bsd3;
@@ -238780,7 +240648,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-persistent" = callPackage
+  "yesod-persistent_1_4_0_4" = callPackage
     ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
      , persistent-sqlite, persistent-template, resource-pool, resourcet
      , text, transformers, wai-extra, yesod-core
@@ -238800,6 +240668,29 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Some helpers for using Persistent from Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-persistent" = callPackage
+    ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
+     , persistent-sqlite, persistent-template, resource-pool, resourcet
+     , text, transformers, wai-extra, yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-persistent";
+       version = "1.4.0.5";
+       sha256 = "e5ad890ca4d4c0499ae08e5e1e294f4c1435e9395ba1ba9bb3acf3982eb8d2c2";
+       libraryHaskellDepends = [
+         base blaze-builder conduit persistent persistent-template
+         resource-pool resourcet transformers yesod-core
+       ];
+       testHaskellDepends = [
+         base blaze-builder conduit hspec persistent persistent-sqlite text
+         wai-extra yesod-core
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Some helpers for using Persistent from Yesod";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-platform" = callPackage
@@ -239386,7 +241277,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-static-angular" = callPackage
+  "yesod-static-angular_0_1_7" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, blaze-markup
      , bytestring, data-default, directory, filepath, hamlet, hspec
      , HUnit, language-javascript, mime-types, shakespeare
@@ -239415,9 +241306,10 @@ self: {
        homepage = "https://bitbucket.org/wuzzeb/yesod-static-angular";
        description = "Yesod generators for embedding AngularJs code into yesod-static at compile time";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-static-angular_0_1_8" = callPackage
+  "yesod-static-angular" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, blaze-markup
      , bytestring, data-default, directory, filepath, hamlet, hspec
      , HUnit, language-javascript, mime-types, shakespeare
@@ -239442,11 +241334,10 @@ self: {
          base bytestring hamlet hspec HUnit shakespeare template-haskell
          text yesod-core yesod-static yesod-test
        ];
-       jailbreak = true;
+       doCheck = false;
        homepage = "https://bitbucket.org/wuzzeb/yesod-static-angular";
        description = "Yesod generators for embedding AngularJs code into yesod-static at compile time";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-table_1_0_3" = callPackage
@@ -239750,7 +241641,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-test" = callPackage
+  "yesod-test_1_5_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, case-insensitive, containers, cookie
      , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
@@ -239774,6 +241665,33 @@ self: {
        homepage = "http://www.yesodweb.com";
        description = "integration testing for WAI/Yesod Applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-test" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, bytestring, case-insensitive, containers, cookie
+     , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
+     , monad-control, network, persistent, text, time, transformers, wai
+     , wai-extra, xml-conduit, xml-types, yesod-core, yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-test";
+       version = "1.5.1.1";
+       sha256 = "0886927c92ddc59608902c6fb02b8e8b9e631120dd6e75db764a95b5a75b0160";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-html blaze-markup bytestring
+         case-insensitive containers cookie hspec-core html-conduit
+         http-types HUnit monad-control network persistent text time
+         transformers wai wai-extra xml-conduit xml-types yesod-core
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec html-conduit http-types HUnit
+         lifted-base text wai xml-conduit yesod-core yesod-form
+       ];
+       homepage = "http://www.yesodweb.com";
+       description = "integration testing for WAI/Yesod Applications";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-test-json" = callPackage

From f622804472ee0e4ba7e0e5ad0dbf5a19087dff08 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 Apr 2016 17:05:15 +0200
Subject: [PATCH 585/712] Add LTS Haskell 5.14.

---
 pkgs/top-level/haskell-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0060b7e37d7..3798abe9208 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -386,7 +386,10 @@ rec {
     lts-5_13 = packages.ghc7103.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.13.nix { };
     };
-    lts-5 = packages.lts-5_13;
+    lts-5_14 = packages.ghc7103.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.14.nix { };
+    };
+    lts-5 = packages.lts-5_14;
 
     lts = packages.lts-5;
   };

From f6980571ab6906782b645885399ffcbcede202dd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 May 2016 10:09:52 +0200
Subject: [PATCH 586/712] Add LTS Haskell 5.15.

---
 pkgs/top-level/haskell-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3798abe9208..3401e967fe8 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -389,7 +389,10 @@ rec {
     lts-5_14 = packages.ghc7103.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.14.nix { };
     };
-    lts-5 = packages.lts-5_14;
+    lts-5_15 = packages.ghc7103.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.15.nix { };
+    };
+    lts-5 = packages.lts-5_15;
 
     lts = packages.lts-5;
   };

From ec493075184f342d29b125457a9a84ccdaf9419a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 Apr 2016 17:14:36 +0200
Subject: [PATCH 587/712] haskell-hakyll: fix test suite by providing "rev" in
 test environment

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 363ddcbea88..3616847dfa0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -276,7 +276,6 @@ self: super: {
   filestore = dontCheck super.filestore;
   getopt-generics = dontCheck super.getopt-generics;
   graceful = dontCheck super.graceful;
-  hakyll = dontCheck super.hakyll;
   Hclip = dontCheck super.Hclip;
   HList = dontCheck super.HList;
   ide-backend = dontCheck super.ide-backend;

From ddb8c06c2d82c44077b2b73606297a70191c3ca2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Apr 2016 10:10:44 +0200
Subject: [PATCH 588/712] haskell-yi: mark as broken

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3616847dfa0..4a9857b20df 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1013,4 +1013,12 @@ self: super: {
   # generate enough conclusive test cases.
   split = dontCheck super.split;
 
+  # https://github.com/NixOS/nixpkgs/issues/14967
+  yi = markBroken super.yi;
+  yi-fuzzy-open = markBroken super.yi-fuzzy-open;
+  yi-monokai = markBroken super.yi-monokai;
+  yi-snippet = markBroken super.yi-snippet;
+  yi-solarized = markBroken super.yi-solarized;
+  yi-spolsky = markBroken super.yi-spolsky;
+
 }

From 967901f1957b98df04c91d6a54b7b55afe07fb97 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 Apr 2016 09:48:20 +0200
Subject: [PATCH 589/712] haskell-binary: update version used for GHC releases
 prior to 7.8.x

---
 pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix  | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix  | 4 ++--
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
index 1bdd454d408..89755799af8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
@@ -41,7 +41,7 @@ self: super: {
   unix = null;
 
   # These packages are core libraries in GHC 7.10.x, but not here.
-  binary = self.binary_0_8_2_1;
+  binary = self.binary_0_8_3_0;
   deepseq = self.deepseq_1_3_0_1;
   haskeline = self.haskeline_0_7_2_1;
   hoopl = self.hoopl_3_10_2_0;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index db0aa51492f..d4c3ae73114 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -42,7 +42,7 @@ self: super: {
   xhtml = self.xhtml_3000_2_1;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_2_1; process = self.process_1_2_3_0; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_3_0; process = self.process_1_2_3_0; };
 
   # Newer versions don't compile.
   Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index e2bb4f00d78..977fffbd558 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -41,10 +41,10 @@ self: super: {
   xhtml = self.xhtml_3000_2_1;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_2_1; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_3_0; };
 
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_2_1; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_3_0; });
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index e10136a42ee..4ce544534fc 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -40,10 +40,10 @@ self: super: {
   xhtml = self.xhtml_3000_2_1;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_2_1; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_3_0; };
 
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_2_1; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_3_0; });
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;

From 66ff540ee6afc52c443296dbfdc7683e608399ea Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 Apr 2016 11:22:15 +0200
Subject: [PATCH 590/712] haskell-lens: update version used by GHC 8.0.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 555223b7594..3611b19db1b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -66,7 +66,7 @@ self: super: {
   kan-extensions = self.kan-extensions_5_0_1;
 
   # Earlier versions don't support kan-extensions 5.x.
-  lens = self.lens_4_13_2_1;
+  lens = self.lens_4_14;
 
   # https://github.com/dreixel/generic-deriving/issues/37
   generic-deriving = dontHaddock super.generic-deriving;

From 066b5cb11abd8ac049b833e9204cbd903ec3cdf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 3 May 2016 10:59:29 +0200
Subject: [PATCH 591/712] idea.idea-{community,ultimate}: 2016.1 -> 2016.1.1

---
 pkgs/applications/editors/idea/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 482cbc56bcf..d51eee6817f 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -185,13 +185,13 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2016.1";
-    build = "IC-145.258.11";
+    version = "2016.1.1";
+    build = "IC-145.597";
     description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "1grgyaapsbf7xn0m18x6fgghjh9n1n2zblz9608g9qgx5p28kn6q";
+      sha256 = "1r0kvq8vk8ln4cabqjvfqp0lfy9vf8c8vddh76sd41d635pamba6";
     };
   };
 
@@ -209,13 +209,13 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2016.1";
-    build = "IU-145.258.11";
+    version = "2016.1.1";
+    build = "IU-145.597";
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
-      sha256 = "15ybqdy311wi3iqi7bzk798cd91jpl73ngl86kzwr68d24nyy3zb";
+      sha256 = "d5a7d2d657fe2ad170716054c6ccd164e509cf50ee6eee8b61fe3490071940df";
     };
   };
 

From 0ba62f7150ed1b2756adb52b1bac6d3d7d93831f Mon Sep 17 00:00:00 2001
From: rardiol <ricardo.ardissone@gmail.com>
Date: Tue, 3 May 2016 06:19:19 -0300
Subject: [PATCH 592/712] spring, springlobby update (#15182)

* alure: init at 1.2

* spring: 96.0 -> 101.0

* springlobby: 0.195 -> 0.247
---
 pkgs/development/libraries/alure/default.nix | 20 ++++++++++++++++
 pkgs/games/spring/default.nix                | 25 +++++++++++++-------
 pkgs/games/spring/springlobby.nix            | 16 ++++++-------
 pkgs/top-level/all-packages.nix              |  2 ++
 4 files changed, 46 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/libraries/alure/default.nix

diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/development/libraries/alure/default.nix
new file mode 100644
index 00000000000..200ff1ca2e7
--- /dev/null
+++ b/pkgs/development/libraries/alure/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, cmake, openal }:
+
+stdenv.mkDerivation rec {
+  name = "alure-${version}";
+  version = "1.2";
+
+  src = fetchurl {
+    url = "http://kcat.strangesoft.net/alure-releases/alure-${version}.tar.bz2";
+    sha256 = "0w8gsyqki21s1qb2s5ac1kj08i6nc937c0rr08xbw9w9wvd6lpj6";
+  };
+
+  buildInputs = [ cmake openal ];
+
+  meta = with stdenv.lib; {
+    description = "A utility library to help manage common tasks with OpenAL applications";
+    homepage = http://kcat.strangesoft.net/alure.html;
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 525adbc0a12..9e4a0954272 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -1,32 +1,41 @@
 { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip
-, openal, libvorbis, glew, freetype, xorg, SDL, mesa, binutils
+, openal, libvorbis, glew, freetype, xorg, SDL2, mesa, binutils
 , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper
-, jdk ? null, python ? null, systemd
+, jdk ? null, python ? null, systemd, libunwind, glibc, which, minizip
 , withAI ? true # support for AI Interfaces and Skirmish AIs
 }:
 
 stdenv.mkDerivation rec {
 
   name = "spring-${version}";
-  version = "96.0";
+  version = "101.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/springrts/spring_${version}_src.tar.lzma";
-    sha256 = "1axyqkxgv3a0zg0afzlc7j3lyi412zd551j317ci41yqz2qzf0px";
+    sha256 = "0nr65zhw92k36zgwqgi31vcp129vk7r3v7xzd6l9w7mp1ljvypgi";
   };
 
+  # The cmake included module correcly finds nix's glew, however
+  # it has to be the bundled FindGLEW for headless or dedicated builds
+  prePatch = ''
+    substituteInPlace ./rts/build/cmake/FindAsciiDoc.cmake \
+      --replace "PATHS /usr /usr/share /usr/local /usr/local/share" "PATHS ${docbook_xsl}"\
+      --replace "xsl/docbook/manpages" "share/xml/docbook-xsl/manpages"
+    patchShebangs .
+    rm rts/build/cmake/FindGLEW.cmake
+  '';
+
   cmakeFlags = ["-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON"
                 "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON"
                 "-DPREFER_STATIC_LIBS:BOOL=OFF"];
 
-  buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL
+  buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2
     xorg.libX11 xorg.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper
-    docbook_xsl_ns systemd ]
+    docbook_xsl_ns systemd libunwind glibc.dev glibc.static which minizip ]
     ++ stdenv.lib.optional withAI jdk
     ++ stdenv.lib.optional withAI python;
 
-  # reported upstream http://springrts.com/mantis/view.php?id=4305
-  #enableParallelBuilding = true; # occasionally missing generated files on Hydra
+  enableParallelBuilding = true;
 
   NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility
 
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index bbcbd1920e9..571cf311545 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -1,18 +1,19 @@
-{ stdenv, fetchurl, cmake, wxGTK, openal, pkgconfig, curl, libtorrentRasterbar, libpng, libX11
-, gettext, bash, gawk, boost, libnotify, gtk, doxygen, spring, makeWrapper }:
+{ stdenv, fetchurl, cmake, wxGTK30, openal, pkgconfig, curl, libtorrentRasterbar
+, libpng, libX11, gettext, bash, gawk, boost, libnotify, gtk, doxygen, spring
+, makeWrapper, glib, minizip, alure, pcre, jsoncpp }:
 stdenv.mkDerivation rec {
 
   name = "springlobby-${version}";
-  version = "0.195";
+  version = "0.247";
 
   src = fetchurl {
     url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
-    sha256 = "0hxxm97c74rvm78vlfn2byn0zjlrhankxdrs2hz73rdq6451h10b";
+    sha256 = "0sx14k4xsyjkmphhxfn9q341lv32c53g6wl1cbdx2sknzs3qasxs";
   };
 
   buildInputs = [
-    cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar
-    boost libpng libX11 libnotify gtk doxygen makeWrapper
+    cmake wxGTK30 openal pkgconfig curl gettext libtorrentRasterbar pcre jsoncpp
+    boost libpng libX11 libnotify gtk doxygen makeWrapper glib minizip alure
   ];
 
   prePatch = ''
@@ -21,9 +22,6 @@ stdenv.mkDerivation rec {
     substituteInPlace CMakeLists.txt --replace "boost_system-mt" "boost_system"
   '';
 
-  # for now sound is disabled as it causes a linker error with alure i can't resolve (qknight)
-  cmakeFlags = "-DOPTION_SOUND:BOOL=OFF"; 
-
   enableParallelBuilding = true;
 
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85c2afd4a54..cb067817f54 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6416,6 +6416,8 @@ in
 
   afflib = callPackage ../development/libraries/afflib { };
 
+  alure = callPackage ../development/libraries/alure { };
+
   agg = callPackage ../development/libraries/agg { };
 
   allegro = callPackage ../development/libraries/allegro {};

From 4b2caa2409fa836b456be59f52b27ac6e49fb17a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 3 May 2016 06:45:17 -0300
Subject: [PATCH 593/712] Greybird: init at 2016-03-11

---
 pkgs/misc/themes/greybird/default.nix | 33 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/misc/themes/greybird/default.nix

diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix
new file mode 100644
index 00000000000..173b392d22a
--- /dev/null
+++ b/pkgs/misc/themes/greybird/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  pname = "Greybird";
+  version = "2016-03-11";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    repo = "${pname}";
+    owner = "shimmerproject";
+    rev = "77f3cbd94b0c87f502aaeeaa7fd6347283c876cf";
+    sha256 = "1gqq9j61izdw8arly8kzr629wa904rn6mq48cvlaksknimw0hf2h";
+  };
+
+  buildInputs = [ gtk-engine-murrine ];
+  
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/share/themes/${pname}{," Bright"," Compact"," a11y"}
+    cp -a * $out/share/themes/${pname}/
+    mv $out/share/themes/${pname}/xfce-notify-4.0_bright $out/share/themes/${pname}" Bright"/xfce-notify-4.0
+    mv $out/share/themes/${pname}/xfwm4-compact $out/share/themes/${pname}" Compact"/xfwm4
+    mv $out/share/themes/${pname}/xfwm4-a11y $out/share/themes/${pname}" a11y"/xfwm4
+  '';
+
+  meta = {
+    description = "Grey and blue theme (Gtk, Xfce, Emerald, Metacity, Mutter, Unity)";
+    homepage = http://shimmerproject.org/our-projects/greybird/;
+    license = with stdenv.lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ];
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4126d518076..b73efcba400 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16266,6 +16266,8 @@ in
   gnuk-unstable = callPackage ../misc/gnuk/unstable.nix { };
   gnuk-git = callPackage ../misc/gnuk/git.nix { };
 
+  greybird = callPackage ../misc/themes/greybird { };
+
   gxemul = callPackage ../misc/emulators/gxemul { };
 
   hatari = callPackage ../misc/emulators/hatari { };

From fe0bb1efd13b75eeb0785840d88c2280562d5f69 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 3 May 2016 13:19:15 +0300
Subject: [PATCH 594/712] imagemagick: add webp support

---
 pkgs/applications/graphics/ImageMagick/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix                    | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index b732a2ed916..78837f55af4 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, pkgconfig, libtool
 , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
-, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg
+, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp
 }:
 
 let
@@ -39,13 +39,14 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig libtool zlib fontconfig freetype ghostscript libjpeg
-      openexr libpng librsvg libtiff libxml2 openjpeg
+      openexr libpng librsvg libtiff libxml2 openjpeg libwebp
     ];
 
   propagatedBuildInputs =
     [ bzip2 freetype libjpeg libX11 libXext libXt lcms2 ];
 
   postInstall = ''
+
     (cd "$out/include" && ln -s ImageMagick* ImageMagick)
   '' + lib.optionalString (ghostscript != null) ''
     for la in $out/lib/*.la; do
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cb067817f54..a74438448f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12871,6 +12871,7 @@ in
     libtiff = null;
     libxml2 = null;
     openjpeg = null;
+    libwebp = null;
   };
 
   imagemagick = self.imagemagickBig.override {

From 6f7fdda06e69c7e37df14c6fb37529b4d2b24687 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Tue, 3 May 2016 15:29:31 +0300
Subject: [PATCH 595/712] rspamd: 1.2.5 -> 1.2.6

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

diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index a9da7953978..0888eb1182a 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -6,13 +6,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "rspamd-${version}";
-  version = "1.2.5";
+  version = "1.2.6";
 
   src = fetchFromGitHub {
     owner = "vstakhov";
     repo = "rspamd";
     rev = version;
-    sha256 = "0slpixcfd74qkm7445lmcry4s1yamayphzzyr7cxjlr9xfxlblqn";
+    sha256 = "152s8shanzm1z0ijcsvki21s4gy2v6lby82qh6ngwl6abh465gq9";
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl ];

From 7dea8d17a76f2164ad96c5da85835b38806269a5 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Tue, 3 May 2016 15:34:20 +0300
Subject: [PATCH 596/712] rmilter: 1.8.1 -> 1.8.4

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

diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix
index d5ba98bfbb3..85979ecca82 100644
--- a/pkgs/servers/mail/rmilter/default.nix
+++ b/pkgs/servers/mail/rmilter/default.nix
@@ -8,13 +8,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "rmilter-${version}";
-  version = "1.8.1";
+  version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "vstakhov";
     repo = "rmilter";
     rev = version;
-    sha256 = "0cplkc1acgysxn8id9wakd1fx0f76cazscpfqhrxyjbk5fb11ll4";
+    sha256 = "0d2hv39sbzsv3bkbx433vpdqgcjv71v2kkaz4k065xppi35wa2js";
   };
 
   nativeBuildInputs = [ bison cmake flex ];

From d092838a1c342747bd522abac875381134679137 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 2 May 2016 22:21:42 +0200
Subject: [PATCH 597/712] postfix: 3.0.3 -> 3.0.4

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

diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index 52327090e44..75685d7605e 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -23,11 +23,11 @@ in stdenv.mkDerivation rec {
 
   name = "postfix-${version}";
 
-  version = "3.0.3";
+  version = "3.0.4";
 
   src = fetchurl {
     url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz";
-    sha256 = "00mc12k5p1zlrlqcf33vh5zizaqr5ai8q78dwv69smjh6kn4c7j0";
+    sha256 = "03msimdzxndm1nskljarws45wpqk020ckfcrmn1p3pxrfq8yh75q";
   };
 
   buildInputs = [ makeWrapper gnused db openssl cyrus_sasl icu pcre ]

From 70ac1ec4224e2b85d01c12f5054e50828b982c00 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 2 May 2016 22:20:52 +0200
Subject: [PATCH 598/712] dovecot: 2.2.21 -> 2.2.24

---
 .../mail/dovecot/2.2.x-module_dir.patch       | 85 ++++++++++---------
 pkgs/servers/mail/dovecot/default.nix         |  4 +-
 2 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
index a6edc8d83ee..66059cff6f7 100644
--- a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
+++ b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
@@ -1,7 +1,8 @@
-diff -ur dovecot-2.2.12-orig/src/auth/main.c dovecot-2.2.12/src/auth/main.c
---- dovecot-2.2.12-orig/src/auth/main.c	2014-02-11 23:23:37.000000000 +0100
-+++ dovecot-2.2.12/src/auth/main.c	2014-03-14 09:28:17.642334838 +0100
-@@ -193,7 +193,7 @@
+diff --git a/src/auth/main.c b/src/auth/main.c
+index 5a87c57..74bff52 100644
+--- a/src/auth/main.c
++++ b/src/auth/main.c
+@@ -194,7 +194,7 @@ static void main_preinit(void)
  	mod_set.debug = global_auth_settings->debug;
  	mod_set.filter_callback = auth_module_filter;
  
@@ -10,7 +11,7 @@ diff -ur dovecot-2.2.12-orig/src/auth/main.c dovecot-2.2.12/src/auth/main.c
  	module_dir_init(modules);
  
  	if (!worker)
-@@ -223,7 +223,7 @@
+@@ -225,7 +225,7 @@ void auth_module_load(const char *names)
  	mod_set.debug = global_auth_settings->debug;
  	mod_set.ignore_missing = TRUE;
  
@@ -19,10 +20,11 @@ diff -ur dovecot-2.2.12-orig/src/auth/main.c dovecot-2.2.12/src/auth/main.c
  					  &mod_set);
  	module_dir_init(modules);
  }
-diff -ur dovecot-2.2.12-orig/src/config/all-settings.c dovecot-2.2.12/src/config/all-settings.c
---- dovecot-2.2.12-orig/src/config/all-settings.c	2014-02-11 23:31:37.000000000 +0100
-+++ dovecot-2.2.12/src/config/all-settings.c	2014-03-14 09:32:08.907608311 +0100
-@@ -773,7 +773,7 @@
+diff --git a/src/config/all-settings.c b/src/config/all-settings.c
+index de223a5..2df2d21 100644
+--- a/src/config/all-settings.c
++++ b/src/config/all-settings.c
+@@ -836,7 +836,7 @@ static const struct mail_user_settings mail_user_default_settings = {
  	.last_valid_gid = 0,
  
  	.mail_plugins = "",
@@ -31,20 +33,20 @@ diff -ur dovecot-2.2.12-orig/src/config/all-settings.c dovecot-2.2.12/src/config
  
  	.mail_log_prefix = "%s(%u): ",
  
-@@ -3304,7 +3304,7 @@
+@@ -3545,7 +3545,7 @@ const struct doveadm_settings doveadm_default_settings = {
  	.base_dir = PKG_RUNDIR,
  	.libexec_dir = PKG_LIBEXECDIR,
  	.mail_plugins = "",
 -	.mail_plugin_dir = MODULEDIR,
 +	.mail_plugin_dir = "/etc/dovecot/modules",
+ 	.auth_debug = FALSE,
  	.auth_socket_path = "auth-userdb",
  	.doveadm_socket_path = "doveadm-server",
- 	.doveadm_worker_count = 0,
-Only in dovecot-2.2.12/src/config: all-settings.c.orig
-diff -ur dovecot-2.2.12-orig/src/config/config-parser.c dovecot-2.2.12/src/config/config-parser.c
---- dovecot-2.2.12-orig/src/config/config-parser.c	2014-02-11 23:23:37.000000000 +0100
-+++ dovecot-2.2.12/src/config/config-parser.c	2014-03-14 09:28:17.645334840 +0100
-@@ -990,7 +990,7 @@
+diff --git a/src/config/config-parser.c b/src/config/config-parser.c
+index 2a5009a..134f92b 100644
+--- a/src/config/config-parser.c
++++ b/src/config/config-parser.c
+@@ -1047,7 +1047,7 @@ void config_parse_load_modules(void)
  
  	memset(&mod_set, 0, sizeof(mod_set));
  	mod_set.abi_version = DOVECOT_ABI_VERSION;
@@ -53,10 +55,11 @@ diff -ur dovecot-2.2.12-orig/src/config/config-parser.c dovecot-2.2.12/src/confi
  	module_dir_init(modules);
  
  	i_array_init(&new_roots, 64);
-diff -ur dovecot-2.2.12-orig/src/dict/main.c dovecot-2.2.12/src/dict/main.c
---- dovecot-2.2.12-orig/src/dict/main.c	2014-02-11 23:23:37.000000000 +0100
-+++ dovecot-2.2.12/src/dict/main.c	2014-03-14 09:28:17.645334840 +0100
-@@ -61,7 +61,7 @@
+diff --git a/src/dict/main.c b/src/dict/main.c
+index e6c945e..06ad6c5 100644
+--- a/src/dict/main.c
++++ b/src/dict/main.c
+@@ -62,7 +62,7 @@ static void main_init(void)
  	mod_set.abi_version = DOVECOT_ABI_VERSION;
  	mod_set.require_init_funcs = TRUE;
  
@@ -65,23 +68,24 @@ diff -ur dovecot-2.2.12-orig/src/dict/main.c dovecot-2.2.12/src/dict/main.c
  	module_dir_init(modules);
  
  	/* Register only after loading modules. They may contain SQL drivers,
-diff -ur dovecot-2.2.12-orig/src/doveadm/doveadm-settings.c dovecot-2.2.12/src/doveadm/doveadm-settings.c
---- dovecot-2.2.12-orig/src/doveadm/doveadm-settings.c	2014-02-11 23:23:37.000000000 +0100
-+++ dovecot-2.2.12/src/doveadm/doveadm-settings.c	2014-03-14 09:32:56.540087069 +0100
-@@ -77,7 +77,7 @@
+diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c
+index df12284..19c18da 100644
+--- a/src/doveadm/doveadm-settings.c
++++ b/src/doveadm/doveadm-settings.c
+@@ -81,7 +81,7 @@ const struct doveadm_settings doveadm_default_settings = {
  	.base_dir = PKG_RUNDIR,
  	.libexec_dir = PKG_LIBEXECDIR,
  	.mail_plugins = "",
 -	.mail_plugin_dir = MODULEDIR,
 +	.mail_plugin_dir = "/etc/dovecot/modules",
+ 	.auth_debug = FALSE,
  	.auth_socket_path = "auth-userdb",
  	.doveadm_socket_path = "doveadm-server",
- 	.doveadm_worker_count = 0,
-Only in dovecot-2.2.12/src/doveadm: doveadm-settings.c.orig
-diff -ur dovecot-2.2.12-orig/src/lib-fs/fs-api.c dovecot-2.2.12/src/lib-fs/fs-api.c
---- dovecot-2.2.12-orig/src/lib-fs/fs-api.c	2014-02-11 23:23:37.000000000 +0100
-+++ dovecot-2.2.12/src/lib-fs/fs-api.c	2014-03-14 09:28:17.646334843 +0100
-@@ -89,7 +89,7 @@
+diff --git a/src/lib-fs/fs-api.c b/src/lib-fs/fs-api.c
+index b50fbe0..ace3aff 100644
+--- a/src/lib-fs/fs-api.c
++++ b/src/lib-fs/fs-api.c
+@@ -114,7 +114,7 @@ static void fs_class_try_load_plugin(const char *driver)
  	mod_set.abi_version = DOVECOT_ABI_VERSION;
  	mod_set.ignore_missing = TRUE;
  
@@ -90,11 +94,11 @@ diff -ur dovecot-2.2.12-orig/src/lib-fs/fs-api.c dovecot-2.2.12/src/lib-fs/fs-ap
  					     module_name, &mod_set);
  	module_dir_init(fs_modules);
  
-Only in dovecot-2.2.12/src/lib-fs: fs-api.c.orig
-diff -ur dovecot-2.2.12-orig/src/lib-ssl-iostream/iostream-ssl.c dovecot-2.2.12/src/lib-ssl-iostream/iostream-ssl.c
---- dovecot-2.2.12-orig/src/lib-ssl-iostream/iostream-ssl.c	2014-02-11 23:23:37.000000000 +0100
-+++ dovecot-2.2.12/src/lib-ssl-iostream/iostream-ssl.c	2014-03-14 09:28:17.646334843 +0100
-@@ -30,7 +30,7 @@
+diff --git a/src/lib-ssl-iostream/iostream-ssl.c b/src/lib-ssl-iostream/iostream-ssl.c
+index a0659ab..dba3729 100644
+--- a/src/lib-ssl-iostream/iostream-ssl.c
++++ b/src/lib-ssl-iostream/iostream-ssl.c
+@@ -29,7 +29,7 @@ static int ssl_module_load(const char **error_r)
  	memset(&mod_set, 0, sizeof(mod_set));
  	mod_set.abi_version = DOVECOT_ABI_VERSION;
  	mod_set.setting_name = "<built-in lib-ssl-iostream lookup>";
@@ -103,11 +107,11 @@ diff -ur dovecot-2.2.12-orig/src/lib-ssl-iostream/iostream-ssl.c dovecot-2.2.12/
  
  	ssl_vfuncs = module_get_symbol(ssl_module, "ssl_vfuncs");
  	if (ssl_vfuncs == NULL) {
-Only in dovecot-2.2.12/src/lib-ssl-iostream: iostream-ssl.c.orig
-diff -ur dovecot-2.2.12-orig/src/lib-storage/mail-storage-settings.c dovecot-2.2.12/src/lib-storage/mail-storage-settings.c
---- dovecot-2.2.12-orig/src/lib-storage/mail-storage-settings.c	2014-02-11 23:23:37.000000000 +0100
-+++ dovecot-2.2.12/src/lib-storage/mail-storage-settings.c	2014-03-14 09:28:17.646334843 +0100
-@@ -262,7 +262,7 @@
+diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
+index e2233bf..bbf981e 100644
+--- a/src/lib-storage/mail-storage-settings.c
++++ b/src/lib-storage/mail-storage-settings.c
+@@ -274,7 +274,7 @@ static const struct mail_user_settings mail_user_default_settings = {
  	.last_valid_gid = 0,
  
  	.mail_plugins = "",
@@ -116,4 +120,3 @@ diff -ur dovecot-2.2.12-orig/src/lib-storage/mail-storage-settings.c dovecot-2.2
  
  	.mail_log_prefix = "%s(%u): ",
  
-Only in dovecot-2.2.12/src/lib-storage: mail-storage-settings.c.orig
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index ec4c5c935af..5bfdc594924 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dovecot-2.2.21";
+  name = "dovecot-2.2.24";
 
   nativeBuildInputs = [ perl pkgconfig ];
   buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ]
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://dovecot.org/releases/2.2/${name}.tar.gz";
-    sha256 = "080bil83gr2dski4gk2bxykg2g497kqm2hn2z4xkbw71b6g17dvs";
+    sha256 = "1dxymvvkykbrx3crb8qsixizgjz23jikxg6vsc1mgswdxa8nij3i";
   };
 
   preConfigure = ''

From c0f4361902d786459b29d69913f606a4a7f92d1c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 1 May 2016 14:41:52 +0200
Subject: [PATCH 599/712] php: Fix openssl module build

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

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index c9fbf5c5de6..d6b4e03a2f6 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -154,8 +154,8 @@ let
         };
 
         openssl = {
-          configureFlags = ["--enable-openssl"];
-          buildInputs = [openssl];
+          configureFlags = ["--with-openssl"];
+          buildInputs = [openssl openssl.dev];
         };
 
         mbstring = {

From ffdcdb5124d0542bb61f16556fdd60ea5f73971a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 26 Apr 2016 01:02:04 +0200
Subject: [PATCH 600/712] znapzend: 0.15.3 -> 0.15.5

---
 pkgs/tools/backup/znapzend/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix
index 1534a0bab0a..d4658132930 100644
--- a/pkgs/tools/backup/znapzend/default.nix
+++ b/pkgs/tools/backup/znapzend/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }:
 
 let
-  version = "0.15.3";
-  checksum = "1xk0lgb23kv1cl0wc2rav75hjrjigd0cp3hjw9gxab835vsvnkq0";
+  version = "0.15.5";
+  checksum = "09cf9n5i1wxlkhq8ky9npg1a6qiz4blizhbb9390gy0m0wl9l7zw";
 in
 stdenv.mkDerivation rec {
   name = "znapzend-${version}";
 
-  src = fetchFromGitHub{
+  src = fetchFromGitHub {
     owner = "oetiker";
     repo = "znapzend";
     rev = "v${version}";
@@ -61,7 +61,6 @@ stdenv.mkDerivation rec {
       "
   '';
 
-
   meta = with stdenv.lib; {
     description = "High performance open source ZFS backup with mbuffer and ssh support";
     homepage    = http://www.znapzend.org;

From b9fc31a4152a0e89c57231220c8e853606d5a5ce Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 3 May 2016 16:07:59 +0200
Subject: [PATCH 601/712] popcorntime: mark as broken

A temporary measure, short of removal, until
https://github.com/NixOS/nixpkgs/issues/15120 has been resolved.
---
 pkgs/applications/video/popcorntime/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/video/popcorntime/default.nix b/pkgs/applications/video/popcorntime/default.nix
index 63c5f0460f2..5b71f9901e1 100644
--- a/pkgs/applications/video/popcorntime/default.nix
+++ b/pkgs/applications/video/popcorntime/default.nix
@@ -40,5 +40,6 @@ in stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ bobvanderlinden rnhmjoj ];
+    broken = true;
   };
 }

From a6fdcea877889ff56f533e7bda7c0c57e56f0b72 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 24 Apr 2016 17:39:36 +0200
Subject: [PATCH 602/712] cimg: 1.5.9 -> 1.7.0

---
 pkgs/development/libraries/cimg/builder.sh  |  7 +++----
 pkgs/development/libraries/cimg/default.nix | 15 ++++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/cimg/builder.sh b/pkgs/development/libraries/cimg/builder.sh
index bbd5f712551..6473395493c 100644
--- a/pkgs/development/libraries/cimg/builder.sh
+++ b/pkgs/development/libraries/cimg/builder.sh
@@ -4,9 +4,8 @@ source $stdenv/setup
 unpackPhase
 cd $sourceRoot
 
-install -dm 755 $out/include/cimg $out/share/doc/cimg/html $out/share/cimg/examples $out/share/cimg/plugins
+install -dm 755 $out/include/cimg $doc/share/doc/cimg/html $doc/share/cimg/examples $doc/share/cimg/plugins
 
 install -m 644 CImg.h $out/include/cimg
-cp -dr --no-preserve=ownership html/* $out/share/doc/cimg/html/
-cp -dr --no-preserve=ownership examples/* $out/share/cimg/examples/
-cp -dr --no-preserve=ownership plugins/* $out/share/cimg/plugins/
+cp -dr --no-preserve=ownership examples/* $doc/share/cimg/examples/
+cp -dr --no-preserve=ownership plugins/* $doc/share/cimg/plugins/
diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix
index dc397adf491..722852f1270 100644
--- a/pkgs/development/libraries/cimg/default.nix
+++ b/pkgs/development/libraries/cimg/default.nix
@@ -4,21 +4,22 @@
 stdenv.mkDerivation rec {
 
   name = "cimg-${version}";
-  version = "1.5.9";
+  version = "1.7.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/cimg/CImg-${version}.zip";
-    sha256 = "1xn20643gcbl76kvy9ajhwbyjjb73mg65q32ma8mdkwn1qhn7f7c";
+    url = "http://cimg.eu/files/CImg_${version}.zip";
+    sha256 = "06j3n7gvgxzvprqwf56nnca195y38dcbdlszrxyn5p9w9al437zj";
   };
 
-  buildInputs = with stdenv.lib;
-  [ unzip ];
+  buildInputs = [ unzip ];
 
   builder = ./builder.sh;
-  
+
+  outputs = [ "out" "doc" ];
+
   meta = with stdenv.lib; {
     description = "A small, open source, C++ toolkit for image processing";
-    homepage = http://cimg.sourceforge.net/;
+    homepage = http://cimg.eu/;
     license = licenses.cecill-c;
     maintainers = [ maintainers.AndersonTorres ];
     platforms = platforms.unix;

From e07b06d12a08b23bf90b9d75e90ea815c975dc30 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 13 Apr 2016 04:58:54 +0200
Subject: [PATCH 603/712] tgt: 1.0.60 -> 1.0.63

---
 pkgs/tools/networking/tgt/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix
index f870b5463b6..bd4be0f1b86 100644
--- a/pkgs/tools/networking/tgt/default.nix
+++ b/pkgs/tools/networking/tgt/default.nix
@@ -2,14 +2,15 @@
 , docbook_xsl }:
 
 let
-  version = "1.0.60";
+  version = "1.0.63";
 in stdenv.mkDerivation rec {
   name = "tgt-${version}";
+
   src = fetchFromGitHub {
     owner = "fujita";
     repo = "tgt";
-    rev = "ab51727a361bf296b1c2036375b5e45479059921";
-    sha256 = "1bf8rn3mavjrzkp5k23akqn5ilw43g8mpfr68z1bi8s9lr2gkf37";
+    rev = "v${version}";
+    sha256 = "1x3irnbfikdqhlikhwqazg0g0hc1df5r2bp001f13sr0nvw28y1n";
   };
 
   buildInputs = [ libxslt systemd libaio docbook_xsl ];
@@ -30,6 +31,7 @@ in stdenv.mkDerivation rec {
   '';
 
   enableParallelBuilding = true;
+
   meta = {
     description = "iSCSI Target daemon with rdma support";
     license = stdenv.lib.licenses.gpl2;

From e027ef7cb866f6cf40c2139eddf8fd43b8aafa8d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 13 Apr 2016 04:53:24 +0200
Subject: [PATCH 604/712] iw: 4.1 -> 4.3

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

diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix
index 3cd2567d96f..53aa15ec62e 100644
--- a/pkgs/os-specific/linux/iw/default.nix
+++ b/pkgs/os-specific/linux/iw/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, libnl, pkgconfig}:
 
 stdenv.mkDerivation rec {
-  name = "iw-4.1";
+  name = "iw-4.3";
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/network/iw/${name}.tar.xz";
-    sha256 = "0jx3s5wdvm2qxd3h883fnyjsb1c29qcsz1r19bc029g8v2nalr2i";
+    sha256 = "085jyvrxzarvn5jl0fk618jjxy50nqx7ifngszc4jxk6a4ddibd6";
   };
 
   buildInputs = [ libnl pkgconfig ];

From d8230abeed7168a044a231797678754c671c160b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 13 Apr 2016 03:30:17 +0200
Subject: [PATCH 605/712] libass: 0.12.2 -> 0.13.2

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

diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix
index ab300729acc..1acd71c30c8 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@@ -18,11 +18,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libass-${version}";
-  version = "0.12.2";
+  version = "0.13.2";
 
   src = fetchurl {
     url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz";
-    sha256 = "1qzibgqmnnqk2r116lpk1br764g0v74f2zp12y5id0p1plaing37";
+    sha256 = "1kpsw4zw95v4cjvild9wpk73dzavn1khsm3bm32kcz6amnkd166n";
   };
 
   configureFlags = [

From 47a7b42d511f492f3c67d66234c1c9fe7cbab0ae Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 13 Apr 2016 03:06:10 +0200
Subject: [PATCH 606/712] collectd: 5.5.0 -> 5.5.1

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

diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index 5f42e39871a..8676ce31c66 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -31,12 +31,12 @@
 , yajl ? null
 }:
 stdenv.mkDerivation rec {
-  version = "5.5.0";
+  version = "5.5.1";
   name = "collectd-${version}";
 
   src = fetchurl {
     url = "http://collectd.org/files/${name}.tar.bz2";
-    sha256 = "847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88";
+    sha256 = "0gxwq3jl20wgvb7qawivshpkm4i3kvghpnfcn5yrlhphw4kdbigr";
   };
 
   buildInputs = [

From ed64199876f8329fa847f9fb2adf97df2b130145 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 13 Apr 2016 02:46:24 +0200
Subject: [PATCH 607/712] libdwg: 0.3 -> 0.6

---
 pkgs/development/libraries/libdwg/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/development/libraries/libdwg/default.nix
index a80c0677a3b..8ffa1ff8192 100644
--- a/pkgs/development/libraries/libdwg/default.nix
+++ b/pkgs/development/libraries/libdwg/default.nix
@@ -1,13 +1,15 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, indent}:
 
 stdenv.mkDerivation {
-  name = "libdwg-0.3";
+  name = "libdwg-0.6";
 
   src = fetchurl {
-    url = mirror://sourceforge/libdwg/libdwg-0.3.tar.bz2;
-    sha256 = "0lx7ih00m11qw9wsc5ksmwvi3d80l0yfwnbrn5qfz182w4d3fpc9";
+    url = mirror://sourceforge/libdwg/libdwg-0.6.tar.bz2;
+    sha256 = "0l8ks1x70mkna1q7mzy1fxplinz141bd24qhrm1zkdil74mcsryc";
   };
 
+  nativeBuildInputs = [ indent ];
+
   meta = {
     description = "library reading dwg files";
     homepage = http://libdwg.sourceforge.net/en/;

From bc233fa54e1a66b53393c27272915d878a607508 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 13 Apr 2016 02:32:51 +0200
Subject: [PATCH 608/712] arandr: 0.1.8 -> 0.1.9

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

diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix
index 68355d0d8aa..676800f73e9 100644
--- a/pkgs/tools/X11/arandr/default.nix
+++ b/pkgs/tools/X11/arandr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, xrandr, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "arandr-0.1.8";
+  name = "arandr-0.1.9";
 
   src = fetchurl {
     url = "http://christian.amsuess.com/tools/arandr/files/${name}.tar.gz";
-    sha256 = "0d574mbmhaqmh7kivaryj2hpghz6xkvic9ah43s1hf385y7c33kd";
+    sha256 = "1i3f1agixxbfy4kxikb2b241p7c2lg73cl9wqfvlwz3q6zf5faxv";
   };
 
   patchPhase = ''

From 13b9d32917bc613f293688989bfa6e25fe5f3e59 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 13 Apr 2016 02:25:25 +0200
Subject: [PATCH 609/712] libu2f-host: 1.0.0 -> 1.1.1

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

diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix
index dc2481a2e85..98dbe517591 100644
--- a/pkgs/development/libraries/libu2f-host/default.nix
+++ b/pkgs/development/libraries/libu2f-host/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, json_c, hidapi }:
 
 stdenv.mkDerivation rec {
-  name = "libu2f-host-1.0.0";
+  name = "libu2f-host-1.1.1";
 
   src = fetchurl {
     url = "https://developers.yubico.com/libu2f-host/Releases/${name}.tar.xz";
-    sha256 = "0x232rp325k1l3rdh1b9d7w3w2z2lhjmp95v4mlmd8pybjdnpi8q";
+    sha256 = "0g0f012w0c00cvj5g319x2b8prbh0d3fcac9960cy7xsd8chckg1";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 669cd2adbf984fb509ed61585fc92bde41b65871 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 13 Apr 2016 02:21:20 +0200
Subject: [PATCH 610/712] lighttpd: 1.4.37 -> 1.4.39

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

diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index 60848516155..af029cc4db2 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -7,11 +7,11 @@ assert enableMagnet -> lua5_1 != null;
 assert enableMysql -> mysql != null;
 
 stdenv.mkDerivation rec {
-  name = "lighttpd-1.4.37";
+  name = "lighttpd-1.4.39";
 
   src = fetchurl {
     url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
-    sha256 = "1gbri5avg1jv2g585wk0jp53mf9jjdz2py9774mxm8bwarh6ykl0";
+    sha256 = "0nrnhxl1ypzgsms0ky6zdf6ib94vf8x77c422s2xav9x7j2s3fby";
   };
 
   buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ]

From 117920233f11d66423b541374ef0acac5f2d5dd2 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 13 Apr 2016 01:33:25 +0200
Subject: [PATCH 611/712] flashrom: 0.9.7 -> 0.9.9

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

diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix
index b514f1c920f..9db6fbca6fa 100644
--- a/pkgs/tools/misc/flashrom/default.nix
+++ b/pkgs/tools/misc/flashrom/default.nix
@@ -1,15 +1,16 @@
 { stdenv, fetchurl, pkgconfig, libftdi, pciutils }:
 
-let version = "0.9.7"; in
+let version = "0.9.9"; in
 stdenv.mkDerivation rec {
   name = "flashrom-${version}";
 
   src = fetchurl {
     url = "http://download.flashrom.org/releases/${name}.tar.bz2";
-    sha256 = "5a55212d00791981a9a1cb0cdca9d9e58bea6d399864251e7b410b4d3d6137e9";
+    sha256 = "0i9wg1lyfg99bld7d00zqjm9f0lk6m0q3h3n9c195c9yysq5ccfb";
   };
 
-  buildInputs = [ pkgconfig libftdi pciutils ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libftdi pciutils ];
 
   preConfigure = "export PREFIX=$out";
 

From 0ab30ecf06d5bf5271e4d256954f734d723b6f0a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 13 Apr 2016 01:20:49 +0200
Subject: [PATCH 612/712] libopus: 1.1 -> 1.1.2

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

diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index b8951e66c8b..20101fe6fe3 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, fixedPoint ? false, withCustomModes ? true }:
 
 let
-  version = "1.1";
+  version = "1.1.2";
 in
 stdenv.mkDerivation rec {
   name = "libopus-${version}";
 
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/opus/opus-${version}.tar.gz";
-    sha256 = "158xprn2086arvdib3vbbygz7z6jqkw2nci7nlywzzwallap0wmr";
+    sha256 = "1z87x5c5x951lhnm70iqr2gqn15wns5cqsw8nnkvl48jwdw00a8f";
   };
 
   outputs = [ "dev" "out" ];

From 7ac522ad83f7d952bc2dd193f77c5e732e575413 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 13 Apr 2016 01:20:33 +0200
Subject: [PATCH 613/712] libevdev: 1.4.5 -> 1.4.6

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

diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix
index c1587cedd16..3ff40141b16 100644
--- a/pkgs/development/libraries/libevdev/default.nix
+++ b/pkgs/development/libraries/libevdev/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "libevdev-1.4.5";
+  name = "libevdev-1.4.6";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz";
-    sha256 = "07faqb47c7sjl25rc788cbslyiv5ijky0jc4g6312qz0hv55h779";
+    sha256 = "1lrja526iyg48yw6i0dxdhyj63q9gwbgvj6xk1hskxzrqyhf2akv";
   };
 
   buildInputs = [ python ];

From b4a5bb3d4be7104bf933a0012af522cb3081d241 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 13 Apr 2016 01:20:18 +0200
Subject: [PATCH 614/712] libev: 4.20 -> 4.22

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

diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix
index 0472aeef694..37e0c9b3431 100644
--- a/pkgs/development/libraries/libev/default.nix
+++ b/pkgs/development/libraries/libev/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libev-${version}";
-  version="4.20";
+  version="4.22";
 
   src = fetchurl {
     url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz";
-    sha256 = "17j47pbkr65a18mfvy2861p5k7w4pxmdgiw723ryfqd9gx636w7q";
+    sha256 = "1mhvy38g9947bbr0n0hzc34zwfvvfd99qgzpkbap8g2lmkl7jq3k";
   };
 
   meta = {

From 9f99116772ffd2a394f9fe2f084b6cd67c099d96 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 13 Apr 2016 01:15:48 +0200
Subject: [PATCH 615/712] libnatspec: 0.2.6 -> 0.3.0

---
 pkgs/development/libraries/libnatspec/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix
index 7dafe3434f9..cdde02c361f 100644
--- a/pkgs/development/libraries/libnatspec/default.nix
+++ b/pkgs/development/libraries/libnatspec/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchurl, popt, libiconv }:
+{ stdenv, fetchurl, autoreconfHook, popt, libiconv }:
 
 stdenv.mkDerivation (rec {
-  name = "libnatspec-0.2.6";
+  name = "libnatspec-0.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/natspec/${name}.tar.bz2";
-    sha256 = "0zvm9afh1skxgdv62ylrpwyykpjhhskxj0zv7yrdf7jhfdriz0y3";
+    sha256 = "0wffxjlc8svilwmrcg3crddpfrpv35mzzjgchf8ygqsvwbrbb3b7";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
+
   buildInputs = [ popt ];
 
   meta = {

From c3df9b0650af1d4a528e280261a9e2037c9062f3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 13 Apr 2016 01:11:00 +0200
Subject: [PATCH 616/712] libnl: 3.2.26 -> 3.2.27

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

diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix
index 1e1ed0a6112..6e5c63a2722 100644
--- a/pkgs/os-specific/linux/libnl/default.nix
+++ b/pkgs/os-specific/linux/libnl/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig }:
 
-let version = "3.2.26"; in
+let version = "3.2.27"; in
 stdenv.mkDerivation {
   name = "libnl-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "1cbqdhirn6hxmv8xkm8xp3n6ayyxw7sbi15fym167rdz0h9rkhmm";
-    rev = "libnl3_2_26";
+    sha256 = "1rc8plgl2ijq2pwlzinpfr06kiggjyx71r3lw505m6rvxvdac82r";
+    rev = "libnl3_2_27";
     repo = "libnl";
     owner = "thom311";
   };

From 738661953878ed0c67c23bbfffe73d05da25c190 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 13 Apr 2016 01:06:26 +0200
Subject: [PATCH 617/712] libseccomp: 2.2.3 -> 2.3.0

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

diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
index 444b68a23ee..63a60820e3f 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, getopt }:
 
-let version = "2.2.3"; in
+let version = "2.3.0"; in
 
 stdenv.mkDerivation rec {
   name = "libseccomp-${version}";
 
   src = fetchurl {
     url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz";
-    sha256 = "d9b400b703cab7bb04b84b9b6e52076a630b673819d7541757bcc16467b6d49e";
+    sha256 = "07chdgr87aayn6sjm94y6gisl4j6si1hr9cqhs09l9bqfnky6mnp";
   };
 
   buildInputs = [ getopt ];

From 57b5c22feb90376bea9e0fe4a4c3405bb59eeacf Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 13 Apr 2016 01:06:10 +0200
Subject: [PATCH 618/712] libsecret: 0.18 -> 0.18.5

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

diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index 3ceabc3f1ac..bb8d971d6d4 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk_doc
 , libgcrypt, gobjectIntrospection }:
 let
-  version = "0.18";
+  version = "0.18.5";
 in
 stdenv.mkDerivation rec {
   name = "libsecret-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libsecret/${version}/${name}.tar.xz";
-    sha256 = "1qq29c01xxjyx5sl6y5h22w8r0ff4c73bph3gfx3h7mx5mvalwqc";
+    url = "mirror://gnome/sources/libsecret/0.18/${name}.tar.xz";
+    sha256 = "1cychxc3ff8fp857iikw0n2s13s2mhw2dn1mr632f7w3sn6vvrww";
   };
 
   propagatedBuildInputs = [ glib ];

From dc576f940383c379692badf968800bbb228695eb Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 13 Apr 2016 00:12:59 +0200
Subject: [PATCH 619/712] libxmp: 4.3.11 -> 4.3.12

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

diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix
index 106fcee257f..28584d14a87 100644
--- a/pkgs/development/libraries/libxmp/default.nix
+++ b/pkgs/development/libraries/libxmp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libxmp-4.3.11";
+  name = "libxmp-4.3.12";
 
   meta = with stdenv.lib; {
     description = "Extended module player library";
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/xmp/libxmp/${name}.tar.gz";
-    sha256 = "0r9qhps2a8nc850bislkgjzlamwl671r1sag1mi8k1a9gxq4n9kx";
+    sha256 = "1536dfxgxl6dyvkdby8lxzi9f7y2qlwl8ylrkybips3ampcqgkhm";
   };
 }

From 50884acd8418e157b5b1a9759095379efd0adb89 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 12 Apr 2016 23:49:33 +0200
Subject: [PATCH 620/712] lzip: 1.16 -> 1.17

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

diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix
index b3d407c98ef..912a0b6f0f2 100644
--- a/pkgs/tools/compression/lzip/default.nix
+++ b/pkgs/tools/compression/lzip/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "lzip-1.16";
+  name = "lzip-1.17";
 
   buildInputs = [ texinfo ];
 
   src = fetchurl {
     url = "mirror://savannah/lzip/${name}.tar.gz";
-    sha256 = "0l9724rw1l3hg2ldr3n7ihqich4m9nc6y7l302bvdj4jmxdw530j";
+    sha256 = "0lh3x964jjldx3piax6c2qzlhfiir5i6rnrcn8ri44rk19g8ahwl";
   };
 
   configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3";

From b701ea82e7c757e80b7867af7095e55f0be4a5da Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 12 Apr 2016 22:52:02 +0200
Subject: [PATCH 621/712] netperf: 2.6.0 -> 2.7.0

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

diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix
index 705f1455c45..40aa3263629 100644
--- a/pkgs/applications/networking/netperf/default.nix
+++ b/pkgs/applications/networking/netperf/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "netperf-2.6.0";
+  name = "netperf-2.7.0";
 
   src = fetchurl {
     url = "ftp://ftp.netperf.org/netperf/${name}.tar.bz2";
-    sha256 = "cd8dac710d4273d29f70e8dbd09353a6362ac58a11926e0822233c0cb230323a";
+    sha256 = "0nip8178pdry0pqx2gkz0sl2gcvc7qww621q43kqnp43amvg2al4";
   };
 
   meta = {

From dd3c18fe2223e14444a7417012b707a679a2e808 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 12 Apr 2016 22:50:28 +0200
Subject: [PATCH 622/712] openh264: 1.4.0 -> 1.5.0

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

diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix
index 76188d484f9..71983b30a2c 100644
--- a/pkgs/development/libraries/openh264/default.nix
+++ b/pkgs/development/libraries/openh264/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, nasm }:
 
 stdenv.mkDerivation rec {
-  name = "openh264-1.4.0";
+  name = "openh264-1.5.0";
 
   src = fetchurl {
-    url = "https://github.com/cisco/openh264/archive/v1.4.0.tar.gz";
-    sha256 = "08haj0xkyjlwbpqdinxk0cmvqw89bx89ly0kqs9lf87fy6ksgfd1";
+    url = "https://github.com/cisco/openh264/archive/v1.5.0.tar.gz";
+    sha256 = "1d97dh5hzmy46jamfw03flvcz8md1hxp6y5n0b787h8ks7apn1wq";
   };
 
   buildInputs = [ nasm ];

From d7338bf9d72d95a59658f811d17716f76e737ffd Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 12 Apr 2016 22:26:44 +0200
Subject: [PATCH 623/712] msmtp: 1.6.2 -> 1.6.4

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

diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index e78605392be..0754d4f2815 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn, Security }:
 
 stdenv.mkDerivation rec {
-  version = "1.6.2";
+  version = "1.6.4";
   name = "msmtp-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/msmtp/${name}.tar.xz";
-    sha256 = "12c7ljahb06pgn8yvvw526xvr11vnr6d4nr0apylixddpxycsvig";
+    sha256 = "1kfihblm769s4hv8iah5mqynqd6hfwlyz5rcg2v423a4llic0jcv";
   };
 
   buildInputs = [ openssl pkgconfig gnutls gsasl libidn ]

From 18964796e6b954be742dbaf4da0475fc3b430ca6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 12 Apr 2016 22:25:16 +0200
Subject: [PATCH 624/712] mc: 4.8.12 -> 4.8.16

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

diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index 94c08fa9ba9..9347b5f9bbe 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -2,11 +2,11 @@
 , libX11, libICE, perl, zip, unzip, gettext, slang}:
 
 stdenv.mkDerivation rec {
-  name = "mc-4.8.12";
+  name = "mc-4.8.16";
   
   src = fetchurl {
-    url = http://www.midnight-commander.org/downloads/mc-4.8.12.tar.bz2;
-    sha256 = "15lkwcis0labshq9k8c2fqdwv8az2c87qpdqwp5p31s8gb1gqm0h";
+    url = http://www.midnight-commander.org/downloads/mc-4.8.16.tar.bz2;
+    sha256 = "1y5apnp6sc9sn13m6816hlrr0dis1z7wsnffldsx7xlkvyas8zn3";
   };
   
   buildInputs = [ pkgconfig perl glib gpm slang zip unzip file gettext libX11 libICE e2fsprogs ];

From 1ec3e7197165dfc5ec59e6c202c1f0e3410b6441 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 12 Apr 2016 22:21:49 +0200
Subject: [PATCH 625/712] libdvdread: 5.0.2 -> 5.0.3

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

diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index 493be4c8f86..ef717fedb22 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libdvdread-${version}";
-  version = "5.0.2";
+  version = "5.0.3";
 
   src = fetchurl {
     url = "http://get.videolan.org/libdvdread/${version}/${name}.tar.bz2";
-    sha256 = "82cbe693f2a3971671e7428790b5498392db32185b8dc8622f7b9cd307d3cfbf";
+    sha256 = "0ayqiq0psq18rcp6f5pz82sxsq66v0kwv0y55dbrcg68plnxy71j";
   };
 
   buildInputs = [libdvdcss];

From d1998b93d765f1c7584018f43da3fa02d71b3956 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 12 Apr 2016 20:29:40 +0200
Subject: [PATCH 626/712] lftp: 4.6.4 -> 4.7.1

---
 pkgs/tools/networking/lftp/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix
index ea7ec605e2b..bf39c36e02b 100644
--- a/pkgs/tools/networking/lftp/default.nix
+++ b/pkgs/tools/networking/lftp/default.nix
@@ -1,17 +1,22 @@
-{ stdenv, fetchurl, gnutls, pkgconfig, readline, zlib }:
+{ stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn }:
 
 stdenv.mkDerivation rec {
-  name = "lftp-4.6.4";
+  name = "lftp-4.7.1";
 
   src = fetchurl {
     urls = [
       "http://lftp.yar.ru/ftp/${name}.tar.bz2"
       "http://lftp.yar.ru/ftp/old/${name}.tar.bz2"
       ];
-    sha256 = "0zj0dd6s3nzwdawxjp0xw31ipsa4vzimmg5bzq952q2f29vd0akn";
+    sha256 = "0n4l0n6ra6z5lh6v79hc0r0hhrsq0l6c47ir15vmq80sbgc9mmwv";
   };
 
-  buildInputs = [ gnutls pkgconfig readline zlib ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gnutls readline zlib libidn ];
+
+  configureFlags = [
+    "--with-readline=${readline}"
+  ];
 
   meta = with stdenv.lib; {
     description = "A file transfer program supporting a number of network protocols";

From d5dd5e05f17c02bd45abf9f9ece33d2037e0cf94 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 12 Apr 2016 18:15:21 +0200
Subject: [PATCH 627/712] glxinfo: 8.1.0 -> 8.3.0

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

diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix
index 35bc1e610de..d2c2f30d6fc 100644
--- a/pkgs/tools/graphics/glxinfo/default.nix
+++ b/pkgs/tools/graphics/glxinfo/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, xlibsWrapper, mesa}:
 
-let version = "8.1.0"; in
+let version = "8.3.0"; in
 
 stdenv.mkDerivation {
   name = "glxinfo-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${version}/mesa-demos-${version}.tar.bz2";
-    sha256 = "0a58hw5850731p4smz4zqsbvyxvgjf7n5xdbs9l1wamk8q3gl0wp";
+    sha256 = "1vqb7s5m3fcg2csbiz45mha1pys2xx6rhw94fcyvapqdpm5iawy1";
   };
 
   buildInputs = [xlibsWrapper mesa];
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   buildPhase = "
     cd src/xdemos
-    gcc glxinfo.c -o glxinfo -lGL -lX11
+    gcc glxinfo.c glinfo_common.c -o glxinfo -lGL -lX11
     gcc glxgears.c -o glxgears -lGL -lX11
   ";
 

From b8aaa3f130a68f6626f818a298acc8322088b85d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 12 Apr 2016 17:37:46 +0200
Subject: [PATCH 628/712] fping: 3.10 -> 3.13

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

diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix
index ab935dc1111..83899c2380c 100644
--- a/pkgs/tools/networking/fping/default.nix
+++ b/pkgs/tools/networking/fping/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "fping-3.10";
+  name = "fping-3.13";
 
   src = fetchurl {
     url = "http://www.fping.org/dist/${name}.tar.gz";
-    sha256 = "1n2psfxgww6wg5rz8rly06xkghgp8lshx2lx6rramrigyd1fhiyd";
+    sha256 = "082pis2c2ad6kkj35zmsf6xb2lm8v8hdrnjiwl529ldk3kyqxcjb";
   };
 
   meta = {

From 9da6390bae7bfe6d0c23622747675fc495d47545 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 12 Apr 2016 17:13:16 +0200
Subject: [PATCH 629/712] ethtool: 4.0 -> 4.5

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

diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index 16af347e551..9ffc4723dfd 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ethtool-4.0";
+  name = "ethtool-4.5";
 
   src = fetchurl {
     url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
-    sha256 = "1zzcwn6pk8qfasalqkxg8vrhacksfa50xsq4xifw7yfjqyn8fj4h";
+    sha256 = "0fyakzpcrjb7hkaj9ccpcgza7r2im17qzxy9w6xzbiss5hrk8a5v";
   };
 
   meta = with stdenv.lib; {

From b5fdb8585be7755b64c4885ac1660e7bfc7163e3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 12 Apr 2016 17:05:29 +0200
Subject: [PATCH 630/712] di: 4.36 -> 4.37

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

diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix
index 9dec905379b..9af1f8192c3 100644
--- a/pkgs/tools/system/di/default.nix
+++ b/pkgs/tools/system/di/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "di-4.36";
+  name = "di-4.37";
 
   src = fetchurl {
     url = "http://gentoo.com/di/${name}.tar.gz";
-    sha256 = "11kd9jawpkir6qwjciis9l5fdvgbp9yndcv4rg6k3x9x1and40zb";
+    sha256 = "1ljamhbpfps5b3n6gsk11znjv2f0cqfy7imda2qmzrlb8dipjs0h";
   };
 
   makeFlags = "INSTALL_DIR=$(out)";

From 4825d4033e3f1b5ca1bfb25aa4d2debac25d8f50 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 12 Apr 2016 16:12:44 +0200
Subject: [PATCH 631/712] ddrescue: 1.20 -> 1.21

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

diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix
index c33359eee88..0e8e77cf5fa 100644
--- a/pkgs/tools/system/ddrescue/default.nix
+++ b/pkgs/tools/system/ddrescue/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, lzip }:
 
 stdenv.mkDerivation rec {
-  name = "ddrescue-1.20";
+  name = "ddrescue-1.21";
 
   src = fetchurl {
     url = "mirror://gnu/ddrescue/${name}.tar.lz";
-    sha256 = "1gb0ak2c47nass7qdf9pnfrshcb38c318z1fx5v5v1k7l6qr7yc3";
+    sha256 = "1b71hb42lh33y9843nd1mxlwkk9qh9ajvnz6ivzd1jq9lav4x7ph";
   };
 
   buildInputs = [ lzip ];
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
 
     platforms = platforms.all;
-    maintainers = with maintainers; [ iElectric ];
+    maintainers = with maintainers; [ iElectric fpletz ];
   };
 }

From 5ca86940954588d0164c1e7339a281c58551bdc8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 12 Apr 2016 15:22:08 +0200
Subject: [PATCH 632/712] debootstrap: 1.0.68 -> 1.0.80

---
 pkgs/tools/misc/debootstrap/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index 9b6c35f41a4..4af6475668e 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -30,15 +30,16 @@ let
   
 in
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
 
-  name = "debootstrap-1.0.67";
+  name = "debootstrap-${version}";
+  version = "1.0.80";
 
   src = fetchurl {
     # git clone git://git.debian.org/d-i/debootstrap.git
     # I'd like to use the source. However it's lacking the lanny script ? (still true?)
-    url = mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.67.tar.gz;
-    sha256 = "06x5zw6fskw37qh62hvqx006319l4wgnnw8sf53ms67zpfif04ha";
+    url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
+    sha256 = "06gigscd2327wsvc7n7w2m8xmaixvp4kyqhayn00qrgd9i9w34x6";
   };
 
   buildInputs = [ dpkg gettext gawk perl ];

From bdafc6df04d650518525e8e4bb27d442a60a339a Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Tue, 3 May 2016 10:42:29 -0400
Subject: [PATCH 633/712] openssl: 1.0.1s -> 1.0.1t, 1.0.2g -> 1.0.2h

CVE-2016-2108, high severity: Memory corruption in the ASN.1 encoder
CVE-2016-2107, high severity: Padding oracle in AES-NI CBC MAC check
CVE-2016-2105, low severity: EVP_EncodeUpdate overflow
CVE-2016-2106, low severity: EVP_EncryptUpdate overflow
CVE-2016-2109, low severity: ASN.1 BIO excessive memory allocation
CVE-2016-2176, low severity: EBCDIC overread
---
 pkgs/development/libraries/openssl/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 1e0f419c5f7..fa84b89bd38 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -105,13 +105,13 @@ let
 in {
 
   openssl_1_0_1 = common {
-    version = "1.0.1s";
-    sha256 = "e7e81d82f3cd538ab0cdba494006d44aab9dd96b7f6233ce9971fb7c7916d511";
+    version = "1.0.1t";
+    sha256 = "4a6ee491a2fdb22e519c76fdc2a628bb3cec12762cd456861d207996c8a07088";
   };
 
   openssl_1_0_2 = common {
-    version = "1.0.2g";
-    sha256 = "b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33";
+    version = "1.0.2h";
+    sha256 = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919";
   };
 
 }

From 6d55b2e9c0a8bd72cb4375c55a5789682cb96b1c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 3 May 2016 17:18:04 +0200
Subject: [PATCH 634/712] libressl: 2.2.6 -> 2.2.7, 2.3.3 -> 2.3.4

Fix multiple vulnerabilities in libcrypto relating to ASN.1 and encoding.

http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.2.7-relnotes.txt
http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.3.4-relnotes.txt
---
 pkgs/development/libraries/libressl/2.2.nix | 4 ++--
 pkgs/development/libraries/libressl/2.3.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libressl/2.2.nix b/pkgs/development/libraries/libressl/2.2.nix
index 09505217ae2..280c2e6bc94 100644
--- a/pkgs/development/libraries/libressl/2.2.nix
+++ b/pkgs/development/libraries/libressl/2.2.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libressl-${version}";
-  version = "2.2.6";
+  version = "2.2.7";
 
   src = fetchurl {
     url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
-    sha256 = "0kynb15l5gq1qgp3p4ncn20sc65sbl8lk89vyr07s17xrya9kq8y";
+    sha256 = "1kckv36dgvvjq1ap6ahxgma4hw57zp61xsp5vjvyza5vhfrnhb3y";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/libressl/2.3.nix b/pkgs/development/libraries/libressl/2.3.nix
index 129456e6657..a5052a9b499 100644
--- a/pkgs/development/libraries/libressl/2.3.nix
+++ b/pkgs/development/libraries/libressl/2.3.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libressl-${version}";
-  version = "2.3.3";
+  version = "2.3.4";
 
   src = fetchurl {
     url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
-    sha256 = "1a8anm8nsfyxds03csk738m2cmzjbsb867my1rz5ij3w31k32wvn";
+    sha256 = "1ag65pbvdikqj5y1w780jicl3ngi9ld2332ki6794y0gcar3a4bs";
   };
 
   enableParallelBuilding = true;

From bf8130684878747be7b1cc393f8aa147c500f14f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 3 May 2016 18:25:57 +0200
Subject: [PATCH 635/712] gandi-cli: pull out of python-packages.nix

---
 pkgs/tools/networking/gandi-cli/default.nix | 28 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 pkgs/top-level/python-packages.nix          | 19 --------------
 3 files changed, 30 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/tools/networking/gandi-cli/default.nix

diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix
new file mode 100644
index 00000000000..2f95123ba21
--- /dev/null
+++ b/pkgs/tools/networking/gandi-cli/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, pythonPackages, fetchFromGitHub }:
+
+with pythonPackages;
+
+buildPythonPackage rec {
+  namePrefix = "";
+  name = "gandi-cli-${version}";
+  version = "0.18";
+
+  src = fetchFromGitHub {
+    sha256 = "045gnz345nfbi1g7j3gcyzrxrx3hcidaxzr05cb49rcr8nmqh1s3";
+    rev = version;
+    repo = "gandi.cli";
+    owner = "Gandi";
+  };
+
+  propagatedBuildInputs = [ click ipy pyyaml requests ];
+
+  doCheck = false;    # Tests try to contact the actual remote API
+
+  meta = with stdenv.lib; {
+    description = "Command-line interface to the public Gandi.net API";
+    homepage = http://cli.gandi.net/;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec2523b975a..446501c094b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1594,6 +1594,8 @@ in
 
   galen = callPackage ../development/tools/galen {};
 
+  gandi-cli = callPackage ../tools/networking/gandi-cli { };
+
   garmin-plugin = callPackage ../applications/misc/garmin-plugin {};
 
   garmintools = callPackage ../development/libraries/garmintools {};
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e664ab56703..8edba3627e4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5785,25 +5785,6 @@ in modules // {
     };
   };
 
-  gandi-cli = buildPythonPackage rec {
-    name = "gandi-cli-${version}";
-    version = "0.18";
-    src = pkgs.fetchFromGitHub {
-      sha256 = "045gnz345nfbi1g7j3gcyzrxrx3hcidaxzr05cb49rcr8nmqh1s3";
-      rev = version;
-      repo = "gandi.cli";
-      owner = "Gandi";
-    };
-    propagatedBuildInputs = with self; [ click ipy pyyaml requests ];
-    doCheck = false;	# Tests try to contact the actual remote API
-    meta = {
-      homepage = http://cli.gandi.net/;
-      description = "Command-line interface to the public Gandi.net API";
-      license = licenses.gpl3Plus;
-      maintainers = with maintainers; [ nckx ];
-    };
-  };
-
   gateone = buildPythonPackage rec {
     name = "gateone-1.2-0d57c3";
     disabled = ! isPy27;

From 3fe746cfc2f26c9161c659305810f14f32f4b8e5 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Tue, 3 May 2016 19:39:53 +0200
Subject: [PATCH 636/712] tinc_pre: 1.1pre-git2016.01.28 -> 1.1pre-14 (#15192)

split the documentation output
remove the tinc-gui binary because python dependencies are not fulfilled
---
 pkgs/tools/networking/tinc/pre.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
index 5473a637b6a..61e4ee281ed 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -2,15 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "tinc-${version}";
-  rev = "d8ca00fe40ff4b6d87e7e64c273f536fab462356";
-  version = "1.1pre-2016-01-28-${builtins.substring 0 7 rev}";
+  version = "1.1pre14";
 
   src = fetchgit {
-    inherit rev;
+    rev = "refs/tags/release-${version}";
     url = "git://tinc-vpn.org/tinc";
-    sha256 = "0wqgzbqlafbkmj71vhfrqwmp61g95amzd43py47kq3fn5aiybcqf";
+    sha256 = "0idc4ddhz380xw26c8wwdyr0p6pibada55f0hzhnc2cz9za9x4iv";
   };
 
+  outputs = [ "out" "doc" ];
+
   nativeBuildInputs = [ autoreconfHook texinfo ];
   buildInputs = [ ncurses readline zlib lzo openssl ];
 
@@ -18,6 +19,10 @@ stdenv.mkDerivation rec {
     substituteInPlace configure.ac --replace UNKNOWN ${version}
   '';
 
+  postInstall = ''
+    rm $out/bin/tinc-gui
+  '';
+
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"

From b95eebec653c749cbc2c2b3932d5b075d566e9b5 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Tue, 3 May 2016 20:03:14 +0200
Subject: [PATCH 637/712] connman: 1.31 -> 1.32 fetch release tarball instead
 of git checkout and drop autotools

This update is compatible with iptables 1.6.0 (see #12178)
---
 pkgs/tools/networking/connman/default.nix | 26 +++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index 7af692f782e..f8abdb33d9d 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -1,26 +1,25 @@
-{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, openconnect, file,
+{ stdenv, fetchurl, pkgconfig, openconnect, file,
   openvpn, vpnc, glib, dbus, iptables, gnutls, polkit,
-  wpa_supplicant, readline6, pptp, ppp, tree }:
+  wpa_supplicant, readline6, pptp, ppp }:
 
 stdenv.mkDerivation rec {
   name = "connman-${version}";
-  version = "1.31";
-  src = fetchgit {
-    url = "git://git.kernel.org/pub/scm/network/connman/connman.git";
-    rev = "refs/tags/${version}";
-    sha256 = "90dab6b11841cb4b6400711d234b59fb4fad4e8778bed6e7ad3ac7ac135d6893";
+  version = "1.32";
+  src = fetchurl {
+    url = "mirror://kernel/linux/network/connman/${name}.tar.xz";
+    sha256 = "0k4kw2j78gwxf0rq79a099qkzl6wi4v5i7rfs4rn0si0fd68d19i";
   };
 
-  buildInputs = [ autoconf automake libtool pkgconfig openconnect polkit
-                  file openvpn vpnc glib dbus iptables gnutls
-                  wpa_supplicant readline6 pptp ppp tree ];
+  buildInputs = [ openconnect polkit
+                  openvpn vpnc glib dbus iptables gnutls
+                  wpa_supplicant readline6 pptp ppp ];
+
+  nativeBuildInputs = [ pkgconfig file ];
 
   preConfigure = ''
     export WPASUPPLICANT=${wpa_supplicant}/sbin/wpa_supplicant
-    ./bootstrap
+    export PPPD=${ppp}/sbin/pppd
     sed -i "s/\/usr\/bin\/file/file/g" ./configure
-    substituteInPlace configure --replace /usr/sbin/pptp ${pptp}/sbin/pptp
-    substituteInPlace configure --replace /usr/sbin/pppd ${ppp}/sbin/pppd
   '';
 
   configureFlags = [
@@ -43,6 +42,7 @@ stdenv.mkDerivation rec {
     "--enable-tools"
     "--enable-datafiles"
     "--enable-pptp"
+    "--with-pptp=${pptp}/sbin/pptp"
   ];
 
   postInstall = ''

From d74335da85c33ef9d0539a94cd9e0f209cb7ff98 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Tue, 3 May 2016 20:05:57 +0200
Subject: [PATCH 638/712] connman: make dependency on awk explicit

---
 pkgs/tools/networking/connman/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index f8abdb33d9d..c9380761f9f 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, openconnect, file,
+{ stdenv, fetchurl, pkgconfig, openconnect, file, gawk,
   openvpn, vpnc, glib, dbus, iptables, gnutls, polkit,
   wpa_supplicant, readline6, pptp, ppp }:
 
@@ -14,11 +14,12 @@ stdenv.mkDerivation rec {
                   openvpn vpnc glib dbus iptables gnutls
                   wpa_supplicant readline6 pptp ppp ];
 
-  nativeBuildInputs = [ pkgconfig file ];
+  nativeBuildInputs = [ pkgconfig file gawk ];
 
   preConfigure = ''
     export WPASUPPLICANT=${wpa_supplicant}/sbin/wpa_supplicant
     export PPPD=${ppp}/sbin/pppd
+    export AWK=${gawk}/bin/gawk
     sed -i "s/\/usr\/bin\/file/file/g" ./configure
   '';
 

From f72a2faa28580c6a19b5cc3a111f4a198f1a80fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 3 May 2016 15:14:50 -0300
Subject: [PATCH 639/712] gtk-xfce-engine: 2.10.1 -> 3.2.0

---
 pkgs/desktops/xfce/core/gtk-xfce-engine.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
index b66faf2390b..25ba1e252d4 100644
--- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
+++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   p_name  = "gtk-xfce-engine";
-  ver_maj = "2.10";
-  ver_min = "1";
+  ver_maj = "3.2";
+  ver_min = "0";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "4a92910205881f707f2cc8d3c9b00a95feb58eb9084d932c841f3ed027f7063d";
+    sha256 = "1va71f3gpl8gikfkmqsd5ikgp7qj8b64jii2l98g1ylnv8xrqp47";
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 

From f0da9ff4128c1c4d3fbee2c4691adcac4bc24e6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 3 May 2016 15:18:23 -0300
Subject: [PATCH 640/712] gtk-xfce-engine: add support to Gtk3

---
 pkgs/desktops/xfce/core/gtk-xfce-engine.nix | 6 ++++--
 pkgs/desktops/xfce/default.nix              | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
index 25ba1e252d4..6e5ac7c55ea 100644
--- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
+++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, withGtk3 ? false, gtk3 }:
 
 stdenv.mkDerivation rec {
   p_name  = "gtk-xfce-engine";
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ pkgconfig intltool gtk ];
+  buildInputs = [ pkgconfig intltool gtk ] ++ stdenv.lib.optional withGtk3 gtk3;
+  
+  configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3";
 
   meta = {
     homepage = http://www.xfce.org/;
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 96e6c55162a..3ea3721362b 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -21,7 +21,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
 
   exo             = callPackage ./core/exo.nix { };
   garcon          = callPackage ./core/garcon.nix { };
-  gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { }; # ToDo: when should be used?
+  gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { withGtk3 = true; }; # ToDo: when should be used?
   libxfce4ui      = callPackage ./core/libxfce4ui.nix { };
   libxfce4ui_gtk3 = libxfce4ui.override { withGtk3 = true; };
   libxfce4util    = callPackage ./core/libxfce4util.nix { };

From 980bca286e4bc509fb4321b75481d9e683e5a1b4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 3 May 2016 21:29:16 +0300
Subject: [PATCH 641/712] gcc 4.5, 4.6: Remove broken update-gcc.sh symlinks

---
 pkgs/development/compilers/gcc/4.5/update-gcc.sh | 1 -
 pkgs/development/compilers/gcc/4.6/update-gcc.sh | 1 -
 2 files changed, 2 deletions(-)
 delete mode 120000 pkgs/development/compilers/gcc/4.5/update-gcc.sh
 delete mode 120000 pkgs/development/compilers/gcc/4.6/update-gcc.sh

diff --git a/pkgs/development/compilers/gcc/4.5/update-gcc.sh b/pkgs/development/compilers/gcc/4.5/update-gcc.sh
deleted file mode 120000
index 907772b2af8..00000000000
--- a/pkgs/development/compilers/gcc/4.5/update-gcc.sh
+++ /dev/null
@@ -1 +0,0 @@
-../4.4/update-gcc.sh
\ No newline at end of file
diff --git a/pkgs/development/compilers/gcc/4.6/update-gcc.sh b/pkgs/development/compilers/gcc/4.6/update-gcc.sh
deleted file mode 120000
index 907772b2af8..00000000000
--- a/pkgs/development/compilers/gcc/4.6/update-gcc.sh
+++ /dev/null
@@ -1 +0,0 @@
-../4.4/update-gcc.sh
\ No newline at end of file

From 147d942b545c7d6c020534fd2987d5e33dc00b6f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 3 May 2016 13:34:50 -0500
Subject: [PATCH 642/712] julia: remove ttuegel from maintainers

ttuegel has not used julia in some time
---
 pkgs/development/compilers/julia/git.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix
index b6d917865d8..00c4730cf85 100644
--- a/pkgs/development/compilers/julia/git.nix
+++ b/pkgs/development/compilers/julia/git.nix
@@ -164,7 +164,7 @@ stdenv.mkDerivation rec {
     description = "High-level performance-oriented dynamical language for technical computing";
     homepage = "http://julialang.org/";
     license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ raskin ttuegel ];
+    maintainers = with stdenv.lib.maintainers; [ raskin ];
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
   };
 }

From ff6a98612cc3f1fe33b01be42efa3d5f4515b149 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 3 May 2016 19:13:42 +0200
Subject: [PATCH 643/712] seccure: 0.4 -> 0.5

---
 pkgs/tools/security/seccure/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/seccure/default.nix b/pkgs/tools/security/seccure/default.nix
index 33a77c07844..46d2113b1da 100644
--- a/pkgs/tools/security/seccure/default.nix
+++ b/pkgs/tools/security/seccure/default.nix
@@ -1,14 +1,15 @@
-{stdenv, fetchurl, libgcrypt}:
+{ stdenv, fetchurl, libgcrypt }:
 
 stdenv.mkDerivation rec {
-  name = "seccure-0.4";
+  name = "seccure-${version}";
+  version = "0.5";
   
   src = fetchurl {
     url = "http://point-at-infinity.org/seccure/${name}.tar.gz";
-    sha256 = "33d690a7034ee349bce4911a8b7c73e6e3cd13a140f429e9e628d5cd5a3bb955";
+    sha256 = "0nwnk3hfhgvf5xr0xipbh6smfnya22wphc5rj0vgi5d0zr5cwrk5";
   };
 
-  buildInputs = [libgcrypt];
+  buildInputs = [ libgcrypt ];
   
   preConfigure = ''
     sed -e s@/usr/@$out/@g -i Makefile

From d4d6d9d3d2f85892dfa3fabab2dfe5f250b054b7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 3 May 2016 19:17:14 +0200
Subject: [PATCH 644/712] ortp: 0.24.2 -> 0.25.0

---
 pkgs/development/libraries/ortp/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix
index 746f10eebed..15bd39a031f 100644
--- a/pkgs/development/libraries/ortp/default.nix
+++ b/pkgs/development/libraries/ortp/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ortp-0.24.2";
+  name = "ortp-${version}";
+  version = "0.25.0";
 
   src = fetchurl {
     url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz";
-    sha256 = "05k6ianphr533qnjwxsv7jnh7fb2sq0dj1pdy1bk2w5khmlwfdyb";
+    sha256 = "16ldzrn1268dr6kdl8mibg2knd6w75a1v0iqfsgk5zdig5mq5sqd";
   };
 
   meta = with stdenv.lib; {

From 31253ad95762deba0b7b91d9a704689b033b3350 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 3 May 2016 19:23:31 +0200
Subject: [PATCH 645/712] cdrtools: 3.02a03 -> 3.02a06

---
 pkgs/applications/misc/cdrtools/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix
index 55bcfd99e17..be6989b7e33 100644
--- a/pkgs/applications/misc/cdrtools/default.nix
+++ b/pkgs/applications/misc/cdrtools/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, acl, libcap }:
 
 stdenv.mkDerivation rec {
-  name = "cdrtools-3.02a03";
+  name = "cdrtools-${version}";
+  version = "3.02a06";
 
   src = fetchurl {
     url = "mirror://sourceforge/cdrtools/${name}.tar.bz2";
-    sha256 = "02gjxib0sgzsdicnb7496x0a175w1sb34v8zc9mdi8cfw7skw996";
+    sha256 = "1cayhfbhj5g2vgmkmq5scr23k0ka5fsn0dhn0n9yllj386csnygd";
   };
 
   patches = [ ./fix-paths.patch ];

From e7d3166656af0d98da9f59c78e2213cec842d743 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 3 May 2016 22:05:11 +0200
Subject: [PATCH 646/712] nixos/tests/netboot: Fix evaluation error

Regression introduced by dfe608c8a2ecfdf0ab2838a967440207250a0b95.

The commit turns the two arguments into one attrset argument so we need
to adapt that to use the new calling convention.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/tests/boot.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix
index a138ba4bcf0..af7db5aa816 100644
--- a/nixos/tests/boot.nix
+++ b/nixos/tests/boot.nix
@@ -64,11 +64,14 @@ in {
         '';
         destination = "/boot.ipxe";
       };
-      ipxeBootDir = pkgs.symlinkJoin "ipxeBootDir" [
-        config.system.build.netbootRamdisk
-        config.system.build.kernel
-        ipxeScriptDir
-      ];
+      ipxeBootDir = pkgs.symlinkJoin {
+        name = "ipxeBootDir";
+        paths = [
+          config.system.build.netbootRamdisk
+          config.system.build.kernel
+          ipxeScriptDir
+        ];
+      };
     in
       makeTest {
         name = "boot-netboot";
@@ -81,4 +84,4 @@ in {
             $machine->shutdown;
           '';
       };
-}
\ No newline at end of file
+}

From 51e5beca4267d4138e9ac8babb744a65f8c4bed0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 3 May 2016 22:08:57 +0200
Subject: [PATCH 647/712] jenkins service: remove unneeded (and brittle) part
 of postStart

The current postStart code holds Jenkins off the "started" state until
Jenkins becomes idle. But it should be enough to wait until Jenkins
start handling HTTP requests to consider it "started".

More reasons why the current approach is bad and we should remove it,
from @coreyoconnor in
https://github.com/NixOS/nixpkgs/issues/14991#issuecomment-216572571:

  1. Repeatedly curling for a specific human-readable string to
  determine "Active" is fragile. For instance, what happens when jenkins
  is localized?

  2. The time jenkins takes to initializes is variable. This (at least
  used to) depend on the number of jobs and any plugin upgrades requested.

  3. Jenkins can be requested to restart from the UI. Which will not
  affect the status of the service. This means that the service being
  "active" does not imply jenkins is initialized. Downstream services
  cannot assume jenkins is initialized if the service is active. Might
  as well accept that and remove the initialized test from service
  startup.

Fixes #14991.
---
 .../services/continuous-integration/jenkins/default.nix   | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index 6fd39e68b1d..d30b27e9df4 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -164,14 +164,6 @@ in {
         until ${pkgs.curl.bin}/bin/curl -s -L ${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} ; do
           sleep 10
         done
-        while true ; do
-          index=`${pkgs.curl.bin}/bin/curl -s -L ${cfg.listenAddress}:${toString cfg.port}${cfg.prefix}`
-          if [[ !("$index" =~ 'Please wait while Jenkins is restarting' ||
-                  "$index" =~ 'Please wait while Jenkins is getting ready to work') ]]; then
-            exit 0
-          fi
-          sleep 30
-        done
       '';
 
       serviceConfig = {

From 78b6e8c3199c1ce8ad4744cb90b47e94739083da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 3 May 2016 22:27:51 +0200
Subject: [PATCH 648/712] jenkins service: improve curl call in postStart

* Perform HTTP HEAD request instead of full GET (lighter weight)
* Don't log output of curl to the journal (it's noise/debug)
* Use explicit http:// URL scheme
* Reduce poll interval from 10s to 2s (respond to state changes
  quicker). Probably not relevant on boot (lots of services compete for
  the CPU), but online service restarts/reloads should be quicker.
* Pass --fail to curl (should be more robust against false positives)
* Use 4 space indent for shell code.
---
 .../services/continuous-integration/jenkins/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index d30b27e9df4..4a6ffb9c261 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -161,8 +161,8 @@ in {
       '';
 
       postStart = ''
-        until ${pkgs.curl.bin}/bin/curl -s -L ${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} ; do
-          sleep 10
+        until ${pkgs.curl.bin}/bin/curl -s -L --fail --head http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} >/dev/null; do
+            sleep 2
         done
       '';
 

From db3ee01ab632cd923b14d0ce2a55229aa2483f3c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 3 May 2016 23:41:33 +0200
Subject: [PATCH 649/712] geolite-legacy: 2016-05-02 -> 2016-05-03

---
 pkgs/data/misc/geolite-legacy/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 3792047aea1..d9693136bf2 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,20 +8,20 @@ let
 in
 stdenv.mkDerivation rec {
   name = "geolite-legacy-${version}";
-  version = "2016-05-02";
+  version = "2016-05-03";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
-    "0g34nwilhim73f0qp0yq3lfx54c42wy70ra4dkmwlfddyq3ln0xd";
+    "1fcbbbdqbxgqmgk61awzbbnd7d9yr2hnfmbc5z5z5s77aw8i8nkj";
   srcGeoIPv6 = fetchDB
     "GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
-    "12k4nmfblm9c7kj4v7cyl6sgfgdfv2jdx4fl7nxfzpk1km7yc5na";
+    "06cx1fza11g25ckjkih6p4awk2pg0jwr421fh8bijwx6i550paca";
   srcGeoLiteCity = fetchDB
     "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
-    "04bi7zmmm7v9gl9vhxh0fvqfhmg9ja1lan4ff0njx7qs7lz3ak88";
+    "1246328q4bhrri15pywkhbaz362ch1vnfw3h0qr8wn8f6ilix6nd";
   srcGeoLiteCityv6 = fetchDB
     "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
-    "1sr2yapsfmdpl4zpf8i5rl3k65dgbq7bb1615g6wf60yw9ngh76x";
+    "1v8wdqh6yjicb7bdcxp7v5dimlrny1fiynf4wr6wh65vr738csy2";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
     "04gyrb5qyy3i1p9lgnls90irq3s64y5qfcqj91nx4x68r7dixnai";

From 571e9b5f1ffe792d4b6d859ca7832b689ca3ea6a Mon Sep 17 00:00:00 2001
From: Mitchell Pleune <mitchpleune@gmail.com>
Date: Tue, 3 May 2016 17:39:18 -0400
Subject: [PATCH 650/712] bspwm: add _JAVA_AWT_WM_NONREPARENTING=1

bspwm is not in java's internal list of non-reparrenting
window managers. See https://awesomewm.org/wiki/Problems_with_Java
---
 nixos/modules/services/x11/window-managers/bspwm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixos/modules/services/x11/window-managers/bspwm.nix
index 271b1b6cf5d..03a1b7a72e8 100644
--- a/nixos/modules/services/x11/window-managers/bspwm.nix
+++ b/nixos/modules/services/x11/window-managers/bspwm.nix
@@ -38,6 +38,7 @@ in
       start = if cfg.startThroughSession
         then cfg.sessionScript
         else ''
+            export _JAVA_AWT_WM_NONREPARENTING=1
             SXHKD_SHELL=/bin/sh ${pkgs.sxhkd}/bin/sxhkd -f 100 &
             ${pkgs.bspwm}/bin/bspwm
         '';

From 518b9abfd5db370d9e446a5741e4c14122aed4fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 3 May 2016 19:03:46 -0300
Subject: [PATCH 651/712] xfce4-whiskermenu-plugin: the xfce4-panel binary is
 in ${xfce4panel.out}

---
 pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
index ff4e89a23cf..8ba542b398e 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     substituteInPlace $out/bin/xfce4-popup-whiskermenu \
-      --replace $out/bin/xfce4-panel ${xfce4panel}/bin/xfce4-panel
+      --replace $out/bin/xfce4-panel ${xfce4panel.out}/bin/xfce4-panel
   '';
 
   meta = {

From b1bf11881a9e2f17c410f5ba8d03756daf71c975 Mon Sep 17 00:00:00 2001
From: obadz <git@obadz.com>
Date: Tue, 3 May 2016 22:54:06 +0100
Subject: [PATCH 652/712] spdlog: init at 292bdc5

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

diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix
new file mode 100644
index 00000000000..1c3952e7adf
--- /dev/null
+++ b/pkgs/development/libraries/spdlog/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "spdlog-${version}";
+  version = stdenv.lib.strings.substring 0 7 rev;
+  rev = "292bdc5eb4929f183c78d2c67082b715306f81c9";
+
+  src = fetchFromGitHub {
+    owner = "gabime";
+    repo = "spdlog";
+    inherit rev;
+    sha256 = "1b6b0c81a8hisaibqlzj5mrk3snrfl8p5sqa056q2f02i62zksbn";
+  };
+
+  buildInputs = [ cmake ];
+
+  # cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=ON" ];
+
+  outputs = [ "out" "doc" ];
+
+  postInstall = ''
+    mkdir -p $out/share/doc/spdlog
+    cp -rv ../example $out/share/doc/spdlog
+  '';
+
+  meta = with stdenv.lib; {
+    description    = "Very fast, header only, C++ logging library.";
+    homepage       = https://github.com/gabime/spdlog;
+    license        = licenses.mit;
+    maintainers    = with maintainers; [ obadz ];
+    platforms      = platforms.all;
+
+    # This is a header-only library, no point in hydra building it:
+    hydraPlatforms = [];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ffcbeddfb93..5f901adb856 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16709,6 +16709,8 @@ in
 
   bullet = callPackage ../development/libraries/bullet {};
 
+  spdlog = callPackage ../development/libraries/spdlog { };
+
   dart = callPackage ../development/interpreters/dart { };
 
   httrack = callPackage ../tools/backup/httrack { };

From 41b5de4773e0c5e76acd663aa347288e84b52dc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 3 May 2016 19:13:09 -0300
Subject: [PATCH 653/712] xfce4-whiskermenu-plugin: 1.5.2 -> 1.5.3

---
 .../xfce4-whiskermenu-plugin.nix              | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
index 8ba542b398e..e4c44865583 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
@@ -4,21 +4,22 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   p_name  = "xfce4-whiskermenu-plugin";
-  ver_maj = "1.5";
-  ver_min = "2";
-  rev = "d08418c8d55edfacef190ec14e03e1e9a6988101";
+  version = "1.5.3";
 
-  name = "${p_name}-${ver_maj}.${ver_min}";
+  name = "${p_name}-${version}";
 
   src = fetchFromGitHub {
     owner = "gottcode";
     repo = "xfce4-whiskermenu-plugin";
-    inherit rev;
-    sha256 = "0icphm6bm5p3csh9kwyyvkj2y87shrs12clfifbhv35dm0skb2dx";
+    rev = "v${version}";
+    sha256 = "07gmf9x3pw6xajklj0idahbnv0psnkhiqhb88bmkp344jirsx6ba";
   };
 
-  buildInputs = [ cmake pkgconfig intltool libxfce4util libxfcegui4 xfce4panel
-                  gtk exo garcon ];
+  nativeBuildInputs = [ cmake pkgconfig intltool ];
+
+  buildInputs = [ libxfce4util libxfcegui4 xfce4panel gtk exo garcon ];
+
+  enableParallelBuilding = true;
 
   preFixup = ''
     substituteInPlace $out/bin/xfce4-popup-whiskermenu \
@@ -27,7 +28,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
-    description = "Whisker Menu is an alternate application launcher for Xfce";
+    description = "Alternate application launcher for Xfce";
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.pjbarnoy ];
   };

From d6e4c1b750be049227870bc635d28acc46033d0e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Wed, 4 May 2016 00:33:27 +0200
Subject: [PATCH 654/712] thinkfan: install manual, README and examples

READMEs usually just waste those precious kilobytes, but both the
manual page and --help output refer to this one quite a bit.
---
 pkgs/tools/system/thinkfan/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix
index 3e97a4b64a3..170d3b3305e 100644
--- a/pkgs/tools/system/thinkfan/default.nix
+++ b/pkgs/tools/system/thinkfan/default.nix
@@ -18,14 +18,17 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir -p $out/bin;
-    mv thinkfan $out/bin/;
+    install -Dm755 {.,$out/bin}/thinkfan
+
+    cd $sourceRoot
+    install -Dm644 {.,$out/share/doc/thinkfan}/README
+    cp -R examples $out/share/doc/thinkfan
+    install -Dm644 {.,$out/share/man/man1}/thinkfan.1
   '';
 
   meta = {
-    description = "";
     license = stdenv.lib.licenses.gpl3;
-    homepage = "http://thinkfan.sourceforge.net/";
+    homepage = http://thinkfan.sourceforge.net/;
     maintainers = with stdenv.lib.maintainers; [ iElectric ];
     platforms = stdenv.lib.platforms.linux;
   };

From 63a63c53d6de08543c08b19f7a62b930b91d19d0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 3 May 2016 23:40:55 +0200
Subject: [PATCH 655/712] poppler: 0.36.0 -> 0.43.0

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

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index ebcdcc2b3ef..ae20cb4090c 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -5,8 +5,8 @@
 }:
 
 let # beware: updates often break cups_filters build
-  version = "0.36.0"; # even major numbers are stable
-  sha256 = "13i440kv873wgmw50rs4d1v05cj0r7bqnghd70hp9vy44dxhdk4k";
+  version = "0.43.0"; # even major numbers are stable
+  sha256 = "0mi4zf0pz3x3fx3ir7szz1n57nywgbpd4mp2r7mvf47f4rmf4867";
 in
 stdenv.mkDerivation rec {
   name = "poppler-${suffix}-${version}";

From 0bd31bce10dbcfa90a5e82f4f6c1bdc1252d02ae Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 3 May 2016 19:24:40 +0200
Subject: [PATCH 656/712] grsecurity: drop support for 4.4 kernels

From now on, only the testing branch of grsecurity will be supported.
Additionally, use only patches from upstream.

It's impossible to provide meaningful support for grsecurity stable.
First, because building and testing \(m \times n \times z) [1], packages
is infeasible.  Second, because stable patches are only available from
upstream for-pay, making us reliant on third-parties for patches. In
addition to creating yet more work for the maintainers, using stable
patches provided by a third-party goes against the wishes of upstream.

nixpkgs provides the tools necessary to build grsecurity kernels for any
version the user chooses, however, provided they pay for, or otherwise
acquire, the patch themselves.

Eventually, we'll want to remove the now obsolete top-level attributes,
but leave them in for now to smoothe migration (they have been removed
from top-level/release.nix, though, because it makes no sense to have
them there).

[1]: where \(m\) is the number of grsecurity flavors, \(n\) is the
number of kernel versions, and z is the size of the `linuxPackages` set
---
 pkgs/os-specific/linux/kernel/linux-grsecurity-4.4.nix | 2 ++
 pkgs/os-specific/linux/kernel/patches.nix              | 4 +---
 pkgs/top-level/release.nix                             | 3 ---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity-4.4.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity-4.4.nix
index 36181308a8b..e51fe642368 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity-4.4.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
+throw "grsecurity stable is no longer supported; please update your configuration"
+
 import ./generic.nix (args // rec {
   version = "4.4.5";
   extraMeta.branch = "4.4";
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 14b0692dbad..c4bc4513395 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -23,9 +23,7 @@ let
     { name = "grsecurity-${grversion}-${kversion}";
       inherit grversion kernel patches kversion revision;
       patch = fetchurl {
-        url = if branch == "stable"
-              then "https://github.com/kdave/grsecurity-patches/blob/master/grsecurity_patches/grsecurity-${grversion}-${kversion}-${revision}.patch?raw=true"
-              else "https://github.com/slashbeast/grsecurity-scrape/blob/master/${branch}/grsecurity-${grversion}-${kversion}-${revision}.patch?raw=true";
+        url = "https://grsecurity.net/${branch}/grsecurity-${grversion}-${kversion}-${revision}.patch";
         inherit sha256;
       };
       features.grsecurity = true;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 763e891173c..8b246c5340f 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -323,9 +323,6 @@ let
       };
 
       linuxPackages_testing = { };
-      linuxPackages_grsec_stable_desktop = { };
-      linuxPackages_grsec_stable_server = { };
-      linuxPackages_grsec_stable_server_xen = { };
       linuxPackages_grsec_testing_desktop = { };
       linuxPackages_grsec_testing_server = { };
       linuxPackages_grsec_testing_server_xen = { };

From 05eae0242d7483ffe29c006ce6b3b8b238bce284 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 May 2016 01:19:27 +0200
Subject: [PATCH 657/712] imagemagick: 6.9.3-8 -> 6.9.3-9

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

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 78837f55af4..6957002f6e8 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -13,7 +13,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "imagemagick-${version}";
-  version = "6.9.3-8";
+  version = "6.9.3-9";
 
   src = fetchurl {
     urls = [
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       # the original source above removes tarballs quickly
       "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz"
     ];
-    sha256 = "129s4cwp6cbhgsr3xr8186q5j02zpbk6kqfk4j7ayb563zsrdb4h";
+    sha256 = "0q19jgn1iv7zqrw8ibxp4z57iihrc9kyb09k2wnspcacs6vrvinf";
   };
 
   outputs = [ "out" "doc" ];

From 69c14985d034cf1b9add0fdcbacc4d997a576d11 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 May 2016 01:20:08 +0200
Subject: [PATCH 658/712] imagemagick: Disable insecure coders (ImageTragick)

See:

  * https://imagetragick.com/
  * https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=29588
---
 .../applications/graphics/ImageMagick/default.nix |  2 ++
 .../graphics/ImageMagick/imagetragick.patch       | 15 +++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/applications/graphics/ImageMagick/imagetragick.patch

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 6957002f6e8..b97eb5a6580 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
     sha256 = "0q19jgn1iv7zqrw8ibxp4z57iihrc9kyb09k2wnspcacs6vrvinf";
   };
 
+  patches = [ ./imagetragick.patch ];
+
   outputs = [ "out" "doc" ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/ImageMagick/imagetragick.patch b/pkgs/applications/graphics/ImageMagick/imagetragick.patch
new file mode 100644
index 00000000000..bdb152dd23a
--- /dev/null
+++ b/pkgs/applications/graphics/ImageMagick/imagetragick.patch
@@ -0,0 +1,15 @@
+diff --git a/config/policy.xml b/config/policy.xml
+index ca3b022..b058c05 100644
+--- a/config/policy.xml
++++ b/config/policy.xml
+@@ -58,4 +58,10 @@
+   <!-- <policy domain="resource" name="time" value="3600"/> -->
+   <!-- <policy domain="system" name="precision" value="6"/> -->
+   <policy domain="cache" name="shared-secret" value="passphrase"/>
++
++  <policy domain="coder" rights="none" pattern="EPHEMERAL" />
++  <policy domain="coder" rights="none" pattern="URL" />
++  <policy domain="coder" rights="none" pattern="HTTPS" />
++  <policy domain="coder" rights="none" pattern="MVG" />
++  <policy domain="coder" rights="none" pattern="MSL" />
+ </policymap>

From 2acea211558fa2d462a9427b24ea15ecedb418c2 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 3 May 2016 23:49:20 +0200
Subject: [PATCH 659/712] gitlab: 8.5.7 -> 8.5.12

---
 .../version-management/gitlab/Gemfile         |    2 +-
 .../version-management/gitlab/Gemfile.lock    |   63 +-
 .../version-management/gitlab/default.nix     |    4 +-
 .../version-management/gitlab/gemset.nix      | 5942 ++++++++---------
 4 files changed, 3005 insertions(+), 3006 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
index fc7ad47919d..99b8a4e28df 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rails', '4.2.5.1'
+gem 'rails', '4.2.5.2'
 gem 'rails-deprecated_sanitizer', '~> 1.0.3'
 
 # Responders respond_to and respond_with
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index 2934988f836..8c3ddf3b570 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -4,34 +4,34 @@ GEM
     CFPropertyList (2.3.2)
     RedCloth (4.2.9)
     ace-rails-ap (2.0.1)
-    actionmailer (4.2.5.1)
-      actionpack (= 4.2.5.1)
-      actionview (= 4.2.5.1)
-      activejob (= 4.2.5.1)
+    actionmailer (4.2.5.2)
+      actionpack (= 4.2.5.2)
+      actionview (= 4.2.5.2)
+      activejob (= 4.2.5.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.5.1)
-      actionview (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    actionpack (4.2.5.2)
+      actionview (= 4.2.5.2)
+      activesupport (= 4.2.5.2)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.5.1)
-      activesupport (= 4.2.5.1)
+    actionview (4.2.5.2)
+      activesupport (= 4.2.5.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.5.1)
-      activesupport (= 4.2.5.1)
+    activejob (4.2.5.2)
+      activesupport (= 4.2.5.2)
       globalid (>= 0.3.0)
-    activemodel (4.2.5.1)
-      activesupport (= 4.2.5.1)
+    activemodel (4.2.5.2)
+      activesupport (= 4.2.5.2)
       builder (~> 3.1)
-    activerecord (4.2.5.1)
-      activemodel (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    activerecord (4.2.5.2)
+      activemodel (= 4.2.5.2)
+      activesupport (= 4.2.5.2)
       arel (~> 6.0)
     activerecord-deprecated_finders (1.0.4)
     activerecord-nulldb-adapter (0.3.2)
@@ -40,7 +40,7 @@ GEM
       actionpack (>= 4.0.0, < 5)
       activerecord (>= 4.0.0, < 5)
       railties (>= 4.0.0, < 5)
-    activesupport (4.2.5.1)
+    activesupport (4.2.5.2)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -588,16 +588,16 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.5.1)
-      actionmailer (= 4.2.5.1)
-      actionpack (= 4.2.5.1)
-      actionview (= 4.2.5.1)
-      activejob (= 4.2.5.1)
-      activemodel (= 4.2.5.1)
-      activerecord (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    rails (4.2.5.2)
+      actionmailer (= 4.2.5.2)
+      actionpack (= 4.2.5.2)
+      actionview (= 4.2.5.2)
+      activejob (= 4.2.5.2)
+      activemodel (= 4.2.5.2)
+      activerecord (= 4.2.5.2)
+      activesupport (= 4.2.5.2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.5.1)
+      railties (= 4.2.5.2)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -607,9 +607,9 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.5.1)
-      actionpack (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    railties (4.2.5.2)
+      actionpack (= 4.2.5.2)
+      activesupport (= 4.2.5.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.0.0)
@@ -963,8 +963,8 @@ DEPENDENCIES
   mysql2 (~> 0.3.16)
   nested_form (~> 0.3.2)
   net-ssh (~> 3.0.1)
-  nokogiri (~> 1.6.7, >= 1.6.7.2)
   newrelic_rpm (~> 3.14)
+  nokogiri (~> 1.6.7, >= 1.6.7.2)
   nprogress-rails (~> 0.1.6.7)
   oauth2 (~> 1.0.0)
   octokit (~> 3.8.0)
@@ -990,7 +990,7 @@ DEPENDENCIES
   rack-attack (~> 4.3.1)
   rack-cors (~> 0.4.0)
   rack-oauth2 (~> 1.2.1)
-  rails (= 4.2.5.1)
+  rails (= 4.2.5.2)
   rails-deprecated_sanitizer (~> 1.0.3)
   raphael-rails (~> 2.1.2)
   rblineprof
@@ -1013,7 +1013,6 @@ DEPENDENCIES
   seed-fu (~> 2.3.5)
   select2-rails (~> 3.5.9)
   sentry-raven (~> 0.15)
-  sentry-raven
   settingslogic (~> 2.0.9)
   sham_rack
   shoulda-matchers (~> 2.8.0)
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 9a3ce8bed22..c3aef17513f 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -24,7 +24,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "gitlab-${version}";
-  version = "8.5.7";
+  version = "8.5.12";
 
   buildInputs = [ ruby bundler tzdata git nodejs procps ];
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     owner = "gitlabhq";
     repo = "gitlabhq";
     rev = "v${version}";
-    sha256 = "0n76dafndhp0rwnnvf12zby9xap5fhcplld86pq2wyvqabg4s9yj";
+    sha256 = "144i97ywnr0xgm7gnwnwiy7kk5z1d71ccawl8qdhapz0705993l8";
   };
 
   patches = [
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
index b0665278183..870f5e79f3a 100644
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -1,2973 +1,17 @@
 {
-  xpath = {
-    dependencies = ["nokogiri"];
+  ace-rails-ap = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04kcr127l34p7221z13blyl0dvh0bmxwx326j72idayri36a394w";
-      type = "gem";
-    };
-    version = "2.0.0";
-  };
-  xml-simple = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0xlqplda3fix5pcykzsyzwgnbamb3qrqkgbrhhfz2a2fxhrkvhw8";
-      type = "gem";
-    };
-    version = "1.1.5";
-  };
-  wikicloth = {
-    dependencies = ["builder" "expression_parser" "rinku"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1jp6c2yzyqbap8jdiw8yz6l08sradky1llhyhmrg934l1b5akj3s";
-      type = "gem";
-    };
-    version = "0.8.1";
-  };
-  websocket-extensions = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "07qnsafl6203a2zclxl20hy4jq11c471cgvd0bj5r9fx1qqw06br";
-      type = "gem";
-    };
-    version = "0.1.2";
-  };
-  websocket-driver = {
-    dependencies = ["websocket-extensions"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1v39w1ig6ps8g55xhz6x1w53apl17ii6kpy0jg9249akgpdvb0k9";
-      type = "gem";
-    };
-    version = "0.6.3";
-  };
-  webmock = {
-    dependencies = ["addressable" "crack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1p7hqdxk5359xwp59pcx841fhbnqx01ra98rnwhdyz61nrc6piv3";
-      type = "gem";
-    };
-    version = "1.21.0";
-  };
-  web-console = {
-    dependencies = ["activemodel" "binding_of_caller" "railties" "sprockets-rails"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "13rwps8m76j45iqhggm810j78i8bg4nqzgi8k7amxplik2zm5blf";
-      type = "gem";
-    };
-    version = "2.2.1";
-  };
-  warden = {
-    dependencies = ["rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1iyxw1ms3930dh7vcrfyi4ifpdbkfsr8k7fzjryva0r7k3c71gb7";
-      type = "gem";
-    };
-    version = "1.2.4";
-  };
-  virtus = {
-    dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "06iphwi3c4f7y9i2rvhvaizfswqbaflilziz4dxqngrdysgkn1fk";
-      type = "gem";
-    };
-    version = "1.0.5";
-  };
-  version_sorter = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1lad9c43w2xfzmva57ia6glpmhyivyk1m79jli42canshvan5v6y";
-      type = "gem";
-    };
-    version = "2.0.0";
-  };
-  uuid = {
-    dependencies = ["macaddr"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0gr2mxg27l380wpiy66mgv9wq02myj6m4gmp6c4g1vsbzkh0213v";
-      type = "gem";
-    };
-    version = "2.3.8";
-  };
-  uniform_notifier = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "009z60qx01am7klmrca8pcladrynljra3a9smifn9f81r4dc7q63";
-      type = "gem";
-    };
-    version = "1.9.0";
-  };
-  unicorn-worker-killer = {
-    dependencies = ["get_process_mem" "unicorn"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0rrdxpwdsapx47axjin8ymxb4f685qlpx8a26bql4ay1559c3gva";
-      type = "gem";
-    };
-    version = "0.4.4";
-  };
-  unicorn = {
-    dependencies = ["kgio" "rack" "raindrops"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1kpg2vikx2hxdyrl45bqcr89a0w59hfw7yn7xh87bmlczi34xds4";
-      type = "gem";
-    };
-    version = "4.8.3";
-  };
-  unf_ext = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ly2ms6c3irmbr1575ldyh52bz2v0lzzr2gagf0p526k12ld2n5b";
-      type = "gem";
-    };
-    version = "0.0.7.1";
-  };
-  unf = {
-    dependencies = ["unf_ext"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
-      type = "gem";
-    };
-    version = "0.1.4";
-  };
-  underscore-rails = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0iyspb7s49wpi9cc314gvlkyn45iyfivzxhdw0kql1zrgllhlzfk";
-      type = "gem";
-    };
-    version = "1.8.3";
-  };
-  uglifier = {
-    dependencies = ["execjs" "json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0mzs64z3m1b98rh6ssxpqfz9sc87f6ml6906b0m57vydzfgrh1cz";
-      type = "gem";
-    };
-    version = "2.7.2";
-  };
-  tzinfo = {
-    dependencies = ["thread_safe"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx";
-      type = "gem";
-    };
-    version = "1.2.2";
-  };
-  twitter-stream = {
-    dependencies = ["eventmachine" "http_parser.rb" "simple_oauth"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0is81g3xvnjk64sqiaqlh2ziwfryzwvk1yvaniryg0zhppgsyriq";
-      type = "gem";
-    };
-    version = "0.1.16";
-  };
-  turbolinks = {
-    dependencies = ["coffee-rails"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1ddrx25vvvqxlz4h59lrmjhc2bfwxf4bpicvyhgbpjd48ckj81jn";
-      type = "gem";
-    };
-    version = "2.5.3";
-  };
-  tins = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "02qarvy17nbwvslfgqam8y6y7479cwmb1a6di9z18hzka4cf90hz";
-      type = "gem";
-    };
-    version = "1.6.0";
-  };
-  tinder = {
-    dependencies = ["eventmachine" "faraday" "faraday_middleware" "hashie" "json" "mime-types" "multi_json" "twitter-stream"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1kwj0wd540wb2ws86d3jdva175dx00w2j8lyrvbb6qli3g27byd7";
-      type = "gem";
-    };
-    version = "1.10.1";
-  };
-  timfel-krb5-auth = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "105vajc0jkqgcx1wbp0ad262sdry4l1irk7jpaawv8vzfjfqqf5b";
-      type = "gem";
-    };
-    version = "0.8.3";
-  };
-  tilt = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir";
-      type = "gem";
-    };
-    version = "1.4.1";
-  };
-  thread_safe = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr";
-      type = "gem";
-    };
-    version = "0.3.5";
-  };
-  thor = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
-      type = "gem";
-    };
-    version = "0.19.1";
-  };
-  thin = {
-    dependencies = ["daemons" "eventmachine" "rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1pyc602sa8fqwjyssn9yvf3fqrr14jk7hj9hsjlan1mq4zvim1lf";
-      type = "gem";
-    };
-    version = "1.6.4";
-  };
-  test_after_commit = {
-    dependencies = ["activerecord"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1fzg8qan6f0n0ynr594bld2k0rwwxj99yzhiga2f3pkj9ina1abb";
-      type = "gem";
-    };
-    version = "0.4.2";
-  };
-  terminal-table = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1s6qyj9ir1agbbi32li9c0c34dcl0klyxqif6mxy0dbvq7kqfp8f";
-      type = "gem";
-    };
-    version = "1.5.2";
-  };
-  term-ansicolor = {
-    dependencies = ["tins"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ydbbyjmk5p7fsi55ffnkq79jnfqx65c3nj8d9rpgl6sw85ahyys";
-      type = "gem";
-    };
-    version = "1.3.2";
-  };
-  temple = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ysraljv7lkb04z5vdyrkijab7j1jzj1mgz4bj82744dp7d0rhb0";
-      type = "gem";
-    };
-    version = "0.7.6";
-  };
-  teaspoon-jasmine = {
-    dependencies = ["teaspoon"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00wygrv1jm4aj15p1ab9d5fdrj6y83kv26xgp52mx4lp78h2ms9q";
-      type = "gem";
-    };
-    version = "2.2.0";
-  };
-  teaspoon = {
-    dependencies = ["railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0cprz18vgf0jgcggcxf4pwx8jcwbiyj1p0dnck5aavlvaxaic58s";
-      type = "gem";
-    };
-    version = "1.0.2";
-  };
-  task_list = {
-    dependencies = ["html-pipeline"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1iv1fizb04463c4mp4gxd8v0414fhvmiwvwvjby5b9qq79d8zwab";
-      type = "gem";
-    };
-    version = "1.0.2";
-  };
-  systemu = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0gmkbakhfci5wnmbfx5i54f25j9zsvbw858yg3jjhfs5n4ad1xq1";
-      type = "gem";
-    };
-    version = "2.6.5";
-  };
-  stringex = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "150adm7rfh6r9b5ra6vk75mswf9m3wwyslcf8f235a08m29fxa17";
-      type = "gem";
-    };
-    version = "2.5.2";
-  };
-  state_machines-activerecord = {
-    dependencies = ["activerecord" "state_machines-activemodel"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "10dplkn4cm49xby8s0sn7wxww4hnxi4dgikfsmhp1rbsa24d76vx";
-      type = "gem";
-    };
-    version = "0.3.0";
-  };
-  state_machines-activemodel = {
-    dependencies = ["activemodel" "state_machines"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1bshcm53v2vfpapvhws1h0dq1h4f3p6bvpdkjpydb52a3m0w2z0y";
-      type = "gem";
-    };
-    version = "0.3.0";
-  };
-  state_machines = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1xg84kdglz0k1pshf2q604zybjpribzcz2b651sc1j27kd86w787";
-      type = "gem";
-    };
-    version = "0.4.0";
-  };
-  sprockets-rails = {
-    dependencies = ["actionpack" "activesupport" "sprockets"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1vsl6ryxdjpp97nl4ghhk1v6p50zh3sx9qv81bhmlffc234r91wn";
-      type = "gem";
-    };
-    version = "2.3.3";
-  };
-  sprockets = {
-    dependencies = ["hike" "multi_json" "rack" "tilt"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15818683yz27w4hgywccf27n91azy9a4nmb5qkklzb08k8jw9gp3";
-      type = "gem";
-    };
-    version = "2.12.4";
-  };
-  spring-commands-teaspoon = {
-    dependencies = ["spring"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1g7n4m2s9d0frh7y1xibzpphqajfnx4fvgfc66nh545dd91w2nqz";
-      type = "gem";
-    };
-    version = "0.0.2";
-  };
-  spring-commands-spinach = {
-    dependencies = ["spring"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "138jardqyj96wz68njdgy55qjbpl2d0g8bxbkz97ndaz3c2bykv9";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
-  spring-commands-rspec = {
-    dependencies = ["spring"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0b0svpq3md1pjz5drpa5pxwg8nk48wrshq8lckim4x3nli7ya0k2";
-      type = "gem";
-    };
-    version = "1.0.4";
-  };
-  spring = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0xvz2x6nvza5i53p7mddnf11j2wshqmbaphi6ngd6nar8v35y0k1";
-      type = "gem";
-    };
-    version = "1.3.6";
-  };
-  spinach-rails = {
-    dependencies = ["capybara" "railties" "spinach"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1nfacfylkncfgi59g2wga6m4nzdcjqb8s50cax4nbx362ap4bl70";
-      type = "gem";
-    };
-    version = "0.2.1";
-  };
-  spinach = {
-    dependencies = ["colorize" "gherkin-ruby" "json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0phfjs4iw2iqxdaljzwk6qxmi2x86pl3hirmpgw2pgfx76wfx688";
-      type = "gem";
-    };
-    version = "0.8.10";
-  };
-  slop = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n";
-      type = "gem";
-    };
-    version = "3.6.0";
-  };
-  slim = {
-    dependencies = ["temple" "tilt"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1szs71hh0msm5gj6qbcxw44m3hqnwybx4yh02scwixnwg576058k";
-      type = "gem";
-    };
-    version = "3.0.6";
-  };
-  slack-notifier = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "08z6fv186yw1nrpl6zwp3lwqksin145aa1jv6jf00bnv3sicliiz";
-      type = "gem";
-    };
-    version = "1.2.1";
-  };
-  six = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1bhapiyjh5r5qjpclfw8i65plvy6k2q4azr5xir63xqglr53viw3";
-      type = "gem";
-    };
-    version = "0.2.0";
-  };
-  sinatra = {
-    dependencies = ["rack" "rack-protection" "tilt"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1hhmwqc81ram7lfwwziv0z70jh92sj1m7h7s9fr0cn2xq8mmn8l7";
-      type = "gem";
-    };
-    version = "1.4.6";
-  };
-  simplecov-html = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1qni8g0xxglkx25w54qcfbi4wjkpvmb28cb7rj5zk3iqynjcdrqf";
-      type = "gem";
-    };
-    version = "0.10.0";
-  };
-  simplecov = {
-    dependencies = ["docile" "json" "simplecov-html"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1q2iq2vgrdvvla5y907gkmqx6ry2qvnvc7a90hlcbwgp1w0sv6z4";
-      type = "gem";
-    };
-    version = "0.10.0";
-  };
-  simple_oauth = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0bb06p88xsdw4fxll1ikv5i5k58sl6y323ss0wp1hqjm3xw1jgvj";
-      type = "gem";
-    };
-    version = "0.1.9";
-  };
-  sidekiq-cron = {
-    dependencies = ["redis-namespace" "rufus-scheduler" "sidekiq"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0xnbvh8kjv6954vsiwfcpp7bn8sgpwvnyapnq7b94w8h7kj3ykqy";
-      type = "gem";
-    };
-    version = "0.4.0";
-  };
-  sidekiq = {
-    dependencies = ["concurrent-ruby" "connection_pool" "json" "redis"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1x7jfc2va0x6fcfffdf0wdiyk4krjw8053jzwffa63wkqr5jvg3y";
-      type = "gem";
-    };
-    version = "4.0.1";
-  };
-  shoulda-matchers = {
-    dependencies = ["activesupport"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0d3ryqcsk1n9y35bx5wxnqbgw4m8b3c79isazdjnnbg8crdp72d0";
-      type = "gem";
-    };
-    version = "2.8.0";
-  };
-  sham_rack = {
-    dependencies = ["rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0zs6hpgg87x5jrykjxgfp2i7m5aja53s5kamdhxam16wki1hid3i";
-      type = "gem";
-    };
-    version = "1.3.6";
-  };
-  sexp_processor = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0gxlcpg81wfjf5gpggf8h6l2dbq3ikgavbrr2yfw3m2vqy88yjg2";
-      type = "gem";
-    };
-    version = "4.6.0";
-  };
-  settingslogic = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1ria5zcrk1nf0b9yia15mdpzw0dqr6wjpbj8dsdbbps81lfsj9ar";
-      type = "gem";
-    };
-    version = "2.0.9";
-  };
-  sentry-raven = {
-    version = "0.15.6";
-    source = {
-      type = "gem";
-      remotes = ["https://rubygems.org"];
-      sha256 = "0iqnwfmf6rnpgrvl3c8gh2gkix91nhm21j5qf389g4mi2rkc0ky8";
-    };
-  };
-  select2-rails = {
-    dependencies = ["thor"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ni2k74n73y3gv56gs37gkjlh912szjf6k9j483wz41m3xvlz7fj";
-      type = "gem";
-    };
-    version = "3.5.9.3";
-  };
-  seed-fu = {
-    dependencies = ["activerecord" "activesupport"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "11xja82yxir1kwccrzng29h7w911i9j0xj2y7y949yqnw91v12vw";
-      type = "gem";
-    };
-    version = "2.3.5";
-  };
-  sdoc = {
-    dependencies = ["json" "rdoc"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "17l8qk0ld47z4h5avcnylvds8nc6dp25zc64w23z8li2hs341xf2";
-      type = "gem";
-    };
-    version = "0.3.20";
-  };
-  sawyer = {
-    dependencies = ["addressable" "faraday"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0fk43bzwn816qj1ksiicm2i1kmzv5675cmnvk57kmfmi4rfsyjpy";
-      type = "gem";
-    };
-    version = "0.6.0";
-  };
-  sass-rails = {
-    dependencies = ["railties" "sass" "sprockets" "sprockets-rails" "tilt"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1f6357vw944w2ayayqmz8ai9myl6xbnry06sx5b5ms4r9lny8hj8";
-      type = "gem";
-    };
-    version = "5.0.4";
-  };
-  sass = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "04rpdcp258arh2wgdk9shbqnzd6cbbbpi3wpi9a0wby8awgpxmyf";
-      type = "gem";
-    };
-    version = "3.4.20";
-  };
-  sanitize = {
-    dependencies = ["nokogiri"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3";
-      type = "gem";
-    };
-    version = "2.1.0";
-  };
-  safe_yaml = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
-      type = "gem";
-    };
-    version = "1.0.4";
-  };
-  rugged = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0v0cvdw8cgy1hf5h3cx796zpxhbad8d5cm50nykyhwjc00q80zrr";
-      type = "gem";
-    };
-    version = "0.24.0b13";
-  };
-  rufus-scheduler = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "04bmvvvri7ni7dvlq3gi1y553f6rp6bw2kmdfp9ny5bh3l7qayrh";
-      type = "gem";
-    };
-    version = "3.1.10";
-  };
-  rubypants = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1vpdkrc4c8qhrxph41wqwswl28q5h5h994gy4c1mlrckqzm3hzph";
-      type = "gem";
-    };
-    version = "0.2.0";
-  };
-  rubyntlm = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "04l8686hl0829x4acsnbz0licf8n6794p7shz8iyahin1jnqg3d7";
-      type = "gem";
-    };
-    version = "0.5.2";
-  };
-  ruby_parser = {
-    dependencies = ["sexp_processor"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1rip6075b4k5a7s8w2klwc3jaqx31h69k004ac5nhl8y0ja92qvz";
-      type = "gem";
-    };
-    version = "3.7.2";
-  };
-  ruby2ruby = {
-    dependencies = ["ruby_parser" "sexp_processor"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1kmc0503s9mqnjyypx51wsi6zz9zj550ch43rag23wpj4qd6i6pm";
-      type = "gem";
-    };
-    version = "2.2.0";
-  };
-  ruby-saml = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "151jbak16y87dbj3ma2nc03rh37z7lixcwgaqahncq80rgnv45a8";
-      type = "gem";
-    };
-    version = "1.1.1";
-  };
-  ruby-progressbar = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0hynaavnqzld17qdx9r7hfw00y16ybldwq730zrqfszjwgi59ivi";
-      type = "gem";
-    };
-    version = "1.7.5";
-  };
-  ruby-fogbugz = {
-    dependencies = ["crack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1jj0gpkycbrivkh2q3429vj6mbgx6axxisg69slj3c4mgvzfgchm";
-      type = "gem";
-    };
-    version = "0.2.1";
-  };
-  rubocop = {
-    dependencies = ["astrolabe" "parser" "powerpack" "rainbow" "ruby-progressbar" "tins"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1grqda2fdknm43zyagh8gcmnhjkypyfw98q92hmvprprwghkq2sg";
-      type = "gem";
-    };
-    version = "0.35.1";
-  };
-  rspec-support = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1cyagig8slxjas8mbg5f8bl240b8zgr8mnjsvrznag1fwpkh4h27";
-      type = "gem";
-    };
-    version = "3.3.0";
-  };
-  rspec-rails = {
-    dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0m66n9p3a7d3fmrzkbh8312prb6dhrgmp53g1amck308ranasv2a";
-      type = "gem";
-    };
-    version = "3.3.3";
-  };
-  rspec-mocks = {
-    dependencies = ["diff-lcs" "rspec-support"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1lfbzscmpyixlbapxmhy2s69596vs1z00lv590l51hgdw70z92vg";
-      type = "gem";
-    };
-    version = "3.3.2";
-  };
-  rspec-expectations = {
-    dependencies = ["diff-lcs" "rspec-support"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1d0b5hpkxlr9f3xpsbhvl3irnk4smmycx2xnmc8qv3pqaa7mb7ah";
-      type = "gem";
-    };
-    version = "3.3.1";
-  };
-  rspec-core = {
-    dependencies = ["rspec-support"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0xw5qi936j6nz9fixi2mwy03f406761cd72bzyvd61pr854d7hy1";
-      type = "gem";
-    };
-    version = "3.3.2";
-  };
-  rspec = {
-    dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1bn5zs71agc0zyns2r3c8myi5bxw3q7xnzp7f3v5b7hbil1qym4r";
-      type = "gem";
-    };
-    version = "3.3.0";
-  };
-  rqrcode-rails3 = {
-    dependencies = ["rqrcode"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1i28rwmj24ssk91chn0g7qsnvn003y3s5a7jsrg3w4l5ckr841bg";
-      type = "gem";
-    };
-    version = "0.1.7";
-  };
-  rqrcode = {
-    dependencies = ["chunky_png"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "188n1mvc7klrlw30bai16sdg4yannmy7cz0sg0nvm6f1kjx5qflb";
-      type = "gem";
-    };
-    version = "0.7.0";
-  };
-  rouge = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0wp8as9ypdy18kdj9h70kny1rdfq71mr8cj2bpahr9vxjjvjasqz";
-      type = "gem";
-    };
-    version = "1.10.1";
-  };
-  rotp = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1nzsc9hfxijnyzjbv728ln9dm80bc608chaihjdk63i2wi4m529g";
-      type = "gem";
-    };
-    version = "2.1.1";
-  };
-  rinku = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1jh6nys332brph55i6x6cil6swm086kxjw34wq131nl6mwryqp7b";
-      type = "gem";
-    };
-    version = "1.7.3";
-  };
-  rest-client = {
-    dependencies = ["http-cookie" "mime-types" "netrc"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1m8z0c4yf6w47iqz6j2p7x1ip4qnnzvhdph9d5fgx081cvjly3p7";
-      type = "gem";
-    };
-    version = "1.8.0";
-  };
-  responders = {
-    dependencies = ["railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1i00bxp8fa67rzl50wfiaw16w21j5d5gwjjkdiwr0sw9q6ixmpz1";
-      type = "gem";
-    };
-    version = "2.1.1";
-  };
-  rerun = {
-    dependencies = ["listen"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0av239bpmy55fdx4qaw9n71aapjy2myr51h5plzjxsyr0fdwn1xq";
-      type = "gem";
-    };
-    version = "0.11.0";
-  };
-  request_store = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "01rxi2hw84y133z0r91jns4aaywd8d83wjq0xgb42iaicf0a90p9";
-      type = "gem";
-    };
-    version = "1.2.1";
-  };
-  redis-store = {
-    dependencies = ["redis"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0gf462p0wx4hn7m1m8ghs701n6xx0ijzm5cff9xfagd2s6va145m";
-      type = "gem";
-    };
-    version = "1.1.7";
-  };
-  redis-rails = {
-    dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0igww7hb58aq74mh50dli3zjg78b54y8nhd0h1h9vz4vgjd4q8m7";
-      type = "gem";
-    };
-    version = "4.0.0";
-  };
-  redis-rack = {
-    dependencies = ["rack" "redis-store"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1y1mxx8gn0krdrpwllv7fqsbvki1qjnb2dz8b4q9gwc326829gk8";
-      type = "gem";
-    };
-    version = "1.5.0";
-  };
-  redis-namespace = {
-    dependencies = ["redis"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0rp8gfkznfxqzxk9s976k71jnljkh0clkrhnp6vgx46s5yhj9g25";
-      type = "gem";
-    };
-    version = "1.5.2";
-  };
-  redis-activesupport = {
-    dependencies = ["activesupport" "redis-store"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "10y3kybz21n2z11478sf0cp4xzclvxf0b428787brmgpc6i7p7zg";
-      type = "gem";
-    };
-    version = "4.1.5";
-  };
-  redis-actionpack = {
-    dependencies = ["actionpack" "redis-rack" "redis-store"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1jjl6dhhpdapdaywq5iqz7z36mwbw0cn0m30wcc5wcbv7xmiiygw";
-      type = "gem";
-    };
-    version = "4.0.1";
-  };
-  redis = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0255w9izzs04hw9wivn05yqiwi34w28ylxs0xvpmwc1vrh18fwcl";
-      type = "gem";
-    };
-    version = "3.2.2";
-  };
-  redcarpet = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "14i3wypp97bpk20679d1csy88q4hsgfqbnqw6mryl77m2g0d09pk";
-      type = "gem";
-    };
-    version = "3.3.3";
-  };
-  recaptcha = {
-    dependencies = ["json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "190qqklirmi31s6ih7png4h9xmx1p5h2n5fi45z90y8hsp5w1sh1";
-      type = "gem";
-    };
-    version = "1.0.2";
-  };
-  rdoc = {
-    dependencies = ["json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1v9k4sp5yzj2bshngckdvivj6bszciskk1nd2r3wri2ygs7vgqm8";
-      type = "gem";
-    };
-    version = "3.12.2";
-  };
-  rblineprof = {
-    dependencies = ["debugger-ruby_core_source"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0m58kdjgncwf0h1qry3qk5h4bg8sj0idykqqijqcrr09mxfd9yc6";
-      type = "gem";
-    };
-    version = "0.3.6";
-  };
-  rb-inotify = {
-    dependencies = ["ffi"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9";
-      type = "gem";
-    };
-    version = "0.9.5";
-  };
-  rb-fsevent = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1hq57by28iv0ijz8pk9ynih0xdg7vnl1010xjcijfklrcv89a1j2";
-      type = "gem";
-    };
-    version = "0.9.6";
-  };
-  raphael-rails = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0sjiaymvfn4al5dr1pza5i142byan0fxnj4rymziyql2bzvdm2bc";
-      type = "gem";
-    };
-    version = "2.1.2";
-  };
-  rake = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0jcabbgnjc788chx31sihc5pgbqnlc1c75wakmqlbjdm8jns2m9b";
-      type = "gem";
-    };
-    version = "10.5.0";
-  };
-  raindrops = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1hv0xhr762axywr937czi92fs0x3zk7k22vg6f4i7rr8d05sp560";
-      type = "gem";
-    };
-    version = "0.15.0";
-  };
-  rainbow = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0dsnzfjiih2w8npsjab3yx1ssmmvmgjkbxny0i9yzrdy7whfw7b4";
-      type = "gem";
-    };
-    version = "2.0.0";
-  };
-  railties = {
-    dependencies = ["actionpack" "activesupport" "rake" "thor"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "cfff64cbc0e409341003c35fa2e576e6a8cd8259a9894d09f15c6123be73f146";
-      type = "gem";
-    };
-    version = "4.2.5.2";
-  };
-  rails-html-sanitizer = {
-    dependencies = ["loofah"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "138fd86kv073zqfx0xifm646w6bgw2lr8snk16lknrrfrss8xnm7";
-      type = "gem";
-    };
-    version = "1.0.3";
-  };
-  rails-dom-testing = {
-    dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1v8jl6803mbqpxh4hn0szj081q1a3ap0nb8ni0qswi7z4la844v8";
-      type = "gem";
-    };
-    version = "1.0.7";
-  };
-  rails-deprecated_sanitizer = {
-    dependencies = ["activesupport"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj";
-      type = "gem";
-    };
-    version = "1.0.3";
-  };
-  rails = {
-    dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "aa93c1b9eb8b535eee58280504e30237f88217699fe9bb016e458e5122eefa2e";
-      type = "gem";
-    };
-    version = "4.2.5.2";
-  };
-  rack-test = {
-    dependencies = ["rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
-      type = "gem";
-    };
-    version = "0.6.3";
-  };
-  rack-protection = {
-    dependencies = ["rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
-      type = "gem";
-    };
-    version = "1.5.3";
-  };
-  rack-oauth2 = {
-    dependencies = ["activesupport" "attr_required" "httpclient" "multi_json" "rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1szfnb74p5s7k0glpmiv16rfl4wx9mnrr7riapgpbcx163zzkxad";
-      type = "gem";
-    };
-    version = "1.2.1";
-  };
-  rack-mount = {
-    dependencies = ["rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "09a1qfaxxsll1kbgz7z0q0nr48sfmfm7akzaviis5bjpa5r00ld2";
-      type = "gem";
-    };
-    version = "0.8.3";
-  };
-  rack-cors = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1sz9d9gjmv2vjl3hddzk269hb1k215k8sp37gicphx82h3chk1kw";
-      type = "gem";
-    };
-    version = "0.4.0";
-  };
-  rack-attack = {
-    dependencies = ["rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ihic8ar2ddfv15p5gia8nqzsl3y7iayg5v4rmg72jlvikgsabls";
-      type = "gem";
-    };
-    version = "4.3.1";
-  };
-  rack-accept = {
-    dependencies = ["rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "18jdipx17b4ki33cfqvliapd31sbfvs4mv727awynr6v95a7n936";
-      type = "gem";
-    };
-    version = "0.4.5";
-  };
-  rack = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5";
-      type = "gem";
-    };
-    version = "1.6.4";
-  };
-  quiet_assets = {
-    dependencies = ["railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1q4azw4j1xsgd7qwcig110mfdn1fm0y34y87zw9j9v187xr401b1";
-      type = "gem";
-    };
-    version = "1.0.3";
-  };
-  pyu-ruby-sasl = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1rcpjiz9lrvyb3rd8k8qni0v4ps08psympffyldmmnrqayyad0sn";
-      type = "gem";
-    };
-    version = "0.0.3.3";
-  };
-  pry-rails = {
-    dependencies = ["pry"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0a2iinvabis2xmv0z7z7jmh7bbkkngxj2qixfdg5m6qj9x8k1kx6";
-      type = "gem";
-    };
-    version = "0.3.4";
-  };
-  pry = {
-    dependencies = ["coderay" "method_source" "slop"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1x78rvp69ws37kwig18a8hr79qn36vh8g1fn75p485y3b3yiqszg";
-      type = "gem";
-    };
-    version = "0.10.3";
-  };
-  powerpack = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43";
-      type = "gem";
-    };
-    version = "0.1.1";
-  };
-  posix-spawn = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "052lnxbkvlnwfjw4qd7vn2xrlaaqiav6f5x5bcjin97bsrfq6cmr";
-      type = "gem";
-    };
-    version = "0.3.11";
-  };
-  poltergeist = {
-    dependencies = ["capybara" "cliver" "multi_json" "websocket-driver"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ppm4isvbxm739508yjhvisq1iwp1q6h8dx4hkndj2krskavz4i9";
-      type = "gem";
-    };
-    version = "1.8.1";
-  };
-  pg = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32";
-      type = "gem";
-    };
-    version = "0.18.4";
-  };
-  parser = {
-    dependencies = ["ast"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "14db0gam24j04iprqz4m3hxygkb8h0plnbm0yk4k3lzq6j5wzcac";
-      type = "gem";
-    };
-    version = "2.2.3.0";
-  };
-  paranoia = {
-    dependencies = ["activerecord"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0z2smnnghjhcs4l5fkz9scs1kj0bvj2n8xmzcvw4rg9yprdnlxr0";
-      type = "gem";
-    };
-    version = "2.1.4";
-  };
-  orm_adapter = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1fg9jpjlzf5y49qs9mlpdrgs5rpcyihq1s4k79nv9js0spjhnpda";
-      type = "gem";
-    };
-    version = "0.5.0";
-  };
-  org-ruby = {
-    dependencies = ["rubypants"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0x69s7aysfiwlcpd9hkvksfyld34d8kxr62adb59vjvh8hxfrjwk";
-      type = "gem";
-    };
-    version = "0.9.12";
-  };
-  omniauth_crowd = {
-    dependencies = ["activesupport" "nokogiri" "omniauth"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "12g5ck05h6kr9mnp870x8pkxsadg81ca70hg8n3k8xx007lfw2q7";
-      type = "gem";
-    };
-    version = "2.2.3";
-  };
-  omniauth-twitter = {
-    dependencies = ["json" "omniauth-oauth"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1hqjpb1zx0pp3s12c83pkpk4kkx41f001jc5n8qz0h3wll0ld833";
-      type = "gem";
-    };
-    version = "1.2.1";
-  };
-  omniauth-shibboleth = {
-    dependencies = ["omniauth"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0a8pwy23aybxhn545357zdjy0hnpfgldwqk5snmz9kxingpq12jl";
-      type = "gem";
-    };
-    version = "1.2.1";
-  };
-  omniauth-saml = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0c7pypskq9y6wbl7c8gnp48j256snph11br3csgwvy9whjfisx65";
-      type = "gem";
-    };
-    version = "1.4.2";
-  };
-  omniauth-oauth2 = {
-    dependencies = ["oauth2" "omniauth"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0mskwlw5ibx9mz7ywqji6mm56ikf7mglbnfc02qhg6ry527jsxdm";
-      type = "gem";
-    };
-    version = "1.3.1";
-  };
-  omniauth-oauth = {
-    dependencies = ["oauth" "omniauth"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1n5vk4by7hkyc09d9blrw2argry5awpw4gbw1l4n2s9b3j4qz037";
-      type = "gem";
-    };
-    version = "1.1.0";
-  };
-  omniauth-multipassword = {
-    dependencies = ["omniauth"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0qykp76hw80lkgb39hyzrv68hkbivc8cv0vbvrnycjh9fwfp1lv8";
-      type = "gem";
-    };
-    version = "0.4.2";
-  };
-  omniauth-kerberos = {
-    dependencies = ["omniauth-multipassword" "timfel-krb5-auth"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "05xsv76qjxcxzrvabaar2bchv7435y8l2j0wk4zgchh3yv85kiq7";
-      type = "gem";
-    };
-    version = "0.3.0";
-  };
-  omniauth-google-oauth2 = {
-    dependencies = ["addressable" "jwt" "multi_json" "omniauth" "omniauth-oauth2"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1lm4fk6ig9vwzv7398qd861325g678sfr1iv2mm60xswl69964fi";
-      type = "gem";
-    };
-    version = "0.2.10";
-  };
-  omniauth-gitlab = {
-    dependencies = ["omniauth" "omniauth-oauth2"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "083yyc8612kq8ygd8y7s8lxg2d51jcsakbs4pa19aww67gcm72iz";
-      type = "gem";
-    };
-    version = "1.0.1";
-  };
-  omniauth-github = {
-    dependencies = ["omniauth" "omniauth-oauth2"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1mbx3c8m1llhdxrqdciq8jh428bxj1nvf4yhziv2xqmqpjcqz617";
-      type = "gem";
-    };
-    version = "1.1.2";
-  };
-  omniauth-facebook = {
-    dependencies = ["omniauth-oauth2"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0plj56sna4b6c71k03jsng6gq3r5yxhj7h26ndahc9caasgk869c";
-      type = "gem";
-    };
-    version = "3.0.0";
-  };
-  omniauth-cas3 = {
-    dependencies = ["addressable" "nokogiri" "omniauth"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "13swm2hi2z63nvb2bps6g41kki8kr9b5c7014rk8259bxlpflrk7";
-      type = "gem";
-    };
-    version = "1.1.3";
-  };
-  omniauth-bitbucket = {
-    dependencies = ["multi_json" "omniauth" "omniauth-oauth"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1lals2z1yixffrc97zh7zn1jpz9l6vpb3alcp13im42dq9q0g845";
-      type = "gem";
-    };
-    version = "0.0.2";
-  };
-  omniauth-azure-oauth2 = {
-    dependencies = ["jwt" "omniauth" "omniauth-oauth2"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0qay454zvyas8xfnfkycqpjkafaq5pw4gaji176cdfw0blhviz0s";
-      type = "gem";
-    };
-    version = "0.0.6";
-  };
-  omniauth = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0vsqxgzkcfi10b7k6vpv3shmlphbs8grc29hznwl9s0i16n8962p";
-      type = "gem";
-    };
-    version = "1.3.1";
-  };
-  octokit = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0vmknh0vz1g734q32kgpxv0qwz9ifmnw2jfpd2w5rrk6xwq1k7a8";
-      type = "gem";
-    };
-    version = "3.8.0";
-  };
-  oauth2 = {
-    dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0zaa7qnvizv363apmxx9vxa8f6c6xy70z0jm0ydx38xvhxr8898r";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
-  oauth = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1k5j09p3al3clpjl6lax62qmhy43f3j3g7i6f9l4dbs6r5vpv95w";
-      type = "gem";
-    };
-    version = "0.4.7";
-  };
-  nprogress-rails = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1ylq2208i95661ba0p1ng2i38z4978ddwiidvpb614amfdq5pqvn";
-      type = "gem";
-    };
-    version = "0.1.6.7";
-  };
-  nokogiri = {
-    dependencies = ["mini_portile2"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv";
-      type = "gem";
-    };
-    version = "1.6.7.2";
-  };
-  newrelic_rpm = {
-    version = "3.14.1.311";
-    source = {
-      type = "gem";
-      remotes = ["https://rubygems.org"];
-      sha256 = "155aj845rxn8ikcs15gphr8svnsrki8wzps794ddbi90h0ypr319";
-    };
-  };
-  netrc = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
-      type = "gem";
-    };
-    version = "0.11.0";
-  };
-  net-ssh = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1dzqkgwi9xm6mbfk1rkk17rzmz8m5xakqi21w1b97ybng6kkw0hf";
-      type = "gem";
-    };
-    version = "3.0.1";
-  };
-  net-ldap = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0z1j0zklbbx3vi91zcd2v0fnkfgkvq3plisa6hxaid8sqndyak46";
-      type = "gem";
-    };
-    version = "0.12.1";
-  };
-  nested_form = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0f053j4zfagxyym28msxj56hrpvmyv4lzxy2c5c270f7xbbnii5i";
-      type = "gem";
-    };
-    version = "0.3.2";
-  };
-  mysql2 = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0n075x14n9kziv0qdxqlzhf3j1abi1w6smpakfpsg4jbr8hnn5ip";
-      type = "gem";
-    };
-    version = "0.3.20";
-  };
-  multipart-post = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
-      type = "gem";
-    };
-    version = "2.0.0";
-  };
-  multi_xml = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0i8r7dsz4z79z3j023l8swan7qpbgxbwwz11g38y2vjqjk16v4q8";
-      type = "gem";
-    };
-    version = "0.5.5";
-  };
-  multi_json = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1rf3l4j3i11lybqzgq2jhszq7fh7gpmafjzd14ymp9cjfxqg596r";
-      type = "gem";
-    };
-    version = "1.11.2";
-  };
-  mousetrap-rails = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00n13r5pwrk4vq018128vcfh021dw0fa2bk4pzsv0fslfm8ayp2m";
-      type = "gem";
-    };
-    version = "1.4.6";
-  };
-  minitest = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0rxqfakp629mp3vwda7zpgb57lcns5znkskikbfd0kriwv8i1vq8";
-      type = "gem";
-    };
-    version = "5.7.0";
-  };
-  mini_portile2 = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l";
-      type = "gem";
-    };
-    version = "2.0.0";
-  };
-  mimemagic = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "101lq4bnjs7ywdcicpw3vbz9amg5gbb4va1626fybd2hawgdx8d9";
-      type = "gem";
-    };
-    version = "0.3.0";
-  };
-  mime-types = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8";
-      type = "gem";
-    };
-    version = "1.25.1";
-  };
-  method_source = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2";
-      type = "gem";
-    };
-    version = "0.8.2";
-  };
-  mail_room = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0jpybhgw9yi50g422qvnwadn5jnj563vh70qaml5cxzdqxbd7fj1";
-      type = "gem";
-    };
-    version = "0.6.1";
-  };
-  mail = {
-    dependencies = ["mime-types"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp";
-      type = "gem";
-    };
-    version = "2.6.3";
-  };
-  macaddr = {
-    dependencies = ["systemu"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1clii8mvhmh5lmnm95ljnjygyiyhdpja85c5vy487rhxn52scn0b";
-      type = "gem";
-    };
-    version = "1.7.1";
-  };
-  loofah = {
-    dependencies = ["nokogiri"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "109ps521p0sr3kgc460d58b4pr1z4mqggan2jbsf0aajy9s6xis8";
-      type = "gem";
-    };
-    version = "2.0.3";
-  };
-  listen = {
-    dependencies = ["rb-fsevent" "rb-inotify"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "182wd2pkf690ll19lx6zbk01a3rqkk5lwsyin6kwydl7lqxj5z3g";
-      type = "gem";
-    };
-    version = "3.0.5";
-  };
-  letter_opener = {
-    dependencies = ["launchy"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1kzbmc686hfh4jznyckq6g40kn14nhb71znsjjm0rc13nb3n0c5l";
-      type = "gem";
-    };
-    version = "1.1.2";
-  };
-  launchy = {
-    dependencies = ["addressable"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2";
-      type = "gem";
-    };
-    version = "2.4.3";
-  };
-  kgio = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1y6wl3vpp82rdv5g340zjgkmy6fny61wib7xylyg0d09k5f26118";
-      type = "gem";
-    };
-    version = "2.10.0";
-  };
-  kaminari = {
-    dependencies = ["actionpack" "activesupport"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "14vx3kgssl4lv2kn6grr5v2whsynx5rbl1j9aqiq8nc3d7j74l67";
-      type = "gem";
-    };
-    version = "0.16.3";
-  };
-  jwt = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0is8973si98rsry5igqdag2jb1knj6jhmfkr9r4mc5n0yvgr5n2q";
-      type = "gem";
-    };
-    version = "1.5.2";
-  };
-  json = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
-      type = "gem";
-    };
-    version = "1.8.3";
-  };
-  jquery-ui-rails = {
-    dependencies = ["railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1gfygrv4bjpjd2c377lw7xzk1b77rxjyy3w6wl4bq1gkqvyrkx77";
-      type = "gem";
-    };
-    version = "5.0.5";
-  };
-  jquery-turbolinks = {
-    dependencies = ["railties" "turbolinks"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1d23mnl3lgamk9ziw4yyv2ixck6d8s8xp4f9pmwimk0by0jq7xhc";
-      type = "gem";
-    };
-    version = "2.1.0";
-  };
-  jquery-scrollto-rails = {
-    dependencies = ["railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "12ic0zxw60ryglm1qjq5ralqd6k4jawmjj7kqnp1nkqds2nvinvp";
-      type = "gem";
-    };
-    version = "1.4.3";
-  };
-  jquery-rails = {
-    dependencies = ["rails-dom-testing" "railties" "thor"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "028dv2n0r2r8qj1bqcbzmih0hwzh5km6cvscn2808v5gd44z48r1";
-      type = "gem";
-    };
-    version = "4.0.5";
-  };
-  jquery-atwho-rails = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0g8239cddyi48i5n0hq2acg9k7n7jilhby9g36zd19mwqyia16w9";
-      type = "gem";
-    };
-    version = "1.3.2";
-  };
-  ipaddress = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0sl0ldvhd6j0qbwhz18w24qy65mdj448b2vhgh2cwn7xrkksmv9l";
-      type = "gem";
-    };
-    version = "0.8.2";
-  };
-  influxdb = {
-    dependencies = ["cause" "json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1vhg5nd88nwvfa76lqcczld916nljswwq6clsixrzi3js8ym9y1w";
-      type = "gem";
-    };
-    version = "0.2.3";
-  };
-  inflecto = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "085l5axmvqw59mw5jg454a3m3gr67ckq9405a075isdsn7bm3sp4";
-      type = "gem";
-    };
-    version = "0.0.2";
-  };
-  ice_nine = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0i674zq0hl6rd0wcd12ni38linfja4k0y3mk5barjb4a6f7rcmkd";
-      type = "gem";
-    };
-    version = "0.11.1";
-  };
-  i18n = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758";
-      type = "gem";
-    };
-    version = "0.7.0";
-  };
-  httpclient = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0k6bqsaqq6c824vrbfb5pkz8bpk565zikd10w85rzj2dy809ik6c";
-      type = "gem";
-    };
-    version = "2.7.0.1";
-  };
-  httparty = {
-    dependencies = ["json" "multi_xml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0c9gvg6dqw2h3qyaxhrq1pzm6r69zfcmfh038wyhisqsd39g9hr2";
-      type = "gem";
-    };
-    version = "0.13.7";
-  };
-  "http_parser.rb" = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0fwf5d573j1sw52kz057dw0nx2wlivczmx6ybf6mk065n5g54kyn";
-      type = "gem";
-    };
-    version = "0.5.3";
-  };
-  http-cookie = {
-    dependencies = ["domain_name"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0cz2fdkngs3jc5w32a6xcl511hy03a7zdiy988jk1sf3bf5v3hdw";
-      type = "gem";
-    };
-    version = "1.0.2";
-  };
-  html2haml = {
-    dependencies = ["erubis" "haml" "nokogiri" "ruby_parser"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "069zcy8lr010hn4qmbi8g5srdf69brk8nbgx4zcqcgbgsl4m8d4i";
-      type = "gem";
-    };
-    version = "2.0.0";
-  };
-  html-pipeline = {
-    dependencies = ["activesupport" "nokogiri"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1yckdlrn4v5d7bgl8mbffax16640pgg9ny693kqi4j7g17vx2q9l";
-      type = "gem";
-    };
-    version = "1.11.0";
-  };
-  hipchat = {
-    dependencies = ["httparty" "mimemagic"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k";
-      type = "gem";
-    };
-    version = "1.5.2";
-  };
-  hike = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm";
-      type = "gem";
-    };
-    version = "1.2.3";
-  };
-  highline = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr";
-      type = "gem";
-    };
-    version = "1.7.8";
-  };
-  hashie = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1iv5hd0zcryprx9lbcm615r3afc0d6rhc27clywmhhgpx68k8899";
-      type = "gem";
-    };
-    version = "3.4.3";
-  };
-  haml-rails = {
-    dependencies = ["actionpack" "activesupport" "haml" "html2haml" "railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1hbfznkxab663hxp1v6gpsa7sv6w1fnw9r8b3flixwylnwh3c5dz";
-      type = "gem";
-    };
-    version = "0.9.0";
-  };
-  haml = {
-    dependencies = ["tilt"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0mrzjgkygvfii66bbylj2j93na8i89998yi01fin3whwqbvx0m1p";
-      type = "gem";
-    };
-    version = "4.0.7";
-  };
-  grape-entity = {
-    dependencies = ["activesupport" "multi_json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0hxghs2p9ncvdwhp6dwr1a74g552c49dd0jzy0szp4pg2xjbgjk8";
-      type = "gem";
-    };
-    version = "0.4.8";
-  };
-  grape = {
-    dependencies = ["activesupport" "builder" "hashie" "multi_json" "multi_xml" "rack" "rack-accept" "rack-mount" "virtus"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1dxfal5jspxq612jjkqbd7xgp5dswdyllbbfq6fj2m7s21pismmh";
-      type = "gem";
-    };
-    version = "0.13.0";
-  };
-  gon = {
-    dependencies = ["actionpack" "json" "multi_json" "request_store"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1f359cd9zsa4nrng35bij5skvjrj5ywn2dhmlg41b97vmza26bxr";
-      type = "gem";
-    };
-    version = "6.0.1";
-  };
-  gollum-lib = {
-    dependencies = ["github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "01s8pgzhc3cgcmsy6hh79wrcbn5vbadniq2a7d4qw87kpq7mzfdm";
-      type = "gem";
-    };
-    version = "4.1.0";
-  };
-  gollum-grit_adapter = {
-    dependencies = ["gitlab-grit"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "02c5qfq0s0kx2ifnpbnbgz6258fl7rchzzzc7vpx72shi8gbpac7";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
-  globalid = {
-    dependencies = ["activesupport"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "145xrpsfx1qqjy33r6qa588wb16dvdhxzj2aysh755vhg6hgm291";
-      type = "gem";
-    };
-    version = "0.3.6";
-  };
-  gitlab_omniauth-ldap = {
-    dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1vbdyi57vvlrigyfhmqrnkw801x57fwa3gxvj1rj2bn9ig5186ri";
-      type = "gem";
-    };
-    version = "1.2.1";
-  };
-  gitlab_meta = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "14vahv7gblcypbvip845sg3lvawf3kij61mkxz5vyfcv23niqvp9";
-      type = "gem";
-    };
-    version = "7.0";
-  };
-  gitlab_git = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0311dl4vh6h7k8xarmpr61fndrhbmfskzjzkkj1rr8321gn8znfv";
-      type = "gem";
-    };
-    version = "8.2.0";
-  };
-  gitlab_emoji = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1dy746icdmyc548mb5xkavvkn37pk7vv3gznx0p6hff325pan8dj";
-      type = "gem";
-    };
-    version = "0.3.1";
-  };
-  gitlab-grit = {
-    dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0nv8shx7w7fww8lf5a2rbvf7bq173rllm381m6x7g1i0qqc68q1b";
-      type = "gem";
-    };
-    version = "2.7.3";
-  };
-  gitlab-flowdock-git-hook = {
-    dependencies = ["flowdock" "gitlab-grit" "multi_json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1s3a10cdbh4xy732b92zcsm5zyc1lhi5v29d76j8mwbqmj11a2p8";
-      type = "gem";
-    };
-    version = "1.0.1";
-  };
-  github-markup = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "01r901wcgn0gs0n9h684gs5n90y1vaj9lxnx4z5ig611jwa43ivq";
-      type = "gem";
-    };
-    version = "1.3.3";
-  };
-  github-linguist = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1xxm2lbabkc1xmx2myv56a4fkw3wwg9n8w2bzwrl4s33kf6x62ag";
-      type = "gem";
-    };
-    version = "4.7.5";
-  };
-  gherkin-ruby = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "18ay7yiibf4sl9n94k7mbi4k5zj2igl4j71qcmkswv69znyx0sn1";
-      type = "gem";
-    };
-    version = "0.3.2";
-  };
-  get_process_mem = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "025f7v6bpbgsa2nr0hzv2riggj8qmzbwcyxfgjidpmwh5grh7j29";
-      type = "gem";
-    };
-    version = "0.2.0";
-  };
-  gemojione = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0av60lajn64z1csmkzfaf5wvpd3x48lcshiknkqr8m0zx3sg7w3h";
-      type = "gem";
-    };
-    version = "2.2.1";
-  };
-  gemnasium-gitlab-service = {
-    dependencies = ["rugged"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1qv7fkahmqkah3770ycrxd0x2ais4z41hb43a0r8q8wcdklns3m3";
-      type = "gem";
-    };
-    version = "0.2.6";
-  };
-  fuubar = {
-    dependencies = ["rspec" "ruby-progressbar"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0xwqs24y8s73aayh39si17kccsmr0bjgmi6jrjyfp7gkjb6iyhpv";
-      type = "gem";
-    };
-    version = "2.0.0";
-  };
-  formatador = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0";
-      type = "gem";
-    };
-    version = "0.2.5";
-  };
-  foreman = {
-    dependencies = ["thor"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1caz8mi7gq1hs4l1flcyyw1iw1bdvdbhppsvy12akr01k3s17xaq";
-      type = "gem";
-    };
-    version = "0.78.0";
-  };
-  font-awesome-rails = {
-    dependencies = ["railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "09x1bg98sp2v1lsg9h2bal915q811xq84h9d74p1f3378ga63c1x";
-      type = "gem";
-    };
-    version = "4.5.0.0";
-  };
-  fog-xml = {
-    dependencies = ["fog-core" "nokogiri"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1576sbzza47z48p0k9h1wg3rhgcvcvdd1dfz3xx1cgahwr564fqa";
-      type = "gem";
-    };
-    version = "0.1.2";
-  };
-  fog-xenserver = {
-    dependencies = ["fog-core" "fog-xml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1ngw8hh8ljk7wi0cp8n4b4jcy2acx0yqzjk7851m3mp0kji5dlgl";
-      type = "gem";
-    };
-    version = "0.2.2";
-  };
-  fog-voxel = {
-    dependencies = ["fog-core" "fog-xml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "10skdnj59yf4jpvq769njjrvh2l0wzaa7liva8n78qq003mvmfgx";
-      type = "gem";
-    };
-    version = "0.1.0";
-  };
-  fog-vmfusion = {
-    dependencies = ["fission" "fog-core"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0g0l0k9ylxk1h9pzqr6h2ba98fl47lpp3j19lqv4jxw0iw1rqxn4";
-      type = "gem";
-    };
-    version = "0.1.0";
-  };
-  fog-terremark = {
-    dependencies = ["fog-core" "fog-xml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "01lfkh9jppj0iknlklmwyb7ym3bfhkq58m3absb6rf5a5mcwi3lf";
-      type = "gem";
-    };
-    version = "0.1.0";
-  };
-  fog-storm_on_demand = {
-    dependencies = ["fog-core" "fog-json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0fif1x8ci095b2yyilf65n7x6iyvn448azrsnmwsdkriy8vxxv3y";
-      type = "gem";
-    };
-    version = "0.1.1";
-  };
-  fog-softlayer = {
-    dependencies = ["fog-core" "fog-json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1zax2wws0q8pm787jnlxd2xlj23f2acz0s6jl5nzczyxjgll571r";
-      type = "gem";
-    };
-    version = "1.0.3";
-  };
-  fog-serverlove = {
-    dependencies = ["fog-core" "fog-json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0hxgmwzygrw25rbsy05i6nzsyr0xl7xj5j2sjpkb9n9wli5sagci";
-      type = "gem";
-    };
-    version = "0.1.2";
-  };
-  fog-sakuracloud = {
-    dependencies = ["fog-core" "fog-json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "08krsn9sk5sx0aza812g31r169bd0zanb8pq5am3a64j6azarimd";
-      type = "gem";
-    };
-    version = "1.7.5";
-  };
-  fog-riakcs = {
-    dependencies = ["fog-core" "fog-json" "fog-xml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1nbxc4dky3agfwrmgm1aqmi59p6vnvfnfbhhg7xpg4c2cf41whxm";
-      type = "gem";
-    };
-    version = "0.1.0";
-  };
-  fog-radosgw = {
-    dependencies = ["fog-core" "fog-json" "fog-xml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0nslgv8yp5qkiryj3zsm91gs7s6i626igj61kwxjjwk2yv6swyr6";
-      type = "gem";
-    };
-    version = "0.0.5";
-  };
-  fog-profitbricks = {
-    dependencies = ["fog-core" "fog-xml" "nokogiri"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "154sqs2dcmvg21v4m3fj8f09z5i70sq8a485v6rdygsffs8xrycn";
-      type = "gem";
-    };
-    version = "0.0.5";
-  };
-  fog-powerdns = {
-    dependencies = ["fog-core" "fog-json" "fog-xml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "08zavzwfkk344gz83phz4sy9nsjznsdjsmn1ifp6ja17bvydlhh7";
-      type = "gem";
-    };
-    version = "0.1.1";
-  };
-  fog-local = {
-    dependencies = ["fog-core"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0i5hxwzmc2ag3z9nlligsaf679kp2pz39cd8n2s9cmxaamnlh2s3";
-      type = "gem";
-    };
-    version = "0.2.1";
-  };
-  fog-json = {
-    dependencies = ["fog-core" "multi_json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r";
-      type = "gem";
-    };
-    version = "1.0.2";
-  };
-  fog-google = {
-    dependencies = ["fog-core" "fog-json" "fog-xml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0z4vmswpqwph04c0wqzrscns1d1wdm8kbxx457bv156mawzrhfj3";
-      type = "gem";
-    };
-    version = "0.1.0";
-  };
-  fog-ecloud = {
-    dependencies = ["fog-core" "fog-xml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "18rb4qjad9xwwqvvpj8r2h0hi9svy71pm4d3fc28cdcnfarmdi06";
-      type = "gem";
-    };
-    version = "0.3.0";
-  };
-  fog-dynect = {
-    dependencies = ["fog-core" "fog-json" "fog-xml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "18lqmdkm22254z86jh3aa9v9vqk8bgbd3d1m0w7az3ij47ak7kch";
-      type = "gem";
-    };
-    version = "0.0.2";
-  };
-  fog-core = {
-    dependencies = ["builder" "excon" "formatador"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "02z91r3f5a64hlalm6h39v0778yl2kk3qvva0zvplpp9hpwbwzhl";
-      type = "gem";
-    };
-    version = "1.35.0";
-  };
-  fog-brightbox = {
-    dependencies = ["fog-core" "fog-json" "inflecto"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0p7rbx587hb1d1am90dcr3zdp6y50c2zddh97yfgl62vji0pbkkd";
-      type = "gem";
-    };
-    version = "0.10.1";
-  };
-  fog-aws = {
-    dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1pzfahq8h3alfflb5dr8lm02q27x81vm96qn5zyfdlx86yy7bq96";
-      type = "gem";
-    };
-    version = "0.8.1";
-  };
-  fog-atmos = {
-    dependencies = ["fog-core" "fog-xml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1aaxgnw9zy96gsh4h73kszypc32sx497s6bslvhfqh32q9d1y8c9";
-      type = "gem";
-    };
-    version = "0.1.0";
-  };
-  fog-aliyun = {
-    dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1i76g8sdskyfc0gcnd6n9i757s7dmwg3wf6spcr2xh8wzyxkm1pj";
-      type = "gem";
-    };
-    version = "0.1.0";
-  };
-  fog = {
-    dependencies = ["fog-aliyun" "fog-atmos" "fog-aws" "fog-brightbox" "fog-core" "fog-dynect" "fog-ecloud" "fog-google" "fog-json" "fog-local" "fog-powerdns" "fog-profitbricks" "fog-radosgw" "fog-riakcs" "fog-sakuracloud" "fog-serverlove" "fog-softlayer" "fog-storm_on_demand" "fog-terremark" "fog-vmfusion" "fog-voxel" "fog-xenserver" "fog-xml" "ipaddress" "nokogiri"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1ml31jdycqdm8w7w3l9pbyrgbnmrrnhmkppa2x4bwi9as1n1jmwq";
-      type = "gem";
-    };
-    version = "1.36.0";
-  };
-  flowdock = {
-    dependencies = ["httparty" "multi_json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "04nrvg4gzgabf5mnnhccl8bwrkvn3y4pm7a1dqzqhpvfr4m5pafg";
-      type = "gem";
-    };
-    version = "0.7.1";
-  };
-  flog = {
-    dependencies = ["ruby_parser" "sexp_processor"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1asrcdj6gh5mxcimqak94jjyyi5cxnqn904lc8pmrljg1nv1bxpm";
-      type = "gem";
-    };
-    version = "4.3.2";
-  };
-  flay = {
-    dependencies = ["ruby_parser" "sexp_processor"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0zcp9nmnfqixdcqa2dzwwjy5np4n2n16bj25gw7bbzbjp9hqzhn6";
-      type = "gem";
-    };
-    version = "2.6.1";
-  };
-  fission = {
-    dependencies = ["CFPropertyList"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "09pmp1j1rr8r3pcmbn2na2ls7s1j9ijbxj99xi3a8r6v5xhjdjzh";
-      type = "gem";
-    };
-    version = "0.5.0";
-  };
-  ffi = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj";
-      type = "gem";
-    };
-    version = "1.9.10";
-  };
-  ffaker = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "19fnbbsw87asyb1hvkr870l2yldah2jcjb8074pgyrma5lynwmn0";
-      type = "gem";
-    };
-    version = "2.0.0";
-  };
-  fastercsv = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1df3vfgw5wg0s405z0pj0rfcvnl9q6wak7ka8gn0xqg4cag1k66h";
-      type = "gem";
-    };
-    version = "1.5.5";
-  };
-  faraday_middleware-multi_json = {
-    dependencies = ["faraday_middleware" "multi_json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0651sxhzbq9xfq3hbpmrp0nbybxnm9ja3m97k386m4bqgamlvz1q";
-      type = "gem";
-    };
-    version = "0.0.6";
-  };
-  faraday_middleware = {
-    dependencies = ["faraday"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0nxia26xzy8i56qfyz1bg8dg9yb26swpgci8n5jry8mh4bnx5r5h";
-      type = "gem";
-    };
-    version = "0.10.0";
-  };
-  faraday = {
-    dependencies = ["multipart-post"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6";
-      type = "gem";
-    };
-    version = "0.9.2";
-  };
-  factory_girl_rails = {
-    dependencies = ["factory_girl" "railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1jj0yl6mfildb4g79dwgc1q5pv2pa65k9b1ml43mi8mg62j8mrhz";
-      type = "gem";
-    };
-    version = "4.3.0";
-  };
-  factory_girl = {
-    dependencies = ["activesupport"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "13z20a4b7z1c8vbz0qz5ranssdprldwvwlgjmn38x311sfjmp9dz";
-      type = "gem";
-    };
-    version = "4.3.0";
-  };
-  expression_parser = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1938z3wmmdabqxlh5d5c56xfg1jc6z15p7zjyhvk7364zwydnmib";
-      type = "gem";
-    };
-    version = "0.9.0";
-  };
-  execjs = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0grlxwiccbnflxs30r3h7g23xnps5knav1jyqkk3anvm8363ifjw";
-      type = "gem";
-    };
-    version = "2.6.0";
-  };
-  excon = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1shb4g3dhsfkywgjv6123yrvp2c8bvi8hqmq47iqa5lp72sn4b4w";
-      type = "gem";
-    };
-    version = "0.45.4";
-  };
-  eventmachine = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1frvpk3p73xc64qkn0ymll3flvn4xcycq5yx8a43zd3gyzc1ifjp";
-      type = "gem";
-    };
-    version = "1.0.8";
-  };
-  escape_utils = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0hb8nmrgmd9n5dhih86fp91sf26mmw14sdn5vswg5g20svrqxc7x";
-      type = "gem";
-    };
-    version = "1.1.0";
-  };
-  erubis = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
-      type = "gem";
-    };
-    version = "2.7.0";
-  };
-  equalizer = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4";
-      type = "gem";
-    };
-    version = "0.0.11";
-  };
-  encryptor = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "04wqqda081h7hmhwjjx1yqxprxjk8s5jgv837xqv1bpxiv7f4v1y";
-      type = "gem";
-    };
-    version = "1.3.0";
-  };
-  email_spec = {
-    dependencies = ["launchy" "mail"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00p1cc69ncrgg7m45va43pszip8anx5735w1lsb7p5ygkyw8nnpv";
-      type = "gem";
-    };
-    version = "1.6.0";
-  };
-  email_reply_parser = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0k2p229mv7xn7q627zwmvhrcvba4b9m70pw2jfjm6iimg2vmf22r";
-      type = "gem";
-    };
-    version = "0.5.8";
-  };
-  dropzonejs-rails = {
-    dependencies = ["rails"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1vqqxzv6qdqy47m2q28adnmccfvc17p2bmkkaqjvrczrhvkkha64";
-      type = "gem";
-    };
-    version = "0.7.2";
-  };
-  doorkeeper = {
-    dependencies = ["railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0wim84wkvx758cfb8q92w3hhvnfbwr990x1mmfv1ss1ivjz8fmm0";
-      type = "gem";
-    };
-    version = "2.2.2";
-  };
-  domain_name = {
-    dependencies = ["unf"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "16qvfrmcwlzz073aas55mpw2nhyhjcn96s524w0g1wlml242hjav";
-      type = "gem";
-    };
-    version = "0.5.25";
-  };
-  docile = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx";
-      type = "gem";
-    };
-    version = "1.1.5";
-  };
-  diffy = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0il0ri511g9rm88qbvncbzgwc6wk6265hmnf7grcczmrs1z49vl0";
-      type = "gem";
-    };
-    version = "3.0.7";
-  };
-  diff-lcs = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1";
-      type = "gem";
-    };
-    version = "1.2.5";
-  };
-  devise-two-factor = {
-    dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1v2wva971ds48af47rj4ywavlmz7qzbmf1jpf1l3xn3mscz52hln";
+      sha256 = "082n12rkd9j7d89030nhmi4fx1gqaf13knps6cknsyvwix7fryvv";
       type = "gem";
     };
     version = "2.0.1";
   };
-  devise-async = {
-    dependencies = ["devise"];
+  actionmailer = {
+    dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "11llg7ggzpmg4lb9gh4sx55spvp98sal5r803gjzamps9crfq6mm";
-      type = "gem";
-    };
-    version = "0.9.0";
-  };
-  devise = {
-    dependencies = ["bcrypt" "orm_adapter" "railties" "responders" "thread_safe" "warden"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00h0xdl4a8pjpb0gbgy4w6q9j2mpczkmj23195zmjrg2b1gl8f2q";
-      type = "gem";
-    };
-    version = "3.5.4";
-  };
-  descendants_tracker = {
-    dependencies = ["thread_safe"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79";
-      type = "gem";
-    };
-    version = "0.0.4";
-  };
-  default_value_for = {
-    dependencies = ["activerecord"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1z4lrba4y1c3y0rxw8321qbwsb3nr6c2igrpksfvz93yhc9m6xm0";
-      type = "gem";
-    };
-    version = "3.0.1";
-  };
-  debugger-ruby_core_source = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1lp5dmm8a8dpwymv6r1y6yr24wxsj0gvgb2b8i7qq9rcv414snwd";
-      type = "gem";
-    };
-    version = "1.3.8";
-  };
-  debug_inspector = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "109761g00dbrw5q0dfnbqg8blfm699z4jj70l4zrgf9mzn7ii50m";
-      type = "gem";
-    };
-    version = "0.0.2";
-  };
-  database_cleaner = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0n5r7kvsmknk876v3scdphfnvllr9157fa5q7j5fczg8j5qm6kf0";
-      type = "gem";
-    };
-    version = "1.4.1";
-  };
-  daemons = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0b839hryy9sg7x3knsa1d6vfiyvn0mlsnhsb6an8zsalyrz1zgqg";
-      type = "gem";
-    };
-    version = "1.2.3";
-  };
-  d3_rails = {
-    dependencies = ["railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "12vxiiflnnkcxak2wmbajyf5wzmcv9wkl4drsp0am72azl8a6g9x";
-      type = "gem";
-    };
-    version = "3.5.11";
-  };
-  creole = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00rcscz16idp6dx0dk5yi5i0fz593i3r6anbn5bg2q07v3i025wm";
-      type = "gem";
-    };
-    version = "0.5.0";
-  };
-  crack = {
-    dependencies = ["safe_yaml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
-      type = "gem";
-    };
-    version = "0.4.3";
-  };
-  coveralls = {
-    dependencies = ["json" "rest-client" "simplecov" "term-ansicolor" "thor" "tins"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "03vnvcw1fdmkp3405blcxpsjf89jxd2061474a32fchsmv2das9y";
-      type = "gem";
-    };
-    version = "0.8.9";
-  };
-  connection_pool = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1b2bb3k39ni5mzcnqlv9y4yjkbin20s7dkwzp0jw2jf1rmzcgrmy";
-      type = "gem";
-    };
-    version = "2.2.0";
-  };
-  concurrent-ruby = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0qqdgcfkzv90nznrpsvg3cgg5xiqz4c8hnv7va5gm4fp4lf4k85v";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
-  colorize = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "16bsjcqb6pg3k94dh1l5g3hhx5g2g4g8rlr76dnc78yyzjjrbayn";
-      type = "gem";
-    };
-    version = "0.7.7";
-  };
-  coffee-script-source = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1k4fg39rrkl3bpgchfj94fbl9s4ysaz16w8dkqncf2vyf79l3qz0";
-      type = "gem";
-    };
-    version = "1.10.0";
-  };
-  coffee-script = {
-    dependencies = ["coffee-script-source" "execjs"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2";
-      type = "gem";
-    };
-    version = "2.4.1";
-  };
-  coffee-rails = {
-    dependencies = ["coffee-script" "railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0p3zhs44gsy1p90nmghihzfyl7bsk8kv6j3q7rj3bn74wg8w7nqs";
-      type = "gem";
-    };
-    version = "4.1.0";
-  };
-  coercible = {
-    dependencies = ["descendants_tracker"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
-  coderay = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s";
-      type = "gem";
-    };
-    version = "1.1.0";
-  };
-  cliver = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "096f4rj7virwvqxhkavy0v55rax10r4jqf8cymbvn4n631948xc7";
-      type = "gem";
-    };
-    version = "0.3.2";
-  };
-  chunky_png = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0vf0axgrm95bs3y0x5gdb76xawfh210yxplj7jbwr6z7n88i1axn";
-      type = "gem";
-    };
-    version = "1.3.5";
-  };
-  charlock_holmes = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0jsl6k27wjmssxbwv9wpf7hgp9r0nvizcf6qpjnr7qs2nia53lf7";
-      type = "gem";
-    };
-    version = "0.7.3";
-  };
-  cause = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0digirxqlwdg79mkbn70yc7i9i1qnclm2wjbrc47kqv6236bpj00";
-      type = "gem";
-    };
-    version = "0.1";
-  };
-  carrierwave = {
-    dependencies = ["activemodel" "activesupport" "json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1b1av1ancby6brhmypl5k8xwrasd8bd3kqp9ri8kbq7z8nj6k445";
-      type = "gem";
-    };
-    version = "0.9.0";
-  };
-  capybara-screenshot = {
-    dependencies = ["capybara" "launchy"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "17v1wihr3aqrxhrwswkdpdklj1xsfcaksblh1y8hixvm9bqfyz3y";
-      type = "gem";
-    };
-    version = "1.0.11";
-  };
-  capybara = {
-    dependencies = ["mime-types" "nokogiri" "rack" "rack-test" "xpath"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "114k4xi4nfbp3jfbxgwa3fksbwsyibx74gbdqpcgg3dxpmzkaa4f";
-      type = "gem";
-    };
-    version = "2.4.4";
-  };
-  cal-heatmap-rails = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0lrmcyj3iixkprqi9fb9vcn97wpp779sl5hxxgx57r3rb7l4d20w";
-      type = "gem";
-    };
-    version = "3.5.1";
-  };
-  byebug = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1yx89b7vh5mbvxyi8n7zl25ia1bqdj71995m4daj6d41rnkmrpnc";
-      type = "gem";
-    };
-    version = "8.2.1";
-  };
-  bundler-audit = {
-    dependencies = ["thor"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0msv3k2277y7al5lbnw7q9lmb5fnrscpkmsb36wpn189pdq0akfv";
-      type = "gem";
-    };
-    version = "0.4.0";
-  };
-  bullet = {
-    dependencies = ["activesupport" "uniform_notifier"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1h3iaflcz5a1xr32bdb8sk4nx06yhh5d8y7w294w49xigfv4hzj3";
-      type = "gem";
-    };
-    version = "4.14.10";
-  };
-  builder = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2";
-      type = "gem";
-    };
-    version = "3.2.2";
-  };
-  browser = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "01bkb64w2ld2q5r3chc4f6spbjrmginyg8wlzg130zmx2z4jia2h";
-      type = "gem";
-    };
-    version = "1.0.1";
-  };
-  brakeman = {
-    dependencies = ["erubis" "fastercsv" "haml" "highline" "multi_json" "ruby2ruby" "ruby_parser" "safe_yaml" "sass" "slim" "terminal-table"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15v13yizpvp1rm86raqggmsmm51v6p8fqw3pfgi6xpvx1ba06cfm";
-      type = "gem";
-    };
-    version = "3.1.4";
-  };
-  bootstrap-sass = {
-    dependencies = ["autoprefixer-rails" "sass"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "12hhw42hk9clwfj6yz5v0c5p35wrn5yjnji7bnzsfs99vi2q00ld";
-      type = "gem";
-    };
-    version = "3.3.6";
-  };
-  binding_of_caller = {
-    dependencies = ["debug_inspector"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15jg6dkaq2nzcd602d7ppqbdxw3aji961942w93crs6qw4n6h9yk";
-      type = "gem";
-    };
-    version = "0.7.2";
-  };
-  better_errors = {
-    dependencies = ["coderay" "erubis"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0v0q8bdkqqlcsfqbk4wvc3qnz8an44mgz720v5f11a4nr413mjgf";
-      type = "gem";
-    };
-    version = "1.0.1";
-  };
-  benchmark-ips = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0bh681m54qdsdyvpvflj1wpnj3ybspbpjkr4cnlrl4nk4yikli0j";
-      type = "gem";
-    };
-    version = "2.3.0";
-  };
-  bcrypt = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15cf7zzlj9b0xcx12jf8fmnpc8g1b0yhxal1yr5p7ny3mrz5pll6";
-      type = "gem";
-    };
-    version = "3.1.10";
-  };
-  babosa = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "05rgxg4pz4bc4xk34w5grv0yp1j94wf571w84lf3xgqcbs42ip2f";
-      type = "gem";
-    };
-    version = "1.0.2";
-  };
-  axiom-types = {
-    dependencies = ["descendants_tracker" "ice_nine" "thread_safe"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1";
-      type = "gem";
-    };
-    version = "0.1.1";
-  };
-  awesome_print = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1k85hckprq0s9pakgadf42k1d5s07q23m3y6cs977i6xmwdivyzr";
-      type = "gem";
-    };
-    version = "1.2.0";
-  };
-  autoprefixer-rails = {
-    dependencies = ["execjs" "json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0m1w42ncz0p48r5hbyglayxkzrnplw18r99dc1ia2cb3nizkwllx";
-      type = "gem";
-    };
-    version = "6.2.3";
-  };
-  attr_required = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0pawa2i7gw9ppj6fq6y288da1ncjpzsmc6kx7z63mjjvypa5q3dc";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
-  attr_encrypted = {
-    dependencies = ["encryptor"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1hm2844qm37kflqq5v0x2irwasbhcblhp40qk10m3wlkj4m9wp8p";
-      type = "gem";
-    };
-    version = "1.3.4";
-  };
-  astrolabe = {
-    dependencies = ["parser"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ybbmjxaf529vvhrj4y8d4jpf87f3hgczydzywyg1d04gggjx7l7";
-      type = "gem";
-    };
-    version = "1.3.1";
-  };
-  ast = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "102bywfxrv0w3n4s6lg25d7xxshd344sc7ijslqmganj5bany1pk";
-      type = "gem";
-    };
-    version = "2.1.0";
-  };
-  asciidoctor = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0q9yhan2mkk1lh15zcfd9g2fn6faix9yrf5skg23dp1y77jv7vm0";
-      type = "gem";
-    };
-    version = "1.5.3";
-  };
-  asana = {
-    dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1560p13g57pl4xqkmhwn1vpqhm7mw9fwmmswk38k3i2r7g0b5y9z";
-      type = "gem";
-    };
-    version = "0.4.0";
-  };
-  arel = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1a270mlajhrmpqbhxcqjqypnvgrq4pgixpv3w9gwp1wrrapnwrzk";
-      type = "gem";
-    };
-    version = "6.0.3";
-  };
-  annotate = {
-    dependencies = ["activerecord" "rake"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1wdw9phsv2dndgid3pd8h0hl4zycwy11jc9iz6prwza0xax0i7hg";
-      type = "gem";
-    };
-    version = "2.6.10";
-  };
-  allocations = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0iynf7gkbnbr5mgl2wgbgvxmjdiawh7ywwbnyjm94bj3pkybzgkc";
-      type = "gem";
-    };
-    version = "1.0.4";
-  };
-  akismet = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0hqpn25iyypkwkrqaibjm5nss5jmlkrddhia7frmz94prvyjr02w";
-      type = "gem";
-    };
-    version = "2.0.0";
-  };
-  after_commit_queue = {
-    dependencies = ["activerecord"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1jrhvj4335dsrj0xndbf7a7m2inbwbx1knc0bwgvmkk1w47l43s0";
-      type = "gem";
-    };
-    version = "1.3.0";
-  };
-  addressable = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1533axm85gpz267km9gnfarf9c78g2scrysd6b8yw33vmhkz2km6";
-      type = "gem";
-    };
-    version = "2.3.8";
-  };
-  acts-as-taggable-on = {
-    dependencies = ["activerecord"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0bz0z8dlp3fjzah9y9b6rr9mkidsav9l4hdm51fnq1gd05yv3pr7";
-      type = "gem";
-    };
-    version = "3.5.0";
-  };
-  activesupport = {
-    dependencies = ["i18n" "json" "minitest" "thread_safe" "tzinfo"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "80ad345adf7e2b72c5d90753c0df91eacc34f4de02b34cfbf60bcf6c83483031";
-      type = "gem";
-    };
-    version = "4.2.5.2";
-  };
-  activerecord-session_store = {
-    dependencies = ["actionpack" "activerecord" "railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1rp5q0q5i5syfgw7qpiq3a42x13p7myyv1c5hmnczpdlh57axs3p";
-      type = "gem";
-    };
-    version = "0.1.2";
-  };
-  activerecord-nulldb-adapter = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1ym3paxp5lqr2kr4hkqj6xxqvgl57fv8jqhvgjfxb9lk7k5jlfmp";
-      type = "gem";
-    };
-    version = "0.3.2";
-  };
-  activerecord-deprecated_finders = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "03xplckz7v3nm6inqkwdd44h6gpbpql0v02jc1rz46a38rd6cj6m";
-      type = "gem";
-    };
-    version = "1.0.4";
-  };
-  activerecord = {
-    dependencies = ["activemodel" "activesupport" "arel"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "c2b1b6a4c6b8542c2464b457dce4cac4915efcbd3d5acfba57102e58474c33f2";
-      type = "gem";
-    };
-    version = "4.2.5.2";
-  };
-  activemodel = {
-    dependencies = ["activesupport" "builder"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "09ce967be3086b34ae9fcbd919e714b2bdf72b8ab6e89b64aa74627267d93962";
-      type = "gem";
-    };
-    version = "4.2.5.2";
-  };
-  activejob = {
-    dependencies = ["activesupport" "globalid"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "cecb9bbc55292dee064ca479990c6e50fa3e2273aac6722ce058d18c22383026";
-      type = "gem";
-    };
-    version = "4.2.5.2";
-  };
-  actionview = {
-    dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "e8ce01cf6cc822ec023a15a856a0fae0e078ebb232b95b722c23af4117d2d635";
+      sha256 = "8cee5f2f1e58c8ada17cca696377443c0cbc9675df2b7eef97a04318876484b5";
       type = "gem";
     };
     version = "4.2.5.2";
@@ -2981,30 +25,356 @@
     };
     version = "4.2.5.2";
   };
-  actionmailer = {
-    dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
+  actionview = {
+    dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "8cee5f2f1e58c8ada17cca696377443c0cbc9675df2b7eef97a04318876484b5";
+      sha256 = "e8ce01cf6cc822ec023a15a856a0fae0e078ebb232b95b722c23af4117d2d635";
       type = "gem";
     };
     version = "4.2.5.2";
   };
-  ace-rails-ap = {
+  activejob = {
+    dependencies = ["activesupport" "globalid"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "082n12rkd9j7d89030nhmi4fx1gqaf13knps6cknsyvwix7fryvv";
+      sha256 = "cecb9bbc55292dee064ca479990c6e50fa3e2273aac6722ce058d18c22383026";
       type = "gem";
     };
-    version = "2.0.1";
+    version = "4.2.5.2";
   };
-  RedCloth = {
+  activemodel = {
+    dependencies = ["activesupport" "builder"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06pahxyrckhgb7alsxwhhlx1ib2xsx33793finj01jk8i054bkxl";
+      sha256 = "09ce967be3086b34ae9fcbd919e714b2bdf72b8ab6e89b64aa74627267d93962";
       type = "gem";
     };
-    version = "4.2.9";
+    version = "4.2.5.2";
+  };
+  activerecord = {
+    dependencies = ["activemodel" "activesupport" "arel"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "c2b1b6a4c6b8542c2464b457dce4cac4915efcbd3d5acfba57102e58474c33f2";
+      type = "gem";
+    };
+    version = "4.2.5.2";
+  };
+  activerecord-deprecated_finders = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03xplckz7v3nm6inqkwdd44h6gpbpql0v02jc1rz46a38rd6cj6m";
+      type = "gem";
+    };
+    version = "1.0.4";
+  };
+  activerecord-nulldb-adapter = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ym3paxp5lqr2kr4hkqj6xxqvgl57fv8jqhvgjfxb9lk7k5jlfmp";
+      type = "gem";
+    };
+    version = "0.3.2";
+  };
+  activerecord-session_store = {
+    dependencies = ["actionpack" "activerecord" "railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rp5q0q5i5syfgw7qpiq3a42x13p7myyv1c5hmnczpdlh57axs3p";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
+  activesupport = {
+    dependencies = ["i18n" "json" "minitest" "thread_safe" "tzinfo"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "80ad345adf7e2b72c5d90753c0df91eacc34f4de02b34cfbf60bcf6c83483031";
+      type = "gem";
+    };
+    version = "4.2.5.2";
+  };
+  acts-as-taggable-on = {
+    dependencies = ["activerecord"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bz0z8dlp3fjzah9y9b6rr9mkidsav9l4hdm51fnq1gd05yv3pr7";
+      type = "gem";
+    };
+    version = "3.5.0";
+  };
+  addressable = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1533axm85gpz267km9gnfarf9c78g2scrysd6b8yw33vmhkz2km6";
+      type = "gem";
+    };
+    version = "2.3.8";
+  };
+  after_commit_queue = {
+    dependencies = ["activerecord"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jrhvj4335dsrj0xndbf7a7m2inbwbx1knc0bwgvmkk1w47l43s0";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
+  akismet = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hqpn25iyypkwkrqaibjm5nss5jmlkrddhia7frmz94prvyjr02w";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  allocations = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0iynf7gkbnbr5mgl2wgbgvxmjdiawh7ywwbnyjm94bj3pkybzgkc";
+      type = "gem";
+    };
+    version = "1.0.4";
+  };
+  annotate = {
+    dependencies = ["activerecord" "rake"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wdw9phsv2dndgid3pd8h0hl4zycwy11jc9iz6prwza0xax0i7hg";
+      type = "gem";
+    };
+    version = "2.6.10";
+  };
+  arel = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1a270mlajhrmpqbhxcqjqypnvgrq4pgixpv3w9gwp1wrrapnwrzk";
+      type = "gem";
+    };
+    version = "6.0.3";
+  };
+  asana = {
+    dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1560p13g57pl4xqkmhwn1vpqhm7mw9fwmmswk38k3i2r7g0b5y9z";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
+  asciidoctor = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0q9yhan2mkk1lh15zcfd9g2fn6faix9yrf5skg23dp1y77jv7vm0";
+      type = "gem";
+    };
+    version = "1.5.3";
+  };
+  ast = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "102bywfxrv0w3n4s6lg25d7xxshd344sc7ijslqmganj5bany1pk";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  astrolabe = {
+    dependencies = ["parser"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ybbmjxaf529vvhrj4y8d4jpf87f3hgczydzywyg1d04gggjx7l7";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
+  attr_encrypted = {
+    dependencies = ["encryptor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hm2844qm37kflqq5v0x2irwasbhcblhp40qk10m3wlkj4m9wp8p";
+      type = "gem";
+    };
+    version = "1.3.4";
+  };
+  attr_required = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0pawa2i7gw9ppj6fq6y288da1ncjpzsmc6kx7z63mjjvypa5q3dc";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  autoprefixer-rails = {
+    dependencies = ["execjs" "json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m1w42ncz0p48r5hbyglayxkzrnplw18r99dc1ia2cb3nizkwllx";
+      type = "gem";
+    };
+    version = "6.2.3";
+  };
+  awesome_print = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1k85hckprq0s9pakgadf42k1d5s07q23m3y6cs977i6xmwdivyzr";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
+  axiom-types = {
+    dependencies = ["descendants_tracker" "ice_nine" "thread_safe"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  babosa = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05rgxg4pz4bc4xk34w5grv0yp1j94wf571w84lf3xgqcbs42ip2f";
+      type = "gem";
+    };
+    version = "1.0.2";
+  };
+  bcrypt = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15cf7zzlj9b0xcx12jf8fmnpc8g1b0yhxal1yr5p7ny3mrz5pll6";
+      type = "gem";
+    };
+    version = "3.1.10";
+  };
+  benchmark-ips = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bh681m54qdsdyvpvflj1wpnj3ybspbpjkr4cnlrl4nk4yikli0j";
+      type = "gem";
+    };
+    version = "2.3.0";
+  };
+  better_errors = {
+    dependencies = ["coderay" "erubis"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0v0q8bdkqqlcsfqbk4wvc3qnz8an44mgz720v5f11a4nr413mjgf";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  binding_of_caller = {
+    dependencies = ["debug_inspector"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15jg6dkaq2nzcd602d7ppqbdxw3aji961942w93crs6qw4n6h9yk";
+      type = "gem";
+    };
+    version = "0.7.2";
+  };
+  bootstrap-sass = {
+    dependencies = ["autoprefixer-rails" "sass"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12hhw42hk9clwfj6yz5v0c5p35wrn5yjnji7bnzsfs99vi2q00ld";
+      type = "gem";
+    };
+    version = "3.3.6";
+  };
+  brakeman = {
+    dependencies = ["erubis" "fastercsv" "haml" "highline" "multi_json" "ruby2ruby" "ruby_parser" "safe_yaml" "sass" "slim" "terminal-table"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15v13yizpvp1rm86raqggmsmm51v6p8fqw3pfgi6xpvx1ba06cfm";
+      type = "gem";
+    };
+    version = "3.1.4";
+  };
+  browser = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01bkb64w2ld2q5r3chc4f6spbjrmginyg8wlzg130zmx2z4jia2h";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  builder = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2";
+      type = "gem";
+    };
+    version = "3.2.2";
+  };
+  bullet = {
+    dependencies = ["activesupport" "uniform_notifier"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1h3iaflcz5a1xr32bdb8sk4nx06yhh5d8y7w294w49xigfv4hzj3";
+      type = "gem";
+    };
+    version = "4.14.10";
+  };
+  bundler-audit = {
+    dependencies = ["thor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0msv3k2277y7al5lbnw7q9lmb5fnrscpkmsb36wpn189pdq0akfv";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
+  byebug = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1yx89b7vh5mbvxyi8n7zl25ia1bqdj71995m4daj6d41rnkmrpnc";
+      type = "gem";
+    };
+    version = "8.2.1";
+  };
+  cal-heatmap-rails = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lrmcyj3iixkprqi9fb9vcn97wpp779sl5hxxgx57r3rb7l4d20w";
+      type = "gem";
+    };
+    version = "3.5.1";
+  };
+  capybara = {
+    dependencies = ["mime-types" "nokogiri" "rack" "rack-test" "xpath"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "114k4xi4nfbp3jfbxgwa3fksbwsyibx74gbdqpcgg3dxpmzkaa4f";
+      type = "gem";
+    };
+    version = "2.4.4";
+  };
+  capybara-screenshot = {
+    dependencies = ["capybara" "launchy"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17v1wihr3aqrxhrwswkdpdklj1xsfcaksblh1y8hixvm9bqfyz3y";
+      type = "gem";
+    };
+    version = "1.0.11";
+  };
+  carrierwave = {
+    dependencies = ["activemodel" "activesupport" "json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1b1av1ancby6brhmypl5k8xwrasd8bd3kqp9ri8kbq7z8nj6k445";
+      type = "gem";
+    };
+    version = "0.9.0";
+  };
+  cause = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0digirxqlwdg79mkbn70yc7i9i1qnclm2wjbrc47kqv6236bpj00";
+      type = "gem";
+    };
+    version = "0.1";
   };
   CFPropertyList = {
     source = {
@@ -3014,4 +384,2634 @@
     };
     version = "2.3.2";
   };
-}
+  charlock_holmes = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jsl6k27wjmssxbwv9wpf7hgp9r0nvizcf6qpjnr7qs2nia53lf7";
+      type = "gem";
+    };
+    version = "0.7.3";
+  };
+  chunky_png = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vf0axgrm95bs3y0x5gdb76xawfh210yxplj7jbwr6z7n88i1axn";
+      type = "gem";
+    };
+    version = "1.3.5";
+  };
+  cliver = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "096f4rj7virwvqxhkavy0v55rax10r4jqf8cymbvn4n631948xc7";
+      type = "gem";
+    };
+    version = "0.3.2";
+  };
+  coderay = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  coercible = {
+    dependencies = ["descendants_tracker"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  coffee-rails = {
+    dependencies = ["coffee-script" "railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0p3zhs44gsy1p90nmghihzfyl7bsk8kv6j3q7rj3bn74wg8w7nqs";
+      type = "gem";
+    };
+    version = "4.1.0";
+  };
+  coffee-script = {
+    dependencies = ["coffee-script-source" "execjs"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2";
+      type = "gem";
+    };
+    version = "2.4.1";
+  };
+  coffee-script-source = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1k4fg39rrkl3bpgchfj94fbl9s4ysaz16w8dkqncf2vyf79l3qz0";
+      type = "gem";
+    };
+    version = "1.10.0";
+  };
+  colorize = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16bsjcqb6pg3k94dh1l5g3hhx5g2g4g8rlr76dnc78yyzjjrbayn";
+      type = "gem";
+    };
+    version = "0.7.7";
+  };
+  concurrent-ruby = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qqdgcfkzv90nznrpsvg3cgg5xiqz4c8hnv7va5gm4fp4lf4k85v";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  connection_pool = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1b2bb3k39ni5mzcnqlv9y4yjkbin20s7dkwzp0jw2jf1rmzcgrmy";
+      type = "gem";
+    };
+    version = "2.2.0";
+  };
+  coveralls = {
+    dependencies = ["json" "rest-client" "simplecov" "term-ansicolor" "thor" "tins"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03vnvcw1fdmkp3405blcxpsjf89jxd2061474a32fchsmv2das9y";
+      type = "gem";
+    };
+    version = "0.8.9";
+  };
+  crack = {
+    dependencies = ["safe_yaml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
+      type = "gem";
+    };
+    version = "0.4.3";
+  };
+  creole = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00rcscz16idp6dx0dk5yi5i0fz593i3r6anbn5bg2q07v3i025wm";
+      type = "gem";
+    };
+    version = "0.5.0";
+  };
+  d3_rails = {
+    dependencies = ["railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12vxiiflnnkcxak2wmbajyf5wzmcv9wkl4drsp0am72azl8a6g9x";
+      type = "gem";
+    };
+    version = "3.5.11";
+  };
+  daemons = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0b839hryy9sg7x3knsa1d6vfiyvn0mlsnhsb6an8zsalyrz1zgqg";
+      type = "gem";
+    };
+    version = "1.2.3";
+  };
+  database_cleaner = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0n5r7kvsmknk876v3scdphfnvllr9157fa5q7j5fczg8j5qm6kf0";
+      type = "gem";
+    };
+    version = "1.4.1";
+  };
+  debug_inspector = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "109761g00dbrw5q0dfnbqg8blfm699z4jj70l4zrgf9mzn7ii50m";
+      type = "gem";
+    };
+    version = "0.0.2";
+  };
+  debugger-ruby_core_source = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lp5dmm8a8dpwymv6r1y6yr24wxsj0gvgb2b8i7qq9rcv414snwd";
+      type = "gem";
+    };
+    version = "1.3.8";
+  };
+  default_value_for = {
+    dependencies = ["activerecord"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1z4lrba4y1c3y0rxw8321qbwsb3nr6c2igrpksfvz93yhc9m6xm0";
+      type = "gem";
+    };
+    version = "3.0.1";
+  };
+  descendants_tracker = {
+    dependencies = ["thread_safe"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79";
+      type = "gem";
+    };
+    version = "0.0.4";
+  };
+  devise = {
+    dependencies = ["bcrypt" "orm_adapter" "railties" "responders" "thread_safe" "warden"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00h0xdl4a8pjpb0gbgy4w6q9j2mpczkmj23195zmjrg2b1gl8f2q";
+      type = "gem";
+    };
+    version = "3.5.4";
+  };
+  devise-async = {
+    dependencies = ["devise"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11llg7ggzpmg4lb9gh4sx55spvp98sal5r803gjzamps9crfq6mm";
+      type = "gem";
+    };
+    version = "0.9.0";
+  };
+  devise-two-factor = {
+    dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1v2wva971ds48af47rj4ywavlmz7qzbmf1jpf1l3xn3mscz52hln";
+      type = "gem";
+    };
+    version = "2.0.1";
+  };
+  diff-lcs = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1";
+      type = "gem";
+    };
+    version = "1.2.5";
+  };
+  diffy = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0il0ri511g9rm88qbvncbzgwc6wk6265hmnf7grcczmrs1z49vl0";
+      type = "gem";
+    };
+    version = "3.0.7";
+  };
+  docile = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx";
+      type = "gem";
+    };
+    version = "1.1.5";
+  };
+  domain_name = {
+    dependencies = ["unf"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16qvfrmcwlzz073aas55mpw2nhyhjcn96s524w0g1wlml242hjav";
+      type = "gem";
+    };
+    version = "0.5.25";
+  };
+  doorkeeper = {
+    dependencies = ["railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0wim84wkvx758cfb8q92w3hhvnfbwr990x1mmfv1ss1ivjz8fmm0";
+      type = "gem";
+    };
+    version = "2.2.2";
+  };
+  dropzonejs-rails = {
+    dependencies = ["rails"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vqqxzv6qdqy47m2q28adnmccfvc17p2bmkkaqjvrczrhvkkha64";
+      type = "gem";
+    };
+    version = "0.7.2";
+  };
+  email_reply_parser = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0k2p229mv7xn7q627zwmvhrcvba4b9m70pw2jfjm6iimg2vmf22r";
+      type = "gem";
+    };
+    version = "0.5.8";
+  };
+  email_spec = {
+    dependencies = ["launchy" "mail"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00p1cc69ncrgg7m45va43pszip8anx5735w1lsb7p5ygkyw8nnpv";
+      type = "gem";
+    };
+    version = "1.6.0";
+  };
+  encryptor = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04wqqda081h7hmhwjjx1yqxprxjk8s5jgv837xqv1bpxiv7f4v1y";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
+  equalizer = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4";
+      type = "gem";
+    };
+    version = "0.0.11";
+  };
+  erubis = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
+      type = "gem";
+    };
+    version = "2.7.0";
+  };
+  escape_utils = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hb8nmrgmd9n5dhih86fp91sf26mmw14sdn5vswg5g20svrqxc7x";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  eventmachine = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1frvpk3p73xc64qkn0ymll3flvn4xcycq5yx8a43zd3gyzc1ifjp";
+      type = "gem";
+    };
+    version = "1.0.8";
+  };
+  excon = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1shb4g3dhsfkywgjv6123yrvp2c8bvi8hqmq47iqa5lp72sn4b4w";
+      type = "gem";
+    };
+    version = "0.45.4";
+  };
+  execjs = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0grlxwiccbnflxs30r3h7g23xnps5knav1jyqkk3anvm8363ifjw";
+      type = "gem";
+    };
+    version = "2.6.0";
+  };
+  expression_parser = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1938z3wmmdabqxlh5d5c56xfg1jc6z15p7zjyhvk7364zwydnmib";
+      type = "gem";
+    };
+    version = "0.9.0";
+  };
+  factory_girl = {
+    dependencies = ["activesupport"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13z20a4b7z1c8vbz0qz5ranssdprldwvwlgjmn38x311sfjmp9dz";
+      type = "gem";
+    };
+    version = "4.3.0";
+  };
+  factory_girl_rails = {
+    dependencies = ["factory_girl" "railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jj0yl6mfildb4g79dwgc1q5pv2pa65k9b1ml43mi8mg62j8mrhz";
+      type = "gem";
+    };
+    version = "4.3.0";
+  };
+  faraday = {
+    dependencies = ["multipart-post"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6";
+      type = "gem";
+    };
+    version = "0.9.2";
+  };
+  faraday_middleware = {
+    dependencies = ["faraday"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nxia26xzy8i56qfyz1bg8dg9yb26swpgci8n5jry8mh4bnx5r5h";
+      type = "gem";
+    };
+    version = "0.10.0";
+  };
+  faraday_middleware-multi_json = {
+    dependencies = ["faraday_middleware" "multi_json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0651sxhzbq9xfq3hbpmrp0nbybxnm9ja3m97k386m4bqgamlvz1q";
+      type = "gem";
+    };
+    version = "0.0.6";
+  };
+  fastercsv = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1df3vfgw5wg0s405z0pj0rfcvnl9q6wak7ka8gn0xqg4cag1k66h";
+      type = "gem";
+    };
+    version = "1.5.5";
+  };
+  ffaker = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19fnbbsw87asyb1hvkr870l2yldah2jcjb8074pgyrma5lynwmn0";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  ffi = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj";
+      type = "gem";
+    };
+    version = "1.9.10";
+  };
+  fission = {
+    dependencies = ["CFPropertyList"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09pmp1j1rr8r3pcmbn2na2ls7s1j9ijbxj99xi3a8r6v5xhjdjzh";
+      type = "gem";
+    };
+    version = "0.5.0";
+  };
+  flay = {
+    dependencies = ["ruby_parser" "sexp_processor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zcp9nmnfqixdcqa2dzwwjy5np4n2n16bj25gw7bbzbjp9hqzhn6";
+      type = "gem";
+    };
+    version = "2.6.1";
+  };
+  flog = {
+    dependencies = ["ruby_parser" "sexp_processor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1asrcdj6gh5mxcimqak94jjyyi5cxnqn904lc8pmrljg1nv1bxpm";
+      type = "gem";
+    };
+    version = "4.3.2";
+  };
+  flowdock = {
+    dependencies = ["httparty" "multi_json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04nrvg4gzgabf5mnnhccl8bwrkvn3y4pm7a1dqzqhpvfr4m5pafg";
+      type = "gem";
+    };
+    version = "0.7.1";
+  };
+  fog = {
+    dependencies = ["fog-aliyun" "fog-atmos" "fog-aws" "fog-brightbox" "fog-core" "fog-dynect" "fog-ecloud" "fog-google" "fog-json" "fog-local" "fog-powerdns" "fog-profitbricks" "fog-radosgw" "fog-riakcs" "fog-sakuracloud" "fog-serverlove" "fog-softlayer" "fog-storm_on_demand" "fog-terremark" "fog-vmfusion" "fog-voxel" "fog-xenserver" "fog-xml" "ipaddress" "nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ml31jdycqdm8w7w3l9pbyrgbnmrrnhmkppa2x4bwi9as1n1jmwq";
+      type = "gem";
+    };
+    version = "1.36.0";
+  };
+  fog-aliyun = {
+    dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1i76g8sdskyfc0gcnd6n9i757s7dmwg3wf6spcr2xh8wzyxkm1pj";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  fog-atmos = {
+    dependencies = ["fog-core" "fog-xml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1aaxgnw9zy96gsh4h73kszypc32sx497s6bslvhfqh32q9d1y8c9";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  fog-aws = {
+    dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pzfahq8h3alfflb5dr8lm02q27x81vm96qn5zyfdlx86yy7bq96";
+      type = "gem";
+    };
+    version = "0.8.1";
+  };
+  fog-brightbox = {
+    dependencies = ["fog-core" "fog-json" "inflecto"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0p7rbx587hb1d1am90dcr3zdp6y50c2zddh97yfgl62vji0pbkkd";
+      type = "gem";
+    };
+    version = "0.10.1";
+  };
+  fog-core = {
+    dependencies = ["builder" "excon" "formatador"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02z91r3f5a64hlalm6h39v0778yl2kk3qvva0zvplpp9hpwbwzhl";
+      type = "gem";
+    };
+    version = "1.35.0";
+  };
+  fog-dynect = {
+    dependencies = ["fog-core" "fog-json" "fog-xml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18lqmdkm22254z86jh3aa9v9vqk8bgbd3d1m0w7az3ij47ak7kch";
+      type = "gem";
+    };
+    version = "0.0.2";
+  };
+  fog-ecloud = {
+    dependencies = ["fog-core" "fog-xml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18rb4qjad9xwwqvvpj8r2h0hi9svy71pm4d3fc28cdcnfarmdi06";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  fog-google = {
+    dependencies = ["fog-core" "fog-json" "fog-xml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0z4vmswpqwph04c0wqzrscns1d1wdm8kbxx457bv156mawzrhfj3";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  fog-json = {
+    dependencies = ["fog-core" "multi_json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r";
+      type = "gem";
+    };
+    version = "1.0.2";
+  };
+  fog-local = {
+    dependencies = ["fog-core"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0i5hxwzmc2ag3z9nlligsaf679kp2pz39cd8n2s9cmxaamnlh2s3";
+      type = "gem";
+    };
+    version = "0.2.1";
+  };
+  fog-powerdns = {
+    dependencies = ["fog-core" "fog-json" "fog-xml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08zavzwfkk344gz83phz4sy9nsjznsdjsmn1ifp6ja17bvydlhh7";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  fog-profitbricks = {
+    dependencies = ["fog-core" "fog-xml" "nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "154sqs2dcmvg21v4m3fj8f09z5i70sq8a485v6rdygsffs8xrycn";
+      type = "gem";
+    };
+    version = "0.0.5";
+  };
+  fog-radosgw = {
+    dependencies = ["fog-core" "fog-json" "fog-xml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nslgv8yp5qkiryj3zsm91gs7s6i626igj61kwxjjwk2yv6swyr6";
+      type = "gem";
+    };
+    version = "0.0.5";
+  };
+  fog-riakcs = {
+    dependencies = ["fog-core" "fog-json" "fog-xml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nbxc4dky3agfwrmgm1aqmi59p6vnvfnfbhhg7xpg4c2cf41whxm";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  fog-sakuracloud = {
+    dependencies = ["fog-core" "fog-json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08krsn9sk5sx0aza812g31r169bd0zanb8pq5am3a64j6azarimd";
+      type = "gem";
+    };
+    version = "1.7.5";
+  };
+  fog-serverlove = {
+    dependencies = ["fog-core" "fog-json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hxgmwzygrw25rbsy05i6nzsyr0xl7xj5j2sjpkb9n9wli5sagci";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
+  fog-softlayer = {
+    dependencies = ["fog-core" "fog-json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zax2wws0q8pm787jnlxd2xlj23f2acz0s6jl5nzczyxjgll571r";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  fog-storm_on_demand = {
+    dependencies = ["fog-core" "fog-json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fif1x8ci095b2yyilf65n7x6iyvn448azrsnmwsdkriy8vxxv3y";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  fog-terremark = {
+    dependencies = ["fog-core" "fog-xml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01lfkh9jppj0iknlklmwyb7ym3bfhkq58m3absb6rf5a5mcwi3lf";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  fog-vmfusion = {
+    dependencies = ["fission" "fog-core"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0g0l0k9ylxk1h9pzqr6h2ba98fl47lpp3j19lqv4jxw0iw1rqxn4";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  fog-voxel = {
+    dependencies = ["fog-core" "fog-xml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10skdnj59yf4jpvq769njjrvh2l0wzaa7liva8n78qq003mvmfgx";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  fog-xenserver = {
+    dependencies = ["fog-core" "fog-xml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ngw8hh8ljk7wi0cp8n4b4jcy2acx0yqzjk7851m3mp0kji5dlgl";
+      type = "gem";
+    };
+    version = "0.2.2";
+  };
+  fog-xml = {
+    dependencies = ["fog-core" "nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1576sbzza47z48p0k9h1wg3rhgcvcvdd1dfz3xx1cgahwr564fqa";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
+  font-awesome-rails = {
+    dependencies = ["railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09x1bg98sp2v1lsg9h2bal915q811xq84h9d74p1f3378ga63c1x";
+      type = "gem";
+    };
+    version = "4.5.0.0";
+  };
+  foreman = {
+    dependencies = ["thor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1caz8mi7gq1hs4l1flcyyw1iw1bdvdbhppsvy12akr01k3s17xaq";
+      type = "gem";
+    };
+    version = "0.78.0";
+  };
+  formatador = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0";
+      type = "gem";
+    };
+    version = "0.2.5";
+  };
+  fuubar = {
+    dependencies = ["rspec" "ruby-progressbar"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xwqs24y8s73aayh39si17kccsmr0bjgmi6jrjyfp7gkjb6iyhpv";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  gemnasium-gitlab-service = {
+    dependencies = ["rugged"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qv7fkahmqkah3770ycrxd0x2ais4z41hb43a0r8q8wcdklns3m3";
+      type = "gem";
+    };
+    version = "0.2.6";
+  };
+  gemojione = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0av60lajn64z1csmkzfaf5wvpd3x48lcshiknkqr8m0zx3sg7w3h";
+      type = "gem";
+    };
+    version = "2.2.1";
+  };
+  get_process_mem = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "025f7v6bpbgsa2nr0hzv2riggj8qmzbwcyxfgjidpmwh5grh7j29";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  gherkin-ruby = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18ay7yiibf4sl9n94k7mbi4k5zj2igl4j71qcmkswv69znyx0sn1";
+      type = "gem";
+    };
+    version = "0.3.2";
+  };
+  github-linguist = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xxm2lbabkc1xmx2myv56a4fkw3wwg9n8w2bzwrl4s33kf6x62ag";
+      type = "gem";
+    };
+    version = "4.7.5";
+  };
+  github-markup = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01r901wcgn0gs0n9h684gs5n90y1vaj9lxnx4z5ig611jwa43ivq";
+      type = "gem";
+    };
+    version = "1.3.3";
+  };
+  gitlab-flowdock-git-hook = {
+    dependencies = ["flowdock" "gitlab-grit" "multi_json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1s3a10cdbh4xy732b92zcsm5zyc1lhi5v29d76j8mwbqmj11a2p8";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  gitlab-grit = {
+    dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nv8shx7w7fww8lf5a2rbvf7bq173rllm381m6x7g1i0qqc68q1b";
+      type = "gem";
+    };
+    version = "2.7.3";
+  };
+  gitlab_emoji = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dy746icdmyc548mb5xkavvkn37pk7vv3gznx0p6hff325pan8dj";
+      type = "gem";
+    };
+    version = "0.3.1";
+  };
+  gitlab_git = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0311dl4vh6h7k8xarmpr61fndrhbmfskzjzkkj1rr8321gn8znfv";
+      type = "gem";
+    };
+    version = "8.2.0";
+  };
+  gitlab_meta = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14vahv7gblcypbvip845sg3lvawf3kij61mkxz5vyfcv23niqvp9";
+      type = "gem";
+    };
+    version = "7.0";
+  };
+  gitlab_omniauth-ldap = {
+    dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vbdyi57vvlrigyfhmqrnkw801x57fwa3gxvj1rj2bn9ig5186ri";
+      type = "gem";
+    };
+    version = "1.2.1";
+  };
+  globalid = {
+    dependencies = ["activesupport"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "145xrpsfx1qqjy33r6qa588wb16dvdhxzj2aysh755vhg6hgm291";
+      type = "gem";
+    };
+    version = "0.3.6";
+  };
+  gollum-grit_adapter = {
+    dependencies = ["gitlab-grit"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02c5qfq0s0kx2ifnpbnbgz6258fl7rchzzzc7vpx72shi8gbpac7";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  gollum-lib = {
+    dependencies = ["github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01s8pgzhc3cgcmsy6hh79wrcbn5vbadniq2a7d4qw87kpq7mzfdm";
+      type = "gem";
+    };
+    version = "4.1.0";
+  };
+  gon = {
+    dependencies = ["actionpack" "json" "multi_json" "request_store"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1f359cd9zsa4nrng35bij5skvjrj5ywn2dhmlg41b97vmza26bxr";
+      type = "gem";
+    };
+    version = "6.0.1";
+  };
+  grape = {
+    dependencies = ["activesupport" "builder" "hashie" "multi_json" "multi_xml" "rack" "rack-accept" "rack-mount" "virtus"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dxfal5jspxq612jjkqbd7xgp5dswdyllbbfq6fj2m7s21pismmh";
+      type = "gem";
+    };
+    version = "0.13.0";
+  };
+  grape-entity = {
+    dependencies = ["activesupport" "multi_json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hxghs2p9ncvdwhp6dwr1a74g552c49dd0jzy0szp4pg2xjbgjk8";
+      type = "gem";
+    };
+    version = "0.4.8";
+  };
+  haml = {
+    dependencies = ["tilt"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mrzjgkygvfii66bbylj2j93na8i89998yi01fin3whwqbvx0m1p";
+      type = "gem";
+    };
+    version = "4.0.7";
+  };
+  haml-rails = {
+    dependencies = ["actionpack" "activesupport" "haml" "html2haml" "railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hbfznkxab663hxp1v6gpsa7sv6w1fnw9r8b3flixwylnwh3c5dz";
+      type = "gem";
+    };
+    version = "0.9.0";
+  };
+  hashie = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1iv5hd0zcryprx9lbcm615r3afc0d6rhc27clywmhhgpx68k8899";
+      type = "gem";
+    };
+    version = "3.4.3";
+  };
+  highline = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr";
+      type = "gem";
+    };
+    version = "1.7.8";
+  };
+  hike = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm";
+      type = "gem";
+    };
+    version = "1.2.3";
+  };
+  hipchat = {
+    dependencies = ["httparty" "mimemagic"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k";
+      type = "gem";
+    };
+    version = "1.5.2";
+  };
+  html-pipeline = {
+    dependencies = ["activesupport" "nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1yckdlrn4v5d7bgl8mbffax16640pgg9ny693kqi4j7g17vx2q9l";
+      type = "gem";
+    };
+    version = "1.11.0";
+  };
+  html2haml = {
+    dependencies = ["erubis" "haml" "nokogiri" "ruby_parser"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "069zcy8lr010hn4qmbi8g5srdf69brk8nbgx4zcqcgbgsl4m8d4i";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  http-cookie = {
+    dependencies = ["domain_name"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cz2fdkngs3jc5w32a6xcl511hy03a7zdiy988jk1sf3bf5v3hdw";
+      type = "gem";
+    };
+    version = "1.0.2";
+  };
+  "http_parser.rb" = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fwf5d573j1sw52kz057dw0nx2wlivczmx6ybf6mk065n5g54kyn";
+      type = "gem";
+    };
+    version = "0.5.3";
+  };
+  httparty = {
+    dependencies = ["json" "multi_xml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0c9gvg6dqw2h3qyaxhrq1pzm6r69zfcmfh038wyhisqsd39g9hr2";
+      type = "gem";
+    };
+    version = "0.13.7";
+  };
+  httpclient = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0k6bqsaqq6c824vrbfb5pkz8bpk565zikd10w85rzj2dy809ik6c";
+      type = "gem";
+    };
+    version = "2.7.0.1";
+  };
+  i18n = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758";
+      type = "gem";
+    };
+    version = "0.7.0";
+  };
+  ice_nine = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0i674zq0hl6rd0wcd12ni38linfja4k0y3mk5barjb4a6f7rcmkd";
+      type = "gem";
+    };
+    version = "0.11.1";
+  };
+  inflecto = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "085l5axmvqw59mw5jg454a3m3gr67ckq9405a075isdsn7bm3sp4";
+      type = "gem";
+    };
+    version = "0.0.2";
+  };
+  influxdb = {
+    dependencies = ["cause" "json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vhg5nd88nwvfa76lqcczld916nljswwq6clsixrzi3js8ym9y1w";
+      type = "gem";
+    };
+    version = "0.2.3";
+  };
+  ipaddress = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sl0ldvhd6j0qbwhz18w24qy65mdj448b2vhgh2cwn7xrkksmv9l";
+      type = "gem";
+    };
+    version = "0.8.2";
+  };
+  jquery-atwho-rails = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0g8239cddyi48i5n0hq2acg9k7n7jilhby9g36zd19mwqyia16w9";
+      type = "gem";
+    };
+    version = "1.3.2";
+  };
+  jquery-rails = {
+    dependencies = ["rails-dom-testing" "railties" "thor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "028dv2n0r2r8qj1bqcbzmih0hwzh5km6cvscn2808v5gd44z48r1";
+      type = "gem";
+    };
+    version = "4.0.5";
+  };
+  jquery-scrollto-rails = {
+    dependencies = ["railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12ic0zxw60ryglm1qjq5ralqd6k4jawmjj7kqnp1nkqds2nvinvp";
+      type = "gem";
+    };
+    version = "1.4.3";
+  };
+  jquery-turbolinks = {
+    dependencies = ["railties" "turbolinks"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1d23mnl3lgamk9ziw4yyv2ixck6d8s8xp4f9pmwimk0by0jq7xhc";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  jquery-ui-rails = {
+    dependencies = ["railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1gfygrv4bjpjd2c377lw7xzk1b77rxjyy3w6wl4bq1gkqvyrkx77";
+      type = "gem";
+    };
+    version = "5.0.5";
+  };
+  json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
+      type = "gem";
+    };
+    version = "1.8.3";
+  };
+  jwt = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0is8973si98rsry5igqdag2jb1knj6jhmfkr9r4mc5n0yvgr5n2q";
+      type = "gem";
+    };
+    version = "1.5.2";
+  };
+  kaminari = {
+    dependencies = ["actionpack" "activesupport"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14vx3kgssl4lv2kn6grr5v2whsynx5rbl1j9aqiq8nc3d7j74l67";
+      type = "gem";
+    };
+    version = "0.16.3";
+  };
+  kgio = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y6wl3vpp82rdv5g340zjgkmy6fny61wib7xylyg0d09k5f26118";
+      type = "gem";
+    };
+    version = "2.10.0";
+  };
+  launchy = {
+    dependencies = ["addressable"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2";
+      type = "gem";
+    };
+    version = "2.4.3";
+  };
+  letter_opener = {
+    dependencies = ["launchy"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kzbmc686hfh4jznyckq6g40kn14nhb71znsjjm0rc13nb3n0c5l";
+      type = "gem";
+    };
+    version = "1.1.2";
+  };
+  listen = {
+    dependencies = ["rb-fsevent" "rb-inotify"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "182wd2pkf690ll19lx6zbk01a3rqkk5lwsyin6kwydl7lqxj5z3g";
+      type = "gem";
+    };
+    version = "3.0.5";
+  };
+  loofah = {
+    dependencies = ["nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "109ps521p0sr3kgc460d58b4pr1z4mqggan2jbsf0aajy9s6xis8";
+      type = "gem";
+    };
+    version = "2.0.3";
+  };
+  macaddr = {
+    dependencies = ["systemu"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1clii8mvhmh5lmnm95ljnjygyiyhdpja85c5vy487rhxn52scn0b";
+      type = "gem";
+    };
+    version = "1.7.1";
+  };
+  mail = {
+    dependencies = ["mime-types"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp";
+      type = "gem";
+    };
+    version = "2.6.3";
+  };
+  mail_room = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jpybhgw9yi50g422qvnwadn5jnj563vh70qaml5cxzdqxbd7fj1";
+      type = "gem";
+    };
+    version = "0.6.1";
+  };
+  method_source = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2";
+      type = "gem";
+    };
+    version = "0.8.2";
+  };
+  mime-types = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8";
+      type = "gem";
+    };
+    version = "1.25.1";
+  };
+  mimemagic = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "101lq4bnjs7ywdcicpw3vbz9amg5gbb4va1626fybd2hawgdx8d9";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  mini_portile2 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  minitest = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rxqfakp629mp3vwda7zpgb57lcns5znkskikbfd0kriwv8i1vq8";
+      type = "gem";
+    };
+    version = "5.7.0";
+  };
+  mousetrap-rails = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00n13r5pwrk4vq018128vcfh021dw0fa2bk4pzsv0fslfm8ayp2m";
+      type = "gem";
+    };
+    version = "1.4.6";
+  };
+  multi_json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rf3l4j3i11lybqzgq2jhszq7fh7gpmafjzd14ymp9cjfxqg596r";
+      type = "gem";
+    };
+    version = "1.11.2";
+  };
+  multi_xml = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0i8r7dsz4z79z3j023l8swan7qpbgxbwwz11g38y2vjqjk16v4q8";
+      type = "gem";
+    };
+    version = "0.5.5";
+  };
+  multipart-post = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  mysql2 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0n075x14n9kziv0qdxqlzhf3j1abi1w6smpakfpsg4jbr8hnn5ip";
+      type = "gem";
+    };
+    version = "0.3.20";
+  };
+  nested_form = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0f053j4zfagxyym28msxj56hrpvmyv4lzxy2c5c270f7xbbnii5i";
+      type = "gem";
+    };
+    version = "0.3.2";
+  };
+  net-ldap = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0z1j0zklbbx3vi91zcd2v0fnkfgkvq3plisa6hxaid8sqndyak46";
+      type = "gem";
+    };
+    version = "0.12.1";
+  };
+  net-ssh = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dzqkgwi9xm6mbfk1rkk17rzmz8m5xakqi21w1b97ybng6kkw0hf";
+      type = "gem";
+    };
+    version = "3.0.1";
+  };
+  netrc = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
+      type = "gem";
+    };
+    version = "0.11.0";
+  };
+  newrelic_rpm = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "155aj845rxn8ikcs15gphr8svnsrki8wzps794ddbi90h0ypr319";
+      type = "gem";
+    };
+    version = "3.14.1.311";
+  };
+  nokogiri = {
+    dependencies = ["mini_portile2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv";
+      type = "gem";
+    };
+    version = "1.6.7.2";
+  };
+  nprogress-rails = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ylq2208i95661ba0p1ng2i38z4978ddwiidvpb614amfdq5pqvn";
+      type = "gem";
+    };
+    version = "0.1.6.7";
+  };
+  oauth = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1k5j09p3al3clpjl6lax62qmhy43f3j3g7i6f9l4dbs6r5vpv95w";
+      type = "gem";
+    };
+    version = "0.4.7";
+  };
+  oauth2 = {
+    dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zaa7qnvizv363apmxx9vxa8f6c6xy70z0jm0ydx38xvhxr8898r";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  octokit = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vmknh0vz1g734q32kgpxv0qwz9ifmnw2jfpd2w5rrk6xwq1k7a8";
+      type = "gem";
+    };
+    version = "3.8.0";
+  };
+  omniauth = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vsqxgzkcfi10b7k6vpv3shmlphbs8grc29hznwl9s0i16n8962p";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
+  omniauth-azure-oauth2 = {
+    dependencies = ["jwt" "omniauth" "omniauth-oauth2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qay454zvyas8xfnfkycqpjkafaq5pw4gaji176cdfw0blhviz0s";
+      type = "gem";
+    };
+    version = "0.0.6";
+  };
+  omniauth-bitbucket = {
+    dependencies = ["multi_json" "omniauth" "omniauth-oauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lals2z1yixffrc97zh7zn1jpz9l6vpb3alcp13im42dq9q0g845";
+      type = "gem";
+    };
+    version = "0.0.2";
+  };
+  omniauth-cas3 = {
+    dependencies = ["addressable" "nokogiri" "omniauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13swm2hi2z63nvb2bps6g41kki8kr9b5c7014rk8259bxlpflrk7";
+      type = "gem";
+    };
+    version = "1.1.3";
+  };
+  omniauth-facebook = {
+    dependencies = ["omniauth-oauth2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0plj56sna4b6c71k03jsng6gq3r5yxhj7h26ndahc9caasgk869c";
+      type = "gem";
+    };
+    version = "3.0.0";
+  };
+  omniauth-github = {
+    dependencies = ["omniauth" "omniauth-oauth2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mbx3c8m1llhdxrqdciq8jh428bxj1nvf4yhziv2xqmqpjcqz617";
+      type = "gem";
+    };
+    version = "1.1.2";
+  };
+  omniauth-gitlab = {
+    dependencies = ["omniauth" "omniauth-oauth2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "083yyc8612kq8ygd8y7s8lxg2d51jcsakbs4pa19aww67gcm72iz";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  omniauth-google-oauth2 = {
+    dependencies = ["addressable" "jwt" "multi_json" "omniauth" "omniauth-oauth2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lm4fk6ig9vwzv7398qd861325g678sfr1iv2mm60xswl69964fi";
+      type = "gem";
+    };
+    version = "0.2.10";
+  };
+  omniauth-kerberos = {
+    dependencies = ["omniauth-multipassword" "timfel-krb5-auth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05xsv76qjxcxzrvabaar2bchv7435y8l2j0wk4zgchh3yv85kiq7";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  omniauth-multipassword = {
+    dependencies = ["omniauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qykp76hw80lkgb39hyzrv68hkbivc8cv0vbvrnycjh9fwfp1lv8";
+      type = "gem";
+    };
+    version = "0.4.2";
+  };
+  omniauth-oauth = {
+    dependencies = ["oauth" "omniauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1n5vk4by7hkyc09d9blrw2argry5awpw4gbw1l4n2s9b3j4qz037";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  omniauth-oauth2 = {
+    dependencies = ["oauth2" "omniauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mskwlw5ibx9mz7ywqji6mm56ikf7mglbnfc02qhg6ry527jsxdm";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
+  omniauth-saml = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0c7pypskq9y6wbl7c8gnp48j256snph11br3csgwvy9whjfisx65";
+      type = "gem";
+    };
+    version = "1.4.2";
+  };
+  omniauth-shibboleth = {
+    dependencies = ["omniauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0a8pwy23aybxhn545357zdjy0hnpfgldwqk5snmz9kxingpq12jl";
+      type = "gem";
+    };
+    version = "1.2.1";
+  };
+  omniauth-twitter = {
+    dependencies = ["json" "omniauth-oauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hqjpb1zx0pp3s12c83pkpk4kkx41f001jc5n8qz0h3wll0ld833";
+      type = "gem";
+    };
+    version = "1.2.1";
+  };
+  omniauth_crowd = {
+    dependencies = ["activesupport" "nokogiri" "omniauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12g5ck05h6kr9mnp870x8pkxsadg81ca70hg8n3k8xx007lfw2q7";
+      type = "gem";
+    };
+    version = "2.2.3";
+  };
+  org-ruby = {
+    dependencies = ["rubypants"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0x69s7aysfiwlcpd9hkvksfyld34d8kxr62adb59vjvh8hxfrjwk";
+      type = "gem";
+    };
+    version = "0.9.12";
+  };
+  orm_adapter = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fg9jpjlzf5y49qs9mlpdrgs5rpcyihq1s4k79nv9js0spjhnpda";
+      type = "gem";
+    };
+    version = "0.5.0";
+  };
+  paranoia = {
+    dependencies = ["activerecord"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0z2smnnghjhcs4l5fkz9scs1kj0bvj2n8xmzcvw4rg9yprdnlxr0";
+      type = "gem";
+    };
+    version = "2.1.4";
+  };
+  parser = {
+    dependencies = ["ast"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14db0gam24j04iprqz4m3hxygkb8h0plnbm0yk4k3lzq6j5wzcac";
+      type = "gem";
+    };
+    version = "2.2.3.0";
+  };
+  pg = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32";
+      type = "gem";
+    };
+    version = "0.18.4";
+  };
+  poltergeist = {
+    dependencies = ["capybara" "cliver" "multi_json" "websocket-driver"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ppm4isvbxm739508yjhvisq1iwp1q6h8dx4hkndj2krskavz4i9";
+      type = "gem";
+    };
+    version = "1.8.1";
+  };
+  posix-spawn = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "052lnxbkvlnwfjw4qd7vn2xrlaaqiav6f5x5bcjin97bsrfq6cmr";
+      type = "gem";
+    };
+    version = "0.3.11";
+  };
+  powerpack = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  pry = {
+    dependencies = ["coderay" "method_source" "slop"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x78rvp69ws37kwig18a8hr79qn36vh8g1fn75p485y3b3yiqszg";
+      type = "gem";
+    };
+    version = "0.10.3";
+  };
+  pry-rails = {
+    dependencies = ["pry"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0a2iinvabis2xmv0z7z7jmh7bbkkngxj2qixfdg5m6qj9x8k1kx6";
+      type = "gem";
+    };
+    version = "0.3.4";
+  };
+  pyu-ruby-sasl = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rcpjiz9lrvyb3rd8k8qni0v4ps08psympffyldmmnrqayyad0sn";
+      type = "gem";
+    };
+    version = "0.0.3.3";
+  };
+  quiet_assets = {
+    dependencies = ["railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1q4azw4j1xsgd7qwcig110mfdn1fm0y34y87zw9j9v187xr401b1";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  rack = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5";
+      type = "gem";
+    };
+    version = "1.6.4";
+  };
+  rack-accept = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18jdipx17b4ki33cfqvliapd31sbfvs4mv727awynr6v95a7n936";
+      type = "gem";
+    };
+    version = "0.4.5";
+  };
+  rack-attack = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ihic8ar2ddfv15p5gia8nqzsl3y7iayg5v4rmg72jlvikgsabls";
+      type = "gem";
+    };
+    version = "4.3.1";
+  };
+  rack-cors = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1sz9d9gjmv2vjl3hddzk269hb1k215k8sp37gicphx82h3chk1kw";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
+  rack-mount = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09a1qfaxxsll1kbgz7z0q0nr48sfmfm7akzaviis5bjpa5r00ld2";
+      type = "gem";
+    };
+    version = "0.8.3";
+  };
+  rack-oauth2 = {
+    dependencies = ["activesupport" "attr_required" "httpclient" "multi_json" "rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1szfnb74p5s7k0glpmiv16rfl4wx9mnrr7riapgpbcx163zzkxad";
+      type = "gem";
+    };
+    version = "1.2.1";
+  };
+  rack-protection = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
+      type = "gem";
+    };
+    version = "1.5.3";
+  };
+  rack-test = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
+      type = "gem";
+    };
+    version = "0.6.3";
+  };
+  rails = {
+    dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "aa93c1b9eb8b535eee58280504e30237f88217699fe9bb016e458e5122eefa2e";
+      type = "gem";
+    };
+    version = "4.2.5.2";
+  };
+  rails-deprecated_sanitizer = {
+    dependencies = ["activesupport"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  rails-dom-testing = {
+    dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1v8jl6803mbqpxh4hn0szj081q1a3ap0nb8ni0qswi7z4la844v8";
+      type = "gem";
+    };
+    version = "1.0.7";
+  };
+  rails-html-sanitizer = {
+    dependencies = ["loofah"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "138fd86kv073zqfx0xifm646w6bgw2lr8snk16lknrrfrss8xnm7";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  railties = {
+    dependencies = ["actionpack" "activesupport" "rake" "thor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "cfff64cbc0e409341003c35fa2e576e6a8cd8259a9894d09f15c6123be73f146";
+      type = "gem";
+    };
+    version = "4.2.5.2";
+  };
+  rainbow = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dsnzfjiih2w8npsjab3yx1ssmmvmgjkbxny0i9yzrdy7whfw7b4";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  raindrops = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hv0xhr762axywr937czi92fs0x3zk7k22vg6f4i7rr8d05sp560";
+      type = "gem";
+    };
+    version = "0.15.0";
+  };
+  rake = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jcabbgnjc788chx31sihc5pgbqnlc1c75wakmqlbjdm8jns2m9b";
+      type = "gem";
+    };
+    version = "10.5.0";
+  };
+  raphael-rails = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sjiaymvfn4al5dr1pza5i142byan0fxnj4rymziyql2bzvdm2bc";
+      type = "gem";
+    };
+    version = "2.1.2";
+  };
+  rb-fsevent = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hq57by28iv0ijz8pk9ynih0xdg7vnl1010xjcijfklrcv89a1j2";
+      type = "gem";
+    };
+    version = "0.9.6";
+  };
+  rb-inotify = {
+    dependencies = ["ffi"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9";
+      type = "gem";
+    };
+    version = "0.9.5";
+  };
+  rblineprof = {
+    dependencies = ["debugger-ruby_core_source"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m58kdjgncwf0h1qry3qk5h4bg8sj0idykqqijqcrr09mxfd9yc6";
+      type = "gem";
+    };
+    version = "0.3.6";
+  };
+  rdoc = {
+    dependencies = ["json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1v9k4sp5yzj2bshngckdvivj6bszciskk1nd2r3wri2ygs7vgqm8";
+      type = "gem";
+    };
+    version = "3.12.2";
+  };
+  recaptcha = {
+    dependencies = ["json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "190qqklirmi31s6ih7png4h9xmx1p5h2n5fi45z90y8hsp5w1sh1";
+      type = "gem";
+    };
+    version = "1.0.2";
+  };
+  redcarpet = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14i3wypp97bpk20679d1csy88q4hsgfqbnqw6mryl77m2g0d09pk";
+      type = "gem";
+    };
+    version = "3.3.3";
+  };
+  RedCloth = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06pahxyrckhgb7alsxwhhlx1ib2xsx33793finj01jk8i054bkxl";
+      type = "gem";
+    };
+    version = "4.2.9";
+  };
+  redis = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0255w9izzs04hw9wivn05yqiwi34w28ylxs0xvpmwc1vrh18fwcl";
+      type = "gem";
+    };
+    version = "3.2.2";
+  };
+  redis-actionpack = {
+    dependencies = ["actionpack" "redis-rack" "redis-store"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jjl6dhhpdapdaywq5iqz7z36mwbw0cn0m30wcc5wcbv7xmiiygw";
+      type = "gem";
+    };
+    version = "4.0.1";
+  };
+  redis-activesupport = {
+    dependencies = ["activesupport" "redis-store"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10y3kybz21n2z11478sf0cp4xzclvxf0b428787brmgpc6i7p7zg";
+      type = "gem";
+    };
+    version = "4.1.5";
+  };
+  redis-namespace = {
+    dependencies = ["redis"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rp8gfkznfxqzxk9s976k71jnljkh0clkrhnp6vgx46s5yhj9g25";
+      type = "gem";
+    };
+    version = "1.5.2";
+  };
+  redis-rack = {
+    dependencies = ["rack" "redis-store"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y1mxx8gn0krdrpwllv7fqsbvki1qjnb2dz8b4q9gwc326829gk8";
+      type = "gem";
+    };
+    version = "1.5.0";
+  };
+  redis-rails = {
+    dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0igww7hb58aq74mh50dli3zjg78b54y8nhd0h1h9vz4vgjd4q8m7";
+      type = "gem";
+    };
+    version = "4.0.0";
+  };
+  redis-store = {
+    dependencies = ["redis"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gf462p0wx4hn7m1m8ghs701n6xx0ijzm5cff9xfagd2s6va145m";
+      type = "gem";
+    };
+    version = "1.1.7";
+  };
+  request_store = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01rxi2hw84y133z0r91jns4aaywd8d83wjq0xgb42iaicf0a90p9";
+      type = "gem";
+    };
+    version = "1.2.1";
+  };
+  rerun = {
+    dependencies = ["listen"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0av239bpmy55fdx4qaw9n71aapjy2myr51h5plzjxsyr0fdwn1xq";
+      type = "gem";
+    };
+    version = "0.11.0";
+  };
+  responders = {
+    dependencies = ["railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1i00bxp8fa67rzl50wfiaw16w21j5d5gwjjkdiwr0sw9q6ixmpz1";
+      type = "gem";
+    };
+    version = "2.1.1";
+  };
+  rest-client = {
+    dependencies = ["http-cookie" "mime-types" "netrc"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1m8z0c4yf6w47iqz6j2p7x1ip4qnnzvhdph9d5fgx081cvjly3p7";
+      type = "gem";
+    };
+    version = "1.8.0";
+  };
+  rinku = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jh6nys332brph55i6x6cil6swm086kxjw34wq131nl6mwryqp7b";
+      type = "gem";
+    };
+    version = "1.7.3";
+  };
+  rotp = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nzsc9hfxijnyzjbv728ln9dm80bc608chaihjdk63i2wi4m529g";
+      type = "gem";
+    };
+    version = "2.1.1";
+  };
+  rouge = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0wp8as9ypdy18kdj9h70kny1rdfq71mr8cj2bpahr9vxjjvjasqz";
+      type = "gem";
+    };
+    version = "1.10.1";
+  };
+  rqrcode = {
+    dependencies = ["chunky_png"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "188n1mvc7klrlw30bai16sdg4yannmy7cz0sg0nvm6f1kjx5qflb";
+      type = "gem";
+    };
+    version = "0.7.0";
+  };
+  rqrcode-rails3 = {
+    dependencies = ["rqrcode"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1i28rwmj24ssk91chn0g7qsnvn003y3s5a7jsrg3w4l5ckr841bg";
+      type = "gem";
+    };
+    version = "0.1.7";
+  };
+  rspec = {
+    dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bn5zs71agc0zyns2r3c8myi5bxw3q7xnzp7f3v5b7hbil1qym4r";
+      type = "gem";
+    };
+    version = "3.3.0";
+  };
+  rspec-core = {
+    dependencies = ["rspec-support"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xw5qi936j6nz9fixi2mwy03f406761cd72bzyvd61pr854d7hy1";
+      type = "gem";
+    };
+    version = "3.3.2";
+  };
+  rspec-expectations = {
+    dependencies = ["diff-lcs" "rspec-support"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1d0b5hpkxlr9f3xpsbhvl3irnk4smmycx2xnmc8qv3pqaa7mb7ah";
+      type = "gem";
+    };
+    version = "3.3.1";
+  };
+  rspec-mocks = {
+    dependencies = ["diff-lcs" "rspec-support"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lfbzscmpyixlbapxmhy2s69596vs1z00lv590l51hgdw70z92vg";
+      type = "gem";
+    };
+    version = "3.3.2";
+  };
+  rspec-rails = {
+    dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m66n9p3a7d3fmrzkbh8312prb6dhrgmp53g1amck308ranasv2a";
+      type = "gem";
+    };
+    version = "3.3.3";
+  };
+  rspec-support = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1cyagig8slxjas8mbg5f8bl240b8zgr8mnjsvrznag1fwpkh4h27";
+      type = "gem";
+    };
+    version = "3.3.0";
+  };
+  rubocop = {
+    dependencies = ["astrolabe" "parser" "powerpack" "rainbow" "ruby-progressbar" "tins"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1grqda2fdknm43zyagh8gcmnhjkypyfw98q92hmvprprwghkq2sg";
+      type = "gem";
+    };
+    version = "0.35.1";
+  };
+  ruby-fogbugz = {
+    dependencies = ["crack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jj0gpkycbrivkh2q3429vj6mbgx6axxisg69slj3c4mgvzfgchm";
+      type = "gem";
+    };
+    version = "0.2.1";
+  };
+  ruby-progressbar = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hynaavnqzld17qdx9r7hfw00y16ybldwq730zrqfszjwgi59ivi";
+      type = "gem";
+    };
+    version = "1.7.5";
+  };
+  ruby-saml = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "151jbak16y87dbj3ma2nc03rh37z7lixcwgaqahncq80rgnv45a8";
+      type = "gem";
+    };
+    version = "1.1.1";
+  };
+  ruby2ruby = {
+    dependencies = ["ruby_parser" "sexp_processor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kmc0503s9mqnjyypx51wsi6zz9zj550ch43rag23wpj4qd6i6pm";
+      type = "gem";
+    };
+    version = "2.2.0";
+  };
+  ruby_parser = {
+    dependencies = ["sexp_processor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rip6075b4k5a7s8w2klwc3jaqx31h69k004ac5nhl8y0ja92qvz";
+      type = "gem";
+    };
+    version = "3.7.2";
+  };
+  rubyntlm = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04l8686hl0829x4acsnbz0licf8n6794p7shz8iyahin1jnqg3d7";
+      type = "gem";
+    };
+    version = "0.5.2";
+  };
+  rubypants = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vpdkrc4c8qhrxph41wqwswl28q5h5h994gy4c1mlrckqzm3hzph";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  rufus-scheduler = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04bmvvvri7ni7dvlq3gi1y553f6rp6bw2kmdfp9ny5bh3l7qayrh";
+      type = "gem";
+    };
+    version = "3.1.10";
+  };
+  rugged = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0v0cvdw8cgy1hf5h3cx796zpxhbad8d5cm50nykyhwjc00q80zrr";
+      type = "gem";
+    };
+    version = "0.24.0b13";
+  };
+  safe_yaml = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
+      type = "gem";
+    };
+    version = "1.0.4";
+  };
+  sanitize = {
+    dependencies = ["nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  sass = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04rpdcp258arh2wgdk9shbqnzd6cbbbpi3wpi9a0wby8awgpxmyf";
+      type = "gem";
+    };
+    version = "3.4.20";
+  };
+  sass-rails = {
+    dependencies = ["railties" "sass" "sprockets" "sprockets-rails" "tilt"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1f6357vw944w2ayayqmz8ai9myl6xbnry06sx5b5ms4r9lny8hj8";
+      type = "gem";
+    };
+    version = "5.0.4";
+  };
+  sawyer = {
+    dependencies = ["addressable" "faraday"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fk43bzwn816qj1ksiicm2i1kmzv5675cmnvk57kmfmi4rfsyjpy";
+      type = "gem";
+    };
+    version = "0.6.0";
+  };
+  sdoc = {
+    dependencies = ["json" "rdoc"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17l8qk0ld47z4h5avcnylvds8nc6dp25zc64w23z8li2hs341xf2";
+      type = "gem";
+    };
+    version = "0.3.20";
+  };
+  seed-fu = {
+    dependencies = ["activerecord" "activesupport"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11xja82yxir1kwccrzng29h7w911i9j0xj2y7y949yqnw91v12vw";
+      type = "gem";
+    };
+    version = "2.3.5";
+  };
+  select2-rails = {
+    dependencies = ["thor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ni2k74n73y3gv56gs37gkjlh912szjf6k9j483wz41m3xvlz7fj";
+      type = "gem";
+    };
+    version = "3.5.9.3";
+  };
+  sentry-raven = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0iqnwfmf6rnpgrvl3c8gh2gkix91nhm21j5qf389g4mi2rkc0ky8";
+      type = "gem";
+    };
+    version = "0.15.6";
+  };
+  settingslogic = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ria5zcrk1nf0b9yia15mdpzw0dqr6wjpbj8dsdbbps81lfsj9ar";
+      type = "gem";
+    };
+    version = "2.0.9";
+  };
+  sexp_processor = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gxlcpg81wfjf5gpggf8h6l2dbq3ikgavbrr2yfw3m2vqy88yjg2";
+      type = "gem";
+    };
+    version = "4.6.0";
+  };
+  sham_rack = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zs6hpgg87x5jrykjxgfp2i7m5aja53s5kamdhxam16wki1hid3i";
+      type = "gem";
+    };
+    version = "1.3.6";
+  };
+  shoulda-matchers = {
+    dependencies = ["activesupport"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0d3ryqcsk1n9y35bx5wxnqbgw4m8b3c79isazdjnnbg8crdp72d0";
+      type = "gem";
+    };
+    version = "2.8.0";
+  };
+  sidekiq = {
+    dependencies = ["concurrent-ruby" "connection_pool" "json" "redis"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x7jfc2va0x6fcfffdf0wdiyk4krjw8053jzwffa63wkqr5jvg3y";
+      type = "gem";
+    };
+    version = "4.0.1";
+  };
+  sidekiq-cron = {
+    dependencies = ["redis-namespace" "rufus-scheduler" "sidekiq"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xnbvh8kjv6954vsiwfcpp7bn8sgpwvnyapnq7b94w8h7kj3ykqy";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
+  simple_oauth = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bb06p88xsdw4fxll1ikv5i5k58sl6y323ss0wp1hqjm3xw1jgvj";
+      type = "gem";
+    };
+    version = "0.1.9";
+  };
+  simplecov = {
+    dependencies = ["docile" "json" "simplecov-html"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1q2iq2vgrdvvla5y907gkmqx6ry2qvnvc7a90hlcbwgp1w0sv6z4";
+      type = "gem";
+    };
+    version = "0.10.0";
+  };
+  simplecov-html = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qni8g0xxglkx25w54qcfbi4wjkpvmb28cb7rj5zk3iqynjcdrqf";
+      type = "gem";
+    };
+    version = "0.10.0";
+  };
+  sinatra = {
+    dependencies = ["rack" "rack-protection" "tilt"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hhmwqc81ram7lfwwziv0z70jh92sj1m7h7s9fr0cn2xq8mmn8l7";
+      type = "gem";
+    };
+    version = "1.4.6";
+  };
+  six = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bhapiyjh5r5qjpclfw8i65plvy6k2q4azr5xir63xqglr53viw3";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  slack-notifier = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08z6fv186yw1nrpl6zwp3lwqksin145aa1jv6jf00bnv3sicliiz";
+      type = "gem";
+    };
+    version = "1.2.1";
+  };
+  slim = {
+    dependencies = ["temple" "tilt"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1szs71hh0msm5gj6qbcxw44m3hqnwybx4yh02scwixnwg576058k";
+      type = "gem";
+    };
+    version = "3.0.6";
+  };
+  slop = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n";
+      type = "gem";
+    };
+    version = "3.6.0";
+  };
+  spinach = {
+    dependencies = ["colorize" "gherkin-ruby" "json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0phfjs4iw2iqxdaljzwk6qxmi2x86pl3hirmpgw2pgfx76wfx688";
+      type = "gem";
+    };
+    version = "0.8.10";
+  };
+  spinach-rails = {
+    dependencies = ["capybara" "railties" "spinach"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nfacfylkncfgi59g2wga6m4nzdcjqb8s50cax4nbx362ap4bl70";
+      type = "gem";
+    };
+    version = "0.2.1";
+  };
+  spring = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xvz2x6nvza5i53p7mddnf11j2wshqmbaphi6ngd6nar8v35y0k1";
+      type = "gem";
+    };
+    version = "1.3.6";
+  };
+  spring-commands-rspec = {
+    dependencies = ["spring"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0b0svpq3md1pjz5drpa5pxwg8nk48wrshq8lckim4x3nli7ya0k2";
+      type = "gem";
+    };
+    version = "1.0.4";
+  };
+  spring-commands-spinach = {
+    dependencies = ["spring"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "138jardqyj96wz68njdgy55qjbpl2d0g8bxbkz97ndaz3c2bykv9";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  spring-commands-teaspoon = {
+    dependencies = ["spring"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g7n4m2s9d0frh7y1xibzpphqajfnx4fvgfc66nh545dd91w2nqz";
+      type = "gem";
+    };
+    version = "0.0.2";
+  };
+  sprockets = {
+    dependencies = ["hike" "multi_json" "rack" "tilt"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15818683yz27w4hgywccf27n91azy9a4nmb5qkklzb08k8jw9gp3";
+      type = "gem";
+    };
+    version = "2.12.4";
+  };
+  sprockets-rails = {
+    dependencies = ["actionpack" "activesupport" "sprockets"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vsl6ryxdjpp97nl4ghhk1v6p50zh3sx9qv81bhmlffc234r91wn";
+      type = "gem";
+    };
+    version = "2.3.3";
+  };
+  state_machines = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xg84kdglz0k1pshf2q604zybjpribzcz2b651sc1j27kd86w787";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
+  state_machines-activemodel = {
+    dependencies = ["activemodel" "state_machines"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bshcm53v2vfpapvhws1h0dq1h4f3p6bvpdkjpydb52a3m0w2z0y";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  state_machines-activerecord = {
+    dependencies = ["activerecord" "state_machines-activemodel"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10dplkn4cm49xby8s0sn7wxww4hnxi4dgikfsmhp1rbsa24d76vx";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  stringex = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "150adm7rfh6r9b5ra6vk75mswf9m3wwyslcf8f235a08m29fxa17";
+      type = "gem";
+    };
+    version = "2.5.2";
+  };
+  systemu = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gmkbakhfci5wnmbfx5i54f25j9zsvbw858yg3jjhfs5n4ad1xq1";
+      type = "gem";
+    };
+    version = "2.6.5";
+  };
+  task_list = {
+    dependencies = ["html-pipeline"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1iv1fizb04463c4mp4gxd8v0414fhvmiwvwvjby5b9qq79d8zwab";
+      type = "gem";
+    };
+    version = "1.0.2";
+  };
+  teaspoon = {
+    dependencies = ["railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cprz18vgf0jgcggcxf4pwx8jcwbiyj1p0dnck5aavlvaxaic58s";
+      type = "gem";
+    };
+    version = "1.0.2";
+  };
+  teaspoon-jasmine = {
+    dependencies = ["teaspoon"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00wygrv1jm4aj15p1ab9d5fdrj6y83kv26xgp52mx4lp78h2ms9q";
+      type = "gem";
+    };
+    version = "2.2.0";
+  };
+  temple = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ysraljv7lkb04z5vdyrkijab7j1jzj1mgz4bj82744dp7d0rhb0";
+      type = "gem";
+    };
+    version = "0.7.6";
+  };
+  term-ansicolor = {
+    dependencies = ["tins"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ydbbyjmk5p7fsi55ffnkq79jnfqx65c3nj8d9rpgl6sw85ahyys";
+      type = "gem";
+    };
+    version = "1.3.2";
+  };
+  terminal-table = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1s6qyj9ir1agbbi32li9c0c34dcl0klyxqif6mxy0dbvq7kqfp8f";
+      type = "gem";
+    };
+    version = "1.5.2";
+  };
+  test_after_commit = {
+    dependencies = ["activerecord"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fzg8qan6f0n0ynr594bld2k0rwwxj99yzhiga2f3pkj9ina1abb";
+      type = "gem";
+    };
+    version = "0.4.2";
+  };
+  thin = {
+    dependencies = ["daemons" "eventmachine" "rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pyc602sa8fqwjyssn9yvf3fqrr14jk7hj9hsjlan1mq4zvim1lf";
+      type = "gem";
+    };
+    version = "1.6.4";
+  };
+  thor = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
+      type = "gem";
+    };
+    version = "0.19.1";
+  };
+  thread_safe = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr";
+      type = "gem";
+    };
+    version = "0.3.5";
+  };
+  tilt = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir";
+      type = "gem";
+    };
+    version = "1.4.1";
+  };
+  timfel-krb5-auth = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "105vajc0jkqgcx1wbp0ad262sdry4l1irk7jpaawv8vzfjfqqf5b";
+      type = "gem";
+    };
+    version = "0.8.3";
+  };
+  tinder = {
+    dependencies = ["eventmachine" "faraday" "faraday_middleware" "hashie" "json" "mime-types" "multi_json" "twitter-stream"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kwj0wd540wb2ws86d3jdva175dx00w2j8lyrvbb6qli3g27byd7";
+      type = "gem";
+    };
+    version = "1.10.1";
+  };
+  tins = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02qarvy17nbwvslfgqam8y6y7479cwmb1a6di9z18hzka4cf90hz";
+      type = "gem";
+    };
+    version = "1.6.0";
+  };
+  turbolinks = {
+    dependencies = ["coffee-rails"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ddrx25vvvqxlz4h59lrmjhc2bfwxf4bpicvyhgbpjd48ckj81jn";
+      type = "gem";
+    };
+    version = "2.5.3";
+  };
+  twitter-stream = {
+    dependencies = ["eventmachine" "http_parser.rb" "simple_oauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0is81g3xvnjk64sqiaqlh2ziwfryzwvk1yvaniryg0zhppgsyriq";
+      type = "gem";
+    };
+    version = "0.1.16";
+  };
+  tzinfo = {
+    dependencies = ["thread_safe"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx";
+      type = "gem";
+    };
+    version = "1.2.2";
+  };
+  uglifier = {
+    dependencies = ["execjs" "json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mzs64z3m1b98rh6ssxpqfz9sc87f6ml6906b0m57vydzfgrh1cz";
+      type = "gem";
+    };
+    version = "2.7.2";
+  };
+  underscore-rails = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0iyspb7s49wpi9cc314gvlkyn45iyfivzxhdw0kql1zrgllhlzfk";
+      type = "gem";
+    };
+    version = "1.8.3";
+  };
+  unf = {
+    dependencies = ["unf_ext"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
+      type = "gem";
+    };
+    version = "0.1.4";
+  };
+  unf_ext = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ly2ms6c3irmbr1575ldyh52bz2v0lzzr2gagf0p526k12ld2n5b";
+      type = "gem";
+    };
+    version = "0.0.7.1";
+  };
+  unicorn = {
+    dependencies = ["kgio" "rack" "raindrops"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kpg2vikx2hxdyrl45bqcr89a0w59hfw7yn7xh87bmlczi34xds4";
+      type = "gem";
+    };
+    version = "4.8.3";
+  };
+  unicorn-worker-killer = {
+    dependencies = ["get_process_mem" "unicorn"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rrdxpwdsapx47axjin8ymxb4f685qlpx8a26bql4ay1559c3gva";
+      type = "gem";
+    };
+    version = "0.4.4";
+  };
+  uniform_notifier = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "009z60qx01am7klmrca8pcladrynljra3a9smifn9f81r4dc7q63";
+      type = "gem";
+    };
+    version = "1.9.0";
+  };
+  uuid = {
+    dependencies = ["macaddr"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gr2mxg27l380wpiy66mgv9wq02myj6m4gmp6c4g1vsbzkh0213v";
+      type = "gem";
+    };
+    version = "2.3.8";
+  };
+  version_sorter = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lad9c43w2xfzmva57ia6glpmhyivyk1m79jli42canshvan5v6y";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  virtus = {
+    dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06iphwi3c4f7y9i2rvhvaizfswqbaflilziz4dxqngrdysgkn1fk";
+      type = "gem";
+    };
+    version = "1.0.5";
+  };
+  warden = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1iyxw1ms3930dh7vcrfyi4ifpdbkfsr8k7fzjryva0r7k3c71gb7";
+      type = "gem";
+    };
+    version = "1.2.4";
+  };
+  web-console = {
+    dependencies = ["activemodel" "binding_of_caller" "railties" "sprockets-rails"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13rwps8m76j45iqhggm810j78i8bg4nqzgi8k7amxplik2zm5blf";
+      type = "gem";
+    };
+    version = "2.2.1";
+  };
+  webmock = {
+    dependencies = ["addressable" "crack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1p7hqdxk5359xwp59pcx841fhbnqx01ra98rnwhdyz61nrc6piv3";
+      type = "gem";
+    };
+    version = "1.21.0";
+  };
+  websocket-driver = {
+    dependencies = ["websocket-extensions"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1v39w1ig6ps8g55xhz6x1w53apl17ii6kpy0jg9249akgpdvb0k9";
+      type = "gem";
+    };
+    version = "0.6.3";
+  };
+  websocket-extensions = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07qnsafl6203a2zclxl20hy4jq11c471cgvd0bj5r9fx1qqw06br";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
+  wikicloth = {
+    dependencies = ["builder" "expression_parser" "rinku"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jp6c2yzyqbap8jdiw8yz6l08sradky1llhyhmrg934l1b5akj3s";
+      type = "gem";
+    };
+    version = "0.8.1";
+  };
+  xml-simple = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xlqplda3fix5pcykzsyzwgnbamb3qrqkgbrhhfz2a2fxhrkvhw8";
+      type = "gem";
+    };
+    version = "1.1.5";
+  };
+  xpath = {
+    dependencies = ["nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04kcr127l34p7221z13blyl0dvh0bmxwx326j72idayri36a394w";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+}
\ No newline at end of file

From c5451206ab3d2b2e4442b9e59e6b1fd978a9d57f Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <svein.ove@aas.no>
Date: Wed, 4 May 2016 02:12:39 +0100
Subject: [PATCH 660/712] Init CKAN: The Comprehensive Kerbal Archive Network
 (#15202)

* ckan: Init at 1.16.1
---
 pkgs/games/ckan/default.nix     | 42 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/games/ckan/default.nix

diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix
new file mode 100644
index 00000000000..1465a65a2bd
--- /dev/null
+++ b/pkgs/games/ckan/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub, makeWrapper, perl, mono, gtk }:
+
+stdenv.mkDerivation rec {
+  name = "ckan-${version}";
+  version = "1.16.1";
+
+  src = fetchFromGitHub {
+    owner = "KSP-CKAN";
+    repo = "CKAN";
+    rev = "v${version}";
+    sha256 = "0lfvl8w09lakz35szp5grfvhq8xx486f5igvj1m6azsql4n929lg";
+  };
+
+  buildInputs = [ makeWrapper perl mono gtk ];
+
+  postPatch = ''
+    substituteInPlace bin/build \
+      --replace /usr/bin/perl ${perl}/bin/perl
+  '';
+
+  # Tests don't currently work, as they try to write into /var/empty.
+  doCheck = false;
+  checkTarget = "test";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    for exe in *.exe; do
+      install -m 0644 $exe $out/bin
+      makeWrapper ${mono}/bin/mono $out/bin/$(basename $exe .exe) \
+        --add-flags $out/bin/$exe \
+        --set LD_LIBRARY_PATH ${gtk.out}/lib
+    done
+  '';
+
+  meta = {
+    description = "Mod manager for Kerbal Space Program";
+    homepage = https://github.com/KSP-CKAN/CKAN;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.Baughn ];
+    platforms = stdenv.lib.platforms.all;
+  };    
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f901adb856..685f1441b1d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14805,6 +14805,8 @@ in
 
   chocolateDoom = callPackage ../games/chocolate-doom { };
 
+  ckan = callPackage ../games/ckan { };
+
   cockatrice = qt5.callPackage ../games/cockatrice {  };
 
   confd = goPackages.confd.bin // { outputs = [ "bin" ]; };

From 3e401a8d01ddb21fe43f77124bfbefb7c82299ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 3 May 2016 22:32:57 -0300
Subject: [PATCH 661/712] imlib2: 1.4.8 -> 1.4.9

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

diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix
index 8d79fcc50a8..85e9979ebb0 100644
--- a/pkgs/development/libraries/imlib2/default.nix
+++ b/pkgs/development/libraries/imlib2/default.nix
@@ -1,17 +1,19 @@
 { stdenv, fetchurl, xlibsWrapper, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "imlib2-1.4.8";
+  name = "imlib2-1.4.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/enlightenment/${name}.tar.bz2";
-    sha256 = "0xxhgkd1axlcmf3kp1d7naiygparpg8l3sg3d263rhl2z0gm7aw9";
+    sha256 = "08809xxk2555yj6glixzw9a0x3x8cx55imd89kj3r0h152bn8a3x";
   };
 
   buildInputs = [ xlibsWrapper libjpeg libtiff giflib libpng bzip2 ];
 
   nativeBuildInputs = [ pkgconfig ];
 
+  enableParallelBuilding = true;
+
   preConfigure = ''
     substituteInPlace imlib2-config.in \
       --replace "@my_libs@" ""

From da767356f275785950c9847428b60be2d6753943 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 4 May 2016 02:20:49 +0200
Subject: [PATCH 662/712] grsecurity: support disabling TCP simultaneous
 connect

Defaults to OFF because disabling TCP simultaneous connect breaks some
legitimate use cases, notably WebRTC [1], but it's nice to provide the
option for deployments where those features are unneeded anyway.

This is an alternative to https://github.com/NixOS/nixpkgs/pull/4937

[1]: http://article.gmane.org/gmane.linux.documentation/9425
---
 nixos/modules/security/grsecurity.nix     | 17 +++++++++++++++++
 pkgs/build-support/grsecurity/default.nix |  2 ++
 2 files changed, 19 insertions(+)

diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index 11668162808..12401f044a7 100644
--- a/nixos/modules/security/grsecurity.nix
+++ b/nixos/modules/security/grsecurity.nix
@@ -194,6 +194,23 @@ in
           '';
         };
 
+        disableSimultConnect = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Disable TCP simultaneous connect.  The TCP simultaneous connect
+            feature allows two clients to connect without either of them
+            entering the listening state.  This feature of the TCP specification
+            is claimed to enable an attacker to deny the target access to a given
+            server by guessing the source port the target would use to make the
+            connection.
+
+            This option is OFF by default because TCP simultaneous connect has
+            some legitimate uses.  Enable this option if you know what this TCP
+            feature is for and know that you do not need it.
+          '';
+        };
+
         verboseVersion = mkOption {
           type = types.bool;
           default = false;
diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix
index 0ba27036667..d8042d65273 100644
--- a/pkgs/build-support/grsecurity/default.nix
+++ b/pkgs/build-support/grsecurity/default.nix
@@ -14,6 +14,7 @@ let
       restrictProcWithGroup = true;
       unrestrictProcGid = 121; # Ugh, an awful hack. See grsecurity NixOS gid
       disableRBAC = false;
+      disableSimultConnect = false;
       verboseVersion = false;
       kernelExtraConfig = "";
     } // grsecOptions.config;
@@ -107,6 +108,7 @@ let
         GRKERNSEC_CHROOT_CHMOD ${boolToKernOpt cfg.config.denyChrootChmod}
         GRKERNSEC_DENYUSB ${boolToKernOpt cfg.config.denyUSB}
         GRKERNSEC_NO_RBAC ${boolToKernOpt cfg.config.disableRBAC}
+        GRKERNSEC_NO_SIMULT_CONNECT ${boolToKernOpt cfg.config.disableSimultConnect}
 
         ${cfg.config.kernelExtraConfig}
       '';

From 90f5be3133ed32aa1564d9bfc7fb89e95beccf79 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 4 May 2016 09:29:45 +0900
Subject: [PATCH 663/712] firefox-bin: 45.0.2 -> 46.0.1

---
 .../browsers/firefox-bin/default.nix          |  18 +-
 .../browsers/firefox-bin/generate_sources.rb  |  76 ++--
 .../browsers/firefox-bin/sources.nix          | 366 +++++++++---------
 pkgs/top-level/all-packages.nix               |   1 +
 4 files changed, 227 insertions(+), 234 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 152089286b4..bc3a0463fa8 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, config
+{ stdenv, fetchurl, config, makeWrapper
 , alsaLib
 , atk
 , cairo
@@ -13,7 +13,8 @@
 , glibc
 , gst_plugins_base
 , gstreamer
-, gtk
+, gtk2
+, gtk3
 , libX11
 , libXScrnSaver
 , libXcomposite
@@ -26,6 +27,7 @@
 , libcanberra
 , libgnome
 , libgnomeui
+, defaultIconTheme
 , mesa
 , nspr
 , nss
@@ -64,7 +66,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/${version}/${source.arch}/${source.locale}/firefox-${version}.tar.bz2";
-    inherit (source) sha256;
+    inherit (source) sha512;
   };
 
   phases = "unpackPhase installPhase";
@@ -85,7 +87,8 @@ stdenv.mkDerivation {
       glibc
       gst_plugins_base
       gstreamer
-      gtk
+      gtk2
+      gtk3
       libX11
       libXScrnSaver
       libXcomposite
@@ -109,6 +112,8 @@ stdenv.mkDerivation {
       stdenv.cc.cc
     ];
 
+  buildInputs = [ makeWrapper gtk3 defaultIconTheme ];
+
   # "strip" after "patchelf" may break binaries.
   # See: https://github.com/NixOS/patchelf/issues/10
   dontStrip = 1;
@@ -144,6 +149,11 @@ stdenv.mkDerivation {
       GenericName=Web Browser
       Categories=Application;Network;
       EOF
+
+      wrapProgram "$out/bin/firefox" \
+        --argv0 "$out/bin/.firefox-wrapped" \
+        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:" \
+        --suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
     '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb b/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb
index c4e14041288..03acf17e426 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb
+++ b/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb
@@ -1,63 +1,45 @@
-# TODO share code with thunderbird-bin/generate_nix.rb
+# TODO share code with thunderbird-bin/generate_sources.rb
 
-version = if ARGV.empty?
-            "latest"
-          else
-            ARGV[0]
-          end
+require "open-uri"
 
-base_path = "archive.mozilla.org/pub/firefox/releases"
+version =
+  if ARGV.empty?
+    $stderr.puts("Usage: ruby generate_sources.rb <version> > sources.nix")
+    exit(-1)
+  else
+    ARGV[0]
+  end
+
+base_path = "http://archive.mozilla.org/pub/firefox/releases"
+
+Source = Struct.new(:hash, :arch, :locale, :filename)
+
+sources = open("#{base_path}/#{version}/SHA512SUMS") do |input|
+  input.readlines
+end.select do |line|
+  /\/firefox-.*\.tar\.bz2$/ === line && !(/source/ === line)
+end.map do |line|
+  hash, name = line.chomp.split(/ +/)
+  Source.new(hash, *(name.split("/")))
+end.sort_by do |source|
+  [source.locale, source.arch]
+end
 
 arches = ["linux-i686", "linux-x86_64"]
 
-arches.each do |arch|
-  system("wget", "--recursive", "--continue", "--no-parent", "--reject-regex", ".*\\?.*", "--reject", "xpi", "http://#{base_path}/#{version}/#{arch}/")
-end
-
-locales = Dir.glob("#{base_path}/#{version}/#{arches[0]}/*").map do |path|
-  File.basename(path)
-end.sort
-
-locales.delete("index.html")
-locales.delete("xpi")
-
-# real version number, e.g. "30.0" instead of "latest".
-real_version = Dir.glob("#{base_path}/#{version}/#{arches[0]}/#{locales[0]}/firefox-*")[0].match(/firefox-([0-9.]*)/)[1][0..-2]
-
-locale_arch_path_tuples = locales.flat_map do |locale|
-  arches.map do |arch|
-    path = Dir.glob("#{base_path}/#{version}/#{arch}/#{locale}/firefox-*")[0]
-
-    [locale, arch, path]
-  end
-end
-
-paths = locale_arch_path_tuples.map do |tuple| tuple[2] end
-
-hashes = IO.popen(["sha256sum", "--binary", *paths]) do |input|
-  input.each_line.map do |line|
-    $stderr.puts(line)
-
-    line.match(/^[0-9a-f]*/)[0]
-  end
-end
-
-
 puts(<<"EOH")
 # This file is generated from generate_sources.rb. DO NOT EDIT.
-# Execute the following command in a temporary directory to update the file.
+# Execute the following command to update the file.
 #
-# ruby generate_sources.rb > sources.nix
+# ruby generate_sources.rb 46.0.1 > sources.nix
 
 {
-  version = "#{real_version}";
+  version = "#{version}";
   sources = [
 EOH
 
-locale_arch_path_tuples.zip(hashes) do |tuple, hash|
-  locale, arch, path = tuple
-
-  puts(%Q|    { locale = "#{locale}"; arch = "#{arch}"; sha256 = "#{hash}"; }|)
+sources.each do |source|
+  puts(%Q|    { locale = "#{source.locale}"; arch = "#{source.arch}"; sha512 = "#{source.hash}"; }|)
 end
 
 puts(<<'EOF')
diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index 883b2abf44a..1c588af4992 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -1,190 +1,190 @@
-# This file is generated from generate_sources.rb. DO NOT EDIT.
+# This file is generated from generate_nix.rb. DO NOT EDIT.
 # Execute the following command in a temporary directory to update the file.
 #
-# ruby generate_sources.rb > sources.nix
+# ruby generate_source.rb 46.0.1 > sources.nix
 
 {
-  version = "45.0.2";
+  version = "46.0.1";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha256 = "3e925e9594f84e6bce3f24fa0a1207ec584818df4815ae04a6c882644e2f7cc6"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha256 = "c960352a5288f09752ff76440278e76700a1921109f0976b4d922ceeedec8e9c"; }
-    { locale = "af"; arch = "linux-i686"; sha256 = "3067a999cc678fe225c11288ed5659a251f237e098903b2cf6f23bdbceb70a9f"; }
-    { locale = "af"; arch = "linux-x86_64"; sha256 = "f329f7f3e15cd90263d70269c946f83bca01384618a59d590ca371930e7b1939"; }
-    { locale = "an"; arch = "linux-i686"; sha256 = "564ba48104a2db7709e4b9b25cf8d2853ef8a2b919a14030d7cc59751ac8ab8c"; }
-    { locale = "an"; arch = "linux-x86_64"; sha256 = "c2628a079e4c601d54c869d3b13ec1a772353885b29a63559aa544d5f48d4873"; }
-    { locale = "ar"; arch = "linux-i686"; sha256 = "3097a13c59a324f3f9b7504b4941b1846cfbd5593c91597a2475fe87efbb61f7"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha256 = "b5778932fb122de9f7070393b4ae98e190e648857c94096a495e021a3c956a04"; }
-    { locale = "as"; arch = "linux-i686"; sha256 = "b6751bdaf612b8a975122812db0e7641eb5932e6c13879d7b48f2b7f5e8a2c6a"; }
-    { locale = "as"; arch = "linux-x86_64"; sha256 = "6501b0e3c4c55eef08e94dcd6f5fab70d01f88e57630f5a999279286fc9b1058"; }
-    { locale = "ast"; arch = "linux-i686"; sha256 = "40b5f29d2a818e60d5ed1ef2f37ed5a65bf52b9138b2e4fd1c110b404fbf3910"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha256 = "6f9e6266d790784d57cab715d8d6fa5e648ec20287c8d6ad746972e284f5558b"; }
-    { locale = "az"; arch = "linux-i686"; sha256 = "005ca6c0184a9c5a2eee8d49b00782872abbe202c70654d856fd519ce62ea47a"; }
-    { locale = "az"; arch = "linux-x86_64"; sha256 = "32d5179de71be41b855d0454004e43d336289a6fe4967e869d0b9fb42fe2fe71"; }
-    { locale = "be"; arch = "linux-i686"; sha256 = "0fadc3acdd104cc171a18c74e11e853a9a322017f3f63b79712dc6628246630c"; }
-    { locale = "be"; arch = "linux-x86_64"; sha256 = "3fe751e0c702fc8a03f63cba1d1f2e0897b2f729c1b607f68f9934926a3343d8"; }
-    { locale = "bg"; arch = "linux-i686"; sha256 = "80c49634c1b0acb2ee533ddd6581845270f05a3406cd7b41bf5962182166c000"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha256 = "12e74f5a3b8500f18126e305d49cf26290fb145d62d888bd00fd44b412dec105"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "22511d1c27f3876bbe7c4e791accdfa205e05cd3fc4143070f8e1e75521fa12e"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "239e59d26a842efd2ec61dcca73f7b6aadca6d4bb969e7447bf8ef2ed880a77c"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha256 = "72f72e6528c5d9e373e21065eba623cbbfc6c82e73db0df3581a1ffebe664cbd"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "580564e4a1e249a7cb6c83736343af43f903df82a97f8d2e19bd749e01867339"; }
-    { locale = "br"; arch = "linux-i686"; sha256 = "1dbc1d60e99812077b1b43a6f294e9c834db5b08ad67976290a5ea6f07d44c05"; }
-    { locale = "br"; arch = "linux-x86_64"; sha256 = "2c6524b05b9ab8da113066de6d6380cad29b681921c03486618dd2b6d10ca1ae"; }
-    { locale = "bs"; arch = "linux-i686"; sha256 = "11b706f2621a8026e10de074f0cbcb6bab4a7b0a17d144640c8296ea35e92c95"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha256 = "e4ff831c617918c52b3b2a9e69a1f35f8b3e825f407cf6729d7e2b479860de29"; }
-    { locale = "ca"; arch = "linux-i686"; sha256 = "1c2aefd0ab56bcfd619705aba70018873581c7482307c32842ffdb68ce441f10"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha256 = "47ab6aa2c474b9b04f246822c471548b2452559d04e4ec8cc099f3686729d285"; }
-    { locale = "cs"; arch = "linux-i686"; sha256 = "f2c4028d562148ad39390853d388ed0617419e97bda55a0c6c47bf0e94145446"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha256 = "28d6eb534884b2c05afe87981b894c790fe57508b3e866cdcf341e1f9c51080c"; }
-    { locale = "cy"; arch = "linux-i686"; sha256 = "684b11673d16778961115b990734888975267c3c253a8081519e53ae95df5798"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha256 = "d17294841995094d6395a4e65d50e5382e845d59e5949c952e96f4fe739d9bc4"; }
-    { locale = "da"; arch = "linux-i686"; sha256 = "4f2d29d52968c1b7a96af37beeee7150504bd3c32c4178a814ab0c4f86fe9644"; }
-    { locale = "da"; arch = "linux-x86_64"; sha256 = "65d01baab9e71a5a3d92124dbcc44c158277b273e8b6bcb302f853f61babde71"; }
-    { locale = "de"; arch = "linux-i686"; sha256 = "55af9ad39962559a48720c65f66d3bbab037ff30e777439428e2467a4559f039"; }
-    { locale = "de"; arch = "linux-x86_64"; sha256 = "835ea2e3757beb74c939296aa3d00092ff3f9d6d8805b64a267bcde28de0cb94"; }
-    { locale = "dsb"; arch = "linux-i686"; sha256 = "5b419a8f5e03257718237249be9c76eee759e46147d154bf994774139bb56be8"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "90d5dae350d65c6db8b156764ccdffe0f9951be29339a68db22018840c2247c1"; }
-    { locale = "el"; arch = "linux-i686"; sha256 = "77cc23059dc3b2956f3caf5802091ba48c4a42f5d86066f06282f82cb00845b7"; }
-    { locale = "el"; arch = "linux-x86_64"; sha256 = "daa2180f15708ec07902b639fe30cdb9c2c230622a92011e1065d24b706bbc62"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha256 = "15b084bfeac2e49a0d40b37a890321500eede1bed2edaa95cf3bba8981bb6a08"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "c5d17b6386dcae9cf88b2d80b38e921646936f253616104bec5a2fbb58d25fbd"; }
-    { locale = "en-US"; arch = "linux-i686"; sha256 = "6ef1fb2322cf448afe2c09b008eb2bab0c2efa94378b2ae9889bf83ac6f779af"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "4068eb3eb07e9798ddc1449186a1c60196bb6051ca7217f6bcee5da21e41c6c5"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha256 = "4a61661b05ddd62f9e28ada0b39fe1a81cb5d737fa50d636561f79ec324e689c"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "ddc551e2d8d0c50ba268ba1e8fd9ecbe52e05b0de0d1bb586045206a9e745a7a"; }
-    { locale = "eo"; arch = "linux-i686"; sha256 = "236a9b6b632d1f30d63989f03783288eb8c1f144cae80b4549c0eded5dd95f1f"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha256 = "0f3a07a470e146891326ac36aa38b58018a4aa9ae668c8bbedc3b95c28d3fcb4"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha256 = "6feb23d97fa5a2356365d5779c18af5fc2a00b0e91c92a5127f4d576f916f7a1"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "5e2afba4834e6c44e8717090b832c76dfb5303617bc466be5299d579e9b298dc"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha256 = "3734590f319e8e281938dae65ad2e6fd7496c0c480123a6a819b3bb5d1489c69"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "e0fcfccfe80dcc71a7d527539e42acfc6d6786a9e8491b426aab7fc3789c8cb6"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha256 = "126cf64e6f7754fe0ff8a97499ccd528896ad3bbd89296271609092ade68524a"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "c8dbda78bffec09d401b39b76d9684a03f47102955d04604cfc2e7ddb0315f2f"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha256 = "8f116ccad3093783476a60ea605e324b0046b84b59c9f858dc080d2e275cac51"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "e6a9c775983e310d3ed8a98530860ce19e7a78df16dffb95e4735007fcf82a57"; }
-    { locale = "et"; arch = "linux-i686"; sha256 = "1b2b205731ce638823bd448b3d90e919d13e24b9b92e25eebef3766bac3e8330"; }
-    { locale = "et"; arch = "linux-x86_64"; sha256 = "97ecc57e21229d46d9d152d7821e860f3f2a53c10eda7caeb865af1919c6a0fe"; }
-    { locale = "eu"; arch = "linux-i686"; sha256 = "5f0e7875993532ad234fe7af2a191619e308be726ed6ae8be01afc79f8c5f3c8"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha256 = "bf2a52f3fce8ff4142cb1346cb5ce0f8b51959755698377db0807bc1e87e01eb"; }
-    { locale = "fa"; arch = "linux-i686"; sha256 = "12d593a12a0fcfcd720a6a5324b349c139f6e6759b111dab869e851241736e28"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha256 = "29cb4531e485af7dae2a45a1b9a0620292eaa2764b4cd24504bce0e54c8b71ae"; }
-    { locale = "ff"; arch = "linux-i686"; sha256 = "d67f9937780713ed4c130713239254a1e0d3918f2d2f528b74651b413e281cbf"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha256 = "140b199b0ce0a32fcf363946c942d733b587d9569c75f2dbab19161385f12d9b"; }
-    { locale = "fi"; arch = "linux-i686"; sha256 = "586346c2bc47b1b2693d03e4f2fe3b36de00966244120272426c597b94044595"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha256 = "160d0036392cb38de1a7e15ba9d0d1acf0538ff1b575ab1d1df11d187c5ac74d"; }
-    { locale = "fr"; arch = "linux-i686"; sha256 = "f33b267d223d704beef813d0c7c8ab534152373435ef04db3b039ad56b02c556"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha256 = "c141b154d5c56eefd94bfe7e391d0fa4027cee6685820e8be304c801d7064c65"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "2fff2f173cf6008b7bc17cad2ce16a43901f8484f3eb2700368acd64f98f075b"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "88227c796a82290c27b97cb27d8f606f1982115eb5724fe4a6169056ac000816"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "f9deacaf81e46267fd1d7297149e9f7e330bc2a58981cd65857c6add5eef6402"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "c376d517de3aad4152c0d5dceb8ef1a2deef1213e568404f06163f9d4adbe777"; }
-    { locale = "gd"; arch = "linux-i686"; sha256 = "f4f11f104fe964196e1588b1cddf5a43c5a8591d41ec7baf365264562240d5be"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha256 = "40993cbe7c6a42c467868e8cd60eb67aa8d0b7357617f5babb415cc3ffd608e9"; }
-    { locale = "gl"; arch = "linux-i686"; sha256 = "23c4a4a47fe7150c70f8489921b756ada22e45140e01d6817f9145de32b4d35a"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha256 = "d3fa81ba627c6e75fea42715d8dc4c5fdbed841429a0493081f915623ad603c4"; }
-    { locale = "gn"; arch = "linux-i686"; sha256 = "ebbf6f05f6b61a6ecb7f5c91ca4a6b87824edced41777fe35293b5ba6836a6cf"; }
-    { locale = "gn"; arch = "linux-x86_64"; sha256 = "d9917c8dc1d236e569d040db1512872ce145af934ee3fad7a7e2d5a9a845a856"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha256 = "598f3feaa412fa85619fd60ca1a48b2a691867d8aab92b39d98d12a3ebee2253"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "f238f84dcc0f41f99073aa4c7bff1fd2dc5f896fb1b9cae00d9d21d199383879"; }
-    { locale = "he"; arch = "linux-i686"; sha256 = "22aacab2263a799f5503e6d73d76c6c7e8c3f2d39d9a8945d7e062e4078f4eea"; }
-    { locale = "he"; arch = "linux-x86_64"; sha256 = "6288418353ab0d51ba8b7a02a302e68dc3b26e5565cb14e50316e5300cb2f696"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha256 = "2ee18b7653f9edf926ff7927d24c04e9aba503174b4fa773a136fd3e29a256db"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "3f18f821cbc4781a9e6d84e54e0a70e2cdd18bcb61342922b1402a3eabb75839"; }
-    { locale = "hr"; arch = "linux-i686"; sha256 = "c8633fb837adf08b257d19b88e9e5d35c2b24a658da7088a3902b4b9b833e7dd"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha256 = "714fcde1e42db06a9083946bb929a182891aadfd249bf5b63aa7f6ca744bcf0b"; }
-    { locale = "hsb"; arch = "linux-i686"; sha256 = "7f86d45ceb3f551b5b371047bbcccf9a75fe2f99df632b42d838419ee0c6d757"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "add010dbfe8a842c16a8dceb019675e04acb7b8de6d952d4b4faa2a368d37f1d"; }
-    { locale = "hu"; arch = "linux-i686"; sha256 = "cc994b9cfb60517062ce3570839b5e76def0a385b4e8793156d6a4719dd707b3"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha256 = "a36d229286d5422dd15d5e0f33e7fb99f6ddff3db4efabc3be244fa26c7bd24d"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "508a5d85df7508c453a991e4a9679b31270da70983607cd9d127a8e432728a3c"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "e21375aa7d5351a841ba05c8b0d921af1f334d37f714ed3c4303e90b5d4e34aa"; }
-    { locale = "id"; arch = "linux-i686"; sha256 = "58d7e3a898f5ae05bc7b0e99e83d8a39a7f5f935a086081af4a9d7ea98b927a3"; }
-    { locale = "id"; arch = "linux-x86_64"; sha256 = "c4b803b519780a0fd5a43fd23a3aef81d4197e860ad8e2908c5ddf2b76f538c3"; }
-    { locale = "is"; arch = "linux-i686"; sha256 = "a9fd41eb35ed7430915d9b09807555af1d8d81f5520deb4aae58e38edf3ca11a"; }
-    { locale = "is"; arch = "linux-x86_64"; sha256 = "74c6a4183f32043fcb6a3b52c71e8a23b36fc1381caff0dae8366cd80af391dc"; }
-    { locale = "it"; arch = "linux-i686"; sha256 = "b6d615f519b7664acb335a305d99bd6c6eb7db98eb29c7957b073fbeb468d63a"; }
-    { locale = "it"; arch = "linux-x86_64"; sha256 = "f65370cd57b1a885169447cc0b879dde715c58309db49f6c268db5113952a05f"; }
-    { locale = "ja"; arch = "linux-i686"; sha256 = "1b3766bd19c8841922cbe1e3a8144d9efe5ab4a3c9b2fe216811caff54607704"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha256 = "68e14f495852e023534bce66626287621a7155464fd56bbe41b38b5bc7305341"; }
-    { locale = "kk"; arch = "linux-i686"; sha256 = "4a72592497d392d4f749733eeaa7964a95fcc3de007127ec198ac86f6a266382"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha256 = "9d6333875c11425a467a32ebf649b7577462920592155ed54ec6130ce76073a0"; }
-    { locale = "km"; arch = "linux-i686"; sha256 = "e380caedd69287569274115aa4cee7b8d2187050d9f65a10ae36c9d48fd1d007"; }
-    { locale = "km"; arch = "linux-x86_64"; sha256 = "95794fa36975d732987012d406770710985c270c8f4e4c99407711d16279d941"; }
-    { locale = "kn"; arch = "linux-i686"; sha256 = "b0cd3f0c6da99b3e86ec4b08b962abb0d823329460e87761733db5d7987f1e5d"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha256 = "47399283f7b395c5079b592c83a93487a17a2cab0e68d35c54aa6e5e647d2c66"; }
-    { locale = "ko"; arch = "linux-i686"; sha256 = "5f9b1c691d9c9a99dd280e3fff8df813aeeefe42ce5273ddf2848352bfde44f6"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha256 = "360c82f93b7f529173f9259a4f475595d0ec4dc4b63b6ac46785bccd549e3dbd"; }
-    { locale = "lij"; arch = "linux-i686"; sha256 = "29f2d93c1f6695c22d4e766ee049bbe4f6fb034e22c12be407062db3deb0805c"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha256 = "c47c6e13b44b8560487f39c6f668fc03ea42bf848fcb9926cf8e0e0014218fc3"; }
-    { locale = "lt"; arch = "linux-i686"; sha256 = "5915cf516690de51021eeccc66cce8142fee7882efd7add7a0bfaa5b04d65dbf"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha256 = "04673232b52aae6b34b87b6a2638ad653a4e81430d21998919a56dbde10febd7"; }
-    { locale = "lv"; arch = "linux-i686"; sha256 = "6648a4a4b8be23ed6fb64efc0bb3e49c1807b5408d2df19d45a3b098b9bb605d"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha256 = "769020e490b9b74608cbbb319254694f7a32c62b6397ff8c563fa27a33cbe16b"; }
-    { locale = "mai"; arch = "linux-i686"; sha256 = "5646fac52682c1053e7b58fa0b13fcf74c8b79e344ffa3a9614fa2509ef2b38d"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha256 = "eb5db15e6584a5272d9c496d29ce4f500811ed4b49277b93ae432498aef80d0f"; }
-    { locale = "mk"; arch = "linux-i686"; sha256 = "8430792262871155bf07b652c5f8ae5408b0bb16fd9e6548010e86b2a1d604d0"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha256 = "273812699d47c99f20d18fdcf547cd9c5386a4d8049dcb93e34c0303a9aae7a5"; }
-    { locale = "ml"; arch = "linux-i686"; sha256 = "bc3b9905214fde7623aa5567f6a6792b2c5cb32fde1172ad60b108a42a372c24"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha256 = "0e21ef50fd3ecb301d0a62baf3e084723c0cc05c3a9569ce08ccf2698f40a526"; }
-    { locale = "mr"; arch = "linux-i686"; sha256 = "fb83926aa70735befc1c8c79c950a9dbb01344dfceff82aefa7640e79f659139"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha256 = "ae6622f7cb9261985d8cc0bf06af9a51d7d8b391386aded9bf07576be60c5f12"; }
-    { locale = "ms"; arch = "linux-i686"; sha256 = "16b35b29882238095475719a4f8cecd5e49a8e50bfe5c2b943c604274cfb02ae"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha256 = "04e390cdeabc686eee093ae2280628375b706c2b09b9aa29e788bc1663b21ad0"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "b3b931e5a38fc71aee2dc2290adb600b0d8e56923c30c748bacbbf527e2e8960"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "4d3c6f639e8c6579c525c6e8c5bd036b3c6abe0e2d14ee0596ac207b3f291f84"; }
-    { locale = "nl"; arch = "linux-i686"; sha256 = "40cc8d419bc536e2826766dbd9b3e58bb98730ed38926387bcadcc5b30c8b742"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha256 = "4595b76ab812dd9ed16405d0863225c0d6f40dd70a96baee2632a5f8e4d2aab5"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "8cad1d60633dfb059c4e29b3a226397822ed10938909dd783b9b8c7bac0e8866"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "d0ac3c7ff26c4747222f2d7a1d5b4b69a861dee261ad338ed88ab8b35cf44ffc"; }
-    { locale = "or"; arch = "linux-i686"; sha256 = "b05473429fb2b844d96ee88108891e5cdc13c56526017ff6db1909ff60dbe1b5"; }
-    { locale = "or"; arch = "linux-x86_64"; sha256 = "406816e487831cd9a928fd9c140290f53d4a9575024adf71e1565d24e573abdc"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "beb60cd44b31c3c1ebfae25efb17d78d001f0009bb5a8304e319791ae535daa0"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "1abab6f91bd2ff22cd6d9075bcb83ddf6a190291997e5d379eff53fc10fd8c5e"; }
-    { locale = "pl"; arch = "linux-i686"; sha256 = "65ceeb5cfeaa7d2c246ba3d152ea1fb892a7d50eafd46da2f41d7ec0a4efa759"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha256 = "d3565007522b0e3a4de15b913c8f1c9421d1d9614fa4f2d6657a4af730f26c87"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "7a0593b15eac64c1261e413f4a22ca2cbb5f489530ae72a637de9bc0de99f2be"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "243c12ea35617336d307d8040d1bee1a1827f3c8815e78185e5d5f8c2b58a5d6"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "ed06f6d30204728089609114c5d08a8b2346ca024d6e5743179d0f2f0da753bf"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "65cf06f13ce3930b4c6b645e0fa442003d41a3ff99d4ff6ad06039c806bf9815"; }
-    { locale = "rm"; arch = "linux-i686"; sha256 = "5b230c43a6b56c4052e054d117c2c80450b36d52b166ac3a9c9e3d13b336e44b"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha256 = "341495282263ce7293350c3623d25a6fc7952429bbc36316687be402831c4376"; }
-    { locale = "ro"; arch = "linux-i686"; sha256 = "12940db350559cc1ef5dd148f2fd34cb4f445fbd1928d0d8dac6e57b0186e08e"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha256 = "a53c18fcf239dce6a49a44bbb42a210b6161f5d21e64e9e33096e36b7a187bf2"; }
-    { locale = "ru"; arch = "linux-i686"; sha256 = "823ecb8bb5b772e896b51bf23ac1fa271b02c1abba9fb4c679c687586047db0b"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha256 = "fd4e34dd08c5f712c68826710496ac4eab262a4356e06a02718b27dd8c65d35b"; }
-    { locale = "si"; arch = "linux-i686"; sha256 = "6cc4f9828e366d59a86922292ca8878ef4bb6cee9ee5316b8733d0704dc6f390"; }
-    { locale = "si"; arch = "linux-x86_64"; sha256 = "ed3c28af72df9960b08071d181b1d097d0326a0cd6eaae673866083f87db18f5"; }
-    { locale = "sk"; arch = "linux-i686"; sha256 = "cfa4b71bb7acdaa689a28f8aa58f7f9375c7d7e4301cce0aea0eccc60d897d2f"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha256 = "736ff619f9d9848d202fe9eaa56b6a29e37e47589282adf7d97f8d7103edecfe"; }
-    { locale = "sl"; arch = "linux-i686"; sha256 = "c8af219be7f7cc7f878425b446b1c02838f651e64a0fcbfae4ec818326927097"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha256 = "d3309efc0b469e9d24e7e01216b52b31ad854653f3904c76fd136d615d75609b"; }
-    { locale = "son"; arch = "linux-i686"; sha256 = "fdc1e500f8499b648cf0fd3d99601cfcd0f7d89ae09d800520793751a6b32fee"; }
-    { locale = "son"; arch = "linux-x86_64"; sha256 = "e1f7038aa136492e3d296b9ff50a3f815f4b587944783ea0ea607717788cb48b"; }
-    { locale = "sq"; arch = "linux-i686"; sha256 = "c6881862ff53402d427d998c59a741c4abd9b2713c1fbbc5315b140d02445507"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha256 = "2a83117de89e2b9036c0f7fde6617d9f55fef4955432cd566692e7a2829b1128"; }
-    { locale = "sr"; arch = "linux-i686"; sha256 = "f214aa32eef11535a73449d7f2626c90b1ce78e469d96c8cc6cd53979582197b"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha256 = "9931d18c18a785569aade6fd233d3c34910ece758f3355b694b553ce6c5dae7a"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "cd5695110c90744a1b750d34c7294f1109b5c7829025eb28101b6ead5bbbcb3d"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "f52fe8f60420171385638a9de46b2b11c03b13239a17ef9fb4f7305774bab664"; }
-    { locale = "ta"; arch = "linux-i686"; sha256 = "8910a680bc6a6e58433686a020916b072e0d5d95e896cb7fa5a212c00ee20b93"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha256 = "ae727422e4b7cb2de2b098f6b4adedb2dc788b57eda7ec2ee7ac2d60b645ee64"; }
-    { locale = "te"; arch = "linux-i686"; sha256 = "0088dcb813864a4e231afd10d4aefca656131a3589b316721e2d87cb29a78dbf"; }
-    { locale = "te"; arch = "linux-x86_64"; sha256 = "6ef6aa557e691324072d201ad7876dd4d2417dfaaab08d3bfa4620c4626d1380"; }
-    { locale = "th"; arch = "linux-i686"; sha256 = "da72450d756950635c0b2d95285b5d998aeddd60b43d9ca98ac4b1b707289a96"; }
-    { locale = "th"; arch = "linux-x86_64"; sha256 = "89ac8220a7be503ecae8dd5a241df4654b93adfac6f431f08b83bb5f7f63de7f"; }
-    { locale = "tr"; arch = "linux-i686"; sha256 = "64b3e853efe96d75282e0a9ca78db876c3f03b609be0acb551d1d6a7b50e116b"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha256 = "fe01dcbfe855e661c79ec63c80098d18c1a051c85fc3fb27ac3df8b9c6d1df92"; }
-    { locale = "uk"; arch = "linux-i686"; sha256 = "1052bb8de8acd200dfed598f5afc1c87a55772b89b2f2ec59b710af1d1bfea90"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha256 = "986d01b61e36188f1293ee7ab1198f2583605469174e2dd9ead8eec241480cec"; }
-    { locale = "uz"; arch = "linux-i686"; sha256 = "b114d4696cf20320ec71c7ff92ac2d6477784e4f0c9f15a54701473a469e4667"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha256 = "19fdc20d1b6a5b556856ad4d43d05cd7ae4bbd0207d326c9f2b0a4a0e3f9425b"; }
-    { locale = "vi"; arch = "linux-i686"; sha256 = "ec48f6eb7b3fba76d07a4ff4192fe28b4faeaf7dfa2317453f1266dd4cb5e66f"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha256 = "89a9c826522dece360abc207260b6a71955d1c86f8f0b783e3013d4c7d5edfdb"; }
-    { locale = "xh"; arch = "linux-i686"; sha256 = "4671201bd924bfb4e290bdd5247b5d972b2dff986db0dd21b26ee0d30f94566f"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha256 = "f381cc509369405e7a06c78c07de3ee01f8b0cf66d3300cfb10f27cab14d34b0"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "abaac014c04bd29dcb5617c489d4b047522f6ede9139781b04c0a73ff20a19a4"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "5da12cc28e6bad8739a0050410efb1ca22d46a42c33fed312acca29e89de007b"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "7279f9ba36dfa988ffade1f54e4f2dcced30be5fab48476d5b6d20d989204274"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "e943d7736ec12d269512363d20d5b2a2e8c740c81a764f44f308d497fe95f0ea"; }
+    { locale = "ach"; arch = "linux-i686"; sha512 = "f6d47d90c084b78085b7fd9553217a982e391c146eed82323dd6b5e75bfa12ec48acf068b7e85fc74fc3d18bdf37ddba385b0b53c74f91a2e11a45d000a6a515"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha512 = "7b561ee5a1e7e1d52a6be6775f5c3e9f2e0a5bf13910241d8dad228e0f8d5e5c452efd9beddc3cd9153766750134503ee3246dd1fa0b692c0ce9549b6bc3b32f"; }
+    { locale = "af"; arch = "linux-i686"; sha512 = "cfcb27c3b2a0ce16faf5911bfdd7f0512144580765d5a086298c73476005e629ab414d6c85a862bbb5bbe1677e5efdbe88f9a2e0f41055d3f0b83717efe550bc"; }
+    { locale = "af"; arch = "linux-x86_64"; sha512 = "8d3f25168f7af269dd863d64576d0b4926adba71f6e2d3aee302e81b864eb85ccb4792b3e7e38cb12e2f949a0575d50002330af8aea8a21bee28a3b50f54a865"; }
+    { locale = "an"; arch = "linux-i686"; sha512 = "574c6a6985635c04f781233fe76ff53cf1608666e1fdf5958a95afbe85dea696265005b7f6ef5633b3124a25c673ec1b83de1fe9aff17e3d88cc9a1f6177aa2a"; }
+    { locale = "an"; arch = "linux-x86_64"; sha512 = "f057e6f20ebd20b5f6caafcf9117fb80af2c671f8fe5aa5814b0839e379e79f90b03228c0cca3ce6412ce3391b5a15c6cb464c8598c5bd6efbad11795eb247fc"; }
+    { locale = "ar"; arch = "linux-i686"; sha512 = "3ed1904d3470265cf0af654952395795b44b8b33d8e6e17ae8d4a7e48c381c8ec1b17e297e491ddc3434fe4a5bc5403ba23e328a13ed37ff119fbbd98b2646df"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha512 = "d8a2ef1b106241a1acf71a1e2e7fd6c2bbecb14ce137ca35cf206616e08900c20f4ede255913571a2cf04467e62758f580d72701be2ec4d2a8bced4a346a2a3b"; }
+    { locale = "as"; arch = "linux-i686"; sha512 = "b82397fd21af47630b284e7897119660b5d83775b684b6d1dd3ba06184a37262a6569b499d0f2a3431d576d1ea862c89dcd9a8d442f76d385fbfc2428fdda390"; }
+    { locale = "as"; arch = "linux-x86_64"; sha512 = "16a2672b532426e024ff8900853c2eca8498337b5e628d02e3b61950e33b01bbf202c9448200e7107ced7357c41797b2858a01982f21badbcdaf5df9dec750fb"; }
+    { locale = "ast"; arch = "linux-i686"; sha512 = "a1fbe0bf3daa30252a525a435eaf276ee29c51e7bc9f34826e1fd4817577d3cba8bad47af5bd5a31b0d77939e6475b81d1f6858364d2425df5d94724d3569228"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha512 = "e11e54442d958f98b5e36747fdd7f95341129ae6888c61d98465608c48526465197a33c8f9c299cc5b2ce620b72734d2f2d6d15c05f0725c6b20bb62e47a0521"; }
+    { locale = "az"; arch = "linux-i686"; sha512 = "3cc0a9e3276b283890b8ae9404b562b1cebe0893f459f31f9893d3c6d73cb074bedf51ce11eb062373d79273005cda0485b26a9de09c7358d589137d7c641cba"; }
+    { locale = "az"; arch = "linux-x86_64"; sha512 = "955d0e39c9d82d43a137f933e9c34a2e28103c79511121e4e25ee97f9b6abfbb10f5a8ada0c1d31fca8dfdf37b18d62c1fa5715483c6dd60aba584012a7eff7b"; }
+    { locale = "be"; arch = "linux-i686"; sha512 = "7d1251a115f7b590e1fdda6ce95c6a883ded1e477028c1f47bff3c6d41308fbd6e636e81e551ed629d6c885a1a348091c582c26f610aae7e0313024949bcd963"; }
+    { locale = "be"; arch = "linux-x86_64"; sha512 = "b23476c0259ede183fa4ed7193e80ce741ed05b3b88935f88291cdf6ce14235e1d31bafaf25edc16b5a7cb62c9671dbb235782913e9fbf10db48ff9f022c8043"; }
+    { locale = "bg"; arch = "linux-i686"; sha512 = "736dcecd01eafe4ca71da494ada47dc434eded887e8100db1c308ad0ae1d35d6ce565535fe153773896482312b65d73cad9d09478830420b5490370f00059c98"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha512 = "c25d754286263ed58772f6bc1a13dd3c2525eb973b9cb4783fa2c57b80e117df5f8c5524aa60fccef158b4d80ddf214b50ce7b9e8631b14e60aad0bb6158f4d5"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha512 = "7e9ff9e316b253e8f3da135535fa38a70ad34183ab4a46d865c1384ae7df72cdcf9eeb8e85fc7e3fe0e0f8c01d50fc3212631f49ad74e34b236a652c929f1149"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "e26be6867709dc3827ad893efb7bb64c510506582683f4c82b7f5dc2931cd34075bb2001da6b3671532ab1a500d097b21388dcb0400f11c6c5c341fe1edf9136"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha512 = "eb93ac222e6d156b044e19d945d7b74ac70224f295cc533012ed6978faf07e0c8214ea6eae355b9905dfedba8a9fba9601224c1eb8c11a6c7e9575cf90ed0ccf"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "4030a6653fb4326ab8d4bc27b9d3e194760d2bd04749f102014b805253438ec04f0a1df0d5f14e62f35227b671de193213e79be947bbc31dc772885048b1001c"; }
+    { locale = "br"; arch = "linux-i686"; sha512 = "dbd75807aab017e012be8138fc6f2b470cf88a7f9afae01de4296dbcbcc4a37754f9d23fcc892efcde4df4e9b8a16c93201c3f93f976987b6be4f80a907483fb"; }
+    { locale = "br"; arch = "linux-x86_64"; sha512 = "0b06186b4ac5c5d69b46b4d571acc23d5193e4dafb1cac4ebaf36f7fd1f12ff4316d47f8340abce72dfe5b8801294256a9c029b6bf9fb77c7ee6174d6178378f"; }
+    { locale = "bs"; arch = "linux-i686"; sha512 = "e708a86177d3d3a855a981ee81c7bc163e886c279f84c6dcfdd3f6dc2c58d0661fcf416b2afd8b74ba127713e5fc39b9f188341b2e84fa03476c07b74ea07a97"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha512 = "aaccaef63d0150bd2f0bb3cb978fa0d99f8b25ee70d4621ffd5bd7d7843ab92ac778cf9ac85c9762583706a78a5bb5e0066bc46c880c96623b92acd919e37246"; }
+    { locale = "ca"; arch = "linux-i686"; sha512 = "ed0f97e485abc2342dac0083311537b98d5c38005bd6ed1fdf817d1d186442cbfb1a71bcb1f62e09e873c36e350e8905611e3013a6dea20921b9516f82ae4daf"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha512 = "16a6cf783feff0658bc41e893873bf5621e2b663834cfe13bfc07980af290ad2f582ffe08af8bbc46624e6eebcc468c3cdd928b2392a57dd8a730c2ca98a476d"; }
+    { locale = "cs"; arch = "linux-i686"; sha512 = "c8e0e40a4001ad734c23f407c126ddaf36e967ae7a08c34f3e562ca986fe941891f3580e39ac3b521b9c8c18b9e21bc37595716f943d252e69d03fa5a18a73c8"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha512 = "f5a9091c4202a578dfb7a863c5bd5229882af85fd1b0d3ad491963f928e9f91c78a742d3e68379df233346169351db4b1773517194a1c48e533978f7189988eb"; }
+    { locale = "cy"; arch = "linux-i686"; sha512 = "ef2ac5d8a9881d3f1659533a88cb4b9ca1bf50b5dfb11f7efbeee9c51ddebffdb302ad80fe88760b9a592c670f93375551c85f37840b9f35f2729b575dd0d273"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha512 = "fd091f53184e6ad5cc4dfa92cb9fd146fa116055576b51de51ad8e335babdd55f62083568eb34821c0cdc882d61854f9f1f69ffc3913f711b9f6ae7b42d096a9"; }
+    { locale = "da"; arch = "linux-i686"; sha512 = "b45f88694c49a59110d1bd19af371fe8308200de9d21858d71ff69bbb3a75c2f71e9c7691513359cac7085173fa4678aecea12db5f274e7f0855680f6e8434ba"; }
+    { locale = "da"; arch = "linux-x86_64"; sha512 = "65c8bbbaf59e749502b35412e3ced200e1d5028b615b27e519932cf87d0c18e9dfa767c90f933bdfc3afe064e0b5630605338e8c14f405b9a3fd15ff350cff59"; }
+    { locale = "de"; arch = "linux-i686"; sha512 = "9c55735b51f7290f90b665c91fbdeebf285e82c30ea0462670064c6f30b3ca778cc0f7dc005df3308a46430b20e2aefc9fa4176f4b119c1a1a67750e646639bf"; }
+    { locale = "de"; arch = "linux-x86_64"; sha512 = "4871350400a76ec4a2af37f1c166da9b1c28314afca1e5c73e4180b6d8f023b036d9d4cf06a52460cc2bc2dac8e086862d433ff70b0e9add80c4f6bd086e7085"; }
+    { locale = "dsb"; arch = "linux-i686"; sha512 = "16a12385c1d2d7efd17fd904dc5b6c223319a482d673953b1897db908c8c80f58943d14ca8c88b82beab4a94548ad3d8d0f7c6e47f9bb219e22078ebd3b6f90e"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha512 = "a81c4e8d18d042bd555fb163de4505f326ed9c40244cfc84db7fa9d346e532a8e8e78218cbd78bc4ac751ed04c3f3e4573edb0b21786f231a08547ba4e63f1b4"; }
+    { locale = "el"; arch = "linux-i686"; sha512 = "50d0ce8a20a0bb6d5b3ba88d70428aa40dcdbc7993bd8802c3f77bf2e82552d6e9c5ff8fbfa8731b38ebea0511a18e65dab7fac92dee0714be7c5e539e3a8965"; }
+    { locale = "el"; arch = "linux-x86_64"; sha512 = "d8a0fa5a3c0cf0de77aa9dd0882d35a336db5f068e9dd87169201e5d5bf4960880975f3c7af193ee537c6692dab3a86bfc57416f9132791a32094c6b12e05a3b"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha512 = "7c509f7c1760474f41f31260f30ca8aa6fd89f8fde699b4c6adfcbe73dd40b320397f3753d40467a60cb915a6a91745733019ea9d33452bcdadab8950e20d165"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "ab5f82317bd2f7aeb68295c39526fbdf1f7c8301b5805dda530d1c0f40922622bf75a9bcaf543036c9f039222a59d70054d63561f851ff7e5c10e87794d64148"; }
+    { locale = "en-US"; arch = "linux-i686"; sha512 = "d8824a0b2dfb44558308a7f240884c0f73b3face4077f59c01fd8352d33137f4799e417de9befe6865ede03dbc77ea5700e95d87783363a332028bc26ea681b2"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha512 = "417c63be1d010cf134940be7f30a69d33dbe005a7789cfebb1161f2aed8384f90b5cea6c097bdb2102737b948684657bf2bf704324f131a4e6b41e56161e4235"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha512 = "a9468aa01d2223c254a7c07407a4e3941a5433d5237489b097ea6298537867679fbd6baafead460bc18951d1401e8c3fc100fe28492cbd745772afdb7b708541"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "1e249c7342fa47c868489ff8ace68696b51b83563677c232f854f29f864881823e451113af444cc6f761539b590192a03461069d175ea50304308e5a490bb8a9"; }
+    { locale = "eo"; arch = "linux-i686"; sha512 = "e96b37a25ab897ff4956b42f75b2b1a4f7bd60ca54939712fc356e77e2e2d8255bcec767971ac3f4215894e2b90a5204e72e70b05c28173a1179a5d8d5810b0d"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha512 = "0679199691f725cc1d3224cf351c7910a50d6e68496b53a780ae1ef42ac13ce0616eab370db310b0226205709ce6c0fb414d2503c8ea7b3c8c53fbcdb30ea470"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha512 = "c5f813bb95f547d220ea6de23d57dae990904e7921880eccac0a987668103ed53086deeadfeb9ca548bfc5f9e4b56d0c90de15ce29fe4c5e40a6e0e084732ae5"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "e3353f9f4621a6e2a3a84d7ebe5dafae8a5f7912afb3c7c949590abfb40b3c8fff2baefe635a435ac5b50e402ab60cbbc2a34b653e31b868e885acc0002fd774"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha512 = "5538d7633a1d1b8cfe3304fe1e6d443ef329554f299c43b0efc0bd8e5d4db07cd5f894741d8ea9ccb3d20bd2d058a7239d89cbc37807ceed5931d820db364ff5"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha512 = "685c1b68c412473d3f1449dd26b69b0182a2ef3e298e240cb147ad134b3f18a4c88aecd2e328f87106a2a2be70dcad06f8637cbf15f89320e196c4710aefd417"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha512 = "095b8453d3a6f829a9be6445a345293e1697e2253346da2c6d22958d19f921dab897d52782ff901dcbd5710ee62641d6ca45675b4afc8b15874dfc3f40184649"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "8f9699720a1e4b2ad92d6dd32bb553e5ec2a7c1038f8f8469809f351b6798f94190b2f8e9ec45b2888422d64dfb6106e1e5d5272d9275794ae1c3e5d23c43340"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha512 = "fa3116b5b40f4e844d39380832bded90bb7dee573c475fe7f4002fc871846fa6f52cc090d5704049e5ff296c93132bec6d6923f707aaa6212d524b4aa514b42b"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha512 = "a6d577f962ca2b9ebe7c4fadb372ff3322a40aefa4229b7a2adae05e6ddc8ef60e90134c15604c8cf88b794f545f566dc090a55ac36e93fcd03333680043c4a9"; }
+    { locale = "et"; arch = "linux-i686"; sha512 = "c4e6e4de6e3b7e28027ef44c995fa87baf22f97bde603f9b2ca08d9282efacfc8ee410557658b6fefa9867aaea6ed35161f1ba6bcf83eb3581c28a68c573fadd"; }
+    { locale = "et"; arch = "linux-x86_64"; sha512 = "e4362621a4fa025388b565ebf7b3ce1d94976a1421e5d73a98647e9d0d3159b45444eb0f84462d668026567aaf6c8971b7bdd075c5b498b95a78c4dc84f6d368"; }
+    { locale = "eu"; arch = "linux-i686"; sha512 = "43f58f824deab2d145bfb4200bc942b29975a86ee66c760b955f3b6647d0f8acbd116b175c4a1c7b4be9beaa62f7c56a8ff132a3cef41c1fa3cc7246ce3bdfac"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha512 = "a4a3091e35e276ee0b8db78993174f18efe1dea0c2ae3fbcdf6c75102a0f0baf4177c4b08d5532267ccf6991d3ebf96a0b9c2e4b6d2fb405a230d6ef3ebac98f"; }
+    { locale = "fa"; arch = "linux-i686"; sha512 = "b78c60eb33a408ddc37d09d00bf077958dc75ad50e34b41cf41cf0ee3ab1e6a133a01b7759015d2be3869c621a20bf92e13a1ac39f998040650dd228381b3ecb"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha512 = "e95b6fe546f41f24b749dfcfd9c98129f97b1b0034e1af8f787203ece66f60c30a6670c1fd76b14433efdddb834c95751d4bb61c3b269dceacd46d9e0a515706"; }
+    { locale = "ff"; arch = "linux-i686"; sha512 = "398a80d6d4511a9c372727ab6a52a85db90ad8cc922f5d709471a40151e81319b5683d84110541bc721a8c15b18617e5ac44f7f54f2b2f11a2b7125e914d1f3f"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha512 = "3b4371581bc077c77d7ee5781fbc82d82d746f82babbe66aeb1ca0d7c6a3fc168e0eedaccd8bce8cec67bbb072158beee8efa49523fc90ac3ddc481d1966c8f8"; }
+    { locale = "fi"; arch = "linux-i686"; sha512 = "2f9276a91d2ff06142ba2b3df972d3bbcb61d43a9f8116cf32f09ee1c739a8386704b2fefa1ee45282a6a81b4009ab5deaef214120d5705ab65e768b28f8e981"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha512 = "a803ebabe7f4ec0004d6ea888e70bc97c23a4d533ea9fe7e546031e530a32c4bdba2cf72549dd58939f92b1e0373dd9fd66833bb56706a877d75db4d7c5ccbca"; }
+    { locale = "fr"; arch = "linux-i686"; sha512 = "30d473d7f05e5082f5318033186bced91a087ede297581b06ef6b3383444fbc9e16f558694381574191564459b43c271ba255b6b3b3ac5d96a0bcf1e7b066b44"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha512 = "d5bddce8fe9b6c2844cbedfe8c73930159fb189608e282dc0afeffe0e40fe8573eb3a6769fb18280c5aae58c90eec7d6808f18944ba8065476f84d9938c7f9c5"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha512 = "3757da3afd154b88a64bd6f505c89e2fb3df8d966d2219404bda36c3d00f90e69c35f6d1c5d33c1eec0075e2ccf7982bcbfcfc7766b62a5660a73d6a00bfc966"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "4101d6c0d8c257490781b90e93acb75f72486be9e7661f82c3c6cce3be387a51d03d458c7ef55cbbd9f0469ad1119405856c12b28f47d4262d89fccb773facd6"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha512 = "56ffc97d50570a0a155cb30e389b5590aaafae32b4a326c2d9deaa2a61ebef272709eb6173682e1c10f0f5e24523fd8d8ab53ee2f35bf9787bdf7c29ae4574de"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "faaef2808b901c5ef0d74d1bc69280f67b233ab720eb8139eb23ff9977c3ae32063b1ea1d948ed2240a4cb921ad2e07df06c71a99b210021d9a8f9178d6bc4d8"; }
+    { locale = "gd"; arch = "linux-i686"; sha512 = "0396cbd5bf6c3a9dfd829d1cf388e3b980b8b0e3a45659c4c339f867ae485c252e296a141035820f47d8fdb05c10350eb53e6da9d7d2942e77e1c04142440758"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha512 = "1208d5cfc20dbc18a0a6e6dcef47425c36cdb5b98ac41e7d7b53c74d64ba0a4490273628ff23ca91f2ca4e016702d7e8ab4457219b5aa06f38f787243befab7d"; }
+    { locale = "gl"; arch = "linux-i686"; sha512 = "775403801f21d821b586b866820c9759fa88e7b0507d0477d29ac033ef3d40bb78fdc6b88cd4d7e5bc4fb6bbd38d950432db339da7a28e8283d07eed00d2aaeb"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha512 = "d8a1088bdd413ae82cc488cce1d87a13f85fabb6fabe25dd343a806ff2c7a7d17c90275c5002434e07acdeddb893b34532f0265e7a6f9e18a312bd0903c76738"; }
+    { locale = "gn"; arch = "linux-i686"; sha512 = "a7bc239dd02bcf0e7e08016cbbf925f23811f63679956adc3a327849533c37983837c5de5a7620eafbacdedb9af892d51f4ee43df5a722795913d992b25ccd1e"; }
+    { locale = "gn"; arch = "linux-x86_64"; sha512 = "10c44f03df9b183b1e2f27f7a1628bb0cbae24f06d0395f4b57584905c5e8998535cd45030d2e4e93b9390a6d6e4a6f2cbc8a68a8bfdad978b4eee2790f84537"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha512 = "fcbae07a790973fd3fb16de39d8cadaddaf203efbeb3cc37065ad85ef9ee32ed02080c00343f8028f54898e44aecacc7936529cb3107323a869b9978fd85a5fa"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "16ac0309932e46e035537a9a17aaa44c523715ac5ec189935533d3ce473f8323f9784c742ae8e0527db8988b56efd2dee40062cf6eb4c2fa5982d435d0aa794a"; }
+    { locale = "he"; arch = "linux-i686"; sha512 = "b9ab9857549cecb2ea706f240bd988c9dbc9e24173e4c37443cb3915664e03f60042f72474fb726811dd0e08780251bee8ca353b299b761a6bcbe2bc6bbef368"; }
+    { locale = "he"; arch = "linux-x86_64"; sha512 = "0bffc9d5939f8347d1c08b4ca5a9dd64e53d7c15e8c08b4a6a1c51b089fcfa5e9e80b47d71728e5279eb57c0393e7e2e6f91a6ed891e30d73b02a3fe36a5aa1c"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha512 = "4a2485c41c48e6a3235084318df1b7a1acb3f032e9ffaf381587eb61459e04112bb9bc66775fd43f8d6f71e38ea78179b34ed2338235648f0de29f43ac2f8ed9"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "721994a7f480bcbb149ff4d1ee3e8ff230098dda8ef434276a73b42098a5d5900b000ed0409586236b33e25c4d6b943a0fe8fd1823e7c4a44ffeb41cfa2a9911"; }
+    { locale = "hr"; arch = "linux-i686"; sha512 = "4d0af384a421871a87a23232dcf272cecdf16d0901017f6485cdf2b851c48e02e0f4349714bb628dd1d34121b7d428e746abcce7130216d283ff858a4da749c8"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha512 = "8565b7d30dfb1070d82f34cbcb9f7913fba78beda600214a306594deb2f01dde893a1e1b9753efcaa686a385ec14799ac1e1a96ce9ca80fd0e0731691e7b46fb"; }
+    { locale = "hsb"; arch = "linux-i686"; sha512 = "784dec7015875dcdb784e909c3b7f0e6bc09bac753b4bec4bcb0cb9413922a0887959d999ea3ec2e85cc361618cabcd59e6eb9f1993079eebd0f981e79a33070"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha512 = "8f9baaf433fc34278c2ee78d5c38f71c9a02b26c18500688225f03bca8eb1fc5460dcfb20f6d4f1bd54fe4095a09a94b45fc695a38c69e4aa52b6457f65c461b"; }
+    { locale = "hu"; arch = "linux-i686"; sha512 = "61ba87779c9a669d088af105266818be476aeff86fe93342dee90fec2aeaf687c437f9b05e71c249e2147eae10c2194fdd14c8f44ce31bc4f530f52224e844c8"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha512 = "852785314f3b56eb0cf0ff756518b428e5276e18e476cc1dc2fb8ff37b66cf1857fb28f40b5c86e7626f3684112943d117cefed4527aefcae03b10b871266737"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha512 = "f0a2329583a806a882b0d4fb7792badc074d1bb87e243a6f71327574b47f7fdddd9eea1b89f3d08f11b9436a4f6b8e558e9e52c645b18d56e3587407983c56ed"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "bf5c397b2bc3ef4cc1228df95989adb03c347ceca0630ece474e92af316289ef877ee3a9266d55a55aa6d770d48dff745515d7b8c8c868fcf788eb3587c8fa50"; }
+    { locale = "id"; arch = "linux-i686"; sha512 = "08d0959fe051109bbbf2e5b3c72bf4b7d4b3e4c92994b7487d5be50636599369bd74e7b8433142424dc64ffc1657a3e64f2c37c88af16d3f04e1679c0bf4c73d"; }
+    { locale = "id"; arch = "linux-x86_64"; sha512 = "a163d4270ec8e090b69cff1f94c2ea0d488dace58483f7ee1844af1db5fdd120bab3304b50feeed615fde478b18b0ceed5bddd2e2415a783ab4941c235db4691"; }
+    { locale = "is"; arch = "linux-i686"; sha512 = "249c58f2ba60deaa93d36e4d3bb4aab80be8a8d45c8669bb659a14edf1afc3a9a7441ed8e05e4724c5e64a153b583a1f43820068cc49f719b58fbfa36d059f22"; }
+    { locale = "is"; arch = "linux-x86_64"; sha512 = "b2468ba5d1bd46b8772d022f6d2e7ddc2661a83c0aa3d5573d3a892944abbd9952a4854bdc7be4fa899309340e712e5ca13ab3bd5d11e9e07ff50c26b5942248"; }
+    { locale = "it"; arch = "linux-i686"; sha512 = "2716f0138f74c2253355c1c00542503908a747ba0f0b26f4e79ffa8c3e343038e0e1b6c8d1fe02ba5bf1a0d8b0ffd22b7afe53b1a7964eb304e5ef263c04ce8e"; }
+    { locale = "it"; arch = "linux-x86_64"; sha512 = "25a51e8f55e1fbaf2ad9b496c4d9c80fdd21675af106fce1a71893bfa828e27e5d9c610e176ca80dcff6b5d0a7a6c860229586cd1f8619ca4eb8856f095336fb"; }
+    { locale = "ja"; arch = "linux-i686"; sha512 = "e2f69658e4a4d6f08f6a0f603355f6c421feba8b523aeddd34121f26ca42092c004fc678821286af355971cb8cf1156755796589bb5c5eb1ecdd8d0b6dc214f3"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha512 = "344c9c073e7175e71b4484a9e2e8283a12034d752e6597a604dd219997181531302250bc8a37c4ca442d58076232fa2c250356194e710dc8a00be03a0e874bf7"; }
+    { locale = "kk"; arch = "linux-i686"; sha512 = "accdcd87c2b20fb6ff913978e117272613ebfd9154d20b12410930ef1c6b3375425c8c4fa20ee8e8e393fc906f422cbd5cb24f6d2914d5bef89e0254d075e0c8"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha512 = "6a446286f867fd2775b0863c8aada5b4b8349c114589f869c8d1ef488bb1027dd98dd74ef0fd0fa1b16fb135265a7be8d7624f84b32dc42d29c7d4a65ab1e153"; }
+    { locale = "km"; arch = "linux-i686"; sha512 = "ee879b225b8f412a8117c33d6c5a9c617b9555d44fc393d6742844083ee83248f8434d00723db2283153496b0886080c20e67df9d7268a6c185a8a1f5b01e491"; }
+    { locale = "km"; arch = "linux-x86_64"; sha512 = "7cc1cb48aa31784c28f74f1968b798b34025ee20e7088eee2a33cc4f9919b59862b75f791f09f63c7f25cce29043750070064921d327c48a516fc22f26073a32"; }
+    { locale = "kn"; arch = "linux-i686"; sha512 = "9868cc4cbaab89dc4425ba14f621750a017a67d5be1a6a63b3a31d0482908e0225d40bc26fedca3472669185d43a780ae4e897994b309644a9d1f80edd2470f2"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha512 = "d6c5ce52d8545935c28387b5a314d1b0fb11bed03111fc7c66da3dbffb72e7fd2ba6c12b7f2ccad3f5df45f897e8c8227428040709c1cb6f3302d06fe050714b"; }
+    { locale = "ko"; arch = "linux-i686"; sha512 = "3be5f165bed0e7ef2c4f88a9799485d12a7a6f99c4efd84bf9aa21abe787ed790d6ec103a7b95015bd64987d231303aac17a8947c8acc7127ddffdbe7e3fb4a1"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha512 = "05a55063f9d9781074c76287ba9d1aef707a603510df956019e65f0a07412850ec29a44fefbb71f0ce8d3f419a40e06f725c2f23b05e8051783bda8f1dfc1d23"; }
+    { locale = "lij"; arch = "linux-i686"; sha512 = "3d9b7cefbf4cdae6855b2c5315cf192e6f04d4af115727ea275aef40b8819cb0a4bb31b7703cfca0812bd58f0d4158c53a5e0b4140cde6825338fa2bc5aab5e8"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha512 = "2f050e77efab6947746f582246290b3709e206520836912c52fea9208a25f7fa5bb7bce0fa1ab2adb723acdc0586245eb1c68c3b172096af7bebb04c864405a1"; }
+    { locale = "lt"; arch = "linux-i686"; sha512 = "f438a37846f95c714650f882ef2ff20b9e82d352eb8159d7001d110f9b20347fe5d19ab0805ff95c3c9007a4cc7dbd4a75b9a28290cd21d2affdbe81defa58fb"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha512 = "f4726e669e71669c3f9e9524e75e749386062a91e0909dc371a7b4ed0dae73647a855c052eb3d8fc8283438782192b2d35b795b2c0dc498e69e5b29916d1b57c"; }
+    { locale = "lv"; arch = "linux-i686"; sha512 = "49e4dd4349ac80e26cea7276c08de679e8d25a953a24f44ccf029f5cbb2c8f62dd650d53ed8967644f22a9df0d83665661190f20263c89cdeac264578d21486c"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha512 = "91e8712263fafbe742bef2b1adba0cd34eac4453bb57f6439335ffd3014a663e6b0f383a085a22e58d271ec9f14de7ad6060cce2957f595a9ff659fcec5bd409"; }
+    { locale = "mai"; arch = "linux-i686"; sha512 = "bf916dd9a96080b25753684f63df03548a99943d3c301b760c692379224f093670f0040b126d4a948f0c0ae64a7138fe1be83814f18940f761cbf52dc0d1fe32"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha512 = "99016417b0f1d433acd8db0eab87973b7c3155ee9efa0e24f8deda25293c23b08337eb17006cfadc99bb8d2bb51dcb519e4270872a63986a75d44929cf74378f"; }
+    { locale = "mk"; arch = "linux-i686"; sha512 = "7ab1081f03f59d56ba2f40845a7c2249c20c87d836e886aca140471ba4fe59b4cc9cfcf765995d89735d4253c70d3dc44185e52caca798d1641831fcd1f49e3d"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha512 = "a8ff017f9678018384056b2b2c47c8250a13b4ff4ff4a48c2c25e4afe9531a033253a8375180b58654605026f07da3f6420177bd599277e1a7f280f17c4a493e"; }
+    { locale = "ml"; arch = "linux-i686"; sha512 = "18f092773c075cb74e7215f834c7cc495a21a768bb50981c6de3c10c83c57459519f38e936fa99112c896696c3282da53c4446958f0f66799c7bfc16634dbcd6"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha512 = "b10f45e990b0d621a5c907fe166b8f8d57b071a4d45037c34736fc172b255485c43620b083eecb51da47a8ab827bc1c900b48ab1820844b374d46cd97dd7d1e3"; }
+    { locale = "mr"; arch = "linux-i686"; sha512 = "e27204611b031ba9ef3e537d1983ac79c1c0ee170e0c18fe6af4ce101165b50cba64c0ec965356dbffeb3d33c8964457cefa54de54ef3bec8657dc30825aee9e"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha512 = "48446f72998b100922e506ae4d6a7528496ac96ccc6faae37e52098c1031ac3a5ef1158e308fca7e7f93abbc858a9d97000568aaded5a439da66710945ce2b66"; }
+    { locale = "ms"; arch = "linux-i686"; sha512 = "cf8257b14717e23f0362973d8e1913bc230650754616efcfc9451f48dde6100d6ac43f4a21fd06c84809707a65985a788c73d9dd5b6f28f4fffaa1818e2ac2b4"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha512 = "a25ff650f0fa0a7e153c03d413b5745b00eee731aec8bdb84ae69e0ea0e967a6dcc9329adea086d9ff7d8b76e35154936e716440b73f61242681f3527e272bcf"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha512 = "98b31be954a71ef221d5fb7f84de52a7f5e2e1cfee20d432b82236d1aaed7dafc63d05163b1946ed6619f12e9c4b6d29761c75ee3f1858112bcbbb373705ab08"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "14ad4ebe13d1952dfcb46443effd2bef636aa5d59235fae54665a3bf2575da8a37c9ca5149732b83ea2724f3bc87c24d7f5f0175e0e296144f7348a987a99486"; }
+    { locale = "nl"; arch = "linux-i686"; sha512 = "86313d415f0c0cbdf29bf148048b3c230382dc17193f8f72f7ee61ac8d3b253cfaa3af8c633662d14c2d2ccb9308d5cf612eaf1ba36a19f44f560771410a7e4b"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha512 = "971fe2e96df5411949f783c2b0af9b610bd1069bc135ba4f70cc5ed267fc80dbde032f2bd0df6897dbe8b5e9c6c130a5cd91b174fd0638bf602324fc91ed6636"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha512 = "ba19b2698072a4df36c5a1a279f4c3a175ec713db0fa737865aad38c2a72a76ec70353268723b55bc4aabb9c80b54357111cae62d572455d1f92599f6cbaa102"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "f1d8796fb582e9734de4e505f88fec21abb2b4012d4ca0d2193c90a6164dce77ba33ab46cdbbe9f136bd2d89668cb86953517c51fcca7369636277f14cdf550d"; }
+    { locale = "or"; arch = "linux-i686"; sha512 = "1d77a35547d7011fbbca3cc87f7739b54b4262fdecb9478f572095cb892ebd03724357f35ac19706161fc2e4ac1f1494652f918ef12539fe7f2741794439752d"; }
+    { locale = "or"; arch = "linux-x86_64"; sha512 = "5a75b99ef9aac1881be88b77618262be95122cc93b957f0ba9a7bf6e1e2f4705078eb884096201caebf3f5d4e64aedccf55d0fd9dab63d1772121853a1c16507"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha512 = "3785c52e02c69b5526d87bbcc383bf9556af1a077b3d3f8a891d51e9ada3bbfdbd769fc23248f482f7a0be056623a73289605d9e7b429b4fa161dd311fabedde"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "13f20bcf0e518ab28dc35ef0e9eda84e4af4813e6e783303da78c1775f557cba27118f3efab6ffc6c7973d43c6e85d7474861d4b0a11319e175a8dc3959d221b"; }
+    { locale = "pl"; arch = "linux-i686"; sha512 = "a018afb8480cd080d472fd57f76f9bec10a7ca36f002f82cccd3f5f2020a276aba56207138d8e01ad602941bac910552c64df961df1c22f643829eb1145431f3"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha512 = "3fb6f3ef60f577550173a893b9a7033f22dfffa6f8198b9e6be3d643da604a87cfc6fa2583ed46b2bb572cef1656d3901f849b5aad2b515ea1d275a41b44c560"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha512 = "60ab5ef83df1d9a4de6b687b124ca8d97dc7f7cd86021e5401365efbd7294d9c8f459bde56994a5aea9ca688597ec5b5a77567a41a60965b7f7a73b11de72622"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "27acfc996b32f949b8d5c01427520250d07d63e927febf6381be51abea12e9c8f8c4b404fce95e9b57ed9dcd58bc1f836e99517a000e7af8632ced98c52609e5"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha512 = "e01c4186e58fa418a56e4b76d05b8fc42479f077465d9f6fcad984689375d72749ab623245ea64493365f02a3080491cf401f0dd11e310d79a1a15db841a37b0"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "9ab7ba71df7343aed687f6a2636b72e09427e06ace51983994b2c4d112f19fe124819a6a6164fcbdbd33192bfe1cfe53dda0d7c86457b9d73b8e043b4d6283e3"; }
+    { locale = "rm"; arch = "linux-i686"; sha512 = "0cbf512e18f0e11154e62057fd5e91a8dfa1dde5da7574f64038a85bb00e72a41d3f8cb20879dc0b7a0eaf4a8ac20d2f7bd7d9f1339019efd92fc6b9899b08c8"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha512 = "3fc727528ab5365d0dd64bc57d449f508c932651130017abf95bc20e5314bcced1a7167333bc5c501386e34d9ba4dcae888d16cb2cece8d02a1bd716d8a08ec3"; }
+    { locale = "ro"; arch = "linux-i686"; sha512 = "bbd61341279fb44931800c95266965e1786f9fcd63a2bde0ea9f667a9464de685d4facd64ce80f17e02e70113c145576d47126ff6b92ee5f064d5edba00d8a5f"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha512 = "d505aa36608d4b4250aafb5e222107f0b8d18b7e1c3d214ce4cb0cb96c8130e2a67b35048fb5d509730d6d00abb62210e5c251ea38882852016c2eaf2f74f895"; }
+    { locale = "ru"; arch = "linux-i686"; sha512 = "5df2e92197eda83b7604565875844faab64c3b1b5ae61480fb1aaad29fae9c40c905470105325ef4128f31bf249967c542552248a3cf5ce208f81a59f15b1395"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha512 = "ce0f678554123ec89379e68b809d9c000b151ad88975b2cd0e4c69a7b0917c52ec8b2a6a06578a7b644837fab718b301b704dba59848a4773ab272c235655d29"; }
+    { locale = "si"; arch = "linux-i686"; sha512 = "2d1dc24a65a747724b3d874e4ce61cf9adf23ff280108d528e75b1c0861859633b98d8f719285034cf9148c551fb509fed6df189a2b69dcc8d4e6ad3ada61921"; }
+    { locale = "si"; arch = "linux-x86_64"; sha512 = "2351940a022ed65df456a14a0eced296e9ee70b3b2f0343cd65b78c7d6a7a7e7a201e95d5418eb40ba88757f34902ef3f7cbe2ec0e24f6aa051064ec1b490049"; }
+    { locale = "sk"; arch = "linux-i686"; sha512 = "e2ad162074bba4d971a02684a4c5f4d84627a7af4027de55a7698e33a6450d137081039527ba478977b1098595a90e6a8c0ed586be1991605e2d82d104522ee4"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha512 = "963db53c67e1ea6f7919939ed6100cd8055da79af96f5d7038ad298c597fa619ca0c01ec64198a757a1307ce6590b1b67fc90169d78eb19492a993a29500a2e9"; }
+    { locale = "sl"; arch = "linux-i686"; sha512 = "2a72ebf8fc40a4b8e4f1633efe7f0383813ca1e1bd25d5040dffacc332e9a2a8ce653be42a79ea45c7560e41678832ed665e06fcaacb9d850ccc6b46b0bcf61f"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha512 = "b22284cc397b0233dc6d00da5d222998024d47da7b967de9380c50bf699def1b79a21df280040da5b850d6713d521c39d8f046e3caf817792bcb1c716fca8370"; }
+    { locale = "son"; arch = "linux-i686"; sha512 = "36d4430fdcf4412aeb5f006269327276f90bafaa65ac817feff16fc23f2199e8cc6bc1c3441b9888c6b6723a70c2f030fd9a855a86516b89adb8c537dca4acf9"; }
+    { locale = "son"; arch = "linux-x86_64"; sha512 = "8bd790a9d027beb003456017a28d9b3c70aeb21afc65032c70e9579b3733a7f5e9cd86841d40bff02918639518593c988c575ef5fa044fef5daf21b83ddb98cf"; }
+    { locale = "sq"; arch = "linux-i686"; sha512 = "abbb952991f20a728d9ce2a098f605a8e163dce73c065aa3ade72e2ef45bffc2a8cc668369d90ae18702502a829ede1c33ee266a286247ce0d6b11198847d195"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha512 = "3cabe8fce7455eee9ebd2cf294e1ff345eeb00a683f5b4b65f404560d9cd5b5033576207c3da20fd0919e823fcd256e2518c55c951dc1ee3ec5c61c122a2a1f7"; }
+    { locale = "sr"; arch = "linux-i686"; sha512 = "7011df81c9ee333838a80e013746ceef2ca3dd25f65d530d22e71f11742899f9790d0acefb12e162c7f51a6d8ee1c9a1089e91029ba994534498a04cea1f407f"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha512 = "66d5f9ee32f81ce73e9068a8c0610c06a8e89182e04701704cef9bd666d7b070fefb902eb3f5d457b360812d8be0682904faf80edf1891f614c9cb6ff0d65e6d"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha512 = "2e62d438b36418d21f821d764e1e91789e6f780d676354431816b8c5eacd81752b55a2ea438f6ce16dc7393670d21fb8966b899f933487efa38e4b2356cd60c1"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "f295eae86e011f09969b0b82f4d41a3e886a53080bb6db350b07cb4eeb83b7c20c0bc1f908fc0b5212ebf19dcdcb8d1ad5814818973823690e55f02af9b77f4c"; }
+    { locale = "ta"; arch = "linux-i686"; sha512 = "ad2adc9a5ea313a8d654ec2a5c38b4ef08c42be0330c038e1da08a83fc1615425cf0de1c6edc612f1e5c37687564a8b6809ca1328830ad2b73760d439b63832d"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha512 = "c0557d9217bdb861fa07774e08c6617ca5aca8ad1a140ecf5ed3950967626ff2eb9d3b34152d021e4ec6e2e95078a34f92eb6ec242da5f3069e1f8a771721cb0"; }
+    { locale = "te"; arch = "linux-i686"; sha512 = "7e8d1d99f651f1bfad0d173ac223d1458e82d2bb507aa1d06da2f66cb969c9d0ae1756a22fbb38b0937a3a615cd28414da4c9621440d99f5a867a16ea74ecf50"; }
+    { locale = "te"; arch = "linux-x86_64"; sha512 = "ae2c563816c992cc72f17af8833f26b5da990ee228481151ed173c858d2c151df19bf80fb514b9ac79408f737077b31cf43a27f1740777ce45b06b22c87df060"; }
+    { locale = "th"; arch = "linux-i686"; sha512 = "294b297618a358c58f6b3fc6d9969b4b687153df233d409404a82e4d4bec7c67e40aeeb42094ff0f5f4517ad53b666a8eac22e087718501ff1e6ae42a939f99a"; }
+    { locale = "th"; arch = "linux-x86_64"; sha512 = "e87a3d13493171c18e2aef32a98648573b891f993d1f0d89aaa0df96011f1473074d40db27f1168a1d15494745a228b60bb6d6b171b024c225334070ea92cb40"; }
+    { locale = "tr"; arch = "linux-i686"; sha512 = "7fd7d196f406d80a8444fa58d8c3426160c19ef63a8e3846b0f0429d0db9b7d7366d82d94fe6b3f3367b573264b9f9cd84e41e1c45f71443a719393cb72255b1"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha512 = "8e84394c1d0b7071e59185f11c72a88f05ddec013d5e95ffaaaa4bd7d40ebfaca2016fabb62d21d40326400c7f291463b14ed50c7b8616372862242b3bbb7e59"; }
+    { locale = "uk"; arch = "linux-i686"; sha512 = "31b888021abfd08b808ff41715429a1a1018719165e0484ce6dab26b1ab73a5268e46237b463ef7e25e47342931e1f3c9db053e057daa62ff0a9911edf9ae4a9"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha512 = "a11751be6d26e81899a850d22ac5e78e2b58abfdfe4f9f2559b31b973a6ece1530b91d7bab109870d01e67ec18117b8fa88dcdcf9fa7ba51e606cdb4e25d7823"; }
+    { locale = "uz"; arch = "linux-i686"; sha512 = "9818a80f5270b3d8f0741cd7b108b7ae115cc465c83c3aabf177dd7cea681272d14790cfc0dd167aa7d7299f8fc03d28c178f216da55103f7e0a92901efc1699"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha512 = "6870938bcff8a4d1854dd61d9d7067e780018ac0b4fc00c4e8b4e81f72f4952b26b069288f4831b6335da49330ccc296f2868b8491a10c4670bf068d1eaa4119"; }
+    { locale = "vi"; arch = "linux-i686"; sha512 = "e267225667c1dcd3f4f1b1421b73d36149656d541b6b6786528c38b78ad37e1ce067680359df54320a814812f85ea0644efab90ae8e82f71e2710a030d609110"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha512 = "a437a31a83d6eddc3db5ae430e3548843fde5b0c56ff29dbe42670e70388b23e7aa31e1bb2ada8868d514ed06028b2c6d0c23aaed17b397cdf002bf36691aa6e"; }
+    { locale = "xh"; arch = "linux-i686"; sha512 = "01d2b86cb0fed4ce7b48c54df75e340b95d876f2bef521de69962c0d4fcd531fb32960ba6fc30f4eecb9781d165ab7b5818d472954d2083c2b5093df21aa0f14"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha512 = "4fefaa22e79288e9db20415538a3e923bce31f2d3a27b63daa8d16aace0ce1ccece25f841ec28dca6a1b9e396e7279842c3ea226e96f47f66e63dfe1ee32558e"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha512 = "811eff9c31525b6a2d794220f82e0eeee7c240a0feb1b6091f758d476a1fa4c3bc8e75366de24318a4e6595989a4312208f5a47ed39772e4370b1c85dffe9cec"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "d6b1bf7e3cd89dfeb78474daddcb91f1a709d1f5568192b406ba7b7a790ea9968d93e60d3e635ee4712e598b6f4dadbe7b19be0930ba67c4756669e34dc553e3"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha512 = "a734f6c36ff898a9aa5d8d27ad5303cef8de0e141921ce95624dcebfd57a0364bef7d4e443a93d67c98dea67ea888c856573c354cdbaf31d27bbba23cc396190"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "d12bcd38d2b65c9be8fd033bd896afdd88867841e4e55018f2f45ea84ad1496a74500db86fbc95fe887441fa8be501981754f2c0f3f97811b9d2713f86bf8f18"; }
   ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f901adb856..b17dc21203f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12506,6 +12506,7 @@ in
   firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
     gconf = pkgs.gnome.GConf;
     inherit (pkgs.gnome) libgnome libgnomeui;
+    inherit (pkgs.gnome3) defaultIconTheme;
   };
 
   firefox-bin = self.wrapFirefox firefox-bin-unwrapped {

From 8c02de135fc8cdef456723ea0e5a8f5cdb4f031c Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 4 May 2016 16:06:43 +0900
Subject: [PATCH 664/712] amarok: add pcre as a dependency to fix failing build

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

diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index aec2768e450..f7097442744 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -2,7 +2,7 @@
 , qtscriptgenerator, gettext, curl , libxml2, mysql, taglib
 , taglib_extras, loudmouth , kdelibs , qca2, libmtp, liblastfm, libgpod
 , phonon , strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null
-, lz4, lzo, snappy, libaio
+, lz4, lzo, snappy, libaio, pcre
 }:
 
 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     qtscriptgenerator stdenv.cc.libc gettext curl libxml2 mysql.lib
     taglib taglib_extras loudmouth kdelibs phonon strigi soprano qca2
     libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core
-    lz4 lzo snappy libaio
+    lz4 lzo snappy libaio pcre
   ];
 
   # This is already fixed upstream, will be release in 2.9

From 0bdb8ef7f3e0e71d0435ec1db170dc0b4104edf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 4 May 2016 06:31:23 -0300
Subject: [PATCH 665/712] enlightenment: 0.20.6 -> 0.20.7

---
 pkgs/desktops/enlightenment/enlightenment.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index ea232a2c607..c5d5a400e05 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -4,15 +4,20 @@ libffi, pam, alsaLib, luajit, bzip2, libuuid, libpthreadstubs, gdbm, libcap, mes
 
 stdenv.mkDerivation rec {
   name = "enlightenment-${version}";
-  version = "0.20.6";
+  version = "0.20.7";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
-    sha256 = "11ahll68nlci214ka05whp5l32hy9lznmcdfqx3hxsmq2p7bl7zj";
+    sha256 = "10g1mn1myspdrxl7jcjx6v52g3pmmb0k2bxjgaqdx2s851cyipkw";
   };
-  buildInputs = [ pkgconfig efl elementary libXdmcp libxcb
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ efl elementary libXdmcp libxcb
     xcbutilkeysyms libXrandr libffi pam alsaLib luajit bzip2 libuuid
     libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
+
   NIX_CFLAGS_COMPILE = [ "-I${efl}/include/eo-1" "-I${efl}/include/emile-1" "-I${libuuid}/include/uuid" ];
+
   preConfigure = ''
     export USER_SESSION_DIR=$prefix/lib/systemd/user
 

From 1c88b276c3f2c319e548a91959c645d66230b612 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 2 May 2016 18:45:53 +0300
Subject: [PATCH 666/712] ghc8 | config:  active: jailbreak

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

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 3611b19db1b..5becbb2beec 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -74,4 +74,6 @@ self: super: {
   # https://github.com/haskell-suite/haskell-src-exts/issues/302
   haskell-src-exts = dontCheck super.haskell-src-exts;
 
+  active         = doJailbreak super.active;
+
 }

From 6d18c0555146ae1d4d7cbdc3a1e7c6e9c98d3137 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 2 May 2016 18:46:11 +0300
Subject: [PATCH 667/712] ghc8 | config:  authenticate-oauth: jailbreak

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

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 5becbb2beec..03ff30d464f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -76,4 +76,6 @@ self: super: {
 
   active         = doJailbreak super.active;
 
+  authenticate-oauth = doJailbreak super.authenticate-oauth;
+
 }

From 4d2b957b8b5618375f03ecff3026183cd2ac3433 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 2 May 2016 18:46:41 +0300
Subject: [PATCH 668/712] ghc8 | config:  diagrams: jailbreak (doesn't make
 them build, issue filed)

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

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 03ff30d464f..8b0e66e5b79 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -78,4 +78,8 @@ self: super: {
 
   authenticate-oauth = doJailbreak super.authenticate-oauth;
 
+  diagrams-core  = doJailbreak super.diagrams-core;
+
+  diagrams-lib   = doJailbreak super.diagrams-lib;
+
 }

From 82b4224835901b8a4801cd51c9eef6974328e626 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 2 May 2016 18:46:52 +0300
Subject: [PATCH 669/712] ghc8 | config:  foldl: jailbreak

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

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 8b0e66e5b79..298d748da97 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -82,4 +82,6 @@ self: super: {
 
   diagrams-lib   = doJailbreak super.diagrams-lib;
 
+  foldl          = doJailbreak super.foldl;
+
 }

From 38f9a1abdffa5136bb5ac99295df32cb7e191a4a Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 2 May 2016 18:47:01 +0300
Subject: [PATCH 670/712] ghc8 | config:  force-layout: jailbreak

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

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 298d748da97..140ab03479f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -84,4 +84,6 @@ self: super: {
 
   foldl          = doJailbreak super.foldl;
 
+  force-layout   = doJailbreak super.force-layout;
+
 }

From 944b28f7c50beb6cde40d1e8c9fab41b31829303 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 2 May 2016 18:48:10 +0300
Subject: [PATCH 671/712] ghc8 | config:  linear -> git, unreleased fixes

---
 .../haskell-modules/configuration-ghc-8.0.x.nix       | 11 +++++++++++
 1 file changed, 11 insertions(+)

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 140ab03479f..282a0b49e52 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -86,4 +86,15 @@ self: super: {
 
   force-layout   = doJailbreak super.force-layout;
 
+  # Partial fixes released in 1.20.5 upstream, full fixes only in git
+  linear         = pkgs.haskell.lib.overrideCabal super.linear (oldAttrs: {
+    editedCabalFile = null;
+    revision        = null;
+    src = pkgs.fetchgit {
+            url    = https://github.com/ekmett/linear.git;
+            rev    = "8da21dc72714441cb34d6eabd6c224819787365c";
+            sha256 = "08l0z6zrlbals2bwc2abbh31j9gf90vgp8sy3dcrp0knc98bgaa1";
+    };
+  });
+
 }

From 62db2406174e7ad9202b0a4ab5ca011b360d1350 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 2 May 2016 18:48:23 +0300
Subject: [PATCH 672/712] ghc8 | config:  lucid-svg: jailbreak

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

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 282a0b49e52..784ea0327cf 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -97,4 +97,6 @@ self: super: {
     };
   });
 
+  lucid-svg      = doJailbreak super.lucid-svg;
+
 }

From 2018121298985ee0eab8b0d8cd9c07a6e054117e Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 2 May 2016 18:48:32 +0300
Subject: [PATCH 673/712] ghc8 | config:  monads-tf: jailbreak

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

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 784ea0327cf..f859a2387ee 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -99,4 +99,6 @@ self: super: {
 
   lucid-svg      = doJailbreak super.lucid-svg;
 
+  monads-tf      = doJailbreak super.monads-tf;
+
 }

From 4015f60d1ddbe67f5a4558c0083db27f622fb8d0 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 2 May 2016 18:48:40 +0300
Subject: [PATCH 674/712] ghc8 | config:  parsers: jailbreak

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

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 f859a2387ee..8e2f72d5f53 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -101,4 +101,6 @@ self: super: {
 
   monads-tf      = doJailbreak super.monads-tf;
 
+  parsers        = doJailbreak super.parsers;
+
 }

From 1fa1be62b6dec9eb67fa5d7c4f85c5bf57436299 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 2 May 2016 18:53:06 +0300
Subject: [PATCH 675/712] ghc8 | config:  pointed -> pointed_5

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

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 8e2f72d5f53..6d26474f5ef 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -103,4 +103,6 @@ self: super: {
 
   parsers        = doJailbreak super.parsers;
 
+  pointed        = super.pointed_5;
+
 }

From 5e08a820dc748b2d9e7ca51bd75167e63528257a Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 2 May 2016 18:53:55 +0300
Subject: [PATCH 676/712] ghc8 | config:  reducers:  jailbreak

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

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 6d26474f5ef..d3b522fcb73 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -105,4 +105,6 @@ self: super: {
 
   pointed        = super.pointed_5;
 
+  reducers       = doJailbreak super.reducers;
+
 }

From d27186a9cae8bd26fa96b725e545cfc939d3f534 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 2 May 2016 18:54:08 +0300
Subject: [PATCH 677/712] ghc8 | config:  sdl2:  jailbreak

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

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 d3b522fcb73..97d5452fac7 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -107,4 +107,6 @@ self: super: {
 
   reducers       = doJailbreak super.reducers;
 
+  sdl2           = doJailbreak super.sdl2;
+
 }

From 6ce39b317ed13af912da0325efd871d99819f1e5 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 2 May 2016 18:54:27 +0300
Subject: [PATCH 678/712] ghc8 | config:  servant*:  jailbreak, disable tests

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

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 97d5452fac7..3f3b5171c00 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -109,4 +109,8 @@ self: super: {
 
   sdl2           = doJailbreak super.sdl2;
 
+  servant        = dontCheck (doJailbreak super.servant_0_7);
+  servant-client = dontCheck (doJailbreak super.servant-client_0_7);
+  servant-server = dontCheck (doJailbreak super.servant-server_0_7);
+
 }

From 49a92137604172670a99af0fa0601a735923dc91 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 2 May 2016 18:55:49 +0300
Subject: [PATCH 679/712] ghc8 | config:  singletons -> git

---
 .../haskell-modules/configuration-ghc-8.0.x.nix          | 9 +++++++++
 1 file changed, 9 insertions(+)

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 3f3b5171c00..7a30431fa9e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -113,4 +113,13 @@ self: super: {
   servant-client = dontCheck (doJailbreak super.servant-client_0_7);
   servant-server = dontCheck (doJailbreak super.servant-server_0_7);
 
+  # The essential part is released in 2.1 upstream (needs hackage import)
+  singletons     = (pkgs.haskell.lib.overrideCabal super.singletons (oldAttrs: {
+    src = pkgs.fetchgit {
+            url    = https://github.com/goldfirere/singletons.git;
+            rev    = "277fa943e8c260973effb2291672b166bdd951c1";
+            sha256 = "1ll9fcgs5nxqihvv5vr2bf9z6ijvn3yyk5ss3cgcfvcd95ayy1wz";
+    };
+  }));
+
 }

From c03af86d39177e82cc5212b378645d1b83a0c15c Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 2 May 2016 18:56:33 +0300
Subject: [PATCH 680/712] ghc8 | config:  stm-conduit -> git

---
 .../haskell-modules/configuration-ghc-8.0.x.nix          | 9 +++++++++
 1 file changed, 9 insertions(+)

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 7a30431fa9e..71fef2ecf23 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -122,4 +122,13 @@ self: super: {
     };
   }));
 
+  # The essential part only in upstream git, last released upstream version 2.7.0, Dec 8
+  stm-conduit    = doJailbreak (pkgs.haskell.lib.overrideCabal super.stm-conduit (oldAttrs: {
+    src          = pkgs.fetchgit {
+            url    = https://github.com/cgaebel/stm-conduit.git;
+            rev    = "3f831d703c422239e56a9da0f42db8a7059238e0";
+            sha256 = "0bmym2ps0yjcsbyg02r8v1q8z5hpml99n72hf2pjmd31dy8iz7v9";
+    };
+  }));
+
 }

From 81f12377e448c9d5a5c0f5351e6e9fadce9c9295 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 2 May 2016 18:57:37 +0300
Subject: [PATCH 681/712] ghc8 | config:  th-desugar -> git

---
 .../haskell-modules/configuration-ghc-8.0.x.nix          | 9 +++++++++
 1 file changed, 9 insertions(+)

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 71fef2ecf23..4f25f42cf3f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -131,4 +131,13 @@ self: super: {
     };
   }));
 
+  # The essential part only in upstream git, last released upstream version 1.6.0, Jan 27
+  th-desugar          = doJailbreak (pkgs.haskell.lib.overrideCabal super.th-desugar (oldAttrs: {
+    src = pkgs.fetchgit {
+            url    = https://github.com/goldfirere/th-desugar.git;
+            rev    = "7496de0243a12c14be1b37b89eb41cf9ef6f5229";
+            sha256 = "10awknqviq7jb738r6n9rlyra0pvkrpnk0hikz4459hny4hamn75";
+    };
+  }));
+
 }

From c9553d7b6d46a1c5e7a0d329b5a0869c566bad53 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 2 May 2016 18:58:15 +0300
Subject: [PATCH 682/712] ghc8 | config:  th-reify-many -> 0.1.4.1

---
 .../haskell-modules/configuration-ghc-8.0.x.nix          | 9 +++++++++
 1 file changed, 9 insertions(+)

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 4f25f42cf3f..161d1647bda 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -140,4 +140,13 @@ self: super: {
     };
   }));
 
+  # The essential part is released in 0.1.4.1 upstream (needs hackage import)
+  th-reify-many          = doJailbreak (pkgs.haskell.lib.overrideCabal super.th-reify-many (oldAttrs: {
+    src = pkgs.fetchgit {
+            url    = https://github.com/mgsloan/th-reify-many.git;
+            rev    = "699eed232c2ccaf9fb109f131e80ed8d654d6f08";
+            sha256 = "001fvpq039l9wj9v8id7kfjwmp4acf53zr4z6sppdvrv6npzz5yb";
+    };
+  }));
+
 }

From 2e7200201270ca50bef007e151d07780a71ccdec Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 2 May 2016 18:58:27 +0300
Subject: [PATCH 683/712] ghc8 | config:  trifecta:  jailbreak

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

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 161d1647bda..345808f5aee 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -149,4 +149,6 @@ self: super: {
     };
   }));
 
+  trifecta       = doJailbreak super.trifecta;
+
 }

From 0438192122d115244504bc489dc96c9f33b223b7 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 2 May 2016 18:58:39 +0300
Subject: [PATCH 684/712] ghc8 | config:  turtle:  jailbreak

---
 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 1 +
 1 file changed, 1 insertion(+)

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 345808f5aee..f5ca9626be6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -151,4 +151,5 @@ self: super: {
 
   trifecta       = doJailbreak super.trifecta;
 
+  turtle         = doJailbreak super.turtle;
 }

From 725c85c720d64fd686a34f12f3a2d3f995349926 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 4 May 2016 19:57:43 +0900
Subject: [PATCH 685/712] lp_solve: fixed build error due to defining isnan

---
 pkgs/applications/science/math/lp_solve/default.nix |  7 ++++++-
 pkgs/applications/science/math/lp_solve/isnan.patch | 13 +++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/science/math/lp_solve/isnan.patch

diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix
index b92691cb611..733cab7a3ed 100644
--- a/pkgs/applications/science/math/lp_solve/default.nix
+++ b/pkgs/applications/science/math/lp_solve/default.nix
@@ -10,10 +10,16 @@ stdenv.mkDerivation rec {
     sha256 = "176c7f023mb6b8bfmv4rfqnrlw88lsg422ca74zjh19i2h5s69sq";
   };
 
+  patches = [ ./isnan.patch ];
+
   buildCommand = ''
     . $stdenv/setup
     tar xvfz $src
     (
+    cd lp_solve*
+    eval patchPhase
+    )
+    (
     cd lp_solve*/lpsolve55
     bash ccc
     mkdir -pv $out/lib
@@ -37,7 +43,6 @@ stdenv.mkDerivation rec {
     license     = licenses.gpl2Plus;
     maintainers = with maintainers; [ smironov ];
     platforms   = platforms.unix;
-    broken      = true;
   };
 
 }
diff --git a/pkgs/applications/science/math/lp_solve/isnan.patch b/pkgs/applications/science/math/lp_solve/isnan.patch
new file mode 100644
index 00000000000..bc1983d4423
--- /dev/null
+++ b/pkgs/applications/science/math/lp_solve/isnan.patch
@@ -0,0 +1,13 @@
+diff -u a/lp_lib.h b/lp_lib.h
+--- a/lp_lib.h	2016-05-04 19:45:15.753143720 +0900
++++ b/lp_lib.h	2016-05-04 19:53:59.536920722 +0900
+@@ -59,9 +59,6 @@
+ # if defined _WIN32 && !defined __GNUC__
+ #  define isnan _isnan
+ # endif
+-#if defined NOISNAN
+-# define isnan(x) FALSE
+-#endif
+ 
+ #define SETMASK(variable, mask)     variable |= mask
+ #define CLEARMASK(variable, mask)   variable &= ~(mask)

From 9dfaf885c6f9dc7476af42346fa42a4430f5203c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 4 May 2016 13:05:56 +0200
Subject: [PATCH 686/712] zbar: pass libwebp WebP image format library

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

diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index 48e3316a4a2..e16d1c888c4 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, imagemagickBig, pkgconfig, python, pygtk, perl
-, libX11, libv4l, qt4, lzma, gtk2
+, libX11, libv4l, qt4, lzma, gtk2, libwebp
 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ imagemagickBig pkgconfig python pygtk perl libX11
-      libv4l qt4 lzma gtk2 ];
+      libv4l qt4 lzma gtk2 libwebp ];
 
   configureFlags = ["--disable-video"];
 

From d3421435e0dc601c8c049ace3dfc46d99c8741f8 Mon Sep 17 00:00:00 2001
From: Yacine Hmito <yacine.hmito@gmail.com>
Date: Sun, 1 May 2016 16:05:22 +0200
Subject: [PATCH 687/712] asciidoctor: Init at 1.5.4

---
 pkgs/tools/typesetting/asciidoctor/Gemfile    |   6 +
 .../typesetting/asciidoctor/Gemfile.lock      |  87 ++++++
 .../tools/typesetting/asciidoctor/default.nix |  25 ++
 pkgs/tools/typesetting/asciidoctor/gemset.nix | 267 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 5 files changed, 387 insertions(+)
 create mode 100644 pkgs/tools/typesetting/asciidoctor/Gemfile
 create mode 100644 pkgs/tools/typesetting/asciidoctor/Gemfile.lock
 create mode 100644 pkgs/tools/typesetting/asciidoctor/default.nix
 create mode 100644 pkgs/tools/typesetting/asciidoctor/gemset.nix

diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile b/pkgs/tools/typesetting/asciidoctor/Gemfile
new file mode 100644
index 00000000000..d382e6397e1
--- /dev/null
+++ b/pkgs/tools/typesetting/asciidoctor/Gemfile
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gem 'asciidoctor'
+gem 'asciidoctor-diagram'
+gem 'asciidoctor-bespoke'
+gem 'asciidoctor-pdf'
+gem 'asciidoctor-latex'
diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
new file mode 100644
index 00000000000..6f704c44ac0
--- /dev/null
+++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
@@ -0,0 +1,87 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    Ascii85 (1.0.2)
+    addressable (2.4.0)
+    afm (0.2.2)
+    asciidoctor (1.5.4)
+    asciidoctor-bespoke (1.0.0.alpha.1)
+      asciidoctor (>= 1.5.0)
+      slim (~> 3.0.6)
+      thread_safe (~> 0.3.5)
+    asciidoctor-diagram (1.4.0)
+      asciidoctor (~> 1.5.0)
+    asciidoctor-latex (1.5.0.6.dev)
+      asciidoctor (~> 1.5, >= 1.5.2)
+      htmlentities (~> 4.3)
+      opal (~> 0.6.3)
+    asciidoctor-pdf (1.5.0.alpha.11)
+      asciidoctor (~> 1.5.0)
+      prawn (>= 1.3.0, < 3.0.0)
+      prawn-icon (= 1.0.0)
+      prawn-svg (= 0.21.0)
+      prawn-table (= 0.2.2)
+      prawn-templates (= 0.0.3)
+      safe_yaml (~> 1.0.4)
+      thread_safe (~> 0.3.5)
+      treetop (= 1.5.3)
+    concurrent-ruby (1.0.1)
+    css_parser (1.4.1)
+      addressable
+    hashery (2.1.2)
+    htmlentities (4.3.4)
+    json (1.8.3)
+    opal (0.6.3)
+      source_map
+      sprockets
+    pdf-core (0.6.1)
+    pdf-reader (1.4.0)
+      Ascii85 (~> 1.0.0)
+      afm (~> 0.2.1)
+      hashery (~> 2.0)
+      ruby-rc4
+      ttfunk
+    polyglot (0.3.5)
+    prawn (2.1.0)
+      pdf-core (~> 0.6.1)
+      ttfunk (~> 1.4.0)
+    prawn-icon (1.0.0)
+      prawn (>= 1.1.0, < 3.0.0)
+    prawn-svg (0.21.0)
+      css_parser (~> 1.3)
+      prawn (>= 0.8.4, < 3)
+    prawn-table (0.2.2)
+      prawn (>= 1.3.0, < 3.0.0)
+    prawn-templates (0.0.3)
+      pdf-reader (~> 1.3)
+      prawn (>= 0.15.0)
+    rack (1.6.4)
+    ruby-rc4 (0.1.5)
+    safe_yaml (1.0.4)
+    slim (3.0.6)
+      temple (~> 0.7.3)
+      tilt (>= 1.3.3, < 2.1)
+    source_map (3.0.1)
+      json
+    sprockets (3.6.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    temple (0.7.6)
+    thread_safe (0.3.5)
+    tilt (2.0.2)
+    treetop (1.5.3)
+      polyglot (~> 0.3)
+    ttfunk (1.4.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  asciidoctor
+  asciidoctor-bespoke
+  asciidoctor-diagram
+  asciidoctor-latex
+  asciidoctor-pdf
+
+BUNDLED WITH
+   1.11.2
diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix
new file mode 100644
index 00000000000..dd90444d6af
--- /dev/null
+++ b/pkgs/tools/typesetting/asciidoctor/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, bundlerEnv, ruby_2_2, curl }:
+
+bundlerEnv rec {
+  name = "asciidoctor-${version}";
+  version = "1.5.4";
+
+  ruby = ruby_2_2;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+
+  # Delete dependencies' executables
+  postBuild = ''
+    find $out/bin -type f -not -wholename '*bin/asciidoctor*' -print0 \
+    | xargs -0 rm
+  '';
+
+  meta = with lib; {
+    description = "A faster Asciidoc processor written in Ruby";
+    homepage = http://asciidoctor.org/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ gpyh ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix
new file mode 100644
index 00000000000..b53e0765d5f
--- /dev/null
+++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix
@@ -0,0 +1,267 @@
+{
+  addressable = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mpn7sbjl477h56gmxsjqb89r5s3w7vx5af994ssgc3iamvgzgvs";
+      type = "gem";
+    };
+    version = "2.4.0";
+  };
+  afm = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06kj9hgd0z8pj27bxp2diwqh6fv7qhwwm17z64rhdc4sfn76jgn8";
+      type = "gem";
+    };
+    version = "0.2.2";
+  };
+  Ascii85 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0j95sbxd18kc8rhcnvl1w37kflqpax1r12h1x47gh4xxn3mz4m7q";
+      type = "gem";
+    };
+    version = "1.0.2";
+  };
+  asciidoctor = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xrli1fjsf1f0h6d9g55vzivxbqac2ygawcacx5ijnqn522wg9qc";
+      type = "gem";
+    };
+    version = "1.5.4";
+  };
+  asciidoctor-bespoke = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1awy933sswxvi2hxpll3rh9phxcvmqhrbb91m6ibjchnf7qsl3zk";
+      type = "gem";
+    };
+    version = "1.0.0.alpha.1";
+  };
+  asciidoctor-diagram = {
+    dependencies = ["asciidoctor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yb2gqzzbvgf5im0bhv26s3h09m9m6a0pjlq3swqcvwi1szc64k5";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
+  asciidoctor-latex = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kzql61w4phr45w771lvmlmvg22h2wd11n9frrzk3k7psqqd7k61";
+      type = "gem";
+    };
+    version = "1.5.0.6.dev";
+  };
+  asciidoctor-pdf = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06jsbn1yiavg6r07k93rmjxj6ah8csqla5mpymqjzslrkgjg5brs";
+      type = "gem";
+    };
+    version = "1.5.0.alpha.11";
+  };
+  concurrent-ruby = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13igpwgbsq701vzh1lrxs9dlqdgs58kflw8vw35644amwnj1cmjn";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  css_parser = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ql5q4n39278prbdjdsxx9wkxkxblgzzn0qcdqnwibgd1dkvb5av";
+      type = "gem";
+    };
+    version = "1.4.1";
+  };
+  hashery = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qj8815bf7q6q7llm5rzdz279gzmpqmqqicxnzv066a020iwqffj";
+      type = "gem";
+    };
+    version = "2.1.2";
+  };
+  htmlentities = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj";
+      type = "gem";
+    };
+    version = "4.3.4";
+  };
+  json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
+      type = "gem";
+    };
+    version = "1.8.3";
+  };
+  opal = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dmdxhmg43ibd4bsldssslsz8870hzknwcxiv9l1838lh6hd390k";
+      type = "gem";
+    };
+    version = "0.6.3";
+  };
+  pdf-core = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1s0h0kkddkivgpf7k1jni9nzqxw09d9bgcsvyga407ixbiipkgfy";
+      type = "gem";
+    };
+    version = "0.6.1";
+  };
+  pdf-reader = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0j9cimzw2waic800108qmnds7w33xd9y3bdvf9qzijwv9wjv0iq1";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
+  polyglot = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
+      type = "gem";
+    };
+    version = "0.3.5";
+  };
+  prawn = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18f99v3r0jzym38s68hr0y8anrilv98shmsdf763ascd0gc5dj2n";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  prawn-icon = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07dcsvxg52zdywhg28p6zsbj7ybz3xzbklawc1n7jwym2mli3916";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  prawn-svg = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1p5fsamh33xqp2gld0j4ii80awsxmm4ffp5pq13m0s1gavzaapc3";
+      type = "gem";
+    };
+    version = "0.21.0";
+  };
+  prawn-table = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nxd6qmxqwl850icp18wjh5k0s3amxcajdrkjyzpfgq0kvilcv9k";
+      type = "gem";
+    };
+    version = "0.2.2";
+  };
+  prawn-templates = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0d14sq01c5zn0ywzazwcz6lkk235za36km53wqbf1bqabdb1ls10";
+      type = "gem";
+    };
+    version = "0.0.3";
+  };
+  rack = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5";
+      type = "gem";
+    };
+    version = "1.6.4";
+  };
+  ruby-rc4 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00vci475258mmbvsdqkmqadlwn6gj9m01sp7b5a3zd90knil1k00";
+      type = "gem";
+    };
+    version = "0.1.5";
+  };
+  safe_yaml = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
+      type = "gem";
+    };
+    version = "1.0.4";
+  };
+  slim = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1szs71hh0msm5gj6qbcxw44m3hqnwybx4yh02scwixnwg576058k";
+      type = "gem";
+    };
+    version = "3.0.6";
+  };
+  source_map = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fviv92glr51v2zqy4i5jzi3hzpvjrcwyrxddcfr84ki65zb7pkv";
+      type = "gem";
+    };
+    version = "3.0.1";
+  };
+  sprockets = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16fnlp4fqzrdxlbalbx3r0bir7dwyr1asg7s9lsmmczngl0x7fw7";
+      type = "gem";
+    };
+    version = "3.6.0";
+  };
+  temple = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ysraljv7lkb04z5vdyrkijab7j1jzj1mgz4bj82744dp7d0rhb0";
+      type = "gem";
+    };
+    version = "0.7.6";
+  };
+  thread_safe = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr";
+      type = "gem";
+    };
+    version = "0.3.5";
+  };
+  tilt = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lkd40xfdqkp333vdfhrfjmi2y7k2hjs4azawfb62mrkfp7ivj84";
+      type = "gem";
+    };
+    version = "2.0.2";
+  };
+  treetop = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0wpl5z33796nz2ah44waflrd1girbra281d9i3m9nz4ylg1ljg5b";
+      type = "gem";
+    };
+    version = "1.5.3";
+  };
+  ttfunk = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1k725rji58i0qx5xwf7p9d07cmhmjixqkdvhg1wk3rpp1753cf1j";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ebaa28cdfe..e7170ef568d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -878,6 +878,8 @@ in
     enableStandardFeatures = true;
     enableExtraPlugins = true;
   });
+  
+  asciidoctor = callPackage ../tools/typesetting/asciidoctor { };
 
   autossh = callPackage ../tools/networking/autossh { };
 

From 3bcaf22decee045aa8dc42ac1885aab0aae69285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 4 May 2016 09:11:34 -0300
Subject: [PATCH 688/712] xfce4-cpufreq-plugin: 1.1.1 -> 1.1.3

---
 .../xfce/panel-plugins/xfce4-cpufreq-plugin.nix     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
index 072da2bc576..c0c8519d63a 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
@@ -4,20 +4,27 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
   p_name  = "xfce4-cpufreq-plugin";
   ver_maj = "1.1";
-  ver_min = "1";
+  ver_min = "3";
 
   src = fetchurl {
     url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "1ryaynkxpqpp92pj18bdds869sf560ir1k3bgl8gqnz60z04ak27";
+    sha256 = "0crd21l5cw0xgm6w7s049xa36k203yx7l56ssnah9nq1w73n58bl";
   };
+
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  buildInputs = [ libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
+
+  enableParallelBuilding = true;
+
   preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
     description = "CPU Freq load plugin for Xfce panel";
+    license = [ licenses.gpl2Plus ];
     platforms = platforms.linux;
     maintainers = [ maintainers.AndersonTorres ];
   };

From 3fa49d5ac424d161baf5a5e952d9be0a803985ab Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 4 May 2016 22:03:22 +0900
Subject: [PATCH 689/712] lp_solve: updated description

---
 pkgs/applications/science/math/lp_solve/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix
index 733cab7a3ed..796faec34e1 100644
--- a/pkgs/applications/science/math/lp_solve/default.nix
+++ b/pkgs/applications/science/math/lp_solve/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "lp_solve is a Mixed Integer Linear Programming (MILP) solver";
+    description = "A Mixed Integer Linear Programming (MILP) solver";
     homepage    = "http://lpsolve.sourceforge.net";
     license     = licenses.gpl2Plus;
     maintainers = with maintainers; [ smironov ];

From f2bab58b3ef2506674ad92aadb2aa8b5058f265b Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 4 May 2016 22:17:37 +0900
Subject: [PATCH 690/712] lp_solve: change source URL to mirror

---
 pkgs/applications/science/math/lp_solve/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix
index 796faec34e1..efa0c1751d4 100644
--- a/pkgs/applications/science/math/lp_solve/default.nix
+++ b/pkgs/applications/science/math/lp_solve/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "5.5.2.0";
 
   src = fetchurl {
-    url = "http://sourceforge.net/projects/lpsolve/files/lpsolve/${version}/lp_solve_${version}_source.tar.gz";
+    url = "mirror://sourceforge/project/lpsolve/lpsolve/${version}/lp_solve_${version}_source.tar.gz";
     sha256 = "176c7f023mb6b8bfmv4rfqnrlw88lsg422ca74zjh19i2h5s69sq";
   };
 

From a941c7e27b3c2e5562031831544cab3648da8224 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Wed, 4 May 2016 13:20:39 +0200
Subject: [PATCH 691/712] mdadm: call /var/setuid-wrappers/sendmail instead of
 /usr/sbin/sendmail

---
 pkgs/os-specific/linux/mdadm/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index 3fe9d462412..3a04466ce41 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -29,7 +29,9 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-std=gnu89";
 
   preConfigure = ''
-    sed -e 's@/lib/udev@''${out}/lib/udev@' -e 's@ -Werror @ @' -i Makefile
+    sed -e 's@/lib/udev@''${out}/lib/udev@' \
+        -e 's@ -Werror @ @' \
+        -e 's@/usr/sbin/sendmail@/var/setuid-wrappers/sendmail@' -i Makefile
   '';
 
   meta = {

From 5423c48148fe20f872abe56be306ac4af1999947 Mon Sep 17 00:00:00 2001
From: Ali Abrar <aliabrar@gmail.com>
Date: Wed, 4 May 2016 10:38:47 -0400
Subject: [PATCH 692/712] rxvt_unicode: 9.21 -> 9.22

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

diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index d30c2761f73..8f195555cf1 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -4,7 +4,7 @@
 
 let
   name = "rxvt-unicode";
-  version = "9.21";
+  version = "9.22";
   n = "${name}-${version}";
 in
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation (rec {
 
   src = fetchurl {
     url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2";
-    sha256 = "0swmi308v5yxsddrdhvi4cch88k2bbs2nffpl5j5m2f55gbhw9vm";
+    sha256 = "1pddjn5ynblwfrdmskylrsxb9vfnk3w4jdnq2l8xn2pspkljhip9";
   };
 
   buildInputs =

From 942db2e9acab06d3199463aa36be1a9c7e615d93 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 4 May 2016 17:54:52 +0200
Subject: [PATCH 693/712] imagemagick: libwebp just has to be a propagated
 input

---
 pkgs/applications/graphics/ImageMagick/default.nix | 2 +-
 pkgs/tools/graphics/zbar/default.nix               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index b97eb5a6580..47f60ed7ec1 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     ];
 
   propagatedBuildInputs =
-    [ bzip2 freetype libjpeg libX11 libXext libXt lcms2 ];
+    [ bzip2 freetype libjpeg libX11 libXext libXt lcms2 libwebp ];
 
   postInstall = ''
 
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index e16d1c888c4..48e3316a4a2 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, imagemagickBig, pkgconfig, python, pygtk, perl
-, libX11, libv4l, qt4, lzma, gtk2, libwebp
+, libX11, libv4l, qt4, lzma, gtk2
 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ imagemagickBig pkgconfig python pygtk perl libX11
-      libv4l qt4 lzma gtk2 libwebp ];
+      libv4l qt4 lzma gtk2 ];
 
   configureFlags = ["--disable-video"];
 

From f44fb5656c586e87e8c836cd20168a7ff9dfcb33 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux-github@gmx-topmail.de>
Date: Tue, 3 May 2016 19:10:22 +0200
Subject: [PATCH 694/712] caddy: v0.8.2 -> v0.8.3

---
 pkgs/top-level/go-packages.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 65b210544cb..25655ce0b8b 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -243,6 +243,13 @@ let
     sha256 = "0gwplb1b4fvav1vjf4b2dypy5rcp2w41vrbxkd1dsmac870cy75p";
   };
 
+  archiver = buildFromGitHub {
+    rev = "85f054813ed511646b0ce5e047697e0651b8e1a4";
+    owner = "mholt";
+    repo = "archiver";
+    sha256 = "0b38mrfm3rwgdi7hrp4gjhf0y0f6bw73qjkfrkafxjrdpdg7nyly";
+  };
+  
   asciinema = buildFromGitHub {
     rev = "v1.2.0";
     owner = "asciinema";
@@ -412,13 +419,13 @@ let
   };
 
   caddy = buildFromGitHub {
-    rev     = "9099375b11b7b5e62b831627c2927d1c4c666071";
-    version = "v0.8.2";
+    rev     = "e2234497b79603388b58ba226abb157aa4aaf065";
+    version = "v0.8.3";
     owner   = "mholt";
     repo    = "caddy";
-    sha256  = "1zdy2sxir21ngh2ird01sv4fgj6sy3wl4s6k4piklri8ps1zw0k0";
+    sha256  = "1snijkbz02yr7wij7bcmrj4257709sbklb3nhb5qmy95b9ssffm6";
     buildInputs = [
-      acme blackfriday crypto go-humanize go-shlex go-syslog
+      acme archiver blackfriday crypto go-humanize go-shlex go-syslog
       http-authentication lumberjack-v2 toml websocket yaml-v2
     ];
     disabled = isGo14 || isGo15;

From f2d24b98408b48c2179b131fa4c3700dc41f5b52 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 May 2016 17:37:34 +0200
Subject: [PATCH 695/712] chromium: Disable Hydra builds of -dev and -beta

It's not the job of Nixpkgs to distribute beta versions of upstream
packages. More importantly, building these delays channel updates by
several hours, which is bad for our security fix turnaround time.
---
 nixos/release.nix                                          | 2 +-
 nixos/tests/chromium.nix                                   | 2 --
 pkgs/applications/networking/browsers/chromium/browser.nix | 3 ++-
 pkgs/applications/networking/browsers/chromium/default.nix | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index 8409191200c..f632f36d3fe 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -210,7 +210,7 @@ in rec {
   tests.blivet = callTest tests/blivet.nix {};
   tests.boot = callSubTests tests/boot.nix {};
   tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; });
-  tests.chromium = callSubTests tests/chromium.nix {};
+  tests.chromium = callSubTests tests/chromium.nix { system = "x86_64-linux"; };
   tests.cjdns = callTest tests/cjdns.nix {};
   tests.containers-ipv4 = callTest tests/containers-ipv4.nix {};
   tests.containers-ipv6 = callTest tests/containers-ipv6.nix {};
diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index 9a6414f81c3..1053b777a61 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -2,8 +2,6 @@
 , pkgs ? import ../.. { inherit system; }
 , channelMap ? {
     stable = pkgs.chromium;
-    beta   = pkgs.chromiumBeta;
-    dev    = pkgs.chromiumDev;
   }
 }:
 
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 982c6d659ee..a6e95ca5187 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkChromiumDerivation }:
+{ stdenv, mkChromiumDerivation, channel }:
 
 with stdenv.lib;
 
@@ -35,5 +35,6 @@ mkChromiumDerivation (base: rec {
     maintainers = with maintainers; [ chaoflow ];
     license = licenses.bsd3;
     platforms = platforms.linux;
+    hydraPlatforms = if channel == "stable" then ["x86_64-linux"] else [];
   };
 })
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 79e5e2dfec3..5f9c423ce44 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -29,7 +29,7 @@ let
               hiDPISupport;
     };
 
-    browser = callPackage ./browser.nix { };
+    browser = callPackage ./browser.nix { inherit channel; };
 
     plugins = callPackage ./plugins.nix {
       inherit enablePepperFlash enableWideVine;

From 1f84e43239bc2a707c30c0d7bca47801e4df5a78 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 May 2016 18:03:12 +0200
Subject: [PATCH 696/712] Do some large, concurrency-capable builds on
 dedicated machines

---
 pkgs/applications/networking/browsers/chromium/browser.nix | 1 +
 pkgs/os-specific/linux/kernel/manual-config.nix            | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index a6e95ca5187..fe21642373e 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -36,5 +36,6 @@ mkChromiumDerivation (base: rec {
     license = licenses.bsd3;
     platforms = platforms.linux;
     hydraPlatforms = if channel == "stable" then ["x86_64-linux"] else [];
+    requiredSystemFeatures = [ "big-parallel" ];
   };
 })
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index ffe09cc2fee..5f2bc2d2c55 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -125,7 +125,7 @@ let
       postInstall = (optionalString installsFirmware ''
         mkdir -p $out/lib/firmware
       '') + (if (platform ? kernelDTB && platform.kernelDTB) then ''
- 	make $makeFlags "''${makeFlagsArray[@]}" dtbs
+        make $makeFlags "''${makeFlagsArray[@]}" dtbs
         mkdir -p $out/dtbs
         cp $buildRoot/arch/$karch/boot/dts/*.dtb $out/dtbs
       '' else "") + (if isModular then ''
@@ -190,6 +190,8 @@ let
           $installFlags "''${installFlagsArray[@]}"
       '');
 
+      requiredSystemFeatures = [ "big-parallel" ];
+
       meta = {
         description =
           "The Linux kernel" +

From 1eab39cdce8d59660ef3000cd7c6b8684a720dca Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 4 May 2016 16:39:24 +0000
Subject: [PATCH 697/712] makeself: fix patch to find the makeself header
 properly

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

diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix
index 3ba0faef968..b1b4e66cfe4 100644
--- a/pkgs/applications/misc/makeself/default.nix
+++ b/pkgs/applications/misc/makeself/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     mv makeself.sh $out/bin/makeself
     mv makeself.1  $out/share/man/man1/
     mv makeself-header.sh $out/share/${name}
-    sed -e 's|HEADER=`dirname $0`/makeself-header.sh|HEADER=`dirname $0`/../share/${name}/makeself-header.sh|' -i $out/bin/makeself
+    sed -e 's|HEADER=`dirname "$0"`/makeself-header.sh|HEADER=`dirname $0`/../share/${name}/makeself-header.sh|' -i $out/bin/makeself
   '';
   meta = with stdenv.lib; {
     homepage = http://megastep.org/makeself;

From f35e9386bd7e063f843f1b33b35c0c2757aade55 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 4 May 2016 18:36:08 +0200
Subject: [PATCH 698/712] nixos/tests/chromium: Re-add map for all channels

This partially reverts f2d24b98408b48c2179b131fa4c3700dc41f5b52.

Instead of disabling the channels via removing the channel mapping from
the tests themselves, let's just explicitly reference the stable test in
release.nix. That way it's still possible to run the beta and dev tests
via something like "nix-build nixos/tests/chromium.nix -A beta" and
achieve the same effect of not building beta and dev versions on Hydra.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/release.nix        | 2 +-
 nixos/tests/chromium.nix | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index f632f36d3fe..97f6df16dc9 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -210,7 +210,7 @@ in rec {
   tests.blivet = callTest tests/blivet.nix {};
   tests.boot = callSubTests tests/boot.nix {};
   tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; });
-  tests.chromium = callSubTests tests/chromium.nix { system = "x86_64-linux"; };
+  tests.chromium = (callSubTests tests/chromium.nix { system = "x86_64-linux"; }).stable;
   tests.cjdns = callTest tests/cjdns.nix {};
   tests.containers-ipv4 = callTest tests/containers-ipv4.nix {};
   tests.containers-ipv6 = callTest tests/containers-ipv6.nix {};
diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index 1053b777a61..9a6414f81c3 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -2,6 +2,8 @@
 , pkgs ? import ../.. { inherit system; }
 , channelMap ? {
     stable = pkgs.chromium;
+    beta   = pkgs.chromiumBeta;
+    dev    = pkgs.chromiumDev;
   }
 }:
 

From 7e09858d6ec38021310711329bc3f97ccce7b50c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 4 May 2016 14:02:13 -0300
Subject: [PATCH 699/712] xfce4-weather-plugin: init at 0.8.7

---
 pkgs/desktops/xfce/default.nix                |  1 +
 .../panel-plugins/xfce4-weather-plugin.nix    | 31 +++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 3ea3721362b..06046bc122b 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -88,6 +88,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
   xfce4_systemload_plugin  = callPackage ./panel-plugins/xfce4-systemload-plugin.nix  { };
   xfce4_verve_plugin       = callPackage ./panel-plugins/xfce4-verve-plugin.nix       { };
   xfce4_xkb_plugin         = callPackage ./panel-plugins/xfce4-xkb-plugin.nix         { };
+  xfce4_weather_plugin     = callPackage ./panel-plugins/xfce4-weather-plugin.nix     { };
   xfce4_whiskermenu_plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin.nix { };
   xfce4_pulseaudio_plugin  = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix  { };
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
new file mode 100644
index 00000000000..419efbcbf95
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxml2, libsoup, upower,
+libxfce4ui, libxfce4util, xfce4panel }:
+
+stdenv.mkDerivation rec {
+  name = "${p_name}-${ver_maj}.${ver_min}";
+  p_name  = "xfce4-weather-plugin";
+  ver_maj = "0.8";
+  ver_min = "7";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "1c35iqqiphazkfdabbjdynk0qkc3r8vxhmk2jc6dkiv8d08727h7";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  buildInputs = [ gtk libxml2 libsoup upower libxfce4ui libxfce4util
+   xfce4panel ];
+
+  enableParallelBuilding = true;
+
+  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
+
+  meta = {
+    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    description = "Weather plugin for the Xfce desktop environment";
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+  };
+}

From 2c021bdbba762bb423f01a0a429152fea025871c Mon Sep 17 00:00:00 2001
From: vbgl <vbgl@users.noreply.github.com>
Date: Wed, 4 May 2016 19:12:20 +0200
Subject: [PATCH 700/712] ocaml-oasis: 0.4.5 -> 0.4.6 (#15209)

---
 pkgs/development/tools/ocaml/oasis/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix
index 70d90752ace..6dcf0522232 100644
--- a/pkgs/development/tools/ocaml/oasis/default.nix
+++ b/pkgs/development/tools/ocaml/oasis/default.nix
@@ -2,11 +2,11 @@
  ocamlmod, ocamlify, ounit, expect}:
 
 stdenv.mkDerivation {
-  name = "ocaml-oasis-0.4.5";
+  name = "ocaml-oasis-0.4.6";
 
   src = fetchurl {
-    url = http://forge.ocamlcore.org/frs/download.php/1475/oasis-0.4.5.tar.gz;
-    sha256 = "0i1fifzig2slhb07d1djx6i690b8ys0avsx6ssnihisw841sc8v6";
+    url = http://forge.ocamlcore.org/frs/download.php/1604/oasis-0.4.6.tar.gz;
+    sha256 = "1yxv3ckkf87nz0cyll0yy1kd295j5pv3jqwkfrr1y65wkz5vw90k";
   };
 
   createFindlibDestdir = true;

From 9fa30d3bad80faa60e961147ca9b68a8abb46134 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 4 May 2016 19:53:43 +0200
Subject: [PATCH 701/712] nixos/tests/containers-imperative: Fix test

Make sure that we always have everything available within the store of
the VM, so let's evaluate/build the test container fully on the host
system and propagate all dependencies to the VM.

This way, even if there are additional default dependencies that come
with containers in the future we should be on the safe side as these
dependencies should now be included for the test as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @kampfschlaefer, @edolstra
---
 nixos/tests/containers-imperative.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix
index 8d100fedf78..81c98a56e07 100644
--- a/nixos/tests/containers-imperative.nix
+++ b/nixos/tests/containers-imperative.nix
@@ -7,11 +7,20 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { config, pkgs, system, lib, ... }:
     { imports = [ ../modules/installer/cd-dvd/channel.nix ];
       virtualisation.writableStore = true;
       virtualisation.memorySize = 768;
-      virtualisation.pathsInNixDB = [ pkgs.stdenv ];
+      # Make sure we always have all the required dependencies for creating a
+      # container available within the VM, because we don't have network access.
+      virtualisation.pathsInNixDB = let
+        emptyContainer = import ../lib/eval-config.nix {
+          inherit (config.nixpkgs) system;
+          modules = lib.singleton {
+            containers.foo.config = {};
+          };
+        };
+      in [ pkgs.stdenv emptyContainer.config.containers.foo.path ];
     };
 
   testScript =

From acf7bc898a55ee19976486cd3b411a24ba66ae1e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 4 May 2016 20:44:55 +0200
Subject: [PATCH 702/712] nixos/tests/containers: Remove unused module arg

Just removing the system argument because it doesn't exist (it's
actually config.nixpkgs.system, which we're already using). We won't get
an error anyway if we're not actually using it, so this is just an
aesthetics fix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/tests/containers-imperative.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix
index 81c98a56e07..89babdcc476 100644
--- a/nixos/tests/containers-imperative.nix
+++ b/nixos/tests/containers-imperative.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, system, lib, ... }:
+    { config, pkgs, lib, ... }:
     { imports = [ ../modules/installer/cd-dvd/channel.nix ];
       virtualisation.writableStore = true;
       virtualisation.memorySize = 768;

From 4f7ea068b459a4ec73115c59f8d8726cd65ec585 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 4 May 2016 19:04:03 +0000
Subject: [PATCH 703/712] rpm-ostree: bump version of libglnx to fix
 environment passing bug

See https://github.com/projectatomic/rpm-ostree/issues/277 for more
details.
---
 pkgs/tools/misc/rpm-ostree/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix
index 8df9666c10b..997d8279e04 100644
--- a/pkgs/tools/misc/rpm-ostree/default.nix
+++ b/pkgs/tools/misc/rpm-ostree/default.nix
@@ -6,8 +6,8 @@ let
   libglnx-src = fetchFromGitHub {
     owner  = "GNOME";
     repo   = "libglnx";
-    rev    = "08ae6639e522e9b11765245fbecdbbe474ccde98";
-    sha256 = "1k7fbivi2mwb2x5bqqbqc3nbnfjjw1l911hs914197hyqpy21dab";
+    rev    = "85c9dd5c073a8c0d74c4baa2e4a94f5535984e62";
+    sha256 = "08m8wxlkymwq5hsc26k7ndwiqiw1ggaaxyi2qfhqznasgbp4g623";
   };
 in stdenv.mkDerivation rec {
   rev  = "v2016.1";

From d122556a2f81264a6546d3f1301fe7ddee09471a Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Wed, 4 May 2016 21:49:08 +0200
Subject: [PATCH 704/712] notmuch: 0.21 -> 0.22

---
 pkgs/applications/networking/mailreaders/notmuch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index f84a3367d52..b9fc84d2058 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "notmuch-0.21";
+  name = "notmuch-0.22";
 
   passthru = {
     pythonSourceRoot = "${name}/bindings/python";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://notmuchmail.org/releases/${name}.tar.gz";
-    sha256 = "1cr53rbpkcy3pvrmhbg2gq7sjpwb0c8xd7a4zhzxbiv8s7z8yvyh";
+    sha256 = "16mrrw6xpsgip4dy8rfx0zncij5h41fsg2aah6x6z83bjbpihhfn";
   };
 
   buildInputs = [ bash emacs glib gmime gnupg pkgconfig talloc xapian sphinx python ]

From f28b71023cba59ba819b0978ebffa70e3e4d1785 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 4 May 2016 22:11:50 +0200
Subject: [PATCH 705/712] chromium/updater: Don't import <nixpkgs> again

This effectively resets the attributes given at the point the main
<nixpkgs> is imported and thus for example is also reading in stuff like
~/.nixpkgs/config.nix again, which might lead to unexpected results.

We now only import <nixpkgs> now if the updater is auto-called (like in
update.sh), otherwise the required attributes are passed by callPackage
within the Chromium scope.

I remember noting about this a while ago either on IRC or on GitHub, but
I can't find it right now, so thanks to @obadz for reminding me about
this in #15225.

Tested this by running the updater and also using:

NIXPKGS_CONFIG=$(pwd)/broken.nix nix-instantiate --arg config {} -A chromium

The contents of broken.nix were:

EVALERR{

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #15225
---
 .../networking/browsers/chromium/default.nix      |  4 +---
 .../networking/browsers/chromium/update.nix       | 15 +++++++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 5f9c423ce44..5a3b289d528 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -19,9 +19,7 @@ let
   callPackage = newScope chromium;
 
   chromium = {
-    upstream-info = (import ./update.nix {
-      inherit (stdenv) system;
-    }).getChannel channel;
+    upstream-info = (callPackage ./update.nix {}).getChannel channel;
 
     mkChromiumDerivation = callPackage ./common.nix {
       inherit enableSELinux enableNaCl enableHotwording gnomeSupport
diff --git a/pkgs/applications/networking/browsers/chromium/update.nix b/pkgs/applications/networking/browsers/chromium/update.nix
index cff84199562..bd7e256bfa9 100644
--- a/pkgs/applications/networking/browsers/chromium/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/update.nix
@@ -1,9 +1,16 @@
-{ system ? builtins.currentSystem }:
+let maybePkgs = import ../../../../../. {}; in
+
+{ stdenv     ? maybePkgs.stdenv
+, runCommand ? maybePkgs.runCommand
+, fetchurl   ? maybePkgs.fetchurl
+, writeText  ? maybePkgs.writeText
+, curl       ? maybePkgs.curl
+, cacert     ? maybePkgs.cacert
+, nix        ? maybePkgs.nix
+}:
 
 let
-  inherit (import ../../../../../. {
-    inherit system;
-  }) lib runCommand fetchurl writeText stdenv curl cacert nix;
+  inherit (stdenv) lib;
 
   sources = if builtins.pathExists ./upstream-info.nix
             then import ./upstream-info.nix

From 3f7735fe659a83f10e6199d2e9e1eb1f609fcca0 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 4 May 2016 23:12:33 +0200
Subject: [PATCH 706/712] chromium+chrome: Don't import update.nix directly

Regression introduced by f28b71023cba59ba819b0978ebffa70e3e4d1785.

Let's now expose and use the upstream-info attribute via the main
Chromium derivation, so that other packages like the google-chrome
package doesn't need to rely on internals of the Chromium
implementation.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/default.nix  | 1 +
 .../networking/browsers/google-chrome/default.nix           | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 5a3b289d528..51493fb4655 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -84,6 +84,7 @@ in stdenv.mkDerivation {
   inherit (chromium.browser) meta packageName;
 
   passthru = {
+    inherit (chromium) upstream-info;
     mkDerivation = chromium.mkChromiumDerivation;
   };
 }
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 77f0d1693da..37602a89cee 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -26,13 +26,13 @@
 # Necessary for USB audio devices.
 , pulseSupport ? true, libpulseaudio ? null
 
+# Only needed for getting information about upstream binaries
+, chromium
 }:
 
 with stdenv.lib;
 
-with (import ../chromium/update.nix {
-  inherit (stdenv) system;
-}).getChannel channel;
+with chromium.upstream-info;
 
 let
   opusWithCustomModes = libopus.override {

From b42d6718b0347953f4032f9c2cd1793dc8f28827 Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@holidaycheck.com>
Date: Sun, 24 Apr 2016 21:10:53 +0200
Subject: [PATCH 707/712] python-neovim: 0.0.38 -> 0.1.7

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8edba3627e4..7786a2443e6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25766,12 +25766,14 @@ in modules // {
   };
 
   neovim = buildPythonPackage rec {
-    version = "0.0.38";
+    version = "0.1.7";
     name = "neovim-${version}";
 
+    disabled = isPy35;
+
     src = pkgs.fetchurl {
       url = "mirror://pypi/n/neovim/${name}.tar.gz";
-      sha256 = "93f475d5583a053af919ba0729b32b3fefef1dbde4717b5657d806bdc69b76b3";
+      sha256 = "0il6h9qpy9rkgz16yn2bhhg5f23w41wvm9ivlscx5l55llq9sd9q";
     };
 
     propagatedBuildInputs = with self; [ msgpack ]

From 953bb5e7ca5ca3f30a8bf626fc42f9fef2d2864e Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@gmail.com>
Date: Wed, 4 May 2016 22:23:09 +0200
Subject: [PATCH 708/712] python-gui: init at 1.0.2, fixes #14958

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7786a2443e6..8d46bc57b1a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25790,9 +25790,17 @@ in modules // {
 
   neovim_gui = buildPythonPackage rec {
     name = "neovim-pygui-${self.neovim.version}";
+    version = "0.1.2";
     disabled = !isPy27;
 
-    src = self.neovim.src;
+    src = pkgs.fetchFromGitHub {
+      owner = "neovim";
+      repo = "python-gui";
+      rev = version;
+      sha256 = "0sc5apxwxgfj57q7d9cih404jgvczbp7slz5z8wqdyxpxlb42pn2";
+    };
+
+    buildInputs = with self; [ neovim ];
 
     propagatedBuildInputs = [
       self.msgpack

From 750d58f439c9d3be3543b4a6753ecc6923b12975 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Wed, 4 May 2016 15:22:16 +0200
Subject: [PATCH 709/712] eid-mw: 4.1.16 -> 4.1.17

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

diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index b6a7b2fedbe..23f10ba0750 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -1,19 +1,20 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, nssTools, pcsclite
-, pkgconfig }:
+{ stdenv, fetchFromGitHub
+, autoreconfHook, pkgconfig
+, gtk3, nssTools, pcsclite }:
 
 stdenv.mkDerivation rec {
   name = "eid-mw-${version}";
-  version = "4.1.16";
+  version = "4.1.17";
 
   src = fetchFromGitHub {
-    sha256 = "14b17aa45l0pyqd87c17mgfmpgq1qmybnl6hq9mc29rxw6jdb1ka";
+    sha256 = "11d4wafcbhamkqvcfqkpz1sq66jq7bxz07m777cqsnyibccns7q6";
     rev = "v${version}";
     repo = "eid-mw";
     owner = "Fedict";
   };
 
-  buildInputs = [ gtk3 pcsclite ];
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ gtk3 pcsclite ];
 
   postPatch = ''
     sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac

From e58cd82e878f6541eacebde9ed4aad65ae8bfef7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 5 May 2016 02:16:56 +0200
Subject: [PATCH 710/712] dpkg: 1.18.5 -> 1.18.6

---
 pkgs/tools/package-management/dpkg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index bc07f3e536f..a14602de64e 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "dpkg-${version}";
-  version = "1.18.5";
+  version = "1.18.6";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
-    sha256 = "01wb8qa4vv2dpd1gv5bm0qzgzb35wn5ij7daqd7b3977l5k6lkh7";
+    sha256 = "18nywp0gs8bnywll9qrcg8g1fli4p5xd6h8sazhsmrxgp8iw62yx";
   };
 
   postPatch = ''

From 367b2aa1e422f2ee8a0860df52e98a5d788cef6a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 5 May 2016 05:27:17 +0300
Subject: [PATCH 711/712] dbus-glibc: Set --exec-prefix to fix pkgconfig file

Without this notify-osd fails to find dbus-binding-tool, since the
pkgconfig file would contain e.g.:

````
prefix=/nix/store/hxsbjbjn7g1j1cf60n228yi9wnzrl4yk-dbus-glib-0.104
exec_prefix=${prefix}
````

... and notify-osd is using `exec_prefix` to locate the binaries.
Set it to $dev to match the location of installed binaries (we have
`outputBin = "dev";`).

Issue #15074.
---
 pkgs/development/libraries/dbus-glib/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix
index 59d227f0e86..d06a919cada 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/pkgs/development/libraries/dbus-glib/default.nix
@@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ dbus glib ];
 
+  preConfigure = ''
+    configureFlagsArray+=("--exec-prefix=$dev")
+  '';
+
   doCheck = true;
 
   passthru = { inherit dbus glib; };

From df310048e5f4a516663bf8c5a74029b54813a7f3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 5 May 2016 06:23:12 +0300
Subject: [PATCH 712/712] release-combined.nix: More Chromium test evaluation
 fixes

Follow-up to f35e9386bd7e.
---
 nixos/release-combined.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index abb69f121da..5fc0bf9c945 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -48,7 +48,7 @@ in rec {
         nixos.ova.x86_64-linux
 
         #(all nixos.tests.containers)
-        (all nixos.tests.chromium.stable)
+        (all nixos.tests.chromium)
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
         nixos.tests.gnome3.x86_64-linux # FIXME: i686-linux